Commit 2fab90bb5e for openssl.org
commit 2fab90bb5e1937f1c2125eab144f7f6c39e70087
Author: Bob Beck <beck@openssl.org>
Date: Tue Dec 9 00:08:07 2025 -0700
4.0-POST-CLANG-FORMAT-WEBKIT
Reviewed-by: Saša NedvÄ›dický <sashan@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/29242)
diff --git a/apps/asn1parse.c b/apps/asn1parse.c
index 4540d5f5fb..fbd9d7c334 100644
--- a/apps/asn1parse.c
+++ b/apps/asn1parse.c
@@ -20,40 +20,51 @@
typedef enum OPTION_choice {
OPT_COMMON,
- OPT_INFORM, OPT_IN, OPT_OUT, OPT_INDENT, OPT_NOOUT,
- OPT_OID, OPT_OFFSET, OPT_LENGTH, OPT_DUMP, OPT_DLIMIT,
- OPT_STRPARSE, OPT_GENSTR, OPT_GENCONF, OPT_STRICTPEM,
+ OPT_INFORM,
+ OPT_IN,
+ OPT_OUT,
+ OPT_INDENT,
+ OPT_NOOUT,
+ OPT_OID,
+ OPT_OFFSET,
+ OPT_LENGTH,
+ OPT_DUMP,
+ OPT_DLIMIT,
+ OPT_STRPARSE,
+ OPT_GENSTR,
+ OPT_GENCONF,
+ OPT_STRICTPEM,
OPT_ITEM
} OPTION_CHOICE;
const OPTIONS asn1parse_options[] = {
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
- {"oid", OPT_OID, '<', "file of extra oid definitions"},
+ { "help", OPT_HELP, '-', "Display this summary" },
+ { "oid", OPT_OID, '<', "file of extra oid definitions" },
OPT_SECTION("I/O"),
- {"inform", OPT_INFORM, 'A', "input format - one of DER PEM B64"},
- {"in", OPT_IN, '<', "input file"},
- {"out", OPT_OUT, '>', "output file (output format is always DER)"},
- {"noout", OPT_NOOUT, 0, "do not produce any output"},
- {"offset", OPT_OFFSET, 'p', "offset into file"},
- {"length", OPT_LENGTH, 'p', "length of section in file"},
- {"strparse", OPT_STRPARSE, 'p',
- "offset; a series of these can be used to 'dig'"},
- {OPT_MORE_STR, 0, 0, "into multiple ASN1 blob wrappings"},
- {"genstr", OPT_GENSTR, 's', "string to generate ASN1 structure from"},
- {"genconf", OPT_GENCONF, 's', "file to generate ASN1 structure from"},
- {"strictpem", OPT_STRICTPEM, 0,
- "equivalent to '-inform pem' (obsolete)"},
- {"item", OPT_ITEM, 's', "item to parse and print"},
- {OPT_MORE_STR, 0, 0, "(-inform will be ignored)"},
+ { "inform", OPT_INFORM, 'A', "input format - one of DER PEM B64" },
+ { "in", OPT_IN, '<', "input file" },
+ { "out", OPT_OUT, '>', "output file (output format is always DER)" },
+ { "noout", OPT_NOOUT, 0, "do not produce any output" },
+ { "offset", OPT_OFFSET, 'p', "offset into file" },
+ { "length", OPT_LENGTH, 'p', "length of section in file" },
+ { "strparse", OPT_STRPARSE, 'p',
+ "offset; a series of these can be used to 'dig'" },
+ { OPT_MORE_STR, 0, 0, "into multiple ASN1 blob wrappings" },
+ { "genstr", OPT_GENSTR, 's', "string to generate ASN1 structure from" },
+ { "genconf", OPT_GENCONF, 's', "file to generate ASN1 structure from" },
+ { "strictpem", OPT_STRICTPEM, 0,
+ "equivalent to '-inform pem' (obsolete)" },
+ { "item", OPT_ITEM, 's', "item to parse and print" },
+ { OPT_MORE_STR, 0, 0, "(-inform will be ignored)" },
OPT_SECTION("Formatting"),
- {"i", OPT_INDENT, 0, "indents the output"},
- {"dump", OPT_DUMP, 0, "unknown data in hex form"},
- {"dlimit", OPT_DLIMIT, 'p',
- "dump the first arg bytes of unknown data in hex form"},
- {NULL}
+ { "i", OPT_INDENT, 0, "indents the output" },
+ { "dump", OPT_DUMP, 0, "unknown data in hex form" },
+ { "dlimit", OPT_DLIMIT, 'p',
+ "dump the first arg bytes of unknown data in hex form" },
+ { NULL }
};
static int do_generate(char *genstr, const char *genconf, BUF_MEM *buf);
@@ -88,7 +99,7 @@ int asn1parse_main(int argc, char **argv)
switch (o) {
case OPT_EOF:
case OPT_ERR:
- opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
case OPT_HELP:
@@ -189,7 +200,7 @@ int asn1parse_main(int argc, char **argv)
buf->length = buf->max = num;
} else {
if (!BUF_MEM_grow(buf, BUFSIZ * 8))
- goto end; /* Pre-allocate :-) */
+ goto end; /* Pre-allocate :-) */
if (genstr || genconf) {
num = do_generate(genstr, genconf, buf);
@@ -224,7 +235,6 @@ int asn1parse_main(int argc, char **argv)
}
}
str = (unsigned char *)buf->data;
-
}
/* If any structs to parse go through in sequence */
@@ -238,7 +248,7 @@ int asn1parse_main(int argc, char **argv)
j = strtol(sk_OPENSSL_STRING_value(osk, i), NULL, 0);
if (j <= 0 || j >= tmplen) {
BIO_printf(bio_err, "'%s' is out of range\n",
- sk_OPENSSL_STRING_value(osk, i));
+ sk_OPENSSL_STRING_value(osk, i));
continue;
}
tmpbuf += j;
@@ -304,7 +314,7 @@ int asn1parse_main(int argc, char **argv)
}
}
ret = 0;
- end:
+end:
BIO_free(derout);
BIO_free(in);
BIO_free(b64);
@@ -358,7 +368,7 @@ static int do_generate(char *genstr, const char *genconf, BUF_MEM *buf)
ASN1_TYPE_free(atyp);
return len;
- err:
+err:
NCONF_free(cnf);
ASN1_TYPE_free(atyp);
return -1;
diff --git a/apps/ca.c b/apps/ca.c
index 850cbc6bb6..07d8ef23b9 100644
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -26,114 +26,114 @@
#include <openssl/pem.h>
#ifndef W_OK
-# ifdef OPENSSL_SYS_VMS
-# include <unistd.h>
-# elif !defined(OPENSSL_SYS_VXWORKS) && !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_TANDEM)
-# include <sys/file.h>
-# endif
+#ifdef OPENSSL_SYS_VMS
+#include <unistd.h>
+#elif !defined(OPENSSL_SYS_VXWORKS) && !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_TANDEM)
+#include <sys/file.h>
+#endif
#endif
#include "apps.h"
#include "progs.h"
#ifndef W_OK
-# define F_OK 0
-# define W_OK 2
-# define R_OK 4
+#define F_OK 0
+#define W_OK 2
+#define R_OK 4
#endif
#ifndef PATH_MAX
-# define PATH_MAX 4096
+#define PATH_MAX 4096
#endif
-#define BASE_SECTION "ca"
-
-#define ENV_DEFAULT_CA "default_ca"
-
-#define STRING_MASK "string_mask"
-#define UTF8_IN "utf8"
-
-#define ENV_NEW_CERTS_DIR "new_certs_dir"
-#define ENV_CERTIFICATE "certificate"
-#define ENV_SERIAL "serial"
-#define ENV_RAND_SERIAL "rand_serial"
-#define ENV_CRLNUMBER "crlnumber"
-#define ENV_PRIVATE_KEY "private_key"
-#define ENV_DEFAULT_DAYS "default_days"
-#define ENV_DEFAULT_STARTDATE "default_startdate"
-#define ENV_DEFAULT_ENDDATE "default_enddate"
-#define ENV_DEFAULT_CRL_DAYS "default_crl_days"
-#define ENV_DEFAULT_CRL_HOURS "default_crl_hours"
-#define ENV_DEFAULT_MD "default_md"
-#define ENV_DEFAULT_EMAIL_DN "email_in_dn"
-#define ENV_PRESERVE "preserve"
-#define ENV_POLICY "policy"
-#define ENV_EXTENSIONS "x509_extensions"
-#define ENV_CRLEXT "crl_extensions"
-#define ENV_MSIE_HACK "msie_hack"
-#define ENV_NAMEOPT "name_opt"
-#define ENV_CERTOPT "cert_opt"
-#define ENV_EXTCOPY "copy_extensions"
-#define ENV_UNIQUE_SUBJECT "unique_subject"
-
-#define ENV_DATABASE "database"
+#define BASE_SECTION "ca"
+
+#define ENV_DEFAULT_CA "default_ca"
+
+#define STRING_MASK "string_mask"
+#define UTF8_IN "utf8"
+
+#define ENV_NEW_CERTS_DIR "new_certs_dir"
+#define ENV_CERTIFICATE "certificate"
+#define ENV_SERIAL "serial"
+#define ENV_RAND_SERIAL "rand_serial"
+#define ENV_CRLNUMBER "crlnumber"
+#define ENV_PRIVATE_KEY "private_key"
+#define ENV_DEFAULT_DAYS "default_days"
+#define ENV_DEFAULT_STARTDATE "default_startdate"
+#define ENV_DEFAULT_ENDDATE "default_enddate"
+#define ENV_DEFAULT_CRL_DAYS "default_crl_days"
+#define ENV_DEFAULT_CRL_HOURS "default_crl_hours"
+#define ENV_DEFAULT_MD "default_md"
+#define ENV_DEFAULT_EMAIL_DN "email_in_dn"
+#define ENV_PRESERVE "preserve"
+#define ENV_POLICY "policy"
+#define ENV_EXTENSIONS "x509_extensions"
+#define ENV_CRLEXT "crl_extensions"
+#define ENV_MSIE_HACK "msie_hack"
+#define ENV_NAMEOPT "name_opt"
+#define ENV_CERTOPT "cert_opt"
+#define ENV_EXTCOPY "copy_extensions"
+#define ENV_UNIQUE_SUBJECT "unique_subject"
+
+#define ENV_DATABASE "database"
/* Additional revocation information types */
typedef enum {
- REV_VALID = -1, /* Valid (not-revoked) status */
- REV_NONE = 0, /* No additional information */
- REV_CRL_REASON = 1, /* Value is CRL reason code */
- REV_HOLD = 2, /* Value is hold instruction */
- REV_KEY_COMPROMISE = 3, /* Value is cert key compromise time */
- REV_CA_COMPROMISE = 4 /* Value is CA key compromise time */
+ REV_VALID = -1, /* Valid (not-revoked) status */
+ REV_NONE = 0, /* No additional information */
+ REV_CRL_REASON = 1, /* Value is CRL reason code */
+ REV_HOLD = 2, /* Value is hold instruction */
+ REV_KEY_COMPROMISE = 3, /* Value is cert key compromise time */
+ REV_CA_COMPROMISE = 4 /* Value is CA key compromise time */
} REVINFO_TYPE;
static char *lookup_conf(const CONF *conf, const char *group, const char *tag);
static int certify(X509 **xret, const char *infile, int informat,
- EVP_PKEY *pkey, X509 *x509,
- const char *dgst,
- STACK_OF(OPENSSL_STRING) *sigopts,
- STACK_OF(OPENSSL_STRING) *vfyopts,
- STACK_OF(CONF_VALUE) *policy, CA_DB *db,
- BIGNUM *serial, const char *subj, unsigned long chtype,
- int multirdn, int email_dn, const char *startdate,
- const char *enddate,
- long days, int batch, const char *ext_sect, CONF *conf,
- int verbose, unsigned long certopt, unsigned long nameopt,
- int default_op, int ext_copy, int selfsign, unsigned long dateopt);
+ EVP_PKEY *pkey, X509 *x509,
+ const char *dgst,
+ STACK_OF(OPENSSL_STRING) *sigopts,
+ STACK_OF(OPENSSL_STRING) *vfyopts,
+ STACK_OF(CONF_VALUE) *policy, CA_DB *db,
+ BIGNUM *serial, const char *subj, unsigned long chtype,
+ int multirdn, int email_dn, const char *startdate,
+ const char *enddate,
+ long days, int batch, const char *ext_sect, CONF *conf,
+ int verbose, unsigned long certopt, unsigned long nameopt,
+ int default_op, int ext_copy, int selfsign, unsigned long dateopt);
static int certify_cert(X509 **xret, const char *infile, int certformat,
- const char *passin, EVP_PKEY *pkey, X509 *x509,
- const char *dgst,
- STACK_OF(OPENSSL_STRING) *sigopts,
- STACK_OF(OPENSSL_STRING) *vfyopts,
- STACK_OF(CONF_VALUE) *policy, CA_DB *db,
- BIGNUM *serial, const char *subj, unsigned long chtype,
- int multirdn, int email_dn, const char *startdate,
- const char *enddate, long days, int batch, const char *ext_sect,
- CONF *conf, int verbose, unsigned long certopt,
- unsigned long nameopt, int default_op, int ext_copy, unsigned long dateopt);
+ const char *passin, EVP_PKEY *pkey, X509 *x509,
+ const char *dgst,
+ STACK_OF(OPENSSL_STRING) *sigopts,
+ STACK_OF(OPENSSL_STRING) *vfyopts,
+ STACK_OF(CONF_VALUE) *policy, CA_DB *db,
+ BIGNUM *serial, const char *subj, unsigned long chtype,
+ int multirdn, int email_dn, const char *startdate,
+ const char *enddate, long days, int batch, const char *ext_sect,
+ CONF *conf, int verbose, unsigned long certopt,
+ unsigned long nameopt, int default_op, int ext_copy, unsigned long dateopt);
static int certify_spkac(X509 **xret, const char *infile, EVP_PKEY *pkey,
- X509 *x509, const char *dgst,
- STACK_OF(OPENSSL_STRING) *sigopts,
- STACK_OF(CONF_VALUE) *policy, CA_DB *db,
- BIGNUM *serial, const char *subj, unsigned long chtype,
- int multirdn, int email_dn, const char *startdate,
- const char *enddate, long days, const char *ext_sect, CONF *conf,
- int verbose, unsigned long certopt,
- unsigned long nameopt, int default_op, int ext_copy, unsigned long dateopt);
+ X509 *x509, const char *dgst,
+ STACK_OF(OPENSSL_STRING) *sigopts,
+ STACK_OF(CONF_VALUE) *policy, CA_DB *db,
+ BIGNUM *serial, const char *subj, unsigned long chtype,
+ int multirdn, int email_dn, const char *startdate,
+ const char *enddate, long days, const char *ext_sect, CONF *conf,
+ int verbose, unsigned long certopt,
+ unsigned long nameopt, int default_op, int ext_copy, unsigned long dateopt);
static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
- const char *dgst, STACK_OF(OPENSSL_STRING) *sigopts,
- STACK_OF(CONF_VALUE) *policy, CA_DB *db, BIGNUM *serial,
- const char *subj, unsigned long chtype, int multirdn,
- int email_dn, const char *startdate, const char *enddate, long days,
- int batch, int verbose, X509_REQ *req, const char *ext_sect,
- CONF *conf, unsigned long certopt, unsigned long nameopt,
- int default_op, int ext_copy, int selfsign, unsigned long dateopt);
+ const char *dgst, STACK_OF(OPENSSL_STRING) *sigopts,
+ STACK_OF(CONF_VALUE) *policy, CA_DB *db, BIGNUM *serial,
+ const char *subj, unsigned long chtype, int multirdn,
+ int email_dn, const char *startdate, const char *enddate, long days,
+ int batch, int verbose, X509_REQ *req, const char *ext_sect,
+ CONF *conf, unsigned long certopt, unsigned long nameopt,
+ int default_op, int ext_copy, int selfsign, unsigned long dateopt);
static int get_certificate_status(const char *ser_status, CA_DB *db);
static int check_time_format(const char *str);
static int do_revoke(X509 *x509, CA_DB *db, REVINFO_TYPE rev_type,
- const char *extval);
+ const char *extval);
static char *make_revocation_str(REVINFO_TYPE rev_type, const char *rev_arg);
static int make_revoked(X509_REVOKED *rev, const char *str);
static int old_entry_print(const ASN1_OBJECT *obj, const ASN1_STRING *str);
@@ -145,118 +145,162 @@ static int msie_hack = 0;
typedef enum OPTION_choice {
OPT_COMMON,
- OPT_VERBOSE, OPT_CONFIG, OPT_NAME, OPT_SUBJ, OPT_UTF8,
- OPT_CREATE_SERIAL, OPT_MULTIVALUE_RDN, OPT_STARTDATE, OPT_ENDDATE,
- OPT_DAYS, OPT_MD, OPT_POLICY, OPT_KEYFILE, OPT_KEYFORM, OPT_PASSIN,
- OPT_KEY, OPT_CERT, OPT_CERTFORM, OPT_SELFSIGN,
- OPT_IN, OPT_INFORM, OPT_OUT, OPT_DATEOPT, OPT_OUTDIR, OPT_VFYOPT,
- OPT_SIGOPT, OPT_NOTEXT, OPT_BATCH, OPT_PRESERVEDN, OPT_NOEMAILDN,
- OPT_GENCRL, OPT_MSIE_HACK, OPT_CRL_LASTUPDATE, OPT_CRL_NEXTUPDATE,
- OPT_CRLDAYS, OPT_CRLHOURS, OPT_CRLSEC, OPT_NOT_BEFORE, OPT_NOT_AFTER,
- OPT_INFILES, OPT_SS_CERT, OPT_SPKAC, OPT_REVOKE, OPT_VALID,
- OPT_EXTENSIONS, OPT_EXTFILE, OPT_STATUS, OPT_UPDATEDB, OPT_CRLEXTS,
- OPT_RAND_SERIAL, OPT_QUIET,
- OPT_R_ENUM, OPT_PROV_ENUM,
+ OPT_VERBOSE,
+ OPT_CONFIG,
+ OPT_NAME,
+ OPT_SUBJ,
+ OPT_UTF8,
+ OPT_CREATE_SERIAL,
+ OPT_MULTIVALUE_RDN,
+ OPT_STARTDATE,
+ OPT_ENDDATE,
+ OPT_DAYS,
+ OPT_MD,
+ OPT_POLICY,
+ OPT_KEYFILE,
+ OPT_KEYFORM,
+ OPT_PASSIN,
+ OPT_KEY,
+ OPT_CERT,
+ OPT_CERTFORM,
+ OPT_SELFSIGN,
+ OPT_IN,
+ OPT_INFORM,
+ OPT_OUT,
+ OPT_DATEOPT,
+ OPT_OUTDIR,
+ OPT_VFYOPT,
+ OPT_SIGOPT,
+ OPT_NOTEXT,
+ OPT_BATCH,
+ OPT_PRESERVEDN,
+ OPT_NOEMAILDN,
+ OPT_GENCRL,
+ OPT_MSIE_HACK,
+ OPT_CRL_LASTUPDATE,
+ OPT_CRL_NEXTUPDATE,
+ OPT_CRLDAYS,
+ OPT_CRLHOURS,
+ OPT_CRLSEC,
+ OPT_NOT_BEFORE,
+ OPT_NOT_AFTER,
+ OPT_INFILES,
+ OPT_SS_CERT,
+ OPT_SPKAC,
+ OPT_REVOKE,
+ OPT_VALID,
+ OPT_EXTENSIONS,
+ OPT_EXTFILE,
+ OPT_STATUS,
+ OPT_UPDATEDB,
+ OPT_CRLEXTS,
+ OPT_RAND_SERIAL,
+ OPT_QUIET,
+ OPT_R_ENUM,
+ OPT_PROV_ENUM,
/* Do not change the order here; see related case statements below */
- OPT_CRL_REASON, OPT_CRL_HOLD, OPT_CRL_COMPROMISE, OPT_CRL_CA_COMPROMISE
+ OPT_CRL_REASON,
+ OPT_CRL_HOLD,
+ OPT_CRL_COMPROMISE,
+ OPT_CRL_CA_COMPROMISE
} OPTION_CHOICE;
const OPTIONS ca_options[] = {
- {OPT_HELP_STR, 1, '-', "Usage: %s [options] [certreq...]\n"},
+ { OPT_HELP_STR, 1, '-', "Usage: %s [options] [certreq...]\n" },
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
- {"verbose", OPT_VERBOSE, '-', "Verbose output during processing"},
- {"quiet", OPT_QUIET, '-', "Terse output during processing"},
- {"outdir", OPT_OUTDIR, '/', "Where to put output cert"},
- {"in", OPT_IN, '<', "The input cert request(s)"},
- {"inform", OPT_INFORM, 'F',
- "CSR input format to use (PEM or DER; by default try PEM first)"},
- {"infiles", OPT_INFILES, '-', "The last argument, requests to process"},
- {"out", OPT_OUT, '>', "Where to put the output file(s)"},
- {"dateopt", OPT_DATEOPT, 's', "Datetime format used for printing. (rfc_822/iso_8601). Default is rfc_822."},
- {"notext", OPT_NOTEXT, '-', "Do not print the generated certificate"},
- {"batch", OPT_BATCH, '-', "Don't ask questions"},
- {"msie_hack", OPT_MSIE_HACK, '-',
- "msie modifications to handle all Universal Strings"},
- {"ss_cert", OPT_SS_CERT, '<', "File contains a self signed cert to sign"},
- {"spkac", OPT_SPKAC, '<',
- "File contains DN and signed public key and challenge"},
+ { "help", OPT_HELP, '-', "Display this summary" },
+ { "verbose", OPT_VERBOSE, '-', "Verbose output during processing" },
+ { "quiet", OPT_QUIET, '-', "Terse output during processing" },
+ { "outdir", OPT_OUTDIR, '/', "Where to put output cert" },
+ { "in", OPT_IN, '<', "The input cert request(s)" },
+ { "inform", OPT_INFORM, 'F',
+ "CSR input format to use (PEM or DER; by default try PEM first)" },
+ { "infiles", OPT_INFILES, '-', "The last argument, requests to process" },
+ { "out", OPT_OUT, '>', "Where to put the output file(s)" },
+ { "dateopt", OPT_DATEOPT, 's', "Datetime format used for printing. (rfc_822/iso_8601). Default is rfc_822." },
+ { "notext", OPT_NOTEXT, '-', "Do not print the generated certificate" },
+ { "batch", OPT_BATCH, '-', "Don't ask questions" },
+ { "msie_hack", OPT_MSIE_HACK, '-',
+ "msie modifications to handle all Universal Strings" },
+ { "ss_cert", OPT_SS_CERT, '<', "File contains a self signed cert to sign" },
+ { "spkac", OPT_SPKAC, '<',
+ "File contains DN and signed public key and challenge" },
OPT_SECTION("Configuration"),
- {"config", OPT_CONFIG, 's', "A config file"},
- {"name", OPT_NAME, 's', "The particular CA definition to use"},
- {"section", OPT_NAME, 's', "An alias for -name"},
- {"policy", OPT_POLICY, 's', "The CA 'policy' to support"},
+ { "config", OPT_CONFIG, 's', "A config file" },
+ { "name", OPT_NAME, 's', "The particular CA definition to use" },
+ { "section", OPT_NAME, 's', "An alias for -name" },
+ { "policy", OPT_POLICY, 's', "The CA 'policy' to support" },
OPT_SECTION("Certificate"),
- {"subj", OPT_SUBJ, 's', "Use arg instead of request's subject"},
- {"utf8", OPT_UTF8, '-', "Input characters are UTF8; default ASCII"},
- {"create_serial", OPT_CREATE_SERIAL, '-',
- "If reading serial fails, create a new random serial"},
- {"rand_serial", OPT_RAND_SERIAL, '-',
- "Always create a random serial; do not store it"},
- {"multivalue-rdn", OPT_MULTIVALUE_RDN, '-',
- "Deprecated; multi-valued RDNs support is always on."},
- {"startdate", OPT_STARTDATE, 's',
- "[CC]YYMMDDHHMMSSZ value for notBefore certificate field"},
- {"not_before", OPT_NOT_BEFORE, 's', "An alias for -startdate"},
- {"enddate", OPT_ENDDATE, 's',
- "[CC]YYMMDDHHMMSSZ value for notAfter certificate field, overrides -days"},
- {"not_after", OPT_NOT_AFTER, 's', "An alias for -enddate"},
- {"days", OPT_DAYS, 'p', "Number of days from today to certify the cert for"},
- {"extensions", OPT_EXTENSIONS, 's',
- "Extension section (override value in config file)"},
- {"extfile", OPT_EXTFILE, '<',
- "Configuration file with X509v3 extensions to add"},
- {"preserveDN", OPT_PRESERVEDN, '-', "Don't re-order the DN"},
- {"noemailDN", OPT_NOEMAILDN, '-', "Don't add the EMAIL field to the DN"},
+ { "subj", OPT_SUBJ, 's', "Use arg instead of request's subject" },
+ { "utf8", OPT_UTF8, '-', "Input characters are UTF8; default ASCII" },
+ { "create_serial", OPT_CREATE_SERIAL, '-',
+ "If reading serial fails, create a new random serial" },
+ { "rand_serial", OPT_RAND_SERIAL, '-',
+ "Always create a random serial; do not store it" },
+ { "multivalue-rdn", OPT_MULTIVALUE_RDN, '-',
+ "Deprecated; multi-valued RDNs support is always on." },
+ { "startdate", OPT_STARTDATE, 's',
+ "[CC]YYMMDDHHMMSSZ value for notBefore certificate field" },
+ { "not_before", OPT_NOT_BEFORE, 's', "An alias for -startdate" },
+ { "enddate", OPT_ENDDATE, 's',
+ "[CC]YYMMDDHHMMSSZ value for notAfter certificate field, overrides -days" },
+ { "not_after", OPT_NOT_AFTER, 's', "An alias for -enddate" },
+ { "days", OPT_DAYS, 'p', "Number of days from today to certify the cert for" },
+ { "extensions", OPT_EXTENSIONS, 's',
+ "Extension section (override value in config file)" },
+ { "extfile", OPT_EXTFILE, '<',
+ "Configuration file with X509v3 extensions to add" },
+ { "preserveDN", OPT_PRESERVEDN, '-', "Don't re-order the DN" },
+ { "noemailDN", OPT_NOEMAILDN, '-', "Don't add the EMAIL field to the DN" },
OPT_SECTION("Signing"),
- {"md", OPT_MD, 's', "Digest to use, such as sha256"},
- {"keyfile", OPT_KEYFILE, 's', "The CA private key"},
- {"keyform", OPT_KEYFORM, 'f', "Private key file format (DER/PEM)"},
- {"passin", OPT_PASSIN, 's', "Key and cert input file pass phrase source"},
- {"key", OPT_KEY, 's',
- "Key to decrypt the private key or cert files if encrypted. Better use -passin"},
- {"cert", OPT_CERT, '<', "The CA cert"},
- {"certform", OPT_CERTFORM, 'F',
- "Certificate input format (DER/PEM/P12); has no effect"},
- {"selfsign", OPT_SELFSIGN, '-',
- "Sign a cert with the key associated with it"},
- {"sigopt", OPT_SIGOPT, 's', "Signature parameter in n:v form"},
- {"vfyopt", OPT_VFYOPT, 's', "Verification parameter in n:v form"},
+ { "md", OPT_MD, 's', "Digest to use, such as sha256" },
+ { "keyfile", OPT_KEYFILE, 's', "The CA private key" },
+ { "keyform", OPT_KEYFORM, 'f', "Private key file format (DER/PEM)" },
+ { "passin", OPT_PASSIN, 's', "Key and cert input file pass phrase source" },
+ { "key", OPT_KEY, 's',
+ "Key to decrypt the private key or cert files if encrypted. Better use -passin" },
+ { "cert", OPT_CERT, '<', "The CA cert" },
+ { "certform", OPT_CERTFORM, 'F',
+ "Certificate input format (DER/PEM/P12); has no effect" },
+ { "selfsign", OPT_SELFSIGN, '-',
+ "Sign a cert with the key associated with it" },
+ { "sigopt", OPT_SIGOPT, 's', "Signature parameter in n:v form" },
+ { "vfyopt", OPT_VFYOPT, 's', "Verification parameter in n:v form" },
OPT_SECTION("Revocation"),
- {"gencrl", OPT_GENCRL, '-', "Generate a new CRL"},
- {"valid", OPT_VALID, 's',
- "Add a Valid(not-revoked) DB entry about a cert (given in file)"},
- {"status", OPT_STATUS, 's', "Shows cert status given the serial number"},
- {"updatedb", OPT_UPDATEDB, '-', "Updates db for expired cert"},
- {"crlexts", OPT_CRLEXTS, 's',
- "CRL extension section (override value in config file)"},
- {"crl_reason", OPT_CRL_REASON, 's', "revocation reason"},
- {"crl_hold", OPT_CRL_HOLD, 's',
- "the hold instruction, an OID. Sets revocation reason to certificateHold"},
- {"crl_compromise", OPT_CRL_COMPROMISE, 's',
- "sets compromise time to val and the revocation reason to keyCompromise"},
- {"crl_CA_compromise", OPT_CRL_CA_COMPROMISE, 's',
- "sets compromise time to val and the revocation reason to CACompromise"},
- {"crl_lastupdate", OPT_CRL_LASTUPDATE, 's',
- "Sets the CRL lastUpdate time to val (YYMMDDHHMMSSZ or YYYYMMDDHHMMSSZ)"},
- {"crl_nextupdate", OPT_CRL_NEXTUPDATE, 's',
- "Sets the CRL nextUpdate time to val (YYMMDDHHMMSSZ or YYYYMMDDHHMMSSZ)"},
- {"crldays", OPT_CRLDAYS, 'p', "Days until the next CRL is due"},
- {"crlhours", OPT_CRLHOURS, 'p', "Hours until the next CRL is due"},
- {"crlsec", OPT_CRLSEC, 'p', "Seconds until the next CRL is due"},
- {"revoke", OPT_REVOKE, '<', "Revoke a cert (given in file)"},
+ { "gencrl", OPT_GENCRL, '-', "Generate a new CRL" },
+ { "valid", OPT_VALID, 's',
+ "Add a Valid(not-revoked) DB entry about a cert (given in file)" },
+ { "status", OPT_STATUS, 's', "Shows cert status given the serial number" },
+ { "updatedb", OPT_UPDATEDB, '-', "Updates db for expired cert" },
+ { "crlexts", OPT_CRLEXTS, 's',
+ "CRL extension section (override value in config file)" },
+ { "crl_reason", OPT_CRL_REASON, 's', "revocation reason" },
+ { "crl_hold", OPT_CRL_HOLD, 's',
+ "the hold instruction, an OID. Sets revocation reason to certificateHold" },
+ { "crl_compromise", OPT_CRL_COMPROMISE, 's',
+ "sets compromise time to val and the revocation reason to keyCompromise" },
+ { "crl_CA_compromise", OPT_CRL_CA_COMPROMISE, 's',
+ "sets compromise time to val and the revocation reason to CACompromise" },
+ { "crl_lastupdate", OPT_CRL_LASTUPDATE, 's',
+ "Sets the CRL lastUpdate time to val (YYMMDDHHMMSSZ or YYYYMMDDHHMMSSZ)" },
+ { "crl_nextupdate", OPT_CRL_NEXTUPDATE, 's',
+ "Sets the CRL nextUpdate time to val (YYMMDDHHMMSSZ or YYYYMMDDHHMMSSZ)" },
+ { "crldays", OPT_CRLDAYS, 'p', "Days until the next CRL is due" },
+ { "crlhours", OPT_CRLHOURS, 'p', "Hours until the next CRL is due" },
+ { "crlsec", OPT_CRLSEC, 'p', "Seconds until the next CRL is due" },
+ { "revoke", OPT_REVOKE, '<', "Revoke a cert (given in file)" },
OPT_R_OPTIONS,
OPT_PROV_OPTIONS,
OPT_PARAMETERS(),
- {"certreq", 0, 0, "Certificate requests to be signed (optional)"},
- {NULL}
+ { "certreq", 0, 0, "Certificate requests to be signed (optional)" },
+ { NULL }
};
int ca_main(int argc, char **argv)
@@ -308,7 +352,7 @@ int ca_main(int argc, char **argv)
switch (o) {
case OPT_EOF:
case OPT_ERR:
-opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
case OPT_HELP:
@@ -488,7 +532,7 @@ opthelp:
case OPT_CRLEXTS:
crl_ext = opt_arg();
break;
- case OPT_CRL_REASON: /* := REV_CRL_REASON */
+ case OPT_CRL_REASON: /* := REV_CRL_REASON */
case OPT_CRL_HOLD:
case OPT_CRL_COMPROMISE:
case OPT_CRL_CA_COMPROMISE:
@@ -602,7 +646,7 @@ end_of_options:
if (!X509_check_private_key(x509, pkey)) {
BIO_printf(bio_err,
- "CA certificate and CA private key do not match\n");
+ "CA certificate and CA private key do not match\n");
goto end;
}
}
@@ -649,7 +693,7 @@ end_of_options:
outdir = NCONF_get_string(conf, section, ENV_NEW_CERTS_DIR);
if (outdir == NULL) {
BIO_printf(bio_err,
- "there needs to be defined a directory for new certificate to be placed in\n");
+ "there needs to be defined a directory for new certificate to be placed in\n");
goto end;
}
#ifndef OPENSSL_SYS_VMS
@@ -685,12 +729,11 @@ end_of_options:
pp = sk_OPENSSL_PSTRING_value(db->db->data, i);
if ((pp[DB_type][0] != DB_TYPE_REV) && (pp[DB_rev_date][0] != '\0')) {
BIO_printf(bio_err,
- "entry %d: not revoked yet, but has a revocation date\n",
- i + 1);
+ "entry %d: not revoked yet, but has a revocation date\n",
+ i + 1);
goto end;
}
- if ((pp[DB_type][0] == DB_TYPE_REV) &&
- !make_revoked(NULL, pp[DB_rev_date])) {
+ if ((pp[DB_type][0] == DB_TYPE_REV) && !make_revoked(NULL, pp[DB_rev_date])) {
BIO_printf(bio_err, " in entry %d\n", i + 1);
goto end;
}
@@ -706,14 +749,14 @@ end_of_options:
}
if ((j & 1) || (j < 2)) {
BIO_printf(bio_err, "entry %d: bad serial number length (%d)\n",
- i + 1, j);
+ i + 1, j);
goto end;
}
- for ( ; *p; p++) {
+ for (; *p; p++) {
if (!isxdigit(_UC(*p))) {
BIO_printf(bio_err,
- "entry %d: bad char 0%o '%c' in serial number\n",
- i + 1, *p, *p);
+ "entry %d: bad char 0%o '%c' in serial number\n",
+ i + 1, *p, *p);
goto end;
}
}
@@ -721,7 +764,7 @@ end_of_options:
if (verbose) {
TXT_DB_write(bio_out, db->db);
BIO_printf(bio_err, "%d entries loaded from the database\n",
- sk_OPENSSL_PSTRING_num(db->db->data));
+ sk_OPENSSL_PSTRING_num(db->db->data));
BIO_printf(bio_err, "generating index\n");
}
@@ -763,12 +806,11 @@ end_of_options:
if (verbose)
BIO_printf(bio_err, "Successfully loaded extensions file %s\n",
- extfile);
+ extfile);
/* We can have sections in the ext file */
if (extensions == NULL) {
- extensions =
- app_conf_try_string(extfile_conf, "default", "extensions");
+ extensions = app_conf_try_string(extfile_conf, "default", "extensions");
if (extensions == NULL)
extensions = "default";
}
@@ -795,8 +837,8 @@ end_of_options:
if (def_ret == 2 && strcmp(def_dgst, "UNDEF") == 0) {
dgst = NULL;
} else if (dgst == NULL
- && (dgst = lookup_conf(conf, section, ENV_DEFAULT_MD)) == NULL
- && strcmp(def_dgst, "UNDEF") != 0) {
+ && (dgst = lookup_conf(conf, section, ENV_DEFAULT_MD)) == NULL
+ && strcmp(def_dgst, "UNDEF") != 0) {
goto end;
} else {
if (strcmp(dgst, "default") == 0 || strcmp(def_dgst, "UNDEF") == 0) {
@@ -812,8 +854,7 @@ end_of_options:
if (email_dn == 1) {
char *tmp_email_dn = NULL;
- tmp_email_dn =
- app_conf_try_string(conf, section, ENV_DEFAULT_EMAIL_DN);
+ tmp_email_dn = app_conf_try_string(conf, section, ENV_DEFAULT_EMAIL_DN);
if (tmp_email_dn != NULL && strcmp(tmp_email_dn, "no") == 0)
email_dn = 0;
}
@@ -842,8 +883,8 @@ end_of_options:
X509V3_set_nconf(&ctx, extfile_conf);
if (!X509V3_EXT_add_nconf(extfile_conf, &ctx, extensions, NULL)) {
BIO_printf(bio_err,
- "Error checking certificate extensions from extfile section %s\n",
- extensions);
+ "Error checking certificate extensions from extfile section %s\n",
+ extensions);
ret = 1;
goto end;
}
@@ -862,8 +903,8 @@ end_of_options:
X509V3_set_nconf(&ctx, conf);
if (!X509V3_EXT_add_nconf(conf, &ctx, extensions, NULL)) {
BIO_printf(bio_err,
- "Error checking certificate extension config section %s\n",
- extensions);
+ "Error checking certificate extension config section %s\n",
+ extensions);
ret = 1;
goto end;
}
@@ -871,8 +912,7 @@ end_of_options:
}
if (startdate == NULL)
- startdate =
- app_conf_try_string(conf, section, ENV_DEFAULT_STARTDATE);
+ startdate = app_conf_try_string(conf, section, ENV_DEFAULT_STARTDATE);
if (enddate == NULL)
enddate = app_conf_try_string(conf, section, ENV_DEFAULT_ENDDATE);
if (days == 0) {
@@ -885,7 +925,7 @@ end_of_options:
}
if (days != 0 && enddate != NULL)
BIO_printf(bio_err,
- "Warning: -enddate or -not_after option overriding -days option\n");
+ "Warning: -enddate or -not_after option overriding -days option\n");
if (rand_ser) {
if ((serial = BN_new()) == NULL || !rand_serial(serial, NULL)) {
@@ -922,10 +962,10 @@ end_of_options:
if (spkac_file != NULL) {
total++;
j = certify_spkac(&x, spkac_file, pkey, x509, dgst, sigopts,
- attribs, db, serial, subj, chtype, multirdn,
- email_dn, startdate, enddate, days, extensions,
- conf, verbose, certopt, get_nameopt(), default_op,
- ext_copy, dateopt);
+ attribs, db, serial, subj, chtype, multirdn,
+ email_dn, startdate, enddate, days, extensions,
+ conf, verbose, certopt, get_nameopt(), default_op,
+ ext_copy, dateopt);
if (j < 0)
goto end;
if (j > 0) {
@@ -942,11 +982,11 @@ end_of_options:
if (ss_cert_file != NULL) {
total++;
j = certify_cert(&x, ss_cert_file, certformat, passin, pkey,
- x509, dgst, sigopts, vfyopts, attribs,
- db, serial, subj, chtype, multirdn, email_dn,
- startdate, enddate, days, batch, extensions,
- conf, verbose, certopt, get_nameopt(), default_op,
- ext_copy, dateopt);
+ x509, dgst, sigopts, vfyopts, attribs,
+ db, serial, subj, chtype, multirdn, email_dn,
+ startdate, enddate, days, batch, extensions,
+ conf, verbose, certopt, get_nameopt(), default_op,
+ ext_copy, dateopt);
if (j < 0)
goto end;
if (j > 0) {
@@ -963,10 +1003,10 @@ end_of_options:
if (infile != NULL) {
total++;
j = certify(&x, infile, informat, pkey, x509p, dgst,
- sigopts, vfyopts, attribs, db,
- serial, subj, chtype, multirdn, email_dn, startdate,
- enddate, days, batch, extensions, conf, verbose,
- certopt, get_nameopt(), default_op, ext_copy, selfsign, dateopt);
+ sigopts, vfyopts, attribs, db,
+ serial, subj, chtype, multirdn, email_dn, startdate,
+ enddate, days, batch, extensions, conf, verbose,
+ certopt, get_nameopt(), default_op, ext_copy, selfsign, dateopt);
if (j < 0)
goto end;
if (j > 0) {
@@ -983,11 +1023,11 @@ end_of_options:
for (i = 0; i < argc; i++) {
total++;
j = certify(&x, argv[i], informat, pkey, x509p, dgst,
- sigopts, vfyopts,
- attribs, db,
- serial, subj, chtype, multirdn, email_dn, startdate,
- enddate, days, batch, extensions, conf, verbose,
- certopt, get_nameopt(), default_op, ext_copy, selfsign, dateopt);
+ sigopts, vfyopts,
+ attribs, db,
+ serial, subj, chtype, multirdn, email_dn, startdate,
+ enddate, days, batch, extensions, conf, verbose,
+ certopt, get_nameopt(), default_op, ext_copy, selfsign, dateopt);
if (j < 0)
goto end;
if (j > 0) {
@@ -1012,8 +1052,8 @@ end_of_options:
if (sk_X509_num(cert_sk) > 0) {
if (!batch) {
BIO_printf(bio_err,
- "\n%d out of %d certificate requests certified, commit? [y/n]",
- total_done, total);
+ "\n%d out of %d certificate requests certified, commit? [y/n]",
+ total_done, total);
(void)BIO_flush(bio_err);
tmp[0] = '\0';
if (fgets(tmp, sizeof(tmp), stdin) == NULL) {
@@ -1029,10 +1069,10 @@ end_of_options:
}
BIO_printf(bio_err, "Write out database with %d new entries\n",
- sk_X509_num(cert_sk));
+ sk_X509_num(cert_sk));
if (serialfile != NULL
- && !save_serial(serialfile, "new", serial, NULL))
+ && !save_serial(serialfile, "new", serial, NULL))
goto end;
if (!save_index(dbfile, "new", db))
@@ -1076,12 +1116,12 @@ end_of_options:
*(n++) = 'p';
*(n++) = 'e';
*(n++) = 'm';
- *n = '\0'; /* closing new_cert */
+ *n = '\0'; /* closing new_cert */
if (verbose)
BIO_printf(bio_err, "writing %s\n", new_cert);
Sout = bio_open_default(outfile, 'w',
- output_der ? FORMAT_ASN1 : FORMAT_TEXT);
+ output_der ? FORMAT_ASN1 : FORMAT_TEXT);
if (Sout == NULL)
goto end;
@@ -1100,7 +1140,7 @@ end_of_options:
if (sk_X509_num(cert_sk)) {
/* Rename the database and the serial file */
if (serialfile != NULL
- && !rotate_serial(serialfile, "new", "old"))
+ && !rotate_serial(serialfile, "new", "old"))
goto end;
if (!rotate_index(dbfile, "new", "old"))
@@ -1124,7 +1164,7 @@ end_of_options:
X509V3_set_nconf(&ctx, conf);
if (!X509V3_EXT_add_nconf(conf, &ctx, crl_ext, NULL)) {
BIO_printf(bio_err,
- "Error checking CRL extension section %s\n", crl_ext);
+ "Error checking CRL extension section %s\n", crl_ext);
ret = 1;
goto end;
}
@@ -1141,16 +1181,15 @@ end_of_options:
if (!crldays && !crlhours && !crlsec) {
if (!app_conf_try_number(conf, section,
- ENV_DEFAULT_CRL_DAYS, &crldays))
+ ENV_DEFAULT_CRL_DAYS, &crldays))
crldays = 0;
if (!app_conf_try_number(conf, section,
- ENV_DEFAULT_CRL_HOURS, &crlhours))
+ ENV_DEFAULT_CRL_HOURS, &crlhours))
crlhours = 0;
}
- if ((crl_nextupdate == NULL) &&
- (crldays == 0) && (crlhours == 0) && (crlsec == 0)) {
+ if ((crl_nextupdate == NULL) && (crldays == 0) && (crlhours == 0) && (crlsec == 0)) {
BIO_printf(bio_err,
- "cannot lookup how long until the next CRL is issued\n");
+ "cannot lookup how long until the next CRL is issued\n");
goto end;
}
@@ -1168,7 +1207,7 @@ end_of_options:
}
if (!set_crl_nextupdate(crl, crl_nextupdate,
- crldays, crlhours, crlsec)) {
+ crldays, crlhours, crlsec)) {
BIO_puts(bio_err, "error setting CRL nextUpdate\n");
ret = 1;
goto end;
@@ -1217,7 +1256,7 @@ end_of_options:
if (crl_ext != NULL)
if (!X509V3_EXT_CRL_add_nconf(conf, &crlctx, crl_ext, crl)) {
BIO_printf(bio_err,
- "Error adding CRL extensions from section %s\n", crl_ext);
+ "Error adding CRL extensions from section %s\n", crl_ext);
goto end;
}
if (crlnumberfile != NULL) {
@@ -1238,7 +1277,7 @@ end_of_options:
/* we have a CRL number that need updating */
if (crlnumberfile != NULL
- && !save_serial(crlnumberfile, "new", crlnumber, NULL))
+ && !save_serial(crlnumberfile, "new", crlnumber, NULL))
goto end;
BN_free(crlnumber);
@@ -1248,7 +1287,7 @@ end_of_options:
goto end;
Sout = bio_open_default(outfile, 'w',
- output_der ? FORMAT_ASN1 : FORMAT_TEXT);
+ output_der ? FORMAT_ASN1 : FORMAT_TEXT);
if (Sout == NULL)
goto end;
@@ -1256,9 +1295,8 @@ end_of_options:
/* Rename the crlnumber file */
if (crlnumberfile != NULL
- && !rotate_serial(crlnumberfile, "new", "old"))
+ && !rotate_serial(crlnumberfile, "new", "old"))
goto end;
-
}
/*****************************************************************/
if (dorevoke) {
@@ -1269,7 +1307,7 @@ end_of_options:
X509 *revcert;
revcert = load_cert_pass(infile, informat, 1, passin,
- "certificate to be revoked");
+ "certificate to be revoked");
if (revcert == NULL)
goto end;
if (dorevoke == 2)
@@ -1290,7 +1328,7 @@ end_of_options:
}
ret = 0;
- end:
+end:
if (ret)
ERR_print_errors(bio_err);
BIO_free_all(Sout);
@@ -1323,17 +1361,17 @@ static char *lookup_conf(const CONF *conf, const char *section, const char *tag)
}
static int certify(X509 **xret, const char *infile, int informat,
- EVP_PKEY *pkey, X509 *x509,
- const char *dgst,
- STACK_OF(OPENSSL_STRING) *sigopts,
- STACK_OF(OPENSSL_STRING) *vfyopts,
- STACK_OF(CONF_VALUE) *policy, CA_DB *db,
- BIGNUM *serial, const char *subj, unsigned long chtype,
- int multirdn, int email_dn, const char *startdate,
- const char *enddate,
- long days, int batch, const char *ext_sect, CONF *lconf,
- int verbose, unsigned long certopt, unsigned long nameopt,
- int default_op, int ext_copy, int selfsign, unsigned long dateopt)
+ EVP_PKEY *pkey, X509 *x509,
+ const char *dgst,
+ STACK_OF(OPENSSL_STRING) *sigopts,
+ STACK_OF(OPENSSL_STRING) *vfyopts,
+ STACK_OF(CONF_VALUE) *policy, CA_DB *db,
+ BIGNUM *serial, const char *subj, unsigned long chtype,
+ int multirdn, int email_dn, const char *startdate,
+ const char *enddate,
+ long days, int batch, const char *ext_sect, CONF *lconf,
+ int verbose, unsigned long certopt, unsigned long nameopt,
+ int default_op, int ext_copy, int selfsign, unsigned long dateopt)
{
X509_REQ *req = NULL;
EVP_PKEY *pktmp = NULL;
@@ -1354,7 +1392,7 @@ static int certify(X509 **xret, const char *infile, int informat,
if (selfsign && !X509_REQ_check_private_key(req, pkey)) {
BIO_printf(bio_err,
- "Certificate request and CA private key do not match\n");
+ "Certificate request and CA private key do not match\n");
goto end;
}
i = do_X509_REQ_verify(req, pktmp, vfyopts);
@@ -1364,33 +1402,33 @@ static int certify(X509 **xret, const char *infile, int informat,
}
if (i == 0) {
BIO_printf(bio_err,
- "Signature did not match the certificate request\n");
+ "Signature did not match the certificate request\n");
goto end;
}
BIO_printf(bio_err, "Signature ok\n");
ok = do_body(xret, pkey, x509, dgst, sigopts, policy, db, serial, subj,
- chtype, multirdn, email_dn, startdate, enddate, days, batch,
- verbose, req, ext_sect, lconf, certopt, nameopt, default_op,
- ext_copy, selfsign, dateopt);
+ chtype, multirdn, email_dn, startdate, enddate, days, batch,
+ verbose, req, ext_sect, lconf, certopt, nameopt, default_op,
+ ext_copy, selfsign, dateopt);
- end:
+end:
ERR_print_errors(bio_err);
X509_REQ_free(req);
return ok;
}
static int certify_cert(X509 **xret, const char *infile, int certformat,
- const char *passin, EVP_PKEY *pkey, X509 *x509,
- const char *dgst,
- STACK_OF(OPENSSL_STRING) *sigopts,
- STACK_OF(OPENSSL_STRING) *vfyopts,
- STACK_OF(CONF_VALUE) *policy, CA_DB *db,
- BIGNUM *serial, const char *subj, unsigned long chtype,
- int multirdn, int email_dn, const char *startdate,
- const char *enddate, long days, int batch, const char *ext_sect,
- CONF *lconf, int verbose, unsigned long certopt,
- unsigned long nameopt, int default_op, int ext_copy, unsigned long dateopt)
+ const char *passin, EVP_PKEY *pkey, X509 *x509,
+ const char *dgst,
+ STACK_OF(OPENSSL_STRING) *sigopts,
+ STACK_OF(OPENSSL_STRING) *vfyopts,
+ STACK_OF(CONF_VALUE) *policy, CA_DB *db,
+ BIGNUM *serial, const char *subj, unsigned long chtype,
+ int multirdn, int email_dn, const char *startdate,
+ const char *enddate, long days, int batch, const char *ext_sect,
+ CONF *lconf, int verbose, unsigned long certopt,
+ unsigned long nameopt, int default_op, int ext_copy, unsigned long dateopt)
{
X509 *template_cert = NULL;
X509_REQ *rreq = NULL;
@@ -1398,7 +1436,8 @@ static int certify_cert(X509 **xret, const char *infile, int certformat,
int ok = -1, i;
if ((template_cert = load_cert_pass(infile, certformat, 1, passin,
- "template certificate")) == NULL)
+ "template certificate"))
+ == NULL)
goto end;
if (verbose)
X509_print(bio_err, template_cert);
@@ -1427,24 +1466,24 @@ static int certify_cert(X509 **xret, const char *infile, int certformat,
goto end;
ok = do_body(xret, pkey, x509, dgst, sigopts, policy, db, serial, subj,
- chtype, multirdn, email_dn, startdate, enddate, days, batch,
- verbose, rreq, ext_sect, lconf, certopt, nameopt, default_op,
- ext_copy, 0, dateopt);
+ chtype, multirdn, email_dn, startdate, enddate, days, batch,
+ verbose, rreq, ext_sect, lconf, certopt, nameopt, default_op,
+ ext_copy, 0, dateopt);
- end:
+end:
X509_REQ_free(rreq);
X509_free(template_cert);
return ok;
}
static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
- const char *dgst, STACK_OF(OPENSSL_STRING) *sigopts,
- STACK_OF(CONF_VALUE) *policy, CA_DB *db, BIGNUM *serial,
- const char *subj, unsigned long chtype, int multirdn,
- int email_dn, const char *startdate, const char *enddate, long days,
- int batch, int verbose, X509_REQ *req, const char *ext_sect,
- CONF *lconf, unsigned long certopt, unsigned long nameopt,
- int default_op, int ext_copy, int selfsign, unsigned long dateopt)
+ const char *dgst, STACK_OF(OPENSSL_STRING) *sigopts,
+ STACK_OF(CONF_VALUE) *policy, CA_DB *db, BIGNUM *serial,
+ const char *subj, unsigned long chtype, int multirdn,
+ int email_dn, const char *startdate, const char *enddate, long days,
+ int batch, int verbose, X509_REQ *req, const char *ext_sect,
+ CONF *lconf, unsigned long certopt, unsigned long nameopt,
+ int default_op, int ext_copy, int selfsign, unsigned long dateopt)
{
const X509_NAME *name = NULL;
X509_NAME *CAname = NULL, *subject = NULL;
@@ -1506,16 +1545,14 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
/* check some things */
if (nid == NID_pkcs9_emailAddress && str->type != V_ASN1_IA5STRING) {
BIO_printf(bio_err,
- "\nemailAddress type needs to be of type IA5STRING\n");
+ "\nemailAddress type needs to be of type IA5STRING\n");
goto end;
}
if (str->type != V_ASN1_BMPSTRING && str->type != V_ASN1_UTF8STRING) {
j = ASN1_PRINTABLE_type(str->data, str->length);
- if ((j == V_ASN1_T61STRING && str->type != V_ASN1_T61STRING) ||
- (j == V_ASN1_IA5STRING && str->type == V_ASN1_PRINTABLESTRING))
- {
+ if ((j == V_ASN1_T61STRING && str->type != V_ASN1_T61STRING) || (j == V_ASN1_IA5STRING && str->type == V_ASN1_PRINTABLESTRING)) {
BIO_printf(bio_err,
- "\nThe string contains characters that are illegal for the ASN.1 type\n");
+ "\nThe string contains characters that are illegal for the ASN.1 type\n");
goto end;
}
}
@@ -1543,8 +1580,8 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
cv = sk_CONF_VALUE_value(policy, i); /* get the object id */
if ((j = OBJ_txt2nid(cv->name)) == NID_undef) {
BIO_printf(bio_err,
- "%s:unknown object type in 'policy' configuration\n",
- cv->name);
+ "%s:unknown object type in 'policy' configuration\n",
+ cv->name);
goto end;
}
obj = OBJ_nid2obj(j);
@@ -1571,8 +1608,8 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
} else if (strcmp(cv->value, "supplied") == 0) {
if (tne == NULL) {
BIO_printf(bio_err,
- "The %s field needed to be supplied and was missing\n",
- cv->name);
+ "The %s field needed to be supplied and was missing\n",
+ cv->name);
goto end;
} else {
push = tne;
@@ -1582,19 +1619,20 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
if (tne == NULL) {
BIO_printf(bio_err,
- "The mandatory %s field was missing\n",
- cv->name);
+ "The mandatory %s field was missing\n",
+ cv->name);
goto end;
}
last2 = -1;
- again2:
+ again2:
j = X509_NAME_get_index_by_OBJ(CAname, obj, last2);
if ((j < 0) && (last2 == -1)) {
BIO_printf(bio_err,
- "The %s field does not exist in the CA certificate,\n"
- "the 'policy' is misconfigured\n", cv->name);
+ "The %s field does not exist in the CA certificate,\n"
+ "the 'policy' is misconfigured\n",
+ cv->name);
goto end;
}
if (j >= 0) {
@@ -1607,17 +1645,17 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
}
if (j < 0) {
BIO_printf(bio_err,
- "The %s field is different between\n"
- "CA certificate (%s) and the request (%s)\n",
- cv->name,
- ((str2 == NULL) ? "NULL" : (char *)str2->data),
- ((str == NULL) ? "NULL" : (char *)str->data));
+ "The %s field is different between\n"
+ "CA certificate (%s) and the request (%s)\n",
+ cv->name,
+ ((str2 == NULL) ? "NULL" : (char *)str2->data),
+ ((str == NULL) ? "NULL" : (char *)str->data));
goto end;
}
} else {
BIO_printf(bio_err,
- "%s:invalid type in 'policy' configuration\n",
- cv->value);
+ "%s:invalid type in 'policy' configuration\n",
+ cv->value);
goto end;
}
@@ -1643,7 +1681,7 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
/* We are now totally happy, lets make and sign the certificate */
if (verbose)
BIO_printf(bio_err,
- "Everything appears to be ok, creating and signing the certificate\n");
+ "Everything appears to be ok, creating and signing the certificate\n");
if ((ret = X509_new_ex(app_get0_libctx(), app_get0_propq())) == NULL)
goto end;
@@ -1679,15 +1717,15 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
/* Initialize the context structure */
X509V3_set_ctx(&ext_ctx, selfsign ? ret : x509,
- ret, NULL /* no need to give req, needed info is in ret */,
- NULL, X509V3_CTX_REPLACE);
+ ret, NULL /* no need to give req, needed info is in ret */,
+ NULL, X509V3_CTX_REPLACE);
/* prepare fallback for AKID, but only if issuer cert equals subject cert */
if (selfsign) {
if (!X509V3_set_issuer_pkey(&ext_ctx, pkey))
goto end;
if (!cert_matches_key(ret, pkey))
BIO_printf(bio_err,
- "Warning: Signature key and public key of cert do not match\n");
+ "Warning: Signature key and public key of cert do not match\n");
}
/* Lets add the extensions, if there are any */
@@ -1702,27 +1740,27 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
/* Adds exts contained in the configuration file */
if (!X509V3_EXT_add_nconf(extfile_conf, &ext_ctx, ext_sect, ret)) {
BIO_printf(bio_err,
- "Error adding certificate extensions from extfile section %s\n",
- ext_sect);
+ "Error adding certificate extensions from extfile section %s\n",
+ ext_sect);
goto end;
}
if (verbose)
BIO_printf(bio_err,
- "Successfully added extensions from file.\n");
+ "Successfully added extensions from file.\n");
} else if (ext_sect) {
/* We found extensions to be set from config file */
X509V3_set_nconf(&ext_ctx, lconf);
if (!X509V3_EXT_add_nconf(lconf, &ext_ctx, ext_sect, ret)) {
BIO_printf(bio_err,
- "Error adding certificate extensions from config section %s\n",
- ext_sect);
+ "Error adding certificate extensions from config section %s\n",
+ ext_sect);
goto end;
}
if (verbose)
BIO_printf(bio_err,
- "Successfully added extensions from config\n");
+ "Successfully added extensions from config\n");
}
}
@@ -1735,7 +1773,7 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
if (verbose)
BIO_printf(bio_err,
- "The subject name appears to be ok, checking database for clashes\n");
+ "The subject name appears to be ok, checking database for clashes\n");
/* Build the correct Subject if no e-mail is wanted in the subject. */
if (!email_dn) {
@@ -1752,8 +1790,9 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
}
i = -1;
while ((i = X509_NAME_get_index_by_NID(dn_subject,
- NID_pkcs9_emailAddress,
- i)) >= 0) {
+ NID_pkcs9_emailAddress,
+ i))
+ >= 0) {
tmpne = X509_NAME_delete_entry(dn_subject, i--);
X509_NAME_ENTRY_free(tmpne);
}
@@ -1800,18 +1839,18 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
rrow = TXT_DB_get_by_index(db->db, DB_name, crow);
if (rrow != NULL) {
BIO_printf(bio_err,
- "ERROR:There is already a certificate for %s\n",
- row[DB_name]);
+ "ERROR:There is already a certificate for %s\n",
+ row[DB_name]);
}
}
if (rrow == NULL) {
rrow = TXT_DB_get_by_index(db->db, DB_serial, row);
if (rrow != NULL) {
BIO_printf(bio_err,
- "ERROR:Serial number %s has already been issued,\n",
- row[DB_serial]);
+ "ERROR:Serial number %s has already been issued,\n",
+ row[DB_serial]);
BIO_printf(bio_err,
- " check the database/serial_file for corruption\n");
+ " check the database/serial_file for corruption\n");
}
}
@@ -1848,7 +1887,7 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
if (p == NULL)
p = "undef";
BIO_printf(bio_err, "Subject Name :%s\n", p);
- ok = -1; /* This is now a 'bad' error. */
+ ok = -1; /* This is now a 'bad' error. */
goto end;
}
@@ -1874,7 +1913,7 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
buf[0] = '\0';
if (fgets(buf, sizeof(buf), stdin) == NULL) {
BIO_printf(bio_err,
- "CERTIFICATE WILL NOT BE CERTIFIED: I/O error\n");
+ "CERTIFICATE WILL NOT BE CERTIFIED: I/O error\n");
ok = 0;
goto end;
}
@@ -1886,8 +1925,7 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
}
pktmp = X509_get0_pubkey(ret);
- if (EVP_PKEY_missing_parameters(pktmp) &&
- !EVP_PKEY_missing_parameters(pkey))
+ if (EVP_PKEY_missing_parameters(pktmp) && !EVP_PKEY_missing_parameters(pkey))
EVP_PKEY_copy_parameters(pktmp, pkey);
if (!do_X509_sign(ret, 0, pkey, dgst, sigopts, &ext_ctx))
@@ -1919,7 +1957,7 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
}
irow = NULL;
ok = 1;
- end:
+end:
if (ok != 1) {
for (i = 0; i < DB_NUMBER; i++)
OPENSSL_free(row[i]);
@@ -1948,14 +1986,14 @@ static void write_new_certificate(BIO *bp, X509 *x, int output_der, int notext)
}
static int certify_spkac(X509 **xret, const char *infile, EVP_PKEY *pkey,
- X509 *x509, const char *dgst,
- STACK_OF(OPENSSL_STRING) *sigopts,
- STACK_OF(CONF_VALUE) *policy, CA_DB *db,
- BIGNUM *serial, const char *subj, unsigned long chtype,
- int multirdn, int email_dn, const char *startdate,
- const char *enddate, long days, const char *ext_sect,
- CONF *lconf, int verbose, unsigned long certopt,
- unsigned long nameopt, int default_op, int ext_copy, unsigned long dateopt)
+ X509 *x509, const char *dgst,
+ STACK_OF(OPENSSL_STRING) *sigopts,
+ STACK_OF(CONF_VALUE) *policy, CA_DB *db,
+ BIGNUM *serial, const char *subj, unsigned long chtype,
+ int multirdn, int email_dn, const char *startdate,
+ const char *enddate, long days, const char *ext_sect,
+ CONF *lconf, int verbose, unsigned long certopt,
+ unsigned long nameopt, int default_op, int ext_copy, unsigned long dateopt)
{
STACK_OF(CONF_VALUE) *sk = NULL;
LHASH_OF(CONF_VALUE) *parms = NULL;
@@ -2026,7 +2064,7 @@ static int certify_spkac(X509 **xret, const char *infile, EVP_PKEY *pkey,
spki = NETSCAPE_SPKI_b64_decode(cv->value, -1);
if (spki == NULL) {
BIO_printf(bio_err,
- "unable to load Netscape SPKAC structure\n");
+ "unable to load Netscape SPKAC structure\n");
goto end;
}
}
@@ -2034,12 +2072,12 @@ static int certify_spkac(X509 **xret, const char *infile, EVP_PKEY *pkey,
}
if (!X509_NAME_add_entry_by_NID(n, nid, chtype,
- (unsigned char *)buf, -1, -1, 0))
+ (unsigned char *)buf, -1, -1, 0))
goto end;
}
if (spki == NULL) {
BIO_printf(bio_err, "Netscape SPKAC structure not found in %s\n",
- infile);
+ infile);
goto end;
}
@@ -2058,7 +2096,7 @@ static int certify_spkac(X509 **xret, const char *infile, EVP_PKEY *pkey,
if (j <= 0) {
EVP_PKEY_free(pktmp);
BIO_printf(bio_err,
- "signature verification failed on SPKAC public key\n");
+ "signature verification failed on SPKAC public key\n");
goto end;
}
BIO_printf(bio_err, "Signature ok\n");
@@ -2066,10 +2104,10 @@ static int certify_spkac(X509 **xret, const char *infile, EVP_PKEY *pkey,
X509_REQ_set_pubkey(req, pktmp);
EVP_PKEY_free(pktmp);
ok = do_body(xret, pkey, x509, dgst, sigopts, policy, db, serial, subj,
- chtype, multirdn, email_dn, startdate, enddate, days, 1,
- verbose, req, ext_sect, lconf, certopt, nameopt, default_op,
- ext_copy, 0, dateopt);
- end:
+ chtype, multirdn, email_dn, startdate, enddate, days, 1,
+ verbose, req, ext_sect, lconf, certopt, nameopt, default_op,
+ ext_copy, 0, dateopt);
+end:
X509_REQ_free(req);
CONF_free(parms);
NETSCAPE_SPKI_free(spki);
@@ -2084,7 +2122,7 @@ static int check_time_format(const char *str)
}
static int do_revoke(X509 *x509, CA_DB *db, REVINFO_TYPE rev_type,
- const char *value)
+ const char *value)
{
const ASN1_TIME *tm = NULL;
char *row[DB_NUMBER], **rrow, **irow;
@@ -2119,8 +2157,8 @@ static int do_revoke(X509 *x509, CA_DB *db, REVINFO_TYPE rev_type,
rrow = TXT_DB_get_by_index(db->db, DB_serial, row);
if (rrow == NULL) {
BIO_printf(bio_err,
- "Adding Entry with serial number %s to DB for %s\n",
- row[DB_serial], row[DB_name]);
+ "Adding Entry with serial number %s to DB for %s\n",
+ row[DB_serial], row[DB_name]);
/* We now just add it to the database as DB_TYPE_REV('V') */
row[DB_type] = OPENSSL_strdup("V");
@@ -2165,11 +2203,11 @@ static int do_revoke(X509 *x509, CA_DB *db, REVINFO_TYPE rev_type,
goto end;
} else if (rev_type == REV_VALID) {
BIO_printf(bio_err, "ERROR:Already present, serial number %s\n",
- row[DB_serial]);
+ row[DB_serial]);
goto end;
} else if (rrow[DB_type][0] == DB_TYPE_REV) {
BIO_printf(bio_err, "ERROR:Already revoked, serial number %s\n",
- row[DB_serial]);
+ row[DB_serial]);
goto end;
} else {
BIO_printf(bio_err, "Revoking Certificate %s.\n", rrow[DB_serial]);
@@ -2183,7 +2221,7 @@ static int do_revoke(X509 *x509, CA_DB *db, REVINFO_TYPE rev_type,
rrow[DB_rev_date] = rev_str;
}
ok = 1;
- end:
+end:
for (i = 0; i < DB_NUMBER; i++)
OPENSSL_free(row[i]);
return ok;
@@ -2230,26 +2268,26 @@ static int get_certificate_status(const char *serial, CA_DB *db)
goto end;
} else if (rrow[DB_type][0] == DB_TYPE_VAL) {
BIO_printf(bio_err, "%s=Valid (%c)\n",
- row[DB_serial], rrow[DB_type][0]);
+ row[DB_serial], rrow[DB_type][0]);
goto end;
} else if (rrow[DB_type][0] == DB_TYPE_REV) {
BIO_printf(bio_err, "%s=Revoked (%c)\n",
- row[DB_serial], rrow[DB_type][0]);
+ row[DB_serial], rrow[DB_type][0]);
goto end;
} else if (rrow[DB_type][0] == DB_TYPE_EXP) {
BIO_printf(bio_err, "%s=Expired (%c)\n",
- row[DB_serial], rrow[DB_type][0]);
+ row[DB_serial], rrow[DB_type][0]);
goto end;
} else if (rrow[DB_type][0] == DB_TYPE_SUSP) {
BIO_printf(bio_err, "%s=Suspended (%c)\n",
- row[DB_serial], rrow[DB_type][0]);
+ row[DB_serial], rrow[DB_type][0]);
goto end;
} else {
BIO_printf(bio_err, "%s=Unknown (%c).\n",
- row[DB_serial], rrow[DB_type][0]);
+ row[DB_serial], rrow[DB_type][0]);
ok = -1;
}
- end:
+end:
for (i = 0; i < DB_NUMBER; i++) {
OPENSSL_free(row[i]);
}
@@ -2376,8 +2414,8 @@ static char *make_revocation_str(REVINFO_TYPE rev_type, const char *rev_arg)
/* Argument is the key compromise time */
if (!ASN1_GENERALIZEDTIME_set_string(NULL, rev_arg)) {
BIO_printf(bio_err,
- "Invalid time format %s. Need YYYYMMDDHHMMSSZ\n",
- rev_arg);
+ "Invalid time format %s. Need YYYYMMDDHHMMSSZ\n",
+ rev_arg);
return NULL;
}
other = rev_arg;
@@ -2451,13 +2489,11 @@ static int make_revoked(X509_REVOKED *rev, const char *str)
}
if (rev && comp_time) {
- if (X509_REVOKED_add1_ext_i2d
- (rev, NID_invalidity_date, comp_time, 0, 0) <= 0)
+ if (X509_REVOKED_add1_ext_i2d(rev, NID_invalidity_date, comp_time, 0, 0) <= 0)
goto end;
}
if (rev && hold) {
- if (X509_REVOKED_add1_ext_i2d
- (rev, NID_hold_instruction_code, hold, 0, 0) <= 0)
+ if (X509_REVOKED_add1_ext_i2d(rev, NID_hold_instruction_code, hold, 0, 0) <= 0)
goto end;
}
@@ -2466,7 +2502,7 @@ static int make_revoked(X509_REVOKED *rev, const char *str)
else
ret = 1;
- end:
+end:
OPENSSL_free(tmp);
ASN1_OBJECT_free(hold);
@@ -2519,7 +2555,7 @@ static int old_entry_print(const ASN1_OBJECT *obj, const ASN1_STRING *str)
}
int unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold,
- ASN1_GENERALIZEDTIME **pinvtm, const char *str)
+ ASN1_GENERALIZEDTIME **pinvtm, const char *str)
{
char *tmp;
char *rtime_str, *reason_str = NULL, *arg_str = NULL, *p;
@@ -2621,7 +2657,7 @@ int unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold,
ret = 1;
- end:
+end:
OPENSSL_free(tmp);
ASN1_GENERALIZEDTIME_free(comp_time);
diff --git a/apps/ciphers.c b/apps/ciphers.c
index c33685d8ce..dc52b9f912 100644
--- a/apps/ciphers.c
+++ b/apps/ciphers.c
@@ -28,58 +28,61 @@ typedef enum OPTION_choice {
OPT_PSK,
OPT_SRP,
OPT_CIPHERSUITES,
- OPT_V, OPT_UPPER_V, OPT_S, OPT_PROV_ENUM
+ OPT_V,
+ OPT_UPPER_V,
+ OPT_S,
+ OPT_PROV_ENUM
} OPTION_CHOICE;
const OPTIONS ciphers_options[] = {
- {OPT_HELP_STR, 1, '-', "Usage: %s [options] [cipher]\n"},
+ { OPT_HELP_STR, 1, '-', "Usage: %s [options] [cipher]\n" },
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
+ { "help", OPT_HELP, '-', "Display this summary" },
OPT_SECTION("Output"),
- {"v", OPT_V, '-', "Verbose listing of the SSL/TLS ciphers"},
- {"V", OPT_UPPER_V, '-', "Even more verbose"},
- {"stdname", OPT_STDNAME, '-', "Show standard cipher names"},
- {"convert", OPT_CONVERT, 's', "Convert standard name into OpenSSL name"},
+ { "v", OPT_V, '-', "Verbose listing of the SSL/TLS ciphers" },
+ { "V", OPT_UPPER_V, '-', "Even more verbose" },
+ { "stdname", OPT_STDNAME, '-', "Show standard cipher names" },
+ { "convert", OPT_CONVERT, 's', "Convert standard name into OpenSSL name" },
OPT_SECTION("Cipher specification"),
- {"s", OPT_S, '-', "Only supported ciphers"},
+ { "s", OPT_S, '-', "Only supported ciphers" },
#ifndef OPENSSL_NO_SSL3
- {"ssl3", OPT_SSL3, '-', "Ciphers compatible with SSL3"},
+ { "ssl3", OPT_SSL3, '-', "Ciphers compatible with SSL3" },
#endif
#ifndef OPENSSL_NO_TLS1
- {"tls1", OPT_TLS1, '-', "Ciphers compatible with TLS1"},
+ { "tls1", OPT_TLS1, '-', "Ciphers compatible with TLS1" },
#endif
#ifndef OPENSSL_NO_TLS1_1
- {"tls1_1", OPT_TLS1_1, '-', "Ciphers compatible with TLS1.1"},
+ { "tls1_1", OPT_TLS1_1, '-', "Ciphers compatible with TLS1.1" },
#endif
#ifndef OPENSSL_NO_TLS1_2
- {"tls1_2", OPT_TLS1_2, '-', "Ciphers compatible with TLS1.2"},
+ { "tls1_2", OPT_TLS1_2, '-', "Ciphers compatible with TLS1.2" },
#endif
#ifndef OPENSSL_NO_TLS1_3
- {"tls1_3", OPT_TLS1_3, '-', "Ciphers compatible with TLS1.3"},
+ { "tls1_3", OPT_TLS1_3, '-', "Ciphers compatible with TLS1.3" },
#endif
#ifndef OPENSSL_NO_PSK
- {"psk", OPT_PSK, '-', "Include ciphersuites requiring PSK"},
+ { "psk", OPT_PSK, '-', "Include ciphersuites requiring PSK" },
#endif
#ifndef OPENSSL_NO_SRP
- {"srp", OPT_SRP, '-', "(deprecated) Include ciphersuites requiring SRP"},
+ { "srp", OPT_SRP, '-', "(deprecated) Include ciphersuites requiring SRP" },
#endif
- {"ciphersuites", OPT_CIPHERSUITES, 's',
- "Configure the TLSv1.3 ciphersuites to use"},
+ { "ciphersuites", OPT_CIPHERSUITES, 's',
+ "Configure the TLSv1.3 ciphersuites to use" },
OPT_PROV_OPTIONS,
OPT_PARAMETERS(),
- {"cipher", 0, 0, "Cipher string to decode (optional)"},
- {NULL}
+ { "cipher", 0, 0, "Cipher string to decode (optional)" },
+ { NULL }
};
#ifndef OPENSSL_NO_PSK
static unsigned int dummy_psk(SSL *ssl, const char *hint, char *identity,
- unsigned int max_identity_len,
- unsigned char *psk,
- unsigned int max_psk_len)
+ unsigned int max_identity_len,
+ unsigned char *psk,
+ unsigned int max_psk_len)
{
return 0;
}
@@ -110,7 +113,7 @@ int ciphers_main(int argc, char **argv)
switch (o) {
case OPT_EOF:
case OPT_ERR:
- opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
case OPT_HELP:
@@ -181,7 +184,7 @@ int ciphers_main(int argc, char **argv)
if (convert != NULL) {
BIO_printf(bio_out, "OpenSSL cipher name: %s\n",
- OPENSSL_cipher_name(convert));
+ OPENSSL_cipher_name(convert));
ret = 0;
goto end;
}
@@ -273,9 +276,9 @@ int ciphers_main(int argc, char **argv)
ret = 0;
goto end;
- err:
+err:
ERR_print_errors(bio_err);
- end:
+end:
if (use_supported)
sk_SSL_CIPHER_free(sk);
SSL_CTX_free(ctx);
diff --git a/apps/cmp.c b/apps/cmp.c
index dc69a64ab7..126e1412cb 100644
--- a/apps/cmp.c
+++ b/apps/cmp.c
@@ -24,10 +24,10 @@
/* tweaks needed due to missing unistd.h on Windows */
#if defined(_WIN32) && !defined(__BORLANDC__)
-# define access _access
+#define access _access
#endif
#ifndef F_OK
-# define F_OK 0
+#define F_OK 0
#endif
#include <openssl/ui.h>
@@ -151,7 +151,7 @@ static int opt_revreason = CRL_REASON_NONE;
/* credentials format */
static char *opt_certform_s = "PEM";
static int opt_certform = FORMAT_PEM;
-/*
+/*
* DER format is the preferred choice for saving a CRL because it allows for
* more efficient storage, especially when dealing with large CRLs.
*/
@@ -228,400 +228,472 @@ static X509_VERIFY_PARAM *vpm = NULL;
typedef enum OPTION_choice {
OPT_COMMON,
- OPT_CONFIG, OPT_SECTION, OPT_VERBOSITY,
-
- OPT_CMD, OPT_INFOTYPE, OPT_PROFILE, OPT_GENINFO,
- OPT_TEMPLATE, OPT_KEYSPEC,
-
- OPT_NEWKEY, OPT_NEWKEYPASS, OPT_CENTRALKEYGEN,
- OPT_NEWKEYOUT, OPT_SUBJECT,
- OPT_DAYS, OPT_REQEXTS,
- OPT_SANS, OPT_SAN_NODEFAULT,
- OPT_POLICIES, OPT_POLICY_OIDS, OPT_POLICY_OIDS_CRITICAL,
- OPT_POPO, OPT_CSR,
- OPT_OUT_TRUSTED, OPT_IMPLICIT_CONFIRM, OPT_DISABLE_CONFIRM,
- OPT_CERTOUT, OPT_CHAINOUT,
-
- OPT_OLDCERT, OPT_ISSUER, OPT_SERIAL, OPT_REVREASON,
+ OPT_CONFIG,
+ OPT_SECTION,
+ OPT_VERBOSITY,
+
+ OPT_CMD,
+ OPT_INFOTYPE,
+ OPT_PROFILE,
+ OPT_GENINFO,
+ OPT_TEMPLATE,
+ OPT_KEYSPEC,
+
+ OPT_NEWKEY,
+ OPT_NEWKEYPASS,
+ OPT_CENTRALKEYGEN,
+ OPT_NEWKEYOUT,
+ OPT_SUBJECT,
+ OPT_DAYS,
+ OPT_REQEXTS,
+ OPT_SANS,
+ OPT_SAN_NODEFAULT,
+ OPT_POLICIES,
+ OPT_POLICY_OIDS,
+ OPT_POLICY_OIDS_CRITICAL,
+ OPT_POPO,
+ OPT_CSR,
+ OPT_OUT_TRUSTED,
+ OPT_IMPLICIT_CONFIRM,
+ OPT_DISABLE_CONFIRM,
+ OPT_CERTOUT,
+ OPT_CHAINOUT,
+
+ OPT_OLDCERT,
+ OPT_ISSUER,
+ OPT_SERIAL,
+ OPT_REVREASON,
#if !defined(OPENSSL_NO_SOCK) && !defined(OPENSSL_NO_HTTP)
- OPT_SERVER, OPT_PROXY, OPT_NO_PROXY,
+ OPT_SERVER,
+ OPT_PROXY,
+ OPT_NO_PROXY,
#endif
- OPT_RECIPIENT, OPT_PATH,
- OPT_KEEP_ALIVE, OPT_MSG_TIMEOUT, OPT_TOTAL_TIMEOUT,
-
- OPT_TRUSTED, OPT_UNTRUSTED, OPT_SRVCERT,
+ OPT_RECIPIENT,
+ OPT_PATH,
+ OPT_KEEP_ALIVE,
+ OPT_MSG_TIMEOUT,
+ OPT_TOTAL_TIMEOUT,
+
+ OPT_TRUSTED,
+ OPT_UNTRUSTED,
+ OPT_SRVCERT,
OPT_EXPECT_SENDER,
- OPT_IGNORE_KEYUSAGE, OPT_UNPROTECTED_ERRORS, OPT_NO_CACHE_EXTRACERTS,
- OPT_SRVCERTOUT, OPT_EXTRACERTSOUT, OPT_CACERTSOUT,
- OPT_OLDWITHOLD, OPT_NEWWITHNEW, OPT_NEWWITHOLD, OPT_OLDWITHNEW,
- OPT_CRLCERT, OPT_OLDCRL, OPT_CRLOUT,
-
- OPT_REF, OPT_SECRET, OPT_CERT, OPT_OWN_TRUSTED, OPT_KEY, OPT_KEYPASS,
- OPT_DIGEST, OPT_MAC, OPT_EXTRACERTS,
+ OPT_IGNORE_KEYUSAGE,
+ OPT_UNPROTECTED_ERRORS,
+ OPT_NO_CACHE_EXTRACERTS,
+ OPT_SRVCERTOUT,
+ OPT_EXTRACERTSOUT,
+ OPT_CACERTSOUT,
+ OPT_OLDWITHOLD,
+ OPT_NEWWITHNEW,
+ OPT_NEWWITHOLD,
+ OPT_OLDWITHNEW,
+ OPT_CRLCERT,
+ OPT_OLDCRL,
+ OPT_CRLOUT,
+
+ OPT_REF,
+ OPT_SECRET,
+ OPT_CERT,
+ OPT_OWN_TRUSTED,
+ OPT_KEY,
+ OPT_KEYPASS,
+ OPT_DIGEST,
+ OPT_MAC,
+ OPT_EXTRACERTS,
OPT_UNPROTECTED_REQUESTS,
- OPT_CERTFORM, OPT_CRLFORM, OPT_KEYFORM,
+ OPT_CERTFORM,
+ OPT_CRLFORM,
+ OPT_KEYFORM,
OPT_OTHERPASS,
OPT_PROV_ENUM,
OPT_R_ENUM,
#if !defined(OPENSSL_NO_SOCK) && !defined(OPENSSL_NO_HTTP)
- OPT_TLS_USED, OPT_TLS_CERT, OPT_TLS_KEY,
+ OPT_TLS_USED,
+ OPT_TLS_CERT,
+ OPT_TLS_KEY,
OPT_TLS_KEYPASS,
- OPT_TLS_EXTRA, OPT_TLS_TRUSTED, OPT_TLS_HOST,
+ OPT_TLS_EXTRA,
+ OPT_TLS_TRUSTED,
+ OPT_TLS_HOST,
#endif
- OPT_BATCH, OPT_REPEAT,
- OPT_REQIN, OPT_REQIN_NEW_TID, OPT_REQOUT, OPT_REQOUT_ONLY,
- OPT_RSPIN, OPT_RSPOUT,
+ OPT_BATCH,
+ OPT_REPEAT,
+ OPT_REQIN,
+ OPT_REQIN_NEW_TID,
+ OPT_REQOUT,
+ OPT_REQOUT_ONLY,
+ OPT_RSPIN,
+ OPT_RSPOUT,
OPT_USE_MOCK_SRV,
#if !defined(OPENSSL_NO_SOCK) && !defined(OPENSSL_NO_HTTP)
- OPT_PORT, OPT_MAX_MSGS,
+ OPT_PORT,
+ OPT_MAX_MSGS,
#endif
- OPT_SRV_REF, OPT_SRV_SECRET,
- OPT_SRV_CERT, OPT_SRV_KEY, OPT_SRV_KEYPASS,
- OPT_SRV_TRUSTED, OPT_SRV_UNTRUSTED,
- OPT_REF_CERT, OPT_RSP_CERT, OPT_RSP_KEY, OPT_RSP_KEYPASS,
- OPT_RSP_CRL, OPT_RSP_EXTRACERTS, OPT_RSP_CAPUBS,
- OPT_RSP_NEWWITHNEW, OPT_RSP_NEWWITHOLD, OPT_RSP_OLDWITHNEW,
- OPT_POLL_COUNT, OPT_CHECK_AFTER,
+ OPT_SRV_REF,
+ OPT_SRV_SECRET,
+ OPT_SRV_CERT,
+ OPT_SRV_KEY,
+ OPT_SRV_KEYPASS,
+ OPT_SRV_TRUSTED,
+ OPT_SRV_UNTRUSTED,
+ OPT_REF_CERT,
+ OPT_RSP_CERT,
+ OPT_RSP_KEY,
+ OPT_RSP_KEYPASS,
+ OPT_RSP_CRL,
+ OPT_RSP_EXTRACERTS,
+ OPT_RSP_CAPUBS,
+ OPT_RSP_NEWWITHNEW,
+ OPT_RSP_NEWWITHOLD,
+ OPT_RSP_OLDWITHNEW,
+ OPT_POLL_COUNT,
+ OPT_CHECK_AFTER,
OPT_GRANT_IMPLICITCONF,
- OPT_PKISTATUS, OPT_FAILURE,
- OPT_FAILUREBITS, OPT_STATUSSTRING,
- OPT_SEND_ERROR, OPT_SEND_UNPROTECTED,
- OPT_SEND_UNPROT_ERR, OPT_ACCEPT_UNPROTECTED,
- OPT_ACCEPT_UNPROT_ERR, OPT_ACCEPT_RAVERIFIED,
+ OPT_PKISTATUS,
+ OPT_FAILURE,
+ OPT_FAILUREBITS,
+ OPT_STATUSSTRING,
+ OPT_SEND_ERROR,
+ OPT_SEND_UNPROTECTED,
+ OPT_SEND_UNPROT_ERR,
+ OPT_ACCEPT_UNPROTECTED,
+ OPT_ACCEPT_UNPROT_ERR,
+ OPT_ACCEPT_RAVERIFIED,
OPT_V_ENUM
} OPTION_CHOICE;
const OPTIONS cmp_options[] = {
/* entries must be in the same order as enumerated above!! */
- {"help", OPT_HELP, '-', "Display this summary"},
- {"config", OPT_CONFIG, 's',
- "Configuration file to use. \"\" = none. Default from env variable OPENSSL_CONF"},
- {"section", OPT_SECTION, 's',
- "Section(s) in config file to get options from. \"\" = 'default'. Default 'cmp'"},
- {"verbosity", OPT_VERBOSITY, 'N',
- "Log level; 3=ERR, 4=WARN, 6=INFO, 7=DEBUG, 8=TRACE. Default 6 = INFO"},
+ { "help", OPT_HELP, '-', "Display this summary" },
+ { "config", OPT_CONFIG, 's',
+ "Configuration file to use. \"\" = none. Default from env variable OPENSSL_CONF" },
+ { "section", OPT_SECTION, 's',
+ "Section(s) in config file to get options from. \"\" = 'default'. Default 'cmp'" },
+ { "verbosity", OPT_VERBOSITY, 'N',
+ "Log level; 3=ERR, 4=WARN, 6=INFO, 7=DEBUG, 8=TRACE. Default 6 = INFO" },
OPT_SECTION("Generic message"),
- {"cmd", OPT_CMD, 's', "CMP request to send: ir/cr/kur/p10cr/rr/genm"},
- {"infotype", OPT_INFOTYPE, 's',
- "InfoType name for requesting specific info in genm, with specific support"},
- {OPT_MORE_STR, 0, 0,
- "for 'caCerts' and 'rootCaCert'"},
- {"profile", OPT_PROFILE, 's',
- "Certificate profile name to place in generalInfo field of request PKIHeader"},
- {"geninfo", OPT_GENINFO, 's',
- "Comma-separated list of OID and value to place in generalInfo PKIHeader"},
- {OPT_MORE_STR, 0, 0,
- "of form <OID>:int:<n> or <OID>:str:<s>, e.g. \'1.2.3.4:int:56789, id-kp:str:name'"},
+ { "cmd", OPT_CMD, 's', "CMP request to send: ir/cr/kur/p10cr/rr/genm" },
+ { "infotype", OPT_INFOTYPE, 's',
+ "InfoType name for requesting specific info in genm, with specific support" },
+ { OPT_MORE_STR, 0, 0,
+ "for 'caCerts' and 'rootCaCert'" },
+ { "profile", OPT_PROFILE, 's',
+ "Certificate profile name to place in generalInfo field of request PKIHeader" },
+ { "geninfo", OPT_GENINFO, 's',
+ "Comma-separated list of OID and value to place in generalInfo PKIHeader" },
+ { OPT_MORE_STR, 0, 0,
+ "of form <OID>:int:<n> or <OID>:str:<s>, e.g. \'1.2.3.4:int:56789, id-kp:str:name'" },
{ "template", OPT_TEMPLATE, 's',
- "File to save certTemplate received in genp of type certReqTemplate"},
+ "File to save certTemplate received in genp of type certReqTemplate" },
{ "keyspec", OPT_KEYSPEC, 's',
- "Optional file to save Key specification received in genp of type certReqTemplate"},
+ "Optional file to save Key specification received in genp of type certReqTemplate" },
OPT_SECTION("Certificate enrollment"),
- {"newkey", OPT_NEWKEY, 's',
- "Private or public key for the requested cert. Default: CSR key or client key"},
- {"newkeypass", OPT_NEWKEYPASS, 's', "New private key pass phrase source"},
- {"centralkeygen", OPT_CENTRALKEYGEN, '-',
- "Request central (server-side) key generation. Default is local generation"},
- {"newkeyout", OPT_NEWKEYOUT, 's',
- "File to save centrally generated key, in PEM format"},
- {"subject", OPT_SUBJECT, 's',
- "Distinguished Name (DN) of subject to use in the requested cert template"},
- {OPT_MORE_STR, 0, 0,
- "For kur, default is subject of -csr arg or reference cert (see -oldcert)"},
- {OPT_MORE_STR, 0, 0,
- "this default is used for ir and cr only if no Subject Alt Names are set"},
- {"days", OPT_DAYS, 'N',
- "Requested validity time of the new certificate in number of days"},
- {"reqexts", OPT_REQEXTS, 's',
- "Name of config file section defining certificate request extensions."},
- {OPT_MORE_STR, 0, 0,
- "Augments or replaces any extensions contained CSR given with -csr"},
- {"sans", OPT_SANS, 's',
- "Subject Alt Names (IPADDR/DNS/URI) to add as (critical) cert req extension"},
- {"san_nodefault", OPT_SAN_NODEFAULT, '-',
- "Do not take default SANs from reference certificate (see -oldcert)"},
- {"policies", OPT_POLICIES, 's',
- "Name of config file section defining policies certificate request extension"},
- {"policy_oids", OPT_POLICY_OIDS, 's',
- "Policy OID(s) to add as policies certificate request extension"},
- {"policy_oids_critical", OPT_POLICY_OIDS_CRITICAL, '-',
- "Flag the policy OID(s) given with -policy_oids as critical"},
- {"popo", OPT_POPO, 'n',
- "Proof-of-Possession (POPO) method to use for ir/cr/kur where"},
- {OPT_MORE_STR, 0, 0,
- "-1 = NONE, 0 = RAVERIFIED, 1 = SIGNATURE (default), 2 = KEYENC"},
- {"csr", OPT_CSR, 's',
- "PKCS#10 CSR file in PEM or DER format to convert or to use in p10cr"},
- {"out_trusted", OPT_OUT_TRUSTED, 's',
- "Certificates to trust when verifying newly enrolled certificates"},
- {"implicit_confirm", OPT_IMPLICIT_CONFIRM, '-',
- "Request implicit confirmation of newly enrolled certificates"},
- {"disable_confirm", OPT_DISABLE_CONFIRM, '-',
- "Do not confirm newly enrolled certificate w/o requesting implicit"},
- {OPT_MORE_STR, 0, 0,
- "confirmation. WARNING: This leads to behavior violating RFC 9810"},
- {"certout", OPT_CERTOUT, 's',
- "File to save newly enrolled certificate"},
- {"chainout", OPT_CHAINOUT, 's',
- "File to save the chain of newly enrolled certificate"},
+ { "newkey", OPT_NEWKEY, 's',
+ "Private or public key for the requested cert. Default: CSR key or client key" },
+ { "newkeypass", OPT_NEWKEYPASS, 's', "New private key pass phrase source" },
+ { "centralkeygen", OPT_CENTRALKEYGEN, '-',
+ "Request central (server-side) key generation. Default is local generation" },
+ { "newkeyout", OPT_NEWKEYOUT, 's',
+ "File to save centrally generated key, in PEM format" },
+ { "subject", OPT_SUBJECT, 's',
+ "Distinguished Name (DN) of subject to use in the requested cert template" },
+ { OPT_MORE_STR, 0, 0,
+ "For kur, default is subject of -csr arg or reference cert (see -oldcert)" },
+ { OPT_MORE_STR, 0, 0,
+ "this default is used for ir and cr only if no Subject Alt Names are set" },
+ { "days", OPT_DAYS, 'N',
+ "Requested validity time of the new certificate in number of days" },
+ { "reqexts", OPT_REQEXTS, 's',
+ "Name of config file section defining certificate request extensions." },
+ { OPT_MORE_STR, 0, 0,
+ "Augments or replaces any extensions contained CSR given with -csr" },
+ { "sans", OPT_SANS, 's',
+ "Subject Alt Names (IPADDR/DNS/URI) to add as (critical) cert req extension" },
+ { "san_nodefault", OPT_SAN_NODEFAULT, '-',
+ "Do not take default SANs from reference certificate (see -oldcert)" },
+ { "policies", OPT_POLICIES, 's',
+ "Name of config file section defining policies certificate request extension" },
+ { "policy_oids", OPT_POLICY_OIDS, 's',
+ "Policy OID(s) to add as policies certificate request extension" },
+ { "policy_oids_critical", OPT_POLICY_OIDS_CRITICAL, '-',
+ "Flag the policy OID(s) given with -policy_oids as critical" },
+ { "popo", OPT_POPO, 'n',
+ "Proof-of-Possession (POPO) method to use for ir/cr/kur where" },
+ { OPT_MORE_STR, 0, 0,
+ "-1 = NONE, 0 = RAVERIFIED, 1 = SIGNATURE (default), 2 = KEYENC" },
+ { "csr", OPT_CSR, 's',
+ "PKCS#10 CSR file in PEM or DER format to convert or to use in p10cr" },
+ { "out_trusted", OPT_OUT_TRUSTED, 's',
+ "Certificates to trust when verifying newly enrolled certificates" },
+ { "implicit_confirm", OPT_IMPLICIT_CONFIRM, '-',
+ "Request implicit confirmation of newly enrolled certificates" },
+ { "disable_confirm", OPT_DISABLE_CONFIRM, '-',
+ "Do not confirm newly enrolled certificate w/o requesting implicit" },
+ { OPT_MORE_STR, 0, 0,
+ "confirmation. WARNING: This leads to behavior violating RFC 9810" },
+ { "certout", OPT_CERTOUT, 's',
+ "File to save newly enrolled certificate" },
+ { "chainout", OPT_CHAINOUT, 's',
+ "File to save the chain of newly enrolled certificate" },
OPT_SECTION("Certificate enrollment and revocation"),
- {"oldcert", OPT_OLDCERT, 's',
- "Certificate to be updated (defaulting to -cert) or to be revoked in rr;"},
- {OPT_MORE_STR, 0, 0,
- "also used as reference (defaulting to -cert) for subject DN and SANs."},
- {OPT_MORE_STR, 0, 0,
- "Issuer is used as recipient unless -recipient, -srvcert, or -issuer given"},
- {"issuer", OPT_ISSUER, 's',
- "DN of the issuer to place in the certificate template of ir/cr/kur/rr;"},
- {OPT_MORE_STR, 0, 0,
- "also used as recipient if neither -recipient nor -srvcert are given"},
- {"serial", OPT_SERIAL, 's',
- "Serial number of certificate to be revoked in revocation request (rr)"},
- {"revreason", OPT_REVREASON, 'n',
- "Reason code to include in revocation request (rr); possible values:"},
- {OPT_MORE_STR, 0, 0,
- "0..6, 8..10 (see RFC5280, 5.3.1) or -1. Default -1 = none included"},
+ { "oldcert", OPT_OLDCERT, 's',
+ "Certificate to be updated (defaulting to -cert) or to be revoked in rr;" },
+ { OPT_MORE_STR, 0, 0,
+ "also used as reference (defaulting to -cert) for subject DN and SANs." },
+ { OPT_MORE_STR, 0, 0,
+ "Issuer is used as recipient unless -recipient, -srvcert, or -issuer given" },
+ { "issuer", OPT_ISSUER, 's',
+ "DN of the issuer to place in the certificate template of ir/cr/kur/rr;" },
+ { OPT_MORE_STR, 0, 0,
+ "also used as recipient if neither -recipient nor -srvcert are given" },
+ { "serial", OPT_SERIAL, 's',
+ "Serial number of certificate to be revoked in revocation request (rr)" },
+ { "revreason", OPT_REVREASON, 'n',
+ "Reason code to include in revocation request (rr); possible values:" },
+ { OPT_MORE_STR, 0, 0,
+ "0..6, 8..10 (see RFC5280, 5.3.1) or -1. Default -1 = none included" },
OPT_SECTION("Message transfer"),
#if defined(OPENSSL_NO_SOCK) || defined(OPENSSL_NO_HTTP)
- {OPT_MORE_STR, 0, 0,
- "NOTE: -server, -proxy, and -no_proxy not supported due to no-sock/no-http build"},
+ { OPT_MORE_STR, 0, 0,
+ "NOTE: -server, -proxy, and -no_proxy not supported due to no-sock/no-http build" },
#else
- {"server", OPT_SERVER, 's',
- "[http[s]://]address[:port][/path] of CMP server. Default port 80 or 443."},
- {OPT_MORE_STR, 0, 0,
- "address may be a DNS name or an IP address; path can be overridden by -path"},
- {"proxy", OPT_PROXY, 's',
- "[http[s]://]address[:port][/path] of HTTP(S) proxy to use; path is ignored"},
- {"no_proxy", OPT_NO_PROXY, 's',
- "List of addresses of servers not to use HTTP(S) proxy for"},
- {OPT_MORE_STR, 0, 0,
- "Default from environment variable 'no_proxy', else 'NO_PROXY', else none"},
+ { "server", OPT_SERVER, 's',
+ "[http[s]://]address[:port][/path] of CMP server. Default port 80 or 443." },
+ { OPT_MORE_STR, 0, 0,
+ "address may be a DNS name or an IP address; path can be overridden by -path" },
+ { "proxy", OPT_PROXY, 's',
+ "[http[s]://]address[:port][/path] of HTTP(S) proxy to use; path is ignored" },
+ { "no_proxy", OPT_NO_PROXY, 's',
+ "List of addresses of servers not to use HTTP(S) proxy for" },
+ { OPT_MORE_STR, 0, 0,
+ "Default from environment variable 'no_proxy', else 'NO_PROXY', else none" },
#endif
- {"recipient", OPT_RECIPIENT, 's',
- "DN of CA. Default: subject of -srvcert, -issuer, issuer of -oldcert or -cert"},
- {"path", OPT_PATH, 's',
- "HTTP path (aka CMP alias) at the CMP server. Default from -server, else \"/\""},
- {"keep_alive", OPT_KEEP_ALIVE, 'N',
- "Persistent HTTP connections. 0: no, 1 (the default): request, 2: require"},
- {"msg_timeout", OPT_MSG_TIMEOUT, 'N',
- "Number of seconds allowed per CMP message round trip, or 0 for infinite"},
- {"total_timeout", OPT_TOTAL_TIMEOUT, 'N',
- "Overall time an enrollment incl. polling may take. Default 0 = infinite"},
+ { "recipient", OPT_RECIPIENT, 's',
+ "DN of CA. Default: subject of -srvcert, -issuer, issuer of -oldcert or -cert" },
+ { "path", OPT_PATH, 's',
+ "HTTP path (aka CMP alias) at the CMP server. Default from -server, else \"/\"" },
+ { "keep_alive", OPT_KEEP_ALIVE, 'N',
+ "Persistent HTTP connections. 0: no, 1 (the default): request, 2: require" },
+ { "msg_timeout", OPT_MSG_TIMEOUT, 'N',
+ "Number of seconds allowed per CMP message round trip, or 0 for infinite" },
+ { "total_timeout", OPT_TOTAL_TIMEOUT, 'N',
+ "Overall time an enrollment incl. polling may take. Default 0 = infinite" },
OPT_SECTION("Server authentication"),
- {"trusted", OPT_TRUSTED, 's',
- "Certificates to use as trust anchors when verifying signed CMP responses"},
- {OPT_MORE_STR, 0, 0, "unless -srvcert is given"},
- {"untrusted", OPT_UNTRUSTED, 's',
- "Intermediate CA certs for chain construction for CMP/TLS/enrolled certs"},
- {"srvcert", OPT_SRVCERT, 's',
- "Server cert to pin and trust directly when verifying signed CMP responses"},
- {"expect_sender", OPT_EXPECT_SENDER, 's',
- "DN of expected sender of responses. Defaults to subject of -srvcert, if any"},
- {"ignore_keyusage", OPT_IGNORE_KEYUSAGE, '-',
- "Ignore CMP signer cert key usage, else 'digitalSignature' must be allowed"},
- {"unprotected_errors", OPT_UNPROTECTED_ERRORS, '-',
- "Accept missing or invalid protection of regular error messages and negative"},
- {OPT_MORE_STR, 0, 0,
- "certificate responses (ip/cp/kup), revocation responses (rp), and PKIConf"},
- {OPT_MORE_STR, 0, 0,
- "WARNING: This setting leads to behavior allowing violation of RFC 9810"},
- {"no_cache_extracerts", OPT_NO_CACHE_EXTRACERTS, '-',
- "Do not keep certificates received in the extraCerts CMP message field"},
+ { "trusted", OPT_TRUSTED, 's',
+ "Certificates to use as trust anchors when verifying signed CMP responses" },
+ { OPT_MORE_STR, 0, 0, "unless -srvcert is given" },
+ { "untrusted", OPT_UNTRUSTED, 's',
+ "Intermediate CA certs for chain construction for CMP/TLS/enrolled certs" },
+ { "srvcert", OPT_SRVCERT, 's',
+ "Server cert to pin and trust directly when verifying signed CMP responses" },
+ { "expect_sender", OPT_EXPECT_SENDER, 's',
+ "DN of expected sender of responses. Defaults to subject of -srvcert, if any" },
+ { "ignore_keyusage", OPT_IGNORE_KEYUSAGE, '-',
+ "Ignore CMP signer cert key usage, else 'digitalSignature' must be allowed" },
+ { "unprotected_errors", OPT_UNPROTECTED_ERRORS, '-',
+ "Accept missing or invalid protection of regular error messages and negative" },
+ { OPT_MORE_STR, 0, 0,
+ "certificate responses (ip/cp/kup), revocation responses (rp), and PKIConf" },
+ { OPT_MORE_STR, 0, 0,
+ "WARNING: This setting leads to behavior allowing violation of RFC 9810" },
+ { "no_cache_extracerts", OPT_NO_CACHE_EXTRACERTS, '-',
+ "Do not keep certificates received in the extraCerts CMP message field" },
{ "srvcertout", OPT_SRVCERTOUT, 's',
- "File to save the server cert used and validated for CMP response protection"},
- {"extracertsout", OPT_EXTRACERTSOUT, 's',
- "File to save extra certificates received in the extraCerts field"},
- {"cacertsout", OPT_CACERTSOUT, 's',
- "File to save CA certs received in caPubs field or genp with id-it-caCerts"},
+ "File to save the server cert used and validated for CMP response protection" },
+ { "extracertsout", OPT_EXTRACERTSOUT, 's',
+ "File to save extra certificates received in the extraCerts field" },
+ { "cacertsout", OPT_CACERTSOUT, 's',
+ "File to save CA certs received in caPubs field or genp with id-it-caCerts" },
{ "oldwithold", OPT_OLDWITHOLD, 's',
- "Root CA certificate to request update for in genm of type rootCaCert"},
+ "Root CA certificate to request update for in genm of type rootCaCert" },
{ "newwithnew", OPT_NEWWITHNEW, 's',
- "File to save NewWithNew cert received in genp of type rootCaKeyUpdate"},
+ "File to save NewWithNew cert received in genp of type rootCaKeyUpdate" },
{ "newwithold", OPT_NEWWITHOLD, 's',
- "File to save NewWithOld cert received in genp of type rootCaKeyUpdate"},
+ "File to save NewWithOld cert received in genp of type rootCaKeyUpdate" },
{ "oldwithnew", OPT_OLDWITHNEW, 's',
- "File to save OldWithNew cert received in genp of type rootCaKeyUpdate"},
+ "File to save OldWithNew cert received in genp of type rootCaKeyUpdate" },
{ "crlcert", OPT_CRLCERT, 's',
- "certificate to request a CRL for in genm of type crlStatusList"},
+ "certificate to request a CRL for in genm of type crlStatusList" },
{ "oldcrl", OPT_OLDCRL, 's',
- "CRL to request update for in genm of type crlStatusList"},
+ "CRL to request update for in genm of type crlStatusList" },
{ "crlout", OPT_CRLOUT, 's',
- "File to save new CRL received in genp of type 'crls'"},
+ "File to save new CRL received in genp of type 'crls'" },
OPT_SECTION("Client authentication"),
- {"ref", OPT_REF, 's',
- "Reference value to use as senderKID in case no -cert is given"},
- {"secret", OPT_SECRET, 's',
- "Prefer PBM (over signatures) for protecting msgs with given password source"},
- {"cert", OPT_CERT, 's',
- "Client's CMP signer certificate; its public key must match the -key argument"},
- {OPT_MORE_STR, 0, 0,
- "This also used as default reference for subject DN and SANs."},
- {OPT_MORE_STR, 0, 0,
- "Any further certs included are appended to the untrusted certs"},
- {"own_trusted", OPT_OWN_TRUSTED, 's',
- "Optional certs to verify chain building for own CMP signer cert"},
- {"key", OPT_KEY, 's', "CMP signer private key, not used when -secret given"},
- {"keypass", OPT_KEYPASS, 's',
- "Client private key (and cert and old cert) pass phrase source"},
- {"digest", OPT_DIGEST, 's',
- "Digest to use in message protection and POPO signatures. Default \"sha256\""},
- {"mac", OPT_MAC, 's',
- "MAC algorithm to use in PBM-based message protection. Default \"hmac-sha1\""},
- {"extracerts", OPT_EXTRACERTS, 's',
- "Certificates to append in extraCerts field of outgoing messages."},
- {OPT_MORE_STR, 0, 0,
- "This can be used as the default CMP signer cert chain to include"},
- {"unprotected_requests", OPT_UNPROTECTED_REQUESTS, '-',
- "Send request messages without CMP-level protection"},
+ { "ref", OPT_REF, 's',
+ "Reference value to use as senderKID in case no -cert is given" },
+ { "secret", OPT_SECRET, 's',
+ "Prefer PBM (over signatures) for protecting msgs with given password source" },
+ { "cert", OPT_CERT, 's',
+ "Client's CMP signer certificate; its public key must match the -key argument" },
+ { OPT_MORE_STR, 0, 0,
+ "This also used as default reference for subject DN and SANs." },
+ { OPT_MORE_STR, 0, 0,
+ "Any further certs included are appended to the untrusted certs" },
+ { "own_trusted", OPT_OWN_TRUSTED, 's',
+ "Optional certs to verify chain building for own CMP signer cert" },
+ { "key", OPT_KEY, 's', "CMP signer private key, not used when -secret given" },
+ { "keypass", OPT_KEYPASS, 's',
+ "Client private key (and cert and old cert) pass phrase source" },
+ { "digest", OPT_DIGEST, 's',
+ "Digest to use in message protection and POPO signatures. Default \"sha256\"" },
+ { "mac", OPT_MAC, 's',
+ "MAC algorithm to use in PBM-based message protection. Default \"hmac-sha1\"" },
+ { "extracerts", OPT_EXTRACERTS, 's',
+ "Certificates to append in extraCerts field of outgoing messages." },
+ { OPT_MORE_STR, 0, 0,
+ "This can be used as the default CMP signer cert chain to include" },
+ { "unprotected_requests", OPT_UNPROTECTED_REQUESTS, '-',
+ "Send request messages without CMP-level protection" },
OPT_SECTION("Credentials format"),
- {"certform", OPT_CERTFORM, 's',
- "Format (PEM or DER) to use when saving a certificate to a file. Default PEM"},
- {"crlform", OPT_CRLFORM, 's',
- "Format (PEM or DER) to use when saving a CRL to a file. Default DER"},
- {"keyform", OPT_KEYFORM, 's', "Format of the key input (DER/PEM/P12)"},
- {"otherpass", OPT_OTHERPASS, 's',
- "Pass phrase source potentially needed for loading certificates of others"},
+ { "certform", OPT_CERTFORM, 's',
+ "Format (PEM or DER) to use when saving a certificate to a file. Default PEM" },
+ { "crlform", OPT_CRLFORM, 's',
+ "Format (PEM or DER) to use when saving a CRL to a file. Default DER" },
+ { "keyform", OPT_KEYFORM, 's', "Format of the key input (DER/PEM/P12)" },
+ { "otherpass", OPT_OTHERPASS, 's',
+ "Pass phrase source potentially needed for loading certificates of others" },
OPT_PROV_OPTIONS,
OPT_R_OPTIONS,
OPT_SECTION("TLS connection"),
#if defined(OPENSSL_NO_SOCK) || defined(OPENSSL_NO_HTTP)
- {OPT_MORE_STR, 0, 0,
- "NOTE: -tls_used and all other TLS options not supported due to no-sock/no-http build"},
+ { OPT_MORE_STR, 0, 0,
+ "NOTE: -tls_used and all other TLS options not supported due to no-sock/no-http build" },
#else
- {"tls_used", OPT_TLS_USED, '-',
- "Enable using TLS (also when other TLS options are not set)"},
- {"tls_cert", OPT_TLS_CERT, 's',
- "Client's TLS certificate. May include chain to be provided to TLS server"},
- {"tls_key", OPT_TLS_KEY, 's',
- "Private key for the client's TLS certificate"},
- {"tls_keypass", OPT_TLS_KEYPASS, 's',
- "Pass phrase source for the client's private TLS key (and TLS cert)"},
- {"tls_extra", OPT_TLS_EXTRA, 's',
- "Extra certificates to provide to TLS server during TLS handshake"},
- {"tls_trusted", OPT_TLS_TRUSTED, 's',
- "Trusted certificates to use for verifying the TLS server certificate;"},
- {OPT_MORE_STR, 0, 0, "this implies hostname validation"},
- {"tls_host", OPT_TLS_HOST, 's',
- "Address to be checked (rather than -server) during TLS hostname validation"},
+ { "tls_used", OPT_TLS_USED, '-',
+ "Enable using TLS (also when other TLS options are not set)" },
+ { "tls_cert", OPT_TLS_CERT, 's',
+ "Client's TLS certificate. May include chain to be provided to TLS server" },
+ { "tls_key", OPT_TLS_KEY, 's',
+ "Private key for the client's TLS certificate" },
+ { "tls_keypass", OPT_TLS_KEYPASS, 's',
+ "Pass phrase source for the client's private TLS key (and TLS cert)" },
+ { "tls_extra", OPT_TLS_EXTRA, 's',
+ "Extra certificates to provide to TLS server during TLS handshake" },
+ { "tls_trusted", OPT_TLS_TRUSTED, 's',
+ "Trusted certificates to use for verifying the TLS server certificate;" },
+ { OPT_MORE_STR, 0, 0, "this implies hostname validation" },
+ { "tls_host", OPT_TLS_HOST, 's',
+ "Address to be checked (rather than -server) during TLS hostname validation" },
#endif
OPT_SECTION("Client-side debugging"),
- {"batch", OPT_BATCH, '-',
- "Do not interactively prompt for input when a password is required etc."},
- {"repeat", OPT_REPEAT, 'p',
- "Invoke the transaction the given positive number of times. Default 1"},
- {"reqin", OPT_REQIN, 's',
- "Take sequence of CMP requests to send to server from file(s)"},
- {"reqin_new_tid", OPT_REQIN_NEW_TID, '-',
- "Use fresh transactionID for CMP requests read from -reqin"},
- {"reqout", OPT_REQOUT, 's',
- "Save sequence of CMP requests created by the client to file(s)"},
- {"reqout_only", OPT_REQOUT_ONLY, 's',
- "Save first CMP request created by the client to file and exit"},
- {"rspin", OPT_RSPIN, 's',
- "Process sequence of CMP responses provided in file(s), skipping server"},
- {"rspout", OPT_RSPOUT, 's',
- "Save sequence of actually used CMP responses to file(s)"},
-
- {"use_mock_srv", OPT_USE_MOCK_SRV, '-',
- "Use internal mock server at API level, bypassing socket-based HTTP"},
+ { "batch", OPT_BATCH, '-',
+ "Do not interactively prompt for input when a password is required etc." },
+ { "repeat", OPT_REPEAT, 'p',
+ "Invoke the transaction the given positive number of times. Default 1" },
+ { "reqin", OPT_REQIN, 's',
+ "Take sequence of CMP requests to send to server from file(s)" },
+ { "reqin_new_tid", OPT_REQIN_NEW_TID, '-',
+ "Use fresh transactionID for CMP requests read from -reqin" },
+ { "reqout", OPT_REQOUT, 's',
+ "Save sequence of CMP requests created by the client to file(s)" },
+ { "reqout_only", OPT_REQOUT_ONLY, 's',
+ "Save first CMP request created by the client to file and exit" },
+ { "rspin", OPT_RSPIN, 's',
+ "Process sequence of CMP responses provided in file(s), skipping server" },
+ { "rspout", OPT_RSPOUT, 's',
+ "Save sequence of actually used CMP responses to file(s)" },
+
+ { "use_mock_srv", OPT_USE_MOCK_SRV, '-',
+ "Use internal mock server at API level, bypassing socket-based HTTP" },
OPT_SECTION("Mock server"),
#if defined(OPENSSL_NO_SOCK) || defined(OPENSSL_NO_HTTP)
- {OPT_MORE_STR, 0, 0,
- "NOTE: -port and -max_msgs not supported due to no-sock/no-http build"},
+ { OPT_MORE_STR, 0, 0,
+ "NOTE: -port and -max_msgs not supported due to no-sock/no-http build" },
#else
- {"port", OPT_PORT, 's',
- "Act as HTTP-based mock server listening on given port"},
- {"max_msgs", OPT_MAX_MSGS, 'N',
- "max number of messages handled by HTTP mock server. Default: 0 = unlimited"},
+ { "port", OPT_PORT, 's',
+ "Act as HTTP-based mock server listening on given port" },
+ { "max_msgs", OPT_MAX_MSGS, 'N',
+ "max number of messages handled by HTTP mock server. Default: 0 = unlimited" },
#endif
- {"srv_ref", OPT_SRV_REF, 's',
- "Reference value to use as senderKID of server in case no -srv_cert is given"},
- {"srv_secret", OPT_SRV_SECRET, 's',
- "Password source for server authentication with a pre-shared key (secret)"},
- {"srv_cert", OPT_SRV_CERT, 's', "Certificate of the server"},
- {"srv_key", OPT_SRV_KEY, 's',
- "Private key used by the server for signing messages"},
- {"srv_keypass", OPT_SRV_KEYPASS, 's',
- "Server private key (and cert) pass phrase source"},
-
- {"srv_trusted", OPT_SRV_TRUSTED, 's',
- "Trusted certificates for client authentication"},
- {"srv_untrusted", OPT_SRV_UNTRUSTED, 's',
- "Intermediate certs that may be useful for verifying CMP protection"},
- {"ref_cert", OPT_REF_CERT, 's',
- "Certificate to be expected for rr and any oldCertID in kur messages"},
- {"rsp_cert", OPT_RSP_CERT, 's',
- "Certificate to be returned as mock enrollment result"},
- {"rsp_key", OPT_RSP_KEY, 's',
- "Private key for the certificate to be returned as mock enrollment result"},
- {OPT_MORE_STR, 0, 0,
- "Key to be returned for central key pair generation"},
- {"rsp_keypass", OPT_RSP_KEYPASS, 's',
- "Response private key (and cert) pass phrase source"},
- {"rsp_crl", OPT_RSP_CRL, 's',
- "CRL to be returned in genp of type crls"},
- {"rsp_extracerts", OPT_RSP_EXTRACERTS, 's',
- "Extra certificates to be included in mock certification responses"},
- {"rsp_capubs", OPT_RSP_CAPUBS, 's',
- "CA certificates to be included in mock ip response"},
- {"rsp_newwithnew", OPT_RSP_NEWWITHNEW, 's',
- "New root CA certificate to include in genp of type rootCaKeyUpdate"},
- {"rsp_newwithold", OPT_RSP_NEWWITHOLD, 's',
- "NewWithOld transition cert to include in genp of type rootCaKeyUpdate"},
- {"rsp_oldwithnew", OPT_RSP_OLDWITHNEW, 's',
- "OldWithNew transition cert to include in genp of type rootCaKeyUpdate"},
- {"poll_count", OPT_POLL_COUNT, 'N',
- "Number of times the client must poll before receiving a certificate"},
- {"check_after", OPT_CHECK_AFTER, 'N',
- "The check_after value (time to wait) to include in poll response"},
- {"grant_implicitconf", OPT_GRANT_IMPLICITCONF, '-',
- "Grant implicit confirmation of newly enrolled certificate"},
-
- {"pkistatus", OPT_PKISTATUS, 'N',
- "PKIStatus to be included in server response. Possible values: 0..6"},
- {"failure", OPT_FAILURE, 'N',
- "A single failure info bit number to include in server response, 0..26"},
- {"failurebits", OPT_FAILUREBITS, 'N',
- "Number representing failure bits to include in server response, 0..2^27 - 1"},
- {"statusstring", OPT_STATUSSTRING, 's',
- "Status string to be included in server response"},
- {"send_error", OPT_SEND_ERROR, '-',
- "Force server to reply with error message"},
- {"send_unprotected", OPT_SEND_UNPROTECTED, '-',
- "Send response messages without CMP-level protection"},
- {"send_unprot_err", OPT_SEND_UNPROT_ERR, '-',
- "In case of negative responses, server shall send unprotected error messages,"},
- {OPT_MORE_STR, 0, 0,
- "certificate responses (ip/cp/kup), and revocation responses (rp)."},
- {OPT_MORE_STR, 0, 0,
- "WARNING: This setting leads to behavior violating RFC 9810"},
- {"accept_unprotected", OPT_ACCEPT_UNPROTECTED, '-',
- "Accept missing or invalid protection of requests"},
- {"accept_unprot_err", OPT_ACCEPT_UNPROT_ERR, '-',
- "Accept unprotected error messages from client"},
- {"accept_raverified", OPT_ACCEPT_RAVERIFIED, '-',
- "Accept RAVERIFIED as proof-of-possession (POPO)"},
+ { "srv_ref", OPT_SRV_REF, 's',
+ "Reference value to use as senderKID of server in case no -srv_cert is given" },
+ { "srv_secret", OPT_SRV_SECRET, 's',
+ "Password source for server authentication with a pre-shared key (secret)" },
+ { "srv_cert", OPT_SRV_CERT, 's', "Certificate of the server" },
+ { "srv_key", OPT_SRV_KEY, 's',
+ "Private key used by the server for signing messages" },
+ { "srv_keypass", OPT_SRV_KEYPASS, 's',
+ "Server private key (and cert) pass phrase source" },
+
+ { "srv_trusted", OPT_SRV_TRUSTED, 's',
+ "Trusted certificates for client authentication" },
+ { "srv_untrusted", OPT_SRV_UNTRUSTED, 's',
+ "Intermediate certs that may be useful for verifying CMP protection" },
+ { "ref_cert", OPT_REF_CERT, 's',
+ "Certificate to be expected for rr and any oldCertID in kur messages" },
+ { "rsp_cert", OPT_RSP_CERT, 's',
+ "Certificate to be returned as mock enrollment result" },
+ { "rsp_key", OPT_RSP_KEY, 's',
+ "Private key for the certificate to be returned as mock enrollment result" },
+ { OPT_MORE_STR, 0, 0,
+ "Key to be returned for central key pair generation" },
+ { "rsp_keypass", OPT_RSP_KEYPASS, 's',
+ "Response private key (and cert) pass phrase source" },
+ { "rsp_crl", OPT_RSP_CRL, 's',
+ "CRL to be returned in genp of type crls" },
+ { "rsp_extracerts", OPT_RSP_EXTRACERTS, 's',
+ "Extra certificates to be included in mock certification responses" },
+ { "rsp_capubs", OPT_RSP_CAPUBS, 's',
+ "CA certificates to be included in mock ip response" },
+ { "rsp_newwithnew", OPT_RSP_NEWWITHNEW, 's',
+ "New root CA certificate to include in genp of type rootCaKeyUpdate" },
+ { "rsp_newwithold", OPT_RSP_NEWWITHOLD, 's',
+ "NewWithOld transition cert to include in genp of type rootCaKeyUpdate" },
+ { "rsp_oldwithnew", OPT_RSP_OLDWITHNEW, 's',
+ "OldWithNew transition cert to include in genp of type rootCaKeyUpdate" },
+ { "poll_count", OPT_POLL_COUNT, 'N',
+ "Number of times the client must poll before receiving a certificate" },
+ { "check_after", OPT_CHECK_AFTER, 'N',
+ "The check_after value (time to wait) to include in poll response" },
+ { "grant_implicitconf", OPT_GRANT_IMPLICITCONF, '-',
+ "Grant implicit confirmation of newly enrolled certificate" },
+
+ { "pkistatus", OPT_PKISTATUS, 'N',
+ "PKIStatus to be included in server response. Possible values: 0..6" },
+ { "failure", OPT_FAILURE, 'N',
+ "A single failure info bit number to include in server response, 0..26" },
+ { "failurebits", OPT_FAILUREBITS, 'N',
+ "Number representing failure bits to include in server response, 0..2^27 - 1" },
+ { "statusstring", OPT_STATUSSTRING, 's',
+ "Status string to be included in server response" },
+ { "send_error", OPT_SEND_ERROR, '-',
+ "Force server to reply with error message" },
+ { "send_unprotected", OPT_SEND_UNPROTECTED, '-',
+ "Send response messages without CMP-level protection" },
+ { "send_unprot_err", OPT_SEND_UNPROT_ERR, '-',
+ "In case of negative responses, server shall send unprotected error messages," },
+ { OPT_MORE_STR, 0, 0,
+ "certificate responses (ip/cp/kup), and revocation responses (rp)." },
+ { OPT_MORE_STR, 0, 0,
+ "WARNING: This setting leads to behavior violating RFC 9810" },
+ { "accept_unprotected", OPT_ACCEPT_UNPROTECTED, '-',
+ "Accept missing or invalid protection of requests" },
+ { "accept_unprot_err", OPT_ACCEPT_UNPROT_ERR, '-',
+ "Accept unprotected error messages from client" },
+ { "accept_raverified", OPT_ACCEPT_RAVERIFIED, '-',
+ "Accept RAVERIFIED as proof-of-possession (POPO)" },
OPT_V_OPTIONS,
- {NULL}
+ { NULL }
};
typedef union {
@@ -630,115 +702,114 @@ typedef union {
long *num_long;
} varref;
static varref cmp_vars[] = { /* must be in same order as enumerated above! */
- {&opt_config}, {&opt_section}, {(char **)&opt_verbosity},
+ { &opt_config }, { &opt_section }, { (char **)&opt_verbosity },
- {&opt_cmd_s}, {&opt_infotype_s}, {&opt_profile}, {&opt_geninfo},
- {&opt_template}, {&opt_keyspec},
+ { &opt_cmd_s }, { &opt_infotype_s }, { &opt_profile }, { &opt_geninfo },
+ { &opt_template }, { &opt_keyspec },
- {&opt_newkey}, {&opt_newkeypass}, {(char **)&opt_centralkeygen},
- {&opt_newkeyout}, {&opt_subject}, {(char **)&opt_days}, {&opt_reqexts},
- {&opt_sans}, {(char **)&opt_san_nodefault},
- {&opt_policies}, {&opt_policy_oids}, {(char **)&opt_policy_oids_critical},
- {(char **)&opt_popo}, {&opt_csr},
- {&opt_out_trusted},
- {(char **)&opt_implicit_confirm}, {(char **)&opt_disable_confirm},
- {&opt_certout}, {&opt_chainout},
+ { &opt_newkey }, { &opt_newkeypass }, { (char **)&opt_centralkeygen },
+ { &opt_newkeyout }, { &opt_subject }, { (char **)&opt_days }, { &opt_reqexts },
+ { &opt_sans }, { (char **)&opt_san_nodefault },
+ { &opt_policies }, { &opt_policy_oids }, { (char **)&opt_policy_oids_critical },
+ { (char **)&opt_popo }, { &opt_csr },
+ { &opt_out_trusted },
+ { (char **)&opt_implicit_confirm }, { (char **)&opt_disable_confirm },
+ { &opt_certout }, { &opt_chainout },
- {&opt_oldcert}, {&opt_issuer}, {&opt_serial}, {(char **)&opt_revreason},
+ { &opt_oldcert }, { &opt_issuer }, { &opt_serial }, { (char **)&opt_revreason },
#if !defined(OPENSSL_NO_SOCK) && !defined(OPENSSL_NO_HTTP)
- {&opt_server}, {&opt_proxy}, {&opt_no_proxy},
+ { &opt_server }, { &opt_proxy }, { &opt_no_proxy },
#endif
- {&opt_recipient}, {&opt_path}, {(char **)&opt_keep_alive},
- {(char **)&opt_msg_timeout}, {(char **)&opt_total_timeout},
+ { &opt_recipient }, { &opt_path }, { (char **)&opt_keep_alive },
+ { (char **)&opt_msg_timeout }, { (char **)&opt_total_timeout },
- {&opt_trusted}, {&opt_untrusted}, {&opt_srvcert},
- {&opt_expect_sender},
- {(char **)&opt_ignore_keyusage}, {(char **)&opt_unprotected_errors},
- {(char **)&opt_no_cache_extracerts},
- {&opt_srvcertout}, {&opt_extracertsout}, {&opt_cacertsout},
- {&opt_oldwithold}, {&opt_newwithnew}, {&opt_newwithold}, {&opt_oldwithnew},
- {&opt_crlcert}, {&opt_oldcrl}, {&opt_crlout},
+ { &opt_trusted }, { &opt_untrusted }, { &opt_srvcert },
+ { &opt_expect_sender },
+ { (char **)&opt_ignore_keyusage }, { (char **)&opt_unprotected_errors },
+ { (char **)&opt_no_cache_extracerts },
+ { &opt_srvcertout }, { &opt_extracertsout }, { &opt_cacertsout },
+ { &opt_oldwithold }, { &opt_newwithnew }, { &opt_newwithold }, { &opt_oldwithnew },
+ { &opt_crlcert }, { &opt_oldcrl }, { &opt_crlout },
- {&opt_ref}, {&opt_secret},
- {&opt_cert}, {&opt_own_trusted}, {&opt_key}, {&opt_keypass},
- {&opt_digest}, {&opt_mac}, {&opt_extracerts},
- {(char **)&opt_unprotected_requests},
+ { &opt_ref }, { &opt_secret },
+ { &opt_cert }, { &opt_own_trusted }, { &opt_key }, { &opt_keypass },
+ { &opt_digest }, { &opt_mac }, { &opt_extracerts },
+ { (char **)&opt_unprotected_requests },
- {&opt_certform_s}, {&opt_crlform_s}, {&opt_keyform_s},
- {&opt_otherpass},
+ { &opt_certform_s }, { &opt_crlform_s }, { &opt_keyform_s },
+ { &opt_otherpass },
#if !defined(OPENSSL_NO_SOCK) && !defined(OPENSSL_NO_HTTP)
- {(char **)&opt_tls_used}, {&opt_tls_cert}, {&opt_tls_key},
- {&opt_tls_keypass},
- {&opt_tls_extra}, {&opt_tls_trusted}, {&opt_tls_host},
+ { (char **)&opt_tls_used }, { &opt_tls_cert }, { &opt_tls_key },
+ { &opt_tls_keypass },
+ { &opt_tls_extra }, { &opt_tls_trusted }, { &opt_tls_host },
#endif
- {(char **)&opt_batch}, {(char **)&opt_repeat},
- {&opt_reqin}, {(char **)&opt_reqin_new_tid},
- {&opt_reqout}, {&opt_reqout_only}, {&opt_rspin}, {&opt_rspout},
+ { (char **)&opt_batch }, { (char **)&opt_repeat },
+ { &opt_reqin }, { (char **)&opt_reqin_new_tid },
+ { &opt_reqout }, { &opt_reqout_only }, { &opt_rspin }, { &opt_rspout },
- {(char **)&opt_use_mock_srv},
+ { (char **)&opt_use_mock_srv },
#if !defined(OPENSSL_NO_SOCK) && !defined(OPENSSL_NO_HTTP)
- {&opt_port}, {(char **)&opt_max_msgs},
+ { &opt_port }, { (char **)&opt_max_msgs },
#endif
- {&opt_srv_ref}, {&opt_srv_secret},
- {&opt_srv_cert}, {&opt_srv_key}, {&opt_srv_keypass},
- {&opt_srv_trusted}, {&opt_srv_untrusted},
- {&opt_ref_cert}, {&opt_rsp_cert}, {&opt_rsp_key}, {&opt_rsp_keypass},
- {&opt_rsp_crl}, {&opt_rsp_extracerts}, {&opt_rsp_capubs},
- {&opt_rsp_newwithnew}, {&opt_rsp_newwithold}, {&opt_rsp_oldwithnew},
-
- {(char **)&opt_poll_count}, {(char **)&opt_check_after},
- {(char **)&opt_grant_implicitconf},
- {(char **)&opt_pkistatus}, {(char **)&opt_failure},
- {(char **)&opt_failurebits}, {&opt_statusstring},
- {(char **)&opt_send_error}, {(char **)&opt_send_unprotected},
- {(char **)&opt_send_unprot_err}, {(char **)&opt_accept_unprotected},
- {(char **)&opt_accept_unprot_err}, {(char **)&opt_accept_raverified},
-
- {NULL}
+ { &opt_srv_ref }, { &opt_srv_secret },
+ { &opt_srv_cert }, { &opt_srv_key }, { &opt_srv_keypass },
+ { &opt_srv_trusted }, { &opt_srv_untrusted },
+ { &opt_ref_cert }, { &opt_rsp_cert }, { &opt_rsp_key }, { &opt_rsp_keypass },
+ { &opt_rsp_crl }, { &opt_rsp_extracerts }, { &opt_rsp_capubs },
+ { &opt_rsp_newwithnew }, { &opt_rsp_newwithold }, { &opt_rsp_oldwithnew },
+
+ { (char **)&opt_poll_count }, { (char **)&opt_check_after },
+ { (char **)&opt_grant_implicitconf },
+ { (char **)&opt_pkistatus }, { (char **)&opt_failure },
+ { (char **)&opt_failurebits }, { &opt_statusstring },
+ { (char **)&opt_send_error }, { (char **)&opt_send_unprotected },
+ { (char **)&opt_send_unprot_err }, { (char **)&opt_accept_unprotected },
+ { (char **)&opt_accept_unprot_err }, { (char **)&opt_accept_raverified },
+
+ { NULL }
};
-#define FUNC (strcmp(OPENSSL_FUNC, "(unknown function)") == 0 \
- ? "CMP" : OPENSSL_FUNC)
+#define FUNC (strcmp(OPENSSL_FUNC, "(unknown function)") == 0 \
+ ? "CMP" \
+ : OPENSSL_FUNC)
#define CMP_print(bio, level, prefix, msg, a1, a2, a3) \
- ((void)(level > opt_verbosity ? 0 : \
- (BIO_printf(bio, "%s:%s:%d:CMP %s: " msg "\n", \
- FUNC, OPENSSL_FILE, OPENSSL_LINE, prefix, a1, a2, a3))))
+ ((void)(level > opt_verbosity ? 0 : (BIO_printf(bio, "%s:%s:%d:CMP %s: " msg "\n", FUNC, OPENSSL_FILE, OPENSSL_LINE, prefix, a1, a2, a3))))
#define CMP_DEBUG(m, a1, a2, a3) \
CMP_print(bio_out, OSSL_CMP_LOG_DEBUG, "debug", m, a1, a2, a3)
-#define CMP_debug(msg) CMP_DEBUG(msg"%s%s%s", "", "", "")
-#define CMP_debug1(msg, a1) CMP_DEBUG(msg"%s%s", a1, "", "")
-#define CMP_debug2(msg, a1, a2) CMP_DEBUG(msg"%s", a1, a2, "")
-#define CMP_debug3(msg, a1, a2, a3) CMP_DEBUG(msg, a1, a2, a3)
+#define CMP_debug(msg) CMP_DEBUG(msg "%s%s%s", "", "", "")
+#define CMP_debug1(msg, a1) CMP_DEBUG(msg "%s%s", a1, "", "")
+#define CMP_debug2(msg, a1, a2) CMP_DEBUG(msg "%s", a1, a2, "")
+#define CMP_debug3(msg, a1, a2, a3) CMP_DEBUG(msg, a1, a2, a3)
#define CMP_INFO(msg, a1, a2, a3) \
CMP_print(bio_out, OSSL_CMP_LOG_INFO, "info", msg, a1, a2, a3)
-#define CMP_info(msg) CMP_INFO(msg"%s%s%s", "", "", "")
-#define CMP_info1(msg, a1) CMP_INFO(msg"%s%s", a1, "", "")
-#define CMP_info2(msg, a1, a2) CMP_INFO(msg"%s", a1, a2, "")
-#define CMP_info3(msg, a1, a2, a3) CMP_INFO(msg, a1, a2, a3)
+#define CMP_info(msg) CMP_INFO(msg "%s%s%s", "", "", "")
+#define CMP_info1(msg, a1) CMP_INFO(msg "%s%s", a1, "", "")
+#define CMP_info2(msg, a1, a2) CMP_INFO(msg "%s", a1, a2, "")
+#define CMP_info3(msg, a1, a2, a3) CMP_INFO(msg, a1, a2, a3)
#define CMP_WARN(m, a1, a2, a3) \
CMP_print(bio_out, OSSL_CMP_LOG_WARNING, "warning", m, a1, a2, a3)
-#define CMP_warn(msg) CMP_WARN(msg"%s%s%s", "", "", "")
-#define CMP_warn1(msg, a1) CMP_WARN(msg"%s%s", a1, "", "")
-#define CMP_warn2(msg, a1, a2) CMP_WARN(msg"%s", a1, a2, "")
-#define CMP_warn3(msg, a1, a2, a3) CMP_WARN(msg, a1, a2, a3)
+#define CMP_warn(msg) CMP_WARN(msg "%s%s%s", "", "", "")
+#define CMP_warn1(msg, a1) CMP_WARN(msg "%s%s", a1, "", "")
+#define CMP_warn2(msg, a1, a2) CMP_WARN(msg "%s", a1, a2, "")
+#define CMP_warn3(msg, a1, a2, a3) CMP_WARN(msg, a1, a2, a3)
#define CMP_ERR(msg, a1, a2, a3) \
CMP_print(bio_err, OSSL_CMP_LOG_ERR, "error", msg, a1, a2, a3)
-#define CMP_err(msg) CMP_ERR(msg"%s%s%s", "", "", "")
-#define CMP_err1(msg, a1) CMP_ERR(msg"%s%s", a1, "", "")
-#define CMP_err2(msg, a1, a2) CMP_ERR(msg"%s", a1, a2, "")
-#define CMP_err3(msg, a1, a2, a3) CMP_ERR(msg, a1, a2, a3)
+#define CMP_err(msg) CMP_ERR(msg "%s%s%s", "", "", "")
+#define CMP_err1(msg, a1) CMP_ERR(msg "%s%s", a1, "", "")
+#define CMP_err2(msg, a1, a2) CMP_ERR(msg "%s", a1, a2, "")
+#define CMP_err3(msg, a1, a2, a3) CMP_ERR(msg, a1, a2, a3)
static int print_to_bio_out(const char *func, const char *file, int line,
- OSSL_CMP_severity level, const char *msg)
+ OSSL_CMP_severity level, const char *msg)
{
return OSSL_CMP_print_to_bio(bio_out, func, file, line, level, msg);
}
static int print_to_bio_err(const char *func, const char *file, int line,
- OSSL_CMP_severity level, const char *msg)
+ OSSL_CMP_severity level, const char *msg)
{
return OSSL_CMP_print_to_bio(bio_err, func, file, line, level, msg);
}
@@ -754,7 +825,7 @@ static int set_verbosity(int level)
}
static EVP_PKEY *load_key_pwd(const char *uri, int format,
- const char *pass, const char *desc)
+ const char *pass, const char *desc)
{
char *pass_string = get_passwd(pass, desc);
EVP_PKEY *pkey = load_key(uri, format, 0, pass_string, desc);
@@ -780,12 +851,11 @@ static int truststore_set_host_etc(X509_STORE *ts, const char *host)
/* first clear any hostnames, IP, and email addresses */
if (!X509_VERIFY_PARAM_set1_host(ts_vpm, NULL, 0)
- || !X509_VERIFY_PARAM_set1_ip(ts_vpm, NULL, 0)
- || !X509_VERIFY_PARAM_set1_email(ts_vpm, NULL, 0))
+ || !X509_VERIFY_PARAM_set1_ip(ts_vpm, NULL, 0)
+ || !X509_VERIFY_PARAM_set1_email(ts_vpm, NULL, 0))
return 0;
X509_VERIFY_PARAM_set_hostflags(ts_vpm,
- X509_CHECK_FLAG_ALWAYS_CHECK_SUBJECT |
- X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
+ X509_CHECK_FLAG_ALWAYS_CHECK_SUBJECT | X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
return (host != NULL && X509_VERIFY_PARAM_set1_ip_asc(ts_vpm, host))
|| X509_VERIFY_PARAM_set1_host(ts_vpm, host, 0);
}
@@ -846,7 +916,7 @@ static OSSL_CMP_MSG *read_PKIMESSAGE(const char *desc, char **filenames)
* to take the sequence of requests and responses from files.
*/
static OSSL_CMP_MSG *read_write_req_resp(OSSL_CMP_CTX *ctx,
- const OSSL_CMP_MSG *req)
+ const OSSL_CMP_MSG *req)
{
OSSL_CMP_MSG *req_new = NULL;
OSSL_CMP_MSG *res = NULL;
@@ -856,7 +926,7 @@ static OSSL_CMP_MSG *read_write_req_resp(OSSL_CMP_CTX *ctx,
if (opt_reqout_only != NULL) {
if (OSSL_CMP_MSG_write(opt_reqout_only, req) < 0)
CMP_err1("cannot write request PKIMessage to file '%s'",
- opt_reqout_only);
+ opt_reqout_only);
else
reqout_only_done = 1;
return NULL; /* stop at this point, not contacting any server */
@@ -872,7 +942,7 @@ static OSSL_CMP_MSG *read_write_req_resp(OSSL_CMP_CTX *ctx,
* The following workaround unfortunately requires re-protection.
*/
if (opt_reqin_new_tid
- && !OSSL_CMP_MSG_update_transactionID(ctx, req_new))
+ && !OSSL_CMP_MSG_update_transactionID(ctx, req_new))
goto err;
/*
@@ -919,7 +989,7 @@ static OSSL_CMP_MSG *read_write_req_resp(OSSL_CMP_CTX *ctx,
nonce = OSSL_CMP_HDR_get0_recipNonce(hdr);
tid = OSSL_CMP_HDR_get0_transactionID(hdr);
if (!OSSL_CMP_CTX_set1_senderNonce(ctx, nonce)
- || !OSSL_CMP_CTX_set1_transactionID(ctx, tid)) {
+ || !OSSL_CMP_CTX_set1_transactionID(ctx, tid)) {
OSSL_CMP_MSG_free(res);
res = NULL;
goto err;
@@ -931,21 +1001,21 @@ static OSSL_CMP_MSG *read_write_req_resp(OSSL_CMP_CTX *ctx,
res = NULL;
}
- err:
+err:
OSSL_CMP_MSG_free(req_new);
return res;
}
static int set_name(const char *str,
- int (*set_fn) (OSSL_CMP_CTX *ctx, const X509_NAME *name),
- OSSL_CMP_CTX *ctx, const char *desc)
+ int (*set_fn)(OSSL_CMP_CTX *ctx, const X509_NAME *name),
+ OSSL_CMP_CTX *ctx, const char *desc)
{
if (str != NULL) {
X509_NAME *n = parse_name(str, MBSTRING_UTF8, 1, desc);
if (n == NULL)
return 0;
- if (!(*set_fn) (ctx, n)) {
+ if (!(*set_fn)(ctx, n)) {
X509_NAME_free(n);
CMP_err("out of memory");
return 0;
@@ -965,8 +1035,8 @@ static int set_gennames(OSSL_CMP_CTX *ctx, char *names, const char *desc)
next = next_item(names);
if (strcmp(names, "critical") == 0) {
(void)OSSL_CMP_CTX_set_option(ctx,
- OSSL_CMP_OPT_SUBJECTALTNAME_CRITICAL,
- 1);
+ OSSL_CMP_OPT_SUBJECTALTNAME_CRITICAL,
+ 1);
continue;
}
@@ -975,9 +1045,9 @@ static int set_gennames(OSSL_CMP_CTX *ctx, char *names, const char *desc)
n = a2i_GENERAL_NAME(NULL, NULL, NULL, GEN_IPADD, names, 0);
if (n == NULL)
n = a2i_GENERAL_NAME(NULL, NULL, NULL,
- strchr(names, '@') != NULL ? GEN_EMAIL :
- strchr(names, ':') != NULL ? GEN_URI : GEN_DNS,
- names, 0);
+ strchr(names, '@') != NULL ? GEN_EMAIL : strchr(names, ':') != NULL ? GEN_URI
+ : GEN_DNS,
+ names, 0);
(void)ERR_pop_to_mark();
if (n == NULL) {
@@ -1004,7 +1074,7 @@ static X509_STORE *load_trusted(char *input, int for_new_cert, const char *desc)
/* copy vpm to store */
if (X509_STORE_set1_param(ts, vpm /* may be NULL */)
- && (for_new_cert || truststore_set_host_etc(ts, NULL)))
+ && (for_new_cert || truststore_set_host_etc(ts, NULL)))
return ts;
BIO_printf(bio_err, "error setting verification parameters for %s\n", desc);
OSSL_CMP_CTX_print_errors(cmp_ctx);
@@ -1014,7 +1084,7 @@ static X509_STORE *load_trusted(char *input, int for_new_cert, const char *desc)
typedef int (*add_X509_fn_t)(void *ctx, const X509 *cert);
static int setup_cert(void *ctx, const char *file, const char *pass,
- const char *desc, add_X509_fn_t set1_fn)
+ const char *desc, add_X509_fn_t set1_fn)
{
X509 *cert;
int ok;
@@ -1030,7 +1100,7 @@ static int setup_cert(void *ctx, const char *file, const char *pass,
typedef int (*add_X509_stack_fn_t)(void *ctx, const STACK_OF(X509) *certs);
static int setup_certs(char *files, const char *desc, void *ctx,
- add_X509_stack_fn_t set1_fn)
+ add_X509_stack_fn_t set1_fn)
{
STACK_OF(X509) *certs;
int ok;
@@ -1088,7 +1158,7 @@ static int transform_opts(void)
#define FORMAT_OPTIONS (OPT_FMT_PEMDER | OPT_FMT_PKCS12)
if (opt_keyform_s != NULL
- && !opt_format(opt_keyform_s, FORMAT_OPTIONS, &opt_keyform)) {
+ && !opt_format(opt_keyform_s, FORMAT_OPTIONS, &opt_keyform)) {
CMP_err("unknown option given for key loading format");
return 0;
}
@@ -1096,12 +1166,12 @@ static int transform_opts(void)
#undef FORMAT_OPTIONS
if (opt_certform_s != NULL
- && !opt_format(opt_certform_s, OPT_FMT_PEMDER, &opt_certform)) {
+ && !opt_format(opt_certform_s, OPT_FMT_PEMDER, &opt_certform)) {
CMP_err("unknown option given for certificate storing format");
return 0;
}
if (opt_crlform_s != NULL
- && !opt_format(opt_crlform_s, OPT_FMT_PEMDER, &opt_crlform)) {
+ && !opt_format(opt_crlform_s, OPT_FMT_PEMDER, &opt_crlform)) {
CMP_err("unknown option given for CRL storing format");
return 0;
}
@@ -1113,7 +1183,7 @@ static OSSL_CMP_SRV_CTX *setup_srv_ctx(void)
{
OSSL_CMP_CTX *ctx; /* extra CMP (client) ctx partly used by server */
OSSL_CMP_SRV_CTX *srv_ctx = ossl_cmp_mock_srv_new(app_get0_libctx(),
- app_get0_propq());
+ app_get0_propq());
if (srv_ctx == NULL)
return NULL;
@@ -1127,7 +1197,7 @@ static OSSL_CMP_SRV_CTX *setup_srv_ctx(void)
}
} else {
if (!OSSL_CMP_CTX_set1_referenceValue(ctx, (unsigned char *)opt_srv_ref,
- (int)strlen(opt_srv_ref)))
+ (int)strlen(opt_srv_ref)))
goto err;
}
@@ -1138,7 +1208,7 @@ static OSSL_CMP_SRV_CTX *setup_srv_ctx(void)
if (pass_str != NULL) {
cleanse(opt_srv_secret);
res = OSSL_CMP_CTX_set1_secretValue(ctx, (unsigned char *)pass_str,
- (int)strlen(pass_str));
+ (int)strlen(pass_str));
clear_free(pass_str);
if (res == 0)
goto err;
@@ -1151,18 +1221,18 @@ static OSSL_CMP_SRV_CTX *setup_srv_ctx(void)
}
if (opt_srv_secret == NULL
- && ((opt_srv_cert == NULL) != (opt_srv_key == NULL))) {
+ && ((opt_srv_cert == NULL) != (opt_srv_key == NULL))) {
CMP_err("must give both -srv_cert and -srv_key options or neither");
goto err;
}
if (!setup_cert(ctx, opt_srv_cert, opt_srv_keypass,
- "signer certificate of the mock server",
- (add_X509_fn_t)OSSL_CMP_CTX_set1_cert))
+ "signer certificate of the mock server",
+ (add_X509_fn_t)OSSL_CMP_CTX_set1_cert))
goto err;
if (opt_srv_key != NULL) {
EVP_PKEY *pkey = load_key_pwd(opt_srv_key, opt_keyform,
- opt_srv_keypass,
- "private key for mock server cert");
+ opt_srv_keypass,
+ "private key for mock server cert");
if (pkey == NULL || !OSSL_CMP_CTX_set1_pkey(ctx, pkey)) {
EVP_PKEY_free(pkey);
@@ -1173,8 +1243,7 @@ static OSSL_CMP_SRV_CTX *setup_srv_ctx(void)
cleanse(opt_srv_keypass);
if (opt_srv_trusted != NULL) {
- X509_STORE *ts =
- load_trusted(opt_srv_trusted, 0, "certs trusted by mock server");
+ X509_STORE *ts = load_trusted(opt_srv_trusted, 0, "certs trusted by mock server");
if (ts == NULL || !OSSL_CMP_CTX_set0_trusted(ctx, ts)) {
X509_STORE_free(ts);
@@ -1184,26 +1253,26 @@ static OSSL_CMP_SRV_CTX *setup_srv_ctx(void)
CMP_warn("mock server will not be able to handle signature-protected requests since -srv_trusted is not given");
}
if (!setup_certs(opt_srv_untrusted,
- "untrusted certificates for mock server", ctx,
- (add_X509_stack_fn_t)OSSL_CMP_CTX_set1_untrusted))
+ "untrusted certificates for mock server", ctx,
+ (add_X509_stack_fn_t)OSSL_CMP_CTX_set1_untrusted))
goto err;
if (!setup_cert(srv_ctx, opt_ref_cert, opt_otherpass,
- "reference cert to be expected by the mock server",
- (add_X509_fn_t)ossl_cmp_mock_srv_set1_refCert))
+ "reference cert to be expected by the mock server",
+ (add_X509_fn_t)ossl_cmp_mock_srv_set1_refCert))
goto err;
if (opt_rsp_cert == NULL) {
CMP_warn("no -rsp_cert given for mock server");
} else {
if (!setup_cert(srv_ctx, opt_rsp_cert, opt_rsp_keypass,
- "cert the mock server returns on certificate requests",
- (add_X509_fn_t)ossl_cmp_mock_srv_set1_certOut))
+ "cert the mock server returns on certificate requests",
+ (add_X509_fn_t)ossl_cmp_mock_srv_set1_certOut))
goto err;
}
if (opt_rsp_key != NULL) {
EVP_PKEY *pkey = load_key_pwd(opt_rsp_key, opt_keyform,
- opt_rsp_keypass,
- "private key for enrollment cert");
+ opt_rsp_keypass,
+ "private key for enrollment cert");
if (pkey == NULL
|| !ossl_cmp_mock_srv_set1_keyOut(srv_ctx, pkey)) {
@@ -1215,24 +1284,24 @@ static OSSL_CMP_SRV_CTX *setup_srv_ctx(void)
cleanse(opt_rsp_keypass);
if (!setup_mock_crlout(srv_ctx, opt_rsp_crl,
- "CRL to be returned by the mock server"))
+ "CRL to be returned by the mock server"))
goto err;
if (!setup_certs(opt_rsp_extracerts,
- "CMP extra certificates for mock server", srv_ctx,
- (add_X509_stack_fn_t)ossl_cmp_mock_srv_set1_chainOut))
+ "CMP extra certificates for mock server", srv_ctx,
+ (add_X509_stack_fn_t)ossl_cmp_mock_srv_set1_chainOut))
goto err;
if (!setup_certs(opt_rsp_capubs, "caPubs for mock server", srv_ctx,
- (add_X509_stack_fn_t)ossl_cmp_mock_srv_set1_caPubsOut))
+ (add_X509_stack_fn_t)ossl_cmp_mock_srv_set1_caPubsOut))
goto err;
if (!setup_cert(srv_ctx, opt_rsp_newwithnew, opt_otherpass,
- "NewWithNew cert the mock server returns in rootCaKeyUpdate",
- (add_X509_fn_t)ossl_cmp_mock_srv_set1_newWithNew)
+ "NewWithNew cert the mock server returns in rootCaKeyUpdate",
+ (add_X509_fn_t)ossl_cmp_mock_srv_set1_newWithNew)
|| !setup_cert(srv_ctx, opt_rsp_newwithold, opt_otherpass,
- "NewWithOld cert the mock server returns in rootCaKeyUpdate",
- (add_X509_fn_t)ossl_cmp_mock_srv_set1_newWithOld)
+ "NewWithOld cert the mock server returns in rootCaKeyUpdate",
+ (add_X509_fn_t)ossl_cmp_mock_srv_set1_newWithOld)
|| !setup_cert(srv_ctx, opt_rsp_oldwithnew, opt_otherpass,
- "OldWithNew cert the mock server returns in rootCaKeyUpdate",
- (add_X509_fn_t)ossl_cmp_mock_srv_set1_oldWithNew))
+ "OldWithNew cert the mock server returns in rootCaKeyUpdate",
+ (add_X509_fn_t)ossl_cmp_mock_srv_set1_oldWithNew))
goto err;
(void)ossl_cmp_mock_srv_set_pollCount(srv_ctx, opt_poll_count);
(void)ossl_cmp_mock_srv_set_checkAfterTime(srv_ctx, opt_check_after);
@@ -1242,7 +1311,7 @@ static OSSL_CMP_SRV_CTX *setup_srv_ctx(void)
if (opt_failure != INT_MIN) { /* option has been set explicitly */
if (opt_failure < 0 || OSSL_CMP_PKIFAILUREINFO_MAX < opt_failure) {
CMP_err1("-failure out of range, should be >= 0 and <= %d",
- OSSL_CMP_PKIFAILUREINFO_MAX);
+ OSSL_CMP_PKIFAILUREINFO_MAX);
goto err;
}
if (opt_failurebits != 0)
@@ -1255,7 +1324,7 @@ static OSSL_CMP_SRV_CTX *setup_srv_ctx(void)
goto err;
}
if (!ossl_cmp_mock_srv_set_statusInfo(srv_ctx, opt_pkistatus,
- opt_failurebits, opt_statusstring))
+ opt_failurebits, opt_statusstring))
goto err;
if (opt_send_error)
@@ -1274,7 +1343,7 @@ static OSSL_CMP_SRV_CTX *setup_srv_ctx(void)
return srv_ctx;
- err:
+err:
ossl_cmp_mock_srv_free(srv_ctx);
return NULL;
}
@@ -1286,7 +1355,7 @@ static OSSL_CMP_SRV_CTX *setup_srv_ctx(void)
static int setup_verification_ctx(OSSL_CMP_CTX *ctx)
{
if (!setup_certs(opt_untrusted, "untrusted certificates", ctx,
- (add_X509_stack_fn_t)OSSL_CMP_CTX_set1_untrusted))
+ (add_X509_stack_fn_t)OSSL_CMP_CTX_set1_untrusted))
return 0;
if (opt_srvcert != NULL || opt_trusted != NULL) {
@@ -1300,8 +1369,8 @@ static int setup_verification_ctx(OSSL_CMP_CTX *ctx)
opt_recipient = NULL;
}
if (!setup_cert(ctx, opt_srvcert, opt_otherpass,
- "directly trusted CMP server certificate",
- (add_X509_fn_t)OSSL_CMP_CTX_set1_srvCert))
+ "directly trusted CMP server certificate",
+ (add_X509_fn_t)OSSL_CMP_CTX_set1_srvCert))
return 0;
}
if (opt_trusted != NULL) {
@@ -1325,9 +1394,8 @@ static int setup_verification_ctx(OSSL_CMP_CTX *ctx)
if (opt_out_trusted != NULL) { /* for use in OSSL_CMP_certConf_cb() */
X509_VERIFY_PARAM *out_vpm = NULL;
- X509_STORE *out_trusted =
- load_trusted(opt_out_trusted, 1,
- "trusted certs for verifying newly enrolled cert");
+ X509_STORE *out_trusted = load_trusted(opt_out_trusted, 1,
+ "trusted certs for verifying newly enrolled cert");
if (out_trusted == NULL)
return 0;
@@ -1380,8 +1448,8 @@ static SSL_CTX *setup_ssl_ctx(OSSL_CMP_CTX *ctx, const char *host)
int ok;
if (!load_cert_certs(opt_tls_cert, &cert, &certs, 0, opt_tls_keypass,
- "TLS client certificate (optionally with chain)",
- vpm))
+ "TLS client certificate (optionally with chain)",
+ vpm))
/* need opt_tls_keypass if opt_tls_cert is encrypted PKCS#12 file */
goto err;
@@ -1394,7 +1462,7 @@ static SSL_CTX *setup_ssl_ctx(OSSL_CMP_CTX *ctx, const char *host)
*/
if (!ok || !SSL_CTX_set0_chain(ssl_ctx, certs)) {
CMP_err1("unable to use client TLS certificate file '%s'",
- opt_tls_cert);
+ opt_tls_cert);
OSSL_STACK_OF_X509_free(certs);
goto err;
}
@@ -1415,15 +1483,14 @@ static SSL_CTX *setup_ssl_ctx(OSSL_CMP_CTX *ctx, const char *host)
bak_flags = X509_VERIFY_PARAM_get_flags(tls_vpm);
/* disable any cert status/revocation checking etc. */
X509_VERIFY_PARAM_clear_flags(tls_vpm,
- ~(X509_V_FLAG_USE_CHECK_TIME
- | X509_V_FLAG_NO_CHECK_TIME
- | X509_V_FLAG_PARTIAL_CHAIN
- | X509_V_FLAG_POLICY_CHECK));
+ ~(X509_V_FLAG_USE_CHECK_TIME
+ | X509_V_FLAG_NO_CHECK_TIME
+ | X509_V_FLAG_PARTIAL_CHAIN
+ | X509_V_FLAG_POLICY_CHECK));
}
CMP_debug("trying to build cert chain for own TLS cert");
if (SSL_CTX_build_cert_chain(ssl_ctx,
- SSL_BUILD_CHAIN_FLAG_UNTRUSTED |
- SSL_BUILD_CHAIN_FLAG_NO_ROOT)) {
+ SSL_BUILD_CHAIN_FLAG_UNTRUSTED | SSL_BUILD_CHAIN_FLAG_NO_ROOT)) {
CMP_debug("success building cert chain for own TLS cert");
} else {
OSSL_CMP_CTX_print_errors(ctx);
@@ -1436,9 +1503,9 @@ static SSL_CTX *setup_ssl_ctx(OSSL_CMP_CTX *ctx, const char *host)
/* If present we append to the list also the certs from opt_tls_extra */
if (opt_tls_extra != NULL) {
STACK_OF(X509) *tls_extra = load_certs_multifile(opt_tls_extra,
- opt_otherpass,
- "extra certificates for TLS",
- vpm);
+ opt_otherpass,
+ "extra certificates for TLS",
+ vpm);
int res = 1;
if (tls_extra == NULL)
@@ -1458,7 +1525,7 @@ static SSL_CTX *setup_ssl_ctx(OSSL_CMP_CTX *ctx, const char *host)
}
pkey = load_key_pwd(opt_tls_key, opt_keyform, opt_tls_keypass,
- "TLS client private key");
+ "TLS client private key");
cleanse(opt_tls_keypass);
if (pkey == NULL)
goto err;
@@ -1468,9 +1535,9 @@ static SSL_CTX *setup_ssl_ctx(OSSL_CMP_CTX *ctx, const char *host)
* because it gives poor and sometimes misleading diagnostics
*/
if (!X509_check_private_key(SSL_CTX_get0_certificate(ssl_ctx),
- pkey)) {
+ pkey)) {
CMP_err2("TLS private key '%s' does not match the TLS certificate '%s'\n",
- opt_tls_key, opt_tls_cert);
+ opt_tls_key, opt_tls_cert);
EVP_PKEY_free(pkey);
pkey = NULL; /* otherwise, for some reason double free! */
goto err;
@@ -1492,11 +1559,11 @@ static SSL_CTX *setup_ssl_ctx(OSSL_CMP_CTX *ctx, const char *host)
* the expected hostname would mislead the check.
*/
if (!truststore_set_host_etc(trust_store,
- opt_tls_host != NULL ? opt_tls_host : host))
+ opt_tls_host != NULL ? opt_tls_host : host))
goto err;
}
return ssl_ctx;
- err:
+err:
SSL_CTX_free(ssl_ctx);
return NULL;
}
@@ -1530,8 +1597,8 @@ static int setup_protection_ctx(OSSL_CMP_CTX *ctx)
if (pass_string != NULL) {
cleanse(opt_secret);
res = OSSL_CMP_CTX_set1_secretValue(ctx,
- (unsigned char *)pass_string,
- (int)strlen(pass_string));
+ (unsigned char *)pass_string,
+ (int)strlen(pass_string));
clear_free(pass_string);
if (res == 0)
return 0;
@@ -1540,13 +1607,13 @@ static int setup_protection_ctx(OSSL_CMP_CTX *ctx)
CMP_warn("-cert and -key not used for protection since -secret is given");
}
if (opt_ref != NULL
- && !OSSL_CMP_CTX_set1_referenceValue(ctx, (unsigned char *)opt_ref,
- (int)strlen(opt_ref)))
+ && !OSSL_CMP_CTX_set1_referenceValue(ctx, (unsigned char *)opt_ref,
+ (int)strlen(opt_ref)))
return 0;
if (opt_key != NULL) {
EVP_PKEY *pkey = load_key_pwd(opt_key, opt_keyform, opt_keypass,
- "private key for CMP client certificate");
+ "private key for CMP client certificate");
if (pkey == NULL || !OSSL_CMP_CTX_set1_pkey(ctx, pkey)) {
EVP_PKEY_free(pkey);
@@ -1564,8 +1631,8 @@ static int setup_protection_ctx(OSSL_CMP_CTX *ctx)
int ok;
if (!load_cert_certs(opt_cert, &cert, &certs, 0, opt_keypass,
- "CMP client certificate (optionally with chain)",
- vpm))
+ "CMP client certificate (optionally with chain)",
+ vpm))
/* opt_keypass is needed if opt_cert is an encrypted PKCS#12 file */
return 0;
ok = OSSL_CMP_CTX_set1_cert(ctx, cert);
@@ -1575,7 +1642,7 @@ static int setup_protection_ctx(OSSL_CMP_CTX *ctx)
} else {
if (opt_own_trusted != NULL) {
own_trusted = load_trusted(opt_own_trusted, 0,
- "trusted certs for verifying own CMP signer cert");
+ "trusted certs for verifying own CMP signer cert");
ok = own_trusted != NULL;
}
ok = ok && OSSL_CMP_CTX_build_cert_chain(ctx, own_trusted, certs);
@@ -1589,7 +1656,7 @@ static int setup_protection_ctx(OSSL_CMP_CTX *ctx)
}
if (!setup_certs(opt_extracerts, "extra certificates for CMP", ctx,
- (add_X509_stack_fn_t)OSSL_CMP_CTX_set1_extraCertsOut))
+ (add_X509_stack_fn_t)OSSL_CMP_CTX_set1_extraCertsOut))
return 0;
cleanse(opt_otherpass);
@@ -1641,25 +1708,25 @@ static int set_fallback_pubkey(OSSL_CMP_CTX *ctx)
if (req == NULL) {
CMP_err1("failed to load ir/cr/kur file '%s' attempting to get fallback public key",
- file);
+ file);
return 0;
}
if ((pubkey = OSSL_CMP_MSG_get0_certreq_publickey(req)) == NULL
|| (pkey = X509_PUBKEY_get0(pubkey)) == NULL) {
CMP_err1("failed to get fallback public key from ir/cr/kur file '%s'",
- file);
+ file);
goto err;
}
pkey1 = EVP_PKEY_dup(pkey);
if (pkey == NULL || !OSSL_CMP_CTX_set0_newPkey(ctx, 0 /* priv */, pkey1)) {
EVP_PKEY_free(pkey1);
CMP_err1("failed to get fallback public key obtained from ir/cr/kur file '%s'",
- file);
+ file);
goto err;
}
res = 1;
- err:
+err:
OSSL_CMP_MSG_free(req);
return res;
}
@@ -1676,8 +1743,8 @@ static int setup_request_ctx(OSSL_CMP_CTX *ctx)
X509V3_CTX ext_ctx;
if (opt_subject == NULL
- && opt_csr == NULL && opt_oldcert == NULL && opt_cert == NULL
- && opt_cmd != CMP_RR && opt_cmd != CMP_GENM)
+ && opt_csr == NULL && opt_oldcert == NULL && opt_cert == NULL
+ && opt_cmd != CMP_RR && opt_cmd != CMP_GENM)
CMP_warn("no -subject given; no -csr or -oldcert or -cert available for fallback");
if (!set_name(opt_issuer, OSSL_CMP_CTX_set1_issuer, ctx, "issuer"))
@@ -1709,8 +1776,7 @@ static int setup_request_ctx(OSSL_CMP_CTX *ctx)
&& opt_popo != OSSL_CRMF_POPO_RAVERIFIED) {
if (opt_csr != NULL) {
CMP_err1("no -newkey option given with private key for POPO, -csr option provides just public key%s",
- opt_key == NULL ? "" :
- ", and -key option superseded by -csr");
+ opt_key == NULL ? "" : ", and -key option superseded by -csr");
if (opt_reqin != NULL)
CMP_info("since -reqin is used, may use -popo -1 or -popo 0 to disable the needless generation of a POPO");
return 0;
@@ -1736,7 +1802,7 @@ static int setup_request_ctx(OSSL_CMP_CTX *ctx)
return 0;
} else {
CMP_warn1("-subject %s since sender is taken from -ref or -cert",
- msg);
+ msg);
}
}
if (opt_issuer != NULL && opt_cmd != CMP_RR)
@@ -1777,7 +1843,7 @@ static int setup_request_ctx(OSSL_CMP_CTX *ctx)
}
if (opt_subject != NULL)
CMP_warn2("given -subject '%s' overrides the subject of '%s' for KUR",
- opt_subject, ref_cert != NULL ? ref_cert : opt_csr);
+ opt_subject, ref_cert != NULL ? ref_cert : opt_csr);
}
if (opt_cmd == CMP_RR) {
if (opt_issuer == NULL && opt_serial == NULL) {
@@ -1814,7 +1880,7 @@ static int setup_request_ctx(OSSL_CMP_CTX *ctx)
}
if (opt_revreason > CRL_REASON_NONE)
(void)OSSL_CMP_CTX_set_option(ctx, OSSL_CMP_OPT_REVOCATION_REASON,
- opt_revreason);
+ opt_revreason);
} else {
if (opt_serial != NULL)
CMP_warn("Ignoring -serial for command other than 'rr'");
@@ -1825,7 +1891,7 @@ static int setup_request_ctx(OSSL_CMP_CTX *ctx)
}
if (opt_recipient == NULL && opt_srvcert == NULL && opt_issuer == NULL
- && opt_oldcert == NULL && opt_cert == NULL)
+ && opt_oldcert == NULL && opt_cert == NULL)
CMP_warn("missing -recipient, -srvcert, -issuer, -oldcert or -cert; recipient for any requests not covered by -reqin will be set to \"NULL-DN\"");
if (opt_cmd == CMP_P10CR || opt_cmd == CMP_RR || opt_cmd == CMP_GENM) {
@@ -1867,15 +1933,15 @@ static int setup_request_ctx(OSSL_CMP_CTX *ctx)
return 0;
}
} else if (opt_reqin != NULL
- && opt_key == NULL && opt_csr == NULL && opt_oldcert == NULL
- && !opt_centralkeygen) {
+ && opt_key == NULL && opt_csr == NULL && opt_oldcert == NULL
+ && !opt_centralkeygen) {
if (!set_fallback_pubkey(ctx))
return 0;
}
if (opt_days > 0
- && !OSSL_CMP_CTX_set_option(ctx, OSSL_CMP_OPT_VALIDITY_DAYS,
- opt_days)) {
+ && !OSSL_CMP_CTX_set_option(ctx, OSSL_CMP_OPT_VALIDITY_DAYS,
+ opt_days)) {
CMP_err("could not set requested cert validity period");
return 0;
}
@@ -1904,13 +1970,13 @@ static int setup_request_ctx(OSSL_CMP_CTX *ctx)
if (opt_reqexts != NULL
&& !X509V3_EXT_add_nconf_sk(conf, &ext_ctx, opt_reqexts, &exts)) {
CMP_err1("cannot load certificate request extension section '%s'",
- opt_reqexts);
+ opt_reqexts);
goto exts_err;
}
if (opt_policies != NULL
&& !X509V3_EXT_add_nconf_sk(conf, &ext_ctx, opt_policies, &exts)) {
CMP_err1("cannot load policy cert request extension section '%s'",
- opt_policies);
+ opt_policies);
goto exts_err;
}
OSSL_CMP_CTX_set0_reqExtensions(ctx, exts);
@@ -1929,7 +1995,7 @@ static int setup_request_ctx(OSSL_CMP_CTX *ctx)
if (opt_sans != NULL)
CMP_warn("-opt_san_nodefault has no effect when -sans is used");
(void)OSSL_CMP_CTX_set_option(ctx,
- OSSL_CMP_OPT_SUBJECTALTNAME_NODEFAULT, 1);
+ OSSL_CMP_OPT_SUBJECTALTNAME_NODEFAULT, 1);
}
if (opt_policy_oids_critical) {
@@ -1971,11 +2037,10 @@ static int setup_request_ctx(OSSL_CMP_CTX *ctx)
CMP_warn("-oldcert option is ignored for 'genm' command");
} else {
if (!setup_cert(ctx, opt_oldcert, opt_keypass,
- /* needed if opt_oldcert is encrypted PKCS12 file */
- opt_cmd == CMP_KUR ? "certificate to be updated" :
- opt_cmd == CMP_RR ? "certificate to be revoked" :
- "reference certificate (oldcert)",
- (add_X509_fn_t)OSSL_CMP_CTX_set1_oldCert))
+ /* needed if opt_oldcert is encrypted PKCS12 file */
+ opt_cmd == CMP_KUR ? "certificate to be updated" : opt_cmd == CMP_RR ? "certificate to be revoked"
+ : "reference certificate (oldcert)",
+ (add_X509_fn_t)OSSL_CMP_CTX_set1_oldCert))
return 0;
}
}
@@ -1983,9 +2048,9 @@ static int setup_request_ctx(OSSL_CMP_CTX *ctx)
return 1;
- oom:
+oom:
CMP_err("out of memory");
- exts_err:
+exts_err:
sk_X509_EXTENSION_pop_free(exts, X509_EXTENSION_free);
X509_REQ_free(csr);
return 0;
@@ -2017,7 +2082,7 @@ static int add_certProfile(OSSL_CMP_CTX *ctx, const char *name)
OSSL_CMP_ITAV_free(itav);
return 0;
- err:
+err:
sk_ASN1_UTF8STRING_pop_free(sk, ASN1_UTF8STRING_free);
return 0;
}
@@ -2060,14 +2125,14 @@ static int handle_opt_geninfo(OSSL_CMP_CTX *ctx)
if (*ptr != '\0') {
if (*ptr != ',') {
CMP_err1("Missing ',' or end of -geninfo arg after int at %.40s",
- ptr);
+ ptr);
goto err;
}
ptr++;
}
if ((aint = ASN1_INTEGER_new()) == NULL
- || !ASN1_INTEGER_set(aint, value))
+ || !ASN1_INTEGER_set(aint, value))
goto oom;
ASN1_TYPE_set(type, V_ASN1_INTEGER, aint);
aint = NULL;
@@ -2079,7 +2144,7 @@ static int handle_opt_geninfo(OSSL_CMP_CTX *ctx)
else
*end++ = '\0';
if ((text = ASN1_UTF8STRING_new()) == NULL
- || !ASN1_STRING_set(text, ptr, -1))
+ || !ASN1_STRING_set(text, ptr, -1))
goto oom;
ptr = end;
ASN1_TYPE_set(type, V_ASN1_UTF8STRING, text);
@@ -2105,9 +2170,9 @@ static int handle_opt_geninfo(OSSL_CMP_CTX *ctx)
} while (*ptr != '\0');
return 1;
- oom:
+oom:
CMP_err("out of memory");
- err:
+err:
ASN1_OBJECT_free(obj);
ASN1_TYPE_free(type);
ASN1_INTEGER_free(aint);
@@ -2155,8 +2220,8 @@ static int setup_client_ctx(OSSL_CMP_CTX *ctx)
goto set_path;
}
if (!OSSL_HTTP_parse_url(opt_server, &use_ssl, NULL /* user */,
- &host, &port, &portnum,
- &path, NULL /* q */, NULL /* frag */)) {
+ &host, &port, &portnum,
+ &path, NULL /* q */, NULL /* frag */)) {
CMP_err1("cannot parse -server URL: %s", opt_server);
goto err;
}
@@ -2171,21 +2236,21 @@ static int setup_client_ctx(OSSL_CMP_CTX *ctx)
if (opt_path == NULL)
used_path = path;
if (!OSSL_CMP_CTX_set1_server(ctx, host)
- || !OSSL_CMP_CTX_set_serverPort(ctx, portnum))
+ || !OSSL_CMP_CTX_set_serverPort(ctx, portnum))
goto oom;
if (opt_proxy != NULL && !OSSL_CMP_CTX_set1_proxy(ctx, opt_proxy))
goto oom;
if (opt_no_proxy != NULL && !OSSL_CMP_CTX_set1_no_proxy(ctx, opt_no_proxy))
goto oom;
(void)BIO_snprintf(server_buf, sizeof(server_buf), "http%s://%s:%s/%s",
- opt_tls_used ? "s" : "", host, port,
- *used_path == '/' ? used_path + 1 : used_path);
+ opt_tls_used ? "s" : "", host, port,
+ *used_path == '/' ? used_path + 1 : used_path);
proxy_host = OSSL_HTTP_adapt_proxy(opt_proxy, opt_no_proxy, host, use_ssl);
if (proxy_host != NULL)
(void)BIO_snprintf(proxy_buf, sizeof(proxy_buf), " via %s", proxy_host);
- set_path:
+set_path:
#endif
if (!OSSL_CMP_CTX_set1_serverPath(ctx, used_path))
@@ -2236,19 +2301,19 @@ static int setup_client_ctx(OSSL_CMP_CTX *ctx)
if (opt_keep_alive != 1)
(void)OSSL_CMP_CTX_set_option(ctx, OSSL_CMP_OPT_KEEP_ALIVE,
- opt_keep_alive);
+ opt_keep_alive);
if (opt_total_timeout > 0 && opt_msg_timeout > 0
- && opt_total_timeout < opt_msg_timeout) {
+ && opt_total_timeout < opt_msg_timeout) {
CMP_err2("-total_timeout argument = %d must not be < %d (-msg_timeout)",
- opt_total_timeout, opt_msg_timeout);
+ opt_total_timeout, opt_msg_timeout);
goto err;
}
if (opt_msg_timeout >= 0) /* must do this before setup_ssl_ctx() */
(void)OSSL_CMP_CTX_set_option(ctx, OSSL_CMP_OPT_MSG_TIMEOUT,
- opt_msg_timeout);
+ opt_msg_timeout);
if (opt_total_timeout >= 0)
(void)OSSL_CMP_CTX_set_option(ctx, OSSL_CMP_OPT_TOTAL_TIMEOUT,
- opt_total_timeout);
+ opt_total_timeout);
if (opt_rspin != NULL) {
rspin_in_use = 1;
@@ -2258,7 +2323,7 @@ static int setup_client_ctx(OSSL_CMP_CTX *ctx)
if (opt_reqin_new_tid && opt_reqin == NULL)
CMP_warn("-reqin_new_tid is ignored since -reqin is not present");
if (opt_reqin != NULL || opt_reqout != NULL
- || opt_rspin != NULL || opt_rspout != NULL || opt_use_mock_srv)
+ || opt_rspin != NULL || opt_rspout != NULL || opt_use_mock_srv)
(void)OSSL_CMP_CTX_set_transfer_cb(ctx, read_write_req_resp);
#if !defined(OPENSSL_NO_SOCK) && !defined(OPENSSL_NO_HTTP)
@@ -2302,8 +2367,8 @@ static int setup_client_ctx(OSSL_CMP_CTX *ctx)
goto err;
if (!set_name(opt_recipient, OSSL_CMP_CTX_set1_recipient, ctx, "recipient")
- || !set_name(opt_expect_sender, OSSL_CMP_CTX_set1_expected_sender,
- ctx, "expected sender"))
+ || !set_name(opt_expect_sender, OSSL_CMP_CTX_set1_expected_sender,
+ ctx, "expected sender"))
goto err;
if (opt_geninfo != NULL && !handle_opt_geninfo(ctx))
@@ -2314,17 +2379,16 @@ static int setup_client_ctx(OSSL_CMP_CTX *ctx)
/* not printing earlier, to minimize confusion in case setup fails before */
if (opt_reqout_only == NULL)
CMP_info3("will contact %s%s%s ", server_buf, proxy_buf,
- opt_rspin == NULL ? "" :
- " only if -rspin argument gives too few filenames");
+ opt_rspin == NULL ? "" : " only if -rspin argument gives too few filenames");
ret = 1;
- err:
+err:
OPENSSL_free(host);
OPENSSL_free(port);
OPENSSL_free(path);
return ret;
- oom:
+oom:
CMP_err("out of memory");
goto err;
}
@@ -2337,12 +2401,12 @@ static int setup_client_ctx(OSSL_CMP_CTX *ctx)
static int write_cert(BIO *bio, X509 *cert)
{
if ((opt_certform == FORMAT_PEM && PEM_write_bio_X509(bio, cert))
- || (opt_certform == FORMAT_ASN1 && i2d_X509_bio(bio, cert)))
+ || (opt_certform == FORMAT_ASN1 && i2d_X509_bio(bio, cert)))
return 1;
if (opt_certform != FORMAT_PEM && opt_certform != FORMAT_ASN1)
BIO_printf(bio_err,
- "error: unsupported type '%s' for writing certificates\n",
- opt_certform_s);
+ "error: unsupported type '%s' for writing certificates\n",
+ opt_certform_s);
return 0;
}
@@ -2350,12 +2414,12 @@ static int write_crl(BIO *bio, X509_CRL *crl)
{
if (opt_crlform != FORMAT_PEM && opt_crlform != FORMAT_ASN1) {
BIO_printf(bio_err, "error: unsupported type '%s' for writing CRLs\n",
- opt_crlform_s);
+ opt_crlform_s);
return 0;
}
return opt_crlform == FORMAT_PEM ? PEM_write_bio_X509_CRL(bio, crl)
- : i2d_X509_CRL_bio(bio, crl);
+ : i2d_X509_CRL_bio(bio, crl);
}
/*
@@ -2367,7 +2431,7 @@ static int write_crl(BIO *bio, X509_CRL *crl)
* Returns number of written certificates on success, -1 on error.
*/
static int save_free_certs(STACK_OF(X509) *certs,
- const char *file, const char *desc)
+ const char *file, const char *desc)
{
BIO *bio = NULL;
int i;
@@ -2379,14 +2443,14 @@ static int save_free_certs(STACK_OF(X509) *certs,
goto end;
if (certs != NULL)
CMP_info3("received %d %s certificate(s), saving to file '%s'",
- n, desc, file);
+ n, desc, file);
if (n > 1 && opt_certform != FORMAT_PEM)
CMP_warn("saving more than one certificate in non-PEM format");
if ((bio = BIO_new(BIO_s_file())) == NULL
- || !BIO_write_filename(bio, (char *)file)) {
+ || !BIO_write_filename(bio, (char *)file)) {
CMP_err3("could not open file '%s' for %s %s certificate(s)",
- file, certs == NULL ? "deleting" : "writing", desc);
+ file, certs == NULL ? "deleting" : "writing", desc);
n = -1;
goto end;
}
@@ -2399,14 +2463,14 @@ static int save_free_certs(STACK_OF(X509) *certs,
}
}
- end:
+end:
BIO_free(bio);
OSSL_STACK_OF_X509_free(certs);
return n;
}
static int save_crl(X509_CRL *crl,
- const char *file, const char *desc)
+ const char *file, const char *desc)
{
BIO *bio = NULL;
int res = 0;
@@ -2417,9 +2481,9 @@ static int save_crl(X509_CRL *crl,
CMP_info2("received %s, saving to file '%s'", desc, file);
if ((bio = BIO_new(BIO_s_file())) == NULL
- || !BIO_write_filename(bio, (char *)file)) {
+ || !BIO_write_filename(bio, (char *)file)) {
CMP_err2("could not open file '%s' for writing %s",
- file, desc);
+ file, desc);
goto end;
}
@@ -2429,7 +2493,7 @@ static int save_crl(X509_CRL *crl,
}
res = 1;
- end:
+end:
BIO_free(bio);
return res;
}
@@ -2441,7 +2505,7 @@ static int delete_file(const char *file, const char *desc)
if (unlink(file) != 0 && errno != ENOENT) {
CMP_err2("Failed to delete %s, which should be done to indicate there is no %s",
- file, desc);
+ file, desc);
return 0;
}
return 1;
@@ -2480,13 +2544,13 @@ static int save_template(const char *file, const OSSL_CRMF_CERTTEMPLATE *tmpl)
if (bio == NULL) {
CMP_err1("error saving certTemplate from genp: cannot open file %s",
- file);
+ file);
return 0;
}
if (!ASN1_i2d_bio_of(OSSL_CRMF_CERTTEMPLATE, i2d_OSSL_CRMF_CERTTEMPLATE,
- bio, tmpl)) {
+ bio, tmpl)) {
CMP_err1("error saving certTemplate from genp: cannot write file %s",
- file);
+ file);
BIO_free(bio);
return 0;
} else {
@@ -2577,7 +2641,7 @@ static const char *prev_item(const char *opt, const char *end)
len = end - beg;
if (len > SECTION_NAME_MAX) {
CMP_warn3("using only first %d characters of section name starting with \"%.*s\"",
- SECTION_NAME_MAX, SECTION_NAME_MAX, beg);
+ SECTION_NAME_MAX, SECTION_NAME_MAX, beg);
len = SECTION_NAME_MAX;
}
memcpy(opt_item, beg, len);
@@ -2594,7 +2658,7 @@ static const char *prev_item(const char *opt, const char *end)
/* get str value for name from a comma-separated hierarchy of config sections */
static char *conf_get_string(const CONF *src_conf, const char *groups,
- const char *name)
+ const char *name)
{
char *res = NULL;
const char *end = groups + strlen(groups);
@@ -2608,7 +2672,7 @@ static char *conf_get_string(const CONF *src_conf, const char *groups,
/* get long val for name from a comma-separated hierarchy of config sections */
static int conf_get_number_e(const CONF *conf_, const char *groups,
- const char *name, long *result)
+ const char *name, long *result)
{
char *str = conf_get_string(conf_, groups, name);
char *tailptr;
@@ -2645,25 +2709,22 @@ static int read_config(void)
int n_options = OSSL_NELEM(cmp_options) - 1;
for (opt = &cmp_options[start_opt], i = start_idx;
- opt->name != NULL; i++, opt++)
+ opt->name != NULL; i++, opt++)
if (!strcmp(opt->name, OPT_SECTION_STR)
- || !strcmp(opt->name, OPT_MORE_STR))
+ || !strcmp(opt->name, OPT_MORE_STR))
n_options--;
- OPENSSL_assert(OSSL_NELEM(cmp_vars) == n_options
- + OPT_PROV__FIRST + 1 - OPT_PROV__LAST
- + OPT_R__FIRST + 1 - OPT_R__LAST
- + OPT_V__FIRST + 1 - OPT_V__LAST);
+ OPENSSL_assert(OSSL_NELEM(cmp_vars) == n_options + OPT_PROV__FIRST + 1 - OPT_PROV__LAST + OPT_R__FIRST + 1 - OPT_R__LAST + OPT_V__FIRST + 1 - OPT_V__LAST);
for (opt = &cmp_options[start_opt], i = start_idx;
- opt->name != NULL; i++, opt++) {
+ opt->name != NULL; i++, opt++) {
int provider_option = (OPT_PROV__FIRST <= opt->retval
- && opt->retval < OPT_PROV__LAST);
+ && opt->retval < OPT_PROV__LAST);
int rand_state_option = (OPT_R__FIRST <= opt->retval
- && opt->retval < OPT_R__LAST);
+ && opt->retval < OPT_R__LAST);
int verification_option = (OPT_V__FIRST <= opt->retval
- && opt->retval < OPT_V__LAST);
+ && opt->retval < OPT_V__LAST);
if (strcmp(opt->name, OPT_SECTION_STR) == 0
- || strcmp(opt->name, OPT_MORE_STR) == 0) {
+ || strcmp(opt->name, OPT_MORE_STR) == 0) {
i--;
continue;
}
@@ -2681,12 +2742,12 @@ static int read_config(void)
}
if (opt->valtype == 'p' && num <= 0) {
opt_printf_stderr("Non-positive number \"%ld\" for config option -%s\n",
- num, opt->name);
+ num, opt->name);
return -1;
}
if (opt->valtype == 'N' && num < 0) {
opt_printf_stderr("Negative number \"%ld\" for config option -%s\n",
- num, opt->name);
+ num, opt->name);
return -1;
}
break;
@@ -2701,7 +2762,7 @@ static int read_config(void)
break;
default:
CMP_err2("internal: unsupported type '%c' for option '%s'",
- opt->valtype, opt->name);
+ opt->valtype, opt->name);
return 0;
break;
}
@@ -2725,10 +2786,10 @@ static int read_config(void)
(void)opt_init(conf_argc, conf_argv, cmp_options);
if (provider_option
- ? !opt_provider(opt_next())
- : !opt_verify(opt_next(), vpm)) {
+ ? !opt_provider(opt_next())
+ : !opt_verify(opt_next(), vpm)) {
CMP_err2("for option '%s' in config file section '%s'",
- opt->name, opt_section);
+ opt->name, opt_section);
return 0;
}
}
@@ -2740,8 +2801,8 @@ static int read_config(void)
case 'N':
if (num < INT_MIN || INT_MAX < num) {
BIO_printf(bio_err,
- "integer value out of range for option '%s'\n",
- opt->name);
+ "integer value out of range for option '%s'\n",
+ opt->name);
return 0;
}
*cmp_vars[i].num = (int)num;
@@ -2767,7 +2828,7 @@ static char *opt_str(void)
if (arg[0] == '\0') {
CMP_warn1("%s option argument is empty string, resetting option",
- opt_flag());
+ opt_flag());
arg = NULL;
} else if (arg[0] == '-') {
CMP_warn1("%s option argument starts with hyphen", opt_flag());
@@ -2786,7 +2847,7 @@ static int get_opts(int argc, char **argv)
switch (o) {
case OPT_EOF:
case OPT_ERR:
- opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
return 0;
case OPT_HELP:
@@ -2997,7 +3058,7 @@ static int get_opts(int argc, char **argv)
case OPT_POPO:
opt_popo = opt_int_arg();
if (opt_popo < OSSL_CRMF_POPO_NONE
- || opt_popo > OSSL_CRMF_POPO_KEYENC) {
+ || opt_popo > OSSL_CRMF_POPO_KEYENC) {
CMP_err("invalid popo spec. Valid values are -1 .. 2");
goto opthelp;
}
@@ -3026,8 +3087,8 @@ static int get_opts(int argc, char **argv)
case OPT_REVREASON:
opt_revreason = opt_int_arg();
if (opt_revreason < CRL_REASON_NONE
- || opt_revreason > CRL_REASON_AA_COMPROMISE
- || opt_revreason == 7) {
+ || opt_revreason > CRL_REASON_AA_COMPROMISE
+ || opt_revreason == 7) {
CMP_err("invalid revreason. Valid values are -1 .. 6, 8 .. 10");
goto opthelp;
}
@@ -3212,9 +3273,9 @@ static int cmp_server(OSSL_CMP_CTX *srv_cmp_ctx)
OSSL_CMP_MSG *resp = NULL;
ret = http_server_get_asn1_req(ASN1_ITEM_rptr(OSSL_CMP_MSG),
- (ASN1_VALUE **)&req, &path,
- &cbio, acbio, &keep_alive,
- prog, 0, 0);
+ (ASN1_VALUE **)&req, &path,
+ &cbio, acbio, &keep_alive,
+ prog, 0, 0);
if (ret == 0) { /* no request yet */
if (retry) {
OSSL_sleep(1000);
@@ -3233,7 +3294,7 @@ static int cmp_server(OSSL_CMP_CTX *srv_cmp_ctx)
if (strcmp(path, "") != 0 && strcmp(path, "pkix/") != 0) {
(void)http_server_send_status(prog, cbio, 404, "Not Found");
CMP_err1("expecting empty path or 'pkix/' but got '%s'",
- path);
+ path);
OPENSSL_free(path);
OSSL_CMP_MSG_free(req);
goto next;
@@ -3243,13 +3304,13 @@ static int cmp_server(OSSL_CMP_CTX *srv_cmp_ctx)
OSSL_CMP_MSG_free(req);
if (resp == NULL) {
(void)http_server_send_status(prog, cbio,
- 500, "Internal Server Error");
+ 500, "Internal Server Error");
break; /* treated as fatal error */
}
ret = http_server_send_asn1_resp(prog, cbio, keep_alive,
- "application/pkixcmp",
- ASN1_ITEM_rptr(OSSL_CMP_MSG),
- (const ASN1_VALUE *)resp);
+ "application/pkixcmp",
+ ASN1_ITEM_rptr(OSSL_CMP_MSG),
+ (const ASN1_VALUE *)resp);
OSSL_CMP_MSG_free(resp);
if (!ret)
break; /* treated as fatal error */
@@ -3299,28 +3360,26 @@ static void print_keyspec(OSSL_CMP_ATAVS *keySpec)
int nid = OBJ_obj2nid(type);
switch (nid) {
- case NID_id_regCtrl_algId:
- {
- X509_ALGOR *alg = OSSL_CMP_ATAV_get0_algId(atav);
- const ASN1_OBJECT *oid;
- int paramtype;
- const void *param;
-
- X509_ALGOR_get0(&oid, ¶mtype, ¶m, alg);
- BIO_printf(mem, "Key algorithm: ");
- i2a_ASN1_OBJECT(mem, oid);
- if (paramtype == V_ASN1_UNDEF || alg->parameter == NULL) {
- BIO_printf(mem, "\n");
- } else {
- BIO_printf(mem, " - ");
- ASN1_item_print(mem, (ASN1_VALUE *)alg,
- 0, ASN1_ITEM_rptr(X509_ALGOR), NULL);
- }
+ case NID_id_regCtrl_algId: {
+ X509_ALGOR *alg = OSSL_CMP_ATAV_get0_algId(atav);
+ const ASN1_OBJECT *oid;
+ int paramtype;
+ const void *param;
+
+ X509_ALGOR_get0(&oid, ¶mtype, ¶m, alg);
+ BIO_printf(mem, "Key algorithm: ");
+ i2a_ASN1_OBJECT(mem, oid);
+ if (paramtype == V_ASN1_UNDEF || alg->parameter == NULL) {
+ BIO_printf(mem, "\n");
+ } else {
+ BIO_printf(mem, " - ");
+ ASN1_item_print(mem, (ASN1_VALUE *)alg,
+ 0, ASN1_ITEM_rptr(X509_ALGOR), NULL);
}
- break;
+ } break;
case NID_id_regCtrl_rsaKeyLen:
BIO_printf(mem, "Key algorithm: RSA %d\n",
- OSSL_CMP_ATAV_get_rsaKeyLen(atav));
+ OSSL_CMP_ATAV_get_rsaKeyLen(atav));
break;
default:
BIO_printf(mem, "Invalid key spec: %s\n", nid_name(nid));
@@ -3343,8 +3402,7 @@ static void print_status(void)
/* print PKIStatusInfo */
int status = OSSL_CMP_CTX_get_status(cmp_ctx);
char *buf = app_malloc(OSSL_CMP_PKISI_BUFLEN, "PKIStatusInfo buf");
- const char *string =
- OSSL_CMP_CTX_snprint_PKIStatus(cmp_ctx, buf, OSSL_CMP_PKISI_BUFLEN);
+ const char *string = OSSL_CMP_CTX_snprint_PKIStatus(cmp_ctx, buf, OSSL_CMP_PKISI_BUFLEN);
const char *from = "", *server = "";
#if !defined(OPENSSL_NO_SOCK) && !defined(OPENSSL_NO_HTTP)
@@ -3354,16 +3412,17 @@ static void print_status(void)
}
#endif
CMP_print(bio_err,
- status == OSSL_CMP_PKISTATUS_accepted
- ? OSSL_CMP_LOG_INFO :
- status == OSSL_CMP_PKISTATUS_rejection
- || status == OSSL_CMP_PKISTATUS_waiting
- ? OSSL_CMP_LOG_ERR : OSSL_CMP_LOG_WARNING,
- status == OSSL_CMP_PKISTATUS_accepted ? "info" :
- status == OSSL_CMP_PKISTATUS_rejection ? "server error" :
- status == OSSL_CMP_PKISTATUS_waiting ? "internal error"
- : "warning", "received%s%s %s", from, server,
- string != NULL ? string : "<unknown PKIStatus>");
+ status == OSSL_CMP_PKISTATUS_accepted
+ ? OSSL_CMP_LOG_INFO
+ : status == OSSL_CMP_PKISTATUS_rejection
+ || status == OSSL_CMP_PKISTATUS_waiting
+ ? OSSL_CMP_LOG_ERR
+ : OSSL_CMP_LOG_WARNING,
+ status == OSSL_CMP_PKISTATUS_accepted ? "info" : status == OSSL_CMP_PKISTATUS_rejection ? "server error"
+ : status == OSSL_CMP_PKISTATUS_waiting ? "internal error"
+ : "warning",
+ "received%s%s %s", from, server,
+ string != NULL ? string : "<unknown PKIStatus>");
OPENSSL_free(buf);
}
@@ -3385,7 +3444,7 @@ static int do_genm(OSSL_CMP_CTX *ctx)
CMP_warn("no CA certificates provided by server");
} else if (save_free_certs(cacerts, opt_cacertsout, "CA") < 0) {
CMP_err1("Failed to store CA certificates from genp in %s",
- opt_cacertsout);
+ opt_cacertsout);
return 0;
}
return 1;
@@ -3404,12 +3463,12 @@ static int do_genm(OSSL_CMP_CTX *ctx)
CMP_warn("No -oldwithold given, will use all certs given with -trusted as trust anchors for verifying the newWithNew cert");
} else {
oldwithold = load_cert_pwd(opt_oldwithold, opt_otherpass,
- "OldWithOld cert for genm with -infotype rootCaCert");
+ "OldWithOld cert for genm with -infotype rootCaCert");
if (oldwithold == NULL)
goto end_upd;
}
if (!OSSL_CMP_get1_rootCaKeyUpdate(ctx, oldwithold, &newwithnew,
- &newwithold, &oldwithnew))
+ &newwithold, &oldwithnew))
goto end_upd;
/* At this point might check authorization of response sender/origin */
@@ -3419,11 +3478,11 @@ static int do_genm(OSSL_CMP_CTX *ctx)
CMP_warn("oldWithNew certificate received in genp for verifying oldWithOld, but oldWithOld was not provided");
if (save_cert_or_delete(newwithnew, opt_newwithnew,
- "NewWithNew cert from genp")
+ "NewWithNew cert from genp")
&& save_cert_or_delete(newwithold, opt_newwithold,
- "NewWithOld cert from genp")
+ "NewWithOld cert from genp")
&& save_cert_or_delete(oldwithnew, opt_oldwithnew,
- "OldWithNew cert from genp"))
+ "OldWithNew cert from genp"))
res = 1;
X509_free(newwithnew);
@@ -3449,21 +3508,21 @@ static int do_genm(OSSL_CMP_CTX *ctx)
if (opt_crlcert != NULL) {
crlcert = load_cert_pwd(opt_crlcert, opt_otherpass,
- "Cert for genm with -infotype crlStatusList");
+ "Cert for genm with -infotype crlStatusList");
if (crlcert == NULL)
goto end_crlupd;
}
if (opt_oldcrl != NULL) {
oldcrl = load_crl(opt_oldcrl, FORMAT_UNDEF, 0,
- "CRL for genm with -infotype crlStatusList");
+ "CRL for genm with -infotype crlStatusList");
if (oldcrl == NULL)
goto end_crlupd;
}
if (opt_oldcrl != NULL && opt_crlcert != NULL) {
if (X509_NAME_cmp(X509_CRL_get_issuer(oldcrl),
- X509_get_issuer_name(crlcert))
+ X509_get_issuer_name(crlcert))
!= 0)
CMP_warn("-oldcrl and -crlcert have different issuer");
}
@@ -3526,12 +3585,12 @@ static int do_genm(OSSL_CMP_CTX *ctx)
if (opt_infotype != NID_undef) {
CMP_warn1("No specific support for -infotype %s available",
- opt_infotype_s);
+ opt_infotype_s);
req = OSSL_CMP_ITAV_create(OBJ_nid2obj(opt_infotype), NULL);
if (req == NULL || !OSSL_CMP_CTX_push0_genm_ITAV(ctx, req)) {
CMP_err1("Failed to create genm for -infotype %s",
- opt_infotype_s);
+ opt_infotype_s);
return 0;
}
}
@@ -3564,11 +3623,12 @@ static int handle_opts_upfront(int argc, char **argv)
if (!strcmp(argv[i] + 1, cmp_options[OPT_CONFIG - OPT_HELP].name))
opt_config = argv[++i];
else if (!strcmp(argv[i] + 1,
- cmp_options[OPT_SECTION - OPT_HELP].name))
+ cmp_options[OPT_SECTION - OPT_HELP].name))
opt_section = argv[++i];
else if (strcmp(argv[i] + 1,
- cmp_options[OPT_VERBOSITY - OPT_HELP].name) == 0
- && !set_verbosity(atoi(argv[++i])))
+ cmp_options[OPT_VERBOSITY - OPT_HELP].name)
+ == 0
+ && !set_verbosity(atoi(argv[++i])))
return 0;
}
}
@@ -3596,10 +3656,10 @@ int cmp_main(int argc, char **argv)
/* read default values for options from config file */
configfile = opt_config != NULL ? opt_config : default_config_file;
if (configfile != NULL && configfile[0] != '\0' /* non-empty string */
- && (configfile != default_config_file
- || access(configfile, F_OK) != -1)) {
+ && (configfile != default_config_file
+ || access(configfile, F_OK) != -1)) {
CMP_info2("using section(s) '%s' of OpenSSL configuration file '%s'",
- opt_section, configfile);
+ opt_section, configfile);
conf = app_load_config(configfile);
if (conf == NULL) {
goto err;
@@ -3608,14 +3668,14 @@ int cmp_main(int argc, char **argv)
if (!NCONF_get_section(conf, opt_section))
CMP_info2("no [%s] section found in config file '%s';"
" will thus use just [default] and unnamed section if present",
- opt_section, configfile);
+ opt_section, configfile);
} else {
const char *end = opt_section + strlen(opt_section);
while ((end = prev_item(opt_section, end)) != NULL) {
if (!NCONF_get_section(conf, opt_item)) {
CMP_err2("no [%s] section found in config file '%s'",
- opt_item, configfile);
+ opt_item, configfile);
goto err;
}
}
@@ -3655,8 +3715,8 @@ int cmp_main(int argc, char **argv)
#if !defined(OPENSSL_NO_SOCK) && !defined(OPENSSL_NO_HTTP)
if (opt_tls_cert == NULL && opt_tls_key == NULL && opt_tls_keypass == NULL
- && opt_tls_extra == NULL && opt_tls_trusted == NULL
- && opt_tls_host == NULL) {
+ && opt_tls_extra == NULL && opt_tls_trusted == NULL
+ && opt_tls_host == NULL) {
if (opt_tls_used)
CMP_warn("-tls_used given without any other TLS options");
} else if (!opt_tls_used) {
@@ -3696,13 +3756,13 @@ int cmp_main(int argc, char **argv)
(void)OSSL_CMP_CTX_set_option(cmp_ctx, OSSL_CMP_OPT_IGNORE_KEYUSAGE, 1);
if (opt_no_cache_extracerts)
(void)OSSL_CMP_CTX_set_option(cmp_ctx, OSSL_CMP_OPT_NO_CACHE_EXTRACERTS,
- 1);
+ 1);
if (opt_reqout_only == NULL && (opt_use_mock_srv
#if !defined(OPENSSL_NO_SOCK) && !defined(OPENSSL_NO_HTTP)
- || opt_port != NULL
+ || opt_port != NULL
#endif
- )) {
+ )) {
OSSL_CMP_SRV_CTX *srv_ctx;
OSSL_CMP_CTX *srv_cmp_ctx;
@@ -3803,23 +3863,22 @@ int cmp_main(int argc, char **argv)
}
print_status();
if (!save_cert_or_delete(OSSL_CMP_CTX_get0_validatedSrvCert(cmp_ctx),
- opt_srvcertout, "validated server"))
+ opt_srvcertout, "validated server"))
ret = 0;
if (!ret)
goto err;
ret = 0;
if (save_free_certs(OSSL_CMP_CTX_get1_extraCertsIn(cmp_ctx),
- opt_extracertsout, "extra") < 0)
+ opt_extracertsout, "extra")
+ < 0)
goto err;
- if (newcert != NULL && (opt_cmd == CMP_IR || opt_cmd == CMP_CR
- || opt_cmd == CMP_KUR || opt_cmd == CMP_P10CR)) {
+ if (newcert != NULL && (opt_cmd == CMP_IR || opt_cmd == CMP_CR || opt_cmd == CMP_KUR || opt_cmd == CMP_P10CR)) {
STACK_OF(X509) *newchain = OSSL_CMP_CTX_get1_newChain(cmp_ctx);
if (newcert != NULL && newchain != NULL /* NULL is on error only */
&& opt_certout != NULL && opt_chainout != NULL
&& strcmp(opt_certout, opt_chainout) == 0) {
- if (!X509_add_cert(newchain, newcert, X509_ADD_FLAG_PREPEND
- | X509_ADD_FLAG_UP_REF)) {
+ if (!X509_add_cert(newchain, newcert, X509_ADD_FLAG_PREPEND | X509_ADD_FLAG_UP_REF)) {
sk_X509_pop_free(newchain, X509_free);
goto err;
}
@@ -3831,7 +3890,8 @@ int cmp_main(int argc, char **argv)
goto err;
}
if (save_free_certs(OSSL_CMP_CTX_get1_caPubs(cmp_ctx),
- opt_cacertsout, "CA") < 0)
+ opt_cacertsout, "CA")
+ < 0)
goto err;
if (opt_centralkeygen) {
EVP_CIPHER *cipher = NULL;
@@ -3846,13 +3906,14 @@ int cmp_main(int argc, char **argv)
goto err;
if (opt_newkeypass != NULL) {
pass_string = get_passwd(opt_newkeypass,
- "Centrally generated private key password");
+ "Centrally generated private key password");
cipher = EVP_CIPHER_fetch(app_get0_libctx(), SN_aes_256_cbc, app_get0_propq());
}
CMP_info1("saving centrally generated key to file '%s'", opt_newkeyout);
if (PEM_write_bio_PrivateKey(out, new_key, cipher, NULL, 0, NULL,
- (void *)pass_string) <= 0)
+ (void *)pass_string)
+ <= 0)
result = 0;
BIO_free(out);
@@ -3867,7 +3928,7 @@ int cmp_main(int argc, char **argv)
}
ret = 1;
- err:
+err:
/* in case we ended up here on error without proper cleaning */
cleanse(opt_keypass);
cleanse(opt_newkeypass);
diff --git a/apps/cms.c b/apps/cms.c
index 144f956943..df13876b23 100644
--- a/apps/cms.c
+++ b/apps/cms.c
@@ -24,31 +24,30 @@
static int save_certs(char *signerfile, STACK_OF(X509) *signers);
static int cms_cb(int ok, X509_STORE_CTX *ctx);
static void receipt_request_print(CMS_ContentInfo *cms);
-static CMS_ReceiptRequest
-*make_receipt_request(STACK_OF(OPENSSL_STRING) *rr_to, int rr_allorfirst,
- STACK_OF(OPENSSL_STRING) *rr_from);
+static CMS_ReceiptRequest *make_receipt_request(STACK_OF(OPENSSL_STRING) *rr_to, int rr_allorfirst,
+ STACK_OF(OPENSSL_STRING) *rr_from);
static int cms_set_pkey_param(EVP_PKEY_CTX *pctx,
- STACK_OF(OPENSSL_STRING) *param);
-
-#define SMIME_OP 0x100
-#define SMIME_IP 0x200
-#define SMIME_SIGNERS 0x400
-#define SMIME_ENCRYPT (1 | SMIME_OP)
-#define SMIME_DECRYPT (2 | SMIME_IP)
-#define SMIME_SIGN (3 | SMIME_OP | SMIME_SIGNERS)
-#define SMIME_VERIFY (4 | SMIME_IP)
-#define SMIME_RESIGN (5 | SMIME_IP | SMIME_OP | SMIME_SIGNERS)
-#define SMIME_SIGN_RECEIPT (6 | SMIME_IP | SMIME_OP)
-#define SMIME_VERIFY_RECEIPT (7 | SMIME_IP)
-#define SMIME_DIGEST_CREATE (8 | SMIME_OP)
-#define SMIME_DIGEST_VERIFY (9 | SMIME_IP)
-#define SMIME_COMPRESS (10 | SMIME_OP)
-#define SMIME_UNCOMPRESS (11 | SMIME_IP)
+ STACK_OF(OPENSSL_STRING) *param);
+
+#define SMIME_OP 0x100
+#define SMIME_IP 0x200
+#define SMIME_SIGNERS 0x400
+#define SMIME_ENCRYPT (1 | SMIME_OP)
+#define SMIME_DECRYPT (2 | SMIME_IP)
+#define SMIME_SIGN (3 | SMIME_OP | SMIME_SIGNERS)
+#define SMIME_VERIFY (4 | SMIME_IP)
+#define SMIME_RESIGN (5 | SMIME_IP | SMIME_OP | SMIME_SIGNERS)
+#define SMIME_SIGN_RECEIPT (6 | SMIME_IP | SMIME_OP)
+#define SMIME_VERIFY_RECEIPT (7 | SMIME_IP)
+#define SMIME_DIGEST_CREATE (8 | SMIME_OP)
+#define SMIME_DIGEST_VERIFY (9 | SMIME_IP)
+#define SMIME_COMPRESS (10 | SMIME_OP)
+#define SMIME_UNCOMPRESS (11 | SMIME_IP)
#define SMIME_ENCRYPTED_ENCRYPT (12 | SMIME_OP)
#define SMIME_ENCRYPTED_DECRYPT (13 | SMIME_IP)
-#define SMIME_DATA_CREATE (14 | SMIME_OP)
-#define SMIME_DATA_OUT (15 | SMIME_IP)
-#define SMIME_CMSOUT (16 | SMIME_IP | SMIME_OP)
+#define SMIME_DATA_CREATE (14 | SMIME_OP)
+#define SMIME_DATA_OUT (15 | SMIME_IP)
+#define SMIME_CMSOUT (16 | SMIME_IP | SMIME_OP)
static int verify_err = 0;
@@ -71,192 +70,254 @@ struct cms_recip_opt_st {
typedef enum OPTION_choice {
OPT_COMMON,
- OPT_INFORM, OPT_OUTFORM, OPT_IN, OPT_OUT, OPT_ENCRYPT,
- OPT_DECRYPT, OPT_SIGN, OPT_CADES, OPT_SIGN_RECEIPT, OPT_RESIGN,
- OPT_VERIFY, OPT_VERIFY_RETCODE, OPT_VERIFY_RECEIPT,
- OPT_CMSOUT, OPT_DATA_OUT, OPT_DATA_CREATE, OPT_DIGEST_VERIFY,
- OPT_DIGEST, OPT_DIGEST_CREATE, OPT_COMPRESS, OPT_UNCOMPRESS,
- OPT_ED_DECRYPT, OPT_ED_ENCRYPT, OPT_DEBUG_DECRYPT, OPT_TEXT,
- OPT_ASCIICRLF, OPT_NOINTERN, OPT_NOVERIFY, OPT_NOCERTS,
- OPT_NOATTR, OPT_NODETACH, OPT_NOSMIMECAP, OPT_NO_SIGNING_TIME,
- OPT_BINARY, OPT_KEYID,
- OPT_NOSIGS, OPT_NO_CONTENT_VERIFY, OPT_NO_ATTR_VERIFY, OPT_INDEF,
- OPT_NOINDEF, OPT_CRLFEOL, OPT_NOOUT, OPT_RR_PRINT,
- OPT_RR_ALL, OPT_RR_FIRST, OPT_RCTFORM, OPT_CERTFILE, OPT_CAFILE,
- OPT_CAPATH, OPT_CASTORE, OPT_NOCAPATH, OPT_NOCAFILE, OPT_NOCASTORE,
- OPT_CONTENT, OPT_PRINT, OPT_NAMEOPT,
- OPT_SECRETKEY, OPT_SECRETKEYID, OPT_PWRI_PASSWORD, OPT_ECONTENT_TYPE,
- OPT_PASSIN, OPT_TO, OPT_FROM, OPT_SUBJECT, OPT_SIGNER, OPT_RECIP,
- OPT_CERTSOUT, OPT_MD, OPT_INKEY, OPT_KEYFORM, OPT_KEYOPT, OPT_RR_FROM,
- OPT_RR_TO, OPT_AES128_WRAP, OPT_AES192_WRAP, OPT_AES256_WRAP,
- OPT_3DES_WRAP, OPT_WRAP,
+ OPT_INFORM,
+ OPT_OUTFORM,
+ OPT_IN,
+ OPT_OUT,
+ OPT_ENCRYPT,
+ OPT_DECRYPT,
+ OPT_SIGN,
+ OPT_CADES,
+ OPT_SIGN_RECEIPT,
+ OPT_RESIGN,
+ OPT_VERIFY,
+ OPT_VERIFY_RETCODE,
+ OPT_VERIFY_RECEIPT,
+ OPT_CMSOUT,
+ OPT_DATA_OUT,
+ OPT_DATA_CREATE,
+ OPT_DIGEST_VERIFY,
+ OPT_DIGEST,
+ OPT_DIGEST_CREATE,
+ OPT_COMPRESS,
+ OPT_UNCOMPRESS,
+ OPT_ED_DECRYPT,
+ OPT_ED_ENCRYPT,
+ OPT_DEBUG_DECRYPT,
+ OPT_TEXT,
+ OPT_ASCIICRLF,
+ OPT_NOINTERN,
+ OPT_NOVERIFY,
+ OPT_NOCERTS,
+ OPT_NOATTR,
+ OPT_NODETACH,
+ OPT_NOSMIMECAP,
+ OPT_NO_SIGNING_TIME,
+ OPT_BINARY,
+ OPT_KEYID,
+ OPT_NOSIGS,
+ OPT_NO_CONTENT_VERIFY,
+ OPT_NO_ATTR_VERIFY,
+ OPT_INDEF,
+ OPT_NOINDEF,
+ OPT_CRLFEOL,
+ OPT_NOOUT,
+ OPT_RR_PRINT,
+ OPT_RR_ALL,
+ OPT_RR_FIRST,
+ OPT_RCTFORM,
+ OPT_CERTFILE,
+ OPT_CAFILE,
+ OPT_CAPATH,
+ OPT_CASTORE,
+ OPT_NOCAPATH,
+ OPT_NOCAFILE,
+ OPT_NOCASTORE,
+ OPT_CONTENT,
+ OPT_PRINT,
+ OPT_NAMEOPT,
+ OPT_SECRETKEY,
+ OPT_SECRETKEYID,
+ OPT_PWRI_PASSWORD,
+ OPT_ECONTENT_TYPE,
+ OPT_PASSIN,
+ OPT_TO,
+ OPT_FROM,
+ OPT_SUBJECT,
+ OPT_SIGNER,
+ OPT_RECIP,
+ OPT_CERTSOUT,
+ OPT_MD,
+ OPT_INKEY,
+ OPT_KEYFORM,
+ OPT_KEYOPT,
+ OPT_RR_FROM,
+ OPT_RR_TO,
+ OPT_AES128_WRAP,
+ OPT_AES192_WRAP,
+ OPT_AES256_WRAP,
+ OPT_3DES_WRAP,
+ OPT_WRAP,
OPT_R_ENUM,
- OPT_PROV_ENUM, OPT_CONFIG,
+ OPT_PROV_ENUM,
+ OPT_CONFIG,
OPT_V_ENUM,
- OPT_CIPHER, OPT_KEKCIPHER,
+ OPT_CIPHER,
+ OPT_KEKCIPHER,
OPT_ORIGINATOR,
- OPT_RECIP_UKM, OPT_RECIP_KDF
+ OPT_RECIP_UKM,
+ OPT_RECIP_KDF
} OPTION_CHOICE;
const OPTIONS cms_options[] = {
- {OPT_HELP_STR, 1, '-', "Usage: %s [options] [cert...]\n"},
- {"help", OPT_HELP, '-', "Display this summary"},
+ { OPT_HELP_STR, 1, '-', "Usage: %s [options] [cert...]\n" },
+ { "help", OPT_HELP, '-', "Display this summary" },
OPT_SECTION("General"),
- {"in", OPT_IN, '<', "Input file"},
- {"out", OPT_OUT, '>', "Output file"},
+ { "in", OPT_IN, '<', "Input file" },
+ { "out", OPT_OUT, '>', "Output file" },
OPT_CONFIG_OPTION,
OPT_SECTION("Operation"),
- {"encrypt", OPT_ENCRYPT, '-', "Encrypt message"},
- {"decrypt", OPT_DECRYPT, '-', "Decrypt encrypted message"},
- {"sign", OPT_SIGN, '-', "Sign message"},
- {"verify", OPT_VERIFY, '-', "Verify signed message"},
- {"resign", OPT_RESIGN, '-', "Resign a signed message"},
- {"sign_receipt", OPT_SIGN_RECEIPT, '-',
- "Generate a signed receipt for a message"},
- {"verify_receipt", OPT_VERIFY_RECEIPT, '<',
- "Verify receipts; exit if receipt signatures do not verify"},
- {"digest", OPT_DIGEST, 's', "Sign a pre-computed digest in hex notation"},
- {"digest_create", OPT_DIGEST_CREATE, '-',
- "Create a CMS \"DigestedData\" object"},
- {"digest_verify", OPT_DIGEST_VERIFY, '-',
- "Verify a CMS \"DigestedData\" object and output it"},
- {"compress", OPT_COMPRESS, '-', "Create a CMS \"CompressedData\" object"},
- {"uncompress", OPT_UNCOMPRESS, '-',
- "Uncompress a CMS \"CompressedData\" object"},
- {"EncryptedData_encrypt", OPT_ED_ENCRYPT, '-',
- "Create CMS \"EncryptedData\" object using symmetric key"},
- {"EncryptedData_decrypt", OPT_ED_DECRYPT, '-',
- "Decrypt CMS \"EncryptedData\" object using symmetric key"},
- {"data_create", OPT_DATA_CREATE, '-', "Create a CMS \"Data\" object"},
- {"data_out", OPT_DATA_OUT, '-', "Copy CMS \"Data\" object to output"},
- {"cmsout", OPT_CMSOUT, '-', "Output CMS structure"},
+ { "encrypt", OPT_ENCRYPT, '-', "Encrypt message" },
+ { "decrypt", OPT_DECRYPT, '-', "Decrypt encrypted message" },
+ { "sign", OPT_SIGN, '-', "Sign message" },
+ { "verify", OPT_VERIFY, '-', "Verify signed message" },
+ { "resign", OPT_RESIGN, '-', "Resign a signed message" },
+ { "sign_receipt", OPT_SIGN_RECEIPT, '-',
+ "Generate a signed receipt for a message" },
+ { "verify_receipt", OPT_VERIFY_RECEIPT, '<',
+ "Verify receipts; exit if receipt signatures do not verify" },
+ { "digest", OPT_DIGEST, 's', "Sign a pre-computed digest in hex notation" },
+ { "digest_create", OPT_DIGEST_CREATE, '-',
+ "Create a CMS \"DigestedData\" object" },
+ { "digest_verify", OPT_DIGEST_VERIFY, '-',
+ "Verify a CMS \"DigestedData\" object and output it" },
+ { "compress", OPT_COMPRESS, '-', "Create a CMS \"CompressedData\" object" },
+ { "uncompress", OPT_UNCOMPRESS, '-',
+ "Uncompress a CMS \"CompressedData\" object" },
+ { "EncryptedData_encrypt", OPT_ED_ENCRYPT, '-',
+ "Create CMS \"EncryptedData\" object using symmetric key" },
+ { "EncryptedData_decrypt", OPT_ED_DECRYPT, '-',
+ "Decrypt CMS \"EncryptedData\" object using symmetric key" },
+ { "data_create", OPT_DATA_CREATE, '-', "Create a CMS \"Data\" object" },
+ { "data_out", OPT_DATA_OUT, '-', "Copy CMS \"Data\" object to output" },
+ { "cmsout", OPT_CMSOUT, '-', "Output CMS structure" },
OPT_SECTION("File format"),
- {"inform", OPT_INFORM, 'c', "Input format SMIME (default), PEM or DER"},
- {"outform", OPT_OUTFORM, 'c',
- "Output format SMIME (default), PEM or DER"},
- {"rctform", OPT_RCTFORM, 'F', "Receipt file format"},
- {"stream", OPT_INDEF, '-', "Enable CMS streaming"},
- {"indef", OPT_INDEF, '-', "Same as -stream"},
- {"noindef", OPT_NOINDEF, '-', "Disable CMS streaming"},
- {"binary", OPT_BINARY, '-',
- "Treat input as binary: do not translate to canonical form"},
- {"crlfeol", OPT_CRLFEOL, '-',
- "Use CRLF as EOL termination instead of LF only" },
- {"asciicrlf", OPT_ASCIICRLF, '-',
- "Perform CRLF canonicalisation when signing"},
+ { "inform", OPT_INFORM, 'c', "Input format SMIME (default), PEM or DER" },
+ { "outform", OPT_OUTFORM, 'c',
+ "Output format SMIME (default), PEM or DER" },
+ { "rctform", OPT_RCTFORM, 'F', "Receipt file format" },
+ { "stream", OPT_INDEF, '-', "Enable CMS streaming" },
+ { "indef", OPT_INDEF, '-', "Same as -stream" },
+ { "noindef", OPT_NOINDEF, '-', "Disable CMS streaming" },
+ { "binary", OPT_BINARY, '-',
+ "Treat input as binary: do not translate to canonical form" },
+ { "crlfeol", OPT_CRLFEOL, '-',
+ "Use CRLF as EOL termination instead of LF only" },
+ { "asciicrlf", OPT_ASCIICRLF, '-',
+ "Perform CRLF canonicalisation when signing" },
OPT_SECTION("Keys and passwords"),
- {"pwri_password", OPT_PWRI_PASSWORD, 's',
- "Specific password for recipient"},
- {"secretkey", OPT_SECRETKEY, 's',
- "Use specified hex-encoded key to decrypt/encrypt recipients or content"},
- {"secretkeyid", OPT_SECRETKEYID, 's',
- "Identity of the -secretkey for CMS \"KEKRecipientInfo\" object"},
- {"inkey", OPT_INKEY, 's',
- "Input private key (if not signer or recipient)"},
- {"passin", OPT_PASSIN, 's', "Input file pass phrase source"},
- {"keyopt", OPT_KEYOPT, 's', "Set public key parameters as n:v pairs"},
- {"keyform", OPT_KEYFORM, 'f', "Input private key format (DER/PEM)"},
+ { "pwri_password", OPT_PWRI_PASSWORD, 's',
+ "Specific password for recipient" },
+ { "secretkey", OPT_SECRETKEY, 's',
+ "Use specified hex-encoded key to decrypt/encrypt recipients or content" },
+ { "secretkeyid", OPT_SECRETKEYID, 's',
+ "Identity of the -secretkey for CMS \"KEKRecipientInfo\" object" },
+ { "inkey", OPT_INKEY, 's',
+ "Input private key (if not signer or recipient)" },
+ { "passin", OPT_PASSIN, 's', "Input file pass phrase source" },
+ { "keyopt", OPT_KEYOPT, 's', "Set public key parameters as n:v pairs" },
+ { "keyform", OPT_KEYFORM, 'f', "Input private key format (DER/PEM)" },
OPT_PROV_OPTIONS,
OPT_R_OPTIONS,
OPT_SECTION("Encryption and decryption"),
- {"originator", OPT_ORIGINATOR, 's', "Originator certificate file"},
- {"recip", OPT_RECIP, '<', "Recipient cert file"},
- {"cert...", OPT_PARAM, '.',
- "Recipient certs (optional; used only when encrypting)"},
- {"", OPT_CIPHER, '-',
- "The encryption algorithm to use (any supported cipher)"},
- {"kekcipher", OPT_KEKCIPHER, 's',
- "The key encryption algorithm to use"},
- {"wrap", OPT_WRAP, 's',
- "Key wrap algorithm to use when encrypting with key agreement or key encapsulation"},
- {"aes128-wrap", OPT_AES128_WRAP, '-', "Use AES128 to wrap key"},
- {"aes192-wrap", OPT_AES192_WRAP, '-', "Use AES192 to wrap key"},
- {"aes256-wrap", OPT_AES256_WRAP, '-', "Use AES256 to wrap key"},
- {"des3-wrap", OPT_3DES_WRAP, '-', "Use 3DES-EDE to wrap key"},
- {"debug_decrypt", OPT_DEBUG_DECRYPT, '-',
- "Disable MMA protection, return error if no recipient found (see doc)"},
- {"recip_kdf", OPT_RECIP_KDF, 's', "Set KEMRecipientInfo KDF for current recipient"},
- {"recip_ukm", OPT_RECIP_UKM, 's', "KEMRecipientInfo user keying material for current recipient, in hex notation"},
+ { "originator", OPT_ORIGINATOR, 's', "Originator certificate file" },
+ { "recip", OPT_RECIP, '<', "Recipient cert file" },
+ { "cert...", OPT_PARAM, '.',
+ "Recipient certs (optional; used only when encrypting)" },
+ { "", OPT_CIPHER, '-',
+ "The encryption algorithm to use (any supported cipher)" },
+ { "kekcipher", OPT_KEKCIPHER, 's',
+ "The key encryption algorithm to use" },
+ { "wrap", OPT_WRAP, 's',
+ "Key wrap algorithm to use when encrypting with key agreement or key encapsulation" },
+ { "aes128-wrap", OPT_AES128_WRAP, '-', "Use AES128 to wrap key" },
+ { "aes192-wrap", OPT_AES192_WRAP, '-', "Use AES192 to wrap key" },
+ { "aes256-wrap", OPT_AES256_WRAP, '-', "Use AES256 to wrap key" },
+ { "des3-wrap", OPT_3DES_WRAP, '-', "Use 3DES-EDE to wrap key" },
+ { "debug_decrypt", OPT_DEBUG_DECRYPT, '-',
+ "Disable MMA protection, return error if no recipient found (see doc)" },
+ { "recip_kdf", OPT_RECIP_KDF, 's', "Set KEMRecipientInfo KDF for current recipient" },
+ { "recip_ukm", OPT_RECIP_UKM, 's', "KEMRecipientInfo user keying material for current recipient, in hex notation" },
OPT_SECTION("Signing"),
- {"md", OPT_MD, 's', "Digest algorithm to use"},
- {"signer", OPT_SIGNER, 's', "Signer certificate input file"},
- {"certfile", OPT_CERTFILE, '<',
- "Extra signer and intermediate CA certificates to include when signing"},
- {OPT_MORE_STR, 0, 0,
- "or to use as preferred signer certs and for chain building when verifying"},
- {"cades", OPT_CADES, '-',
- "Include signingCertificate attribute (CAdES-BES)"},
- {"nodetach", OPT_NODETACH, '-', "Use opaque signing"},
- {"nocerts", OPT_NOCERTS, '-',
- "Don't include signer's certificate when signing"},
- {"noattr", OPT_NOATTR, '-', "Don't include any signed attributes"},
- {"nosmimecap", OPT_NOSMIMECAP, '-', "Omit the SMIMECapabilities attribute"},
- {"no_signing_time", OPT_NO_SIGNING_TIME, '-',
- "Omit the signing time attribute"},
- {"receipt_request_all", OPT_RR_ALL, '-',
- "When signing, create a receipt request for all recipients"},
- {"receipt_request_first", OPT_RR_FIRST, '-',
- "When signing, create a receipt request for first recipient"},
- {"receipt_request_from", OPT_RR_FROM, 's',
- "Create signed receipt request with specified email address"},
- {"receipt_request_to", OPT_RR_TO, 's',
- "Create signed receipt targeted to specified address"},
+ { "md", OPT_MD, 's', "Digest algorithm to use" },
+ { "signer", OPT_SIGNER, 's', "Signer certificate input file" },
+ { "certfile", OPT_CERTFILE, '<',
+ "Extra signer and intermediate CA certificates to include when signing" },
+ { OPT_MORE_STR, 0, 0,
+ "or to use as preferred signer certs and for chain building when verifying" },
+ { "cades", OPT_CADES, '-',
+ "Include signingCertificate attribute (CAdES-BES)" },
+ { "nodetach", OPT_NODETACH, '-', "Use opaque signing" },
+ { "nocerts", OPT_NOCERTS, '-',
+ "Don't include signer's certificate when signing" },
+ { "noattr", OPT_NOATTR, '-', "Don't include any signed attributes" },
+ { "nosmimecap", OPT_NOSMIMECAP, '-', "Omit the SMIMECapabilities attribute" },
+ { "no_signing_time", OPT_NO_SIGNING_TIME, '-',
+ "Omit the signing time attribute" },
+ { "receipt_request_all", OPT_RR_ALL, '-',
+ "When signing, create a receipt request for all recipients" },
+ { "receipt_request_first", OPT_RR_FIRST, '-',
+ "When signing, create a receipt request for first recipient" },
+ { "receipt_request_from", OPT_RR_FROM, 's',
+ "Create signed receipt request with specified email address" },
+ { "receipt_request_to", OPT_RR_TO, 's',
+ "Create signed receipt targeted to specified address" },
OPT_SECTION("Verification"),
- {"signer", OPT_DUP, 's', "Signer certificate(s) output file"},
- {"content", OPT_CONTENT, '<',
- "Supply or override content for detached signature"},
- {"no_content_verify", OPT_NO_CONTENT_VERIFY, '-',
- "Do not verify signed content signatures"},
- {"no_attr_verify", OPT_NO_ATTR_VERIFY, '-',
- "Do not verify signed attribute signatures"},
- {"nosigs", OPT_NOSIGS, '-', "Don't verify message signature"},
- {"noverify", OPT_NOVERIFY, '-', "Don't verify signers certificate"},
- {"nointern", OPT_NOINTERN, '-',
- "Don't search certificates in message for signer"},
- {"cades", OPT_DUP, '-', "Check signingCertificate (CAdES-BES)"},
- {"verify_retcode", OPT_VERIFY_RETCODE, '-',
- "Exit non-zero on verification failure"},
- {"CAfile", OPT_CAFILE, '<', "Trusted certificates file"},
- {"CApath", OPT_CAPATH, '/', "Trusted certificates directory"},
- {"CAstore", OPT_CASTORE, ':', "Trusted certificates store URI"},
- {"no-CAfile", OPT_NOCAFILE, '-',
- "Do not load the default certificates file"},
- {"no-CApath", OPT_NOCAPATH, '-',
- "Do not load certificates from the default certificates directory"},
- {"no-CAstore", OPT_NOCASTORE, '-',
- "Do not load certificates from the default certificates store"},
+ { "signer", OPT_DUP, 's', "Signer certificate(s) output file" },
+ { "content", OPT_CONTENT, '<',
+ "Supply or override content for detached signature" },
+ { "no_content_verify", OPT_NO_CONTENT_VERIFY, '-',
+ "Do not verify signed content signatures" },
+ { "no_attr_verify", OPT_NO_ATTR_VERIFY, '-',
+ "Do not verify signed attribute signatures" },
+ { "nosigs", OPT_NOSIGS, '-', "Don't verify message signature" },
+ { "noverify", OPT_NOVERIFY, '-', "Don't verify signers certificate" },
+ { "nointern", OPT_NOINTERN, '-',
+ "Don't search certificates in message for signer" },
+ { "cades", OPT_DUP, '-', "Check signingCertificate (CAdES-BES)" },
+ { "verify_retcode", OPT_VERIFY_RETCODE, '-',
+ "Exit non-zero on verification failure" },
+ { "CAfile", OPT_CAFILE, '<', "Trusted certificates file" },
+ { "CApath", OPT_CAPATH, '/', "Trusted certificates directory" },
+ { "CAstore", OPT_CASTORE, ':', "Trusted certificates store URI" },
+ { "no-CAfile", OPT_NOCAFILE, '-',
+ "Do not load the default certificates file" },
+ { "no-CApath", OPT_NOCAPATH, '-',
+ "Do not load certificates from the default certificates directory" },
+ { "no-CAstore", OPT_NOCASTORE, '-',
+ "Do not load certificates from the default certificates store" },
OPT_SECTION("Output"),
- {"keyid", OPT_KEYID, '-', "Use subject key identifier"},
- {"econtent_type", OPT_ECONTENT_TYPE, 's', "OID for external content"},
- {"text", OPT_TEXT, '-', "Include or delete text MIME headers"},
- {"certsout", OPT_CERTSOUT, '>', "Certificate output file"},
- {"to", OPT_TO, 's', "To address"},
- {"from", OPT_FROM, 's', "From address"},
- {"subject", OPT_SUBJECT, 's', "Subject"},
+ { "keyid", OPT_KEYID, '-', "Use subject key identifier" },
+ { "econtent_type", OPT_ECONTENT_TYPE, 's', "OID for external content" },
+ { "text", OPT_TEXT, '-', "Include or delete text MIME headers" },
+ { "certsout", OPT_CERTSOUT, '>', "Certificate output file" },
+ { "to", OPT_TO, 's', "To address" },
+ { "from", OPT_FROM, 's', "From address" },
+ { "subject", OPT_SUBJECT, 's', "Subject" },
OPT_SECTION("Printing"),
- {"noout", OPT_NOOUT, '-',
- "For the -cmsout operation do not output the parsed CMS structure"},
- {"print", OPT_PRINT, '-',
- "For the -cmsout operation print out all fields of the CMS structure"},
- {"nameopt", OPT_NAMEOPT, 's',
- "For the -print option specifies various strings printing options"},
- {"receipt_request_print", OPT_RR_PRINT, '-', "Print CMS Receipt Request" },
+ { "noout", OPT_NOOUT, '-',
+ "For the -cmsout operation do not output the parsed CMS structure" },
+ { "print", OPT_PRINT, '-',
+ "For the -cmsout operation print out all fields of the CMS structure" },
+ { "nameopt", OPT_NAMEOPT, 's',
+ "For the -print option specifies various strings printing options" },
+ { "receipt_request_print", OPT_RR_PRINT, '-', "Print CMS Receipt Request" },
OPT_V_OPTIONS,
- {NULL}
+ { NULL }
};
static CMS_ContentInfo *load_content_info(int informat, BIO *in, int flags,
- BIO **indata, const char *name)
+ BIO **indata, const char *name)
{
CMS_ContentInfo *ret, *ci;
@@ -284,7 +345,7 @@ static CMS_ContentInfo *load_content_info(int informat, BIO *in, int flags,
goto err;
}
return ret;
- err:
+err:
CMS_ContentInfo_free(ret);
return NULL;
}
@@ -355,7 +416,7 @@ int cms_main(int argc, char **argv)
switch (o) {
case OPT_EOF:
case OPT_ERR:
- opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
case OPT_HELP:
@@ -502,7 +563,7 @@ int cms_main(int argc, char **argv)
break;
case OPT_RCTFORM:
if (!opt_format(opt_arg(),
- OPT_FMT_PEMDER | OPT_FMT_SMIME, &rctformat))
+ OPT_FMT_PEMDER | OPT_FMT_SMIME, &rctformat))
goto opthelp;
break;
case OPT_CERTFILE:
@@ -556,7 +617,7 @@ int cms_main(int argc, char **argv)
case OPT_SECRETKEY:
if (secret_key != NULL) {
BIO_printf(bio_err, "Invalid key (supplied twice) %s\n",
- opt_arg());
+ opt_arg());
goto opthelp;
}
secret_key = OPENSSL_hexstr2buf(opt_arg(), <mp);
@@ -569,7 +630,7 @@ int cms_main(int argc, char **argv)
case OPT_SECRETKEYID:
if (secret_keyid != NULL) {
BIO_printf(bio_err, "Invalid id (supplied twice) %s\n",
- opt_arg());
+ opt_arg());
goto opthelp;
}
secret_keyid = OPENSSL_hexstr2buf(opt_arg(), <mp);
@@ -585,7 +646,7 @@ int cms_main(int argc, char **argv)
case OPT_ECONTENT_TYPE:
if (econtent_type != NULL) {
BIO_printf(bio_err, "Invalid OID (supplied twice) %s\n",
- opt_arg());
+ opt_arg());
goto opthelp;
}
econtent_type = OBJ_txt2obj(opt_arg(), 0);
@@ -662,7 +723,7 @@ int cms_main(int argc, char **argv)
case OPT_RECIP:
if (operation == SMIME_ENCRYPT) {
cert = load_cert(opt_arg(), FORMAT_UNDEF,
- "recipient certificate file");
+ "recipient certificate file");
if (cert == NULL)
goto end;
if (!sk_X509_push(encerts, cert))
@@ -705,7 +766,7 @@ int cms_main(int argc, char **argv)
goto end;
}
recip_opt->ukm_data = OPENSSL_hexstr2buf(opt_arg(),
- &recip_opt->ukm_data_length);
+ &recip_opt->ukm_data_length);
if (recip_opt->ukm_data == NULL) {
BIO_printf(bio_err, "Invalid hex value after -recip_ukm\n");
goto end;
@@ -816,13 +877,13 @@ int cms_main(int argc, char **argv)
if ((flags & CMS_CADES) != 0) {
if ((flags & CMS_NOATTR) != 0) {
BIO_puts(bio_err, "Incompatible options: "
- "CAdES requires signed attributes\n");
+ "CAdES requires signed attributes\n");
goto opthelp;
}
if (operation == SMIME_VERIFY
- && (flags & (CMS_NO_SIGNER_CERT_VERIFY | CMS_NO_ATTR_VERIFY)) != 0) {
+ && (flags & (CMS_NO_SIGNER_CERT_VERIFY | CMS_NO_ATTR_VERIFY)) != 0) {
BIO_puts(bio_err, "Incompatible options: CAdES validation requires"
- " certs and signed attributes validations\n");
+ " certs and signed attributes validations\n");
goto opthelp;
}
}
@@ -856,7 +917,7 @@ int cms_main(int argc, char **argv)
if (recipfile == NULL && keyfile == NULL
&& secret_key == NULL && pwri_pass == NULL) {
BIO_printf(bio_err,
- "No recipient certificate or key specified\n");
+ "No recipient certificate or key specified\n");
goto opthelp;
}
} else if (operation == SMIME_ENCRYPT) {
@@ -880,19 +941,19 @@ int cms_main(int argc, char **argv)
if ((operation & SMIME_SIGNERS) == 0) {
if ((flags & CMS_DETACHED) == 0)
BIO_printf(bio_err,
- "Warning: -nodetach option is ignored for non-signing operation\n");
+ "Warning: -nodetach option is ignored for non-signing operation\n");
flags &= ~CMS_DETACHED;
}
if ((operation & SMIME_IP) == 0 && contfile != NULL)
BIO_printf(bio_err,
- "Warning: -contfile option is ignored for the given operation\n");
+ "Warning: -contfile option is ignored for the given operation\n");
if (operation != SMIME_ENCRYPT && *argv != NULL)
BIO_printf(bio_err,
- "Warning: recipient certificate file parameters ignored for operation other than -encrypt\n");
+ "Warning: recipient certificate file parameters ignored for operation other than -encrypt\n");
if (operation != SMIME_ENCRYPT && recip_first != NULL)
BIO_printf(bio_err,
- "Warning: -recip_kdf and -recip_ukm parameters ignored for operation other than -encrypt\n");
+ "Warning: -recip_kdf and -recip_ukm parameters ignored for operation other than -encrypt\n");
if ((flags & CMS_BINARY) != 0) {
if (!(operation & SMIME_OP))
@@ -915,7 +976,7 @@ int cms_main(int argc, char **argv)
for (; *argv != NULL; argv++) {
cert = load_cert(*argv, FORMAT_UNDEF,
- "recipient certificate file");
+ "recipient certificate file");
if (cert == NULL)
goto end;
if (!sk_X509_push(encerts, cert))
@@ -925,22 +986,25 @@ int cms_main(int argc, char **argv)
}
if (certfile != NULL
- && !load_certs(certfile, 0, &other, NULL, "certificate file"))
+ && !load_certs(certfile, 0, &other, NULL, "certificate file"))
goto end;
if (recipfile != NULL && (operation == SMIME_DECRYPT)
&& (recip = load_cert(recipfile, FORMAT_UNDEF,
- "recipient certificate file")) == NULL)
+ "recipient certificate file"))
+ == NULL)
goto end;
if (originatorfile != NULL
&& (originator = load_cert(originatorfile, FORMAT_UNDEF,
- "originator certificate file")) == NULL)
+ "originator certificate file"))
+ == NULL)
goto end;
if (operation == SMIME_SIGN_RECEIPT
&& (signer = load_cert(signerfile, FORMAT_UNDEF,
- "receipt signer certificate file")) == NULL)
+ "receipt signer certificate file"))
+ == NULL)
goto end;
if ((operation == SMIME_DECRYPT) || (operation == SMIME_ENCRYPT)) {
@@ -962,25 +1026,25 @@ int cms_main(int argc, char **argv)
if (digesthex != NULL) {
if (operation != SMIME_SIGN) {
BIO_printf(bio_err,
- "Cannot use -digest for non-signing operation\n");
+ "Cannot use -digest for non-signing operation\n");
goto end;
}
if (infile != NULL
|| (flags & CMS_DETACHED) == 0
|| (flags & CMS_STREAM) != 0) {
BIO_printf(bio_err,
- "Cannot use -digest when -in, -nodetach or streaming is used\n");
+ "Cannot use -digest when -in, -nodetach or streaming is used\n");
goto end;
}
digestbin = OPENSSL_hexstr2buf(digesthex, &digestlen);
if (digestbin == NULL) {
BIO_printf(bio_err,
- "Invalid hex value after -digest\n");
+ "Invalid hex value after -digest\n");
goto end;
}
} else {
in = bio_open_default(infile, 'r',
- binary_files ? FORMAT_BINARY : informat);
+ binary_files ? FORMAT_BINARY : informat);
if (in == NULL)
goto end;
}
@@ -1001,7 +1065,7 @@ int cms_main(int argc, char **argv)
allcerts = CMS_get1_certs(cms);
if (!save_certs(certsoutfile, allcerts)) {
BIO_printf(bio_err,
- "Error writing certs to %s\n", certsoutfile);
+ "Error writing certs to %s\n", certsoutfile);
ret = 5;
goto end;
}
@@ -1023,13 +1087,14 @@ int cms_main(int argc, char **argv)
}
out = bio_open_default(outfile, 'w',
- binary_files ? FORMAT_BINARY : outformat);
+ binary_files ? FORMAT_BINARY : outformat);
if (out == NULL)
goto end;
if ((operation == SMIME_VERIFY) || (operation == SMIME_VERIFY_RECEIPT)) {
if ((store = setup_verify(CAfile, noCAfile, CApath, noCApath,
- CAstore, noCAstore)) == NULL)
+ CAstore, noCAstore))
+ == NULL)
goto end;
X509_STORE_set_verify_cb(store, cms_cb);
if (vpmtouched)
@@ -1082,8 +1147,8 @@ int cms_main(int argc, char **argv)
}
res = EVP_PKEY_CTX_ctrl(pctx, -1, -1,
- EVP_PKEY_CTRL_CIPHER,
- EVP_CIPHER_get_nid(cipher), NULL);
+ EVP_PKEY_CTRL_CIPHER,
+ EVP_CIPHER_get_nid(cipher), NULL);
if (res <= 0 && res != -2)
goto end;
@@ -1103,7 +1168,7 @@ int cms_main(int argc, char **argv)
if (ropt != NULL && ri_type == CMS_RECIPINFO_KEM) {
if (ropt->ukm_data != NULL) {
if (!CMS_RecipientInfo_kemri_set_ukm(ri, ropt->ukm_data,
- (int)ropt->ukm_data_length))
+ (int)ropt->ukm_data_length))
goto end;
}
if (ropt->kdf != NULL) {
@@ -1125,9 +1190,9 @@ int cms_main(int argc, char **argv)
if (secret_key != NULL) {
if (!CMS_add0_recipient_key(cms, NID_undef,
- secret_key, secret_keylen,
- secret_keyid, secret_keyidlen,
- NULL, NULL, NULL))
+ secret_key, secret_keylen,
+ secret_keyid, secret_keyidlen,
+ NULL, NULL, NULL))
goto end;
/* NULL these because call absorbs them */
secret_key = NULL;
@@ -1138,7 +1203,8 @@ int cms_main(int argc, char **argv)
if (pwri_tmp == NULL)
goto end;
if (CMS_add0_recipient_password(cms, -1, NID_undef, NID_undef,
- pwri_tmp, -1, kekcipher) == NULL)
+ pwri_tmp, -1, kekcipher)
+ == NULL)
goto end;
pwri_tmp = NULL;
}
@@ -1146,7 +1212,7 @@ int cms_main(int argc, char **argv)
if (!CMS_final(cms, in, NULL, flags)) {
if (originator != NULL
&& ERR_GET_REASON(ERR_peek_error())
- == CMS_R_ERROR_UNSUPPORTED_STATIC_KEY_AGREEMENT) {
+ == CMS_R_ERROR_UNSUPPORTED_STATIC_KEY_AGREEMENT) {
BIO_printf(bio_err, "Cannot use originator for encryption\n");
goto end;
}
@@ -1155,7 +1221,7 @@ int cms_main(int argc, char **argv)
}
} else if (operation == SMIME_ENCRYPTED_ENCRYPT) {
cms = CMS_EncryptedData_encrypt_ex(in, cipher, secret_key,
- secret_keylen, flags, libctx, app_get0_propq());
+ secret_keylen, flags, libctx, app_get0_propq());
} else if (operation == SMIME_SIGN_RECEIPT) {
CMS_ContentInfo *srcms = NULL;
@@ -1272,8 +1338,8 @@ int cms_main(int argc, char **argv)
if (secret_key != NULL) {
if (!CMS_decrypt_set1_key(cms,
- secret_key, secret_keylen,
- secret_keyid, secret_keyidlen)) {
+ secret_key, secret_keylen,
+ secret_keyid, secret_keyidlen)) {
BIO_puts(bio_err, "Error decrypting CMS using secret key\n");
goto end;
}
@@ -1312,15 +1378,15 @@ int cms_main(int argc, char **argv)
}
} else if (operation == SMIME_ENCRYPTED_DECRYPT) {
if (!CMS_EncryptedData_decrypt(cms, secret_key, secret_keylen,
- indata, out, flags))
+ indata, out, flags))
goto end;
} else if (operation == SMIME_VERIFY) {
if (CMS_verify(cms, other, store, indata, out, flags) > 0) {
BIO_printf(bio_err, "%s Verification successful\n",
- (flags & CMS_CADES) != 0 ? "CAdES" : "CMS");
+ (flags & CMS_CADES) != 0 ? "CAdES" : "CMS");
} else {
BIO_printf(bio_err, "%s Verification failure\n",
- (flags & CMS_CADES) != 0 ? "CAdES" : "CMS");
+ (flags & CMS_CADES) != 0 ? "CAdES" : "CMS");
if (verify_retcode)
ret = verify_err + 32;
goto end;
@@ -1330,7 +1396,7 @@ int cms_main(int argc, char **argv)
if (!save_certs(signerfile, signers)) {
BIO_printf(bio_err,
- "Error writing signers to %s\n", signerfile);
+ "Error writing signers to %s\n", signerfile);
ret = 5;
goto end;
}
@@ -1389,7 +1455,7 @@ int cms_main(int argc, char **argv)
}
}
ret = 0;
- end:
+end:
if (ret != 0)
ERR_print_errors(bio_err);
OSSL_STACK_OF_X509_free(encerts);
@@ -1473,7 +1539,6 @@ static int cms_cb(int ok, X509_STORE_CTX *ctx)
policies_print(ctx);
return ok;
-
}
static void gnames_stack_print(STACK_OF(GENERAL_NAMES) *gns)
@@ -1517,7 +1582,7 @@ static void receipt_request_print(CMS_ContentInfo *cms)
const char *id;
int idlen;
CMS_ReceiptRequest_get0_values(rr, &scid, &allorfirst,
- &rlist, &rto);
+ &rlist, &rto);
BIO_puts(bio_err, " Signed Content ID:\n");
idlen = ASN1_STRING_length(scid);
id = (const char *)ASN1_STRING_get0_data(scid);
@@ -1567,16 +1632,15 @@ static STACK_OF(GENERAL_NAMES) *make_names_stack(STACK_OF(OPENSSL_STRING) *ns)
return ret;
- err:
+err:
sk_GENERAL_NAMES_pop_free(ret, GENERAL_NAMES_free);
GENERAL_NAMES_free(gens);
GENERAL_NAME_free(gen);
return NULL;
}
-static CMS_ReceiptRequest
-*make_receipt_request(STACK_OF(OPENSSL_STRING) *rr_to, int rr_allorfirst,
- STACK_OF(OPENSSL_STRING) *rr_from)
+static CMS_ReceiptRequest *make_receipt_request(STACK_OF(OPENSSL_STRING) *rr_to, int rr_allorfirst,
+ STACK_OF(OPENSSL_STRING) *rr_from)
{
STACK_OF(GENERAL_NAMES) *rct_to = NULL, *rct_from = NULL;
CMS_ReceiptRequest *rr;
@@ -1592,18 +1656,18 @@ static CMS_ReceiptRequest
rct_from = NULL;
}
rr = CMS_ReceiptRequest_create0_ex(NULL, -1, rr_allorfirst, rct_from,
- rct_to, app_get0_libctx());
+ rct_to, app_get0_libctx());
if (rr == NULL)
goto err;
return rr;
- err:
+err:
sk_GENERAL_NAMES_pop_free(rct_to, GENERAL_NAMES_free);
sk_GENERAL_NAMES_pop_free(rct_from, GENERAL_NAMES_free);
return NULL;
}
static int cms_set_pkey_param(EVP_PKEY_CTX *pctx,
- STACK_OF(OPENSSL_STRING) *param)
+ STACK_OF(OPENSSL_STRING) *param)
{
char *keyopt;
int i;
diff --git a/apps/configutl.c b/apps/configutl.c
index 2ee2796279..e564ce06d3 100644
--- a/apps/configutl.c
+++ b/apps/configutl.c
@@ -93,12 +93,12 @@ typedef enum OPTION_choice {
const OPTIONS configutl_options[] = {
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
- {"config", OPT_CONFIG, 's', "Config file to deal with (the default one if omitted)"},
+ { "help", OPT_HELP, '-', "Display this summary" },
+ { "config", OPT_CONFIG, 's', "Config file to deal with (the default one if omitted)" },
OPT_SECTION("Output"),
- {"out", OPT_OUT, '>', "Output to filename rather than stdout"},
- {"noheader", OPT_NOHEADER, '-', "Don't print the information about original config"},
- {NULL}
+ { "out", OPT_OUT, '>', "Output to filename rather than stdout" },
+ { "noheader", OPT_NOHEADER, '-', "Don't print the information about original config" },
+ { NULL }
};
/**
@@ -174,7 +174,7 @@ int configutl_main(int argc, char *argv[])
if (no_header == 0)
BIO_printf(out, "# This configuration file was linearized and expanded from %s\n",
- configfile);
+ configfile);
default_section_idx = sk_OPENSSL_CSTRING_find(sections, "default");
if (default_section_idx != -1)
diff --git a/apps/crl.c b/apps/crl.c
index e0218334d1..3c0987b98e 100644
--- a/apps/crl.c
+++ b/apps/crl.c
@@ -20,58 +20,81 @@
typedef enum OPTION_choice {
OPT_COMMON,
- OPT_INFORM, OPT_IN, OPT_OUTFORM, OPT_OUT, OPT_KEYFORM, OPT_KEY,
- OPT_ISSUER, OPT_LASTUPDATE, OPT_NEXTUPDATE, OPT_FINGERPRINT,
- OPT_CRLNUMBER, OPT_BADSIG, OPT_GENDELTA, OPT_CAPATH, OPT_CAFILE, OPT_CASTORE,
- OPT_NOCAPATH, OPT_NOCAFILE, OPT_NOCASTORE, OPT_VERIFY, OPT_DATEOPT, OPT_TEXT, OPT_HASH,
- OPT_HASH_OLD, OPT_NOOUT, OPT_NAMEOPT, OPT_MD, OPT_PROV_ENUM
+ OPT_INFORM,
+ OPT_IN,
+ OPT_OUTFORM,
+ OPT_OUT,
+ OPT_KEYFORM,
+ OPT_KEY,
+ OPT_ISSUER,
+ OPT_LASTUPDATE,
+ OPT_NEXTUPDATE,
+ OPT_FINGERPRINT,
+ OPT_CRLNUMBER,
+ OPT_BADSIG,
+ OPT_GENDELTA,
+ OPT_CAPATH,
+ OPT_CAFILE,
+ OPT_CASTORE,
+ OPT_NOCAPATH,
+ OPT_NOCAFILE,
+ OPT_NOCASTORE,
+ OPT_VERIFY,
+ OPT_DATEOPT,
+ OPT_TEXT,
+ OPT_HASH,
+ OPT_HASH_OLD,
+ OPT_NOOUT,
+ OPT_NAMEOPT,
+ OPT_MD,
+ OPT_PROV_ENUM
} OPTION_CHOICE;
const OPTIONS crl_options[] = {
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
- {"verify", OPT_VERIFY, '-', "Verify CRL signature"},
+ { "help", OPT_HELP, '-', "Display this summary" },
+ { "verify", OPT_VERIFY, '-', "Verify CRL signature" },
OPT_SECTION("Input"),
- {"in", OPT_IN, '<', "Input file - default stdin"},
- {"inform", OPT_INFORM, 'F', "CRL input format (DER or PEM); has no effect"},
- {"key", OPT_KEY, '<', "CRL signing Private key to use"},
- {"keyform", OPT_KEYFORM, 'F', "Private key file format (DER/PEM/P12); has no effect"},
+ { "in", OPT_IN, '<', "Input file - default stdin" },
+ { "inform", OPT_INFORM, 'F', "CRL input format (DER or PEM); has no effect" },
+ { "key", OPT_KEY, '<', "CRL signing Private key to use" },
+ { "keyform", OPT_KEYFORM, 'F', "Private key file format (DER/PEM/P12); has no effect" },
OPT_SECTION("Output"),
- {"out", OPT_OUT, '>', "output file - default stdout"},
- {"outform", OPT_OUTFORM, 'F', "Output format - default PEM"},
- {"dateopt", OPT_DATEOPT, 's', "Datetime format used for printing. (rfc_822/iso_8601). Default is rfc_822."},
- {"text", OPT_TEXT, '-', "Print out a text format version"},
- {"hash", OPT_HASH, '-', "Print hash value"},
+ { "out", OPT_OUT, '>', "output file - default stdout" },
+ { "outform", OPT_OUTFORM, 'F', "Output format - default PEM" },
+ { "dateopt", OPT_DATEOPT, 's', "Datetime format used for printing. (rfc_822/iso_8601). Default is rfc_822." },
+ { "text", OPT_TEXT, '-', "Print out a text format version" },
+ { "hash", OPT_HASH, '-', "Print hash value" },
#ifndef OPENSSL_NO_MD5
- {"hash_old", OPT_HASH_OLD, '-', "Print old-style (MD5) hash value"},
+ { "hash_old", OPT_HASH_OLD, '-', "Print old-style (MD5) hash value" },
#endif
- {"nameopt", OPT_NAMEOPT, 's', "Certificate subject/issuer name printing options"},
- {"", OPT_MD, '-', "Any supported digest"},
+ { "nameopt", OPT_NAMEOPT, 's', "Certificate subject/issuer name printing options" },
+ { "", OPT_MD, '-', "Any supported digest" },
OPT_SECTION("CRL"),
- {"issuer", OPT_ISSUER, '-', "Print issuer DN"},
- {"lastupdate", OPT_LASTUPDATE, '-', "Set lastUpdate field"},
- {"nextupdate", OPT_NEXTUPDATE, '-', "Set nextUpdate field"},
- {"noout", OPT_NOOUT, '-', "No CRL output"},
- {"fingerprint", OPT_FINGERPRINT, '-', "Print the crl fingerprint"},
- {"crlnumber", OPT_CRLNUMBER, '-', "Print CRL number"},
- {"badsig", OPT_BADSIG, '-', "Corrupt last byte of loaded CRL signature (for test)" },
- {"gendelta", OPT_GENDELTA, '<', "Other CRL to compare/diff to the Input one"},
+ { "issuer", OPT_ISSUER, '-', "Print issuer DN" },
+ { "lastupdate", OPT_LASTUPDATE, '-', "Set lastUpdate field" },
+ { "nextupdate", OPT_NEXTUPDATE, '-', "Set nextUpdate field" },
+ { "noout", OPT_NOOUT, '-', "No CRL output" },
+ { "fingerprint", OPT_FINGERPRINT, '-', "Print the crl fingerprint" },
+ { "crlnumber", OPT_CRLNUMBER, '-', "Print CRL number" },
+ { "badsig", OPT_BADSIG, '-', "Corrupt last byte of loaded CRL signature (for test)" },
+ { "gendelta", OPT_GENDELTA, '<', "Other CRL to compare/diff to the Input one" },
OPT_SECTION("Certificate"),
- {"CApath", OPT_CAPATH, '/', "Verify CRL using certificates in dir"},
- {"CAfile", OPT_CAFILE, '<', "Verify CRL using certificates in file name"},
- {"CAstore", OPT_CASTORE, ':', "Verify CRL using certificates in store URI"},
- {"no-CAfile", OPT_NOCAFILE, '-',
- "Do not load the default certificates file"},
- {"no-CApath", OPT_NOCAPATH, '-',
- "Do not load certificates from the default certificates directory"},
- {"no-CAstore", OPT_NOCASTORE, '-',
- "Do not load certificates from the default certificates store"},
+ { "CApath", OPT_CAPATH, '/', "Verify CRL using certificates in dir" },
+ { "CAfile", OPT_CAFILE, '<', "Verify CRL using certificates in file name" },
+ { "CAstore", OPT_CASTORE, ':', "Verify CRL using certificates in store URI" },
+ { "no-CAfile", OPT_NOCAFILE, '-',
+ "Do not load the default certificates file" },
+ { "no-CApath", OPT_NOCAPATH, '-',
+ "Do not load certificates from the default certificates directory" },
+ { "no-CAstore", OPT_NOCASTORE, '-',
+ "Do not load certificates from the default certificates store" },
OPT_PROV_OPTIONS,
- {NULL}
+ { NULL }
};
int crl_main(int argc, char **argv)
@@ -104,7 +127,7 @@ int crl_main(int argc, char **argv)
switch (o) {
case OPT_EOF:
case OPT_ERR:
- opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
case OPT_HELP:
@@ -148,13 +171,13 @@ int crl_main(int argc, char **argv)
do_ver = 1;
break;
case OPT_NOCAPATH:
- noCApath = 1;
+ noCApath = 1;
break;
case OPT_NOCAFILE:
- noCAfile = 1;
+ noCAfile = 1;
break;
case OPT_NOCASTORE:
- noCAstore = 1;
+ noCAstore = 1;
break;
case OPT_HASH_OLD:
#ifndef OPENSSL_NO_MD5
@@ -221,7 +244,8 @@ int crl_main(int argc, char **argv)
if (do_ver) {
if ((store = setup_verify(CAfile, noCAfile, CApath, noCApath,
- CAstore, noCAstore)) == NULL)
+ CAstore, noCAstore))
+ == NULL)
goto end;
lookup = X509_STORE_add_lookup(store, X509_LOOKUP_file());
if (lookup == NULL)
@@ -233,7 +257,7 @@ int crl_main(int argc, char **argv)
}
xobj = X509_STORE_CTX_get_obj_by_subject(ctx, X509_LU_X509,
- X509_CRL_get_issuer(x));
+ X509_CRL_get_issuer(x));
if (xobj == NULL) {
BIO_printf(bio_err, "Error getting CRL issuer certificate\n");
goto end;
@@ -310,9 +334,8 @@ int crl_main(int argc, char **argv)
}
if (hash == i) {
int ok;
- unsigned long hash_value =
- X509_NAME_hash_ex(X509_CRL_get_issuer(x), app_get0_libctx(),
- app_get0_propq(), &ok);
+ unsigned long hash_value = X509_NAME_hash_ex(X509_CRL_get_issuer(x), app_get0_libctx(),
+ app_get0_propq(), &ok);
if (num > 1)
BIO_printf(bio_out, "issuer name hash=");
@@ -328,7 +351,7 @@ int crl_main(int argc, char **argv)
if (num > 1)
BIO_printf(bio_out, "issuer name old hash=");
BIO_printf(bio_out, "%08lx\n",
- X509_NAME_hash_old(X509_CRL_get_issuer(x)));
+ X509_NAME_hash_old(X509_CRL_get_issuer(x)));
}
#endif
if (lastupdate == i) {
@@ -354,10 +377,9 @@ int crl_main(int argc, char **argv)
goto end;
}
BIO_printf(bio_out, "%s Fingerprint=",
- EVP_MD_get0_name(digest));
+ EVP_MD_get0_name(digest));
for (j = 0; j < (int)n; j++) {
- BIO_printf(bio_out, "%02X%c", md[j], (j + 1 == (int)n)
- ? '\n' : ':');
+ BIO_printf(bio_out, "%02X%c", md[j], (j + 1 == (int)n) ? '\n' : ':');
}
}
}
@@ -384,7 +406,7 @@ int crl_main(int argc, char **argv)
}
ret = 0;
- end:
+end:
if (ret != 0)
ERR_print_errors(bio_err);
BIO_free_all(out);
diff --git a/apps/crl2pkcs7.c b/apps/crl2pkcs7.c
index f661393907..72d385250a 100644
--- a/apps/crl2pkcs7.c
+++ b/apps/crl2pkcs7.c
@@ -23,27 +23,32 @@ static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile);
typedef enum OPTION_choice {
OPT_COMMON,
- OPT_INFORM, OPT_OUTFORM, OPT_IN, OPT_OUT, OPT_NOCRL, OPT_CERTFILE,
+ OPT_INFORM,
+ OPT_OUTFORM,
+ OPT_IN,
+ OPT_OUT,
+ OPT_NOCRL,
+ OPT_CERTFILE,
OPT_PROV_ENUM
} OPTION_CHOICE;
const OPTIONS crl2pkcs7_options[] = {
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
+ { "help", OPT_HELP, '-', "Display this summary" },
OPT_SECTION("Input"),
- {"in", OPT_IN, '<', "Input file"},
- {"inform", OPT_INFORM, 'F', "Input format - DER or PEM"},
- {"nocrl", OPT_NOCRL, '-', "No crl to load, just certs from '-certfile'"},
- {"certfile", OPT_CERTFILE, '<',
- "File of chain of certs to a trusted CA; can be repeated"},
+ { "in", OPT_IN, '<', "Input file" },
+ { "inform", OPT_INFORM, 'F', "Input format - DER or PEM" },
+ { "nocrl", OPT_NOCRL, '-', "No crl to load, just certs from '-certfile'" },
+ { "certfile", OPT_CERTFILE, '<',
+ "File of chain of certs to a trusted CA; can be repeated" },
OPT_SECTION("Output"),
- {"out", OPT_OUT, '>', "Output file"},
- {"outform", OPT_OUTFORM, 'F', "Output format - DER or PEM"},
+ { "out", OPT_OUT, '>', "Output file" },
+ { "outform", OPT_OUTFORM, 'F', "Output format - DER or PEM" },
OPT_PROV_OPTIONS,
- {NULL}
+ { NULL }
};
int crl2pkcs7_main(int argc, char **argv)
@@ -56,8 +61,7 @@ int crl2pkcs7_main(int argc, char **argv)
STACK_OF(X509_CRL) *crl_stack = NULL;
X509_CRL *crl = NULL;
char *infile = NULL, *outfile = NULL, *prog, *certfile;
- int i = 0, informat = FORMAT_PEM, outformat = FORMAT_PEM, ret = 1, nocrl =
- 0;
+ int i = 0, informat = FORMAT_PEM, outformat = FORMAT_PEM, ret = 1, nocrl = 0;
OPTION_CHOICE o;
prog = opt_init(argc, argv, crl2pkcs7_options);
@@ -65,7 +69,7 @@ int crl2pkcs7_main(int argc, char **argv)
switch (o) {
case OPT_EOF:
case OPT_ERR:
- opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
case OPT_HELP:
@@ -141,7 +145,7 @@ int crl2pkcs7_main(int argc, char **argv)
if (!sk_X509_CRL_push(crl_stack, crl))
goto end;
- crl = NULL; /* now part of p7 for OPENSSL_freeing */
+ crl = NULL; /* now part of p7 for OPENSSL_freeing */
}
if (certflst != NULL) {
@@ -173,7 +177,7 @@ int crl2pkcs7_main(int argc, char **argv)
goto end;
}
ret = 0;
- end:
+end:
sk_OPENSSL_STRING_free(certflst);
BIO_free(in);
BIO_free_all(out);
@@ -229,7 +233,7 @@ static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile)
}
ret = count;
- end:
+end:
/* never need to OPENSSL_free x */
BIO_free(in);
sk_X509_INFO_free(sk);
diff --git a/apps/dgst.c b/apps/dgst.c
index 31a9c2cf7f..8bc8e4c2c5 100644
--- a/apps/dgst.c
+++ b/apps/dgst.c
@@ -22,15 +22,15 @@
#include <ctype.h>
#undef BUFSIZE
-#define BUFSIZE 1024*8
+#define BUFSIZE 1024 * 8
static int do_fp_oneshot_sign(BIO *out, EVP_MD_CTX *ctx, BIO *in, int sep, int binout,
- EVP_PKEY *key, unsigned char *sigin, int siglen,
- const char *sig_name, const char *file);
+ EVP_PKEY *key, unsigned char *sigin, int siglen,
+ const char *sig_name, const char *file);
int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout, int xoflen,
- EVP_PKEY *key, unsigned char *sigin, int siglen,
- const char *sig_name, const char *md_name,
- const char *file);
+ EVP_PKEY *key, unsigned char *sigin, int siglen,
+ const char *sig_name, const char *md_name,
+ const char *file);
static void show_digests(const OBJ_NAME *name, void *bio_);
struct doall_dgst_digests {
@@ -41,54 +41,71 @@ struct doall_dgst_digests {
typedef enum OPTION_choice {
OPT_COMMON,
OPT_LIST,
- OPT_C, OPT_R, OPT_OUT, OPT_SIGN, OPT_PASSIN, OPT_VERIFY,
- OPT_PRVERIFY, OPT_SIGNATURE, OPT_KEYFORM,
- OPT_HEX, OPT_BINARY, OPT_DEBUG, OPT_FIPS_FINGERPRINT,
- OPT_HMAC, OPT_HMAC_ENV, OPT_HMAC_STDIN, OPT_MAC, OPT_SIGOPT, OPT_MACOPT, OPT_XOFLEN,
+ OPT_C,
+ OPT_R,
+ OPT_OUT,
+ OPT_SIGN,
+ OPT_PASSIN,
+ OPT_VERIFY,
+ OPT_PRVERIFY,
+ OPT_SIGNATURE,
+ OPT_KEYFORM,
+ OPT_HEX,
+ OPT_BINARY,
+ OPT_DEBUG,
+ OPT_FIPS_FINGERPRINT,
+ OPT_HMAC,
+ OPT_HMAC_ENV,
+ OPT_HMAC_STDIN,
+ OPT_MAC,
+ OPT_SIGOPT,
+ OPT_MACOPT,
+ OPT_XOFLEN,
OPT_DIGEST,
- OPT_R_ENUM, OPT_PROV_ENUM
+ OPT_R_ENUM,
+ OPT_PROV_ENUM
} OPTION_CHOICE;
const OPTIONS dgst_options[] = {
- {OPT_HELP_STR, 1, '-', "Usage: %s [options] [file...]\n"},
+ { OPT_HELP_STR, 1, '-', "Usage: %s [options] [file...]\n" },
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
- {"list", OPT_LIST, '-', "List digests"},
- {"passin", OPT_PASSIN, 's', "Input file pass phrase source"},
+ { "help", OPT_HELP, '-', "Display this summary" },
+ { "list", OPT_LIST, '-', "List digests" },
+ { "passin", OPT_PASSIN, 's', "Input file pass phrase source" },
OPT_SECTION("Output"),
- {"c", OPT_C, '-', "Print the digest with separating colons"},
- {"r", OPT_R, '-', "Print the digest in coreutils format"},
- {"out", OPT_OUT, '>', "Output to filename rather than stdout"},
- {"keyform", OPT_KEYFORM, 'f', "Key file format (DER/PEM)"},
- {"hex", OPT_HEX, '-', "Print as hex dump"},
- {"binary", OPT_BINARY, '-', "Print in binary form"},
- {"xoflen", OPT_XOFLEN, 'p', "Output length for XOF algorithms. To obtain the maximum security strength set this to 32 (or greater) for SHAKE128, and 64 (or greater) for SHAKE256"},
- {"d", OPT_DEBUG, '-', "Print debug info"},
- {"debug", OPT_DEBUG, '-', "Print debug info"},
+ { "c", OPT_C, '-', "Print the digest with separating colons" },
+ { "r", OPT_R, '-', "Print the digest in coreutils format" },
+ { "out", OPT_OUT, '>', "Output to filename rather than stdout" },
+ { "keyform", OPT_KEYFORM, 'f', "Key file format (DER/PEM)" },
+ { "hex", OPT_HEX, '-', "Print as hex dump" },
+ { "binary", OPT_BINARY, '-', "Print in binary form" },
+ { "xoflen", OPT_XOFLEN, 'p', "Output length for XOF algorithms. To obtain the maximum security strength set this to 32 (or greater) for SHAKE128, and 64 (or greater) for SHAKE256" },
+ { "d", OPT_DEBUG, '-', "Print debug info" },
+ { "debug", OPT_DEBUG, '-', "Print debug info" },
OPT_SECTION("Signing"),
- {"sign", OPT_SIGN, 's', "Sign digest using private key"},
- {"verify", OPT_VERIFY, 's', "Verify a signature using public key"},
- {"prverify", OPT_PRVERIFY, 's', "Verify a signature using private key"},
- {"sigopt", OPT_SIGOPT, 's', "Signature parameter in n:v form"},
- {"signature", OPT_SIGNATURE, '<', "File with signature to verify"},
- {"hmac", OPT_HMAC, 's', "Create hashed MAC with key"},
- {"hmac-env", OPT_HMAC_ENV, 's', "Create hashed MAC with key from environment variable"},
- {"hmac-stdin", OPT_HMAC_STDIN, '-', "Create hashed MAC with key from stdin"},
- {"mac", OPT_MAC, 's', "Create MAC (not necessarily HMAC)"},
- {"macopt", OPT_MACOPT, 's', "MAC algorithm parameters in n:v form or key"},
- {"", OPT_DIGEST, '-', "Any supported digest"},
- {"fips-fingerprint", OPT_FIPS_FINGERPRINT, '-',
- "Compute HMAC with the key used in OpenSSL-FIPS fingerprint"},
+ { "sign", OPT_SIGN, 's', "Sign digest using private key" },
+ { "verify", OPT_VERIFY, 's', "Verify a signature using public key" },
+ { "prverify", OPT_PRVERIFY, 's', "Verify a signature using private key" },
+ { "sigopt", OPT_SIGOPT, 's', "Signature parameter in n:v form" },
+ { "signature", OPT_SIGNATURE, '<', "File with signature to verify" },
+ { "hmac", OPT_HMAC, 's', "Create hashed MAC with key" },
+ { "hmac-env", OPT_HMAC_ENV, 's', "Create hashed MAC with key from environment variable" },
+ { "hmac-stdin", OPT_HMAC_STDIN, '-', "Create hashed MAC with key from stdin" },
+ { "mac", OPT_MAC, 's', "Create MAC (not necessarily HMAC)" },
+ { "macopt", OPT_MACOPT, 's', "MAC algorithm parameters in n:v form or key" },
+ { "", OPT_DIGEST, '-', "Any supported digest" },
+ { "fips-fingerprint", OPT_FIPS_FINGERPRINT, '-',
+ "Compute HMAC with the key used in OpenSSL-FIPS fingerprint" },
OPT_R_OPTIONS,
OPT_PROV_OPTIONS,
OPT_PARAMETERS(),
- {"file", 0, 0, "Files to digest (optional; default is stdin)"},
- {NULL}
+ { "file", 0, 0, "Files to digest (optional; default is stdin)" },
+ { NULL }
};
int dgst_main(int argc, char **argv)
@@ -126,7 +143,7 @@ int dgst_main(int argc, char **argv)
switch (o) {
case OPT_EOF:
case OPT_ERR:
- opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
case OPT_HELP:
@@ -138,7 +155,7 @@ int dgst_main(int argc, char **argv)
dec.bio = bio_out;
dec.n = 0;
OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_MD_METH,
- show_digests, &dec);
+ show_digests, &dec);
BIO_printf(bio_out, "\n");
ret = EXIT_SUCCESS;
goto end;
@@ -266,7 +283,7 @@ int dgst_main(int argc, char **argv)
if (do_verify && sigfile == NULL) {
BIO_printf(bio_err,
- "No signature to verify: use the -signature option\n");
+ "No signature to verify: use the -signature option\n");
goto end;
}
@@ -317,8 +334,9 @@ int dgst_main(int argc, char **argv)
char def_md[80];
if (EVP_PKEY_get_default_digest_name(sigkey, def_md,
- sizeof(def_md)) == 2
- && strcmp(def_md, "UNDEF") == 0)
+ sizeof(def_md))
+ == 2
+ && strcmp(def_md, "UNDEF") == 0)
oneshot_sign = 1;
signctx = EVP_MD_CTX_new();
if (signctx == NULL)
@@ -355,8 +373,8 @@ int dgst_main(int argc, char **argv)
digestname = SN_sha256;
}
sigkey = EVP_PKEY_new_raw_private_key(EVP_PKEY_HMAC, NULL,
- (unsigned char *)hmac_key,
- strlen(hmac_key));
+ (unsigned char *)hmac_key,
+ strlen(hmac_key));
if (sigkey == NULL)
goto end;
}
@@ -374,12 +392,12 @@ int dgst_main(int argc, char **argv)
}
if (do_verify)
res = EVP_DigestVerifyInit_ex(mctx, &pctx, digestname,
- app_get0_libctx(),
- app_get0_propq(), sigkey, NULL);
+ app_get0_libctx(),
+ app_get0_propq(), sigkey, NULL);
else
res = EVP_DigestSignInit_ex(mctx, &pctx, digestname,
- app_get0_libctx(),
- app_get0_propq(), sigkey, NULL);
+ app_get0_libctx(),
+ app_get0_propq(), sigkey, NULL);
if (res == 0) {
BIO_printf(bio_err, "Error setting context\n");
goto end;
@@ -390,7 +408,7 @@ int dgst_main(int argc, char **argv)
if (pkey_ctrl_string(pctx, sigopt) <= 0) {
BIO_printf(bio_err, "Signature parameter error \"%s\"\n",
- sigopt);
+ sigopt);
goto end;
}
}
@@ -464,10 +482,10 @@ int dgst_main(int argc, char **argv)
BIO_set_fp(in, stdin, BIO_NOCLOSE);
if (oneshot_sign)
ret = do_fp_oneshot_sign(out, signctx, in, separator, out_bin,
- sigkey, sigbuf, siglen, NULL, "stdin");
+ sigkey, sigbuf, siglen, NULL, "stdin");
else
ret = do_fp(out, buf, inp, separator, out_bin, xoflen,
- sigkey, sigbuf, siglen, NULL, md_name, "stdin");
+ sigkey, sigbuf, siglen, NULL, md_name, "stdin");
} else {
const char *sig_name = NULL;
@@ -484,19 +502,19 @@ int dgst_main(int argc, char **argv)
} else {
if (oneshot_sign) {
if (do_fp_oneshot_sign(out, signctx, in, separator, out_bin,
- sigkey, sigbuf, siglen, sig_name,
- argv[i]))
+ sigkey, sigbuf, siglen, sig_name,
+ argv[i]))
ret = EXIT_FAILURE;
} else {
if (do_fp(out, buf, inp, separator, out_bin, xoflen,
- sigkey, sigbuf, siglen, sig_name, md_name, argv[i]))
+ sigkey, sigbuf, siglen, sig_name, md_name, argv[i]))
ret = EXIT_FAILURE;
}
}
(void)BIO_reset(bmd);
}
}
- end:
+end:
if (ret != EXIT_SUCCESS)
ERR_print_errors(bio_err);
OPENSSL_clear_free(buf, BUFSIZE);
@@ -580,12 +598,12 @@ static const char *newline_escape_filename(const char *file, int *backslash)
e++;
}
file_cpy[i] = '\0';
- return (const char*)file_cpy;
+ return (const char *)file_cpy;
}
static void print_out(BIO *out, unsigned char *buf, size_t len,
- int sep, int binout,
- const char *sig_name, const char *md_name, const char *file)
+ int sep, int binout,
+ const char *sig_name, const char *md_name, const char *file)
{
int i, backslash = 0;
@@ -633,9 +651,9 @@ static void print_verify_result(BIO *out, int i)
}
int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout, int xoflen,
- EVP_PKEY *key, unsigned char *sigin, int siglen,
- const char *sig_name, const char *md_name,
- const char *file)
+ EVP_PKEY *key, unsigned char *sigin, int siglen,
+ const char *sig_name, const char *md_name,
+ const char *file)
{
size_t len = BUFSIZE;
int i, ret = EXIT_FAILURE;
@@ -699,7 +717,7 @@ int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout, int xoflen
}
print_out(out, buf, len, sep, binout, sig_name, md_name, file);
ret = EXIT_SUCCESS;
- end:
+end:
if (allocated_buf != NULL)
OPENSSL_clear_free(allocated_buf, len);
@@ -713,8 +731,8 @@ int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout, int xoflen
* then used inside EVP_DigestVerify() and EVP_DigestSign().
*/
static int do_fp_oneshot_sign(BIO *out, EVP_MD_CTX *ctx, BIO *in, int sep, int binout,
- EVP_PKEY *key, unsigned char *sigin, int siglen,
- const char *sig_name, const char *file)
+ EVP_PKEY *key, unsigned char *sigin, int siglen,
+ const char *sig_name, const char *file)
{
int res, ret = EXIT_FAILURE;
size_t len = 0;
@@ -751,7 +769,7 @@ static int do_fp_oneshot_sign(BIO *out, EVP_MD_CTX *ctx, BIO *in, int sep, int b
goto end;
}
- end:
+end:
OPENSSL_free(sig);
OPENSSL_clear_free(buf, buflen);
diff --git a/apps/dhparam.c b/apps/dhparam.c
index 72fa6f0d9a..dc6648aa92 100644
--- a/apps/dhparam.c
+++ b/apps/dhparam.c
@@ -36,44 +36,55 @@ static int verbose = 1;
typedef enum OPTION_choice {
OPT_COMMON,
- OPT_INFORM, OPT_OUTFORM, OPT_IN, OPT_OUT,
- OPT_CHECK, OPT_TEXT, OPT_NOOUT,
- OPT_DSAPARAM, OPT_2, OPT_3, OPT_5, OPT_VERBOSE, OPT_QUIET,
- OPT_R_ENUM, OPT_PROV_ENUM
+ OPT_INFORM,
+ OPT_OUTFORM,
+ OPT_IN,
+ OPT_OUT,
+ OPT_CHECK,
+ OPT_TEXT,
+ OPT_NOOUT,
+ OPT_DSAPARAM,
+ OPT_2,
+ OPT_3,
+ OPT_5,
+ OPT_VERBOSE,
+ OPT_QUIET,
+ OPT_R_ENUM,
+ OPT_PROV_ENUM
} OPTION_CHOICE;
const OPTIONS dhparam_options[] = {
- {OPT_HELP_STR, 1, '-', "Usage: %s [options] [numbits]\n"},
+ { OPT_HELP_STR, 1, '-', "Usage: %s [options] [numbits]\n" },
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
- {"check", OPT_CHECK, '-', "Check the DH parameters"},
+ { "help", OPT_HELP, '-', "Display this summary" },
+ { "check", OPT_CHECK, '-', "Check the DH parameters" },
#if !defined(OPENSSL_NO_DSA) || !defined(OPENSSL_NO_DEPRECATED_3_0)
- {"dsaparam", OPT_DSAPARAM, '-',
- "Read or generate DSA parameters, convert to DH"},
+ { "dsaparam", OPT_DSAPARAM, '-',
+ "Read or generate DSA parameters, convert to DH" },
#endif
OPT_SECTION("Input"),
- {"in", OPT_IN, '<', "Input file"},
- {"inform", OPT_INFORM, 'F', "Input format, DER or PEM"},
+ { "in", OPT_IN, '<', "Input file" },
+ { "inform", OPT_INFORM, 'F', "Input format, DER or PEM" },
OPT_SECTION("Output"),
- {"out", OPT_OUT, '>', "Output file"},
- {"outform", OPT_OUTFORM, 'F', "Output format, DER or PEM"},
- {"text", OPT_TEXT, '-', "Print a text form of the DH parameters"},
- {"noout", OPT_NOOUT, '-', "Don't output any DH parameters"},
- {"2", OPT_2, '-', "Generate parameters using 2 as the generator value"},
- {"3", OPT_3, '-', "Generate parameters using 3 as the generator value"},
- {"5", OPT_5, '-', "Generate parameters using 5 as the generator value"},
- {"verbose", OPT_VERBOSE, '-', "Verbose output"},
- {"quiet", OPT_QUIET, '-', "Terse output"},
+ { "out", OPT_OUT, '>', "Output file" },
+ { "outform", OPT_OUTFORM, 'F', "Output format, DER or PEM" },
+ { "text", OPT_TEXT, '-', "Print a text form of the DH parameters" },
+ { "noout", OPT_NOOUT, '-', "Don't output any DH parameters" },
+ { "2", OPT_2, '-', "Generate parameters using 2 as the generator value" },
+ { "3", OPT_3, '-', "Generate parameters using 3 as the generator value" },
+ { "5", OPT_5, '-', "Generate parameters using 5 as the generator value" },
+ { "verbose", OPT_VERBOSE, '-', "Verbose output" },
+ { "quiet", OPT_QUIET, '-', "Terse output" },
OPT_R_OPTIONS,
OPT_PROV_OPTIONS,
OPT_PARAMETERS(),
- {"numbits", 0, 0, "Number of bits if generating parameters (optional)"},
- {NULL}
+ { "numbits", 0, 0, "Number of bits if generating parameters (optional)" },
+ { NULL }
};
int dhparam_main(int argc, char **argv)
@@ -92,7 +103,7 @@ int dhparam_main(int argc, char **argv)
switch (o) {
case OPT_EOF:
case OPT_ERR:
- opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
case OPT_HELP:
@@ -168,7 +179,7 @@ int dhparam_main(int argc, char **argv)
if (dsaparam && g) {
BIO_printf(bio_err,
- "Error, generator may not be chosen for DSA parameters\n");
+ "Error, generator may not be chosen for DSA parameters\n");
goto end;
}
@@ -186,22 +197,22 @@ int dhparam_main(int argc, char **argv)
ctx = EVP_PKEY_CTX_new_from_name(app_get0_libctx(), alg, app_get0_propq());
if (ctx == NULL) {
BIO_printf(bio_err,
- "Error, %s param generation context allocation failed\n",
- alg);
+ "Error, %s param generation context allocation failed\n",
+ alg);
goto end;
}
EVP_PKEY_CTX_set_app_data(ctx, bio_err);
if (verbose) {
EVP_PKEY_CTX_set_cb(ctx, progress_cb);
BIO_printf(bio_err,
- "Generating %s parameters, %d bit long %sprime\n",
- alg, num, dsaparam ? "" : "safe ");
+ "Generating %s parameters, %d bit long %sprime\n",
+ alg, num, dsaparam ? "" : "safe ");
}
if (EVP_PKEY_paramgen_init(ctx) <= 0) {
BIO_printf(bio_err,
- "Error, unable to initialise %s parameters\n",
- alg);
+ "Error, unable to initialise %s parameters\n",
+ alg);
goto end;
}
@@ -251,32 +262,34 @@ int dhparam_main(int argc, char **argv)
*/
done = 1;
/*
- * We set NULL for the keytype to allow any key type. We don't know
- * if we're going to get DH or DHX (or DSA in the event of dsaparam).
- * We check that we got one of those key types afterwards.
- */
+ * We set NULL for the keytype to allow any key type. We don't know
+ * if we're going to get DH or DHX (or DSA in the event of dsaparam).
+ * We check that we got one of those key types afterwards.
+ */
decoderctx
= OSSL_DECODER_CTX_new_for_pkey(&tmppkey,
- (informat == FORMAT_ASN1)
- ? "DER" : "PEM",
- NULL,
- (informat == FORMAT_ASN1)
- ? keytype : NULL,
- OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS,
- NULL, NULL);
+ (informat == FORMAT_ASN1)
+ ? "DER"
+ : "PEM",
+ NULL,
+ (informat == FORMAT_ASN1)
+ ? keytype
+ : NULL,
+ OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS,
+ NULL, NULL);
if (decoderctx != NULL
- && !OSSL_DECODER_from_bio(decoderctx, in)
- && informat == FORMAT_ASN1
- && strcmp(keytype, "DH") == 0) {
+ && !OSSL_DECODER_from_bio(decoderctx, in)
+ && informat == FORMAT_ASN1
+ && strcmp(keytype, "DH") == 0) {
/*
- * When reading DER we explicitly state the expected keytype
- * because, unlike PEM, there is no header to declare what
- * the contents of the DER file are. The decoders just try
- * and guess. Unfortunately with DHX key types they may guess
- * wrong and think we have a DSA keytype. Therefore, we try
- * both DH and DHX sequentially.
- */
+ * When reading DER we explicitly state the expected keytype
+ * because, unlike PEM, there is no header to declare what
+ * the contents of the DER file are. The decoders just try
+ * and guess. Unfortunately with DHX key types they may guess
+ * wrong and think we have a DSA keytype. Therefore, we try
+ * both DH and DHX sequentially.
+ */
keytype = "DHX";
/*
* BIO_reset() returns 0 for success for file BIOs only!!!
@@ -302,7 +315,7 @@ int dhparam_main(int argc, char **argv)
goto end;
} else {
if (!EVP_PKEY_is_a(tmppkey, "DH")
- && !EVP_PKEY_is_a(tmppkey, "DHX")) {
+ && !EVP_PKEY_is_a(tmppkey, "DHX")) {
BIO_printf(bio_err, "Error, unable to load DH parameters\n");
goto end;
}
@@ -332,12 +345,12 @@ int dhparam_main(int argc, char **argv)
}
if (!noout) {
- OSSL_ENCODER_CTX *ectx =
- OSSL_ENCODER_CTX_new_for_pkey(pkey,
- OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS,
- outformat == FORMAT_ASN1
- ? "DER" : "PEM",
- NULL, NULL);
+ OSSL_ENCODER_CTX *ectx = OSSL_ENCODER_CTX_new_for_pkey(pkey,
+ OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS,
+ outformat == FORMAT_ASN1
+ ? "DER"
+ : "PEM",
+ NULL, NULL);
if (ectx == NULL || !OSSL_ENCODER_to_bio(ectx, out)) {
OSSL_ENCODER_CTX_free(ectx);
@@ -347,7 +360,7 @@ int dhparam_main(int argc, char **argv)
OSSL_ENCODER_CTX_free(ectx);
}
ret = 0;
- end:
+end:
if (ret != 0)
ERR_print_errors(bio_err);
BIO_free(in);
@@ -372,33 +385,33 @@ static EVP_PKEY *dsa_to_dh(EVP_PKEY *dh)
EVP_PKEY *pkey = NULL;
if (!EVP_PKEY_get_bn_param(dh, OSSL_PKEY_PARAM_FFC_P, &bn_p)
- || !EVP_PKEY_get_bn_param(dh, OSSL_PKEY_PARAM_FFC_Q, &bn_q)
- || !EVP_PKEY_get_bn_param(dh, OSSL_PKEY_PARAM_FFC_G, &bn_g)) {
+ || !EVP_PKEY_get_bn_param(dh, OSSL_PKEY_PARAM_FFC_Q, &bn_q)
+ || !EVP_PKEY_get_bn_param(dh, OSSL_PKEY_PARAM_FFC_G, &bn_g)) {
BIO_printf(bio_err, "Error, failed to set DH parameters\n");
goto err;
}
if ((tmpl = OSSL_PARAM_BLD_new()) == NULL
- || !OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_FFC_P,
- bn_p)
- || !OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_FFC_Q,
- bn_q)
- || !OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_FFC_G,
- bn_g)
- || (params = OSSL_PARAM_BLD_to_param(tmpl)) == NULL) {
+ || !OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_FFC_P,
+ bn_p)
+ || !OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_FFC_Q,
+ bn_q)
+ || !OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_FFC_G,
+ bn_g)
+ || (params = OSSL_PARAM_BLD_to_param(tmpl)) == NULL) {
BIO_printf(bio_err, "Error, failed to set DH parameters\n");
goto err;
}
ctx = EVP_PKEY_CTX_new_from_name(app_get0_libctx(), "DHX", app_get0_propq());
if (ctx == NULL
- || EVP_PKEY_fromdata_init(ctx) <= 0
- || EVP_PKEY_fromdata(ctx, &pkey, EVP_PKEY_KEY_PARAMETERS, params) <= 0) {
+ || EVP_PKEY_fromdata_init(ctx) <= 0
+ || EVP_PKEY_fromdata(ctx, &pkey, EVP_PKEY_KEY_PARAMETERS, params) <= 0) {
BIO_printf(bio_err, "Error, failed to set DH parameters\n");
goto err;
}
- err:
+err:
EVP_PKEY_CTX_free(ctx);
OSSL_PARAM_free(params);
OSSL_PARAM_BLD_free(tmpl);
@@ -407,4 +420,3 @@ static EVP_PKEY *dsa_to_dh(EVP_PKEY *dh)
BN_free(bn_g);
return pkey;
}
-
diff --git a/apps/dsa.c b/apps/dsa.c
index 7ba3634d6d..ac7172f41d 100644
--- a/apps/dsa.c
+++ b/apps/dsa.c
@@ -27,48 +27,59 @@
#include <openssl/core_dispatch.h>
#ifndef OPENSSL_NO_RC4
-# define DEFAULT_PVK_ENCR_STRENGTH 2
+#define DEFAULT_PVK_ENCR_STRENGTH 2
#else
-# define DEFAULT_PVK_ENCR_STRENGTH 0
+#define DEFAULT_PVK_ENCR_STRENGTH 0
#endif
typedef enum OPTION_choice {
OPT_COMMON,
- OPT_INFORM, OPT_OUTFORM, OPT_IN, OPT_OUT,
+ OPT_INFORM,
+ OPT_OUTFORM,
+ OPT_IN,
+ OPT_OUT,
/* Do not change the order here; see case statements below */
- OPT_PVK_NONE, OPT_PVK_WEAK, OPT_PVK_STRONG,
- OPT_NOOUT, OPT_TEXT, OPT_MODULUS, OPT_PUBIN,
- OPT_PUBOUT, OPT_CIPHER, OPT_PASSIN, OPT_PASSOUT,
+ OPT_PVK_NONE,
+ OPT_PVK_WEAK,
+ OPT_PVK_STRONG,
+ OPT_NOOUT,
+ OPT_TEXT,
+ OPT_MODULUS,
+ OPT_PUBIN,
+ OPT_PUBOUT,
+ OPT_CIPHER,
+ OPT_PASSIN,
+ OPT_PASSOUT,
OPT_PROV_ENUM
} OPTION_CHOICE;
const OPTIONS dsa_options[] = {
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
- {"", OPT_CIPHER, '-', "Any supported cipher"},
+ { "help", OPT_HELP, '-', "Display this summary" },
+ { "", OPT_CIPHER, '-', "Any supported cipher" },
#ifndef OPENSSL_NO_RC4
- {"pvk-strong", OPT_PVK_STRONG, '-', "Enable 'Strong' PVK encoding level (default)"},
- {"pvk-weak", OPT_PVK_WEAK, '-', "Enable 'Weak' PVK encoding level"},
- {"pvk-none", OPT_PVK_NONE, '-', "Don't enforce PVK encoding"},
+ { "pvk-strong", OPT_PVK_STRONG, '-', "Enable 'Strong' PVK encoding level (default)" },
+ { "pvk-weak", OPT_PVK_WEAK, '-', "Enable 'Weak' PVK encoding level" },
+ { "pvk-none", OPT_PVK_NONE, '-', "Don't enforce PVK encoding" },
#endif
OPT_SECTION("Input"),
- {"in", OPT_IN, 's', "Input key"},
- {"inform", OPT_INFORM, 'f', "Input format (DER/PEM/PVK); has no effect"},
- {"pubin", OPT_PUBIN, '-', "Expect a public key in input file"},
- {"passin", OPT_PASSIN, 's', "Input file pass phrase source"},
+ { "in", OPT_IN, 's', "Input key" },
+ { "inform", OPT_INFORM, 'f', "Input format (DER/PEM/PVK); has no effect" },
+ { "pubin", OPT_PUBIN, '-', "Expect a public key in input file" },
+ { "passin", OPT_PASSIN, 's', "Input file pass phrase source" },
OPT_SECTION("Output"),
- {"out", OPT_OUT, '>', "Output file"},
- {"outform", OPT_OUTFORM, 'f', "Output format, DER PEM PVK"},
- {"noout", OPT_NOOUT, '-', "Don't print key out"},
- {"text", OPT_TEXT, '-', "Print the key in text"},
- {"modulus", OPT_MODULUS, '-', "Print the DSA public value"},
- {"pubout", OPT_PUBOUT, '-', "Output public key, not private"},
- {"passout", OPT_PASSOUT, 's', "Output file pass phrase source"},
+ { "out", OPT_OUT, '>', "Output file" },
+ { "outform", OPT_OUTFORM, 'f', "Output format, DER PEM PVK" },
+ { "noout", OPT_NOOUT, '-', "Don't print key out" },
+ { "text", OPT_TEXT, '-', "Print the key in text" },
+ { "modulus", OPT_MODULUS, '-', "Print the DSA public value" },
+ { "pubout", OPT_PUBOUT, '-', "Output public key, not private" },
+ { "passout", OPT_PASSOUT, 's', "Output file pass phrase source" },
OPT_PROV_OPTIONS,
- {NULL}
+ { NULL }
};
int dsa_main(int argc, char **argv)
@@ -94,7 +105,7 @@ int dsa_main(int argc, char **argv)
switch (o) {
case OPT_EOF:
case OPT_ERR:
- opthelp:
+ opthelp:
ret = 0;
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
@@ -122,9 +133,9 @@ int dsa_main(int argc, char **argv)
case OPT_PASSOUT:
passoutarg = opt_arg();
break;
- case OPT_PVK_STRONG: /* pvk_encr:= 2 */
- case OPT_PVK_WEAK: /* pvk_encr:= 1 */
- case OPT_PVK_NONE: /* pvk_encr:= 0 */
+ case OPT_PVK_STRONG: /* pvk_encr:= 2 */
+ case OPT_PVK_WEAK: /* pvk_encr:= 1 */
+ case OPT_PVK_NONE: /* pvk_encr:= 0 */
#ifndef OPENSSL_NO_RC4
pvk_encr = (o - OPT_PVK_NONE);
#endif
@@ -245,12 +256,12 @@ int dsa_main(int argc, char **argv)
} else {
assert(private);
selection = (OSSL_KEYMGMT_SELECT_KEYPAIR
- | OSSL_KEYMGMT_SELECT_ALL_PARAMETERS);
+ | OSSL_KEYMGMT_SELECT_ALL_PARAMETERS);
}
/* Perform the encoding */
ectx = OSSL_ENCODER_CTX_new_for_pkey(pkey, selection, output_type,
- output_structure, NULL);
+ output_structure, NULL);
if (OSSL_ENCODER_CTX_get_num_encoders(ectx) == 0) {
BIO_printf(bio_err, "%s format not supported\n", output_type);
goto end;
@@ -266,8 +277,8 @@ int dsa_main(int argc, char **argv)
if (passout != NULL)
/* When passout given, override the passphrase prompter */
OSSL_ENCODER_CTX_set_passphrase(ectx,
- (const unsigned char *)passout,
- strlen(passout));
+ (const unsigned char *)passout,
+ strlen(passout));
}
/* PVK requires a bit more */
@@ -286,7 +297,7 @@ int dsa_main(int argc, char **argv)
goto end;
}
ret = 0;
- end:
+end:
if (ret != 0)
ERR_print_errors(bio_err);
OSSL_ENCODER_CTX_free(ectx);
diff --git a/apps/dsaparam.c b/apps/dsaparam.c
index 583224f56d..cec9b7af4d 100644
--- a/apps/dsaparam.c
+++ b/apps/dsaparam.c
@@ -26,37 +26,45 @@ static int verbose = 0;
typedef enum OPTION_choice {
OPT_COMMON,
- OPT_INFORM, OPT_OUTFORM, OPT_IN, OPT_OUT, OPT_TEXT,
- OPT_NOOUT, OPT_GENKEY, OPT_VERBOSE, OPT_QUIET,
- OPT_R_ENUM, OPT_PROV_ENUM
+ OPT_INFORM,
+ OPT_OUTFORM,
+ OPT_IN,
+ OPT_OUT,
+ OPT_TEXT,
+ OPT_NOOUT,
+ OPT_GENKEY,
+ OPT_VERBOSE,
+ OPT_QUIET,
+ OPT_R_ENUM,
+ OPT_PROV_ENUM
} OPTION_CHOICE;
const OPTIONS dsaparam_options[] = {
- {OPT_HELP_STR, 1, '-', "Usage: %s [options] [numbits] [numqbits]\n"},
+ { OPT_HELP_STR, 1, '-', "Usage: %s [options] [numbits] [numqbits]\n" },
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
+ { "help", OPT_HELP, '-', "Display this summary" },
OPT_SECTION("Input"),
- {"in", OPT_IN, '<', "Input file"},
- {"inform", OPT_INFORM, 'F', "Input format - DER or PEM"},
+ { "in", OPT_IN, '<', "Input file" },
+ { "inform", OPT_INFORM, 'F', "Input format - DER or PEM" },
OPT_SECTION("Output"),
- {"out", OPT_OUT, '>', "Output file"},
- {"outform", OPT_OUTFORM, 'F', "Output format - DER or PEM"},
- {"text", OPT_TEXT, '-', "Print as text"},
- {"noout", OPT_NOOUT, '-', "No output"},
- {"verbose", OPT_VERBOSE, '-', "Verbose output"},
- {"quiet", OPT_QUIET, '-', "Terse output"},
- {"genkey", OPT_GENKEY, '-', "Generate a DSA key"},
+ { "out", OPT_OUT, '>', "Output file" },
+ { "outform", OPT_OUTFORM, 'F', "Output format - DER or PEM" },
+ { "text", OPT_TEXT, '-', "Print as text" },
+ { "noout", OPT_NOOUT, '-', "No output" },
+ { "verbose", OPT_VERBOSE, '-', "Verbose output" },
+ { "quiet", OPT_QUIET, '-', "Terse output" },
+ { "genkey", OPT_GENKEY, '-', "Generate a DSA key" },
OPT_R_OPTIONS,
OPT_PROV_OPTIONS,
OPT_PARAMETERS(),
- {"numbits", 0, 0, "Number of bits if generating parameters or key (optional)"},
- {"numqbits", 0, 0, "Number of bits in the subprime parameter q if generating parameters or key (optional)"},
- {NULL}
+ { "numbits", 0, 0, "Number of bits if generating parameters or key (optional)" },
+ { "numqbits", 0, 0, "Number of bits in the subprime parameter q if generating parameters or key (optional)" },
+ { NULL }
};
int dsaparam_main(int argc, char **argv)
@@ -75,7 +83,7 @@ int dsaparam_main(int argc, char **argv)
switch (o) {
case OPT_EOF:
case OPT_ERR:
- opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
case OPT_HELP:
@@ -146,37 +154,37 @@ int dsaparam_main(int argc, char **argv)
ctx = EVP_PKEY_CTX_new_from_name(app_get0_libctx(), "DSA", app_get0_propq());
if (ctx == NULL) {
BIO_printf(bio_err,
- "Error, DSA parameter generation context allocation failed\n");
+ "Error, DSA parameter generation context allocation failed\n");
goto end;
}
if (numbits > 0) {
if (numbits > OPENSSL_DSA_MAX_MODULUS_BITS)
BIO_printf(bio_err,
- "Warning: It is not recommended to use more than %d bit for DSA keys.\n"
- " Your key size is %d! Larger key size may behave not as expected.\n",
- OPENSSL_DSA_MAX_MODULUS_BITS, numbits);
+ "Warning: It is not recommended to use more than %d bit for DSA keys.\n"
+ " Your key size is %d! Larger key size may behave not as expected.\n",
+ OPENSSL_DSA_MAX_MODULUS_BITS, numbits);
EVP_PKEY_CTX_set_app_data(ctx, bio_err);
if (verbose) {
EVP_PKEY_CTX_set_cb(ctx, progress_cb);
BIO_printf(bio_err, "Generating DSA parameters, %d bit long prime\n",
- num);
+ num);
BIO_printf(bio_err, "This could take some time\n");
}
if (EVP_PKEY_paramgen_init(ctx) <= 0) {
BIO_printf(bio_err,
- "Error, DSA key generation paramgen init failed\n");
+ "Error, DSA key generation paramgen init failed\n");
goto end;
}
if (EVP_PKEY_CTX_set_dsa_paramgen_bits(ctx, num) <= 0) {
BIO_printf(bio_err,
- "Error, DSA key generation setting bit length failed\n");
+ "Error, DSA key generation setting bit length failed\n");
goto end;
}
if (numqbits > 0) {
if (EVP_PKEY_CTX_set_dsa_paramgen_q_bits(ctx, numqbits) <= 0) {
BIO_printf(bio_err,
- "Error, DSA key generation setting subprime bit length failed\n");
+ "Error, DSA key generation setting subprime bit length failed\n");
goto end;
}
}
@@ -213,15 +221,15 @@ int dsaparam_main(int argc, char **argv)
if (genkey) {
EVP_PKEY_CTX_free(ctx);
ctx = EVP_PKEY_CTX_new_from_pkey(app_get0_libctx(), params,
- app_get0_propq());
+ app_get0_propq());
if (ctx == NULL) {
BIO_printf(bio_err,
- "Error, DSA key generation context allocation failed\n");
+ "Error, DSA key generation context allocation failed\n");
goto end;
}
if (EVP_PKEY_keygen_init(ctx) <= 0) {
BIO_printf(bio_err,
- "Error, unable to initialise for key generation\n");
+ "Error, unable to initialise for key generation\n");
goto end;
}
pkey = app_keygen(ctx, "DSA", numbits, verbose);
@@ -234,12 +242,12 @@ int dsaparam_main(int argc, char **argv)
i = PEM_write_bio_PrivateKey(out, pkey, NULL, NULL, 0, NULL, NULL);
if (i <= 0) {
BIO_printf(bio_err,
- "Error, unable to write DSA private key\n");
+ "Error, unable to write DSA private key\n");
goto end;
}
}
ret = 0;
- end:
+end:
if (ret != 0)
ERR_print_errors(bio_err);
BIO_free_all(out);
diff --git a/apps/ec.c b/apps/ec.c
index 0d0cddfb29..a5abc34ac3 100644
--- a/apps/ec.c
+++ b/apps/ec.c
@@ -23,39 +23,52 @@
typedef enum OPTION_choice {
OPT_COMMON,
- OPT_INFORM, OPT_OUTFORM, OPT_IN, OPT_OUT,
- OPT_NOOUT, OPT_TEXT, OPT_PARAM_OUT, OPT_PUBIN, OPT_PUBOUT,
- OPT_PASSIN, OPT_PASSOUT, OPT_PARAM_ENC, OPT_CONV_FORM, OPT_CIPHER,
- OPT_NO_PUBLIC, OPT_CHECK, OPT_PROV_ENUM
+ OPT_INFORM,
+ OPT_OUTFORM,
+ OPT_IN,
+ OPT_OUT,
+ OPT_NOOUT,
+ OPT_TEXT,
+ OPT_PARAM_OUT,
+ OPT_PUBIN,
+ OPT_PUBOUT,
+ OPT_PASSIN,
+ OPT_PASSOUT,
+ OPT_PARAM_ENC,
+ OPT_CONV_FORM,
+ OPT_CIPHER,
+ OPT_NO_PUBLIC,
+ OPT_CHECK,
+ OPT_PROV_ENUM
} OPTION_CHOICE;
const OPTIONS ec_options[] = {
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
+ { "help", OPT_HELP, '-', "Display this summary" },
OPT_SECTION("Input"),
- {"in", OPT_IN, 's', "Input file"},
- {"inform", OPT_INFORM, 'f', "Input format (DER/PEM/P12)"},
- {"pubin", OPT_PUBIN, '-', "Expect a public key in input file"},
- {"passin", OPT_PASSIN, 's', "Input file pass phrase source"},
- {"check", OPT_CHECK, '-', "check key consistency"},
- {"", OPT_CIPHER, '-', "Any supported cipher"},
- {"param_enc", OPT_PARAM_ENC, 's',
- "Specifies the way the ec parameters are encoded"},
- {"conv_form", OPT_CONV_FORM, 's', "Specifies the point conversion form "},
+ { "in", OPT_IN, 's', "Input file" },
+ { "inform", OPT_INFORM, 'f', "Input format (DER/PEM/P12)" },
+ { "pubin", OPT_PUBIN, '-', "Expect a public key in input file" },
+ { "passin", OPT_PASSIN, 's', "Input file pass phrase source" },
+ { "check", OPT_CHECK, '-', "check key consistency" },
+ { "", OPT_CIPHER, '-', "Any supported cipher" },
+ { "param_enc", OPT_PARAM_ENC, 's',
+ "Specifies the way the ec parameters are encoded" },
+ { "conv_form", OPT_CONV_FORM, 's', "Specifies the point conversion form " },
OPT_SECTION("Output"),
- {"out", OPT_OUT, '>', "Output file"},
- {"outform", OPT_OUTFORM, 'F', "Output format - DER or PEM"},
- {"noout", OPT_NOOUT, '-', "Don't print key out"},
- {"text", OPT_TEXT, '-', "Print the key"},
- {"param_out", OPT_PARAM_OUT, '-', "Print the elliptic curve parameters"},
- {"pubout", OPT_PUBOUT, '-', "Output public key, not private"},
- {"no_public", OPT_NO_PUBLIC, '-', "exclude public key from private key"},
- {"passout", OPT_PASSOUT, 's', "Output file pass phrase source"},
+ { "out", OPT_OUT, '>', "Output file" },
+ { "outform", OPT_OUTFORM, 'F', "Output format - DER or PEM" },
+ { "noout", OPT_NOOUT, '-', "Don't print key out" },
+ { "text", OPT_TEXT, '-', "Print the key" },
+ { "param_out", OPT_PARAM_OUT, '-', "Print the elliptic curve parameters" },
+ { "pubout", OPT_PUBOUT, '-', "Output public key, not private" },
+ { "no_public", OPT_NO_PUBLIC, '-', "exclude public key from private key" },
+ { "passout", OPT_PASSOUT, 's', "Output file pass phrase source" },
OPT_PROV_OPTIONS,
- {NULL}
+ { NULL }
};
int ec_main(int argc, char **argv)
@@ -82,7 +95,7 @@ int ec_main(int argc, char **argv)
switch (o) {
case OPT_EOF:
case OPT_ERR:
- opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
case OPT_HELP:
@@ -179,15 +192,15 @@ int ec_main(int argc, char **argv)
if (point_format
&& !EVP_PKEY_set_utf8_string_param(
- eckey, OSSL_PKEY_PARAM_EC_POINT_CONVERSION_FORMAT,
- point_format)) {
+ eckey, OSSL_PKEY_PARAM_EC_POINT_CONVERSION_FORMAT,
+ point_format)) {
BIO_printf(bio_err, "unable to set point conversion format\n");
goto end;
}
if (asn1_encoding != NULL
&& !EVP_PKEY_set_utf8_string_param(
- eckey, OSSL_PKEY_PARAM_EC_ENCODING, asn1_encoding)) {
+ eckey, OSSL_PKEY_PARAM_EC_ENCODING, asn1_encoding)) {
BIO_printf(bio_err, "unable to set asn1 encoding format\n");
goto end;
}
@@ -243,8 +256,8 @@ int ec_main(int argc, char **argv)
}
ectx = OSSL_ENCODER_CTX_new_for_pkey(eckey, selection,
- output_type, output_structure,
- NULL);
+ output_type, output_structure,
+ NULL);
if (enc != NULL) {
OSSL_ENCODER_CTX_set_cipher(ectx, EVP_CIPHER_get0_name(enc), NULL);
/* Default passphrase prompter */
@@ -252,8 +265,8 @@ int ec_main(int argc, char **argv)
if (passout != NULL)
/* When passout given, override the passphrase prompter */
OSSL_ENCODER_CTX_set_passphrase(ectx,
- (const unsigned char *)passout,
- strlen(passout));
+ (const unsigned char *)passout,
+ strlen(passout));
}
if (!OSSL_ENCODER_to_bio(ectx, out)) {
BIO_printf(bio_err, "unable to write EC key\n");
diff --git a/apps/ecparam.c b/apps/ecparam.c
index f326105ec5..27f8039e3b 100644
--- a/apps/ecparam.c
+++ b/apps/ecparam.c
@@ -23,43 +23,55 @@
typedef enum OPTION_choice {
OPT_COMMON,
- OPT_INFORM, OPT_OUTFORM, OPT_IN, OPT_OUT, OPT_TEXT,
- OPT_CHECK, OPT_LIST_CURVES, OPT_NO_SEED, OPT_NOOUT, OPT_NAME,
- OPT_CONV_FORM, OPT_PARAM_ENC, OPT_GENKEY, OPT_CHECK_NAMED,
- OPT_R_ENUM, OPT_PROV_ENUM
+ OPT_INFORM,
+ OPT_OUTFORM,
+ OPT_IN,
+ OPT_OUT,
+ OPT_TEXT,
+ OPT_CHECK,
+ OPT_LIST_CURVES,
+ OPT_NO_SEED,
+ OPT_NOOUT,
+ OPT_NAME,
+ OPT_CONV_FORM,
+ OPT_PARAM_ENC,
+ OPT_GENKEY,
+ OPT_CHECK_NAMED,
+ OPT_R_ENUM,
+ OPT_PROV_ENUM
} OPTION_CHOICE;
const OPTIONS ecparam_options[] = {
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
- {"list_curves", OPT_LIST_CURVES, '-',
- "Prints a list of all curve 'short names'"},
+ { "help", OPT_HELP, '-', "Display this summary" },
+ { "list_curves", OPT_LIST_CURVES, '-',
+ "Prints a list of all curve 'short names'" },
- {"genkey", OPT_GENKEY, '-', "Generate ec key"},
- {"in", OPT_IN, '<', "Input file - default stdin"},
- {"inform", OPT_INFORM, 'F', "Input format - default PEM (DER or PEM)"},
- {"out", OPT_OUT, '>', "Output file - default stdout"},
- {"outform", OPT_OUTFORM, 'F', "Output format - default PEM"},
+ { "genkey", OPT_GENKEY, '-', "Generate ec key" },
+ { "in", OPT_IN, '<', "Input file - default stdin" },
+ { "inform", OPT_INFORM, 'F', "Input format - default PEM (DER or PEM)" },
+ { "out", OPT_OUT, '>', "Output file - default stdout" },
+ { "outform", OPT_OUTFORM, 'F', "Output format - default PEM" },
OPT_SECTION("Output"),
- {"text", OPT_TEXT, '-', "Print the ec parameters in text form"},
- {"noout", OPT_NOOUT, '-', "Do not print the ec parameter"},
- {"param_enc", OPT_PARAM_ENC, 's',
- "Specifies the way the ec parameters are encoded"},
+ { "text", OPT_TEXT, '-', "Print the ec parameters in text form" },
+ { "noout", OPT_NOOUT, '-', "Do not print the ec parameter" },
+ { "param_enc", OPT_PARAM_ENC, 's',
+ "Specifies the way the ec parameters are encoded" },
OPT_SECTION("Parameter"),
- {"check", OPT_CHECK, '-', "Validate the ec parameters"},
- {"check_named", OPT_CHECK_NAMED, '-',
- "Check that named EC curve parameters have not been modified"},
- {"no_seed", OPT_NO_SEED, '-',
- "If 'explicit' parameters are chosen do not use the seed"},
- {"name", OPT_NAME, 's',
- "Use the ec parameters with specified 'short name'"},
- {"conv_form", OPT_CONV_FORM, 's', "Specifies the point conversion form "},
+ { "check", OPT_CHECK, '-', "Validate the ec parameters" },
+ { "check_named", OPT_CHECK_NAMED, '-',
+ "Check that named EC curve parameters have not been modified" },
+ { "no_seed", OPT_NO_SEED, '-',
+ "If 'explicit' parameters are chosen do not use the seed" },
+ { "name", OPT_NAME, 's',
+ "Use the ec parameters with specified 'short name'" },
+ { "conv_form", OPT_CONV_FORM, 's', "Specifies the point conversion form " },
OPT_R_OPTIONS,
OPT_PROV_OPTIONS,
- {NULL}
+ { NULL }
};
static int list_builtin_curves(BIO *out)
@@ -108,7 +120,7 @@ int ecparam_main(int argc, char **argv)
switch (o) {
case OPT_EOF:
case OPT_ERR:
- opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
case OPT_HELP:
@@ -199,30 +211,30 @@ int ecparam_main(int argc, char **argv)
if (strcmp(curve_name, "secp192r1") == 0) {
BIO_printf(bio_err,
- "using curve name prime192v1 instead of secp192r1\n");
+ "using curve name prime192v1 instead of secp192r1\n");
curve_name = SN_X9_62_prime192v1;
} else if (strcmp(curve_name, "secp256r1") == 0) {
BIO_printf(bio_err,
- "using curve name prime256v1 instead of secp256r1\n");
+ "using curve name prime256v1 instead of secp256r1\n");
curve_name = SN_X9_62_prime256v1;
}
*p++ = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_GROUP_NAME,
- curve_name, 0);
+ curve_name, 0);
if (asn1_encoding != NULL)
*p++ = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_EC_ENCODING,
- asn1_encoding, 0);
+ asn1_encoding, 0);
if (point_format != NULL)
*p++ = OSSL_PARAM_construct_utf8_string(
- OSSL_PKEY_PARAM_EC_POINT_CONVERSION_FORMAT,
- point_format, 0);
+ OSSL_PKEY_PARAM_EC_POINT_CONVERSION_FORMAT,
+ point_format, 0);
*p = OSSL_PARAM_construct_end();
if (OPENSSL_strcasecmp(curve_name, "SM2") == 0)
gctx_params = EVP_PKEY_CTX_new_from_name(app_get0_libctx(), "sm2",
- app_get0_propq());
+ app_get0_propq());
else
gctx_params = EVP_PKEY_CTX_new_from_name(app_get0_libctx(), "ec",
- app_get0_propq());
+ app_get0_propq());
if (gctx_params == NULL
|| EVP_PKEY_keygen_init(gctx_params) <= 0
|| EVP_PKEY_CTX_set_params(gctx_params, params) <= 0
@@ -232,10 +244,10 @@ int ecparam_main(int argc, char **argv)
}
} else {
params_key = load_keyparams_suppress(infile, informat, 1, "EC",
- "EC parameters", 1);
+ "EC parameters", 1);
if (params_key == NULL)
params_key = load_keyparams_suppress(infile, informat, 1, "SM2",
- "SM2 parameters", 1);
+ "SM2 parameters", 1);
if (params_key == NULL) {
BIO_printf(bio_err, "Unable to load parameters from %s\n", infile);
@@ -244,15 +256,15 @@ int ecparam_main(int argc, char **argv)
if (point_format
&& !EVP_PKEY_set_utf8_string_param(
- params_key, OSSL_PKEY_PARAM_EC_POINT_CONVERSION_FORMAT,
- point_format)) {
+ params_key, OSSL_PKEY_PARAM_EC_POINT_CONVERSION_FORMAT,
+ point_format)) {
BIO_printf(bio_err, "unable to set point conversion format\n");
goto end;
}
if (asn1_encoding != NULL
&& !EVP_PKEY_set_utf8_string_param(
- params_key, OSSL_PKEY_PARAM_EC_ENCODING, asn1_encoding)) {
+ params_key, OSSL_PKEY_PARAM_EC_ENCODING, asn1_encoding)) {
BIO_printf(bio_err, "unable to set asn1 encoding format\n");
goto end;
}
@@ -260,7 +272,7 @@ int ecparam_main(int argc, char **argv)
if (no_seed
&& !EVP_PKEY_set_octet_string_param(params_key, OSSL_PKEY_PARAM_EC_SEED,
- NULL, 0)) {
+ NULL, 0)) {
BIO_printf(bio_err, "unable to clear seed\n");
goto end;
}
@@ -280,13 +292,13 @@ int ecparam_main(int argc, char **argv)
if (check_named
&& !EVP_PKEY_set_utf8_string_param(params_key,
- OSSL_PKEY_PARAM_EC_GROUP_CHECK_TYPE,
- OSSL_PKEY_EC_GROUP_CHECK_NAMED)) {
- BIO_printf(bio_err, "unable to set check_type\n");
- goto end;
+ OSSL_PKEY_PARAM_EC_GROUP_CHECK_TYPE,
+ OSSL_PKEY_EC_GROUP_CHECK_NAMED)) {
+ BIO_printf(bio_err, "unable to set check_type\n");
+ goto end;
}
pctx = EVP_PKEY_CTX_new_from_pkey(app_get0_libctx(), params_key,
- app_get0_propq());
+ app_get0_propq());
if (pctx == NULL || EVP_PKEY_param_check(pctx) <= 0) {
BIO_printf(bio_err, "failed\n");
goto end;
@@ -299,8 +311,8 @@ int ecparam_main(int argc, char **argv)
if (!noout) {
ectx_params = OSSL_ENCODER_CTX_new_for_pkey(
- params_key, OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS,
- outformat == FORMAT_ASN1 ? "DER" : "PEM", NULL, NULL);
+ params_key, OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS,
+ outformat == FORMAT_ASN1 ? "DER" : "PEM", NULL, NULL);
if (!OSSL_ENCODER_to_bio(ectx_params, out)) {
BIO_printf(bio_err, "unable to write elliptic curve parameters\n");
goto end;
@@ -317,7 +329,7 @@ int ecparam_main(int argc, char **argv)
* EVP_PKEY_keygen(gctx, &key) <= 0)
*/
gctx_key = EVP_PKEY_CTX_new_from_pkey(app_get0_libctx(), params_key,
- app_get0_propq());
+ app_get0_propq());
if (EVP_PKEY_keygen_init(gctx_key) <= 0
|| EVP_PKEY_keygen(gctx_key, &key) <= 0) {
BIO_printf(bio_err, "unable to generate key\n");
@@ -325,11 +337,11 @@ int ecparam_main(int argc, char **argv)
}
assert(private);
ectx_key = OSSL_ENCODER_CTX_new_for_pkey(
- key, OSSL_KEYMGMT_SELECT_ALL,
- outformat == FORMAT_ASN1 ? "DER" : "PEM", NULL, NULL);
+ key, OSSL_KEYMGMT_SELECT_ALL,
+ outformat == FORMAT_ASN1 ? "DER" : "PEM", NULL, NULL);
if (!OSSL_ENCODER_to_bio(ectx_key, out)) {
BIO_printf(bio_err, "unable to write elliptic "
- "curve parameters\n");
+ "curve parameters\n");
goto end;
}
}
diff --git a/apps/enc.c b/apps/enc.c
index 15cc52847c..69ac4bc60c 100644
--- a/apps/enc.c
+++ b/apps/enc.c
@@ -21,16 +21,16 @@
#include <openssl/rand.h>
#include <openssl/pem.h>
#ifndef OPENSSL_NO_COMP
-# include <openssl/comp.h>
+#include <openssl/comp.h>
#endif
#include <ctype.h>
#undef SIZE
#undef BSIZE
-#define SIZE (512)
-#define BSIZE (8*1024)
+#define SIZE (512)
+#define BSIZE (8 * 1024)
-#define PBKDF2_ITER_DEFAULT 10000
+#define PBKDF2_ITER_DEFAULT 10000
#define STR(a) XSTR(a)
#define XSTR(a) #a
@@ -45,79 +45,103 @@ struct doall_enc_ciphers {
typedef enum OPTION_choice {
OPT_COMMON,
OPT_LIST,
- OPT_E, OPT_IN, OPT_OUT, OPT_PASS, OPT_D, OPT_P, OPT_V,
- OPT_NOPAD, OPT_SALT, OPT_NOSALT, OPT_DEBUG, OPT_UPPER_P, OPT_UPPER_A,
- OPT_A, OPT_Z, OPT_BUFSIZE, OPT_K, OPT_KFILE, OPT_UPPER_K, OPT_NONE,
- OPT_UPPER_S, OPT_IV, OPT_MD, OPT_ITER, OPT_PBKDF2, OPT_CIPHER,
- OPT_SALTLEN, OPT_R_ENUM, OPT_PROV_ENUM,
- OPT_SKEYOPT, OPT_SKEYMGMT
+ OPT_E,
+ OPT_IN,
+ OPT_OUT,
+ OPT_PASS,
+ OPT_D,
+ OPT_P,
+ OPT_V,
+ OPT_NOPAD,
+ OPT_SALT,
+ OPT_NOSALT,
+ OPT_DEBUG,
+ OPT_UPPER_P,
+ OPT_UPPER_A,
+ OPT_A,
+ OPT_Z,
+ OPT_BUFSIZE,
+ OPT_K,
+ OPT_KFILE,
+ OPT_UPPER_K,
+ OPT_NONE,
+ OPT_UPPER_S,
+ OPT_IV,
+ OPT_MD,
+ OPT_ITER,
+ OPT_PBKDF2,
+ OPT_CIPHER,
+ OPT_SALTLEN,
+ OPT_R_ENUM,
+ OPT_PROV_ENUM,
+ OPT_SKEYOPT,
+ OPT_SKEYMGMT
} OPTION_CHOICE;
const OPTIONS enc_options[] = {
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
- {"list", OPT_LIST, '-', "List ciphers"},
+ { "help", OPT_HELP, '-', "Display this summary" },
+ { "list", OPT_LIST, '-', "List ciphers" },
#ifndef OPENSSL_NO_DEPRECATED_3_0
- {"ciphers", OPT_LIST, '-', "Alias for -list"},
+ { "ciphers", OPT_LIST, '-', "Alias for -list" },
#endif
- {"e", OPT_E, '-', "Encrypt"},
- {"d", OPT_D, '-', "Decrypt"},
- {"p", OPT_P, '-', "Print the iv/key"},
- {"P", OPT_UPPER_P, '-', "Print the iv/key and exit"},
+ { "e", OPT_E, '-', "Encrypt" },
+ { "d", OPT_D, '-', "Decrypt" },
+ { "p", OPT_P, '-', "Print the iv/key" },
+ { "P", OPT_UPPER_P, '-', "Print the iv/key and exit" },
OPT_SECTION("Input"),
- {"in", OPT_IN, '<', "Input file"},
+ { "in", OPT_IN, '<', "Input file" },
OPT_SECTION("Output"),
- {"out", OPT_OUT, '>', "Output file"},
- {"v", OPT_V, '-', "Verbose output"},
- {"a", OPT_A, '-', "Base64 encode/decode, depending on encryption flag"},
- {"base64", OPT_A, '-', "Same as option -a"},
- {"A", OPT_UPPER_A, '-',
- "Used with -[base64|a] to specify base64 buffer as a single line"},
+ { "out", OPT_OUT, '>', "Output file" },
+ { "v", OPT_V, '-', "Verbose output" },
+ { "a", OPT_A, '-', "Base64 encode/decode, depending on encryption flag" },
+ { "base64", OPT_A, '-', "Same as option -a" },
+ { "A", OPT_UPPER_A, '-',
+ "Used with -[base64|a] to specify base64 buffer as a single line" },
OPT_SECTION("Encryption"),
- {"nopad", OPT_NOPAD, '-', "Disable standard block padding"},
- {"salt", OPT_SALT, '-', "Use salt in the KDF (default)"},
- {"nosalt", OPT_NOSALT, '-', "Do not use salt in the KDF"},
- {"debug", OPT_DEBUG, '-', "Print debug info"},
-
- {"bufsize", OPT_BUFSIZE, 's', "Buffer size"},
- {"K", OPT_UPPER_K, 's', "Raw key, in hex"},
- {"S", OPT_UPPER_S, 's', "Salt, in hex"},
- {"iv", OPT_IV, 's', "IV in hex"},
- {"md", OPT_MD, 's', "Use specified digest to create a key from the passphrase"},
- {"k", OPT_K, 's', "Passphrase (Deprecated"},
- {"kfile", OPT_KFILE, '<', "Read passphrase from file (Deprecated)"},
- {"pass", OPT_PASS, 's', "Passphrase source"},
- {"iter", OPT_ITER, 'p',
- "Specify the iteration count and force the use of PBKDF2"},
- {OPT_MORE_STR, 0, 0, "Default: " STR(PBKDF2_ITER_DEFAULT)},
- {"pbkdf2", OPT_PBKDF2, '-',
- "Use password-based key derivation function 2 (PBKDF2)"},
- {OPT_MORE_STR, 0, 0,
- "Use -iter to change the iteration count from " STR(PBKDF2_ITER_DEFAULT)},
- {"none", OPT_NONE, '-', "Don't encrypt"},
- {"saltlen", OPT_SALTLEN, 'p', "Specify the PBKDF2 salt length (in bytes)"},
- {OPT_MORE_STR, 0, 0, "Default: 16"},
+ { "nopad", OPT_NOPAD, '-', "Disable standard block padding" },
+ { "salt", OPT_SALT, '-', "Use salt in the KDF (default)" },
+ { "nosalt", OPT_NOSALT, '-', "Do not use salt in the KDF" },
+ { "debug", OPT_DEBUG, '-', "Print debug info" },
+
+ { "bufsize", OPT_BUFSIZE, 's', "Buffer size" },
+ { "K", OPT_UPPER_K, 's', "Raw key, in hex" },
+ { "S", OPT_UPPER_S, 's', "Salt, in hex" },
+ { "iv", OPT_IV, 's', "IV in hex" },
+ { "md", OPT_MD, 's', "Use specified digest to create a key from the passphrase" },
+ { "k", OPT_K, 's', "Passphrase (Deprecated" },
+ { "kfile", OPT_KFILE, '<', "Read passphrase from file (Deprecated)" },
+ { "pass", OPT_PASS, 's', "Passphrase source" },
+ { "iter", OPT_ITER, 'p',
+ "Specify the iteration count and force the use of PBKDF2" },
+ { OPT_MORE_STR, 0, 0, "Default: " STR(PBKDF2_ITER_DEFAULT) },
+ { "pbkdf2", OPT_PBKDF2, '-',
+ "Use password-based key derivation function 2 (PBKDF2)" },
+ { OPT_MORE_STR, 0, 0,
+ "Use -iter to change the iteration count from " STR(PBKDF2_ITER_DEFAULT) },
+ { "none", OPT_NONE, '-', "Don't encrypt" },
+ { "saltlen", OPT_SALTLEN, 'p', "Specify the PBKDF2 salt length (in bytes)" },
+ { OPT_MORE_STR, 0, 0, "Default: 16" },
#ifndef OPENSSL_NO_ZLIB
- {"z", OPT_Z, '-', "Compress or decompress encrypted data using zlib"},
+ { "z", OPT_Z, '-', "Compress or decompress encrypted data using zlib" },
#endif
- {"skeyopt", OPT_SKEYOPT, 's', "Key options as opt:value for opaque symmetric key handling"},
- {"skeymgmt", OPT_SKEYMGMT, 's', "Symmetric key management name for opaque symmetric key handling"},
- {"", OPT_CIPHER, '-', "Any supported cipher"},
+ { "skeyopt", OPT_SKEYOPT, 's', "Key options as opt:value for opaque symmetric key handling" },
+ { "skeymgmt", OPT_SKEYMGMT, 's', "Symmetric key management name for opaque symmetric key handling" },
+ { "", OPT_CIPHER, '-', "Any supported cipher" },
OPT_R_OPTIONS,
OPT_PROV_OPTIONS,
- {NULL}
+ { NULL }
};
int enc_main(int argc, char **argv)
{
static char buf[128];
static const char magic[] = "Salted__";
- BIO *in = NULL, *out = NULL, *b64 = NULL, *benc = NULL, *rbio =
- NULL, *wbio = NULL;
+ BIO *in = NULL, *out = NULL, *b64 = NULL, *benc = NULL, *rbio = NULL, *wbio = NULL;
EVP_CIPHER_CTX *ctx = NULL;
EVP_CIPHER *cipher = NULL;
EVP_MD *dgst = NULL;
@@ -179,7 +203,7 @@ int enc_main(int argc, char **argv)
switch (o) {
case OPT_EOF:
case OPT_ERR:
- opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
case OPT_HELP:
@@ -191,7 +215,7 @@ int enc_main(int argc, char **argv)
dec.bio = bio_out;
dec.n = 0;
OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH,
- show_ciphers, &dec);
+ show_ciphers, &dec);
BIO_printf(bio_out, "\n");
ret = 0;
goto end;
@@ -249,7 +273,7 @@ int enc_main(int argc, char **argv)
if (k)
p[i] = '\0';
if (!opt_long(opt_arg(), &n)
- || n < 0 || (k && n >= LONG_MAX / 1024))
+ || n < 0 || (k && n >= LONG_MAX / 1024))
goto opthelp;
if (k)
n *= 1024;
@@ -269,7 +293,7 @@ int enc_main(int argc, char **argv)
in = NULL;
if (i <= 0) {
BIO_printf(bio_err,
- "%s Can't read key from %s\n", prog, opt_arg());
+ "%s Can't read key from %s\n", prog, opt_arg());
goto opthelp;
}
while (--i > 0 && (buf[i] == '\r' || buf[i] == '\n'))
@@ -307,16 +331,14 @@ int enc_main(int argc, char **argv)
break;
case OPT_PBKDF2:
pbkdf2 = 1;
- if (iter == 0) /* do not overwrite a chosen value */
+ if (iter == 0) /* do not overwrite a chosen value */
iter = PBKDF2_ITER_DEFAULT;
break;
case OPT_NONE:
cipher = NULL;
break;
case OPT_SKEYOPT:
- if ((skeyopts == NULL &&
- (skeyopts = sk_OPENSSL_STRING_new_null()) == NULL) ||
- sk_OPENSSL_STRING_push(skeyopts, opt_arg()) == 0) {
+ if ((skeyopts == NULL && (skeyopts = sk_OPENSSL_STRING_new_null()) == NULL) || sk_OPENSSL_STRING_push(skeyopts, opt_arg()) == 0) {
BIO_printf(bio_err, "%s: out of memory\n", prog);
goto end;
}
@@ -386,7 +408,7 @@ int enc_main(int argc, char **argv)
buff = app_malloc(EVP_ENCODE_LENGTH(bsize), "evp buffer");
if (infile == NULL) {
- if (!streamable && printkey != 2) { /* if just print key and exit, it's ok */
+ if (!streamable && printkey != 2) { /* if just print key and exit, it's ok */
BIO_printf(bio_err, "Unstreamable cipher mode\n");
goto end;
}
@@ -412,8 +434,8 @@ int enc_main(int argc, char **argv)
char prompt[200];
BIO_snprintf(prompt, sizeof(prompt), "enter %s %s password:",
- EVP_CIPHER_get0_name(cipher),
- (enc) ? "encryption" : "decryption");
+ EVP_CIPHER_get0_name(cipher),
+ (enc) ? "encryption" : "decryption");
strbuf[0] = '\0';
i = EVP_read_pw_string((char *)strbuf, SIZE, prompt, enc);
if (i == 0) {
@@ -451,7 +473,7 @@ int enc_main(int argc, char **argv)
wbio = out;
#ifndef OPENSSL_NO_COMP
-# ifndef OPENSSL_NO_ZLIB
+#ifndef OPENSSL_NO_ZLIB
if (do_zlib) {
if ((bzl = BIO_new(BIO_f_zlib())) == NULL)
goto end;
@@ -464,7 +486,7 @@ int enc_main(int argc, char **argv)
else
rbio = BIO_push(bzl, rbio);
}
-# endif
+#endif
if (do_brotli) {
if ((bbrot = BIO_new(BIO_f_brotli())) == NULL)
@@ -525,7 +547,7 @@ int enc_main(int argc, char **argv)
BIO_printf(bio_err, "invalid hex salt value\n");
goto end;
}
- if (enc) { /* encryption */
+ if (enc) { /* encryption */
if (hsalt == NULL) {
if (RAND_bytes(salt, saltlen) <= 0) {
BIO_printf(bio_err, "RAND_bytes failed\n");
@@ -537,15 +559,17 @@ int enc_main(int argc, char **argv)
*/
if ((printkey != 2)
&& (BIO_write(wbio, magic,
- sizeof(magic) - 1) != sizeof(magic) - 1
+ sizeof(magic) - 1)
+ != sizeof(magic) - 1
|| BIO_write(wbio,
- (char *)salt,
- saltlen) != saltlen)) {
+ (char *)salt,
+ saltlen)
+ != saltlen)) {
BIO_printf(bio_err, "error writing output file\n");
goto end;
}
}
- } else { /* decryption */
+ } else { /* decryption */
if (hsalt == NULL) {
if (BIO_read(rbio, mbuf, sizeof(mbuf)) != sizeof(mbuf)) {
BIO_printf(bio_err, "error reading input file\n");
@@ -553,7 +577,8 @@ int enc_main(int argc, char **argv)
}
if (memcmp(mbuf, magic, sizeof(mbuf)) == 0) { /* file IS salted */
if (BIO_read(rbio, salt,
- saltlen) != saltlen) {
+ saltlen)
+ != saltlen) {
BIO_printf(bio_err, "error reading input file\n");
goto end;
}
@@ -568,9 +593,9 @@ int enc_main(int argc, char **argv)
if (pbkdf2 == 1) {
/*
- * derive key and default iv
- * concatenated into a temporary buffer
- */
+ * derive key and default iv
+ * concatenated into a temporary buffer
+ */
unsigned char tmpkeyiv[EVP_MAX_KEY_LENGTH + EVP_MAX_IV_LENGTH];
int iklen = EVP_CIPHER_get_key_length(cipher);
int ivlen = EVP_CIPHER_get_iv_length(cipher);
@@ -578,21 +603,21 @@ int enc_main(int argc, char **argv)
int islen = (sptr != NULL ? saltlen : 0);
if (!PKCS5_PBKDF2_HMAC(str, (int)str_len, sptr, islen,
- iter, dgst, iklen+ivlen, tmpkeyiv)) {
+ iter, dgst, iklen + ivlen, tmpkeyiv)) {
BIO_printf(bio_err, "PKCS5_PBKDF2_HMAC failed\n");
goto end;
}
/* split and move data back to global buffer */
memcpy(key, tmpkeyiv, iklen);
- memcpy(iv, tmpkeyiv+iklen, ivlen);
+ memcpy(iv, tmpkeyiv + iklen, ivlen);
rawkey_set = 1;
} else {
BIO_printf(bio_err, "*** WARNING : "
"deprecated key derivation used.\n"
"Using -iter or -pbkdf2 would be better.\n");
if (!EVP_BytesToKey(cipher, dgst, sptr,
- (unsigned char *)str, (int)str_len,
- 1, key, iv)) {
+ (unsigned char *)str, (int)str_len,
+ 1, key, iv)) {
BIO_printf(bio_err, "EVP_BytesToKey failed\n");
goto end;
}
@@ -661,9 +686,9 @@ int enc_main(int argc, char **argv)
if (rawkey_set) {
if (!EVP_CipherInit_ex(ctx, cipher, NULL, key,
- (hiv == NULL && wrap == 1 ? NULL : iv), enc)) {
+ (hiv == NULL && wrap == 1 ? NULL : iv), enc)) {
BIO_printf(bio_err, "Error setting cipher %s\n",
- EVP_CIPHER_get0_name(cipher));
+ EVP_CIPHER_get0_name(cipher));
ERR_print_errors(bio_err);
goto end;
}
@@ -671,31 +696,31 @@ int enc_main(int argc, char **argv)
OSSL_PARAM *params = NULL;
mgmt = EVP_SKEYMGMT_fetch(app_get0_libctx(),
- skeymgmt != NULL ? skeymgmt : EVP_CIPHER_name(cipher),
- app_get0_propq());
+ skeymgmt != NULL ? skeymgmt : EVP_CIPHER_name(cipher),
+ app_get0_propq());
if (mgmt == NULL)
goto end;
params = app_params_new_from_opts(skeyopts,
- EVP_SKEYMGMT_get0_imp_settable_params(mgmt));
+ EVP_SKEYMGMT_get0_imp_settable_params(mgmt));
if (params == NULL)
goto end;
skey = EVP_SKEY_import(app_get0_libctx(), EVP_SKEYMGMT_get0_name(mgmt),
- app_get0_propq(), OSSL_SKEYMGMT_SELECT_ALL, params);
+ app_get0_propq(), OSSL_SKEYMGMT_SELECT_ALL, params);
OSSL_PARAM_free(params);
if (skey == NULL) {
BIO_printf(bio_err, "Error creating opaque key object for skeymgmt %s\n",
- skeymgmt ? skeymgmt : EVP_CIPHER_name(cipher));
+ skeymgmt ? skeymgmt : EVP_CIPHER_name(cipher));
ERR_print_errors(bio_err);
goto end;
}
if (!EVP_CipherInit_SKEY(ctx, cipher, skey,
- (hiv == NULL && wrap == 1 ? NULL : iv),
- EVP_CIPHER_get_iv_length(cipher), enc, NULL)) {
+ (hiv == NULL && wrap == 1 ? NULL : iv),
+ EVP_CIPHER_get_iv_length(cipher), enc, NULL)) {
BIO_printf(bio_err, "Error setting an opaque key for cipher %s\n",
- EVP_CIPHER_get0_name(cipher));
+ EVP_CIPHER_get0_name(cipher));
ERR_print_errors(bio_err);
goto end;
}
@@ -743,7 +768,7 @@ int enc_main(int argc, char **argv)
inl = BIO_read(rbio, (char *)buff, bsize);
if (inl <= 0)
break;
- if (!streamable && !BIO_eof(rbio)) { /* do not output data */
+ if (!streamable && !BIO_eof(rbio)) { /* do not output data */
BIO_printf(bio_err, "Unstreamable cipher mode\n");
goto end;
}
@@ -767,7 +792,7 @@ int enc_main(int argc, char **argv)
BIO_printf(bio_err, "bytes read : %8ju\n", BIO_number_read(in));
BIO_printf(bio_err, "bytes written: %8ju\n", BIO_number_written(out));
}
- end:
+end:
ERR_print_errors(bio_err);
sk_OPENSSL_STRING_free(skeyopts);
EVP_SKEYMGMT_free(mgmt);
@@ -800,9 +825,9 @@ static void show_ciphers(const OBJ_NAME *name, void *arg)
/* Filter out ciphers that we cannot use */
cipher = EVP_get_cipherbyname(name->name);
if (cipher == NULL
- || (EVP_CIPHER_get_flags(cipher) & EVP_CIPH_FLAG_AEAD_CIPHER) != 0
- || (EVP_CIPHER_get_flags(cipher) & EVP_CIPH_FLAG_ENC_THEN_MAC) != 0
- || EVP_CIPHER_get_mode(cipher) == EVP_CIPH_XTS_MODE)
+ || (EVP_CIPHER_get_flags(cipher) & EVP_CIPH_FLAG_AEAD_CIPHER) != 0
+ || (EVP_CIPHER_get_flags(cipher) & EVP_CIPH_FLAG_ENC_THEN_MAC) != 0
+ || EVP_CIPHER_get_mode(cipher) == EVP_CIPH_XTS_MODE)
return;
BIO_printf(dec->bio, "-%-25s", name->name);
diff --git a/apps/errstr.c b/apps/errstr.c
index 21349d21cb..d4146da49b 100644
--- a/apps/errstr.c
+++ b/apps/errstr.c
@@ -17,18 +17,20 @@
#include <openssl/ssl.h>
typedef enum OPTION_choice {
- OPT_ERR = -1, OPT_EOF = 0, OPT_HELP
+ OPT_ERR = -1,
+ OPT_EOF = 0,
+ OPT_HELP
} OPTION_CHOICE;
const OPTIONS errstr_options[] = {
- {OPT_HELP_STR, 1, '-', "Usage: %s [options] errnum...\n"},
+ { OPT_HELP_STR, 1, '-', "Usage: %s [options] errnum...\n" },
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
+ { "help", OPT_HELP, '-', "Display this summary" },
OPT_PARAMETERS(),
- {"errnum", 0, 0, "Error number(s) to decode"},
- {NULL}
+ { "errnum", 0, 0, "Error number(s) to decode" },
+ { NULL }
};
int errstr_main(int argc, char **argv)
@@ -57,7 +59,8 @@ int errstr_main(int argc, char **argv)
* we're still interested in SSL error strings
*/
OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS
- | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
+ | OPENSSL_INIT_LOAD_CRYPTO_STRINGS,
+ NULL);
/* All remaining arg are error code. */
ret = 0;
@@ -69,6 +72,6 @@ int errstr_main(int argc, char **argv)
BIO_printf(bio_out, "%s\n", buf);
}
}
- end:
+end:
return ret;
}
diff --git a/apps/fipsinstall.c b/apps/fipsinstall.c
index 7d168106d4..ea54a00cff 100644
--- a/apps/fipsinstall.c
+++ b/apps/fipsinstall.c
@@ -21,8 +21,8 @@
#define BUFSIZE 4096
/* Configuration file values */
-#define VERSION_KEY "version"
-#define VERSION_VAL "1"
+#define VERSION_KEY "version"
+#define VERSION_VAL "1"
#define INSTALL_STATUS_VAL "INSTALL_SELF_TEST_KATS_RUN"
static OSSL_CALLBACK self_test_events;
@@ -33,15 +33,29 @@ static int quiet = 0;
typedef enum OPTION_choice {
OPT_COMMON,
- OPT_IN, OPT_OUT, OPT_MODULE, OPT_PEDANTIC,
- OPT_PROV_NAME, OPT_SECTION_NAME, OPT_MAC_NAME, OPT_MACOPT, OPT_VERIFY,
- OPT_NO_LOG, OPT_CORRUPT_DESC, OPT_CORRUPT_TYPE, OPT_QUIET, OPT_CONFIG,
+ OPT_IN,
+ OPT_OUT,
+ OPT_MODULE,
+ OPT_PEDANTIC,
+ OPT_PROV_NAME,
+ OPT_SECTION_NAME,
+ OPT_MAC_NAME,
+ OPT_MACOPT,
+ OPT_VERIFY,
+ OPT_NO_LOG,
+ OPT_CORRUPT_DESC,
+ OPT_CORRUPT_TYPE,
+ OPT_QUIET,
+ OPT_CONFIG,
OPT_NO_CONDITIONAL_ERRORS,
OPT_NO_SECURITY_CHECKS,
- OPT_TLS_PRF_EMS_CHECK, OPT_NO_SHORT_MAC,
- OPT_DISALLOW_PKCS15_PADDING, OPT_RSA_PSS_SALTLEN_CHECK,
+ OPT_TLS_PRF_EMS_CHECK,
+ OPT_NO_SHORT_MAC,
+ OPT_DISALLOW_PKCS15_PADDING,
+ OPT_RSA_PSS_SALTLEN_CHECK,
OPT_DISALLOW_SIGNATURE_X931_PADDING,
- OPT_HMAC_KEY_CHECK, OPT_KMAC_KEY_CHECK,
+ OPT_HMAC_KEY_CHECK,
+ OPT_KMAC_KEY_CHECK,
OPT_DISALLOW_DRGB_TRUNC_DIGEST,
OPT_SIGNATURE_DIGEST_CHECK,
OPT_HKDF_DIGEST_CHECK,
@@ -62,93 +76,94 @@ typedef enum OPTION_choice {
OPT_X942KDF_KEY_CHECK,
OPT_NO_PBKDF2_LOWER_BOUND_CHECK,
OPT_ECDH_COFACTOR_CHECK,
- OPT_SELF_TEST_ONLOAD, OPT_SELF_TEST_ONINSTALL
+ OPT_SELF_TEST_ONLOAD,
+ OPT_SELF_TEST_ONINSTALL
} OPTION_CHOICE;
const OPTIONS fipsinstall_options[] = {
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
- {"pedantic", OPT_PEDANTIC, '-', "Set options for strict FIPS compliance"},
- {"verify", OPT_VERIFY, '-',
- "Verify a config file instead of generating one"},
- {"module", OPT_MODULE, '<', "File name of the provider module"},
- {"provider_name", OPT_PROV_NAME, 's', "FIPS provider name"},
- {"section_name", OPT_SECTION_NAME, 's',
- "FIPS Provider config section name (optional)"},
- {"no_conditional_errors", OPT_NO_CONDITIONAL_ERRORS, '-',
- "Disable the ability of the fips module to enter an error state if"
- " any conditional self tests fail"},
- {"no_security_checks", OPT_NO_SECURITY_CHECKS, '-',
- "Disable the run-time FIPS security checks in the module"},
- {"self_test_onload", OPT_SELF_TEST_ONLOAD, '-',
- "Forces self tests to always run on module load"},
- {"self_test_oninstall", OPT_SELF_TEST_ONINSTALL, '-',
- "Forces self tests to run once on module installation"},
- {"ems_check", OPT_TLS_PRF_EMS_CHECK, '-',
- "Enable the run-time FIPS check for EMS during TLS1_PRF"},
- {"no_short_mac", OPT_NO_SHORT_MAC, '-', "Disallow short MAC output"},
- {"no_drbg_truncated_digests", OPT_DISALLOW_DRGB_TRUNC_DIGEST, '-',
- "Disallow truncated digests with Hash and HMAC DRBGs"},
- {"signature_digest_check", OPT_SIGNATURE_DIGEST_CHECK, '-',
- "Enable checking for approved digests for signatures"},
- {"hmac_key_check", OPT_HMAC_KEY_CHECK, '-', "Enable key check for HMAC"},
- {"kmac_key_check", OPT_KMAC_KEY_CHECK, '-', "Enable key check for KMAC"},
- {"hkdf_digest_check", OPT_HKDF_DIGEST_CHECK, '-',
- "Enable digest check for HKDF"},
- {"tls13_kdf_digest_check", OPT_TLS13_KDF_DIGEST_CHECK, '-',
- "Enable digest check for TLS13-KDF"},
- {"tls1_prf_digest_check", OPT_TLS1_PRF_DIGEST_CHECK, '-',
- "Enable digest check for TLS1-PRF"},
- {"sshkdf_digest_check", OPT_SSHKDF_DIGEST_CHECK, '-',
- "Enable digest check for SSHKDF"},
- {"sskdf_digest_check", OPT_SSKDF_DIGEST_CHECK, '-',
- "Enable digest check for SSKDF"},
- {"x963kdf_digest_check", OPT_X963KDF_DIGEST_CHECK, '-',
- "Enable digest check for X963KDF"},
- {"dsa_sign_disabled", OPT_DISALLOW_DSA_SIGN, '-',
- "Disallow DSA signing"},
- {"tdes_encrypt_disabled", OPT_DISALLOW_TDES_ENCRYPT, '-',
- "Disallow Triple-DES encryption"},
- {"rsa_pkcs15_padding_disabled", OPT_DISALLOW_PKCS15_PADDING, '-',
- "Disallow PKCS#1 version 1.5 padding for RSA encryption"},
- {"rsa_pss_saltlen_check", OPT_RSA_PSS_SALTLEN_CHECK, '-',
- "Enable salt length check for RSA-PSS signature operations"},
- {"rsa_sign_x931_disabled", OPT_DISALLOW_SIGNATURE_X931_PADDING, '-',
- "Disallow X931 Padding for RSA signing"},
- {"hkdf_key_check", OPT_HKDF_KEY_CHECK, '-',
- "Enable key check for HKDF"},
- {"kbkdf_key_check", OPT_KBKDF_KEY_CHECK, '-',
- "Enable key check for KBKDF"},
- {"tls13_kdf_key_check", OPT_TLS13_KDF_KEY_CHECK, '-',
- "Enable key check for TLS13-KDF"},
- {"tls1_prf_key_check", OPT_TLS1_PRF_KEY_CHECK, '-',
- "Enable key check for TLS1-PRF"},
- {"sshkdf_key_check", OPT_SSHKDF_KEY_CHECK, '-',
- "Enable key check for SSHKDF"},
- {"sskdf_key_check", OPT_SSKDF_KEY_CHECK, '-',
- "Enable key check for SSKDF"},
- {"x963kdf_key_check", OPT_X963KDF_KEY_CHECK, '-',
- "Enable key check for X963KDF"},
- {"x942kdf_key_check", OPT_X942KDF_KEY_CHECK, '-',
- "Enable key check for X942KDF"},
- {"no_pbkdf2_lower_bound_check", OPT_NO_PBKDF2_LOWER_BOUND_CHECK, '-',
- "Disable lower bound check for PBKDF2"},
- {"ecdh_cofactor_check", OPT_ECDH_COFACTOR_CHECK, '-',
- "Enable Cofactor check for ECDH"},
+ { "help", OPT_HELP, '-', "Display this summary" },
+ { "pedantic", OPT_PEDANTIC, '-', "Set options for strict FIPS compliance" },
+ { "verify", OPT_VERIFY, '-',
+ "Verify a config file instead of generating one" },
+ { "module", OPT_MODULE, '<', "File name of the provider module" },
+ { "provider_name", OPT_PROV_NAME, 's', "FIPS provider name" },
+ { "section_name", OPT_SECTION_NAME, 's',
+ "FIPS Provider config section name (optional)" },
+ { "no_conditional_errors", OPT_NO_CONDITIONAL_ERRORS, '-',
+ "Disable the ability of the fips module to enter an error state if"
+ " any conditional self tests fail" },
+ { "no_security_checks", OPT_NO_SECURITY_CHECKS, '-',
+ "Disable the run-time FIPS security checks in the module" },
+ { "self_test_onload", OPT_SELF_TEST_ONLOAD, '-',
+ "Forces self tests to always run on module load" },
+ { "self_test_oninstall", OPT_SELF_TEST_ONINSTALL, '-',
+ "Forces self tests to run once on module installation" },
+ { "ems_check", OPT_TLS_PRF_EMS_CHECK, '-',
+ "Enable the run-time FIPS check for EMS during TLS1_PRF" },
+ { "no_short_mac", OPT_NO_SHORT_MAC, '-', "Disallow short MAC output" },
+ { "no_drbg_truncated_digests", OPT_DISALLOW_DRGB_TRUNC_DIGEST, '-',
+ "Disallow truncated digests with Hash and HMAC DRBGs" },
+ { "signature_digest_check", OPT_SIGNATURE_DIGEST_CHECK, '-',
+ "Enable checking for approved digests for signatures" },
+ { "hmac_key_check", OPT_HMAC_KEY_CHECK, '-', "Enable key check for HMAC" },
+ { "kmac_key_check", OPT_KMAC_KEY_CHECK, '-', "Enable key check for KMAC" },
+ { "hkdf_digest_check", OPT_HKDF_DIGEST_CHECK, '-',
+ "Enable digest check for HKDF" },
+ { "tls13_kdf_digest_check", OPT_TLS13_KDF_DIGEST_CHECK, '-',
+ "Enable digest check for TLS13-KDF" },
+ { "tls1_prf_digest_check", OPT_TLS1_PRF_DIGEST_CHECK, '-',
+ "Enable digest check for TLS1-PRF" },
+ { "sshkdf_digest_check", OPT_SSHKDF_DIGEST_CHECK, '-',
+ "Enable digest check for SSHKDF" },
+ { "sskdf_digest_check", OPT_SSKDF_DIGEST_CHECK, '-',
+ "Enable digest check for SSKDF" },
+ { "x963kdf_digest_check", OPT_X963KDF_DIGEST_CHECK, '-',
+ "Enable digest check for X963KDF" },
+ { "dsa_sign_disabled", OPT_DISALLOW_DSA_SIGN, '-',
+ "Disallow DSA signing" },
+ { "tdes_encrypt_disabled", OPT_DISALLOW_TDES_ENCRYPT, '-',
+ "Disallow Triple-DES encryption" },
+ { "rsa_pkcs15_padding_disabled", OPT_DISALLOW_PKCS15_PADDING, '-',
+ "Disallow PKCS#1 version 1.5 padding for RSA encryption" },
+ { "rsa_pss_saltlen_check", OPT_RSA_PSS_SALTLEN_CHECK, '-',
+ "Enable salt length check for RSA-PSS signature operations" },
+ { "rsa_sign_x931_disabled", OPT_DISALLOW_SIGNATURE_X931_PADDING, '-',
+ "Disallow X931 Padding for RSA signing" },
+ { "hkdf_key_check", OPT_HKDF_KEY_CHECK, '-',
+ "Enable key check for HKDF" },
+ { "kbkdf_key_check", OPT_KBKDF_KEY_CHECK, '-',
+ "Enable key check for KBKDF" },
+ { "tls13_kdf_key_check", OPT_TLS13_KDF_KEY_CHECK, '-',
+ "Enable key check for TLS13-KDF" },
+ { "tls1_prf_key_check", OPT_TLS1_PRF_KEY_CHECK, '-',
+ "Enable key check for TLS1-PRF" },
+ { "sshkdf_key_check", OPT_SSHKDF_KEY_CHECK, '-',
+ "Enable key check for SSHKDF" },
+ { "sskdf_key_check", OPT_SSKDF_KEY_CHECK, '-',
+ "Enable key check for SSKDF" },
+ { "x963kdf_key_check", OPT_X963KDF_KEY_CHECK, '-',
+ "Enable key check for X963KDF" },
+ { "x942kdf_key_check", OPT_X942KDF_KEY_CHECK, '-',
+ "Enable key check for X942KDF" },
+ { "no_pbkdf2_lower_bound_check", OPT_NO_PBKDF2_LOWER_BOUND_CHECK, '-',
+ "Disable lower bound check for PBKDF2" },
+ { "ecdh_cofactor_check", OPT_ECDH_COFACTOR_CHECK, '-',
+ "Enable Cofactor check for ECDH" },
OPT_SECTION("Input"),
- {"in", OPT_IN, '<', "Input config file, used when verifying"},
+ { "in", OPT_IN, '<', "Input config file, used when verifying" },
OPT_SECTION("Output"),
- {"out", OPT_OUT, '>', "Output config file, used when generating"},
- {"mac_name", OPT_MAC_NAME, 's', "MAC name"},
- {"macopt", OPT_MACOPT, 's', "MAC algorithm parameters in n:v form."},
- {OPT_MORE_STR, 0, 0, "See 'PARAMETER NAMES' in the EVP_MAC_ docs"},
- {"noout", OPT_NO_LOG, '-', "Disable logging of self test events"},
- {"corrupt_desc", OPT_CORRUPT_DESC, 's', "Corrupt a self test by description"},
- {"corrupt_type", OPT_CORRUPT_TYPE, 's', "Corrupt a self test by type"},
- {"config", OPT_CONFIG, '<', "The parent config to verify"},
- {"quiet", OPT_QUIET, '-', "No messages, just exit status"},
- {NULL}
+ { "out", OPT_OUT, '>', "Output config file, used when generating" },
+ { "mac_name", OPT_MAC_NAME, 's', "MAC name" },
+ { "macopt", OPT_MACOPT, 's', "MAC algorithm parameters in n:v form." },
+ { OPT_MORE_STR, 0, 0, "See 'PARAMETER NAMES' in the EVP_MAC_ docs" },
+ { "noout", OPT_NO_LOG, '-', "Disable logging of self test events" },
+ { "corrupt_desc", OPT_CORRUPT_DESC, 's', "Corrupt a self test by description" },
+ { "corrupt_type", OPT_CORRUPT_TYPE, 's', "Corrupt a self test by type" },
+ { "config", OPT_CONFIG, '<', "The parent config to verify" },
+ { "quiet", OPT_QUIET, '-', "No messages, just exit status" },
+ { NULL }
};
typedef struct {
@@ -186,70 +201,70 @@ typedef struct {
/* Pedantic FIPS compliance */
static const FIPS_OPTS pedantic_opts = {
- 1, /* self_test_onload */
- 1, /* conditional_errors */
- 1, /* security_checks */
- 1, /* hmac_key_check */
- 1, /* kmac_key_check */
- 1, /* tls_prf_ems_check */
- 1, /* no_short_mac */
- 1, /* drgb_no_trunc_dgst */
- 1, /* signature_digest_check */
- 1, /* hkdf_digest_check */
- 1, /* tls13_kdf_digest_check */
- 1, /* tls1_prf_digest_check */
- 1, /* sshkdf_digest_check */
- 1, /* sskdf_digest_check */
- 1, /* x963kdf_digest_check */
- 1, /* dsa_sign_disabled */
- 1, /* tdes_encrypt_disabled */
- 1, /* rsa_pkcs15_padding_disabled */
- 1, /* rsa_pss_saltlen_check */
- 1, /* sign_x931_padding_disabled */
- 1, /* hkdf_key_check */
- 1, /* kbkdf_key_check */
- 1, /* tls13_kdf_key_check */
- 1, /* tls1_prf_key_check */
- 1, /* sshkdf_key_check */
- 1, /* sskdf_key_check */
- 1, /* x963kdf_key_check */
- 1, /* x942kdf_key_check */
- 1, /* pbkdf2_lower_bound_check */
- 1, /* ecdh_cofactor_check */
+ 1, /* self_test_onload */
+ 1, /* conditional_errors */
+ 1, /* security_checks */
+ 1, /* hmac_key_check */
+ 1, /* kmac_key_check */
+ 1, /* tls_prf_ems_check */
+ 1, /* no_short_mac */
+ 1, /* drgb_no_trunc_dgst */
+ 1, /* signature_digest_check */
+ 1, /* hkdf_digest_check */
+ 1, /* tls13_kdf_digest_check */
+ 1, /* tls1_prf_digest_check */
+ 1, /* sshkdf_digest_check */
+ 1, /* sskdf_digest_check */
+ 1, /* x963kdf_digest_check */
+ 1, /* dsa_sign_disabled */
+ 1, /* tdes_encrypt_disabled */
+ 1, /* rsa_pkcs15_padding_disabled */
+ 1, /* rsa_pss_saltlen_check */
+ 1, /* sign_x931_padding_disabled */
+ 1, /* hkdf_key_check */
+ 1, /* kbkdf_key_check */
+ 1, /* tls13_kdf_key_check */
+ 1, /* tls1_prf_key_check */
+ 1, /* sshkdf_key_check */
+ 1, /* sskdf_key_check */
+ 1, /* x963kdf_key_check */
+ 1, /* x942kdf_key_check */
+ 1, /* pbkdf2_lower_bound_check */
+ 1, /* ecdh_cofactor_check */
};
/* Default FIPS settings for backward compatibility */
static FIPS_OPTS fips_opts = {
- 1, /* self_test_onload */
- 1, /* conditional_errors */
- 1, /* security_checks */
- 0, /* hmac_key_check */
- 0, /* kmac_key_check */
- 0, /* tls_prf_ems_check */
- 0, /* no_short_mac */
- 0, /* drgb_no_trunc_dgst */
- 0, /* signature_digest_check */
- 0, /* hkdf_digest_check */
- 0, /* tls13_kdf_digest_check */
- 0, /* tls1_prf_digest_check */
- 0, /* sshkdf_digest_check */
- 0, /* sskdf_digest_check */
- 0, /* x963kdf_digest_check */
- 0, /* dsa_sign_disabled */
- 0, /* tdes_encrypt_disabled */
- 0, /* rsa_pkcs15_padding_disabled */
- 0, /* rsa_pss_saltlen_check */
- 0, /* sign_x931_padding_disabled */
- 0, /* hkdf_key_check */
- 0, /* kbkdf_key_check */
- 0, /* tls13_kdf_key_check */
- 0, /* tls1_prf_key_check */
- 0, /* sshkdf_key_check */
- 0, /* sskdf_key_check */
- 0, /* x963kdf_key_check */
- 0, /* x942kdf_key_check */
- 1, /* pbkdf2_lower_bound_check */
- 0, /* ecdh_cofactor_check */
+ 1, /* self_test_onload */
+ 1, /* conditional_errors */
+ 1, /* security_checks */
+ 0, /* hmac_key_check */
+ 0, /* kmac_key_check */
+ 0, /* tls_prf_ems_check */
+ 0, /* no_short_mac */
+ 0, /* drgb_no_trunc_dgst */
+ 0, /* signature_digest_check */
+ 0, /* hkdf_digest_check */
+ 0, /* tls13_kdf_digest_check */
+ 0, /* tls1_prf_digest_check */
+ 0, /* sshkdf_digest_check */
+ 0, /* sskdf_digest_check */
+ 0, /* x963kdf_digest_check */
+ 0, /* dsa_sign_disabled */
+ 0, /* tdes_encrypt_disabled */
+ 0, /* rsa_pkcs15_padding_disabled */
+ 0, /* rsa_pss_saltlen_check */
+ 0, /* sign_x931_padding_disabled */
+ 0, /* hkdf_key_check */
+ 0, /* kbkdf_key_check */
+ 0, /* tls13_kdf_key_check */
+ 0, /* tls1_prf_key_check */
+ 0, /* sshkdf_key_check */
+ 0, /* sskdf_key_check */
+ 0, /* x963kdf_key_check */
+ 0, /* x942kdf_key_check */
+ 1, /* pbkdf2_lower_bound_check */
+ 0, /* ecdh_cofactor_check */
};
static int check_non_pedantic_fips(int pedantic, const char *name)
@@ -262,7 +277,7 @@ static int check_non_pedantic_fips(int pedantic, const char *name)
}
static int do_mac(EVP_MAC_CTX *ctx, unsigned char *tmp, BIO *in,
- unsigned char *out, size_t *out_len)
+ unsigned char *out, size_t *out_len)
{
int ret = 0;
int i;
@@ -285,7 +300,7 @@ err:
}
static int load_fips_prov_and_run_self_test(const char *prov_name,
- int *is_fips_140_2_prov)
+ int *is_fips_140_2_prov)
{
int ret = 0;
OSSL_PROVIDER *prov = NULL;
@@ -299,11 +314,11 @@ static int load_fips_prov_and_run_self_test(const char *prov_name,
}
if (!quiet) {
*p++ = OSSL_PARAM_construct_utf8_ptr(OSSL_PROV_PARAM_NAME,
- &name, sizeof(name));
+ &name, sizeof(name));
*p++ = OSSL_PARAM_construct_utf8_ptr(OSSL_PROV_PARAM_VERSION,
- &vers, sizeof(vers));
+ &vers, sizeof(vers));
*p++ = OSSL_PARAM_construct_utf8_ptr(OSSL_PROV_PARAM_BUILDINFO,
- &build, sizeof(build));
+ &build, sizeof(build));
*p = OSSL_PARAM_construct_end();
if (!OSSL_PROVIDER_get_params(prov, params)) {
BIO_printf(bio_err, "Failed to query FIPS module parameters\n");
@@ -317,7 +332,7 @@ static int load_fips_prov_and_run_self_test(const char *prov_name,
BIO_printf(bio_err, "\t%-10s\t%s\n", "build:", build);
} else {
*p++ = OSSL_PARAM_construct_utf8_ptr(OSSL_PROV_PARAM_VERSION,
- &vers, sizeof(vers));
+ &vers, sizeof(vers));
*p = OSSL_PARAM_construct_end();
if (!OSSL_PROVIDER_get_params(prov, params)) {
BIO_printf(bio_err, "Failed to query FIPS module parameters\n");
@@ -332,7 +347,7 @@ end:
}
static int print_mac(BIO *bio, const char *label, const unsigned char *mac,
- size_t len)
+ size_t len)
{
int ret;
char *hexstr = NULL;
@@ -346,13 +361,13 @@ static int print_mac(BIO *bio, const char *label, const unsigned char *mac,
}
static int write_config_header(BIO *out, const char *prov_name,
- const char *section)
+ const char *section)
{
return BIO_printf(out, "openssl_conf = openssl_init\n\n")
- && BIO_printf(out, "[openssl_init]\n")
- && BIO_printf(out, "providers = provider_section\n\n")
- && BIO_printf(out, "[provider_section]\n")
- && BIO_printf(out, "%s = %s\n\n", prov_name, section);
+ && BIO_printf(out, "[openssl_init]\n")
+ && BIO_printf(out, "providers = provider_section\n\n")
+ && BIO_printf(out, "[provider_section]\n")
+ && BIO_printf(out, "%s = %s\n\n", prov_name, section);
}
/*
@@ -363,96 +378,127 @@ static int write_config_header(BIO *out, const char *prov_name,
* Returns 1 if the config file is written otherwise it returns 0 on error.
*/
static int write_config_fips_section(BIO *out, const char *section,
- unsigned char *module_mac,
- size_t module_mac_len,
- const FIPS_OPTS *opts,
- unsigned char *install_mac,
- size_t install_mac_len)
+ unsigned char *module_mac,
+ size_t module_mac_len,
+ const FIPS_OPTS *opts,
+ unsigned char *install_mac,
+ size_t install_mac_len)
{
int ret = 0;
if (BIO_printf(out, "[%s]\n", section) <= 0
|| BIO_printf(out, "activate = 1\n") <= 0
|| BIO_printf(out, "%s = %s\n", OSSL_PROV_FIPS_PARAM_INSTALL_VERSION,
- VERSION_VAL) <= 0
+ VERSION_VAL)
+ <= 0
|| BIO_printf(out, "%s = %s\n", OSSL_PROV_FIPS_PARAM_CONDITIONAL_ERRORS,
- opts->conditional_errors ? "1" : "0") <= 0
+ opts->conditional_errors ? "1" : "0")
+ <= 0
|| BIO_printf(out, "%s = %s\n", OSSL_PROV_PARAM_SECURITY_CHECKS,
- opts->security_checks ? "1" : "0") <= 0
+ opts->security_checks ? "1" : "0")
+ <= 0
|| BIO_printf(out, "%s = %s\n", OSSL_PROV_PARAM_HMAC_KEY_CHECK,
- opts->hmac_key_check ? "1": "0") <= 0
+ opts->hmac_key_check ? "1" : "0")
+ <= 0
|| BIO_printf(out, "%s = %s\n", OSSL_PROV_PARAM_KMAC_KEY_CHECK,
- opts->kmac_key_check ? "1": "0") <= 0
+ opts->kmac_key_check ? "1" : "0")
+ <= 0
|| BIO_printf(out, "%s = %s\n", OSSL_PROV_PARAM_TLS1_PRF_EMS_CHECK,
- opts->tls_prf_ems_check ? "1" : "0") <= 0
+ opts->tls_prf_ems_check ? "1" : "0")
+ <= 0
|| BIO_printf(out, "%s = %s\n", OSSL_PROV_PARAM_NO_SHORT_MAC,
- opts->no_short_mac ? "1" : "0") <= 0
+ opts->no_short_mac ? "1" : "0")
+ <= 0
|| BIO_printf(out, "%s = %s\n", OSSL_PROV_PARAM_DRBG_TRUNC_DIGEST,
- opts->drgb_no_trunc_dgst ? "1" : "0") <= 0
+ opts->drgb_no_trunc_dgst ? "1" : "0")
+ <= 0
|| BIO_printf(out, "%s = %s\n", OSSL_PROV_PARAM_SIGNATURE_DIGEST_CHECK,
- opts->signature_digest_check ? "1" : "0") <= 0
+ opts->signature_digest_check ? "1" : "0")
+ <= 0
|| BIO_printf(out, "%s = %s\n", OSSL_PROV_PARAM_HKDF_DIGEST_CHECK,
- opts->hkdf_digest_check ? "1": "0") <= 0
+ opts->hkdf_digest_check ? "1" : "0")
+ <= 0
|| BIO_printf(out, "%s = %s\n",
- OSSL_PROV_PARAM_TLS13_KDF_DIGEST_CHECK,
- opts->tls13_kdf_digest_check ? "1": "0") <= 0
+ OSSL_PROV_PARAM_TLS13_KDF_DIGEST_CHECK,
+ opts->tls13_kdf_digest_check ? "1" : "0")
+ <= 0
|| BIO_printf(out, "%s = %s\n",
- OSSL_PROV_PARAM_TLS1_PRF_DIGEST_CHECK,
- opts->tls1_prf_digest_check ? "1": "0") <= 0
+ OSSL_PROV_PARAM_TLS1_PRF_DIGEST_CHECK,
+ opts->tls1_prf_digest_check ? "1" : "0")
+ <= 0
|| BIO_printf(out, "%s = %s\n",
- OSSL_PROV_PARAM_SSHKDF_DIGEST_CHECK,
- opts->sshkdf_digest_check ? "1": "0") <= 0
+ OSSL_PROV_PARAM_SSHKDF_DIGEST_CHECK,
+ opts->sshkdf_digest_check ? "1" : "0")
+ <= 0
|| BIO_printf(out, "%s = %s\n", OSSL_PROV_PARAM_SSKDF_DIGEST_CHECK,
- opts->sskdf_digest_check ? "1": "0") <= 0
+ opts->sskdf_digest_check ? "1" : "0")
+ <= 0
|| BIO_printf(out, "%s = %s\n",
- OSSL_PROV_PARAM_X963KDF_DIGEST_CHECK,
- opts->x963kdf_digest_check ? "1": "0") <= 0
+ OSSL_PROV_PARAM_X963KDF_DIGEST_CHECK,
+ opts->x963kdf_digest_check ? "1" : "0")
+ <= 0
|| BIO_printf(out, "%s = %s\n", OSSL_PROV_PARAM_DSA_SIGN_DISABLED,
- opts->dsa_sign_disabled ? "1" : "0") <= 0
+ opts->dsa_sign_disabled ? "1" : "0")
+ <= 0
|| BIO_printf(out, "%s = %s\n", OSSL_PROV_PARAM_TDES_ENCRYPT_DISABLED,
- opts->tdes_encrypt_disabled ? "1" : "0") <= 0
+ opts->tdes_encrypt_disabled ? "1" : "0")
+ <= 0
|| BIO_printf(out, "%s = %s\n",
- OSSL_PROV_PARAM_RSA_PKCS15_PAD_DISABLED,
- opts->rsa_pkcs15_padding_disabled ? "1" : "0") <= 0
+ OSSL_PROV_PARAM_RSA_PKCS15_PAD_DISABLED,
+ opts->rsa_pkcs15_padding_disabled ? "1" : "0")
+ <= 0
|| BIO_printf(out, "%s = %s\n",
- OSSL_PROV_PARAM_RSA_PSS_SALTLEN_CHECK,
- opts->rsa_pss_saltlen_check ? "1" : "0") <= 0
+ OSSL_PROV_PARAM_RSA_PSS_SALTLEN_CHECK,
+ opts->rsa_pss_saltlen_check ? "1" : "0")
+ <= 0
|| BIO_printf(out, "%s = %s\n",
- OSSL_PROV_PARAM_RSA_SIGN_X931_PAD_DISABLED,
- opts->sign_x931_padding_disabled ? "1" : "0") <= 0
+ OSSL_PROV_PARAM_RSA_SIGN_X931_PAD_DISABLED,
+ opts->sign_x931_padding_disabled ? "1" : "0")
+ <= 0
|| BIO_printf(out, "%s = %s\n", OSSL_PROV_PARAM_HKDF_KEY_CHECK,
- opts->hkdf_key_check ? "1": "0") <= 0
+ opts->hkdf_key_check ? "1" : "0")
+ <= 0
|| BIO_printf(out, "%s = %s\n", OSSL_PROV_PARAM_KBKDF_KEY_CHECK,
- opts->kbkdf_key_check ? "1": "0") <= 0
+ opts->kbkdf_key_check ? "1" : "0")
+ <= 0
|| BIO_printf(out, "%s = %s\n",
- OSSL_PROV_PARAM_TLS13_KDF_KEY_CHECK,
- opts->tls13_kdf_key_check ? "1": "0") <= 0
+ OSSL_PROV_PARAM_TLS13_KDF_KEY_CHECK,
+ opts->tls13_kdf_key_check ? "1" : "0")
+ <= 0
|| BIO_printf(out, "%s = %s\n", OSSL_PROV_PARAM_TLS1_PRF_KEY_CHECK,
- opts->tls1_prf_key_check ? "1": "0") <= 0
+ opts->tls1_prf_key_check ? "1" : "0")
+ <= 0
|| BIO_printf(out, "%s = %s\n", OSSL_PROV_PARAM_SSHKDF_KEY_CHECK,
- opts->sshkdf_key_check ? "1": "0") <= 0
+ opts->sshkdf_key_check ? "1" : "0")
+ <= 0
|| BIO_printf(out, "%s = %s\n", OSSL_PROV_PARAM_SSKDF_KEY_CHECK,
- opts->sskdf_key_check ? "1": "0") <= 0
+ opts->sskdf_key_check ? "1" : "0")
+ <= 0
|| BIO_printf(out, "%s = %s\n", OSSL_PROV_PARAM_X963KDF_KEY_CHECK,
- opts->x963kdf_key_check ? "1": "0") <= 0
+ opts->x963kdf_key_check ? "1" : "0")
+ <= 0
|| BIO_printf(out, "%s = %s\n", OSSL_PROV_PARAM_X942KDF_KEY_CHECK,
- opts->x942kdf_key_check ? "1": "0") <= 0
+ opts->x942kdf_key_check ? "1" : "0")
+ <= 0
|| BIO_printf(out, "%s = %s\n",
- OSSL_PROV_PARAM_PBKDF2_LOWER_BOUND_CHECK,
- opts->pbkdf2_lower_bound_check ? "1" : "0") <= 0
+ OSSL_PROV_PARAM_PBKDF2_LOWER_BOUND_CHECK,
+ opts->pbkdf2_lower_bound_check ? "1" : "0")
+ <= 0
|| BIO_printf(out, "%s = %s\n", OSSL_PROV_PARAM_ECDH_COFACTOR_CHECK,
- opts->ecdh_cofactor_check ? "1": "0") <= 0
+ opts->ecdh_cofactor_check ? "1" : "0")
+ <= 0
|| !print_mac(out, OSSL_PROV_FIPS_PARAM_MODULE_MAC, module_mac,
- module_mac_len))
+ module_mac_len))
goto end;
if (install_mac != NULL
- && install_mac_len > 0
- && opts->self_test_onload == 0) {
+ && install_mac_len > 0
+ && opts->self_test_onload == 0) {
if (!print_mac(out, OSSL_PROV_FIPS_PARAM_INSTALL_MAC, install_mac,
- install_mac_len)
+ install_mac_len)
|| BIO_printf(out, "%s = %s\n", OSSL_PROV_FIPS_PARAM_INSTALL_STATUS,
- INSTALL_STATUS_VAL) <= 0)
+ INSTALL_STATUS_VAL)
+ <= 0)
goto end;
}
ret = 1;
@@ -461,10 +507,10 @@ end:
}
static CONF *generate_config_and_load(const char *prov_name,
- const char *section,
- unsigned char *module_mac,
- size_t module_mac_len,
- const FIPS_OPTS *opts)
+ const char *section,
+ unsigned char *module_mac,
+ size_t module_mac_len,
+ const FIPS_OPTS *opts)
{
BIO *mem_bio = NULL;
CONF *conf = NULL;
@@ -474,8 +520,8 @@ static CONF *generate_config_and_load(const char *prov_name,
return 0;
if (!write_config_header(mem_bio, prov_name, section)
|| !write_config_fips_section(mem_bio, section,
- module_mac, module_mac_len,
- opts, NULL, 0))
+ module_mac, module_mac_len,
+ opts, NULL, 0))
goto end;
conf = app_load_config_bio(mem_bio, NULL);
@@ -510,8 +556,8 @@ static int verify_module_load(const char *parent_config_file)
* install_mac values, otherwise it returns 0.
*/
static int verify_config(const char *infile, const char *section,
- unsigned char *module_mac, size_t module_mac_len,
- unsigned char *install_mac, size_t install_mac_len)
+ unsigned char *module_mac, size_t module_mac_len,
+ unsigned char *install_mac, size_t install_mac_len)
{
int ret = 0;
char *s = NULL;
@@ -536,8 +582,8 @@ static int verify_config(const char *infile, const char *section,
}
buf1 = OPENSSL_hexstr2buf(s, &len);
if (buf1 == NULL
- || (size_t)len != module_mac_len
- || memcmp(module_mac, buf1, module_mac_len) != 0) {
+ || (size_t)len != module_mac_len
+ || memcmp(module_mac, buf1, module_mac_len) != 0) {
BIO_printf(bio_err, "Module integrity mismatch\n");
goto end;
}
@@ -554,8 +600,8 @@ static int verify_config(const char *infile, const char *section,
}
buf2 = OPENSSL_hexstr2buf(s, &len);
if (buf2 == NULL
- || (size_t)len != install_mac_len
- || memcmp(install_mac, buf2, install_mac_len) != 0) {
+ || (size_t)len != install_mac_len
+ || memcmp(install_mac, buf2, install_mac_len) != 0) {
BIO_printf(bio_err, "Install indicator status mismatch\n");
goto end;
}
@@ -598,7 +644,7 @@ int fipsinstall_main(int argc, char **argv)
switch (o) {
case OPT_EOF:
case OPT_ERR:
- opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto cleanup;
case OPT_HELP:
@@ -773,7 +819,7 @@ int fipsinstall_main(int argc, char **argv)
ret = OSSL_PROVIDER_available(NULL, prov_name) ? 0 : 1;
if (!quiet) {
BIO_printf(bio_err, "FIPS provider is %s\n",
- ret == 0 ? "available" : "not available");
+ ret == 0 ? "available" : "not available");
}
}
goto end;
@@ -792,8 +838,8 @@ int fipsinstall_main(int argc, char **argv)
}
if (self_test_log
- || self_test_corrupt_desc != NULL
- || self_test_corrupt_type != NULL)
+ || self_test_corrupt_desc != NULL
+ || self_test_corrupt_type != NULL)
OSSL_SELF_TEST_set_callback(NULL, self_test_events, NULL);
/* Use the default FIPS HMAC digest and key if not specified. */
@@ -826,8 +872,7 @@ int fipsinstall_main(int argc, char **argv)
if (opts != NULL) {
int ok = 1;
- OSSL_PARAM *params =
- app_params_new_from_opts(opts, EVP_MAC_settable_ctx_params(mac));
+ OSSL_PARAM *params = app_params_new_from_opts(opts, EVP_MAC_settable_ctx_params(mac));
if (params == NULL)
goto end;
@@ -853,7 +898,7 @@ int fipsinstall_main(int argc, char **argv)
/* Calculate the MAC for the indicator status - it may not be used */
mem_bio = BIO_new_mem_buf((const void *)INSTALL_STATUS_VAL,
- (int)strlen(INSTALL_STATUS_VAL));
+ (int)strlen(INSTALL_STATUS_VAL));
if (mem_bio == NULL) {
BIO_printf(bio_err, "Unable to create memory BIO\n");
goto end;
@@ -865,13 +910,13 @@ int fipsinstall_main(int argc, char **argv)
if (fips_opts.self_test_onload == 1)
install_mac_len = 0;
if (!verify_config(in_fname, section_name, module_mac, module_mac_len,
- install_mac, install_mac_len))
+ install_mac, install_mac_len))
goto end;
if (!quiet)
BIO_printf(bio_err, "VERIFY PASSED\n");
} else {
conf = generate_config_and_load(prov_name, section_name, module_mac,
- module_mac_len, &fips_opts);
+ module_mac_len, &fips_opts);
if (conf == NULL)
goto end;
if (!load_fips_prov_and_run_self_test(prov_name, &is_fips_140_2_prov))
@@ -888,17 +933,16 @@ int fipsinstall_main(int argc, char **argv)
if (set_selftest_onload_option == 0 && is_fips_140_2_prov)
fips_opts.self_test_onload = 0;
- fout =
- out_fname == NULL ? dup_bio_out(FORMAT_TEXT)
- : bio_open_default(out_fname, 'w', FORMAT_TEXT);
+ fout = out_fname == NULL ? dup_bio_out(FORMAT_TEXT)
+ : bio_open_default(out_fname, 'w', FORMAT_TEXT);
if (fout == NULL) {
BIO_printf(bio_err, "Failed to open file\n");
goto end;
}
if (!write_config_fips_section(fout, section_name,
- module_mac, module_mac_len, &fips_opts,
- install_mac, install_mac_len))
+ module_mac, module_mac_len, &fips_opts,
+ install_mac, install_mac_len))
goto end;
if (!quiet)
BIO_printf(bio_err, "INSTALL PASSED\n");
@@ -951,7 +995,7 @@ static int self_test_events(const OSSL_PARAM params[], void *arg)
if (strcmp(phase, OSSL_SELF_TEST_PHASE_START) == 0)
BIO_printf(bio_err, "%s : (%s) : ", desc, type);
else if (strcmp(phase, OSSL_SELF_TEST_PHASE_PASS) == 0
- || strcmp(phase, OSSL_SELF_TEST_PHASE_FAIL) == 0)
+ || strcmp(phase, OSSL_SELF_TEST_PHASE_FAIL) == 0)
BIO_printf(bio_err, "%s\n", phase);
}
/*
@@ -959,13 +1003,13 @@ static int self_test_events(const OSSL_PARAM params[], void *arg)
* error is returned during the corrupt phase.
*/
if (strcmp(phase, OSSL_SELF_TEST_PHASE_CORRUPT) == 0
- && (self_test_corrupt_desc != NULL
- || self_test_corrupt_type != NULL)) {
+ && (self_test_corrupt_desc != NULL
+ || self_test_corrupt_type != NULL)) {
if (self_test_corrupt_desc != NULL
- && strcmp(self_test_corrupt_desc, desc) != 0)
+ && strcmp(self_test_corrupt_desc, desc) != 0)
goto end;
if (self_test_corrupt_type != NULL
- && strcmp(self_test_corrupt_type, type) != 0)
+ && strcmp(self_test_corrupt_type, type) != 0)
goto end;
BIO_printf(bio_err, "%s ", phase);
goto err;
diff --git a/apps/gendsa.c b/apps/gendsa.c
index fd9de9ecb6..bc0f5e5ba1 100644
--- a/apps/gendsa.c
+++ b/apps/gendsa.c
@@ -24,28 +24,33 @@
typedef enum OPTION_choice {
OPT_COMMON,
- OPT_OUT, OPT_PASSOUT, OPT_CIPHER, OPT_VERBOSE, OPT_QUIET,
- OPT_R_ENUM, OPT_PROV_ENUM
+ OPT_OUT,
+ OPT_PASSOUT,
+ OPT_CIPHER,
+ OPT_VERBOSE,
+ OPT_QUIET,
+ OPT_R_ENUM,
+ OPT_PROV_ENUM
} OPTION_CHOICE;
const OPTIONS gendsa_options[] = {
- {OPT_HELP_STR, 1, '-', "Usage: %s [options] dsaparam-file\n"},
+ { OPT_HELP_STR, 1, '-', "Usage: %s [options] dsaparam-file\n" },
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
+ { "help", OPT_HELP, '-', "Display this summary" },
OPT_SECTION("Output"),
- {"out", OPT_OUT, '>', "Output the key to the specified file"},
- {"passout", OPT_PASSOUT, 's', "Output file pass phrase source"},
+ { "out", OPT_OUT, '>', "Output the key to the specified file" },
+ { "passout", OPT_PASSOUT, 's', "Output file pass phrase source" },
OPT_R_OPTIONS,
OPT_PROV_OPTIONS,
- {"", OPT_CIPHER, '-', "Encrypt the output with any supported cipher"},
- {"verbose", OPT_VERBOSE, '-', "Verbose output"},
- {"quiet", OPT_QUIET, '-', "Terse output"},
+ { "", OPT_CIPHER, '-', "Encrypt the output with any supported cipher" },
+ { "verbose", OPT_VERBOSE, '-', "Verbose output" },
+ { "quiet", OPT_QUIET, '-', "Terse output" },
OPT_PARAMETERS(),
- {"dsaparam-file", 0, 0, "File containing DSA parameters"},
- {NULL}
+ { "dsaparam-file", 0, 0, "File containing DSA parameters" },
+ { NULL }
};
int gendsa_main(int argc, char **argv)
@@ -65,7 +70,7 @@ int gendsa_main(int argc, char **argv)
switch (o) {
case OPT_EOF:
case OPT_ERR:
- opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
case OPT_HELP:
@@ -125,9 +130,9 @@ int gendsa_main(int argc, char **argv)
nbits = EVP_PKEY_get_bits(pkey);
if (nbits > OPENSSL_DSA_MAX_MODULUS_BITS)
BIO_printf(bio_err,
- "Warning: It is not recommended to use more than %d bit for DSA keys.\n"
- " Your key size is %d! Larger key size may behave not as expected.\n",
- OPENSSL_DSA_MAX_MODULUS_BITS, EVP_PKEY_get_bits(pkey));
+ "Warning: It is not recommended to use more than %d bit for DSA keys.\n"
+ " Your key size is %d! Larger key size may behave not as expected.\n",
+ OPENSSL_DSA_MAX_MODULUS_BITS, EVP_PKEY_get_bits(pkey));
ctx = EVP_PKEY_CTX_new_from_pkey(app_get0_libctx(), pkey, app_get0_propq());
if (ctx == NULL) {
@@ -150,10 +155,10 @@ int gendsa_main(int argc, char **argv)
goto end;
}
ret = 0;
- end:
+end:
if (ret != 0)
ERR_print_errors(bio_err);
- end2:
+end2:
BIO_free(in);
BIO_free_all(out);
EVP_PKEY_free(pkey);
diff --git a/apps/genpkey.c b/apps/genpkey.c
index f39388b1f8..19fc788b23 100644
--- a/apps/genpkey.c
+++ b/apps/genpkey.c
@@ -18,42 +18,53 @@
static int verbose = 0;
static int init_keygen_file(EVP_PKEY_CTX **pctx, const char *file,
- OSSL_LIB_CTX *libctx, const char *propq);
+ OSSL_LIB_CTX *libctx, const char *propq);
typedef enum OPTION_choice {
OPT_COMMON,
- OPT_OUTFORM, OPT_OUT, OPT_PASS, OPT_PARAMFILE,
- OPT_ALGORITHM, OPT_PKEYOPT, OPT_GENPARAM, OPT_TEXT, OPT_CIPHER,
- OPT_VERBOSE, OPT_QUIET, OPT_CONFIG, OPT_OUTPUBKEY,
- OPT_PROV_ENUM, OPT_R_ENUM
+ OPT_OUTFORM,
+ OPT_OUT,
+ OPT_PASS,
+ OPT_PARAMFILE,
+ OPT_ALGORITHM,
+ OPT_PKEYOPT,
+ OPT_GENPARAM,
+ OPT_TEXT,
+ OPT_CIPHER,
+ OPT_VERBOSE,
+ OPT_QUIET,
+ OPT_CONFIG,
+ OPT_OUTPUBKEY,
+ OPT_PROV_ENUM,
+ OPT_R_ENUM
} OPTION_CHOICE;
const OPTIONS genpkey_options[] = {
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
- {"paramfile", OPT_PARAMFILE, '<', "Parameters file"},
- {"algorithm", OPT_ALGORITHM, 's', "The public key algorithm"},
- {"verbose", OPT_VERBOSE, '-', "Output status while generating keys"},
- {"quiet", OPT_QUIET, '-', "Do not output status while generating keys"},
- {"pkeyopt", OPT_PKEYOPT, 's',
- "Set the public key algorithm option as opt:value"},
- OPT_CONFIG_OPTION,
+ { "help", OPT_HELP, '-', "Display this summary" },
+ { "paramfile", OPT_PARAMFILE, '<', "Parameters file" },
+ { "algorithm", OPT_ALGORITHM, 's', "The public key algorithm" },
+ { "verbose", OPT_VERBOSE, '-', "Output status while generating keys" },
+ { "quiet", OPT_QUIET, '-', "Do not output status while generating keys" },
+ { "pkeyopt", OPT_PKEYOPT, 's',
+ "Set the public key algorithm option as opt:value" },
+ OPT_CONFIG_OPTION,
OPT_SECTION("Output"),
- {"out", OPT_OUT, '>', "Output (private key) file"},
- {"outpubkey", OPT_OUTPUBKEY, '>', "Output public key file"},
- {"outform", OPT_OUTFORM, 'F', "output format (DER or PEM)"},
- {"pass", OPT_PASS, 's', "Output file pass phrase source"},
- {"genparam", OPT_GENPARAM, '-', "Generate parameters, not key"},
- {"text", OPT_TEXT, '-', "Print the private key in text"},
- {"", OPT_CIPHER, '-', "Cipher to use to encrypt the key"},
+ { "out", OPT_OUT, '>', "Output (private key) file" },
+ { "outpubkey", OPT_OUTPUBKEY, '>', "Output public key file" },
+ { "outform", OPT_OUTFORM, 'F', "output format (DER or PEM)" },
+ { "pass", OPT_PASS, 's', "Output file pass phrase source" },
+ { "genparam", OPT_GENPARAM, '-', "Generate parameters, not key" },
+ { "text", OPT_TEXT, '-', "Print the private key in text" },
+ { "", OPT_CIPHER, '-', "Cipher to use to encrypt the key" },
OPT_PROV_OPTIONS,
OPT_R_OPTIONS,
/* This is deliberately last. */
- {OPT_HELP_STR, 1, 1,
- "Order of options may be important! See the documentation.\n"},
- {NULL}
+ { OPT_HELP_STR, 1, 1,
+ "Order of options may be important! See the documentation.\n" },
+ { NULL }
};
static const char *param_datatype_2name(unsigned int type, int *ishex)
@@ -61,11 +72,17 @@ static const char *param_datatype_2name(unsigned int type, int *ishex)
*ishex = 0;
switch (type) {
- case OSSL_PARAM_INTEGER: return "int";
- case OSSL_PARAM_UNSIGNED_INTEGER: return "uint";
- case OSSL_PARAM_REAL: return "float";
- case OSSL_PARAM_OCTET_STRING: *ishex = 1; return "string";
- case OSSL_PARAM_UTF8_STRING: return "string";
+ case OSSL_PARAM_INTEGER:
+ return "int";
+ case OSSL_PARAM_UNSIGNED_INTEGER:
+ return "uint";
+ case OSSL_PARAM_REAL:
+ return "float";
+ case OSSL_PARAM_OCTET_STRING:
+ *ishex = 1;
+ return "string";
+ case OSSL_PARAM_UTF8_STRING:
+ return "string";
default:
return NULL;
}
@@ -125,7 +142,7 @@ int genpkey_main(int argc, char **argv)
switch (o) {
case OPT_EOF:
case OPT_ERR:
- opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
case OPT_HELP:
@@ -287,7 +304,7 @@ int genpkey_main(int argc, char **argv)
}
}
- end:
+end:
sk_OPENSSL_STRING_free(keyopt);
if (ret != 0) {
ERR_print_errors(bio_err);
@@ -296,13 +313,13 @@ int genpkey_main(int argc, char **argv)
rv = mem_bio_to_file(mem_outpubkey, outpubkeyfile, outformat, private);
if (!rv)
BIO_printf(bio_err, "Error writing to outpubkey: '%s'. Error: %s\n",
- outpubkeyfile, strerror(errno));
+ outpubkeyfile, strerror(errno));
}
if (mem_out != NULL) {
rv = mem_bio_to_file(mem_out, outfile, outformat, private);
if (!rv)
BIO_printf(bio_err, "Error writing to outfile: '%s'. Error: %s\n",
- outfile, strerror(errno));
+ outfile, strerror(errno));
}
}
EVP_PKEY_free(pkey);
@@ -316,7 +333,7 @@ int genpkey_main(int argc, char **argv)
}
static int init_keygen_file(EVP_PKEY_CTX **pctx, const char *file,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_LIB_CTX *libctx, const char *propq)
{
BIO *pbio;
EVP_PKEY *pkey = NULL;
@@ -349,18 +366,17 @@ static int init_keygen_file(EVP_PKEY_CTX **pctx, const char *file,
*pctx = ctx;
return 1;
- err:
+err:
BIO_puts(bio_err, "Error initializing context\n");
ERR_print_errors(bio_err);
EVP_PKEY_CTX_free(ctx);
EVP_PKEY_free(pkey);
return 0;
-
}
int init_gen_str(EVP_PKEY_CTX **pctx,
- const char *algname, int do_param,
- OSSL_LIB_CTX *libctx, const char *propq)
+ const char *algname, int do_param,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
EVP_PKEY_CTX *ctx = NULL;
@@ -384,11 +400,9 @@ int init_gen_str(EVP_PKEY_CTX **pctx,
*pctx = ctx;
return 1;
- err:
+err:
BIO_printf(bio_err, "Error initializing %s context\n", algname);
ERR_print_errors(bio_err);
EVP_PKEY_CTX_free(ctx);
return 0;
-
}
-
diff --git a/apps/genrsa.c b/apps/genrsa.c
index 5b022fd3a2..1412d3cf34 100644
--- a/apps/genrsa.c
+++ b/apps/genrsa.c
@@ -35,39 +35,46 @@ typedef enum OPTION_choice {
OPT_3,
#endif
OPT_F4,
- OPT_OUT, OPT_PASSOUT, OPT_CIPHER, OPT_PRIMES, OPT_VERBOSE, OPT_QUIET,
- OPT_R_ENUM, OPT_PROV_ENUM, OPT_TRADITIONAL
+ OPT_OUT,
+ OPT_PASSOUT,
+ OPT_CIPHER,
+ OPT_PRIMES,
+ OPT_VERBOSE,
+ OPT_QUIET,
+ OPT_R_ENUM,
+ OPT_PROV_ENUM,
+ OPT_TRADITIONAL
} OPTION_CHOICE;
const OPTIONS genrsa_options[] = {
- {OPT_HELP_STR, 1, '-', "Usage: %s [options] numbits\n"},
+ { OPT_HELP_STR, 1, '-', "Usage: %s [options] numbits\n" },
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
+ { "help", OPT_HELP, '-', "Display this summary" },
OPT_SECTION("Input"),
#ifndef OPENSSL_NO_DEPRECATED_3_0
- {"3", OPT_3, '-', "(deprecated) Use 3 for the E value"},
+ { "3", OPT_3, '-', "(deprecated) Use 3 for the E value" },
#endif
- {"F4", OPT_F4, '-', "Use the Fermat number F4 (0x10001) for the E value"},
- {"f4", OPT_F4, '-', "Use the Fermat number F4 (0x10001) for the E value"},
+ { "F4", OPT_F4, '-', "Use the Fermat number F4 (0x10001) for the E value" },
+ { "f4", OPT_F4, '-', "Use the Fermat number F4 (0x10001) for the E value" },
OPT_SECTION("Output"),
- {"out", OPT_OUT, '>', "Output the key to specified file"},
- {"passout", OPT_PASSOUT, 's', "Output file pass phrase source"},
- {"primes", OPT_PRIMES, 'p', "Specify number of primes"},
- {"verbose", OPT_VERBOSE, '-', "Verbose output"},
- {"quiet", OPT_QUIET, '-', "Terse output"},
- {"traditional", OPT_TRADITIONAL, '-',
- "Use traditional format for private keys"},
- {"", OPT_CIPHER, '-', "Encrypt the output with any supported cipher"},
+ { "out", OPT_OUT, '>', "Output the key to specified file" },
+ { "passout", OPT_PASSOUT, 's', "Output file pass phrase source" },
+ { "primes", OPT_PRIMES, 'p', "Specify number of primes" },
+ { "verbose", OPT_VERBOSE, '-', "Verbose output" },
+ { "quiet", OPT_QUIET, '-', "Terse output" },
+ { "traditional", OPT_TRADITIONAL, '-',
+ "Use traditional format for private keys" },
+ { "", OPT_CIPHER, '-', "Encrypt the output with any supported cipher" },
OPT_R_OPTIONS,
OPT_PROV_OPTIONS,
OPT_PARAMETERS(),
- {"numbits", 0, 0, "Size of key in bits"},
- {NULL}
+ { "numbits", 0, 0, "Size of key in bits" },
+ { NULL }
};
int genrsa_main(int argc, char **argv)
@@ -94,7 +101,7 @@ int genrsa_main(int argc, char **argv)
switch (o) {
case OPT_EOF:
case OPT_ERR:
-opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
case OPT_HELP:
@@ -150,9 +157,9 @@ opthelp:
goto end;
if (num > OPENSSL_RSA_MAX_MODULUS_BITS)
BIO_printf(bio_err,
- "Warning: It is not recommended to use more than %d bit for RSA keys.\n"
- " Your key size is %d! Larger key size may behave not as expected.\n",
- OPENSSL_RSA_MAX_MODULUS_BITS, num);
+ "Warning: It is not recommended to use more than %d bit for RSA keys.\n"
+ " Your key size is %d! Larger key size may behave not as expected.\n",
+ OPENSSL_RSA_MAX_MODULUS_BITS, num);
} else if (!opt_check_rest_arg(NULL)) {
goto opthelp;
}
@@ -173,7 +180,7 @@ opthelp:
goto end;
if (!init_gen_str(&ctx, "RSA", 0, app_get0_libctx(),
- app_get0_propq()))
+ app_get0_propq()))
goto end;
if (verbose)
@@ -220,7 +227,7 @@ opthelp:
}
if (traditional) {
if (!PEM_write_bio_PrivateKey_traditional(out, pkey, enc, NULL, 0,
- NULL, passout))
+ NULL, passout))
goto end;
} else {
if (!PEM_write_bio_PrivateKey(out, pkey, enc, NULL, 0, NULL, passout))
@@ -228,7 +235,7 @@ opthelp:
}
ret = 0;
- end:
+end:
BN_free(bn);
BN_GENCB_free(cb);
EVP_PKEY_CTX_free(ctx);
@@ -240,4 +247,3 @@ opthelp:
ERR_print_errors(bio_err);
return ret;
}
-
diff --git a/apps/include/app_libctx.h b/apps/include/app_libctx.h
index 17c0afc713..b7157cec40 100644
--- a/apps/include/app_libctx.h
+++ b/apps/include/app_libctx.h
@@ -8,9 +8,9 @@
*/
#ifndef OSSL_APPS_LIBCTX_H
-# define OSSL_APPS_LIBCTX_H
+#define OSSL_APPS_LIBCTX_H
-# include <openssl/types.h>
+#include <openssl/types.h>
OSSL_LIB_CTX *app_create_libctx(void);
OSSL_LIB_CTX *app_get0_libctx(void);
diff --git a/apps/include/app_params.h b/apps/include/app_params.h
index 79f8f58b31..20caf737d4 100644
--- a/apps/include/app_params.h
+++ b/apps/include/app_params.h
@@ -11,4 +11,3 @@
int print_param_types(const char *thing, const OSSL_PARAM *pdefs, int indent);
void print_param_value(const OSSL_PARAM *p, int indent);
-
diff --git a/apps/include/apps.h b/apps/include/apps.h
index db4df40382..ce87477924 100644
--- a/apps/include/apps.h
+++ b/apps/include/apps.h
@@ -8,40 +8,40 @@
*/
#ifndef OSSL_APPS_H
-# define OSSL_APPS_H
-
-# include "internal/common.h" /* for HAS_PREFIX */
-# include "internal/nelem.h"
-# include <assert.h>
-
-# include <stdarg.h>
-# include <sys/types.h>
-# ifndef OPENSSL_NO_POSIX_IO
-# include <sys/stat.h>
-# include <fcntl.h>
-# endif
-
-# include <openssl/e_os2.h>
-# include <openssl/types.h>
-# include <openssl/bio.h>
-# include <openssl/x509.h>
-# include <openssl/conf.h>
-# include <openssl/txt_db.h>
-# include <openssl/ocsp.h>
-# include <openssl/http.h>
-# include <signal.h>
-# include "apps_ui.h"
-# include "opt.h"
-# include "fmt.h"
-# include "platform.h"
-# include "app_libctx.h"
+#define OSSL_APPS_H
+
+#include "internal/common.h" /* for HAS_PREFIX */
+#include "internal/nelem.h"
+#include <assert.h>
+
+#include <stdarg.h>
+#include <sys/types.h>
+#ifndef OPENSSL_NO_POSIX_IO
+#include <sys/stat.h>
+#include <fcntl.h>
+#endif
+
+#include <openssl/e_os2.h>
+#include <openssl/types.h>
+#include <openssl/bio.h>
+#include <openssl/x509.h>
+#include <openssl/conf.h>
+#include <openssl/txt_db.h>
+#include <openssl/ocsp.h>
+#include <openssl/http.h>
+#include <signal.h>
+#include "apps_ui.h"
+#include "opt.h"
+#include "fmt.h"
+#include "platform.h"
+#include "app_libctx.h"
/*
* quick macro when you need to pass an unsigned char instead of a char.
* this is true for some implementations of the is*() functions, for
* example.
*/
-# define _UC(c) ((unsigned char)(c))
+#define _UC(c) ((unsigned char)(c))
void app_RAND_load_conf(CONF *c, const char *section);
int app_RAND_write(void);
@@ -64,30 +64,30 @@ BIO *bio_open_default_quiet(const char *filename, char mode, int format);
int mem_bio_to_file(BIO *in, const char *filename, int format, int private);
char *app_conf_try_string(const CONF *cnf, const char *group, const char *name);
int app_conf_try_number(const CONF *conf, const char *group, const char *name,
- long *result);
+ long *result);
CONF *app_load_config_bio(BIO *in, const char *filename);
-# define app_load_config(filename) app_load_config_internal(filename, 0)
-# define app_load_config_quiet(filename) app_load_config_internal(filename, 1)
+#define app_load_config(filename) app_load_config_internal(filename, 0)
+#define app_load_config_quiet(filename) app_load_config_internal(filename, 1)
CONF *app_load_config_internal(const char *filename, int quiet);
CONF *app_load_config_verbose(const char *filename, int verbose);
int app_load_modules(const CONF *config);
CONF *app_load_config_modules(const char *configfile);
void unbuffer(FILE *fp);
void wait_for_async(SSL *s);
-# if defined(OPENSSL_SYS_MSDOS)
+#if defined(OPENSSL_SYS_MSDOS)
int has_stdin_waiting(void);
-# endif
+#endif
void corrupt_signature(const ASN1_STRING *signature);
/* Helpers for setting X509v3 certificate fields notBefore and notAfter */
int check_cert_time_string(const char *time, const char *desc);
int set_cert_times(X509 *x, const char *startdate, const char *enddate,
- int days, int strict_compare_times);
+ int days, int strict_compare_times);
int set_crl_lastupdate(X509_CRL *crl, const char *lastupdate);
int set_crl_nextupdate(X509_CRL *crl, const char *nextupdate,
- long days, long hours, long secs);
+ long days, long hours, long secs);
typedef struct args_st {
int size;
@@ -104,7 +104,7 @@ int progress_cb(EVP_PKEY_CTX *ctx);
void dump_cert_text(BIO *out, X509 *x);
void print_name(BIO *out, const char *title, const X509_NAME *nm);
void print_bignum_var(BIO *, const BIGNUM *, const char *,
- int, unsigned char *);
+ int, unsigned char *);
void print_array(BIO *, const char *, int, const unsigned char *);
int set_nameopt(const char *arg);
unsigned long get_nameopt(void);
@@ -118,54 +118,54 @@ int app_passwd(const char *arg1, const char *arg2, char **pass1, char **pass2);
int add_oid_section(CONF *conf);
X509_REQ *load_csr(const char *file, int format, const char *desc);
X509_REQ *load_csr_autofmt(const char *infile, int format,
- STACK_OF(OPENSSL_STRING) *vfyopts, const char *desc);
+ STACK_OF(OPENSSL_STRING) *vfyopts, const char *desc);
X509 *load_cert_pass(const char *uri, int format, int maybe_stdin,
- const char *pass, const char *desc);
-# define load_cert(uri, format, desc) load_cert_pass(uri, format, 1, NULL, desc)
+ const char *pass, const char *desc);
+#define load_cert(uri, format, desc) load_cert_pass(uri, format, 1, NULL, desc)
X509_CRL *load_crl(const char *uri, int format, int maybe_stdin,
- const char *desc);
+ const char *desc);
void cleanse(char *str);
void clear_free(char *str);
EVP_PKEY *load_key(const char *uri, int format, int maybe_stdin,
- const char *pass, const char *desc);
+ const char *pass, const char *desc);
/* first try reading public key, on failure resort to loading private key */
EVP_PKEY *load_pubkey(const char *uri, int format, int maybe_stdin,
- const char *pass, const char *desc);
+ const char *pass, const char *desc);
EVP_PKEY *load_keyparams(const char *uri, int format, int maybe_stdin,
- const char *keytype, const char *desc);
+ const char *keytype, const char *desc);
EVP_PKEY *load_keyparams_suppress(const char *uri, int format, int maybe_stdin,
- const char *keytype, const char *desc,
- int suppress_decode_errors);
+ const char *keytype, const char *desc,
+ int suppress_decode_errors);
char *next_item(char *opt); /* in list separated by comma and/or space */
char *process_additional_mac_key_arguments(const char *arg);
char *get_str_from_file(const char *filename);
int load_cert_certs(const char *uri,
- X509 **pcert, STACK_OF(X509) **pcerts,
- int exclude_http, const char *pass, const char *desc,
- X509_VERIFY_PARAM *vpm);
+ X509 **pcert, STACK_OF(X509) **pcerts,
+ int exclude_http, const char *pass, const char *desc,
+ X509_VERIFY_PARAM *vpm);
STACK_OF(X509) *load_certs_multifile(char *files, const char *pass,
- const char *desc, X509_VERIFY_PARAM *vpm);
+ const char *desc, X509_VERIFY_PARAM *vpm);
X509_STORE *load_certstore(char *input, const char *pass, const char *desc,
- X509_VERIFY_PARAM *vpm);
+ X509_VERIFY_PARAM *vpm);
int load_certs(const char *uri, int maybe_stdin, STACK_OF(X509) **certs,
- const char *pass, const char *desc);
+ const char *pass, const char *desc);
int load_crls(const char *uri, STACK_OF(X509_CRL) **crls,
- const char *pass, const char *desc);
+ const char *pass, const char *desc);
int load_key_certs_crls(const char *uri, int format, int maybe_stdin,
- const char *pass, const char *desc, int quiet,
- EVP_PKEY **ppkey, EVP_PKEY **ppubkey,
- EVP_PKEY **pparams,
- X509 **pcert, STACK_OF(X509) **pcerts,
- X509_CRL **pcrl, STACK_OF(X509_CRL) **pcrls);
+ const char *pass, const char *desc, int quiet,
+ EVP_PKEY **ppkey, EVP_PKEY **ppubkey,
+ EVP_PKEY **pparams,
+ X509 **pcert, STACK_OF(X509) **pcerts,
+ X509_CRL **pcrl, STACK_OF(X509_CRL) **pcrls);
X509_STORE *setup_verify(const char *CAfile, int noCAfile,
- const char *CApath, int noCApath,
- const char *CAstore, int noCAstore);
+ const char *CApath, int noCApath,
+ const char *CAstore, int noCAstore);
__owur int ctx_set_verify_locations(SSL_CTX *ctx,
- const char *CAfile, int noCAfile,
- const char *CApath, int noCApath,
- const char *CAstore, int noCAstore);
+ const char *CAfile, int noCAfile,
+ const char *CApath, int noCApath,
+ const char *CAstore, int noCAstore);
-# ifndef OPENSSL_NO_CT
+#ifndef OPENSSL_NO_CT
/*
* Sets the file to load the Certificate Transparency log list from.
@@ -174,32 +174,32 @@ __owur int ctx_set_verify_locations(SSL_CTX *ctx,
*/
__owur int ctx_set_ctlog_list_file(SSL_CTX *ctx, const char *path);
-# endif
+#endif
-# ifndef OPENSSL_NO_OCSP
+#ifndef OPENSSL_NO_OCSP
OCSP_RESPONSE *process_responder(OCSP_REQUEST *req, const char *host,
- const char *port, const char *path,
- const char *proxy, const char *no_proxy,
- int use_ssl, STACK_OF(CONF_VALUE) *headers,
- int req_timeout);
-# endif
+ const char *port, const char *path,
+ const char *proxy, const char *no_proxy,
+ int use_ssl, STACK_OF(CONF_VALUE) *headers,
+ int req_timeout);
+#endif
/* Functions defined in ca.c and also used in ocsp.c */
int unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold,
- ASN1_GENERALIZEDTIME **pinvtm, const char *str);
+ ASN1_GENERALIZEDTIME **pinvtm, const char *str);
-# define DB_type 0
-# define DB_exp_date 1
-# define DB_rev_date 2
-# define DB_serial 3 /* index - unique */
-# define DB_file 4
-# define DB_name 5 /* index - unique when active and not disabled */
-# define DB_NUMBER 6
+#define DB_type 0
+#define DB_exp_date 1
+#define DB_rev_date 2
+#define DB_serial 3 /* index - unique */
+#define DB_file 4
+#define DB_name 5 /* index - unique when active and not disabled */
+#define DB_NUMBER 6
-# define DB_TYPE_REV 'R' /* Revoked */
-# define DB_TYPE_EXP 'E' /* Expired */
-# define DB_TYPE_VAL 'V' /* Valid ; inserted with: ca ... -valid */
-# define DB_TYPE_SUSP 'S' /* Suspended */
+#define DB_TYPE_REV 'R' /* Revoked */
+#define DB_TYPE_EXP 'E' /* Expired */
+#define DB_TYPE_VAL 'V' /* Valid ; inserted with: ca ... -valid */
+#define DB_TYPE_SUSP 'S' /* Suspended */
typedef struct db_attr_st {
int unique_subject;
@@ -208,9 +208,9 @@ typedef struct ca_db_st {
DB_ATTR attributes;
TXT_DB *db;
char *dbfname;
-# ifndef OPENSSL_NO_POSIX_IO
+#ifndef OPENSSL_NO_POSIX_IO
struct stat dbst;
-# endif
+#endif
} CA_DB;
extern int do_updatedb(CA_DB *db, time_t *now);
@@ -239,53 +239,53 @@ void *app_malloc_array(size_t n, size_t sz, const char *what);
/* load_serial, save_serial, and rotate_serial are also used for CRL numbers */
BIGNUM *load_serial(const char *serialfile, int *exists, int create,
- ASN1_INTEGER **retai);
+ ASN1_INTEGER **retai);
int save_serial(const char *serialfile, const char *suffix,
- const BIGNUM *serial, ASN1_INTEGER **retai);
+ const BIGNUM *serial, ASN1_INTEGER **retai);
int rotate_serial(const char *serialfile, const char *new_suffix,
- const char *old_suffix);
+ const char *old_suffix);
int rand_serial(BIGNUM *b, ASN1_INTEGER *ai);
CA_DB *load_index(const char *dbfile, DB_ATTR *dbattr);
int index_index(CA_DB *db);
int save_index(const char *dbfile, const char *suffix, CA_DB *db);
int rotate_index(const char *dbfile, const char *new_suffix,
- const char *old_suffix);
+ const char *old_suffix);
void free_index(CA_DB *db);
-# define index_name_cmp_noconst(a, b) \
+#define index_name_cmp_noconst(a, b) \
index_name_cmp((const OPENSSL_CSTRING *)CHECKED_PTR_OF(OPENSSL_STRING, a), \
- (const OPENSSL_CSTRING *)CHECKED_PTR_OF(OPENSSL_STRING, b))
+ (const OPENSSL_CSTRING *)CHECKED_PTR_OF(OPENSSL_STRING, b))
int index_name_cmp(const OPENSSL_CSTRING *a, const OPENSSL_CSTRING *b);
int parse_yesno(const char *str, int def);
X509_NAME *parse_name(const char *str, int chtype, int multirdn,
- const char *desc);
+ const char *desc);
void policies_print(X509_STORE_CTX *ctx);
int bio_to_mem(unsigned char **out, int maxlen, BIO *in);
int pkey_ctrl_string(EVP_PKEY_CTX *ctx, const char *value);
int x509_ctrl_string(X509 *x, const char *value);
int x509_req_ctrl_string(X509_REQ *x, const char *value);
int init_gen_str(EVP_PKEY_CTX **pctx,
- const char *algname, int do_param,
- OSSL_LIB_CTX *libctx, const char *propq);
+ const char *algname, int do_param,
+ OSSL_LIB_CTX *libctx, const char *propq);
int cert_matches_key(const X509 *cert, const EVP_PKEY *pkey);
int do_X509_sign(X509 *x, int force_v1, EVP_PKEY *pkey, const char *md,
- STACK_OF(OPENSSL_STRING) *sigopts, X509V3_CTX *ext_ctx);
+ STACK_OF(OPENSSL_STRING) *sigopts, X509V3_CTX *ext_ctx);
int do_X509_verify(X509 *x, EVP_PKEY *pkey, STACK_OF(OPENSSL_STRING) *vfyopts);
int do_X509_REQ_sign(X509_REQ *x, EVP_PKEY *pkey, const char *md,
- STACK_OF(OPENSSL_STRING) *sigopts);
+ STACK_OF(OPENSSL_STRING) *sigopts);
int do_X509_REQ_verify(X509_REQ *x, EVP_PKEY *pkey,
- STACK_OF(OPENSSL_STRING) *vfyopts);
+ STACK_OF(OPENSSL_STRING) *vfyopts);
int do_X509_CRL_sign(X509_CRL *x, EVP_PKEY *pkey, const char *md,
- STACK_OF(OPENSSL_STRING) *sigopts);
+ STACK_OF(OPENSSL_STRING) *sigopts);
extern char *psk_key;
unsigned char *next_protos_parse(size_t *outlen, const char *in);
int check_cert_attributes(BIO *bio, X509 *x,
- const char *checkhost, const char *checkemail,
- const char *checkip, int print);
+ const char *checkhost, const char *checkemail,
+ const char *checkip, int print);
void store_setup_crl_download(X509_STORE *st);
@@ -297,38 +297,38 @@ typedef struct app_http_tls_info_st {
SSL_CTX *ssl_ctx;
} APP_HTTP_TLS_INFO;
BIO *app_http_tls_cb(BIO *hbio, /* APP_HTTP_TLS_INFO */ void *arg,
- int connect, int detail);
+ int connect, int detail);
void APP_HTTP_TLS_INFO_free(APP_HTTP_TLS_INFO *info);
-# ifndef OPENSSL_NO_SOCK
+#ifndef OPENSSL_NO_SOCK
ASN1_VALUE *app_http_get_asn1(const char *url, const char *proxy,
- const char *no_proxy, SSL_CTX *ssl_ctx,
- const STACK_OF(CONF_VALUE) *headers,
- long timeout, const char *expected_content_type,
- const ASN1_ITEM *it);
+ const char *no_proxy, SSL_CTX *ssl_ctx,
+ const STACK_OF(CONF_VALUE) *headers,
+ long timeout, const char *expected_content_type,
+ const ASN1_ITEM *it);
ASN1_VALUE *app_http_post_asn1(const char *host, const char *port,
- const char *path, const char *proxy,
- const char *no_proxy, SSL_CTX *ctx,
- const STACK_OF(CONF_VALUE) *headers,
- const char *content_type,
- ASN1_VALUE *req, const ASN1_ITEM *req_it,
- const char *expected_content_type,
- long timeout, const ASN1_ITEM *rsp_it);
-# endif
+ const char *path, const char *proxy,
+ const char *no_proxy, SSL_CTX *ctx,
+ const STACK_OF(CONF_VALUE) *headers,
+ const char *content_type,
+ ASN1_VALUE *req, const ASN1_ITEM *req_it,
+ const char *expected_content_type,
+ long timeout, const ASN1_ITEM *rsp_it);
+#endif
-# define EXT_COPY_NONE 0
-# define EXT_COPY_ADD 1
-# define EXT_COPY_ALL 2
+#define EXT_COPY_NONE 0
+#define EXT_COPY_ADD 1
+#define EXT_COPY_ALL 2
-# define NETSCAPE_CERT_HDR "certificate"
+#define NETSCAPE_CERT_HDR "certificate"
-# define APP_PASS_LEN 1024
+#define APP_PASS_LEN 1024
/*
* IETF RFC 5280 says serial number must be <= 20 bytes. Use 159 bits
* so that the first bit will never be one, so that the DER encoding
* rules won't force a leading octet.
*/
-# define SERIAL_RAND_BITS 159
+#define SERIAL_RAND_BITS 159
int app_isdir(const char *);
int app_access(const char *, int flag);
@@ -337,8 +337,8 @@ int fileno_stdout(void);
int raw_read_stdin(void *, int);
int raw_write_stdout(const void *, int);
-# define TM_START 0
-# define TM_STOP 1
+#define TM_START 0
+#define TM_STOP 1
double app_tminterval(int stop, int usertime);
void make_uppercase(char *string);
@@ -353,7 +353,7 @@ typedef struct verify_options_st {
extern VERIFY_CB_ARGS verify_args;
OSSL_PARAM *app_params_new_from_opts(STACK_OF(OPENSSL_STRING) *opts,
- const OSSL_PARAM *paramdefs);
+ const OSSL_PARAM *paramdefs);
void app_params_free(OSSL_PARAM *params);
int app_provider_load(OSSL_LIB_CTX *libctx, const char *provider_name);
void app_providers_cleanup(void);
diff --git a/apps/include/apps_ui.h b/apps/include/apps_ui.h
index 6875b7c372..ea41c092f4 100644
--- a/apps/include/apps_ui.h
+++ b/apps/include/apps_ui.h
@@ -8,10 +8,9 @@
*/
#ifndef OSSL_APPS_UI_H
-# define OSSL_APPS_UI_H
+#define OSSL_APPS_UI_H
-
-# define PW_MIN_LENGTH 4
+#define PW_MIN_LENGTH 4
typedef struct pw_cb_data {
const void *password;
const char *prompt_info;
diff --git a/apps/include/cmp_mock_srv.h b/apps/include/cmp_mock_srv.h
index 00f3b8f1cb..215b95b744 100644
--- a/apps/include/cmp_mock_srv.h
+++ b/apps/include/cmp_mock_srv.h
@@ -9,15 +9,15 @@
*/
#ifndef OSSL_APPS_CMP_MOCK_SRV_H
-# define OSSL_APPS_CMP_MOCK_SRV_H
+#define OSSL_APPS_CMP_MOCK_SRV_H
-# include <openssl/opensslconf.h>
-# ifndef OPENSSL_NO_CMP
+#include <openssl/opensslconf.h>
+#ifndef OPENSSL_NO_CMP
-# include <openssl/cmp.h>
+#include <openssl/cmp.h>
OSSL_CMP_SRV_CTX *ossl_cmp_mock_srv_new(OSSL_LIB_CTX *libctx,
- const char *propq);
+ const char *propq);
void ossl_cmp_mock_srv_free(OSSL_CMP_SRV_CTX *srv_ctx);
int ossl_cmp_mock_srv_set1_refCert(OSSL_CMP_SRV_CTX *srv_ctx, X509 *cert);
@@ -25,17 +25,17 @@ int ossl_cmp_mock_srv_set1_certOut(OSSL_CMP_SRV_CTX *srv_ctx, X509 *cert);
int ossl_cmp_mock_srv_set1_keyOut(OSSL_CMP_SRV_CTX *srv_ctx, EVP_PKEY *pkey);
int ossl_cmp_mock_srv_set1_crlOut(OSSL_CMP_SRV_CTX *srv_ctx, X509_CRL *crl);
int ossl_cmp_mock_srv_set1_chainOut(OSSL_CMP_SRV_CTX *srv_ctx,
- STACK_OF(X509) *chain);
+ STACK_OF(X509) *chain);
int ossl_cmp_mock_srv_set1_caPubsOut(OSSL_CMP_SRV_CTX *srv_ctx,
- STACK_OF(X509) *caPubs);
+ STACK_OF(X509) *caPubs);
int ossl_cmp_mock_srv_set1_newWithNew(OSSL_CMP_SRV_CTX *srv_ctx, X509 *cert);
int ossl_cmp_mock_srv_set1_newWithOld(OSSL_CMP_SRV_CTX *srv_ctx, X509 *cert);
int ossl_cmp_mock_srv_set1_oldWithNew(OSSL_CMP_SRV_CTX *srv_ctx, X509 *cert);
int ossl_cmp_mock_srv_set_statusInfo(OSSL_CMP_SRV_CTX *srv_ctx, int status,
- int fail_info, const char *text);
+ int fail_info, const char *text);
int ossl_cmp_mock_srv_set_sendError(OSSL_CMP_SRV_CTX *srv_ctx, int bodytype);
int ossl_cmp_mock_srv_set_pollCount(OSSL_CMP_SRV_CTX *srv_ctx, int count);
int ossl_cmp_mock_srv_set_checkAfterTime(OSSL_CMP_SRV_CTX *srv_ctx, int sec);
-# endif /* !defined(OPENSSL_NO_CMP) */
+#endif /* !defined(OPENSSL_NO_CMP) */
#endif /* !defined(OSSL_APPS_CMP_MOCK_SRV_H) */
diff --git a/apps/include/fmt.h b/apps/include/fmt.h
index 17b891cfa2..a799b0f003 100644
--- a/apps/include/fmt.h
+++ b/apps/include/fmt.h
@@ -23,21 +23,21 @@
* contents. The FORMAT_xxx macros are meant to express an intent with the
* file being read or created.
*/
-# define B_FORMAT_TEXT 0x8000
-# define FORMAT_UNDEF 0
-# define FORMAT_TEXT (1 | B_FORMAT_TEXT) /* Generic text */
-# define FORMAT_BINARY 2 /* Generic binary */
-# define FORMAT_BASE64 (3 | B_FORMAT_TEXT) /* Base64 */
-# define FORMAT_ASN1 4 /* ASN.1/DER */
-# define FORMAT_PEM (5 | B_FORMAT_TEXT)
-# define FORMAT_PKCS12 6
-# define FORMAT_SMIME (7 | B_FORMAT_TEXT)
-# define FORMAT_PEMRSA (9 | B_FORMAT_TEXT) /* PEM RSAPublicKey format */
-# define FORMAT_ASN1RSA 10 /* DER RSAPublicKey format */
-# define FORMAT_MSBLOB 11 /* MS Key blob format */
-# define FORMAT_PVK 12 /* MS PVK file format */
-# define FORMAT_HTTP 13 /* Download using HTTP */
-# define FORMAT_NSS 14 /* NSS keylog format */
+#define B_FORMAT_TEXT 0x8000
+#define FORMAT_UNDEF 0
+#define FORMAT_TEXT (1 | B_FORMAT_TEXT) /* Generic text */
+#define FORMAT_BINARY 2 /* Generic binary */
+#define FORMAT_BASE64 (3 | B_FORMAT_TEXT) /* Base64 */
+#define FORMAT_ASN1 4 /* ASN.1/DER */
+#define FORMAT_PEM (5 | B_FORMAT_TEXT)
+#define FORMAT_PKCS12 6
+#define FORMAT_SMIME (7 | B_FORMAT_TEXT)
+#define FORMAT_PEMRSA (9 | B_FORMAT_TEXT) /* PEM RSAPublicKey format */
+#define FORMAT_ASN1RSA 10 /* DER RSAPublicKey format */
+#define FORMAT_MSBLOB 11 /* MS Key blob format */
+#define FORMAT_PVK 12 /* MS PVK file format */
+#define FORMAT_HTTP 13 /* Download using HTTP */
+#define FORMAT_NSS 14 /* NSS keylog format */
int FMT_istext(int format);
diff --git a/apps/include/function.h b/apps/include/function.h
index e796ff4045..ee08282e2f 100644
--- a/apps/include/function.h
+++ b/apps/include/function.h
@@ -8,16 +8,21 @@
*/
#ifndef OSSL_APPS_FUNCTION_H
-# define OSSL_APPS_FUNCTION_H
+#define OSSL_APPS_FUNCTION_H
-# include <openssl/lhash.h>
-# include "opt.h"
+#include <openssl/lhash.h>
+#include "opt.h"
-#define DEPRECATED_NO_ALTERNATIVE "unknown"
+#define DEPRECATED_NO_ALTERNATIVE "unknown"
typedef enum FUNC_TYPE {
- FT_none, FT_general, FT_md, FT_cipher, FT_pkey,
- FT_md_alg, FT_cipher_alg
+ FT_none,
+ FT_general,
+ FT_md,
+ FT_cipher,
+ FT_pkey,
+ FT_md_alg,
+ FT_cipher_alg
} FUNC_TYPE;
typedef struct function_st {
diff --git a/apps/include/http_server.h b/apps/include/http_server.h
index 4811e6be40..ddc7545fa3 100644
--- a/apps/include/http_server.h
+++ b/apps/include/http_server.h
@@ -8,35 +8,35 @@
*/
#ifndef OSSL_HTTP_SERVER_H
-# define OSSL_HTTP_SERVER_H
+#define OSSL_HTTP_SERVER_H
-# include "apps.h"
-# include "log.h"
+#include "apps.h"
+#include "log.h"
-# ifndef HAVE_FORK
-# if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_WINDOWS)
-# define HAVE_FORK 0
-# else
-# define HAVE_FORK 1
-# endif
-# endif
+#ifndef HAVE_FORK
+#if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_WINDOWS)
+#define HAVE_FORK 0
+#else
+#define HAVE_FORK 1
+#endif
+#endif
-# if HAVE_FORK
-# undef NO_FORK
-# else
-# define NO_FORK
-# endif
+#if HAVE_FORK
+#undef NO_FORK
+#else
+#define NO_FORK
+#endif
-# if !defined(NO_FORK) && !defined(OPENSSL_NO_SOCK) \
+#if !defined(NO_FORK) && !defined(OPENSSL_NO_SOCK) \
&& !defined(OPENSSL_NO_POSIX_IO)
-# define HTTP_DAEMON
-# include <sys/types.h>
-# include <sys/wait.h>
-# include <signal.h>
-# define MAXERRLEN 1000 /* limit error text sent to syslog to 1000 bytes */
-# endif
+#define HTTP_DAEMON
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <signal.h>
+#define MAXERRLEN 1000 /* limit error text sent to syslog to 1000 bytes */
+#endif
-# ifndef OPENSSL_NO_SOCK
+#ifndef OPENSSL_NO_SOCK
/*-
* Initialize an HTTP server, setting up its listening BIO
* prog: the name of the current app
@@ -66,9 +66,9 @@ BIO *http_server_init(const char *prog, const char *port, int verbosity);
* The caller must free any non-NULL *preq, *ppath, and *pcbio pointers.
*/
int http_server_get_asn1_req(const ASN1_ITEM *it, ASN1_VALUE **preq,
- char **ppath, BIO **pcbio, BIO *acbio,
- int *found_keep_alive,
- const char *prog, int accept_get, int timeout);
+ char **ppath, BIO **pcbio, BIO *acbio,
+ int *found_keep_alive,
+ const char *prog, int accept_get, int timeout);
/*-
* Send an ASN.1-formatted HTTP response
@@ -82,8 +82,8 @@ int http_server_get_asn1_req(const ASN1_ITEM *it, ASN1_VALUE **preq,
* returns 1 on success, 0 on failure
*/
int http_server_send_asn1_resp(const char *prog, BIO *cbio, int keep_alive,
- const char *content_type,
- const ASN1_ITEM *it, const ASN1_VALUE *resp);
+ const char *content_type,
+ const ASN1_ITEM *it, const ASN1_VALUE *resp);
/*-
* Send a trivial HTTP response, typically to report an error or OK
@@ -94,16 +94,16 @@ int http_server_send_asn1_resp(const char *prog, BIO *cbio, int keep_alive,
* returns 1 on success, 0 on failure
*/
int http_server_send_status(const char *prog, BIO *cbio,
- int status, const char *reason);
+ int status, const char *reason);
-# endif
+#endif
-# ifdef HTTP_DAEMON
+#ifdef HTTP_DAEMON
extern int n_responders;
extern int acfd;
void socket_timeout(int signum);
void spawn_loop(const char *prog);
-# endif
+#endif
#endif
diff --git a/apps/include/log.h b/apps/include/log.h
index 1b8b58d41a..d866b90c54 100644
--- a/apps/include/log.h
+++ b/apps/include/log.h
@@ -8,25 +8,25 @@
*/
#ifndef OSSL_APPS_LOG_H
-# define OSSL_APPS_LOG_H
+#define OSSL_APPS_LOG_H
-# include <openssl/bio.h>
-# if !defined(OPENSSL_SYS_VMS) && !defined(OPENSSL_SYS_WINDOWS) \
+#include <openssl/bio.h>
+#if !defined(OPENSSL_SYS_VMS) && !defined(OPENSSL_SYS_WINDOWS) \
&& !defined(OPENSSL_NO_SOCK) && !defined(OPENSSL_NO_POSIX_IO)
-# include <syslog.h>
-# else
-# define LOG_EMERG 0
-# define LOG_ALERT 1
-# define LOG_CRIT 2
-# define LOG_ERR 3
-# define LOG_WARNING 4
-# define LOG_NOTICE 5
-# define LOG_INFO 6
-# define LOG_DEBUG 7
-# endif
+#include <syslog.h>
+#else
+#define LOG_EMERG 0
+#define LOG_ALERT 1
+#define LOG_CRIT 2
+#define LOG_ERR 3
+#define LOG_WARNING 4
+#define LOG_NOTICE 5
+#define LOG_INFO 6
+#define LOG_DEBUG 7
+#endif
-# undef LOG_TRACE
-# define LOG_TRACE (LOG_DEBUG + 1)
+#undef LOG_TRACE
+#define LOG_TRACE (LOG_DEBUG + 1)
int log_set_verbosity(const char *prog, int level);
int log_get_verbosity(void);
@@ -45,6 +45,6 @@ int log_get_verbosity(void);
* returns nothing
*/
void trace_log_message(int category,
- const char *prog, int level, const char *fmt, ...);
+ const char *prog, int level, const char *fmt, ...);
#endif /* OSSL_APPS_LOG_H */
diff --git a/apps/include/names.h b/apps/include/names.h
index f4d6f6a9a3..bf47459ade 100644
--- a/apps/include/names.h
+++ b/apps/include/names.h
@@ -10,7 +10,7 @@
#include <openssl/safestack.h>
/* Standard comparing function for names */
-int name_cmp(const char * const *a, const char * const *b);
+int name_cmp(const char *const *a, const char *const *b);
/* collect_names is meant to be used with EVP_{type}_doall_names */
void collect_names(const char *name, void *vdata);
/* Sorts and prints a stack of names to |out| */
diff --git a/apps/include/opt.h b/apps/include/opt.h
index d4fd4f115f..a2facb0252 100644
--- a/apps/include/opt.h
+++ b/apps/include/opt.h
@@ -19,301 +19,312 @@
/*
* Common verification options.
*/
-# define OPT_V_ENUM \
- OPT_V__FIRST=2000, \
- OPT_V_POLICY, OPT_V_PURPOSE, OPT_V_VERIFY_NAME, OPT_V_VERIFY_DEPTH, \
- OPT_V_ATTIME, OPT_V_VERIFY_HOSTNAME, OPT_V_VERIFY_EMAIL, \
- OPT_V_VERIFY_IP, OPT_V_IGNORE_CRITICAL, OPT_V_ISSUER_CHECKS, \
- OPT_V_CRL_CHECK, OPT_V_CRL_CHECK_ALL, OPT_V_POLICY_CHECK, \
- OPT_V_EXPLICIT_POLICY, OPT_V_INHIBIT_ANY, OPT_V_INHIBIT_MAP, \
- OPT_V_X509_STRICT, OPT_V_EXTENDED_CRL, OPT_V_USE_DELTAS, \
- OPT_V_POLICY_PRINT, OPT_V_CHECK_SS_SIG, OPT_V_TRUSTED_FIRST, \
- OPT_V_SUITEB_128_ONLY, OPT_V_SUITEB_128, OPT_V_SUITEB_192, \
- OPT_V_PARTIAL_CHAIN, OPT_V_NO_ALT_CHAINS, OPT_V_NO_CHECK_TIME, \
- OPT_V_VERIFY_AUTH_LEVEL, OPT_V_ALLOW_PROXY_CERTS, \
- OPT_V__LAST
-
-# define OPT_V_OPTIONS \
- OPT_SECTION("Validation"), \
- { "policy", OPT_V_POLICY, 's', "adds policy to the acceptable policy set"}, \
- { "purpose", OPT_V_PURPOSE, 's', \
- "certificate chain purpose"}, \
- { "verify_name", OPT_V_VERIFY_NAME, 's', "verification policy name"}, \
- { "verify_depth", OPT_V_VERIFY_DEPTH, 'n', \
- "chain depth limit" }, \
- { "auth_level", OPT_V_VERIFY_AUTH_LEVEL, 'n', \
- "chain authentication security level" }, \
- { "attime", OPT_V_ATTIME, 'M', "verification epoch time" }, \
- { "verify_hostname", OPT_V_VERIFY_HOSTNAME, 's', \
- "expected peer hostname" }, \
- { "verify_email", OPT_V_VERIFY_EMAIL, 's', \
- "expected peer email" }, \
- { "verify_ip", OPT_V_VERIFY_IP, 's', \
- "expected peer IP address" }, \
- { "ignore_critical", OPT_V_IGNORE_CRITICAL, '-', \
- "permit unhandled critical extensions"}, \
- { "issuer_checks", OPT_V_ISSUER_CHECKS, '-', "(deprecated)"}, \
- { "crl_check", OPT_V_CRL_CHECK, '-', "check leaf certificate revocation" }, \
- { "crl_check_all", OPT_V_CRL_CHECK_ALL, '-', "check full chain revocation" }, \
- { "policy_check", OPT_V_POLICY_CHECK, '-', "perform rfc5280 policy checks"}, \
- { "explicit_policy", OPT_V_EXPLICIT_POLICY, '-', \
- "set policy variable require-explicit-policy"}, \
- { "inhibit_any", OPT_V_INHIBIT_ANY, '-', \
- "set policy variable inhibit-any-policy"}, \
- { "inhibit_map", OPT_V_INHIBIT_MAP, '-', \
- "set policy variable inhibit-policy-mapping"}, \
- { "x509_strict", OPT_V_X509_STRICT, '-', \
- "disable certificate compatibility work-arounds"}, \
- { "extended_crl", OPT_V_EXTENDED_CRL, '-', \
- "enable extended CRL features"}, \
- { "use_deltas", OPT_V_USE_DELTAS, '-', \
- "use delta CRLs"}, \
- { "policy_print", OPT_V_POLICY_PRINT, '-', \
- "print policy processing diagnostics"}, \
- { "check_ss_sig", OPT_V_CHECK_SS_SIG, '-', \
- "check root CA self-signatures"}, \
- { "trusted_first", OPT_V_TRUSTED_FIRST, '-', \
- "search trust store first (default)" }, \
- { "suiteB_128_only", OPT_V_SUITEB_128_ONLY, '-', "Suite B 128-bit-only mode"}, \
- { "suiteB_128", OPT_V_SUITEB_128, '-', \
- "Suite B 128-bit mode allowing 192-bit algorithms"}, \
- { "suiteB_192", OPT_V_SUITEB_192, '-', "Suite B 192-bit-only mode" }, \
- { "partial_chain", OPT_V_PARTIAL_CHAIN, '-', \
- "accept chains anchored by intermediate trust-store CAs"}, \
- { "no_alt_chains", OPT_V_NO_ALT_CHAINS, '-', "(deprecated)" }, \
+#define OPT_V_ENUM \
+ OPT_V__FIRST = 2000, \
+ OPT_V_POLICY, OPT_V_PURPOSE, OPT_V_VERIFY_NAME, OPT_V_VERIFY_DEPTH, \
+ OPT_V_ATTIME, OPT_V_VERIFY_HOSTNAME, OPT_V_VERIFY_EMAIL, \
+ OPT_V_VERIFY_IP, OPT_V_IGNORE_CRITICAL, OPT_V_ISSUER_CHECKS, \
+ OPT_V_CRL_CHECK, OPT_V_CRL_CHECK_ALL, OPT_V_POLICY_CHECK, \
+ OPT_V_EXPLICIT_POLICY, OPT_V_INHIBIT_ANY, OPT_V_INHIBIT_MAP, \
+ OPT_V_X509_STRICT, OPT_V_EXTENDED_CRL, OPT_V_USE_DELTAS, \
+ OPT_V_POLICY_PRINT, OPT_V_CHECK_SS_SIG, OPT_V_TRUSTED_FIRST, \
+ OPT_V_SUITEB_128_ONLY, OPT_V_SUITEB_128, OPT_V_SUITEB_192, \
+ OPT_V_PARTIAL_CHAIN, OPT_V_NO_ALT_CHAINS, OPT_V_NO_CHECK_TIME, \
+ OPT_V_VERIFY_AUTH_LEVEL, OPT_V_ALLOW_PROXY_CERTS, \
+ OPT_V__LAST
+
+#define OPT_V_OPTIONS \
+ OPT_SECTION("Validation"), \
+ { "policy", OPT_V_POLICY, 's', "adds policy to the acceptable policy set" }, \
+ { "purpose", OPT_V_PURPOSE, 's', \
+ "certificate chain purpose" }, \
+ { "verify_name", OPT_V_VERIFY_NAME, 's', "verification policy name" }, \
+ { "verify_depth", OPT_V_VERIFY_DEPTH, 'n', \
+ "chain depth limit" }, \
+ { "auth_level", OPT_V_VERIFY_AUTH_LEVEL, 'n', \
+ "chain authentication security level" }, \
+ { "attime", OPT_V_ATTIME, 'M', "verification epoch time" }, \
+ { "verify_hostname", OPT_V_VERIFY_HOSTNAME, 's', \
+ "expected peer hostname" }, \
+ { "verify_email", OPT_V_VERIFY_EMAIL, 's', \
+ "expected peer email" }, \
+ { "verify_ip", OPT_V_VERIFY_IP, 's', \
+ "expected peer IP address" }, \
+ { "ignore_critical", OPT_V_IGNORE_CRITICAL, '-', \
+ "permit unhandled critical extensions" }, \
+ { "issuer_checks", OPT_V_ISSUER_CHECKS, '-', "(deprecated)" }, \
+ { "crl_check", OPT_V_CRL_CHECK, '-', "check leaf certificate revocation" }, \
+ { "crl_check_all", OPT_V_CRL_CHECK_ALL, '-', "check full chain revocation" }, \
+ { "policy_check", OPT_V_POLICY_CHECK, '-', "perform rfc5280 policy checks" }, \
+ { "explicit_policy", OPT_V_EXPLICIT_POLICY, '-', \
+ "set policy variable require-explicit-policy" }, \
+ { "inhibit_any", OPT_V_INHIBIT_ANY, '-', \
+ "set policy variable inhibit-any-policy" }, \
+ { "inhibit_map", OPT_V_INHIBIT_MAP, '-', \
+ "set policy variable inhibit-policy-mapping" }, \
+ { "x509_strict", OPT_V_X509_STRICT, '-', \
+ "disable certificate compatibility work-arounds" }, \
+ { "extended_crl", OPT_V_EXTENDED_CRL, '-', \
+ "enable extended CRL features" }, \
+ { "use_deltas", OPT_V_USE_DELTAS, '-', \
+ "use delta CRLs" }, \
+ { "policy_print", OPT_V_POLICY_PRINT, '-', \
+ "print policy processing diagnostics" }, \
+ { "check_ss_sig", OPT_V_CHECK_SS_SIG, '-', \
+ "check root CA self-signatures" }, \
+ { "trusted_first", OPT_V_TRUSTED_FIRST, '-', \
+ "search trust store first (default)" }, \
+ { "suiteB_128_only", OPT_V_SUITEB_128_ONLY, '-', "Suite B 128-bit-only mode" }, \
+ { "suiteB_128", OPT_V_SUITEB_128, '-', \
+ "Suite B 128-bit mode allowing 192-bit algorithms" }, \
+ { "suiteB_192", OPT_V_SUITEB_192, '-', "Suite B 192-bit-only mode" }, \
+ { "partial_chain", OPT_V_PARTIAL_CHAIN, '-', \
+ "accept chains anchored by intermediate trust-store CAs" }, \
+ { "no_alt_chains", OPT_V_NO_ALT_CHAINS, '-', "(deprecated)" }, \
{ "no_check_time", OPT_V_NO_CHECK_TIME, '-', "ignore certificate validity time" }, \
{ "allow_proxy_certs", OPT_V_ALLOW_PROXY_CERTS, '-', "allow the use of proxy certificates" }
-# define OPT_V_CASES \
- OPT_V__FIRST: case OPT_V__LAST: break; \
- case OPT_V_POLICY: \
- case OPT_V_PURPOSE: \
- case OPT_V_VERIFY_NAME: \
- case OPT_V_VERIFY_DEPTH: \
- case OPT_V_VERIFY_AUTH_LEVEL: \
- case OPT_V_ATTIME: \
- case OPT_V_VERIFY_HOSTNAME: \
- case OPT_V_VERIFY_EMAIL: \
- case OPT_V_VERIFY_IP: \
- case OPT_V_IGNORE_CRITICAL: \
- case OPT_V_ISSUER_CHECKS: \
- case OPT_V_CRL_CHECK: \
- case OPT_V_CRL_CHECK_ALL: \
- case OPT_V_POLICY_CHECK: \
- case OPT_V_EXPLICIT_POLICY: \
- case OPT_V_INHIBIT_ANY: \
- case OPT_V_INHIBIT_MAP: \
- case OPT_V_X509_STRICT: \
- case OPT_V_EXTENDED_CRL: \
- case OPT_V_USE_DELTAS: \
- case OPT_V_POLICY_PRINT: \
- case OPT_V_CHECK_SS_SIG: \
- case OPT_V_TRUSTED_FIRST: \
- case OPT_V_SUITEB_128_ONLY: \
- case OPT_V_SUITEB_128: \
- case OPT_V_SUITEB_192: \
- case OPT_V_PARTIAL_CHAIN: \
- case OPT_V_NO_ALT_CHAINS: \
- case OPT_V_NO_CHECK_TIME: \
- case OPT_V_ALLOW_PROXY_CERTS
+#define OPT_V_CASES \
+ OPT_V__FIRST: \
+ case OPT_V__LAST: \
+ break; \
+ case OPT_V_POLICY: \
+ case OPT_V_PURPOSE: \
+ case OPT_V_VERIFY_NAME: \
+ case OPT_V_VERIFY_DEPTH: \
+ case OPT_V_VERIFY_AUTH_LEVEL: \
+ case OPT_V_ATTIME: \
+ case OPT_V_VERIFY_HOSTNAME: \
+ case OPT_V_VERIFY_EMAIL: \
+ case OPT_V_VERIFY_IP: \
+ case OPT_V_IGNORE_CRITICAL: \
+ case OPT_V_ISSUER_CHECKS: \
+ case OPT_V_CRL_CHECK: \
+ case OPT_V_CRL_CHECK_ALL: \
+ case OPT_V_POLICY_CHECK: \
+ case OPT_V_EXPLICIT_POLICY: \
+ case OPT_V_INHIBIT_ANY: \
+ case OPT_V_INHIBIT_MAP: \
+ case OPT_V_X509_STRICT: \
+ case OPT_V_EXTENDED_CRL: \
+ case OPT_V_USE_DELTAS: \
+ case OPT_V_POLICY_PRINT: \
+ case OPT_V_CHECK_SS_SIG: \
+ case OPT_V_TRUSTED_FIRST: \
+ case OPT_V_SUITEB_128_ONLY: \
+ case OPT_V_SUITEB_128: \
+ case OPT_V_SUITEB_192: \
+ case OPT_V_PARTIAL_CHAIN: \
+ case OPT_V_NO_ALT_CHAINS: \
+ case OPT_V_NO_CHECK_TIME: \
+ case OPT_V_ALLOW_PROXY_CERTS
/*
* Common "extended validation" options.
*/
-# define OPT_X_ENUM \
- OPT_X__FIRST=1000, \
- OPT_X_KEY, OPT_X_CERT, OPT_X_CHAIN, OPT_X_CHAIN_BUILD, \
- OPT_X_CERTFORM, OPT_X_KEYFORM, \
- OPT_X__LAST
-
-# define OPT_X_OPTIONS \
- OPT_SECTION("Extended certificate"), \
- { "xkey", OPT_X_KEY, '<', "key for Extended certificates"}, \
- { "xcert", OPT_X_CERT, '<', "cert for Extended certificates"}, \
- { "xchain", OPT_X_CHAIN, '<', "chain for Extended certificates"}, \
- { "xchain_build", OPT_X_CHAIN_BUILD, '-', \
- "build certificate chain for the extended certificates"}, \
- { "xcertform", OPT_X_CERTFORM, 'F', \
+#define OPT_X_ENUM \
+ OPT_X__FIRST = 1000, \
+ OPT_X_KEY, OPT_X_CERT, OPT_X_CHAIN, OPT_X_CHAIN_BUILD, \
+ OPT_X_CERTFORM, OPT_X_KEYFORM, \
+ OPT_X__LAST
+
+#define OPT_X_OPTIONS \
+ OPT_SECTION("Extended certificate"), \
+ { "xkey", OPT_X_KEY, '<', "key for Extended certificates" }, \
+ { "xcert", OPT_X_CERT, '<', "cert for Extended certificates" }, \
+ { "xchain", OPT_X_CHAIN, '<', "chain for Extended certificates" }, \
+ { "xchain_build", OPT_X_CHAIN_BUILD, '-', \
+ "build certificate chain for the extended certificates" }, \
+ { "xcertform", OPT_X_CERTFORM, 'F', \
"format of Extended certificate (PEM/DER/P12); has no effect" }, \
- { "xkeyform", OPT_X_KEYFORM, 'F', \
- "format of Extended certificate's key (DER/PEM/P12); has no effect"}
-
-# define OPT_X_CASES \
- OPT_X__FIRST: case OPT_X__LAST: break; \
- case OPT_X_KEY: \
- case OPT_X_CERT: \
- case OPT_X_CHAIN: \
- case OPT_X_CHAIN_BUILD: \
- case OPT_X_CERTFORM: \
- case OPT_X_KEYFORM
+ { "xkeyform", OPT_X_KEYFORM, 'F', \
+ "format of Extended certificate's key (DER/PEM/P12); has no effect" }
+
+#define OPT_X_CASES \
+ OPT_X__FIRST: \
+ case OPT_X__LAST: \
+ break; \
+ case OPT_X_KEY: \
+ case OPT_X_CERT: \
+ case OPT_X_CHAIN: \
+ case OPT_X_CHAIN_BUILD: \
+ case OPT_X_CERTFORM: \
+ case OPT_X_KEYFORM
/*
* Common SSL options.
* Any changes here must be coordinated with ../ssl/ssl_conf.c
*/
-# define OPT_S_ENUM \
- OPT_S__FIRST=3000, \
- OPT_S_NOSSL3, OPT_S_NOTLS1, OPT_S_NOTLS1_1, OPT_S_NOTLS1_2, \
- OPT_S_NOTLS1_3, OPT_S_BUGS, OPT_S_NO_COMP, OPT_S_NOTICKET, \
- OPT_S_SERVERPREF, OPT_S_LEGACYRENEG, OPT_S_CLIENTRENEG, \
- OPT_S_LEGACYCONN, \
- OPT_S_ONRESUMP, OPT_S_NOLEGACYCONN, \
- OPT_S_ALLOW_NO_DHE_KEX, OPT_S_PREFER_NO_DHE_KEX, \
- OPT_S_PRIORITIZE_CHACHA, \
- OPT_S_STRICT, OPT_S_SIGALGS, OPT_S_CLIENTSIGALGS, OPT_S_GROUPS, \
- OPT_S_CURVES, OPT_S_NAMEDCURVE, OPT_S_CIPHER, OPT_S_CIPHERSUITES, \
- OPT_S_RECORD_PADDING, OPT_S_DEBUGBROKE, OPT_S_COMP, \
- OPT_S_MINPROTO, OPT_S_MAXPROTO, \
- OPT_S_NO_RENEGOTIATION, OPT_S_NO_MIDDLEBOX, OPT_S_NO_ETM, \
- OPT_S_NO_EMS, \
- OPT_S_NO_TX_CERT_COMP, \
- OPT_S_NO_RX_CERT_COMP, \
- OPT_S__LAST
-
-# define OPT_S_OPTIONS \
- OPT_SECTION("TLS/SSL"), \
- {"no_ssl3", OPT_S_NOSSL3, '-',"Just disable SSLv3" }, \
- {"no_tls1", OPT_S_NOTLS1, '-', "Just disable TLSv1"}, \
- {"no_tls1_1", OPT_S_NOTLS1_1, '-', "Just disable TLSv1.1" }, \
- {"no_tls1_2", OPT_S_NOTLS1_2, '-', "Just disable TLSv1.2"}, \
- {"no_tls1_3", OPT_S_NOTLS1_3, '-', "Just disable TLSv1.3"}, \
- {"bugs", OPT_S_BUGS, '-', "Turn on SSL bug compatibility"}, \
- {"no_comp", OPT_S_NO_COMP, '-', "Disable SSL/TLS compression (default)" }, \
- {"comp", OPT_S_COMP, '-', "Use SSL/TLS-level compression" }, \
- {"no_tx_cert_comp", OPT_S_NO_TX_CERT_COMP, '-', "Disable sending TLSv1.3 compressed certificates" }, \
- {"no_rx_cert_comp", OPT_S_NO_RX_CERT_COMP, '-', "Disable receiving TLSv1.3 compressed certificates" }, \
- {"no_ticket", OPT_S_NOTICKET, '-', \
- "Disable use of TLS session tickets"}, \
- {"serverpref", OPT_S_SERVERPREF, '-', "Use server's cipher preferences"}, \
- {"legacy_renegotiation", OPT_S_LEGACYRENEG, '-', \
- "Enable use of legacy renegotiation (dangerous)"}, \
- {"client_renegotiation", OPT_S_CLIENTRENEG, '-', \
- "Allow client-initiated renegotiation" }, \
- {"no_renegotiation", OPT_S_NO_RENEGOTIATION, '-', \
- "Disable all renegotiation."}, \
- {"legacy_server_connect", OPT_S_LEGACYCONN, '-', \
- "Allow initial connection to servers that don't support RI"}, \
- {"no_resumption_on_reneg", OPT_S_ONRESUMP, '-', \
- "Disallow session resumption on renegotiation"}, \
- {"no_legacy_server_connect", OPT_S_NOLEGACYCONN, '-', \
- "Disallow initial connection to servers that don't support RI"}, \
- {"allow_no_dhe_kex", OPT_S_ALLOW_NO_DHE_KEX, '-', \
- "In TLSv1.3 allow non-(ec)dhe based key exchange on resumption"}, \
- {"prefer_no_dhe_kex", OPT_S_PREFER_NO_DHE_KEX, '-', \
- "In TLSv1.3 prefer non-(ec)dhe over (ec)dhe-based key exchange on resumption"}, \
- {"prioritize_chacha", OPT_S_PRIORITIZE_CHACHA, '-', \
- "Prioritize ChaCha ciphers when preferred by clients"}, \
- {"strict", OPT_S_STRICT, '-', \
- "Enforce strict certificate checks as per TLS standard"}, \
- {"sigalgs", OPT_S_SIGALGS, 's', \
- "Signature algorithms to support (colon-separated list)" }, \
- {"client_sigalgs", OPT_S_CLIENTSIGALGS, 's', \
- "Signature algorithms to support for client certificate" \
- " authentication (colon-separated list)" }, \
- {"groups", OPT_S_GROUPS, 's', \
- "Groups to advertise (colon-separated list)" }, \
- {"curves", OPT_S_CURVES, 's', \
- "Groups to advertise (colon-separated list)" }, \
- {"named_curve", OPT_S_NAMEDCURVE, 's', \
- "Elliptic curve used for ECDHE (server-side only)" }, \
- {"cipher", OPT_S_CIPHER, 's', "Specify TLSv1.2 and below cipher list to be used"}, \
- {"ciphersuites", OPT_S_CIPHERSUITES, 's', "Specify TLSv1.3 ciphersuites to be used"}, \
- {"min_protocol", OPT_S_MINPROTO, 's', "Specify the minimum protocol version to be used"}, \
- {"max_protocol", OPT_S_MAXPROTO, 's', "Specify the maximum protocol version to be used"}, \
- {"record_padding", OPT_S_RECORD_PADDING, 's', \
- "Block size to pad TLS 1.3 records to."}, \
- {"debug_broken_protocol", OPT_S_DEBUGBROKE, '-', \
- "Perform all sorts of protocol violations for testing purposes"}, \
- {"no_middlebox", OPT_S_NO_MIDDLEBOX, '-', \
- "Disable TLSv1.3 middlebox compat mode" }, \
- {"no_etm", OPT_S_NO_ETM, '-', \
- "Disable Encrypt-then-Mac extension"}, \
- {"no_ems", OPT_S_NO_EMS, '-', \
- "Disable Extended master secret extension"}
-
-# define OPT_S_CASES \
- OPT_S__FIRST: case OPT_S__LAST: break; \
- case OPT_S_NOSSL3: \
- case OPT_S_NOTLS1: \
- case OPT_S_NOTLS1_1: \
- case OPT_S_NOTLS1_2: \
- case OPT_S_NOTLS1_3: \
- case OPT_S_BUGS: \
- case OPT_S_NO_COMP: \
- case OPT_S_COMP: \
- case OPT_S_NO_TX_CERT_COMP: \
- case OPT_S_NO_RX_CERT_COMP: \
- case OPT_S_NOTICKET: \
- case OPT_S_SERVERPREF: \
- case OPT_S_LEGACYRENEG: \
- case OPT_S_CLIENTRENEG: \
- case OPT_S_LEGACYCONN: \
- case OPT_S_ONRESUMP: \
- case OPT_S_NOLEGACYCONN: \
- case OPT_S_ALLOW_NO_DHE_KEX: \
- case OPT_S_PREFER_NO_DHE_KEX: \
- case OPT_S_PRIORITIZE_CHACHA: \
- case OPT_S_STRICT: \
- case OPT_S_SIGALGS: \
- case OPT_S_CLIENTSIGALGS: \
- case OPT_S_GROUPS: \
- case OPT_S_CURVES: \
- case OPT_S_NAMEDCURVE: \
- case OPT_S_CIPHER: \
- case OPT_S_CIPHERSUITES: \
- case OPT_S_RECORD_PADDING: \
- case OPT_S_NO_RENEGOTIATION: \
- case OPT_S_MINPROTO: \
- case OPT_S_MAXPROTO: \
- case OPT_S_DEBUGBROKE: \
- case OPT_S_NO_MIDDLEBOX: \
- case OPT_S_NO_ETM: \
- case OPT_S_NO_EMS
-
-#define IS_NO_PROT_FLAG(o) \
- (o == OPT_S_NOSSL3 || o == OPT_S_NOTLS1 || o == OPT_S_NOTLS1_1 \
- || o == OPT_S_NOTLS1_2 || o == OPT_S_NOTLS1_3)
+#define OPT_S_ENUM \
+ OPT_S__FIRST = 3000, \
+ OPT_S_NOSSL3, OPT_S_NOTLS1, OPT_S_NOTLS1_1, OPT_S_NOTLS1_2, \
+ OPT_S_NOTLS1_3, OPT_S_BUGS, OPT_S_NO_COMP, OPT_S_NOTICKET, \
+ OPT_S_SERVERPREF, OPT_S_LEGACYRENEG, OPT_S_CLIENTRENEG, \
+ OPT_S_LEGACYCONN, \
+ OPT_S_ONRESUMP, OPT_S_NOLEGACYCONN, \
+ OPT_S_ALLOW_NO_DHE_KEX, OPT_S_PREFER_NO_DHE_KEX, \
+ OPT_S_PRIORITIZE_CHACHA, \
+ OPT_S_STRICT, OPT_S_SIGALGS, OPT_S_CLIENTSIGALGS, OPT_S_GROUPS, \
+ OPT_S_CURVES, OPT_S_NAMEDCURVE, OPT_S_CIPHER, OPT_S_CIPHERSUITES, \
+ OPT_S_RECORD_PADDING, OPT_S_DEBUGBROKE, OPT_S_COMP, \
+ OPT_S_MINPROTO, OPT_S_MAXPROTO, \
+ OPT_S_NO_RENEGOTIATION, OPT_S_NO_MIDDLEBOX, OPT_S_NO_ETM, \
+ OPT_S_NO_EMS, \
+ OPT_S_NO_TX_CERT_COMP, \
+ OPT_S_NO_RX_CERT_COMP, \
+ OPT_S__LAST
+
+#define OPT_S_OPTIONS \
+ OPT_SECTION("TLS/SSL"), \
+ { "no_ssl3", OPT_S_NOSSL3, '-', "Just disable SSLv3" }, \
+ { "no_tls1", OPT_S_NOTLS1, '-', "Just disable TLSv1" }, \
+ { "no_tls1_1", OPT_S_NOTLS1_1, '-', "Just disable TLSv1.1" }, \
+ { "no_tls1_2", OPT_S_NOTLS1_2, '-', "Just disable TLSv1.2" }, \
+ { "no_tls1_3", OPT_S_NOTLS1_3, '-', "Just disable TLSv1.3" }, \
+ { "bugs", OPT_S_BUGS, '-', "Turn on SSL bug compatibility" }, \
+ { "no_comp", OPT_S_NO_COMP, '-', "Disable SSL/TLS compression (default)" }, \
+ { "comp", OPT_S_COMP, '-', "Use SSL/TLS-level compression" }, \
+ { "no_tx_cert_comp", OPT_S_NO_TX_CERT_COMP, '-', "Disable sending TLSv1.3 compressed certificates" }, \
+ { "no_rx_cert_comp", OPT_S_NO_RX_CERT_COMP, '-', "Disable receiving TLSv1.3 compressed certificates" }, \
+ { "no_ticket", OPT_S_NOTICKET, '-', \
+ "Disable use of TLS session tickets" }, \
+ { "serverpref", OPT_S_SERVERPREF, '-', "Use server's cipher preferences" }, \
+ { "legacy_renegotiation", OPT_S_LEGACYRENEG, '-', \
+ "Enable use of legacy renegotiation (dangerous)" }, \
+ { "client_renegotiation", OPT_S_CLIENTRENEG, '-', \
+ "Allow client-initiated renegotiation" }, \
+ { "no_renegotiation", OPT_S_NO_RENEGOTIATION, '-', \
+ "Disable all renegotiation." }, \
+ { "legacy_server_connect", OPT_S_LEGACYCONN, '-', \
+ "Allow initial connection to servers that don't support RI" }, \
+ { "no_resumption_on_reneg", OPT_S_ONRESUMP, '-', \
+ "Disallow session resumption on renegotiation" }, \
+ { "no_legacy_server_connect", OPT_S_NOLEGACYCONN, '-', \
+ "Disallow initial connection to servers that don't support RI" }, \
+ { "allow_no_dhe_kex", OPT_S_ALLOW_NO_DHE_KEX, '-', \
+ "In TLSv1.3 allow non-(ec)dhe based key exchange on resumption" }, \
+ { "prefer_no_dhe_kex", OPT_S_PREFER_NO_DHE_KEX, '-', \
+ "In TLSv1.3 prefer non-(ec)dhe over (ec)dhe-based key exchange on resumption" }, \
+ { "prioritize_chacha", OPT_S_PRIORITIZE_CHACHA, '-', \
+ "Prioritize ChaCha ciphers when preferred by clients" }, \
+ { "strict", OPT_S_STRICT, '-', \
+ "Enforce strict certificate checks as per TLS standard" }, \
+ { "sigalgs", OPT_S_SIGALGS, 's', \
+ "Signature algorithms to support (colon-separated list)" }, \
+ { "client_sigalgs", OPT_S_CLIENTSIGALGS, 's', \
+ "Signature algorithms to support for client certificate" \
+ " authentication (colon-separated list)" }, \
+ { "groups", OPT_S_GROUPS, 's', \
+ "Groups to advertise (colon-separated list)" }, \
+ { "curves", OPT_S_CURVES, 's', \
+ "Groups to advertise (colon-separated list)" }, \
+ { "named_curve", OPT_S_NAMEDCURVE, 's', \
+ "Elliptic curve used for ECDHE (server-side only)" }, \
+ { "cipher", OPT_S_CIPHER, 's', "Specify TLSv1.2 and below cipher list to be used" }, \
+ { "ciphersuites", OPT_S_CIPHERSUITES, 's', "Specify TLSv1.3 ciphersuites to be used" }, \
+ { "min_protocol", OPT_S_MINPROTO, 's', "Specify the minimum protocol version to be used" }, \
+ { "max_protocol", OPT_S_MAXPROTO, 's', "Specify the maximum protocol version to be used" }, \
+ { "record_padding", OPT_S_RECORD_PADDING, 's', \
+ "Block size to pad TLS 1.3 records to." }, \
+ { "debug_broken_protocol", OPT_S_DEBUGBROKE, '-', \
+ "Perform all sorts of protocol violations for testing purposes" }, \
+ { "no_middlebox", OPT_S_NO_MIDDLEBOX, '-', \
+ "Disable TLSv1.3 middlebox compat mode" }, \
+ { "no_etm", OPT_S_NO_ETM, '-', \
+ "Disable Encrypt-then-Mac extension" }, \
+ { "no_ems", OPT_S_NO_EMS, '-', \
+ "Disable Extended master secret extension" }
+
+#define OPT_S_CASES \
+ OPT_S__FIRST: \
+ case OPT_S__LAST: \
+ break; \
+ case OPT_S_NOSSL3: \
+ case OPT_S_NOTLS1: \
+ case OPT_S_NOTLS1_1: \
+ case OPT_S_NOTLS1_2: \
+ case OPT_S_NOTLS1_3: \
+ case OPT_S_BUGS: \
+ case OPT_S_NO_COMP: \
+ case OPT_S_COMP: \
+ case OPT_S_NO_TX_CERT_COMP: \
+ case OPT_S_NO_RX_CERT_COMP: \
+ case OPT_S_NOTICKET: \
+ case OPT_S_SERVERPREF: \
+ case OPT_S_LEGACYRENEG: \
+ case OPT_S_CLIENTRENEG: \
+ case OPT_S_LEGACYCONN: \
+ case OPT_S_ONRESUMP: \
+ case OPT_S_NOLEGACYCONN: \
+ case OPT_S_ALLOW_NO_DHE_KEX: \
+ case OPT_S_PREFER_NO_DHE_KEX: \
+ case OPT_S_PRIORITIZE_CHACHA: \
+ case OPT_S_STRICT: \
+ case OPT_S_SIGALGS: \
+ case OPT_S_CLIENTSIGALGS: \
+ case OPT_S_GROUPS: \
+ case OPT_S_CURVES: \
+ case OPT_S_NAMEDCURVE: \
+ case OPT_S_CIPHER: \
+ case OPT_S_CIPHERSUITES: \
+ case OPT_S_RECORD_PADDING: \
+ case OPT_S_NO_RENEGOTIATION: \
+ case OPT_S_MINPROTO: \
+ case OPT_S_MAXPROTO: \
+ case OPT_S_DEBUGBROKE: \
+ case OPT_S_NO_MIDDLEBOX: \
+ case OPT_S_NO_ETM: \
+ case OPT_S_NO_EMS
+
+#define IS_NO_PROT_FLAG(o) \
+ (o == OPT_S_NOSSL3 || o == OPT_S_NOTLS1 || o == OPT_S_NOTLS1_1 \
+ || o == OPT_S_NOTLS1_2 || o == OPT_S_NOTLS1_3)
/*
* Random state options.
*/
-# define OPT_R_ENUM \
- OPT_R__FIRST=1500, OPT_R_RAND, OPT_R_WRITERAND, OPT_R__LAST
+#define OPT_R_ENUM \
+ OPT_R__FIRST = 1500, OPT_R_RAND, OPT_R_WRITERAND, OPT_R__LAST
-# define OPT_R_OPTIONS \
- OPT_SECTION("Random state"), \
- {"rand", OPT_R_RAND, 's', "Load the given file(s) into the random number generator"}, \
- {"writerand", OPT_R_WRITERAND, '>', "Write random data to the specified file"}
+#define OPT_R_OPTIONS \
+ OPT_SECTION("Random state"), \
+ { "rand", OPT_R_RAND, 's', "Load the given file(s) into the random number generator" }, \
+ { "writerand", OPT_R_WRITERAND, '>', "Write random data to the specified file" }
-# define OPT_R_CASES \
- OPT_R__FIRST: case OPT_R__LAST: break; \
- case OPT_R_RAND: case OPT_R_WRITERAND
+#define OPT_R_CASES \
+ OPT_R__FIRST: \
+ case OPT_R__LAST: \
+ break; \
+ case OPT_R_RAND: \
+ case OPT_R_WRITERAND
/*
* Provider options.
*/
-# define OPT_PROV_ENUM \
- OPT_PROV__FIRST=1600, \
- OPT_PROV_PROVIDER, OPT_PROV_PROVIDER_PATH, OPT_PROV_PROPQUERY, \
- OPT_PROV_PARAM, \
- OPT_PROV__LAST
+#define OPT_PROV_ENUM \
+ OPT_PROV__FIRST = 1600, \
+ OPT_PROV_PROVIDER, OPT_PROV_PROVIDER_PATH, OPT_PROV_PROPQUERY, \
+ OPT_PROV_PARAM, \
+ OPT_PROV__LAST
-# define OPT_CONFIG_OPTION \
- { "config", OPT_CONFIG, '<', "Load a configuration file (this may load modules)" }
+#define OPT_CONFIG_OPTION \
+ { "config", OPT_CONFIG, '<', "Load a configuration file (this may load modules)" }
-# define OPT_PROV_OPTIONS \
- OPT_SECTION("Provider"), \
+#define OPT_PROV_OPTIONS \
+ OPT_SECTION("Provider"), \
{ "provider-path", OPT_PROV_PROVIDER_PATH, 's', "Provider load path (must be before 'provider' argument if required)" }, \
- { "provider", OPT_PROV_PROVIDER, 's', "Provider to load (can be specified multiple times)" }, \
- { "provparam", OPT_PROV_PARAM, 's', "Set a provider key-value parameter" }, \
+ { "provider", OPT_PROV_PROVIDER, 's', "Provider to load (can be specified multiple times)" }, \
+ { "provparam", OPT_PROV_PARAM, 's', "Set a provider key-value parameter" }, \
{ "propquery", OPT_PROV_PROPQUERY, 's', "Property query used when fetching algorithms" }
-# define OPT_PROV_CASES \
- OPT_PROV__FIRST: case OPT_PROV__LAST: break; \
- case OPT_PROV_PROVIDER: \
- case OPT_PROV_PROVIDER_PATH: \
- case OPT_PROV_PARAM: \
- case OPT_PROV_PROPQUERY
+#define OPT_PROV_CASES \
+ OPT_PROV__FIRST: \
+ case OPT_PROV__LAST: \
+ break; \
+ case OPT_PROV_PROVIDER: \
+ case OPT_PROV_PROVIDER_PATH: \
+ case OPT_PROV_PARAM: \
+ case OPT_PROV_PROPQUERY
/*
* Option parsing.
@@ -366,24 +377,21 @@ typedef struct string_int_pair_st {
} OPT_PAIR, STRINT_PAIR;
/* Flags to pass into opt_format; see FORMAT_xxx, below. */
-# define OPT_FMT_PEM (1L << 1)
-# define OPT_FMT_DER (1L << 2)
-# define OPT_FMT_B64 (1L << 3)
-# define OPT_FMT_PKCS12 (1L << 4)
-# define OPT_FMT_SMIME (1L << 5)
-# define OPT_FMT_MSBLOB (1L << 7)
-# define OPT_FMT_NSS (1L << 8)
-# define OPT_FMT_TEXT (1L << 9)
-# define OPT_FMT_HTTP (1L << 10)
-# define OPT_FMT_PVK (1L << 11)
-
-# define OPT_FMT_PEMDER (OPT_FMT_PEM | OPT_FMT_DER)
-# define OPT_FMT_ASN1 (OPT_FMT_PEM | OPT_FMT_DER | OPT_FMT_B64)
-# define OPT_FMT_PDS (OPT_FMT_PEMDER | OPT_FMT_SMIME)
-# define OPT_FMT_ANY (OPT_FMT_PEM | OPT_FMT_DER | OPT_FMT_B64 | \
- OPT_FMT_PKCS12 | OPT_FMT_SMIME | \
- OPT_FMT_MSBLOB | OPT_FMT_NSS | \
- OPT_FMT_TEXT | OPT_FMT_HTTP | OPT_FMT_PVK)
+#define OPT_FMT_PEM (1L << 1)
+#define OPT_FMT_DER (1L << 2)
+#define OPT_FMT_B64 (1L << 3)
+#define OPT_FMT_PKCS12 (1L << 4)
+#define OPT_FMT_SMIME (1L << 5)
+#define OPT_FMT_MSBLOB (1L << 7)
+#define OPT_FMT_NSS (1L << 8)
+#define OPT_FMT_TEXT (1L << 9)
+#define OPT_FMT_HTTP (1L << 10)
+#define OPT_FMT_PVK (1L << 11)
+
+#define OPT_FMT_PEMDER (OPT_FMT_PEM | OPT_FMT_DER)
+#define OPT_FMT_ASN1 (OPT_FMT_PEM | OPT_FMT_DER | OPT_FMT_B64)
+#define OPT_FMT_PDS (OPT_FMT_PEMDER | OPT_FMT_SMIME)
+#define OPT_FMT_ANY (OPT_FMT_PEM | OPT_FMT_DER | OPT_FMT_B64 | OPT_FMT_PKCS12 | OPT_FMT_SMIME | OPT_FMT_MSBLOB | OPT_FMT_NSS | OPT_FMT_TEXT | OPT_FMT_HTTP | OPT_FMT_PVK)
/* Divide options into sections when displaying usage */
#define OPT_SECTION(sec) { OPT_SECTION_STR, 1, '-', sec " options:\n" }
@@ -433,5 +441,4 @@ char **opt_rest(void);
int opt_num_rest(void);
int opt_check_rest_arg(const char *expected);
-
#endif /* OSSL_APPS_OPT_H */
diff --git a/apps/include/platform.h b/apps/include/platform.h
index 62fc99c5fd..ec12a41af7 100644
--- a/apps/include/platform.h
+++ b/apps/include/platform.h
@@ -8,25 +8,25 @@
*/
#ifndef OSSL_APPS_PLATFORM_H
-# define OSSL_APPS_PLATFORM_H
+#define OSSL_APPS_PLATFORM_H
-# include <openssl/e_os2.h>
+#include <openssl/e_os2.h>
-# if defined(OPENSSL_SYS_VMS) && defined(__DECC)
+#if defined(OPENSSL_SYS_VMS) && defined(__DECC)
/*
* VMS C only for now, implemented in vms_decc_init.c
* If other C compilers forget to terminate argv with NULL, this function
* can be reused.
*/
char **copy_argv(int *argc, char *argv[]);
-# endif
+#endif
-# ifdef _WIN32
+#ifdef _WIN32
/*
* Win32-specific argv initialization that splits OS-supplied UNICODE
* command line string to array of UTF8-encoded strings.
*/
void win32_utf8argv(int *argc, char **argv[]);
-# endif
+#endif
#endif
diff --git a/apps/include/s_apps.h b/apps/include/s_apps.h
index 33c3b6278c..c6a9a890c2 100644
--- a/apps/include/s_apps.h
+++ b/apps/include/s_apps.h
@@ -12,8 +12,8 @@
#include <openssl/ssl.h>
#include <openssl/srp.h>
-#define PORT "4433"
-#define PROTOCOL "tcp"
+#define PORT "4433"
+#define PROTOCOL "tcp"
#define SSL_VERSION_ALLOWS_RENEGOTIATION(s) \
(SSL_is_dtls(s) || (SSL_version(s) < TLS1_3_VERSION))
@@ -22,48 +22,48 @@ typedef int (*do_server_cb)(int s, int stype, int prot, unsigned char *context);
void get_sock_info_address(int asock, char **hostname, char **service);
int report_server_accept(BIO *out, int asock, int with_address, int with_pid);
int do_server(int *accept_sock, const char *host, const char *port,
- int family, int type, int protocol, do_server_cb cb,
- unsigned char *context, int naccept, BIO *bio_s_out,
- int tfo);
+ int family, int type, int protocol, do_server_cb cb,
+ unsigned char *context, int naccept, BIO *bio_s_out,
+ int tfo);
int verify_callback(int ok, X509_STORE_CTX *ctx);
int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file);
int set_cert_key_stuff(SSL_CTX *ctx, X509 *cert, EVP_PKEY *key,
- STACK_OF(X509) *chain, int build_chain);
+ STACK_OF(X509) *chain, int build_chain);
int ssl_print_sigalgs(BIO *out, SSL *s);
int ssl_print_point_formats(BIO *out, SSL *s);
int ssl_print_groups(BIO *out, SSL *s, int noshared);
int ssl_print_tmp_key(BIO *out, SSL *s);
int init_client(int *sock, const char *host, const char *port,
- const char *bindhost, const char *bindport,
- int family, int type, int protocol, int tfo, int doconn,
- BIO_ADDR **ba_ret);
+ const char *bindhost, const char *bindport,
+ int family, int type, int protocol, int tfo, int doconn,
+ BIO_ADDR **ba_ret);
int should_retry(int i);
void do_ssl_shutdown(SSL *ssl);
long bio_dump_callback(BIO *bio, int cmd, const char *argp, size_t len,
- int argi, long argl, int ret, size_t *processed);
+ int argi, long argl, int ret, size_t *processed);
void apps_ssl_info_callback(const SSL *s, int where, int ret);
void msg_cb(int write_p, int version, int content_type, const void *buf,
- size_t len, SSL *ssl, void *arg);
+ size_t len, SSL *ssl, void *arg);
void tlsext_cb(SSL *s, int client_server, int type, const unsigned char *data,
- int len, void *arg);
+ int len, void *arg);
int generate_cookie_callback(SSL *ssl, unsigned char *cookie,
- unsigned int *cookie_len);
+ unsigned int *cookie_len);
int verify_cookie_callback(SSL *ssl, const unsigned char *cookie,
- unsigned int cookie_len);
+ unsigned int cookie_len);
-#ifdef __VMS /* 31 char symbol name limit */
-# define generate_stateless_cookie_callback generate_stateless_cookie_cb
-# define verify_stateless_cookie_callback verify_stateless_cookie_cb
+#ifdef __VMS /* 31 char symbol name limit */
+#define generate_stateless_cookie_callback generate_stateless_cookie_cb
+#define verify_stateless_cookie_callback verify_stateless_cookie_cb
#endif
int generate_stateless_cookie_callback(SSL *ssl, unsigned char *cookie,
- size_t *cookie_len);
+ size_t *cookie_len);
int verify_stateless_cookie_callback(SSL *ssl, const unsigned char *cookie,
- size_t cookie_len);
+ size_t cookie_len);
typedef struct ssl_excert_st SSL_EXCERT;
@@ -75,12 +75,12 @@ void print_verify_detail(SSL *s, BIO *bio);
void print_ssl_summary(SSL *s);
int config_ctx(SSL_CONF_CTX *cctx, STACK_OF(OPENSSL_STRING) *str, SSL_CTX *ctx);
int ssl_ctx_add_crls(SSL_CTX *ctx, STACK_OF(X509_CRL) *crls,
- int crl_download);
+ int crl_download);
int ssl_load_stores(SSL_CTX *ctx, const char *vfyCApath,
- const char *vfyCAfile, const char *vfyCAstore,
- const char *chCApath, const char *chCAfile,
- const char *chCAstore, STACK_OF(X509_CRL) *crls,
- int crl_download);
+ const char *vfyCAfile, const char *vfyCAstore,
+ const char *chCApath, const char *chCAfile,
+ const char *chCAstore, STACK_OF(X509_CRL) *crls,
+ int crl_download);
void ssl_ctx_security_debug(SSL_CTX *ctx, int verbose);
int set_keylog_file(SSL_CTX *ctx, const char *keylog_file);
void print_ca_names(BIO *bio, SSL *s);
@@ -91,14 +91,14 @@ void ssl_print_secure_renegotiation_notes(BIO *bio, SSL *s);
typedef struct srp_arg_st {
char *srppassin;
char *srplogin;
- int msg; /* copy from c_msg */
- int debug; /* copy from c_debug */
- int amp; /* allow more groups */
- int strength; /* minimal size for N */
+ int msg; /* copy from c_msg */
+ int debug; /* copy from c_debug */
+ int amp; /* allow more groups */
+ int strength; /* minimal size for N */
} SRP_ARG;
int set_up_srp_arg(SSL_CTX *ctx, SRP_ARG *srp_arg, int srp_lateuser, int c_msg,
- int c_debug);
+ int c_debug);
void set_up_dummy_srp(SSL_CTX *ctx);
/* The server side SRP context that we pass to all SRP related callbacks */
@@ -109,6 +109,6 @@ typedef struct srpsrvparm_st {
} srpsrvparm;
int set_up_srp_verifier_file(SSL_CTX *ctx, srpsrvparm *srp_callback_parm,
- char *srpuserseed, char *srp_verifier_file);
+ char *srpuserseed, char *srp_verifier_file);
void lookup_srp_user(srpsrvparm *srp_callback_parm, BIO *bio_s_out);
#endif /* OPENSSL_NO_SRP */
diff --git a/apps/include/vms_term_sock.h b/apps/include/vms_term_sock.h
index eae37b1af9..6e0cda9a30 100644
--- a/apps/include/vms_term_sock.h
+++ b/apps/include/vms_term_sock.h
@@ -9,23 +9,23 @@
*/
#ifndef OSSL_APPS_VMS_TERM_SOCK_H
-# define OSSL_APPS_VMS_TERM_SOCK_H
+#define OSSL_APPS_VMS_TERM_SOCK_H
/*
** Terminal Socket Function Codes
*/
-# define TERM_SOCK_CREATE 1
-# define TERM_SOCK_DELETE 2
+#define TERM_SOCK_CREATE 1
+#define TERM_SOCK_DELETE 2
/*
** Terminal Socket Status Codes
*/
-# define TERM_SOCK_FAILURE 0
-# define TERM_SOCK_SUCCESS 1
+#define TERM_SOCK_FAILURE 0
+#define TERM_SOCK_SUCCESS 1
/*
** Terminal Socket Prototype
*/
-int TerminalSocket (int FunctionCode, int *ReturnSocket);
+int TerminalSocket(int FunctionCode, int *ReturnSocket);
#endif
diff --git a/apps/info.c b/apps/info.c
index b3115d11d9..15316c1eb0 100644
--- a/apps/info.c
+++ b/apps/info.c
@@ -13,26 +13,32 @@
typedef enum OPTION_choice {
OPT_COMMON,
- OPT_CONFIGDIR, OPT_MODULESDIR, OPT_DSOEXT, OPT_DIRNAMESEP,
- OPT_LISTSEP, OPT_SEEDS, OPT_CPUSETTINGS, OPT_WINDOWSCONTEXT
+ OPT_CONFIGDIR,
+ OPT_MODULESDIR,
+ OPT_DSOEXT,
+ OPT_DIRNAMESEP,
+ OPT_LISTSEP,
+ OPT_SEEDS,
+ OPT_CPUSETTINGS,
+ OPT_WINDOWSCONTEXT
} OPTION_CHOICE;
const OPTIONS info_options[] = {
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
+ { "help", OPT_HELP, '-', "Display this summary" },
OPT_SECTION("Output"),
- {"configdir", OPT_CONFIGDIR, '-', "Default configuration file directory"},
- {"modulesdir", OPT_MODULESDIR, '-',
- "Default module directory (other than engine modules)"},
- {"dsoext", OPT_DSOEXT, '-', "Configured extension for modules"},
- {"dirnamesep", OPT_DIRNAMESEP, '-', "Directory-filename separator"},
- {"listsep", OPT_LISTSEP, '-', "List separator character"},
- {"seeds", OPT_SEEDS, '-', "Seed sources"},
- {"cpusettings", OPT_CPUSETTINGS, '-', "CPU settings info"},
- {"windowscontext", OPT_WINDOWSCONTEXT, '-', "Windows install context"},
- {NULL}
+ { "configdir", OPT_CONFIGDIR, '-', "Default configuration file directory" },
+ { "modulesdir", OPT_MODULESDIR, '-',
+ "Default module directory (other than engine modules)" },
+ { "dsoext", OPT_DSOEXT, '-', "Configured extension for modules" },
+ { "dirnamesep", OPT_DIRNAMESEP, '-', "Directory-filename separator" },
+ { "listsep", OPT_LISTSEP, '-', "List separator character" },
+ { "seeds", OPT_SEEDS, '-', "Seed sources" },
+ { "cpusettings", OPT_CPUSETTINGS, '-', "CPU settings info" },
+ { "windowscontext", OPT_WINDOWSCONTEXT, '-', "Windows install context" },
+ { NULL }
};
int info_main(int argc, char **argv)
@@ -46,7 +52,7 @@ int info_main(int argc, char **argv)
while ((o = opt_next()) != OPT_EOF) {
switch (o) {
default:
-opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
case OPT_HELP:
@@ -101,6 +107,6 @@ opthelp:
typedata = OPENSSL_info(type);
BIO_printf(bio_out, "%s\n", typedata == NULL ? "Undefined" : typedata);
ret = 0;
- end:
+end:
return ret;
}
diff --git a/apps/kdf.c b/apps/kdf.c
index f7de2ac54a..dae13c8fcf 100644
--- a/apps/kdf.c
+++ b/apps/kdf.c
@@ -19,37 +19,42 @@
typedef enum OPTION_choice {
OPT_COMMON,
- OPT_KDFOPT, OPT_BIN, OPT_KEYLEN, OPT_OUT,
- OPT_CIPHER, OPT_DIGEST, OPT_MAC,
+ OPT_KDFOPT,
+ OPT_BIN,
+ OPT_KEYLEN,
+ OPT_OUT,
+ OPT_CIPHER,
+ OPT_DIGEST,
+ OPT_MAC,
OPT_PROV_ENUM
} OPTION_CHOICE;
const OPTIONS kdf_options[] = {
- {OPT_HELP_STR, 1, '-', "Usage: %s [options] kdf_name\n"},
+ { OPT_HELP_STR, 1, '-', "Usage: %s [options] kdf_name\n" },
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
- {"kdfopt", OPT_KDFOPT, 's', "KDF algorithm control parameters in n:v form"},
- {"cipher", OPT_CIPHER, 's', "Cipher"},
- {"digest", OPT_DIGEST, 's', "Digest"},
- {"mac", OPT_MAC, 's', "MAC"},
- {OPT_MORE_STR, 1, '-', "See 'Supported Controls' in the EVP_KDF_ docs\n"},
- {"keylen", OPT_KEYLEN, 's', "The size of the output derived key"},
+ { "help", OPT_HELP, '-', "Display this summary" },
+ { "kdfopt", OPT_KDFOPT, 's', "KDF algorithm control parameters in n:v form" },
+ { "cipher", OPT_CIPHER, 's', "Cipher" },
+ { "digest", OPT_DIGEST, 's', "Digest" },
+ { "mac", OPT_MAC, 's', "MAC" },
+ { OPT_MORE_STR, 1, '-', "See 'Supported Controls' in the EVP_KDF_ docs\n" },
+ { "keylen", OPT_KEYLEN, 's', "The size of the output derived key" },
OPT_SECTION("Output"),
- {"out", OPT_OUT, '>', "Output to filename rather than stdout"},
- {"binary", OPT_BIN, '-',
- "Output in binary format (default is hexadecimal)"},
+ { "out", OPT_OUT, '>', "Output to filename rather than stdout" },
+ { "binary", OPT_BIN, '-',
+ "Output in binary format (default is hexadecimal)" },
OPT_PROV_OPTIONS,
OPT_PARAMETERS(),
- {"kdf_name", 0, 0, "Name of the KDF algorithm"},
- {NULL}
+ { "kdf_name", 0, 0, "Name of the KDF algorithm" },
+ { NULL }
};
static char *alloc_kdf_algorithm_name(STACK_OF(OPENSSL_STRING) **optp,
- const char *name, const char *arg)
+ const char *name, const char *arg)
{
size_t len = strlen(name) + strlen(arg) + 2;
char *res;
@@ -85,7 +90,7 @@ int kdf_main(int argc, char **argv)
while ((o = opt_next()) != OPT_EOF) {
switch (o) {
default:
-opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto err;
case OPT_HELP:
@@ -139,7 +144,8 @@ opthelp:
goto opthelp;
if ((kdf = EVP_KDF_fetch(app_get0_libctx(), argv[0],
- app_get0_propq())) == NULL) {
+ app_get0_propq()))
+ == NULL) {
BIO_printf(bio_err, "Invalid KDF name %s\n", argv[0]);
goto opthelp;
}
@@ -150,8 +156,7 @@ opthelp:
if (opts != NULL) {
int ok = 1;
- OSSL_PARAM *params =
- app_params_new_from_opts(opts, EVP_KDF_settable_ctx_params(kdf));
+ OSSL_PARAM *params = app_params_new_from_opts(opts, EVP_KDF_settable_ctx_params(kdf));
if (params == NULL)
goto err;
diff --git a/apps/lib/app_libctx.c b/apps/lib/app_libctx.c
index 2f68cb0a75..fb26e8e487 100644
--- a/apps/lib/app_libctx.c
+++ b/apps/lib/app_libctx.c
@@ -45,4 +45,3 @@ OSSL_LIB_CTX *app_create_libctx(void)
opt_printf_stderr("Failed to create library context\n");
return app_libctx;
}
-
diff --git a/apps/lib/app_params.c b/apps/lib/app_params.c
index 6a49bfd419..cfd48ebc35 100644
--- a/apps/lib/app_params.c
+++ b/apps/lib/app_params.c
@@ -66,7 +66,7 @@ static int describe_param_type(char *buf, size_t bufsz, const OSSL_PARAM *param)
printed_len = BIO_snprintf(buf, bufsz, " (arbitrary size)");
else
printed_len = BIO_snprintf(buf, bufsz, " (max %zu bytes large)",
- param->data_size);
+ param->data_size);
if (printed_len > 0) {
buf += printed_len;
bufsz -= printed_len;
@@ -88,7 +88,7 @@ int print_param_types(const char *thing, const OSSL_PARAM *pdefs, int indent)
} else {
BIO_printf(bio_out, "%*s%s:\n", indent, "", thing);
for (; pdefs->key != NULL; pdefs++) {
- char buf[200]; /* This should be ample space */
+ char buf[200]; /* This should be ample space */
describe_param_type(buf, sizeof(buf), pdefs);
BIO_printf(bio_out, "%*s %s\n", indent, "", buf);
@@ -180,8 +180,7 @@ void print_param_value(const OSSL_PARAM *p, int indent)
break;
default:
BIO_printf(bio_out, "unknown type (%u) of %zu bytes\n",
- p->data_type, p->return_size);
+ p->data_type, p->return_size);
break;
}
}
-
diff --git a/apps/lib/app_provider.c b/apps/lib/app_provider.c
index 6db1d4b0b5..6986ab4c10 100644
--- a/apps/lib/app_provider.c
+++ b/apps/lib/app_provider.c
@@ -39,7 +39,7 @@ int app_provider_load(OSSL_LIB_CTX *libctx, const char *provider_name)
if (prov == NULL) {
opt_printf_stderr("%s: unable to load provider %s\n"
"Hint: use -provider-path option or OPENSSL_MODULES environment variable.\n",
- opt_getprog(), provider_name);
+ opt_getprog(), provider_name);
ERR_print_errors(bio_err);
return 0;
}
@@ -92,7 +92,7 @@ static int opt_provider_param(const char *arg)
if ((copy = OPENSSL_strdup(arg)) == NULL
|| (p.val = strchr(copy, '=')) == NULL) {
opt_printf_stderr("%s: malformed '-provparam' option value: '%s'\n",
- opt_getprog(), arg);
+ opt_getprog(), arg);
goto end;
}
@@ -118,7 +118,7 @@ static int opt_provider_param(const char *arg)
/* The key must not be empty */
if (*p.key == '\0') {
opt_printf_stderr("%s: malformed '-provparam' option value: '%s'\n",
- opt_getprog(), arg);
+ opt_getprog(), arg);
goto end;
}
@@ -126,14 +126,14 @@ static int opt_provider_param(const char *arg)
ret = OSSL_PROVIDER_do_all(app_get0_libctx(), set_prov_param, (void *)&p);
if (ret == 0) {
opt_printf_stderr("%s: Error setting provider '%s' parameter '%s'\n",
- opt_getprog(), p.name, p.key);
+ opt_getprog(), p.name, p.key);
} else if (p.found == 0) {
opt_printf_stderr("%s: No provider named '%s' is loaded\n",
- opt_getprog(), p.name);
+ opt_getprog(), p.name);
ret = 0;
}
- end:
+end:
OPENSSL_free(copy);
return ret;
}
diff --git a/apps/lib/app_rand.c b/apps/lib/app_rand.c
index 64d0f9b309..061211a0b6 100644
--- a/apps/lib/app_rand.c
+++ b/apps/lib/app_rand.c
@@ -89,11 +89,10 @@ int app_RAND_write(void)
ret = 0;
}
OPENSSL_free(save_rand_file);
- save_rand_file = NULL;
+ save_rand_file = NULL;
return ret;
}
-
/*
* See comments in opt_verify for explanation of this.
*/
@@ -107,7 +106,7 @@ int opt_rand(int opt)
break;
case OPT_R_RAND:
if (randfiles == NULL
- && (randfiles = sk_OPENSSL_STRING_new_null()) == NULL)
+ && (randfiles = sk_OPENSSL_STRING_new_null()) == NULL)
return 0;
if (!sk_OPENSSL_STRING_push(randfiles, opt_arg()))
return 0;
diff --git a/apps/lib/app_x509.c b/apps/lib/app_x509.c
index f2c22948f2..11cb3fa342 100644
--- a/apps/lib/app_x509.c
+++ b/apps/lib/app_x509.c
@@ -38,53 +38,51 @@ static int x509_ctrl(void *object, int cmd, void *value, size_t value_n)
{
switch (cmd) {
#ifdef EVP_PKEY_CTRL_SET1_ID
- case EVP_PKEY_CTRL_SET1_ID:
- {
- ASN1_OCTET_STRING *v = mk_octet_string(value, value_n);
-
- if (v == NULL) {
- BIO_printf(bio_err,
- "error: setting distinguishing ID in certificate failed\n");
- return 0;
- }
-
- X509_set0_distinguishing_id(object, v);
- return 1;
+ case EVP_PKEY_CTRL_SET1_ID: {
+ ASN1_OCTET_STRING *v = mk_octet_string(value, value_n);
+
+ if (v == NULL) {
+ BIO_printf(bio_err,
+ "error: setting distinguishing ID in certificate failed\n");
+ return 0;
}
+
+ X509_set0_distinguishing_id(object, v);
+ return 1;
+ }
#endif
default:
break;
}
- return -2; /* typical EVP_PKEY return for "unsupported" */
+ return -2; /* typical EVP_PKEY return for "unsupported" */
}
static int x509_req_ctrl(void *object, int cmd, void *value, size_t value_n)
{
switch (cmd) {
#ifdef EVP_PKEY_CTRL_SET1_ID
- case EVP_PKEY_CTRL_SET1_ID:
- {
- ASN1_OCTET_STRING *v = mk_octet_string(value, value_n);
-
- if (v == NULL) {
- BIO_printf(bio_err,
- "error: setting distinguishing ID in certificate signing request failed\n");
- return 0;
- }
-
- X509_REQ_set0_distinguishing_id(object, v);
- return 1;
+ case EVP_PKEY_CTRL_SET1_ID: {
+ ASN1_OCTET_STRING *v = mk_octet_string(value, value_n);
+
+ if (v == NULL) {
+ BIO_printf(bio_err,
+ "error: setting distinguishing ID in certificate signing request failed\n");
+ return 0;
}
+
+ X509_REQ_set0_distinguishing_id(object, v);
+ return 1;
+ }
#endif
default:
break;
}
- return -2; /* typical EVP_PKEY return for "unsupported" */
+ return -2; /* typical EVP_PKEY return for "unsupported" */
}
static int do_x509_ctrl_string(int (*ctrl)(void *object, int cmd,
- void *value, size_t value_n),
- void *object, const char *value)
+ void *value, size_t value_n),
+ void *object, const char *value)
{
int rv = 0;
char *stmp, *vtmp = NULL;
diff --git a/apps/lib/apps.c b/apps/lib/apps.c
index 765832a0b2..5f6dcae84e 100644
--- a/apps/lib/apps.c
+++ b/apps/lib/apps.c
@@ -12,7 +12,7 @@
* On VMS, you need to define this to get the declaration of fileno(). The
* value 2 is to make sure no function defined in POSIX-2 is left undefined.
*/
-# define _POSIX_C_SOURCE 2
+#define _POSIX_C_SOURCE 2
#endif
#include <stdio.h>
@@ -20,8 +20,8 @@
#include <string.h>
#include <sys/types.h>
#ifndef OPENSSL_NO_POSIX_IO
-# include <sys/stat.h>
-# include <fcntl.h>
+#include <sys/stat.h>
+#include <fcntl.h>
#endif
#include <ctype.h>
#include <errno.h>
@@ -47,19 +47,19 @@
#ifdef _WIN32
static int WIN32_rename(const char *from, const char *to);
-# define rename(from, to) WIN32_rename((from), (to))
+#define rename(from, to) WIN32_rename((from), (to))
#endif
#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS)
-# include <conio.h>
+#include <conio.h>
#endif
#if defined(OPENSSL_SYS_MSDOS) && !defined(_WIN32) || defined(__BORLANDC__)
-# define _kbhit kbhit
+#define _kbhit kbhit
#endif
static BIO *bio_open_default_(const char *filename, char mode, int format,
- int quiet);
+ int quiet);
#define PASS_SOURCE_SIZE_MAX 4
@@ -72,9 +72,9 @@ typedef struct {
} NAME_EX_TBL;
static int set_table_opts(unsigned long *flags, const char *arg,
- const NAME_EX_TBL *in_tbl);
+ const NAME_EX_TBL *in_tbl);
static int set_multi_opts(unsigned long *flags, const char *arg,
- const NAME_EX_TBL *in_tbl);
+ const NAME_EX_TBL *in_tbl);
int app_init(long mesgwin);
#ifndef APP_INIT
@@ -85,9 +85,9 @@ int app_init(long mesgwin)
#endif
int ctx_set_verify_locations(SSL_CTX *ctx,
- const char *CAfile, int noCAfile,
- const char *CApath, int noCApath,
- const char *CAstore, int noCAstore)
+ const char *CAfile, int noCAfile,
+ const char *CApath, int noCApath,
+ const char *CAstore, int noCAstore)
{
if (CAfile == NULL && CApath == NULL && CAstore == NULL) {
if (!noCAfile && SSL_CTX_set_default_verify_file(ctx) <= 0)
@@ -136,12 +136,7 @@ int set_nameopt(const char *arg)
unsigned long get_nameopt(void)
{
- return
- nmflag_set ? nmflag : XN_FLAG_SEP_CPLUS_SPC | XN_FLAG_FN_SN
- | ASN1_STRFLGS_ESC_CTRL
- | ASN1_STRFLGS_UTF8_CONVERT
- | ASN1_STRFLGS_DUMP_UNKNOWN
- | ASN1_STRFLGS_DUMP_DER;
+ return nmflag_set ? nmflag : XN_FLAG_SEP_CPLUS_SPC | XN_FLAG_FN_SN | ASN1_STRFLGS_ESC_CTRL | ASN1_STRFLGS_UTF8_CONVERT | ASN1_STRFLGS_DUMP_UNKNOWN | ASN1_STRFLGS_DUMP_DER;
}
void dump_cert_text(BIO *out, X509 *x)
@@ -167,11 +162,11 @@ char *get_passwd(const char *pass, const char *desc)
BIO_printf(bio_err, "Error getting password for %s\n", desc);
if (pass != NULL && result == NULL) {
BIO_printf(bio_err,
- "Trying plain input string (better precede with 'pass:')\n");
+ "Trying plain input string (better precede with 'pass:')\n");
result = OPENSSL_strdup(pass);
if (result == NULL)
BIO_printf(bio_err,
- "Out of memory getting password for %s\n", desc);
+ "Out of memory getting password for %s\n", desc);
}
return result;
}
@@ -264,12 +259,12 @@ static char *app_get_pass(const char *arg, int keepbio)
tmp = strchr(arg, ':');
if (tmp == NULL || tmp - arg > PASS_SOURCE_SIZE_MAX)
BIO_printf(bio_err,
- "Invalid password argument, missing ':' within the first %d chars\n",
- PASS_SOURCE_SIZE_MAX + 1);
+ "Invalid password argument, missing ':' within the first %d chars\n",
+ PASS_SOURCE_SIZE_MAX + 1);
else
BIO_printf(bio_err,
- "Invalid password argument, starting with \"%.*s\"\n",
- (int)(tmp - arg + 1), arg);
+ "Invalid password argument, starting with \"%.*s\"\n",
+ (int)(tmp - arg + 1), arg);
return NULL;
}
}
@@ -302,7 +297,7 @@ char *app_conf_try_string(const CONF *conf, const char *group, const char *name)
}
int app_conf_try_number(const CONF *conf, const char *group, const char *name,
- long *result)
+ long *result)
{
int ok;
@@ -330,7 +325,7 @@ CONF *app_load_config_bio(BIO *in, const char *filename)
BIO_printf(bio_err, "%s: Can't load ", opt_getprog());
} else {
BIO_printf(bio_err, "%s: Error on line %ld of ", opt_getprog(),
- errorline);
+ errorline);
}
if (filename != NULL)
BIO_printf(bio_err, "config file \"%s\"\n", filename);
@@ -405,7 +400,7 @@ int add_oid_section(CONF *conf)
cnf = sk_CONF_VALUE_value(sktmp, i);
if (OBJ_create(cnf->value, cnf->name, cnf->name) == NID_undef) {
BIO_printf(bio_err, "problem creating object %s=%s\n",
- cnf->name, cnf->value);
+ cnf->name, cnf->value);
return 0;
}
}
@@ -427,11 +422,11 @@ CONF *app_load_config_modules(const char *configfile)
return conf;
}
-#define IS_HTTP(uri) ((uri) != NULL && HAS_PREFIX(uri, OSSL_HTTP_PREFIX))
+#define IS_HTTP(uri) ((uri) != NULL && HAS_PREFIX(uri, OSSL_HTTP_PREFIX))
#define IS_HTTPS(uri) ((uri) != NULL && HAS_PREFIX(uri, OSSL_HTTPS_PREFIX))
X509 *load_cert_pass(const char *uri, int format, int maybe_stdin,
- const char *pass, const char *desc)
+ const char *pass, const char *desc)
{
X509 *cert = NULL;
@@ -447,13 +442,13 @@ X509 *load_cert_pass(const char *uri, int format, int maybe_stdin,
}
} else {
(void)load_key_certs_crls(uri, format, maybe_stdin, pass, desc, 0,
- NULL, NULL, NULL, &cert, NULL, NULL, NULL);
+ NULL, NULL, NULL, &cert, NULL, NULL, NULL);
}
return cert;
}
X509_CRL *load_crl(const char *uri, int format, int maybe_stdin,
- const char *desc)
+ const char *desc)
{
X509_CRL *crl = NULL;
@@ -469,7 +464,7 @@ X509_CRL *load_crl(const char *uri, int format, int maybe_stdin,
}
} else {
(void)load_key_certs_crls(uri, format, maybe_stdin, NULL, desc, 0,
- NULL, NULL, NULL, NULL, NULL, &crl, NULL);
+ NULL, NULL, NULL, NULL, NULL, &crl, NULL);
}
return crl;
}
@@ -493,7 +488,7 @@ X509_REQ *load_csr(const char *file, int format, const char *desc)
else
print_format_error(format, OPT_FMT_PEMDER);
- end:
+end:
if (req == NULL) {
ERR_print_errors(bio_err);
if (desc != NULL)
@@ -505,7 +500,7 @@ X509_REQ *load_csr(const char *file, int format, const char *desc)
/* Better extend OSSL_STORE to support CSRs, see FR #15725 */
X509_REQ *load_csr_autofmt(const char *infile, int format,
- STACK_OF(OPENSSL_STRING) *vfyopts, const char *desc)
+ STACK_OF(OPENSSL_STRING) *vfyopts, const char *desc)
{
X509_REQ *csr;
@@ -523,7 +518,7 @@ X509_REQ *load_csr_autofmt(const char *infile, int format,
}
if (csr == NULL) {
BIO_printf(bio_err, "error: unable to load %s from file '%s'\n",
- desc, infile);
+ desc, infile);
}
}
if (csr != NULL) {
@@ -552,7 +547,7 @@ void clear_free(char *str)
}
EVP_PKEY *load_key(const char *uri, int format, int may_stdin,
- const char *pass, const char *desc)
+ const char *pass, const char *desc)
{
EVP_PKEY *pkey = NULL;
@@ -560,14 +555,14 @@ EVP_PKEY *load_key(const char *uri, int format, int may_stdin,
desc = "private key";
(void)load_key_certs_crls(uri, format, may_stdin, pass, desc, 0,
- &pkey, NULL, NULL, NULL, NULL, NULL, NULL);
+ &pkey, NULL, NULL, NULL, NULL, NULL, NULL);
return pkey;
}
/* first try reading public key, on failure resort to loading private key */
EVP_PKEY *load_pubkey(const char *uri, int format, int maybe_stdin,
- const char *pass, const char *desc)
+ const char *pass, const char *desc)
{
EVP_PKEY *pkey = NULL;
@@ -575,29 +570,29 @@ EVP_PKEY *load_pubkey(const char *uri, int format, int maybe_stdin,
desc = "public key";
(void)load_key_certs_crls(uri, format, maybe_stdin, pass, desc, 1,
- NULL, &pkey, NULL, NULL, NULL, NULL, NULL);
+ NULL, &pkey, NULL, NULL, NULL, NULL, NULL);
if (pkey == NULL)
(void)load_key_certs_crls(uri, format, maybe_stdin, pass, desc, 0,
- &pkey, NULL, NULL, NULL, NULL, NULL, NULL);
+ &pkey, NULL, NULL, NULL, NULL, NULL, NULL);
return pkey;
}
EVP_PKEY *load_keyparams_suppress(const char *uri, int format, int maybe_stdin,
- const char *keytype, const char *desc,
- int suppress_decode_errors)
+ const char *keytype, const char *desc,
+ int suppress_decode_errors)
{
EVP_PKEY *params = NULL;
if (desc == NULL)
desc = "key parameters";
(void)load_key_certs_crls(uri, format, maybe_stdin, NULL, desc,
- suppress_decode_errors,
- NULL, NULL, ¶ms, NULL, NULL, NULL, NULL);
+ suppress_decode_errors,
+ NULL, NULL, ¶ms, NULL, NULL, NULL, NULL);
if (params != NULL && keytype != NULL && !EVP_PKEY_is_a(params, keytype)) {
ERR_print_errors(bio_err);
BIO_printf(bio_err,
- "Unable to load %s from %s (unexpected parameters type)\n",
- desc, uri);
+ "Unable to load %s from %s (unexpected parameters type)\n",
+ desc, uri);
EVP_PKEY_free(params);
params = NULL;
}
@@ -605,7 +600,7 @@ EVP_PKEY *load_keyparams_suppress(const char *uri, int format, int maybe_stdin,
}
EVP_PKEY *load_keyparams(const char *uri, int format, int maybe_stdin,
- const char *keytype, const char *desc)
+ const char *keytype, const char *desc)
{
return load_keyparams_suppress(uri, format, maybe_stdin, keytype, desc, 0);
}
@@ -627,7 +622,7 @@ void *app_malloc(size_t sz, const char *what)
if (vp == NULL)
app_bail_out("%s: Could not allocate %zu bytes for %s\n",
- opt_getprog(), sz, what);
+ opt_getprog(), sz, what);
return vp;
}
@@ -637,7 +632,7 @@ void *app_malloc_array(size_t n, size_t sz, const char *what)
if (vp == NULL)
app_bail_out("%s: Could not allocate %zu*%zu bytes for %s\n",
- opt_getprog(), n, sz, what);
+ opt_getprog(), n, sz, what);
return vp;
}
@@ -661,12 +656,12 @@ static void warn_cert_msg(const char *uri, X509 *cert, const char *msg)
char *subj = X509_NAME_oneline(X509_get_subject_name(cert), NULL, 0);
BIO_printf(bio_err, "Warning: certificate from '%s' with subject '%s' %s\n",
- uri, subj, msg);
+ uri, subj, msg);
OPENSSL_free(subj);
}
static void warn_cert(const char *uri, X509 *cert, int warn_EE,
- X509_VERIFY_PARAM *vpm)
+ X509_VERIFY_PARAM *vpm)
{
uint32_t ex_flags = X509_get_extension_flags(cert);
/*
@@ -676,7 +671,7 @@ static void warn_cert(const char *uri, X509 *cert, int warn_EE,
* you don't want outside of a toy testing function like this.
*/
int res = X509_cmp_timeframe(vpm, X509_get0_notBefore(cert),
- X509_get0_notAfter(cert));
+ X509_get0_notAfter(cert));
if (res != 0)
warn_cert_msg(uri, cert, res > 0 ? "has expired" : "not yet valid");
@@ -685,7 +680,7 @@ static void warn_cert(const char *uri, X509 *cert, int warn_EE,
}
static void warn_certs(const char *uri, STACK_OF(X509) *certs, int warn_EE,
- X509_VERIFY_PARAM *vpm)
+ X509_VERIFY_PARAM *vpm)
{
int i;
@@ -694,23 +689,22 @@ static void warn_certs(const char *uri, STACK_OF(X509) *certs, int warn_EE,
}
int load_cert_certs(const char *uri,
- X509 **pcert, STACK_OF(X509) **pcerts,
- int exclude_http, const char *pass, const char *desc,
- X509_VERIFY_PARAM *vpm)
+ X509 **pcert, STACK_OF(X509) **pcerts,
+ int exclude_http, const char *pass, const char *desc,
+ X509_VERIFY_PARAM *vpm)
{
int ret = 0;
char *pass_string;
if (desc == NULL)
desc = pcerts == NULL ? "certificate" : "certificates";
- if (exclude_http && (HAS_CASE_PREFIX(uri, "http://")
- || HAS_CASE_PREFIX(uri, "https://"))) {
+ if (exclude_http && (HAS_CASE_PREFIX(uri, "http://") || HAS_CASE_PREFIX(uri, "https://"))) {
BIO_printf(bio_err, "error: HTTP retrieval not allowed for %s\n", desc);
return ret;
}
pass_string = get_passwd(pass, desc);
ret = load_key_certs_crls(uri, FORMAT_UNDEF, 0, pass_string, desc, 0,
- NULL, NULL, NULL, pcert, pcerts, NULL, NULL);
+ NULL, NULL, NULL, pcert, pcerts, NULL, NULL);
clear_free(pass_string);
if (ret) {
@@ -723,7 +717,7 @@ int load_cert_certs(const char *uri,
}
STACK_OF(X509) *load_certs_multifile(char *files, const char *pass,
- const char *desc, X509_VERIFY_PARAM *vpm)
+ const char *desc, X509_VERIFY_PARAM *vpm)
{
STACK_OF(X509) *certs = NULL;
STACK_OF(X509) *result = sk_X509_new_null();
@@ -739,7 +733,7 @@ STACK_OF(X509) *load_certs_multifile(char *files, const char *pass,
if (!load_cert_certs(files, NULL, &certs, 0, pass, desc, vpm))
goto err;
if (!X509_add_certs(result, certs,
- X509_ADD_FLAG_UP_REF | X509_ADD_FLAG_NO_DUP))
+ X509_ADD_FLAG_UP_REF | X509_ADD_FLAG_NO_DUP))
goto oom;
OSSL_STACK_OF_X509_free(certs);
certs = NULL;
@@ -747,16 +741,16 @@ STACK_OF(X509) *load_certs_multifile(char *files, const char *pass,
}
return result;
- oom:
+oom:
BIO_printf(bio_err, "out of memory\n");
- err:
+err:
OSSL_STACK_OF_X509_free(certs);
OSSL_STACK_OF_X509_free(result);
return NULL;
}
static X509_STORE *sk_X509_to_store(X509_STORE *store /* may be NULL */,
- const STACK_OF(X509) *certs /* may NULL */)
+ const STACK_OF(X509) *certs /* may NULL */)
{
int i;
@@ -778,7 +772,7 @@ static X509_STORE *sk_X509_to_store(X509_STORE *store /* may be NULL */,
* Returns pointer to created X509_STORE on success, NULL on error.
*/
X509_STORE *load_certstore(char *input, const char *pass, const char *desc,
- X509_VERIFY_PARAM *vpm)
+ X509_VERIFY_PARAM *vpm)
{
X509_STORE *store = NULL;
STACK_OF(X509) *certs = NULL;
@@ -806,12 +800,12 @@ X509_STORE *load_certstore(char *input, const char *pass, const char *desc,
* The caller is responsible for freeing *certs if its value is left not NULL.
*/
int load_certs(const char *uri, int maybe_stdin, STACK_OF(X509) **certs,
- const char *pass, const char *desc)
+ const char *pass, const char *desc)
{
if (desc == NULL)
desc = "certificates";
return load_key_certs_crls(uri, FORMAT_UNDEF, maybe_stdin, pass, desc, 0,
- NULL, NULL, NULL, NULL, certs, NULL, NULL);
+ NULL, NULL, NULL, NULL, certs, NULL, NULL);
}
/*
@@ -819,12 +813,12 @@ int load_certs(const char *uri, int maybe_stdin, STACK_OF(X509) **certs,
* The caller is responsible for freeing *crls if its value is left not NULL.
*/
int load_crls(const char *uri, STACK_OF(X509_CRL) **crls,
- const char *pass, const char *desc)
+ const char *pass, const char *desc)
{
if (desc == NULL)
desc = "CRLs";
return load_key_certs_crls(uri, FORMAT_UNDEF, 0, pass, desc, 0,
- NULL, NULL, NULL, NULL, NULL, NULL, crls);
+ NULL, NULL, NULL, NULL, NULL, NULL, crls);
}
static const char *format2string(int format)
@@ -846,16 +840,19 @@ static const char *format2string(int format)
#define SET_EXPECT(val) \
(expect = expect < 0 ? (val) : (expect == (val) ? (val) : 0))
#define SET_EXPECT1(pvar, val) \
- if ((pvar) != NULL) { \
- *(pvar) = NULL; \
- SET_EXPECT(val); \
+ if ((pvar) != NULL) { \
+ *(pvar) = NULL; \
+ SET_EXPECT(val); \
}
/* Provide (error msg) text for some of the credential types to be loaded. */
-#define FAIL_NAME \
- (ppkey != NULL ? "private key" : ppubkey != NULL ? "public key" : \
- pparams != NULL ? "key parameters" : \
- pcert != NULL ? "certificate" : pcerts != NULL ? "certificates" : \
- pcrl != NULL ? "CRL" : pcrls != NULL ? "CRLs" : NULL)
+#define FAIL_NAME \
+ (ppkey != NULL ? "private key" : ppubkey != NULL ? "public key" \
+ : pparams != NULL ? "key parameters" \
+ : pcert != NULL ? "certificate" \
+ : pcerts != NULL ? "certificates" \
+ : pcrl != NULL ? "CRL" \
+ : pcrls != NULL ? "CRLs" \
+ : NULL)
/*
* Load those types of credentials for which the result pointer is not NULL.
* Reads from stdin if 'uri' is NULL and 'maybe_stdin' is nonzero.
@@ -871,11 +868,11 @@ static const char *format2string(int format)
* On error, any contents of non-NULL credential pointers are freed.
*/
int load_key_certs_crls(const char *uri, int format, int maybe_stdin,
- const char *pass, const char *desc, int quiet,
- EVP_PKEY **ppkey, EVP_PKEY **ppubkey,
- EVP_PKEY **pparams,
- X509 **pcert, STACK_OF(X509) **pcerts,
- X509_CRL **pcrl, STACK_OF(X509_CRL) **pcrls)
+ const char *pass, const char *desc, int quiet,
+ EVP_PKEY **ppkey, EVP_PKEY **ppubkey,
+ EVP_PKEY **pparams,
+ X509 **pcert, STACK_OF(X509) **pcerts,
+ X509_CRL **pcrl, STACK_OF(X509_CRL) **pcrls)
{
PW_CB_DATA uidata;
OSSL_STORE_CTX *ctx = NULL;
@@ -891,7 +888,7 @@ int load_key_certs_crls(const char *uri, int format, int maybe_stdin,
if (failed == NULL) {
if (!quiet)
BIO_printf(bio_err, "Internal error: nothing was requested to load from %s\n",
- uri != NULL ? uri : "<stdin>");
+ uri != NULL ? uri : "<stdin>");
return 0;
}
/* suppress any extraneous errors left over from failed parse attempts */
@@ -941,7 +938,7 @@ int load_key_certs_crls(const char *uri, int format, int maybe_stdin,
if ((input_type = format2string(format)) != NULL) {
itp[0] = OSSL_PARAM_construct_utf8_string(OSSL_STORE_PARAM_INPUT_TYPE,
- (char *)input_type, 0);
+ (char *)input_type, 0);
itp[1] = OSSL_PARAM_construct_end();
params = itp;
}
@@ -959,13 +956,13 @@ int load_key_certs_crls(const char *uri, int format, int maybe_stdin,
bio = BIO_new_fp(stdin, 0);
if (bio != NULL) {
ctx = OSSL_STORE_attach(bio, "file", libctx, propq,
- get_ui_method(), &uidata, params,
- NULL, NULL);
+ get_ui_method(), &uidata, params,
+ NULL, NULL);
BIO_free(bio);
}
} else {
ctx = OSSL_STORE_open_ex(uri, libctx, propq, get_ui_method(), &uidata,
- params, NULL, NULL);
+ params, NULL, NULL);
}
if (ctx == NULL) {
if (!quiet)
@@ -983,8 +980,8 @@ int load_key_certs_crls(const char *uri, int format, int maybe_stdin,
/* from here, failed != NULL only if actually an error has been detected */
while ((ppkey != NULL || ppubkey != NULL || pparams != NULL
- || pcert != NULL || pcerts != NULL || pcrl != NULL || pcrls != NULL)
- && !OSSL_STORE_eof(ctx)) {
+ || pcert != NULL || pcerts != NULL || pcrl != NULL || pcrls != NULL)
+ && !OSSL_STORE_eof(ctx)) {
OSSL_STORE_INFO *info = OSSL_STORE_load(ctx);
int type, ok = 1;
@@ -1035,8 +1032,8 @@ int load_key_certs_crls(const char *uri, int format, int maybe_stdin,
pcert = NULL;
} else if (pcerts != NULL) {
ok = X509_add_cert(*pcerts,
- OSSL_STORE_INFO_get1_CERT(info),
- X509_ADD_FLAG_DEFAULT);
+ OSSL_STORE_INFO_get1_CERT(info),
+ X509_ADD_FLAG_DEFAULT);
}
ncerts += ok;
break;
@@ -1063,7 +1060,7 @@ int load_key_certs_crls(const char *uri, int format, int maybe_stdin,
}
}
- end:
+end:
OSSL_STORE_close(ctx);
/* see if any of the requested types of credentials was not found */
@@ -1137,37 +1134,36 @@ int load_key_certs_crls(const char *uri, int format, int maybe_stdin,
return 1;
}
-#define X509V3_EXT_UNKNOWN_MASK (0xfL << 16)
-#define X509V3_EXT_DEFAULT 0 /* Return error for unknown exts */
+#define X509V3_EXT_UNKNOWN_MASK (0xfL << 16)
+#define X509V3_EXT_DEFAULT 0 /* Return error for unknown exts */
#define X509V3_EXT_ERROR_UNKNOWN (1L << 16) /* Print error for unknown exts */
#define X509V3_EXT_PARSE_UNKNOWN (2L << 16) /* ASN1 parse unknown extensions */
-#define X509V3_EXT_DUMP_UNKNOWN (3L << 16) /* BIO_dump unknown extensions */
+#define X509V3_EXT_DUMP_UNKNOWN (3L << 16) /* BIO_dump unknown extensions */
-#define X509_FLAG_CA (X509_FLAG_NO_ISSUER | X509_FLAG_NO_PUBKEY | \
- X509_FLAG_NO_HEADER | X509_FLAG_NO_VERSION)
+#define X509_FLAG_CA (X509_FLAG_NO_ISSUER | X509_FLAG_NO_PUBKEY | X509_FLAG_NO_HEADER | X509_FLAG_NO_VERSION)
int set_cert_ex(unsigned long *flags, const char *arg)
{
static const NAME_EX_TBL cert_tbl[] = {
- {"compatible", X509_FLAG_COMPAT, 0xffffffffl},
- {"ca_default", X509_FLAG_CA, 0xffffffffl},
- {"no_header", X509_FLAG_NO_HEADER, 0},
- {"no_version", X509_FLAG_NO_VERSION, 0},
- {"no_serial", X509_FLAG_NO_SERIAL, 0},
- {"no_signame", X509_FLAG_NO_SIGNAME, 0},
- {"no_validity", X509_FLAG_NO_VALIDITY, 0},
- {"no_subject", X509_FLAG_NO_SUBJECT, 0},
- {"no_issuer", X509_FLAG_NO_ISSUER, 0},
- {"no_pubkey", X509_FLAG_NO_PUBKEY, 0},
- {"no_extensions", X509_FLAG_NO_EXTENSIONS, 0},
- {"no_sigdump", X509_FLAG_NO_SIGDUMP, 0},
- {"no_aux", X509_FLAG_NO_AUX, 0},
- {"no_attributes", X509_FLAG_NO_ATTRIBUTES, 0},
- {"ext_default", X509V3_EXT_DEFAULT, X509V3_EXT_UNKNOWN_MASK},
- {"ext_error", X509V3_EXT_ERROR_UNKNOWN, X509V3_EXT_UNKNOWN_MASK},
- {"ext_parse", X509V3_EXT_PARSE_UNKNOWN, X509V3_EXT_UNKNOWN_MASK},
- {"ext_dump", X509V3_EXT_DUMP_UNKNOWN, X509V3_EXT_UNKNOWN_MASK},
- {NULL, 0, 0}
+ { "compatible", X509_FLAG_COMPAT, 0xffffffffl },
+ { "ca_default", X509_FLAG_CA, 0xffffffffl },
+ { "no_header", X509_FLAG_NO_HEADER, 0 },
+ { "no_version", X509_FLAG_NO_VERSION, 0 },
+ { "no_serial", X509_FLAG_NO_SERIAL, 0 },
+ { "no_signame", X509_FLAG_NO_SIGNAME, 0 },
+ { "no_validity", X509_FLAG_NO_VALIDITY, 0 },
+ { "no_subject", X509_FLAG_NO_SUBJECT, 0 },
+ { "no_issuer", X509_FLAG_NO_ISSUER, 0 },
+ { "no_pubkey", X509_FLAG_NO_PUBKEY, 0 },
+ { "no_extensions", X509_FLAG_NO_EXTENSIONS, 0 },
+ { "no_sigdump", X509_FLAG_NO_SIGDUMP, 0 },
+ { "no_aux", X509_FLAG_NO_AUX, 0 },
+ { "no_attributes", X509_FLAG_NO_ATTRIBUTES, 0 },
+ { "ext_default", X509V3_EXT_DEFAULT, X509V3_EXT_UNKNOWN_MASK },
+ { "ext_error", X509V3_EXT_ERROR_UNKNOWN, X509V3_EXT_UNKNOWN_MASK },
+ { "ext_parse", X509V3_EXT_PARSE_UNKNOWN, X509V3_EXT_UNKNOWN_MASK },
+ { "ext_dump", X509V3_EXT_DUMP_UNKNOWN, X509V3_EXT_UNKNOWN_MASK },
+ { NULL, 0, 0 }
};
return set_multi_opts(flags, arg, cert_tbl);
}
@@ -1175,35 +1171,35 @@ int set_cert_ex(unsigned long *flags, const char *arg)
int set_name_ex(unsigned long *flags, const char *arg)
{
static const NAME_EX_TBL ex_tbl[] = {
- {"esc_2253", ASN1_STRFLGS_ESC_2253, 0},
- {"esc_2254", ASN1_STRFLGS_ESC_2254, 0},
- {"esc_ctrl", ASN1_STRFLGS_ESC_CTRL, 0},
- {"esc_msb", ASN1_STRFLGS_ESC_MSB, 0},
- {"use_quote", ASN1_STRFLGS_ESC_QUOTE, 0},
- {"utf8", ASN1_STRFLGS_UTF8_CONVERT, 0},
- {"ignore_type", ASN1_STRFLGS_IGNORE_TYPE, 0},
- {"show_type", ASN1_STRFLGS_SHOW_TYPE, 0},
- {"dump_all", ASN1_STRFLGS_DUMP_ALL, 0},
- {"dump_nostr", ASN1_STRFLGS_DUMP_UNKNOWN, 0},
- {"dump_der", ASN1_STRFLGS_DUMP_DER, 0},
- {"compat", XN_FLAG_COMPAT, 0xffffffffL},
- {"sep_comma_plus", XN_FLAG_SEP_COMMA_PLUS, XN_FLAG_SEP_MASK},
- {"sep_comma_plus_space", XN_FLAG_SEP_CPLUS_SPC, XN_FLAG_SEP_MASK},
- {"sep_semi_plus_space", XN_FLAG_SEP_SPLUS_SPC, XN_FLAG_SEP_MASK},
- {"sep_multiline", XN_FLAG_SEP_MULTILINE, XN_FLAG_SEP_MASK},
- {"dn_rev", XN_FLAG_DN_REV, 0},
- {"nofname", XN_FLAG_FN_NONE, XN_FLAG_FN_MASK},
- {"sname", XN_FLAG_FN_SN, XN_FLAG_FN_MASK},
- {"lname", XN_FLAG_FN_LN, XN_FLAG_FN_MASK},
- {"align", XN_FLAG_FN_ALIGN, 0},
- {"oid", XN_FLAG_FN_OID, XN_FLAG_FN_MASK},
- {"space_eq", XN_FLAG_SPC_EQ, 0},
- {"dump_unknown", XN_FLAG_DUMP_UNKNOWN_FIELDS, 0},
- {"RFC2253", XN_FLAG_RFC2253, 0xffffffffL},
- {"oneline", XN_FLAG_ONELINE, 0xffffffffL},
- {"multiline", XN_FLAG_MULTILINE, 0xffffffffL},
- {"ca_default", XN_FLAG_MULTILINE, 0xffffffffL},
- {NULL, 0, 0}
+ { "esc_2253", ASN1_STRFLGS_ESC_2253, 0 },
+ { "esc_2254", ASN1_STRFLGS_ESC_2254, 0 },
+ { "esc_ctrl", ASN1_STRFLGS_ESC_CTRL, 0 },
+ { "esc_msb", ASN1_STRFLGS_ESC_MSB, 0 },
+ { "use_quote", ASN1_STRFLGS_ESC_QUOTE, 0 },
+ { "utf8", ASN1_STRFLGS_UTF8_CONVERT, 0 },
+ { "ignore_type", ASN1_STRFLGS_IGNORE_TYPE, 0 },
+ { "show_type", ASN1_STRFLGS_SHOW_TYPE, 0 },
+ { "dump_all", ASN1_STRFLGS_DUMP_ALL, 0 },
+ { "dump_nostr", ASN1_STRFLGS_DUMP_UNKNOWN, 0 },
+ { "dump_der", ASN1_STRFLGS_DUMP_DER, 0 },
+ { "compat", XN_FLAG_COMPAT, 0xffffffffL },
+ { "sep_comma_plus", XN_FLAG_SEP_COMMA_PLUS, XN_FLAG_SEP_MASK },
+ { "sep_comma_plus_space", XN_FLAG_SEP_CPLUS_SPC, XN_FLAG_SEP_MASK },
+ { "sep_semi_plus_space", XN_FLAG_SEP_SPLUS_SPC, XN_FLAG_SEP_MASK },
+ { "sep_multiline", XN_FLAG_SEP_MULTILINE, XN_FLAG_SEP_MASK },
+ { "dn_rev", XN_FLAG_DN_REV, 0 },
+ { "nofname", XN_FLAG_FN_NONE, XN_FLAG_FN_MASK },
+ { "sname", XN_FLAG_FN_SN, XN_FLAG_FN_MASK },
+ { "lname", XN_FLAG_FN_LN, XN_FLAG_FN_MASK },
+ { "align", XN_FLAG_FN_ALIGN, 0 },
+ { "oid", XN_FLAG_FN_OID, XN_FLAG_FN_MASK },
+ { "space_eq", XN_FLAG_SPC_EQ, 0 },
+ { "dump_unknown", XN_FLAG_DUMP_UNKNOWN_FIELDS, 0 },
+ { "RFC2253", XN_FLAG_RFC2253, 0xffffffffL },
+ { "oneline", XN_FLAG_ONELINE, 0xffffffffL },
+ { "multiline", XN_FLAG_MULTILINE, 0xffffffffL },
+ { "ca_default", XN_FLAG_MULTILINE, 0xffffffffL },
+ { NULL, 0, 0 }
};
if (set_multi_opts(flags, arg, ex_tbl) == 0)
return 0;
@@ -1269,13 +1265,13 @@ int copy_extensions(X509 *x, X509_REQ *req, int copy_type)
}
ret = 1;
- end:
+end:
sk_X509_EXTENSION_pop_free(exts, X509_EXTENSION_free);
return ret;
}
static int set_multi_opts(unsigned long *flags, const char *arg,
- const NAME_EX_TBL *in_tbl)
+ const NAME_EX_TBL *in_tbl)
{
STACK_OF(CONF_VALUE) *vals;
CONF_VALUE *val;
@@ -1294,7 +1290,7 @@ static int set_multi_opts(unsigned long *flags, const char *arg,
}
static int set_table_opts(unsigned long *flags, const char *arg,
- const NAME_EX_TBL *in_tbl)
+ const NAME_EX_TBL *in_tbl)
{
char c;
const NAME_EX_TBL *ptbl;
@@ -1352,7 +1348,7 @@ void print_name(BIO *out, const char *title, const X509_NAME *nm)
}
void print_bignum_var(BIO *out, const BIGNUM *in, const char *var,
- int len, unsigned char *buffer)
+ int len, unsigned char *buffer)
{
BIO_printf(out, " static unsigned char %s_%d[] = {", var, len);
if (BN_is_zero(in)) {
@@ -1389,8 +1385,8 @@ void print_array(BIO *out, const char *title, int len, const unsigned char *d)
}
X509_STORE *setup_verify(const char *CAfile, int noCAfile,
- const char *CApath, int noCApath,
- const char *CAstore, int noCAstore)
+ const char *CApath, int noCApath,
+ const char *CAstore, int noCAstore)
{
X509_STORE *store = X509_STORE_new();
X509_LOOKUP *lookup;
@@ -1406,17 +1402,19 @@ X509_STORE *setup_verify(const char *CAfile, int noCAfile,
goto end;
if (CAfile != NULL) {
if (X509_LOOKUP_load_file_ex(lookup, CAfile, X509_FILETYPE_PEM,
- libctx, propq) <= 0) {
+ libctx, propq)
+ <= 0) {
ERR_clear_error();
if (X509_LOOKUP_load_file_ex(lookup, CAfile, X509_FILETYPE_ASN1,
- libctx, propq) <= 0) {
+ libctx, propq)
+ <= 0) {
BIO_printf(bio_err, "Error loading file %s\n", CAfile);
goto end;
}
}
} else {
X509_LOOKUP_load_file_ex(lookup, NULL, X509_FILETYPE_DEFAULT,
- libctx, propq);
+ libctx, propq);
}
}
@@ -1447,7 +1445,7 @@ X509_STORE *setup_verify(const char *CAfile, int noCAfile,
ERR_clear_error();
return store;
- end:
+end:
ERR_print_errors(bio_err);
X509_STORE_free(store);
return NULL;
@@ -1464,12 +1462,14 @@ static unsigned long index_serial_hash(const OPENSSL_CSTRING *a)
}
static int index_serial_cmp(const OPENSSL_CSTRING *a,
- const OPENSSL_CSTRING *b)
+ const OPENSSL_CSTRING *b)
{
const char *aa, *bb;
- for (aa = a[DB_serial]; *aa == '0'; aa++) ;
- for (bb = b[DB_serial]; *bb == '0'; bb++) ;
+ for (aa = a[DB_serial]; *aa == '0'; aa++)
+ ;
+ for (bb = b[DB_serial]; *bb == '0'; bb++)
+ ;
return strcmp(aa, bb);
}
@@ -1495,7 +1495,7 @@ static IMPLEMENT_LHASH_COMP_FN(index_name, OPENSSL_CSTRING)
#undef BSIZE
#define BSIZE 256
BIGNUM *load_serial(const char *serialfile, int *exists, int create,
- ASN1_INTEGER **retai)
+ ASN1_INTEGER **retai)
{
BIO *in = NULL;
BIGNUM *ret = NULL;
@@ -1520,14 +1520,14 @@ BIGNUM *load_serial(const char *serialfile, int *exists, int create,
BIO_printf(bio_err, "Out of memory\n");
} else if (!rand_serial(ret, ai)) {
BIO_printf(bio_err, "Error creating random number to store in %s\n",
- serialfile);
+ serialfile);
BN_free(ret);
ret = NULL;
}
} else {
if (!a2i_ASN1_INTEGER(in, ai, buf, 1024)) {
BIO_printf(bio_err, "Unable to load number from %s\n",
- serialfile);
+ serialfile);
goto err;
}
ret = ASN1_INTEGER_to_BN(ai, NULL);
@@ -1541,7 +1541,7 @@ BIGNUM *load_serial(const char *serialfile, int *exists, int create,
*retai = ai;
ai = NULL;
}
- err:
+err:
if (ret == NULL)
ERR_print_errors(bio_err);
BIO_free(in);
@@ -1550,7 +1550,7 @@ BIGNUM *load_serial(const char *serialfile, int *exists, int create,
}
int save_serial(const char *serialfile, const char *suffix,
- const BIGNUM *serial, ASN1_INTEGER **retai)
+ const BIGNUM *serial, ASN1_INTEGER **retai)
{
char buf[1][BSIZE];
BIO *out = NULL;
@@ -1592,7 +1592,7 @@ int save_serial(const char *serialfile, const char *suffix,
*retai = ai;
ai = NULL;
}
- err:
+err:
if (!ret)
ERR_print_errors(bio_err);
BIO_free_all(out);
@@ -1601,7 +1601,7 @@ int save_serial(const char *serialfile, const char *suffix,
}
int rotate_serial(const char *serialfile, const char *new_suffix,
- const char *old_suffix)
+ const char *old_suffix)
{
char buf[2][BSIZE];
size_t i, j;
@@ -1625,21 +1625,21 @@ int rotate_serial(const char *serialfile, const char *new_suffix,
#ifdef ENOTDIR
&& errno != ENOTDIR
#endif
- ) {
+ ) {
BIO_printf(bio_err,
- "Unable to rename %s to %s\n", serialfile, buf[1]);
+ "Unable to rename %s to %s\n", serialfile, buf[1]);
perror("reason");
goto err;
}
if (rename(buf[0], serialfile) < 0) {
BIO_printf(bio_err,
- "Unable to rename %s to %s\n", buf[0], serialfile);
+ "Unable to rename %s to %s\n", buf[0], serialfile);
perror("reason");
rename(buf[1], serialfile);
goto err;
}
return 1;
- err:
+err:
ERR_print_errors(bio_err);
return 0;
}
@@ -1660,7 +1660,7 @@ int rand_serial(BIGNUM *b, ASN1_INTEGER *ai)
ret = 1;
- error:
+error:
if (btmp != b)
BN_free(btmp);
@@ -1688,7 +1688,7 @@ CA_DB *load_index(const char *dbfile, DB_ATTR *db_attr)
BIO_get_fp(in, &dbfp);
if (fstat(fileno(dbfp), &dbst) == -1) {
ERR_raise_data(ERR_LIB_SYS, errno,
- "calling fstat(%s)", dbfile);
+ "calling fstat(%s)", dbfile);
goto err;
}
#endif
@@ -1726,7 +1726,7 @@ CA_DB *load_index(const char *dbfile, DB_ATTR *db_attr)
retdb->dbst = dbst;
#endif
- err:
+err:
ERR_print_errors(bio_err);
NCONF_free(dbattr_conf);
TXT_DB_free(tmpdb);
@@ -1740,24 +1740,24 @@ CA_DB *load_index(const char *dbfile, DB_ATTR *db_attr)
int index_index(CA_DB *db)
{
if (!TXT_DB_create_index(db->db, DB_serial, NULL,
- LHASH_HASH_FN(index_serial),
- LHASH_COMP_FN(index_serial))) {
+ LHASH_HASH_FN(index_serial),
+ LHASH_COMP_FN(index_serial))) {
BIO_printf(bio_err,
- "Error creating serial number index:(%ld,%ld,%ld)\n",
- db->db->error, db->db->arg1, db->db->arg2);
+ "Error creating serial number index:(%ld,%ld,%ld)\n",
+ db->db->error, db->db->arg1, db->db->arg2);
goto err;
}
if (db->attributes.unique_subject
&& !TXT_DB_create_index(db->db, DB_name, index_name_qual,
- LHASH_HASH_FN(index_name),
- LHASH_COMP_FN(index_name))) {
+ LHASH_HASH_FN(index_name),
+ LHASH_COMP_FN(index_name))) {
BIO_printf(bio_err, "Error creating name index:(%ld,%ld,%ld)\n",
- db->db->error, db->db->arg1, db->db->arg2);
+ db->db->error, db->db->arg1, db->db->arg2);
goto err;
}
return 1;
- err:
+err:
ERR_print_errors(bio_err);
return 0;
}
@@ -1800,17 +1800,17 @@ int save_index(const char *dbfile, const char *suffix, CA_DB *db)
goto err;
}
BIO_printf(out, "unique_subject = %s\n",
- db->attributes.unique_subject ? "yes" : "no");
+ db->attributes.unique_subject ? "yes" : "no");
BIO_free(out);
return 1;
- err:
+err:
ERR_print_errors(bio_err);
return 0;
}
int rotate_index(const char *dbfile, const char *new_suffix,
- const char *old_suffix)
+ const char *old_suffix)
{
char buf[5][BSIZE];
size_t i, j;
@@ -1840,7 +1840,7 @@ int rotate_index(const char *dbfile, const char *new_suffix,
#ifdef ENOTDIR
&& errno != ENOTDIR
#endif
- ) {
+ ) {
BIO_printf(bio_err, "Unable to rename %s to %s\n", dbfile, buf[1]);
perror("reason");
goto err;
@@ -1855,7 +1855,7 @@ int rotate_index(const char *dbfile, const char *new_suffix,
#ifdef ENOTDIR
&& errno != ENOTDIR
#endif
- ) {
+ ) {
BIO_printf(bio_err, "Unable to rename %s to %s\n", buf[4], buf[3]);
perror("reason");
rename(dbfile, buf[0]);
@@ -1871,7 +1871,7 @@ int rotate_index(const char *dbfile, const char *new_suffix,
goto err;
}
return 1;
- err:
+err:
ERR_print_errors(bio_err);
return 0;
}
@@ -1889,17 +1889,17 @@ int parse_yesno(const char *str, int def)
{
if (str) {
switch (*str) {
- case 'f': /* false */
- case 'F': /* FALSE */
- case 'n': /* no */
- case 'N': /* NO */
- case '0': /* 0 */
+ case 'f': /* false */
+ case 'F': /* FALSE */
+ case 'n': /* no */
+ case 'N': /* NO */
+ case '0': /* 0 */
return 0;
- case 't': /* true */
- case 'T': /* TRUE */
- case 'y': /* yes */
- case 'Y': /* YES */
- case '1': /* 1 */
+ case 't': /* true */
+ case 'T': /* TRUE */
+ case 'y': /* yes */
+ case 'Y': /* YES */
+ case '1': /* 1 */
return 1;
}
}
@@ -1912,7 +1912,7 @@ int parse_yesno(const char *str, int def)
* and characters may be escaped by \
*/
X509_NAME *parse_name(const char *cp, int chtype, int canmulti,
- const char *desc)
+ const char *desc)
{
int nextismulti = 0;
char *work;
@@ -1920,10 +1920,10 @@ X509_NAME *parse_name(const char *cp, int chtype, int canmulti,
if (*cp++ != '/') {
BIO_printf(bio_err,
- "%s: %s name is expected to be in the format "
- "/type0=value0/type1=value1/type2=... where characters may "
- "be escaped by \\. This name is not in that format: '%s'\n",
- opt_getprog(), desc, --cp);
+ "%s: %s name is expected to be in the format "
+ "/type0=value0/type1=value1/type2=... where characters may "
+ "be escaped by \\. This name is not in that format: '%s'\n",
+ opt_getprog(), desc, --cp);
return NULL;
}
@@ -1935,7 +1935,7 @@ X509_NAME *parse_name(const char *cp, int chtype, int canmulti,
work = OPENSSL_strdup(cp);
if (work == NULL) {
BIO_printf(bio_err, "%s: Error copying %s name input\n",
- opt_getprog(), desc);
+ opt_getprog(), desc);
goto err;
}
@@ -1954,8 +1954,8 @@ X509_NAME *parse_name(const char *cp, int chtype, int canmulti,
*bp++ = '\0';
if (*cp == '\0') {
BIO_printf(bio_err,
- "%s: Missing '=' after RDN type string '%s' in %s name string\n",
- opt_getprog(), typestr, desc);
+ "%s: Missing '=' after RDN type string '%s' in %s name string\n",
+ opt_getprog(), typestr, desc);
goto err;
}
++cp;
@@ -1970,8 +1970,8 @@ X509_NAME *parse_name(const char *cp, int chtype, int canmulti,
}
if (*cp == '\\' && *++cp == '\0') {
BIO_printf(bio_err,
- "%s: Escape character at end of %s name string\n",
- opt_getprog(), desc);
+ "%s: Escape character at end of %s name string\n",
+ opt_getprog(), desc);
goto err;
}
}
@@ -1985,27 +1985,27 @@ X509_NAME *parse_name(const char *cp, int chtype, int canmulti,
nid = OBJ_txt2nid(typestr);
if (nid == NID_undef) {
BIO_printf(bio_err,
- "%s warning: Skipping unknown %s name attribute \"%s\"\n",
- opt_getprog(), desc, typestr);
+ "%s warning: Skipping unknown %s name attribute \"%s\"\n",
+ opt_getprog(), desc, typestr);
if (ismulti)
BIO_printf(bio_err,
- "%s hint: a '+' in a value string needs be escaped using '\\' else a new member of a multi-valued RDN is expected\n",
- opt_getprog());
+ "%s hint: a '+' in a value string needs be escaped using '\\' else a new member of a multi-valued RDN is expected\n",
+ opt_getprog());
continue;
}
if (*valstr == '\0') {
BIO_printf(bio_err,
- "%s warning: No value provided for %s name attribute \"%s\", skipped\n",
- opt_getprog(), desc, typestr);
+ "%s warning: No value provided for %s name attribute \"%s\", skipped\n",
+ opt_getprog(), desc, typestr);
continue;
}
if (!X509_NAME_add_entry_by_NID(n, nid, chtype,
- valstr, (int)strlen((char *)valstr),
- -1, ismulti ? -1 : 0)) {
+ valstr, (int)strlen((char *)valstr),
+ -1, ismulti ? -1 : 0)) {
ERR_print_errors(bio_err);
BIO_printf(bio_err,
- "%s: Error adding %s name attribute \"/%s=%s\"\n",
- opt_getprog(), desc, typestr, valstr);
+ "%s: Error adding %s name attribute \"/%s=%s\"\n",
+ opt_getprog(), desc, typestr, valstr);
goto err;
}
}
@@ -2013,7 +2013,7 @@ X509_NAME *parse_name(const char *cp, int chtype, int canmulti,
OPENSSL_free(work);
return n;
- err:
+err:
X509_NAME_free(n);
OPENSSL_free(work);
return NULL;
@@ -2077,7 +2077,7 @@ int pkey_ctrl_string(EVP_PKEY_CTX *ctx, const char *value)
vtmp++;
rv = EVP_PKEY_CTX_ctrl_str(ctx, stmp, vtmp);
- err:
+err:
OPENSSL_free(stmp);
return rv;
}
@@ -2108,7 +2108,7 @@ void policies_print(X509_STORE_CTX *ctx)
explicit_policy = X509_STORE_CTX_get_explicit_policy(ctx);
BIO_printf(bio_err, "Require explicit Policy: %s\n",
- explicit_policy ? "True" : "False");
+ explicit_policy ? "True" : "False");
nodes_print("Authority", X509_policy_tree_get0_policies(tree));
nodes_print("User", X509_policy_tree_get0_user_policies(tree));
@@ -2172,8 +2172,8 @@ unsigned char *next_protos_parse(size_t *outlen, const char *in)
}
int check_cert_attributes(BIO *bio, X509 *x, const char *checkhost,
- const char *checkemail, const char *checkip,
- int print)
+ const char *checkemail, const char *checkip,
+ int print)
{
int valid_host = 0;
int valid_mail = 0;
@@ -2187,7 +2187,7 @@ int check_cert_attributes(BIO *bio, X509 *x, const char *checkhost,
valid_host = X509_check_host(x, checkhost, 0, 0, NULL);
if (print)
BIO_printf(bio, "Hostname %s does%s match certificate\n",
- checkhost, valid_host == 1 ? "" : " NOT");
+ checkhost, valid_host == 1 ? "" : " NOT");
ret = ret && valid_host > 0;
}
@@ -2195,7 +2195,7 @@ int check_cert_attributes(BIO *bio, X509 *x, const char *checkhost,
valid_mail = X509_check_email(x, checkemail, 0, 0);
if (print)
BIO_printf(bio, "Email %s does%s match certificate\n",
- checkemail, valid_mail ? "" : " NOT");
+ checkemail, valid_mail ? "" : " NOT");
ret = ret && valid_mail > 0;
}
@@ -2203,7 +2203,7 @@ int check_cert_attributes(BIO *bio, X509 *x, const char *checkhost,
valid_ip = X509_check_ip_asc(x, checkip, 0);
if (print)
BIO_printf(bio, "IP %s does%s match certificate\n",
- checkip, valid_ip ? "" : " NOT");
+ checkip, valid_ip ? "" : " NOT");
ret = ret && valid_ip > 0;
}
@@ -2271,7 +2271,7 @@ static int do_x509_req_init(X509_REQ *x, STACK_OF(OPENSSL_STRING) *opts)
}
static int do_sign_init(EVP_MD_CTX *ctx, EVP_PKEY *pkey,
- const char *md, STACK_OF(OPENSSL_STRING) *sigopts)
+ const char *md, STACK_OF(OPENSSL_STRING) *sigopts)
{
EVP_PKEY_CTX *pkctx = NULL;
char def_md[80];
@@ -2283,18 +2283,18 @@ static int do_sign_init(EVP_MD_CTX *ctx, EVP_PKEY *pkey,
* for this algorithm.
*/
if (EVP_PKEY_get_default_digest_name(pkey, def_md, sizeof(def_md)) == 2
- && strcmp(def_md, "UNDEF") == 0) {
+ && strcmp(def_md, "UNDEF") == 0) {
/* The signing algorithm requires there to be no digest */
md = NULL;
}
return EVP_DigestSignInit_ex(ctx, &pkctx, md, app_get0_libctx(),
- app_get0_propq(), pkey, NULL)
+ app_get0_propq(), pkey, NULL)
&& do_pkey_ctx_init(pkctx, sigopts);
}
static int adapt_keyid_ext(X509 *cert, X509V3_CTX *ext_ctx,
- const char *name, const char *value, int add_default)
+ const char *name, const char *value, int add_default)
{
const STACK_OF(X509_EXTENSION) *exts = X509_get0_extensions(cert);
X509_EXTENSION *new_ext = X509V3_EXT_nconf(NULL, ext_ctx, name, value);
@@ -2333,7 +2333,7 @@ int cert_matches_key(const X509 *cert, const EVP_PKEY *pkey)
/* Ensure RFC 5280 compliance, adapt keyIDs as needed, and sign the cert info */
int do_X509_sign(X509 *cert, int force_v1, EVP_PKEY *pkey, const char *md,
- STACK_OF(OPENSSL_STRING) *sigopts, X509V3_CTX *ext_ctx)
+ STACK_OF(OPENSSL_STRING) *sigopts, X509V3_CTX *ext_ctx)
{
EVP_MD_CTX *mctx = EVP_MD_CTX_new();
int self_sign;
@@ -2353,21 +2353,21 @@ int do_X509_sign(X509 *cert, int force_v1, EVP_PKEY *pkey, const char *md,
/* Prevent X509_V_ERR_MISSING_AUTHORITY_KEY_IDENTIFIER */
self_sign = cert_matches_key(cert, pkey);
if (!adapt_keyid_ext(cert, ext_ctx, "authorityKeyIdentifier",
- "keyid, issuer", !self_sign))
+ "keyid, issuer", !self_sign))
goto end;
}
/* May add further measures for ensuring RFC 5280 compliance, see #19805 */
if (mctx != NULL && do_sign_init(mctx, pkey, md, sigopts) > 0)
rv = (X509_sign_ctx(cert, mctx) > 0);
- end:
+end:
EVP_MD_CTX_free(mctx);
return rv;
}
/* Sign the certificate request info */
int do_X509_REQ_sign(X509_REQ *x, EVP_PKEY *pkey, const char *md,
- STACK_OF(OPENSSL_STRING) *sigopts)
+ STACK_OF(OPENSSL_STRING) *sigopts)
{
int rv = 0;
EVP_MD_CTX *mctx = EVP_MD_CTX_new();
@@ -2380,7 +2380,7 @@ int do_X509_REQ_sign(X509_REQ *x, EVP_PKEY *pkey, const char *md,
/* Sign the CRL info */
int do_X509_CRL_sign(X509_CRL *x, EVP_PKEY *pkey, const char *md,
- STACK_OF(OPENSSL_STRING) *sigopts)
+ STACK_OF(OPENSSL_STRING) *sigopts)
{
int rv = 0;
EVP_MD_CTX *mctx = EVP_MD_CTX_new();
@@ -2411,7 +2411,7 @@ int do_X509_verify(X509 *x, EVP_PKEY *pkey, STACK_OF(OPENSSL_STRING) *vfyopts)
* 0 if the signature check fails, or -1 if error occurs.
*/
int do_X509_REQ_verify(X509_REQ *x, EVP_PKEY *pkey,
- STACK_OF(OPENSSL_STRING) *vfyopts)
+ STACK_OF(OPENSSL_STRING) *vfyopts)
{
int rv = 0;
@@ -2473,7 +2473,7 @@ static X509_CRL *load_crl_crldp(STACK_OF(DIST_POINT) *crldp)
*/
static STACK_OF(X509_CRL) *crls_http_cb(const X509_STORE_CTX *ctx,
- const X509_NAME *nm)
+ const X509_NAME *nm)
{
X509 *x;
STACK_OF(X509_CRL) *crls = NULL;
@@ -2569,15 +2569,14 @@ BIO *app_http_tls_cb(BIO *bio, void *arg, int connect, int detail)
BIO *sbio = NULL;
X509_STORE *ts = SSL_CTX_get_cert_store(ssl_ctx);
X509_VERIFY_PARAM *vpm = X509_STORE_get0_param(ts);
- const char *host = vpm == NULL ? NULL :
- X509_VERIFY_PARAM_get0_host(vpm, 0 /* first hostname */);
+ const char *host = vpm == NULL ? NULL : X509_VERIFY_PARAM_get0_host(vpm, 0 /* first hostname */);
/* adapt after fixing callback design flaw, see #17088 */
if ((info->use_proxy
- && !OSSL_HTTP_proxy_connect(bio, info->server, info->port,
- NULL, NULL, /* no proxy credentials */
- info->timeout, bio_err, opt_getprog()))
- || (sbio = BIO_new(BIO_f_ssl())) == NULL) {
+ && !OSSL_HTTP_proxy_connect(bio, info->server, info->port,
+ NULL, NULL, /* no proxy credentials */
+ info->timeout, bio_err, opt_getprog()))
+ || (sbio = BIO_new(BIO_f_ssl())) == NULL) {
return NULL;
}
if ((ssl = SSL_new(ssl_ctx)) == NULL) {
@@ -2607,10 +2606,10 @@ void APP_HTTP_TLS_INFO_free(APP_HTTP_TLS_INFO *info)
}
ASN1_VALUE *app_http_get_asn1(const char *url, const char *proxy,
- const char *no_proxy, SSL_CTX *ssl_ctx,
- const STACK_OF(CONF_VALUE) *headers,
- long timeout, const char *expected_content_type,
- const ASN1_ITEM *it)
+ const char *no_proxy, SSL_CTX *ssl_ctx,
+ const STACK_OF(CONF_VALUE) *headers,
+ long timeout, const char *expected_content_type,
+ const ASN1_ITEM *it)
{
APP_HTTP_TLS_INFO info;
char *server;
@@ -2625,16 +2624,16 @@ ASN1_VALUE *app_http_get_asn1(const char *url, const char *proxy,
}
if (!OSSL_HTTP_parse_url(url, &use_ssl, NULL /* userinfo */, &server, &port,
- NULL /* port_num, */, NULL, NULL, NULL))
+ NULL /* port_num, */, NULL, NULL, NULL))
return NULL;
if (use_ssl && ssl_ctx == NULL) {
ERR_raise_data(ERR_LIB_HTTP, ERR_R_PASSED_NULL_PARAMETER,
- "missing SSL_CTX");
+ "missing SSL_CTX");
goto end;
}
if (!use_ssl && ssl_ctx != NULL) {
ERR_raise_data(ERR_LIB_HTTP, ERR_R_PASSED_INVALID_ARGUMENT,
- "SSL_CTX given but use_ssl == 0");
+ "SSL_CTX given but use_ssl == 0");
goto end;
}
@@ -2645,27 +2644,26 @@ ASN1_VALUE *app_http_get_asn1(const char *url, const char *proxy,
info.timeout = timeout;
info.ssl_ctx = ssl_ctx;
mem = OSSL_HTTP_get(url, proxy, no_proxy, NULL /* bio */, NULL /* rbio */,
- app_http_tls_cb, &info, 0 /* buf_size */, headers,
- expected_content_type, 1 /* expect_asn1 */,
- OSSL_HTTP_DEFAULT_MAX_RESP_LEN, timeout);
+ app_http_tls_cb, &info, 0 /* buf_size */, headers,
+ expected_content_type, 1 /* expect_asn1 */,
+ OSSL_HTTP_DEFAULT_MAX_RESP_LEN, timeout);
resp = ASN1_item_d2i_bio(it, mem, NULL);
BIO_free(mem);
- end:
+end:
OPENSSL_free(server);
OPENSSL_free(port);
return resp;
-
}
ASN1_VALUE *app_http_post_asn1(const char *host, const char *port,
- const char *path, const char *proxy,
- const char *no_proxy, SSL_CTX *ssl_ctx,
- const STACK_OF(CONF_VALUE) *headers,
- const char *content_type,
- ASN1_VALUE *req, const ASN1_ITEM *req_it,
- const char *expected_content_type,
- long timeout, const ASN1_ITEM *rsp_it)
+ const char *path, const char *proxy,
+ const char *no_proxy, SSL_CTX *ssl_ctx,
+ const STACK_OF(CONF_VALUE) *headers,
+ const char *content_type,
+ ASN1_VALUE *req, const ASN1_ITEM *req_it,
+ const char *expected_content_type,
+ long timeout, const ASN1_ITEM *rsp_it)
{
int use_ssl = ssl_ctx != NULL;
APP_HTTP_TLS_INFO info;
@@ -2682,12 +2680,12 @@ ASN1_VALUE *app_http_post_asn1(const char *host, const char *port,
info.timeout = timeout;
info.ssl_ctx = ssl_ctx;
rsp = OSSL_HTTP_transfer(NULL, host, port, path, use_ssl,
- proxy, no_proxy, NULL /* bio */, NULL /* rbio */,
- app_http_tls_cb, &info,
- 0 /* buf_size */, headers, content_type, req_mem,
- expected_content_type, 1 /* expect_asn1 */,
- OSSL_HTTP_DEFAULT_MAX_RESP_LEN, timeout,
- 0 /* keep_alive */);
+ proxy, no_proxy, NULL /* bio */, NULL /* rbio */,
+ app_http_tls_cb, &info,
+ 0 /* buf_size */, headers, content_type, req_mem,
+ expected_content_type, 1 /* expect_asn1 */,
+ OSSL_HTTP_DEFAULT_MAX_RESP_LEN, timeout,
+ 0 /* keep_alive */);
BIO_free(req_mem);
res = ASN1_item_d2i_bio(rsp_it, rsp, NULL);
BIO_free(rsp);
@@ -2700,13 +2698,13 @@ ASN1_VALUE *app_http_post_asn1(const char *host, const char *port,
* Platform-specific sections
*/
#if defined(_WIN32)
-# ifdef fileno
-# undef fileno
-# define fileno(a) (int)_fileno(a)
-# endif
+#ifdef fileno
+#undef fileno
+#define fileno(a) (int)_fileno(a)
+#endif
-# include <windows.h>
-# include <tchar.h>
+#include <windows.h>
+#include <tchar.h>
static int WIN32_rename(const char *from, const char *to)
{
@@ -2717,21 +2715,21 @@ static int WIN32_rename(const char *from, const char *to)
if (sizeof(TCHAR) == 1) {
tfrom = (TCHAR *)from;
tto = (TCHAR *)to;
- } else { /* UNICODE path */
+ } else { /* UNICODE path */
size_t i, flen = strlen(from) + 1, tlen = strlen(to) + 1;
tfrom = malloc(sizeof(*tfrom) * (flen + tlen));
if (tfrom == NULL)
goto err;
tto = tfrom + flen;
-# if !defined(_WIN32_WCE) || _WIN32_WCE >= 101
+#if !defined(_WIN32_WCE) || _WIN32_WCE >= 101
if (!MultiByteToWideChar(CP_ACP, 0, from, (int)flen, (WCHAR *)tfrom, (int)flen))
-# endif
+#endif
for (i = 0; i < flen; i++)
tfrom[i] = (TCHAR)from[i];
-# if !defined(_WIN32_WCE) || _WIN32_WCE >= 101
+#if !defined(_WIN32_WCE) || _WIN32_WCE >= 101
if (!MultiByteToWideChar(CP_ACP, 0, to, (int)tlen, (WCHAR *)tto, (int)tlen))
-# endif
+#endif
for (i = 0; i < tlen; i++)
tto[i] = (TCHAR)to[i];
}
@@ -2749,10 +2747,10 @@ static int WIN32_rename(const char *from, const char *to)
else if (err == ERROR_ACCESS_DENIED)
errno = EACCES;
else
- errno = EINVAL; /* we could map more codes... */
- err:
+ errno = EINVAL; /* we could map more codes... */
+err:
ret = -1;
- ok:
+ok:
if (tfrom != NULL && tfrom != (TCHAR *)from)
free(tfrom);
return ret;
@@ -2768,30 +2766,30 @@ double app_tminterval(int stop, int usertime)
static ULARGE_INTEGER tmstart;
static int warning = 1;
int use_GetSystemTime = 1;
-# ifdef _WIN32_WINNT
+#ifdef _WIN32_WINNT
static HANDLE proc = NULL;
if (proc == NULL) {
if (check_winnt())
proc = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE,
- GetCurrentProcessId());
+ GetCurrentProcessId());
if (proc == NULL)
- proc = (HANDLE) - 1;
+ proc = (HANDLE)-1;
}
- if (usertime && proc != (HANDLE) - 1) {
+ if (usertime && proc != (HANDLE)-1) {
FILETIME junk;
GetProcessTimes(proc, &junk, &junk, &junk, &now);
use_GetSystemTime = 0;
}
-# endif
+#endif
if (use_GetSystemTime) {
SYSTEMTIME systime;
if (usertime && warning) {
BIO_printf(bio_err, "To get meaningful results, run "
- "this program on idle system.\n");
+ "this program on idle system.\n");
warning = 0;
}
GetSystemTime(&systime);
@@ -2813,44 +2811,44 @@ double app_tminterval(int stop, int usertime)
return ret;
}
#elif defined(OPENSSL_SYS_VXWORKS)
-# include <time.h>
+#include <time.h>
double app_tminterval(int stop, int usertime)
{
double ret = 0;
-# ifdef CLOCK_REALTIME
+#ifdef CLOCK_REALTIME
static struct timespec tmstart;
struct timespec now;
-# else
+#else
static unsigned long tmstart;
unsigned long now;
-# endif
+#endif
static int warning = 1;
if (usertime && warning) {
BIO_printf(bio_err, "To get meaningful results, run "
- "this program on idle system.\n");
+ "this program on idle system.\n");
warning = 0;
}
-# ifdef CLOCK_REALTIME
+#ifdef CLOCK_REALTIME
clock_gettime(CLOCK_REALTIME, &now);
if (stop == TM_START)
tmstart = now;
else
ret = ((now.tv_sec + now.tv_nsec * 1e-9)
- - (tmstart.tv_sec + tmstart.tv_nsec * 1e-9));
-# else
+ - (tmstart.tv_sec + tmstart.tv_nsec * 1e-9));
+#else
now = tickGet();
if (stop == TM_START)
tmstart = now;
else
ret = (now - tmstart) / (double)sysClkRateGet();
-# endif
+#endif
return ret;
}
-#elif defined(_SC_CLK_TCK) /* by means of unistd.h */
-# include <sys/times.h>
+#elif defined(_SC_CLK_TCK) /* by means of unistd.h */
+#include <sys/times.h>
double app_tminterval(int stop, int usertime)
{
@@ -2874,8 +2872,8 @@ double app_tminterval(int stop, int usertime)
}
#else
-# include <sys/time.h>
-# include <sys/resource.h>
+#include <sys/time.h>
+#include <sys/resource.h>
double app_tminterval(int stop, int usertime)
{
@@ -2893,7 +2891,7 @@ double app_tminterval(int stop, int usertime)
tmstart = now;
else
ret = ((now.tv_sec + now.tv_usec * 1e-6)
- - (tmstart.tv_sec + tmstart.tv_usec * 1e-6));
+ - (tmstart.tv_sec + tmstart.tv_usec * 1e-6));
return ret;
}
@@ -2915,7 +2913,7 @@ int app_isdir(const char *name)
/* raw_read|write section */
#if defined(__VMS)
-# include "vms_term_sock.h"
+#include "vms_term_sock.h"
static int stdin_sock = -1;
static void close_stdin_sock(void)
@@ -2955,7 +2953,7 @@ int raw_read_stdin(void *buf, int siz)
return -1;
}
#elif defined(__VMS)
-# include <sys/socket.h>
+#include <sys/socket.h>
int raw_read_stdin(void *buf, int siz)
{
@@ -3001,13 +2999,13 @@ int raw_write_stdout(const void *buf, int siz)
BIO *dup_bio_in(int format)
{
return BIO_new_fp(stdin,
- BIO_NOCLOSE | (FMT_istext(format) ? BIO_FP_TEXT : 0));
+ BIO_NOCLOSE | (FMT_istext(format) ? BIO_FP_TEXT : 0));
}
BIO *dup_bio_out(int format)
{
BIO *b = BIO_new_fp(stdout,
- BIO_NOCLOSE | (FMT_istext(format) ? BIO_FP_TEXT : 0));
+ BIO_NOCLOSE | (FMT_istext(format) ? BIO_FP_TEXT : 0));
#ifdef OPENSSL_SYS_VMS
if (b != NULL && FMT_istext(format)) {
@@ -3027,7 +3025,7 @@ BIO *dup_bio_out(int format)
BIO *dup_bio_err(int format)
{
BIO *b = BIO_new_fp(stderr,
- BIO_NOCLOSE | (FMT_istext(format) ? BIO_FP_TEXT : 0));
+ BIO_NOCLOSE | (FMT_istext(format) ? BIO_FP_TEXT : 0));
#ifdef OPENSSL_SYS_VMS
if (b != NULL && FMT_istext(format)) {
@@ -3053,12 +3051,12 @@ void unbuffer(FILE *fp)
* temporarily.
*/
#if defined(OPENSSL_SYS_VMS) && defined(__DECC)
-# pragma environment save
-# pragma message disable maylosedata2
+#pragma environment save
+#pragma message disable maylosedata2
#endif
setbuf(fp, NULL);
#if defined(OPENSSL_SYS_VMS) && defined(__DECC)
-# pragma environment restore
+#pragma environment restore
#endif
}
@@ -3109,21 +3107,21 @@ BIO *bio_open_owner(const char *filename, int format, int private)
textmode = FMT_istext(format);
#ifndef OPENSSL_NO_POSIX_IO
mode = O_WRONLY;
-# ifdef O_CREAT
+#ifdef O_CREAT
mode |= O_CREAT;
-# endif
-# ifdef O_TRUNC
+#endif
+#ifdef O_TRUNC
mode |= O_TRUNC;
-# endif
+#endif
if (!textmode) {
-# ifdef O_BINARY
+#ifdef O_BINARY
mode |= O_BINARY;
-# elif defined(_O_BINARY)
+#elif defined(_O_BINARY)
mode |= _O_BINARY;
-# endif
+#endif
}
-# ifdef OPENSSL_SYS_VMS
+#ifdef OPENSSL_SYS_VMS
/*
* VMS doesn't have O_BINARY, it just doesn't make sense. But,
* it still needs to know that we're going binary, or fdopen()
@@ -3133,15 +3131,15 @@ BIO *bio_open_owner(const char *filename, int format, int private)
if (!textmode)
fd = open(filename, mode, 0600, "ctx=bin");
else
-# endif
+#endif
fd = open(filename, mode, 0600);
if (fd < 0)
goto err;
fp = fdopen(fd, modestr('w', format));
-#else /* OPENSSL_NO_POSIX_IO */
+#else /* OPENSSL_NO_POSIX_IO */
/* Have stdio but not Posix IO, do the best we can */
fp = fopen(filename, modestr('w', format));
-#endif /* OPENSSL_NO_POSIX_IO */
+#endif /* OPENSSL_NO_POSIX_IO */
if (fp == NULL)
goto err;
bflags = BIO_CLOSE;
@@ -3151,9 +3149,9 @@ BIO *bio_open_owner(const char *filename, int format, int private)
if (b != NULL)
return b;
- err:
+err:
BIO_printf(bio_err, "%s: Can't open \"%s\" for writing, %s\n",
- opt_getprog(), filename, strerror(errno));
+ opt_getprog(), filename, strerror(errno));
ERR_print_errors(bio_err);
/* If we have fp, then fdopen took over fd, so don't close both. */
if (fp != NULL)
@@ -3166,7 +3164,7 @@ BIO *bio_open_owner(const char *filename, int format, int private)
}
static BIO *bio_open_default_(const char *filename, char mode, int format,
- int quiet)
+ int quiet)
{
BIO *ret;
@@ -3179,8 +3177,8 @@ static BIO *bio_open_default_(const char *filename, char mode, int format,
if (ret != NULL)
return ret;
BIO_printf(bio_err,
- "Can't open %s, %s\n",
- mode == 'r' ? "stdin" : "stdout", strerror(errno));
+ "Can't open %s, %s\n",
+ mode == 'r' ? "stdin" : "stdout", strerror(errno));
} else {
ret = BIO_new_file(filename, modestr(mode, format));
if (quiet) {
@@ -3190,8 +3188,8 @@ static BIO *bio_open_default_(const char *filename, char mode, int format,
if (ret != NULL)
return ret;
BIO_printf(bio_err,
- "Can't open \"%s\" for %s, %s\n",
- filename, modeverb(mode), strerror(errno));
+ "Can't open \"%s\" for %s, %s\n",
+ filename, modeverb(mode), strerror(errno));
}
ERR_print_errors(bio_err);
return NULL;
@@ -3268,7 +3266,7 @@ void wait_for_async(SSL *s)
#if defined(OPENSSL_SYS_MSDOS)
int has_stdin_waiting(void)
{
-# if defined(OPENSSL_SYS_WINDOWS)
+#if defined(OPENSSL_SYS_WINDOWS)
HANDLE inhand = GetStdHandle(STD_INPUT_HANDLE);
DWORD events = 0;
INPUT_RECORD inputrec;
@@ -3287,7 +3285,7 @@ int has_stdin_waiting(void)
}
return 0;
}
-# endif
+#endif
return _kbhit();
}
#endif
@@ -3303,16 +3301,16 @@ void corrupt_signature(const ASN1_STRING *signature)
int check_cert_time_string(const char *time, const char *desc)
{
if (time == NULL || strcmp(time, "today") == 0
- || ASN1_TIME_set_string_X509(NULL, time))
+ || ASN1_TIME_set_string_X509(NULL, time))
return 1;
BIO_printf(bio_err,
- "%s is invalid, it should be \"today\" or have format [CC]YYMMDDHHMMSSZ\n",
- desc);
+ "%s is invalid, it should be \"today\" or have format [CC]YYMMDDHHMMSSZ\n",
+ desc);
return 0;
}
int set_cert_times(X509 *x, const char *startdate, const char *enddate,
- int days, int strict_compare_times)
+ int days, int strict_compare_times)
{
if (!check_cert_time_string(startdate, "start date"))
return 0;
@@ -3344,7 +3342,7 @@ int set_cert_times(X509 *x, const char *startdate, const char *enddate,
}
if (ASN1_TIME_compare(X509_get0_notAfter(x), X509_get0_notBefore(x)) < 0) {
BIO_printf(bio_err, "%s: end date before start date\n",
- strict_compare_times ? "Error" : "Warning");
+ strict_compare_times ? "Error" : "Warning");
if (strict_compare_times)
return 0;
}
@@ -3377,7 +3375,7 @@ end:
}
int set_crl_nextupdate(X509_CRL *crl, const char *nextupdate,
- long days, long hours, long secs)
+ long days, long hours, long secs)
{
int ret = 0;
ASN1_TIME *tm = ASN1_TIME_new();
@@ -3411,7 +3409,7 @@ void make_uppercase(char *string)
}
OSSL_PARAM *app_params_new_from_opts(STACK_OF(OPENSSL_STRING) *opts,
- const OSSL_PARAM *paramdefs)
+ const OSSL_PARAM *paramdefs)
{
OSSL_PARAM *params = NULL;
size_t sz = (size_t)sk_OPENSSL_STRING_num(opts);
@@ -3436,7 +3434,7 @@ OSSL_PARAM *app_params_new_from_opts(STACK_OF(OPENSSL_STRING) *opts,
/* Skip over the separator so that vmtp points to the value */
vtmp++;
if (!OSSL_PARAM_allocate_from_text(¶ms[params_n], paramdefs,
- stmp, vtmp, strlen(vtmp), &found))
+ stmp, vtmp, strlen(vtmp), &found))
goto err;
OPENSSL_free(stmp);
}
@@ -3445,7 +3443,7 @@ OSSL_PARAM *app_params_new_from_opts(STACK_OF(OPENSSL_STRING) *opts,
err:
OPENSSL_free(stmp);
BIO_printf(bio_err, "Parameter %s '%s'\n", found ? "error" : "unknown",
- opt);
+ opt);
ERR_print_errors(bio_err);
app_params_free(params);
return NULL;
@@ -3475,10 +3473,10 @@ EVP_PKEY *app_keygen(EVP_PKEY_CTX *ctx, const char *alg, int bits, int verbose)
}
if (!RAND_status())
BIO_printf(bio_err, "Warning: generating random key material may take a long time\n"
- "if the system has a poor entropy source\n");
+ "if the system has a poor entropy source\n");
if (EVP_PKEY_keygen(ctx, &res) <= 0)
BIO_printf(bio_err, "%s: Error generating %s key\n", opt_getprog(),
- alg != NULL ? alg : "asymmetric");
+ alg != NULL ? alg : "asymmetric");
return res;
}
@@ -3488,10 +3486,10 @@ EVP_PKEY *app_paramgen(EVP_PKEY_CTX *ctx, const char *alg)
if (!RAND_status())
BIO_printf(bio_err, "Warning: generating random key parameters may take a long time\n"
- "if the system has a poor entropy source\n");
+ "if the system has a poor entropy source\n");
if (EVP_PKEY_paramgen(ctx, &res) <= 0)
BIO_printf(bio_err, "%s: Generating %s key parameters failed\n",
- opt_getprog(), alg != NULL ? alg : "asymmetric");
+ opt_getprog(), alg != NULL ? alg : "asymmetric");
return res;
}
@@ -3582,7 +3580,7 @@ char *process_additional_mac_key_arguments(const char *arg)
outbuf = app_malloc(strlen("hexkey:") + total_read * 2 + 1, "MACOPT KEYFILE");
strcpy(outbuf, "hexkey:");
OPENSSL_buf2hexstr_ex(outbuf + strlen("hexkey:"), total_read * 2 + 1,
- NULL, (unsigned char *)inbuf, total_read, '\0');
+ NULL, (unsigned char *)inbuf, total_read, '\0');
OPENSSL_clear_free(inbuf, MAX_KEY_SIZE);
return outbuf;
}
diff --git a/apps/lib/apps_opt_printf.c b/apps/lib/apps_opt_printf.c
index e15f4b795e..7816cb201b 100644
--- a/apps/lib/apps_opt_printf.c
+++ b/apps/lib/apps_opt_printf.c
@@ -22,4 +22,3 @@ int opt_printf_stderr(const char *fmt, ...)
va_end(ap);
return ret;
}
-
diff --git a/apps/lib/apps_ui.c b/apps/lib/apps_ui.c
index 48a39208d9..ecfa25e076 100644
--- a/apps/lib/apps_ui.c
+++ b/apps/lib/apps_ui.c
@@ -32,17 +32,14 @@ static int ui_read(UI *ui, UI_STRING *uis)
&& UI_get0_user_data(ui)) {
switch (UI_get_string_type(uis)) {
case UIT_PROMPT:
- case UIT_VERIFY:
- {
- const char *password =
- ((PW_CB_DATA *)UI_get0_user_data(ui))->password;
-
- if (password != NULL) {
- UI_set_result(ui, uis, password);
- return 1;
- }
+ case UIT_VERIFY: {
+ const char *password = ((PW_CB_DATA *)UI_get0_user_data(ui))->password;
+
+ if (password != NULL) {
+ UI_set_result(ui, uis, password);
+ return 1;
}
- break;
+ } break;
case UIT_NONE:
case UIT_BOOLEAN:
case UIT_INFO:
@@ -67,15 +64,12 @@ static int ui_write(UI *ui, UI_STRING *uis)
&& UI_get0_user_data(ui)) {
switch (UI_get_string_type(uis)) {
case UIT_PROMPT:
- case UIT_VERIFY:
- {
- const char *password =
- ((PW_CB_DATA *)UI_get0_user_data(ui))->password;
+ case UIT_VERIFY: {
+ const char *password = ((PW_CB_DATA *)UI_get0_user_data(ui))->password;
- if (password != NULL)
- return 1;
- }
- break;
+ if (password != NULL)
+ return 1;
+ } break;
case UIT_NONE:
case UIT_BOOLEAN:
case UIT_INFO:
@@ -101,7 +95,7 @@ static int ui_close(UI *ui)
/* object_name defaults to prompt_info from ui user data if present */
static char *ui_prompt_construct(UI *ui, const char *phrase_desc,
- const char *object_name)
+ const char *object_name)
{
PW_CB_DATA *cb_data = (PW_CB_DATA *)UI_get0_user_data(ui);
@@ -132,8 +126,7 @@ int setup_ui_method(void)
&& 0 == UI_method_set_reader(ui_method, ui_read)
&& 0 == UI_method_set_writer(ui_method, ui_write)
&& 0 == UI_method_set_closer(ui_method, ui_close)
- && 0 == UI_method_set_prompt_constructor(ui_method,
- ui_prompt_construct);
+ && 0 == UI_method_set_prompt_constructor(ui_method, ui_prompt_construct);
}
void destroy_ui_method(void)
@@ -190,12 +183,12 @@ int password_callback(char *buf, int bufsiz, int verify, PW_CB_DATA *cb_data)
(void)UI_add_user_data(ui, cb_data);
ok = UI_add_input_string(ui, prompt, ui_flags, buf,
- PW_MIN_LENGTH, bufsiz - 1);
+ PW_MIN_LENGTH, bufsiz - 1);
if (ok >= 0 && verify) {
buff = ui_malloc(bufsiz, "password buffer");
ok = UI_add_verify_string(ui, prompt, ui_flags, buff,
- PW_MIN_LENGTH, bufsiz - 1, buf);
+ PW_MIN_LENGTH, bufsiz - 1, buf);
}
if (ok >= 0)
do {
diff --git a/apps/lib/cmp_mock_srv.c b/apps/lib/cmp_mock_srv.c
index 73ab1eb560..bf8b06c390 100644
--- a/apps/lib/cmp_mock_srv.c
+++ b/apps/lib/cmp_mock_srv.c
@@ -17,21 +17,21 @@
/* the context for the CMP mock server */
typedef struct {
- X509 *refCert; /* cert to expect for oldCertID in kur/rr msg */
- X509 *certOut; /* certificate to be returned in cp/ip/kup msg */
- EVP_PKEY *keyOut; /* Private key to be returned for central keygen */
- X509_CRL *crlOut; /* CRL to be returned in genp for crls */
- STACK_OF(X509) *chainOut; /* chain of certOut to add to extraCerts field */
+ X509 *refCert; /* cert to expect for oldCertID in kur/rr msg */
+ X509 *certOut; /* certificate to be returned in cp/ip/kup msg */
+ EVP_PKEY *keyOut; /* Private key to be returned for central keygen */
+ X509_CRL *crlOut; /* CRL to be returned in genp for crls */
+ STACK_OF(X509) *chainOut; /* chain of certOut to add to extraCerts field */
STACK_OF(X509) *caPubsOut; /* used in caPubs of ip and in caCerts of genp */
- X509 *newWithNew; /* to return in newWithNew of rootKeyUpdate */
- X509 *newWithOld; /* to return in newWithOld of rootKeyUpdate */
- X509 *oldWithNew; /* to return in oldWithNew of rootKeyUpdate */
+ X509 *newWithNew; /* to return in newWithNew of rootKeyUpdate */
+ X509 *newWithOld; /* to return in newWithOld of rootKeyUpdate */
+ X509 *oldWithNew; /* to return in oldWithNew of rootKeyUpdate */
OSSL_CMP_PKISI *statusOut; /* status for ip/cp/kup/rp msg unless polling */
- int sendError; /* send error response on given request type */
- OSSL_CMP_MSG *req; /* original request message during polling */
- int pollCount; /* number of polls before actual cert response */
- int curr_pollCount; /* number of polls so far for current request */
- int checkAfterTime; /* time the client should wait between polling */
+ int sendError; /* send error response on given request type */
+ OSSL_CMP_MSG *req; /* original request message during polling */
+ int pollCount; /* number of polls before actual cert response */
+ int curr_pollCount; /* number of polls so far for current request */
+ int checkAfterTime; /* time the client should wait between polling */
} mock_srv_ctx;
static void mock_srv_ctx_free(mock_srv_ctx *ctx)
@@ -62,27 +62,27 @@ static mock_srv_ctx *mock_srv_ctx_new(void)
/* all other elements are initialized to 0 or NULL, respectively */
return ctx;
- err:
+err:
mock_srv_ctx_free(ctx);
return NULL;
}
-#define DEFINE_OSSL_SET1_CERT(FIELD) \
- int ossl_cmp_mock_srv_set1_##FIELD(OSSL_CMP_SRV_CTX *srv_ctx, \
- X509 *cert) \
- { \
+#define DEFINE_OSSL_SET1_CERT(FIELD) \
+ int ossl_cmp_mock_srv_set1_##FIELD(OSSL_CMP_SRV_CTX *srv_ctx, \
+ X509 *cert) \
+ { \
mock_srv_ctx *ctx = OSSL_CMP_SRV_CTX_get0_custom_ctx(srv_ctx); \
- \
- if (ctx == NULL) { \
- ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT); \
- return 0; \
- } \
- if (cert == NULL || X509_up_ref(cert)) { \
- X509_free(ctx->FIELD); \
- ctx->FIELD = cert; \
- return 1; \
- } \
- return 0; \
+ \
+ if (ctx == NULL) { \
+ ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT); \
+ return 0; \
+ } \
+ if (cert == NULL || X509_up_ref(cert)) { \
+ X509_free(ctx->FIELD); \
+ ctx->FIELD = cert; \
+ return 1; \
+ } \
+ return 0; \
}
DEFINE_OSSL_SET1_CERT(refCert)
@@ -104,7 +104,7 @@ int ossl_cmp_mock_srv_set1_keyOut(OSSL_CMP_SRV_CTX *srv_ctx, EVP_PKEY *pkey)
}
int ossl_cmp_mock_srv_set1_crlOut(OSSL_CMP_SRV_CTX *srv_ctx,
- X509_CRL *crl)
+ X509_CRL *crl)
{
mock_srv_ctx *ctx = OSSL_CMP_SRV_CTX_get0_custom_ctx(srv_ctx);
@@ -120,7 +120,7 @@ int ossl_cmp_mock_srv_set1_crlOut(OSSL_CMP_SRV_CTX *srv_ctx,
}
int ossl_cmp_mock_srv_set1_chainOut(OSSL_CMP_SRV_CTX *srv_ctx,
- STACK_OF(X509) *chain)
+ STACK_OF(X509) *chain)
{
mock_srv_ctx *ctx = OSSL_CMP_SRV_CTX_get0_custom_ctx(srv_ctx);
STACK_OF(X509) *chain_copy = NULL;
@@ -137,7 +137,7 @@ int ossl_cmp_mock_srv_set1_chainOut(OSSL_CMP_SRV_CTX *srv_ctx,
}
int ossl_cmp_mock_srv_set1_caPubsOut(OSSL_CMP_SRV_CTX *srv_ctx,
- STACK_OF(X509) *caPubs)
+ STACK_OF(X509) *caPubs)
{
mock_srv_ctx *ctx = OSSL_CMP_SRV_CTX_get0_custom_ctx(srv_ctx);
STACK_OF(X509) *caPubs_copy = NULL;
@@ -158,7 +158,7 @@ DEFINE_OSSL_SET1_CERT(newWithOld)
DEFINE_OSSL_SET1_CERT(oldWithNew)
int ossl_cmp_mock_srv_set_statusInfo(OSSL_CMP_SRV_CTX *srv_ctx, int status,
- int fail_info, const char *text)
+ int fail_info, const char *text)
{
mock_srv_ctx *ctx = OSSL_CMP_SRV_CTX_get0_custom_ctx(srv_ctx);
OSSL_CMP_PKISI *si;
@@ -249,7 +249,7 @@ static int delayed_delivery(OSSL_CMP_SRV_CTX *srv_ctx, const OSSL_CMP_MSG *req)
/* check for matching reference cert components, as far as given */
static int refcert_cmp(const X509 *refcert,
- const X509_NAME *issuer, const ASN1_INTEGER *serial)
+ const X509_NAME *issuer, const ASN1_INTEGER *serial)
{
const X509_NAME *ref_issuer;
const ASN1_INTEGER *ref_serial;
@@ -264,7 +264,7 @@ static int refcert_cmp(const X509 *refcert,
/* reset the state that belongs to a transaction */
static int clean_transaction(OSSL_CMP_SRV_CTX *srv_ctx,
- ossl_unused const ASN1_OCTET_STRING *id)
+ ossl_unused const ASN1_OCTET_STRING *id)
{
mock_srv_ctx *ctx = OSSL_CMP_SRV_CTX_get0_custom_ctx(srv_ctx);
@@ -280,13 +280,13 @@ static int clean_transaction(OSSL_CMP_SRV_CTX *srv_ctx,
}
static OSSL_CMP_PKISI *process_cert_request(OSSL_CMP_SRV_CTX *srv_ctx,
- const OSSL_CMP_MSG *cert_req,
- ossl_unused int certReqId,
- const OSSL_CRMF_MSG *crm,
- const X509_REQ *p10cr,
- X509 **certOut,
- STACK_OF(X509) **chainOut,
- STACK_OF(X509) **caPubs)
+ const OSSL_CMP_MSG *cert_req,
+ ossl_unused int certReqId,
+ const OSSL_CRMF_MSG *crm,
+ const X509_REQ *p10cr,
+ X509 **certOut,
+ STACK_OF(X509) **chainOut,
+ STACK_OF(X509) **caPubs)
{
mock_srv_ctx *ctx = OSSL_CMP_SRV_CTX_get0_custom_ctx(srv_ctx);
int bodytype, central_keygen;
@@ -294,7 +294,7 @@ static OSSL_CMP_PKISI *process_cert_request(OSSL_CMP_SRV_CTX *srv_ctx,
EVP_PKEY *keyOut = NULL;
if (ctx == NULL || cert_req == NULL
- || certOut == NULL || chainOut == NULL || caPubs == NULL) {
+ || certOut == NULL || chainOut == NULL || caPubs == NULL) {
ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT);
return NULL;
}
@@ -320,8 +320,7 @@ static OSSL_CMP_PKISI *process_cert_request(OSSL_CMP_SRV_CTX *srv_ctx,
/* accept cert profile for cr messages only with the configured name */
if (OSSL_CMP_MSG_get_bodytype(cert_req) == OSSL_CMP_CR) {
- STACK_OF(OSSL_CMP_ITAV) *itavs =
- OSSL_CMP_HDR_get0_geninfo_ITAVs(OSSL_CMP_MSG_get0_header(cert_req));
+ STACK_OF(OSSL_CMP_ITAV) *itavs = OSSL_CMP_HDR_get0_geninfo_ITAVs(OSSL_CMP_MSG_get0_header(cert_req));
int i;
for (i = 0; i < sk_OSSL_CMP_ITAV_num(itavs); i++) {
@@ -340,8 +339,7 @@ static OSSL_CMP_PKISI *process_cert_request(OSSL_CMP_SRV_CTX *srv_ctx,
}
str = sk_ASN1_UTF8STRING_value(strs, 0);
if (str == NULL
- || (data =
- (const char *)ASN1_STRING_get0_data(str)) == NULL) {
+ || (data = (const char *)ASN1_STRING_get0_data(str)) == NULL) {
ERR_raise(ERR_LIB_CMP, ERR_R_PASSED_INVALID_ARGUMENT);
return NULL;
}
@@ -356,7 +354,7 @@ static OSSL_CMP_PKISI *process_cert_request(OSSL_CMP_SRV_CTX *srv_ctx,
/* accept cert update request only for the reference cert, if given */
if (bodytype == OSSL_CMP_KUR
- && crm != NULL /* thus not p10cr */ && ctx->refCert != NULL) {
+ && crm != NULL /* thus not p10cr */ && ctx->refCert != NULL) {
const OSSL_CRMF_CERTID *cid = OSSL_CRMF_MSG_get0_regCtrl_oldCertID(crm);
if (cid == NULL) {
@@ -364,15 +362,15 @@ static OSSL_CMP_PKISI *process_cert_request(OSSL_CMP_SRV_CTX *srv_ctx,
return NULL;
}
if (!refcert_cmp(ctx->refCert,
- OSSL_CRMF_CERTID_get0_issuer(cid),
- OSSL_CRMF_CERTID_get0_serialNumber(cid))) {
+ OSSL_CRMF_CERTID_get0_issuer(cid),
+ OSSL_CRMF_CERTID_get0_serialNumber(cid))) {
ERR_raise(ERR_LIB_CMP, CMP_R_WRONG_CERTID);
return NULL;
}
}
if (ctx->certOut != NULL
- && (*certOut = X509_dup(ctx->certOut)) == NULL)
+ && (*certOut = X509_dup(ctx->certOut)) == NULL)
/* Should return a cert produced from request template, see FR #16054 */
goto err;
@@ -383,7 +381,7 @@ static OSSL_CMP_PKISI *process_cert_request(OSSL_CMP_SRV_CTX *srv_ctx,
&& (ctx->keyOut == NULL
|| (keyOut = EVP_PKEY_dup(ctx->keyOut)) == NULL
|| !OSSL_CMP_CTX_set0_newPkey(OSSL_CMP_SRV_CTX_get0_cmp_ctx(srv_ctx),
- 1 /* priv */, keyOut))) {
+ 1 /* priv */, keyOut))) {
EVP_PKEY_free(keyOut);
goto err;
}
@@ -393,17 +391,17 @@ static OSSL_CMP_PKISI *process_cert_request(OSSL_CMP_SRV_CTX *srv_ctx,
*/
if (ctx->chainOut != NULL
- && (*chainOut = X509_chain_up_ref(ctx->chainOut)) == NULL)
+ && (*chainOut = X509_chain_up_ref(ctx->chainOut)) == NULL)
goto err;
if (ctx->caPubsOut != NULL /* OSSL_CMP_PKIBODY_IP not visible here */
- && (*caPubs = X509_chain_up_ref(ctx->caPubsOut)) == NULL)
+ && (*caPubs = X509_chain_up_ref(ctx->caPubsOut)) == NULL)
goto err;
if (ctx->statusOut != NULL
- && (si = OSSL_CMP_PKISI_dup(ctx->statusOut)) == NULL)
+ && (si = OSSL_CMP_PKISI_dup(ctx->statusOut)) == NULL)
goto err;
return si;
- err:
+err:
X509_free(*certOut);
*certOut = NULL;
OSSL_STACK_OF_X509_free(*chainOut);
@@ -414,9 +412,9 @@ static OSSL_CMP_PKISI *process_cert_request(OSSL_CMP_SRV_CTX *srv_ctx,
}
static OSSL_CMP_PKISI *process_rr(OSSL_CMP_SRV_CTX *srv_ctx,
- const OSSL_CMP_MSG *rr,
- const X509_NAME *issuer,
- const ASN1_INTEGER *serial)
+ const OSSL_CMP_MSG *rr,
+ const X509_NAME *issuer,
+ const ASN1_INTEGER *serial)
{
mock_srv_ctx *ctx = OSSL_CMP_SRV_CTX_get0_custom_ctx(srv_ctx);
@@ -425,7 +423,7 @@ static OSSL_CMP_PKISI *process_rr(OSSL_CMP_SRV_CTX *srv_ctx,
return NULL;
}
if (ctx->sendError == 1
- || ctx->sendError == OSSL_CMP_MSG_get_bodytype(rr)) {
+ || ctx->sendError == OSSL_CMP_MSG_get_bodytype(rr)) {
ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_PROCESSING_MESSAGE);
return NULL;
}
@@ -433,9 +431,9 @@ static OSSL_CMP_PKISI *process_rr(OSSL_CMP_SRV_CTX *srv_ctx,
/* allow any RR derived from CSR which does not include issuer and serial */
if ((issuer != NULL || serial != NULL)
/* accept revocation only for the reference cert, if given */
- && !refcert_cmp(ctx->refCert, issuer, serial)) {
+ && !refcert_cmp(ctx->refCert, issuer, serial)) {
ERR_raise_data(ERR_LIB_CMP, CMP_R_REQUEST_NOT_ACCEPTED,
- "wrong certificate to revoke");
+ "wrong certificate to revoke");
return NULL;
}
return OSSL_CMP_PKISI_dup(ctx->statusOut);
@@ -443,7 +441,7 @@ static OSSL_CMP_PKISI *process_rr(OSSL_CMP_SRV_CTX *srv_ctx,
/* return -1 for error, 0 for no update available */
static int check_client_crl(const STACK_OF(OSSL_CMP_CRLSTATUS) *crlStatusList,
- const X509_CRL *crl)
+ const X509_CRL *crl)
{
OSSL_CMP_CRLSTATUS *crlstatus;
DIST_POINT_NAME *dpn = NULL;
@@ -471,9 +469,9 @@ static int check_client_crl(const STACK_OF(OSSL_CMP_CRLSTATUS) *crlStatusList,
ERR_raise(ERR_LIB_CMP, CMP_R_UNKNOWN_CRL_ISSUER);
return -1;
}
- } else {
- ERR_raise(ERR_LIB_CMP, CMP_R_SENDER_GENERALNAME_TYPE_NOT_SUPPORTED);
- return -1; /* error according to RFC 9483 section 4.3.4 */
+ } else {
+ ERR_raise(ERR_LIB_CMP, CMP_R_SENDER_GENERALNAME_TYPE_NOT_SUPPORTED);
+ return -1; /* error according to RFC 9483 section 4.3.4 */
}
}
@@ -482,7 +480,7 @@ static int check_client_crl(const STACK_OF(OSSL_CMP_CRLSTATUS) *crlStatusList,
}
static OSSL_CMP_ITAV *process_genm_itav(mock_srv_ctx *ctx, int req_nid,
- const OSSL_CMP_ITAV *req)
+ const OSSL_CMP_ITAV *req)
{
OSSL_CMP_ITAV *rsp = NULL;
@@ -490,81 +488,76 @@ static OSSL_CMP_ITAV *process_genm_itav(mock_srv_ctx *ctx, int req_nid,
case NID_id_it_caCerts:
rsp = OSSL_CMP_ITAV_new_caCerts(ctx->caPubsOut);
break;
- case NID_id_it_rootCaCert:
- {
- X509 *rootcacert = NULL;
-
- if (!OSSL_CMP_ITAV_get0_rootCaCert(req, &rootcacert))
- return NULL;
-
- if (rootcacert != NULL
- && X509_NAME_cmp(X509_get_subject_name(rootcacert),
- X509_get_subject_name(ctx->newWithNew)) != 0)
- /* The subjects do not match */
- rsp = OSSL_CMP_ITAV_new_rootCaKeyUpdate(NULL, NULL, NULL);
- else
- rsp = OSSL_CMP_ITAV_new_rootCaKeyUpdate(ctx->newWithNew,
- ctx->newWithOld,
- ctx->oldWithNew);
- }
- break;
- case NID_id_it_crlStatusList:
- {
- STACK_OF(OSSL_CMP_CRLSTATUS) *crlstatuslist = NULL;
- int res = 0;
-
- if (!OSSL_CMP_ITAV_get0_crlStatusList(req, &crlstatuslist))
- return NULL;
-
- res = check_client_crl(crlstatuslist, ctx->crlOut);
- if (res < 0)
- rsp = NULL;
- else
- rsp = OSSL_CMP_ITAV_new_crls(res == 0 ? NULL : ctx->crlOut);
- }
- break;
- case NID_id_it_certReqTemplate:
- {
- OSSL_CRMF_CERTTEMPLATE *reqtemp;
- OSSL_CMP_ATAVS *keyspec = NULL;
- X509_ALGOR *keyalg = NULL;
- OSSL_CMP_ATAV *rsakeylen, *eckeyalg;
- int ok = 0;
-
- if ((reqtemp = OSSL_CRMF_CERTTEMPLATE_new()) == NULL)
- return NULL;
-
- if (!OSSL_CRMF_CERTTEMPLATE_fill(reqtemp, NULL, NULL,
- X509_get_issuer_name(ctx->refCert),
- NULL))
- goto crt_err;
-
- if ((keyalg = X509_ALGOR_new()) == NULL)
- goto crt_err;
-
- (void)X509_ALGOR_set0(keyalg, OBJ_nid2obj(NID_X9_62_id_ecPublicKey),
- V_ASN1_UNDEF, NULL); /* cannot fail */
-
- eckeyalg = OSSL_CMP_ATAV_new_algId(keyalg);
- rsakeylen = OSSL_CMP_ATAV_new_rsaKeyLen(4096);
- ok = OSSL_CMP_ATAV_push1(&keyspec, eckeyalg)
- && OSSL_CMP_ATAV_push1(&keyspec, rsakeylen);
- OSSL_CMP_ATAV_free(eckeyalg);
- OSSL_CMP_ATAV_free(rsakeylen);
- X509_ALGOR_free(keyalg);
-
- if (!ok)
- goto crt_err;
-
- rsp = OSSL_CMP_ITAV_new0_certReqTemplate(reqtemp, keyspec);
- return rsp;
-
- crt_err:
- OSSL_CRMF_CERTTEMPLATE_free(reqtemp);
- OSSL_CMP_ATAVS_free(keyspec);
+ case NID_id_it_rootCaCert: {
+ X509 *rootcacert = NULL;
+
+ if (!OSSL_CMP_ITAV_get0_rootCaCert(req, &rootcacert))
return NULL;
- }
- break;
+
+ if (rootcacert != NULL
+ && X509_NAME_cmp(X509_get_subject_name(rootcacert),
+ X509_get_subject_name(ctx->newWithNew))
+ != 0)
+ /* The subjects do not match */
+ rsp = OSSL_CMP_ITAV_new_rootCaKeyUpdate(NULL, NULL, NULL);
+ else
+ rsp = OSSL_CMP_ITAV_new_rootCaKeyUpdate(ctx->newWithNew,
+ ctx->newWithOld,
+ ctx->oldWithNew);
+ } break;
+ case NID_id_it_crlStatusList: {
+ STACK_OF(OSSL_CMP_CRLSTATUS) *crlstatuslist = NULL;
+ int res = 0;
+
+ if (!OSSL_CMP_ITAV_get0_crlStatusList(req, &crlstatuslist))
+ return NULL;
+
+ res = check_client_crl(crlstatuslist, ctx->crlOut);
+ if (res < 0)
+ rsp = NULL;
+ else
+ rsp = OSSL_CMP_ITAV_new_crls(res == 0 ? NULL : ctx->crlOut);
+ } break;
+ case NID_id_it_certReqTemplate: {
+ OSSL_CRMF_CERTTEMPLATE *reqtemp;
+ OSSL_CMP_ATAVS *keyspec = NULL;
+ X509_ALGOR *keyalg = NULL;
+ OSSL_CMP_ATAV *rsakeylen, *eckeyalg;
+ int ok = 0;
+
+ if ((reqtemp = OSSL_CRMF_CERTTEMPLATE_new()) == NULL)
+ return NULL;
+
+ if (!OSSL_CRMF_CERTTEMPLATE_fill(reqtemp, NULL, NULL,
+ X509_get_issuer_name(ctx->refCert),
+ NULL))
+ goto crt_err;
+
+ if ((keyalg = X509_ALGOR_new()) == NULL)
+ goto crt_err;
+
+ (void)X509_ALGOR_set0(keyalg, OBJ_nid2obj(NID_X9_62_id_ecPublicKey),
+ V_ASN1_UNDEF, NULL); /* cannot fail */
+
+ eckeyalg = OSSL_CMP_ATAV_new_algId(keyalg);
+ rsakeylen = OSSL_CMP_ATAV_new_rsaKeyLen(4096);
+ ok = OSSL_CMP_ATAV_push1(&keyspec, eckeyalg)
+ && OSSL_CMP_ATAV_push1(&keyspec, rsakeylen);
+ OSSL_CMP_ATAV_free(eckeyalg);
+ OSSL_CMP_ATAV_free(rsakeylen);
+ X509_ALGOR_free(keyalg);
+
+ if (!ok)
+ goto crt_err;
+
+ rsp = OSSL_CMP_ITAV_new0_certReqTemplate(reqtemp, keyspec);
+ return rsp;
+
+ crt_err:
+ OSSL_CRMF_CERTTEMPLATE_free(reqtemp);
+ OSSL_CMP_ATAVS_free(keyspec);
+ return NULL;
+ } break;
default:
rsp = OSSL_CMP_ITAV_dup(req);
}
@@ -572,9 +565,9 @@ static OSSL_CMP_ITAV *process_genm_itav(mock_srv_ctx *ctx, int req_nid,
}
static int process_genm(OSSL_CMP_SRV_CTX *srv_ctx,
- const OSSL_CMP_MSG *genm,
- const STACK_OF(OSSL_CMP_ITAV) *in,
- STACK_OF(OSSL_CMP_ITAV) **out)
+ const OSSL_CMP_MSG *genm,
+ const STACK_OF(OSSL_CMP_ITAV) *in,
+ STACK_OF(OSSL_CMP_ITAV) **out)
{
mock_srv_ctx *ctx = OSSL_CMP_SRV_CTX_get0_custom_ctx(srv_ctx);
@@ -583,8 +576,8 @@ static int process_genm(OSSL_CMP_SRV_CTX *srv_ctx,
return 0;
}
if (ctx->sendError == 1
- || ctx->sendError == OSSL_CMP_MSG_get_bodytype(genm)
- || sk_OSSL_CMP_ITAV_num(in) > 1) {
+ || ctx->sendError == OSSL_CMP_MSG_get_bodytype(genm)
+ || sk_OSSL_CMP_ITAV_num(in) > 1) {
ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_PROCESSING_MESSAGE);
return 0;
}
@@ -602,14 +595,14 @@ static int process_genm(OSSL_CMP_SRV_CTX *srv_ctx,
}
*out = sk_OSSL_CMP_ITAV_deep_copy(in, OSSL_CMP_ITAV_dup,
- OSSL_CMP_ITAV_free);
+ OSSL_CMP_ITAV_free);
return *out != NULL;
}
static void process_error(OSSL_CMP_SRV_CTX *srv_ctx, const OSSL_CMP_MSG *error,
- const OSSL_CMP_PKISI *statusInfo,
- const ASN1_INTEGER *errorCode,
- const OSSL_CMP_PKIFREETEXT *errorDetails)
+ const OSSL_CMP_PKISI *statusInfo,
+ const ASN1_INTEGER *errorCode,
+ const OSSL_CMP_PKIFREETEXT *errorDetails)
{
mock_srv_ctx *ctx = OSSL_CMP_SRV_CTX_get0_custom_ctx(srv_ctx);
char buf[OSSL_CMP_PKISI_BUFLEN];
@@ -628,7 +621,7 @@ static void process_error(OSSL_CMP_SRV_CTX *srv_ctx, const OSSL_CMP_MSG *error,
} else {
sibuf = OSSL_CMP_snprint_PKIStatusInfo(statusInfo, buf, sizeof(buf));
BIO_printf(bio_err, "pkiStatusInfo: %s\n",
- sibuf != NULL ? sibuf: "<invalid>");
+ sibuf != NULL ? sibuf : "<invalid>");
}
if (errorCode == NULL)
@@ -644,18 +637,18 @@ static void process_error(OSSL_CMP_SRV_CTX *srv_ctx, const OSSL_CMP_MSG *error,
if (i > 0)
BIO_printf(bio_err, ", ");
ASN1_STRING_print_ex(bio_err,
- sk_ASN1_UTF8STRING_value(errorDetails, i),
- ASN1_STRFLGS_ESC_QUOTE);
+ sk_ASN1_UTF8STRING_value(errorDetails, i),
+ ASN1_STRFLGS_ESC_QUOTE);
}
BIO_printf(bio_err, "\n");
}
}
static int process_certConf(OSSL_CMP_SRV_CTX *srv_ctx,
- const OSSL_CMP_MSG *certConf,
- ossl_unused int certReqId,
- const ASN1_OCTET_STRING *certHash,
- const OSSL_CMP_PKISI *si)
+ const OSSL_CMP_MSG *certConf,
+ ossl_unused int certReqId,
+ const ASN1_OCTET_STRING *certHash,
+ const OSSL_CMP_PKISI *si)
{
mock_srv_ctx *ctx = OSSL_CMP_SRV_CTX_get0_custom_ctx(srv_ctx);
ASN1_OCTET_STRING *digest;
@@ -665,8 +658,8 @@ static int process_certConf(OSSL_CMP_SRV_CTX *srv_ctx,
return 0;
}
if (ctx->sendError == 1
- || ctx->sendError == OSSL_CMP_MSG_get_bodytype(certConf)
- || ctx->certOut == NULL) {
+ || ctx->sendError == OSSL_CMP_MSG_get_bodytype(certConf)
+ || ctx->certOut == NULL) {
ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_PROCESSING_MESSAGE);
return 0;
}
@@ -684,22 +677,22 @@ static int process_certConf(OSSL_CMP_SRV_CTX *srv_ctx,
/* return 0 on failure, 1 on success, setting *req or otherwise *check_after */
static int process_pollReq(OSSL_CMP_SRV_CTX *srv_ctx,
- const OSSL_CMP_MSG *pollReq,
- ossl_unused int certReqId,
- OSSL_CMP_MSG **req, int64_t *check_after)
+ const OSSL_CMP_MSG *pollReq,
+ ossl_unused int certReqId,
+ OSSL_CMP_MSG **req, int64_t *check_after)
{
mock_srv_ctx *ctx = OSSL_CMP_SRV_CTX_get0_custom_ctx(srv_ctx);
if (req != NULL)
*req = NULL;
if (ctx == NULL || pollReq == NULL
- || req == NULL || check_after == NULL) {
+ || req == NULL || check_after == NULL) {
ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT);
return 0;
}
if (ctx->sendError == 1
- || ctx->sendError == OSSL_CMP_MSG_get_bodytype(pollReq)) {
+ || ctx->sendError == OSSL_CMP_MSG_get_bodytype(pollReq)) {
ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_PROCESSING_MESSAGE);
return 0;
}
@@ -725,11 +718,11 @@ OSSL_CMP_SRV_CTX *ossl_cmp_mock_srv_new(OSSL_LIB_CTX *libctx, const char *propq)
mock_srv_ctx *ctx = mock_srv_ctx_new();
if (srv_ctx != NULL && ctx != NULL
- && OSSL_CMP_SRV_CTX_init(srv_ctx, ctx, process_cert_request,
- process_rr, process_genm, process_error,
- process_certConf, process_pollReq)
- && OSSL_CMP_SRV_CTX_init_trans(srv_ctx,
- delayed_delivery, clean_transaction))
+ && OSSL_CMP_SRV_CTX_init(srv_ctx, ctx, process_cert_request,
+ process_rr, process_genm, process_error,
+ process_certConf, process_pollReq)
+ && OSSL_CMP_SRV_CTX_init_trans(srv_ctx,
+ delayed_delivery, clean_transaction))
return srv_ctx;
mock_srv_ctx_free(ctx);
diff --git a/apps/lib/columns.c b/apps/lib/columns.c
index f7bc86723d..86d57dff94 100644
--- a/apps/lib/columns.c
+++ b/apps/lib/columns.c
@@ -24,4 +24,3 @@ void calculate_columns(FUNCTION *functions, DISPLAY_COLUMNS *dc)
dc->width = maxlen + 2;
dc->columns = (80 - 1) / dc->width;
}
-
diff --git a/apps/lib/http_server.c b/apps/lib/http_server.c
index 82befa188f..d470fb8c58 100644
--- a/apps/lib/http_server.c
+++ b/apps/lib/http_server.c
@@ -14,7 +14,7 @@
* On VMS, you need to define this to get the declaration of fileno(). The
* value 2 is to make sure no function defined in POSIX-2 is left undefined.
*/
-# define _POSIX_C_SOURCE 2
+#define _POSIX_C_SOURCE 2
#endif
#include <ctype.h>
@@ -30,9 +30,9 @@
#define HTTP_PREFIX "HTTP/"
#define HTTP_VERSION_PATT "1." /* allow 1.x */
-#define HTTP_PREFIX_VERSION HTTP_PREFIX""HTTP_VERSION_PATT
-#define HTTP_1_0 HTTP_PREFIX_VERSION"0" /* "HTTP/1.0" */
-#define HTTP_VERSION_STR " "HTTP_PREFIX_VERSION
+#define HTTP_PREFIX_VERSION HTTP_PREFIX "" HTTP_VERSION_PATT
+#define HTTP_1_0 HTTP_PREFIX_VERSION "0" /* "HTTP/1.0" */
+#define HTTP_VERSION_STR " " HTTP_PREFIX_VERSION
#define log_HTTP(prog, level, text) \
trace_log_message(OSSL_TRACE_CATEGORY_HTTP, prog, level, "%s", text)
@@ -40,7 +40,7 @@
trace_log_message(OSSL_TRACE_CATEGORY_HTTP, prog, level, fmt, arg)
#define log_HTTP2(prog, level, fmt, arg1, arg2) \
trace_log_message(OSSL_TRACE_CATEGORY_HTTP, prog, level, fmt, arg1, arg2)
-#define log_HTTP3(prog, level, fmt, a1, a2, a3) \
+#define log_HTTP3(prog, level, fmt, a1, a2, a3) \
trace_log_message(OSSL_TRACE_CATEGORY_HTTP, prog, level, fmt, a1, a2, a3)
#ifdef HTTP_DAEMON
@@ -88,12 +88,12 @@ void spawn_loop(const char *prog)
if (setpgid(0, 0)) {
log_HTTP1(prog, LOG_CRIT,
- "error detaching from parent process group: %s",
- strerror(errno));
+ "error detaching from parent process group: %s",
+ strerror(errno));
exit(1);
}
kidpids = app_malloc_array(n_responders, sizeof(*kidpids),
- "child PID array");
+ "child PID array");
for (i = 0; i < n_responders; ++i)
kidpids[i] = 0;
@@ -118,32 +118,32 @@ void spawn_loop(const char *prog)
}
if (i >= n_responders) {
log_HTTP1(prog, LOG_CRIT,
- "internal error: no matching child slot for pid: %ld",
- (long)fpid);
+ "internal error: no matching child slot for pid: %ld",
+ (long)fpid);
killall(1, kidpids);
}
if (status != 0) {
if (WIFEXITED(status)) {
log_HTTP2(prog, LOG_WARNING,
- "child process: %ld, exit status: %d",
- (long)fpid, WEXITSTATUS(status));
+ "child process: %ld, exit status: %d",
+ (long)fpid, WEXITSTATUS(status));
} else if (WIFSIGNALED(status)) {
char *dumped = "";
-# ifdef WCOREDUMP
+#ifdef WCOREDUMP
if (WCOREDUMP(status))
dumped = " (core dumped)";
-# endif
+#endif
log_HTTP3(prog, LOG_WARNING,
- "child process: %ld, term signal %d%s",
- (long)fpid, WTERMSIG(status), dumped);
+ "child process: %ld, term signal %d%s",
+ (long)fpid, WTERMSIG(status), dumped);
}
OSSL_sleep(1000);
}
break;
} else if (errno != EINTR) {
log_HTTP1(prog, LOG_CRIT,
- "waitpid() failed: %s", strerror(errno));
+ "waitpid() failed: %s", strerror(errno));
killall(1, kidpids);
}
}
@@ -166,7 +166,7 @@ void spawn_loop(const char *prog)
_exit(1);
}
return;
- default: /* parent */
+ default: /* parent */
for (i = 0; i < n_responders; ++i) {
if (kidpids[i] == 0) {
kidpids[i] = fpid;
@@ -176,7 +176,7 @@ void spawn_loop(const char *prog)
}
if (i >= n_responders) {
log_HTTP(prog, LOG_CRIT,
- "internal error: no free child slots");
+ "internal error: no free child slots");
killall(1, kidpids);
}
break;
@@ -229,7 +229,7 @@ BIO *http_server_init(const char *prog, const char *port, int verb)
return acbio;
- err:
+err:
ERR_print_errors(bio_err);
BIO_free_all(acbio);
BIO_free(bufbio);
@@ -263,9 +263,9 @@ static int urldecode(char *p)
/* if *pcbio != NULL, continue given connected session, else accept new */
/* if found_keep_alive != NULL, return this way connection persistence state */
int http_server_get_asn1_req(const ASN1_ITEM *it, ASN1_VALUE **preq,
- char **ppath, BIO **pcbio, BIO *acbio,
- int *found_keep_alive,
- const char *prog, int accept_get, int timeout)
+ char **ppath, BIO **pcbio, BIO *acbio,
+ int *found_keep_alive,
+ const char *prog, int accept_get, int timeout)
{
BIO *cbio = *pcbio, *getbio = NULL, *b64 = NULL;
int len;
@@ -287,7 +287,7 @@ int http_server_get_asn1_req(const ASN1_ITEM *it, ASN1_VALUE **preq,
goto fatal;
}
log_HTTP1(prog, LOG_DEBUG,
- "awaiting new connection on port %s ...", port);
+ "awaiting new connection on port %s ...", port);
OPENSSL_free(port);
if (BIO_do_accept(acbio) <= 0)
@@ -304,12 +304,12 @@ int http_server_get_asn1_req(const ASN1_ITEM *it, ASN1_VALUE **preq,
goto out;
}
-# ifdef HTTP_DAEMON
+#ifdef HTTP_DAEMON
if (timeout > 0) {
(void)BIO_get_fd(cbio, &acfd);
alarm(timeout);
}
-# endif
+#endif
/* Read the request line. */
len = BIO_gets(cbio, reqbuf, sizeof(reqbuf));
@@ -323,23 +323,23 @@ int http_server_get_asn1_req(const ASN1_ITEM *it, ASN1_VALUE **preq,
}
if (((end = strchr(reqbuf, '\r')) != NULL && end[1] == '\n')
- || (end = strchr(reqbuf, '\n')) != NULL)
+ || (end = strchr(reqbuf, '\n')) != NULL)
*end = '\0';
if (log_get_verbosity() < LOG_TRACE)
trace_log_message(-1, prog, LOG_INFO,
- "received request, 1st line: %s", reqbuf);
+ "received request, 1st line: %s", reqbuf);
log_HTTP(prog, LOG_TRACE, "received request header:");
log_HTTP1(prog, LOG_TRACE, "%s", reqbuf);
if (end == NULL) {
log_HTTP(prog, LOG_WARNING,
- "cannot parse HTTP header: missing end of line");
+ "cannot parse HTTP header: missing end of line");
(void)http_server_send_status(prog, cbio, 400, "Bad Request");
goto out;
}
url = meth = reqbuf;
if ((accept_get && CHECK_AND_SKIP_PREFIX(url, "GET "))
- || CHECK_AND_SKIP_PREFIX(url, "POST ")) {
+ || CHECK_AND_SKIP_PREFIX(url, "POST ")) {
/* Expecting (GET|POST) {sp} /URL {sp} HTTP/1.x */
url[-1] = '\0';
@@ -347,8 +347,8 @@ int http_server_get_asn1_req(const ASN1_ITEM *it, ASN1_VALUE **preq,
url++;
if (*url != '/') {
log_HTTP2(prog, LOG_WARNING,
- "invalid %s -- URL does not begin with '/': %s",
- meth, url);
+ "invalid %s -- URL does not begin with '/': %s",
+ meth, url);
(void)http_server_send_status(prog, cbio, 400, "Bad Request");
goto out;
}
@@ -360,8 +360,8 @@ int http_server_get_asn1_req(const ASN1_ITEM *it, ASN1_VALUE **preq,
break;
if (!HAS_PREFIX(end, HTTP_VERSION_STR)) {
log_HTTP2(prog, LOG_WARNING,
- "invalid %s -- bad HTTP/version string: %s",
- meth, end + 1);
+ "invalid %s -- bad HTTP/version string: %s",
+ meth, end + 1);
(void)http_server_send_status(prog, cbio, 400, "Bad Request");
goto out;
}
@@ -383,7 +383,7 @@ int http_server_get_asn1_req(const ASN1_ITEM *it, ASN1_VALUE **preq,
len = urldecode(url);
if (len < 0) {
log_HTTP2(prog, LOG_WARNING,
- "invalid %s request -- bad URL encoding: %s", meth, url);
+ "invalid %s request -- bad URL encoding: %s", meth, url);
(void)http_server_send_status(prog, cbio, 400, "Bad Request");
goto out;
}
@@ -391,7 +391,7 @@ int http_server_get_asn1_req(const ASN1_ITEM *it, ASN1_VALUE **preq,
if ((getbio = BIO_new_mem_buf(url, len)) == NULL
|| (b64 = BIO_new(BIO_f_base64())) == NULL) {
log_HTTP1(prog, LOG_ERR,
- "could not allocate base64 bio with size = %d", len);
+ "could not allocate base64 bio with size = %d", len);
goto fatal;
}
BIO_set_flags(b64, BIO_FLAGS_BASE64_NO_NL);
@@ -399,8 +399,8 @@ int http_server_get_asn1_req(const ASN1_ITEM *it, ASN1_VALUE **preq,
}
} else {
log_HTTP2(prog, LOG_WARNING,
- "HTTP request does not begin with %sPOST: %s",
- accept_get ? "GET or " : "", reqbuf);
+ "HTTP request does not begin with %sPOST: %s",
+ accept_get ? "GET or " : "", reqbuf);
(void)http_server_send_status(prog, cbio, 400, "Bad Request");
goto out;
}
@@ -426,11 +426,10 @@ int http_server_get_asn1_req(const ASN1_ITEM *it, ASN1_VALUE **preq,
if (((end = strchr(inbuf, '\r')) != NULL && end[1] == '\n')
|| (end = strchr(inbuf, '\n')) != NULL)
*end = '\0';
- log_HTTP1(prog, LOG_TRACE, "%s", *inbuf == '\0' ?
- " " /* workaround for "" getting ignored */ : inbuf);
+ log_HTTP1(prog, LOG_TRACE, "%s", *inbuf == '\0' ? " " /* workaround for "" getting ignored */ : inbuf);
if (end == NULL) {
log_HTTP(prog, LOG_WARNING,
- "error parsing HTTP header: missing end of line");
+ "error parsing HTTP header: missing end of line");
(void)http_server_send_status(prog, cbio, 400, "Bad Request");
goto out;
}
@@ -442,7 +441,7 @@ int http_server_get_asn1_req(const ASN1_ITEM *it, ASN1_VALUE **preq,
value = strchr(key, ':');
if (value == NULL) {
log_HTTP(prog, LOG_WARNING,
- "error parsing HTTP header: missing ':'");
+ "error parsing HTTP header: missing ':'");
(void)http_server_send_status(prog, cbio, 400, "Bad Request");
goto out;
}
@@ -459,37 +458,37 @@ int http_server_get_asn1_req(const ASN1_ITEM *it, ASN1_VALUE **preq,
}
}
-# ifdef HTTP_DAEMON
+#ifdef HTTP_DAEMON
/* Clear alarm before we close the client socket */
alarm(0);
timeout = 0;
-# endif
+#endif
/* Try to read and parse request */
req = ASN1_item_d2i_bio(it, getbio != NULL ? getbio : cbio, NULL);
if (req == NULL) {
log_HTTP(prog, LOG_WARNING,
- "error parsing DER-encoded request content");
+ "error parsing DER-encoded request content");
(void)http_server_send_status(prog, cbio, 400, "Bad Request");
} else if (ppath != NULL && (*ppath = OPENSSL_strdup(url)) == NULL) {
log_HTTP1(prog, LOG_ERR,
- "out of memory allocating %zu bytes", strlen(url) + 1);
+ "out of memory allocating %zu bytes", strlen(url) + 1);
ASN1_item_free(req, it);
goto fatal;
}
*preq = req;
- out:
+out:
BIO_free_all(getbio);
-# ifdef HTTP_DAEMON
+#ifdef HTTP_DAEMON
if (timeout > 0)
alarm(0);
acfd = (int)INVALID_SOCKET;
-# endif
+#endif
return ret;
- fatal:
+fatal:
(void)http_server_send_status(prog, cbio, 500, "Internal Server Error");
if (ppath != NULL) {
OPENSSL_free(*ppath);
@@ -503,23 +502,23 @@ int http_server_get_asn1_req(const ASN1_ITEM *it, ASN1_VALUE **preq,
/* assumes that cbio does not do an encoding that changes the output length */
int http_server_send_asn1_resp(const char *prog, BIO *cbio, int keep_alive,
- const char *content_type,
- const ASN1_ITEM *it, const ASN1_VALUE *resp)
+ const char *content_type,
+ const ASN1_ITEM *it, const ASN1_VALUE *resp)
{
char buf[200], *p;
- int ret = BIO_snprintf(buf, sizeof(buf), HTTP_1_0" 200 OK\r\n%s"
- "Content-type: %s\r\n"
- "Content-Length: %d\r\n",
- keep_alive ? "Connection: keep-alive\r\n" : "",
- content_type,
- ASN1_item_i2d(resp, NULL, it));
+ int ret = BIO_snprintf(buf, sizeof(buf), HTTP_1_0 " 200 OK\r\n%s"
+ "Content-type: %s\r\n"
+ "Content-Length: %d\r\n",
+ keep_alive ? "Connection: keep-alive\r\n" : "",
+ content_type,
+ ASN1_item_i2d(resp, NULL, it));
if (ret < 0 || (size_t)ret >= sizeof(buf))
return 0;
if (log_get_verbosity() < LOG_TRACE && (p = strchr(buf, '\r')) != NULL)
trace_log_message(-1, prog, LOG_INFO,
- "sending response, 1st line: %.*s", (int)(p - buf),
- buf);
+ "sending response, 1st line: %.*s", (int)(p - buf),
+ buf);
log_HTTP1(prog, LOG_TRACE, "sending response header:\n%s", buf);
ret = BIO_printf(cbio, "%s\r\n", buf) > 0
@@ -530,12 +529,12 @@ int http_server_send_asn1_resp(const char *prog, BIO *cbio, int keep_alive,
}
int http_server_send_status(const char *prog, BIO *cbio,
- int status, const char *reason)
+ int status, const char *reason)
{
char buf[200];
- int ret = BIO_snprintf(buf, sizeof(buf), HTTP_1_0" %d %s\r\n\r\n",
- /* This implicitly cancels keep-alive */
- status, reason);
+ int ret = BIO_snprintf(buf, sizeof(buf), HTTP_1_0 " %d %s\r\n\r\n",
+ /* This implicitly cancels keep-alive */
+ status, reason);
if (ret < 0 || (size_t)ret >= sizeof(buf))
return 0;
diff --git a/apps/lib/log.c b/apps/lib/log.c
index cfe5973960..d686cfbdf2 100644
--- a/apps/lib/log.c
+++ b/apps/lib/log.c
@@ -17,7 +17,7 @@ int log_set_verbosity(const char *prog, int level)
{
if (level < LOG_EMERG || level > LOG_TRACE) {
trace_log_message(-1, prog, LOG_ERR,
- "Invalid verbosity level %d", level);
+ "Invalid verbosity level %d", level);
return 0;
}
verbosity = level;
@@ -68,11 +68,11 @@ static void log_with_prefix(const char *prog, const char *fmt, va_list ap)
*/
#undef OSSL_NO_C99
#if !defined(__STDC_VERSION__) || __STDC_VERSION__ + 0 < 199900L
-# define OSSL_NO_C99
+#define OSSL_NO_C99
#endif
void trace_log_message(int category,
- const char *prog, int level, const char *fmt, ...)
+ const char *prog, int level, const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
@@ -106,6 +106,6 @@ void trace_log_message(int category,
ERR_print_errors_cb(print_syslog, &level);
} else
#endif
- log_with_prefix(prog, fmt, ap);
+ log_with_prefix(prog, fmt, ap);
va_end(ap);
}
diff --git a/apps/lib/names.c b/apps/lib/names.c
index 8825dfa3d8..24a146819b 100644
--- a/apps/lib/names.c
+++ b/apps/lib/names.c
@@ -13,7 +13,7 @@
#include "names.h"
#include "internal/e_os.h"
-int name_cmp(const char * const *a, const char * const *b)
+int name_cmp(const char *const *a, const char *const *b)
{
return OPENSSL_strcasecmp(*a, *b);
}
diff --git a/apps/lib/opt.c b/apps/lib/opt.c
index b978120ff4..8c3b3a9e25 100644
--- a/apps/lib/opt.c
+++ b/apps/lib/opt.c
@@ -17,7 +17,7 @@
#include "internal/numbers.h"
#include <string.h>
#if !defined(OPENSSL_SYS_MSDOS)
-# include <unistd.h>
+#include <unistd.h>
#endif
#include <stdlib.h>
@@ -56,7 +56,7 @@ const char *opt_path_end(const char *filename)
const char *p;
/* find the last '/', '\' or ':' */
- for (p = filename + strlen(filename); --p > filename; )
+ for (p = filename + strlen(filename); --p > filename;)
if (*p == '/' || *p == '\\' || *p == ':') {
p++;
break;
@@ -74,8 +74,7 @@ char *opt_progname(const char *argv0)
/* Strip off trailing nonsense. */
n = strlen(p);
- if (n > 4 &&
- (strcmp(&p[n - 4], ".exe") == 0 || strcmp(&p[n - 4], ".EXE") == 0))
+ if (n > 4 && (strcmp(&p[n - 4], ".exe") == 0 || strcmp(&p[n - 4], ".EXE") == 0))
n -= 4;
/* Copy over the name, in lowercase. */
@@ -178,8 +177,8 @@ char *opt_init(int ac, char **av, const OPTIONS *o)
#endif
if (o->name == OPT_HELP_STR
- || o->name == OPT_MORE_STR
- || o->name == OPT_SECTION_STR)
+ || o->name == OPT_MORE_STR
+ || o->name == OPT_SECTION_STR)
continue;
#ifndef NDEBUG
i = o->valtype;
@@ -191,10 +190,25 @@ char *opt_init(int ac, char **av, const OPTIONS *o)
else
OPENSSL_assert(o->retval == OPT_DUP || o->retval > OPT_PARAM);
switch (i) {
- case 0: case '-': case '.':
- case '/': case '<': case '>': case 'F':
- case 'M': case 'U': case 'f': case 'l': case 'n': case 'p': case 's':
- case 'u': case 'c': case ':': case 'N': case 'A':
+ case 0:
+ case '-':
+ case '.':
+ case '/':
+ case '<':
+ case '>':
+ case 'F':
+ case 'M':
+ case 'U':
+ case 'f':
+ case 'l':
+ case 'n':
+ case 'p':
+ case 's':
+ case 'u':
+ case 'c':
+ case ':':
+ case 'N':
+ case 'A':
break;
default:
OPENSSL_assert(0);
@@ -209,7 +223,7 @@ char *opt_init(int ac, char **av, const OPTIONS *o)
&& strcmp(o->name, next->name) == 0;
if (duplicated) {
opt_printf_stderr("%s: Internal error: duplicate option %s\n",
- prog, o->name);
+ prog, o->name);
OPENSSL_assert(!duplicated);
}
}
@@ -225,17 +239,17 @@ char *opt_init(int ac, char **av, const OPTIONS *o)
}
static OPT_PAIR formats[] = {
- {"pem", OPT_FMT_PEM},
- {"der", OPT_FMT_DER},
- {"b64", OPT_FMT_B64},
- {"pkcs12", OPT_FMT_PKCS12},
- {"smime", OPT_FMT_SMIME},
- {"msblob", OPT_FMT_MSBLOB},
- {"nss", OPT_FMT_NSS},
- {"text", OPT_FMT_TEXT},
- {"http", OPT_FMT_HTTP},
- {"pvk", OPT_FMT_PVK},
- {NULL}
+ { "pem", OPT_FMT_PEM },
+ { "der", OPT_FMT_DER },
+ { "b64", OPT_FMT_B64 },
+ { "pkcs12", OPT_FMT_PKCS12 },
+ { "smime", OPT_FMT_SMIME },
+ { "msblob", OPT_FMT_MSBLOB },
+ { "nss", OPT_FMT_NSS },
+ { "text", OPT_FMT_TEXT },
+ { "http", OPT_FMT_HTTP },
+ { "pvk", OPT_FMT_PVK },
+ { NULL }
};
void opt_set_unknown_name(const char *name)
@@ -268,7 +282,7 @@ int opt_format(const char *s, unsigned long flags, int *result)
case 'b':
if (s[1] == '\0'
|| strcmp(s, "B64") == 0 || strcmp(s, "b64") == 0
- || strcmp(s, "BASE64") == 0 || strcmp(s, "base64") == 0 ) {
+ || strcmp(s, "BASE64") == 0 || strcmp(s, "base64") == 0) {
if ((flags & OPT_FMT_B64) == 0)
return opt_format_error(s, flags);
*result = FORMAT_BASE64;
@@ -330,7 +344,7 @@ int opt_format(const char *s, unsigned long flags, int *result)
return opt_format_error(s, flags);
*result = FORMAT_PVK;
} else if (strcmp(s, "P12") == 0 || strcmp(s, "p12") == 0
- || strcmp(s, "PKCS12") == 0 || strcmp(s, "pkcs12") == 0) {
+ || strcmp(s, "PKCS12") == 0 || strcmp(s, "pkcs12") == 0) {
if ((flags & OPT_FMT_PKCS12) == 0)
return opt_format_error(s, flags);
*result = FORMAT_PKCS12;
@@ -386,7 +400,8 @@ int opt_cipher_silent(const char *name, EVP_CIPHER **cipherp)
ERR_set_mark();
if ((c = EVP_CIPHER_fetch(app_get0_libctx(), name,
- app_get0_propq())) != NULL) {
+ app_get0_propq()))
+ != NULL) {
ERR_pop_to_mark();
if (cipherp != NULL) {
EVP_CIPHER_free(*cipherp);
@@ -405,7 +420,7 @@ int opt_cipher_any(const char *name, EVP_CIPHER **cipherp)
int ret;
if (name == NULL)
- return 1;
+ return 1;
if ((ret = opt_cipher_silent(name, cipherp)) == 0)
opt_printf_stderr("%s: Unknown option or cipher: %s\n", prog, name);
return ret;
@@ -413,13 +428,13 @@ int opt_cipher_any(const char *name, EVP_CIPHER **cipherp)
int opt_cipher(const char *name, EVP_CIPHER **cipherp)
{
- int mode, ret = 0;
- unsigned long int flags;
- EVP_CIPHER *c = NULL;
+ int mode, ret = 0;
+ unsigned long int flags;
+ EVP_CIPHER *c = NULL;
if (name == NULL)
- return 1;
- if (opt_cipher_any(name, &c)) {
+ return 1;
+ if (opt_cipher_any(name, &c)) {
mode = EVP_CIPHER_get_mode(c);
flags = EVP_CIPHER_get_flags(c);
if (mode == EVP_CIPH_XTS_MODE) {
@@ -467,7 +482,7 @@ int opt_md(const char *name, EVP_MD **mdp)
return 1;
if ((ret = opt_md_silent(name, mdp)) == 0)
opt_printf_stderr("%s: Unknown option or message digest: %s\n",
- prog, name);
+ prog, name);
return ret;
}
@@ -480,7 +495,7 @@ int opt_check_md(const char *name)
}
/* Look through a list of name/value pairs. */
-int opt_pair(const char *name, const OPT_PAIR* pairs, int *result)
+int opt_pair(const char *name, const OPT_PAIR *pairs, int *result)
{
const OPT_PAIR *pp;
@@ -519,7 +534,7 @@ int opt_int(const char *value, int *result)
*result = (int)l;
if (*result != l) {
opt_printf_stderr("%s: Value \"%s\" outside integer range\n",
- prog, value);
+ prog, value);
return 0;
}
return 1;
@@ -541,15 +556,15 @@ static void opt_number_error(const char *v)
char *prefix;
char *name;
} b[] = {
- {"0x", "a hexadecimal"},
- {"0X", "a hexadecimal"},
- {"0", "an octal"}
+ { "0x", "a hexadecimal" },
+ { "0X", "a hexadecimal" },
+ { "0", "an octal" }
};
for (i = 0; i < OSSL_NELEM(b); i++) {
if (strncmp(v, b[i].prefix, strlen(b[i].prefix)) == 0) {
opt_printf_stderr("%s: Can't parse \"%s\" as %s number\n",
- prog, v, b[i].name);
+ prog, v, b[i].name);
return;
}
}
@@ -567,9 +582,9 @@ int opt_long(const char *value, long *result)
errno = 0;
l = strtol(value, &endp, 0);
if (*endp
- || endp == value
- || ((l == LONG_MAX || l == LONG_MIN) && errno == ERANGE)
- || (l == 0 && errno != 0)) {
+ || endp == value
+ || ((l == LONG_MAX || l == LONG_MIN) && errno == ERANGE)
+ || (l == 0 && errno != 0)) {
opt_number_error(value);
errno = oerrno;
return 0;
@@ -579,9 +594,7 @@ int opt_long(const char *value, long *result)
return 1;
}
-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && \
- defined(INTMAX_MAX) && defined(UINTMAX_MAX) && \
- !defined(OPENSSL_NO_INTTYPES_H)
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && defined(INTMAX_MAX) && defined(UINTMAX_MAX) && !defined(OPENSSL_NO_INTTYPES_H)
/* Parse an intmax_t, put it into *result; return 0 on failure, else 1. */
int opt_intmax(const char *value, ossl_intmax_t *result)
@@ -593,10 +606,10 @@ int opt_intmax(const char *value, ossl_intmax_t *result)
errno = 0;
m = strtoimax(value, &endp, 0);
if (*endp
- || endp == value
- || ((m == INTMAX_MAX || m == INTMAX_MIN)
- && errno == ERANGE)
- || (m == 0 && errno != 0)) {
+ || endp == value
+ || ((m == INTMAX_MAX || m == INTMAX_MIN)
+ && errno == ERANGE)
+ || (m == 0 && errno != 0)) {
opt_number_error(value);
errno = oerrno;
return 0;
@@ -622,9 +635,9 @@ int opt_uintmax(const char *value, ossl_uintmax_t *result)
errno = 0;
m = strtoumax(value, &endp, 0);
if (*endp
- || endp == value
- || (m == UINTMAX_MAX && errno == ERANGE)
- || (m == 0 && errno != 0)) {
+ || endp == value
+ || (m == UINTMAX_MAX && errno == ERANGE)
+ || (m == 0 && errno != 0)) {
opt_number_error(value);
errno = oerrno;
return 0;
@@ -674,9 +687,9 @@ int opt_ulong(const char *value, unsigned long *result)
errno = 0;
l = strtoul(value, &endptr, 0);
if (*endptr
- || endptr == value
- || ((l == ULONG_MAX) && errno == ERANGE)
- || (l == 0 && errno != 0)) {
+ || endptr == value
+ || ((l == ULONG_MAX) && errno == ERANGE)
+ || (l == 0 && errno != 0)) {
opt_number_error(value);
errno = oerrno;
return 0;
@@ -718,7 +731,7 @@ int opt_verify(int opt, X509_VERIFY_PARAM *vpm)
if (!X509_VERIFY_PARAM_add0_policy(vpm, otmp)) {
ASN1_OBJECT_free(otmp);
opt_printf_stderr("%s: Internal error adding Policy %s\n",
- prog, opt_arg());
+ prog, opt_arg());
return 0;
}
break;
@@ -738,7 +751,7 @@ int opt_verify(int opt, X509_VERIFY_PARAM *vpm)
if (!X509_VERIFY_PARAM_set_purpose(vpm, i)) {
opt_printf_stderr("%s: Internal error setting purpose %s\n",
- prog, opt_arg());
+ prog, opt_arg());
return 0;
}
break;
@@ -746,7 +759,7 @@ int opt_verify(int opt, X509_VERIFY_PARAM *vpm)
vtmp = X509_VERIFY_PARAM_lookup(opt_arg());
if (vtmp == NULL) {
opt_printf_stderr("%s: Invalid verify name %s\n",
- prog, opt_arg());
+ prog, opt_arg());
return 0;
}
X509_VERIFY_PARAM_set1(vpm, vtmp);
@@ -766,7 +779,7 @@ int opt_verify(int opt, X509_VERIFY_PARAM *vpm)
return 0;
if (t != (time_t)t) {
opt_printf_stderr("%s: epoch time out of range %s\n",
- prog, opt_arg());
+ prog, opt_arg());
return 0;
}
X509_VERIFY_PARAM_set_time(vpm, (time_t)t);
@@ -794,8 +807,7 @@ int opt_verify(int opt, X509_VERIFY_PARAM *vpm)
break;
case OPT_V_CRL_CHECK_ALL:
X509_VERIFY_PARAM_set_flags(vpm,
- X509_V_FLAG_CRL_CHECK |
- X509_V_FLAG_CRL_CHECK_ALL);
+ X509_V_FLAG_CRL_CHECK | X509_V_FLAG_CRL_CHECK_ALL);
break;
case OPT_V_POLICY_CHECK:
X509_VERIFY_PARAM_set_flags(vpm, X509_V_FLAG_POLICY_CHECK);
@@ -850,7 +862,6 @@ int opt_verify(int opt, X509_VERIFY_PARAM *vpm)
break;
}
return 1;
-
}
void opt_begin(void)
@@ -900,14 +911,14 @@ int opt_next(void)
for (o = opts; o->name; ++o) {
/* If not this option, move on to the next one. */
if (!(strcmp(p, "h") == 0 && strcmp(o->name, "help") == 0)
- && strcmp(p, o->name) != 0)
+ && strcmp(p, o->name) != 0)
continue;
/* If it doesn't take a value, make sure none was given. */
if (o->valtype == 0 || o->valtype == '-') {
if (arg) {
opt_printf_stderr("%s: Option -%s does not take a value\n",
- prog, p);
+ prog, p);
return -1;
}
return o->retval;
@@ -917,7 +928,7 @@ int opt_next(void)
if (arg == NULL) {
if (argv[opt_index] == NULL) {
opt_printf_stderr("%s: Option -%s needs a value\n",
- prog, o->name);
+ prog, o->name);
return -1;
}
arg = argv[opt_index++];
@@ -951,12 +962,12 @@ int opt_next(void)
return -1;
if (o->valtype == 'p' && ival <= 0) {
opt_printf_stderr("%s: Non-positive number \"%s\" for option -%s\n",
- prog, arg, o->name);
+ prog, arg, o->name);
return -1;
}
if (o->valtype == 'N' && ival < 0) {
opt_printf_stderr("%s: Negative number \"%s\" for option -%s\n",
- prog, arg, o->name);
+ prog, arg, o->name);
return -1;
}
break;
@@ -982,13 +993,13 @@ int opt_next(void)
case 'A':
case 'a':
if (opt_format(arg,
- o->valtype == 'c' ? OPT_FMT_PDS :
- o->valtype == 'F' ? OPT_FMT_PEMDER :
- o->valtype == 'A' ? OPT_FMT_ASN1 :
- OPT_FMT_ANY, &ival))
+ o->valtype == 'c' ? OPT_FMT_PDS : o->valtype == 'F' ? OPT_FMT_PEMDER
+ : o->valtype == 'A' ? OPT_FMT_ASN1
+ : OPT_FMT_ANY,
+ &ival))
break;
opt_printf_stderr("%s: Invalid format \"%s\" for option -%s\n",
- prog, arg, o->name);
+ prog, arg, o->name);
return -1;
}
@@ -998,7 +1009,7 @@ int opt_next(void)
if (unknown != NULL) {
if (dunno != NULL) {
opt_printf_stderr("%s: Multiple %s or unknown options: -%s and -%s\n",
- prog, unknown_name, dunno, p);
+ prog, unknown_name, dunno, p);
return -1;
}
dunno = p;
@@ -1070,7 +1081,7 @@ int opt_check_rest_arg(const char *expected)
opt_printf_stderr("%s: Extra option: \"%s\"\n", prog, opt);
else
opt_printf_stderr("%s: Extra (unknown) options: \"%s\" \"%s\"\n",
- prog, opt_unknown(), opt);
+ prog, opt_unknown(), opt);
return 0;
}
@@ -1115,7 +1126,7 @@ static const char *valtype2param(const OPTIONS *o)
static void opt_print(const OPTIONS *o, int doingparams, int width)
{
- const char* help;
+ const char *help;
char start[80 + 1];
int linelen, printlen;
@@ -1153,11 +1164,11 @@ static void opt_print(const OPTIONS *o, int doingparams, int width)
printlen = opt_printf_stderr(" %s", !doingparams ? "-" : "");
linelen += (printlen > 0) ? printlen : MAX_OPT_HELP_WIDTH;
- printlen = opt_printf_stderr("%s" , o->name[0] ? o->name : "*");
+ printlen = opt_printf_stderr("%s", o->name[0] ? o->name : "*");
linelen += (printlen > 0) ? printlen : MAX_OPT_HELP_WIDTH;
if (o->valtype != '-') {
- printlen = opt_printf_stderr(" %s" , valtype2param(o));
+ printlen = opt_printf_stderr(" %s", valtype2param(o));
linelen += (printlen > 0) ? printlen : MAX_OPT_HELP_WIDTH;
}
@@ -1214,52 +1225,52 @@ void opt_help(const OPTIONS *list)
/* opt_isdir section */
#ifdef _WIN32
-# include <windows.h>
+#include <windows.h>
int opt_isdir(const char *name)
{
DWORD attr;
-# if defined(UNICODE) || defined(_UNICODE)
+#if defined(UNICODE) || defined(_UNICODE)
size_t i, len_0 = strlen(name) + 1;
WCHAR tempname[MAX_PATH];
if (len_0 > MAX_PATH)
return -1;
-# if !defined(_WIN32_WCE) || _WIN32_WCE>=101
+#if !defined(_WIN32_WCE) || _WIN32_WCE >= 101
if (!MultiByteToWideChar(CP_ACP, 0, name, (int)len_0, tempname, MAX_PATH))
-# endif
+#endif
for (i = 0; i < len_0; i++)
tempname[i] = (WCHAR)name[i];
attr = GetFileAttributes(tempname);
-# else
+#else
attr = GetFileAttributes(name);
-# endif
+#endif
if (attr == INVALID_FILE_ATTRIBUTES)
return -1;
return ((attr & FILE_ATTRIBUTE_DIRECTORY) != 0);
}
#else
-# include <sys/stat.h>
-# ifndef S_ISDIR
-# if defined(_S_IFMT) && defined(_S_IFDIR)
-# define S_ISDIR(a) (((a) & _S_IFMT) == _S_IFDIR)
-# else
-# define S_ISDIR(a) (((a) & S_IFMT) == S_IFDIR)
-# endif
-# endif
+#include <sys/stat.h>
+#ifndef S_ISDIR
+#if defined(_S_IFMT) && defined(_S_IFDIR)
+#define S_ISDIR(a) (((a) & _S_IFMT) == _S_IFDIR)
+#else
+#define S_ISDIR(a) (((a) & S_IFMT) == S_IFDIR)
+#endif
+#endif
int opt_isdir(const char *name)
{
-# if defined(S_ISDIR)
+#if defined(S_ISDIR)
struct stat st;
if (stat(name, &st) == 0)
return S_ISDIR(st.st_mode);
else
return -1;
-# else
+#else
return -1;
-# endif
+#endif
}
#endif
diff --git a/apps/lib/s_cb.c b/apps/lib/s_cb.c
index c4fa5d9d8a..016adb5043 100644
--- a/apps/lib/s_cb.c
+++ b/apps/lib/s_cb.c
@@ -23,11 +23,11 @@
#include <openssl/ssl.h>
#include <openssl/bn.h>
#ifndef OPENSSL_NO_DH
-# include <openssl/dh.h>
+#include <openssl/dh.h>
#endif
#include "s_apps.h"
-#define COOKIE_SECRET_LENGTH 16
+#define COOKIE_SECRET_LENGTH 16
VERIFY_CB_ARGS verify_args = { -1, 0, X509_V_OK, 0 };
@@ -37,9 +37,9 @@ static int cookie_initialized = 0;
#endif
static BIO *bio_keylog = NULL;
-static const char *lookup(int val, const STRINT_PAIR* list, const char* def)
+static const char *lookup(int val, const STRINT_PAIR *list, const char *def)
{
- for ( ; list->name; ++list)
+ for (; list->name; ++list)
if (list->retval == val)
return list->name;
return def;
@@ -58,8 +58,8 @@ int verify_callback(int ok, X509_STORE_CTX *ctx)
BIO_printf(bio_err, "depth=%d ", depth);
if (err_cert != NULL) {
X509_NAME_print_ex(bio_err,
- X509_get_subject_name(err_cert),
- 0, get_nameopt());
+ X509_get_subject_name(err_cert),
+ 0, get_nameopt());
BIO_puts(bio_err, "\n");
} else {
BIO_puts(bio_err, "<no cert>\n");
@@ -67,7 +67,7 @@ int verify_callback(int ok, X509_STORE_CTX *ctx)
}
if (!ok) {
BIO_printf(bio_err, "verify error:num=%d:%s\n", err,
- X509_verify_cert_error_string(err));
+ X509_verify_cert_error_string(err));
if (verify_args.depth < 0 || verify_args.depth >= depth) {
if (!verify_args.return_error)
ok = 1;
@@ -82,7 +82,7 @@ int verify_callback(int ok, X509_STORE_CTX *ctx)
if (err_cert != NULL) {
BIO_puts(bio_err, "issuer= ");
X509_NAME_print_ex(bio_err, X509_get_issuer_name(err_cert),
- 0, get_nameopt());
+ 0, get_nameopt());
BIO_puts(bio_err, "\n");
}
break;
@@ -122,9 +122,10 @@ int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file)
{
if (cert_file != NULL) {
if (SSL_CTX_use_certificate_file(ctx, cert_file,
- SSL_FILETYPE_PEM) <= 0) {
+ SSL_FILETYPE_PEM)
+ <= 0) {
BIO_printf(bio_err, "unable to get certificate from '%s'\n",
- cert_file);
+ cert_file);
ERR_print_errors(bio_err);
return 0;
}
@@ -132,7 +133,7 @@ int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file)
key_file = cert_file;
if (SSL_CTX_use_PrivateKey_file(ctx, key_file, SSL_FILETYPE_PEM) <= 0) {
BIO_printf(bio_err, "unable to get private key from '%s'\n",
- key_file);
+ key_file);
ERR_print_errors(bio_err);
return 0;
}
@@ -148,7 +149,7 @@ int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file)
*/
if (!SSL_CTX_check_private_key(ctx)) {
BIO_printf(bio_err,
- "Private key does not match the certificate public key\n");
+ "Private key does not match the certificate public key\n");
return 0;
}
}
@@ -156,7 +157,7 @@ int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file)
}
int set_cert_key_stuff(SSL_CTX *ctx, X509 *cert, EVP_PKEY *key,
- STACK_OF(X509) *chain, int build_chain)
+ STACK_OF(X509) *chain, int build_chain)
{
int chflags = chain ? SSL_BUILD_CHAIN_FLAG_CHECK : 0;
@@ -179,7 +180,7 @@ int set_cert_key_stuff(SSL_CTX *ctx, X509 *cert, EVP_PKEY *key,
*/
if (!SSL_CTX_check_private_key(ctx)) {
BIO_printf(bio_err,
- "Private key does not match the certificate public key\n");
+ "Private key does not match the certificate public key\n");
return 0;
}
if (chain && !SSL_CTX_set1_chain(ctx, chain)) {
@@ -196,16 +197,16 @@ int set_cert_key_stuff(SSL_CTX *ctx, X509 *cert, EVP_PKEY *key,
}
static STRINT_PAIR cert_type_list[] = {
- {"RSA sign", TLS_CT_RSA_SIGN},
- {"DSA sign", TLS_CT_DSS_SIGN},
- {"RSA fixed DH", TLS_CT_RSA_FIXED_DH},
- {"DSS fixed DH", TLS_CT_DSS_FIXED_DH},
- {"ECDSA sign", TLS_CT_ECDSA_SIGN},
- {"RSA fixed ECDH", TLS_CT_RSA_FIXED_ECDH},
- {"ECDSA fixed ECDH", TLS_CT_ECDSA_FIXED_ECDH},
- {"GOST01 Sign", TLS_CT_GOST01_SIGN},
- {"GOST12 Sign", TLS_CT_GOST12_IANA_SIGN},
- {NULL}
+ { "RSA sign", TLS_CT_RSA_SIGN },
+ { "DSA sign", TLS_CT_DSS_SIGN },
+ { "RSA fixed DH", TLS_CT_RSA_FIXED_DH },
+ { "DSS fixed DH", TLS_CT_DSS_FIXED_DH },
+ { "ECDSA sign", TLS_CT_ECDSA_SIGN },
+ { "RSA fixed ECDH", TLS_CT_RSA_FIXED_ECDH },
+ { "ECDSA fixed ECDH", TLS_CT_ECDSA_FIXED_ECDH },
+ { "GOST01 Sign", TLS_CT_GOST01_SIGN },
+ { "GOST12 Sign", TLS_CT_GOST12_IANA_SIGN },
+ { NULL }
};
static void ssl_print_client_cert_types(BIO *bio, SSL *s)
@@ -291,7 +292,7 @@ static int do_print_sigalgs(BIO *out, SSL *s, int shared)
const char *sstr = NULL;
if (shared)
SSL_get_shared_sigalgs(s, i, &sign_nid, &hash_nid, NULL,
- &rsign, &rhash);
+ &rsign, &rhash);
else
SSL_get_sigalgs(s, i, &sign_nid, &hash_nid, NULL, &rsign, &rhash);
if (i)
@@ -377,7 +378,6 @@ int ssl_print_point_formats(BIO *out, SSL *s)
default:
BIO_printf(out, "unknown(%d)", (int)*pformats);
break;
-
}
}
BIO_puts(out, "\n");
@@ -429,7 +429,7 @@ int ssl_print_tmp_key(BIO *out, SSL *s)
if (!SSL_get_peer_tmp_key(s, &key)) {
if (SSL_version(s) == TLS1_3_VERSION)
BIO_printf(out, "Negotiated TLS1.3 group: %s\n",
- SSL_group_to_name(s, SSL_get_negotiated_group(s)));
+ SSL_group_to_name(s, SSL_get_negotiated_group(s)));
return 1;
}
@@ -449,28 +449,26 @@ int ssl_print_tmp_key(BIO *out, SSL *s)
BIO_printf(out, "DH, %d bits\n", EVP_PKEY_get_bits(key));
break;
#ifndef OPENSSL_NO_EC
- case EVP_PKEY_EC:
- {
- char name[80];
- size_t name_len;
-
- if (!EVP_PKEY_get_utf8_string_param(key, OSSL_PKEY_PARAM_GROUP_NAME,
- name, sizeof(name), &name_len))
- strcpy(name, "?");
- BIO_printf(out, "ECDH, %s, %d bits\n", name, EVP_PKEY_get_bits(key));
- }
- break;
+ case EVP_PKEY_EC: {
+ char name[80];
+ size_t name_len;
+
+ if (!EVP_PKEY_get_utf8_string_param(key, OSSL_PKEY_PARAM_GROUP_NAME,
+ name, sizeof(name), &name_len))
+ strcpy(name, "?");
+ BIO_printf(out, "ECDH, %s, %d bits\n", name, EVP_PKEY_get_bits(key));
+ } break;
#endif
default:
BIO_printf(out, "%s, %d bits\n", OBJ_nid2sn(EVP_PKEY_get_id(key)),
- EVP_PKEY_get_bits(key));
+ EVP_PKEY_get_bits(key));
}
EVP_PKEY_free(key);
return 1;
}
long bio_dump_callback(BIO *bio, int cmd, const char *argp, size_t len,
- int argi, long argl, int ret, size_t *processed)
+ int argi, long argl, int ret, size_t *processed)
{
BIO *out;
BIO_MMSG_CB_ARGS *mmsgargs;
@@ -484,22 +482,22 @@ long bio_dump_callback(BIO *bio, int cmd, const char *argp, size_t len,
case (BIO_CB_READ | BIO_CB_RETURN):
if (ret > 0 && processed != NULL) {
BIO_printf(out, "read from %p [%p] (%zu bytes => %zu (0x%zX))\n",
- (void *)bio, (void *)argp, len, *processed, *processed);
+ (void *)bio, (void *)argp, len, *processed, *processed);
BIO_dump(out, argp, (int)*processed);
} else {
BIO_printf(out, "read from %p [%p] (%zu bytes => %d)\n",
- (void *)bio, (void *)argp, len, ret);
+ (void *)bio, (void *)argp, len, ret);
}
break;
case (BIO_CB_WRITE | BIO_CB_RETURN):
if (ret > 0 && processed != NULL) {
BIO_printf(out, "write to %p [%p] (%zu bytes => %zu (0x%zX))\n",
- (void *)bio, (void *)argp, len, *processed, *processed);
+ (void *)bio, (void *)argp, len, *processed, *processed);
BIO_dump(out, argp, (int)*processed);
} else {
BIO_printf(out, "write to %p [%p] (%zu bytes => %d)\n",
- (void *)bio, (void *)argp, len, ret);
+ (void *)bio, (void *)argp, len, ret);
}
break;
@@ -508,11 +506,11 @@ long bio_dump_callback(BIO *bio, int cmd, const char *argp, size_t len,
if (ret > 0) {
for (i = 0; i < *(mmsgargs->msgs_processed); i++) {
BIO_MSG *msg = (BIO_MSG *)((char *)mmsgargs->msg
- + (i * mmsgargs->stride));
+ + (i * mmsgargs->stride));
BIO_printf(out, "read from %p [%p] (%zu bytes => %zu (0x%zX))\n",
- (void *)bio, (void *)msg->data, msg->data_len,
- msg->data_len, msg->data_len);
+ (void *)bio, (void *)msg->data, msg->data_len,
+ msg->data_len, msg->data_len);
if (msg->data_len <= INT_MAX)
BIO_dump(out, msg->data, (int)msg->data_len);
}
@@ -520,7 +518,7 @@ long bio_dump_callback(BIO *bio, int cmd, const char *argp, size_t len,
BIO_MSG *msg = mmsgargs->msg;
BIO_printf(out, "read from %p [%p] (%zu bytes => %d)\n",
- (void *)bio, (void *)msg->data, msg->data_len, ret);
+ (void *)bio, (void *)msg->data, msg->data_len, ret);
}
break;
@@ -529,11 +527,11 @@ long bio_dump_callback(BIO *bio, int cmd, const char *argp, size_t len,
if (ret > 0) {
for (i = 0; i < *(mmsgargs->msgs_processed); i++) {
BIO_MSG *msg = (BIO_MSG *)((char *)mmsgargs->msg
- + (i * mmsgargs->stride));
+ + (i * mmsgargs->stride));
BIO_printf(out, "write to %p [%p] (%zu bytes => %zu (0x%zX))\n",
- (void *)bio, (void *)msg->data, msg->data_len,
- msg->data_len, msg->data_len);
+ (void *)bio, (void *)msg->data, msg->data_len,
+ msg->data_len, msg->data_len);
if (msg->data_len <= INT_MAX)
BIO_dump(out, msg->data, (int)msg->data_len);
}
@@ -541,7 +539,7 @@ long bio_dump_callback(BIO *bio, int cmd, const char *argp, size_t len,
BIO_MSG *msg = mmsgargs->msg;
BIO_printf(out, "write to %p [%p] (%zu bytes => %d)\n",
- (void *)bio, (void *)msg->data, msg->data_len, ret);
+ (void *)bio, (void *)msg->data, msg->data_len, ret);
}
break;
@@ -571,109 +569,104 @@ void apps_ssl_info_callback(const SSL *s, int where, int ret)
} else if (where & SSL_CB_ALERT) {
str = (where & SSL_CB_READ) ? "read" : "write";
BIO_printf(bio_err, "SSL3 alert %s:%s:%s\n",
- str,
- SSL_alert_type_string_long(ret),
- SSL_alert_desc_string_long(ret));
+ str,
+ SSL_alert_type_string_long(ret),
+ SSL_alert_desc_string_long(ret));
} else if (where & SSL_CB_EXIT) {
if (ret == 0)
BIO_printf(bio_err, "%s:failed in %s\n",
- str, SSL_state_string_long(s));
+ str, SSL_state_string_long(s));
else if (ret < 0)
BIO_printf(bio_err, "%s:error in %s\n",
- str, SSL_state_string_long(s));
+ str, SSL_state_string_long(s));
}
}
static STRINT_PAIR ssl_versions[] = {
- {"SSL 3.0", SSL3_VERSION},
- {"TLS 1.0", TLS1_VERSION},
- {"TLS 1.1", TLS1_1_VERSION},
- {"TLS 1.2", TLS1_2_VERSION},
- {"TLS 1.3", TLS1_3_VERSION},
- {"DTLS 1.0", DTLS1_VERSION},
- {"DTLS 1.0 (bad)", DTLS1_BAD_VER},
- {NULL}
+ { "SSL 3.0", SSL3_VERSION },
+ { "TLS 1.0", TLS1_VERSION },
+ { "TLS 1.1", TLS1_1_VERSION },
+ { "TLS 1.2", TLS1_2_VERSION },
+ { "TLS 1.3", TLS1_3_VERSION },
+ { "DTLS 1.0", DTLS1_VERSION },
+ { "DTLS 1.0 (bad)", DTLS1_BAD_VER },
+ { NULL }
};
static STRINT_PAIR alert_types[] = {
- {" close_notify", 0},
- {" end_of_early_data", 1},
- {" unexpected_message", 10},
- {" bad_record_mac", 20},
- {" decryption_failed", 21},
- {" record_overflow", 22},
- {" decompression_failure", 30},
- {" handshake_failure", 40},
- {" bad_certificate", 42},
- {" unsupported_certificate", 43},
- {" certificate_revoked", 44},
- {" certificate_expired", 45},
- {" certificate_unknown", 46},
- {" illegal_parameter", 47},
- {" unknown_ca", 48},
- {" access_denied", 49},
- {" decode_error", 50},
- {" decrypt_error", 51},
- {" export_restriction", 60},
- {" protocol_version", 70},
- {" insufficient_security", 71},
- {" internal_error", 80},
- {" inappropriate_fallback", 86},
- {" user_canceled", 90},
- {" no_renegotiation", 100},
- {" missing_extension", 109},
- {" unsupported_extension", 110},
- {" certificate_unobtainable", 111},
- {" unrecognized_name", 112},
- {" bad_certificate_status_response", 113},
- {" bad_certificate_hash_value", 114},
- {" unknown_psk_identity", 115},
- {" certificate_required", 116},
- {NULL}
+ { " close_notify", 0 },
+ { " end_of_early_data", 1 },
+ { " unexpected_message", 10 },
+ { " bad_record_mac", 20 },
+ { " decryption_failed", 21 },
+ { " record_overflow", 22 },
+ { " decompression_failure", 30 },
+ { " handshake_failure", 40 },
+ { " bad_certificate", 42 },
+ { " unsupported_certificate", 43 },
+ { " certificate_revoked", 44 },
+ { " certificate_expired", 45 },
+ { " certificate_unknown", 46 },
+ { " illegal_parameter", 47 },
+ { " unknown_ca", 48 },
+ { " access_denied", 49 },
+ { " decode_error", 50 },
+ { " decrypt_error", 51 },
+ { " export_restriction", 60 },
+ { " protocol_version", 70 },
+ { " insufficient_security", 71 },
+ { " internal_error", 80 },
+ { " inappropriate_fallback", 86 },
+ { " user_canceled", 90 },
+ { " no_renegotiation", 100 },
+ { " missing_extension", 109 },
+ { " unsupported_extension", 110 },
+ { " certificate_unobtainable", 111 },
+ { " unrecognized_name", 112 },
+ { " bad_certificate_status_response", 113 },
+ { " bad_certificate_hash_value", 114 },
+ { " unknown_psk_identity", 115 },
+ { " certificate_required", 116 },
+ { NULL }
};
static STRINT_PAIR handshakes[] = {
- {", HelloRequest", SSL3_MT_HELLO_REQUEST},
- {", ClientHello", SSL3_MT_CLIENT_HELLO},
- {", ServerHello", SSL3_MT_SERVER_HELLO},
- {", HelloVerifyRequest", DTLS1_MT_HELLO_VERIFY_REQUEST},
- {", NewSessionTicket", SSL3_MT_NEWSESSION_TICKET},
- {", EndOfEarlyData", SSL3_MT_END_OF_EARLY_DATA},
- {", EncryptedExtensions", SSL3_MT_ENCRYPTED_EXTENSIONS},
- {", Certificate", SSL3_MT_CERTIFICATE},
- {", ServerKeyExchange", SSL3_MT_SERVER_KEY_EXCHANGE},
- {", CertificateRequest", SSL3_MT_CERTIFICATE_REQUEST},
- {", ServerHelloDone", SSL3_MT_SERVER_DONE},
- {", CertificateVerify", SSL3_MT_CERTIFICATE_VERIFY},
- {", ClientKeyExchange", SSL3_MT_CLIENT_KEY_EXCHANGE},
- {", Finished", SSL3_MT_FINISHED},
- {", CertificateUrl", SSL3_MT_CERTIFICATE_URL},
- {", CertificateStatus", SSL3_MT_CERTIFICATE_STATUS},
- {", SupplementalData", SSL3_MT_SUPPLEMENTAL_DATA},
- {", KeyUpdate", SSL3_MT_KEY_UPDATE},
- {", CompressedCertificate", SSL3_MT_COMPRESSED_CERTIFICATE},
+ { ", HelloRequest", SSL3_MT_HELLO_REQUEST },
+ { ", ClientHello", SSL3_MT_CLIENT_HELLO },
+ { ", ServerHello", SSL3_MT_SERVER_HELLO },
+ { ", HelloVerifyRequest", DTLS1_MT_HELLO_VERIFY_REQUEST },
+ { ", NewSessionTicket", SSL3_MT_NEWSESSION_TICKET },
+ { ", EndOfEarlyData", SSL3_MT_END_OF_EARLY_DATA },
+ { ", EncryptedExtensions", SSL3_MT_ENCRYPTED_EXTENSIONS },
+ { ", Certificate", SSL3_MT_CERTIFICATE },
+ { ", ServerKeyExchange", SSL3_MT_SERVER_KEY_EXCHANGE },
+ { ", CertificateRequest", SSL3_MT_CERTIFICATE_REQUEST },
+ { ", ServerHelloDone", SSL3_MT_SERVER_DONE },
+ { ", CertificateVerify", SSL3_MT_CERTIFICATE_VERIFY },
+ { ", ClientKeyExchange", SSL3_MT_CLIENT_KEY_EXCHANGE },
+ { ", Finished", SSL3_MT_FINISHED },
+ { ", CertificateUrl", SSL3_MT_CERTIFICATE_URL },
+ { ", CertificateStatus", SSL3_MT_CERTIFICATE_STATUS },
+ { ", SupplementalData", SSL3_MT_SUPPLEMENTAL_DATA },
+ { ", KeyUpdate", SSL3_MT_KEY_UPDATE },
+ { ", CompressedCertificate", SSL3_MT_COMPRESSED_CERTIFICATE },
#ifndef OPENSSL_NO_NEXTPROTONEG
- {", NextProto", SSL3_MT_NEXT_PROTO},
+ { ", NextProto", SSL3_MT_NEXT_PROTO },
#endif
- {", MessageHash", SSL3_MT_MESSAGE_HASH},
- {NULL}
+ { ", MessageHash", SSL3_MT_MESSAGE_HASH },
+ { NULL }
};
void msg_cb(int write_p, int version, int content_type, const void *buf,
- size_t len, SSL *ssl, void *arg)
+ size_t len, SSL *ssl, void *arg)
{
BIO *bio = arg;
const char *str_write_p = write_p ? ">>>" : "<<<";
char tmpbuf[128];
const char *str_version, *str_content_type = "", *str_details1 = "", *str_details2 = "";
- const unsigned char* bp = buf;
-
- if (version == SSL3_VERSION ||
- version == TLS1_VERSION ||
- version == TLS1_1_VERSION ||
- version == TLS1_2_VERSION ||
- version == TLS1_3_VERSION ||
- version == DTLS1_VERSION || version == DTLS1_BAD_VER) {
+ const unsigned char *bp = buf;
+
+ if (version == SSL3_VERSION || version == TLS1_VERSION || version == TLS1_1_VERSION || version == TLS1_2_VERSION || version == TLS1_3_VERSION || version == DTLS1_VERSION || version == DTLS1_BAD_VER) {
str_version = lookup(version, ssl_versions, "???");
switch (content_type) {
case SSL3_RT_CHANGE_CIPHER_SPEC:
@@ -716,17 +709,17 @@ void msg_cb(int write_p, int version, int content_type, const void *buf,
str_content_type = ", InnerContent";
break;
default:
- BIO_snprintf(tmpbuf, sizeof(tmpbuf)-1, ", Unknown (content_type=%d)", content_type);
+ BIO_snprintf(tmpbuf, sizeof(tmpbuf) - 1, ", Unknown (content_type=%d)", content_type);
str_content_type = tmpbuf;
}
} else {
- BIO_snprintf(tmpbuf, sizeof(tmpbuf)-1, "Not TLS data or unknown version (version=%d, content_type=%d)", version, content_type);
+ BIO_snprintf(tmpbuf, sizeof(tmpbuf) - 1, "Not TLS data or unknown version (version=%d, content_type=%d)", version, content_type);
str_version = tmpbuf;
}
BIO_printf(bio, "%s %s%s [length %04lx]%s%s\n", str_write_p, str_version,
- str_content_type, (unsigned long)len, str_details1,
- str_details2);
+ str_content_type, (unsigned long)len, str_details1,
+ str_details2);
if (len > 0) {
size_t num, i;
@@ -746,113 +739,113 @@ void msg_cb(int write_p, int version, int content_type, const void *buf,
}
static const STRINT_PAIR tlsext_types[] = {
- {"server name", TLSEXT_TYPE_server_name},
- {"max fragment length", TLSEXT_TYPE_max_fragment_length},
- {"client certificate URL", TLSEXT_TYPE_client_certificate_url},
- {"trusted CA keys", TLSEXT_TYPE_trusted_ca_keys},
- {"truncated HMAC", TLSEXT_TYPE_truncated_hmac},
- {"status request", TLSEXT_TYPE_status_request},
- {"user mapping", TLSEXT_TYPE_user_mapping},
- {"client authz", TLSEXT_TYPE_client_authz},
- {"server authz", TLSEXT_TYPE_server_authz},
- {"cert type", TLSEXT_TYPE_cert_type},
- {"supported_groups", TLSEXT_TYPE_supported_groups},
- {"EC point formats", TLSEXT_TYPE_ec_point_formats},
- {"SRP", TLSEXT_TYPE_srp},
- {"signature algorithms", TLSEXT_TYPE_signature_algorithms},
- {"use SRTP", TLSEXT_TYPE_use_srtp},
- {"session ticket", TLSEXT_TYPE_session_ticket},
- {"renegotiation info", TLSEXT_TYPE_renegotiate},
- {"signed certificate timestamps", TLSEXT_TYPE_signed_certificate_timestamp},
- {"client cert type", TLSEXT_TYPE_client_cert_type},
- {"server cert type", TLSEXT_TYPE_server_cert_type},
- {"TLS padding", TLSEXT_TYPE_padding},
+ { "server name", TLSEXT_TYPE_server_name },
+ { "max fragment length", TLSEXT_TYPE_max_fragment_length },
+ { "client certificate URL", TLSEXT_TYPE_client_certificate_url },
+ { "trusted CA keys", TLSEXT_TYPE_trusted_ca_keys },
+ { "truncated HMAC", TLSEXT_TYPE_truncated_hmac },
+ { "status request", TLSEXT_TYPE_status_request },
+ { "user mapping", TLSEXT_TYPE_user_mapping },
+ { "client authz", TLSEXT_TYPE_client_authz },
+ { "server authz", TLSEXT_TYPE_server_authz },
+ { "cert type", TLSEXT_TYPE_cert_type },
+ { "supported_groups", TLSEXT_TYPE_supported_groups },
+ { "EC point formats", TLSEXT_TYPE_ec_point_formats },
+ { "SRP", TLSEXT_TYPE_srp },
+ { "signature algorithms", TLSEXT_TYPE_signature_algorithms },
+ { "use SRTP", TLSEXT_TYPE_use_srtp },
+ { "session ticket", TLSEXT_TYPE_session_ticket },
+ { "renegotiation info", TLSEXT_TYPE_renegotiate },
+ { "signed certificate timestamps", TLSEXT_TYPE_signed_certificate_timestamp },
+ { "client cert type", TLSEXT_TYPE_client_cert_type },
+ { "server cert type", TLSEXT_TYPE_server_cert_type },
+ { "TLS padding", TLSEXT_TYPE_padding },
#ifdef TLSEXT_TYPE_next_proto_neg
- {"next protocol", TLSEXT_TYPE_next_proto_neg},
+ { "next protocol", TLSEXT_TYPE_next_proto_neg },
#endif
#ifdef TLSEXT_TYPE_encrypt_then_mac
- {"encrypt-then-mac", TLSEXT_TYPE_encrypt_then_mac},
+ { "encrypt-then-mac", TLSEXT_TYPE_encrypt_then_mac },
#endif
#ifdef TLSEXT_TYPE_application_layer_protocol_negotiation
- {"application layer protocol negotiation",
- TLSEXT_TYPE_application_layer_protocol_negotiation},
+ { "application layer protocol negotiation",
+ TLSEXT_TYPE_application_layer_protocol_negotiation },
#endif
#ifdef TLSEXT_TYPE_extended_master_secret
- {"extended master secret", TLSEXT_TYPE_extended_master_secret},
+ { "extended master secret", TLSEXT_TYPE_extended_master_secret },
#endif
- {"compress certificate", TLSEXT_TYPE_compress_certificate},
- {"key share", TLSEXT_TYPE_key_share},
- {"supported versions", TLSEXT_TYPE_supported_versions},
- {"psk", TLSEXT_TYPE_psk},
- {"psk kex modes", TLSEXT_TYPE_psk_kex_modes},
- {"certificate authorities", TLSEXT_TYPE_certificate_authorities},
- {"post handshake auth", TLSEXT_TYPE_post_handshake_auth},
- {"early_data", TLSEXT_TYPE_early_data},
- {NULL}
+ { "compress certificate", TLSEXT_TYPE_compress_certificate },
+ { "key share", TLSEXT_TYPE_key_share },
+ { "supported versions", TLSEXT_TYPE_supported_versions },
+ { "psk", TLSEXT_TYPE_psk },
+ { "psk kex modes", TLSEXT_TYPE_psk_kex_modes },
+ { "certificate authorities", TLSEXT_TYPE_certificate_authorities },
+ { "post handshake auth", TLSEXT_TYPE_post_handshake_auth },
+ { "early_data", TLSEXT_TYPE_early_data },
+ { NULL }
};
/* from rfc8446 4.2.3. + gost (https://tools.ietf.org/id/draft-smyshlyaev-tls12-gost-suites-04.html) */
static STRINT_PAIR signature_tls13_scheme_list[] = {
- {"rsa_pkcs1_sha1", 0x0201 /* TLSEXT_SIGALG_rsa_pkcs1_sha1 */},
- {"ecdsa_sha1", 0x0203 /* TLSEXT_SIGALG_ecdsa_sha1 */},
-/* {"rsa_pkcs1_sha224", 0x0301 TLSEXT_SIGALG_rsa_pkcs1_sha224}, not in rfc8446 */
-/* {"ecdsa_sha224", 0x0303 TLSEXT_SIGALG_ecdsa_sha224} not in rfc8446 */
- {"rsa_pkcs1_sha256", 0x0401 /* TLSEXT_SIGALG_rsa_pkcs1_sha256 */},
- {"ecdsa_secp256r1_sha256", 0x0403 /* TLSEXT_SIGALG_ecdsa_secp256r1_sha256 */},
- {"rsa_pkcs1_sha384", 0x0501 /* TLSEXT_SIGALG_rsa_pkcs1_sha384 */},
- {"ecdsa_secp384r1_sha384", 0x0503 /* TLSEXT_SIGALG_ecdsa_secp384r1_sha384 */},
- {"rsa_pkcs1_sha512", 0x0601 /* TLSEXT_SIGALG_rsa_pkcs1_sha512 */},
- {"ecdsa_secp521r1_sha512", 0x0603 /* TLSEXT_SIGALG_ecdsa_secp521r1_sha512 */},
- {"rsa_pss_rsae_sha256", 0x0804 /* TLSEXT_SIGALG_rsa_pss_rsae_sha256 */},
- {"rsa_pss_rsae_sha384", 0x0805 /* TLSEXT_SIGALG_rsa_pss_rsae_sha384 */},
- {"rsa_pss_rsae_sha512", 0x0806 /* TLSEXT_SIGALG_rsa_pss_rsae_sha512 */},
- {"ed25519", 0x0807 /* TLSEXT_SIGALG_ed25519 */},
- {"ed448", 0x0808 /* TLSEXT_SIGALG_ed448 */},
- {"rsa_pss_pss_sha256", 0x0809 /* TLSEXT_SIGALG_rsa_pss_pss_sha256 */},
- {"rsa_pss_pss_sha384", 0x080a /* TLSEXT_SIGALG_rsa_pss_pss_sha384 */},
- {"rsa_pss_pss_sha512", 0x080b /* TLSEXT_SIGALG_rsa_pss_pss_sha512 */},
- {"gostr34102001", 0xeded /* TLSEXT_SIGALG_gostr34102001_gostr3411 */},
- {"gostr34102012_256", 0xeeee /* TLSEXT_SIGALG_gostr34102012_256_gostr34112012_256 */},
- {"gostr34102012_512", 0xefef /* TLSEXT_SIGALG_gostr34102012_512_gostr34112012_512 */},
- {NULL}
+ { "rsa_pkcs1_sha1", 0x0201 /* TLSEXT_SIGALG_rsa_pkcs1_sha1 */ },
+ { "ecdsa_sha1", 0x0203 /* TLSEXT_SIGALG_ecdsa_sha1 */ },
+ /* {"rsa_pkcs1_sha224", 0x0301 TLSEXT_SIGALG_rsa_pkcs1_sha224}, not in rfc8446 */
+ /* {"ecdsa_sha224", 0x0303 TLSEXT_SIGALG_ecdsa_sha224} not in rfc8446 */
+ { "rsa_pkcs1_sha256", 0x0401 /* TLSEXT_SIGALG_rsa_pkcs1_sha256 */ },
+ { "ecdsa_secp256r1_sha256", 0x0403 /* TLSEXT_SIGALG_ecdsa_secp256r1_sha256 */ },
+ { "rsa_pkcs1_sha384", 0x0501 /* TLSEXT_SIGALG_rsa_pkcs1_sha384 */ },
+ { "ecdsa_secp384r1_sha384", 0x0503 /* TLSEXT_SIGALG_ecdsa_secp384r1_sha384 */ },
+ { "rsa_pkcs1_sha512", 0x0601 /* TLSEXT_SIGALG_rsa_pkcs1_sha512 */ },
+ { "ecdsa_secp521r1_sha512", 0x0603 /* TLSEXT_SIGALG_ecdsa_secp521r1_sha512 */ },
+ { "rsa_pss_rsae_sha256", 0x0804 /* TLSEXT_SIGALG_rsa_pss_rsae_sha256 */ },
+ { "rsa_pss_rsae_sha384", 0x0805 /* TLSEXT_SIGALG_rsa_pss_rsae_sha384 */ },
+ { "rsa_pss_rsae_sha512", 0x0806 /* TLSEXT_SIGALG_rsa_pss_rsae_sha512 */ },
+ { "ed25519", 0x0807 /* TLSEXT_SIGALG_ed25519 */ },
+ { "ed448", 0x0808 /* TLSEXT_SIGALG_ed448 */ },
+ { "rsa_pss_pss_sha256", 0x0809 /* TLSEXT_SIGALG_rsa_pss_pss_sha256 */ },
+ { "rsa_pss_pss_sha384", 0x080a /* TLSEXT_SIGALG_rsa_pss_pss_sha384 */ },
+ { "rsa_pss_pss_sha512", 0x080b /* TLSEXT_SIGALG_rsa_pss_pss_sha512 */ },
+ { "gostr34102001", 0xeded /* TLSEXT_SIGALG_gostr34102001_gostr3411 */ },
+ { "gostr34102012_256", 0xeeee /* TLSEXT_SIGALG_gostr34102012_256_gostr34112012_256 */ },
+ { "gostr34102012_512", 0xefef /* TLSEXT_SIGALG_gostr34102012_512_gostr34112012_512 */ },
+ { NULL }
};
/* from rfc5246 7.4.1.4.1. */
static STRINT_PAIR signature_tls12_alg_list[] = {
- {"anonymous", TLSEXT_signature_anonymous /* 0 */},
- {"RSA", TLSEXT_signature_rsa /* 1 */},
- {"DSA", TLSEXT_signature_dsa /* 2 */},
- {"ECDSA", TLSEXT_signature_ecdsa /* 3 */},
- {NULL}
+ { "anonymous", TLSEXT_signature_anonymous /* 0 */ },
+ { "RSA", TLSEXT_signature_rsa /* 1 */ },
+ { "DSA", TLSEXT_signature_dsa /* 2 */ },
+ { "ECDSA", TLSEXT_signature_ecdsa /* 3 */ },
+ { NULL }
};
/* from rfc5246 7.4.1.4.1. */
static STRINT_PAIR signature_tls12_hash_list[] = {
- {"none", TLSEXT_hash_none /* 0 */},
- {"MD5", TLSEXT_hash_md5 /* 1 */},
- {"SHA1", TLSEXT_hash_sha1 /* 2 */},
- {"SHA224", TLSEXT_hash_sha224 /* 3 */},
- {"SHA256", TLSEXT_hash_sha256 /* 4 */},
- {"SHA384", TLSEXT_hash_sha384 /* 5 */},
- {"SHA512", TLSEXT_hash_sha512 /* 6 */},
- {NULL}
+ { "none", TLSEXT_hash_none /* 0 */ },
+ { "MD5", TLSEXT_hash_md5 /* 1 */ },
+ { "SHA1", TLSEXT_hash_sha1 /* 2 */ },
+ { "SHA224", TLSEXT_hash_sha224 /* 3 */ },
+ { "SHA256", TLSEXT_hash_sha256 /* 4 */ },
+ { "SHA384", TLSEXT_hash_sha384 /* 5 */ },
+ { "SHA512", TLSEXT_hash_sha512 /* 6 */ },
+ { NULL }
};
void tlsext_cb(SSL *s, int client_server, int type,
- const unsigned char *data, int len, void *arg)
+ const unsigned char *data, int len, void *arg)
{
BIO *bio = arg;
const char *extname = lookup(type, tlsext_types, "unknown");
BIO_printf(bio, "TLS %s extension \"%s\" (id=%d), len=%d\n",
- client_server ? "server" : "client", extname, type, len);
+ client_server ? "server" : "client", extname, type, len);
BIO_dump(bio, (const char *)data, len);
(void)BIO_flush(bio);
}
#ifndef OPENSSL_NO_SOCK
int generate_stateless_cookie_callback(SSL *ssl, unsigned char *cookie,
- size_t *cookie_len)
+ size_t *cookie_len)
{
unsigned char *buffer = NULL;
size_t length = 0;
@@ -898,10 +891,11 @@ int generate_stateless_cookie_callback(SSL *ssl, unsigned char *cookie,
goto end;
if (EVP_Q_mac(NULL, "HMAC", NULL, "SHA1", NULL,
- cookie_secret, COOKIE_SECRET_LENGTH, buffer, length,
- cookie, DTLS1_COOKIE_LENGTH, cookie_len) == NULL) {
+ cookie_secret, COOKIE_SECRET_LENGTH, buffer, length,
+ cookie, DTLS1_COOKIE_LENGTH, cookie_len)
+ == NULL) {
BIO_printf(bio_err,
- "Error calculating HMAC-SHA1 of buffer with secret\n");
+ "Error calculating HMAC-SHA1 of buffer with secret\n");
goto end;
}
res = 1;
@@ -913,7 +907,7 @@ end:
}
int verify_stateless_cookie_callback(SSL *ssl, const unsigned char *cookie,
- size_t cookie_len)
+ size_t cookie_len)
{
unsigned char result[EVP_MAX_MD_SIZE];
size_t resultlength;
@@ -930,7 +924,7 @@ int verify_stateless_cookie_callback(SSL *ssl, const unsigned char *cookie,
}
int generate_cookie_callback(SSL *ssl, unsigned char *cookie,
- unsigned int *cookie_len)
+ unsigned int *cookie_len)
{
size_t temp = 0;
int res = generate_stateless_cookie_callback(ssl, cookie, &temp);
@@ -941,7 +935,7 @@ int generate_cookie_callback(SSL *ssl, unsigned char *cookie,
}
int verify_cookie_callback(SSL *ssl, const unsigned char *cookie,
- unsigned int cookie_len)
+ unsigned int cookie_len)
{
return verify_stateless_cookie_callback(ssl, cookie, cookie_len);
}
@@ -970,16 +964,16 @@ struct ssl_excert_st {
};
static STRINT_PAIR chain_flags[] = {
- {"Overall Validity", CERT_PKEY_VALID},
- {"Sign with EE key", CERT_PKEY_SIGN},
- {"EE signature", CERT_PKEY_EE_SIGNATURE},
- {"CA signature", CERT_PKEY_CA_SIGNATURE},
- {"EE key parameters", CERT_PKEY_EE_PARAM},
- {"CA key parameters", CERT_PKEY_CA_PARAM},
- {"Explicitly sign with EE key", CERT_PKEY_EXPLICIT_SIGN},
- {"Issuer Name", CERT_PKEY_ISSUER_NAME},
- {"Certificate Type", CERT_PKEY_CERT_TYPE},
- {NULL}
+ { "Overall Validity", CERT_PKEY_VALID },
+ { "Sign with EE key", CERT_PKEY_SIGN },
+ { "EE signature", CERT_PKEY_EE_SIGNATURE },
+ { "CA signature", CERT_PKEY_CA_SIGNATURE },
+ { "EE key parameters", CERT_PKEY_EE_PARAM },
+ { "CA key parameters", CERT_PKEY_CA_PARAM },
+ { "Explicitly sign with EE key", CERT_PKEY_EXPLICIT_SIGN },
+ { "Issuer Name", CERT_PKEY_ISSUER_NAME },
+ { "Certificate Type", CERT_PKEY_CERT_TYPE },
+ { NULL }
};
static void print_chain_flags(SSL *s, int flags)
@@ -988,8 +982,8 @@ static void print_chain_flags(SSL *s, int flags)
for (pp = chain_flags; pp->name; ++pp)
BIO_printf(bio_err, "\t%s: %s\n",
- pp->name,
- (flags & pp->retval) ? "OK" : "NOT OK");
+ pp->name,
+ (flags & pp->retval) ? "OK" : "NOT OK");
BIO_printf(bio_err, "\tSuite B: ");
if (SSL_set_cert_flags(s, 0) & SSL_CERT_FLAG_SUITEB_128_LOS)
BIO_puts(bio_err, flags & CERT_PKEY_SUITEB ? "OK\n" : "NOT OK\n");
@@ -1011,8 +1005,8 @@ static int set_cert_cb(SSL *ssl, void *arg)
if (retry_cnt < 5) {
retry_cnt++;
BIO_printf(bio_err,
- "Certificate callback retry test: count %d\n",
- retry_cnt);
+ "Certificate callback retry test: count %d\n",
+ retry_cnt);
return -1;
}
#endif
@@ -1035,12 +1029,12 @@ static int set_cert_cb(SSL *ssl, void *arg)
rv = SSL_check_chain(ssl, exc->cert, exc->key, exc->chain);
BIO_printf(bio_err, "Checking cert chain %d:\nSubject: ", i);
X509_NAME_print_ex(bio_err, X509_get_subject_name(exc->cert), 0,
- get_nameopt());
+ get_nameopt());
BIO_puts(bio_err, "\n");
print_chain_flags(ssl, rv);
if (rv & CERT_PKEY_VALID) {
if (!SSL_use_certificate(ssl, exc->cert)
- || !SSL_use_PrivateKey(ssl, exc->key)) {
+ || !SSL_use_PrivateKey(ssl, exc->key)) {
return 0;
}
/*
@@ -1084,7 +1078,6 @@ static int ssl_excert_prepend(SSL_EXCERT **pexc)
exc->keyform = FORMAT_PEM;
}
return 1;
-
}
void ssl_excert_free(SSL_EXCERT *exc)
@@ -1121,15 +1114,15 @@ int load_excert(SSL_EXCERT **pexc)
return 0;
}
exc->cert = load_cert(exc->certfile, exc->certform,
- "Server Certificate");
+ "Server Certificate");
if (exc->cert == NULL)
return 0;
if (exc->keyfile != NULL) {
exc->key = load_key(exc->keyfile, exc->keyform,
- 0, NULL, "server key");
+ 0, NULL, "server key");
} else {
exc->key = load_key(exc->certfile, exc->certform,
- 0, NULL, "server key");
+ 0, NULL, "server key");
}
if (exc->key == NULL)
return 0;
@@ -1153,7 +1146,7 @@ int args_excert(int opt, SSL_EXCERT **pexc)
if (exc == NULL) {
if (!ssl_excert_prepend(&exc)) {
BIO_printf(bio_err, " %s: Error initialising xcert\n",
- opt_getprog());
+ opt_getprog());
goto err;
}
*pexc = exc;
@@ -1181,7 +1174,7 @@ int args_excert(int opt, SSL_EXCERT **pexc)
case OPT_X_CHAIN:
if (exc->chainfile != NULL) {
BIO_printf(bio_err, "%s: Chain already specified\n",
- opt_getprog());
+ opt_getprog());
goto err;
}
exc->chainfile = opt_arg();
@@ -1200,7 +1193,7 @@ int args_excert(int opt, SSL_EXCERT **pexc)
}
return 1;
- err:
+err:
ERR_print_errors(bio_err);
ssl_excert_free(exc);
*pexc = NULL;
@@ -1246,11 +1239,11 @@ static char *hexencode(const unsigned char *data, size_t len)
char *out;
char *cp;
size_t outlen = 2 * len + 1;
- int ilen = (int) outlen;
+ int ilen = (int)outlen;
if (outlen < len || ilen < 0 || outlen != (size_t)ilen) {
BIO_printf(bio_err, "%s: %zu-byte buffer too large to hexencode\n",
- opt_getprog(), len);
+ opt_getprog(), len);
exit(1);
}
cp = out = app_malloc(ilen, "TLSA hex data buffer");
@@ -1302,12 +1295,13 @@ void print_verify_detail(SSL *s, BIO *bio)
else
hexdata = hexencode(data, dlen);
BIO_printf(bio, "DANE TLSA %d %d %d %s%s ",
- usage, selector, mtype,
- (dlen > TLSA_TAIL_SIZE) ? "..." : "", hexdata);
+ usage, selector, mtype,
+ (dlen > TLSA_TAIL_SIZE) ? "..." : "", hexdata);
if (SSL_get0_peer_rpk(s) == NULL)
BIO_printf(bio, "%s certificate at depth %d\n",
- (mspki != NULL) ? "signed the peer" :
- mdpth ? "matched the TA" : "matched the EE", mdpth);
+ (mspki != NULL) ? "signed the peer" : mdpth ? "matched the TA"
+ : "matched the EE",
+ mdpth);
else
BIO_printf(bio, "matched the peer raw public key\n");
OPENSSL_free(hexdata);
@@ -1330,7 +1324,7 @@ void print_ssl_summary(SSL *s)
if (peer != NULL) {
BIO_puts(bio_err, "Peer certificate: ");
X509_NAME_print_ex(bio_err, X509_get_subject_name(peer),
- 0, get_nameopt());
+ 0, get_nameopt());
BIO_puts(bio_err, "\n");
if (SSL_get_peer_signature_nid(s, &nid))
BIO_printf(bio_err, "Hash used: %s\n", OBJ_nid2sn(nid));
@@ -1354,7 +1348,7 @@ void print_ssl_summary(SSL *s)
}
int config_ctx(SSL_CONF_CTX *cctx, STACK_OF(OPENSSL_STRING) *str,
- SSL_CTX *ctx)
+ SSL_CTX *ctx)
{
int i;
@@ -1365,7 +1359,7 @@ int config_ctx(SSL_CONF_CTX *cctx, STACK_OF(OPENSSL_STRING) *str,
if (SSL_CONF_cmd(cctx, flag, arg) <= 0) {
BIO_printf(bio_err, "Call to SSL_CONF_cmd(%s, %s) failed\n",
- flag, arg == NULL ? "<NULL>" : arg);
+ flag, arg == NULL ? "<NULL>" : arg);
ERR_print_errors(bio_err);
return 0;
}
@@ -1403,11 +1397,11 @@ int ssl_ctx_add_crls(SSL_CTX *ctx, STACK_OF(X509_CRL) *crls, int crl_download)
}
int ssl_load_stores(SSL_CTX *ctx,
- const char *vfyCApath, const char *vfyCAfile,
- const char *vfyCAstore,
- const char *chCApath, const char *chCAfile,
- const char *chCAstore,
- STACK_OF(X509_CRL) *crls, int crl_download)
+ const char *vfyCApath, const char *vfyCAfile,
+ const char *vfyCAstore,
+ const char *chCApath, const char *chCAfile,
+ const char *chCAstore,
+ STACK_OF(X509_CRL) *crls, int crl_download)
{
X509_STORE *vfy = NULL, *ch = NULL;
int rv = 0;
@@ -1442,7 +1436,7 @@ int ssl_load_stores(SSL_CTX *ctx,
goto err;
}
rv = 1;
- err:
+err:
X509_STORE_free(vfy);
X509_STORE_free(ch);
return rv;
@@ -1453,38 +1447,38 @@ int ssl_load_stores(SSL_CTX *ctx,
typedef struct {
BIO *out;
int verbose;
- int (*old_cb) (const SSL *s, const SSL_CTX *ctx, int op, int bits, int nid,
- void *other, void *ex);
+ int (*old_cb)(const SSL *s, const SSL_CTX *ctx, int op, int bits, int nid,
+ void *other, void *ex);
} security_debug_ex;
static STRINT_PAIR callback_types[] = {
- {"Supported Ciphersuite", SSL_SECOP_CIPHER_SUPPORTED},
- {"Shared Ciphersuite", SSL_SECOP_CIPHER_SHARED},
- {"Check Ciphersuite", SSL_SECOP_CIPHER_CHECK},
+ { "Supported Ciphersuite", SSL_SECOP_CIPHER_SUPPORTED },
+ { "Shared Ciphersuite", SSL_SECOP_CIPHER_SHARED },
+ { "Check Ciphersuite", SSL_SECOP_CIPHER_CHECK },
#ifndef OPENSSL_NO_DH
- {"Temp DH key bits", SSL_SECOP_TMP_DH},
+ { "Temp DH key bits", SSL_SECOP_TMP_DH },
#endif
- {"Supported Curve", SSL_SECOP_CURVE_SUPPORTED},
- {"Shared Curve", SSL_SECOP_CURVE_SHARED},
- {"Check Curve", SSL_SECOP_CURVE_CHECK},
- {"Supported Signature Algorithm", SSL_SECOP_SIGALG_SUPPORTED},
- {"Shared Signature Algorithm", SSL_SECOP_SIGALG_SHARED},
- {"Check Signature Algorithm", SSL_SECOP_SIGALG_CHECK},
- {"Signature Algorithm mask", SSL_SECOP_SIGALG_MASK},
- {"Certificate chain EE key", SSL_SECOP_EE_KEY},
- {"Certificate chain CA key", SSL_SECOP_CA_KEY},
- {"Peer Chain EE key", SSL_SECOP_PEER_EE_KEY},
- {"Peer Chain CA key", SSL_SECOP_PEER_CA_KEY},
- {"Certificate chain CA digest", SSL_SECOP_CA_MD},
- {"Peer chain CA digest", SSL_SECOP_PEER_CA_MD},
- {"SSL compression", SSL_SECOP_COMPRESSION},
- {"Session ticket", SSL_SECOP_TICKET},
- {NULL}
+ { "Supported Curve", SSL_SECOP_CURVE_SUPPORTED },
+ { "Shared Curve", SSL_SECOP_CURVE_SHARED },
+ { "Check Curve", SSL_SECOP_CURVE_CHECK },
+ { "Supported Signature Algorithm", SSL_SECOP_SIGALG_SUPPORTED },
+ { "Shared Signature Algorithm", SSL_SECOP_SIGALG_SHARED },
+ { "Check Signature Algorithm", SSL_SECOP_SIGALG_CHECK },
+ { "Signature Algorithm mask", SSL_SECOP_SIGALG_MASK },
+ { "Certificate chain EE key", SSL_SECOP_EE_KEY },
+ { "Certificate chain CA key", SSL_SECOP_CA_KEY },
+ { "Peer Chain EE key", SSL_SECOP_PEER_EE_KEY },
+ { "Peer Chain CA key", SSL_SECOP_PEER_CA_KEY },
+ { "Certificate chain CA digest", SSL_SECOP_CA_MD },
+ { "Peer chain CA digest", SSL_SECOP_PEER_CA_MD },
+ { "SSL compression", SSL_SECOP_COMPRESSION },
+ { "Session ticket", SSL_SECOP_TICKET },
+ { NULL }
};
static int security_callback_debug(const SSL *s, const SSL_CTX *ctx,
- int op, int bits, int nid,
- void *other, void *ex)
+ int op, int bits, int nid,
+ void *other, void *ex)
{
security_debug_ex *sdb = ex;
int rv, show_bits = 1, cert_md = 0;
@@ -1530,63 +1524,58 @@ static int security_callback_debug(const SSL *s, const SSL_CTX *ctx,
break;
#ifndef OPENSSL_NO_EC
- case SSL_SECOP_OTHER_CURVE:
- {
- const char *cname;
- cname = EC_curve_nid2nist(nid);
- if (cname == NULL)
- cname = OBJ_nid2sn(nid);
- BIO_puts(sdb->out, cname);
- }
- break;
+ case SSL_SECOP_OTHER_CURVE: {
+ const char *cname;
+ cname = EC_curve_nid2nist(nid);
+ if (cname == NULL)
+ cname = OBJ_nid2sn(nid);
+ BIO_puts(sdb->out, cname);
+ } break;
#endif
- case SSL_SECOP_OTHER_CERT:
- {
- if (cert_md) {
- int sig_nid = X509_get_signature_nid(other);
+ case SSL_SECOP_OTHER_CERT: {
+ if (cert_md) {
+ int sig_nid = X509_get_signature_nid(other);
- BIO_puts(sdb->out, OBJ_nid2sn(sig_nid));
- } else {
- EVP_PKEY *pkey = X509_get0_pubkey(other);
-
- if (pkey == NULL) {
- BIO_printf(sdb->out, "Public key missing");
- } else {
- BIO_printf(sdb->out, "%s, bits=%d",
- EVP_PKEY_get0_type_name(pkey),
- EVP_PKEY_get_bits(pkey));
- }
- }
- break;
- }
- case SSL_SECOP_OTHER_SIGALG:
- {
- const unsigned char *salg = other;
- const char *sname = NULL;
- int raw_sig_code = (salg[0] << 8) + salg[1]; /* always big endian (msb, lsb) */
- /* raw_sig_code: signature_scheme from tls1.3, or signature_and_hash from tls1.2 */
-
- if (nm != NULL)
- BIO_printf(sdb->out, "%s", nm);
- else
- BIO_printf(sdb->out, "s_cb.c:security_callback_debug op=0x%x", op);
+ BIO_puts(sdb->out, OBJ_nid2sn(sig_nid));
+ } else {
+ EVP_PKEY *pkey = X509_get0_pubkey(other);
- sname = lookup(raw_sig_code, signature_tls13_scheme_list, NULL);
- if (sname != NULL) {
- BIO_printf(sdb->out, " scheme=%s", sname);
+ if (pkey == NULL) {
+ BIO_printf(sdb->out, "Public key missing");
} else {
- int alg_code = salg[1];
- int hash_code = salg[0];
- const char *alg_str = lookup(alg_code, signature_tls12_alg_list, NULL);
- const char *hash_str = lookup(hash_code, signature_tls12_hash_list, NULL);
-
- if (alg_str != NULL && hash_str != NULL)
- BIO_printf(sdb->out, " digest=%s, algorithm=%s", hash_str, alg_str);
- else
- BIO_printf(sdb->out, " scheme=unknown(0x%04x)", raw_sig_code);
+ BIO_printf(sdb->out, "%s, bits=%d",
+ EVP_PKEY_get0_type_name(pkey),
+ EVP_PKEY_get_bits(pkey));
}
}
+ break;
+ }
+ case SSL_SECOP_OTHER_SIGALG: {
+ const unsigned char *salg = other;
+ const char *sname = NULL;
+ int raw_sig_code = (salg[0] << 8) + salg[1]; /* always big endian (msb, lsb) */
+ /* raw_sig_code: signature_scheme from tls1.3, or signature_and_hash from tls1.2 */
+
+ if (nm != NULL)
+ BIO_printf(sdb->out, "%s", nm);
+ else
+ BIO_printf(sdb->out, "s_cb.c:security_callback_debug op=0x%x", op);
+ sname = lookup(raw_sig_code, signature_tls13_scheme_list, NULL);
+ if (sname != NULL) {
+ BIO_printf(sdb->out, " scheme=%s", sname);
+ } else {
+ int alg_code = salg[1];
+ int hash_code = salg[0];
+ const char *alg_str = lookup(alg_code, signature_tls12_alg_list, NULL);
+ const char *hash_str = lookup(hash_code, signature_tls12_hash_list, NULL);
+
+ if (alg_str != NULL && hash_str != NULL)
+ BIO_printf(sdb->out, " digest=%s, algorithm=%s", hash_str, alg_str);
+ else
+ BIO_printf(sdb->out, " scheme=unknown(0x%04x)", raw_sig_code);
+ }
+ }
}
if (show_bits)
@@ -1646,7 +1635,7 @@ int set_keylog_file(SSL_CTX *ctx, const char *keylog_file)
/* Write a header for seekable, empty files (this excludes pipes). */
if (BIO_tell(bio_keylog) == 0) {
BIO_puts(bio_keylog,
- "# SSL/TLS secrets log file, generated by OpenSSL\n");
+ "# SSL/TLS secrets log file, generated by OpenSSL\n");
(void)BIO_flush(bio_keylog);
}
SSL_CTX_set_keylog_callback(ctx, keylog_callback);
@@ -1676,7 +1665,7 @@ void ssl_print_secure_renegotiation_notes(BIO *bio, SSL *s)
{
if (SSL_VERSION_ALLOWS_RENEGOTIATION(s)) {
BIO_printf(bio, "Secure Renegotiation IS%s supported\n",
- SSL_get_secure_renegotiation_support(s) ? "" : " NOT");
+ SSL_get_secure_renegotiation_support(s) ? "" : " NOT");
} else {
BIO_printf(bio, "This TLS version forbids renegotiation.\n");
}
diff --git a/apps/lib/s_socket.c b/apps/lib/s_socket.c
index 06b183bc23..976728a423 100644
--- a/apps/lib/s_socket.c
+++ b/apps/lib/s_socket.c
@@ -22,28 +22,28 @@
* needed to have fileno() declared correctly... So let's define u_int
*/
#if defined(OPENSSL_SYS_VMS_DECC) && !defined(__U_INT)
-# define __U_INT
+#define __U_INT
typedef unsigned int u_int;
#endif
#ifdef _WIN32
-# include <process.h>
+#include <process.h>
/* MSVC renamed some POSIX functions to have an underscore prefix. */
-# ifdef _MSC_VER
-# define getpid _getpid
-# endif
+#ifdef _MSC_VER
+#define getpid _getpid
+#endif
#endif
#ifndef OPENSSL_NO_SOCK
-# include "internal/e_os.h"
-# include "apps.h"
-# include "s_apps.h"
-# include "internal/sockets.h" /* for openssl_fdset() */
+#include "internal/e_os.h"
+#include "apps.h"
+#include "s_apps.h"
+#include "internal/sockets.h" /* for openssl_fdset() */
-# include <openssl/bio.h>
-# include <openssl/err.h>
+#include <openssl/bio.h>
+#include <openssl/err.h>
/* Keep track of our peer's address for the cookie callback */
BIO_ADDR *ourpeer = NULL;
@@ -73,9 +73,9 @@ BIO_ADDR *ourpeer = NULL;
* Returns 1 on success, 0 on failure.
*/
int init_client(int *sock, const char *host, const char *port,
- const char *bindhost, const char *bindport,
- int family, int type, int protocol, int tfo, int doconn,
- BIO_ADDR **ba_ret)
+ const char *bindhost, const char *bindport,
+ int family, int type, int protocol, int tfo, int doconn,
+ BIO_ADDR **ba_ret)
{
BIO_ADDRINFO *res = NULL;
BIO_ADDRINFO *bindaddr = NULL;
@@ -89,7 +89,7 @@ int init_client(int *sock, const char *host, const char *port,
return 0;
ret = BIO_lookup_ex(host, port, BIO_LOOKUP_CLIENT, family, type, protocol,
- &res);
+ &res);
if (ret == 0) {
ERR_print_errors(bio_err);
return 0;
@@ -97,9 +97,9 @@ int init_client(int *sock, const char *host, const char *port,
if (bindhost != NULL || bindport != NULL) {
ret = BIO_lookup_ex(bindhost, bindport, BIO_LOOKUP_CLIENT,
- family, type, protocol, &bindaddr);
+ family, type, protocol, &bindaddr);
if (ret == 0) {
- ERR_print_errors (bio_err);
+ ERR_print_errors(bio_err);
goto out;
}
}
@@ -110,10 +110,10 @@ int init_client(int *sock, const char *host, const char *port,
* anything in the BIO_ADDRINFO chain that we haven't
* asked for. */
OPENSSL_assert((family == AF_UNSPEC
- || family == BIO_ADDRINFO_family(ai))
- && (type == 0 || type == BIO_ADDRINFO_socktype(ai))
- && (protocol == 0
- || protocol == BIO_ADDRINFO_protocol(ai)));
+ || family == BIO_ADDRINFO_family(ai))
+ && (type == 0 || type == BIO_ADDRINFO_socktype(ai))
+ && (protocol == 0
+ || protocol == BIO_ADDRINFO_protocol(ai)));
if (bindaddr != NULL) {
for (bi = bindaddr; bi != NULL; bi = BIO_ADDRINFO_next(bi)) {
@@ -126,7 +126,7 @@ int init_client(int *sock, const char *host, const char *port,
}
*sock = BIO_socket(BIO_ADDRINFO_family(ai), BIO_ADDRINFO_socktype(ai),
- BIO_ADDRINFO_protocol(ai), 0);
+ BIO_ADDRINFO_protocol(ai), 0);
if (*sock == INVALID_SOCKET) {
/* Maybe the kernel doesn't support the socket family, even if
* BIO_lookup() added it in the returned result...
@@ -136,7 +136,7 @@ int init_client(int *sock, const char *host, const char *port,
if (bi != NULL) {
if (!BIO_bind(*sock, BIO_ADDRINFO_address(bi),
- BIO_SOCK_REUSEADDR)) {
+ BIO_SOCK_REUSEADDR)) {
BIO_closesocket(*sock);
*sock = INVALID_SOCKET;
continue;
@@ -193,13 +193,14 @@ int init_client(int *sock, const char *host, const char *port,
if (bindaddr != NULL && !found) {
BIO_printf(bio_err, "Can't bind %saddress for %s%s%s\n",
#ifdef AF_INET6
- BIO_ADDRINFO_family(res) == AF_INET6 ? "IPv6 " :
+ BIO_ADDRINFO_family(res) == AF_INET6 ? "IPv6 " :
#endif
- BIO_ADDRINFO_family(res) == AF_INET ? "IPv4 " :
- BIO_ADDRINFO_family(res) == AF_UNIX ? "unix " : "",
- bindhost != NULL ? bindhost : "",
- bindport != NULL ? ":" : "",
- bindport != NULL ? bindport : "");
+ BIO_ADDRINFO_family(res) == AF_INET ? "IPv4 "
+ : BIO_ADDRINFO_family(res) == AF_UNIX ? "unix "
+ : "",
+ bindhost != NULL ? bindhost : "",
+ bindport != NULL ? ":" : "",
+ bindport != NULL ? bindport : "");
ERR_clear_error();
ret = 0;
}
@@ -218,7 +219,7 @@ int init_client(int *sock, const char *host, const char *port,
}
out:
if (bindaddr != NULL) {
- BIO_ADDRINFO_free (bindaddr);
+ BIO_ADDRINFO_free(bindaddr);
}
BIO_ADDRINFO_free(res);
return ret;
@@ -234,7 +235,7 @@ void get_sock_info_address(int asock, char **hostname, char **service)
*service = NULL;
if ((info.addr = BIO_ADDR_new()) != NULL
- && BIO_sock_info(asock, BIO_SOCK_INFO_ADDRESS, &info)) {
+ && BIO_sock_info(asock, BIO_SOCK_INFO_ADDRESS, &info)) {
if (hostname != NULL)
*hostname = BIO_ADDR_hostname_string(info.addr, 1);
if (service != NULL)
@@ -256,10 +257,11 @@ int report_server_accept(BIO *out, int asock, int with_address, int with_pid)
success = hostname != NULL && service != NULL;
if (success)
success = BIO_printf(out,
- strchr(hostname, ':') == NULL
- ? /* IPv4 */ " %s:%s"
- : /* IPv6 */ " [%s]:%s",
- hostname, service) > 0;
+ strchr(hostname, ':') == NULL
+ ? /* IPv4 */ " %s:%s"
+ : /* IPv6 */ " [%s]:%s",
+ hostname, service)
+ > 0;
else
(void)BIO_printf(out, "unknown:error\n");
OPENSSL_free(hostname);
@@ -294,9 +296,9 @@ int report_server_accept(BIO *out, int asock, int with_address, int with_pid)
* 0 on failure, something other on success.
*/
int do_server(int *accept_sock, const char *host, const char *port,
- int family, int type, int protocol, do_server_cb cb,
- unsigned char *context, int naccept, BIO *bio_s_out,
- int tfo)
+ int family, int type, int protocol, do_server_cb cb,
+ unsigned char *context, int naccept, BIO *bio_s_out,
+ int tfo)
{
int asock = 0;
int sock;
@@ -314,7 +316,7 @@ int do_server(int *accept_sock, const char *host, const char *port,
return 0;
if (!BIO_lookup_ex(host, port, BIO_LOOKUP_SERVER, family, type, protocol,
- &res)) {
+ &res)) {
ERR_print_errors(bio_err);
return 0;
}
@@ -322,8 +324,8 @@ int do_server(int *accept_sock, const char *host, const char *port,
/* Admittedly, these checks are quite paranoid, we should not get
* anything in the BIO_ADDRINFO chain that we haven't asked for */
OPENSSL_assert((family == AF_UNSPEC || family == BIO_ADDRINFO_family(res))
- && (type == 0 || type == BIO_ADDRINFO_socktype(res))
- && (protocol == 0 || protocol == BIO_ADDRINFO_protocol(res)));
+ && (type == 0 || type == BIO_ADDRINFO_socktype(res))
+ && (protocol == 0 || protocol == BIO_ADDRINFO_protocol(res)));
sock_family = BIO_ADDRINFO_family(res);
sock_type = BIO_ADDRINFO_socktype(res);
@@ -336,10 +338,10 @@ int do_server(int *accept_sock, const char *host, const char *port,
if (sock_family == AF_INET6)
sock_options |= BIO_SOCK_V6_ONLY;
if (next != NULL
- && BIO_ADDRINFO_socktype(next) == sock_type
- && BIO_ADDRINFO_protocol(next) == sock_protocol) {
+ && BIO_ADDRINFO_socktype(next) == sock_type
+ && BIO_ADDRINFO_protocol(next) == sock_protocol) {
if (sock_family == AF_INET
- && BIO_ADDRINFO_family(next) == AF_INET6) {
+ && BIO_ADDRINFO_family(next) == AF_INET6) {
/* In case AF_INET6 is returned but not supported by the
* kernel, retry with the first detected address family */
sock_family_fallback = sock_family;
@@ -347,7 +349,7 @@ int do_server(int *accept_sock, const char *host, const char *port,
sock_family = AF_INET6;
sock_address = BIO_ADDRINFO_address(next);
} else if (sock_family == AF_INET6
- && BIO_ADDRINFO_family(next) == AF_INET) {
+ && BIO_ADDRINFO_family(next) == AF_INET) {
sock_options &= ~BIO_SOCK_V6_ONLY;
}
}
@@ -445,12 +447,12 @@ int do_server(int *accept_sock, const char *host, const char *port,
* alerts are passed on...]
*/
timeout.tv_sec = 0;
- timeout.tv_usec = 500000; /* some extreme round-trip */
+ timeout.tv_usec = 500000; /* some extreme round-trip */
do {
FD_ZERO(&readfds);
openssl_fdset(sock, &readfds);
} while (select(sock + 1, &readfds, NULL, NULL, &timeout) > 0
- && readsocket(sock, sink, sizeof(sink)) > 0);
+ && readsocket(sock, sink, sizeof(sink)) > 0);
BIO_closesocket(sock);
} else {
@@ -467,11 +469,11 @@ int do_server(int *accept_sock, const char *host, const char *port,
break;
}
}
- end:
-# ifdef AF_UNIX
+end:
+#ifdef AF_UNIX
if (family == AF_UNIX)
unlink(host);
-# endif
+#endif
BIO_ADDR_free(ourpeer);
ourpeer = NULL;
return ret;
@@ -498,4 +500,4 @@ void do_ssl_shutdown(SSL *ssl)
} while (ret < 0);
}
-#endif /* OPENSSL_NO_SOCK */
+#endif /* OPENSSL_NO_SOCK */
diff --git a/apps/lib/tlssrp_depr.c b/apps/lib/tlssrp_depr.c
index 413f1f3538..058f47b90f 100644
--- a/apps/lib/tlssrp_depr.c
+++ b/apps/lib/tlssrp_depr.c
@@ -29,16 +29,11 @@ static int srp_Verify_N_and_g(const BIGNUM *N, const BIGNUM *g)
BN_CTX *bn_ctx = BN_CTX_new();
BIGNUM *p = BN_new();
BIGNUM *r = BN_new();
- int ret =
- g != NULL && N != NULL && bn_ctx != NULL && BN_is_odd(N) &&
- BN_check_prime(N, bn_ctx, NULL) == 1 &&
- p != NULL && BN_rshift1(p, N) &&
+ int ret = g != NULL && N != NULL && bn_ctx != NULL && BN_is_odd(N) && BN_check_prime(N, bn_ctx, NULL) == 1 && p != NULL && BN_rshift1(p, N) &&
/* p = (N-1)/2 */
- BN_check_prime(p, bn_ctx, NULL) == 1 &&
- r != NULL &&
+ BN_check_prime(p, bn_ctx, NULL) == 1 && r != NULL &&
/* verify g^((N-1)/2) == -1 (mod N) */
- BN_mod_exp(r, g, p, N, bn_ctx) &&
- BN_add_word(r, 1) && BN_cmp(r, N) == 0;
+ BN_mod_exp(r, g, p, N, bn_ctx) && BN_add_word(r, 1) && BN_cmp(r, N) == 0;
BN_free(r);
BN_free(p);
@@ -84,7 +79,7 @@ static int ssl_srp_verify_param_cb(SSL *s, void *arg)
if (srp_arg->amp == 1) {
if (srp_arg->debug)
BIO_printf(bio_err,
- "SRP param N and g are not known params, going to check deeper.\n");
+ "SRP param N and g are not known params, going to check deeper.\n");
/*
* The srp_moregroups is a real debugging feature. Implementers
@@ -120,7 +115,7 @@ static char *ssl_give_srp_client_pwd_cb(SSL *s, void *arg)
}
int set_up_srp_arg(SSL_CTX *ctx, SRP_ARG *srp_arg, int srp_lateuser, int c_msg,
- int c_debug)
+ int c_debug)
{
if (!srp_lateuser && !SSL_CTX_set_srp_username(ctx, srp_arg->srplogin)) {
BIO_printf(bio_err, "Unable to set SRP username\n");
@@ -144,7 +139,7 @@ static char *dummy_srp(SSL *ssl, void *arg)
void set_up_dummy_srp(SSL_CTX *ctx)
{
- SSL_CTX_set_srp_client_pwd_callback(ctx, dummy_srp);
+ SSL_CTX_set_srp_client_pwd_callback(ctx, dummy_srp);
}
/*
@@ -157,7 +152,7 @@ void set_up_dummy_srp(SSL_CTX *ctx)
*/
static int ssl_srp_server_param_cb(SSL *s, int *ad, void *arg)
{
- srpsrvparm *p = (srpsrvparm *) arg;
+ srpsrvparm *p = (srpsrvparm *)arg;
int ret = SSL3_AL_FATAL;
if (p->login == NULL && p->user == NULL) {
@@ -171,18 +166,18 @@ static int ssl_srp_server_param_cb(SSL *s, int *ad, void *arg)
goto err;
}
- if (SSL_set_srp_server_param
- (s, p->user->N, p->user->g, p->user->s, p->user->v,
- p->user->info) < 0) {
+ if (SSL_set_srp_server_param(s, p->user->N, p->user->g, p->user->s, p->user->v,
+ p->user->info)
+ < 0) {
*ad = SSL_AD_INTERNAL_ERROR;
goto err;
}
BIO_printf(bio_err,
- "SRP parameters set: username = \"%s\" info=\"%s\"\n",
- p->login, p->user->info);
+ "SRP parameters set: username = \"%s\" info=\"%s\"\n",
+ p->login, p->user->info);
ret = SSL_ERROR_NONE;
- err:
+err:
SRP_user_pwd_free(p->user);
p->user = NULL;
p->login = NULL;
@@ -190,7 +185,7 @@ static int ssl_srp_server_param_cb(SSL *s, int *ad, void *arg)
}
int set_up_srp_verifier_file(SSL_CTX *ctx, srpsrvparm *srp_callback_parm,
- char *srpuserseed, char *srp_verifier_file)
+ char *srpuserseed, char *srp_verifier_file)
{
int ret;
@@ -202,12 +197,12 @@ int set_up_srp_verifier_file(SSL_CTX *ctx, srpsrvparm *srp_callback_parm,
BIO_printf(bio_err, "Failed to initialize SRP verifier file\n");
return 0;
}
- if ((ret =
- SRP_VBASE_init(srp_callback_parm->vb,
- srp_verifier_file)) != SRP_NO_ERROR) {
+ if ((ret = SRP_VBASE_init(srp_callback_parm->vb,
+ srp_verifier_file))
+ != SRP_NO_ERROR) {
BIO_printf(bio_err,
- "Cannot initialize SRP verifier file \"%s\":ret=%d\n",
- srp_verifier_file, ret);
+ "Cannot initialize SRP verifier file \"%s\":ret=%d\n",
+ srp_verifier_file, ret);
return 0;
}
SSL_CTX_set_verify(ctx, SSL_VERIFY_NONE, verify_callback);
@@ -221,11 +216,11 @@ void lookup_srp_user(srpsrvparm *srp_callback_parm, BIO *bio_s_out)
{
SRP_user_pwd_free(srp_callback_parm->user);
srp_callback_parm->user = SRP_VBASE_get1_by_user(srp_callback_parm->vb,
- srp_callback_parm->login);
+ srp_callback_parm->login);
if (srp_callback_parm->user != NULL)
BIO_printf(bio_s_out, "LOOKUP done %s\n",
- srp_callback_parm->user->info);
+ srp_callback_parm->user->info);
else
BIO_printf(bio_s_out, "LOOKUP not successful\n");
}
diff --git a/apps/lib/vms_decc_argv.c b/apps/lib/vms_decc_argv.c
index f7b21e975f..a3963a0c76 100644
--- a/apps/lib/vms_decc_argv.c
+++ b/apps/lib/vms_decc_argv.c
@@ -9,7 +9,7 @@
#include <stdlib.h>
#include <openssl/crypto.h>
-#include "platform.h" /* for copy_argv() */
+#include "platform.h" /* for copy_argv() */
char **newargv = NULL;
diff --git a/apps/lib/vms_term_sock.c b/apps/lib/vms_term_sock.c
index 36a851a7e5..faceb05d01 100644
--- a/apps/lib/vms_term_sock.c
+++ b/apps/lib/vms_term_sock.c
@@ -9,107 +9,122 @@
*/
#ifdef __VMS
-# define OPENSSL_SYS_VMS
-# pragma message disable DOLLARID
+#define OPENSSL_SYS_VMS
+#pragma message disable DOLLARID
+#include <openssl/opensslconf.h>
-# include <openssl/opensslconf.h>
-
-# if !defined(_POSIX_C_SOURCE) && defined(OPENSSL_SYS_VMS)
+#if !defined(_POSIX_C_SOURCE) && defined(OPENSSL_SYS_VMS)
/*
* On VMS, you need to define this to get the declaration of fileno(). The
* value 2 is to make sure no function defined in POSIX-2 is left undefined.
*/
-# define _POSIX_C_SOURCE 2
-# endif
-
-# include <stdio.h>
-
-# undef _POSIX_C_SOURCE
-
-# include <sys/types.h>
-# include <sys/socket.h>
-# include <netinet/in.h>
-# include <inet.h>
-# include <unistd.h>
-# include <string.h>
-# include <errno.h>
-# include <starlet.h>
-# include <iodef.h>
-# ifdef __alpha
-# include <iosbdef.h>
-# else
-typedef struct _iosb { /* Copied from IOSBDEF.H for Alpha */
-# pragma __nomember_alignment
- __union {
- __struct {
+#define _POSIX_C_SOURCE 2
+#endif
+
+#include <stdio.h>
+
+#undef _POSIX_C_SOURCE
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <inet.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+#include <starlet.h>
+#include <iodef.h>
+#ifdef __alpha
+#include <iosbdef.h>
+#else
+typedef struct _iosb { /* Copied from IOSBDEF.H for Alpha */
+#pragma __nomember_alignment
+ __union
+ {
+ __struct
+ {
unsigned short int iosb$w_status; /* Final I/O status */
- __union {
- __struct { /* 16-bit byte count variant */
+ __union
+ {
+ __struct
+ { /* 16-bit byte count variant */
unsigned short int iosb$w_bcnt; /* 16-bit byte count */
- __union {
+ __union
+ {
unsigned int iosb$l_dev_depend; /* 32-bit device dependent info */
unsigned int iosb$l_pid; /* 32-bit pid */
- } iosb$r_l;
- } iosb$r_bcnt_16;
- __struct { /* 32-bit byte count variant */
+ }
+ iosb$r_l;
+ }
+ iosb$r_bcnt_16;
+ __struct
+ { /* 32-bit byte count variant */
unsigned int iosb$l_bcnt; /* 32-bit byte count (unaligned) */
unsigned short int iosb$w_dev_depend_high; /* 16-bit device dependent info */
- } iosb$r_bcnt_32;
- } iosb$r_devdepend;
- } iosb$r_io_64;
- __struct {
- __union {
+ }
+ iosb$r_bcnt_32;
+ }
+ iosb$r_devdepend;
+ }
+ iosb$r_io_64;
+ __struct
+ {
+ __union
+ {
unsigned int iosb$l_getxxi_status; /* Final GETxxI status */
unsigned int iosb$l_reg_status; /* Final $Registry status */
- } iosb$r_l_status;
+ }
+ iosb$r_l_status;
unsigned int iosb$l_reserved; /* Reserved field */
- } iosb$r_get_64;
- } iosb$r_io_get;
+ }
+ iosb$r_get_64;
+ }
+ iosb$r_io_get;
} IOSB;
-# if !defined(__VAXC)
-# define iosb$w_status iosb$r_io_get.iosb$r_io_64.iosb$w_status
-# define iosb$w_bcnt iosb$r_io_get.iosb$r_io_64.iosb$r_devdepend.iosb$r_bcnt_16.iosb$w_bcnt
-# define iosb$r_l iosb$r_io_get.iosb$r_io_64.iosb$r_devdepend.iosb$r_bcnt_16.iosb$r_l
-# define iosb$l_dev_depend iosb$r_l.iosb$l_dev_depend
-# define iosb$l_pid iosb$r_l.iosb$l_pid
-# define iosb$l_bcnt iosb$r_io_get.iosb$r_io_64.iosb$r_devdepend.iosb$r_bcnt_32.iosb$l_bcnt
-# define iosb$w_dev_depend_high iosb$r_io_get.iosb$r_io_64.iosb$r_devdepend.iosb$r_bcnt_32.iosb$w_dev_depend_high
-# define iosb$l_getxxi_status iosb$r_io_get.iosb$r_get_64.iosb$r_l_status.iosb$l_getxxi_status
-# define iosb$l_reg_status iosb$r_io_get.iosb$r_get_64.iosb$r_l_status.iosb$l_reg_status
-# endif /* #if !defined(__VAXC) */
-
-# endif /* End of IOSBDEF */
-
-# include <efndef.h>
-# include <stdlib.h>
-# include <ssdef.h>
-# include <time.h>
-# include <stdarg.h>
-# include <descrip.h>
-
-# include "vms_term_sock.h"
-
-# ifdef __alpha
+#if !defined(__VAXC)
+#define iosb$w_status iosb$r_io_get.iosb$r_io_64.iosb$w_status
+#define iosb$w_bcnt iosb$r_io_get.iosb$r_io_64.iosb$r_devdepend.iosb$r_bcnt_16.iosb$w_bcnt
+#define iosb$r_l iosb$r_io_get.iosb$r_io_64.iosb$r_devdepend.iosb$r_bcnt_16.iosb$r_l
+#define iosb$l_dev_depend iosb$r_l.iosb$l_dev_depend
+#define iosb$l_pid iosb$r_l.iosb$l_pid
+#define iosb$l_bcnt iosb$r_io_get.iosb$r_io_64.iosb$r_devdepend.iosb$r_bcnt_32.iosb$l_bcnt
+#define iosb$w_dev_depend_high iosb$r_io_get.iosb$r_io_64.iosb$r_devdepend.iosb$r_bcnt_32.iosb$w_dev_depend_high
+#define iosb$l_getxxi_status iosb$r_io_get.iosb$r_get_64.iosb$r_l_status.iosb$l_getxxi_status
+#define iosb$l_reg_status iosb$r_io_get.iosb$r_get_64.iosb$r_l_status.iosb$l_reg_status
+#endif /* #if !defined(__VAXC) */
+
+#endif /* End of IOSBDEF */
+
+#include <efndef.h>
+#include <stdlib.h>
+#include <ssdef.h>
+#include <time.h>
+#include <stdarg.h>
+#include <descrip.h>
+
+#include "vms_term_sock.h"
+
+#ifdef __alpha
static struct _iosb TerminalDeviceIosb;
-# else
+#else
IOSB TerminalDeviceIosb;
-# endif
+#endif
static char TerminalDeviceBuff[255 + 2];
-static int TerminalSocketPair[2] = {0, 0};
+static int TerminalSocketPair[2] = { 0, 0 };
static unsigned short TerminalDeviceChan = 0;
-static int CreateSocketPair (int, int, int, int *);
-static void SocketPairTimeoutAst (int);
-static int TerminalDeviceAst (int);
-static void LogMessage (char *, ...);
+static int CreateSocketPair(int, int, int, int *);
+static void SocketPairTimeoutAst(int);
+static int TerminalDeviceAst(int);
+static void LogMessage(char *, ...);
/*
** Socket Pair Timeout Value (must be 0-59 seconds)
*/
-# define SOCKET_PAIR_TIMEOUT_VALUE 20
+#define SOCKET_PAIR_TIMEOUT_VALUE 20
/*
** Socket Pair Timeout Block which is passed to timeout AST
@@ -119,55 +134,54 @@ typedef struct _SocketPairTimeoutBlock {
unsigned short SockChan2;
} SPTB;
-# ifdef TERM_SOCK_TEST
+#ifdef TERM_SOCK_TEST
/*----------------------------------------------------------------------------*/
/* */
/*----------------------------------------------------------------------------*/
-int main (int argc, char *argv[], char *envp[])
+int main(int argc, char *argv[], char *envp[])
{
char TermBuff[80];
int TermSock,
status,
len;
- LogMessage ("Enter 'q' or 'Q' to quit ...");
- while (OPENSSL_strcasecmp (TermBuff, "Q")) {
+ LogMessage("Enter 'q' or 'Q' to quit ...");
+ while (OPENSSL_strcasecmp(TermBuff, "Q")) {
/*
** Create the terminal socket
*/
- status = TerminalSocket (TERM_SOCK_CREATE, &TermSock);
+ status = TerminalSocket(TERM_SOCK_CREATE, &TermSock);
if (status != TERM_SOCK_SUCCESS)
- exit (1);
+ exit(1);
/*
** Process the terminal input
*/
- LogMessage ("Waiting on terminal I/O ...\n");
- len = recv (TermSock, TermBuff, sizeof(TermBuff), 0) ;
+ LogMessage("Waiting on terminal I/O ...\n");
+ len = recv(TermSock, TermBuff, sizeof(TermBuff), 0);
TermBuff[len] = '\0';
- LogMessage ("Received terminal I/O [%s]", TermBuff);
+ LogMessage("Received terminal I/O [%s]", TermBuff);
/*
** Delete the terminal socket
*/
- status = TerminalSocket (TERM_SOCK_DELETE, &TermSock);
+ status = TerminalSocket(TERM_SOCK_DELETE, &TermSock);
if (status != TERM_SOCK_SUCCESS)
- exit (1);
+ exit(1);
}
return 1;
-
}
-# endif
+#endif
/*----------------------------------------------------------------------------*/
/* */
/*----------------------------------------------------------------------------*/
-int TerminalSocket (int FunctionCode, int *ReturnSocket)
+int TerminalSocket(int FunctionCode, int *ReturnSocket)
{
int status;
- $DESCRIPTOR (TerminalDeviceDesc, "SYS$COMMAND");
+ $DESCRIPTOR(TerminalDeviceDesc, "SYS$COMMAND");
/*
** Process the requested function code
@@ -177,45 +191,45 @@ int TerminalSocket (int FunctionCode, int *ReturnSocket)
/*
** Create a socket pair
*/
- status = CreateSocketPair (AF_INET, SOCK_STREAM, 0, TerminalSocketPair);
+ status = CreateSocketPair(AF_INET, SOCK_STREAM, 0, TerminalSocketPair);
if (status == -1) {
- LogMessage ("TerminalSocket: CreateSocketPair () - %08X", status);
+ LogMessage("TerminalSocket: CreateSocketPair () - %08X", status);
if (TerminalSocketPair[0])
- close (TerminalSocketPair[0]);
+ close(TerminalSocketPair[0]);
if (TerminalSocketPair[1])
- close (TerminalSocketPair[1]);
+ close(TerminalSocketPair[1]);
return TERM_SOCK_FAILURE;
}
/*
** Assign a channel to the terminal device
*/
- status = sys$assign (&TerminalDeviceDesc,
- &TerminalDeviceChan,
- 0, 0, 0);
- if (! (status & 1)) {
- LogMessage ("TerminalSocket: SYS$ASSIGN () - %08X", status);
- close (TerminalSocketPair[0]);
- close (TerminalSocketPair[1]);
+ status = sys$assign(&TerminalDeviceDesc,
+ &TerminalDeviceChan,
+ 0, 0, 0);
+ if (!(status & 1)) {
+ LogMessage("TerminalSocket: SYS$ASSIGN () - %08X", status);
+ close(TerminalSocketPair[0]);
+ close(TerminalSocketPair[1]);
return TERM_SOCK_FAILURE;
}
/*
** Queue an async IO to the terminal device
*/
- status = sys$qio (EFN$C_ENF,
- TerminalDeviceChan,
- IO$_READVBLK,
- &TerminalDeviceIosb,
- TerminalDeviceAst,
- 0,
- TerminalDeviceBuff,
- sizeof(TerminalDeviceBuff) - 2,
- 0, 0, 0, 0);
- if (! (status & 1)) {
- LogMessage ("TerminalSocket: SYS$QIO () - %08X", status);
- close (TerminalSocketPair[0]);
- close (TerminalSocketPair[1]);
+ status = sys$qio(EFN$C_ENF,
+ TerminalDeviceChan,
+ IO$_READVBLK,
+ &TerminalDeviceIosb,
+ TerminalDeviceAst,
+ 0,
+ TerminalDeviceBuff,
+ sizeof(TerminalDeviceBuff) - 2,
+ 0, 0, 0, 0);
+ if (!(status & 1)) {
+ LogMessage("TerminalSocket: SYS$QIO () - %08X", status);
+ close(TerminalSocketPair[0]);
+ close(TerminalSocketPair[1]);
return TERM_SOCK_FAILURE;
}
@@ -229,30 +243,30 @@ int TerminalSocket (int FunctionCode, int *ReturnSocket)
/*
** Cancel any pending IO on the terminal channel
*/
- status = sys$cancel (TerminalDeviceChan);
- if (! (status & 1)) {
- LogMessage ("TerminalSocket: SYS$CANCEL () - %08X", status);
- close (TerminalSocketPair[0]);
- close (TerminalSocketPair[1]);
+ status = sys$cancel(TerminalDeviceChan);
+ if (!(status & 1)) {
+ LogMessage("TerminalSocket: SYS$CANCEL () - %08X", status);
+ close(TerminalSocketPair[0]);
+ close(TerminalSocketPair[1]);
return TERM_SOCK_FAILURE;
}
/*
** Deassign the terminal channel
*/
- status = sys$dassgn (TerminalDeviceChan);
- if (! (status & 1)) {
- LogMessage ("TerminalSocket: SYS$DASSGN () - %08X", status);
- close (TerminalSocketPair[0]);
- close (TerminalSocketPair[1]);
+ status = sys$dassgn(TerminalDeviceChan);
+ if (!(status & 1)) {
+ LogMessage("TerminalSocket: SYS$DASSGN () - %08X", status);
+ close(TerminalSocketPair[0]);
+ close(TerminalSocketPair[1]);
return TERM_SOCK_FAILURE;
}
/*
** Close the terminal socket pair
*/
- close (TerminalSocketPair[0]);
- close (TerminalSocketPair[1]);
+ close(TerminalSocketPair[0]);
+ close(TerminalSocketPair[1]);
/*
** Return the initialized socket
@@ -264,7 +278,7 @@ int TerminalSocket (int FunctionCode, int *ReturnSocket)
/*
** Invalid function code
*/
- LogMessage ("TerminalSocket: Invalid Function Code - %d", FunctionCode);
+ LogMessage("TerminalSocket: Invalid Function Code - %d", FunctionCode);
return TERM_SOCK_FAILURE;
break;
}
@@ -273,21 +287,20 @@ int TerminalSocket (int FunctionCode, int *ReturnSocket)
** Return success
*/
return TERM_SOCK_SUCCESS;
-
}
/*----------------------------------------------------------------------------*/
/* */
/*----------------------------------------------------------------------------*/
-static int CreateSocketPair (int SocketFamily,
- int SocketType,
- int SocketProtocol,
- int *SocketPair)
+static int CreateSocketPair(int SocketFamily,
+ int SocketType,
+ int SocketProtocol,
+ int *SocketPair)
{
- struct dsc$descriptor AscTimeDesc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, NULL};
- static const char* LocalHostAddr = {"127.0.0.1"};
+ struct dsc$descriptor AscTimeDesc = { 0, DSC$K_DTYPE_T, DSC$K_CLASS_S, NULL };
+ static const char *LocalHostAddr = { "127.0.0.1" };
unsigned short TcpAcceptChan = 0,
- TcpDeviceChan = 0;
+ TcpDeviceChan = 0;
unsigned long BinTimeBuff[2];
struct sockaddr_in sin;
char AscTimeBuff[32];
@@ -295,23 +308,23 @@ static int CreateSocketPair (int SocketFamily,
int status;
unsigned int slen;
-# ifdef __alpha
+#ifdef __alpha
struct _iosb iosb;
-# else
+#else
IOSB iosb;
-# endif
+#endif
int SockDesc1 = 0,
SockDesc2 = 0;
SPTB sptb;
- $DESCRIPTOR (TcpDeviceDesc, "TCPIP$DEVICE");
+ $DESCRIPTOR(TcpDeviceDesc, "TCPIP$DEVICE");
/*
** Create a socket
*/
- SockDesc1 = socket (SocketFamily, SocketType, 0);
+ SockDesc1 = socket(SocketFamily, SocketType, 0);
if (SockDesc1 < 0) {
- LogMessage ("CreateSocketPair: socket () - %d", errno);
+ LogMessage("CreateSocketPair: socket () - %d", errno);
return -1;
}
@@ -319,28 +332,28 @@ static int CreateSocketPair (int SocketFamily,
** Initialize the socket information
*/
slen = sizeof(sin);
- memset ((char *) &sin, 0, slen);
+ memset((char *)&sin, 0, slen);
sin.sin_family = SocketFamily;
- sin.sin_addr.s_addr = inet_addr (LocalHostAddr);
+ sin.sin_addr.s_addr = inet_addr(LocalHostAddr);
sin.sin_port = 0;
/*
** Bind the socket to the local IP
*/
- status = bind (SockDesc1, (struct sockaddr *) &sin, slen);
+ status = bind(SockDesc1, (struct sockaddr *)&sin, slen);
if (status < 0) {
- LogMessage ("CreateSocketPair: bind () - %d", errno);
- close (SockDesc1);
+ LogMessage("CreateSocketPair: bind () - %d", errno);
+ close(SockDesc1);
return -1;
}
/*
** Get the socket name so we can save the port number
*/
- status = getsockname (SockDesc1, (struct sockaddr *) &sin, &slen);
+ status = getsockname(SockDesc1, (struct sockaddr *)&sin, &slen);
if (status < 0) {
- LogMessage ("CreateSocketPair: getsockname () - %d", errno);
- close (SockDesc1);
+ LogMessage("CreateSocketPair: getsockname () - %d", errno);
+ close(SockDesc1);
return -1;
} else
LocalHostPort = sin.sin_port;
@@ -348,18 +361,18 @@ static int CreateSocketPair (int SocketFamily,
/*
** Setup a listen for the socket
*/
- listen (SockDesc1, 5);
+ listen(SockDesc1, 5);
/*
** Get the binary (64-bit) time of the specified timeout value
*/
BIO_snprintf(AscTimeBuff, sizeof(AscTimeBuff), "0 0:0:%02d.00", SOCKET_PAIR_TIMEOUT_VALUE);
- AscTimeDesc.dsc$w_length = strlen (AscTimeBuff);
+ AscTimeDesc.dsc$w_length = strlen(AscTimeBuff);
AscTimeDesc.dsc$a_pointer = AscTimeBuff;
- status = sys$bintim (&AscTimeDesc, BinTimeBuff);
- if (! (status & 1)) {
- LogMessage ("CreateSocketPair: SYS$BINTIM () - %08X", status);
- close (SockDesc1);
+ status = sys$bintim(&AscTimeDesc, BinTimeBuff);
+ if (!(status & 1)) {
+ LogMessage("CreateSocketPair: SYS$BINTIM () - %08X", status);
+ close(SockDesc1);
return -1;
}
@@ -367,87 +380,87 @@ static int CreateSocketPair (int SocketFamily,
** Assign another channel to the TCP/IP device for the accept.
** This is the channel that ends up being connected to.
*/
- status = sys$assign (&TcpDeviceDesc, &TcpDeviceChan, 0, 0, 0);
- if (! (status & 1)) {
- LogMessage ("CreateSocketPair: SYS$ASSIGN () - %08X", status);
- close (SockDesc1);
+ status = sys$assign(&TcpDeviceDesc, &TcpDeviceChan, 0, 0, 0);
+ if (!(status & 1)) {
+ LogMessage("CreateSocketPair: SYS$ASSIGN () - %08X", status);
+ close(SockDesc1);
return -1;
}
/*
** Get the channel of the first socket for the accept
*/
- TcpAcceptChan = decc$get_sdc (SockDesc1);
+ TcpAcceptChan = decc$get_sdc(SockDesc1);
/*
** Perform the accept using $QIO so we can do this asynchronously
*/
- status = sys$qio (EFN$C_ENF,
- TcpAcceptChan,
- IO$_ACCESS | IO$M_ACCEPT,
- &iosb,
- 0, 0, 0, 0, 0,
- &TcpDeviceChan,
- 0, 0);
- if (! (status & 1)) {
- LogMessage ("CreateSocketPair: SYS$QIO () - %08X", status);
- close (SockDesc1);
- sys$dassgn (TcpDeviceChan);
+ status = sys$qio(EFN$C_ENF,
+ TcpAcceptChan,
+ IO$_ACCESS | IO$M_ACCEPT,
+ &iosb,
+ 0, 0, 0, 0, 0,
+ &TcpDeviceChan,
+ 0, 0);
+ if (!(status & 1)) {
+ LogMessage("CreateSocketPair: SYS$QIO () - %08X", status);
+ close(SockDesc1);
+ sys$dassgn(TcpDeviceChan);
return -1;
}
/*
** Create the second socket to do the connect
*/
- SockDesc2 = socket (SocketFamily, SocketType, 0);
+ SockDesc2 = socket(SocketFamily, SocketType, 0);
if (SockDesc2 < 0) {
- LogMessage ("CreateSocketPair: socket () - %d", errno);
- sys$cancel (TcpAcceptChan);
- close (SockDesc1);
- sys$dassgn (TcpDeviceChan);
- return (-1) ;
+ LogMessage("CreateSocketPair: socket () - %d", errno);
+ sys$cancel(TcpAcceptChan);
+ close(SockDesc1);
+ sys$dassgn(TcpDeviceChan);
+ return (-1);
}
/*
** Setup the Socket Pair Timeout Block
*/
sptb.SockChan1 = TcpAcceptChan;
- sptb.SockChan2 = decc$get_sdc (SockDesc2);
+ sptb.SockChan2 = decc$get_sdc(SockDesc2);
/*
** Before we block on the connect, set a timer that can cancel I/O on our
** two sockets if it never connects.
*/
- status = sys$setimr (EFN$C_ENF,
- BinTimeBuff,
- SocketPairTimeoutAst,
- &sptb,
- 0);
- if (! (status & 1)) {
- LogMessage ("CreateSocketPair: SYS$SETIMR () - %08X", status);
- sys$cancel (TcpAcceptChan);
- close (SockDesc1);
- close (SockDesc2);
- sys$dassgn (TcpDeviceChan);
+ status = sys$setimr(EFN$C_ENF,
+ BinTimeBuff,
+ SocketPairTimeoutAst,
+ &sptb,
+ 0);
+ if (!(status & 1)) {
+ LogMessage("CreateSocketPair: SYS$SETIMR () - %08X", status);
+ sys$cancel(TcpAcceptChan);
+ close(SockDesc1);
+ close(SockDesc2);
+ sys$dassgn(TcpDeviceChan);
return -1;
}
/*
** Now issue the connect
*/
- memset ((char *) &sin, 0, sizeof(sin)) ;
+ memset((char *)&sin, 0, sizeof(sin));
sin.sin_family = SocketFamily;
- sin.sin_addr.s_addr = inet_addr (LocalHostAddr) ;
- sin.sin_port = LocalHostPort ;
+ sin.sin_addr.s_addr = inet_addr(LocalHostAddr);
+ sin.sin_port = LocalHostPort;
- status = connect (SockDesc2, (struct sockaddr *) &sin, sizeof(sin));
+ status = connect(SockDesc2, (struct sockaddr *)&sin, sizeof(sin));
if (status < 0) {
- LogMessage ("CreateSocketPair: connect () - %d", errno);
- sys$cantim (&sptb, 0);
- sys$cancel (TcpAcceptChan);
- close (SockDesc1);
- close (SockDesc2);
- sys$dassgn (TcpDeviceChan);
+ LogMessage("CreateSocketPair: connect () - %d", errno);
+ sys$cantim(&sptb, 0);
+ sys$cancel(TcpAcceptChan);
+ close(SockDesc1);
+ close(SockDesc2);
+ sys$dassgn(TcpDeviceChan);
return -1;
}
@@ -456,18 +469,18 @@ static int CreateSocketPair (int SocketFamily,
** (SS$_ABORT), then we probably canceled it from the AST routine - so log
** a timeout.
*/
- status = sys$synch (EFN$C_ENF, &iosb);
- if (! (iosb.iosb$w_status & 1)) {
+ status = sys$synch(EFN$C_ENF, &iosb);
+ if (!(iosb.iosb$w_status & 1)) {
if (iosb.iosb$w_status == SS$_ABORT)
- LogMessage ("CreateSocketPair: SYS$QIO(iosb) timeout");
+ LogMessage("CreateSocketPair: SYS$QIO(iosb) timeout");
else {
- LogMessage ("CreateSocketPair: SYS$QIO(iosb) - %d",
- iosb.iosb$w_status);
- sys$cantim (&sptb, 0);
+ LogMessage("CreateSocketPair: SYS$QIO(iosb) - %d",
+ iosb.iosb$w_status);
+ sys$cantim(&sptb, 0);
}
- close (SockDesc1);
- close (SockDesc2);
- sys$dassgn (TcpDeviceChan);
+ close(SockDesc1);
+ close(SockDesc2);
+ sys$dassgn(TcpDeviceChan);
return -1;
}
@@ -476,34 +489,32 @@ static int CreateSocketPair (int SocketFamily,
** I/O channel to a socket fd, close the listener socket and return the
** connected pair.
*/
- sys$cantim (&sptb, 0);
-
- close (SockDesc1) ;
- SocketPair[0] = SockDesc2 ;
- SocketPair[1] = socket_fd (TcpDeviceChan);
+ sys$cantim(&sptb, 0);
- return (0) ;
+ close(SockDesc1);
+ SocketPair[0] = SockDesc2;
+ SocketPair[1] = socket_fd(TcpDeviceChan);
+ return (0);
}
/*----------------------------------------------------------------------------*/
/* */
/*----------------------------------------------------------------------------*/
-static void SocketPairTimeoutAst (int astparm)
+static void SocketPairTimeoutAst(int astparm)
{
- SPTB *sptb = (SPTB *) astparm;
+ SPTB *sptb = (SPTB *)astparm;
- sys$cancel (sptb->SockChan2); /* Cancel the connect() */
- sys$cancel (sptb->SockChan1); /* Cancel the accept() */
+ sys$cancel(sptb->SockChan2); /* Cancel the connect() */
+ sys$cancel(sptb->SockChan1); /* Cancel the accept() */
return;
-
}
/*----------------------------------------------------------------------------*/
/* */
/*----------------------------------------------------------------------------*/
-static int TerminalDeviceAst (int astparm)
+static int TerminalDeviceAst(int astparm)
{
int status;
@@ -511,41 +522,40 @@ static int TerminalDeviceAst (int astparm)
** Terminate the terminal buffer
*/
TerminalDeviceBuff[TerminalDeviceIosb.iosb$w_bcnt] = '\0';
- strcat (TerminalDeviceBuff, "\n");
+ strcat(TerminalDeviceBuff, "\n");
/*
** Send the data read from the terminal device through the socket pair
*/
- send (TerminalSocketPair[0], TerminalDeviceBuff,
- TerminalDeviceIosb.iosb$w_bcnt + 1, 0);
+ send(TerminalSocketPair[0], TerminalDeviceBuff,
+ TerminalDeviceIosb.iosb$w_bcnt + 1, 0);
/*
** Queue another async IO to the terminal device
*/
- status = sys$qio (EFN$C_ENF,
- TerminalDeviceChan,
- IO$_READVBLK,
- &TerminalDeviceIosb,
- TerminalDeviceAst,
- 0,
- TerminalDeviceBuff,
- sizeof(TerminalDeviceBuff) - 2,
- 0, 0, 0, 0);
+ status = sys$qio(EFN$C_ENF,
+ TerminalDeviceChan,
+ IO$_READVBLK,
+ &TerminalDeviceIosb,
+ TerminalDeviceAst,
+ 0,
+ TerminalDeviceBuff,
+ sizeof(TerminalDeviceBuff) - 2,
+ 0, 0, 0, 0);
/*
** Return status
*/
return status;
-
}
/*----------------------------------------------------------------------------*/
/* */
/*----------------------------------------------------------------------------*/
-static void LogMessage (char *msg, ...)
+static void LogMessage(char *msg, ...)
{
- char *Month[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
- "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
+ char *Month[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+ "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
static unsigned int pid = 0;
va_list args;
time_t CurTime;
@@ -556,36 +566,35 @@ static void LogMessage (char *msg, ...)
** Get the process pid
*/
if (pid == 0)
- pid = getpid ();
+ pid = getpid();
/*
** Convert the current time into local time
*/
- CurTime = time (NULL);
- LocTime = localtime (&CurTime);
+ CurTime = time(NULL);
+ LocTime = localtime(&CurTime);
/*
** Format the message buffer
*/
BIO_snprintf(MsgBuff, sizeof(MsgBuff), "%02d-%s-%04d %02d:%02d:%02d [%08X] %s\n",
- LocTime->tm_mday, Month[LocTime->tm_mon],
- (LocTime->tm_year + 1900), LocTime->tm_hour, LocTime->tm_min,
- LocTime->tm_sec, pid, msg);
+ LocTime->tm_mday, Month[LocTime->tm_mon],
+ (LocTime->tm_year + 1900), LocTime->tm_hour, LocTime->tm_min,
+ LocTime->tm_sec, pid, msg);
/*
** Get any variable arguments and add them to the print of the message
** buffer
*/
- va_start (args, msg);
- vfprintf (stderr, MsgBuff, args);
- va_end (args);
+ va_start(args, msg);
+ vfprintf(stderr, MsgBuff, args);
+ va_end(args);
/*
** Flush standard error output
*/
- fsync (fileno (stderr));
+ fsync(fileno(stderr));
return;
-
}
#endif
diff --git a/apps/lib/win32_init.c b/apps/lib/win32_init.c
index ee0ba27235..ff05730414 100644
--- a/apps/lib/win32_init.c
+++ b/apps/lib/win32_init.c
@@ -81,18 +81,18 @@ static int process_glob(WCHAR *wstr, int wlen)
break;
if (i == wlen)
- return 0; /* definitely not a glob */
+ return 0; /* definitely not a glob */
saved_char = wstr[wlen];
wstr[wlen] = L'\0';
h = FindFirstFileW(wstr, &data);
wstr[wlen] = saved_char;
if (h == INVALID_HANDLE_VALUE)
- return 0; /* not a valid glob, just pass... */
+ return 0; /* not a valid glob, just pass... */
if (slash)
udlen = WideCharToMultiByte(CP_UTF8, 0, wstr, slash,
- NULL, 0, NULL, NULL);
+ NULL, 0, NULL, NULL);
else
udlen = 0;
@@ -104,8 +104,7 @@ static int process_glob(WCHAR *wstr, int wlen)
* skip over . and ..
*/
if (data.cFileName[0] == L'.') {
- if ((data.cFileName[1] == L'\0') ||
- (data.cFileName[1] == L'.' && data.cFileName[2] == L'\0'))
+ if ((data.cFileName[1] == L'\0') || (data.cFileName[1] == L'.' && data.cFileName[2] == L'\0'))
continue;
}
@@ -117,7 +116,7 @@ static int process_glob(WCHAR *wstr, int wlen)
* so that |uflen| covers even trailing '\0'.
*/
uflen = WideCharToMultiByte(CP_UTF8, 0, data.cFileName, -1,
- NULL, 0, NULL, NULL);
+ NULL, 0, NULL, NULL);
arg = malloc(udlen + uflen);
if (arg == NULL)
@@ -125,10 +124,10 @@ static int process_glob(WCHAR *wstr, int wlen)
if (udlen)
WideCharToMultiByte(CP_UTF8, 0, wstr, slash,
- arg, udlen, NULL, NULL);
+ arg, udlen, NULL, NULL);
WideCharToMultiByte(CP_UTF8, 0, data.cFileName, -1,
- arg + udlen, uflen, NULL, NULL);
+ arg + udlen, uflen, NULL, NULL);
newargv[newargc++] = arg;
} while (FindNextFileW(h, &data));
@@ -154,7 +153,8 @@ void win32_utf8argv(int *argc, char **argv[])
return;
wcmdline = GetCommandLineW();
- if (wcmdline == NULL) return;
+ if (wcmdline == NULL)
+ return;
/*
* make a copy of the command line, since we might have to modify it...
@@ -178,7 +178,7 @@ void win32_utf8argv(int *argc, char **argv[])
*/
warg = wend = p;
while (*p != L'\0'
- && (in_quote || (*p != L' ' && *p != L'\t'))) {
+ && (in_quote || (*p != L' ' && *p != L'\t'))) {
switch (*p) {
case L'\\':
/*
@@ -257,7 +257,7 @@ void win32_utf8argv(int *argc, char **argv[])
ulen = 0;
if (wlen > 0) {
ulen = WideCharToMultiByte(CP_UTF8, 0, warg, wlen,
- NULL, 0, NULL, NULL);
+ NULL, 0, NULL, NULL);
if (ulen <= 0)
continue;
}
@@ -270,7 +270,7 @@ void win32_utf8argv(int *argc, char **argv[])
if (wlen > 0)
WideCharToMultiByte(CP_UTF8, 0, warg, wlen,
- arg, ulen, NULL, NULL);
+ arg, ulen, NULL, NULL);
arg[ulen] = '\0';
newargv[newargc++] = arg;
@@ -301,5 +301,7 @@ void win32_utf8argv(int *argc, char **argv[])
}
#else
void win32_utf8argv(int *argc, char **argv[])
-{ return; }
+{
+ return;
+}
#endif
diff --git a/apps/list.c b/apps/list.c
index 9e3e65e77d..e4825ae3b1 100644
--- a/apps/list.c
+++ b/apps/list.c
@@ -36,21 +36,21 @@ static int verbose = 0;
static const char *select_name = NULL;
/* Checks to see if algorithms are fetchable */
-#define IS_FETCHABLE(type, TYPE) \
- static int is_ ## type ## _fetchable(const TYPE *alg) \
- { \
- TYPE *impl; \
- const char *propq = app_get0_propq(); \
- OSSL_LIB_CTX *libctx = app_get0_libctx(); \
- const char *name = TYPE ## _get0_name(alg); \
- \
- ERR_set_mark(); \
- impl = TYPE ## _fetch(libctx, name, propq); \
- ERR_pop_to_mark(); \
- if (impl == NULL) \
- return 0; \
- TYPE ## _free(impl); \
- return 1; \
+#define IS_FETCHABLE(type, TYPE) \
+ static int is_##type##_fetchable(const TYPE *alg) \
+ { \
+ TYPE *impl; \
+ const char *propq = app_get0_propq(); \
+ OSSL_LIB_CTX *libctx = app_get0_libctx(); \
+ const char *name = TYPE##_get0_name(alg); \
+ \
+ ERR_set_mark(); \
+ impl = TYPE##_fetch(libctx, name, propq); \
+ ERR_pop_to_mark(); \
+ if (impl == NULL) \
+ return 0; \
+ TYPE##_free(impl); \
+ return 1; \
}
IS_FETCHABLE(cipher, EVP_CIPHER)
IS_FETCHABLE(digest, EVP_MD)
@@ -73,7 +73,7 @@ static int include_legacy(void)
}
static void legacy_cipher_fn(const EVP_CIPHER *c,
- const char *from, const char *to, void *arg)
+ const char *from, const char *to, void *arg)
{
if (select_name != NULL
&& (c == NULL
@@ -92,11 +92,11 @@ static void legacy_cipher_fn(const EVP_CIPHER *c,
#endif
DEFINE_STACK_OF(EVP_CIPHER)
-static int cipher_cmp(const EVP_CIPHER * const *a,
- const EVP_CIPHER * const *b)
+static int cipher_cmp(const EVP_CIPHER *const *a,
+ const EVP_CIPHER *const *b)
{
return strcmp(OSSL_PROVIDER_get0_name(EVP_CIPHER_get0_provider(*a)),
- OSSL_PROVIDER_get0_name(EVP_CIPHER_get0_provider(*b)));
+ OSSL_PROVIDER_get0_name(EVP_CIPHER_get0_provider(*b)));
}
static void collect_ciphers(EVP_CIPHER *cipher, void *stack)
@@ -104,8 +104,8 @@ static void collect_ciphers(EVP_CIPHER *cipher, void *stack)
STACK_OF(EVP_CIPHER) *cipher_stack = stack;
if (is_cipher_fetchable(cipher)
- && EVP_CIPHER_up_ref(cipher)
- && sk_EVP_CIPHER_push(cipher_stack, cipher) <= 0)
+ && EVP_CIPHER_up_ref(cipher)
+ && sk_EVP_CIPHER_push(cipher_stack, cipher) <= 0)
EVP_CIPHER_free(cipher); /* up-ref successful but push to stack failed */
}
@@ -141,7 +141,7 @@ static void list_ciphers(const char *prefix)
print_names(bio_out, names);
BIO_printf(bio_out, " @ %s\n",
- OSSL_PROVIDER_get0_name(EVP_CIPHER_get0_provider(c)));
+ OSSL_PROVIDER_get0_name(EVP_CIPHER_get0_provider(c)));
if (verbose) {
const char *desc = EVP_CIPHER_get0_description(c);
@@ -149,11 +149,11 @@ static void list_ciphers(const char *prefix)
if (desc != NULL)
BIO_printf(bio_out, " description: %s\n", desc);
print_param_types("retrievable algorithm parameters",
- EVP_CIPHER_gettable_params(c), 4);
+ EVP_CIPHER_gettable_params(c), 4);
print_param_types("retrievable operation parameters",
- EVP_CIPHER_gettable_ctx_params(c), 4);
+ EVP_CIPHER_gettable_ctx_params(c), 4);
print_param_types("settable operation parameters",
- EVP_CIPHER_settable_ctx_params(c), 4);
+ EVP_CIPHER_settable_ctx_params(c), 4);
}
}
sk_OPENSSL_CSTRING_free(names);
@@ -163,7 +163,7 @@ static void list_ciphers(const char *prefix)
#ifndef OPENSSL_NO_DEPRECATED_3_0
static void legacy_md_fn(const EVP_MD *m,
- const char *from, const char *to, void *arg)
+ const char *from, const char *to, void *arg)
{
if (m != NULL) {
BIO_printf(arg, " %s\n", EVP_MD_get0_name(m));
@@ -178,10 +178,10 @@ static void legacy_md_fn(const EVP_MD *m,
#endif
DEFINE_STACK_OF(EVP_MD)
-static int md_cmp(const EVP_MD * const *a, const EVP_MD * const *b)
+static int md_cmp(const EVP_MD *const *a, const EVP_MD *const *b)
{
return strcmp(OSSL_PROVIDER_get0_name(EVP_MD_get0_provider(*a)),
- OSSL_PROVIDER_get0_name(EVP_MD_get0_provider(*b)));
+ OSSL_PROVIDER_get0_name(EVP_MD_get0_provider(*b)));
}
static void collect_digests(EVP_MD *digest, void *stack)
@@ -189,8 +189,8 @@ static void collect_digests(EVP_MD *digest, void *stack)
STACK_OF(EVP_MD) *digest_stack = stack;
if (is_digest_fetchable(digest)
- && EVP_MD_up_ref(digest)
- && sk_EVP_MD_push(digest_stack, digest) <= 0)
+ && EVP_MD_up_ref(digest)
+ && sk_EVP_MD_push(digest_stack, digest) <= 0)
EVP_MD_free(digest); /* up-ref successful but push to stack failed */
}
@@ -226,7 +226,7 @@ static void list_digests(const char *prefix)
print_names(bio_out, names);
BIO_printf(bio_out, " @ %s\n",
- OSSL_PROVIDER_get0_name(EVP_MD_get0_provider(m)));
+ OSSL_PROVIDER_get0_name(EVP_MD_get0_provider(m)));
if (verbose) {
const char *desc = EVP_MD_get0_description(m);
@@ -234,11 +234,11 @@ static void list_digests(const char *prefix)
if (desc != NULL)
BIO_printf(bio_out, " description: %s\n", desc);
print_param_types("retrievable algorithm parameters",
- EVP_MD_gettable_params(m), 4);
+ EVP_MD_gettable_params(m), 4);
print_param_types("retrievable operation parameters",
- EVP_MD_gettable_ctx_params(m), 4);
+ EVP_MD_gettable_ctx_params(m), 4);
print_param_types("settable operation parameters",
- EVP_MD_settable_ctx_params(m), 4);
+ EVP_MD_settable_ctx_params(m), 4);
}
}
sk_OPENSSL_CSTRING_free(names);
@@ -247,10 +247,10 @@ static void list_digests(const char *prefix)
}
DEFINE_STACK_OF(EVP_MAC)
-static int mac_cmp(const EVP_MAC * const *a, const EVP_MAC * const *b)
+static int mac_cmp(const EVP_MAC *const *a, const EVP_MAC *const *b)
{
return strcmp(OSSL_PROVIDER_get0_name(EVP_MAC_get0_provider(*a)),
- OSSL_PROVIDER_get0_name(EVP_MAC_get0_provider(*b)));
+ OSSL_PROVIDER_get0_name(EVP_MAC_get0_provider(*b)));
}
static void collect_macs(EVP_MAC *mac, void *stack)
@@ -258,7 +258,7 @@ static void collect_macs(EVP_MAC *mac, void *stack)
STACK_OF(EVP_MAC) *mac_stack = stack;
if (is_mac_fetchable(mac)
- && sk_EVP_MAC_push(mac_stack, mac) > 0)
+ && sk_EVP_MAC_push(mac_stack, mac) > 0)
EVP_MAC_up_ref(mac);
}
@@ -287,7 +287,7 @@ static void list_macs(void)
print_names(bio_out, names);
BIO_printf(bio_out, " @ %s\n",
- OSSL_PROVIDER_get0_name(EVP_MAC_get0_provider(m)));
+ OSSL_PROVIDER_get0_name(EVP_MAC_get0_provider(m)));
if (verbose) {
const char *desc = EVP_MAC_get0_description(m);
@@ -295,11 +295,11 @@ static void list_macs(void)
if (desc != NULL)
BIO_printf(bio_out, " description: %s\n", desc);
print_param_types("retrievable algorithm parameters",
- EVP_MAC_gettable_params(m), 4);
+ EVP_MAC_gettable_params(m), 4);
print_param_types("retrievable operation parameters",
- EVP_MAC_gettable_ctx_params(m), 4);
+ EVP_MAC_gettable_ctx_params(m), 4);
print_param_types("settable operation parameters",
- EVP_MAC_settable_ctx_params(m), 4);
+ EVP_MAC_settable_ctx_params(m), 4);
}
}
sk_OPENSSL_CSTRING_free(names);
@@ -311,10 +311,10 @@ static void list_macs(void)
* KDFs and PRFs
*/
DEFINE_STACK_OF(EVP_KDF)
-static int kdf_cmp(const EVP_KDF * const *a, const EVP_KDF * const *b)
+static int kdf_cmp(const EVP_KDF *const *a, const EVP_KDF *const *b)
{
return strcmp(OSSL_PROVIDER_get0_name(EVP_KDF_get0_provider(*a)),
- OSSL_PROVIDER_get0_name(EVP_KDF_get0_provider(*b)));
+ OSSL_PROVIDER_get0_name(EVP_KDF_get0_provider(*b)));
}
static void collect_kdfs(EVP_KDF *kdf, void *stack)
@@ -322,8 +322,8 @@ static void collect_kdfs(EVP_KDF *kdf, void *stack)
STACK_OF(EVP_KDF) *kdf_stack = stack;
if (is_kdf_fetchable(kdf)
- && EVP_KDF_up_ref(kdf)
- && sk_EVP_KDF_push(kdf_stack, kdf) <= 0)
+ && EVP_KDF_up_ref(kdf)
+ && sk_EVP_KDF_push(kdf_stack, kdf) <= 0)
EVP_KDF_free(kdf); /* up-ref successful but push to stack failed */
}
@@ -352,7 +352,7 @@ static void list_kdfs(void)
print_names(bio_out, names);
BIO_printf(bio_out, " @ %s\n",
- OSSL_PROVIDER_get0_name(EVP_KDF_get0_provider(k)));
+ OSSL_PROVIDER_get0_name(EVP_KDF_get0_provider(k)));
if (verbose) {
const char *desc = EVP_KDF_get0_description(k);
@@ -360,11 +360,11 @@ static void list_kdfs(void)
if (desc != NULL)
BIO_printf(bio_out, " description: %s\n", desc);
print_param_types("retrievable algorithm parameters",
- EVP_KDF_gettable_params(k), 4);
+ EVP_KDF_gettable_params(k), 4);
print_param_types("retrievable operation parameters",
- EVP_KDF_gettable_ctx_params(k), 4);
+ EVP_KDF_gettable_ctx_params(k), 4);
print_param_types("settable operation parameters",
- EVP_KDF_settable_ctx_params(k), 4);
+ EVP_KDF_settable_ctx_params(k), 4);
}
}
sk_OPENSSL_CSTRING_free(names);
@@ -377,13 +377,13 @@ static void list_kdfs(void)
*/
DEFINE_STACK_OF(EVP_RAND)
-static int rand_cmp(const EVP_RAND * const *a, const EVP_RAND * const *b)
+static int rand_cmp(const EVP_RAND *const *a, const EVP_RAND *const *b)
{
int ret = OPENSSL_strcasecmp(EVP_RAND_get0_name(*a), EVP_RAND_get0_name(*b));
if (ret == 0)
ret = strcmp(OSSL_PROVIDER_get0_name(EVP_RAND_get0_provider(*a)),
- OSSL_PROVIDER_get0_name(EVP_RAND_get0_provider(*b)));
+ OSSL_PROVIDER_get0_name(EVP_RAND_get0_provider(*b)));
return ret;
}
@@ -393,8 +393,8 @@ static void collect_rands(EVP_RAND *rand, void *stack)
STACK_OF(EVP_RAND) *rand_stack = stack;
if (is_rand_fetchable(rand)
- && EVP_RAND_up_ref(rand)
- && sk_EVP_RAND_push(rand_stack, rand) <= 0)
+ && EVP_RAND_up_ref(rand)
+ && sk_EVP_RAND_push(rand_stack, rand) <= 0)
EVP_RAND_free(rand); /* up-ref successful but push to stack failed */
}
@@ -418,7 +418,7 @@ static void list_random_generators(void)
continue;
BIO_printf(bio_out, " %s", EVP_RAND_get0_name(m));
BIO_printf(bio_out, " @ %s\n",
- OSSL_PROVIDER_get0_name(EVP_RAND_get0_provider(m)));
+ OSSL_PROVIDER_get0_name(EVP_RAND_get0_provider(m)));
if (verbose) {
const char *desc = EVP_RAND_get0_description(m);
@@ -426,11 +426,11 @@ static void list_random_generators(void)
if (desc != NULL)
BIO_printf(bio_out, " description: %s\n", desc);
print_param_types("retrievable algorithm parameters",
- EVP_RAND_gettable_params(m), 4);
+ EVP_RAND_gettable_params(m), 4);
print_param_types("retrievable operation parameters",
- EVP_RAND_gettable_ctx_params(m), 4);
+ EVP_RAND_gettable_ctx_params(m), 4);
print_param_types("settable operation parameters",
- EVP_RAND_settable_ctx_params(m), 4);
+ EVP_RAND_settable_ctx_params(m), 4);
}
}
sk_EVP_RAND_pop_free(rands, EVP_RAND_free);
@@ -451,7 +451,7 @@ static void display_random(const char *name, EVP_RAND_CTX *drbg)
BIO_printf(bio_out, " %s", EVP_RAND_get0_name(rand));
BIO_printf(bio_out, " @ %s\n",
- OSSL_PROVIDER_get0_name(EVP_RAND_get0_provider(rand)));
+ OSSL_PROVIDER_get0_name(EVP_RAND_get0_provider(rand)));
switch (EVP_RAND_get_state(drbg)) {
case EVP_RAND_STATE_UNINITIALISED:
@@ -477,13 +477,13 @@ static void display_random(const char *name, EVP_RAND_CTX *drbg)
continue;
/* Outside of verbose mode, we skip non-string values */
if (gettables->data_type != OSSL_PARAM_UTF8_STRING
- && gettables->data_type != OSSL_PARAM_UTF8_PTR
- && !verbose)
+ && gettables->data_type != OSSL_PARAM_UTF8_PTR
+ && !verbose)
continue;
params->key = gettables->key;
params->data_type = gettables->data_type;
if (gettables->data_type == OSSL_PARAM_UNSIGNED_INTEGER
- || gettables->data_type == OSSL_PARAM_INTEGER) {
+ || gettables->data_type == OSSL_PARAM_INTEGER) {
params->data = &u;
params->data_size = sizeof(u);
} else {
@@ -508,11 +508,11 @@ static void list_random_instances(void)
* Encoders
*/
DEFINE_STACK_OF(OSSL_ENCODER)
-static int encoder_cmp(const OSSL_ENCODER * const *a,
- const OSSL_ENCODER * const *b)
+static int encoder_cmp(const OSSL_ENCODER *const *a,
+ const OSSL_ENCODER *const *b)
{
return strcmp(OSSL_PROVIDER_get0_name(OSSL_ENCODER_get0_provider(*a)),
- OSSL_PROVIDER_get0_name(OSSL_ENCODER_get0_provider(*b)));
+ OSSL_PROVIDER_get0_name(OSSL_ENCODER_get0_provider(*b)));
}
static void collect_encoders(OSSL_ENCODER *encoder, void *stack)
@@ -520,8 +520,8 @@ static void collect_encoders(OSSL_ENCODER *encoder, void *stack)
STACK_OF(OSSL_ENCODER) *encoder_stack = stack;
if (is_encoder_fetchable(encoder)
- && OSSL_ENCODER_up_ref(encoder)
- && sk_OSSL_ENCODER_push(encoder_stack, encoder) <= 0)
+ && OSSL_ENCODER_up_ref(encoder)
+ && sk_OSSL_ENCODER_push(encoder_stack, encoder) <= 0)
OSSL_ENCODER_free(encoder); /* up-ref successful but push to stack failed */
}
@@ -537,7 +537,7 @@ static void list_encoders(void)
}
BIO_printf(bio_out, "Provided ENCODERs:\n");
OSSL_ENCODER_do_all_provided(app_get0_libctx(), collect_encoders,
- encoders);
+ encoders);
sk_OSSL_ENCODER_sort(encoders);
for (i = 0; i < sk_OSSL_ENCODER_num(encoders); i++) {
@@ -553,8 +553,8 @@ static void list_encoders(void)
print_names(bio_out, names);
BIO_printf(bio_out, " @ %s (%s)\n",
- OSSL_PROVIDER_get0_name(OSSL_ENCODER_get0_provider(k)),
- OSSL_ENCODER_get0_properties(k));
+ OSSL_PROVIDER_get0_name(OSSL_ENCODER_get0_provider(k)),
+ OSSL_ENCODER_get0_properties(k));
if (verbose) {
const char *desc = OSSL_ENCODER_get0_description(k);
@@ -562,7 +562,7 @@ static void list_encoders(void)
if (desc != NULL)
BIO_printf(bio_out, " description: %s\n", desc);
print_param_types("settable operation parameters",
- OSSL_ENCODER_settable_ctx_params(k), 4);
+ OSSL_ENCODER_settable_ctx_params(k), 4);
}
}
sk_OPENSSL_CSTRING_free(names);
@@ -574,11 +574,11 @@ static void list_encoders(void)
* Decoders
*/
DEFINE_STACK_OF(OSSL_DECODER)
-static int decoder_cmp(const OSSL_DECODER * const *a,
- const OSSL_DECODER * const *b)
+static int decoder_cmp(const OSSL_DECODER *const *a,
+ const OSSL_DECODER *const *b)
{
return strcmp(OSSL_PROVIDER_get0_name(OSSL_DECODER_get0_provider(*a)),
- OSSL_PROVIDER_get0_name(OSSL_DECODER_get0_provider(*b)));
+ OSSL_PROVIDER_get0_name(OSSL_DECODER_get0_provider(*b)));
}
static void collect_decoders(OSSL_DECODER *decoder, void *stack)
@@ -586,8 +586,8 @@ static void collect_decoders(OSSL_DECODER *decoder, void *stack)
STACK_OF(OSSL_DECODER) *decoder_stack = stack;
if (is_decoder_fetchable(decoder)
- && OSSL_DECODER_up_ref(decoder)
- && sk_OSSL_DECODER_push(decoder_stack, decoder) <= 0)
+ && OSSL_DECODER_up_ref(decoder)
+ && sk_OSSL_DECODER_push(decoder_stack, decoder) <= 0)
OSSL_DECODER_free(decoder); /* up-ref successful but push to stack failed */
}
@@ -603,7 +603,7 @@ static void list_decoders(void)
}
BIO_printf(bio_out, "Provided DECODERs:\n");
OSSL_DECODER_do_all_provided(app_get0_libctx(), collect_decoders,
- decoders);
+ decoders);
sk_OSSL_DECODER_sort(decoders);
for (i = 0; i < sk_OSSL_DECODER_num(decoders); i++) {
@@ -619,8 +619,8 @@ static void list_decoders(void)
print_names(bio_out, names);
BIO_printf(bio_out, " @ %s (%s)\n",
- OSSL_PROVIDER_get0_name(OSSL_DECODER_get0_provider(k)),
- OSSL_DECODER_get0_properties(k));
+ OSSL_PROVIDER_get0_name(OSSL_DECODER_get0_provider(k)),
+ OSSL_DECODER_get0_properties(k));
if (verbose) {
const char *desc = OSSL_DECODER_get0_description(k);
@@ -628,7 +628,7 @@ static void list_decoders(void)
if (desc != NULL)
BIO_printf(bio_out, " description: %s\n", desc);
print_param_types("settable operation parameters",
- OSSL_DECODER_settable_ctx_params(k), 4);
+ OSSL_DECODER_settable_ctx_params(k), 4);
}
}
sk_OPENSSL_CSTRING_free(names);
@@ -637,11 +637,11 @@ static void list_decoders(void)
}
DEFINE_STACK_OF(EVP_KEYMGMT)
-static int keymanager_cmp(const EVP_KEYMGMT * const *a,
- const EVP_KEYMGMT * const *b)
+static int keymanager_cmp(const EVP_KEYMGMT *const *a,
+ const EVP_KEYMGMT *const *b)
{
return strcmp(OSSL_PROVIDER_get0_name(EVP_KEYMGMT_get0_provider(*a)),
- OSSL_PROVIDER_get0_name(EVP_KEYMGMT_get0_provider(*b)));
+ OSSL_PROVIDER_get0_name(EVP_KEYMGMT_get0_provider(*b)));
}
static void collect_keymanagers(EVP_KEYMGMT *km, void *stack)
@@ -649,8 +649,8 @@ static void collect_keymanagers(EVP_KEYMGMT *km, void *stack)
STACK_OF(EVP_KEYMGMT) *km_stack = stack;
if (is_keymgmt_fetchable(km)
- && EVP_KEYMGMT_up_ref(km)
- && sk_EVP_KEYMGMT_push(km_stack, km) <= 0)
+ && EVP_KEYMGMT_up_ref(km)
+ && sk_EVP_KEYMGMT_push(km_stack, km) <= 0)
EVP_KEYMGMT_free(km); /* up-ref successful but push to stack failed */
}
@@ -660,7 +660,7 @@ static void list_keymanagers(void)
STACK_OF(EVP_KEYMGMT) *km_stack = sk_EVP_KEYMGMT_new(keymanager_cmp);
EVP_KEYMGMT_do_all_provided(app_get0_libctx(), collect_keymanagers,
- km_stack);
+ km_stack);
sk_EVP_KEYMGMT_sort(km_stack);
for (i = 0; i < sk_EVP_KEYMGMT_num(km_stack); i++) {
@@ -684,15 +684,15 @@ static void list_keymanagers(void)
BIO_printf(bio_out, " IDs: ");
print_names(bio_out, names);
BIO_printf(bio_out, " @ %s\n",
- OSSL_PROVIDER_get0_name(EVP_KEYMGMT_get0_provider(k)));
+ OSSL_PROVIDER_get0_name(EVP_KEYMGMT_get0_provider(k)));
if (verbose) {
print_param_types("settable key generation parameters",
- EVP_KEYMGMT_gen_settable_params(k), 4);
+ EVP_KEYMGMT_gen_settable_params(k), 4);
print_param_types("settable operation parameters",
- EVP_KEYMGMT_settable_params(k), 4);
+ EVP_KEYMGMT_settable_params(k), 4);
print_param_types("retrievable operation parameters",
- EVP_KEYMGMT_gettable_params(k), 4);
+ EVP_KEYMGMT_gettable_params(k), 4);
}
}
sk_OPENSSL_CSTRING_free(names);
@@ -701,11 +701,11 @@ static void list_keymanagers(void)
}
DEFINE_STACK_OF(EVP_SKEYMGMT)
-static int skeymanager_cmp(const EVP_SKEYMGMT * const *a,
- const EVP_SKEYMGMT * const *b)
+static int skeymanager_cmp(const EVP_SKEYMGMT *const *a,
+ const EVP_SKEYMGMT *const *b)
{
return strcmp(OSSL_PROVIDER_get0_name(EVP_SKEYMGMT_get0_provider(*a)),
- OSSL_PROVIDER_get0_name(EVP_SKEYMGMT_get0_provider(*b)));
+ OSSL_PROVIDER_get0_name(EVP_SKEYMGMT_get0_provider(*b)));
}
static void collect_skeymanagers(EVP_SKEYMGMT *km, void *stack)
@@ -713,7 +713,7 @@ static void collect_skeymanagers(EVP_SKEYMGMT *km, void *stack)
STACK_OF(EVP_SKEYMGMT) *km_stack = stack;
if (is_skeymgmt_fetchable(km)
- && sk_EVP_SKEYMGMT_push(km_stack, km) > 0)
+ && sk_EVP_SKEYMGMT_push(km_stack, km) > 0)
EVP_SKEYMGMT_up_ref(km);
}
@@ -723,7 +723,7 @@ static void list_skeymanagers(void)
STACK_OF(EVP_SKEYMGMT) *km_stack = sk_EVP_SKEYMGMT_new(skeymanager_cmp);
EVP_SKEYMGMT_do_all_provided(app_get0_libctx(), collect_skeymanagers,
- km_stack);
+ km_stack);
sk_EVP_SKEYMGMT_sort(km_stack);
for (i = 0; i < sk_EVP_SKEYMGMT_num(km_stack); i++) {
@@ -747,8 +747,7 @@ static void list_skeymanagers(void)
BIO_printf(bio_out, " IDs: ");
print_names(bio_out, names);
BIO_printf(bio_out, " @ %s\n",
- OSSL_PROVIDER_get0_name(EVP_SKEYMGMT_get0_provider(k)));
-
+ OSSL_PROVIDER_get0_name(EVP_SKEYMGMT_get0_provider(k)));
}
sk_OPENSSL_CSTRING_free(names);
}
@@ -756,11 +755,11 @@ static void list_skeymanagers(void)
}
DEFINE_STACK_OF(EVP_SIGNATURE)
-static int signature_cmp(const EVP_SIGNATURE * const *a,
- const EVP_SIGNATURE * const *b)
+static int signature_cmp(const EVP_SIGNATURE *const *a,
+ const EVP_SIGNATURE *const *b)
{
return strcmp(OSSL_PROVIDER_get0_name(EVP_SIGNATURE_get0_provider(*a)),
- OSSL_PROVIDER_get0_name(EVP_SIGNATURE_get0_provider(*b)));
+ OSSL_PROVIDER_get0_name(EVP_SIGNATURE_get0_provider(*b)));
}
static void collect_signatures(EVP_SIGNATURE *sig, void *stack)
@@ -768,8 +767,8 @@ static void collect_signatures(EVP_SIGNATURE *sig, void *stack)
STACK_OF(EVP_SIGNATURE) *sig_stack = stack;
if (is_signature_fetchable(sig)
- && EVP_SIGNATURE_up_ref(sig)
- && sk_EVP_SIGNATURE_push(sig_stack, sig) <= 0)
+ && EVP_SIGNATURE_up_ref(sig)
+ && sk_EVP_SIGNATURE_push(sig_stack, sig) <= 0)
EVP_SIGNATURE_free(sig); /* up-ref successful but push to stack failed */
}
@@ -779,7 +778,7 @@ static void list_signatures(void)
STACK_OF(EVP_SIGNATURE) *sig_stack = sk_EVP_SIGNATURE_new(signature_cmp);
EVP_SIGNATURE_do_all_provided(app_get0_libctx(), collect_signatures,
- sig_stack);
+ sig_stack);
sk_EVP_SIGNATURE_sort(sig_stack);
for (i = 0; i < sk_EVP_SIGNATURE_num(sig_stack); i++) {
@@ -796,7 +795,7 @@ static void list_signatures(void)
print_names(bio_out, names);
BIO_printf(bio_out, " @ %s\n",
- OSSL_PROVIDER_get0_name(EVP_SIGNATURE_get0_provider(k)));
+ OSSL_PROVIDER_get0_name(EVP_SIGNATURE_get0_provider(k)));
if (verbose) {
const char *desc = EVP_SIGNATURE_get0_description(k);
@@ -804,9 +803,9 @@ static void list_signatures(void)
if (desc != NULL)
BIO_printf(bio_out, " description: %s\n", desc);
print_param_types("settable operation parameters",
- EVP_SIGNATURE_settable_ctx_params(k), 4);
+ EVP_SIGNATURE_settable_ctx_params(k), 4);
print_param_types("retrievable operation parameters",
- EVP_SIGNATURE_gettable_ctx_params(k), 4);
+ EVP_SIGNATURE_gettable_ctx_params(k), 4);
}
}
sk_OPENSSL_CSTRING_free(names);
@@ -836,8 +835,8 @@ static int list_provider_tls_sigalgs(const OSSL_PARAM params[], void *data)
static int list_tls_sigalg_caps(OSSL_PROVIDER *provider, void *cbdata)
{
OSSL_PROVIDER_get_capabilities(provider, "TLS-SIGALG",
- list_provider_tls_sigalgs,
- cbdata);
+ list_provider_tls_sigalgs,
+ cbdata);
/* As built-in providers don't have this capability, never error */
return 1;
}
@@ -869,9 +868,9 @@ static void list_tls_groups(int version, int all)
num = sk_OPENSSL_CSTRING_num(groups);
for (i = 0; i < num; ++i) {
BIO_printf(bio_out, "%s%c", sk_OPENSSL_CSTRING_value(groups, i),
- (i < num - 1) ? ':' : '\n');
+ (i < num - 1) ? ':' : '\n');
}
- err:
+err:
SSL_CTX_free(ctx);
sk_OPENSSL_CSTRING_free(groups);
return;
@@ -893,19 +892,19 @@ static void list_tls_signatures(void)
if (!OSSL_PROVIDER_do_all(NULL, list_tls_sigalg_caps, &tls_sigalg_listed))
BIO_printf(bio_err,
- "ERROR: could not list all provider signature algorithms\n");
+ "ERROR: could not list all provider signature algorithms\n");
if (tls_sigalg_listed < 2)
BIO_printf(bio_out,
- "\nNo TLS sig algs registered by currently active providers");
+ "\nNo TLS sig algs registered by currently active providers");
BIO_printf(bio_out, "\n");
}
DEFINE_STACK_OF(EVP_KEM)
-static int kem_cmp(const EVP_KEM * const *a,
- const EVP_KEM * const *b)
+static int kem_cmp(const EVP_KEM *const *a,
+ const EVP_KEM *const *b)
{
return strcmp(OSSL_PROVIDER_get0_name(EVP_KEM_get0_provider(*a)),
- OSSL_PROVIDER_get0_name(EVP_KEM_get0_provider(*b)));
+ OSSL_PROVIDER_get0_name(EVP_KEM_get0_provider(*b)));
}
static void collect_kem(EVP_KEM *kem, void *stack)
@@ -913,8 +912,8 @@ static void collect_kem(EVP_KEM *kem, void *stack)
STACK_OF(EVP_KEM) *kem_stack = stack;
if (is_kem_fetchable(kem)
- && EVP_KEM_up_ref(kem)
- && sk_EVP_KEM_push(kem_stack, kem) <= 0)
+ && EVP_KEM_up_ref(kem)
+ && sk_EVP_KEM_push(kem_stack, kem) <= 0)
EVP_KEM_free(kem); /* up-ref successful but push to stack failed */
}
@@ -940,7 +939,7 @@ static void list_kems(void)
print_names(bio_out, names);
BIO_printf(bio_out, " @ %s\n",
- OSSL_PROVIDER_get0_name(EVP_KEM_get0_provider(k)));
+ OSSL_PROVIDER_get0_name(EVP_KEM_get0_provider(k)));
if (verbose) {
const char *desc = EVP_KEM_get0_description(k);
@@ -948,9 +947,9 @@ static void list_kems(void)
if (desc != NULL)
BIO_printf(bio_out, " description: %s\n", desc);
print_param_types("settable operation parameters",
- EVP_KEM_settable_ctx_params(k), 4);
+ EVP_KEM_settable_ctx_params(k), 4);
print_param_types("retrievable operation parameters",
- EVP_KEM_gettable_ctx_params(k), 4);
+ EVP_KEM_gettable_ctx_params(k), 4);
}
}
sk_OPENSSL_CSTRING_free(names);
@@ -961,11 +960,11 @@ static void list_kems(void)
}
DEFINE_STACK_OF(EVP_ASYM_CIPHER)
-static int asymcipher_cmp(const EVP_ASYM_CIPHER * const *a,
- const EVP_ASYM_CIPHER * const *b)
+static int asymcipher_cmp(const EVP_ASYM_CIPHER *const *a,
+ const EVP_ASYM_CIPHER *const *b)
{
return strcmp(OSSL_PROVIDER_get0_name(EVP_ASYM_CIPHER_get0_provider(*a)),
- OSSL_PROVIDER_get0_name(EVP_ASYM_CIPHER_get0_provider(*b)));
+ OSSL_PROVIDER_get0_name(EVP_ASYM_CIPHER_get0_provider(*b)));
}
static void collect_asymciph(EVP_ASYM_CIPHER *asym_cipher, void *stack)
@@ -973,19 +972,18 @@ static void collect_asymciph(EVP_ASYM_CIPHER *asym_cipher, void *stack)
STACK_OF(EVP_ASYM_CIPHER) *asym_cipher_stack = stack;
if (is_asym_cipher_fetchable(asym_cipher)
- && EVP_ASYM_CIPHER_up_ref(asym_cipher)
- && sk_EVP_ASYM_CIPHER_push(asym_cipher_stack, asym_cipher) <= 0)
+ && EVP_ASYM_CIPHER_up_ref(asym_cipher)
+ && sk_EVP_ASYM_CIPHER_push(asym_cipher_stack, asym_cipher) <= 0)
EVP_ASYM_CIPHER_free(asym_cipher); /* up-ref successful but push to stack failed */
}
static void list_asymciphers(void)
{
int i, count = 0;
- STACK_OF(EVP_ASYM_CIPHER) *asymciph_stack =
- sk_EVP_ASYM_CIPHER_new(asymcipher_cmp);
+ STACK_OF(EVP_ASYM_CIPHER) *asymciph_stack = sk_EVP_ASYM_CIPHER_new(asymcipher_cmp);
EVP_ASYM_CIPHER_do_all_provided(app_get0_libctx(), collect_asymciph,
- asymciph_stack);
+ asymciph_stack);
sk_EVP_ASYM_CIPHER_sort(asymciph_stack);
for (i = 0; i < sk_EVP_ASYM_CIPHER_num(asymciph_stack); i++) {
@@ -997,13 +995,13 @@ static void list_asymciphers(void)
names = sk_OPENSSL_CSTRING_new(name_cmp);
if (names != NULL
- && EVP_ASYM_CIPHER_names_do_all(k, collect_names, names)) {
+ && EVP_ASYM_CIPHER_names_do_all(k, collect_names, names)) {
count++;
BIO_printf(bio_out, " ");
print_names(bio_out, names);
BIO_printf(bio_out, " @ %s\n",
- OSSL_PROVIDER_get0_name(EVP_ASYM_CIPHER_get0_provider(k)));
+ OSSL_PROVIDER_get0_name(EVP_ASYM_CIPHER_get0_provider(k)));
if (verbose) {
const char *desc = EVP_ASYM_CIPHER_get0_description(k);
@@ -1011,9 +1009,9 @@ static void list_asymciphers(void)
if (desc != NULL)
BIO_printf(bio_out, " description: %s\n", desc);
print_param_types("settable operation parameters",
- EVP_ASYM_CIPHER_settable_ctx_params(k), 4);
+ EVP_ASYM_CIPHER_settable_ctx_params(k), 4);
print_param_types("retrievable operation parameters",
- EVP_ASYM_CIPHER_gettable_ctx_params(k), 4);
+ EVP_ASYM_CIPHER_gettable_ctx_params(k), 4);
}
}
sk_OPENSSL_CSTRING_free(names);
@@ -1024,11 +1022,11 @@ static void list_asymciphers(void)
}
DEFINE_STACK_OF(EVP_KEYEXCH)
-static int kex_cmp(const EVP_KEYEXCH * const *a,
- const EVP_KEYEXCH * const *b)
+static int kex_cmp(const EVP_KEYEXCH *const *a,
+ const EVP_KEYEXCH *const *b)
{
return strcmp(OSSL_PROVIDER_get0_name(EVP_KEYEXCH_get0_provider(*a)),
- OSSL_PROVIDER_get0_name(EVP_KEYEXCH_get0_provider(*b)));
+ OSSL_PROVIDER_get0_name(EVP_KEYEXCH_get0_provider(*b)));
}
static void collect_kex(EVP_KEYEXCH *kex, void *stack)
@@ -1036,8 +1034,8 @@ static void collect_kex(EVP_KEYEXCH *kex, void *stack)
STACK_OF(EVP_KEYEXCH) *kex_stack = stack;
if (is_keyexch_fetchable(kex)
- && EVP_KEYEXCH_up_ref(kex)
- && sk_EVP_KEYEXCH_push(kex_stack, kex) <= 0)
+ && EVP_KEYEXCH_up_ref(kex)
+ && sk_EVP_KEYEXCH_push(kex_stack, kex) <= 0)
EVP_KEYEXCH_free(kex); /* up-ref successful but push to stack failed */
}
@@ -1063,7 +1061,7 @@ static void list_keyexchanges(void)
print_names(bio_out, names);
BIO_printf(bio_out, " @ %s\n",
- OSSL_PROVIDER_get0_name(EVP_KEYEXCH_get0_provider(k)));
+ OSSL_PROVIDER_get0_name(EVP_KEYEXCH_get0_provider(k)));
if (verbose) {
const char *desc = EVP_KEYEXCH_get0_description(k);
@@ -1071,9 +1069,9 @@ static void list_keyexchanges(void)
if (desc != NULL)
BIO_printf(bio_out, " description: %s\n", desc);
print_param_types("settable operation parameters",
- EVP_KEYEXCH_settable_ctx_params(k), 4);
+ EVP_KEYEXCH_settable_ctx_params(k), 4);
print_param_types("retrievable operation parameters",
- EVP_KEYEXCH_gettable_ctx_params(k), 4);
+ EVP_KEYEXCH_gettable_ctx_params(k), 4);
}
}
sk_OPENSSL_CSTRING_free(names);
@@ -1112,18 +1110,18 @@ static void list_objects(void)
continue;
}
if (n < 0)
- break; /* Error */
+ break; /* Error */
if (n > oid_size) {
oid_buf = OPENSSL_realloc(oid_buf, n + 1);
if (oid_buf == NULL) {
BIO_printf(bio_err, "ERROR: Memory allocation\n");
- break; /* Error */
+ break; /* Error */
}
oid_size = n + 1;
}
if (OBJ_obj2txt(oid_buf, oid_size, obj, 1) < 0)
- break; /* Error */
+ break; /* Error */
if (ln == NULL || strcmp(sn, ln) == 0)
BIO_printf(bio_out, "%s = %s\n", sn, oid_buf);
else
@@ -1143,23 +1141,23 @@ static void list_options_for_command(const char *command)
break;
if (fp->name == NULL) {
BIO_printf(bio_err, "Invalid command '%s'; type \"help\" for a list.\n",
- command);
+ command);
return;
}
if ((o = fp->help) == NULL)
return;
- for ( ; o->name != NULL; o++) {
+ for (; o->name != NULL; o++) {
char c = o->valtype;
if (o->name == OPT_PARAM_STR)
break;
if (o->name == OPT_HELP_STR
- || o->name == OPT_MORE_STR
- || o->name == OPT_SECTION_STR
- || o->name[0] == '\0')
+ || o->name == OPT_MORE_STR
+ || o->name == OPT_SECTION_STR
+ || o->name[0] == '\0')
continue;
BIO_printf(bio_out, "%s %c\n", o->name, c == '\0' ? '-' : c);
}
@@ -1252,16 +1250,15 @@ static void list_pkey(void)
const char *pinfo, *pem_str;
ameth = EVP_PKEY_asn1_get0(i);
EVP_PKEY_asn1_get0_info(&pkey_id, &pkey_base_id, &pkey_flags,
- &pinfo, &pem_str, ameth);
+ &pinfo, &pem_str, ameth);
if (pkey_flags & ASN1_PKEY_ALIAS) {
BIO_printf(bio_out, " Name: %s\n", OBJ_nid2ln(pkey_id));
BIO_printf(bio_out, "\tAlias for: %s\n",
- OBJ_nid2ln(pkey_base_id));
+ OBJ_nid2ln(pkey_base_id));
} else {
BIO_printf(bio_out, " Name: %s\n", pinfo);
BIO_printf(bio_out, "\tType: %s Algorithm\n",
- pkey_flags & ASN1_PKEY_DYNAMIC ?
- "External" : "Builtin");
+ pkey_flags & ASN1_PKEY_DYNAMIC ? "External" : "Builtin");
BIO_printf(bio_out, "\tOID: %s\n", OBJ_nid2ln(pkey_id));
if (pem_str == NULL)
pem_str = "(none)";
@@ -1290,7 +1287,7 @@ static void list_pkey_meth(void)
EVP_PKEY_meth_get0_info(&pkey_id, &pkey_flags, pmeth);
BIO_printf(bio_out, " %s\n", OBJ_nid2ln(pkey_id));
BIO_printf(bio_out, "\tType: %s Algorithm\n",
- pkey_flags & ASN1_PKEY_DYNAMIC ? "External" : "Builtin");
+ pkey_flags & ASN1_PKEY_DYNAMIC ? "External" : "Builtin");
}
}
#endif
@@ -1306,11 +1303,11 @@ static void list_pkey_meth(void)
}
DEFINE_STACK_OF(OSSL_STORE_LOADER)
-static int store_cmp(const OSSL_STORE_LOADER * const *a,
- const OSSL_STORE_LOADER * const *b)
+static int store_cmp(const OSSL_STORE_LOADER *const *a,
+ const OSSL_STORE_LOADER *const *b)
{
return strcmp(OSSL_PROVIDER_get0_name(OSSL_STORE_LOADER_get0_provider(*a)),
- OSSL_PROVIDER_get0_name(OSSL_STORE_LOADER_get0_provider(*b)));
+ OSSL_PROVIDER_get0_name(OSSL_STORE_LOADER_get0_provider(*b)));
}
static void collect_store_loaders(OSSL_STORE_LOADER *store, void *stack)
@@ -1318,7 +1315,7 @@ static void collect_store_loaders(OSSL_STORE_LOADER *store, void *stack)
STACK_OF(OSSL_STORE_LOADER) *store_stack = stack;
if (OSSL_STORE_LOADER_up_ref(store)
- && sk_OSSL_STORE_LOADER_push(store_stack, store) <= 0)
+ && sk_OSSL_STORE_LOADER_push(store_stack, store) <= 0)
OSSL_STORE_LOADER_free(store); /* up-ref successful but push to stack failed */
}
@@ -1333,7 +1330,7 @@ static void list_store_loaders(void)
}
BIO_printf(bio_out, "Provided STORE LOADERs:\n");
OSSL_STORE_LOADER_do_all_provided(app_get0_libctx(), collect_store_loaders,
- stores);
+ stores);
sk_OSSL_STORE_LOADER_sort(stores);
for (i = 0; i < sk_OSSL_STORE_LOADER_num(stores); i++) {
const OSSL_STORE_LOADER *l = sk_OSSL_STORE_LOADER_value(stores, i);
@@ -1343,13 +1340,12 @@ static void list_store_loaders(void)
continue;
names = sk_OPENSSL_CSTRING_new(name_cmp);
- if (names != NULL && OSSL_STORE_LOADER_names_do_all(l, collect_names,
- names)) {
+ if (names != NULL && OSSL_STORE_LOADER_names_do_all(l, collect_names, names)) {
BIO_printf(bio_out, " ");
print_names(bio_out, names);
BIO_printf(bio_out, " @ %s\n",
- OSSL_PROVIDER_get0_name(OSSL_STORE_LOADER_get0_provider(l)));
+ OSSL_PROVIDER_get0_name(OSSL_STORE_LOADER_get0_provider(l)));
if (verbose) {
const char *desc = OSSL_STORE_LOADER_get0_description(l);
@@ -1357,7 +1353,7 @@ static void list_store_loaders(void)
if (desc != NULL)
BIO_printf(bio_out, " description: %s\n", desc);
print_param_types("settable operation parameters",
- OSSL_STORE_LOADER_settable_ctx_params(l), 4);
+ OSSL_STORE_LOADER_settable_ctx_params(l), 4);
}
}
sk_OPENSSL_CSTRING_free(names);
@@ -1366,8 +1362,8 @@ static void list_store_loaders(void)
}
DEFINE_STACK_OF(OSSL_PROVIDER)
-static int provider_cmp(const OSSL_PROVIDER * const *a,
- const OSSL_PROVIDER * const *b)
+static int provider_cmp(const OSSL_PROVIDER *const *a,
+ const OSSL_PROVIDER *const *b)
{
return strcmp(OSSL_PROVIDER_get0_name(*a), OSSL_PROVIDER_get0_name(*b));
}
@@ -1412,18 +1408,18 @@ static void list_provider_info(void)
/* Query the "known" information parameters, the order matches below */
params[0] = OSSL_PARAM_construct_utf8_ptr(OSSL_PROV_PARAM_NAME,
- &name, 0);
+ &name, 0);
params[1] = OSSL_PARAM_construct_utf8_ptr(OSSL_PROV_PARAM_VERSION,
- &version, 0);
+ &version, 0);
params[2] = OSSL_PARAM_construct_int(OSSL_PROV_PARAM_STATUS, &status);
params[3] = OSSL_PARAM_construct_utf8_ptr(OSSL_PROV_PARAM_BUILDINFO,
- &buildinfo, 0);
+ &buildinfo, 0);
params[4] = OSSL_PARAM_construct_end();
OSSL_PARAM_set_all_unmodified(params);
if (!OSSL_PROVIDER_get_params(prov, params)) {
BIO_printf(bio_err,
- "WARNING: Unable to query provider parameters for %s\n",
- provname);
+ "WARNING: Unable to query provider parameters for %s\n",
+ provname);
} else {
/* Print out the provider information, the params order matches above */
if (OSSL_PARAM_modified(params))
@@ -1436,7 +1432,7 @@ static void list_provider_info(void)
if (OSSL_PARAM_modified(params + 3))
BIO_printf(bio_out, " build info: %s\n", buildinfo);
print_param_types("gettable provider parameters",
- OSSL_PROVIDER_gettable_params(prov), 4);
+ OSSL_PROVIDER_gettable_params(prov), 4);
}
}
}
@@ -1598,26 +1594,44 @@ static void list_disabled(void)
/* Unified enum for help and list commands. */
typedef enum HELPLIST_CHOICE {
OPT_COMMON,
- OPT_ONE, OPT_VERBOSE,
+ OPT_ONE,
+ OPT_VERBOSE,
OPT_ALL_ARGORITHMS,
- OPT_COMMANDS, OPT_DIGEST_COMMANDS, OPT_MAC_ALGORITHMS, OPT_OPTIONS,
- OPT_DIGEST_ALGORITHMS, OPT_CIPHER_COMMANDS, OPT_CIPHER_ALGORITHMS,
- OPT_PK_ALGORITHMS, OPT_PK_METHOD, OPT_DISABLED,
- OPT_KDF_ALGORITHMS, OPT_RANDOM_INSTANCES, OPT_RANDOM_GENERATORS,
- OPT_ENCODERS, OPT_DECODERS, OPT_KEYMANAGERS, OPT_KEYEXCHANGE_ALGORITHMS,
+ OPT_COMMANDS,
+ OPT_DIGEST_COMMANDS,
+ OPT_MAC_ALGORITHMS,
+ OPT_OPTIONS,
+ OPT_DIGEST_ALGORITHMS,
+ OPT_CIPHER_COMMANDS,
+ OPT_CIPHER_ALGORITHMS,
+ OPT_PK_ALGORITHMS,
+ OPT_PK_METHOD,
+ OPT_DISABLED,
+ OPT_KDF_ALGORITHMS,
+ OPT_RANDOM_INSTANCES,
+ OPT_RANDOM_GENERATORS,
+ OPT_ENCODERS,
+ OPT_DECODERS,
+ OPT_KEYMANAGERS,
+ OPT_KEYEXCHANGE_ALGORITHMS,
OPT_SKEYMANAGERS,
- OPT_KEM_ALGORITHMS, OPT_SIGNATURE_ALGORITHMS,
- OPT_TLS_SIGNATURE_ALGORITHMS, OPT_ASYM_CIPHER_ALGORITHMS,
- OPT_STORE_LOADERS, OPT_PROVIDER_INFO, OPT_OBJECTS,
+ OPT_KEM_ALGORITHMS,
+ OPT_SIGNATURE_ALGORITHMS,
+ OPT_TLS_SIGNATURE_ALGORITHMS,
+ OPT_ASYM_CIPHER_ALGORITHMS,
+ OPT_STORE_LOADERS,
+ OPT_PROVIDER_INFO,
+ OPT_OBJECTS,
OPT_SELECT_NAME,
#if !defined(OPENSSL_NO_TLS1_3) || !defined(OPENSSL_NO_TLS1_2)
- OPT_ALL_TLS_GROUPS, OPT_TLS_GROUPS,
-# if !defined(OPENSSL_NO_TLS1_2)
+ OPT_ALL_TLS_GROUPS,
+ OPT_TLS_GROUPS,
+#if !defined(OPENSSL_NO_TLS1_2)
OPT_TLS1_2,
-# endif
-# if !defined(OPENSSL_NO_TLS1_3)
+#endif
+#if !defined(OPENSSL_NO_TLS1_3)
OPT_TLS1_3,
-# endif
+#endif
#endif
OPT_PROV_ENUM
} HELPLIST_CHOICE;
@@ -1625,79 +1639,79 @@ typedef enum HELPLIST_CHOICE {
const OPTIONS list_options[] = {
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
+ { "help", OPT_HELP, '-', "Display this summary" },
OPT_SECTION("Output"),
- {"1", OPT_ONE, '-', "List in one column"},
- {"verbose", OPT_VERBOSE, '-', "Verbose listing"},
- {"select", OPT_SELECT_NAME, 's', "Select a single algorithm"},
- {"commands", OPT_COMMANDS, '-', "List of standard commands"},
- {"standard-commands", OPT_COMMANDS, '-', "List of standard commands"},
- {"all-algorithms", OPT_ALL_ARGORITHMS, '-', "List of all algorithms"},
+ { "1", OPT_ONE, '-', "List in one column" },
+ { "verbose", OPT_VERBOSE, '-', "Verbose listing" },
+ { "select", OPT_SELECT_NAME, 's', "Select a single algorithm" },
+ { "commands", OPT_COMMANDS, '-', "List of standard commands" },
+ { "standard-commands", OPT_COMMANDS, '-', "List of standard commands" },
+ { "all-algorithms", OPT_ALL_ARGORITHMS, '-', "List of all algorithms" },
#ifndef OPENSSL_NO_DEPRECATED_3_0
- {"digest-commands", OPT_DIGEST_COMMANDS, '-',
- "List of message digest commands (deprecated)"},
-#endif
- {"digest-algorithms", OPT_DIGEST_ALGORITHMS, '-',
- "List of message digest algorithms"},
- {"kdf-algorithms", OPT_KDF_ALGORITHMS, '-',
- "List of key derivation and pseudo random function algorithms"},
- {"random-instances", OPT_RANDOM_INSTANCES, '-',
- "List the primary, public and private random number generator details"},
- {"random-generators", OPT_RANDOM_GENERATORS, '-',
- "List of random number generators"},
- {"mac-algorithms", OPT_MAC_ALGORITHMS, '-',
- "List of message authentication code algorithms"},
+ { "digest-commands", OPT_DIGEST_COMMANDS, '-',
+ "List of message digest commands (deprecated)" },
+#endif
+ { "digest-algorithms", OPT_DIGEST_ALGORITHMS, '-',
+ "List of message digest algorithms" },
+ { "kdf-algorithms", OPT_KDF_ALGORITHMS, '-',
+ "List of key derivation and pseudo random function algorithms" },
+ { "random-instances", OPT_RANDOM_INSTANCES, '-',
+ "List the primary, public and private random number generator details" },
+ { "random-generators", OPT_RANDOM_GENERATORS, '-',
+ "List of random number generators" },
+ { "mac-algorithms", OPT_MAC_ALGORITHMS, '-',
+ "List of message authentication code algorithms" },
#ifndef OPENSSL_NO_DEPRECATED_3_0
- {"cipher-commands", OPT_CIPHER_COMMANDS, '-',
- "List of cipher commands (deprecated)"},
-#endif
- {"cipher-algorithms", OPT_CIPHER_ALGORITHMS, '-',
- "List of symmetric cipher algorithms"},
- {"encoders", OPT_ENCODERS, '-', "List of encoding methods" },
- {"decoders", OPT_DECODERS, '-', "List of decoding methods" },
- {"key-managers", OPT_KEYMANAGERS, '-', "List of key managers" },
- {"skey-managers", OPT_SKEYMANAGERS, '-', "List of symmetric key managers" },
- {"key-exchange-algorithms", OPT_KEYEXCHANGE_ALGORITHMS, '-',
- "List of key exchange algorithms" },
- {"kem-algorithms", OPT_KEM_ALGORITHMS, '-',
- "List of key encapsulation mechanism algorithms" },
- {"signature-algorithms", OPT_SIGNATURE_ALGORITHMS, '-',
- "List of signature algorithms" },
- {"tls-signature-algorithms", OPT_TLS_SIGNATURE_ALGORITHMS, '-',
- "List of TLS signature algorithms" },
- {"asymcipher-algorithms", OPT_ASYM_CIPHER_ALGORITHMS, '-',
- "List of asymmetric cipher algorithms" },
- {"public-key-algorithms", OPT_PK_ALGORITHMS, '-',
- "List of public key algorithms"},
- {"public-key-methods", OPT_PK_METHOD, '-',
- "List of public key methods"},
- {"store-loaders", OPT_STORE_LOADERS, '-',
- "List of store loaders"},
+ { "cipher-commands", OPT_CIPHER_COMMANDS, '-',
+ "List of cipher commands (deprecated)" },
+#endif
+ { "cipher-algorithms", OPT_CIPHER_ALGORITHMS, '-',
+ "List of symmetric cipher algorithms" },
+ { "encoders", OPT_ENCODERS, '-', "List of encoding methods" },
+ { "decoders", OPT_DECODERS, '-', "List of decoding methods" },
+ { "key-managers", OPT_KEYMANAGERS, '-', "List of key managers" },
+ { "skey-managers", OPT_SKEYMANAGERS, '-', "List of symmetric key managers" },
+ { "key-exchange-algorithms", OPT_KEYEXCHANGE_ALGORITHMS, '-',
+ "List of key exchange algorithms" },
+ { "kem-algorithms", OPT_KEM_ALGORITHMS, '-',
+ "List of key encapsulation mechanism algorithms" },
+ { "signature-algorithms", OPT_SIGNATURE_ALGORITHMS, '-',
+ "List of signature algorithms" },
+ { "tls-signature-algorithms", OPT_TLS_SIGNATURE_ALGORITHMS, '-',
+ "List of TLS signature algorithms" },
+ { "asymcipher-algorithms", OPT_ASYM_CIPHER_ALGORITHMS, '-',
+ "List of asymmetric cipher algorithms" },
+ { "public-key-algorithms", OPT_PK_ALGORITHMS, '-',
+ "List of public key algorithms" },
+ { "public-key-methods", OPT_PK_METHOD, '-',
+ "List of public key methods" },
+ { "store-loaders", OPT_STORE_LOADERS, '-',
+ "List of store loaders" },
#if !defined(OPENSSL_NO_TLS1_2) || !defined(OPENSSL_NO_TLS1_3)
- {"tls-groups", OPT_TLS_GROUPS, '-',
- "List implemented TLS key exchange 'groups'" },
- {"all-tls-groups", OPT_ALL_TLS_GROUPS, '-',
- "List implemented TLS key exchange 'groups' and all aliases" },
-# ifndef OPENSSL_NO_TLS1_2
- {"tls1_2", OPT_TLS1_2, '-',
- "When listing 'groups', list those compatible with TLS1.2"},
-# endif
-# ifndef OPENSSL_NO_TLS1_3
- {"tls1_3", OPT_TLS1_3, '-',
- "When listing 'groups', list those compatible with TLS1.3"},
-# endif
-#endif
- {"providers", OPT_PROVIDER_INFO, '-',
- "List of provider information"},
- {"disabled", OPT_DISABLED, '-', "List of disabled features"},
- {"options", OPT_OPTIONS, 's',
- "List options for specified command"},
- {"objects", OPT_OBJECTS, '-',
- "List built in objects (OID<->name mappings)"},
+ { "tls-groups", OPT_TLS_GROUPS, '-',
+ "List implemented TLS key exchange 'groups'" },
+ { "all-tls-groups", OPT_ALL_TLS_GROUPS, '-',
+ "List implemented TLS key exchange 'groups' and all aliases" },
+#ifndef OPENSSL_NO_TLS1_2
+ { "tls1_2", OPT_TLS1_2, '-',
+ "When listing 'groups', list those compatible with TLS1.2" },
+#endif
+#ifndef OPENSSL_NO_TLS1_3
+ { "tls1_3", OPT_TLS1_3, '-',
+ "When listing 'groups', list those compatible with TLS1.3" },
+#endif
+#endif
+ { "providers", OPT_PROVIDER_INFO, '-',
+ "List of provider information" },
+ { "disabled", OPT_DISABLED, '-', "List of disabled features" },
+ { "options", OPT_OPTIONS, 's',
+ "List options for specified command" },
+ { "objects", OPT_OBJECTS, '-',
+ "List built in objects (OID<->name mappings)" },
OPT_PROV_OPTIONS,
- {NULL}
+ { NULL }
};
int list_main(int argc, char **argv)
@@ -1708,50 +1722,52 @@ int list_main(int argc, char **argv)
int print_newline = 0;
#if !defined(OPENSSL_NO_TLS1_3) || !defined(OPENSSL_NO_TLS1_2)
int all_tls_groups = 0;
-# if !defined(OPENSSL_NO_TLS1_3)
+#if !defined(OPENSSL_NO_TLS1_3)
unsigned int tls_version = TLS1_3_VERSION;
-# else
+#else
unsigned int tls_version = TLS1_2_VERSION;
-# endif
+#endif
#endif
struct {
- unsigned int commands:1;
- unsigned int all_algorithms:1;
- unsigned int random_instances:1;
- unsigned int random_generators:1;
- unsigned int digest_commands:1;
- unsigned int digest_algorithms:1;
- unsigned int kdf_algorithms:1;
- unsigned int mac_algorithms:1;
- unsigned int cipher_commands:1;
- unsigned int cipher_algorithms:1;
- unsigned int encoder_algorithms:1;
- unsigned int decoder_algorithms:1;
- unsigned int keymanager_algorithms:1;
- unsigned int skeymanager_algorithms:1;
- unsigned int signature_algorithms:1;
- unsigned int tls_signature_algorithms:1;
- unsigned int keyexchange_algorithms:1;
- unsigned int kem_algorithms:1;
- unsigned int tls_groups:1;
- unsigned int asym_cipher_algorithms:1;
- unsigned int pk_algorithms:1;
- unsigned int pk_method:1;
- unsigned int store_loaders:1;
- unsigned int provider_info:1;
- unsigned int disabled:1;
- unsigned int objects:1;
- unsigned int options:1;
- } todo = { 0, };
-
- verbose = 0; /* Clear a possible previous call */
+ unsigned int commands : 1;
+ unsigned int all_algorithms : 1;
+ unsigned int random_instances : 1;
+ unsigned int random_generators : 1;
+ unsigned int digest_commands : 1;
+ unsigned int digest_algorithms : 1;
+ unsigned int kdf_algorithms : 1;
+ unsigned int mac_algorithms : 1;
+ unsigned int cipher_commands : 1;
+ unsigned int cipher_algorithms : 1;
+ unsigned int encoder_algorithms : 1;
+ unsigned int decoder_algorithms : 1;
+ unsigned int keymanager_algorithms : 1;
+ unsigned int skeymanager_algorithms : 1;
+ unsigned int signature_algorithms : 1;
+ unsigned int tls_signature_algorithms : 1;
+ unsigned int keyexchange_algorithms : 1;
+ unsigned int kem_algorithms : 1;
+ unsigned int tls_groups : 1;
+ unsigned int asym_cipher_algorithms : 1;
+ unsigned int pk_algorithms : 1;
+ unsigned int pk_method : 1;
+ unsigned int store_loaders : 1;
+ unsigned int provider_info : 1;
+ unsigned int disabled : 1;
+ unsigned int objects : 1;
+ unsigned int options : 1;
+ } todo = {
+ 0,
+ };
+
+ verbose = 0; /* Clear a possible previous call */
prog = opt_init(argc, argv, list_options);
while ((o = opt_next()) != OPT_EOF) {
switch (o) {
- case OPT_EOF: /* Never hit, but suppresses warning */
+ case OPT_EOF: /* Never hit, but suppresses warning */
case OPT_ERR:
-opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
return 1;
case OPT_HELP:
@@ -1822,16 +1838,16 @@ opthelp:
all_tls_groups = 1;
todo.tls_groups = 1;
break;
-# if !defined(OPENSSL_NO_TLS1_2)
+#if !defined(OPENSSL_NO_TLS1_2)
case OPT_TLS1_2:
tls_version = TLS1_2_VERSION;
break;
-# endif
-# if !defined(OPENSSL_NO_TLS1_3)
+#endif
+#if !defined(OPENSSL_NO_TLS1_3)
case OPT_TLS1_3:
tls_version = TLS1_3_VERSION;
break;
-# endif
+#endif
#endif
case OPT_ASYM_CIPHER_ALGORITHMS:
todo.asym_cipher_algorithms = 1;
@@ -1875,12 +1891,12 @@ opthelp:
if (!opt_check_rest_arg(NULL))
goto opthelp;
-#define MAYBE_ADD_NL(cmd) \
- do { \
- if (print_newline++) { \
+#define MAYBE_ADD_NL(cmd) \
+ do { \
+ if (print_newline++) { \
BIO_printf(bio_out, "\n"); \
- } \
- cmd; \
+ } \
+ cmd; \
} while (0)
if (todo.commands)
diff --git a/apps/mac.c b/apps/mac.c
index 8a0ad3786a..d67c573054 100644
--- a/apps/mac.c
+++ b/apps/mac.c
@@ -18,42 +18,46 @@
#include <openssl/core_names.h>
#undef BUFSIZE
-#define BUFSIZE 1024*8
+#define BUFSIZE 1024 * 8
typedef enum OPTION_choice {
OPT_COMMON,
- OPT_MACOPT, OPT_BIN, OPT_IN, OPT_OUT,
- OPT_CIPHER, OPT_DIGEST,
+ OPT_MACOPT,
+ OPT_BIN,
+ OPT_IN,
+ OPT_OUT,
+ OPT_CIPHER,
+ OPT_DIGEST,
OPT_PROV_ENUM
} OPTION_CHOICE;
const OPTIONS mac_options[] = {
- {OPT_HELP_STR, 1, '-', "Usage: %s [options] mac_name\n"},
+ { OPT_HELP_STR, 1, '-', "Usage: %s [options] mac_name\n" },
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
- {"macopt", OPT_MACOPT, 's', "MAC algorithm parameters in n:v form"},
- {"cipher", OPT_CIPHER, 's', "Cipher"},
- {"digest", OPT_DIGEST, 's', "Digest"},
- {OPT_MORE_STR, 1, '-', "See 'PARAMETER NAMES' in the EVP_MAC_ docs"},
+ { "help", OPT_HELP, '-', "Display this summary" },
+ { "macopt", OPT_MACOPT, 's', "MAC algorithm parameters in n:v form" },
+ { "cipher", OPT_CIPHER, 's', "Cipher" },
+ { "digest", OPT_DIGEST, 's', "Digest" },
+ { OPT_MORE_STR, 1, '-', "See 'PARAMETER NAMES' in the EVP_MAC_ docs" },
OPT_SECTION("Input"),
- {"in", OPT_IN, '<', "Input file to MAC (default is stdin)"},
+ { "in", OPT_IN, '<', "Input file to MAC (default is stdin)" },
OPT_SECTION("Output"),
- {"out", OPT_OUT, '>', "Output to filename rather than stdout"},
- {"binary", OPT_BIN, '-',
- "Output in binary format (default is hexadecimal)"},
+ { "out", OPT_OUT, '>', "Output to filename rather than stdout" },
+ { "binary", OPT_BIN, '-',
+ "Output in binary format (default is hexadecimal)" },
OPT_PROV_OPTIONS,
OPT_PARAMETERS(),
- {"mac_name", 0, 0, "MAC algorithm"},
- {NULL}
+ { "mac_name", 0, 0, "MAC algorithm" },
+ { NULL }
};
static char *alloc_mac_algorithm_name(STACK_OF(OPENSSL_STRING) **optp,
- const char *name, const char *arg)
+ const char *name, const char *arg)
{
size_t len = strlen(name) + strlen(arg) + 2;
char *res;
@@ -96,7 +100,7 @@ int mac_main(int argc, char **argv)
while ((o = opt_next()) != OPT_EOF) {
switch (o) {
default:
-opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto err;
case OPT_HELP:
@@ -163,7 +167,7 @@ opthelp:
int ok = 1;
params = app_params_new_from_opts(opts,
- EVP_MAC_settable_ctx_params(mac));
+ EVP_MAC_settable_ctx_params(mac));
if (params == NULL)
goto err;
diff --git a/apps/nseq.c b/apps/nseq.c
index e66b58d957..58b830b031 100644
--- a/apps/nseq.c
+++ b/apps/nseq.c
@@ -16,23 +16,25 @@
typedef enum OPTION_choice {
OPT_COMMON,
- OPT_TOSEQ, OPT_IN, OPT_OUT,
+ OPT_TOSEQ,
+ OPT_IN,
+ OPT_OUT,
OPT_PROV_ENUM
} OPTION_CHOICE;
const OPTIONS nseq_options[] = {
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
+ { "help", OPT_HELP, '-', "Display this summary" },
OPT_SECTION("Input"),
- {"in", OPT_IN, '<', "Input file"},
+ { "in", OPT_IN, '<', "Input file" },
OPT_SECTION("Output"),
- {"toseq", OPT_TOSEQ, '-', "Output NS Sequence file"},
- {"out", OPT_OUT, '>', "Output file"},
+ { "toseq", OPT_TOSEQ, '-', "Output NS Sequence file" },
+ { "out", OPT_OUT, '>', "Output file" },
OPT_PROV_OPTIONS,
- {NULL}
+ { NULL }
};
int nseq_main(int argc, char **argv)
@@ -49,7 +51,7 @@ int nseq_main(int argc, char **argv)
switch (o) {
case OPT_EOF:
case OPT_ERR:
- opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
case OPT_HELP:
@@ -97,7 +99,7 @@ int nseq_main(int argc, char **argv)
if (!sk_X509_num(seq->certs)) {
BIO_printf(bio_err, "%s: Error reading certs file %s\n",
- prog, infile);
+ prog, infile);
ERR_print_errors(bio_err);
goto end;
}
@@ -109,7 +111,7 @@ int nseq_main(int argc, char **argv)
seq = PEM_read_bio_NETSCAPE_CERT_SEQUENCE(in, NULL, NULL, NULL);
if (seq == NULL) {
BIO_printf(bio_err, "%s: Error reading sequence file %s\n",
- prog, infile);
+ prog, infile);
ERR_print_errors(bio_err);
goto end;
}
@@ -120,7 +122,7 @@ int nseq_main(int argc, char **argv)
PEM_write_bio_X509(out, x509);
}
ret = 0;
- end:
+end:
BIO_free(in);
BIO_free_all(out);
NETSCAPE_CERT_SEQUENCE_free(seq);
diff --git a/apps/ocsp.c b/apps/ocsp.c
index e187582152..9c55fecd4f 100644
--- a/apps/ocsp.c
+++ b/apps/ocsp.c
@@ -10,8 +10,8 @@
#include <openssl/opensslconf.h>
#ifdef OPENSSL_SYS_VMS
- /* So fd_set and friends get properly defined on OpenVMS */
-# define _XOPEN_SOURCE_EXTENDED
+/* So fd_set and friends get properly defined on OpenVMS */
+#define _XOPEN_SOURCE_EXTENDED
#endif
#include <stdio.h>
@@ -44,33 +44,33 @@ int setpgid(pid_t pid, pid_t pgid)
pid_t fork(void)
{
errno = ENOSYS;
- return (pid_t) -1;
+ return (pid_t)-1;
}
#endif
/* Maximum leeway in validity period: default 5 minutes */
-#define MAX_VALIDITY_PERIOD (5 * 60)
+#define MAX_VALIDITY_PERIOD (5 * 60)
static int add_ocsp_cert(OCSP_REQUEST **req, X509 *cert,
- const EVP_MD *cert_id_md, X509 *issuer,
- STACK_OF(OCSP_CERTID) *ids);
+ const EVP_MD *cert_id_md, X509 *issuer,
+ STACK_OF(OCSP_CERTID) *ids);
static int add_ocsp_serial(OCSP_REQUEST **req, char *serial,
- const EVP_MD *cert_id_md, X509 *issuer,
- STACK_OF(OCSP_CERTID) *ids);
+ const EVP_MD *cert_id_md, X509 *issuer,
+ STACK_OF(OCSP_CERTID) *ids);
static int print_ocsp_summary(BIO *out, OCSP_BASICRESP *bs, OCSP_REQUEST *req,
- STACK_OF(OPENSSL_STRING) *names,
- STACK_OF(OCSP_CERTID) *ids, long nsec,
- long maxage);
+ STACK_OF(OPENSSL_STRING) *names,
+ STACK_OF(OCSP_CERTID) *ids, long nsec,
+ long maxage);
static void make_ocsp_response(BIO *err, OCSP_RESPONSE **resp, OCSP_REQUEST *req,
- CA_DB *db, STACK_OF(X509) *ca, X509 *rcert,
- EVP_PKEY *rkey, const EVP_MD *md,
- STACK_OF(OPENSSL_STRING) *sigopts,
- STACK_OF(X509) *rother, unsigned long flags,
- int nmin, int ndays, int badsig,
- const EVP_MD *resp_md);
+ CA_DB *db, STACK_OF(X509) *ca, X509 *rcert,
+ EVP_PKEY *rkey, const EVP_MD *md,
+ STACK_OF(OPENSSL_STRING) *sigopts,
+ STACK_OF(X509) *rother, unsigned long flags,
+ int nmin, int ndays, int badsig,
+ const EVP_MD *resp_md);
static char **lookup_serial(CA_DB *db, ASN1_INTEGER *ser);
static int do_responder(OCSP_REQUEST **preq, BIO **pcbio, BIO *acbio,
- int timeout);
+ int timeout);
static int send_ocsp_response(BIO *cbio, const OCSP_RESPONSE *resp);
static char *prog;
@@ -80,131 +80,175 @@ static int index_changed(CA_DB *);
typedef enum OPTION_choice {
OPT_COMMON,
- OPT_OUTFILE, OPT_TIMEOUT, OPT_URL, OPT_HOST, OPT_PORT,
+ OPT_OUTFILE,
+ OPT_TIMEOUT,
+ OPT_URL,
+ OPT_HOST,
+ OPT_PORT,
#ifndef OPENSSL_NO_SOCK
- OPT_PROXY, OPT_NO_PROXY,
+ OPT_PROXY,
+ OPT_NO_PROXY,
#endif
- OPT_IGNORE_ERR, OPT_NOVERIFY, OPT_NONCE, OPT_NO_NONCE,
- OPT_RESP_NO_CERTS, OPT_RESP_KEY_ID, OPT_NO_CERTS,
- OPT_NO_SIGNATURE_VERIFY, OPT_NO_CERT_VERIFY, OPT_NO_CHAIN,
- OPT_NO_CERT_CHECKS, OPT_NO_EXPLICIT, OPT_TRUST_OTHER,
- OPT_NO_INTERN, OPT_BADSIG, OPT_TEXT, OPT_REQ_TEXT, OPT_RESP_TEXT,
- OPT_REQIN, OPT_RESPIN, OPT_SIGNER, OPT_VAFILE, OPT_SIGN_OTHER,
- OPT_VERIFY_OTHER, OPT_CAFILE, OPT_CAPATH, OPT_CASTORE, OPT_NOCAFILE,
- OPT_NOCAPATH, OPT_NOCASTORE,
- OPT_VALIDITY_PERIOD, OPT_STATUS_AGE, OPT_SIGNKEY, OPT_REQOUT,
- OPT_RESPOUT, OPT_PATH, OPT_ISSUER, OPT_CERT, OPT_SERIAL,
- OPT_INDEX, OPT_CA, OPT_NMIN, OPT_REQUEST, OPT_NDAYS, OPT_RSIGNER,
- OPT_RKEY, OPT_ROTHER, OPT_RMD, OPT_RSIGOPT, OPT_HEADER,
+ OPT_IGNORE_ERR,
+ OPT_NOVERIFY,
+ OPT_NONCE,
+ OPT_NO_NONCE,
+ OPT_RESP_NO_CERTS,
+ OPT_RESP_KEY_ID,
+ OPT_NO_CERTS,
+ OPT_NO_SIGNATURE_VERIFY,
+ OPT_NO_CERT_VERIFY,
+ OPT_NO_CHAIN,
+ OPT_NO_CERT_CHECKS,
+ OPT_NO_EXPLICIT,
+ OPT_TRUST_OTHER,
+ OPT_NO_INTERN,
+ OPT_BADSIG,
+ OPT_TEXT,
+ OPT_REQ_TEXT,
+ OPT_RESP_TEXT,
+ OPT_REQIN,
+ OPT_RESPIN,
+ OPT_SIGNER,
+ OPT_VAFILE,
+ OPT_SIGN_OTHER,
+ OPT_VERIFY_OTHER,
+ OPT_CAFILE,
+ OPT_CAPATH,
+ OPT_CASTORE,
+ OPT_NOCAFILE,
+ OPT_NOCAPATH,
+ OPT_NOCASTORE,
+ OPT_VALIDITY_PERIOD,
+ OPT_STATUS_AGE,
+ OPT_SIGNKEY,
+ OPT_REQOUT,
+ OPT_RESPOUT,
+ OPT_PATH,
+ OPT_ISSUER,
+ OPT_CERT,
+ OPT_SERIAL,
+ OPT_INDEX,
+ OPT_CA,
+ OPT_NMIN,
+ OPT_REQUEST,
+ OPT_NDAYS,
+ OPT_RSIGNER,
+ OPT_RKEY,
+ OPT_ROTHER,
+ OPT_RMD,
+ OPT_RSIGOPT,
+ OPT_HEADER,
OPT_PASSIN,
OPT_RCID,
OPT_V_ENUM,
OPT_MD,
- OPT_MULTI, OPT_PROV_ENUM
+ OPT_MULTI,
+ OPT_PROV_ENUM
} OPTION_CHOICE;
const OPTIONS ocsp_options[] = {
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
- {"ignore_err", OPT_IGNORE_ERR, '-',
- "Ignore error on OCSP request or response and continue running"},
- {"CAfile", OPT_CAFILE, '<', "Trusted certificates file"},
- {"CApath", OPT_CAPATH, '<', "Trusted certificates directory"},
- {"CAstore", OPT_CASTORE, ':', "Trusted certificates store URI"},
- {"no-CAfile", OPT_NOCAFILE, '-',
- "Do not load the default certificates file"},
- {"no-CApath", OPT_NOCAPATH, '-',
- "Do not load certificates from the default certificates directory"},
- {"no-CAstore", OPT_NOCASTORE, '-',
- "Do not load certificates from the default certificates store"},
+ { "help", OPT_HELP, '-', "Display this summary" },
+ { "ignore_err", OPT_IGNORE_ERR, '-',
+ "Ignore error on OCSP request or response and continue running" },
+ { "CAfile", OPT_CAFILE, '<', "Trusted certificates file" },
+ { "CApath", OPT_CAPATH, '<', "Trusted certificates directory" },
+ { "CAstore", OPT_CASTORE, ':', "Trusted certificates store URI" },
+ { "no-CAfile", OPT_NOCAFILE, '-',
+ "Do not load the default certificates file" },
+ { "no-CApath", OPT_NOCAPATH, '-',
+ "Do not load certificates from the default certificates directory" },
+ { "no-CAstore", OPT_NOCASTORE, '-',
+ "Do not load certificates from the default certificates store" },
OPT_SECTION("Responder"),
- {"timeout", OPT_TIMEOUT, 'p',
- "Connection timeout (in seconds) to the OCSP responder"},
- {"resp_no_certs", OPT_RESP_NO_CERTS, '-',
- "Don't include any certificates in response"},
+ { "timeout", OPT_TIMEOUT, 'p',
+ "Connection timeout (in seconds) to the OCSP responder" },
+ { "resp_no_certs", OPT_RESP_NO_CERTS, '-',
+ "Don't include any certificates in response" },
#ifdef HTTP_DAEMON
- {"multi", OPT_MULTI, 'p', "run multiple responder processes"},
+ { "multi", OPT_MULTI, 'p', "run multiple responder processes" },
#endif
- {"no_certs", OPT_NO_CERTS, '-',
- "Don't include any certificates in signed request"},
- {"badsig", OPT_BADSIG, '-',
- "Corrupt last byte of loaded OCSP response signature (for test)"},
- {"CA", OPT_CA, '<', "CA certificates"},
- {"nmin", OPT_NMIN, 'p', "Number of minutes before next update"},
- {"nrequest", OPT_REQUEST, 'p',
- "Number of requests to accept (default unlimited)"},
- {"reqin", OPT_REQIN, 's', "File with the DER-encoded request"},
- {"signer", OPT_SIGNER, '<', "Certificate to sign OCSP request with"},
- {"sign_other", OPT_SIGN_OTHER, '<',
- "Additional certificates to include in signed request"},
- {"index", OPT_INDEX, '<', "Certificate status index file"},
- {"ndays", OPT_NDAYS, 'p', "Number of days before next update"},
- {"rsigner", OPT_RSIGNER, '<',
- "Responder certificate to sign responses with"},
- {"rkey", OPT_RKEY, '<', "Responder key to sign responses with"},
- {"passin", OPT_PASSIN, 's', "Responder key pass phrase source"},
- {"rother", OPT_ROTHER, '<', "Other certificates to include in response"},
- {"rmd", OPT_RMD, 's', "Digest Algorithm to use in signature of OCSP response"},
- {"rsigopt", OPT_RSIGOPT, 's', "OCSP response signature parameter in n:v form"},
- {"header", OPT_HEADER, 's', "key=value header to add"},
- {"rcid", OPT_RCID, 's', "Use specified algorithm for cert id in response"},
- {"", OPT_MD, '-', "Any supported digest algorithm (sha1,sha256, ... )"},
+ { "no_certs", OPT_NO_CERTS, '-',
+ "Don't include any certificates in signed request" },
+ { "badsig", OPT_BADSIG, '-',
+ "Corrupt last byte of loaded OCSP response signature (for test)" },
+ { "CA", OPT_CA, '<', "CA certificates" },
+ { "nmin", OPT_NMIN, 'p', "Number of minutes before next update" },
+ { "nrequest", OPT_REQUEST, 'p',
+ "Number of requests to accept (default unlimited)" },
+ { "reqin", OPT_REQIN, 's', "File with the DER-encoded request" },
+ { "signer", OPT_SIGNER, '<', "Certificate to sign OCSP request with" },
+ { "sign_other", OPT_SIGN_OTHER, '<',
+ "Additional certificates to include in signed request" },
+ { "index", OPT_INDEX, '<', "Certificate status index file" },
+ { "ndays", OPT_NDAYS, 'p', "Number of days before next update" },
+ { "rsigner", OPT_RSIGNER, '<',
+ "Responder certificate to sign responses with" },
+ { "rkey", OPT_RKEY, '<', "Responder key to sign responses with" },
+ { "passin", OPT_PASSIN, 's', "Responder key pass phrase source" },
+ { "rother", OPT_ROTHER, '<', "Other certificates to include in response" },
+ { "rmd", OPT_RMD, 's', "Digest Algorithm to use in signature of OCSP response" },
+ { "rsigopt", OPT_RSIGOPT, 's', "OCSP response signature parameter in n:v form" },
+ { "header", OPT_HEADER, 's', "key=value header to add" },
+ { "rcid", OPT_RCID, 's', "Use specified algorithm for cert id in response" },
+ { "", OPT_MD, '-', "Any supported digest algorithm (sha1,sha256, ... )" },
OPT_SECTION("Client"),
- {"url", OPT_URL, 's', "Responder URL"},
- {"host", OPT_HOST, 's', "TCP/IP hostname:port to connect to"},
- {"port", OPT_PORT, 'N', "Port to run responder on"},
- {"path", OPT_PATH, 's', "Path to use in OCSP request"},
+ { "url", OPT_URL, 's', "Responder URL" },
+ { "host", OPT_HOST, 's', "TCP/IP hostname:port to connect to" },
+ { "port", OPT_PORT, 'N', "Port to run responder on" },
+ { "path", OPT_PATH, 's', "Path to use in OCSP request" },
#ifndef OPENSSL_NO_SOCK
- {"proxy", OPT_PROXY, 's',
- "[http[s]://]host[:port][/path] of HTTP(S) proxy to use; path is ignored"},
- {"no_proxy", OPT_NO_PROXY, 's',
- "List of addresses of servers not to use HTTP(S) proxy for"},
- {OPT_MORE_STR, 0, 0,
- "Default from environment variable 'no_proxy', else 'NO_PROXY', else none"},
+ { "proxy", OPT_PROXY, 's',
+ "[http[s]://]host[:port][/path] of HTTP(S) proxy to use; path is ignored" },
+ { "no_proxy", OPT_NO_PROXY, 's',
+ "List of addresses of servers not to use HTTP(S) proxy for" },
+ { OPT_MORE_STR, 0, 0,
+ "Default from environment variable 'no_proxy', else 'NO_PROXY', else none" },
#endif
- {"out", OPT_OUTFILE, '>', "Output filename"},
- {"noverify", OPT_NOVERIFY, '-', "Don't verify response at all"},
- {"nonce", OPT_NONCE, '-', "Add OCSP nonce to request"},
- {"no_nonce", OPT_NO_NONCE, '-', "Don't add OCSP nonce to request"},
- {"no_signature_verify", OPT_NO_SIGNATURE_VERIFY, '-',
- "Don't check signature on response"},
- {"resp_key_id", OPT_RESP_KEY_ID, '-',
- "Identify response by signing certificate key ID"},
- {"no_cert_verify", OPT_NO_CERT_VERIFY, '-',
- "Don't check signing certificate"},
- {"text", OPT_TEXT, '-', "Print text form of request and response"},
- {"req_text", OPT_REQ_TEXT, '-', "Print text form of request"},
- {"resp_text", OPT_RESP_TEXT, '-', "Print text form of response"},
- {"no_chain", OPT_NO_CHAIN, '-', "Don't chain verify response"},
- {"no_cert_checks", OPT_NO_CERT_CHECKS, '-',
- "Don't do additional checks on signing certificate"},
- {"no_explicit", OPT_NO_EXPLICIT, '-',
- "Do not explicitly check the chain, just verify the root"},
- {"trust_other", OPT_TRUST_OTHER, '-',
- "Don't verify additional certificates"},
- {"no_intern", OPT_NO_INTERN, '-',
- "Don't search certificates contained in response for signer"},
- {"respin", OPT_RESPIN, 's', "File with the DER-encoded response"},
- {"VAfile", OPT_VAFILE, '<', "Validator certificates file"},
- {"verify_other", OPT_VERIFY_OTHER, '<',
- "Additional certificates to search for signer"},
- {"cert", OPT_CERT, '<',
- "Certificate to check; may be given multiple times"},
- {"serial", OPT_SERIAL, 's',
- "Serial number to check; may be given multiple times"},
- {"validity_period", OPT_VALIDITY_PERIOD, 'u',
- "Maximum validity discrepancy in seconds"},
- {"signkey", OPT_SIGNKEY, 's', "Private key to sign OCSP request with"},
- {"reqout", OPT_REQOUT, 's', "Output file for the DER-encoded request"},
- {"respout", OPT_RESPOUT, 's', "Output file for the DER-encoded response"},
- {"issuer", OPT_ISSUER, '<', "Issuer certificate"},
- {"status_age", OPT_STATUS_AGE, 'p', "Maximum status age in seconds"},
+ { "out", OPT_OUTFILE, '>', "Output filename" },
+ { "noverify", OPT_NOVERIFY, '-', "Don't verify response at all" },
+ { "nonce", OPT_NONCE, '-', "Add OCSP nonce to request" },
+ { "no_nonce", OPT_NO_NONCE, '-', "Don't add OCSP nonce to request" },
+ { "no_signature_verify", OPT_NO_SIGNATURE_VERIFY, '-',
+ "Don't check signature on response" },
+ { "resp_key_id", OPT_RESP_KEY_ID, '-',
+ "Identify response by signing certificate key ID" },
+ { "no_cert_verify", OPT_NO_CERT_VERIFY, '-',
+ "Don't check signing certificate" },
+ { "text", OPT_TEXT, '-', "Print text form of request and response" },
+ { "req_text", OPT_REQ_TEXT, '-', "Print text form of request" },
+ { "resp_text", OPT_RESP_TEXT, '-', "Print text form of response" },
+ { "no_chain", OPT_NO_CHAIN, '-', "Don't chain verify response" },
+ { "no_cert_checks", OPT_NO_CERT_CHECKS, '-',
+ "Don't do additional checks on signing certificate" },
+ { "no_explicit", OPT_NO_EXPLICIT, '-',
+ "Do not explicitly check the chain, just verify the root" },
+ { "trust_other", OPT_TRUST_OTHER, '-',
+ "Don't verify additional certificates" },
+ { "no_intern", OPT_NO_INTERN, '-',
+ "Don't search certificates contained in response for signer" },
+ { "respin", OPT_RESPIN, 's', "File with the DER-encoded response" },
+ { "VAfile", OPT_VAFILE, '<', "Validator certificates file" },
+ { "verify_other", OPT_VERIFY_OTHER, '<',
+ "Additional certificates to search for signer" },
+ { "cert", OPT_CERT, '<',
+ "Certificate to check; may be given multiple times" },
+ { "serial", OPT_SERIAL, 's',
+ "Serial number to check; may be given multiple times" },
+ { "validity_period", OPT_VALIDITY_PERIOD, 'u',
+ "Maximum validity discrepancy in seconds" },
+ { "signkey", OPT_SIGNKEY, 's', "Private key to sign OCSP request with" },
+ { "reqout", OPT_REQOUT, 's', "Output file for the DER-encoded request" },
+ { "respout", OPT_RESPOUT, 's', "Output file for the DER-encoded response" },
+ { "issuer", OPT_ISSUER, '<', "Issuer certificate" },
+ { "status_age", OPT_STATUS_AGE, 'p', "Maximum status age in seconds" },
OPT_V_OPTIONS,
OPT_PROV_OPTIONS,
- {NULL}
+ { NULL }
};
int ocsp_main(int argc, char **argv)
@@ -253,8 +297,8 @@ int ocsp_main(int argc, char **argv)
OPTION_CHOICE o;
if ((reqnames = sk_OPENSSL_STRING_new_null()) == NULL
- || (ids = sk_OCSP_CERTID_new_null()) == NULL
- || (vpm = X509_VERIFY_PARAM_new()) == NULL)
+ || (ids = sk_OCSP_CERTID_new_null()) == NULL
+ || (vpm = X509_VERIFY_PARAM_new()) == NULL)
goto end;
opt_set_unknown_name("digest");
@@ -263,7 +307,7 @@ int ocsp_main(int argc, char **argv)
switch (o) {
case OPT_EOF:
case OPT_ERR:
- opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
case OPT_HELP:
@@ -284,8 +328,8 @@ int ocsp_main(int argc, char **argv)
OPENSSL_free(tpath);
thost = tport = tpath = NULL;
if (!OSSL_HTTP_parse_url(opt_arg(), &use_ssl, NULL /* userinfo */,
- &host, &port, NULL /* port_num */,
- &path, NULL /* qry */, NULL /* frag */)) {
+ &host, &port, NULL /* port_num */,
+ &path, NULL /* qry */, NULL /* frag */)) {
BIO_printf(bio_err, "%s Error parsing -url argument\n", prog);
goto end;
}
@@ -485,7 +529,7 @@ int ocsp_main(int argc, char **argv)
case OPT_ROTHER:
rcertfile = opt_arg();
break;
- case OPT_RMD: /* Response MessageDigest */
+ case OPT_RMD: /* Response MessageDigest */
respdigname = opt_arg();
break;
case OPT_RSIGOPT:
@@ -513,8 +557,8 @@ int ocsp_main(int argc, char **argv)
case OPT_MD:
if (trailing_md) {
BIO_printf(bio_err,
- "%s: Digest must be before -cert or -serial\n",
- prog);
+ "%s: Digest must be before -cert or -serial\n",
+ prog);
goto opthelp;
}
if (!opt_md(opt_unknown(), &cert_id_md))
@@ -539,7 +583,7 @@ int ocsp_main(int argc, char **argv)
if (trailing_md) {
BIO_printf(bio_err, "%s: Digest must be before -cert or -serial\n",
- prog);
+ prog);
goto opthelp;
}
@@ -591,7 +635,7 @@ int ocsp_main(int argc, char **argv)
goto end;
if (rcertfile != NULL) {
if (!load_certs(rcertfile, 0, &rother, NULL,
- "responder other certificates"))
+ "responder other certificates"))
goto end;
}
if (!app_passwd(passinarg, NULL, &passin, NULL)) {
@@ -599,7 +643,7 @@ int ocsp_main(int argc, char **argv)
goto end;
}
rkey = load_key(rkeyfile, FORMAT_UNDEF, 0, passin,
- "responder private key");
+ "responder private key");
if (rkey == NULL)
goto end;
}
@@ -607,7 +651,7 @@ int ocsp_main(int argc, char **argv)
if (ridx_filename != NULL
&& (rkey == NULL || rsigner == NULL || rca_certs == NULL)) {
BIO_printf(bio_err,
- "Responder mode requires certificate, key, and CA.\n");
+ "Responder mode requires certificate, key, and CA.\n");
goto end;
}
@@ -631,7 +675,7 @@ int ocsp_main(int argc, char **argv)
if (acbio != NULL)
trace_log_message(-1, prog,
- LOG_INFO, "waiting for OCSP client connections...");
+ LOG_INFO, "waiting for OCSP client connections...");
redo_accept:
@@ -646,8 +690,8 @@ redo_accept:
} else {
free_index(newrdb);
trace_log_message(-1, prog,
- LOG_ERR, "error reloading updated index: %s",
- ridx_filename);
+ LOG_ERR, "error reloading updated index: %s",
+ ridx_filename);
}
}
#endif
@@ -659,9 +703,8 @@ redo_accept:
if (req == NULL) {
if (res == 1) {
- resp =
- OCSP_response_create(OCSP_RESPONSE_STATUS_MALFORMEDREQUEST,
- NULL);
+ resp = OCSP_response_create(OCSP_RESPONSE_STATUS_MALFORMEDREQUEST,
+ NULL);
if (resp != NULL)
send_ocsp_response(cbio, resp);
}
@@ -691,16 +734,16 @@ redo_accept:
}
if (sign_certfile != NULL) {
if (!load_certs(sign_certfile, 0, &sign_other, NULL,
- "signer certificates"))
+ "signer certificates"))
goto end;
}
key = load_key(keyfile, FORMAT_UNDEF, 0, NULL,
- "signer private key");
+ "signer private key");
if (key == NULL)
goto end;
if (!OCSP_request_sign(req, signer, key, NULL,
- sign_other, sign_flags)) {
+ sign_other, sign_flags)) {
BIO_printf(bio_err, "Error signing OCSP request\n");
goto end;
}
@@ -723,8 +766,8 @@ redo_accept:
if (rdb != NULL) {
make_ocsp_response(bio_err, &resp, req, rdb, rca_certs, rsigner, rkey,
- rsign_md, rsign_sigopts, rother, rflags, nmin, ndays,
- badsig, resp_certid_md);
+ rsign_md, rsign_sigopts, rother, rflags, nmin, ndays,
+ badsig, resp_certid_md);
if (resp == NULL)
goto end;
if (cbio != NULL)
@@ -732,12 +775,12 @@ redo_accept:
} else if (host != NULL) {
#ifndef OPENSSL_NO_SOCK
resp = process_responder(req, host, port, path, opt_proxy, opt_no_proxy,
- use_ssl, headers, req_timeout);
+ use_ssl, headers, req_timeout);
if (resp == NULL)
goto end;
#else
BIO_printf(bio_err,
- "Error creating connect BIO - sockets not supported\n");
+ "Error creating connect BIO - sockets not supported\n");
goto end;
#endif
} else if (respin != NULL) {
@@ -755,7 +798,7 @@ redo_accept:
goto end;
}
- done_resp:
+done_resp:
if (respout != NULL) {
derbio = bio_open_default(respout, 'w', FORMAT_ASN1);
@@ -769,7 +812,7 @@ redo_accept:
i = OCSP_response_status(resp);
if (i != OCSP_RESPONSE_STATUS_SUCCESSFUL) {
BIO_printf(out, "Responder Error: %s (%d)\n",
- OCSP_response_status_str(i), i);
+ OCSP_response_status_str(i), i);
if (!ignore_err)
goto end;
}
@@ -800,7 +843,7 @@ redo_accept:
if (store == NULL) {
store = setup_verify(CAfile, noCAfile, CApath, noCApath,
- CAstore, noCAstore);
+ CAstore, noCAstore);
if (!store)
goto end;
}
@@ -808,7 +851,7 @@ redo_accept:
X509_STORE_set1_param(store, vpm);
if (verify_certfile != NULL) {
if (!load_certs(verify_certfile, 0, &verify_other, NULL,
- "validator certificates"))
+ "validator certificates"))
goto end;
}
@@ -849,7 +892,7 @@ redo_accept:
if (!print_ocsp_summary(out, bs, req, reqnames, ids, nsec, maxage))
ret = 1;
- end:
+end:
ERR_print_errors(bio_err);
X509_free(signer);
X509_STORE_free(store);
@@ -904,8 +947,8 @@ static int index_changed(CA_DB *rdb)
#endif
static int add_ocsp_cert(OCSP_REQUEST **req, X509 *cert,
- const EVP_MD *cert_id_md, X509 *issuer,
- STACK_OF(OCSP_CERTID) *ids)
+ const EVP_MD *cert_id_md, X509 *issuer,
+ STACK_OF(OCSP_CERTID) *ids)
{
OCSP_CERTID *id = NULL;
@@ -926,15 +969,15 @@ static int add_ocsp_cert(OCSP_REQUEST **req, X509 *cert,
}
return 1;
- err:
+err:
OCSP_CERTID_free(id);
BIO_printf(bio_err, "Error Creating OCSP request\n");
return 0;
}
static int add_ocsp_serial(OCSP_REQUEST **req, char *serial,
- const EVP_MD *cert_id_md, X509 *issuer,
- STACK_OF(OCSP_CERTID) *ids)
+ const EVP_MD *cert_id_md, X509 *issuer,
+ STACK_OF(OCSP_CERTID) *ids)
{
OCSP_CERTID *id = NULL;
const X509_NAME *iname;
@@ -966,16 +1009,16 @@ static int add_ocsp_serial(OCSP_REQUEST **req, char *serial,
}
return 1;
- err:
+err:
OCSP_CERTID_free(id);
BIO_printf(bio_err, "Error Creating OCSP request\n");
return 0;
}
static int print_ocsp_summary(BIO *out, OCSP_BASICRESP *bs, OCSP_REQUEST *req,
- STACK_OF(OPENSSL_STRING) *names,
- STACK_OF(OCSP_CERTID) *ids, long nsec,
- long maxage)
+ STACK_OF(OPENSSL_STRING) *names,
+ STACK_OF(OCSP_CERTID) *ids, long nsec,
+ long maxage)
{
OCSP_CERTID *id;
const char *name;
@@ -995,7 +1038,7 @@ static int print_ocsp_summary(BIO *out, OCSP_BASICRESP *bs, OCSP_REQUEST *req,
BIO_printf(out, "%s: ", name);
if (!OCSP_resp_find_status(bs, id, &status, &reason,
- &rev, &thisupd, &nextupd)) {
+ &rev, &thisupd, &nextupd)) {
BIO_puts(out, "ERROR: No Status found.\n");
ret = 0;
continue;
@@ -1035,12 +1078,12 @@ static int print_ocsp_summary(BIO *out, OCSP_BASICRESP *bs, OCSP_REQUEST *req,
}
static void make_ocsp_response(BIO *err, OCSP_RESPONSE **resp, OCSP_REQUEST *req,
- CA_DB *db, STACK_OF(X509) *ca, X509 *rcert,
- EVP_PKEY *rkey, const EVP_MD *rmd,
- STACK_OF(OPENSSL_STRING) *sigopts,
- STACK_OF(X509) *rother, unsigned long flags,
- int nmin, int ndays, int badsig,
- const EVP_MD *resp_md)
+ CA_DB *db, STACK_OF(X509) *ca, X509 *rcert,
+ EVP_PKEY *rkey, const EVP_MD *rmd,
+ STACK_OF(OPENSSL_STRING) *sigopts,
+ STACK_OF(X509) *rother, unsigned long flags,
+ int nmin, int ndays, int badsig,
+ const EVP_MD *resp_md)
{
ASN1_TIME *thisupd = NULL, *nextupd = NULL;
OCSP_CERTID *cid;
@@ -1052,8 +1095,7 @@ static void make_ocsp_response(BIO *err, OCSP_RESPONSE **resp, OCSP_REQUEST *req
id_count = OCSP_request_onereq_count(req);
if (id_count <= 0) {
- *resp =
- OCSP_response_create(OCSP_RESPONSE_STATUS_MALFORMEDREQUEST, NULL);
+ *resp = OCSP_response_create(OCSP_RESPONSE_STATUS_MALFORMEDREQUEST, NULL);
goto end;
}
@@ -1085,7 +1127,7 @@ static void make_ocsp_response(BIO *err, OCSP_RESPONSE **resp, OCSP_REQUEST *req
cert_id_md = EVP_get_digestbyobj(cert_id_md_oid);
if (cert_id_md == NULL) {
*resp = OCSP_response_create(OCSP_RESPONSE_STATUS_INTERNALERROR,
- NULL);
+ NULL);
goto end;
}
for (jj = 0; jj < sk_X509_num(ca) && !found; jj++) {
@@ -1107,18 +1149,18 @@ static void make_ocsp_response(BIO *err, OCSP_RESPONSE **resp, OCSP_REQUEST *req
if (!found) {
OCSP_basic_add1_status(bs, cid,
- V_OCSP_CERTSTATUS_UNKNOWN,
- 0, NULL, thisupd, nextupd);
+ V_OCSP_CERTSTATUS_UNKNOWN,
+ 0, NULL, thisupd, nextupd);
continue;
}
if (inf == NULL) {
OCSP_basic_add1_status(bs, cid,
- V_OCSP_CERTSTATUS_UNKNOWN,
- 0, NULL, thisupd, nextupd);
+ V_OCSP_CERTSTATUS_UNKNOWN,
+ 0, NULL, thisupd, nextupd);
} else if (inf[DB_type][0] == DB_TYPE_VAL) {
OCSP_basic_add1_status(bs, cid,
- V_OCSP_CERTSTATUS_GOOD,
- 0, NULL, thisupd, nextupd);
+ V_OCSP_CERTSTATUS_GOOD,
+ 0, NULL, thisupd, nextupd);
} else if (inf[DB_type][0] == DB_TYPE_REV) {
ASN1_OBJECT *inst = NULL;
ASN1_TIME *revtm = NULL;
@@ -1128,20 +1170,20 @@ static void make_ocsp_response(BIO *err, OCSP_RESPONSE **resp, OCSP_REQUEST *req
unpack_revinfo(&revtm, &reason, &inst, &invtm, inf[DB_rev_date]);
single = OCSP_basic_add1_status(bs, cid,
- V_OCSP_CERTSTATUS_REVOKED,
- reason, revtm, thisupd, nextupd);
+ V_OCSP_CERTSTATUS_REVOKED,
+ reason, revtm, thisupd, nextupd);
if (single == NULL) {
*resp = OCSP_response_create(OCSP_RESPONSE_STATUS_INTERNALERROR,
- NULL);
+ NULL);
goto end;
}
if (invtm != NULL)
OCSP_SINGLERESP_add1_ext_i2d(single, NID_invalidity_date,
- invtm, 0, 0);
+ invtm, 0, 0);
else if (inst != NULL)
OCSP_SINGLERESP_add1_ext_i2d(single,
- NID_hold_instruction_code, inst,
- 0, 0);
+ NID_hold_instruction_code, inst,
+ 0, 0);
ASN1_OBJECT_free(inst);
ASN1_TIME_free(revtm);
ASN1_GENERALIZEDTIME_free(invtm);
@@ -1163,7 +1205,7 @@ static void make_ocsp_response(BIO *err, OCSP_RESPONSE **resp, OCSP_REQUEST *req
BIO_printf(err, "parameter error \"%s\"\n", sigopt);
ERR_print_errors(bio_err);
*resp = OCSP_response_create(OCSP_RESPONSE_STATUS_INTERNALERROR,
- NULL);
+ NULL);
goto end;
}
}
@@ -1179,7 +1221,7 @@ static void make_ocsp_response(BIO *err, OCSP_RESPONSE **resp, OCSP_REQUEST *req
*resp = OCSP_response_create(OCSP_RESPONSE_STATUS_SUCCESSFUL, bs);
- end:
+end:
EVP_MD_CTX_free(mctx);
ASN1_TIME_free(thisupd);
ASN1_TIME_free(nextupd);
@@ -1194,8 +1236,8 @@ static char **lookup_serial(CA_DB *db, ASN1_INTEGER *ser)
for (i = 0; i < DB_NUMBER; i++)
row[i] = NULL;
bn = ASN1_INTEGER_to_BN(ser, NULL);
- OPENSSL_assert(bn); /* FIXME: should report an error at this
- * point and abort */
+ OPENSSL_assert(bn); /* FIXME: should report an error at this
+ * point and abort */
if (BN_is_zero(bn)) {
itmp = OPENSSL_strdup("00");
OPENSSL_assert(itmp);
@@ -1210,16 +1252,16 @@ static char **lookup_serial(CA_DB *db, ASN1_INTEGER *ser)
}
static int do_responder(OCSP_REQUEST **preq, BIO **pcbio, BIO *acbio,
- int timeout)
+ int timeout)
{
#ifndef OPENSSL_NO_SOCK
return http_server_get_asn1_req(ASN1_ITEM_rptr(OCSP_REQUEST),
- (ASN1_VALUE **)preq, NULL, pcbio, acbio,
- NULL /* found_keep_alive */,
- prog, 1 /* accept_get */, timeout);
+ (ASN1_VALUE **)preq, NULL, pcbio, acbio,
+ NULL /* found_keep_alive */,
+ prog, 1 /* accept_get */, timeout);
#else
BIO_printf(bio_err,
- "Error getting OCSP request - sockets not supported\n");
+ "Error getting OCSP request - sockets not supported\n");
*preq = NULL;
return 0;
#endif
@@ -1229,23 +1271,23 @@ static int send_ocsp_response(BIO *cbio, const OCSP_RESPONSE *resp)
{
#ifndef OPENSSL_NO_SOCK
return http_server_send_asn1_resp(prog, cbio,
- 0 /* no keep-alive */,
- "application/ocsp-response",
- ASN1_ITEM_rptr(OCSP_RESPONSE),
- (const ASN1_VALUE *)resp);
+ 0 /* no keep-alive */,
+ "application/ocsp-response",
+ ASN1_ITEM_rptr(OCSP_RESPONSE),
+ (const ASN1_VALUE *)resp);
#else
BIO_printf(bio_err,
- "Error sending OCSP response - sockets not supported\n");
+ "Error sending OCSP response - sockets not supported\n");
return 0;
#endif
}
#ifndef OPENSSL_NO_SOCK
OCSP_RESPONSE *process_responder(OCSP_REQUEST *req, const char *host,
- const char *port, const char *path,
- const char *proxy, const char *no_proxy,
- int use_ssl, STACK_OF(CONF_VALUE) *headers,
- int req_timeout)
+ const char *port, const char *path,
+ const char *proxy, const char *no_proxy,
+ int use_ssl, STACK_OF(CONF_VALUE) *headers,
+ int req_timeout)
{
SSL_CTX *ctx = NULL;
OCSP_RESPONSE *resp = NULL;
@@ -1260,15 +1302,15 @@ OCSP_RESPONSE *process_responder(OCSP_REQUEST *req, const char *host,
resp = (OCSP_RESPONSE *)
app_http_post_asn1(host, port, path, proxy, no_proxy,
- ctx, headers, "application/ocsp-request",
- (ASN1_VALUE *)req, ASN1_ITEM_rptr(OCSP_REQUEST),
- "application/ocsp-response",
- req_timeout, ASN1_ITEM_rptr(OCSP_RESPONSE));
+ ctx, headers, "application/ocsp-request",
+ (ASN1_VALUE *)req, ASN1_ITEM_rptr(OCSP_REQUEST),
+ "application/ocsp-response",
+ req_timeout, ASN1_ITEM_rptr(OCSP_RESPONSE));
if (resp == NULL)
BIO_printf(bio_err, "Error querying OCSP responder\n");
- end:
+end:
SSL_CTX_free(ctx);
return resp;
}
diff --git a/apps/openssl.c b/apps/openssl.c
index b7f2f9982a..61623086f7 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -23,7 +23,7 @@
#include <openssl/err.h>
/* Needed to get the other O_xxx flags. */
#ifdef OPENSSL_SYS_VMS
-# include <unixio.h>
+#include <unixio.h>
#endif
#include "apps.h"
#include "progs.h"
@@ -46,7 +46,7 @@ static void warn_deprecated(const FUNCTION *fp)
{
if (fp->deprecated_version != NULL)
BIO_printf(bio_err, "The command %s was deprecated in version %s.",
- fp->name, fp->deprecated_version);
+ fp->name, fp->deprecated_version);
else
BIO_printf(bio_err, "The command %s is deprecated.", fp->name);
if (strcmp(fp->deprecated_alternative, DEPRECATED_NO_ALTERNATIVE) != 0)
@@ -90,15 +90,14 @@ static void apps_shutdown(void)
destroy_ui_method();
}
-
#ifndef OPENSSL_NO_TRACE
typedef struct tracedata_st {
BIO *bio;
- unsigned int ingroup:1;
+ unsigned int ingroup : 1;
} tracedata;
static size_t internal_trace_cb(const char *buf, size_t cnt,
- int category, int cmd, void *vdata)
+ int category, int cmd, void *vdata)
{
int ret = 0;
tracedata *trace_data = vdata;
@@ -116,8 +115,8 @@ static size_t internal_trace_cb(const char *buf, size_t cnt,
tid = CRYPTO_THREAD_get_current_id();
hex = OPENSSL_buf2hexstr((const unsigned char *)&tid, sizeof(tid));
BIO_snprintf(buffer, sizeof(buffer), "TRACE[%s]:%s: ",
- hex == NULL ? "<null>" : hex,
- OSSL_trace_get_category_name(category));
+ hex == NULL ? "<null>" : hex,
+ OSSL_trace_get_category_name(category));
OPENSSL_free(hex);
BIO_set_prefix(trace_data->bio, buffer);
break;
@@ -177,12 +176,13 @@ static void setup_trace_category(int category)
|| bio == NULL
|| (trace_data->bio = channel) == NULL
|| OSSL_trace_set_callback(category, internal_trace_cb,
- trace_data) == 0
+ trace_data)
+ == 0
|| sk_tracedata_push(trace_data_stack, trace_data) == 0) {
fprintf(stderr,
- "warning: unable to setup trace callback for category '%s'.\n",
- OSSL_trace_get_category_name(category));
+ "warning: unable to setup trace callback for category '%s'.\n",
+ OSSL_trace_get_category_name(category));
OSSL_trace_set_callback(category, NULL, NULL);
BIO_free_all(channel);
@@ -219,7 +219,7 @@ static void setup_trace(const char *str)
setup_trace_category(category);
} else {
fprintf(stderr,
- "warning: unknown trace category: '%s'.\n", item);
+ "warning: unknown trace category: '%s'.\n", item);
}
}
}
@@ -276,8 +276,8 @@ int main(int argc, char *argv[])
sec_mem = strtol(sec_mem_char, &end, 0);
if (errno != 0 || *end != 0 || end == sec_mem_char) {
BIO_printf(bio_err,
- "FATAL: could not convert OPENSSL_SEC_MEM (%s) to number\n",
- sec_mem_char);
+ "FATAL: could not convert OPENSSL_SEC_MEM (%s) to number\n",
+ sec_mem_char);
ret = EXIT_FAILURE;
goto end;
}
@@ -291,8 +291,8 @@ int main(int argc, char *argv[])
sec_mem_minsize = strtol(sec_mem_minsize_char, &end, 0);
if (errno != 0 || *end != 0 || end == sec_mem_minsize_char) {
BIO_printf(bio_err,
- "FATAL: could not convert OPENSSL_SEC_MEM_MINSIZE (%s) to number\n",
- sec_mem_minsize_char);
+ "FATAL: could not convert OPENSSL_SEC_MEM_MINSIZE (%s) to number\n",
+ sec_mem_minsize_char);
ret = 1;
goto end;
}
@@ -301,23 +301,23 @@ int main(int argc, char *argv[])
ret = CRYPTO_secure_malloc_init(sec_mem, sec_mem_minsize);
if (ret != 1) {
BIO_printf(bio_err,
- "FATAL: could not initialize secure memory\n");
+ "FATAL: could not initialize secure memory\n");
ERR_print_errors(bio_err);
ret = 1;
goto end;
}
#else
BIO_printf(bio_err,
- "FATAL: OPENSSL_SEC_MEM environment variable was set, but "
- "openssl was compiled without secure memory support.\n");
+ "FATAL: OPENSSL_SEC_MEM environment variable was set, but "
+ "openssl was compiled without secure memory support.\n");
#endif
}
if ((fname = "apps_startup", !apps_startup())
- || (fname = "prog_init", (prog = prog_init()) == NULL)) {
+ || (fname = "prog_init", (prog = prog_init()) == NULL)) {
BIO_printf(bio_err,
- "FATAL: Startup failure (dev note: %s()) for %s\n",
- fname, argv[0]);
+ "FATAL: Startup failure (dev note: %s()) for %s\n",
+ fname, argv[0]);
ERR_print_errors(bio_err);
ret = 1;
goto end;
@@ -342,7 +342,8 @@ int main(int argc, char *argv[])
argc--;
argv++;
- opt_appname(argc == 1 || global_help ? "help" : global_version ? "version" : argv[0]);
+ opt_appname(argc == 1 || global_help ? "help" : global_version ? "version"
+ : argv[0]);
} else {
argv[0] = pname;
}
@@ -351,13 +352,13 @@ int main(int argc, char *argv[])
* If there's no command, assume "help". If there's an override for help
* or version run those, otherwise run the command given.
*/
- ret = (argc == 0) || global_help
- ? do_cmd(prog, 1, help_argv)
- : global_version
- ? do_cmd(prog, 1, version_argv)
- : do_cmd(prog, argc, argv);
+ ret = (argc == 0) || global_help
+ ? do_cmd(prog, 1, help_argv)
+ : global_version
+ ? do_cmd(prog, 1, version_argv)
+ : do_cmd(prog, argc, argv);
- end:
+end:
OPENSSL_free(default_config_file);
lh_FUNCTION_free(prog);
OPENSSL_free(arg.argv);
@@ -375,18 +376,20 @@ int main(int argc, char *argv[])
}
typedef enum HELP_CHOICE {
- OPT_hERR = -1, OPT_hEOF = 0, OPT_hHELP
+ OPT_hERR = -1,
+ OPT_hEOF = 0,
+ OPT_hHELP
} HELP_CHOICE;
const OPTIONS help_options[] = {
- {OPT_HELP_STR, 1, '-', "Usage: help [options] [command]\n"},
+ { OPT_HELP_STR, 1, '-', "Usage: help [options] [command]\n" },
OPT_SECTION("General"),
- {"help", OPT_hHELP, '-', "Display this summary"},
+ { "help", OPT_hHELP, '-', "Display this summary" },
OPT_PARAMETERS(),
- {"command", 0, 0, "Name of command to display help (optional)"},
- {NULL}
+ { "command", 0, 0, "Name of command to display help (optional)" },
+ { NULL }
};
int help_main(int argc, char **argv)
@@ -441,11 +444,11 @@ int help_main(int argc, char **argv)
if (tp == FT_md) {
i = 1;
BIO_printf(bio_err,
- "\nMessage Digest commands (see the `dgst' command for more details)\n");
+ "\nMessage Digest commands (see the `dgst' command for more details)\n");
} else if (tp == FT_cipher) {
i = 1;
BIO_printf(bio_err,
- "\nCipher commands (see the `enc' command for more details)\n");
+ "\nCipher commands (see the `enc' command for more details)\n");
}
}
BIO_printf(bio_err, "%-*s", dc.width, fp->name);
@@ -494,7 +497,7 @@ static int do_cmd(LHASH_OF(FUNCTION) *prog, int argc, char *argv[])
}
BIO_printf(bio_err, "Invalid command '%s'; type \"help\" for a list.\n",
- argv[0]);
+ argv[0]);
return 1;
}
diff --git a/apps/passwd.c b/apps/passwd.c
index 495fb083db..338e0135ba 100644
--- a/apps/passwd.c
+++ b/apps/passwd.c
@@ -17,7 +17,7 @@
#include <openssl/evp.h>
#include <openssl/rand.h>
#if !defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_DEPRECATED_3_0)
-# include <openssl/des.h>
+#include <openssl/des.h>
#endif
#include <openssl/md5.h>
#include <openssl/sha.h>
@@ -46,48 +46,58 @@ typedef enum {
} passwd_modes;
static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
- char *passwd, BIO *out, int quiet, int table,
- int reverse, size_t pw_maxlen, passwd_modes mode);
+ char *passwd, BIO *out, int quiet, int table,
+ int reverse, size_t pw_maxlen, passwd_modes mode);
typedef enum OPTION_choice {
OPT_COMMON,
OPT_IN,
- OPT_NOVERIFY, OPT_QUIET, OPT_TABLE, OPT_REVERSE, OPT_APR1,
- OPT_1, OPT_5, OPT_6, OPT_AIXMD5, OPT_SALT, OPT_STDIN,
- OPT_R_ENUM, OPT_PROV_ENUM
+ OPT_NOVERIFY,
+ OPT_QUIET,
+ OPT_TABLE,
+ OPT_REVERSE,
+ OPT_APR1,
+ OPT_1,
+ OPT_5,
+ OPT_6,
+ OPT_AIXMD5,
+ OPT_SALT,
+ OPT_STDIN,
+ OPT_R_ENUM,
+ OPT_PROV_ENUM
} OPTION_CHOICE;
const OPTIONS passwd_options[] = {
- {OPT_HELP_STR, 1, '-', "Usage: %s [options] [password]\n"},
+ { OPT_HELP_STR, 1, '-', "Usage: %s [options] [password]\n" },
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
+ { "help", OPT_HELP, '-', "Display this summary" },
OPT_SECTION("Input"),
- {"in", OPT_IN, '<', "Read passwords from file"},
- {"noverify", OPT_NOVERIFY, '-',
- "Never verify when reading password from terminal"},
- {"stdin", OPT_STDIN, '-', "Read passwords from stdin"},
+ { "in", OPT_IN, '<', "Read passwords from file" },
+ { "noverify", OPT_NOVERIFY, '-',
+ "Never verify when reading password from terminal" },
+ { "stdin", OPT_STDIN, '-', "Read passwords from stdin" },
OPT_SECTION("Output"),
- {"quiet", OPT_QUIET, '-', "No warnings"},
- {"table", OPT_TABLE, '-', "Format output as table"},
- {"reverse", OPT_REVERSE, '-', "Switch table columns"},
+ { "quiet", OPT_QUIET, '-', "No warnings" },
+ { "table", OPT_TABLE, '-', "Format output as table" },
+ { "reverse", OPT_REVERSE, '-', "Switch table columns" },
OPT_SECTION("Cryptographic"),
- {"salt", OPT_SALT, 's', "Use provided salt"},
- {"6", OPT_6, '-', "SHA512-based password algorithm"},
- {"5", OPT_5, '-', "SHA256-based password algorithm"},
- {"apr1", OPT_APR1, '-', "MD5-based password algorithm, Apache variant"},
- {"1", OPT_1, '-', "MD5-based password algorithm"},
- {"aixmd5", OPT_AIXMD5, '-', "AIX MD5-based password algorithm"},
+ { "salt", OPT_SALT, 's', "Use provided salt" },
+ { "6", OPT_6, '-', "SHA512-based password algorithm" },
+ { "5", OPT_5, '-', "SHA256-based password algorithm" },
+ { "apr1", OPT_APR1, '-', "MD5-based password algorithm, Apache variant" },
+ { "1", OPT_1, '-', "MD5-based password algorithm" },
+ { "aixmd5", OPT_AIXMD5, '-', "AIX MD5-based password algorithm" },
OPT_R_OPTIONS,
OPT_PROV_OPTIONS,
OPT_PARAMETERS(),
- {"password", 0, 0, "Password text to digest (optional)"},
- {NULL}
+ { "password", 0, 0, "Password text to digest (optional)" },
+ { NULL }
};
int passwd_main(int argc, char **argv)
@@ -112,7 +122,7 @@ int passwd_main(int argc, char **argv)
switch (o) {
case OPT_EOF:
case OPT_ERR:
- opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
case OPT_HELP:
@@ -223,8 +233,7 @@ int passwd_main(int argc, char **argv)
passwd_malloc_size = pw_maxlen + 2;
/* longer than necessary so that we can warn about truncation */
- passwd = passwd_malloc =
- app_malloc(passwd_malloc_size, "password buffer");
+ passwd = passwd_malloc = app_malloc(passwd_malloc_size, "password buffer");
}
if ((in == NULL) && (passwds == NULL)) {
@@ -240,9 +249,9 @@ int passwd_main(int argc, char **argv)
passwds = passwds_static;
if (in == NULL) {
- if (EVP_read_pw_string
- (passwd_malloc, (int)passwd_malloc_size, "Password: ",
- !(passed_salt || in_noverify)) != 0)
+ if (EVP_read_pw_string(passwd_malloc, (int)passwd_malloc_size, "Password: ",
+ !(passed_salt || in_noverify))
+ != 0)
goto end;
}
passwds[0] = passwd_malloc;
@@ -257,10 +266,10 @@ int passwd_main(int argc, char **argv)
assert(passwds != NULL);
assert(*passwds != NULL);
- do { /* loop over list of passwords */
+ do { /* loop over list of passwords */
passwd = *passwds++;
if (!do_passwd(passed_salt, &salt, &salt_malloc, passwd, bio_out,
- quiet, table, reverse, pw_maxlen, mode))
+ quiet, table, reverse, pw_maxlen, mode))
goto end;
} while (*passwds != NULL);
} else {
@@ -273,7 +282,7 @@ int passwd_main(int argc, char **argv)
if (r > 0) {
char *c = (strchr(passwd, '\n'));
if (c != NULL) {
- *c = 0; /* truncate at newline */
+ *c = 0; /* truncate at newline */
} else {
/* ignore rest of line */
char trash[BUFSIZ];
@@ -282,9 +291,8 @@ int passwd_main(int argc, char **argv)
while ((r > 0) && (!strchr(trash, '\n')));
}
- if (!do_passwd
- (passed_salt, &salt, &salt_malloc, passwd, bio_out, quiet,
- table, reverse, pw_maxlen, mode))
+ if (!do_passwd(passed_salt, &salt, &salt_malloc, passwd, bio_out, quiet,
+ table, reverse, pw_maxlen, mode))
goto end;
}
done = (r <= 0);
@@ -292,7 +300,7 @@ int passwd_main(int argc, char **argv)
}
ret = 0;
- end:
+end:
#if 0
ERR_print_errors(bio_err);
#endif
@@ -316,8 +324,8 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
/* "$apr1$..salt..$.......md5hash..........\0" */
static char out_buf[6 + 9 + 24 + 2];
unsigned char buf[MD5_DIGEST_LENGTH];
- char ascii_magic[5]; /* "apr1" plus '\0' */
- char ascii_salt[9]; /* Max 8 chars plus '\0' */
+ char ascii_magic[5]; /* "apr1" plus '\0' */
+ char ascii_salt[9]; /* Max 8 chars plus '\0' */
char *ascii_passwd = NULL;
char *salt_out;
int n;
@@ -331,7 +339,7 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
magic_len = strlen(magic);
OPENSSL_strlcpy(ascii_magic, magic, sizeof(ascii_magic));
#ifdef CHARSET_EBCDIC
- if ((magic[0] & 0x80) != 0) /* High bit is 1 in EBCDIC alnums */
+ if ((magic[0] & 0x80) != 0) /* High bit is 1 in EBCDIC alnums */
ebcdic2ascii(ascii_magic, ascii_magic, magic_len);
#endif
@@ -353,7 +361,7 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
if (magic_len > 0) {
OPENSSL_strlcat(out_buf, ascii_dollar, sizeof(out_buf));
- if (magic_len > 4) /* assert it's "1" or "apr1" */
+ if (magic_len > 4) /* assert it's "1" or "apr1" */
goto err;
OPENSSL_strlcat(out_buf, ascii_magic, sizeof(out_buf));
@@ -381,7 +389,7 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
if (!EVP_DigestUpdate(md, ascii_dollar, 1)
|| !EVP_DigestUpdate(md, ascii_magic, magic_len)
|| !EVP_DigestUpdate(md, ascii_dollar, 1))
- goto err;
+ goto err;
if (!EVP_DigestUpdate(md, ascii_salt, salt_len))
goto err;
@@ -415,8 +423,8 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
if (!EVP_DigestInit_ex(md2, EVP_md5(), NULL))
goto err;
if (!EVP_DigestUpdate(md2,
- (i & 1) ? (const unsigned char *)passwd : buf,
- (i & 1) ? passwd_len : sizeof(buf)))
+ (i & 1) ? (const unsigned char *)passwd : buf,
+ (i & 1) ? passwd_len : sizeof(buf)))
goto err;
if (i % 3) {
if (!EVP_DigestUpdate(md2, ascii_salt, salt_len))
@@ -427,11 +435,11 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
goto err;
}
if (!EVP_DigestUpdate(md2,
- (i & 1) ? buf : (const unsigned char *)passwd,
- (i & 1) ? sizeof(buf) : passwd_len))
- goto err;
+ (i & 1) ? buf : (const unsigned char *)passwd,
+ (i & 1) ? sizeof(buf) : passwd_len))
+ goto err;
if (!EVP_DigestFinal_ex(md2, buf, NULL))
- goto err;
+ goto err;
}
EVP_MD_CTX_free(md2);
EVP_MD_CTX_free(md);
@@ -446,14 +454,14 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
/* silly output permutation */
for (dest = 0, source = 0; dest < 14;
- dest++, source = (source + 6) % 17)
+ dest++, source = (source + 6) % 17)
buf_perm[dest] = buf[source];
buf_perm[14] = buf[5];
buf_perm[15] = buf[11];
-# ifndef PEDANTIC /* Unfortunately, this generates a "no
- * effect" warning */
+#ifndef PEDANTIC /* Unfortunately, this generates a "no \
+ * effect" warning */
assert(16 == sizeof(buf_perm));
-# endif
+#endif
output = salt_out + salt_len;
assert(output == out_buf + strlen(out_buf));
@@ -462,10 +470,8 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
for (i = 0; i < 15; i += 3) {
*output++ = cov_2char[buf_perm[i + 2] & 0x3f];
- *output++ = cov_2char[((buf_perm[i + 1] & 0xf) << 2) |
- (buf_perm[i + 2] >> 6)];
- *output++ = cov_2char[((buf_perm[i] & 3) << 4) |
- (buf_perm[i + 1] >> 4)];
+ *output++ = cov_2char[((buf_perm[i + 1] & 0xf) << 2) | (buf_perm[i + 2] >> 6)];
+ *output++ = cov_2char[((buf_perm[i] & 3) << 4) | (buf_perm[i + 1] >> 4)];
*output++ = cov_2char[buf_perm[i] >> 2];
}
assert(i == 15);
@@ -480,7 +486,7 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
return out_buf;
- err:
+err:
OPENSSL_free(ascii_passwd);
EVP_MD_CTX_free(md2);
EVP_MD_CTX_free(md);
@@ -497,13 +503,13 @@ static char *shacrypt(const char *passwd, const char *magic, const char *salt)
/* Prefix for optional rounds specification. */
static const char rounds_prefix[] = "rounds=";
/* Maximum salt string length. */
-# define SALT_LEN_MAX 16
+#define SALT_LEN_MAX 16
/* Default number of rounds if not explicitly specified. */
-# define ROUNDS_DEFAULT 5000
+#define ROUNDS_DEFAULT 5000
/* Minimum number of rounds. */
-# define ROUNDS_MIN 1000
+#define ROUNDS_MIN 1000
/* Maximum number of rounds. */
-# define ROUNDS_MAX 999999999
+#define ROUNDS_MAX 999999999
/* "$6$rounds=<N>$......salt......$...shahash(up to 86 chars)...\0" */
static char out_buf[3 + 17 + 17 + 86 + 1];
@@ -511,13 +517,13 @@ static char *shacrypt(const char *passwd, const char *magic, const char *salt)
unsigned char temp_buf[SHA512_DIGEST_LENGTH];
size_t buf_size = 0;
char ascii_magic[2];
- char ascii_salt[17]; /* Max 16 chars plus '\0' */
+ char ascii_salt[17]; /* Max 16 chars plus '\0' */
char *ascii_passwd = NULL;
size_t n;
EVP_MD_CTX *md = NULL, *md2 = NULL;
const EVP_MD *sha = NULL;
size_t passwd_len, salt_len, magic_len;
- unsigned int rounds = ROUNDS_DEFAULT; /* Default */
+ unsigned int rounds = ROUNDS_DEFAULT; /* Default */
char rounds_custom = 0;
char *p_bytes = NULL;
char *s_bytes = NULL;
@@ -546,7 +552,7 @@ static char *shacrypt(const char *passwd, const char *magic, const char *salt)
if (strncmp(salt, rounds_prefix, sizeof(rounds_prefix) - 1) == 0) {
const char *num = salt + sizeof(rounds_prefix) - 1;
char *endp;
- unsigned long int srounds = strtoul (num, &endp, 10);
+ unsigned long int srounds = strtoul(num, &endp, 10);
if (*endp == '$') {
salt = endp + 1;
if (srounds > ROUNDS_MAX)
@@ -563,7 +569,7 @@ static char *shacrypt(const char *passwd, const char *magic, const char *salt)
OPENSSL_strlcpy(ascii_magic, magic, sizeof(ascii_magic));
#ifdef CHARSET_EBCDIC
- if ((magic[0] & 0x80) != 0) /* High bit is 1 in EBCDIC alnums */
+ if ((magic[0] & 0x80) != 0) /* High bit is 1 in EBCDIC alnums */
ebcdic2ascii(ascii_magic, ascii_magic, magic_len);
#endif
@@ -592,7 +598,7 @@ static char *shacrypt(const char *passwd, const char *magic, const char *salt)
BIO_snprintf(tmp_buf, sizeof(tmp_buf), "rounds=%u", rounds);
#ifdef CHARSET_EBCDIC
/* In case we're really on a ASCII based platform and just pretend */
- if (tmp_buf[0] != 0x72) /* ASCII 'r' */
+ if (tmp_buf[0] != 0x72) /* ASCII 'r' */
ebcdic2ascii(tmp_buf, tmp_buf, strlen(tmp_buf));
#endif
OPENSSL_strlcat(out_buf, tmp_buf, sizeof(out_buf));
@@ -630,8 +636,8 @@ static char *shacrypt(const char *passwd, const char *magic, const char *salt)
n = passwd_len;
while (n) {
if (!EVP_DigestUpdate(md,
- (n & 1) ? buf : (const unsigned char *)passwd,
- (n & 1) ? buf_size : passwd_len))
+ (n & 1) ? buf : (const unsigned char *)passwd,
+ (n & 1) ? buf_size : passwd_len))
goto err;
n >>= 1;
}
@@ -676,8 +682,8 @@ static char *shacrypt(const char *passwd, const char *magic, const char *salt)
if (!EVP_DigestInit_ex(md2, sha, NULL))
goto err;
if (!EVP_DigestUpdate(md2,
- (n & 1) ? (const unsigned char *)p_bytes : buf,
- (n & 1) ? passwd_len : buf_size))
+ (n & 1) ? (const unsigned char *)p_bytes : buf,
+ (n & 1) ? passwd_len : buf_size))
goto err;
if (n % 3) {
if (!EVP_DigestUpdate(md2, s_bytes, salt_len))
@@ -688,11 +694,11 @@ static char *shacrypt(const char *passwd, const char *magic, const char *salt)
goto err;
}
if (!EVP_DigestUpdate(md2,
- (n & 1) ? buf : (const unsigned char *)p_bytes,
- (n & 1) ? buf_size : passwd_len))
- goto err;
+ (n & 1) ? buf : (const unsigned char *)p_bytes,
+ (n & 1) ? buf_size : passwd_len))
+ goto err;
if (!EVP_DigestFinal_ex(md2, buf, NULL))
- goto err;
+ goto err;
}
EVP_MD_CTX_free(md2);
EVP_MD_CTX_free(md);
@@ -706,53 +712,53 @@ static char *shacrypt(const char *passwd, const char *magic, const char *salt)
cp = out_buf + strlen(out_buf);
*cp++ = ascii_dollar[0];
-# define b64_from_24bit(B2, B1, B0, N) \
- do { \
- unsigned int w = ((B2) << 16) | ((B1) << 8) | (B0); \
- int i = (N); \
- while (i-- > 0) { \
- *cp++ = cov_2char[w & 0x3f]; \
- w >>= 6; \
- } \
+#define b64_from_24bit(B2, B1, B0, N) \
+ do { \
+ unsigned int w = ((B2) << 16) | ((B1) << 8) | (B0); \
+ int i = (N); \
+ while (i-- > 0) { \
+ *cp++ = cov_2char[w & 0x3f]; \
+ w >>= 6; \
+ } \
} while (0)
switch (magic[0]) {
case '5':
- b64_from_24bit (buf[0], buf[10], buf[20], 4);
- b64_from_24bit (buf[21], buf[1], buf[11], 4);
- b64_from_24bit (buf[12], buf[22], buf[2], 4);
- b64_from_24bit (buf[3], buf[13], buf[23], 4);
- b64_from_24bit (buf[24], buf[4], buf[14], 4);
- b64_from_24bit (buf[15], buf[25], buf[5], 4);
- b64_from_24bit (buf[6], buf[16], buf[26], 4);
- b64_from_24bit (buf[27], buf[7], buf[17], 4);
- b64_from_24bit (buf[18], buf[28], buf[8], 4);
- b64_from_24bit (buf[9], buf[19], buf[29], 4);
- b64_from_24bit (0, buf[31], buf[30], 3);
+ b64_from_24bit(buf[0], buf[10], buf[20], 4);
+ b64_from_24bit(buf[21], buf[1], buf[11], 4);
+ b64_from_24bit(buf[12], buf[22], buf[2], 4);
+ b64_from_24bit(buf[3], buf[13], buf[23], 4);
+ b64_from_24bit(buf[24], buf[4], buf[14], 4);
+ b64_from_24bit(buf[15], buf[25], buf[5], 4);
+ b64_from_24bit(buf[6], buf[16], buf[26], 4);
+ b64_from_24bit(buf[27], buf[7], buf[17], 4);
+ b64_from_24bit(buf[18], buf[28], buf[8], 4);
+ b64_from_24bit(buf[9], buf[19], buf[29], 4);
+ b64_from_24bit(0, buf[31], buf[30], 3);
break;
case '6':
- b64_from_24bit (buf[0], buf[21], buf[42], 4);
- b64_from_24bit (buf[22], buf[43], buf[1], 4);
- b64_from_24bit (buf[44], buf[2], buf[23], 4);
- b64_from_24bit (buf[3], buf[24], buf[45], 4);
- b64_from_24bit (buf[25], buf[46], buf[4], 4);
- b64_from_24bit (buf[47], buf[5], buf[26], 4);
- b64_from_24bit (buf[6], buf[27], buf[48], 4);
- b64_from_24bit (buf[28], buf[49], buf[7], 4);
- b64_from_24bit (buf[50], buf[8], buf[29], 4);
- b64_from_24bit (buf[9], buf[30], buf[51], 4);
- b64_from_24bit (buf[31], buf[52], buf[10], 4);
- b64_from_24bit (buf[53], buf[11], buf[32], 4);
- b64_from_24bit (buf[12], buf[33], buf[54], 4);
- b64_from_24bit (buf[34], buf[55], buf[13], 4);
- b64_from_24bit (buf[56], buf[14], buf[35], 4);
- b64_from_24bit (buf[15], buf[36], buf[57], 4);
- b64_from_24bit (buf[37], buf[58], buf[16], 4);
- b64_from_24bit (buf[59], buf[17], buf[38], 4);
- b64_from_24bit (buf[18], buf[39], buf[60], 4);
- b64_from_24bit (buf[40], buf[61], buf[19], 4);
- b64_from_24bit (buf[62], buf[20], buf[41], 4);
- b64_from_24bit (0, 0, buf[63], 2);
+ b64_from_24bit(buf[0], buf[21], buf[42], 4);
+ b64_from_24bit(buf[22], buf[43], buf[1], 4);
+ b64_from_24bit(buf[44], buf[2], buf[23], 4);
+ b64_from_24bit(buf[3], buf[24], buf[45], 4);
+ b64_from_24bit(buf[25], buf[46], buf[4], 4);
+ b64_from_24bit(buf[47], buf[5], buf[26], 4);
+ b64_from_24bit(buf[6], buf[27], buf[48], 4);
+ b64_from_24bit(buf[28], buf[49], buf[7], 4);
+ b64_from_24bit(buf[50], buf[8], buf[29], 4);
+ b64_from_24bit(buf[9], buf[30], buf[51], 4);
+ b64_from_24bit(buf[31], buf[52], buf[10], 4);
+ b64_from_24bit(buf[53], buf[11], buf[32], 4);
+ b64_from_24bit(buf[12], buf[33], buf[54], 4);
+ b64_from_24bit(buf[34], buf[55], buf[13], 4);
+ b64_from_24bit(buf[56], buf[14], buf[35], 4);
+ b64_from_24bit(buf[15], buf[36], buf[57], 4);
+ b64_from_24bit(buf[37], buf[58], buf[16], 4);
+ b64_from_24bit(buf[59], buf[17], buf[38], 4);
+ b64_from_24bit(buf[18], buf[39], buf[60], 4);
+ b64_from_24bit(buf[40], buf[61], buf[19], 4);
+ b64_from_24bit(buf[62], buf[20], buf[41], 4);
+ b64_from_24bit(0, 0, buf[63], 2);
break;
default:
goto err;
@@ -764,7 +770,7 @@ static char *shacrypt(const char *passwd, const char *magic, const char *salt)
return out_buf;
- err:
+err:
EVP_MD_CTX_free(md2);
EVP_MD_CTX_free(md);
OPENSSL_free(p_bytes);
@@ -774,8 +780,8 @@ static char *shacrypt(const char *passwd, const char *magic, const char *salt)
}
static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
- char *passwd, BIO *out, int quiet, int table,
- int reverse, size_t pw_maxlen, passwd_modes mode)
+ char *passwd, BIO *out, int quiet, int table,
+ int reverse, size_t pw_maxlen, passwd_modes mode)
{
char *hash = NULL;
@@ -803,10 +809,10 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
for (i = 0; i < saltlen; i++)
(*salt_p)[i] = cov_2char[(*salt_p)[i] & 0x3f]; /* 6 bits */
(*salt_p)[i] = 0;
-# ifdef CHARSET_EBCDIC
+#ifdef CHARSET_EBCDIC
/* The password encryption function will convert back to ASCII */
ascii2ebcdic(*salt_p, *salt_p, saltlen);
-# endif
+#endif
}
assert(*salt_p != NULL);
@@ -818,8 +824,8 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
* XXX: really we should know how to print a size_t, not cast it
*/
BIO_printf(bio_err,
- "Warning: truncating password to %u characters\n",
- (unsigned)pw_maxlen);
+ "Warning: truncating password to %u characters\n",
+ (unsigned)pw_maxlen);
passwd[pw_maxlen] = 0;
}
assert(strlen(passwd) <= pw_maxlen);
@@ -841,6 +847,6 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
BIO_printf(out, "%s\n", hash);
return 1;
- end:
+end:
return 0;
}
diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index 7620edd69a..65ce120b40 100644
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -23,11 +23,11 @@
#include <openssl/kdf.h>
#include <openssl/rand.h>
-#define NOKEYS 0x1
-#define NOCERTS 0x2
-#define INFO 0x4
-#define CLCERTS 0x8
-#define CACERTS 0x10
+#define NOKEYS 0x1
+#define NOCERTS 0x2
+#define INFO 0x4
+#define CLCERTS 0x8
+#define CACERTS 0x10
#define PASSWD_BUF_SIZE 2048
@@ -37,20 +37,20 @@
BIO_printf(bio_err, "Warning: -%s option ignored without -export\n", opt);
static int get_cert_chain(X509 *cert, X509_STORE *store,
- STACK_OF(X509) *untrusted_certs,
- STACK_OF(X509) **chain);
+ STACK_OF(X509) *untrusted_certs,
+ STACK_OF(X509) **chain);
int dump_certs_keys_p12(BIO *out, const PKCS12 *p12,
- const char *pass, int passlen, int options,
- char *pempass, const EVP_CIPHER *enc);
+ const char *pass, int passlen, int options,
+ char *pempass, const EVP_CIPHER *enc);
int dump_certs_pkeys_bags(BIO *out, const STACK_OF(PKCS12_SAFEBAG) *bags,
- const char *pass, int passlen, int options,
- char *pempass, const EVP_CIPHER *enc);
+ const char *pass, int passlen, int options,
+ char *pempass, const EVP_CIPHER *enc);
int dump_certs_pkeys_bag(BIO *out, const PKCS12_SAFEBAG *bags,
- const char *pass, int passlen,
- int options, char *pempass, const EVP_CIPHER *enc);
+ const char *pass, int passlen,
+ int options, char *pempass, const EVP_CIPHER *enc);
void print_attribute(BIO *out, const ASN1_TYPE *av);
int print_attribs(BIO *out, const STACK_OF(X509_ATTRIBUTE) *attrlst,
- const char *name);
+ const char *name);
void hex_prin(BIO *out, unsigned char *buf, int len);
static int alg_print(const X509_ALGOR *alg);
int cert_load(BIO *in, STACK_OF(X509) *sk);
@@ -59,18 +59,57 @@ static int jdk_trust(PKCS12_SAFEBAG *bag, void *cbarg);
typedef enum OPTION_choice {
OPT_COMMON,
- OPT_CIPHER, OPT_NOKEYS, OPT_KEYEX, OPT_KEYSIG, OPT_NOCERTS, OPT_CLCERTS,
- OPT_CACERTS, OPT_NOOUT, OPT_INFO, OPT_CHAIN, OPT_TWOPASS, OPT_NOMACVER,
+ OPT_CIPHER,
+ OPT_NOKEYS,
+ OPT_KEYEX,
+ OPT_KEYSIG,
+ OPT_NOCERTS,
+ OPT_CLCERTS,
+ OPT_CACERTS,
+ OPT_NOOUT,
+ OPT_INFO,
+ OPT_CHAIN,
+ OPT_TWOPASS,
+ OPT_NOMACVER,
#ifndef OPENSSL_NO_DES
OPT_DESCERT,
#endif
- OPT_EXPORT, OPT_ITER, OPT_NOITER, OPT_MACITER, OPT_NOMACITER, OPT_MACSALTLEN,
- OPT_NOMAC, OPT_LMK, OPT_NODES, OPT_NOENC, OPT_MACALG, OPT_CERTPBE, OPT_KEYPBE,
- OPT_INKEY, OPT_CERTFILE, OPT_UNTRUSTED, OPT_PASSCERTS,
- OPT_NAME, OPT_CSP, OPT_CANAME,
- OPT_IN, OPT_OUT, OPT_PASSIN, OPT_PASSOUT, OPT_PASSWORD, OPT_CAPATH,
- OPT_CAFILE, OPT_CASTORE, OPT_NOCAPATH, OPT_NOCAFILE, OPT_NOCASTORE,
- OPT_R_ENUM, OPT_PROV_ENUM, OPT_JDKTRUST, OPT_PBMAC1_PBKDF2, OPT_PBMAC1_PBKDF2_MD,
+ OPT_EXPORT,
+ OPT_ITER,
+ OPT_NOITER,
+ OPT_MACITER,
+ OPT_NOMACITER,
+ OPT_MACSALTLEN,
+ OPT_NOMAC,
+ OPT_LMK,
+ OPT_NODES,
+ OPT_NOENC,
+ OPT_MACALG,
+ OPT_CERTPBE,
+ OPT_KEYPBE,
+ OPT_INKEY,
+ OPT_CERTFILE,
+ OPT_UNTRUSTED,
+ OPT_PASSCERTS,
+ OPT_NAME,
+ OPT_CSP,
+ OPT_CANAME,
+ OPT_IN,
+ OPT_OUT,
+ OPT_PASSIN,
+ OPT_PASSOUT,
+ OPT_PASSWORD,
+ OPT_CAPATH,
+ OPT_CAFILE,
+ OPT_CASTORE,
+ OPT_NOCAPATH,
+ OPT_NOCAFILE,
+ OPT_NOCASTORE,
+ OPT_R_ENUM,
+ OPT_PROV_ENUM,
+ OPT_JDKTRUST,
+ OPT_PBMAC1_PBKDF2,
+ OPT_PBMAC1_PBKDF2_MD,
#ifndef OPENSSL_NO_DES
OPT_LEGACY_ALG
#endif
@@ -78,82 +117,82 @@ typedef enum OPTION_choice {
const OPTIONS pkcs12_options[] = {
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
- {"in", OPT_IN, '<', "Input file"},
- {"out", OPT_OUT, '>', "Output file"},
- {"passin", OPT_PASSIN, 's', "Input file pass phrase source"},
- {"passout", OPT_PASSOUT, 's', "Output file pass phrase source"},
- {"password", OPT_PASSWORD, 's', "Set PKCS#12 import/export password source"},
- {"twopass", OPT_TWOPASS, '-', "Separate MAC, encryption passwords"},
- {"nokeys", OPT_NOKEYS, '-', "Don't output private keys"},
- {"nocerts", OPT_NOCERTS, '-', "Don't output certificates"},
- {"noout", OPT_NOOUT, '-', "Don't output anything, just verify PKCS#12 input"},
+ { "help", OPT_HELP, '-', "Display this summary" },
+ { "in", OPT_IN, '<', "Input file" },
+ { "out", OPT_OUT, '>', "Output file" },
+ { "passin", OPT_PASSIN, 's', "Input file pass phrase source" },
+ { "passout", OPT_PASSOUT, 's', "Output file pass phrase source" },
+ { "password", OPT_PASSWORD, 's', "Set PKCS#12 import/export password source" },
+ { "twopass", OPT_TWOPASS, '-', "Separate MAC, encryption passwords" },
+ { "nokeys", OPT_NOKEYS, '-', "Don't output private keys" },
+ { "nocerts", OPT_NOCERTS, '-', "Don't output certificates" },
+ { "noout", OPT_NOOUT, '-', "Don't output anything, just verify PKCS#12 input" },
#ifndef OPENSSL_NO_DES
- {"legacy", OPT_LEGACY_ALG, '-',
-# ifdef OPENSSL_NO_RC2
- "Use legacy encryption algorithm 3DES_CBC for keys and certs"
-# else
- "Use legacy encryption: 3DES_CBC for keys, RC2_CBC for certs"
-# endif
+ { "legacy", OPT_LEGACY_ALG, '-',
+#ifdef OPENSSL_NO_RC2
+ "Use legacy encryption algorithm 3DES_CBC for keys and certs"
+#else
+ "Use legacy encryption: 3DES_CBC for keys, RC2_CBC for certs"
+#endif
},
#endif
OPT_PROV_OPTIONS,
OPT_R_OPTIONS,
OPT_SECTION("PKCS#12 import (parsing PKCS#12)"),
- {"info", OPT_INFO, '-', "Print info about PKCS#12 structure"},
- {"nomacver", OPT_NOMACVER, '-', "Don't verify integrity MAC"},
- {"clcerts", OPT_CLCERTS, '-', "Only output client certificates"},
- {"cacerts", OPT_CACERTS, '-', "Only output CA certificates"},
- {"", OPT_CIPHER, '-', "Any supported cipher for output encryption"},
- {"noenc", OPT_NOENC, '-', "Don't encrypt private keys"},
- {"nodes", OPT_NODES, '-', "Don't encrypt private keys; deprecated"},
+ { "info", OPT_INFO, '-', "Print info about PKCS#12 structure" },
+ { "nomacver", OPT_NOMACVER, '-', "Don't verify integrity MAC" },
+ { "clcerts", OPT_CLCERTS, '-', "Only output client certificates" },
+ { "cacerts", OPT_CACERTS, '-', "Only output CA certificates" },
+ { "", OPT_CIPHER, '-', "Any supported cipher for output encryption" },
+ { "noenc", OPT_NOENC, '-', "Don't encrypt private keys" },
+ { "nodes", OPT_NODES, '-', "Don't encrypt private keys; deprecated" },
OPT_SECTION("PKCS#12 output (export)"),
- {"export", OPT_EXPORT, '-', "Create PKCS12 file"},
- {"inkey", OPT_INKEY, 's', "Private key, else read from -in input file"},
- {"certfile", OPT_CERTFILE, '<', "Extra certificates for PKCS12 output"},
- {"passcerts", OPT_PASSCERTS, 's', "Certificate file pass phrase source"},
- {"chain", OPT_CHAIN, '-', "Build and add certificate chain for EE cert,"},
- {OPT_MORE_STR, 0, 0,
- "which is the 1st cert from -in matching the private key (if given)"},
- {"untrusted", OPT_UNTRUSTED, '<', "Untrusted certificates for chain building"},
- {"CAfile", OPT_CAFILE, '<', "PEM-format file of CA's"},
- {"CApath", OPT_CAPATH, '/', "PEM-format directory of CA's"},
- {"CAstore", OPT_CASTORE, ':', "URI to store of CA's"},
- {"no-CAfile", OPT_NOCAFILE, '-',
- "Do not load the default certificates file"},
- {"no-CApath", OPT_NOCAPATH, '-',
- "Do not load certificates from the default certificates directory"},
- {"no-CAstore", OPT_NOCASTORE, '-',
- "Do not load certificates from the default certificates store"},
- {"name", OPT_NAME, 's', "Use name as friendly name"},
- {"caname", OPT_CANAME, 's',
- "Use name as CA friendly name (can be repeated)"},
- {"CSP", OPT_CSP, 's', "Microsoft CSP name"},
- {"LMK", OPT_LMK, '-',
- "Add local machine keyset attribute to private key"},
- {"keyex", OPT_KEYEX, '-', "Set key type to MS key exchange"},
- {"keysig", OPT_KEYSIG, '-', "Set key type to MS key signature"},
- {"keypbe", OPT_KEYPBE, 's', "Private key PBE algorithm (default AES-256 CBC)"},
- {"certpbe", OPT_CERTPBE, 's',
- "Certificate PBE algorithm (default PBES2 with PBKDF2 and AES-256 CBC)"},
+ { "export", OPT_EXPORT, '-', "Create PKCS12 file" },
+ { "inkey", OPT_INKEY, 's', "Private key, else read from -in input file" },
+ { "certfile", OPT_CERTFILE, '<', "Extra certificates for PKCS12 output" },
+ { "passcerts", OPT_PASSCERTS, 's', "Certificate file pass phrase source" },
+ { "chain", OPT_CHAIN, '-', "Build and add certificate chain for EE cert," },
+ { OPT_MORE_STR, 0, 0,
+ "which is the 1st cert from -in matching the private key (if given)" },
+ { "untrusted", OPT_UNTRUSTED, '<', "Untrusted certificates for chain building" },
+ { "CAfile", OPT_CAFILE, '<', "PEM-format file of CA's" },
+ { "CApath", OPT_CAPATH, '/', "PEM-format directory of CA's" },
+ { "CAstore", OPT_CASTORE, ':', "URI to store of CA's" },
+ { "no-CAfile", OPT_NOCAFILE, '-',
+ "Do not load the default certificates file" },
+ { "no-CApath", OPT_NOCAPATH, '-',
+ "Do not load certificates from the default certificates directory" },
+ { "no-CAstore", OPT_NOCASTORE, '-',
+ "Do not load certificates from the default certificates store" },
+ { "name", OPT_NAME, 's', "Use name as friendly name" },
+ { "caname", OPT_CANAME, 's',
+ "Use name as CA friendly name (can be repeated)" },
+ { "CSP", OPT_CSP, 's', "Microsoft CSP name" },
+ { "LMK", OPT_LMK, '-',
+ "Add local machine keyset attribute to private key" },
+ { "keyex", OPT_KEYEX, '-', "Set key type to MS key exchange" },
+ { "keysig", OPT_KEYSIG, '-', "Set key type to MS key signature" },
+ { "keypbe", OPT_KEYPBE, 's', "Private key PBE algorithm (default AES-256 CBC)" },
+ { "certpbe", OPT_CERTPBE, 's',
+ "Certificate PBE algorithm (default PBES2 with PBKDF2 and AES-256 CBC)" },
#ifndef OPENSSL_NO_DES
- {"descert", OPT_DESCERT, '-',
- "Encrypt output with 3DES (default PBES2 with PBKDF2 and AES-256 CBC)"},
+ { "descert", OPT_DESCERT, '-',
+ "Encrypt output with 3DES (default PBES2 with PBKDF2 and AES-256 CBC)" },
#endif
- {"macalg", OPT_MACALG, 's',
- "Digest algorithm to use in MAC (default SHA256)"},
- {"pbmac1_pbkdf2", OPT_PBMAC1_PBKDF2, '-', "Use PBMAC1 with PBKDF2 instead of MAC"},
- {"pbmac1_pbkdf2_md", OPT_PBMAC1_PBKDF2_MD, 's', "Digest to use for PBMAC1 KDF (default SHA256)"},
- {"iter", OPT_ITER, 'p', "Specify the iteration count for encryption and MAC"},
- {"noiter", OPT_NOITER, '-', "Don't use encryption iteration"},
- {"nomaciter", OPT_NOMACITER, '-', "Don't use MAC iteration)"},
- {"maciter", OPT_MACITER, '-', "Unused, kept for backwards compatibility"},
- {"macsaltlen", OPT_MACSALTLEN, 'p', "Specify the salt len for MAC"},
- {"nomac", OPT_NOMAC, '-', "Don't generate MAC"},
- {"jdktrust", OPT_JDKTRUST, 's', "Mark certificate in PKCS#12 store as trusted for JDK compatibility"},
- {NULL}
+ { "macalg", OPT_MACALG, 's',
+ "Digest algorithm to use in MAC (default SHA256)" },
+ { "pbmac1_pbkdf2", OPT_PBMAC1_PBKDF2, '-', "Use PBMAC1 with PBKDF2 instead of MAC" },
+ { "pbmac1_pbkdf2_md", OPT_PBMAC1_PBKDF2_MD, 's', "Digest to use for PBMAC1 KDF (default SHA256)" },
+ { "iter", OPT_ITER, 'p', "Specify the iteration count for encryption and MAC" },
+ { "noiter", OPT_NOITER, '-', "Don't use encryption iteration" },
+ { "nomaciter", OPT_NOMACITER, '-', "Don't use MAC iteration)" },
+ { "maciter", OPT_MACITER, '-', "Unused, kept for backwards compatibility" },
+ { "macsaltlen", OPT_MACSALTLEN, 'p', "Specify the salt len for MAC" },
+ { "nomac", OPT_NOMAC, '-', "Don't generate MAC" },
+ { "jdktrust", OPT_JDKTRUST, 's', "Mark certificate in PKCS#12 store as trusted for JDK compatibility" },
+ { NULL }
};
int pkcs12_main(int argc, char **argv)
@@ -193,7 +232,7 @@ int pkcs12_main(int argc, char **argv)
switch (o) {
case OPT_EOF:
case OPT_ERR:
- opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
case OPT_HELP:
@@ -392,7 +431,7 @@ int pkcs12_main(int argc, char **argv)
WARN_EXPORT("cacerts");
if (enc != default_enc)
BIO_printf(bio_err,
- "Warning: output encryption option -%s ignored with -export\n", enc_name);
+ "Warning: output encryption option -%s ignored with -export\n", enc_name);
} else {
if (keyname != NULL)
WARN_NO_EXPORT("inkey");
@@ -455,11 +494,11 @@ int pkcs12_main(int argc, char **argv)
}
if (cert_pbe == NID_undef) {
/* Adapt default algorithm */
-# ifndef OPENSSL_NO_RC2
+#ifndef OPENSSL_NO_RC2
cert_pbe = NID_pbe_WithSHA1And40BitRC2_CBC;
-# else
+#else
cert_pbe = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;
-# endif
+#endif
}
if (key_pbe == NID_undef)
@@ -517,7 +556,7 @@ int pkcs12_main(int argc, char **argv)
if (1) {
#ifndef OPENSSL_NO_UI_CONSOLE
if (EVP_read_pw_string(
- macpass, sizeof(macpass), "Enter MAC Password:", export_pkcs12)) {
+ macpass, sizeof(macpass), "Enter MAC Password:", export_pkcs12)) {
BIO_printf(bio_err, "Can't read Password\n");
goto end;
}
@@ -550,10 +589,8 @@ int pkcs12_main(int argc, char **argv)
if (!(options & NOKEYS)) {
key = load_key(keyname ? keyname : infile,
- FORMAT_PEM, 1, passin,
- keyname ?
- "private key from -inkey file" :
- "private key from -in file");
+ FORMAT_PEM, 1, passin,
+ keyname ? "private key from -inkey file" : "private key from -in file");
if (key == NULL)
goto export_end;
}
@@ -561,7 +598,7 @@ int pkcs12_main(int argc, char **argv)
/* Load all certs in input file */
if (!(options & NOCERTS)) {
if (!load_certs(infile, 1, &certs, passin,
- "certificates from -in file"))
+ "certificates from -in file"))
goto export_end;
if (sk_X509_num(certs) < 1) {
BIO_printf(bio_err, "No certificate in -in file %s\n", infile);
@@ -584,8 +621,8 @@ int pkcs12_main(int argc, char **argv)
}
if (ee_cert == NULL) {
BIO_printf(bio_err,
- "No cert in -in file '%s' matches private key\n",
- infile);
+ "No cert in -in file '%s' matches private key\n",
+ infile);
goto export_end;
}
}
@@ -594,7 +631,7 @@ int pkcs12_main(int argc, char **argv)
/* Load any untrusted certificates for chain building */
if (untrusted != NULL) {
if (!load_certs(untrusted, 0, &untrusted_certs, passcerts,
- "untrusted certificates"))
+ "untrusted certificates"))
goto export_end;
}
@@ -611,13 +648,13 @@ int pkcs12_main(int argc, char **argv)
if (ee_cert_tmp == NULL) {
BIO_printf(bio_err,
- "No end entity certificate to check with -chain\n");
+ "No end entity certificate to check with -chain\n");
goto export_end;
}
if ((store = setup_verify(CAfile, noCAfile, CApath, noCApath,
- CAstore, noCAstore))
- == NULL)
+ CAstore, noCAstore))
+ == NULL)
goto export_end;
vret = get_cert_chain(ee_cert_tmp, store, untrusted_certs, &chain2);
@@ -628,15 +665,14 @@ int pkcs12_main(int argc, char **argv)
/* Remove from chain2 the first (end entity) certificate */
X509_free(sk_X509_shift(chain2));
/* Add the remaining certs (except for duplicates) */
- add_certs = X509_add_certs(certs, chain2, X509_ADD_FLAG_UP_REF
- | X509_ADD_FLAG_NO_DUP);
+ add_certs = X509_add_certs(certs, chain2, X509_ADD_FLAG_UP_REF | X509_ADD_FLAG_NO_DUP);
OSSL_STACK_OF_X509_free(chain2);
if (!add_certs)
goto export_end;
} else {
if (vret != X509_V_ERR_UNSPECIFIED)
BIO_printf(bio_err, "Error getting chain: %s\n",
- X509_verify_cert_error_string(vret));
+ X509_verify_cert_error_string(vret));
goto export_end;
}
}
@@ -644,7 +680,7 @@ int pkcs12_main(int argc, char **argv)
/* Add any extra certificates asked for */
if (certfile != NULL) {
if (!load_certs(certfile, 0, &certs, passcerts,
- "extra certificates from -certfile"))
+ "extra certificates from -certfile"))
goto export_end;
}
@@ -656,8 +692,8 @@ int pkcs12_main(int argc, char **argv)
if (csp_name != NULL && key != NULL)
EVP_PKEY_add1_attr_by_NID(key, NID_ms_csp_name,
- MBSTRING_ASC, (unsigned char *)csp_name,
- -1);
+ MBSTRING_ASC, (unsigned char *)csp_name,
+ -1);
if (add_lmk && key != NULL)
EVP_PKEY_add1_attr_by_NID(key, NID_LocalKeySet, 0, NULL, -1);
@@ -667,7 +703,7 @@ int pkcs12_main(int argc, char **argv)
if (1) {
#ifndef OPENSSL_NO_UI_CONSOLE
if (EVP_read_pw_string(pass, sizeof(pass),
- "Enter Export Password:", 1)) {
+ "Enter Export Password:", 1)) {
BIO_printf(bio_err, "Can't read Password\n");
goto export_end;
}
@@ -686,13 +722,13 @@ int pkcs12_main(int argc, char **argv)
}
p12 = PKCS12_create_ex2(cpass, name, key, ee_cert, certs,
- key_pbe, cert_pbe, iter, -1, keytype,
- app_get0_libctx(), app_get0_propq(),
- jdk_trust, (void*)obj);
+ key_pbe, cert_pbe, iter, -1, keytype,
+ app_get0_libctx(), app_get0_propq(),
+ jdk_trust, (void *)obj);
if (p12 == NULL) {
BIO_printf(bio_err, "Error creating PKCS12 structure for %s\n",
- outfile);
+ outfile);
goto export_end;
}
@@ -704,8 +740,8 @@ int pkcs12_main(int argc, char **argv)
if (maciter != -1) {
if (pbmac1_pbkdf2 == 1) {
if (!PKCS12_set_pbmac1_pbkdf2(p12, mpass, -1, NULL,
- macsaltlen, maciter,
- macmd, pbmac1_pbkdf2_md)) {
+ macsaltlen, maciter,
+ macmd, pbmac1_pbkdf2_md)) {
BIO_printf(bio_err, "Error creating PBMAC1\n");
goto export_end;
}
@@ -713,7 +749,7 @@ int pkcs12_main(int argc, char **argv)
if (!PKCS12_set_mac(p12, mpass, -1, NULL, macsaltlen, maciter, macmd)) {
BIO_printf(bio_err, "Error creating PKCS12 MAC; no PKCS12KDF support?\n");
BIO_printf(bio_err,
- "Use -nomac or -pbmac1_pbkdf2 if PKCS12KDF support not available\n");
+ "Use -nomac or -pbmac1_pbkdf2 if PKCS12KDF support not available\n");
goto export_end;
}
}
@@ -728,7 +764,7 @@ int pkcs12_main(int argc, char **argv)
ret = 0;
- export_end:
+ export_end:
EVP_PKEY_free(key);
EVP_MD_free(macmd);
@@ -738,7 +774,6 @@ int pkcs12_main(int argc, char **argv)
ASN1_OBJECT_free(obj);
ERR_print_errors(bio_err);
goto end;
-
}
in = bio_open_default(infile, 'r', FORMAT_PKCS12);
@@ -759,7 +794,7 @@ int pkcs12_main(int argc, char **argv)
if (1) {
#ifndef OPENSSL_NO_UI_CONSOLE
if (EVP_read_pw_string(pass, sizeof(pass), "Enter Import Password:",
- 0)) {
+ 0)) {
BIO_printf(bio_err, "Can't read Password\n");
goto end;
}
@@ -796,10 +831,10 @@ int pkcs12_main(int argc, char **argv)
int prfnid;
BIO_printf(bio_err, " using PBKDF2, Iteration %ld\n",
- ASN1_INTEGER_get(pbkdf2_param->iter));
+ ASN1_INTEGER_get(pbkdf2_param->iter));
BIO_printf(bio_err, "Key length: %ld, Salt length: %d\n",
- ASN1_INTEGER_get(pbkdf2_param->keylength),
- ASN1_STRING_length(pbkdf2_param->salt->value.octet_string));
+ ASN1_INTEGER_get(pbkdf2_param->keylength),
+ ASN1_STRING_length(pbkdf2_param->salt->value.octet_string));
if (pbkdf2_param->prf == NULL) {
prfnid = NID_hmacWithSHA1;
} else {
@@ -811,10 +846,10 @@ int pkcs12_main(int argc, char **argv)
PBKDF2PARAM_free(pbkdf2_param);
} else {
BIO_printf(bio_err, ", Iteration %ld\n",
- tmaciter != NULL ? ASN1_INTEGER_get(tmaciter) : 1L);
+ tmaciter != NULL ? ASN1_INTEGER_get(tmaciter) : 1L);
BIO_printf(bio_err, "MAC length: %ld, salt length: %ld\n",
- tmac != NULL ? ASN1_STRING_length(tmac) : 0L,
- tsalt != NULL ? ASN1_STRING_length(tsalt) : 0L);
+ tmac != NULL ? ASN1_STRING_length(tmac) : 0L,
+ tsalt != NULL ? ASN1_STRING_length(tsalt) : 0L);
}
}
@@ -835,7 +870,7 @@ int pkcs12_main(int argc, char **argv)
EVP_KDF *pkcs12kdf;
pkcs12kdf = EVP_KDF_fetch(app_get0_libctx(), "PKCS12KDF",
- app_get0_propq());
+ app_get0_propq());
if (pkcs12kdf == NULL) {
BIO_printf(bio_err, "Error verifying PKCS12 MAC; no PKCS12KDF support.\n");
BIO_printf(bio_err, "Use -nomacver if MAC verification is not required.\n");
@@ -882,7 +917,7 @@ int pkcs12_main(int argc, char **argv)
}
}
- dump:
+dump:
assert(private);
out = bio_open_owner(outfile, FORMAT_PEM, private);
@@ -895,7 +930,7 @@ int pkcs12_main(int argc, char **argv)
goto end;
}
ret = 0;
- end:
+end:
PKCS12_free(p12);
BIO_free(in);
BIO_free_all(out);
@@ -917,10 +952,10 @@ static int jdk_trust(PKCS12_SAFEBAG *bag, void *cbarg)
return 1;
/* Get the current attrs */
- attrs = (STACK_OF(X509_ATTRIBUTE)*)PKCS12_SAFEBAG_get0_attrs(bag);
+ attrs = (STACK_OF(X509_ATTRIBUTE) *)PKCS12_SAFEBAG_get0_attrs(bag);
/* Create a new attr for the JDK Trusted Usage and add it */
- attr = X509_ATTRIBUTE_create(NID_oracle_jdk_trustedkeyusage, V_ASN1_OBJECT, (ASN1_OBJECT*)cbarg);
+ attr = X509_ATTRIBUTE_create(NID_oracle_jdk_trustedkeyusage, V_ASN1_OBJECT, (ASN1_OBJECT *)cbarg);
/* Add the new attr, if attrs is NULL, it'll be initialised */
X509at_add1_attr(&attrs, attr);
@@ -933,8 +968,8 @@ static int jdk_trust(PKCS12_SAFEBAG *bag, void *cbarg)
}
int dump_certs_keys_p12(BIO *out, const PKCS12 *p12, const char *pass,
- int passlen, int options, char *pempass,
- const EVP_CIPHER *enc)
+ int passlen, int options, char *pempass,
+ const EVP_CIPHER *enc)
{
STACK_OF(PKCS7) *asafes = NULL;
int i, bagnid;
@@ -968,7 +1003,7 @@ int dump_certs_keys_p12(BIO *out, const PKCS12 *p12, const char *pass,
if (bags == NULL)
goto err;
if (!dump_certs_pkeys_bags(out, bags, pass, passlen,
- options, pempass, enc)) {
+ options, pempass, enc)) {
sk_PKCS12_SAFEBAG_pop_free(bags, PKCS12_SAFEBAG_free);
goto err;
}
@@ -976,28 +1011,28 @@ int dump_certs_keys_p12(BIO *out, const PKCS12 *p12, const char *pass,
}
ret = 1;
- err:
+err:
sk_PKCS7_pop_free(asafes, PKCS7_free);
return ret;
}
int dump_certs_pkeys_bags(BIO *out, const STACK_OF(PKCS12_SAFEBAG) *bags,
- const char *pass, int passlen, int options,
- char *pempass, const EVP_CIPHER *enc)
+ const char *pass, int passlen, int options,
+ char *pempass, const EVP_CIPHER *enc)
{
int i;
for (i = 0; i < sk_PKCS12_SAFEBAG_num(bags); i++) {
if (!dump_certs_pkeys_bag(out,
- sk_PKCS12_SAFEBAG_value(bags, i),
- pass, passlen, options, pempass, enc))
+ sk_PKCS12_SAFEBAG_value(bags, i),
+ pass, passlen, options, pempass, enc))
return 0;
}
return 1;
}
int dump_certs_pkeys_bag(BIO *out, const PKCS12_SAFEBAG *bag,
- const char *pass, int passlen, int options,
- char *pempass, const EVP_CIPHER *enc)
+ const char *pass, int passlen, int options,
+ char *pempass, const EVP_CIPHER *enc)
{
EVP_PKEY *pkey;
PKCS8_PRIV_KEY_INFO *p8;
@@ -1083,7 +1118,7 @@ int dump_certs_pkeys_bag(BIO *out, const PKCS12_SAFEBAG *bag,
BIO_printf(bio_err, "Safe Contents bag\n");
print_attribs(out, attrs, "Bag Attributes");
return dump_certs_pkeys_bags(out, PKCS12_SAFEBAG_get0_safes(bag),
- pass, passlen, options, pempass, enc);
+ pass, passlen, options, pempass, enc);
default:
BIO_printf(bio_err, "Warning unsupported bag type: ");
@@ -1097,8 +1132,8 @@ int dump_certs_pkeys_bag(BIO *out, const PKCS12_SAFEBAG *bag,
/* Given a single certificate return a verified chain or NULL if error */
static int get_cert_chain(X509 *cert, X509_STORE *store,
- STACK_OF(X509) *untrusted_certs,
- STACK_OF(X509) **chain)
+ STACK_OF(X509) *untrusted_certs,
+ STACK_OF(X509) **chain)
{
X509_STORE_CTX *store_ctx = NULL;
STACK_OF(X509) *chn = NULL;
@@ -1106,15 +1141,14 @@ static int get_cert_chain(X509 *cert, X509_STORE *store,
store_ctx = X509_STORE_CTX_new_ex(app_get0_libctx(), app_get0_propq());
if (store_ctx == NULL) {
- i = X509_V_ERR_UNSPECIFIED;
+ i = X509_V_ERR_UNSPECIFIED;
goto end;
}
if (!X509_STORE_CTX_init(store_ctx, store, cert, untrusted_certs)) {
- i = X509_V_ERR_UNSPECIFIED;
+ i = X509_V_ERR_UNSPECIFIED;
goto end;
}
-
if (X509_verify_cert(store_ctx) > 0)
chn = X509_STORE_CTX_get1_chain(store_ctx);
else if ((i = X509_STORE_CTX_get_error(store_ctx)) == 0)
@@ -1157,7 +1191,7 @@ static int alg_print(const X509_ALGOR *alg)
X509_ALGOR_get0(&aoid, NULL, NULL, pbe2->encryption);
encnid = OBJ_obj2nid(aoid);
BIO_printf(bio_err, ", %s, %s", OBJ_nid2ln(pbenid),
- OBJ_nid2sn(encnid));
+ OBJ_nid2sn(encnid));
/* If KDF is PBKDF2 decode parameters */
if (pbenid == NID_id_pbkdf2) {
PBKDF2PARAM *kdf = NULL;
@@ -1176,7 +1210,7 @@ static int alg_print(const X509_ALGOR *alg)
prfnid = OBJ_obj2nid(aoid);
}
BIO_printf(bio_err, ", Iteration %ld, PRF %s",
- ASN1_INTEGER_get(kdf->iter), OBJ_nid2sn(prfnid));
+ ASN1_INTEGER_get(kdf->iter), OBJ_nid2sn(prfnid));
PBKDF2PARAM_free(kdf);
#ifndef OPENSSL_NO_SCRYPT
} else if (pbenid == NID_id_scrypt) {
@@ -1189,11 +1223,11 @@ static int alg_print(const X509_ALGOR *alg)
goto done;
}
BIO_printf(bio_err, ", Salt length: %d, Cost(N): %ld, "
- "Block size(r): %ld, Parallelism(p): %ld",
- ASN1_STRING_length(kdf->salt),
- ASN1_INTEGER_get(kdf->costParameter),
- ASN1_INTEGER_get(kdf->blockSize),
- ASN1_INTEGER_get(kdf->parallelizationParameter));
+ "Block size(r): %ld, Parallelism(p): %ld",
+ ASN1_STRING_length(kdf->salt),
+ ASN1_INTEGER_get(kdf->costParameter),
+ ASN1_INTEGER_get(kdf->blockSize),
+ ASN1_INTEGER_get(kdf->parallelizationParameter));
SCRYPT_PARAMS_free(kdf);
#endif
}
@@ -1208,7 +1242,7 @@ static int alg_print(const X509_ALGOR *alg)
BIO_printf(bio_err, ", Iteration %ld", ASN1_INTEGER_get(pbe->iter));
PBEPARAM_free(pbe);
}
- done:
+done:
BIO_puts(bio_err, "\n");
return 1;
}
@@ -1241,25 +1275,25 @@ void print_attribute(BIO *out, const ASN1_TYPE *av)
switch (av->type) {
case V_ASN1_BMPSTRING:
value = OPENSSL_uni2asc(av->value.bmpstring->data,
- av->value.bmpstring->length);
+ av->value.bmpstring->length);
BIO_printf(out, "%s\n", value);
OPENSSL_free(value);
break;
case V_ASN1_UTF8STRING:
BIO_printf(out, "%.*s\n", av->value.utf8string->length,
- av->value.utf8string->data);
+ av->value.utf8string->data);
break;
case V_ASN1_OCTET_STRING:
hex_prin(out, av->value.octet_string->data,
- av->value.octet_string->length);
+ av->value.octet_string->length);
BIO_printf(out, "\n");
break;
case V_ASN1_BIT_STRING:
hex_prin(out, av->value.bit_string->data,
- av->value.bit_string->length);
+ av->value.bit_string->length);
BIO_printf(out, "\n");
break;
@@ -1281,7 +1315,7 @@ void print_attribute(BIO *out, const ASN1_TYPE *av)
/* Generalised attribute print: handle PKCS#8 and bag attributes */
int print_attribs(BIO *out, const STACK_OF(X509_ATTRIBUTE) *attrlst,
- const char *name)
+ const char *name)
{
X509_ATTRIBUTE *attr;
ASN1_TYPE *av;
diff --git a/apps/pkcs7.c b/apps/pkcs7.c
index 90659334b8..33d84098be 100644
--- a/apps/pkcs7.c
+++ b/apps/pkcs7.c
@@ -22,32 +22,39 @@
typedef enum OPTION_choice {
OPT_COMMON,
- OPT_INFORM, OPT_OUTFORM, OPT_IN, OPT_OUT, OPT_NOOUT,
- OPT_TEXT, OPT_PRINT, OPT_PRINT_CERTS, OPT_QUIET,
+ OPT_INFORM,
+ OPT_OUTFORM,
+ OPT_IN,
+ OPT_OUT,
+ OPT_NOOUT,
+ OPT_TEXT,
+ OPT_PRINT,
+ OPT_PRINT_CERTS,
+ OPT_QUIET,
OPT_PROV_ENUM
} OPTION_CHOICE;
const OPTIONS pkcs7_options[] = {
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
+ { "help", OPT_HELP, '-', "Display this summary" },
OPT_SECTION("Input"),
- {"in", OPT_IN, '<', "Input file"},
- {"inform", OPT_INFORM, 'F', "Input format - DER or PEM"},
+ { "in", OPT_IN, '<', "Input file" },
+ { "inform", OPT_INFORM, 'F', "Input format - DER or PEM" },
OPT_SECTION("Output"),
- {"outform", OPT_OUTFORM, 'F', "Output format - DER or PEM"},
- {"out", OPT_OUT, '>', "Output file"},
- {"noout", OPT_NOOUT, '-', "Don't output encoded data"},
- {"text", OPT_TEXT, '-', "Print full details of certificates"},
- {"print", OPT_PRINT, '-', "Print out all fields of the PKCS7 structure"},
- {"print_certs", OPT_PRINT_CERTS, '-',
- "Print_certs print any certs or crl in the input"},
- {"quiet", OPT_QUIET, '-',
- "When used with -print_certs, it produces a cleaner output"},
+ { "outform", OPT_OUTFORM, 'F', "Output format - DER or PEM" },
+ { "out", OPT_OUT, '>', "Output file" },
+ { "noout", OPT_NOOUT, '-', "Don't output encoded data" },
+ { "text", OPT_TEXT, '-', "Print full details of certificates" },
+ { "print", OPT_PRINT, '-', "Print out all fields of the PKCS7 structure" },
+ { "print_certs", OPT_PRINT_CERTS, '-',
+ "Print_certs print any certs or crl in the input" },
+ { "quiet", OPT_QUIET, '-',
+ "When used with -print_certs, it produces a cleaner output" },
OPT_PROV_OPTIONS,
- {NULL}
+ { NULL }
};
int pkcs7_main(int argc, char **argv)
@@ -65,7 +72,7 @@ int pkcs7_main(int argc, char **argv)
switch (o) {
case OPT_EOF:
case OPT_ERR:
- opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
case OPT_HELP:
@@ -208,7 +215,7 @@ int pkcs7_main(int argc, char **argv)
}
}
ret = 0;
- end:
+end:
PKCS7_free(p7);
BIO_free(in);
BIO_free_all(out);
diff --git a/apps/pkcs8.c b/apps/pkcs8.c
index 4876ce502a..4d73f30c2f 100644
--- a/apps/pkcs8.c
+++ b/apps/pkcs8.c
@@ -22,51 +22,65 @@
typedef enum OPTION_choice {
OPT_COMMON,
- OPT_INFORM, OPT_OUTFORM, OPT_IN, OPT_OUT,
- OPT_TOPK8, OPT_NOITER, OPT_NOCRYPT,
+ OPT_INFORM,
+ OPT_OUTFORM,
+ OPT_IN,
+ OPT_OUT,
+ OPT_TOPK8,
+ OPT_NOITER,
+ OPT_NOCRYPT,
#ifndef OPENSSL_NO_SCRYPT
- OPT_SCRYPT, OPT_SCRYPT_N, OPT_SCRYPT_R, OPT_SCRYPT_P,
+ OPT_SCRYPT,
+ OPT_SCRYPT_N,
+ OPT_SCRYPT_R,
+ OPT_SCRYPT_P,
#endif
- OPT_V2, OPT_V1, OPT_V2PRF, OPT_ITER, OPT_PASSIN, OPT_PASSOUT,
+ OPT_V2,
+ OPT_V1,
+ OPT_V2PRF,
+ OPT_ITER,
+ OPT_PASSIN,
+ OPT_PASSOUT,
OPT_TRADITIONAL,
OPT_SALTLEN,
- OPT_R_ENUM, OPT_PROV_ENUM
+ OPT_R_ENUM,
+ OPT_PROV_ENUM
} OPTION_CHOICE;
const OPTIONS pkcs8_options[] = {
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
- {"v1", OPT_V1, 's', "Use PKCS#5 v1.5 and cipher"},
- {"v2", OPT_V2, 's', "Use PKCS#5 v2.0 and cipher"},
- {"v2prf", OPT_V2PRF, 's', "Set the PRF algorithm to use with PKCS#5 v2.0"},
+ { "help", OPT_HELP, '-', "Display this summary" },
+ { "v1", OPT_V1, 's', "Use PKCS#5 v1.5 and cipher" },
+ { "v2", OPT_V2, 's', "Use PKCS#5 v2.0 and cipher" },
+ { "v2prf", OPT_V2PRF, 's', "Set the PRF algorithm to use with PKCS#5 v2.0" },
OPT_SECTION("Input"),
- {"in", OPT_IN, '<', "Input file"},
- {"inform", OPT_INFORM, 'F', "Input format (DER or PEM)"},
- {"passin", OPT_PASSIN, 's', "Input file pass phrase source"},
- {"nocrypt", OPT_NOCRYPT, '-', "Use or expect unencrypted private key"},
+ { "in", OPT_IN, '<', "Input file" },
+ { "inform", OPT_INFORM, 'F', "Input format (DER or PEM)" },
+ { "passin", OPT_PASSIN, 's', "Input file pass phrase source" },
+ { "nocrypt", OPT_NOCRYPT, '-', "Use or expect unencrypted private key" },
OPT_SECTION("Output"),
- {"out", OPT_OUT, '>', "Output file"},
- {"outform", OPT_OUTFORM, 'F', "Output format (DER or PEM)"},
- {"topk8", OPT_TOPK8, '-', "Output PKCS8 file"},
- {"passout", OPT_PASSOUT, 's', "Output file pass phrase source"},
- {"traditional", OPT_TRADITIONAL, '-', "use traditional format private key"},
- {"iter", OPT_ITER, 'p', "Specify the iteration count"},
- {"noiter", OPT_NOITER, '-', "Use 1 as iteration count"},
- {"saltlen", OPT_SALTLEN, 'p', "Specify the salt length (in bytes)"},
- {OPT_MORE_STR, 0, 0, "Default: 8 (For PBE1) or 16 (for PBE2)"},
+ { "out", OPT_OUT, '>', "Output file" },
+ { "outform", OPT_OUTFORM, 'F', "Output format (DER or PEM)" },
+ { "topk8", OPT_TOPK8, '-', "Output PKCS8 file" },
+ { "passout", OPT_PASSOUT, 's', "Output file pass phrase source" },
+ { "traditional", OPT_TRADITIONAL, '-', "use traditional format private key" },
+ { "iter", OPT_ITER, 'p', "Specify the iteration count" },
+ { "noiter", OPT_NOITER, '-', "Use 1 as iteration count" },
+ { "saltlen", OPT_SALTLEN, 'p', "Specify the salt length (in bytes)" },
+ { OPT_MORE_STR, 0, 0, "Default: 8 (For PBE1) or 16 (for PBE2)" },
#ifndef OPENSSL_NO_SCRYPT
OPT_SECTION("Scrypt"),
- {"scrypt", OPT_SCRYPT, '-', "Use scrypt algorithm"},
- {"scrypt_N", OPT_SCRYPT_N, 's', "Set scrypt N parameter"},
- {"scrypt_r", OPT_SCRYPT_R, 's', "Set scrypt r parameter"},
- {"scrypt_p", OPT_SCRYPT_P, 's', "Set scrypt p parameter"},
+ { "scrypt", OPT_SCRYPT, '-', "Use scrypt algorithm" },
+ { "scrypt_N", OPT_SCRYPT_N, 's', "Set scrypt N parameter" },
+ { "scrypt_r", OPT_SCRYPT_R, 's', "Set scrypt r parameter" },
+ { "scrypt_p", OPT_SCRYPT_P, 's', "Set scrypt p parameter" },
#endif
OPT_R_OPTIONS,
OPT_PROV_OPTIONS,
- {NULL}
+ { NULL }
};
int pkcs8_main(int argc, char **argv)
@@ -96,7 +110,7 @@ int pkcs8_main(int argc, char **argv)
switch (o) {
case OPT_EOF:
case OPT_ERR:
- opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
case OPT_HELP:
@@ -144,7 +158,7 @@ int pkcs8_main(int argc, char **argv)
pbe_nid = OBJ_txt2nid(opt_arg());
if (pbe_nid == NID_undef) {
BIO_printf(bio_err,
- "%s: Unknown PBE algorithm %s\n", prog, opt_arg());
+ "%s: Unknown PBE algorithm %s\n", prog, opt_arg());
goto opthelp;
}
break;
@@ -152,14 +166,14 @@ int pkcs8_main(int argc, char **argv)
pbe_nid = OBJ_txt2nid(opt_arg());
if (!EVP_PBE_find(EVP_PBE_TYPE_PRF, pbe_nid, NULL, NULL, 0)) {
BIO_printf(bio_err,
- "%s: Unknown PRF algorithm %s\n", prog, opt_arg());
+ "%s: Unknown PRF algorithm %s\n", prog, opt_arg());
goto opthelp;
}
if (cipher == NULL)
cipher = (EVP_CIPHER *)EVP_aes_256_cbc();
break;
case OPT_ITER:
- iter = opt_int_arg();
+ iter = opt_int_arg();
break;
case OPT_PASSIN:
passinarg = opt_arg();
@@ -217,7 +231,7 @@ int pkcs8_main(int argc, char **argv)
cipher = (EVP_CIPHER *)EVP_aes_256_cbc();
in = bio_open_default(infile, 'r',
- informat == FORMAT_UNDEF ? FORMAT_PEM : informat);
+ informat == FORMAT_UNDEF ? FORMAT_PEM : informat);
if (in == NULL)
goto end;
@@ -248,11 +262,11 @@ int pkcs8_main(int argc, char **argv)
#ifndef OPENSSL_NO_SCRYPT
if (scrypt_N && scrypt_r && scrypt_p)
pbe = PKCS5_pbe2_set_scrypt(cipher, NULL, saltlen, NULL,
- scrypt_N, scrypt_r, scrypt_p);
+ scrypt_N, scrypt_r, scrypt_p);
else
#endif
pbe = PKCS5_pbe2_set_iv(cipher, iter, NULL, saltlen, NULL,
- pbe_nid);
+ pbe_nid);
} else {
pbe = PKCS5_pbe_set(pbe_nid, iter, NULL, saltlen);
}
@@ -267,8 +281,7 @@ int pkcs8_main(int argc, char **argv)
/* To avoid bit rot */
#ifndef OPENSSL_NO_UI_CONSOLE
p8pass = pass;
- if (EVP_read_pw_string
- (pass, sizeof(pass), "Enter Encryption Password:", 1)) {
+ if (EVP_read_pw_string(pass, sizeof(pass), "Enter Encryption Password:", 1)) {
X509_ALGOR_free(pbe);
goto end;
}
@@ -359,7 +372,7 @@ int pkcs8_main(int argc, char **argv)
if (outformat == FORMAT_PEM) {
if (traditional)
PEM_write_bio_PrivateKey_traditional(out, pkey, NULL, NULL, 0,
- NULL, passout);
+ NULL, passout);
else
PEM_write_bio_PrivateKey(out, pkey, NULL, NULL, 0, NULL, passout);
} else if (outformat == FORMAT_ASN1) {
@@ -370,7 +383,7 @@ int pkcs8_main(int argc, char **argv)
}
ret = 0;
- end:
+end:
X509_SIG_free(p8);
PKCS8_PRIV_KEY_INFO_free(p8inf);
EVP_PKEY_free(pkey);
diff --git a/apps/pkey.c b/apps/pkey.c
index b9dcc2f0f6..13160f9d8a 100644
--- a/apps/pkey.c
+++ b/apps/pkey.c
@@ -19,46 +19,59 @@
typedef enum OPTION_choice {
OPT_COMMON,
- OPT_INFORM, OPT_OUTFORM, OPT_PASSIN, OPT_PASSOUT,
- OPT_IN, OPT_OUT, OPT_PUBIN, OPT_PUBOUT, OPT_TEXT_PUB,
- OPT_TEXT, OPT_NOOUT, OPT_CIPHER, OPT_TRADITIONAL, OPT_CHECK, OPT_PUB_CHECK,
- OPT_EC_PARAM_ENC, OPT_EC_CONV_FORM,
+ OPT_INFORM,
+ OPT_OUTFORM,
+ OPT_PASSIN,
+ OPT_PASSOUT,
+ OPT_IN,
+ OPT_OUT,
+ OPT_PUBIN,
+ OPT_PUBOUT,
+ OPT_TEXT_PUB,
+ OPT_TEXT,
+ OPT_NOOUT,
+ OPT_CIPHER,
+ OPT_TRADITIONAL,
+ OPT_CHECK,
+ OPT_PUB_CHECK,
+ OPT_EC_PARAM_ENC,
+ OPT_EC_CONV_FORM,
OPT_PROV_ENUM
} OPTION_CHOICE;
const OPTIONS pkey_options[] = {
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
+ { "help", OPT_HELP, '-', "Display this summary" },
OPT_PROV_OPTIONS,
- {"check", OPT_CHECK, '-', "Check key consistency"},
- {"pubcheck", OPT_PUB_CHECK, '-', "Check public key consistency"},
+ { "check", OPT_CHECK, '-', "Check key consistency" },
+ { "pubcheck", OPT_PUB_CHECK, '-', "Check public key consistency" },
OPT_SECTION("Input"),
- {"in", OPT_IN, 's', "Input key"},
- {"inform", OPT_INFORM, 'f', "Key input format (DER/PEM)"},
- {"passin", OPT_PASSIN, 's', "Key input pass phrase source"},
- {"pubin", OPT_PUBIN, '-',
- "Read only public components from key input"},
+ { "in", OPT_IN, 's', "Input key" },
+ { "inform", OPT_INFORM, 'f', "Key input format (DER/PEM)" },
+ { "passin", OPT_PASSIN, 's', "Key input pass phrase source" },
+ { "pubin", OPT_PUBIN, '-',
+ "Read only public components from key input" },
OPT_SECTION("Output"),
- {"out", OPT_OUT, '>', "Output file for encoded and/or text output"},
- {"outform", OPT_OUTFORM, 'F', "Output encoding format (DER or PEM)"},
- {"", OPT_CIPHER, '-', "Any supported cipher to be used for encryption"},
- {"passout", OPT_PASSOUT, 's', "Output PEM file pass phrase source"},
- {"traditional", OPT_TRADITIONAL, '-',
- "Use traditional format for private key PEM output"},
- {"pubout", OPT_PUBOUT, '-', "Restrict encoded output to public components"},
- {"noout", OPT_NOOUT, '-', "Do not output the key in encoded form"},
- {"text", OPT_TEXT, '-', "Output key components in plaintext"},
- {"text_pub", OPT_TEXT_PUB, '-',
- "Output only public key components in text form"},
- {"ec_conv_form", OPT_EC_CONV_FORM, 's',
- "Specifies the EC point conversion form in the encoding"},
- {"ec_param_enc", OPT_EC_PARAM_ENC, 's',
- "Specifies the way the EC parameters are encoded"},
+ { "out", OPT_OUT, '>', "Output file for encoded and/or text output" },
+ { "outform", OPT_OUTFORM, 'F', "Output encoding format (DER or PEM)" },
+ { "", OPT_CIPHER, '-', "Any supported cipher to be used for encryption" },
+ { "passout", OPT_PASSOUT, 's', "Output PEM file pass phrase source" },
+ { "traditional", OPT_TRADITIONAL, '-',
+ "Use traditional format for private key PEM output" },
+ { "pubout", OPT_PUBOUT, '-', "Restrict encoded output to public components" },
+ { "noout", OPT_NOOUT, '-', "Do not output the key in encoded form" },
+ { "text", OPT_TEXT, '-', "Output key components in plaintext" },
+ { "text_pub", OPT_TEXT_PUB, '-',
+ "Output only public key components in text form" },
+ { "ec_conv_form", OPT_EC_CONV_FORM, 's',
+ "Specifies the EC point conversion form in the encoding" },
+ { "ec_param_enc", OPT_EC_PARAM_ENC, 's',
+ "Specifies the way the EC parameters are encoded" },
- {NULL}
+ { NULL }
};
int pkey_main(int argc, char **argv)
@@ -84,7 +97,7 @@ int pkey_main(int argc, char **argv)
switch (o) {
case OPT_EOF:
case OPT_ERR:
- opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
case OPT_HELP:
@@ -169,10 +182,10 @@ int pkey_main(int argc, char **argv)
if (text && text_pub)
BIO_printf(bio_err,
- "Warning: The -text option is ignored with -text_pub\n");
+ "Warning: The -text option is ignored with -text_pub\n");
if (traditional && (noout || pubout))
BIO_printf(bio_err,
- "Warning: -traditional is ignored with no private key output\n");
+ "Warning: -traditional is ignored with no private key output\n");
/* -pubout and -text is the same as -text_pub */
if (!text_pub && pubout && text) {
@@ -187,11 +200,11 @@ int pkey_main(int argc, char **argv)
if (cipher == NULL) {
if (passoutarg != NULL)
BIO_printf(bio_err,
- "Warning: The -passout option is ignored without a cipher option\n");
+ "Warning: The -passout option is ignored without a cipher option\n");
} else {
if (noout || outformat != FORMAT_PEM) {
BIO_printf(bio_err,
- "Error: Cipher options are supported only for PEM output\n");
+ "Error: Cipher options are supported only for PEM output\n");
goto end;
}
}
@@ -220,11 +233,11 @@ int pkey_main(int argc, char **argv)
if (asn1_encoding != NULL)
*p++ = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_EC_ENCODING,
- asn1_encoding, 0);
+ asn1_encoding, 0);
if (point_format != NULL)
*p++ = OSSL_PARAM_construct_utf8_string(
- OSSL_PKEY_PARAM_EC_POINT_CONVERSION_FORMAT,
- point_format, 0);
+ OSSL_PKEY_PARAM_EC_POINT_CONVERSION_FORMAT,
+ point_format, 0);
*p = OSSL_PARAM_construct_end();
if (EVP_PKEY_set_params(pkey, params) <= 0)
goto end;
@@ -267,19 +280,19 @@ int pkey_main(int argc, char **argv)
assert(private);
if (traditional) {
if (!PEM_write_bio_PrivateKey_traditional(out, pkey, cipher,
- NULL, 0, NULL,
- passout))
+ NULL, 0, NULL,
+ passout))
goto end;
} else {
if (!PEM_write_bio_PrivateKey(out, pkey, cipher,
- NULL, 0, NULL, passout))
+ NULL, 0, NULL, passout))
goto end;
}
}
} else if (outformat == FORMAT_ASN1) {
if (text || text_pub) {
BIO_printf(bio_err,
- "Error: Text output cannot be combined with DER output\n");
+ "Error: Text output cannot be combined with DER output\n");
goto end;
}
if (pubout) {
@@ -292,7 +305,7 @@ int pkey_main(int argc, char **argv)
goto end;
} else {
if (!i2d_PKCS8PrivateKey_bio(out, pkey, NULL, NULL, 0,
- NULL, NULL))
+ NULL, NULL))
goto end;
}
}
@@ -313,7 +326,7 @@ int pkey_main(int argc, char **argv)
ret = 0;
- end:
+end:
if (ret != 0)
ERR_print_errors(bio_err);
EVP_PKEY_CTX_free(ctx);
diff --git a/apps/pkeyparam.c b/apps/pkeyparam.c
index a35ad3e3b3..624ab91cf0 100644
--- a/apps/pkeyparam.c
+++ b/apps/pkeyparam.c
@@ -18,26 +18,29 @@
typedef enum OPTION_choice {
OPT_COMMON,
- OPT_IN, OPT_OUT, OPT_TEXT, OPT_NOOUT,
+ OPT_IN,
+ OPT_OUT,
+ OPT_TEXT,
+ OPT_NOOUT,
OPT_CHECK,
OPT_PROV_ENUM
} OPTION_CHOICE;
const OPTIONS pkeyparam_options[] = {
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
- {"check", OPT_CHECK, '-', "Check key param consistency"},
+ { "help", OPT_HELP, '-', "Display this summary" },
+ { "check", OPT_CHECK, '-', "Check key param consistency" },
OPT_SECTION("Input"),
- {"in", OPT_IN, '<', "Input file"},
+ { "in", OPT_IN, '<', "Input file" },
OPT_SECTION("Output"),
- {"out", OPT_OUT, '>', "Output file"},
- {"text", OPT_TEXT, '-', "Print parameters as text"},
- {"noout", OPT_NOOUT, '-', "Don't output encoded parameters"},
+ { "out", OPT_OUT, '>', "Output file" },
+ { "text", OPT_TEXT, '-', "Print parameters as text" },
+ { "noout", OPT_NOOUT, '-', "Don't output encoded parameters" },
OPT_PROV_OPTIONS,
- {NULL}
+ { NULL }
};
int pkeyparam_main(int argc, char **argv)
@@ -54,7 +57,7 @@ int pkeyparam_main(int argc, char **argv)
switch (o) {
case OPT_EOF:
case OPT_ERR:
- opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
case OPT_HELP:
@@ -91,7 +94,7 @@ int pkeyparam_main(int argc, char **argv)
if (in == NULL)
goto end;
pkey = PEM_read_bio_Parameters_ex(in, NULL, app_get0_libctx(),
- app_get0_propq());
+ app_get0_propq());
if (pkey == NULL) {
BIO_printf(bio_err, "Error reading parameters\n");
ERR_print_errors(bio_err);
@@ -103,7 +106,7 @@ int pkeyparam_main(int argc, char **argv)
if (check) {
ctx = EVP_PKEY_CTX_new_from_pkey(app_get0_libctx(), pkey,
- app_get0_propq());
+ app_get0_propq());
if (ctx == NULL) {
ERR_print_errors(bio_err);
goto end;
@@ -132,7 +135,7 @@ int pkeyparam_main(int argc, char **argv)
ret = EXIT_SUCCESS;
- end:
+end:
EVP_PKEY_CTX_free(ctx);
EVP_PKEY_free(pkey);
BIO_free_all(out);
diff --git a/apps/pkeyutl.c b/apps/pkeyutl.c
index 2e77f2b29d..59b061b7d9 100644
--- a/apps/pkeyutl.c
+++ b/apps/pkeyutl.c
@@ -15,31 +15,31 @@
#include <openssl/evp.h>
#include <sys/stat.h>
-#define KEY_NONE 0
-#define KEY_PRIVKEY 1
-#define KEY_PUBKEY 2
-#define KEY_CERT 3
+#define KEY_NONE 0
+#define KEY_PRIVKEY 1
+#define KEY_PUBKEY 2
+#define KEY_CERT 3
static EVP_PKEY *get_pkey(const char *kdfalg,
- const char *keyfile, int keyform, int key_type,
- char *passinarg, int pkey_op);
+ const char *keyfile, int keyform, int key_type,
+ char *passinarg, int pkey_op);
static EVP_PKEY_CTX *init_ctx(const char *kdfalg, int *pkeysize,
- int pkey_op, int rawin,
- EVP_PKEY *pkey /* ownership is passed to ctx */,
- EVP_MD_CTX *mctx, const char *digestname,
- const char *kemop, OSSL_LIB_CTX *libctx, const char *propq);
+ int pkey_op, int rawin,
+ EVP_PKEY *pkey /* ownership is passed to ctx */,
+ EVP_MD_CTX *mctx, const char *digestname,
+ const char *kemop, OSSL_LIB_CTX *libctx, const char *propq);
static int setup_peer(EVP_PKEY_CTX *ctx, int peerform, const char *file);
static int do_keyop(EVP_PKEY_CTX *ctx, int pkey_op,
- unsigned char *out, size_t *poutlen,
- const unsigned char *in, size_t inlen,
- unsigned char *secret, size_t *psecretlen);
+ unsigned char *out, size_t *poutlen,
+ const unsigned char *in, size_t inlen,
+ unsigned char *secret, size_t *psecretlen);
static int do_raw_keyop(int pkey_op, EVP_MD_CTX *mctx,
- EVP_PKEY *pkey, BIO *in,
- int filesize, unsigned char *sig, int siglen,
- unsigned char **out, size_t *poutlen);
+ EVP_PKEY *pkey, BIO *in,
+ int filesize, unsigned char *sig, int siglen,
+ unsigned char **out, size_t *poutlen);
static int only_nomd(EVP_PKEY *pkey)
{
@@ -54,65 +54,88 @@ static int only_nomd(EVP_PKEY *pkey)
typedef enum OPTION_choice {
OPT_COMMON,
- OPT_IN, OPT_OUT,
- OPT_PUBIN, OPT_CERTIN, OPT_ASN1PARSE, OPT_HEXDUMP, OPT_SIGN,
- OPT_VERIFY, OPT_VERIFYRECOVER, OPT_REV, OPT_ENCRYPT, OPT_DECRYPT,
- OPT_DERIVE, OPT_SIGFILE, OPT_INKEY, OPT_PEERKEY, OPT_PASSIN,
- OPT_PEERFORM, OPT_KEYFORM, OPT_PKEYOPT, OPT_PKEYOPT_PASSIN, OPT_KDF,
- OPT_KDFLEN, OPT_R_ENUM, OPT_PROV_ENUM,
- OPT_DECAP, OPT_ENCAP, OPT_SECOUT, OPT_KEMOP,
+ OPT_IN,
+ OPT_OUT,
+ OPT_PUBIN,
+ OPT_CERTIN,
+ OPT_ASN1PARSE,
+ OPT_HEXDUMP,
+ OPT_SIGN,
+ OPT_VERIFY,
+ OPT_VERIFYRECOVER,
+ OPT_REV,
+ OPT_ENCRYPT,
+ OPT_DECRYPT,
+ OPT_DERIVE,
+ OPT_SIGFILE,
+ OPT_INKEY,
+ OPT_PEERKEY,
+ OPT_PASSIN,
+ OPT_PEERFORM,
+ OPT_KEYFORM,
+ OPT_PKEYOPT,
+ OPT_PKEYOPT_PASSIN,
+ OPT_KDF,
+ OPT_KDFLEN,
+ OPT_R_ENUM,
+ OPT_PROV_ENUM,
+ OPT_DECAP,
+ OPT_ENCAP,
+ OPT_SECOUT,
+ OPT_KEMOP,
OPT_CONFIG,
- OPT_RAWIN, OPT_DIGEST
+ OPT_RAWIN,
+ OPT_DIGEST
} OPTION_CHOICE;
const OPTIONS pkeyutl_options[] = {
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
- {"sign", OPT_SIGN, '-', "Sign input data with private key"},
- {"verify", OPT_VERIFY, '-', "Verify with public key"},
- {"encrypt", OPT_ENCRYPT, '-', "Encrypt input data with public key"},
- {"decrypt", OPT_DECRYPT, '-', "Decrypt input data with private key"},
- {"derive", OPT_DERIVE, '-', "Derive shared secret from own and peer (EC)DH keys"},
- {"decap", OPT_DECAP, '-', "Decapsulate shared secret"},
- {"encap", OPT_ENCAP, '-', "Encapsulate shared secret"},
+ { "help", OPT_HELP, '-', "Display this summary" },
+ { "sign", OPT_SIGN, '-', "Sign input data with private key" },
+ { "verify", OPT_VERIFY, '-', "Verify with public key" },
+ { "encrypt", OPT_ENCRYPT, '-', "Encrypt input data with public key" },
+ { "decrypt", OPT_DECRYPT, '-', "Decrypt input data with private key" },
+ { "derive", OPT_DERIVE, '-', "Derive shared secret from own and peer (EC)DH keys" },
+ { "decap", OPT_DECAP, '-', "Decapsulate shared secret" },
+ { "encap", OPT_ENCAP, '-', "Encapsulate shared secret" },
OPT_CONFIG_OPTION,
OPT_SECTION("Input"),
- {"in", OPT_IN, '<', "Input file - default stdin"},
- {"inkey", OPT_INKEY, 's', "Input key, by default private key"},
- {"pubin", OPT_PUBIN, '-', "Input key is a public key"},
- {"passin", OPT_PASSIN, 's', "Input file pass phrase source"},
- {"peerkey", OPT_PEERKEY, 's', "Peer key file used in key derivation"},
- {"peerform", OPT_PEERFORM, 'f', "Peer key format (DER/PEM/P12)"},
- {"certin", OPT_CERTIN, '-', "Input is a cert with a public key"},
- {"rev", OPT_REV, '-', "Reverse the order of the input buffer"},
- {"sigfile", OPT_SIGFILE, '<', "Signature file (verify operation only)"},
- {"keyform", OPT_KEYFORM, 'f', "Private key format (DER/PEM)"},
+ { "in", OPT_IN, '<', "Input file - default stdin" },
+ { "inkey", OPT_INKEY, 's', "Input key, by default private key" },
+ { "pubin", OPT_PUBIN, '-', "Input key is a public key" },
+ { "passin", OPT_PASSIN, 's', "Input file pass phrase source" },
+ { "peerkey", OPT_PEERKEY, 's', "Peer key file used in key derivation" },
+ { "peerform", OPT_PEERFORM, 'f', "Peer key format (DER/PEM/P12)" },
+ { "certin", OPT_CERTIN, '-', "Input is a cert with a public key" },
+ { "rev", OPT_REV, '-', "Reverse the order of the input buffer" },
+ { "sigfile", OPT_SIGFILE, '<', "Signature file (verify operation only)" },
+ { "keyform", OPT_KEYFORM, 'f', "Private key format (DER/PEM)" },
OPT_SECTION("Output"),
- {"out", OPT_OUT, '>', "Output file - default stdout"},
- {"secret", OPT_SECOUT, '>', "File to store secret on encapsulation"},
- {"asn1parse", OPT_ASN1PARSE, '-',
- "parse the output as ASN.1 data to check its DER encoding and print errors"},
- {"hexdump", OPT_HEXDUMP, '-', "Hex dump output"},
- {"verifyrecover", OPT_VERIFYRECOVER, '-',
- "Verify RSA signature, recovering original signature input data"},
+ { "out", OPT_OUT, '>', "Output file - default stdout" },
+ { "secret", OPT_SECOUT, '>', "File to store secret on encapsulation" },
+ { "asn1parse", OPT_ASN1PARSE, '-',
+ "parse the output as ASN.1 data to check its DER encoding and print errors" },
+ { "hexdump", OPT_HEXDUMP, '-', "Hex dump output" },
+ { "verifyrecover", OPT_VERIFYRECOVER, '-',
+ "Verify RSA signature, recovering original signature input data" },
OPT_SECTION("Signing/Derivation/Encapsulation"),
- {"rawin", OPT_RAWIN, '-',
- "Indicate that the signature/verification input data is not yet hashed"},
- {"digest", OPT_DIGEST, 's',
- "The digest algorithm to use for signing/verifying raw input data. Implies -rawin"},
- {"pkeyopt", OPT_PKEYOPT, 's', "Public key options as opt:value"},
- {"pkeyopt_passin", OPT_PKEYOPT_PASSIN, 's',
- "Public key option that is read as a passphrase argument opt:passphrase"},
- {"kdf", OPT_KDF, 's', "Use KDF algorithm"},
- {"kdflen", OPT_KDFLEN, 'p', "KDF algorithm output length"},
- {"kemop", OPT_KEMOP, 's', "KEM operation specific to the key algorithm"},
+ { "rawin", OPT_RAWIN, '-',
+ "Indicate that the signature/verification input data is not yet hashed" },
+ { "digest", OPT_DIGEST, 's',
+ "The digest algorithm to use for signing/verifying raw input data. Implies -rawin" },
+ { "pkeyopt", OPT_PKEYOPT, 's', "Public key options as opt:value" },
+ { "pkeyopt_passin", OPT_PKEYOPT_PASSIN, 's',
+ "Public key option that is read as a passphrase argument opt:passphrase" },
+ { "kdf", OPT_KDF, 's', "Use KDF algorithm" },
+ { "kdflen", OPT_KDFLEN, 'p', "KDF algorithm output length" },
+ { "kemop", OPT_KEMOP, 's', "KEM operation specific to the key algorithm" },
OPT_R_OPTIONS,
OPT_PROV_OPTIONS,
- {NULL}
+ { NULL }
};
int pkeyutl_main(int argc, char **argv)
@@ -147,7 +170,7 @@ int pkeyutl_main(int argc, char **argv)
switch (o) {
case OPT_EOF:
case OPT_ERR:
- opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
case OPT_HELP:
@@ -248,17 +271,13 @@ int pkeyutl_main(int argc, char **argv)
rev = 1;
break;
case OPT_PKEYOPT:
- if ((pkeyopts == NULL &&
- (pkeyopts = sk_OPENSSL_STRING_new_null()) == NULL) ||
- sk_OPENSSL_STRING_push(pkeyopts, opt_arg()) == 0) {
+ if ((pkeyopts == NULL && (pkeyopts = sk_OPENSSL_STRING_new_null()) == NULL) || sk_OPENSSL_STRING_push(pkeyopts, opt_arg()) == 0) {
BIO_puts(bio_err, "out of memory\n");
goto end;
}
break;
case OPT_PKEYOPT_PASSIN:
- if ((pkeyopts_passin == NULL &&
- (pkeyopts_passin = sk_OPENSSL_STRING_new_null()) == NULL) ||
- sk_OPENSSL_STRING_push(pkeyopts_passin, opt_arg()) == 0) {
+ if ((pkeyopts_passin == NULL && (pkeyopts_passin = sk_OPENSSL_STRING_new_null()) == NULL) || sk_OPENSSL_STRING_push(pkeyopts_passin, opt_arg()) == 0) {
BIO_puts(bio_err, "out of memory\n");
goto end;
}
@@ -285,20 +304,20 @@ int pkeyutl_main(int argc, char **argv)
if (kdfalg != NULL) {
if (kdflen == 0) {
BIO_printf(bio_err,
- "%s: no KDF length given (-kdflen parameter).\n", prog);
+ "%s: no KDF length given (-kdflen parameter).\n", prog);
goto opthelp;
}
} else if (inkey == NULL) {
BIO_printf(bio_err,
- "%s: no private key given (-inkey parameter).\n", prog);
+ "%s: no private key given (-inkey parameter).\n", prog);
goto opthelp;
} else if (peerkey != NULL && pkey_op != EVP_PKEY_OP_DERIVE) {
BIO_printf(bio_err,
- "%s: -peerkey option not allowed without -derive.\n", prog);
+ "%s: -peerkey option not allowed without -derive.\n", prog);
goto opthelp;
} else if (peerkey == NULL && pkey_op == EVP_PKEY_OP_DERIVE) {
BIO_printf(bio_err,
- "%s: missing -peerkey option for -derive operation.\n", prog);
+ "%s: missing -peerkey option for -derive operation.\n", prog);
goto opthelp;
}
@@ -319,15 +338,15 @@ int pkeyutl_main(int argc, char **argv)
const char *alg = EVP_PKEY_get0_type_name(pkey);
BIO_printf(bio_err,
- "%s: -digest (prehash) is not supported with %s\n",
- prog, alg != NULL ? alg : "(unknown key type)");
+ "%s: -digest (prehash) is not supported with %s\n",
+ prog, alg != NULL ? alg : "(unknown key type)");
goto end;
}
rawin = 1;
}
} else if (digestname != NULL || rawin) {
BIO_printf(bio_err,
- "%s: -digest and -rawin can only be used with -sign or -verify\n", prog);
+ "%s: -digest and -rawin can only be used with -sign or -verify\n", prog);
goto opthelp;
}
@@ -343,7 +362,7 @@ int pkeyutl_main(int argc, char **argv)
}
}
ctx = init_ctx(kdfalg, &keysize, pkey_op, rawin, pkey,
- mctx, digestname, kemop, libctx, app_get0_propq());
+ mctx, digestname, kemop, libctx, app_get0_propq());
if (ctx == NULL) {
BIO_printf(bio_err, "%s: Error initializing context\n", prog);
goto end;
@@ -361,7 +380,7 @@ int pkeyutl_main(int argc, char **argv)
if (pkey_ctrl_string(ctx, opt) <= 0) {
BIO_printf(bio_err, "%s: Can't set parameter \"%s\":\n",
- prog, opt);
+ prog, opt);
goto end;
}
}
@@ -382,7 +401,7 @@ int pkeyutl_main(int argc, char **argv)
BIO_snprintf(passwd_buf, sizeof(passwd_buf), "Enter %s: ", opt);
r = EVP_read_pw_string(passwd_buf, sizeof(passwd_buf) - 1,
- passwd_buf, 0);
+ passwd_buf, 0);
if (r < 0) {
if (r == -2)
BIO_puts(bio_err, "user abort\n");
@@ -410,7 +429,7 @@ int pkeyutl_main(int argc, char **argv)
if (EVP_PKEY_CTX_ctrl_str(ctx, opt, passwd) <= 0) {
BIO_printf(bio_err, "%s: Can't set parameter \"%s\":\n",
- prog, opt);
+ prog, opt);
OPENSSL_free(passwd);
goto end;
}
@@ -420,13 +439,13 @@ int pkeyutl_main(int argc, char **argv)
if (sigfile != NULL && (pkey_op != EVP_PKEY_OP_VERIFY)) {
BIO_printf(bio_err,
- "%s: Signature file specified for non verify\n", prog);
+ "%s: Signature file specified for non verify\n", prog);
goto end;
}
if (sigfile == NULL && (pkey_op == EVP_PKEY_OP_VERIFY)) {
BIO_printf(bio_err,
- "%s: No signature file specified for verify\n", prog);
+ "%s: No signature file specified for verify\n", prog);
goto end;
}
@@ -445,7 +464,8 @@ int pkeyutl_main(int argc, char **argv)
if (secoutfile != NULL) {
BIO_printf(bio_err, "%s: Decapsulation produces only a shared "
"secret and no output. The '-out' option "
- "is not applicable.\n", prog);
+ "is not applicable.\n",
+ prog);
goto end;
}
if ((out = bio_open_owner(outfile, 'w', FORMAT_BINARY)) == NULL)
@@ -510,8 +530,8 @@ int pkeyutl_main(int argc, char **argv)
&& (pkey_op == EVP_PKEY_OP_SIGN || pkey_op == EVP_PKEY_OP_VERIFY)) {
if (buf_inlen > EVP_MAX_MD_SIZE) {
BIO_printf(bio_err,
- "Error: The non-raw input data length %d is too long - max supported hashed size is %d\n",
- buf_inlen, EVP_MAX_MD_SIZE);
+ "Error: The non-raw input data length %d is too long - max supported hashed size is %d\n",
+ buf_inlen, EVP_MAX_MD_SIZE);
goto end;
}
}
@@ -519,10 +539,10 @@ int pkeyutl_main(int argc, char **argv)
if (pkey_op == EVP_PKEY_OP_VERIFY) {
if (rawin) {
rv = do_raw_keyop(pkey_op, mctx, pkey, in, filesize, sig, siglen,
- NULL, 0);
+ NULL, 0);
} else {
rv = EVP_PKEY_verify(ctx, sig, (size_t)siglen,
- buf_in, (size_t)buf_inlen);
+ buf_in, (size_t)buf_inlen);
}
if (rv == 1) {
BIO_puts(out, "Signature Verified Successfully\n");
@@ -535,26 +555,25 @@ int pkeyutl_main(int argc, char **argv)
if (rawin) {
/* rawin allocates the buffer in do_raw_keyop() */
rv = do_raw_keyop(pkey_op, mctx, pkey, in, filesize, NULL, 0,
- &buf_out, &buf_outlen);
+ &buf_out, &buf_outlen);
} else {
if (kdflen != 0) {
buf_outlen = kdflen;
rv = 1;
} else {
rv = do_keyop(ctx, pkey_op, NULL, &buf_outlen,
- buf_in, (size_t)buf_inlen, NULL, &secretlen);
+ buf_in, (size_t)buf_inlen, NULL, &secretlen);
}
if (rv > 0
- && (secretlen > 0 || (pkey_op != EVP_PKEY_OP_ENCAPSULATE
- && pkey_op != EVP_PKEY_OP_DECAPSULATE))
+ && (secretlen > 0 || (pkey_op != EVP_PKEY_OP_ENCAPSULATE && pkey_op != EVP_PKEY_OP_DECAPSULATE))
&& (buf_outlen > 0 || pkey_op == EVP_PKEY_OP_DECAPSULATE)) {
if (buf_outlen > 0)
buf_out = app_malloc(buf_outlen, "buffer output");
if (secretlen > 0)
secret = app_malloc(secretlen, "secret output");
rv = do_keyop(ctx, pkey_op,
- buf_out, &buf_outlen,
- buf_in, (size_t)buf_inlen, secret, &secretlen);
+ buf_out, &buf_outlen,
+ buf_in, (size_t)buf_inlen, secret, &secretlen);
}
}
if (rv <= 0) {
@@ -579,7 +598,7 @@ int pkeyutl_main(int argc, char **argv)
if (secretlen > 0)
BIO_write(secout ? secout : out, secret, (int)secretlen);
- end:
+end:
if (ret != 0)
ERR_print_errors(bio_err);
EVP_MD_CTX_free(mctx);
@@ -600,15 +619,15 @@ int pkeyutl_main(int argc, char **argv)
}
static EVP_PKEY *get_pkey(const char *kdfalg,
- const char *keyfile, int keyform, int key_type,
- char *passinarg, int pkey_op)
+ const char *keyfile, int keyform, int key_type,
+ char *passinarg, int pkey_op)
{
EVP_PKEY *pkey = NULL;
char *passin = NULL;
X509 *x;
if (((pkey_op == EVP_PKEY_OP_SIGN) || (pkey_op == EVP_PKEY_OP_DECRYPT)
- || (pkey_op == EVP_PKEY_OP_DERIVE))
+ || (pkey_op == EVP_PKEY_OP_DERIVE))
&& (key_type != KEY_PRIVKEY && kdfalg == NULL)) {
BIO_printf(bio_err, "A private key is needed for this operation\n");
return NULL;
@@ -636,17 +655,16 @@ static EVP_PKEY *get_pkey(const char *kdfalg,
case KEY_NONE:
break;
-
}
OPENSSL_free(passin);
return pkey;
}
static EVP_PKEY_CTX *init_ctx(const char *kdfalg, int *pkeysize,
- int pkey_op, int rawin,
- EVP_PKEY *pkey /* ownership is passed to ctx */,
- EVP_MD_CTX *mctx, const char *digestname,
- const char *kemop, OSSL_LIB_CTX *libctx, const char *propq)
+ int pkey_op, int rawin,
+ EVP_PKEY *pkey /* ownership is passed to ctx */,
+ EVP_MD_CTX *mctx, const char *digestname,
+ const char *kemop, OSSL_LIB_CTX *libctx, const char *propq)
{
EVP_PKEY_CTX *ctx = NULL;
int rv = -1;
@@ -658,7 +676,7 @@ static EVP_PKEY_CTX *init_ctx(const char *kdfalg, int *pkeysize,
kdfnid = OBJ_ln2nid(kdfalg);
if (kdfnid == NID_undef) {
BIO_printf(bio_err, "The given KDF \"%s\" is unknown.\n",
- kdfalg);
+ kdfalg);
return NULL;
}
}
@@ -680,12 +698,12 @@ static EVP_PKEY_CTX *init_ctx(const char *kdfalg, int *pkeysize,
switch (pkey_op) {
case EVP_PKEY_OP_SIGN:
rv = EVP_DigestSignInit_ex(mctx, NULL, digestname, libctx, propq,
- pkey, NULL);
+ pkey, NULL);
break;
case EVP_PKEY_OP_VERIFY:
rv = EVP_DigestVerifyInit_ex(mctx, NULL, digestname, libctx, propq,
- pkey, NULL);
+ pkey, NULL);
break;
}
@@ -750,8 +768,8 @@ static int setup_peer(EVP_PKEY_CTX *ctx, int peerform, const char *file)
}
if (strcmp(EVP_PKEY_get0_type_name(peer), EVP_PKEY_get0_type_name(pkey)) != 0) {
BIO_printf(bio_err,
- "Type of peer public key: %s does not match type of private key: %s\n",
- EVP_PKEY_get0_type_name(peer), EVP_PKEY_get0_type_name(pkey));
+ "Type of peer public key: %s does not match type of private key: %s\n",
+ EVP_PKEY_get0_type_name(peer), EVP_PKEY_get0_type_name(pkey));
ret = 0;
} else {
ret = EVP_PKEY_derive_set_peer(ctx, peer) > 0;
@@ -762,9 +780,9 @@ static int setup_peer(EVP_PKEY_CTX *ctx, int peerform, const char *file)
}
static int do_keyop(EVP_PKEY_CTX *ctx, int pkey_op,
- unsigned char *out, size_t *poutlen,
- const unsigned char *in, size_t inlen,
- unsigned char *secret, size_t *pseclen)
+ unsigned char *out, size_t *poutlen,
+ const unsigned char *in, size_t inlen,
+ unsigned char *secret, size_t *pseclen)
{
int rv = 0;
@@ -796,7 +814,6 @@ static int do_keyop(EVP_PKEY_CTX *ctx, int pkey_op,
case EVP_PKEY_OP_DECAPSULATE:
rv = EVP_PKEY_decapsulate(ctx, secret, pseclen, in, inlen);
break;
-
}
return rv;
}
@@ -804,9 +821,9 @@ static int do_keyop(EVP_PKEY_CTX *ctx, int pkey_op,
#define TBUF_MAXSIZE 2048
static int do_raw_keyop(int pkey_op, EVP_MD_CTX *mctx,
- EVP_PKEY *pkey, BIO *in,
- int filesize, unsigned char *sig, int siglen,
- unsigned char **out, size_t *poutlen)
+ EVP_PKEY *pkey, BIO *in,
+ int filesize, unsigned char *sig, int siglen,
+ unsigned char **out, size_t *poutlen)
{
int rv = 0;
unsigned char tbuf[TBUF_MAXSIZE];
@@ -817,7 +834,7 @@ static int do_raw_keyop(int pkey_op, EVP_MD_CTX *mctx,
if (only_nomd(pkey)) {
if (filesize < 0) {
BIO_printf(bio_err,
- "Error: unable to determine file size for oneshot operation\n");
+ "Error: unable to determine file size for oneshot operation\n");
goto end;
}
mbuf = app_malloc(filesize, "oneshot sign/verify buffer");
@@ -887,7 +904,7 @@ static int do_raw_keyop(int pkey_op, EVP_MD_CTX *mctx,
break;
}
- end:
+end:
OPENSSL_free(mbuf);
return rv;
}
diff --git a/apps/prime.c b/apps/prime.c
index 8241c3eae0..ffb7648384 100644
--- a/apps/prime.c
+++ b/apps/prime.c
@@ -18,7 +18,11 @@
typedef enum OPTION_choice {
OPT_COMMON,
- OPT_HEX, OPT_GENERATE, OPT_BITS, OPT_SAFE, OPT_CHECKS,
+ OPT_HEX,
+ OPT_GENERATE,
+ OPT_BITS,
+ OPT_SAFE,
+ OPT_CHECKS,
OPT_PROV_ENUM,
OPT_IN_FILE
} OPTION_CHOICE;
@@ -32,10 +36,13 @@ static int check_num(const char *s, const int is_hex)
*/
if (is_hex) {
for (i = 0; ('0' <= s[i] && s[i] <= '9')
- || ('A' <= s[i] && s[i] <= 'F')
- || ('a' <= s[i] && s[i] <= 'f'); i++);
+ || ('A' <= s[i] && s[i] <= 'F')
+ || ('a' <= s[i] && s[i] <= 'f');
+ i++)
+ ;
} else {
- for (i = 0; '0' <= s[i] && s[i] <= '9'; i++);
+ for (i = 0; '0' <= s[i] && s[i] <= '9'; i++)
+ ;
}
return s[i] == 0;
}
@@ -68,26 +75,26 @@ static void process_num(const char *s, const int is_hex)
}
const OPTIONS prime_options[] = {
- {OPT_HELP_STR, 1, '-', "Usage: %s [options] [number...]\n"},
+ { OPT_HELP_STR, 1, '-', "Usage: %s [options] [number...]\n" },
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
- {"bits", OPT_BITS, 'p', "Size of number in bits"},
- {"checks", OPT_CHECKS, 'p', "Number of checks"},
- {"hex", OPT_HEX, '-',
- "Enables hex format for output from prime generation or input to primality checking"},
- {"in", OPT_IN_FILE, '-', "Provide file names containing numbers for primality checking"},
+ { "help", OPT_HELP, '-', "Display this summary" },
+ { "bits", OPT_BITS, 'p', "Size of number in bits" },
+ { "checks", OPT_CHECKS, 'p', "Number of checks" },
+ { "hex", OPT_HEX, '-',
+ "Enables hex format for output from prime generation or input to primality checking" },
+ { "in", OPT_IN_FILE, '-', "Provide file names containing numbers for primality checking" },
OPT_SECTION("Output"),
- {"generate", OPT_GENERATE, '-', "Generate a prime"},
- {"safe", OPT_SAFE, '-',
- "When used with -generate, generate a safe prime"},
+ { "generate", OPT_GENERATE, '-', "Generate a prime" },
+ { "safe", OPT_SAFE, '-',
+ "When used with -generate, generate a safe prime" },
OPT_PROV_OPTIONS,
OPT_PARAMETERS(),
- {"number", 0, 0, "Number(s) to check for primality if not generating"},
- {NULL}
+ { "number", 0, 0, "Number(s) to check for primality if not generating" },
+ { NULL }
};
int prime_main(int argc, char **argv)
@@ -104,7 +111,7 @@ int prime_main(int argc, char **argv)
switch (o) {
case OPT_EOF:
case OPT_ERR:
-opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
case OPT_HELP:
@@ -171,7 +178,7 @@ opthelp:
BIO_printf(bio_out, "%s\n", s);
OPENSSL_free(s);
} else {
- for ( ; *argv; argv++) {
+ for (; *argv; argv++) {
int bytes_read = 0;
if (!in_file) {
@@ -189,8 +196,9 @@ opthelp:
/* Number is too long. Discard remainder of the line */
if (bytes_read == BUFSIZE - 1 && file_read_buf[BUFSIZE - 2] != '\n') {
BIO_printf(bio_err, "Value in %s is over the maximum size (%d digits)\n",
- argv[0], BUFSIZE - 2);
- while (BIO_get_line(in, file_read_buf, BUFSIZE) == BUFSIZE - 1);
+ argv[0], BUFSIZE - 2);
+ while (BIO_get_line(in, file_read_buf, BUFSIZE) == BUFSIZE - 1)
+ ;
continue;
}
@@ -209,7 +217,7 @@ opthelp:
}
ret = 0;
- end:
+end:
BN_free(bn);
return ret;
}
diff --git a/apps/rand.c b/apps/rand.c
index d57ed74f6e..a4fb7ecde0 100644
--- a/apps/rand.c
+++ b/apps/rand.c
@@ -20,27 +20,30 @@
typedef enum OPTION_choice {
OPT_COMMON,
- OPT_OUT, OPT_BASE64, OPT_HEX,
- OPT_R_ENUM, OPT_PROV_ENUM
+ OPT_OUT,
+ OPT_BASE64,
+ OPT_HEX,
+ OPT_R_ENUM,
+ OPT_PROV_ENUM
} OPTION_CHOICE;
const OPTIONS rand_options[] = {
- {OPT_HELP_STR, 1, '-', "Usage: %s [options] num[K|M|G|T]\n"},
+ { OPT_HELP_STR, 1, '-', "Usage: %s [options] num[K|M|G|T]\n" },
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
+ { "help", OPT_HELP, '-', "Display this summary" },
OPT_SECTION("Output"),
- {"out", OPT_OUT, '>', "Output file"},
- {"base64", OPT_BASE64, '-', "Base64 encode output"},
- {"hex", OPT_HEX, '-', "Hex encode output"},
+ { "out", OPT_OUT, '>', "Output file" },
+ { "base64", OPT_BASE64, '-', "Base64 encode output" },
+ { "hex", OPT_HEX, '-', "Hex encode output" },
OPT_R_OPTIONS,
OPT_PROV_OPTIONS,
OPT_PARAMETERS(),
- {"num", 0, 0, "Number of bytes to generate"},
- {NULL}
+ { "num", 0, 0, "Number of bytes to generate" },
+ { NULL }
};
int rand_main(int argc, char **argv)
@@ -59,7 +62,7 @@ int rand_main(int argc, char **argv)
switch (o) {
case OPT_EOF:
case OPT_ERR:
- opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
case OPT_HELP:
@@ -117,7 +120,7 @@ int rand_main(int argc, char **argv)
*/
while (argv[0][factoridx]) {
if (!isdigit((int)(argv[0][factoridx]))) {
- switch(argv[0][factoridx]) {
+ switch (argv[0][factoridx]) {
case 'K':
shift = 10;
break;
@@ -132,7 +135,7 @@ int rand_main(int argc, char **argv)
break;
default:
BIO_printf(bio_err, "Invalid size suffix %s\n",
- &argv[0][factoridx]);
+ &argv[0][factoridx]);
goto opthelp;
}
break;
@@ -142,7 +145,7 @@ int rand_main(int argc, char **argv)
if (shift != 0 && strlen(&argv[0][factoridx]) != 1) {
BIO_printf(bio_err, "Invalid size suffix %s\n",
- &argv[0][factoridx]);
+ &argv[0][factoridx]);
goto opthelp;
}
}
@@ -157,7 +160,7 @@ int rand_main(int argc, char **argv)
/* check for overflow */
if ((UINT64_MAX >> shift) < (size_t)num) {
BIO_printf(bio_err, "%lu bytes with suffix overflows\n",
- num);
+ num);
goto opthelp;
}
scaled_num = num << shift;
@@ -212,7 +215,7 @@ int rand_main(int argc, char **argv)
ret = 0;
- end:
+end:
if (ret != 0)
ERR_print_errors(bio_err);
OPENSSL_free(buf);
diff --git a/apps/rehash.c b/apps/rehash.c
index e6b12d36fb..e2083fa76b 100644
--- a/apps/rehash.c
+++ b/apps/rehash.c
@@ -12,15 +12,14 @@
#include "apps.h"
#include "progs.h"
-#if defined(OPENSSL_SYS_UNIX) || defined(__APPLE__) || \
- (defined(__VMS) && defined(__DECC) && __CRTL_VER >= 80300000)
-# include <unistd.h>
-# include <stdio.h>
-# include <limits.h>
-# include <errno.h>
-# include <string.h>
-# include <ctype.h>
-# include <sys/stat.h>
+#if defined(OPENSSL_SYS_UNIX) || defined(__APPLE__) || (defined(__VMS) && defined(__DECC) && __CRTL_VER >= 80300000)
+#include <unistd.h>
+#include <stdio.h>
+#include <limits.h>
+#include <errno.h>
+#include <string.h>
+#include <ctype.h>
+#include <sys/stat.h>
/*
* Make sure that the processing of symbol names is treated the same as when
@@ -28,32 +27,32 @@
* include/openssl/__DECC_INCLUDE_PROLOGUE.H and __DECC_INCLUDE_EPILOGUE.H),
* but not for internal headers.
*/
-# ifdef __VMS
-# pragma names save
-# pragma names as_is,shortened
-# endif
+#ifdef __VMS
+#pragma names save
+#pragma names as_is, shortened
+#endif
-# include "internal/o_dir.h"
+#include "internal/o_dir.h"
-# ifdef __VMS
-# pragma names restore
-# endif
+#ifdef __VMS
+#pragma names restore
+#endif
-# include <openssl/evp.h>
-# include <openssl/pem.h>
-# include <openssl/x509.h>
+#include <openssl/evp.h>
+#include <openssl/pem.h>
+#include <openssl/x509.h>
-# ifndef PATH_MAX
-# define PATH_MAX 4096
-# endif
-# define MAX_COLLISIONS 256
+#ifndef PATH_MAX
+#define PATH_MAX 4096
+#endif
+#define MAX_COLLISIONS 256
-# if defined(OPENSSL_SYS_VXWORKS)
+#if defined(OPENSSL_SYS_VXWORKS)
/*
* VxWorks has no symbolic links
*/
-# define lstat(path, buf) stat(path, buf)
+#define lstat(path, buf) stat(path, buf)
int symlink(const char *target, const char *linkpath)
{
@@ -66,7 +65,7 @@ ssize_t readlink(const char *pathname, char *buf, size_t bufsiz)
errno = ENOSYS;
return -1;
}
-# endif
+#endif
typedef struct hentry_st {
struct hentry_st *next;
@@ -86,14 +85,16 @@ typedef struct bucket_st {
enum Type {
/* Keep in sync with |suffixes|, below. */
- TYPE_CERT=0, TYPE_CRL=1
+ TYPE_CERT = 0,
+ TYPE_CRL = 1
};
enum Hash {
- HASH_OLD, HASH_NEW, HASH_BOTH
+ HASH_OLD,
+ HASH_NEW,
+ HASH_BOTH
};
-
static int evpmdsize;
static const EVP_MD *evpmd;
static int remove_links = 1;
@@ -103,7 +104,6 @@ static BUCKET *hash_table[257];
static const char *suffixes[] = { "", "r" };
static const char *extensions[] = { "pem", "crt", "cer", "crl" };
-
static void bit_set(unsigned char *set, unsigned int bit)
{
set[bit >> 3] |= 1 << (bit & 0x7);
@@ -114,13 +114,12 @@ static int bit_isset(unsigned char *set, unsigned int bit)
return set[bit >> 3] & (1 << (bit & 0x7));
}
-
/*
* Process an entry; return number of errors.
*/
static int add_entry(enum Type type, unsigned int hash, const char *filename,
- const unsigned char *digest, int need_symlink,
- unsigned short old_id)
+ const unsigned char *digest, int need_symlink,
+ unsigned short old_id)
{
static BUCKET nilbucket;
static HENTRY nilhentry;
@@ -143,9 +142,9 @@ static int add_entry(enum Type type, unsigned int hash, const char *filename,
for (ep = bp->first_entry; ep; ep = ep->next) {
if (digest && memcmp(digest, ep->digest, (size_t)evpmdsize) == 0) {
BIO_printf(bio_err,
- "%s: warning: skipping duplicate %s in %s\n",
- opt_getprog(),
- type == TYPE_CERT ? "certificate" : "CRL", filename);
+ "%s: warning: skipping duplicate %s in %s\n",
+ opt_getprog(),
+ type == TYPE_CERT ? "certificate" : "CRL", filename);
return 0;
}
if (strcmp(filename, ep->filename) == 0) {
@@ -158,8 +157,8 @@ static int add_entry(enum Type type, unsigned int hash, const char *filename,
if (ep == NULL) {
if (bp->num_needed >= MAX_COLLISIONS) {
BIO_printf(bio_err,
- "%s: error: hash table overflow for %s\n",
- opt_getprog(), filename);
+ "%s: error: hash table overflow for %s\n",
+ opt_getprog(), filename);
return 1;
}
ep = app_malloc(sizeof(*ep), "collision bucket");
@@ -212,7 +211,8 @@ static int handle_symlink(const char *filename, const char *fullpath)
return -1;
for (type = OSSL_NELEM(suffixes) - 1; type > 0; type--)
if (OPENSSL_strncasecmp(&filename[i],
- suffixes[type], strlen(suffixes[type])) == 0)
+ suffixes[type], strlen(suffixes[type]))
+ == 0)
break;
i += strlen(suffixes[type]);
@@ -234,7 +234,7 @@ static int handle_symlink(const char *filename, const char *fullpath)
*/
static int do_file(const char *filename, const char *fullpath, enum Hash h)
{
- STACK_OF (X509_INFO) *inf = NULL;
+ STACK_OF(X509_INFO) *inf = NULL;
X509_INFO *x;
const X509_NAME *name = NULL;
BIO *b;
@@ -256,7 +256,7 @@ static int do_file(const char *filename, const char *fullpath, enum Hash h)
/* Does it have X.509 data in it? */
if ((b = BIO_new_file(fullpath, "r")) == NULL) {
BIO_printf(bio_err, "%s: error: skipping %s, cannot open file\n",
- opt_getprog(), filename);
+ opt_getprog(), filename);
errs++;
goto end;
}
@@ -267,9 +267,9 @@ static int do_file(const char *filename, const char *fullpath, enum Hash h)
if (sk_X509_INFO_num(inf) != 1) {
BIO_printf(bio_err,
- "%s: warning: skipping %s, "
- "it does not contain exactly one certificate or CRL\n",
- opt_getprog(), filename);
+ "%s: warning: skipping %s, "
+ "it does not contain exactly one certificate or CRL\n",
+ opt_getprog(), filename);
/* This is not an error. */
goto end;
}
@@ -297,21 +297,20 @@ static int do_file(const char *filename, const char *fullpath, enum Hash h)
if (name != NULL) {
if (h == HASH_NEW || h == HASH_BOTH) {
int ok;
- unsigned long hash_value =
- X509_NAME_hash_ex(name,
- app_get0_libctx(), app_get0_propq(), &ok);
+ unsigned long hash_value = X509_NAME_hash_ex(name,
+ app_get0_libctx(), app_get0_propq(), &ok);
if (ok) {
errs += add_entry(type, hash_value, filename, digest, 1, ~0);
} else {
BIO_printf(bio_err, "%s: error calculating SHA1 hash value\n",
- opt_getprog());
+ opt_getprog());
errs++;
}
}
if ((h == HASH_OLD) || (h == HASH_BOTH))
errs += add_entry(type, X509_NAME_hash_old(name),
- filename, digest, 1, ~0);
+ filename, digest, 1, ~0);
}
end:
@@ -328,17 +327,17 @@ static int ends_with_dirsep(const char *path)
{
if (*path != '\0')
path += strlen(path) - 1;
-# if defined __VMS
+#if defined __VMS
if (*path == ']' || *path == '>' || *path == ':')
return 1;
-# elif defined _WIN32
+#elif defined _WIN32
if (*path == '\\')
return 1;
-# endif
+#endif
return *path == '/';
}
-static int sk_strcmp(const char * const *a, const char * const *b)
+static int sk_strcmp(const char *const *a, const char *const *b)
{
return strcmp(*a, *b);
}
@@ -382,7 +381,7 @@ static int do_dir(const char *dirname, enum Hash h)
size_t fname_len = strlen(filename);
if ((copy = OPENSSL_strdup(filename)) == NULL
- || sk_OPENSSL_STRING_push(files, copy) == 0) {
+ || sk_OPENSSL_STRING_push(files, copy) == 0) {
OPENSSL_free(copy);
OPENSSL_DIR_end(&d);
BIO_puts(bio_err, "out of memory\n");
@@ -402,7 +401,8 @@ static int do_dir(const char *dirname, enum Hash h)
for (n = 0; n < numfiles; ++n) {
filename = sk_OPENSSL_STRING_value(files, n);
if (BIO_snprintf(buf, buflen, "%s%s%s",
- dirname, pathsep, filename) >= buflen)
+ dirname, pathsep, filename)
+ >= buflen)
continue;
if (lstat(buf, &st) < 0)
continue;
@@ -425,47 +425,47 @@ static int do_dir(const char *dirname, enum Hash h)
if (ep->old_id < bp->num_needed) {
/* Link exists, and is used as-is */
BIO_snprintf(buf, buflen, "%08x.%s%d", bp->hash,
- suffixes[bp->type], ep->old_id);
+ suffixes[bp->type], ep->old_id);
if (verbose)
BIO_printf(bio_out, "link %s -> %s\n",
- ep->filename, buf);
+ ep->filename, buf);
} else if (ep->need_symlink) {
/* New link needed (it may replace something) */
while (bit_isset(idmask, nextid))
nextid++;
BIO_snprintf(buf, buflen, "%s%s%08x.%s%d",
- dirname, pathsep, bp->hash,
- suffixes[bp->type], nextid);
+ dirname, pathsep, bp->hash,
+ suffixes[bp->type], nextid);
if (verbose)
BIO_printf(bio_out, "link %s -> %s\n",
- ep->filename, &buf[dirlen]);
+ ep->filename, &buf[dirlen]);
if (unlink(buf) < 0 && errno != ENOENT) {
BIO_printf(bio_err,
- "%s: Can't unlink %s, %s\n",
- opt_getprog(), buf, strerror(errno));
+ "%s: Can't unlink %s, %s\n",
+ opt_getprog(), buf, strerror(errno));
errs++;
}
if (symlink(ep->filename, buf) < 0) {
BIO_printf(bio_err,
- "%s: Can't symlink %s, %s\n",
- opt_getprog(), ep->filename,
- strerror(errno));
+ "%s: Can't symlink %s, %s\n",
+ opt_getprog(), ep->filename,
+ strerror(errno));
errs++;
}
bit_set(idmask, nextid);
} else if (remove_links) {
/* Link to be deleted */
BIO_snprintf(buf, buflen, "%s%s%08x.%s%d",
- dirname, pathsep, bp->hash,
- suffixes[bp->type], ep->old_id);
+ dirname, pathsep, bp->hash,
+ suffixes[bp->type], ep->old_id);
if (verbose)
BIO_printf(bio_out, "unlink %s\n",
- &buf[dirlen]);
+ &buf[dirlen]);
if (unlink(buf) < 0 && errno != ENOENT) {
BIO_printf(bio_err,
- "%s: Can't unlink %s, %s\n",
- opt_getprog(), buf, strerror(errno));
+ "%s: Can't unlink %s, %s\n",
+ opt_getprog(), buf, strerror(errno));
errs++;
}
}
@@ -477,7 +477,7 @@ static int do_dir(const char *dirname, enum Hash h)
hash_table[i] = NULL;
}
- err:
+err:
sk_OPENSSL_STRING_pop_free(files, str_free);
OPENSSL_free(buf);
return errs;
@@ -485,31 +485,33 @@ static int do_dir(const char *dirname, enum Hash h)
typedef enum OPTION_choice {
OPT_COMMON,
- OPT_COMPAT, OPT_OLD, OPT_N, OPT_VERBOSE,
+ OPT_COMPAT,
+ OPT_OLD,
+ OPT_N,
+ OPT_VERBOSE,
OPT_PROV_ENUM
} OPTION_CHOICE;
const OPTIONS rehash_options[] = {
- {OPT_HELP_STR, 1, '-', "Usage: %s [options] [directory...]\n"},
+ { OPT_HELP_STR, 1, '-', "Usage: %s [options] [directory...]\n" },
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
- {"h", OPT_HELP, '-', "Display this summary"},
- {"compat", OPT_COMPAT, '-', "Create both new- and old-style hash links"},
- {"old", OPT_OLD, '-', "Use old-style hash to generate links"},
- {"n", OPT_N, '-', "Do not remove existing links"},
+ { "help", OPT_HELP, '-', "Display this summary" },
+ { "h", OPT_HELP, '-', "Display this summary" },
+ { "compat", OPT_COMPAT, '-', "Create both new- and old-style hash links" },
+ { "old", OPT_OLD, '-', "Use old-style hash to generate links" },
+ { "n", OPT_N, '-', "Do not remove existing links" },
OPT_SECTION("Output"),
- {"v", OPT_VERBOSE, '-', "Verbose output"},
+ { "v", OPT_VERBOSE, '-', "Verbose output" },
OPT_PROV_OPTIONS,
OPT_PARAMETERS(),
- {"directory", 0, 0, "One or more directories to process (optional)"},
- {NULL}
+ { "directory", 0, 0, "One or more directories to process (optional)" },
+ { NULL }
};
-
int rehash_main(int argc, char **argv)
{
const char *env, *prog;
@@ -575,13 +577,13 @@ int rehash_main(int argc, char **argv)
errs += do_dir(X509_get_default_cert_dir(), h);
}
- end:
+end:
return errs;
}
#else
const OPTIONS rehash_options[] = {
- {NULL}
+ { NULL }
};
int rehash_main(int argc, char **argv)
diff --git a/apps/req.c b/apps/req.c
index 79afbaf621..f95fa013bd 100644
--- a/apps/req.c
+++ b/apps/req.c
@@ -28,50 +28,50 @@
#include <openssl/lhash.h>
#include <openssl/rsa.h>
#ifndef OPENSSL_NO_DSA
-# include <openssl/dsa.h>
+#include <openssl/dsa.h>
#endif
-#include "internal/e_os.h" /* For isatty() */
+#include "internal/e_os.h" /* For isatty() */
-#define BITS "default_bits"
-#define KEYFILE "default_keyfile"
-#define PROMPT "prompt"
+#define BITS "default_bits"
+#define KEYFILE "default_keyfile"
+#define PROMPT "prompt"
#define DISTINGUISHED_NAME "distinguished_name"
-#define ATTRIBUTES "attributes"
-#define V3_EXTENSIONS "x509_extensions"
-#define REQ_EXTENSIONS "req_extensions"
-#define STRING_MASK "string_mask"
-#define UTF8_IN "utf8"
+#define ATTRIBUTES "attributes"
+#define V3_EXTENSIONS "x509_extensions"
+#define REQ_EXTENSIONS "req_extensions"
+#define STRING_MASK "string_mask"
+#define UTF8_IN "utf8"
#define DEFAULT_KEY_LENGTH 2048
-#define MIN_KEY_LENGTH 512
-#define DEFAULT_DAYS 30 /* default certificate validity period in days */
-#define UNSET_DAYS -2 /* -1 may be used for testing expiration checks */
-#define EXT_COPY_UNSET -1
+#define MIN_KEY_LENGTH 512
+#define DEFAULT_DAYS 30 /* default certificate validity period in days */
+#define UNSET_DAYS -2 /* -1 may be used for testing expiration checks */
+#define EXT_COPY_UNSET -1
static int make_REQ(X509_REQ *req, EVP_PKEY *pkey, X509_NAME *fsubj,
- int mutlirdn, int attribs, unsigned long chtype);
+ int mutlirdn, int attribs, unsigned long chtype);
static int prompt_info(X509_REQ *req,
- STACK_OF(CONF_VALUE) *dn_sk, const char *dn_sect,
- STACK_OF(CONF_VALUE) *attr_sk, const char *attr_sect,
- int attribs, unsigned long chtype);
+ STACK_OF(CONF_VALUE) *dn_sk, const char *dn_sect,
+ STACK_OF(CONF_VALUE) *attr_sk, const char *attr_sect,
+ int attribs, unsigned long chtype);
static int auto_info(X509_REQ *req, STACK_OF(CONF_VALUE) *sk,
- STACK_OF(CONF_VALUE) *attr, int attribs,
- unsigned long chtype);
+ STACK_OF(CONF_VALUE) *attr, int attribs,
+ unsigned long chtype);
static int add_attribute_object(X509_REQ *req, char *text, const char *def,
- char *value, int nid, int n_min, int n_max,
- unsigned long chtype);
+ char *value, int nid, int n_min, int n_max,
+ unsigned long chtype);
static int add_DN_object(X509_NAME *n, char *text, const char *def,
- char *value, int nid, int n_min, int n_max,
- unsigned long chtype, int mval);
+ char *value, int nid, int n_min, int n_max,
+ unsigned long chtype, int mval);
static int build_data(char *text, const char *def, char *value,
- int n_min, int n_max, char *buf, const int buf_size,
- const char *desc1, const char *desc2);
+ int n_min, int n_max, char *buf, const int buf_size,
+ const char *desc1, const char *desc2);
static int req_check_len(int len, int n_min, int n_max);
static int check_end(const char *str, const char *end);
static int join(char buf[], size_t buf_size, const char *name,
- const char *tail, const char *desc);
+ const char *tail, const char *desc);
static EVP_PKEY_CTX *set_keygen_ctx(const char *gstr,
- char **pkeytype, long *pkeylen);
+ char **pkeytype, long *pkeylen);
static const char *section = "req";
static CONF *req_conf = NULL;
@@ -81,94 +81,131 @@ static int batch = 0;
typedef enum OPTION_choice {
OPT_COMMON,
OPT_CIPHER,
- OPT_INFORM, OPT_OUTFORM, OPT_KEY,
- OPT_PUBKEY, OPT_NEW, OPT_CONFIG, OPT_KEYFORM, OPT_IN, OPT_OUT,
- OPT_KEYOUT, OPT_PASSIN, OPT_PASSOUT, OPT_NEWKEY,
- OPT_PKEYOPT, OPT_SIGOPT, OPT_VFYOPT, OPT_BATCH, OPT_NEWHDR, OPT_MODULUS,
- OPT_VERIFY, OPT_NOENC, OPT_NODES, OPT_NOOUT, OPT_VERBOSE, OPT_UTF8,
- OPT_NAMEOPT, OPT_REQOPT, OPT_SUBJ, OPT_SUBJECT, OPT_TEXT,
- OPT_X509, OPT_X509V1, OPT_CA, OPT_CAKEY,
- OPT_MULTIVALUE_RDN, OPT_NOT_BEFORE, OPT_NOT_AFTER, OPT_DAYS, OPT_SET_SERIAL,
- OPT_COPY_EXTENSIONS, OPT_EXTENSIONS, OPT_REQEXTS, OPT_ADDEXT,
- OPT_PRECERT, OPT_MD,
- OPT_SECTION, OPT_QUIET,
- OPT_R_ENUM, OPT_PROV_ENUM
+ OPT_INFORM,
+ OPT_OUTFORM,
+ OPT_KEY,
+ OPT_PUBKEY,
+ OPT_NEW,
+ OPT_CONFIG,
+ OPT_KEYFORM,
+ OPT_IN,
+ OPT_OUT,
+ OPT_KEYOUT,
+ OPT_PASSIN,
+ OPT_PASSOUT,
+ OPT_NEWKEY,
+ OPT_PKEYOPT,
+ OPT_SIGOPT,
+ OPT_VFYOPT,
+ OPT_BATCH,
+ OPT_NEWHDR,
+ OPT_MODULUS,
+ OPT_VERIFY,
+ OPT_NOENC,
+ OPT_NODES,
+ OPT_NOOUT,
+ OPT_VERBOSE,
+ OPT_UTF8,
+ OPT_NAMEOPT,
+ OPT_REQOPT,
+ OPT_SUBJ,
+ OPT_SUBJECT,
+ OPT_TEXT,
+ OPT_X509,
+ OPT_X509V1,
+ OPT_CA,
+ OPT_CAKEY,
+ OPT_MULTIVALUE_RDN,
+ OPT_NOT_BEFORE,
+ OPT_NOT_AFTER,
+ OPT_DAYS,
+ OPT_SET_SERIAL,
+ OPT_COPY_EXTENSIONS,
+ OPT_EXTENSIONS,
+ OPT_REQEXTS,
+ OPT_ADDEXT,
+ OPT_PRECERT,
+ OPT_MD,
+ OPT_SECTION,
+ OPT_QUIET,
+ OPT_R_ENUM,
+ OPT_PROV_ENUM
} OPTION_CHOICE;
const OPTIONS req_options[] = {
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
- {"cipher", OPT_CIPHER, 's', "Specify the cipher for private key encryption"},
- {"in", OPT_IN, '<', "X.509 request input file (default stdin)"},
- {"inform", OPT_INFORM, 'F',
- "CSR input format to use (PEM or DER; by default try PEM first)"},
- {"verify", OPT_VERIFY, '-', "Verify self-signature on the request"},
+ { "help", OPT_HELP, '-', "Display this summary" },
+ { "cipher", OPT_CIPHER, 's', "Specify the cipher for private key encryption" },
+ { "in", OPT_IN, '<', "X.509 request input file (default stdin)" },
+ { "inform", OPT_INFORM, 'F',
+ "CSR input format to use (PEM or DER; by default try PEM first)" },
+ { "verify", OPT_VERIFY, '-', "Verify self-signature on the request" },
OPT_SECTION("Certificate"),
- {"new", OPT_NEW, '-', "New request"},
- {"config", OPT_CONFIG, '<', "Request template file"},
- {"section", OPT_SECTION, 's', "Config section to use (default \"req\")"},
- {"utf8", OPT_UTF8, '-', "Input characters are UTF8 (default ASCII)"},
- {"nameopt", OPT_NAMEOPT, 's', "Certificate subject/issuer name printing options"},
- {"reqopt", OPT_REQOPT, 's', "Various request text options"},
- {"text", OPT_TEXT, '-', "Text form of request"},
- {"x509", OPT_X509, '-',
- "Output an X.509 certificate structure instead of a cert request"},
- {"x509v1", OPT_X509V1, '-', "Request cert generation with X.509 version 1"},
- {"CA", OPT_CA, '<', "Issuer cert to use for signing a cert, implies -x509"},
- {"CAkey", OPT_CAKEY, 's',
- "Issuer private key to use with -CA; default is -CA arg"},
- {OPT_MORE_STR, 1, 1, "(Required by some CA's)"},
- {"subj", OPT_SUBJ, 's', "Set or modify subject of request or cert"},
- {"subject", OPT_SUBJECT, '-',
- "Print the subject of the output request or cert"},
- {"multivalue-rdn", OPT_MULTIVALUE_RDN, '-',
- "Deprecated; multi-valued RDNs support is always on."},
- {"not_before", OPT_NOT_BEFORE, 's',
- "[CC]YYMMDDHHMMSSZ value for notBefore certificate field"},
- {"not_after", OPT_NOT_AFTER, 's',
- "[CC]YYMMDDHHMMSSZ value for notAfter certificate field, overrides -days"},
- {"days", OPT_DAYS, 'p', "Number of days certificate is valid for"},
- {"set_serial", OPT_SET_SERIAL, 's', "Serial number to use"},
- {"copy_extensions", OPT_COPY_EXTENSIONS, 's',
- "copy extensions from request when using -x509"},
- {"extensions", OPT_EXTENSIONS, 's',
- "Cert or request extension section (override value in config file)"},
- {"reqexts", OPT_REQEXTS, 's', "An alias for -extensions"},
- {"addext", OPT_ADDEXT, 's',
- "Additional cert extension key=value pair (may be given more than once)"},
- {"precert", OPT_PRECERT, '-', "Add a poison extension to generated cert (implies -new)"},
+ { "new", OPT_NEW, '-', "New request" },
+ { "config", OPT_CONFIG, '<', "Request template file" },
+ { "section", OPT_SECTION, 's', "Config section to use (default \"req\")" },
+ { "utf8", OPT_UTF8, '-', "Input characters are UTF8 (default ASCII)" },
+ { "nameopt", OPT_NAMEOPT, 's', "Certificate subject/issuer name printing options" },
+ { "reqopt", OPT_REQOPT, 's', "Various request text options" },
+ { "text", OPT_TEXT, '-', "Text form of request" },
+ { "x509", OPT_X509, '-',
+ "Output an X.509 certificate structure instead of a cert request" },
+ { "x509v1", OPT_X509V1, '-', "Request cert generation with X.509 version 1" },
+ { "CA", OPT_CA, '<', "Issuer cert to use for signing a cert, implies -x509" },
+ { "CAkey", OPT_CAKEY, 's',
+ "Issuer private key to use with -CA; default is -CA arg" },
+ { OPT_MORE_STR, 1, 1, "(Required by some CA's)" },
+ { "subj", OPT_SUBJ, 's', "Set or modify subject of request or cert" },
+ { "subject", OPT_SUBJECT, '-',
+ "Print the subject of the output request or cert" },
+ { "multivalue-rdn", OPT_MULTIVALUE_RDN, '-',
+ "Deprecated; multi-valued RDNs support is always on." },
+ { "not_before", OPT_NOT_BEFORE, 's',
+ "[CC]YYMMDDHHMMSSZ value for notBefore certificate field" },
+ { "not_after", OPT_NOT_AFTER, 's',
+ "[CC]YYMMDDHHMMSSZ value for notAfter certificate field, overrides -days" },
+ { "days", OPT_DAYS, 'p', "Number of days certificate is valid for" },
+ { "set_serial", OPT_SET_SERIAL, 's', "Serial number to use" },
+ { "copy_extensions", OPT_COPY_EXTENSIONS, 's',
+ "copy extensions from request when using -x509" },
+ { "extensions", OPT_EXTENSIONS, 's',
+ "Cert or request extension section (override value in config file)" },
+ { "reqexts", OPT_REQEXTS, 's', "An alias for -extensions" },
+ { "addext", OPT_ADDEXT, 's',
+ "Additional cert extension key=value pair (may be given more than once)" },
+ { "precert", OPT_PRECERT, '-', "Add a poison extension to generated cert (implies -new)" },
OPT_SECTION("Keys and Signing"),
- {"key", OPT_KEY, 's', "Key for signing, and to include unless -in given"},
- {"keyform", OPT_KEYFORM, 'f', "Key file format (DER/PEM)"},
- {"pubkey", OPT_PUBKEY, '-', "Output public key"},
- {"keyout", OPT_KEYOUT, '>', "File to write private key to"},
- {"passin", OPT_PASSIN, 's', "Private key and certificate password source"},
- {"passout", OPT_PASSOUT, 's', "Output file pass phrase source"},
- {"newkey", OPT_NEWKEY, 's',
- "Generate new key with [<alg>:]<nbits> or <alg>[:<file>] or param:<file>"},
- {"pkeyopt", OPT_PKEYOPT, 's', "Public key options as opt:value"},
- {"sigopt", OPT_SIGOPT, 's', "Signature parameter in n:v form"},
- {"vfyopt", OPT_VFYOPT, 's', "Verification parameter in n:v form"},
- {"", OPT_MD, '-', "Any supported digest"},
+ { "key", OPT_KEY, 's', "Key for signing, and to include unless -in given" },
+ { "keyform", OPT_KEYFORM, 'f', "Key file format (DER/PEM)" },
+ { "pubkey", OPT_PUBKEY, '-', "Output public key" },
+ { "keyout", OPT_KEYOUT, '>', "File to write private key to" },
+ { "passin", OPT_PASSIN, 's', "Private key and certificate password source" },
+ { "passout", OPT_PASSOUT, 's', "Output file pass phrase source" },
+ { "newkey", OPT_NEWKEY, 's',
+ "Generate new key with [<alg>:]<nbits> or <alg>[:<file>] or param:<file>" },
+ { "pkeyopt", OPT_PKEYOPT, 's', "Public key options as opt:value" },
+ { "sigopt", OPT_SIGOPT, 's', "Signature parameter in n:v form" },
+ { "vfyopt", OPT_VFYOPT, 's', "Verification parameter in n:v form" },
+ { "", OPT_MD, '-', "Any supported digest" },
OPT_SECTION("Output"),
- {"out", OPT_OUT, '>', "Output file"},
- {"outform", OPT_OUTFORM, 'F', "Output format - DER or PEM"},
- {"batch", OPT_BATCH, '-',
- "Do not ask anything during request generation"},
- {"verbose", OPT_VERBOSE, '-', "Verbose output"},
- {"quiet", OPT_QUIET, '-', "Terse output"},
- {"noenc", OPT_NOENC, '-', "Don't encrypt private keys"},
- {"nodes", OPT_NODES, '-', "Don't encrypt private keys; deprecated"},
- {"noout", OPT_NOOUT, '-', "Do not output REQ"},
- {"newhdr", OPT_NEWHDR, '-', "Output \"NEW\" in the header lines"},
- {"modulus", OPT_MODULUS, '-', "RSA modulus"},
+ { "out", OPT_OUT, '>', "Output file" },
+ { "outform", OPT_OUTFORM, 'F', "Output format - DER or PEM" },
+ { "batch", OPT_BATCH, '-',
+ "Do not ask anything during request generation" },
+ { "verbose", OPT_VERBOSE, '-', "Verbose output" },
+ { "quiet", OPT_QUIET, '-', "Terse output" },
+ { "noenc", OPT_NOENC, '-', "Don't encrypt private keys" },
+ { "nodes", OPT_NODES, '-', "Don't encrypt private keys; deprecated" },
+ { "noout", OPT_NOOUT, '-', "Do not output REQ" },
+ { "newhdr", OPT_NEWHDR, '-', "Output \"NEW\" in the header lines" },
+ { "modulus", OPT_MODULUS, '-', "RSA modulus" },
OPT_R_OPTIONS,
OPT_PROV_OPTIONS,
- {NULL}
+ { NULL }
};
/*
@@ -276,7 +313,7 @@ int req_main(int argc, char **argv)
switch (o) {
case OPT_EOF:
case OPT_ERR:
- opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
case OPT_HELP:
@@ -341,7 +378,7 @@ int req_main(int argc, char **argv)
if (pkeyopts == NULL)
pkeyopts = sk_OPENSSL_STRING_new_null();
if (pkeyopts == NULL
- || !sk_OPENSSL_STRING_push(pkeyopts, opt_arg()))
+ || !sk_OPENSSL_STRING_push(pkeyopts, opt_arg()))
goto opthelp;
break;
case OPT_SIGOPT:
@@ -420,7 +457,7 @@ int req_main(int argc, char **argv)
days = atoi(opt_arg());
if (days <= UNSET_DAYS) {
BIO_printf(bio_err, "%s: -days parameter arg must be >= -1\n",
- prog);
+ prog);
goto end;
}
break;
@@ -445,7 +482,7 @@ int req_main(int argc, char **argv)
case OPT_COPY_EXTENSIONS:
if (!set_ext_copy(&ext_copy, opt_arg())) {
BIO_printf(bio_err, "Invalid extension copy option: \"%s\"\n",
- opt_arg());
+ opt_arg());
goto end;
}
break;
@@ -507,7 +544,7 @@ int req_main(int argc, char **argv)
newreq = 1;
else if (!newreq && isatty(fileno_stdin()))
BIO_printf(bio_err,
- "Warning: Will read cert request from stdin since no -in option is given\n");
+ "Warning: Will read cert request from stdin since no -in option is given\n");
}
if (!app_passwd(passargin, passargout, &passin, &passout)) {
@@ -520,7 +557,7 @@ int req_main(int argc, char **argv)
if (addext_bio != NULL) {
if (verbose)
BIO_printf(bio_err,
- "Using additional configuration from -addext options\n");
+ "Using additional configuration from -addext options\n");
if ((addext_conf = app_load_config_bio(addext_bio, NULL)) == NULL)
goto end;
}
@@ -535,7 +572,7 @@ int req_main(int argc, char **argv)
if (oid_bio == NULL) {
if (verbose)
BIO_printf(bio_err,
- "Problems opening '%s' for extra OIDs\n", p);
+ "Problems opening '%s' for extra OIDs\n", p);
} else {
OBJ_create_objects(oid_bio);
BIO_free(oid_bio);
@@ -558,7 +595,7 @@ int req_main(int argc, char **argv)
if (extsect == NULL)
extsect = app_conf_try_string(req_conf, section,
- gen_x509 ? V3_EXTENSIONS : REQ_EXTENSIONS);
+ gen_x509 ? V3_EXTENSIONS : REQ_EXTENSIONS);
if (extsect != NULL) {
/* Check syntax of extension section in config file */
X509V3_CTX ctx;
@@ -567,8 +604,8 @@ int req_main(int argc, char **argv)
X509V3_set_nconf(&ctx, req_conf);
if (!X509V3_EXT_add_nconf(req_conf, &ctx, extsect, NULL)) {
BIO_printf(bio_err,
- "Error checking %s extension section %s\n",
- gen_x509 ? "x509" : "request", extsect);
+ "Error checking %s extension section %s\n",
+ gen_x509 ? "x509" : "request", extsect);
goto end;
}
}
@@ -585,12 +622,10 @@ int req_main(int argc, char **argv)
}
if (passin == NULL)
- passin = nofree_passin =
- app_conf_try_string(req_conf, section, "input_password");
+ passin = nofree_passin = app_conf_try_string(req_conf, section, "input_password");
if (passout == NULL)
- passout = nofree_passout =
- app_conf_try_string(req_conf, section, "output_password");
+ passout = nofree_passout = app_conf_try_string(req_conf, section, "output_password");
p = app_conf_try_string(req_conf, section, STRING_MASK);
if (p != NULL && !ASN1_STRING_set_default_mask_asc(p)) {
@@ -612,7 +647,7 @@ int req_main(int argc, char **argv)
}
if (keyalg != NULL && pkey != NULL) {
BIO_printf(bio_err,
- "Warning: Not generating key via given -newkey option since -key is given\n");
+ "Warning: Not generating key via given -newkey option since -key is given\n");
/* Better throw an error in this case */
}
if (newreq && pkey == NULL) {
@@ -630,7 +665,7 @@ int req_main(int argc, char **argv)
|| EVP_PKEY_CTX_is_a(genctx, "RSA-PSS")
|| EVP_PKEY_CTX_is_a(genctx, "DSA"))) {
BIO_printf(bio_err, "Private key length too short, needs to be at least %d bits, not %ld.\n",
- MIN_KEY_LENGTH, newkey_len);
+ MIN_KEY_LENGTH, newkey_len);
goto end;
}
@@ -638,17 +673,17 @@ int req_main(int argc, char **argv)
&& (EVP_PKEY_CTX_is_a(genctx, "RSA")
|| EVP_PKEY_CTX_is_a(genctx, "RSA-PSS")))
BIO_printf(bio_err,
- "Warning: It is not recommended to use more than %d bit for RSA keys.\n"
- " Your key size is %ld! Larger key size may behave not as expected.\n",
- OPENSSL_RSA_MAX_MODULUS_BITS, newkey_len);
+ "Warning: It is not recommended to use more than %d bit for RSA keys.\n"
+ " Your key size is %ld! Larger key size may behave not as expected.\n",
+ OPENSSL_RSA_MAX_MODULUS_BITS, newkey_len);
#ifndef OPENSSL_NO_DSA
if (EVP_PKEY_CTX_is_a(genctx, "DSA")
- && newkey_len > OPENSSL_DSA_MAX_MODULUS_BITS)
+ && newkey_len > OPENSSL_DSA_MAX_MODULUS_BITS)
BIO_printf(bio_err,
- "Warning: It is not recommended to use more than %d bit for DSA keys.\n"
- " Your key size is %ld! Larger key size may behave not as expected.\n",
- OPENSSL_DSA_MAX_MODULUS_BITS, newkey_len);
+ "Warning: It is not recommended to use more than %d bit for DSA keys.\n"
+ " Your key size is %ld! Larger key size may behave not as expected.\n",
+ OPENSSL_DSA_MAX_MODULUS_BITS, newkey_len);
#endif
if (pkeyopts != NULL) {
@@ -697,11 +732,10 @@ int req_main(int argc, char **argv)
cipher = NULL;
i = 0;
- loop:
+ loop:
if (!PEM_write_bio_PrivateKey(out, pkey, cipher,
- NULL, 0, NULL, passout)) {
- if ((ERR_GET_REASON(ERR_peek_error()) ==
- PEM_R_PROBLEMS_GETTING_PASSWORD) && (i < 3)) {
+ NULL, 0, NULL, passout)) {
+ if ((ERR_GET_REASON(ERR_peek_error()) == PEM_R_PROBLEMS_GETTING_PASSWORD) && (i < 3)) {
ERR_clear_error();
i++;
goto loop;
@@ -718,20 +752,20 @@ int req_main(int argc, char **argv)
* where characters may be escaped by \
*/
if (subj != NULL
- && (fsubj = parse_name(subj, chtype, multirdn, "subject")) == NULL)
+ && (fsubj = parse_name(subj, chtype, multirdn, "subject")) == NULL)
goto end;
if (!newreq) {
if (keyfile != NULL)
BIO_printf(bio_err,
- "Warning: Not placing -key in cert or request since request is used\n");
+ "Warning: Not placing -key in cert or request since request is used\n");
req = load_csr_autofmt(infile /* if NULL, reads from stdin */,
- informat, vfyopts, "X509 request");
+ informat, vfyopts, "X509 request");
if (req == NULL)
goto end;
} else if (infile != NULL) {
BIO_printf(bio_err,
- "Warning: Ignoring -in option since -new or -newkey or -precert is given\n");
+ "Warning: Ignoring -in option since -new or -newkey or -precert is given\n");
/* Better throw an error in this case, as done in the x509 app */
}
@@ -740,30 +774,32 @@ int req_main(int argc, char **argv)
if (CAkeyfile != NULL) {
if (CAfile == NULL) {
BIO_printf(bio_err,
- "Warning: Ignoring -CAkey option since no -CA option is given\n");
+ "Warning: Ignoring -CAkey option since no -CA option is given\n");
} else {
if ((CAkey = load_key(CAkeyfile, FORMAT_UNDEF,
- 0, passin,
- CAkeyfile != CAfile
- ? "issuer private key from -CAkey arg"
- : "issuer private key from -CA arg")) == NULL)
+ 0, passin,
+ CAkeyfile != CAfile
+ ? "issuer private key from -CAkey arg"
+ : "issuer private key from -CA arg"))
+ == NULL)
goto end;
}
}
if (CAfile != NULL) {
if ((CAcert = load_cert_pass(CAfile, FORMAT_UNDEF, 1, passin,
- "issuer cert from -CA arg")) == NULL)
+ "issuer cert from -CA arg"))
+ == NULL)
goto end;
if (!X509_check_private_key(CAcert, CAkey)) {
BIO_printf(bio_err,
- "Issuer CA certificate and key do not match\n");
+ "Issuer CA certificate and key do not match\n");
goto end;
}
}
if (newreq || gen_x509) {
if (CAcert == NULL && pkey == NULL) {
BIO_printf(bio_err, "Must provide a signature key using -key or"
- " provide -CA / -CAkey\n");
+ " provide -CA / -CAkey\n");
goto end;
}
@@ -783,17 +819,16 @@ int req_main(int argc, char **argv)
EVP_PKEY *pub_key = X509_REQ_get0_pubkey(req);
EVP_PKEY *issuer_key = CAcert != NULL ? CAkey : pkey;
X509V3_CTX ext_ctx;
- X509_NAME *issuer = CAcert != NULL ? X509_get_subject_name(CAcert) :
- X509_REQ_get_subject_name(req);
- X509_NAME *n_subj = fsubj != NULL ? fsubj :
- X509_REQ_get_subject_name(req);
+ X509_NAME *issuer = CAcert != NULL ? X509_get_subject_name(CAcert) : X509_REQ_get_subject_name(req);
+ X509_NAME *n_subj = fsubj != NULL ? fsubj : X509_REQ_get_subject_name(req);
if (CAcert != NULL && keyfile != NULL)
BIO_printf(bio_err,
- "Warning: Not using -key or -newkey for signing since -CA option is given\n");
+ "Warning: Not using -key or -newkey for signing since -CA option is given\n");
if ((new_x509 = X509_new_ex(app_get0_libctx(),
- app_get0_propq())) == NULL)
+ app_get0_propq()))
+ == NULL)
goto end;
if (serial != NULL) {
@@ -809,7 +844,7 @@ int req_main(int argc, char **argv)
if (days == UNSET_DAYS)
days = DEFAULT_DAYS;
else if (not_after != NULL)
- BIO_printf(bio_err,"Warning: -not_after option overriding -days option\n");
+ BIO_printf(bio_err, "Warning: -not_after option overriding -days option\n");
if (!set_cert_times(new_x509, not_before, not_after, days, 1))
goto end;
if (!X509_set_subject_name(new_x509, n_subj))
@@ -826,14 +861,14 @@ int req_main(int argc, char **argv)
/* Set up V3 context struct */
X509V3_set_ctx(&ext_ctx, CAcert != NULL ? CAcert : new_x509,
- new_x509, NULL, NULL, X509V3_CTX_REPLACE);
+ new_x509, NULL, NULL, X509V3_CTX_REPLACE);
/* prepare fallback for AKID, but only if issuer cert == new_x509 */
if (CAcert == NULL) {
if (!X509V3_set_issuer_pkey(&ext_ctx, issuer_key))
goto end;
if (!cert_matches_key(new_x509, issuer_key))
BIO_printf(bio_err,
- "Warning: Signature key and public key of cert do not match\n");
+ "Warning: Signature key and public key of cert do not match\n");
}
X509V3_set_nconf(&ext_ctx, req_conf);
@@ -841,12 +876,12 @@ int req_main(int argc, char **argv)
if (extsect != NULL
&& !X509V3_EXT_add_nconf(req_conf, &ext_ctx, extsect, new_x509)) {
BIO_printf(bio_err, "Error adding x509 extensions from section %s\n",
- extsect);
+ extsect);
goto end;
}
if (addext_conf != NULL
&& !X509V3_EXT_add_nconf(addext_conf, &ext_ctx, "default",
- new_x509)) {
+ new_x509)) {
BIO_printf(bio_err, "Error adding x509 extensions defined via -addext\n");
goto end;
}
@@ -854,14 +889,15 @@ int req_main(int argc, char **argv)
/* If a pre-cert was requested, we need to add a poison extension */
if (precert) {
if (X509_add1_ext_i2d(new_x509, NID_ct_precert_poison,
- NULL, 1, 0) != 1) {
+ NULL, 1, 0)
+ != 1) {
BIO_printf(bio_err, "Error adding poison extension\n");
goto end;
}
}
i = do_X509_sign(new_x509, x509v1, issuer_key, digest, sigopts,
- &ext_ctx);
+ &ext_ctx);
if (!i)
goto end;
} else {
@@ -869,7 +905,7 @@ int req_main(int argc, char **argv)
if (precert) {
BIO_printf(bio_err,
- "Warning: Ignoring -precert flag since no cert is produced\n");
+ "Warning: Ignoring -precert flag since no cert is produced\n");
}
/* Set up V3 context struct */
X509V3_set_ctx(&ext_ctx, NULL, NULL, req, NULL, X509V3_CTX_REPLACE);
@@ -879,12 +915,12 @@ int req_main(int argc, char **argv)
if (extsect != NULL
&& !X509V3_EXT_REQ_add_nconf(req_conf, &ext_ctx, extsect, req)) {
BIO_printf(bio_err, "Error adding request extensions from section %s\n",
- extsect);
+ extsect);
goto end;
}
if (addext_conf != NULL
&& !X509V3_EXT_REQ_add_nconf(addext_conf, &ext_ctx, "default",
- req)) {
+ req)) {
BIO_printf(bio_err, "Error adding request extensions defined via -addext\n");
goto end;
}
@@ -937,9 +973,8 @@ int req_main(int argc, char **argv)
}
out = bio_open_default(outfile,
- keyout != NULL && outfile != NULL &&
- strcmp(keyout, outfile) == 0 ? 'a' : 'w',
- outformat);
+ keyout != NULL && outfile != NULL && strcmp(keyout, outfile) == 0 ? 'a' : 'w',
+ outformat);
if (out == NULL)
goto end;
@@ -969,9 +1004,7 @@ int req_main(int argc, char **argv)
}
if (subject) {
- print_name(out, "subject=", gen_x509
- ? X509_get_subject_name(new_x509)
- : X509_REQ_get_subject_name(req));
+ print_name(out, "subject=", gen_x509 ? X509_get_subject_name(new_x509) : X509_REQ_get_subject_name(req));
}
if (modulus) {
@@ -1022,7 +1055,7 @@ int req_main(int argc, char **argv)
}
}
ret = 0;
- end:
+end:
if (ret) {
ERR_print_errors(bio_err);
}
@@ -1052,7 +1085,7 @@ int req_main(int argc, char **argv)
}
static int make_REQ(X509_REQ *req, EVP_PKEY *pkey, X509_NAME *fsubj,
- int multirdn, int attribs, unsigned long chtype)
+ int multirdn, int attribs, unsigned long chtype)
{
int ret = 0, i;
char no_prompt = 0;
@@ -1091,7 +1124,7 @@ static int make_REQ(X509_REQ *req, EVP_PKEY *pkey, X509_NAME *fsubj,
i = auto_info(req, dn_sk, attr_sk, attribs, chtype);
else
i = prompt_info(req, dn_sk, dn_sect, attr_sk, attr_sect, attribs,
- chtype);
+ chtype);
if (!i)
goto err;
@@ -1099,14 +1132,14 @@ static int make_REQ(X509_REQ *req, EVP_PKEY *pkey, X509_NAME *fsubj,
goto err;
ret = 1;
- err:
+err:
return ret;
}
static int prompt_info(X509_REQ *req,
- STACK_OF(CONF_VALUE) *dn_sk, const char *dn_sect,
- STACK_OF(CONF_VALUE) *attr_sk, const char *attr_sect,
- int attribs, unsigned long chtype)
+ STACK_OF(CONF_VALUE) *dn_sk, const char *dn_sect,
+ STACK_OF(CONF_VALUE) *attr_sk, const char *attr_sect,
+ int attribs, unsigned long chtype)
{
int i;
char *p, *q;
@@ -1120,22 +1153,22 @@ static int prompt_info(X509_REQ *req,
if (!batch) {
BIO_printf(bio_err,
- "You are about to be asked to enter information that will be incorporated\n");
+ "You are about to be asked to enter information that will be incorporated\n");
BIO_printf(bio_err, "into your certificate request.\n");
BIO_printf(bio_err,
- "What you are about to enter is what is called a Distinguished Name or a DN.\n");
+ "What you are about to enter is what is called a Distinguished Name or a DN.\n");
BIO_printf(bio_err,
- "There are quite a few fields but you can leave some blank\n");
+ "There are quite a few fields but you can leave some blank\n");
BIO_printf(bio_err,
- "For some fields there will be a default value,\n");
+ "For some fields there will be a default value,\n");
BIO_printf(bio_err,
- "If you enter '.', the field will be left blank.\n");
+ "If you enter '.', the field will be left blank.\n");
BIO_printf(bio_err, "-----\n");
}
if (sk_CONF_VALUE_num(dn_sk)) {
i = -1;
- start:
+ start:
for (;;) {
i++;
if (sk_CONF_VALUE_num(dn_sk) <= i)
@@ -1144,8 +1177,7 @@ static int prompt_info(X509_REQ *req,
v = sk_CONF_VALUE_value(dn_sk, i);
p = q = NULL;
type = v->name;
- if (!check_end(type, "_min") || !check_end(type, "_max") ||
- !check_end(type, "_default") || !check_end(type, "_value"))
+ if (!check_end(type, "_min") || !check_end(type, "_max") || !check_end(type, "_default") || !check_end(type, "_value"))
continue;
/*
* Skip past any leading X. X: X, etc to allow for multiple
@@ -1188,7 +1220,7 @@ static int prompt_info(X509_REQ *req,
n_max = -1;
if (!add_DN_object(subj, v->value, def, value, nid,
- n_min, n_max, chtype, mval))
+ n_min, n_max, chtype, mval))
return 0;
}
if (X509_NAME_entry_count(subj) == 0) {
@@ -1200,13 +1232,13 @@ static int prompt_info(X509_REQ *req,
if ((attr_sk != NULL) && (sk_CONF_VALUE_num(attr_sk) > 0)
&& (!batch)) {
BIO_printf(bio_err,
- "\nPlease enter the following 'extra' attributes\n");
+ "\nPlease enter the following 'extra' attributes\n");
BIO_printf(bio_err,
- "to be sent with your certificate request\n");
+ "to be sent with your certificate request\n");
}
i = -1;
- start2:
+ start2:
for (;;) {
i++;
if ((attr_sk == NULL) || (sk_CONF_VALUE_num(attr_sk) <= i))
@@ -1238,8 +1270,8 @@ static int prompt_info(X509_REQ *req,
n_max = -1;
if (!add_attribute_object(req,
- v->value, def, value, nid, n_min,
- n_max, chtype))
+ v->value, def, value, nid, n_min,
+ n_max, chtype))
return 0;
}
}
@@ -1249,12 +1281,11 @@ static int prompt_info(X509_REQ *req,
}
return 1;
-
}
static int auto_info(X509_REQ *req, STACK_OF(CONF_VALUE) *dn_sk,
- STACK_OF(CONF_VALUE) *attr_sk, int attribs,
- unsigned long chtype)
+ STACK_OF(CONF_VALUE) *attr_sk, int attribs,
+ unsigned long chtype)
{
int i, spec_char, plus_char;
char *p, *q;
@@ -1277,7 +1308,7 @@ static int auto_info(X509_REQ *req, STACK_OF(CONF_VALUE) *dn_sk,
spec_char = (*p == ':' || *p == ',' || *p == '.');
#else
spec_char = (*p == os_toascii[':'] || *p == os_toascii[',']
- || *p == os_toascii['.']);
+ || *p == os_toascii['.']);
#endif
if (spec_char) {
p++;
@@ -1298,10 +1329,9 @@ static int auto_info(X509_REQ *req, STACK_OF(CONF_VALUE) *dn_sk,
mval = 0;
}
if (!X509_NAME_add_entry_by_txt(subj, type, chtype,
- (unsigned char *)v->value, -1, -1,
- mval))
+ (unsigned char *)v->value, -1, -1,
+ mval))
return 0;
-
}
if (!X509_NAME_entry_count(subj)) {
@@ -1312,7 +1342,7 @@ static int auto_info(X509_REQ *req, STACK_OF(CONF_VALUE) *dn_sk,
for (i = 0; i < sk_CONF_VALUE_num(attr_sk); i++) {
v = sk_CONF_VALUE_value(attr_sk, i);
if (!X509_REQ_add1_attr_by_txt(req, v->name, chtype,
- (unsigned char *)v->value, -1))
+ (unsigned char *)v->value, -1))
return 0;
}
}
@@ -1320,40 +1350,40 @@ static int auto_info(X509_REQ *req, STACK_OF(CONF_VALUE) *dn_sk,
}
static int add_DN_object(X509_NAME *n, char *text, const char *def,
- char *value, int nid, int n_min, int n_max,
- unsigned long chtype, int mval)
+ char *value, int nid, int n_min, int n_max,
+ unsigned long chtype, int mval)
{
int ret = 0;
char buf[1024];
ret = build_data(text, def, value, n_min, n_max, buf, sizeof(buf),
- "DN value", "DN default");
+ "DN value", "DN default");
if ((ret == 0) || (ret == 1))
return ret;
ret = 1;
if (!X509_NAME_add_entry_by_NID(n, nid, chtype,
- (unsigned char *)buf, -1, -1, mval))
+ (unsigned char *)buf, -1, -1, mval))
ret = 0;
return ret;
}
static int add_attribute_object(X509_REQ *req, char *text, const char *def,
- char *value, int nid, int n_min,
- int n_max, unsigned long chtype)
+ char *value, int nid, int n_min,
+ int n_max, unsigned long chtype)
{
int ret = 0;
char buf[1024];
ret = build_data(text, def, value, n_min, n_max, buf, sizeof(buf),
- "Attribute value", "Attribute default");
+ "Attribute value", "Attribute default");
if ((ret == 0) || (ret == 1))
return ret;
ret = 1;
if (!X509_REQ_add1_attr_by_NID(req, nid, chtype,
- (unsigned char *)buf, -1)) {
+ (unsigned char *)buf, -1)) {
BIO_printf(bio_err, "Error adding attribute\n");
ret = 0;
}
@@ -1362,11 +1392,11 @@ static int add_attribute_object(X509_REQ *req, char *text, const char *def,
}
static int build_data(char *text, const char *def, char *value,
- int n_min, int n_max, char *buf, const int buf_size,
- const char *desc1, const char *desc2)
+ int n_min, int n_max, char *buf, const int buf_size,
+ const char *desc1, const char *desc2)
{
int i;
- start:
+start:
if (!batch)
BIO_printf(bio_err, "%s [%s]:", text, def);
(void)BIO_flush(bio_err);
@@ -1417,12 +1447,12 @@ static int req_check_len(int len, int n_min, int n_max)
{
if (n_min > 0 && len < n_min) {
BIO_printf(bio_err,
- "String too short, must be at least %d bytes long\n", n_min);
+ "String too short, must be at least %d bytes long\n", n_min);
return 0;
}
if (n_max >= 0 && len > n_max) {
BIO_printf(bio_err,
- "String too long, must be at most %d bytes long\n", n_max);
+ "String too long, must be at most %d bytes long\n", n_max);
return 0;
}
return 1;
@@ -1447,7 +1477,7 @@ static int check_end(const char *str, const char *end)
* overflow and producing an error message if there is.
*/
static int join(char buf[], size_t buf_size, const char *name,
- const char *tail, const char *desc)
+ const char *tail, const char *desc)
{
const size_t name_len = strlen(name), tail_len = strlen(tail);
@@ -1461,7 +1491,7 @@ static int join(char buf[], size_t buf_size, const char *name,
}
static EVP_PKEY_CTX *set_keygen_ctx(const char *gstr,
- char **pkeytype, long *pkeylen)
+ char **pkeytype, long *pkeylen)
{
EVP_PKEY_CTX *gctx = NULL;
EVP_PKEY *param = NULL;
@@ -1497,8 +1527,8 @@ static EVP_PKEY_CTX *set_keygen_ctx(const char *gstr,
expect_paramfile = 1;
if (p == NULL) {
BIO_printf(bio_err,
- "Parameter file requested but no path given: %s\n",
- gstr);
+ "Parameter file requested but no path given: %s\n",
+ gstr);
return NULL;
}
} else {
@@ -1578,12 +1608,12 @@ static EVP_PKEY_CTX *set_keygen_ctx(const char *gstr,
}
gctx = EVP_PKEY_CTX_new_from_pkey(app_get0_libctx(),
- param, app_get0_propq());
+ param, app_get0_propq());
*pkeylen = EVP_PKEY_get_bits(param);
EVP_PKEY_free(param);
} else {
gctx = EVP_PKEY_CTX_new_from_name(app_get0_libctx(),
- *pkeytype, app_get0_propq());
+ *pkeytype, app_get0_propq());
}
if (gctx == NULL) {
@@ -1596,16 +1626,14 @@ static EVP_PKEY_CTX *set_keygen_ctx(const char *gstr,
EVP_PKEY_CTX_free(gctx);
return NULL;
}
- if (keylen == -1 && (EVP_PKEY_CTX_is_a(gctx, "RSA")
- || EVP_PKEY_CTX_is_a(gctx, "RSA-PSS")))
+ if (keylen == -1 && (EVP_PKEY_CTX_is_a(gctx, "RSA") || EVP_PKEY_CTX_is_a(gctx, "RSA-PSS")))
keylen = *pkeylen;
if (keylen != -1) {
OSSL_PARAM params[] = { OSSL_PARAM_END, OSSL_PARAM_END };
size_t bits = keylen;
- params[0] =
- OSSL_PARAM_construct_size_t(OSSL_PKEY_PARAM_BITS, &bits);
+ params[0] = OSSL_PARAM_construct_size_t(OSSL_PKEY_PARAM_BITS, &bits);
if (EVP_PKEY_CTX_set_params(gctx, params) <= 0) {
BIO_puts(bio_err, "Error setting keysize\n");
EVP_PKEY_CTX_free(gctx);
@@ -1615,4 +1643,3 @@ static EVP_PKEY_CTX *set_keygen_ctx(const char *gstr,
return gctx;
}
-
diff --git a/apps/rsa.c b/apps/rsa.c
index 8aa3295f8e..6cdffd1eae 100644
--- a/apps/rsa.c
+++ b/apps/rsa.c
@@ -34,60 +34,74 @@
#include <openssl/core_dispatch.h>
#ifndef OPENSSL_NO_RC4
-# define DEFAULT_PVK_ENCR_STRENGTH 2
+#define DEFAULT_PVK_ENCR_STRENGTH 2
#else
-# define DEFAULT_PVK_ENCR_STRENGTH 0
+#define DEFAULT_PVK_ENCR_STRENGTH 0
#endif
typedef enum OPTION_choice {
OPT_COMMON,
- OPT_INFORM, OPT_OUTFORM, OPT_IN, OPT_OUT,
- OPT_PUBIN, OPT_PUBOUT, OPT_PASSOUT, OPT_PASSIN,
- OPT_RSAPUBKEY_IN, OPT_RSAPUBKEY_OUT,
+ OPT_INFORM,
+ OPT_OUTFORM,
+ OPT_IN,
+ OPT_OUT,
+ OPT_PUBIN,
+ OPT_PUBOUT,
+ OPT_PASSOUT,
+ OPT_PASSIN,
+ OPT_RSAPUBKEY_IN,
+ OPT_RSAPUBKEY_OUT,
/* Do not change the order here; see case statements below */
- OPT_PVK_NONE, OPT_PVK_WEAK, OPT_PVK_STRONG,
- OPT_NOOUT, OPT_TEXT, OPT_MODULUS, OPT_CHECK, OPT_CIPHER,
- OPT_PROV_ENUM, OPT_TRADITIONAL
+ OPT_PVK_NONE,
+ OPT_PVK_WEAK,
+ OPT_PVK_STRONG,
+ OPT_NOOUT,
+ OPT_TEXT,
+ OPT_MODULUS,
+ OPT_CHECK,
+ OPT_CIPHER,
+ OPT_PROV_ENUM,
+ OPT_TRADITIONAL
} OPTION_CHOICE;
const OPTIONS rsa_options[] = {
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
- {"check", OPT_CHECK, '-', "Verify key consistency"},
- {"", OPT_CIPHER, '-', "Any supported cipher"},
+ { "help", OPT_HELP, '-', "Display this summary" },
+ { "check", OPT_CHECK, '-', "Verify key consistency" },
+ { "", OPT_CIPHER, '-', "Any supported cipher" },
OPT_SECTION("Input"),
- {"in", OPT_IN, 's', "Input file"},
- {"inform", OPT_INFORM, 'f', "Input format (DER/PEM/P12)"},
- {"pubin", OPT_PUBIN, '-', "Expect a public key in input file"},
- {"RSAPublicKey_in", OPT_RSAPUBKEY_IN, '-', "Input is an RSAPublicKey"},
- {"passin", OPT_PASSIN, 's', "Input file pass phrase source"},
+ { "in", OPT_IN, 's', "Input file" },
+ { "inform", OPT_INFORM, 'f', "Input format (DER/PEM/P12)" },
+ { "pubin", OPT_PUBIN, '-', "Expect a public key in input file" },
+ { "RSAPublicKey_in", OPT_RSAPUBKEY_IN, '-', "Input is an RSAPublicKey" },
+ { "passin", OPT_PASSIN, 's', "Input file pass phrase source" },
OPT_SECTION("Output"),
- {"out", OPT_OUT, '>', "Output file"},
- {"outform", OPT_OUTFORM, 'f', "Output format, one of DER PEM PVK"},
- {"pubout", OPT_PUBOUT, '-', "Output a public key"},
- {"RSAPublicKey_out", OPT_RSAPUBKEY_OUT, '-', "Output is an RSAPublicKey"},
- {"passout", OPT_PASSOUT, 's', "Output file pass phrase source"},
- {"noout", OPT_NOOUT, '-', "Don't print key out"},
- {"text", OPT_TEXT, '-', "Print the key in text"},
- {"modulus", OPT_MODULUS, '-', "Print the RSA key modulus"},
- {"traditional", OPT_TRADITIONAL, '-',
- "Use traditional format for private keys"},
+ { "out", OPT_OUT, '>', "Output file" },
+ { "outform", OPT_OUTFORM, 'f', "Output format, one of DER PEM PVK" },
+ { "pubout", OPT_PUBOUT, '-', "Output a public key" },
+ { "RSAPublicKey_out", OPT_RSAPUBKEY_OUT, '-', "Output is an RSAPublicKey" },
+ { "passout", OPT_PASSOUT, 's', "Output file pass phrase source" },
+ { "noout", OPT_NOOUT, '-', "Don't print key out" },
+ { "text", OPT_TEXT, '-', "Print the key in text" },
+ { "modulus", OPT_MODULUS, '-', "Print the RSA key modulus" },
+ { "traditional", OPT_TRADITIONAL, '-',
+ "Use traditional format for private keys" },
#ifndef OPENSSL_NO_RC4
OPT_SECTION("PVK"),
- {"pvk-strong", OPT_PVK_STRONG, '-', "Enable 'Strong' PVK encoding level (default)"},
- {"pvk-weak", OPT_PVK_WEAK, '-', "Enable 'Weak' PVK encoding level"},
- {"pvk-none", OPT_PVK_NONE, '-', "Don't enforce PVK encoding"},
+ { "pvk-strong", OPT_PVK_STRONG, '-', "Enable 'Strong' PVK encoding level (default)" },
+ { "pvk-weak", OPT_PVK_WEAK, '-', "Enable 'Weak' PVK encoding level" },
+ { "pvk-none", OPT_PVK_NONE, '-', "Don't enforce PVK encoding" },
#endif
OPT_PROV_OPTIONS,
- {NULL}
+ { NULL }
};
static int try_legacy_encoding(EVP_PKEY *pkey, int outformat, int pubout,
- BIO *out)
+ BIO *out)
{
int ret = 0;
#ifndef OPENSSL_NO_DEPRECATED_3_0
@@ -106,10 +120,10 @@ static int try_legacy_encoding(EVP_PKEY *pkey, int outformat, int pubout,
ret = PEM_write_bio_RSAPublicKey(out, rsa) > 0;
else
ret = PEM_write_bio_RSA_PUBKEY(out, rsa) > 0;
-# ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DSA
} else if (outformat == FORMAT_MSBLOB || outformat == FORMAT_PVK) {
ret = i2b_PublicKey_bio(out, pkey) > 0;
-# endif
+#endif
}
#endif
@@ -141,7 +155,7 @@ int rsa_main(int argc, char **argv)
switch (o) {
case OPT_EOF:
case OPT_ERR:
- opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
case OPT_HELP:
@@ -180,9 +194,9 @@ int rsa_main(int argc, char **argv)
case OPT_RSAPUBKEY_OUT:
pubout = 2;
break;
- case OPT_PVK_STRONG: /* pvk_encr:= 2 */
- case OPT_PVK_WEAK: /* pvk_encr:= 1 */
- case OPT_PVK_NONE: /* pvk_encr:= 0 */
+ case OPT_PVK_STRONG: /* pvk_encr:= 2 */
+ case OPT_PVK_WEAK: /* pvk_encr:= 1 */
+ case OPT_PVK_NONE: /* pvk_encr:= 0 */
pvk_encr = (o - OPT_PVK_NONE);
break;
case OPT_NOOUT:
@@ -331,7 +345,7 @@ int rsa_main(int argc, char **argv)
} else {
assert(private);
selection = (OSSL_KEYMGMT_SELECT_KEYPAIR
- | OSSL_KEYMGMT_SELECT_ALL_PARAMETERS);
+ | OSSL_KEYMGMT_SELECT_ALL_PARAMETERS);
}
/* For DER based output, select the desired output structure */
@@ -352,8 +366,8 @@ int rsa_main(int argc, char **argv)
/* Now, perform the encoding */
ectx = OSSL_ENCODER_CTX_new_for_pkey(pkey, selection,
- output_type, output_structure,
- NULL);
+ output_type, output_structure,
+ NULL);
if (OSSL_ENCODER_CTX_get_num_encoders(ectx) == 0) {
if ((!pubout && !pubin)
|| !try_legacy_encoding(pkey, outformat, pubout, out))
@@ -373,8 +387,8 @@ int rsa_main(int argc, char **argv)
if (passout != NULL)
/* When passout given, override the passphrase prompter */
OSSL_ENCODER_CTX_set_passphrase(ectx,
- (const unsigned char *)passout,
- strlen(passout));
+ (const unsigned char *)passout,
+ strlen(passout));
}
/* PVK is a bit special... */
@@ -394,7 +408,7 @@ int rsa_main(int argc, char **argv)
goto end;
}
ret = 0;
- end:
+end:
OSSL_ENCODER_CTX_free(ectx);
BIO_free_all(out);
EVP_PKEY_free(pkey);
diff --git a/apps/rsautl.c b/apps/rsautl.c
index 1639ecc224..e54b1812f2 100644
--- a/apps/rsautl.c
+++ b/apps/rsautl.c
@@ -16,54 +16,69 @@
#include <openssl/pem.h>
#include <openssl/rsa.h>
-#define RSA_SIGN 1
-#define RSA_VERIFY 2
-#define RSA_ENCRYPT 3
-#define RSA_DECRYPT 4
+#define RSA_SIGN 1
+#define RSA_VERIFY 2
+#define RSA_ENCRYPT 3
+#define RSA_DECRYPT 4
-#define KEY_PRIVKEY 1
-#define KEY_PUBKEY 2
-#define KEY_CERT 3
+#define KEY_PRIVKEY 1
+#define KEY_PUBKEY 2
+#define KEY_CERT 3
typedef enum OPTION_choice {
OPT_COMMON,
- OPT_IN, OPT_OUT, OPT_ASN1PARSE, OPT_HEXDUMP,
- OPT_RSA_RAW, OPT_OAEP, OPT_PKCS, OPT_X931,
- OPT_SIGN, OPT_VERIFY, OPT_REV, OPT_ENCRYPT, OPT_DECRYPT,
- OPT_PUBIN, OPT_CERTIN, OPT_INKEY, OPT_PASSIN, OPT_KEYFORM,
- OPT_R_ENUM, OPT_PROV_ENUM
+ OPT_IN,
+ OPT_OUT,
+ OPT_ASN1PARSE,
+ OPT_HEXDUMP,
+ OPT_RSA_RAW,
+ OPT_OAEP,
+ OPT_PKCS,
+ OPT_X931,
+ OPT_SIGN,
+ OPT_VERIFY,
+ OPT_REV,
+ OPT_ENCRYPT,
+ OPT_DECRYPT,
+ OPT_PUBIN,
+ OPT_CERTIN,
+ OPT_INKEY,
+ OPT_PASSIN,
+ OPT_KEYFORM,
+ OPT_R_ENUM,
+ OPT_PROV_ENUM
} OPTION_CHOICE;
const OPTIONS rsautl_options[] = {
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
- {"sign", OPT_SIGN, '-', "Sign with private key"},
- {"verify", OPT_VERIFY, '-', "Verify with public key"},
- {"encrypt", OPT_ENCRYPT, '-', "Encrypt with public key"},
- {"decrypt", OPT_DECRYPT, '-', "Decrypt with private key"},
+ { "help", OPT_HELP, '-', "Display this summary" },
+ { "sign", OPT_SIGN, '-', "Sign with private key" },
+ { "verify", OPT_VERIFY, '-', "Verify with public key" },
+ { "encrypt", OPT_ENCRYPT, '-', "Encrypt with public key" },
+ { "decrypt", OPT_DECRYPT, '-', "Decrypt with private key" },
OPT_SECTION("Input"),
- {"in", OPT_IN, '<', "Input file"},
- {"inkey", OPT_INKEY, 's', "Input key, by default an RSA private key"},
- {"keyform", OPT_KEYFORM, 'f', "Private key format (DER/PEM)"},
- {"pubin", OPT_PUBIN, '-', "Input key is an RSA public pkey"},
- {"certin", OPT_CERTIN, '-', "Input is a cert carrying an RSA public key"},
- {"rev", OPT_REV, '-', "Reverse the order of the input buffer"},
- {"passin", OPT_PASSIN, 's', "Input file pass phrase source"},
+ { "in", OPT_IN, '<', "Input file" },
+ { "inkey", OPT_INKEY, 's', "Input key, by default an RSA private key" },
+ { "keyform", OPT_KEYFORM, 'f', "Private key format (DER/PEM)" },
+ { "pubin", OPT_PUBIN, '-', "Input key is an RSA public pkey" },
+ { "certin", OPT_CERTIN, '-', "Input is a cert carrying an RSA public key" },
+ { "rev", OPT_REV, '-', "Reverse the order of the input buffer" },
+ { "passin", OPT_PASSIN, 's', "Input file pass phrase source" },
OPT_SECTION("Output"),
- {"out", OPT_OUT, '>', "Output file"},
- {"raw", OPT_RSA_RAW, '-', "Use no padding"},
- {"pkcs", OPT_PKCS, '-', "Use PKCS#1 v1.5 padding (default)"},
- {"x931", OPT_X931, '-', "Use ANSI X9.31 padding"},
- {"oaep", OPT_OAEP, '-', "Use PKCS#1 OAEP"},
- {"asn1parse", OPT_ASN1PARSE, '-',
- "Run output through asn1parse; useful with -verify"},
- {"hexdump", OPT_HEXDUMP, '-', "Hex dump output"},
+ { "out", OPT_OUT, '>', "Output file" },
+ { "raw", OPT_RSA_RAW, '-', "Use no padding" },
+ { "pkcs", OPT_PKCS, '-', "Use PKCS#1 v1.5 padding (default)" },
+ { "x931", OPT_X931, '-', "Use ANSI X9.31 padding" },
+ { "oaep", OPT_OAEP, '-', "Use PKCS#1 OAEP" },
+ { "asn1parse", OPT_ASN1PARSE, '-',
+ "Run output through asn1parse; useful with -verify" },
+ { "hexdump", OPT_HEXDUMP, '-', "Hex dump output" },
OPT_R_OPTIONS,
OPT_PROV_OPTIONS,
- {NULL}
+ { NULL }
};
int rsautl_main(int argc, char **argv)
@@ -86,7 +101,7 @@ int rsautl_main(int argc, char **argv)
switch (o) {
case OPT_EOF:
case OPT_ERR:
- opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
case OPT_HELP:
@@ -238,7 +253,8 @@ int rsautl_main(int argc, char **argv)
rv = EVP_PKEY_verify_recover_init(ctx) > 0
&& EVP_PKEY_CTX_set_rsa_padding(ctx, pad) > 0
&& EVP_PKEY_verify_recover(ctx, rsa_out, &rsa_outlen,
- rsa_in, rsa_inlen) > 0;
+ rsa_in, rsa_inlen)
+ > 0;
break;
case RSA_SIGN:
rv = EVP_PKEY_sign_init(ctx) > 0
@@ -272,7 +288,7 @@ int rsautl_main(int argc, char **argv)
} else {
BIO_write(out, rsa_out, (int)rsa_outlen);
}
- end:
+end:
EVP_PKEY_CTX_free(ctx);
EVP_PKEY_free(pkey);
BIO_free(in);
diff --git a/apps/s_client.c b/apps/s_client.c
index 44d8421673..55e8b02256 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -27,7 +27,7 @@
* needed to have fileno() declared correctly... So let's define u_int
*/
#if defined(OPENSSL_SYS_VMS_DECC) && !defined(__U_INT)
-# define __U_INT
+#define __U_INT
typedef unsigned int u_int;
#endif
@@ -43,31 +43,31 @@ typedef unsigned int u_int;
#include <openssl/trace.h>
#include <openssl/async.h>
#ifndef OPENSSL_NO_CT
-# include <openssl/ct.h>
+#include <openssl/ct.h>
#endif
#include "s_apps.h"
#include "timeouts.h"
#include "internal/sockets.h"
#if defined(__has_feature)
-# if __has_feature(memory_sanitizer)
-# include <sanitizer/msan_interface.h>
-# endif
+#if __has_feature(memory_sanitizer)
+#include <sanitizer/msan_interface.h>
+#endif
#endif
#undef BUFSIZZ
-#define BUFSIZZ 1024*16
+#define BUFSIZZ 1024 * 16
#define S_CLIENT_IRC_READ_TIMEOUT 8
-#define USER_DATA_MODE_NONE 0
-#define USER_DATA_MODE_BASIC 1
+#define USER_DATA_MODE_NONE 0
+#define USER_DATA_MODE_BASIC 1
#define USER_DATA_MODE_ADVANCED 2
#define USER_DATA_PROCESS_BAD_ARGUMENT 0
-#define USER_DATA_PROCESS_SHUT 1
-#define USER_DATA_PROCESS_RESTART 2
-#define USER_DATA_PROCESS_NO_DATA 3
-#define USER_DATA_PROCESS_CONTINUE 4
+#define USER_DATA_PROCESS_SHUT 1
+#define USER_DATA_PROCESS_RESTART 2
+#define USER_DATA_PROCESS_NO_DATA 3
+#define USER_DATA_PROCESS_CONTINUE 4
struct user_data_st {
/* SSL connection we are processing commands for */
@@ -93,10 +93,10 @@ struct user_data_st {
};
static void user_data_init(struct user_data_st *user_data, SSL *con, char *buf,
- size_t bufmax, int mode);
+ size_t bufmax, int mode);
static int user_data_add(struct user_data_st *user_data, size_t i);
static int user_data_process(struct user_data_st *user_data, size_t *len,
- size_t *off);
+ size_t *off);
static int user_data_has_data(struct user_data_st *user_data);
static char *prog;
@@ -110,10 +110,10 @@ static char *sess_out = NULL;
static SSL_SESSION *psksess = NULL;
static void print_stuff(BIO *berr, SSL *con, int full);
-# ifndef OPENSSL_NO_OCSP
+#ifndef OPENSSL_NO_OCSP
static int ocsp_resp_cb(SSL *s, void *arg);
static void print_ocsp_response(BIO *bp, OCSP_RESPONSE *rsp);
-# endif
+#endif
static int ldap_ExtendedResponse_parse(const char *buf, long rem);
static int is_dNS_name(const char *host);
@@ -140,9 +140,9 @@ static char *psk_identity = "Client_identity";
#ifndef OPENSSL_NO_PSK
static unsigned int psk_client_cb(SSL *ssl, const char *hint, char *identity,
- unsigned int max_identity_len,
- unsigned char *psk,
- unsigned int max_psk_len)
+ unsigned int max_identity_len,
+ unsigned char *psk,
+ unsigned int max_psk_len)
{
int ret;
long key_len;
@@ -154,7 +154,7 @@ static unsigned int psk_client_cb(SSL *ssl, const char *hint, char *identity,
/* no ServerKeyExchange message */
if (c_debug)
BIO_printf(bio_c_out,
- "NULL received PSK identity hint, continuing anyway\n");
+ "NULL received PSK identity hint, continuing anyway\n");
} else if (c_debug) {
BIO_printf(bio_c_out, "Received PSK identity hint '%s'\n", hint);
}
@@ -167,19 +167,19 @@ static unsigned int psk_client_cb(SSL *ssl, const char *hint, char *identity,
goto out_err;
if (c_debug)
BIO_printf(bio_c_out, "created identity '%s' len=%d\n", identity,
- ret);
+ ret);
/* convert the PSK key to binary */
key = OPENSSL_hexstr2buf(psk_key, &key_len);
if (key == NULL) {
BIO_printf(bio_err, "Could not convert PSK key '%s' to buffer\n",
- psk_key);
+ psk_key);
return 0;
}
if (max_psk_len > INT_MAX || key_len > (long)max_psk_len) {
BIO_printf(bio_err,
- "psk buffer of callback is too small (%d) for key (%ld)\n",
- max_psk_len, key_len);
+ "psk buffer of callback is too small (%d) for key (%ld)\n",
+ max_psk_len, key_len);
OPENSSL_free(key);
return 0;
}
@@ -191,7 +191,7 @@ static unsigned int psk_client_cb(SSL *ssl, const char *hint, char *identity,
BIO_printf(bio_c_out, "created PSK len=%ld\n", key_len);
return key_len;
- out_err:
+out_err:
if (c_debug)
BIO_printf(bio_err, "Error in PSK client callback\n");
return 0;
@@ -202,8 +202,8 @@ const unsigned char tls13_aes128gcmsha256_id[] = { 0x13, 0x01 };
const unsigned char tls13_aes256gcmsha384_id[] = { 0x13, 0x02 };
static int psk_use_session_cb(SSL *s, const EVP_MD *md,
- const unsigned char **id, size_t *idlen,
- SSL_SESSION **sess)
+ const unsigned char **id, size_t *idlen,
+ SSL_SESSION **sess)
{
SSL_SESSION *usesess = NULL;
const SSL_CIPHER *cipher = NULL;
@@ -218,7 +218,7 @@ static int psk_use_session_cb(SSL *s, const EVP_MD *md,
if (key == NULL) {
BIO_printf(bio_err, "Could not convert PSK key '%s' to buffer\n",
- psk_key);
+ psk_key);
return 0;
}
@@ -232,9 +232,9 @@ static int psk_use_session_cb(SSL *s, const EVP_MD *md,
usesess = SSL_SESSION_new();
if (usesess == NULL
- || !SSL_SESSION_set1_master_key(usesess, key, key_len)
- || !SSL_SESSION_set_cipher(usesess, cipher)
- || !SSL_SESSION_set_protocol_version(usesess, TLS1_3_VERSION)) {
+ || !SSL_SESSION_set1_master_key(usesess, key, key_len)
+ || !SSL_SESSION_set_cipher(usesess, cipher)
+ || !SSL_SESSION_set_protocol_version(usesess, TLS1_3_VERSION)) {
OPENSSL_free(key);
goto err;
}
@@ -259,7 +259,7 @@ static int psk_use_session_cb(SSL *s, const EVP_MD *md,
return 1;
- err:
+err:
SSL_SESSION_free(usesess);
return 0;
}
@@ -272,7 +272,7 @@ typedef struct tlsextctx_st {
static int ssl_servername_cb(SSL *s, int *ad, void *arg)
{
- tlsextctx *p = (tlsextctx *) arg;
+ tlsextctx *p = (tlsextctx *)arg;
const char *hn = SSL_get_servername(s, TLSEXT_NAMETYPE_host_name);
if (SSL_get_servername_type(s) != -1)
p->ack = !SSL_session_reused(s) && hn != NULL;
@@ -293,8 +293,8 @@ typedef struct tlsextnextprotoctx_st {
static tlsextnextprotoctx next_proto;
static int next_proto_cb(SSL *s, unsigned char **out, unsigned char *outlen,
- const unsigned char *in, unsigned int inlen,
- void *arg)
+ const unsigned char *in, unsigned int inlen,
+ void *arg)
{
tlsextnextprotoctx *ctx = arg;
@@ -311,16 +311,15 @@ static int next_proto_cb(SSL *s, unsigned char **out, unsigned char *outlen,
BIO_write(bio_c_out, "\n", 1);
}
- ctx->status =
- SSL_select_next_proto(out, outlen, in, inlen,
- ctx->data, (unsigned int)ctx->len);
+ ctx->status = SSL_select_next_proto(out, outlen, in, inlen,
+ ctx->data, (unsigned int)ctx->len);
return SSL_TLSEXT_ERR_OK;
}
-#endif /* ndef OPENSSL_NO_NEXTPROTONEG */
+#endif /* ndef OPENSSL_NO_NEXTPROTONEG */
static int serverinfo_cli_parse_cb(SSL *s, unsigned int ext_type,
- const unsigned char *in, size_t inlen,
- int *al, void *arg)
+ const unsigned char *in, size_t inlen,
+ int *al, void *arg)
{
char pem_name[100];
unsigned char ext_buf[4 + 65536];
@@ -334,7 +333,7 @@ static int serverinfo_cli_parse_cb(SSL *s, unsigned int ext_type,
memcpy(ext_buf + 4, in, inlen);
BIO_snprintf(pem_name, sizeof(pem_name), "SERVERINFO FOR EXTENSION %d",
- ext_type);
+ ext_type);
PEM_write_bio(bio_c_out, pem_name, "", ext_buf, (long)(4 + inlen));
return 1;
}
@@ -398,9 +397,7 @@ static ossl_ssize_t checked_uint8(const char **inptr, void *out)
v = strtol(in, &endp, 10);
e = restore_errno();
- if (((v == LONG_MIN || v == LONG_MAX) && e == ERANGE) ||
- endp == in || !isspace(_UC(*endp)) ||
- v != (*result = (uint8_t) v)) {
+ if (((v == LONG_MIN || v == LONG_MAX) && e == ERANGE) || endp == in || !isspace(_UC(*endp)) || v != (*result = (uint8_t)v)) {
return -1;
}
for (in = endp; isspace(_UC(*in)); ++in)
@@ -428,7 +425,9 @@ static int tlsa_import_rr(SSL *con, const char *rrdata)
{ &selector, "selector", checked_uint8 },
{ &mtype, "mtype", checked_uint8 },
{ &data, "data", hexdecode },
- { NULL, }
+ {
+ NULL,
+ }
};
struct tlsa_field *f;
int ret;
@@ -439,7 +438,7 @@ static int tlsa_import_rr(SSL *con, const char *rrdata)
/* Returns number of bytes produced, advances cp to next field */
if ((len = f->parser(&cp, f->var)) <= 0) {
BIO_printf(bio_err, "%s: warning: bad TLSA %s field in: %s\n",
- prog, f->name, rrdata);
+ prog, f->name, rrdata);
return 0;
}
}
@@ -450,13 +449,13 @@ static int tlsa_import_rr(SSL *con, const char *rrdata)
if (ret == 0) {
ERR_print_errors(bio_err);
BIO_printf(bio_err, "%s: warning: unusable TLSA rrdata: %s\n",
- prog, rrdata);
+ prog, rrdata);
return 0;
}
if (ret < 0) {
ERR_print_errors(bio_err);
BIO_printf(bio_err, "%s: warning: error loading TLSA rrdata: %s\n",
- prog, rrdata);
+ prog, rrdata);
return 0;
}
return ret;
@@ -478,289 +477,374 @@ static int tlsa_import_rrset(SSL *con, STACK_OF(OPENSSL_STRING) *rrset)
typedef enum OPTION_choice {
OPT_COMMON,
- OPT_4, OPT_6, OPT_HOST, OPT_PORT, OPT_CONNECT, OPT_BIND, OPT_UNIX,
- OPT_XMPPHOST, OPT_VERIFY, OPT_NAMEOPT,
- OPT_CERT, OPT_CRL, OPT_CRL_DOWNLOAD, OPT_SESS_OUT, OPT_SESS_IN,
- OPT_CERTFORM, OPT_CRLFORM, OPT_VERIFY_RET_ERROR, OPT_VERIFY_QUIET,
- OPT_BRIEF, OPT_PREXIT, OPT_NO_INTERACTIVE, OPT_CRLF, OPT_QUIET, OPT_NBIO,
- OPT_IGN_EOF, OPT_NO_IGN_EOF, OPT_DEBUG, OPT_TLSEXTDEBUG, OPT_WDEBUG,
-# ifndef OPENSSL_NO_OCSP
- OPT_STATUS, OPT_STATUS_OCSP_CHECK_LEAF, OPT_STATUS_OCSP_CHECK_ALL,
-# endif
- OPT_MSG, OPT_MSGFILE, OPT_TRACE, OPT_SECURITY_DEBUG,
- OPT_SECURITY_DEBUG_VERBOSE, OPT_SHOWCERTS, OPT_NBIO_TEST, OPT_STATE,
- OPT_PSK_IDENTITY, OPT_PSK, OPT_PSK_SESS,
+ OPT_4,
+ OPT_6,
+ OPT_HOST,
+ OPT_PORT,
+ OPT_CONNECT,
+ OPT_BIND,
+ OPT_UNIX,
+ OPT_XMPPHOST,
+ OPT_VERIFY,
+ OPT_NAMEOPT,
+ OPT_CERT,
+ OPT_CRL,
+ OPT_CRL_DOWNLOAD,
+ OPT_SESS_OUT,
+ OPT_SESS_IN,
+ OPT_CERTFORM,
+ OPT_CRLFORM,
+ OPT_VERIFY_RET_ERROR,
+ OPT_VERIFY_QUIET,
+ OPT_BRIEF,
+ OPT_PREXIT,
+ OPT_NO_INTERACTIVE,
+ OPT_CRLF,
+ OPT_QUIET,
+ OPT_NBIO,
+ OPT_IGN_EOF,
+ OPT_NO_IGN_EOF,
+ OPT_DEBUG,
+ OPT_TLSEXTDEBUG,
+ OPT_WDEBUG,
+#ifndef OPENSSL_NO_OCSP
+ OPT_STATUS,
+ OPT_STATUS_OCSP_CHECK_LEAF,
+ OPT_STATUS_OCSP_CHECK_ALL,
+#endif
+ OPT_MSG,
+ OPT_MSGFILE,
+ OPT_TRACE,
+ OPT_SECURITY_DEBUG,
+ OPT_SECURITY_DEBUG_VERBOSE,
+ OPT_SHOWCERTS,
+ OPT_NBIO_TEST,
+ OPT_STATE,
+ OPT_PSK_IDENTITY,
+ OPT_PSK,
+ OPT_PSK_SESS,
#ifndef OPENSSL_NO_SRP
- OPT_SRPUSER, OPT_SRPPASS, OPT_SRP_STRENGTH, OPT_SRP_LATEUSER,
+ OPT_SRPUSER,
+ OPT_SRPPASS,
+ OPT_SRP_STRENGTH,
+ OPT_SRP_LATEUSER,
OPT_SRP_MOREGROUPS,
#endif
- OPT_SSL3, OPT_SSL_CONFIG,
- OPT_TLS1_3, OPT_TLS1_2, OPT_TLS1_1, OPT_TLS1, OPT_DTLS, OPT_DTLS1,
- OPT_DTLS1_2, OPT_QUIC, OPT_SCTP, OPT_TIMEOUT, OPT_MTU, OPT_KEYFORM,
- OPT_PASS, OPT_CERT_CHAIN, OPT_KEY, OPT_RECONNECT, OPT_BUILD_CHAIN,
- OPT_NEXTPROTONEG, OPT_ALPN,
- OPT_CAPATH, OPT_NOCAPATH, OPT_CHAINCAPATH, OPT_VERIFYCAPATH,
- OPT_CAFILE, OPT_NOCAFILE, OPT_CHAINCAFILE, OPT_VERIFYCAFILE,
- OPT_CASTORE, OPT_NOCASTORE, OPT_CHAINCASTORE, OPT_VERIFYCASTORE,
- OPT_SERVERINFO, OPT_STARTTLS, OPT_SERVERNAME, OPT_NOSERVERNAME, OPT_ASYNC,
- OPT_USE_SRTP, OPT_KEYMATEXPORT, OPT_KEYMATEXPORTLEN, OPT_PROTOHOST,
- OPT_MAXFRAGLEN, OPT_MAX_SEND_FRAG, OPT_SPLIT_SEND_FRAG, OPT_MAX_PIPELINES,
- OPT_READ_BUF, OPT_KEYLOG_FILE, OPT_EARLY_DATA, OPT_REQCAFILE,
+ OPT_SSL3,
+ OPT_SSL_CONFIG,
+ OPT_TLS1_3,
+ OPT_TLS1_2,
+ OPT_TLS1_1,
+ OPT_TLS1,
+ OPT_DTLS,
+ OPT_DTLS1,
+ OPT_DTLS1_2,
+ OPT_QUIC,
+ OPT_SCTP,
+ OPT_TIMEOUT,
+ OPT_MTU,
+ OPT_KEYFORM,
+ OPT_PASS,
+ OPT_CERT_CHAIN,
+ OPT_KEY,
+ OPT_RECONNECT,
+ OPT_BUILD_CHAIN,
+ OPT_NEXTPROTONEG,
+ OPT_ALPN,
+ OPT_CAPATH,
+ OPT_NOCAPATH,
+ OPT_CHAINCAPATH,
+ OPT_VERIFYCAPATH,
+ OPT_CAFILE,
+ OPT_NOCAFILE,
+ OPT_CHAINCAFILE,
+ OPT_VERIFYCAFILE,
+ OPT_CASTORE,
+ OPT_NOCASTORE,
+ OPT_CHAINCASTORE,
+ OPT_VERIFYCASTORE,
+ OPT_SERVERINFO,
+ OPT_STARTTLS,
+ OPT_SERVERNAME,
+ OPT_NOSERVERNAME,
+ OPT_ASYNC,
+ OPT_USE_SRTP,
+ OPT_KEYMATEXPORT,
+ OPT_KEYMATEXPORTLEN,
+ OPT_PROTOHOST,
+ OPT_MAXFRAGLEN,
+ OPT_MAX_SEND_FRAG,
+ OPT_SPLIT_SEND_FRAG,
+ OPT_MAX_PIPELINES,
+ OPT_READ_BUF,
+ OPT_KEYLOG_FILE,
+ OPT_EARLY_DATA,
+ OPT_REQCAFILE,
OPT_TFO,
OPT_V_ENUM,
OPT_X_ENUM,
- OPT_S_ENUM, OPT_IGNORE_UNEXPECTED_EOF,
- OPT_FALLBACKSCSV, OPT_NOCMDS, OPT_ADV, OPT_PROXY, OPT_PROXY_USER,
- OPT_PROXY_PASS, OPT_DANE_TLSA_DOMAIN,
+ OPT_S_ENUM,
+ OPT_IGNORE_UNEXPECTED_EOF,
+ OPT_FALLBACKSCSV,
+ OPT_NOCMDS,
+ OPT_ADV,
+ OPT_PROXY,
+ OPT_PROXY_USER,
+ OPT_PROXY_PASS,
+ OPT_DANE_TLSA_DOMAIN,
#ifndef OPENSSL_NO_CT
- OPT_CT, OPT_NOCT, OPT_CTLOG_FILE,
+ OPT_CT,
+ OPT_NOCT,
+ OPT_CTLOG_FILE,
#endif
- OPT_DANE_TLSA_RRDATA, OPT_DANE_EE_NO_NAME,
+ OPT_DANE_TLSA_RRDATA,
+ OPT_DANE_EE_NO_NAME,
OPT_ENABLE_PHA,
OPT_ENABLE_SERVER_RPK,
OPT_ENABLE_CLIENT_RPK,
OPT_SCTP_LABEL_BUG,
OPT_KTLS,
- OPT_R_ENUM, OPT_PROV_ENUM
+ OPT_R_ENUM,
+ OPT_PROV_ENUM
} OPTION_CHOICE;
const OPTIONS s_client_options[] = {
- {OPT_HELP_STR, 1, '-', "Usage: %s [options] [host:port]\n"},
+ { OPT_HELP_STR, 1, '-', "Usage: %s [options] [host:port]\n" },
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
- {"ssl_config", OPT_SSL_CONFIG, 's', "Use specified section for SSL_CTX configuration"},
+ { "help", OPT_HELP, '-', "Display this summary" },
+ { "ssl_config", OPT_SSL_CONFIG, 's', "Use specified section for SSL_CTX configuration" },
#ifndef OPENSSL_NO_CT
- {"ct", OPT_CT, '-', "Request and parse SCTs (also enables OCSP stapling)"},
- {"noct", OPT_NOCT, '-', "Do not request or parse SCTs (default)"},
- {"ctlogfile", OPT_CTLOG_FILE, '<', "CT log list CONF file"},
+ { "ct", OPT_CT, '-', "Request and parse SCTs (also enables OCSP stapling)" },
+ { "noct", OPT_NOCT, '-', "Do not request or parse SCTs (default)" },
+ { "ctlogfile", OPT_CTLOG_FILE, '<', "CT log list CONF file" },
#endif
OPT_SECTION("Network"),
- {"host", OPT_HOST, 's', "Use -connect instead"},
- {"port", OPT_PORT, 'p', "Use -connect instead"},
- {"connect", OPT_CONNECT, 's',
- "TCP/IP where to connect; default: " PORT ")"},
- {"bind", OPT_BIND, 's', "bind local address for connection"},
- {"proxy", OPT_PROXY, 's',
- "Connect to via specified proxy to the real server"},
- {"proxy_user", OPT_PROXY_USER, 's', "UserID for proxy authentication"},
- {"proxy_pass", OPT_PROXY_PASS, 's', "Proxy authentication password source"},
+ { "host", OPT_HOST, 's', "Use -connect instead" },
+ { "port", OPT_PORT, 'p', "Use -connect instead" },
+ { "connect", OPT_CONNECT, 's',
+ "TCP/IP where to connect; default: " PORT ")" },
+ { "bind", OPT_BIND, 's', "bind local address for connection" },
+ { "proxy", OPT_PROXY, 's',
+ "Connect to via specified proxy to the real server" },
+ { "proxy_user", OPT_PROXY_USER, 's', "UserID for proxy authentication" },
+ { "proxy_pass", OPT_PROXY_PASS, 's', "Proxy authentication password source" },
#ifdef AF_UNIX
- {"unix", OPT_UNIX, 's', "Connect over the specified Unix-domain socket"},
+ { "unix", OPT_UNIX, 's', "Connect over the specified Unix-domain socket" },
#endif
- {"4", OPT_4, '-', "Use IPv4 only"},
+ { "4", OPT_4, '-', "Use IPv4 only" },
#ifdef AF_INET6
- {"6", OPT_6, '-', "Use IPv6 only"},
-#endif
- {"maxfraglen", OPT_MAXFRAGLEN, 'p',
- "Enable Maximum Fragment Length Negotiation (len values: 512, 1024, 2048 and 4096)"},
- {"max_send_frag", OPT_MAX_SEND_FRAG, 'p', "Maximum Size of send frames "},
- {"split_send_frag", OPT_SPLIT_SEND_FRAG, 'p',
- "Size used to split data for encrypt pipelines"},
- {"max_pipelines", OPT_MAX_PIPELINES, 'p',
- "Maximum number of encrypt/decrypt pipelines to be used"},
- {"read_buf", OPT_READ_BUF, 'p',
- "Default read buffer size to be used for connections"},
- {"fallback_scsv", OPT_FALLBACKSCSV, '-', "Send the fallback SCSV"},
+ { "6", OPT_6, '-', "Use IPv6 only" },
+#endif
+ { "maxfraglen", OPT_MAXFRAGLEN, 'p',
+ "Enable Maximum Fragment Length Negotiation (len values: 512, 1024, 2048 and 4096)" },
+ { "max_send_frag", OPT_MAX_SEND_FRAG, 'p', "Maximum Size of send frames " },
+ { "split_send_frag", OPT_SPLIT_SEND_FRAG, 'p',
+ "Size used to split data for encrypt pipelines" },
+ { "max_pipelines", OPT_MAX_PIPELINES, 'p',
+ "Maximum number of encrypt/decrypt pipelines to be used" },
+ { "read_buf", OPT_READ_BUF, 'p',
+ "Default read buffer size to be used for connections" },
+ { "fallback_scsv", OPT_FALLBACKSCSV, '-', "Send the fallback SCSV" },
OPT_SECTION("Identity"),
- {"cert", OPT_CERT, '<', "Client certificate file to use"},
- {"certform", OPT_CERTFORM, 'F',
- "Client certificate file format (PEM/DER/P12); has no effect"},
- {"cert_chain", OPT_CERT_CHAIN, '<',
- "Client certificate chain file (in PEM format)"},
- {"build_chain", OPT_BUILD_CHAIN, '-', "Build client certificate chain"},
- {"key", OPT_KEY, 's', "Private key file to use; default: -cert file"},
- {"keyform", OPT_KEYFORM, 'f', "Key format (DER/PEM)"},
- {"pass", OPT_PASS, 's', "Private key and cert file pass phrase source"},
- {"verify", OPT_VERIFY, 'p', "Turn on peer certificate verification"},
- {"nameopt", OPT_NAMEOPT, 's', "Certificate subject/issuer name printing options"},
- {"CApath", OPT_CAPATH, '/', "PEM format directory of CA's"},
- {"CAfile", OPT_CAFILE, '<', "PEM format file of CA's"},
- {"CAstore", OPT_CASTORE, ':', "URI to store of CA's"},
- {"no-CAfile", OPT_NOCAFILE, '-',
- "Do not load the default certificates file"},
- {"no-CApath", OPT_NOCAPATH, '-',
- "Do not load certificates from the default certificates directory"},
- {"no-CAstore", OPT_NOCASTORE, '-',
- "Do not load certificates from the default certificates store"},
- {"requestCAfile", OPT_REQCAFILE, '<',
- "PEM format file of CA names to send to the server"},
+ { "cert", OPT_CERT, '<', "Client certificate file to use" },
+ { "certform", OPT_CERTFORM, 'F',
+ "Client certificate file format (PEM/DER/P12); has no effect" },
+ { "cert_chain", OPT_CERT_CHAIN, '<',
+ "Client certificate chain file (in PEM format)" },
+ { "build_chain", OPT_BUILD_CHAIN, '-', "Build client certificate chain" },
+ { "key", OPT_KEY, 's', "Private key file to use; default: -cert file" },
+ { "keyform", OPT_KEYFORM, 'f', "Key format (DER/PEM)" },
+ { "pass", OPT_PASS, 's', "Private key and cert file pass phrase source" },
+ { "verify", OPT_VERIFY, 'p', "Turn on peer certificate verification" },
+ { "nameopt", OPT_NAMEOPT, 's', "Certificate subject/issuer name printing options" },
+ { "CApath", OPT_CAPATH, '/', "PEM format directory of CA's" },
+ { "CAfile", OPT_CAFILE, '<', "PEM format file of CA's" },
+ { "CAstore", OPT_CASTORE, ':', "URI to store of CA's" },
+ { "no-CAfile", OPT_NOCAFILE, '-',
+ "Do not load the default certificates file" },
+ { "no-CApath", OPT_NOCAPATH, '-',
+ "Do not load certificates from the default certificates directory" },
+ { "no-CAstore", OPT_NOCASTORE, '-',
+ "Do not load certificates from the default certificates store" },
+ { "requestCAfile", OPT_REQCAFILE, '<',
+ "PEM format file of CA names to send to the server" },
#if defined(TCP_FASTOPEN) && !defined(OPENSSL_NO_TFO)
- {"tfo", OPT_TFO, '-', "Connect using TCP Fast Open"},
-#endif
- {"dane_tlsa_domain", OPT_DANE_TLSA_DOMAIN, 's', "DANE TLSA base domain"},
- {"dane_tlsa_rrdata", OPT_DANE_TLSA_RRDATA, 's',
- "DANE TLSA rrdata presentation form"},
- {"dane_ee_no_namechecks", OPT_DANE_EE_NO_NAME, '-',
- "Disable name checks when matching DANE-EE(3) TLSA records"},
- {"psk_identity", OPT_PSK_IDENTITY, 's', "PSK identity"},
- {"psk", OPT_PSK, 's', "PSK in hex (without 0x)"},
- {"psk_session", OPT_PSK_SESS, '<', "File to read PSK SSL session from"},
- {"name", OPT_PROTOHOST, 's',
- "Hostname to use for \"-starttls lmtp\", \"-starttls smtp\" or \"-starttls xmpp[-server]\""},
+ { "tfo", OPT_TFO, '-', "Connect using TCP Fast Open" },
+#endif
+ { "dane_tlsa_domain", OPT_DANE_TLSA_DOMAIN, 's', "DANE TLSA base domain" },
+ { "dane_tlsa_rrdata", OPT_DANE_TLSA_RRDATA, 's',
+ "DANE TLSA rrdata presentation form" },
+ { "dane_ee_no_namechecks", OPT_DANE_EE_NO_NAME, '-',
+ "Disable name checks when matching DANE-EE(3) TLSA records" },
+ { "psk_identity", OPT_PSK_IDENTITY, 's', "PSK identity" },
+ { "psk", OPT_PSK, 's', "PSK in hex (without 0x)" },
+ { "psk_session", OPT_PSK_SESS, '<', "File to read PSK SSL session from" },
+ { "name", OPT_PROTOHOST, 's',
+ "Hostname to use for \"-starttls lmtp\", \"-starttls smtp\" or \"-starttls xmpp[-server]\"" },
OPT_SECTION("Session"),
- {"reconnect", OPT_RECONNECT, '-',
- "Drop and re-make the connection with the same Session-ID"},
- {"sess_out", OPT_SESS_OUT, '>', "File to write SSL session to"},
- {"sess_in", OPT_SESS_IN, '<', "File to read SSL session from"},
+ { "reconnect", OPT_RECONNECT, '-',
+ "Drop and re-make the connection with the same Session-ID" },
+ { "sess_out", OPT_SESS_OUT, '>', "File to write SSL session to" },
+ { "sess_in", OPT_SESS_IN, '<', "File to read SSL session from" },
OPT_SECTION("Input/Output"),
- {"crlf", OPT_CRLF, '-', "Convert LF from terminal into CRLF"},
- {"quiet", OPT_QUIET, '-', "No s_client output"},
- {"ign_eof", OPT_IGN_EOF, '-', "Ignore input eof (default when -quiet)"},
- {"no_ign_eof", OPT_NO_IGN_EOF, '-', "Don't ignore input eof"},
- {"starttls", OPT_STARTTLS, 's',
- "Use the appropriate STARTTLS command before starting TLS"},
- {"xmpphost", OPT_XMPPHOST, 's',
- "Alias of -name option for \"-starttls xmpp[-server]\""},
- {"brief", OPT_BRIEF, '-',
- "Restrict output to brief summary of connection parameters"},
- {"prexit", OPT_PREXIT, '-',
- "Print session information when the program exits"},
- {"no-interactive", OPT_NO_INTERACTIVE, '-',
- "Don't run the client in the interactive mode"},
-
-# ifndef OPENSSL_NO_OCSP
+ { "crlf", OPT_CRLF, '-', "Convert LF from terminal into CRLF" },
+ { "quiet", OPT_QUIET, '-', "No s_client output" },
+ { "ign_eof", OPT_IGN_EOF, '-', "Ignore input eof (default when -quiet)" },
+ { "no_ign_eof", OPT_NO_IGN_EOF, '-', "Don't ignore input eof" },
+ { "starttls", OPT_STARTTLS, 's',
+ "Use the appropriate STARTTLS command before starting TLS" },
+ { "xmpphost", OPT_XMPPHOST, 's',
+ "Alias of -name option for \"-starttls xmpp[-server]\"" },
+ { "brief", OPT_BRIEF, '-',
+ "Restrict output to brief summary of connection parameters" },
+ { "prexit", OPT_PREXIT, '-',
+ "Print session information when the program exits" },
+ { "no-interactive", OPT_NO_INTERACTIVE, '-',
+ "Don't run the client in the interactive mode" },
+
+#ifndef OPENSSL_NO_OCSP
OPT_SECTION("OCSP stapling"),
- {"status", OPT_STATUS, '-',
- "Sends a certificate status request to the server (OCSP stapling) " \
- "The server response (if any) will be printed out."},
- {"ocsp_check_leaf", OPT_STATUS_OCSP_CHECK_LEAF, '-',
- "Require checking leaf certificate status, attempting to use OCSP stapling first"},
- {"ocsp_check_all", OPT_STATUS_OCSP_CHECK_ALL, '-',
- "Require checking status of full chain, attempting to use OCSP stapling first"},
-# endif
+ { "status", OPT_STATUS, '-',
+ "Sends a certificate status request to the server (OCSP stapling) "
+ "The server response (if any) will be printed out." },
+ { "ocsp_check_leaf", OPT_STATUS_OCSP_CHECK_LEAF, '-',
+ "Require checking leaf certificate status, attempting to use OCSP stapling first" },
+ { "ocsp_check_all", OPT_STATUS_OCSP_CHECK_ALL, '-',
+ "Require checking status of full chain, attempting to use OCSP stapling first" },
+#endif
OPT_SECTION("Debug"),
- {"showcerts", OPT_SHOWCERTS, '-',
- "Show all certificates sent by the server"},
- {"debug", OPT_DEBUG, '-', "Extra output"},
- {"msg", OPT_MSG, '-', "Show protocol messages"},
- {"msgfile", OPT_MSGFILE, '>',
- "File to send output of -msg or -trace, instead of stdout"},
- {"nbio_test", OPT_NBIO_TEST, '-', "More ssl protocol testing"},
- {"state", OPT_STATE, '-', "Print the ssl states"},
- {"keymatexport", OPT_KEYMATEXPORT, 's',
- "Export keying material using label"},
- {"keymatexportlen", OPT_KEYMATEXPORTLEN, 'p',
- "Export len bytes of keying material; default 20"},
- {"security_debug", OPT_SECURITY_DEBUG, '-',
- "Enable security debug messages"},
- {"security_debug_verbose", OPT_SECURITY_DEBUG_VERBOSE, '-',
- "Output more security debug output"},
+ { "showcerts", OPT_SHOWCERTS, '-',
+ "Show all certificates sent by the server" },
+ { "debug", OPT_DEBUG, '-', "Extra output" },
+ { "msg", OPT_MSG, '-', "Show protocol messages" },
+ { "msgfile", OPT_MSGFILE, '>',
+ "File to send output of -msg or -trace, instead of stdout" },
+ { "nbio_test", OPT_NBIO_TEST, '-', "More ssl protocol testing" },
+ { "state", OPT_STATE, '-', "Print the ssl states" },
+ { "keymatexport", OPT_KEYMATEXPORT, 's',
+ "Export keying material using label" },
+ { "keymatexportlen", OPT_KEYMATEXPORTLEN, 'p',
+ "Export len bytes of keying material; default 20" },
+ { "security_debug", OPT_SECURITY_DEBUG, '-',
+ "Enable security debug messages" },
+ { "security_debug_verbose", OPT_SECURITY_DEBUG_VERBOSE, '-',
+ "Output more security debug output" },
#ifndef OPENSSL_NO_SSL_TRACE
- {"trace", OPT_TRACE, '-', "Show trace output of protocol messages"},
+ { "trace", OPT_TRACE, '-', "Show trace output of protocol messages" },
#endif
#ifdef WATT32
- {"wdebug", OPT_WDEBUG, '-', "WATT-32 tcp debugging"},
-#endif
- {"keylogfile", OPT_KEYLOG_FILE, '>', "Write TLS secrets to file"},
- {"nocommands", OPT_NOCMDS, '-', "Do not use interactive command letters"},
- {"adv", OPT_ADV, '-', "Advanced command mode"},
- {"servername", OPT_SERVERNAME, 's',
- "Set TLS extension servername (SNI) in ClientHello (default)"},
- {"noservername", OPT_NOSERVERNAME, '-',
- "Do not send the server name (SNI) extension in the ClientHello"},
- {"tlsextdebug", OPT_TLSEXTDEBUG, '-',
- "Hex dump of all TLS extensions received"},
- {"ignore_unexpected_eof", OPT_IGNORE_UNEXPECTED_EOF, '-',
- "Do not treat lack of close_notify from a peer as an error"},
- {"serverinfo", OPT_SERVERINFO, 's',
- "types Send empty ClientHello extensions (comma-separated numbers)"},
- {"alpn", OPT_ALPN, 's',
- "Enable ALPN extension, considering named protocols supported (comma-separated list)"},
- {"async", OPT_ASYNC, '-', "Support asynchronous operation"},
- {"nbio", OPT_NBIO, '-', "Use non-blocking IO"},
+ { "wdebug", OPT_WDEBUG, '-', "WATT-32 tcp debugging" },
+#endif
+ { "keylogfile", OPT_KEYLOG_FILE, '>', "Write TLS secrets to file" },
+ { "nocommands", OPT_NOCMDS, '-', "Do not use interactive command letters" },
+ { "adv", OPT_ADV, '-', "Advanced command mode" },
+ { "servername", OPT_SERVERNAME, 's',
+ "Set TLS extension servername (SNI) in ClientHello (default)" },
+ { "noservername", OPT_NOSERVERNAME, '-',
+ "Do not send the server name (SNI) extension in the ClientHello" },
+ { "tlsextdebug", OPT_TLSEXTDEBUG, '-',
+ "Hex dump of all TLS extensions received" },
+ { "ignore_unexpected_eof", OPT_IGNORE_UNEXPECTED_EOF, '-',
+ "Do not treat lack of close_notify from a peer as an error" },
+ { "serverinfo", OPT_SERVERINFO, 's',
+ "types Send empty ClientHello extensions (comma-separated numbers)" },
+ { "alpn", OPT_ALPN, 's',
+ "Enable ALPN extension, considering named protocols supported (comma-separated list)" },
+ { "async", OPT_ASYNC, '-', "Support asynchronous operation" },
+ { "nbio", OPT_NBIO, '-', "Use non-blocking IO" },
OPT_SECTION("Protocol and version"),
#ifndef OPENSSL_NO_SSL3
- {"ssl3", OPT_SSL3, '-', "Just use SSLv3"},
+ { "ssl3", OPT_SSL3, '-', "Just use SSLv3" },
#endif
#ifndef OPENSSL_NO_TLS1
- {"tls1", OPT_TLS1, '-', "Just use TLSv1"},
+ { "tls1", OPT_TLS1, '-', "Just use TLSv1" },
#endif
#ifndef OPENSSL_NO_TLS1_1
- {"tls1_1", OPT_TLS1_1, '-', "Just use TLSv1.1"},
+ { "tls1_1", OPT_TLS1_1, '-', "Just use TLSv1.1" },
#endif
#ifndef OPENSSL_NO_TLS1_2
- {"tls1_2", OPT_TLS1_2, '-', "Just use TLSv1.2"},
+ { "tls1_2", OPT_TLS1_2, '-', "Just use TLSv1.2" },
#endif
#ifndef OPENSSL_NO_TLS1_3
- {"tls1_3", OPT_TLS1_3, '-', "Just use TLSv1.3"},
+ { "tls1_3", OPT_TLS1_3, '-', "Just use TLSv1.3" },
#endif
#ifndef OPENSSL_NO_DTLS
- {"dtls", OPT_DTLS, '-', "Use any version of DTLS"},
- {"quic", OPT_QUIC, '-', "Use QUIC"},
- {"timeout", OPT_TIMEOUT, '-',
- "Enable send/receive timeout on DTLS connections"},
- {"mtu", OPT_MTU, 'p', "Set the link layer MTU"},
+ { "dtls", OPT_DTLS, '-', "Use any version of DTLS" },
+ { "quic", OPT_QUIC, '-', "Use QUIC" },
+ { "timeout", OPT_TIMEOUT, '-',
+ "Enable send/receive timeout on DTLS connections" },
+ { "mtu", OPT_MTU, 'p', "Set the link layer MTU" },
#endif
#ifndef OPENSSL_NO_DTLS1
- {"dtls1", OPT_DTLS1, '-', "Just use DTLSv1"},
+ { "dtls1", OPT_DTLS1, '-', "Just use DTLSv1" },
#endif
#ifndef OPENSSL_NO_DTLS1_2
- {"dtls1_2", OPT_DTLS1_2, '-', "Just use DTLSv1.2"},
+ { "dtls1_2", OPT_DTLS1_2, '-', "Just use DTLSv1.2" },
#endif
#ifndef OPENSSL_NO_SCTP
- {"sctp", OPT_SCTP, '-', "Use SCTP"},
- {"sctp_label_bug", OPT_SCTP_LABEL_BUG, '-', "Enable SCTP label length bug"},
+ { "sctp", OPT_SCTP, '-', "Use SCTP" },
+ { "sctp_label_bug", OPT_SCTP_LABEL_BUG, '-', "Enable SCTP label length bug" },
#endif
#ifndef OPENSSL_NO_NEXTPROTONEG
- {"nextprotoneg", OPT_NEXTPROTONEG, 's',
- "Enable NPN extension, considering named protocols supported (comma-separated list)"},
+ { "nextprotoneg", OPT_NEXTPROTONEG, 's',
+ "Enable NPN extension, considering named protocols supported (comma-separated list)" },
#endif
- {"early_data", OPT_EARLY_DATA, '<', "File to send as early data"},
- {"enable_pha", OPT_ENABLE_PHA, '-', "Enable post-handshake-authentication"},
- {"enable_server_rpk", OPT_ENABLE_SERVER_RPK, '-', "Enable raw public keys (RFC7250) from the server"},
- {"enable_client_rpk", OPT_ENABLE_CLIENT_RPK, '-', "Enable raw public keys (RFC7250) from the client"},
+ { "early_data", OPT_EARLY_DATA, '<', "File to send as early data" },
+ { "enable_pha", OPT_ENABLE_PHA, '-', "Enable post-handshake-authentication" },
+ { "enable_server_rpk", OPT_ENABLE_SERVER_RPK, '-', "Enable raw public keys (RFC7250) from the server" },
+ { "enable_client_rpk", OPT_ENABLE_CLIENT_RPK, '-', "Enable raw public keys (RFC7250) from the client" },
#ifndef OPENSSL_NO_SRTP
- {"use_srtp", OPT_USE_SRTP, 's',
- "Offer SRTP key management with a colon-separated profile list"},
+ { "use_srtp", OPT_USE_SRTP, 's',
+ "Offer SRTP key management with a colon-separated profile list" },
#endif
#ifndef OPENSSL_NO_SRP
- {"srpuser", OPT_SRPUSER, 's', "(deprecated) SRP authentication for 'user'"},
- {"srppass", OPT_SRPPASS, 's', "(deprecated) Password for 'user'"},
- {"srp_lateuser", OPT_SRP_LATEUSER, '-',
- "(deprecated) SRP username into second ClientHello message"},
- {"srp_moregroups", OPT_SRP_MOREGROUPS, '-',
- "(deprecated) Tolerate other than the known g N values."},
- {"srp_strength", OPT_SRP_STRENGTH, 'p',
- "(deprecated) Minimal length in bits for N"},
+ { "srpuser", OPT_SRPUSER, 's', "(deprecated) SRP authentication for 'user'" },
+ { "srppass", OPT_SRPPASS, 's', "(deprecated) Password for 'user'" },
+ { "srp_lateuser", OPT_SRP_LATEUSER, '-',
+ "(deprecated) SRP username into second ClientHello message" },
+ { "srp_moregroups", OPT_SRP_MOREGROUPS, '-',
+ "(deprecated) Tolerate other than the known g N values." },
+ { "srp_strength", OPT_SRP_STRENGTH, 'p',
+ "(deprecated) Minimal length in bits for N" },
#endif
#ifndef OPENSSL_NO_KTLS
- {"ktls", OPT_KTLS, '-', "Enable Kernel TLS for sending and receiving"},
+ { "ktls", OPT_KTLS, '-', "Enable Kernel TLS for sending and receiving" },
#endif
OPT_R_OPTIONS,
OPT_S_OPTIONS,
OPT_V_OPTIONS,
- {"CRL", OPT_CRL, '<', "CRL file to use"},
- {"crl_download", OPT_CRL_DOWNLOAD, '-', "Download CRL from distribution points"},
- {"CRLform", OPT_CRLFORM, 'F', "CRL format (PEM or DER); default PEM"},
- {"verify_return_error", OPT_VERIFY_RET_ERROR, '-',
- "Close connection on verification error"},
- {"verify_quiet", OPT_VERIFY_QUIET, '-', "Restrict verify output to errors"},
- {"chainCAfile", OPT_CHAINCAFILE, '<',
- "CA file for certificate chain (PEM format)"},
- {"chainCApath", OPT_CHAINCAPATH, '/',
- "Use dir as certificate store path to build CA certificate chain"},
- {"chainCAstore", OPT_CHAINCASTORE, ':',
- "CA store URI for certificate chain"},
- {"verifyCAfile", OPT_VERIFYCAFILE, '<',
- "CA file for certificate verification (PEM format)"},
- {"verifyCApath", OPT_VERIFYCAPATH, '/',
- "Use dir as certificate store path to verify CA certificate"},
- {"verifyCAstore", OPT_VERIFYCASTORE, ':',
- "CA store URI for certificate verification"},
+ { "CRL", OPT_CRL, '<', "CRL file to use" },
+ { "crl_download", OPT_CRL_DOWNLOAD, '-', "Download CRL from distribution points" },
+ { "CRLform", OPT_CRLFORM, 'F', "CRL format (PEM or DER); default PEM" },
+ { "verify_return_error", OPT_VERIFY_RET_ERROR, '-',
+ "Close connection on verification error" },
+ { "verify_quiet", OPT_VERIFY_QUIET, '-', "Restrict verify output to errors" },
+ { "chainCAfile", OPT_CHAINCAFILE, '<',
+ "CA file for certificate chain (PEM format)" },
+ { "chainCApath", OPT_CHAINCAPATH, '/',
+ "Use dir as certificate store path to build CA certificate chain" },
+ { "chainCAstore", OPT_CHAINCASTORE, ':',
+ "CA store URI for certificate chain" },
+ { "verifyCAfile", OPT_VERIFYCAFILE, '<',
+ "CA file for certificate verification (PEM format)" },
+ { "verifyCApath", OPT_VERIFYCAPATH, '/',
+ "Use dir as certificate store path to verify CA certificate" },
+ { "verifyCAstore", OPT_VERIFYCASTORE, ':',
+ "CA store URI for certificate verification" },
OPT_X_OPTIONS,
OPT_PROV_OPTIONS,
OPT_PARAMETERS(),
- {"host:port", 0, 0, "Where to connect; same as -connect option"},
- {NULL}
+ { "host:port", 0, 0, "Where to connect; same as -connect option" },
+ { NULL }
};
typedef enum PROTOCOL_choice {
@@ -782,31 +866,31 @@ typedef enum PROTOCOL_choice {
} PROTOCOL_CHOICE;
static const OPT_PAIR services[] = {
- {"smtp", PROTO_SMTP},
- {"pop3", PROTO_POP3},
- {"imap", PROTO_IMAP},
- {"ftp", PROTO_FTP},
- {"xmpp", PROTO_XMPP},
- {"xmpp-server", PROTO_XMPP_SERVER},
- {"telnet", PROTO_TELNET},
- {"irc", PROTO_IRC},
- {"mysql", PROTO_MYSQL},
- {"postgres", PROTO_POSTGRES},
- {"lmtp", PROTO_LMTP},
- {"nntp", PROTO_NNTP},
- {"sieve", PROTO_SIEVE},
- {"ldap", PROTO_LDAP},
- {NULL, 0}
+ { "smtp", PROTO_SMTP },
+ { "pop3", PROTO_POP3 },
+ { "imap", PROTO_IMAP },
+ { "ftp", PROTO_FTP },
+ { "xmpp", PROTO_XMPP },
+ { "xmpp-server", PROTO_XMPP_SERVER },
+ { "telnet", PROTO_TELNET },
+ { "irc", PROTO_IRC },
+ { "mysql", PROTO_MYSQL },
+ { "postgres", PROTO_POSTGRES },
+ { "lmtp", PROTO_LMTP },
+ { "nntp", PROTO_NNTP },
+ { "sieve", PROTO_SIEVE },
+ { "ldap", PROTO_LDAP },
+ { NULL, 0 }
};
#define IS_INET_FLAG(o) \
- (o == OPT_4 || o == OPT_6 || o == OPT_HOST || o == OPT_PORT || o == OPT_CONNECT)
+ (o == OPT_4 || o == OPT_6 || o == OPT_HOST || o == OPT_PORT || o == OPT_CONNECT)
#define IS_UNIX_FLAG(o) (o == OPT_UNIX)
-#define IS_PROT_FLAG(o) \
- (o == OPT_SSL3 || o == OPT_TLS1 || o == OPT_TLS1_1 || o == OPT_TLS1_2 \
- || o == OPT_TLS1_3 || o == OPT_DTLS || o == OPT_DTLS1 || o == OPT_DTLS1_2 \
- || o == OPT_QUIC)
+#define IS_PROT_FLAG(o) \
+ (o == OPT_SSL3 || o == OPT_TLS1 || o == OPT_TLS1_1 || o == OPT_TLS1_2 \
+ || o == OPT_TLS1_3 || o == OPT_DTLS || o == OPT_DTLS1 || o == OPT_DTLS1_2 \
+ || o == OPT_QUIC)
/* Free |*dest| and optionally set it to a copy of |source|. */
static void freeandcopy(char **dest, const char *source)
@@ -837,7 +921,7 @@ static int new_session_cb(SSL *s, SSL_SESSION *sess)
*/
if (SSL_version(s) == TLS1_3_VERSION) {
BIO_printf(bio_c_out,
- "---\nPost-Handshake New Session Ticket arrived:\n");
+ "---\nPost-Handshake New Session Ticket arrived:\n");
SSL_SESSION_print(bio_c_out, sess);
BIO_printf(bio_c_out, "---\n");
}
@@ -938,7 +1022,10 @@ int s_client_main(int argc, char **argv)
int async = 0;
unsigned int max_send_fragment = 0;
unsigned int split_send_fragment = 0, max_pipelines = 0;
- enum { use_inet, use_unix, use_unknown } connect_type = use_unknown;
+ enum { use_inet,
+ use_unix,
+ use_unknown } connect_type
+ = use_unknown;
int count4or6 = 0;
uint8_t maxfraglen = 0;
int c_nbio = 0, c_msg = 0, c_ign_eof = 0, c_brief = 0;
@@ -968,10 +1055,10 @@ int s_client_main(int argc, char **argv)
FD_ZERO(&writefds);
/* Known false-positive of MemorySanitizer. */
#if defined(__has_feature)
-# if __has_feature(memory_sanitizer)
+#if __has_feature(memory_sanitizer)
__msan_unpoison(&readfds, sizeof(readfds));
__msan_unpoison(&writefds, sizeof(writefds));
-# endif
+#endif
#endif
c_quiet = 0;
@@ -998,14 +1085,14 @@ int s_client_main(int argc, char **argv)
/* Check for intermixing flags. */
if (connect_type == use_unix && IS_INET_FLAG(o)) {
BIO_printf(bio_err,
- "%s: Intermixed protocol flags (unix and internet domains)\n",
- prog);
+ "%s: Intermixed protocol flags (unix and internet domains)\n",
+ prog);
goto end;
}
if (connect_type == use_inet && IS_UNIX_FLAG(o)) {
BIO_printf(bio_err,
- "%s: Intermixed protocol flags (internet and unix domains)\n",
- prog);
+ "%s: Intermixed protocol flags (internet and unix domains)\n",
+ prog);
goto end;
}
@@ -1017,14 +1104,14 @@ int s_client_main(int argc, char **argv)
no_prot_opt++;
if (prot_opt == 1 && no_prot_opt) {
BIO_printf(bio_err,
- "Cannot supply both a protocol flag and '-no_<prot>'\n");
+ "Cannot supply both a protocol flag and '-no_<prot>'\n");
goto end;
}
switch (o) {
case OPT_EOF:
case OPT_ERR:
- opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
case OPT_HELP:
@@ -1185,7 +1272,7 @@ int s_client_main(int argc, char **argv)
case OPT_TLSEXTDEBUG:
c_tlsextdebug = 1;
break;
-# ifndef OPENSSL_NO_OCSP
+#ifndef OPENSSL_NO_OCSP
case OPT_STATUS:
c_status_req = 1;
break;
@@ -1197,11 +1284,10 @@ int s_client_main(int argc, char **argv)
case OPT_STATUS_OCSP_CHECK_ALL:
c_status_req = 1;
X509_VERIFY_PARAM_set_flags(vpm,
- X509_V_FLAG_OCSP_RESP_CHECK |
- X509_V_FLAG_OCSP_RESP_CHECK_ALL);
+ X509_V_FLAG_OCSP_RESP_CHECK | X509_V_FLAG_OCSP_RESP_CHECK_ALL);
vpmtouched++;
break;
-# endif
+#endif
case OPT_WDEBUG:
#ifdef WATT32
dbug_init();
@@ -1265,7 +1351,7 @@ int s_client_main(int argc, char **argv)
case OPT_SRP_STRENGTH:
srp_arg.strength = atoi(opt_arg());
BIO_printf(bio_err, "SRP minimal length for N is %d\n",
- srp_arg.strength);
+ srp_arg.strength);
if (min_version < TLS1_VERSION)
min_version = TLS1_VERSION;
break;
@@ -1362,9 +1448,9 @@ int s_client_main(int argc, char **argv)
min_version = 0;
max_version = 0;
socket_type = SOCK_DGRAM;
-# ifndef OPENSSL_NO_DTLS
+#ifndef OPENSSL_NO_DTLS
isdtls = 0;
-# endif
+#endif
isquic = 1;
#endif
break;
@@ -1466,8 +1552,7 @@ int s_client_main(int argc, char **argv)
case OPT_DANE_TLSA_RRDATA:
if (dane_tlsa_rrset == NULL)
dane_tlsa_rrset = sk_OPENSSL_STRING_new_null();
- if (dane_tlsa_rrset == NULL ||
- !sk_OPENSSL_STRING_push(dane_tlsa_rrset, opt_arg())) {
+ if (dane_tlsa_rrset == NULL || !sk_OPENSSL_STRING_push(dane_tlsa_rrset, opt_arg())) {
BIO_printf(bio_err, "%s: Memory allocation failure\n", prog);
goto end;
}
@@ -1539,8 +1624,8 @@ int s_client_main(int argc, char **argv)
break;
default:
BIO_printf(bio_err,
- "%s: Max Fragment Len %u is out of permitted values",
- prog, len);
+ "%s: Max Fragment Len %u is out of permitted values",
+ prog, len);
goto opthelp;
}
break;
@@ -1584,8 +1669,8 @@ int s_client_main(int argc, char **argv)
/* Don't allow -connect and a separate argument. */
if (connectstr != NULL) {
BIO_printf(bio_err,
- "%s: cannot provide both -connect option and target parameter\n",
- prog);
+ "%s: cannot provide both -connect option and target parameter\n",
+ prog);
goto opthelp;
}
connect_type = use_inet;
@@ -1606,14 +1691,14 @@ int s_client_main(int argc, char **argv)
if (noservername) {
if (servername != NULL) {
BIO_printf(bio_err,
- "%s: Can't use -servername and -noservername together\n",
- prog);
+ "%s: Can't use -servername and -noservername together\n",
+ prog);
goto opthelp;
}
if (dane_tlsa_domain != NULL) {
BIO_printf(bio_err,
- "%s: Can't use -dane_tlsa_domain and -noservername together\n",
- prog);
+ "%s: Can't use -dane_tlsa_domain and -noservername together\n",
+ prog);
goto opthelp;
}
}
@@ -1636,14 +1721,14 @@ int s_client_main(int argc, char **argv)
OPENSSL_free(tmp_port);
if (!res) {
BIO_printf(bio_err,
- "%s: -connect argument or target parameter malformed or ambiguous\n",
- prog);
+ "%s: -connect argument or target parameter malformed or ambiguous\n",
+ prog);
goto end;
}
}
if (proxystr != NULL) {
-# ifndef OPENSSL_NO_HTTP
+#ifndef OPENSSL_NO_HTTP
int res;
char *tmp_host = host, *tmp_port = port;
@@ -1675,25 +1760,24 @@ int s_client_main(int argc, char **argv)
OPENSSL_free(tmp_port);
if (!res) {
BIO_printf(bio_err,
- "%s: -proxy argument malformed or ambiguous\n", prog);
+ "%s: -proxy argument malformed or ambiguous\n", prog);
goto end;
}
-# else
+#else
BIO_printf(bio_err,
- "%s: -proxy not supported in no-http build\n", prog);
+ "%s: -proxy not supported in no-http build\n", prog);
goto end;
-# endif
+#endif
}
-
if (bindstr != NULL) {
int res;
res = BIO_parse_hostserv(bindstr, &bindhost, &bindport,
- BIO_PARSE_PRIO_HOST);
+ BIO_PARSE_PRIO_HOST);
if (!res) {
BIO_printf(bio_err,
- "%s: -bind argument parameter malformed or ambiguous\n",
- prog);
+ "%s: -bind argument parameter malformed or ambiguous\n",
+ prog);
goto end;
}
}
@@ -1701,7 +1785,7 @@ int s_client_main(int argc, char **argv)
#ifdef AF_UNIX
if (socket_family == AF_UNIX && socket_type != SOCK_STREAM) {
BIO_printf(bio_err,
- "Can't use unix sockets and datagrams together\n");
+ "Can't use unix sockets and datagrams together\n");
goto end;
}
#endif
@@ -1720,8 +1804,7 @@ int s_client_main(int argc, char **argv)
#if !defined(OPENSSL_NO_NEXTPROTONEG)
next_proto.status = -1;
if (next_proto_neg_in) {
- next_proto.data =
- next_protos_parse(&next_proto.len, next_proto_neg_in);
+ next_proto.data = next_protos_parse(&next_proto.len, next_proto_neg_in);
if (next_proto.data == NULL) {
BIO_printf(bio_err, "Error parsing -nextprotoneg argument\n");
goto end;
@@ -1750,14 +1833,14 @@ int s_client_main(int argc, char **argv)
if (key_file != NULL) {
key = load_key(key_file, key_format, 0, pass,
- "client certificate private key");
+ "client certificate private key");
if (key == NULL)
goto end;
}
if (cert_file != NULL) {
cert = load_cert_pass(cert_file, cert_format, 1, pass,
- "client certificate");
+ "client certificate");
if (cert == NULL)
goto end;
}
@@ -1824,7 +1907,7 @@ int s_client_main(int argc, char **argv)
if (ssl_config != NULL) {
if (SSL_CTX_config(ctx, ssl_config) == 0) {
BIO_printf(bio_err, "Error using configuration \"%s\"\n",
- ssl_config);
+ ssl_config);
goto end;
}
}
@@ -1860,21 +1943,21 @@ int s_client_main(int argc, char **argv)
if (max_send_fragment > 0
&& !SSL_CTX_set_max_send_fragment(ctx, max_send_fragment)) {
BIO_printf(bio_err, "%s: Max send fragment size %u is out of permitted range\n",
- prog, max_send_fragment);
+ prog, max_send_fragment);
goto end;
}
if (split_send_fragment > 0
&& !SSL_CTX_set_split_send_fragment(ctx, split_send_fragment)) {
BIO_printf(bio_err, "%s: Split send fragment size %u is out of permitted range\n",
- prog, split_send_fragment);
+ prog, split_send_fragment);
goto end;
}
if (max_pipelines > 0
&& !SSL_CTX_set_max_pipelines(ctx, max_pipelines)) {
BIO_printf(bio_err, "%s: Max pipelines %u is out of permitted range\n",
- prog, max_pipelines);
+ prog, max_pipelines);
goto end;
}
@@ -1883,17 +1966,18 @@ int s_client_main(int argc, char **argv)
}
if (maxfraglen > 0
- && !SSL_CTX_set_tlsext_max_fragment_length(ctx, maxfraglen)) {
+ && !SSL_CTX_set_tlsext_max_fragment_length(ctx, maxfraglen)) {
BIO_printf(bio_err,
- "%s: Max Fragment Length code %u is out of permitted values"
- "\n", prog, maxfraglen);
+ "%s: Max Fragment Length code %u is out of permitted values"
+ "\n",
+ prog, maxfraglen);
goto end;
}
if (!ssl_load_stores(ctx,
- vfyCApath, vfyCAfile, vfyCAstore,
- chCApath, chCAfile, chCAstore,
- crls, crl_download)) {
+ vfyCApath, vfyCAfile, vfyCAstore,
+ chCApath, chCAfile, chCAstore,
+ crls, crl_download)) {
BIO_printf(bio_err, "Error loading store locations\n");
goto end;
}
@@ -1967,12 +2051,12 @@ int s_client_main(int argc, char **argv)
for (i = 0; i < serverinfo_count; i++) {
if (!SSL_CTX_add_client_custom_ext(ctx,
- serverinfo_types[i],
- NULL, NULL, NULL,
- serverinfo_cli_parse_cb, NULL)) {
+ serverinfo_types[i],
+ NULL, NULL, NULL,
+ serverinfo_cli_parse_cb, NULL)) {
BIO_printf(bio_err,
- "Warning: Unable to add custom extension %u, skipping\n",
- serverinfo_types[i]);
+ "Warning: Unable to add custom extension %u, skipping\n",
+ serverinfo_types[i]);
}
}
@@ -1981,8 +2065,7 @@ int s_client_main(int argc, char **argv)
#ifndef OPENSSL_NO_CT
/* Enable SCT processing, without early connection termination */
- if (ct_validation &&
- !SSL_CTX_enable_ct(ctx, SSL_CT_VALIDATION_PERMISSIVE)) {
+ if (ct_validation && !SSL_CTX_enable_ct(ctx, SSL_CT_VALIDATION_PERMISSIVE)) {
goto end;
}
@@ -2003,7 +2086,7 @@ int s_client_main(int argc, char **argv)
SSL_CTX_set_verify(ctx, verify, verify_callback);
if (!ctx_set_verify_locations(ctx, CAfile, noCAfile, CApath, noCApath,
- CAstore, noCAstore))
+ CAstore, noCAstore))
goto end;
ssl_ctx_add_crls(ctx, crls, crl_download);
@@ -2018,15 +2101,15 @@ int s_client_main(int argc, char **argv)
}
#ifndef OPENSSL_NO_SRP
if (srp_arg.srplogin != NULL
- && !set_up_srp_arg(ctx, &srp_arg, srp_lateuser, c_msg, c_debug))
+ && !set_up_srp_arg(ctx, &srp_arg, srp_lateuser, c_msg, c_debug))
goto end;
-# endif
+#endif
if (dane_tlsa_domain != NULL) {
if (SSL_CTX_dane_enable(ctx) <= 0) {
BIO_printf(bio_err,
- "%s: Error enabling DANE TLSA authentication.\n",
- prog);
+ "%s: Error enabling DANE TLSA authentication.\n",
+ prog);
goto end;
}
}
@@ -2036,8 +2119,7 @@ int s_client_main(int argc, char **argv)
* come at any time. Therefore, we use a callback to write out the session
* when we know about it. This approach works for < TLSv1.3 as well.
*/
- SSL_CTX_set_session_cache_mode(ctx, SSL_SESS_CACHE_CLIENT
- | SSL_SESS_CACHE_NO_INTERNAL_STORE);
+ SSL_CTX_set_session_cache_mode(ctx, SSL_SESS_CACHE_CLIENT | SSL_SESS_CACHE_NO_INTERNAL_STORE);
SSL_CTX_sess_set_new_cb(ctx, new_session_cb);
if (set_keylog_file(ctx, keylog_file))
@@ -2100,24 +2182,28 @@ int s_client_main(int argc, char **argv)
if (dane_tlsa_domain != NULL) {
if (SSL_dane_enable(con, dane_tlsa_domain) <= 0) {
BIO_printf(bio_err, "%s: Error enabling DANE TLSA "
- "authentication.\n", prog);
+ "authentication.\n",
+ prog);
goto end;
}
if (dane_tlsa_rrset == NULL) {
BIO_printf(bio_err, "%s: DANE TLSA authentication requires at "
- "least one -dane_tlsa_rrdata option.\n", prog);
+ "least one -dane_tlsa_rrdata option.\n",
+ prog);
goto end;
}
if (tlsa_import_rrset(con, dane_tlsa_rrset) <= 0) {
BIO_printf(bio_err, "%s: Failed to import any TLSA "
- "records.\n", prog);
+ "records.\n",
+ prog);
goto end;
}
if (dane_ee_no_name)
SSL_dane_set_flags(con, DANE_FLAG_NO_DANE_EE_NAMECHECKS);
} else if (dane_tlsa_rrset != NULL) {
BIO_printf(bio_err, "%s: DANE TLSA authentication requires the "
- "-dane_tlsa_domain option.\n", prog);
+ "-dane_tlsa_domain option.\n",
+ prog);
goto end;
}
#ifndef OPENSSL_NO_DTLS
@@ -2139,12 +2225,13 @@ int s_client_main(int argc, char **argv)
if (tfo)
BIO_printf(bio_c_out, "Connecting via TFO\n");
- re_start:
+re_start:
/* peer_addr might be set from previous connections */
BIO_ADDR_free(peer_addr);
peer_addr = NULL;
if (init_client(&sock, host, port, bindhost, bindport, socket_family,
- socket_type, protocol, tfo, !isquic, &peer_addr) == 0) {
+ socket_type, protocol, tfo, !isquic, &peer_addr)
+ == 0) {
BIO_printf(bio_err, "connect:errno=%d\n", get_last_socket_error());
BIO_closesocket(sock);
goto end;
@@ -2183,7 +2270,7 @@ int s_client_main(int argc, char **argv)
}
if (!BIO_sock_info(sock, BIO_SOCK_INFO_ADDRESS, &peer_info)) {
BIO_printf(bio_err, "getsockname:errno=%d\n",
- get_last_socket_error());
+ get_last_socket_error());
BIO_free(sbio);
BIO_ADDR_free(peer_info.addr);
BIO_closesocket(sock);
@@ -2207,7 +2294,7 @@ int s_client_main(int argc, char **argv)
if (socket_mtu) {
if (socket_mtu < DTLS_get_link_min_mtu(con)) {
BIO_printf(bio_err, "MTU too small. Must be at least %ld\n",
- DTLS_get_link_min_mtu(con));
+ DTLS_get_link_min_mtu(con));
BIO_free(sbio);
goto shut;
}
@@ -2224,7 +2311,7 @@ int s_client_main(int argc, char **argv)
} else
#endif /* OPENSSL_NO_DTLS */
#ifndef OPENSSL_NO_QUIC
- if (isquic) {
+ if (isquic) {
sbio = BIO_new_dgram(sock, BIO_NOCLOSE);
if (!SSL_set1_initial_peer_addr(con, peer_addr)) {
BIO_printf(bio_err, "Failed to set the initial peer address\n");
@@ -2309,535 +2396,506 @@ int s_client_main(int argc, char **argv)
if (proxystr != NULL) {
/* Here we must use the connect string target host & port */
if (!OSSL_HTTP_proxy_connect(sbio, thost, tport, proxyuser, proxypass,
- 0 /* no timeout */, bio_err, prog))
+ 0 /* no timeout */, bio_err, prog))
goto shut;
}
#endif
- switch ((PROTOCOL_CHOICE) starttls_proto) {
+ switch ((PROTOCOL_CHOICE)starttls_proto) {
case PROTO_OFF:
break;
case PROTO_LMTP:
- case PROTO_SMTP:
- {
- /*
- * This is an ugly hack that does a lot of assumptions. We do
- * have to handle multi-line responses which may come in a single
- * packet or not. We therefore have to use BIO_gets() which does
- * need a buffering BIO. So during the initial chitchat we do
- * push a buffering BIO into the chain that is removed again
- * later on to not disturb the rest of the s_client operation.
- */
- int foundit = 0;
- BIO *fbio = BIO_new(BIO_f_buffer());
+ case PROTO_SMTP: {
+ /*
+ * This is an ugly hack that does a lot of assumptions. We do
+ * have to handle multi-line responses which may come in a single
+ * packet or not. We therefore have to use BIO_gets() which does
+ * need a buffering BIO. So during the initial chitchat we do
+ * push a buffering BIO into the chain that is removed again
+ * later on to not disturb the rest of the s_client operation.
+ */
+ int foundit = 0;
+ BIO *fbio = BIO_new(BIO_f_buffer());
- if (fbio == NULL) {
- BIO_printf(bio_err, "Unable to create BIO\n");
- goto shut;
- }
- BIO_push(fbio, sbio);
- /* Wait for multi-line response to end from LMTP or SMTP */
- do {
- mbuf_len = BIO_gets(fbio, mbuf, BUFSIZZ);
- } while (mbuf_len > 3 && mbuf[3] == '-');
- if (protohost == NULL)
- protohost = "mail.example.com";
- if (starttls_proto == (int)PROTO_LMTP)
- BIO_printf(fbio, "LHLO %s\r\n", protohost);
- else
- BIO_printf(fbio, "EHLO %s\r\n", protohost);
- (void)BIO_flush(fbio);
- /*
- * Wait for multi-line response to end LHLO LMTP or EHLO SMTP
- * response.
- */
- do {
- mbuf_len = BIO_gets(fbio, mbuf, BUFSIZZ);
- if (strstr(mbuf, "STARTTLS"))
- foundit = 1;
- } while (mbuf_len > 3 && mbuf[3] == '-');
- (void)BIO_flush(fbio);
- BIO_pop(fbio);
- BIO_free(fbio);
- if (!foundit)
- BIO_printf(bio_err,
- "Didn't find STARTTLS in server response,"
- " trying anyway...\n");
- BIO_printf(sbio, "STARTTLS\r\n");
- BIO_read(sbio, sbuf, BUFSIZZ);
+ if (fbio == NULL) {
+ BIO_printf(bio_err, "Unable to create BIO\n");
+ goto shut;
}
- break;
- case PROTO_POP3:
- {
- BIO_read(sbio, mbuf, BUFSIZZ);
- BIO_printf(sbio, "STLS\r\n");
- mbuf_len = BIO_read(sbio, sbuf, BUFSIZZ);
- if (mbuf_len < 0) {
- BIO_printf(bio_err, "BIO_read failed\n");
- goto end;
- }
+ BIO_push(fbio, sbio);
+ /* Wait for multi-line response to end from LMTP or SMTP */
+ do {
+ mbuf_len = BIO_gets(fbio, mbuf, BUFSIZZ);
+ } while (mbuf_len > 3 && mbuf[3] == '-');
+ if (protohost == NULL)
+ protohost = "mail.example.com";
+ if (starttls_proto == (int)PROTO_LMTP)
+ BIO_printf(fbio, "LHLO %s\r\n", protohost);
+ else
+ BIO_printf(fbio, "EHLO %s\r\n", protohost);
+ (void)BIO_flush(fbio);
+ /*
+ * Wait for multi-line response to end LHLO LMTP or EHLO SMTP
+ * response.
+ */
+ do {
+ mbuf_len = BIO_gets(fbio, mbuf, BUFSIZZ);
+ if (strstr(mbuf, "STARTTLS"))
+ foundit = 1;
+ } while (mbuf_len > 3 && mbuf[3] == '-');
+ (void)BIO_flush(fbio);
+ BIO_pop(fbio);
+ BIO_free(fbio);
+ if (!foundit)
+ BIO_printf(bio_err,
+ "Didn't find STARTTLS in server response,"
+ " trying anyway...\n");
+ BIO_printf(sbio, "STARTTLS\r\n");
+ BIO_read(sbio, sbuf, BUFSIZZ);
+ } break;
+ case PROTO_POP3: {
+ BIO_read(sbio, mbuf, BUFSIZZ);
+ BIO_printf(sbio, "STLS\r\n");
+ mbuf_len = BIO_read(sbio, sbuf, BUFSIZZ);
+ if (mbuf_len < 0) {
+ BIO_printf(bio_err, "BIO_read failed\n");
+ goto end;
}
- break;
- case PROTO_IMAP:
- {
- int foundit = 0;
- BIO *fbio = BIO_new(BIO_f_buffer());
+ } break;
+ case PROTO_IMAP: {
+ int foundit = 0;
+ BIO *fbio = BIO_new(BIO_f_buffer());
- if (fbio == NULL) {
- BIO_printf(bio_err, "Unable to create BIO\n");
- goto shut;
- }
- BIO_push(fbio, sbio);
- BIO_gets(fbio, mbuf, BUFSIZZ);
- /* STARTTLS command requires CAPABILITY... */
- BIO_printf(fbio, ". CAPABILITY\r\n");
- (void)BIO_flush(fbio);
- /* wait for multi-line CAPABILITY response */
- do {
- mbuf_len = BIO_gets(fbio, mbuf, BUFSIZZ);
- if (strstr(mbuf, "STARTTLS"))
- foundit = 1;
- }
- while (mbuf_len > 3 && mbuf[0] != '.');
- (void)BIO_flush(fbio);
- BIO_pop(fbio);
- BIO_free(fbio);
- if (!foundit)
- BIO_printf(bio_err,
- "Didn't find STARTTLS in server response,"
- " trying anyway...\n");
- BIO_printf(sbio, ". STARTTLS\r\n");
- BIO_read(sbio, sbuf, BUFSIZZ);
+ if (fbio == NULL) {
+ BIO_printf(bio_err, "Unable to create BIO\n");
+ goto shut;
}
- break;
- case PROTO_FTP:
- {
- BIO *fbio = BIO_new(BIO_f_buffer());
-
- if (fbio == NULL) {
- BIO_printf(bio_err, "Unable to create BIO\n");
- goto shut;
- }
- BIO_push(fbio, sbio);
- /* wait for multi-line response to end from FTP */
- do {
- mbuf_len = BIO_gets(fbio, mbuf, BUFSIZZ);
- }
- while (mbuf_len > 3 && (!isdigit((unsigned char)mbuf[0]) || !isdigit((unsigned char)mbuf[1]) || !isdigit((unsigned char)mbuf[2]) || mbuf[3] != ' '));
- (void)BIO_flush(fbio);
- BIO_pop(fbio);
- BIO_free(fbio);
- BIO_printf(sbio, "AUTH TLS\r\n");
- BIO_read(sbio, sbuf, BUFSIZZ);
+ BIO_push(fbio, sbio);
+ BIO_gets(fbio, mbuf, BUFSIZZ);
+ /* STARTTLS command requires CAPABILITY... */
+ BIO_printf(fbio, ". CAPABILITY\r\n");
+ (void)BIO_flush(fbio);
+ /* wait for multi-line CAPABILITY response */
+ do {
+ mbuf_len = BIO_gets(fbio, mbuf, BUFSIZZ);
+ if (strstr(mbuf, "STARTTLS"))
+ foundit = 1;
+ } while (mbuf_len > 3 && mbuf[0] != '.');
+ (void)BIO_flush(fbio);
+ BIO_pop(fbio);
+ BIO_free(fbio);
+ if (!foundit)
+ BIO_printf(bio_err,
+ "Didn't find STARTTLS in server response,"
+ " trying anyway...\n");
+ BIO_printf(sbio, ". STARTTLS\r\n");
+ BIO_read(sbio, sbuf, BUFSIZZ);
+ } break;
+ case PROTO_FTP: {
+ BIO *fbio = BIO_new(BIO_f_buffer());
+
+ if (fbio == NULL) {
+ BIO_printf(bio_err, "Unable to create BIO\n");
+ goto shut;
}
- break;
+ BIO_push(fbio, sbio);
+ /* wait for multi-line response to end from FTP */
+ do {
+ mbuf_len = BIO_gets(fbio, mbuf, BUFSIZZ);
+ } while (mbuf_len > 3 && (!isdigit((unsigned char)mbuf[0]) || !isdigit((unsigned char)mbuf[1]) || !isdigit((unsigned char)mbuf[2]) || mbuf[3] != ' '));
+ (void)BIO_flush(fbio);
+ BIO_pop(fbio);
+ BIO_free(fbio);
+ BIO_printf(sbio, "AUTH TLS\r\n");
+ BIO_read(sbio, sbuf, BUFSIZZ);
+ } break;
case PROTO_XMPP:
- case PROTO_XMPP_SERVER:
- {
- int seen = 0;
- BIO_printf(sbio, "<stream:stream "
- "xmlns:stream='http://etherx.jabber.org/streams' "
- "xmlns='jabber:%s' to='%s' version='1.0'>",
- starttls_proto == PROTO_XMPP ? "client" : "server",
- protohost ? protohost : host);
+ case PROTO_XMPP_SERVER: {
+ int seen = 0;
+ BIO_printf(sbio, "<stream:stream "
+ "xmlns:stream='http://etherx.jabber.org/streams' "
+ "xmlns='jabber:%s' to='%s' version='1.0'>",
+ starttls_proto == PROTO_XMPP ? "client" : "server",
+ protohost ? protohost : host);
+ seen = BIO_read(sbio, mbuf, BUFSIZZ);
+ if (seen < 0) {
+ BIO_printf(bio_err, "BIO_read failed\n");
+ goto end;
+ }
+ mbuf[seen] = '\0';
+ while (!strstr(mbuf, "<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'")
+ && !strstr(mbuf,
+ "<starttls xmlns=\"urn:ietf:params:xml:ns:xmpp-tls\"")) {
seen = BIO_read(sbio, mbuf, BUFSIZZ);
- if (seen < 0) {
- BIO_printf(bio_err, "BIO_read failed\n");
- goto end;
- }
- mbuf[seen] = '\0';
- while (!strstr
- (mbuf, "<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'")
- && !strstr(mbuf,
- "<starttls xmlns=\"urn:ietf:params:xml:ns:xmpp-tls\""))
- {
- seen = BIO_read(sbio, mbuf, BUFSIZZ);
-
- if (seen <= 0)
- goto shut;
- mbuf[seen] = '\0';
- }
- BIO_printf(sbio,
- "<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>");
- seen = BIO_read(sbio, sbuf, BUFSIZZ);
- if (seen < 0) {
- BIO_printf(bio_err, "BIO_read failed\n");
+ if (seen <= 0)
goto shut;
- }
- sbuf[seen] = '\0';
- if (!strstr(sbuf, "<proceed"))
- goto shut;
- mbuf[0] = '\0';
+
+ mbuf[seen] = '\0';
}
- break;
- case PROTO_TELNET:
- {
- static const unsigned char tls_do[] = {
- /* IAC DO START_TLS */
- 255, 253, 46
- };
- static const unsigned char tls_will[] = {
- /* IAC WILL START_TLS */
- 255, 251, 46
- };
- static const unsigned char tls_follows[] = {
- /* IAC SB START_TLS FOLLOWS IAC SE */
- 255, 250, 46, 1, 255, 240
- };
- int bytes;
-
- /* Telnet server should demand we issue START_TLS */
- bytes = BIO_read(sbio, mbuf, BUFSIZZ);
- if (bytes != 3 || memcmp(mbuf, tls_do, 3) != 0)
- goto shut;
- /* Agree to issue START_TLS and send the FOLLOWS sub-command */
- BIO_write(sbio, tls_will, 3);
- BIO_write(sbio, tls_follows, 6);
- (void)BIO_flush(sbio);
- /* Telnet server also sent the FOLLOWS sub-command */
- bytes = BIO_read(sbio, mbuf, BUFSIZZ);
- if (bytes != 6 || memcmp(mbuf, tls_follows, 6) != 0)
- goto shut;
+ BIO_printf(sbio,
+ "<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>");
+ seen = BIO_read(sbio, sbuf, BUFSIZZ);
+ if (seen < 0) {
+ BIO_printf(bio_err, "BIO_read failed\n");
+ goto shut;
}
- break;
- case PROTO_IRC:
- {
- int numeric;
- BIO *fbio = BIO_new(BIO_f_buffer());
-
- if (fbio == NULL) {
- BIO_printf(bio_err, "Unable to create BIO\n");
- goto end;
- }
- BIO_push(fbio, sbio);
- BIO_printf(fbio, "STARTTLS\r\n");
- (void)BIO_flush(fbio);
- width = SSL_get_fd(con) + 1;
-
- do {
- numeric = 0;
-
- FD_ZERO(&readfds);
- openssl_fdset(SSL_get_fd(con), &readfds);
- timeout.tv_sec = S_CLIENT_IRC_READ_TIMEOUT;
- timeout.tv_usec = 0;
- /*
- * If the IRCd doesn't respond within
- * S_CLIENT_IRC_READ_TIMEOUT seconds, assume
- * it doesn't support STARTTLS. Many IRCds
- * will not give _any_ sort of response to a
- * STARTTLS command when it's not supported.
- */
- if (!BIO_get_buffer_num_lines(fbio)
- && !BIO_pending(fbio)
- && !BIO_pending(sbio)
- && select(width, (void *)&readfds, NULL, NULL,
- &timeout) < 1) {
- BIO_printf(bio_err,
- "Timeout waiting for response (%d seconds).\n",
- S_CLIENT_IRC_READ_TIMEOUT);
- break;
- }
+ sbuf[seen] = '\0';
+ if (!strstr(sbuf, "<proceed"))
+ goto shut;
+ mbuf[0] = '\0';
+ } break;
+ case PROTO_TELNET: {
+ static const unsigned char tls_do[] = {
+ /* IAC DO START_TLS */
+ 255, 253, 46
+ };
+ static const unsigned char tls_will[] = {
+ /* IAC WILL START_TLS */
+ 255, 251, 46
+ };
+ static const unsigned char tls_follows[] = {
+ /* IAC SB START_TLS FOLLOWS IAC SE */
+ 255, 250, 46, 1, 255, 240
+ };
+ int bytes;
+
+ /* Telnet server should demand we issue START_TLS */
+ bytes = BIO_read(sbio, mbuf, BUFSIZZ);
+ if (bytes != 3 || memcmp(mbuf, tls_do, 3) != 0)
+ goto shut;
+ /* Agree to issue START_TLS and send the FOLLOWS sub-command */
+ BIO_write(sbio, tls_will, 3);
+ BIO_write(sbio, tls_follows, 6);
+ (void)BIO_flush(sbio);
+ /* Telnet server also sent the FOLLOWS sub-command */
+ bytes = BIO_read(sbio, mbuf, BUFSIZZ);
+ if (bytes != 6 || memcmp(mbuf, tls_follows, 6) != 0)
+ goto shut;
+ } break;
+ case PROTO_IRC: {
+ int numeric;
+ BIO *fbio = BIO_new(BIO_f_buffer());
- mbuf_len = BIO_gets(fbio, mbuf, BUFSIZZ);
- if (mbuf_len < 1 || sscanf(mbuf, "%*s %d", &numeric) != 1)
- break;
- /* :example.net 451 STARTTLS :You have not registered */
- /* :example.net 421 STARTTLS :Unknown command */
- if ((numeric == 451 || numeric == 421)
- && strstr(mbuf, "STARTTLS") != NULL) {
- BIO_printf(bio_err, "STARTTLS not supported: %s", mbuf);
- break;
- }
- if (numeric == 691) {
- BIO_printf(bio_err, "STARTTLS negotiation failed: ");
- break;
- }
- } while (numeric != 670);
-
- (void)BIO_flush(fbio);
- BIO_pop(fbio);
- BIO_free(fbio);
- if (numeric != 670) {
- BIO_printf(bio_err, "Server does not support STARTTLS.\n");
- ret = 1;
- goto shut;
- }
+ if (fbio == NULL) {
+ BIO_printf(bio_err, "Unable to create BIO\n");
+ goto end;
}
- break;
- case PROTO_MYSQL:
- {
- /* SSL request packet */
- static const unsigned char ssl_req[] = {
- /* payload_length, sequence_id */
- 0x20, 0x00, 0x00, 0x01,
- /* payload */
- /* capability flags, CLIENT_SSL always set */
- 0x85, 0xae, 0x7f, 0x00,
- /* max-packet size */
- 0x00, 0x00, 0x00, 0x01,
- /* character set */
- 0x21,
- /* string[23] reserved (all [0]) */
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- };
- int bytes = 0;
- int ssl_flg = 0x800;
- int pos;
- const unsigned char *packet = (const unsigned char *)sbuf;
-
- /* Receiving Initial Handshake packet. */
- bytes = BIO_read(sbio, (void *)packet, BUFSIZZ);
- if (bytes < 0) {
- BIO_printf(bio_err, "BIO_read failed\n");
- goto shut;
- /* Packet length[3], Packet number[1] + minimum payload[17] */
- } else if (bytes < 21) {
- BIO_printf(bio_err, "MySQL packet too short.\n");
- goto shut;
- } else if (bytes != (4 + packet[0] +
- (packet[1] << 8) +
- (packet[2] << 16))) {
- BIO_printf(bio_err, "MySQL packet length does not match.\n");
- goto shut;
- /* protocol version[1] */
- } else if (packet[4] != 0xA) {
- BIO_printf(bio_err,
- "Only MySQL protocol version 10 is supported.\n");
- goto shut;
- }
+ BIO_push(fbio, sbio);
+ BIO_printf(fbio, "STARTTLS\r\n");
+ (void)BIO_flush(fbio);
+ width = SSL_get_fd(con) + 1;
- pos = 5;
- /* server version[string+NULL] */
- for (;;) {
- if (pos >= bytes) {
- BIO_printf(bio_err, "Cannot confirm server version. ");
- goto shut;
- } else if (packet[pos++] == '\0') {
- break;
- }
- }
+ do {
+ numeric = 0;
- /* make sure we have at least 15 bytes left in the packet */
- if (pos + 15 > bytes) {
+ FD_ZERO(&readfds);
+ openssl_fdset(SSL_get_fd(con), &readfds);
+ timeout.tv_sec = S_CLIENT_IRC_READ_TIMEOUT;
+ timeout.tv_usec = 0;
+ /*
+ * If the IRCd doesn't respond within
+ * S_CLIENT_IRC_READ_TIMEOUT seconds, assume
+ * it doesn't support STARTTLS. Many IRCds
+ * will not give _any_ sort of response to a
+ * STARTTLS command when it's not supported.
+ */
+ if (!BIO_get_buffer_num_lines(fbio)
+ && !BIO_pending(fbio)
+ && !BIO_pending(sbio)
+ && select(width, (void *)&readfds, NULL, NULL,
+ &timeout)
+ < 1) {
BIO_printf(bio_err,
- "MySQL server handshake packet is broken.\n");
- goto shut;
+ "Timeout waiting for response (%d seconds).\n",
+ S_CLIENT_IRC_READ_TIMEOUT);
+ break;
}
- pos += 12; /* skip over conn id[4] + SALT[8] */
- if (packet[pos++] != '\0') { /* verify filler */
- BIO_printf(bio_err,
- "MySQL packet is broken.\n");
- goto shut;
+ mbuf_len = BIO_gets(fbio, mbuf, BUFSIZZ);
+ if (mbuf_len < 1 || sscanf(mbuf, "%*s %d", &numeric) != 1)
+ break;
+ /* :example.net 451 STARTTLS :You have not registered */
+ /* :example.net 421 STARTTLS :Unknown command */
+ if ((numeric == 451 || numeric == 421)
+ && strstr(mbuf, "STARTTLS") != NULL) {
+ BIO_printf(bio_err, "STARTTLS not supported: %s", mbuf);
+ break;
+ }
+ if (numeric == 691) {
+ BIO_printf(bio_err, "STARTTLS negotiation failed: ");
+ break;
}
+ } while (numeric != 670);
+
+ (void)BIO_flush(fbio);
+ BIO_pop(fbio);
+ BIO_free(fbio);
+ if (numeric != 670) {
+ BIO_printf(bio_err, "Server does not support STARTTLS.\n");
+ ret = 1;
+ goto shut;
+ }
+ } break;
+ case PROTO_MYSQL: {
+ /* SSL request packet */
+ static const unsigned char ssl_req[] = {
+ /* payload_length, sequence_id */
+ 0x20, 0x00, 0x00, 0x01,
+ /* payload */
+ /* capability flags, CLIENT_SSL always set */
+ 0x85, 0xae, 0x7f, 0x00,
+ /* max-packet size */
+ 0x00, 0x00, 0x00, 0x01,
+ /* character set */
+ 0x21,
+ /* string[23] reserved (all [0]) */
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ };
+ int bytes = 0;
+ int ssl_flg = 0x800;
+ int pos;
+ const unsigned char *packet = (const unsigned char *)sbuf;
+
+ /* Receiving Initial Handshake packet. */
+ bytes = BIO_read(sbio, (void *)packet, BUFSIZZ);
+ if (bytes < 0) {
+ BIO_printf(bio_err, "BIO_read failed\n");
+ goto shut;
+ /* Packet length[3], Packet number[1] + minimum payload[17] */
+ } else if (bytes < 21) {
+ BIO_printf(bio_err, "MySQL packet too short.\n");
+ goto shut;
+ } else if (bytes != (4 + packet[0] + (packet[1] << 8) + (packet[2] << 16))) {
+ BIO_printf(bio_err, "MySQL packet length does not match.\n");
+ goto shut;
+ /* protocol version[1] */
+ } else if (packet[4] != 0xA) {
+ BIO_printf(bio_err,
+ "Only MySQL protocol version 10 is supported.\n");
+ goto shut;
+ }
- /* capability flags[2] */
- if (!((packet[pos] + (packet[pos + 1] << 8)) & ssl_flg)) {
- BIO_printf(bio_err, "MySQL server does not support SSL.\n");
+ pos = 5;
+ /* server version[string+NULL] */
+ for (;;) {
+ if (pos >= bytes) {
+ BIO_printf(bio_err, "Cannot confirm server version. ");
goto shut;
+ } else if (packet[pos++] == '\0') {
+ break;
}
+ }
- /* Sending SSL Handshake packet. */
- BIO_write(sbio, ssl_req, sizeof(ssl_req));
- (void)BIO_flush(sbio);
+ /* make sure we have at least 15 bytes left in the packet */
+ if (pos + 15 > bytes) {
+ BIO_printf(bio_err,
+ "MySQL server handshake packet is broken.\n");
+ goto shut;
}
- break;
- case PROTO_POSTGRES:
- {
- static const unsigned char ssl_request[] = {
- /* Length SSLRequest */
- 0, 0, 0, 8, 4, 210, 22, 47
- };
- int bytes;
-
- /* Send SSLRequest packet */
- BIO_write(sbio, ssl_request, 8);
- (void)BIO_flush(sbio);
-
- /* Reply will be a single S if SSL is enabled */
- bytes = BIO_read(sbio, sbuf, BUFSIZZ);
- if (bytes != 1 || sbuf[0] != 'S')
- goto shut;
+
+ pos += 12; /* skip over conn id[4] + SALT[8] */
+ if (packet[pos++] != '\0') { /* verify filler */
+ BIO_printf(bio_err,
+ "MySQL packet is broken.\n");
+ goto shut;
}
- break;
- case PROTO_NNTP:
- {
- int foundit = 0;
- BIO *fbio = BIO_new(BIO_f_buffer());
- if (fbio == NULL) {
- BIO_printf(bio_err, "Unable to create BIO\n");
- goto end;
- }
- BIO_push(fbio, sbio);
- BIO_gets(fbio, mbuf, BUFSIZZ);
- /* STARTTLS command requires CAPABILITIES... */
- BIO_printf(fbio, "CAPABILITIES\r\n");
- (void)BIO_flush(fbio);
- BIO_gets(fbio, mbuf, BUFSIZZ);
- /* no point in trying to parse the CAPABILITIES response if there is none */
- if (strstr(mbuf, "101") != NULL) {
- /* wait for multi-line CAPABILITIES response */
- do {
- mbuf_len = BIO_gets(fbio, mbuf, BUFSIZZ);
- if (strstr(mbuf, "STARTTLS"))
- foundit = 1;
- } while (mbuf_len > 1 && mbuf[0] != '.');
- }
- (void)BIO_flush(fbio);
- BIO_pop(fbio);
- BIO_free(fbio);
- if (!foundit)
- BIO_printf(bio_err,
- "Didn't find STARTTLS in server response,"
- " trying anyway...\n");
- BIO_printf(sbio, "STARTTLS\r\n");
- mbuf_len = BIO_read(sbio, mbuf, BUFSIZZ);
- if (mbuf_len < 0) {
- BIO_printf(bio_err, "BIO_read failed\n");
- goto end;
- }
- mbuf[mbuf_len] = '\0';
- if (strstr(mbuf, "382") == NULL) {
- BIO_printf(bio_err, "STARTTLS failed: %s", mbuf);
- goto shut;
- }
+ /* capability flags[2] */
+ if (!((packet[pos] + (packet[pos + 1] << 8)) & ssl_flg)) {
+ BIO_printf(bio_err, "MySQL server does not support SSL.\n");
+ goto shut;
}
- break;
- case PROTO_SIEVE:
- {
- int foundit = 0;
- BIO *fbio = BIO_new(BIO_f_buffer());
- if (fbio == NULL) {
- BIO_printf(bio_err, "Unable to create BIO\n");
- goto end;
- }
- BIO_push(fbio, sbio);
- /* wait for multi-line response to end from Sieve */
+ /* Sending SSL Handshake packet. */
+ BIO_write(sbio, ssl_req, sizeof(ssl_req));
+ (void)BIO_flush(sbio);
+ } break;
+ case PROTO_POSTGRES: {
+ static const unsigned char ssl_request[] = {
+ /* Length SSLRequest */
+ 0, 0, 0, 8, 4, 210, 22, 47
+ };
+ int bytes;
+
+ /* Send SSLRequest packet */
+ BIO_write(sbio, ssl_request, 8);
+ (void)BIO_flush(sbio);
+
+ /* Reply will be a single S if SSL is enabled */
+ bytes = BIO_read(sbio, sbuf, BUFSIZZ);
+ if (bytes != 1 || sbuf[0] != 'S')
+ goto shut;
+ } break;
+ case PROTO_NNTP: {
+ int foundit = 0;
+ BIO *fbio = BIO_new(BIO_f_buffer());
+
+ if (fbio == NULL) {
+ BIO_printf(bio_err, "Unable to create BIO\n");
+ goto end;
+ }
+ BIO_push(fbio, sbio);
+ BIO_gets(fbio, mbuf, BUFSIZZ);
+ /* STARTTLS command requires CAPABILITIES... */
+ BIO_printf(fbio, "CAPABILITIES\r\n");
+ (void)BIO_flush(fbio);
+ BIO_gets(fbio, mbuf, BUFSIZZ);
+ /* no point in trying to parse the CAPABILITIES response if there is none */
+ if (strstr(mbuf, "101") != NULL) {
+ /* wait for multi-line CAPABILITIES response */
do {
mbuf_len = BIO_gets(fbio, mbuf, BUFSIZZ);
- /*
- * According to RFC 5804 § 1.7, capability
- * is case-insensitive, make it uppercase
- */
- if (mbuf_len > 1 && mbuf[0] == '"') {
- make_uppercase(mbuf);
- if (HAS_PREFIX(mbuf, "\"STARTTLS\""))
- foundit = 1;
- }
- } while (mbuf_len > 1 && mbuf[0] == '"');
- (void)BIO_flush(fbio);
- BIO_pop(fbio);
- BIO_free(fbio);
- if (!foundit)
- BIO_printf(bio_err,
- "Didn't find STARTTLS in server response,"
- " trying anyway...\n");
- BIO_printf(sbio, "STARTTLS\r\n");
- mbuf_len = BIO_read(sbio, mbuf, BUFSIZZ);
- if (mbuf_len < 0) {
- BIO_printf(bio_err, "BIO_read failed\n");
- goto end;
- }
- mbuf[mbuf_len] = '\0';
- if (mbuf_len < 2) {
- BIO_printf(bio_err, "STARTTLS failed: %s", mbuf);
- goto shut;
- }
+ if (strstr(mbuf, "STARTTLS"))
+ foundit = 1;
+ } while (mbuf_len > 1 && mbuf[0] != '.');
+ }
+ (void)BIO_flush(fbio);
+ BIO_pop(fbio);
+ BIO_free(fbio);
+ if (!foundit)
+ BIO_printf(bio_err,
+ "Didn't find STARTTLS in server response,"
+ " trying anyway...\n");
+ BIO_printf(sbio, "STARTTLS\r\n");
+ mbuf_len = BIO_read(sbio, mbuf, BUFSIZZ);
+ if (mbuf_len < 0) {
+ BIO_printf(bio_err, "BIO_read failed\n");
+ goto end;
+ }
+ mbuf[mbuf_len] = '\0';
+ if (strstr(mbuf, "382") == NULL) {
+ BIO_printf(bio_err, "STARTTLS failed: %s", mbuf);
+ goto shut;
+ }
+ } break;
+ case PROTO_SIEVE: {
+ int foundit = 0;
+ BIO *fbio = BIO_new(BIO_f_buffer());
+
+ if (fbio == NULL) {
+ BIO_printf(bio_err, "Unable to create BIO\n");
+ goto end;
+ }
+ BIO_push(fbio, sbio);
+ /* wait for multi-line response to end from Sieve */
+ do {
+ mbuf_len = BIO_gets(fbio, mbuf, BUFSIZZ);
/*
- * According to RFC 5804 § 2.2, response codes are case-
- * insensitive, make it uppercase but preserve the response.
+ * According to RFC 5804 § 1.7, capability
+ * is case-insensitive, make it uppercase
*/
- strncpy(sbuf, mbuf, 2);
- make_uppercase(sbuf);
- if (!HAS_PREFIX(sbuf, "OK")) {
- BIO_printf(bio_err, "STARTTLS not supported: %s", mbuf);
- goto shut;
+ if (mbuf_len > 1 && mbuf[0] == '"') {
+ make_uppercase(mbuf);
+ if (HAS_PREFIX(mbuf, "\"STARTTLS\""))
+ foundit = 1;
}
+ } while (mbuf_len > 1 && mbuf[0] == '"');
+ (void)BIO_flush(fbio);
+ BIO_pop(fbio);
+ BIO_free(fbio);
+ if (!foundit)
+ BIO_printf(bio_err,
+ "Didn't find STARTTLS in server response,"
+ " trying anyway...\n");
+ BIO_printf(sbio, "STARTTLS\r\n");
+ mbuf_len = BIO_read(sbio, mbuf, BUFSIZZ);
+ if (mbuf_len < 0) {
+ BIO_printf(bio_err, "BIO_read failed\n");
+ goto end;
}
- break;
- case PROTO_LDAP:
- {
- /* StartTLS Operation according to RFC 4511 */
- static char ldap_tls_genconf[] = "asn1=SEQUENCE:LDAPMessage\n"
- "[LDAPMessage]\n"
- "messageID=INTEGER:1\n"
- "extendedReq=EXPLICIT:23A,IMPLICIT:0C,"
- "FORMAT:ASCII,OCT:1.3.6.1.4.1.1466.20037\n";
- long errline = -1;
- char *genstr = NULL;
- int result = -1;
- ASN1_TYPE *atyp = NULL;
- BIO *ldapbio = BIO_new(BIO_s_mem());
- CONF *cnf = NCONF_new(NULL);
-
- if (ldapbio == NULL || cnf == NULL) {
- BIO_free(ldapbio);
- NCONF_free(cnf);
- goto end;
- }
- BIO_puts(ldapbio, ldap_tls_genconf);
- if (NCONF_load_bio(cnf, ldapbio, &errline) <= 0) {
- BIO_free(ldapbio);
- NCONF_free(cnf);
- if (errline <= 0) {
- BIO_printf(bio_err, "NCONF_load_bio failed\n");
- goto end;
- } else {
- BIO_printf(bio_err, "Error on line %ld\n", errline);
- goto end;
- }
- }
+ mbuf[mbuf_len] = '\0';
+ if (mbuf_len < 2) {
+ BIO_printf(bio_err, "STARTTLS failed: %s", mbuf);
+ goto shut;
+ }
+ /*
+ * According to RFC 5804 § 2.2, response codes are case-
+ * insensitive, make it uppercase but preserve the response.
+ */
+ strncpy(sbuf, mbuf, 2);
+ make_uppercase(sbuf);
+ if (!HAS_PREFIX(sbuf, "OK")) {
+ BIO_printf(bio_err, "STARTTLS not supported: %s", mbuf);
+ goto shut;
+ }
+ } break;
+ case PROTO_LDAP: {
+ /* StartTLS Operation according to RFC 4511 */
+ static char ldap_tls_genconf[] = "asn1=SEQUENCE:LDAPMessage\n"
+ "[LDAPMessage]\n"
+ "messageID=INTEGER:1\n"
+ "extendedReq=EXPLICIT:23A,IMPLICIT:0C,"
+ "FORMAT:ASCII,OCT:1.3.6.1.4.1.1466.20037\n";
+ long errline = -1;
+ char *genstr = NULL;
+ int result = -1;
+ ASN1_TYPE *atyp = NULL;
+ BIO *ldapbio = BIO_new(BIO_s_mem());
+ CONF *cnf = NCONF_new(NULL);
+
+ if (ldapbio == NULL || cnf == NULL) {
+ BIO_free(ldapbio);
+ NCONF_free(cnf);
+ goto end;
+ }
+ BIO_puts(ldapbio, ldap_tls_genconf);
+ if (NCONF_load_bio(cnf, ldapbio, &errline) <= 0) {
BIO_free(ldapbio);
- genstr = NCONF_get_string(cnf, "default", "asn1");
- if (genstr == NULL) {
- NCONF_free(cnf);
- BIO_printf(bio_err, "NCONF_get_string failed\n");
+ NCONF_free(cnf);
+ if (errline <= 0) {
+ BIO_printf(bio_err, "NCONF_load_bio failed\n");
goto end;
- }
- atyp = ASN1_generate_nconf(genstr, cnf);
- if (atyp == NULL) {
- NCONF_free(cnf);
- BIO_printf(bio_err, "ASN1_generate_nconf failed\n");
+ } else {
+ BIO_printf(bio_err, "Error on line %ld\n", errline);
goto end;
}
+ }
+ BIO_free(ldapbio);
+ genstr = NCONF_get_string(cnf, "default", "asn1");
+ if (genstr == NULL) {
+ NCONF_free(cnf);
+ BIO_printf(bio_err, "NCONF_get_string failed\n");
+ goto end;
+ }
+ atyp = ASN1_generate_nconf(genstr, cnf);
+ if (atyp == NULL) {
NCONF_free(cnf);
+ BIO_printf(bio_err, "ASN1_generate_nconf failed\n");
+ goto end;
+ }
+ NCONF_free(cnf);
- /* Send SSLRequest packet */
- BIO_write(sbio, atyp->value.sequence->data,
- atyp->value.sequence->length);
- (void)BIO_flush(sbio);
- ASN1_TYPE_free(atyp);
+ /* Send SSLRequest packet */
+ BIO_write(sbio, atyp->value.sequence->data,
+ atyp->value.sequence->length);
+ (void)BIO_flush(sbio);
+ ASN1_TYPE_free(atyp);
- mbuf_len = BIO_read(sbio, mbuf, BUFSIZZ);
- if (mbuf_len < 0) {
- BIO_printf(bio_err, "BIO_read failed\n");
- goto end;
- }
- result = ldap_ExtendedResponse_parse(mbuf, mbuf_len);
- if (result < 0) {
- BIO_printf(bio_err, "ldap_ExtendedResponse_parse failed\n");
- goto shut;
- } else if (result > 0) {
- BIO_printf(bio_err, "STARTTLS failed, LDAP Result Code: %i\n",
- result);
- goto shut;
- }
- mbuf_len = 0;
+ mbuf_len = BIO_read(sbio, mbuf, BUFSIZZ);
+ if (mbuf_len < 0) {
+ BIO_printf(bio_err, "BIO_read failed\n");
+ goto end;
}
- break;
+ result = ldap_ExtendedResponse_parse(mbuf, mbuf_len);
+ if (result < 0) {
+ BIO_printf(bio_err, "ldap_ExtendedResponse_parse failed\n");
+ goto shut;
+ } else if (result > 0) {
+ BIO_printf(bio_err, "STARTTLS failed, LDAP Result Code: %i\n",
+ result);
+ goto shut;
+ }
+ mbuf_len = 0;
+ } break;
}
if (early_data_file != NULL
- && ((SSL_get0_session(con) != NULL
- && SSL_SESSION_get_max_early_data(SSL_get0_session(con)) > 0)
- || (psksess != NULL
- && SSL_SESSION_get_max_early_data(psksess) > 0))) {
+ && ((SSL_get0_session(con) != NULL
+ && SSL_SESSION_get_max_early_data(SSL_get0_session(con)) > 0)
+ || (psksess != NULL
+ && SSL_SESSION_get_max_early_data(psksess) > 0))) {
BIO *edfile = BIO_new_file(early_data_file, "r");
size_t readbytes, writtenbytes;
int finish = 0;
@@ -2882,7 +2940,7 @@ int s_client_main(int argc, char **argv)
timeoutp = NULL;
if (!SSL_is_init_finished(con) && SSL_total_renegotiations(con) == 0
- && SSL_get_key_update_type(con) == SSL_KEY_UPDATE_NONE) {
+ && SSL_get_key_update_type(con) == SSL_KEY_UPDATE_NONE) {
in_init = 1;
tty_on = 0;
} else {
@@ -2908,7 +2966,7 @@ int s_client_main(int argc, char **argv)
if (reconnect) {
reconnect--;
BIO_printf(bio_c_out,
- "drop connection and then reconnect\n");
+ "drop connection and then reconnect\n");
do_ssl_shutdown(con);
SSL_set_connect_state(con);
BIO_closesocket(SSL_get_fd(con));
@@ -2938,8 +2996,8 @@ int s_client_main(int argc, char **argv)
break;
}
} while (!write_ssl
- && cbuf_len == 0
- && user_data_has_data(&user_data));
+ && cbuf_len == 0
+ && user_data_has_data(&user_data));
if (cbuf_len > 0) {
read_tty = 0;
timeout.tv_sec = 0;
@@ -2974,18 +3032,18 @@ int s_client_main(int argc, char **argv)
* the right thing.
*/
if ((!isquic && read_ssl)
- || (isquic && SSL_net_read_desired(con)))
+ || (isquic && SSL_net_read_desired(con)))
openssl_fdset(SSL_get_fd(con), &readfds);
if ((!isquic && write_ssl)
- || (isquic && (first_loop || SSL_net_write_desired(con))))
+ || (isquic && (first_loop || SSL_net_write_desired(con))))
openssl_fdset(SSL_get_fd(con), &writefds);
#else
if (!tty_on || !write_tty) {
if ((!isquic && read_ssl)
- || (isquic && SSL_net_read_desired(con)))
+ || (isquic && SSL_net_read_desired(con)))
openssl_fdset(SSL_get_fd(con), &readfds);
if ((!isquic && write_ssl)
- || (isquic && (first_loop || SSL_net_write_desired(con))))
+ || (isquic && (first_loop || SSL_net_write_desired(con))))
openssl_fdset(SSL_get_fd(con), &writefds);
}
#endif
@@ -3011,20 +3069,20 @@ int s_client_main(int argc, char **argv)
tv.tv_sec = 1;
tv.tv_usec = 0;
i = select(width, (void *)&readfds, (void *)&writefds,
- NULL, &tv);
+ NULL, &tv);
if (!i && (!has_stdin_waiting() || !read_tty))
continue;
} else
i = select(width, (void *)&readfds, (void *)&writefds,
- NULL, timeoutp);
+ NULL, timeoutp);
}
#else
i = select(width, (void *)&readfds, (void *)&writefds,
- NULL, timeoutp);
+ NULL, timeoutp);
#endif
if (i < 0) {
BIO_printf(bio_err, "bad select %d\n",
- get_last_socket_error());
+ get_last_socket_error());
goto shut;
}
}
@@ -3032,14 +3090,14 @@ int s_client_main(int argc, char **argv)
if (timeoutp != NULL) {
SSL_handle_events(con);
if (isdtls
- && !FD_ISSET(SSL_get_fd(con), &readfds)
- && !FD_ISSET(SSL_get_fd(con), &writefds))
+ && !FD_ISSET(SSL_get_fd(con), &readfds)
+ && !FD_ISSET(SSL_get_fd(con), &writefds))
BIO_printf(bio_err, "TIMEOUT occurred\n");
}
if (!ssl_pending
- && ((!isquic && FD_ISSET(SSL_get_fd(con), &writefds))
- || (isquic && (cbuf_len > 0 || first_loop)))) {
+ && ((!isquic && FD_ISSET(SSL_get_fd(con), &writefds))
+ || (isquic && (cbuf_len > 0 || first_loop)))) {
k = SSL_write(con, &(cbuf[cbuf_off]), (unsigned int)cbuf_len);
switch (SSL_get_error(con, k)) {
case SSL_ERROR_NONE:
@@ -3051,7 +3109,7 @@ int s_client_main(int argc, char **argv)
if (cbuf_len == 0) {
read_tty = 1;
write_ssl = 0;
- } else { /* if (cbuf_len > 0) */
+ } else { /* if (cbuf_len > 0) */
read_tty = 0;
write_ssl = 1;
@@ -3132,7 +3190,7 @@ int s_client_main(int argc, char **argv)
write_tty = 0;
}
} else if (ssl_pending
- || (!isquic && FD_ISSET(SSL_get_fd(con), &readfds))) {
+ || (!isquic && FD_ISSET(SSL_get_fd(con), &readfds))) {
k = SSL_read(con, sbuf, BUFSIZZ);
switch (SSL_get_error(con, k)) {
@@ -3239,7 +3297,7 @@ int s_client_main(int argc, char **argv)
first_loop = 0;
}
- shut:
+shut:
if (ret > 0)
ERR_print_errors(bio_err); /* show any errors accumulated so far */
if (in_init)
@@ -3263,15 +3321,15 @@ int s_client_main(int argc, char **argv)
* data. [In testing context this ensures that alerts are passed on...]
*/
timeout.tv_sec = 0;
- timeout.tv_usec = 500000; /* some extreme round-trip */
+ timeout.tv_usec = 500000; /* some extreme round-trip */
do {
FD_ZERO(&readfds);
openssl_fdset(sock, &readfds);
} while (select(sock + 1, &readfds, NULL, NULL, &timeout) > 0
- && BIO_read(sbio, sbuf, BUFSIZZ) > 0);
+ && BIO_read(sbio, sbuf, BUFSIZZ) > 0);
BIO_closesocket(SSL_get_fd(con));
- end:
+end:
if (ret > 0)
ERR_print_errors(bio_err); /* show any new or remaining errors */
if (con != NULL) {
@@ -3349,12 +3407,12 @@ static void print_cert_key_info(BIO *bio, X509 *cert)
curve = ec_curve_name(pkey);
if (curve != NULL)
BIO_printf(bio, " a:PKEY: %s, (%s); sigalg: %s\n",
- keyalg, curve,
- OBJ_nid2ln(X509_get_signature_nid(cert)));
+ keyalg, curve,
+ OBJ_nid2ln(X509_get_signature_nid(cert)));
else
BIO_printf(bio, " a:PKEY: %s, %d (bit); sigalg: %s\n",
- keyalg, EVP_PKEY_get_bits(pkey),
- OBJ_nid2ln(X509_get_signature_nid(cert)));
+ keyalg, EVP_PKEY_get_bits(pkey),
+ OBJ_nid2ln(X509_get_signature_nid(cert)));
OPENSSL_free(curve);
}
@@ -3458,7 +3516,7 @@ static void print_stuff(BIO *bio, SSL *s, int full)
SCT *sct = sk_SCT_value(scts, i);
BIO_printf(bio, "SCT validation status: %s\n",
- SCT_validation_status_string(sct));
+ SCT_validation_status_string(sct));
SCT_print(sct, bio, 0, log_store);
if (i < sct_count - 1)
BIO_printf(bio, "\n---\n");
@@ -3469,23 +3527,23 @@ static void print_stuff(BIO *bio, SSL *s, int full)
#endif
BIO_printf(bio,
- "---\nSSL handshake has read %ju bytes "
- "and written %ju bytes\n",
- BIO_number_read(SSL_get_rbio(s)),
- BIO_number_written(SSL_get_wbio(s)));
+ "---\nSSL handshake has read %ju bytes "
+ "and written %ju bytes\n",
+ BIO_number_read(SSL_get_rbio(s)),
+ BIO_number_written(SSL_get_wbio(s)));
}
print_verify_detail(s, bio);
BIO_printf(bio, (SSL_session_reused(s) ? "---\nReused, " : "---\nNew, "));
c = SSL_get_current_cipher(s);
BIO_printf(bio, "%s, Cipher is %s\n",
- SSL_CIPHER_get_version(c), SSL_CIPHER_get_name(c));
+ SSL_CIPHER_get_version(c), SSL_CIPHER_get_name(c));
BIO_printf(bio, "Protocol: %s\n", SSL_get_version(s));
if (peer != NULL) {
EVP_PKEY *pktmp;
pktmp = X509_get0_pubkey(peer);
BIO_printf(bio, "Server public key is %d bit\n",
- EVP_PKEY_get_bits(pktmp));
+ EVP_PKEY_get_bits(pktmp));
}
ssl_print_secure_renegotiation_notes(bio, s);
@@ -3494,9 +3552,9 @@ static void print_stuff(BIO *bio, SSL *s, int full)
comp = SSL_get_current_compression(s);
expansion = SSL_get_current_expansion(s);
BIO_printf(bio, "Compression: %s\n",
- comp ? SSL_COMP_get_name(comp) : "NONE");
+ comp ? SSL_COMP_get_name(comp) : "NONE");
BIO_printf(bio, "Expansion: %s\n",
- expansion ? SSL_COMP_get_name(expansion) : "NONE");
+ expansion ? SSL_COMP_get_name(expansion) : "NONE");
#endif
#ifndef OPENSSL_NO_KTLS
if (BIO_get_ktls_send(SSL_get_wbio(s)))
@@ -3514,7 +3572,7 @@ static void print_stuff(BIO *bio, SSL *s, int full)
if ((info.addr = BIO_ADDR_new()) != NULL
&& BIO_sock_info(sock, BIO_SOCK_INFO_ADDRESS, &info)) {
BIO_printf(bio_c_out, "LOCAL PORT is %u\n",
- ntohs(BIO_ADDR_rawport(info.addr)));
+ ntohs(BIO_ADDR_rawport(info.addr)));
}
BIO_ADDR_free(info.addr);
}
@@ -3543,12 +3601,11 @@ static void print_stuff(BIO *bio, SSL *s, int full)
#ifndef OPENSSL_NO_SRTP
{
- SRTP_PROTECTION_PROFILE *srtp_profile =
- SSL_get_selected_srtp_profile(s);
+ SRTP_PROTECTION_PROFILE *srtp_profile = SSL_get_selected_srtp_profile(s);
if (srtp_profile)
BIO_printf(bio, "SRTP Extension negotiated, profile=%s\n",
- srtp_profile->name);
+ srtp_profile->name);
}
#endif
@@ -3565,7 +3622,6 @@ static void print_stuff(BIO *bio, SSL *s, int full)
case SSL_EARLY_DATA_ACCEPTED:
BIO_printf(bio, "Early data was accepted\n");
break;
-
}
/*
@@ -3575,7 +3631,7 @@ static void print_stuff(BIO *bio, SSL *s, int full)
*/
verify_result = SSL_get_verify_result(s);
BIO_printf(bio, "Verify return code: %ld (%s)\n", verify_result,
- X509_verify_cert_error_string(verify_result));
+ X509_verify_cert_error_string(verify_result));
} else {
/* In TLSv1.3 we do this on arrival of a NewSessionTicket */
SSL_SESSION_print(bio, SSL_get_session(s));
@@ -3587,10 +3643,11 @@ static void print_stuff(BIO *bio, SSL *s, int full)
BIO_printf(bio, " Length: %i bytes\n", keymatexportlen);
exportedkeymat = app_malloc(keymatexportlen, "export key");
if (SSL_export_keying_material(s, exportedkeymat,
- keymatexportlen,
- keymatexportlabel,
- strlen(keymatexportlabel),
- NULL, 0, 0) <= 0) {
+ keymatexportlen,
+ keymatexportlabel,
+ strlen(keymatexportlabel),
+ NULL, 0, 0)
+ <= 0) {
BIO_printf(bio, " Error\n");
} else {
BIO_printf(bio, " Keying material: ");
@@ -3605,7 +3662,7 @@ static void print_stuff(BIO *bio, SSL *s, int full)
(void)BIO_flush(bio);
}
-# ifndef OPENSSL_NO_OCSP
+#ifndef OPENSSL_NO_OCSP
static int ocsp_resp_cb(SSL *s, void *arg)
{
int num, i;
@@ -3660,7 +3717,7 @@ static void print_ocsp_response(BIO *bp, OCSP_RESPONSE *rsp)
OCSP_RESPONSE_print(bp, rsp, 0);
BIO_puts(bp, "\n======================================\n");
}
-# endif
+#endif
static int ldap_ExtendedResponse_parse(const char *buf, long rem)
{
@@ -3700,18 +3757,16 @@ static int ldap_ExtendedResponse_parse(const char *buf, long rem)
/* pull SEQUENCE */
inf = ASN1_get_object(&cur, &len, &tag, &xclass, rem);
- if (inf != V_ASN1_CONSTRUCTED || tag != V_ASN1_SEQUENCE ||
- (rem = (long)(end - cur), len > rem)) {
+ if (inf != V_ASN1_CONSTRUCTED || tag != V_ASN1_SEQUENCE || (rem = (long)(end - cur), len > rem)) {
BIO_printf(bio_err, "Unexpected LDAP response\n");
goto end;
}
- rem = len; /* ensure that we don't overstep the SEQUENCE */
+ rem = len; /* ensure that we don't overstep the SEQUENCE */
/* pull MessageID */
inf = ASN1_get_object(&cur, &len, &tag, &xclass, rem);
- if (inf != V_ASN1_UNIVERSAL || tag != V_ASN1_INTEGER ||
- (rem = (long)(end - cur), len > rem)) {
+ if (inf != V_ASN1_UNIVERSAL || tag != V_ASN1_INTEGER || (rem = (long)(end - cur), len > rem)) {
BIO_printf(bio_err, "No MessageID\n");
goto end;
}
@@ -3721,8 +3776,7 @@ static int ldap_ExtendedResponse_parse(const char *buf, long rem)
/* pull [APPLICATION 24] */
rem = (long)(end - cur);
inf = ASN1_get_object(&cur, &len, &tag, &xclass, rem);
- if (inf != V_ASN1_CONSTRUCTED || xclass != V_ASN1_APPLICATION ||
- tag != 24) {
+ if (inf != V_ASN1_CONSTRUCTED || xclass != V_ASN1_APPLICATION || tag != 24) {
BIO_printf(bio_err, "Not ExtendedResponse\n");
goto end;
}
@@ -3730,8 +3784,7 @@ static int ldap_ExtendedResponse_parse(const char *buf, long rem)
/* pull resultCode */
rem = (long)(end - cur);
inf = ASN1_get_object(&cur, &len, &tag, &xclass, rem);
- if (inf != V_ASN1_UNIVERSAL || tag != V_ASN1_ENUMERATED || len == 0 ||
- (rem = (long)(end - cur), len > rem)) {
+ if (inf != V_ASN1_UNIVERSAL || tag != V_ASN1_ENUMERATED || len == 0 || (rem = (long)(end - cur), len > rem)) {
BIO_printf(bio_err, "Not LDAPResult\n");
goto end;
}
@@ -3742,7 +3795,7 @@ static int ldap_ExtendedResponse_parse(const char *buf, long rem)
ret |= cur[inf];
}
/* There is more data, but we don't care... */
- end:
+end:
return ret;
}
@@ -3813,7 +3866,7 @@ static int is_dNS_name(const char *host)
}
static void user_data_init(struct user_data_st *user_data, SSL *con, char *buf,
- size_t bufmax, int mode)
+ size_t bufmax, int mode)
{
user_data->con = con;
user_data->buf = buf;
@@ -3835,12 +3888,12 @@ static int user_data_add(struct user_data_st *user_data, size_t i)
return 1;
}
-#define USER_COMMAND_HELP 0
-#define USER_COMMAND_QUIT 1
-#define USER_COMMAND_RECONNECT 2
+#define USER_COMMAND_HELP 0
+#define USER_COMMAND_QUIT 1
+#define USER_COMMAND_RECONNECT 2
#define USER_COMMAND_RENEGOTIATE 3
-#define USER_COMMAND_KEY_UPDATE 4
-#define USER_COMMAND_FIN 5
+#define USER_COMMAND_KEY_UPDATE 4
+#define USER_COMMAND_FIN 5
static int user_data_execute(struct user_data_st *user_data, int cmd, char *arg)
{
@@ -3856,7 +3909,7 @@ static int user_data_execute(struct user_data_st *user_data, int cmd, char *arg)
BIO_printf(bio_err, " {reconnect}: Reconnect to the peer\n");
if (SSL_is_quic(user_data->con)) {
BIO_printf(bio_err, " {fin}: Send FIN on the stream. No further writing is possible\n");
- } else if(SSL_version(user_data->con) == TLS1_3_VERSION) {
+ } else if (SSL_version(user_data->con) == TLS1_3_VERSION) {
BIO_printf(bio_err, " {keyup:req|noreq}: Send a Key Update message\n");
BIO_printf(bio_err, " Arguments:\n");
BIO_printf(bio_err, " req = peer update requested (default)\n");
@@ -3885,19 +3938,19 @@ static int user_data_execute(struct user_data_st *user_data, int cmd, char *arg)
return USER_DATA_PROCESS_CONTINUE;
case USER_COMMAND_KEY_UPDATE: {
- int updatetype;
-
- if (OPENSSL_strcasecmp(arg, "req") == 0)
- updatetype = SSL_KEY_UPDATE_REQUESTED;
- else if (OPENSSL_strcasecmp(arg, "noreq") == 0)
- updatetype = SSL_KEY_UPDATE_NOT_REQUESTED;
- else
- return USER_DATA_PROCESS_BAD_ARGUMENT;
- BIO_printf(bio_err, "KEYUPDATE\n");
- if (!SSL_key_update(user_data->con, updatetype))
- break;
- return USER_DATA_PROCESS_CONTINUE;
- }
+ int updatetype;
+
+ if (OPENSSL_strcasecmp(arg, "req") == 0)
+ updatetype = SSL_KEY_UPDATE_REQUESTED;
+ else if (OPENSSL_strcasecmp(arg, "noreq") == 0)
+ updatetype = SSL_KEY_UPDATE_NOT_REQUESTED;
+ else
+ return USER_DATA_PROCESS_BAD_ARGUMENT;
+ BIO_printf(bio_err, "KEYUPDATE\n");
+ if (!SSL_key_update(user_data->con, updatetype))
+ break;
+ return USER_DATA_PROCESS_CONTINUE;
+ }
case USER_COMMAND_FIN:
if (!SSL_stream_conclude(user_data->con, 0))
@@ -3914,7 +3967,7 @@ static int user_data_execute(struct user_data_st *user_data, int cmd, char *arg)
}
static int user_data_process(struct user_data_st *user_data, size_t *len,
- size_t *off)
+ size_t *off)
{
char *buf_start = user_data->buf + user_data->bufoff;
size_t outlen = user_data->buflen;
@@ -3943,7 +3996,7 @@ static int user_data_process(struct user_data_st *user_data, size_t *len,
case 'k':
user_data->buflen = user_data->bufoff = *len = *off = 0;
return user_data_execute(user_data, USER_COMMAND_KEY_UPDATE,
- buf_start[0] == 'K' ? "req" : "noreq");
+ buf_start[0] == 'K' ? "req" : "noreq");
default:
break;
}
@@ -3976,8 +4029,8 @@ static int user_data_process(struct user_data_st *user_data, size_t *len,
/* Malformed command */
cmd_start[outlen - 1] = '\0';
BIO_printf(bio_err,
- "ERROR PROCESSING COMMAND. REST OF LINE IGNORED: %s\n",
- cmd_start);
+ "ERROR PROCESSING COMMAND. REST OF LINE IGNORED: %s\n",
+ cmd_start);
user_data->buflen = user_data->bufoff = *len = *off = 0;
return USER_DATA_PROCESS_NO_DATA;
}
@@ -4000,10 +4053,11 @@ static int user_data_process(struct user_data_st *user_data, size_t *len,
cmd = USER_COMMAND_QUIT;
} else if (OPENSSL_strcasecmp(cmd_start, "reconnect") == 0) {
cmd = USER_COMMAND_RECONNECT;
- } else if(SSL_is_quic(user_data->con)) {
+ } else if (SSL_is_quic(user_data->con)) {
if (OPENSSL_strcasecmp(cmd_start, "fin") == 0)
cmd = USER_COMMAND_FIN;
- } if (SSL_version(user_data->con) == TLS1_3_VERSION) {
+ }
+ if (SSL_version(user_data->con) == TLS1_3_VERSION) {
if (OPENSSL_strcasecmp(cmd_start, "keyup") == 0) {
cmd = USER_COMMAND_KEY_UPDATE;
if (arg_start == NULL)
@@ -4016,12 +4070,12 @@ static int user_data_process(struct user_data_st *user_data, size_t *len,
}
if (cmd == -1) {
BIO_printf(bio_err, "UNRECOGNISED COMMAND (IGNORED): %s\n",
- cmd_start);
+ cmd_start);
} else {
ret = user_data_execute(user_data, cmd, arg_start);
if (ret == USER_DATA_PROCESS_BAD_ARGUMENT) {
BIO_printf(bio_err, "BAD ARGUMENT (COMMAND IGNORED): %s\n",
- arg_start);
+ arg_start);
ret = USER_DATA_PROCESS_NO_DATA;
}
}
@@ -4029,8 +4083,8 @@ static int user_data_process(struct user_data_st *user_data, size_t *len,
user_data->bufoff = (cmd_end - user_data->buf) + 1;
user_data->buflen -= user_data->bufoff - oldoff;
if (user_data->buf + 1 == cmd_start
- && user_data->buflen == 1
- && user_data->buf[user_data->bufoff] == '\n') {
+ && user_data->buflen == 1
+ && user_data->buf[user_data->bufoff] == '\n') {
/*
* This command was the only thing on the whole line. We
* suppress the final `\n`
@@ -4072,4 +4126,4 @@ static int user_data_has_data(struct user_data_st *user_data)
{
return user_data->buflen > 0;
}
-#endif /* OPENSSL_NO_SOCK */
+#endif /* OPENSSL_NO_SOCK */
diff --git a/apps/s_server.c b/apps/s_server.c
index 12c5451ea5..dd5431ca30 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -17,7 +17,7 @@
#include <string.h>
#if defined(_WIN32)
/* Included before async.h to avoid some warnings */
-# include <windows.h>
+#include <windows.h>
#endif
#include <openssl/e_os2.h>
@@ -35,7 +35,7 @@
* needed to have fileno() declared correctly... So let's define u_int
*/
#if defined(OPENSSL_SYS_VMS_DECC) && !defined(__U_INT)
-# define __U_INT
+#define __U_INT
typedef unsigned int u_int;
#endif
@@ -48,13 +48,13 @@ typedef unsigned int u_int;
#include <openssl/rand.h>
#include <openssl/ocsp.h>
#ifndef OPENSSL_NO_DH
-# include <openssl/dh.h>
+#include <openssl/dh.h>
#endif
#include <openssl/rsa.h>
#include "s_apps.h"
#include "timeouts.h"
#ifdef CHARSET_EBCDIC
-# include <openssl/ebcdic.h>
+#include <openssl/ebcdic.h>
#endif
#include "internal/sockets.h"
#include "internal/statem.h"
@@ -67,7 +67,7 @@ static void close_accept_socket(void);
static int init_ssl_connection(SSL *s);
static void print_stats(BIO *bp, SSL_CTX *ctx);
static int generate_session_id(SSL *ssl, unsigned char *id,
- unsigned int *id_len);
+ unsigned int *id_len);
static void init_session_cache_ctx(SSL_CTX *sctx);
static void free_sessions(void);
static void print_connection_info(SSL *con);
@@ -75,8 +75,8 @@ static void print_connection_info(SSL *con);
static const int bufsize = 16 * 1024;
static int accept_socket = -1;
-#define TEST_CERT "server.pem"
-#define TEST_CERT2 "server2.pem"
+#define TEST_CERT "server.pem"
+#define TEST_CERT2 "server2.pem"
static int s_nbio = 0;
static int s_nbio_test = 0;
@@ -123,14 +123,14 @@ static int early_data = 0;
static SSL_SESSION *psksess = NULL;
static char *psk_identity = "Client_identity";
-char *psk_key = NULL; /* by default PSK is not used */
+char *psk_key = NULL; /* by default PSK is not used */
static char http_server_binmode = 0; /* for now: 0/1 = default/binary */
#ifndef OPENSSL_NO_PSK
static unsigned int psk_server_cb(SSL *ssl, const char *identity,
- unsigned char *psk,
- unsigned int max_psk_len)
+ unsigned char *psk,
+ unsigned int max_psk_len)
{
long key_len = 0;
unsigned char *key;
@@ -154,28 +154,29 @@ static unsigned int psk_server_cb(SSL *ssl, const char *identity,
}
if (s_debug)
BIO_printf(bio_s_out, "identity_len=%d identity=%s\n",
- (int)strlen(identity), identity);
+ (int)strlen(identity), identity);
/* here we could lookup the given identity e.g. from a database */
if (strcmp(identity, psk_identity) != 0) {
BIO_printf(bio_s_out, "PSK warning: client identity not what we expected"
- " (got '%s' expected '%s')\n", identity, psk_identity);
+ " (got '%s' expected '%s')\n",
+ identity, psk_identity);
} else {
- if (s_debug)
- BIO_printf(bio_s_out, "PSK client identity found\n");
+ if (s_debug)
+ BIO_printf(bio_s_out, "PSK client identity found\n");
}
/* convert the PSK key to binary */
key = OPENSSL_hexstr2buf(psk_key, &key_len);
if (key == NULL) {
BIO_printf(bio_err, "Could not convert PSK key '%s' to buffer\n",
- psk_key);
+ psk_key);
return 0;
}
if (key_len > (int)max_psk_len) {
BIO_printf(bio_err,
- "psk buffer of callback is too small (%d) for key (%ld)\n",
- max_psk_len, key_len);
+ "psk buffer of callback is too small (%d) for key (%ld)\n",
+ max_psk_len, key_len);
OPENSSL_free(key);
return 0;
}
@@ -186,7 +187,7 @@ static unsigned int psk_server_cb(SSL *ssl, const char *identity,
if (s_debug)
BIO_printf(bio_s_out, "fetched PSK len=%ld\n", key_len);
return key_len;
- out_err:
+out_err:
if (s_debug)
BIO_printf(bio_err, "Error in PSK server callback\n");
(void)BIO_flush(bio_err);
@@ -196,7 +197,7 @@ static unsigned int psk_server_cb(SSL *ssl, const char *identity,
#endif
static int psk_find_session_cb(SSL *ssl, const unsigned char *identity,
- size_t identity_len, SSL_SESSION **sess)
+ size_t identity_len, SSL_SESSION **sess)
{
SSL_SESSION *tmpsess = NULL;
unsigned char *key;
@@ -204,7 +205,7 @@ static int psk_find_session_cb(SSL *ssl, const unsigned char *identity,
const SSL_CIPHER *cipher = NULL;
if (strlen(psk_identity) != identity_len
- || memcmp(psk_identity, identity, identity_len) != 0) {
+ || memcmp(psk_identity, identity, identity_len) != 0) {
*sess = NULL;
return 1;
}
@@ -220,7 +221,7 @@ static int psk_find_session_cb(SSL *ssl, const unsigned char *identity,
key = OPENSSL_hexstr2buf(psk_key, &key_len);
if (key == NULL) {
BIO_printf(bio_err, "Could not convert PSK key '%s' to buffer\n",
- psk_key);
+ psk_key);
return 0;
}
@@ -234,9 +235,9 @@ static int psk_find_session_cb(SSL *ssl, const unsigned char *identity,
tmpsess = SSL_SESSION_new();
if (tmpsess == NULL
- || !SSL_SESSION_set1_master_key(tmpsess, key, key_len)
- || !SSL_SESSION_set_cipher(tmpsess, cipher)
- || !SSL_SESSION_set_protocol_version(tmpsess, SSL_version(ssl))) {
+ || !SSL_SESSION_set1_master_key(tmpsess, key, key_len)
+ || !SSL_SESSION_set_cipher(tmpsess, cipher)
+ || !SSL_SESSION_set_protocol_version(tmpsess, SSL_version(ssl))) {
OPENSSL_free(key);
SSL_SESSION_free(tmpsess);
return 0;
@@ -263,7 +264,7 @@ static long ebcdic_ctrl(BIO *b, int cmd, long num, void *ptr);
static int ebcdic_gets(BIO *bp, char *buf, int size);
static int ebcdic_puts(BIO *bp, const char *str);
-# define BIO_TYPE_EBCDIC_FILTER (18|0x0200)
+#define BIO_TYPE_EBCDIC_FILTER (18 | 0x0200)
static BIO_METHOD *methods_ebcdic = NULL;
/* This struct is "unwarranted chumminess with the compiler." */
@@ -276,7 +277,7 @@ static const BIO_METHOD *BIO_f_ebcdic_filter(void)
{
if (methods_ebcdic == NULL) {
methods_ebcdic = BIO_meth_new(BIO_TYPE_EBCDIC_FILTER,
- "EBCDIC/ASCII filter");
+ "EBCDIC/ASCII filter");
if (methods_ebcdic == NULL
|| !BIO_meth_set_write(methods_ebcdic, ebcdic_write)
|| !BIO_meth_set_read(methods_ebcdic, ebcdic_read)
@@ -345,10 +346,10 @@ static int ebcdic_write(BIO *b, const char *in, int inl)
if (next == NULL)
return 0;
- wbuf = (EBCDIC_OUTBUFF *) BIO_get_data(b);
+ wbuf = (EBCDIC_OUTBUFF *)BIO_get_data(b);
if (inl > (num = wbuf->alloced)) {
- num = num + num; /* double the size */
+ num = num + num; /* double the size */
if (num < inl)
num = inl;
OPENSSL_free(wbuf);
@@ -392,7 +393,7 @@ static int ebcdic_gets(BIO *bp, char *buf, int size)
if (next == NULL)
return 0;
-/* return(BIO_gets(bp->next_bio,buf,size));*/
+ /* return(BIO_gets(bp->next_bio,buf,size));*/
for (i = 0; i < size - 1; ++i) {
ret = ebcdic_read(bp, &buf[i], 1);
if (ret <= 0)
@@ -424,7 +425,7 @@ typedef struct tlsextctx_st {
static int ssl_servername_cb(SSL *s, int *ad, void *arg)
{
- tlsextctx *p = (tlsextctx *) arg;
+ tlsextctx *p = (tlsextctx *)arg;
const char *servername = SSL_get_servername(s, TLSEXT_NAMETYPE_host_name);
if (servername != NULL && p->biodebug != NULL) {
@@ -434,7 +435,7 @@ static int ssl_servername_cb(SSL *s, int *ad, void *arg)
BIO_printf(p->biodebug, "Hostname in TLS extension: \"");
while ((uc = *cp++) != 0)
BIO_printf(p->biodebug,
- (((uc) & ~127) == 0) && isprint(uc) ? "%c" : "\\x%02x", uc);
+ (((uc) & ~127) == 0) && isprint(uc) ? "%c" : "\\x%02x", uc);
BIO_printf(p->biodebug, "\"\n");
}
@@ -480,8 +481,8 @@ static tlsextstatusctx tlscstatp = { -1, NULL };
* them until they were considered "expired".
*/
static int get_ocsp_resp_from_responder_single(SSL *s, X509 *x,
- tlsextstatusctx *srctx,
- OCSP_RESPONSE **resp)
+ tlsextstatusctx *srctx,
+ OCSP_RESPONSE **resp)
{
char *host = NULL, *port = NULL, *path = NULL;
char *proxy = NULL, *no_proxy = NULL;
@@ -504,17 +505,17 @@ static int get_ocsp_resp_from_responder_single(SSL *s, X509 *x,
aia = X509_get1_ocsp(x);
if (aia != NULL) {
if (!OSSL_HTTP_parse_url(sk_OPENSSL_STRING_value(aia, 0), &use_ssl,
- NULL, &host, &port, NULL, &path, NULL, NULL)) {
+ NULL, &host, &port, NULL, &path, NULL, NULL)) {
BIO_puts(bio_err, "cert_status: can't parse AIA URL\n");
goto err;
}
if (srctx->verbose)
BIO_printf(bio_err, "cert_status: AIA URL: %s\n",
- sk_OPENSSL_STRING_value(aia, 0));
+ sk_OPENSSL_STRING_value(aia, 0));
} else {
if (srctx->host == NULL) {
BIO_puts(bio_err,
- "cert_status: no AIA and no default responder URL\n");
+ "cert_status: no AIA and no default responder URL\n");
goto done;
}
host = srctx->host;
@@ -542,7 +543,7 @@ static int get_ocsp_resp_from_responder_single(SSL *s, X509 *x,
if (inctx == NULL)
goto err;
if (!X509_STORE_CTX_init(inctx, SSL_CTX_get_cert_store(ssl_ctx),
- NULL, NULL))
+ NULL, NULL))
goto err;
obj = X509_STORE_CTX_get_obj_by_subject(inctx, X509_LU_X509, iname);
if (obj == NULL) {
@@ -569,7 +570,7 @@ static int get_ocsp_resp_from_responder_single(SSL *s, X509 *x,
goto err;
}
*resp = process_responder(req, host, port, path, proxy, no_proxy,
- use_ssl, NULL /* headers */, srctx->timeout);
+ use_ssl, NULL /* headers */, srctx->timeout);
if (*resp == NULL) {
BIO_puts(bio_err, "cert_status: error querying responder\n");
goto done;
@@ -578,9 +579,9 @@ static int get_ocsp_resp_from_responder_single(SSL *s, X509 *x,
ret = SSL_TLSEXT_ERR_OK;
goto done;
- err:
+err:
ret = SSL_TLSEXT_ERR_ALERT_FATAL;
- done:
+done:
/*
* If we parsed aia we need to free; otherwise they were copied and we
* don't
@@ -598,8 +599,8 @@ static int get_ocsp_resp_from_responder_single(SSL *s, X509 *x,
}
static int bring_ocsp_resp_in_correct_order(SSL *s, tlsextstatusctx *srctx,
- STACK_OF(OCSP_RESPONSE) *sk_resp_unordered,
- STACK_OF(OCSP_RESPONSE) **sk_resp)
+ STACK_OF(OCSP_RESPONSE) *sk_resp_unordered,
+ STACK_OF(OCSP_RESPONSE) **sk_resp)
{
STACK_OF(X509) *server_chain = NULL;
X509 *ssl_cert = NULL;
@@ -617,8 +618,7 @@ static int bring_ocsp_resp_in_correct_order(SSL *s, tlsextstatusctx *srctx,
/*
* TODO(DTLS-1.3): in future DTLS should also be considered
*/
- if (server_chain != NULL && srctx->status_all &&
- !SSL_is_dtls(s) && SSL_version(s) >= TLS1_3_VERSION) {
+ if (server_chain != NULL && srctx->status_all && !SSL_is_dtls(s) && SSL_version(s) >= TLS1_3_VERSION) {
/* certificate chain is available */
num = sk_X509_num(server_chain) + 1;
}
@@ -696,7 +696,7 @@ static int bring_ocsp_resp_in_correct_order(SSL *s, tlsextstatusctx *srctx,
* In case of a missing entry, the respective list element will be NULL.
*/
static int get_ocsp_resp_from_files(SSL *s, tlsextstatusctx *srctx,
- STACK_OF(OCSP_RESPONSE) **sk_resp)
+ STACK_OF(OCSP_RESPONSE) **sk_resp)
{
STACK_OF(OCSP_RESPONSE) *sk_resp_unordered = NULL;
char *respfile = NULL;
@@ -729,7 +729,7 @@ static int get_ocsp_resp_from_files(SSL *s, tlsextstatusctx *srctx,
BIO_free(derbio);
if (resp == NULL) {
BIO_printf(bio_err, "cert_status: Error reading OCSP response from file %s\n",
- respfile);
+ respfile);
ret = SSL_TLSEXT_ERR_ALERT_FATAL;
goto err;
}
@@ -759,7 +759,7 @@ err:
* OCSP queries by caching responses until they were considered "expired".
*/
static int get_ocsp_resp_from_responder(SSL *s, tlsextstatusctx *srctx,
- STACK_OF(OCSP_RESPONSE) **sk_resp)
+ STACK_OF(OCSP_RESPONSE) **sk_resp)
{
X509 *ssl_cert = NULL;
int i, num = 0;
@@ -776,8 +776,7 @@ static int get_ocsp_resp_from_responder(SSL *s, tlsextstatusctx *srctx,
/*
* TODO(DTLS-1.3): in future DTLS should also be considered
*/
- if (server_chain != NULL && srctx->status_all &&
- !SSL_is_dtls(s) && SSL_version(s) >= TLS1_3_VERSION) {
+ if (server_chain != NULL && srctx->status_all && !SSL_is_dtls(s) && SSL_version(s) >= TLS1_3_VERSION) {
/* certificate chain is available */
num = sk_X509_num(server_chain) + 1;
} else {
@@ -850,20 +849,20 @@ static int cert_status_cb(SSL *s, void *arg)
if (srctx->verbose) {
BIO_puts(bio_err, "cert_status: ocsp response sent:\n");
BIO_printf(bio_err, "cert_status: number of responses: %d\n",
- sk_OCSP_RESPONSE_num(sk_resp));
+ sk_OCSP_RESPONSE_num(sk_resp));
for (i = 0; i < sk_OCSP_RESPONSE_num(sk_resp); i++) {
resp = sk_OCSP_RESPONSE_value(sk_resp, i);
if (resp != NULL)
OCSP_RESPONSE_print(bio_err, resp, 2);
else
BIO_printf(bio_err,
- "cert_status: no ocsp response for certificate with index %d\n", i);
+ "cert_status: no ocsp response for certificate with index %d\n", i);
}
}
ret = SSL_TLSEXT_ERR_OK;
- err:
+err:
if (ret != SSL_TLSEXT_ERR_OK) {
ERR_print_errors(bio_err);
sk_OCSP_RESPONSE_pop_free(sk_resp, OCSP_RESPONSE_free);
@@ -881,7 +880,7 @@ typedef struct tlsextnextprotoctx_st {
} tlsextnextprotoctx;
static int next_proto_cb(SSL *s, const unsigned char **data,
- unsigned int *len, void *arg)
+ unsigned int *len, void *arg)
{
tlsextnextprotoctx *next_proto = arg;
@@ -890,7 +889,7 @@ static int next_proto_cb(SSL *s, const unsigned char **data,
return SSL_TLSEXT_ERR_OK;
}
-#endif /* ndef OPENSSL_NO_NEXTPROTONEG */
+#endif /* ndef OPENSSL_NO_NEXTPROTONEG */
/* This the context that we pass to alpn_cb */
typedef struct tlsextalpnctx_st {
@@ -899,7 +898,7 @@ typedef struct tlsextalpnctx_st {
} tlsextalpnctx;
static int alpn_cb(SSL *s, const unsigned char **out, unsigned char *outlen,
- const unsigned char *in, unsigned int inlen, void *arg)
+ const unsigned char *in, unsigned int inlen, void *arg)
{
tlsextalpnctx *alpn_ctx = arg;
@@ -917,9 +916,9 @@ static int alpn_cb(SSL *s, const unsigned char **out, unsigned char *outlen,
BIO_write(bio_s_out, "\n", 1);
}
- if (SSL_select_next_proto
- ((unsigned char **)out, outlen, alpn_ctx->data,
- (unsigned int)alpn_ctx->len, in, inlen) != OPENSSL_NPN_NEGOTIATED)
+ if (SSL_select_next_proto((unsigned char **)out, outlen, alpn_ctx->data,
+ (unsigned int)alpn_ctx->len, in, inlen)
+ != OPENSSL_NPN_NEGOTIATED)
return SSL_TLSEXT_ERR_ALERT_FATAL;
if (!s_quiet) {
@@ -939,36 +938,132 @@ static int not_resumable_sess_cb(SSL *s, int is_forward_secure)
typedef enum OPTION_choice {
OPT_COMMON,
- OPT_4, OPT_6, OPT_ACCEPT, OPT_PORT, OPT_UNIX, OPT_UNLINK, OPT_NACCEPT,
- OPT_VERIFY, OPT_NAMEOPT, OPT_UPPER_V_VERIFY, OPT_CONTEXT, OPT_CERT, OPT_CRL,
- OPT_CRL_DOWNLOAD, OPT_SERVERINFO, OPT_CERTFORM, OPT_KEY, OPT_KEYFORM,
- OPT_PASS, OPT_CERT_CHAIN, OPT_DHPARAM, OPT_DCERTFORM, OPT_DCERT,
- OPT_DKEYFORM, OPT_DPASS, OPT_DKEY, OPT_DCERT_CHAIN, OPT_NOCERT,
- OPT_CAPATH, OPT_NOCAPATH, OPT_CHAINCAPATH, OPT_VERIFYCAPATH, OPT_NO_CACHE,
- OPT_EXT_CACHE, OPT_CRLFORM, OPT_VERIFY_RET_ERROR, OPT_VERIFY_QUIET,
- OPT_BUILD_CHAIN, OPT_CAFILE, OPT_NOCAFILE, OPT_CHAINCAFILE,
+ OPT_4,
+ OPT_6,
+ OPT_ACCEPT,
+ OPT_PORT,
+ OPT_UNIX,
+ OPT_UNLINK,
+ OPT_NACCEPT,
+ OPT_VERIFY,
+ OPT_NAMEOPT,
+ OPT_UPPER_V_VERIFY,
+ OPT_CONTEXT,
+ OPT_CERT,
+ OPT_CRL,
+ OPT_CRL_DOWNLOAD,
+ OPT_SERVERINFO,
+ OPT_CERTFORM,
+ OPT_KEY,
+ OPT_KEYFORM,
+ OPT_PASS,
+ OPT_CERT_CHAIN,
+ OPT_DHPARAM,
+ OPT_DCERTFORM,
+ OPT_DCERT,
+ OPT_DKEYFORM,
+ OPT_DPASS,
+ OPT_DKEY,
+ OPT_DCERT_CHAIN,
+ OPT_NOCERT,
+ OPT_CAPATH,
+ OPT_NOCAPATH,
+ OPT_CHAINCAPATH,
+ OPT_VERIFYCAPATH,
+ OPT_NO_CACHE,
+ OPT_EXT_CACHE,
+ OPT_CRLFORM,
+ OPT_VERIFY_RET_ERROR,
+ OPT_VERIFY_QUIET,
+ OPT_BUILD_CHAIN,
+ OPT_CAFILE,
+ OPT_NOCAFILE,
+ OPT_CHAINCAFILE,
OPT_VERIFYCAFILE,
- OPT_CASTORE, OPT_NOCASTORE, OPT_CHAINCASTORE, OPT_VERIFYCASTORE,
- OPT_NBIO, OPT_NBIO_TEST, OPT_IGN_EOF, OPT_NO_IGN_EOF,
- OPT_DEBUG, OPT_TLSEXTDEBUG, OPT_STATUS, OPT_STATUS_ALL,
- OPT_STATUS_VERBOSE, OPT_STATUS_TIMEOUT, OPT_PROXY, OPT_NO_PROXY,
- OPT_STATUS_URL, OPT_STATUS_FILE, OPT_MSG, OPT_MSGFILE,
- OPT_TRACE, OPT_SECURITY_DEBUG, OPT_SECURITY_DEBUG_VERBOSE, OPT_STATE,
- OPT_CRLF, OPT_QUIET, OPT_BRIEF, OPT_NO_DHE,
- OPT_NO_RESUME_EPHEMERAL, OPT_PSK_IDENTITY, OPT_PSK_HINT, OPT_PSK,
- OPT_PSK_SESS, OPT_SRPVFILE, OPT_SRPUSERSEED, OPT_REV, OPT_WWW,
- OPT_UPPER_WWW, OPT_HTTP, OPT_ASYNC, OPT_SSL_CONFIG,
- OPT_MAX_SEND_FRAG, OPT_SPLIT_SEND_FRAG, OPT_MAX_PIPELINES, OPT_READ_BUF,
- OPT_SSL3, OPT_TLS1_3, OPT_TLS1_2, OPT_TLS1_1, OPT_TLS1, OPT_DTLS, OPT_DTLS1,
- OPT_DTLS1_2, OPT_SCTP, OPT_TIMEOUT, OPT_MTU, OPT_LISTEN, OPT_STATELESS,
- OPT_ID_PREFIX, OPT_SERVERNAME, OPT_SERVERNAME_FATAL,
- OPT_CERT2, OPT_KEY2, OPT_NEXTPROTONEG, OPT_ALPN, OPT_SENDFILE,
- OPT_SRTP_PROFILES, OPT_KEYMATEXPORT, OPT_KEYMATEXPORTLEN,
- OPT_KEYLOG_FILE, OPT_MAX_EARLY, OPT_RECV_MAX_EARLY, OPT_EARLY_DATA,
- OPT_S_NUM_TICKETS, OPT_ANTI_REPLAY, OPT_NO_ANTI_REPLAY, OPT_SCTP_LABEL_BUG,
- OPT_HTTP_SERVER_BINMODE, OPT_NOCANAMES, OPT_IGNORE_UNEXPECTED_EOF, OPT_KTLS,
+ OPT_CASTORE,
+ OPT_NOCASTORE,
+ OPT_CHAINCASTORE,
+ OPT_VERIFYCASTORE,
+ OPT_NBIO,
+ OPT_NBIO_TEST,
+ OPT_IGN_EOF,
+ OPT_NO_IGN_EOF,
+ OPT_DEBUG,
+ OPT_TLSEXTDEBUG,
+ OPT_STATUS,
+ OPT_STATUS_ALL,
+ OPT_STATUS_VERBOSE,
+ OPT_STATUS_TIMEOUT,
+ OPT_PROXY,
+ OPT_NO_PROXY,
+ OPT_STATUS_URL,
+ OPT_STATUS_FILE,
+ OPT_MSG,
+ OPT_MSGFILE,
+ OPT_TRACE,
+ OPT_SECURITY_DEBUG,
+ OPT_SECURITY_DEBUG_VERBOSE,
+ OPT_STATE,
+ OPT_CRLF,
+ OPT_QUIET,
+ OPT_BRIEF,
+ OPT_NO_DHE,
+ OPT_NO_RESUME_EPHEMERAL,
+ OPT_PSK_IDENTITY,
+ OPT_PSK_HINT,
+ OPT_PSK,
+ OPT_PSK_SESS,
+ OPT_SRPVFILE,
+ OPT_SRPUSERSEED,
+ OPT_REV,
+ OPT_WWW,
+ OPT_UPPER_WWW,
+ OPT_HTTP,
+ OPT_ASYNC,
+ OPT_SSL_CONFIG,
+ OPT_MAX_SEND_FRAG,
+ OPT_SPLIT_SEND_FRAG,
+ OPT_MAX_PIPELINES,
+ OPT_READ_BUF,
+ OPT_SSL3,
+ OPT_TLS1_3,
+ OPT_TLS1_2,
+ OPT_TLS1_1,
+ OPT_TLS1,
+ OPT_DTLS,
+ OPT_DTLS1,
+ OPT_DTLS1_2,
+ OPT_SCTP,
+ OPT_TIMEOUT,
+ OPT_MTU,
+ OPT_LISTEN,
+ OPT_STATELESS,
+ OPT_ID_PREFIX,
+ OPT_SERVERNAME,
+ OPT_SERVERNAME_FATAL,
+ OPT_CERT2,
+ OPT_KEY2,
+ OPT_NEXTPROTONEG,
+ OPT_ALPN,
+ OPT_SENDFILE,
+ OPT_SRTP_PROFILES,
+ OPT_KEYMATEXPORT,
+ OPT_KEYMATEXPORTLEN,
+ OPT_KEYLOG_FILE,
+ OPT_MAX_EARLY,
+ OPT_RECV_MAX_EARLY,
+ OPT_EARLY_DATA,
+ OPT_S_NUM_TICKETS,
+ OPT_ANTI_REPLAY,
+ OPT_NO_ANTI_REPLAY,
+ OPT_SCTP_LABEL_BUG,
+ OPT_HTTP_SERVER_BINMODE,
+ OPT_NOCANAMES,
+ OPT_IGNORE_UNEXPECTED_EOF,
+ OPT_KTLS,
OPT_USE_ZC_SENDFILE,
- OPT_TFO, OPT_CERT_COMP,
+ OPT_TFO,
+ OPT_CERT_COMP,
OPT_ENABLE_SERVER_RPK,
OPT_ENABLE_CLIENT_RPK,
OPT_R_ENUM,
@@ -980,260 +1075,260 @@ typedef enum OPTION_choice {
const OPTIONS s_server_options[] = {
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
- {"ssl_config", OPT_SSL_CONFIG, 's',
- "Configure SSL_CTX using the given configuration value"},
+ { "help", OPT_HELP, '-', "Display this summary" },
+ { "ssl_config", OPT_SSL_CONFIG, 's',
+ "Configure SSL_CTX using the given configuration value" },
#ifndef OPENSSL_NO_SSL_TRACE
- {"trace", OPT_TRACE, '-', "trace protocol messages"},
+ { "trace", OPT_TRACE, '-', "trace protocol messages" },
#endif
OPT_SECTION("Network"),
- {"port", OPT_PORT, 'p',
- "TCP/IP port to listen on for connections (default is " PORT ")"},
- {"accept", OPT_ACCEPT, 's',
- "TCP/IP optional host and port to listen on for connections (default is *:" PORT ")"},
+ { "port", OPT_PORT, 'p',
+ "TCP/IP port to listen on for connections (default is " PORT ")" },
+ { "accept", OPT_ACCEPT, 's',
+ "TCP/IP optional host and port to listen on for connections (default is *:" PORT ")" },
#ifdef AF_UNIX
- {"unix", OPT_UNIX, 's', "Unix domain socket to accept on"},
- {"unlink", OPT_UNLINK, '-', "For -unix, unlink existing socket first"},
+ { "unix", OPT_UNIX, 's', "Unix domain socket to accept on" },
+ { "unlink", OPT_UNLINK, '-', "For -unix, unlink existing socket first" },
#endif
- {"4", OPT_4, '-', "Use IPv4 only"},
- {"6", OPT_6, '-', "Use IPv6 only"},
+ { "4", OPT_4, '-', "Use IPv4 only" },
+ { "6", OPT_6, '-', "Use IPv6 only" },
#if defined(TCP_FASTOPEN) && !defined(OPENSSL_NO_TFO)
- {"tfo", OPT_TFO, '-', "Listen for TCP Fast Open connections"},
+ { "tfo", OPT_TFO, '-', "Listen for TCP Fast Open connections" },
#endif
OPT_SECTION("Identity"),
- {"context", OPT_CONTEXT, 's', "Set session ID context"},
- {"CAfile", OPT_CAFILE, '<', "PEM format file of CA's"},
- {"CApath", OPT_CAPATH, '/', "PEM format directory of CA's"},
- {"CAstore", OPT_CASTORE, ':', "URI to store of CA's"},
- {"no-CAfile", OPT_NOCAFILE, '-',
- "Do not load the default certificates file"},
- {"no-CApath", OPT_NOCAPATH, '-',
- "Do not load certificates from the default certificates directory"},
- {"no-CAstore", OPT_NOCASTORE, '-',
- "Do not load certificates from the default certificates store URI"},
- {"nocert", OPT_NOCERT, '-', "Don't use any certificates (Anon-DH)"},
- {"verify", OPT_VERIFY, 'n', "Turn on peer certificate verification"},
- {"Verify", OPT_UPPER_V_VERIFY, 'n',
- "Turn on peer certificate verification, must have a cert"},
- {"nameopt", OPT_NAMEOPT, 's', "Certificate subject/issuer name printing options"},
- {"cert", OPT_CERT, '<', "Server certificate file to use; default " TEST_CERT},
- {"cert2", OPT_CERT2, '<',
- "Certificate file to use for servername; default " TEST_CERT2},
- {"certform", OPT_CERTFORM, 'F',
- "Server certificate file format (PEM/DER/P12); has no effect"},
- {"cert_chain", OPT_CERT_CHAIN, '<',
- "Server certificate chain file in PEM format"},
- {"build_chain", OPT_BUILD_CHAIN, '-', "Build server certificate chain"},
- {"serverinfo", OPT_SERVERINFO, 's',
- "PEM serverinfo file for certificate"},
- {"key", OPT_KEY, 's',
- "Private key file to use; default is -cert file or else" TEST_CERT},
- {"key2", OPT_KEY2, '<',
- "-Private Key file to use for servername if not in -cert2"},
- {"keyform", OPT_KEYFORM, 'f', "Key format (DER/PEM)"},
- {"pass", OPT_PASS, 's', "Private key and cert file pass phrase source"},
- {"dcert", OPT_DCERT, '<',
- "Second server certificate file to use (usually for DSA)"},
- {"dcertform", OPT_DCERTFORM, 'F',
- "Second server certificate file format (PEM/DER/P12); has no effect"},
- {"dcert_chain", OPT_DCERT_CHAIN, '<',
- "second server certificate chain file in PEM format"},
- {"dkey", OPT_DKEY, '<',
- "Second private key file to use (usually for DSA)"},
- {"dkeyform", OPT_DKEYFORM, 'f', "Second key file format (DER/PEM)"},
- {"dpass", OPT_DPASS, 's',
- "Second private key and cert file pass phrase source"},
- {"dhparam", OPT_DHPARAM, '<', "DH parameters file to use"},
- {"servername", OPT_SERVERNAME, 's',
- "Servername for HostName TLS extension"},
- {"servername_fatal", OPT_SERVERNAME_FATAL, '-',
- "On servername mismatch send fatal alert (default warning alert)"},
- {"nbio_test", OPT_NBIO_TEST, '-', "Test with the non-blocking test bio"},
- {"crlf", OPT_CRLF, '-', "Convert LF from terminal into CRLF"},
- {"quiet", OPT_QUIET, '-', "No server output"},
- {"no_resume_ephemeral", OPT_NO_RESUME_EPHEMERAL, '-',
- "Disable caching and tickets if ephemeral (EC)DH is used"},
- {"www", OPT_WWW, '-', "Respond to a 'GET /' with a status page"},
- {"WWW", OPT_UPPER_WWW, '-', "Respond to a 'GET with the file ./path"},
- {"ignore_unexpected_eof", OPT_IGNORE_UNEXPECTED_EOF, '-',
- "Do not treat lack of close_notify from a peer as an error"},
- {"tlsextdebug", OPT_TLSEXTDEBUG, '-',
- "Hex dump of all TLS extensions received"},
- {"HTTP", OPT_HTTP, '-', "Like -WWW but ./path includes HTTP headers"},
- {"id_prefix", OPT_ID_PREFIX, 's',
- "Generate SSL/TLS session IDs prefixed by arg"},
- {"keymatexport", OPT_KEYMATEXPORT, 's',
- "Export keying material using label"},
- {"keymatexportlen", OPT_KEYMATEXPORTLEN, 'p',
- "Export len bytes of keying material; default 20"},
- {"CRL", OPT_CRL, '<', "CRL file to use"},
- {"CRLform", OPT_CRLFORM, 'F', "CRL file format (PEM or DER); default PEM"},
- {"crl_download", OPT_CRL_DOWNLOAD, '-',
- "Download CRLs from distribution points in certificate CDP entries"},
- {"chainCAfile", OPT_CHAINCAFILE, '<',
- "CA file for certificate chain (PEM format)"},
- {"chainCApath", OPT_CHAINCAPATH, '/',
- "use dir as certificate store path to build CA certificate chain"},
- {"chainCAstore", OPT_CHAINCASTORE, ':',
- "use URI as certificate store to build CA certificate chain"},
- {"verifyCAfile", OPT_VERIFYCAFILE, '<',
- "CA file for certificate verification (PEM format)"},
- {"verifyCApath", OPT_VERIFYCAPATH, '/',
- "use dir as certificate store path to verify CA certificate"},
- {"verifyCAstore", OPT_VERIFYCASTORE, ':',
- "use URI as certificate store to verify CA certificate"},
- {"no_cache", OPT_NO_CACHE, '-', "Disable session cache"},
- {"ext_cache", OPT_EXT_CACHE, '-',
- "Disable internal cache, set up and use external cache"},
- {"verify_return_error", OPT_VERIFY_RET_ERROR, '-',
- "Close connection on verification error"},
- {"verify_quiet", OPT_VERIFY_QUIET, '-',
- "No verify output except verify errors"},
- {"ign_eof", OPT_IGN_EOF, '-', "Ignore input EOF (default when -quiet)"},
- {"no_ign_eof", OPT_NO_IGN_EOF, '-', "Do not ignore input EOF"},
+ { "context", OPT_CONTEXT, 's', "Set session ID context" },
+ { "CAfile", OPT_CAFILE, '<', "PEM format file of CA's" },
+ { "CApath", OPT_CAPATH, '/', "PEM format directory of CA's" },
+ { "CAstore", OPT_CASTORE, ':', "URI to store of CA's" },
+ { "no-CAfile", OPT_NOCAFILE, '-',
+ "Do not load the default certificates file" },
+ { "no-CApath", OPT_NOCAPATH, '-',
+ "Do not load certificates from the default certificates directory" },
+ { "no-CAstore", OPT_NOCASTORE, '-',
+ "Do not load certificates from the default certificates store URI" },
+ { "nocert", OPT_NOCERT, '-', "Don't use any certificates (Anon-DH)" },
+ { "verify", OPT_VERIFY, 'n', "Turn on peer certificate verification" },
+ { "Verify", OPT_UPPER_V_VERIFY, 'n',
+ "Turn on peer certificate verification, must have a cert" },
+ { "nameopt", OPT_NAMEOPT, 's', "Certificate subject/issuer name printing options" },
+ { "cert", OPT_CERT, '<', "Server certificate file to use; default " TEST_CERT },
+ { "cert2", OPT_CERT2, '<',
+ "Certificate file to use for servername; default " TEST_CERT2 },
+ { "certform", OPT_CERTFORM, 'F',
+ "Server certificate file format (PEM/DER/P12); has no effect" },
+ { "cert_chain", OPT_CERT_CHAIN, '<',
+ "Server certificate chain file in PEM format" },
+ { "build_chain", OPT_BUILD_CHAIN, '-', "Build server certificate chain" },
+ { "serverinfo", OPT_SERVERINFO, 's',
+ "PEM serverinfo file for certificate" },
+ { "key", OPT_KEY, 's',
+ "Private key file to use; default is -cert file or else" TEST_CERT },
+ { "key2", OPT_KEY2, '<',
+ "-Private Key file to use for servername if not in -cert2" },
+ { "keyform", OPT_KEYFORM, 'f', "Key format (DER/PEM)" },
+ { "pass", OPT_PASS, 's', "Private key and cert file pass phrase source" },
+ { "dcert", OPT_DCERT, '<',
+ "Second server certificate file to use (usually for DSA)" },
+ { "dcertform", OPT_DCERTFORM, 'F',
+ "Second server certificate file format (PEM/DER/P12); has no effect" },
+ { "dcert_chain", OPT_DCERT_CHAIN, '<',
+ "second server certificate chain file in PEM format" },
+ { "dkey", OPT_DKEY, '<',
+ "Second private key file to use (usually for DSA)" },
+ { "dkeyform", OPT_DKEYFORM, 'f', "Second key file format (DER/PEM)" },
+ { "dpass", OPT_DPASS, 's',
+ "Second private key and cert file pass phrase source" },
+ { "dhparam", OPT_DHPARAM, '<', "DH parameters file to use" },
+ { "servername", OPT_SERVERNAME, 's',
+ "Servername for HostName TLS extension" },
+ { "servername_fatal", OPT_SERVERNAME_FATAL, '-',
+ "On servername mismatch send fatal alert (default warning alert)" },
+ { "nbio_test", OPT_NBIO_TEST, '-', "Test with the non-blocking test bio" },
+ { "crlf", OPT_CRLF, '-', "Convert LF from terminal into CRLF" },
+ { "quiet", OPT_QUIET, '-', "No server output" },
+ { "no_resume_ephemeral", OPT_NO_RESUME_EPHEMERAL, '-',
+ "Disable caching and tickets if ephemeral (EC)DH is used" },
+ { "www", OPT_WWW, '-', "Respond to a 'GET /' with a status page" },
+ { "WWW", OPT_UPPER_WWW, '-', "Respond to a 'GET with the file ./path" },
+ { "ignore_unexpected_eof", OPT_IGNORE_UNEXPECTED_EOF, '-',
+ "Do not treat lack of close_notify from a peer as an error" },
+ { "tlsextdebug", OPT_TLSEXTDEBUG, '-',
+ "Hex dump of all TLS extensions received" },
+ { "HTTP", OPT_HTTP, '-', "Like -WWW but ./path includes HTTP headers" },
+ { "id_prefix", OPT_ID_PREFIX, 's',
+ "Generate SSL/TLS session IDs prefixed by arg" },
+ { "keymatexport", OPT_KEYMATEXPORT, 's',
+ "Export keying material using label" },
+ { "keymatexportlen", OPT_KEYMATEXPORTLEN, 'p',
+ "Export len bytes of keying material; default 20" },
+ { "CRL", OPT_CRL, '<', "CRL file to use" },
+ { "CRLform", OPT_CRLFORM, 'F', "CRL file format (PEM or DER); default PEM" },
+ { "crl_download", OPT_CRL_DOWNLOAD, '-',
+ "Download CRLs from distribution points in certificate CDP entries" },
+ { "chainCAfile", OPT_CHAINCAFILE, '<',
+ "CA file for certificate chain (PEM format)" },
+ { "chainCApath", OPT_CHAINCAPATH, '/',
+ "use dir as certificate store path to build CA certificate chain" },
+ { "chainCAstore", OPT_CHAINCASTORE, ':',
+ "use URI as certificate store to build CA certificate chain" },
+ { "verifyCAfile", OPT_VERIFYCAFILE, '<',
+ "CA file for certificate verification (PEM format)" },
+ { "verifyCApath", OPT_VERIFYCAPATH, '/',
+ "use dir as certificate store path to verify CA certificate" },
+ { "verifyCAstore", OPT_VERIFYCASTORE, ':',
+ "use URI as certificate store to verify CA certificate" },
+ { "no_cache", OPT_NO_CACHE, '-', "Disable session cache" },
+ { "ext_cache", OPT_EXT_CACHE, '-',
+ "Disable internal cache, set up and use external cache" },
+ { "verify_return_error", OPT_VERIFY_RET_ERROR, '-',
+ "Close connection on verification error" },
+ { "verify_quiet", OPT_VERIFY_QUIET, '-',
+ "No verify output except verify errors" },
+ { "ign_eof", OPT_IGN_EOF, '-', "Ignore input EOF (default when -quiet)" },
+ { "no_ign_eof", OPT_NO_IGN_EOF, '-', "Do not ignore input EOF" },
#ifndef OPENSSL_NO_COMP_ALG
- {"cert_comp", OPT_CERT_COMP, '-', "Pre-compress server certificates"},
+ { "cert_comp", OPT_CERT_COMP, '-', "Pre-compress server certificates" },
#endif
-# ifndef OPENSSL_NO_OCSP
+#ifndef OPENSSL_NO_OCSP
OPT_SECTION("OCSP"),
- {"status", OPT_STATUS, '-',
- "Provide certificate status response if requested, for server cert only"},
- {"status_all", OPT_STATUS_ALL, '-',
- "Provide certificate status response(s) if requested, for the whole chain"},
- {"status_verbose", OPT_STATUS_VERBOSE, '-',
- "Print more output in certificate status callback"},
- {"status_timeout", OPT_STATUS_TIMEOUT, 'n',
- "Status request responder timeout"},
- {"status_url", OPT_STATUS_URL, 's', "Status request fallback URL"},
- {"proxy", OPT_PROXY, 's',
- "[http[s]://]host[:port][/path] of HTTP(S) proxy to use; path is ignored"},
- {"no_proxy", OPT_NO_PROXY, 's',
- "List of addresses of servers not to use HTTP(S) proxy for"},
- {OPT_MORE_STR, 0, 0,
- "Default from environment variable 'no_proxy', else 'NO_PROXY', else none"},
- {"status_file", OPT_STATUS_FILE, '<',
- "File containing DER encoded OCSP Response (can be specified multiple times)"},
-# endif
+ { "status", OPT_STATUS, '-',
+ "Provide certificate status response if requested, for server cert only" },
+ { "status_all", OPT_STATUS_ALL, '-',
+ "Provide certificate status response(s) if requested, for the whole chain" },
+ { "status_verbose", OPT_STATUS_VERBOSE, '-',
+ "Print more output in certificate status callback" },
+ { "status_timeout", OPT_STATUS_TIMEOUT, 'n',
+ "Status request responder timeout" },
+ { "status_url", OPT_STATUS_URL, 's', "Status request fallback URL" },
+ { "proxy", OPT_PROXY, 's',
+ "[http[s]://]host[:port][/path] of HTTP(S) proxy to use; path is ignored" },
+ { "no_proxy", OPT_NO_PROXY, 's',
+ "List of addresses of servers not to use HTTP(S) proxy for" },
+ { OPT_MORE_STR, 0, 0,
+ "Default from environment variable 'no_proxy', else 'NO_PROXY', else none" },
+ { "status_file", OPT_STATUS_FILE, '<',
+ "File containing DER encoded OCSP Response (can be specified multiple times)" },
+#endif
OPT_SECTION("Debug"),
- {"security_debug", OPT_SECURITY_DEBUG, '-',
- "Print output from SSL/TLS security framework"},
- {"security_debug_verbose", OPT_SECURITY_DEBUG_VERBOSE, '-',
- "Print more output from SSL/TLS security framework"},
- {"brief", OPT_BRIEF, '-',
- "Restrict output to brief summary of connection parameters"},
- {"rev", OPT_REV, '-',
- "act as an echo server that sends back received text reversed"},
- {"debug", OPT_DEBUG, '-', "Print more output"},
- {"msg", OPT_MSG, '-', "Show protocol messages"},
- {"msgfile", OPT_MSGFILE, '>',
- "File to send output of -msg or -trace, instead of stdout"},
- {"state", OPT_STATE, '-', "Print the SSL states"},
- {"async", OPT_ASYNC, '-', "Operate in asynchronous mode"},
- {"max_pipelines", OPT_MAX_PIPELINES, 'p',
- "Maximum number of encrypt/decrypt pipelines to be used"},
- {"naccept", OPT_NACCEPT, 'p', "Terminate after #num connections"},
- {"keylogfile", OPT_KEYLOG_FILE, '>', "Write TLS secrets to file"},
+ { "security_debug", OPT_SECURITY_DEBUG, '-',
+ "Print output from SSL/TLS security framework" },
+ { "security_debug_verbose", OPT_SECURITY_DEBUG_VERBOSE, '-',
+ "Print more output from SSL/TLS security framework" },
+ { "brief", OPT_BRIEF, '-',
+ "Restrict output to brief summary of connection parameters" },
+ { "rev", OPT_REV, '-',
+ "act as an echo server that sends back received text reversed" },
+ { "debug", OPT_DEBUG, '-', "Print more output" },
+ { "msg", OPT_MSG, '-', "Show protocol messages" },
+ { "msgfile", OPT_MSGFILE, '>',
+ "File to send output of -msg or -trace, instead of stdout" },
+ { "state", OPT_STATE, '-', "Print the SSL states" },
+ { "async", OPT_ASYNC, '-', "Operate in asynchronous mode" },
+ { "max_pipelines", OPT_MAX_PIPELINES, 'p',
+ "Maximum number of encrypt/decrypt pipelines to be used" },
+ { "naccept", OPT_NACCEPT, 'p', "Terminate after #num connections" },
+ { "keylogfile", OPT_KEYLOG_FILE, '>', "Write TLS secrets to file" },
OPT_SECTION("Network"),
- {"nbio", OPT_NBIO, '-', "Use non-blocking IO"},
- {"timeout", OPT_TIMEOUT, '-', "Enable timeouts"},
- {"mtu", OPT_MTU, 'p', "Set link-layer MTU"},
- {"read_buf", OPT_READ_BUF, 'p',
- "Default read buffer size to be used for connections"},
- {"split_send_frag", OPT_SPLIT_SEND_FRAG, 'p',
- "Size used to split data for encrypt pipelines"},
- {"max_send_frag", OPT_MAX_SEND_FRAG, 'p', "Maximum Size of send frames "},
+ { "nbio", OPT_NBIO, '-', "Use non-blocking IO" },
+ { "timeout", OPT_TIMEOUT, '-', "Enable timeouts" },
+ { "mtu", OPT_MTU, 'p', "Set link-layer MTU" },
+ { "read_buf", OPT_READ_BUF, 'p',
+ "Default read buffer size to be used for connections" },
+ { "split_send_frag", OPT_SPLIT_SEND_FRAG, 'p',
+ "Size used to split data for encrypt pipelines" },
+ { "max_send_frag", OPT_MAX_SEND_FRAG, 'p', "Maximum Size of send frames " },
OPT_SECTION("Server identity"),
- {"psk_identity", OPT_PSK_IDENTITY, 's', "PSK identity to expect"},
+ { "psk_identity", OPT_PSK_IDENTITY, 's', "PSK identity to expect" },
#ifndef OPENSSL_NO_PSK
- {"psk_hint", OPT_PSK_HINT, 's', "PSK identity hint to use"},
+ { "psk_hint", OPT_PSK_HINT, 's', "PSK identity hint to use" },
#endif
- {"psk", OPT_PSK, 's', "PSK in hex (without 0x)"},
- {"psk_session", OPT_PSK_SESS, '<', "File to read PSK SSL session from"},
+ { "psk", OPT_PSK, 's', "PSK in hex (without 0x)" },
+ { "psk_session", OPT_PSK_SESS, '<', "File to read PSK SSL session from" },
#ifndef OPENSSL_NO_SRP
- {"srpvfile", OPT_SRPVFILE, '<', "(deprecated) The verifier file for SRP"},
- {"srpuserseed", OPT_SRPUSERSEED, 's',
- "(deprecated) A seed string for a default user salt"},
+ { "srpvfile", OPT_SRPVFILE, '<', "(deprecated) The verifier file for SRP" },
+ { "srpuserseed", OPT_SRPUSERSEED, 's',
+ "(deprecated) A seed string for a default user salt" },
#endif
OPT_SECTION("Protocol and version"),
- {"max_early_data", OPT_MAX_EARLY, 'n',
- "The maximum number of bytes of early data as advertised in tickets"},
- {"recv_max_early_data", OPT_RECV_MAX_EARLY, 'n',
- "The maximum number of bytes of early data (hard limit)"},
- {"early_data", OPT_EARLY_DATA, '-', "Attempt to read early data"},
- {"num_tickets", OPT_S_NUM_TICKETS, 'n',
- "The number of TLSv1.3 session tickets that a server will automatically issue" },
- {"anti_replay", OPT_ANTI_REPLAY, '-', "Switch on anti-replay protection (default)"},
- {"no_anti_replay", OPT_NO_ANTI_REPLAY, '-', "Switch off anti-replay protection"},
- {"http_server_binmode", OPT_HTTP_SERVER_BINMODE, '-', "opening files in binary mode when acting as http server (-WWW and -HTTP)"},
- {"no_ca_names", OPT_NOCANAMES, '-',
- "Disable TLS Extension CA Names"},
- {"stateless", OPT_STATELESS, '-', "Require TLSv1.3 cookies"},
+ { "max_early_data", OPT_MAX_EARLY, 'n',
+ "The maximum number of bytes of early data as advertised in tickets" },
+ { "recv_max_early_data", OPT_RECV_MAX_EARLY, 'n',
+ "The maximum number of bytes of early data (hard limit)" },
+ { "early_data", OPT_EARLY_DATA, '-', "Attempt to read early data" },
+ { "num_tickets", OPT_S_NUM_TICKETS, 'n',
+ "The number of TLSv1.3 session tickets that a server will automatically issue" },
+ { "anti_replay", OPT_ANTI_REPLAY, '-', "Switch on anti-replay protection (default)" },
+ { "no_anti_replay", OPT_NO_ANTI_REPLAY, '-', "Switch off anti-replay protection" },
+ { "http_server_binmode", OPT_HTTP_SERVER_BINMODE, '-', "opening files in binary mode when acting as http server (-WWW and -HTTP)" },
+ { "no_ca_names", OPT_NOCANAMES, '-',
+ "Disable TLS Extension CA Names" },
+ { "stateless", OPT_STATELESS, '-', "Require TLSv1.3 cookies" },
#ifndef OPENSSL_NO_SSL3
- {"ssl3", OPT_SSL3, '-', "Just talk SSLv3"},
+ { "ssl3", OPT_SSL3, '-', "Just talk SSLv3" },
#endif
#ifndef OPENSSL_NO_TLS1
- {"tls1", OPT_TLS1, '-', "Just talk TLSv1"},
+ { "tls1", OPT_TLS1, '-', "Just talk TLSv1" },
#endif
#ifndef OPENSSL_NO_TLS1_1
- {"tls1_1", OPT_TLS1_1, '-', "Just talk TLSv1.1"},
+ { "tls1_1", OPT_TLS1_1, '-', "Just talk TLSv1.1" },
#endif
#ifndef OPENSSL_NO_TLS1_2
- {"tls1_2", OPT_TLS1_2, '-', "just talk TLSv1.2"},
+ { "tls1_2", OPT_TLS1_2, '-', "just talk TLSv1.2" },
#endif
#ifndef OPENSSL_NO_TLS1_3
- {"tls1_3", OPT_TLS1_3, '-', "just talk TLSv1.3"},
+ { "tls1_3", OPT_TLS1_3, '-', "just talk TLSv1.3" },
#endif
#ifndef OPENSSL_NO_DTLS
- {"dtls", OPT_DTLS, '-', "Use any DTLS version"},
- {"listen", OPT_LISTEN, '-',
- "Listen for a DTLS ClientHello with a cookie and then connect"},
+ { "dtls", OPT_DTLS, '-', "Use any DTLS version" },
+ { "listen", OPT_LISTEN, '-',
+ "Listen for a DTLS ClientHello with a cookie and then connect" },
#endif
#ifndef OPENSSL_NO_DTLS1
- {"dtls1", OPT_DTLS1, '-', "Just talk DTLSv1"},
+ { "dtls1", OPT_DTLS1, '-', "Just talk DTLSv1" },
#endif
#ifndef OPENSSL_NO_DTLS1_2
- {"dtls1_2", OPT_DTLS1_2, '-', "Just talk DTLSv1.2"},
+ { "dtls1_2", OPT_DTLS1_2, '-', "Just talk DTLSv1.2" },
#endif
#ifndef OPENSSL_NO_SCTP
- {"sctp", OPT_SCTP, '-', "Use SCTP"},
- {"sctp_label_bug", OPT_SCTP_LABEL_BUG, '-', "Enable SCTP label length bug"},
+ { "sctp", OPT_SCTP, '-', "Use SCTP" },
+ { "sctp_label_bug", OPT_SCTP_LABEL_BUG, '-', "Enable SCTP label length bug" },
#endif
#ifndef OPENSSL_NO_SRTP
- {"use_srtp", OPT_SRTP_PROFILES, 's',
- "Offer SRTP key management with a colon-separated profile list"},
+ { "use_srtp", OPT_SRTP_PROFILES, 's',
+ "Offer SRTP key management with a colon-separated profile list" },
#endif
- {"no_dhe", OPT_NO_DHE, '-', "Disable ephemeral DH"},
+ { "no_dhe", OPT_NO_DHE, '-', "Disable ephemeral DH" },
#ifndef OPENSSL_NO_NEXTPROTONEG
- {"nextprotoneg", OPT_NEXTPROTONEG, 's',
- "Set the advertised protocols for the NPN extension (comma-separated list)"},
+ { "nextprotoneg", OPT_NEXTPROTONEG, 's',
+ "Set the advertised protocols for the NPN extension (comma-separated list)" },
#endif
- {"alpn", OPT_ALPN, 's',
- "Set the advertised protocols for the ALPN extension (comma-separated list)"},
+ { "alpn", OPT_ALPN, 's',
+ "Set the advertised protocols for the ALPN extension (comma-separated list)" },
#ifndef OPENSSL_NO_KTLS
- {"ktls", OPT_KTLS, '-', "Enable Kernel TLS for sending and receiving"},
- {"sendfile", OPT_SENDFILE, '-', "Use sendfile to response file with -WWW"},
- {"zerocopy_sendfile", OPT_USE_ZC_SENDFILE, '-', "Use zerocopy mode of KTLS sendfile"},
+ { "ktls", OPT_KTLS, '-', "Enable Kernel TLS for sending and receiving" },
+ { "sendfile", OPT_SENDFILE, '-', "Use sendfile to response file with -WWW" },
+ { "zerocopy_sendfile", OPT_USE_ZC_SENDFILE, '-', "Use zerocopy mode of KTLS sendfile" },
#endif
- {"enable_server_rpk", OPT_ENABLE_SERVER_RPK, '-', "Enable raw public keys (RFC7250) from the server"},
- {"enable_client_rpk", OPT_ENABLE_CLIENT_RPK, '-', "Enable raw public keys (RFC7250) from the client"},
+ { "enable_server_rpk", OPT_ENABLE_SERVER_RPK, '-', "Enable raw public keys (RFC7250) from the server" },
+ { "enable_client_rpk", OPT_ENABLE_CLIENT_RPK, '-', "Enable raw public keys (RFC7250) from the client" },
OPT_R_OPTIONS,
OPT_S_OPTIONS,
OPT_V_OPTIONS,
OPT_X_OPTIONS,
OPT_PROV_OPTIONS,
- {NULL}
+ { NULL }
};
-#define IS_PROT_FLAG(o) \
- (o == OPT_SSL3 || o == OPT_TLS1 || o == OPT_TLS1_1 || o == OPT_TLS1_2 \
- || o == OPT_TLS1_3 || o == OPT_DTLS || o == OPT_DTLS1 || o == OPT_DTLS1_2)
+#define IS_PROT_FLAG(o) \
+ (o == OPT_SSL3 || o == OPT_TLS1 || o == OPT_TLS1_1 || o == OPT_TLS1_2 \
+ || o == OPT_TLS1_3 || o == OPT_DTLS || o == OPT_DTLS1 || o == OPT_DTLS1_2)
int s_server_main(int argc, char *argv[])
{
@@ -1299,9 +1394,9 @@ int s_server_main(int argc, char *argv[])
const char *s_cert_file = TEST_CERT, *s_key_file = NULL, *s_chain_file = NULL;
const char *s_cert_file2 = TEST_CERT2, *s_key_file2 = NULL;
char *s_dcert_file = NULL, *s_dkey_file = NULL, *s_dchain_file = NULL;
-# ifndef OPENSSL_NO_OCSP
+#ifndef OPENSSL_NO_OCSP
int s_tlsextstatus = 0;
-# endif
+#endif
int no_resume_ephemeral = 0;
unsigned int max_send_fragment = 0;
unsigned int split_send_fragment = 0, max_pipelines = 0;
@@ -1343,7 +1438,7 @@ int s_server_main(int argc, char *argv[])
if (port == NULL || cctx == NULL || vpm == NULL)
goto end;
SSL_CONF_CTX_set_flags(cctx,
- SSL_CONF_FLAG_SERVER | SSL_CONF_FLAG_CMDLINE);
+ SSL_CONF_FLAG_SERVER | SSL_CONF_FLAG_CMDLINE);
prog = opt_init(argc, argv, s_server_options);
while ((o = opt_next()) != OPT_EOF) {
@@ -1355,13 +1450,13 @@ int s_server_main(int argc, char *argv[])
no_prot_opt++;
if (prot_opt == 1 && no_prot_opt) {
BIO_printf(bio_err,
- "Cannot supply both a protocol flag and '-no_<prot>'\n");
+ "Cannot supply both a protocol flag and '-no_<prot>'\n");
goto end;
}
switch (o) {
case OPT_EOF:
case OPT_ERR:
- opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
case OPT_HELP:
@@ -1372,8 +1467,10 @@ int s_server_main(int argc, char *argv[])
case OPT_4:
#ifdef AF_UNIX
if (socket_family == AF_UNIX) {
- OPENSSL_free(host); host = NULL;
- OPENSSL_free(port); port = NULL;
+ OPENSSL_free(host);
+ host = NULL;
+ OPENSSL_free(port);
+ port = NULL;
}
#endif
socket_family = AF_INET;
@@ -1383,8 +1480,10 @@ int s_server_main(int argc, char *argv[])
#ifdef AF_INET6
#ifdef AF_UNIX
if (socket_family == AF_UNIX) {
- OPENSSL_free(host); host = NULL;
- OPENSSL_free(port); port = NULL;
+ OPENSSL_free(host);
+ host = NULL;
+ OPENSSL_free(port);
+ port = NULL;
}
#endif
socket_family = AF_INET6;
@@ -1400,12 +1499,14 @@ int s_server_main(int argc, char *argv[])
socket_family = AF_UNSPEC;
}
#endif
- OPENSSL_free(port); port = NULL;
- OPENSSL_free(host); host = NULL;
+ OPENSSL_free(port);
+ port = NULL;
+ OPENSSL_free(host);
+ host = NULL;
if (BIO_parse_hostserv(opt_arg(), NULL, &port, BIO_PARSE_PRIO_SERV) < 1) {
BIO_printf(bio_err,
- "%s: -port argument malformed or ambiguous\n",
- prog);
+ "%s: -port argument malformed or ambiguous\n",
+ prog);
goto end;
}
break;
@@ -1415,22 +1516,26 @@ int s_server_main(int argc, char *argv[])
socket_family = AF_UNSPEC;
}
#endif
- OPENSSL_free(port); port = NULL;
- OPENSSL_free(host); host = NULL;
+ OPENSSL_free(port);
+ port = NULL;
+ OPENSSL_free(host);
+ host = NULL;
if (BIO_parse_hostserv(opt_arg(), &host, &port, BIO_PARSE_PRIO_SERV) < 1) {
BIO_printf(bio_err,
- "%s: -accept argument malformed or ambiguous\n",
- prog);
+ "%s: -accept argument malformed or ambiguous\n",
+ prog);
goto end;
}
break;
#ifdef AF_UNIX
case OPT_UNIX:
socket_family = AF_UNIX;
- OPENSSL_free(host); host = OPENSSL_strdup(opt_arg());
+ OPENSSL_free(host);
+ host = OPENSSL_strdup(opt_arg());
if (host == NULL)
goto end;
- OPENSSL_free(port); port = NULL;
+ OPENSSL_free(port);
+ port = NULL;
break;
case OPT_UNLINK:
unlink_unix_path = 1;
@@ -1446,14 +1551,12 @@ int s_server_main(int argc, char *argv[])
BIO_printf(bio_err, "verify depth is %d\n", verify_args.depth);
break;
case OPT_UPPER_V_VERIFY:
- s_server_verify =
- SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT |
- SSL_VERIFY_CLIENT_ONCE;
+ s_server_verify = SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT | SSL_VERIFY_CLIENT_ONCE;
verify_args.depth = atoi(opt_arg());
if (!s_quiet)
BIO_printf(bio_err,
- "verify depth is %d, must return a certificate\n",
- verify_args.depth);
+ "verify depth is %d, must return a certificate\n",
+ verify_args.depth);
break;
case OPT_CONTEXT:
context = (unsigned char *)opt_arg();
@@ -1614,57 +1717,57 @@ int s_server_main(int argc, char *argv[])
s_tlsextdebug = 1;
break;
case OPT_STATUS:
-# ifndef OPENSSL_NO_OCSP
+#ifndef OPENSSL_NO_OCSP
s_tlsextstatus = 1;
tlscstatp.status_all = 0;
-# endif
+#endif
break;
case OPT_STATUS_ALL:
-# ifndef OPENSSL_NO_OCSP
+#ifndef OPENSSL_NO_OCSP
s_tlsextstatus = tlscstatp.status_all = 1;
-# endif
+#endif
break;
case OPT_STATUS_VERBOSE:
-# ifndef OPENSSL_NO_OCSP
+#ifndef OPENSSL_NO_OCSP
s_tlsextstatus = tlscstatp.verbose = 1;
-# endif
+#endif
break;
case OPT_STATUS_TIMEOUT:
-# ifndef OPENSSL_NO_OCSP
+#ifndef OPENSSL_NO_OCSP
s_tlsextstatus = 1;
tlscstatp.timeout = atoi(opt_arg());
-# endif
+#endif
break;
case OPT_PROXY:
-# ifndef OPENSSL_NO_OCSP
+#ifndef OPENSSL_NO_OCSP
tlscstatp.proxy = opt_arg();
-# endif
+#endif
break;
case OPT_NO_PROXY:
-# ifndef OPENSSL_NO_OCSP
+#ifndef OPENSSL_NO_OCSP
tlscstatp.no_proxy = opt_arg();
-# endif
+#endif
break;
case OPT_STATUS_URL:
-# ifndef OPENSSL_NO_OCSP
+#ifndef OPENSSL_NO_OCSP
s_tlsextstatus = 1;
if (!OSSL_HTTP_parse_url(opt_arg(), &tlscstatp.use_ssl, NULL,
- &tlscstatp.host, &tlscstatp.port, NULL,
- &tlscstatp.path, NULL, NULL)) {
+ &tlscstatp.host, &tlscstatp.port, NULL,
+ &tlscstatp.path, NULL, NULL)) {
BIO_printf(bio_err, "Error parsing -status_url argument\n");
goto end;
}
-# endif
+#endif
break;
case OPT_STATUS_FILE:
-# ifndef OPENSSL_NO_OCSP
+#ifndef OPENSSL_NO_OCSP
s_tlsextstatus = 1;
if (tlscstatp.sk_resp_in == NULL
&& (tlscstatp.sk_resp_in = sk_OPENSSL_STRING_new_null()) == NULL)
goto end;
sk_OPENSSL_STRING_push(tlscstatp.sk_resp_in, opt_arg());
-# endif
+#endif
break;
case OPT_MSG:
s_msg = 1;
@@ -1847,7 +1950,7 @@ int s_server_main(int argc, char *argv[])
s_key_file2 = opt_arg();
break;
case OPT_NEXTPROTONEG:
-# ifndef OPENSSL_NO_NEXTPROTONEG
+#ifndef OPENSSL_NO_NEXTPROTONEG
next_proto_neg_in = opt_arg();
#endif
break;
@@ -1984,13 +2087,13 @@ int s_server_main(int argc, char *argv[])
#ifdef AF_UNIX
if (socket_family == AF_UNIX && socket_type != SOCK_STREAM) {
BIO_printf(bio_err,
- "Can't use unix sockets and datagrams together\n");
+ "Can't use unix sockets and datagrams together\n");
goto end;
}
#endif
if (early_data && rev) {
BIO_printf(bio_err,
- "Can't use -early_data in combination with -rev\n");
+ "Can't use -early_data in combination with -rev\n");
goto end;
}
@@ -2038,29 +2141,29 @@ int s_server_main(int argc, char *argv[])
if (nocert == 0) {
s_key = load_key(s_key_file, s_key_format, 0, pass,
- "server certificate private key");
+ "server certificate private key");
if (s_key == NULL)
goto end;
s_cert = load_cert_pass(s_cert_file, s_cert_format, 1, pass,
- "server certificate");
+ "server certificate");
if (s_cert == NULL)
goto end;
if (s_chain_file != NULL) {
if (!load_certs(s_chain_file, 0, &s_chain, NULL,
- "server certificate chain"))
+ "server certificate chain"))
goto end;
}
if (tlsextcbp.servername != NULL) {
s_key2 = load_key(s_key_file2, s_key_format, 0, pass,
- "second server certificate private key");
+ "second server certificate private key");
if (s_key2 == NULL)
goto end;
s_cert2 = load_cert_pass(s_cert_file2, s_cert_format, 1, pass,
- "second server certificate");
+ "second server certificate");
if (s_cert2 == NULL)
goto end;
@@ -2100,12 +2203,12 @@ int s_server_main(int argc, char *argv[])
s_dkey_file = s_dcert_file;
s_dkey = load_key(s_dkey_file, s_dkey_format,
- 0, dpass, "second certificate private key");
+ 0, dpass, "second certificate private key");
if (s_dkey == NULL)
goto end;
s_dcert = load_cert_pass(s_dcert_file, s_dcert_format, 1, dpass,
- "second server certificate");
+ "second server certificate");
if (s_dcert == NULL) {
ERR_print_errors(bio_err);
@@ -2113,10 +2216,9 @@ int s_server_main(int argc, char *argv[])
}
if (s_dchain_file != NULL) {
if (!load_certs(s_dchain_file, 0, &s_dchain, NULL,
- "second server certificate chain"))
+ "second server certificate chain"))
goto end;
}
-
}
if (bio_s_out == NULL) {
@@ -2163,7 +2265,7 @@ int s_server_main(int argc, char *argv[])
if (ssl_config) {
if (SSL_CTX_config(ctx, ssl_config) == 0) {
BIO_printf(bio_err, "Error using configuration \"%s\"\n",
- ssl_config);
+ ssl_config);
ERR_print_errors(bio_err);
goto end;
}
@@ -2183,7 +2285,7 @@ int s_server_main(int argc, char *argv[])
if (session_id_prefix) {
if (strlen(session_id_prefix) >= 32)
BIO_printf(bio_err,
- "warning: id_prefix is too long, only one new session will be possible\n");
+ "warning: id_prefix is too long, only one new session will be possible\n");
if (!SSL_CTX_set_generate_session_id(ctx, generate_session_id)) {
BIO_printf(bio_err, "error setting 'id_prefix'\n");
ERR_print_errors(bio_err);
@@ -2223,20 +2325,20 @@ int s_server_main(int argc, char *argv[])
if (max_send_fragment > 0
&& !SSL_CTX_set_max_send_fragment(ctx, max_send_fragment)) {
BIO_printf(bio_err, "%s: Max send fragment size %u is out of permitted range\n",
- prog, max_send_fragment);
+ prog, max_send_fragment);
goto end;
}
if (split_send_fragment > 0
&& !SSL_CTX_set_split_send_fragment(ctx, split_send_fragment)) {
BIO_printf(bio_err, "%s: Split send fragment size %u is out of permitted range\n",
- prog, split_send_fragment);
+ prog, split_send_fragment);
goto end;
}
if (max_pipelines > 0
&& !SSL_CTX_set_max_pipelines(ctx, max_pipelines)) {
BIO_printf(bio_err, "%s: Max pipelines %u is out of permitted range\n",
- prog, max_pipelines);
+ prog, max_pipelines);
goto end;
}
@@ -2255,7 +2357,7 @@ int s_server_main(int argc, char *argv[])
#endif
if (!ctx_set_verify_locations(ctx, CAfile, noCAfile, CApath, noCApath,
- CAstore, noCAstore)) {
+ CAstore, noCAstore)) {
ERR_print_errors(bio_err);
goto end;
}
@@ -2268,9 +2370,9 @@ int s_server_main(int argc, char *argv[])
ssl_ctx_add_crls(ctx, crls, 0);
if (!ssl_load_stores(ctx,
- vfyCApath, vfyCAfile, vfyCAstore,
- chCApath, chCAfile, chCAstore,
- crls, crl_download)) {
+ vfyCApath, vfyCAfile, vfyCAstore,
+ chCApath, chCAfile, chCAstore,
+ crls, crl_download)) {
BIO_printf(bio_err, "Error loading store locations\n");
ERR_print_errors(bio_err);
goto end;
@@ -2293,7 +2395,7 @@ int s_server_main(int argc, char *argv[])
if (session_id_prefix) {
if (strlen(session_id_prefix) >= 32)
BIO_printf(bio_err,
- "warning: id_prefix is too long, only one new session will be possible\n");
+ "warning: id_prefix is too long, only one new session will be possible\n");
if (!SSL_CTX_set_generate_session_id(ctx2, generate_session_id)) {
BIO_printf(bio_err, "error setting 'id_prefix'\n");
ERR_print_errors(bio_err);
@@ -2318,7 +2420,7 @@ int s_server_main(int argc, char *argv[])
SSL_CTX_set_mode(ctx2, SSL_MODE_ASYNC);
if (!ctx_set_verify_locations(ctx2, CAfile, noCAfile, CApath,
- noCApath, CAstore, noCAstore)) {
+ noCApath, CAstore, noCAstore)) {
ERR_print_errors(bio_err);
goto end;
}
@@ -2335,7 +2437,7 @@ int s_server_main(int argc, char *argv[])
#ifndef OPENSSL_NO_NEXTPROTONEG
if (next_proto.data)
SSL_CTX_set_next_protos_advertised_cb(ctx, next_proto_cb,
- &next_proto);
+ &next_proto);
#endif
if (alpn_ctx.data)
SSL_CTX_set_alpn_select_cb(ctx, alpn_cb, &alpn_ctx);
@@ -2347,7 +2449,7 @@ int s_server_main(int argc, char *argv[])
dhpkey = load_keyparams(dhfile, FORMAT_UNDEF, 0, "DH", "DH parameters");
else if (s_cert_file != NULL)
dhpkey = load_keyparams_suppress(s_cert_file, FORMAT_UNDEF, 0, "DH",
- "DH parameters", 1);
+ "DH parameters", 1);
if (dhpkey != NULL) {
BIO_printf(bio_s_out, "Setting temp DH parameters\n");
@@ -2380,9 +2482,9 @@ int s_server_main(int argc, char *argv[])
if (ctx2 != NULL) {
if (dhfile != NULL) {
EVP_PKEY *dhpkey2 = load_keyparams_suppress(s_cert_file2,
- FORMAT_UNDEF,
- 0, "DH",
- "DH parameters", 1);
+ FORMAT_UNDEF,
+ 0, "DH",
+ "DH parameters", 1);
if (dhpkey2 != NULL) {
BIO_printf(bio_s_out, "Setting temp DH parameters\n");
@@ -2425,11 +2527,11 @@ int s_server_main(int argc, char *argv[])
if (no_resume_ephemeral) {
SSL_CTX_set_not_resumable_session_callback(ctx,
- not_resumable_sess_cb);
+ not_resumable_sess_cb);
if (ctx2 != NULL)
SSL_CTX_set_not_resumable_session_callback(ctx2,
- not_resumable_sess_cb);
+ not_resumable_sess_cb);
}
#ifndef OPENSSL_NO_PSK
if (psk_key != NULL) {
@@ -2465,7 +2567,6 @@ int s_server_main(int argc, char *argv[])
ERR_print_errors(bio_err);
goto end;
}
-
}
if (psk_key != NULL || psksess != NULL)
@@ -2473,8 +2574,8 @@ int s_server_main(int argc, char *argv[])
SSL_CTX_set_verify(ctx, s_server_verify, verify_callback);
if (!SSL_CTX_set_session_id_context(ctx,
- (void *)&s_server_session_id_context,
- sizeof(s_server_session_id_context))) {
+ (void *)&s_server_session_id_context,
+ sizeof(s_server_session_id_context))) {
BIO_printf(bio_err, "error setting session id context\n");
ERR_print_errors(bio_err);
goto end;
@@ -2491,8 +2592,8 @@ int s_server_main(int argc, char *argv[])
if (ctx2 != NULL) {
SSL_CTX_set_verify(ctx2, s_server_verify, verify_callback);
if (!SSL_CTX_set_session_id_context(ctx2,
- (void *)&s_server_session_id_context,
- sizeof(s_server_session_id_context))) {
+ (void *)&s_server_session_id_context,
+ sizeof(s_server_session_id_context))) {
BIO_printf(bio_err, "error setting session id context\n");
ERR_print_errors(bio_err);
goto end;
@@ -2507,11 +2608,11 @@ int s_server_main(int argc, char *argv[])
#ifndef OPENSSL_NO_SRP
if (srp_verifier_file != NULL) {
if (!set_up_srp_verifier_file(ctx, &srp_callback_parm, srpuserseed,
- srp_verifier_file))
+ srp_verifier_file))
goto end;
} else
#endif
- if (CAfile != NULL) {
+ if (CAfile != NULL) {
SSL_CTX_set_client_CA_list(ctx, SSL_load_client_CA_file(CAfile));
if (ctx2)
@@ -2567,10 +2668,10 @@ int s_server_main(int argc, char *argv[])
if (tfo)
BIO_printf(bio_s_out, "Listening for TFO\n");
do_server(&accept_socket, host, port, socket_family, socket_type, protocol,
- server_cb, context, naccept, bio_s_out, tfo);
+ server_cb, context, naccept, bio_s_out, tfo);
print_stats(bio_s_out, ctx);
ret = 0;
- end:
+end:
SSL_CTX_free(ctx);
SSL_SESSION_free(psksess);
set_keylog_file(NULL, NULL);
@@ -2614,38 +2715,38 @@ int s_server_main(int argc, char *argv[])
static void print_stats(BIO *bio, SSL_CTX *ssl_ctx)
{
BIO_printf(bio, "%4ld items in the session cache\n",
- SSL_CTX_sess_number(ssl_ctx));
+ SSL_CTX_sess_number(ssl_ctx));
BIO_printf(bio, "%4ld client connects (SSL_connect())\n",
- SSL_CTX_sess_connect(ssl_ctx));
+ SSL_CTX_sess_connect(ssl_ctx));
BIO_printf(bio, "%4ld client renegotiates (SSL_connect())\n",
- SSL_CTX_sess_connect_renegotiate(ssl_ctx));
+ SSL_CTX_sess_connect_renegotiate(ssl_ctx));
BIO_printf(bio, "%4ld client connects that finished\n",
- SSL_CTX_sess_connect_good(ssl_ctx));
+ SSL_CTX_sess_connect_good(ssl_ctx));
BIO_printf(bio, "%4ld server accepts (SSL_accept())\n",
- SSL_CTX_sess_accept(ssl_ctx));
+ SSL_CTX_sess_accept(ssl_ctx));
BIO_printf(bio, "%4ld server renegotiates (SSL_accept())\n",
- SSL_CTX_sess_accept_renegotiate(ssl_ctx));
+ SSL_CTX_sess_accept_renegotiate(ssl_ctx));
BIO_printf(bio, "%4ld server accepts that finished\n",
- SSL_CTX_sess_accept_good(ssl_ctx));
+ SSL_CTX_sess_accept_good(ssl_ctx));
BIO_printf(bio, "%4ld session cache hits\n", SSL_CTX_sess_hits(ssl_ctx));
BIO_printf(bio, "%4ld session cache misses\n",
- SSL_CTX_sess_misses(ssl_ctx));
+ SSL_CTX_sess_misses(ssl_ctx));
BIO_printf(bio, "%4ld session cache timeouts\n",
- SSL_CTX_sess_timeouts(ssl_ctx));
+ SSL_CTX_sess_timeouts(ssl_ctx));
BIO_printf(bio, "%4ld callback cache hits\n",
- SSL_CTX_sess_cb_hits(ssl_ctx));
+ SSL_CTX_sess_cb_hits(ssl_ctx));
BIO_printf(bio, "%4ld cache full overflows (%ld allowed)\n",
- SSL_CTX_sess_cache_full(ssl_ctx),
- SSL_CTX_sess_get_cache_size(ssl_ctx));
+ SSL_CTX_sess_cache_full(ssl_ctx),
+ SSL_CTX_sess_get_cache_size(ssl_ctx));
}
static long int count_reads_callback(BIO *bio, int cmd, const char *argp, size_t len,
- int argi, long argl, int ret, size_t *processed)
+ int argi, long argl, int ret, size_t *processed)
{
unsigned int *p_counter = (unsigned int *)BIO_get_callback_arg(bio);
switch (cmd) {
- case BIO_CB_READ: /* No break here */
+ case BIO_CB_READ: /* No break here */
case BIO_CB_GETS:
if (p_counter != NULL)
++*p_counter;
@@ -2677,11 +2778,11 @@ static int sv_body(int s, int stype, int prot, unsigned char *context)
struct timeval *timeoutp;
#endif
#ifndef OPENSSL_NO_DTLS
-# ifndef OPENSSL_NO_SCTP
+#ifndef OPENSSL_NO_SCTP
int isdtls = (stype == SOCK_DGRAM || prot == IPPROTO_SCTP);
-# else
+#else
int isdtls = (stype == SOCK_DGRAM);
-# endif
+#endif
#endif
buf = app_malloc(bufsize, "server buffer");
@@ -2705,7 +2806,7 @@ static int sv_body(int s, int stype, int prot, unsigned char *context)
if (context != NULL
&& !SSL_set_session_id_context(con, context,
- (unsigned int)strlen((char *)context))) {
+ (unsigned int)strlen((char *)context))) {
BIO_printf(bio_err, "Error setting session id context\n");
ret = -1;
goto err;
@@ -2718,11 +2819,11 @@ static int sv_body(int s, int stype, int prot, unsigned char *context)
}
#ifndef OPENSSL_NO_DTLS
if (isdtls) {
-# ifndef OPENSSL_NO_SCTP
+#ifndef OPENSSL_NO_SCTP
if (prot == IPPROTO_SCTP)
sbio = BIO_new_dgram_sctp(s, BIO_NOCLOSE);
else
-# endif
+#endif
sbio = BIO_new_dgram(s, BIO_NOCLOSE);
if (sbio == NULL) {
BIO_printf(bio_err, "Unable to create BIO\n");
@@ -2743,7 +2844,7 @@ static int sv_body(int s, int stype, int prot, unsigned char *context)
if (socket_mtu) {
if (socket_mtu < DTLS_get_link_min_mtu(con)) {
BIO_printf(bio_err, "MTU too small. Must be at least %ld\n",
- DTLS_get_link_min_mtu(con));
+ DTLS_get_link_min_mtu(con));
ret = -1;
BIO_free(sbio);
goto err;
@@ -2759,9 +2860,9 @@ static int sv_body(int s, int stype, int prot, unsigned char *context)
/* want to do MTU discovery */
BIO_ctrl(sbio, BIO_CTRL_DGRAM_MTU_DISCOVER, 0, NULL);
-# ifndef OPENSSL_NO_SCTP
+#ifndef OPENSSL_NO_SCTP
if (prot != IPPROTO_SCTP)
-# endif
+#endif
/* Turn on cookie exchange. Not necessary for SCTP */
SSL_set_options(con, SSL_OP_COOKIE_EXCHANGE);
} else
@@ -2861,7 +2962,7 @@ static int sv_body(int s, int stype, int prot, unsigned char *context)
read_from_terminal = 0;
read_from_sslcon = SSL_has_pending(con)
- || (async && SSL_waiting_for_async(con));
+ || (async && SSL_waiting_for_async(con));
if (!read_from_sslcon) {
FD_ZERO(&readfds);
@@ -2959,18 +3060,16 @@ static int sv_body(int s, int stype, int prot, unsigned char *context)
}
if ((buf[0] == 'R') && ((buf[1] == '\n') || (buf[1] == '\r'))) {
SSL_set_verify(con,
- SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE,
- NULL);
+ SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE,
+ NULL);
SSL_renegotiate(con);
i = SSL_do_handshake(con);
printf("SSL_do_handshake -> %d\n", i);
continue;
}
if ((buf[0] == 'K' || buf[0] == 'k')
- && ((buf[1] == '\n') || (buf[1] == '\r'))) {
- SSL_key_update(con, buf[0] == 'K' ?
- SSL_KEY_UPDATE_REQUESTED
- : SSL_KEY_UPDATE_NOT_REQUESTED);
+ && ((buf[1] == '\n') || (buf[1] == '\r'))) {
+ SSL_key_update(con, buf[0] == 'K' ? SSL_KEY_UPDATE_REQUESTED : SSL_KEY_UPDATE_NOT_REQUESTED);
i = SSL_do_handshake(con);
printf("SSL_do_handshake -> %d\n", i);
continue;
@@ -2989,7 +3088,7 @@ static int sv_body(int s, int stype, int prot, unsigned char *context)
}
if (buf[0] == 'P') {
static const char str[] = "Lets print some clear text\n";
- BIO_write(SSL_get_wbio(con), str, sizeof(str) -1);
+ BIO_write(SSL_get_wbio(con), str, sizeof(str) - 1);
}
if (buf[0] == 'S') {
print_stats(bio_s_out, SSL_get_SSL_CTX(con));
@@ -3058,7 +3157,7 @@ static int sv_body(int s, int stype, int prot, unsigned char *context)
* init_ssl_connection
*/
if ((!async || !SSL_waiting_for_async(con))
- && !SSL_is_init_finished(con)) {
+ && !SSL_is_init_finished(con)) {
/*
* Count number of reads during init_ssl_connection.
* It helps us to distinguish configuration errors from errors
@@ -3086,7 +3185,7 @@ static int sv_body(int s, int stype, int prot, unsigned char *context)
goto err;
}
} else {
- again:
+ again:
i = SSL_read(con, (char *)buf, bufsize);
#ifndef OPENSSL_NO_SRP
while (SSL_get_error(con, i) == SSL_ERROR_WANT_X509_LOOKUP) {
@@ -3137,7 +3236,7 @@ static int sv_body(int s, int stype, int prot, unsigned char *context)
}
}
}
- err:
+err:
if (con != NULL) {
BIO_printf(bio_s_out, "shutting down SSL\n");
do_ssl_shutdown(con);
@@ -3162,8 +3261,8 @@ static int is_retryable(SSL *con, int i)
/* If it's not a fatal error, it must be retryable */
return (err != SSL_ERROR_SSL)
- && (err != SSL_ERROR_SYSCALL)
- && (err != SSL_ERROR_ZERO_RETURN);
+ && (err != SSL_ERROR_SYSCALL)
+ && (err != SSL_ERROR_ZERO_RETURN);
}
static int init_ssl_connection(SSL *con)
@@ -3219,10 +3318,10 @@ static int init_ssl_connection(SSL *con)
#ifdef CERT_CB_TEST_RETRY
{
while (i <= 0
- && SSL_get_error(con, i) == SSL_ERROR_WANT_X509_LOOKUP
- && SSL_get_state(con) == TLS_ST_SR_CLNT_HELLO) {
+ && SSL_get_error(con, i) == SSL_ERROR_WANT_X509_LOOKUP
+ && SSL_get_state(con) == TLS_ST_SR_CLNT_HELLO) {
BIO_printf(bio_err,
- "LOOKUP from certificate callback during accept\n");
+ "LOOKUP from certificate callback during accept\n");
i = SSL_accept(con);
if (i <= 0)
retry = is_retryable(con, i);
@@ -3232,9 +3331,9 @@ static int init_ssl_connection(SSL *con)
#ifndef OPENSSL_NO_SRP
while (i <= 0
- && SSL_get_error(con, i) == SSL_ERROR_WANT_X509_LOOKUP) {
+ && SSL_get_error(con, i) == SSL_ERROR_WANT_X509_LOOKUP) {
BIO_printf(bio_s_out, "LOOKUP during accept %s\n",
- srp_callback_parm.login);
+ srp_callback_parm.login);
lookup_srp_user(&srp_callback_parm, bio_s_out);
@@ -3248,7 +3347,7 @@ static int init_ssl_connection(SSL *con)
if (i <= 0) {
if (((dtlslisten || stateless) && i == 0)
- || (!dtlslisten && !stateless && retry)) {
+ || (!dtlslisten && !stateless && retry)) {
BIO_printf(bio_s_out, "DELAY\n");
return 1;
}
@@ -3258,7 +3357,7 @@ static int init_ssl_connection(SSL *con)
verify_err = SSL_get_verify_result(con);
if (verify_err != X509_V_OK) {
BIO_printf(bio_err, "verify error:%s\n",
- X509_verify_cert_error_string(verify_err));
+ X509_verify_cert_error_string(verify_err));
}
/* Always print any error messages */
ERR_print_errors(bio_err);
@@ -3333,7 +3432,7 @@ static void print_connection_info(SSL *con)
if (srtp_profile)
BIO_printf(bio_s_out, "SRTP Extension negotiated, profile=%s\n",
- srtp_profile->name);
+ srtp_profile->name);
}
#endif
if (SSL_session_reused(con))
@@ -3350,10 +3449,11 @@ static void print_connection_info(SSL *con)
BIO_printf(bio_s_out, " Length: %i bytes\n", keymatexportlen);
exportedkeymat = app_malloc(keymatexportlen, "export key");
if (SSL_export_keying_material(con, exportedkeymat,
- keymatexportlen,
- keymatexportlabel,
- strlen(keymatexportlabel),
- NULL, 0, 0) <= 0) {
+ keymatexportlen,
+ keymatexportlabel,
+ strlen(keymatexportlabel),
+ NULL, 0, 0)
+ <= 0) {
BIO_printf(bio_s_out, " Error\n");
} else {
BIO_printf(bio_s_out, " Keying material: ");
@@ -3424,7 +3524,7 @@ static int www_body(int s, int stype, int prot, unsigned char *context)
if (context != NULL
&& !SSL_set_session_id_context(con, context,
- (unsigned int)strlen((char *)context))) {
+ (unsigned int)strlen((char *)context))) {
SSL_free(con);
goto err;
}
@@ -3511,7 +3611,7 @@ static int www_body(int s, int stype, int prot, unsigned char *context)
for (;;) {
i = BIO_gets(!BIO_eof(edio) ? edio : io, buf, bufsize + 1);
- if (i < 0) { /* error */
+ if (i < 0) { /* error */
if (!BIO_should_retry(io) && !SSL_waiting_for_async(con)) {
if (!s_quiet)
ERR_print_errors(bio_err);
@@ -3531,14 +3631,14 @@ static int www_body(int s, int stype, int prot, unsigned char *context)
OSSL_sleep(1000);
continue;
}
- } else if (i == 0) { /* end of input */
+ } else if (i == 0) { /* end of input */
ret = 1;
goto end;
}
/* else we have data */
if ((www == 1 && HAS_PREFIX(buf, "GET "))
- || (www == 2 && HAS_PREFIX(buf, "GET /stats "))) {
+ || (www == 2 && HAS_PREFIX(buf, "GET /stats "))) {
X509 *peer = NULL;
STACK_OF(SSL_CIPHER) *sk;
static const char *space = " ";
@@ -3546,15 +3646,15 @@ static int www_body(int s, int stype, int prot, unsigned char *context)
if (www == 1 && HAS_PREFIX(buf, "GET /reneg")) {
if (HAS_PREFIX(buf, "GET /renegcert"))
SSL_set_verify(con,
- SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE,
- NULL);
+ SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE,
+ NULL);
i = SSL_renegotiate(con);
BIO_printf(bio_s_out, "SSL_renegotiate -> %d\n", i);
/* Send the HelloRequest */
i = SSL_do_handshake(con);
if (i <= 0) {
BIO_printf(bio_s_out, "SSL_do_handshake() Retval %d\n",
- SSL_get_error(con, i));
+ SSL_get_error(con, i));
ERR_print_errors(bio_err);
goto err;
}
@@ -3564,7 +3664,7 @@ static int www_body(int s, int stype, int prot, unsigned char *context)
i = select(width, (void *)&readfds, NULL, NULL, NULL);
if (i <= 0 || !FD_ISSET(s, &readfds)) {
BIO_printf(bio_s_out,
- "Error waiting for client response\n");
+ "Error waiting for client response\n");
ERR_print_errors(bio_err);
goto err;
}
@@ -3578,7 +3678,7 @@ static int www_body(int s, int stype, int prot, unsigned char *context)
}
BIO_puts(io,
- "HTTP/1.0 200 ok\r\nContent-type: text/html\r\n\r\n");
+ "HTTP/1.0 200 ok\r\nContent-type: text/html\r\n\r\n");
BIO_puts(io, "<HTML><BODY BGCOLOR=\"#ffffff\">\n");
BIO_puts(io, "<pre>\n");
/* BIO_puts(io, OpenSSL_version(OPENSSL_VERSION)); */
@@ -3616,7 +3716,7 @@ static int www_body(int s, int stype, int prot, unsigned char *context)
for (i = 0; i < j; i++) {
c = sk_SSL_CIPHER_value(sk, i);
BIO_printf(io, "%-11s:%-25s ",
- SSL_CIPHER_get_version(c), SSL_CIPHER_get_name(c));
+ SSL_CIPHER_get_version(c), SSL_CIPHER_get_name(c));
if ((((i + 1) % 2) == 0) && (i + 1 != j))
BIO_puts(io, "\n");
}
@@ -3624,7 +3724,7 @@ static int www_body(int s, int stype, int prot, unsigned char *context)
p = SSL_get_shared_ciphers(con, buf, bufsize);
if (p != NULL) {
BIO_printf(io,
- "---\nCiphers common between both SSL end points:\n");
+ "---\nCiphers common between both SSL end points:\n");
j = i = 0;
while (*p) {
if (*p == ':') {
@@ -3645,11 +3745,10 @@ static int www_body(int s, int stype, int prot, unsigned char *context)
ssl_print_groups(io, con, 0);
#endif
print_ca_names(io, con);
- BIO_printf(io, (SSL_session_reused(con)
- ? "---\nReused, " : "---\nNew, "));
+ BIO_printf(io, (SSL_session_reused(con) ? "---\nReused, " : "---\nNew, "));
c = SSL_get_current_cipher(con);
BIO_printf(io, "%s, Cipher is %s\n",
- SSL_CIPHER_get_version(c), SSL_CIPHER_get_name(c));
+ SSL_CIPHER_get_version(c), SSL_CIPHER_get_name(c));
SSL_SESSION_print(io, SSL_get_session(con));
BIO_printf(io, "---\n");
print_stats(io, SSL_get_SSL_CTX(con));
@@ -3668,8 +3767,7 @@ static int www_body(int s, int stype, int prot, unsigned char *context)
} else if ((www == 2 || www == 3) && CHECK_AND_SKIP_PREFIX(p, "GET /")) {
BIO *file;
char *e;
- static const char *text =
- "HTTP/1.0 200 ok\r\nContent-type: text/plain\r\n\r\n";
+ static const char *text = "HTTP/1.0 200 ok\r\nContent-type: text/plain\r\n\r\n";
dot = 1;
for (e = p; *e != '\0'; e++) {
@@ -3738,14 +3836,12 @@ static int www_body(int s, int stype, int prot, unsigned char *context)
if (www == 2) {
i = (int)strlen(p);
- if (((i > 5) && (strcmp(&(p[i - 5]), ".html") == 0)) ||
- ((i > 4) && (strcmp(&(p[i - 4]), ".php") == 0)) ||
- ((i > 4) && (strcmp(&(p[i - 4]), ".htm") == 0)))
+ if (((i > 5) && (strcmp(&(p[i - 5]), ".html") == 0)) || ((i > 4) && (strcmp(&(p[i - 4]), ".php") == 0)) || ((i > 4) && (strcmp(&(p[i - 4]), ".htm") == 0)))
BIO_puts(io,
- "HTTP/1.0 200 ok\r\nContent-type: text/html\r\n\r\n");
+ "HTTP/1.0 200 ok\r\nContent-type: text/html\r\n\r\n");
else
BIO_puts(io,
- "HTTP/1.0 200 ok\r\nContent-type: text/plain\r\n\r\n");
+ "HTTP/1.0 200 ok\r\nContent-type: text/plain\r\n\r\n");
}
/* send the file */
#ifndef OPENSSL_NO_KTLS
@@ -3813,7 +3909,7 @@ static int www_body(int s, int stype, int prot, unsigned char *context)
}
}
}
- write_error:
+ write_error:
BIO_free(file);
break;
}
@@ -3827,11 +3923,11 @@ static int www_body(int s, int stype, int prot, unsigned char *context)
} else
break;
}
- end:
+end:
/* make sure we reuse sessions */
do_ssl_shutdown(con);
- err:
+err:
OPENSSL_free(buf);
BIO_free(ssl_bio);
BIO_free_all(io);
@@ -3871,7 +3967,7 @@ static int rev_body(int s, int stype, int prot, unsigned char *context)
}
if (context != NULL
&& !SSL_set_session_id_context(con, context,
- (unsigned int)strlen((char *)context))) {
+ (unsigned int)strlen((char *)context))) {
SSL_free(con);
ERR_print_errors(bio_err);
goto err;
@@ -3938,7 +4034,7 @@ static int rev_body(int s, int stype, int prot, unsigned char *context)
for (;;) {
i = BIO_gets(io, buf, bufsize + 1);
- if (i < 0) { /* error */
+ if (i < 0) { /* error */
if (!BIO_should_retry(io)) {
if (!s_quiet)
ERR_print_errors(bio_err);
@@ -3958,7 +4054,7 @@ static int rev_body(int s, int stype, int prot, unsigned char *context)
OSSL_sleep(1000);
continue;
}
- } else if (i == 0) { /* end of input */
+ } else if (i == 0) { /* end of input */
ret = 1;
BIO_printf(bio_err, "CONNECTION CLOSED\n");
goto end;
@@ -3985,11 +4081,11 @@ static int rev_body(int s, int stype, int prot, unsigned char *context)
}
}
}
- end:
+end:
/* make sure we reuse sessions */
do_ssl_shutdown(con);
- err:
+err:
OPENSSL_free(buf);
BIO_free(ssl_bio);
@@ -3999,7 +4095,7 @@ static int rev_body(int s, int stype, int prot, unsigned char *context)
#define MAX_SESSION_ID_ATTEMPTS 10
static int generate_session_id(SSL *ssl, unsigned char *id,
- unsigned int *id_len)
+ unsigned int *id_len)
{
unsigned int count = 0;
unsigned int session_id_prefix_len = (unsigned int)strlen(session_id_prefix);
@@ -4015,11 +4111,8 @@ static int generate_session_id(SSL *ssl, unsigned char *id,
* conflicts.
*/
memcpy(id, session_id_prefix,
- (session_id_prefix_len < *id_len) ?
- session_id_prefix_len : *id_len);
- }
- while (SSL_has_matching_session_id(ssl, id, *id_len) &&
- (++count < MAX_SESSION_ID_ATTEMPTS));
+ (session_id_prefix_len < *id_len) ? session_id_prefix_len : *id_len);
+ } while (SSL_has_matching_session_id(ssl, id, *id_len) && (++count < MAX_SESSION_ID_ATTEMPTS));
if (count >= MAX_SESSION_ID_ATTEMPTS)
return 0;
return 1;
@@ -4082,7 +4175,7 @@ static int add_session(SSL *ssl, SSL_SESSION *session)
}
static SSL_SESSION *get_session(SSL *ssl, const unsigned char *id, int idlen,
- int *do_copy)
+ int *do_copy)
{
simple_ssl_session *sess;
*do_copy = 0;
@@ -4091,7 +4184,7 @@ static SSL_SESSION *get_session(SSL *ssl, const unsigned char *id, int idlen,
const unsigned char *p = sess->der;
BIO_printf(bio_err, "Lookup session: cache hit\n");
return d2i_SSL_SESSION_ex(NULL, &p, sess->derlen, app_get0_libctx(),
- app_get0_propq());
+ app_get0_propq());
}
}
BIO_printf(bio_err, "Lookup session: cache miss\n");
@@ -4122,8 +4215,7 @@ static void del_session(SSL_CTX *sctx, SSL_SESSION *session)
static void init_session_cache_ctx(SSL_CTX *sctx)
{
SSL_CTX_set_session_cache_mode(sctx,
- SSL_SESS_CACHE_NO_INTERNAL |
- SSL_SESS_CACHE_SERVER);
+ SSL_SESS_CACHE_NO_INTERNAL | SSL_SESS_CACHE_SERVER);
SSL_CTX_sess_set_new_cb(sctx, add_session);
SSL_CTX_sess_set_get_cb(sctx, get_session);
SSL_CTX_sess_set_remove_cb(sctx, del_session);
@@ -4142,4 +4234,4 @@ static void free_sessions(void)
first = NULL;
}
-#endif /* OPENSSL_NO_SOCK */
+#endif /* OPENSSL_NO_SOCK */
diff --git a/apps/s_time.c b/apps/s_time.c
index 29ef21dd9b..e52f456838 100644
--- a/apps/s_time.c
+++ b/apps/s_time.c
@@ -24,10 +24,10 @@
#include <openssl/err.h>
#include "internal/sockets.h"
#if !defined(OPENSSL_SYS_MSDOS)
-# include <unistd.h>
+#include <unistd.h>
#endif
-#define SSL_CONNECT_NAME "localhost:4433"
+#define SSL_CONNECT_NAME "localhost:4433"
#define SECONDS 30
#define SECONDSSTR "30"
@@ -44,68 +44,86 @@ static const size_t fmt_http_get_cmd_size = sizeof(fmt_http_get_cmd) - 2;
typedef enum OPTION_choice {
OPT_COMMON,
- OPT_CONNECT, OPT_CIPHER, OPT_CIPHERSUITES, OPT_CERT, OPT_NAMEOPT, OPT_KEY,
- OPT_CAPATH, OPT_CAFILE, OPT_CASTORE,
- OPT_NOCAPATH, OPT_NOCAFILE, OPT_NOCASTORE,
- OPT_NEW, OPT_REUSE, OPT_BUGS, OPT_VERIFY, OPT_TIME, OPT_SSL3,
- OPT_WWW, OPT_TLS1, OPT_TLS1_1, OPT_TLS1_2, OPT_TLS1_3,
+ OPT_CONNECT,
+ OPT_CIPHER,
+ OPT_CIPHERSUITES,
+ OPT_CERT,
+ OPT_NAMEOPT,
+ OPT_KEY,
+ OPT_CAPATH,
+ OPT_CAFILE,
+ OPT_CASTORE,
+ OPT_NOCAPATH,
+ OPT_NOCAFILE,
+ OPT_NOCASTORE,
+ OPT_NEW,
+ OPT_REUSE,
+ OPT_BUGS,
+ OPT_VERIFY,
+ OPT_TIME,
+ OPT_SSL3,
+ OPT_WWW,
+ OPT_TLS1,
+ OPT_TLS1_1,
+ OPT_TLS1_2,
+ OPT_TLS1_3,
OPT_PROV_ENUM
} OPTION_CHOICE;
const OPTIONS s_time_options[] = {
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
+ { "help", OPT_HELP, '-', "Display this summary" },
OPT_SECTION("Connection"),
- {"connect", OPT_CONNECT, 's',
- "Where to connect as post:port (default is " SSL_CONNECT_NAME ")"},
- {"new", OPT_NEW, '-', "Just time new connections"},
- {"reuse", OPT_REUSE, '-', "Just time connection reuse"},
- {"bugs", OPT_BUGS, '-', "Turn on SSL bug compatibility"},
- {"cipher", OPT_CIPHER, 's', "TLSv1.2 and below cipher list to be used"},
- {"ciphersuites", OPT_CIPHERSUITES, 's',
- "Specify TLSv1.3 ciphersuites to be used"},
+ { "connect", OPT_CONNECT, 's',
+ "Where to connect as post:port (default is " SSL_CONNECT_NAME ")" },
+ { "new", OPT_NEW, '-', "Just time new connections" },
+ { "reuse", OPT_REUSE, '-', "Just time connection reuse" },
+ { "bugs", OPT_BUGS, '-', "Turn on SSL bug compatibility" },
+ { "cipher", OPT_CIPHER, 's', "TLSv1.2 and below cipher list to be used" },
+ { "ciphersuites", OPT_CIPHERSUITES, 's',
+ "Specify TLSv1.3 ciphersuites to be used" },
#ifndef OPENSSL_NO_SSL3
- {"ssl3", OPT_SSL3, '-', "Just use SSLv3"},
+ { "ssl3", OPT_SSL3, '-', "Just use SSLv3" },
#endif
#ifndef OPENSSL_NO_TLS1
- {"tls1", OPT_TLS1, '-', "Just use TLSv1.0"},
+ { "tls1", OPT_TLS1, '-', "Just use TLSv1.0" },
#endif
#ifndef OPENSSL_NO_TLS1_1
- {"tls1_1", OPT_TLS1_1, '-', "Just use TLSv1.1"},
+ { "tls1_1", OPT_TLS1_1, '-', "Just use TLSv1.1" },
#endif
#ifndef OPENSSL_NO_TLS1_2
- {"tls1_2", OPT_TLS1_2, '-', "Just use TLSv1.2"},
+ { "tls1_2", OPT_TLS1_2, '-', "Just use TLSv1.2" },
#endif
#ifndef OPENSSL_NO_TLS1_3
- {"tls1_3", OPT_TLS1_3, '-', "Just use TLSv1.3"},
+ { "tls1_3", OPT_TLS1_3, '-', "Just use TLSv1.3" },
#endif
- {"verify", OPT_VERIFY, 'p',
- "Turn on peer certificate verification, set depth"},
- {"time", OPT_TIME, 'p', "Seconds to collect data, default " SECONDSSTR},
- {"www", OPT_WWW, 's', "Fetch specified page from the site"},
+ { "verify", OPT_VERIFY, 'p',
+ "Turn on peer certificate verification, set depth" },
+ { "time", OPT_TIME, 'p', "Seconds to collect data, default " SECONDSSTR },
+ { "www", OPT_WWW, 's', "Fetch specified page from the site" },
OPT_SECTION("Certificate"),
- {"nameopt", OPT_NAMEOPT, 's', "Certificate subject/issuer name printing options"},
- {"cert", OPT_CERT, '<', "Cert file to use, PEM format assumed"},
- {"key", OPT_KEY, '<', "File with key, PEM; default is -cert file"},
- {"cafile", OPT_CAFILE, '<', "PEM format file of CA's"},
- {"CAfile", OPT_CAFILE, '<', "PEM format file of CA's"},
- {"CApath", OPT_CAPATH, '/', "PEM format directory of CA's"},
- {"CAstore", OPT_CASTORE, ':', "URI to store of CA's"},
- {"no-CAfile", OPT_NOCAFILE, '-',
- "Do not load the default certificates file"},
- {"no-CApath", OPT_NOCAPATH, '-',
- "Do not load certificates from the default certificates directory"},
- {"no-CAstore", OPT_NOCASTORE, '-',
- "Do not load certificates from the default certificates store URI"},
+ { "nameopt", OPT_NAMEOPT, 's', "Certificate subject/issuer name printing options" },
+ { "cert", OPT_CERT, '<', "Cert file to use, PEM format assumed" },
+ { "key", OPT_KEY, '<', "File with key, PEM; default is -cert file" },
+ { "cafile", OPT_CAFILE, '<', "PEM format file of CA's" },
+ { "CAfile", OPT_CAFILE, '<', "PEM format file of CA's" },
+ { "CApath", OPT_CAPATH, '/', "PEM format directory of CA's" },
+ { "CAstore", OPT_CASTORE, ':', "URI to store of CA's" },
+ { "no-CAfile", OPT_NOCAFILE, '-',
+ "Do not load the default certificates file" },
+ { "no-CApath", OPT_NOCAPATH, '-',
+ "Do not load certificates from the default certificates directory" },
+ { "no-CAstore", OPT_NOCASTORE, '-',
+ "Do not load certificates from the default certificates store URI" },
OPT_PROV_OPTIONS,
- {NULL}
+ { NULL }
};
-#define START 0
-#define STOP 1
+#define START 0
+#define STOP 1
static double tm_Time_F(int s)
{
@@ -138,7 +156,7 @@ int s_time_main(int argc, char **argv)
switch (o) {
case OPT_EOF:
case OPT_ERR:
- opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
case OPT_HELP:
@@ -158,7 +176,7 @@ int s_time_main(int argc, char **argv)
verify_args.depth = opt_int_arg();
want_verify = 1;
BIO_printf(bio_err, "%s: verify depth is %d\n",
- prog, verify_args.depth);
+ prog, verify_args.depth);
break;
case OPT_CERT:
certfile = opt_arg();
@@ -261,7 +279,7 @@ int s_time_main(int argc, char **argv)
goto end;
if (!ctx_set_verify_locations(ctx, CAfile, noCAfile, CApath, noCApath,
- CAstore, noCAstore)) {
+ CAstore, noCAstore)) {
ERR_print_errors(bio_err);
goto end;
}
@@ -292,7 +310,7 @@ int s_time_main(int argc, char **argv)
if (www_path != NULL) {
buf_len = BIO_snprintf(buf, sizeof(buf), fmt_http_get_cmd,
- www_path);
+ www_path);
if (buf_len <= 0 || SSL_write(scon, buf, buf_len) <= 0)
goto end;
while ((i = SSL_read(scon, buf, sizeof(buf))) > 0)
@@ -321,19 +339,17 @@ int s_time_main(int argc, char **argv)
}
totalTime += tm_Time_F(STOP); /* Add the time for this iteration */
- printf
- ("\n\n%d connections in %.2fs; %.2f connections/user sec, bytes read %ld\n",
- nConn, totalTime, ((double)nConn / totalTime), bytes_read);
- printf
- ("%d connections in %ld real seconds, %ld bytes read per connection\n",
- nConn, (long)time(NULL) - finishtime + maxtime,
- nConn > 0 ? bytes_read / nConn : 0l);
+ printf("\n\n%d connections in %.2fs; %.2f connections/user sec, bytes read %ld\n",
+ nConn, totalTime, ((double)nConn / totalTime), bytes_read);
+ printf("%d connections in %ld real seconds, %ld bytes read per connection\n",
+ nConn, (long)time(NULL) - finishtime + maxtime,
+ nConn > 0 ? bytes_read / nConn : 0l);
/*
* Now loop and time connections using the same session id over and over
*/
- next:
+next:
if (!(perform & 2)) {
ret = 0;
goto end;
@@ -375,7 +391,7 @@ int s_time_main(int argc, char **argv)
if (www_path != NULL) {
buf_len = BIO_snprintf(buf, sizeof(buf), fmt_http_get_cmd,
- www_path);
+ www_path);
if (buf_len <= 0 || SSL_write(scon, buf, buf_len) <= 0)
goto end;
while ((i = SSL_read(scon, buf, sizeof(buf))) > 0)
@@ -402,19 +418,17 @@ int s_time_main(int argc, char **argv)
}
totalTime += tm_Time_F(STOP); /* Add the time for this iteration */
- printf
- ("\n\n%d connections in %.2fs; %.2f connections/user sec, bytes read %ld\n",
- nConn, totalTime, ((double)nConn / totalTime), bytes_read);
+ printf("\n\n%d connections in %.2fs; %.2f connections/user sec, bytes read %ld\n",
+ nConn, totalTime, ((double)nConn / totalTime), bytes_read);
if (nConn > 0)
- printf
- ("%d connections in %ld real seconds, %ld bytes read per connection\n",
- nConn, (long)time(NULL) - finishtime + maxtime, bytes_read / nConn);
+ printf("%d connections in %ld real seconds, %ld bytes read per connection\n",
+ nConn, (long)time(NULL) - finishtime + maxtime, bytes_read / nConn);
else
printf("0 connections in %ld real seconds\n",
- (long)time(NULL) - finishtime + maxtime);
+ (long)time(NULL) - finishtime + maxtime);
ret = 0;
- end:
+end:
SSL_free(scon);
SSL_CTX_free(ctx);
return ret;
@@ -433,7 +447,7 @@ static SSL *doConnection(SSL *scon, const char *host, SSL_CTX *ctx)
return NULL;
if (BIO_set_conn_hostname(conn, host) <= 0
- || BIO_set_conn_mode(conn, BIO_SOCK_NODELAY) <= 0) {
+ || BIO_set_conn_mode(conn, BIO_SOCK_NODELAY) <= 0) {
BIO_free(conn);
return NULL;
}
@@ -467,7 +481,7 @@ static SSL *doConnection(SSL *scon, const char *host, SSL_CTX *ctx)
BIO_printf(bio_err, "ERROR\n");
if (verify_args.error != X509_V_OK)
BIO_printf(bio_err, "verify error:%s\n",
- X509_verify_cert_error_string(verify_args.error));
+ X509_verify_cert_error_string(verify_args.error));
else
ERR_print_errors(bio_err);
if (scon == NULL)
@@ -480,12 +494,12 @@ static SSL *doConnection(SSL *scon, const char *host, SSL_CTX *ctx)
struct linger no_linger;
int fd;
- no_linger.l_onoff = 1;
+ no_linger.l_onoff = 1;
no_linger.l_linger = 0;
fd = SSL_get_fd(serverCon);
if (fd >= 0)
- (void)setsockopt(fd, SOL_SOCKET, SO_LINGER, (char*)&no_linger,
- sizeof(no_linger));
+ (void)setsockopt(fd, SOL_SOCKET, SO_LINGER, (char *)&no_linger,
+ sizeof(no_linger));
}
#endif
diff --git a/apps/sess_id.c b/apps/sess_id.c
index c8dddc84aa..130670d1de 100644
--- a/apps/sess_id.c
+++ b/apps/sess_id.c
@@ -20,27 +20,33 @@
typedef enum OPTION_choice {
OPT_COMMON,
- OPT_INFORM, OPT_OUTFORM, OPT_IN, OPT_OUT,
- OPT_TEXT, OPT_CERT, OPT_NOOUT, OPT_CONTEXT
+ OPT_INFORM,
+ OPT_OUTFORM,
+ OPT_IN,
+ OPT_OUT,
+ OPT_TEXT,
+ OPT_CERT,
+ OPT_NOOUT,
+ OPT_CONTEXT
} OPTION_CHOICE;
const OPTIONS sess_id_options[] = {
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
- {"context", OPT_CONTEXT, 's', "Set the session ID context"},
+ { "help", OPT_HELP, '-', "Display this summary" },
+ { "context", OPT_CONTEXT, 's', "Set the session ID context" },
OPT_SECTION("Input"),
- {"in", OPT_IN, 's', "Input file - default stdin"},
- {"inform", OPT_INFORM, 'F', "Input format - default PEM (DER or PEM)"},
+ { "in", OPT_IN, 's', "Input file - default stdin" },
+ { "inform", OPT_INFORM, 'F', "Input format - default PEM (DER or PEM)" },
OPT_SECTION("Output"),
- {"out", OPT_OUT, '>', "Output file - default stdout"},
- {"outform", OPT_OUTFORM, 'f',
- "Output format - default PEM (PEM, DER or NSS)"},
- {"text", OPT_TEXT, '-', "Print ssl session id details"},
- {"cert", OPT_CERT, '-', "Output certificate "},
- {"noout", OPT_NOOUT, '-', "Don't output the encoded session info"},
- {NULL}
+ { "out", OPT_OUT, '>', "Output file - default stdout" },
+ { "outform", OPT_OUTFORM, 'f',
+ "Output format - default PEM (PEM, DER or NSS)" },
+ { "text", OPT_TEXT, '-', "Print ssl session id details" },
+ { "cert", OPT_CERT, '-', "Output certificate " },
+ { "noout", OPT_NOOUT, '-', "Don't output the encoded session info" },
+ { NULL }
};
static SSL_SESSION *load_sess_id(char *file, int format);
@@ -60,7 +66,7 @@ int sess_id_main(int argc, char **argv)
switch (o) {
case OPT_EOF:
case OPT_ERR:
- opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
case OPT_HELP:
@@ -73,7 +79,7 @@ int sess_id_main(int argc, char **argv)
break;
case OPT_OUTFORM:
if (!opt_format(opt_arg(), OPT_FMT_PEMDER | OPT_FMT_NSS,
- &outformat))
+ &outformat))
goto opthelp;
break;
case OPT_IN:
@@ -114,7 +120,7 @@ int sess_id_main(int argc, char **argv)
goto end;
}
if (!SSL_SESSION_set1_id_context(x, (unsigned char *)context,
- (unsigned int)ctx_len)) {
+ (unsigned int)ctx_len)) {
BIO_printf(bio_err, "Error setting id context\n");
goto end;
}
@@ -167,7 +173,7 @@ int sess_id_main(int argc, char **argv)
}
}
ret = 0;
- end:
+end:
BIO_free_all(out);
SSL_SESSION_free(x);
return ret;
@@ -191,7 +197,7 @@ static SSL_SESSION *load_sess_id(char *infile, int format)
goto end;
}
- end:
+end:
BIO_free(in);
return x;
}
diff --git a/apps/skeyutl.c b/apps/skeyutl.c
index bc744f785b..2404a8e8aa 100644
--- a/apps/skeyutl.c
+++ b/apps/skeyutl.c
@@ -21,18 +21,20 @@ typedef enum OPTION_choice {
OPT_COMMON,
OPT_PROV_ENUM,
OPT_CIPHER,
- OPT_SKEYOPT, OPT_SKEYMGMT, OPT_GENKEY
+ OPT_SKEYOPT,
+ OPT_SKEYMGMT,
+ OPT_GENKEY
} OPTION_CHOICE;
const OPTIONS skeyutl_options[] = {
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
- {"skeyopt", OPT_SKEYOPT, 's', "Key options as opt:value for opaque keys handling"},
- {"skeymgmt", OPT_SKEYMGMT, 's', "Symmetric key management name for opaque keys handling"},
- {"genkey", OPT_GENKEY, '-', "Generate an opaque symmetric key"},
- {"cipher", OPT_CIPHER, 's', "The cipher to generate key for"},
+ { "help", OPT_HELP, '-', "Display this summary" },
+ { "skeyopt", OPT_SKEYOPT, 's', "Key options as opt:value for opaque keys handling" },
+ { "skeymgmt", OPT_SKEYMGMT, 's', "Symmetric key management name for opaque keys handling" },
+ { "genkey", OPT_GENKEY, '-', "Generate an opaque symmetric key" },
+ { "cipher", OPT_CIPHER, 's', "The cipher to generate key for" },
OPT_PROV_OPTIONS,
- {NULL}
+ { NULL }
};
int skeyutl_main(int argc, char **argv)
@@ -52,7 +54,7 @@ int skeyutl_main(int argc, char **argv)
switch (o) {
case OPT_EOF:
case OPT_ERR:
- opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
case OPT_HELP:
@@ -66,9 +68,7 @@ int skeyutl_main(int argc, char **argv)
ciphername = opt_arg();
break;
case OPT_SKEYOPT:
- if ((skeyopts == NULL &&
- (skeyopts = sk_OPENSSL_STRING_new_null()) == NULL) ||
- sk_OPENSSL_STRING_push(skeyopts, opt_arg()) == 0) {
+ if ((skeyopts == NULL && (skeyopts = sk_OPENSSL_STRING_new_null()) == NULL) || sk_OPENSSL_STRING_push(skeyopts, opt_arg()) == 0) {
BIO_printf(bio_err, "%s: out of memory\n", prog);
goto end;
}
@@ -96,26 +96,26 @@ int skeyutl_main(int argc, char **argv)
OSSL_PARAM *params = NULL;
mgmt = EVP_SKEYMGMT_fetch(app_get0_libctx(),
- skeymgmt ? skeymgmt : EVP_CIPHER_name(cipher),
- app_get0_propq());
+ skeymgmt ? skeymgmt : EVP_CIPHER_name(cipher),
+ app_get0_propq());
if (mgmt == NULL)
goto end;
params = app_params_new_from_opts(skeyopts,
- EVP_SKEYMGMT_get0_gen_settable_params(mgmt));
+ EVP_SKEYMGMT_get0_gen_settable_params(mgmt));
skey = EVP_SKEY_generate(app_get0_libctx(),
- skeymgmt ? skeymgmt : EVP_CIPHER_name(cipher),
- app_get0_propq(), params);
+ skeymgmt ? skeymgmt : EVP_CIPHER_name(cipher),
+ app_get0_propq(), params);
OSSL_PARAM_free(params);
if (skey == NULL) {
BIO_printf(bio_err, "Error creating opaque key for skeymgmt %s\n",
- skeymgmt ? skeymgmt : EVP_CIPHER_name(cipher));
+ skeymgmt ? skeymgmt : EVP_CIPHER_name(cipher));
ERR_print_errors(bio_err);
} else {
const char *key_name = EVP_SKEY_get0_key_id(skey);
BIO_printf(bio_out, "An opaque key identified by %s is created\n",
- key_name ? key_name : "<unknown>");
+ key_name ? key_name : "<unknown>");
BIO_printf(bio_out, "Provider: %s\n", EVP_SKEY_get0_provider_name(skey));
BIO_printf(bio_out, "Key management: %s\n", EVP_SKEY_get0_skeymgmt_name(skey));
ret = 0;
@@ -125,7 +125,7 @@ int skeyutl_main(int argc, char **argv)
BIO_printf(bio_err, "Key generation is the only supported operation as of now\n");
}
- end:
+end:
ERR_print_errors(bio_err);
sk_OPENSSL_STRING_free(skeyopts);
EVP_SKEYMGMT_free(mgmt);
diff --git a/apps/smime.c b/apps/smime.c
index 6e0aa92c17..458056c04d 100644
--- a/apps/smime.c
+++ b/apps/smime.c
@@ -22,111 +22,145 @@
static int save_certs(char *signerfile, STACK_OF(X509) *signers);
static int smime_cb(int ok, X509_STORE_CTX *ctx);
-#define SMIME_OP 0x10
-#define SMIME_IP 0x20
-#define SMIME_SIGNERS 0x40
-#define SMIME_ENCRYPT (1 | SMIME_OP)
-#define SMIME_DECRYPT (2 | SMIME_IP)
-#define SMIME_SIGN (3 | SMIME_OP | SMIME_SIGNERS)
-#define SMIME_RESIGN (6 | SMIME_IP | SMIME_OP | SMIME_SIGNERS)
-#define SMIME_VERIFY (4 | SMIME_IP)
-#define SMIME_PK7OUT (5 | SMIME_IP | SMIME_OP)
+#define SMIME_OP 0x10
+#define SMIME_IP 0x20
+#define SMIME_SIGNERS 0x40
+#define SMIME_ENCRYPT (1 | SMIME_OP)
+#define SMIME_DECRYPT (2 | SMIME_IP)
+#define SMIME_SIGN (3 | SMIME_OP | SMIME_SIGNERS)
+#define SMIME_RESIGN (6 | SMIME_IP | SMIME_OP | SMIME_SIGNERS)
+#define SMIME_VERIFY (4 | SMIME_IP)
+#define SMIME_PK7OUT (5 | SMIME_IP | SMIME_OP)
typedef enum OPTION_choice {
OPT_COMMON,
- OPT_ENCRYPT, OPT_DECRYPT, OPT_SIGN, OPT_RESIGN, OPT_VERIFY,
- OPT_PK7OUT, OPT_TEXT, OPT_NOINTERN, OPT_NOVERIFY, OPT_NOCHAIN,
- OPT_NOCERTS, OPT_NOATTR, OPT_NODETACH, OPT_NOSMIMECAP,
- OPT_BINARY, OPT_NOSIGS, OPT_STREAM, OPT_INDEF, OPT_NOINDEF,
- OPT_CRLFEOL, OPT_PASSIN,
- OPT_TO, OPT_FROM, OPT_SUBJECT, OPT_SIGNER, OPT_RECIP, OPT_MD,
- OPT_CIPHER, OPT_INKEY, OPT_KEYFORM, OPT_CERTFILE, OPT_CAFILE,
- OPT_CAPATH, OPT_CASTORE, OPT_NOCAFILE, OPT_NOCAPATH, OPT_NOCASTORE,
- OPT_R_ENUM, OPT_PROV_ENUM, OPT_CONFIG,
+ OPT_ENCRYPT,
+ OPT_DECRYPT,
+ OPT_SIGN,
+ OPT_RESIGN,
+ OPT_VERIFY,
+ OPT_PK7OUT,
+ OPT_TEXT,
+ OPT_NOINTERN,
+ OPT_NOVERIFY,
+ OPT_NOCHAIN,
+ OPT_NOCERTS,
+ OPT_NOATTR,
+ OPT_NODETACH,
+ OPT_NOSMIMECAP,
+ OPT_BINARY,
+ OPT_NOSIGS,
+ OPT_STREAM,
+ OPT_INDEF,
+ OPT_NOINDEF,
+ OPT_CRLFEOL,
+ OPT_PASSIN,
+ OPT_TO,
+ OPT_FROM,
+ OPT_SUBJECT,
+ OPT_SIGNER,
+ OPT_RECIP,
+ OPT_MD,
+ OPT_CIPHER,
+ OPT_INKEY,
+ OPT_KEYFORM,
+ OPT_CERTFILE,
+ OPT_CAFILE,
+ OPT_CAPATH,
+ OPT_CASTORE,
+ OPT_NOCAFILE,
+ OPT_NOCAPATH,
+ OPT_NOCASTORE,
+ OPT_R_ENUM,
+ OPT_PROV_ENUM,
+ OPT_CONFIG,
OPT_V_ENUM,
- OPT_IN, OPT_INFORM, OPT_OUT,
- OPT_OUTFORM, OPT_CONTENT
+ OPT_IN,
+ OPT_INFORM,
+ OPT_OUT,
+ OPT_OUTFORM,
+ OPT_CONTENT
} OPTION_CHOICE;
const OPTIONS smime_options[] = {
- {OPT_HELP_STR, 1, '-', "Usage: %s [options] [cert...]\n"},
+ { OPT_HELP_STR, 1, '-', "Usage: %s [options] [cert...]\n" },
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
- {"in", OPT_IN, '<', "Input file"},
- {"inform", OPT_INFORM, 'c', "Input format SMIME (default), PEM or DER"},
- {"out", OPT_OUT, '>', "Output file"},
- {"outform", OPT_OUTFORM, 'c',
- "Output format SMIME (default), PEM or DER"},
- {"inkey", OPT_INKEY, 's',
- "Input private key (if not signer or recipient)"},
- {"keyform", OPT_KEYFORM, 'f', "Input private key format (DER/PEM)"},
- {"stream", OPT_STREAM, '-', "Enable CMS streaming" },
- {"indef", OPT_INDEF, '-', "Same as -stream" },
- {"noindef", OPT_NOINDEF, '-', "Disable CMS streaming"},
+ { "help", OPT_HELP, '-', "Display this summary" },
+ { "in", OPT_IN, '<', "Input file" },
+ { "inform", OPT_INFORM, 'c', "Input format SMIME (default), PEM or DER" },
+ { "out", OPT_OUT, '>', "Output file" },
+ { "outform", OPT_OUTFORM, 'c',
+ "Output format SMIME (default), PEM or DER" },
+ { "inkey", OPT_INKEY, 's',
+ "Input private key (if not signer or recipient)" },
+ { "keyform", OPT_KEYFORM, 'f', "Input private key format (DER/PEM)" },
+ { "stream", OPT_STREAM, '-', "Enable CMS streaming" },
+ { "indef", OPT_INDEF, '-', "Same as -stream" },
+ { "noindef", OPT_NOINDEF, '-', "Disable CMS streaming" },
OPT_CONFIG_OPTION,
OPT_SECTION("Action"),
- {"encrypt", OPT_ENCRYPT, '-', "Encrypt message"},
- {"decrypt", OPT_DECRYPT, '-', "Decrypt encrypted message"},
- {"sign", OPT_SIGN, '-', "Sign message"},
- {"resign", OPT_RESIGN, '-', "Resign a signed message"},
- {"verify", OPT_VERIFY, '-', "Verify signed message"},
- {"pk7out", OPT_PK7OUT, '-', "Output PKCS#7 structure"},
+ { "encrypt", OPT_ENCRYPT, '-', "Encrypt message" },
+ { "decrypt", OPT_DECRYPT, '-', "Decrypt encrypted message" },
+ { "sign", OPT_SIGN, '-', "Sign message" },
+ { "resign", OPT_RESIGN, '-', "Resign a signed message" },
+ { "verify", OPT_VERIFY, '-', "Verify signed message" },
+ { "pk7out", OPT_PK7OUT, '-', "Output PKCS#7 structure" },
OPT_SECTION("Signing/Encryption"),
- {"passin", OPT_PASSIN, 's', "Input file pass phrase source"},
- {"md", OPT_MD, 's', "Digest algorithm to use when signing or resigning"},
- {"", OPT_CIPHER, '-', "Any supported cipher"},
- {"nointern", OPT_NOINTERN, '-',
- "Don't search certificates in message for signer"},
- {"nodetach", OPT_NODETACH, '-', "Use opaque signing"},
- {"noattr", OPT_NOATTR, '-', "Don't include any signed attributes"},
- {"binary", OPT_BINARY, '-', "Don't translate message to text"},
- {"signer", OPT_SIGNER, 's', "Signer certificate file"},
- {"content", OPT_CONTENT, '<',
- "Supply or override content for detached signature"},
- {"nocerts", OPT_NOCERTS, '-',
- "Don't include signers certificate when signing"},
+ { "passin", OPT_PASSIN, 's', "Input file pass phrase source" },
+ { "md", OPT_MD, 's', "Digest algorithm to use when signing or resigning" },
+ { "", OPT_CIPHER, '-', "Any supported cipher" },
+ { "nointern", OPT_NOINTERN, '-',
+ "Don't search certificates in message for signer" },
+ { "nodetach", OPT_NODETACH, '-', "Use opaque signing" },
+ { "noattr", OPT_NOATTR, '-', "Don't include any signed attributes" },
+ { "binary", OPT_BINARY, '-', "Don't translate message to text" },
+ { "signer", OPT_SIGNER, 's', "Signer certificate file" },
+ { "content", OPT_CONTENT, '<',
+ "Supply or override content for detached signature" },
+ { "nocerts", OPT_NOCERTS, '-',
+ "Don't include signers certificate when signing" },
OPT_SECTION("Verification/Decryption"),
- {"nosigs", OPT_NOSIGS, '-', "Don't verify message signature"},
- {"noverify", OPT_NOVERIFY, '-', "Don't verify signers certificate"},
+ { "nosigs", OPT_NOSIGS, '-', "Don't verify message signature" },
+ { "noverify", OPT_NOVERIFY, '-', "Don't verify signers certificate" },
- {"certfile", OPT_CERTFILE, '<',
- "Extra signer and intermediate CA certificates to include when signing"},
- {OPT_MORE_STR, 0, 0,
- "or to use as preferred signer certs and for chain building when verifying"},
- {"recip", OPT_RECIP, '<', "Recipient certificate file for decryption"},
+ { "certfile", OPT_CERTFILE, '<',
+ "Extra signer and intermediate CA certificates to include when signing" },
+ { OPT_MORE_STR, 0, 0,
+ "or to use as preferred signer certs and for chain building when verifying" },
+ { "recip", OPT_RECIP, '<', "Recipient certificate file for decryption" },
OPT_SECTION("Email"),
- {"to", OPT_TO, 's', "To address"},
- {"from", OPT_FROM, 's', "From address"},
- {"subject", OPT_SUBJECT, 's', "Subject"},
- {"text", OPT_TEXT, '-', "Include or delete text MIME headers"},
- {"nosmimecap", OPT_NOSMIMECAP, '-', "Omit the SMIMECapabilities attribute"},
+ { "to", OPT_TO, 's', "To address" },
+ { "from", OPT_FROM, 's', "From address" },
+ { "subject", OPT_SUBJECT, 's', "Subject" },
+ { "text", OPT_TEXT, '-', "Include or delete text MIME headers" },
+ { "nosmimecap", OPT_NOSMIMECAP, '-', "Omit the SMIMECapabilities attribute" },
OPT_SECTION("Certificate chain"),
- {"CApath", OPT_CAPATH, '/', "Trusted certificates directory"},
- {"CAfile", OPT_CAFILE, '<', "Trusted certificates file"},
- {"CAstore", OPT_CASTORE, ':', "Trusted certificates store URI"},
- {"no-CAfile", OPT_NOCAFILE, '-',
- "Do not load the default certificates file"},
- {"no-CApath", OPT_NOCAPATH, '-',
- "Do not load certificates from the default certificates directory"},
- {"no-CAstore", OPT_NOCASTORE, '-',
- "Do not load certificates from the default certificates store"},
- {"nochain", OPT_NOCHAIN, '-',
- "set PKCS7_NOCHAIN so certificates contained in the message are not used as untrusted CAs" },
- {"crlfeol", OPT_CRLFEOL, '-', "Use CRLF as EOL termination instead of LF only"},
+ { "CApath", OPT_CAPATH, '/', "Trusted certificates directory" },
+ { "CAfile", OPT_CAFILE, '<', "Trusted certificates file" },
+ { "CAstore", OPT_CASTORE, ':', "Trusted certificates store URI" },
+ { "no-CAfile", OPT_NOCAFILE, '-',
+ "Do not load the default certificates file" },
+ { "no-CApath", OPT_NOCAPATH, '-',
+ "Do not load certificates from the default certificates directory" },
+ { "no-CAstore", OPT_NOCASTORE, '-',
+ "Do not load certificates from the default certificates store" },
+ { "nochain", OPT_NOCHAIN, '-',
+ "set PKCS7_NOCHAIN so certificates contained in the message are not used as untrusted CAs" },
+ { "crlfeol", OPT_CRLFEOL, '-', "Use CRLF as EOL termination instead of LF only" },
OPT_R_OPTIONS,
OPT_V_OPTIONS,
OPT_PROV_OPTIONS,
OPT_PARAMETERS(),
- {"cert", 0, 0, "Recipient certs, used when encrypting"},
- {NULL}
+ { "cert", 0, 0, "Recipient certs, used when encrypting" },
+ { NULL }
};
static const char *operation_name(int operation)
@@ -149,11 +183,10 @@ static const char *operation_name(int operation)
}
}
-#define SET_OPERATION(op) \
- ((operation != 0 && (operation != (op))) \
- ? 0 * BIO_printf(bio_err, "%s: Cannot use -%s together with -%s\n", \
- prog, operation_name(op), operation_name(operation)) \
- : (operation = (op)))
+#define SET_OPERATION(op) \
+ ((operation != 0 && (operation != (op))) \
+ ? 0 * BIO_printf(bio_err, "%s: Cannot use -%s together with -%s\n", prog, operation_name(op), operation_name(operation)) \
+ : (operation = (op)))
int smime_main(int argc, char **argv)
{
@@ -176,8 +209,7 @@ int smime_main(int argc, char **argv)
OPTION_CHOICE o;
int noCApath = 0, noCAfile = 0, noCAstore = 0;
int flags = PKCS7_DETACHED, operation = 0, ret = 0, indef = 0;
- int informat = FORMAT_SMIME, outformat = FORMAT_SMIME, keyform =
- FORMAT_UNDEF;
+ int informat = FORMAT_SMIME, outformat = FORMAT_SMIME, keyform = FORMAT_UNDEF;
int vpmtouched = 0, rv = 0;
const char *mime_eol = "\n";
OSSL_LIB_CTX *libctx = app_get0_libctx();
@@ -191,7 +223,7 @@ int smime_main(int argc, char **argv)
switch (o) {
case OPT_EOF:
case OPT_ERR:
- opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
case OPT_HELP:
@@ -335,7 +367,7 @@ int smime_main(int argc, char **argv)
if (keyfile != NULL) {
if (signerfile == NULL) {
BIO_printf(bio_err,
- "%s: Must have -signer before -inkey\n", prog);
+ "%s: Must have -signer before -inkey\n", prog);
goto opthelp;
}
if (sksigners == NULL
@@ -400,14 +432,14 @@ int smime_main(int argc, char **argv)
goto opthelp;
}
if (!opt_cipher_any(ciphername, &cipher))
- goto opthelp;
+ goto opthelp;
if (!(operation & SMIME_SIGNERS) && (skkeys != NULL || sksigners != NULL)) {
BIO_puts(bio_err, "Multiple signers or keys not allowed\n");
goto opthelp;
}
if (!operation) {
BIO_puts(bio_err,
- "No operation (-encrypt|-sign|...) specified\n");
+ "No operation (-encrypt|-sign|...) specified\n");
goto opthelp;
}
@@ -439,7 +471,7 @@ int smime_main(int argc, char **argv)
} else if (operation == SMIME_DECRYPT) {
if (recipfile == NULL && keyfile == NULL) {
BIO_printf(bio_err,
- "No recipient certificate or key specified\n");
+ "No recipient certificate or key specified\n");
goto opthelp;
}
} else if (operation == SMIME_ENCRYPT) {
@@ -477,7 +509,7 @@ int smime_main(int argc, char **argv)
goto end;
while (*argv != NULL) {
cert = load_cert(*argv, FORMAT_UNDEF,
- "recipient certificate file");
+ "recipient certificate file");
if (cert == NULL)
goto end;
if (!sk_X509_push(encerts, cert))
@@ -496,7 +528,8 @@ int smime_main(int argc, char **argv)
if (recipfile != NULL && (operation == SMIME_DECRYPT)) {
if ((recip = load_cert(recipfile, FORMAT_UNDEF,
- "recipient certificate file")) == NULL) {
+ "recipient certificate file"))
+ == NULL) {
ERR_print_errors(bio_err);
goto end;
}
@@ -560,7 +593,8 @@ int smime_main(int argc, char **argv)
if (operation == SMIME_VERIFY) {
if ((store = setup_verify(CAfile, noCAfile, CApath, noCApath,
- CAstore, noCAstore)) == NULL)
+ CAstore, noCAstore))
+ == NULL)
goto end;
X509_STORE_set_verify_cb(store, smime_cb);
if (vpmtouched)
@@ -678,7 +712,7 @@ int smime_main(int argc, char **argv)
}
}
ret = 0;
- end:
+end:
if (ret)
ERR_print_errors(bio_err);
OSSL_STACK_OF_X509_free(encerts);
diff --git a/apps/speed.c b/apps/speed.c
index 4467385746..bd1a0da705 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -9,18 +9,18 @@
*/
#undef SECONDS
-#define SECONDS 3
-#define PKEY_SECONDS 10
-
-#define RSA_SECONDS PKEY_SECONDS
-#define DSA_SECONDS PKEY_SECONDS
-#define ECDSA_SECONDS PKEY_SECONDS
-#define ECDH_SECONDS PKEY_SECONDS
-#define EdDSA_SECONDS PKEY_SECONDS
-#define SM2_SECONDS PKEY_SECONDS
-#define FFDH_SECONDS PKEY_SECONDS
-#define KEM_SECONDS PKEY_SECONDS
-#define SIG_SECONDS PKEY_SECONDS
+#define SECONDS 3
+#define PKEY_SECONDS 10
+
+#define RSA_SECONDS PKEY_SECONDS
+#define DSA_SECONDS PKEY_SECONDS
+#define ECDSA_SECONDS PKEY_SECONDS
+#define ECDH_SECONDS PKEY_SECONDS
+#define EdDSA_SECONDS PKEY_SECONDS
+#define SM2_SECONDS PKEY_SECONDS
+#define FFDH_SECONDS PKEY_SECONDS
+#define KEM_SECONDS PKEY_SECONDS
+#define SIG_SECONDS PKEY_SECONDS
#define MAX_ALGNAME_SUFFIX 100
@@ -45,33 +45,32 @@
#include <openssl/async.h>
#include <openssl/provider.h>
#if !defined(OPENSSL_SYS_MSDOS)
-# include <unistd.h>
+#include <unistd.h>
#endif
#if defined(_WIN32)
-# include <windows.h>
+#include <windows.h>
/*
* While VirtualLock is available under the app partition (e.g. UWP),
* the headers do not define the API. Define it ourselves instead.
*/
WINBASEAPI
BOOL
-WINAPI
-VirtualLock(
- _In_ LPVOID lpAddress,
- _In_ SIZE_T dwSize
- );
+ WINAPI
+ VirtualLock(
+ _In_ LPVOID lpAddress,
+ _In_ SIZE_T dwSize);
#endif
#if defined(OPENSSL_SYS_LINUX)
-# include <sys/mman.h>
+#include <sys/mman.h>
#endif
#include <openssl/bn.h>
#include <openssl/rsa.h>
#include "./testrsa.h"
#ifndef OPENSSL_NO_DH
-# include <openssl/dh.h>
+#include <openssl/dh.h>
#endif
#include <openssl/x509.h>
#include <openssl/dsa.h>
@@ -79,27 +78,27 @@ VirtualLock(
#include <openssl/modes.h>
#ifndef HAVE_FORK
-# if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_VXWORKS)
-# define HAVE_FORK 0
-# else
-# define HAVE_FORK 1
-# include <sys/wait.h>
-# endif
+#if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_VXWORKS)
+#define HAVE_FORK 0
+#else
+#define HAVE_FORK 1
+#include <sys/wait.h>
+#endif
#endif
#if HAVE_FORK
-# undef NO_FORK
+#undef NO_FORK
#else
-# define NO_FORK
+#define NO_FORK
#endif
#define MAX_MISALIGNMENT 63
-#define MAX_ECDH_SIZE 256
-#define MISALIGN 64
+#define MAX_ECDH_SIZE 256
+#define MISALIGN 64
#define MAX_FFDH_SIZE 1024
#ifndef RSA_DEFAULT_PRIME_NUM
-# define RSA_DEFAULT_PRIME_NUM 2
+#define RSA_DEFAULT_PRIME_NUM 2
#endif
typedef struct openssl_speed_sec_st {
@@ -117,13 +116,13 @@ typedef struct openssl_speed_sec_st {
static volatile int run = 0;
-static int mr = 0; /* machine-readeable output format to merge fork results */
+static int mr = 0; /* machine-readeable output format to merge fork results */
static int usertime = 1;
static double Time_F(int s);
static void print_message(const char *s, int length, int tm);
static void pkey_print_message(const char *str, const char *str2,
- unsigned int bits, int sec);
+ unsigned int bits, int sec);
static void kskey_print_message(const char *str, const char *str2, int tm);
static void print_result(int alg, int run_no, int count, double time_used);
#ifndef NO_FORK
@@ -137,15 +136,15 @@ static int testmoderesult = 0;
static const int lengths_list[] = {
16, 64, 256, 1024, 8 * 1024, 16 * 1024
};
-#define SIZE_NUM OSSL_NELEM(lengths_list)
+#define SIZE_NUM OSSL_NELEM(lengths_list)
static const int *lengths = lengths_list;
static const int aead_lengths_list[] = {
2, 31, 136, 1024, 8 * 1024, 16 * 1024
};
-#define START 0
-#define STOP 1
+#define START 0
+#define STOP 1
#ifdef SIGALRM
@@ -165,7 +164,7 @@ static double Time_F(int s)
#elif defined(_WIN32)
-# define SIGALRM -1
+#define SIGALRM -1
static unsigned int lapse;
static volatile unsigned int schlock;
@@ -174,9 +173,9 @@ static void alarm_win32(unsigned int secs)
lapse = secs * 1000;
}
-# define alarm alarm_win32
+#define alarm alarm_win32
-static DWORD WINAPI sleepy(VOID * arg)
+static DWORD WINAPI sleepy(VOID *arg)
{
schlock = 1;
Sleep(lapse);
@@ -198,7 +197,7 @@ static double Time_F(int s)
ExitProcess(err);
}
while (!schlock)
- Sleep(0); /* scheduler spinlock */
+ Sleep(0); /* scheduler spinlock */
ret = app_tminterval(s, usertime);
} else {
ret = app_tminterval(s, usertime);
@@ -210,14 +209,14 @@ static double Time_F(int s)
return ret;
}
#else
-# error "SIGALRM not defined and the platform is not Windows"
+#error "SIGALRM not defined and the platform is not Windows"
#endif
static void multiblock_speed(const EVP_CIPHER *evp_cipher, int lengths_single,
- const openssl_speed_sec_t *seconds);
+ const openssl_speed_sec_t *seconds);
static int opt_found(const char *name, unsigned int *result,
- const OPT_PAIR pairs[], unsigned int nbelem)
+ const OPT_PAIR pairs[], unsigned int nbelem)
{
unsigned int idx;
@@ -228,80 +227,120 @@ static int opt_found(const char *name, unsigned int *result,
}
return 0;
}
-#define opt_found(value, pairs, result)\
+#define opt_found(value, pairs, result) \
opt_found(value, result, pairs, OSSL_NELEM(pairs))
typedef enum OPTION_choice {
OPT_COMMON,
- OPT_ELAPSED, OPT_EVP, OPT_HMAC, OPT_DECRYPT, OPT_MULTI,
- OPT_MR, OPT_MB, OPT_MISALIGN, OPT_ASYNCJOBS, OPT_R_ENUM, OPT_PROV_ENUM,
- OPT_CONFIG, OPT_PRIMES, OPT_SECONDS, OPT_BYTES, OPT_AEAD, OPT_CMAC,
- OPT_MLOCK, OPT_TESTMODE, OPT_KEM, OPT_SIG
+ OPT_ELAPSED,
+ OPT_EVP,
+ OPT_HMAC,
+ OPT_DECRYPT,
+ OPT_MULTI,
+ OPT_MR,
+ OPT_MB,
+ OPT_MISALIGN,
+ OPT_ASYNCJOBS,
+ OPT_R_ENUM,
+ OPT_PROV_ENUM,
+ OPT_CONFIG,
+ OPT_PRIMES,
+ OPT_SECONDS,
+ OPT_BYTES,
+ OPT_AEAD,
+ OPT_CMAC,
+ OPT_MLOCK,
+ OPT_TESTMODE,
+ OPT_KEM,
+ OPT_SIG
} OPTION_CHOICE;
const OPTIONS speed_options[] = {
- {OPT_HELP_STR, 1, '-',
- "Usage: %s [options] [algorithm...]\n"
- "All +int options consider prefix '0' as base-8 input, "
- "prefix '0x'/'0X' as base-16 input.\n"
- },
+ { OPT_HELP_STR, 1, '-',
+ "Usage: %s [options] [algorithm...]\n"
+ "All +int options consider prefix '0' as base-8 input, "
+ "prefix '0x'/'0X' as base-16 input.\n" },
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
- {"mb", OPT_MB, '-',
- "Enable (tls1>=1) multi-block mode on EVP-named cipher"},
- {"mr", OPT_MR, '-', "Produce machine readable output"},
+ { "help", OPT_HELP, '-', "Display this summary" },
+ { "mb", OPT_MB, '-',
+ "Enable (tls1>=1) multi-block mode on EVP-named cipher" },
+ { "mr", OPT_MR, '-', "Produce machine readable output" },
#ifndef NO_FORK
- {"multi", OPT_MULTI, 'p', "Run benchmarks in parallel"},
+ { "multi", OPT_MULTI, 'p', "Run benchmarks in parallel" },
#endif
#ifndef OPENSSL_NO_ASYNC
- {"async_jobs", OPT_ASYNCJOBS, 'p',
- "Enable async mode and start specified number of jobs"},
+ { "async_jobs", OPT_ASYNCJOBS, 'p',
+ "Enable async mode and start specified number of jobs" },
#endif
- {"primes", OPT_PRIMES, 'p', "Specify number of primes (for RSA only)"},
- {"mlock", OPT_MLOCK, '-', "Lock memory for better result determinism"},
- {"testmode", OPT_TESTMODE, '-', "Run the speed command in test mode"},
+ { "primes", OPT_PRIMES, 'p', "Specify number of primes (for RSA only)" },
+ { "mlock", OPT_MLOCK, '-', "Lock memory for better result determinism" },
+ { "testmode", OPT_TESTMODE, '-', "Run the speed command in test mode" },
OPT_CONFIG_OPTION,
OPT_SECTION("Selection"),
- {"evp", OPT_EVP, 's', "Use EVP-named cipher or digest"},
- {"hmac", OPT_HMAC, 's', "HMAC using EVP-named digest"},
- {"cmac", OPT_CMAC, 's', "CMAC using EVP-named cipher"},
- {"decrypt", OPT_DECRYPT, '-',
- "Time decryption instead of encryption (only EVP)"},
- {"aead", OPT_AEAD, '-',
- "Benchmark EVP-named AEAD cipher in TLS-like sequence"},
- {"kem-algorithms", OPT_KEM, '-',
- "Benchmark KEM algorithms"},
- {"signature-algorithms", OPT_SIG, '-',
- "Benchmark signature algorithms"},
+ { "evp", OPT_EVP, 's', "Use EVP-named cipher or digest" },
+ { "hmac", OPT_HMAC, 's', "HMAC using EVP-named digest" },
+ { "cmac", OPT_CMAC, 's', "CMAC using EVP-named cipher" },
+ { "decrypt", OPT_DECRYPT, '-',
+ "Time decryption instead of encryption (only EVP)" },
+ { "aead", OPT_AEAD, '-',
+ "Benchmark EVP-named AEAD cipher in TLS-like sequence" },
+ { "kem-algorithms", OPT_KEM, '-',
+ "Benchmark KEM algorithms" },
+ { "signature-algorithms", OPT_SIG, '-',
+ "Benchmark signature algorithms" },
OPT_SECTION("Timing"),
- {"elapsed", OPT_ELAPSED, '-',
- "Use wall-clock time instead of CPU user time as divisor"},
- {"seconds", OPT_SECONDS, 'p',
- "Run benchmarks for specified amount of seconds"},
- {"bytes", OPT_BYTES, 'p',
- "Run [non-PKI] benchmarks on custom-sized buffer"},
- {"misalign", OPT_MISALIGN, 'p',
- "Use specified offset to mis-align buffers"},
+ { "elapsed", OPT_ELAPSED, '-',
+ "Use wall-clock time instead of CPU user time as divisor" },
+ { "seconds", OPT_SECONDS, 'p',
+ "Run benchmarks for specified amount of seconds" },
+ { "bytes", OPT_BYTES, 'p',
+ "Run [non-PKI] benchmarks on custom-sized buffer" },
+ { "misalign", OPT_MISALIGN, 'p',
+ "Use specified offset to mis-align buffers" },
OPT_R_OPTIONS,
OPT_PROV_OPTIONS,
OPT_PARAMETERS(),
- {"algorithm", 0, 0, "Algorithm(s) to test (optional; otherwise tests all)"},
- {NULL}
+ { "algorithm", 0, 0, "Algorithm(s) to test (optional; otherwise tests all)" },
+ { NULL }
};
enum {
- D_MD2, D_MDC2, D_MD4, D_MD5, D_SHA1, D_RMD160,
- D_SHA256, D_SHA512, D_WHIRLPOOL, D_HMAC,
- D_CBC_DES, D_EDE3_DES, D_RC4, D_CBC_IDEA, D_CBC_SEED,
- D_CBC_RC2, D_CBC_RC5, D_CBC_BF, D_CBC_CAST,
- D_CBC_128_AES, D_CBC_192_AES, D_CBC_256_AES,
- D_CBC_128_CML, D_CBC_192_CML, D_CBC_256_CML,
- D_EVP, D_GHASH, D_RAND, D_EVP_CMAC, D_KMAC128, D_KMAC256,
+ D_MD2,
+ D_MDC2,
+ D_MD4,
+ D_MD5,
+ D_SHA1,
+ D_RMD160,
+ D_SHA256,
+ D_SHA512,
+ D_WHIRLPOOL,
+ D_HMAC,
+ D_CBC_DES,
+ D_EDE3_DES,
+ D_RC4,
+ D_CBC_IDEA,
+ D_CBC_SEED,
+ D_CBC_RC2,
+ D_CBC_RC5,
+ D_CBC_BF,
+ D_CBC_CAST,
+ D_CBC_128_AES,
+ D_CBC_192_AES,
+ D_CBC_256_AES,
+ D_CBC_128_CML,
+ D_CBC_192_CML,
+ D_CBC_256_CML,
+ D_EVP,
+ D_GHASH,
+ D_RAND,
+ D_EVP_CMAC,
+ D_KMAC128,
+ D_KMAC256,
ALGOR_NUM
};
/* name of algorithms to test. MUST BE KEEP IN SYNC with above enum ! */
@@ -317,197 +356,233 @@ static const char *names[ALGOR_NUM] = {
/* list of configured algorithm (remaining), with some few alias */
static const OPT_PAIR doit_choices[] = {
- {"md2", D_MD2},
- {"mdc2", D_MDC2},
- {"md4", D_MD4},
- {"md5", D_MD5},
- {"hmac", D_HMAC},
- {"sha1", D_SHA1},
- {"sha256", D_SHA256},
- {"sha512", D_SHA512},
- {"whirlpool", D_WHIRLPOOL},
- {"ripemd", D_RMD160},
- {"rmd160", D_RMD160},
- {"ripemd160", D_RMD160},
- {"rc4", D_RC4},
- {"des-cbc", D_CBC_DES},
- {"des-ede3", D_EDE3_DES},
- {"aes-128-cbc", D_CBC_128_AES},
- {"aes-192-cbc", D_CBC_192_AES},
- {"aes-256-cbc", D_CBC_256_AES},
- {"camellia-128-cbc", D_CBC_128_CML},
- {"camellia-192-cbc", D_CBC_192_CML},
- {"camellia-256-cbc", D_CBC_256_CML},
- {"rc2-cbc", D_CBC_RC2},
- {"rc2", D_CBC_RC2},
- {"rc5-cbc", D_CBC_RC5},
- {"rc5", D_CBC_RC5},
- {"idea-cbc", D_CBC_IDEA},
- {"idea", D_CBC_IDEA},
- {"seed-cbc", D_CBC_SEED},
- {"seed", D_CBC_SEED},
- {"bf-cbc", D_CBC_BF},
- {"blowfish", D_CBC_BF},
- {"bf", D_CBC_BF},
- {"cast-cbc", D_CBC_CAST},
- {"cast", D_CBC_CAST},
- {"cast5", D_CBC_CAST},
- {"ghash", D_GHASH},
- {"rand", D_RAND},
- {"kmac128", D_KMAC128},
- {"kmac256", D_KMAC256},
+ { "md2", D_MD2 },
+ { "mdc2", D_MDC2 },
+ { "md4", D_MD4 },
+ { "md5", D_MD5 },
+ { "hmac", D_HMAC },
+ { "sha1", D_SHA1 },
+ { "sha256", D_SHA256 },
+ { "sha512", D_SHA512 },
+ { "whirlpool", D_WHIRLPOOL },
+ { "ripemd", D_RMD160 },
+ { "rmd160", D_RMD160 },
+ { "ripemd160", D_RMD160 },
+ { "rc4", D_RC4 },
+ { "des-cbc", D_CBC_DES },
+ { "des-ede3", D_EDE3_DES },
+ { "aes-128-cbc", D_CBC_128_AES },
+ { "aes-192-cbc", D_CBC_192_AES },
+ { "aes-256-cbc", D_CBC_256_AES },
+ { "camellia-128-cbc", D_CBC_128_CML },
+ { "camellia-192-cbc", D_CBC_192_CML },
+ { "camellia-256-cbc", D_CBC_256_CML },
+ { "rc2-cbc", D_CBC_RC2 },
+ { "rc2", D_CBC_RC2 },
+ { "rc5-cbc", D_CBC_RC5 },
+ { "rc5", D_CBC_RC5 },
+ { "idea-cbc", D_CBC_IDEA },
+ { "idea", D_CBC_IDEA },
+ { "seed-cbc", D_CBC_SEED },
+ { "seed", D_CBC_SEED },
+ { "bf-cbc", D_CBC_BF },
+ { "blowfish", D_CBC_BF },
+ { "bf", D_CBC_BF },
+ { "cast-cbc", D_CBC_CAST },
+ { "cast", D_CBC_CAST },
+ { "cast5", D_CBC_CAST },
+ { "ghash", D_GHASH },
+ { "rand", D_RAND },
+ { "kmac128", D_KMAC128 },
+ { "kmac256", D_KMAC256 },
};
static double results[ALGOR_NUM][SIZE_NUM];
#ifndef OPENSSL_NO_DSA
-enum { R_DSA_1024, R_DSA_2048, DSA_NUM };
+enum { R_DSA_1024,
+ R_DSA_2048,
+ DSA_NUM };
static const OPT_PAIR dsa_choices[DSA_NUM] = {
- {"dsa1024", R_DSA_1024},
- {"dsa2048", R_DSA_2048}
+ { "dsa1024", R_DSA_1024 },
+ { "dsa2048", R_DSA_2048 }
};
-static double dsa_results[DSA_NUM][2]; /* 2 ops: sign then verify */
+static double dsa_results[DSA_NUM][2]; /* 2 ops: sign then verify */
#endif /* OPENSSL_NO_DSA */
enum {
- R_RSA_512, R_RSA_1024, R_RSA_2048, R_RSA_3072, R_RSA_4096, R_RSA_7680,
- R_RSA_15360, RSA_NUM
+ R_RSA_512,
+ R_RSA_1024,
+ R_RSA_2048,
+ R_RSA_3072,
+ R_RSA_4096,
+ R_RSA_7680,
+ R_RSA_15360,
+ RSA_NUM
};
static const OPT_PAIR rsa_choices[RSA_NUM] = {
- {"rsa512", R_RSA_512},
- {"rsa1024", R_RSA_1024},
- {"rsa2048", R_RSA_2048},
- {"rsa3072", R_RSA_3072},
- {"rsa4096", R_RSA_4096},
- {"rsa7680", R_RSA_7680},
- {"rsa15360", R_RSA_15360}
+ { "rsa512", R_RSA_512 },
+ { "rsa1024", R_RSA_1024 },
+ { "rsa2048", R_RSA_2048 },
+ { "rsa3072", R_RSA_3072 },
+ { "rsa4096", R_RSA_4096 },
+ { "rsa7680", R_RSA_7680 },
+ { "rsa15360", R_RSA_15360 }
};
-static double rsa_results[RSA_NUM][4]; /* 4 ops: sign, verify, encrypt, decrypt */
+static double rsa_results[RSA_NUM][4]; /* 4 ops: sign, verify, encrypt, decrypt */
#ifndef OPENSSL_NO_DH
enum ff_params_t {
- R_FFDH_2048, R_FFDH_3072, R_FFDH_4096, R_FFDH_6144, R_FFDH_8192, FFDH_NUM
+ R_FFDH_2048,
+ R_FFDH_3072,
+ R_FFDH_4096,
+ R_FFDH_6144,
+ R_FFDH_8192,
+ FFDH_NUM
};
static const OPT_PAIR ffdh_choices[FFDH_NUM] = {
- {"ffdh2048", R_FFDH_2048},
- {"ffdh3072", R_FFDH_3072},
- {"ffdh4096", R_FFDH_4096},
- {"ffdh6144", R_FFDH_6144},
- {"ffdh8192", R_FFDH_8192},
+ { "ffdh2048", R_FFDH_2048 },
+ { "ffdh3072", R_FFDH_3072 },
+ { "ffdh4096", R_FFDH_4096 },
+ { "ffdh6144", R_FFDH_6144 },
+ { "ffdh8192", R_FFDH_8192 },
};
-static double ffdh_results[FFDH_NUM][1]; /* 1 op: derivation */
+static double ffdh_results[FFDH_NUM][1]; /* 1 op: derivation */
#endif /* OPENSSL_NO_DH */
enum ec_curves_t {
- R_EC_P160, R_EC_P192, R_EC_P224, R_EC_P256, R_EC_P384, R_EC_P521,
+ R_EC_P160,
+ R_EC_P192,
+ R_EC_P224,
+ R_EC_P256,
+ R_EC_P384,
+ R_EC_P521,
#ifndef OPENSSL_NO_EC2M
- R_EC_K163, R_EC_K233, R_EC_K283, R_EC_K409, R_EC_K571,
- R_EC_B163, R_EC_B233, R_EC_B283, R_EC_B409, R_EC_B571,
+ R_EC_K163,
+ R_EC_K233,
+ R_EC_K283,
+ R_EC_K409,
+ R_EC_K571,
+ R_EC_B163,
+ R_EC_B233,
+ R_EC_B283,
+ R_EC_B409,
+ R_EC_B571,
#endif
- R_EC_BRP256R1, R_EC_BRP256T1, R_EC_BRP384R1, R_EC_BRP384T1,
- R_EC_BRP512R1, R_EC_BRP512T1, ECDSA_NUM
+ R_EC_BRP256R1,
+ R_EC_BRP256T1,
+ R_EC_BRP384R1,
+ R_EC_BRP384T1,
+ R_EC_BRP512R1,
+ R_EC_BRP512T1,
+ ECDSA_NUM
};
/* list of ecdsa curves */
static const OPT_PAIR ecdsa_choices[ECDSA_NUM] = {
- {"ecdsap160", R_EC_P160},
- {"ecdsap192", R_EC_P192},
- {"ecdsap224", R_EC_P224},
- {"ecdsap256", R_EC_P256},
- {"ecdsap384", R_EC_P384},
- {"ecdsap521", R_EC_P521},
+ { "ecdsap160", R_EC_P160 },
+ { "ecdsap192", R_EC_P192 },
+ { "ecdsap224", R_EC_P224 },
+ { "ecdsap256", R_EC_P256 },
+ { "ecdsap384", R_EC_P384 },
+ { "ecdsap521", R_EC_P521 },
#ifndef OPENSSL_NO_EC2M
- {"ecdsak163", R_EC_K163},
- {"ecdsak233", R_EC_K233},
- {"ecdsak283", R_EC_K283},
- {"ecdsak409", R_EC_K409},
- {"ecdsak571", R_EC_K571},
- {"ecdsab163", R_EC_B163},
- {"ecdsab233", R_EC_B233},
- {"ecdsab283", R_EC_B283},
- {"ecdsab409", R_EC_B409},
- {"ecdsab571", R_EC_B571},
+ { "ecdsak163", R_EC_K163 },
+ { "ecdsak233", R_EC_K233 },
+ { "ecdsak283", R_EC_K283 },
+ { "ecdsak409", R_EC_K409 },
+ { "ecdsak571", R_EC_K571 },
+ { "ecdsab163", R_EC_B163 },
+ { "ecdsab233", R_EC_B233 },
+ { "ecdsab283", R_EC_B283 },
+ { "ecdsab409", R_EC_B409 },
+ { "ecdsab571", R_EC_B571 },
#endif
- {"ecdsabrp256r1", R_EC_BRP256R1},
- {"ecdsabrp256t1", R_EC_BRP256T1},
- {"ecdsabrp384r1", R_EC_BRP384R1},
- {"ecdsabrp384t1", R_EC_BRP384T1},
- {"ecdsabrp512r1", R_EC_BRP512R1},
- {"ecdsabrp512t1", R_EC_BRP512T1}
+ { "ecdsabrp256r1", R_EC_BRP256R1 },
+ { "ecdsabrp256t1", R_EC_BRP256T1 },
+ { "ecdsabrp384r1", R_EC_BRP384R1 },
+ { "ecdsabrp384t1", R_EC_BRP384T1 },
+ { "ecdsabrp512r1", R_EC_BRP512R1 },
+ { "ecdsabrp512t1", R_EC_BRP512T1 }
};
enum {
#ifndef OPENSSL_NO_ECX
- R_EC_X25519 = ECDSA_NUM, R_EC_X448, EC_NUM
+ R_EC_X25519 = ECDSA_NUM,
+ R_EC_X448,
+ EC_NUM
#else
EC_NUM = ECDSA_NUM
#endif
};
/* list of ecdh curves, extension of |ecdsa_choices| list above */
static const OPT_PAIR ecdh_choices[EC_NUM] = {
- {"ecdhp160", R_EC_P160},
- {"ecdhp192", R_EC_P192},
- {"ecdhp224", R_EC_P224},
- {"ecdhp256", R_EC_P256},
- {"ecdhp384", R_EC_P384},
- {"ecdhp521", R_EC_P521},
+ { "ecdhp160", R_EC_P160 },
+ { "ecdhp192", R_EC_P192 },
+ { "ecdhp224", R_EC_P224 },
+ { "ecdhp256", R_EC_P256 },
+ { "ecdhp384", R_EC_P384 },
+ { "ecdhp521", R_EC_P521 },
#ifndef OPENSSL_NO_EC2M
- {"ecdhk163", R_EC_K163},
- {"ecdhk233", R_EC_K233},
- {"ecdhk283", R_EC_K283},
- {"ecdhk409", R_EC_K409},
- {"ecdhk571", R_EC_K571},
- {"ecdhb163", R_EC_B163},
- {"ecdhb233", R_EC_B233},
- {"ecdhb283", R_EC_B283},
- {"ecdhb409", R_EC_B409},
- {"ecdhb571", R_EC_B571},
+ { "ecdhk163", R_EC_K163 },
+ { "ecdhk233", R_EC_K233 },
+ { "ecdhk283", R_EC_K283 },
+ { "ecdhk409", R_EC_K409 },
+ { "ecdhk571", R_EC_K571 },
+ { "ecdhb163", R_EC_B163 },
+ { "ecdhb233", R_EC_B233 },
+ { "ecdhb283", R_EC_B283 },
+ { "ecdhb409", R_EC_B409 },
+ { "ecdhb571", R_EC_B571 },
#endif
- {"ecdhbrp256r1", R_EC_BRP256R1},
- {"ecdhbrp256t1", R_EC_BRP256T1},
- {"ecdhbrp384r1", R_EC_BRP384R1},
- {"ecdhbrp384t1", R_EC_BRP384T1},
- {"ecdhbrp512r1", R_EC_BRP512R1},
- {"ecdhbrp512t1", R_EC_BRP512T1},
+ { "ecdhbrp256r1", R_EC_BRP256R1 },
+ { "ecdhbrp256t1", R_EC_BRP256T1 },
+ { "ecdhbrp384r1", R_EC_BRP384R1 },
+ { "ecdhbrp384t1", R_EC_BRP384T1 },
+ { "ecdhbrp512r1", R_EC_BRP512R1 },
+ { "ecdhbrp512t1", R_EC_BRP512T1 },
#ifndef OPENSSL_NO_ECX
- {"ecdhx25519", R_EC_X25519},
- {"ecdhx448", R_EC_X448}
+ { "ecdhx25519", R_EC_X25519 },
+ { "ecdhx448", R_EC_X448 }
#endif
};
-static double ecdh_results[EC_NUM][1]; /* 1 op: derivation */
-static double ecdsa_results[ECDSA_NUM][2]; /* 2 ops: sign then verify */
+static double ecdh_results[EC_NUM][1]; /* 1 op: derivation */
+static double ecdsa_results[ECDSA_NUM][2]; /* 2 ops: sign then verify */
#ifndef OPENSSL_NO_ECX
-enum { R_EC_Ed25519, R_EC_Ed448, EdDSA_NUM };
+enum { R_EC_Ed25519,
+ R_EC_Ed448,
+ EdDSA_NUM };
static const OPT_PAIR eddsa_choices[EdDSA_NUM] = {
- {"ed25519", R_EC_Ed25519},
- {"ed448", R_EC_Ed448}
+ { "ed25519", R_EC_Ed25519 },
+ { "ed448", R_EC_Ed448 }
};
-static double eddsa_results[EdDSA_NUM][2]; /* 2 ops: sign then verify */
+static double eddsa_results[EdDSA_NUM][2]; /* 2 ops: sign then verify */
#endif /* OPENSSL_NO_ECX */
#ifndef OPENSSL_NO_SM2
-enum { R_EC_CURVESM2, SM2_NUM };
+enum { R_EC_CURVESM2,
+ SM2_NUM };
static const OPT_PAIR sm2_choices[SM2_NUM] = {
- {"curveSM2", R_EC_CURVESM2}
+ { "curveSM2", R_EC_CURVESM2 }
};
-# define SM2_ID "TLSv1.3+GM+Cipher+Suite"
-# define SM2_ID_LEN sizeof("TLSv1.3+GM+Cipher+Suite") - 1
-static double sm2_results[SM2_NUM][2]; /* 2 ops: sign then verify */
+#define SM2_ID "TLSv1.3+GM+Cipher+Suite"
+#define SM2_ID_LEN sizeof("TLSv1.3+GM+Cipher+Suite") - 1
+static double sm2_results[SM2_NUM][2]; /* 2 ops: sign then verify */
#endif /* OPENSSL_NO_SM2 */
#define MAX_KEM_NUM 111
static size_t kems_algs_len = 0;
static char *kems_algname[MAX_KEM_NUM] = { NULL };
-static double kems_results[MAX_KEM_NUM][3]; /* keygen, encaps, decaps */
+static double kems_results[MAX_KEM_NUM][3]; /* keygen, encaps, decaps */
#define MAX_SIG_NUM 256
static size_t sigs_algs_len = 0;
static char *sigs_algname[MAX_SIG_NUM] = { NULL };
-static double sigs_results[MAX_SIG_NUM][3]; /* keygen, sign, verify */
+static double sigs_results[MAX_SIG_NUM][3]; /* keygen, sign, verify */
#define COND(unused_cond) (run && count < (testmode ? 1 : INT_MAX))
#define COUNT(d) (count)
@@ -577,8 +652,8 @@ typedef struct loopargs_st {
size_t sig_act_sig_len[MAX_SIG_NUM];
unsigned char *sig_sig[MAX_SIG_NUM];
} loopargs_t;
-static int run_benchmark(int async_jobs, int (*loop_function) (void *),
- loopargs_t *loopargs);
+static int run_benchmark(int async_jobs, int (*loop_function)(void *),
+ loopargs_t *loopargs);
static unsigned int testnum;
@@ -629,7 +704,7 @@ static int have_cipher(const char *name)
static int EVP_Digest_loop(const char *mdname, ossl_unused int algindex, void *args)
{
- loopargs_t *tempargs = *(loopargs_t **) args;
+ loopargs_t *tempargs = *(loopargs_t **)args;
unsigned char *buf = tempargs->buf;
unsigned char digest[EVP_MAX_MD_SIZE];
int count;
@@ -646,9 +721,9 @@ static int EVP_Digest_loop(const char *mdname, ossl_unused int algindex, void *a
}
for (count = 0; COND(c[algindex][testnum]); count++) {
- if (!EVP_DigestInit_ex2(ctx, md, NULL)
- || !EVP_DigestUpdate(ctx, buf, (size_t)lengths[testnum])
- || !EVP_DigestFinalXOF(ctx, digest, sizeof(digest))) {
+ if (!EVP_DigestInit_ex2(ctx, md, NULL)
+ || !EVP_DigestUpdate(ctx, buf, (size_t)lengths[testnum])
+ || !EVP_DigestFinalXOF(ctx, digest, sizeof(digest))) {
count = -1;
break;
}
@@ -656,7 +731,7 @@ static int EVP_Digest_loop(const char *mdname, ossl_unused int algindex, void *a
} else {
for (count = 0; COND(c[algindex][testnum]); count++) {
if (!EVP_Digest(buf, (size_t)lengths[testnum], digest, NULL, md,
- NULL)) {
+ NULL)) {
count = -1;
break;
}
@@ -694,8 +769,8 @@ static int MD5_loop(void *args)
}
static int mac_setup(const char *name,
- EVP_MAC **mac, OSSL_PARAM params[],
- loopargs_t *loopargs, unsigned int loopargs_len)
+ EVP_MAC **mac, OSSL_PARAM params[],
+ loopargs_t *loopargs, unsigned int loopargs_len)
{
unsigned int i;
@@ -716,7 +791,7 @@ static int mac_setup(const char *name,
}
static void mac_teardown(EVP_MAC **mac,
- loopargs_t *loopargs, unsigned int loopargs_len)
+ loopargs_t *loopargs, unsigned int loopargs_len)
{
unsigned int i;
@@ -730,7 +805,7 @@ static void mac_teardown(EVP_MAC **mac,
static int EVP_MAC_loop(ossl_unused int algindex, void *args)
{
- loopargs_t *tempargs = *(loopargs_t **) args;
+ loopargs_t *tempargs = *(loopargs_t **)args;
unsigned char *buf = tempargs->buf;
EVP_MAC_CTX *mctx = tempargs->mctx;
unsigned char mac[EVP_MAX_MD_SIZE];
@@ -796,7 +871,7 @@ static int algindex;
static int EVP_Cipher_loop(void *args)
{
- loopargs_t *tempargs = *(loopargs_t **) args;
+ loopargs_t *tempargs = *(loopargs_t **)args;
unsigned char *buf = tempargs->buf;
int count;
@@ -810,7 +885,7 @@ static int EVP_Cipher_loop(void *args)
static int GHASH_loop(void *args)
{
- loopargs_t *tempargs = *(loopargs_t **) args;
+ loopargs_t *tempargs = *(loopargs_t **)args;
unsigned char *buf = tempargs->buf;
EVP_MAC_CTX *mctx = tempargs->mctx;
int count;
@@ -828,8 +903,8 @@ static int GHASH_loop(void *args)
static unsigned char iv[2 * MAX_BLOCK_SIZE / 8];
static EVP_CIPHER_CTX *init_evp_cipher_ctx(const char *ciphername,
- const unsigned char *key,
- int keylen)
+ const unsigned char *key,
+ int keylen)
{
EVP_CIPHER_CTX *ctx = NULL;
EVP_CIPHER *cipher = NULL;
@@ -865,7 +940,7 @@ end:
static int RAND_bytes_loop(void *args)
{
- loopargs_t *tempargs = *(loopargs_t **) args;
+ loopargs_t *tempargs = *(loopargs_t **)args;
unsigned char *buf = tempargs->buf;
int count;
@@ -877,7 +952,7 @@ static int RAND_bytes_loop(void *args)
static int decrypt = 0;
static int EVP_Update_loop(void *args)
{
- loopargs_t *tempargs = *(loopargs_t **) args;
+ loopargs_t *tempargs = *(loopargs_t **)args;
unsigned char *buf = tempargs->buf;
EVP_CIPHER_CTX *ctx = tempargs->ctx;
int outl, count, rc;
@@ -919,7 +994,7 @@ static int EVP_Update_loop(void *args)
*/
static int EVP_Update_loop_aead_enc(void *args)
{
- loopargs_t *tempargs = *(loopargs_t **) args;
+ loopargs_t *tempargs = *(loopargs_t **)args;
unsigned char *buf = tempargs->buf;
unsigned char *key = tempargs->key;
EVP_CIPHER_CTX *ctx = tempargs->ctx;
@@ -929,7 +1004,7 @@ static int EVP_Update_loop_aead_enc(void *args)
/* Set length of iv (Doesn't apply to SIV mode) */
if (mode_op != EVP_CIPH_SIV_MODE) {
if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_IVLEN,
- sizeof(aead_iv), NULL)) {
+ sizeof(aead_iv), NULL)) {
BIO_printf(bio_err, "\nFailed to set iv length\n");
dofail();
exit(1);
@@ -940,7 +1015,7 @@ static int EVP_Update_loop_aead_enc(void *args)
&& mode_op != EVP_CIPH_SIV_MODE
&& mode_op != EVP_CIPH_GCM_SIV_MODE) {
if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG,
- TAG_LEN, NULL)) {
+ TAG_LEN, NULL)) {
BIO_printf(bio_err, "\nFailed to set tag length\n");
dofail();
exit(1);
@@ -954,7 +1029,7 @@ static int EVP_Update_loop_aead_enc(void *args)
/* Set total length of input. Only required for CCM */
if (mode_op == EVP_CIPH_CCM_MODE) {
if (!EVP_EncryptUpdate(ctx, NULL, &outl,
- NULL, lengths[testnum])) {
+ NULL, lengths[testnum])) {
BIO_printf(bio_err, "\nCouldn't set input text length\n");
dofail();
exit(1);
@@ -989,7 +1064,7 @@ static int EVP_Update_loop_aead_enc(void *args)
*/
static int EVP_Update_loop_aead_dec(void *args)
{
- loopargs_t *tempargs = *(loopargs_t **) args;
+ loopargs_t *tempargs = *(loopargs_t **)args;
unsigned char *buf = tempargs->buf;
unsigned char *outbuf = tempargs->buf2;
unsigned char *key = tempargs->key;
@@ -1001,7 +1076,7 @@ static int EVP_Update_loop_aead_dec(void *args)
/* Set the length of iv (Doesn't apply to SIV mode) */
if (mode_op != EVP_CIPH_SIV_MODE) {
if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_IVLEN,
- sizeof(aead_iv), NULL)) {
+ sizeof(aead_iv), NULL)) {
BIO_printf(bio_err, "\nFailed to set iv length\n");
dofail();
exit(1);
@@ -1013,7 +1088,7 @@ static int EVP_Update_loop_aead_dec(void *args)
&& mode_op != EVP_CIPH_GCM_MODE
&& mode_op != EVP_CIPH_GCM_SIV_MODE) {
if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG,
- TAG_LEN, NULL)) {
+ TAG_LEN, NULL)) {
BIO_printf(bio_err, "\nFailed to set tag length\n");
dofail();
exit(1);
@@ -1035,7 +1110,7 @@ static int EVP_Update_loop_aead_dec(void *args)
memcpy(tag, tempargs->tag, TAG_LEN);
if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG,
- TAG_LEN, tag)) {
+ TAG_LEN, tag)) {
BIO_printf(bio_err, "\nFailed to set tag\n");
dofail();
exit(1);
@@ -1043,7 +1118,7 @@ static int EVP_Update_loop_aead_dec(void *args)
/* Set the total length of cipher text. Only required for CCM */
if (mode_op == EVP_CIPH_CCM_MODE) {
if (!EVP_DecryptUpdate(ctx, NULL, &outl,
- NULL, lengths[testnum])) {
+ NULL, lengths[testnum])) {
BIO_printf(bio_err, "\nCouldn't set cipher text length\n");
dofail();
exit(1);
@@ -1069,7 +1144,7 @@ static int EVP_Update_loop_aead_dec(void *args)
static int RSA_sign_loop(void *args)
{
- loopargs_t *tempargs = *(loopargs_t **) args;
+ loopargs_t *tempargs = *(loopargs_t **)args;
unsigned char *buf = tempargs->buf;
unsigned char *buf2 = tempargs->buf2;
size_t *rsa_num = &tempargs->sigsize;
@@ -1091,7 +1166,7 @@ static int RSA_sign_loop(void *args)
static int RSA_verify_loop(void *args)
{
- loopargs_t *tempargs = *(loopargs_t **) args;
+ loopargs_t *tempargs = *(loopargs_t **)args;
unsigned char *buf = tempargs->buf;
unsigned char *buf2 = tempargs->buf2;
size_t rsa_num = tempargs->sigsize;
@@ -1112,7 +1187,7 @@ static int RSA_verify_loop(void *args)
static int RSA_encrypt_loop(void *args)
{
- loopargs_t *tempargs = *(loopargs_t **) args;
+ loopargs_t *tempargs = *(loopargs_t **)args;
unsigned char *buf = tempargs->buf;
unsigned char *buf2 = tempargs->buf2;
size_t *rsa_num = &tempargs->encsize;
@@ -1134,7 +1209,7 @@ static int RSA_encrypt_loop(void *args)
static int RSA_decrypt_loop(void *args)
{
- loopargs_t *tempargs = *(loopargs_t **) args;
+ loopargs_t *tempargs = *(loopargs_t **)args;
unsigned char *buf = tempargs->buf;
unsigned char *buf2 = tempargs->buf2;
size_t rsa_num;
@@ -1158,7 +1233,7 @@ static int RSA_decrypt_loop(void *args)
static int FFDH_derive_key_loop(void *args)
{
- loopargs_t *tempargs = *(loopargs_t **) args;
+ loopargs_t *tempargs = *(loopargs_t **)args;
EVP_PKEY_CTX *ffdh_ctx = tempargs->ffdh_ctx[testnum];
unsigned char *derived_secret = tempargs->secret_ff_a;
int count;
@@ -1176,7 +1251,7 @@ static int FFDH_derive_key_loop(void *args)
#ifndef OPENSSL_NO_DSA
static int DSA_sign_loop(void *args)
{
- loopargs_t *tempargs = *(loopargs_t **) args;
+ loopargs_t *tempargs = *(loopargs_t **)args;
unsigned char *buf = tempargs->buf;
unsigned char *buf2 = tempargs->buf2;
size_t *dsa_num = &tempargs->sigsize;
@@ -1198,7 +1273,7 @@ static int DSA_sign_loop(void *args)
static int DSA_verify_loop(void *args)
{
- loopargs_t *tempargs = *(loopargs_t **) args;
+ loopargs_t *tempargs = *(loopargs_t **)args;
unsigned char *buf = tempargs->buf;
unsigned char *buf2 = tempargs->buf2;
size_t dsa_num = tempargs->sigsize;
@@ -1220,7 +1295,7 @@ static int DSA_verify_loop(void *args)
static int ECDSA_sign_loop(void *args)
{
- loopargs_t *tempargs = *(loopargs_t **) args;
+ loopargs_t *tempargs = *(loopargs_t **)args;
unsigned char *buf = tempargs->buf;
unsigned char *buf2 = tempargs->buf2;
size_t *ecdsa_num = &tempargs->sigsize;
@@ -1242,7 +1317,7 @@ static int ECDSA_sign_loop(void *args)
static int ECDSA_verify_loop(void *args)
{
- loopargs_t *tempargs = *(loopargs_t **) args;
+ loopargs_t *tempargs = *(loopargs_t **)args;
unsigned char *buf = tempargs->buf;
unsigned char *buf2 = tempargs->buf2;
size_t ecdsa_num = tempargs->sigsize;
@@ -1251,7 +1326,7 @@ static int ECDSA_verify_loop(void *args)
for (count = 0; COND(ecdsa_c[testnum][1]); count++) {
ret = EVP_PKEY_verify(ecdsa_verify_ctx[testnum], buf2, ecdsa_num,
- buf, 20);
+ buf, 20);
if (ret <= 0) {
BIO_printf(bio_err, "ECDSA verify failure\n");
dofail();
@@ -1266,7 +1341,7 @@ static int ECDSA_verify_loop(void *args)
static int ECDH_EVP_derive_key_loop(void *args)
{
- loopargs_t *tempargs = *(loopargs_t **) args;
+ loopargs_t *tempargs = *(loopargs_t **)args;
EVP_PKEY_CTX *ctx = tempargs->ecdh_ctx[testnum];
unsigned char *derived_secret = tempargs->secret_a;
int count;
@@ -1281,7 +1356,7 @@ static int ECDH_EVP_derive_key_loop(void *args)
#ifndef OPENSSL_NO_ECX
static int EdDSA_sign_loop(void *args)
{
- loopargs_t *tempargs = *(loopargs_t **) args;
+ loopargs_t *tempargs = *(loopargs_t **)args;
unsigned char *buf = tempargs->buf;
EVP_MD_CTX **edctx = tempargs->eddsa_ctx;
unsigned char *eddsasig = tempargs->buf2;
@@ -1309,7 +1384,7 @@ static int EdDSA_sign_loop(void *args)
static int EdDSA_verify_loop(void *args)
{
- loopargs_t *tempargs = *(loopargs_t **) args;
+ loopargs_t *tempargs = *(loopargs_t **)args;
unsigned char *buf = tempargs->buf;
EVP_MD_CTX **edctx = tempargs->eddsa_ctx2;
unsigned char *eddsasig = tempargs->buf2;
@@ -1339,7 +1414,7 @@ static int EdDSA_verify_loop(void *args)
#ifndef OPENSSL_NO_SM2
static int SM2_sign_loop(void *args)
{
- loopargs_t *tempargs = *(loopargs_t **) args;
+ loopargs_t *tempargs = *(loopargs_t **)args;
unsigned char *buf = tempargs->buf;
EVP_MD_CTX **sm2ctx = tempargs->sm2_ctx;
unsigned char *sm2sig = tempargs->buf2;
@@ -1352,14 +1427,14 @@ static int SM2_sign_loop(void *args)
sm2sigsize = max_size;
if (!EVP_DigestSignInit(sm2ctx[testnum], NULL, EVP_sm3(),
- NULL, sm2_pkey[testnum])) {
+ NULL, sm2_pkey[testnum])) {
BIO_printf(bio_err, "SM2 init sign failure\n");
dofail();
count = -1;
break;
}
ret = EVP_DigestSign(sm2ctx[testnum], sm2sig, &sm2sigsize,
- buf, 20);
+ buf, 20);
if (ret == 0) {
BIO_printf(bio_err, "SM2 sign failure\n");
dofail();
@@ -1375,7 +1450,7 @@ static int SM2_sign_loop(void *args)
static int SM2_verify_loop(void *args)
{
- loopargs_t *tempargs = *(loopargs_t **) args;
+ loopargs_t *tempargs = *(loopargs_t **)args;
unsigned char *buf = tempargs->buf;
EVP_MD_CTX **sm2ctx = tempargs->sm2_vfy_ctx;
unsigned char *sm2sig = tempargs->buf2;
@@ -1385,14 +1460,14 @@ static int SM2_verify_loop(void *args)
for (count = 0; COND(sm2_c[testnum][1]); count++) {
if (!EVP_DigestVerifyInit(sm2ctx[testnum], NULL, EVP_sm3(),
- NULL, sm2_pkey[testnum])) {
+ NULL, sm2_pkey[testnum])) {
BIO_printf(bio_err, "SM2 verify init failure\n");
dofail();
count = -1;
break;
}
ret = EVP_DigestVerify(sm2ctx[testnum], sm2sig, sm2sigsize,
- buf, 20);
+ buf, 20);
if (ret != 1) {
BIO_printf(bio_err, "SM2 verify failure\n");
dofail();
@@ -1402,11 +1477,11 @@ static int SM2_verify_loop(void *args)
}
return count;
}
-#endif /* OPENSSL_NO_SM2 */
+#endif /* OPENSSL_NO_SM2 */
static int KEM_keygen_loop(void *args)
{
- loopargs_t *tempargs = *(loopargs_t **) args;
+ loopargs_t *tempargs = *(loopargs_t **)args;
EVP_PKEY_CTX *ctx = tempargs->kem_gen_ctx[testnum];
EVP_PKEY *pkey = NULL;
int count;
@@ -1429,7 +1504,7 @@ static int KEM_keygen_loop(void *args)
static int KEM_encaps_loop(void *args)
{
- loopargs_t *tempargs = *(loopargs_t **) args;
+ loopargs_t *tempargs = *(loopargs_t **)args;
EVP_PKEY_CTX *ctx = tempargs->kem_encaps_ctx[testnum];
size_t out_len = tempargs->kem_out_len[testnum];
size_t secret_len = tempargs->kem_secret_len[testnum];
@@ -1446,7 +1521,7 @@ static int KEM_encaps_loop(void *args)
static int KEM_decaps_loop(void *args)
{
- loopargs_t *tempargs = *(loopargs_t **) args;
+ loopargs_t *tempargs = *(loopargs_t **)args;
EVP_PKEY_CTX *ctx = tempargs->kem_decaps_ctx[testnum];
size_t out_len = tempargs->kem_out_len[testnum];
size_t secret_len = tempargs->kem_secret_len[testnum];
@@ -1463,7 +1538,7 @@ static int KEM_decaps_loop(void *args)
static int SIG_keygen_loop(void *args)
{
- loopargs_t *tempargs = *(loopargs_t **) args;
+ loopargs_t *tempargs = *(loopargs_t **)args;
EVP_PKEY_CTX *ctx = tempargs->sig_gen_ctx[testnum];
EVP_PKEY *pkey = NULL;
int count;
@@ -1479,11 +1554,11 @@ static int SIG_keygen_loop(void *args)
static int SIG_sign_loop(void *args)
{
- loopargs_t *tempargs = *(loopargs_t **) args;
+ loopargs_t *tempargs = *(loopargs_t **)args;
EVP_PKEY_CTX *ctx = tempargs->sig_sign_ctx[testnum];
/* be sure to not change stored sig: */
unsigned char *sig = app_malloc(tempargs->sig_max_sig_len[testnum],
- "sig sign loop");
+ "sig sign loop");
unsigned char md[SHA256_DIGEST_LENGTH] = { 0 };
size_t md_len = SHA256_DIGEST_LENGTH;
int count;
@@ -1505,7 +1580,7 @@ static int SIG_sign_loop(void *args)
static int SIG_verify_loop(void *args)
{
- loopargs_t *tempargs = *(loopargs_t **) args;
+ loopargs_t *tempargs = *(loopargs_t **)args;
EVP_PKEY_CTX *ctx = tempargs->sig_verify_ctx[testnum];
size_t sig_len = tempargs->sig_act_sig_len[testnum];
unsigned char *sig = tempargs->sig_sig[testnum];
@@ -1522,7 +1597,6 @@ static int SIG_verify_loop(void *args)
count = -1;
break;
}
-
}
return count;
}
@@ -1538,15 +1612,15 @@ static int check_block_size(EVP_CIPHER_CTX *ctx, int length)
}
if (length % blocksize != 0) {
BIO_printf(bio_err,
- "\nRequested encryption length not a multiple of block size for %s!\n",
- EVP_CIPHER_get0_name(ciph));
+ "\nRequested encryption length not a multiple of block size for %s!\n",
+ EVP_CIPHER_get0_name(ciph));
return 0;
}
return 1;
}
static int run_benchmark(int async_jobs,
- int (*loop_function) (void *), loopargs_t *loopargs)
+ int (*loop_function)(void *), loopargs_t *loopargs)
{
int job_op_count = 0;
int total_op_count = 0;
@@ -1564,8 +1638,8 @@ static int run_benchmark(int async_jobs,
/* Copy pointer content (looparg_t item address) into async context */
ret = ASYNC_start_job(&loopargs[i].inprogress_job, loopargs[i].wait_ctx,
- &job_op_count, loop_function,
- (void *)&looparg_item, sizeof(looparg_item));
+ &job_op_count, loop_function,
+ (void *)&looparg_item, sizeof(looparg_item));
switch (ret) {
case ASYNC_PAUSE:
++num_inprogress;
@@ -1600,8 +1674,7 @@ static int run_benchmark(int async_jobs,
if (loopargs[i].inprogress_job == NULL)
continue;
- if (!ASYNC_WAIT_CTX_get_all_fds
- (loopargs[i].wait_ctx, NULL, &num_job_fds)
+ if (!ASYNC_WAIT_CTX_get_all_fds(loopargs[i].wait_ctx, NULL, &num_job_fds)
|| num_job_fds > 1) {
BIO_printf(bio_err, "Too many fds in ASYNC_WAIT_CTX\n");
dofail();
@@ -1609,7 +1682,7 @@ static int run_benchmark(int async_jobs,
break;
}
ASYNC_WAIT_CTX_get_all_fds(loopargs[i].wait_ctx, &job_fd,
- &num_job_fds);
+ &num_job_fds);
FD_SET(job_fd, &waitfdset);
if (job_fd > max_fd)
max_fd = job_fd;
@@ -1617,9 +1690,9 @@ static int run_benchmark(int async_jobs,
if (max_fd >= (OSSL_ASYNC_FD)FD_SETSIZE) {
BIO_printf(bio_err,
- "Error: max_fd (%d) must be smaller than FD_SETSIZE (%d). "
- "Decrease the value of async_jobs\n",
- max_fd, FD_SETSIZE);
+ "Error: max_fd (%d) must be smaller than FD_SETSIZE (%d). "
+ "Decrease the value of async_jobs\n",
+ max_fd, FD_SETSIZE);
dofail();
error = 1;
break;
@@ -1644,8 +1717,7 @@ static int run_benchmark(int async_jobs,
if (loopargs[i].inprogress_job == NULL)
continue;
- if (!ASYNC_WAIT_CTX_get_all_fds
- (loopargs[i].wait_ctx, NULL, &num_job_fds)
+ if (!ASYNC_WAIT_CTX_get_all_fds(loopargs[i].wait_ctx, NULL, &num_job_fds)
|| num_job_fds > 1) {
BIO_printf(bio_err, "Too many fds in ASYNC_WAIT_CTX\n");
dofail();
@@ -1653,7 +1725,7 @@ static int run_benchmark(int async_jobs,
break;
}
ASYNC_WAIT_CTX_get_all_fds(loopargs[i].wait_ctx, &job_fd,
- &num_job_fds);
+ &num_job_fds);
#if defined(OPENSSL_SYS_UNIX)
if (num_job_fds == 1 && !FD_ISSET(job_fd, &waitfdset))
@@ -1666,9 +1738,9 @@ static int run_benchmark(int async_jobs,
#endif
ret = ASYNC_start_job(&loopargs[i].inprogress_job,
- loopargs[i].wait_ctx, &job_op_count,
- loop_function, (void *)(loopargs + i),
- sizeof(loopargs_t));
+ loopargs[i].wait_ctx, &job_op_count,
+ loop_function, (void *)(loopargs + i),
+ sizeof(loopargs_t));
switch (ret) {
case ASYNC_PAUSE:
break;
@@ -1711,7 +1783,7 @@ static EVP_PKEY *get_ecdsa(const EC_CURVE *curve)
/* Ensure that the error queue is empty */
if (ERR_peek_error()) {
BIO_printf(bio_err,
- "WARNING: the error queue contains previous unhandled errors.\n");
+ "WARNING: the error queue contains previous unhandled errors.\n");
dofail();
}
@@ -1743,7 +1815,7 @@ static EVP_PKEY *get_ecdsa(const EC_CURVE *curve)
ERR_get_error(); /* pop error from queue */
if (ERR_peek_error()) {
BIO_printf(bio_err,
- "Unhandled error in the error queue during EC key setup.\n");
+ "Unhandled error in the error queue during EC key setup.\n");
dofail();
return NULL;
}
@@ -1752,7 +1824,8 @@ static EVP_PKEY *get_ecdsa(const EC_CURVE *curve)
if ((pctx = EVP_PKEY_CTX_new_from_name(NULL, "EC", NULL)) == NULL
|| EVP_PKEY_paramgen_init(pctx) <= 0
|| EVP_PKEY_CTX_set_ec_paramgen_curve_nid(pctx,
- curve->nid) <= 0
+ curve->nid)
+ <= 0
|| EVP_PKEY_paramgen(pctx, ¶ms) <= 0) {
BIO_printf(bio_err, "EC params init failure.\n");
dofail();
@@ -1776,25 +1849,25 @@ static EVP_PKEY *get_ecdsa(const EC_CURVE *curve)
return key;
}
-#define stop_it(do_it, test_num)\
+#define stop_it(do_it, test_num) \
memset(do_it + test_num, 0, OSSL_NELEM(do_it) - test_num);
/* Checks to see if algorithms are fetchable */
-#define IS_FETCHABLE(type, TYPE) \
- static int is_ ## type ## _fetchable(const TYPE *alg) \
- { \
- TYPE *impl; \
- const char *propq = app_get0_propq(); \
- OSSL_LIB_CTX *libctx = app_get0_libctx(); \
- const char *name = TYPE ## _get0_name(alg); \
- \
- ERR_set_mark(); \
- impl = TYPE ## _fetch(libctx, name, propq); \
- ERR_pop_to_mark(); \
- if (impl == NULL) \
- return 0; \
- TYPE ## _free(impl); \
- return 1; \
+#define IS_FETCHABLE(type, TYPE) \
+ static int is_##type##_fetchable(const TYPE *alg) \
+ { \
+ TYPE *impl; \
+ const char *propq = app_get0_propq(); \
+ OSSL_LIB_CTX *libctx = app_get0_libctx(); \
+ const char *name = TYPE##_get0_name(alg); \
+ \
+ ERR_set_mark(); \
+ impl = TYPE##_fetch(libctx, name, propq); \
+ ERR_pop_to_mark(); \
+ if (impl == NULL) \
+ return 0; \
+ TYPE##_free(impl); \
+ return 1; \
}
IS_FETCHABLE(signature, EVP_SIGNATURE)
@@ -1802,11 +1875,11 @@ IS_FETCHABLE(kem, EVP_KEM)
DEFINE_STACK_OF(EVP_KEM)
-static int kems_cmp(const EVP_KEM * const *a,
- const EVP_KEM * const *b)
+static int kems_cmp(const EVP_KEM *const *a,
+ const EVP_KEM *const *b)
{
return strcmp(OSSL_PROVIDER_get0_name(EVP_KEM_get0_provider(*a)),
- OSSL_PROVIDER_get0_name(EVP_KEM_get0_provider(*b)));
+ OSSL_PROVIDER_get0_name(EVP_KEM_get0_provider(*b)));
}
static void collect_kem(EVP_KEM *kem, void *stack)
@@ -1814,8 +1887,8 @@ static void collect_kem(EVP_KEM *kem, void *stack)
STACK_OF(EVP_KEM) *kem_stack = stack;
if (is_kem_fetchable(kem)
- && EVP_KEM_up_ref(kem)
- && sk_EVP_KEM_push(kem_stack, kem) <= 0)
+ && EVP_KEM_up_ref(kem)
+ && sk_EVP_KEM_push(kem_stack, kem) <= 0)
EVP_KEM_free(kem); /* up-ref successful but push to stack failed */
}
@@ -1834,11 +1907,11 @@ static int kem_locate(const char *algo, unsigned int *idx)
DEFINE_STACK_OF(EVP_SIGNATURE)
-static int signatures_cmp(const EVP_SIGNATURE * const *a,
- const EVP_SIGNATURE * const *b)
+static int signatures_cmp(const EVP_SIGNATURE *const *a,
+ const EVP_SIGNATURE *const *b)
{
return strcmp(OSSL_PROVIDER_get0_name(EVP_SIGNATURE_get0_provider(*a)),
- OSSL_PROVIDER_get0_name(EVP_SIGNATURE_get0_provider(*b)));
+ OSSL_PROVIDER_get0_name(EVP_SIGNATURE_get0_provider(*b)));
}
static void collect_signatures(EVP_SIGNATURE *sig, void *stack)
@@ -1846,8 +1919,8 @@ static void collect_signatures(EVP_SIGNATURE *sig, void *stack)
STACK_OF(EVP_SIGNATURE) *sig_stack = stack;
if (is_signature_fetchable(sig)
- && EVP_SIGNATURE_up_ref(sig)
- && sk_EVP_SIGNATURE_push(sig_stack, sig) <= 0)
+ && EVP_SIGNATURE_up_ref(sig)
+ && sk_EVP_SIGNATURE_push(sig_stack, sig) <= 0)
EVP_SIGNATURE_free(sig); /* up-ref successful but push to stack failed */
}
@@ -1864,12 +1937,14 @@ static int sig_locate(const char *algo, unsigned int *idx)
return 0;
}
-static int get_max(const uint8_t doit[], size_t algs_len) {
+static int get_max(const uint8_t doit[], size_t algs_len)
+{
size_t i = 0;
int maxcnt = 0;
for (i = 0; i < algs_len; i++)
- if (maxcnt < doit[i]) maxcnt = doit[i];
+ if (maxcnt < doit[i])
+ maxcnt = doit[i];
return maxcnt;
}
@@ -1901,10 +1976,10 @@ int speed_main(int argc, char **argv)
#endif
long op_count = 1;
openssl_speed_sec_t seconds = { SECONDS, RSA_SECONDS, DSA_SECONDS,
- ECDSA_SECONDS, ECDH_SECONDS,
- EdDSA_SECONDS, SM2_SECONDS,
- FFDH_SECONDS, KEM_SECONDS,
- SIG_SECONDS };
+ ECDSA_SECONDS, ECDH_SECONDS,
+ EdDSA_SECONDS, SM2_SECONDS,
+ FFDH_SECONDS, KEM_SECONDS,
+ SIG_SECONDS };
static const unsigned char key32[32] = {
0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0,
@@ -1915,19 +1990,19 @@ int speed_main(int argc, char **argv)
static const unsigned char deskey[] = {
0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, /* key1 */
0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12, /* key2 */
- 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12, 0x34 /* key3 */
+ 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12, 0x34 /* key3 */
};
static const struct {
const unsigned char *data;
unsigned int length;
unsigned int bits;
} rsa_keys[] = {
- { test512, sizeof(test512), 512 },
- { test1024, sizeof(test1024), 1024 },
- { test2048, sizeof(test2048), 2048 },
- { test3072, sizeof(test3072), 3072 },
- { test4096, sizeof(test4096), 4096 },
- { test7680, sizeof(test7680), 7680 },
+ { test512, sizeof(test512), 512 },
+ { test1024, sizeof(test1024), 1024 },
+ { test2048, sizeof(test2048), 2048 },
+ { test3072, sizeof(test3072), 3072 },
+ { test4096, sizeof(test4096), 4096 },
+ { test7680, sizeof(test7680), 7680 },
{ test15360, sizeof(test15360), 15360 }
};
uint8_t rsa_doit[RSA_NUM] = { 0 };
@@ -1940,11 +2015,11 @@ int speed_main(int argc, char **argv)
} FFDH_PARAMS;
static const FFDH_PARAMS ffdh_params[FFDH_NUM] = {
- {"ffdh2048", NID_ffdhe2048, 2048},
- {"ffdh3072", NID_ffdhe3072, 3072},
- {"ffdh4096", NID_ffdhe4096, 4096},
- {"ffdh6144", NID_ffdhe6144, 6144},
- {"ffdh8192", NID_ffdhe8192, 8192}
+ { "ffdh2048", NID_ffdhe2048, 2048 },
+ { "ffdh3072", NID_ffdhe3072, 3072 },
+ { "ffdh4096", NID_ffdhe4096, 4096 },
+ { "ffdh6144", NID_ffdhe6144, 6144 },
+ { "ffdh8192", NID_ffdhe8192, 8192 }
};
uint8_t ffdh_doit[FFDH_NUM] = { 0 };
@@ -1961,48 +2036,48 @@ int speed_main(int argc, char **argv)
*/
static const EC_CURVE ec_curves[EC_NUM] = {
/* Prime Curves */
- {"secp160r1", NID_secp160r1, 160},
- {"nistp192", NID_X9_62_prime192v1, 192},
- {"nistp224", NID_secp224r1, 224},
- {"nistp256", NID_X9_62_prime256v1, 256},
- {"nistp384", NID_secp384r1, 384},
- {"nistp521", NID_secp521r1, 521},
+ { "secp160r1", NID_secp160r1, 160 },
+ { "nistp192", NID_X9_62_prime192v1, 192 },
+ { "nistp224", NID_secp224r1, 224 },
+ { "nistp256", NID_X9_62_prime256v1, 256 },
+ { "nistp384", NID_secp384r1, 384 },
+ { "nistp521", NID_secp521r1, 521 },
#ifndef OPENSSL_NO_EC2M
/* Binary Curves */
- {"nistk163", NID_sect163k1, 163},
- {"nistk233", NID_sect233k1, 233},
- {"nistk283", NID_sect283k1, 283},
- {"nistk409", NID_sect409k1, 409},
- {"nistk571", NID_sect571k1, 571},
- {"nistb163", NID_sect163r2, 163},
- {"nistb233", NID_sect233r1, 233},
- {"nistb283", NID_sect283r1, 283},
- {"nistb409", NID_sect409r1, 409},
- {"nistb571", NID_sect571r1, 571},
+ { "nistk163", NID_sect163k1, 163 },
+ { "nistk233", NID_sect233k1, 233 },
+ { "nistk283", NID_sect283k1, 283 },
+ { "nistk409", NID_sect409k1, 409 },
+ { "nistk571", NID_sect571k1, 571 },
+ { "nistb163", NID_sect163r2, 163 },
+ { "nistb233", NID_sect233r1, 233 },
+ { "nistb283", NID_sect283r1, 283 },
+ { "nistb409", NID_sect409r1, 409 },
+ { "nistb571", NID_sect571r1, 571 },
#endif
- {"brainpoolP256r1", NID_brainpoolP256r1, 256},
- {"brainpoolP256t1", NID_brainpoolP256t1, 256},
- {"brainpoolP384r1", NID_brainpoolP384r1, 384},
- {"brainpoolP384t1", NID_brainpoolP384t1, 384},
- {"brainpoolP512r1", NID_brainpoolP512r1, 512},
- {"brainpoolP512t1", NID_brainpoolP512t1, 512},
+ { "brainpoolP256r1", NID_brainpoolP256r1, 256 },
+ { "brainpoolP256t1", NID_brainpoolP256t1, 256 },
+ { "brainpoolP384r1", NID_brainpoolP384r1, 384 },
+ { "brainpoolP384t1", NID_brainpoolP384t1, 384 },
+ { "brainpoolP512r1", NID_brainpoolP512r1, 512 },
+ { "brainpoolP512t1", NID_brainpoolP512t1, 512 },
#ifndef OPENSSL_NO_ECX
/* Other and ECDH only ones */
- {"X25519", NID_X25519, 253},
- {"X448", NID_X448, 448}
+ { "X25519", NID_X25519, 253 },
+ { "X448", NID_X448, 448 }
#endif
};
#ifndef OPENSSL_NO_ECX
static const EC_CURVE ed_curves[EdDSA_NUM] = {
/* EdDSA */
- {"Ed25519", NID_ED25519, 253, 64},
- {"Ed448", NID_ED448, 456, 114}
+ { "Ed25519", NID_ED25519, 253, 64 },
+ { "Ed448", NID_ED448, 456, 114 }
};
#endif /* OPENSSL_NO_ECX */
#ifndef OPENSSL_NO_SM2
static const EC_CURVE sm2_curves[SM2_NUM] = {
/* SM2 */
- {"CurveSM2", NID_sm2, 256}
+ { "CurveSM2", NID_sm2, 256 }
};
uint8_t sm2_doit[SM2_NUM] = { 0 };
#endif
@@ -2040,7 +2115,7 @@ int speed_main(int argc, char **argv)
switch (o) {
case OPT_EOF:
case OPT_ERR:
- opterr:
+ opterr:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
case OPT_HELP:
@@ -2063,8 +2138,8 @@ int speed_main(int argc, char **argv)
if (evp_cipher == NULL && evp_md_name == NULL) {
ERR_clear_last_mark();
BIO_printf(bio_err,
- "%s: %s is an unknown cipher or digest\n",
- prog, opt_arg());
+ "%s: %s is an unknown cipher or digest\n",
+ prog, opt_arg());
goto end;
}
ERR_pop_to_mark();
@@ -2073,7 +2148,7 @@ int speed_main(int argc, char **argv)
case OPT_HMAC:
if (!have_md(opt_arg())) {
BIO_printf(bio_err, "%s: %s is an unknown digest\n",
- prog, opt_arg());
+ prog, opt_arg());
goto end;
}
evp_mac_mdname = opt_arg();
@@ -2082,7 +2157,7 @@ int speed_main(int argc, char **argv)
case OPT_CMAC:
if (!have_cipher(opt_arg())) {
BIO_printf(bio_err, "%s: %s is an unknown cipher\n",
- prog, opt_arg());
+ prog, opt_arg());
goto end;
}
evp_mac_ciphername = opt_arg();
@@ -2109,8 +2184,8 @@ int speed_main(int argc, char **argv)
}
if (!ASYNC_is_capable()) {
BIO_printf(bio_err,
- "%s: async_jobs specified but async not supported\n",
- prog);
+ "%s: async_jobs specified but async not supported\n",
+ prog);
if (testmode)
/* Return success in the testmode. */
return 0;
@@ -2122,7 +2197,7 @@ int speed_main(int argc, char **argv)
misalign = opt_int_arg();
if (misalign > MISALIGN) {
BIO_printf(bio_err,
- "%s: Maximum offset is %d\n", prog, MISALIGN);
+ "%s: Maximum offset is %d\n", prog, MISALIGN);
goto opterr;
}
break;
@@ -2133,8 +2208,8 @@ int speed_main(int argc, char **argv)
multiblock = 1;
#ifdef OPENSSL_NO_MULTIBLOCK
BIO_printf(bio_err,
- "%s: -mb specified but multi-block support is disabled\n",
- prog);
+ "%s: -mb specified but multi-block support is disabled\n",
+ prog);
goto end;
#endif
break;
@@ -2156,9 +2231,9 @@ int speed_main(int argc, char **argv)
break;
case OPT_SECONDS:
seconds.sym = seconds.rsa = seconds.dsa = seconds.ecdsa
- = seconds.ecdh = seconds.eddsa
- = seconds.sm2 = seconds.ffdh
- = seconds.kem = seconds.sig = opt_int_arg();
+ = seconds.ecdh = seconds.eddsa
+ = seconds.sm2 = seconds.ffdh
+ = seconds.kem = seconds.sig = opt_int_arg();
break;
case OPT_BYTES:
lengths_single = opt_int_arg();
@@ -2178,8 +2253,8 @@ int speed_main(int argc, char **argv)
domlock = 1;
#if !defined(_WIN32) && !defined(OPENSSL_SYS_LINUX)
BIO_printf(bio_err,
- "%s: -mlock not supported on this platform\n",
- prog);
+ "%s: -mlock not supported on this platform\n",
+ prog);
goto end;
#endif
break;
@@ -2201,7 +2276,7 @@ int speed_main(int argc, char **argv)
if (strcmp(EVP_KEM_get0_name(kem), "RSA") == 0) {
if (kems_algs_len + OSSL_NELEM(rsa_choices) >= MAX_KEM_NUM) {
BIO_printf(bio_err,
- "Too many KEMs registered. Change MAX_KEM_NUM.\n");
+ "Too many KEMs registered. Change MAX_KEM_NUM.\n");
goto end;
}
for (i = 0; i < OSSL_NELEM(rsa_choices); i++) {
@@ -2211,7 +2286,7 @@ int speed_main(int argc, char **argv)
} else if (strcmp(EVP_KEM_get0_name(kem), "EC") == 0) {
if (kems_algs_len + 3 >= MAX_KEM_NUM) {
BIO_printf(bio_err,
- "Too many KEMs registered. Change MAX_KEM_NUM.\n");
+ "Too many KEMs registered. Change MAX_KEM_NUM.\n");
goto end;
}
kems_doit[kems_algs_len] = 1;
@@ -2223,7 +2298,7 @@ int speed_main(int argc, char **argv)
} else {
if (kems_algs_len + 1 >= MAX_KEM_NUM) {
BIO_printf(bio_err,
- "Too many KEMs registered. Change MAX_KEM_NUM.\n");
+ "Too many KEMs registered. Change MAX_KEM_NUM.\n");
goto end;
}
kems_doit[kems_algs_len] = 1;
@@ -2246,7 +2321,7 @@ int speed_main(int argc, char **argv)
if (strcmp(sig_name, "RSA") == 0) {
if (sigs_algs_len + OSSL_NELEM(rsa_choices) >= MAX_SIG_NUM) {
BIO_printf(bio_err,
- "Too many signatures registered. Change MAX_SIG_NUM.\n");
+ "Too many signatures registered. Change MAX_SIG_NUM.\n");
goto end;
}
for (i = 0; i < OSSL_NELEM(rsa_choices); i++) {
@@ -2258,7 +2333,7 @@ int speed_main(int argc, char **argv)
else if (strcmp(sig_name, "DSA") == 0) {
if (sigs_algs_len + DSA_NUM >= MAX_SIG_NUM) {
BIO_printf(bio_err,
- "Too many signatures registered. Change MAX_SIG_NUM.\n");
+ "Too many signatures registered. Change MAX_SIG_NUM.\n");
goto end;
}
for (i = 0; i < DSA_NUM; i++) {
@@ -2268,19 +2343,10 @@ int speed_main(int argc, char **argv)
}
#endif /* OPENSSL_NO_DSA */
/* skipping these algs as tested elsewhere - and b/o setup is a pain */
- else if (strncmp(sig_name, "RSA", 3) &&
- strncmp(sig_name, "DSA", 3) &&
- strncmp(sig_name, "ED25519", 7) &&
- strncmp(sig_name, "ED448", 5) &&
- strncmp(sig_name, "ECDSA", 5) &&
- strcmp(sig_name, "HMAC") &&
- strcmp(sig_name, "SIPHASH") &&
- strcmp(sig_name, "POLY1305") &&
- strcmp(sig_name, "CMAC") &&
- strcmp(sig_name, "SM2")) { /* skip alg */
+ else if (strncmp(sig_name, "RSA", 3) && strncmp(sig_name, "DSA", 3) && strncmp(sig_name, "ED25519", 7) && strncmp(sig_name, "ED448", 5) && strncmp(sig_name, "ECDSA", 5) && strcmp(sig_name, "HMAC") && strcmp(sig_name, "SIPHASH") && strcmp(sig_name, "POLY1305") && strcmp(sig_name, "CMAC") && strcmp(sig_name, "SM2")) { /* skip alg */
if (sigs_algs_len + 1 >= MAX_SIG_NUM) {
BIO_printf(bio_err,
- "Too many signatures registered. Change MAX_SIG_NUM.\n");
+ "Too many signatures registered. Change MAX_SIG_NUM.\n");
goto end;
}
/* activate this provider algorithm */
@@ -2430,10 +2496,9 @@ int speed_main(int argc, char **argv)
if (evp_cipher == NULL) {
BIO_printf(bio_err, "-aead can be used only with an AEAD cipher\n");
goto end;
- } else if (!(EVP_CIPHER_get_flags(evp_cipher) &
- EVP_CIPH_FLAG_AEAD_CIPHER)) {
+ } else if (!(EVP_CIPHER_get_flags(evp_cipher) & EVP_CIPH_FLAG_AEAD_CIPHER)) {
BIO_printf(bio_err, "%s is not an AEAD cipher\n",
- EVP_CIPHER_get0_name(evp_cipher));
+ EVP_CIPHER_get0_name(evp_cipher));
goto end;
}
}
@@ -2464,10 +2529,9 @@ int speed_main(int argc, char **argv)
BIO_printf(bio_err, "-mb can be used only with a multi-block"
" capable cipher\n");
goto end;
- } else if (!(EVP_CIPHER_get_flags(evp_cipher) &
- EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK)) {
+ } else if (!(EVP_CIPHER_get_flags(evp_cipher) & EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK)) {
BIO_printf(bio_err, "%s is not a multi-block capable\n",
- EVP_CIPHER_get0_name(evp_cipher));
+ EVP_CIPHER_get0_name(evp_cipher));
goto end;
} else if (async_jobs > 0) {
BIO_printf(bio_err, "Async mode is not supported with -mb");
@@ -2485,12 +2549,11 @@ int speed_main(int argc, char **argv)
}
loopargs_len = (async_jobs == 0 ? 1 : async_jobs);
- loopargs =
- app_malloc_array(loopargs_len, sizeof(loopargs_t), "array of loopargs");
+ loopargs = app_malloc_array(loopargs_len, sizeof(loopargs_t), "array of loopargs");
memset(loopargs, 0, loopargs_len * sizeof(loopargs_t));
buflen = lengths[size_num - 1];
- if (buflen < 36) /* size of random vector in RSA benchmark */
+ if (buflen < 36) /* size of random vector in RSA benchmark */
buflen = 36;
if (INT_MAX - (MAX_MISALIGNMENT + 1) < buflen) {
BIO_printf(bio_err, "Error: buffer size too large\n");
@@ -2556,14 +2619,16 @@ int speed_main(int argc, char **argv)
doit[i] = 0;
}
if ((mac = EVP_MAC_fetch(app_get0_libctx(), "GMAC",
- app_get0_propq())) != NULL) {
+ app_get0_propq()))
+ != NULL) {
EVP_MAC_free(mac);
mac = NULL;
} else {
doit[D_GHASH] = 0;
}
if ((mac = EVP_MAC_fetch(app_get0_libctx(), "HMAC",
- app_get0_propq())) != NULL) {
+ app_get0_propq()))
+ != NULL) {
EVP_MAC_free(mac);
mac = NULL;
} else {
@@ -2596,8 +2661,8 @@ int speed_main(int argc, char **argv)
if (usertime == 0 && !mr)
BIO_printf(bio_err,
- "You have chosen to measure elapsed time "
- "instead of user CPU time.\n");
+ "You have chosen to measure elapsed time "
+ "instead of user CPU time.\n");
#if SIGALRM > 0
signal(SIGALRM, alarmed);
@@ -2723,12 +2788,10 @@ int speed_main(int argc, char **argv)
BIO_snprintf(evp_hmac_name, hmac_name_len, "hmac(%s)", evp_mac_mdname);
names[D_HMAC] = evp_hmac_name;
- params[0] =
- OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_DIGEST,
- evp_mac_mdname, 0);
- params[1] =
- OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_KEY,
- (char *)hmac_key, len);
+ params[0] = OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_DIGEST,
+ evp_mac_mdname, 0);
+ params[1] = OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_KEY,
+ (char *)hmac_key, len);
params[2] = OSSL_PARAM_construct_end();
if (mac_setup("HMAC", &mac, params, loopargs, loopargs_len) < 1)
@@ -2750,7 +2813,7 @@ int speed_main(int argc, char **argv)
for (i = 0; st && i < loopargs_len; i++) {
loopargs[i].ctx = init_evp_cipher_ctx("des-cbc", deskey,
- sizeof(deskey) / 3);
+ sizeof(deskey) / 3);
st = loopargs[i].ctx != NULL;
}
algindex = D_CBC_DES;
@@ -2772,7 +2835,7 @@ int speed_main(int argc, char **argv)
for (i = 0; st && i < loopargs_len; i++) {
loopargs[i].ctx = init_evp_cipher_ctx("des-ede3-cbc", deskey,
- sizeof(deskey));
+ sizeof(deskey));
st = loopargs[i].ctx != NULL;
}
algindex = D_EDE3_DES;
@@ -2781,8 +2844,7 @@ int speed_main(int argc, char **argv)
break;
print_message(names[D_EDE3_DES], lengths[testnum], seconds.sym);
Time_F(START);
- count =
- run_benchmark(async_jobs, EVP_Cipher_loop, loopargs);
+ count = run_benchmark(async_jobs, EVP_Cipher_loop, loopargs);
d = Time_F(STOP);
print_result(D_EDE3_DES, testnum, count, d);
}
@@ -2798,7 +2860,7 @@ int speed_main(int argc, char **argv)
keylen = 16 + k * 8;
for (i = 0; st && i < loopargs_len; i++) {
loopargs[i].ctx = init_evp_cipher_ctx(names[algindex],
- key32, keylen);
+ key32, keylen);
st = loopargs[i].ctx != NULL;
}
@@ -2807,8 +2869,7 @@ int speed_main(int argc, char **argv)
break;
print_message(names[algindex], lengths[testnum], seconds.sym);
Time_F(START);
- count =
- run_benchmark(async_jobs, EVP_Cipher_loop, loopargs);
+ count = run_benchmark(async_jobs, EVP_Cipher_loop, loopargs);
d = Time_F(STOP);
print_result(algindex, testnum, count, d);
}
@@ -2825,7 +2886,7 @@ int speed_main(int argc, char **argv)
keylen = 16 + k * 8;
for (i = 0; st && i < loopargs_len; i++) {
loopargs[i].ctx = init_evp_cipher_ctx(names[algindex],
- key32, keylen);
+ key32, keylen);
st = loopargs[i].ctx != NULL;
}
@@ -2834,8 +2895,7 @@ int speed_main(int argc, char **argv)
break;
print_message(names[algindex], lengths[testnum], seconds.sym);
Time_F(START);
- count =
- run_benchmark(async_jobs, EVP_Cipher_loop, loopargs);
+ count = run_benchmark(async_jobs, EVP_Cipher_loop, loopargs);
d = Time_F(STOP);
print_result(algindex, testnum, count, d);
}
@@ -2851,7 +2911,7 @@ int speed_main(int argc, char **argv)
keylen = 16;
for (i = 0; st && i < loopargs_len; i++) {
loopargs[i].ctx = init_evp_cipher_ctx(names[algindex],
- key32, keylen);
+ key32, keylen);
st = loopargs[i].ctx != NULL;
}
@@ -2860,8 +2920,7 @@ int speed_main(int argc, char **argv)
break;
print_message(names[algindex], lengths[testnum], seconds.sym);
Time_F(START);
- count =
- run_benchmark(async_jobs, EVP_Cipher_loop, loopargs);
+ count = run_benchmark(async_jobs, EVP_Cipher_loop, loopargs);
d = Time_F(STOP);
print_result(algindex, testnum, count, d);
}
@@ -2874,12 +2933,12 @@ int speed_main(int argc, char **argv)
OSSL_PARAM params[4];
params[0] = OSSL_PARAM_construct_utf8_string(OSSL_ALG_PARAM_CIPHER,
- "aes-128-gcm", 0);
+ "aes-128-gcm", 0);
params[1] = OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_IV,
- (char *)gmac_iv,
- sizeof(gmac_iv) - 1);
+ (char *)gmac_iv,
+ sizeof(gmac_iv) - 1);
params[2] = OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_KEY,
- (void *)key32, 16);
+ (void *)key32, 16);
params[3] = OSSL_PARAM_construct_end();
if (mac_setup("GMAC", &mac, params, loopargs, loopargs_len) < 1)
@@ -2919,12 +2978,11 @@ int speed_main(int argc, char **argv)
*/
if (doit[D_EVP]) {
if (evp_cipher != NULL) {
- int (*loopfunc) (void *);
+ int (*loopfunc)(void *);
int outlen = 0;
unsigned int ae_mode = 0;
- if (multiblock && (EVP_CIPHER_get_flags(evp_cipher)
- & EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK)) {
+ if (multiblock && (EVP_CIPHER_get_flags(evp_cipher) & EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK)) {
multiblock_speed(evp_cipher, lengths_single, &seconds);
ret = 0;
goto end;
@@ -2971,7 +3029,7 @@ int speed_main(int argc, char **argv)
* authenticity and hence decryption will fail.
*/
if (!EVP_CipherInit_ex(loopargs[k].ctx, evp_cipher, NULL,
- NULL, NULL, ae_mode ? 1 : !decrypt)) {
+ NULL, NULL, ae_mode ? 1 : !decrypt)) {
BIO_printf(bio_err, "\nCouldn't init the context\n");
dofail();
exit(1);
@@ -2986,22 +3044,22 @@ int speed_main(int argc, char **argv)
if (!ae_mode) {
if (!EVP_CipherInit_ex(loopargs[k].ctx, NULL, NULL,
- loopargs[k].key, iv, -1)) {
+ loopargs[k].key, iv, -1)) {
BIO_printf(bio_err, "\nFailed to set the key\n");
dofail();
exit(1);
}
} else if (mode_op == EVP_CIPH_SIV_MODE
- || mode_op == EVP_CIPH_GCM_SIV_MODE) {
+ || mode_op == EVP_CIPH_GCM_SIV_MODE) {
EVP_CIPHER_CTX_ctrl(loopargs[k].ctx,
- EVP_CTRL_SET_SPEED, 1, NULL);
+ EVP_CTRL_SET_SPEED, 1, NULL);
}
if (ae_mode && decrypt) {
/* Set length of iv (Doesn't apply to SIV mode) */
if (mode_op != EVP_CIPH_SIV_MODE) {
if (!EVP_CIPHER_CTX_ctrl(loopargs[k].ctx,
- EVP_CTRL_AEAD_SET_IVLEN,
- sizeof(aead_iv), NULL)) {
+ EVP_CTRL_AEAD_SET_IVLEN,
+ sizeof(aead_iv), NULL)) {
BIO_printf(bio_err, "\nFailed to set iv length\n");
dofail();
exit(1);
@@ -3012,16 +3070,16 @@ int speed_main(int argc, char **argv)
&& mode_op != EVP_CIPH_SIV_MODE
&& mode_op != EVP_CIPH_GCM_SIV_MODE) {
if (!EVP_CIPHER_CTX_ctrl(loopargs[k].ctx,
- EVP_CTRL_AEAD_SET_TAG,
- TAG_LEN, NULL)) {
+ EVP_CTRL_AEAD_SET_TAG,
+ TAG_LEN, NULL)) {
BIO_printf(bio_err,
- "\nFailed to set tag length\n");
+ "\nFailed to set tag length\n");
dofail();
exit(1);
}
}
if (!EVP_CipherInit_ex(loopargs[k].ctx, NULL, NULL,
- loopargs[k].key, aead_iv, -1)) {
+ loopargs[k].key, aead_iv, -1)) {
BIO_printf(bio_err, "\nFailed to set the key\n");
dofail();
exit(1);
@@ -3029,42 +3087,42 @@ int speed_main(int argc, char **argv)
/* Set total length of input. Only required for CCM */
if (mode_op == EVP_CIPH_CCM_MODE) {
if (!EVP_EncryptUpdate(loopargs[k].ctx, NULL,
- &outlen, NULL,
- lengths[testnum])) {
+ &outlen, NULL,
+ lengths[testnum])) {
BIO_printf(bio_err,
- "\nCouldn't set input text length\n");
+ "\nCouldn't set input text length\n");
dofail();
exit(1);
}
}
if (aead) {
if (!EVP_EncryptUpdate(loopargs[k].ctx, NULL,
- &outlen, aad, sizeof(aad))) {
+ &outlen, aad, sizeof(aad))) {
BIO_printf(bio_err,
- "\nCouldn't insert AAD when encrypting\n");
+ "\nCouldn't insert AAD when encrypting\n");
dofail();
exit(1);
}
}
if (!EVP_EncryptUpdate(loopargs[k].ctx, loopargs[k].buf,
- &outlen, loopargs[k].buf,
- lengths[testnum])) {
+ &outlen, loopargs[k].buf,
+ lengths[testnum])) {
BIO_printf(bio_err,
- "\nFailed to to encrypt the data\n");
+ "\nFailed to to encrypt the data\n");
dofail();
exit(1);
}
if (!EVP_EncryptFinal_ex(loopargs[k].ctx,
- loopargs[k].buf, &outlen)) {
+ loopargs[k].buf, &outlen)) {
BIO_printf(bio_err,
- "\nFailed finalize the encryption\n");
+ "\nFailed finalize the encryption\n");
dofail();
exit(1);
}
if (!EVP_CIPHER_CTX_ctrl(loopargs[k].ctx, EVP_CTRL_AEAD_GET_TAG,
- TAG_LEN, &loopargs[k].tag)) {
+ TAG_LEN, &loopargs[k].tag)) {
BIO_printf(bio_err, "\nFailed to get the tag\n");
dofail();
exit(1);
@@ -3074,13 +3132,13 @@ int speed_main(int argc, char **argv)
loopargs[k].ctx = EVP_CIPHER_CTX_new();
if (loopargs[k].ctx == NULL) {
BIO_printf(bio_err,
- "\nEVP_CIPHER_CTX_new failure\n");
+ "\nEVP_CIPHER_CTX_new failure\n");
exit(1);
}
if (!EVP_CipherInit_ex(loopargs[k].ctx, evp_cipher,
- NULL, NULL, NULL, 0)) {
+ NULL, NULL, NULL, 0)) {
BIO_printf(bio_err,
- "\nFailed initializing the context\n");
+ "\nFailed initializing the context\n");
dofail();
exit(1);
}
@@ -3091,7 +3149,7 @@ int speed_main(int argc, char **argv)
if (mode_op == EVP_CIPH_SIV_MODE
|| mode_op == EVP_CIPH_GCM_SIV_MODE)
EVP_CIPHER_CTX_ctrl(loopargs[k].ctx,
- EVP_CTRL_SET_SPEED, 1, NULL);
+ EVP_CTRL_SET_SPEED, 1, NULL);
}
}
@@ -3138,9 +3196,9 @@ int speed_main(int argc, char **argv)
names[D_EVP_CMAC] = evp_cmac_name;
params[0] = OSSL_PARAM_construct_utf8_string(OSSL_ALG_PARAM_CIPHER,
- evp_mac_ciphername, 0);
+ evp_mac_ciphername, 0);
params[1] = OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_KEY,
- (char *)key32, keylen);
+ (char *)key32, keylen);
params[2] = OSSL_PARAM_construct_end();
if (mac_setup("CMAC", &mac, params, loopargs, loopargs_len) < 1)
@@ -3161,7 +3219,7 @@ int speed_main(int argc, char **argv)
OSSL_PARAM params[2];
params[0] = OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_KEY,
- (void *)key32, 16);
+ (void *)key32, 16);
params[1] = OSSL_PARAM_construct_end();
if (mac_setup("KMAC-128", &mac, params, loopargs, loopargs_len) < 1)
@@ -3182,7 +3240,7 @@ int speed_main(int argc, char **argv)
OSSL_PARAM params[2];
params[0] = OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_KEY,
- (void *)key32, 32);
+ (void *)key32, 32);
params[1] = OSSL_PARAM_construct_end();
if (mac_setup("KMAC-256", &mac, params, loopargs, loopargs_len) < 1)
@@ -3228,7 +3286,8 @@ int speed_main(int argc, char **argv)
const unsigned char *p = rsa_keys[testnum].data;
st = (rsa_key = d2i_PrivateKey(EVP_PKEY_RSA, NULL, &p,
- rsa_keys[testnum].length)) != NULL;
+ rsa_keys[testnum].length))
+ != NULL;
}
for (i = 0; st && i < loopargs_len; i++) {
@@ -3237,57 +3296,59 @@ int speed_main(int argc, char **argv)
if (loopargs[i].rsa_sign_ctx[testnum] == NULL
|| EVP_PKEY_sign_init(loopargs[i].rsa_sign_ctx[testnum]) <= 0
|| EVP_PKEY_sign(loopargs[i].rsa_sign_ctx[testnum],
- loopargs[i].buf2,
- &loopargs[i].sigsize,
- loopargs[i].buf, 36) <= 0)
+ loopargs[i].buf2,
+ &loopargs[i].sigsize,
+ loopargs[i].buf, 36)
+ <= 0)
st = 0;
}
if (!st) {
BIO_printf(bio_err,
- "RSA sign setup failure. No RSA sign will be done.\n");
+ "RSA sign setup failure. No RSA sign will be done.\n");
dofail();
op_count = 1;
} else {
pkey_print_message("private", "rsa sign",
- rsa_keys[testnum].bits, seconds.rsa);
+ rsa_keys[testnum].bits, seconds.rsa);
/* RSA_blinding_on(rsa_key[testnum],NULL); */
Time_F(START);
count = run_benchmark(async_jobs, RSA_sign_loop, loopargs);
d = Time_F(STOP);
BIO_printf(bio_err,
- mr ? "+R1:%ld:%d:%.2f\n"
- : "%ld %u bits private RSA sign ops in %.2fs\n",
- count, rsa_keys[testnum].bits, d);
+ mr ? "+R1:%ld:%d:%.2f\n"
+ : "%ld %u bits private RSA sign ops in %.2fs\n",
+ count, rsa_keys[testnum].bits, d);
rsa_results[testnum][0] = (double)count / d;
op_count = count;
}
for (i = 0; st && i < loopargs_len; i++) {
loopargs[i].rsa_verify_ctx[testnum] = EVP_PKEY_CTX_new(rsa_key,
- NULL);
+ NULL);
if (loopargs[i].rsa_verify_ctx[testnum] == NULL
|| EVP_PKEY_verify_init(loopargs[i].rsa_verify_ctx[testnum]) <= 0
|| EVP_PKEY_verify(loopargs[i].rsa_verify_ctx[testnum],
- loopargs[i].buf2,
- loopargs[i].sigsize,
- loopargs[i].buf, 36) <= 0)
+ loopargs[i].buf2,
+ loopargs[i].sigsize,
+ loopargs[i].buf, 36)
+ <= 0)
st = 0;
}
if (!st) {
BIO_printf(bio_err,
- "RSA verify setup failure. No RSA verify will be done.\n");
+ "RSA verify setup failure. No RSA verify will be done.\n");
dofail();
rsa_doit[testnum] = 0;
} else {
pkey_print_message("public", "rsa verify",
- rsa_keys[testnum].bits, seconds.rsa);
+ rsa_keys[testnum].bits, seconds.rsa);
Time_F(START);
count = run_benchmark(async_jobs, RSA_verify_loop, loopargs);
d = Time_F(STOP);
BIO_printf(bio_err,
- mr ? "+R2:%ld:%d:%.2f\n"
- : "%ld %u bits public RSA verify ops in %.2fs\n",
- count, rsa_keys[testnum].bits, d);
+ mr ? "+R2:%ld:%d:%.2f\n"
+ : "%ld %u bits public RSA verify ops in %.2fs\n",
+ count, rsa_keys[testnum].bits, d);
rsa_results[testnum][1] = (double)count / d;
}
@@ -3297,27 +3358,28 @@ int speed_main(int argc, char **argv)
if (loopargs[i].rsa_encrypt_ctx[testnum] == NULL
|| EVP_PKEY_encrypt_init(loopargs[i].rsa_encrypt_ctx[testnum]) <= 0
|| EVP_PKEY_encrypt(loopargs[i].rsa_encrypt_ctx[testnum],
- loopargs[i].buf2,
- &loopargs[i].encsize,
- loopargs[i].buf, 36) <= 0)
+ loopargs[i].buf2,
+ &loopargs[i].encsize,
+ loopargs[i].buf, 36)
+ <= 0)
st = 0;
}
if (!st) {
BIO_printf(bio_err,
- "RSA encrypt setup failure. No RSA encrypt will be done.\n");
+ "RSA encrypt setup failure. No RSA encrypt will be done.\n");
dofail();
op_count = 1;
} else {
pkey_print_message("public", "rsa encrypt",
- rsa_keys[testnum].bits, seconds.rsa);
+ rsa_keys[testnum].bits, seconds.rsa);
/* RSA_blinding_on(rsa_key[testnum],NULL); */
Time_F(START);
count = run_benchmark(async_jobs, RSA_encrypt_loop, loopargs);
d = Time_F(STOP);
BIO_printf(bio_err,
- mr ? "+R3:%ld:%d:%.2f\n"
- : "%ld %u bits public RSA encrypt ops in %.2fs\n",
- count, rsa_keys[testnum].bits, d);
+ mr ? "+R3:%ld:%d:%.2f\n"
+ : "%ld %u bits public RSA encrypt ops in %.2fs\n",
+ count, rsa_keys[testnum].bits, d);
rsa_results[testnum][2] = (double)count / d;
op_count = count;
}
@@ -3328,28 +3390,29 @@ int speed_main(int argc, char **argv)
if (loopargs[i].rsa_decrypt_ctx[testnum] == NULL
|| EVP_PKEY_decrypt_init(loopargs[i].rsa_decrypt_ctx[testnum]) <= 0
|| EVP_PKEY_decrypt(loopargs[i].rsa_decrypt_ctx[testnum],
- loopargs[i].buf,
- &declen,
- loopargs[i].buf2,
- loopargs[i].encsize) <= 0)
+ loopargs[i].buf,
+ &declen,
+ loopargs[i].buf2,
+ loopargs[i].encsize)
+ <= 0)
st = 0;
}
if (!st) {
BIO_printf(bio_err,
- "RSA decrypt setup failure. No RSA decrypt will be done.\n");
+ "RSA decrypt setup failure. No RSA decrypt will be done.\n");
dofail();
op_count = 1;
} else {
pkey_print_message("private", "rsa decrypt",
- rsa_keys[testnum].bits, seconds.rsa);
+ rsa_keys[testnum].bits, seconds.rsa);
/* RSA_blinding_on(rsa_key[testnum],NULL); */
Time_F(START);
count = run_benchmark(async_jobs, RSA_decrypt_loop, loopargs);
d = Time_F(STOP);
BIO_printf(bio_err,
- mr ? "+R4:%ld:%d:%.2f\n"
- : "%ld %u bits private RSA decrypt ops in %.2fs\n",
- count, rsa_keys[testnum].bits, d);
+ mr ? "+R4:%ld:%d:%.2f\n"
+ : "%ld %u bits private RSA decrypt ops in %.2fs\n",
+ count, rsa_keys[testnum].bits, d);
rsa_results[testnum][3] = (double)count / d;
op_count = count;
}
@@ -3373,61 +3436,63 @@ int speed_main(int argc, char **argv)
for (i = 0; st && i < loopargs_len; i++) {
loopargs[i].dsa_sign_ctx[testnum] = EVP_PKEY_CTX_new(dsa_key,
- NULL);
+ NULL);
loopargs[i].sigsize = loopargs[i].buflen;
if (loopargs[i].dsa_sign_ctx[testnum] == NULL
|| EVP_PKEY_sign_init(loopargs[i].dsa_sign_ctx[testnum]) <= 0
|| EVP_PKEY_sign(loopargs[i].dsa_sign_ctx[testnum],
- loopargs[i].buf2,
- &loopargs[i].sigsize,
- loopargs[i].buf, 20) <= 0)
+ loopargs[i].buf2,
+ &loopargs[i].sigsize,
+ loopargs[i].buf, 20)
+ <= 0)
st = 0;
}
if (!st) {
BIO_printf(bio_err,
- "DSA sign setup failure. No DSA sign will be done.\n");
+ "DSA sign setup failure. No DSA sign will be done.\n");
dofail();
op_count = 1;
} else {
pkey_print_message("sign", "dsa",
- dsa_bits[testnum], seconds.dsa);
+ dsa_bits[testnum], seconds.dsa);
Time_F(START);
count = run_benchmark(async_jobs, DSA_sign_loop, loopargs);
d = Time_F(STOP);
BIO_printf(bio_err,
- mr ? "+R5:%ld:%u:%.2f\n"
- : "%ld %u bits DSA sign ops in %.2fs\n",
- count, dsa_bits[testnum], d);
+ mr ? "+R5:%ld:%u:%.2f\n"
+ : "%ld %u bits DSA sign ops in %.2fs\n",
+ count, dsa_bits[testnum], d);
dsa_results[testnum][0] = (double)count / d;
op_count = count;
}
for (i = 0; st && i < loopargs_len; i++) {
loopargs[i].dsa_verify_ctx[testnum] = EVP_PKEY_CTX_new(dsa_key,
- NULL);
+ NULL);
if (loopargs[i].dsa_verify_ctx[testnum] == NULL
|| EVP_PKEY_verify_init(loopargs[i].dsa_verify_ctx[testnum]) <= 0
|| EVP_PKEY_verify(loopargs[i].dsa_verify_ctx[testnum],
- loopargs[i].buf2,
- loopargs[i].sigsize,
- loopargs[i].buf, 36) <= 0)
+ loopargs[i].buf2,
+ loopargs[i].sigsize,
+ loopargs[i].buf, 36)
+ <= 0)
st = 0;
}
if (!st) {
BIO_printf(bio_err,
- "DSA verify setup failure. No DSA verify will be done.\n");
+ "DSA verify setup failure. No DSA verify will be done.\n");
dofail();
dsa_doit[testnum] = 0;
} else {
pkey_print_message("verify", "dsa",
- dsa_bits[testnum], seconds.dsa);
+ dsa_bits[testnum], seconds.dsa);
Time_F(START);
count = run_benchmark(async_jobs, DSA_verify_loop, loopargs);
d = Time_F(STOP);
BIO_printf(bio_err,
- mr ? "+R6:%ld:%u:%.2f\n"
- : "%ld %u bits DSA verify ops in %.2fs\n",
- count, dsa_bits[testnum], d);
+ mr ? "+R6:%ld:%u:%.2f\n"
+ : "%ld %u bits DSA verify ops in %.2fs\n",
+ count, dsa_bits[testnum], d);
dsa_results[testnum][1] = (double)count / d;
}
@@ -3450,61 +3515,63 @@ int speed_main(int argc, char **argv)
for (i = 0; st && i < loopargs_len; i++) {
loopargs[i].ecdsa_sign_ctx[testnum] = EVP_PKEY_CTX_new(ecdsa_key,
- NULL);
+ NULL);
loopargs[i].sigsize = loopargs[i].buflen;
if (loopargs[i].ecdsa_sign_ctx[testnum] == NULL
|| EVP_PKEY_sign_init(loopargs[i].ecdsa_sign_ctx[testnum]) <= 0
|| EVP_PKEY_sign(loopargs[i].ecdsa_sign_ctx[testnum],
- loopargs[i].buf2,
- &loopargs[i].sigsize,
- loopargs[i].buf, 20) <= 0)
+ loopargs[i].buf2,
+ &loopargs[i].sigsize,
+ loopargs[i].buf, 20)
+ <= 0)
st = 0;
}
if (!st) {
BIO_printf(bio_err,
- "ECDSA sign setup failure. No ECDSA sign will be done.\n");
+ "ECDSA sign setup failure. No ECDSA sign will be done.\n");
dofail();
op_count = 1;
} else {
pkey_print_message("sign", "ecdsa",
- ec_curves[testnum].bits, seconds.ecdsa);
+ ec_curves[testnum].bits, seconds.ecdsa);
Time_F(START);
count = run_benchmark(async_jobs, ECDSA_sign_loop, loopargs);
d = Time_F(STOP);
BIO_printf(bio_err,
- mr ? "+R7:%ld:%u:%.2f\n"
- : "%ld %u bits ECDSA sign ops in %.2fs\n",
- count, ec_curves[testnum].bits, d);
+ mr ? "+R7:%ld:%u:%.2f\n"
+ : "%ld %u bits ECDSA sign ops in %.2fs\n",
+ count, ec_curves[testnum].bits, d);
ecdsa_results[testnum][0] = (double)count / d;
op_count = count;
}
for (i = 0; st && i < loopargs_len; i++) {
loopargs[i].ecdsa_verify_ctx[testnum] = EVP_PKEY_CTX_new(ecdsa_key,
- NULL);
+ NULL);
if (loopargs[i].ecdsa_verify_ctx[testnum] == NULL
|| EVP_PKEY_verify_init(loopargs[i].ecdsa_verify_ctx[testnum]) <= 0
|| EVP_PKEY_verify(loopargs[i].ecdsa_verify_ctx[testnum],
- loopargs[i].buf2,
- loopargs[i].sigsize,
- loopargs[i].buf, 20) <= 0)
+ loopargs[i].buf2,
+ loopargs[i].sigsize,
+ loopargs[i].buf, 20)
+ <= 0)
st = 0;
}
if (!st) {
BIO_printf(bio_err,
- "ECDSA verify setup failure. No ECDSA verify will be done.\n");
+ "ECDSA verify setup failure. No ECDSA verify will be done.\n");
dofail();
ecdsa_doit[testnum] = 0;
} else {
pkey_print_message("verify", "ecdsa",
- ec_curves[testnum].bits, seconds.ecdsa);
+ ec_curves[testnum].bits, seconds.ecdsa);
Time_F(START);
count = run_benchmark(async_jobs, ECDSA_verify_loop, loopargs);
d = Time_F(STOP);
BIO_printf(bio_err,
- mr ? "+R8:%ld:%u:%.2f\n"
- : "%ld %u bits ECDSA verify ops in %.2fs\n",
- count, ec_curves[testnum].bits, d);
+ mr ? "+R8:%ld:%u:%.2f\n"
+ : "%ld %u bits ECDSA verify ops in %.2fs\n",
+ count, ec_curves[testnum].bits, d);
ecdsa_results[testnum][1] = (double)count / d;
}
@@ -3566,7 +3633,7 @@ int speed_main(int argc, char **argv)
/* Compare the computation results: CRYPTO_memcmp() returns 0 if equal */
if (CRYPTO_memcmp(loopargs[i].secret_a,
- loopargs[i].secret_b, outlen)) {
+ loopargs[i].secret_b, outlen)) {
ecdh_checks = 0;
BIO_printf(bio_err, "ECDH computations don't match.\n");
dofail();
@@ -3584,15 +3651,13 @@ int speed_main(int argc, char **argv)
}
if (ecdh_checks != 0) {
pkey_print_message("", "ecdh",
- ec_curves[testnum].bits, seconds.ecdh);
+ ec_curves[testnum].bits, seconds.ecdh);
Time_F(START);
- count =
- run_benchmark(async_jobs, ECDH_EVP_derive_key_loop, loopargs);
+ count = run_benchmark(async_jobs, ECDH_EVP_derive_key_loop, loopargs);
d = Time_F(STOP);
BIO_printf(bio_err,
- mr ? "+R9:%ld:%d:%.2f\n" :
- "%ld %u-bits ECDH ops in %.2fs\n", count,
- ec_curves[testnum].bits, d);
+ mr ? "+R9:%ld:%d:%.2f\n" : "%ld %u-bits ECDH ops in %.2fs\n", count,
+ ec_curves[testnum].bits, d);
ecdh_results[testnum][0] = (double)count / d;
op_count = count;
}
@@ -3610,7 +3675,7 @@ int speed_main(int argc, char **argv)
EVP_PKEY_CTX *ed_pctx = NULL;
if (!eddsa_doit[testnum])
- continue; /* Ignore Curve */
+ continue; /* Ignore Curve */
for (i = 0; i < loopargs_len; i++) {
loopargs[i].eddsa_ctx[testnum] = EVP_MD_CTX_new();
if (loopargs[i].eddsa_ctx[testnum] == NULL) {
@@ -3624,7 +3689,8 @@ int speed_main(int argc, char **argv)
}
if ((ed_pctx = EVP_PKEY_CTX_new_id(ed_curves[testnum].nid,
- NULL)) == NULL
+ NULL))
+ == NULL
|| EVP_PKEY_keygen_init(ed_pctx) <= 0
|| EVP_PKEY_keygen(ed_pctx, &ed_pkey) <= 0) {
st = 0;
@@ -3634,13 +3700,13 @@ int speed_main(int argc, char **argv)
EVP_PKEY_CTX_free(ed_pctx);
if (!EVP_DigestSignInit(loopargs[i].eddsa_ctx[testnum], NULL, NULL,
- NULL, ed_pkey)) {
+ NULL, ed_pkey)) {
st = 0;
EVP_PKEY_free(ed_pkey);
break;
}
if (!EVP_DigestVerifyInit(loopargs[i].eddsa_ctx2[testnum], NULL,
- NULL, NULL, ed_pkey)) {
+ NULL, NULL, ed_pkey)) {
st = 0;
EVP_PKEY_free(ed_pkey);
break;
@@ -3658,55 +3724,54 @@ int speed_main(int argc, char **argv)
/* Perform EdDSA signature test */
loopargs[i].sigsize = ed_curves[testnum].sigsize;
st = EVP_DigestSign(loopargs[i].eddsa_ctx[testnum],
- loopargs[i].buf2, &loopargs[i].sigsize,
- loopargs[i].buf, 20);
+ loopargs[i].buf2, &loopargs[i].sigsize,
+ loopargs[i].buf, 20);
if (st == 0)
break;
}
if (st == 0) {
BIO_printf(bio_err,
- "EdDSA sign failure. No EdDSA sign will be done.\n");
+ "EdDSA sign failure. No EdDSA sign will be done.\n");
dofail();
op_count = 1;
} else {
pkey_print_message("sign", ed_curves[testnum].name,
- ed_curves[testnum].bits, seconds.eddsa);
+ ed_curves[testnum].bits, seconds.eddsa);
Time_F(START);
count = run_benchmark(async_jobs, EdDSA_sign_loop, loopargs);
d = Time_F(STOP);
BIO_printf(bio_err,
- mr ? "+R10:%ld:%u:%s:%.2f\n" :
- "%ld %u bits %s sign ops in %.2fs \n",
- count, ed_curves[testnum].bits,
- ed_curves[testnum].name, d);
+ mr ? "+R10:%ld:%u:%s:%.2f\n" : "%ld %u bits %s sign ops in %.2fs \n",
+ count, ed_curves[testnum].bits,
+ ed_curves[testnum].name, d);
eddsa_results[testnum][0] = (double)count / d;
op_count = count;
}
/* Perform EdDSA verification test */
for (i = 0; i < loopargs_len; i++) {
st = EVP_DigestVerify(loopargs[i].eddsa_ctx2[testnum],
- loopargs[i].buf2, loopargs[i].sigsize,
- loopargs[i].buf, 20);
+ loopargs[i].buf2, loopargs[i].sigsize,
+ loopargs[i].buf, 20);
if (st != 1)
break;
}
if (st != 1) {
BIO_printf(bio_err,
- "EdDSA verify failure. No EdDSA verify will be done.\n");
+ "EdDSA verify failure. No EdDSA verify will be done.\n");
dofail();
eddsa_doit[testnum] = 0;
} else {
pkey_print_message("verify", ed_curves[testnum].name,
- ed_curves[testnum].bits, seconds.eddsa);
+ ed_curves[testnum].bits, seconds.eddsa);
Time_F(START);
count = run_benchmark(async_jobs, EdDSA_verify_loop, loopargs);
d = Time_F(STOP);
BIO_printf(bio_err,
- mr ? "+R11:%ld:%u:%s:%.2f\n"
- : "%ld %u bits %s verify ops in %.2fs\n",
- count, ed_curves[testnum].bits,
- ed_curves[testnum].name, d);
+ mr ? "+R11:%ld:%u:%s:%.2f\n"
+ : "%ld %u bits %s verify ops in %.2fs\n",
+ count, ed_curves[testnum].bits,
+ ed_curves[testnum].name, d);
eddsa_results[testnum][1] = (double)count / d;
}
@@ -3724,7 +3789,7 @@ int speed_main(int argc, char **argv)
EVP_PKEY *sm2_pkey = NULL;
if (!sm2_doit[testnum])
- continue; /* Ignore Curve */
+ continue; /* Ignore Curve */
/* Init signing and verification */
for (i = 0; i < loopargs_len; i++) {
EVP_PKEY_CTX *sm2_pctx = NULL;
@@ -3735,7 +3800,7 @@ int speed_main(int argc, char **argv)
loopargs[i].sm2_ctx[testnum] = EVP_MD_CTX_new();
loopargs[i].sm2_vfy_ctx[testnum] = EVP_MD_CTX_new();
if (loopargs[i].sm2_ctx[testnum] == NULL
- || loopargs[i].sm2_vfy_ctx[testnum] == NULL)
+ || loopargs[i].sm2_vfy_ctx[testnum] == NULL)
break;
sm2_pkey = NULL;
@@ -3743,7 +3808,8 @@ int speed_main(int argc, char **argv)
st = !((pctx = EVP_PKEY_CTX_new_id(EVP_PKEY_SM2, NULL)) == NULL
|| EVP_PKEY_keygen_init(pctx) <= 0
|| EVP_PKEY_CTX_set_ec_paramgen_curve_nid(pctx,
- sm2_curves[testnum].nid) <= 0
+ sm2_curves[testnum].nid)
+ <= 0
|| EVP_PKEY_keygen(pctx, &sm2_pkey) <= 0);
EVP_PKEY_CTX_free(pctx);
if (st == 0)
@@ -3774,12 +3840,12 @@ int speed_main(int argc, char **argv)
break;
if (!EVP_DigestSignInit(loopargs[i].sm2_ctx[testnum], NULL,
- EVP_sm3(), NULL, sm2_pkey))
+ EVP_sm3(), NULL, sm2_pkey))
break;
if (!EVP_DigestVerifyInit(loopargs[i].sm2_vfy_ctx[testnum], NULL,
- EVP_sm3(), NULL, sm2_pkey))
+ EVP_sm3(), NULL, sm2_pkey))
break;
- st = 1; /* mark loop as succeeded */
+ st = 1; /* mark loop as succeeded */
}
if (st == 0) {
BIO_printf(bio_err, "SM2 init failure.\n");
@@ -3789,28 +3855,27 @@ int speed_main(int argc, char **argv)
for (i = 0; i < loopargs_len; i++) {
/* Perform SM2 signature test */
st = EVP_DigestSign(loopargs[i].sm2_ctx[testnum],
- loopargs[i].buf2, &loopargs[i].sigsize,
- loopargs[i].buf, 20);
+ loopargs[i].buf2, &loopargs[i].sigsize,
+ loopargs[i].buf, 20);
if (st == 0)
break;
}
if (st == 0) {
BIO_printf(bio_err,
- "SM2 sign failure. No SM2 sign will be done.\n");
+ "SM2 sign failure. No SM2 sign will be done.\n");
dofail();
op_count = 1;
} else {
pkey_print_message("sign", sm2_curves[testnum].name,
- sm2_curves[testnum].bits, seconds.sm2);
+ sm2_curves[testnum].bits, seconds.sm2);
Time_F(START);
count = run_benchmark(async_jobs, SM2_sign_loop, loopargs);
d = Time_F(STOP);
BIO_printf(bio_err,
- mr ? "+R12:%ld:%u:%s:%.2f\n" :
- "%ld %u bits %s sign ops in %.2fs \n",
- count, sm2_curves[testnum].bits,
- sm2_curves[testnum].name, d);
+ mr ? "+R12:%ld:%u:%s:%.2f\n" : "%ld %u bits %s sign ops in %.2fs \n",
+ count, sm2_curves[testnum].bits,
+ sm2_curves[testnum].name, d);
sm2_results[testnum][0] = (double)count / d;
op_count = count;
}
@@ -3818,27 +3883,27 @@ int speed_main(int argc, char **argv)
/* Perform SM2 verification test */
for (i = 0; i < loopargs_len; i++) {
st = EVP_DigestVerify(loopargs[i].sm2_vfy_ctx[testnum],
- loopargs[i].buf2, loopargs[i].sigsize,
- loopargs[i].buf, 20);
+ loopargs[i].buf2, loopargs[i].sigsize,
+ loopargs[i].buf, 20);
if (st != 1)
break;
}
if (st != 1) {
BIO_printf(bio_err,
- "SM2 verify failure. No SM2 verify will be done.\n");
+ "SM2 verify failure. No SM2 verify will be done.\n");
dofail();
sm2_doit[testnum] = 0;
} else {
pkey_print_message("verify", sm2_curves[testnum].name,
- sm2_curves[testnum].bits, seconds.sm2);
+ sm2_curves[testnum].bits, seconds.sm2);
Time_F(START);
count = run_benchmark(async_jobs, SM2_verify_loop, loopargs);
d = Time_F(STOP);
BIO_printf(bio_err,
- mr ? "+R13:%ld:%u:%s:%.2f\n"
- : "%ld %u bits %s verify ops in %.2fs\n",
- count, sm2_curves[testnum].bits,
- sm2_curves[testnum].name, d);
+ mr ? "+R13:%ld:%u:%s:%.2f\n"
+ : "%ld %u bits %s verify ops in %.2fs\n",
+ count, sm2_curves[testnum].bits,
+ sm2_curves[testnum].name, d);
sm2_results[testnum][1] = (double)count / d;
}
@@ -3849,7 +3914,7 @@ int speed_main(int argc, char **argv)
}
}
}
-#endif /* OPENSSL_NO_SM2 */
+#endif /* OPENSSL_NO_SM2 */
#ifndef OPENSSL_NO_DH
for (testnum = 0; testnum < FFDH_NUM; testnum++) {
@@ -3869,7 +3934,7 @@ int speed_main(int argc, char **argv)
/* Ensure that the error queue is empty */
if (ERR_peek_error()) {
BIO_printf(bio_err,
- "WARNING: the error queue contains previous unhandled errors.\n");
+ "WARNING: the error queue contains previous unhandled errors.\n");
dofail();
}
@@ -3914,8 +3979,7 @@ int speed_main(int argc, char **argv)
break;
}
- if (EVP_PKEY_keygen(ffdh_ctx, &pkey_A) <= 0 ||
- EVP_PKEY_keygen(ffdh_ctx, &pkey_B) <= 0) {
+ if (EVP_PKEY_keygen(ffdh_ctx, &pkey_A) <= 0 || EVP_PKEY_keygen(ffdh_ctx, &pkey_B) <= 0) {
BIO_printf(bio_err, "FFDH key generation failure.\n");
dofail();
op_count = 1;
@@ -3966,8 +4030,9 @@ int speed_main(int argc, char **argv)
break;
}
if (EVP_PKEY_derive(ffdh_ctx,
- loopargs[i].secret_ff_a,
- &secret_size) <= 0) {
+ loopargs[i].secret_ff_a,
+ &secret_size)
+ <= 0) {
BIO_printf(bio_err, "Shared secret derive failure.\n");
dofail();
op_count = 1;
@@ -3983,11 +4048,7 @@ int speed_main(int argc, char **argv)
ffdh_checks = 0;
break;
}
- if (EVP_PKEY_derive_init(test_ctx) <= 0 ||
- EVP_PKEY_derive_set_peer(test_ctx, pkey_A) <= 0 ||
- EVP_PKEY_derive(test_ctx, NULL, &test_out) <= 0 ||
- EVP_PKEY_derive(test_ctx, loopargs[i].secret_ff_b, &test_out) <= 0 ||
- test_out != secret_size) {
+ if (EVP_PKEY_derive_init(test_ctx) <= 0 || EVP_PKEY_derive_set_peer(test_ctx, pkey_A) <= 0 || EVP_PKEY_derive(test_ctx, NULL, &test_out) <= 0 || EVP_PKEY_derive(test_ctx, loopargs[i].secret_ff_b, &test_out) <= 0 || test_out != secret_size) {
BIO_printf(bio_err, "FFDH computation failure.\n");
op_count = 1;
ffdh_checks = 0;
@@ -3996,7 +4057,7 @@ int speed_main(int argc, char **argv)
/* compare the computed secrets */
if (CRYPTO_memcmp(loopargs[i].secret_ff_a,
- loopargs[i].secret_ff_b, secret_size)) {
+ loopargs[i].secret_ff_b, secret_size)) {
BIO_printf(bio_err, "FFDH computations don't match.\n");
dofail();
op_count = 1;
@@ -4015,15 +4076,13 @@ int speed_main(int argc, char **argv)
}
if (ffdh_checks != 0) {
pkey_print_message("", "ffdh",
- ffdh_params[testnum].bits, seconds.ffdh);
+ ffdh_params[testnum].bits, seconds.ffdh);
Time_F(START);
- count =
- run_benchmark(async_jobs, FFDH_derive_key_loop, loopargs);
+ count = run_benchmark(async_jobs, FFDH_derive_key_loop, loopargs);
d = Time_F(STOP);
BIO_printf(bio_err,
- mr ? "+R14:%ld:%d:%.2f\n" :
- "%ld %u-bits FFDH ops in %.2fs\n", count,
- ffdh_params[testnum].bits, d);
+ mr ? "+R14:%ld:%d:%.2f\n" : "%ld %u-bits FFDH ops in %.2fs\n", count,
+ ffdh_params[testnum].bits, d);
ffdh_results[testnum][0] = (double)count / d;
op_count = count;
}
@@ -4032,7 +4091,7 @@ int speed_main(int argc, char **argv)
stop_it(ffdh_doit, testnum);
}
}
-#endif /* OPENSSL_NO_DH */
+#endif /* OPENSSL_NO_DH */
for (testnum = 0; testnum < kems_algs_len; testnum++) {
int kem_checks = 1;
@@ -4054,7 +4113,10 @@ int speed_main(int argc, char **argv)
char sfx[MAX_ALGNAME_SUFFIX];
OSSL_PARAM params[] = { OSSL_PARAM_END, OSSL_PARAM_END };
int use_params = 0;
- enum kem_type_t { KEM_RSA = 1, KEM_EC, KEM_X25519, KEM_X448 } kem_type;
+ enum kem_type_t { KEM_RSA = 1,
+ KEM_EC,
+ KEM_X25519,
+ KEM_X448 } kem_type;
/* no string after rsa<bitcnt> permitted: */
if (strlen(kem_name) < MAX_ALGNAME_SUFFIX + 4 /* rsa+digit */
@@ -4066,36 +4128,36 @@ int speed_main(int argc, char **argv)
kem_type = KEM_X25519;
else if (strcmp(kem_name, "X448") == 0)
kem_type = KEM_X448;
- else kem_type = 0;
+ else
+ kem_type = 0;
if (ERR_peek_error()) {
BIO_printf(bio_err,
- "WARNING: the error queue contains previous unhandled errors.\n");
+ "WARNING: the error queue contains previous unhandled errors.\n");
dofail();
}
if (kem_type == KEM_RSA) {
params[0] = OSSL_PARAM_construct_uint(OSSL_PKEY_PARAM_RSA_BITS,
- &bits);
+ &bits);
use_params = 1;
} else if (kem_type == KEM_EC) {
name = (char *)(kem_name + 2);
params[0] = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_GROUP_NAME,
- name, 0);
+ name, 0);
use_params = 1;
}
kem_gen_ctx = EVP_PKEY_CTX_new_from_name(app_get0_libctx(),
- (kem_type == KEM_RSA) ? "RSA":
- (kem_type == KEM_EC) ? "EC":
- kem_name,
- app_get0_propq());
+ (kem_type == KEM_RSA) ? "RSA" : (kem_type == KEM_EC) ? "EC"
+ : kem_name,
+ app_get0_propq());
if ((!kem_gen_ctx || EVP_PKEY_keygen_init(kem_gen_ctx) <= 0)
|| (use_params
&& EVP_PKEY_CTX_set_params(kem_gen_ctx, params) <= 0)) {
BIO_printf(bio_err, "Error initializing keygen ctx for %s.\n",
- kem_name);
+ kem_name);
goto kem_err_break;
}
if (EVP_PKEY_keygen(kem_gen_ctx, &pkey) <= 0) {
@@ -4104,21 +4166,22 @@ int speed_main(int argc, char **argv)
}
/* Now prepare encaps data structs */
kem_encaps_ctx = EVP_PKEY_CTX_new_from_pkey(app_get0_libctx(),
- pkey,
- app_get0_propq());
+ pkey,
+ app_get0_propq());
if (kem_encaps_ctx == NULL
|| EVP_PKEY_encapsulate_init(kem_encaps_ctx, NULL) <= 0
|| (kem_type == KEM_RSA
&& EVP_PKEY_CTX_set_kem_op(kem_encaps_ctx, "RSASVE") <= 0)
|| ((kem_type == KEM_EC
- || kem_type == KEM_X25519
- || kem_type == KEM_X448)
- && EVP_PKEY_CTX_set_kem_op(kem_encaps_ctx, "DHKEM") <= 0)
+ || kem_type == KEM_X25519
+ || kem_type == KEM_X448)
+ && EVP_PKEY_CTX_set_kem_op(kem_encaps_ctx, "DHKEM") <= 0)
|| EVP_PKEY_encapsulate(kem_encaps_ctx, NULL, &out_len,
- NULL, &send_secret_len) <= 0) {
+ NULL, &send_secret_len)
+ <= 0) {
BIO_printf(bio_err,
- "Error while initializing encaps data structs for %s.\n",
- kem_name);
+ "Error while initializing encaps data structs for %s.\n",
+ kem_name);
goto kem_err_break;
}
out = app_malloc(out_len, "encaps result");
@@ -4128,37 +4191,40 @@ int speed_main(int argc, char **argv)
goto kem_err_break;
}
if (EVP_PKEY_encapsulate(kem_encaps_ctx, out, &out_len,
- send_secret, &send_secret_len) <= 0) {
+ send_secret, &send_secret_len)
+ <= 0) {
BIO_printf(bio_err, "Encaps error for %s.\n", kem_name);
goto kem_err_break;
}
/* Now prepare decaps data structs */
kem_decaps_ctx = EVP_PKEY_CTX_new_from_pkey(app_get0_libctx(),
- pkey,
- app_get0_propq());
+ pkey,
+ app_get0_propq());
if (kem_decaps_ctx == NULL
|| EVP_PKEY_decapsulate_init(kem_decaps_ctx, NULL) <= 0
|| (kem_type == KEM_RSA
- && EVP_PKEY_CTX_set_kem_op(kem_decaps_ctx, "RSASVE") <= 0)
+ && EVP_PKEY_CTX_set_kem_op(kem_decaps_ctx, "RSASVE") <= 0)
|| ((kem_type == KEM_EC
- || kem_type == KEM_X25519
- || kem_type == KEM_X448)
- && EVP_PKEY_CTX_set_kem_op(kem_decaps_ctx, "DHKEM") <= 0)
+ || kem_type == KEM_X25519
+ || kem_type == KEM_X448)
+ && EVP_PKEY_CTX_set_kem_op(kem_decaps_ctx, "DHKEM") <= 0)
|| EVP_PKEY_decapsulate(kem_decaps_ctx, NULL, &rcv_secret_len,
- out, out_len) <= 0) {
+ out, out_len)
+ <= 0) {
BIO_printf(bio_err,
- "Error while initializing decaps data structs for %s.\n",
- kem_name);
+ "Error while initializing decaps data structs for %s.\n",
+ kem_name);
goto kem_err_break;
}
rcv_secret = app_malloc(rcv_secret_len, "KEM decaps secret");
if (rcv_secret == NULL) {
BIO_printf(bio_err, "MemAlloc failure in decaps for %s.\n",
- kem_name);
+ kem_name);
goto kem_err_break;
}
if (EVP_PKEY_decapsulate(kem_decaps_ctx, rcv_secret,
- &rcv_secret_len, out, out_len) <= 0
+ &rcv_secret_len, out, out_len)
+ <= 0
|| rcv_secret_len != send_secret_len
|| memcmp(send_secret, rcv_secret, send_secret_len)) {
BIO_printf(bio_err, "Decaps error for %s.\n", kem_name);
@@ -4186,35 +4252,29 @@ int speed_main(int argc, char **argv)
if (kem_checks != 0) {
kskey_print_message(kem_name, "keygen", seconds.kem);
Time_F(START);
- count =
- run_benchmark(async_jobs, KEM_keygen_loop, loopargs);
+ count = run_benchmark(async_jobs, KEM_keygen_loop, loopargs);
d = Time_F(STOP);
BIO_printf(bio_err,
- mr ? "+R15:%ld:%s:%.2f\n" :
- "%ld %s KEM keygen ops in %.2fs\n", count,
- kem_name, d);
+ mr ? "+R15:%ld:%s:%.2f\n" : "%ld %s KEM keygen ops in %.2fs\n", count,
+ kem_name, d);
kems_results[testnum][0] = (double)count / d;
op_count = count;
kskey_print_message(kem_name, "encaps", seconds.kem);
Time_F(START);
- count =
- run_benchmark(async_jobs, KEM_encaps_loop, loopargs);
+ count = run_benchmark(async_jobs, KEM_encaps_loop, loopargs);
d = Time_F(STOP);
BIO_printf(bio_err,
- mr ? "+R16:%ld:%s:%.2f\n" :
- "%ld %s KEM encaps ops in %.2fs\n", count,
- kem_name, d);
+ mr ? "+R16:%ld:%s:%.2f\n" : "%ld %s KEM encaps ops in %.2fs\n", count,
+ kem_name, d);
kems_results[testnum][1] = (double)count / d;
op_count = count;
kskey_print_message(kem_name, "decaps", seconds.kem);
Time_F(START);
- count =
- run_benchmark(async_jobs, KEM_decaps_loop, loopargs);
+ count = run_benchmark(async_jobs, KEM_decaps_loop, loopargs);
d = Time_F(STOP);
BIO_printf(bio_err,
- mr ? "+R17:%ld:%s:%.2f\n" :
- "%ld %s KEM decaps ops in %.2fs\n", count,
- kem_name, d);
+ mr ? "+R17:%ld:%s:%.2f\n" : "%ld %s KEM decaps ops in %.2fs\n", count,
+ kem_name, d);
kems_results[testnum][2] = (double)count / d;
op_count = count;
}
@@ -4234,7 +4294,7 @@ int speed_main(int argc, char **argv)
for (i = 0; i < loopargs_len; i++) {
EVP_PKEY *pkey = NULL;
EVP_PKEY_CTX *ctx_params = NULL;
- EVP_PKEY* pkey_params = NULL;
+ EVP_PKEY *pkey_params = NULL;
EVP_PKEY_CTX *sig_gen_ctx = NULL;
EVP_PKEY_CTX *sig_sign_ctx = NULL;
EVP_PKEY_CTX *sig_verify_ctx = NULL;
@@ -4253,7 +4313,7 @@ int speed_main(int argc, char **argv)
if (ERR_peek_error()) {
BIO_printf(bio_err,
- "WARNING: the error queue contains previous unhandled errors.\n");
+ "WARNING: the error queue contains previous unhandled errors.\n");
dofail();
}
@@ -4261,7 +4321,7 @@ int speed_main(int argc, char **argv)
if (strlen(sig_name) < MAX_ALGNAME_SUFFIX + 4 /* rsa+digit */
&& sscanf(sig_name, "rsa%u%s", &bits, sfx) == 1) {
params[0] = OSSL_PARAM_construct_uint(OSSL_PKEY_PARAM_RSA_BITS,
- &bits);
+ &bits);
use_params = 1;
}
@@ -4270,33 +4330,33 @@ int speed_main(int argc, char **argv)
if (ctx_params == NULL
|| EVP_PKEY_paramgen_init(ctx_params) <= 0
|| EVP_PKEY_CTX_set_dsa_paramgen_bits(ctx_params,
- atoi(sig_name + 3)) <= 0
+ atoi(sig_name + 3))
+ <= 0
|| EVP_PKEY_paramgen(ctx_params, &pkey_params) <= 0
|| (sig_gen_ctx = EVP_PKEY_CTX_new(pkey_params, NULL)) == NULL
|| EVP_PKEY_keygen_init(sig_gen_ctx) <= 0) {
BIO_printf(bio_err,
- "Error initializing classic keygen ctx for %s.\n",
- sig_name);
+ "Error initializing classic keygen ctx for %s.\n",
+ sig_name);
goto sig_err_break;
}
}
if (sig_gen_ctx == NULL)
sig_gen_ctx = EVP_PKEY_CTX_new_from_name(app_get0_libctx(),
- use_params == 1 ? "RSA" : sig_name,
- app_get0_propq());
+ use_params == 1 ? "RSA" : sig_name,
+ app_get0_propq());
if (!sig_gen_ctx || EVP_PKEY_keygen_init(sig_gen_ctx) <= 0
- || (use_params &&
- EVP_PKEY_CTX_set_params(sig_gen_ctx, params) <= 0)) {
+ || (use_params && EVP_PKEY_CTX_set_params(sig_gen_ctx, params) <= 0)) {
BIO_printf(bio_err, "Error initializing keygen ctx for %s.\n",
- sig_name);
+ sig_name);
goto sig_err_break;
}
if (EVP_PKEY_keygen(sig_gen_ctx, &pkey) <= 0) {
BIO_printf(bio_err,
- "Error while generating signature EVP_PKEY for %s.\n",
- sig_name);
+ "Error while generating signature EVP_PKEY for %s.\n",
+ sig_name);
goto sig_err_break;
}
@@ -4310,12 +4370,12 @@ int speed_main(int argc, char **argv)
/* Now prepare signature data structs */
sig_sign_ctx = EVP_PKEY_CTX_new_from_pkey(app_get0_libctx(),
- pkey,
- app_get0_propq());
+ pkey,
+ app_get0_propq());
if (sig_sign_ctx == NULL) {
BIO_printf(bio_err,
- "Error while initializing signing ctx for %s.\n",
- sig_name);
+ "Error while initializing signing ctx for %s.\n",
+ sig_name);
goto sig_err_break;
}
ERR_set_mark();
@@ -4324,22 +4384,21 @@ int speed_main(int argc, char **argv)
|| EVP_PKEY_sign_message_init(sig_sign_ctx, alg, NULL) <= 0)) {
ERR_clear_last_mark();
BIO_printf(bio_err,
- "Error while initializing signing data structs for %s.\n",
- sig_name);
+ "Error while initializing signing data structs for %s.\n",
+ sig_name);
goto sig_err_break;
}
ERR_pop_to_mark();
- if (use_params == 1 &&
- EVP_PKEY_CTX_set_rsa_padding(sig_sign_ctx, RSA_PKCS1_PADDING) <= 0) {
+ if (use_params == 1 && EVP_PKEY_CTX_set_rsa_padding(sig_sign_ctx, RSA_PKCS1_PADDING) <= 0) {
BIO_printf(bio_err,
- "Error while initializing padding for %s.\n",
- sig_name);
+ "Error while initializing padding for %s.\n",
+ sig_name);
goto sig_err_break;
}
if (EVP_PKEY_sign(sig_sign_ctx, NULL, &max_sig_len, md, md_len) <= 0) {
BIO_printf(bio_err,
- "Error while obtaining signature buffer length for %s.\n",
- sig_name);
+ "Error while obtaining signature buffer length for %s.\n",
+ sig_name);
goto sig_err_break;
}
sig = app_malloc(sig_len = max_sig_len, "signature buffer");
@@ -4354,12 +4413,12 @@ int speed_main(int argc, char **argv)
/* Now prepare verify data structs */
memset(md, 0, SHA256_DIGEST_LENGTH);
sig_verify_ctx = EVP_PKEY_CTX_new_from_pkey(app_get0_libctx(),
- pkey,
- app_get0_propq());
+ pkey,
+ app_get0_propq());
if (sig_verify_ctx == NULL) {
BIO_printf(bio_err,
- "Error while initializing verify ctx for %s.\n",
- sig_name);
+ "Error while initializing verify ctx for %s.\n",
+ sig_name);
goto sig_err_break;
}
ERR_set_mark();
@@ -4368,8 +4427,8 @@ int speed_main(int argc, char **argv)
|| EVP_PKEY_verify_message_init(sig_verify_ctx, alg, NULL) <= 0)) {
ERR_clear_last_mark();
BIO_printf(bio_err,
- "Error while initializing verify data structs for %s.\n",
- sig_name);
+ "Error while initializing verify data structs for %s.\n",
+ sig_name);
goto sig_err_break;
}
ERR_pop_to_mark();
@@ -4407,32 +4466,27 @@ int speed_main(int argc, char **argv)
count = run_benchmark(async_jobs, SIG_keygen_loop, loopargs);
d = Time_F(STOP);
BIO_printf(bio_err,
- mr ? "+R18:%ld:%s:%.2f\n" :
- "%ld %s signature keygen ops in %.2fs\n", count,
- sig_name, d);
+ mr ? "+R18:%ld:%s:%.2f\n" : "%ld %s signature keygen ops in %.2fs\n", count,
+ sig_name, d);
sigs_results[testnum][0] = (double)count / d;
op_count = count;
kskey_print_message(sig_name, "signs", seconds.sig);
Time_F(START);
- count =
- run_benchmark(async_jobs, SIG_sign_loop, loopargs);
+ count = run_benchmark(async_jobs, SIG_sign_loop, loopargs);
d = Time_F(STOP);
BIO_printf(bio_err,
- mr ? "+R19:%ld:%s:%.2f\n" :
- "%ld %s signature sign ops in %.2fs\n", count,
- sig_name, d);
+ mr ? "+R19:%ld:%s:%.2f\n" : "%ld %s signature sign ops in %.2fs\n", count,
+ sig_name, d);
sigs_results[testnum][1] = (double)count / d;
op_count = count;
kskey_print_message(sig_name, "verify", seconds.sig);
Time_F(START);
- count =
- run_benchmark(async_jobs, SIG_verify_loop, loopargs);
+ count = run_benchmark(async_jobs, SIG_verify_loop, loopargs);
d = Time_F(STOP);
BIO_printf(bio_err,
- mr ? "+R20:%ld:%s:%.2f\n" :
- "%ld %s signature verify ops in %.2fs\n", count,
- sig_name, d);
+ mr ? "+R20:%ld:%s:%.2f\n" : "%ld %s signature verify ops in %.2fs\n", count,
+ sig_name, d);
sigs_results[testnum][2] = (double)count / d;
op_count = count;
}
@@ -4441,7 +4495,7 @@ int speed_main(int argc, char **argv)
}
#ifndef NO_FORK
- show_res:
+show_res:
#endif
if (!mr) {
printf("version: %s\n", OpenSSL_version(OPENSSL_FULL_VERSION_STRING));
@@ -4498,15 +4552,15 @@ int speed_main(int argc, char **argv)
}
if (mr)
printf("+F2:%u:%u:%f:%f:%f:%f\n",
- k, rsa_keys[k].bits, rsa_results[k][0], rsa_results[k][1],
- rsa_results[k][2], rsa_results[k][3]);
+ k, rsa_keys[k].bits, rsa_results[k][0], rsa_results[k][1],
+ rsa_results[k][2], rsa_results[k][3]);
else
printf("rsa %5u bits %8.6fs %8.6fs %8.6fs %8.6fs %8.1f %8.1f %8.1f %8.1f\n",
- rsa_keys[k].bits, 1.0 / rsa_results[k][0],
- 1.0 / rsa_results[k][1], 1.0 / rsa_results[k][2],
- 1.0 / rsa_results[k][3],
- rsa_results[k][0], rsa_results[k][1],
- rsa_results[k][2], rsa_results[k][3]);
+ rsa_keys[k].bits, 1.0 / rsa_results[k][0],
+ 1.0 / rsa_results[k][1], 1.0 / rsa_results[k][2],
+ 1.0 / rsa_results[k][3],
+ rsa_results[k][0], rsa_results[k][1],
+ rsa_results[k][2], rsa_results[k][3]);
}
testnum = 1;
#ifndef OPENSSL_NO_DSA
@@ -4519,11 +4573,11 @@ int speed_main(int argc, char **argv)
}
if (mr)
printf("+F3:%u:%u:%f:%f\n",
- k, dsa_bits[k], dsa_results[k][0], dsa_results[k][1]);
+ k, dsa_bits[k], dsa_results[k][0], dsa_results[k][1]);
else
printf("dsa %4u bits %8.6fs %8.6fs %8.1f %8.1f\n",
- dsa_bits[k], 1.0 / dsa_results[k][0], 1.0 / dsa_results[k][1],
- dsa_results[k][0], dsa_results[k][1]);
+ dsa_bits[k], 1.0 / dsa_results[k][0], 1.0 / dsa_results[k][1],
+ dsa_results[k][0], dsa_results[k][1]);
}
#endif /* OPENSSL_NO_DSA */
testnum = 1;
@@ -4537,13 +4591,13 @@ int speed_main(int argc, char **argv)
if (mr)
printf("+F4:%u:%u:%f:%f\n",
- k, ec_curves[k].bits,
- ecdsa_results[k][0], ecdsa_results[k][1]);
+ k, ec_curves[k].bits,
+ ecdsa_results[k][0], ecdsa_results[k][1]);
else
printf("%4u bits ecdsa (%s) %8.4fs %8.4fs %8.1f %8.1f\n",
- ec_curves[k].bits, ec_curves[k].name,
- 1.0 / ecdsa_results[k][0], 1.0 / ecdsa_results[k][1],
- ecdsa_results[k][0], ecdsa_results[k][1]);
+ ec_curves[k].bits, ec_curves[k].name,
+ 1.0 / ecdsa_results[k][0], 1.0 / ecdsa_results[k][1],
+ ecdsa_results[k][0], ecdsa_results[k][1]);
}
testnum = 1;
@@ -4556,13 +4610,13 @@ int speed_main(int argc, char **argv)
}
if (mr)
printf("+F5:%u:%u:%f:%f\n",
- k, ec_curves[k].bits,
- ecdh_results[k][0], 1.0 / ecdh_results[k][0]);
+ k, ec_curves[k].bits,
+ ecdh_results[k][0], 1.0 / ecdh_results[k][0]);
else
printf("%4u bits ecdh (%s) %8.4fs %8.1f\n",
- ec_curves[k].bits, ec_curves[k].name,
- 1.0 / ecdh_results[k][0], ecdh_results[k][0]);
+ ec_curves[k].bits, ec_curves[k].name,
+ 1.0 / ecdh_results[k][0], ecdh_results[k][0]);
}
#ifndef OPENSSL_NO_ECX
@@ -4577,13 +4631,13 @@ int speed_main(int argc, char **argv)
if (mr)
printf("+F6:%u:%u:%s:%f:%f\n",
- k, ed_curves[k].bits, ed_curves[k].name,
- eddsa_results[k][0], eddsa_results[k][1]);
+ k, ed_curves[k].bits, ed_curves[k].name,
+ eddsa_results[k][0], eddsa_results[k][1]);
else
printf("%4u bits EdDSA (%s) %8.4fs %8.4fs %8.1f %8.1f\n",
- ed_curves[k].bits, ed_curves[k].name,
- 1.0 / eddsa_results[k][0], 1.0 / eddsa_results[k][1],
- eddsa_results[k][0], eddsa_results[k][1]);
+ ed_curves[k].bits, ed_curves[k].name,
+ 1.0 / eddsa_results[k][0], 1.0 / eddsa_results[k][1],
+ eddsa_results[k][0], eddsa_results[k][1]);
}
#endif /* OPENSSL_NO_ECX */
@@ -4599,13 +4653,13 @@ int speed_main(int argc, char **argv)
if (mr)
printf("+F7:%u:%u:%s:%f:%f\n",
- k, sm2_curves[k].bits, sm2_curves[k].name,
- sm2_results[k][0], sm2_results[k][1]);
+ k, sm2_curves[k].bits, sm2_curves[k].name,
+ sm2_results[k][0], sm2_results[k][1]);
else
printf("%4u bits SM2 (%s) %8.4fs %8.4fs %8.1f %8.1f\n",
- sm2_curves[k].bits, sm2_curves[k].name,
- 1.0 / sm2_results[k][0], 1.0 / sm2_results[k][1],
- sm2_results[k][0], sm2_results[k][1]);
+ sm2_curves[k].bits, sm2_curves[k].name,
+ 1.0 / sm2_results[k][0], 1.0 / sm2_results[k][1],
+ sm2_results[k][0], sm2_results[k][1]);
}
#endif
#ifndef OPENSSL_NO_DH
@@ -4619,13 +4673,13 @@ int speed_main(int argc, char **argv)
}
if (mr)
printf("+F8:%u:%u:%f:%f\n",
- k, ffdh_params[k].bits,
- ffdh_results[k][0], 1.0 / ffdh_results[k][0]);
+ k, ffdh_params[k].bits,
+ ffdh_results[k][0], 1.0 / ffdh_results[k][0]);
else
printf("%4u bits ffdh %8.4fs %8.1f\n",
- ffdh_params[k].bits,
- 1.0 / ffdh_results[k][0], ffdh_results[k][0]);
+ ffdh_params[k].bits,
+ 1.0 / ffdh_results[k][0], ffdh_results[k][0]);
}
#endif /* OPENSSL_NO_DH */
@@ -4641,13 +4695,13 @@ int speed_main(int argc, char **argv)
}
if (mr)
printf("+F9:%u:%f:%f:%f\n",
- k, kems_results[k][0], kems_results[k][1],
- kems_results[k][2]);
+ k, kems_results[k][0], kems_results[k][1],
+ kems_results[k][2]);
else
printf("%27s %8.6fs %8.6fs %8.6fs %9.1f %9.1f %9.1f\n", kem_name,
- 1.0 / kems_results[k][0],
- 1.0 / kems_results[k][1], 1.0 / kems_results[k][2],
- kems_results[k][0], kems_results[k][1], kems_results[k][2]);
+ 1.0 / kems_results[k][0],
+ 1.0 / kems_results[k][1], 1.0 / kems_results[k][2],
+ kems_results[k][0], kems_results[k][1], kems_results[k][2]);
}
ret = 0;
@@ -4663,17 +4717,17 @@ int speed_main(int argc, char **argv)
}
if (mr)
printf("+F10:%u:%f:%f:%f\n",
- k, sigs_results[k][0], sigs_results[k][1],
- sigs_results[k][2]);
+ k, sigs_results[k][0], sigs_results[k][1],
+ sigs_results[k][2]);
else
printf("%27s %8.6fs %8.6fs %8.6fs %9.1f %9.1f %9.1f\n", sig_name,
- 1.0 / sigs_results[k][0], 1.0 / sigs_results[k][1],
- 1.0 / sigs_results[k][2], sigs_results[k][0],
- sigs_results[k][1], sigs_results[k][2]);
+ 1.0 / sigs_results[k][0], 1.0 / sigs_results[k][1],
+ 1.0 / sigs_results[k][2], sigs_results[k][0],
+ sigs_results[k][1], sigs_results[k][2]);
}
ret = 0;
- end:
+end:
if (ret == 0 && testmode)
ret = testmoderesult;
ERR_print_errors(bio_err);
@@ -4777,19 +4831,21 @@ int speed_main(int argc, char **argv)
static void print_message(const char *s, int length, int tm)
{
BIO_printf(bio_err,
- mr ? "+DT:%s:%d:%d\n"
- : "Doing %s ops for %ds on %d size blocks: ", s, tm, length);
+ mr ? "+DT:%s:%d:%d\n"
+ : "Doing %s ops for %ds on %d size blocks: ",
+ s, tm, length);
(void)BIO_flush(bio_err);
run = 1;
alarm(tm);
}
static void pkey_print_message(const char *str, const char *str2, unsigned int bits,
- int tm)
+ int tm)
{
BIO_printf(bio_err,
- mr ? "+DTP:%d:%s:%s:%d\n"
- : "Doing %u bits %s %s ops for %ds: ", bits, str, str2, tm);
+ mr ? "+DTP:%d:%s:%s:%d\n"
+ : "Doing %u bits %s %s ops for %ds: ",
+ bits, str, str2, tm);
(void)BIO_flush(bio_err);
run = 1;
alarm(tm);
@@ -4798,8 +4854,9 @@ static void pkey_print_message(const char *str, const char *str2, unsigned int b
static void kskey_print_message(const char *str, const char *str2, int tm)
{
BIO_printf(bio_err,
- mr ? "+DTP:%s:%s:%d\n"
- : "Doing %s %s ops for %ds: ", str, str2, tm);
+ mr ? "+DTP:%s:%s:%d\n"
+ : "Doing %s %s ops for %ds: ",
+ str, str2, tm);
(void)BIO_flush(bio_err);
run = 1;
alarm(tm);
@@ -4813,8 +4870,9 @@ static void print_result(int alg, int run_no, int count, double time_used)
return;
}
BIO_printf(bio_err,
- mr ? "+R:%d:%s:%f\n"
- : "%d %s ops in %.2fs\n", count, names[alg], time_used);
+ mr ? "+R:%d:%s:%f\n"
+ : "%d %s ops in %.2fs\n",
+ count, names[alg], time_used);
results[alg][run_no] = ((double)count) / time_used * lengths[run_no];
}
@@ -4844,7 +4902,7 @@ static char *sstrsep(char **string, const char *delim)
}
static int strtoint(const char *str, const int min_val, const int upper_val,
- int *res)
+ int *res)
{
char *end = NULL;
long int val = 0;
@@ -4906,7 +4964,7 @@ static int do_multi(int multi, int size_num)
if ((f = fdopen(fds[n], "r")) == NULL) {
BIO_printf(bio_err, "fdopen failure with 0x%x\n",
- errno);
+ errno);
OPENSSL_free(fds);
return 1;
}
@@ -4916,8 +4974,8 @@ static int do_multi(int multi, int size_num)
*p = '\0';
if (buf[0] != '+') {
BIO_printf(bio_err,
- "Don't understand line '%s' from child %d\n", buf,
- n);
+ "Don't understand line '%s' from child %d\n", buf,
+ n);
continue;
}
printf("Got: %s from %d\n", buf, n);
@@ -4948,7 +5006,7 @@ static int do_multi(int multi, int size_num)
d = atof(sstrsep(&p, sep));
rsa_results[k][3] += d;
}
-# ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DSA
} else if (CHECK_AND_SKIP_PREFIX(p, "+F3:")) {
tk = sstrsep(&p, sep);
if (strtoint(tk, 0, OSSL_NELEM(dsa_results), &k)) {
@@ -4960,7 +5018,7 @@ static int do_multi(int multi, int size_num)
d = atof(sstrsep(&p, sep));
dsa_results[k][1] += d;
}
-# endif /* OPENSSL_NO_DSA */
+#endif /* OPENSSL_NO_DSA */
} else if (CHECK_AND_SKIP_PREFIX(p, "+F4:")) {
tk = sstrsep(&p, sep);
if (strtoint(tk, 0, OSSL_NELEM(ecdsa_results), &k)) {
@@ -4980,7 +5038,7 @@ static int do_multi(int multi, int size_num)
d = atof(sstrsep(&p, sep));
ecdh_results[k][0] += d;
}
-# ifndef OPENSSL_NO_ECX
+#ifndef OPENSSL_NO_ECX
} else if (CHECK_AND_SKIP_PREFIX(p, "+F6:")) {
tk = sstrsep(&p, sep);
if (strtoint(tk, 0, OSSL_NELEM(eddsa_results), &k)) {
@@ -4993,8 +5051,8 @@ static int do_multi(int multi, int size_num)
d = atof(sstrsep(&p, sep));
eddsa_results[k][1] += d;
}
-# endif /* OPENSSL_NO_ECX */
-# ifndef OPENSSL_NO_SM2
+#endif /* OPENSSL_NO_ECX */
+#ifndef OPENSSL_NO_SM2
} else if (CHECK_AND_SKIP_PREFIX(p, "+F7:")) {
tk = sstrsep(&p, sep);
if (strtoint(tk, 0, OSSL_NELEM(sm2_results), &k)) {
@@ -5007,8 +5065,8 @@ static int do_multi(int multi, int size_num)
d = atof(sstrsep(&p, sep));
sm2_results[k][1] += d;
}
-# endif /* OPENSSL_NO_SM2 */
-# ifndef OPENSSL_NO_DH
+#endif /* OPENSSL_NO_SM2 */
+#ifndef OPENSSL_NO_DH
} else if (CHECK_AND_SKIP_PREFIX(p, "+F8:")) {
tk = sstrsep(&p, sep);
if (strtoint(tk, 0, OSSL_NELEM(ffdh_results), &k)) {
@@ -5017,7 +5075,7 @@ static int do_multi(int multi, int size_num)
d = atof(sstrsep(&p, sep));
ffdh_results[k][0] += d;
}
-# endif /* OPENSSL_NO_DH */
+#endif /* OPENSSL_NO_DH */
} else if (CHECK_AND_SKIP_PREFIX(p, "+F9:")) {
tk = sstrsep(&p, sep);
if (strtoint(tk, 0, OSSL_NELEM(kems_results), &k)) {
@@ -5044,7 +5102,7 @@ static int do_multi(int multi, int size_num)
}
} else if (!HAS_PREFIX(buf, "+H:")) {
BIO_printf(bio_err, "Unknown type '%s' from child %d\n", buf,
- n);
+ n);
}
}
@@ -5055,14 +5113,14 @@ static int do_multi(int multi, int size_num)
while (wait(&status) == -1)
if (errno != EINTR) {
BIO_printf(bio_err, "Waitng for child failed with 0x%x\n",
- errno);
+ errno);
return 1;
}
if (WIFEXITED(status) && WEXITSTATUS(status)) {
BIO_printf(bio_err, "Child exited with %d\n", WEXITSTATUS(status));
} else if (WIFSIGNALED(status)) {
BIO_printf(bio_err, "Child terminated by signal %d\n",
- WTERMSIG(status));
+ WTERMSIG(status));
}
}
return 1;
@@ -5070,7 +5128,7 @@ static int do_multi(int multi, int size_num)
#endif
static void multiblock_speed(const EVP_CIPHER *evp_cipher, int lengths_single,
- const openssl_speed_sec_t *seconds)
+ const openssl_speed_sec_t *seconds)
{
static const int mblengths_list[] = {
8 * 1024, 2 * 8 * 1024, 4 * 8 * 1024, 8 * 8 * 1024, 8 * 16 * 1024
@@ -5106,7 +5164,8 @@ static void multiblock_speed(const EVP_CIPHER *evp_cipher, int lengths_single,
OPENSSL_clear_free(key, keylen);
if (EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_MAC_KEY,
- sizeof(no_key), no_key) <= 0)
+ sizeof(no_key), no_key)
+ <= 0)
app_bail_out("failed to set AEAD key\n");
if ((alg_name = EVP_CIPHER_get0_name(evp_cipher)) == NULL)
app_bail_out("failed to get cipher name\n");
@@ -5119,11 +5178,11 @@ static void multiblock_speed(const EVP_CIPHER *evp_cipher, int lengths_single,
size_t len = mblengths[j];
int packlen;
- memset(aad, 0, 8); /* avoid uninitialized values */
- aad[8] = 23; /* SSL3_RT_APPLICATION_DATA */
- aad[9] = 3; /* version */
+ memset(aad, 0, 8); /* avoid uninitialized values */
+ aad[8] = 23; /* SSL3_RT_APPLICATION_DATA */
+ aad[9] = 3; /* version */
aad[10] = 2;
- aad[11] = 0; /* length */
+ aad[11] = 0; /* length */
aad[12] = 0;
mb_param.out = NULL;
mb_param.inp = aad;
@@ -5131,15 +5190,15 @@ static void multiblock_speed(const EVP_CIPHER *evp_cipher, int lengths_single,
mb_param.interleave = 8;
packlen = EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_TLS1_1_MULTIBLOCK_AAD,
- sizeof(mb_param), &mb_param);
+ sizeof(mb_param), &mb_param);
if (packlen > 0) {
mb_param.out = out;
mb_param.inp = inp;
mb_param.len = len;
(void)EVP_CIPHER_CTX_ctrl(ctx,
- EVP_CTRL_TLS1_1_MULTIBLOCK_ENCRYPT,
- sizeof(mb_param), &mb_param);
+ EVP_CTRL_TLS1_1_MULTIBLOCK_ENCRYPT,
+ sizeof(mb_param), &mb_param);
} else {
int pad;
@@ -5149,13 +5208,12 @@ static void multiblock_speed(const EVP_CIPHER *evp_cipher, int lengths_single,
aad[11] = (unsigned char)(len >> 8);
aad[12] = (unsigned char)(len);
pad = EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_TLS1_AAD,
- EVP_AEAD_TLS1_AAD_LEN, aad);
+ EVP_AEAD_TLS1_AAD_LEN, aad);
ciph_success = EVP_Cipher(ctx, out, inp, (unsigned int)(len + pad));
}
}
d = Time_F(STOP);
- BIO_printf(bio_err, mr ? "+R:%d:%s:%f\n"
- : "%d %s ops in %.2fs\n", count, "evp", d);
+ BIO_printf(bio_err, mr ? "+R:%d:%s:%f\n" : "%d %s ops in %.2fs\n", count, "evp", d);
if ((ciph_success <= 0) && (mr == 0))
BIO_printf(bio_err, "Error performing cipher op\n");
results[D_EVP][j] = ((double)count) / d * mblengths[j];
@@ -5172,7 +5230,7 @@ static void multiblock_speed(const EVP_CIPHER *evp_cipher, int lengths_single,
fprintf(stdout, "\n");
} else {
fprintf(stdout,
- "The 'numbers' are in 1000s of bytes per second processed.\n");
+ "The 'numbers' are in 1000s of bytes per second processed.\n");
fprintf(stdout, "type ");
for (j = 0; j < num; j++)
fprintf(stdout, "%7d bytes", mblengths[j]);
@@ -5188,7 +5246,7 @@ static void multiblock_speed(const EVP_CIPHER *evp_cipher, int lengths_single,
fprintf(stdout, "\n");
}
- err:
+err:
OPENSSL_free(inp);
OPENSSL_free(out);
EVP_CIPHER_CTX_free(ctx);
diff --git a/apps/spkac.c b/apps/spkac.c
index 3634fb21b7..d2cb68086a 100644
--- a/apps/spkac.c
+++ b/apps/spkac.c
@@ -22,35 +22,44 @@
typedef enum OPTION_choice {
OPT_COMMON,
- OPT_NOOUT, OPT_PUBKEY, OPT_VERIFY, OPT_IN, OPT_OUT,
- OPT_KEY, OPT_CHALLENGE, OPT_PASSIN, OPT_SPKAC,
- OPT_SPKSECT, OPT_KEYFORM, OPT_DIGEST,
+ OPT_NOOUT,
+ OPT_PUBKEY,
+ OPT_VERIFY,
+ OPT_IN,
+ OPT_OUT,
+ OPT_KEY,
+ OPT_CHALLENGE,
+ OPT_PASSIN,
+ OPT_SPKAC,
+ OPT_SPKSECT,
+ OPT_KEYFORM,
+ OPT_DIGEST,
OPT_PROV_ENUM
} OPTION_CHOICE;
const OPTIONS spkac_options[] = {
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
- {"spksect", OPT_SPKSECT, 's',
- "Specify the name of an SPKAC-dedicated section of configuration"},
+ { "help", OPT_HELP, '-', "Display this summary" },
+ { "spksect", OPT_SPKSECT, 's',
+ "Specify the name of an SPKAC-dedicated section of configuration" },
OPT_SECTION("Input"),
- {"in", OPT_IN, '<', "Input file"},
- {"key", OPT_KEY, '<', "Create SPKAC using private key"},
- {"keyform", OPT_KEYFORM, 'f', "Private key file format (DER/PEM)"},
- {"passin", OPT_PASSIN, 's', "Input file pass phrase source"},
- {"challenge", OPT_CHALLENGE, 's', "Challenge string"},
- {"spkac", OPT_SPKAC, 's', "Alternative SPKAC name"},
+ { "in", OPT_IN, '<', "Input file" },
+ { "key", OPT_KEY, '<', "Create SPKAC using private key" },
+ { "keyform", OPT_KEYFORM, 'f', "Private key file format (DER/PEM)" },
+ { "passin", OPT_PASSIN, 's', "Input file pass phrase source" },
+ { "challenge", OPT_CHALLENGE, 's', "Challenge string" },
+ { "spkac", OPT_SPKAC, 's', "Alternative SPKAC name" },
OPT_SECTION("Output"),
- {"digest", OPT_DIGEST, 's', "Sign new SPKAC with the specified digest (default: MD5)" },
- {"out", OPT_OUT, '>', "Output file"},
- {"noout", OPT_NOOUT, '-', "Don't print SPKAC"},
- {"pubkey", OPT_PUBKEY, '-', "Output public key"},
- {"verify", OPT_VERIFY, '-', "Verify SPKAC signature"},
+ { "digest", OPT_DIGEST, 's', "Sign new SPKAC with the specified digest (default: MD5)" },
+ { "out", OPT_OUT, '>', "Output file" },
+ { "noout", OPT_NOOUT, '-', "Don't print SPKAC" },
+ { "pubkey", OPT_PUBKEY, '-', "Output public key" },
+ { "verify", OPT_VERIFY, '-', "Verify SPKAC signature" },
OPT_PROV_OPTIONS,
- {NULL}
+ { NULL }
};
int spkac_main(int argc, char **argv)
@@ -74,7 +83,7 @@ int spkac_main(int argc, char **argv)
switch (o) {
case OPT_EOF:
case OPT_ERR:
- opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
case OPT_HELP:
@@ -139,7 +148,7 @@ int spkac_main(int argc, char **argv)
goto end;
pkey = load_key(strcmp(keyfile, "-") ? keyfile : NULL,
- keyformat, 1, passin, "private key");
+ keyformat, 1, passin, "private key");
if (pkey == NULL)
goto end;
spki = NETSCAPE_SPKI_new();
@@ -147,7 +156,7 @@ int spkac_main(int argc, char **argv)
goto end;
if (challenge != NULL
&& !ASN1_STRING_set(spki->spkac->challenge,
- challenge, (int)strlen(challenge)))
+ challenge, (int)strlen(challenge)))
goto end;
if (!NETSCAPE_SPKI_set_pubkey(spki, pkey)) {
BIO_printf(bio_err, "Error setting public key\n");
@@ -214,7 +223,7 @@ int spkac_main(int argc, char **argv)
ret = 0;
- end:
+end:
EVP_MD_free(md);
NCONF_free(conf);
NETSCAPE_SPKI_free(spki);
diff --git a/apps/srp.c b/apps/srp.c
index f35fe128cb..554f129ff7 100644
--- a/apps/srp.c
+++ b/apps/srp.c
@@ -28,12 +28,11 @@
#include "apps.h"
#include "progs.h"
-#define BASE_SECTION "srp"
+#define BASE_SECTION "srp"
#define CONFIG_FILE "openssl.cnf"
-
-#define ENV_DATABASE "srpvfile"
-#define ENV_DEFAULT_SRP "default_srp"
+#define ENV_DATABASE "srpvfile"
+#define ENV_DEFAULT_SRP "default_srp"
static int get_index(CA_DB *db, char *id, char type)
{
@@ -86,9 +85,8 @@ static void print_user(CA_DB *db, int userindex, int verbose)
if (pp[DB_srptype][0] != 'I') {
print_entry(db, userindex, verbose, "User entry");
print_entry(db, get_index(db, pp[DB_srpgN], 'I'), verbose,
- "g N entry");
+ "g N entry");
}
-
}
}
@@ -120,8 +118,8 @@ static char *lookup_conf(const CONF *conf, const char *section, const char *tag)
}
static char *srp_verify_user(const char *user, const char *srp_verifier,
- char *srp_usersalt, const char *g, const char *N,
- const char *passin, int verbose)
+ char *srp_usersalt, const char *g, const char *N,
+ const char *passin, int verbose)
{
char password[1025];
PW_CB_DATA cb_tmp;
@@ -132,19 +130,20 @@ static char *srp_verify_user(const char *user, const char *srp_verifier,
cb_tmp.prompt_info = user;
cb_tmp.password = passin;
- len = password_callback(password, sizeof(password)-1, 0, &cb_tmp);
+ len = password_callback(password, sizeof(password) - 1, 0, &cb_tmp);
if (len > 0) {
password[len] = 0;
if (verbose)
BIO_printf(bio_err,
- "Validating\n user=\"%s\"\n srp_verifier=\"%s\"\n srp_usersalt=\"%s\"\n g=\"%s\"\n N=\"%s\"\n",
- user, srp_verifier, srp_usersalt, g, N);
+ "Validating\n user=\"%s\"\n srp_verifier=\"%s\"\n srp_usersalt=\"%s\"\n g=\"%s\"\n N=\"%s\"\n",
+ user, srp_verifier, srp_usersalt, g, N);
if (verbose > 1)
BIO_printf(bio_err, "Pass %s\n", password);
OPENSSL_assert(srp_usersalt != NULL);
if ((gNid = SRP_create_verifier(user, password, &srp_usersalt,
- &verifier, N, g)) == NULL) {
+ &verifier, N, g))
+ == NULL) {
BIO_printf(bio_err, "Internal error validating SRP verifier\n");
} else {
if (strcmp(verifier, srp_verifier))
@@ -157,8 +156,8 @@ static char *srp_verify_user(const char *user, const char *srp_verifier,
}
static char *srp_create_user(char *user, char **srp_verifier,
- char **srp_usersalt, char *g, char *N,
- char *passout, int verbose)
+ char **srp_usersalt, char *g, char *N,
+ char *passout, int verbose)
{
char password[1025];
PW_CB_DATA cb_tmp;
@@ -168,14 +167,15 @@ static char *srp_create_user(char *user, char **srp_verifier,
cb_tmp.prompt_info = user;
cb_tmp.password = passout;
- len = password_callback(password, sizeof(password)-1, 1, &cb_tmp);
+ len = password_callback(password, sizeof(password) - 1, 1, &cb_tmp);
if (len > 0) {
password[len] = 0;
if (verbose)
BIO_printf(bio_err, "Creating\n user=\"%s\"\n g=\"%s\"\n N=\"%s\"\n",
- user, g, N);
+ user, g, N);
if ((gNid = SRP_create_verifier(user, password, &salt,
- srp_verifier, N, g)) == NULL) {
+ srp_verifier, N, g))
+ == NULL) {
BIO_printf(bio_err, "Internal error creating SRP verifier\n");
} else {
*srp_usersalt = salt;
@@ -183,47 +183,57 @@ static char *srp_create_user(char *user, char **srp_verifier,
OPENSSL_cleanse(password, len);
if (verbose > 1)
BIO_printf(bio_err, "gNid=%s salt =\"%s\"\n verifier =\"%s\"\n",
- gNid, salt, *srp_verifier);
-
+ gNid, salt, *srp_verifier);
}
return gNid;
}
typedef enum OPTION_choice {
OPT_COMMON,
- OPT_VERBOSE, OPT_CONFIG, OPT_NAME, OPT_SRPVFILE, OPT_ADD,
- OPT_DELETE, OPT_MODIFY, OPT_LIST, OPT_GN, OPT_USERINFO,
- OPT_PASSIN, OPT_PASSOUT, OPT_R_ENUM, OPT_PROV_ENUM
+ OPT_VERBOSE,
+ OPT_CONFIG,
+ OPT_NAME,
+ OPT_SRPVFILE,
+ OPT_ADD,
+ OPT_DELETE,
+ OPT_MODIFY,
+ OPT_LIST,
+ OPT_GN,
+ OPT_USERINFO,
+ OPT_PASSIN,
+ OPT_PASSOUT,
+ OPT_R_ENUM,
+ OPT_PROV_ENUM
} OPTION_CHOICE;
const OPTIONS srp_options[] = {
- {OPT_HELP_STR, 1, '-', "Usage: %s [options] [user...]\n"},
+ { OPT_HELP_STR, 1, '-', "Usage: %s [options] [user...]\n" },
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
- {"verbose", OPT_VERBOSE, '-', "Talk a lot while doing things"},
- {"config", OPT_CONFIG, '<', "A config file"},
- {"name", OPT_NAME, 's', "The particular srp definition to use"},
+ { "help", OPT_HELP, '-', "Display this summary" },
+ { "verbose", OPT_VERBOSE, '-', "Talk a lot while doing things" },
+ { "config", OPT_CONFIG, '<', "A config file" },
+ { "name", OPT_NAME, 's', "The particular srp definition to use" },
OPT_SECTION("Action"),
- {"add", OPT_ADD, '-', "Add a user and SRP verifier"},
- {"modify", OPT_MODIFY, '-', "Modify the SRP verifier of an existing user"},
- {"delete", OPT_DELETE, '-', "Delete user from verifier file"},
- {"list", OPT_LIST, '-', "List users"},
+ { "add", OPT_ADD, '-', "Add a user and SRP verifier" },
+ { "modify", OPT_MODIFY, '-', "Modify the SRP verifier of an existing user" },
+ { "delete", OPT_DELETE, '-', "Delete user from verifier file" },
+ { "list", OPT_LIST, '-', "List users" },
OPT_SECTION("Configuration"),
- {"srpvfile", OPT_SRPVFILE, '<', "The srp verifier file name"},
- {"gn", OPT_GN, 's', "Set g and N values to be used for new verifier"},
- {"userinfo", OPT_USERINFO, 's', "Additional info to be set for user"},
- {"passin", OPT_PASSIN, 's', "Input file pass phrase source"},
- {"passout", OPT_PASSOUT, 's', "Output file pass phrase source"},
+ { "srpvfile", OPT_SRPVFILE, '<', "The srp verifier file name" },
+ { "gn", OPT_GN, 's', "Set g and N values to be used for new verifier" },
+ { "userinfo", OPT_USERINFO, 's', "Additional info to be set for user" },
+ { "passin", OPT_PASSIN, 's', "Input file pass phrase source" },
+ { "passout", OPT_PASSOUT, 's', "Output file pass phrase source" },
OPT_R_OPTIONS,
OPT_PROV_OPTIONS,
OPT_PARAMETERS(),
- {"user", 0, 0, "Username(s) to process (optional)"},
- {NULL}
+ { "user", 0, 0, "Username(s) to process (optional)" },
+ { NULL }
};
int srp_main(int argc, char **argv)
@@ -244,7 +254,7 @@ int srp_main(int argc, char **argv)
switch (o) {
case OPT_EOF:
case OPT_ERR:
- opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
case OPT_HELP:
@@ -269,8 +279,8 @@ int srp_main(int argc, char **argv)
case OPT_LIST:
if (mode != OPT_ERR) {
BIO_printf(bio_err,
- "%s: Only one of -add/-delete/-modify/-list\n",
- prog);
+ "%s: Only one of -add/-delete/-modify/-list\n",
+ prog);
goto opthelp;
}
mode = o;
@@ -307,12 +317,12 @@ int srp_main(int argc, char **argv)
if (srpvfile != NULL && configfile != NULL) {
BIO_printf(bio_err,
- "-srpvfile and -configfile cannot be specified together.\n");
+ "-srpvfile and -configfile cannot be specified together.\n");
goto end;
}
if (mode == OPT_ERR) {
BIO_printf(bio_err,
- "Exactly one of the options -add, -delete, -modify -list must be specified.\n");
+ "Exactly one of the options -add, -delete, -modify -list must be specified.\n");
goto opthelp;
}
if (mode == OPT_DELETE || mode == OPT_MODIFY || mode == OPT_ADD) {
@@ -324,7 +334,7 @@ int srp_main(int argc, char **argv)
}
if ((passinarg != NULL || passoutarg != NULL) && argc != 1) {
BIO_printf(bio_err,
- "-passin, -passout arguments only valid with one user.\n");
+ "-passin, -passout arguments only valid with one user.\n");
goto opthelp;
}
@@ -347,8 +357,8 @@ int srp_main(int argc, char **argv)
if (section == NULL) {
if (verbose)
BIO_printf(bio_err,
- "trying to read " ENV_DEFAULT_SRP
- " in " BASE_SECTION "\n");
+ "trying to read " ENV_DEFAULT_SRP
+ " in " BASE_SECTION "\n");
section = lookup_conf(conf, BASE_SECTION, ENV_DEFAULT_SRP);
if (section == NULL)
@@ -359,8 +369,8 @@ int srp_main(int argc, char **argv)
if (verbose)
BIO_printf(bio_err,
- "trying to read " ENV_DATABASE " in section \"%s\"\n",
- section);
+ "trying to read " ENV_DATABASE " in section \"%s\"\n",
+ section);
srpvfile = lookup_conf(conf, section, ENV_DATABASE);
if (srpvfile == NULL)
@@ -369,7 +379,7 @@ int srp_main(int argc, char **argv)
if (verbose)
BIO_printf(bio_err, "Trying to read SRP verifier file \"%s\"\n",
- srpvfile);
+ srpvfile);
db = load_index(srpvfile, NULL);
if (db == NULL) {
@@ -424,14 +434,13 @@ int srp_main(int argc, char **argv)
print_user(db, i, 1);
} else if (userindex < 0) {
BIO_printf(bio_err,
- "user \"%s\" does not exist, ignored. t\n", user);
+ "user \"%s\" does not exist, ignored. t\n", user);
errors++;
}
} else if (mode == OPT_ADD) {
if (userindex >= 0) {
/* reactivation of a new user */
- char **row =
- sk_OPENSSL_PSTRING_value(db->db->data, userindex);
+ char **row = sk_OPENSSL_PSTRING_value(db->db->data, userindex);
BIO_printf(bio_err, "user \"%s\" reactivated.\n", user);
row[DB_srptype][0] = 'V';
@@ -442,16 +451,14 @@ int srp_main(int argc, char **argv)
row[DB_srpverifier] = NULL;
row[DB_srpsalt] = NULL;
row[DB_srpinfo] = NULL;
- if (!
- (gNid =
- srp_create_user(user, &(row[DB_srpverifier]),
- &(row[DB_srpsalt]),
- gNrow ? gNrow[DB_srpsalt] : gN,
- gNrow ? gNrow[DB_srpverifier] : NULL,
- passout, verbose))) {
+ if (!(gNid = srp_create_user(user, &(row[DB_srpverifier]),
+ &(row[DB_srpsalt]),
+ gNrow ? gNrow[DB_srpsalt] : gN,
+ gNrow ? gNrow[DB_srpverifier] : NULL,
+ passout, verbose))) {
BIO_printf(bio_err,
- "Cannot create srp verifier for user \"%s\", operation abandoned .\n",
- user);
+ "Cannot create srp verifier for user \"%s\", operation abandoned .\n",
+ user);
errors++;
goto end;
}
@@ -480,18 +487,17 @@ int srp_main(int argc, char **argv)
} else if (mode == OPT_MODIFY) {
if (userindex < 0) {
BIO_printf(bio_err,
- "user \"%s\" does not exist, operation ignored.\n",
- user);
+ "user \"%s\" does not exist, operation ignored.\n",
+ user);
errors++;
} else {
- char **row =
- sk_OPENSSL_PSTRING_value(db->db->data, userindex);
+ char **row = sk_OPENSSL_PSTRING_value(db->db->data, userindex);
char type = row[DB_srptype][0];
if (type == 'v') {
BIO_printf(bio_err,
- "user \"%s\" already updated, operation ignored.\n",
- user);
+ "user \"%s\" already updated, operation ignored.\n",
+ user);
errors++;
} else {
char *gNid;
@@ -501,40 +507,35 @@ int srp_main(int argc, char **argv)
char **irow = NULL;
if (verbose)
BIO_printf(bio_err,
- "Verifying password for user \"%s\"\n",
- user);
- if ((user_gN =
- get_index(db, row[DB_srpgN], DB_SRP_INDEX)) >= 0)
- irow =
- sk_OPENSSL_PSTRING_value(db->db->data,
- userindex);
-
- if (!srp_verify_user
- (user, row[DB_srpverifier], row[DB_srpsalt],
- irow ? irow[DB_srpsalt] : row[DB_srpgN],
- irow ? irow[DB_srpverifier] : NULL, passin,
- verbose)) {
+ "Verifying password for user \"%s\"\n",
+ user);
+ if ((user_gN = get_index(db, row[DB_srpgN], DB_SRP_INDEX)) >= 0)
+ irow = sk_OPENSSL_PSTRING_value(db->db->data,
+ userindex);
+
+ if (!srp_verify_user(user, row[DB_srpverifier], row[DB_srpsalt],
+ irow ? irow[DB_srpsalt] : row[DB_srpgN],
+ irow ? irow[DB_srpverifier] : NULL, passin,
+ verbose)) {
BIO_printf(bio_err,
- "Invalid password for user \"%s\", operation abandoned.\n",
- user);
+ "Invalid password for user \"%s\", operation abandoned.\n",
+ user);
errors++;
goto end;
}
}
if (verbose)
BIO_printf(bio_err, "Password for user \"%s\" ok.\n",
- user);
-
- if (!
- (gNid =
- srp_create_user(user, &(row[DB_srpverifier]),
- &(row[DB_srpsalt]),
- gNrow ? gNrow[DB_srpsalt] : NULL,
- gNrow ? gNrow[DB_srpverifier] : NULL,
- passout, verbose))) {
+ user);
+
+ if (!(gNid = srp_create_user(user, &(row[DB_srpverifier]),
+ &(row[DB_srpsalt]),
+ gNrow ? gNrow[DB_srpsalt] : NULL,
+ gNrow ? gNrow[DB_srpverifier] : NULL,
+ passout, verbose))) {
BIO_printf(bio_err,
- "Cannot create srp verifier for user \"%s\", operation abandoned.\n",
- user);
+ "Cannot create srp verifier for user \"%s\", operation abandoned.\n",
+ user);
errors++;
goto end;
}
@@ -558,8 +559,8 @@ int srp_main(int argc, char **argv)
} else if (mode == OPT_DELETE) {
if (userindex < 0) {
BIO_printf(bio_err,
- "user \"%s\" does not exist, operation ignored. t\n",
- user);
+ "user \"%s\" does not exist, operation ignored. t\n",
+ user);
errors++;
} else {
char **xpp = sk_OPENSSL_PSTRING_value(db->db->data, userindex);
@@ -605,7 +606,7 @@ int srp_main(int argc, char **argv)
}
ret = (errors != 0);
- end:
+end:
if (errors != 0)
if (verbose)
BIO_printf(bio_err, "User errors %d.\n", errors);
diff --git a/apps/storeutl.c b/apps/storeutl.c
index fe809d421c..ebd430d89a 100644
--- a/apps/storeutl.c
+++ b/apps/storeutl.c
@@ -14,56 +14,65 @@
#include <openssl/err.h>
#include <openssl/pem.h>
#include <openssl/store.h>
-#include <openssl/x509v3.h> /* s2i_ASN1_INTEGER */
+#include <openssl/x509v3.h> /* s2i_ASN1_INTEGER */
static int process(const char *uri, const UI_METHOD *uimeth, PW_CB_DATA *uidata,
- int expected, int criterion, OSSL_STORE_SEARCH *search,
- int text, int noout, int recursive, int indent, const char *outfile,
- const char *prog, OSSL_LIB_CTX *libctx);
+ int expected, int criterion, OSSL_STORE_SEARCH *search,
+ int text, int noout, int recursive, int indent, const char *outfile,
+ const char *prog, OSSL_LIB_CTX *libctx);
static BIO *out = NULL;
typedef enum OPTION_choice {
OPT_COMMON,
- OPT_OUT, OPT_PASSIN,
- OPT_NOOUT, OPT_TEXT, OPT_RECURSIVE,
- OPT_SEARCHFOR_CERTS, OPT_SEARCHFOR_KEYS, OPT_SEARCHFOR_CRLS,
- OPT_CRITERION_SUBJECT, OPT_CRITERION_ISSUER, OPT_CRITERION_SERIAL,
- OPT_CRITERION_FINGERPRINT, OPT_CRITERION_ALIAS,
- OPT_MD, OPT_PROV_ENUM
+ OPT_OUT,
+ OPT_PASSIN,
+ OPT_NOOUT,
+ OPT_TEXT,
+ OPT_RECURSIVE,
+ OPT_SEARCHFOR_CERTS,
+ OPT_SEARCHFOR_KEYS,
+ OPT_SEARCHFOR_CRLS,
+ OPT_CRITERION_SUBJECT,
+ OPT_CRITERION_ISSUER,
+ OPT_CRITERION_SERIAL,
+ OPT_CRITERION_FINGERPRINT,
+ OPT_CRITERION_ALIAS,
+ OPT_MD,
+ OPT_PROV_ENUM
} OPTION_CHOICE;
const OPTIONS storeutl_options[] = {
- {OPT_HELP_STR, 1, '-', "Usage: %s [options] uri\n"},
+ { OPT_HELP_STR, 1, '-', "Usage: %s [options] uri\n" },
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
- {"", OPT_MD, '-', "Any supported digest"},
+ { "help", OPT_HELP, '-', "Display this summary" },
+ { "", OPT_MD, '-', "Any supported digest" },
OPT_SECTION("Search"),
- {"certs", OPT_SEARCHFOR_CERTS, '-', "Search for certificates only"},
- {"keys", OPT_SEARCHFOR_KEYS, '-', "Search for keys only"},
- {"crls", OPT_SEARCHFOR_CRLS, '-', "Search for CRLs only"},
- {"subject", OPT_CRITERION_SUBJECT, 's', "Search by subject"},
- {"issuer", OPT_CRITERION_ISSUER, 's', "Search by issuer and serial, issuer name"},
- {"serial", OPT_CRITERION_SERIAL, 's', "Search by issuer and serial, serial number"},
- {"fingerprint", OPT_CRITERION_FINGERPRINT, 's', "Search by public key fingerprint, given in hex"},
- {"alias", OPT_CRITERION_ALIAS, 's', "Search by alias"},
- {"r", OPT_RECURSIVE, '-', "Recurse through names"},
+ { "certs", OPT_SEARCHFOR_CERTS, '-', "Search for certificates only" },
+ { "keys", OPT_SEARCHFOR_KEYS, '-', "Search for keys only" },
+ { "crls", OPT_SEARCHFOR_CRLS, '-', "Search for CRLs only" },
+ { "subject", OPT_CRITERION_SUBJECT, 's', "Search by subject" },
+ { "issuer", OPT_CRITERION_ISSUER, 's', "Search by issuer and serial, issuer name" },
+ { "serial", OPT_CRITERION_SERIAL, 's', "Search by issuer and serial, serial number" },
+ { "fingerprint", OPT_CRITERION_FINGERPRINT, 's', "Search by public key fingerprint, given in hex" },
+ { "alias", OPT_CRITERION_ALIAS, 's', "Search by alias" },
+ { "r", OPT_RECURSIVE, '-', "Recurse through names" },
OPT_SECTION("Input"),
- {"passin", OPT_PASSIN, 's', "Input file pass phrase source"},
+ { "passin", OPT_PASSIN, 's', "Input file pass phrase source" },
OPT_SECTION("Output"),
- {"out", OPT_OUT, '>', "Output file - default stdout"},
- {"text", OPT_TEXT, '-', "Print a text form of the objects"},
- {"noout", OPT_NOOUT, '-', "No PEM output, just status"},
+ { "out", OPT_OUT, '>', "Output file - default stdout" },
+ { "text", OPT_TEXT, '-', "Print a text form of the objects" },
+ { "noout", OPT_NOOUT, '-', "No PEM output, just status" },
OPT_PROV_OPTIONS,
OPT_PARAMETERS(),
- {"uri", 0, 0, "URI of the store object"},
- {NULL}
+ { "uri", 0, 0, "URI of the store object" },
+ { NULL }
};
int storeutl_main(int argc, char *argv[])
@@ -90,7 +99,7 @@ int storeutl_main(int argc, char *argv[])
switch (o) {
case OPT_EOF:
case OPT_ERR:
- opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
case OPT_HELP:
@@ -117,7 +126,7 @@ int storeutl_main(int argc, char *argv[])
case OPT_SEARCHFOR_CRLS:
if (expected != 0) {
BIO_printf(bio_err, "%s: only one search type can be given.\n",
- prog);
+ prog);
goto end;
}
{
@@ -125,9 +134,9 @@ int storeutl_main(int argc, char *argv[])
enum OPTION_choice choice;
int type;
} map[] = {
- {OPT_SEARCHFOR_CERTS, OSSL_STORE_INFO_CERT},
- {OPT_SEARCHFOR_KEYS, OSSL_STORE_INFO_PKEY},
- {OPT_SEARCHFOR_CRLS, OSSL_STORE_INFO_CRL},
+ { OPT_SEARCHFOR_CERTS, OSSL_STORE_INFO_CERT },
+ { OPT_SEARCHFOR_KEYS, OSSL_STORE_INFO_PKEY },
+ { OPT_SEARCHFOR_CRLS, OSSL_STORE_INFO_CRL },
};
size_t i;
@@ -147,13 +156,13 @@ int storeutl_main(int argc, char *argv[])
case OPT_CRITERION_SUBJECT:
if (criterion != 0) {
BIO_printf(bio_err, "%s: criterion already given.\n",
- prog);
+ prog);
goto end;
}
criterion = OSSL_STORE_SEARCH_BY_NAME;
if (subject != NULL) {
BIO_printf(bio_err, "%s: subject already given.\n",
- prog);
+ prog);
goto end;
}
subject = parse_name(opt_arg(), MBSTRING_UTF8, 1, "subject");
@@ -164,13 +173,13 @@ int storeutl_main(int argc, char *argv[])
if (criterion != 0
&& criterion != OSSL_STORE_SEARCH_BY_ISSUER_SERIAL) {
BIO_printf(bio_err, "%s: criterion already given.\n",
- prog);
+ prog);
goto end;
}
criterion = OSSL_STORE_SEARCH_BY_ISSUER_SERIAL;
if (issuer != NULL) {
BIO_printf(bio_err, "%s: issuer already given.\n",
- prog);
+ prog);
goto end;
}
issuer = parse_name(opt_arg(), MBSTRING_UTF8, 1, "issuer");
@@ -181,31 +190,31 @@ int storeutl_main(int argc, char *argv[])
if (criterion != 0
&& criterion != OSSL_STORE_SEARCH_BY_ISSUER_SERIAL) {
BIO_printf(bio_err, "%s: criterion already given.\n",
- prog);
+ prog);
goto end;
}
criterion = OSSL_STORE_SEARCH_BY_ISSUER_SERIAL;
if (serial != NULL) {
BIO_printf(bio_err, "%s: serial number already given.\n",
- prog);
+ prog);
goto end;
}
if ((serial = s2i_ASN1_INTEGER(NULL, opt_arg())) == NULL) {
BIO_printf(bio_err, "%s: can't parse serial number argument.\n",
- prog);
+ prog);
goto end;
}
break;
case OPT_CRITERION_FINGERPRINT:
if (criterion != 0) {
BIO_printf(bio_err, "%s: criterion already given.\n",
- prog);
+ prog);
goto end;
}
criterion = OSSL_STORE_SEARCH_BY_KEY_FINGERPRINT;
if (fingerprint != NULL) {
BIO_printf(bio_err, "%s: fingerprint already given.\n",
- prog);
+ prog);
goto end;
}
{
@@ -214,8 +223,8 @@ int storeutl_main(int argc, char *argv[])
if ((fingerprint = OPENSSL_hexstr2buf(opt_arg(), &tmplen))
== NULL) {
BIO_printf(bio_err,
- "%s: can't parse fingerprint argument.\n",
- prog);
+ "%s: can't parse fingerprint argument.\n",
+ prog);
goto end;
}
fingerprintlen = (size_t)tmplen;
@@ -224,18 +233,18 @@ int storeutl_main(int argc, char *argv[])
case OPT_CRITERION_ALIAS:
if (criterion != 0) {
BIO_printf(bio_err, "%s: criterion already given.\n",
- prog);
+ prog);
goto end;
}
criterion = OSSL_STORE_SEARCH_BY_ALIAS;
if (alias != NULL) {
BIO_printf(bio_err, "%s: alias already given.\n",
- prog);
+ prog);
goto end;
}
if ((alias = OPENSSL_strdup(opt_arg())) == NULL) {
BIO_printf(bio_err, "%s: can't parse alias argument.\n",
- prog);
+ prog);
goto end;
}
break;
@@ -268,8 +277,8 @@ int storeutl_main(int argc, char *argv[])
case OSSL_STORE_SEARCH_BY_ISSUER_SERIAL:
if (issuer == NULL || serial == NULL) {
BIO_printf(bio_err,
- "%s: both -issuer and -serial must be given.\n",
- prog);
+ "%s: both -issuer and -serial must be given.\n",
+ prog);
goto end;
}
if ((search = OSSL_STORE_SEARCH_by_issuer_serial(issuer, serial))
@@ -280,8 +289,8 @@ int storeutl_main(int argc, char *argv[])
break;
case OSSL_STORE_SEARCH_BY_KEY_FINGERPRINT:
if ((search = OSSL_STORE_SEARCH_by_key_fingerprint(digest,
- fingerprint,
- fingerprintlen))
+ fingerprint,
+ fingerprintlen))
== NULL) {
ERR_print_errors(bio_err);
goto end;
@@ -304,10 +313,10 @@ int storeutl_main(int argc, char *argv[])
pw_cb_data.prompt_info = argv[0];
ret = process(argv[0], get_ui_method(), &pw_cb_data,
- expected, criterion, search,
- text, noout, recursive, 0, outfile, prog, libctx);
+ expected, criterion, search,
+ text, noout, recursive, 0, outfile, prog, libctx);
- end:
+end:
EVP_MD_free(digest);
OPENSSL_free(fingerprint);
OPENSSL_free(alias);
@@ -331,15 +340,15 @@ static void indent_printf(int indent, BIO *bio, const char *format, ...)
}
static int process(const char *uri, const UI_METHOD *uimeth, PW_CB_DATA *uidata,
- int expected, int criterion, OSSL_STORE_SEARCH *search,
- int text, int noout, int recursive, int indent, const char *outfile,
- const char *prog, OSSL_LIB_CTX *libctx)
+ int expected, int criterion, OSSL_STORE_SEARCH *search,
+ int text, int noout, int recursive, int indent, const char *outfile,
+ const char *prog, OSSL_LIB_CTX *libctx)
{
OSSL_STORE_CTX *store_ctx = NULL;
int ret = 1, items = 0;
if ((store_ctx = OSSL_STORE_open_ex(uri, libctx, app_get0_propq(), uimeth, uidata,
- NULL, NULL, NULL))
+ NULL, NULL, NULL))
== NULL) {
BIO_printf(bio_err, "Couldn't open file or uri %s\n", uri);
ERR_print_errors(bio_err);
@@ -356,8 +365,8 @@ static int process(const char *uri, const UI_METHOD *uimeth, PW_CB_DATA *uidata,
if (criterion != 0) {
if (!OSSL_STORE_supports_search(store_ctx, criterion)) {
BIO_printf(bio_err,
- "%s: the store scheme doesn't support the given search criteria.\n",
- prog);
+ "%s: the store scheme doesn't support the given search criteria.\n",
+ prog);
goto end2;
}
@@ -373,8 +382,7 @@ static int process(const char *uri, const UI_METHOD *uimeth, PW_CB_DATA *uidata,
for (;;) {
OSSL_STORE_INFO *info = OSSL_STORE_load(store_ctx);
int type = info == NULL ? 0 : OSSL_STORE_INFO_get_type(info);
- const char *infostr =
- info == NULL ? NULL : OSSL_STORE_INFO_type_string(type);
+ const char *infostr = info == NULL ? NULL : OSSL_STORE_INFO_type_string(type);
if (info == NULL) {
if (OSSL_STORE_error(store_ctx)) {
@@ -392,8 +400,8 @@ static int process(const char *uri, const UI_METHOD *uimeth, PW_CB_DATA *uidata,
break;
BIO_printf(bio_err,
- "ERROR: OSSL_STORE_load() returned NULL without "
- "eof or error indications\n");
+ "ERROR: OSSL_STORE_load() returned NULL without "
+ "eof or error indications\n");
BIO_printf(bio_err, " This is an error in the loader\n");
ERR_print_errors(bio_err);
ret++;
@@ -404,7 +412,7 @@ static int process(const char *uri, const UI_METHOD *uimeth, PW_CB_DATA *uidata,
const char *name = OSSL_STORE_INFO_get0_NAME(info);
const char *desc = OSSL_STORE_INFO_get0_NAME_description(info);
indent_printf(indent, bio_out, "%d: %s: %s\n", items, infostr,
- name);
+ name);
if (desc != NULL)
indent_printf(indent, bio_out, "%s\n", desc);
} else {
@@ -428,33 +436,33 @@ static int process(const char *uri, const UI_METHOD *uimeth, PW_CB_DATA *uidata,
if (recursive) {
const char *suburi = OSSL_STORE_INFO_get0_NAME(info);
ret += process(suburi, uimeth, uidata,
- expected, criterion, search,
- text, noout, recursive, indent + 2, outfile, prog,
- libctx);
+ expected, criterion, search,
+ text, noout, recursive, indent + 2, outfile, prog,
+ libctx);
}
break;
case OSSL_STORE_INFO_PARAMS:
if (text)
EVP_PKEY_print_params(out, OSSL_STORE_INFO_get0_PARAMS(info),
- 0, NULL);
+ 0, NULL);
if (!noout)
PEM_write_bio_Parameters(out,
- OSSL_STORE_INFO_get0_PARAMS(info));
+ OSSL_STORE_INFO_get0_PARAMS(info));
break;
case OSSL_STORE_INFO_PUBKEY:
if (text)
EVP_PKEY_print_public(out, OSSL_STORE_INFO_get0_PUBKEY(info),
- 0, NULL);
+ 0, NULL);
if (!noout)
PEM_write_bio_PUBKEY(out, OSSL_STORE_INFO_get0_PUBKEY(info));
break;
case OSSL_STORE_INFO_PKEY:
if (text)
EVP_PKEY_print_private(out, OSSL_STORE_INFO_get0_PKEY(info),
- 0, NULL);
+ 0, NULL);
if (!noout)
PEM_write_bio_PrivateKey(out, OSSL_STORE_INFO_get0_PKEY(info),
- NULL, NULL, 0, NULL, NULL);
+ NULL, NULL, 0, NULL, NULL);
break;
case OSSL_STORE_INFO_CERT:
if (text)
@@ -478,7 +486,7 @@ static int process(const char *uri, const UI_METHOD *uimeth, PW_CB_DATA *uidata,
}
indent_printf(indent, out, "Total found: %d\n", items);
- end2:
+end2:
if (!OSSL_STORE_close(store_ctx)) {
ERR_print_errors(bio_err);
ret++;
diff --git a/apps/testdsa.h b/apps/testdsa.h
index d80d2cf7f2..e8d04bb31e 100644
--- a/apps/testdsa.h
+++ b/apps/testdsa.h
@@ -13,45 +13,274 @@
EVP_PKEY *get_dsa(int);
static unsigned char dsa512_priv[] = {
- 0x65, 0xe5, 0xc7, 0x38, 0x60, 0x24, 0xb5, 0x89, 0xd4, 0x9c, 0xeb, 0x4c,
- 0x9c, 0x1d, 0x7a, 0x22, 0xbd, 0xd1, 0xc2, 0xd2,
+ 0x65,
+ 0xe5,
+ 0xc7,
+ 0x38,
+ 0x60,
+ 0x24,
+ 0xb5,
+ 0x89,
+ 0xd4,
+ 0x9c,
+ 0xeb,
+ 0x4c,
+ 0x9c,
+ 0x1d,
+ 0x7a,
+ 0x22,
+ 0xbd,
+ 0xd1,
+ 0xc2,
+ 0xd2,
};
static unsigned char dsa512_pub[] = {
- 0x00, 0x95, 0xa7, 0x0d, 0xec, 0x93, 0x68, 0xba, 0x5f, 0xf7, 0x5f, 0x07,
- 0xf2, 0x3b, 0xad, 0x6b, 0x01, 0xdc, 0xbe, 0xec, 0xde, 0x04, 0x7a, 0x3a,
- 0x27, 0xb3, 0xec, 0x49, 0xfd, 0x08, 0x43, 0x3d, 0x7e, 0xa8, 0x2c, 0x5e,
- 0x7b, 0xbb, 0xfc, 0xf4, 0x6e, 0xeb, 0x6c, 0xb0, 0x6e, 0xf8, 0x02, 0x12,
- 0x8c, 0x38, 0x5d, 0x83, 0x56, 0x7d, 0xee, 0x53, 0x05, 0x3e, 0x24, 0x84,
- 0xbe, 0xba, 0x0a, 0x6b, 0xc8,
+ 0x00,
+ 0x95,
+ 0xa7,
+ 0x0d,
+ 0xec,
+ 0x93,
+ 0x68,
+ 0xba,
+ 0x5f,
+ 0xf7,
+ 0x5f,
+ 0x07,
+ 0xf2,
+ 0x3b,
+ 0xad,
+ 0x6b,
+ 0x01,
+ 0xdc,
+ 0xbe,
+ 0xec,
+ 0xde,
+ 0x04,
+ 0x7a,
+ 0x3a,
+ 0x27,
+ 0xb3,
+ 0xec,
+ 0x49,
+ 0xfd,
+ 0x08,
+ 0x43,
+ 0x3d,
+ 0x7e,
+ 0xa8,
+ 0x2c,
+ 0x5e,
+ 0x7b,
+ 0xbb,
+ 0xfc,
+ 0xf4,
+ 0x6e,
+ 0xeb,
+ 0x6c,
+ 0xb0,
+ 0x6e,
+ 0xf8,
+ 0x02,
+ 0x12,
+ 0x8c,
+ 0x38,
+ 0x5d,
+ 0x83,
+ 0x56,
+ 0x7d,
+ 0xee,
+ 0x53,
+ 0x05,
+ 0x3e,
+ 0x24,
+ 0x84,
+ 0xbe,
+ 0xba,
+ 0x0a,
+ 0x6b,
+ 0xc8,
};
static unsigned char dsa512_p[] = {
- 0x9D, 0x1B, 0x69, 0x8E, 0x26, 0xDB, 0xF2, 0x2B, 0x11, 0x70, 0x19, 0x86,
- 0xF6, 0x19, 0xC8, 0xF8, 0x19, 0xF2, 0x18, 0x53, 0x94, 0x46, 0x06, 0xD0,
- 0x62, 0x50, 0x33, 0x4B, 0x02, 0x3C, 0x52, 0x30, 0x03, 0x8B, 0x3B, 0xF9,
- 0x5F, 0xD1, 0x24, 0x06, 0x4F, 0x7B, 0x4C, 0xBA, 0xAA, 0x40, 0x9B, 0xFD,
- 0x96, 0xE4, 0x37, 0x33, 0xBB, 0x2D, 0x5A, 0xD7, 0x5A, 0x11, 0x40, 0x66,
- 0xA2, 0x76, 0x7D, 0x31,
+ 0x9D,
+ 0x1B,
+ 0x69,
+ 0x8E,
+ 0x26,
+ 0xDB,
+ 0xF2,
+ 0x2B,
+ 0x11,
+ 0x70,
+ 0x19,
+ 0x86,
+ 0xF6,
+ 0x19,
+ 0xC8,
+ 0xF8,
+ 0x19,
+ 0xF2,
+ 0x18,
+ 0x53,
+ 0x94,
+ 0x46,
+ 0x06,
+ 0xD0,
+ 0x62,
+ 0x50,
+ 0x33,
+ 0x4B,
+ 0x02,
+ 0x3C,
+ 0x52,
+ 0x30,
+ 0x03,
+ 0x8B,
+ 0x3B,
+ 0xF9,
+ 0x5F,
+ 0xD1,
+ 0x24,
+ 0x06,
+ 0x4F,
+ 0x7B,
+ 0x4C,
+ 0xBA,
+ 0xAA,
+ 0x40,
+ 0x9B,
+ 0xFD,
+ 0x96,
+ 0xE4,
+ 0x37,
+ 0x33,
+ 0xBB,
+ 0x2D,
+ 0x5A,
+ 0xD7,
+ 0x5A,
+ 0x11,
+ 0x40,
+ 0x66,
+ 0xA2,
+ 0x76,
+ 0x7D,
+ 0x31,
};
static unsigned char dsa512_q[] = {
- 0xFB, 0x53, 0xEF, 0x50, 0xB4, 0x40, 0x92, 0x31, 0x56, 0x86, 0x53, 0x7A,
- 0xE8, 0x8B, 0x22, 0x9A, 0x49, 0xFB, 0x71, 0x8F,
+ 0xFB,
+ 0x53,
+ 0xEF,
+ 0x50,
+ 0xB4,
+ 0x40,
+ 0x92,
+ 0x31,
+ 0x56,
+ 0x86,
+ 0x53,
+ 0x7A,
+ 0xE8,
+ 0x8B,
+ 0x22,
+ 0x9A,
+ 0x49,
+ 0xFB,
+ 0x71,
+ 0x8F,
};
static unsigned char dsa512_g[] = {
- 0x83, 0x3E, 0x88, 0xE5, 0xC5, 0x89, 0x73, 0xCE, 0x3B, 0x6C, 0x01, 0x49,
- 0xBF, 0xB3, 0xC7, 0x9F, 0x0A, 0xEA, 0x44, 0x91, 0xE5, 0x30, 0xAA, 0xD9,
- 0xBE, 0x5B, 0x5F, 0xB7, 0x10, 0xD7, 0x89, 0xB7, 0x8E, 0x74, 0xFB, 0xCF,
- 0x29, 0x1E, 0xEB, 0xA8, 0x2C, 0x54, 0x51, 0xB8, 0x10, 0xDE, 0xA0, 0xCE,
- 0x2F, 0xCC, 0x24, 0x6B, 0x90, 0x77, 0xDE, 0xA2, 0x68, 0xA6, 0x52, 0x12,
- 0xA2, 0x03, 0x9D, 0x20,
+ 0x83,
+ 0x3E,
+ 0x88,
+ 0xE5,
+ 0xC5,
+ 0x89,
+ 0x73,
+ 0xCE,
+ 0x3B,
+ 0x6C,
+ 0x01,
+ 0x49,
+ 0xBF,
+ 0xB3,
+ 0xC7,
+ 0x9F,
+ 0x0A,
+ 0xEA,
+ 0x44,
+ 0x91,
+ 0xE5,
+ 0x30,
+ 0xAA,
+ 0xD9,
+ 0xBE,
+ 0x5B,
+ 0x5F,
+ 0xB7,
+ 0x10,
+ 0xD7,
+ 0x89,
+ 0xB7,
+ 0x8E,
+ 0x74,
+ 0xFB,
+ 0xCF,
+ 0x29,
+ 0x1E,
+ 0xEB,
+ 0xA8,
+ 0x2C,
+ 0x54,
+ 0x51,
+ 0xB8,
+ 0x10,
+ 0xDE,
+ 0xA0,
+ 0xCE,
+ 0x2F,
+ 0xCC,
+ 0x24,
+ 0x6B,
+ 0x90,
+ 0x77,
+ 0xDE,
+ 0xA2,
+ 0x68,
+ 0xA6,
+ 0x52,
+ 0x12,
+ 0xA2,
+ 0x03,
+ 0x9D,
+ 0x20,
};
static unsigned char dsa1024_priv[] = {
- 0x7d, 0x21, 0xda, 0xbb, 0x62, 0x15, 0x47, 0x36, 0x07, 0x67, 0x12, 0xe8,
- 0x8c, 0xaa, 0x1c, 0xcd, 0x38, 0x12, 0x61, 0x18,
+ 0x7d,
+ 0x21,
+ 0xda,
+ 0xbb,
+ 0x62,
+ 0x15,
+ 0x47,
+ 0x36,
+ 0x07,
+ 0x67,
+ 0x12,
+ 0xe8,
+ 0x8c,
+ 0xaa,
+ 0x1c,
+ 0xcd,
+ 0x38,
+ 0x12,
+ 0x61,
+ 0x18,
};
static unsigned char dsa1024_pub[] = {
@@ -69,121 +298,1111 @@ static unsigned char dsa1024_pub[] = {
};
static unsigned char dsa1024_p[] = {
- 0xA7, 0x3F, 0x6E, 0x85, 0xBF, 0x41, 0x6A, 0x29, 0x7D, 0xF0, 0x9F, 0x47,
- 0x19, 0x30, 0x90, 0x9A, 0x09, 0x1D, 0xDA, 0x6A, 0x33, 0x1E, 0xC5, 0x3D,
- 0x86, 0x96, 0xB3, 0x15, 0xE0, 0x53, 0x2E, 0x8F, 0xE0, 0x59, 0x82, 0x73,
- 0x90, 0x3E, 0x75, 0x31, 0x99, 0x47, 0x7A, 0x52, 0xFB, 0x85, 0xE4, 0xD9,
- 0xA6, 0x7B, 0x38, 0x9B, 0x68, 0x8A, 0x84, 0x9B, 0x87, 0xC6, 0x1E, 0xB5,
- 0x7E, 0x86, 0x4B, 0x53, 0x5B, 0x59, 0xCF, 0x71, 0x65, 0x19, 0x88, 0x6E,
- 0xCE, 0x66, 0xAE, 0x6B, 0x88, 0x36, 0xFB, 0xEC, 0x28, 0xDC, 0xC2, 0xD7,
- 0xA5, 0xBB, 0xE5, 0x2C, 0x39, 0x26, 0x4B, 0xDA, 0x9A, 0x70, 0x18, 0x95,
- 0x37, 0x95, 0x10, 0x56, 0x23, 0xF6, 0x15, 0xED, 0xBA, 0x04, 0x5E, 0xDE,
- 0x39, 0x4F, 0xFD, 0xB7, 0x43, 0x1F, 0xB5, 0xA4, 0x65, 0x6F, 0xCD, 0x80,
- 0x11, 0xE4, 0x70, 0x95, 0x5B, 0x50, 0xCD, 0x49,
+ 0xA7,
+ 0x3F,
+ 0x6E,
+ 0x85,
+ 0xBF,
+ 0x41,
+ 0x6A,
+ 0x29,
+ 0x7D,
+ 0xF0,
+ 0x9F,
+ 0x47,
+ 0x19,
+ 0x30,
+ 0x90,
+ 0x9A,
+ 0x09,
+ 0x1D,
+ 0xDA,
+ 0x6A,
+ 0x33,
+ 0x1E,
+ 0xC5,
+ 0x3D,
+ 0x86,
+ 0x96,
+ 0xB3,
+ 0x15,
+ 0xE0,
+ 0x53,
+ 0x2E,
+ 0x8F,
+ 0xE0,
+ 0x59,
+ 0x82,
+ 0x73,
+ 0x90,
+ 0x3E,
+ 0x75,
+ 0x31,
+ 0x99,
+ 0x47,
+ 0x7A,
+ 0x52,
+ 0xFB,
+ 0x85,
+ 0xE4,
+ 0xD9,
+ 0xA6,
+ 0x7B,
+ 0x38,
+ 0x9B,
+ 0x68,
+ 0x8A,
+ 0x84,
+ 0x9B,
+ 0x87,
+ 0xC6,
+ 0x1E,
+ 0xB5,
+ 0x7E,
+ 0x86,
+ 0x4B,
+ 0x53,
+ 0x5B,
+ 0x59,
+ 0xCF,
+ 0x71,
+ 0x65,
+ 0x19,
+ 0x88,
+ 0x6E,
+ 0xCE,
+ 0x66,
+ 0xAE,
+ 0x6B,
+ 0x88,
+ 0x36,
+ 0xFB,
+ 0xEC,
+ 0x28,
+ 0xDC,
+ 0xC2,
+ 0xD7,
+ 0xA5,
+ 0xBB,
+ 0xE5,
+ 0x2C,
+ 0x39,
+ 0x26,
+ 0x4B,
+ 0xDA,
+ 0x9A,
+ 0x70,
+ 0x18,
+ 0x95,
+ 0x37,
+ 0x95,
+ 0x10,
+ 0x56,
+ 0x23,
+ 0xF6,
+ 0x15,
+ 0xED,
+ 0xBA,
+ 0x04,
+ 0x5E,
+ 0xDE,
+ 0x39,
+ 0x4F,
+ 0xFD,
+ 0xB7,
+ 0x43,
+ 0x1F,
+ 0xB5,
+ 0xA4,
+ 0x65,
+ 0x6F,
+ 0xCD,
+ 0x80,
+ 0x11,
+ 0xE4,
+ 0x70,
+ 0x95,
+ 0x5B,
+ 0x50,
+ 0xCD,
+ 0x49,
};
static unsigned char dsa1024_q[] = {
- 0xF7, 0x07, 0x31, 0xED, 0xFA, 0x6C, 0x06, 0x03, 0xD5, 0x85, 0x8A, 0x1C,
- 0xAC, 0x9C, 0x65, 0xE7, 0x50, 0x66, 0x65, 0x6F,
+ 0xF7,
+ 0x07,
+ 0x31,
+ 0xED,
+ 0xFA,
+ 0x6C,
+ 0x06,
+ 0x03,
+ 0xD5,
+ 0x85,
+ 0x8A,
+ 0x1C,
+ 0xAC,
+ 0x9C,
+ 0x65,
+ 0xE7,
+ 0x50,
+ 0x66,
+ 0x65,
+ 0x6F,
};
static unsigned char dsa1024_g[] = {
- 0x4D, 0xDF, 0x4C, 0x03, 0xA6, 0x91, 0x8A, 0xF5, 0x19, 0x6F, 0x50, 0x46,
- 0x25, 0x99, 0xE5, 0x68, 0x6F, 0x30, 0xE3, 0x69, 0xE1, 0xE5, 0xB3, 0x5D,
- 0x98, 0xBB, 0x28, 0x86, 0x48, 0xFC, 0xDE, 0x99, 0x04, 0x3F, 0x5F, 0x88,
- 0x0C, 0x9C, 0x73, 0x24, 0x0D, 0x20, 0x5D, 0xB9, 0x2A, 0x9A, 0x3F, 0x18,
- 0x96, 0x27, 0xE4, 0x62, 0x87, 0xC1, 0x7B, 0x74, 0x62, 0x53, 0xFC, 0x61,
- 0x27, 0xA8, 0x7A, 0x91, 0x09, 0x9D, 0xB6, 0xF1, 0x4D, 0x9C, 0x54, 0x0F,
- 0x58, 0x06, 0xEE, 0x49, 0x74, 0x07, 0xCE, 0x55, 0x7E, 0x23, 0xCE, 0x16,
- 0xF6, 0xCA, 0xDC, 0x5A, 0x61, 0x01, 0x7E, 0xC9, 0x71, 0xB5, 0x4D, 0xF6,
- 0xDC, 0x34, 0x29, 0x87, 0x68, 0xF6, 0x5E, 0x20, 0x93, 0xB3, 0xDB, 0xF5,
- 0xE4, 0x09, 0x6C, 0x41, 0x17, 0x95, 0x92, 0xEB, 0x01, 0xB5, 0x73, 0xA5,
- 0x6A, 0x7E, 0xD8, 0x32, 0xED, 0x0E, 0x02, 0xB8,
+ 0x4D,
+ 0xDF,
+ 0x4C,
+ 0x03,
+ 0xA6,
+ 0x91,
+ 0x8A,
+ 0xF5,
+ 0x19,
+ 0x6F,
+ 0x50,
+ 0x46,
+ 0x25,
+ 0x99,
+ 0xE5,
+ 0x68,
+ 0x6F,
+ 0x30,
+ 0xE3,
+ 0x69,
+ 0xE1,
+ 0xE5,
+ 0xB3,
+ 0x5D,
+ 0x98,
+ 0xBB,
+ 0x28,
+ 0x86,
+ 0x48,
+ 0xFC,
+ 0xDE,
+ 0x99,
+ 0x04,
+ 0x3F,
+ 0x5F,
+ 0x88,
+ 0x0C,
+ 0x9C,
+ 0x73,
+ 0x24,
+ 0x0D,
+ 0x20,
+ 0x5D,
+ 0xB9,
+ 0x2A,
+ 0x9A,
+ 0x3F,
+ 0x18,
+ 0x96,
+ 0x27,
+ 0xE4,
+ 0x62,
+ 0x87,
+ 0xC1,
+ 0x7B,
+ 0x74,
+ 0x62,
+ 0x53,
+ 0xFC,
+ 0x61,
+ 0x27,
+ 0xA8,
+ 0x7A,
+ 0x91,
+ 0x09,
+ 0x9D,
+ 0xB6,
+ 0xF1,
+ 0x4D,
+ 0x9C,
+ 0x54,
+ 0x0F,
+ 0x58,
+ 0x06,
+ 0xEE,
+ 0x49,
+ 0x74,
+ 0x07,
+ 0xCE,
+ 0x55,
+ 0x7E,
+ 0x23,
+ 0xCE,
+ 0x16,
+ 0xF6,
+ 0xCA,
+ 0xDC,
+ 0x5A,
+ 0x61,
+ 0x01,
+ 0x7E,
+ 0xC9,
+ 0x71,
+ 0xB5,
+ 0x4D,
+ 0xF6,
+ 0xDC,
+ 0x34,
+ 0x29,
+ 0x87,
+ 0x68,
+ 0xF6,
+ 0x5E,
+ 0x20,
+ 0x93,
+ 0xB3,
+ 0xDB,
+ 0xF5,
+ 0xE4,
+ 0x09,
+ 0x6C,
+ 0x41,
+ 0x17,
+ 0x95,
+ 0x92,
+ 0xEB,
+ 0x01,
+ 0xB5,
+ 0x73,
+ 0xA5,
+ 0x6A,
+ 0x7E,
+ 0xD8,
+ 0x32,
+ 0xED,
+ 0x0E,
+ 0x02,
+ 0xB8,
};
static unsigned char dsa2048_priv[] = {
- 0x32, 0x67, 0x92, 0xf6, 0xc4, 0xe2, 0xe2, 0xe8, 0xa0, 0x8b, 0x6b, 0x45,
- 0x0c, 0x8a, 0x76, 0xb0, 0xee, 0xcf, 0x91, 0xa7,
+ 0x32,
+ 0x67,
+ 0x92,
+ 0xf6,
+ 0xc4,
+ 0xe2,
+ 0xe2,
+ 0xe8,
+ 0xa0,
+ 0x8b,
+ 0x6b,
+ 0x45,
+ 0x0c,
+ 0x8a,
+ 0x76,
+ 0xb0,
+ 0xee,
+ 0xcf,
+ 0x91,
+ 0xa7,
};
static unsigned char dsa2048_pub[] = {
- 0x17, 0x8f, 0xa8, 0x11, 0x84, 0x92, 0xec, 0x83, 0x47, 0xc7, 0x6a, 0xb0,
- 0x92, 0xaf, 0x5a, 0x20, 0x37, 0xa3, 0x64, 0x79, 0xd2, 0xd0, 0x3d, 0xcd,
- 0xe0, 0x61, 0x88, 0x88, 0x21, 0xcc, 0x74, 0x5d, 0xce, 0x4c, 0x51, 0x47,
- 0xf0, 0xc5, 0x5c, 0x4c, 0x82, 0x7a, 0xaf, 0x72, 0xad, 0xb9, 0xe0, 0x53,
- 0xf2, 0x78, 0xb7, 0xf0, 0xb5, 0x48, 0x7f, 0x8a, 0x3a, 0x18, 0xd1, 0x9f,
- 0x8b, 0x7d, 0xa5, 0x47, 0xb7, 0x95, 0xab, 0x98, 0xf8, 0x7b, 0x74, 0x50,
- 0x56, 0x8e, 0x57, 0xf0, 0xee, 0xf5, 0xb7, 0xba, 0xab, 0x85, 0x86, 0xf9,
- 0x2b, 0xef, 0x41, 0x56, 0xa0, 0xa4, 0x9f, 0xb7, 0x38, 0x00, 0x46, 0x0a,
- 0xa6, 0xf1, 0xfc, 0x1f, 0xd8, 0x4e, 0x85, 0x44, 0x92, 0x43, 0x21, 0x5d,
- 0x6e, 0xcc, 0xc2, 0xcb, 0x26, 0x31, 0x0d, 0x21, 0xc4, 0xbd, 0x8d, 0x24,
- 0xbc, 0xd9, 0x18, 0x19, 0xd7, 0xdc, 0xf1, 0xe7, 0x93, 0x50, 0x48, 0x03,
- 0x2c, 0xae, 0x2e, 0xe7, 0x49, 0x88, 0x5f, 0x93, 0x57, 0x27, 0x99, 0x36,
- 0xb4, 0x20, 0xab, 0xfc, 0xa7, 0x2b, 0xf2, 0xd9, 0x98, 0xd7, 0xd4, 0x34,
- 0x9d, 0x96, 0x50, 0x58, 0x9a, 0xea, 0x54, 0xf3, 0xee, 0xf5, 0x63, 0x14,
- 0xee, 0x85, 0x83, 0x74, 0x76, 0xe1, 0x52, 0x95, 0xc3, 0xf7, 0xeb, 0x04,
- 0x04, 0x7b, 0xa7, 0x28, 0x1b, 0xcc, 0xea, 0x4a, 0x4e, 0x84, 0xda, 0xd8,
- 0x9c, 0x79, 0xd8, 0x9b, 0x66, 0x89, 0x2f, 0xcf, 0xac, 0xd7, 0x79, 0xf9,
- 0xa9, 0xd8, 0x45, 0x13, 0x78, 0xb9, 0x00, 0x14, 0xc9, 0x7e, 0x22, 0x51,
- 0x86, 0x67, 0xb0, 0x9f, 0x26, 0x11, 0x23, 0xc8, 0x38, 0xd7, 0x70, 0x1d,
- 0x15, 0x8e, 0x4d, 0x4f, 0x95, 0x97, 0x40, 0xa1, 0xc2, 0x7e, 0x01, 0x18,
- 0x72, 0xf4, 0x10, 0xe6, 0x8d, 0x52, 0x16, 0x7f, 0xf2, 0xc9, 0xf8, 0x33,
- 0x8b, 0x33, 0xb7, 0xce,
+ 0x17,
+ 0x8f,
+ 0xa8,
+ 0x11,
+ 0x84,
+ 0x92,
+ 0xec,
+ 0x83,
+ 0x47,
+ 0xc7,
+ 0x6a,
+ 0xb0,
+ 0x92,
+ 0xaf,
+ 0x5a,
+ 0x20,
+ 0x37,
+ 0xa3,
+ 0x64,
+ 0x79,
+ 0xd2,
+ 0xd0,
+ 0x3d,
+ 0xcd,
+ 0xe0,
+ 0x61,
+ 0x88,
+ 0x88,
+ 0x21,
+ 0xcc,
+ 0x74,
+ 0x5d,
+ 0xce,
+ 0x4c,
+ 0x51,
+ 0x47,
+ 0xf0,
+ 0xc5,
+ 0x5c,
+ 0x4c,
+ 0x82,
+ 0x7a,
+ 0xaf,
+ 0x72,
+ 0xad,
+ 0xb9,
+ 0xe0,
+ 0x53,
+ 0xf2,
+ 0x78,
+ 0xb7,
+ 0xf0,
+ 0xb5,
+ 0x48,
+ 0x7f,
+ 0x8a,
+ 0x3a,
+ 0x18,
+ 0xd1,
+ 0x9f,
+ 0x8b,
+ 0x7d,
+ 0xa5,
+ 0x47,
+ 0xb7,
+ 0x95,
+ 0xab,
+ 0x98,
+ 0xf8,
+ 0x7b,
+ 0x74,
+ 0x50,
+ 0x56,
+ 0x8e,
+ 0x57,
+ 0xf0,
+ 0xee,
+ 0xf5,
+ 0xb7,
+ 0xba,
+ 0xab,
+ 0x85,
+ 0x86,
+ 0xf9,
+ 0x2b,
+ 0xef,
+ 0x41,
+ 0x56,
+ 0xa0,
+ 0xa4,
+ 0x9f,
+ 0xb7,
+ 0x38,
+ 0x00,
+ 0x46,
+ 0x0a,
+ 0xa6,
+ 0xf1,
+ 0xfc,
+ 0x1f,
+ 0xd8,
+ 0x4e,
+ 0x85,
+ 0x44,
+ 0x92,
+ 0x43,
+ 0x21,
+ 0x5d,
+ 0x6e,
+ 0xcc,
+ 0xc2,
+ 0xcb,
+ 0x26,
+ 0x31,
+ 0x0d,
+ 0x21,
+ 0xc4,
+ 0xbd,
+ 0x8d,
+ 0x24,
+ 0xbc,
+ 0xd9,
+ 0x18,
+ 0x19,
+ 0xd7,
+ 0xdc,
+ 0xf1,
+ 0xe7,
+ 0x93,
+ 0x50,
+ 0x48,
+ 0x03,
+ 0x2c,
+ 0xae,
+ 0x2e,
+ 0xe7,
+ 0x49,
+ 0x88,
+ 0x5f,
+ 0x93,
+ 0x57,
+ 0x27,
+ 0x99,
+ 0x36,
+ 0xb4,
+ 0x20,
+ 0xab,
+ 0xfc,
+ 0xa7,
+ 0x2b,
+ 0xf2,
+ 0xd9,
+ 0x98,
+ 0xd7,
+ 0xd4,
+ 0x34,
+ 0x9d,
+ 0x96,
+ 0x50,
+ 0x58,
+ 0x9a,
+ 0xea,
+ 0x54,
+ 0xf3,
+ 0xee,
+ 0xf5,
+ 0x63,
+ 0x14,
+ 0xee,
+ 0x85,
+ 0x83,
+ 0x74,
+ 0x76,
+ 0xe1,
+ 0x52,
+ 0x95,
+ 0xc3,
+ 0xf7,
+ 0xeb,
+ 0x04,
+ 0x04,
+ 0x7b,
+ 0xa7,
+ 0x28,
+ 0x1b,
+ 0xcc,
+ 0xea,
+ 0x4a,
+ 0x4e,
+ 0x84,
+ 0xda,
+ 0xd8,
+ 0x9c,
+ 0x79,
+ 0xd8,
+ 0x9b,
+ 0x66,
+ 0x89,
+ 0x2f,
+ 0xcf,
+ 0xac,
+ 0xd7,
+ 0x79,
+ 0xf9,
+ 0xa9,
+ 0xd8,
+ 0x45,
+ 0x13,
+ 0x78,
+ 0xb9,
+ 0x00,
+ 0x14,
+ 0xc9,
+ 0x7e,
+ 0x22,
+ 0x51,
+ 0x86,
+ 0x67,
+ 0xb0,
+ 0x9f,
+ 0x26,
+ 0x11,
+ 0x23,
+ 0xc8,
+ 0x38,
+ 0xd7,
+ 0x70,
+ 0x1d,
+ 0x15,
+ 0x8e,
+ 0x4d,
+ 0x4f,
+ 0x95,
+ 0x97,
+ 0x40,
+ 0xa1,
+ 0xc2,
+ 0x7e,
+ 0x01,
+ 0x18,
+ 0x72,
+ 0xf4,
+ 0x10,
+ 0xe6,
+ 0x8d,
+ 0x52,
+ 0x16,
+ 0x7f,
+ 0xf2,
+ 0xc9,
+ 0xf8,
+ 0x33,
+ 0x8b,
+ 0x33,
+ 0xb7,
+ 0xce,
};
static unsigned char dsa2048_p[] = {
- 0xA0, 0x25, 0xFA, 0xAD, 0xF4, 0x8E, 0xB9, 0xE5, 0x99, 0xF3, 0x5D, 0x6F,
- 0x4F, 0x83, 0x34, 0xE2, 0x7E, 0xCF, 0x6F, 0xBF, 0x30, 0xAF, 0x6F, 0x81,
- 0xEB, 0xF8, 0xC4, 0x13, 0xD9, 0xA0, 0x5D, 0x8B, 0x5C, 0x8E, 0xDC, 0xC2,
- 0x1D, 0x0B, 0x41, 0x32, 0xB0, 0x1F, 0xFE, 0xEF, 0x0C, 0xC2, 0xA2, 0x7E,
- 0x68, 0x5C, 0x28, 0x21, 0xE9, 0xF5, 0xB1, 0x58, 0x12, 0x63, 0x4C, 0x19,
- 0x4E, 0xFF, 0x02, 0x4B, 0x92, 0xED, 0xD2, 0x07, 0x11, 0x4D, 0x8C, 0x58,
- 0x16, 0x5C, 0x55, 0x8E, 0xAD, 0xA3, 0x67, 0x7D, 0xB9, 0x86, 0x6E, 0x0B,
- 0xE6, 0x54, 0x6F, 0x40, 0xAE, 0x0E, 0x67, 0x4C, 0xF9, 0x12, 0x5B, 0x3C,
- 0x08, 0x7A, 0xF7, 0xFC, 0x67, 0x86, 0x69, 0xE7, 0x0A, 0x94, 0x40, 0xBF,
- 0x8B, 0x76, 0xFE, 0x26, 0xD1, 0xF2, 0xA1, 0x1A, 0x84, 0xA1, 0x43, 0x56,
- 0x28, 0xBC, 0x9A, 0x5F, 0xD7, 0x3B, 0x69, 0x89, 0x8A, 0x36, 0x2C, 0x51,
- 0xDF, 0x12, 0x77, 0x2F, 0x57, 0x7B, 0xA0, 0xAA, 0xDD, 0x7F, 0xA1, 0x62,
- 0x3B, 0x40, 0x7B, 0x68, 0x1A, 0x8F, 0x0D, 0x38, 0xBB, 0x21, 0x5D, 0x18,
- 0xFC, 0x0F, 0x46, 0xF7, 0xA3, 0xB0, 0x1D, 0x23, 0xC3, 0xD2, 0xC7, 0x72,
- 0x51, 0x18, 0xDF, 0x46, 0x95, 0x79, 0xD9, 0xBD, 0xB5, 0x19, 0x02, 0x2C,
- 0x87, 0xDC, 0xE7, 0x57, 0x82, 0x7E, 0xF1, 0x8B, 0x06, 0x3D, 0x00, 0xA5,
- 0x7B, 0x6B, 0x26, 0x27, 0x91, 0x0F, 0x6A, 0x77, 0xE4, 0xD5, 0x04, 0xE4,
- 0x12, 0x2C, 0x42, 0xFF, 0xD2, 0x88, 0xBB, 0xD3, 0x92, 0xA0, 0xF9, 0xC8,
- 0x51, 0x64, 0x14, 0x5C, 0xD8, 0xF9, 0x6C, 0x47, 0x82, 0xB4, 0x1C, 0x7F,
- 0x09, 0xB8, 0xF0, 0x25, 0x83, 0x1D, 0x3F, 0x3F, 0x05, 0xB3, 0x21, 0x0A,
- 0x5D, 0xA7, 0xD8, 0x54, 0xC3, 0x65, 0x7D, 0xC3, 0xB0, 0x1D, 0xBF, 0xAE,
- 0xF8, 0x68, 0xCF, 0x9B,
+ 0xA0,
+ 0x25,
+ 0xFA,
+ 0xAD,
+ 0xF4,
+ 0x8E,
+ 0xB9,
+ 0xE5,
+ 0x99,
+ 0xF3,
+ 0x5D,
+ 0x6F,
+ 0x4F,
+ 0x83,
+ 0x34,
+ 0xE2,
+ 0x7E,
+ 0xCF,
+ 0x6F,
+ 0xBF,
+ 0x30,
+ 0xAF,
+ 0x6F,
+ 0x81,
+ 0xEB,
+ 0xF8,
+ 0xC4,
+ 0x13,
+ 0xD9,
+ 0xA0,
+ 0x5D,
+ 0x8B,
+ 0x5C,
+ 0x8E,
+ 0xDC,
+ 0xC2,
+ 0x1D,
+ 0x0B,
+ 0x41,
+ 0x32,
+ 0xB0,
+ 0x1F,
+ 0xFE,
+ 0xEF,
+ 0x0C,
+ 0xC2,
+ 0xA2,
+ 0x7E,
+ 0x68,
+ 0x5C,
+ 0x28,
+ 0x21,
+ 0xE9,
+ 0xF5,
+ 0xB1,
+ 0x58,
+ 0x12,
+ 0x63,
+ 0x4C,
+ 0x19,
+ 0x4E,
+ 0xFF,
+ 0x02,
+ 0x4B,
+ 0x92,
+ 0xED,
+ 0xD2,
+ 0x07,
+ 0x11,
+ 0x4D,
+ 0x8C,
+ 0x58,
+ 0x16,
+ 0x5C,
+ 0x55,
+ 0x8E,
+ 0xAD,
+ 0xA3,
+ 0x67,
+ 0x7D,
+ 0xB9,
+ 0x86,
+ 0x6E,
+ 0x0B,
+ 0xE6,
+ 0x54,
+ 0x6F,
+ 0x40,
+ 0xAE,
+ 0x0E,
+ 0x67,
+ 0x4C,
+ 0xF9,
+ 0x12,
+ 0x5B,
+ 0x3C,
+ 0x08,
+ 0x7A,
+ 0xF7,
+ 0xFC,
+ 0x67,
+ 0x86,
+ 0x69,
+ 0xE7,
+ 0x0A,
+ 0x94,
+ 0x40,
+ 0xBF,
+ 0x8B,
+ 0x76,
+ 0xFE,
+ 0x26,
+ 0xD1,
+ 0xF2,
+ 0xA1,
+ 0x1A,
+ 0x84,
+ 0xA1,
+ 0x43,
+ 0x56,
+ 0x28,
+ 0xBC,
+ 0x9A,
+ 0x5F,
+ 0xD7,
+ 0x3B,
+ 0x69,
+ 0x89,
+ 0x8A,
+ 0x36,
+ 0x2C,
+ 0x51,
+ 0xDF,
+ 0x12,
+ 0x77,
+ 0x2F,
+ 0x57,
+ 0x7B,
+ 0xA0,
+ 0xAA,
+ 0xDD,
+ 0x7F,
+ 0xA1,
+ 0x62,
+ 0x3B,
+ 0x40,
+ 0x7B,
+ 0x68,
+ 0x1A,
+ 0x8F,
+ 0x0D,
+ 0x38,
+ 0xBB,
+ 0x21,
+ 0x5D,
+ 0x18,
+ 0xFC,
+ 0x0F,
+ 0x46,
+ 0xF7,
+ 0xA3,
+ 0xB0,
+ 0x1D,
+ 0x23,
+ 0xC3,
+ 0xD2,
+ 0xC7,
+ 0x72,
+ 0x51,
+ 0x18,
+ 0xDF,
+ 0x46,
+ 0x95,
+ 0x79,
+ 0xD9,
+ 0xBD,
+ 0xB5,
+ 0x19,
+ 0x02,
+ 0x2C,
+ 0x87,
+ 0xDC,
+ 0xE7,
+ 0x57,
+ 0x82,
+ 0x7E,
+ 0xF1,
+ 0x8B,
+ 0x06,
+ 0x3D,
+ 0x00,
+ 0xA5,
+ 0x7B,
+ 0x6B,
+ 0x26,
+ 0x27,
+ 0x91,
+ 0x0F,
+ 0x6A,
+ 0x77,
+ 0xE4,
+ 0xD5,
+ 0x04,
+ 0xE4,
+ 0x12,
+ 0x2C,
+ 0x42,
+ 0xFF,
+ 0xD2,
+ 0x88,
+ 0xBB,
+ 0xD3,
+ 0x92,
+ 0xA0,
+ 0xF9,
+ 0xC8,
+ 0x51,
+ 0x64,
+ 0x14,
+ 0x5C,
+ 0xD8,
+ 0xF9,
+ 0x6C,
+ 0x47,
+ 0x82,
+ 0xB4,
+ 0x1C,
+ 0x7F,
+ 0x09,
+ 0xB8,
+ 0xF0,
+ 0x25,
+ 0x83,
+ 0x1D,
+ 0x3F,
+ 0x3F,
+ 0x05,
+ 0xB3,
+ 0x21,
+ 0x0A,
+ 0x5D,
+ 0xA7,
+ 0xD8,
+ 0x54,
+ 0xC3,
+ 0x65,
+ 0x7D,
+ 0xC3,
+ 0xB0,
+ 0x1D,
+ 0xBF,
+ 0xAE,
+ 0xF8,
+ 0x68,
+ 0xCF,
+ 0x9B,
};
static unsigned char dsa2048_q[] = {
- 0x97, 0xE7, 0x33, 0x4D, 0xD3, 0x94, 0x3E, 0x0B, 0xDB, 0x62, 0x74, 0xC6,
- 0xA1, 0x08, 0xDD, 0x19, 0xA3, 0x75, 0x17, 0x1B,
+ 0x97,
+ 0xE7,
+ 0x33,
+ 0x4D,
+ 0xD3,
+ 0x94,
+ 0x3E,
+ 0x0B,
+ 0xDB,
+ 0x62,
+ 0x74,
+ 0xC6,
+ 0xA1,
+ 0x08,
+ 0xDD,
+ 0x19,
+ 0xA3,
+ 0x75,
+ 0x17,
+ 0x1B,
};
static unsigned char dsa2048_g[] = {
- 0x2C, 0x78, 0x16, 0x59, 0x34, 0x63, 0xF4, 0xF3, 0x92, 0xFC, 0xB5, 0xA5,
- 0x4F, 0x13, 0xDE, 0x2F, 0x1C, 0xA4, 0x3C, 0xAE, 0xAD, 0x38, 0x3F, 0x7E,
- 0x90, 0xBF, 0x96, 0xA6, 0xAE, 0x25, 0x90, 0x72, 0xF5, 0x8E, 0x80, 0x0C,
- 0x39, 0x1C, 0xD9, 0xEC, 0xBA, 0x90, 0x5B, 0x3A, 0xE8, 0x58, 0x6C, 0x9E,
- 0x30, 0x42, 0x37, 0x02, 0x31, 0x82, 0xBC, 0x6A, 0xDF, 0x6A, 0x09, 0x29,
- 0xE3, 0xC0, 0x46, 0xD1, 0xCB, 0x85, 0xEC, 0x0C, 0x30, 0x5E, 0xEA, 0xC8,
- 0x39, 0x8E, 0x22, 0x9F, 0x22, 0x10, 0xD2, 0x34, 0x61, 0x68, 0x37, 0x3D,
- 0x2E, 0x4A, 0x5B, 0x9A, 0xF5, 0xC1, 0x48, 0xC6, 0xF6, 0xDC, 0x63, 0x1A,
- 0xD3, 0x96, 0x64, 0xBA, 0x34, 0xC9, 0xD1, 0xA0, 0xD1, 0xAE, 0x6C, 0x2F,
- 0x48, 0x17, 0x93, 0x14, 0x43, 0xED, 0xF0, 0x21, 0x30, 0x19, 0xC3, 0x1B,
- 0x5F, 0xDE, 0xA3, 0xF0, 0x70, 0x78, 0x18, 0xE1, 0xA8, 0xE4, 0xEE, 0x2E,
- 0x00, 0xA5, 0xE4, 0xB3, 0x17, 0xC8, 0x0C, 0x7D, 0x6E, 0x42, 0xDC, 0xB7,
- 0x46, 0x00, 0x36, 0x4D, 0xD4, 0x46, 0xAA, 0x3D, 0x3C, 0x46, 0x89, 0x40,
- 0xBF, 0x1D, 0x84, 0x77, 0x0A, 0x75, 0xF3, 0x87, 0x1D, 0x08, 0x4C, 0xA6,
- 0xD1, 0xA9, 0x1C, 0x1E, 0x12, 0x1E, 0xE1, 0xC7, 0x30, 0x28, 0x76, 0xA5,
- 0x7F, 0x6C, 0x85, 0x96, 0x2B, 0x6F, 0xDB, 0x80, 0x66, 0x26, 0xAE, 0xF5,
- 0x93, 0xC7, 0x8E, 0xAE, 0x9A, 0xED, 0xE4, 0xCA, 0x04, 0xEA, 0x3B, 0x72,
- 0xEF, 0xDC, 0x87, 0xED, 0x0D, 0xA5, 0x4C, 0x4A, 0xDD, 0x71, 0x22, 0x64,
- 0x59, 0x69, 0x4E, 0x8E, 0xBF, 0x43, 0xDC, 0xAB, 0x8E, 0x66, 0xBB, 0x01,
- 0xB6, 0xF4, 0xE7, 0xFD, 0xD2, 0xAD, 0x9F, 0x36, 0xC1, 0xA0, 0x29, 0x99,
- 0xD1, 0x96, 0x70, 0x59, 0x06, 0x78, 0x35, 0xBD, 0x65, 0x55, 0x52, 0x9E,
- 0xF8, 0xB2, 0xE5, 0x38,
+ 0x2C,
+ 0x78,
+ 0x16,
+ 0x59,
+ 0x34,
+ 0x63,
+ 0xF4,
+ 0xF3,
+ 0x92,
+ 0xFC,
+ 0xB5,
+ 0xA5,
+ 0x4F,
+ 0x13,
+ 0xDE,
+ 0x2F,
+ 0x1C,
+ 0xA4,
+ 0x3C,
+ 0xAE,
+ 0xAD,
+ 0x38,
+ 0x3F,
+ 0x7E,
+ 0x90,
+ 0xBF,
+ 0x96,
+ 0xA6,
+ 0xAE,
+ 0x25,
+ 0x90,
+ 0x72,
+ 0xF5,
+ 0x8E,
+ 0x80,
+ 0x0C,
+ 0x39,
+ 0x1C,
+ 0xD9,
+ 0xEC,
+ 0xBA,
+ 0x90,
+ 0x5B,
+ 0x3A,
+ 0xE8,
+ 0x58,
+ 0x6C,
+ 0x9E,
+ 0x30,
+ 0x42,
+ 0x37,
+ 0x02,
+ 0x31,
+ 0x82,
+ 0xBC,
+ 0x6A,
+ 0xDF,
+ 0x6A,
+ 0x09,
+ 0x29,
+ 0xE3,
+ 0xC0,
+ 0x46,
+ 0xD1,
+ 0xCB,
+ 0x85,
+ 0xEC,
+ 0x0C,
+ 0x30,
+ 0x5E,
+ 0xEA,
+ 0xC8,
+ 0x39,
+ 0x8E,
+ 0x22,
+ 0x9F,
+ 0x22,
+ 0x10,
+ 0xD2,
+ 0x34,
+ 0x61,
+ 0x68,
+ 0x37,
+ 0x3D,
+ 0x2E,
+ 0x4A,
+ 0x5B,
+ 0x9A,
+ 0xF5,
+ 0xC1,
+ 0x48,
+ 0xC6,
+ 0xF6,
+ 0xDC,
+ 0x63,
+ 0x1A,
+ 0xD3,
+ 0x96,
+ 0x64,
+ 0xBA,
+ 0x34,
+ 0xC9,
+ 0xD1,
+ 0xA0,
+ 0xD1,
+ 0xAE,
+ 0x6C,
+ 0x2F,
+ 0x48,
+ 0x17,
+ 0x93,
+ 0x14,
+ 0x43,
+ 0xED,
+ 0xF0,
+ 0x21,
+ 0x30,
+ 0x19,
+ 0xC3,
+ 0x1B,
+ 0x5F,
+ 0xDE,
+ 0xA3,
+ 0xF0,
+ 0x70,
+ 0x78,
+ 0x18,
+ 0xE1,
+ 0xA8,
+ 0xE4,
+ 0xEE,
+ 0x2E,
+ 0x00,
+ 0xA5,
+ 0xE4,
+ 0xB3,
+ 0x17,
+ 0xC8,
+ 0x0C,
+ 0x7D,
+ 0x6E,
+ 0x42,
+ 0xDC,
+ 0xB7,
+ 0x46,
+ 0x00,
+ 0x36,
+ 0x4D,
+ 0xD4,
+ 0x46,
+ 0xAA,
+ 0x3D,
+ 0x3C,
+ 0x46,
+ 0x89,
+ 0x40,
+ 0xBF,
+ 0x1D,
+ 0x84,
+ 0x77,
+ 0x0A,
+ 0x75,
+ 0xF3,
+ 0x87,
+ 0x1D,
+ 0x08,
+ 0x4C,
+ 0xA6,
+ 0xD1,
+ 0xA9,
+ 0x1C,
+ 0x1E,
+ 0x12,
+ 0x1E,
+ 0xE1,
+ 0xC7,
+ 0x30,
+ 0x28,
+ 0x76,
+ 0xA5,
+ 0x7F,
+ 0x6C,
+ 0x85,
+ 0x96,
+ 0x2B,
+ 0x6F,
+ 0xDB,
+ 0x80,
+ 0x66,
+ 0x26,
+ 0xAE,
+ 0xF5,
+ 0x93,
+ 0xC7,
+ 0x8E,
+ 0xAE,
+ 0x9A,
+ 0xED,
+ 0xE4,
+ 0xCA,
+ 0x04,
+ 0xEA,
+ 0x3B,
+ 0x72,
+ 0xEF,
+ 0xDC,
+ 0x87,
+ 0xED,
+ 0x0D,
+ 0xA5,
+ 0x4C,
+ 0x4A,
+ 0xDD,
+ 0x71,
+ 0x22,
+ 0x64,
+ 0x59,
+ 0x69,
+ 0x4E,
+ 0x8E,
+ 0xBF,
+ 0x43,
+ 0xDC,
+ 0xAB,
+ 0x8E,
+ 0x66,
+ 0xBB,
+ 0x01,
+ 0xB6,
+ 0xF4,
+ 0xE7,
+ 0xFD,
+ 0xD2,
+ 0xAD,
+ 0x9F,
+ 0x36,
+ 0xC1,
+ 0xA0,
+ 0x29,
+ 0x99,
+ 0xD1,
+ 0x96,
+ 0x70,
+ 0x59,
+ 0x06,
+ 0x78,
+ 0x35,
+ 0xBD,
+ 0x65,
+ 0x55,
+ 0x52,
+ 0x9E,
+ 0xF8,
+ 0xB2,
+ 0xE5,
+ 0x38,
};
typedef struct testdsa_st {
@@ -199,18 +1418,18 @@ typedef struct testdsa_st {
int q_l;
} testdsa;
-#define set_dsa_ptr(st, bits) \
- do { \
- st.priv = dsa##bits##_priv; \
- st.pub = dsa##bits##_pub; \
- st.p = dsa##bits##_p; \
- st.g = dsa##bits##_g; \
- st.q = dsa##bits##_q; \
+#define set_dsa_ptr(st, bits) \
+ do { \
+ st.priv = dsa##bits##_priv; \
+ st.pub = dsa##bits##_pub; \
+ st.p = dsa##bits##_p; \
+ st.g = dsa##bits##_g; \
+ st.q = dsa##bits##_q; \
st.priv_l = sizeof(dsa##bits##_priv); \
- st.pub_l = sizeof(dsa##bits##_pub); \
- st.p_l = sizeof(dsa##bits##_p); \
- st.g_l = sizeof(dsa##bits##_g); \
- st.q_l = sizeof(dsa##bits##_q); \
+ st.pub_l = sizeof(dsa##bits##_pub); \
+ st.p_l = sizeof(dsa##bits##_p); \
+ st.g_l = sizeof(dsa##bits##_g); \
+ st.q_l = sizeof(dsa##bits##_q); \
} while (0)
EVP_PKEY *get_dsa(int dsa_bits)
@@ -250,21 +1469,22 @@ EVP_PKEY *get_dsa(int dsa_bits)
}
if ((tmpl = OSSL_PARAM_BLD_new()) == NULL
|| !OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_FFC_P,
- p)
+ p)
|| !OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_FFC_Q,
- q)
+ q)
|| !OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_FFC_G,
- g)
+ g)
|| !OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_PRIV_KEY,
- priv_key)
+ priv_key)
|| !OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_PUB_KEY,
- pub_key)
+ pub_key)
|| (params = OSSL_PARAM_BLD_to_param(tmpl)) == NULL)
goto err;
if (EVP_PKEY_fromdata_init(pctx) <= 0
|| EVP_PKEY_fromdata(pctx, &pkey, EVP_PKEY_KEYPAIR,
- params) <= 0)
+ params)
+ <= 0)
pkey = NULL;
err:
OSSL_PARAM_free(params);
diff --git a/apps/testrsa.h b/apps/testrsa.h
index 8c3a967414..db9221e8aa 100644
--- a/apps/testrsa.h
+++ b/apps/testrsa.h
@@ -8,224 +8,2128 @@
*/
static unsigned char test512[] = {
- 0x30, 0x82, 0x01, 0x3a, 0x02, 0x01, 0x00, 0x02, 0x41, 0x00,
- 0xd6, 0x33, 0xb9, 0xc8, 0xfb, 0x4f, 0x3c, 0x7d, 0xc0, 0x01,
- 0x86, 0xd0, 0xe7, 0xa0, 0x55, 0xf2, 0x95, 0x93, 0xcc, 0x4f,
- 0xb7, 0x5b, 0x67, 0x5b, 0x94, 0x68, 0xc9, 0x34, 0x15, 0xde,
- 0xa5, 0x2e, 0x1c, 0x33, 0xc2, 0x6e, 0xfc, 0x34, 0x5e, 0x71,
- 0x13, 0xb7, 0xd6, 0xee, 0xd8, 0xa5, 0x65, 0x05, 0x72, 0x87,
- 0xa8, 0xb0, 0x77, 0xfe, 0x57, 0xf5, 0xfc, 0x5f, 0x55, 0x83,
- 0x87, 0xdd, 0x57, 0x49, 0x02, 0x03, 0x01, 0x00, 0x01, 0x02,
- 0x41, 0x00, 0xa7, 0xf7, 0x91, 0xc5, 0x0f, 0x84, 0x57, 0xdc,
- 0x07, 0xf7, 0x6a, 0x7f, 0x60, 0x52, 0xb3, 0x72, 0xf1, 0x66,
- 0x1f, 0x7d, 0x97, 0x3b, 0x9e, 0xb6, 0x0a, 0x8f, 0x8c, 0xcf,
- 0x42, 0x23, 0x00, 0x04, 0xd4, 0x28, 0x0e, 0x1c, 0x90, 0xc4,
- 0x11, 0x25, 0x25, 0xa5, 0x93, 0xa5, 0x2f, 0x70, 0x02, 0xdf,
- 0x81, 0x9c, 0x49, 0x03, 0xa0, 0xf8, 0x6d, 0x54, 0x2e, 0x26,
- 0xde, 0xaa, 0x85, 0x59, 0xa8, 0x31, 0x02, 0x21, 0x00, 0xeb,
- 0x47, 0xd7, 0x3b, 0xf6, 0xc3, 0xdd, 0x5a, 0x46, 0xc5, 0xb9,
- 0x2b, 0x9a, 0xa0, 0x09, 0x8f, 0xa6, 0xfb, 0xf3, 0x78, 0x7a,
- 0x33, 0x70, 0x9d, 0x0f, 0x42, 0x6b, 0x13, 0x68, 0x24, 0xd3,
- 0x15, 0x02, 0x21, 0x00, 0xe9, 0x10, 0xb0, 0xb3, 0x0d, 0xe2,
- 0x82, 0x68, 0x77, 0x8a, 0x6e, 0x7c, 0xda, 0xbc, 0x3e, 0x53,
- 0x83, 0xfb, 0xd6, 0x22, 0xe7, 0xb5, 0xae, 0x6e, 0x80, 0xda,
- 0x00, 0x55, 0x97, 0xc1, 0xd0, 0x65, 0x02, 0x20, 0x4c, 0xf8,
- 0x73, 0xb1, 0x6a, 0x49, 0x29, 0x61, 0x1f, 0x46, 0x10, 0x0d,
- 0xf3, 0xc7, 0xe7, 0x58, 0xd7, 0x88, 0x15, 0x5e, 0x94, 0x9b,
- 0xbf, 0x7b, 0xa2, 0x42, 0x58, 0x45, 0x41, 0x0c, 0xcb, 0x01,
- 0x02, 0x20, 0x12, 0x11, 0xba, 0x31, 0x57, 0x9d, 0x3d, 0x11,
- 0x0e, 0x5b, 0x8c, 0x2f, 0x5f, 0xe2, 0x02, 0x4f, 0x05, 0x47,
- 0x8c, 0x15, 0x8e, 0xb3, 0x56, 0x3f, 0xb8, 0xfb, 0xad, 0xd4,
- 0xf4, 0xfc, 0x10, 0xc5, 0x02, 0x20, 0x18, 0xa1, 0x29, 0x99,
- 0x5b, 0xd9, 0xc8, 0xd4, 0xfc, 0x49, 0x7a, 0x2a, 0x21, 0x2c,
- 0x49, 0xe4, 0x4f, 0xeb, 0xef, 0x51, 0xf1, 0xab, 0x6d, 0xfb,
- 0x4b, 0x14, 0xe9, 0x4b, 0x52, 0xb5, 0x82, 0x2c,
+ 0x30,
+ 0x82,
+ 0x01,
+ 0x3a,
+ 0x02,
+ 0x01,
+ 0x00,
+ 0x02,
+ 0x41,
+ 0x00,
+ 0xd6,
+ 0x33,
+ 0xb9,
+ 0xc8,
+ 0xfb,
+ 0x4f,
+ 0x3c,
+ 0x7d,
+ 0xc0,
+ 0x01,
+ 0x86,
+ 0xd0,
+ 0xe7,
+ 0xa0,
+ 0x55,
+ 0xf2,
+ 0x95,
+ 0x93,
+ 0xcc,
+ 0x4f,
+ 0xb7,
+ 0x5b,
+ 0x67,
+ 0x5b,
+ 0x94,
+ 0x68,
+ 0xc9,
+ 0x34,
+ 0x15,
+ 0xde,
+ 0xa5,
+ 0x2e,
+ 0x1c,
+ 0x33,
+ 0xc2,
+ 0x6e,
+ 0xfc,
+ 0x34,
+ 0x5e,
+ 0x71,
+ 0x13,
+ 0xb7,
+ 0xd6,
+ 0xee,
+ 0xd8,
+ 0xa5,
+ 0x65,
+ 0x05,
+ 0x72,
+ 0x87,
+ 0xa8,
+ 0xb0,
+ 0x77,
+ 0xfe,
+ 0x57,
+ 0xf5,
+ 0xfc,
+ 0x5f,
+ 0x55,
+ 0x83,
+ 0x87,
+ 0xdd,
+ 0x57,
+ 0x49,
+ 0x02,
+ 0x03,
+ 0x01,
+ 0x00,
+ 0x01,
+ 0x02,
+ 0x41,
+ 0x00,
+ 0xa7,
+ 0xf7,
+ 0x91,
+ 0xc5,
+ 0x0f,
+ 0x84,
+ 0x57,
+ 0xdc,
+ 0x07,
+ 0xf7,
+ 0x6a,
+ 0x7f,
+ 0x60,
+ 0x52,
+ 0xb3,
+ 0x72,
+ 0xf1,
+ 0x66,
+ 0x1f,
+ 0x7d,
+ 0x97,
+ 0x3b,
+ 0x9e,
+ 0xb6,
+ 0x0a,
+ 0x8f,
+ 0x8c,
+ 0xcf,
+ 0x42,
+ 0x23,
+ 0x00,
+ 0x04,
+ 0xd4,
+ 0x28,
+ 0x0e,
+ 0x1c,
+ 0x90,
+ 0xc4,
+ 0x11,
+ 0x25,
+ 0x25,
+ 0xa5,
+ 0x93,
+ 0xa5,
+ 0x2f,
+ 0x70,
+ 0x02,
+ 0xdf,
+ 0x81,
+ 0x9c,
+ 0x49,
+ 0x03,
+ 0xa0,
+ 0xf8,
+ 0x6d,
+ 0x54,
+ 0x2e,
+ 0x26,
+ 0xde,
+ 0xaa,
+ 0x85,
+ 0x59,
+ 0xa8,
+ 0x31,
+ 0x02,
+ 0x21,
+ 0x00,
+ 0xeb,
+ 0x47,
+ 0xd7,
+ 0x3b,
+ 0xf6,
+ 0xc3,
+ 0xdd,
+ 0x5a,
+ 0x46,
+ 0xc5,
+ 0xb9,
+ 0x2b,
+ 0x9a,
+ 0xa0,
+ 0x09,
+ 0x8f,
+ 0xa6,
+ 0xfb,
+ 0xf3,
+ 0x78,
+ 0x7a,
+ 0x33,
+ 0x70,
+ 0x9d,
+ 0x0f,
+ 0x42,
+ 0x6b,
+ 0x13,
+ 0x68,
+ 0x24,
+ 0xd3,
+ 0x15,
+ 0x02,
+ 0x21,
+ 0x00,
+ 0xe9,
+ 0x10,
+ 0xb0,
+ 0xb3,
+ 0x0d,
+ 0xe2,
+ 0x82,
+ 0x68,
+ 0x77,
+ 0x8a,
+ 0x6e,
+ 0x7c,
+ 0xda,
+ 0xbc,
+ 0x3e,
+ 0x53,
+ 0x83,
+ 0xfb,
+ 0xd6,
+ 0x22,
+ 0xe7,
+ 0xb5,
+ 0xae,
+ 0x6e,
+ 0x80,
+ 0xda,
+ 0x00,
+ 0x55,
+ 0x97,
+ 0xc1,
+ 0xd0,
+ 0x65,
+ 0x02,
+ 0x20,
+ 0x4c,
+ 0xf8,
+ 0x73,
+ 0xb1,
+ 0x6a,
+ 0x49,
+ 0x29,
+ 0x61,
+ 0x1f,
+ 0x46,
+ 0x10,
+ 0x0d,
+ 0xf3,
+ 0xc7,
+ 0xe7,
+ 0x58,
+ 0xd7,
+ 0x88,
+ 0x15,
+ 0x5e,
+ 0x94,
+ 0x9b,
+ 0xbf,
+ 0x7b,
+ 0xa2,
+ 0x42,
+ 0x58,
+ 0x45,
+ 0x41,
+ 0x0c,
+ 0xcb,
+ 0x01,
+ 0x02,
+ 0x20,
+ 0x12,
+ 0x11,
+ 0xba,
+ 0x31,
+ 0x57,
+ 0x9d,
+ 0x3d,
+ 0x11,
+ 0x0e,
+ 0x5b,
+ 0x8c,
+ 0x2f,
+ 0x5f,
+ 0xe2,
+ 0x02,
+ 0x4f,
+ 0x05,
+ 0x47,
+ 0x8c,
+ 0x15,
+ 0x8e,
+ 0xb3,
+ 0x56,
+ 0x3f,
+ 0xb8,
+ 0xfb,
+ 0xad,
+ 0xd4,
+ 0xf4,
+ 0xfc,
+ 0x10,
+ 0xc5,
+ 0x02,
+ 0x20,
+ 0x18,
+ 0xa1,
+ 0x29,
+ 0x99,
+ 0x5b,
+ 0xd9,
+ 0xc8,
+ 0xd4,
+ 0xfc,
+ 0x49,
+ 0x7a,
+ 0x2a,
+ 0x21,
+ 0x2c,
+ 0x49,
+ 0xe4,
+ 0x4f,
+ 0xeb,
+ 0xef,
+ 0x51,
+ 0xf1,
+ 0xab,
+ 0x6d,
+ 0xfb,
+ 0x4b,
+ 0x14,
+ 0xe9,
+ 0x4b,
+ 0x52,
+ 0xb5,
+ 0x82,
+ 0x2c,
};
static unsigned char test1024[] = {
- 0x30, 0x82, 0x02, 0x5c, 0x02, 0x01, 0x00, 0x02, 0x81, 0x81,
- 0x00, 0xdc, 0x98, 0x43, 0xe8, 0x3d, 0x43, 0x5b, 0xe4, 0x05,
- 0xcd, 0xd0, 0xa9, 0x3e, 0xcb, 0x83, 0x75, 0xf6, 0xb5, 0xa5,
- 0x9f, 0x6b, 0xe9, 0x34, 0x41, 0x29, 0x18, 0xfa, 0x6a, 0x55,
- 0x4d, 0x70, 0xfc, 0xec, 0xae, 0x87, 0x38, 0x0a, 0x20, 0xa9,
- 0xc0, 0x45, 0x77, 0x6e, 0x57, 0x60, 0x57, 0xf4, 0xed, 0x96,
- 0x22, 0xcb, 0x8f, 0xe1, 0x33, 0x3a, 0x17, 0x1f, 0xed, 0x37,
- 0xa5, 0x6f, 0xeb, 0xa6, 0xbc, 0x12, 0x80, 0x1d, 0x53, 0xbd,
- 0x70, 0xeb, 0x21, 0x76, 0x3e, 0xc9, 0x2f, 0x1a, 0x45, 0x24,
- 0x82, 0xff, 0xcd, 0x59, 0x32, 0x06, 0x2e, 0x12, 0x3b, 0x23,
- 0x78, 0xed, 0x12, 0x3d, 0xe0, 0x8d, 0xf9, 0x67, 0x4f, 0x37,
- 0x4e, 0x47, 0x02, 0x4c, 0x2d, 0xc0, 0x4f, 0x1f, 0xb3, 0x94,
- 0xe1, 0x41, 0x2e, 0x2d, 0x90, 0x10, 0xfc, 0x82, 0x91, 0x8b,
- 0x0f, 0x22, 0xd4, 0xf2, 0xfc, 0x2c, 0xab, 0x53, 0x55, 0x02,
- 0x03, 0x01, 0x00, 0x01, 0x02, 0x81, 0x80, 0x2b, 0xcc, 0x3f,
- 0x8f, 0x58, 0xba, 0x8b, 0x00, 0x16, 0xf6, 0xea, 0x3a, 0xf0,
- 0x30, 0xd0, 0x05, 0x17, 0xda, 0xb0, 0xeb, 0x9a, 0x2d, 0x4f,
- 0x26, 0xb0, 0xd6, 0x38, 0xc1, 0xeb, 0xf5, 0xd8, 0x3d, 0x1f,
- 0x70, 0xf7, 0x7f, 0xf4, 0xe2, 0xcf, 0x51, 0x51, 0x79, 0x88,
- 0xfa, 0xe8, 0x32, 0x0e, 0x7b, 0x2d, 0x97, 0xf2, 0xfa, 0xba,
- 0x27, 0xc5, 0x9c, 0xd9, 0xc5, 0xeb, 0x8a, 0x79, 0x52, 0x3c,
- 0x64, 0x34, 0x7d, 0xc2, 0xcf, 0x28, 0xc7, 0x4e, 0xd5, 0x43,
- 0x0b, 0xd1, 0xa6, 0xca, 0x6d, 0x03, 0x2d, 0x72, 0x23, 0xbc,
- 0x6d, 0x05, 0xfa, 0x16, 0x09, 0x2f, 0x2e, 0x5c, 0xb6, 0xee,
- 0x74, 0xdd, 0xd2, 0x48, 0x8e, 0x36, 0x0c, 0x06, 0x3d, 0x4d,
- 0xe5, 0x10, 0x82, 0xeb, 0x6a, 0xf3, 0x4b, 0x9f, 0xd6, 0xed,
- 0x11, 0xb1, 0x6e, 0xec, 0xf4, 0xfe, 0x8e, 0x75, 0x94, 0x20,
- 0x2f, 0xcb, 0xac, 0x46, 0xf1, 0x02, 0x41, 0x00, 0xf9, 0x8c,
- 0xa3, 0x85, 0xb1, 0xdd, 0x29, 0xaf, 0x65, 0xc1, 0x33, 0xf3,
- 0x95, 0xc5, 0x52, 0x68, 0x0b, 0xd4, 0xf1, 0xe5, 0x0e, 0x02,
- 0x9f, 0x4f, 0xfa, 0x77, 0xdc, 0x46, 0x9e, 0xc7, 0xa6, 0xe4,
- 0x16, 0x29, 0xda, 0xb0, 0x07, 0xcf, 0x5b, 0xa9, 0x12, 0x8a,
- 0xdd, 0x63, 0x0a, 0xde, 0x2e, 0x8c, 0x66, 0x8b, 0x8c, 0xdc,
- 0x19, 0xa3, 0x7e, 0xf4, 0x3b, 0xd0, 0x1a, 0x8c, 0xa4, 0xc2,
- 0xe1, 0xd3, 0x02, 0x41, 0x00, 0xe2, 0x4c, 0x05, 0xf2, 0x04,
- 0x86, 0x4e, 0x61, 0x43, 0xdb, 0xb0, 0xb9, 0x96, 0x86, 0x52,
- 0x2c, 0xca, 0x8d, 0x7b, 0xab, 0x0b, 0x13, 0x0d, 0x7e, 0x38,
- 0x5b, 0xe2, 0x2e, 0x7b, 0x0e, 0xe7, 0x19, 0x99, 0x38, 0xe7,
- 0xf2, 0x21, 0xbd, 0x85, 0x85, 0xe3, 0xfd, 0x28, 0x77, 0x20,
- 0x31, 0x71, 0x2c, 0xd0, 0xff, 0xfb, 0x2e, 0xaf, 0x85, 0xb4,
- 0x86, 0xca, 0xf3, 0xbb, 0xca, 0xaa, 0x0f, 0x95, 0x37, 0x02,
- 0x40, 0x0e, 0x41, 0x9a, 0x95, 0xe8, 0xb3, 0x59, 0xce, 0x4b,
- 0x61, 0xde, 0x35, 0xec, 0x38, 0x79, 0x9c, 0xb8, 0x10, 0x52,
- 0x41, 0x63, 0xab, 0x82, 0xae, 0x6f, 0x00, 0xa9, 0xf4, 0xde,
- 0xdd, 0x49, 0x0b, 0x7e, 0xb8, 0xa5, 0x65, 0xa9, 0x0c, 0x8f,
- 0x8f, 0xf9, 0x1f, 0x35, 0xc6, 0x92, 0xb8, 0x5e, 0xb0, 0x66,
- 0xab, 0x52, 0x40, 0xc0, 0xb6, 0x36, 0x6a, 0x7d, 0x80, 0x46,
- 0x04, 0x02, 0xe5, 0x9f, 0x41, 0x02, 0x41, 0x00, 0xc0, 0xad,
- 0xcc, 0x4e, 0x21, 0xee, 0x1d, 0x24, 0x91, 0xfb, 0xa7, 0x80,
- 0x8d, 0x9a, 0xb6, 0xb3, 0x2e, 0x8f, 0xc2, 0xe1, 0x82, 0xdf,
- 0x69, 0x18, 0xb4, 0x71, 0xff, 0xa6, 0x65, 0xde, 0xed, 0x84,
- 0x8d, 0x42, 0xb7, 0xb3, 0x21, 0x69, 0x56, 0x1c, 0x07, 0x60,
- 0x51, 0x29, 0x04, 0xff, 0x34, 0x06, 0xdd, 0xb9, 0x67, 0x2c,
- 0x7c, 0x04, 0x93, 0x0e, 0x46, 0x15, 0xbb, 0x2a, 0xb7, 0x1b,
- 0xe7, 0x87, 0x02, 0x40, 0x78, 0xda, 0x5d, 0x07, 0x51, 0x0c,
- 0x16, 0x7a, 0x9f, 0x29, 0x20, 0x84, 0x0d, 0x42, 0xfa, 0xd7,
- 0x00, 0xd8, 0x77, 0x7e, 0xb0, 0xb0, 0x6b, 0xd6, 0x5b, 0x53,
- 0xb8, 0x9b, 0x7a, 0xcd, 0xc7, 0x2b, 0xb8, 0x6a, 0x63, 0xa9,
- 0xfb, 0x6f, 0xa4, 0x72, 0xbf, 0x4c, 0x5d, 0x00, 0x14, 0xba,
- 0xfa, 0x59, 0x88, 0xed, 0xe4, 0xe0, 0x8c, 0xa2, 0xec, 0x14,
- 0x7e, 0x2d, 0xe2, 0xf0, 0x46, 0x49, 0x95, 0x45,
+ 0x30,
+ 0x82,
+ 0x02,
+ 0x5c,
+ 0x02,
+ 0x01,
+ 0x00,
+ 0x02,
+ 0x81,
+ 0x81,
+ 0x00,
+ 0xdc,
+ 0x98,
+ 0x43,
+ 0xe8,
+ 0x3d,
+ 0x43,
+ 0x5b,
+ 0xe4,
+ 0x05,
+ 0xcd,
+ 0xd0,
+ 0xa9,
+ 0x3e,
+ 0xcb,
+ 0x83,
+ 0x75,
+ 0xf6,
+ 0xb5,
+ 0xa5,
+ 0x9f,
+ 0x6b,
+ 0xe9,
+ 0x34,
+ 0x41,
+ 0x29,
+ 0x18,
+ 0xfa,
+ 0x6a,
+ 0x55,
+ 0x4d,
+ 0x70,
+ 0xfc,
+ 0xec,
+ 0xae,
+ 0x87,
+ 0x38,
+ 0x0a,
+ 0x20,
+ 0xa9,
+ 0xc0,
+ 0x45,
+ 0x77,
+ 0x6e,
+ 0x57,
+ 0x60,
+ 0x57,
+ 0xf4,
+ 0xed,
+ 0x96,
+ 0x22,
+ 0xcb,
+ 0x8f,
+ 0xe1,
+ 0x33,
+ 0x3a,
+ 0x17,
+ 0x1f,
+ 0xed,
+ 0x37,
+ 0xa5,
+ 0x6f,
+ 0xeb,
+ 0xa6,
+ 0xbc,
+ 0x12,
+ 0x80,
+ 0x1d,
+ 0x53,
+ 0xbd,
+ 0x70,
+ 0xeb,
+ 0x21,
+ 0x76,
+ 0x3e,
+ 0xc9,
+ 0x2f,
+ 0x1a,
+ 0x45,
+ 0x24,
+ 0x82,
+ 0xff,
+ 0xcd,
+ 0x59,
+ 0x32,
+ 0x06,
+ 0x2e,
+ 0x12,
+ 0x3b,
+ 0x23,
+ 0x78,
+ 0xed,
+ 0x12,
+ 0x3d,
+ 0xe0,
+ 0x8d,
+ 0xf9,
+ 0x67,
+ 0x4f,
+ 0x37,
+ 0x4e,
+ 0x47,
+ 0x02,
+ 0x4c,
+ 0x2d,
+ 0xc0,
+ 0x4f,
+ 0x1f,
+ 0xb3,
+ 0x94,
+ 0xe1,
+ 0x41,
+ 0x2e,
+ 0x2d,
+ 0x90,
+ 0x10,
+ 0xfc,
+ 0x82,
+ 0x91,
+ 0x8b,
+ 0x0f,
+ 0x22,
+ 0xd4,
+ 0xf2,
+ 0xfc,
+ 0x2c,
+ 0xab,
+ 0x53,
+ 0x55,
+ 0x02,
+ 0x03,
+ 0x01,
+ 0x00,
+ 0x01,
+ 0x02,
+ 0x81,
+ 0x80,
+ 0x2b,
+ 0xcc,
+ 0x3f,
+ 0x8f,
+ 0x58,
+ 0xba,
+ 0x8b,
+ 0x00,
+ 0x16,
+ 0xf6,
+ 0xea,
+ 0x3a,
+ 0xf0,
+ 0x30,
+ 0xd0,
+ 0x05,
+ 0x17,
+ 0xda,
+ 0xb0,
+ 0xeb,
+ 0x9a,
+ 0x2d,
+ 0x4f,
+ 0x26,
+ 0xb0,
+ 0xd6,
+ 0x38,
+ 0xc1,
+ 0xeb,
+ 0xf5,
+ 0xd8,
+ 0x3d,
+ 0x1f,
+ 0x70,
+ 0xf7,
+ 0x7f,
+ 0xf4,
+ 0xe2,
+ 0xcf,
+ 0x51,
+ 0x51,
+ 0x79,
+ 0x88,
+ 0xfa,
+ 0xe8,
+ 0x32,
+ 0x0e,
+ 0x7b,
+ 0x2d,
+ 0x97,
+ 0xf2,
+ 0xfa,
+ 0xba,
+ 0x27,
+ 0xc5,
+ 0x9c,
+ 0xd9,
+ 0xc5,
+ 0xeb,
+ 0x8a,
+ 0x79,
+ 0x52,
+ 0x3c,
+ 0x64,
+ 0x34,
+ 0x7d,
+ 0xc2,
+ 0xcf,
+ 0x28,
+ 0xc7,
+ 0x4e,
+ 0xd5,
+ 0x43,
+ 0x0b,
+ 0xd1,
+ 0xa6,
+ 0xca,
+ 0x6d,
+ 0x03,
+ 0x2d,
+ 0x72,
+ 0x23,
+ 0xbc,
+ 0x6d,
+ 0x05,
+ 0xfa,
+ 0x16,
+ 0x09,
+ 0x2f,
+ 0x2e,
+ 0x5c,
+ 0xb6,
+ 0xee,
+ 0x74,
+ 0xdd,
+ 0xd2,
+ 0x48,
+ 0x8e,
+ 0x36,
+ 0x0c,
+ 0x06,
+ 0x3d,
+ 0x4d,
+ 0xe5,
+ 0x10,
+ 0x82,
+ 0xeb,
+ 0x6a,
+ 0xf3,
+ 0x4b,
+ 0x9f,
+ 0xd6,
+ 0xed,
+ 0x11,
+ 0xb1,
+ 0x6e,
+ 0xec,
+ 0xf4,
+ 0xfe,
+ 0x8e,
+ 0x75,
+ 0x94,
+ 0x20,
+ 0x2f,
+ 0xcb,
+ 0xac,
+ 0x46,
+ 0xf1,
+ 0x02,
+ 0x41,
+ 0x00,
+ 0xf9,
+ 0x8c,
+ 0xa3,
+ 0x85,
+ 0xb1,
+ 0xdd,
+ 0x29,
+ 0xaf,
+ 0x65,
+ 0xc1,
+ 0x33,
+ 0xf3,
+ 0x95,
+ 0xc5,
+ 0x52,
+ 0x68,
+ 0x0b,
+ 0xd4,
+ 0xf1,
+ 0xe5,
+ 0x0e,
+ 0x02,
+ 0x9f,
+ 0x4f,
+ 0xfa,
+ 0x77,
+ 0xdc,
+ 0x46,
+ 0x9e,
+ 0xc7,
+ 0xa6,
+ 0xe4,
+ 0x16,
+ 0x29,
+ 0xda,
+ 0xb0,
+ 0x07,
+ 0xcf,
+ 0x5b,
+ 0xa9,
+ 0x12,
+ 0x8a,
+ 0xdd,
+ 0x63,
+ 0x0a,
+ 0xde,
+ 0x2e,
+ 0x8c,
+ 0x66,
+ 0x8b,
+ 0x8c,
+ 0xdc,
+ 0x19,
+ 0xa3,
+ 0x7e,
+ 0xf4,
+ 0x3b,
+ 0xd0,
+ 0x1a,
+ 0x8c,
+ 0xa4,
+ 0xc2,
+ 0xe1,
+ 0xd3,
+ 0x02,
+ 0x41,
+ 0x00,
+ 0xe2,
+ 0x4c,
+ 0x05,
+ 0xf2,
+ 0x04,
+ 0x86,
+ 0x4e,
+ 0x61,
+ 0x43,
+ 0xdb,
+ 0xb0,
+ 0xb9,
+ 0x96,
+ 0x86,
+ 0x52,
+ 0x2c,
+ 0xca,
+ 0x8d,
+ 0x7b,
+ 0xab,
+ 0x0b,
+ 0x13,
+ 0x0d,
+ 0x7e,
+ 0x38,
+ 0x5b,
+ 0xe2,
+ 0x2e,
+ 0x7b,
+ 0x0e,
+ 0xe7,
+ 0x19,
+ 0x99,
+ 0x38,
+ 0xe7,
+ 0xf2,
+ 0x21,
+ 0xbd,
+ 0x85,
+ 0x85,
+ 0xe3,
+ 0xfd,
+ 0x28,
+ 0x77,
+ 0x20,
+ 0x31,
+ 0x71,
+ 0x2c,
+ 0xd0,
+ 0xff,
+ 0xfb,
+ 0x2e,
+ 0xaf,
+ 0x85,
+ 0xb4,
+ 0x86,
+ 0xca,
+ 0xf3,
+ 0xbb,
+ 0xca,
+ 0xaa,
+ 0x0f,
+ 0x95,
+ 0x37,
+ 0x02,
+ 0x40,
+ 0x0e,
+ 0x41,
+ 0x9a,
+ 0x95,
+ 0xe8,
+ 0xb3,
+ 0x59,
+ 0xce,
+ 0x4b,
+ 0x61,
+ 0xde,
+ 0x35,
+ 0xec,
+ 0x38,
+ 0x79,
+ 0x9c,
+ 0xb8,
+ 0x10,
+ 0x52,
+ 0x41,
+ 0x63,
+ 0xab,
+ 0x82,
+ 0xae,
+ 0x6f,
+ 0x00,
+ 0xa9,
+ 0xf4,
+ 0xde,
+ 0xdd,
+ 0x49,
+ 0x0b,
+ 0x7e,
+ 0xb8,
+ 0xa5,
+ 0x65,
+ 0xa9,
+ 0x0c,
+ 0x8f,
+ 0x8f,
+ 0xf9,
+ 0x1f,
+ 0x35,
+ 0xc6,
+ 0x92,
+ 0xb8,
+ 0x5e,
+ 0xb0,
+ 0x66,
+ 0xab,
+ 0x52,
+ 0x40,
+ 0xc0,
+ 0xb6,
+ 0x36,
+ 0x6a,
+ 0x7d,
+ 0x80,
+ 0x46,
+ 0x04,
+ 0x02,
+ 0xe5,
+ 0x9f,
+ 0x41,
+ 0x02,
+ 0x41,
+ 0x00,
+ 0xc0,
+ 0xad,
+ 0xcc,
+ 0x4e,
+ 0x21,
+ 0xee,
+ 0x1d,
+ 0x24,
+ 0x91,
+ 0xfb,
+ 0xa7,
+ 0x80,
+ 0x8d,
+ 0x9a,
+ 0xb6,
+ 0xb3,
+ 0x2e,
+ 0x8f,
+ 0xc2,
+ 0xe1,
+ 0x82,
+ 0xdf,
+ 0x69,
+ 0x18,
+ 0xb4,
+ 0x71,
+ 0xff,
+ 0xa6,
+ 0x65,
+ 0xde,
+ 0xed,
+ 0x84,
+ 0x8d,
+ 0x42,
+ 0xb7,
+ 0xb3,
+ 0x21,
+ 0x69,
+ 0x56,
+ 0x1c,
+ 0x07,
+ 0x60,
+ 0x51,
+ 0x29,
+ 0x04,
+ 0xff,
+ 0x34,
+ 0x06,
+ 0xdd,
+ 0xb9,
+ 0x67,
+ 0x2c,
+ 0x7c,
+ 0x04,
+ 0x93,
+ 0x0e,
+ 0x46,
+ 0x15,
+ 0xbb,
+ 0x2a,
+ 0xb7,
+ 0x1b,
+ 0xe7,
+ 0x87,
+ 0x02,
+ 0x40,
+ 0x78,
+ 0xda,
+ 0x5d,
+ 0x07,
+ 0x51,
+ 0x0c,
+ 0x16,
+ 0x7a,
+ 0x9f,
+ 0x29,
+ 0x20,
+ 0x84,
+ 0x0d,
+ 0x42,
+ 0xfa,
+ 0xd7,
+ 0x00,
+ 0xd8,
+ 0x77,
+ 0x7e,
+ 0xb0,
+ 0xb0,
+ 0x6b,
+ 0xd6,
+ 0x5b,
+ 0x53,
+ 0xb8,
+ 0x9b,
+ 0x7a,
+ 0xcd,
+ 0xc7,
+ 0x2b,
+ 0xb8,
+ 0x6a,
+ 0x63,
+ 0xa9,
+ 0xfb,
+ 0x6f,
+ 0xa4,
+ 0x72,
+ 0xbf,
+ 0x4c,
+ 0x5d,
+ 0x00,
+ 0x14,
+ 0xba,
+ 0xfa,
+ 0x59,
+ 0x88,
+ 0xed,
+ 0xe4,
+ 0xe0,
+ 0x8c,
+ 0xa2,
+ 0xec,
+ 0x14,
+ 0x7e,
+ 0x2d,
+ 0xe2,
+ 0xf0,
+ 0x46,
+ 0x49,
+ 0x95,
+ 0x45,
};
static unsigned char test2048[] = {
- 0x30, 0x82, 0x04, 0xa3, 0x02, 0x01, 0x00, 0x02, 0x82, 0x01,
- 0x01, 0x00, 0xc0, 0xc0, 0xce, 0x3e, 0x3c, 0x53, 0x67, 0x3f,
- 0x4f, 0xc5, 0x2f, 0xa4, 0xc2, 0x5a, 0x2f, 0x58, 0xfd, 0x27,
- 0x52, 0x6a, 0xe8, 0xcf, 0x4a, 0x73, 0x47, 0x8d, 0x25, 0x0f,
- 0x5f, 0x03, 0x26, 0x78, 0xef, 0xf0, 0x22, 0x12, 0xd3, 0xde,
- 0x47, 0xb2, 0x1c, 0x0b, 0x38, 0x63, 0x1a, 0x6c, 0x85, 0x7a,
- 0x80, 0xc6, 0x8f, 0xa0, 0x41, 0xaf, 0x62, 0xc4, 0x67, 0x32,
- 0x88, 0xf8, 0xa6, 0x9c, 0xf5, 0x23, 0x1d, 0xe4, 0xac, 0x3f,
- 0x29, 0xf9, 0xec, 0xe1, 0x8b, 0x26, 0x03, 0x2c, 0xb2, 0xab,
- 0xf3, 0x7d, 0xb5, 0xca, 0x49, 0xc0, 0x8f, 0x1c, 0xdf, 0x33,
- 0x3a, 0x60, 0xda, 0x3c, 0xb0, 0x16, 0xf8, 0xa9, 0x12, 0x8f,
- 0x64, 0xac, 0x23, 0x0c, 0x69, 0x64, 0x97, 0x5d, 0x99, 0xd4,
- 0x09, 0x83, 0x9b, 0x61, 0xd3, 0xac, 0xf0, 0xde, 0xdd, 0x5e,
- 0x9f, 0x44, 0x94, 0xdb, 0x3a, 0x4d, 0x97, 0xe8, 0x52, 0x29,
- 0xf7, 0xdb, 0x94, 0x07, 0x45, 0x90, 0x78, 0x1e, 0x31, 0x0b,
- 0x80, 0xf7, 0x57, 0xad, 0x1c, 0x79, 0xc5, 0xcb, 0x32, 0xb0,
- 0xce, 0xcd, 0x74, 0xb3, 0xe2, 0x94, 0xc5, 0x78, 0x2f, 0x34,
- 0x1a, 0x45, 0xf7, 0x8c, 0x52, 0xa5, 0xbc, 0x8d, 0xec, 0xd1,
- 0x2f, 0x31, 0x3b, 0xf0, 0x49, 0x59, 0x5e, 0x88, 0x9d, 0x15,
- 0x92, 0x35, 0x32, 0xc1, 0xe7, 0x61, 0xec, 0x50, 0x48, 0x7c,
- 0xba, 0x05, 0xf9, 0xf8, 0xf8, 0xa7, 0x8c, 0x83, 0xe8, 0x66,
- 0x5b, 0xeb, 0xfe, 0xd8, 0x4f, 0xdd, 0x6d, 0x36, 0xc0, 0xb2,
- 0x90, 0x0f, 0xb8, 0x52, 0xf9, 0x04, 0x9b, 0x40, 0x2c, 0x27,
- 0xd6, 0x36, 0x8e, 0xc2, 0x1b, 0x44, 0xf3, 0x92, 0xd5, 0x15,
- 0x9e, 0x9a, 0xbc, 0xf3, 0x7d, 0x03, 0xd7, 0x02, 0x14, 0x20,
- 0xe9, 0x10, 0x92, 0xfd, 0xf9, 0xfc, 0x8f, 0xe5, 0x18, 0xe1,
- 0x95, 0xcc, 0x9e, 0x60, 0xa6, 0xfa, 0x38, 0x4d, 0x02, 0x03,
- 0x01, 0x00, 0x01, 0x02, 0x82, 0x01, 0x00, 0x00, 0xc3, 0xc3,
- 0x0d, 0xb4, 0x27, 0x90, 0x8d, 0x4b, 0xbf, 0xb8, 0x84, 0xaa,
- 0xd0, 0xb8, 0xc7, 0x5d, 0x99, 0xbe, 0x55, 0xf6, 0x3e, 0x7c,
- 0x49, 0x20, 0xcb, 0x8a, 0x8e, 0x19, 0x0e, 0x66, 0x24, 0xac,
- 0xaf, 0x03, 0x33, 0x97, 0xeb, 0x95, 0xd5, 0x3b, 0x0f, 0x40,
- 0x56, 0x04, 0x50, 0xd1, 0xe6, 0xbe, 0x84, 0x0b, 0x25, 0xd3,
- 0x9c, 0xe2, 0x83, 0x6c, 0xf5, 0x62, 0x5d, 0xba, 0x2b, 0x7d,
- 0x3d, 0x7a, 0x6c, 0xe1, 0xd2, 0x0e, 0x54, 0x93, 0x80, 0x01,
- 0x91, 0x51, 0x09, 0xe8, 0x5b, 0x8e, 0x47, 0xbd, 0x64, 0xe4,
- 0x0e, 0x03, 0x83, 0x55, 0xcf, 0x5a, 0x37, 0xf0, 0x25, 0xb5,
- 0x7d, 0x21, 0xd7, 0x69, 0xdf, 0x6f, 0xc2, 0xcf, 0x10, 0xc9,
- 0x8a, 0x40, 0x9f, 0x7a, 0x70, 0xc0, 0xe8, 0xe8, 0xc0, 0xe6,
- 0x9a, 0x15, 0x0a, 0x8d, 0x4e, 0x46, 0xcb, 0x7a, 0xdb, 0xb3,
- 0xcb, 0x83, 0x02, 0xc4, 0xf0, 0xab, 0xeb, 0x02, 0x01, 0x0e,
- 0x23, 0xfc, 0x1d, 0xc4, 0xbd, 0xd4, 0xaa, 0x5d, 0x31, 0x46,
- 0x99, 0xce, 0x9e, 0xf8, 0x04, 0x75, 0x10, 0x67, 0xc4, 0x53,
- 0x47, 0x44, 0xfa, 0xc2, 0x25, 0x73, 0x7e, 0xd0, 0x8e, 0x59,
- 0xd1, 0xb2, 0x5a, 0xf4, 0xc7, 0x18, 0x92, 0x2f, 0x39, 0xab,
- 0xcd, 0xa3, 0xb5, 0xc2, 0xb9, 0xc7, 0xb9, 0x1b, 0x9f, 0x48,
- 0xfa, 0x13, 0xc6, 0x98, 0x4d, 0xca, 0x84, 0x9c, 0x06, 0xca,
- 0xe7, 0x89, 0x01, 0x04, 0xc4, 0x6c, 0xfd, 0x29, 0x59, 0x35,
- 0xe7, 0xf3, 0xdd, 0xce, 0x64, 0x59, 0xbf, 0x21, 0x13, 0xa9,
- 0x9f, 0x0e, 0xc5, 0xff, 0xbd, 0x33, 0x00, 0xec, 0xac, 0x6b,
- 0x11, 0xef, 0x51, 0x5e, 0xad, 0x07, 0x15, 0xde, 0xb8, 0x5f,
- 0xc6, 0xb9, 0xa3, 0x22, 0x65, 0x46, 0x83, 0x14, 0xdf, 0xd0,
- 0xf1, 0x44, 0x8a, 0xe1, 0x9c, 0x23, 0x33, 0xb4, 0x97, 0x33,
- 0xe6, 0x6b, 0x81, 0x02, 0x81, 0x81, 0x00, 0xec, 0x12, 0xa7,
- 0x59, 0x74, 0x6a, 0xde, 0x3e, 0xad, 0xd8, 0x36, 0x80, 0x50,
- 0xa2, 0xd5, 0x21, 0x81, 0x07, 0xf1, 0xd0, 0x91, 0xf2, 0x6c,
- 0x12, 0x2f, 0x9d, 0x1a, 0x26, 0xf8, 0x30, 0x65, 0xdf, 0xe8,
- 0xc0, 0x9b, 0x6a, 0x30, 0x98, 0x82, 0x87, 0xec, 0xa2, 0x56,
- 0x87, 0x62, 0x6f, 0xe7, 0x9f, 0xf6, 0x56, 0xe6, 0x71, 0x8f,
- 0x49, 0x86, 0x93, 0x5a, 0x4d, 0x34, 0x58, 0xfe, 0xd9, 0x04,
- 0x13, 0xaf, 0x79, 0xb7, 0xad, 0x11, 0xd1, 0x30, 0x9a, 0x14,
- 0x06, 0xa0, 0xfa, 0xb7, 0x55, 0xdc, 0x6c, 0x5a, 0x4c, 0x2c,
- 0x59, 0x56, 0xf6, 0xe8, 0x9d, 0xaf, 0x0a, 0x78, 0x99, 0x06,
- 0x06, 0x9e, 0xe7, 0x9c, 0x51, 0x55, 0x43, 0xfc, 0x3b, 0x6c,
- 0x0b, 0xbf, 0x2d, 0x41, 0xa7, 0xaf, 0xb7, 0xe0, 0xe8, 0x28,
- 0x18, 0xb4, 0x13, 0xd1, 0xe6, 0x97, 0xd0, 0x9f, 0x6a, 0x80,
- 0xca, 0xdd, 0x1a, 0x7e, 0x15, 0x02, 0x81, 0x81, 0x00, 0xd1,
- 0x06, 0x0c, 0x1f, 0xe3, 0xd0, 0xab, 0xd6, 0xca, 0x7c, 0xbc,
- 0x7d, 0x13, 0x35, 0xce, 0x27, 0xcd, 0xd8, 0x49, 0x51, 0x63,
- 0x64, 0x0f, 0xca, 0x06, 0x12, 0xfc, 0x07, 0x3e, 0xaf, 0x61,
- 0x6d, 0xe2, 0x53, 0x39, 0x27, 0xae, 0xc3, 0x11, 0x9e, 0x94,
- 0x01, 0x4f, 0xe3, 0xf3, 0x67, 0xf9, 0x77, 0xf9, 0xe7, 0x95,
- 0x3a, 0x6f, 0xe2, 0x20, 0x73, 0x3e, 0xa4, 0x7a, 0x28, 0xd4,
- 0x61, 0x97, 0xf6, 0x17, 0xa0, 0x23, 0x10, 0x2b, 0xce, 0x84,
- 0x57, 0x7e, 0x25, 0x1f, 0xf4, 0xa8, 0x54, 0xd2, 0x65, 0x94,
- 0xcc, 0x95, 0x0a, 0xab, 0x30, 0xc1, 0x59, 0x1f, 0x61, 0x8e,
- 0xb9, 0x6b, 0xd7, 0x4e, 0xb9, 0x83, 0x43, 0x79, 0x85, 0x11,
- 0xbc, 0x0f, 0xae, 0x25, 0x20, 0x05, 0xbc, 0xd2, 0x48, 0xa1,
- 0x68, 0x09, 0x84, 0xf6, 0x12, 0x9a, 0x66, 0xb9, 0x2b, 0xbb,
- 0x76, 0x03, 0x17, 0x46, 0x4e, 0x97, 0x59, 0x02, 0x81, 0x80,
- 0x09, 0x4c, 0xfa, 0xd6, 0xe5, 0x65, 0x48, 0x78, 0x43, 0xb5,
- 0x1f, 0x00, 0x93, 0x2c, 0xb7, 0x24, 0xe8, 0xc6, 0x7d, 0x5a,
- 0x70, 0x45, 0x92, 0xc8, 0x6c, 0xa3, 0xcd, 0xe1, 0xf7, 0x29,
- 0x40, 0xfa, 0x3f, 0x5b, 0x47, 0x44, 0x39, 0xc1, 0xe8, 0x72,
- 0x9e, 0x7a, 0x0e, 0xda, 0xaa, 0xa0, 0x2a, 0x09, 0xfd, 0x54,
- 0x93, 0x23, 0xaa, 0x37, 0x85, 0x5b, 0xcc, 0xd4, 0xf9, 0xd8,
- 0xff, 0xc1, 0x61, 0x0d, 0xbd, 0x7e, 0x18, 0x24, 0x73, 0x6d,
- 0x40, 0x72, 0xf1, 0x93, 0x09, 0x48, 0x97, 0x6c, 0x84, 0x90,
- 0xa8, 0x46, 0x14, 0x01, 0x39, 0x11, 0xe5, 0x3c, 0x41, 0x27,
- 0x32, 0x75, 0x24, 0xed, 0xa1, 0xd9, 0x12, 0x29, 0x8a, 0x28,
- 0x71, 0x89, 0x8d, 0xca, 0x30, 0xb0, 0x01, 0xc4, 0x2f, 0x82,
- 0x19, 0x14, 0x4c, 0x70, 0x1c, 0xb8, 0x23, 0x2e, 0xe8, 0x90,
- 0x49, 0x97, 0x92, 0x97, 0x6b, 0x7a, 0x9d, 0xb9, 0x02, 0x81,
- 0x80, 0x0f, 0x0e, 0xa1, 0x76, 0xf6, 0xa1, 0x44, 0x8f, 0xaf,
- 0x7c, 0x76, 0xd3, 0x87, 0xbb, 0xbb, 0x83, 0x10, 0x88, 0x01,
- 0x18, 0x14, 0xd1, 0xd3, 0x75, 0x59, 0x24, 0xaa, 0xf5, 0x16,
- 0xa5, 0xe9, 0x9d, 0xd1, 0xcc, 0xee, 0xf4, 0x15, 0xd9, 0xc5,
- 0x7e, 0x27, 0xe9, 0x44, 0x49, 0x06, 0x72, 0xb9, 0xfc, 0xd3,
- 0x8a, 0xc4, 0x2c, 0x36, 0x7d, 0x12, 0x9b, 0x5a, 0xaa, 0xdc,
- 0x85, 0xee, 0x6e, 0xad, 0x54, 0xb3, 0xf4, 0xfc, 0x31, 0xa1,
- 0x06, 0x3a, 0x70, 0x57, 0x0c, 0xf3, 0x95, 0x5b, 0x3e, 0xe8,
- 0xfd, 0x1a, 0x4f, 0xf6, 0x78, 0x93, 0x46, 0x6a, 0xd7, 0x31,
- 0xb4, 0x84, 0x64, 0x85, 0x09, 0x38, 0x89, 0x92, 0x94, 0x1c,
- 0xbf, 0xe2, 0x3c, 0x2a, 0xe0, 0xff, 0x99, 0xa3, 0xf0, 0x2b,
- 0x31, 0xc2, 0x36, 0xcd, 0x60, 0xbf, 0x9d, 0x2d, 0x74, 0x32,
- 0xe8, 0x9c, 0x93, 0x6e, 0xbb, 0x91, 0x7b, 0xfd, 0xd9, 0x02,
- 0x81, 0x81, 0x00, 0xa2, 0x71, 0x25, 0x38, 0xeb, 0x2a, 0xe9,
- 0x37, 0xcd, 0xfe, 0x44, 0xce, 0x90, 0x3f, 0x52, 0x87, 0x84,
- 0x52, 0x1b, 0xae, 0x8d, 0x22, 0x94, 0xce, 0x38, 0xe6, 0x04,
- 0x88, 0x76, 0x85, 0x9a, 0xd3, 0x14, 0x09, 0xe5, 0x69, 0x9a,
- 0xff, 0x58, 0x92, 0x02, 0x6a, 0x7d, 0x7c, 0x1e, 0x2c, 0xfd,
- 0xa8, 0xca, 0x32, 0x14, 0x4f, 0x0d, 0x84, 0x0d, 0x37, 0x43,
- 0xbf, 0xe4, 0x5d, 0x12, 0xc8, 0x24, 0x91, 0x27, 0x8d, 0x46,
- 0xd9, 0x54, 0x53, 0xe7, 0x62, 0x71, 0xa8, 0x2b, 0x71, 0x41,
- 0x8d, 0x75, 0xf8, 0x3a, 0xa0, 0x61, 0x29, 0x46, 0xa6, 0xe5,
- 0x82, 0xfa, 0x3a, 0xd9, 0x08, 0xfa, 0xfc, 0x63, 0xfd, 0x6b,
- 0x30, 0xbc, 0xf4, 0x4e, 0x9e, 0x8c, 0x25, 0x0c, 0xb6, 0x55,
- 0xe7, 0x3c, 0xd4, 0x4e, 0x0b, 0xfd, 0x8b, 0xc3, 0x0e, 0x1d,
- 0x9c, 0x44, 0x57, 0x8f, 0x1f, 0x86, 0xf7, 0xd5, 0x1b, 0xe4,
+ 0x30,
+ 0x82,
+ 0x04,
+ 0xa3,
+ 0x02,
+ 0x01,
+ 0x00,
+ 0x02,
+ 0x82,
+ 0x01,
+ 0x01,
+ 0x00,
+ 0xc0,
+ 0xc0,
+ 0xce,
+ 0x3e,
+ 0x3c,
+ 0x53,
+ 0x67,
+ 0x3f,
+ 0x4f,
+ 0xc5,
+ 0x2f,
+ 0xa4,
+ 0xc2,
+ 0x5a,
+ 0x2f,
+ 0x58,
+ 0xfd,
+ 0x27,
+ 0x52,
+ 0x6a,
+ 0xe8,
+ 0xcf,
+ 0x4a,
+ 0x73,
+ 0x47,
+ 0x8d,
+ 0x25,
+ 0x0f,
+ 0x5f,
+ 0x03,
+ 0x26,
+ 0x78,
+ 0xef,
+ 0xf0,
+ 0x22,
+ 0x12,
+ 0xd3,
+ 0xde,
+ 0x47,
+ 0xb2,
+ 0x1c,
+ 0x0b,
+ 0x38,
+ 0x63,
+ 0x1a,
+ 0x6c,
+ 0x85,
+ 0x7a,
+ 0x80,
+ 0xc6,
+ 0x8f,
+ 0xa0,
+ 0x41,
+ 0xaf,
+ 0x62,
+ 0xc4,
+ 0x67,
+ 0x32,
+ 0x88,
+ 0xf8,
+ 0xa6,
+ 0x9c,
+ 0xf5,
+ 0x23,
+ 0x1d,
+ 0xe4,
+ 0xac,
+ 0x3f,
+ 0x29,
+ 0xf9,
+ 0xec,
+ 0xe1,
+ 0x8b,
+ 0x26,
+ 0x03,
+ 0x2c,
+ 0xb2,
+ 0xab,
+ 0xf3,
+ 0x7d,
+ 0xb5,
+ 0xca,
+ 0x49,
+ 0xc0,
+ 0x8f,
+ 0x1c,
+ 0xdf,
+ 0x33,
+ 0x3a,
+ 0x60,
+ 0xda,
+ 0x3c,
+ 0xb0,
+ 0x16,
+ 0xf8,
+ 0xa9,
+ 0x12,
+ 0x8f,
+ 0x64,
+ 0xac,
+ 0x23,
+ 0x0c,
+ 0x69,
+ 0x64,
+ 0x97,
+ 0x5d,
+ 0x99,
+ 0xd4,
+ 0x09,
+ 0x83,
+ 0x9b,
+ 0x61,
+ 0xd3,
+ 0xac,
+ 0xf0,
+ 0xde,
+ 0xdd,
+ 0x5e,
+ 0x9f,
+ 0x44,
+ 0x94,
+ 0xdb,
+ 0x3a,
+ 0x4d,
+ 0x97,
+ 0xe8,
+ 0x52,
+ 0x29,
+ 0xf7,
+ 0xdb,
+ 0x94,
+ 0x07,
+ 0x45,
+ 0x90,
+ 0x78,
+ 0x1e,
+ 0x31,
+ 0x0b,
+ 0x80,
+ 0xf7,
+ 0x57,
+ 0xad,
+ 0x1c,
+ 0x79,
+ 0xc5,
+ 0xcb,
+ 0x32,
+ 0xb0,
+ 0xce,
+ 0xcd,
+ 0x74,
+ 0xb3,
+ 0xe2,
+ 0x94,
+ 0xc5,
+ 0x78,
+ 0x2f,
+ 0x34,
+ 0x1a,
+ 0x45,
+ 0xf7,
+ 0x8c,
+ 0x52,
+ 0xa5,
+ 0xbc,
+ 0x8d,
+ 0xec,
+ 0xd1,
+ 0x2f,
+ 0x31,
+ 0x3b,
+ 0xf0,
+ 0x49,
+ 0x59,
+ 0x5e,
+ 0x88,
+ 0x9d,
+ 0x15,
+ 0x92,
+ 0x35,
+ 0x32,
+ 0xc1,
+ 0xe7,
+ 0x61,
+ 0xec,
+ 0x50,
+ 0x48,
+ 0x7c,
+ 0xba,
+ 0x05,
+ 0xf9,
+ 0xf8,
+ 0xf8,
+ 0xa7,
+ 0x8c,
+ 0x83,
+ 0xe8,
+ 0x66,
+ 0x5b,
+ 0xeb,
+ 0xfe,
+ 0xd8,
+ 0x4f,
+ 0xdd,
+ 0x6d,
+ 0x36,
+ 0xc0,
+ 0xb2,
+ 0x90,
+ 0x0f,
+ 0xb8,
+ 0x52,
+ 0xf9,
+ 0x04,
+ 0x9b,
+ 0x40,
+ 0x2c,
+ 0x27,
+ 0xd6,
+ 0x36,
+ 0x8e,
+ 0xc2,
+ 0x1b,
+ 0x44,
+ 0xf3,
+ 0x92,
+ 0xd5,
+ 0x15,
+ 0x9e,
+ 0x9a,
+ 0xbc,
+ 0xf3,
+ 0x7d,
+ 0x03,
+ 0xd7,
+ 0x02,
+ 0x14,
+ 0x20,
+ 0xe9,
+ 0x10,
+ 0x92,
+ 0xfd,
+ 0xf9,
+ 0xfc,
+ 0x8f,
+ 0xe5,
+ 0x18,
+ 0xe1,
+ 0x95,
+ 0xcc,
+ 0x9e,
+ 0x60,
+ 0xa6,
+ 0xfa,
+ 0x38,
+ 0x4d,
+ 0x02,
+ 0x03,
+ 0x01,
+ 0x00,
+ 0x01,
+ 0x02,
+ 0x82,
+ 0x01,
+ 0x00,
+ 0x00,
+ 0xc3,
+ 0xc3,
+ 0x0d,
+ 0xb4,
+ 0x27,
+ 0x90,
+ 0x8d,
+ 0x4b,
+ 0xbf,
+ 0xb8,
+ 0x84,
+ 0xaa,
+ 0xd0,
+ 0xb8,
+ 0xc7,
+ 0x5d,
+ 0x99,
+ 0xbe,
+ 0x55,
+ 0xf6,
+ 0x3e,
+ 0x7c,
+ 0x49,
+ 0x20,
+ 0xcb,
+ 0x8a,
+ 0x8e,
+ 0x19,
+ 0x0e,
+ 0x66,
+ 0x24,
+ 0xac,
+ 0xaf,
+ 0x03,
+ 0x33,
+ 0x97,
+ 0xeb,
+ 0x95,
+ 0xd5,
+ 0x3b,
+ 0x0f,
+ 0x40,
+ 0x56,
+ 0x04,
+ 0x50,
+ 0xd1,
+ 0xe6,
+ 0xbe,
+ 0x84,
+ 0x0b,
+ 0x25,
+ 0xd3,
+ 0x9c,
+ 0xe2,
+ 0x83,
+ 0x6c,
+ 0xf5,
+ 0x62,
+ 0x5d,
+ 0xba,
+ 0x2b,
+ 0x7d,
+ 0x3d,
+ 0x7a,
+ 0x6c,
+ 0xe1,
+ 0xd2,
+ 0x0e,
+ 0x54,
+ 0x93,
+ 0x80,
+ 0x01,
+ 0x91,
+ 0x51,
+ 0x09,
+ 0xe8,
+ 0x5b,
+ 0x8e,
+ 0x47,
+ 0xbd,
+ 0x64,
+ 0xe4,
+ 0x0e,
+ 0x03,
+ 0x83,
+ 0x55,
+ 0xcf,
+ 0x5a,
+ 0x37,
+ 0xf0,
+ 0x25,
+ 0xb5,
+ 0x7d,
+ 0x21,
+ 0xd7,
+ 0x69,
+ 0xdf,
+ 0x6f,
+ 0xc2,
+ 0xcf,
+ 0x10,
+ 0xc9,
+ 0x8a,
+ 0x40,
+ 0x9f,
+ 0x7a,
+ 0x70,
+ 0xc0,
+ 0xe8,
+ 0xe8,
+ 0xc0,
+ 0xe6,
+ 0x9a,
+ 0x15,
+ 0x0a,
+ 0x8d,
+ 0x4e,
+ 0x46,
+ 0xcb,
+ 0x7a,
+ 0xdb,
+ 0xb3,
+ 0xcb,
+ 0x83,
+ 0x02,
+ 0xc4,
+ 0xf0,
+ 0xab,
+ 0xeb,
+ 0x02,
+ 0x01,
+ 0x0e,
+ 0x23,
+ 0xfc,
+ 0x1d,
+ 0xc4,
+ 0xbd,
+ 0xd4,
+ 0xaa,
+ 0x5d,
+ 0x31,
+ 0x46,
+ 0x99,
+ 0xce,
+ 0x9e,
+ 0xf8,
+ 0x04,
+ 0x75,
+ 0x10,
+ 0x67,
+ 0xc4,
+ 0x53,
+ 0x47,
+ 0x44,
+ 0xfa,
+ 0xc2,
+ 0x25,
+ 0x73,
+ 0x7e,
+ 0xd0,
+ 0x8e,
+ 0x59,
+ 0xd1,
+ 0xb2,
+ 0x5a,
+ 0xf4,
+ 0xc7,
+ 0x18,
+ 0x92,
+ 0x2f,
+ 0x39,
+ 0xab,
+ 0xcd,
+ 0xa3,
+ 0xb5,
+ 0xc2,
+ 0xb9,
+ 0xc7,
+ 0xb9,
+ 0x1b,
+ 0x9f,
+ 0x48,
+ 0xfa,
+ 0x13,
+ 0xc6,
+ 0x98,
+ 0x4d,
+ 0xca,
+ 0x84,
+ 0x9c,
+ 0x06,
+ 0xca,
+ 0xe7,
+ 0x89,
+ 0x01,
+ 0x04,
+ 0xc4,
+ 0x6c,
+ 0xfd,
+ 0x29,
+ 0x59,
+ 0x35,
+ 0xe7,
+ 0xf3,
+ 0xdd,
+ 0xce,
+ 0x64,
+ 0x59,
+ 0xbf,
+ 0x21,
+ 0x13,
+ 0xa9,
+ 0x9f,
+ 0x0e,
+ 0xc5,
+ 0xff,
+ 0xbd,
+ 0x33,
+ 0x00,
+ 0xec,
+ 0xac,
+ 0x6b,
+ 0x11,
+ 0xef,
+ 0x51,
+ 0x5e,
+ 0xad,
+ 0x07,
+ 0x15,
+ 0xde,
+ 0xb8,
+ 0x5f,
+ 0xc6,
+ 0xb9,
+ 0xa3,
+ 0x22,
+ 0x65,
+ 0x46,
+ 0x83,
+ 0x14,
+ 0xdf,
+ 0xd0,
+ 0xf1,
+ 0x44,
+ 0x8a,
+ 0xe1,
+ 0x9c,
+ 0x23,
+ 0x33,
+ 0xb4,
+ 0x97,
+ 0x33,
+ 0xe6,
+ 0x6b,
+ 0x81,
+ 0x02,
+ 0x81,
+ 0x81,
+ 0x00,
+ 0xec,
+ 0x12,
+ 0xa7,
+ 0x59,
+ 0x74,
+ 0x6a,
+ 0xde,
+ 0x3e,
+ 0xad,
+ 0xd8,
+ 0x36,
+ 0x80,
+ 0x50,
+ 0xa2,
+ 0xd5,
+ 0x21,
+ 0x81,
+ 0x07,
+ 0xf1,
+ 0xd0,
+ 0x91,
+ 0xf2,
+ 0x6c,
+ 0x12,
+ 0x2f,
+ 0x9d,
+ 0x1a,
+ 0x26,
+ 0xf8,
+ 0x30,
+ 0x65,
+ 0xdf,
+ 0xe8,
+ 0xc0,
+ 0x9b,
+ 0x6a,
+ 0x30,
+ 0x98,
+ 0x82,
+ 0x87,
+ 0xec,
+ 0xa2,
+ 0x56,
+ 0x87,
+ 0x62,
+ 0x6f,
+ 0xe7,
+ 0x9f,
+ 0xf6,
+ 0x56,
+ 0xe6,
+ 0x71,
+ 0x8f,
+ 0x49,
+ 0x86,
+ 0x93,
+ 0x5a,
+ 0x4d,
+ 0x34,
+ 0x58,
+ 0xfe,
+ 0xd9,
+ 0x04,
+ 0x13,
+ 0xaf,
+ 0x79,
+ 0xb7,
+ 0xad,
+ 0x11,
+ 0xd1,
+ 0x30,
+ 0x9a,
+ 0x14,
+ 0x06,
+ 0xa0,
+ 0xfa,
+ 0xb7,
+ 0x55,
+ 0xdc,
+ 0x6c,
+ 0x5a,
+ 0x4c,
+ 0x2c,
+ 0x59,
+ 0x56,
+ 0xf6,
+ 0xe8,
+ 0x9d,
+ 0xaf,
+ 0x0a,
+ 0x78,
+ 0x99,
+ 0x06,
+ 0x06,
+ 0x9e,
+ 0xe7,
+ 0x9c,
+ 0x51,
+ 0x55,
+ 0x43,
+ 0xfc,
+ 0x3b,
+ 0x6c,
+ 0x0b,
+ 0xbf,
+ 0x2d,
+ 0x41,
+ 0xa7,
+ 0xaf,
+ 0xb7,
+ 0xe0,
+ 0xe8,
+ 0x28,
+ 0x18,
+ 0xb4,
+ 0x13,
+ 0xd1,
+ 0xe6,
+ 0x97,
+ 0xd0,
+ 0x9f,
+ 0x6a,
+ 0x80,
+ 0xca,
+ 0xdd,
+ 0x1a,
+ 0x7e,
+ 0x15,
+ 0x02,
+ 0x81,
+ 0x81,
+ 0x00,
+ 0xd1,
+ 0x06,
+ 0x0c,
+ 0x1f,
+ 0xe3,
+ 0xd0,
+ 0xab,
+ 0xd6,
+ 0xca,
+ 0x7c,
+ 0xbc,
+ 0x7d,
+ 0x13,
+ 0x35,
+ 0xce,
+ 0x27,
+ 0xcd,
+ 0xd8,
+ 0x49,
+ 0x51,
+ 0x63,
+ 0x64,
+ 0x0f,
+ 0xca,
+ 0x06,
+ 0x12,
+ 0xfc,
+ 0x07,
+ 0x3e,
+ 0xaf,
+ 0x61,
+ 0x6d,
+ 0xe2,
+ 0x53,
+ 0x39,
+ 0x27,
+ 0xae,
+ 0xc3,
+ 0x11,
+ 0x9e,
+ 0x94,
+ 0x01,
+ 0x4f,
+ 0xe3,
+ 0xf3,
+ 0x67,
+ 0xf9,
+ 0x77,
+ 0xf9,
+ 0xe7,
+ 0x95,
+ 0x3a,
+ 0x6f,
+ 0xe2,
+ 0x20,
+ 0x73,
+ 0x3e,
+ 0xa4,
+ 0x7a,
+ 0x28,
+ 0xd4,
+ 0x61,
+ 0x97,
+ 0xf6,
+ 0x17,
+ 0xa0,
+ 0x23,
+ 0x10,
+ 0x2b,
+ 0xce,
+ 0x84,
+ 0x57,
+ 0x7e,
+ 0x25,
+ 0x1f,
+ 0xf4,
+ 0xa8,
+ 0x54,
+ 0xd2,
+ 0x65,
+ 0x94,
+ 0xcc,
+ 0x95,
+ 0x0a,
+ 0xab,
+ 0x30,
+ 0xc1,
+ 0x59,
+ 0x1f,
+ 0x61,
+ 0x8e,
+ 0xb9,
+ 0x6b,
+ 0xd7,
+ 0x4e,
+ 0xb9,
+ 0x83,
+ 0x43,
+ 0x79,
+ 0x85,
+ 0x11,
+ 0xbc,
+ 0x0f,
+ 0xae,
+ 0x25,
+ 0x20,
+ 0x05,
+ 0xbc,
+ 0xd2,
+ 0x48,
+ 0xa1,
+ 0x68,
+ 0x09,
+ 0x84,
+ 0xf6,
+ 0x12,
+ 0x9a,
+ 0x66,
+ 0xb9,
+ 0x2b,
+ 0xbb,
+ 0x76,
+ 0x03,
+ 0x17,
+ 0x46,
+ 0x4e,
+ 0x97,
+ 0x59,
+ 0x02,
+ 0x81,
+ 0x80,
+ 0x09,
+ 0x4c,
+ 0xfa,
+ 0xd6,
+ 0xe5,
+ 0x65,
+ 0x48,
+ 0x78,
+ 0x43,
+ 0xb5,
+ 0x1f,
+ 0x00,
+ 0x93,
+ 0x2c,
+ 0xb7,
+ 0x24,
+ 0xe8,
+ 0xc6,
+ 0x7d,
+ 0x5a,
+ 0x70,
+ 0x45,
+ 0x92,
+ 0xc8,
+ 0x6c,
+ 0xa3,
+ 0xcd,
+ 0xe1,
+ 0xf7,
+ 0x29,
+ 0x40,
+ 0xfa,
+ 0x3f,
+ 0x5b,
+ 0x47,
+ 0x44,
+ 0x39,
+ 0xc1,
+ 0xe8,
+ 0x72,
+ 0x9e,
+ 0x7a,
+ 0x0e,
+ 0xda,
+ 0xaa,
+ 0xa0,
+ 0x2a,
+ 0x09,
+ 0xfd,
+ 0x54,
+ 0x93,
+ 0x23,
+ 0xaa,
+ 0x37,
+ 0x85,
+ 0x5b,
+ 0xcc,
+ 0xd4,
+ 0xf9,
+ 0xd8,
+ 0xff,
+ 0xc1,
+ 0x61,
+ 0x0d,
+ 0xbd,
+ 0x7e,
+ 0x18,
+ 0x24,
+ 0x73,
+ 0x6d,
+ 0x40,
+ 0x72,
+ 0xf1,
+ 0x93,
+ 0x09,
+ 0x48,
+ 0x97,
+ 0x6c,
+ 0x84,
+ 0x90,
+ 0xa8,
+ 0x46,
+ 0x14,
+ 0x01,
+ 0x39,
+ 0x11,
+ 0xe5,
+ 0x3c,
+ 0x41,
+ 0x27,
+ 0x32,
+ 0x75,
+ 0x24,
+ 0xed,
+ 0xa1,
+ 0xd9,
+ 0x12,
+ 0x29,
+ 0x8a,
+ 0x28,
+ 0x71,
+ 0x89,
+ 0x8d,
+ 0xca,
+ 0x30,
+ 0xb0,
+ 0x01,
+ 0xc4,
+ 0x2f,
+ 0x82,
+ 0x19,
+ 0x14,
+ 0x4c,
+ 0x70,
+ 0x1c,
+ 0xb8,
+ 0x23,
+ 0x2e,
+ 0xe8,
+ 0x90,
+ 0x49,
+ 0x97,
+ 0x92,
+ 0x97,
+ 0x6b,
+ 0x7a,
+ 0x9d,
+ 0xb9,
+ 0x02,
+ 0x81,
+ 0x80,
+ 0x0f,
+ 0x0e,
+ 0xa1,
+ 0x76,
+ 0xf6,
+ 0xa1,
+ 0x44,
+ 0x8f,
+ 0xaf,
+ 0x7c,
+ 0x76,
+ 0xd3,
+ 0x87,
+ 0xbb,
+ 0xbb,
+ 0x83,
+ 0x10,
+ 0x88,
+ 0x01,
+ 0x18,
+ 0x14,
+ 0xd1,
+ 0xd3,
+ 0x75,
+ 0x59,
+ 0x24,
+ 0xaa,
+ 0xf5,
+ 0x16,
+ 0xa5,
+ 0xe9,
+ 0x9d,
+ 0xd1,
+ 0xcc,
+ 0xee,
+ 0xf4,
+ 0x15,
+ 0xd9,
+ 0xc5,
+ 0x7e,
+ 0x27,
+ 0xe9,
+ 0x44,
+ 0x49,
+ 0x06,
+ 0x72,
+ 0xb9,
+ 0xfc,
+ 0xd3,
+ 0x8a,
+ 0xc4,
+ 0x2c,
+ 0x36,
+ 0x7d,
+ 0x12,
+ 0x9b,
+ 0x5a,
+ 0xaa,
+ 0xdc,
+ 0x85,
+ 0xee,
+ 0x6e,
+ 0xad,
+ 0x54,
+ 0xb3,
+ 0xf4,
+ 0xfc,
+ 0x31,
+ 0xa1,
+ 0x06,
+ 0x3a,
+ 0x70,
+ 0x57,
+ 0x0c,
+ 0xf3,
+ 0x95,
+ 0x5b,
+ 0x3e,
+ 0xe8,
+ 0xfd,
+ 0x1a,
+ 0x4f,
+ 0xf6,
+ 0x78,
+ 0x93,
+ 0x46,
+ 0x6a,
+ 0xd7,
+ 0x31,
+ 0xb4,
+ 0x84,
+ 0x64,
+ 0x85,
+ 0x09,
+ 0x38,
+ 0x89,
+ 0x92,
+ 0x94,
+ 0x1c,
+ 0xbf,
+ 0xe2,
+ 0x3c,
+ 0x2a,
+ 0xe0,
+ 0xff,
+ 0x99,
+ 0xa3,
+ 0xf0,
+ 0x2b,
+ 0x31,
+ 0xc2,
+ 0x36,
+ 0xcd,
+ 0x60,
+ 0xbf,
+ 0x9d,
+ 0x2d,
+ 0x74,
+ 0x32,
+ 0xe8,
+ 0x9c,
+ 0x93,
+ 0x6e,
+ 0xbb,
+ 0x91,
+ 0x7b,
+ 0xfd,
+ 0xd9,
+ 0x02,
+ 0x81,
+ 0x81,
+ 0x00,
+ 0xa2,
+ 0x71,
+ 0x25,
+ 0x38,
+ 0xeb,
+ 0x2a,
+ 0xe9,
+ 0x37,
+ 0xcd,
+ 0xfe,
+ 0x44,
+ 0xce,
+ 0x90,
+ 0x3f,
+ 0x52,
+ 0x87,
+ 0x84,
+ 0x52,
+ 0x1b,
+ 0xae,
+ 0x8d,
+ 0x22,
+ 0x94,
+ 0xce,
+ 0x38,
+ 0xe6,
+ 0x04,
+ 0x88,
+ 0x76,
+ 0x85,
+ 0x9a,
+ 0xd3,
+ 0x14,
+ 0x09,
+ 0xe5,
+ 0x69,
+ 0x9a,
+ 0xff,
+ 0x58,
+ 0x92,
+ 0x02,
+ 0x6a,
+ 0x7d,
+ 0x7c,
+ 0x1e,
+ 0x2c,
+ 0xfd,
+ 0xa8,
+ 0xca,
+ 0x32,
+ 0x14,
+ 0x4f,
+ 0x0d,
+ 0x84,
+ 0x0d,
+ 0x37,
+ 0x43,
+ 0xbf,
+ 0xe4,
+ 0x5d,
+ 0x12,
+ 0xc8,
+ 0x24,
+ 0x91,
+ 0x27,
+ 0x8d,
+ 0x46,
+ 0xd9,
+ 0x54,
+ 0x53,
+ 0xe7,
+ 0x62,
+ 0x71,
+ 0xa8,
+ 0x2b,
+ 0x71,
+ 0x41,
+ 0x8d,
+ 0x75,
+ 0xf8,
+ 0x3a,
+ 0xa0,
+ 0x61,
+ 0x29,
+ 0x46,
+ 0xa6,
+ 0xe5,
+ 0x82,
+ 0xfa,
+ 0x3a,
+ 0xd9,
+ 0x08,
+ 0xfa,
+ 0xfc,
+ 0x63,
+ 0xfd,
+ 0x6b,
+ 0x30,
+ 0xbc,
+ 0xf4,
+ 0x4e,
+ 0x9e,
+ 0x8c,
+ 0x25,
+ 0x0c,
+ 0xb6,
+ 0x55,
+ 0xe7,
+ 0x3c,
+ 0xd4,
+ 0x4e,
+ 0x0b,
+ 0xfd,
+ 0x8b,
+ 0xc3,
+ 0x0e,
+ 0x1d,
+ 0x9c,
+ 0x44,
+ 0x57,
+ 0x8f,
+ 0x1f,
+ 0x86,
+ 0xf7,
+ 0xd5,
+ 0x1b,
+ 0xe4,
0x95,
};
@@ -410,241 +2314,2355 @@ static unsigned char test3072[] = {
};
static unsigned char test4096[] = {
- 0x30, 0x82, 0x09, 0x29, 0x02, 0x01, 0x00, 0x02, 0x82, 0x02,
- 0x01, 0x00, 0xc0, 0x71, 0xac, 0x1a, 0x13, 0x88, 0x82, 0x43,
- 0x3b, 0x51, 0x57, 0x71, 0x8d, 0xb6, 0x2b, 0x82, 0x65, 0x21,
- 0x53, 0x5f, 0x28, 0x29, 0x4f, 0x8d, 0x7c, 0x8a, 0xb9, 0x44,
- 0xb3, 0x28, 0x41, 0x4f, 0xd3, 0xfa, 0x6a, 0xf8, 0xb9, 0x28,
- 0x50, 0x39, 0x67, 0x53, 0x2c, 0x3c, 0xd7, 0xcb, 0x96, 0x41,
- 0x40, 0x32, 0xbb, 0xeb, 0x70, 0xae, 0x1f, 0xb0, 0x65, 0xf7,
- 0x3a, 0xd9, 0x22, 0xfd, 0x10, 0xae, 0xbd, 0x02, 0xe2, 0xdd,
- 0xf3, 0xc2, 0x79, 0x3c, 0xc6, 0xfc, 0x75, 0xbb, 0xaf, 0x4e,
- 0x3a, 0x36, 0xc2, 0x4f, 0xea, 0x25, 0xdf, 0x13, 0x16, 0x4b,
- 0x20, 0xfe, 0x4b, 0x69, 0x16, 0xc4, 0x7f, 0x1a, 0x43, 0xa6,
- 0x17, 0x1b, 0xb9, 0x0a, 0xf3, 0x09, 0x86, 0x28, 0x89, 0xcf,
- 0x2c, 0xd0, 0xd4, 0x81, 0xaf, 0xc6, 0x6d, 0xe6, 0x21, 0x8d,
- 0xee, 0xef, 0xea, 0xdc, 0xb7, 0xc6, 0x3b, 0x63, 0x9f, 0x0e,
- 0xad, 0x89, 0x78, 0x23, 0x18, 0xbf, 0x70, 0x7e, 0x84, 0xe0,
- 0x37, 0xec, 0xdb, 0x8e, 0x9c, 0x3e, 0x6a, 0x19, 0xcc, 0x99,
- 0x72, 0xe6, 0xb5, 0x7d, 0x6d, 0xfa, 0xe5, 0xd3, 0xe4, 0x90,
- 0xb5, 0xb2, 0xb2, 0x12, 0x70, 0x4e, 0xca, 0xf8, 0x10, 0xf8,
- 0xa3, 0x14, 0xc2, 0x48, 0x19, 0xeb, 0x60, 0x99, 0xbb, 0x2a,
- 0x1f, 0xb1, 0x7a, 0xb1, 0x3d, 0x24, 0xfb, 0xa0, 0x29, 0xda,
- 0xbd, 0x1b, 0xd7, 0xa4, 0xbf, 0xef, 0x60, 0x2d, 0x22, 0xca,
- 0x65, 0x98, 0xf1, 0xc4, 0xe1, 0xc9, 0x02, 0x6b, 0x16, 0x28,
- 0x2f, 0xa1, 0xaa, 0x79, 0x00, 0xda, 0xdc, 0x7c, 0x43, 0xf7,
- 0x42, 0x3c, 0xa0, 0xef, 0x68, 0xf7, 0xdf, 0xb9, 0x69, 0xfb,
- 0x8e, 0x01, 0xed, 0x01, 0x42, 0xb5, 0x4e, 0x57, 0xa6, 0x26,
- 0xb8, 0xd0, 0x7b, 0x56, 0x6d, 0x03, 0xc6, 0x40, 0x8c, 0x8c,
- 0x2a, 0x55, 0xd7, 0x9c, 0x35, 0x00, 0x94, 0x93, 0xec, 0x03,
- 0xeb, 0x22, 0xef, 0x77, 0xbb, 0x79, 0x13, 0x3f, 0x15, 0xa1,
- 0x8f, 0xca, 0xdf, 0xfd, 0xd3, 0xb8, 0xe1, 0xd4, 0xcc, 0x09,
- 0x3f, 0x3c, 0x2c, 0xdb, 0xd1, 0x49, 0x7f, 0x38, 0x07, 0x83,
- 0x6d, 0xeb, 0x08, 0x66, 0xe9, 0x06, 0x44, 0x12, 0xac, 0x95,
- 0x22, 0x90, 0x23, 0x67, 0xd4, 0x08, 0xcc, 0xf4, 0xb7, 0xdc,
- 0xcc, 0x87, 0xd4, 0xac, 0x69, 0x35, 0x4c, 0xb5, 0x39, 0x36,
- 0xcd, 0xa4, 0xd2, 0x95, 0xca, 0x0d, 0xc5, 0xda, 0xc2, 0xc5,
- 0x22, 0x32, 0x28, 0x08, 0xe3, 0xd2, 0x8b, 0x38, 0x30, 0xdc,
- 0x8c, 0x75, 0x4f, 0x6a, 0xec, 0x7a, 0xac, 0x16, 0x3e, 0xa8,
- 0xd4, 0x6a, 0x45, 0xe1, 0xa8, 0x4f, 0x2e, 0x80, 0x34, 0xaa,
- 0x54, 0x1b, 0x02, 0x95, 0x7d, 0x8a, 0x6d, 0xcc, 0x79, 0xca,
- 0xf2, 0xa4, 0x2e, 0x8d, 0xfb, 0xfe, 0x15, 0x51, 0x10, 0x0e,
- 0x4d, 0x88, 0xb1, 0xc7, 0xf4, 0x79, 0xdb, 0xf0, 0xb4, 0x56,
- 0x44, 0x37, 0xca, 0x5a, 0xc1, 0x8c, 0x48, 0xac, 0xae, 0x48,
- 0x80, 0x83, 0x01, 0x3f, 0xde, 0xd9, 0xd3, 0x2c, 0x51, 0x46,
- 0xb1, 0x41, 0xb6, 0xc6, 0x91, 0x72, 0xf9, 0x83, 0x55, 0x1b,
- 0x8c, 0xba, 0xf3, 0x73, 0xe5, 0x2c, 0x74, 0x50, 0x3a, 0xbe,
- 0xc5, 0x2f, 0xa7, 0xb2, 0x6d, 0x8c, 0x9e, 0x13, 0x77, 0xa3,
- 0x13, 0xcd, 0x6d, 0x8c, 0x45, 0xe1, 0xfc, 0x0b, 0xb7, 0x69,
- 0xe9, 0x27, 0xbc, 0x65, 0xc3, 0xfa, 0x9b, 0xd0, 0xef, 0xfe,
- 0xe8, 0x1f, 0xb3, 0x5e, 0x34, 0xf4, 0x8c, 0xea, 0xfc, 0xd3,
- 0x81, 0xbf, 0x3d, 0x30, 0xb2, 0xb4, 0x01, 0xe8, 0x43, 0x0f,
- 0xba, 0x02, 0x23, 0x42, 0x76, 0x82, 0x31, 0x73, 0x91, 0xed,
- 0x07, 0x46, 0x61, 0x0d, 0x39, 0x83, 0x40, 0xce, 0x7a, 0xd4,
- 0xdb, 0x80, 0x2c, 0x1f, 0x0d, 0xd1, 0x34, 0xd4, 0x92, 0xe3,
- 0xd4, 0xf1, 0xc2, 0x01, 0x02, 0x03, 0x01, 0x00, 0x01, 0x02,
- 0x82, 0x02, 0x01, 0x00, 0x97, 0x6c, 0xda, 0x6e, 0xea, 0x4f,
- 0xcf, 0xaf, 0xf7, 0x4c, 0xd9, 0xf1, 0x90, 0x00, 0x77, 0xdb,
- 0xf2, 0x97, 0x76, 0x72, 0xb9, 0xb7, 0x47, 0xd1, 0x9c, 0xdd,
- 0xcb, 0x4a, 0x33, 0x6e, 0xc9, 0x75, 0x76, 0xe6, 0xe4, 0xa5,
- 0x31, 0x8c, 0x77, 0x13, 0xb4, 0x29, 0xcd, 0xf5, 0x52, 0x17,
- 0xef, 0xf3, 0x08, 0x00, 0xe3, 0xbd, 0x2e, 0xbc, 0xd4, 0x52,
- 0x88, 0xe9, 0x30, 0x75, 0x0b, 0x02, 0xf5, 0xcd, 0x89, 0x0c,
- 0x6c, 0x57, 0x19, 0x27, 0x3d, 0x1e, 0x85, 0xb4, 0xc1, 0x2f,
- 0x1d, 0x92, 0x00, 0x5c, 0x76, 0x29, 0x4b, 0xa4, 0xe1, 0x12,
- 0xb3, 0xc8, 0x09, 0xfe, 0x0e, 0x78, 0x72, 0x61, 0xcb, 0x61,
- 0x6f, 0x39, 0x91, 0x95, 0x4e, 0xd5, 0x3e, 0xc7, 0x8f, 0xb8,
- 0xf6, 0x36, 0xfe, 0x9c, 0x93, 0x9a, 0x38, 0x25, 0x7a, 0xf4,
- 0x4a, 0x12, 0xd4, 0xa0, 0x13, 0xbd, 0xf9, 0x1d, 0x12, 0x3e,
- 0x21, 0x39, 0xfb, 0x72, 0xe0, 0x05, 0x3d, 0xc3, 0xe5, 0x50,
- 0xa8, 0x5d, 0x85, 0xa3, 0xea, 0x5f, 0x1c, 0xb2, 0x3f, 0xea,
- 0x6d, 0x03, 0x91, 0x55, 0xd8, 0x19, 0x0a, 0x21, 0x12, 0x16,
- 0xd9, 0x12, 0xc4, 0xe6, 0x07, 0x18, 0x5b, 0x26, 0xa4, 0xae,
- 0xed, 0x2b, 0xb7, 0xa6, 0xed, 0xf8, 0xad, 0xec, 0x77, 0xe6,
- 0x7f, 0x4f, 0x76, 0x00, 0xc0, 0xfa, 0x15, 0x92, 0xb4, 0x2c,
- 0x22, 0xc2, 0xeb, 0x6a, 0xad, 0x14, 0x05, 0xb2, 0xe5, 0x8a,
- 0x9e, 0x85, 0x83, 0xcc, 0x04, 0xf1, 0x56, 0x78, 0x44, 0x5e,
- 0xde, 0xe0, 0x60, 0x1a, 0x65, 0x79, 0x31, 0x23, 0x05, 0xbb,
- 0x01, 0xff, 0xdd, 0x2e, 0xb7, 0xb3, 0xaa, 0x74, 0xe0, 0xa5,
- 0x94, 0xaf, 0x4b, 0xde, 0x58, 0x0f, 0x55, 0xde, 0x33, 0xf6,
- 0xe3, 0xd6, 0x34, 0x36, 0x57, 0xd6, 0x79, 0x91, 0x2e, 0xbe,
- 0x3b, 0xd9, 0x4e, 0xb6, 0x9d, 0x21, 0x5c, 0xd3, 0x48, 0x14,
- 0x7f, 0x4a, 0xc4, 0x60, 0xa9, 0x29, 0xf8, 0x53, 0x7f, 0x88,
- 0x11, 0x2d, 0xb5, 0xc5, 0x2d, 0x6f, 0xee, 0x85, 0x0b, 0xf7,
- 0x8d, 0x9a, 0xbe, 0xb0, 0x42, 0xf2, 0x2e, 0x71, 0xaf, 0x19,
- 0x31, 0x6d, 0xec, 0xcd, 0x6f, 0x2b, 0x23, 0xdf, 0xb4, 0x40,
- 0xaf, 0x2c, 0x0a, 0xc3, 0x1b, 0x7d, 0x7d, 0x03, 0x1d, 0x4b,
- 0xf3, 0xb5, 0xe0, 0x85, 0xd8, 0xdf, 0x91, 0x6b, 0x0a, 0x69,
- 0xf7, 0xf2, 0x69, 0x66, 0x5b, 0xf1, 0xcf, 0x46, 0x7d, 0xe9,
- 0x70, 0xfa, 0x6d, 0x7e, 0x75, 0x4e, 0xa9, 0x77, 0xe6, 0x8c,
- 0x02, 0xf7, 0x14, 0x4d, 0xa5, 0x41, 0x8f, 0x3f, 0xc1, 0x62,
- 0x1e, 0x71, 0x5e, 0x38, 0xb4, 0xd6, 0xe6, 0xe1, 0x4b, 0xc2,
- 0x2c, 0x30, 0x83, 0x81, 0x6f, 0x49, 0x2e, 0x96, 0xe6, 0xc9,
- 0x9a, 0xf7, 0x5d, 0x09, 0xa0, 0x55, 0x02, 0xa5, 0x3a, 0x25,
- 0x23, 0xd0, 0x92, 0xc3, 0xa3, 0xe3, 0x0e, 0x12, 0x2f, 0x4d,
- 0xef, 0xf3, 0x55, 0x5a, 0xbe, 0xe6, 0x19, 0x86, 0x31, 0xab,
- 0x75, 0x9a, 0xd3, 0xf0, 0x2c, 0xc5, 0x41, 0x92, 0xd9, 0x1f,
- 0x5f, 0x11, 0x8c, 0x75, 0x1c, 0x63, 0xd0, 0x02, 0x80, 0x2c,
- 0x68, 0xcb, 0x93, 0xfb, 0x51, 0x73, 0x49, 0xb4, 0x60, 0xda,
- 0xe2, 0x26, 0xaf, 0xa9, 0x46, 0x12, 0xb8, 0xec, 0x50, 0xdd,
- 0x12, 0x06, 0x5f, 0xce, 0x59, 0xe6, 0xf6, 0x1c, 0xe0, 0x54,
- 0x10, 0xad, 0xf6, 0xcd, 0x98, 0xcc, 0x0f, 0xfb, 0xcb, 0x41,
- 0x14, 0x9d, 0xed, 0xe4, 0xb4, 0x74, 0x5f, 0x09, 0x60, 0xc7,
- 0x12, 0xf6, 0x7b, 0x3c, 0x8f, 0xa7, 0x20, 0xbc, 0xe4, 0xb1,
- 0xef, 0xeb, 0xa4, 0x93, 0xc5, 0x06, 0xca, 0x9a, 0x27, 0x9d,
- 0x87, 0xf3, 0xde, 0xca, 0xe5, 0xe7, 0xf6, 0x1c, 0x01, 0x65,
- 0x5b, 0xfb, 0x19, 0x79, 0x6e, 0x08, 0x26, 0xc5, 0xc8, 0x28,
- 0x0e, 0xb6, 0x3b, 0x07, 0x08, 0xc1, 0x02, 0x82, 0x01, 0x01,
- 0x00, 0xe8, 0x1c, 0x73, 0xa6, 0xb8, 0xe0, 0x0e, 0x6d, 0x8d,
- 0x1b, 0xb9, 0x53, 0xed, 0x58, 0x94, 0xe6, 0x1d, 0x60, 0x14,
- 0x5c, 0x76, 0x43, 0xc4, 0x58, 0x19, 0xc4, 0x24, 0xe8, 0xbc,
- 0x1b, 0x3b, 0x0b, 0x13, 0x24, 0x45, 0x54, 0x0e, 0xcc, 0x37,
- 0xf0, 0xe0, 0x63, 0x7d, 0xc3, 0xf7, 0xfb, 0x81, 0x74, 0x81,
- 0xc4, 0x0f, 0x1a, 0x21, 0x48, 0xaf, 0xce, 0xc1, 0xc4, 0x94,
- 0x18, 0x06, 0x44, 0x8d, 0xd3, 0xd2, 0x22, 0x2d, 0x2d, 0x3e,
- 0x5a, 0x31, 0xdc, 0x95, 0x8e, 0xf4, 0x41, 0xfc, 0x58, 0xc9,
- 0x40, 0x92, 0x17, 0x5f, 0xe3, 0xda, 0xac, 0x9e, 0x3f, 0x1c,
- 0x2a, 0x6b, 0x58, 0x5f, 0x48, 0x78, 0x20, 0xb1, 0xaf, 0x24,
- 0x9b, 0x3c, 0x20, 0x8b, 0x93, 0x25, 0x9e, 0xe6, 0x6b, 0xbc,
- 0x13, 0x42, 0x14, 0x6c, 0x36, 0x31, 0xff, 0x7a, 0xd1, 0xc1,
- 0x1a, 0x26, 0x14, 0x7f, 0xa9, 0x76, 0xa7, 0x0c, 0xf8, 0xcc,
- 0xed, 0x07, 0x6a, 0xd2, 0xdf, 0x62, 0xee, 0x0a, 0x7c, 0x84,
- 0xcb, 0x49, 0x90, 0xb2, 0x03, 0x0d, 0xa2, 0x82, 0x06, 0x77,
- 0xf1, 0xcd, 0x67, 0xf2, 0x47, 0x21, 0x02, 0x3f, 0x43, 0x21,
- 0xf0, 0x46, 0x30, 0x62, 0x51, 0x72, 0xb1, 0xe7, 0x48, 0xc6,
- 0x67, 0x12, 0xcd, 0x9e, 0xd6, 0x15, 0xe5, 0x21, 0xed, 0xfa,
- 0x8f, 0x30, 0xa6, 0x41, 0xfe, 0xb6, 0xfa, 0x8f, 0x34, 0x14,
- 0x19, 0xe8, 0x11, 0xf7, 0xa5, 0x77, 0x3e, 0xb7, 0xf9, 0x39,
- 0x07, 0x8c, 0x67, 0x2a, 0xab, 0x7b, 0x08, 0xf8, 0xb0, 0x06,
- 0xa8, 0xea, 0x2f, 0x8f, 0xfa, 0xcc, 0xcc, 0x40, 0xce, 0xf3,
- 0x70, 0x4f, 0x3f, 0x7f, 0xe2, 0x0c, 0xea, 0x76, 0x4a, 0x35,
- 0x4e, 0x47, 0xad, 0x2b, 0xa7, 0x97, 0x5d, 0x74, 0x43, 0x97,
- 0x90, 0xd2, 0xfb, 0xd9, 0xf9, 0x96, 0x01, 0x33, 0x05, 0xed,
- 0x7b, 0x03, 0x05, 0xad, 0xf8, 0x49, 0x03, 0x02, 0x82, 0x01,
- 0x01, 0x00, 0xd4, 0x40, 0x17, 0x66, 0x10, 0x92, 0x95, 0xc8,
- 0xec, 0x62, 0xa9, 0x7a, 0xcb, 0x93, 0x8e, 0xe6, 0x53, 0xd4,
- 0x80, 0x48, 0x27, 0x4b, 0x41, 0xce, 0x61, 0xdf, 0xbf, 0x94,
- 0xa4, 0x3d, 0x71, 0x03, 0x0b, 0xed, 0x25, 0x71, 0x98, 0xa4,
- 0xd6, 0xd5, 0x4a, 0x57, 0xf5, 0x6c, 0x1b, 0xda, 0x21, 0x7d,
- 0x35, 0x45, 0xb3, 0xf3, 0x6a, 0xd9, 0xd3, 0x43, 0xe8, 0x5c,
- 0x54, 0x1c, 0x83, 0x1b, 0xb4, 0x5f, 0xf2, 0x97, 0x24, 0x2e,
- 0xdc, 0x40, 0xde, 0x92, 0x23, 0x59, 0x8e, 0xbc, 0xd2, 0xa1,
- 0xf2, 0xe0, 0x4c, 0xdd, 0x0b, 0xd1, 0xe7, 0xae, 0x65, 0xbc,
- 0xb5, 0xf5, 0x5b, 0x98, 0xe9, 0xd7, 0xc2, 0xb7, 0x0e, 0x55,
- 0x71, 0x0e, 0x3c, 0x0a, 0x24, 0x6b, 0xa6, 0xe6, 0x14, 0x61,
- 0x11, 0xfd, 0x33, 0x42, 0x99, 0x2b, 0x84, 0x77, 0x74, 0x92,
- 0x91, 0xf5, 0x79, 0x79, 0xcf, 0xad, 0x8e, 0x04, 0xef, 0x80,
- 0x1e, 0x57, 0xf4, 0x14, 0xf5, 0x35, 0x09, 0x74, 0xb2, 0x13,
- 0x71, 0x58, 0x6b, 0xea, 0x32, 0x5d, 0xf3, 0xd3, 0x76, 0x48,
- 0x39, 0x10, 0x23, 0x84, 0x9d, 0xbe, 0x92, 0x77, 0x4a, 0xed,
- 0x70, 0x3e, 0x1a, 0xa2, 0x6c, 0xb3, 0x81, 0x00, 0xc3, 0xc9,
- 0xe4, 0x52, 0xc8, 0x24, 0x88, 0x0c, 0x41, 0xad, 0x87, 0x5a,
- 0xea, 0xa3, 0x7a, 0x85, 0x1c, 0x5e, 0x31, 0x7f, 0xc3, 0x35,
- 0xc6, 0xfa, 0x10, 0xc8, 0x75, 0x10, 0xc4, 0x96, 0x99, 0xe7,
- 0xfe, 0x01, 0xb4, 0x74, 0xdb, 0xb4, 0x11, 0xc3, 0xc8, 0x8c,
- 0xf6, 0xf7, 0x3b, 0x66, 0x50, 0xfc, 0xdb, 0xeb, 0xca, 0x47,
- 0x85, 0x89, 0xe1, 0x65, 0xd9, 0x62, 0x34, 0x3c, 0x70, 0xd8,
- 0x2e, 0xb4, 0x2f, 0x65, 0x3c, 0x4a, 0xa6, 0x2a, 0xe7, 0xc7,
- 0xd8, 0x41, 0x8f, 0x8a, 0x43, 0xbf, 0x42, 0xf2, 0x4d, 0xbc,
- 0xfc, 0x9e, 0x27, 0x95, 0xfb, 0x75, 0xff, 0xab, 0x02, 0x82,
- 0x01, 0x00, 0x41, 0x2f, 0x44, 0x57, 0x6d, 0x12, 0x17, 0x5b,
- 0x32, 0xc6, 0xb7, 0x6c, 0x57, 0x7a, 0x8a, 0x0e, 0x79, 0xef,
- 0x72, 0xa8, 0x68, 0xda, 0x2d, 0x38, 0xe4, 0xbb, 0x8d, 0xf6,
- 0x02, 0x65, 0xcf, 0x56, 0x13, 0xe1, 0x1a, 0xcb, 0x39, 0x80,
- 0xa6, 0xb1, 0x32, 0x03, 0x1e, 0xdd, 0xbb, 0x35, 0xd9, 0xac,
- 0x43, 0x89, 0x31, 0x08, 0x90, 0x92, 0x5e, 0x35, 0x3d, 0x7b,
- 0x9c, 0x6f, 0x86, 0xcb, 0x17, 0xdd, 0x85, 0xe4, 0xed, 0x35,
- 0x08, 0x8e, 0xc1, 0xf4, 0x05, 0xd8, 0x68, 0xc6, 0x63, 0x3c,
- 0xf7, 0xff, 0xf7, 0x47, 0x33, 0x39, 0xc5, 0x3e, 0xb7, 0x0e,
- 0x58, 0x35, 0x9d, 0x81, 0xea, 0xf8, 0x6a, 0x2c, 0x1c, 0x5a,
- 0x68, 0x78, 0x64, 0x11, 0x6b, 0xc1, 0x3e, 0x4e, 0x7a, 0xbd,
- 0x84, 0xcb, 0x0f, 0xc2, 0xb6, 0x85, 0x1d, 0xd3, 0x76, 0xc5,
- 0x93, 0x6a, 0x69, 0x89, 0x56, 0x34, 0xdc, 0x4a, 0x9b, 0xbc,
- 0xff, 0xa8, 0x0d, 0x6e, 0x35, 0x9c, 0x60, 0xa7, 0x23, 0x30,
- 0xc7, 0x06, 0x64, 0x39, 0x8b, 0x94, 0x89, 0xee, 0xba, 0x7f,
- 0x60, 0x8d, 0xfa, 0xb6, 0x97, 0x76, 0xdc, 0x51, 0x4a, 0x3c,
- 0xeb, 0x3a, 0x14, 0x2c, 0x20, 0x60, 0x69, 0x4a, 0x86, 0xfe,
- 0x8c, 0x21, 0x84, 0x49, 0x54, 0xb3, 0x20, 0xe1, 0x01, 0x7f,
- 0x58, 0xdf, 0x7f, 0xb5, 0x21, 0x51, 0x8c, 0x47, 0x9f, 0x91,
- 0xeb, 0x97, 0x3e, 0xf2, 0x54, 0xcf, 0x16, 0x46, 0xf9, 0xd9,
- 0xb6, 0xe7, 0x64, 0xc9, 0xd0, 0x54, 0xea, 0x2f, 0xa1, 0xcf,
- 0xa5, 0x7f, 0x28, 0x8d, 0x84, 0xec, 0xd5, 0x39, 0x03, 0x76,
- 0x5b, 0x2d, 0x8e, 0x43, 0xf2, 0x01, 0x24, 0xc9, 0x6f, 0xc0,
- 0xf5, 0x69, 0x6f, 0x7d, 0xb5, 0x85, 0xd2, 0x5f, 0x7f, 0x78,
- 0x40, 0x07, 0x7f, 0x09, 0x15, 0xb5, 0x1f, 0x28, 0x65, 0x10,
- 0xe4, 0x19, 0xa8, 0xc6, 0x9e, 0x8d, 0xdc, 0xcb, 0x02, 0x82,
- 0x01, 0x00, 0x13, 0x01, 0xee, 0x56, 0x80, 0x93, 0x70, 0x00,
- 0x7f, 0x52, 0xd2, 0x94, 0xa1, 0x98, 0x84, 0x4a, 0x92, 0x25,
- 0x4c, 0x9b, 0xa9, 0x91, 0x2e, 0xc2, 0x79, 0xb7, 0x5c, 0xe3,
- 0xc5, 0xd5, 0x8e, 0xc2, 0x54, 0x16, 0x17, 0xad, 0x55, 0x9b,
- 0x25, 0x76, 0x12, 0x63, 0x50, 0x22, 0x2f, 0x58, 0x58, 0x79,
- 0x6b, 0x04, 0xe3, 0xf9, 0x9f, 0x8f, 0x04, 0x41, 0x67, 0x94,
- 0xa5, 0x1f, 0xac, 0x8a, 0x15, 0x9c, 0x26, 0x10, 0x6c, 0xf8,
- 0x19, 0x57, 0x61, 0xd7, 0x3a, 0x7d, 0x31, 0xb0, 0x2d, 0x38,
- 0xbd, 0x94, 0x62, 0xad, 0xc4, 0xfa, 0x36, 0x42, 0x42, 0xf0,
- 0x24, 0x67, 0x65, 0x9d, 0x8b, 0x0b, 0x7c, 0x6f, 0x82, 0x44,
- 0x1a, 0x8c, 0xc8, 0xc9, 0xab, 0xbb, 0x4c, 0x45, 0xfc, 0x7b,
- 0x38, 0xee, 0x30, 0xe1, 0xfc, 0xef, 0x8d, 0xbc, 0x58, 0xdf,
- 0x2b, 0x5d, 0x0d, 0x54, 0xe0, 0x49, 0x4d, 0x97, 0x99, 0x8f,
- 0x22, 0xa8, 0x83, 0xbe, 0x40, 0xbb, 0x50, 0x2e, 0x78, 0x28,
- 0x0f, 0x95, 0x78, 0x8c, 0x8f, 0x98, 0x24, 0x56, 0xc2, 0x97,
- 0xf3, 0x2c, 0x43, 0xd2, 0x03, 0x82, 0x66, 0x81, 0x72, 0x5f,
- 0x53, 0x16, 0xec, 0xb1, 0xb1, 0x04, 0x5e, 0x40, 0x20, 0x48,
- 0x7b, 0x3f, 0x02, 0x97, 0x6a, 0xeb, 0x96, 0x12, 0x21, 0x35,
- 0xfe, 0x1f, 0x47, 0xc0, 0x95, 0xea, 0xc5, 0x8a, 0x08, 0x84,
- 0x4f, 0x5e, 0x63, 0x94, 0x60, 0x0f, 0x71, 0x5b, 0x7f, 0x4a,
- 0xec, 0x4f, 0x60, 0xc6, 0xba, 0x4a, 0x24, 0xf1, 0x20, 0x8b,
- 0xa7, 0x2e, 0x3a, 0xce, 0x8d, 0xe0, 0x27, 0x1d, 0xb5, 0x8e,
- 0xb4, 0x21, 0xc5, 0xe2, 0xa6, 0x16, 0x0a, 0x51, 0x83, 0x55,
- 0x88, 0xd1, 0x30, 0x11, 0x63, 0xd5, 0xd7, 0x8d, 0xae, 0x16,
- 0x12, 0x82, 0xc4, 0x85, 0x00, 0x4e, 0x27, 0x83, 0xa5, 0x7c,
- 0x90, 0x2e, 0xe5, 0xa2, 0xa3, 0xd3, 0x4c, 0x63, 0x02, 0x82,
- 0x01, 0x01, 0x00, 0x86, 0x08, 0x98, 0x98, 0xa5, 0x00, 0x05,
- 0x39, 0x77, 0xd9, 0x66, 0xb3, 0xcf, 0xca, 0xa0, 0x71, 0xb3,
- 0x50, 0xce, 0x3d, 0xb1, 0x93, 0x95, 0x35, 0xc4, 0xd4, 0x2e,
- 0x90, 0xdf, 0x0f, 0xfc, 0x60, 0xc1, 0x94, 0x68, 0x61, 0x43,
- 0xca, 0x9a, 0x23, 0x4a, 0x1e, 0x45, 0x72, 0x99, 0xb5, 0x1e,
- 0x61, 0x8d, 0x77, 0x0f, 0xa0, 0xbb, 0xd7, 0x77, 0xb4, 0x2a,
- 0x15, 0x11, 0x88, 0x2d, 0xb3, 0x56, 0x61, 0x5e, 0x6a, 0xed,
- 0xa4, 0x46, 0x4a, 0x3f, 0x50, 0x11, 0xd6, 0xba, 0xb6, 0xd7,
- 0x95, 0x65, 0x53, 0xc3, 0xa1, 0x8f, 0xe0, 0xa3, 0xf5, 0x1c,
- 0xfd, 0xaf, 0x6e, 0x43, 0xd7, 0x17, 0xa7, 0xd3, 0x81, 0x1b,
- 0xa4, 0xdf, 0xe0, 0x97, 0x8a, 0x46, 0x03, 0xd3, 0x46, 0x0e,
- 0x83, 0x48, 0x4e, 0xd2, 0x02, 0xcb, 0xc0, 0xad, 0x79, 0x95,
- 0x8c, 0x96, 0xba, 0x40, 0x34, 0x11, 0x71, 0x5e, 0xe9, 0x11,
- 0xf9, 0xc5, 0x4a, 0x5e, 0x91, 0x9d, 0xf5, 0x92, 0x4f, 0xeb,
- 0xc6, 0x70, 0x02, 0x2d, 0x3d, 0x04, 0xaa, 0xe9, 0x3a, 0x8e,
- 0xd5, 0xa8, 0xad, 0xf7, 0xce, 0x0d, 0x16, 0xb2, 0xec, 0x0a,
- 0x9c, 0xf5, 0x94, 0x39, 0xb9, 0x8a, 0xfc, 0x1e, 0xf9, 0xcc,
- 0xf2, 0x5f, 0x21, 0x31, 0x74, 0x72, 0x6b, 0x64, 0xae, 0x35,
- 0x61, 0x8d, 0x0d, 0xcb, 0xe7, 0xda, 0x39, 0xca, 0xf3, 0x21,
- 0x66, 0x0b, 0x95, 0xd7, 0x0a, 0x7c, 0xca, 0xa1, 0xa9, 0x5a,
- 0xe8, 0xac, 0xe0, 0x71, 0x54, 0xaf, 0x28, 0xcf, 0xd5, 0x70,
- 0x89, 0xe0, 0xf3, 0x9e, 0x43, 0x6c, 0x8d, 0x7b, 0x99, 0x01,
- 0x68, 0x4d, 0xa1, 0x45, 0x46, 0x0c, 0x43, 0xbc, 0xcc, 0x2c,
- 0xdd, 0xc5, 0x46, 0xc8, 0x4e, 0x0e, 0xbe, 0xed, 0xb9, 0x26,
- 0xab, 0x2e, 0xdb, 0xeb, 0x8f, 0xff, 0xdb, 0xb0, 0xc6, 0x55,
- 0xaf, 0xf8, 0x2a, 0x91, 0x9d, 0x50, 0x44, 0x21, 0x17,
+ 0x30,
+ 0x82,
+ 0x09,
+ 0x29,
+ 0x02,
+ 0x01,
+ 0x00,
+ 0x02,
+ 0x82,
+ 0x02,
+ 0x01,
+ 0x00,
+ 0xc0,
+ 0x71,
+ 0xac,
+ 0x1a,
+ 0x13,
+ 0x88,
+ 0x82,
+ 0x43,
+ 0x3b,
+ 0x51,
+ 0x57,
+ 0x71,
+ 0x8d,
+ 0xb6,
+ 0x2b,
+ 0x82,
+ 0x65,
+ 0x21,
+ 0x53,
+ 0x5f,
+ 0x28,
+ 0x29,
+ 0x4f,
+ 0x8d,
+ 0x7c,
+ 0x8a,
+ 0xb9,
+ 0x44,
+ 0xb3,
+ 0x28,
+ 0x41,
+ 0x4f,
+ 0xd3,
+ 0xfa,
+ 0x6a,
+ 0xf8,
+ 0xb9,
+ 0x28,
+ 0x50,
+ 0x39,
+ 0x67,
+ 0x53,
+ 0x2c,
+ 0x3c,
+ 0xd7,
+ 0xcb,
+ 0x96,
+ 0x41,
+ 0x40,
+ 0x32,
+ 0xbb,
+ 0xeb,
+ 0x70,
+ 0xae,
+ 0x1f,
+ 0xb0,
+ 0x65,
+ 0xf7,
+ 0x3a,
+ 0xd9,
+ 0x22,
+ 0xfd,
+ 0x10,
+ 0xae,
+ 0xbd,
+ 0x02,
+ 0xe2,
+ 0xdd,
+ 0xf3,
+ 0xc2,
+ 0x79,
+ 0x3c,
+ 0xc6,
+ 0xfc,
+ 0x75,
+ 0xbb,
+ 0xaf,
+ 0x4e,
+ 0x3a,
+ 0x36,
+ 0xc2,
+ 0x4f,
+ 0xea,
+ 0x25,
+ 0xdf,
+ 0x13,
+ 0x16,
+ 0x4b,
+ 0x20,
+ 0xfe,
+ 0x4b,
+ 0x69,
+ 0x16,
+ 0xc4,
+ 0x7f,
+ 0x1a,
+ 0x43,
+ 0xa6,
+ 0x17,
+ 0x1b,
+ 0xb9,
+ 0x0a,
+ 0xf3,
+ 0x09,
+ 0x86,
+ 0x28,
+ 0x89,
+ 0xcf,
+ 0x2c,
+ 0xd0,
+ 0xd4,
+ 0x81,
+ 0xaf,
+ 0xc6,
+ 0x6d,
+ 0xe6,
+ 0x21,
+ 0x8d,
+ 0xee,
+ 0xef,
+ 0xea,
+ 0xdc,
+ 0xb7,
+ 0xc6,
+ 0x3b,
+ 0x63,
+ 0x9f,
+ 0x0e,
+ 0xad,
+ 0x89,
+ 0x78,
+ 0x23,
+ 0x18,
+ 0xbf,
+ 0x70,
+ 0x7e,
+ 0x84,
+ 0xe0,
+ 0x37,
+ 0xec,
+ 0xdb,
+ 0x8e,
+ 0x9c,
+ 0x3e,
+ 0x6a,
+ 0x19,
+ 0xcc,
+ 0x99,
+ 0x72,
+ 0xe6,
+ 0xb5,
+ 0x7d,
+ 0x6d,
+ 0xfa,
+ 0xe5,
+ 0xd3,
+ 0xe4,
+ 0x90,
+ 0xb5,
+ 0xb2,
+ 0xb2,
+ 0x12,
+ 0x70,
+ 0x4e,
+ 0xca,
+ 0xf8,
+ 0x10,
+ 0xf8,
+ 0xa3,
+ 0x14,
+ 0xc2,
+ 0x48,
+ 0x19,
+ 0xeb,
+ 0x60,
+ 0x99,
+ 0xbb,
+ 0x2a,
+ 0x1f,
+ 0xb1,
+ 0x7a,
+ 0xb1,
+ 0x3d,
+ 0x24,
+ 0xfb,
+ 0xa0,
+ 0x29,
+ 0xda,
+ 0xbd,
+ 0x1b,
+ 0xd7,
+ 0xa4,
+ 0xbf,
+ 0xef,
+ 0x60,
+ 0x2d,
+ 0x22,
+ 0xca,
+ 0x65,
+ 0x98,
+ 0xf1,
+ 0xc4,
+ 0xe1,
+ 0xc9,
+ 0x02,
+ 0x6b,
+ 0x16,
+ 0x28,
+ 0x2f,
+ 0xa1,
+ 0xaa,
+ 0x79,
+ 0x00,
+ 0xda,
+ 0xdc,
+ 0x7c,
+ 0x43,
+ 0xf7,
+ 0x42,
+ 0x3c,
+ 0xa0,
+ 0xef,
+ 0x68,
+ 0xf7,
+ 0xdf,
+ 0xb9,
+ 0x69,
+ 0xfb,
+ 0x8e,
+ 0x01,
+ 0xed,
+ 0x01,
+ 0x42,
+ 0xb5,
+ 0x4e,
+ 0x57,
+ 0xa6,
+ 0x26,
+ 0xb8,
+ 0xd0,
+ 0x7b,
+ 0x56,
+ 0x6d,
+ 0x03,
+ 0xc6,
+ 0x40,
+ 0x8c,
+ 0x8c,
+ 0x2a,
+ 0x55,
+ 0xd7,
+ 0x9c,
+ 0x35,
+ 0x00,
+ 0x94,
+ 0x93,
+ 0xec,
+ 0x03,
+ 0xeb,
+ 0x22,
+ 0xef,
+ 0x77,
+ 0xbb,
+ 0x79,
+ 0x13,
+ 0x3f,
+ 0x15,
+ 0xa1,
+ 0x8f,
+ 0xca,
+ 0xdf,
+ 0xfd,
+ 0xd3,
+ 0xb8,
+ 0xe1,
+ 0xd4,
+ 0xcc,
+ 0x09,
+ 0x3f,
+ 0x3c,
+ 0x2c,
+ 0xdb,
+ 0xd1,
+ 0x49,
+ 0x7f,
+ 0x38,
+ 0x07,
+ 0x83,
+ 0x6d,
+ 0xeb,
+ 0x08,
+ 0x66,
+ 0xe9,
+ 0x06,
+ 0x44,
+ 0x12,
+ 0xac,
+ 0x95,
+ 0x22,
+ 0x90,
+ 0x23,
+ 0x67,
+ 0xd4,
+ 0x08,
+ 0xcc,
+ 0xf4,
+ 0xb7,
+ 0xdc,
+ 0xcc,
+ 0x87,
+ 0xd4,
+ 0xac,
+ 0x69,
+ 0x35,
+ 0x4c,
+ 0xb5,
+ 0x39,
+ 0x36,
+ 0xcd,
+ 0xa4,
+ 0xd2,
+ 0x95,
+ 0xca,
+ 0x0d,
+ 0xc5,
+ 0xda,
+ 0xc2,
+ 0xc5,
+ 0x22,
+ 0x32,
+ 0x28,
+ 0x08,
+ 0xe3,
+ 0xd2,
+ 0x8b,
+ 0x38,
+ 0x30,
+ 0xdc,
+ 0x8c,
+ 0x75,
+ 0x4f,
+ 0x6a,
+ 0xec,
+ 0x7a,
+ 0xac,
+ 0x16,
+ 0x3e,
+ 0xa8,
+ 0xd4,
+ 0x6a,
+ 0x45,
+ 0xe1,
+ 0xa8,
+ 0x4f,
+ 0x2e,
+ 0x80,
+ 0x34,
+ 0xaa,
+ 0x54,
+ 0x1b,
+ 0x02,
+ 0x95,
+ 0x7d,
+ 0x8a,
+ 0x6d,
+ 0xcc,
+ 0x79,
+ 0xca,
+ 0xf2,
+ 0xa4,
+ 0x2e,
+ 0x8d,
+ 0xfb,
+ 0xfe,
+ 0x15,
+ 0x51,
+ 0x10,
+ 0x0e,
+ 0x4d,
+ 0x88,
+ 0xb1,
+ 0xc7,
+ 0xf4,
+ 0x79,
+ 0xdb,
+ 0xf0,
+ 0xb4,
+ 0x56,
+ 0x44,
+ 0x37,
+ 0xca,
+ 0x5a,
+ 0xc1,
+ 0x8c,
+ 0x48,
+ 0xac,
+ 0xae,
+ 0x48,
+ 0x80,
+ 0x83,
+ 0x01,
+ 0x3f,
+ 0xde,
+ 0xd9,
+ 0xd3,
+ 0x2c,
+ 0x51,
+ 0x46,
+ 0xb1,
+ 0x41,
+ 0xb6,
+ 0xc6,
+ 0x91,
+ 0x72,
+ 0xf9,
+ 0x83,
+ 0x55,
+ 0x1b,
+ 0x8c,
+ 0xba,
+ 0xf3,
+ 0x73,
+ 0xe5,
+ 0x2c,
+ 0x74,
+ 0x50,
+ 0x3a,
+ 0xbe,
+ 0xc5,
+ 0x2f,
+ 0xa7,
+ 0xb2,
+ 0x6d,
+ 0x8c,
+ 0x9e,
+ 0x13,
+ 0x77,
+ 0xa3,
+ 0x13,
+ 0xcd,
+ 0x6d,
+ 0x8c,
+ 0x45,
+ 0xe1,
+ 0xfc,
+ 0x0b,
+ 0xb7,
+ 0x69,
+ 0xe9,
+ 0x27,
+ 0xbc,
+ 0x65,
+ 0xc3,
+ 0xfa,
+ 0x9b,
+ 0xd0,
+ 0xef,
+ 0xfe,
+ 0xe8,
+ 0x1f,
+ 0xb3,
+ 0x5e,
+ 0x34,
+ 0xf4,
+ 0x8c,
+ 0xea,
+ 0xfc,
+ 0xd3,
+ 0x81,
+ 0xbf,
+ 0x3d,
+ 0x30,
+ 0xb2,
+ 0xb4,
+ 0x01,
+ 0xe8,
+ 0x43,
+ 0x0f,
+ 0xba,
+ 0x02,
+ 0x23,
+ 0x42,
+ 0x76,
+ 0x82,
+ 0x31,
+ 0x73,
+ 0x91,
+ 0xed,
+ 0x07,
+ 0x46,
+ 0x61,
+ 0x0d,
+ 0x39,
+ 0x83,
+ 0x40,
+ 0xce,
+ 0x7a,
+ 0xd4,
+ 0xdb,
+ 0x80,
+ 0x2c,
+ 0x1f,
+ 0x0d,
+ 0xd1,
+ 0x34,
+ 0xd4,
+ 0x92,
+ 0xe3,
+ 0xd4,
+ 0xf1,
+ 0xc2,
+ 0x01,
+ 0x02,
+ 0x03,
+ 0x01,
+ 0x00,
+ 0x01,
+ 0x02,
+ 0x82,
+ 0x02,
+ 0x01,
+ 0x00,
+ 0x97,
+ 0x6c,
+ 0xda,
+ 0x6e,
+ 0xea,
+ 0x4f,
+ 0xcf,
+ 0xaf,
+ 0xf7,
+ 0x4c,
+ 0xd9,
+ 0xf1,
+ 0x90,
+ 0x00,
+ 0x77,
+ 0xdb,
+ 0xf2,
+ 0x97,
+ 0x76,
+ 0x72,
+ 0xb9,
+ 0xb7,
+ 0x47,
+ 0xd1,
+ 0x9c,
+ 0xdd,
+ 0xcb,
+ 0x4a,
+ 0x33,
+ 0x6e,
+ 0xc9,
+ 0x75,
+ 0x76,
+ 0xe6,
+ 0xe4,
+ 0xa5,
+ 0x31,
+ 0x8c,
+ 0x77,
+ 0x13,
+ 0xb4,
+ 0x29,
+ 0xcd,
+ 0xf5,
+ 0x52,
+ 0x17,
+ 0xef,
+ 0xf3,
+ 0x08,
+ 0x00,
+ 0xe3,
+ 0xbd,
+ 0x2e,
+ 0xbc,
+ 0xd4,
+ 0x52,
+ 0x88,
+ 0xe9,
+ 0x30,
+ 0x75,
+ 0x0b,
+ 0x02,
+ 0xf5,
+ 0xcd,
+ 0x89,
+ 0x0c,
+ 0x6c,
+ 0x57,
+ 0x19,
+ 0x27,
+ 0x3d,
+ 0x1e,
+ 0x85,
+ 0xb4,
+ 0xc1,
+ 0x2f,
+ 0x1d,
+ 0x92,
+ 0x00,
+ 0x5c,
+ 0x76,
+ 0x29,
+ 0x4b,
+ 0xa4,
+ 0xe1,
+ 0x12,
+ 0xb3,
+ 0xc8,
+ 0x09,
+ 0xfe,
+ 0x0e,
+ 0x78,
+ 0x72,
+ 0x61,
+ 0xcb,
+ 0x61,
+ 0x6f,
+ 0x39,
+ 0x91,
+ 0x95,
+ 0x4e,
+ 0xd5,
+ 0x3e,
+ 0xc7,
+ 0x8f,
+ 0xb8,
+ 0xf6,
+ 0x36,
+ 0xfe,
+ 0x9c,
+ 0x93,
+ 0x9a,
+ 0x38,
+ 0x25,
+ 0x7a,
+ 0xf4,
+ 0x4a,
+ 0x12,
+ 0xd4,
+ 0xa0,
+ 0x13,
+ 0xbd,
+ 0xf9,
+ 0x1d,
+ 0x12,
+ 0x3e,
+ 0x21,
+ 0x39,
+ 0xfb,
+ 0x72,
+ 0xe0,
+ 0x05,
+ 0x3d,
+ 0xc3,
+ 0xe5,
+ 0x50,
+ 0xa8,
+ 0x5d,
+ 0x85,
+ 0xa3,
+ 0xea,
+ 0x5f,
+ 0x1c,
+ 0xb2,
+ 0x3f,
+ 0xea,
+ 0x6d,
+ 0x03,
+ 0x91,
+ 0x55,
+ 0xd8,
+ 0x19,
+ 0x0a,
+ 0x21,
+ 0x12,
+ 0x16,
+ 0xd9,
+ 0x12,
+ 0xc4,
+ 0xe6,
+ 0x07,
+ 0x18,
+ 0x5b,
+ 0x26,
+ 0xa4,
+ 0xae,
+ 0xed,
+ 0x2b,
+ 0xb7,
+ 0xa6,
+ 0xed,
+ 0xf8,
+ 0xad,
+ 0xec,
+ 0x77,
+ 0xe6,
+ 0x7f,
+ 0x4f,
+ 0x76,
+ 0x00,
+ 0xc0,
+ 0xfa,
+ 0x15,
+ 0x92,
+ 0xb4,
+ 0x2c,
+ 0x22,
+ 0xc2,
+ 0xeb,
+ 0x6a,
+ 0xad,
+ 0x14,
+ 0x05,
+ 0xb2,
+ 0xe5,
+ 0x8a,
+ 0x9e,
+ 0x85,
+ 0x83,
+ 0xcc,
+ 0x04,
+ 0xf1,
+ 0x56,
+ 0x78,
+ 0x44,
+ 0x5e,
+ 0xde,
+ 0xe0,
+ 0x60,
+ 0x1a,
+ 0x65,
+ 0x79,
+ 0x31,
+ 0x23,
+ 0x05,
+ 0xbb,
+ 0x01,
+ 0xff,
+ 0xdd,
+ 0x2e,
+ 0xb7,
+ 0xb3,
+ 0xaa,
+ 0x74,
+ 0xe0,
+ 0xa5,
+ 0x94,
+ 0xaf,
+ 0x4b,
+ 0xde,
+ 0x58,
+ 0x0f,
+ 0x55,
+ 0xde,
+ 0x33,
+ 0xf6,
+ 0xe3,
+ 0xd6,
+ 0x34,
+ 0x36,
+ 0x57,
+ 0xd6,
+ 0x79,
+ 0x91,
+ 0x2e,
+ 0xbe,
+ 0x3b,
+ 0xd9,
+ 0x4e,
+ 0xb6,
+ 0x9d,
+ 0x21,
+ 0x5c,
+ 0xd3,
+ 0x48,
+ 0x14,
+ 0x7f,
+ 0x4a,
+ 0xc4,
+ 0x60,
+ 0xa9,
+ 0x29,
+ 0xf8,
+ 0x53,
+ 0x7f,
+ 0x88,
+ 0x11,
+ 0x2d,
+ 0xb5,
+ 0xc5,
+ 0x2d,
+ 0x6f,
+ 0xee,
+ 0x85,
+ 0x0b,
+ 0xf7,
+ 0x8d,
+ 0x9a,
+ 0xbe,
+ 0xb0,
+ 0x42,
+ 0xf2,
+ 0x2e,
+ 0x71,
+ 0xaf,
+ 0x19,
+ 0x31,
+ 0x6d,
+ 0xec,
+ 0xcd,
+ 0x6f,
+ 0x2b,
+ 0x23,
+ 0xdf,
+ 0xb4,
+ 0x40,
+ 0xaf,
+ 0x2c,
+ 0x0a,
+ 0xc3,
+ 0x1b,
+ 0x7d,
+ 0x7d,
+ 0x03,
+ 0x1d,
+ 0x4b,
+ 0xf3,
+ 0xb5,
+ 0xe0,
+ 0x85,
+ 0xd8,
+ 0xdf,
+ 0x91,
+ 0x6b,
+ 0x0a,
+ 0x69,
+ 0xf7,
+ 0xf2,
+ 0x69,
+ 0x66,
+ 0x5b,
+ 0xf1,
+ 0xcf,
+ 0x46,
+ 0x7d,
+ 0xe9,
+ 0x70,
+ 0xfa,
+ 0x6d,
+ 0x7e,
+ 0x75,
+ 0x4e,
+ 0xa9,
+ 0x77,
+ 0xe6,
+ 0x8c,
+ 0x02,
+ 0xf7,
+ 0x14,
+ 0x4d,
+ 0xa5,
+ 0x41,
+ 0x8f,
+ 0x3f,
+ 0xc1,
+ 0x62,
+ 0x1e,
+ 0x71,
+ 0x5e,
+ 0x38,
+ 0xb4,
+ 0xd6,
+ 0xe6,
+ 0xe1,
+ 0x4b,
+ 0xc2,
+ 0x2c,
+ 0x30,
+ 0x83,
+ 0x81,
+ 0x6f,
+ 0x49,
+ 0x2e,
+ 0x96,
+ 0xe6,
+ 0xc9,
+ 0x9a,
+ 0xf7,
+ 0x5d,
+ 0x09,
+ 0xa0,
+ 0x55,
+ 0x02,
+ 0xa5,
+ 0x3a,
+ 0x25,
+ 0x23,
+ 0xd0,
+ 0x92,
+ 0xc3,
+ 0xa3,
+ 0xe3,
+ 0x0e,
+ 0x12,
+ 0x2f,
+ 0x4d,
+ 0xef,
+ 0xf3,
+ 0x55,
+ 0x5a,
+ 0xbe,
+ 0xe6,
+ 0x19,
+ 0x86,
+ 0x31,
+ 0xab,
+ 0x75,
+ 0x9a,
+ 0xd3,
+ 0xf0,
+ 0x2c,
+ 0xc5,
+ 0x41,
+ 0x92,
+ 0xd9,
+ 0x1f,
+ 0x5f,
+ 0x11,
+ 0x8c,
+ 0x75,
+ 0x1c,
+ 0x63,
+ 0xd0,
+ 0x02,
+ 0x80,
+ 0x2c,
+ 0x68,
+ 0xcb,
+ 0x93,
+ 0xfb,
+ 0x51,
+ 0x73,
+ 0x49,
+ 0xb4,
+ 0x60,
+ 0xda,
+ 0xe2,
+ 0x26,
+ 0xaf,
+ 0xa9,
+ 0x46,
+ 0x12,
+ 0xb8,
+ 0xec,
+ 0x50,
+ 0xdd,
+ 0x12,
+ 0x06,
+ 0x5f,
+ 0xce,
+ 0x59,
+ 0xe6,
+ 0xf6,
+ 0x1c,
+ 0xe0,
+ 0x54,
+ 0x10,
+ 0xad,
+ 0xf6,
+ 0xcd,
+ 0x98,
+ 0xcc,
+ 0x0f,
+ 0xfb,
+ 0xcb,
+ 0x41,
+ 0x14,
+ 0x9d,
+ 0xed,
+ 0xe4,
+ 0xb4,
+ 0x74,
+ 0x5f,
+ 0x09,
+ 0x60,
+ 0xc7,
+ 0x12,
+ 0xf6,
+ 0x7b,
+ 0x3c,
+ 0x8f,
+ 0xa7,
+ 0x20,
+ 0xbc,
+ 0xe4,
+ 0xb1,
+ 0xef,
+ 0xeb,
+ 0xa4,
+ 0x93,
+ 0xc5,
+ 0x06,
+ 0xca,
+ 0x9a,
+ 0x27,
+ 0x9d,
+ 0x87,
+ 0xf3,
+ 0xde,
+ 0xca,
+ 0xe5,
+ 0xe7,
+ 0xf6,
+ 0x1c,
+ 0x01,
+ 0x65,
+ 0x5b,
+ 0xfb,
+ 0x19,
+ 0x79,
+ 0x6e,
+ 0x08,
+ 0x26,
+ 0xc5,
+ 0xc8,
+ 0x28,
+ 0x0e,
+ 0xb6,
+ 0x3b,
+ 0x07,
+ 0x08,
+ 0xc1,
+ 0x02,
+ 0x82,
+ 0x01,
+ 0x01,
+ 0x00,
+ 0xe8,
+ 0x1c,
+ 0x73,
+ 0xa6,
+ 0xb8,
+ 0xe0,
+ 0x0e,
+ 0x6d,
+ 0x8d,
+ 0x1b,
+ 0xb9,
+ 0x53,
+ 0xed,
+ 0x58,
+ 0x94,
+ 0xe6,
+ 0x1d,
+ 0x60,
+ 0x14,
+ 0x5c,
+ 0x76,
+ 0x43,
+ 0xc4,
+ 0x58,
+ 0x19,
+ 0xc4,
+ 0x24,
+ 0xe8,
+ 0xbc,
+ 0x1b,
+ 0x3b,
+ 0x0b,
+ 0x13,
+ 0x24,
+ 0x45,
+ 0x54,
+ 0x0e,
+ 0xcc,
+ 0x37,
+ 0xf0,
+ 0xe0,
+ 0x63,
+ 0x7d,
+ 0xc3,
+ 0xf7,
+ 0xfb,
+ 0x81,
+ 0x74,
+ 0x81,
+ 0xc4,
+ 0x0f,
+ 0x1a,
+ 0x21,
+ 0x48,
+ 0xaf,
+ 0xce,
+ 0xc1,
+ 0xc4,
+ 0x94,
+ 0x18,
+ 0x06,
+ 0x44,
+ 0x8d,
+ 0xd3,
+ 0xd2,
+ 0x22,
+ 0x2d,
+ 0x2d,
+ 0x3e,
+ 0x5a,
+ 0x31,
+ 0xdc,
+ 0x95,
+ 0x8e,
+ 0xf4,
+ 0x41,
+ 0xfc,
+ 0x58,
+ 0xc9,
+ 0x40,
+ 0x92,
+ 0x17,
+ 0x5f,
+ 0xe3,
+ 0xda,
+ 0xac,
+ 0x9e,
+ 0x3f,
+ 0x1c,
+ 0x2a,
+ 0x6b,
+ 0x58,
+ 0x5f,
+ 0x48,
+ 0x78,
+ 0x20,
+ 0xb1,
+ 0xaf,
+ 0x24,
+ 0x9b,
+ 0x3c,
+ 0x20,
+ 0x8b,
+ 0x93,
+ 0x25,
+ 0x9e,
+ 0xe6,
+ 0x6b,
+ 0xbc,
+ 0x13,
+ 0x42,
+ 0x14,
+ 0x6c,
+ 0x36,
+ 0x31,
+ 0xff,
+ 0x7a,
+ 0xd1,
+ 0xc1,
+ 0x1a,
+ 0x26,
+ 0x14,
+ 0x7f,
+ 0xa9,
+ 0x76,
+ 0xa7,
+ 0x0c,
+ 0xf8,
+ 0xcc,
+ 0xed,
+ 0x07,
+ 0x6a,
+ 0xd2,
+ 0xdf,
+ 0x62,
+ 0xee,
+ 0x0a,
+ 0x7c,
+ 0x84,
+ 0xcb,
+ 0x49,
+ 0x90,
+ 0xb2,
+ 0x03,
+ 0x0d,
+ 0xa2,
+ 0x82,
+ 0x06,
+ 0x77,
+ 0xf1,
+ 0xcd,
+ 0x67,
+ 0xf2,
+ 0x47,
+ 0x21,
+ 0x02,
+ 0x3f,
+ 0x43,
+ 0x21,
+ 0xf0,
+ 0x46,
+ 0x30,
+ 0x62,
+ 0x51,
+ 0x72,
+ 0xb1,
+ 0xe7,
+ 0x48,
+ 0xc6,
+ 0x67,
+ 0x12,
+ 0xcd,
+ 0x9e,
+ 0xd6,
+ 0x15,
+ 0xe5,
+ 0x21,
+ 0xed,
+ 0xfa,
+ 0x8f,
+ 0x30,
+ 0xa6,
+ 0x41,
+ 0xfe,
+ 0xb6,
+ 0xfa,
+ 0x8f,
+ 0x34,
+ 0x14,
+ 0x19,
+ 0xe8,
+ 0x11,
+ 0xf7,
+ 0xa5,
+ 0x77,
+ 0x3e,
+ 0xb7,
+ 0xf9,
+ 0x39,
+ 0x07,
+ 0x8c,
+ 0x67,
+ 0x2a,
+ 0xab,
+ 0x7b,
+ 0x08,
+ 0xf8,
+ 0xb0,
+ 0x06,
+ 0xa8,
+ 0xea,
+ 0x2f,
+ 0x8f,
+ 0xfa,
+ 0xcc,
+ 0xcc,
+ 0x40,
+ 0xce,
+ 0xf3,
+ 0x70,
+ 0x4f,
+ 0x3f,
+ 0x7f,
+ 0xe2,
+ 0x0c,
+ 0xea,
+ 0x76,
+ 0x4a,
+ 0x35,
+ 0x4e,
+ 0x47,
+ 0xad,
+ 0x2b,
+ 0xa7,
+ 0x97,
+ 0x5d,
+ 0x74,
+ 0x43,
+ 0x97,
+ 0x90,
+ 0xd2,
+ 0xfb,
+ 0xd9,
+ 0xf9,
+ 0x96,
+ 0x01,
+ 0x33,
+ 0x05,
+ 0xed,
+ 0x7b,
+ 0x03,
+ 0x05,
+ 0xad,
+ 0xf8,
+ 0x49,
+ 0x03,
+ 0x02,
+ 0x82,
+ 0x01,
+ 0x01,
+ 0x00,
+ 0xd4,
+ 0x40,
+ 0x17,
+ 0x66,
+ 0x10,
+ 0x92,
+ 0x95,
+ 0xc8,
+ 0xec,
+ 0x62,
+ 0xa9,
+ 0x7a,
+ 0xcb,
+ 0x93,
+ 0x8e,
+ 0xe6,
+ 0x53,
+ 0xd4,
+ 0x80,
+ 0x48,
+ 0x27,
+ 0x4b,
+ 0x41,
+ 0xce,
+ 0x61,
+ 0xdf,
+ 0xbf,
+ 0x94,
+ 0xa4,
+ 0x3d,
+ 0x71,
+ 0x03,
+ 0x0b,
+ 0xed,
+ 0x25,
+ 0x71,
+ 0x98,
+ 0xa4,
+ 0xd6,
+ 0xd5,
+ 0x4a,
+ 0x57,
+ 0xf5,
+ 0x6c,
+ 0x1b,
+ 0xda,
+ 0x21,
+ 0x7d,
+ 0x35,
+ 0x45,
+ 0xb3,
+ 0xf3,
+ 0x6a,
+ 0xd9,
+ 0xd3,
+ 0x43,
+ 0xe8,
+ 0x5c,
+ 0x54,
+ 0x1c,
+ 0x83,
+ 0x1b,
+ 0xb4,
+ 0x5f,
+ 0xf2,
+ 0x97,
+ 0x24,
+ 0x2e,
+ 0xdc,
+ 0x40,
+ 0xde,
+ 0x92,
+ 0x23,
+ 0x59,
+ 0x8e,
+ 0xbc,
+ 0xd2,
+ 0xa1,
+ 0xf2,
+ 0xe0,
+ 0x4c,
+ 0xdd,
+ 0x0b,
+ 0xd1,
+ 0xe7,
+ 0xae,
+ 0x65,
+ 0xbc,
+ 0xb5,
+ 0xf5,
+ 0x5b,
+ 0x98,
+ 0xe9,
+ 0xd7,
+ 0xc2,
+ 0xb7,
+ 0x0e,
+ 0x55,
+ 0x71,
+ 0x0e,
+ 0x3c,
+ 0x0a,
+ 0x24,
+ 0x6b,
+ 0xa6,
+ 0xe6,
+ 0x14,
+ 0x61,
+ 0x11,
+ 0xfd,
+ 0x33,
+ 0x42,
+ 0x99,
+ 0x2b,
+ 0x84,
+ 0x77,
+ 0x74,
+ 0x92,
+ 0x91,
+ 0xf5,
+ 0x79,
+ 0x79,
+ 0xcf,
+ 0xad,
+ 0x8e,
+ 0x04,
+ 0xef,
+ 0x80,
+ 0x1e,
+ 0x57,
+ 0xf4,
+ 0x14,
+ 0xf5,
+ 0x35,
+ 0x09,
+ 0x74,
+ 0xb2,
+ 0x13,
+ 0x71,
+ 0x58,
+ 0x6b,
+ 0xea,
+ 0x32,
+ 0x5d,
+ 0xf3,
+ 0xd3,
+ 0x76,
+ 0x48,
+ 0x39,
+ 0x10,
+ 0x23,
+ 0x84,
+ 0x9d,
+ 0xbe,
+ 0x92,
+ 0x77,
+ 0x4a,
+ 0xed,
+ 0x70,
+ 0x3e,
+ 0x1a,
+ 0xa2,
+ 0x6c,
+ 0xb3,
+ 0x81,
+ 0x00,
+ 0xc3,
+ 0xc9,
+ 0xe4,
+ 0x52,
+ 0xc8,
+ 0x24,
+ 0x88,
+ 0x0c,
+ 0x41,
+ 0xad,
+ 0x87,
+ 0x5a,
+ 0xea,
+ 0xa3,
+ 0x7a,
+ 0x85,
+ 0x1c,
+ 0x5e,
+ 0x31,
+ 0x7f,
+ 0xc3,
+ 0x35,
+ 0xc6,
+ 0xfa,
+ 0x10,
+ 0xc8,
+ 0x75,
+ 0x10,
+ 0xc4,
+ 0x96,
+ 0x99,
+ 0xe7,
+ 0xfe,
+ 0x01,
+ 0xb4,
+ 0x74,
+ 0xdb,
+ 0xb4,
+ 0x11,
+ 0xc3,
+ 0xc8,
+ 0x8c,
+ 0xf6,
+ 0xf7,
+ 0x3b,
+ 0x66,
+ 0x50,
+ 0xfc,
+ 0xdb,
+ 0xeb,
+ 0xca,
+ 0x47,
+ 0x85,
+ 0x89,
+ 0xe1,
+ 0x65,
+ 0xd9,
+ 0x62,
+ 0x34,
+ 0x3c,
+ 0x70,
+ 0xd8,
+ 0x2e,
+ 0xb4,
+ 0x2f,
+ 0x65,
+ 0x3c,
+ 0x4a,
+ 0xa6,
+ 0x2a,
+ 0xe7,
+ 0xc7,
+ 0xd8,
+ 0x41,
+ 0x8f,
+ 0x8a,
+ 0x43,
+ 0xbf,
+ 0x42,
+ 0xf2,
+ 0x4d,
+ 0xbc,
+ 0xfc,
+ 0x9e,
+ 0x27,
+ 0x95,
+ 0xfb,
+ 0x75,
+ 0xff,
+ 0xab,
+ 0x02,
+ 0x82,
+ 0x01,
+ 0x00,
+ 0x41,
+ 0x2f,
+ 0x44,
+ 0x57,
+ 0x6d,
+ 0x12,
+ 0x17,
+ 0x5b,
+ 0x32,
+ 0xc6,
+ 0xb7,
+ 0x6c,
+ 0x57,
+ 0x7a,
+ 0x8a,
+ 0x0e,
+ 0x79,
+ 0xef,
+ 0x72,
+ 0xa8,
+ 0x68,
+ 0xda,
+ 0x2d,
+ 0x38,
+ 0xe4,
+ 0xbb,
+ 0x8d,
+ 0xf6,
+ 0x02,
+ 0x65,
+ 0xcf,
+ 0x56,
+ 0x13,
+ 0xe1,
+ 0x1a,
+ 0xcb,
+ 0x39,
+ 0x80,
+ 0xa6,
+ 0xb1,
+ 0x32,
+ 0x03,
+ 0x1e,
+ 0xdd,
+ 0xbb,
+ 0x35,
+ 0xd9,
+ 0xac,
+ 0x43,
+ 0x89,
+ 0x31,
+ 0x08,
+ 0x90,
+ 0x92,
+ 0x5e,
+ 0x35,
+ 0x3d,
+ 0x7b,
+ 0x9c,
+ 0x6f,
+ 0x86,
+ 0xcb,
+ 0x17,
+ 0xdd,
+ 0x85,
+ 0xe4,
+ 0xed,
+ 0x35,
+ 0x08,
+ 0x8e,
+ 0xc1,
+ 0xf4,
+ 0x05,
+ 0xd8,
+ 0x68,
+ 0xc6,
+ 0x63,
+ 0x3c,
+ 0xf7,
+ 0xff,
+ 0xf7,
+ 0x47,
+ 0x33,
+ 0x39,
+ 0xc5,
+ 0x3e,
+ 0xb7,
+ 0x0e,
+ 0x58,
+ 0x35,
+ 0x9d,
+ 0x81,
+ 0xea,
+ 0xf8,
+ 0x6a,
+ 0x2c,
+ 0x1c,
+ 0x5a,
+ 0x68,
+ 0x78,
+ 0x64,
+ 0x11,
+ 0x6b,
+ 0xc1,
+ 0x3e,
+ 0x4e,
+ 0x7a,
+ 0xbd,
+ 0x84,
+ 0xcb,
+ 0x0f,
+ 0xc2,
+ 0xb6,
+ 0x85,
+ 0x1d,
+ 0xd3,
+ 0x76,
+ 0xc5,
+ 0x93,
+ 0x6a,
+ 0x69,
+ 0x89,
+ 0x56,
+ 0x34,
+ 0xdc,
+ 0x4a,
+ 0x9b,
+ 0xbc,
+ 0xff,
+ 0xa8,
+ 0x0d,
+ 0x6e,
+ 0x35,
+ 0x9c,
+ 0x60,
+ 0xa7,
+ 0x23,
+ 0x30,
+ 0xc7,
+ 0x06,
+ 0x64,
+ 0x39,
+ 0x8b,
+ 0x94,
+ 0x89,
+ 0xee,
+ 0xba,
+ 0x7f,
+ 0x60,
+ 0x8d,
+ 0xfa,
+ 0xb6,
+ 0x97,
+ 0x76,
+ 0xdc,
+ 0x51,
+ 0x4a,
+ 0x3c,
+ 0xeb,
+ 0x3a,
+ 0x14,
+ 0x2c,
+ 0x20,
+ 0x60,
+ 0x69,
+ 0x4a,
+ 0x86,
+ 0xfe,
+ 0x8c,
+ 0x21,
+ 0x84,
+ 0x49,
+ 0x54,
+ 0xb3,
+ 0x20,
+ 0xe1,
+ 0x01,
+ 0x7f,
+ 0x58,
+ 0xdf,
+ 0x7f,
+ 0xb5,
+ 0x21,
+ 0x51,
+ 0x8c,
+ 0x47,
+ 0x9f,
+ 0x91,
+ 0xeb,
+ 0x97,
+ 0x3e,
+ 0xf2,
+ 0x54,
+ 0xcf,
+ 0x16,
+ 0x46,
+ 0xf9,
+ 0xd9,
+ 0xb6,
+ 0xe7,
+ 0x64,
+ 0xc9,
+ 0xd0,
+ 0x54,
+ 0xea,
+ 0x2f,
+ 0xa1,
+ 0xcf,
+ 0xa5,
+ 0x7f,
+ 0x28,
+ 0x8d,
+ 0x84,
+ 0xec,
+ 0xd5,
+ 0x39,
+ 0x03,
+ 0x76,
+ 0x5b,
+ 0x2d,
+ 0x8e,
+ 0x43,
+ 0xf2,
+ 0x01,
+ 0x24,
+ 0xc9,
+ 0x6f,
+ 0xc0,
+ 0xf5,
+ 0x69,
+ 0x6f,
+ 0x7d,
+ 0xb5,
+ 0x85,
+ 0xd2,
+ 0x5f,
+ 0x7f,
+ 0x78,
+ 0x40,
+ 0x07,
+ 0x7f,
+ 0x09,
+ 0x15,
+ 0xb5,
+ 0x1f,
+ 0x28,
+ 0x65,
+ 0x10,
+ 0xe4,
+ 0x19,
+ 0xa8,
+ 0xc6,
+ 0x9e,
+ 0x8d,
+ 0xdc,
+ 0xcb,
+ 0x02,
+ 0x82,
+ 0x01,
+ 0x00,
+ 0x13,
+ 0x01,
+ 0xee,
+ 0x56,
+ 0x80,
+ 0x93,
+ 0x70,
+ 0x00,
+ 0x7f,
+ 0x52,
+ 0xd2,
+ 0x94,
+ 0xa1,
+ 0x98,
+ 0x84,
+ 0x4a,
+ 0x92,
+ 0x25,
+ 0x4c,
+ 0x9b,
+ 0xa9,
+ 0x91,
+ 0x2e,
+ 0xc2,
+ 0x79,
+ 0xb7,
+ 0x5c,
+ 0xe3,
+ 0xc5,
+ 0xd5,
+ 0x8e,
+ 0xc2,
+ 0x54,
+ 0x16,
+ 0x17,
+ 0xad,
+ 0x55,
+ 0x9b,
+ 0x25,
+ 0x76,
+ 0x12,
+ 0x63,
+ 0x50,
+ 0x22,
+ 0x2f,
+ 0x58,
+ 0x58,
+ 0x79,
+ 0x6b,
+ 0x04,
+ 0xe3,
+ 0xf9,
+ 0x9f,
+ 0x8f,
+ 0x04,
+ 0x41,
+ 0x67,
+ 0x94,
+ 0xa5,
+ 0x1f,
+ 0xac,
+ 0x8a,
+ 0x15,
+ 0x9c,
+ 0x26,
+ 0x10,
+ 0x6c,
+ 0xf8,
+ 0x19,
+ 0x57,
+ 0x61,
+ 0xd7,
+ 0x3a,
+ 0x7d,
+ 0x31,
+ 0xb0,
+ 0x2d,
+ 0x38,
+ 0xbd,
+ 0x94,
+ 0x62,
+ 0xad,
+ 0xc4,
+ 0xfa,
+ 0x36,
+ 0x42,
+ 0x42,
+ 0xf0,
+ 0x24,
+ 0x67,
+ 0x65,
+ 0x9d,
+ 0x8b,
+ 0x0b,
+ 0x7c,
+ 0x6f,
+ 0x82,
+ 0x44,
+ 0x1a,
+ 0x8c,
+ 0xc8,
+ 0xc9,
+ 0xab,
+ 0xbb,
+ 0x4c,
+ 0x45,
+ 0xfc,
+ 0x7b,
+ 0x38,
+ 0xee,
+ 0x30,
+ 0xe1,
+ 0xfc,
+ 0xef,
+ 0x8d,
+ 0xbc,
+ 0x58,
+ 0xdf,
+ 0x2b,
+ 0x5d,
+ 0x0d,
+ 0x54,
+ 0xe0,
+ 0x49,
+ 0x4d,
+ 0x97,
+ 0x99,
+ 0x8f,
+ 0x22,
+ 0xa8,
+ 0x83,
+ 0xbe,
+ 0x40,
+ 0xbb,
+ 0x50,
+ 0x2e,
+ 0x78,
+ 0x28,
+ 0x0f,
+ 0x95,
+ 0x78,
+ 0x8c,
+ 0x8f,
+ 0x98,
+ 0x24,
+ 0x56,
+ 0xc2,
+ 0x97,
+ 0xf3,
+ 0x2c,
+ 0x43,
+ 0xd2,
+ 0x03,
+ 0x82,
+ 0x66,
+ 0x81,
+ 0x72,
+ 0x5f,
+ 0x53,
+ 0x16,
+ 0xec,
+ 0xb1,
+ 0xb1,
+ 0x04,
+ 0x5e,
+ 0x40,
+ 0x20,
+ 0x48,
+ 0x7b,
+ 0x3f,
+ 0x02,
+ 0x97,
+ 0x6a,
+ 0xeb,
+ 0x96,
+ 0x12,
+ 0x21,
+ 0x35,
+ 0xfe,
+ 0x1f,
+ 0x47,
+ 0xc0,
+ 0x95,
+ 0xea,
+ 0xc5,
+ 0x8a,
+ 0x08,
+ 0x84,
+ 0x4f,
+ 0x5e,
+ 0x63,
+ 0x94,
+ 0x60,
+ 0x0f,
+ 0x71,
+ 0x5b,
+ 0x7f,
+ 0x4a,
+ 0xec,
+ 0x4f,
+ 0x60,
+ 0xc6,
+ 0xba,
+ 0x4a,
+ 0x24,
+ 0xf1,
+ 0x20,
+ 0x8b,
+ 0xa7,
+ 0x2e,
+ 0x3a,
+ 0xce,
+ 0x8d,
+ 0xe0,
+ 0x27,
+ 0x1d,
+ 0xb5,
+ 0x8e,
+ 0xb4,
+ 0x21,
+ 0xc5,
+ 0xe2,
+ 0xa6,
+ 0x16,
+ 0x0a,
+ 0x51,
+ 0x83,
+ 0x55,
+ 0x88,
+ 0xd1,
+ 0x30,
+ 0x11,
+ 0x63,
+ 0xd5,
+ 0xd7,
+ 0x8d,
+ 0xae,
+ 0x16,
+ 0x12,
+ 0x82,
+ 0xc4,
+ 0x85,
+ 0x00,
+ 0x4e,
+ 0x27,
+ 0x83,
+ 0xa5,
+ 0x7c,
+ 0x90,
+ 0x2e,
+ 0xe5,
+ 0xa2,
+ 0xa3,
+ 0xd3,
+ 0x4c,
+ 0x63,
+ 0x02,
+ 0x82,
+ 0x01,
+ 0x01,
+ 0x00,
+ 0x86,
+ 0x08,
+ 0x98,
+ 0x98,
+ 0xa5,
+ 0x00,
+ 0x05,
+ 0x39,
+ 0x77,
+ 0xd9,
+ 0x66,
+ 0xb3,
+ 0xcf,
+ 0xca,
+ 0xa0,
+ 0x71,
+ 0xb3,
+ 0x50,
+ 0xce,
+ 0x3d,
+ 0xb1,
+ 0x93,
+ 0x95,
+ 0x35,
+ 0xc4,
+ 0xd4,
+ 0x2e,
+ 0x90,
+ 0xdf,
+ 0x0f,
+ 0xfc,
+ 0x60,
+ 0xc1,
+ 0x94,
+ 0x68,
+ 0x61,
+ 0x43,
+ 0xca,
+ 0x9a,
+ 0x23,
+ 0x4a,
+ 0x1e,
+ 0x45,
+ 0x72,
+ 0x99,
+ 0xb5,
+ 0x1e,
+ 0x61,
+ 0x8d,
+ 0x77,
+ 0x0f,
+ 0xa0,
+ 0xbb,
+ 0xd7,
+ 0x77,
+ 0xb4,
+ 0x2a,
+ 0x15,
+ 0x11,
+ 0x88,
+ 0x2d,
+ 0xb3,
+ 0x56,
+ 0x61,
+ 0x5e,
+ 0x6a,
+ 0xed,
+ 0xa4,
+ 0x46,
+ 0x4a,
+ 0x3f,
+ 0x50,
+ 0x11,
+ 0xd6,
+ 0xba,
+ 0xb6,
+ 0xd7,
+ 0x95,
+ 0x65,
+ 0x53,
+ 0xc3,
+ 0xa1,
+ 0x8f,
+ 0xe0,
+ 0xa3,
+ 0xf5,
+ 0x1c,
+ 0xfd,
+ 0xaf,
+ 0x6e,
+ 0x43,
+ 0xd7,
+ 0x17,
+ 0xa7,
+ 0xd3,
+ 0x81,
+ 0x1b,
+ 0xa4,
+ 0xdf,
+ 0xe0,
+ 0x97,
+ 0x8a,
+ 0x46,
+ 0x03,
+ 0xd3,
+ 0x46,
+ 0x0e,
+ 0x83,
+ 0x48,
+ 0x4e,
+ 0xd2,
+ 0x02,
+ 0xcb,
+ 0xc0,
+ 0xad,
+ 0x79,
+ 0x95,
+ 0x8c,
+ 0x96,
+ 0xba,
+ 0x40,
+ 0x34,
+ 0x11,
+ 0x71,
+ 0x5e,
+ 0xe9,
+ 0x11,
+ 0xf9,
+ 0xc5,
+ 0x4a,
+ 0x5e,
+ 0x91,
+ 0x9d,
+ 0xf5,
+ 0x92,
+ 0x4f,
+ 0xeb,
+ 0xc6,
+ 0x70,
+ 0x02,
+ 0x2d,
+ 0x3d,
+ 0x04,
+ 0xaa,
+ 0xe9,
+ 0x3a,
+ 0x8e,
+ 0xd5,
+ 0xa8,
+ 0xad,
+ 0xf7,
+ 0xce,
+ 0x0d,
+ 0x16,
+ 0xb2,
+ 0xec,
+ 0x0a,
+ 0x9c,
+ 0xf5,
+ 0x94,
+ 0x39,
+ 0xb9,
+ 0x8a,
+ 0xfc,
+ 0x1e,
+ 0xf9,
+ 0xcc,
+ 0xf2,
+ 0x5f,
+ 0x21,
+ 0x31,
+ 0x74,
+ 0x72,
+ 0x6b,
+ 0x64,
+ 0xae,
+ 0x35,
+ 0x61,
+ 0x8d,
+ 0x0d,
+ 0xcb,
+ 0xe7,
+ 0xda,
+ 0x39,
+ 0xca,
+ 0xf3,
+ 0x21,
+ 0x66,
+ 0x0b,
+ 0x95,
+ 0xd7,
+ 0x0a,
+ 0x7c,
+ 0xca,
+ 0xa1,
+ 0xa9,
+ 0x5a,
+ 0xe8,
+ 0xac,
+ 0xe0,
+ 0x71,
+ 0x54,
+ 0xaf,
+ 0x28,
+ 0xcf,
+ 0xd5,
+ 0x70,
+ 0x89,
+ 0xe0,
+ 0xf3,
+ 0x9e,
+ 0x43,
+ 0x6c,
+ 0x8d,
+ 0x7b,
+ 0x99,
+ 0x01,
+ 0x68,
+ 0x4d,
+ 0xa1,
+ 0x45,
+ 0x46,
+ 0x0c,
+ 0x43,
+ 0xbc,
+ 0xcc,
+ 0x2c,
+ 0xdd,
+ 0xc5,
+ 0x46,
+ 0xc8,
+ 0x4e,
+ 0x0e,
+ 0xbe,
+ 0xed,
+ 0xb9,
+ 0x26,
+ 0xab,
+ 0x2e,
+ 0xdb,
+ 0xeb,
+ 0x8f,
+ 0xff,
+ 0xdb,
+ 0xb0,
+ 0xc6,
+ 0x55,
+ 0xaf,
+ 0xf8,
+ 0x2a,
+ 0x91,
+ 0x9d,
+ 0x50,
+ 0x44,
+ 0x21,
+ 0x17,
};
static unsigned char test7680[] = {
diff --git a/apps/timeouts.h b/apps/timeouts.h
index 0028527247..3f9b2b50c9 100644
--- a/apps/timeouts.h
+++ b/apps/timeouts.h
@@ -8,10 +8,10 @@
*/
#ifndef OSSL_APPS_TIMEOUTS_H
-# define OSSL_APPS_TIMEOUTS_H
+#define OSSL_APPS_TIMEOUTS_H
/* numbers in us */
-# define DGRAM_RCV_TIMEOUT 250000
-# define DGRAM_SND_TIMEOUT 250000
+#define DGRAM_RCV_TIMEOUT 250000
+#define DGRAM_SND_TIMEOUT 250000
-#endif /* ! OSSL_APPS_TIMEOUTS_H */
+#endif /* ! OSSL_APPS_TIMEOUTS_H */
diff --git a/apps/ts.c b/apps/ts.c
index 3bb9032d8f..ef2c717966 100644
--- a/apps/ts.c
+++ b/apps/ts.c
@@ -21,114 +21,134 @@
#include <openssl/bn.h>
/* Request nonce length, in bits (must be a multiple of 8). */
-#define NONCE_LENGTH 64
+#define NONCE_LENGTH 64
/* Name of config entry that defines the OID file. */
-#define ENV_OID_FILE "oid_file"
+#define ENV_OID_FILE "oid_file"
/* Is |EXACTLY_ONE| of three pointers set? */
#define EXACTLY_ONE(a, b, c) \
- (( a && !b && !c) || \
- ( b && !a && !c) || \
- ( c && !a && !b))
+ ((a && !b && !c) || (b && !a && !c) || (c && !a && !b))
static ASN1_OBJECT *txt2obj(const char *oid);
static CONF *load_config_file(const char *configfile);
/* Query related functions. */
static int query_command(const char *data, const char *digest,
- const EVP_MD *md, const char *policy, int no_nonce,
- int cert, const char *in, const char *out, int text);
+ const EVP_MD *md, const char *policy, int no_nonce,
+ int cert, const char *in, const char *out, int text);
static TS_REQ *create_query(BIO *data_bio, const char *digest, const EVP_MD *md,
- const char *policy, int no_nonce, int cert);
+ const char *policy, int no_nonce, int cert);
static int create_digest(BIO *input, const char *digest,
- const EVP_MD *md, unsigned char **md_value);
+ const EVP_MD *md, unsigned char **md_value);
static ASN1_INTEGER *create_nonce(int bits);
/* Reply related functions. */
static int reply_command(CONF *conf, const char *section,
- const char *queryfile, const char *passin, const char *inkey,
- const EVP_MD *md, const char *signer, const char *chain,
- const char *policy, const char *in, int token_in,
- const char *out, int token_out, int text);
+ const char *queryfile, const char *passin, const char *inkey,
+ const EVP_MD *md, const char *signer, const char *chain,
+ const char *policy, const char *in, int token_in,
+ const char *out, int token_out, int text);
static TS_RESP *read_PKCS7(BIO *in_bio);
static TS_RESP *create_response(CONF *conf, const char *section,
- const char *queryfile, const char *passin,
- const char *inkey, const EVP_MD *md, const char *signer,
- const char *chain, const char *policy);
+ const char *queryfile, const char *passin,
+ const char *inkey, const EVP_MD *md, const char *signer,
+ const char *chain, const char *policy);
static ASN1_INTEGER *serial_cb(TS_RESP_CTX *ctx, void *data);
static ASN1_INTEGER *next_serial(const char *serialfile);
static int save_ts_serial(const char *serialfile, ASN1_INTEGER *serial);
/* Verify related functions. */
static int verify_command(const char *data, const char *digest, const char *queryfile,
- const char *in, int token_in,
- const char *CApath, const char *CAfile,
- const char *CAstore,
- char *untrusted, X509_VERIFY_PARAM *vpm);
+ const char *in, int token_in,
+ const char *CApath, const char *CAfile,
+ const char *CAstore,
+ char *untrusted, X509_VERIFY_PARAM *vpm);
static TS_VERIFY_CTX *create_verify_ctx(const char *data, const char *digest,
- const char *queryfile,
- const char *CApath, const char *CAfile,
- const char *CAstore,
- char *untrusted,
- X509_VERIFY_PARAM *vpm);
+ const char *queryfile,
+ const char *CApath, const char *CAfile,
+ const char *CAstore,
+ char *untrusted,
+ X509_VERIFY_PARAM *vpm);
static X509_STORE *create_cert_store(const char *CApath, const char *CAfile,
- const char *CAstore, X509_VERIFY_PARAM *vpm);
+ const char *CAstore, X509_VERIFY_PARAM *vpm);
static int verify_cb(int ok, X509_STORE_CTX *ctx);
typedef enum OPTION_choice {
OPT_COMMON,
- OPT_CONFIG, OPT_SECTION, OPT_QUERY, OPT_DATA,
- OPT_DIGEST, OPT_TSPOLICY, OPT_NO_NONCE, OPT_CERT,
- OPT_IN, OPT_TOKEN_IN, OPT_OUT, OPT_TOKEN_OUT, OPT_TEXT,
- OPT_REPLY, OPT_QUERYFILE, OPT_PASSIN, OPT_INKEY, OPT_SIGNER,
- OPT_CHAIN, OPT_VERIFY, OPT_CAPATH, OPT_CAFILE, OPT_CASTORE, OPT_UNTRUSTED,
- OPT_MD, OPT_V_ENUM, OPT_R_ENUM, OPT_PROV_ENUM
+ OPT_CONFIG,
+ OPT_SECTION,
+ OPT_QUERY,
+ OPT_DATA,
+ OPT_DIGEST,
+ OPT_TSPOLICY,
+ OPT_NO_NONCE,
+ OPT_CERT,
+ OPT_IN,
+ OPT_TOKEN_IN,
+ OPT_OUT,
+ OPT_TOKEN_OUT,
+ OPT_TEXT,
+ OPT_REPLY,
+ OPT_QUERYFILE,
+ OPT_PASSIN,
+ OPT_INKEY,
+ OPT_SIGNER,
+ OPT_CHAIN,
+ OPT_VERIFY,
+ OPT_CAPATH,
+ OPT_CAFILE,
+ OPT_CASTORE,
+ OPT_UNTRUSTED,
+ OPT_MD,
+ OPT_V_ENUM,
+ OPT_R_ENUM,
+ OPT_PROV_ENUM
} OPTION_CHOICE;
const OPTIONS ts_options[] = {
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
- {"config", OPT_CONFIG, '<', "Configuration file"},
- {"section", OPT_SECTION, 's', "Section to use within config file"},
- {"inkey", OPT_INKEY, 's', "File with private key for reply"},
- {"signer", OPT_SIGNER, 's', "Signer certificate file"},
- {"chain", OPT_CHAIN, '<', "File with signer CA chain"},
- {"CAfile", OPT_CAFILE, '<', "File with trusted CA certs"},
- {"CApath", OPT_CAPATH, '/', "Path to trusted CA files"},
- {"CAstore", OPT_CASTORE, ':', "URI to trusted CA store"},
- {"untrusted", OPT_UNTRUSTED, '<', "Extra untrusted certs"},
- {"token_in", OPT_TOKEN_IN, '-', "Input is a PKCS#7 file"},
- {"token_out", OPT_TOKEN_OUT, '-', "Output is a PKCS#7 file"},
- {"passin", OPT_PASSIN, 's', "Input file pass phrase source"},
- {"", OPT_MD, '-', "Any supported digest"},
+ { "help", OPT_HELP, '-', "Display this summary" },
+ { "config", OPT_CONFIG, '<', "Configuration file" },
+ { "section", OPT_SECTION, 's', "Section to use within config file" },
+ { "inkey", OPT_INKEY, 's', "File with private key for reply" },
+ { "signer", OPT_SIGNER, 's', "Signer certificate file" },
+ { "chain", OPT_CHAIN, '<', "File with signer CA chain" },
+ { "CAfile", OPT_CAFILE, '<', "File with trusted CA certs" },
+ { "CApath", OPT_CAPATH, '/', "Path to trusted CA files" },
+ { "CAstore", OPT_CASTORE, ':', "URI to trusted CA store" },
+ { "untrusted", OPT_UNTRUSTED, '<', "Extra untrusted certs" },
+ { "token_in", OPT_TOKEN_IN, '-', "Input is a PKCS#7 file" },
+ { "token_out", OPT_TOKEN_OUT, '-', "Output is a PKCS#7 file" },
+ { "passin", OPT_PASSIN, 's', "Input file pass phrase source" },
+ { "", OPT_MD, '-', "Any supported digest" },
OPT_SECTION("Query"),
- {"query", OPT_QUERY, '-', "Generate a TS query"},
- {"data", OPT_DATA, '<', "File to hash"},
- {"digest", OPT_DIGEST, 's', "Digest (as a hex string)"},
- {"queryfile", OPT_QUERYFILE, '<', "File containing a TS query"},
- {"cert", OPT_CERT, '-', "Put cert request into query"},
- {"in", OPT_IN, '<', "Input file"},
+ { "query", OPT_QUERY, '-', "Generate a TS query" },
+ { "data", OPT_DATA, '<', "File to hash" },
+ { "digest", OPT_DIGEST, 's', "Digest (as a hex string)" },
+ { "queryfile", OPT_QUERYFILE, '<', "File containing a TS query" },
+ { "cert", OPT_CERT, '-', "Put cert request into query" },
+ { "in", OPT_IN, '<', "Input file" },
OPT_SECTION("Verify"),
- {"verify", OPT_VERIFY, '-', "Verify a TS response"},
- {"reply", OPT_REPLY, '-', "Generate a TS reply"},
- {"tspolicy", OPT_TSPOLICY, 's', "Policy OID to use"},
- {"no_nonce", OPT_NO_NONCE, '-', "Do not include a nonce"},
- {"out", OPT_OUT, '>', "Output file"},
- {"text", OPT_TEXT, '-', "Output text (not DER)"},
+ { "verify", OPT_VERIFY, '-', "Verify a TS response" },
+ { "reply", OPT_REPLY, '-', "Generate a TS reply" },
+ { "tspolicy", OPT_TSPOLICY, 's', "Policy OID to use" },
+ { "no_nonce", OPT_NO_NONCE, '-', "Do not include a nonce" },
+ { "out", OPT_OUT, '>', "Output file" },
+ { "text", OPT_TEXT, '-', "Output text (not DER)" },
OPT_R_OPTIONS,
OPT_V_OPTIONS,
OPT_PROV_OPTIONS,
- {NULL}
+ { NULL }
};
/*
* This command is so complex, special help is needed.
*/
-static char* opt_helplist[] = {
+static char *opt_helplist[] = {
"",
"Typical uses:",
" openssl ts -query [-rand file...] [-config file] [-data file]",
@@ -180,7 +200,7 @@ int ts_main(int argc, char **argv)
switch (o) {
case OPT_EOF:
case OPT_ERR:
- opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
case OPT_HELP:
@@ -293,8 +313,7 @@ int ts_main(int argc, char **argv)
if (!opt_md(digestname, &md))
goto opthelp;
- if (mode == OPT_REPLY && passin &&
- !app_passwd(passin, NULL, &password, NULL)) {
+ if (mode == OPT_REPLY && passin && !app_passwd(passin, NULL, &password, NULL)) {
BIO_printf(bio_err, "Error getting password.\n");
goto end;
}
@@ -311,7 +330,7 @@ int ts_main(int argc, char **argv)
if ((data != NULL) && (digest != NULL))
goto opthelp;
ret = !query_command(data, digest, md, policy, no_nonce, cert,
- in, out, text);
+ in, out, text);
} else if (mode == OPT_REPLY) {
if (vpmtouched)
goto opthelp;
@@ -322,20 +341,20 @@ int ts_main(int argc, char **argv)
goto opthelp;
}
ret = !reply_command(conf, section, queryfile,
- password, inkey, md, signer, chain, policy,
- in, token_in, out, token_out, text);
+ password, inkey, md, signer, chain, policy,
+ in, token_in, out, token_out, text);
} else if (mode == OPT_VERIFY) {
if ((in == NULL) || !EXACTLY_ONE(queryfile, data, digest))
goto opthelp;
ret = !verify_command(data, digest, queryfile, in, token_in,
- CApath, CAfile, CAstore, untrusted,
- vpmtouched ? vpm : NULL);
+ CApath, CAfile, CAstore, untrusted,
+ vpmtouched ? vpm : NULL);
} else {
goto opthelp;
}
- end:
+end:
X509_VERIFY_PARAM_free(vpm);
EVP_MD_free(md);
NCONF_free(conf);
@@ -385,8 +404,8 @@ static CONF *load_config_file(const char *configfile)
* Query-related method definitions.
*/
static int query_command(const char *data, const char *digest, const EVP_MD *md,
- const char *policy, int no_nonce,
- int cert, const char *in, const char *out, int text)
+ const char *policy, int no_nonce,
+ int cert, const char *in, const char *out, int text)
{
int ret = 0;
TS_REQ *query = NULL;
@@ -422,7 +441,7 @@ static int query_command(const char *data, const char *digest, const EVP_MD *md,
ret = 1;
- end:
+end:
ERR_print_errors(bio_err);
BIO_free_all(in_bio);
BIO_free_all(data_bio);
@@ -432,7 +451,7 @@ static int query_command(const char *data, const char *digest, const EVP_MD *md,
}
static TS_REQ *create_query(BIO *data_bio, const char *digest, const EVP_MD *md,
- const char *policy, int no_nonce, int cert)
+ const char *policy, int no_nonce, int cert)
{
int ret = 0;
TS_REQ *ts_req = NULL;
@@ -480,7 +499,7 @@ static TS_REQ *create_query(BIO *data_bio, const char *digest, const EVP_MD *md,
goto err;
ret = 1;
- err:
+err:
if (!ret) {
TS_REQ_free(ts_req);
ts_req = NULL;
@@ -496,7 +515,7 @@ static TS_REQ *create_query(BIO *data_bio, const char *digest, const EVP_MD *md,
}
static int create_digest(BIO *input, const char *digest, const EVP_MD *md,
- unsigned char **md_value)
+ unsigned char **md_value)
{
int md_value_len;
int rv = 0;
@@ -529,12 +548,13 @@ static int create_digest(BIO *input, const char *digest, const EVP_MD *md,
*md_value = OPENSSL_hexstr2buf(digest, &digest_len);
if (*md_value == NULL || md_value_len != digest_len) {
BIO_printf(bio_err, "bad digest, %d bytes "
- "must be specified\n", md_value_len);
+ "must be specified\n",
+ md_value_len);
goto err;
}
}
rv = md_value_len;
- err:
+err:
if (rv <= 0) {
OPENSSL_free(*md_value);
*md_value = NULL;
@@ -567,7 +587,7 @@ static ASN1_INTEGER *create_nonce(int bits)
memcpy(nonce->data, buf + i, nonce->length);
return nonce;
- err:
+err:
BIO_printf(bio_err, "could not create nonce\n");
ASN1_INTEGER_free(nonce);
return NULL;
@@ -578,10 +598,10 @@ static ASN1_INTEGER *create_nonce(int bits)
*/
static int reply_command(CONF *conf, const char *section,
- const char *queryfile, const char *passin, const char *inkey,
- const EVP_MD *md, const char *signer, const char *chain,
- const char *policy, const char *in, int token_in,
- const char *out, int token_out, int text)
+ const char *queryfile, const char *passin, const char *inkey,
+ const EVP_MD *md, const char *signer, const char *chain,
+ const char *policy, const char *in, int token_in,
+ const char *out, int token_out, int text)
{
int ret = 0;
TS_RESP *response = NULL;
@@ -601,7 +621,7 @@ static int reply_command(CONF *conf, const char *section,
}
} else {
response = create_response(conf, section, queryfile,
- passin, inkey, md, signer, chain, policy);
+ passin, inkey, md, signer, chain, policy);
if (response != NULL)
BIO_printf(bio_err, "Response has been generated.\n");
else
@@ -613,7 +633,7 @@ static int reply_command(CONF *conf, const char *section,
/* Write response. */
if (text) {
if ((out_bio = bio_open_default(out, 'w', FORMAT_TEXT)) == NULL)
- goto end;
+ goto end;
if (token_out) {
TS_TST_INFO *tst_info = TS_RESP_get_tst_info(response);
if (!TS_TST_INFO_print_bio(out_bio, tst_info))
@@ -637,7 +657,7 @@ static int reply_command(CONF *conf, const char *section,
ret = 1;
- end:
+end:
ERR_print_errors(bio_err);
BIO_free_all(in_bio);
BIO_free_all(query_bio);
@@ -670,11 +690,11 @@ static TS_RESP *read_PKCS7(BIO *in_bio)
if (!TS_RESP_set_status_info(resp, si))
goto end;
TS_RESP_set_tst_info(resp, token, tst_info);
- token = NULL; /* Ownership is lost. */
- tst_info = NULL; /* Ownership is lost. */
+ token = NULL; /* Ownership is lost. */
+ tst_info = NULL; /* Ownership is lost. */
ret = 1;
- end:
+end:
PKCS7_free(token);
TS_TST_INFO_free(tst_info);
if (!ret) {
@@ -686,9 +706,9 @@ static TS_RESP *read_PKCS7(BIO *in_bio)
}
static TS_RESP *create_response(CONF *conf, const char *section,
- const char *queryfile, const char *passin,
- const char *inkey, const EVP_MD *md, const char *signer,
- const char *chain, const char *policy)
+ const char *queryfile, const char *passin,
+ const char *inkey, const EVP_MD *md, const char *signer,
+ const char *chain, const char *policy)
{
int ret = 0;
TS_RESP *response = NULL;
@@ -714,7 +734,7 @@ static TS_RESP *create_response(CONF *conf, const char *section,
if (!TS_RESP_CTX_set_signer_digest(resp_ctx, md))
goto end;
} else if (!TS_CONF_set_signer_digest(conf, section, NULL, resp_ctx)) {
- goto end;
+ goto end;
}
if (!TS_CONF_set_ess_cert_id_digest(conf, section, resp_ctx))
@@ -739,7 +759,7 @@ static TS_RESP *create_response(CONF *conf, const char *section,
goto end;
ret = 1;
- end:
+end:
if (!ret) {
TS_RESP_free(response);
response = NULL;
@@ -756,8 +776,8 @@ static ASN1_INTEGER *serial_cb(TS_RESP_CTX *ctx, void *data)
if (serial == NULL) {
TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
- "Error during serial number "
- "generation.");
+ "Error during serial number "
+ "generation.");
TS_RESP_CTX_add_failure_info(ctx, TS_INFO_ADD_INFO_NOT_AVAILABLE);
} else {
save_ts_serial(serial_file, serial);
@@ -779,14 +799,15 @@ static ASN1_INTEGER *next_serial(const char *serialfile)
if ((in = BIO_new_file(serialfile, "r")) == NULL) {
ERR_clear_error();
BIO_printf(bio_err, "Warning: could not open file %s for "
- "reading, using serial number: 1\n", serialfile);
+ "reading, using serial number: 1\n",
+ serialfile);
if (!ASN1_INTEGER_set(serial, 1))
goto err;
} else {
char buf[1024];
if (!a2i_ASN1_INTEGER(in, serial, buf, sizeof(buf))) {
BIO_printf(bio_err, "unable to load number from %s\n",
- serialfile);
+ serialfile);
goto err;
}
if ((bn = ASN1_INTEGER_to_BN(serial, NULL)) == NULL)
@@ -800,7 +821,7 @@ static ASN1_INTEGER *next_serial(const char *serialfile)
}
ret = 1;
- err:
+err:
if (!ret) {
ASN1_INTEGER_free(serial);
serial = NULL;
@@ -822,24 +843,23 @@ static int save_ts_serial(const char *serialfile, ASN1_INTEGER *serial)
if (BIO_puts(out, "\n") <= 0)
goto err;
ret = 1;
- err:
+err:
if (!ret)
BIO_printf(bio_err, "could not save serial number to %s\n",
- serialfile);
+ serialfile);
BIO_free_all(out);
return ret;
}
-
/*
* Verify-related method definitions.
*/
static int verify_command(const char *data, const char *digest, const char *queryfile,
- const char *in, int token_in,
- const char *CApath, const char *CAfile,
- const char *CAstore, char *untrusted,
- X509_VERIFY_PARAM *vpm)
+ const char *in, int token_in,
+ const char *CApath, const char *CAfile,
+ const char *CAstore, char *untrusted,
+ X509_VERIFY_PARAM *vpm)
{
BIO *in_bio = NULL;
PKCS7 *token = NULL;
@@ -858,15 +878,16 @@ static int verify_command(const char *data, const char *digest, const char *quer
}
if ((verify_ctx = create_verify_ctx(data, digest, queryfile,
- CApath, CAfile, CAstore, untrusted,
- vpm)) == NULL)
+ CApath, CAfile, CAstore, untrusted,
+ vpm))
+ == NULL)
goto end;
ret = token_in
? TS_RESP_verify_token(verify_ctx, token)
: TS_RESP_verify_response(verify_ctx, response);
- end:
+end:
printf("Verification: ");
if (ret)
printf("OK\n");
@@ -883,11 +904,11 @@ static int verify_command(const char *data, const char *digest, const char *quer
}
static TS_VERIFY_CTX *create_verify_ctx(const char *data, const char *digest,
- const char *queryfile,
- const char *CApath, const char *CAfile,
- const char *CAstore,
- char *untrusted,
- X509_VERIFY_PARAM *vpm)
+ const char *queryfile,
+ const char *CApath, const char *CAfile,
+ const char *CAstore,
+ char *untrusted,
+ X509_VERIFY_PARAM *vpm)
{
TS_VERIFY_CTX *ctx = NULL;
STACK_OF(X509) *certs;
@@ -935,20 +956,19 @@ static TS_VERIFY_CTX *create_verify_ctx(const char *data, const char *digest,
TS_VERIFY_CTX_add_flags(ctx, f | TS_VFY_SIGNATURE);
/* Initialising the X509_STORE object. */
- if (!TS_VERIFY_CTX_set0_store(ctx, create_cert_store(CApath, CAfile,
- CAstore, vpm)))
+ if (!TS_VERIFY_CTX_set0_store(ctx, create_cert_store(CApath, CAfile, CAstore, vpm)))
goto err;
/* Loading any extra untrusted certificates. */
if (untrusted != NULL) {
certs = load_certs_multifile(untrusted, NULL, "extra untrusted certs",
- vpm);
+ vpm);
if (certs == NULL || !TS_VERIFY_CTX_set0_certs(ctx, certs))
goto err;
}
ret = 1;
- err:
+err:
if (!ret) {
TS_VERIFY_CTX_free(ctx);
ctx = NULL;
@@ -959,7 +979,7 @@ static TS_VERIFY_CTX *create_verify_ctx(const char *data, const char *digest,
}
static X509_STORE *create_cert_store(const char *CApath, const char *CAfile,
- const char *CAstore, X509_VERIFY_PARAM *vpm)
+ const char *CAstore, X509_VERIFY_PARAM *vpm)
{
X509_STORE *cert_ctx = NULL;
X509_LOOKUP *lookup = NULL;
@@ -991,7 +1011,8 @@ static X509_STORE *create_cert_store(const char *CApath, const char *CAfile,
goto err;
}
if (X509_LOOKUP_load_file_ex(lookup, CAfile, X509_FILETYPE_PEM, libctx,
- propq) <= 0) {
+ propq)
+ <= 0) {
BIO_printf(bio_err, "Error loading file %s\n", CAfile);
goto err;
}
@@ -1014,7 +1035,7 @@ static X509_STORE *create_cert_store(const char *CApath, const char *CAfile,
return cert_ctx;
- err:
+err:
X509_STORE_free(cert_ctx);
return NULL;
}
diff --git a/apps/verify.c b/apps/verify.c
index ac2382b924..c1d50ba4b7 100644
--- a/apps/verify.c
+++ b/apps/verify.c
@@ -20,57 +20,67 @@
static int cb(int ok, X509_STORE_CTX *ctx);
static int check(X509_STORE *ctx, const char *file,
- STACK_OF(X509) *uchain, STACK_OF(X509) *tchain,
- STACK_OF(X509_CRL) *crls, int show_chain,
- STACK_OF(OPENSSL_STRING) *opts);
+ STACK_OF(X509) *uchain, STACK_OF(X509) *tchain,
+ STACK_OF(X509_CRL) *crls, int show_chain,
+ STACK_OF(OPENSSL_STRING) *opts);
static int v_verbose = 0, vflags = 0;
typedef enum OPTION_choice {
OPT_COMMON,
- OPT_CAPATH, OPT_CAFILE, OPT_CASTORE,
- OPT_NOCAPATH, OPT_NOCAFILE, OPT_NOCASTORE,
- OPT_UNTRUSTED, OPT_TRUSTED, OPT_CRLFILE, OPT_CRL_DOWNLOAD, OPT_SHOW_CHAIN,
- OPT_V_ENUM, OPT_NAMEOPT, OPT_VFYOPT,
+ OPT_CAPATH,
+ OPT_CAFILE,
+ OPT_CASTORE,
+ OPT_NOCAPATH,
+ OPT_NOCAFILE,
+ OPT_NOCASTORE,
+ OPT_UNTRUSTED,
+ OPT_TRUSTED,
+ OPT_CRLFILE,
+ OPT_CRL_DOWNLOAD,
+ OPT_SHOW_CHAIN,
+ OPT_V_ENUM,
+ OPT_NAMEOPT,
+ OPT_VFYOPT,
OPT_VERBOSE,
OPT_PROV_ENUM
} OPTION_CHOICE;
const OPTIONS verify_options[] = {
- {OPT_HELP_STR, 1, '-', "Usage: %s [options] [cert...]\n"},
+ { OPT_HELP_STR, 1, '-', "Usage: %s [options] [cert...]\n" },
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
- {"verbose", OPT_VERBOSE, '-',
- "Print extra information about the operations being performed."},
- {"nameopt", OPT_NAMEOPT, 's', "Certificate subject/issuer name printing options"},
+ { "help", OPT_HELP, '-', "Display this summary" },
+ { "verbose", OPT_VERBOSE, '-',
+ "Print extra information about the operations being performed." },
+ { "nameopt", OPT_NAMEOPT, 's', "Certificate subject/issuer name printing options" },
OPT_SECTION("Certificate chain"),
- {"trusted", OPT_TRUSTED, '<', "A file of trusted certificates"},
- {"CAfile", OPT_CAFILE, '<', "A file of trusted certificates"},
- {"CApath", OPT_CAPATH, '/', "A directory of files with trusted certificates"},
- {"CAstore", OPT_CASTORE, ':', "URI to a store of trusted certificates"},
- {"no-CAfile", OPT_NOCAFILE, '-',
- "Do not load the default trusted certificates file"},
- {"no-CApath", OPT_NOCAPATH, '-',
- "Do not load trusted certificates from the default directory"},
- {"no-CAstore", OPT_NOCASTORE, '-',
- "Do not load trusted certificates from the default certificates store"},
- {"untrusted", OPT_UNTRUSTED, '<', "A file of untrusted certificates"},
- {"CRLfile", OPT_CRLFILE, '<',
- "File containing one or more CRL's (in PEM format) to load"},
- {"crl_download", OPT_CRL_DOWNLOAD, '-',
- "Try downloading CRL information for certificates via their CDP entries"},
- {"show_chain", OPT_SHOW_CHAIN, '-',
- "Display information about the certificate chain"},
+ { "trusted", OPT_TRUSTED, '<', "A file of trusted certificates" },
+ { "CAfile", OPT_CAFILE, '<', "A file of trusted certificates" },
+ { "CApath", OPT_CAPATH, '/', "A directory of files with trusted certificates" },
+ { "CAstore", OPT_CASTORE, ':', "URI to a store of trusted certificates" },
+ { "no-CAfile", OPT_NOCAFILE, '-',
+ "Do not load the default trusted certificates file" },
+ { "no-CApath", OPT_NOCAPATH, '-',
+ "Do not load trusted certificates from the default directory" },
+ { "no-CAstore", OPT_NOCASTORE, '-',
+ "Do not load trusted certificates from the default certificates store" },
+ { "untrusted", OPT_UNTRUSTED, '<', "A file of untrusted certificates" },
+ { "CRLfile", OPT_CRLFILE, '<',
+ "File containing one or more CRL's (in PEM format) to load" },
+ { "crl_download", OPT_CRL_DOWNLOAD, '-',
+ "Try downloading CRL information for certificates via their CDP entries" },
+ { "show_chain", OPT_SHOW_CHAIN, '-',
+ "Display information about the certificate chain" },
OPT_V_OPTIONS,
- {"vfyopt", OPT_VFYOPT, 's', "Verification parameter in n:v form"},
+ { "vfyopt", OPT_VFYOPT, 's', "Verification parameter in n:v form" },
OPT_PROV_OPTIONS,
OPT_PARAMETERS(),
- {"cert", 0, 0, "Certificate(s) to verify (optional; stdin used otherwise)"},
- {NULL}
+ { "cert", 0, 0, "Certificate(s) to verify (optional; stdin used otherwise)" },
+ { NULL }
};
int verify_main(int argc, char **argv)
@@ -93,7 +103,7 @@ int verify_main(int argc, char **argv)
switch (o) {
case OPT_EOF:
case OPT_ERR:
- opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
case OPT_HELP:
@@ -103,8 +113,8 @@ int verify_main(int argc, char **argv)
X509_PURPOSE *ptmp = X509_PURPOSE_get0(i);
BIO_printf(bio_err, " %-15s %s\n",
- X509_PURPOSE_get0_sname(ptmp),
- X509_PURPOSE_get0_name(ptmp));
+ X509_PURPOSE_get0_sname(ptmp),
+ X509_PURPOSE_get0_name(ptmp));
}
BIO_printf(bio_err, "Recognized certificate policy names:\n");
@@ -112,7 +122,7 @@ int verify_main(int argc, char **argv)
const X509_VERIFY_PARAM *vptmp = X509_VERIFY_PARAM_get0(i);
BIO_printf(bio_err, " %s\n",
- X509_VERIFY_PARAM_get0_name(vptmp));
+ X509_VERIFY_PARAM_get0_name(vptmp));
}
ret = 0;
goto end;
@@ -142,7 +152,7 @@ int verify_main(int argc, char **argv)
case OPT_UNTRUSTED:
/* Zero or more times */
if (!load_certs(opt_arg(), 0, &untrusted, NULL,
- "untrusted certificates"))
+ "untrusted certificates"))
goto end;
break;
case OPT_TRUSTED:
@@ -191,13 +201,14 @@ int verify_main(int argc, char **argv)
if (trusted != NULL
&& (CAfile != NULL || CApath != NULL || CAstore != NULL)) {
BIO_printf(bio_err,
- "%s: Cannot use -trusted with -CAfile, -CApath or -CAstore\n",
- prog);
+ "%s: Cannot use -trusted with -CAfile, -CApath or -CAstore\n",
+ prog);
goto end;
}
if ((store = setup_verify(CAfile, noCAfile, CApath, noCApath,
- CAstore, noCAstore)) == NULL)
+ CAstore, noCAstore))
+ == NULL)
goto end;
X509_STORE_set_verify_cb(store, cb);
@@ -212,16 +223,18 @@ int verify_main(int argc, char **argv)
ret = 0;
if (argc < 1) {
if (check(store, NULL, untrusted, trusted, crls, show_chain,
- vfyopts) != 1)
+ vfyopts)
+ != 1)
ret = -1;
} else {
for (i = 0; i < argc; i++)
if (check(store, argv[i], untrusted, trusted, crls, show_chain,
- vfyopts) != 1)
+ vfyopts)
+ != 1)
ret = -1;
}
- end:
+end:
X509_VERIFY_PARAM_free(vpm);
X509_STORE_free(store);
OSSL_STACK_OF_X509_free(untrusted);
@@ -232,9 +245,9 @@ int verify_main(int argc, char **argv)
}
static int check(X509_STORE *ctx, const char *file,
- STACK_OF(X509) *uchain, STACK_OF(X509) *tchain,
- STACK_OF(X509_CRL) *crls, int show_chain,
- STACK_OF(OPENSSL_STRING) *opts)
+ STACK_OF(X509) *uchain, STACK_OF(X509) *tchain,
+ STACK_OF(X509_CRL) *crls, int show_chain,
+ STACK_OF(OPENSSL_STRING) *opts)
{
X509 *x = NULL;
int i = 0, ret = 0;
@@ -261,7 +274,7 @@ static int check(X509_STORE *ctx, const char *file,
csc = X509_STORE_CTX_new();
if (csc == NULL) {
BIO_printf(bio_err, "error %s: X.509 store context allocation failed\n",
- (file == NULL) ? "stdin" : file);
+ (file == NULL) ? "stdin" : file);
goto end;
}
@@ -269,8 +282,8 @@ static int check(X509_STORE *ctx, const char *file,
if (!X509_STORE_CTX_init(csc, ctx, x, uchain)) {
X509_STORE_CTX_free(csc);
BIO_printf(bio_err,
- "error %s: X.509 store context initialization failed\n",
- (file == NULL) ? "stdin" : file);
+ "error %s: X.509 store context initialization failed\n",
+ (file == NULL) ? "stdin" : file);
goto end;
}
if (tchain != NULL)
@@ -291,8 +304,8 @@ static int check(X509_STORE *ctx, const char *file,
X509 *cert = sk_X509_value(chain, j);
BIO_printf(bio_out, "depth=%d: ", j);
X509_NAME_print_ex_fp(stdout,
- X509_get_subject_name(cert),
- 0, get_nameopt());
+ X509_get_subject_name(cert),
+ 0, get_nameopt());
if (j < num_untrusted)
BIO_printf(bio_out, " (untrusted)");
BIO_printf(bio_out, "\n");
@@ -301,12 +314,12 @@ static int check(X509_STORE *ctx, const char *file,
}
} else {
BIO_printf(bio_err,
- "error %s: verification failed\n",
- (file == NULL) ? "stdin" : file);
+ "error %s: verification failed\n",
+ (file == NULL) ? "stdin" : file);
}
X509_STORE_CTX_free(csc);
- end:
+end:
if (i <= 0)
ERR_print_errors(bio_err);
X509_free(x);
@@ -322,15 +335,15 @@ static int cb(int ok, X509_STORE_CTX *ctx)
if (!ok) {
if (current_cert != NULL) {
X509_NAME_print_ex(bio_err,
- X509_get_subject_name(current_cert),
- 0, get_nameopt());
+ X509_get_subject_name(current_cert),
+ 0, get_nameopt());
BIO_printf(bio_err, "\n");
}
BIO_printf(bio_err, "%serror %d at %d depth lookup: %s\n",
- X509_STORE_CTX_get0_parent_ctx(ctx) ? "[CRL path] " : "",
- cert_error,
- X509_STORE_CTX_get_error_depth(ctx),
- X509_verify_cert_error_string(cert_error));
+ X509_STORE_CTX_get0_parent_ctx(ctx) ? "[CRL path] " : "",
+ cert_error,
+ X509_STORE_CTX_get_error_depth(ctx),
+ X509_verify_cert_error_string(cert_error));
/*
* Pretend that some errors are ok, so they don't stop further
@@ -372,7 +385,6 @@ static int cb(int ok, X509_STORE_CTX *ctx)
ok = 1;
}
return ok;
-
}
if (cert_error == X509_V_OK && ok == 2)
policies_print(ctx);
diff --git a/apps/version.c b/apps/version.c
index 370ded6375..8bd1b31e4f 100644
--- a/apps/version.c
+++ b/apps/version.c
@@ -18,31 +18,41 @@
typedef enum OPTION_choice {
OPT_COMMON,
- OPT_B, OPT_D, OPT_M, OPT_F, OPT_O, OPT_P, OPT_V, OPT_A, OPT_R, OPT_C
+ OPT_B,
+ OPT_D,
+ OPT_M,
+ OPT_F,
+ OPT_O,
+ OPT_P,
+ OPT_V,
+ OPT_A,
+ OPT_R,
+ OPT_C
#if defined(_WIN32)
- ,OPT_W
+ ,
+ OPT_W
#endif
} OPTION_CHOICE;
const OPTIONS version_options[] = {
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
+ { "help", OPT_HELP, '-', "Display this summary" },
OPT_SECTION("Output"),
- {"a", OPT_A, '-', "Show all data"},
- {"b", OPT_B, '-', "Show build date"},
- {"d", OPT_D, '-', "Show configuration directory"},
- {"m", OPT_M, '-', "Show modules directory"},
- {"f", OPT_F, '-', "Show compiler flags used"},
- {"o", OPT_O, '-', "Show some internal datatype options"},
- {"p", OPT_P, '-', "Show target build platform"},
- {"r", OPT_R, '-', "Show random seeding options"},
- {"v", OPT_V, '-', "Show library version"},
- {"c", OPT_C, '-', "Show CPU settings info"},
+ { "a", OPT_A, '-', "Show all data" },
+ { "b", OPT_B, '-', "Show build date" },
+ { "d", OPT_D, '-', "Show configuration directory" },
+ { "m", OPT_M, '-', "Show modules directory" },
+ { "f", OPT_F, '-', "Show compiler flags used" },
+ { "o", OPT_O, '-', "Show some internal datatype options" },
+ { "p", OPT_P, '-', "Show target build platform" },
+ { "r", OPT_R, '-', "Show random seeding options" },
+ { "v", OPT_V, '-', "Show library version" },
+ { "c", OPT_C, '-', "Show CPU settings info" },
#if defined(_WIN32)
- {"w", OPT_W, '-', "Show Windows install context"},
+ { "w", OPT_W, '-', "Show Windows install context" },
#endif
- {NULL}
+ { NULL }
};
int version_main(int argc, char **argv)
@@ -61,7 +71,7 @@ int version_main(int argc, char **argv)
switch (o) {
case OPT_EOF:
case OPT_ERR:
-opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
case OPT_HELP:
@@ -117,7 +127,7 @@ opthelp:
if (version)
printf("%s (Library: %s)\n",
- OPENSSL_VERSION_TEXT, OpenSSL_version(OPENSSL_VERSION));
+ OPENSSL_VERSION_TEXT, OpenSSL_version(OPENSSL_VERSION));
if (date)
printf("%s\n", OpenSSL_version(OPENSSL_BUILT_ON));
if (platform)
@@ -144,19 +154,18 @@ opthelp:
printf("%s\n", OpenSSL_version(OPENSSL_WINCTX));
#endif
ret = 0;
- end:
+end:
return ret;
}
-
#if defined(__TANDEM) && defined(OPENSSL_VPROC)
/*
* Define a VPROC function for the openssl program.
* This is used by platform version identification tools.
* Do not inline this procedure or make it static.
*/
-# define OPENSSL_VPROC_STRING_(x) x##_OPENSSL
-# define OPENSSL_VPROC_STRING(x) OPENSSL_VPROC_STRING_(x)
-# define OPENSSL_VPROC_FUNC OPENSSL_VPROC_STRING(OPENSSL_VPROC)
-void OPENSSL_VPROC_FUNC(void) {}
+#define OPENSSL_VPROC_STRING_(x) x##_OPENSSL
+#define OPENSSL_VPROC_STRING(x) OPENSSL_VPROC_STRING_(x)
+#define OPENSSL_VPROC_FUNC OPENSSL_VPROC_STRING(OPENSSL_VPROC)
+void OPENSSL_VPROC_FUNC(void) { }
#endif
diff --git a/apps/vms_decc_init.c b/apps/vms_decc_init.c
index 21481e27bf..58b9b190a1 100644
--- a/apps/vms_decc_init.c
+++ b/apps/vms_decc_init.c
@@ -7,9 +7,8 @@
* https://www.openssl.org/source/license.html
*/
-#if defined( __VMS) && !defined( OPENSSL_NO_DECC_INIT) && \
- defined( __DECC) && !defined( __VAX) && (__CRTL_VER >= 70301000)
-# define USE_DECC_INIT 1
+#if defined(__VMS) && !defined(OPENSSL_NO_DECC_INIT) && defined(__DECC) && !defined(__VAX) && (__CRTL_VER >= 70301000)
+#define USE_DECC_INIT 1
#endif
#ifdef USE_DECC_INIT
@@ -21,9 +20,9 @@
* ----------------------------------------------------------------------
*/
-# include <stdio.h>
-# include <stdlib.h>
-# include <unixlib.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unixlib.h>
/* Global storage. */
@@ -45,22 +44,21 @@ typedef struct {
decc_feat_t decc_feat_array[] = {
/* Preserve command-line case with SET PROCESS/PARSE_STYLE=EXTENDED */
- {"DECC$ARGV_PARSE_STYLE", 1},
+ { "DECC$ARGV_PARSE_STYLE", 1 },
/* Preserve case for file names on ODS5 disks. */
- {"DECC$EFS_CASE_PRESERVE", 1},
+ { "DECC$EFS_CASE_PRESERVE", 1 },
/*
* Enable multiple dots (and most characters) in ODS5 file names, while
* preserving VMS-ness of ";version".
*/
- {"DECC$EFS_CHARSET", 1},
+ { "DECC$EFS_CHARSET", 1 },
/* List terminator. */
- {(char *)NULL, 0}
+ { (char *)NULL, 0 }
};
-
/* LIB$INITIALIZE initialization function. */
static void decc_init(void)
@@ -98,31 +96,30 @@ static void decc_init(void)
feat_value_max = decc$feature_get_value(feat_index, 3);
/* Check the validity of our desired value. */
- if ((decc_feat_array[i].value >= feat_value_min) &&
- (decc_feat_array[i].value <= feat_value_max)) {
+ if ((decc_feat_array[i].value >= feat_value_min) && (decc_feat_array[i].value <= feat_value_max)) {
/* Valid value. Set it if necessary. */
if (feat_value != decc_feat_array[i].value) {
sts = decc$feature_set_value(feat_index,
- 1, decc_feat_array[i].value);
+ 1, decc_feat_array[i].value);
if (verbose > 1) {
fprintf(stderr, " %s = %d, sts = %d.\n",
- decc_feat_array[i].name,
- decc_feat_array[i].value, sts);
+ decc_feat_array[i].name,
+ decc_feat_array[i].value, sts);
}
}
} else {
/* Invalid DECC feature value. */
fprintf(stderr,
- " INVALID DECC$FEATURE VALUE, %d: %d <= %s <= %d.\n",
- feat_value,
- feat_value_min, decc_feat_array[i].name,
- feat_value_max);
+ " INVALID DECC$FEATURE VALUE, %d: %d <= %s <= %d.\n",
+ feat_value,
+ feat_value_min, decc_feat_array[i].name,
+ feat_value_max);
}
} else {
/* Invalid DECC feature name. */
fprintf(stderr,
- " UNKNOWN DECC$FEATURE: %s.\n", decc_feat_array[i].name);
+ " UNKNOWN DECC$FEATURE: %s.\n", decc_feat_array[i].name);
}
}
@@ -133,44 +130,44 @@ static void decc_init(void)
/* Get "decc_init()" into a valid, loaded LIB$INITIALIZE PSECT. */
-# pragma nostandard
+#pragma nostandard
/*
* Establish the LIB$INITIALIZE PSECTs, with proper alignment and other
* attributes. Note that "nopic" is significant only on VAX.
*/
-# pragma extern_model save
+#pragma extern_model save
-# if __INITIAL_POINTER_SIZE == 64
-# define PSECT_ALIGN 3
-# else
-# define PSECT_ALIGN 2
-# endif
+#if __INITIAL_POINTER_SIZE == 64
+#define PSECT_ALIGN 3
+#else
+#define PSECT_ALIGN 2
+#endif
-# pragma extern_model strict_refdef "LIB$INITIALIZ" PSECT_ALIGN, nopic, nowrt
+#pragma extern_model strict_refdef "LIB$INITIALIZ" PSECT_ALIGN, nopic, nowrt
const int spare[8] = { 0 };
-# pragma extern_model strict_refdef "LIB$INITIALIZE" PSECT_ALIGN, nopic, nowrt
-void (*const x_decc_init) () = decc_init;
+#pragma extern_model strict_refdef "LIB$INITIALIZE" PSECT_ALIGN, nopic, nowrt
+void (*const x_decc_init)() = decc_init;
-# pragma extern_model restore
+#pragma extern_model restore
/* Fake reference to ensure loading the LIB$INITIALIZE PSECT. */
-# pragma extern_model save
+#pragma extern_model save
int LIB$INITIALIZE(void);
-# pragma extern_model strict_refdef
+#pragma extern_model strict_refdef
int dmy_lib$initialize = (int)LIB$INITIALIZE;
-# pragma extern_model restore
+#pragma extern_model restore
-# pragma standard
+#pragma standard
-#else /* def USE_DECC_INIT */
+#else /* def USE_DECC_INIT */
/* Dummy code to avoid a %CC-W-EMPTYFILE complaint. */
int decc_init_dummy(void);
-#endif /* def USE_DECC_INIT */
+#endif /* def USE_DECC_INIT */
diff --git a/apps/x509.c b/apps/x509.c
index ac8a72dce2..41e9204087 100644
--- a/apps/x509.c
+++ b/apps/x509.c
@@ -23,166 +23,223 @@
#include <openssl/pem.h>
#include <openssl/rsa.h>
#ifndef OPENSSL_NO_DSA
-# include <openssl/dsa.h>
+#include <openssl/dsa.h>
#endif
-#include "internal/e_os.h" /* For isatty() */
+#include "internal/e_os.h" /* For isatty() */
#undef POSTFIX
#define POSTFIX ".srl"
-#define DEFAULT_DAYS 30 /* default certificate validity period in days */
-#define UNSET_DAYS -2 /* -1 may be used for testing expiration checks */
-#define EXT_COPY_UNSET -1
+#define DEFAULT_DAYS 30 /* default certificate validity period in days */
+#define UNSET_DAYS -2 /* -1 may be used for testing expiration checks */
+#define EXT_COPY_UNSET -1
static int callb(int ok, X509_STORE_CTX *ctx);
static ASN1_INTEGER *x509_load_serial(const char *CAfile,
- const char *serialfile, int create);
+ const char *serialfile, int create);
static int purpose_print(BIO *bio, X509 *cert, X509_PURPOSE *pt);
static int print_x509v3_exts(BIO *bio, X509 *x, const char *ext_names);
typedef enum OPTION_choice {
OPT_COMMON,
- OPT_INFORM, OPT_OUTFORM, OPT_KEYFORM, OPT_REQ, OPT_CAFORM,
- OPT_CAKEYFORM, OPT_VFYOPT, OPT_SIGOPT, OPT_DAYS, OPT_PASSIN, OPT_EXTFILE,
- OPT_EXTENSIONS, OPT_IN, OPT_OUT, OPT_KEY, OPT_SIGNKEY, OPT_CA, OPT_CAKEY,
- OPT_CASERIAL, OPT_SET_SERIAL, OPT_NEW, OPT_FORCE_PUBKEY, OPT_ISSU, OPT_SUBJ,
- OPT_ADDTRUST, OPT_ADDREJECT, OPT_SETALIAS, OPT_CERTOPT, OPT_DATEOPT, OPT_NAMEOPT,
- OPT_EMAIL, OPT_OCSP_URI, OPT_SERIAL, OPT_NEXT_SERIAL,
- OPT_MODULUS, OPT_MULTI, OPT_PUBKEY, OPT_X509TOREQ, OPT_TEXT, OPT_HASH,
- OPT_ISSUER_HASH, OPT_SUBJECT, OPT_ISSUER, OPT_FINGERPRINT, OPT_DATES,
- OPT_PURPOSE, OPT_STARTDATE, OPT_ENDDATE, OPT_CHECKEND, OPT_CHECKHOST,
- OPT_CHECKEMAIL, OPT_CHECKIP, OPT_NOOUT, OPT_TRUSTOUT, OPT_CLRTRUST,
- OPT_CLRREJECT, OPT_ALIAS, OPT_CACREATESERIAL, OPT_CLREXT, OPT_OCSPID,
- OPT_SUBJECT_HASH_OLD, OPT_ISSUER_HASH_OLD, OPT_COPY_EXTENSIONS,
- OPT_BADSIG, OPT_MD, OPT_NOCERT, OPT_PRESERVE_DATES,
- OPT_NOT_BEFORE, OPT_NOT_AFTER,
- OPT_R_ENUM, OPT_PROV_ENUM, OPT_EXT
+ OPT_INFORM,
+ OPT_OUTFORM,
+ OPT_KEYFORM,
+ OPT_REQ,
+ OPT_CAFORM,
+ OPT_CAKEYFORM,
+ OPT_VFYOPT,
+ OPT_SIGOPT,
+ OPT_DAYS,
+ OPT_PASSIN,
+ OPT_EXTFILE,
+ OPT_EXTENSIONS,
+ OPT_IN,
+ OPT_OUT,
+ OPT_KEY,
+ OPT_SIGNKEY,
+ OPT_CA,
+ OPT_CAKEY,
+ OPT_CASERIAL,
+ OPT_SET_SERIAL,
+ OPT_NEW,
+ OPT_FORCE_PUBKEY,
+ OPT_ISSU,
+ OPT_SUBJ,
+ OPT_ADDTRUST,
+ OPT_ADDREJECT,
+ OPT_SETALIAS,
+ OPT_CERTOPT,
+ OPT_DATEOPT,
+ OPT_NAMEOPT,
+ OPT_EMAIL,
+ OPT_OCSP_URI,
+ OPT_SERIAL,
+ OPT_NEXT_SERIAL,
+ OPT_MODULUS,
+ OPT_MULTI,
+ OPT_PUBKEY,
+ OPT_X509TOREQ,
+ OPT_TEXT,
+ OPT_HASH,
+ OPT_ISSUER_HASH,
+ OPT_SUBJECT,
+ OPT_ISSUER,
+ OPT_FINGERPRINT,
+ OPT_DATES,
+ OPT_PURPOSE,
+ OPT_STARTDATE,
+ OPT_ENDDATE,
+ OPT_CHECKEND,
+ OPT_CHECKHOST,
+ OPT_CHECKEMAIL,
+ OPT_CHECKIP,
+ OPT_NOOUT,
+ OPT_TRUSTOUT,
+ OPT_CLRTRUST,
+ OPT_CLRREJECT,
+ OPT_ALIAS,
+ OPT_CACREATESERIAL,
+ OPT_CLREXT,
+ OPT_OCSPID,
+ OPT_SUBJECT_HASH_OLD,
+ OPT_ISSUER_HASH_OLD,
+ OPT_COPY_EXTENSIONS,
+ OPT_BADSIG,
+ OPT_MD,
+ OPT_NOCERT,
+ OPT_PRESERVE_DATES,
+ OPT_NOT_BEFORE,
+ OPT_NOT_AFTER,
+ OPT_R_ENUM,
+ OPT_PROV_ENUM,
+ OPT_EXT
} OPTION_CHOICE;
const OPTIONS x509_options[] = {
OPT_SECTION("General"),
- {"help", OPT_HELP, '-', "Display this summary"},
-
- {"in", OPT_IN, '<',
- "Certificate input, or CSR input file with -req (default stdin)"},
- {"passin", OPT_PASSIN, 's', "Private key and cert file pass-phrase source"},
- {"new", OPT_NEW, '-', "Generate a certificate from scratch"},
- {"x509toreq", OPT_X509TOREQ, '-',
- "Output a certification request (rather than a certificate)"},
- {"req", OPT_REQ, '-', "Input is a CSR file (rather than a certificate)"},
- {"copy_extensions", OPT_COPY_EXTENSIONS, 's',
- "copy extensions when converting from CSR to x509 or vice versa"},
- {"inform", OPT_INFORM, 'f',
- "CSR input format to use (PEM or DER; by default try PEM first)"},
- {"vfyopt", OPT_VFYOPT, 's', "CSR verification parameter in n:v form"},
- {"key", OPT_KEY, 's',
- "Key for signing, and to include unless using -force_pubkey"},
- {"signkey", OPT_SIGNKEY, 's',
- "Same as -key"},
- {"keyform", OPT_KEYFORM, 'f', "Key input format (DER/PEM)"},
- {"out", OPT_OUT, '>', "Output file - default stdout"},
- {"outform", OPT_OUTFORM, 'f',
- "Output format (DER or PEM) - default PEM"},
- {"nocert", OPT_NOCERT, '-',
- "No cert output (except for requested printing)"},
- {"noout", OPT_NOOUT, '-', "No output (except for requested printing)"},
+ { "help", OPT_HELP, '-', "Display this summary" },
+
+ { "in", OPT_IN, '<',
+ "Certificate input, or CSR input file with -req (default stdin)" },
+ { "passin", OPT_PASSIN, 's', "Private key and cert file pass-phrase source" },
+ { "new", OPT_NEW, '-', "Generate a certificate from scratch" },
+ { "x509toreq", OPT_X509TOREQ, '-',
+ "Output a certification request (rather than a certificate)" },
+ { "req", OPT_REQ, '-', "Input is a CSR file (rather than a certificate)" },
+ { "copy_extensions", OPT_COPY_EXTENSIONS, 's',
+ "copy extensions when converting from CSR to x509 or vice versa" },
+ { "inform", OPT_INFORM, 'f',
+ "CSR input format to use (PEM or DER; by default try PEM first)" },
+ { "vfyopt", OPT_VFYOPT, 's', "CSR verification parameter in n:v form" },
+ { "key", OPT_KEY, 's',
+ "Key for signing, and to include unless using -force_pubkey" },
+ { "signkey", OPT_SIGNKEY, 's',
+ "Same as -key" },
+ { "keyform", OPT_KEYFORM, 'f', "Key input format (DER/PEM)" },
+ { "out", OPT_OUT, '>', "Output file - default stdout" },
+ { "outform", OPT_OUTFORM, 'f',
+ "Output format (DER or PEM) - default PEM" },
+ { "nocert", OPT_NOCERT, '-',
+ "No cert output (except for requested printing)" },
+ { "noout", OPT_NOOUT, '-', "No output (except for requested printing)" },
OPT_SECTION("Certificate printing"),
- {"text", OPT_TEXT, '-', "Print the certificate in text form"},
- {"dateopt", OPT_DATEOPT, 's',
- "Datetime format used for printing. (rfc_822/iso_8601). Default is rfc_822."},
- {"certopt", OPT_CERTOPT, 's', "Various certificate text printing options"},
- {"fingerprint", OPT_FINGERPRINT, '-', "Print the certificate fingerprint"},
- {"alias", OPT_ALIAS, '-', "Print certificate alias"},
- {"serial", OPT_SERIAL, '-', "Print serial number value"},
- {"startdate", OPT_STARTDATE, '-', "Print the notBefore field"},
- {"enddate", OPT_ENDDATE, '-', "Print the notAfter field"},
- {"dates", OPT_DATES, '-', "Print both notBefore and notAfter fields"},
- {"subject", OPT_SUBJECT, '-', "Print subject DN"},
- {"issuer", OPT_ISSUER, '-', "Print issuer DN"},
- {"nameopt", OPT_NAMEOPT, 's',
- "Certificate subject/issuer name printing options"},
- {"email", OPT_EMAIL, '-', "Print email address(es)"},
- {"hash", OPT_HASH, '-', "Synonym for -subject_hash (for backward compat)"},
- {"subject_hash", OPT_HASH, '-', "Print subject hash value"},
+ { "text", OPT_TEXT, '-', "Print the certificate in text form" },
+ { "dateopt", OPT_DATEOPT, 's',
+ "Datetime format used for printing. (rfc_822/iso_8601). Default is rfc_822." },
+ { "certopt", OPT_CERTOPT, 's', "Various certificate text printing options" },
+ { "fingerprint", OPT_FINGERPRINT, '-', "Print the certificate fingerprint" },
+ { "alias", OPT_ALIAS, '-', "Print certificate alias" },
+ { "serial", OPT_SERIAL, '-', "Print serial number value" },
+ { "startdate", OPT_STARTDATE, '-', "Print the notBefore field" },
+ { "enddate", OPT_ENDDATE, '-', "Print the notAfter field" },
+ { "dates", OPT_DATES, '-', "Print both notBefore and notAfter fields" },
+ { "subject", OPT_SUBJECT, '-', "Print subject DN" },
+ { "issuer", OPT_ISSUER, '-', "Print issuer DN" },
+ { "nameopt", OPT_NAMEOPT, 's',
+ "Certificate subject/issuer name printing options" },
+ { "email", OPT_EMAIL, '-', "Print email address(es)" },
+ { "hash", OPT_HASH, '-', "Synonym for -subject_hash (for backward compat)" },
+ { "subject_hash", OPT_HASH, '-', "Print subject hash value" },
#ifndef OPENSSL_NO_MD5
- {"subject_hash_old", OPT_SUBJECT_HASH_OLD, '-',
- "Print old-style (MD5) subject hash value"},
+ { "subject_hash_old", OPT_SUBJECT_HASH_OLD, '-',
+ "Print old-style (MD5) subject hash value" },
#endif
- {"issuer_hash", OPT_ISSUER_HASH, '-', "Print issuer hash value"},
+ { "issuer_hash", OPT_ISSUER_HASH, '-', "Print issuer hash value" },
#ifndef OPENSSL_NO_MD5
- {"issuer_hash_old", OPT_ISSUER_HASH_OLD, '-',
- "Print old-style (MD5) issuer hash value"},
+ { "issuer_hash_old", OPT_ISSUER_HASH_OLD, '-',
+ "Print old-style (MD5) issuer hash value" },
#endif
- {"ext", OPT_EXT, 's',
- "Restrict which X.509 extensions to print and/or copy"},
- {"ocspid", OPT_OCSPID, '-',
- "Print OCSP hash values for the subject name and public key"},
- {"ocsp_uri", OPT_OCSP_URI, '-', "Print OCSP Responder URL(s)"},
- {"purpose", OPT_PURPOSE, '-', "Print out certificate purposes"},
- {"pubkey", OPT_PUBKEY, '-', "Print the public key in PEM format"},
- {"modulus", OPT_MODULUS, '-', "Print the RSA key modulus"},
- {"multi", OPT_MULTI, '-', "Process multiple certificates"},
+ { "ext", OPT_EXT, 's',
+ "Restrict which X.509 extensions to print and/or copy" },
+ { "ocspid", OPT_OCSPID, '-',
+ "Print OCSP hash values for the subject name and public key" },
+ { "ocsp_uri", OPT_OCSP_URI, '-', "Print OCSP Responder URL(s)" },
+ { "purpose", OPT_PURPOSE, '-', "Print out certificate purposes" },
+ { "pubkey", OPT_PUBKEY, '-', "Print the public key in PEM format" },
+ { "modulus", OPT_MODULUS, '-', "Print the RSA key modulus" },
+ { "multi", OPT_MULTI, '-', "Process multiple certificates" },
OPT_SECTION("Certificate checking"),
- {"checkend", OPT_CHECKEND, 'M',
- "Check whether cert expires in the next arg seconds"},
- {OPT_MORE_STR, 1, 1, "Exit 1 (failure) if so, 0 if not"},
- {"checkhost", OPT_CHECKHOST, 's', "Check certificate matches host"},
- {"checkemail", OPT_CHECKEMAIL, 's', "Check certificate matches email"},
- {"checkip", OPT_CHECKIP, 's', "Check certificate matches ipaddr"},
+ { "checkend", OPT_CHECKEND, 'M',
+ "Check whether cert expires in the next arg seconds" },
+ { OPT_MORE_STR, 1, 1, "Exit 1 (failure) if so, 0 if not" },
+ { "checkhost", OPT_CHECKHOST, 's', "Check certificate matches host" },
+ { "checkemail", OPT_CHECKEMAIL, 's', "Check certificate matches email" },
+ { "checkip", OPT_CHECKIP, 's', "Check certificate matches ipaddr" },
OPT_SECTION("Certificate output"),
- {"set_serial", OPT_SET_SERIAL, 's',
- "Serial number to use, overrides -CAserial"},
- {"next_serial", OPT_NEXT_SERIAL, '-',
- "Increment current certificate serial number"},
- {"not_before", OPT_NOT_BEFORE, 's',
- "[CC]YYMMDDHHMMSSZ value for notBefore certificate field"},
- {"not_after", OPT_NOT_AFTER, 's',
- "[CC]YYMMDDHHMMSSZ value for notAfter certificate field, overrides -days"},
- {"days", OPT_DAYS, 'n',
- "Number of days until newly generated certificate expires - default 30"},
- {"preserve_dates", OPT_PRESERVE_DATES, '-',
- "Preserve existing validity dates"},
- {"set_issuer", OPT_ISSU, 's', "Set or override certificate issuer"},
- {"set_subject", OPT_SUBJ, 's', "Set or override certificate subject (and issuer)"},
- {"subj", OPT_SUBJ, 's', "Alias for -set_subject"},
- {"force_pubkey", OPT_FORCE_PUBKEY, '<',
- "Key to be placed in new certificate or certificate request"},
- {"clrext", OPT_CLREXT, '-',
- "Do not take over any extensions from the source certificate or request"},
- {"extfile", OPT_EXTFILE, '<', "Config file with X509V3 extensions to add"},
- {"extensions", OPT_EXTENSIONS, 's',
- "Section of extfile to use - default: unnamed section"},
- {"sigopt", OPT_SIGOPT, 's', "Signature parameter, in n:v form"},
- {"badsig", OPT_BADSIG, '-',
- "Corrupt last byte of certificate signature (for test)"},
- {"", OPT_MD, '-', "Any supported digest, used for signing and printing"},
+ { "set_serial", OPT_SET_SERIAL, 's',
+ "Serial number to use, overrides -CAserial" },
+ { "next_serial", OPT_NEXT_SERIAL, '-',
+ "Increment current certificate serial number" },
+ { "not_before", OPT_NOT_BEFORE, 's',
+ "[CC]YYMMDDHHMMSSZ value for notBefore certificate field" },
+ { "not_after", OPT_NOT_AFTER, 's',
+ "[CC]YYMMDDHHMMSSZ value for notAfter certificate field, overrides -days" },
+ { "days", OPT_DAYS, 'n',
+ "Number of days until newly generated certificate expires - default 30" },
+ { "preserve_dates", OPT_PRESERVE_DATES, '-',
+ "Preserve existing validity dates" },
+ { "set_issuer", OPT_ISSU, 's', "Set or override certificate issuer" },
+ { "set_subject", OPT_SUBJ, 's', "Set or override certificate subject (and issuer)" },
+ { "subj", OPT_SUBJ, 's', "Alias for -set_subject" },
+ { "force_pubkey", OPT_FORCE_PUBKEY, '<',
+ "Key to be placed in new certificate or certificate request" },
+ { "clrext", OPT_CLREXT, '-',
+ "Do not take over any extensions from the source certificate or request" },
+ { "extfile", OPT_EXTFILE, '<', "Config file with X509V3 extensions to add" },
+ { "extensions", OPT_EXTENSIONS, 's',
+ "Section of extfile to use - default: unnamed section" },
+ { "sigopt", OPT_SIGOPT, 's', "Signature parameter, in n:v form" },
+ { "badsig", OPT_BADSIG, '-',
+ "Corrupt last byte of certificate signature (for test)" },
+ { "", OPT_MD, '-', "Any supported digest, used for signing and printing" },
OPT_SECTION("Micro-CA"),
- {"CA", OPT_CA, '<',
- "Use the given CA certificate, conflicts with -key"},
- {"CAform", OPT_CAFORM, 'F', "CA cert format (PEM/DER/P12); has no effect"},
- {"CAkey", OPT_CAKEY, 's', "The corresponding CA key; default is -CA arg"},
- {"CAkeyform", OPT_CAKEYFORM, 'f', "CA key format (DER/PEM)"},
- {"CAserial", OPT_CASERIAL, 's',
- "File that keeps track of CA-generated serial number"},
- {"CAcreateserial", OPT_CACREATESERIAL, '-',
- "Create CA serial number file if it does not exist"},
+ { "CA", OPT_CA, '<',
+ "Use the given CA certificate, conflicts with -key" },
+ { "CAform", OPT_CAFORM, 'F', "CA cert format (PEM/DER/P12); has no effect" },
+ { "CAkey", OPT_CAKEY, 's', "The corresponding CA key; default is -CA arg" },
+ { "CAkeyform", OPT_CAKEYFORM, 'f', "CA key format (DER/PEM)" },
+ { "CAserial", OPT_CASERIAL, 's',
+ "File that keeps track of CA-generated serial number" },
+ { "CAcreateserial", OPT_CACREATESERIAL, '-',
+ "Create CA serial number file if it does not exist" },
OPT_SECTION("Certificate trust output"),
- {"trustout", OPT_TRUSTOUT, '-', "Mark certificate PEM output as trusted"},
- {"setalias", OPT_SETALIAS, 's', "Set certificate alias (nickname)"},
- {"clrtrust", OPT_CLRTRUST, '-', "Clear all trusted purposes"},
- {"addtrust", OPT_ADDTRUST, 's', "Trust certificate for a given purpose"},
- {"clrreject", OPT_CLRREJECT, '-',
- "Clears all the prohibited or rejected uses of the certificate"},
- {"addreject", OPT_ADDREJECT, 's',
- "Reject certificate for a given purpose"},
+ { "trustout", OPT_TRUSTOUT, '-', "Mark certificate PEM output as trusted" },
+ { "setalias", OPT_SETALIAS, 's', "Set certificate alias (nickname)" },
+ { "clrtrust", OPT_CLRTRUST, '-', "Clear all trusted purposes" },
+ { "addtrust", OPT_ADDTRUST, 's', "Trust certificate for a given purpose" },
+ { "clrreject", OPT_CLRREJECT, '-',
+ "Clears all the prohibited or rejected uses of the certificate" },
+ { "addreject", OPT_ADDREJECT, 's',
+ "Reject certificate for a given purpose" },
OPT_R_OPTIONS,
OPT_PROV_OPTIONS,
- {NULL}
+ { NULL }
};
static void warn_copying(ASN1_OBJECT *excluded, const char *names)
@@ -191,8 +248,8 @@ static void warn_copying(ASN1_OBJECT *excluded, const char *names)
if (names != NULL && strstr(names, sn) != NULL)
BIO_printf(bio_err,
- "Warning: -ext should not specify copying %s extension to CSR; ignoring this\n",
- sn);
+ "Warning: -ext should not specify copying %s extension to CSR; ignoring this\n",
+ sn);
}
static X509_REQ *x509_to_req(X509 *cert, int ext_copy, const char *names)
@@ -220,13 +277,13 @@ static X509_REQ *x509_to_req(X509 *cert, int ext_copy, const char *names)
ASN1_OBJECT *obj = X509_EXTENSION_get_object(ex);
if (OBJ_cmp(obj, skid) != 0 && OBJ_cmp(obj, akid) != 0
- && !sk_X509_EXTENSION_push(exts, ex))
+ && !sk_X509_EXTENSION_push(exts, ex))
goto err;
}
if (sk_X509_EXTENSION_num(exts) > 0) {
if (ext_copy != EXT_COPY_UNSET && ext_copy != EXT_COPY_NONE
- && !X509_REQ_add_extensions(req, exts)) {
+ && !X509_REQ_add_extensions(req, exts)) {
BIO_printf(bio_err, "Error copying extensions from certificate\n");
goto err;
}
@@ -234,7 +291,7 @@ static X509_REQ *x509_to_req(X509 *cert, int ext_copy, const char *names)
sk_X509_EXTENSION_free(exts);
return req;
- err:
+err:
sk_X509_EXTENSION_free(exts);
X509_REQ_free(req);
return NULL;
@@ -313,7 +370,7 @@ int x509_main(int argc, char **argv)
switch (o) {
case OPT_EOF:
case OPT_ERR:
- opthelp:
+ opthelp:
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto err;
case OPT_HELP:
@@ -353,14 +410,14 @@ int x509_main(int argc, char **argv)
case OPT_DATEOPT:
if (!set_dateopt(&dateopt, opt_arg())) {
BIO_printf(bio_err,
- "Invalid date format: %s\n", opt_arg());
+ "Invalid date format: %s\n", opt_arg());
goto err;
}
break;
case OPT_COPY_EXTENSIONS:
if (!set_ext_copy(&ext_copy, opt_arg())) {
BIO_printf(bio_err,
- "Invalid extension copy option: %s\n", opt_arg());
+ "Invalid extension copy option: %s\n", opt_arg());
goto err;
}
break;
@@ -387,7 +444,7 @@ int x509_main(int argc, char **argv)
days = atoi(opt_arg());
if (days <= UNSET_DAYS) {
BIO_printf(bio_err, "%s: -days parameter arg must be >= -1\n",
- prog);
+ prog);
goto err;
}
break;
@@ -446,7 +503,7 @@ int x509_main(int argc, char **argv)
goto err;
if ((objtmp = OBJ_txt2obj(opt_arg(), 0)) == NULL) {
BIO_printf(bio_err, "%s: Invalid trust object value %s\n",
- prog, opt_arg());
+ prog, opt_arg());
goto opthelp;
}
if (!sk_ASN1_OBJECT_push(trust, objtmp))
@@ -458,7 +515,7 @@ int x509_main(int argc, char **argv)
goto err;
if ((objtmp = OBJ_txt2obj(opt_arg(), 0)) == NULL) {
BIO_printf(bio_err, "%s: Invalid reject object value %s\n",
- prog, opt_arg());
+ prog, opt_arg());
goto opthelp;
}
if (!sk_ASN1_OBJECT_push(reject, objtmp))
@@ -587,7 +644,7 @@ int x509_main(int argc, char **argv)
checkoffset = (time_t)temp;
if ((ossl_intmax_t)checkoffset != temp) {
BIO_printf(bio_err, "%s: Checkend time out of range %s\n",
- prog, opt_arg());
+ prog, opt_arg());
goto opthelp;
}
}
@@ -642,7 +699,7 @@ int x509_main(int argc, char **argv)
}
if (!X509_STORE_set_default_paths_ex(ctx, app_get0_libctx(),
- app_get0_propq()))
+ app_get0_propq()))
goto err;
if (newcert && infile != NULL) {
@@ -660,27 +717,28 @@ int x509_main(int argc, char **argv)
}
if (pubkeyfile != NULL) {
if ((pubkey = load_pubkey(pubkeyfile, keyformat, 0, NULL,
- "explicitly set public key")) == NULL)
+ "explicitly set public key"))
+ == NULL)
goto err;
}
if (newcert) {
if (subj == NULL) {
BIO_printf(bio_err,
- "The -new option requires a subject to be set using -subj\n");
+ "The -new option requires a subject to be set using -subj\n");
goto err;
}
if (privkeyfile == NULL && pubkeyfile == NULL) {
BIO_printf(bio_err,
- "The -new option requires using the -key or -force_pubkey option\n");
+ "The -new option requires using the -key or -force_pubkey option\n");
goto err;
}
}
if (issu != NULL
- && (fissu = parse_name(issu, chtype, multirdn, "issuer")) == NULL)
+ && (fissu = parse_name(issu, chtype, multirdn, "issuer")) == NULL)
goto err;
if (subj != NULL
- && (fsubj = parse_name(subj, chtype, multirdn, "subject")) == NULL)
+ && (fsubj = parse_name(subj, chtype, multirdn, "subject")) == NULL)
goto err;
if (CAkeyfile == NULL)
@@ -692,7 +750,7 @@ int x509_main(int argc, char **argv)
}
} else {
#define WARN_NO_CA(opt) BIO_printf(bio_err, \
- "Warning: ignoring " opt " option since -CA option is not given\n");
+ "Warning: ignoring " opt " option since -CA option is not given\n");
if (CAkeyfile != NULL)
WARN_NO_CA("-CAkey");
if (CAkeyformat != FORMAT_UNDEF)
@@ -708,7 +766,7 @@ int x509_main(int argc, char **argv)
if (extfile == NULL) {
if (extsect != NULL)
BIO_printf(bio_err,
- "Warning: ignoring -extensions option without -extfile\n");
+ "Warning: ignoring -extensions option without -extfile\n");
} else {
X509V3_CTX ctx2;
@@ -723,7 +781,7 @@ int x509_main(int argc, char **argv)
X509V3_set_nconf(&ctx2, extconf);
if (!X509V3_EXT_add_nconf(extconf, &ctx2, extsect, NULL)) {
BIO_printf(bio_err,
- "Error checking extension section %s\n", extsect);
+ "Error checking extension section %s\n", extsect);
goto err;
}
}
@@ -736,9 +794,9 @@ int x509_main(int argc, char **argv)
if (reqfile) {
if (infile == NULL && isatty(fileno_stdin()))
BIO_printf(bio_err,
- "Warning: Reading cert request from stdin since no -in option is given\n");
+ "Warning: Reading cert request from stdin since no -in option is given\n");
req = load_csr_autofmt(infile, informat, vfyopts,
- "certificate request input");
+ "certificate request input");
if (req == NULL)
goto err;
@@ -748,9 +806,7 @@ int x509_main(int argc, char **argv)
}
i = do_X509_REQ_verify(req, pkey, vfyopts);
if (i <= 0) {
- BIO_printf(bio_err, i < 0
- ? "Error while verifying certificate request self-signature\n"
- : "Certificate request self-signature did not match the contents\n");
+ BIO_printf(bio_err, i < 0 ? "Error while verifying certificate request self-signature\n" : "Certificate request self-signature did not match the contents\n");
goto err;
}
BIO_printf(bio_err, "Certificate request self-signature ok\n");
@@ -763,11 +819,11 @@ int x509_main(int argc, char **argv)
if (reqfile || newcert) {
if (preserve_dates)
BIO_printf(bio_err,
- "Warning: ignoring -preserve_dates option with -req or -new\n");
+ "Warning: ignoring -preserve_dates option with -req or -new\n");
preserve_dates = 0;
if (privkeyfile == NULL && CAkeyfile == NULL) {
BIO_printf(bio_err,
- "We need a private key to sign with, use -key or -CAkey or -CA with private key\n");
+ "We need a private key to sign with, use -key or -CAkey or -CA with private key\n");
goto err;
}
if ((x = X509_new_ex(app_get0_libctx(), app_get0_propq())) == NULL)
@@ -789,7 +845,7 @@ int x509_main(int argc, char **argv)
} else {
if (infile == NULL && isatty(fileno_stdin()))
BIO_printf(bio_err,
- "Warning: Reading certificate(s) from stdin since no -in or -new option is given\n");
+ "Warning: Reading certificate(s) from stdin since no -in or -new option is given\n");
if (multi) {
certs = sk_X509_new_null();
if (certs == NULL)
@@ -809,18 +865,16 @@ int x509_main(int argc, char **argv)
if (out == NULL)
goto err;
- cert_loop:
+cert_loop:
if (multi)
x = sk_X509_value(certs, k);
if ((fsubj != NULL || req != NULL)
- && !X509_set_subject_name(x, fsubj != NULL ? fsubj :
- X509_REQ_get_subject_name(req)))
+ && !X509_set_subject_name(x, fsubj != NULL ? fsubj : X509_REQ_get_subject_name(req)))
goto err;
if ((pubkey != NULL || privkey != NULL || req != NULL)
- && !X509_set_pubkey(x, pubkey != NULL ? pubkey :
- privkey != NULL ? privkey :
- X509_REQ_get0_pubkey(req)))
+ && !X509_set_pubkey(x, pubkey != NULL ? pubkey : privkey != NULL ? privkey
+ : X509_REQ_get0_pubkey(req)))
goto err;
if (CAfile != NULL) {
@@ -869,7 +923,7 @@ int x509_main(int argc, char **argv)
} else {
if (privkey != NULL && !cert_matches_key(x, privkey))
BIO_printf(bio_err,
- "Warning: Signature key and public key of cert do not match\n");
+ "Warning: Signature key and public key of cert do not match\n");
}
if (sno != NULL && !X509_set_serialNumber(x, sno))
@@ -897,7 +951,7 @@ int x509_main(int argc, char **argv)
X509V3_set_nconf(&ext_ctx, extconf);
if (!X509V3_EXT_add_nconf(extconf, &ext_ctx, extsect, x)) {
BIO_printf(bio_err,
- "Error adding extensions from section %s\n", extsect);
+ "Error adding extensions from section %s\n", extsect);
goto err;
}
}
@@ -925,7 +979,7 @@ int x509_main(int argc, char **argv)
X509V3_set_nconf(&ext_ctx, extconf);
if (!X509V3_EXT_REQ_add_nconf(extconf, &ext_ctx, extsect, rq)) {
BIO_printf(bio_err,
- "Error adding request extensions from section %s\n", extsect);
+ "Error adding request extensions from section %s\n", extsect);
goto err;
}
}
@@ -940,18 +994,19 @@ int x509_main(int argc, char **argv)
}
if (!i) {
BIO_printf(bio_err,
- "Unable to write certificate request\n");
+ "Unable to write certificate request\n");
goto err;
}
}
noout = 1;
} else if (CAfile != NULL) {
if ((CAkey = load_key(CAkeyfile, CAkeyformat,
- 0, passin, "CA private key")) == NULL)
+ 0, passin, "CA private key"))
+ == NULL)
goto err;
if (!X509_check_private_key(xca, CAkey)) {
BIO_printf(bio_err,
- "CA certificate and CA private key do not match\n");
+ "CA certificate and CA private key do not match\n");
goto err;
}
@@ -985,7 +1040,7 @@ int x509_main(int argc, char **argv)
if (bnser == NULL)
goto err;
if (!BN_add_word(bnser, 1)
- || (ser = BN_to_ASN1_INTEGER(bnser, NULL)) == NULL) {
+ || (ser = BN_to_ASN1_INTEGER(bnser, NULL)) == NULL) {
BN_free(bnser);
goto err;
}
@@ -994,8 +1049,7 @@ int x509_main(int argc, char **argv)
ASN1_INTEGER_free(ser);
BIO_puts(out, "\n");
} else if (i == email || i == ocsp_uri) {
- STACK_OF(OPENSSL_STRING) *emlst =
- i == email ? X509_get1_email(x) : X509_get1_ocsp(x);
+ STACK_OF(OPENSSL_STRING) *emlst = i == email ? X509_get1_email(x) : X509_get1_ocsp(x);
for (j = 0; j < sk_OPENSSL_STRING_num(emlst); j++)
BIO_printf(out, "%s\n", sk_OPENSSL_STRING_value(emlst, j));
@@ -1066,7 +1120,8 @@ int x509_main(int argc, char **argv)
fdigname = "SHA1";
if ((fdig = EVP_MD_fetch(app_get0_libctx(), fdigname,
- app_get0_propq())) == NULL) {
+ app_get0_propq()))
+ == NULL) {
BIO_printf(bio_err, "Unknown digest\n");
goto err;
}
@@ -1131,17 +1186,17 @@ int x509_main(int argc, char **argv)
goto err;
}
- end_cert_loop:
+end_cert_loop:
if (multi && ++k < sk_X509_num(certs))
goto cert_loop;
ret = 0;
goto end;
- err:
+err:
ERR_print_errors(bio_err);
- end:
+end:
if (multi) {
sk_X509_pop_free(certs, X509_free);
x = NULL;
@@ -1168,7 +1223,7 @@ int x509_main(int argc, char **argv)
}
static ASN1_INTEGER *x509_load_serial(const char *CAfile,
- const char *serialfile, int create)
+ const char *serialfile, int create)
{
char *buf = NULL;
ASN1_INTEGER *bs = NULL;
@@ -1200,7 +1255,7 @@ static ASN1_INTEGER *x509_load_serial(const char *CAfile,
else
bs = BN_to_ASN1_INTEGER(serial, NULL);
- end:
+end:
OPENSSL_free(buf);
BN_free(serial);
return bs;
@@ -1223,9 +1278,9 @@ static int callb(int ok, X509_STORE_CTX *ctx)
err_cert = X509_STORE_CTX_get_current_cert(ctx);
print_name(bio_err, "subject=", X509_get_subject_name(err_cert));
BIO_printf(bio_err,
- "Error with certificate - error %d at depth %d\n%s\n", err,
- X509_STORE_CTX_get_error_depth(ctx),
- X509_verify_cert_error_string(err));
+ "Error with certificate - error %d at depth %d\n%s\n", err,
+ X509_STORE_CTX_get_error_depth(ctx),
+ X509_verify_cert_error_string(err));
return 1;
}
@@ -1334,7 +1389,7 @@ static int print_x509v3_exts(BIO *bio, X509 *x, const char *ext_names)
}
ret = X509V3_extensions_print(bio, NULL, exts2, 0, 0);
- end:
+end:
sk_X509_EXTENSION_free(exts2);
OPENSSL_free(names);
OPENSSL_free(tmp_ext_names);
diff --git a/crypto/LPdir_nyi.c b/crypto/LPdir_nyi.c
index a1540785f8..a56f2edd92 100644
--- a/crypto/LPdir_nyi.c
+++ b/crypto/LPdir_nyi.c
@@ -37,7 +37,7 @@
*/
#ifndef LPDIR_H
-# include "LPdir.h"
+#include "LPdir.h"
#endif
struct LP_dir_context_st {
diff --git a/crypto/LPdir_unix.c b/crypto/LPdir_unix.c
index b6dda7bce2..c3a321fe1b 100644
--- a/crypto/LPdir_unix.c
+++ b/crypto/LPdir_unix.c
@@ -44,10 +44,10 @@
#include <dirent.h>
#include <errno.h>
#ifndef LPDIR_H
-# include "LPdir.h"
+#include "LPdir.h"
#endif
#ifdef __VMS
-# include <ctype.h>
+#include <ctype.h>
#endif
/*
@@ -57,9 +57,9 @@
* if it doesn't exist, use NAME_MAX.
*/
#if defined(PATH_MAX)
-# define LP_ENTRY_SIZE PATH_MAX
+#define LP_ENTRY_SIZE PATH_MAX
#elif defined(NAME_MAX)
-# define LP_ENTRY_SIZE NAME_MAX
+#define LP_ENTRY_SIZE NAME_MAX
#endif
/*
@@ -68,9 +68,9 @@
* small value (HP-UX offers 14), so we need to check if we got a result, and
* if it meets a minimum standard, and create or change it if not.
*/
-#if !defined(LP_ENTRY_SIZE) || LP_ENTRY_SIZE<255
-# undef LP_ENTRY_SIZE
-# define LP_ENTRY_SIZE 255
+#if !defined(LP_ENTRY_SIZE) || LP_ENTRY_SIZE < 255
+#undef LP_ENTRY_SIZE
+#define LP_ENTRY_SIZE 255
#endif
struct LP_dir_context_st {
@@ -121,9 +121,9 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
#ifdef __VMS
strncpy((*ctx)->previous_entry_name, (*ctx)->entry_name,
- sizeof((*ctx)->previous_entry_name));
+ sizeof((*ctx)->previous_entry_name));
- again:
+again:
#endif
direntry = readdir((*ctx)->dir);
@@ -132,7 +132,7 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
}
OPENSSL_strlcpy((*ctx)->entry_name, direntry->d_name,
- sizeof((*ctx)->entry_name));
+ sizeof((*ctx)->entry_name));
#ifdef __VMS
if ((*ctx)->expect_file_generations) {
char *p = (*ctx)->entry_name + strlen((*ctx)->entry_name);
@@ -142,7 +142,8 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
if (p > (*ctx)->entry_name && p[-1] == ';')
p[-1] = '\0';
if (OPENSSL_strcasecmp((*ctx)->entry_name,
- (*ctx)->previous_entry_name) == 0)
+ (*ctx)->previous_entry_name)
+ == 0)
goto again;
}
#endif
diff --git a/crypto/LPdir_vms.c b/crypto/LPdir_vms.c
index 51043263ae..4f89657179 100644
--- a/crypto/LPdir_vms.c
+++ b/crypto/LPdir_vms.c
@@ -49,13 +49,13 @@
#include <str$routines.h>
#include <stsdef.h>
#ifndef LPDIR_H
-# include "LPdir.h"
+#include "LPdir.h"
#endif
#include "vms_rms.h"
/* Some compiler options hide EVMSERR. */
#ifndef EVMSERR
-# define EVMSERR 65535 /* error for non-translatable VMS errors */
+#define EVMSERR 65535 /* error for non-translatable VMS errors */
#endif
struct LP_dir_context_st {
@@ -75,12 +75,12 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
/* Arrange 32-bit pointer to (copied) string storage, if needed. */
#if __INITIAL_POINTER_SIZE == 64
-# pragma pointer_size save
-# pragma pointer_size 32
+#pragma pointer_size save
+#pragma pointer_size 32
char *ctx_filespec_32p;
-# pragma pointer_size restore
+#pragma pointer_size restore
char ctx_filespec_32[NAMX_MAXRSS + 1];
-#endif /* __INITIAL_POINTER_SIZE == 64 */
+#endif /* __INITIAL_POINTER_SIZE == 64 */
#ifdef NAML$C_MAXRSS
flags |= LIB$M_FIL_LONG_NAMES;
@@ -109,7 +109,7 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
return 0;
}
- filespeclen += 4; /* "*.*;" */
+ filespeclen += 4; /* "*.*;" */
if (filespeclen > NAMX_MAXRSS) {
errno = ENAMETOOLONG;
@@ -128,13 +128,13 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
/* Arrange 32-bit pointer to (copied) string storage, if needed. */
#if __INITIAL_POINTER_SIZE == 64
-# define CTX_FILESPEC ctx_filespec_32p
+#define CTX_FILESPEC ctx_filespec_32p
/* Copy the file name to storage with a 32-bit pointer. */
ctx_filespec_32p = ctx_filespec_32;
strcpy(ctx_filespec_32p, (*ctx)->filespec);
-#else /* __INITIAL_POINTER_SIZE == 64 */
-# define CTX_FILESPEC (*ctx)->filespec
-#endif /* __INITIAL_POINTER_SIZE == 64 [else] */
+#else /* __INITIAL_POINTER_SIZE == 64 */
+#define CTX_FILESPEC (*ctx)->filespec
+#endif /* __INITIAL_POINTER_SIZE == 64 [else] */
(*ctx)->filespec_dsc.dsc$w_length = filespeclen;
(*ctx)->filespec_dsc.dsc$b_dtype = DSC$K_DTYPE_T;
@@ -148,7 +148,7 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
(*ctx)->result_dsc.dsc$a_pointer = 0;
status = lib$find_file(&(*ctx)->filespec_dsc, &(*ctx)->result_dsc,
- &(*ctx)->VMS_context, 0, 0, 0, &flags);
+ &(*ctx)->VMS_context, 0, 0, 0, &flags);
if (status == RMS$_NMF) {
errno = 0;
diff --git a/crypto/LPdir_win.c b/crypto/LPdir_win.c
index de1746d356..bc5cec35d9 100644
--- a/crypto/LPdir_win.c
+++ b/crypto/LPdir_win.c
@@ -40,7 +40,7 @@
#include <tchar.h>
#include "internal/numbers.h"
#ifndef LPDIR_H
-# include "LPdir.h"
+#include "LPdir.h"
#endif
/*
@@ -49,20 +49,20 @@
* builds are compiled with -DUNICODE [as well as -D_UNICODE].
*/
#if defined(LP_SYS_WINCE) && !defined(FindFirstFile)
-# define FindFirstFile FindFirstFileW
+#define FindFirstFile FindFirstFileW
#endif
#if defined(LP_SYS_WINCE) && !defined(FindNextFile)
-# define FindNextFile FindNextFileW
+#define FindNextFile FindNextFileW
#endif
#ifndef NAME_MAX
-# define NAME_MAX 255
+#define NAME_MAX 255
#endif
#ifdef CP_UTF8
-# define CP_DEFAULT CP_UTF8
+#define CP_DEFAULT CP_UTF8
#else
-# define CP_DEFAULT CP_ACP
+#define CP_DEFAULT CP_ACP
#endif
struct LP_dir_context_st {
@@ -103,16 +103,17 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
UINT cp;
do {
-# ifdef CP_UTF8
+#ifdef CP_UTF8
if ((sz = MultiByteToWideChar((cp = CP_UTF8), 0,
- directory, (int)len_0,
- NULL, 0)) > 0 ||
- GetLastError() != ERROR_NO_UNICODE_TRANSLATION)
+ directory, (int)len_0,
+ NULL, 0))
+ > 0
+ || GetLastError() != ERROR_NO_UNICODE_TRANSLATION)
break;
-# endif
+#endif
sz = MultiByteToWideChar((cp = CP_ACP), 0,
- directory, (int)len_0,
- NULL, 0);
+ directory, (int)len_0,
+ NULL, 0);
} while (0);
if (sz > 0) {
@@ -122,7 +123,7 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
*/
wdir = _alloca((sz + 2) * sizeof(TCHAR));
if (!MultiByteToWideChar(cp, 0, directory, (int)len_0,
- (WCHAR *)wdir, sz)) {
+ (WCHAR *)wdir, sz)) {
free(*ctx);
*ctx = NULL;
errno = EINVAL;
@@ -187,14 +188,14 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
#ifdef LP_MULTIBYTE_AVAILABLE
if (!WideCharToMultiByte(CP_DEFAULT, 0, (WCHAR *)wdir, (int)len_0,
- (*ctx)->entry_name,
- sizeof((*ctx)->entry_name), NULL, 0))
+ (*ctx)->entry_name,
+ sizeof((*ctx)->entry_name), NULL, 0))
#endif
for (index = 0; index < len_0; index++)
(*ctx)->entry_name[index] = (char)wdir[index];
} else
strncpy((*ctx)->entry_name, (const char *)(*ctx)->ctx.cFileName,
- sizeof((*ctx)->entry_name) - 1);
+ sizeof((*ctx)->entry_name) - 1);
(*ctx)->entry_name[sizeof((*ctx)->entry_name) - 1] = '\0';
diff --git a/crypto/aes/aes_cbc.c b/crypto/aes/aes_cbc.c
index f2d5381b86..a933fc50e5 100644
--- a/crypto/aes/aes_cbc.c
+++ b/crypto/aes/aes_cbc.c
@@ -18,14 +18,14 @@
#include <openssl/modes.h>
void AES_cbc_encrypt(const unsigned char *in, unsigned char *out,
- size_t len, const AES_KEY *key,
- unsigned char *ivec, const int enc)
+ size_t len, const AES_KEY *key,
+ unsigned char *ivec, const int enc)
{
if (enc)
CRYPTO_cbc128_encrypt(in, out, len, key, ivec,
- (block128_f) AES_encrypt);
+ (block128_f)AES_encrypt);
else
CRYPTO_cbc128_decrypt(in, out, len, key, ivec,
- (block128_f) AES_decrypt);
+ (block128_f)AES_decrypt);
}
diff --git a/crypto/aes/aes_cfb.c b/crypto/aes/aes_cfb.c
index e5fcbb87f6..e6a184a19f 100644
--- a/crypto/aes/aes_cfb.c
+++ b/crypto/aes/aes_cfb.c
@@ -23,27 +23,27 @@
*/
void AES_cfb128_encrypt(const unsigned char *in, unsigned char *out,
- size_t length, const AES_KEY *key,
- unsigned char *ivec, int *num, const int enc)
+ size_t length, const AES_KEY *key,
+ unsigned char *ivec, int *num, const int enc)
{
CRYPTO_cfb128_encrypt(in, out, length, key, ivec, num, enc,
- (block128_f) AES_encrypt);
+ (block128_f)AES_encrypt);
}
/* N.B. This expects the input to be packed, MS bit first */
void AES_cfb1_encrypt(const unsigned char *in, unsigned char *out,
- size_t length, const AES_KEY *key,
- unsigned char *ivec, int *num, const int enc)
+ size_t length, const AES_KEY *key,
+ unsigned char *ivec, int *num, const int enc)
{
CRYPTO_cfb128_1_encrypt(in, out, length, key, ivec, num, enc,
- (block128_f) AES_encrypt);
+ (block128_f)AES_encrypt);
}
void AES_cfb8_encrypt(const unsigned char *in, unsigned char *out,
- size_t length, const AES_KEY *key,
- unsigned char *ivec, int *num, const int enc)
+ size_t length, const AES_KEY *key,
+ unsigned char *ivec, int *num, const int enc)
{
CRYPTO_cfb128_8_encrypt(in, out, length, key, ivec, num, enc,
- (block128_f) AES_encrypt);
+ (block128_f)AES_encrypt);
}
diff --git a/crypto/aes/aes_core.c b/crypto/aes/aes_core.c
index 3413ce8f43..b376e7e47d 100644
--- a/crypto/aes/aes_core.c
+++ b/crypto/aes/aes_core.c
@@ -52,13 +52,13 @@
#if defined(OPENSSL_AES_CONST_TIME) && !defined(AES_ASM)
-# if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__)
-# define U64(C) C##UI64
-# elif defined(__arch64__)
-# define U64(C) C##UL
-# else
-# define U64(C) C##ULL
-# endif
+#if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__)
+#define U64(C) C##UI64
+#elif defined(__arch64__)
+#define U64(C) C##UL
+#else
+#define U64(C) C##ULL
+#endif
typedef union {
unsigned char b[8];
@@ -430,14 +430,14 @@ static void ShiftRows(u64 *state)
s0 = (unsigned char *)state;
for (r = 0; r < 4; r++) {
- s[0] = s0[0*4 + r];
- s[1] = s0[1*4 + r];
- s[2] = s0[2*4 + r];
- s[3] = s0[3*4 + r];
- s0[0*4 + r] = s[(r+0) % 4];
- s0[1*4 + r] = s[(r+1) % 4];
- s0[2*4 + r] = s[(r+2) % 4];
- s0[3*4 + r] = s[(r+3) % 4];
+ s[0] = s0[0 * 4 + r];
+ s[1] = s0[1 * 4 + r];
+ s[2] = s0[2 * 4 + r];
+ s[3] = s0[3 * 4 + r];
+ s0[0 * 4 + r] = s[(r + 0) % 4];
+ s0[1 * 4 + r] = s[(r + 1) % 4];
+ s0[2 * 4 + r] = s[(r + 2) % 4];
+ s0[3 * 4 + r] = s[(r + 3) % 4];
}
}
@@ -449,14 +449,14 @@ static void InvShiftRows(u64 *state)
s0 = (unsigned char *)state;
for (r = 0; r < 4; r++) {
- s[0] = s0[0*4 + r];
- s[1] = s0[1*4 + r];
- s[2] = s0[2*4 + r];
- s[3] = s0[3*4 + r];
- s0[0*4 + r] = s[(4-r) % 4];
- s0[1*4 + r] = s[(5-r) % 4];
- s0[2*4 + r] = s[(6-r) % 4];
- s0[3*4 + r] = s[(7-r) % 4];
+ s[0] = s0[0 * 4 + r];
+ s[1] = s0[1 * 4 + r];
+ s[2] = s0[2 * 4 + r];
+ s[3] = s0[3 * 4 + r];
+ s0[0 * 4 + r] = s[(4 - r) % 4];
+ s0[1 * 4 + r] = s[(5 - r) % 4];
+ s0[2 * 4 + r] = s[(6 - r) % 4];
+ s0[3 * 4 + r] = s[(7 - r) % 4];
}
}
@@ -470,9 +470,9 @@ static void MixColumns(u64 *state)
s1.d = state[c];
s.d = s1.d;
s.d ^= ((s.d & U64(0xFFFF0000FFFF0000)) >> 16)
- | ((s.d & U64(0x0000FFFF0000FFFF)) << 16);
+ | ((s.d & U64(0x0000FFFF0000FFFF)) << 16);
s.d ^= ((s.d & U64(0xFF00FF00FF00FF00)) >> 8)
- | ((s.d & U64(0x00FF00FF00FF00FF)) << 8);
+ | ((s.d & U64(0x00FF00FF00FF00FF)) << 8);
s.d ^= s1.d;
XtimeLong(&s1.d);
s.d ^= s1.d;
@@ -498,9 +498,9 @@ static void InvMixColumns(u64 *state)
s1.d = state[c];
s.d = s1.d;
s.d ^= ((s.d & U64(0xFFFF0000FFFF0000)) >> 16)
- | ((s.d & U64(0x0000FFFF0000FFFF)) << 16);
+ | ((s.d & U64(0x0000FFFF0000FFFF)) << 16);
s.d ^= ((s.d & U64(0xFF00FF00FF00FF00)) >> 8)
- | ((s.d & U64(0x00FF00FF00FF00FF)) << 8);
+ | ((s.d & U64(0x00FF00FF00FF00FF)) << 8);
s.d ^= s1.d;
XtimeLong(&s1.d);
s.d ^= s1.d;
@@ -514,11 +514,11 @@ static void InvMixColumns(u64 *state)
s.b[7] ^= s1.b[4];
XtimeLong(&s1.d);
s1.d ^= ((s1.d & U64(0xFFFF0000FFFF0000)) >> 16)
- | ((s1.d & U64(0x0000FFFF0000FFFF)) << 16);
+ | ((s1.d & U64(0x0000FFFF0000FFFF)) << 16);
s.d ^= s1.d;
XtimeLong(&s1.d);
s1.d ^= ((s1.d & U64(0xFF00FF00FF00FF00)) >> 8)
- | ((s1.d & U64(0x00FF00FF00FF00FF)) << 8);
+ | ((s1.d & U64(0x00FF00FF00FF00FF)) << 8);
s.d ^= s1.d;
state[c] = s.d;
}
@@ -531,7 +531,7 @@ static void AddRoundKey(u64 *state, const u64 *w)
}
static void Cipher(const unsigned char *in, unsigned char *out,
- const u64 *w, int nr)
+ const u64 *w, int nr)
{
u64 state[2];
int i;
@@ -545,19 +545,19 @@ static void Cipher(const unsigned char *in, unsigned char *out,
SubLong(&state[1]);
ShiftRows(state);
MixColumns(state);
- AddRoundKey(state, w + i*2);
+ AddRoundKey(state, w + i * 2);
}
SubLong(&state[0]);
SubLong(&state[1]);
ShiftRows(state);
- AddRoundKey(state, w + nr*2);
+ AddRoundKey(state, w + nr * 2);
memcpy(out, state, 16);
}
static void InvCipher(const unsigned char *in, unsigned char *out,
- const u64 *w, int nr)
+ const u64 *w, int nr)
{
u64 state[2];
@@ -565,13 +565,13 @@ static void InvCipher(const unsigned char *in, unsigned char *out,
memcpy(state, in, 16);
- AddRoundKey(state, w + nr*2);
+ AddRoundKey(state, w + nr * 2);
for (i = nr - 1; i > 0; i--) {
InvShiftRows(state);
InvSubLong(&state[0]);
InvSubLong(&state[1]);
- AddRoundKey(state, w + i*2);
+ AddRoundKey(state, w + i * 2);
InvMixColumns(state);
}
@@ -597,18 +597,18 @@ static void RotWord(u32 *x)
}
static void KeyExpansion(const unsigned char *key, u64 *w,
- int nr, int nk)
+ int nr, int nk)
{
u32 rcon;
uni prev;
u32 temp;
int i, n;
- memcpy(w, key, nk*4);
+ memcpy(w, key, nk * 4);
memcpy(&rcon, "\1\0\0\0", 4);
- n = nk/2;
- prev.d = w[n-1];
- for (i = n; i < (nr+1)*2; i++) {
+ n = nk / 2;
+ prev.d = w[n - 1];
+ for (i = n; i < (nr + 1) * 2; i++) {
temp = prev.w[1];
if (i % n == 0) {
RotWord(&temp);
@@ -618,7 +618,7 @@ static void KeyExpansion(const unsigned char *key, u64 *w,
} else if (nk > 6 && i % n == 2) {
SubWord(&temp);
}
- prev.d = w[i-n];
+ prev.d = w[i - n];
prev.w[0] ^= temp;
prev.w[1] ^= prev.w[0];
w[i] = prev.d;
@@ -629,7 +629,7 @@ static void KeyExpansion(const unsigned char *key, u64 *w,
* Expand the cipher key into the encryption key schedule.
*/
int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
- AES_KEY *key)
+ AES_KEY *key)
{
u64 *rk;
@@ -638,7 +638,7 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
if (bits != 128 && bits != 192 && bits != 256)
return -2;
- rk = (u64*)key->rd_key;
+ rk = (u64 *)key->rd_key;
if (bits == 128)
key->rounds = 10;
@@ -647,7 +647,7 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
else
key->rounds = 14;
- KeyExpansion(userKey, rk, key->rounds, bits/32);
+ KeyExpansion(userKey, rk, key->rounds, bits / 32);
return 0;
}
@@ -655,7 +655,7 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
* Expand the cipher key into the decryption key schedule.
*/
int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
- AES_KEY *key)
+ AES_KEY *key)
{
return AES_set_encrypt_key(userKey, bits, key);
}
@@ -665,12 +665,12 @@ int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
* in and out can overlap
*/
void AES_encrypt(const unsigned char *in, unsigned char *out,
- const AES_KEY *key)
+ const AES_KEY *key)
{
const u64 *rk;
assert(in && out && key);
- rk = (u64*)key->rd_key;
+ rk = (u64 *)key->rd_key;
Cipher(in, out, rk, key->rounds);
}
@@ -680,12 +680,12 @@ void AES_encrypt(const unsigned char *in, unsigned char *out,
* in and out can overlap
*/
void AES_decrypt(const unsigned char *in, unsigned char *out,
- const AES_KEY *key)
+ const AES_KEY *key)
{
const u64 *rk;
assert(in && out && key);
- rk = (u64*)key->rd_key;
+ rk = (u64 *)key->rd_key;
InvCipher(in, out, rk, key->rounds);
}
@@ -704,579 +704,2346 @@ Td4[x] = Si[x].[01];
*/
static const u32 Te0[256] = {
- 0xc66363a5U, 0xf87c7c84U, 0xee777799U, 0xf67b7b8dU,
- 0xfff2f20dU, 0xd66b6bbdU, 0xde6f6fb1U, 0x91c5c554U,
- 0x60303050U, 0x02010103U, 0xce6767a9U, 0x562b2b7dU,
- 0xe7fefe19U, 0xb5d7d762U, 0x4dababe6U, 0xec76769aU,
- 0x8fcaca45U, 0x1f82829dU, 0x89c9c940U, 0xfa7d7d87U,
- 0xeffafa15U, 0xb25959ebU, 0x8e4747c9U, 0xfbf0f00bU,
- 0x41adadecU, 0xb3d4d467U, 0x5fa2a2fdU, 0x45afafeaU,
- 0x239c9cbfU, 0x53a4a4f7U, 0xe4727296U, 0x9bc0c05bU,
- 0x75b7b7c2U, 0xe1fdfd1cU, 0x3d9393aeU, 0x4c26266aU,
- 0x6c36365aU, 0x7e3f3f41U, 0xf5f7f702U, 0x83cccc4fU,
- 0x6834345cU, 0x51a5a5f4U, 0xd1e5e534U, 0xf9f1f108U,
- 0xe2717193U, 0xabd8d873U, 0x62313153U, 0x2a15153fU,
- 0x0804040cU, 0x95c7c752U, 0x46232365U, 0x9dc3c35eU,
- 0x30181828U, 0x379696a1U, 0x0a05050fU, 0x2f9a9ab5U,
- 0x0e070709U, 0x24121236U, 0x1b80809bU, 0xdfe2e23dU,
- 0xcdebeb26U, 0x4e272769U, 0x7fb2b2cdU, 0xea75759fU,
- 0x1209091bU, 0x1d83839eU, 0x582c2c74U, 0x341a1a2eU,
- 0x361b1b2dU, 0xdc6e6eb2U, 0xb45a5aeeU, 0x5ba0a0fbU,
- 0xa45252f6U, 0x763b3b4dU, 0xb7d6d661U, 0x7db3b3ceU,
- 0x5229297bU, 0xdde3e33eU, 0x5e2f2f71U, 0x13848497U,
- 0xa65353f5U, 0xb9d1d168U, 0x00000000U, 0xc1eded2cU,
- 0x40202060U, 0xe3fcfc1fU, 0x79b1b1c8U, 0xb65b5bedU,
- 0xd46a6abeU, 0x8dcbcb46U, 0x67bebed9U, 0x7239394bU,
- 0x944a4adeU, 0x984c4cd4U, 0xb05858e8U, 0x85cfcf4aU,
- 0xbbd0d06bU, 0xc5efef2aU, 0x4faaaae5U, 0xedfbfb16U,
- 0x864343c5U, 0x9a4d4dd7U, 0x66333355U, 0x11858594U,
- 0x8a4545cfU, 0xe9f9f910U, 0x04020206U, 0xfe7f7f81U,
- 0xa05050f0U, 0x783c3c44U, 0x259f9fbaU, 0x4ba8a8e3U,
- 0xa25151f3U, 0x5da3a3feU, 0x804040c0U, 0x058f8f8aU,
- 0x3f9292adU, 0x219d9dbcU, 0x70383848U, 0xf1f5f504U,
- 0x63bcbcdfU, 0x77b6b6c1U, 0xafdada75U, 0x42212163U,
- 0x20101030U, 0xe5ffff1aU, 0xfdf3f30eU, 0xbfd2d26dU,
- 0x81cdcd4cU, 0x180c0c14U, 0x26131335U, 0xc3ecec2fU,
- 0xbe5f5fe1U, 0x359797a2U, 0x884444ccU, 0x2e171739U,
- 0x93c4c457U, 0x55a7a7f2U, 0xfc7e7e82U, 0x7a3d3d47U,
- 0xc86464acU, 0xba5d5de7U, 0x3219192bU, 0xe6737395U,
- 0xc06060a0U, 0x19818198U, 0x9e4f4fd1U, 0xa3dcdc7fU,
- 0x44222266U, 0x542a2a7eU, 0x3b9090abU, 0x0b888883U,
- 0x8c4646caU, 0xc7eeee29U, 0x6bb8b8d3U, 0x2814143cU,
- 0xa7dede79U, 0xbc5e5ee2U, 0x160b0b1dU, 0xaddbdb76U,
- 0xdbe0e03bU, 0x64323256U, 0x743a3a4eU, 0x140a0a1eU,
- 0x924949dbU, 0x0c06060aU, 0x4824246cU, 0xb85c5ce4U,
- 0x9fc2c25dU, 0xbdd3d36eU, 0x43acacefU, 0xc46262a6U,
- 0x399191a8U, 0x319595a4U, 0xd3e4e437U, 0xf279798bU,
- 0xd5e7e732U, 0x8bc8c843U, 0x6e373759U, 0xda6d6db7U,
- 0x018d8d8cU, 0xb1d5d564U, 0x9c4e4ed2U, 0x49a9a9e0U,
- 0xd86c6cb4U, 0xac5656faU, 0xf3f4f407U, 0xcfeaea25U,
- 0xca6565afU, 0xf47a7a8eU, 0x47aeaee9U, 0x10080818U,
- 0x6fbabad5U, 0xf0787888U, 0x4a25256fU, 0x5c2e2e72U,
- 0x381c1c24U, 0x57a6a6f1U, 0x73b4b4c7U, 0x97c6c651U,
- 0xcbe8e823U, 0xa1dddd7cU, 0xe874749cU, 0x3e1f1f21U,
- 0x964b4bddU, 0x61bdbddcU, 0x0d8b8b86U, 0x0f8a8a85U,
- 0xe0707090U, 0x7c3e3e42U, 0x71b5b5c4U, 0xcc6666aaU,
- 0x904848d8U, 0x06030305U, 0xf7f6f601U, 0x1c0e0e12U,
- 0xc26161a3U, 0x6a35355fU, 0xae5757f9U, 0x69b9b9d0U,
- 0x17868691U, 0x99c1c158U, 0x3a1d1d27U, 0x279e9eb9U,
- 0xd9e1e138U, 0xebf8f813U, 0x2b9898b3U, 0x22111133U,
- 0xd26969bbU, 0xa9d9d970U, 0x078e8e89U, 0x339494a7U,
- 0x2d9b9bb6U, 0x3c1e1e22U, 0x15878792U, 0xc9e9e920U,
- 0x87cece49U, 0xaa5555ffU, 0x50282878U, 0xa5dfdf7aU,
- 0x038c8c8fU, 0x59a1a1f8U, 0x09898980U, 0x1a0d0d17U,
- 0x65bfbfdaU, 0xd7e6e631U, 0x844242c6U, 0xd06868b8U,
- 0x824141c3U, 0x299999b0U, 0x5a2d2d77U, 0x1e0f0f11U,
- 0x7bb0b0cbU, 0xa85454fcU, 0x6dbbbbd6U, 0x2c16163aU,
+ 0xc66363a5U,
+ 0xf87c7c84U,
+ 0xee777799U,
+ 0xf67b7b8dU,
+ 0xfff2f20dU,
+ 0xd66b6bbdU,
+ 0xde6f6fb1U,
+ 0x91c5c554U,
+ 0x60303050U,
+ 0x02010103U,
+ 0xce6767a9U,
+ 0x562b2b7dU,
+ 0xe7fefe19U,
+ 0xb5d7d762U,
+ 0x4dababe6U,
+ 0xec76769aU,
+ 0x8fcaca45U,
+ 0x1f82829dU,
+ 0x89c9c940U,
+ 0xfa7d7d87U,
+ 0xeffafa15U,
+ 0xb25959ebU,
+ 0x8e4747c9U,
+ 0xfbf0f00bU,
+ 0x41adadecU,
+ 0xb3d4d467U,
+ 0x5fa2a2fdU,
+ 0x45afafeaU,
+ 0x239c9cbfU,
+ 0x53a4a4f7U,
+ 0xe4727296U,
+ 0x9bc0c05bU,
+ 0x75b7b7c2U,
+ 0xe1fdfd1cU,
+ 0x3d9393aeU,
+ 0x4c26266aU,
+ 0x6c36365aU,
+ 0x7e3f3f41U,
+ 0xf5f7f702U,
+ 0x83cccc4fU,
+ 0x6834345cU,
+ 0x51a5a5f4U,
+ 0xd1e5e534U,
+ 0xf9f1f108U,
+ 0xe2717193U,
+ 0xabd8d873U,
+ 0x62313153U,
+ 0x2a15153fU,
+ 0x0804040cU,
+ 0x95c7c752U,
+ 0x46232365U,
+ 0x9dc3c35eU,
+ 0x30181828U,
+ 0x379696a1U,
+ 0x0a05050fU,
+ 0x2f9a9ab5U,
+ 0x0e070709U,
+ 0x24121236U,
+ 0x1b80809bU,
+ 0xdfe2e23dU,
+ 0xcdebeb26U,
+ 0x4e272769U,
+ 0x7fb2b2cdU,
+ 0xea75759fU,
+ 0x1209091bU,
+ 0x1d83839eU,
+ 0x582c2c74U,
+ 0x341a1a2eU,
+ 0x361b1b2dU,
+ 0xdc6e6eb2U,
+ 0xb45a5aeeU,
+ 0x5ba0a0fbU,
+ 0xa45252f6U,
+ 0x763b3b4dU,
+ 0xb7d6d661U,
+ 0x7db3b3ceU,
+ 0x5229297bU,
+ 0xdde3e33eU,
+ 0x5e2f2f71U,
+ 0x13848497U,
+ 0xa65353f5U,
+ 0xb9d1d168U,
+ 0x00000000U,
+ 0xc1eded2cU,
+ 0x40202060U,
+ 0xe3fcfc1fU,
+ 0x79b1b1c8U,
+ 0xb65b5bedU,
+ 0xd46a6abeU,
+ 0x8dcbcb46U,
+ 0x67bebed9U,
+ 0x7239394bU,
+ 0x944a4adeU,
+ 0x984c4cd4U,
+ 0xb05858e8U,
+ 0x85cfcf4aU,
+ 0xbbd0d06bU,
+ 0xc5efef2aU,
+ 0x4faaaae5U,
+ 0xedfbfb16U,
+ 0x864343c5U,
+ 0x9a4d4dd7U,
+ 0x66333355U,
+ 0x11858594U,
+ 0x8a4545cfU,
+ 0xe9f9f910U,
+ 0x04020206U,
+ 0xfe7f7f81U,
+ 0xa05050f0U,
+ 0x783c3c44U,
+ 0x259f9fbaU,
+ 0x4ba8a8e3U,
+ 0xa25151f3U,
+ 0x5da3a3feU,
+ 0x804040c0U,
+ 0x058f8f8aU,
+ 0x3f9292adU,
+ 0x219d9dbcU,
+ 0x70383848U,
+ 0xf1f5f504U,
+ 0x63bcbcdfU,
+ 0x77b6b6c1U,
+ 0xafdada75U,
+ 0x42212163U,
+ 0x20101030U,
+ 0xe5ffff1aU,
+ 0xfdf3f30eU,
+ 0xbfd2d26dU,
+ 0x81cdcd4cU,
+ 0x180c0c14U,
+ 0x26131335U,
+ 0xc3ecec2fU,
+ 0xbe5f5fe1U,
+ 0x359797a2U,
+ 0x884444ccU,
+ 0x2e171739U,
+ 0x93c4c457U,
+ 0x55a7a7f2U,
+ 0xfc7e7e82U,
+ 0x7a3d3d47U,
+ 0xc86464acU,
+ 0xba5d5de7U,
+ 0x3219192bU,
+ 0xe6737395U,
+ 0xc06060a0U,
+ 0x19818198U,
+ 0x9e4f4fd1U,
+ 0xa3dcdc7fU,
+ 0x44222266U,
+ 0x542a2a7eU,
+ 0x3b9090abU,
+ 0x0b888883U,
+ 0x8c4646caU,
+ 0xc7eeee29U,
+ 0x6bb8b8d3U,
+ 0x2814143cU,
+ 0xa7dede79U,
+ 0xbc5e5ee2U,
+ 0x160b0b1dU,
+ 0xaddbdb76U,
+ 0xdbe0e03bU,
+ 0x64323256U,
+ 0x743a3a4eU,
+ 0x140a0a1eU,
+ 0x924949dbU,
+ 0x0c06060aU,
+ 0x4824246cU,
+ 0xb85c5ce4U,
+ 0x9fc2c25dU,
+ 0xbdd3d36eU,
+ 0x43acacefU,
+ 0xc46262a6U,
+ 0x399191a8U,
+ 0x319595a4U,
+ 0xd3e4e437U,
+ 0xf279798bU,
+ 0xd5e7e732U,
+ 0x8bc8c843U,
+ 0x6e373759U,
+ 0xda6d6db7U,
+ 0x018d8d8cU,
+ 0xb1d5d564U,
+ 0x9c4e4ed2U,
+ 0x49a9a9e0U,
+ 0xd86c6cb4U,
+ 0xac5656faU,
+ 0xf3f4f407U,
+ 0xcfeaea25U,
+ 0xca6565afU,
+ 0xf47a7a8eU,
+ 0x47aeaee9U,
+ 0x10080818U,
+ 0x6fbabad5U,
+ 0xf0787888U,
+ 0x4a25256fU,
+ 0x5c2e2e72U,
+ 0x381c1c24U,
+ 0x57a6a6f1U,
+ 0x73b4b4c7U,
+ 0x97c6c651U,
+ 0xcbe8e823U,
+ 0xa1dddd7cU,
+ 0xe874749cU,
+ 0x3e1f1f21U,
+ 0x964b4bddU,
+ 0x61bdbddcU,
+ 0x0d8b8b86U,
+ 0x0f8a8a85U,
+ 0xe0707090U,
+ 0x7c3e3e42U,
+ 0x71b5b5c4U,
+ 0xcc6666aaU,
+ 0x904848d8U,
+ 0x06030305U,
+ 0xf7f6f601U,
+ 0x1c0e0e12U,
+ 0xc26161a3U,
+ 0x6a35355fU,
+ 0xae5757f9U,
+ 0x69b9b9d0U,
+ 0x17868691U,
+ 0x99c1c158U,
+ 0x3a1d1d27U,
+ 0x279e9eb9U,
+ 0xd9e1e138U,
+ 0xebf8f813U,
+ 0x2b9898b3U,
+ 0x22111133U,
+ 0xd26969bbU,
+ 0xa9d9d970U,
+ 0x078e8e89U,
+ 0x339494a7U,
+ 0x2d9b9bb6U,
+ 0x3c1e1e22U,
+ 0x15878792U,
+ 0xc9e9e920U,
+ 0x87cece49U,
+ 0xaa5555ffU,
+ 0x50282878U,
+ 0xa5dfdf7aU,
+ 0x038c8c8fU,
+ 0x59a1a1f8U,
+ 0x09898980U,
+ 0x1a0d0d17U,
+ 0x65bfbfdaU,
+ 0xd7e6e631U,
+ 0x844242c6U,
+ 0xd06868b8U,
+ 0x824141c3U,
+ 0x299999b0U,
+ 0x5a2d2d77U,
+ 0x1e0f0f11U,
+ 0x7bb0b0cbU,
+ 0xa85454fcU,
+ 0x6dbbbbd6U,
+ 0x2c16163aU,
};
static const u32 Te1[256] = {
- 0xa5c66363U, 0x84f87c7cU, 0x99ee7777U, 0x8df67b7bU,
- 0x0dfff2f2U, 0xbdd66b6bU, 0xb1de6f6fU, 0x5491c5c5U,
- 0x50603030U, 0x03020101U, 0xa9ce6767U, 0x7d562b2bU,
- 0x19e7fefeU, 0x62b5d7d7U, 0xe64dababU, 0x9aec7676U,
- 0x458fcacaU, 0x9d1f8282U, 0x4089c9c9U, 0x87fa7d7dU,
- 0x15effafaU, 0xebb25959U, 0xc98e4747U, 0x0bfbf0f0U,
- 0xec41adadU, 0x67b3d4d4U, 0xfd5fa2a2U, 0xea45afafU,
- 0xbf239c9cU, 0xf753a4a4U, 0x96e47272U, 0x5b9bc0c0U,
- 0xc275b7b7U, 0x1ce1fdfdU, 0xae3d9393U, 0x6a4c2626U,
- 0x5a6c3636U, 0x417e3f3fU, 0x02f5f7f7U, 0x4f83ccccU,
- 0x5c683434U, 0xf451a5a5U, 0x34d1e5e5U, 0x08f9f1f1U,
- 0x93e27171U, 0x73abd8d8U, 0x53623131U, 0x3f2a1515U,
- 0x0c080404U, 0x5295c7c7U, 0x65462323U, 0x5e9dc3c3U,
- 0x28301818U, 0xa1379696U, 0x0f0a0505U, 0xb52f9a9aU,
- 0x090e0707U, 0x36241212U, 0x9b1b8080U, 0x3ddfe2e2U,
- 0x26cdebebU, 0x694e2727U, 0xcd7fb2b2U, 0x9fea7575U,
- 0x1b120909U, 0x9e1d8383U, 0x74582c2cU, 0x2e341a1aU,
- 0x2d361b1bU, 0xb2dc6e6eU, 0xeeb45a5aU, 0xfb5ba0a0U,
- 0xf6a45252U, 0x4d763b3bU, 0x61b7d6d6U, 0xce7db3b3U,
- 0x7b522929U, 0x3edde3e3U, 0x715e2f2fU, 0x97138484U,
- 0xf5a65353U, 0x68b9d1d1U, 0x00000000U, 0x2cc1ededU,
- 0x60402020U, 0x1fe3fcfcU, 0xc879b1b1U, 0xedb65b5bU,
- 0xbed46a6aU, 0x468dcbcbU, 0xd967bebeU, 0x4b723939U,
- 0xde944a4aU, 0xd4984c4cU, 0xe8b05858U, 0x4a85cfcfU,
- 0x6bbbd0d0U, 0x2ac5efefU, 0xe54faaaaU, 0x16edfbfbU,
- 0xc5864343U, 0xd79a4d4dU, 0x55663333U, 0x94118585U,
- 0xcf8a4545U, 0x10e9f9f9U, 0x06040202U, 0x81fe7f7fU,
- 0xf0a05050U, 0x44783c3cU, 0xba259f9fU, 0xe34ba8a8U,
- 0xf3a25151U, 0xfe5da3a3U, 0xc0804040U, 0x8a058f8fU,
- 0xad3f9292U, 0xbc219d9dU, 0x48703838U, 0x04f1f5f5U,
- 0xdf63bcbcU, 0xc177b6b6U, 0x75afdadaU, 0x63422121U,
- 0x30201010U, 0x1ae5ffffU, 0x0efdf3f3U, 0x6dbfd2d2U,
- 0x4c81cdcdU, 0x14180c0cU, 0x35261313U, 0x2fc3ececU,
- 0xe1be5f5fU, 0xa2359797U, 0xcc884444U, 0x392e1717U,
- 0x5793c4c4U, 0xf255a7a7U, 0x82fc7e7eU, 0x477a3d3dU,
- 0xacc86464U, 0xe7ba5d5dU, 0x2b321919U, 0x95e67373U,
- 0xa0c06060U, 0x98198181U, 0xd19e4f4fU, 0x7fa3dcdcU,
- 0x66442222U, 0x7e542a2aU, 0xab3b9090U, 0x830b8888U,
- 0xca8c4646U, 0x29c7eeeeU, 0xd36bb8b8U, 0x3c281414U,
- 0x79a7dedeU, 0xe2bc5e5eU, 0x1d160b0bU, 0x76addbdbU,
- 0x3bdbe0e0U, 0x56643232U, 0x4e743a3aU, 0x1e140a0aU,
- 0xdb924949U, 0x0a0c0606U, 0x6c482424U, 0xe4b85c5cU,
- 0x5d9fc2c2U, 0x6ebdd3d3U, 0xef43acacU, 0xa6c46262U,
- 0xa8399191U, 0xa4319595U, 0x37d3e4e4U, 0x8bf27979U,
- 0x32d5e7e7U, 0x438bc8c8U, 0x596e3737U, 0xb7da6d6dU,
- 0x8c018d8dU, 0x64b1d5d5U, 0xd29c4e4eU, 0xe049a9a9U,
- 0xb4d86c6cU, 0xfaac5656U, 0x07f3f4f4U, 0x25cfeaeaU,
- 0xafca6565U, 0x8ef47a7aU, 0xe947aeaeU, 0x18100808U,
- 0xd56fbabaU, 0x88f07878U, 0x6f4a2525U, 0x725c2e2eU,
- 0x24381c1cU, 0xf157a6a6U, 0xc773b4b4U, 0x5197c6c6U,
- 0x23cbe8e8U, 0x7ca1ddddU, 0x9ce87474U, 0x213e1f1fU,
- 0xdd964b4bU, 0xdc61bdbdU, 0x860d8b8bU, 0x850f8a8aU,
- 0x90e07070U, 0x427c3e3eU, 0xc471b5b5U, 0xaacc6666U,
- 0xd8904848U, 0x05060303U, 0x01f7f6f6U, 0x121c0e0eU,
- 0xa3c26161U, 0x5f6a3535U, 0xf9ae5757U, 0xd069b9b9U,
- 0x91178686U, 0x5899c1c1U, 0x273a1d1dU, 0xb9279e9eU,
- 0x38d9e1e1U, 0x13ebf8f8U, 0xb32b9898U, 0x33221111U,
- 0xbbd26969U, 0x70a9d9d9U, 0x89078e8eU, 0xa7339494U,
- 0xb62d9b9bU, 0x223c1e1eU, 0x92158787U, 0x20c9e9e9U,
- 0x4987ceceU, 0xffaa5555U, 0x78502828U, 0x7aa5dfdfU,
- 0x8f038c8cU, 0xf859a1a1U, 0x80098989U, 0x171a0d0dU,
- 0xda65bfbfU, 0x31d7e6e6U, 0xc6844242U, 0xb8d06868U,
- 0xc3824141U, 0xb0299999U, 0x775a2d2dU, 0x111e0f0fU,
- 0xcb7bb0b0U, 0xfca85454U, 0xd66dbbbbU, 0x3a2c1616U,
+ 0xa5c66363U,
+ 0x84f87c7cU,
+ 0x99ee7777U,
+ 0x8df67b7bU,
+ 0x0dfff2f2U,
+ 0xbdd66b6bU,
+ 0xb1de6f6fU,
+ 0x5491c5c5U,
+ 0x50603030U,
+ 0x03020101U,
+ 0xa9ce6767U,
+ 0x7d562b2bU,
+ 0x19e7fefeU,
+ 0x62b5d7d7U,
+ 0xe64dababU,
+ 0x9aec7676U,
+ 0x458fcacaU,
+ 0x9d1f8282U,
+ 0x4089c9c9U,
+ 0x87fa7d7dU,
+ 0x15effafaU,
+ 0xebb25959U,
+ 0xc98e4747U,
+ 0x0bfbf0f0U,
+ 0xec41adadU,
+ 0x67b3d4d4U,
+ 0xfd5fa2a2U,
+ 0xea45afafU,
+ 0xbf239c9cU,
+ 0xf753a4a4U,
+ 0x96e47272U,
+ 0x5b9bc0c0U,
+ 0xc275b7b7U,
+ 0x1ce1fdfdU,
+ 0xae3d9393U,
+ 0x6a4c2626U,
+ 0x5a6c3636U,
+ 0x417e3f3fU,
+ 0x02f5f7f7U,
+ 0x4f83ccccU,
+ 0x5c683434U,
+ 0xf451a5a5U,
+ 0x34d1e5e5U,
+ 0x08f9f1f1U,
+ 0x93e27171U,
+ 0x73abd8d8U,
+ 0x53623131U,
+ 0x3f2a1515U,
+ 0x0c080404U,
+ 0x5295c7c7U,
+ 0x65462323U,
+ 0x5e9dc3c3U,
+ 0x28301818U,
+ 0xa1379696U,
+ 0x0f0a0505U,
+ 0xb52f9a9aU,
+ 0x090e0707U,
+ 0x36241212U,
+ 0x9b1b8080U,
+ 0x3ddfe2e2U,
+ 0x26cdebebU,
+ 0x694e2727U,
+ 0xcd7fb2b2U,
+ 0x9fea7575U,
+ 0x1b120909U,
+ 0x9e1d8383U,
+ 0x74582c2cU,
+ 0x2e341a1aU,
+ 0x2d361b1bU,
+ 0xb2dc6e6eU,
+ 0xeeb45a5aU,
+ 0xfb5ba0a0U,
+ 0xf6a45252U,
+ 0x4d763b3bU,
+ 0x61b7d6d6U,
+ 0xce7db3b3U,
+ 0x7b522929U,
+ 0x3edde3e3U,
+ 0x715e2f2fU,
+ 0x97138484U,
+ 0xf5a65353U,
+ 0x68b9d1d1U,
+ 0x00000000U,
+ 0x2cc1ededU,
+ 0x60402020U,
+ 0x1fe3fcfcU,
+ 0xc879b1b1U,
+ 0xedb65b5bU,
+ 0xbed46a6aU,
+ 0x468dcbcbU,
+ 0xd967bebeU,
+ 0x4b723939U,
+ 0xde944a4aU,
+ 0xd4984c4cU,
+ 0xe8b05858U,
+ 0x4a85cfcfU,
+ 0x6bbbd0d0U,
+ 0x2ac5efefU,
+ 0xe54faaaaU,
+ 0x16edfbfbU,
+ 0xc5864343U,
+ 0xd79a4d4dU,
+ 0x55663333U,
+ 0x94118585U,
+ 0xcf8a4545U,
+ 0x10e9f9f9U,
+ 0x06040202U,
+ 0x81fe7f7fU,
+ 0xf0a05050U,
+ 0x44783c3cU,
+ 0xba259f9fU,
+ 0xe34ba8a8U,
+ 0xf3a25151U,
+ 0xfe5da3a3U,
+ 0xc0804040U,
+ 0x8a058f8fU,
+ 0xad3f9292U,
+ 0xbc219d9dU,
+ 0x48703838U,
+ 0x04f1f5f5U,
+ 0xdf63bcbcU,
+ 0xc177b6b6U,
+ 0x75afdadaU,
+ 0x63422121U,
+ 0x30201010U,
+ 0x1ae5ffffU,
+ 0x0efdf3f3U,
+ 0x6dbfd2d2U,
+ 0x4c81cdcdU,
+ 0x14180c0cU,
+ 0x35261313U,
+ 0x2fc3ececU,
+ 0xe1be5f5fU,
+ 0xa2359797U,
+ 0xcc884444U,
+ 0x392e1717U,
+ 0x5793c4c4U,
+ 0xf255a7a7U,
+ 0x82fc7e7eU,
+ 0x477a3d3dU,
+ 0xacc86464U,
+ 0xe7ba5d5dU,
+ 0x2b321919U,
+ 0x95e67373U,
+ 0xa0c06060U,
+ 0x98198181U,
+ 0xd19e4f4fU,
+ 0x7fa3dcdcU,
+ 0x66442222U,
+ 0x7e542a2aU,
+ 0xab3b9090U,
+ 0x830b8888U,
+ 0xca8c4646U,
+ 0x29c7eeeeU,
+ 0xd36bb8b8U,
+ 0x3c281414U,
+ 0x79a7dedeU,
+ 0xe2bc5e5eU,
+ 0x1d160b0bU,
+ 0x76addbdbU,
+ 0x3bdbe0e0U,
+ 0x56643232U,
+ 0x4e743a3aU,
+ 0x1e140a0aU,
+ 0xdb924949U,
+ 0x0a0c0606U,
+ 0x6c482424U,
+ 0xe4b85c5cU,
+ 0x5d9fc2c2U,
+ 0x6ebdd3d3U,
+ 0xef43acacU,
+ 0xa6c46262U,
+ 0xa8399191U,
+ 0xa4319595U,
+ 0x37d3e4e4U,
+ 0x8bf27979U,
+ 0x32d5e7e7U,
+ 0x438bc8c8U,
+ 0x596e3737U,
+ 0xb7da6d6dU,
+ 0x8c018d8dU,
+ 0x64b1d5d5U,
+ 0xd29c4e4eU,
+ 0xe049a9a9U,
+ 0xb4d86c6cU,
+ 0xfaac5656U,
+ 0x07f3f4f4U,
+ 0x25cfeaeaU,
+ 0xafca6565U,
+ 0x8ef47a7aU,
+ 0xe947aeaeU,
+ 0x18100808U,
+ 0xd56fbabaU,
+ 0x88f07878U,
+ 0x6f4a2525U,
+ 0x725c2e2eU,
+ 0x24381c1cU,
+ 0xf157a6a6U,
+ 0xc773b4b4U,
+ 0x5197c6c6U,
+ 0x23cbe8e8U,
+ 0x7ca1ddddU,
+ 0x9ce87474U,
+ 0x213e1f1fU,
+ 0xdd964b4bU,
+ 0xdc61bdbdU,
+ 0x860d8b8bU,
+ 0x850f8a8aU,
+ 0x90e07070U,
+ 0x427c3e3eU,
+ 0xc471b5b5U,
+ 0xaacc6666U,
+ 0xd8904848U,
+ 0x05060303U,
+ 0x01f7f6f6U,
+ 0x121c0e0eU,
+ 0xa3c26161U,
+ 0x5f6a3535U,
+ 0xf9ae5757U,
+ 0xd069b9b9U,
+ 0x91178686U,
+ 0x5899c1c1U,
+ 0x273a1d1dU,
+ 0xb9279e9eU,
+ 0x38d9e1e1U,
+ 0x13ebf8f8U,
+ 0xb32b9898U,
+ 0x33221111U,
+ 0xbbd26969U,
+ 0x70a9d9d9U,
+ 0x89078e8eU,
+ 0xa7339494U,
+ 0xb62d9b9bU,
+ 0x223c1e1eU,
+ 0x92158787U,
+ 0x20c9e9e9U,
+ 0x4987ceceU,
+ 0xffaa5555U,
+ 0x78502828U,
+ 0x7aa5dfdfU,
+ 0x8f038c8cU,
+ 0xf859a1a1U,
+ 0x80098989U,
+ 0x171a0d0dU,
+ 0xda65bfbfU,
+ 0x31d7e6e6U,
+ 0xc6844242U,
+ 0xb8d06868U,
+ 0xc3824141U,
+ 0xb0299999U,
+ 0x775a2d2dU,
+ 0x111e0f0fU,
+ 0xcb7bb0b0U,
+ 0xfca85454U,
+ 0xd66dbbbbU,
+ 0x3a2c1616U,
};
static const u32 Te2[256] = {
- 0x63a5c663U, 0x7c84f87cU, 0x7799ee77U, 0x7b8df67bU,
- 0xf20dfff2U, 0x6bbdd66bU, 0x6fb1de6fU, 0xc55491c5U,
- 0x30506030U, 0x01030201U, 0x67a9ce67U, 0x2b7d562bU,
- 0xfe19e7feU, 0xd762b5d7U, 0xabe64dabU, 0x769aec76U,
- 0xca458fcaU, 0x829d1f82U, 0xc94089c9U, 0x7d87fa7dU,
- 0xfa15effaU, 0x59ebb259U, 0x47c98e47U, 0xf00bfbf0U,
- 0xadec41adU, 0xd467b3d4U, 0xa2fd5fa2U, 0xafea45afU,
- 0x9cbf239cU, 0xa4f753a4U, 0x7296e472U, 0xc05b9bc0U,
- 0xb7c275b7U, 0xfd1ce1fdU, 0x93ae3d93U, 0x266a4c26U,
- 0x365a6c36U, 0x3f417e3fU, 0xf702f5f7U, 0xcc4f83ccU,
- 0x345c6834U, 0xa5f451a5U, 0xe534d1e5U, 0xf108f9f1U,
- 0x7193e271U, 0xd873abd8U, 0x31536231U, 0x153f2a15U,
- 0x040c0804U, 0xc75295c7U, 0x23654623U, 0xc35e9dc3U,
- 0x18283018U, 0x96a13796U, 0x050f0a05U, 0x9ab52f9aU,
- 0x07090e07U, 0x12362412U, 0x809b1b80U, 0xe23ddfe2U,
- 0xeb26cdebU, 0x27694e27U, 0xb2cd7fb2U, 0x759fea75U,
- 0x091b1209U, 0x839e1d83U, 0x2c74582cU, 0x1a2e341aU,
- 0x1b2d361bU, 0x6eb2dc6eU, 0x5aeeb45aU, 0xa0fb5ba0U,
- 0x52f6a452U, 0x3b4d763bU, 0xd661b7d6U, 0xb3ce7db3U,
- 0x297b5229U, 0xe33edde3U, 0x2f715e2fU, 0x84971384U,
- 0x53f5a653U, 0xd168b9d1U, 0x00000000U, 0xed2cc1edU,
- 0x20604020U, 0xfc1fe3fcU, 0xb1c879b1U, 0x5bedb65bU,
- 0x6abed46aU, 0xcb468dcbU, 0xbed967beU, 0x394b7239U,
- 0x4ade944aU, 0x4cd4984cU, 0x58e8b058U, 0xcf4a85cfU,
- 0xd06bbbd0U, 0xef2ac5efU, 0xaae54faaU, 0xfb16edfbU,
- 0x43c58643U, 0x4dd79a4dU, 0x33556633U, 0x85941185U,
- 0x45cf8a45U, 0xf910e9f9U, 0x02060402U, 0x7f81fe7fU,
- 0x50f0a050U, 0x3c44783cU, 0x9fba259fU, 0xa8e34ba8U,
- 0x51f3a251U, 0xa3fe5da3U, 0x40c08040U, 0x8f8a058fU,
- 0x92ad3f92U, 0x9dbc219dU, 0x38487038U, 0xf504f1f5U,
- 0xbcdf63bcU, 0xb6c177b6U, 0xda75afdaU, 0x21634221U,
- 0x10302010U, 0xff1ae5ffU, 0xf30efdf3U, 0xd26dbfd2U,
- 0xcd4c81cdU, 0x0c14180cU, 0x13352613U, 0xec2fc3ecU,
- 0x5fe1be5fU, 0x97a23597U, 0x44cc8844U, 0x17392e17U,
- 0xc45793c4U, 0xa7f255a7U, 0x7e82fc7eU, 0x3d477a3dU,
- 0x64acc864U, 0x5de7ba5dU, 0x192b3219U, 0x7395e673U,
- 0x60a0c060U, 0x81981981U, 0x4fd19e4fU, 0xdc7fa3dcU,
- 0x22664422U, 0x2a7e542aU, 0x90ab3b90U, 0x88830b88U,
- 0x46ca8c46U, 0xee29c7eeU, 0xb8d36bb8U, 0x143c2814U,
- 0xde79a7deU, 0x5ee2bc5eU, 0x0b1d160bU, 0xdb76addbU,
- 0xe03bdbe0U, 0x32566432U, 0x3a4e743aU, 0x0a1e140aU,
- 0x49db9249U, 0x060a0c06U, 0x246c4824U, 0x5ce4b85cU,
- 0xc25d9fc2U, 0xd36ebdd3U, 0xacef43acU, 0x62a6c462U,
- 0x91a83991U, 0x95a43195U, 0xe437d3e4U, 0x798bf279U,
- 0xe732d5e7U, 0xc8438bc8U, 0x37596e37U, 0x6db7da6dU,
- 0x8d8c018dU, 0xd564b1d5U, 0x4ed29c4eU, 0xa9e049a9U,
- 0x6cb4d86cU, 0x56faac56U, 0xf407f3f4U, 0xea25cfeaU,
- 0x65afca65U, 0x7a8ef47aU, 0xaee947aeU, 0x08181008U,
- 0xbad56fbaU, 0x7888f078U, 0x256f4a25U, 0x2e725c2eU,
- 0x1c24381cU, 0xa6f157a6U, 0xb4c773b4U, 0xc65197c6U,
- 0xe823cbe8U, 0xdd7ca1ddU, 0x749ce874U, 0x1f213e1fU,
- 0x4bdd964bU, 0xbddc61bdU, 0x8b860d8bU, 0x8a850f8aU,
- 0x7090e070U, 0x3e427c3eU, 0xb5c471b5U, 0x66aacc66U,
- 0x48d89048U, 0x03050603U, 0xf601f7f6U, 0x0e121c0eU,
- 0x61a3c261U, 0x355f6a35U, 0x57f9ae57U, 0xb9d069b9U,
- 0x86911786U, 0xc15899c1U, 0x1d273a1dU, 0x9eb9279eU,
- 0xe138d9e1U, 0xf813ebf8U, 0x98b32b98U, 0x11332211U,
- 0x69bbd269U, 0xd970a9d9U, 0x8e89078eU, 0x94a73394U,
- 0x9bb62d9bU, 0x1e223c1eU, 0x87921587U, 0xe920c9e9U,
- 0xce4987ceU, 0x55ffaa55U, 0x28785028U, 0xdf7aa5dfU,
- 0x8c8f038cU, 0xa1f859a1U, 0x89800989U, 0x0d171a0dU,
- 0xbfda65bfU, 0xe631d7e6U, 0x42c68442U, 0x68b8d068U,
- 0x41c38241U, 0x99b02999U, 0x2d775a2dU, 0x0f111e0fU,
- 0xb0cb7bb0U, 0x54fca854U, 0xbbd66dbbU, 0x163a2c16U,
+ 0x63a5c663U,
+ 0x7c84f87cU,
+ 0x7799ee77U,
+ 0x7b8df67bU,
+ 0xf20dfff2U,
+ 0x6bbdd66bU,
+ 0x6fb1de6fU,
+ 0xc55491c5U,
+ 0x30506030U,
+ 0x01030201U,
+ 0x67a9ce67U,
+ 0x2b7d562bU,
+ 0xfe19e7feU,
+ 0xd762b5d7U,
+ 0xabe64dabU,
+ 0x769aec76U,
+ 0xca458fcaU,
+ 0x829d1f82U,
+ 0xc94089c9U,
+ 0x7d87fa7dU,
+ 0xfa15effaU,
+ 0x59ebb259U,
+ 0x47c98e47U,
+ 0xf00bfbf0U,
+ 0xadec41adU,
+ 0xd467b3d4U,
+ 0xa2fd5fa2U,
+ 0xafea45afU,
+ 0x9cbf239cU,
+ 0xa4f753a4U,
+ 0x7296e472U,
+ 0xc05b9bc0U,
+ 0xb7c275b7U,
+ 0xfd1ce1fdU,
+ 0x93ae3d93U,
+ 0x266a4c26U,
+ 0x365a6c36U,
+ 0x3f417e3fU,
+ 0xf702f5f7U,
+ 0xcc4f83ccU,
+ 0x345c6834U,
+ 0xa5f451a5U,
+ 0xe534d1e5U,
+ 0xf108f9f1U,
+ 0x7193e271U,
+ 0xd873abd8U,
+ 0x31536231U,
+ 0x153f2a15U,
+ 0x040c0804U,
+ 0xc75295c7U,
+ 0x23654623U,
+ 0xc35e9dc3U,
+ 0x18283018U,
+ 0x96a13796U,
+ 0x050f0a05U,
+ 0x9ab52f9aU,
+ 0x07090e07U,
+ 0x12362412U,
+ 0x809b1b80U,
+ 0xe23ddfe2U,
+ 0xeb26cdebU,
+ 0x27694e27U,
+ 0xb2cd7fb2U,
+ 0x759fea75U,
+ 0x091b1209U,
+ 0x839e1d83U,
+ 0x2c74582cU,
+ 0x1a2e341aU,
+ 0x1b2d361bU,
+ 0x6eb2dc6eU,
+ 0x5aeeb45aU,
+ 0xa0fb5ba0U,
+ 0x52f6a452U,
+ 0x3b4d763bU,
+ 0xd661b7d6U,
+ 0xb3ce7db3U,
+ 0x297b5229U,
+ 0xe33edde3U,
+ 0x2f715e2fU,
+ 0x84971384U,
+ 0x53f5a653U,
+ 0xd168b9d1U,
+ 0x00000000U,
+ 0xed2cc1edU,
+ 0x20604020U,
+ 0xfc1fe3fcU,
+ 0xb1c879b1U,
+ 0x5bedb65bU,
+ 0x6abed46aU,
+ 0xcb468dcbU,
+ 0xbed967beU,
+ 0x394b7239U,
+ 0x4ade944aU,
+ 0x4cd4984cU,
+ 0x58e8b058U,
+ 0xcf4a85cfU,
+ 0xd06bbbd0U,
+ 0xef2ac5efU,
+ 0xaae54faaU,
+ 0xfb16edfbU,
+ 0x43c58643U,
+ 0x4dd79a4dU,
+ 0x33556633U,
+ 0x85941185U,
+ 0x45cf8a45U,
+ 0xf910e9f9U,
+ 0x02060402U,
+ 0x7f81fe7fU,
+ 0x50f0a050U,
+ 0x3c44783cU,
+ 0x9fba259fU,
+ 0xa8e34ba8U,
+ 0x51f3a251U,
+ 0xa3fe5da3U,
+ 0x40c08040U,
+ 0x8f8a058fU,
+ 0x92ad3f92U,
+ 0x9dbc219dU,
+ 0x38487038U,
+ 0xf504f1f5U,
+ 0xbcdf63bcU,
+ 0xb6c177b6U,
+ 0xda75afdaU,
+ 0x21634221U,
+ 0x10302010U,
+ 0xff1ae5ffU,
+ 0xf30efdf3U,
+ 0xd26dbfd2U,
+ 0xcd4c81cdU,
+ 0x0c14180cU,
+ 0x13352613U,
+ 0xec2fc3ecU,
+ 0x5fe1be5fU,
+ 0x97a23597U,
+ 0x44cc8844U,
+ 0x17392e17U,
+ 0xc45793c4U,
+ 0xa7f255a7U,
+ 0x7e82fc7eU,
+ 0x3d477a3dU,
+ 0x64acc864U,
+ 0x5de7ba5dU,
+ 0x192b3219U,
+ 0x7395e673U,
+ 0x60a0c060U,
+ 0x81981981U,
+ 0x4fd19e4fU,
+ 0xdc7fa3dcU,
+ 0x22664422U,
+ 0x2a7e542aU,
+ 0x90ab3b90U,
+ 0x88830b88U,
+ 0x46ca8c46U,
+ 0xee29c7eeU,
+ 0xb8d36bb8U,
+ 0x143c2814U,
+ 0xde79a7deU,
+ 0x5ee2bc5eU,
+ 0x0b1d160bU,
+ 0xdb76addbU,
+ 0xe03bdbe0U,
+ 0x32566432U,
+ 0x3a4e743aU,
+ 0x0a1e140aU,
+ 0x49db9249U,
+ 0x060a0c06U,
+ 0x246c4824U,
+ 0x5ce4b85cU,
+ 0xc25d9fc2U,
+ 0xd36ebdd3U,
+ 0xacef43acU,
+ 0x62a6c462U,
+ 0x91a83991U,
+ 0x95a43195U,
+ 0xe437d3e4U,
+ 0x798bf279U,
+ 0xe732d5e7U,
+ 0xc8438bc8U,
+ 0x37596e37U,
+ 0x6db7da6dU,
+ 0x8d8c018dU,
+ 0xd564b1d5U,
+ 0x4ed29c4eU,
+ 0xa9e049a9U,
+ 0x6cb4d86cU,
+ 0x56faac56U,
+ 0xf407f3f4U,
+ 0xea25cfeaU,
+ 0x65afca65U,
+ 0x7a8ef47aU,
+ 0xaee947aeU,
+ 0x08181008U,
+ 0xbad56fbaU,
+ 0x7888f078U,
+ 0x256f4a25U,
+ 0x2e725c2eU,
+ 0x1c24381cU,
+ 0xa6f157a6U,
+ 0xb4c773b4U,
+ 0xc65197c6U,
+ 0xe823cbe8U,
+ 0xdd7ca1ddU,
+ 0x749ce874U,
+ 0x1f213e1fU,
+ 0x4bdd964bU,
+ 0xbddc61bdU,
+ 0x8b860d8bU,
+ 0x8a850f8aU,
+ 0x7090e070U,
+ 0x3e427c3eU,
+ 0xb5c471b5U,
+ 0x66aacc66U,
+ 0x48d89048U,
+ 0x03050603U,
+ 0xf601f7f6U,
+ 0x0e121c0eU,
+ 0x61a3c261U,
+ 0x355f6a35U,
+ 0x57f9ae57U,
+ 0xb9d069b9U,
+ 0x86911786U,
+ 0xc15899c1U,
+ 0x1d273a1dU,
+ 0x9eb9279eU,
+ 0xe138d9e1U,
+ 0xf813ebf8U,
+ 0x98b32b98U,
+ 0x11332211U,
+ 0x69bbd269U,
+ 0xd970a9d9U,
+ 0x8e89078eU,
+ 0x94a73394U,
+ 0x9bb62d9bU,
+ 0x1e223c1eU,
+ 0x87921587U,
+ 0xe920c9e9U,
+ 0xce4987ceU,
+ 0x55ffaa55U,
+ 0x28785028U,
+ 0xdf7aa5dfU,
+ 0x8c8f038cU,
+ 0xa1f859a1U,
+ 0x89800989U,
+ 0x0d171a0dU,
+ 0xbfda65bfU,
+ 0xe631d7e6U,
+ 0x42c68442U,
+ 0x68b8d068U,
+ 0x41c38241U,
+ 0x99b02999U,
+ 0x2d775a2dU,
+ 0x0f111e0fU,
+ 0xb0cb7bb0U,
+ 0x54fca854U,
+ 0xbbd66dbbU,
+ 0x163a2c16U,
};
static const u32 Te3[256] = {
- 0x6363a5c6U, 0x7c7c84f8U, 0x777799eeU, 0x7b7b8df6U,
- 0xf2f20dffU, 0x6b6bbdd6U, 0x6f6fb1deU, 0xc5c55491U,
- 0x30305060U, 0x01010302U, 0x6767a9ceU, 0x2b2b7d56U,
- 0xfefe19e7U, 0xd7d762b5U, 0xababe64dU, 0x76769aecU,
- 0xcaca458fU, 0x82829d1fU, 0xc9c94089U, 0x7d7d87faU,
- 0xfafa15efU, 0x5959ebb2U, 0x4747c98eU, 0xf0f00bfbU,
- 0xadadec41U, 0xd4d467b3U, 0xa2a2fd5fU, 0xafafea45U,
- 0x9c9cbf23U, 0xa4a4f753U, 0x727296e4U, 0xc0c05b9bU,
- 0xb7b7c275U, 0xfdfd1ce1U, 0x9393ae3dU, 0x26266a4cU,
- 0x36365a6cU, 0x3f3f417eU, 0xf7f702f5U, 0xcccc4f83U,
- 0x34345c68U, 0xa5a5f451U, 0xe5e534d1U, 0xf1f108f9U,
- 0x717193e2U, 0xd8d873abU, 0x31315362U, 0x15153f2aU,
- 0x04040c08U, 0xc7c75295U, 0x23236546U, 0xc3c35e9dU,
- 0x18182830U, 0x9696a137U, 0x05050f0aU, 0x9a9ab52fU,
- 0x0707090eU, 0x12123624U, 0x80809b1bU, 0xe2e23ddfU,
- 0xebeb26cdU, 0x2727694eU, 0xb2b2cd7fU, 0x75759feaU,
- 0x09091b12U, 0x83839e1dU, 0x2c2c7458U, 0x1a1a2e34U,
- 0x1b1b2d36U, 0x6e6eb2dcU, 0x5a5aeeb4U, 0xa0a0fb5bU,
- 0x5252f6a4U, 0x3b3b4d76U, 0xd6d661b7U, 0xb3b3ce7dU,
- 0x29297b52U, 0xe3e33eddU, 0x2f2f715eU, 0x84849713U,
- 0x5353f5a6U, 0xd1d168b9U, 0x00000000U, 0xeded2cc1U,
- 0x20206040U, 0xfcfc1fe3U, 0xb1b1c879U, 0x5b5bedb6U,
- 0x6a6abed4U, 0xcbcb468dU, 0xbebed967U, 0x39394b72U,
- 0x4a4ade94U, 0x4c4cd498U, 0x5858e8b0U, 0xcfcf4a85U,
- 0xd0d06bbbU, 0xefef2ac5U, 0xaaaae54fU, 0xfbfb16edU,
- 0x4343c586U, 0x4d4dd79aU, 0x33335566U, 0x85859411U,
- 0x4545cf8aU, 0xf9f910e9U, 0x02020604U, 0x7f7f81feU,
- 0x5050f0a0U, 0x3c3c4478U, 0x9f9fba25U, 0xa8a8e34bU,
- 0x5151f3a2U, 0xa3a3fe5dU, 0x4040c080U, 0x8f8f8a05U,
- 0x9292ad3fU, 0x9d9dbc21U, 0x38384870U, 0xf5f504f1U,
- 0xbcbcdf63U, 0xb6b6c177U, 0xdada75afU, 0x21216342U,
- 0x10103020U, 0xffff1ae5U, 0xf3f30efdU, 0xd2d26dbfU,
- 0xcdcd4c81U, 0x0c0c1418U, 0x13133526U, 0xecec2fc3U,
- 0x5f5fe1beU, 0x9797a235U, 0x4444cc88U, 0x1717392eU,
- 0xc4c45793U, 0xa7a7f255U, 0x7e7e82fcU, 0x3d3d477aU,
- 0x6464acc8U, 0x5d5de7baU, 0x19192b32U, 0x737395e6U,
- 0x6060a0c0U, 0x81819819U, 0x4f4fd19eU, 0xdcdc7fa3U,
- 0x22226644U, 0x2a2a7e54U, 0x9090ab3bU, 0x8888830bU,
- 0x4646ca8cU, 0xeeee29c7U, 0xb8b8d36bU, 0x14143c28U,
- 0xdede79a7U, 0x5e5ee2bcU, 0x0b0b1d16U, 0xdbdb76adU,
- 0xe0e03bdbU, 0x32325664U, 0x3a3a4e74U, 0x0a0a1e14U,
- 0x4949db92U, 0x06060a0cU, 0x24246c48U, 0x5c5ce4b8U,
- 0xc2c25d9fU, 0xd3d36ebdU, 0xacacef43U, 0x6262a6c4U,
- 0x9191a839U, 0x9595a431U, 0xe4e437d3U, 0x79798bf2U,
- 0xe7e732d5U, 0xc8c8438bU, 0x3737596eU, 0x6d6db7daU,
- 0x8d8d8c01U, 0xd5d564b1U, 0x4e4ed29cU, 0xa9a9e049U,
- 0x6c6cb4d8U, 0x5656faacU, 0xf4f407f3U, 0xeaea25cfU,
- 0x6565afcaU, 0x7a7a8ef4U, 0xaeaee947U, 0x08081810U,
- 0xbabad56fU, 0x787888f0U, 0x25256f4aU, 0x2e2e725cU,
- 0x1c1c2438U, 0xa6a6f157U, 0xb4b4c773U, 0xc6c65197U,
- 0xe8e823cbU, 0xdddd7ca1U, 0x74749ce8U, 0x1f1f213eU,
- 0x4b4bdd96U, 0xbdbddc61U, 0x8b8b860dU, 0x8a8a850fU,
- 0x707090e0U, 0x3e3e427cU, 0xb5b5c471U, 0x6666aaccU,
- 0x4848d890U, 0x03030506U, 0xf6f601f7U, 0x0e0e121cU,
- 0x6161a3c2U, 0x35355f6aU, 0x5757f9aeU, 0xb9b9d069U,
- 0x86869117U, 0xc1c15899U, 0x1d1d273aU, 0x9e9eb927U,
- 0xe1e138d9U, 0xf8f813ebU, 0x9898b32bU, 0x11113322U,
- 0x6969bbd2U, 0xd9d970a9U, 0x8e8e8907U, 0x9494a733U,
- 0x9b9bb62dU, 0x1e1e223cU, 0x87879215U, 0xe9e920c9U,
- 0xcece4987U, 0x5555ffaaU, 0x28287850U, 0xdfdf7aa5U,
- 0x8c8c8f03U, 0xa1a1f859U, 0x89898009U, 0x0d0d171aU,
- 0xbfbfda65U, 0xe6e631d7U, 0x4242c684U, 0x6868b8d0U,
- 0x4141c382U, 0x9999b029U, 0x2d2d775aU, 0x0f0f111eU,
- 0xb0b0cb7bU, 0x5454fca8U, 0xbbbbd66dU, 0x16163a2cU,
+ 0x6363a5c6U,
+ 0x7c7c84f8U,
+ 0x777799eeU,
+ 0x7b7b8df6U,
+ 0xf2f20dffU,
+ 0x6b6bbdd6U,
+ 0x6f6fb1deU,
+ 0xc5c55491U,
+ 0x30305060U,
+ 0x01010302U,
+ 0x6767a9ceU,
+ 0x2b2b7d56U,
+ 0xfefe19e7U,
+ 0xd7d762b5U,
+ 0xababe64dU,
+ 0x76769aecU,
+ 0xcaca458fU,
+ 0x82829d1fU,
+ 0xc9c94089U,
+ 0x7d7d87faU,
+ 0xfafa15efU,
+ 0x5959ebb2U,
+ 0x4747c98eU,
+ 0xf0f00bfbU,
+ 0xadadec41U,
+ 0xd4d467b3U,
+ 0xa2a2fd5fU,
+ 0xafafea45U,
+ 0x9c9cbf23U,
+ 0xa4a4f753U,
+ 0x727296e4U,
+ 0xc0c05b9bU,
+ 0xb7b7c275U,
+ 0xfdfd1ce1U,
+ 0x9393ae3dU,
+ 0x26266a4cU,
+ 0x36365a6cU,
+ 0x3f3f417eU,
+ 0xf7f702f5U,
+ 0xcccc4f83U,
+ 0x34345c68U,
+ 0xa5a5f451U,
+ 0xe5e534d1U,
+ 0xf1f108f9U,
+ 0x717193e2U,
+ 0xd8d873abU,
+ 0x31315362U,
+ 0x15153f2aU,
+ 0x04040c08U,
+ 0xc7c75295U,
+ 0x23236546U,
+ 0xc3c35e9dU,
+ 0x18182830U,
+ 0x9696a137U,
+ 0x05050f0aU,
+ 0x9a9ab52fU,
+ 0x0707090eU,
+ 0x12123624U,
+ 0x80809b1bU,
+ 0xe2e23ddfU,
+ 0xebeb26cdU,
+ 0x2727694eU,
+ 0xb2b2cd7fU,
+ 0x75759feaU,
+ 0x09091b12U,
+ 0x83839e1dU,
+ 0x2c2c7458U,
+ 0x1a1a2e34U,
+ 0x1b1b2d36U,
+ 0x6e6eb2dcU,
+ 0x5a5aeeb4U,
+ 0xa0a0fb5bU,
+ 0x5252f6a4U,
+ 0x3b3b4d76U,
+ 0xd6d661b7U,
+ 0xb3b3ce7dU,
+ 0x29297b52U,
+ 0xe3e33eddU,
+ 0x2f2f715eU,
+ 0x84849713U,
+ 0x5353f5a6U,
+ 0xd1d168b9U,
+ 0x00000000U,
+ 0xeded2cc1U,
+ 0x20206040U,
+ 0xfcfc1fe3U,
+ 0xb1b1c879U,
+ 0x5b5bedb6U,
+ 0x6a6abed4U,
+ 0xcbcb468dU,
+ 0xbebed967U,
+ 0x39394b72U,
+ 0x4a4ade94U,
+ 0x4c4cd498U,
+ 0x5858e8b0U,
+ 0xcfcf4a85U,
+ 0xd0d06bbbU,
+ 0xefef2ac5U,
+ 0xaaaae54fU,
+ 0xfbfb16edU,
+ 0x4343c586U,
+ 0x4d4dd79aU,
+ 0x33335566U,
+ 0x85859411U,
+ 0x4545cf8aU,
+ 0xf9f910e9U,
+ 0x02020604U,
+ 0x7f7f81feU,
+ 0x5050f0a0U,
+ 0x3c3c4478U,
+ 0x9f9fba25U,
+ 0xa8a8e34bU,
+ 0x5151f3a2U,
+ 0xa3a3fe5dU,
+ 0x4040c080U,
+ 0x8f8f8a05U,
+ 0x9292ad3fU,
+ 0x9d9dbc21U,
+ 0x38384870U,
+ 0xf5f504f1U,
+ 0xbcbcdf63U,
+ 0xb6b6c177U,
+ 0xdada75afU,
+ 0x21216342U,
+ 0x10103020U,
+ 0xffff1ae5U,
+ 0xf3f30efdU,
+ 0xd2d26dbfU,
+ 0xcdcd4c81U,
+ 0x0c0c1418U,
+ 0x13133526U,
+ 0xecec2fc3U,
+ 0x5f5fe1beU,
+ 0x9797a235U,
+ 0x4444cc88U,
+ 0x1717392eU,
+ 0xc4c45793U,
+ 0xa7a7f255U,
+ 0x7e7e82fcU,
+ 0x3d3d477aU,
+ 0x6464acc8U,
+ 0x5d5de7baU,
+ 0x19192b32U,
+ 0x737395e6U,
+ 0x6060a0c0U,
+ 0x81819819U,
+ 0x4f4fd19eU,
+ 0xdcdc7fa3U,
+ 0x22226644U,
+ 0x2a2a7e54U,
+ 0x9090ab3bU,
+ 0x8888830bU,
+ 0x4646ca8cU,
+ 0xeeee29c7U,
+ 0xb8b8d36bU,
+ 0x14143c28U,
+ 0xdede79a7U,
+ 0x5e5ee2bcU,
+ 0x0b0b1d16U,
+ 0xdbdb76adU,
+ 0xe0e03bdbU,
+ 0x32325664U,
+ 0x3a3a4e74U,
+ 0x0a0a1e14U,
+ 0x4949db92U,
+ 0x06060a0cU,
+ 0x24246c48U,
+ 0x5c5ce4b8U,
+ 0xc2c25d9fU,
+ 0xd3d36ebdU,
+ 0xacacef43U,
+ 0x6262a6c4U,
+ 0x9191a839U,
+ 0x9595a431U,
+ 0xe4e437d3U,
+ 0x79798bf2U,
+ 0xe7e732d5U,
+ 0xc8c8438bU,
+ 0x3737596eU,
+ 0x6d6db7daU,
+ 0x8d8d8c01U,
+ 0xd5d564b1U,
+ 0x4e4ed29cU,
+ 0xa9a9e049U,
+ 0x6c6cb4d8U,
+ 0x5656faacU,
+ 0xf4f407f3U,
+ 0xeaea25cfU,
+ 0x6565afcaU,
+ 0x7a7a8ef4U,
+ 0xaeaee947U,
+ 0x08081810U,
+ 0xbabad56fU,
+ 0x787888f0U,
+ 0x25256f4aU,
+ 0x2e2e725cU,
+ 0x1c1c2438U,
+ 0xa6a6f157U,
+ 0xb4b4c773U,
+ 0xc6c65197U,
+ 0xe8e823cbU,
+ 0xdddd7ca1U,
+ 0x74749ce8U,
+ 0x1f1f213eU,
+ 0x4b4bdd96U,
+ 0xbdbddc61U,
+ 0x8b8b860dU,
+ 0x8a8a850fU,
+ 0x707090e0U,
+ 0x3e3e427cU,
+ 0xb5b5c471U,
+ 0x6666aaccU,
+ 0x4848d890U,
+ 0x03030506U,
+ 0xf6f601f7U,
+ 0x0e0e121cU,
+ 0x6161a3c2U,
+ 0x35355f6aU,
+ 0x5757f9aeU,
+ 0xb9b9d069U,
+ 0x86869117U,
+ 0xc1c15899U,
+ 0x1d1d273aU,
+ 0x9e9eb927U,
+ 0xe1e138d9U,
+ 0xf8f813ebU,
+ 0x9898b32bU,
+ 0x11113322U,
+ 0x6969bbd2U,
+ 0xd9d970a9U,
+ 0x8e8e8907U,
+ 0x9494a733U,
+ 0x9b9bb62dU,
+ 0x1e1e223cU,
+ 0x87879215U,
+ 0xe9e920c9U,
+ 0xcece4987U,
+ 0x5555ffaaU,
+ 0x28287850U,
+ 0xdfdf7aa5U,
+ 0x8c8c8f03U,
+ 0xa1a1f859U,
+ 0x89898009U,
+ 0x0d0d171aU,
+ 0xbfbfda65U,
+ 0xe6e631d7U,
+ 0x4242c684U,
+ 0x6868b8d0U,
+ 0x4141c382U,
+ 0x9999b029U,
+ 0x2d2d775aU,
+ 0x0f0f111eU,
+ 0xb0b0cb7bU,
+ 0x5454fca8U,
+ 0xbbbbd66dU,
+ 0x16163a2cU,
};
static const u32 Td0[256] = {
- 0x51f4a750U, 0x7e416553U, 0x1a17a4c3U, 0x3a275e96U,
- 0x3bab6bcbU, 0x1f9d45f1U, 0xacfa58abU, 0x4be30393U,
- 0x2030fa55U, 0xad766df6U, 0x88cc7691U, 0xf5024c25U,
- 0x4fe5d7fcU, 0xc52acbd7U, 0x26354480U, 0xb562a38fU,
- 0xdeb15a49U, 0x25ba1b67U, 0x45ea0e98U, 0x5dfec0e1U,
- 0xc32f7502U, 0x814cf012U, 0x8d4697a3U, 0x6bd3f9c6U,
- 0x038f5fe7U, 0x15929c95U, 0xbf6d7aebU, 0x955259daU,
- 0xd4be832dU, 0x587421d3U, 0x49e06929U, 0x8ec9c844U,
- 0x75c2896aU, 0xf48e7978U, 0x99583e6bU, 0x27b971ddU,
- 0xbee14fb6U, 0xf088ad17U, 0xc920ac66U, 0x7dce3ab4U,
- 0x63df4a18U, 0xe51a3182U, 0x97513360U, 0x62537f45U,
- 0xb16477e0U, 0xbb6bae84U, 0xfe81a01cU, 0xf9082b94U,
- 0x70486858U, 0x8f45fd19U, 0x94de6c87U, 0x527bf8b7U,
- 0xab73d323U, 0x724b02e2U, 0xe31f8f57U, 0x6655ab2aU,
- 0xb2eb2807U, 0x2fb5c203U, 0x86c57b9aU, 0xd33708a5U,
- 0x302887f2U, 0x23bfa5b2U, 0x02036abaU, 0xed16825cU,
- 0x8acf1c2bU, 0xa779b492U, 0xf307f2f0U, 0x4e69e2a1U,
- 0x65daf4cdU, 0x0605bed5U, 0xd134621fU, 0xc4a6fe8aU,
- 0x342e539dU, 0xa2f355a0U, 0x058ae132U, 0xa4f6eb75U,
- 0x0b83ec39U, 0x4060efaaU, 0x5e719f06U, 0xbd6e1051U,
- 0x3e218af9U, 0x96dd063dU, 0xdd3e05aeU, 0x4de6bd46U,
- 0x91548db5U, 0x71c45d05U, 0x0406d46fU, 0x605015ffU,
- 0x1998fb24U, 0xd6bde997U, 0x894043ccU, 0x67d99e77U,
- 0xb0e842bdU, 0x07898b88U, 0xe7195b38U, 0x79c8eedbU,
- 0xa17c0a47U, 0x7c420fe9U, 0xf8841ec9U, 0x00000000U,
- 0x09808683U, 0x322bed48U, 0x1e1170acU, 0x6c5a724eU,
- 0xfd0efffbU, 0x0f853856U, 0x3daed51eU, 0x362d3927U,
- 0x0a0fd964U, 0x685ca621U, 0x9b5b54d1U, 0x24362e3aU,
- 0x0c0a67b1U, 0x9357e70fU, 0xb4ee96d2U, 0x1b9b919eU,
- 0x80c0c54fU, 0x61dc20a2U, 0x5a774b69U, 0x1c121a16U,
- 0xe293ba0aU, 0xc0a02ae5U, 0x3c22e043U, 0x121b171dU,
- 0x0e090d0bU, 0xf28bc7adU, 0x2db6a8b9U, 0x141ea9c8U,
- 0x57f11985U, 0xaf75074cU, 0xee99ddbbU, 0xa37f60fdU,
- 0xf701269fU, 0x5c72f5bcU, 0x44663bc5U, 0x5bfb7e34U,
- 0x8b432976U, 0xcb23c6dcU, 0xb6edfc68U, 0xb8e4f163U,
- 0xd731dccaU, 0x42638510U, 0x13972240U, 0x84c61120U,
- 0x854a247dU, 0xd2bb3df8U, 0xaef93211U, 0xc729a16dU,
- 0x1d9e2f4bU, 0xdcb230f3U, 0x0d8652ecU, 0x77c1e3d0U,
- 0x2bb3166cU, 0xa970b999U, 0x119448faU, 0x47e96422U,
- 0xa8fc8cc4U, 0xa0f03f1aU, 0x567d2cd8U, 0x223390efU,
- 0x87494ec7U, 0xd938d1c1U, 0x8ccaa2feU, 0x98d40b36U,
- 0xa6f581cfU, 0xa57ade28U, 0xdab78e26U, 0x3fadbfa4U,
- 0x2c3a9de4U, 0x5078920dU, 0x6a5fcc9bU, 0x547e4662U,
- 0xf68d13c2U, 0x90d8b8e8U, 0x2e39f75eU, 0x82c3aff5U,
- 0x9f5d80beU, 0x69d0937cU, 0x6fd52da9U, 0xcf2512b3U,
- 0xc8ac993bU, 0x10187da7U, 0xe89c636eU, 0xdb3bbb7bU,
- 0xcd267809U, 0x6e5918f4U, 0xec9ab701U, 0x834f9aa8U,
- 0xe6956e65U, 0xaaffe67eU, 0x21bccf08U, 0xef15e8e6U,
- 0xbae79bd9U, 0x4a6f36ceU, 0xea9f09d4U, 0x29b07cd6U,
- 0x31a4b2afU, 0x2a3f2331U, 0xc6a59430U, 0x35a266c0U,
- 0x744ebc37U, 0xfc82caa6U, 0xe090d0b0U, 0x33a7d815U,
- 0xf104984aU, 0x41ecdaf7U, 0x7fcd500eU, 0x1791f62fU,
- 0x764dd68dU, 0x43efb04dU, 0xccaa4d54U, 0xe49604dfU,
- 0x9ed1b5e3U, 0x4c6a881bU, 0xc12c1fb8U, 0x4665517fU,
- 0x9d5eea04U, 0x018c355dU, 0xfa877473U, 0xfb0b412eU,
- 0xb3671d5aU, 0x92dbd252U, 0xe9105633U, 0x6dd64713U,
- 0x9ad7618cU, 0x37a10c7aU, 0x59f8148eU, 0xeb133c89U,
- 0xcea927eeU, 0xb761c935U, 0xe11ce5edU, 0x7a47b13cU,
- 0x9cd2df59U, 0x55f2733fU, 0x1814ce79U, 0x73c737bfU,
- 0x53f7cdeaU, 0x5ffdaa5bU, 0xdf3d6f14U, 0x7844db86U,
- 0xcaaff381U, 0xb968c43eU, 0x3824342cU, 0xc2a3405fU,
- 0x161dc372U, 0xbce2250cU, 0x283c498bU, 0xff0d9541U,
- 0x39a80171U, 0x080cb3deU, 0xd8b4e49cU, 0x6456c190U,
- 0x7bcb8461U, 0xd532b670U, 0x486c5c74U, 0xd0b85742U,
+ 0x51f4a750U,
+ 0x7e416553U,
+ 0x1a17a4c3U,
+ 0x3a275e96U,
+ 0x3bab6bcbU,
+ 0x1f9d45f1U,
+ 0xacfa58abU,
+ 0x4be30393U,
+ 0x2030fa55U,
+ 0xad766df6U,
+ 0x88cc7691U,
+ 0xf5024c25U,
+ 0x4fe5d7fcU,
+ 0xc52acbd7U,
+ 0x26354480U,
+ 0xb562a38fU,
+ 0xdeb15a49U,
+ 0x25ba1b67U,
+ 0x45ea0e98U,
+ 0x5dfec0e1U,
+ 0xc32f7502U,
+ 0x814cf012U,
+ 0x8d4697a3U,
+ 0x6bd3f9c6U,
+ 0x038f5fe7U,
+ 0x15929c95U,
+ 0xbf6d7aebU,
+ 0x955259daU,
+ 0xd4be832dU,
+ 0x587421d3U,
+ 0x49e06929U,
+ 0x8ec9c844U,
+ 0x75c2896aU,
+ 0xf48e7978U,
+ 0x99583e6bU,
+ 0x27b971ddU,
+ 0xbee14fb6U,
+ 0xf088ad17U,
+ 0xc920ac66U,
+ 0x7dce3ab4U,
+ 0x63df4a18U,
+ 0xe51a3182U,
+ 0x97513360U,
+ 0x62537f45U,
+ 0xb16477e0U,
+ 0xbb6bae84U,
+ 0xfe81a01cU,
+ 0xf9082b94U,
+ 0x70486858U,
+ 0x8f45fd19U,
+ 0x94de6c87U,
+ 0x527bf8b7U,
+ 0xab73d323U,
+ 0x724b02e2U,
+ 0xe31f8f57U,
+ 0x6655ab2aU,
+ 0xb2eb2807U,
+ 0x2fb5c203U,
+ 0x86c57b9aU,
+ 0xd33708a5U,
+ 0x302887f2U,
+ 0x23bfa5b2U,
+ 0x02036abaU,
+ 0xed16825cU,
+ 0x8acf1c2bU,
+ 0xa779b492U,
+ 0xf307f2f0U,
+ 0x4e69e2a1U,
+ 0x65daf4cdU,
+ 0x0605bed5U,
+ 0xd134621fU,
+ 0xc4a6fe8aU,
+ 0x342e539dU,
+ 0xa2f355a0U,
+ 0x058ae132U,
+ 0xa4f6eb75U,
+ 0x0b83ec39U,
+ 0x4060efaaU,
+ 0x5e719f06U,
+ 0xbd6e1051U,
+ 0x3e218af9U,
+ 0x96dd063dU,
+ 0xdd3e05aeU,
+ 0x4de6bd46U,
+ 0x91548db5U,
+ 0x71c45d05U,
+ 0x0406d46fU,
+ 0x605015ffU,
+ 0x1998fb24U,
+ 0xd6bde997U,
+ 0x894043ccU,
+ 0x67d99e77U,
+ 0xb0e842bdU,
+ 0x07898b88U,
+ 0xe7195b38U,
+ 0x79c8eedbU,
+ 0xa17c0a47U,
+ 0x7c420fe9U,
+ 0xf8841ec9U,
+ 0x00000000U,
+ 0x09808683U,
+ 0x322bed48U,
+ 0x1e1170acU,
+ 0x6c5a724eU,
+ 0xfd0efffbU,
+ 0x0f853856U,
+ 0x3daed51eU,
+ 0x362d3927U,
+ 0x0a0fd964U,
+ 0x685ca621U,
+ 0x9b5b54d1U,
+ 0x24362e3aU,
+ 0x0c0a67b1U,
+ 0x9357e70fU,
+ 0xb4ee96d2U,
+ 0x1b9b919eU,
+ 0x80c0c54fU,
+ 0x61dc20a2U,
+ 0x5a774b69U,
+ 0x1c121a16U,
+ 0xe293ba0aU,
+ 0xc0a02ae5U,
+ 0x3c22e043U,
+ 0x121b171dU,
+ 0x0e090d0bU,
+ 0xf28bc7adU,
+ 0x2db6a8b9U,
+ 0x141ea9c8U,
+ 0x57f11985U,
+ 0xaf75074cU,
+ 0xee99ddbbU,
+ 0xa37f60fdU,
+ 0xf701269fU,
+ 0x5c72f5bcU,
+ 0x44663bc5U,
+ 0x5bfb7e34U,
+ 0x8b432976U,
+ 0xcb23c6dcU,
+ 0xb6edfc68U,
+ 0xb8e4f163U,
+ 0xd731dccaU,
+ 0x42638510U,
+ 0x13972240U,
+ 0x84c61120U,
+ 0x854a247dU,
+ 0xd2bb3df8U,
+ 0xaef93211U,
+ 0xc729a16dU,
+ 0x1d9e2f4bU,
+ 0xdcb230f3U,
+ 0x0d8652ecU,
+ 0x77c1e3d0U,
+ 0x2bb3166cU,
+ 0xa970b999U,
+ 0x119448faU,
+ 0x47e96422U,
+ 0xa8fc8cc4U,
+ 0xa0f03f1aU,
+ 0x567d2cd8U,
+ 0x223390efU,
+ 0x87494ec7U,
+ 0xd938d1c1U,
+ 0x8ccaa2feU,
+ 0x98d40b36U,
+ 0xa6f581cfU,
+ 0xa57ade28U,
+ 0xdab78e26U,
+ 0x3fadbfa4U,
+ 0x2c3a9de4U,
+ 0x5078920dU,
+ 0x6a5fcc9bU,
+ 0x547e4662U,
+ 0xf68d13c2U,
+ 0x90d8b8e8U,
+ 0x2e39f75eU,
+ 0x82c3aff5U,
+ 0x9f5d80beU,
+ 0x69d0937cU,
+ 0x6fd52da9U,
+ 0xcf2512b3U,
+ 0xc8ac993bU,
+ 0x10187da7U,
+ 0xe89c636eU,
+ 0xdb3bbb7bU,
+ 0xcd267809U,
+ 0x6e5918f4U,
+ 0xec9ab701U,
+ 0x834f9aa8U,
+ 0xe6956e65U,
+ 0xaaffe67eU,
+ 0x21bccf08U,
+ 0xef15e8e6U,
+ 0xbae79bd9U,
+ 0x4a6f36ceU,
+ 0xea9f09d4U,
+ 0x29b07cd6U,
+ 0x31a4b2afU,
+ 0x2a3f2331U,
+ 0xc6a59430U,
+ 0x35a266c0U,
+ 0x744ebc37U,
+ 0xfc82caa6U,
+ 0xe090d0b0U,
+ 0x33a7d815U,
+ 0xf104984aU,
+ 0x41ecdaf7U,
+ 0x7fcd500eU,
+ 0x1791f62fU,
+ 0x764dd68dU,
+ 0x43efb04dU,
+ 0xccaa4d54U,
+ 0xe49604dfU,
+ 0x9ed1b5e3U,
+ 0x4c6a881bU,
+ 0xc12c1fb8U,
+ 0x4665517fU,
+ 0x9d5eea04U,
+ 0x018c355dU,
+ 0xfa877473U,
+ 0xfb0b412eU,
+ 0xb3671d5aU,
+ 0x92dbd252U,
+ 0xe9105633U,
+ 0x6dd64713U,
+ 0x9ad7618cU,
+ 0x37a10c7aU,
+ 0x59f8148eU,
+ 0xeb133c89U,
+ 0xcea927eeU,
+ 0xb761c935U,
+ 0xe11ce5edU,
+ 0x7a47b13cU,
+ 0x9cd2df59U,
+ 0x55f2733fU,
+ 0x1814ce79U,
+ 0x73c737bfU,
+ 0x53f7cdeaU,
+ 0x5ffdaa5bU,
+ 0xdf3d6f14U,
+ 0x7844db86U,
+ 0xcaaff381U,
+ 0xb968c43eU,
+ 0x3824342cU,
+ 0xc2a3405fU,
+ 0x161dc372U,
+ 0xbce2250cU,
+ 0x283c498bU,
+ 0xff0d9541U,
+ 0x39a80171U,
+ 0x080cb3deU,
+ 0xd8b4e49cU,
+ 0x6456c190U,
+ 0x7bcb8461U,
+ 0xd532b670U,
+ 0x486c5c74U,
+ 0xd0b85742U,
};
static const u32 Td1[256] = {
- 0x5051f4a7U, 0x537e4165U, 0xc31a17a4U, 0x963a275eU,
- 0xcb3bab6bU, 0xf11f9d45U, 0xabacfa58U, 0x934be303U,
- 0x552030faU, 0xf6ad766dU, 0x9188cc76U, 0x25f5024cU,
- 0xfc4fe5d7U, 0xd7c52acbU, 0x80263544U, 0x8fb562a3U,
- 0x49deb15aU, 0x6725ba1bU, 0x9845ea0eU, 0xe15dfec0U,
- 0x02c32f75U, 0x12814cf0U, 0xa38d4697U, 0xc66bd3f9U,
- 0xe7038f5fU, 0x9515929cU, 0xebbf6d7aU, 0xda955259U,
- 0x2dd4be83U, 0xd3587421U, 0x2949e069U, 0x448ec9c8U,
- 0x6a75c289U, 0x78f48e79U, 0x6b99583eU, 0xdd27b971U,
- 0xb6bee14fU, 0x17f088adU, 0x66c920acU, 0xb47dce3aU,
- 0x1863df4aU, 0x82e51a31U, 0x60975133U, 0x4562537fU,
- 0xe0b16477U, 0x84bb6baeU, 0x1cfe81a0U, 0x94f9082bU,
- 0x58704868U, 0x198f45fdU, 0x8794de6cU, 0xb7527bf8U,
- 0x23ab73d3U, 0xe2724b02U, 0x57e31f8fU, 0x2a6655abU,
- 0x07b2eb28U, 0x032fb5c2U, 0x9a86c57bU, 0xa5d33708U,
- 0xf2302887U, 0xb223bfa5U, 0xba02036aU, 0x5ced1682U,
- 0x2b8acf1cU, 0x92a779b4U, 0xf0f307f2U, 0xa14e69e2U,
- 0xcd65daf4U, 0xd50605beU, 0x1fd13462U, 0x8ac4a6feU,
- 0x9d342e53U, 0xa0a2f355U, 0x32058ae1U, 0x75a4f6ebU,
- 0x390b83ecU, 0xaa4060efU, 0x065e719fU, 0x51bd6e10U,
- 0xf93e218aU, 0x3d96dd06U, 0xaedd3e05U, 0x464de6bdU,
- 0xb591548dU, 0x0571c45dU, 0x6f0406d4U, 0xff605015U,
- 0x241998fbU, 0x97d6bde9U, 0xcc894043U, 0x7767d99eU,
- 0xbdb0e842U, 0x8807898bU, 0x38e7195bU, 0xdb79c8eeU,
- 0x47a17c0aU, 0xe97c420fU, 0xc9f8841eU, 0x00000000U,
- 0x83098086U, 0x48322bedU, 0xac1e1170U, 0x4e6c5a72U,
- 0xfbfd0effU, 0x560f8538U, 0x1e3daed5U, 0x27362d39U,
- 0x640a0fd9U, 0x21685ca6U, 0xd19b5b54U, 0x3a24362eU,
- 0xb10c0a67U, 0x0f9357e7U, 0xd2b4ee96U, 0x9e1b9b91U,
- 0x4f80c0c5U, 0xa261dc20U, 0x695a774bU, 0x161c121aU,
- 0x0ae293baU, 0xe5c0a02aU, 0x433c22e0U, 0x1d121b17U,
- 0x0b0e090dU, 0xadf28bc7U, 0xb92db6a8U, 0xc8141ea9U,
- 0x8557f119U, 0x4caf7507U, 0xbbee99ddU, 0xfda37f60U,
- 0x9ff70126U, 0xbc5c72f5U, 0xc544663bU, 0x345bfb7eU,
- 0x768b4329U, 0xdccb23c6U, 0x68b6edfcU, 0x63b8e4f1U,
- 0xcad731dcU, 0x10426385U, 0x40139722U, 0x2084c611U,
- 0x7d854a24U, 0xf8d2bb3dU, 0x11aef932U, 0x6dc729a1U,
- 0x4b1d9e2fU, 0xf3dcb230U, 0xec0d8652U, 0xd077c1e3U,
- 0x6c2bb316U, 0x99a970b9U, 0xfa119448U, 0x2247e964U,
- 0xc4a8fc8cU, 0x1aa0f03fU, 0xd8567d2cU, 0xef223390U,
- 0xc787494eU, 0xc1d938d1U, 0xfe8ccaa2U, 0x3698d40bU,
- 0xcfa6f581U, 0x28a57adeU, 0x26dab78eU, 0xa43fadbfU,
- 0xe42c3a9dU, 0x0d507892U, 0x9b6a5fccU, 0x62547e46U,
- 0xc2f68d13U, 0xe890d8b8U, 0x5e2e39f7U, 0xf582c3afU,
- 0xbe9f5d80U, 0x7c69d093U, 0xa96fd52dU, 0xb3cf2512U,
- 0x3bc8ac99U, 0xa710187dU, 0x6ee89c63U, 0x7bdb3bbbU,
- 0x09cd2678U, 0xf46e5918U, 0x01ec9ab7U, 0xa8834f9aU,
- 0x65e6956eU, 0x7eaaffe6U, 0x0821bccfU, 0xe6ef15e8U,
- 0xd9bae79bU, 0xce4a6f36U, 0xd4ea9f09U, 0xd629b07cU,
- 0xaf31a4b2U, 0x312a3f23U, 0x30c6a594U, 0xc035a266U,
- 0x37744ebcU, 0xa6fc82caU, 0xb0e090d0U, 0x1533a7d8U,
- 0x4af10498U, 0xf741ecdaU, 0x0e7fcd50U, 0x2f1791f6U,
- 0x8d764dd6U, 0x4d43efb0U, 0x54ccaa4dU, 0xdfe49604U,
- 0xe39ed1b5U, 0x1b4c6a88U, 0xb8c12c1fU, 0x7f466551U,
- 0x049d5eeaU, 0x5d018c35U, 0x73fa8774U, 0x2efb0b41U,
- 0x5ab3671dU, 0x5292dbd2U, 0x33e91056U, 0x136dd647U,
- 0x8c9ad761U, 0x7a37a10cU, 0x8e59f814U, 0x89eb133cU,
- 0xeecea927U, 0x35b761c9U, 0xede11ce5U, 0x3c7a47b1U,
- 0x599cd2dfU, 0x3f55f273U, 0x791814ceU, 0xbf73c737U,
- 0xea53f7cdU, 0x5b5ffdaaU, 0x14df3d6fU, 0x867844dbU,
- 0x81caaff3U, 0x3eb968c4U, 0x2c382434U, 0x5fc2a340U,
- 0x72161dc3U, 0x0cbce225U, 0x8b283c49U, 0x41ff0d95U,
- 0x7139a801U, 0xde080cb3U, 0x9cd8b4e4U, 0x906456c1U,
- 0x617bcb84U, 0x70d532b6U, 0x74486c5cU, 0x42d0b857U,
+ 0x5051f4a7U,
+ 0x537e4165U,
+ 0xc31a17a4U,
+ 0x963a275eU,
+ 0xcb3bab6bU,
+ 0xf11f9d45U,
+ 0xabacfa58U,
+ 0x934be303U,
+ 0x552030faU,
+ 0xf6ad766dU,
+ 0x9188cc76U,
+ 0x25f5024cU,
+ 0xfc4fe5d7U,
+ 0xd7c52acbU,
+ 0x80263544U,
+ 0x8fb562a3U,
+ 0x49deb15aU,
+ 0x6725ba1bU,
+ 0x9845ea0eU,
+ 0xe15dfec0U,
+ 0x02c32f75U,
+ 0x12814cf0U,
+ 0xa38d4697U,
+ 0xc66bd3f9U,
+ 0xe7038f5fU,
+ 0x9515929cU,
+ 0xebbf6d7aU,
+ 0xda955259U,
+ 0x2dd4be83U,
+ 0xd3587421U,
+ 0x2949e069U,
+ 0x448ec9c8U,
+ 0x6a75c289U,
+ 0x78f48e79U,
+ 0x6b99583eU,
+ 0xdd27b971U,
+ 0xb6bee14fU,
+ 0x17f088adU,
+ 0x66c920acU,
+ 0xb47dce3aU,
+ 0x1863df4aU,
+ 0x82e51a31U,
+ 0x60975133U,
+ 0x4562537fU,
+ 0xe0b16477U,
+ 0x84bb6baeU,
+ 0x1cfe81a0U,
+ 0x94f9082bU,
+ 0x58704868U,
+ 0x198f45fdU,
+ 0x8794de6cU,
+ 0xb7527bf8U,
+ 0x23ab73d3U,
+ 0xe2724b02U,
+ 0x57e31f8fU,
+ 0x2a6655abU,
+ 0x07b2eb28U,
+ 0x032fb5c2U,
+ 0x9a86c57bU,
+ 0xa5d33708U,
+ 0xf2302887U,
+ 0xb223bfa5U,
+ 0xba02036aU,
+ 0x5ced1682U,
+ 0x2b8acf1cU,
+ 0x92a779b4U,
+ 0xf0f307f2U,
+ 0xa14e69e2U,
+ 0xcd65daf4U,
+ 0xd50605beU,
+ 0x1fd13462U,
+ 0x8ac4a6feU,
+ 0x9d342e53U,
+ 0xa0a2f355U,
+ 0x32058ae1U,
+ 0x75a4f6ebU,
+ 0x390b83ecU,
+ 0xaa4060efU,
+ 0x065e719fU,
+ 0x51bd6e10U,
+ 0xf93e218aU,
+ 0x3d96dd06U,
+ 0xaedd3e05U,
+ 0x464de6bdU,
+ 0xb591548dU,
+ 0x0571c45dU,
+ 0x6f0406d4U,
+ 0xff605015U,
+ 0x241998fbU,
+ 0x97d6bde9U,
+ 0xcc894043U,
+ 0x7767d99eU,
+ 0xbdb0e842U,
+ 0x8807898bU,
+ 0x38e7195bU,
+ 0xdb79c8eeU,
+ 0x47a17c0aU,
+ 0xe97c420fU,
+ 0xc9f8841eU,
+ 0x00000000U,
+ 0x83098086U,
+ 0x48322bedU,
+ 0xac1e1170U,
+ 0x4e6c5a72U,
+ 0xfbfd0effU,
+ 0x560f8538U,
+ 0x1e3daed5U,
+ 0x27362d39U,
+ 0x640a0fd9U,
+ 0x21685ca6U,
+ 0xd19b5b54U,
+ 0x3a24362eU,
+ 0xb10c0a67U,
+ 0x0f9357e7U,
+ 0xd2b4ee96U,
+ 0x9e1b9b91U,
+ 0x4f80c0c5U,
+ 0xa261dc20U,
+ 0x695a774bU,
+ 0x161c121aU,
+ 0x0ae293baU,
+ 0xe5c0a02aU,
+ 0x433c22e0U,
+ 0x1d121b17U,
+ 0x0b0e090dU,
+ 0xadf28bc7U,
+ 0xb92db6a8U,
+ 0xc8141ea9U,
+ 0x8557f119U,
+ 0x4caf7507U,
+ 0xbbee99ddU,
+ 0xfda37f60U,
+ 0x9ff70126U,
+ 0xbc5c72f5U,
+ 0xc544663bU,
+ 0x345bfb7eU,
+ 0x768b4329U,
+ 0xdccb23c6U,
+ 0x68b6edfcU,
+ 0x63b8e4f1U,
+ 0xcad731dcU,
+ 0x10426385U,
+ 0x40139722U,
+ 0x2084c611U,
+ 0x7d854a24U,
+ 0xf8d2bb3dU,
+ 0x11aef932U,
+ 0x6dc729a1U,
+ 0x4b1d9e2fU,
+ 0xf3dcb230U,
+ 0xec0d8652U,
+ 0xd077c1e3U,
+ 0x6c2bb316U,
+ 0x99a970b9U,
+ 0xfa119448U,
+ 0x2247e964U,
+ 0xc4a8fc8cU,
+ 0x1aa0f03fU,
+ 0xd8567d2cU,
+ 0xef223390U,
+ 0xc787494eU,
+ 0xc1d938d1U,
+ 0xfe8ccaa2U,
+ 0x3698d40bU,
+ 0xcfa6f581U,
+ 0x28a57adeU,
+ 0x26dab78eU,
+ 0xa43fadbfU,
+ 0xe42c3a9dU,
+ 0x0d507892U,
+ 0x9b6a5fccU,
+ 0x62547e46U,
+ 0xc2f68d13U,
+ 0xe890d8b8U,
+ 0x5e2e39f7U,
+ 0xf582c3afU,
+ 0xbe9f5d80U,
+ 0x7c69d093U,
+ 0xa96fd52dU,
+ 0xb3cf2512U,
+ 0x3bc8ac99U,
+ 0xa710187dU,
+ 0x6ee89c63U,
+ 0x7bdb3bbbU,
+ 0x09cd2678U,
+ 0xf46e5918U,
+ 0x01ec9ab7U,
+ 0xa8834f9aU,
+ 0x65e6956eU,
+ 0x7eaaffe6U,
+ 0x0821bccfU,
+ 0xe6ef15e8U,
+ 0xd9bae79bU,
+ 0xce4a6f36U,
+ 0xd4ea9f09U,
+ 0xd629b07cU,
+ 0xaf31a4b2U,
+ 0x312a3f23U,
+ 0x30c6a594U,
+ 0xc035a266U,
+ 0x37744ebcU,
+ 0xa6fc82caU,
+ 0xb0e090d0U,
+ 0x1533a7d8U,
+ 0x4af10498U,
+ 0xf741ecdaU,
+ 0x0e7fcd50U,
+ 0x2f1791f6U,
+ 0x8d764dd6U,
+ 0x4d43efb0U,
+ 0x54ccaa4dU,
+ 0xdfe49604U,
+ 0xe39ed1b5U,
+ 0x1b4c6a88U,
+ 0xb8c12c1fU,
+ 0x7f466551U,
+ 0x049d5eeaU,
+ 0x5d018c35U,
+ 0x73fa8774U,
+ 0x2efb0b41U,
+ 0x5ab3671dU,
+ 0x5292dbd2U,
+ 0x33e91056U,
+ 0x136dd647U,
+ 0x8c9ad761U,
+ 0x7a37a10cU,
+ 0x8e59f814U,
+ 0x89eb133cU,
+ 0xeecea927U,
+ 0x35b761c9U,
+ 0xede11ce5U,
+ 0x3c7a47b1U,
+ 0x599cd2dfU,
+ 0x3f55f273U,
+ 0x791814ceU,
+ 0xbf73c737U,
+ 0xea53f7cdU,
+ 0x5b5ffdaaU,
+ 0x14df3d6fU,
+ 0x867844dbU,
+ 0x81caaff3U,
+ 0x3eb968c4U,
+ 0x2c382434U,
+ 0x5fc2a340U,
+ 0x72161dc3U,
+ 0x0cbce225U,
+ 0x8b283c49U,
+ 0x41ff0d95U,
+ 0x7139a801U,
+ 0xde080cb3U,
+ 0x9cd8b4e4U,
+ 0x906456c1U,
+ 0x617bcb84U,
+ 0x70d532b6U,
+ 0x74486c5cU,
+ 0x42d0b857U,
};
static const u32 Td2[256] = {
- 0xa75051f4U, 0x65537e41U, 0xa4c31a17U, 0x5e963a27U,
- 0x6bcb3babU, 0x45f11f9dU, 0x58abacfaU, 0x03934be3U,
- 0xfa552030U, 0x6df6ad76U, 0x769188ccU, 0x4c25f502U,
- 0xd7fc4fe5U, 0xcbd7c52aU, 0x44802635U, 0xa38fb562U,
- 0x5a49deb1U, 0x1b6725baU, 0x0e9845eaU, 0xc0e15dfeU,
- 0x7502c32fU, 0xf012814cU, 0x97a38d46U, 0xf9c66bd3U,
- 0x5fe7038fU, 0x9c951592U, 0x7aebbf6dU, 0x59da9552U,
- 0x832dd4beU, 0x21d35874U, 0x692949e0U, 0xc8448ec9U,
- 0x896a75c2U, 0x7978f48eU, 0x3e6b9958U, 0x71dd27b9U,
- 0x4fb6bee1U, 0xad17f088U, 0xac66c920U, 0x3ab47dceU,
- 0x4a1863dfU, 0x3182e51aU, 0x33609751U, 0x7f456253U,
- 0x77e0b164U, 0xae84bb6bU, 0xa01cfe81U, 0x2b94f908U,
- 0x68587048U, 0xfd198f45U, 0x6c8794deU, 0xf8b7527bU,
- 0xd323ab73U, 0x02e2724bU, 0x8f57e31fU, 0xab2a6655U,
- 0x2807b2ebU, 0xc2032fb5U, 0x7b9a86c5U, 0x08a5d337U,
- 0x87f23028U, 0xa5b223bfU, 0x6aba0203U, 0x825ced16U,
- 0x1c2b8acfU, 0xb492a779U, 0xf2f0f307U, 0xe2a14e69U,
- 0xf4cd65daU, 0xbed50605U, 0x621fd134U, 0xfe8ac4a6U,
- 0x539d342eU, 0x55a0a2f3U, 0xe132058aU, 0xeb75a4f6U,
- 0xec390b83U, 0xefaa4060U, 0x9f065e71U, 0x1051bd6eU,
- 0x8af93e21U, 0x063d96ddU, 0x05aedd3eU, 0xbd464de6U,
- 0x8db59154U, 0x5d0571c4U, 0xd46f0406U, 0x15ff6050U,
- 0xfb241998U, 0xe997d6bdU, 0x43cc8940U, 0x9e7767d9U,
- 0x42bdb0e8U, 0x8b880789U, 0x5b38e719U, 0xeedb79c8U,
- 0x0a47a17cU, 0x0fe97c42U, 0x1ec9f884U, 0x00000000U,
- 0x86830980U, 0xed48322bU, 0x70ac1e11U, 0x724e6c5aU,
- 0xfffbfd0eU, 0x38560f85U, 0xd51e3daeU, 0x3927362dU,
- 0xd9640a0fU, 0xa621685cU, 0x54d19b5bU, 0x2e3a2436U,
- 0x67b10c0aU, 0xe70f9357U, 0x96d2b4eeU, 0x919e1b9bU,
- 0xc54f80c0U, 0x20a261dcU, 0x4b695a77U, 0x1a161c12U,
- 0xba0ae293U, 0x2ae5c0a0U, 0xe0433c22U, 0x171d121bU,
- 0x0d0b0e09U, 0xc7adf28bU, 0xa8b92db6U, 0xa9c8141eU,
- 0x198557f1U, 0x074caf75U, 0xddbbee99U, 0x60fda37fU,
- 0x269ff701U, 0xf5bc5c72U, 0x3bc54466U, 0x7e345bfbU,
- 0x29768b43U, 0xc6dccb23U, 0xfc68b6edU, 0xf163b8e4U,
- 0xdccad731U, 0x85104263U, 0x22401397U, 0x112084c6U,
- 0x247d854aU, 0x3df8d2bbU, 0x3211aef9U, 0xa16dc729U,
- 0x2f4b1d9eU, 0x30f3dcb2U, 0x52ec0d86U, 0xe3d077c1U,
- 0x166c2bb3U, 0xb999a970U, 0x48fa1194U, 0x642247e9U,
- 0x8cc4a8fcU, 0x3f1aa0f0U, 0x2cd8567dU, 0x90ef2233U,
- 0x4ec78749U, 0xd1c1d938U, 0xa2fe8ccaU, 0x0b3698d4U,
- 0x81cfa6f5U, 0xde28a57aU, 0x8e26dab7U, 0xbfa43fadU,
- 0x9de42c3aU, 0x920d5078U, 0xcc9b6a5fU, 0x4662547eU,
- 0x13c2f68dU, 0xb8e890d8U, 0xf75e2e39U, 0xaff582c3U,
- 0x80be9f5dU, 0x937c69d0U, 0x2da96fd5U, 0x12b3cf25U,
- 0x993bc8acU, 0x7da71018U, 0x636ee89cU, 0xbb7bdb3bU,
- 0x7809cd26U, 0x18f46e59U, 0xb701ec9aU, 0x9aa8834fU,
- 0x6e65e695U, 0xe67eaaffU, 0xcf0821bcU, 0xe8e6ef15U,
- 0x9bd9bae7U, 0x36ce4a6fU, 0x09d4ea9fU, 0x7cd629b0U,
- 0xb2af31a4U, 0x23312a3fU, 0x9430c6a5U, 0x66c035a2U,
- 0xbc37744eU, 0xcaa6fc82U, 0xd0b0e090U, 0xd81533a7U,
- 0x984af104U, 0xdaf741ecU, 0x500e7fcdU, 0xf62f1791U,
- 0xd68d764dU, 0xb04d43efU, 0x4d54ccaaU, 0x04dfe496U,
- 0xb5e39ed1U, 0x881b4c6aU, 0x1fb8c12cU, 0x517f4665U,
- 0xea049d5eU, 0x355d018cU, 0x7473fa87U, 0x412efb0bU,
- 0x1d5ab367U, 0xd25292dbU, 0x5633e910U, 0x47136dd6U,
- 0x618c9ad7U, 0x0c7a37a1U, 0x148e59f8U, 0x3c89eb13U,
- 0x27eecea9U, 0xc935b761U, 0xe5ede11cU, 0xb13c7a47U,
- 0xdf599cd2U, 0x733f55f2U, 0xce791814U, 0x37bf73c7U,
- 0xcdea53f7U, 0xaa5b5ffdU, 0x6f14df3dU, 0xdb867844U,
- 0xf381caafU, 0xc43eb968U, 0x342c3824U, 0x405fc2a3U,
- 0xc372161dU, 0x250cbce2U, 0x498b283cU, 0x9541ff0dU,
- 0x017139a8U, 0xb3de080cU, 0xe49cd8b4U, 0xc1906456U,
- 0x84617bcbU, 0xb670d532U, 0x5c74486cU, 0x5742d0b8U,
+ 0xa75051f4U,
+ 0x65537e41U,
+ 0xa4c31a17U,
+ 0x5e963a27U,
+ 0x6bcb3babU,
+ 0x45f11f9dU,
+ 0x58abacfaU,
+ 0x03934be3U,
+ 0xfa552030U,
+ 0x6df6ad76U,
+ 0x769188ccU,
+ 0x4c25f502U,
+ 0xd7fc4fe5U,
+ 0xcbd7c52aU,
+ 0x44802635U,
+ 0xa38fb562U,
+ 0x5a49deb1U,
+ 0x1b6725baU,
+ 0x0e9845eaU,
+ 0xc0e15dfeU,
+ 0x7502c32fU,
+ 0xf012814cU,
+ 0x97a38d46U,
+ 0xf9c66bd3U,
+ 0x5fe7038fU,
+ 0x9c951592U,
+ 0x7aebbf6dU,
+ 0x59da9552U,
+ 0x832dd4beU,
+ 0x21d35874U,
+ 0x692949e0U,
+ 0xc8448ec9U,
+ 0x896a75c2U,
+ 0x7978f48eU,
+ 0x3e6b9958U,
+ 0x71dd27b9U,
+ 0x4fb6bee1U,
+ 0xad17f088U,
+ 0xac66c920U,
+ 0x3ab47dceU,
+ 0x4a1863dfU,
+ 0x3182e51aU,
+ 0x33609751U,
+ 0x7f456253U,
+ 0x77e0b164U,
+ 0xae84bb6bU,
+ 0xa01cfe81U,
+ 0x2b94f908U,
+ 0x68587048U,
+ 0xfd198f45U,
+ 0x6c8794deU,
+ 0xf8b7527bU,
+ 0xd323ab73U,
+ 0x02e2724bU,
+ 0x8f57e31fU,
+ 0xab2a6655U,
+ 0x2807b2ebU,
+ 0xc2032fb5U,
+ 0x7b9a86c5U,
+ 0x08a5d337U,
+ 0x87f23028U,
+ 0xa5b223bfU,
+ 0x6aba0203U,
+ 0x825ced16U,
+ 0x1c2b8acfU,
+ 0xb492a779U,
+ 0xf2f0f307U,
+ 0xe2a14e69U,
+ 0xf4cd65daU,
+ 0xbed50605U,
+ 0x621fd134U,
+ 0xfe8ac4a6U,
+ 0x539d342eU,
+ 0x55a0a2f3U,
+ 0xe132058aU,
+ 0xeb75a4f6U,
+ 0xec390b83U,
+ 0xefaa4060U,
+ 0x9f065e71U,
+ 0x1051bd6eU,
+ 0x8af93e21U,
+ 0x063d96ddU,
+ 0x05aedd3eU,
+ 0xbd464de6U,
+ 0x8db59154U,
+ 0x5d0571c4U,
+ 0xd46f0406U,
+ 0x15ff6050U,
+ 0xfb241998U,
+ 0xe997d6bdU,
+ 0x43cc8940U,
+ 0x9e7767d9U,
+ 0x42bdb0e8U,
+ 0x8b880789U,
+ 0x5b38e719U,
+ 0xeedb79c8U,
+ 0x0a47a17cU,
+ 0x0fe97c42U,
+ 0x1ec9f884U,
+ 0x00000000U,
+ 0x86830980U,
+ 0xed48322bU,
+ 0x70ac1e11U,
+ 0x724e6c5aU,
+ 0xfffbfd0eU,
+ 0x38560f85U,
+ 0xd51e3daeU,
+ 0x3927362dU,
+ 0xd9640a0fU,
+ 0xa621685cU,
+ 0x54d19b5bU,
+ 0x2e3a2436U,
+ 0x67b10c0aU,
+ 0xe70f9357U,
+ 0x96d2b4eeU,
+ 0x919e1b9bU,
+ 0xc54f80c0U,
+ 0x20a261dcU,
+ 0x4b695a77U,
+ 0x1a161c12U,
+ 0xba0ae293U,
+ 0x2ae5c0a0U,
+ 0xe0433c22U,
+ 0x171d121bU,
+ 0x0d0b0e09U,
+ 0xc7adf28bU,
+ 0xa8b92db6U,
+ 0xa9c8141eU,
+ 0x198557f1U,
+ 0x074caf75U,
+ 0xddbbee99U,
+ 0x60fda37fU,
+ 0x269ff701U,
+ 0xf5bc5c72U,
+ 0x3bc54466U,
+ 0x7e345bfbU,
+ 0x29768b43U,
+ 0xc6dccb23U,
+ 0xfc68b6edU,
+ 0xf163b8e4U,
+ 0xdccad731U,
+ 0x85104263U,
+ 0x22401397U,
+ 0x112084c6U,
+ 0x247d854aU,
+ 0x3df8d2bbU,
+ 0x3211aef9U,
+ 0xa16dc729U,
+ 0x2f4b1d9eU,
+ 0x30f3dcb2U,
+ 0x52ec0d86U,
+ 0xe3d077c1U,
+ 0x166c2bb3U,
+ 0xb999a970U,
+ 0x48fa1194U,
+ 0x642247e9U,
+ 0x8cc4a8fcU,
+ 0x3f1aa0f0U,
+ 0x2cd8567dU,
+ 0x90ef2233U,
+ 0x4ec78749U,
+ 0xd1c1d938U,
+ 0xa2fe8ccaU,
+ 0x0b3698d4U,
+ 0x81cfa6f5U,
+ 0xde28a57aU,
+ 0x8e26dab7U,
+ 0xbfa43fadU,
+ 0x9de42c3aU,
+ 0x920d5078U,
+ 0xcc9b6a5fU,
+ 0x4662547eU,
+ 0x13c2f68dU,
+ 0xb8e890d8U,
+ 0xf75e2e39U,
+ 0xaff582c3U,
+ 0x80be9f5dU,
+ 0x937c69d0U,
+ 0x2da96fd5U,
+ 0x12b3cf25U,
+ 0x993bc8acU,
+ 0x7da71018U,
+ 0x636ee89cU,
+ 0xbb7bdb3bU,
+ 0x7809cd26U,
+ 0x18f46e59U,
+ 0xb701ec9aU,
+ 0x9aa8834fU,
+ 0x6e65e695U,
+ 0xe67eaaffU,
+ 0xcf0821bcU,
+ 0xe8e6ef15U,
+ 0x9bd9bae7U,
+ 0x36ce4a6fU,
+ 0x09d4ea9fU,
+ 0x7cd629b0U,
+ 0xb2af31a4U,
+ 0x23312a3fU,
+ 0x9430c6a5U,
+ 0x66c035a2U,
+ 0xbc37744eU,
+ 0xcaa6fc82U,
+ 0xd0b0e090U,
+ 0xd81533a7U,
+ 0x984af104U,
+ 0xdaf741ecU,
+ 0x500e7fcdU,
+ 0xf62f1791U,
+ 0xd68d764dU,
+ 0xb04d43efU,
+ 0x4d54ccaaU,
+ 0x04dfe496U,
+ 0xb5e39ed1U,
+ 0x881b4c6aU,
+ 0x1fb8c12cU,
+ 0x517f4665U,
+ 0xea049d5eU,
+ 0x355d018cU,
+ 0x7473fa87U,
+ 0x412efb0bU,
+ 0x1d5ab367U,
+ 0xd25292dbU,
+ 0x5633e910U,
+ 0x47136dd6U,
+ 0x618c9ad7U,
+ 0x0c7a37a1U,
+ 0x148e59f8U,
+ 0x3c89eb13U,
+ 0x27eecea9U,
+ 0xc935b761U,
+ 0xe5ede11cU,
+ 0xb13c7a47U,
+ 0xdf599cd2U,
+ 0x733f55f2U,
+ 0xce791814U,
+ 0x37bf73c7U,
+ 0xcdea53f7U,
+ 0xaa5b5ffdU,
+ 0x6f14df3dU,
+ 0xdb867844U,
+ 0xf381caafU,
+ 0xc43eb968U,
+ 0x342c3824U,
+ 0x405fc2a3U,
+ 0xc372161dU,
+ 0x250cbce2U,
+ 0x498b283cU,
+ 0x9541ff0dU,
+ 0x017139a8U,
+ 0xb3de080cU,
+ 0xe49cd8b4U,
+ 0xc1906456U,
+ 0x84617bcbU,
+ 0xb670d532U,
+ 0x5c74486cU,
+ 0x5742d0b8U,
};
static const u32 Td3[256] = {
- 0xf4a75051U, 0x4165537eU, 0x17a4c31aU, 0x275e963aU,
- 0xab6bcb3bU, 0x9d45f11fU, 0xfa58abacU, 0xe303934bU,
- 0x30fa5520U, 0x766df6adU, 0xcc769188U, 0x024c25f5U,
- 0xe5d7fc4fU, 0x2acbd7c5U, 0x35448026U, 0x62a38fb5U,
- 0xb15a49deU, 0xba1b6725U, 0xea0e9845U, 0xfec0e15dU,
- 0x2f7502c3U, 0x4cf01281U, 0x4697a38dU, 0xd3f9c66bU,
- 0x8f5fe703U, 0x929c9515U, 0x6d7aebbfU, 0x5259da95U,
- 0xbe832dd4U, 0x7421d358U, 0xe0692949U, 0xc9c8448eU,
- 0xc2896a75U, 0x8e7978f4U, 0x583e6b99U, 0xb971dd27U,
- 0xe14fb6beU, 0x88ad17f0U, 0x20ac66c9U, 0xce3ab47dU,
- 0xdf4a1863U, 0x1a3182e5U, 0x51336097U, 0x537f4562U,
- 0x6477e0b1U, 0x6bae84bbU, 0x81a01cfeU, 0x082b94f9U,
- 0x48685870U, 0x45fd198fU, 0xde6c8794U, 0x7bf8b752U,
- 0x73d323abU, 0x4b02e272U, 0x1f8f57e3U, 0x55ab2a66U,
- 0xeb2807b2U, 0xb5c2032fU, 0xc57b9a86U, 0x3708a5d3U,
- 0x2887f230U, 0xbfa5b223U, 0x036aba02U, 0x16825cedU,
- 0xcf1c2b8aU, 0x79b492a7U, 0x07f2f0f3U, 0x69e2a14eU,
- 0xdaf4cd65U, 0x05bed506U, 0x34621fd1U, 0xa6fe8ac4U,
- 0x2e539d34U, 0xf355a0a2U, 0x8ae13205U, 0xf6eb75a4U,
- 0x83ec390bU, 0x60efaa40U, 0x719f065eU, 0x6e1051bdU,
- 0x218af93eU, 0xdd063d96U, 0x3e05aeddU, 0xe6bd464dU,
- 0x548db591U, 0xc45d0571U, 0x06d46f04U, 0x5015ff60U,
- 0x98fb2419U, 0xbde997d6U, 0x4043cc89U, 0xd99e7767U,
- 0xe842bdb0U, 0x898b8807U, 0x195b38e7U, 0xc8eedb79U,
- 0x7c0a47a1U, 0x420fe97cU, 0x841ec9f8U, 0x00000000U,
- 0x80868309U, 0x2bed4832U, 0x1170ac1eU, 0x5a724e6cU,
- 0x0efffbfdU, 0x8538560fU, 0xaed51e3dU, 0x2d392736U,
- 0x0fd9640aU, 0x5ca62168U, 0x5b54d19bU, 0x362e3a24U,
- 0x0a67b10cU, 0x57e70f93U, 0xee96d2b4U, 0x9b919e1bU,
- 0xc0c54f80U, 0xdc20a261U, 0x774b695aU, 0x121a161cU,
- 0x93ba0ae2U, 0xa02ae5c0U, 0x22e0433cU, 0x1b171d12U,
- 0x090d0b0eU, 0x8bc7adf2U, 0xb6a8b92dU, 0x1ea9c814U,
- 0xf1198557U, 0x75074cafU, 0x99ddbbeeU, 0x7f60fda3U,
- 0x01269ff7U, 0x72f5bc5cU, 0x663bc544U, 0xfb7e345bU,
- 0x4329768bU, 0x23c6dccbU, 0xedfc68b6U, 0xe4f163b8U,
- 0x31dccad7U, 0x63851042U, 0x97224013U, 0xc6112084U,
- 0x4a247d85U, 0xbb3df8d2U, 0xf93211aeU, 0x29a16dc7U,
- 0x9e2f4b1dU, 0xb230f3dcU, 0x8652ec0dU, 0xc1e3d077U,
- 0xb3166c2bU, 0x70b999a9U, 0x9448fa11U, 0xe9642247U,
- 0xfc8cc4a8U, 0xf03f1aa0U, 0x7d2cd856U, 0x3390ef22U,
- 0x494ec787U, 0x38d1c1d9U, 0xcaa2fe8cU, 0xd40b3698U,
- 0xf581cfa6U, 0x7ade28a5U, 0xb78e26daU, 0xadbfa43fU,
- 0x3a9de42cU, 0x78920d50U, 0x5fcc9b6aU, 0x7e466254U,
- 0x8d13c2f6U, 0xd8b8e890U, 0x39f75e2eU, 0xc3aff582U,
- 0x5d80be9fU, 0xd0937c69U, 0xd52da96fU, 0x2512b3cfU,
- 0xac993bc8U, 0x187da710U, 0x9c636ee8U, 0x3bbb7bdbU,
- 0x267809cdU, 0x5918f46eU, 0x9ab701ecU, 0x4f9aa883U,
- 0x956e65e6U, 0xffe67eaaU, 0xbccf0821U, 0x15e8e6efU,
- 0xe79bd9baU, 0x6f36ce4aU, 0x9f09d4eaU, 0xb07cd629U,
- 0xa4b2af31U, 0x3f23312aU, 0xa59430c6U, 0xa266c035U,
- 0x4ebc3774U, 0x82caa6fcU, 0x90d0b0e0U, 0xa7d81533U,
- 0x04984af1U, 0xecdaf741U, 0xcd500e7fU, 0x91f62f17U,
- 0x4dd68d76U, 0xefb04d43U, 0xaa4d54ccU, 0x9604dfe4U,
- 0xd1b5e39eU, 0x6a881b4cU, 0x2c1fb8c1U, 0x65517f46U,
- 0x5eea049dU, 0x8c355d01U, 0x877473faU, 0x0b412efbU,
- 0x671d5ab3U, 0xdbd25292U, 0x105633e9U, 0xd647136dU,
- 0xd7618c9aU, 0xa10c7a37U, 0xf8148e59U, 0x133c89ebU,
- 0xa927eeceU, 0x61c935b7U, 0x1ce5ede1U, 0x47b13c7aU,
- 0xd2df599cU, 0xf2733f55U, 0x14ce7918U, 0xc737bf73U,
- 0xf7cdea53U, 0xfdaa5b5fU, 0x3d6f14dfU, 0x44db8678U,
- 0xaff381caU, 0x68c43eb9U, 0x24342c38U, 0xa3405fc2U,
- 0x1dc37216U, 0xe2250cbcU, 0x3c498b28U, 0x0d9541ffU,
- 0xa8017139U, 0x0cb3de08U, 0xb4e49cd8U, 0x56c19064U,
- 0xcb84617bU, 0x32b670d5U, 0x6c5c7448U, 0xb85742d0U,
+ 0xf4a75051U,
+ 0x4165537eU,
+ 0x17a4c31aU,
+ 0x275e963aU,
+ 0xab6bcb3bU,
+ 0x9d45f11fU,
+ 0xfa58abacU,
+ 0xe303934bU,
+ 0x30fa5520U,
+ 0x766df6adU,
+ 0xcc769188U,
+ 0x024c25f5U,
+ 0xe5d7fc4fU,
+ 0x2acbd7c5U,
+ 0x35448026U,
+ 0x62a38fb5U,
+ 0xb15a49deU,
+ 0xba1b6725U,
+ 0xea0e9845U,
+ 0xfec0e15dU,
+ 0x2f7502c3U,
+ 0x4cf01281U,
+ 0x4697a38dU,
+ 0xd3f9c66bU,
+ 0x8f5fe703U,
+ 0x929c9515U,
+ 0x6d7aebbfU,
+ 0x5259da95U,
+ 0xbe832dd4U,
+ 0x7421d358U,
+ 0xe0692949U,
+ 0xc9c8448eU,
+ 0xc2896a75U,
+ 0x8e7978f4U,
+ 0x583e6b99U,
+ 0xb971dd27U,
+ 0xe14fb6beU,
+ 0x88ad17f0U,
+ 0x20ac66c9U,
+ 0xce3ab47dU,
+ 0xdf4a1863U,
+ 0x1a3182e5U,
+ 0x51336097U,
+ 0x537f4562U,
+ 0x6477e0b1U,
+ 0x6bae84bbU,
+ 0x81a01cfeU,
+ 0x082b94f9U,
+ 0x48685870U,
+ 0x45fd198fU,
+ 0xde6c8794U,
+ 0x7bf8b752U,
+ 0x73d323abU,
+ 0x4b02e272U,
+ 0x1f8f57e3U,
+ 0x55ab2a66U,
+ 0xeb2807b2U,
+ 0xb5c2032fU,
+ 0xc57b9a86U,
+ 0x3708a5d3U,
+ 0x2887f230U,
+ 0xbfa5b223U,
+ 0x036aba02U,
+ 0x16825cedU,
+ 0xcf1c2b8aU,
+ 0x79b492a7U,
+ 0x07f2f0f3U,
+ 0x69e2a14eU,
+ 0xdaf4cd65U,
+ 0x05bed506U,
+ 0x34621fd1U,
+ 0xa6fe8ac4U,
+ 0x2e539d34U,
+ 0xf355a0a2U,
+ 0x8ae13205U,
+ 0xf6eb75a4U,
+ 0x83ec390bU,
+ 0x60efaa40U,
+ 0x719f065eU,
+ 0x6e1051bdU,
+ 0x218af93eU,
+ 0xdd063d96U,
+ 0x3e05aeddU,
+ 0xe6bd464dU,
+ 0x548db591U,
+ 0xc45d0571U,
+ 0x06d46f04U,
+ 0x5015ff60U,
+ 0x98fb2419U,
+ 0xbde997d6U,
+ 0x4043cc89U,
+ 0xd99e7767U,
+ 0xe842bdb0U,
+ 0x898b8807U,
+ 0x195b38e7U,
+ 0xc8eedb79U,
+ 0x7c0a47a1U,
+ 0x420fe97cU,
+ 0x841ec9f8U,
+ 0x00000000U,
+ 0x80868309U,
+ 0x2bed4832U,
+ 0x1170ac1eU,
+ 0x5a724e6cU,
+ 0x0efffbfdU,
+ 0x8538560fU,
+ 0xaed51e3dU,
+ 0x2d392736U,
+ 0x0fd9640aU,
+ 0x5ca62168U,
+ 0x5b54d19bU,
+ 0x362e3a24U,
+ 0x0a67b10cU,
+ 0x57e70f93U,
+ 0xee96d2b4U,
+ 0x9b919e1bU,
+ 0xc0c54f80U,
+ 0xdc20a261U,
+ 0x774b695aU,
+ 0x121a161cU,
+ 0x93ba0ae2U,
+ 0xa02ae5c0U,
+ 0x22e0433cU,
+ 0x1b171d12U,
+ 0x090d0b0eU,
+ 0x8bc7adf2U,
+ 0xb6a8b92dU,
+ 0x1ea9c814U,
+ 0xf1198557U,
+ 0x75074cafU,
+ 0x99ddbbeeU,
+ 0x7f60fda3U,
+ 0x01269ff7U,
+ 0x72f5bc5cU,
+ 0x663bc544U,
+ 0xfb7e345bU,
+ 0x4329768bU,
+ 0x23c6dccbU,
+ 0xedfc68b6U,
+ 0xe4f163b8U,
+ 0x31dccad7U,
+ 0x63851042U,
+ 0x97224013U,
+ 0xc6112084U,
+ 0x4a247d85U,
+ 0xbb3df8d2U,
+ 0xf93211aeU,
+ 0x29a16dc7U,
+ 0x9e2f4b1dU,
+ 0xb230f3dcU,
+ 0x8652ec0dU,
+ 0xc1e3d077U,
+ 0xb3166c2bU,
+ 0x70b999a9U,
+ 0x9448fa11U,
+ 0xe9642247U,
+ 0xfc8cc4a8U,
+ 0xf03f1aa0U,
+ 0x7d2cd856U,
+ 0x3390ef22U,
+ 0x494ec787U,
+ 0x38d1c1d9U,
+ 0xcaa2fe8cU,
+ 0xd40b3698U,
+ 0xf581cfa6U,
+ 0x7ade28a5U,
+ 0xb78e26daU,
+ 0xadbfa43fU,
+ 0x3a9de42cU,
+ 0x78920d50U,
+ 0x5fcc9b6aU,
+ 0x7e466254U,
+ 0x8d13c2f6U,
+ 0xd8b8e890U,
+ 0x39f75e2eU,
+ 0xc3aff582U,
+ 0x5d80be9fU,
+ 0xd0937c69U,
+ 0xd52da96fU,
+ 0x2512b3cfU,
+ 0xac993bc8U,
+ 0x187da710U,
+ 0x9c636ee8U,
+ 0x3bbb7bdbU,
+ 0x267809cdU,
+ 0x5918f46eU,
+ 0x9ab701ecU,
+ 0x4f9aa883U,
+ 0x956e65e6U,
+ 0xffe67eaaU,
+ 0xbccf0821U,
+ 0x15e8e6efU,
+ 0xe79bd9baU,
+ 0x6f36ce4aU,
+ 0x9f09d4eaU,
+ 0xb07cd629U,
+ 0xa4b2af31U,
+ 0x3f23312aU,
+ 0xa59430c6U,
+ 0xa266c035U,
+ 0x4ebc3774U,
+ 0x82caa6fcU,
+ 0x90d0b0e0U,
+ 0xa7d81533U,
+ 0x04984af1U,
+ 0xecdaf741U,
+ 0xcd500e7fU,
+ 0x91f62f17U,
+ 0x4dd68d76U,
+ 0xefb04d43U,
+ 0xaa4d54ccU,
+ 0x9604dfe4U,
+ 0xd1b5e39eU,
+ 0x6a881b4cU,
+ 0x2c1fb8c1U,
+ 0x65517f46U,
+ 0x5eea049dU,
+ 0x8c355d01U,
+ 0x877473faU,
+ 0x0b412efbU,
+ 0x671d5ab3U,
+ 0xdbd25292U,
+ 0x105633e9U,
+ 0xd647136dU,
+ 0xd7618c9aU,
+ 0xa10c7a37U,
+ 0xf8148e59U,
+ 0x133c89ebU,
+ 0xa927eeceU,
+ 0x61c935b7U,
+ 0x1ce5ede1U,
+ 0x47b13c7aU,
+ 0xd2df599cU,
+ 0xf2733f55U,
+ 0x14ce7918U,
+ 0xc737bf73U,
+ 0xf7cdea53U,
+ 0xfdaa5b5fU,
+ 0x3d6f14dfU,
+ 0x44db8678U,
+ 0xaff381caU,
+ 0x68c43eb9U,
+ 0x24342c38U,
+ 0xa3405fc2U,
+ 0x1dc37216U,
+ 0xe2250cbcU,
+ 0x3c498b28U,
+ 0x0d9541ffU,
+ 0xa8017139U,
+ 0x0cb3de08U,
+ 0xb4e49cd8U,
+ 0x56c19064U,
+ 0xcb84617bU,
+ 0x32b670d5U,
+ 0x6c5c7448U,
+ 0xb85742d0U,
};
static const u8 Td4[256] = {
- 0x52U, 0x09U, 0x6aU, 0xd5U, 0x30U, 0x36U, 0xa5U, 0x38U,
- 0xbfU, 0x40U, 0xa3U, 0x9eU, 0x81U, 0xf3U, 0xd7U, 0xfbU,
- 0x7cU, 0xe3U, 0x39U, 0x82U, 0x9bU, 0x2fU, 0xffU, 0x87U,
- 0x34U, 0x8eU, 0x43U, 0x44U, 0xc4U, 0xdeU, 0xe9U, 0xcbU,
- 0x54U, 0x7bU, 0x94U, 0x32U, 0xa6U, 0xc2U, 0x23U, 0x3dU,
- 0xeeU, 0x4cU, 0x95U, 0x0bU, 0x42U, 0xfaU, 0xc3U, 0x4eU,
- 0x08U, 0x2eU, 0xa1U, 0x66U, 0x28U, 0xd9U, 0x24U, 0xb2U,
- 0x76U, 0x5bU, 0xa2U, 0x49U, 0x6dU, 0x8bU, 0xd1U, 0x25U,
- 0x72U, 0xf8U, 0xf6U, 0x64U, 0x86U, 0x68U, 0x98U, 0x16U,
- 0xd4U, 0xa4U, 0x5cU, 0xccU, 0x5dU, 0x65U, 0xb6U, 0x92U,
- 0x6cU, 0x70U, 0x48U, 0x50U, 0xfdU, 0xedU, 0xb9U, 0xdaU,
- 0x5eU, 0x15U, 0x46U, 0x57U, 0xa7U, 0x8dU, 0x9dU, 0x84U,
- 0x90U, 0xd8U, 0xabU, 0x00U, 0x8cU, 0xbcU, 0xd3U, 0x0aU,
- 0xf7U, 0xe4U, 0x58U, 0x05U, 0xb8U, 0xb3U, 0x45U, 0x06U,
- 0xd0U, 0x2cU, 0x1eU, 0x8fU, 0xcaU, 0x3fU, 0x0fU, 0x02U,
- 0xc1U, 0xafU, 0xbdU, 0x03U, 0x01U, 0x13U, 0x8aU, 0x6bU,
- 0x3aU, 0x91U, 0x11U, 0x41U, 0x4fU, 0x67U, 0xdcU, 0xeaU,
- 0x97U, 0xf2U, 0xcfU, 0xceU, 0xf0U, 0xb4U, 0xe6U, 0x73U,
- 0x96U, 0xacU, 0x74U, 0x22U, 0xe7U, 0xadU, 0x35U, 0x85U,
- 0xe2U, 0xf9U, 0x37U, 0xe8U, 0x1cU, 0x75U, 0xdfU, 0x6eU,
- 0x47U, 0xf1U, 0x1aU, 0x71U, 0x1dU, 0x29U, 0xc5U, 0x89U,
- 0x6fU, 0xb7U, 0x62U, 0x0eU, 0xaaU, 0x18U, 0xbeU, 0x1bU,
- 0xfcU, 0x56U, 0x3eU, 0x4bU, 0xc6U, 0xd2U, 0x79U, 0x20U,
- 0x9aU, 0xdbU, 0xc0U, 0xfeU, 0x78U, 0xcdU, 0x5aU, 0xf4U,
- 0x1fU, 0xddU, 0xa8U, 0x33U, 0x88U, 0x07U, 0xc7U, 0x31U,
- 0xb1U, 0x12U, 0x10U, 0x59U, 0x27U, 0x80U, 0xecU, 0x5fU,
- 0x60U, 0x51U, 0x7fU, 0xa9U, 0x19U, 0xb5U, 0x4aU, 0x0dU,
- 0x2dU, 0xe5U, 0x7aU, 0x9fU, 0x93U, 0xc9U, 0x9cU, 0xefU,
- 0xa0U, 0xe0U, 0x3bU, 0x4dU, 0xaeU, 0x2aU, 0xf5U, 0xb0U,
- 0xc8U, 0xebU, 0xbbU, 0x3cU, 0x83U, 0x53U, 0x99U, 0x61U,
- 0x17U, 0x2bU, 0x04U, 0x7eU, 0xbaU, 0x77U, 0xd6U, 0x26U,
- 0xe1U, 0x69U, 0x14U, 0x63U, 0x55U, 0x21U, 0x0cU, 0x7dU,
+ 0x52U,
+ 0x09U,
+ 0x6aU,
+ 0xd5U,
+ 0x30U,
+ 0x36U,
+ 0xa5U,
+ 0x38U,
+ 0xbfU,
+ 0x40U,
+ 0xa3U,
+ 0x9eU,
+ 0x81U,
+ 0xf3U,
+ 0xd7U,
+ 0xfbU,
+ 0x7cU,
+ 0xe3U,
+ 0x39U,
+ 0x82U,
+ 0x9bU,
+ 0x2fU,
+ 0xffU,
+ 0x87U,
+ 0x34U,
+ 0x8eU,
+ 0x43U,
+ 0x44U,
+ 0xc4U,
+ 0xdeU,
+ 0xe9U,
+ 0xcbU,
+ 0x54U,
+ 0x7bU,
+ 0x94U,
+ 0x32U,
+ 0xa6U,
+ 0xc2U,
+ 0x23U,
+ 0x3dU,
+ 0xeeU,
+ 0x4cU,
+ 0x95U,
+ 0x0bU,
+ 0x42U,
+ 0xfaU,
+ 0xc3U,
+ 0x4eU,
+ 0x08U,
+ 0x2eU,
+ 0xa1U,
+ 0x66U,
+ 0x28U,
+ 0xd9U,
+ 0x24U,
+ 0xb2U,
+ 0x76U,
+ 0x5bU,
+ 0xa2U,
+ 0x49U,
+ 0x6dU,
+ 0x8bU,
+ 0xd1U,
+ 0x25U,
+ 0x72U,
+ 0xf8U,
+ 0xf6U,
+ 0x64U,
+ 0x86U,
+ 0x68U,
+ 0x98U,
+ 0x16U,
+ 0xd4U,
+ 0xa4U,
+ 0x5cU,
+ 0xccU,
+ 0x5dU,
+ 0x65U,
+ 0xb6U,
+ 0x92U,
+ 0x6cU,
+ 0x70U,
+ 0x48U,
+ 0x50U,
+ 0xfdU,
+ 0xedU,
+ 0xb9U,
+ 0xdaU,
+ 0x5eU,
+ 0x15U,
+ 0x46U,
+ 0x57U,
+ 0xa7U,
+ 0x8dU,
+ 0x9dU,
+ 0x84U,
+ 0x90U,
+ 0xd8U,
+ 0xabU,
+ 0x00U,
+ 0x8cU,
+ 0xbcU,
+ 0xd3U,
+ 0x0aU,
+ 0xf7U,
+ 0xe4U,
+ 0x58U,
+ 0x05U,
+ 0xb8U,
+ 0xb3U,
+ 0x45U,
+ 0x06U,
+ 0xd0U,
+ 0x2cU,
+ 0x1eU,
+ 0x8fU,
+ 0xcaU,
+ 0x3fU,
+ 0x0fU,
+ 0x02U,
+ 0xc1U,
+ 0xafU,
+ 0xbdU,
+ 0x03U,
+ 0x01U,
+ 0x13U,
+ 0x8aU,
+ 0x6bU,
+ 0x3aU,
+ 0x91U,
+ 0x11U,
+ 0x41U,
+ 0x4fU,
+ 0x67U,
+ 0xdcU,
+ 0xeaU,
+ 0x97U,
+ 0xf2U,
+ 0xcfU,
+ 0xceU,
+ 0xf0U,
+ 0xb4U,
+ 0xe6U,
+ 0x73U,
+ 0x96U,
+ 0xacU,
+ 0x74U,
+ 0x22U,
+ 0xe7U,
+ 0xadU,
+ 0x35U,
+ 0x85U,
+ 0xe2U,
+ 0xf9U,
+ 0x37U,
+ 0xe8U,
+ 0x1cU,
+ 0x75U,
+ 0xdfU,
+ 0x6eU,
+ 0x47U,
+ 0xf1U,
+ 0x1aU,
+ 0x71U,
+ 0x1dU,
+ 0x29U,
+ 0xc5U,
+ 0x89U,
+ 0x6fU,
+ 0xb7U,
+ 0x62U,
+ 0x0eU,
+ 0xaaU,
+ 0x18U,
+ 0xbeU,
+ 0x1bU,
+ 0xfcU,
+ 0x56U,
+ 0x3eU,
+ 0x4bU,
+ 0xc6U,
+ 0xd2U,
+ 0x79U,
+ 0x20U,
+ 0x9aU,
+ 0xdbU,
+ 0xc0U,
+ 0xfeU,
+ 0x78U,
+ 0xcdU,
+ 0x5aU,
+ 0xf4U,
+ 0x1fU,
+ 0xddU,
+ 0xa8U,
+ 0x33U,
+ 0x88U,
+ 0x07U,
+ 0xc7U,
+ 0x31U,
+ 0xb1U,
+ 0x12U,
+ 0x10U,
+ 0x59U,
+ 0x27U,
+ 0x80U,
+ 0xecU,
+ 0x5fU,
+ 0x60U,
+ 0x51U,
+ 0x7fU,
+ 0xa9U,
+ 0x19U,
+ 0xb5U,
+ 0x4aU,
+ 0x0dU,
+ 0x2dU,
+ 0xe5U,
+ 0x7aU,
+ 0x9fU,
+ 0x93U,
+ 0xc9U,
+ 0x9cU,
+ 0xefU,
+ 0xa0U,
+ 0xe0U,
+ 0x3bU,
+ 0x4dU,
+ 0xaeU,
+ 0x2aU,
+ 0xf5U,
+ 0xb0U,
+ 0xc8U,
+ 0xebU,
+ 0xbbU,
+ 0x3cU,
+ 0x83U,
+ 0x53U,
+ 0x99U,
+ 0x61U,
+ 0x17U,
+ 0x2bU,
+ 0x04U,
+ 0x7eU,
+ 0xbaU,
+ 0x77U,
+ 0xd6U,
+ 0x26U,
+ 0xe1U,
+ 0x69U,
+ 0x14U,
+ 0x63U,
+ 0x55U,
+ 0x21U,
+ 0x0cU,
+ 0x7dU,
};
static const u32 rcon[] = {
- 0x01000000, 0x02000000, 0x04000000, 0x08000000,
- 0x10000000, 0x20000000, 0x40000000, 0x80000000,
- 0x1B000000, 0x36000000, /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */
+ 0x01000000,
+ 0x02000000,
+ 0x04000000,
+ 0x08000000,
+ 0x10000000,
+ 0x20000000,
+ 0x40000000,
+ 0x80000000,
+ 0x1B000000,
+ 0x36000000, /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */
};
/**
* Expand the cipher key into the encryption key schedule.
*/
int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
- AES_KEY *key)
+ AES_KEY *key)
{
u32 *rk;
@@ -1297,19 +3064,14 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
else
key->rounds = 14;
- rk[0] = GETU32(userKey );
- rk[1] = GETU32(userKey + 4);
- rk[2] = GETU32(userKey + 8);
+ rk[0] = GETU32(userKey);
+ rk[1] = GETU32(userKey + 4);
+ rk[2] = GETU32(userKey + 8);
rk[3] = GETU32(userKey + 12);
if (bits == 128) {
while (1) {
- temp = rk[3];
- rk[4] = rk[0] ^
- (Te2[(temp >> 16) & 0xff] & 0xff000000) ^
- (Te3[(temp >> 8) & 0xff] & 0x00ff0000) ^
- (Te0[(temp ) & 0xff] & 0x0000ff00) ^
- (Te1[(temp >> 24) ] & 0x000000ff) ^
- rcon[i];
+ temp = rk[3];
+ rk[4] = rk[0] ^ (Te2[(temp >> 16) & 0xff] & 0xff000000) ^ (Te3[(temp >> 8) & 0xff] & 0x00ff0000) ^ (Te0[(temp) & 0xff] & 0x0000ff00) ^ (Te1[(temp >> 24)] & 0x000000ff) ^ rcon[i];
rk[5] = rk[1] ^ rk[4];
rk[6] = rk[2] ^ rk[5];
rk[7] = rk[3] ^ rk[6];
@@ -1323,21 +3085,16 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
rk[5] = GETU32(userKey + 20);
if (bits == 192) {
while (1) {
- temp = rk[ 5];
- rk[ 6] = rk[ 0] ^
- (Te2[(temp >> 16) & 0xff] & 0xff000000) ^
- (Te3[(temp >> 8) & 0xff] & 0x00ff0000) ^
- (Te0[(temp ) & 0xff] & 0x0000ff00) ^
- (Te1[(temp >> 24) ] & 0x000000ff) ^
- rcon[i];
- rk[ 7] = rk[ 1] ^ rk[ 6];
- rk[ 8] = rk[ 2] ^ rk[ 7];
- rk[ 9] = rk[ 3] ^ rk[ 8];
+ temp = rk[5];
+ rk[6] = rk[0] ^ (Te2[(temp >> 16) & 0xff] & 0xff000000) ^ (Te3[(temp >> 8) & 0xff] & 0x00ff0000) ^ (Te0[(temp) & 0xff] & 0x0000ff00) ^ (Te1[(temp >> 24)] & 0x000000ff) ^ rcon[i];
+ rk[7] = rk[1] ^ rk[6];
+ rk[8] = rk[2] ^ rk[7];
+ rk[9] = rk[3] ^ rk[8];
if (++i == 8) {
return 0;
}
- rk[10] = rk[ 4] ^ rk[ 9];
- rk[11] = rk[ 5] ^ rk[10];
+ rk[10] = rk[4] ^ rk[9];
+ rk[11] = rk[5] ^ rk[10];
rk += 6;
}
}
@@ -1345,31 +3102,22 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
rk[7] = GETU32(userKey + 28);
if (bits == 256) {
while (1) {
- temp = rk[ 7];
- rk[ 8] = rk[ 0] ^
- (Te2[(temp >> 16) & 0xff] & 0xff000000) ^
- (Te3[(temp >> 8) & 0xff] & 0x00ff0000) ^
- (Te0[(temp ) & 0xff] & 0x0000ff00) ^
- (Te1[(temp >> 24) ] & 0x000000ff) ^
- rcon[i];
- rk[ 9] = rk[ 1] ^ rk[ 8];
- rk[10] = rk[ 2] ^ rk[ 9];
- rk[11] = rk[ 3] ^ rk[10];
+ temp = rk[7];
+ rk[8] = rk[0] ^ (Te2[(temp >> 16) & 0xff] & 0xff000000) ^ (Te3[(temp >> 8) & 0xff] & 0x00ff0000) ^ (Te0[(temp) & 0xff] & 0x0000ff00) ^ (Te1[(temp >> 24)] & 0x000000ff) ^ rcon[i];
+ rk[9] = rk[1] ^ rk[8];
+ rk[10] = rk[2] ^ rk[9];
+ rk[11] = rk[3] ^ rk[10];
if (++i == 7) {
return 0;
}
temp = rk[11];
- rk[12] = rk[ 4] ^
- (Te2[(temp >> 24) ] & 0xff000000) ^
- (Te3[(temp >> 16) & 0xff] & 0x00ff0000) ^
- (Te0[(temp >> 8) & 0xff] & 0x0000ff00) ^
- (Te1[(temp ) & 0xff] & 0x000000ff);
- rk[13] = rk[ 5] ^ rk[12];
- rk[14] = rk[ 6] ^ rk[13];
- rk[15] = rk[ 7] ^ rk[14];
+ rk[12] = rk[4] ^ (Te2[(temp >> 24)] & 0xff000000) ^ (Te3[(temp >> 16) & 0xff] & 0x00ff0000) ^ (Te0[(temp >> 8) & 0xff] & 0x0000ff00) ^ (Te1[(temp) & 0xff] & 0x000000ff);
+ rk[13] = rk[5] ^ rk[12];
+ rk[14] = rk[6] ^ rk[13];
+ rk[15] = rk[7] ^ rk[14];
rk += 8;
- }
+ }
}
return 0;
}
@@ -1378,7 +3126,7 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
* Expand the cipher key into the decryption key schedule.
*/
int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
- AES_KEY *key)
+ AES_KEY *key)
{
u32 *rk;
@@ -1393,35 +3141,27 @@ int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
rk = key->rd_key;
/* invert the order of the round keys: */
- for (i = 0, j = 4*(key->rounds); i < j; i += 4, j -= 4) {
- temp = rk[i ]; rk[i ] = rk[j ]; rk[j ] = temp;
- temp = rk[i + 1]; rk[i + 1] = rk[j + 1]; rk[j + 1] = temp;
- temp = rk[i + 2]; rk[i + 2] = rk[j + 2]; rk[j + 2] = temp;
- temp = rk[i + 3]; rk[i + 3] = rk[j + 3]; rk[j + 3] = temp;
+ for (i = 0, j = 4 * (key->rounds); i < j; i += 4, j -= 4) {
+ temp = rk[i];
+ rk[i] = rk[j];
+ rk[j] = temp;
+ temp = rk[i + 1];
+ rk[i + 1] = rk[j + 1];
+ rk[j + 1] = temp;
+ temp = rk[i + 2];
+ rk[i + 2] = rk[j + 2];
+ rk[j + 2] = temp;
+ temp = rk[i + 3];
+ rk[i + 3] = rk[j + 3];
+ rk[j + 3] = temp;
}
/* apply the inverse MixColumn transform to all round keys but the first and the last: */
for (i = 1; i < (key->rounds); i++) {
rk += 4;
- rk[0] =
- Td0[Te1[(rk[0] >> 24) ] & 0xff] ^
- Td1[Te1[(rk[0] >> 16) & 0xff] & 0xff] ^
- Td2[Te1[(rk[0] >> 8) & 0xff] & 0xff] ^
- Td3[Te1[(rk[0] ) & 0xff] & 0xff];
- rk[1] =
- Td0[Te1[(rk[1] >> 24) ] & 0xff] ^
- Td1[Te1[(rk[1] >> 16) & 0xff] & 0xff] ^
- Td2[Te1[(rk[1] >> 8) & 0xff] & 0xff] ^
- Td3[Te1[(rk[1] ) & 0xff] & 0xff];
- rk[2] =
- Td0[Te1[(rk[2] >> 24) ] & 0xff] ^
- Td1[Te1[(rk[2] >> 16) & 0xff] & 0xff] ^
- Td2[Te1[(rk[2] >> 8) & 0xff] & 0xff] ^
- Td3[Te1[(rk[2] ) & 0xff] & 0xff];
- rk[3] =
- Td0[Te1[(rk[3] >> 24) ] & 0xff] ^
- Td1[Te1[(rk[3] >> 16) & 0xff] & 0xff] ^
- Td2[Te1[(rk[3] >> 8) & 0xff] & 0xff] ^
- Td3[Te1[(rk[3] ) & 0xff] & 0xff];
+ rk[0] = Td0[Te1[(rk[0] >> 24)] & 0xff] ^ Td1[Te1[(rk[0] >> 16) & 0xff] & 0xff] ^ Td2[Te1[(rk[0] >> 8) & 0xff] & 0xff] ^ Td3[Te1[(rk[0]) & 0xff] & 0xff];
+ rk[1] = Td0[Te1[(rk[1] >> 24)] & 0xff] ^ Td1[Te1[(rk[1] >> 16) & 0xff] & 0xff] ^ Td2[Te1[(rk[1] >> 8) & 0xff] & 0xff] ^ Td3[Te1[(rk[1]) & 0xff] & 0xff];
+ rk[2] = Td0[Te1[(rk[2] >> 24)] & 0xff] ^ Td1[Te1[(rk[2] >> 16) & 0xff] & 0xff] ^ Td2[Te1[(rk[2] >> 8) & 0xff] & 0xff] ^ Td3[Te1[(rk[2]) & 0xff] & 0xff];
+ rk[3] = Td0[Te1[(rk[3] >> 24)] & 0xff] ^ Td1[Te1[(rk[3] >> 16) & 0xff] & 0xff] ^ Td2[Te1[(rk[3] >> 8) & 0xff] & 0xff] ^ Td3[Te1[(rk[3]) & 0xff] & 0xff];
}
return 0;
}
@@ -1431,7 +3171,8 @@ int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
* in and out can overlap
*/
void AES_encrypt(const unsigned char *in, unsigned char *out,
- const AES_KEY *key) {
+ const AES_KEY *key)
+{
const u32 *rk;
u32 s0, s1, s2, s3, t0, t1, t2, t3;
@@ -1446,174 +3187,114 @@ void AES_encrypt(const unsigned char *in, unsigned char *out,
* map byte array block to cipher state
* and add initial round key:
*/
- s0 = GETU32(in ) ^ rk[0];
- s1 = GETU32(in + 4) ^ rk[1];
- s2 = GETU32(in + 8) ^ rk[2];
+ s0 = GETU32(in) ^ rk[0];
+ s1 = GETU32(in + 4) ^ rk[1];
+ s2 = GETU32(in + 8) ^ rk[2];
s3 = GETU32(in + 12) ^ rk[3];
#ifdef FULL_UNROLL
/* round 1: */
- t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[ 4];
- t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[ 5];
- t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[ 6];
- t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[ 7];
+ t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[4];
+ t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[5];
+ t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[6];
+ t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[7];
/* round 2: */
- s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[ 8];
- s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[ 9];
- s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[10];
- s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[11];
+ s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[8];
+ s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[9];
+ s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[10];
+ s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[11];
/* round 3: */
- t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[12];
- t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[13];
- t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[14];
- t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[15];
+ t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[12];
+ t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[13];
+ t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[14];
+ t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[15];
/* round 4: */
- s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[16];
- s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[17];
- s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[18];
- s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[19];
+ s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[16];
+ s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[17];
+ s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[18];
+ s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[19];
/* round 5: */
- t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[20];
- t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[21];
- t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[22];
- t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[23];
+ t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[20];
+ t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[21];
+ t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[22];
+ t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[23];
/* round 6: */
- s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[24];
- s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[25];
- s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[26];
- s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[27];
+ s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[24];
+ s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[25];
+ s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[26];
+ s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[27];
/* round 7: */
- t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[28];
- t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[29];
- t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[30];
- t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[31];
+ t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[28];
+ t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[29];
+ t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[30];
+ t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[31];
/* round 8: */
- s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[32];
- s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[33];
- s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[34];
- s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[35];
+ s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[32];
+ s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[33];
+ s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[34];
+ s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[35];
/* round 9: */
- t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[36];
- t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[37];
- t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[38];
- t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[39];
+ t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[36];
+ t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[37];
+ t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[38];
+ t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[39];
if (key->rounds > 10) {
/* round 10: */
- s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[40];
- s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[41];
- s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[42];
- s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[43];
+ s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[40];
+ s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[41];
+ s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[42];
+ s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[43];
/* round 11: */
- t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[44];
- t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[45];
- t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[46];
- t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[47];
+ t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[44];
+ t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[45];
+ t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[46];
+ t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[47];
if (key->rounds > 12) {
/* round 12: */
- s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[48];
- s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[49];
- s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[50];
- s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[51];
+ s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[48];
+ s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[49];
+ s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[50];
+ s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[51];
/* round 13: */
- t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[52];
- t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[53];
- t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[54];
- t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[55];
+ t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[52];
+ t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[53];
+ t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[54];
+ t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[55];
}
}
rk += key->rounds << 2;
-#else /* !FULL_UNROLL */
+#else /* !FULL_UNROLL */
/*
* Nr - 1 full rounds:
*/
r = key->rounds >> 1;
for (;;) {
- t0 =
- Te0[(s0 >> 24) ] ^
- Te1[(s1 >> 16) & 0xff] ^
- Te2[(s2 >> 8) & 0xff] ^
- Te3[(s3 ) & 0xff] ^
- rk[4];
- t1 =
- Te0[(s1 >> 24) ] ^
- Te1[(s2 >> 16) & 0xff] ^
- Te2[(s3 >> 8) & 0xff] ^
- Te3[(s0 ) & 0xff] ^
- rk[5];
- t2 =
- Te0[(s2 >> 24) ] ^
- Te1[(s3 >> 16) & 0xff] ^
- Te2[(s0 >> 8) & 0xff] ^
- Te3[(s1 ) & 0xff] ^
- rk[6];
- t3 =
- Te0[(s3 >> 24) ] ^
- Te1[(s0 >> 16) & 0xff] ^
- Te2[(s1 >> 8) & 0xff] ^
- Te3[(s2 ) & 0xff] ^
- rk[7];
+ t0 = Te0[(s0 >> 24)] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[(s3) & 0xff] ^ rk[4];
+ t1 = Te0[(s1 >> 24)] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[(s0) & 0xff] ^ rk[5];
+ t2 = Te0[(s2 >> 24)] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[(s1) & 0xff] ^ rk[6];
+ t3 = Te0[(s3 >> 24)] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[(s2) & 0xff] ^ rk[7];
rk += 8;
if (--r == 0) {
break;
}
- s0 =
- Te0[(t0 >> 24) ] ^
- Te1[(t1 >> 16) & 0xff] ^
- Te2[(t2 >> 8) & 0xff] ^
- Te3[(t3 ) & 0xff] ^
- rk[0];
- s1 =
- Te0[(t1 >> 24) ] ^
- Te1[(t2 >> 16) & 0xff] ^
- Te2[(t3 >> 8) & 0xff] ^
- Te3[(t0 ) & 0xff] ^
- rk[1];
- s2 =
- Te0[(t2 >> 24) ] ^
- Te1[(t3 >> 16) & 0xff] ^
- Te2[(t0 >> 8) & 0xff] ^
- Te3[(t1 ) & 0xff] ^
- rk[2];
- s3 =
- Te0[(t3 >> 24) ] ^
- Te1[(t0 >> 16) & 0xff] ^
- Te2[(t1 >> 8) & 0xff] ^
- Te3[(t2 ) & 0xff] ^
- rk[3];
+ s0 = Te0[(t0 >> 24)] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[(t3) & 0xff] ^ rk[0];
+ s1 = Te0[(t1 >> 24)] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[(t0) & 0xff] ^ rk[1];
+ s2 = Te0[(t2 >> 24)] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[(t1) & 0xff] ^ rk[2];
+ s3 = Te0[(t3 >> 24)] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[(t2) & 0xff] ^ rk[3];
}
#endif /* ?FULL_UNROLL */
/*
* apply last round and
* map cipher state to byte array block:
*/
- s0 =
- (Te2[(t0 >> 24) ] & 0xff000000) ^
- (Te3[(t1 >> 16) & 0xff] & 0x00ff0000) ^
- (Te0[(t2 >> 8) & 0xff] & 0x0000ff00) ^
- (Te1[(t3 ) & 0xff] & 0x000000ff) ^
- rk[0];
- PUTU32(out , s0);
- s1 =
- (Te2[(t1 >> 24) ] & 0xff000000) ^
- (Te3[(t2 >> 16) & 0xff] & 0x00ff0000) ^
- (Te0[(t3 >> 8) & 0xff] & 0x0000ff00) ^
- (Te1[(t0 ) & 0xff] & 0x000000ff) ^
- rk[1];
- PUTU32(out + 4, s1);
- s2 =
- (Te2[(t2 >> 24) ] & 0xff000000) ^
- (Te3[(t3 >> 16) & 0xff] & 0x00ff0000) ^
- (Te0[(t0 >> 8) & 0xff] & 0x0000ff00) ^
- (Te1[(t1 ) & 0xff] & 0x000000ff) ^
- rk[2];
- PUTU32(out + 8, s2);
- s3 =
- (Te2[(t3 >> 24) ] & 0xff000000) ^
- (Te3[(t0 >> 16) & 0xff] & 0x00ff0000) ^
- (Te0[(t1 >> 8) & 0xff] & 0x0000ff00) ^
- (Te1[(t2 ) & 0xff] & 0x000000ff) ^
- rk[3];
+ s0 = (Te2[(t0 >> 24)] & 0xff000000) ^ (Te3[(t1 >> 16) & 0xff] & 0x00ff0000) ^ (Te0[(t2 >> 8) & 0xff] & 0x0000ff00) ^ (Te1[(t3) & 0xff] & 0x000000ff) ^ rk[0];
+ PUTU32(out, s0);
+ s1 = (Te2[(t1 >> 24)] & 0xff000000) ^ (Te3[(t2 >> 16) & 0xff] & 0x00ff0000) ^ (Te0[(t3 >> 8) & 0xff] & 0x0000ff00) ^ (Te1[(t0) & 0xff] & 0x000000ff) ^ rk[1];
+ PUTU32(out + 4, s1);
+ s2 = (Te2[(t2 >> 24)] & 0xff000000) ^ (Te3[(t3 >> 16) & 0xff] & 0x00ff0000) ^ (Te0[(t0 >> 8) & 0xff] & 0x0000ff00) ^ (Te1[(t1) & 0xff] & 0x000000ff) ^ rk[2];
+ PUTU32(out + 8, s2);
+ s3 = (Te2[(t3 >> 24)] & 0xff000000) ^ (Te3[(t0 >> 16) & 0xff] & 0x00ff0000) ^ (Te0[(t1 >> 8) & 0xff] & 0x0000ff00) ^ (Te1[(t2) & 0xff] & 0x000000ff) ^ rk[3];
PUTU32(out + 12, s3);
}
@@ -1622,7 +3303,7 @@ void AES_encrypt(const unsigned char *in, unsigned char *out,
* in and out can overlap
*/
void AES_decrypt(const unsigned char *in, unsigned char *out,
- const AES_KEY *key)
+ const AES_KEY *key)
{
const u32 *rk;
@@ -1638,174 +3319,114 @@ void AES_decrypt(const unsigned char *in, unsigned char *out,
* map byte array block to cipher state
* and add initial round key:
*/
- s0 = GETU32(in ) ^ rk[0];
- s1 = GETU32(in + 4) ^ rk[1];
- s2 = GETU32(in + 8) ^ rk[2];
+ s0 = GETU32(in) ^ rk[0];
+ s1 = GETU32(in + 4) ^ rk[1];
+ s2 = GETU32(in + 8) ^ rk[2];
s3 = GETU32(in + 12) ^ rk[3];
#ifdef FULL_UNROLL
/* round 1: */
- t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[ 4];
- t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[ 5];
- t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[ 6];
- t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[ 7];
+ t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[4];
+ t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[5];
+ t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[6];
+ t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[7];
/* round 2: */
- s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[ 8];
- s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[ 9];
- s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[10];
- s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[11];
+ s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[8];
+ s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[9];
+ s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[10];
+ s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[11];
/* round 3: */
- t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[12];
- t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[13];
- t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[14];
- t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[15];
+ t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[12];
+ t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[13];
+ t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[14];
+ t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[15];
/* round 4: */
- s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[16];
- s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[17];
- s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[18];
- s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[19];
+ s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[16];
+ s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[17];
+ s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[18];
+ s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[19];
/* round 5: */
- t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[20];
- t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[21];
- t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[22];
- t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[23];
+ t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[20];
+ t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[21];
+ t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[22];
+ t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[23];
/* round 6: */
- s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[24];
- s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[25];
- s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[26];
- s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[27];
+ s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[24];
+ s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[25];
+ s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[26];
+ s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[27];
/* round 7: */
- t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[28];
- t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[29];
- t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[30];
- t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[31];
+ t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[28];
+ t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[29];
+ t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[30];
+ t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[31];
/* round 8: */
- s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[32];
- s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[33];
- s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[34];
- s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[35];
+ s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[32];
+ s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[33];
+ s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[34];
+ s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[35];
/* round 9: */
- t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[36];
- t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[37];
- t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[38];
- t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[39];
+ t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[36];
+ t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[37];
+ t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[38];
+ t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[39];
if (key->rounds > 10) {
/* round 10: */
- s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[40];
- s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[41];
- s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[42];
- s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[43];
+ s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[40];
+ s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[41];
+ s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[42];
+ s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[43];
/* round 11: */
- t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[44];
- t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[45];
- t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[46];
- t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[47];
+ t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[44];
+ t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[45];
+ t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[46];
+ t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[47];
if (key->rounds > 12) {
/* round 12: */
- s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[48];
- s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[49];
- s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[50];
- s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[51];
+ s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[48];
+ s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[49];
+ s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[50];
+ s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[51];
/* round 13: */
- t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[52];
- t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[53];
- t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[54];
- t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[55];
+ t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[52];
+ t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[53];
+ t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[54];
+ t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[55];
}
}
rk += key->rounds << 2;
-#else /* !FULL_UNROLL */
+#else /* !FULL_UNROLL */
/*
* Nr - 1 full rounds:
*/
r = key->rounds >> 1;
for (;;) {
- t0 =
- Td0[(s0 >> 24) ] ^
- Td1[(s3 >> 16) & 0xff] ^
- Td2[(s2 >> 8) & 0xff] ^
- Td3[(s1 ) & 0xff] ^
- rk[4];
- t1 =
- Td0[(s1 >> 24) ] ^
- Td1[(s0 >> 16) & 0xff] ^
- Td2[(s3 >> 8) & 0xff] ^
- Td3[(s2 ) & 0xff] ^
- rk[5];
- t2 =
- Td0[(s2 >> 24) ] ^
- Td1[(s1 >> 16) & 0xff] ^
- Td2[(s0 >> 8) & 0xff] ^
- Td3[(s3 ) & 0xff] ^
- rk[6];
- t3 =
- Td0[(s3 >> 24) ] ^
- Td1[(s2 >> 16) & 0xff] ^
- Td2[(s1 >> 8) & 0xff] ^
- Td3[(s0 ) & 0xff] ^
- rk[7];
+ t0 = Td0[(s0 >> 24)] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[(s1) & 0xff] ^ rk[4];
+ t1 = Td0[(s1 >> 24)] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[(s2) & 0xff] ^ rk[5];
+ t2 = Td0[(s2 >> 24)] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[(s3) & 0xff] ^ rk[6];
+ t3 = Td0[(s3 >> 24)] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[(s0) & 0xff] ^ rk[7];
rk += 8;
if (--r == 0) {
break;
}
- s0 =
- Td0[(t0 >> 24) ] ^
- Td1[(t3 >> 16) & 0xff] ^
- Td2[(t2 >> 8) & 0xff] ^
- Td3[(t1 ) & 0xff] ^
- rk[0];
- s1 =
- Td0[(t1 >> 24) ] ^
- Td1[(t0 >> 16) & 0xff] ^
- Td2[(t3 >> 8) & 0xff] ^
- Td3[(t2 ) & 0xff] ^
- rk[1];
- s2 =
- Td0[(t2 >> 24) ] ^
- Td1[(t1 >> 16) & 0xff] ^
- Td2[(t0 >> 8) & 0xff] ^
- Td3[(t3 ) & 0xff] ^
- rk[2];
- s3 =
- Td0[(t3 >> 24) ] ^
- Td1[(t2 >> 16) & 0xff] ^
- Td2[(t1 >> 8) & 0xff] ^
- Td3[(t0 ) & 0xff] ^
- rk[3];
+ s0 = Td0[(t0 >> 24)] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[(t1) & 0xff] ^ rk[0];
+ s1 = Td0[(t1 >> 24)] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[(t2) & 0xff] ^ rk[1];
+ s2 = Td0[(t2 >> 24)] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[(t3) & 0xff] ^ rk[2];
+ s3 = Td0[(t3 >> 24)] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[(t0) & 0xff] ^ rk[3];
}
#endif /* ?FULL_UNROLL */
/*
* apply last round and
* map cipher state to byte array block:
*/
- s0 =
- ((u32)Td4[(t0 >> 24) ] << 24) ^
- ((u32)Td4[(t3 >> 16) & 0xff] << 16) ^
- ((u32)Td4[(t2 >> 8) & 0xff] << 8) ^
- ((u32)Td4[(t1 ) & 0xff]) ^
- rk[0];
- PUTU32(out , s0);
- s1 =
- ((u32)Td4[(t1 >> 24) ] << 24) ^
- ((u32)Td4[(t0 >> 16) & 0xff] << 16) ^
- ((u32)Td4[(t3 >> 8) & 0xff] << 8) ^
- ((u32)Td4[(t2 ) & 0xff]) ^
- rk[1];
- PUTU32(out + 4, s1);
- s2 =
- ((u32)Td4[(t2 >> 24) ] << 24) ^
- ((u32)Td4[(t1 >> 16) & 0xff] << 16) ^
- ((u32)Td4[(t0 >> 8) & 0xff] << 8) ^
- ((u32)Td4[(t3 ) & 0xff]) ^
- rk[2];
- PUTU32(out + 8, s2);
- s3 =
- ((u32)Td4[(t3 >> 24) ] << 24) ^
- ((u32)Td4[(t2 >> 16) & 0xff] << 16) ^
- ((u32)Td4[(t1 >> 8) & 0xff] << 8) ^
- ((u32)Td4[(t0 ) & 0xff]) ^
- rk[3];
+ s0 = ((u32)Td4[(t0 >> 24)] << 24) ^ ((u32)Td4[(t3 >> 16) & 0xff] << 16) ^ ((u32)Td4[(t2 >> 8) & 0xff] << 8) ^ ((u32)Td4[(t1) & 0xff]) ^ rk[0];
+ PUTU32(out, s0);
+ s1 = ((u32)Td4[(t1 >> 24)] << 24) ^ ((u32)Td4[(t0 >> 16) & 0xff] << 16) ^ ((u32)Td4[(t3 >> 8) & 0xff] << 8) ^ ((u32)Td4[(t2) & 0xff]) ^ rk[1];
+ PUTU32(out + 4, s1);
+ s2 = ((u32)Td4[(t2 >> 24)] << 24) ^ ((u32)Td4[(t1 >> 16) & 0xff] << 16) ^ ((u32)Td4[(t0 >> 8) & 0xff] << 8) ^ ((u32)Td4[(t3) & 0xff]) ^ rk[2];
+ PUTU32(out + 8, s2);
+ s3 = ((u32)Td4[(t3 >> 24)] << 24) ^ ((u32)Td4[(t2 >> 16) & 0xff] << 16) ^ ((u32)Td4[(t1 >> 8) & 0xff] << 8) ^ ((u32)Td4[(t0) & 0xff]) ^ rk[3];
PUTU32(out + 12, s3);
}
@@ -1846,16 +3467,23 @@ static const u8 Te4[256] = {
0x41U, 0x99U, 0x2dU, 0x0fU, 0xb0U, 0x54U, 0xbbU, 0x16U
};
static const u32 rcon[] = {
- 0x01000000, 0x02000000, 0x04000000, 0x08000000,
- 0x10000000, 0x20000000, 0x40000000, 0x80000000,
- 0x1B000000, 0x36000000, /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */
+ 0x01000000,
+ 0x02000000,
+ 0x04000000,
+ 0x08000000,
+ 0x10000000,
+ 0x20000000,
+ 0x40000000,
+ 0x80000000,
+ 0x1B000000,
+ 0x36000000, /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */
};
/**
* Expand the cipher key into the encryption key schedule.
*/
int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
- AES_KEY *key)
+ AES_KEY *key)
{
u32 *rk;
int i = 0;
@@ -1875,19 +3503,14 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
else
key->rounds = 14;
- rk[0] = GETU32(userKey );
- rk[1] = GETU32(userKey + 4);
- rk[2] = GETU32(userKey + 8);
+ rk[0] = GETU32(userKey);
+ rk[1] = GETU32(userKey + 4);
+ rk[2] = GETU32(userKey + 8);
rk[3] = GETU32(userKey + 12);
if (bits == 128) {
while (1) {
- temp = rk[3];
- rk[4] = rk[0] ^
- ((u32)Te4[(temp >> 16) & 0xff] << 24) ^
- ((u32)Te4[(temp >> 8) & 0xff] << 16) ^
- ((u32)Te4[(temp ) & 0xff] << 8) ^
- ((u32)Te4[(temp >> 24) ]) ^
- rcon[i];
+ temp = rk[3];
+ rk[4] = rk[0] ^ ((u32)Te4[(temp >> 16) & 0xff] << 24) ^ ((u32)Te4[(temp >> 8) & 0xff] << 16) ^ ((u32)Te4[(temp) & 0xff] << 8) ^ ((u32)Te4[(temp >> 24)]) ^ rcon[i];
rk[5] = rk[1] ^ rk[4];
rk[6] = rk[2] ^ rk[5];
rk[7] = rk[3] ^ rk[6];
@@ -1901,21 +3524,16 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
rk[5] = GETU32(userKey + 20);
if (bits == 192) {
while (1) {
- temp = rk[ 5];
- rk[ 6] = rk[ 0] ^
- ((u32)Te4[(temp >> 16) & 0xff] << 24) ^
- ((u32)Te4[(temp >> 8) & 0xff] << 16) ^
- ((u32)Te4[(temp ) & 0xff] << 8) ^
- ((u32)Te4[(temp >> 24) ]) ^
- rcon[i];
- rk[ 7] = rk[ 1] ^ rk[ 6];
- rk[ 8] = rk[ 2] ^ rk[ 7];
- rk[ 9] = rk[ 3] ^ rk[ 8];
+ temp = rk[5];
+ rk[6] = rk[0] ^ ((u32)Te4[(temp >> 16) & 0xff] << 24) ^ ((u32)Te4[(temp >> 8) & 0xff] << 16) ^ ((u32)Te4[(temp) & 0xff] << 8) ^ ((u32)Te4[(temp >> 24)]) ^ rcon[i];
+ rk[7] = rk[1] ^ rk[6];
+ rk[8] = rk[2] ^ rk[7];
+ rk[9] = rk[3] ^ rk[8];
if (++i == 8) {
return 0;
}
- rk[10] = rk[ 4] ^ rk[ 9];
- rk[11] = rk[ 5] ^ rk[10];
+ rk[10] = rk[4] ^ rk[9];
+ rk[11] = rk[5] ^ rk[10];
rk += 6;
}
}
@@ -1923,28 +3541,19 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
rk[7] = GETU32(userKey + 28);
if (bits == 256) {
while (1) {
- temp = rk[ 7];
- rk[ 8] = rk[ 0] ^
- ((u32)Te4[(temp >> 16) & 0xff] << 24) ^
- ((u32)Te4[(temp >> 8) & 0xff] << 16) ^
- ((u32)Te4[(temp ) & 0xff] << 8) ^
- ((u32)Te4[(temp >> 24) ]) ^
- rcon[i];
- rk[ 9] = rk[ 1] ^ rk[ 8];
- rk[10] = rk[ 2] ^ rk[ 9];
- rk[11] = rk[ 3] ^ rk[10];
+ temp = rk[7];
+ rk[8] = rk[0] ^ ((u32)Te4[(temp >> 16) & 0xff] << 24) ^ ((u32)Te4[(temp >> 8) & 0xff] << 16) ^ ((u32)Te4[(temp) & 0xff] << 8) ^ ((u32)Te4[(temp >> 24)]) ^ rcon[i];
+ rk[9] = rk[1] ^ rk[8];
+ rk[10] = rk[2] ^ rk[9];
+ rk[11] = rk[3] ^ rk[10];
if (++i == 7) {
return 0;
}
temp = rk[11];
- rk[12] = rk[ 4] ^
- ((u32)Te4[(temp >> 24) ] << 24) ^
- ((u32)Te4[(temp >> 16) & 0xff] << 16) ^
- ((u32)Te4[(temp >> 8) & 0xff] << 8) ^
- ((u32)Te4[(temp ) & 0xff]);
- rk[13] = rk[ 5] ^ rk[12];
- rk[14] = rk[ 6] ^ rk[13];
- rk[15] = rk[ 7] ^ rk[14];
+ rk[12] = rk[4] ^ ((u32)Te4[(temp >> 24)] << 24) ^ ((u32)Te4[(temp >> 16) & 0xff] << 16) ^ ((u32)Te4[(temp >> 8) & 0xff] << 8) ^ ((u32)Te4[(temp) & 0xff]);
+ rk[13] = rk[5] ^ rk[12];
+ rk[14] = rk[6] ^ rk[13];
+ rk[15] = rk[7] ^ rk[14];
rk += 8;
}
@@ -1956,7 +3565,7 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
* Expand the cipher key into the decryption key schedule.
*/
int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
- AES_KEY *key)
+ AES_KEY *key)
{
u32 *rk;
@@ -1971,11 +3580,19 @@ int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
rk = key->rd_key;
/* invert the order of the round keys: */
- for (i = 0, j = 4*(key->rounds); i < j; i += 4, j -= 4) {
- temp = rk[i ]; rk[i ] = rk[j ]; rk[j ] = temp;
- temp = rk[i + 1]; rk[i + 1] = rk[j + 1]; rk[j + 1] = temp;
- temp = rk[i + 2]; rk[i + 2] = rk[j + 2]; rk[j + 2] = temp;
- temp = rk[i + 3]; rk[i + 3] = rk[j + 3]; rk[j + 3] = temp;
+ for (i = 0, j = 4 * (key->rounds); i < j; i += 4, j -= 4) {
+ temp = rk[i];
+ rk[i] = rk[j];
+ rk[j] = temp;
+ temp = rk[i + 1];
+ rk[i + 1] = rk[j + 1];
+ rk[j + 1] = temp;
+ temp = rk[i + 2];
+ rk[i + 2] = rk[j + 2];
+ rk[j + 2] = temp;
+ temp = rk[i + 3];
+ rk[i + 3] = rk[j + 3];
+ rk[j + 3] = temp;
}
/* apply the inverse MixColumn transform to all round keys but the first and the last: */
for (i = 1; i < (key->rounds); i++) {
@@ -1985,25 +3602,19 @@ int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
tp1 = rk[j];
m = tp1 & 0x80808080;
- tp2 = ((tp1 & 0x7f7f7f7f) << 1) ^
- ((m - (m >> 7)) & 0x1b1b1b1b);
+ tp2 = ((tp1 & 0x7f7f7f7f) << 1) ^ ((m - (m >> 7)) & 0x1b1b1b1b);
m = tp2 & 0x80808080;
- tp4 = ((tp2 & 0x7f7f7f7f) << 1) ^
- ((m - (m >> 7)) & 0x1b1b1b1b);
+ tp4 = ((tp2 & 0x7f7f7f7f) << 1) ^ ((m - (m >> 7)) & 0x1b1b1b1b);
m = tp4 & 0x80808080;
- tp8 = ((tp4 & 0x7f7f7f7f) << 1) ^
- ((m - (m >> 7)) & 0x1b1b1b1b);
+ tp8 = ((tp4 & 0x7f7f7f7f) << 1) ^ ((m - (m >> 7)) & 0x1b1b1b1b);
tp9 = tp8 ^ tp1;
tpb = tp9 ^ tp2;
tpd = tp9 ^ tp4;
tpe = tp8 ^ tp4 ^ tp2;
#if defined(ROTATE)
- rk[j] = tpe ^ ROTATE(tpd,16) ^
- ROTATE(tp9,24) ^ ROTATE(tpb,8);
+ rk[j] = tpe ^ ROTATE(tpd, 16) ^ ROTATE(tp9, 24) ^ ROTATE(tpb, 8);
#else
- rk[j] = tpe ^ (tpd >> 16) ^ (tpd << 16) ^
- (tp9 >> 8) ^ (tp9 << 24) ^
- (tpb >> 24) ^ (tpb << 8);
+ rk[j] = tpe ^ (tpd >> 16) ^ (tpd << 16) ^ (tp9 >> 8) ^ (tp9 << 24) ^ (tpb >> 24) ^ (tpb << 8);
#endif
}
}
diff --git a/crypto/aes/aes_ecb.c b/crypto/aes/aes_ecb.c
index e05afb0449..d0e9747ccc 100644
--- a/crypto/aes/aes_ecb.c
+++ b/crypto/aes/aes_ecb.c
@@ -19,7 +19,7 @@
#include "aes_local.h"
void AES_ecb_encrypt(const unsigned char *in, unsigned char *out,
- const AES_KEY *key, const int enc)
+ const AES_KEY *key, const int enc)
{
assert(in && out && key);
diff --git a/crypto/aes/aes_ige.c b/crypto/aes/aes_ige.c
index 72fcba7a0c..0308f3f225 100644
--- a/crypto/aes/aes_ige.c
+++ b/crypto/aes/aes_ige.c
@@ -20,9 +20,9 @@
/* XXX: probably some better way to do this */
#if defined(__i386__) || defined(__x86_64__)
-# define UNALIGNED_MEMOPS_ARE_FAST 1
+#define UNALIGNED_MEMOPS_ARE_FAST 1
#else
-# define UNALIGNED_MEMOPS_ARE_FAST 0
+#define UNALIGNED_MEMOPS_ARE_FAST 0
#endif
#define N_WORDS (AES_BLOCK_SIZE / sizeof(unsigned long))
@@ -35,19 +35,19 @@ typedef struct {
#endif
#if UNALIGNED_MEMOPS_ARE_FAST
-# define load_block(d, s) (d) = *(const aes_block_t *)(s)
-# define store_block(d, s) *(aes_block_t *)(d) = (s)
+#define load_block(d, s) (d) = *(const aes_block_t *)(s)
+#define store_block(d, s) *(aes_block_t *)(d) = (s)
#else
-# define load_block(d, s) memcpy((d).data, (s), AES_BLOCK_SIZE)
-# define store_block(d, s) memcpy((d), (s).data, AES_BLOCK_SIZE)
+#define load_block(d, s) memcpy((d).data, (s), AES_BLOCK_SIZE)
+#define store_block(d, s) memcpy((d), (s).data, AES_BLOCK_SIZE)
#endif
/* N.B. The IV for this mode is _twice_ the block size */
/* Use of this function is deprecated. */
void AES_ige_encrypt(const unsigned char *in, unsigned char *out,
- size_t length, const AES_KEY *key,
- unsigned char *ivec, const int enc)
+ size_t length, const AES_KEY *key,
+ unsigned char *ivec, const int enc)
{
size_t n;
size_t len = length / AES_BLOCK_SIZE;
@@ -60,21 +60,18 @@ void AES_ige_encrypt(const unsigned char *in, unsigned char *out,
OPENSSL_assert((length % AES_BLOCK_SIZE) == 0);
if (AES_ENCRYPT == enc) {
- if (in != out &&
- (UNALIGNED_MEMOPS_ARE_FAST
- || ((size_t)in | (size_t)out | (size_t)ivec) % sizeof(long) ==
- 0)) {
- aes_block_t *ivp = (aes_block_t *) ivec;
- aes_block_t *iv2p = (aes_block_t *) (ivec + AES_BLOCK_SIZE);
+ if (in != out && (UNALIGNED_MEMOPS_ARE_FAST || ((size_t)in | (size_t)out | (size_t)ivec) % sizeof(long) == 0)) {
+ aes_block_t *ivp = (aes_block_t *)ivec;
+ aes_block_t *iv2p = (aes_block_t *)(ivec + AES_BLOCK_SIZE);
while (len) {
- aes_block_t *inp = (aes_block_t *) in;
- aes_block_t *outp = (aes_block_t *) out;
+ aes_block_t *inp = (aes_block_t *)in;
+ aes_block_t *outp = (aes_block_t *)out;
for (n = 0; n < N_WORDS; ++n)
outp->data[n] = inp->data[n] ^ ivp->data[n];
AES_encrypt((unsigned char *)outp->data,
- (unsigned char *)outp->data, key);
+ (unsigned char *)outp->data, key);
for (n = 0; n < N_WORDS; ++n)
outp->data[n] ^= iv2p->data[n];
ivp = outp;
@@ -98,7 +95,7 @@ void AES_ige_encrypt(const unsigned char *in, unsigned char *out,
for (n = 0; n < N_WORDS; ++n)
tmp2.data[n] = tmp.data[n] ^ iv.data[n];
AES_encrypt((unsigned char *)tmp2.data,
- (unsigned char *)tmp2.data, key);
+ (unsigned char *)tmp2.data, key);
for (n = 0; n < N_WORDS; ++n)
tmp2.data[n] ^= iv2.data[n];
store_block(out, tmp2);
@@ -112,22 +109,19 @@ void AES_ige_encrypt(const unsigned char *in, unsigned char *out,
memcpy(ivec + AES_BLOCK_SIZE, iv2.data, AES_BLOCK_SIZE);
}
} else {
- if (in != out &&
- (UNALIGNED_MEMOPS_ARE_FAST
- || ((size_t)in | (size_t)out | (size_t)ivec) % sizeof(long) ==
- 0)) {
- aes_block_t *ivp = (aes_block_t *) ivec;
- aes_block_t *iv2p = (aes_block_t *) (ivec + AES_BLOCK_SIZE);
+ if (in != out && (UNALIGNED_MEMOPS_ARE_FAST || ((size_t)in | (size_t)out | (size_t)ivec) % sizeof(long) == 0)) {
+ aes_block_t *ivp = (aes_block_t *)ivec;
+ aes_block_t *iv2p = (aes_block_t *)(ivec + AES_BLOCK_SIZE);
while (len) {
aes_block_t tmp;
- aes_block_t *inp = (aes_block_t *) in;
- aes_block_t *outp = (aes_block_t *) out;
+ aes_block_t *inp = (aes_block_t *)in;
+ aes_block_t *outp = (aes_block_t *)out;
for (n = 0; n < N_WORDS; ++n)
tmp.data[n] = inp->data[n] ^ iv2p->data[n];
AES_decrypt((unsigned char *)tmp.data,
- (unsigned char *)outp->data, key);
+ (unsigned char *)outp->data, key);
for (n = 0; n < N_WORDS; ++n)
outp->data[n] ^= ivp->data[n];
ivp = inp;
@@ -152,7 +146,7 @@ void AES_ige_encrypt(const unsigned char *in, unsigned char *out,
for (n = 0; n < N_WORDS; ++n)
tmp.data[n] ^= iv2.data[n];
AES_decrypt((unsigned char *)tmp.data,
- (unsigned char *)tmp.data, key);
+ (unsigned char *)tmp.data, key);
for (n = 0; n < N_WORDS; ++n)
tmp.data[n] ^= iv.data[n];
store_block(out, tmp);
@@ -184,9 +178,9 @@ void AES_ige_encrypt(const unsigned char *in, unsigned char *out,
/* N.B. The IV for this mode is _four times_ the block size */
void AES_bi_ige_encrypt(const unsigned char *in, unsigned char *out,
- size_t length, const AES_KEY *key,
- const AES_KEY *key2, const unsigned char *ivec,
- const int enc)
+ size_t length, const AES_KEY *key,
+ const AES_KEY *key2, const unsigned char *ivec,
+ const int enc)
{
size_t n;
size_t len = length;
diff --git a/crypto/aes/aes_local.h b/crypto/aes/aes_local.h
index 69d17d6cde..71f9f5c648 100644
--- a/crypto/aes/aes_local.h
+++ b/crypto/aes/aes_local.h
@@ -8,36 +8,45 @@
*/
#ifndef OSSL_CRYPTO_AES_LOCAL_H
-# define OSSL_CRYPTO_AES_LOCAL_H
+#define OSSL_CRYPTO_AES_LOCAL_H
-# include <openssl/e_os2.h>
-# include <stdio.h>
-# include <stdlib.h>
-# include <string.h>
+#include <openssl/e_os2.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
-# if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64))
-# define SWAP(x) (_lrotl(x, 8) & 0x00ff00ff | _lrotr(x, 8) & 0xff00ff00)
-# define GETU32(p) SWAP(*((u32 *)(p)))
-# define PUTU32(ct, st) { *((u32 *)(ct)) = SWAP((st)); }
-# else
-# define GETU32(pt) (((u32)(pt)[0] << 24) ^ ((u32)(pt)[1] << 16) ^ ((u32)(pt)[2] << 8) ^ ((u32)(pt)[3]))
-# define PUTU32(ct, st) { (ct)[0] = (u8)((st) >> 24); (ct)[1] = (u8)((st) >> 16); (ct)[2] = (u8)((st) >> 8); (ct)[3] = (u8)(st); }
-# endif
+#if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64))
+#define SWAP(x) (_lrotl(x, 8) & 0x00ff00ff | _lrotr(x, 8) & 0xff00ff00)
+#define GETU32(p) SWAP(*((u32 *)(p)))
+#define PUTU32(ct, st) \
+ { \
+ *((u32 *)(ct)) = SWAP((st)); \
+ }
+#else
+#define GETU32(pt) (((u32)(pt)[0] << 24) ^ ((u32)(pt)[1] << 16) ^ ((u32)(pt)[2] << 8) ^ ((u32)(pt)[3]))
+#define PUTU32(ct, st) \
+ { \
+ (ct)[0] = (u8)((st) >> 24); \
+ (ct)[1] = (u8)((st) >> 16); \
+ (ct)[2] = (u8)((st) >> 8); \
+ (ct)[3] = (u8)(st); \
+ }
+#endif
typedef uint64_t u64;
-# ifdef AES_LONG
+#ifdef AES_LONG
typedef unsigned long u32;
-# else
+#else
typedef unsigned int u32;
-# endif
+#endif
typedef unsigned short u16;
typedef unsigned char u8;
-# define MAXKC (256/32)
-# define MAXKB (256/8)
-# define MAXNR 14
+#define MAXKC (256 / 32)
+#define MAXKB (256 / 8)
+#define MAXNR 14
/* This controls loop-unrolling in aes_core.c */
-# undef FULL_UNROLL
+#undef FULL_UNROLL
-#endif /* !OSSL_CRYPTO_AES_LOCAL_H */
+#endif /* !OSSL_CRYPTO_AES_LOCAL_H */
diff --git a/crypto/aes/aes_misc.c b/crypto/aes/aes_misc.c
index 7f39bcf2b3..e2729dd549 100644
--- a/crypto/aes/aes_misc.c
+++ b/crypto/aes/aes_misc.c
@@ -14,10 +14,10 @@
#ifndef OPENSSL_NO_DEPRECATED_3_0
const char *AES_options(void)
{
-# ifdef FULL_UNROLL
+#ifdef FULL_UNROLL
return "aes(full)";
-# else
+#else
return "aes(partial)";
-# endif
+#endif
}
#endif
diff --git a/crypto/aes/aes_ofb.c b/crypto/aes/aes_ofb.c
index 58e47dc45e..57b5a5496d 100644
--- a/crypto/aes/aes_ofb.c
+++ b/crypto/aes/aes_ofb.c
@@ -17,9 +17,9 @@
#include <openssl/modes.h>
void AES_ofb128_encrypt(const unsigned char *in, unsigned char *out,
- size_t length, const AES_KEY *key,
- unsigned char *ivec, int *num)
+ size_t length, const AES_KEY *key,
+ unsigned char *ivec, int *num)
{
CRYPTO_ofb128_encrypt(in, out, length, key, ivec, num,
- (block128_f) AES_encrypt);
+ (block128_f)AES_encrypt);
}
diff --git a/crypto/aes/aes_wrap.c b/crypto/aes/aes_wrap.c
index 9ceecb2e34..8059620c68 100644
--- a/crypto/aes/aes_wrap.c
+++ b/crypto/aes/aes_wrap.c
@@ -18,16 +18,16 @@
#include <openssl/modes.h>
int AES_wrap_key(AES_KEY *key, const unsigned char *iv,
- unsigned char *out,
- const unsigned char *in, unsigned int inlen)
+ unsigned char *out,
+ const unsigned char *in, unsigned int inlen)
{
- return (int)CRYPTO_128_wrap(key, iv, out, in, inlen, (block128_f) AES_encrypt);
+ return (int)CRYPTO_128_wrap(key, iv, out, in, inlen, (block128_f)AES_encrypt);
}
int AES_unwrap_key(AES_KEY *key, const unsigned char *iv,
- unsigned char *out,
- const unsigned char *in, unsigned int inlen)
+ unsigned char *out,
+ const unsigned char *in, unsigned int inlen)
{
return (int)CRYPTO_128_unwrap(key, iv, out, in, inlen,
- (block128_f) AES_decrypt);
+ (block128_f)AES_decrypt);
}
diff --git a/crypto/aes/aes_x86core.c b/crypto/aes/aes_x86core.c
index 3e5b24ed19..0fa994871b 100644
--- a/crypto/aes/aes_x86core.c
+++ b/crypto/aes/aes_x86core.c
@@ -41,7 +41,6 @@
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-
#include <assert.h>
#include <stdlib.h>
@@ -53,11 +52,11 @@
* referenced in outer and respectively inner rounds.
*/
#define AES_COMPACT_IN_OUTER_ROUNDS
-#ifdef AES_COMPACT_IN_OUTER_ROUNDS
+#ifdef AES_COMPACT_IN_OUTER_ROUNDS
/* AES_COMPACT_IN_OUTER_ROUNDS costs ~30% in performance, while
* adding AES_COMPACT_IN_INNER_ROUNDS reduces benchmark *further*
* by factor of ~2. */
-# undef AES_COMPACT_IN_INNER_ROUNDS
+#undef AES_COMPACT_IN_INNER_ROUNDS
#endif
#if 1
@@ -68,42 +67,43 @@ static void prefetch256(const void *table)
int i;
/* 32 is common least cache-line size */
- for (sum = 0, i = 0; i < 256/sizeof(t[0]); i += 32/sizeof(t[0]))
+ for (sum = 0, i = 0; i < 256 / sizeof(t[0]); i += 32 / sizeof(t[0]))
sum ^= t[i];
ret = sum;
}
#else
-# define prefetch256(t)
+#define prefetch256(t)
#endif
#undef GETU32
-#define GETU32(p) (*((u32*)(p)))
+#define GETU32(p) (*((u32 *)(p)))
#if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__)
-#define U64(C) C##UI64
+#define U64(C) C##UI64
#elif defined(__arch64__)
-#define U64(C) C##UL
+#define U64(C) C##UL
#else
-#define U64(C) C##ULL
+#define U64(C) C##ULL
#endif
#undef ROTATE
#if defined(_MSC_VER)
-# define ROTATE(a,n) _lrotl(a,n)
+#define ROTATE(a, n) _lrotl(a, n)
#elif defined(__ICC)
-# define ROTATE(a,n) _rotl(a,n)
-#elif defined(__GNUC__) && __GNUC__>=2
-# if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__)
-# define ROTATE(a,n) ({ register unsigned int ret; \
- asm ( \
- "roll %1,%0" \
- : "=r"(ret) \
- : "I"(n), "0"(a) \
- : "cc"); \
- ret; \
- })
-# endif
+#define ROTATE(a, n) _rotl(a, n)
+#elif defined(__GNUC__) && __GNUC__ >= 2
+#if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__)
+#define ROTATE(a, n) ({ \
+ register unsigned int ret; \
+ asm( \
+ "roll %1,%0" \
+ : "=r"(ret) \
+ : "I"(n), "0"(a) \
+ : "cc"); \
+ ret; \
+})
+#endif
#endif
/*-
Te [x] = S [x].[02, 01, 01, 03, 02, 01, 01, 03];
@@ -112,10 +112,10 @@ Te1[x] = S [x].[03, 02, 01, 01];
Te2[x] = S [x].[01, 03, 02, 01];
Te3[x] = S [x].[01, 01, 03, 02];
*/
-#define Te0 (u32)((u64*)((u8*)Te+0))
-#define Te1 (u32)((u64*)((u8*)Te+3))
-#define Te2 (u32)((u64*)((u8*)Te+2))
-#define Te3 (u32)((u64*)((u8*)Te+1))
+#define Te0 (u32)((u64 *)((u8 *)Te + 0))
+#define Te1 (u32)((u64 *)((u8 *)Te + 3))
+#define Te2 (u32)((u64 *)((u8 *)Te + 2))
+#define Te3 (u32)((u64 *)((u8 *)Te + 1))
/*-
Td [x] = Si[x].[0e, 09, 0d, 0b, 0e, 09, 0d, 0b];
Td0[x] = Si[x].[0e, 09, 0d, 0b];
@@ -124,10 +124,10 @@ Td2[x] = Si[x].[0d, 0b, 0e, 09];
Td3[x] = Si[x].[09, 0d, 0b, 0e];
Td4[x] = Si[x].[01];
*/
-#define Td0 (u32)((u64*)((u8*)Td+0))
-#define Td1 (u32)((u64*)((u8*)Td+3))
-#define Td2 (u32)((u64*)((u8*)Td+2))
-#define Td3 (u32)((u64*)((u8*)Td+1))
+#define Td0 (u32)((u64 *)((u8 *)Td + 0))
+#define Td1 (u32)((u64 *)((u8 *)Td + 3))
+#define Td2 (u32)((u64 *)((u8 *)Td + 2))
+#define Td3 (u32)((u64 *)((u8 *)Td + 1))
static const u64 Te[256] = {
U64(0xa56363c6a56363c6), U64(0x847c7cf8847c7cf8),
@@ -461,16 +461,23 @@ static const u8 Td4[256] = {
};
static const u32 rcon[] = {
- 0x00000001U, 0x00000002U, 0x00000004U, 0x00000008U,
- 0x00000010U, 0x00000020U, 0x00000040U, 0x00000080U,
- 0x0000001bU, 0x00000036U, /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */
+ 0x00000001U,
+ 0x00000002U,
+ 0x00000004U,
+ 0x00000008U,
+ 0x00000010U,
+ 0x00000020U,
+ 0x00000040U,
+ 0x00000080U,
+ 0x0000001bU,
+ 0x00000036U, /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */
};
/**
* Expand the cipher key into the encryption key schedule.
*/
int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
- AES_KEY *key)
+ AES_KEY *key)
{
u32 *rk;
@@ -484,26 +491,21 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
rk = key->rd_key;
- if (bits==128)
+ if (bits == 128)
key->rounds = 10;
- else if (bits==192)
+ else if (bits == 192)
key->rounds = 12;
else
key->rounds = 14;
- rk[0] = GETU32(userKey );
- rk[1] = GETU32(userKey + 4);
- rk[2] = GETU32(userKey + 8);
+ rk[0] = GETU32(userKey);
+ rk[1] = GETU32(userKey + 4);
+ rk[2] = GETU32(userKey + 8);
rk[3] = GETU32(userKey + 12);
if (bits == 128) {
while (1) {
- temp = rk[3];
- rk[4] = rk[0] ^
- ((u32)Te4[(temp >> 8) & 0xff] ) ^
- ((u32)Te4[(temp >> 16) & 0xff] << 8) ^
- ((u32)Te4[(temp >> 24) ] << 16) ^
- ((u32)Te4[(temp ) & 0xff] << 24) ^
- rcon[i];
+ temp = rk[3];
+ rk[4] = rk[0] ^ ((u32)Te4[(temp >> 8) & 0xff]) ^ ((u32)Te4[(temp >> 16) & 0xff] << 8) ^ ((u32)Te4[(temp >> 24)] << 16) ^ ((u32)Te4[(temp) & 0xff] << 24) ^ rcon[i];
rk[5] = rk[1] ^ rk[4];
rk[6] = rk[2] ^ rk[5];
rk[7] = rk[3] ^ rk[6];
@@ -517,21 +519,16 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
rk[5] = GETU32(userKey + 20);
if (bits == 192) {
while (1) {
- temp = rk[ 5];
- rk[ 6] = rk[ 0] ^
- ((u32)Te4[(temp >> 8) & 0xff] ) ^
- ((u32)Te4[(temp >> 16) & 0xff] << 8) ^
- ((u32)Te4[(temp >> 24) ] << 16) ^
- ((u32)Te4[(temp ) & 0xff] << 24) ^
- rcon[i];
- rk[ 7] = rk[ 1] ^ rk[ 6];
- rk[ 8] = rk[ 2] ^ rk[ 7];
- rk[ 9] = rk[ 3] ^ rk[ 8];
+ temp = rk[5];
+ rk[6] = rk[0] ^ ((u32)Te4[(temp >> 8) & 0xff]) ^ ((u32)Te4[(temp >> 16) & 0xff] << 8) ^ ((u32)Te4[(temp >> 24)] << 16) ^ ((u32)Te4[(temp) & 0xff] << 24) ^ rcon[i];
+ rk[7] = rk[1] ^ rk[6];
+ rk[8] = rk[2] ^ rk[7];
+ rk[9] = rk[3] ^ rk[8];
if (++i == 8) {
return 0;
}
- rk[10] = rk[ 4] ^ rk[ 9];
- rk[11] = rk[ 5] ^ rk[10];
+ rk[10] = rk[4] ^ rk[9];
+ rk[11] = rk[5] ^ rk[10];
rk += 6;
}
}
@@ -539,31 +536,22 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
rk[7] = GETU32(userKey + 28);
if (bits == 256) {
while (1) {
- temp = rk[ 7];
- rk[ 8] = rk[ 0] ^
- ((u32)Te4[(temp >> 8) & 0xff] ) ^
- ((u32)Te4[(temp >> 16) & 0xff] << 8) ^
- ((u32)Te4[(temp >> 24) ] << 16) ^
- ((u32)Te4[(temp ) & 0xff] << 24) ^
- rcon[i];
- rk[ 9] = rk[ 1] ^ rk[ 8];
- rk[10] = rk[ 2] ^ rk[ 9];
- rk[11] = rk[ 3] ^ rk[10];
+ temp = rk[7];
+ rk[8] = rk[0] ^ ((u32)Te4[(temp >> 8) & 0xff]) ^ ((u32)Te4[(temp >> 16) & 0xff] << 8) ^ ((u32)Te4[(temp >> 24)] << 16) ^ ((u32)Te4[(temp) & 0xff] << 24) ^ rcon[i];
+ rk[9] = rk[1] ^ rk[8];
+ rk[10] = rk[2] ^ rk[9];
+ rk[11] = rk[3] ^ rk[10];
if (++i == 7) {
return 0;
}
temp = rk[11];
- rk[12] = rk[ 4] ^
- ((u32)Te4[(temp ) & 0xff] ) ^
- ((u32)Te4[(temp >> 8) & 0xff] << 8) ^
- ((u32)Te4[(temp >> 16) & 0xff] << 16) ^
- ((u32)Te4[(temp >> 24) ] << 24);
- rk[13] = rk[ 5] ^ rk[12];
- rk[14] = rk[ 6] ^ rk[13];
- rk[15] = rk[ 7] ^ rk[14];
+ rk[12] = rk[4] ^ ((u32)Te4[(temp) & 0xff]) ^ ((u32)Te4[(temp >> 8) & 0xff] << 8) ^ ((u32)Te4[(temp >> 16) & 0xff] << 16) ^ ((u32)Te4[(temp >> 24)] << 24);
+ rk[13] = rk[5] ^ rk[12];
+ rk[14] = rk[6] ^ rk[13];
+ rk[15] = rk[7] ^ rk[14];
rk += 8;
- }
+ }
}
return 0;
}
@@ -572,7 +560,7 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
* Expand the cipher key into the decryption key schedule.
*/
int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
- AES_KEY *key)
+ AES_KEY *key)
{
u32 *rk;
@@ -587,11 +575,19 @@ int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
rk = key->rd_key;
/* invert the order of the round keys: */
- for (i = 0, j = 4*(key->rounds); i < j; i += 4, j -= 4) {
- temp = rk[i ]; rk[i ] = rk[j ]; rk[j ] = temp;
- temp = rk[i + 1]; rk[i + 1] = rk[j + 1]; rk[j + 1] = temp;
- temp = rk[i + 2]; rk[i + 2] = rk[j + 2]; rk[j + 2] = temp;
- temp = rk[i + 3]; rk[i + 3] = rk[j + 3]; rk[j + 3] = temp;
+ for (i = 0, j = 4 * (key->rounds); i < j; i += 4, j -= 4) {
+ temp = rk[i];
+ rk[i] = rk[j];
+ rk[j] = temp;
+ temp = rk[i + 1];
+ rk[i + 1] = rk[j + 1];
+ rk[j + 1] = temp;
+ temp = rk[i + 2];
+ rk[i + 2] = rk[j + 2];
+ rk[j + 2] = temp;
+ temp = rk[i + 3];
+ rk[i + 3] = rk[j + 3];
+ rk[j + 3] = temp;
}
/* apply the inverse MixColumn transform to all round keys but the first and the last: */
for (i = 1; i < (key->rounds); i++) {
@@ -602,48 +598,26 @@ int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
tp1 = rk[j];
m = tp1 & 0x80808080;
- tp2 = ((tp1 & 0x7f7f7f7f) << 1) ^
- ((m - (m >> 7)) & 0x1b1b1b1b);
+ tp2 = ((tp1 & 0x7f7f7f7f) << 1) ^ ((m - (m >> 7)) & 0x1b1b1b1b);
m = tp2 & 0x80808080;
- tp4 = ((tp2 & 0x7f7f7f7f) << 1) ^
- ((m - (m >> 7)) & 0x1b1b1b1b);
+ tp4 = ((tp2 & 0x7f7f7f7f) << 1) ^ ((m - (m >> 7)) & 0x1b1b1b1b);
m = tp4 & 0x80808080;
- tp8 = ((tp4 & 0x7f7f7f7f) << 1) ^
- ((m - (m >> 7)) & 0x1b1b1b1b);
+ tp8 = ((tp4 & 0x7f7f7f7f) << 1) ^ ((m - (m >> 7)) & 0x1b1b1b1b);
tp9 = tp8 ^ tp1;
tpb = tp9 ^ tp2;
tpd = tp9 ^ tp4;
tpe = tp8 ^ tp4 ^ tp2;
#if defined(ROTATE)
- rk[j] = tpe ^ ROTATE(tpd,16) ^
- ROTATE(tp9,8) ^ ROTATE(tpb,24);
+ rk[j] = tpe ^ ROTATE(tpd, 16) ^ ROTATE(tp9, 8) ^ ROTATE(tpb, 24);
#else
- rk[j] = tpe ^ (tpd >> 16) ^ (tpd << 16) ^
- (tp9 >> 24) ^ (tp9 << 8) ^
- (tpb >> 8) ^ (tpb << 24);
+ rk[j] = tpe ^ (tpd >> 16) ^ (tpd << 16) ^ (tp9 >> 24) ^ (tp9 << 8) ^ (tpb >> 8) ^ (tpb << 24);
#endif
}
#else
- rk[0] =
- Td0[Te2[(rk[0] ) & 0xff] & 0xff] ^
- Td1[Te2[(rk[0] >> 8) & 0xff] & 0xff] ^
- Td2[Te2[(rk[0] >> 16) & 0xff] & 0xff] ^
- Td3[Te2[(rk[0] >> 24) ] & 0xff];
- rk[1] =
- Td0[Te2[(rk[1] ) & 0xff] & 0xff] ^
- Td1[Te2[(rk[1] >> 8) & 0xff] & 0xff] ^
- Td2[Te2[(rk[1] >> 16) & 0xff] & 0xff] ^
- Td3[Te2[(rk[1] >> 24) ] & 0xff];
- rk[2] =
- Td0[Te2[(rk[2] ) & 0xff] & 0xff] ^
- Td1[Te2[(rk[2] >> 8) & 0xff] & 0xff] ^
- Td2[Te2[(rk[2] >> 16) & 0xff] & 0xff] ^
- Td3[Te2[(rk[2] >> 24) ] & 0xff];
- rk[3] =
- Td0[Te2[(rk[3] ) & 0xff] & 0xff] ^
- Td1[Te2[(rk[3] >> 8) & 0xff] & 0xff] ^
- Td2[Te2[(rk[3] >> 16) & 0xff] & 0xff] ^
- Td3[Te2[(rk[3] >> 24) ] & 0xff];
+ rk[0] = Td0[Te2[(rk[0]) & 0xff] & 0xff] ^ Td1[Te2[(rk[0] >> 8) & 0xff] & 0xff] ^ Td2[Te2[(rk[0] >> 16) & 0xff] & 0xff] ^ Td3[Te2[(rk[0] >> 24)] & 0xff];
+ rk[1] = Td0[Te2[(rk[1]) & 0xff] & 0xff] ^ Td1[Te2[(rk[1] >> 8) & 0xff] & 0xff] ^ Td2[Te2[(rk[1] >> 16) & 0xff] & 0xff] ^ Td3[Te2[(rk[1] >> 24)] & 0xff];
+ rk[2] = Td0[Te2[(rk[2]) & 0xff] & 0xff] ^ Td1[Te2[(rk[2] >> 8) & 0xff] & 0xff] ^ Td2[Te2[(rk[2] >> 16) & 0xff] & 0xff] ^ Td3[Te2[(rk[2] >> 24)] & 0xff];
+ rk[3] = Td0[Te2[(rk[3]) & 0xff] & 0xff] ^ Td1[Te2[(rk[3] >> 8) & 0xff] & 0xff] ^ Td2[Te2[(rk[3] >> 16) & 0xff] & 0xff] ^ Td3[Te2[(rk[3] >> 24)] & 0xff];
#endif
}
return 0;
@@ -654,7 +628,7 @@ int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
* in and out can overlap
*/
void AES_encrypt(const unsigned char *in, unsigned char *out,
- const AES_KEY *key)
+ const AES_KEY *key)
{
const u32 *rk;
@@ -668,96 +642,56 @@ void AES_encrypt(const unsigned char *in, unsigned char *out,
* map byte array block to cipher state
* and add initial round key:
*/
- s0 = GETU32(in ) ^ rk[0];
- s1 = GETU32(in + 4) ^ rk[1];
- s2 = GETU32(in + 8) ^ rk[2];
+ s0 = GETU32(in) ^ rk[0];
+ s1 = GETU32(in + 4) ^ rk[1];
+ s2 = GETU32(in + 8) ^ rk[2];
s3 = GETU32(in + 12) ^ rk[3];
#if defined(AES_COMPACT_IN_OUTER_ROUNDS)
prefetch256(Te4);
- t[0] = (u32)Te4[(s0 ) & 0xff] ^
- (u32)Te4[(s1 >> 8) & 0xff] << 8 ^
- (u32)Te4[(s2 >> 16) & 0xff] << 16 ^
- (u32)Te4[(s3 >> 24) ] << 24;
- t[1] = (u32)Te4[(s1 ) & 0xff] ^
- (u32)Te4[(s2 >> 8) & 0xff] << 8 ^
- (u32)Te4[(s3 >> 16) & 0xff] << 16 ^
- (u32)Te4[(s0 >> 24) ] << 24;
- t[2] = (u32)Te4[(s2 ) & 0xff] ^
- (u32)Te4[(s3 >> 8) & 0xff] << 8 ^
- (u32)Te4[(s0 >> 16) & 0xff] << 16 ^
- (u32)Te4[(s1 >> 24) ] << 24;
- t[3] = (u32)Te4[(s3 ) & 0xff] ^
- (u32)Te4[(s0 >> 8) & 0xff] << 8 ^
- (u32)Te4[(s1 >> 16) & 0xff] << 16 ^
- (u32)Te4[(s2 >> 24) ] << 24;
+ t[0] = (u32)Te4[(s0) & 0xff] ^ (u32)Te4[(s1 >> 8) & 0xff] << 8 ^ (u32)Te4[(s2 >> 16) & 0xff] << 16 ^ (u32)Te4[(s3 >> 24)] << 24;
+ t[1] = (u32)Te4[(s1) & 0xff] ^ (u32)Te4[(s2 >> 8) & 0xff] << 8 ^ (u32)Te4[(s3 >> 16) & 0xff] << 16 ^ (u32)Te4[(s0 >> 24)] << 24;
+ t[2] = (u32)Te4[(s2) & 0xff] ^ (u32)Te4[(s3 >> 8) & 0xff] << 8 ^ (u32)Te4[(s0 >> 16) & 0xff] << 16 ^ (u32)Te4[(s1 >> 24)] << 24;
+ t[3] = (u32)Te4[(s3) & 0xff] ^ (u32)Te4[(s0 >> 8) & 0xff] << 8 ^ (u32)Te4[(s1 >> 16) & 0xff] << 16 ^ (u32)Te4[(s2 >> 24)] << 24;
/* now do the linear transform using words */
- { int i;
+ {
+ int i;
u32 r0, r1, r2;
for (i = 0; i < 4; i++) {
r0 = t[i];
r1 = r0 & 0x80808080;
- r2 = ((r0 & 0x7f7f7f7f) << 1) ^
- ((r1 - (r1 >> 7)) & 0x1b1b1b1b);
+ r2 = ((r0 & 0x7f7f7f7f) << 1) ^ ((r1 - (r1 >> 7)) & 0x1b1b1b1b);
#if defined(ROTATE)
- t[i] = r2 ^ ROTATE(r2,24) ^ ROTATE(r0,24) ^
- ROTATE(r0,16) ^ ROTATE(r0,8);
+ t[i] = r2 ^ ROTATE(r2, 24) ^ ROTATE(r0, 24) ^ ROTATE(r0, 16) ^ ROTATE(r0, 8);
#else
- t[i] = r2 ^ ((r2 ^ r0) << 24) ^ ((r2 ^ r0) >> 8) ^
- (r0 << 16) ^ (r0 >> 16) ^
- (r0 << 8) ^ (r0 >> 24);
+ t[i] = r2 ^ ((r2 ^ r0) << 24) ^ ((r2 ^ r0) >> 8) ^ (r0 << 16) ^ (r0 >> 16) ^ (r0 << 8) ^ (r0 >> 24);
#endif
- t[i] ^= rk[4+i];
+ t[i] ^= rk[4 + i];
}
}
#else
- t[0] = Te0[(s0 ) & 0xff] ^
- Te1[(s1 >> 8) & 0xff] ^
- Te2[(s2 >> 16) & 0xff] ^
- Te3[(s3 >> 24) ] ^
- rk[4];
- t[1] = Te0[(s1 ) & 0xff] ^
- Te1[(s2 >> 8) & 0xff] ^
- Te2[(s3 >> 16) & 0xff] ^
- Te3[(s0 >> 24) ] ^
- rk[5];
- t[2] = Te0[(s2 ) & 0xff] ^
- Te1[(s3 >> 8) & 0xff] ^
- Te2[(s0 >> 16) & 0xff] ^
- Te3[(s1 >> 24) ] ^
- rk[6];
- t[3] = Te0[(s3 ) & 0xff] ^
- Te1[(s0 >> 8) & 0xff] ^
- Te2[(s1 >> 16) & 0xff] ^
- Te3[(s2 >> 24) ] ^
- rk[7];
+ t[0] = Te0[(s0) & 0xff] ^ Te1[(s1 >> 8) & 0xff] ^ Te2[(s2 >> 16) & 0xff] ^ Te3[(s3 >> 24)] ^ rk[4];
+ t[1] = Te0[(s1) & 0xff] ^ Te1[(s2 >> 8) & 0xff] ^ Te2[(s3 >> 16) & 0xff] ^ Te3[(s0 >> 24)] ^ rk[5];
+ t[2] = Te0[(s2) & 0xff] ^ Te1[(s3 >> 8) & 0xff] ^ Te2[(s0 >> 16) & 0xff] ^ Te3[(s1 >> 24)] ^ rk[6];
+ t[3] = Te0[(s3) & 0xff] ^ Te1[(s0 >> 8) & 0xff] ^ Te2[(s1 >> 16) & 0xff] ^ Te3[(s2 >> 24)] ^ rk[7];
#endif
- s0 = t[0]; s1 = t[1]; s2 = t[2]; s3 = t[3];
+ s0 = t[0];
+ s1 = t[1];
+ s2 = t[2];
+ s3 = t[3];
/*
* Nr - 2 full rounds:
*/
- for (rk+=8,r=key->rounds-2; r>0; rk+=4,r--) {
+ for (rk += 8, r = key->rounds - 2; r > 0; rk += 4, r--) {
#if defined(AES_COMPACT_IN_INNER_ROUNDS)
- t[0] = (u32)Te4[(s0 ) & 0xff] ^
- (u32)Te4[(s1 >> 8) & 0xff] << 8 ^
- (u32)Te4[(s2 >> 16) & 0xff] << 16 ^
- (u32)Te4[(s3 >> 24) ] << 24;
- t[1] = (u32)Te4[(s1 ) & 0xff] ^
- (u32)Te4[(s2 >> 8) & 0xff] << 8 ^
- (u32)Te4[(s3 >> 16) & 0xff] << 16 ^
- (u32)Te4[(s0 >> 24) ] << 24;
- t[2] = (u32)Te4[(s2 ) & 0xff] ^
- (u32)Te4[(s3 >> 8) & 0xff] << 8 ^
- (u32)Te4[(s0 >> 16) & 0xff] << 16 ^
- (u32)Te4[(s1 >> 24) ] << 24;
- t[3] = (u32)Te4[(s3 ) & 0xff] ^
- (u32)Te4[(s0 >> 8) & 0xff] << 8 ^
- (u32)Te4[(s1 >> 16) & 0xff] << 16 ^
- (u32)Te4[(s2 >> 24) ] << 24;
+ t[0] = (u32)Te4[(s0) & 0xff] ^ (u32)Te4[(s1 >> 8) & 0xff] << 8 ^ (u32)Te4[(s2 >> 16) & 0xff] << 16 ^ (u32)Te4[(s3 >> 24)] << 24;
+ t[1] = (u32)Te4[(s1) & 0xff] ^ (u32)Te4[(s2 >> 8) & 0xff] << 8 ^ (u32)Te4[(s3 >> 16) & 0xff] << 16 ^ (u32)Te4[(s0 >> 24)] << 24;
+ t[2] = (u32)Te4[(s2) & 0xff] ^ (u32)Te4[(s3 >> 8) & 0xff] << 8 ^ (u32)Te4[(s0 >> 16) & 0xff] << 16 ^ (u32)Te4[(s1 >> 24)] << 24;
+ t[3] = (u32)Te4[(s3) & 0xff] ^ (u32)Te4[(s0 >> 8) & 0xff] << 8 ^ (u32)Te4[(s1 >> 16) & 0xff] << 16 ^ (u32)Te4[(s2 >> 24)] << 24;
/* now do the linear transform using words */
{
@@ -767,42 +701,25 @@ void AES_encrypt(const unsigned char *in, unsigned char *out,
for (i = 0; i < 4; i++) {
r0 = t[i];
r1 = r0 & 0x80808080;
- r2 = ((r0 & 0x7f7f7f7f) << 1) ^
- ((r1 - (r1 >> 7)) & 0x1b1b1b1b);
+ r2 = ((r0 & 0x7f7f7f7f) << 1) ^ ((r1 - (r1 >> 7)) & 0x1b1b1b1b);
#if defined(ROTATE)
- t[i] = r2 ^ ROTATE(r2,24) ^ ROTATE(r0,24) ^
- ROTATE(r0,16) ^ ROTATE(r0,8);
+ t[i] = r2 ^ ROTATE(r2, 24) ^ ROTATE(r0, 24) ^ ROTATE(r0, 16) ^ ROTATE(r0, 8);
#else
- t[i] = r2 ^ ((r2 ^ r0) << 24) ^ ((r2 ^ r0) >> 8) ^
- (r0 << 16) ^ (r0 >> 16) ^
- (r0 << 8) ^ (r0 >> 24);
+ t[i] = r2 ^ ((r2 ^ r0) << 24) ^ ((r2 ^ r0) >> 8) ^ (r0 << 16) ^ (r0 >> 16) ^ (r0 << 8) ^ (r0 >> 24);
#endif
t[i] ^= rk[i];
}
}
#else
- t[0] = Te0[(s0 ) & 0xff] ^
- Te1[(s1 >> 8) & 0xff] ^
- Te2[(s2 >> 16) & 0xff] ^
- Te3[(s3 >> 24) ] ^
- rk[0];
- t[1] = Te0[(s1 ) & 0xff] ^
- Te1[(s2 >> 8) & 0xff] ^
- Te2[(s3 >> 16) & 0xff] ^
- Te3[(s0 >> 24) ] ^
- rk[1];
- t[2] = Te0[(s2 ) & 0xff] ^
- Te1[(s3 >> 8) & 0xff] ^
- Te2[(s0 >> 16) & 0xff] ^
- Te3[(s1 >> 24) ] ^
- rk[2];
- t[3] = Te0[(s3 ) & 0xff] ^
- Te1[(s0 >> 8) & 0xff] ^
- Te2[(s1 >> 16) & 0xff] ^
- Te3[(s2 >> 24) ] ^
- rk[3];
+ t[0] = Te0[(s0) & 0xff] ^ Te1[(s1 >> 8) & 0xff] ^ Te2[(s2 >> 16) & 0xff] ^ Te3[(s3 >> 24)] ^ rk[0];
+ t[1] = Te0[(s1) & 0xff] ^ Te1[(s2 >> 8) & 0xff] ^ Te2[(s3 >> 16) & 0xff] ^ Te3[(s0 >> 24)] ^ rk[1];
+ t[2] = Te0[(s2) & 0xff] ^ Te1[(s3 >> 8) & 0xff] ^ Te2[(s0 >> 16) & 0xff] ^ Te3[(s1 >> 24)] ^ rk[2];
+ t[3] = Te0[(s3) & 0xff] ^ Te1[(s0 >> 8) & 0xff] ^ Te2[(s1 >> 16) & 0xff] ^ Te3[(s2 >> 24)] ^ rk[3];
#endif
- s0 = t[0]; s1 = t[1]; s2 = t[2]; s3 = t[3];
+ s0 = t[0];
+ s1 = t[1];
+ s2 = t[2];
+ s3 = t[3];
}
/*
* apply last round and
@@ -811,55 +728,15 @@ void AES_encrypt(const unsigned char *in, unsigned char *out,
#if defined(AES_COMPACT_IN_OUTER_ROUNDS)
prefetch256(Te4);
- *(u32*)(out+0) =
- (u32)Te4[(s0 ) & 0xff] ^
- (u32)Te4[(s1 >> 8) & 0xff] << 8 ^
- (u32)Te4[(s2 >> 16) & 0xff] << 16 ^
- (u32)Te4[(s3 >> 24) ] << 24 ^
- rk[0];
- *(u32*)(out+4) =
- (u32)Te4[(s1 ) & 0xff] ^
- (u32)Te4[(s2 >> 8) & 0xff] << 8 ^
- (u32)Te4[(s3 >> 16) & 0xff] << 16 ^
- (u32)Te4[(s0 >> 24) ] << 24 ^
- rk[1];
- *(u32*)(out+8) =
- (u32)Te4[(s2 ) & 0xff] ^
- (u32)Te4[(s3 >> 8) & 0xff] << 8 ^
- (u32)Te4[(s0 >> 16) & 0xff] << 16 ^
- (u32)Te4[(s1 >> 24) ] << 24 ^
- rk[2];
- *(u32*)(out+12) =
- (u32)Te4[(s3 ) & 0xff] ^
- (u32)Te4[(s0 >> 8) & 0xff] << 8 ^
- (u32)Te4[(s1 >> 16) & 0xff] << 16 ^
- (u32)Te4[(s2 >> 24) ] << 24 ^
- rk[3];
+ *(u32 *)(out + 0) = (u32)Te4[(s0) & 0xff] ^ (u32)Te4[(s1 >> 8) & 0xff] << 8 ^ (u32)Te4[(s2 >> 16) & 0xff] << 16 ^ (u32)Te4[(s3 >> 24)] << 24 ^ rk[0];
+ *(u32 *)(out + 4) = (u32)Te4[(s1) & 0xff] ^ (u32)Te4[(s2 >> 8) & 0xff] << 8 ^ (u32)Te4[(s3 >> 16) & 0xff] << 16 ^ (u32)Te4[(s0 >> 24)] << 24 ^ rk[1];
+ *(u32 *)(out + 8) = (u32)Te4[(s2) & 0xff] ^ (u32)Te4[(s3 >> 8) & 0xff] << 8 ^ (u32)Te4[(s0 >> 16) & 0xff] << 16 ^ (u32)Te4[(s1 >> 24)] << 24 ^ rk[2];
+ *(u32 *)(out + 12) = (u32)Te4[(s3) & 0xff] ^ (u32)Te4[(s0 >> 8) & 0xff] << 8 ^ (u32)Te4[(s1 >> 16) & 0xff] << 16 ^ (u32)Te4[(s2 >> 24)] << 24 ^ rk[3];
#else
- *(u32*)(out+0) =
- (Te2[(s0 ) & 0xff] & 0x000000ffU) ^
- (Te3[(s1 >> 8) & 0xff] & 0x0000ff00U) ^
- (Te0[(s2 >> 16) & 0xff] & 0x00ff0000U) ^
- (Te1[(s3 >> 24) ] & 0xff000000U) ^
- rk[0];
- *(u32*)(out+4) =
- (Te2[(s1 ) & 0xff] & 0x000000ffU) ^
- (Te3[(s2 >> 8) & 0xff] & 0x0000ff00U) ^
- (Te0[(s3 >> 16) & 0xff] & 0x00ff0000U) ^
- (Te1[(s0 >> 24) ] & 0xff000000U) ^
- rk[1];
- *(u32*)(out+8) =
- (Te2[(s2 ) & 0xff] & 0x000000ffU) ^
- (Te3[(s3 >> 8) & 0xff] & 0x0000ff00U) ^
- (Te0[(s0 >> 16) & 0xff] & 0x00ff0000U) ^
- (Te1[(s1 >> 24) ] & 0xff000000U) ^
- rk[2];
- *(u32*)(out+12) =
- (Te2[(s3 ) & 0xff] & 0x000000ffU) ^
- (Te3[(s0 >> 8) & 0xff] & 0x0000ff00U) ^
- (Te0[(s1 >> 16) & 0xff] & 0x00ff0000U) ^
- (Te1[(s2 >> 24) ] & 0xff000000U) ^
- rk[3];
+ *(u32 *)(out + 0) = (Te2[(s0) & 0xff] & 0x000000ffU) ^ (Te3[(s1 >> 8) & 0xff] & 0x0000ff00U) ^ (Te0[(s2 >> 16) & 0xff] & 0x00ff0000U) ^ (Te1[(s3 >> 24)] & 0xff000000U) ^ rk[0];
+ *(u32 *)(out + 4) = (Te2[(s1) & 0xff] & 0x000000ffU) ^ (Te3[(s2 >> 8) & 0xff] & 0x0000ff00U) ^ (Te0[(s3 >> 16) & 0xff] & 0x00ff0000U) ^ (Te1[(s0 >> 24)] & 0xff000000U) ^ rk[1];
+ *(u32 *)(out + 8) = (Te2[(s2) & 0xff] & 0x000000ffU) ^ (Te3[(s3 >> 8) & 0xff] & 0x0000ff00U) ^ (Te0[(s0 >> 16) & 0xff] & 0x00ff0000U) ^ (Te1[(s1 >> 24)] & 0xff000000U) ^ rk[2];
+ *(u32 *)(out + 12) = (Te2[(s3) & 0xff] & 0x000000ffU) ^ (Te3[(s0 >> 8) & 0xff] & 0x0000ff00U) ^ (Te0[(s1 >> 16) & 0xff] & 0x00ff0000U) ^ (Te1[(s2 >> 24)] & 0xff000000U) ^ rk[3];
#endif
}
@@ -868,7 +745,7 @@ void AES_encrypt(const unsigned char *in, unsigned char *out,
* in and out can overlap
*/
void AES_decrypt(const unsigned char *in, unsigned char *out,
- const AES_KEY *key)
+ const AES_KEY *key)
{
const u32 *rk;
@@ -882,30 +759,18 @@ void AES_decrypt(const unsigned char *in, unsigned char *out,
* map byte array block to cipher state
* and add initial round key:
*/
- s0 = GETU32(in ) ^ rk[0];
- s1 = GETU32(in + 4) ^ rk[1];
- s2 = GETU32(in + 8) ^ rk[2];
+ s0 = GETU32(in) ^ rk[0];
+ s1 = GETU32(in + 4) ^ rk[1];
+ s2 = GETU32(in + 8) ^ rk[2];
s3 = GETU32(in + 12) ^ rk[3];
#if defined(AES_COMPACT_IN_OUTER_ROUNDS)
prefetch256(Td4);
- t[0] = (u32)Td4[(s0 ) & 0xff] ^
- (u32)Td4[(s3 >> 8) & 0xff] << 8 ^
- (u32)Td4[(s2 >> 16) & 0xff] << 16 ^
- (u32)Td4[(s1 >> 24) ] << 24;
- t[1] = (u32)Td4[(s1 ) & 0xff] ^
- (u32)Td4[(s0 >> 8) & 0xff] << 8 ^
- (u32)Td4[(s3 >> 16) & 0xff] << 16 ^
- (u32)Td4[(s2 >> 24) ] << 24;
- t[2] = (u32)Td4[(s2 ) & 0xff] ^
- (u32)Td4[(s1 >> 8) & 0xff] << 8 ^
- (u32)Td4[(s0 >> 16) & 0xff] << 16 ^
- (u32)Td4[(s3 >> 24) ] << 24;
- t[3] = (u32)Td4[(s3 ) & 0xff] ^
- (u32)Td4[(s2 >> 8) & 0xff] << 8 ^
- (u32)Td4[(s1 >> 16) & 0xff] << 16 ^
- (u32)Td4[(s0 >> 24) ] << 24;
+ t[0] = (u32)Td4[(s0) & 0xff] ^ (u32)Td4[(s3 >> 8) & 0xff] << 8 ^ (u32)Td4[(s2 >> 16) & 0xff] << 16 ^ (u32)Td4[(s1 >> 24)] << 24;
+ t[1] = (u32)Td4[(s1) & 0xff] ^ (u32)Td4[(s0 >> 8) & 0xff] << 8 ^ (u32)Td4[(s3 >> 16) & 0xff] << 16 ^ (u32)Td4[(s2 >> 24)] << 24;
+ t[2] = (u32)Td4[(s2) & 0xff] ^ (u32)Td4[(s1 >> 8) & 0xff] << 8 ^ (u32)Td4[(s0 >> 16) & 0xff] << 16 ^ (u32)Td4[(s3 >> 24)] << 24;
+ t[3] = (u32)Td4[(s3) & 0xff] ^ (u32)Td4[(s2 >> 8) & 0xff] << 8 ^ (u32)Td4[(s1 >> 16) & 0xff] << 16 ^ (u32)Td4[(s0 >> 24)] << 24;
/* now do the linear transform using words */
{
@@ -915,129 +780,79 @@ void AES_decrypt(const unsigned char *in, unsigned char *out,
for (i = 0; i < 4; i++) {
tp1 = t[i];
m = tp1 & 0x80808080;
- tp2 = ((tp1 & 0x7f7f7f7f) << 1) ^
- ((m - (m >> 7)) & 0x1b1b1b1b);
+ tp2 = ((tp1 & 0x7f7f7f7f) << 1) ^ ((m - (m >> 7)) & 0x1b1b1b1b);
m = tp2 & 0x80808080;
- tp4 = ((tp2 & 0x7f7f7f7f) << 1) ^
- ((m - (m >> 7)) & 0x1b1b1b1b);
+ tp4 = ((tp2 & 0x7f7f7f7f) << 1) ^ ((m - (m >> 7)) & 0x1b1b1b1b);
m = tp4 & 0x80808080;
- tp8 = ((tp4 & 0x7f7f7f7f) << 1) ^
- ((m - (m >> 7)) & 0x1b1b1b1b);
+ tp8 = ((tp4 & 0x7f7f7f7f) << 1) ^ ((m - (m >> 7)) & 0x1b1b1b1b);
tp9 = tp8 ^ tp1;
tpb = tp9 ^ tp2;
tpd = tp9 ^ tp4;
tpe = tp8 ^ tp4 ^ tp2;
#if defined(ROTATE)
- t[i] = tpe ^ ROTATE(tpd,16) ^
- ROTATE(tp9,8) ^ ROTATE(tpb,24);
+ t[i] = tpe ^ ROTATE(tpd, 16) ^ ROTATE(tp9, 8) ^ ROTATE(tpb, 24);
#else
- t[i] = tpe ^ (tpd >> 16) ^ (tpd << 16) ^
- (tp9 >> 24) ^ (tp9 << 8) ^
- (tpb >> 8) ^ (tpb << 24);
+ t[i] = tpe ^ (tpd >> 16) ^ (tpd << 16) ^ (tp9 >> 24) ^ (tp9 << 8) ^ (tpb >> 8) ^ (tpb << 24);
#endif
- t[i] ^= rk[4+i];
+ t[i] ^= rk[4 + i];
}
}
#else
- t[0] = Td0[(s0 ) & 0xff] ^
- Td1[(s3 >> 8) & 0xff] ^
- Td2[(s2 >> 16) & 0xff] ^
- Td3[(s1 >> 24) ] ^
- rk[4];
- t[1] = Td0[(s1 ) & 0xff] ^
- Td1[(s0 >> 8) & 0xff] ^
- Td2[(s3 >> 16) & 0xff] ^
- Td3[(s2 >> 24) ] ^
- rk[5];
- t[2] = Td0[(s2 ) & 0xff] ^
- Td1[(s1 >> 8) & 0xff] ^
- Td2[(s0 >> 16) & 0xff] ^
- Td3[(s3 >> 24) ] ^
- rk[6];
- t[3] = Td0[(s3 ) & 0xff] ^
- Td1[(s2 >> 8) & 0xff] ^
- Td2[(s1 >> 16) & 0xff] ^
- Td3[(s0 >> 24) ] ^
- rk[7];
+ t[0] = Td0[(s0) & 0xff] ^ Td1[(s3 >> 8) & 0xff] ^ Td2[(s2 >> 16) & 0xff] ^ Td3[(s1 >> 24)] ^ rk[4];
+ t[1] = Td0[(s1) & 0xff] ^ Td1[(s0 >> 8) & 0xff] ^ Td2[(s3 >> 16) & 0xff] ^ Td3[(s2 >> 24)] ^ rk[5];
+ t[2] = Td0[(s2) & 0xff] ^ Td1[(s1 >> 8) & 0xff] ^ Td2[(s0 >> 16) & 0xff] ^ Td3[(s3 >> 24)] ^ rk[6];
+ t[3] = Td0[(s3) & 0xff] ^ Td1[(s2 >> 8) & 0xff] ^ Td2[(s1 >> 16) & 0xff] ^ Td3[(s0 >> 24)] ^ rk[7];
#endif
- s0 = t[0]; s1 = t[1]; s2 = t[2]; s3 = t[3];
+ s0 = t[0];
+ s1 = t[1];
+ s2 = t[2];
+ s3 = t[3];
/*
* Nr - 2 full rounds:
*/
- for (rk+=8,r=key->rounds-2; r>0; rk+=4,r--) {
+ for (rk += 8, r = key->rounds - 2; r > 0; rk += 4, r--) {
#if defined(AES_COMPACT_IN_INNER_ROUNDS)
- t[0] = (u32)Td4[(s0 ) & 0xff] ^
- (u32)Td4[(s3 >> 8) & 0xff] << 8 ^
- (u32)Td4[(s2 >> 16) & 0xff] << 16 ^
- (u32)Td4[(s1 >> 24) ] << 24;
- t[1] = (u32)Td4[(s1 ) & 0xff] ^
- (u32)Td4[(s0 >> 8) & 0xff] << 8 ^
- (u32)Td4[(s3 >> 16) & 0xff] << 16 ^
- (u32)Td4[(s2 >> 24) ] << 24;
- t[2] = (u32)Td4[(s2 ) & 0xff] ^
- (u32)Td4[(s1 >> 8) & 0xff] << 8 ^
- (u32)Td4[(s0 >> 16) & 0xff] << 16 ^
- (u32)Td4[(s3 >> 24) ] << 24;
- t[3] = (u32)Td4[(s3 ) & 0xff] ^
- (u32)Td4[(s2 >> 8) & 0xff] << 8 ^
- (u32)Td4[(s1 >> 16) & 0xff] << 16 ^
- (u32)Td4[(s0 >> 24) ] << 24;
+ t[0] = (u32)Td4[(s0) & 0xff] ^ (u32)Td4[(s3 >> 8) & 0xff] << 8 ^ (u32)Td4[(s2 >> 16) & 0xff] << 16 ^ (u32)Td4[(s1 >> 24)] << 24;
+ t[1] = (u32)Td4[(s1) & 0xff] ^ (u32)Td4[(s0 >> 8) & 0xff] << 8 ^ (u32)Td4[(s3 >> 16) & 0xff] << 16 ^ (u32)Td4[(s2 >> 24)] << 24;
+ t[2] = (u32)Td4[(s2) & 0xff] ^ (u32)Td4[(s1 >> 8) & 0xff] << 8 ^ (u32)Td4[(s0 >> 16) & 0xff] << 16 ^ (u32)Td4[(s3 >> 24)] << 24;
+ t[3] = (u32)Td4[(s3) & 0xff] ^ (u32)Td4[(s2 >> 8) & 0xff] << 8 ^ (u32)Td4[(s1 >> 16) & 0xff] << 16 ^ (u32)Td4[(s0 >> 24)] << 24;
- /* now do the linear transform using words */
- {
- int i;
- u32 tp1, tp2, tp4, tp8, tp9, tpb, tpd, tpe, m;
+ /* now do the linear transform using words */
+ {
+ int i;
+ u32 tp1, tp2, tp4, tp8, tp9, tpb, tpd, tpe, m;
- for (i = 0; i < 4; i++) {
- tp1 = t[i];
- m = tp1 & 0x80808080;
- tp2 = ((tp1 & 0x7f7f7f7f) << 1) ^
- ((m - (m >> 7)) & 0x1b1b1b1b);
- m = tp2 & 0x80808080;
- tp4 = ((tp2 & 0x7f7f7f7f) << 1) ^
- ((m - (m >> 7)) & 0x1b1b1b1b);
- m = tp4 & 0x80808080;
- tp8 = ((tp4 & 0x7f7f7f7f) << 1) ^
- ((m - (m >> 7)) & 0x1b1b1b1b);
- tp9 = tp8 ^ tp1;
- tpb = tp9 ^ tp2;
- tpd = tp9 ^ tp4;
- tpe = tp8 ^ tp4 ^ tp2;
+ for (i = 0; i < 4; i++) {
+ tp1 = t[i];
+ m = tp1 & 0x80808080;
+ tp2 = ((tp1 & 0x7f7f7f7f) << 1) ^ ((m - (m >> 7)) & 0x1b1b1b1b);
+ m = tp2 & 0x80808080;
+ tp4 = ((tp2 & 0x7f7f7f7f) << 1) ^ ((m - (m >> 7)) & 0x1b1b1b1b);
+ m = tp4 & 0x80808080;
+ tp8 = ((tp4 & 0x7f7f7f7f) << 1) ^ ((m - (m >> 7)) & 0x1b1b1b1b);
+ tp9 = tp8 ^ tp1;
+ tpb = tp9 ^ tp2;
+ tpd = tp9 ^ tp4;
+ tpe = tp8 ^ tp4 ^ tp2;
#if defined(ROTATE)
- t[i] = tpe ^ ROTATE(tpd,16) ^
- ROTATE(tp9,8) ^ ROTATE(tpb,24);
+ t[i] = tpe ^ ROTATE(tpd, 16) ^ ROTATE(tp9, 8) ^ ROTATE(tpb, 24);
#else
- t[i] = tpe ^ (tpd >> 16) ^ (tpd << 16) ^
- (tp9 >> 24) ^ (tp9 << 8) ^
- (tpb >> 8) ^ (tpb << 24);
+ t[i] = tpe ^ (tpd >> 16) ^ (tpd << 16) ^ (tp9 >> 24) ^ (tp9 << 8) ^ (tpb >> 8) ^ (tpb << 24);
#endif
- t[i] ^= rk[i];
+ t[i] ^= rk[i];
+ }
}
- }
#else
- t[0] = Td0[(s0 ) & 0xff] ^
- Td1[(s3 >> 8) & 0xff] ^
- Td2[(s2 >> 16) & 0xff] ^
- Td3[(s1 >> 24) ] ^
- rk[0];
- t[1] = Td0[(s1 ) & 0xff] ^
- Td1[(s0 >> 8) & 0xff] ^
- Td2[(s3 >> 16) & 0xff] ^
- Td3[(s2 >> 24) ] ^
- rk[1];
- t[2] = Td0[(s2 ) & 0xff] ^
- Td1[(s1 >> 8) & 0xff] ^
- Td2[(s0 >> 16) & 0xff] ^
- Td3[(s3 >> 24) ] ^
- rk[2];
- t[3] = Td0[(s3 ) & 0xff] ^
- Td1[(s2 >> 8) & 0xff] ^
- Td2[(s1 >> 16) & 0xff] ^
- Td3[(s0 >> 24) ] ^
- rk[3];
+ t[0] = Td0[(s0) & 0xff] ^ Td1[(s3 >> 8) & 0xff] ^ Td2[(s2 >> 16) & 0xff] ^ Td3[(s1 >> 24)] ^ rk[0];
+ t[1] = Td0[(s1) & 0xff] ^ Td1[(s0 >> 8) & 0xff] ^ Td2[(s3 >> 16) & 0xff] ^ Td3[(s2 >> 24)] ^ rk[1];
+ t[2] = Td0[(s2) & 0xff] ^ Td1[(s1 >> 8) & 0xff] ^ Td2[(s0 >> 16) & 0xff] ^ Td3[(s3 >> 24)] ^ rk[2];
+ t[3] = Td0[(s3) & 0xff] ^ Td1[(s2 >> 8) & 0xff] ^ Td2[(s1 >> 16) & 0xff] ^ Td3[(s0 >> 24)] ^ rk[3];
#endif
- s0 = t[0]; s1 = t[1]; s2 = t[2]; s3 = t[3];
+ s0 = t[0];
+ s1 = t[1];
+ s2 = t[2];
+ s3 = t[3];
}
/*
* apply last round and
@@ -1045,28 +860,8 @@ void AES_decrypt(const unsigned char *in, unsigned char *out,
*/
prefetch256(Td4);
- *(u32*)(out+0) =
- ((u32)Td4[(s0 ) & 0xff]) ^
- ((u32)Td4[(s3 >> 8) & 0xff] << 8) ^
- ((u32)Td4[(s2 >> 16) & 0xff] << 16) ^
- ((u32)Td4[(s1 >> 24) ] << 24) ^
- rk[0];
- *(u32*)(out+4) =
- ((u32)Td4[(s1 ) & 0xff]) ^
- ((u32)Td4[(s0 >> 8) & 0xff] << 8) ^
- ((u32)Td4[(s3 >> 16) & 0xff] << 16) ^
- ((u32)Td4[(s2 >> 24) ] << 24) ^
- rk[1];
- *(u32*)(out+8) =
- ((u32)Td4[(s2 ) & 0xff]) ^
- ((u32)Td4[(s1 >> 8) & 0xff] << 8) ^
- ((u32)Td4[(s0 >> 16) & 0xff] << 16) ^
- ((u32)Td4[(s3 >> 24) ] << 24) ^
- rk[2];
- *(u32*)(out+12) =
- ((u32)Td4[(s3 ) & 0xff]) ^
- ((u32)Td4[(s2 >> 8) & 0xff] << 8) ^
- ((u32)Td4[(s1 >> 16) & 0xff] << 16) ^
- ((u32)Td4[(s0 >> 24) ] << 24) ^
- rk[3];
+ *(u32 *)(out + 0) = ((u32)Td4[(s0) & 0xff]) ^ ((u32)Td4[(s3 >> 8) & 0xff] << 8) ^ ((u32)Td4[(s2 >> 16) & 0xff] << 16) ^ ((u32)Td4[(s1 >> 24)] << 24) ^ rk[0];
+ *(u32 *)(out + 4) = ((u32)Td4[(s1) & 0xff]) ^ ((u32)Td4[(s0 >> 8) & 0xff] << 8) ^ ((u32)Td4[(s3 >> 16) & 0xff] << 16) ^ ((u32)Td4[(s2 >> 24)] << 24) ^ rk[1];
+ *(u32 *)(out + 8) = ((u32)Td4[(s2) & 0xff]) ^ ((u32)Td4[(s1 >> 8) & 0xff] << 8) ^ ((u32)Td4[(s0 >> 16) & 0xff] << 16) ^ ((u32)Td4[(s3 >> 24)] << 24) ^ rk[2];
+ *(u32 *)(out + 12) = ((u32)Td4[(s3) & 0xff]) ^ ((u32)Td4[(s2 >> 8) & 0xff] << 8) ^ ((u32)Td4[(s1 >> 16) & 0xff] << 16) ^ ((u32)Td4[(s0 >> 24)] << 24) ^ rk[3];
}
diff --git a/crypto/aligned_alloc.c b/crypto/aligned_alloc.c
index f2eed13c6c..639286ea6e 100644
--- a/crypto/aligned_alloc.c
+++ b/crypto/aligned_alloc.c
@@ -14,7 +14,7 @@
#include <stdlib.h>
void *ossl_malloc_align(size_t num, size_t alignment, void **freeptr,
- const char *file, int line)
+ const char *file, int line)
{
size_t alloc_bytes;
void *ret;
diff --git a/crypto/aria/aria.c b/crypto/aria/aria.c
index 84ddd00cd8..eed9214d4b 100644
--- a/crypto/aria/aria.c
+++ b/crypto/aria/aria.c
@@ -32,30 +32,23 @@
#define rotl32(v, r) (((uint32_t)(v) << (r)) | ((uint32_t)(v) >> (32 - r)))
#define rotr32(v, r) (((uint32_t)(v) >> (r)) | ((uint32_t)(v) << (32 - r)))
-#define bswap32(v) \
- (((v) << 24) ^ ((v) >> 24) ^ \
- (((v) & 0x0000ff00) << 8) ^ (((v) & 0x00ff0000) >> 8))
+#define bswap32(v) \
+ (((v) << 24) ^ ((v) >> 24) ^ (((v) & 0x0000ff00) << 8) ^ (((v) & 0x00ff0000) >> 8))
#define GET_U8_BE(X, Y) ((uint8_t)((X) >> ((3 - Y) * 8)))
-#define GET_U32_BE(X, Y) ( \
- ((uint32_t)((const uint8_t *)(X))[Y * 4 ] << 24) ^ \
- ((uint32_t)((const uint8_t *)(X))[Y * 4 + 1] << 16) ^ \
- ((uint32_t)((const uint8_t *)(X))[Y * 4 + 2] << 8) ^ \
- ((uint32_t)((const uint8_t *)(X))[Y * 4 + 3] ) )
-
-#define PUT_U32_BE(DEST, IDX, VAL) \
- do { \
- ((uint8_t *)(DEST))[IDX * 4 ] = GET_U8_BE(VAL, 0); \
- ((uint8_t *)(DEST))[IDX * 4 + 1] = GET_U8_BE(VAL, 1); \
- ((uint8_t *)(DEST))[IDX * 4 + 2] = GET_U8_BE(VAL, 2); \
- ((uint8_t *)(DEST))[IDX * 4 + 3] = GET_U8_BE(VAL, 3); \
- } while(0)
-
-#define MAKE_U32(V0, V1, V2, V3) ( \
- ((uint32_t)((uint8_t)(V0)) << 24) | \
- ((uint32_t)((uint8_t)(V1)) << 16) | \
- ((uint32_t)((uint8_t)(V2)) << 8) | \
- ((uint32_t)((uint8_t)(V3)) ) )
+#define GET_U32_BE(X, Y) ( \
+ ((uint32_t)((const uint8_t *)(X))[Y * 4] << 24) ^ ((uint32_t)((const uint8_t *)(X))[Y * 4 + 1] << 16) ^ ((uint32_t)((const uint8_t *)(X))[Y * 4 + 2] << 8) ^ ((uint32_t)((const uint8_t *)(X))[Y * 4 + 3]))
+
+#define PUT_U32_BE(DEST, IDX, VAL) \
+ do { \
+ ((uint8_t *)(DEST))[IDX * 4] = GET_U8_BE(VAL, 0); \
+ ((uint8_t *)(DEST))[IDX * 4 + 1] = GET_U8_BE(VAL, 1); \
+ ((uint8_t *)(DEST))[IDX * 4 + 2] = GET_U8_BE(VAL, 2); \
+ ((uint8_t *)(DEST))[IDX * 4 + 3] = GET_U8_BE(VAL, 3); \
+ } while (0)
+
+#define MAKE_U32(V0, V1, V2, V3) ( \
+ ((uint32_t)((uint8_t)(V0)) << 24) | ((uint32_t)((uint8_t)(V1)) << 16) | ((uint32_t)((uint8_t)(V2)) << 8) | ((uint32_t)((uint8_t)(V3))))
/* End Macro*/
@@ -342,75 +335,43 @@ static const uint32_t X2[256] = {
};
/* Key XOR Layer */
-#define ARIA_ADD_ROUND_KEY(RK, T0, T1, T2, T3) \
- do { \
- (T0) ^= (RK)->u[0]; \
- (T1) ^= (RK)->u[1]; \
- (T2) ^= (RK)->u[2]; \
- (T3) ^= (RK)->u[3]; \
- } while(0)
+#define ARIA_ADD_ROUND_KEY(RK, T0, T1, T2, T3) \
+ do { \
+ (T0) ^= (RK)->u[0]; \
+ (T1) ^= (RK)->u[1]; \
+ (T2) ^= (RK)->u[2]; \
+ (T3) ^= (RK)->u[3]; \
+ } while (0)
/* S-Box Layer 1 + M */
-#define ARIA_SBOX_LAYER1_WITH_PRE_DIFF(T0, T1, T2, T3) \
- do { \
- (T0) = \
- S1[GET_U8_BE(T0, 0)] ^ \
- S2[GET_U8_BE(T0, 1)] ^ \
- X1[GET_U8_BE(T0, 2)] ^ \
- X2[GET_U8_BE(T0, 3)]; \
- (T1) = \
- S1[GET_U8_BE(T1, 0)] ^ \
- S2[GET_U8_BE(T1, 1)] ^ \
- X1[GET_U8_BE(T1, 2)] ^ \
- X2[GET_U8_BE(T1, 3)]; \
- (T2) = \
- S1[GET_U8_BE(T2, 0)] ^ \
- S2[GET_U8_BE(T2, 1)] ^ \
- X1[GET_U8_BE(T2, 2)] ^ \
- X2[GET_U8_BE(T2, 3)]; \
- (T3) = \
- S1[GET_U8_BE(T3, 0)] ^ \
- S2[GET_U8_BE(T3, 1)] ^ \
- X1[GET_U8_BE(T3, 2)] ^ \
- X2[GET_U8_BE(T3, 3)]; \
- } while(0)
+#define ARIA_SBOX_LAYER1_WITH_PRE_DIFF(T0, T1, T2, T3) \
+ do { \
+ (T0) = S1[GET_U8_BE(T0, 0)] ^ S2[GET_U8_BE(T0, 1)] ^ X1[GET_U8_BE(T0, 2)] ^ X2[GET_U8_BE(T0, 3)]; \
+ (T1) = S1[GET_U8_BE(T1, 0)] ^ S2[GET_U8_BE(T1, 1)] ^ X1[GET_U8_BE(T1, 2)] ^ X2[GET_U8_BE(T1, 3)]; \
+ (T2) = S1[GET_U8_BE(T2, 0)] ^ S2[GET_U8_BE(T2, 1)] ^ X1[GET_U8_BE(T2, 2)] ^ X2[GET_U8_BE(T2, 3)]; \
+ (T3) = S1[GET_U8_BE(T3, 0)] ^ S2[GET_U8_BE(T3, 1)] ^ X1[GET_U8_BE(T3, 2)] ^ X2[GET_U8_BE(T3, 3)]; \
+ } while (0)
/* S-Box Layer 2 + M */
-#define ARIA_SBOX_LAYER2_WITH_PRE_DIFF(T0, T1, T2, T3) \
- do { \
- (T0) = \
- X1[GET_U8_BE(T0, 0)] ^ \
- X2[GET_U8_BE(T0, 1)] ^ \
- S1[GET_U8_BE(T0, 2)] ^ \
- S2[GET_U8_BE(T0, 3)]; \
- (T1) = \
- X1[GET_U8_BE(T1, 0)] ^ \
- X2[GET_U8_BE(T1, 1)] ^ \
- S1[GET_U8_BE(T1, 2)] ^ \
- S2[GET_U8_BE(T1, 3)]; \
- (T2) = \
- X1[GET_U8_BE(T2, 0)] ^ \
- X2[GET_U8_BE(T2, 1)] ^ \
- S1[GET_U8_BE(T2, 2)] ^ \
- S2[GET_U8_BE(T2, 3)]; \
- (T3) = \
- X1[GET_U8_BE(T3, 0)] ^ \
- X2[GET_U8_BE(T3, 1)] ^ \
- S1[GET_U8_BE(T3, 2)] ^ \
- S2[GET_U8_BE(T3, 3)]; \
- } while(0)
+#define ARIA_SBOX_LAYER2_WITH_PRE_DIFF(T0, T1, T2, T3) \
+ do { \
+ (T0) = X1[GET_U8_BE(T0, 0)] ^ X2[GET_U8_BE(T0, 1)] ^ S1[GET_U8_BE(T0, 2)] ^ S2[GET_U8_BE(T0, 3)]; \
+ (T1) = X1[GET_U8_BE(T1, 0)] ^ X2[GET_U8_BE(T1, 1)] ^ S1[GET_U8_BE(T1, 2)] ^ S2[GET_U8_BE(T1, 3)]; \
+ (T2) = X1[GET_U8_BE(T2, 0)] ^ X2[GET_U8_BE(T2, 1)] ^ S1[GET_U8_BE(T2, 2)] ^ S2[GET_U8_BE(T2, 3)]; \
+ (T3) = X1[GET_U8_BE(T3, 0)] ^ X2[GET_U8_BE(T3, 1)] ^ S1[GET_U8_BE(T3, 2)] ^ S2[GET_U8_BE(T3, 3)]; \
+ } while (0)
/* Word-level diffusion */
-#define ARIA_DIFF_WORD(T0,T1,T2,T3) \
- do { \
- (T1) ^= (T2); \
- (T2) ^= (T3); \
- (T0) ^= (T1); \
- \
- (T3) ^= (T1); \
- (T2) ^= (T0); \
- (T1) ^= (T2); \
- } while(0)
+#define ARIA_DIFF_WORD(T0, T1, T2, T3) \
+ do { \
+ (T1) ^= (T2); \
+ (T2) ^= (T3); \
+ (T0) ^= (T1); \
+ \
+ (T3) ^= (T1); \
+ (T2) ^= (T0); \
+ (T1) ^= (T2); \
+ } while (0)
/* Byte-level diffusion */
#define ARIA_DIFF_BYTE(T0, T1, T2, T3) \
@@ -418,7 +379,7 @@ static const uint32_t X2[256] = {
(T1) = (((T1) << 8) & 0xff00ff00) ^ (((T1) >> 8) & 0x00ff00ff); \
(T2) = rotr32(T2, 16); \
(T3) = bswap32(T3); \
- } while(0)
+ } while (0)
/* Odd round Substitution & Diffusion */
#define ARIA_SUBST_DIFF_ODD(T0, T1, T2, T3) \
@@ -427,7 +388,7 @@ static const uint32_t X2[256] = {
ARIA_DIFF_WORD(T0, T1, T2, T3); \
ARIA_DIFF_BYTE(T0, T1, T2, T3); \
ARIA_DIFF_WORD(T0, T1, T2, T3); \
- } while(0)
+ } while (0)
/* Even round Substitution & Diffusion */
#define ARIA_SUBST_DIFF_EVEN(T0, T1, T2, T3) \
@@ -436,40 +397,28 @@ static const uint32_t X2[256] = {
ARIA_DIFF_WORD(T0, T1, T2, T3); \
ARIA_DIFF_BYTE(T2, T3, T0, T1); \
ARIA_DIFF_WORD(T0, T1, T2, T3); \
- } while(0)
+ } while (0)
/* Q, R Macro expanded ARIA GSRK */
-#define _ARIA_GSRK(RK, X, Y, Q, R) \
- do { \
- (RK)->u[0] = \
- ((X)[0]) ^ \
- (((Y)[((Q) ) % 4]) >> (R)) ^ \
- (((Y)[((Q) + 3) % 4]) << (32 - (R))); \
- (RK)->u[1] = \
- ((X)[1]) ^ \
- (((Y)[((Q) + 1) % 4]) >> (R)) ^ \
- (((Y)[((Q) ) % 4]) << (32 - (R))); \
- (RK)->u[2] = \
- ((X)[2]) ^ \
- (((Y)[((Q) + 2) % 4]) >> (R)) ^ \
- (((Y)[((Q) + 1) % 4]) << (32 - (R))); \
- (RK)->u[3] = \
- ((X)[3]) ^ \
- (((Y)[((Q) + 3) % 4]) >> (R)) ^ \
- (((Y)[((Q) + 2) % 4]) << (32 - (R))); \
- } while(0)
+#define _ARIA_GSRK(RK, X, Y, Q, R) \
+ do { \
+ (RK)->u[0] = ((X)[0]) ^ (((Y)[((Q)) % 4]) >> (R)) ^ (((Y)[((Q) + 3) % 4]) << (32 - (R))); \
+ (RK)->u[1] = ((X)[1]) ^ (((Y)[((Q) + 1) % 4]) >> (R)) ^ (((Y)[((Q)) % 4]) << (32 - (R))); \
+ (RK)->u[2] = ((X)[2]) ^ (((Y)[((Q) + 2) % 4]) >> (R)) ^ (((Y)[((Q) + 1) % 4]) << (32 - (R))); \
+ (RK)->u[3] = ((X)[3]) ^ (((Y)[((Q) + 3) % 4]) >> (R)) ^ (((Y)[((Q) + 2) % 4]) << (32 - (R))); \
+ } while (0)
#define ARIA_GSRK(RK, X, Y, N) _ARIA_GSRK(RK, X, Y, 4 - ((N) / 32), (N) % 32)
-#define ARIA_DEC_DIFF_BYTE(X, Y, TMP, TMP2) \
- do { \
- (TMP) = (X); \
- (TMP2) = rotr32((TMP), 8); \
- (Y) = (TMP2) ^ rotr32((TMP) ^ (TMP2), 16); \
- } while(0)
+#define ARIA_DEC_DIFF_BYTE(X, Y, TMP, TMP2) \
+ do { \
+ (TMP) = (X); \
+ (TMP2) = rotr32((TMP), 8); \
+ (Y) = (TMP2) ^ rotr32((TMP) ^ (TMP2), 16); \
+ } while (0)
void ossl_aria_encrypt(const unsigned char *in, unsigned char *out,
- const ARIA_KEY *key)
+ const ARIA_KEY *key)
{
register uint32_t reg0, reg1, reg2, reg3;
int Nr;
@@ -508,26 +457,10 @@ void ossl_aria_encrypt(const unsigned char *in, unsigned char *out,
rk++;
}
- reg0 = rk->u[0] ^ MAKE_U32(
- (uint8_t)(X1[GET_U8_BE(reg0, 0)] ),
- (uint8_t)(X2[GET_U8_BE(reg0, 1)] >> 8),
- (uint8_t)(S1[GET_U8_BE(reg0, 2)] ),
- (uint8_t)(S2[GET_U8_BE(reg0, 3)] ));
- reg1 = rk->u[1] ^ MAKE_U32(
- (uint8_t)(X1[GET_U8_BE(reg1, 0)] ),
- (uint8_t)(X2[GET_U8_BE(reg1, 1)] >> 8),
- (uint8_t)(S1[GET_U8_BE(reg1, 2)] ),
- (uint8_t)(S2[GET_U8_BE(reg1, 3)] ));
- reg2 = rk->u[2] ^ MAKE_U32(
- (uint8_t)(X1[GET_U8_BE(reg2, 0)] ),
- (uint8_t)(X2[GET_U8_BE(reg2, 1)] >> 8),
- (uint8_t)(S1[GET_U8_BE(reg2, 2)] ),
- (uint8_t)(S2[GET_U8_BE(reg2, 3)] ));
- reg3 = rk->u[3] ^ MAKE_U32(
- (uint8_t)(X1[GET_U8_BE(reg3, 0)] ),
- (uint8_t)(X2[GET_U8_BE(reg3, 1)] >> 8),
- (uint8_t)(S1[GET_U8_BE(reg3, 2)] ),
- (uint8_t)(S2[GET_U8_BE(reg3, 3)] ));
+ reg0 = rk->u[0] ^ MAKE_U32((uint8_t)(X1[GET_U8_BE(reg0, 0)]), (uint8_t)(X2[GET_U8_BE(reg0, 1)] >> 8), (uint8_t)(S1[GET_U8_BE(reg0, 2)]), (uint8_t)(S2[GET_U8_BE(reg0, 3)]));
+ reg1 = rk->u[1] ^ MAKE_U32((uint8_t)(X1[GET_U8_BE(reg1, 0)]), (uint8_t)(X2[GET_U8_BE(reg1, 1)] >> 8), (uint8_t)(S1[GET_U8_BE(reg1, 2)]), (uint8_t)(S2[GET_U8_BE(reg1, 3)]));
+ reg2 = rk->u[2] ^ MAKE_U32((uint8_t)(X1[GET_U8_BE(reg2, 0)]), (uint8_t)(X2[GET_U8_BE(reg2, 1)] >> 8), (uint8_t)(S1[GET_U8_BE(reg2, 2)]), (uint8_t)(S2[GET_U8_BE(reg2, 3)]));
+ reg3 = rk->u[3] ^ MAKE_U32((uint8_t)(X1[GET_U8_BE(reg3, 0)]), (uint8_t)(X2[GET_U8_BE(reg3, 1)] >> 8), (uint8_t)(S1[GET_U8_BE(reg3, 2)]), (uint8_t)(S2[GET_U8_BE(reg3, 3)]));
PUT_U32_BE(out, 0, reg0);
PUT_U32_BE(out, 1, reg1);
@@ -536,7 +469,7 @@ void ossl_aria_encrypt(const unsigned char *in, unsigned char *out,
}
int ossl_aria_set_encrypt_key(const unsigned char *userKey, const int bits,
- ARIA_KEY *key)
+ ARIA_KEY *key)
{
register uint32_t reg0, reg1, reg2, reg3;
uint32_t w0[4], w1[4], w2[4], w3[4];
@@ -574,12 +507,10 @@ int ossl_aria_set_encrypt_key(const unsigned char *userKey, const int bits,
if (bits > 192) {
w1[2] = GET_U32_BE(userKey, 6);
w1[3] = GET_U32_BE(userKey, 7);
- }
- else {
+ } else {
w1[2] = w1[3] = 0;
}
- }
- else {
+ } else {
w1[0] = w1[1] = w1[2] = w1[3] = 0;
}
@@ -668,7 +599,7 @@ int ossl_aria_set_encrypt_key(const unsigned char *userKey, const int bits,
}
int ossl_aria_set_decrypt_key(const unsigned char *userKey, const int bits,
- ARIA_KEY *key)
+ ARIA_KEY *key)
{
ARIA_u128 *rk_head;
ARIA_u128 *rk_tail;
@@ -893,20 +824,14 @@ static const unsigned char sb4[256] = {
0xf7, 0x4c, 0x11, 0x33, 0x03, 0xa2, 0xac, 0x60
};
-static const ARIA_u128 c1 = {{
- 0x51, 0x7c, 0xc1, 0xb7, 0x27, 0x22, 0x0a, 0x94,
- 0xfe, 0x13, 0xab, 0xe8, 0xfa, 0x9a, 0x6e, 0xe0
-}};
+static const ARIA_u128 c1 = { { 0x51, 0x7c, 0xc1, 0xb7, 0x27, 0x22, 0x0a, 0x94,
+ 0xfe, 0x13, 0xab, 0xe8, 0xfa, 0x9a, 0x6e, 0xe0 } };
-static const ARIA_u128 c2 = {{
- 0x6d, 0xb1, 0x4a, 0xcc, 0x9e, 0x21, 0xc8, 0x20,
- 0xff, 0x28, 0xb1, 0xd5, 0xef, 0x5d, 0xe2, 0xb0
-}};
+static const ARIA_u128 c2 = { { 0x6d, 0xb1, 0x4a, 0xcc, 0x9e, 0x21, 0xc8, 0x20,
+ 0xff, 0x28, 0xb1, 0xd5, 0xef, 0x5d, 0xe2, 0xb0 } };
-static const ARIA_u128 c3 = {{
- 0xdb, 0x92, 0x37, 0x1d, 0x21, 0x26, 0xe9, 0x70,
- 0x03, 0x24, 0x97, 0x75, 0x04, 0xe8, 0xc9, 0x0e
-}};
+static const ARIA_u128 c3 = { { 0xdb, 0x92, 0x37, 0x1d, 0x21, 0x26, 0xe9, 0x70,
+ 0x03, 0x24, 0x97, 0x75, 0x04, 0xe8, 0xc9, 0x0e } };
/*
* Exclusive or two 128 bit values into the result.
@@ -925,7 +850,7 @@ static void xor128(ARIA_c128 o, const ARIA_c128 x, const ARIA_u128 *y)
* It is safe for the output to overlap either input.
*/
static ossl_inline void rotnr(unsigned int n, ARIA_u128 *o,
- const ARIA_u128 *xor, const ARIA_u128 *z)
+ const ARIA_u128 *xor, const ARIA_u128 *z)
{
const unsigned int bytes = n / 8, bits = n % 8;
unsigned int i;
@@ -934,9 +859,7 @@ static ossl_inline void rotnr(unsigned int n, ARIA_u128 *o,
for (i = 0; i < ARIA_BLOCK_SIZE; i++)
t.c[(i + bytes) % ARIA_BLOCK_SIZE] = z->c[i];
for (i = 0; i < ARIA_BLOCK_SIZE; i++)
- o->c[i] = ((t.c[i] >> bits) |
- (t.c[i ? i - 1 : ARIA_BLOCK_SIZE - 1] << (8 - bits))) ^
- xor->c[i];
+ o->c[i] = ((t.c[i] >> bits) | (t.c[i ? i - 1 : ARIA_BLOCK_SIZE - 1] << (8 - bits))) ^ xor->c[i];
}
/*
@@ -992,7 +915,7 @@ static void sl1(ARIA_u128 *o, const ARIA_u128 *x, const ARIA_u128 *y)
{
unsigned int i;
for (i = 0; i < ARIA_BLOCK_SIZE; i += 4) {
- o->c[i ] = sb1[x->c[i ] ^ y->c[i ]];
+ o->c[i] = sb1[x->c[i] ^ y->c[i]];
o->c[i + 1] = sb2[x->c[i + 1] ^ y->c[i + 1]];
o->c[i + 2] = sb3[x->c[i + 2] ^ y->c[i + 2]];
o->c[i + 3] = sb4[x->c[i + 3] ^ y->c[i + 3]];
@@ -1007,7 +930,7 @@ static void sl2(ARIA_c128 o, const ARIA_u128 *x, const ARIA_u128 *y)
{
unsigned int i;
for (i = 0; i < ARIA_BLOCK_SIZE; i += 4) {
- o[i ] = sb3[x->c[i ] ^ y->c[i ]];
+ o[i] = sb3[x->c[i] ^ y->c[i]];
o[i + 1] = sb4[x->c[i + 1] ^ y->c[i + 1]];
o[i + 2] = sb1[x->c[i + 2] ^ y->c[i + 2]];
o[i + 3] = sb2[x->c[i + 3] ^ y->c[i + 3]];
@@ -1020,38 +943,22 @@ static void sl2(ARIA_c128 o, const ARIA_u128 *x, const ARIA_u128 *y)
*/
static void a(ARIA_u128 *y, const ARIA_u128 *x)
{
- y->c[ 0] = x->c[ 3] ^ x->c[ 4] ^ x->c[ 6] ^ x->c[ 8] ^
- x->c[ 9] ^ x->c[13] ^ x->c[14];
- y->c[ 1] = x->c[ 2] ^ x->c[ 5] ^ x->c[ 7] ^ x->c[ 8] ^
- x->c[ 9] ^ x->c[12] ^ x->c[15];
- y->c[ 2] = x->c[ 1] ^ x->c[ 4] ^ x->c[ 6] ^ x->c[10] ^
- x->c[11] ^ x->c[12] ^ x->c[15];
- y->c[ 3] = x->c[ 0] ^ x->c[ 5] ^ x->c[ 7] ^ x->c[10] ^
- x->c[11] ^ x->c[13] ^ x->c[14];
- y->c[ 4] = x->c[ 0] ^ x->c[ 2] ^ x->c[ 5] ^ x->c[ 8] ^
- x->c[11] ^ x->c[14] ^ x->c[15];
- y->c[ 5] = x->c[ 1] ^ x->c[ 3] ^ x->c[ 4] ^ x->c[ 9] ^
- x->c[10] ^ x->c[14] ^ x->c[15];
- y->c[ 6] = x->c[ 0] ^ x->c[ 2] ^ x->c[ 7] ^ x->c[ 9] ^
- x->c[10] ^ x->c[12] ^ x->c[13];
- y->c[ 7] = x->c[ 1] ^ x->c[ 3] ^ x->c[ 6] ^ x->c[ 8] ^
- x->c[11] ^ x->c[12] ^ x->c[13];
- y->c[ 8] = x->c[ 0] ^ x->c[ 1] ^ x->c[ 4] ^ x->c[ 7] ^
- x->c[10] ^ x->c[13] ^ x->c[15];
- y->c[ 9] = x->c[ 0] ^ x->c[ 1] ^ x->c[ 5] ^ x->c[ 6] ^
- x->c[11] ^ x->c[12] ^ x->c[14];
- y->c[10] = x->c[ 2] ^ x->c[ 3] ^ x->c[ 5] ^ x->c[ 6] ^
- x->c[ 8] ^ x->c[13] ^ x->c[15];
- y->c[11] = x->c[ 2] ^ x->c[ 3] ^ x->c[ 4] ^ x->c[ 7] ^
- x->c[ 9] ^ x->c[12] ^ x->c[14];
- y->c[12] = x->c[ 1] ^ x->c[ 2] ^ x->c[ 6] ^ x->c[ 7] ^
- x->c[ 9] ^ x->c[11] ^ x->c[12];
- y->c[13] = x->c[ 0] ^ x->c[ 3] ^ x->c[ 6] ^ x->c[ 7] ^
- x->c[ 8] ^ x->c[10] ^ x->c[13];
- y->c[14] = x->c[ 0] ^ x->c[ 3] ^ x->c[ 4] ^ x->c[ 5] ^
- x->c[ 9] ^ x->c[11] ^ x->c[14];
- y->c[15] = x->c[ 1] ^ x->c[ 2] ^ x->c[ 4] ^ x->c[ 5] ^
- x->c[ 8] ^ x->c[10] ^ x->c[15];
+ y->c[0] = x->c[3] ^ x->c[4] ^ x->c[6] ^ x->c[8] ^ x->c[9] ^ x->c[13] ^ x->c[14];
+ y->c[1] = x->c[2] ^ x->c[5] ^ x->c[7] ^ x->c[8] ^ x->c[9] ^ x->c[12] ^ x->c[15];
+ y->c[2] = x->c[1] ^ x->c[4] ^ x->c[6] ^ x->c[10] ^ x->c[11] ^ x->c[12] ^ x->c[15];
+ y->c[3] = x->c[0] ^ x->c[5] ^ x->c[7] ^ x->c[10] ^ x->c[11] ^ x->c[13] ^ x->c[14];
+ y->c[4] = x->c[0] ^ x->c[2] ^ x->c[5] ^ x->c[8] ^ x->c[11] ^ x->c[14] ^ x->c[15];
+ y->c[5] = x->c[1] ^ x->c[3] ^ x->c[4] ^ x->c[9] ^ x->c[10] ^ x->c[14] ^ x->c[15];
+ y->c[6] = x->c[0] ^ x->c[2] ^ x->c[7] ^ x->c[9] ^ x->c[10] ^ x->c[12] ^ x->c[13];
+ y->c[7] = x->c[1] ^ x->c[3] ^ x->c[6] ^ x->c[8] ^ x->c[11] ^ x->c[12] ^ x->c[13];
+ y->c[8] = x->c[0] ^ x->c[1] ^ x->c[4] ^ x->c[7] ^ x->c[10] ^ x->c[13] ^ x->c[15];
+ y->c[9] = x->c[0] ^ x->c[1] ^ x->c[5] ^ x->c[6] ^ x->c[11] ^ x->c[12] ^ x->c[14];
+ y->c[10] = x->c[2] ^ x->c[3] ^ x->c[5] ^ x->c[6] ^ x->c[8] ^ x->c[13] ^ x->c[15];
+ y->c[11] = x->c[2] ^ x->c[3] ^ x->c[4] ^ x->c[7] ^ x->c[9] ^ x->c[12] ^ x->c[14];
+ y->c[12] = x->c[1] ^ x->c[2] ^ x->c[6] ^ x->c[7] ^ x->c[9] ^ x->c[11] ^ x->c[12];
+ y->c[13] = x->c[0] ^ x->c[3] ^ x->c[6] ^ x->c[7] ^ x->c[8] ^ x->c[10] ^ x->c[13];
+ y->c[14] = x->c[0] ^ x->c[3] ^ x->c[4] ^ x->c[5] ^ x->c[9] ^ x->c[11] ^ x->c[14];
+ y->c[15] = x->c[1] ^ x->c[2] ^ x->c[4] ^ x->c[5] ^ x->c[8] ^ x->c[10] ^ x->c[15];
}
/*
@@ -1060,7 +967,7 @@ static void a(ARIA_u128 *y, const ARIA_u128 *x)
* It is safe for the input and output to overlap.
*/
static ossl_inline void FO(ARIA_u128 *o, const ARIA_u128 *d,
- const ARIA_u128 *rk)
+ const ARIA_u128 *rk)
{
ARIA_u128 y;
@@ -1074,7 +981,7 @@ static ossl_inline void FO(ARIA_u128 *o, const ARIA_u128 *d,
* It is safe for the input and output to overlap.
*/
static ossl_inline void FE(ARIA_u128 *o, const ARIA_u128 *d,
- const ARIA_u128 *rk)
+ const ARIA_u128 *rk)
{
ARIA_u128 y;
@@ -1087,7 +994,7 @@ static ossl_inline void FE(ARIA_u128 *o, const ARIA_u128 *d,
* in and out can overlap
*/
static void do_encrypt(unsigned char *o, const unsigned char *pin,
- unsigned int rounds, const ARIA_u128 *keys)
+ unsigned int rounds, const ARIA_u128 *keys)
{
ARIA_u128 p;
unsigned int i;
@@ -1107,20 +1014,19 @@ static void do_encrypt(unsigned char *o, const unsigned char *pin,
* in and out can overlap
*/
void ossl_aria_encrypt(const unsigned char *in, unsigned char *out,
- const ARIA_KEY *key)
+ const ARIA_KEY *key)
{
assert(in != NULL && out != NULL && key != NULL);
do_encrypt(out, in, key->rounds, key->rd_key);
}
-
/*
* Expand the cipher key into the encryption key schedule.
* We short circuit execution of the last two
* or four rotations based on the key size.
*/
int ossl_aria_set_encrypt_key(const unsigned char *userKey, const int bits,
- ARIA_KEY *key)
+ ARIA_KEY *key)
{
const ARIA_u128 *ck1, *ck2, *ck3;
ARIA_u128 kr, w0, w1, w2, w3;
@@ -1157,22 +1063,25 @@ int ossl_aria_set_encrypt_key(const unsigned char *userKey, const int bits,
break;
}
- FO(&w3, &w0, ck1); xor128(w1.c, w3.c, &kr);
- FE(&w3, &w1, ck2); xor128(w2.c, w3.c, &w0);
- FO(&kr, &w2, ck3); xor128(w3.c, kr.c, &w1);
-
- rot19r(&key->rd_key[ 0], &w0, &w1);
- rot19r(&key->rd_key[ 1], &w1, &w2);
- rot19r(&key->rd_key[ 2], &w2, &w3);
- rot19r(&key->rd_key[ 3], &w3, &w0);
-
- rot31r(&key->rd_key[ 4], &w0, &w1);
- rot31r(&key->rd_key[ 5], &w1, &w2);
- rot31r(&key->rd_key[ 6], &w2, &w3);
- rot31r(&key->rd_key[ 7], &w3, &w0);
-
- rot61l(&key->rd_key[ 8], &w0, &w1);
- rot61l(&key->rd_key[ 9], &w1, &w2);
+ FO(&w3, &w0, ck1);
+ xor128(w1.c, w3.c, &kr);
+ FE(&w3, &w1, ck2);
+ xor128(w2.c, w3.c, &w0);
+ FO(&kr, &w2, ck3);
+ xor128(w3.c, kr.c, &w1);
+
+ rot19r(&key->rd_key[0], &w0, &w1);
+ rot19r(&key->rd_key[1], &w1, &w2);
+ rot19r(&key->rd_key[2], &w2, &w3);
+ rot19r(&key->rd_key[3], &w3, &w0);
+
+ rot31r(&key->rd_key[4], &w0, &w1);
+ rot31r(&key->rd_key[5], &w1, &w2);
+ rot31r(&key->rd_key[6], &w2, &w3);
+ rot31r(&key->rd_key[7], &w3, &w0);
+
+ rot61l(&key->rd_key[8], &w0, &w1);
+ rot61l(&key->rd_key[9], &w1, &w2);
rot61l(&key->rd_key[10], &w2, &w3);
rot61l(&key->rd_key[11], &w3, &w0);
@@ -1193,7 +1102,7 @@ int ossl_aria_set_encrypt_key(const unsigned char *userKey, const int bits,
* Expand the cipher key into the decryption key schedule.
*/
int ossl_aria_set_decrypt_key(const unsigned char *userKey, const int bits,
- ARIA_KEY *key)
+ ARIA_KEY *key)
{
ARIA_KEY ek;
const int r = ossl_aria_set_encrypt_key(userKey, bits, &ek);
diff --git a/crypto/arm_arch.h b/crypto/arm_arch.h
index b037e1b9f1..1cf41ff5b5 100644
--- a/crypto/arm_arch.h
+++ b/crypto/arm_arch.h
@@ -8,88 +8,81 @@
*/
#ifndef OSSL_CRYPTO_ARM_ARCH_H
-# define OSSL_CRYPTO_ARM_ARCH_H
-
-# if !defined(__ARM_ARCH__)
-# if defined(__CC_ARM)
-# define __ARM_ARCH__ __TARGET_ARCH_ARM
-# if defined(__BIG_ENDIAN)
-# define __ARMEB__
-# else
-# define __ARMEL__
-# endif
-# elif defined(__GNUC__)
-# if defined(__aarch64__)
-# define __ARM_ARCH__ 8
- /*
- * Why doesn't gcc define __ARM_ARCH__? Instead it defines
- * bunch of below macros. See all_architectures[] table in
- * gcc/config/arm/arm.c. On a side note it defines
- * __ARMEL__/__ARMEB__ for little-/big-endian.
- */
-# elif defined(__ARM_ARCH)
-# define __ARM_ARCH__ __ARM_ARCH
-# elif defined(__ARM_ARCH_8A__)
-# define __ARM_ARCH__ 8
-# elif defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || \
- defined(__ARM_ARCH_7R__)|| defined(__ARM_ARCH_7M__) || \
- defined(__ARM_ARCH_7EM__)
-# define __ARM_ARCH__ 7
-# elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || \
- defined(__ARM_ARCH_6K__)|| defined(__ARM_ARCH_6M__) || \
- defined(__ARM_ARCH_6Z__)|| defined(__ARM_ARCH_6ZK__) || \
- defined(__ARM_ARCH_6T2__)
-# define __ARM_ARCH__ 6
-# elif defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__) || \
- defined(__ARM_ARCH_5E__)|| defined(__ARM_ARCH_5TE__) || \
- defined(__ARM_ARCH_5TEJ__)
-# define __ARM_ARCH__ 5
-# elif defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__)
-# define __ARM_ARCH__ 4
-# else
-# error "unsupported ARM architecture"
-# endif
-# elif defined(__ARM_ARCH)
-# define __ARM_ARCH__ __ARM_ARCH
-# endif
-# endif
-
-# if !defined(__ARM_MAX_ARCH__)
-# define __ARM_MAX_ARCH__ __ARM_ARCH__
-# endif
-
-# if __ARM_MAX_ARCH__<__ARM_ARCH__
-# error "__ARM_MAX_ARCH__ can't be less than __ARM_ARCH__"
-# elif __ARM_MAX_ARCH__!=__ARM_ARCH__
-# if __ARM_ARCH__<7 && __ARM_MAX_ARCH__>=7 && defined(__ARMEB__)
-# error "can't build universal big-endian binary"
-# endif
-# endif
-
-# ifndef __ASSEMBLER__
+#define OSSL_CRYPTO_ARM_ARCH_H
+
+#if !defined(__ARM_ARCH__)
+#if defined(__CC_ARM)
+#define __ARM_ARCH__ __TARGET_ARCH_ARM
+#if defined(__BIG_ENDIAN)
+#define __ARMEB__
+#else
+#define __ARMEL__
+#endif
+#elif defined(__GNUC__)
+#if defined(__aarch64__)
+#define __ARM_ARCH__ 8
+/*
+ * Why doesn't gcc define __ARM_ARCH__? Instead it defines
+ * bunch of below macros. See all_architectures[] table in
+ * gcc/config/arm/arm.c. On a side note it defines
+ * __ARMEL__/__ARMEB__ for little-/big-endian.
+ */
+#elif defined(__ARM_ARCH)
+#define __ARM_ARCH__ __ARM_ARCH
+#elif defined(__ARM_ARCH_8A__)
+#define __ARM_ARCH__ 8
+#elif defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7EM__)
+#define __ARM_ARCH__ 7
+#elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6M__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__)
+#define __ARM_ARCH__ 6
+#elif defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__) || defined(__ARM_ARCH_5E__) || defined(__ARM_ARCH_5TE__) || defined(__ARM_ARCH_5TEJ__)
+#define __ARM_ARCH__ 5
+#elif defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__)
+#define __ARM_ARCH__ 4
+#else
+#error "unsupported ARM architecture"
+#endif
+#elif defined(__ARM_ARCH)
+#define __ARM_ARCH__ __ARM_ARCH
+#endif
+#endif
+
+#if !defined(__ARM_MAX_ARCH__)
+#define __ARM_MAX_ARCH__ __ARM_ARCH__
+#endif
+
+#if __ARM_MAX_ARCH__ < __ARM_ARCH__
+#error "__ARM_MAX_ARCH__ can't be less than __ARM_ARCH__"
+#elif __ARM_MAX_ARCH__ != __ARM_ARCH__
+#if __ARM_ARCH__ < 7 && __ARM_MAX_ARCH__ >= 7 && defined(__ARMEB__)
+#error "can't build universal big-endian binary"
+#endif
+#endif
+
+#ifndef __ASSEMBLER__
extern unsigned int OPENSSL_armcap_P;
extern unsigned int OPENSSL_arm_midr;
extern unsigned int OPENSSL_armv8_rsa_neonized;
-# endif
-
-# define ARMV7_NEON (1<<0)
-# define ARMV7_TICK (1<<1)
-# define ARMV8_AES (1<<2)
-# define ARMV8_SHA1 (1<<3)
-# define ARMV8_SHA256 (1<<4)
-# define ARMV8_PMULL (1<<5)
-# define ARMV8_SHA512 (1<<6)
-# define ARMV8_CPUID (1<<7)
-# define ARMV8_RNG (1<<8)
-# define ARMV8_SM3 (1<<9)
-# define ARMV8_SM4 (1<<10)
-# define ARMV8_SHA3 (1<<11)
-# define ARMV8_UNROLL8_EOR3 (1<<12)
-# define ARMV8_SVE (1<<13)
-# define ARMV9_SVE2 (1<<14)
-# define ARMV8_HAVE_SHA3_AND_WORTH_USING (1<<15)
-# define ARMV8_UNROLL12_EOR3 (1<<16)
-# define ARMV9_SVE2_POLY1305 (1<<17)
+#endif
+
+#define ARMV7_NEON (1 << 0)
+#define ARMV7_TICK (1 << 1)
+#define ARMV8_AES (1 << 2)
+#define ARMV8_SHA1 (1 << 3)
+#define ARMV8_SHA256 (1 << 4)
+#define ARMV8_PMULL (1 << 5)
+#define ARMV8_SHA512 (1 << 6)
+#define ARMV8_CPUID (1 << 7)
+#define ARMV8_RNG (1 << 8)
+#define ARMV8_SM3 (1 << 9)
+#define ARMV8_SM4 (1 << 10)
+#define ARMV8_SHA3 (1 << 11)
+#define ARMV8_UNROLL8_EOR3 (1 << 12)
+#define ARMV8_SVE (1 << 13)
+#define ARMV9_SVE2 (1 << 14)
+#define ARMV8_HAVE_SHA3_AND_WORTH_USING (1 << 15)
+#define ARMV8_UNROLL12_EOR3 (1 << 16)
+#define ARMV9_SVE2_POLY1305 (1 << 17)
/*
* MIDR_EL1 system register
@@ -101,126 +94,120 @@ extern unsigned int OPENSSL_armv8_rsa_neonized;
*
*/
-# define ARM_CPU_IMP_ARM 0x41
-# define HISI_CPU_IMP 0x48
-# define ARM_CPU_IMP_QCOMM 0x51
-# define ARM_CPU_IMP_APPLE 0x61
-# define ARM_CPU_IMP_MICROSOFT 0x6D
-# define ARM_CPU_IMP_AMPERE 0xC0
-
-# define ARM_CPU_PART_CORTEX_A72 0xD08
-# define ARM_CPU_PART_N1 0xD0C
-# define ARM_CPU_PART_V1 0xD40
-# define ARM_CPU_PART_N2 0xD49
-# define HISI_CPU_PART_KP920 0xD01
-# define ARM_CPU_PART_V2 0xD4F
-# define ARM_CPU_PART_N3 0xD8E
-# define ARM_CPU_PART_V3_AE 0xD83
-# define ARM_CPU_PART_V3 0xD84
-
-# define QCOM_CPU_PART_ORYON_X1 0x001
-
-# define APPLE_CPU_PART_M1_ICESTORM 0x022
-# define APPLE_CPU_PART_M1_FIRESTORM 0x023
-# define APPLE_CPU_PART_M1_ICESTORM_PRO 0x024
-# define APPLE_CPU_PART_M1_FIRESTORM_PRO 0x025
-# define APPLE_CPU_PART_M1_ICESTORM_MAX 0x028
-# define APPLE_CPU_PART_M1_FIRESTORM_MAX 0x029
-# define APPLE_CPU_PART_M2_BLIZZARD 0x032
-# define APPLE_CPU_PART_M2_AVALANCHE 0x033
-# define APPLE_CPU_PART_M2_BLIZZARD_PRO 0x034
-# define APPLE_CPU_PART_M2_AVALANCHE_PRO 0x035
-# define APPLE_CPU_PART_M2_BLIZZARD_MAX 0x038
-# define APPLE_CPU_PART_M2_AVALANCHE_MAX 0x039
-
-# define MICROSOFT_CPU_PART_COBALT_100 0xD49
-
-# define MIDR_PARTNUM_SHIFT 4
-# define MIDR_PARTNUM_MASK (0xfffU << MIDR_PARTNUM_SHIFT)
-# define MIDR_PARTNUM(midr) \
- (((midr) & MIDR_PARTNUM_MASK) >> MIDR_PARTNUM_SHIFT)
-
-# define MIDR_IMPLEMENTER_SHIFT 24
-# define MIDR_IMPLEMENTER_MASK (0xffU << MIDR_IMPLEMENTER_SHIFT)
-# define MIDR_IMPLEMENTER(midr) \
- (((midr) & MIDR_IMPLEMENTER_MASK) >> MIDR_IMPLEMENTER_SHIFT)
-
-# define MIDR_ARCHITECTURE_SHIFT 16
-# define MIDR_ARCHITECTURE_MASK (0xfU << MIDR_ARCHITECTURE_SHIFT)
-# define MIDR_ARCHITECTURE(midr) \
- (((midr) & MIDR_ARCHITECTURE_MASK) >> MIDR_ARCHITECTURE_SHIFT)
-
-# define MIDR_CPU_MODEL_MASK \
- (MIDR_IMPLEMENTER_MASK | \
- MIDR_PARTNUM_MASK | \
- MIDR_ARCHITECTURE_MASK)
-
-# define MIDR_CPU_MODEL(imp, partnum) \
- (((imp) << MIDR_IMPLEMENTER_SHIFT) | \
- (0xfU << MIDR_ARCHITECTURE_SHIFT) | \
- ((partnum) << MIDR_PARTNUM_SHIFT))
-
-# define MIDR_IS_CPU_MODEL(midr, imp, partnum) \
- (((midr) & MIDR_CPU_MODEL_MASK) == MIDR_CPU_MODEL(imp, partnum))
+#define ARM_CPU_IMP_ARM 0x41
+#define HISI_CPU_IMP 0x48
+#define ARM_CPU_IMP_QCOMM 0x51
+#define ARM_CPU_IMP_APPLE 0x61
+#define ARM_CPU_IMP_MICROSOFT 0x6D
+#define ARM_CPU_IMP_AMPERE 0xC0
+
+#define ARM_CPU_PART_CORTEX_A72 0xD08
+#define ARM_CPU_PART_N1 0xD0C
+#define ARM_CPU_PART_V1 0xD40
+#define ARM_CPU_PART_N2 0xD49
+#define HISI_CPU_PART_KP920 0xD01
+#define ARM_CPU_PART_V2 0xD4F
+#define ARM_CPU_PART_N3 0xD8E
+#define ARM_CPU_PART_V3_AE 0xD83
+#define ARM_CPU_PART_V3 0xD84
+
+#define QCOM_CPU_PART_ORYON_X1 0x001
+
+#define APPLE_CPU_PART_M1_ICESTORM 0x022
+#define APPLE_CPU_PART_M1_FIRESTORM 0x023
+#define APPLE_CPU_PART_M1_ICESTORM_PRO 0x024
+#define APPLE_CPU_PART_M1_FIRESTORM_PRO 0x025
+#define APPLE_CPU_PART_M1_ICESTORM_MAX 0x028
+#define APPLE_CPU_PART_M1_FIRESTORM_MAX 0x029
+#define APPLE_CPU_PART_M2_BLIZZARD 0x032
+#define APPLE_CPU_PART_M2_AVALANCHE 0x033
+#define APPLE_CPU_PART_M2_BLIZZARD_PRO 0x034
+#define APPLE_CPU_PART_M2_AVALANCHE_PRO 0x035
+#define APPLE_CPU_PART_M2_BLIZZARD_MAX 0x038
+#define APPLE_CPU_PART_M2_AVALANCHE_MAX 0x039
+
+#define MICROSOFT_CPU_PART_COBALT_100 0xD49
+
+#define MIDR_PARTNUM_SHIFT 4
+#define MIDR_PARTNUM_MASK (0xfffU << MIDR_PARTNUM_SHIFT)
+#define MIDR_PARTNUM(midr) \
+ (((midr) & MIDR_PARTNUM_MASK) >> MIDR_PARTNUM_SHIFT)
+
+#define MIDR_IMPLEMENTER_SHIFT 24
+#define MIDR_IMPLEMENTER_MASK (0xffU << MIDR_IMPLEMENTER_SHIFT)
+#define MIDR_IMPLEMENTER(midr) \
+ (((midr) & MIDR_IMPLEMENTER_MASK) >> MIDR_IMPLEMENTER_SHIFT)
+
+#define MIDR_ARCHITECTURE_SHIFT 16
+#define MIDR_ARCHITECTURE_MASK (0xfU << MIDR_ARCHITECTURE_SHIFT)
+#define MIDR_ARCHITECTURE(midr) \
+ (((midr) & MIDR_ARCHITECTURE_MASK) >> MIDR_ARCHITECTURE_SHIFT)
+
+#define MIDR_CPU_MODEL_MASK \
+ (MIDR_IMPLEMENTER_MASK | MIDR_PARTNUM_MASK | MIDR_ARCHITECTURE_MASK)
+
+#define MIDR_CPU_MODEL(imp, partnum) \
+ (((imp) << MIDR_IMPLEMENTER_SHIFT) | (0xfU << MIDR_ARCHITECTURE_SHIFT) | ((partnum) << MIDR_PARTNUM_SHIFT))
+
+#define MIDR_IS_CPU_MODEL(midr, imp, partnum) \
+ (((midr) & MIDR_CPU_MODEL_MASK) == MIDR_CPU_MODEL(imp, partnum))
#if defined(__ASSEMBLER__)
- /*
- * Support macros for
- * - Armv8.3-A Pointer Authentication and
- * - Armv8.5-A Branch Target Identification
- * features which require emitting a .note.gnu.property section with the
- * appropriate architecture-dependent feature bits set.
- * Read more: "ELF for the Arm® 64-bit Architecture"
- */
-
-# if defined(__ARM_FEATURE_BTI_DEFAULT) && __ARM_FEATURE_BTI_DEFAULT == 1
-# define GNU_PROPERTY_AARCH64_BTI (1 << 0) /* Has Branch Target Identification */
-# define AARCH64_VALID_CALL_TARGET hint #34 /* BTI 'c' */
-# else
-# define GNU_PROPERTY_AARCH64_BTI 0 /* No Branch Target Identification */
-# define AARCH64_VALID_CALL_TARGET
-# endif
-
-# if defined(__ARM_FEATURE_PAC_DEFAULT) && \
- (__ARM_FEATURE_PAC_DEFAULT & 1) == 1 /* Signed with A-key */
-# define GNU_PROPERTY_AARCH64_POINTER_AUTH \
- (1 << 1) /* Has Pointer Authentication */
-# define AARCH64_SIGN_LINK_REGISTER hint #25 /* PACIASP */
-# define AARCH64_VALIDATE_LINK_REGISTER hint #29 /* AUTIASP */
-# elif defined(__ARM_FEATURE_PAC_DEFAULT) && \
- (__ARM_FEATURE_PAC_DEFAULT & 2) == 2 /* Signed with B-key */
-# define GNU_PROPERTY_AARCH64_POINTER_AUTH \
- (1 << 1) /* Has Pointer Authentication */
-# define AARCH64_SIGN_LINK_REGISTER hint #27 /* PACIBSP */
-# define AARCH64_VALIDATE_LINK_REGISTER hint #31 /* AUTIBSP */
-# else
-# define GNU_PROPERTY_AARCH64_POINTER_AUTH 0 /* No Pointer Authentication */
-# if GNU_PROPERTY_AARCH64_BTI != 0
-# define AARCH64_SIGN_LINK_REGISTER AARCH64_VALID_CALL_TARGET
-# else
-# define AARCH64_SIGN_LINK_REGISTER
-# endif
-# define AARCH64_VALIDATE_LINK_REGISTER
-# endif
-
-# if GNU_PROPERTY_AARCH64_POINTER_AUTH != 0 || GNU_PROPERTY_AARCH64_BTI != 0
- .pushsection .note.gnu.property, "a";
- .balign 8;
- .long 4;
- .long 0x10;
- .long 0x5;
- .asciz "GNU";
- .long 0xc0000000; /* GNU_PROPERTY_AARCH64_FEATURE_1_AND */
- .long 4;
- .long (GNU_PROPERTY_AARCH64_POINTER_AUTH | GNU_PROPERTY_AARCH64_BTI);
- .long 0;
- .popsection;
-# endif
-
-# endif /* defined __ASSEMBLER__ */
-
-# define IS_CPU_SUPPORT_UNROLL8_EOR3() \
- (OPENSSL_armcap_P & ARMV8_UNROLL8_EOR3)
+/*
+ * Support macros for
+ * - Armv8.3-A Pointer Authentication and
+ * - Armv8.5-A Branch Target Identification
+ * features which require emitting a .note.gnu.property section with the
+ * appropriate architecture-dependent feature bits set.
+ * Read more: "ELF for the Arm® 64-bit Architecture"
+ */
+
+#if defined(__ARM_FEATURE_BTI_DEFAULT) && __ARM_FEATURE_BTI_DEFAULT == 1
+#define GNU_PROPERTY_AARCH64_BTI (1 << 0) /* Has Branch Target Identification */
+#define AARCH64_VALID_CALL_TARGET hint #34 /* BTI 'c' */
+#else
+#define GNU_PROPERTY_AARCH64_BTI 0 /* No Branch Target Identification */
+#define AARCH64_VALID_CALL_TARGET
+#endif
+
+#if defined(__ARM_FEATURE_PAC_DEFAULT) && (__ARM_FEATURE_PAC_DEFAULT & 1) == 1 /* Signed with A-key */
+#define GNU_PROPERTY_AARCH64_POINTER_AUTH \
+ (1 << 1) /* Has Pointer Authentication */
+#define AARCH64_SIGN_LINK_REGISTER hint #25 /* PACIASP */
+#define AARCH64_VALIDATE_LINK_REGISTER hint #29 /* AUTIASP */
+#elif defined(__ARM_FEATURE_PAC_DEFAULT) && (__ARM_FEATURE_PAC_DEFAULT & 2) == 2 /* Signed with B-key */
+#define GNU_PROPERTY_AARCH64_POINTER_AUTH \
+ (1 << 1) /* Has Pointer Authentication */
+#define AARCH64_SIGN_LINK_REGISTER hint #27 /* PACIBSP */
+#define AARCH64_VALIDATE_LINK_REGISTER hint #31 /* AUTIBSP */
+#else
+#define GNU_PROPERTY_AARCH64_POINTER_AUTH 0 /* No Pointer Authentication */
+#if GNU_PROPERTY_AARCH64_BTI != 0
+#define AARCH64_SIGN_LINK_REGISTER AARCH64_VALID_CALL_TARGET
+#else
+#define AARCH64_SIGN_LINK_REGISTER
+#endif
+#define AARCH64_VALIDATE_LINK_REGISTER
+#endif
+
+#if GNU_PROPERTY_AARCH64_POINTER_AUTH != 0 || GNU_PROPERTY_AARCH64_BTI != 0
+.pushsection.note.gnu.property, "a";
+.balign 8;
+.long 4;
+.long 0x10;
+.long 0x5;
+.asciz "GNU";
+.long 0xc0000000; /* GNU_PROPERTY_AARCH64_FEATURE_1_AND */
+.long 4;
+.long(GNU_PROPERTY_AARCH64_POINTER_AUTH | GNU_PROPERTY_AARCH64_BTI);
+.long 0;
+.popsection;
+#endif
+
+#endif /* defined __ASSEMBLER__ */
+
+#define IS_CPU_SUPPORT_UNROLL8_EOR3() \
+ (OPENSSL_armcap_P & ARMV8_UNROLL8_EOR3)
#endif
diff --git a/crypto/armcap.c b/crypto/armcap.c
index 84f621aeb8..d8ad9ce012 100644
--- a/crypto/armcap.c
+++ b/crypto/armcap.c
@@ -65,89 +65,88 @@ uint32_t OPENSSL_rdtsc(void)
}
#else /* !_WIN32 && __ARM_MAX_ARCH__ >= 7 */
- /* 3 ways of handling things here: __APPLE__, getauxval() or SIGILL detect */
+/* 3 ways of handling things here: __APPLE__, getauxval() or SIGILL detect */
- /* First determine if getauxval() is available (OSSL_IMPLEMENT_GETAUXVAL) */
+/* First determine if getauxval() is available (OSSL_IMPLEMENT_GETAUXVAL) */
-# if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
-# if __GLIBC_PREREQ(2, 16)
-# include <sys/auxv.h>
-# define OSSL_IMPLEMENT_GETAUXVAL
-# endif
-# elif defined(__ANDROID_API__)
+#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+#if __GLIBC_PREREQ(2, 16)
+#include <sys/auxv.h>
+#define OSSL_IMPLEMENT_GETAUXVAL
+#endif
+#elif defined(__ANDROID_API__)
/* see https://developer.android.google.cn/ndk/guides/cpu-features */
-# if __ANDROID_API__ >= 18
-# include <sys/auxv.h>
-# define OSSL_IMPLEMENT_GETAUXVAL
-# endif
-# endif
-# if defined(__FreeBSD__) || defined(__OpenBSD__)
-# include <sys/param.h>
-# if (defined(__FreeBSD__) && __FreeBSD_version >= 1104000) || \
- (defined(__OpenBSD__) && OpenBSD >= 202409)
-# include <sys/auxv.h>
-# define OSSL_IMPLEMENT_GETAUXVAL
+#if __ANDROID_API__ >= 18
+#include <sys/auxv.h>
+#define OSSL_IMPLEMENT_GETAUXVAL
+#endif
+#endif
+#if defined(__FreeBSD__) || defined(__OpenBSD__)
+#include <sys/param.h>
+#if (defined(__FreeBSD__) && __FreeBSD_version >= 1104000) || (defined(__OpenBSD__) && OpenBSD >= 202409)
+#include <sys/auxv.h>
+#define OSSL_IMPLEMENT_GETAUXVAL
static unsigned long getauxval(unsigned long key)
{
- unsigned long val = 0ul;
+ unsigned long val = 0ul;
- if (elf_aux_info((int)key, &val, sizeof(val)) != 0)
- return 0ul;
+ if (elf_aux_info((int)key, &val, sizeof(val)) != 0)
+ return 0ul;
- return val;
+ return val;
}
-# endif
-# endif
+#endif
+#endif
/*
* Android: according to https://developer.android.com/ndk/guides/cpu-features,
* getauxval is supported starting with API level 18
*/
-# if defined(__ANDROID__) && defined(__ANDROID_API__) && __ANDROID_API__ >= 18
-# include <sys/auxv.h>
-# define OSSL_IMPLEMENT_GETAUXVAL
-# endif
+#if defined(__ANDROID__) && defined(__ANDROID_API__) && __ANDROID_API__ >= 18
+#include <sys/auxv.h>
+#define OSSL_IMPLEMENT_GETAUXVAL
+#endif
/*
* ARM puts the feature bits for Crypto Extensions in AT_HWCAP2, whereas
* AArch64 used AT_HWCAP.
*/
-# ifndef AT_HWCAP
-# define AT_HWCAP 16
-# endif
-# ifndef AT_HWCAP2
-# define AT_HWCAP2 26
-# endif
-# if defined(__arm__) || defined (__arm)
-# define OSSL_HWCAP AT_HWCAP
-# define OSSL_HWCAP_NEON (1 << 12)
-
-# define OSSL_HWCAP_CE AT_HWCAP2
-# define OSSL_HWCAP_CE_AES (1 << 0)
-# define OSSL_HWCAP_CE_PMULL (1 << 1)
-# define OSSL_HWCAP_CE_SHA1 (1 << 2)
-# define OSSL_HWCAP_CE_SHA256 (1 << 3)
-# elif defined(__aarch64__)
-# define OSSL_HWCAP AT_HWCAP
-# define OSSL_HWCAP_NEON (1 << 1)
-
-# define OSSL_HWCAP_CE AT_HWCAP
-# define OSSL_HWCAP_CE_AES (1 << 3)
-# define OSSL_HWCAP_CE_PMULL (1 << 4)
-# define OSSL_HWCAP_CE_SHA1 (1 << 5)
-# define OSSL_HWCAP_CE_SHA256 (1 << 6)
-# define OSSL_HWCAP_CPUID (1 << 11)
-# define OSSL_HWCAP_SHA3 (1 << 17)
-# define OSSL_HWCAP_CE_SM3 (1 << 18)
-# define OSSL_HWCAP_CE_SM4 (1 << 19)
-# define OSSL_HWCAP_CE_SHA512 (1 << 21)
-# define OSSL_HWCAP_SVE (1 << 22)
- /* AT_HWCAP2 */
-# define OSSL_HWCAP2 26
-# define OSSL_HWCAP2_SVE2 (1 << 1)
-# define OSSL_HWCAP2_RNG (1 << 16)
-# endif
+#ifndef AT_HWCAP
+#define AT_HWCAP 16
+#endif
+#ifndef AT_HWCAP2
+#define AT_HWCAP2 26
+#endif
+#if defined(__arm__) || defined(__arm)
+#define OSSL_HWCAP AT_HWCAP
+#define OSSL_HWCAP_NEON (1 << 12)
+
+#define OSSL_HWCAP_CE AT_HWCAP2
+#define OSSL_HWCAP_CE_AES (1 << 0)
+#define OSSL_HWCAP_CE_PMULL (1 << 1)
+#define OSSL_HWCAP_CE_SHA1 (1 << 2)
+#define OSSL_HWCAP_CE_SHA256 (1 << 3)
+#elif defined(__aarch64__)
+#define OSSL_HWCAP AT_HWCAP
+#define OSSL_HWCAP_NEON (1 << 1)
+
+#define OSSL_HWCAP_CE AT_HWCAP
+#define OSSL_HWCAP_CE_AES (1 << 3)
+#define OSSL_HWCAP_CE_PMULL (1 << 4)
+#define OSSL_HWCAP_CE_SHA1 (1 << 5)
+#define OSSL_HWCAP_CE_SHA256 (1 << 6)
+#define OSSL_HWCAP_CPUID (1 << 11)
+#define OSSL_HWCAP_SHA3 (1 << 17)
+#define OSSL_HWCAP_CE_SM3 (1 << 18)
+#define OSSL_HWCAP_CE_SM4 (1 << 19)
+#define OSSL_HWCAP_CE_SHA512 (1 << 21)
+#define OSSL_HWCAP_SVE (1 << 22)
+/* AT_HWCAP2 */
+#define OSSL_HWCAP2 26
+#define OSSL_HWCAP2_SVE2 (1 << 1)
+#define OSSL_HWCAP2_RNG (1 << 16)
+#endif
uint32_t _armv7_tick(void);
@@ -159,7 +158,7 @@ uint32_t OPENSSL_rdtsc(void)
return 0;
}
-# ifdef __aarch64__
+#ifdef __aarch64__
size_t OPENSSL_rndr_asm(unsigned char *buf, size_t len);
size_t OPENSSL_rndrrs_asm(unsigned char *buf, size_t len);
@@ -175,7 +174,7 @@ static size_t OPENSSL_rndr_wrapper(size_t (*func)(unsigned char *, size_t), unsi
buffer_size = func(buf, len);
if (buffer_size == len)
break;
- usleep(5000); /* 5000 microseconds (5 milliseconds) */
+ usleep(5000); /* 5000 microseconds (5 milliseconds) */
}
return buffer_size;
}
@@ -189,9 +188,9 @@ size_t OPENSSL_rndrrs_bytes(unsigned char *buf, size_t len)
{
return OPENSSL_rndr_wrapper(OPENSSL_rndrrs_asm, buf, len);
}
-# endif
+#endif
-# if !defined(__APPLE__) && !defined(OSSL_IMPLEMENT_GETAUXVAL)
+#if !defined(__APPLE__) && !defined(OSSL_IMPLEMENT_GETAUXVAL)
static sigset_t all_masked;
static sigjmp_buf ill_jmp;
@@ -210,7 +209,7 @@ void _armv8_aes_probe(void);
void _armv8_sha1_probe(void);
void _armv8_sha256_probe(void);
void _armv8_pmull_probe(void);
-# ifdef __aarch64__
+#ifdef __aarch64__
void _armv8_sm3_probe(void);
void _armv8_sm4_probe(void);
void _armv8_sha512_probe(void);
@@ -218,13 +217,13 @@ void _armv8_eor3_probe(void);
void _armv8_sve_probe(void);
void _armv8_sve2_probe(void);
void _armv8_rng_probe(void);
-# endif
-# endif /* !__APPLE__ && !OSSL_IMPLEMENT_GETAUXVAL */
+#endif
+#endif /* !__APPLE__ && !OSSL_IMPLEMENT_GETAUXVAL */
/* We only call _armv8_cpuid_probe() if (OPENSSL_armcap_P & ARMV8_CPUID) != 0 */
unsigned int _armv8_cpuid_probe(void);
-# if defined(__APPLE__)
+#if defined(__APPLE__)
/*
* Checks the specified integer sysctl, returning `value` if it's 1, otherwise returning 0.
*/
@@ -235,7 +234,7 @@ static unsigned int sysctl_query(const char *name, unsigned int value)
return (sysctlbyname(name, &sys_value, &len, NULL, 0) == 0 && sys_value == 1) ? value : 0;
}
-# elif !defined(OSSL_IMPLEMENT_GETAUXVAL)
+#elif !defined(OSSL_IMPLEMENT_GETAUXVAL)
/*
* Calls a provided probe function, which may SIGILL. If it doesn't, return `value`, otherwise return 0.
*/
@@ -249,15 +248,15 @@ static unsigned int arm_probe_for(void (*probe)(void), volatile unsigned int val
return 0;
}
}
-# endif
+#endif
void OPENSSL_cpuid_setup(void)
{
const char *e;
-# if !defined(__APPLE__) && !defined(OSSL_IMPLEMENT_GETAUXVAL)
+#if !defined(__APPLE__) && !defined(OSSL_IMPLEMENT_GETAUXVAL)
struct sigaction ill_oact, ill_act;
sigset_t oset;
-# endif
+#endif
static int trigger = 0;
if (trigger)
@@ -271,8 +270,8 @@ void OPENSSL_cpuid_setup(void)
return;
}
-# if defined(__APPLE__)
-# if !defined(__aarch64__)
+#if defined(__APPLE__)
+#if !defined(__aarch64__)
/*
* Capability probing by catching SIGILL appears to be problematic
* on iOS. But since Apple universe is "monocultural", it's actually
@@ -282,7 +281,7 @@ void OPENSSL_cpuid_setup(void)
OPENSSL_armcap_P = ARMV7_NEON;
return;
}
-# else
+#else
{
/*
* From
@@ -300,20 +299,15 @@ void OPENSSL_cpuid_setup(void)
char uarch[64];
size_t len = sizeof(uarch);
- if ((sysctlbyname("machdep.cpu.brand_string", uarch, &len, NULL, 0) == 0) &&
- ((strncmp(uarch, "Apple M1", 8) == 0) ||
- (strncmp(uarch, "Apple M2", 8) == 0) ||
- (strncmp(uarch, "Apple M3", 8) == 0) ||
- (strncmp(uarch, "Apple M4", 8) == 0) ||
- (strncmp(uarch, "Apple M5", 8) == 0))) {
+ if ((sysctlbyname("machdep.cpu.brand_string", uarch, &len, NULL, 0) == 0) && ((strncmp(uarch, "Apple M1", 8) == 0) || (strncmp(uarch, "Apple M2", 8) == 0) || (strncmp(uarch, "Apple M3", 8) == 0) || (strncmp(uarch, "Apple M4", 8) == 0) || (strncmp(uarch, "Apple M5", 8) == 0))) {
OPENSSL_armcap_P |= ARMV8_UNROLL8_EOR3;
OPENSSL_armcap_P |= ARMV8_HAVE_SHA3_AND_WORTH_USING;
}
}
}
-# endif /* __aarch64__ */
+#endif /* __aarch64__ */
-# elif defined(OSSL_IMPLEMENT_GETAUXVAL)
+#elif defined(OSSL_IMPLEMENT_GETAUXVAL)
if (getauxval(OSSL_HWCAP) & OSSL_HWCAP_NEON) {
unsigned long hwcap = getauxval(OSSL_HWCAP_CE);
@@ -332,7 +326,7 @@ void OPENSSL_cpuid_setup(void)
if (hwcap & OSSL_HWCAP_CE_SHA256)
OPENSSL_armcap_P |= ARMV8_SHA256;
-# ifdef __aarch64__
+#ifdef __aarch64__
if (hwcap & OSSL_HWCAP_CE_SM4)
OPENSSL_armcap_P |= ARMV8_SM4;
@@ -346,20 +340,20 @@ void OPENSSL_cpuid_setup(void)
OPENSSL_armcap_P |= ARMV8_SM3;
if (hwcap & OSSL_HWCAP_SHA3)
OPENSSL_armcap_P |= ARMV8_SHA3;
-# endif
+#endif
}
-# ifdef __aarch64__
- if (getauxval(OSSL_HWCAP) & OSSL_HWCAP_SVE)
- OPENSSL_armcap_P |= ARMV8_SVE;
+#ifdef __aarch64__
+ if (getauxval(OSSL_HWCAP) & OSSL_HWCAP_SVE)
+ OPENSSL_armcap_P |= ARMV8_SVE;
- if (getauxval(OSSL_HWCAP2) & OSSL_HWCAP2_SVE2)
- OPENSSL_armcap_P |= ARMV9_SVE2;
+ if (getauxval(OSSL_HWCAP2) & OSSL_HWCAP2_SVE2)
+ OPENSSL_armcap_P |= ARMV9_SVE2;
- if (getauxval(OSSL_HWCAP2) & OSSL_HWCAP2_RNG)
- OPENSSL_armcap_P |= ARMV8_RNG;
-# endif
+ if (getauxval(OSSL_HWCAP2) & OSSL_HWCAP2_RNG)
+ OPENSSL_armcap_P |= ARMV8_RNG;
+#endif
-# else /* !__APPLE__ && !OSSL_IMPLEMENT_GETAUXVAL */
+#else /* !__APPLE__ && !OSSL_IMPLEMENT_GETAUXVAL */
/* If all else fails, do brute force SIGILL-based feature detection */
@@ -389,18 +383,18 @@ void OPENSSL_cpuid_setup(void)
OPENSSL_armcap_P |= arm_probe_for(_armv8_sha1_probe, ARMV8_SHA1);
OPENSSL_armcap_P |= arm_probe_for(_armv8_sha256_probe, ARMV8_SHA256);
-# if defined(__aarch64__)
+#if defined(__aarch64__)
OPENSSL_armcap_P |= arm_probe_for(_armv8_sm3_probe, ARMV8_SM3);
OPENSSL_armcap_P |= arm_probe_for(_armv8_sm4_probe, ARMV8_SM4);
OPENSSL_armcap_P |= arm_probe_for(_armv8_sha512_probe, ARMV8_SHA512);
OPENSSL_armcap_P |= arm_probe_for(_armv8_eor3_probe, ARMV8_SHA3);
-# endif
+#endif
}
-# ifdef __aarch64__
+#ifdef __aarch64__
OPENSSL_armcap_P |= arm_probe_for(_armv8_sve_probe, ARMV8_SVE);
OPENSSL_armcap_P |= arm_probe_for(_armv8_sve2_probe, ARMV9_SVE2);
OPENSSL_armcap_P |= arm_probe_for(_armv8_rng_probe, ARMV8_RNG);
-# endif
+#endif
/*
* Probing for ARMV7_TICK is known to produce unreliable results,
@@ -411,51 +405,20 @@ void OPENSSL_cpuid_setup(void)
sigaction(SIGILL, &ill_oact, NULL);
sigprocmask(SIG_SETMASK, &oset, NULL);
-# endif /* __APPLE__, OSSL_IMPLEMENT_GETAUXVAL */
+#endif /* __APPLE__, OSSL_IMPLEMENT_GETAUXVAL */
-# ifdef __aarch64__
+#ifdef __aarch64__
if (OPENSSL_armcap_P & ARMV8_CPUID)
OPENSSL_arm_midr = _armv8_cpuid_probe();
- if ((MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A72) ||
- MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_N1)) &&
- (OPENSSL_armcap_P & ARMV7_NEON)) {
- OPENSSL_armv8_rsa_neonized = 1;
+ if ((MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A72) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_N1)) && (OPENSSL_armcap_P & ARMV7_NEON)) {
+ OPENSSL_armv8_rsa_neonized = 1;
}
- if ((MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_V1) ||
- MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_N2) ||
- MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_QCOMM, QCOM_CPU_PART_ORYON_X1) ||
- MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_MICROSOFT, MICROSOFT_CPU_PART_COBALT_100) ||
- MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_V2) ||
- MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_N3) ||
- MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_V3_AE) ||
- MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_V3) ||
- MIDR_IMPLEMENTER(OPENSSL_arm_midr) == ARM_CPU_IMP_AMPERE) &&
- (OPENSSL_armcap_P & ARMV8_SHA3))
+ if ((MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_V1) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_N2) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_QCOMM, QCOM_CPU_PART_ORYON_X1) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_MICROSOFT, MICROSOFT_CPU_PART_COBALT_100) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_V2) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_N3) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_V3_AE) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_V3) || MIDR_IMPLEMENTER(OPENSSL_arm_midr) == ARM_CPU_IMP_AMPERE) && (OPENSSL_armcap_P & ARMV8_SHA3))
OPENSSL_armcap_P |= ARMV8_UNROLL8_EOR3;
- if ((MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_V1) ||
- MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_V2) ||
- MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_V3_AE) ||
- MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_V3) ||
- MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_N2) ||
- MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_N3) ||
- MIDR_IMPLEMENTER(OPENSSL_arm_midr) == ARM_CPU_IMP_AMPERE) &&
- (OPENSSL_armcap_P & ARMV8_SHA3))
+ if ((MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_V1) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_V2) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_V3_AE) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_V3) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_N2) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_N3) || MIDR_IMPLEMENTER(OPENSSL_arm_midr) == ARM_CPU_IMP_AMPERE) && (OPENSSL_armcap_P & ARMV8_SHA3))
OPENSSL_armcap_P |= ARMV8_UNROLL12_EOR3;
- if ((MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_FIRESTORM) ||
- MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_ICESTORM) ||
- MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_FIRESTORM_PRO) ||
- MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_ICESTORM_PRO) ||
- MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_FIRESTORM_MAX) ||
- MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_ICESTORM_MAX) ||
- MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_AVALANCHE) ||
- MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_BLIZZARD) ||
- MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_AVALANCHE_PRO) ||
- MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_BLIZZARD_PRO) ||
- MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_AVALANCHE_MAX) ||
- MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_BLIZZARD_MAX) ||
- MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_QCOMM, QCOM_CPU_PART_ORYON_X1)) &&
- (OPENSSL_armcap_P & ARMV8_SHA3))
+ if ((MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_FIRESTORM) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_ICESTORM) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_FIRESTORM_PRO) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_ICESTORM_PRO) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_FIRESTORM_MAX) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_ICESTORM_MAX) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_AVALANCHE) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_BLIZZARD) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_AVALANCHE_PRO) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_BLIZZARD_PRO) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_AVALANCHE_MAX) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_BLIZZARD_MAX) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_QCOMM, QCOM_CPU_PART_ORYON_X1)) && (OPENSSL_armcap_P & ARMV8_SHA3))
OPENSSL_armcap_P |= ARMV8_HAVE_SHA3_AND_WORTH_USING;
if (OPENSSL_armcap_P & ARMV9_SVE2) {
uint64_t vl_bytes = _armv8_sve_get_vl_bytes();
@@ -468,6 +431,6 @@ void OPENSSL_cpuid_setup(void)
OPENSSL_armcap_P |= ARMV9_SVE2_POLY1305;
}
}
-# endif
+#endif
}
#endif /* _WIN32, __ARM_MAX_ARCH__ >= 7 */
diff --git a/crypto/array_alloc.c b/crypto/array_alloc.c
index 8c02163088..cb10b9ac3b 100644
--- a/crypto/array_alloc.c
+++ b/crypto/array_alloc.c
@@ -36,7 +36,7 @@ void *CRYPTO_calloc(size_t num, size_t size, const char *file, int line)
}
void *CRYPTO_aligned_alloc_array(size_t num, size_t size, size_t align,
- void **freeptr, const char *file, int line)
+ void **freeptr, const char *file, int line)
{
size_t bytes;
@@ -50,7 +50,7 @@ void *CRYPTO_aligned_alloc_array(size_t num, size_t size, size_t align,
}
void *CRYPTO_realloc_array(void *addr, size_t num, size_t size,
- const char *file, int line)
+ const char *file, int line)
{
size_t bytes;
@@ -61,19 +61,19 @@ void *CRYPTO_realloc_array(void *addr, size_t num, size_t size,
}
void *CRYPTO_clear_realloc_array(void *addr, size_t old_num, size_t num,
- size_t size, const char *file, int line)
+ size_t size, const char *file, int line)
{
size_t old_bytes, bytes = 0;
if (ossl_unlikely(!ossl_size_mul(old_num, size, &old_bytes, file, line)
- || !ossl_size_mul(num, size, &bytes, file, line)))
+ || !ossl_size_mul(num, size, &bytes, file, line)))
return NULL;
return CRYPTO_clear_realloc(addr, old_bytes, bytes, file, line);
}
void *CRYPTO_secure_malloc_array(size_t num, size_t size,
- const char *file, int line)
+ const char *file, int line)
{
size_t bytes;
diff --git a/crypto/asn1/a_bitstr.c b/crypto/asn1/a_bitstr.c
index a87cb15b44..223efc2bb1 100644
--- a/crypto/asn1/a_bitstr.c
+++ b/crypto/asn1/a_bitstr.c
@@ -58,7 +58,7 @@ int ossl_i2c_ASN1_BIT_STRING(ASN1_BIT_STRING *a, unsigned char **pp)
else if (j & 0x80)
bits = 7;
else
- bits = 0; /* should not happen */
+ bits = 0; /* should not happen */
}
}
} else
@@ -82,7 +82,7 @@ int ossl_i2c_ASN1_BIT_STRING(ASN1_BIT_STRING *a, unsigned char **pp)
}
ASN1_BIT_STRING *ossl_c2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a,
- const unsigned char **pp, long len)
+ const unsigned char **pp, long len)
{
ASN1_BIT_STRING *ret = NULL;
const unsigned char *p;
@@ -117,7 +117,7 @@ ASN1_BIT_STRING *ossl_c2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a,
*/
ossl_asn1_string_set_bits_left(ret, i);
- if (len-- > 1) { /* using one because of the bits left byte */
+ if (len-- > 1) { /* using one because of the bits left byte */
s = OPENSSL_malloc((int)len);
if (s == NULL) {
goto err;
@@ -134,7 +134,7 @@ ASN1_BIT_STRING *ossl_c2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a,
(*a) = ret;
*pp = p;
return ret;
- err:
+err:
if (i != 0)
ERR_raise(ERR_LIB_ASN1, i);
if ((a == NULL) || (*a != ret))
@@ -166,7 +166,7 @@ int ASN1_BIT_STRING_set_bit(ASN1_BIT_STRING *a, int n, int value)
if ((a->length < (w + 1)) || (a->data == NULL)) {
if (!value)
- return 1; /* Don't need to set */
+ return 1; /* Don't need to set */
c = OPENSSL_clear_realloc(a->data, a->length, w + 1);
if (c == NULL)
return 0;
@@ -202,7 +202,7 @@ int ASN1_BIT_STRING_get_bit(const ASN1_BIT_STRING *a, int n)
* 'len' is the length of 'flags'.
*/
int ASN1_BIT_STRING_check(const ASN1_BIT_STRING *a,
- const unsigned char *flags, int flags_len)
+ const unsigned char *flags, int flags_len)
{
int i, ok;
/* Check if there is one bit set at all. */
diff --git a/crypto/asn1/a_d2i_fp.c b/crypto/asn1/a_d2i_fp.c
index 95c1b884c1..4204743cd2 100644
--- a/crypto/asn1/a_d2i_fp.c
+++ b/crypto/asn1/a_d2i_fp.c
@@ -17,9 +17,9 @@
#include "crypto/asn1.h"
#ifndef NO_OLD_ASN1
-# ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_STDIO
-void *ASN1_d2i_fp(void *(*xnew) (void), d2i_of_void *d2i, FILE *in, void **x)
+void *ASN1_d2i_fp(void *(*xnew)(void), d2i_of_void *d2i, FILE *in, void **x)
{
BIO *b;
void *ret;
@@ -33,9 +33,9 @@ void *ASN1_d2i_fp(void *(*xnew) (void), d2i_of_void *d2i, FILE *in, void **x)
BIO_free(b);
return ret;
}
-# endif
+#endif
-void *ASN1_d2i_bio(void *(*xnew) (void), d2i_of_void *d2i, BIO *in, void **x)
+void *ASN1_d2i_bio(void *(*xnew)(void), d2i_of_void *d2i, BIO *in, void **x)
{
BUF_MEM *b = NULL;
const unsigned char *p;
@@ -48,7 +48,7 @@ void *ASN1_d2i_bio(void *(*xnew) (void), d2i_of_void *d2i, BIO *in, void **x)
p = (unsigned char *)b->data;
ret = d2i(x, &p, len);
- err:
+err:
BUF_MEM_free(b);
return ret;
}
@@ -56,7 +56,7 @@ void *ASN1_d2i_bio(void *(*xnew) (void), d2i_of_void *d2i, BIO *in, void **x)
#endif
void *ASN1_item_d2i_bio_ex(const ASN1_ITEM *it, BIO *in, void *x,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_LIB_CTX *libctx, const char *propq)
{
BUF_MEM *b = NULL;
const unsigned char *p;
@@ -71,7 +71,7 @@ void *ASN1_item_d2i_bio_ex(const ASN1_ITEM *it, BIO *in, void *x,
p = (const unsigned char *)b->data;
ret = ASN1_item_d2i_ex(x, &p, len, it, libctx, propq);
- err:
+err:
BUF_MEM_free(b);
return ret;
}
@@ -83,7 +83,7 @@ void *ASN1_item_d2i_bio(const ASN1_ITEM *it, BIO *in, void *x)
#ifndef OPENSSL_NO_STDIO
void *ASN1_item_d2i_fp_ex(const ASN1_ITEM *it, FILE *in, void *x,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_LIB_CTX *libctx, const char *propq)
{
BIO *b;
void *ret;
@@ -104,7 +104,7 @@ void *ASN1_item_d2i_fp(const ASN1_ITEM *it, FILE *in, void *x)
}
#endif
-#define HEADER_SIZE 8
+#define HEADER_SIZE 8
#define ASN1_CHUNK_INITIAL_SIZE (16 * 1024)
int asn1_d2i_read_bio(BIO *in, BUF_MEM **pb)
{
@@ -153,7 +153,6 @@ int asn1_d2i_read_bio(BIO *in, BUF_MEM **pb)
len += i;
if ((size_t)i < want)
continue;
-
}
}
/* else data already loaded */
@@ -173,7 +172,7 @@ int asn1_d2i_read_bio(BIO *in, BUF_MEM **pb)
ERR_pop_to_mark();
ERR_set_mark();
}
- off += q - p; /* end of data */
+ off += q - p; /* end of data */
if (inf & 1) {
/* no data body so go round again */
@@ -197,8 +196,7 @@ int asn1_d2i_read_bio(BIO *in, BUF_MEM **pb)
size_t chunk_max = ASN1_CHUNK_INITIAL_SIZE;
want -= (len - off);
- if (want > INT_MAX /* BIO_read takes an int length */ ||
- len + want < len) {
+ if (want > INT_MAX /* BIO_read takes an int length */ || len + want < len) {
ERR_raise(ERR_LIB_ASN1, ASN1_R_TOO_LONG);
goto err;
}
@@ -223,14 +221,14 @@ int asn1_d2i_read_bio(BIO *in, BUF_MEM **pb)
ERR_raise(ERR_LIB_ASN1, ASN1_R_NOT_ENOUGH_DATA);
goto err;
}
- /*
- * This can't overflow because |len+want| didn't
- * overflow.
- */
+ /*
+ * This can't overflow because |len+want| didn't
+ * overflow.
+ */
len += i;
chunk -= i;
}
- if (chunk_max < INT_MAX/2)
+ if (chunk_max < INT_MAX / 2)
chunk_max *= 2;
}
}
@@ -254,7 +252,7 @@ int asn1_d2i_read_bio(BIO *in, BUF_MEM **pb)
*pb = b;
ERR_clear_last_mark();
return (int)off;
- err:
+err:
ERR_clear_last_mark();
BUF_MEM_free(b);
return -1;
diff --git a/crypto/asn1/a_digest.c b/crypto/asn1/a_digest.c
index f485a19213..c9348ce567 100644
--- a/crypto/asn1/a_digest.c
+++ b/crypto/asn1/a_digest.c
@@ -22,7 +22,7 @@
#ifndef OPENSSL_NO_DEPRECATED_3_0
int ASN1_digest(i2d_of_void *i2d, const EVP_MD *type, char *data,
- unsigned char *md, unsigned int *len)
+ unsigned char *md, unsigned int *len)
{
int inl;
unsigned char *str, *p;
@@ -48,8 +48,8 @@ int ASN1_digest(i2d_of_void *i2d, const EVP_MD *type, char *data,
#endif
int ossl_asn1_item_digest_ex(const ASN1_ITEM *it, const EVP_MD *md, void *asn,
- unsigned char *data, unsigned int *len,
- OSSL_LIB_CTX *libctx, const char *propq)
+ unsigned char *data, unsigned int *len,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
int i, ret = 0;
unsigned char *str = NULL;
@@ -73,8 +73,7 @@ err:
}
int ASN1_item_digest(const ASN1_ITEM *it, const EVP_MD *md, void *asn,
- unsigned char *data, unsigned int *len)
+ unsigned char *data, unsigned int *len)
{
return ossl_asn1_item_digest_ex(it, md, asn, data, len, NULL, NULL);
}
-
diff --git a/crypto/asn1/a_dup.c b/crypto/asn1/a_dup.c
index e673023fae..48f5b3f6a4 100644
--- a/crypto/asn1/a_dup.c
+++ b/crypto/asn1/a_dup.c
@@ -69,8 +69,8 @@ void *ASN1_item_dup(const ASN1_ITEM *it, const void *x)
if (asn1_cb != NULL) {
if (!asn1_cb(ASN1_OP_DUP_PRE, (ASN1_VALUE **)&x, it, NULL)
- || !asn1_cb(ASN1_OP_GET0_LIBCTX, (ASN1_VALUE **)&x, it, &libctx)
- || !asn1_cb(ASN1_OP_GET0_PROPQ, (ASN1_VALUE **)&x, it, &propq))
+ || !asn1_cb(ASN1_OP_GET0_LIBCTX, (ASN1_VALUE **)&x, it, &libctx)
+ || !asn1_cb(ASN1_OP_GET0_PROPQ, (ASN1_VALUE **)&x, it, &propq))
goto auxerr;
}
@@ -89,7 +89,7 @@ void *ASN1_item_dup(const ASN1_ITEM *it, const void *x)
return ret;
- auxerr:
+auxerr:
ERR_raise_data(ERR_LIB_ASN1, ASN1_R_AUX_ERROR, "Type=%s", it->sname);
return NULL;
}
diff --git a/crypto/asn1/a_gentm.c b/crypto/asn1/a_gentm.c
index fc58248ed3..89a957b0b1 100644
--- a/crypto/asn1/a_gentm.c
+++ b/crypto/asn1/a_gentm.c
@@ -22,7 +22,7 @@ IMPLEMENT_ASN1_DUP_FUNCTION(ASN1_GENERALIZEDTIME)
/* This is the primary function used to parse ASN1_GENERALIZEDTIME */
static int asn1_generalizedtime_to_tm(struct tm *tm,
- const ASN1_GENERALIZEDTIME *d)
+ const ASN1_GENERALIZEDTIME *d)
{
/* wrapper around ossl_asn1_time_to_tm */
if (d->type != V_ASN1_GENERALIZEDTIME)
@@ -58,14 +58,14 @@ int ASN1_GENERALIZEDTIME_set_string(ASN1_GENERALIZEDTIME *s, const char *str)
}
ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_set(ASN1_GENERALIZEDTIME *s,
- time_t t)
+ time_t t)
{
return ASN1_GENERALIZEDTIME_adj(s, t, 0, 0);
}
ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_adj(ASN1_GENERALIZEDTIME *s,
- time_t t, int offset_day,
- long offset_sec)
+ time_t t, int offset_day,
+ long offset_sec)
{
struct tm *ts;
struct tm data;
diff --git a/crypto/asn1/a_i2d_fp.c b/crypto/asn1/a_i2d_fp.c
index 23e0b0f700..e177e20465 100644
--- a/crypto/asn1/a_i2d_fp.c
+++ b/crypto/asn1/a_i2d_fp.c
@@ -14,7 +14,7 @@
#ifndef NO_OLD_ASN1
-# ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_STDIO
int ASN1_i2d_fp(i2d_of_void *i2d, FILE *out, const void *x)
{
BIO *b;
@@ -29,7 +29,7 @@ int ASN1_i2d_fp(i2d_of_void *i2d, FILE *out, const void *x)
BIO_free(b);
return ret;
}
-# endif
+#endif
int ASN1_i2d_bio(i2d_of_void *i2d, BIO *out, const void *x)
{
diff --git a/crypto/asn1/a_int.c b/crypto/asn1/a_int.c
index 7cdfc0311b..de39a54cdb 100644
--- a/crypto/asn1/a_int.c
+++ b/crypto/asn1/a_int.c
@@ -74,7 +74,7 @@ int ASN1_INTEGER_cmp(const ASN1_INTEGER *x, const ASN1_INTEGER *y)
* used elsewhere below...
*/
static void twos_complement(unsigned char *dst, const unsigned char *src,
- size_t len, unsigned char pad)
+ size_t len, unsigned char pad)
{
unsigned int carry = pad & 1;
@@ -95,7 +95,7 @@ static void twos_complement(unsigned char *dst, const unsigned char *src,
}
static size_t i2c_ibuf(const unsigned char *b, size_t blen, int neg,
- unsigned char **pp)
+ unsigned char **pp)
{
unsigned int pad = 0;
size_t ret, i;
@@ -125,7 +125,7 @@ static size_t i2c_ibuf(const unsigned char *b, size_t blen, int neg,
ret += pad;
} else {
ret = 1;
- blen = 0; /* reduce '(b == NULL || blen == 0)' to '(blen == 0)' */
+ blen = 0; /* reduce '(b == NULL || blen == 0)' to '(blen == 0)' */
}
if (pp == NULL || (p = *pp) == NULL)
@@ -137,8 +137,8 @@ static size_t i2c_ibuf(const unsigned char *b, size_t blen, int neg,
* by any number of zeros...
*/
*p = pb;
- p += pad; /* yes, p[0] can be written twice, but it's little
- * price to pay for eliminated branches */
+ p += pad; /* yes, p[0] can be written twice, but it's little
+ * price to pay for eliminated branches */
twos_complement(p, b, blen, pb);
*pp += ret;
@@ -152,7 +152,7 @@ static size_t i2c_ibuf(const unsigned char *b, size_t blen, int neg,
*/
static size_t c2i_ibuf(unsigned char *b, int *pneg,
- const unsigned char *p, size_t plen)
+ const unsigned char *p, size_t plen)
{
int neg, pad;
/* Zero content length is illegal */
@@ -262,7 +262,7 @@ static size_t asn1_put_uint64(unsigned char b[sizeof(uint64_t)], uint64_t r)
/* signed version of asn1_get_uint64 */
static int asn1_get_int64(int64_t *pr, const unsigned char *b, size_t blen,
- int neg)
+ int neg)
{
uint64_t r;
if (asn1_get_uint64(&r, b, blen) == 0)
@@ -297,7 +297,7 @@ static int asn1_get_int64(int64_t *pr, const unsigned char *b, size_t blen,
/* Convert ASN1 INTEGER content octets to ASN1_INTEGER structure */
ASN1_INTEGER *ossl_c2i_ASN1_INTEGER(ASN1_INTEGER **a, const unsigned char **pp,
- long len)
+ long len)
{
ASN1_INTEGER *ret = NULL;
size_t r;
@@ -332,7 +332,7 @@ ASN1_INTEGER *ossl_c2i_ASN1_INTEGER(ASN1_INTEGER **a, const unsigned char **pp,
if (a != NULL)
(*a) = ret;
return ret;
- err:
+err:
if (a == NULL || *a != ret)
ASN1_INTEGER_free(ret);
return NULL;
@@ -375,7 +375,7 @@ static int asn1_string_set_int64(ASN1_STRING *a, int64_t r, int itype)
}
static int asn1_string_get_uint64(uint64_t *pr, const ASN1_STRING *a,
- int itype)
+ int itype)
{
if (a == NULL) {
ERR_raise(ERR_LIB_ASN1, ERR_R_PASSED_NULL_PARAMETER);
@@ -409,7 +409,7 @@ static int asn1_string_set_uint64(ASN1_STRING *a, uint64_t r, int itype)
*/
ASN1_INTEGER *d2i_ASN1_UINTEGER(ASN1_INTEGER **a, const unsigned char **pp,
- long length)
+ long length)
{
ASN1_INTEGER *ret = NULL;
const unsigned char *p;
@@ -463,7 +463,7 @@ ASN1_INTEGER *d2i_ASN1_UINTEGER(ASN1_INTEGER **a, const unsigned char **pp,
(*a) = ret;
*pp = p;
return ret;
- err:
+err:
if (i != 0)
ERR_raise(ERR_LIB_ASN1, i);
if ((a == NULL) || (*a != ret))
@@ -472,7 +472,7 @@ ASN1_INTEGER *d2i_ASN1_UINTEGER(ASN1_INTEGER **a, const unsigned char **pp,
}
static ASN1_STRING *bn_to_asn1_string(const BIGNUM *bn, ASN1_STRING *ai,
- int atype)
+ int atype)
{
ASN1_INTEGER *ret;
int len;
@@ -509,14 +509,14 @@ static ASN1_STRING *bn_to_asn1_string(const BIGNUM *bn, ASN1_STRING *ai,
len = BN_bn2bin(bn, ret->data);
ret->length = len;
return ret;
- err:
+err:
if (ret != ai)
ASN1_INTEGER_free(ret);
return NULL;
}
static BIGNUM *asn1_string_to_bn(const ASN1_INTEGER *ai, BIGNUM *bn,
- int itype)
+ int itype)
{
BIGNUM *ret;
@@ -629,7 +629,7 @@ BIGNUM *ASN1_ENUMERATED_to_BN(const ASN1_ENUMERATED *ai, BIGNUM *bn)
/* Internal functions used by x_int64.c */
int ossl_c2i_uint64_int(uint64_t *ret, int *neg,
- const unsigned char **pp, long len)
+ const unsigned char **pp, long len)
{
unsigned char buf[sizeof(uint64_t)];
size_t buflen;
@@ -653,4 +653,3 @@ int ossl_i2c_uint64_int(unsigned char *p, uint64_t r, int neg)
off = asn1_put_uint64(buf, r);
return (int)i2c_ibuf(buf + off, sizeof(buf) - off, neg, &p);
}
-
diff --git a/crypto/asn1/a_mbstr.c b/crypto/asn1/a_mbstr.c
index d5672b3cfb..b7a5284fa5 100644
--- a/crypto/asn1/a_mbstr.c
+++ b/crypto/asn1/a_mbstr.c
@@ -14,8 +14,8 @@
#include <openssl/asn1.h>
static int traverse_string(const unsigned char *p, int len, int inform,
- int (*rfunc) (unsigned long value, void *in),
- void *arg);
+ int (*rfunc)(unsigned long value, void *in),
+ void *arg);
static int in_utf8(unsigned long value, void *arg);
static int out_utf8(unsigned long value, void *arg);
static int type_str(unsigned long value, void *arg);
@@ -34,14 +34,14 @@ static int cpy_utf8(unsigned long value, void *arg);
*/
int ASN1_mbstring_copy(ASN1_STRING **out, const unsigned char *in, int len,
- int inform, unsigned long mask)
+ int inform, unsigned long mask)
{
return ASN1_mbstring_ncopy(out, in, len, inform, mask, 0, 0);
}
int ASN1_mbstring_ncopy(ASN1_STRING **out, const unsigned char *in, int len,
- int inform, unsigned long mask,
- long minsize, long maxsize)
+ int inform, unsigned long mask,
+ long minsize, long maxsize)
{
int str_type;
int ret;
@@ -50,7 +50,7 @@ int ASN1_mbstring_ncopy(ASN1_STRING **out, const unsigned char *in, int len,
ASN1_STRING *dest;
unsigned char *p;
int nchar;
- int (*cpyfunc) (unsigned long, void *) = NULL;
+ int (*cpyfunc)(unsigned long, void *) = NULL;
if (len == -1) {
size_t len_s = strlen((const char *)in);
@@ -107,13 +107,13 @@ int ASN1_mbstring_ncopy(ASN1_STRING **out, const unsigned char *in, int len,
if ((minsize > 0) && (nchar < minsize)) {
ERR_raise_data(ERR_LIB_ASN1, ASN1_R_STRING_TOO_SHORT,
- "minsize=%ld", minsize);
+ "minsize=%ld", minsize);
return -1;
}
if ((maxsize > 0) && (nchar > maxsize)) {
ERR_raise_data(ERR_LIB_ASN1, ASN1_R_STRING_TOO_LONG,
- "maxsize=%ld", maxsize);
+ "maxsize=%ld", maxsize);
return -1;
}
@@ -215,8 +215,8 @@ int ASN1_mbstring_ncopy(ASN1_STRING **out, const unsigned char *in, int len,
*/
static int traverse_string(const unsigned char *p, int len, int inform,
- int (*rfunc) (unsigned long value, void *in),
- void *arg)
+ int (*rfunc)(unsigned long value, void *in),
+ void *arg)
{
unsigned long value;
int ret;
@@ -289,8 +289,7 @@ static int type_str(unsigned long value, void *arg)
unsigned long types = *((unsigned long *)arg);
const int native = value > INT_MAX ? INT_MAX : ossl_fromascii(value);
- if ((types & B_ASN1_NUMERICSTRING) && !(ossl_isdigit(native)
- || native == ' '))
+ if ((types & B_ASN1_NUMERICSTRING) && !(ossl_isdigit(native) || native == ' '))
types &= ~B_ASN1_NUMERICSTRING;
if ((types & B_ASN1_PRINTABLESTRING) && !ossl_isasn1print(native))
types &= ~B_ASN1_PRINTABLESTRING;
diff --git a/crypto/asn1/a_object.c b/crypto/asn1/a_object.c
index 63012e4627..4860308821 100644
--- a/crypto/asn1/a_object.c
+++ b/crypto/asn1/a_object.c
@@ -128,7 +128,7 @@ int a2d_ASN1_OBJECT(unsigned char *out, int olen, const char *buf, int num)
if (!BN_add_word(bl, first * 40))
goto err;
} else
- l += (long)first *40;
+ l += (long)first * 40;
}
i = 0;
if (use_bn) {
@@ -157,7 +157,6 @@ int a2d_ASN1_OBJECT(unsigned char *out, int olen, const char *buf, int num)
if (l == 0L)
break;
}
-
}
if (out != NULL) {
if (len + i > olen) {
@@ -174,7 +173,7 @@ int a2d_ASN1_OBJECT(unsigned char *out, int olen, const char *buf, int num)
OPENSSL_free(tmp);
BN_free(bl);
return len;
- err:
+err:
if (tmp != ftmp)
OPENSSL_free(tmp);
BN_free(bl);
@@ -195,7 +194,7 @@ int i2a_ASN1_OBJECT(BIO *bp, const ASN1_OBJECT *a)
return BIO_write(bp, "NULL", 4);
i = i2t_ASN1_OBJECT(buf, sizeof(buf), a);
if (i > (int)(sizeof(buf) - 1)) {
- if (i > INT_MAX - 1) { /* catch an integer overflow */
+ if (i > INT_MAX - 1) { /* catch an integer overflow */
ERR_raise(ERR_LIB_ASN1, ASN1_R_LENGTH_TOO_LONG);
return -1;
}
@@ -216,7 +215,7 @@ int i2a_ASN1_OBJECT(BIO *bp, const ASN1_OBJECT *a)
}
ASN1_OBJECT *d2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp,
- long length)
+ long length)
{
const unsigned char *p;
long len;
@@ -238,13 +237,13 @@ ASN1_OBJECT *d2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp,
if (ret)
*pp = p;
return ret;
- err:
+err:
ERR_raise(ERR_LIB_ASN1, i);
return NULL;
}
ASN1_OBJECT *ossl_c2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp,
- long len)
+ long len)
{
ASN1_OBJECT *ret = NULL, tobj;
const unsigned char *p;
@@ -256,8 +255,7 @@ ASN1_OBJECT *ossl_c2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp,
* be clear in the last octet. can't have leading 0x80 in subidentifiers,
* see: X.690 8.19.2
*/
- if (len <= 0 || len > INT_MAX || pp == NULL || (p = *pp) == NULL ||
- p[len - 1] & 0x80) {
+ if (len <= 0 || len > INT_MAX || pp == NULL || (p = *pp) == NULL || p[len - 1] & 0x80) {
ERR_raise(ERR_LIB_ASN1, ASN1_R_INVALID_OBJECT_ENCODING);
return NULL;
}
@@ -293,8 +291,7 @@ ASN1_OBJECT *ossl_c2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp,
}
}
- if ((a == NULL) || ((*a) == NULL) ||
- !((*a)->flags & ASN1_OBJECT_FLAG_DYNAMIC)) {
+ if ((a == NULL) || ((*a) == NULL) || !((*a)->flags & ASN1_OBJECT_FLAG_DYNAMIC)) {
if ((ret = ASN1_OBJECT_new()) == NULL)
return NULL;
} else {
@@ -333,7 +330,7 @@ ASN1_OBJECT *ossl_c2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp,
(*a) = ret;
*pp = p;
return ret;
- err:
+err:
ERR_raise(ERR_LIB_ASN1, i);
if ((a == NULL) || (*a != ret))
ASN1_OBJECT_free(ret);
@@ -361,13 +358,13 @@ void ASN1_OBJECT_free(ASN1_OBJECT *a)
* Disable purely for compile-time strict const checking. Doing this
* on a "real" compile will cause memory leaks
*/
- OPENSSL_free((void*)a->sn);
- OPENSSL_free((void*)a->ln);
+ OPENSSL_free((void *)a->sn);
+ OPENSSL_free((void *)a->ln);
#endif
a->sn = a->ln = NULL;
}
if (a->flags & ASN1_OBJECT_FLAG_DYNAMIC_DATA) {
- OPENSSL_free((void*)a->data);
+ OPENSSL_free((void *)a->data);
a->data = NULL;
a->length = 0;
}
@@ -376,7 +373,7 @@ void ASN1_OBJECT_free(ASN1_OBJECT *a)
}
ASN1_OBJECT *ASN1_OBJECT_create(int nid, unsigned char *data, int len,
- const char *sn, const char *ln)
+ const char *sn, const char *ln)
{
ASN1_OBJECT o;
@@ -385,7 +382,6 @@ ASN1_OBJECT *ASN1_OBJECT_create(int nid, unsigned char *data, int len,
o.data = data;
o.nid = nid;
o.length = len;
- o.flags = ASN1_OBJECT_FLAG_DYNAMIC | ASN1_OBJECT_FLAG_DYNAMIC_STRINGS |
- ASN1_OBJECT_FLAG_DYNAMIC_DATA;
+ o.flags = ASN1_OBJECT_FLAG_DYNAMIC | ASN1_OBJECT_FLAG_DYNAMIC_STRINGS | ASN1_OBJECT_FLAG_DYNAMIC_DATA;
return OBJ_dup(&o);
}
diff --git a/crypto/asn1/a_octet.c b/crypto/asn1/a_octet.c
index fcb2ef0a7d..4efb8ec517 100644
--- a/crypto/asn1/a_octet.c
+++ b/crypto/asn1/a_octet.c
@@ -17,13 +17,13 @@ ASN1_OCTET_STRING *ASN1_OCTET_STRING_dup(const ASN1_OCTET_STRING *x)
}
int ASN1_OCTET_STRING_cmp(const ASN1_OCTET_STRING *a,
- const ASN1_OCTET_STRING *b)
+ const ASN1_OCTET_STRING *b)
{
return ASN1_STRING_cmp(a, b);
}
int ASN1_OCTET_STRING_set(ASN1_OCTET_STRING *x, const unsigned char *d,
- int len)
+ int len)
{
return ASN1_STRING_set(x, d, len);
}
diff --git a/crypto/asn1/a_print.c b/crypto/asn1/a_print.c
index c5f33b69a0..54e5042591 100644
--- a/crypto/asn1/a_print.c
+++ b/crypto/asn1/a_print.c
@@ -77,8 +77,7 @@ int ASN1_STRING_print(BIO *bp, const ASN1_STRING *v)
n = 0;
p = (const char *)v->data;
for (i = 0; i < v->length; i++) {
- if ((p[i] > '~') || ((p[i] < ' ') &&
- (p[i] != '\n') && (p[i] != '\r')))
+ if ((p[i] > '~') || ((p[i] < ' ') && (p[i] != '\n') && (p[i] != '\r')))
buf[n] = '.';
else
buf[n] = p[i];
diff --git a/crypto/asn1/a_sign.c b/crypto/asn1/a_sign.c
index 62f1ecfddb..7659cf8703 100644
--- a/crypto/asn1/a_sign.c
+++ b/crypto/asn1/a_sign.c
@@ -25,8 +25,8 @@
#ifndef OPENSSL_NO_DEPRECATED_3_0
int ASN1_sign(i2d_of_void *i2d, X509_ALGOR *algor1, X509_ALGOR *algor2,
- ASN1_BIT_STRING *signature, char *data, EVP_PKEY *pkey,
- const EVP_MD *type)
+ ASN1_BIT_STRING *signature, char *data, EVP_PKEY *pkey,
+ const EVP_MD *type)
{
EVP_MD_CTX *ctx = EVP_MD_CTX_new();
unsigned char *p, *buf_in = NULL, *buf_out = NULL;
@@ -52,8 +52,7 @@ int ASN1_sign(i2d_of_void *i2d, X509_ALGOR *algor1, X509_ALGOR *algor2,
*/
ASN1_TYPE_free(a->parameter);
a->parameter = NULL;
- } else if ((a->parameter == NULL) ||
- (a->parameter->type != V_ASN1_NULL)) {
+ } else if ((a->parameter == NULL) || (a->parameter->type != V_ASN1_NULL)) {
ASN1_TYPE_free(a->parameter);
if ((a->parameter = ASN1_TYPE_new()) == NULL)
goto err;
@@ -67,7 +66,7 @@ int ASN1_sign(i2d_of_void *i2d, X509_ALGOR *algor1, X509_ALGOR *algor2,
}
if (a->algorithm->length == 0) {
ERR_raise(ERR_LIB_ASN1,
- ASN1_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD);
+ ASN1_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD);
goto err;
}
}
@@ -90,7 +89,7 @@ int ASN1_sign(i2d_of_void *i2d, X509_ALGOR *algor1, X509_ALGOR *algor2,
if (!EVP_SignInit_ex(ctx, type, NULL)
|| !EVP_SignUpdate(ctx, (unsigned char *)buf_in, inl)
|| !EVP_SignFinal(ctx, (unsigned char *)buf_out,
- (unsigned int *)&outl, pkey)) {
+ (unsigned int *)&outl, pkey)) {
outl = 0;
ERR_raise(ERR_LIB_ASN1, ERR_R_EVP_LIB);
goto err;
@@ -102,7 +101,7 @@ int ASN1_sign(i2d_of_void *i2d, X509_ALGOR *algor1, X509_ALGOR *algor2,
* has a 'not-used bits' value of 0
*/
ossl_asn1_string_set_bits_left(signature, 0);
- err:
+err:
EVP_MD_CTX_free(ctx);
OPENSSL_clear_free((char *)buf_in, inll);
OPENSSL_clear_free((char *)buf_out, outll);
@@ -112,18 +111,18 @@ int ASN1_sign(i2d_of_void *i2d, X509_ALGOR *algor1, X509_ALGOR *algor2,
#endif
int ASN1_item_sign(const ASN1_ITEM *it, X509_ALGOR *algor1, X509_ALGOR *algor2,
- ASN1_BIT_STRING *signature, const void *data,
- EVP_PKEY *pkey, const EVP_MD *md)
+ ASN1_BIT_STRING *signature, const void *data,
+ EVP_PKEY *pkey, const EVP_MD *md)
{
return ASN1_item_sign_ex(it, algor1, algor2, signature, data, NULL, pkey,
- md, NULL, NULL);
+ md, NULL, NULL);
}
int ASN1_item_sign_ex(const ASN1_ITEM *it, X509_ALGOR *algor1,
- X509_ALGOR *algor2, ASN1_BIT_STRING *signature,
- const void *data, const ASN1_OCTET_STRING *id,
- EVP_PKEY *pkey, const EVP_MD *md, OSSL_LIB_CTX *libctx,
- const char *propq)
+ X509_ALGOR *algor2, ASN1_BIT_STRING *signature,
+ const void *data, const ASN1_OCTET_STRING *id,
+ EVP_PKEY *pkey, const EVP_MD *md, OSSL_LIB_CTX *libctx,
+ const char *propq)
{
int rv = 0;
EVP_MD_CTX *ctx = evp_md_ctx_new_ex(pkey, id, libctx, propq);
@@ -138,15 +137,15 @@ int ASN1_item_sign_ex(const ASN1_ITEM *it, X509_ALGOR *algor1,
rv = ASN1_item_sign_ctx(it, algor1, algor2, signature, data, ctx);
- err:
+err:
EVP_PKEY_CTX_free(EVP_MD_CTX_get_pkey_ctx(ctx));
EVP_MD_CTX_free(ctx);
return rv;
}
int ASN1_item_sign_ctx(const ASN1_ITEM *it, X509_ALGOR *algor1,
- X509_ALGOR *algor2, ASN1_BIT_STRING *signature,
- const void *data, EVP_MD_CTX *ctx)
+ X509_ALGOR *algor2, ASN1_BIT_STRING *signature,
+ const void *data, EVP_MD_CTX *ctx)
{
const EVP_MD *md;
EVP_PKEY *pkey;
@@ -175,9 +174,8 @@ int ASN1_item_sign_ctx(const ASN1_ITEM *it, X509_ALGOR *algor1,
goto err;
}
- params[0] =
- OSSL_PARAM_construct_octet_string(OSSL_SIGNATURE_PARAM_ALGORITHM_ID,
- aid, sizeof(aid));
+ params[0] = OSSL_PARAM_construct_octet_string(OSSL_SIGNATURE_PARAM_ALGORITHM_ID,
+ aid, sizeof(aid));
params[1] = OSSL_PARAM_construct_end();
if (EVP_PKEY_CTX_get_params(pctx, params) <= 0)
@@ -236,15 +234,14 @@ int ASN1_item_sign_ctx(const ASN1_ITEM *it, X509_ALGOR *algor1,
#ifndef OPENSSL_NO_SM2
EVP_PKEY_get_id(pkey) == NID_sm2 ? NID_sm2 :
#endif
- pkey->ameth->pkey_id;
+ pkey->ameth->pkey_id;
if (!OBJ_find_sigid_by_algs(&signid, EVP_MD_nid(md), pkey_id)) {
ERR_raise(ERR_LIB_ASN1, ASN1_R_DIGEST_AND_KEY_TYPE_NOT_SUPPORTED);
goto err;
}
- paramtype = pkey->ameth->pkey_flags & ASN1_PKEY_SIGPARAM_NULL ?
- V_ASN1_NULL : V_ASN1_UNDEF;
+ paramtype = pkey->ameth->pkey_flags & ASN1_PKEY_SIGPARAM_NULL ? V_ASN1_NULL : V_ASN1_UNDEF;
if (algor1 != NULL
&& !X509_ALGOR_set0(algor1, OBJ_nid2obj(signid), paramtype, NULL))
goto err;
@@ -284,7 +281,7 @@ int ASN1_item_sign_ctx(const ASN1_ITEM *it, X509_ALGOR *algor1,
* has a 'not-used bits' value of 0
*/
ossl_asn1_string_set_bits_left(signature, 0);
- err:
+err:
OPENSSL_clear_free((char *)buf_in, inl);
OPENSSL_clear_free((char *)buf_out, outll);
return (int)outl;
diff --git a/crypto/asn1/a_strex.c b/crypto/asn1/a_strex.c
index 3ac9d61c48..17f7372026 100644
--- a/crypto/asn1/a_strex.c
+++ b/crypto/asn1/a_strex.c
@@ -24,13 +24,9 @@
* other options.
*/
-#define CHARTYPE_BS_ESC (ASN1_STRFLGS_ESC_2253 | CHARTYPE_FIRST_ESC_2253 | CHARTYPE_LAST_ESC_2253)
+#define CHARTYPE_BS_ESC (ASN1_STRFLGS_ESC_2253 | CHARTYPE_FIRST_ESC_2253 | CHARTYPE_LAST_ESC_2253)
-#define ESC_FLAGS (ASN1_STRFLGS_ESC_2253 | \
- ASN1_STRFLGS_ESC_2254 | \
- ASN1_STRFLGS_ESC_QUOTE | \
- ASN1_STRFLGS_ESC_CTRL | \
- ASN1_STRFLGS_ESC_MSB)
+#define ESC_FLAGS (ASN1_STRFLGS_ESC_2253 | ASN1_STRFLGS_ESC_2254 | ASN1_STRFLGS_ESC_QUOTE | ASN1_STRFLGS_ESC_CTRL | ASN1_STRFLGS_ESC_MSB)
/*
* Three IO functions for sending data to memory, a BIO and a FILE
@@ -56,7 +52,7 @@ static int send_fp_chars(void *arg, const void *buf, int len)
}
#endif
-typedef int char_io (void *arg, const void *buf, int len);
+typedef int char_io(void *arg, const void *buf, int len);
/*
* This function handles display of strings, one character at a time. It is
@@ -65,7 +61,7 @@ typedef int char_io (void *arg, const void *buf, int len);
*/
static int do_esc_char(unsigned long c, unsigned short flags, char *do_quotes,
- char_io *io_ch, void *arg)
+ char_io *io_ch, void *arg)
{
unsigned short chflgs;
unsigned char chtmp;
@@ -105,9 +101,7 @@ static int do_esc_char(unsigned long c, unsigned short flags, char *do_quotes,
return -1;
return 2;
}
- if (chflgs & (ASN1_STRFLGS_ESC_CTRL
- | ASN1_STRFLGS_ESC_MSB
- | ASN1_STRFLGS_ESC_2254)) {
+ if (chflgs & (ASN1_STRFLGS_ESC_CTRL | ASN1_STRFLGS_ESC_MSB | ASN1_STRFLGS_ESC_2254)) {
BIO_snprintf(tmphex, 11, "\\%02X", chtmp);
if (!io_ch(arg, tmphex, 3))
return -1;
@@ -127,8 +121,8 @@ static int do_esc_char(unsigned long c, unsigned short flags, char *do_quotes,
return 1;
}
-#define BUF_TYPE_WIDTH_MASK 0x7
-#define BUF_TYPE_CONVUTF8 0x8
+#define BUF_TYPE_WIDTH_MASK 0x7
+#define BUF_TYPE_CONVUTF8 0x8
/*
* This function sends each character in a buffer to do_esc_char(). It
@@ -137,8 +131,8 @@ static int do_esc_char(unsigned long c, unsigned short flags, char *do_quotes,
*/
static int do_buf(unsigned char *buf, int buflen,
- int type, unsigned short flags, char *quotes, char_io *io_ch,
- void *arg)
+ int type, unsigned short flags, char *quotes, char_io *io_ch,
+ void *arg)
{
int i, outlen, len, charwidth;
unsigned short orflags;
@@ -193,12 +187,12 @@ static int do_buf(unsigned char *buf, int buflen,
case 0:
i = UTF8_getc(p, buflen, &c);
if (i < 0)
- return -1; /* Invalid UTF8String */
+ return -1; /* Invalid UTF8String */
buflen -= i;
p += i;
break;
default:
- return -1; /* invalid width */
+ return -1; /* invalid width */
}
if (p == q && flags & ASN1_STRFLGS_ESC_2253)
orflags = CHARTYPE_LAST_ESC_2253;
@@ -214,14 +208,14 @@ static int do_buf(unsigned char *buf, int buflen,
* character will never be escaped on first and last.
*/
len = do_esc_char(utfbuf[i], flags | orflags, quotes,
- io_ch, arg);
+ io_ch, arg);
if (len < 0)
return -1;
outlen += len;
}
} else {
len = do_esc_char(c, flags | orflags, quotes,
- io_ch, arg);
+ io_ch, arg);
if (len < 0)
return -1;
outlen += len;
@@ -233,7 +227,7 @@ static int do_buf(unsigned char *buf, int buflen,
/* This function hex dumps a buffer of characters */
static int do_hex_dump(char_io *io_ch, void *arg, unsigned char *buf,
- int buflen)
+ int buflen)
{
unsigned char *p, *q;
char hextmp[2];
@@ -258,7 +252,7 @@ static int do_hex_dump(char_io *io_ch, void *arg, unsigned char *buf,
*/
static int do_dump(unsigned long lflags, char_io *io_ch, void *arg,
- const ASN1_STRING *str)
+ const ASN1_STRING *str)
{
/*
* Placing the ASN1_STRING in a temp ASN1_TYPE allows the DER encoding to
@@ -300,24 +294,24 @@ static int do_dump(unsigned long lflags, char_io *io_ch, void *arg,
*/
static const signed char tag2nbyte[] = {
- -1, -1, -1, -1, -1, /* 0-4 */
- -1, -1, -1, -1, -1, /* 5-9 */
- -1, -1, /* 10-11 */
- 0, /* 12 V_ASN1_UTF8STRING */
- -1, -1, -1, -1, -1, /* 13-17 */
- 1, /* 18 V_ASN1_NUMERICSTRING */
- 1, /* 19 V_ASN1_PRINTABLESTRING */
- 1, /* 20 V_ASN1_T61STRING */
- -1, /* 21 */
- 1, /* 22 V_ASN1_IA5STRING */
- 1, /* 23 V_ASN1_UTCTIME */
- 1, /* 24 V_ASN1_GENERALIZEDTIME */
- -1, /* 25 */
- 1, /* 26 V_ASN1_ISO64STRING */
- -1, /* 27 */
- 4, /* 28 V_ASN1_UNIVERSALSTRING */
- -1, /* 29 */
- 2 /* 30 V_ASN1_BMPSTRING */
+ -1, -1, -1, -1, -1, /* 0-4 */
+ -1, -1, -1, -1, -1, /* 5-9 */
+ -1, -1, /* 10-11 */
+ 0, /* 12 V_ASN1_UTF8STRING */
+ -1, -1, -1, -1, -1, /* 13-17 */
+ 1, /* 18 V_ASN1_NUMERICSTRING */
+ 1, /* 19 V_ASN1_PRINTABLESTRING */
+ 1, /* 20 V_ASN1_T61STRING */
+ -1, /* 21 */
+ 1, /* 22 V_ASN1_IA5STRING */
+ 1, /* 23 V_ASN1_UTCTIME */
+ 1, /* 24 V_ASN1_GENERALIZEDTIME */
+ -1, /* 25 */
+ 1, /* 26 V_ASN1_ISO64STRING */
+ -1, /* 27 */
+ 4, /* 28 V_ASN1_UNIVERSALSTRING */
+ -1, /* 29 */
+ 2 /* 30 V_ASN1_BMPSTRING */
};
/*
@@ -327,7 +321,7 @@ static const signed char tag2nbyte[] = {
*/
static int do_print_ex(char_io *io_ch, void *arg, unsigned long lflags,
- const ASN1_STRING *str)
+ const ASN1_STRING *str)
{
int outlen, len;
int type;
@@ -418,11 +412,11 @@ static int do_indent(char_io *io_ch, void *arg, int indent)
return 1;
}
-#define FN_WIDTH_LN 25
-#define FN_WIDTH_SN 10
+#define FN_WIDTH_LN 25
+#define FN_WIDTH_SN 10
static int do_name_ex(char_io *io_ch, void *arg, const X509_NAME *n,
- int indent, unsigned long flags)
+ int indent, unsigned long flags)
{
int i, prev = -1, orflags, cnt;
int fn_opt, fn_nid;
@@ -513,7 +507,7 @@ static int do_name_ex(char_io *io_ch, void *arg, const X509_NAME *n,
int objlen, fld_len;
if ((fn_opt == XN_FLAG_FN_OID) || (fn_nid == NID_undef)) {
OBJ_obj2txt(objtmp, sizeof(objtmp), fn, 1);
- fld_len = 0; /* XXX: what should this be? */
+ fld_len = 0; /* XXX: what should this be? */
objbuf = objtmp;
} else {
if (fn_opt == XN_FLAG_FN_SN) {
@@ -560,7 +554,7 @@ static int do_name_ex(char_io *io_ch, void *arg, const X509_NAME *n,
/* Wrappers round the main functions */
int X509_NAME_print_ex(BIO *out, const X509_NAME *nm, int indent,
- unsigned long flags)
+ unsigned long flags)
{
if (flags == XN_FLAG_COMPAT)
return X509_NAME_print(out, nm, indent);
@@ -569,7 +563,7 @@ int X509_NAME_print_ex(BIO *out, const X509_NAME *nm, int indent,
#ifndef OPENSSL_NO_STDIO
int X509_NAME_print_ex_fp(FILE *fp, const X509_NAME *nm, int indent,
- unsigned long flags)
+ unsigned long flags)
{
if (flags == XN_FLAG_COMPAT) {
BIO *btmp;
@@ -618,9 +612,8 @@ int ASN1_STRING_to_UTF8(unsigned char **out, const ASN1_STRING *in)
stmp.data = NULL;
stmp.length = 0;
stmp.flags = 0;
- ret =
- ASN1_mbstring_copy(&str, in->data, in->length, mbflag,
- B_ASN1_UTF8STRING);
+ ret = ASN1_mbstring_copy(&str, in->data, in->length, mbflag,
+ B_ASN1_UTF8STRING);
if (ret < 0)
return ret;
*out = stmp.data;
diff --git a/crypto/asn1/a_strnid.c b/crypto/asn1/a_strnid.c
index 14b57ac5a9..889587133c 100644
--- a/crypto/asn1/a_strnid.c
+++ b/crypto/asn1/a_strnid.c
@@ -15,7 +15,7 @@
static STACK_OF(ASN1_STRING_TABLE) *stable = NULL;
static void st_free(ASN1_STRING_TABLE *tbl);
static int sk_table_cmp(const ASN1_STRING_TABLE *const *a,
- const ASN1_STRING_TABLE *const *b);
+ const ASN1_STRING_TABLE *const *b);
/*
* This is the global mask for the mbstring functions: this is use to mask
@@ -77,8 +77,8 @@ int ASN1_STRING_set_default_mask_asc(const char *p)
*/
ASN1_STRING *ASN1_STRING_set_by_NID(ASN1_STRING **out,
- const unsigned char *in, int inlen,
- int inform, int nid)
+ const unsigned char *in, int inlen,
+ int inform, int nid)
{
ASN1_STRING_TABLE *tbl;
ASN1_STRING *str = NULL;
@@ -93,10 +93,10 @@ ASN1_STRING *ASN1_STRING_set_by_NID(ASN1_STRING **out,
if (!(tbl->flags & STABLE_NO_MASK))
mask &= global_mask;
ret = ASN1_mbstring_ncopy(out, in, inlen, inform, mask,
- tbl->minsize, tbl->maxsize);
+ tbl->minsize, tbl->maxsize);
} else {
ret = ASN1_mbstring_copy(out, in, inlen, inform,
- DIRSTRING_TYPE & global_mask);
+ DIRSTRING_TYPE & global_mask);
}
if (ret <= 0)
return NULL;
@@ -110,7 +110,7 @@ ASN1_STRING *ASN1_STRING_set_by_NID(ASN1_STRING **out,
#include "tbl_standard.h"
static int sk_table_cmp(const ASN1_STRING_TABLE *const *a,
- const ASN1_STRING_TABLE *const *b)
+ const ASN1_STRING_TABLE *const *b)
{
return (*a)->nid - (*b)->nid;
}
@@ -190,8 +190,8 @@ static ASN1_STRING_TABLE *stable_get(int nid)
}
int ASN1_STRING_TABLE_add(int nid,
- long minsize, long maxsize, unsigned long mask,
- unsigned long flags)
+ long minsize, long maxsize, unsigned long mask,
+ unsigned long flags)
{
ASN1_STRING_TABLE *tmp;
diff --git a/crypto/asn1/a_time.c b/crypto/asn1/a_time.c
index ad28f46a9b..51536eb630 100644
--- a/crypto/asn1/a_time.c
+++ b/crypto/asn1/a_time.c
@@ -258,13 +258,13 @@ int ossl_asn1_time_to_tm(struct tm *tm, const ASN1_TIME *d)
*tm = tmp;
return 1;
}
- err:
+err:
return 0;
}
ASN1_TIME *ossl_asn1_time_from_tm(ASN1_TIME *s, struct tm *ts, int type)
{
- char* p;
+ char *p;
ASN1_TIME *tmps = NULL;
const int len = 20;
@@ -291,7 +291,7 @@ ASN1_TIME *ossl_asn1_time_from_tm(ASN1_TIME *s, struct tm *ts, int type)
goto err;
tmps->type = type;
- p = (char*)tmps->data;
+ p = (char *)tmps->data;
if (ts->tm_mon > INT_MAX - 1)
goto err;
@@ -300,21 +300,21 @@ ASN1_TIME *ossl_asn1_time_from_tm(ASN1_TIME *s, struct tm *ts, int type)
if (ts->tm_year > INT_MAX - 1900)
goto err;
tmps->length = BIO_snprintf(p, len, "%04d%02d%02d%02d%02d%02dZ",
- ts->tm_year + 1900, ts->tm_mon + 1,
- ts->tm_mday, ts->tm_hour, ts->tm_min,
- ts->tm_sec);
+ ts->tm_year + 1900, ts->tm_mon + 1,
+ ts->tm_mday, ts->tm_hour, ts->tm_min,
+ ts->tm_sec);
} else {
tmps->length = BIO_snprintf(p, len, "%02d%02d%02d%02d%02d%02dZ",
- ts->tm_year % 100, ts->tm_mon + 1,
- ts->tm_mday, ts->tm_hour, ts->tm_min,
- ts->tm_sec);
+ ts->tm_year % 100, ts->tm_mon + 1,
+ ts->tm_mday, ts->tm_hour, ts->tm_min,
+ ts->tm_sec);
}
#ifdef CHARSET_EBCDIC
ebcdic2ascii(tmps->data, tmps->data, tmps->length);
#endif
return tmps;
- err:
+err:
if (tmps != s)
ASN1_STRING_free(tmps);
return NULL;
@@ -326,7 +326,7 @@ ASN1_TIME *ASN1_TIME_set(ASN1_TIME *s, time_t t)
}
ASN1_TIME *ASN1_TIME_adj(ASN1_TIME *s, time_t t,
- int offset_day, long offset_sec)
+ int offset_day, long offset_sec)
{
struct tm *ts;
struct tm data;
@@ -354,7 +354,7 @@ int ASN1_TIME_check(const ASN1_TIME *t)
/* Convert an ASN1_TIME structure to GeneralizedTime */
ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(const ASN1_TIME *t,
- ASN1_GENERALIZEDTIME **out)
+ ASN1_GENERALIZEDTIME **out)
{
ASN1_GENERALIZEDTIME *ret = NULL;
struct tm tm;
@@ -459,7 +459,7 @@ int ASN1_TIME_to_tm(const ASN1_TIME *s, struct tm *tm)
}
int ASN1_TIME_diff(int *pday, int *psec,
- const ASN1_TIME *from, const ASN1_TIME *to)
+ const ASN1_TIME *from, const ASN1_TIME *to)
{
struct tm tm_from, tm_to;
@@ -487,7 +487,6 @@ int ASN1_TIME_print_ex(BIO *bp, const ASN1_TIME *tm, unsigned long flags)
return ossl_asn1_time_print_ex(bp, tm, flags) > 0;
}
-
/* prints the time with the date format of ISO 8601 */
/* returns 0 on BIO write error, else -1 in case of parse failure, else 1 */
int ossl_asn1_time_print_ex(BIO *bp, const ASN1_TIME *tm, unsigned long flags)
@@ -523,26 +522,30 @@ int ossl_asn1_time_print_ex(BIO *bp, const ASN1_TIME *tm, unsigned long flags)
if (f_len > 0) {
if ((flags & ASN1_DTFLGS_TYPE_MASK) == ASN1_DTFLGS_ISO8601) {
return BIO_printf(bp, "%4d-%02d-%02d %02d:%02d:%02d.%.*sZ",
- stm.tm_year + 1900, stm.tm_mon + 1,
- stm.tm_mday, stm.tm_hour,
- stm.tm_min, stm.tm_sec, f_len, f) > 0;
+ stm.tm_year + 1900, stm.tm_mon + 1,
+ stm.tm_mday, stm.tm_hour,
+ stm.tm_min, stm.tm_sec, f_len, f)
+ > 0;
} else {
return BIO_printf(bp, "%s %2d %02d:%02d:%02d.%.*s %d GMT",
- _asn1_mon[stm.tm_mon], stm.tm_mday, stm.tm_hour,
- stm.tm_min, stm.tm_sec, f_len, f,
- stm.tm_year + 1900) > 0;
+ _asn1_mon[stm.tm_mon], stm.tm_mday, stm.tm_hour,
+ stm.tm_min, stm.tm_sec, f_len, f,
+ stm.tm_year + 1900)
+ > 0;
}
}
}
if ((flags & ASN1_DTFLGS_TYPE_MASK) == ASN1_DTFLGS_ISO8601) {
return BIO_printf(bp, "%4d-%02d-%02d %02d:%02d:%02dZ",
- stm.tm_year + 1900, stm.tm_mon + 1,
- stm.tm_mday, stm.tm_hour,
- stm.tm_min, stm.tm_sec) > 0;
+ stm.tm_year + 1900, stm.tm_mon + 1,
+ stm.tm_mday, stm.tm_hour,
+ stm.tm_min, stm.tm_sec)
+ > 0;
} else {
return BIO_printf(bp, "%s %2d %02d:%02d:%02d %d GMT",
- _asn1_mon[stm.tm_mon], stm.tm_mday, stm.tm_hour,
- stm.tm_min, stm.tm_sec, stm.tm_year + 1900) > 0;
+ _asn1_mon[stm.tm_mon], stm.tm_mday, stm.tm_hour,
+ stm.tm_min, stm.tm_sec, stm.tm_year + 1900)
+ > 0;
}
}
diff --git a/crypto/asn1/a_time_posix.c b/crypto/asn1/a_time_posix.c
index 29a4d00226..d65ef1cf8b 100644
--- a/crypto/asn1/a_time_posix.c
+++ b/crypto/asn1/a_time_posix.c
@@ -71,8 +71,7 @@ static int is_valid_date(int64_t year, int64_t month, int64_t day)
*/
static int is_valid_time(int64_t hours, int64_t minutes, int64_t seconds)
{
- return hours >= 0 && minutes >= 0 && seconds >= 0 && hours <= 23 &&
- minutes <= 59 && seconds <= 59;
+ return hours >= 0 && minutes >= 0 && seconds >= 0 && hours <= 23 && minutes <= 59 && seconds <= 59;
}
/* 0000-01-01 00:00:00 UTC */
@@ -92,27 +91,23 @@ static int is_valid_posix_time(int64_t time)
* (Public Domain)
*/
static int posix_time_from_utc(int64_t year, int64_t month, int64_t day,
- int64_t hours, int64_t minutes, int64_t seconds,
- int64_t *out_time)
+ int64_t hours, int64_t minutes, int64_t seconds,
+ int64_t *out_time)
{
int64_t era, year_of_era, day_of_year, day_of_era, posix_days;
- if (!is_valid_date(year, month, day) ||
- !is_valid_time(hours, minutes, seconds))
+ if (!is_valid_date(year, month, day) || !is_valid_time(hours, minutes, seconds))
return 0;
if (month <= 2)
- year--; /* Start years on Mar 1, so leap days end a year. */
+ year--; /* Start years on Mar 1, so leap days end a year. */
/* At this point year will be in the range -1 and 9999. */
era = (year >= 0 ? year : year - 399) / 400;
year_of_era = year - era * 400;
- day_of_year = (153 * (month > 2 ? month - 3 : month + 9) + 2) /
- 5 + day - 1;
- day_of_era = year_of_era * 365 + year_of_era / 4 - year_of_era /
- 100 + day_of_year;
+ day_of_year = (153 * (month > 2 ? month - 3 : month + 9) + 2) / 5 + day - 1;
+ day_of_era = year_of_era * 365 + year_of_era / 4 - year_of_era / 100 + day_of_year;
posix_days = era * 146097 + day_of_era - 719468;
- *out_time = posix_days * SECS_PER_DAY + hours * SECS_PER_HOUR +
- minutes * 60 + seconds;
+ *out_time = posix_days * SECS_PER_DAY + hours * SECS_PER_HOUR + minutes * 60 + seconds;
return 1;
}
@@ -123,8 +118,8 @@ static int posix_time_from_utc(int64_t year, int64_t month, int64_t day,
* (Public Domain)
*/
static int utc_from_posix_time(int64_t time, int *out_year, int *out_month,
- int *out_day, int *out_hours, int *out_minutes,
- int *out_seconds)
+ int *out_day, int *out_hours, int *out_minutes,
+ int *out_seconds)
{
int64_t days, leftover_seconds, era, day_of_era, year_of_era, day_of_year;
int64_t month_of_year;
@@ -138,27 +133,24 @@ static int utc_from_posix_time(int64_t time, int *out_year, int *out_month,
days--;
leftover_seconds += SECS_PER_DAY;
}
- days += 719468; /* Shift to starting epoch of Mar 1 0000. */
+ days += 719468; /* Shift to starting epoch of Mar 1 0000. */
/* At this point, days will be in the range -61 and 3652364. */
era = (days > 0 ? days : days - 146096) / 146097;
day_of_era = days - era * 146097;
- year_of_era = (day_of_era - day_of_era / 1460 + day_of_era / 36524 -
- day_of_era / 146096) / 365;
- *out_year = (int) (year_of_era + era * 400); /* Year starts on Mar 1 */
- day_of_year = day_of_era - (365 * year_of_era + year_of_era / 4 -
- year_of_era / 100);
+ year_of_era = (day_of_era - day_of_era / 1460 + day_of_era / 36524 - day_of_era / 146096) / 365;
+ *out_year = (int)(year_of_era + era * 400); /* Year starts on Mar 1 */
+ day_of_year = day_of_era - (365 * year_of_era + year_of_era / 4 - year_of_era / 100);
month_of_year = (5 * day_of_year + 2) / 153;
- *out_month = (int) (month_of_year < 10 ? month_of_year + 3 :
- month_of_year - 9);
+ *out_month = (int)(month_of_year < 10 ? month_of_year + 3 : month_of_year - 9);
if (*out_month <= 2)
- (*out_year)++; /* Adjust year back to Jan 1 start of year. */
+ (*out_year)++; /* Adjust year back to Jan 1 start of year. */
- *out_day = (int) (day_of_year - (153 * month_of_year + 2) / 5 + 1);
- *out_hours = (int) leftover_seconds / SECS_PER_HOUR;
+ *out_day = (int)(day_of_year - (153 * month_of_year + 2) / 5 + 1);
+ *out_hours = (int)leftover_seconds / SECS_PER_HOUR;
leftover_seconds %= SECS_PER_HOUR;
- *out_minutes = (int) leftover_seconds / 60;
- *out_seconds = (int) leftover_seconds % 60;
+ *out_minutes = (int)leftover_seconds / 60;
+ *out_seconds = (int)leftover_seconds % 60;
return 1;
}
@@ -166,19 +158,19 @@ static int utc_from_posix_time(int64_t time, int *out_year, int *out_month,
int OPENSSL_tm_to_posix(const struct tm *tm, int64_t *out)
{
return posix_time_from_utc(tm->tm_year + (int64_t)1900,
- tm->tm_mon + (int64_t)1, tm->tm_mday,
- tm->tm_hour, tm->tm_min, tm->tm_sec, out);
+ tm->tm_mon + (int64_t)1, tm->tm_mday,
+ tm->tm_hour, tm->tm_min, tm->tm_sec, out);
}
int OPENSSL_posix_to_tm(int64_t time, struct tm *out_tm)
{
- struct tm tmp_tm = {0};
+ struct tm tmp_tm = { 0 };
memset(out_tm, 0, sizeof(*out_tm));
if (!utc_from_posix_time(time, &tmp_tm.tm_year, &tmp_tm.tm_mon,
- &tmp_tm.tm_mday, &tmp_tm.tm_hour,
- &tmp_tm.tm_min, &tmp_tm.tm_sec))
+ &tmp_tm.tm_mday, &tmp_tm.tm_hour,
+ &tmp_tm.tm_min, &tmp_tm.tm_sec))
return 0;
tmp_tm.tm_year -= 1900;
@@ -199,10 +191,8 @@ int ossl_asn1_time_tm_to_time_t(const struct tm *tm, time_t *out)
return 0;
if (sizeof(time_t) == sizeof(int32_t)
- && ((!bad_idea_bears && (posix_time > INT32_MAX
- || posix_time < INT32_MIN))
- || (bad_idea_bears && (posix_time > UINT32_MAX
- || posix_time < 0))))
+ && ((!bad_idea_bears && (posix_time > INT32_MAX || posix_time < INT32_MIN))
+ || (bad_idea_bears && (posix_time > UINT32_MAX || posix_time < 0))))
return 0;
*out = posix_time;
@@ -221,7 +211,7 @@ int OPENSSL_timegm(const struct tm *tm, time_t *out)
return ossl_asn1_time_tm_to_time_t(tm, out);
}
-struct tm * OPENSSL_gmtime(const time_t *time, struct tm *out_tm)
+struct tm *OPENSSL_gmtime(const time_t *time, struct tm *out_tm)
{
if (!ossl_asn1_time_time_t_to_tm(time, out_tm))
return NULL;
@@ -255,12 +245,11 @@ int OPENSSL_gmtime_adj(struct tm *tm, int offset_day, long offset_sec)
}
int OPENSSL_gmtime_diff(int *out_days, int *out_secs, const struct tm *from,
- const struct tm *to)
+ const struct tm *to)
{
int64_t time_to, time_from, timediff, daydiff;
- if (!OPENSSL_tm_to_posix(to, &time_to) ||
- !OPENSSL_tm_to_posix(from, &time_from))
+ if (!OPENSSL_tm_to_posix(to, &time_to) || !OPENSSL_tm_to_posix(from, &time_from))
return 0;
/* Times are in range, so these calculations cannot overflow. */
@@ -271,8 +260,8 @@ int OPENSSL_gmtime_diff(int *out_days, int *out_secs, const struct tm *from,
daydiff = timediff / SECS_PER_DAY;
timediff %= SECS_PER_DAY;
- *out_secs = (int) timediff;
- *out_days = (int) daydiff;
+ *out_secs = (int)timediff;
+ *out_days = (int)daydiff;
return 1;
}
diff --git a/crypto/asn1/a_type.c b/crypto/asn1/a_type.c
index 6b638bd80c..facd1b6afc 100644
--- a/crypto/asn1/a_type.c
+++ b/crypto/asn1/a_type.c
@@ -16,8 +16,8 @@
int ASN1_TYPE_get(const ASN1_TYPE *a)
{
if (a->type == V_ASN1_BOOLEAN
- || a->type == V_ASN1_NULL
- || a->value.ptr != NULL)
+ || a->type == V_ASN1_NULL
+ || a->value.ptr != NULL)
return a->type;
else
return 0;
@@ -26,8 +26,8 @@ int ASN1_TYPE_get(const ASN1_TYPE *a)
void ASN1_TYPE_set(ASN1_TYPE *a, int type, void *value)
{
if (a->type != V_ASN1_BOOLEAN
- && a->type != V_ASN1_NULL
- && a->value.ptr != NULL) {
+ && a->type != V_ASN1_NULL
+ && a->value.ptr != NULL) {
ASN1_TYPE **tmp_a = &a;
ossl_asn1_primitive_free((ASN1_VALUE **)tmp_a, NULL, 0);
}
@@ -75,7 +75,7 @@ int ASN1_TYPE_cmp(const ASN1_TYPE *a, const ASN1_TYPE *b)
result = a->value.boolean - b->value.boolean;
break;
case V_ASN1_NULL:
- result = 0; /* They do not have content. */
+ result = 0; /* They do not have content. */
break;
case V_ASN1_INTEGER:
case V_ASN1_ENUMERATED:
@@ -99,7 +99,7 @@ int ASN1_TYPE_cmp(const ASN1_TYPE *a, const ASN1_TYPE *b)
case V_ASN1_OTHER:
default:
result = ASN1_STRING_cmp((ASN1_STRING *)a->value.ptr,
- (ASN1_STRING *)b->value.ptr);
+ (ASN1_STRING *)b->value.ptr);
break;
}
diff --git a/crypto/asn1/a_utctm.c b/crypto/asn1/a_utctm.c
index eb023f0863..e5b801cc43 100644
--- a/crypto/asn1/a_utctm.c
+++ b/crypto/asn1/a_utctm.c
@@ -58,7 +58,7 @@ ASN1_UTCTIME *ASN1_UTCTIME_set(ASN1_UTCTIME *s, time_t t)
}
ASN1_UTCTIME *ASN1_UTCTIME_adj(ASN1_UTCTIME *s, time_t t,
- int offset_day, long offset_sec)
+ int offset_day, long offset_sec)
{
struct tm *ts;
struct tm data;
diff --git a/crypto/asn1/a_utf8.c b/crypto/asn1/a_utf8.c
index 0a6024ffa4..fb5999fa7f 100644
--- a/crypto/asn1/a_utf8.c
+++ b/crypto/asn1/a_utf8.c
@@ -93,7 +93,7 @@ int UTF8_getc(const unsigned char *str, int len, unsigned long *val)
int UTF8_putc(unsigned char *str, int len, unsigned long value)
{
if (!str)
- len = 4; /* Maximum we will need */
+ len = 4; /* Maximum we will need */
else if (len <= 0)
return -1;
if (value < 0x80) {
diff --git a/crypto/asn1/a_verify.c b/crypto/asn1/a_verify.c
index f6cac80962..55f86ee83f 100644
--- a/crypto/asn1/a_verify.c
+++ b/crypto/asn1/a_verify.c
@@ -25,7 +25,7 @@
#ifndef OPENSSL_NO_DEPRECATED_3_0
int ASN1_verify(i2d_of_void *i2d, X509_ALGOR *a, ASN1_BIT_STRING *signature,
- char *data, EVP_PKEY *pkey)
+ char *data, EVP_PKEY *pkey)
{
EVP_MD_CTX *ctx = EVP_MD_CTX_new();
const EVP_MD *type;
@@ -71,13 +71,14 @@ int ASN1_verify(i2d_of_void *i2d, X509_ALGOR *a, ASN1_BIT_STRING *signature,
ret = -1;
if (EVP_VerifyFinal(ctx, (unsigned char *)signature->data,
- (unsigned int)signature->length, pkey) <= 0) {
+ (unsigned int)signature->length, pkey)
+ <= 0) {
ERR_raise(ERR_LIB_ASN1, ERR_R_EVP_LIB);
ret = 0;
goto err;
}
ret = 1;
- err:
+err:
EVP_MD_CTX_free(ctx);
return ret;
}
@@ -85,16 +86,16 @@ int ASN1_verify(i2d_of_void *i2d, X509_ALGOR *a, ASN1_BIT_STRING *signature,
#endif
int ASN1_item_verify(const ASN1_ITEM *it, const X509_ALGOR *alg,
- const ASN1_BIT_STRING *signature, const void *data,
- EVP_PKEY *pkey)
+ const ASN1_BIT_STRING *signature, const void *data,
+ EVP_PKEY *pkey)
{
return ASN1_item_verify_ex(it, alg, signature, data, NULL, pkey, NULL, NULL);
}
int ASN1_item_verify_ex(const ASN1_ITEM *it, const X509_ALGOR *alg,
- const ASN1_BIT_STRING *signature, const void *data,
- const ASN1_OCTET_STRING *id, EVP_PKEY *pkey,
- OSSL_LIB_CTX *libctx, const char *propq)
+ const ASN1_BIT_STRING *signature, const void *data,
+ const ASN1_OCTET_STRING *id, EVP_PKEY *pkey,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
EVP_MD_CTX *ctx;
int rv = -1;
@@ -108,8 +109,8 @@ int ASN1_item_verify_ex(const ASN1_ITEM *it, const X509_ALGOR *alg,
}
int ASN1_item_verify_ctx(const ASN1_ITEM *it, const X509_ALGOR *alg,
- const ASN1_BIT_STRING *signature, const void *data,
- EVP_MD_CTX *ctx)
+ const ASN1_BIT_STRING *signature, const void *data,
+ EVP_MD_CTX *ctx)
{
EVP_PKEY *pkey;
unsigned char *buf_in = NULL;
@@ -181,8 +182,8 @@ int ASN1_item_verify_ctx(const ASN1_ITEM *it, const X509_ALGOR *alg,
type = EVP_get_digestbynid(mdnid);
if (type == NULL) {
ERR_raise_data(ERR_LIB_ASN1,
- ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM,
- "nid=0x%x", mdnid);
+ ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM,
+ "nid=0x%x", mdnid);
goto err;
}
}
@@ -213,13 +214,13 @@ int ASN1_item_verify_ctx(const ASN1_ITEM *it, const X509_ALGOR *alg,
inll = inl;
ret = EVP_DigestVerify(ctx, signature->data, (size_t)signature->length,
- buf_in, inl);
+ buf_in, inl);
if (ret <= 0) {
ERR_raise(ERR_LIB_ASN1, ERR_R_EVP_LIB);
goto err;
}
ret = 1;
- err:
+err:
OPENSSL_clear_free(buf_in, inll);
return ret;
}
diff --git a/crypto/asn1/ameth_lib.c b/crypto/asn1/ameth_lib.c
index f56d05e1ae..de63ea96bd 100644
--- a/crypto/asn1/ameth_lib.c
+++ b/crypto/asn1/ameth_lib.c
@@ -25,16 +25,16 @@ typedef int sk_cmp_fn_type(const char *const *a, const char *const *b);
static STACK_OF(EVP_PKEY_ASN1_METHOD) *app_methods = NULL;
DECLARE_OBJ_BSEARCH_CMP_FN(const EVP_PKEY_ASN1_METHOD *,
- const EVP_PKEY_ASN1_METHOD *, ameth);
+ const EVP_PKEY_ASN1_METHOD *, ameth);
static int ameth_cmp(const EVP_PKEY_ASN1_METHOD *const *a,
- const EVP_PKEY_ASN1_METHOD *const *b)
+ const EVP_PKEY_ASN1_METHOD *const *b)
{
return ((*a)->pkey_id - (*b)->pkey_id);
}
IMPLEMENT_OBJ_BSEARCH_CMP_FN(const EVP_PKEY_ASN1_METHOD *,
- const EVP_PKEY_ASN1_METHOD *, ameth);
+ const EVP_PKEY_ASN1_METHOD *, ameth);
int EVP_PKEY_asn1_get_count(void)
{
@@ -95,7 +95,7 @@ const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_find(ENGINE **pe, int type)
}
const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_find_str(ENGINE **pe,
- const char *str, int len)
+ const char *str, int len)
{
int i;
const EVP_PKEY_ASN1_METHOD *ameth = NULL;
@@ -105,7 +105,7 @@ const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_find_str(ENGINE **pe,
if (pe) {
*pe = NULL;
}
- for (i = EVP_PKEY_asn1_get_count(); i-- > 0; ) {
+ for (i = EVP_PKEY_asn1_get_count(); i-- > 0;) {
ameth = EVP_PKEY_asn1_get0(i);
if (ameth->pkey_flags & ASN1_PKEY_ALIAS)
continue;
@@ -118,7 +118,9 @@ const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_find_str(ENGINE **pe,
int EVP_PKEY_asn1_add0(const EVP_PKEY_ASN1_METHOD *ameth)
{
- EVP_PKEY_ASN1_METHOD tmp = { 0, };
+ EVP_PKEY_ASN1_METHOD tmp = {
+ 0,
+ };
/*
* One of the following must be true:
@@ -129,9 +131,9 @@ int EVP_PKEY_asn1_add0(const EVP_PKEY_ASN1_METHOD *ameth)
* Anything else is an error and may lead to a corrupt ASN1 method table
*/
if (!((ameth->pem_str == NULL
- && (ameth->pkey_flags & ASN1_PKEY_ALIAS) != 0)
- || (ameth->pem_str != NULL
- && (ameth->pkey_flags & ASN1_PKEY_ALIAS) == 0))) {
+ && (ameth->pkey_flags & ASN1_PKEY_ALIAS) != 0)
+ || (ameth->pem_str != NULL
+ && (ameth->pkey_flags & ASN1_PKEY_ALIAS) == 0))) {
ERR_raise(ERR_LIB_EVP, ERR_R_PASSED_INVALID_ARGUMENT);
return 0;
}
@@ -145,7 +147,7 @@ int EVP_PKEY_asn1_add0(const EVP_PKEY_ASN1_METHOD *ameth)
tmp.pkey_id = ameth->pkey_id;
if (sk_EVP_PKEY_ASN1_METHOD_find(app_methods, &tmp) >= 0) {
ERR_raise(ERR_LIB_EVP,
- EVP_R_PKEY_APPLICATION_ASN1_METHOD_ALREADY_REGISTERED);
+ EVP_R_PKEY_APPLICATION_ASN1_METHOD_ALREADY_REGISTERED);
return 0;
}
@@ -170,9 +172,9 @@ int EVP_PKEY_asn1_add_alias(int to, int from)
}
int EVP_PKEY_asn1_get0_info(int *ppkey_id, int *ppkey_base_id,
- int *ppkey_flags, const char **pinfo,
- const char **ppem_str,
- const EVP_PKEY_ASN1_METHOD *ameth)
+ int *ppkey_flags, const char **pinfo,
+ const char **ppem_str,
+ const EVP_PKEY_ASN1_METHOD *ameth)
{
if (!ameth)
return 0;
@@ -195,7 +197,7 @@ const EVP_PKEY_ASN1_METHOD *EVP_PKEY_get0_asn1(const EVP_PKEY *pkey)
}
EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_new(int id, int flags,
- const char *pem_str, const char *info)
+ const char *pem_str, const char *info)
{
EVP_PKEY_ASN1_METHOD *ameth = OPENSSL_zalloc(sizeof(*ameth));
@@ -220,13 +222,13 @@ EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_new(int id, int flags,
return ameth;
- err:
+err:
EVP_PKEY_asn1_free(ameth);
return NULL;
}
void EVP_PKEY_asn1_copy(EVP_PKEY_ASN1_METHOD *dst,
- const EVP_PKEY_ASN1_METHOD *src)
+ const EVP_PKEY_ASN1_METHOD *src)
{
int pkey_id = dst->pkey_id;
int pkey_base_id = dst->pkey_base_id;
@@ -254,17 +256,17 @@ void EVP_PKEY_asn1_free(EVP_PKEY_ASN1_METHOD *ameth)
}
void EVP_PKEY_asn1_set_public(EVP_PKEY_ASN1_METHOD *ameth,
- int (*pub_decode) (EVP_PKEY *pk,
- const X509_PUBKEY *pub),
- int (*pub_encode) (X509_PUBKEY *pub,
- const EVP_PKEY *pk),
- int (*pub_cmp) (const EVP_PKEY *a,
- const EVP_PKEY *b),
- int (*pub_print) (BIO *out,
- const EVP_PKEY *pkey,
- int indent, ASN1_PCTX *pctx),
- int (*pkey_size) (const EVP_PKEY *pk),
- int (*pkey_bits) (const EVP_PKEY *pk))
+ int (*pub_decode)(EVP_PKEY *pk,
+ const X509_PUBKEY *pub),
+ int (*pub_encode)(X509_PUBKEY *pub,
+ const EVP_PKEY *pk),
+ int (*pub_cmp)(const EVP_PKEY *a,
+ const EVP_PKEY *b),
+ int (*pub_print)(BIO *out,
+ const EVP_PKEY *pkey,
+ int indent, ASN1_PCTX *pctx),
+ int (*pkey_size)(const EVP_PKEY *pk),
+ int (*pkey_bits)(const EVP_PKEY *pk))
{
ameth->pub_decode = pub_decode;
ameth->pub_encode = pub_encode;
@@ -275,15 +277,15 @@ void EVP_PKEY_asn1_set_public(EVP_PKEY_ASN1_METHOD *ameth,
}
void EVP_PKEY_asn1_set_private(EVP_PKEY_ASN1_METHOD *ameth,
- int (*priv_decode) (EVP_PKEY *pk,
- const PKCS8_PRIV_KEY_INFO
- *p8inf),
- int (*priv_encode) (PKCS8_PRIV_KEY_INFO *p8,
- const EVP_PKEY *pk),
- int (*priv_print) (BIO *out,
- const EVP_PKEY *pkey,
- int indent,
- ASN1_PCTX *pctx))
+ int (*priv_decode)(EVP_PKEY *pk,
+ const PKCS8_PRIV_KEY_INFO
+ *p8inf),
+ int (*priv_encode)(PKCS8_PRIV_KEY_INFO *p8,
+ const EVP_PKEY *pk),
+ int (*priv_print)(BIO *out,
+ const EVP_PKEY *pkey,
+ int indent,
+ ASN1_PCTX *pctx))
{
ameth->priv_decode = priv_decode;
ameth->priv_encode = priv_encode;
@@ -291,19 +293,19 @@ void EVP_PKEY_asn1_set_private(EVP_PKEY_ASN1_METHOD *ameth,
}
void EVP_PKEY_asn1_set_param(EVP_PKEY_ASN1_METHOD *ameth,
- int (*param_decode) (EVP_PKEY *pkey,
- const unsigned char **pder,
- int derlen),
- int (*param_encode) (const EVP_PKEY *pkey,
- unsigned char **pder),
- int (*param_missing) (const EVP_PKEY *pk),
- int (*param_copy) (EVP_PKEY *to,
- const EVP_PKEY *from),
- int (*param_cmp) (const EVP_PKEY *a,
- const EVP_PKEY *b),
- int (*param_print) (BIO *out,
- const EVP_PKEY *pkey,
- int indent, ASN1_PCTX *pctx))
+ int (*param_decode)(EVP_PKEY *pkey,
+ const unsigned char **pder,
+ int derlen),
+ int (*param_encode)(const EVP_PKEY *pkey,
+ unsigned char **pder),
+ int (*param_missing)(const EVP_PKEY *pk),
+ int (*param_copy)(EVP_PKEY *to,
+ const EVP_PKEY *from),
+ int (*param_cmp)(const EVP_PKEY *a,
+ const EVP_PKEY *b),
+ int (*param_print)(BIO *out,
+ const EVP_PKEY *pkey,
+ int indent, ASN1_PCTX *pctx))
{
ameth->param_decode = param_decode;
ameth->param_encode = param_encode;
@@ -314,98 +316,98 @@ void EVP_PKEY_asn1_set_param(EVP_PKEY_ASN1_METHOD *ameth,
}
void EVP_PKEY_asn1_set_free(EVP_PKEY_ASN1_METHOD *ameth,
- void (*pkey_free) (EVP_PKEY *pkey))
+ void (*pkey_free)(EVP_PKEY *pkey))
{
ameth->pkey_free = pkey_free;
}
void EVP_PKEY_asn1_set_ctrl(EVP_PKEY_ASN1_METHOD *ameth,
- int (*pkey_ctrl) (EVP_PKEY *pkey, int op,
- long arg1, void *arg2))
+ int (*pkey_ctrl)(EVP_PKEY *pkey, int op,
+ long arg1, void *arg2))
{
ameth->pkey_ctrl = pkey_ctrl;
}
void EVP_PKEY_asn1_set_security_bits(EVP_PKEY_ASN1_METHOD *ameth,
- int (*pkey_security_bits) (const EVP_PKEY
- *pk))
+ int (*pkey_security_bits)(const EVP_PKEY
+ *pk))
{
ameth->pkey_security_bits = pkey_security_bits;
}
void EVP_PKEY_asn1_set_item(EVP_PKEY_ASN1_METHOD *ameth,
- int (*item_verify) (EVP_MD_CTX *ctx,
- const ASN1_ITEM *it,
- const void *data,
- const X509_ALGOR *a,
- const ASN1_BIT_STRING *sig,
- EVP_PKEY *pkey),
- int (*item_sign) (EVP_MD_CTX *ctx,
- const ASN1_ITEM *it,
- const void *data,
- X509_ALGOR *alg1,
- X509_ALGOR *alg2,
- ASN1_BIT_STRING *sig))
+ int (*item_verify)(EVP_MD_CTX *ctx,
+ const ASN1_ITEM *it,
+ const void *data,
+ const X509_ALGOR *a,
+ const ASN1_BIT_STRING *sig,
+ EVP_PKEY *pkey),
+ int (*item_sign)(EVP_MD_CTX *ctx,
+ const ASN1_ITEM *it,
+ const void *data,
+ X509_ALGOR *alg1,
+ X509_ALGOR *alg2,
+ ASN1_BIT_STRING *sig))
{
ameth->item_sign = item_sign;
ameth->item_verify = item_verify;
}
void EVP_PKEY_asn1_set_siginf(EVP_PKEY_ASN1_METHOD *ameth,
- int (*siginf_set) (X509_SIG_INFO *siginf,
- const X509_ALGOR *alg,
- const ASN1_STRING *sig))
+ int (*siginf_set)(X509_SIG_INFO *siginf,
+ const X509_ALGOR *alg,
+ const ASN1_STRING *sig))
{
ameth->siginf_set = siginf_set;
}
void EVP_PKEY_asn1_set_check(EVP_PKEY_ASN1_METHOD *ameth,
- int (*pkey_check) (const EVP_PKEY *pk))
+ int (*pkey_check)(const EVP_PKEY *pk))
{
ameth->pkey_check = pkey_check;
}
void EVP_PKEY_asn1_set_public_check(EVP_PKEY_ASN1_METHOD *ameth,
- int (*pkey_pub_check) (const EVP_PKEY *pk))
+ int (*pkey_pub_check)(const EVP_PKEY *pk))
{
ameth->pkey_public_check = pkey_pub_check;
}
void EVP_PKEY_asn1_set_param_check(EVP_PKEY_ASN1_METHOD *ameth,
- int (*pkey_param_check) (const EVP_PKEY *pk))
+ int (*pkey_param_check)(const EVP_PKEY *pk))
{
ameth->pkey_param_check = pkey_param_check;
}
void EVP_PKEY_asn1_set_set_priv_key(EVP_PKEY_ASN1_METHOD *ameth,
- int (*set_priv_key) (EVP_PKEY *pk,
- const unsigned char
- *priv,
- size_t len))
+ int (*set_priv_key)(EVP_PKEY *pk,
+ const unsigned char
+ *priv,
+ size_t len))
{
ameth->set_priv_key = set_priv_key;
}
void EVP_PKEY_asn1_set_set_pub_key(EVP_PKEY_ASN1_METHOD *ameth,
- int (*set_pub_key) (EVP_PKEY *pk,
- const unsigned char *pub,
- size_t len))
+ int (*set_pub_key)(EVP_PKEY *pk,
+ const unsigned char *pub,
+ size_t len))
{
ameth->set_pub_key = set_pub_key;
}
void EVP_PKEY_asn1_set_get_priv_key(EVP_PKEY_ASN1_METHOD *ameth,
- int (*get_priv_key) (const EVP_PKEY *pk,
- unsigned char *priv,
- size_t *len))
+ int (*get_priv_key)(const EVP_PKEY *pk,
+ unsigned char *priv,
+ size_t *len))
{
ameth->get_priv_key = get_priv_key;
}
void EVP_PKEY_asn1_set_get_pub_key(EVP_PKEY_ASN1_METHOD *ameth,
- int (*get_pub_key) (const EVP_PKEY *pk,
- unsigned char *pub,
- size_t *len))
+ int (*get_pub_key)(const EVP_PKEY *pk,
+ unsigned char *pub,
+ size_t *len))
{
ameth->get_pub_key = get_pub_key;
}
diff --git a/crypto/asn1/asn1_err.c b/crypto/asn1/asn1_err.c
index f525842449..81ac09bba3 100644
--- a/crypto/asn1/asn1_err.c
+++ b/crypto/asn1/asn1_err.c
@@ -15,193 +15,193 @@
#ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA ASN1_str_reasons[] = {
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ADDING_OBJECT), "adding object"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ASN1_PARSE_ERROR), "asn1 parse error"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ASN1_SIG_PARSE_ERROR),
- "asn1 sig parse error"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_AUX_ERROR), "aux error"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_BAD_OBJECT_HEADER), "bad object header"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_BAD_TEMPLATE), "bad template"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_BMPSTRING_IS_WRONG_LENGTH),
- "bmpstring is wrong length"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_BN_LIB), "bn lib"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_BOOLEAN_IS_WRONG_LENGTH),
- "boolean is wrong length"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_BUFFER_TOO_SMALL), "buffer too small"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER),
- "cipher has no object identifier"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_CONTEXT_NOT_INITIALISED),
- "context not initialised"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_DATA_IS_WRONG), "data is wrong"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_DECODE_ERROR), "decode error"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_DEPTH_EXCEEDED), "depth exceeded"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_DIGEST_AND_KEY_TYPE_NOT_SUPPORTED),
- "digest and key type not supported"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ENCODE_ERROR), "encode error"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ERROR_GETTING_TIME),
- "error getting time"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ERROR_LOADING_SECTION),
- "error loading section"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ERROR_SETTING_CIPHER_PARAMS),
- "error setting cipher params"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_EXPECTING_AN_INTEGER),
- "expecting an integer"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_EXPECTING_AN_OBJECT),
- "expecting an object"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_EXPLICIT_LENGTH_MISMATCH),
- "explicit length mismatch"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED),
- "explicit tag not constructed"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_FIELD_MISSING), "field missing"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_FIRST_NUM_TOO_LARGE),
- "first num too large"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_GENERALIZEDTIME_IS_TOO_SHORT),
- "generalizedtime is too short"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_HEADER_TOO_LONG), "header too long"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_BITSTRING_FORMAT),
- "illegal bitstring format"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_BOOLEAN), "illegal boolean"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_CHARACTERS),
- "illegal characters"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_FORMAT), "illegal format"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_HEX), "illegal hex"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_IMPLICIT_TAG),
- "illegal implicit tag"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_INTEGER), "illegal integer"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_NEGATIVE_VALUE),
- "illegal negative value"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_NESTED_TAGGING),
- "illegal nested tagging"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_NULL), "illegal null"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_NULL_VALUE),
- "illegal null value"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_OBJECT), "illegal object"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_OPTIONAL_ANY),
- "illegal optional any"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_OPTIONS_ON_ITEM_TEMPLATE),
- "illegal options on item template"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_PADDING), "illegal padding"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_TAGGED_ANY),
- "illegal tagged any"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_TIME_VALUE),
- "illegal time value"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_ZERO_CONTENT),
- "illegal zero content"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INTEGER_NOT_ASCII_FORMAT),
- "integer not ascii format"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INTEGER_TOO_LARGE_FOR_LONG),
- "integer too large for long"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_BIT_STRING_BITS_LEFT),
- "invalid bit string bits left"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_BMPSTRING_LENGTH),
- "invalid bmpstring length"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_DIGIT), "invalid digit"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_MIME_TYPE), "invalid mime type"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_MODIFIER), "invalid modifier"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_NUMBER), "invalid number"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_OBJECT_ENCODING),
- "invalid object encoding"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_SCRYPT_PARAMETERS),
- "invalid scrypt parameters"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_SEPARATOR), "invalid separator"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_STRING_TABLE_VALUE),
- "invalid string table value"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_UNIVERSALSTRING_LENGTH),
- "invalid universalstring length"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_UTF8STRING),
- "invalid utf8string"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_VALUE), "invalid value"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_LENGTH_TOO_LONG), "length too long"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_LIST_ERROR), "list error"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_MIME_NO_CONTENT_TYPE),
- "mime no content type"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_MIME_PARSE_ERROR), "mime parse error"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_MIME_SIG_PARSE_ERROR),
- "mime sig parse error"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_MISSING_EOC), "missing eoc"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_MISSING_SECOND_NUMBER),
- "missing second number"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_MISSING_VALUE), "missing value"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_MSTRING_NOT_UNIVERSAL),
- "mstring not universal"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_MSTRING_WRONG_TAG), "mstring wrong tag"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_NESTED_ASN1_STRING),
- "nested asn1 string"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_NESTED_TOO_DEEP), "nested too deep"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_NON_HEX_CHARACTERS),
- "non hex characters"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_NOT_ASCII_FORMAT), "not ascii format"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_NOT_ENOUGH_DATA), "not enough data"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_NO_CONTENT_TYPE), "no content type"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_NO_MATCHING_CHOICE_TYPE),
- "no matching choice type"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_NO_MULTIPART_BODY_FAILURE),
- "no multipart body failure"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_NO_MULTIPART_BOUNDARY),
- "no multipart boundary"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_NO_SIG_CONTENT_TYPE),
- "no sig content type"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_NULL_IS_WRONG_LENGTH),
- "null is wrong length"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_OBJECT_NOT_ASCII_FORMAT),
- "object not ascii format"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ODD_NUMBER_OF_CHARS),
- "odd number of chars"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_SECOND_NUMBER_TOO_LARGE),
- "second number too large"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_SEQUENCE_LENGTH_MISMATCH),
- "sequence length mismatch"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_SEQUENCE_NOT_CONSTRUCTED),
- "sequence not constructed"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_SEQUENCE_OR_SET_NEEDS_CONFIG),
- "sequence or set needs config"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_SHORT_LINE), "short line"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_SIG_INVALID_MIME_TYPE),
- "sig invalid mime type"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_STREAMING_NOT_SUPPORTED),
- "streaming not supported"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_STRING_TOO_LONG), "string too long"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_STRING_TOO_SHORT), "string too short"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD),
- "the asn1 object identifier is not known for this md"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_TIME_NOT_ASCII_FORMAT),
- "time not ascii format"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_TOO_LARGE), "too large"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_TOO_LONG), "too long"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_TOO_SMALL), "too small"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_TYPE_NOT_CONSTRUCTED),
- "type not constructed"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_TYPE_NOT_PRIMITIVE),
- "type not primitive"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNEXPECTED_EOC), "unexpected eoc"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNIVERSALSTRING_IS_WRONG_LENGTH),
- "universalstring is wrong length"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNKNOWN_DIGEST), "unknown digest"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNKNOWN_FORMAT), "unknown format"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM),
- "unknown message digest algorithm"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNKNOWN_OBJECT_TYPE),
- "unknown object type"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE),
- "unknown public key type"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNKNOWN_SIGNATURE_ALGORITHM),
- "unknown signature algorithm"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNKNOWN_TAG), "unknown tag"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNSUPPORTED_ANY_DEFINED_BY_TYPE),
- "unsupported any defined by type"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNSUPPORTED_CIPHER),
- "unsupported cipher"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE),
- "unsupported public key type"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNSUPPORTED_TYPE), "unsupported type"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UTCTIME_IS_TOO_SHORT),
- "utctime is too short"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_WRONG_INTEGER_TYPE),
- "wrong integer type"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_WRONG_PUBLIC_KEY_TYPE),
- "wrong public key type"},
- {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_WRONG_TAG), "wrong tag"},
- {0, NULL}
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ADDING_OBJECT), "adding object" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ASN1_PARSE_ERROR), "asn1 parse error" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ASN1_SIG_PARSE_ERROR),
+ "asn1 sig parse error" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_AUX_ERROR), "aux error" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_BAD_OBJECT_HEADER), "bad object header" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_BAD_TEMPLATE), "bad template" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_BMPSTRING_IS_WRONG_LENGTH),
+ "bmpstring is wrong length" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_BN_LIB), "bn lib" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_BOOLEAN_IS_WRONG_LENGTH),
+ "boolean is wrong length" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_BUFFER_TOO_SMALL), "buffer too small" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER),
+ "cipher has no object identifier" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_CONTEXT_NOT_INITIALISED),
+ "context not initialised" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_DATA_IS_WRONG), "data is wrong" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_DECODE_ERROR), "decode error" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_DEPTH_EXCEEDED), "depth exceeded" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_DIGEST_AND_KEY_TYPE_NOT_SUPPORTED),
+ "digest and key type not supported" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ENCODE_ERROR), "encode error" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ERROR_GETTING_TIME),
+ "error getting time" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ERROR_LOADING_SECTION),
+ "error loading section" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ERROR_SETTING_CIPHER_PARAMS),
+ "error setting cipher params" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_EXPECTING_AN_INTEGER),
+ "expecting an integer" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_EXPECTING_AN_OBJECT),
+ "expecting an object" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_EXPLICIT_LENGTH_MISMATCH),
+ "explicit length mismatch" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED),
+ "explicit tag not constructed" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_FIELD_MISSING), "field missing" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_FIRST_NUM_TOO_LARGE),
+ "first num too large" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_GENERALIZEDTIME_IS_TOO_SHORT),
+ "generalizedtime is too short" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_HEADER_TOO_LONG), "header too long" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_BITSTRING_FORMAT),
+ "illegal bitstring format" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_BOOLEAN), "illegal boolean" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_CHARACTERS),
+ "illegal characters" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_FORMAT), "illegal format" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_HEX), "illegal hex" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_IMPLICIT_TAG),
+ "illegal implicit tag" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_INTEGER), "illegal integer" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_NEGATIVE_VALUE),
+ "illegal negative value" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_NESTED_TAGGING),
+ "illegal nested tagging" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_NULL), "illegal null" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_NULL_VALUE),
+ "illegal null value" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_OBJECT), "illegal object" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_OPTIONAL_ANY),
+ "illegal optional any" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_OPTIONS_ON_ITEM_TEMPLATE),
+ "illegal options on item template" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_PADDING), "illegal padding" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_TAGGED_ANY),
+ "illegal tagged any" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_TIME_VALUE),
+ "illegal time value" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_ZERO_CONTENT),
+ "illegal zero content" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INTEGER_NOT_ASCII_FORMAT),
+ "integer not ascii format" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INTEGER_TOO_LARGE_FOR_LONG),
+ "integer too large for long" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_BIT_STRING_BITS_LEFT),
+ "invalid bit string bits left" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_BMPSTRING_LENGTH),
+ "invalid bmpstring length" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_DIGIT), "invalid digit" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_MIME_TYPE), "invalid mime type" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_MODIFIER), "invalid modifier" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_NUMBER), "invalid number" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_OBJECT_ENCODING),
+ "invalid object encoding" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_SCRYPT_PARAMETERS),
+ "invalid scrypt parameters" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_SEPARATOR), "invalid separator" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_STRING_TABLE_VALUE),
+ "invalid string table value" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_UNIVERSALSTRING_LENGTH),
+ "invalid universalstring length" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_UTF8STRING),
+ "invalid utf8string" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_VALUE), "invalid value" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_LENGTH_TOO_LONG), "length too long" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_LIST_ERROR), "list error" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_MIME_NO_CONTENT_TYPE),
+ "mime no content type" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_MIME_PARSE_ERROR), "mime parse error" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_MIME_SIG_PARSE_ERROR),
+ "mime sig parse error" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_MISSING_EOC), "missing eoc" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_MISSING_SECOND_NUMBER),
+ "missing second number" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_MISSING_VALUE), "missing value" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_MSTRING_NOT_UNIVERSAL),
+ "mstring not universal" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_MSTRING_WRONG_TAG), "mstring wrong tag" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_NESTED_ASN1_STRING),
+ "nested asn1 string" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_NESTED_TOO_DEEP), "nested too deep" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_NON_HEX_CHARACTERS),
+ "non hex characters" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_NOT_ASCII_FORMAT), "not ascii format" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_NOT_ENOUGH_DATA), "not enough data" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_NO_CONTENT_TYPE), "no content type" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_NO_MATCHING_CHOICE_TYPE),
+ "no matching choice type" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_NO_MULTIPART_BODY_FAILURE),
+ "no multipart body failure" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_NO_MULTIPART_BOUNDARY),
+ "no multipart boundary" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_NO_SIG_CONTENT_TYPE),
+ "no sig content type" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_NULL_IS_WRONG_LENGTH),
+ "null is wrong length" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_OBJECT_NOT_ASCII_FORMAT),
+ "object not ascii format" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ODD_NUMBER_OF_CHARS),
+ "odd number of chars" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_SECOND_NUMBER_TOO_LARGE),
+ "second number too large" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_SEQUENCE_LENGTH_MISMATCH),
+ "sequence length mismatch" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_SEQUENCE_NOT_CONSTRUCTED),
+ "sequence not constructed" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_SEQUENCE_OR_SET_NEEDS_CONFIG),
+ "sequence or set needs config" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_SHORT_LINE), "short line" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_SIG_INVALID_MIME_TYPE),
+ "sig invalid mime type" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_STREAMING_NOT_SUPPORTED),
+ "streaming not supported" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_STRING_TOO_LONG), "string too long" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_STRING_TOO_SHORT), "string too short" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD),
+ "the asn1 object identifier is not known for this md" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_TIME_NOT_ASCII_FORMAT),
+ "time not ascii format" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_TOO_LARGE), "too large" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_TOO_LONG), "too long" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_TOO_SMALL), "too small" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_TYPE_NOT_CONSTRUCTED),
+ "type not constructed" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_TYPE_NOT_PRIMITIVE),
+ "type not primitive" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNEXPECTED_EOC), "unexpected eoc" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNIVERSALSTRING_IS_WRONG_LENGTH),
+ "universalstring is wrong length" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNKNOWN_DIGEST), "unknown digest" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNKNOWN_FORMAT), "unknown format" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM),
+ "unknown message digest algorithm" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNKNOWN_OBJECT_TYPE),
+ "unknown object type" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE),
+ "unknown public key type" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNKNOWN_SIGNATURE_ALGORITHM),
+ "unknown signature algorithm" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNKNOWN_TAG), "unknown tag" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNSUPPORTED_ANY_DEFINED_BY_TYPE),
+ "unsupported any defined by type" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNSUPPORTED_CIPHER),
+ "unsupported cipher" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE),
+ "unsupported public key type" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNSUPPORTED_TYPE), "unsupported type" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UTCTIME_IS_TOO_SHORT),
+ "utctime is too short" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_WRONG_INTEGER_TYPE),
+ "wrong integer type" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_WRONG_PUBLIC_KEY_TYPE),
+ "wrong public key type" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_WRONG_TAG), "wrong tag" },
+ { 0, NULL }
};
#endif
diff --git a/crypto/asn1/asn1_gen.c b/crypto/asn1/asn1_gen.c
index dacc97d0d2..4561b227b1 100644
--- a/crypto/asn1/asn1_gen.c
+++ b/crypto/asn1/asn1_gen.c
@@ -12,30 +12,30 @@
#include "internal/cryptlib.h"
#include "crypto/asn1.h"
-#define ASN1_GEN_FLAG 0x10000
-#define ASN1_GEN_FLAG_IMP (ASN1_GEN_FLAG|1)
-#define ASN1_GEN_FLAG_EXP (ASN1_GEN_FLAG|2)
-#define ASN1_GEN_FLAG_TAG (ASN1_GEN_FLAG|3)
-#define ASN1_GEN_FLAG_BITWRAP (ASN1_GEN_FLAG|4)
-#define ASN1_GEN_FLAG_OCTWRAP (ASN1_GEN_FLAG|5)
-#define ASN1_GEN_FLAG_SEQWRAP (ASN1_GEN_FLAG|6)
-#define ASN1_GEN_FLAG_SETWRAP (ASN1_GEN_FLAG|7)
-#define ASN1_GEN_FLAG_FORMAT (ASN1_GEN_FLAG|8)
-
-#define ASN1_GEN_STR(str,val) {str, sizeof(str) - 1, val}
-
-#define ASN1_FLAG_EXP_MAX 20
+#define ASN1_GEN_FLAG 0x10000
+#define ASN1_GEN_FLAG_IMP (ASN1_GEN_FLAG | 1)
+#define ASN1_GEN_FLAG_EXP (ASN1_GEN_FLAG | 2)
+#define ASN1_GEN_FLAG_TAG (ASN1_GEN_FLAG | 3)
+#define ASN1_GEN_FLAG_BITWRAP (ASN1_GEN_FLAG | 4)
+#define ASN1_GEN_FLAG_OCTWRAP (ASN1_GEN_FLAG | 5)
+#define ASN1_GEN_FLAG_SEQWRAP (ASN1_GEN_FLAG | 6)
+#define ASN1_GEN_FLAG_SETWRAP (ASN1_GEN_FLAG | 7)
+#define ASN1_GEN_FLAG_FORMAT (ASN1_GEN_FLAG | 8)
+
+#define ASN1_GEN_STR(str, val) { str, sizeof(str) - 1, val }
+
+#define ASN1_FLAG_EXP_MAX 20
/* Maximum number of nested sequences */
-#define ASN1_GEN_SEQ_MAX_DEPTH 50
+#define ASN1_GEN_SEQ_MAX_DEPTH 50
/* Input formats */
/* ASCII: default */
-#define ASN1_GEN_FORMAT_ASCII 1
+#define ASN1_GEN_FORMAT_ASCII 1
/* UTF8 */
-#define ASN1_GEN_FORMAT_UTF8 2
+#define ASN1_GEN_FORMAT_UTF8 2
/* Hex */
-#define ASN1_GEN_FORMAT_HEX 3
+#define ASN1_GEN_FORMAT_HEX 3
/* List of bits */
#define ASN1_GEN_FORMAT_BITLIST 4
@@ -64,15 +64,15 @@ typedef struct {
} tag_exp_arg;
static ASN1_TYPE *generate_v3(const char *str, X509V3_CTX *cnf, int depth,
- int *perr);
+ int *perr);
static int bitstr_cb(const char *elem, int len, void *bitstr);
static int asn1_cb(const char *elem, int len, void *bitstr);
static int append_exp(tag_exp_arg *arg, int exp_tag, int exp_class,
- int exp_constructed, int exp_pad, int imp_ok);
+ int exp_constructed, int exp_pad, int imp_ok);
static int parse_tagging(const char *vstart, int vlen, int *ptag,
- int *pclass);
+ int *pclass);
static ASN1_TYPE *asn1_multi(int utype, const char *section, X509V3_CTX *cnf,
- int depth, int *perr);
+ int depth, int *perr);
static ASN1_TYPE *asn1_str2type(const char *str, int format, int utype);
static int asn1_str2tag(const char *tagstr, int len);
@@ -97,7 +97,7 @@ ASN1_TYPE *ASN1_generate_v3(const char *str, X509V3_CTX *cnf)
}
static ASN1_TYPE *generate_v3(const char *str, X509V3_CTX *cnf, int depth,
- int *perr)
+ int *perr)
{
ASN1_TYPE *ret;
tag_exp_arg asn1_tags;
@@ -157,7 +157,7 @@ static ASN1_TYPE *generate_v3(const char *str, X509V3_CTX *cnf, int depth,
/* If IMPLICIT we will replace the underlying tag */
/* Skip existing tag+len */
r = ASN1_get_object(&cpy_start, &hdr_len, &hdr_tag, &hdr_class,
- cpy_len);
+ cpy_len);
if (r & 0x80)
goto err;
/* Update copy length */
@@ -188,7 +188,7 @@ static ASN1_TYPE *generate_v3(const char *str, X509V3_CTX *cnf, int depth,
/* Work out length in any EXPLICIT, starting from end */
for (i = 0, etmp = asn1_tags.exp_list + asn1_tags.exp_count - 1;
- i < asn1_tags.exp_count; i++, etmp--) {
+ i < asn1_tags.exp_count; i++, etmp--) {
/* Content length: number of content octets + any padding */
len += etmp->exp_pad;
etmp->exp_len = len;
@@ -211,9 +211,9 @@ static ASN1_TYPE *generate_v3(const char *str, X509V3_CTX *cnf, int depth,
/* Output explicit tags first */
for (i = 0, etmp = asn1_tags.exp_list; i < asn1_tags.exp_count;
- i++, etmp++) {
+ i++, etmp++) {
ASN1_put_object(&p, etmp->exp_constructed, etmp->exp_len,
- etmp->exp_tag, etmp->exp_class);
+ etmp->exp_tag, etmp->exp_class);
if (etmp->exp_pad)
*p++ = 0;
}
@@ -226,7 +226,7 @@ static ASN1_TYPE *generate_v3(const char *str, X509V3_CTX *cnf, int depth,
|| asn1_tags.imp_tag == V_ASN1_SET))
hdr_constructed = V_ASN1_CONSTRUCTED;
ASN1_put_object(&p, hdr_constructed, hdr_len,
- asn1_tags.imp_tag, asn1_tags.imp_class);
+ asn1_tags.imp_tag, asn1_tags.imp_class);
}
/* Copy across original encoding */
@@ -237,12 +237,11 @@ static ASN1_TYPE *generate_v3(const char *str, X509V3_CTX *cnf, int depth,
/* Obtain new ASN1_TYPE structure */
ret = d2i_ASN1_TYPE(NULL, &cp, len);
- err:
+err:
OPENSSL_free(orig_der);
OPENSSL_free(new_der);
return ret;
-
}
static int asn1_cb(const char *elem, int len, void *bitstr)
@@ -345,11 +344,9 @@ static int asn1_cb(const char *elem, int len, void *bitstr)
return -1;
}
break;
-
}
return 1;
-
}
static int parse_tagging(const char *vstart, int vlen, int *ptag, int *pclass)
@@ -393,21 +390,19 @@ static int parse_tagging(const char *vstart, int vlen, int *ptag, int *pclass)
default:
ERR_raise_data(ERR_LIB_ASN1, ASN1_R_INVALID_MODIFIER,
- "Char=%c", *eptr);
+ "Char=%c", *eptr);
return 0;
-
}
} else
*pclass = V_ASN1_CONTEXT_SPECIFIC;
return 1;
-
}
/* Handle multiple types: SET and SEQUENCE */
static ASN1_TYPE *asn1_multi(int utype, const char *section, X509V3_CTX *cnf,
- int depth, int *perr)
+ int depth, int *perr)
{
ASN1_TYPE *ret = NULL;
STACK_OF(ASN1_TYPE) *sk = NULL;
@@ -425,9 +420,8 @@ static ASN1_TYPE *asn1_multi(int utype, const char *section, X509V3_CTX *cnf,
if (!sect)
goto bad;
for (i = 0; i < sk_CONF_VALUE_num(sect); i++) {
- ASN1_TYPE *typ =
- generate_v3(sk_CONF_VALUE_value(sect, i)->value, cnf,
- depth + 1, perr);
+ ASN1_TYPE *typ = generate_v3(sk_CONF_VALUE_value(sect, i)->value, cnf,
+ depth + 1, perr);
if (!typ)
goto bad;
if (!sk_ASN1_TYPE_push(sk, typ))
@@ -457,7 +451,7 @@ static ASN1_TYPE *asn1_multi(int utype, const char *section, X509V3_CTX *cnf,
der = NULL;
- bad:
+bad:
OPENSSL_free(der);
@@ -468,7 +462,7 @@ static ASN1_TYPE *asn1_multi(int utype, const char *section, X509V3_CTX *cnf,
}
static int append_exp(tag_exp_arg *arg, int exp_tag, int exp_class,
- int exp_constructed, int exp_pad, int imp_ok)
+ int exp_constructed, int exp_pad, int imp_ok)
{
tag_exp_type *exp_tmp;
/* Can only have IMPLICIT if permitted */
@@ -627,7 +621,8 @@ static ASN1_TYPE *asn1_str2type(const char *str, int format, int utype)
goto bad_form;
}
if ((atmp->value.integer
- = s2i_ASN1_INTEGER(NULL, str)) == NULL) {
+ = s2i_ASN1_INTEGER(NULL, str))
+ == NULL) {
ERR_raise(ERR_LIB_ASN1, ASN1_R_ILLEGAL_INTEGER);
goto bad_str;
}
@@ -685,7 +680,8 @@ static ASN1_TYPE *asn1_str2type(const char *str, int format, int utype)
}
if (ASN1_mbstring_copy(&atmp->value.asn1_string, (unsigned char *)str,
- -1, format, ASN1_tag2bit(utype)) <= 0) {
+ -1, format, ASN1_tag2bit(utype))
+ <= 0) {
ERR_raise(ERR_LIB_ASN1, ERR_R_ASN1_LIB);
goto bad_str;
}
@@ -713,9 +709,8 @@ static ASN1_TYPE *asn1_str2type(const char *str, int format, int utype)
goto bad_str;
}
} else if ((format == ASN1_GEN_FORMAT_BITLIST)
- && (utype == V_ASN1_BIT_STRING)) {
- if (!CONF_parse_list
- (str, ',', 1, bitstr_cb, atmp->value.bit_string)) {
+ && (utype == V_ASN1_BIT_STRING)) {
+ if (!CONF_parse_list(str, ',', 1, bitstr_cb, atmp->value.bit_string)) {
ERR_raise(ERR_LIB_ASN1, ASN1_R_LIST_ERROR);
goto bad_str;
}
@@ -739,13 +734,12 @@ static ASN1_TYPE *asn1_str2type(const char *str, int format, int utype)
atmp->type = utype;
return atmp;
- bad_str:
+bad_str:
ERR_add_error_data(2, "string=", str);
- bad_form:
+bad_form:
ASN1_TYPE_free(atmp);
return NULL;
-
}
static int bitstr_cb(const char *elem, int len, void *bitstr)
diff --git a/crypto/asn1/asn1_item_list.h b/crypto/asn1/asn1_item_list.h
index 3d678ae18f..f26954ecb7 100644
--- a/crypto/asn1/asn1_item_list.h
+++ b/crypto/asn1/asn1_item_list.h
@@ -64,10 +64,10 @@ static ASN1_ITEM_EXP *asn1_item_list[] = {
ASN1_ITEM_ref(DIST_POINT_NAME),
ASN1_ITEM_ref(DIST_POINT),
#ifndef OPENSSL_NO_EC
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
ASN1_ITEM_ref(ECPARAMETERS),
ASN1_ITEM_ref(ECPKPARAMETERS),
-# endif
+#endif
#endif
ASN1_ITEM_ref(EDIPARTYNAME),
ASN1_ITEM_ref(EXTENDED_KEY_USAGE),
diff --git a/crypto/asn1/asn1_lib.c b/crypto/asn1/asn1_lib.c
index cb50a35072..892b984353 100644
--- a/crypto/asn1/asn1_lib.c
+++ b/crypto/asn1/asn1_lib.c
@@ -14,7 +14,7 @@
#include "asn1_local.h"
static int asn1_get_length(const unsigned char **pp, int *inf, long *rl,
- long max);
+ long max);
static void asn1_put_length(unsigned char **pp, int length);
static int _asn1_check_infinite_end(const unsigned char **p, long len)
@@ -44,7 +44,7 @@ int ASN1_const_check_infinite_end(const unsigned char **p, long len)
}
int ASN1_get_object(const unsigned char **pp, long *plength, int *ptag,
- int *pclass, long omax)
+ int *pclass, long omax)
{
int i, ret;
long len;
@@ -101,7 +101,7 @@ int ASN1_get_object(const unsigned char **pp, long *plength, int *ptag,
}
*pp = p;
return ret | inf;
- err:
+err:
ERR_raise(ERR_LIB_ASN1, ASN1_R_HEADER_TOO_LONG);
return 0x80;
}
@@ -114,7 +114,7 @@ int ASN1_get_object(const unsigned char **pp, long *plength, int *ptag,
* are stored most significant digit first.
*/
static int asn1_get_length(const unsigned char **pp, int *inf, long *rl,
- long max)
+ long max)
{
const unsigned char *p = *pp;
unsigned long ret = 0;
@@ -158,7 +158,7 @@ static int asn1_get_length(const unsigned char **pp, int *inf, long *rl,
* constructed == 2 for indefinite length constructed
*/
void ASN1_put_object(unsigned char **pp, int constructed, int length, int tag,
- int xclass)
+ int xclass)
{
unsigned char *p = *pp;
int i, ttag;
@@ -426,7 +426,7 @@ const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *x)
/* |max_len| excludes NUL terminator and may be 0 to indicate no restriction */
char *ossl_sk_ASN1_UTF8STRING2text(STACK_OF(ASN1_UTF8STRING) *text,
- const char *sep, size_t max_len)
+ const char *sep, size_t max_len)
{
int i;
ASN1_UTF8STRING *current;
diff --git a/crypto/asn1/asn1_local.h b/crypto/asn1/asn1_local.h
index 11a54be603..7796603dd4 100644
--- a/crypto/asn1/asn1_local.h
+++ b/crypto/asn1/asn1_local.h
@@ -37,10 +37,10 @@ struct asn1_sctx_st {
/* The field value itself */
ASN1_VALUE **field;
/* Callback to pass information to */
- int (*scan_cb) (ASN1_SCTX *ctx);
+ int (*scan_cb)(ASN1_SCTX *ctx);
/* Context specific application data */
void *app_data;
-} /* ASN1_SCTX */ ;
+} /* ASN1_SCTX */;
typedef struct mime_param_st MIME_PARAM;
DEFINE_STACK_OF(MIME_PARAM)
@@ -51,46 +51,46 @@ void ossl_asn1_string_embed_free(ASN1_STRING *a, int embed);
int ossl_asn1_get_choice_selector(ASN1_VALUE **pval, const ASN1_ITEM *it);
int ossl_asn1_get_choice_selector_const(const ASN1_VALUE **pval,
- const ASN1_ITEM *it);
+ const ASN1_ITEM *it);
int ossl_asn1_set_choice_selector(ASN1_VALUE **pval, int value,
- const ASN1_ITEM *it);
+ const ASN1_ITEM *it);
ASN1_VALUE **ossl_asn1_get_field_ptr(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt);
const ASN1_VALUE **ossl_asn1_get_const_field_ptr(const ASN1_VALUE **pval,
- const ASN1_TEMPLATE *tt);
+ const ASN1_TEMPLATE *tt);
const ASN1_TEMPLATE *ossl_asn1_do_adb(const ASN1_VALUE *val,
- const ASN1_TEMPLATE *tt,
- int nullerr);
+ const ASN1_TEMPLATE *tt,
+ int nullerr);
int ossl_asn1_do_lock(ASN1_VALUE **pval, int op, const ASN1_ITEM *it);
void ossl_asn1_enc_init(ASN1_VALUE **pval, const ASN1_ITEM *it);
void ossl_asn1_enc_free(ASN1_VALUE **pval, const ASN1_ITEM *it);
int ossl_asn1_enc_restore(int *len, unsigned char **out, const ASN1_VALUE **pval,
- const ASN1_ITEM *it);
+ const ASN1_ITEM *it);
int ossl_asn1_enc_save(ASN1_VALUE **pval, const unsigned char *in, long inlen,
- const ASN1_ITEM *it);
+ const ASN1_ITEM *it);
void ossl_asn1_item_embed_free(ASN1_VALUE **pval, const ASN1_ITEM *it, int embed);
void ossl_asn1_primitive_free(ASN1_VALUE **pval, const ASN1_ITEM *it, int embed);
void ossl_asn1_template_free(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt);
ASN1_OBJECT *ossl_c2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp,
- long length);
+ long length);
int ossl_i2c_ASN1_BIT_STRING(ASN1_BIT_STRING *a, unsigned char **pp);
ASN1_BIT_STRING *ossl_c2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a,
- const unsigned char **pp, long length);
+ const unsigned char **pp, long length);
int ossl_i2c_ASN1_INTEGER(ASN1_INTEGER *a, unsigned char **pp);
ASN1_INTEGER *ossl_c2i_ASN1_INTEGER(ASN1_INTEGER **a, const unsigned char **pp,
- long length);
+ long length);
/* Internal functions used by x_int64.c */
int ossl_c2i_uint64_int(uint64_t *ret, int *neg, const unsigned char **pp,
- long len);
+ long len);
int ossl_i2c_uint64_int(unsigned char *p, uint64_t r, int neg);
int ossl_asn1_item_ex_new_intern(ASN1_VALUE **pval, const ASN1_ITEM *it,
- OSSL_LIB_CTX *libctx, const char *propq);
+ OSSL_LIB_CTX *libctx, const char *propq);
int ossl_asn1_time_time_t_to_tm(const time_t *time, struct tm *out_tm);
int ossl_asn1_time_tm_to_time_t(const struct tm *tm, time_t *out);
diff --git a/crypto/asn1/asn1_parse.c b/crypto/asn1/asn1_parse.c
index 84910a8a17..9b7e2a7939 100644
--- a/crypto/asn1/asn1_parse.c
+++ b/crypto/asn1/asn1_parse.c
@@ -18,9 +18,9 @@
#endif
static int asn1_parse2(BIO *bp, const unsigned char **pp, long length,
- int offset, int depth, int indent, int dump);
+ int offset, int depth, int indent, int dump);
static int asn1_print_info(BIO *bp, long offset, int depth, int hl, long len,
- int tag, int xclass, int constructed, int indent)
+ int tag, int xclass, int constructed, int indent)
{
char str[128];
const char *p;
@@ -35,17 +35,19 @@ static int asn1_print_info(BIO *bp, long offset, int depth, int hl, long len,
p = "prim: ";
if (constructed != (V_ASN1_CONSTRUCTED | 1)) {
if (BIO_snprintf(str, sizeof(str), "%5ld:d=%-2d hl=%ld l=%4ld %s",
- offset, depth, (long)hl, len, p) <= 0)
+ offset, depth, (long)hl, len, p)
+ <= 0)
goto err;
} else {
if (BIO_snprintf(str, sizeof(str), "%5ld:d=%-2d hl=%ld l=inf %s",
- offset, depth, (long)hl, p) <= 0)
+ offset, depth, (long)hl, p)
+ <= 0)
goto err;
}
if (bp != NULL) {
if (BIO_set_prefix(bp, str) <= 0) {
if ((bio = BIO_new(BIO_f_prefix())) == NULL
- || (bp = BIO_push(bio, bp)) == NULL)
+ || (bp = BIO_push(bio, bp)) == NULL)
goto err;
pop_f_prefix = 1;
}
@@ -71,7 +73,7 @@ static int asn1_print_info(BIO *bp, long offset, int depth, int hl, long len,
p = ASN1_tag2str(tag);
i = (BIO_printf(bp, "%-18s", p) > 0);
- err:
+err:
if (saved_indent >= 0)
BIO_set_indent(bp, saved_indent);
if (pop_f_prefix)
@@ -86,13 +88,13 @@ int ASN1_parse(BIO *bp, const unsigned char *pp, long len, int indent)
}
int ASN1_parse_dump(BIO *bp, const unsigned char *pp, long len, int indent,
- int dump)
+ int dump)
{
return asn1_parse2(bp, &pp, len, 0, 0, indent, dump);
}
static int asn1_parse2(BIO *bp, const unsigned char **pp, long length,
- int offset, int depth, int indent, int dump)
+ int offset, int depth, int indent, int dump)
{
const unsigned char *p, *ep, *tot, *op, *opp;
long len;
@@ -110,7 +112,7 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length,
return 0;
}
- dump_indent = 6; /* Because we know BIO_dump_indent() */
+ dump_indent = 6; /* Because we know BIO_dump_indent() */
p = *pp;
tot = p + length;
while (length > 0) {
@@ -126,7 +128,7 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length,
* if j == 0x21 it is a constructed indefinite length object
*/
if (!asn1_print_info(bp, (long)offset + (long)(op - *pp), depth,
- hl, len, tag, xclass, j, (indent) ? depth : 0))
+ hl, len, tag, xclass, j, (indent) ? depth : 0))
goto end;
if (j & V_ASN1_CONSTRUCTED) {
const unsigned char *sp = p;
@@ -141,8 +143,8 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length,
if ((j == 0x21) && (len == 0)) {
for (;;) {
r = asn1_parse2(bp, &p, (long)(tot - p),
- offset + (int)(p - *pp), depth + 1,
- indent, dump);
+ offset + (int)(p - *pp), depth + 1,
+ indent, dump);
if (r == 0)
goto end;
if ((r == 2) || (p >= tot)) {
@@ -156,8 +158,8 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length,
while (p < ep) {
sp = p;
r = asn1_parse2(bp, &p, tmp,
- offset + (int)(p - *pp), depth + 1,
- indent, dump);
+ offset + (int)(p - *pp), depth + 1,
+ indent, dump);
if (r == 0)
goto end;
tmp -= (long)(p - sp);
@@ -169,17 +171,10 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length,
goto end;
} else {
nl = 0;
- if ((tag == V_ASN1_PRINTABLESTRING) ||
- (tag == V_ASN1_T61STRING) ||
- (tag == V_ASN1_IA5STRING) ||
- (tag == V_ASN1_VISIBLESTRING) ||
- (tag == V_ASN1_NUMERICSTRING) ||
- (tag == V_ASN1_UTF8STRING) ||
- (tag == V_ASN1_UTCTIME) || (tag == V_ASN1_GENERALIZEDTIME)) {
+ if ((tag == V_ASN1_PRINTABLESTRING) || (tag == V_ASN1_T61STRING) || (tag == V_ASN1_IA5STRING) || (tag == V_ASN1_VISIBLESTRING) || (tag == V_ASN1_NUMERICSTRING) || (tag == V_ASN1_UTF8STRING) || (tag == V_ASN1_UTCTIME) || (tag == V_ASN1_GENERALIZEDTIME)) {
if (BIO_write(bp, ":", 1) <= 0)
goto end;
- if ((len > 0) && BIO_write(bp, (const char *)p, (int)len)
- != (int)len)
+ if ((len > 0) && BIO_write(bp, (const char *)p, (int)len) != (int)len)
goto end;
} else if (tag == V_ASN1_OBJECT) {
opp = op;
@@ -213,25 +208,22 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length,
* testing whether the octet string is printable
*/
for (i = 0; i < os->length; i++) {
- if (((opp[i] < ' ') &&
- (opp[i] != '\n') &&
- (opp[i] != '\r') &&
- (opp[i] != '\t')) || (opp[i] > '~')) {
+ if (((opp[i] < ' ') && (opp[i] != '\n') && (opp[i] != '\r') && (opp[i] != '\t')) || (opp[i] > '~')) {
printable = 0;
break;
}
}
if (printable)
- /* printable string */
+ /* printable string */
{
if (BIO_write(bp, ":", 1) <= 0)
goto end;
if (BIO_write(bp, (const char *)opp, os->length) <= 0)
goto end;
} else if (!dump)
- /*
- * not printable => print octet string as hex dump
- */
+ /*
+ * not printable => print octet string as hex dump
+ */
{
if (BIO_write(bp, "[HEX DUMP]:", 11) <= 0)
goto end;
@@ -240,18 +232,17 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length,
goto end;
}
} else
- /* print the normal dump */
+ /* print the normal dump */
{
if (!nl) {
if (BIO_write(bp, "\n", 1) <= 0)
goto end;
}
if (BIO_dump_indent(bp,
- (const char *)opp,
- ((dump == -1 || dump >
- os->
- length) ? os->length : dump),
- dump_indent) <= 0)
+ (const char *)opp,
+ ((dump == -1 || dump > os->length) ? os->length : dump),
+ dump_indent)
+ <= 0)
goto end;
nl = 1;
}
@@ -316,8 +307,9 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length,
goto end;
}
if (BIO_dump_indent(bp, (const char *)p,
- ((dump == -1 || dump > len) ? len : dump),
- dump_indent) <= 0)
+ ((dump == -1 || dump > len) ? len : dump),
+ dump_indent)
+ <= 0)
goto end;
nl = 1;
}
@@ -341,14 +333,14 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length,
}
p += len;
if ((tag == V_ASN1_EOC) && (xclass == 0)) {
- ret = 2; /* End of sequence */
+ ret = 2; /* End of sequence */
goto end;
}
}
length -= len;
}
ret = 1;
- end:
+end:
ASN1_OBJECT_free(o);
ASN1_OCTET_STRING_free(os);
ASN1_INTEGER_free(ai);
diff --git a/crypto/asn1/asn_mime.c b/crypto/asn1/asn_mime.c
index c72aca06a6..eff6f89fb6 100644
--- a/crypto/asn1/asn_mime.c
+++ b/crypto/asn1/asn_mime.c
@@ -30,18 +30,18 @@
*/
struct mime_param_st {
- char *param_name; /* Param name e.g. "micalg" */
- char *param_value; /* Param value e.g. "sha1" */
+ char *param_name; /* Param name e.g. "micalg" */
+ char *param_value; /* Param value e.g. "sha1" */
};
struct mime_header_st {
- char *name; /* Name of line e.g. "content-type" */
- char *value; /* Value of line e.g. "text/plain" */
+ char *name; /* Name of line e.g. "content-type" */
+ char *value; /* Value of line e.g. "text/plain" */
STACK_OF(MIME_PARAM) *params; /* Zero or more parameters */
};
static int asn1_output_data(BIO *out, BIO *data, ASN1_VALUE *val, int flags,
- const ASN1_ITEM *it);
+ const ASN1_ITEM *it);
static char *strip_ends(char *name);
static char *strip_start(char *name);
static char *strip_end(char *name);
@@ -49,9 +49,9 @@ static MIME_HEADER *mime_hdr_new(const char *name, const char *value);
static int mime_hdr_addparam(MIME_HEADER *mhdr, const char *name, const char *value);
static STACK_OF(MIME_HEADER) *mime_parse_hdr(BIO *bio);
static int mime_hdr_cmp(const MIME_HEADER *const *a,
- const MIME_HEADER *const *b);
+ const MIME_HEADER *const *b);
static int mime_param_cmp(const MIME_PARAM *const *a,
- const MIME_PARAM *const *b);
+ const MIME_PARAM *const *b);
static void mime_param_free(MIME_PARAM *param);
static int mime_bound_check(char *line, int linelen, const char *bound, int blen);
static int multi_split(BIO *bio, int flags, const char *bound, STACK_OF(BIO) **ret);
@@ -61,13 +61,13 @@ static MIME_PARAM *mime_param_find(MIME_HEADER *hdr, const char *name);
static void mime_hdr_free(MIME_HEADER *hdr);
#define MAX_SMLEN 1024
-#define mime_debug(x) /* x */
+#define mime_debug(x) /* x */
/* Output an ASN1 structure in BER format streaming if necessary */
/* unfortunately cannot constify this due to CMS_stream() and PKCS7_stream() */
int i2d_ASN1_bio_stream(BIO *out, ASN1_VALUE *val, BIO *in, int flags,
- const ASN1_ITEM *it)
+ const ASN1_ITEM *it)
{
int rv = 1;
@@ -103,7 +103,7 @@ int i2d_ASN1_bio_stream(BIO *out, ASN1_VALUE *val, BIO *in, int flags,
/* Base 64 read and write of ASN1 structure */
static int B64_write_ASN1(BIO *out, ASN1_VALUE *val, BIO *in, int flags,
- const ASN1_ITEM *it)
+ const ASN1_ITEM *it)
{
BIO *b64;
int r;
@@ -126,7 +126,7 @@ static int B64_write_ASN1(BIO *out, ASN1_VALUE *val, BIO *in, int flags,
/* Streaming ASN1 PEM write */
int PEM_write_bio_ASN1_stream(BIO *out, ASN1_VALUE *val, BIO *in, int flags,
- const char *hdr, const ASN1_ITEM *it)
+ const char *hdr, const ASN1_ITEM *it)
{
return BIO_printf(out, "-----BEGIN %s-----\n", hdr) >= 0
&& B64_write_ASN1(out, val, in, flags, it)
@@ -134,7 +134,7 @@ int PEM_write_bio_ASN1_stream(BIO *out, ASN1_VALUE *val, BIO *in, int flags,
}
static ASN1_VALUE *b64_read_asn1(BIO *bio, const ASN1_ITEM *it, ASN1_VALUE **x,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_LIB_CTX *libctx, const char *propq)
{
BIO *b64;
ASN1_VALUE *val;
@@ -244,23 +244,21 @@ static int asn1_write_micalg(BIO *out, STACK_OF(X509_ALGOR) *mdalgs)
have_unknown = 1;
}
break;
-
}
}
ret = 1;
- err:
+err:
return ret;
-
}
/* SMIME sender */
int SMIME_write_ASN1_ex(BIO *bio, ASN1_VALUE *val, BIO *data, int flags,
- int ctype_nid, int econt_nid,
- STACK_OF(X509_ALGOR) *mdalgs, const ASN1_ITEM *it,
- OSSL_LIB_CTX *libctx, const char *propq)
+ int ctype_nid, int econt_nid,
+ STACK_OF(X509_ALGOR) *mdalgs, const ASN1_ITEM *it,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
char bound[33], c;
int i;
@@ -291,19 +289,21 @@ int SMIME_write_ASN1_ex(BIO *bio, ASN1_VALUE *val, BIO *data, int flags,
}
bound[32] = 0;
if (BIO_printf(bio, "MIME-Version: 1.0%s"
- "Content-Type: multipart/signed; protocol=\"%ssignature\";"
- " micalg=\"", /* not 'macalg', seee RFC 2311 section 3.4.3.2 */
- mime_eol, mime_prefix) < 0)
+ "Content-Type: multipart/signed; protocol=\"%ssignature\";"
+ " micalg=\"", /* not 'macalg', seee RFC 2311 section 3.4.3.2 */
+ mime_eol, mime_prefix)
+ < 0)
return 0;
if (!asn1_write_micalg(bio, mdalgs))
return 0;
if (BIO_printf(bio, "\"; boundary=\"----%s\"%s%s"
- "This is an S/MIME signed message%s%s"
- /* Now comes the first part */
- "------%s%s",
- bound, mime_eol, mime_eol,
- mime_eol, mime_eol,
- bound, mime_eol) < 0)
+ "This is an S/MIME signed message%s%s"
+ /* Now comes the first part */
+ "------%s%s",
+ bound, mime_eol, mime_eol,
+ mime_eol, mime_eol,
+ bound, mime_eol)
+ < 0)
return 0;
if (!asn1_output_data(bio, data, val, flags, it))
return 0;
@@ -313,10 +313,11 @@ int SMIME_write_ASN1_ex(BIO *bio, ASN1_VALUE *val, BIO *data, int flags,
/* Headers for signature */
if (BIO_printf(bio, "Content-Type: %ssignature; name=\"smime.p7s\"%s"
- "Content-Transfer-Encoding: base64%s"
- "Content-Disposition: attachment; filename=\"smime.p7s\"%s%s",
- mime_prefix, mime_eol,
- mime_eol, mime_eol, mime_eol) < 0)
+ "Content-Transfer-Encoding: base64%s"
+ "Content-Disposition: attachment; filename=\"smime.p7s\"%s%s",
+ mime_prefix, mime_eol,
+ mime_eol, mime_eol, mime_eol)
+ < 0)
return 0;
if (!B64_write_ASN1(bio, val, NULL, 0, it)
|| BIO_printf(bio, "%s------%s--%s%s", mime_eol, bound, mime_eol, mime_eol) < 0)
@@ -343,16 +344,19 @@ int SMIME_write_ASN1_ex(BIO *bio, ASN1_VALUE *val, BIO *data, int flags,
}
/* MIME headers */
if (BIO_printf(bio, "MIME-Version: 1.0%s"
- "Content-Disposition: attachment;"
- " filename=\"%s\"%s", mime_eol, cname, mime_eol) < 0)
+ "Content-Disposition: attachment;"
+ " filename=\"%s\"%s",
+ mime_eol, cname, mime_eol)
+ < 0)
return 0;
if (BIO_printf(bio, "Content-Type: %smime;", mime_prefix) < 0)
return 0;
if (msg_type != NULL && BIO_printf(bio, " smime-type=%s;", msg_type) < 0)
return 0;
if (BIO_printf(bio, " name=\"%s\"%s"
- "Content-Transfer-Encoding: base64%s%s",
- cname, mime_eol, mime_eol, mime_eol) < 0)
+ "Content-Transfer-Encoding: base64%s%s",
+ cname, mime_eol, mime_eol, mime_eol)
+ < 0)
return 0;
if (!B64_write_ASN1(bio, val, data, flags, it))
return 0;
@@ -360,18 +364,18 @@ int SMIME_write_ASN1_ex(BIO *bio, ASN1_VALUE *val, BIO *data, int flags,
}
int SMIME_write_ASN1(BIO *bio, ASN1_VALUE *val, BIO *data, int flags,
- int ctype_nid, int econt_nid,
- STACK_OF(X509_ALGOR) *mdalgs, const ASN1_ITEM *it)
+ int ctype_nid, int econt_nid,
+ STACK_OF(X509_ALGOR) *mdalgs, const ASN1_ITEM *it)
{
return SMIME_write_ASN1_ex(bio, val, data, flags, ctype_nid, econt_nid,
- mdalgs, it, NULL, NULL);
+ mdalgs, it, NULL, NULL);
}
/* Handle output of ASN1 data */
/* cannot constify val because of CMS_dataFinal() */
static int asn1_output_data(BIO *out, BIO *data, ASN1_VALUE *val, int flags,
- const ASN1_ITEM *it)
+ const ASN1_ITEM *it)
{
BIO *tmpbio;
const ASN1_AUX *aux = it->funcs;
@@ -417,7 +421,6 @@ static int asn1_output_data(BIO *out, BIO *data, ASN1_VALUE *val, int flags,
}
return rv;
-
}
/*
@@ -427,8 +430,8 @@ static int asn1_output_data(BIO *out, BIO *data, ASN1_VALUE *val, int flags,
*/
ASN1_VALUE *SMIME_read_ASN1_ex(BIO *bio, int flags, BIO **bcont,
- const ASN1_ITEM *it, ASN1_VALUE **x,
- OSSL_LIB_CTX *libctx, const char *propq)
+ const ASN1_ITEM *it, ASN1_VALUE **x,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
BIO *asnin;
STACK_OF(MIME_HEADER) *headers = NULL;
@@ -490,10 +493,9 @@ ASN1_VALUE *SMIME_read_ASN1_ex(BIO *bio, int flags, BIO **bcont,
return NULL;
}
- if (strcmp(hdr->value, "application/x-pkcs7-signature") &&
- strcmp(hdr->value, "application/pkcs7-signature")) {
+ if (strcmp(hdr->value, "application/x-pkcs7-signature") && strcmp(hdr->value, "application/pkcs7-signature")) {
ERR_raise_data(ERR_LIB_ASN1, ASN1_R_SIG_INVALID_MIME_TYPE,
- "type: %s", hdr->value);
+ "type: %s", hdr->value);
sk_MIME_HEADER_pop_free(headers, mime_hdr_free);
sk_BIO_pop_free(parts, BIO_vfree);
return NULL;
@@ -518,10 +520,9 @@ ASN1_VALUE *SMIME_read_ASN1_ex(BIO *bio, int flags, BIO **bcont,
/* OK, if not multipart/signed try opaque signature */
- if (strcmp(hdr->value, "application/x-pkcs7-mime") &&
- strcmp(hdr->value, "application/pkcs7-mime")) {
+ if (strcmp(hdr->value, "application/x-pkcs7-mime") && strcmp(hdr->value, "application/pkcs7-mime")) {
ERR_raise_data(ERR_LIB_ASN1, ASN1_R_INVALID_MIME_TYPE,
- "type: %s", hdr->value);
+ "type: %s", hdr->value);
sk_MIME_HEADER_pop_free(headers, mime_hdr_free);
return NULL;
}
@@ -573,7 +574,7 @@ int SMIME_crlf_copy(BIO *in, BIO *out, int flags)
int eolcnt = 0;
if ((flags & SMIME_TEXT) != 0
- && BIO_puts(out, "Content-Type: text/plain\r\n\r\n") < 0)
+ && BIO_puts(out, "Content-Type: text/plain\r\n\r\n") < 0)
goto err;
while ((len = BIO_gets(in, linebuf, MAX_SMLEN)) > 0) {
eol = strip_eol(linebuf, &len, flags);
@@ -600,7 +601,7 @@ int SMIME_crlf_copy(BIO *in, BIO *out, int flags)
}
ret = 1;
- err:
+err:
ret = BIO_flush(out) > 0 && ret;
BIO_pop(out);
BIO_free(bf);
@@ -627,7 +628,7 @@ int SMIME_text(BIO *in, BIO *out)
}
if (strcmp(hdr->value, "text/plain")) {
ERR_raise_data(ERR_LIB_ASN1, ASN1_R_INVALID_MIME_TYPE,
- "type: %s", hdr->value);
+ "type: %s", hdr->value);
sk_MIME_HEADER_pop_free(headers, mime_hdr_free);
return 0;
}
@@ -701,7 +702,7 @@ static int multi_split(BIO *bio, int flags, const char *bound, STACK_OF(BIO) **r
#else
1
#endif
- || (flags & SMIME_CRLFEOL) != 0) {
+ || (flags & SMIME_CRLFEOL) != 0) {
if (BIO_puts(bpart, "\r\n") < 0)
return 0;
} else {
@@ -720,13 +721,13 @@ static int multi_split(BIO *bio, int flags, const char *bound, STACK_OF(BIO) **r
/* This is the big one: parse MIME header lines up to message body */
-#define MIME_INVALID 0
-#define MIME_START 1
-#define MIME_TYPE 2
-#define MIME_NAME 3
-#define MIME_VALUE 4
-#define MIME_QUOTE 5
-#define MIME_COMMENT 6
+#define MIME_INVALID 0
+#define MIME_START 1
+#define MIME_TYPE 2
+#define MIME_NAME 3
+#define MIME_VALUE 4
+#define MIME_QUOTE 5
+#define MIME_COMMENT 6
static STACK_OF(MIME_HEADER) *mime_parse_hdr(BIO *bio)
{
@@ -749,7 +750,7 @@ static STACK_OF(MIME_HEADER) *mime_parse_hdr(BIO *bio)
ntmp = NULL;
/* Go through all characters */
for (p = linebuf, q = linebuf; (c = *p) && (c != '\r') && (c != '\n');
- p++) {
+ p++) {
/*
* State machine to handle MIME headers if this looks horrible
@@ -838,18 +839,18 @@ static STACK_OF(MIME_HEADER) *mime_parse_hdr(BIO *bio)
mime_hdr_addparam(mhdr, ntmp, strip_ends(q));
}
if (p == linebuf)
- break; /* Blank line means end of headers */
+ break; /* Blank line means end of headers */
}
/* Sort the headers and their params for faster searching */
sk_MIME_HEADER_sort(headers);
for (i = 0; i < sk_MIME_HEADER_num(headers); i++)
if ((mhdr = sk_MIME_HEADER_value(headers, i)) != NULL
- && mhdr->params != NULL)
+ && mhdr->params != NULL)
sk_MIME_PARAM_sort(mhdr->params);
return headers;
- err:
+err:
mime_hdr_free(new_hdr);
sk_MIME_HEADER_pop_free(headers, mime_hdr_free);
return NULL;
@@ -928,7 +929,7 @@ static MIME_HEADER *mime_hdr_new(const char *name, const char *value)
goto err;
return mhdr;
- err:
+err:
OPENSSL_free(tmpname);
OPENSSL_free(tmpval);
OPENSSL_free(mhdr);
@@ -961,7 +962,7 @@ static int mime_hdr_addparam(MIME_HEADER *mhdr, const char *name, const char *va
if (!sk_MIME_PARAM_push(mhdr->params, mparam))
goto err;
return 1;
- err:
+err:
OPENSSL_free(tmpname);
OPENSSL_free(tmpval);
OPENSSL_free(mparam);
@@ -969,7 +970,7 @@ static int mime_hdr_addparam(MIME_HEADER *mhdr, const char *name, const char *va
}
static int mime_hdr_cmp(const MIME_HEADER *const *a,
- const MIME_HEADER *const *b)
+ const MIME_HEADER *const *b)
{
if ((*a)->name == NULL || (*b)->name == NULL)
return ((*a)->name != NULL) - ((*b)->name != NULL);
@@ -978,7 +979,7 @@ static int mime_hdr_cmp(const MIME_HEADER *const *a,
}
static int mime_param_cmp(const MIME_PARAM *const *a,
- const MIME_PARAM *const *b)
+ const MIME_PARAM *const *b)
{
if ((*a)->param_name == NULL || (*b)->param_name == NULL)
return ((*a)->param_name != NULL) - ((*b)->param_name != NULL);
diff --git a/crypto/asn1/asn_mstbl.c b/crypto/asn1/asn_mstbl.c
index b930957655..cc9dba8e03 100644
--- a/crypto/asn1/asn_mstbl.c
+++ b/crypto/asn1/asn_mstbl.c
@@ -96,19 +96,19 @@ static int do_tcreate(const char *value, const char *name)
goto err;
}
rv = 1;
- err:
+err:
if (rv == 0) {
if (cnf)
ERR_raise_data(ERR_LIB_ASN1, ASN1_R_INVALID_STRING_TABLE_VALUE,
- "field=%s, value=%s", cnf->name,
- cnf->value != NULL ? cnf->value
- : value);
+ "field=%s, value=%s", cnf->name,
+ cnf->value != NULL ? cnf->value
+ : value);
else
ERR_raise_data(ERR_LIB_ASN1, ASN1_R_INVALID_STRING_TABLE_VALUE,
- "name=%s, value=%s", name, value);
+ "name=%s, value=%s", name, value);
} else {
rv = ASN1_STRING_TABLE_add(nid, tbl_min, tbl_max,
- tbl_mask, tbl_flags);
+ tbl_mask, tbl_flags);
if (!rv)
ERR_raise(ERR_LIB_ASN1, ERR_R_ASN1_LIB);
}
diff --git a/crypto/asn1/asn_pack.c b/crypto/asn1/asn_pack.c
index 54f4ae3a67..e8b93030a2 100644
--- a/crypto/asn1/asn_pack.c
+++ b/crypto/asn1/asn_pack.c
@@ -41,7 +41,7 @@ ASN1_STRING *ASN1_item_pack(void *obj, const ASN1_ITEM *it, ASN1_STRING **oct)
*oct = octmp;
return octmp;
- err:
+err:
if (oct == NULL || *oct == NULL)
ASN1_STRING_free(octmp);
return NULL;
@@ -61,14 +61,15 @@ void *ASN1_item_unpack(const ASN1_STRING *oct, const ASN1_ITEM *it)
}
void *ASN1_item_unpack_ex(const ASN1_STRING *oct, const ASN1_ITEM *it,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_LIB_CTX *libctx, const char *propq)
{
const unsigned char *p;
void *ret;
p = oct->data;
- if ((ret = ASN1_item_d2i_ex(NULL, &p, oct->length, it,\
- libctx, propq)) == NULL)
+ if ((ret = ASN1_item_d2i_ex(NULL, &p, oct->length, it,
+ libctx, propq))
+ == NULL)
ERR_raise(ERR_LIB_ASN1, ASN1_R_DECODE_ERROR);
return ret;
}
diff --git a/crypto/asn1/bio_asn1.c b/crypto/asn1/bio_asn1.c
index fe314355bb..610d767d43 100644
--- a/crypto/asn1/bio_asn1.c
+++ b/crypto/asn1/bio_asn1.c
@@ -70,11 +70,11 @@ static long asn1_bio_callback_ctrl(BIO *h, int cmd, BIO_info_cb *fp);
static int asn1_bio_init(BIO_ASN1_BUF_CTX *ctx, int size);
static int asn1_bio_flush_ex(BIO *b, BIO_ASN1_BUF_CTX *ctx,
- asn1_ps_func *cleanup, asn1_bio_state_t next);
+ asn1_ps_func *cleanup, asn1_bio_state_t next);
static int asn1_bio_setup_ex(BIO *b, BIO_ASN1_BUF_CTX *ctx,
- asn1_ps_func *setup,
- asn1_bio_state_t ex_state,
- asn1_bio_state_t other_state);
+ asn1_ps_func *setup,
+ asn1_bio_state_t ex_state,
+ asn1_bio_state_t other_state);
static const BIO_METHOD methods_asn1 = {
BIO_TYPE_ASN1,
@@ -171,7 +171,7 @@ static int asn1_bio_write(BIO *b, const char *in, int inl)
/* Setup prefix data, call it */
case ASN1_STATE_START:
if (!asn1_bio_setup_ex(b, ctx, ctx->prefix,
- ASN1_STATE_PRE_COPY, ASN1_STATE_HEADER))
+ ASN1_STATE_PRE_COPY, ASN1_STATE_HEADER))
return -1;
break;
@@ -179,7 +179,7 @@ static int asn1_bio_write(BIO *b, const char *in, int inl)
case ASN1_STATE_PRE_COPY:
ret = asn1_bio_flush_ex(b, ctx, ctx->prefix_free,
- ASN1_STATE_HEADER);
+ ASN1_STATE_HEADER);
if (ret <= 0)
goto done;
@@ -238,21 +238,18 @@ static int asn1_bio_write(BIO *b, const char *in, int inl)
case ASN1_STATE_DONE:
BIO_clear_retry_flags(b);
return 0;
-
}
-
}
- done:
+done:
BIO_clear_retry_flags(b);
BIO_copy_next_retry(b);
return (wrlen > 0) ? wrlen : ret;
-
}
static int asn1_bio_flush_ex(BIO *b, BIO_ASN1_BUF_CTX *ctx,
- asn1_ps_func *cleanup, asn1_bio_state_t next)
+ asn1_ps_func *cleanup, asn1_bio_state_t next)
{
int ret;
@@ -277,9 +274,9 @@ static int asn1_bio_flush_ex(BIO *b, BIO_ASN1_BUF_CTX *ctx,
}
static int asn1_bio_setup_ex(BIO *b, BIO_ASN1_BUF_CTX *ctx,
- asn1_ps_func *setup,
- asn1_bio_state_t ex_state,
- asn1_bio_state_t other_state)
+ asn1_ps_func *setup,
+ asn1_bio_state_t ex_state,
+ asn1_bio_state_t other_state)
{
if (setup && !setup(b, &ctx->ex_buf, &ctx->ex_len, &ctx->ex_arg)) {
BIO_clear_retry_flags(b);
@@ -378,13 +375,13 @@ static long asn1_bio_ctrl(BIO *b, int cmd, long arg1, void *arg2)
/* Call post function if possible */
if (ctx->state == ASN1_STATE_HEADER) {
if (!asn1_bio_setup_ex(b, ctx, ctx->suffix,
- ASN1_STATE_POST_COPY, ASN1_STATE_DONE))
+ ASN1_STATE_POST_COPY, ASN1_STATE_DONE))
return 0;
}
if (ctx->state == ASN1_STATE_POST_COPY) {
ret = asn1_bio_flush_ex(b, ctx, ctx->suffix_free,
- ASN1_STATE_DONE);
+ ASN1_STATE_DONE);
if (ret <= 0)
return ret;
}
@@ -400,14 +397,13 @@ static long asn1_bio_ctrl(BIO *b, int cmd, long arg1, void *arg2)
if (next == NULL)
return 0;
return BIO_ctrl(next, cmd, arg1, arg2);
-
}
return ret;
}
static int asn1_bio_set_ex(BIO *b, int cmd,
- asn1_ps_func *ex_func, asn1_ps_func *ex_free_func)
+ asn1_ps_func *ex_func, asn1_ps_func *ex_free_func)
{
BIO_ASN1_EX_FUNCS extmp;
extmp.ex_func = ex_func;
@@ -416,8 +412,8 @@ static int asn1_bio_set_ex(BIO *b, int cmd,
}
static int asn1_bio_get_ex(BIO *b, int cmd,
- asn1_ps_func **ex_func,
- asn1_ps_func **ex_free_func)
+ asn1_ps_func **ex_func,
+ asn1_ps_func **ex_free_func)
{
BIO_ASN1_EX_FUNCS extmp;
int ret;
@@ -430,25 +426,25 @@ static int asn1_bio_get_ex(BIO *b, int cmd,
}
int BIO_asn1_set_prefix(BIO *b, asn1_ps_func *prefix,
- asn1_ps_func *prefix_free)
+ asn1_ps_func *prefix_free)
{
return asn1_bio_set_ex(b, BIO_C_SET_PREFIX, prefix, prefix_free);
}
int BIO_asn1_get_prefix(BIO *b, asn1_ps_func **pprefix,
- asn1_ps_func **pprefix_free)
+ asn1_ps_func **pprefix_free)
{
return asn1_bio_get_ex(b, BIO_C_GET_PREFIX, pprefix, pprefix_free);
}
int BIO_asn1_set_suffix(BIO *b, asn1_ps_func *suffix,
- asn1_ps_func *suffix_free)
+ asn1_ps_func *suffix_free)
{
return asn1_bio_set_ex(b, BIO_C_SET_SUFFIX, suffix, suffix_free);
}
int BIO_asn1_get_suffix(BIO *b, asn1_ps_func **psuffix,
- asn1_ps_func **psuffix_free)
+ asn1_ps_func **psuffix_free)
{
return asn1_bio_get_ex(b, BIO_C_GET_SUFFIX, psuffix, psuffix_free);
}
diff --git a/crypto/asn1/bio_ndef.c b/crypto/asn1/bio_ndef.c
index f6cc2b0267..5c20a1bc8d 100644
--- a/crypto/asn1/bio_ndef.c
+++ b/crypto/asn1/bio_ndef.c
@@ -44,10 +44,10 @@ typedef struct ndef_aux_st {
static int ndef_prefix(BIO *b, unsigned char **pbuf, int *plen, void *parg);
static int ndef_prefix_free(BIO *b, unsigned char **pbuf, int *plen,
- void *parg);
+ void *parg);
static int ndef_suffix(BIO *b, unsigned char **pbuf, int *plen, void *parg);
static int ndef_suffix_free(BIO *b, unsigned char **pbuf, int *plen,
- void *parg);
+ void *parg);
/*
* On success, the returned BIO owns the input BIO as part of its BIO chain.
@@ -79,8 +79,8 @@ BIO *BIO_new_NDEF(BIO *out, ASN1_VALUE *val, const ASN1_ITEM *it)
pop_bio = asn_bio;
if (BIO_asn1_set_prefix(asn_bio, ndef_prefix, ndef_prefix_free) <= 0
- || BIO_asn1_set_suffix(asn_bio, ndef_suffix, ndef_suffix_free) <= 0
- || BIO_ctrl(asn_bio, BIO_C_SET_EX_ARG, 0, ndef_aux) <= 0)
+ || BIO_asn1_set_suffix(asn_bio, ndef_suffix, ndef_suffix_free) <= 0
+ || BIO_ctrl(asn_bio, BIO_C_SET_EX_ARG, 0, ndef_aux) <= 0)
goto err;
/*
@@ -118,7 +118,7 @@ BIO *BIO_new_NDEF(BIO *out, ASN1_VALUE *val, const ASN1_ITEM *it)
return sarg.ndef_bio;
- err:
+err:
/* BIO_pop() is NULL safe */
(void)BIO_pop(pop_bio);
BIO_free(asn_bio);
@@ -156,7 +156,7 @@ static int ndef_prefix(BIO *b, unsigned char **pbuf, int *plen, void *parg)
}
static int ndef_prefix_free(BIO *b, unsigned char **pbuf, int *plen,
- void *parg)
+ void *parg)
{
NDEF_SUPPORT *ndef_aux;
@@ -177,7 +177,7 @@ static int ndef_prefix_free(BIO *b, unsigned char **pbuf, int *plen,
}
static int ndef_suffix_free(BIO *b, unsigned char **pbuf, int *plen,
- void *parg)
+ void *parg)
{
NDEF_SUPPORT **pndef_aux = (NDEF_SUPPORT **)parg;
if (!ndef_prefix_free(b, pbuf, plen, parg))
@@ -207,7 +207,8 @@ static int ndef_suffix(BIO *b, unsigned char **pbuf, int *plen, void *parg)
sarg.out = ndef_aux->out;
sarg.boundary = ndef_aux->boundary;
if (aux->asn1_cb(ASN1_OP_STREAM_POST,
- &ndef_aux->val, ndef_aux->it, &sarg) <= 0)
+ &ndef_aux->val, ndef_aux->it, &sarg)
+ <= 0)
return 0;
derlen = ASN1_item_ndef_i2d(ndef_aux->val, NULL, ndef_aux->it);
diff --git a/crypto/asn1/d2i_param.c b/crypto/asn1/d2i_param.c
index 1a0e2bfe6d..ac76c57b68 100644
--- a/crypto/asn1/d2i_param.c
+++ b/crypto/asn1/d2i_param.c
@@ -16,7 +16,7 @@
#include "crypto/evp.h"
EVP_PKEY *d2i_KeyParams(int type, EVP_PKEY **a, const unsigned char **pp,
- long length)
+ long length)
{
EVP_PKEY *ret = NULL;
diff --git a/crypto/asn1/d2i_pr.c b/crypto/asn1/d2i_pr.c
index 7b9d55ec7a..59ba8f909b 100644
--- a/crypto/asn1/d2i_pr.c
+++ b/crypto/asn1/d2i_pr.c
@@ -23,7 +23,7 @@
static EVP_PKEY *
d2i_PrivateKey_decoder(int keytype, EVP_PKEY **a, const unsigned char **pp,
- long length, OSSL_LIB_CTX *libctx, const char *propq)
+ long length, OSSL_LIB_CTX *libctx, const char *propq)
{
OSSL_DECODER_CTX *dctx = NULL;
size_t len = length;
@@ -59,8 +59,8 @@ d2i_PrivateKey_decoder(int keytype, EVP_PKEY **a, const unsigned char **pp,
return NULL;
}
if (key_name == NULL
- && PKCS8_pkey_get0(&algoid, NULL, NULL, NULL, p8info)
- && OBJ_obj2txt(keytypebuf, sizeof(keytypebuf), algoid, 0))
+ && PKCS8_pkey_get0(&algoid, NULL, NULL, NULL, p8info)
+ && OBJ_obj2txt(keytypebuf, sizeof(keytypebuf), algoid, 0))
key_name = keytypebuf;
structure = "PrivateKeyInfo";
PKCS8_PRIV_KEY_INFO_free(p8info);
@@ -72,7 +72,7 @@ d2i_PrivateKey_decoder(int keytype, EVP_PKEY **a, const unsigned char **pp,
if (a != NULL && (bak_a = *a) != NULL)
ppkey = a;
dctx = OSSL_DECODER_CTX_new_for_pkey(ppkey, "DER", structure, key_name,
- EVP_PKEY_KEYPAIR, libctx, propq);
+ EVP_PKEY_KEYPAIR, libctx, propq);
if (a != NULL)
*a = bak_a;
if (dctx == NULL)
@@ -88,7 +88,7 @@ d2i_PrivateKey_decoder(int keytype, EVP_PKEY **a, const unsigned char **pp,
return *ppkey;
}
- err:
+err:
if (ppkey != a)
EVP_PKEY_free(*ppkey);
return NULL;
@@ -96,7 +96,7 @@ d2i_PrivateKey_decoder(int keytype, EVP_PKEY **a, const unsigned char **pp,
EVP_PKEY *
ossl_d2i_PrivateKey_legacy(int keytype, EVP_PKEY **a, const unsigned char **pp,
- long length, OSSL_LIB_CTX *libctx, const char *propq)
+ long length, OSSL_LIB_CTX *libctx, const char *propq)
{
EVP_PKEY *ret;
const unsigned char *p = *pp;
@@ -116,10 +116,9 @@ ossl_d2i_PrivateKey_legacy(int keytype, EVP_PKEY **a, const unsigned char **pp,
}
ERR_set_mark();
- if (!ret->ameth->old_priv_decode ||
- !ret->ameth->old_priv_decode(ret, &p, length)) {
+ if (!ret->ameth->old_priv_decode || !ret->ameth->old_priv_decode(ret, &p, length)) {
if (ret->ameth->priv_decode != NULL
- || ret->ameth->priv_decode_ex != NULL) {
+ || ret->ameth->priv_decode_ex != NULL) {
EVP_PKEY *tmp;
PKCS8_PRIV_KEY_INFO *p8 = NULL;
p8 = d2i_PKCS8_PRIV_KEY_INFO(NULL, &p, length);
@@ -144,21 +143,21 @@ ossl_d2i_PrivateKey_legacy(int keytype, EVP_PKEY **a, const unsigned char **pp,
goto err;
}
} else {
- ERR_clear_last_mark();
+ ERR_clear_last_mark();
}
*pp = p;
if (a != NULL)
*a = ret;
return ret;
- err:
+err:
if (a == NULL || *a != ret)
EVP_PKEY_free(ret);
return NULL;
}
EVP_PKEY *d2i_PrivateKey_ex(int keytype, EVP_PKEY **a, const unsigned char **pp,
- long length, OSSL_LIB_CTX *libctx,
- const char *propq)
+ long length, OSSL_LIB_CTX *libctx,
+ const char *propq)
{
EVP_PKEY *ret;
@@ -170,16 +169,16 @@ EVP_PKEY *d2i_PrivateKey_ex(int keytype, EVP_PKEY **a, const unsigned char **pp,
}
EVP_PKEY *d2i_PrivateKey(int type, EVP_PKEY **a, const unsigned char **pp,
- long length)
+ long length)
{
return d2i_PrivateKey_ex(type, a, pp, length, NULL, NULL);
}
static EVP_PKEY *d2i_AutoPrivateKey_legacy(EVP_PKEY **a,
- const unsigned char **pp,
- long length,
- OSSL_LIB_CTX *libctx,
- const char *propq)
+ const unsigned char **pp,
+ long length,
+ OSSL_LIB_CTX *libctx,
+ const char *propq)
{
STACK_OF(ASN1_TYPE) *inkey;
const unsigned char *p;
@@ -202,7 +201,7 @@ static EVP_PKEY *d2i_AutoPrivateKey_legacy(EVP_PKEY **a,
} else if (sk_ASN1_TYPE_num(inkey) == 4) {
keytype = EVP_PKEY_EC;
} else if (sk_ASN1_TYPE_num(inkey) == 3) { /* This seems to be PKCS8, not
- * traditional format */
+ * traditional format */
PKCS8_PRIV_KEY_INFO *p8 = d2i_PKCS8_PRIV_KEY_INFO(NULL, &p, length);
EVP_PKEY *ret;
@@ -232,8 +231,8 @@ static EVP_PKEY *d2i_AutoPrivateKey_legacy(EVP_PKEY **a,
* EVP_PKEY_NONE, which then figures out the type during decoding.
*/
EVP_PKEY *d2i_AutoPrivateKey_ex(EVP_PKEY **a, const unsigned char **pp,
- long length, OSSL_LIB_CTX *libctx,
- const char *propq)
+ long length, OSSL_LIB_CTX *libctx,
+ const char *propq)
{
EVP_PKEY *ret;
@@ -245,7 +244,7 @@ EVP_PKEY *d2i_AutoPrivateKey_ex(EVP_PKEY **a, const unsigned char **pp,
}
EVP_PKEY *d2i_AutoPrivateKey(EVP_PKEY **a, const unsigned char **pp,
- long length)
+ long length)
{
return d2i_AutoPrivateKey_ex(a, pp, length, NULL, NULL);
}
diff --git a/crypto/asn1/d2i_pu.c b/crypto/asn1/d2i_pu.c
index cf7825c439..60b2188035 100644
--- a/crypto/asn1/d2i_pu.c
+++ b/crypto/asn1/d2i_pu.c
@@ -26,7 +26,7 @@
#include "crypto/evp.h"
EVP_PKEY *d2i_PublicKey(int type, EVP_PKEY **a, const unsigned char **pp,
- long length)
+ long length)
{
EVP_PKEY *ret;
EVP_PKEY *copy = NULL;
@@ -90,7 +90,7 @@ EVP_PKEY *d2i_PublicKey(int type, EVP_PKEY **a, const unsigned char **pp,
(*a) = ret;
EVP_PKEY_free(copy);
return ret;
- err:
+err:
if (a == NULL || *a != ret)
EVP_PKEY_free(ret);
EVP_PKEY_free(copy);
diff --git a/crypto/asn1/evp_asn1.c b/crypto/asn1/evp_asn1.c
index 13d8ed3893..5e313fc9e8 100644
--- a/crypto/asn1/evp_asn1.c
+++ b/crypto/asn1/evp_asn1.c
@@ -52,7 +52,7 @@ int ASN1_TYPE_get_octetstring(const ASN1_TYPE *a, unsigned char *data, int max_l
}
static ossl_inline void asn1_type_init_oct(ASN1_OCTET_STRING *oct,
- unsigned char *data, int len)
+ unsigned char *data, int len)
{
oct->data = data;
oct->type = V_ASN1_OCTET_STRING;
@@ -61,7 +61,7 @@ static ossl_inline void asn1_type_init_oct(ASN1_OCTET_STRING *oct,
}
static int asn1_type_get_int_oct(ASN1_OCTET_STRING *oct, int32_t anum,
- long *num, unsigned char *data, int max_len)
+ long *num, unsigned char *data, int max_len)
{
int ret = ASN1_STRING_length(oct), n;
@@ -85,14 +85,14 @@ typedef struct {
} asn1_int_oct;
ASN1_SEQUENCE(asn1_int_oct) = {
- ASN1_EMBED(asn1_int_oct, num, INT32),
- ASN1_SIMPLE(asn1_int_oct, oct, ASN1_OCTET_STRING)
+ ASN1_EMBED(asn1_int_oct, num, INT32),
+ ASN1_SIMPLE(asn1_int_oct, oct, ASN1_OCTET_STRING)
} static_ASN1_SEQUENCE_END(asn1_int_oct)
-DECLARE_ASN1_ITEM(asn1_int_oct)
+ DECLARE_ASN1_ITEM(asn1_int_oct)
int ASN1_TYPE_set_int_octetstring(ASN1_TYPE *a, long num, unsigned char *data,
- int len)
+ int len)
{
asn1_int_oct atmp;
ASN1_OCTET_STRING oct;
@@ -107,7 +107,7 @@ int ASN1_TYPE_set_int_octetstring(ASN1_TYPE *a, long num, unsigned char *data,
}
int ASN1_TYPE_get_int_octetstring(const ASN1_TYPE *a, long *num,
- unsigned char *data, int max_len)
+ unsigned char *data, int max_len)
{
asn1_int_oct *atmp = NULL;
int ret = -1;
@@ -124,7 +124,7 @@ int ASN1_TYPE_get_int_octetstring(const ASN1_TYPE *a, long *num,
ret = asn1_type_get_int_oct(atmp->oct, atmp->num, num, data, max_len);
if (ret == -1) {
- err:
+ err:
ERR_raise(ERR_LIB_ASN1, ASN1_R_DATA_IS_WRONG);
}
M_ASN1_free_of(atmp, asn1_int_oct);
@@ -141,14 +141,14 @@ typedef struct {
* Section 2. "Content-Authenticated Encryption Algorithms"
*/
ASN1_SEQUENCE(asn1_oct_int) = {
- ASN1_SIMPLE(asn1_oct_int, oct, ASN1_OCTET_STRING),
- ASN1_EMBED(asn1_oct_int, num, INT32)
+ ASN1_SIMPLE(asn1_oct_int, oct, ASN1_OCTET_STRING),
+ ASN1_EMBED(asn1_oct_int, num, INT32)
} static_ASN1_SEQUENCE_END(asn1_oct_int)
-DECLARE_ASN1_ITEM(asn1_oct_int)
+ DECLARE_ASN1_ITEM(asn1_oct_int)
int ossl_asn1_type_set_octetstring_int(ASN1_TYPE *a, long num,
- unsigned char *data, int len)
+ unsigned char *data, int len)
{
asn1_oct_int atmp;
ASN1_OCTET_STRING oct;
@@ -163,7 +163,7 @@ int ossl_asn1_type_set_octetstring_int(ASN1_TYPE *a, long num,
}
int ossl_asn1_type_get_octetstring_int(const ASN1_TYPE *a, long *num,
- unsigned char *data, int max_len)
+ unsigned char *data, int max_len)
{
asn1_oct_int *atmp = NULL;
int ret = -1;
@@ -179,7 +179,7 @@ int ossl_asn1_type_get_octetstring_int(const ASN1_TYPE *a, long *num,
ret = asn1_type_get_int_oct(atmp->oct, atmp->num, num, data, max_len);
if (ret == -1) {
- err:
+ err:
ERR_raise(ERR_LIB_ASN1, ASN1_R_DATA_IS_WRONG);
}
M_ASN1_free_of(atmp, asn1_oct_int);
diff --git a/crypto/asn1/f_int.c b/crypto/asn1/f_int.c
index 5b5dda4ce1..b1fd3f9467 100644
--- a/crypto/asn1/f_int.c
+++ b/crypto/asn1/f_int.c
@@ -45,7 +45,7 @@ int i2a_ASN1_INTEGER(BIO *bp, const ASN1_INTEGER *a)
}
}
return n;
- err:
+err:
return -1;
}
@@ -131,7 +131,7 @@ int a2i_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *bs, char *buf, int size)
bs->length = num;
bs->data = s;
return 1;
- err:
+err:
ERR_raise(ERR_LIB_ASN1, ASN1_R_SHORT_LINE);
OPENSSL_free(s);
return 0;
diff --git a/crypto/asn1/f_string.c b/crypto/asn1/f_string.c
index 7e4e598514..9fb34f495e 100644
--- a/crypto/asn1/f_string.c
+++ b/crypto/asn1/f_string.c
@@ -39,7 +39,7 @@ int i2a_ASN1_STRING(BIO *bp, const ASN1_STRING *a, int type)
}
}
return n;
- err:
+err:
return -1;
}
@@ -125,7 +125,7 @@ int a2i_ASN1_STRING(BIO *bp, ASN1_STRING *bs, char *buf, int size)
bs->data = s;
return 1;
- err:
+err:
ERR_raise(ERR_LIB_ASN1, ASN1_R_SHORT_LINE);
OPENSSL_free(s);
return 0;
diff --git a/crypto/asn1/i2d_evp.c b/crypto/asn1/i2d_evp.c
index 9907e24124..fc219e230e 100644
--- a/crypto/asn1/i2d_evp.c
+++ b/crypto/asn1/i2d_evp.c
@@ -19,9 +19,9 @@
#include <openssl/encoder.h>
#include <openssl/buffer.h>
#include <openssl/x509.h>
-#include <openssl/rsa.h> /* For i2d_RSAPublicKey */
-#include <openssl/dsa.h> /* For i2d_DSAPublicKey */
-#include <openssl/ec.h> /* For i2o_ECPublicKey */
+#include <openssl/rsa.h> /* For i2d_RSAPublicKey */
+#include <openssl/dsa.h> /* For i2d_DSAPublicKey */
+#include <openssl/ec.h> /* For i2o_ECPublicKey */
#include "crypto/asn1.h"
#include "crypto/evp.h"
@@ -31,14 +31,14 @@ struct type_and_structure_st {
};
static int i2d_provided(const EVP_PKEY *a, int selection,
- const struct type_and_structure_st *output_info,
- unsigned char **pp)
+ const struct type_and_structure_st *output_info,
+ unsigned char **pp)
{
int ret;
for (ret = -1;
- ret == -1 && output_info->output_type != NULL;
- output_info++) {
+ ret == -1 && output_info->output_type != NULL;
+ output_info++) {
/*
* The i2d_ calls don't take a boundary length for *pp. However,
* OSSL_ENCODER_to_data() needs one, so we make one up. Because
@@ -51,9 +51,9 @@ static int i2d_provided(const EVP_PKEY *a, int selection,
OSSL_ENCODER_CTX *ctx;
ctx = OSSL_ENCODER_CTX_new_for_pkey(a, selection,
- output_info->output_type,
- output_info->output_structure,
- NULL);
+ output_info->output_type,
+ output_info->output_structure,
+ NULL);
if (ctx == NULL)
return -1;
if (OSSL_ENCODER_to_data(ctx, pp, &len)) {
@@ -75,7 +75,9 @@ int i2d_KeyParams(const EVP_PKEY *a, unsigned char **pp)
if (evp_pkey_is_provided(a)) {
static const struct type_and_structure_st output_info[] = {
{ "DER", "type-specific" },
- { NULL, }
+ {
+ NULL,
+ }
};
return i2d_provided(a, EVP_PKEY_KEY_PARAMETERS, output_info, pp);
@@ -98,7 +100,9 @@ i2d_PrivateKey_impl(const EVP_PKEY *a, unsigned char **pp, int traditional)
static const struct type_and_structure_st trad_output_info[] = {
{ "DER", "type-specific" },
{ "DER", "PrivateKeyInfo" },
- { NULL, }
+ {
+ NULL,
+ }
};
const struct type_and_structure_st *oi = trad_output_info;
@@ -139,8 +143,10 @@ int i2d_PublicKey(const EVP_PKEY *a, unsigned char **pp)
if (evp_pkey_is_provided(a)) {
static const struct type_and_structure_st output_info[] = {
{ "DER", "type-specific" },
- { "blob", NULL }, /* for EC */
- { NULL, }
+ { "blob", NULL }, /* for EC */
+ {
+ NULL,
+ }
};
return i2d_provided(a, EVP_PKEY_PUBLIC_KEY, output_info, pp);
diff --git a/crypto/asn1/n_pkey.c b/crypto/asn1/n_pkey.c
index eb0918f79f..7b70d6c7a0 100644
--- a/crypto/asn1/n_pkey.c
+++ b/crypto/asn1/n_pkey.c
@@ -16,11 +16,11 @@
#include <openssl/evp.h>
#include <openssl/x509.h>
-#define ASN1_BROKEN_SEQUENCE(tname) \
- static const ASN1_AUX tname##_aux = {NULL, ASN1_AFLG_BROKEN, 0, 0, 0, 0}; \
- ASN1_SEQUENCE(tname)
+#define ASN1_BROKEN_SEQUENCE(tname) \
+ static const ASN1_AUX tname##_aux = { NULL, ASN1_AFLG_BROKEN, 0, 0, 0, 0 }; \
+ ASN1_SEQUENCE(tname)
#define static_ASN1_BROKEN_SEQUENCE_END(stname) \
- static_ASN1_SEQUENCE_END_ref(stname, stname)
+ static_ASN1_SEQUENCE_END_ref(stname, stname)
typedef struct netscape_pkey_st {
int32_t version;
@@ -37,22 +37,21 @@ typedef struct netscape_encrypted_pkey_st {
X509_SIG *enckey;
} NETSCAPE_ENCRYPTED_PKEY;
-
ASN1_BROKEN_SEQUENCE(NETSCAPE_ENCRYPTED_PKEY) = {
- ASN1_SIMPLE(NETSCAPE_ENCRYPTED_PKEY, os, ASN1_OCTET_STRING),
- ASN1_SIMPLE(NETSCAPE_ENCRYPTED_PKEY, enckey, X509_SIG)
+ ASN1_SIMPLE(NETSCAPE_ENCRYPTED_PKEY, os, ASN1_OCTET_STRING),
+ ASN1_SIMPLE(NETSCAPE_ENCRYPTED_PKEY, enckey, X509_SIG)
} static_ASN1_BROKEN_SEQUENCE_END(NETSCAPE_ENCRYPTED_PKEY)
-DECLARE_ASN1_FUNCTIONS(NETSCAPE_ENCRYPTED_PKEY)
+ DECLARE_ASN1_FUNCTIONS(NETSCAPE_ENCRYPTED_PKEY)
DECLARE_ASN1_ENCODE_FUNCTIONS_name(NETSCAPE_ENCRYPTED_PKEY, NETSCAPE_ENCRYPTED_PKEY)
IMPLEMENT_ASN1_FUNCTIONS(NETSCAPE_ENCRYPTED_PKEY)
ASN1_SEQUENCE(NETSCAPE_PKEY) = {
- ASN1_EMBED(NETSCAPE_PKEY, version, INT32),
- ASN1_SIMPLE(NETSCAPE_PKEY, algor, X509_ALGOR),
- ASN1_SIMPLE(NETSCAPE_PKEY, private_key, ASN1_OCTET_STRING)
+ ASN1_EMBED(NETSCAPE_PKEY, version, INT32),
+ ASN1_SIMPLE(NETSCAPE_PKEY, algor, X509_ALGOR),
+ ASN1_SIMPLE(NETSCAPE_PKEY, private_key, ASN1_OCTET_STRING)
} static_ASN1_SEQUENCE_END(NETSCAPE_PKEY)
-DECLARE_ASN1_FUNCTIONS(NETSCAPE_PKEY)
+ DECLARE_ASN1_FUNCTIONS(NETSCAPE_PKEY)
DECLARE_ASN1_ENCODE_FUNCTIONS_name(NETSCAPE_PKEY, NETSCAPE_PKEY)
IMPLEMENT_ASN1_FUNCTIONS(NETSCAPE_PKEY)
diff --git a/crypto/asn1/nsseq.c b/crypto/asn1/nsseq.c
index 09dc24f25f..1b36531941 100644
--- a/crypto/asn1/nsseq.c
+++ b/crypto/asn1/nsseq.c
@@ -14,7 +14,7 @@
#include <openssl/objects.h>
static int nsseq_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
- void *exarg)
+ void *exarg)
{
if (operation == ASN1_OP_NEW_POST) {
NETSCAPE_CERT_SEQUENCE *nsseq;
@@ -27,8 +27,8 @@ static int nsseq_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
/* Netscape certificate sequence structure */
ASN1_SEQUENCE_cb(NETSCAPE_CERT_SEQUENCE, nsseq_cb) = {
- ASN1_SIMPLE(NETSCAPE_CERT_SEQUENCE, type, ASN1_OBJECT),
- ASN1_EXP_SEQUENCE_OF_OPT(NETSCAPE_CERT_SEQUENCE, certs, X509, 0)
+ ASN1_SIMPLE(NETSCAPE_CERT_SEQUENCE, type, ASN1_OBJECT),
+ ASN1_EXP_SEQUENCE_OF_OPT(NETSCAPE_CERT_SEQUENCE, certs, X509, 0)
} ASN1_SEQUENCE_END_cb(NETSCAPE_CERT_SEQUENCE, NETSCAPE_CERT_SEQUENCE)
IMPLEMENT_ASN1_FUNCTIONS(NETSCAPE_CERT_SEQUENCE)
diff --git a/crypto/asn1/p5_pbe.c b/crypto/asn1/p5_pbe.c
index a90c200d42..11782cd315 100644
--- a/crypto/asn1/p5_pbe.c
+++ b/crypto/asn1/p5_pbe.c
@@ -17,8 +17,8 @@
/* PKCS#5 password based encryption structure */
ASN1_SEQUENCE(PBEPARAM) = {
- ASN1_SIMPLE(PBEPARAM, salt, ASN1_OCTET_STRING),
- ASN1_SIMPLE(PBEPARAM, iter, ASN1_INTEGER)
+ ASN1_SIMPLE(PBEPARAM, salt, ASN1_OCTET_STRING),
+ ASN1_SIMPLE(PBEPARAM, iter, ASN1_INTEGER)
} ASN1_SEQUENCE_END(PBEPARAM)
IMPLEMENT_ASN1_FUNCTIONS(PBEPARAM)
@@ -26,8 +26,8 @@ IMPLEMENT_ASN1_FUNCTIONS(PBEPARAM)
/* Set an algorithm identifier for a PKCS#5 PBE algorithm */
int PKCS5_pbe_set0_algor_ex(X509_ALGOR *algor, int alg, int iter,
- const unsigned char *salt, int saltlen,
- OSSL_LIB_CTX *ctx)
+ const unsigned char *salt, int saltlen,
+ OSSL_LIB_CTX *ctx)
{
PBEPARAM *pbe = NULL;
ASN1_STRING *pbe_str = NULL;
@@ -72,7 +72,7 @@ int PKCS5_pbe_set0_algor_ex(X509_ALGOR *algor, int alg, int iter,
if (X509_ALGOR_set0(algor, OBJ_nid2obj(alg), V_ASN1_SEQUENCE, pbe_str))
return 1;
- err:
+err:
OPENSSL_free(sstr);
PBEPARAM_free(pbe);
ASN1_STRING_free(pbe_str);
@@ -80,7 +80,7 @@ int PKCS5_pbe_set0_algor_ex(X509_ALGOR *algor, int alg, int iter,
}
int PKCS5_pbe_set0_algor(X509_ALGOR *algor, int alg, int iter,
- const unsigned char *salt, int saltlen)
+ const unsigned char *salt, int saltlen)
{
return PKCS5_pbe_set0_algor_ex(algor, alg, iter, salt, saltlen, NULL);
}
@@ -88,8 +88,8 @@ int PKCS5_pbe_set0_algor(X509_ALGOR *algor, int alg, int iter,
/* Return an algorithm identifier for a PKCS#5 PBE algorithm */
X509_ALGOR *PKCS5_pbe_set_ex(int alg, int iter,
- const unsigned char *salt, int saltlen,
- OSSL_LIB_CTX *ctx)
+ const unsigned char *salt, int saltlen,
+ OSSL_LIB_CTX *ctx)
{
X509_ALGOR *ret;
ret = X509_ALGOR_new();
@@ -106,8 +106,7 @@ X509_ALGOR *PKCS5_pbe_set_ex(int alg, int iter,
}
X509_ALGOR *PKCS5_pbe_set(int alg, int iter,
- const unsigned char *salt, int saltlen)
+ const unsigned char *salt, int saltlen)
{
return PKCS5_pbe_set_ex(alg, iter, salt, saltlen, NULL);
}
-
diff --git a/crypto/asn1/p5_pbev2.c b/crypto/asn1/p5_pbev2.c
index b9ad4db4a7..468e9fc769 100644
--- a/crypto/asn1/p5_pbev2.c
+++ b/crypto/asn1/p5_pbev2.c
@@ -20,17 +20,17 @@
/* PKCS#5 v2.0 password based encryption structures */
ASN1_SEQUENCE(PBE2PARAM) = {
- ASN1_SIMPLE(PBE2PARAM, keyfunc, X509_ALGOR),
- ASN1_SIMPLE(PBE2PARAM, encryption, X509_ALGOR)
+ ASN1_SIMPLE(PBE2PARAM, keyfunc, X509_ALGOR),
+ ASN1_SIMPLE(PBE2PARAM, encryption, X509_ALGOR)
} ASN1_SEQUENCE_END(PBE2PARAM)
IMPLEMENT_ASN1_FUNCTIONS(PBE2PARAM)
ASN1_SEQUENCE(PBKDF2PARAM) = {
- ASN1_SIMPLE(PBKDF2PARAM, salt, ASN1_ANY),
- ASN1_SIMPLE(PBKDF2PARAM, iter, ASN1_INTEGER),
- ASN1_OPT(PBKDF2PARAM, keylength, ASN1_INTEGER),
- ASN1_OPT(PBKDF2PARAM, prf, X509_ALGOR)
+ ASN1_SIMPLE(PBKDF2PARAM, salt, ASN1_ANY),
+ ASN1_SIMPLE(PBKDF2PARAM, iter, ASN1_INTEGER),
+ ASN1_OPT(PBKDF2PARAM, keylength, ASN1_INTEGER),
+ ASN1_OPT(PBKDF2PARAM, prf, X509_ALGOR)
} ASN1_SEQUENCE_END(PBKDF2PARAM)
IMPLEMENT_ASN1_FUNCTIONS(PBKDF2PARAM)
@@ -49,9 +49,9 @@ IMPLEMENT_ASN1_FUNCTIONS(PBMAC1PARAM)
*/
X509_ALGOR *PKCS5_pbe2_set_iv_ex(const EVP_CIPHER *cipher, int iter,
- unsigned char *salt, int saltlen,
- unsigned char *aiv, int prf_nid,
- OSSL_LIB_CTX *libctx)
+ unsigned char *salt, int saltlen,
+ unsigned char *aiv, int prf_nid,
+ OSSL_LIB_CTX *libctx)
{
X509_ALGOR *scheme = NULL, *ret = NULL;
int alg_nid, keylen, ivlen;
@@ -105,8 +105,7 @@ X509_ALGOR *PKCS5_pbe2_set_iv_ex(const EVP_CIPHER *cipher, int iter,
* here: just means use default PRF.
*/
ERR_set_mark();
- if ((prf_nid == -1) &&
- EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_PBE_PRF_NID, 0, &prf_nid) <= 0) {
+ if ((prf_nid == -1) && EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_PBE_PRF_NID, 0, &prf_nid) <= 0) {
prf_nid = NID_hmacWithSHA256;
}
ERR_pop_to_mark();
@@ -125,7 +124,7 @@ X509_ALGOR *PKCS5_pbe2_set_iv_ex(const EVP_CIPHER *cipher, int iter,
X509_ALGOR_free(pbe2->keyfunc);
pbe2->keyfunc = PKCS5_pbkdf2_set_ex(iter, salt, saltlen, prf_nid, keylen,
- libctx);
+ libctx);
if (pbe2->keyfunc == NULL) {
ERR_raise(ERR_LIB_ASN1, ERR_R_ASN1_LIB);
@@ -144,7 +143,7 @@ X509_ALGOR *PKCS5_pbe2_set_iv_ex(const EVP_CIPHER *cipher, int iter,
/* Encode PBE2PARAM into parameter */
if (!ASN1_TYPE_pack_sequence(ASN1_ITEM_rptr(PBE2PARAM), pbe2,
- &ret->parameter)) {
+ &ret->parameter)) {
ERR_raise(ERR_LIB_ASN1, ERR_R_ASN1_LIB);
goto err;
}
@@ -154,7 +153,7 @@ X509_ALGOR *PKCS5_pbe2_set_iv_ex(const EVP_CIPHER *cipher, int iter,
return ret;
- err:
+err:
EVP_CIPHER_CTX_free(ctx);
PBE2PARAM_free(pbe2);
/* Note 'scheme' is freed as part of pbe2 */
@@ -164,24 +163,23 @@ X509_ALGOR *PKCS5_pbe2_set_iv_ex(const EVP_CIPHER *cipher, int iter,
}
X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter,
- unsigned char *salt, int saltlen,
- unsigned char *aiv, int prf_nid)
+ unsigned char *salt, int saltlen,
+ unsigned char *aiv, int prf_nid)
{
return PKCS5_pbe2_set_iv_ex(cipher, iter, salt, saltlen, aiv, prf_nid,
- NULL);
+ NULL);
}
X509_ALGOR *PKCS5_pbe2_set(const EVP_CIPHER *cipher, int iter,
- unsigned char *salt, int saltlen)
+ unsigned char *salt, int saltlen)
{
return PKCS5_pbe2_set_iv_ex(cipher, iter, salt, saltlen, NULL, -1,
- NULL);
+ NULL);
}
-
X509_ALGOR *PKCS5_pbkdf2_set_ex(int iter, unsigned char *salt, int saltlen,
- int prf_nid, int keylen,
- OSSL_LIB_CTX *libctx)
+ int prf_nid, int keylen,
+ OSSL_LIB_CTX *libctx)
{
X509_ALGOR *keyfunc = NULL;
PBKDF2PARAM *kdf = NULL;
@@ -208,7 +206,6 @@ X509_ALGOR *PKCS5_pbkdf2_set_ex(int iter, unsigned char *salt, int saltlen,
if ((osalt->data = OPENSSL_malloc(saltlen)) == NULL)
goto err;
-
osalt->length = saltlen;
if (salt) {
@@ -261,7 +258,7 @@ X509_ALGOR *PKCS5_pbkdf2_set_ex(int iter, unsigned char *salt, int saltlen,
/* Encode PBKDF2PARAM into parameter of pbe2 */
if (!ASN1_TYPE_pack_sequence(ASN1_ITEM_rptr(PBKDF2PARAM), kdf,
- &keyfunc->parameter)) {
+ &keyfunc->parameter)) {
ERR_raise(ERR_LIB_ASN1, ERR_R_ASN1_LIB);
goto err;
}
@@ -269,15 +266,14 @@ X509_ALGOR *PKCS5_pbkdf2_set_ex(int iter, unsigned char *salt, int saltlen,
PBKDF2PARAM_free(kdf);
return keyfunc;
- err:
+err:
PBKDF2PARAM_free(kdf);
X509_ALGOR_free(keyfunc);
return NULL;
}
X509_ALGOR *PKCS5_pbkdf2_set(int iter, unsigned char *salt, int saltlen,
- int prf_nid, int keylen)
+ int prf_nid, int keylen)
{
return PKCS5_pbkdf2_set_ex(iter, salt, saltlen, prf_nid, keylen, NULL);
}
-
diff --git a/crypto/asn1/p5_scrypt.c b/crypto/asn1/p5_scrypt.c
index bdff8e4f42..14c672bcb4 100644
--- a/crypto/asn1/p5_scrypt.c
+++ b/crypto/asn1/p5_scrypt.c
@@ -21,27 +21,27 @@
/* PKCS#5 scrypt password based encryption structures */
ASN1_SEQUENCE(SCRYPT_PARAMS) = {
- ASN1_SIMPLE(SCRYPT_PARAMS, salt, ASN1_OCTET_STRING),
- ASN1_SIMPLE(SCRYPT_PARAMS, costParameter, ASN1_INTEGER),
- ASN1_SIMPLE(SCRYPT_PARAMS, blockSize, ASN1_INTEGER),
- ASN1_SIMPLE(SCRYPT_PARAMS, parallelizationParameter, ASN1_INTEGER),
- ASN1_OPT(SCRYPT_PARAMS, keyLength, ASN1_INTEGER),
+ ASN1_SIMPLE(SCRYPT_PARAMS, salt, ASN1_OCTET_STRING),
+ ASN1_SIMPLE(SCRYPT_PARAMS, costParameter, ASN1_INTEGER),
+ ASN1_SIMPLE(SCRYPT_PARAMS, blockSize, ASN1_INTEGER),
+ ASN1_SIMPLE(SCRYPT_PARAMS, parallelizationParameter, ASN1_INTEGER),
+ ASN1_OPT(SCRYPT_PARAMS, keyLength, ASN1_INTEGER),
} ASN1_SEQUENCE_END(SCRYPT_PARAMS)
IMPLEMENT_ASN1_FUNCTIONS(SCRYPT_PARAMS)
static X509_ALGOR *pkcs5_scrypt_set(const unsigned char *salt, int saltlen,
- size_t keylen, uint64_t N, uint64_t r,
- uint64_t p);
+ size_t keylen, uint64_t N, uint64_t r,
+ uint64_t p);
/*
* Return an algorithm identifier for a PKCS#5 v2.0 PBE algorithm using scrypt
*/
X509_ALGOR *PKCS5_pbe2_set_scrypt(const EVP_CIPHER *cipher,
- const unsigned char *salt, int saltlen,
- unsigned char *aiv, uint64_t N, uint64_t r,
- uint64_t p)
+ const unsigned char *salt, int saltlen,
+ unsigned char *aiv, uint64_t N, uint64_t r,
+ uint64_t p)
{
X509_ALGOR *scheme = NULL, *ret = NULL;
int alg_nid;
@@ -135,7 +135,8 @@ X509_ALGOR *PKCS5_pbe2_set_scrypt(const EVP_CIPHER *cipher,
/* Encode PBE2PARAM into parameter */
if (ASN1_TYPE_pack_sequence(ASN1_ITEM_rptr(PBE2PARAM), pbe2,
- &ret->parameter) == NULL) {
+ &ret->parameter)
+ == NULL) {
ERR_raise(ERR_LIB_ASN1, ERR_R_ASN1_LIB);
goto err;
}
@@ -145,7 +146,7 @@ X509_ALGOR *PKCS5_pbe2_set_scrypt(const EVP_CIPHER *cipher,
return ret;
- err:
+err:
PBE2PARAM_free(pbe2);
X509_ALGOR_free(ret);
EVP_CIPHER_CTX_free(ctx);
@@ -154,8 +155,8 @@ X509_ALGOR *PKCS5_pbe2_set_scrypt(const EVP_CIPHER *cipher,
}
static X509_ALGOR *pkcs5_scrypt_set(const unsigned char *salt, int saltlen,
- size_t keylen, uint64_t N, uint64_t r,
- uint64_t p)
+ size_t keylen, uint64_t N, uint64_t r,
+ uint64_t p)
{
X509_ALGOR *keyfunc = NULL;
SCRYPT_PARAMS *sparam = SCRYPT_PARAMS_new();
@@ -219,7 +220,8 @@ static X509_ALGOR *pkcs5_scrypt_set(const unsigned char *salt, int saltlen,
/* Encode SCRYPT_PARAMS into parameter of pbe2 */
if (ASN1_TYPE_pack_sequence(ASN1_ITEM_rptr(SCRYPT_PARAMS), sparam,
- &keyfunc->parameter) == NULL) {
+ &keyfunc->parameter)
+ == NULL) {
ERR_raise(ERR_LIB_ASN1, ERR_R_ASN1_LIB);
goto err;
}
@@ -227,16 +229,16 @@ static X509_ALGOR *pkcs5_scrypt_set(const unsigned char *salt, int saltlen,
SCRYPT_PARAMS_free(sparam);
return keyfunc;
- err:
+err:
SCRYPT_PARAMS_free(sparam);
X509_ALGOR_free(keyfunc);
return NULL;
}
int PKCS5_v2_scrypt_keyivgen_ex(EVP_CIPHER_CTX *ctx, const char *pass,
- int passlen, ASN1_TYPE *param,
- const EVP_CIPHER *c, const EVP_MD *md, int en_de,
- OSSL_LIB_CTX *libctx, const char *propq)
+ int passlen, ASN1_TYPE *param,
+ const EVP_CIPHER *c, const EVP_MD *md, int en_de,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
unsigned char *salt, key[EVP_MAX_KEY_LENGTH];
uint64_t p, r, N;
@@ -281,7 +283,8 @@ int PKCS5_v2_scrypt_keyivgen_ex(EVP_CIPHER_CTX *ctx, const char *pass,
|| ASN1_INTEGER_get_uint64(&r, sparam->blockSize) == 0
|| ASN1_INTEGER_get_uint64(&p, sparam->parallelizationParameter) == 0
|| EVP_PBE_scrypt_ex(NULL, 0, NULL, 0, N, r, p, 0, NULL, 0,
- libctx, propq) == 0) {
+ libctx, propq)
+ == 0) {
ERR_raise(ERR_LIB_EVP, EVP_R_ILLEGAL_SCRYPT_PARAMETERS);
goto err;
}
@@ -291,10 +294,11 @@ int PKCS5_v2_scrypt_keyivgen_ex(EVP_CIPHER_CTX *ctx, const char *pass,
salt = sparam->salt->data;
saltlen = sparam->salt->length;
if (EVP_PBE_scrypt_ex(pass, passlen, salt, saltlen, N, r, p, 0, key,
- keylen, libctx, propq) == 0)
+ keylen, libctx, propq)
+ == 0)
goto err;
rv = EVP_CipherInit_ex(ctx, NULL, NULL, key, NULL, en_de);
- err:
+err:
if (keylen)
OPENSSL_cleanse(key, keylen);
SCRYPT_PARAMS_free(sparam);
@@ -302,8 +306,8 @@ int PKCS5_v2_scrypt_keyivgen_ex(EVP_CIPHER_CTX *ctx, const char *pass,
}
int PKCS5_v2_scrypt_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass,
- int passlen, ASN1_TYPE *param,
- const EVP_CIPHER *c, const EVP_MD *md, int en_de)
+ int passlen, ASN1_TYPE *param,
+ const EVP_CIPHER *c, const EVP_MD *md, int en_de)
{
return PKCS5_v2_scrypt_keyivgen_ex(ctx, pass, passlen, param, c, md, en_de, NULL, NULL);
}
diff --git a/crypto/asn1/p8_pkey.c b/crypto/asn1/p8_pkey.c
index a33445d49e..143f503dea 100644
--- a/crypto/asn1/p8_pkey.c
+++ b/crypto/asn1/p8_pkey.c
@@ -15,7 +15,7 @@
/* Minor tweak to operation: zero private key data */
static int pkey_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
- void *exarg)
+ void *exarg)
{
PKCS8_PRIV_KEY_INFO *key;
int version;
@@ -41,18 +41,18 @@ static int pkey_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
}
ASN1_SEQUENCE_cb(PKCS8_PRIV_KEY_INFO, pkey_cb) = {
- ASN1_SIMPLE(PKCS8_PRIV_KEY_INFO, version, ASN1_INTEGER),
- ASN1_SIMPLE(PKCS8_PRIV_KEY_INFO, pkeyalg, X509_ALGOR),
- ASN1_SIMPLE(PKCS8_PRIV_KEY_INFO, pkey, ASN1_OCTET_STRING),
- ASN1_IMP_SET_OF_OPT(PKCS8_PRIV_KEY_INFO, attributes, X509_ATTRIBUTE, 0),
- ASN1_IMP_OPT(PKCS8_PRIV_KEY_INFO, kpub, ASN1_BIT_STRING, 1)
+ ASN1_SIMPLE(PKCS8_PRIV_KEY_INFO, version, ASN1_INTEGER),
+ ASN1_SIMPLE(PKCS8_PRIV_KEY_INFO, pkeyalg, X509_ALGOR),
+ ASN1_SIMPLE(PKCS8_PRIV_KEY_INFO, pkey, ASN1_OCTET_STRING),
+ ASN1_IMP_SET_OF_OPT(PKCS8_PRIV_KEY_INFO, attributes, X509_ATTRIBUTE, 0),
+ ASN1_IMP_OPT(PKCS8_PRIV_KEY_INFO, kpub, ASN1_BIT_STRING, 1)
} ASN1_SEQUENCE_END_cb(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO)
IMPLEMENT_ASN1_FUNCTIONS(PKCS8_PRIV_KEY_INFO)
int PKCS8_pkey_set0(PKCS8_PRIV_KEY_INFO *priv, ASN1_OBJECT *aobj,
- int version,
- int ptype, void *pval, unsigned char *penc, int penclen)
+ int version,
+ int ptype, void *pval, unsigned char *penc, int penclen)
{
if (version >= 0) {
/* We only support PKCS#8 v1 (0) and v2 (1). */
@@ -69,8 +69,8 @@ int PKCS8_pkey_set0(PKCS8_PRIV_KEY_INFO *priv, ASN1_OBJECT *aobj,
}
int PKCS8_pkey_get0(const ASN1_OBJECT **ppkalg,
- const unsigned char **pk, int *ppklen,
- const X509_ALGOR **pa, const PKCS8_PRIV_KEY_INFO *p8)
+ const unsigned char **pk, int *ppklen,
+ const X509_ALGOR **pa, const PKCS8_PRIV_KEY_INFO *p8)
{
if (ppkalg)
*ppkalg = p8->pkeyalg->algorithm;
@@ -90,7 +90,7 @@ PKCS8_pkey_get0_attrs(const PKCS8_PRIV_KEY_INFO *p8)
}
int PKCS8_pkey_add1_attr_by_NID(PKCS8_PRIV_KEY_INFO *p8, int nid, int type,
- const unsigned char *bytes, int len)
+ const unsigned char *bytes, int len)
{
if (X509at_add1_attr_by_NID(&p8->attributes, nid, type, bytes, len) != NULL)
return 1;
@@ -98,7 +98,7 @@ int PKCS8_pkey_add1_attr_by_NID(PKCS8_PRIV_KEY_INFO *p8, int nid, int type,
}
int PKCS8_pkey_add1_attr_by_OBJ(PKCS8_PRIV_KEY_INFO *p8, const ASN1_OBJECT *obj, int type,
- const unsigned char *bytes, int len)
+ const unsigned char *bytes, int len)
{
return (X509at_add1_attr_by_OBJ(&p8->attributes, obj, type, bytes, len) != NULL);
}
diff --git a/crypto/asn1/t_bitst.c b/crypto/asn1/t_bitst.c
index 51fbadb8cf..bee3f78543 100644
--- a/crypto/asn1/t_bitst.c
+++ b/crypto/asn1/t_bitst.c
@@ -13,7 +13,7 @@
#include <openssl/x509v3.h>
int ASN1_BIT_STRING_name_print(BIO *out, ASN1_BIT_STRING *bs,
- BIT_STRING_BITNAME *tbl, int indent)
+ BIT_STRING_BITNAME *tbl, int indent)
{
BIT_STRING_BITNAME *bnam;
char first = 1;
@@ -42,7 +42,7 @@ int ASN1_BIT_STRING_name_print(BIO *out, ASN1_BIT_STRING *bs,
}
int ASN1_BIT_STRING_set_asc(ASN1_BIT_STRING *bs, const char *name, int value,
- BIT_STRING_BITNAME *tbl)
+ BIT_STRING_BITNAME *tbl)
{
int bitnum;
bitnum = ASN1_BIT_STRING_num_asc(name, tbl);
diff --git a/crypto/asn1/t_pkey.c b/crypto/asn1/t_pkey.c
index ddd3e81d30..b02f43cfbe 100644
--- a/crypto/asn1/t_pkey.c
+++ b/crypto/asn1/t_pkey.c
@@ -34,8 +34,9 @@ int ASN1_buf_print(BIO *bp, const unsigned char *buf, size_t buflen, int indent)
* this function is used to print out key components.
*/
if (BIO_printf(bp, "%02x%s", buf[i],
- (i == buflen - 1) ? "" : ":") <= 0)
- return 0;
+ (i == buflen - 1) ? "" : ":")
+ <= 0)
+ return 0;
}
if (BIO_write(bp, "\n", 1) <= 0)
return 0;
@@ -43,7 +44,7 @@ int ASN1_buf_print(BIO *bp, const unsigned char *buf, size_t buflen, int indent)
}
int ASN1_bn_print(BIO *bp, const char *number, const BIGNUM *num,
- unsigned char *ign, int indent)
+ unsigned char *ign, int indent)
{
int n, rv = 0;
const char *neg;
@@ -63,8 +64,9 @@ int ASN1_bn_print(BIO *bp, const char *number, const BIGNUM *num,
if (BN_num_bytes(num) <= BN_BYTES) {
if (BIO_printf(bp, "%s %s%lu (%s0x%lx)\n", number, neg,
- (unsigned long)bn_get_words(num)[0], neg,
- (unsigned long)bn_get_words(num)[0]) <= 0)
+ (unsigned long)bn_get_words(num)[0], neg,
+ (unsigned long)bn_get_words(num)[0])
+ <= 0)
return 0;
return 1;
}
@@ -74,14 +76,15 @@ int ASN1_bn_print(BIO *bp, const char *number, const BIGNUM *num,
if (buf == NULL)
goto err;
if (BIO_printf(bp, "%s%s\n", number,
- (neg[0] == '-') ? " (Negative)" : "") <= 0)
+ (neg[0] == '-') ? " (Negative)" : "")
+ <= 0)
goto err;
n = BN_bn2bin(num, buf);
if (ASN1_buf_print(bp, buf, n, indent + 4) == 0)
goto err;
rv = 1;
- err:
+err:
OPENSSL_clear_free(buf, buflen);
return rv;
}
diff --git a/crypto/asn1/t_spki.c b/crypto/asn1/t_spki.c
index 2ae765938b..ab5fca73bc 100644
--- a/crypto/asn1/t_spki.c
+++ b/crypto/asn1/t_spki.c
@@ -28,7 +28,7 @@ int NETSCAPE_SPKI_print(BIO *out, const NETSCAPE_SPKI *spki)
X509_PUBKEY_get0_param(&spkioid, NULL, NULL, NULL, spki->spkac->pubkey);
i = OBJ_obj2nid(spkioid);
BIO_printf(out, " Public Key Algorithm: %s\n",
- (i == NID_undef) ? "UNKNOWN" : OBJ_nid2ln(i));
+ (i == NID_undef) ? "UNKNOWN" : OBJ_nid2ln(i));
pkey = X509_PUBKEY_get(spki->spkac->pubkey);
if (pkey == NULL)
BIO_printf(out, " Unable to load public key\n");
@@ -41,7 +41,7 @@ int NETSCAPE_SPKI_print(BIO *out, const NETSCAPE_SPKI *spki)
BIO_printf(out, " Challenge String: %.*s\n", chal->length, chal->data);
i = OBJ_obj2nid(spki->sig_algor.algorithm);
BIO_printf(out, " Signature Algorithm: %s",
- (i == NID_undef) ? "UNKNOWN" : OBJ_nid2ln(i));
+ (i == NID_undef) ? "UNKNOWN" : OBJ_nid2ln(i));
n = spki->signature->length;
s = (char *)spki->signature->data;
@@ -49,7 +49,7 @@ int NETSCAPE_SPKI_print(BIO *out, const NETSCAPE_SPKI *spki)
if ((i % 24) == 0)
BIO_write(out, "\n ", 7);
BIO_printf(out, "%02x%s", (unsigned char)s[i],
- ((i + 1) == n) ? "" : ":");
+ ((i + 1) == n) ? "" : ":");
}
BIO_write(out, "\n", 1);
return 1;
diff --git a/crypto/asn1/tasn_dec.c b/crypto/asn1/tasn_dec.c
index 4fd57b3410..70ea5f0879 100644
--- a/crypto/asn1/tasn_dec.c
+++ b/crypto/asn1/tasn_dec.c
@@ -30,53 +30,76 @@ static int asn1_check_eoc(const unsigned char **in, long len);
static int asn1_find_end(const unsigned char **in, long len, char inf);
static int asn1_collect(BUF_MEM *buf, const unsigned char **in, long len,
- char inf, int tag, int aclass, int depth);
+ char inf, int tag, int aclass, int depth);
static int collect_data(BUF_MEM *buf, const unsigned char **p, long plen);
static int asn1_check_tlen(long *olen, int *otag, unsigned char *oclass,
- char *inf, char *cst,
- const unsigned char **in, long len,
- int exptag, int expclass, char opt, ASN1_TLC *ctx);
+ char *inf, char *cst,
+ const unsigned char **in, long len,
+ int exptag, int expclass, char opt, ASN1_TLC *ctx);
static int asn1_template_ex_d2i(ASN1_VALUE **pval,
- const unsigned char **in, long len,
- const ASN1_TEMPLATE *tt, char opt,
- ASN1_TLC *ctx, int depth, OSSL_LIB_CTX *libctx,
- const char *propq);
+ const unsigned char **in, long len,
+ const ASN1_TEMPLATE *tt, char opt,
+ ASN1_TLC *ctx, int depth, OSSL_LIB_CTX *libctx,
+ const char *propq);
static int asn1_template_noexp_d2i(ASN1_VALUE **val,
- const unsigned char **in, long len,
- const ASN1_TEMPLATE *tt, char opt,
- ASN1_TLC *ctx, int depth,
- OSSL_LIB_CTX *libctx, const char *propq);
+ const unsigned char **in, long len,
+ const ASN1_TEMPLATE *tt, char opt,
+ ASN1_TLC *ctx, int depth,
+ OSSL_LIB_CTX *libctx, const char *propq);
static int asn1_d2i_ex_primitive(ASN1_VALUE **pval,
- const unsigned char **in, long len,
- const ASN1_ITEM *it,
- int tag, int aclass, char opt,
- ASN1_TLC *ctx);
+ const unsigned char **in, long len,
+ const ASN1_ITEM *it,
+ int tag, int aclass, char opt,
+ ASN1_TLC *ctx);
static int asn1_ex_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
- int utype, char *free_cont, const ASN1_ITEM *it);
+ int utype, char *free_cont, const ASN1_ITEM *it);
/* Table to convert tags to bit values, used for MSTRING type */
static const unsigned long tag2bit[32] = {
/* tags 0 - 3 */
- 0, 0, 0, B_ASN1_BIT_STRING,
+ 0,
+ 0,
+ 0,
+ B_ASN1_BIT_STRING,
/* tags 4- 7 */
- B_ASN1_OCTET_STRING, 0, 0, B_ASN1_UNKNOWN,
+ B_ASN1_OCTET_STRING,
+ 0,
+ 0,
+ B_ASN1_UNKNOWN,
/* tags 8-11 */
- B_ASN1_UNKNOWN, B_ASN1_UNKNOWN, 0, B_ASN1_UNKNOWN,
+ B_ASN1_UNKNOWN,
+ B_ASN1_UNKNOWN,
+ 0,
+ B_ASN1_UNKNOWN,
/* tags 12-15 */
- B_ASN1_UTF8STRING, B_ASN1_UNKNOWN, B_ASN1_UNKNOWN, B_ASN1_UNKNOWN,
+ B_ASN1_UTF8STRING,
+ B_ASN1_UNKNOWN,
+ B_ASN1_UNKNOWN,
+ B_ASN1_UNKNOWN,
/* tags 16-19 */
- B_ASN1_SEQUENCE, 0, B_ASN1_NUMERICSTRING, B_ASN1_PRINTABLESTRING,
+ B_ASN1_SEQUENCE,
+ 0,
+ B_ASN1_NUMERICSTRING,
+ B_ASN1_PRINTABLESTRING,
/* tags 20-22 */
- B_ASN1_T61STRING, B_ASN1_VIDEOTEXSTRING, B_ASN1_IA5STRING,
+ B_ASN1_T61STRING,
+ B_ASN1_VIDEOTEXSTRING,
+ B_ASN1_IA5STRING,
/* tags 23-24 */
- B_ASN1_UTCTIME, B_ASN1_GENERALIZEDTIME,
+ B_ASN1_UTCTIME,
+ B_ASN1_GENERALIZEDTIME,
/* tags 25-27 */
- B_ASN1_GRAPHICSTRING, B_ASN1_ISO64STRING, B_ASN1_GENERALSTRING,
+ B_ASN1_GRAPHICSTRING,
+ B_ASN1_ISO64STRING,
+ B_ASN1_GENERALSTRING,
/* tags 28-31 */
- B_ASN1_UNIVERSALSTRING, B_ASN1_UNKNOWN, B_ASN1_BMPSTRING, B_ASN1_UNKNOWN,
+ B_ASN1_UNIVERSALSTRING,
+ B_ASN1_UNKNOWN,
+ B_ASN1_BMPSTRING,
+ B_ASN1_UNKNOWN,
};
unsigned long ASN1_tag2bit(int tag)
@@ -88,9 +111,16 @@ unsigned long ASN1_tag2bit(int tag)
/* Macro to initialize and invalidate the cache */
-#define asn1_tlc_clear(c) do { if ((c) != NULL) (c)->valid = 0; } while (0)
+#define asn1_tlc_clear(c) \
+ do { \
+ if ((c) != NULL) \
+ (c)->valid = 0; \
+ } while (0)
/* Version to avoid compiler warning about 'c' always non-NULL */
-#define asn1_tlc_clear_nc(c) do {(c)->valid = 0; } while (0)
+#define asn1_tlc_clear_nc(c) \
+ do { \
+ (c)->valid = 0; \
+ } while (0)
/*
* Decode an ASN1 item, this currently behaves just like a standard 'd2i'
@@ -100,9 +130,9 @@ unsigned long ASN1_tag2bit(int tag)
*/
static int asn1_item_ex_d2i_intern(ASN1_VALUE **pval, const unsigned char **in,
- long len, const ASN1_ITEM *it, int tag,
- int aclass, char opt, ASN1_TLC *ctx,
- OSSL_LIB_CTX *libctx, const char *propq)
+ long len, const ASN1_ITEM *it, int tag,
+ int aclass, char opt, ASN1_TLC *ctx,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
int rv;
@@ -111,24 +141,24 @@ static int asn1_item_ex_d2i_intern(ASN1_VALUE **pval, const unsigned char **in,
return 0;
}
rv = asn1_item_embed_d2i(pval, in, len, it, tag, aclass, opt, ctx, 0,
- libctx, propq);
+ libctx, propq);
if (rv <= 0)
ASN1_item_ex_free(pval, it);
return rv;
}
int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
- const ASN1_ITEM *it,
- int tag, int aclass, char opt, ASN1_TLC *ctx)
+ const ASN1_ITEM *it,
+ int tag, int aclass, char opt, ASN1_TLC *ctx)
{
return asn1_item_ex_d2i_intern(pval, in, len, it, tag, aclass, opt, ctx,
- NULL, NULL);
+ NULL, NULL);
}
ASN1_VALUE *ASN1_item_d2i_ex(ASN1_VALUE **pval,
- const unsigned char **in, long len,
- const ASN1_ITEM *it, OSSL_LIB_CTX *libctx,
- const char *propq)
+ const unsigned char **in, long len,
+ const ASN1_ITEM *it, OSSL_LIB_CTX *libctx,
+ const char *propq)
{
ASN1_TLC c;
ASN1_VALUE *ptmpval = NULL;
@@ -137,14 +167,15 @@ ASN1_VALUE *ASN1_item_d2i_ex(ASN1_VALUE **pval,
pval = &ptmpval;
asn1_tlc_clear_nc(&c);
if (asn1_item_ex_d2i_intern(pval, in, len, it, -1, 0, 0, &c, libctx,
- propq) > 0)
+ propq)
+ > 0)
return *pval;
return NULL;
}
ASN1_VALUE *ASN1_item_d2i(ASN1_VALUE **pval,
- const unsigned char **in, long len,
- const ASN1_ITEM *it)
+ const unsigned char **in, long len,
+ const ASN1_ITEM *it)
{
return ASN1_item_d2i_ex(pval, in, len, it, NULL, NULL);
}
@@ -155,10 +186,10 @@ ASN1_VALUE *ASN1_item_d2i(ASN1_VALUE **pval,
*/
int asn1_item_embed_d2i(ASN1_VALUE **pval, const unsigned char **in,
- long len, const ASN1_ITEM *it,
- int tag, int aclass, char opt, ASN1_TLC *ctx,
- int depth, OSSL_LIB_CTX *libctx,
- const char *propq)
+ long len, const ASN1_ITEM *it,
+ int tag, int aclass, char opt, ASN1_TLC *ctx,
+ int depth, OSSL_LIB_CTX *libctx,
+ const char *propq)
{
const ASN1_TEMPLATE *tt, *errtt = NULL;
const ASN1_EXTERN_FUNCS *ef;
@@ -203,14 +234,14 @@ int asn1_item_embed_d2i(ASN1_VALUE **pval, const unsigned char **in,
*/
if ((tag != -1) || opt) {
ERR_raise(ERR_LIB_ASN1,
- ASN1_R_ILLEGAL_OPTIONS_ON_ITEM_TEMPLATE);
+ ASN1_R_ILLEGAL_OPTIONS_ON_ITEM_TEMPLATE);
goto err;
}
return asn1_template_ex_d2i(pval, in, len, it->templates, opt, ctx,
- depth, libctx, propq);
+ depth, libctx, propq);
}
return asn1_d2i_ex_primitive(pval, in, len, it,
- tag, aclass, opt, ctx);
+ tag, aclass, opt, ctx);
case ASN1_ITYPE_MSTRING:
/*
@@ -225,7 +256,7 @@ int asn1_item_embed_d2i(ASN1_VALUE **pval, const unsigned char **in,
p = *in;
/* Just read in tag and class */
ret = asn1_check_tlen(NULL, &otag, &oclass, NULL, NULL,
- &p, len, -1, 0, 1, ctx);
+ &p, len, -1, 0, 1, ctx);
if (!ret) {
ERR_raise(ERR_LIB_ASN1, ERR_R_NESTED_ASN1_ERROR);
goto err;
@@ -255,7 +286,7 @@ int asn1_item_embed_d2i(ASN1_VALUE **pval, const unsigned char **in,
ef = it->funcs;
if (ef->asn1_ex_d2i_ex != NULL)
return ef->asn1_ex_d2i_ex(pval, in, len, it, tag, aclass, opt, ctx,
- libctx, propq);
+ libctx, propq);
return ef->asn1_ex_d2i(pval, in, len, it, tag, aclass, opt, ctx);
case ASN1_ITYPE_CHOICE:
@@ -291,7 +322,7 @@ int asn1_item_embed_d2i(ASN1_VALUE **pval, const unsigned char **in,
* We mark field as OPTIONAL so its absence can be recognised.
*/
ret = asn1_template_ex_d2i(pchptr, &p, len, tt, 1, ctx, depth,
- libctx, propq);
+ libctx, propq);
/* If field not present, try the next one */
if (ret == -1)
continue;
@@ -339,7 +370,7 @@ int asn1_item_embed_d2i(ASN1_VALUE **pval, const unsigned char **in,
}
/* Get SEQUENCE length and update len, p */
ret = asn1_check_tlen(&len, NULL, NULL, &seq_eoc, &cst,
- &p, len, tag, aclass, opt, ctx);
+ &p, len, tag, aclass, opt, ctx);
if (!ret) {
ERR_raise(ERR_LIB_ASN1, ERR_R_NESTED_ASN1_ERROR);
goto err;
@@ -358,7 +389,7 @@ int asn1_item_embed_d2i(ASN1_VALUE **pval, const unsigned char **in,
}
if (*pval == NULL
- && !ossl_asn1_item_ex_new_intern(pval, it, libctx, propq)) {
+ && !ossl_asn1_item_ex_new_intern(pval, it, libctx, propq)) {
ERR_raise(ERR_LIB_ASN1, ERR_R_NESTED_ASN1_ERROR);
goto err;
}
@@ -415,7 +446,7 @@ int asn1_item_embed_d2i(ASN1_VALUE **pval, const unsigned char **in,
*/
ret = asn1_template_ex_d2i(pseqval, &p, len, seqtt, isopt, ctx,
- depth, libctx, propq);
+ depth, libctx, propq);
if (!ret) {
errtt = seqtt;
goto err;
@@ -472,12 +503,12 @@ int asn1_item_embed_d2i(ASN1_VALUE **pval, const unsigned char **in,
default:
return 0;
}
- auxerr:
+auxerr:
ERR_raise(ERR_LIB_ASN1, ASN1_R_AUX_ERROR);
- err:
+err:
if (errtt)
ERR_add_error_data(4, "Field=", errtt->field_name,
- ", Type=", it->sname);
+ ", Type=", it->sname);
else
ERR_add_error_data(2, "Type=", it->sname);
return 0;
@@ -489,10 +520,10 @@ int asn1_item_embed_d2i(ASN1_VALUE **pval, const unsigned char **in,
*/
static int asn1_template_ex_d2i(ASN1_VALUE **val,
- const unsigned char **in, long inlen,
- const ASN1_TEMPLATE *tt, char opt,
- ASN1_TLC *ctx, int depth,
- OSSL_LIB_CTX *libctx, const char *propq)
+ const unsigned char **in, long inlen,
+ const ASN1_TEMPLATE *tt, char opt,
+ ASN1_TLC *ctx, int depth,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
int flags, aclass;
int ret;
@@ -514,7 +545,7 @@ static int asn1_template_ex_d2i(ASN1_VALUE **val,
* where it starts: so read in EXPLICIT header to get the info.
*/
ret = asn1_check_tlen(&len, NULL, NULL, &exp_eoc, &cst,
- &p, inlen, tt->tag, aclass, opt, ctx);
+ &p, inlen, tt->tag, aclass, opt, ctx);
q = p;
if (!ret) {
ERR_raise(ERR_LIB_ASN1, ERR_R_NESTED_ASN1_ERROR);
@@ -527,7 +558,7 @@ static int asn1_template_ex_d2i(ASN1_VALUE **val,
}
/* We've found the field so it can't be OPTIONAL now */
ret = asn1_template_noexp_d2i(val, &p, len, tt, 0, ctx, depth, libctx,
- propq);
+ propq);
if (!ret) {
ERR_raise(ERR_LIB_ASN1, ERR_R_NESTED_ASN1_ERROR);
return 0;
@@ -551,20 +582,20 @@ static int asn1_template_ex_d2i(ASN1_VALUE **val,
}
} else
return asn1_template_noexp_d2i(val, in, inlen, tt, opt, ctx, depth,
- libctx, propq);
+ libctx, propq);
*in = p;
return 1;
- err:
+err:
return 0;
}
static int asn1_template_noexp_d2i(ASN1_VALUE **val,
- const unsigned char **in, long len,
- const ASN1_TEMPLATE *tt, char opt,
- ASN1_TLC *ctx, int depth,
- OSSL_LIB_CTX *libctx, const char *propq)
+ const unsigned char **in, long len,
+ const ASN1_TEMPLATE *tt, char opt,
+ ASN1_TLC *ctx, int depth,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
int flags, aclass;
int ret;
@@ -603,7 +634,7 @@ static int asn1_template_noexp_d2i(ASN1_VALUE **val,
}
/* Get the tag */
ret = asn1_check_tlen(&len, NULL, NULL, &sk_eoc, NULL,
- &p, len, sktag, skaclass, opt, ctx);
+ &p, len, sktag, skaclass, opt, ctx);
if (!ret) {
ERR_raise(ERR_LIB_ASN1, ERR_R_NESTED_ASN1_ERROR);
return 0;
@@ -644,8 +675,9 @@ static int asn1_template_noexp_d2i(ASN1_VALUE **val,
}
skfield = NULL;
if (asn1_item_embed_d2i(&skfield, &p, len,
- ASN1_ITEM_ptr(tt->item), -1, 0, 0, ctx,
- depth, libctx, propq) <= 0) {
+ ASN1_ITEM_ptr(tt->item), -1, 0, 0, ctx,
+ depth, libctx, propq)
+ <= 0) {
ERR_raise(ERR_LIB_ASN1, ERR_R_NESTED_ASN1_ERROR);
/* |skfield| may be partially allocated despite failure. */
ASN1_item_free(skfield, ASN1_ITEM_ptr(tt->item));
@@ -665,8 +697,8 @@ static int asn1_template_noexp_d2i(ASN1_VALUE **val,
} else if (flags & ASN1_TFLG_IMPTAG) {
/* IMPLICIT tagging */
ret = asn1_item_embed_d2i(val, &p, len,
- ASN1_ITEM_ptr(tt->item), tt->tag, aclass, opt,
- ctx, depth, libctx, propq);
+ ASN1_ITEM_ptr(tt->item), tt->tag, aclass, opt,
+ ctx, depth, libctx, propq);
if (!ret) {
ERR_raise(ERR_LIB_ASN1, ERR_R_NESTED_ASN1_ERROR);
goto err;
@@ -675,7 +707,7 @@ static int asn1_template_noexp_d2i(ASN1_VALUE **val,
} else {
/* Nothing special */
ret = asn1_item_embed_d2i(val, &p, len, ASN1_ITEM_ptr(tt->item),
- -1, 0, opt, ctx, depth, libctx, propq);
+ -1, 0, opt, ctx, depth, libctx, propq);
if (!ret) {
ERR_raise(ERR_LIB_ASN1, ERR_R_NESTED_ASN1_ERROR);
goto err;
@@ -686,14 +718,14 @@ static int asn1_template_noexp_d2i(ASN1_VALUE **val,
*in = p;
return 1;
- err:
+err:
return 0;
}
static int asn1_d2i_ex_primitive(ASN1_VALUE **pval,
- const unsigned char **in, long inlen,
- const ASN1_ITEM *it,
- int tag, int aclass, char opt, ASN1_TLC *ctx)
+ const unsigned char **in, long inlen,
+ const ASN1_ITEM *it,
+ int tag, int aclass, char opt, ASN1_TLC *ctx)
{
int ret = 0, utype;
long plen;
@@ -705,7 +737,7 @@ static int asn1_d2i_ex_primitive(ASN1_VALUE **pval,
if (pval == NULL) {
ERR_raise(ERR_LIB_ASN1, ASN1_R_ILLEGAL_NULL);
- return 0; /* Should never happen */
+ return 0; /* Should never happen */
}
if (it->itype == ASN1_ITYPE_MSTRING) {
@@ -727,7 +759,7 @@ static int asn1_d2i_ex_primitive(ASN1_VALUE **pval,
}
p = *in;
ret = asn1_check_tlen(NULL, &utype, &oclass, NULL, NULL,
- &p, inlen, -1, 0, 0, ctx);
+ &p, inlen, -1, 0, 0, ctx);
if (!ret) {
ERR_raise(ERR_LIB_ASN1, ERR_R_NESTED_ASN1_ERROR);
return 0;
@@ -742,7 +774,7 @@ static int asn1_d2i_ex_primitive(ASN1_VALUE **pval,
p = *in;
/* Check header */
ret = asn1_check_tlen(&plen, NULL, NULL, &inf, &cst,
- &p, inlen, tag, aclass, opt, ctx);
+ &p, inlen, tag, aclass, opt, ctx);
if (!ret) {
ERR_raise(ERR_LIB_ASN1, ERR_R_NESTED_ASN1_ERROR);
return 0;
@@ -815,7 +847,7 @@ static int asn1_d2i_ex_primitive(ASN1_VALUE **pval,
*in = p;
ret = 1;
- err:
+err:
if (free_cont)
OPENSSL_free(buf.data);
return ret;
@@ -824,7 +856,7 @@ static int asn1_d2i_ex_primitive(ASN1_VALUE **pval,
/* Translate ASN1 content octets into a structure */
static int asn1_ex_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
- int utype, char *free_cont, const ASN1_ITEM *it)
+ int utype, char *free_cont, const ASN1_ITEM *it)
{
ASN1_VALUE **opval = NULL;
ASN1_STRING *stmp;
@@ -955,7 +987,7 @@ static int asn1_ex_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
typ->value.ptr = NULL;
ret = 1;
- err:
+err:
if (!ret) {
ASN1_TYPE_free(typ);
if (opval)
@@ -999,7 +1031,7 @@ static int asn1_find_end(const unsigned char **in, long len, char inf)
q = p;
/* Just read in a header: only care about the length */
if (!asn1_check_tlen(&plen, NULL, NULL, &inf, NULL, &p, len,
- -1, 0, 0, NULL)) {
+ -1, 0, 0, NULL)) {
ERR_raise(ERR_LIB_ASN1, ERR_R_NESTED_ASN1_ERROR);
return 0;
}
@@ -1035,11 +1067,11 @@ static int asn1_find_end(const unsigned char **in, long len, char inf)
* recursion is allowed at all. Although zero should be adequate examples
* exist that require a value of 1. So 5 should be more than enough.
*/
-# define ASN1_MAX_STRING_NEST 5
+#define ASN1_MAX_STRING_NEST 5
#endif
static int asn1_collect(BUF_MEM *buf, const unsigned char **in, long len,
- char inf, int tag, int aclass, int depth)
+ char inf, int tag, int aclass, int depth)
{
const unsigned char *p, *q;
long plen;
@@ -1070,7 +1102,7 @@ static int asn1_collect(BUF_MEM *buf, const unsigned char **in, long len,
}
if (!asn1_check_tlen(&plen, NULL, NULL, &ininf, &cst, &p,
- len, tag, aclass, 0, NULL)) {
+ len, tag, aclass, 0, NULL)) {
ERR_raise(ERR_LIB_ASN1, ERR_R_NESTED_ASN1_ERROR);
return 0;
}
@@ -1139,9 +1171,9 @@ static int asn1_check_eoc(const unsigned char **in, long len)
*/
static int asn1_check_tlen(long *olen, int *otag, unsigned char *oclass,
- char *inf, char *cst,
- const unsigned char **in, long len,
- int exptag, int expclass, char opt, ASN1_TLC *ctx)
+ char *inf, char *cst,
+ const unsigned char **in, long len,
+ int exptag, int expclass, char opt, ASN1_TLC *ctx)
{
int i;
int ptag, pclass;
@@ -1222,7 +1254,7 @@ static int asn1_check_tlen(long *olen, int *otag, unsigned char *oclass,
*in = p;
return 1;
- err:
+err:
asn1_tlc_clear(ctx);
return 0;
}
diff --git a/crypto/asn1/tasn_enc.c b/crypto/asn1/tasn_enc.c
index f302b4b2e1..8dea9f3653 100644
--- a/crypto/asn1/tasn_enc.c
+++ b/crypto/asn1/tasn_enc.c
@@ -17,17 +17,17 @@
#include "asn1_local.h"
static int asn1_i2d_ex_primitive(const ASN1_VALUE **pval, unsigned char **out,
- const ASN1_ITEM *it, int tag, int aclass);
+ const ASN1_ITEM *it, int tag, int aclass);
static int asn1_set_seq_out(STACK_OF(const_ASN1_VALUE) *sk,
- unsigned char **out,
- int skcontlen, const ASN1_ITEM *item,
- int do_sort, int iclass);
+ unsigned char **out,
+ int skcontlen, const ASN1_ITEM *item,
+ int do_sort, int iclass);
static int asn1_template_ex_i2d(const ASN1_VALUE **pval, unsigned char **out,
- const ASN1_TEMPLATE *tt, int tag, int aclass);
+ const ASN1_TEMPLATE *tt, int tag, int aclass);
static int asn1_item_flags_i2d(const ASN1_VALUE *val, unsigned char **out,
- const ASN1_ITEM *it, int flags);
+ const ASN1_ITEM *it, int flags);
static int asn1_ex_i2c(const ASN1_VALUE **pval, unsigned char *cout, int *putype,
- const ASN1_ITEM *it);
+ const ASN1_ITEM *it);
/*
* Top level i2d equivalents: the 'ndef' variant instructs the encoder to use
@@ -35,7 +35,7 @@ static int asn1_ex_i2c(const ASN1_VALUE **pval, unsigned char *cout, int *putype
*/
int ASN1_item_ndef_i2d(const ASN1_VALUE *val, unsigned char **out,
- const ASN1_ITEM *it)
+ const ASN1_ITEM *it)
{
return asn1_item_flags_i2d(val, out, it, ASN1_TFLG_NDEF);
}
@@ -53,7 +53,7 @@ int ASN1_item_i2d(const ASN1_VALUE *val, unsigned char **out, const ASN1_ITEM *i
*/
static int asn1_item_flags_i2d(const ASN1_VALUE *val, unsigned char **out,
- const ASN1_ITEM *it, int flags)
+ const ASN1_ITEM *it, int flags)
{
if (out != NULL && *out == NULL) {
unsigned char *p, *buf;
@@ -79,7 +79,7 @@ static int asn1_item_flags_i2d(const ASN1_VALUE *val, unsigned char **out,
*/
int ASN1_item_ex_i2d(const ASN1_VALUE **pval, unsigned char **out,
- const ASN1_ITEM *it, int tag, int aclass)
+ const ASN1_ITEM *it, int tag, int aclass)
{
const ASN1_TEMPLATE *tt = NULL;
int i, seqcontlen, seqlen, ndef = 1;
@@ -92,7 +92,7 @@ int ASN1_item_ex_i2d(const ASN1_VALUE **pval, unsigned char **out,
if (aux != NULL) {
asn1_cb = ((aux->flags & ASN1_AFLG_CONST_CB) != 0) ? aux->asn1_const_cb
- : (ASN1_aux_const_cb *)aux->asn1_cb; /* backward compatibility */
+ : (ASN1_aux_const_cb *)aux->asn1_cb; /* backward compatibility */
}
switch (it->itype) {
@@ -100,7 +100,7 @@ int ASN1_item_ex_i2d(const ASN1_VALUE **pval, unsigned char **out,
case ASN1_ITYPE_PRIMITIVE:
if (it->templates)
return asn1_template_ex_i2d(pval, out, it->templates,
- tag, aclass);
+ tag, aclass);
return asn1_i2d_ex_primitive(pval, out, it, tag, aclass);
case ASN1_ITYPE_MSTRING:
@@ -206,13 +206,12 @@ int ASN1_item_ex_i2d(const ASN1_VALUE **pval, unsigned char **out,
default:
return 0;
-
}
return 0;
}
static int asn1_template_ex_i2d(const ASN1_VALUE **pval, unsigned char **out,
- const ASN1_TEMPLATE *tt, int tag, int iclass)
+ const ASN1_TEMPLATE *tt, int tag, int iclass)
{
const int flags = tt->flags;
int i, ret, ttag, tclass, ndef, len;
@@ -303,7 +302,7 @@ static int asn1_template_ex_i2d(const ASN1_VALUE **pval, unsigned char **out,
for (i = 0; i < sk_const_ASN1_VALUE_num(sk); i++) {
skitem = sk_const_ASN1_VALUE_value(sk, i);
len = ASN1_item_ex_i2d(&skitem, NULL, ASN1_ITEM_ptr(tt->item),
- -1, iclass);
+ -1, iclass);
if (len == -1 || (skcontlen > INT_MAX - len))
return -1;
if (len == 0 && (tt->flags & ASN1_TFLG_OPTIONAL) == 0) {
@@ -332,7 +331,7 @@ static int asn1_template_ex_i2d(const ASN1_VALUE **pval, unsigned char **out,
ASN1_put_object(out, ndef, skcontlen, sktag, skaclass);
/* And the stuff itself */
asn1_set_seq_out(sk, out, skcontlen, ASN1_ITEM_ptr(tt->item),
- isset, iclass);
+ isset, iclass);
if (ndef == 2) {
ASN1_put_eoc(out);
if (flags & ASN1_TFLG_EXPTAG)
@@ -367,7 +366,7 @@ static int asn1_template_ex_i2d(const ASN1_VALUE **pval, unsigned char **out,
/* Either normal or IMPLICIT tagging: combine class and flags */
len = ASN1_item_ex_i2d(pval, out, ASN1_ITEM_ptr(tt->item),
- ttag, tclass | iclass);
+ ttag, tclass | iclass);
if (len == 0 && (tt->flags & ASN1_TFLG_OPTIONAL) == 0) {
ERR_raise(ERR_LIB_ASN1, ASN1_R_ILLEGAL_ZERO_CONTENT);
return -1;
@@ -397,9 +396,9 @@ static int der_cmp(const void *a, const void *b)
/* Output the content octets of SET OF or SEQUENCE OF */
static int asn1_set_seq_out(STACK_OF(const_ASN1_VALUE) *sk,
- unsigned char **out,
- int skcontlen, const ASN1_ITEM *item,
- int do_sort, int iclass)
+ unsigned char **out,
+ int skcontlen, const ASN1_ITEM *item,
+ int do_sort, int iclass)
{
int i, ret = 0;
const ASN1_VALUE *skitem;
@@ -412,7 +411,7 @@ static int asn1_set_seq_out(STACK_OF(const_ASN1_VALUE) *sk,
do_sort = 0;
else {
derlst = OPENSSL_malloc(sk_const_ASN1_VALUE_num(sk)
- * sizeof(*derlst));
+ * sizeof(*derlst));
if (derlst == NULL)
return 0;
tmpdat = OPENSSL_malloc(skcontlen);
@@ -460,7 +459,7 @@ err:
}
static int asn1_i2d_ex_primitive(const ASN1_VALUE **pval, unsigned char **out,
- const ASN1_ITEM *it, int tag, int aclass)
+ const ASN1_ITEM *it, int tag, int aclass)
{
int len;
int utype;
@@ -480,8 +479,7 @@ static int asn1_i2d_ex_primitive(const ASN1_VALUE **pval, unsigned char **out,
* octets so don't include tag+length. We need to check here because the
* call to asn1_ex_i2c() could change utype.
*/
- if ((utype == V_ASN1_SEQUENCE) || (utype == V_ASN1_SET) ||
- (utype == V_ASN1_OTHER))
+ if ((utype == V_ASN1_SEQUENCE) || (utype == V_ASN1_SET) || (utype == V_ASN1_OTHER))
usetag = 0;
else
usetag = 1;
@@ -520,7 +518,7 @@ static int asn1_i2d_ex_primitive(const ASN1_VALUE **pval, unsigned char **out,
/* Produce content octets from a structure */
static int asn1_ex_i2c(const ASN1_VALUE **pval, unsigned char *cout, int *putype,
- const ASN1_ITEM *it)
+ const ASN1_ITEM *it)
{
ASN1_BOOLEAN *tbool = NULL;
ASN1_STRING *strtmp;
@@ -593,7 +591,7 @@ static int asn1_ex_i2c(const ASN1_VALUE **pval, unsigned char *cout, int *putype
case V_ASN1_BIT_STRING:
return ossl_i2c_ASN1_BIT_STRING((ASN1_BIT_STRING *)*pval,
- cout ? &cout : NULL);
+ cout ? &cout : NULL);
case V_ASN1_INTEGER:
case V_ASN1_ENUMERATED:
@@ -635,7 +633,6 @@ static int asn1_ex_i2c(const ASN1_VALUE **pval, unsigned char *cout, int *putype
len = strtmp->length;
break;
-
}
if (cout && len)
memcpy(cout, cont, len);
diff --git a/crypto/asn1/tasn_new.c b/crypto/asn1/tasn_new.c
index 00a5397a5e..721bb14b2a 100644
--- a/crypto/asn1/tasn_new.c
+++ b/crypto/asn1/tasn_new.c
@@ -16,13 +16,13 @@
#include "asn1_local.h"
static int asn1_item_embed_new(ASN1_VALUE **pval, const ASN1_ITEM *it,
- int embed, OSSL_LIB_CTX *libctx,
- const char *propq);
+ int embed, OSSL_LIB_CTX *libctx,
+ const char *propq);
static int asn1_primitive_new(ASN1_VALUE **pval, const ASN1_ITEM *it,
- int embed);
+ int embed);
static void asn1_item_clear(ASN1_VALUE **pval, const ASN1_ITEM *it);
static int asn1_template_new(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt,
- OSSL_LIB_CTX *libctx, const char *propq);
+ OSSL_LIB_CTX *libctx, const char *propq);
static void asn1_template_clear(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt);
static void asn1_primitive_clear(ASN1_VALUE **pval, const ASN1_ITEM *it);
@@ -35,7 +35,7 @@ ASN1_VALUE *ASN1_item_new(const ASN1_ITEM *it)
}
ASN1_VALUE *ASN1_item_new_ex(const ASN1_ITEM *it, OSSL_LIB_CTX *libctx,
- const char *propq)
+ const char *propq)
{
ASN1_VALUE *ret = NULL;
if (asn1_item_embed_new(&ret, it, 0, libctx, propq) > 0)
@@ -45,9 +45,8 @@ ASN1_VALUE *ASN1_item_new_ex(const ASN1_ITEM *it, OSSL_LIB_CTX *libctx,
/* Allocate an ASN1 structure */
-
int ossl_asn1_item_ex_new_intern(ASN1_VALUE **pval, const ASN1_ITEM *it,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_LIB_CTX *libctx, const char *propq)
{
return asn1_item_embed_new(pval, it, 0, libctx, propq);
}
@@ -58,7 +57,7 @@ int ASN1_item_ex_new(ASN1_VALUE **pval, const ASN1_ITEM *it)
}
int asn1_item_embed_new(ASN1_VALUE **pval, const ASN1_ITEM *it, int embed,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_LIB_CTX *libctx, const char *propq)
{
const ASN1_TEMPLATE *tt = NULL;
const ASN1_EXTERN_FUNCS *ef;
@@ -157,18 +156,17 @@ int asn1_item_embed_new(ASN1_VALUE **pval, const ASN1_ITEM *it, int embed,
}
return 1;
- asn1err2:
+asn1err2:
ossl_asn1_item_embed_free(pval, it, embed);
- asn1err:
+asn1err:
ERR_raise(ERR_LIB_ASN1, ERR_R_ASN1_LIB);
return 0;
- auxerr2:
+auxerr2:
ossl_asn1_item_embed_free(pval, it, embed);
- auxerr:
+auxerr:
ERR_raise(ERR_LIB_ASN1, ASN1_R_AUX_ERROR);
return 0;
-
}
static void asn1_item_clear(ASN1_VALUE **pval, const ASN1_ITEM *it)
@@ -205,7 +203,7 @@ static void asn1_item_clear(ASN1_VALUE **pval, const ASN1_ITEM *it)
}
static int asn1_template_new(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_LIB_CTX *libctx, const char *propq)
{
const ASN1_ITEM *it = ASN1_ITEM_ptr(tt->item);
int embed = tt->flags & ASN1_TFLG_EMBED;
@@ -240,7 +238,7 @@ static int asn1_template_new(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt,
}
/* Otherwise pass it back to the item routine */
ret = asn1_item_embed_new(pval, it, embed, libctx, propq);
- done:
+done:
return ret;
}
@@ -259,7 +257,7 @@ static void asn1_template_clear(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt)
*/
static int asn1_primitive_new(ASN1_VALUE **pval, const ASN1_ITEM *it,
- int embed)
+ int embed)
{
ASN1_TYPE *typ;
ASN1_STRING *str;
diff --git a/crypto/asn1/tasn_prn.c b/crypto/asn1/tasn_prn.c
index 73eadc5fd4..080b5623e4 100644
--- a/crypto/asn1/tasn_prn.c
+++ b/crypto/asn1/tasn_prn.c
@@ -26,10 +26,10 @@
static ASN1_PCTX default_pctx = {
ASN1_PCTX_FLAGS_SHOW_ABSENT, /* flags */
- 0, /* nm_flags */
- 0, /* cert_flags */
- 0, /* oid_flags */
- 0 /* str_flags */
+ 0, /* nm_flags */
+ 0, /* cert_flags */
+ 0, /* oid_flags */
+ 0 /* str_flags */
};
ASN1_PCTX *ASN1_PCTX_new(void)
@@ -100,24 +100,24 @@ void ASN1_PCTX_set_str_flags(ASN1_PCTX *p, unsigned long flags)
/* Main print routines */
static int asn1_item_print_ctx(BIO *out, const ASN1_VALUE **fld, int indent,
- const ASN1_ITEM *it,
- const char *fname, const char *sname,
- int nohdr, const ASN1_PCTX *pctx);
+ const ASN1_ITEM *it,
+ const char *fname, const char *sname,
+ int nohdr, const ASN1_PCTX *pctx);
static int asn1_template_print_ctx(BIO *out, const ASN1_VALUE **fld, int indent,
- const ASN1_TEMPLATE *tt, const ASN1_PCTX *pctx);
+ const ASN1_TEMPLATE *tt, const ASN1_PCTX *pctx);
static int asn1_primitive_print(BIO *out, const ASN1_VALUE **fld,
- const ASN1_ITEM *it, int indent,
- const char *fname, const char *sname,
- const ASN1_PCTX *pctx);
+ const ASN1_ITEM *it, int indent,
+ const char *fname, const char *sname,
+ const ASN1_PCTX *pctx);
static int asn1_print_fsname(BIO *out, int indent,
- const char *fname, const char *sname,
- const ASN1_PCTX *pctx);
+ const char *fname, const char *sname,
+ const ASN1_PCTX *pctx);
int ASN1_item_print(BIO *out, const ASN1_VALUE *ifld, int indent,
- const ASN1_ITEM *it, const ASN1_PCTX *pctx)
+ const ASN1_ITEM *it, const ASN1_PCTX *pctx)
{
const char *sname;
if (pctx == NULL)
@@ -130,9 +130,9 @@ int ASN1_item_print(BIO *out, const ASN1_VALUE *ifld, int indent,
}
static int asn1_item_print_ctx(BIO *out, const ASN1_VALUE **fld, int indent,
- const ASN1_ITEM *it,
- const char *fname, const char *sname,
- int nohdr, const ASN1_PCTX *pctx)
+ const ASN1_ITEM *it,
+ const char *fname, const char *sname,
+ int nohdr, const ASN1_PCTX *pctx)
{
const ASN1_TEMPLATE *tt;
const ASN1_EXTERN_FUNCS *ef;
@@ -146,11 +146,12 @@ static int asn1_item_print_ctx(BIO *out, const ASN1_VALUE **fld, int indent,
parg.indent = indent;
parg.pctx = pctx;
asn1_cb = ((aux->flags & ASN1_AFLG_CONST_CB) != 0) ? aux->asn1_const_cb
- : (ASN1_aux_const_cb *)aux->asn1_cb; /* backward compatibility */
+ : (ASN1_aux_const_cb *)aux->asn1_cb; /* backward compatibility */
}
- if (((it->itype != ASN1_ITYPE_PRIMITIVE)
- || (it->utype != V_ASN1_BOOLEAN)) && *fld == NULL) {
+ if (((it->itype != ASN1_ITYPE_PRIMITIVE)
+ || (it->utype != V_ASN1_BOOLEAN))
+ && *fld == NULL) {
if (pctx->flags & ASN1_PCTX_FLAGS_SHOW_ABSENT) {
if (!nohdr && !asn1_print_fsname(out, indent, fname, sname, pctx))
return 0;
@@ -164,7 +165,7 @@ static int asn1_item_print_ctx(BIO *out, const ASN1_VALUE **fld, int indent,
case ASN1_ITYPE_PRIMITIVE:
if (it->templates) {
if (!asn1_template_print_ctx(out, fld, indent,
- it->templates, pctx))
+ it->templates, pctx))
return 0;
break;
}
@@ -186,8 +187,7 @@ static int asn1_item_print_ctx(BIO *out, const ASN1_VALUE **fld, int indent,
if ((i == 2) && (BIO_puts(out, "\n") <= 0))
return 0;
return 1;
- } else if (sname &&
- BIO_printf(out, ":EXTERNAL TYPE %s\n", sname) <= 0)
+ } else if (sname && BIO_printf(out, ":EXTERNAL TYPE %s\n", sname) <= 0)
return 0;
break;
@@ -236,7 +236,7 @@ static int asn1_item_print_ctx(BIO *out, const ASN1_VALUE **fld, int indent,
return 0;
tmpfld = ossl_asn1_get_const_field_ptr(fld, seqtt);
if (!asn1_template_print_ctx(out, tmpfld,
- indent + 2, seqtt, pctx))
+ indent + 2, seqtt, pctx))
return 0;
}
if (pctx->flags & ASN1_PCTX_FLAGS_SHOW_SEQUENCE) {
@@ -260,7 +260,7 @@ static int asn1_item_print_ctx(BIO *out, const ASN1_VALUE **fld, int indent,
}
static int asn1_template_print_ctx(BIO *out, const ASN1_VALUE **fld, int indent,
- const ASN1_TEMPLATE *tt, const ASN1_PCTX *pctx)
+ const ASN1_TEMPLATE *tt, const ASN1_PCTX *pctx)
{
int i, flags;
const char *sname, *fname;
@@ -297,7 +297,8 @@ static int asn1_template_print_ctx(BIO *out, const ASN1_VALUE **fld, int indent,
else
tname = "SEQUENCE";
if (BIO_printf(out, "%*s%s OF %s {\n",
- indent, "", tname, tt->field_name) <= 0)
+ indent, "", tname, tt->field_name)
+ <= 0)
return 0;
} else if (BIO_printf(out, "%*s%s:\n", indent, "", fname) <= 0)
return 0;
@@ -309,12 +310,11 @@ static int asn1_template_print_ctx(BIO *out, const ASN1_VALUE **fld, int indent,
skitem = sk_const_ASN1_VALUE_value(stack, i);
if (!asn1_item_print_ctx(out, &skitem, indent + 2,
- ASN1_ITEM_ptr(tt->item), NULL, NULL, 1,
- pctx))
+ ASN1_ITEM_ptr(tt->item), NULL, NULL, 1,
+ pctx))
return 0;
}
- if (i == 0 && BIO_printf(out, "%*s<%s>\n", indent + 2, "",
- stack == NULL ? "ABSENT" : "EMPTY") <= 0)
+ if (i == 0 && BIO_printf(out, "%*s<%s>\n", indent + 2, "", stack == NULL ? "ABSENT" : "EMPTY") <= 0)
return 0;
if (pctx->flags & ASN1_PCTX_FLAGS_SHOW_SEQUENCE) {
if (BIO_printf(out, "%*s}\n", indent, "") <= 0)
@@ -323,12 +323,12 @@ static int asn1_template_print_ctx(BIO *out, const ASN1_VALUE **fld, int indent,
return 1;
}
return asn1_item_print_ctx(out, fld, indent, ASN1_ITEM_ptr(tt->item),
- fname, sname, 0, pctx);
+ fname, sname, 0, pctx);
}
static int asn1_print_fsname(BIO *out, int indent,
- const char *fname, const char *sname,
- const ASN1_PCTX *pctx)
+ const char *fname, const char *sname,
+ const ASN1_PCTX *pctx)
{
static const char spaces[] = " ";
static const int nspaces = sizeof(spaces) - 1;
@@ -379,13 +379,11 @@ static int asn1_print_boolean(BIO *out, int boolval)
default:
str = "TRUE";
break;
-
}
if (BIO_puts(out, str) <= 0)
return 0;
return 1;
-
}
static int asn1_print_integer(BIO *out, const ASN1_INTEGER *str)
@@ -423,15 +421,16 @@ static int asn1_print_obstring(BIO *out, const ASN1_STRING *str, int indent)
return 0;
if ((str->length > 0)
&& BIO_dump_indent(out, (const char *)str->data, str->length,
- indent + 2) <= 0)
+ indent + 2)
+ <= 0)
return 0;
return 1;
}
static int asn1_primitive_print(BIO *out, const ASN1_VALUE **fld,
- const ASN1_ITEM *it, int indent,
- const char *fname, const char *sname,
- const ASN1_PCTX *pctx)
+ const ASN1_ITEM *it, int indent,
+ const char *fname, const char *sname,
+ const ASN1_PCTX *pctx)
{
long utype;
ASN1_STRING *str;
@@ -483,14 +482,12 @@ static int asn1_primitive_print(BIO *out, const ASN1_VALUE **fld,
}
switch (utype) {
- case V_ASN1_BOOLEAN:
- {
- int boolval = *(int *)fld;
- if (boolval == -1)
- boolval = it->size;
- ret = asn1_print_boolean(out, boolval);
- }
- break;
+ case V_ASN1_BOOLEAN: {
+ int boolval = *(int *)fld;
+ if (boolval == -1)
+ boolval = it->size;
+ ret = asn1_print_boolean(out, boolval);
+ } break;
case V_ASN1_INTEGER:
case V_ASN1_ENUMERATED:
@@ -527,7 +524,6 @@ static int asn1_primitive_print(BIO *out, const ASN1_VALUE **fld,
default:
ret = ASN1_STRING_print_ex(out, str, pctx->str_flags);
-
}
if (!ret)
return 0;
diff --git a/crypto/asn1/tasn_scn.c b/crypto/asn1/tasn_scn.c
index 7ada313b94..1e46cc90d2 100644
--- a/crypto/asn1/tasn_scn.c
+++ b/crypto/asn1/tasn_scn.c
@@ -22,7 +22,7 @@
* passing details to a callback.
*/
-ASN1_SCTX *ASN1_SCTX_new(int (*scan_cb) (ASN1_SCTX *ctx))
+ASN1_SCTX *ASN1_SCTX_new(int (*scan_cb)(ASN1_SCTX *ctx))
{
ASN1_SCTX *ret = OPENSSL_zalloc(sizeof(*ret));
diff --git a/crypto/asn1/tasn_typ.c b/crypto/asn1/tasn_typ.c
index 8095e32370..0e25b75b9f 100644
--- a/crypto/asn1/tasn_typ.c
+++ b/crypto/asn1/tasn_typ.c
@@ -13,17 +13,17 @@
/* Declarations for string types */
-#define IMPLEMENT_ASN1_STRING_FUNCTIONS(sname) \
- IMPLEMENT_ASN1_TYPE(sname) \
+#define IMPLEMENT_ASN1_STRING_FUNCTIONS(sname) \
+ IMPLEMENT_ASN1_TYPE(sname) \
IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(sname, sname, sname) \
-sname *sname##_new(void) \
-{ \
- return ASN1_STRING_type_new(V_##sname); \
-} \
-void sname##_free(sname *x) \
-{ \
- ASN1_STRING_free(x); \
-}
+ sname *sname##_new(void) \
+ { \
+ return ASN1_STRING_type_new(V_##sname); \
+ } \
+ void sname##_free(sname *x) \
+ { \
+ ASN1_STRING_free(x); \
+ }
IMPLEMENT_ASN1_STRING_FUNCTIONS(ASN1_OCTET_STRING)
IMPLEMENT_ASN1_STRING_FUNCTIONS(ASN1_INTEGER)
@@ -72,12 +72,10 @@ IMPLEMENT_ASN1_TYPE_ex(ASN1_FBOOLEAN, ASN1_BOOLEAN, 0)
IMPLEMENT_ASN1_TYPE_ex(ASN1_OCTET_STRING_NDEF, ASN1_OCTET_STRING, ASN1_TFLG_NDEF)
-ASN1_ITEM_TEMPLATE(ASN1_SEQUENCE_ANY) =
- ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, ASN1_SEQUENCE_ANY, ASN1_ANY)
+ASN1_ITEM_TEMPLATE(ASN1_SEQUENCE_ANY) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, ASN1_SEQUENCE_ANY, ASN1_ANY)
ASN1_ITEM_TEMPLATE_END(ASN1_SEQUENCE_ANY)
-ASN1_ITEM_TEMPLATE(ASN1_SET_ANY) =
- ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SET_OF, 0, ASN1_SET_ANY, ASN1_ANY)
+ASN1_ITEM_TEMPLATE(ASN1_SET_ANY) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SET_OF, 0, ASN1_SET_ANY, ASN1_ANY)
ASN1_ITEM_TEMPLATE_END(ASN1_SET_ANY)
IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(ASN1_SEQUENCE_ANY, ASN1_SEQUENCE_ANY, ASN1_SEQUENCE_ANY)
diff --git a/crypto/asn1/tasn_utl.c b/crypto/asn1/tasn_utl.c
index 599c309c9b..5e82a10fbd 100644
--- a/crypto/asn1/tasn_utl.c
+++ b/crypto/asn1/tasn_utl.c
@@ -20,7 +20,7 @@
/* Utility functions for manipulating fields and offsets */
/* Add 'offset' to 'addr' */
-#define offset2ptr(addr, offset) (void *)(((char *) addr) + offset)
+#define offset2ptr(addr, offset) (void *)(((char *)addr) + offset)
/*
* Given an ASN1_ITEM CHOICE type return the selector value
@@ -34,7 +34,7 @@ int ossl_asn1_get_choice_selector(ASN1_VALUE **pval, const ASN1_ITEM *it)
}
int ossl_asn1_get_choice_selector_const(const ASN1_VALUE **pval,
- const ASN1_ITEM *it)
+ const ASN1_ITEM *it)
{
int *sel = offset2ptr(*pval, it->utype);
@@ -46,7 +46,7 @@ int ossl_asn1_get_choice_selector_const(const ASN1_VALUE **pval,
*/
int ossl_asn1_set_choice_selector(ASN1_VALUE **pval, int value,
- const ASN1_ITEM *it)
+ const ASN1_ITEM *it)
{
int *sel, ret;
@@ -99,7 +99,7 @@ int ossl_asn1_do_lock(ASN1_VALUE **pval, int op, const ASN1_ITEM *it)
break;
case -1:
if (!CRYPTO_DOWN_REF(refcnt, &ret))
- return -1; /* failed */
+ return -1; /* failed */
REF_PRINT_EX(it->sname, ret, (void *)it);
REF_ASSERT_ISNT(ret < 0);
if (ret == 0) {
@@ -126,7 +126,7 @@ static ASN1_ENCODING *asn1_get_enc_ptr(ASN1_VALUE **pval, const ASN1_ITEM *it)
}
static const ASN1_ENCODING *asn1_get_const_enc_ptr(const ASN1_VALUE **pval,
- const ASN1_ITEM *it)
+ const ASN1_ITEM *it)
{
const ASN1_AUX *aux;
@@ -162,7 +162,7 @@ void ossl_asn1_enc_free(ASN1_VALUE **pval, const ASN1_ITEM *it)
}
int ossl_asn1_enc_save(ASN1_VALUE **pval, const unsigned char *in, long inlen,
- const ASN1_ITEM *it)
+ const ASN1_ITEM *it)
{
ASN1_ENCODING *enc = asn1_get_enc_ptr(pval, it);
@@ -184,7 +184,7 @@ int ossl_asn1_enc_save(ASN1_VALUE **pval, const unsigned char *in, long inlen,
}
int ossl_asn1_enc_restore(int *len, unsigned char **out, const ASN1_VALUE **pval,
- const ASN1_ITEM *it)
+ const ASN1_ITEM *it)
{
const ASN1_ENCODING *enc = asn1_get_const_enc_ptr(pval, it);
@@ -213,7 +213,7 @@ ASN1_VALUE **ossl_asn1_get_field_ptr(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt)
/* Given an ASN1_TEMPLATE get a const pointer to a field */
const ASN1_VALUE **ossl_asn1_get_const_field_ptr(const ASN1_VALUE **pval,
- const ASN1_TEMPLATE *tt)
+ const ASN1_TEMPLATE *tt)
{
return offset2ptr(*pval, tt->offset);
}
@@ -224,8 +224,8 @@ const ASN1_VALUE **ossl_asn1_get_const_field_ptr(const ASN1_VALUE **pval,
*/
const ASN1_TEMPLATE *ossl_asn1_do_adb(const ASN1_VALUE *val,
- const ASN1_TEMPLATE *tt,
- int nullerr)
+ const ASN1_TEMPLATE *tt,
+ int nullerr)
{
const ASN1_ADB *adb;
const ASN1_ADB_TABLE *atbl;
@@ -282,7 +282,7 @@ const ASN1_TEMPLATE *ossl_asn1_do_adb(const ASN1_VALUE *val,
goto err;
return adb->default_tt;
- err:
+err:
/* FIXME: should log the value or OID of unsupported type */
if (nullerr)
ERR_raise(ERR_LIB_ASN1, ASN1_R_UNSUPPORTED_ANY_DEFINED_BY_TYPE);
diff --git a/crypto/asn1/tbl_standard.h b/crypto/asn1/tbl_standard.h
index 3e8fe81eeb..da9c299bed 100644
--- a/crypto/asn1/tbl_standard.h
+++ b/crypto/asn1/tbl_standard.h
@@ -9,54 +9,53 @@
/* size limits: this stuff is taken straight from RFC3280 */
-#define ub_name 32768
-#define ub_common_name 64
-#define ub_locality_name 128
-#define ub_state_name 128
-#define ub_organization_name 64
-#define ub_organization_unit_name 64
-#define ub_title 64
-#define ub_email_address 128
-#define ub_serial_number 64
+#define ub_name 32768
+#define ub_common_name 64
+#define ub_locality_name 128
+#define ub_state_name 128
+#define ub_organization_name 64
+#define ub_organization_unit_name 64
+#define ub_title 64
+#define ub_email_address 128
+#define ub_serial_number 64
/* From RFC4524 */
-#define ub_rfc822_mailbox 256
+#define ub_rfc822_mailbox 256
/* This table must be kept in NID order */
static const ASN1_STRING_TABLE tbl_standard[] = {
- {NID_commonName, 1, ub_common_name, DIRSTRING_TYPE, 0},
- {NID_countryName, 2, 2, B_ASN1_PRINTABLESTRING, STABLE_NO_MASK},
- {NID_localityName, 1, ub_locality_name, DIRSTRING_TYPE, 0},
- {NID_stateOrProvinceName, 1, ub_state_name, DIRSTRING_TYPE, 0},
- {NID_organizationName, 1, ub_organization_name, DIRSTRING_TYPE, 0},
- {NID_organizationalUnitName, 1, ub_organization_unit_name, DIRSTRING_TYPE,
- 0},
- {NID_pkcs9_emailAddress, 1, ub_email_address, B_ASN1_IA5STRING,
- STABLE_NO_MASK},
- {NID_pkcs9_unstructuredName, 1, -1, PKCS9STRING_TYPE, 0},
- {NID_pkcs9_challengePassword, 1, -1, PKCS9STRING_TYPE, 0},
- {NID_pkcs9_unstructuredAddress, 1, -1, DIRSTRING_TYPE, 0},
- {NID_givenName, 1, ub_name, DIRSTRING_TYPE, 0},
- {NID_surname, 1, ub_name, DIRSTRING_TYPE, 0},
- {NID_initials, 1, ub_name, DIRSTRING_TYPE, 0},
- {NID_serialNumber, 1, ub_serial_number, B_ASN1_PRINTABLESTRING,
- STABLE_NO_MASK},
- {NID_friendlyName, -1, -1, B_ASN1_BMPSTRING, STABLE_NO_MASK},
- {NID_name, 1, ub_name, DIRSTRING_TYPE, 0},
- {NID_dnQualifier, -1, -1, B_ASN1_PRINTABLESTRING, STABLE_NO_MASK},
- {NID_domainComponent, 1, -1, B_ASN1_IA5STRING, STABLE_NO_MASK},
- {NID_ms_csp_name, -1, -1, B_ASN1_BMPSTRING, STABLE_NO_MASK},
- {NID_rfc822Mailbox, 1, ub_rfc822_mailbox, B_ASN1_IA5STRING,
- STABLE_NO_MASK},
- {NID_jurisdictionCountryName, 2, 2, B_ASN1_PRINTABLESTRING, STABLE_NO_MASK},
- {NID_INN, 1, 12, B_ASN1_NUMERICSTRING, STABLE_NO_MASK},
- {NID_OGRN, 1, 13, B_ASN1_NUMERICSTRING, STABLE_NO_MASK},
- {NID_SNILS, 1, 11, B_ASN1_NUMERICSTRING, STABLE_NO_MASK},
- {NID_countryCode3c, 3, 3, B_ASN1_PRINTABLESTRING, STABLE_NO_MASK},
- {NID_countryCode3n, 3, 3, B_ASN1_NUMERICSTRING, STABLE_NO_MASK},
- {NID_dnsName, 0, -1, B_ASN1_UTF8STRING, STABLE_NO_MASK},
- {NID_id_on_SmtpUTF8Mailbox, 1, ub_email_address, B_ASN1_UTF8STRING, STABLE_NO_MASK}
+ { NID_commonName, 1, ub_common_name, DIRSTRING_TYPE, 0 },
+ { NID_countryName, 2, 2, B_ASN1_PRINTABLESTRING, STABLE_NO_MASK },
+ { NID_localityName, 1, ub_locality_name, DIRSTRING_TYPE, 0 },
+ { NID_stateOrProvinceName, 1, ub_state_name, DIRSTRING_TYPE, 0 },
+ { NID_organizationName, 1, ub_organization_name, DIRSTRING_TYPE, 0 },
+ { NID_organizationalUnitName, 1, ub_organization_unit_name, DIRSTRING_TYPE,
+ 0 },
+ { NID_pkcs9_emailAddress, 1, ub_email_address, B_ASN1_IA5STRING,
+ STABLE_NO_MASK },
+ { NID_pkcs9_unstructuredName, 1, -1, PKCS9STRING_TYPE, 0 },
+ { NID_pkcs9_challengePassword, 1, -1, PKCS9STRING_TYPE, 0 },
+ { NID_pkcs9_unstructuredAddress, 1, -1, DIRSTRING_TYPE, 0 },
+ { NID_givenName, 1, ub_name, DIRSTRING_TYPE, 0 },
+ { NID_surname, 1, ub_name, DIRSTRING_TYPE, 0 },
+ { NID_initials, 1, ub_name, DIRSTRING_TYPE, 0 },
+ { NID_serialNumber, 1, ub_serial_number, B_ASN1_PRINTABLESTRING,
+ STABLE_NO_MASK },
+ { NID_friendlyName, -1, -1, B_ASN1_BMPSTRING, STABLE_NO_MASK },
+ { NID_name, 1, ub_name, DIRSTRING_TYPE, 0 },
+ { NID_dnQualifier, -1, -1, B_ASN1_PRINTABLESTRING, STABLE_NO_MASK },
+ { NID_domainComponent, 1, -1, B_ASN1_IA5STRING, STABLE_NO_MASK },
+ { NID_ms_csp_name, -1, -1, B_ASN1_BMPSTRING, STABLE_NO_MASK },
+ { NID_rfc822Mailbox, 1, ub_rfc822_mailbox, B_ASN1_IA5STRING,
+ STABLE_NO_MASK },
+ { NID_jurisdictionCountryName, 2, 2, B_ASN1_PRINTABLESTRING, STABLE_NO_MASK },
+ { NID_INN, 1, 12, B_ASN1_NUMERICSTRING, STABLE_NO_MASK },
+ { NID_OGRN, 1, 13, B_ASN1_NUMERICSTRING, STABLE_NO_MASK },
+ { NID_SNILS, 1, 11, B_ASN1_NUMERICSTRING, STABLE_NO_MASK },
+ { NID_countryCode3c, 3, 3, B_ASN1_PRINTABLESTRING, STABLE_NO_MASK },
+ { NID_countryCode3n, 3, 3, B_ASN1_NUMERICSTRING, STABLE_NO_MASK },
+ { NID_dnsName, 0, -1, B_ASN1_UTF8STRING, STABLE_NO_MASK },
+ { NID_id_on_SmtpUTF8Mailbox, 1, ub_email_address, B_ASN1_UTF8STRING, STABLE_NO_MASK }
};
-
diff --git a/crypto/asn1/x_algor.c b/crypto/asn1/x_algor.c
index db9dd06e49..f8faf7209b 100644
--- a/crypto/asn1/x_algor.c
+++ b/crypto/asn1/x_algor.c
@@ -16,12 +16,11 @@
#include "crypto/evp.h"
ASN1_SEQUENCE(X509_ALGOR) = {
- ASN1_SIMPLE(X509_ALGOR, algorithm, ASN1_OBJECT),
- ASN1_OPT(X509_ALGOR, parameter, ASN1_ANY)
+ ASN1_SIMPLE(X509_ALGOR, algorithm, ASN1_OBJECT),
+ ASN1_OPT(X509_ALGOR, parameter, ASN1_ANY)
} ASN1_SEQUENCE_END(X509_ALGOR)
-ASN1_ITEM_TEMPLATE(X509_ALGORS) =
- ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, algorithms, X509_ALGOR)
+ASN1_ITEM_TEMPLATE(X509_ALGORS) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, algorithms, X509_ALGOR)
ASN1_ITEM_TEMPLATE_END(X509_ALGORS)
IMPLEMENT_ASN1_FUNCTIONS(X509_ALGOR)
@@ -34,7 +33,7 @@ int X509_ALGOR_set0(X509_ALGOR *alg, ASN1_OBJECT *aobj, int ptype, void *pval)
return 0;
if (ptype != V_ASN1_UNDEF && alg->parameter == NULL
- && (alg->parameter = ASN1_TYPE_new()) == NULL)
+ && (alg->parameter = ASN1_TYPE_new()) == NULL)
return 0;
ASN1_OBJECT_free(alg->algorithm);
@@ -63,14 +62,14 @@ X509_ALGOR *ossl_X509_ALGOR_from_nid(int nid, int ptype, void *pval)
return alg;
alg->algorithm = NULL; /* precaution to prevent double free */
- err:
+err:
X509_ALGOR_free(alg);
/* ASN1_OBJECT_free(algo) is not needed due to OBJ_nid2obj() */
return NULL;
}
void X509_ALGOR_get0(const ASN1_OBJECT **paobj, int *pptype,
- const void **ppval, const X509_ALGOR *algor)
+ const void **ppval, const X509_ALGOR *algor)
{
if (paobj)
*paobj = algor->algorithm;
@@ -111,7 +110,7 @@ int X509_ALGOR_copy(X509_ALGOR *dest, const X509_ALGOR *src)
return 0;
if (dest->algorithm)
- ASN1_OBJECT_free(dest->algorithm);
+ ASN1_OBJECT_free(dest->algorithm);
dest->algorithm = NULL;
if (dest->parameter)
@@ -131,7 +130,8 @@ int X509_ALGOR_copy(X509_ALGOR *dest, const X509_ALGOR *src)
* set does copy as a side effect.
*/
if (ASN1_TYPE_set1(dest->parameter, src->parameter->type,
- src->parameter->value.ptr) == 0)
+ src->parameter->value.ptr)
+ == 0)
return 0;
}
@@ -171,7 +171,7 @@ X509_ALGOR *ossl_x509_algor_mgf1_decode(X509_ALGOR *alg)
if (OBJ_obj2nid(alg->algorithm) != NID_mgf1)
return NULL;
return ASN1_TYPE_unpack_sequence(ASN1_ITEM_rptr(X509_ALGOR),
- alg->parameter);
+ alg->parameter);
}
/* Allocate and set MGF1 algorithm ID from EVP_MD */
@@ -187,12 +187,12 @@ int ossl_x509_algor_md_to_mgf1(X509_ALGOR **palg, const EVP_MD *mgf1md)
if (!ossl_x509_algor_new_from_md(&algtmp, mgf1md))
goto err;
if (ASN1_item_pack(algtmp, ASN1_ITEM_rptr(X509_ALGOR), &stmp) == NULL)
- goto err;
+ goto err;
*palg = ossl_X509_ALGOR_from_nid(NID_mgf1, V_ASN1_SEQUENCE, stmp);
if (*palg == NULL)
goto err;
stmp = NULL;
- err:
+err:
ASN1_STRING_free(stmp);
X509_ALGOR_free(algtmp);
return *palg != NULL;
diff --git a/crypto/asn1/x_bignum.c b/crypto/asn1/x_bignum.c
index 3ae58a49f0..efa2ade30f 100644
--- a/crypto/asn1/x_bignum.c
+++ b/crypto/asn1/x_bignum.c
@@ -19,20 +19,20 @@
* is normally due to an encoding error.
*/
-#define BN_SENSITIVE 1
+#define BN_SENSITIVE 1
static int bn_new(ASN1_VALUE **pval, const ASN1_ITEM *it);
static int bn_secure_new(ASN1_VALUE **pval, const ASN1_ITEM *it);
static void bn_free(ASN1_VALUE **pval, const ASN1_ITEM *it);
static int bn_i2c(const ASN1_VALUE **pval, unsigned char *cont, int *putype,
- const ASN1_ITEM *it);
+ const ASN1_ITEM *it);
static int bn_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
- int utype, char *free_cont, const ASN1_ITEM *it);
+ int utype, char *free_cont, const ASN1_ITEM *it);
static int bn_secure_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
- int utype, char *free_cont, const ASN1_ITEM *it);
+ int utype, char *free_cont, const ASN1_ITEM *it);
static int bn_print(BIO *out, const ASN1_VALUE **pval, const ASN1_ITEM *it,
- int indent, const ASN1_PCTX *pctx);
+ int indent, const ASN1_PCTX *pctx);
static ASN1_PRIMITIVE_FUNCS bignum_pf = {
NULL, 0,
@@ -55,14 +55,13 @@ static ASN1_PRIMITIVE_FUNCS cbignum_pf = {
};
ASN1_ITEM_start(BIGNUM)
- ASN1_ITYPE_PRIMITIVE, V_ASN1_INTEGER, NULL, 0, &bignum_pf, 0, "BIGNUM"
-ASN1_ITEM_end(BIGNUM)
+ ASN1_ITYPE_PRIMITIVE,
+ V_ASN1_INTEGER, NULL, 0, &bignum_pf, 0, "BIGNUM" ASN1_ITEM_end(BIGNUM)
-ASN1_ITEM_start(CBIGNUM)
- ASN1_ITYPE_PRIMITIVE, V_ASN1_INTEGER, NULL, 0, &cbignum_pf, BN_SENSITIVE, "CBIGNUM"
-ASN1_ITEM_end(CBIGNUM)
+ ASN1_ITEM_start(CBIGNUM) ASN1_ITYPE_PRIMITIVE,
+ V_ASN1_INTEGER, NULL, 0, &cbignum_pf, BN_SENSITIVE, "CBIGNUM" ASN1_ITEM_end(CBIGNUM)
-static int bn_new(ASN1_VALUE **pval, const ASN1_ITEM *it)
+ static int bn_new(ASN1_VALUE **pval, const ASN1_ITEM *it)
{
*pval = (ASN1_VALUE *)BN_new();
if (*pval != NULL)
@@ -92,7 +91,7 @@ static void bn_free(ASN1_VALUE **pval, const ASN1_ITEM *it)
}
static int bn_i2c(const ASN1_VALUE **pval, unsigned char *cont, int *putype,
- const ASN1_ITEM *it)
+ const ASN1_ITEM *it)
{
BIGNUM *bn;
int pad;
@@ -113,7 +112,7 @@ static int bn_i2c(const ASN1_VALUE **pval, unsigned char *cont, int *putype,
}
static int bn_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
- int utype, char *free_cont, const ASN1_ITEM *it)
+ int utype, char *free_cont, const ASN1_ITEM *it)
{
BIGNUM *bn;
@@ -128,7 +127,7 @@ static int bn_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
}
static int bn_secure_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
- int utype, char *free_cont, const ASN1_ITEM *it)
+ int utype, char *free_cont, const ASN1_ITEM *it)
{
int ret;
BIGNUM *bn;
@@ -147,7 +146,7 @@ static int bn_secure_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
}
static int bn_print(BIO *out, const ASN1_VALUE **pval, const ASN1_ITEM *it,
- int indent, const ASN1_PCTX *pctx)
+ int indent, const ASN1_PCTX *pctx)
{
if (!BN_print(out, *(BIGNUM **)pval))
return 0;
diff --git a/crypto/asn1/x_int64.c b/crypto/asn1/x_int64.c
index b7251b8ad8..f7cd7cbd95 100644
--- a/crypto/asn1/x_int64.c
+++ b/crypto/asn1/x_int64.c
@@ -23,8 +23,8 @@
/*
* We abuse the ASN1_ITEM fields |size| as a flags field
*/
-#define INTxx_FLAG_ZERO_DEFAULT (1<<0)
-#define INTxx_FLAG_SIGNED (1<<1)
+#define INTxx_FLAG_ZERO_DEFAULT (1 << 0)
+#define INTxx_FLAG_SIGNED (1 << 1)
static int uint64_new(ASN1_VALUE **pval, const ASN1_ITEM *it)
{
@@ -45,7 +45,7 @@ static void uint64_clear(ASN1_VALUE **pval, const ASN1_ITEM *it)
}
static int uint64_i2c(const ASN1_VALUE **pval, unsigned char *cont, int *putype,
- const ASN1_ITEM *it)
+ const ASN1_ITEM *it)
{
uint64_t utmp;
int neg = 0;
@@ -69,7 +69,7 @@ static int uint64_i2c(const ASN1_VALUE **pval, unsigned char *cont, int *putype,
}
static int uint64_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
- int utype, char *free_cont, const ASN1_ITEM *it)
+ int utype, char *free_cont, const ASN1_ITEM *it)
{
uint64_t utmp = 0;
char *cp;
@@ -96,7 +96,7 @@ static int uint64_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
return 0;
}
if ((it->size & INTxx_FLAG_SIGNED) == INTxx_FLAG_SIGNED
- && !neg && utmp > INT64_MAX) {
+ && !neg && utmp > INT64_MAX) {
ERR_raise(ERR_LIB_ASN1, ASN1_R_TOO_LARGE);
return 0;
}
@@ -104,13 +104,13 @@ static int uint64_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
/* ossl_c2i_uint64_int() returns positive values */
utmp = 0 - utmp;
- long_compat:
+long_compat:
memcpy(cp, &utmp, sizeof(utmp));
return 1;
}
static int uint64_print(BIO *out, const ASN1_VALUE **pval, const ASN1_ITEM *it,
- int indent, const ASN1_PCTX *pctx)
+ int indent, const ASN1_PCTX *pctx)
{
if ((it->size & INTxx_FLAG_SIGNED) == INTxx_FLAG_SIGNED)
return BIO_printf(out, "%jd\n", **(int64_t **)pval);
@@ -138,7 +138,7 @@ static void uint32_clear(ASN1_VALUE **pval, const ASN1_ITEM *it)
}
static int uint32_i2c(const ASN1_VALUE **pval, unsigned char *cont, int *putype,
- const ASN1_ITEM *it)
+ const ASN1_ITEM *it)
{
uint32_t utmp;
int neg = 0;
@@ -169,7 +169,7 @@ static int uint32_i2c(const ASN1_VALUE **pval, unsigned char *cont, int *putype,
#define ABS_INT32_MIN ((uint32_t)INT32_MAX + 1)
static int uint32_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
- int utype, char *free_cont, const ASN1_ITEM *it)
+ int utype, char *free_cont, const ASN1_ITEM *it)
{
uint64_t utmp = 0;
uint32_t utmp2 = 0;
@@ -210,21 +210,20 @@ static int uint32_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
}
}
- long_compat:
+long_compat:
utmp2 = (uint32_t)utmp;
memcpy(cp, &utmp2, sizeof(utmp2));
return 1;
}
static int uint32_print(BIO *out, const ASN1_VALUE **pval, const ASN1_ITEM *it,
- int indent, const ASN1_PCTX *pctx)
+ int indent, const ASN1_PCTX *pctx)
{
if ((it->size & INTxx_FLAG_SIGNED) == INTxx_FLAG_SIGNED)
return BIO_printf(out, "%d\n", (int)**(int32_t **)pval);
return BIO_printf(out, "%u\n", (unsigned int)**(uint32_t **)pval);
}
-
/* Define the primitives themselves */
static ASN1_PRIMITIVE_FUNCS uint32_pf = {
@@ -248,40 +247,32 @@ static ASN1_PRIMITIVE_FUNCS uint64_pf = {
};
ASN1_ITEM_start(INT32)
- ASN1_ITYPE_PRIMITIVE, V_ASN1_INTEGER, NULL, 0, &uint32_pf,
- INTxx_FLAG_SIGNED, "INT32"
-ASN1_ITEM_end(INT32)
-
-ASN1_ITEM_start(UINT32)
- ASN1_ITYPE_PRIMITIVE, V_ASN1_INTEGER, NULL, 0, &uint32_pf, 0, "UINT32"
-ASN1_ITEM_end(UINT32)
-
-ASN1_ITEM_start(INT64)
- ASN1_ITYPE_PRIMITIVE, V_ASN1_INTEGER, NULL, 0, &uint64_pf,
- INTxx_FLAG_SIGNED, "INT64"
-ASN1_ITEM_end(INT64)
-
-ASN1_ITEM_start(UINT64)
- ASN1_ITYPE_PRIMITIVE, V_ASN1_INTEGER, NULL, 0, &uint64_pf, 0, "UINT64"
-ASN1_ITEM_end(UINT64)
-
-ASN1_ITEM_start(ZINT32)
- ASN1_ITYPE_PRIMITIVE, V_ASN1_INTEGER, NULL, 0, &uint32_pf,
- INTxx_FLAG_ZERO_DEFAULT|INTxx_FLAG_SIGNED, "ZINT32"
-ASN1_ITEM_end(ZINT32)
-
-ASN1_ITEM_start(ZUINT32)
- ASN1_ITYPE_PRIMITIVE, V_ASN1_INTEGER, NULL, 0, &uint32_pf,
- INTxx_FLAG_ZERO_DEFAULT, "ZUINT32"
-ASN1_ITEM_end(ZUINT32)
-
-ASN1_ITEM_start(ZINT64)
- ASN1_ITYPE_PRIMITIVE, V_ASN1_INTEGER, NULL, 0, &uint64_pf,
- INTxx_FLAG_ZERO_DEFAULT|INTxx_FLAG_SIGNED, "ZINT64"
-ASN1_ITEM_end(ZINT64)
-
-ASN1_ITEM_start(ZUINT64)
- ASN1_ITYPE_PRIMITIVE, V_ASN1_INTEGER, NULL, 0, &uint64_pf,
- INTxx_FLAG_ZERO_DEFAULT, "ZUINT64"
-ASN1_ITEM_end(ZUINT64)
+ ASN1_ITYPE_PRIMITIVE,
+ V_ASN1_INTEGER, NULL, 0, &uint32_pf,
+ INTxx_FLAG_SIGNED, "INT32" ASN1_ITEM_end(INT32)
+
+ ASN1_ITEM_start(UINT32) ASN1_ITYPE_PRIMITIVE,
+ V_ASN1_INTEGER, NULL, 0, &uint32_pf, 0, "UINT32" ASN1_ITEM_end(UINT32)
+
+ ASN1_ITEM_start(INT64) ASN1_ITYPE_PRIMITIVE,
+ V_ASN1_INTEGER, NULL, 0, &uint64_pf,
+ INTxx_FLAG_SIGNED, "INT64" ASN1_ITEM_end(INT64)
+
+ ASN1_ITEM_start(UINT64) ASN1_ITYPE_PRIMITIVE,
+ V_ASN1_INTEGER, NULL, 0, &uint64_pf, 0, "UINT64" ASN1_ITEM_end(UINT64)
+
+ ASN1_ITEM_start(ZINT32) ASN1_ITYPE_PRIMITIVE,
+ V_ASN1_INTEGER, NULL, 0, &uint32_pf,
+ INTxx_FLAG_ZERO_DEFAULT | INTxx_FLAG_SIGNED, "ZINT32" ASN1_ITEM_end(ZINT32)
+
+ ASN1_ITEM_start(ZUINT32) ASN1_ITYPE_PRIMITIVE,
+ V_ASN1_INTEGER, NULL, 0, &uint32_pf,
+ INTxx_FLAG_ZERO_DEFAULT, "ZUINT32" ASN1_ITEM_end(ZUINT32)
+
+ ASN1_ITEM_start(ZINT64) ASN1_ITYPE_PRIMITIVE,
+ V_ASN1_INTEGER, NULL, 0, &uint64_pf,
+ INTxx_FLAG_ZERO_DEFAULT | INTxx_FLAG_SIGNED, "ZINT64" ASN1_ITEM_end(ZINT64)
+ ASN1_ITEM_start(ZUINT64) ASN1_ITYPE_PRIMITIVE,
+ V_ASN1_INTEGER, NULL, 0, &uint64_pf,
+ INTxx_FLAG_ZERO_DEFAULT, "ZUINT64" ASN1_ITEM_end(ZUINT64)
diff --git a/crypto/asn1/x_long.c b/crypto/asn1/x_long.c
index 0685780f08..4dc9dc6c6b 100644
--- a/crypto/asn1/x_long.c
+++ b/crypto/asn1/x_long.c
@@ -22,31 +22,30 @@ static int long_new(ASN1_VALUE **pval, const ASN1_ITEM *it);
static void long_free(ASN1_VALUE **pval, const ASN1_ITEM *it);
static int long_i2c(const ASN1_VALUE **pval, unsigned char *cont, int *putype,
- const ASN1_ITEM *it);
+ const ASN1_ITEM *it);
static int long_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
- int utype, char *free_cont, const ASN1_ITEM *it);
+ int utype, char *free_cont, const ASN1_ITEM *it);
static int long_print(BIO *out, const ASN1_VALUE **pval, const ASN1_ITEM *it,
- int indent, const ASN1_PCTX *pctx);
+ int indent, const ASN1_PCTX *pctx);
static ASN1_PRIMITIVE_FUNCS long_pf = {
NULL, 0,
long_new,
long_free,
- long_free, /* Clear should set to initial value */
+ long_free, /* Clear should set to initial value */
long_c2i,
long_i2c,
long_print
};
ASN1_ITEM_start(LONG)
- ASN1_ITYPE_PRIMITIVE, V_ASN1_INTEGER, NULL, 0, &long_pf, ASN1_LONG_UNDEF, "LONG"
-ASN1_ITEM_end(LONG)
+ ASN1_ITYPE_PRIMITIVE,
+ V_ASN1_INTEGER, NULL, 0, &long_pf, ASN1_LONG_UNDEF, "LONG" ASN1_ITEM_end(LONG)
-ASN1_ITEM_start(ZLONG)
- ASN1_ITYPE_PRIMITIVE, V_ASN1_INTEGER, NULL, 0, &long_pf, 0, "ZLONG"
-ASN1_ITEM_end(ZLONG)
+ ASN1_ITEM_start(ZLONG) ASN1_ITYPE_PRIMITIVE,
+ V_ASN1_INTEGER, NULL, 0, &long_pf, 0, "ZLONG" ASN1_ITEM_end(ZLONG)
-static int long_new(ASN1_VALUE **pval, const ASN1_ITEM *it)
+ static int long_new(ASN1_VALUE **pval, const ASN1_ITEM *it)
{
memcpy(pval, &it->size, COPY_SIZE(*pval, it->size));
return 1;
@@ -83,7 +82,7 @@ static int num_bits_ulong(unsigned long value)
}
static int long_i2c(const ASN1_VALUE **pval, unsigned char *cont, int *putype,
- const ASN1_ITEM *it)
+ const ASN1_ITEM *it)
{
long ltmp;
unsigned long utmp, sign;
@@ -126,7 +125,7 @@ static int long_i2c(const ASN1_VALUE **pval, unsigned char *cont, int *putype,
}
static int long_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
- int utype, char *free_cont, const ASN1_ITEM *it)
+ int utype, char *free_cont, const ASN1_ITEM *it)
{
int i;
long ltmp;
@@ -187,7 +186,7 @@ static int long_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
}
static int long_print(BIO *out, const ASN1_VALUE **pval, const ASN1_ITEM *it,
- int indent, const ASN1_PCTX *pctx)
+ int indent, const ASN1_PCTX *pctx)
{
long l;
diff --git a/crypto/asn1/x_sig.c b/crypto/asn1/x_sig.c
index 759a956653..3932ff6f2c 100644
--- a/crypto/asn1/x_sig.c
+++ b/crypto/asn1/x_sig.c
@@ -14,14 +14,14 @@
#include "crypto/x509.h"
ASN1_SEQUENCE(X509_SIG) = {
- ASN1_SIMPLE(X509_SIG, algor, X509_ALGOR),
- ASN1_SIMPLE(X509_SIG, digest, ASN1_OCTET_STRING)
+ ASN1_SIMPLE(X509_SIG, algor, X509_ALGOR),
+ ASN1_SIMPLE(X509_SIG, digest, ASN1_OCTET_STRING)
} ASN1_SEQUENCE_END(X509_SIG)
IMPLEMENT_ASN1_FUNCTIONS(X509_SIG)
void X509_SIG_get0(const X509_SIG *sig, const X509_ALGOR **palg,
- const ASN1_OCTET_STRING **pdigest)
+ const ASN1_OCTET_STRING **pdigest)
{
if (palg)
*palg = sig->algor;
@@ -30,7 +30,7 @@ void X509_SIG_get0(const X509_SIG *sig, const X509_ALGOR **palg,
}
void X509_SIG_getm(X509_SIG *sig, X509_ALGOR **palg,
- ASN1_OCTET_STRING **pdigest)
+ ASN1_OCTET_STRING **pdigest)
{
if (palg)
*palg = sig->algor;
diff --git a/crypto/asn1/x_spki.c b/crypto/asn1/x_spki.c
index 2d7de66eb7..91fbda8bfc 100644
--- a/crypto/asn1/x_spki.c
+++ b/crypto/asn1/x_spki.c
@@ -13,16 +13,16 @@
#include <openssl/asn1t.h>
ASN1_SEQUENCE(NETSCAPE_SPKAC) = {
- ASN1_SIMPLE(NETSCAPE_SPKAC, pubkey, X509_PUBKEY),
- ASN1_SIMPLE(NETSCAPE_SPKAC, challenge, ASN1_IA5STRING)
+ ASN1_SIMPLE(NETSCAPE_SPKAC, pubkey, X509_PUBKEY),
+ ASN1_SIMPLE(NETSCAPE_SPKAC, challenge, ASN1_IA5STRING)
} ASN1_SEQUENCE_END(NETSCAPE_SPKAC)
IMPLEMENT_ASN1_FUNCTIONS(NETSCAPE_SPKAC)
ASN1_SEQUENCE(NETSCAPE_SPKI) = {
- ASN1_SIMPLE(NETSCAPE_SPKI, spkac, NETSCAPE_SPKAC),
- ASN1_EMBED(NETSCAPE_SPKI, sig_algor, X509_ALGOR),
- ASN1_SIMPLE(NETSCAPE_SPKI, signature, ASN1_BIT_STRING)
+ ASN1_SIMPLE(NETSCAPE_SPKI, spkac, NETSCAPE_SPKAC),
+ ASN1_EMBED(NETSCAPE_SPKI, sig_algor, X509_ALGOR),
+ ASN1_SIMPLE(NETSCAPE_SPKI, signature, ASN1_BIT_STRING)
} ASN1_SEQUENCE_END(NETSCAPE_SPKI)
IMPLEMENT_ASN1_FUNCTIONS(NETSCAPE_SPKI)
diff --git a/crypto/asn1/x_val.c b/crypto/asn1/x_val.c
index a4e57cbcc7..fdde195b71 100644
--- a/crypto/asn1/x_val.c
+++ b/crypto/asn1/x_val.c
@@ -13,8 +13,8 @@
#include <openssl/x509.h>
ASN1_SEQUENCE(X509_VAL) = {
- ASN1_SIMPLE(X509_VAL, notBefore, ASN1_TIME),
- ASN1_SIMPLE(X509_VAL, notAfter, ASN1_TIME)
+ ASN1_SIMPLE(X509_VAL, notBefore, ASN1_TIME),
+ ASN1_SIMPLE(X509_VAL, notAfter, ASN1_TIME)
} ASN1_SEQUENCE_END(X509_VAL)
IMPLEMENT_ASN1_FUNCTIONS(X509_VAL)
diff --git a/crypto/asn1_dsa.c b/crypto/asn1_dsa.c
index 0782fe7c2a..2f338da176 100644
--- a/crypto/asn1_dsa.c
+++ b/crypto/asn1_dsa.c
@@ -43,11 +43,11 @@ int ossl_encode_der_length(WPACKET *pkt, size_t cont_len)
if (cont_len > 0xff) {
if (!WPACKET_put_bytes_u8(pkt, 0x82)
- || !WPACKET_put_bytes_u16(pkt, cont_len))
+ || !WPACKET_put_bytes_u16(pkt, cont_len))
return 0;
} else {
if (cont_len > 0x7f
- && !WPACKET_put_bytes_u8(pkt, 0x81))
+ && !WPACKET_put_bytes_u8(pkt, 0x81))
return 0;
if (!WPACKET_put_bytes_u8(pkt, cont_len))
return 0;
@@ -83,14 +83,14 @@ int ossl_encode_der_integer(WPACKET *pkt, const BIGNUM *n)
cont_len = BN_num_bits(n) / 8 + 1;
if (!WPACKET_start_sub_packet(pkt)
- || !WPACKET_put_bytes_u8(pkt, ID_INTEGER)
- || !ossl_encode_der_length(pkt, cont_len)
- || !WPACKET_allocate_bytes(pkt, cont_len, &bnbytes)
- || !WPACKET_close(pkt))
+ || !WPACKET_put_bytes_u8(pkt, ID_INTEGER)
+ || !ossl_encode_der_length(pkt, cont_len)
+ || !WPACKET_allocate_bytes(pkt, cont_len, &bnbytes)
+ || !WPACKET_close(pkt))
return 0;
if (bnbytes != NULL
- && BN_bn2binpad(n, bnbytes, (int)cont_len) != (int)cont_len)
+ && BN_bn2binpad(n, bnbytes, (int)cont_len) != (int)cont_len)
return 0;
return 1;
@@ -123,9 +123,9 @@ int ossl_encode_der_dsa_sig(WPACKET *pkt, const BIGNUM *r, const BIGNUM *s)
/* Calculate the content length */
if (!ossl_encode_der_integer(dummypkt, r)
- || !ossl_encode_der_integer(dummypkt, s)
- || !WPACKET_get_length(dummypkt, &cont_len)
- || (!isnull && !WPACKET_finish(dummypkt))) {
+ || !ossl_encode_der_integer(dummypkt, s)
+ || !WPACKET_get_length(dummypkt, &cont_len)
+ || (!isnull && !WPACKET_finish(dummypkt))) {
if (!isnull)
WPACKET_cleanup(dummypkt);
return 0;
@@ -133,14 +133,14 @@ int ossl_encode_der_dsa_sig(WPACKET *pkt, const BIGNUM *r, const BIGNUM *s)
/* Add the tag and length bytes */
if (!WPACKET_put_bytes_u8(pkt, ID_SEQUENCE)
- || !ossl_encode_der_length(pkt, cont_len)
- /*
- * Really encode the integers. We already wrote to the main pkt
- * if it had a NULL buffer, so don't do it again
- */
- || (!isnull && !ossl_encode_der_integer(pkt, r))
- || (!isnull && !ossl_encode_der_integer(pkt, s))
- || !WPACKET_close(pkt))
+ || !ossl_encode_der_length(pkt, cont_len)
+ /*
+ * Really encode the integers. We already wrote to the main pkt
+ * if it had a NULL buffer, so don't do it again
+ */
+ || (!isnull && !ossl_encode_der_integer(pkt, r))
+ || (!isnull && !ossl_encode_der_integer(pkt, s))
+ || !WPACKET_close(pkt))
return 0;
return 1;
@@ -191,25 +191,26 @@ int ossl_decode_der_integer(PACKET *pkt, BIGNUM *n)
/* Check we have an integer and get the content bytes */
if (!PACKET_get_1(pkt, &tag)
- || tag != ID_INTEGER
- || !ossl_decode_der_length(pkt, &contpkt))
+ || tag != ID_INTEGER
+ || !ossl_decode_der_length(pkt, &contpkt))
return 0;
/* Peek ahead at the first bytes to check for proper encoding */
tmppkt = contpkt;
/* The INTEGER must be positive */
if (!PACKET_get_1(&tmppkt, &tmp)
- || (tmp & 0x80) != 0)
+ || (tmp & 0x80) != 0)
return 0;
/* If there a zero padding byte the next byte must have the msb set */
if (PACKET_remaining(&tmppkt) > 0 && tmp == 0) {
if (!PACKET_get_1(&tmppkt, &tmp)
- || (tmp & 0x80) == 0)
+ || (tmp & 0x80) == 0)
return 0;
}
if (BN_bin2bn(PACKET_data(&contpkt),
- (int)PACKET_remaining(&contpkt), n) == NULL)
+ (int)PACKET_remaining(&contpkt), n)
+ == NULL)
return 0;
return 1;
@@ -231,19 +232,19 @@ int ossl_decode_der_integer(PACKET *pkt, BIGNUM *n)
* were consumed.
*/
size_t ossl_decode_der_dsa_sig(BIGNUM *r, BIGNUM *s,
- const unsigned char **ppin, size_t len)
+ const unsigned char **ppin, size_t len)
{
size_t consumed;
PACKET pkt, contpkt;
unsigned int tag;
if (!PACKET_buf_init(&pkt, *ppin, len)
- || !PACKET_get_1(&pkt, &tag)
- || tag != ID_SEQUENCE
- || !ossl_decode_der_length(&pkt, &contpkt)
- || !ossl_decode_der_integer(&contpkt, r)
- || !ossl_decode_der_integer(&contpkt, s)
- || PACKET_remaining(&contpkt) != 0)
+ || !PACKET_get_1(&pkt, &tag)
+ || tag != ID_SEQUENCE
+ || !ossl_decode_der_length(&pkt, &contpkt)
+ || !ossl_decode_der_integer(&contpkt, r)
+ || !ossl_decode_der_integer(&contpkt, s)
+ || PACKET_remaining(&contpkt) != 0)
return 0;
consumed = PACKET_data(&pkt) - *ppin;
diff --git a/crypto/async/arch/async_null.c b/crypto/async/arch/async_null.c
index 306c43df41..28276c1014 100644
--- a/crypto/async/arch/async_null.c
+++ b/crypto/async/arch/async_null.c
@@ -17,13 +17,13 @@ int ASYNC_is_capable(void)
}
int ASYNC_set_mem_functions(ASYNC_stack_alloc_fn alloc_fn,
- ASYNC_stack_free_fn free_fn)
+ ASYNC_stack_free_fn free_fn)
{
return 0;
}
void ASYNC_get_mem_functions(ASYNC_stack_alloc_fn *alloc_fn,
- ASYNC_stack_free_fn *free_fn)
+ ASYNC_stack_free_fn *free_fn)
{
if (alloc_fn != NULL)
*alloc_fn = NULL;
@@ -35,4 +35,3 @@ void async_local_cleanup(void)
{
}
#endif
-
diff --git a/crypto/async/arch/async_null.h b/crypto/async/arch/async_null.h
index 536c9829cd..6be0b96f9e 100644
--- a/crypto/async/arch/async_null.h
+++ b/crypto/async/arch/async_null.h
@@ -14,19 +14,18 @@
* to NULL.
*/
#ifndef ASYNC_ARCH
-# define ASYNC_NULL
-# define ASYNC_ARCH
+#define ASYNC_NULL
+#define ASYNC_ARCH
typedef struct async_fibre_st {
int dummy;
} async_fibre;
-
-# define async_fibre_swapcontext(o,n,r) 0
-# define async_fibre_makecontext(c) 0
-# define async_fibre_free(f)
-# define async_fibre_init_dispatcher(f)
-# define async_local_init() 1
-# define async_local_deinit()
+#define async_fibre_swapcontext(o, n, r) 0
+#define async_fibre_makecontext(c) 0
+#define async_fibre_free(f)
+#define async_fibre_init_dispatcher(f)
+#define async_local_init() 1
+#define async_local_deinit()
#endif
diff --git a/crypto/async/arch/async_posix.c b/crypto/async/arch/async_posix.c
index f2b507c7d0..46e2ce7559 100644
--- a/crypto/async/arch/async_posix.c
+++ b/crypto/async/arch/async_posix.c
@@ -12,12 +12,12 @@
#ifdef ASYNC_POSIX
-# include <stddef.h>
-# include <unistd.h>
-# include <openssl/err.h>
-# include <openssl/crypto.h>
+#include <stddef.h>
+#include <unistd.h>
+#include <openssl/err.h>
+#include <openssl/crypto.h>
-#define STACKSIZE 32768
+#define STACKSIZE 32768
static CRYPTO_RWLOCK *async_mem_lock;
@@ -51,7 +51,7 @@ int ASYNC_is_capable(void)
}
int ASYNC_set_mem_functions(ASYNC_stack_alloc_fn alloc_fn,
- ASYNC_stack_free_fn free_fn)
+ ASYNC_stack_free_fn free_fn)
{
OPENSSL_init_crypto(OPENSSL_INIT_ASYNC, NULL);
@@ -71,7 +71,7 @@ int ASYNC_set_mem_functions(ASYNC_stack_alloc_fn alloc_fn,
}
void ASYNC_get_mem_functions(ASYNC_stack_alloc_fn *alloc_fn,
- ASYNC_stack_free_fn *free_fn)
+ ASYNC_stack_free_fn *free_fn)
{
if (alloc_fn != NULL)
*alloc_fn = stack_alloc_impl;
diff --git a/crypto/async/arch/async_posix.h b/crypto/async/arch/async_posix.h
index b953d2e9f9..449ca27d22 100644
--- a/crypto/async/arch/async_posix.h
+++ b/crypto/async/arch/async_posix.h
@@ -11,22 +11,22 @@
#define OSSL_CRYPTO_ASYNC_POSIX_H
#include <openssl/e_os2.h>
-#if defined(OPENSSL_SYS_UNIX) \
+#if defined(OPENSSL_SYS_UNIX) \
&& defined(OPENSSL_THREADS) && !defined(OPENSSL_NO_ASYNC) \
- && !defined(__ANDROID__) && !defined(__OpenBSD__) \
+ && !defined(__ANDROID__) && !defined(__OpenBSD__) \
&& !defined(OPENSSL_SYS_TANDEM)
-# include <unistd.h>
+#include <unistd.h>
-# if _POSIX_VERSION >= 200112L \
+#if _POSIX_VERSION >= 200112L \
&& (_POSIX_VERSION < 200809L || defined(__GLIBC__) || defined(__FreeBSD__))
-# include <pthread.h>
+#include <pthread.h>
-# define ASYNC_POSIX
-# define ASYNC_ARCH
+#define ASYNC_POSIX
+#define ASYNC_ARCH
-# if defined(__CET__) || defined(__ia64__)
+#if defined(__CET__) || defined(__ia64__)
/*
* When Intel CET is enabled, makecontext will create a different
* shadow stack for each context. async_fibre_swapcontext cannot
@@ -35,9 +35,9 @@
* On IA64 the register stack engine is not saved across setjmp/longjmp. Here
* swapcontext() performs correctly.
*/
-# define USE_SWAPCONTEXT
-# endif
-# if defined(__aarch64__) && defined(__clang__) \
+#define USE_SWAPCONTEXT
+#endif
+#if defined(__aarch64__) && defined(__clang__) \
&& defined(__ARM_FEATURE_BTI_DEFAULT) && __ARM_FEATURE_BTI_DEFAULT == 1
/*
* setjmp/longjmp don't currently work with BTI on all libc implementations
@@ -47,23 +47,23 @@
* So use the swapcontext implementation, which does work.
* See https://github.com/llvm/llvm-project/issues/48888.
*/
-# define USE_SWAPCONTEXT
-# endif
-# if defined(OPENSSL_SYS_TANDEM)
-# include <tdmsig.h>
-# else
-# include <ucontext.h>
-# endif
-# ifndef USE_SWAPCONTEXT
-# include <setjmp.h>
-# endif
+#define USE_SWAPCONTEXT
+#endif
+#if defined(OPENSSL_SYS_TANDEM)
+#include <tdmsig.h>
+#else
+#include <ucontext.h>
+#endif
+#ifndef USE_SWAPCONTEXT
+#include <setjmp.h>
+#endif
typedef struct async_fibre_st {
ucontext_t fibre;
-# ifndef USE_SWAPCONTEXT
+#ifndef USE_SWAPCONTEXT
jmp_buf env;
int env_init;
-# endif
+#endif
} async_fibre;
int async_local_init(void);
@@ -71,9 +71,9 @@ void async_local_deinit(void);
static ossl_inline int async_fibre_swapcontext(async_fibre *o, async_fibre *n, int r)
{
-# ifdef USE_SWAPCONTEXT
+#ifdef USE_SWAPCONTEXT
swapcontext(&o->fibre, &n->fibre);
-# else
+#else
o->env_init = 1;
if (!r || !_setjmp(o->env)) {
@@ -82,16 +82,16 @@ static ossl_inline int async_fibre_swapcontext(async_fibre *o, async_fibre *n, i
else
setcontext(&n->fibre);
}
-# endif
+#endif
return 1;
}
-# define async_fibre_init_dispatcher(d)
+#define async_fibre_init_dispatcher(d)
int async_fibre_makecontext(async_fibre *fibre);
void async_fibre_free(async_fibre *fibre);
-# endif
+#endif
#endif
#endif /* OSSL_CRYPTO_ASYNC_POSIX_H */
diff --git a/crypto/async/arch/async_win.c b/crypto/async/arch/async_win.c
index cbb8ef24ed..849da5c3c4 100644
--- a/crypto/async/arch/async_win.c
+++ b/crypto/async/arch/async_win.c
@@ -12,8 +12,8 @@
#ifdef ASYNC_WIN
-# include <windows.h>
-# include "internal/cryptlib.h"
+#include <windows.h>
+#include "internal/cryptlib.h"
int ASYNC_is_capable(void)
{
@@ -21,13 +21,13 @@ int ASYNC_is_capable(void)
}
int ASYNC_set_mem_functions(ASYNC_stack_alloc_fn alloc_fn,
- ASYNC_stack_free_fn free_fn)
+ ASYNC_stack_free_fn free_fn)
{
return 0;
}
void ASYNC_get_mem_functions(ASYNC_stack_alloc_fn *alloc_fn,
- ASYNC_stack_free_fn *free_fn)
+ ASYNC_stack_free_fn *free_fn)
{
if (alloc_fn != NULL)
*alloc_fn = NULL;
@@ -49,11 +49,11 @@ void async_local_cleanup(void)
int async_fibre_init_dispatcher(async_fibre *fibre)
{
-# if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x600
+#if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x600
fibre->fibre = ConvertThreadToFiberEx(NULL, FIBER_FLAG_FLOAT_SWITCH);
-# else
+#else
fibre->fibre = ConvertThreadToFiber(NULL);
-# endif
+#endif
if (fibre->fibre == NULL) {
fibre->converted = 0;
fibre->fibre = GetCurrentFiber();
diff --git a/crypto/async/arch/async_win.h b/crypto/async/arch/async_win.h
index 6a61a9a380..ef134f53ab 100644
--- a/crypto/async/arch/async_win.h
+++ b/crypto/async/arch/async_win.h
@@ -13,32 +13,32 @@
*/
#if defined(_WIN32) && !defined(OPENSSL_NO_ASYNC)
#include <openssl/async.h>
-# define ASYNC_WIN
-# define ASYNC_ARCH
+#define ASYNC_WIN
+#define ASYNC_ARCH
-# include <windows.h>
-# include "internal/cryptlib.h"
+#include <windows.h>
+#include "internal/cryptlib.h"
typedef struct async_fibre_st {
LPVOID fibre;
int converted;
} async_fibre;
-# define async_fibre_swapcontext(o,n,r) \
- (SwitchToFiber((n)->fibre), 1)
-
-# if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x600
-# define async_fibre_makecontext(c) \
- ((c)->fibre = CreateFiberEx(0, 0, FIBER_FLAG_FLOAT_SWITCH, \
- async_start_func_win, 0))
-# else
-# define async_fibre_makecontext(c) \
- ((c)->fibre = CreateFiber(0, async_start_func_win, 0))
-# endif
-
-# define async_fibre_free(f) (DeleteFiber((f)->fibre))
-# define async_local_init() 1
-# define async_local_deinit()
+#define async_fibre_swapcontext(o, n, r) \
+ (SwitchToFiber((n)->fibre), 1)
+
+#if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x600
+#define async_fibre_makecontext(c) \
+ ((c)->fibre = CreateFiberEx(0, 0, FIBER_FLAG_FLOAT_SWITCH, \
+ async_start_func_win, 0))
+#else
+#define async_fibre_makecontext(c) \
+ ((c)->fibre = CreateFiber(0, async_start_func_win, 0))
+#endif
+
+#define async_fibre_free(f) (DeleteFiber((f)->fibre))
+#define async_local_init() 1
+#define async_local_deinit()
int async_fibre_init_dispatcher(async_fibre *fibre);
VOID CALLBACK async_start_func_win(PVOID unused);
diff --git a/crypto/async/async.c b/crypto/async/async.c
index 8e3760c2aa..ff55ef77ba 100644
--- a/crypto/async/async.c
+++ b/crypto/async/async.c
@@ -23,10 +23,10 @@
#include "crypto/cryptlib.h"
#include <string.h>
-#define ASYNC_JOB_RUNNING 0
-#define ASYNC_JOB_PAUSING 1
-#define ASYNC_JOB_PAUSED 2
-#define ASYNC_JOB_STOPPING 3
+#define ASYNC_JOB_RUNNING 0
+#define ASYNC_JOB_PAUSING 1
+#define ASYNC_JOB_PAUSED 2
+#define ASYNC_JOB_STOPPING 3
static void async_delete_thread_state(void *arg);
@@ -45,7 +45,7 @@ static async_ctx *async_ctx_new(void)
nctx->currjob = NULL;
nctx->blocked = 0;
if (!CRYPTO_THREAD_set_local_ex(CRYPTO_THREAD_LOCAL_ASYNC_CTX_KEY,
- CRYPTO_THREAD_NO_CONTEXT, nctx))
+ CRYPTO_THREAD_NO_CONTEXT, nctx))
goto err;
return nctx;
@@ -58,7 +58,7 @@ err:
async_ctx *async_get_ctx(void)
{
return (async_ctx *)CRYPTO_THREAD_get_local_ex(CRYPTO_THREAD_LOCAL_ASYNC_CTX_KEY,
- CRYPTO_THREAD_NO_CONTEXT);
+ CRYPTO_THREAD_NO_CONTEXT);
}
static int async_ctx_free(void)
@@ -68,7 +68,7 @@ static int async_ctx_free(void)
ctx = async_get_ctx();
if (!CRYPTO_THREAD_set_local_ex(CRYPTO_THREAD_LOCAL_ASYNC_CTX_KEY,
- CRYPTO_THREAD_NO_CONTEXT, NULL))
+ CRYPTO_THREAD_NO_CONTEXT, NULL))
return 0;
OPENSSL_free(ctx);
@@ -98,12 +98,13 @@ static void async_job_free(ASYNC_JOB *job)
}
}
-static ASYNC_JOB *async_get_pool_job(void) {
+static ASYNC_JOB *async_get_pool_job(void)
+{
ASYNC_JOB *job;
async_pool *pool;
pool = (async_pool *)CRYPTO_THREAD_get_local_ex(CRYPTO_THREAD_LOCAL_ASYNC_POOL_KEY,
- CRYPTO_THREAD_NO_CONTEXT);
+ CRYPTO_THREAD_NO_CONTEXT);
if (pool == NULL) {
/*
* Pool has not been initialised, so init with the defaults, i.e.
@@ -112,7 +113,7 @@ static ASYNC_JOB *async_get_pool_job(void) {
if (ASYNC_init_thread(0, 0) == 0)
return NULL;
pool = (async_pool *)CRYPTO_THREAD_get_local_ex(CRYPTO_THREAD_LOCAL_ASYNC_POOL_KEY,
- CRYPTO_THREAD_NO_CONTEXT);
+ CRYPTO_THREAD_NO_CONTEXT);
}
job = sk_ASYNC_JOB_pop(pool->jobs);
@@ -123,7 +124,7 @@ static ASYNC_JOB *async_get_pool_job(void) {
job = async_job_new();
if (job != NULL) {
- if (! async_fibre_makecontext(&job->fibrectx)) {
+ if (!async_fibre_makecontext(&job->fibrectx)) {
async_job_free(job);
return NULL;
}
@@ -133,11 +134,12 @@ static ASYNC_JOB *async_get_pool_job(void) {
return job;
}
-static void async_release_job(ASYNC_JOB *job) {
+static void async_release_job(ASYNC_JOB *job)
+{
async_pool *pool;
pool = (async_pool *)CRYPTO_THREAD_get_local_ex(CRYPTO_THREAD_LOCAL_ASYNC_POOL_KEY,
- CRYPTO_THREAD_NO_CONTEXT);
+ CRYPTO_THREAD_NO_CONTEXT);
if (pool == NULL) {
ERR_raise(ERR_LIB_ASYNC, ERR_R_INTERNAL_ERROR);
return;
@@ -164,7 +166,7 @@ void async_start_func(void)
/* Stop the job */
job->status = ASYNC_JOB_STOPPING;
if (!async_fibre_swapcontext(&job->fibrectx,
- &ctx->dispatcher, 1)) {
+ &ctx->dispatcher, 1)) {
/*
* Should not happen. Getting here will close the thread...can't do
* much about it
@@ -175,7 +177,7 @@ void async_start_func(void)
}
int ASYNC_start_job(ASYNC_JOB **job, ASYNC_WAIT_CTX *wctx, int *ret,
- int (*func)(void *), void *args, size_t size)
+ int (*func)(void *), void *args, size_t size)
{
async_ctx *ctx;
OSSL_LIB_CTX *libctx;
@@ -293,8 +295,8 @@ int ASYNC_pause_job(void)
async_ctx *ctx = async_get_ctx();
if (ctx == NULL
- || ctx->currjob == NULL
- || ctx->blocked) {
+ || ctx->currjob == NULL
+ || ctx->blocked) {
/*
* Could be we've deliberately not been started within a job so this is
* counted as success.
@@ -306,7 +308,7 @@ int ASYNC_pause_job(void)
job->status = ASYNC_JOB_PAUSING;
if (!async_fibre_swapcontext(&job->fibrectx,
- &ctx->dispatcher, 1)) {
+ &ctx->dispatcher, 1)) {
ERR_raise(ERR_LIB_ASYNC, ASYNC_R_FAILED_TO_SWAP_CONTEXT);
return 0;
}
@@ -386,7 +388,7 @@ int ASYNC_init_thread(size_t max_size, size_t init_size)
}
pool->curr_size = curr_size;
if (!CRYPTO_THREAD_set_local_ex(CRYPTO_THREAD_LOCAL_ASYNC_POOL_KEY,
- CRYPTO_THREAD_NO_CONTEXT, pool)) {
+ CRYPTO_THREAD_NO_CONTEXT, pool)) {
ERR_raise(ERR_LIB_ASYNC, ASYNC_R_FAILED_TO_SET_POOL);
goto err;
}
@@ -402,14 +404,14 @@ err:
static void async_delete_thread_state(void *arg)
{
async_pool *pool = (async_pool *)CRYPTO_THREAD_get_local_ex(CRYPTO_THREAD_LOCAL_ASYNC_POOL_KEY,
- CRYPTO_THREAD_NO_CONTEXT);
+ CRYPTO_THREAD_NO_CONTEXT);
if (pool != NULL) {
async_empty_pool(pool);
sk_ASYNC_JOB_free(pool->jobs);
OPENSSL_free(pool);
CRYPTO_THREAD_set_local_ex(CRYPTO_THREAD_LOCAL_ASYNC_POOL_KEY,
- CRYPTO_THREAD_NO_CONTEXT, NULL);
+ CRYPTO_THREAD_NO_CONTEXT, NULL);
}
async_local_cleanup();
async_ctx_free();
diff --git a/crypto/async/async_err.c b/crypto/async/async_err.c
index 34db12fb96..1e28eb7823 100644
--- a/crypto/async/async_err.c
+++ b/crypto/async/async_err.c
@@ -15,14 +15,14 @@
#ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA ASYNC_str_reasons[] = {
- {ERR_PACK(ERR_LIB_ASYNC, 0, ASYNC_R_FAILED_TO_SET_POOL),
- "failed to set pool"},
- {ERR_PACK(ERR_LIB_ASYNC, 0, ASYNC_R_FAILED_TO_SWAP_CONTEXT),
- "failed to swap context"},
- {ERR_PACK(ERR_LIB_ASYNC, 0, ASYNC_R_INIT_FAILED), "init failed"},
- {ERR_PACK(ERR_LIB_ASYNC, 0, ASYNC_R_INVALID_POOL_SIZE),
- "invalid pool size"},
- {0, NULL}
+ { ERR_PACK(ERR_LIB_ASYNC, 0, ASYNC_R_FAILED_TO_SET_POOL),
+ "failed to set pool" },
+ { ERR_PACK(ERR_LIB_ASYNC, 0, ASYNC_R_FAILED_TO_SWAP_CONTEXT),
+ "failed to swap context" },
+ { ERR_PACK(ERR_LIB_ASYNC, 0, ASYNC_R_INIT_FAILED), "init failed" },
+ { ERR_PACK(ERR_LIB_ASYNC, 0, ASYNC_R_INVALID_POOL_SIZE),
+ "invalid pool size" },
+ { 0, NULL }
};
#endif
diff --git a/crypto/async/async_local.h b/crypto/async/async_local.h
index c06f413cf6..9690adbb1e 100644
--- a/crypto/async/async_local.h
+++ b/crypto/async/async_local.h
@@ -12,12 +12,12 @@
* includes <signal.h> which includes <ucontext.h>
*/
#if defined(__APPLE__) && defined(__MACH__) && !defined(_XOPEN_SOURCE)
-# define _XOPEN_SOURCE /* Otherwise incomplete ucontext_t structure */
-# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#define _XOPEN_SOURCE /* Otherwise incomplete ucontext_t structure */
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
#if defined(_WIN32)
-# include <windows.h>
+#include <windows.h>
#endif
#include "crypto/async.h"
@@ -38,7 +38,7 @@ struct async_ctx_st {
struct async_job_st {
async_fibre fibrectx;
- int (*func) (void *);
+ int (*func)(void *);
void *funcargs;
int ret;
int status;
@@ -78,4 +78,3 @@ void async_start_func(void);
async_ctx *async_get_ctx(void);
void async_wait_ctx_reset_counts(ASYNC_WAIT_CTX *ctx);
-
diff --git a/crypto/async/async_wait.c b/crypto/async/async_wait.c
index cf4db49dae..662cd74dd1 100644
--- a/crypto/async/async_wait.c
+++ b/crypto/async/async_wait.c
@@ -42,9 +42,9 @@ void ASYNC_WAIT_CTX_free(ASYNC_WAIT_CTX *ctx)
}
int ASYNC_WAIT_CTX_set_wait_fd(ASYNC_WAIT_CTX *ctx, const void *key,
- OSSL_ASYNC_FD fd, void *custom_data,
- void (*cleanup)(ASYNC_WAIT_CTX *, const void *,
- OSSL_ASYNC_FD, void *))
+ OSSL_ASYNC_FD fd, void *custom_data,
+ void (*cleanup)(ASYNC_WAIT_CTX *, const void *,
+ OSSL_ASYNC_FD, void *))
{
struct fd_lookup_st *fdlookup;
@@ -63,7 +63,7 @@ int ASYNC_WAIT_CTX_set_wait_fd(ASYNC_WAIT_CTX *ctx, const void *key,
}
int ASYNC_WAIT_CTX_get_fd(ASYNC_WAIT_CTX *ctx, const void *key,
- OSSL_ASYNC_FD *fd, void **custom_data)
+ OSSL_ASYNC_FD *fd, void **custom_data)
{
struct fd_lookup_st *curr;
@@ -85,7 +85,7 @@ int ASYNC_WAIT_CTX_get_fd(ASYNC_WAIT_CTX *ctx, const void *key,
}
int ASYNC_WAIT_CTX_get_all_fds(ASYNC_WAIT_CTX *ctx, OSSL_ASYNC_FD *fd,
- size_t *numfds)
+ size_t *numfds)
{
struct fd_lookup_st *curr;
@@ -108,8 +108,8 @@ int ASYNC_WAIT_CTX_get_all_fds(ASYNC_WAIT_CTX *ctx, OSSL_ASYNC_FD *fd,
}
int ASYNC_WAIT_CTX_get_changed_fds(ASYNC_WAIT_CTX *ctx, OSSL_ASYNC_FD *addfd,
- size_t *numaddfds, OSSL_ASYNC_FD *delfd,
- size_t *numdelfds)
+ size_t *numaddfds, OSSL_ASYNC_FD *delfd,
+ size_t *numdelfds)
{
struct fd_lookup_st *curr;
@@ -182,38 +182,38 @@ int ASYNC_WAIT_CTX_clear_fd(ASYNC_WAIT_CTX *ctx, const void *key)
}
int ASYNC_WAIT_CTX_set_callback(ASYNC_WAIT_CTX *ctx,
- ASYNC_callback_fn callback,
- void *callback_arg)
+ ASYNC_callback_fn callback,
+ void *callback_arg)
{
- if (ctx == NULL)
- return 0;
+ if (ctx == NULL)
+ return 0;
- ctx->callback = callback;
- ctx->callback_arg = callback_arg;
- return 1;
+ ctx->callback = callback;
+ ctx->callback_arg = callback_arg;
+ return 1;
}
int ASYNC_WAIT_CTX_get_callback(ASYNC_WAIT_CTX *ctx,
- ASYNC_callback_fn *callback,
- void **callback_arg)
+ ASYNC_callback_fn *callback,
+ void **callback_arg)
{
- if (ctx->callback == NULL)
- return 0;
+ if (ctx->callback == NULL)
+ return 0;
- *callback = ctx->callback;
- *callback_arg = ctx->callback_arg;
- return 1;
+ *callback = ctx->callback;
+ *callback_arg = ctx->callback_arg;
+ return 1;
}
int ASYNC_WAIT_CTX_set_status(ASYNC_WAIT_CTX *ctx, int status)
{
- ctx->status = status;
- return 1;
+ ctx->status = status;
+ return 1;
}
int ASYNC_WAIT_CTX_get_status(ASYNC_WAIT_CTX *ctx)
{
- return ctx->status;
+ return ctx->status;
}
void async_wait_ctx_reset_counts(ASYNC_WAIT_CTX *ctx)
diff --git a/crypto/bf/bf_cfb64.c b/crypto/bf/bf_cfb64.c
index d7a9266204..e380972dbd 100644
--- a/crypto/bf/bf_cfb64.c
+++ b/crypto/bf/bf_cfb64.c
@@ -23,8 +23,8 @@
*/
void BF_cfb64_encrypt(const unsigned char *in, unsigned char *out,
- long length, const BF_KEY *schedule,
- unsigned char *ivec, int *num, int encrypt)
+ long length, const BF_KEY *schedule,
+ unsigned char *ivec, int *num, int encrypt)
{
register BF_LONG v0, v1, t;
register int n = *num;
diff --git a/crypto/bf/bf_ecb.c b/crypto/bf/bf_ecb.c
index b02768261d..cee1bf138e 100644
--- a/crypto/bf/bf_ecb.c
+++ b/crypto/bf/bf_ecb.c
@@ -29,7 +29,7 @@ const char *BF_options(void)
}
void BF_ecb_encrypt(const unsigned char *in, unsigned char *out,
- const BF_KEY *key, int encrypt)
+ const BF_KEY *key, int encrypt)
{
BF_LONG l, d[2];
diff --git a/crypto/bf/bf_enc.c b/crypto/bf/bf_enc.c
index 40ddaf4af6..39a6e1bbb9 100644
--- a/crypto/bf/bf_enc.c
+++ b/crypto/bf/bf_enc.c
@@ -23,7 +23,7 @@
*/
#if (BF_ROUNDS != 16) && (BF_ROUNDS != 20)
-# error If you set BF_ROUNDS to some value other than 16 or 20, you will have \
+#error If you set BF_ROUNDS to some value other than 16 or 20, you will have \
to modify the code.
#endif
@@ -54,12 +54,12 @@ void BF_encrypt(BF_LONG *data, const BF_KEY *key)
BF_ENC(l, r, s, p[14]);
BF_ENC(r, l, s, p[15]);
BF_ENC(l, r, s, p[16]);
-# if BF_ROUNDS == 20
+#if BF_ROUNDS == 20
BF_ENC(r, l, s, p[17]);
BF_ENC(l, r, s, p[18]);
BF_ENC(r, l, s, p[19]);
BF_ENC(l, r, s, p[20]);
-# endif
+#endif
r ^= p[BF_ROUNDS + 1];
data[1] = l & 0xffffffffU;
@@ -77,12 +77,12 @@ void BF_decrypt(BF_LONG *data, const BF_KEY *key)
r = data[1];
l ^= p[BF_ROUNDS + 1];
-# if BF_ROUNDS == 20
+#if BF_ROUNDS == 20
BF_ENC(r, l, s, p[20]);
BF_ENC(l, r, s, p[19]);
BF_ENC(r, l, s, p[18]);
BF_ENC(l, r, s, p[17]);
-# endif
+#endif
BF_ENC(r, l, s, p[16]);
BF_ENC(l, r, s, p[15]);
BF_ENC(r, l, s, p[14]);
@@ -106,7 +106,7 @@ void BF_decrypt(BF_LONG *data, const BF_KEY *key)
}
void BF_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
- const BF_KEY *schedule, unsigned char *ivec, int encrypt)
+ const BF_KEY *schedule, unsigned char *ivec, int encrypt)
{
register BF_LONG tin0, tin1;
register BF_LONG tout0, tout1, xor0, xor1;
diff --git a/crypto/bf/bf_local.h b/crypto/bf/bf_local.h
index 53c6963e6b..8634a57ceb 100644
--- a/crypto/bf/bf_local.h
+++ b/crypto/bf/bf_local.h
@@ -8,77 +8,91 @@
*/
#ifndef OSSL_CRYPTO_BF_LOCAL_H
-# define OSSL_CRYPTO_BF_LOCAL_H
-# include <openssl/opensslconf.h>
+#define OSSL_CRYPTO_BF_LOCAL_H
+#include <openssl/opensslconf.h>
/* NOTE - c is not incremented as per n2l */
-# define n2ln(c,l1,l2,n) { \
- c+=n; \
- l1=l2=0; \
- switch (n) { \
- case 8: l2 =((unsigned long)(*(--(c)))) ; \
- /* fall through */ \
- case 7: l2|=((unsigned long)(*(--(c))))<< 8; \
- /* fall through */ \
- case 6: l2|=((unsigned long)(*(--(c))))<<16; \
- /* fall through */ \
- case 5: l2|=((unsigned long)(*(--(c))))<<24; \
- /* fall through */ \
- case 4: l1 =((unsigned long)(*(--(c)))) ; \
- /* fall through */ \
- case 3: l1|=((unsigned long)(*(--(c))))<< 8; \
- /* fall through */ \
- case 2: l1|=((unsigned long)(*(--(c))))<<16; \
- /* fall through */ \
- case 1: l1|=((unsigned long)(*(--(c))))<<24; \
- } \
- }
+#define n2ln(c, l1, l2, n) \
+ { \
+ c += n; \
+ l1 = l2 = 0; \
+ switch (n) { \
+ case 8: \
+ l2 = ((unsigned long)(*(--(c)))); \
+ /* fall through */ \
+ case 7: \
+ l2 |= ((unsigned long)(*(--(c)))) << 8; \
+ /* fall through */ \
+ case 6: \
+ l2 |= ((unsigned long)(*(--(c)))) << 16; \
+ /* fall through */ \
+ case 5: \
+ l2 |= ((unsigned long)(*(--(c)))) << 24; \
+ /* fall through */ \
+ case 4: \
+ l1 = ((unsigned long)(*(--(c)))); \
+ /* fall through */ \
+ case 3: \
+ l1 |= ((unsigned long)(*(--(c)))) << 8; \
+ /* fall through */ \
+ case 2: \
+ l1 |= ((unsigned long)(*(--(c)))) << 16; \
+ /* fall through */ \
+ case 1: \
+ l1 |= ((unsigned long)(*(--(c)))) << 24; \
+ } \
+ }
/* NOTE - c is not incremented as per l2n */
-# define l2nn(l1,l2,c,n) { \
- c+=n; \
- switch (n) { \
- case 8: *(--(c))=(unsigned char)(((l2) )&0xff); \
- /* fall through */ \
- case 7: *(--(c))=(unsigned char)(((l2)>> 8)&0xff); \
- /* fall through */ \
- case 6: *(--(c))=(unsigned char)(((l2)>>16)&0xff); \
- /* fall through */ \
- case 5: *(--(c))=(unsigned char)(((l2)>>24)&0xff); \
- /* fall through */ \
- case 4: *(--(c))=(unsigned char)(((l1) )&0xff); \
- /* fall through */ \
- case 3: *(--(c))=(unsigned char)(((l1)>> 8)&0xff); \
- /* fall through */ \
- case 2: *(--(c))=(unsigned char)(((l1)>>16)&0xff); \
- /* fall through */ \
- case 1: *(--(c))=(unsigned char)(((l1)>>24)&0xff); \
- } \
- }
+#define l2nn(l1, l2, c, n) \
+ { \
+ c += n; \
+ switch (n) { \
+ case 8: \
+ *(--(c)) = (unsigned char)(((l2)) & 0xff); \
+ /* fall through */ \
+ case 7: \
+ *(--(c)) = (unsigned char)(((l2) >> 8) & 0xff); \
+ /* fall through */ \
+ case 6: \
+ *(--(c)) = (unsigned char)(((l2) >> 16) & 0xff); \
+ /* fall through */ \
+ case 5: \
+ *(--(c)) = (unsigned char)(((l2) >> 24) & 0xff); \
+ /* fall through */ \
+ case 4: \
+ *(--(c)) = (unsigned char)(((l1)) & 0xff); \
+ /* fall through */ \
+ case 3: \
+ *(--(c)) = (unsigned char)(((l1) >> 8) & 0xff); \
+ /* fall through */ \
+ case 2: \
+ *(--(c)) = (unsigned char)(((l1) >> 16) & 0xff); \
+ /* fall through */ \
+ case 1: \
+ *(--(c)) = (unsigned char)(((l1) >> 24) & 0xff); \
+ } \
+ }
-# undef n2l
-# define n2l(c,l) (l =((unsigned long)(*((c)++)))<<24L, \
- l|=((unsigned long)(*((c)++)))<<16L, \
- l|=((unsigned long)(*((c)++)))<< 8L, \
- l|=((unsigned long)(*((c)++))))
+#undef n2l
+#define n2l(c, l) (l = ((unsigned long)(*((c)++))) << 24L, \
+ l |= ((unsigned long)(*((c)++))) << 16L, \
+ l |= ((unsigned long)(*((c)++))) << 8L, \
+ l |= ((unsigned long)(*((c)++))))
-# undef l2n
-# define l2n(l,c) (*((c)++)=(unsigned char)(((l)>>24L)&0xff), \
- *((c)++)=(unsigned char)(((l)>>16L)&0xff), \
- *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \
- *((c)++)=(unsigned char)(((l) )&0xff))
+#undef l2n
+#define l2n(l, c) (*((c)++) = (unsigned char)(((l) >> 24L) & 0xff), \
+ *((c)++) = (unsigned char)(((l) >> 16L) & 0xff), \
+ *((c)++) = (unsigned char)(((l) >> 8L) & 0xff), \
+ *((c)++) = (unsigned char)(((l)) & 0xff))
/*
* This is actually a big endian algorithm, the most significant byte is used
* to lookup array 0
*/
-# define BF_ENC(LL,R,S,P) ( \
- LL^=P, \
- LL^=((( S[ ((R>>24)&0xff)] + \
- S[0x0100+((R>>16)&0xff)])^ \
- S[0x0200+((R>> 8)&0xff)])+ \
- S[0x0300+((R )&0xff)])&0xffffffffU \
- )
+#define BF_ENC(LL, R, S, P) ( \
+ LL ^= P, \
+ LL ^= (((S[((R >> 24) & 0xff)] + S[0x0100 + ((R >> 16) & 0xff)]) ^ S[0x0200 + ((R >> 8) & 0xff)]) + S[0x0300 + ((R) & 0xff)]) & 0xffffffffU)
#endif
diff --git a/crypto/bf/bf_ofb64.c b/crypto/bf/bf_ofb64.c
index 086c3f07f0..5c9193add1 100644
--- a/crypto/bf/bf_ofb64.c
+++ b/crypto/bf/bf_ofb64.c
@@ -22,8 +22,8 @@
* used is contained in *num;
*/
void BF_ofb64_encrypt(const unsigned char *in, unsigned char *out,
- long length, const BF_KEY *schedule,
- unsigned char *ivec, int *num)
+ long length, const BF_KEY *schedule,
+ unsigned char *ivec, int *num)
{
register BF_LONG v0, v1, t;
register int n = *num;
diff --git a/crypto/bf/bf_pi.h b/crypto/bf/bf_pi.h
index 8b9896e7f3..ffb3b3e9b3 100644
--- a/crypto/bf/bf_pi.h
+++ b/crypto/bf/bf_pi.h
@@ -8,523 +8,1035 @@
*/
static const BF_KEY bf_init = {
+ { 0x243f6a88L, 0x85a308d3L, 0x13198a2eL, 0x03707344L,
+ 0xa4093822L, 0x299f31d0L, 0x082efa98L, 0xec4e6c89L,
+ 0x452821e6L, 0x38d01377L, 0xbe5466cfL, 0x34e90c6cL,
+ 0xc0ac29b7L, 0xc97c50ddL, 0x3f84d5b5L, 0xb5470917L,
+ 0x9216d5d9L, 0x8979fb1b },
{
- 0x243f6a88L, 0x85a308d3L, 0x13198a2eL, 0x03707344L,
- 0xa4093822L, 0x299f31d0L, 0x082efa98L, 0xec4e6c89L,
- 0x452821e6L, 0x38d01377L, 0xbe5466cfL, 0x34e90c6cL,
- 0xc0ac29b7L, 0xc97c50ddL, 0x3f84d5b5L, 0xb5470917L,
- 0x9216d5d9L, 0x8979fb1b}, {
- 0xd1310ba6L, 0x98dfb5acL, 0x2ffd72dbL,
- 0xd01adfb7L,
- 0xb8e1afedL, 0x6a267e96L, 0xba7c9045L,
- 0xf12c7f99L,
- 0x24a19947L, 0xb3916cf7L, 0x0801f2e2L,
- 0x858efc16L,
- 0x636920d8L, 0x71574e69L, 0xa458fea3L,
- 0xf4933d7eL,
- 0x0d95748fL, 0x728eb658L, 0x718bcd58L,
- 0x82154aeeL,
- 0x7b54a41dL, 0xc25a59b5L, 0x9c30d539L,
- 0x2af26013L,
- 0xc5d1b023L, 0x286085f0L, 0xca417918L,
- 0xb8db38efL,
- 0x8e79dcb0L, 0x603a180eL, 0x6c9e0e8bL,
- 0xb01e8a3eL,
- 0xd71577c1L, 0xbd314b27L, 0x78af2fdaL,
- 0x55605c60L,
- 0xe65525f3L, 0xaa55ab94L, 0x57489862L,
- 0x63e81440L,
- 0x55ca396aL, 0x2aab10b6L, 0xb4cc5c34L,
- 0x1141e8ceL,
- 0xa15486afL, 0x7c72e993L, 0xb3ee1411L,
- 0x636fbc2aL,
- 0x2ba9c55dL, 0x741831f6L, 0xce5c3e16L,
- 0x9b87931eL,
- 0xafd6ba33L, 0x6c24cf5cL, 0x7a325381L,
- 0x28958677L,
- 0x3b8f4898L, 0x6b4bb9afL, 0xc4bfe81bL,
- 0x66282193L,
- 0x61d809ccL, 0xfb21a991L, 0x487cac60L,
- 0x5dec8032L,
- 0xef845d5dL, 0xe98575b1L, 0xdc262302L,
- 0xeb651b88L,
- 0x23893e81L, 0xd396acc5L, 0x0f6d6ff3L,
- 0x83f44239L,
- 0x2e0b4482L, 0xa4842004L, 0x69c8f04aL,
- 0x9e1f9b5eL,
- 0x21c66842L, 0xf6e96c9aL, 0x670c9c61L,
- 0xabd388f0L,
- 0x6a51a0d2L, 0xd8542f68L, 0x960fa728L,
- 0xab5133a3L,
- 0x6eef0b6cL, 0x137a3be4L, 0xba3bf050L,
- 0x7efb2a98L,
- 0xa1f1651dL, 0x39af0176L, 0x66ca593eL,
- 0x82430e88L,
- 0x8cee8619L, 0x456f9fb4L, 0x7d84a5c3L,
- 0x3b8b5ebeL,
- 0xe06f75d8L, 0x85c12073L, 0x401a449fL,
- 0x56c16aa6L,
- 0x4ed3aa62L, 0x363f7706L, 0x1bfedf72L,
- 0x429b023dL,
- 0x37d0d724L, 0xd00a1248L, 0xdb0fead3L,
- 0x49f1c09bL,
- 0x075372c9L, 0x80991b7bL, 0x25d479d8L,
- 0xf6e8def7L,
- 0xe3fe501aL, 0xb6794c3bL, 0x976ce0bdL,
- 0x04c006baL,
- 0xc1a94fb6L, 0x409f60c4L, 0x5e5c9ec2L,
- 0x196a2463L,
- 0x68fb6fafL, 0x3e6c53b5L, 0x1339b2ebL,
- 0x3b52ec6fL,
- 0x6dfc511fL, 0x9b30952cL, 0xcc814544L,
- 0xaf5ebd09L,
- 0xbee3d004L, 0xde334afdL, 0x660f2807L,
- 0x192e4bb3L,
- 0xc0cba857L, 0x45c8740fL, 0xd20b5f39L,
- 0xb9d3fbdbL,
- 0x5579c0bdL, 0x1a60320aL, 0xd6a100c6L,
- 0x402c7279L,
- 0x679f25feL, 0xfb1fa3ccL, 0x8ea5e9f8L,
- 0xdb3222f8L,
- 0x3c7516dfL, 0xfd616b15L, 0x2f501ec8L,
- 0xad0552abL,
- 0x323db5faL, 0xfd238760L, 0x53317b48L,
- 0x3e00df82L,
- 0x9e5c57bbL, 0xca6f8ca0L, 0x1a87562eL,
- 0xdf1769dbL,
- 0xd542a8f6L, 0x287effc3L, 0xac6732c6L,
- 0x8c4f5573L,
- 0x695b27b0L, 0xbbca58c8L, 0xe1ffa35dL,
- 0xb8f011a0L,
- 0x10fa3d98L, 0xfd2183b8L, 0x4afcb56cL,
- 0x2dd1d35bL,
- 0x9a53e479L, 0xb6f84565L, 0xd28e49bcL,
- 0x4bfb9790L,
- 0xe1ddf2daL, 0xa4cb7e33L, 0x62fb1341L,
- 0xcee4c6e8L,
- 0xef20cadaL, 0x36774c01L, 0xd07e9efeL,
- 0x2bf11fb4L,
- 0x95dbda4dL, 0xae909198L, 0xeaad8e71L,
- 0x6b93d5a0L,
- 0xd08ed1d0L, 0xafc725e0L, 0x8e3c5b2fL,
- 0x8e7594b7L,
- 0x8ff6e2fbL, 0xf2122b64L, 0x8888b812L,
- 0x900df01cL,
- 0x4fad5ea0L, 0x688fc31cL, 0xd1cff191L,
- 0xb3a8c1adL,
- 0x2f2f2218L, 0xbe0e1777L, 0xea752dfeL,
- 0x8b021fa1L,
- 0xe5a0cc0fL, 0xb56f74e8L, 0x18acf3d6L,
- 0xce89e299L,
- 0xb4a84fe0L, 0xfd13e0b7L, 0x7cc43b81L,
- 0xd2ada8d9L,
- 0x165fa266L, 0x80957705L, 0x93cc7314L,
- 0x211a1477L,
- 0xe6ad2065L, 0x77b5fa86L, 0xc75442f5L,
- 0xfb9d35cfL,
- 0xebcdaf0cL, 0x7b3e89a0L, 0xd6411bd3L,
- 0xae1e7e49L,
- 0x00250e2dL, 0x2071b35eL, 0x226800bbL,
- 0x57b8e0afL,
- 0x2464369bL, 0xf009b91eL, 0x5563911dL,
- 0x59dfa6aaL,
- 0x78c14389L, 0xd95a537fL, 0x207d5ba2L,
- 0x02e5b9c5L,
- 0x83260376L, 0x6295cfa9L, 0x11c81968L,
- 0x4e734a41L,
- 0xb3472dcaL, 0x7b14a94aL, 0x1b510052L,
- 0x9a532915L,
- 0xd60f573fL, 0xbc9bc6e4L, 0x2b60a476L,
- 0x81e67400L,
- 0x08ba6fb5L, 0x571be91fL, 0xf296ec6bL,
- 0x2a0dd915L,
- 0xb6636521L, 0xe7b9f9b6L, 0xff34052eL,
- 0xc5855664L,
- 0x53b02d5dL, 0xa99f8fa1L, 0x08ba4799L,
- 0x6e85076aL,
- 0x4b7a70e9L, 0xb5b32944L, 0xdb75092eL,
- 0xc4192623L,
- 0xad6ea6b0L, 0x49a7df7dL, 0x9cee60b8L,
- 0x8fedb266L,
- 0xecaa8c71L, 0x699a17ffL, 0x5664526cL,
- 0xc2b19ee1L,
- 0x193602a5L, 0x75094c29L, 0xa0591340L,
- 0xe4183a3eL,
- 0x3f54989aL, 0x5b429d65L, 0x6b8fe4d6L,
- 0x99f73fd6L,
- 0xa1d29c07L, 0xefe830f5L, 0x4d2d38e6L,
- 0xf0255dc1L,
- 0x4cdd2086L, 0x8470eb26L, 0x6382e9c6L,
- 0x021ecc5eL,
- 0x09686b3fL, 0x3ebaefc9L, 0x3c971814L,
- 0x6b6a70a1L,
- 0x687f3584L, 0x52a0e286L, 0xb79c5305L,
- 0xaa500737L,
- 0x3e07841cL, 0x7fdeae5cL, 0x8e7d44ecL,
- 0x5716f2b8L,
- 0xb03ada37L, 0xf0500c0dL, 0xf01c1f04L,
- 0x0200b3ffL,
- 0xae0cf51aL, 0x3cb574b2L, 0x25837a58L,
- 0xdc0921bdL,
- 0xd19113f9L, 0x7ca92ff6L, 0x94324773L,
- 0x22f54701L,
- 0x3ae5e581L, 0x37c2dadcL, 0xc8b57634L,
- 0x9af3dda7L,
- 0xa9446146L, 0x0fd0030eL, 0xecc8c73eL,
- 0xa4751e41L,
- 0xe238cd99L, 0x3bea0e2fL, 0x3280bba1L,
- 0x183eb331L,
- 0x4e548b38L, 0x4f6db908L, 0x6f420d03L,
- 0xf60a04bfL,
- 0x2cb81290L, 0x24977c79L, 0x5679b072L,
- 0xbcaf89afL,
- 0xde9a771fL, 0xd9930810L, 0xb38bae12L,
- 0xdccf3f2eL,
- 0x5512721fL, 0x2e6b7124L, 0x501adde6L,
- 0x9f84cd87L,
- 0x7a584718L, 0x7408da17L, 0xbc9f9abcL,
- 0xe94b7d8cL,
- 0xec7aec3aL, 0xdb851dfaL, 0x63094366L,
- 0xc464c3d2L,
- 0xef1c1847L, 0x3215d908L, 0xdd433b37L,
- 0x24c2ba16L,
- 0x12a14d43L, 0x2a65c451L, 0x50940002L,
- 0x133ae4ddL,
- 0x71dff89eL, 0x10314e55L, 0x81ac77d6L,
- 0x5f11199bL,
- 0x043556f1L, 0xd7a3c76bL, 0x3c11183bL,
- 0x5924a509L,
- 0xf28fe6edL, 0x97f1fbfaL, 0x9ebabf2cL,
- 0x1e153c6eL,
- 0x86e34570L, 0xeae96fb1L, 0x860e5e0aL,
- 0x5a3e2ab3L,
- 0x771fe71cL, 0x4e3d06faL, 0x2965dcb9L,
- 0x99e71d0fL,
- 0x803e89d6L, 0x5266c825L, 0x2e4cc978L,
- 0x9c10b36aL,
- 0xc6150ebaL, 0x94e2ea78L, 0xa5fc3c53L,
- 0x1e0a2df4L,
- 0xf2f74ea7L, 0x361d2b3dL, 0x1939260fL,
- 0x19c27960L,
- 0x5223a708L, 0xf71312b6L, 0xebadfe6eL,
- 0xeac31f66L,
- 0xe3bc4595L, 0xa67bc883L, 0xb17f37d1L,
- 0x018cff28L,
- 0xc332ddefL, 0xbe6c5aa5L, 0x65582185L,
- 0x68ab9802L,
- 0xeecea50fL, 0xdb2f953bL, 0x2aef7dadL,
- 0x5b6e2f84L,
- 0x1521b628L, 0x29076170L, 0xecdd4775L,
- 0x619f1510L,
- 0x13cca830L, 0xeb61bd96L, 0x0334fe1eL,
- 0xaa0363cfL,
- 0xb5735c90L, 0x4c70a239L, 0xd59e9e0bL,
- 0xcbaade14L,
- 0xeecc86bcL, 0x60622ca7L, 0x9cab5cabL,
- 0xb2f3846eL,
- 0x648b1eafL, 0x19bdf0caL, 0xa02369b9L,
- 0x655abb50L,
- 0x40685a32L, 0x3c2ab4b3L, 0x319ee9d5L,
- 0xc021b8f7L,
- 0x9b540b19L, 0x875fa099L, 0x95f7997eL,
- 0x623d7da8L,
- 0xf837889aL, 0x97e32d77L, 0x11ed935fL,
- 0x16681281L,
- 0x0e358829L, 0xc7e61fd6L, 0x96dedfa1L,
- 0x7858ba99L,
- 0x57f584a5L, 0x1b227263L, 0x9b83c3ffL,
- 0x1ac24696L,
- 0xcdb30aebL, 0x532e3054L, 0x8fd948e4L,
- 0x6dbc3128L,
- 0x58ebf2efL, 0x34c6ffeaL, 0xfe28ed61L,
- 0xee7c3c73L,
- 0x5d4a14d9L, 0xe864b7e3L, 0x42105d14L,
- 0x203e13e0L,
- 0x45eee2b6L, 0xa3aaabeaL, 0xdb6c4f15L,
- 0xfacb4fd0L,
- 0xc742f442L, 0xef6abbb5L, 0x654f3b1dL,
- 0x41cd2105L,
- 0xd81e799eL, 0x86854dc7L, 0xe44b476aL,
- 0x3d816250L,
- 0xcf62a1f2L, 0x5b8d2646L, 0xfc8883a0L,
- 0xc1c7b6a3L,
- 0x7f1524c3L, 0x69cb7492L, 0x47848a0bL,
- 0x5692b285L,
- 0x095bbf00L, 0xad19489dL, 0x1462b174L,
- 0x23820e00L,
- 0x58428d2aL, 0x0c55f5eaL, 0x1dadf43eL,
- 0x233f7061L,
- 0x3372f092L, 0x8d937e41L, 0xd65fecf1L,
- 0x6c223bdbL,
- 0x7cde3759L, 0xcbee7460L, 0x4085f2a7L,
- 0xce77326eL,
- 0xa6078084L, 0x19f8509eL, 0xe8efd855L,
- 0x61d99735L,
- 0xa969a7aaL, 0xc50c06c2L, 0x5a04abfcL,
- 0x800bcadcL,
- 0x9e447a2eL, 0xc3453484L, 0xfdd56705L,
- 0x0e1e9ec9L,
- 0xdb73dbd3L, 0x105588cdL, 0x675fda79L,
- 0xe3674340L,
- 0xc5c43465L, 0x713e38d8L, 0x3d28f89eL,
- 0xf16dff20L,
- 0x153e21e7L, 0x8fb03d4aL, 0xe6e39f2bL,
- 0xdb83adf7L,
- 0xe93d5a68L, 0x948140f7L, 0xf64c261cL,
- 0x94692934L,
- 0x411520f7L, 0x7602d4f7L, 0xbcf46b2eL,
- 0xd4a20068L,
- 0xd4082471L, 0x3320f46aL, 0x43b7d4b7L,
- 0x500061afL,
- 0x1e39f62eL, 0x97244546L, 0x14214f74L,
- 0xbf8b8840L,
- 0x4d95fc1dL, 0x96b591afL, 0x70f4ddd3L,
- 0x66a02f45L,
- 0xbfbc09ecL, 0x03bd9785L, 0x7fac6dd0L,
- 0x31cb8504L,
- 0x96eb27b3L, 0x55fd3941L, 0xda2547e6L,
- 0xabca0a9aL,
- 0x28507825L, 0x530429f4L, 0x0a2c86daL,
- 0xe9b66dfbL,
- 0x68dc1462L, 0xd7486900L, 0x680ec0a4L,
- 0x27a18deeL,
- 0x4f3ffea2L, 0xe887ad8cL, 0xb58ce006L,
- 0x7af4d6b6L,
- 0xaace1e7cL, 0xd3375fecL, 0xce78a399L,
- 0x406b2a42L,
- 0x20fe9e35L, 0xd9f385b9L, 0xee39d7abL,
- 0x3b124e8bL,
- 0x1dc9faf7L, 0x4b6d1856L, 0x26a36631L,
- 0xeae397b2L,
- 0x3a6efa74L, 0xdd5b4332L, 0x6841e7f7L,
- 0xca7820fbL,
- 0xfb0af54eL, 0xd8feb397L, 0x454056acL,
- 0xba489527L,
- 0x55533a3aL, 0x20838d87L, 0xfe6ba9b7L,
- 0xd096954bL,
- 0x55a867bcL, 0xa1159a58L, 0xcca92963L,
- 0x99e1db33L,
- 0xa62a4a56L, 0x3f3125f9L, 0x5ef47e1cL,
- 0x9029317cL,
- 0xfdf8e802L, 0x04272f70L, 0x80bb155cL,
- 0x05282ce3L,
- 0x95c11548L, 0xe4c66d22L, 0x48c1133fL,
- 0xc70f86dcL,
- 0x07f9c9eeL, 0x41041f0fL, 0x404779a4L,
- 0x5d886e17L,
- 0x325f51ebL, 0xd59bc0d1L, 0xf2bcc18fL,
- 0x41113564L,
- 0x257b7834L, 0x602a9c60L, 0xdff8e8a3L,
- 0x1f636c1bL,
- 0x0e12b4c2L, 0x02e1329eL, 0xaf664fd1L,
- 0xcad18115L,
- 0x6b2395e0L, 0x333e92e1L, 0x3b240b62L,
- 0xeebeb922L,
- 0x85b2a20eL, 0xe6ba0d99L, 0xde720c8cL,
- 0x2da2f728L,
- 0xd0127845L, 0x95b794fdL, 0x647d0862L,
- 0xe7ccf5f0L,
- 0x5449a36fL, 0x877d48faL, 0xc39dfd27L,
- 0xf33e8d1eL,
- 0x0a476341L, 0x992eff74L, 0x3a6f6eabL,
- 0xf4f8fd37L,
- 0xa812dc60L, 0xa1ebddf8L, 0x991be14cL,
- 0xdb6e6b0dL,
- 0xc67b5510L, 0x6d672c37L, 0x2765d43bL,
- 0xdcd0e804L,
- 0xf1290dc7L, 0xcc00ffa3L, 0xb5390f92L,
- 0x690fed0bL,
- 0x667b9ffbL, 0xcedb7d9cL, 0xa091cf0bL,
- 0xd9155ea3L,
- 0xbb132f88L, 0x515bad24L, 0x7b9479bfL,
- 0x763bd6ebL,
- 0x37392eb3L, 0xcc115979L, 0x8026e297L,
- 0xf42e312dL,
- 0x6842ada7L, 0xc66a2b3bL, 0x12754cccL,
- 0x782ef11cL,
- 0x6a124237L, 0xb79251e7L, 0x06a1bbe6L,
- 0x4bfb6350L,
- 0x1a6b1018L, 0x11caedfaL, 0x3d25bdd8L,
- 0xe2e1c3c9L,
- 0x44421659L, 0x0a121386L, 0xd90cec6eL,
- 0xd5abea2aL,
- 0x64af674eL, 0xda86a85fL, 0xbebfe988L,
- 0x64e4c3feL,
- 0x9dbc8057L, 0xf0f7c086L, 0x60787bf8L,
- 0x6003604dL,
- 0xd1fd8346L, 0xf6381fb0L, 0x7745ae04L,
- 0xd736fcccL,
- 0x83426b33L, 0xf01eab71L, 0xb0804187L,
- 0x3c005e5fL,
- 0x77a057beL, 0xbde8ae24L, 0x55464299L,
- 0xbf582e61L,
- 0x4e58f48fL, 0xf2ddfda2L, 0xf474ef38L,
- 0x8789bdc2L,
- 0x5366f9c3L, 0xc8b38e74L, 0xb475f255L,
- 0x46fcd9b9L,
- 0x7aeb2661L, 0x8b1ddf84L, 0x846a0e79L,
- 0x915f95e2L,
- 0x466e598eL, 0x20b45770L, 0x8cd55591L,
- 0xc902de4cL,
- 0xb90bace1L, 0xbb8205d0L, 0x11a86248L,
- 0x7574a99eL,
- 0xb77f19b6L, 0xe0a9dc09L, 0x662d09a1L,
- 0xc4324633L,
- 0xe85a1f02L, 0x09f0be8cL, 0x4a99a025L,
- 0x1d6efe10L,
- 0x1ab93d1dL, 0x0ba5a4dfL, 0xa186f20fL,
- 0x2868f169L,
- 0xdcb7da83L, 0x573906feL, 0xa1e2ce9bL,
- 0x4fcd7f52L,
- 0x50115e01L, 0xa70683faL, 0xa002b5c4L,
- 0x0de6d027L,
- 0x9af88c27L, 0x773f8641L, 0xc3604c06L,
- 0x61a806b5L,
- 0xf0177a28L, 0xc0f586e0L, 0x006058aaL,
- 0x30dc7d62L,
- 0x11e69ed7L, 0x2338ea63L, 0x53c2dd94L,
- 0xc2c21634L,
- 0xbbcbee56L, 0x90bcb6deL, 0xebfc7da1L,
- 0xce591d76L,
- 0x6f05e409L, 0x4b7c0188L, 0x39720a3dL,
- 0x7c927c24L,
- 0x86e3725fL, 0x724d9db9L, 0x1ac15bb4L,
- 0xd39eb8fcL,
- 0xed545578L, 0x08fca5b5L, 0xd83d7cd3L,
- 0x4dad0fc4L,
- 0x1e50ef5eL, 0xb161e6f8L, 0xa28514d9L,
- 0x6c51133cL,
- 0x6fd5c7e7L, 0x56e14ec4L, 0x362abfceL,
- 0xddc6c837L,
- 0xd79a3234L, 0x92638212L, 0x670efa8eL,
- 0x406000e0L,
- 0x3a39ce37L, 0xd3faf5cfL, 0xabc27737L,
- 0x5ac52d1bL,
- 0x5cb0679eL, 0x4fa33742L, 0xd3822740L,
- 0x99bc9bbeL,
- 0xd5118e9dL, 0xbf0f7315L, 0xd62d1c7eL,
- 0xc700c47bL,
- 0xb78c1b6bL, 0x21a19045L, 0xb26eb1beL,
- 0x6a366eb4L,
- 0x5748ab2fL, 0xbc946e79L, 0xc6a376d2L,
- 0x6549c2c8L,
- 0x530ff8eeL, 0x468dde7dL, 0xd5730a1dL,
- 0x4cd04dc6L,
- 0x2939bbdbL, 0xa9ba4650L, 0xac9526e8L,
- 0xbe5ee304L,
- 0xa1fad5f0L, 0x6a2d519aL, 0x63ef8ce2L,
- 0x9a86ee22L,
- 0xc089c2b8L, 0x43242ef6L, 0xa51e03aaL,
- 0x9cf2d0a4L,
- 0x83c061baL, 0x9be96a4dL, 0x8fe51550L,
- 0xba645bd6L,
- 0x2826a2f9L, 0xa73a3ae1L, 0x4ba99586L,
- 0xef5562e9L,
- 0xc72fefd3L, 0xf752f7daL, 0x3f046f69L,
- 0x77fa0a59L,
- 0x80e4a915L, 0x87b08601L, 0x9b09e6adL,
- 0x3b3ee593L,
- 0xe990fd5aL, 0x9e34d797L, 0x2cf0b7d9L,
- 0x022b8b51L,
- 0x96d5ac3aL, 0x017da67dL, 0xd1cf3ed6L,
- 0x7c7d2d28L,
- 0x1f9f25cfL, 0xadf2b89bL, 0x5ad6b472L,
- 0x5a88f54cL,
- 0xe029ac71L, 0xe019a5e6L, 0x47b0acfdL,
- 0xed93fa9bL,
- 0xe8d3c48dL, 0x283b57ccL, 0xf8d56629L,
- 0x79132e28L,
- 0x785f0191L, 0xed756055L, 0xf7960e44L,
- 0xe3d35e8cL,
- 0x15056dd4L, 0x88f46dbaL, 0x03a16125L,
- 0x0564f0bdL,
- 0xc3eb9e15L, 0x3c9057a2L, 0x97271aecL,
- 0xa93a072aL,
- 0x1b3f6d9bL, 0x1e6321f5L, 0xf59c66fbL,
- 0x26dcf319L,
- 0x7533d928L, 0xb155fdf5L, 0x03563482L,
- 0x8aba3cbbL,
- 0x28517711L, 0xc20ad9f8L, 0xabcc5167L,
- 0xccad925fL,
- 0x4de81751L, 0x3830dc8eL, 0x379d5862L,
- 0x9320f991L,
- 0xea7a90c2L, 0xfb3e7bceL, 0x5121ce64L,
- 0x774fbe32L,
- 0xa8b6e37eL, 0xc3293d46L, 0x48de5369L,
- 0x6413e680L,
- 0xa2ae0810L, 0xdd6db224L, 0x69852dfdL,
- 0x09072166L,
- 0xb39a460aL, 0x6445c0ddL, 0x586cdecfL,
- 0x1c20c8aeL,
- 0x5bbef7ddL, 0x1b588d40L, 0xccd2017fL,
- 0x6bb4e3bbL,
- 0xdda26a7eL, 0x3a59ff45L, 0x3e350a44L,
- 0xbcb4cdd5L,
- 0x72eacea8L, 0xfa6484bbL, 0x8d6612aeL,
- 0xbf3c6f47L,
- 0xd29be463L, 0x542f5d9eL, 0xaec2771bL,
- 0xf64e6370L,
- 0x740e0d8dL, 0xe75b1357L, 0xf8721671L,
- 0xaf537d5dL,
- 0x4040cb08L, 0x4eb4e2ccL, 0x34d2466aL,
- 0x0115af84L,
- 0xe1b00428L, 0x95983a1dL, 0x06b89fb4L,
- 0xce6ea048L,
- 0x6f3f3b82L, 0x3520ab82L, 0x011a1d4bL,
- 0x277227f8L,
- 0x611560b1L, 0xe7933fdcL, 0xbb3a792bL,
- 0x344525bdL,
- 0xa08839e1L, 0x51ce794bL, 0x2f32c9b7L,
- 0xa01fbac9L,
- 0xe01cc87eL, 0xbcc7d1f6L, 0xcf0111c3L,
- 0xa1e8aac7L,
- 0x1a908749L, 0xd44fbd9aL, 0xd0dadecbL,
- 0xd50ada38L,
- 0x0339c32aL, 0xc6913667L, 0x8df9317cL,
- 0xe0b12b4fL,
- 0xf79e59b7L, 0x43f5bb3aL, 0xf2d519ffL,
- 0x27d9459cL,
- 0xbf97222cL, 0x15e6fc2aL, 0x0f91fc71L,
- 0x9b941525L,
- 0xfae59361L, 0xceb69cebL, 0xc2a86459L,
- 0x12baa8d1L,
- 0xb6c1075eL, 0xe3056a0cL, 0x10d25065L,
- 0xcb03a442L,
- 0xe0ec6e0eL, 0x1698db3bL, 0x4c98a0beL,
- 0x3278e964L,
- 0x9f1f9532L, 0xe0d392dfL, 0xd3a0342bL,
- 0x8971f21eL,
- 0x1b0a7441L, 0x4ba3348cL, 0xc5be7120L,
- 0xc37632d8L,
- 0xdf359f8dL, 0x9b992f2eL, 0xe60b6f47L,
- 0x0fe3f11dL,
- 0xe54cda54L, 0x1edad891L, 0xce6279cfL,
- 0xcd3e7e6fL,
- 0x1618b166L, 0xfd2c1d05L, 0x848fd2c5L,
- 0xf6fb2299L,
- 0xf523f357L, 0xa6327623L, 0x93a83531L,
- 0x56cccd02L,
- 0xacf08162L, 0x5a75ebb5L, 0x6e163697L,
- 0x88d273ccL,
- 0xde966292L, 0x81b949d0L, 0x4c50901bL,
- 0x71c65614L,
- 0xe6c6c7bdL, 0x327a140aL, 0x45e1d006L,
- 0xc3f27b9aL,
- 0xc9aa53fdL, 0x62a80f00L, 0xbb25bfe2L,
- 0x35bdd2f6L,
- 0x71126905L, 0xb2040222L, 0xb6cbcf7cL,
- 0xcd769c2bL,
- 0x53113ec0L, 0x1640e3d3L, 0x38abbd60L,
- 0x2547adf0L,
- 0xba38209cL, 0xf746ce76L, 0x77afa1c5L,
- 0x20756060L,
- 0x85cbfe4eL, 0x8ae88dd8L, 0x7aaaf9b0L,
- 0x4cf9aa7eL,
- 0x1948c25cL, 0x02fb8a8cL, 0x01c36ae4L,
- 0xd6ebe1f9L,
- 0x90d4f869L, 0xa65cdea0L, 0x3f09252dL,
- 0xc208e69fL,
- 0xb74e6132L, 0xce77e25bL, 0x578fdfe3L,
- 0x3ac372e6L,
- }
+ 0xd1310ba6L,
+ 0x98dfb5acL,
+ 0x2ffd72dbL,
+ 0xd01adfb7L,
+ 0xb8e1afedL,
+ 0x6a267e96L,
+ 0xba7c9045L,
+ 0xf12c7f99L,
+ 0x24a19947L,
+ 0xb3916cf7L,
+ 0x0801f2e2L,
+ 0x858efc16L,
+ 0x636920d8L,
+ 0x71574e69L,
+ 0xa458fea3L,
+ 0xf4933d7eL,
+ 0x0d95748fL,
+ 0x728eb658L,
+ 0x718bcd58L,
+ 0x82154aeeL,
+ 0x7b54a41dL,
+ 0xc25a59b5L,
+ 0x9c30d539L,
+ 0x2af26013L,
+ 0xc5d1b023L,
+ 0x286085f0L,
+ 0xca417918L,
+ 0xb8db38efL,
+ 0x8e79dcb0L,
+ 0x603a180eL,
+ 0x6c9e0e8bL,
+ 0xb01e8a3eL,
+ 0xd71577c1L,
+ 0xbd314b27L,
+ 0x78af2fdaL,
+ 0x55605c60L,
+ 0xe65525f3L,
+ 0xaa55ab94L,
+ 0x57489862L,
+ 0x63e81440L,
+ 0x55ca396aL,
+ 0x2aab10b6L,
+ 0xb4cc5c34L,
+ 0x1141e8ceL,
+ 0xa15486afL,
+ 0x7c72e993L,
+ 0xb3ee1411L,
+ 0x636fbc2aL,
+ 0x2ba9c55dL,
+ 0x741831f6L,
+ 0xce5c3e16L,
+ 0x9b87931eL,
+ 0xafd6ba33L,
+ 0x6c24cf5cL,
+ 0x7a325381L,
+ 0x28958677L,
+ 0x3b8f4898L,
+ 0x6b4bb9afL,
+ 0xc4bfe81bL,
+ 0x66282193L,
+ 0x61d809ccL,
+ 0xfb21a991L,
+ 0x487cac60L,
+ 0x5dec8032L,
+ 0xef845d5dL,
+ 0xe98575b1L,
+ 0xdc262302L,
+ 0xeb651b88L,
+ 0x23893e81L,
+ 0xd396acc5L,
+ 0x0f6d6ff3L,
+ 0x83f44239L,
+ 0x2e0b4482L,
+ 0xa4842004L,
+ 0x69c8f04aL,
+ 0x9e1f9b5eL,
+ 0x21c66842L,
+ 0xf6e96c9aL,
+ 0x670c9c61L,
+ 0xabd388f0L,
+ 0x6a51a0d2L,
+ 0xd8542f68L,
+ 0x960fa728L,
+ 0xab5133a3L,
+ 0x6eef0b6cL,
+ 0x137a3be4L,
+ 0xba3bf050L,
+ 0x7efb2a98L,
+ 0xa1f1651dL,
+ 0x39af0176L,
+ 0x66ca593eL,
+ 0x82430e88L,
+ 0x8cee8619L,
+ 0x456f9fb4L,
+ 0x7d84a5c3L,
+ 0x3b8b5ebeL,
+ 0xe06f75d8L,
+ 0x85c12073L,
+ 0x401a449fL,
+ 0x56c16aa6L,
+ 0x4ed3aa62L,
+ 0x363f7706L,
+ 0x1bfedf72L,
+ 0x429b023dL,
+ 0x37d0d724L,
+ 0xd00a1248L,
+ 0xdb0fead3L,
+ 0x49f1c09bL,
+ 0x075372c9L,
+ 0x80991b7bL,
+ 0x25d479d8L,
+ 0xf6e8def7L,
+ 0xe3fe501aL,
+ 0xb6794c3bL,
+ 0x976ce0bdL,
+ 0x04c006baL,
+ 0xc1a94fb6L,
+ 0x409f60c4L,
+ 0x5e5c9ec2L,
+ 0x196a2463L,
+ 0x68fb6fafL,
+ 0x3e6c53b5L,
+ 0x1339b2ebL,
+ 0x3b52ec6fL,
+ 0x6dfc511fL,
+ 0x9b30952cL,
+ 0xcc814544L,
+ 0xaf5ebd09L,
+ 0xbee3d004L,
+ 0xde334afdL,
+ 0x660f2807L,
+ 0x192e4bb3L,
+ 0xc0cba857L,
+ 0x45c8740fL,
+ 0xd20b5f39L,
+ 0xb9d3fbdbL,
+ 0x5579c0bdL,
+ 0x1a60320aL,
+ 0xd6a100c6L,
+ 0x402c7279L,
+ 0x679f25feL,
+ 0xfb1fa3ccL,
+ 0x8ea5e9f8L,
+ 0xdb3222f8L,
+ 0x3c7516dfL,
+ 0xfd616b15L,
+ 0x2f501ec8L,
+ 0xad0552abL,
+ 0x323db5faL,
+ 0xfd238760L,
+ 0x53317b48L,
+ 0x3e00df82L,
+ 0x9e5c57bbL,
+ 0xca6f8ca0L,
+ 0x1a87562eL,
+ 0xdf1769dbL,
+ 0xd542a8f6L,
+ 0x287effc3L,
+ 0xac6732c6L,
+ 0x8c4f5573L,
+ 0x695b27b0L,
+ 0xbbca58c8L,
+ 0xe1ffa35dL,
+ 0xb8f011a0L,
+ 0x10fa3d98L,
+ 0xfd2183b8L,
+ 0x4afcb56cL,
+ 0x2dd1d35bL,
+ 0x9a53e479L,
+ 0xb6f84565L,
+ 0xd28e49bcL,
+ 0x4bfb9790L,
+ 0xe1ddf2daL,
+ 0xa4cb7e33L,
+ 0x62fb1341L,
+ 0xcee4c6e8L,
+ 0xef20cadaL,
+ 0x36774c01L,
+ 0xd07e9efeL,
+ 0x2bf11fb4L,
+ 0x95dbda4dL,
+ 0xae909198L,
+ 0xeaad8e71L,
+ 0x6b93d5a0L,
+ 0xd08ed1d0L,
+ 0xafc725e0L,
+ 0x8e3c5b2fL,
+ 0x8e7594b7L,
+ 0x8ff6e2fbL,
+ 0xf2122b64L,
+ 0x8888b812L,
+ 0x900df01cL,
+ 0x4fad5ea0L,
+ 0x688fc31cL,
+ 0xd1cff191L,
+ 0xb3a8c1adL,
+ 0x2f2f2218L,
+ 0xbe0e1777L,
+ 0xea752dfeL,
+ 0x8b021fa1L,
+ 0xe5a0cc0fL,
+ 0xb56f74e8L,
+ 0x18acf3d6L,
+ 0xce89e299L,
+ 0xb4a84fe0L,
+ 0xfd13e0b7L,
+ 0x7cc43b81L,
+ 0xd2ada8d9L,
+ 0x165fa266L,
+ 0x80957705L,
+ 0x93cc7314L,
+ 0x211a1477L,
+ 0xe6ad2065L,
+ 0x77b5fa86L,
+ 0xc75442f5L,
+ 0xfb9d35cfL,
+ 0xebcdaf0cL,
+ 0x7b3e89a0L,
+ 0xd6411bd3L,
+ 0xae1e7e49L,
+ 0x00250e2dL,
+ 0x2071b35eL,
+ 0x226800bbL,
+ 0x57b8e0afL,
+ 0x2464369bL,
+ 0xf009b91eL,
+ 0x5563911dL,
+ 0x59dfa6aaL,
+ 0x78c14389L,
+ 0xd95a537fL,
+ 0x207d5ba2L,
+ 0x02e5b9c5L,
+ 0x83260376L,
+ 0x6295cfa9L,
+ 0x11c81968L,
+ 0x4e734a41L,
+ 0xb3472dcaL,
+ 0x7b14a94aL,
+ 0x1b510052L,
+ 0x9a532915L,
+ 0xd60f573fL,
+ 0xbc9bc6e4L,
+ 0x2b60a476L,
+ 0x81e67400L,
+ 0x08ba6fb5L,
+ 0x571be91fL,
+ 0xf296ec6bL,
+ 0x2a0dd915L,
+ 0xb6636521L,
+ 0xe7b9f9b6L,
+ 0xff34052eL,
+ 0xc5855664L,
+ 0x53b02d5dL,
+ 0xa99f8fa1L,
+ 0x08ba4799L,
+ 0x6e85076aL,
+ 0x4b7a70e9L,
+ 0xb5b32944L,
+ 0xdb75092eL,
+ 0xc4192623L,
+ 0xad6ea6b0L,
+ 0x49a7df7dL,
+ 0x9cee60b8L,
+ 0x8fedb266L,
+ 0xecaa8c71L,
+ 0x699a17ffL,
+ 0x5664526cL,
+ 0xc2b19ee1L,
+ 0x193602a5L,
+ 0x75094c29L,
+ 0xa0591340L,
+ 0xe4183a3eL,
+ 0x3f54989aL,
+ 0x5b429d65L,
+ 0x6b8fe4d6L,
+ 0x99f73fd6L,
+ 0xa1d29c07L,
+ 0xefe830f5L,
+ 0x4d2d38e6L,
+ 0xf0255dc1L,
+ 0x4cdd2086L,
+ 0x8470eb26L,
+ 0x6382e9c6L,
+ 0x021ecc5eL,
+ 0x09686b3fL,
+ 0x3ebaefc9L,
+ 0x3c971814L,
+ 0x6b6a70a1L,
+ 0x687f3584L,
+ 0x52a0e286L,
+ 0xb79c5305L,
+ 0xaa500737L,
+ 0x3e07841cL,
+ 0x7fdeae5cL,
+ 0x8e7d44ecL,
+ 0x5716f2b8L,
+ 0xb03ada37L,
+ 0xf0500c0dL,
+ 0xf01c1f04L,
+ 0x0200b3ffL,
+ 0xae0cf51aL,
+ 0x3cb574b2L,
+ 0x25837a58L,
+ 0xdc0921bdL,
+ 0xd19113f9L,
+ 0x7ca92ff6L,
+ 0x94324773L,
+ 0x22f54701L,
+ 0x3ae5e581L,
+ 0x37c2dadcL,
+ 0xc8b57634L,
+ 0x9af3dda7L,
+ 0xa9446146L,
+ 0x0fd0030eL,
+ 0xecc8c73eL,
+ 0xa4751e41L,
+ 0xe238cd99L,
+ 0x3bea0e2fL,
+ 0x3280bba1L,
+ 0x183eb331L,
+ 0x4e548b38L,
+ 0x4f6db908L,
+ 0x6f420d03L,
+ 0xf60a04bfL,
+ 0x2cb81290L,
+ 0x24977c79L,
+ 0x5679b072L,
+ 0xbcaf89afL,
+ 0xde9a771fL,
+ 0xd9930810L,
+ 0xb38bae12L,
+ 0xdccf3f2eL,
+ 0x5512721fL,
+ 0x2e6b7124L,
+ 0x501adde6L,
+ 0x9f84cd87L,
+ 0x7a584718L,
+ 0x7408da17L,
+ 0xbc9f9abcL,
+ 0xe94b7d8cL,
+ 0xec7aec3aL,
+ 0xdb851dfaL,
+ 0x63094366L,
+ 0xc464c3d2L,
+ 0xef1c1847L,
+ 0x3215d908L,
+ 0xdd433b37L,
+ 0x24c2ba16L,
+ 0x12a14d43L,
+ 0x2a65c451L,
+ 0x50940002L,
+ 0x133ae4ddL,
+ 0x71dff89eL,
+ 0x10314e55L,
+ 0x81ac77d6L,
+ 0x5f11199bL,
+ 0x043556f1L,
+ 0xd7a3c76bL,
+ 0x3c11183bL,
+ 0x5924a509L,
+ 0xf28fe6edL,
+ 0x97f1fbfaL,
+ 0x9ebabf2cL,
+ 0x1e153c6eL,
+ 0x86e34570L,
+ 0xeae96fb1L,
+ 0x860e5e0aL,
+ 0x5a3e2ab3L,
+ 0x771fe71cL,
+ 0x4e3d06faL,
+ 0x2965dcb9L,
+ 0x99e71d0fL,
+ 0x803e89d6L,
+ 0x5266c825L,
+ 0x2e4cc978L,
+ 0x9c10b36aL,
+ 0xc6150ebaL,
+ 0x94e2ea78L,
+ 0xa5fc3c53L,
+ 0x1e0a2df4L,
+ 0xf2f74ea7L,
+ 0x361d2b3dL,
+ 0x1939260fL,
+ 0x19c27960L,
+ 0x5223a708L,
+ 0xf71312b6L,
+ 0xebadfe6eL,
+ 0xeac31f66L,
+ 0xe3bc4595L,
+ 0xa67bc883L,
+ 0xb17f37d1L,
+ 0x018cff28L,
+ 0xc332ddefL,
+ 0xbe6c5aa5L,
+ 0x65582185L,
+ 0x68ab9802L,
+ 0xeecea50fL,
+ 0xdb2f953bL,
+ 0x2aef7dadL,
+ 0x5b6e2f84L,
+ 0x1521b628L,
+ 0x29076170L,
+ 0xecdd4775L,
+ 0x619f1510L,
+ 0x13cca830L,
+ 0xeb61bd96L,
+ 0x0334fe1eL,
+ 0xaa0363cfL,
+ 0xb5735c90L,
+ 0x4c70a239L,
+ 0xd59e9e0bL,
+ 0xcbaade14L,
+ 0xeecc86bcL,
+ 0x60622ca7L,
+ 0x9cab5cabL,
+ 0xb2f3846eL,
+ 0x648b1eafL,
+ 0x19bdf0caL,
+ 0xa02369b9L,
+ 0x655abb50L,
+ 0x40685a32L,
+ 0x3c2ab4b3L,
+ 0x319ee9d5L,
+ 0xc021b8f7L,
+ 0x9b540b19L,
+ 0x875fa099L,
+ 0x95f7997eL,
+ 0x623d7da8L,
+ 0xf837889aL,
+ 0x97e32d77L,
+ 0x11ed935fL,
+ 0x16681281L,
+ 0x0e358829L,
+ 0xc7e61fd6L,
+ 0x96dedfa1L,
+ 0x7858ba99L,
+ 0x57f584a5L,
+ 0x1b227263L,
+ 0x9b83c3ffL,
+ 0x1ac24696L,
+ 0xcdb30aebL,
+ 0x532e3054L,
+ 0x8fd948e4L,
+ 0x6dbc3128L,
+ 0x58ebf2efL,
+ 0x34c6ffeaL,
+ 0xfe28ed61L,
+ 0xee7c3c73L,
+ 0x5d4a14d9L,
+ 0xe864b7e3L,
+ 0x42105d14L,
+ 0x203e13e0L,
+ 0x45eee2b6L,
+ 0xa3aaabeaL,
+ 0xdb6c4f15L,
+ 0xfacb4fd0L,
+ 0xc742f442L,
+ 0xef6abbb5L,
+ 0x654f3b1dL,
+ 0x41cd2105L,
+ 0xd81e799eL,
+ 0x86854dc7L,
+ 0xe44b476aL,
+ 0x3d816250L,
+ 0xcf62a1f2L,
+ 0x5b8d2646L,
+ 0xfc8883a0L,
+ 0xc1c7b6a3L,
+ 0x7f1524c3L,
+ 0x69cb7492L,
+ 0x47848a0bL,
+ 0x5692b285L,
+ 0x095bbf00L,
+ 0xad19489dL,
+ 0x1462b174L,
+ 0x23820e00L,
+ 0x58428d2aL,
+ 0x0c55f5eaL,
+ 0x1dadf43eL,
+ 0x233f7061L,
+ 0x3372f092L,
+ 0x8d937e41L,
+ 0xd65fecf1L,
+ 0x6c223bdbL,
+ 0x7cde3759L,
+ 0xcbee7460L,
+ 0x4085f2a7L,
+ 0xce77326eL,
+ 0xa6078084L,
+ 0x19f8509eL,
+ 0xe8efd855L,
+ 0x61d99735L,
+ 0xa969a7aaL,
+ 0xc50c06c2L,
+ 0x5a04abfcL,
+ 0x800bcadcL,
+ 0x9e447a2eL,
+ 0xc3453484L,
+ 0xfdd56705L,
+ 0x0e1e9ec9L,
+ 0xdb73dbd3L,
+ 0x105588cdL,
+ 0x675fda79L,
+ 0xe3674340L,
+ 0xc5c43465L,
+ 0x713e38d8L,
+ 0x3d28f89eL,
+ 0xf16dff20L,
+ 0x153e21e7L,
+ 0x8fb03d4aL,
+ 0xe6e39f2bL,
+ 0xdb83adf7L,
+ 0xe93d5a68L,
+ 0x948140f7L,
+ 0xf64c261cL,
+ 0x94692934L,
+ 0x411520f7L,
+ 0x7602d4f7L,
+ 0xbcf46b2eL,
+ 0xd4a20068L,
+ 0xd4082471L,
+ 0x3320f46aL,
+ 0x43b7d4b7L,
+ 0x500061afL,
+ 0x1e39f62eL,
+ 0x97244546L,
+ 0x14214f74L,
+ 0xbf8b8840L,
+ 0x4d95fc1dL,
+ 0x96b591afL,
+ 0x70f4ddd3L,
+ 0x66a02f45L,
+ 0xbfbc09ecL,
+ 0x03bd9785L,
+ 0x7fac6dd0L,
+ 0x31cb8504L,
+ 0x96eb27b3L,
+ 0x55fd3941L,
+ 0xda2547e6L,
+ 0xabca0a9aL,
+ 0x28507825L,
+ 0x530429f4L,
+ 0x0a2c86daL,
+ 0xe9b66dfbL,
+ 0x68dc1462L,
+ 0xd7486900L,
+ 0x680ec0a4L,
+ 0x27a18deeL,
+ 0x4f3ffea2L,
+ 0xe887ad8cL,
+ 0xb58ce006L,
+ 0x7af4d6b6L,
+ 0xaace1e7cL,
+ 0xd3375fecL,
+ 0xce78a399L,
+ 0x406b2a42L,
+ 0x20fe9e35L,
+ 0xd9f385b9L,
+ 0xee39d7abL,
+ 0x3b124e8bL,
+ 0x1dc9faf7L,
+ 0x4b6d1856L,
+ 0x26a36631L,
+ 0xeae397b2L,
+ 0x3a6efa74L,
+ 0xdd5b4332L,
+ 0x6841e7f7L,
+ 0xca7820fbL,
+ 0xfb0af54eL,
+ 0xd8feb397L,
+ 0x454056acL,
+ 0xba489527L,
+ 0x55533a3aL,
+ 0x20838d87L,
+ 0xfe6ba9b7L,
+ 0xd096954bL,
+ 0x55a867bcL,
+ 0xa1159a58L,
+ 0xcca92963L,
+ 0x99e1db33L,
+ 0xa62a4a56L,
+ 0x3f3125f9L,
+ 0x5ef47e1cL,
+ 0x9029317cL,
+ 0xfdf8e802L,
+ 0x04272f70L,
+ 0x80bb155cL,
+ 0x05282ce3L,
+ 0x95c11548L,
+ 0xe4c66d22L,
+ 0x48c1133fL,
+ 0xc70f86dcL,
+ 0x07f9c9eeL,
+ 0x41041f0fL,
+ 0x404779a4L,
+ 0x5d886e17L,
+ 0x325f51ebL,
+ 0xd59bc0d1L,
+ 0xf2bcc18fL,
+ 0x41113564L,
+ 0x257b7834L,
+ 0x602a9c60L,
+ 0xdff8e8a3L,
+ 0x1f636c1bL,
+ 0x0e12b4c2L,
+ 0x02e1329eL,
+ 0xaf664fd1L,
+ 0xcad18115L,
+ 0x6b2395e0L,
+ 0x333e92e1L,
+ 0x3b240b62L,
+ 0xeebeb922L,
+ 0x85b2a20eL,
+ 0xe6ba0d99L,
+ 0xde720c8cL,
+ 0x2da2f728L,
+ 0xd0127845L,
+ 0x95b794fdL,
+ 0x647d0862L,
+ 0xe7ccf5f0L,
+ 0x5449a36fL,
+ 0x877d48faL,
+ 0xc39dfd27L,
+ 0xf33e8d1eL,
+ 0x0a476341L,
+ 0x992eff74L,
+ 0x3a6f6eabL,
+ 0xf4f8fd37L,
+ 0xa812dc60L,
+ 0xa1ebddf8L,
+ 0x991be14cL,
+ 0xdb6e6b0dL,
+ 0xc67b5510L,
+ 0x6d672c37L,
+ 0x2765d43bL,
+ 0xdcd0e804L,
+ 0xf1290dc7L,
+ 0xcc00ffa3L,
+ 0xb5390f92L,
+ 0x690fed0bL,
+ 0x667b9ffbL,
+ 0xcedb7d9cL,
+ 0xa091cf0bL,
+ 0xd9155ea3L,
+ 0xbb132f88L,
+ 0x515bad24L,
+ 0x7b9479bfL,
+ 0x763bd6ebL,
+ 0x37392eb3L,
+ 0xcc115979L,
+ 0x8026e297L,
+ 0xf42e312dL,
+ 0x6842ada7L,
+ 0xc66a2b3bL,
+ 0x12754cccL,
+ 0x782ef11cL,
+ 0x6a124237L,
+ 0xb79251e7L,
+ 0x06a1bbe6L,
+ 0x4bfb6350L,
+ 0x1a6b1018L,
+ 0x11caedfaL,
+ 0x3d25bdd8L,
+ 0xe2e1c3c9L,
+ 0x44421659L,
+ 0x0a121386L,
+ 0xd90cec6eL,
+ 0xd5abea2aL,
+ 0x64af674eL,
+ 0xda86a85fL,
+ 0xbebfe988L,
+ 0x64e4c3feL,
+ 0x9dbc8057L,
+ 0xf0f7c086L,
+ 0x60787bf8L,
+ 0x6003604dL,
+ 0xd1fd8346L,
+ 0xf6381fb0L,
+ 0x7745ae04L,
+ 0xd736fcccL,
+ 0x83426b33L,
+ 0xf01eab71L,
+ 0xb0804187L,
+ 0x3c005e5fL,
+ 0x77a057beL,
+ 0xbde8ae24L,
+ 0x55464299L,
+ 0xbf582e61L,
+ 0x4e58f48fL,
+ 0xf2ddfda2L,
+ 0xf474ef38L,
+ 0x8789bdc2L,
+ 0x5366f9c3L,
+ 0xc8b38e74L,
+ 0xb475f255L,
+ 0x46fcd9b9L,
+ 0x7aeb2661L,
+ 0x8b1ddf84L,
+ 0x846a0e79L,
+ 0x915f95e2L,
+ 0x466e598eL,
+ 0x20b45770L,
+ 0x8cd55591L,
+ 0xc902de4cL,
+ 0xb90bace1L,
+ 0xbb8205d0L,
+ 0x11a86248L,
+ 0x7574a99eL,
+ 0xb77f19b6L,
+ 0xe0a9dc09L,
+ 0x662d09a1L,
+ 0xc4324633L,
+ 0xe85a1f02L,
+ 0x09f0be8cL,
+ 0x4a99a025L,
+ 0x1d6efe10L,
+ 0x1ab93d1dL,
+ 0x0ba5a4dfL,
+ 0xa186f20fL,
+ 0x2868f169L,
+ 0xdcb7da83L,
+ 0x573906feL,
+ 0xa1e2ce9bL,
+ 0x4fcd7f52L,
+ 0x50115e01L,
+ 0xa70683faL,
+ 0xa002b5c4L,
+ 0x0de6d027L,
+ 0x9af88c27L,
+ 0x773f8641L,
+ 0xc3604c06L,
+ 0x61a806b5L,
+ 0xf0177a28L,
+ 0xc0f586e0L,
+ 0x006058aaL,
+ 0x30dc7d62L,
+ 0x11e69ed7L,
+ 0x2338ea63L,
+ 0x53c2dd94L,
+ 0xc2c21634L,
+ 0xbbcbee56L,
+ 0x90bcb6deL,
+ 0xebfc7da1L,
+ 0xce591d76L,
+ 0x6f05e409L,
+ 0x4b7c0188L,
+ 0x39720a3dL,
+ 0x7c927c24L,
+ 0x86e3725fL,
+ 0x724d9db9L,
+ 0x1ac15bb4L,
+ 0xd39eb8fcL,
+ 0xed545578L,
+ 0x08fca5b5L,
+ 0xd83d7cd3L,
+ 0x4dad0fc4L,
+ 0x1e50ef5eL,
+ 0xb161e6f8L,
+ 0xa28514d9L,
+ 0x6c51133cL,
+ 0x6fd5c7e7L,
+ 0x56e14ec4L,
+ 0x362abfceL,
+ 0xddc6c837L,
+ 0xd79a3234L,
+ 0x92638212L,
+ 0x670efa8eL,
+ 0x406000e0L,
+ 0x3a39ce37L,
+ 0xd3faf5cfL,
+ 0xabc27737L,
+ 0x5ac52d1bL,
+ 0x5cb0679eL,
+ 0x4fa33742L,
+ 0xd3822740L,
+ 0x99bc9bbeL,
+ 0xd5118e9dL,
+ 0xbf0f7315L,
+ 0xd62d1c7eL,
+ 0xc700c47bL,
+ 0xb78c1b6bL,
+ 0x21a19045L,
+ 0xb26eb1beL,
+ 0x6a366eb4L,
+ 0x5748ab2fL,
+ 0xbc946e79L,
+ 0xc6a376d2L,
+ 0x6549c2c8L,
+ 0x530ff8eeL,
+ 0x468dde7dL,
+ 0xd5730a1dL,
+ 0x4cd04dc6L,
+ 0x2939bbdbL,
+ 0xa9ba4650L,
+ 0xac9526e8L,
+ 0xbe5ee304L,
+ 0xa1fad5f0L,
+ 0x6a2d519aL,
+ 0x63ef8ce2L,
+ 0x9a86ee22L,
+ 0xc089c2b8L,
+ 0x43242ef6L,
+ 0xa51e03aaL,
+ 0x9cf2d0a4L,
+ 0x83c061baL,
+ 0x9be96a4dL,
+ 0x8fe51550L,
+ 0xba645bd6L,
+ 0x2826a2f9L,
+ 0xa73a3ae1L,
+ 0x4ba99586L,
+ 0xef5562e9L,
+ 0xc72fefd3L,
+ 0xf752f7daL,
+ 0x3f046f69L,
+ 0x77fa0a59L,
+ 0x80e4a915L,
+ 0x87b08601L,
+ 0x9b09e6adL,
+ 0x3b3ee593L,
+ 0xe990fd5aL,
+ 0x9e34d797L,
+ 0x2cf0b7d9L,
+ 0x022b8b51L,
+ 0x96d5ac3aL,
+ 0x017da67dL,
+ 0xd1cf3ed6L,
+ 0x7c7d2d28L,
+ 0x1f9f25cfL,
+ 0xadf2b89bL,
+ 0x5ad6b472L,
+ 0x5a88f54cL,
+ 0xe029ac71L,
+ 0xe019a5e6L,
+ 0x47b0acfdL,
+ 0xed93fa9bL,
+ 0xe8d3c48dL,
+ 0x283b57ccL,
+ 0xf8d56629L,
+ 0x79132e28L,
+ 0x785f0191L,
+ 0xed756055L,
+ 0xf7960e44L,
+ 0xe3d35e8cL,
+ 0x15056dd4L,
+ 0x88f46dbaL,
+ 0x03a16125L,
+ 0x0564f0bdL,
+ 0xc3eb9e15L,
+ 0x3c9057a2L,
+ 0x97271aecL,
+ 0xa93a072aL,
+ 0x1b3f6d9bL,
+ 0x1e6321f5L,
+ 0xf59c66fbL,
+ 0x26dcf319L,
+ 0x7533d928L,
+ 0xb155fdf5L,
+ 0x03563482L,
+ 0x8aba3cbbL,
+ 0x28517711L,
+ 0xc20ad9f8L,
+ 0xabcc5167L,
+ 0xccad925fL,
+ 0x4de81751L,
+ 0x3830dc8eL,
+ 0x379d5862L,
+ 0x9320f991L,
+ 0xea7a90c2L,
+ 0xfb3e7bceL,
+ 0x5121ce64L,
+ 0x774fbe32L,
+ 0xa8b6e37eL,
+ 0xc3293d46L,
+ 0x48de5369L,
+ 0x6413e680L,
+ 0xa2ae0810L,
+ 0xdd6db224L,
+ 0x69852dfdL,
+ 0x09072166L,
+ 0xb39a460aL,
+ 0x6445c0ddL,
+ 0x586cdecfL,
+ 0x1c20c8aeL,
+ 0x5bbef7ddL,
+ 0x1b588d40L,
+ 0xccd2017fL,
+ 0x6bb4e3bbL,
+ 0xdda26a7eL,
+ 0x3a59ff45L,
+ 0x3e350a44L,
+ 0xbcb4cdd5L,
+ 0x72eacea8L,
+ 0xfa6484bbL,
+ 0x8d6612aeL,
+ 0xbf3c6f47L,
+ 0xd29be463L,
+ 0x542f5d9eL,
+ 0xaec2771bL,
+ 0xf64e6370L,
+ 0x740e0d8dL,
+ 0xe75b1357L,
+ 0xf8721671L,
+ 0xaf537d5dL,
+ 0x4040cb08L,
+ 0x4eb4e2ccL,
+ 0x34d2466aL,
+ 0x0115af84L,
+ 0xe1b00428L,
+ 0x95983a1dL,
+ 0x06b89fb4L,
+ 0xce6ea048L,
+ 0x6f3f3b82L,
+ 0x3520ab82L,
+ 0x011a1d4bL,
+ 0x277227f8L,
+ 0x611560b1L,
+ 0xe7933fdcL,
+ 0xbb3a792bL,
+ 0x344525bdL,
+ 0xa08839e1L,
+ 0x51ce794bL,
+ 0x2f32c9b7L,
+ 0xa01fbac9L,
+ 0xe01cc87eL,
+ 0xbcc7d1f6L,
+ 0xcf0111c3L,
+ 0xa1e8aac7L,
+ 0x1a908749L,
+ 0xd44fbd9aL,
+ 0xd0dadecbL,
+ 0xd50ada38L,
+ 0x0339c32aL,
+ 0xc6913667L,
+ 0x8df9317cL,
+ 0xe0b12b4fL,
+ 0xf79e59b7L,
+ 0x43f5bb3aL,
+ 0xf2d519ffL,
+ 0x27d9459cL,
+ 0xbf97222cL,
+ 0x15e6fc2aL,
+ 0x0f91fc71L,
+ 0x9b941525L,
+ 0xfae59361L,
+ 0xceb69cebL,
+ 0xc2a86459L,
+ 0x12baa8d1L,
+ 0xb6c1075eL,
+ 0xe3056a0cL,
+ 0x10d25065L,
+ 0xcb03a442L,
+ 0xe0ec6e0eL,
+ 0x1698db3bL,
+ 0x4c98a0beL,
+ 0x3278e964L,
+ 0x9f1f9532L,
+ 0xe0d392dfL,
+ 0xd3a0342bL,
+ 0x8971f21eL,
+ 0x1b0a7441L,
+ 0x4ba3348cL,
+ 0xc5be7120L,
+ 0xc37632d8L,
+ 0xdf359f8dL,
+ 0x9b992f2eL,
+ 0xe60b6f47L,
+ 0x0fe3f11dL,
+ 0xe54cda54L,
+ 0x1edad891L,
+ 0xce6279cfL,
+ 0xcd3e7e6fL,
+ 0x1618b166L,
+ 0xfd2c1d05L,
+ 0x848fd2c5L,
+ 0xf6fb2299L,
+ 0xf523f357L,
+ 0xa6327623L,
+ 0x93a83531L,
+ 0x56cccd02L,
+ 0xacf08162L,
+ 0x5a75ebb5L,
+ 0x6e163697L,
+ 0x88d273ccL,
+ 0xde966292L,
+ 0x81b949d0L,
+ 0x4c50901bL,
+ 0x71c65614L,
+ 0xe6c6c7bdL,
+ 0x327a140aL,
+ 0x45e1d006L,
+ 0xc3f27b9aL,
+ 0xc9aa53fdL,
+ 0x62a80f00L,
+ 0xbb25bfe2L,
+ 0x35bdd2f6L,
+ 0x71126905L,
+ 0xb2040222L,
+ 0xb6cbcf7cL,
+ 0xcd769c2bL,
+ 0x53113ec0L,
+ 0x1640e3d3L,
+ 0x38abbd60L,
+ 0x2547adf0L,
+ 0xba38209cL,
+ 0xf746ce76L,
+ 0x77afa1c5L,
+ 0x20756060L,
+ 0x85cbfe4eL,
+ 0x8ae88dd8L,
+ 0x7aaaf9b0L,
+ 0x4cf9aa7eL,
+ 0x1948c25cL,
+ 0x02fb8a8cL,
+ 0x01c36ae4L,
+ 0xd6ebe1f9L,
+ 0x90d4f869L,
+ 0xa65cdea0L,
+ 0x3f09252dL,
+ 0xc208e69fL,
+ 0xb74e6132L,
+ 0xce77e25bL,
+ 0x578fdfe3L,
+ 0x3ac372e6L,
+ }
};
diff --git a/crypto/bio/bf_buff.c b/crypto/bio/bf_buff.c
index 538dcab33c..3926d1552b 100644
--- a/crypto/bio/bf_buff.c
+++ b/crypto/bio/bf_buff.c
@@ -20,7 +20,7 @@ static long buffer_ctrl(BIO *h, int cmd, long arg1, void *arg2);
static int buffer_new(BIO *h);
static int buffer_free(BIO *data);
static long buffer_callback_ctrl(BIO *h, int cmd, BIO_info_cb *fp);
-#define DEFAULT_BUFFER_SIZE 4096
+#define DEFAULT_BUFFER_SIZE 4096
static const BIO_METHOD methods_buffer = {
BIO_TYPE_BUFFER,
@@ -98,7 +98,7 @@ static int buffer_read(BIO *b, char *out, int outl)
num = 0;
BIO_clear_retry_flags(b);
- start:
+start:
i = ctx->ibuf_len;
/* If there is stuff left over, grab it */
if (i != 0) {
@@ -167,7 +167,7 @@ static int buffer_write(BIO *b, const char *in, int inl)
return 0;
BIO_clear_retry_flags(b);
- start:
+start:
i = ctx->obuf_size - (ctx->obuf_len + ctx->obuf_off);
/* add to buffer and return */
if (i >= inl) {
@@ -178,7 +178,7 @@ static int buffer_write(BIO *b, const char *in, int inl)
/* else */
/* stuff already in buffer, so add to it first, then flush */
if (ctx->obuf_len != 0) {
- if (i > 0) { /* lets fill it up if we can */
+ if (i > 0) { /* lets fill it up if we can */
memcpy(&(ctx->obuf[ctx->obuf_off + ctx->obuf_len]), in, i);
in += i;
inl -= i;
@@ -188,7 +188,7 @@ static int buffer_write(BIO *b, const char *in, int inl)
/* we now have a full buffer needing flushing */
for (;;) {
i = BIO_write(b->next_bio, &(ctx->obuf[ctx->obuf_off]),
- ctx->obuf_len);
+ ctx->obuf_len);
if (i <= 0) {
BIO_copy_next_retry(b);
@@ -306,7 +306,7 @@ static long buffer_ctrl(BIO *b, int cmd, long num, void *ptr)
if (*ip == 0) {
ibs = (int)num;
obs = ctx->obuf_size;
- } else { /* if (*ip == 1) */
+ } else { /* if (*ip == 1) */
ibs = ctx->ibuf_size;
obs = (int)num;
@@ -368,7 +368,7 @@ static long buffer_ctrl(BIO *b, int cmd, long num, void *ptr)
BIO_clear_retry_flags(b);
if (ctx->obuf_len > 0) {
r = BIO_write(b->next_bio,
- &(ctx->obuf[ctx->obuf_off]), ctx->obuf_len);
+ &(ctx->obuf[ctx->obuf_off]), ctx->obuf_len);
BIO_copy_next_retry(b);
if (r <= 0)
return (long)r;
@@ -385,8 +385,7 @@ static long buffer_ctrl(BIO *b, int cmd, long num, void *ptr)
break;
case BIO_CTRL_DUP:
dbio = (BIO *)ptr;
- if (BIO_set_read_buffer_size(dbio, ctx->ibuf_size) <= 0 ||
- BIO_set_write_buffer_size(dbio, ctx->obuf_size) <= 0)
+ if (BIO_set_read_buffer_size(dbio, ctx->ibuf_size) <= 0 || BIO_set_write_buffer_size(dbio, ctx->obuf_size) <= 0)
ret = 0;
break;
case BIO_CTRL_PEEK:
@@ -423,7 +422,7 @@ static int buffer_gets(BIO *b, char *buf, int size)
char *p;
ctx = (BIO_F_BUFFER_CTX *)b->ptr;
- size--; /* reserve space for a '\0' */
+ size--; /* reserve space for a '\0' */
BIO_clear_retry_flags(b);
for (;;) {
@@ -446,7 +445,7 @@ static int buffer_gets(BIO *b, char *buf, int size)
*buf = '\0';
return num;
}
- } else { /* read another chunk */
+ } else { /* read another chunk */
i = BIO_read(b->next_bio, ctx->ibuf, ctx->ibuf_size);
if (i <= 0) {
diff --git a/crypto/bio/bf_lbuf.c b/crypto/bio/bf_lbuf.c
index e307c77be0..1dfcac8f2e 100644
--- a/crypto/bio/bf_lbuf.c
+++ b/crypto/bio/bf_lbuf.c
@@ -23,7 +23,7 @@ static int linebuffer_free(BIO *data);
static long linebuffer_callback_ctrl(BIO *h, int cmd, BIO_info_cb *fp);
/* A 10k maximum should be enough for most purposes */
-#define DEFAULT_LINEBUFFER_SIZE 1024*10
+#define DEFAULT_LINEBUFFER_SIZE 1024 * 10
/* #define DEBUG */
@@ -48,9 +48,9 @@ const BIO_METHOD *BIO_f_linebuffer(void)
}
typedef struct bio_linebuffer_ctx_struct {
- char *obuf; /* the output char array */
- int obuf_size; /* how big is the output buffer */
- int obuf_len; /* how many bytes are in it */
+ char *obuf; /* the output char array */
+ int obuf_size; /* how big is the output buffer */
+ int obuf_len; /* how many bytes are in it */
} BIO_LINEBUFFER_CTX;
static int linebuffer_new(BIO *bi)
@@ -119,7 +119,8 @@ static int linebuffer_write(BIO *b, const char *in, int inl)
const char *p;
char c;
- for (p = in, c = '\0'; p < in + inl && (c = *p) != '\n'; p++) ;
+ for (p = in, c = '\0'; p < in + inl && (c = *p) != '\n'; p++)
+ ;
if (c == '\n') {
p++;
foundnl = 1;
@@ -131,7 +132,7 @@ static int linebuffer_write(BIO *b, const char *in, int inl)
* concatenate them and write
*/
while ((foundnl || p - in > ctx->obuf_size - ctx->obuf_len)
- && ctx->obuf_len > 0) {
+ && ctx->obuf_len > 0) {
int orig_olen = ctx->obuf_len;
int llen = (int)(p - in);
@@ -183,8 +184,7 @@ static int linebuffer_write(BIO *b, const char *in, int inl)
in += i;
inl -= i;
}
- }
- while (foundnl && inl > 0);
+ } while (foundnl && inl > 0);
/*
* We've written as much as we can. The rest of the input buffer, if
* any, is text that doesn't and with a NL and therefore needs to be
diff --git a/crypto/bio/bf_prefix.c b/crypto/bio/bf_prefix.c
index 1141b7bbcc..d8c32e1c65 100644
--- a/crypto/bio/bf_prefix.c
+++ b/crypto/bio/bf_prefix.c
@@ -13,7 +13,7 @@
#include "bio_local.h"
static int prefix_write(BIO *b, const char *out, size_t outl,
- size_t *numwritten);
+ size_t *numwritten);
static int prefix_read(BIO *b, char *buf, size_t size, size_t *numread);
static int prefix_puts(BIO *b, const char *str);
static int prefix_gets(BIO *b, char *str, int size);
@@ -43,10 +43,10 @@ const BIO_METHOD *BIO_f_prefix(void)
}
typedef struct prefix_ctx_st {
- char *prefix; /* Text prefix, given by user */
- unsigned int indent; /* Indentation amount, given by user */
+ char *prefix; /* Text prefix, given by user */
+ unsigned int indent; /* Indentation amount, given by user */
- int linestart; /* flag to indicate we're at the line start */
+ int linestart; /* flag to indicate we're at the line start */
} PREFIX_CTX;
static int prefix_create(BIO *b)
@@ -79,7 +79,7 @@ static int prefix_read(BIO *b, char *in, size_t size, size_t *numread)
}
static int prefix_write(BIO *b, const char *out, size_t outl,
- size_t *numwritten)
+ size_t *numwritten)
{
PREFIX_CTX *ctx = BIO_get_data(b);
@@ -97,7 +97,7 @@ static int prefix_write(BIO *b, const char *out, size_t outl,
* prepared to handle prefix and indentation the next time around.
*/
if (outl > 0)
- ctx->linestart = (out[outl-1] == '\n');
+ ctx->linestart = (out[outl - 1] == '\n');
return BIO_write_ex(BIO_next(b), out, outl, numwritten);
}
@@ -116,7 +116,7 @@ static int prefix_write(BIO *b, const char *out, size_t outl,
if (ctx->prefix != NULL
&& !BIO_write_ex(BIO_next(b), ctx->prefix, strlen(ctx->prefix),
- &dontcare))
+ &dontcare))
return 0;
BIO_printf(BIO_next(b), "%*s", ctx->indent, "");
ctx->linestart = 0;
diff --git a/crypto/bio/bf_readbuff.c b/crypto/bio/bf_readbuff.c
index 2409c9db97..36971a40c6 100644
--- a/crypto/bio/bf_readbuff.c
+++ b/crypto/bio/bf_readbuff.c
@@ -19,7 +19,7 @@
#include "bio_local.h"
#include "internal/cryptlib.h"
-#define DEFAULT_BUFFER_SIZE 4096
+#define DEFAULT_BUFFER_SIZE 4096
static int readbuffer_write(BIO *h, const char *buf, int num);
static int readbuffer_read(BIO *h, char *buf, int size);
@@ -236,8 +236,8 @@ static int readbuffer_gets(BIO *b, char *buf, int size)
p = ctx->ibuf + ctx->ibuf_off;
found_newline = 0;
for (num_chars = 0;
- (num_chars < ctx->ibuf_len) && (num_chars < size);
- num_chars++) {
+ (num_chars < ctx->ibuf_len) && (num_chars < size);
+ num_chars++) {
*buf++ = p[num_chars];
if (p[num_chars] == '\n') {
found_newline = 1;
@@ -259,33 +259,33 @@ static int readbuffer_gets(BIO *b, char *buf, int size)
* next bio.
*/
- /* Resize if we have to */
- if (!readbuffer_resize(ctx, 1 + size))
- return 0;
- /*
- * Read more data from the next bio using BIO_read_ex:
- * Note we cannot use BIO_gets() here as it does not work on a
- * binary stream that contains 0x00. (Since strlen() will stop at
- * any 0x00 not at the last read '\n' in a FILE bio).
- * Also note that some applications open and close the file bio
- * multiple times and need to read the next available block when using
- * stdin - so we need to READ one byte at a time!
- */
- p = ctx->ibuf + ctx->ibuf_off;
- for (i = 0; i < size; ++i) {
- j = BIO_read(b->next_bio, p, 1);
- if (j <= 0) {
- BIO_copy_next_retry(b);
- *buf = '\0';
- return num > 0 ? num : j;
- }
- *buf++ = *p;
- num++;
- ctx->ibuf_off++;
- if (*p == '\n')
- break;
- ++p;
- }
- *buf = '\0';
- return num;
+ /* Resize if we have to */
+ if (!readbuffer_resize(ctx, 1 + size))
+ return 0;
+ /*
+ * Read more data from the next bio using BIO_read_ex:
+ * Note we cannot use BIO_gets() here as it does not work on a
+ * binary stream that contains 0x00. (Since strlen() will stop at
+ * any 0x00 not at the last read '\n' in a FILE bio).
+ * Also note that some applications open and close the file bio
+ * multiple times and need to read the next available block when using
+ * stdin - so we need to READ one byte at a time!
+ */
+ p = ctx->ibuf + ctx->ibuf_off;
+ for (i = 0; i < size; ++i) {
+ j = BIO_read(b->next_bio, p, 1);
+ if (j <= 0) {
+ BIO_copy_next_retry(b);
+ *buf = '\0';
+ return num > 0 ? num : j;
+ }
+ *buf++ = *p;
+ num++;
+ ctx->ibuf_off++;
+ if (*p == '\n')
+ break;
+ ++p;
+ }
+ *buf = '\0';
+ return num;
}
diff --git a/crypto/bio/bio_addr.c b/crypto/bio/bio_addr.c
index 7301165a7e..a53ec7047f 100644
--- a/crypto/bio/bio_addr.c
+++ b/crypto/bio/bio_addr.c
@@ -8,7 +8,7 @@
*/
#ifndef _GNU_SOURCE
-# define _GNU_SOURCE
+#define _GNU_SOURCE
#endif
/*
@@ -126,8 +126,8 @@ int BIO_ADDR_make(BIO_ADDR *ap, const struct sockaddr *sa)
}
int BIO_ADDR_rawmake(BIO_ADDR *ap, int family,
- const void *where, size_t wherelen,
- unsigned short port)
+ const void *where, size_t wherelen,
+ unsigned short port)
{
#ifndef OPENSSL_NO_UNIX_SOCK
if (family == AF_UNIX) {
@@ -227,7 +227,7 @@ unsigned short BIO_ADDR_rawport(const BIO_ADDR *ap)
* stack, and 1 on success.
*/
static int addr_strings(const BIO_ADDR *ap, int numeric,
- char **hostname, char **service)
+ char **hostname, char **service)
{
if (BIO_sock_init() != 1)
return 0;
@@ -242,15 +242,16 @@ static int addr_strings(const BIO_ADDR *ap, int numeric,
flags |= NI_NUMERICHOST | NI_NUMERICSERV;
if ((ret = getnameinfo(BIO_ADDR_sockaddr(ap),
- BIO_ADDR_sockaddr_size(ap),
- host, sizeof(host), serv, sizeof(serv),
- flags)) != 0) {
-# ifdef EAI_SYSTEM
+ BIO_ADDR_sockaddr_size(ap),
+ host, sizeof(host), serv, sizeof(serv),
+ flags))
+ != 0) {
+#ifdef EAI_SYSTEM
if (ret == EAI_SYSTEM) {
ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling getnameinfo()");
+ "calling getnameinfo()");
} else
-# endif
+#endif
{
ERR_raise_data(ERR_LIB_BIO, ERR_R_SYS_LIB, gai_strerror(ret));
}
@@ -265,7 +266,7 @@ static int addr_strings(const BIO_ADDR *ap, int numeric,
*/
if (serv[0] == '\0') {
BIO_snprintf(serv, sizeof(serv), "%d",
- ntohs(BIO_ADDR_rawport(ap)));
+ ntohs(BIO_ADDR_rawport(ap)));
}
if (hostname != NULL)
@@ -277,14 +278,14 @@ static int addr_strings(const BIO_ADDR *ap, int numeric,
if (hostname != NULL)
*hostname = OPENSSL_strdup(inet_ntoa(ap->s_in.sin_addr));
if (service != NULL) {
- char serv[6]; /* port is 16 bits => max 5 decimal digits */
+ char serv[6]; /* port is 16 bits => max 5 decimal digits */
BIO_snprintf(serv, sizeof(serv), "%d", ntohs(ap->s_in.sin_port));
*service = OPENSSL_strdup(serv);
}
}
if ((hostname != NULL && *hostname == NULL)
- || (service != NULL && *service == NULL)) {
+ || (service != NULL && *service == NULL)) {
if (hostname != NULL) {
OPENSSL_free(*hostname);
*hostname = NULL;
@@ -455,11 +456,11 @@ void BIO_ADDRINFO_free(BIO_ADDRINFO *bai)
return;
#ifdef AI_PASSIVE
-# ifndef OPENSSL_NO_UNIX_SOCK
-# define _cond bai->bai_family != AF_UNIX
-# else
-# define _cond 1
-# endif
+#ifndef OPENSSL_NO_UNIX_SOCK
+#define _cond bai->bai_family != AF_UNIX
+#else
+#define _cond 1
+#endif
if (_cond) {
freeaddrinfo(bai);
return;
@@ -503,10 +504,12 @@ void BIO_ADDRINFO_free(BIO_ADDRINFO *bai)
*
*/
int BIO_parse_hostserv(const char *hostserv, char **host, char **service,
- enum BIO_hostserv_priorities hostserv_prio)
+ enum BIO_hostserv_priorities hostserv_prio)
{
- const char *h = NULL; size_t hl = 0;
- const char *p = NULL; size_t pl = 0;
+ const char *h = NULL;
+ size_t hl = 0;
+ const char *p = NULL;
+ size_t pl = 0;
if (*hostserv == '[') {
if ((p = strchr(hostserv, ']')) == NULL)
@@ -583,10 +586,10 @@ int BIO_parse_hostserv(const char *hostserv, char **host, char **service,
}
return 1;
- amb_err:
+amb_err:
ERR_raise(ERR_LIB_BIO, BIO_R_AMBIGUOUS_HOST_OR_SERVICE);
return 0;
- spec_err:
+spec_err:
ERR_raise(ERR_LIB_BIO, BIO_R_MALFORMED_HOST_OR_SERVICE);
return 0;
}
@@ -601,9 +604,9 @@ int BIO_parse_hostserv(const char *hostserv, char **host, char **service,
* only happens if a memory allocation error occurred.
*/
static int addrinfo_wrap(int family, int socktype,
- const void *where, size_t wherelen,
- unsigned short port,
- BIO_ADDRINFO **bai)
+ const void *where, size_t wherelen,
+ unsigned short port,
+ BIO_ADDRINFO **bai)
{
if ((*bai = OPENSSL_zalloc(sizeof(**bai))) == NULL)
return 0;
@@ -646,8 +649,8 @@ DEFINE_RUN_ONCE_STATIC(do_bio_lookup_init)
}
int BIO_lookup(const char *host, const char *service,
- enum BIO_lookup_type lookup_type,
- int family, int socktype, BIO_ADDRINFO **res)
+ enum BIO_lookup_type lookup_type,
+ int family, int socktype, BIO_ADDRINFO **res)
{
return BIO_lookup_ex(host, service, lookup_type, family, socktype, 0, res);
}
@@ -675,9 +678,9 @@ int BIO_lookup(const char *host, const char *service,
* The return value is 1 on success or 0 in case of error.
*/
int BIO_lookup_ex(const char *host, const char *service, int lookup_type,
- int family, int socktype, int protocol, BIO_ADDRINFO **res)
+ int family, int socktype, int protocol, BIO_ADDRINFO **res)
{
- int ret = 0; /* Assume failure */
+ int ret = 0; /* Assume failure */
switch (family) {
case AF_INET:
@@ -719,12 +722,12 @@ int BIO_lookup_ex(const char *host, const char *service, int lookup_type,
hints.ai_family = family;
hints.ai_socktype = socktype;
hints.ai_protocol = protocol;
-# ifdef AI_ADDRCONFIG
-# ifdef AF_UNSPEC
+#ifdef AI_ADDRCONFIG
+#ifdef AF_UNSPEC
if (host != NULL && family == AF_UNSPEC)
-# endif
+#endif
hints.ai_flags |= AI_ADDRCONFIG;
-# endif
+#endif
if (lookup_type == BIO_LOOKUP_SERVER)
hints.ai_flags |= AI_PASSIVE;
@@ -732,37 +735,37 @@ int BIO_lookup_ex(const char *host, const char *service, int lookup_type,
/* Note that |res| SHOULD be a 'struct addrinfo **' thanks to
* macro magic in bio_local.h
*/
-# if defined(AI_ADDRCONFIG) && defined(AI_NUMERICHOST)
- retry:
-# endif
+#if defined(AI_ADDRCONFIG) && defined(AI_NUMERICHOST)
+ retry:
+#endif
switch ((gai_ret = getaddrinfo(host, service, &hints, res))) {
-# ifdef EAI_SYSTEM
+#ifdef EAI_SYSTEM
case EAI_SYSTEM:
ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling getaddrinfo()");
+ "calling getaddrinfo()");
ERR_raise(ERR_LIB_BIO, ERR_R_SYS_LIB);
break;
-# endif
-# ifdef EAI_MEMORY
+#endif
+#ifdef EAI_MEMORY
case EAI_MEMORY:
ERR_raise_data(ERR_LIB_BIO, ERR_R_SYS_LIB,
- gai_strerror(old_ret ? old_ret : gai_ret));
+ gai_strerror(old_ret ? old_ret : gai_ret));
break;
-# endif
+#endif
case 0:
- ret = 1; /* Success */
+ ret = 1; /* Success */
break;
default:
-# if defined(AI_ADDRCONFIG) && defined(AI_NUMERICHOST)
+#if defined(AI_ADDRCONFIG) && defined(AI_NUMERICHOST)
if (hints.ai_flags & AI_ADDRCONFIG) {
hints.ai_flags &= ~AI_ADDRCONFIG;
hints.ai_flags |= AI_NUMERICHOST;
old_ret = gai_ret;
goto retry;
}
-# endif
+#endif
ERR_raise_data(ERR_LIB_BIO, ERR_R_SYS_LIB,
- gai_strerror(old_ret ? old_ret : gai_ret));
+ gai_strerror(old_ret ? old_ret : gai_ret));
break;
}
} else {
@@ -774,8 +777,8 @@ int BIO_lookup_ex(const char *host, const char *service, int lookup_type,
* '&he_fallback_addresses' are 32-bit pointers
*/
#if defined(OPENSSL_SYS_VMS) && defined(__DECC)
-# pragma pointer_size save
-# pragma pointer_size 32
+#pragma pointer_size save
+#pragma pointer_size 32
#endif
/* Windows doesn't seem to have in_addr_t */
#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS)
@@ -794,7 +797,7 @@ int BIO_lookup_ex(const char *host, const char *service, int lookup_type,
(char **)&he_fallback_addresses
};
#if defined(OPENSSL_SYS_VMS) && defined(__DECC)
-# pragma pointer_size restore
+#pragma pointer_size restore
#endif
struct servent *se;
@@ -813,7 +816,7 @@ int BIO_lookup_ex(const char *host, const char *service, int lookup_type,
if (!CRYPTO_THREAD_write_lock(bio_lookup_lock))
return 0;
-
+
he_fallback_address = INADDR_ANY;
if (host == NULL) {
he = &he_fallback;
@@ -847,17 +850,17 @@ int BIO_lookup_ex(const char *host, const char *service, int lookup_type,
* anyway [above getaddrinfo/gai_strerror is]. We just let
* system administrator figure this out...
*/
-# if defined(OPENSSL_SYS_VXWORKS)
+#if defined(OPENSSL_SYS_VXWORKS)
/* h_errno doesn't exist on VxWorks */
ERR_raise_data(ERR_LIB_SYS, 1000,
- "calling gethostbyname()");
-# else
+ "calling gethostbyname()");
+#else
ERR_raise_data(ERR_LIB_SYS, 1000 + h_errno,
- "calling gethostbyname()");
-# endif
+ "calling gethostbyname()");
+#endif
#else
ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling gethostbyname()");
+ "calling gethostbyname()");
#endif
ret = 0;
goto err;
@@ -877,12 +880,12 @@ int BIO_lookup_ex(const char *host, const char *service, int lookup_type,
* VMS C, we need to make sure that 'proto' is a 32-bit pointer.
*/
#if defined(OPENSSL_SYS_VMS) && defined(__DECC)
-# pragma pointer_size save
-# pragma pointer_size 32
+#pragma pointer_size save
+#pragma pointer_size 32
#endif
char *proto = NULL;
#if defined(OPENSSL_SYS_VMS) && defined(__DECC)
-# pragma pointer_size restore
+#pragma pointer_size restore
#endif
switch (socktype) {
@@ -895,7 +898,7 @@ int BIO_lookup_ex(const char *host, const char *service, int lookup_type,
}
if (endp != service && *endp == '\0'
- && portnum > 0 && portnum < 65536) {
+ && portnum > 0 && portnum < 65536) {
se_fallback.s_port = htons((unsigned short)portnum);
se_fallback.s_proto = proto;
se = &se_fallback;
@@ -904,7 +907,7 @@ int BIO_lookup_ex(const char *host, const char *service, int lookup_type,
if (se == NULL) {
ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling getservbyname()");
+ "calling getservbyname()");
goto err;
}
} else {
@@ -922,12 +925,12 @@ int BIO_lookup_ex(const char *host, const char *service, int lookup_type,
* the pointer size dance.
*/
#if defined(OPENSSL_SYS_VMS) && defined(__DECC)
-# pragma pointer_size save
-# pragma pointer_size 32
+#pragma pointer_size save
+#pragma pointer_size 32
#endif
char **addrlistp;
#if defined(OPENSSL_SYS_VMS) && defined(__DECC)
-# pragma pointer_size restore
+#pragma pointer_size restore
#endif
size_t addresses;
BIO_ADDRINFO *tmp_bai = NULL;
@@ -935,19 +938,19 @@ int BIO_lookup_ex(const char *host, const char *service, int lookup_type,
/* The easiest way to create a linked list from an
array is to start from the back */
for (addrlistp = he->h_addr_list; *addrlistp != NULL;
- addrlistp++)
+ addrlistp++)
;
for (addresses = addrlistp - he->h_addr_list;
- addrlistp--, addresses-- > 0; ) {
+ addrlistp--, addresses-- > 0;) {
if (!addrinfo_wrap(he->h_addrtype, socktype,
- *addrlistp, he->h_length,
- se->s_port, &tmp_bai))
+ *addrlistp, he->h_length,
+ se->s_port, &tmp_bai))
goto addrinfo_wrap_err;
tmp_bai->bai_next = *res;
*res = tmp_bai;
continue;
- addrinfo_wrap_err:
+ addrinfo_wrap_err:
BIO_ADDRINFO_free(*res);
*res = NULL;
ERR_raise(ERR_LIB_BIO, ERR_R_BIO_LIB);
@@ -957,7 +960,7 @@ int BIO_lookup_ex(const char *host, const char *service, int lookup_type,
ret = 1;
}
- err:
+ err:
CRYPTO_THREAD_unlock(bio_lookup_lock);
}
diff --git a/crypto/bio/bio_cb.c b/crypto/bio/bio_cb.c
index c8c5b55fec..db7b6d1b2f 100644
--- a/crypto/bio/bio_cb.c
+++ b/crypto/bio/bio_cb.c
@@ -17,7 +17,7 @@
#include <openssl/err.h>
long BIO_debug_callback_ex(BIO *bio, int cmd, const char *argp, size_t len,
- int argi, long argl, int ret, size_t *processed)
+ int argi, long argl, int ret, size_t *processed)
{
BIO *b;
char buf[256];
@@ -45,41 +45,41 @@ long BIO_debug_callback_ex(BIO *bio, int cmd, const char *argp, size_t len,
case BIO_CB_READ:
if (bio->method->type & BIO_TYPE_DESCRIPTOR)
BIO_snprintf(p, left, "read(%d,%zu) - %s fd=%d\n",
- bio->num, len,
- bio->method->name, bio->num);
+ bio->num, len,
+ bio->method->name, bio->num);
else
BIO_snprintf(p, left, "read(%d,%zu) - %s\n",
- bio->num, len, bio->method->name);
+ bio->num, len, bio->method->name);
break;
case BIO_CB_WRITE:
if (bio->method->type & BIO_TYPE_DESCRIPTOR)
BIO_snprintf(p, left, "write(%d,%zu) - %s fd=%d\n",
- bio->num, len,
- bio->method->name, bio->num);
+ bio->num, len,
+ bio->method->name, bio->num);
else
BIO_snprintf(p, left, "write(%d,%zu) - %s\n",
- bio->num, len, bio->method->name);
+ bio->num, len, bio->method->name);
break;
case BIO_CB_PUTS:
BIO_snprintf(p, left, "puts() - %s\n", bio->method->name);
break;
case BIO_CB_GETS:
BIO_snprintf(p, left, "gets(%zu) - %s\n", len,
- bio->method->name);
+ bio->method->name);
break;
case BIO_CB_CTRL:
BIO_snprintf(p, left, "ctrl(%d) - %s\n", argi,
- bio->method->name);
+ bio->method->name);
break;
case BIO_CB_RECVMMSG:
args = (BIO_MMSG_CB_ARGS *)argp;
BIO_snprintf(p, left, "recvmmsg(%zu) - %s",
- args->num_msg, bio->method->name);
+ args->num_msg, bio->method->name);
break;
case BIO_CB_SENDMMSG:
args = (BIO_MMSG_CB_ARGS *)argp;
BIO_snprintf(p, left, "sendmmsg(%zu) - %s",
- args->num_msg, bio->method->name);
+ args->num_msg, bio->method->name);
break;
case BIO_CB_RETURN | BIO_CB_READ:
BIO_snprintf(p, left, "read return %d processed: %zu\n", ret, l);
@@ -121,14 +121,14 @@ long BIO_debug_callback_ex(BIO *bio, int cmd, const char *argp, size_t len,
#ifndef OPENSSL_NO_DEPRECATED_3_0
long BIO_debug_callback(BIO *bio, int cmd, const char *argp,
- int argi, long argl, long ret)
+ int argi, long argl, long ret)
{
size_t processed = 0;
if (ret > 0)
processed = (size_t)ret;
BIO_debug_callback_ex(bio, cmd, argp, (size_t)argi,
- argi, argl, ret > 0 ? 1 : (int)ret, &processed);
+ argi, argl, ret > 0 ? 1 : (int)ret, &processed);
return ret;
}
#endif
diff --git a/crypto/bio/bio_dump.c b/crypto/bio/bio_dump.c
index ef19ad3dc6..d03485c797 100644
--- a/crypto/bio/bio_dump.c
+++ b/crypto/bio/bio_dump.c
@@ -14,19 +14,19 @@
#include <stdio.h>
#include "bio_local.h"
-#define DUMP_WIDTH 16
+#define DUMP_WIDTH 16
#define DUMP_WIDTH_LESS_INDENT(i) (DUMP_WIDTH - ((i - (i > 6 ? 6 : i) + 3) / 4))
-#define SPACE(buf, pos, n) (sizeof(buf) - (pos) > (n))
+#define SPACE(buf, pos, n) (sizeof(buf) - (pos) > (n))
-int BIO_dump_cb(int (*cb) (const void *data, size_t len, void *u),
- void *u, const void *s, int len)
+int BIO_dump_cb(int (*cb)(const void *data, size_t len, void *u),
+ void *u, const void *s, int len)
{
return BIO_dump_indent_cb(cb, u, s, len, 0);
}
-int BIO_dump_indent_cb(int (*cb) (const void *data, size_t len, void *u),
- void *u, const void *v, int len, int indent)
+int BIO_dump_indent_cb(int (*cb)(const void *data, size_t len, void *u),
+ void *u, const void *v, int len, int indent)
{
const unsigned char *s = v;
int res, ret = 0;
@@ -46,7 +46,7 @@ int BIO_dump_indent_cb(int (*cb) (const void *data, size_t len, void *u),
rows++;
for (i = 0; i < rows; i++) {
n = BIO_snprintf(buf, sizeof(buf), "%*s%04x - ", indent, "",
- i * dump_width);
+ i * dump_width);
if (n < 0)
return -1;
for (j = 0; j < dump_width; j++) {
@@ -56,7 +56,7 @@ int BIO_dump_indent_cb(int (*cb) (const void *data, size_t len, void *u),
} else {
ch = *(s + i * dump_width + j) & 0xff;
BIO_snprintf(buf + n, 4, "%02x%c", ch,
- j == 7 ? '-' : ' ');
+ j == 7 ? '-' : ' ');
}
n += 3;
}
@@ -74,8 +74,8 @@ int BIO_dump_indent_cb(int (*cb) (const void *data, size_t len, void *u),
buf[n++] = ((ch >= ' ') && (ch <= '~')) ? ch : '.';
#else
buf[n++] = ((ch >= os_toascii[' ']) && (ch <= os_toascii['~']))
- ? os_toebcdic[ch]
- : '.';
+ ? os_toebcdic[ch]
+ : '.';
#endif
buf[n] = '\0';
}
@@ -131,7 +131,7 @@ int BIO_dump_indent(BIO *bp, const void *s, int len, int indent)
}
int BIO_hex_string(BIO *out, int indent, int width, const void *data,
- int datalen)
+ int datalen)
{
const unsigned char *d = data;
int i, j = 0;
diff --git a/crypto/bio/bio_err.c b/crypto/bio/bio_err.c
index e03712b4f1..e2ccb09eb3 100644
--- a/crypto/bio/bio_err.c
+++ b/crypto/bio/bio_err.c
@@ -15,76 +15,76 @@
#ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA BIO_str_reasons[] = {
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_ACCEPT_ERROR), "accept error"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_ADDRINFO_ADDR_IS_NOT_AF_INET),
- "addrinfo addr is not af inet"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_AMBIGUOUS_HOST_OR_SERVICE),
- "ambiguous host or service"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_BAD_FOPEN_MODE), "bad fopen mode"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_BROKEN_PIPE), "broken pipe"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_CONNECT_ERROR), "connect error"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_CONNECT_TIMEOUT), "connect timeout"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_GETHOSTBYNAME_ADDR_IS_NOT_AF_INET),
- "gethostbyname addr is not af inet"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_GETSOCKNAME_ERROR), "getsockname error"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_GETSOCKNAME_TRUNCATED_ADDRESS),
- "getsockname truncated address"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_GETTING_SOCKTYPE), "getting socktype"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_INVALID_ARGUMENT), "invalid argument"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_INVALID_SOCKET), "invalid socket"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_IN_USE), "in use"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_LENGTH_TOO_LONG), "length too long"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_LISTEN_V6_ONLY), "listen v6 only"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_LOOKUP_RETURNED_NOTHING),
- "lookup returned nothing"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_MALFORMED_HOST_OR_SERVICE),
- "malformed host or service"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_NBIO_CONNECT_ERROR), "nbio connect error"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_NO_ACCEPT_ADDR_OR_SERVICE_SPECIFIED),
- "no accept addr or service specified"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_NO_HOSTNAME_OR_SERVICE_SPECIFIED),
- "no hostname or service specified"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_NO_PORT_DEFINED), "no port defined"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_NO_SUCH_FILE), "no such file"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_PORT_MISMATCH), "port mismatch"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_TFO_DISABLED), "tfo disabled"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_TFO_NO_KERNEL_SUPPORT),
- "tfo no kernel support"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_TRANSFER_ERROR), "transfer error"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_TRANSFER_TIMEOUT), "transfer timeout"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNABLE_TO_BIND_SOCKET),
- "unable to bind socket"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNABLE_TO_CREATE_SOCKET),
- "unable to create socket"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNABLE_TO_KEEPALIVE),
- "unable to keepalive"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNABLE_TO_LISTEN_SOCKET),
- "unable to listen socket"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNABLE_TO_NODELAY), "unable to nodelay"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNABLE_TO_REUSEADDR),
- "unable to reuseaddr"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNABLE_TO_TFO), "unable to tfo"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNAVAILABLE_IP_FAMILY),
- "unavailable ip family"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNINITIALIZED), "uninitialized"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNKNOWN_INFO_TYPE), "unknown info type"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNSUPPORTED_IP_FAMILY),
- "unsupported ip family"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNSUPPORTED_METHOD), "unsupported method"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNSUPPORTED_PROTOCOL_FAMILY),
- "unsupported protocol family"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_WRITE_TO_READ_ONLY_BIO),
- "write to read only BIO"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_WSASTARTUP), "WSAStartup"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_LOCAL_ADDR_NOT_AVAILABLE),
- "local address not available"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_PEER_ADDR_NOT_AVAILABLE),
- "peer address not available"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_NON_FATAL),
- "non-fatal or transient error"},
- {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_PORT_MISMATCH),
- "port mismatch"},
- {0, NULL}
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_ACCEPT_ERROR), "accept error" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_ADDRINFO_ADDR_IS_NOT_AF_INET),
+ "addrinfo addr is not af inet" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_AMBIGUOUS_HOST_OR_SERVICE),
+ "ambiguous host or service" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_BAD_FOPEN_MODE), "bad fopen mode" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_BROKEN_PIPE), "broken pipe" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_CONNECT_ERROR), "connect error" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_CONNECT_TIMEOUT), "connect timeout" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_GETHOSTBYNAME_ADDR_IS_NOT_AF_INET),
+ "gethostbyname addr is not af inet" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_GETSOCKNAME_ERROR), "getsockname error" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_GETSOCKNAME_TRUNCATED_ADDRESS),
+ "getsockname truncated address" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_GETTING_SOCKTYPE), "getting socktype" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_INVALID_ARGUMENT), "invalid argument" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_INVALID_SOCKET), "invalid socket" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_IN_USE), "in use" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_LENGTH_TOO_LONG), "length too long" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_LISTEN_V6_ONLY), "listen v6 only" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_LOOKUP_RETURNED_NOTHING),
+ "lookup returned nothing" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_MALFORMED_HOST_OR_SERVICE),
+ "malformed host or service" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_NBIO_CONNECT_ERROR), "nbio connect error" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_NO_ACCEPT_ADDR_OR_SERVICE_SPECIFIED),
+ "no accept addr or service specified" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_NO_HOSTNAME_OR_SERVICE_SPECIFIED),
+ "no hostname or service specified" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_NO_PORT_DEFINED), "no port defined" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_NO_SUCH_FILE), "no such file" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_PORT_MISMATCH), "port mismatch" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_TFO_DISABLED), "tfo disabled" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_TFO_NO_KERNEL_SUPPORT),
+ "tfo no kernel support" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_TRANSFER_ERROR), "transfer error" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_TRANSFER_TIMEOUT), "transfer timeout" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNABLE_TO_BIND_SOCKET),
+ "unable to bind socket" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNABLE_TO_CREATE_SOCKET),
+ "unable to create socket" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNABLE_TO_KEEPALIVE),
+ "unable to keepalive" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNABLE_TO_LISTEN_SOCKET),
+ "unable to listen socket" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNABLE_TO_NODELAY), "unable to nodelay" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNABLE_TO_REUSEADDR),
+ "unable to reuseaddr" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNABLE_TO_TFO), "unable to tfo" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNAVAILABLE_IP_FAMILY),
+ "unavailable ip family" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNINITIALIZED), "uninitialized" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNKNOWN_INFO_TYPE), "unknown info type" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNSUPPORTED_IP_FAMILY),
+ "unsupported ip family" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNSUPPORTED_METHOD), "unsupported method" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNSUPPORTED_PROTOCOL_FAMILY),
+ "unsupported protocol family" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_WRITE_TO_READ_ONLY_BIO),
+ "write to read only BIO" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_WSASTARTUP), "WSAStartup" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_LOCAL_ADDR_NOT_AVAILABLE),
+ "local address not available" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_PEER_ADDR_NOT_AVAILABLE),
+ "peer address not available" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_NON_FATAL),
+ "non-fatal or transient error" },
+ { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_PORT_MISMATCH),
+ "port mismatch" },
+ { 0, NULL }
};
#endif
diff --git a/crypto/bio/bio_lib.c b/crypto/bio/bio_lib.c
index f133578b55..f89316b59f 100644
--- a/crypto/bio/bio_lib.c
+++ b/crypto/bio/bio_lib.c
@@ -20,12 +20,12 @@
* len parameter or not
*/
#define HAS_LEN_OPER(o) ((o) == BIO_CB_READ || (o) == BIO_CB_WRITE \
- || (o) == BIO_CB_GETS)
+ || (o) == BIO_CB_GETS)
#ifndef OPENSSL_NO_DEPRECATED_3_0
-# define HAS_CALLBACK(b) ((b)->callback != NULL || (b)->callback_ex != NULL)
+#define HAS_CALLBACK(b) ((b)->callback != NULL || (b)->callback_ex != NULL)
#else
-# define HAS_CALLBACK(b) ((b)->callback_ex != NULL)
+#define HAS_CALLBACK(b) ((b)->callback_ex != NULL)
#endif
/*
* Helper function to work out whether to call the new style callback or the old
@@ -35,8 +35,8 @@
* for the "long" used for "inret"
*/
static long bio_call_callback(BIO *b, int oper, const char *argp, size_t len,
- int argi, long argl, long inret,
- size_t *processed)
+ int argi, long argl, long inret,
+ size_t *processed)
{
long ret = inret;
#ifndef OPENSSL_NO_DEPRECATED_3_0
@@ -272,9 +272,7 @@ static int bio_read_intern(BIO *b, void *data, size_t dlen, size_t *readbytes)
return -2;
}
- if (HAS_CALLBACK(b) &&
- ((ret = (int)bio_call_callback(b, BIO_CB_READ, data, dlen, 0, 0L, 1L,
- NULL)) <= 0))
+ if (HAS_CALLBACK(b) && ((ret = (int)bio_call_callback(b, BIO_CB_READ, data, dlen, 0, 0L, 1L, NULL)) <= 0))
return ret;
if (!b->init) {
@@ -289,7 +287,7 @@ static int bio_read_intern(BIO *b, void *data, size_t dlen, size_t *readbytes)
if (HAS_CALLBACK(b))
ret = (int)bio_call_callback(b, BIO_CB_READ | BIO_CB_RETURN, data,
- dlen, 0, 0L, ret, readbytes);
+ dlen, 0, 0L, ret, readbytes);
/* Shouldn't happen */
if (ret > 0 && *readbytes > dlen) {
@@ -324,7 +322,7 @@ int BIO_read_ex(BIO *b, void *data, size_t dlen, size_t *readbytes)
}
static int bio_write_intern(BIO *b, const void *data, size_t dlen,
- size_t *written)
+ size_t *written)
{
size_t local_written;
int ret;
@@ -343,9 +341,7 @@ static int bio_write_intern(BIO *b, const void *data, size_t dlen,
return -2;
}
- if (HAS_CALLBACK(b) &&
- ((ret = (int)bio_call_callback(b, BIO_CB_WRITE, data, dlen, 0, 0L, 1L,
- NULL)) <= 0))
+ if (HAS_CALLBACK(b) && ((ret = (int)bio_call_callback(b, BIO_CB_WRITE, data, dlen, 0, 0L, 1L, NULL)) <= 0))
return ret;
if (!b->init) {
@@ -360,7 +356,7 @@ static int bio_write_intern(BIO *b, const void *data, size_t dlen,
if (HAS_CALLBACK(b))
ret = (int)bio_call_callback(b, BIO_CB_WRITE | BIO_CB_RETURN, data,
- dlen, 0, 0L, ret, &local_written);
+ dlen, 0, 0L, ret, &local_written);
if (written != NULL)
*written = local_written;
@@ -392,8 +388,8 @@ int BIO_write_ex(BIO *b, const void *data, size_t dlen, size_t *written)
}
int BIO_sendmmsg(BIO *b, BIO_MSG *msg,
- size_t stride, size_t num_msg, uint64_t flags,
- size_t *msgs_processed)
+ size_t stride, size_t num_msg, uint64_t flags,
+ size_t *msgs_processed)
{
size_t ret;
BIO_MMSG_CB_ARGS args;
@@ -411,14 +407,14 @@ int BIO_sendmmsg(BIO *b, BIO_MSG *msg,
}
if (HAS_CALLBACK(b)) {
- args.msg = msg;
- args.stride = stride;
- args.num_msg = num_msg;
- args.flags = flags;
+ args.msg = msg;
+ args.stride = stride;
+ args.num_msg = num_msg;
+ args.flags = flags;
args.msgs_processed = msgs_processed;
ret = (size_t)bio_call_callback(b, BIO_CB_SENDMMSG, (void *)&args,
- 0, 0, 0, 1, NULL);
+ 0, 0, 0, 1, NULL);
if (ret <= 0)
return 0;
}
@@ -433,14 +429,14 @@ int BIO_sendmmsg(BIO *b, BIO_MSG *msg,
if (HAS_CALLBACK(b))
ret = (size_t)bio_call_callback(b, BIO_CB_SENDMMSG | BIO_CB_RETURN,
- (void *)&args, ret, 0, 0, (long)ret, NULL);
+ (void *)&args, ret, 0, 0, (long)ret, NULL);
return ret > 0;
}
int BIO_recvmmsg(BIO *b, BIO_MSG *msg,
- size_t stride, size_t num_msg, uint64_t flags,
- size_t *msgs_processed)
+ size_t stride, size_t num_msg, uint64_t flags,
+ size_t *msgs_processed)
{
size_t ret;
BIO_MMSG_CB_ARGS args;
@@ -458,14 +454,14 @@ int BIO_recvmmsg(BIO *b, BIO_MSG *msg,
}
if (HAS_CALLBACK(b)) {
- args.msg = msg;
- args.stride = stride;
- args.num_msg = num_msg;
- args.flags = flags;
+ args.msg = msg;
+ args.stride = stride;
+ args.num_msg = num_msg;
+ args.flags = flags;
args.msgs_processed = msgs_processed;
ret = bio_call_callback(b, BIO_CB_RECVMMSG, (void *)&args,
- 0, 0, 0, 1, NULL);
+ 0, 0, 0, 1, NULL);
if (ret <= 0)
return 0;
}
@@ -480,7 +476,7 @@ int BIO_recvmmsg(BIO *b, BIO_MSG *msg,
if (HAS_CALLBACK(b))
ret = (size_t)bio_call_callback(b, BIO_CB_RECVMMSG | BIO_CB_RETURN,
- (void *)&args, ret, 0, 0, (long)ret, NULL);
+ (void *)&args, ret, 0, 0, (long)ret, NULL);
return ret > 0;
}
@@ -530,7 +526,7 @@ int BIO_puts(BIO *b, const char *buf)
if (HAS_CALLBACK(b))
ret = (int)bio_call_callback(b, BIO_CB_PUTS | BIO_CB_RETURN, buf, 0, 0,
- 0L, ret, &written);
+ 0L, ret, &written);
if (ret > 0) {
if (written > INT_MAX) {
@@ -583,7 +579,7 @@ int BIO_gets(BIO *b, char *buf, int size)
if (HAS_CALLBACK(b))
ret = (int)bio_call_callback(b, BIO_CB_GETS | BIO_CB_RETURN, buf, size,
- 0, 0L, ret, &readbytes);
+ 0, 0L, ret, &readbytes);
if (ret > 0) {
/* Shouldn't happen */
@@ -678,7 +674,7 @@ long BIO_ctrl(BIO *b, int cmd, long larg, void *parg)
if (HAS_CALLBACK(b))
ret = bio_call_callback(b, BIO_CB_CTRL | BIO_CB_RETURN, parg, 0, cmd,
- larg, ret, NULL);
+ larg, ret, NULL);
return ret;
}
@@ -690,14 +686,14 @@ long BIO_callback_ctrl(BIO *b, int cmd, BIO_info_cb *fp)
if (b == NULL)
return -2;
if (b->method == NULL || b->method->callback_ctrl == NULL
- || cmd != BIO_CTRL_SET_CALLBACK) {
+ || cmd != BIO_CTRL_SET_CALLBACK) {
ERR_raise(ERR_LIB_BIO, BIO_R_UNSUPPORTED_METHOD);
return -2;
}
if (HAS_CALLBACK(b)) {
ret = bio_call_callback(b, BIO_CB_CTRL, (void *)&fp, 0, cmd, 0, 1L,
- NULL);
+ NULL);
if (ret <= 0)
return ret;
}
@@ -706,7 +702,7 @@ long BIO_callback_ctrl(BIO *b, int cmd, BIO_info_cb *fp)
if (HAS_CALLBACK(b))
ret = bio_call_callback(b, BIO_CB_CTRL | BIO_CB_RETURN, (void *)&fp, 0,
- cmd, 0, ret, NULL);
+ cmd, 0, ret, NULL);
return ret;
}
@@ -888,7 +884,7 @@ BIO *BIO_dup_chain(BIO *in)
/* copy app data */
if (!CRYPTO_dup_ex_data(CRYPTO_EX_INDEX_BIO, &new_bio->ex_data,
- &bio->ex_data)) {
+ &bio->ex_data)) {
BIO_free(new_bio);
goto err;
}
@@ -902,7 +898,7 @@ BIO *BIO_dup_chain(BIO *in)
}
}
return ret;
- err:
+err:
BIO_free_all(ret);
return NULL;
@@ -1004,7 +1000,7 @@ int BIO_wait(BIO *bio, time_t max_time, unsigned int nap_milliseconds)
if (rv <= 0)
ERR_raise(ERR_LIB_BIO,
- rv == 0 ? BIO_R_TRANSFER_TIMEOUT : BIO_R_TRANSFER_ERROR);
+ rv == 0 ? BIO_R_TRANSFER_TIMEOUT : BIO_R_TRANSFER_ERROR);
return rv;
}
@@ -1031,7 +1027,7 @@ int BIO_do_connect_retry(BIO *bio, int timeout, int nap_milliseconds)
nap_milliseconds = 100;
BIO_set_nbio(bio, !blocking);
- retry:
+retry:
ERR_set_mark();
rv = BIO_do_connect(bio);
@@ -1066,7 +1062,7 @@ int BIO_do_connect_retry(BIO *bio, int timeout, int nap_milliseconds)
if (rv > 0)
goto retry;
ERR_raise(ERR_LIB_BIO,
- rv == 0 ? BIO_R_CONNECT_TIMEOUT : BIO_R_CONNECT_ERROR);
+ rv == 0 ? BIO_R_CONNECT_TIMEOUT : BIO_R_CONNECT_ERROR);
} else {
ERR_clear_last_mark();
rv = -1;
@@ -1088,7 +1084,7 @@ int BIO_err_is_non_fatal(unsigned int errcode)
if (ERR_SYSTEM_ERROR(errcode))
return BIO_sock_non_fatal_error(ERR_GET_REASON(errcode));
else if (ERR_GET_LIB(errcode) == ERR_LIB_BIO
- && ERR_GET_REASON(errcode) == BIO_R_NON_FATAL)
+ && ERR_GET_REASON(errcode) == BIO_R_NON_FATAL)
return 1;
else
return 0;
diff --git a/crypto/bio/bio_local.h b/crypto/bio/bio_local.h
index 05954f85bb..60fb944928 100644
--- a/crypto/bio/bio_local.h
+++ b/crypto/bio/bio_local.h
@@ -27,14 +27,14 @@
* For clarity, we check for internal/cryptlib.h since it's a common header
* that also includes bio.h.
*/
-# ifdef OSSL_INTERNAL_CRYPTLIB_H
-# error internal/cryptlib.h included before bio_local.h
-# endif
-# ifdef OPENSSL_BIO_H
-# error openssl/bio.h included before bio_local.h
-# endif
+#ifdef OSSL_INTERNAL_CRYPTLIB_H
+#error internal/cryptlib.h included before bio_local.h
+#endif
+#ifdef OPENSSL_BIO_H
+#error openssl/bio.h included before bio_local.h
+#endif
-# ifdef AI_PASSIVE
+#ifdef AI_PASSIVE
/*
* There's a bug in VMS C header file netdb.h, where struct addrinfo
@@ -43,18 +43,18 @@
* size. The easiest workaround is to force struct addrinfo to be the
* 64-bit variant when compiling in P64 mode.
*/
-# if defined(OPENSSL_SYS_VMS) && __INITIAL_POINTER_SIZE == 64
-# define addrinfo __addrinfo64
-# endif
-
-# define bio_addrinfo_st addrinfo
-# define bai_family ai_family
-# define bai_socktype ai_socktype
-# define bai_protocol ai_protocol
-# define bai_addrlen ai_addrlen
-# define bai_addr ai_addr
-# define bai_next ai_next
-# else
+#if defined(OPENSSL_SYS_VMS) && __INITIAL_POINTER_SIZE == 64
+#define addrinfo __addrinfo64
+#endif
+
+#define bio_addrinfo_st addrinfo
+#define bai_family ai_family
+#define bai_socktype ai_socktype
+#define bai_protocol ai_protocol
+#define bai_addrlen ai_addrlen
+#define bai_addr ai_addr
+#define bai_next ai_next
+#else
struct bio_addrinfo_st {
int bai_family;
int bai_socktype;
@@ -63,7 +63,7 @@ struct bio_addrinfo_st {
struct sockaddr *bai_addr;
struct bio_addrinfo_st *bai_next;
};
-# endif
+#endif
#endif
/* END BIO_ADDRINFO/BIO_ADDR stuff. */
@@ -82,17 +82,17 @@ typedef struct bio_f_buffer_ctx_struct {
* +---------------------------------------------------+
* <-- off --><------- len ------->
*/
- /*- BIO *bio; *//*
- * this is now in the BIO struct
- */
- int ibuf_size; /* how big is the input buffer */
- int obuf_size; /* how big is the output buffer */
- char *ibuf; /* the char array */
- int ibuf_len; /* how many bytes are in it */
- int ibuf_off; /* write/read offset */
- char *obuf; /* the char array */
- int obuf_len; /* how many bytes are in it */
- int obuf_off; /* write/read offset */
+ /*- BIO *bio; */ /*
+ * this is now in the BIO struct
+ */
+ int ibuf_size; /* how big is the input buffer */
+ int obuf_size; /* how big is the output buffer */
+ char *ibuf; /* the char array */
+ int ibuf_len; /* how many bytes are in it */
+ int ibuf_off; /* write/read offset */
+ char *obuf; /* the char array */
+ int obuf_len; /* how many bytes are in it */
+ int obuf_off; /* write/read offset */
} BIO_F_BUFFER_CTX;
struct bio_st {
@@ -103,15 +103,15 @@ struct bio_st {
BIO_callback_fn callback;
#endif
BIO_callback_fn_ex callback_ex;
- char *cb_arg; /* first argument for the callback */
+ char *cb_arg; /* first argument for the callback */
int init;
int shutdown;
- int flags; /* extra storage */
+ int flags; /* extra storage */
int retry_reason;
int num;
void *ptr;
- struct bio_st *next_bio; /* used by filter BIOs */
- struct bio_st *prev_bio; /* used by filter BIOs */
+ struct bio_st *next_bio; /* used by filter BIOs */
+ struct bio_st *prev_bio; /* used by filter BIOs */
CRYPTO_REF_COUNT references;
uint64_t num_read;
uint64_t num_write;
@@ -119,9 +119,9 @@ struct bio_st {
};
#ifndef OPENSSL_NO_SOCK
-# ifdef OPENSSL_SYS_VMS
+#ifdef OPENSSL_SYS_VMS
typedef unsigned int socklen_t;
-# endif
+#endif
extern CRYPTO_RWLOCK *bio_lookup_lock;
@@ -132,50 +132,49 @@ socklen_t BIO_ADDR_sockaddr_size(const BIO_ADDR *ap);
socklen_t BIO_ADDRINFO_sockaddr_size(const BIO_ADDRINFO *bai);
const struct sockaddr *BIO_ADDRINFO_sockaddr(const BIO_ADDRINFO *bai);
-# if defined(OPENSSL_SYS_WINDOWS) && defined(WSAID_WSARECVMSG)
-# define BIO_HAVE_WSAMSG
+#if defined(OPENSSL_SYS_WINDOWS) && defined(WSAID_WSARECVMSG)
+#define BIO_HAVE_WSAMSG
extern LPFN_WSARECVMSG bio_WSARecvMsg;
extern LPFN_WSASENDMSG bio_WSASendMsg;
-# endif
+#endif
#endif
extern CRYPTO_REF_COUNT bio_type_count;
void bio_sock_cleanup_int(void);
-#if BIO_FLAGS_UPLINK_INTERNAL==0
+#if BIO_FLAGS_UPLINK_INTERNAL == 0
/* Shortcut UPLINK calls on most platforms... */
-# define UP_stdin stdin
-# define UP_stdout stdout
-# define UP_stderr stderr
-# define UP_fprintf fprintf
-# define UP_fgets fgets
-# define UP_fread fread
-# define UP_fwrite fwrite
-# undef UP_fsetmod
-# define UP_feof feof
-# define UP_fclose fclose
-
-# define UP_fopen fopen
-# define UP_fseek fseek
-# define UP_ftell ftell
-# define UP_fflush fflush
-# define UP_ferror ferror
-# ifdef _WIN32
-# define UP_fileno _fileno
-# define UP_open _open
-# define UP_read _read
-# define UP_write _write
-# define UP_lseek _lseek
-# define UP_close _close
-# else
-# define UP_fileno fileno
-# define UP_open open
-# define UP_read read
-# define UP_write write
-# define UP_lseek lseek
-# define UP_close close
-# endif
-
+#define UP_stdin stdin
+#define UP_stdout stdout
+#define UP_stderr stderr
+#define UP_fprintf fprintf
+#define UP_fgets fgets
+#define UP_fread fread
+#define UP_fwrite fwrite
+#undef UP_fsetmod
+#define UP_feof feof
+#define UP_fclose fclose
+
+#define UP_fopen fopen
+#define UP_fseek fseek
+#define UP_ftell ftell
+#define UP_fflush fflush
+#define UP_ferror ferror
+#ifdef _WIN32
+#define UP_fileno _fileno
+#define UP_open _open
+#define UP_read _read
+#define UP_write _write
+#define UP_lseek _lseek
+#define UP_close _close
+#else
+#define UP_fileno fileno
+#define UP_open open
+#define UP_read read
+#define UP_write write
+#define UP_lseek lseek
+#define UP_close close
#endif
+#endif
diff --git a/crypto/bio/bio_meth.c b/crypto/bio/bio_meth.c
index b665929b5f..0cab60491e 100644
--- a/crypto/bio/bio_meth.c
+++ b/crypto/bio/bio_meth.c
@@ -39,7 +39,7 @@ BIO_METHOD *BIO_meth_new(int type, const char *name)
BIO_METHOD *biom = OPENSSL_zalloc(sizeof(BIO_METHOD));
if (biom == NULL
- || (biom->name = OPENSSL_strdup(name)) == NULL) {
+ || (biom->name = OPENSSL_strdup(name)) == NULL) {
OPENSSL_free(biom);
return NULL;
}
@@ -56,13 +56,13 @@ void BIO_meth_free(BIO_METHOD *biom)
}
#ifndef OPENSSL_NO_DEPRECATED_3_5
-int (*BIO_meth_get_write(const BIO_METHOD *biom)) (BIO *, const char *, int)
+int (*BIO_meth_get_write(const BIO_METHOD *biom))(BIO *, const char *, int)
{
return biom->bwrite_old;
}
-int (*BIO_meth_get_write_ex(const BIO_METHOD *biom)) (BIO *, const char *, size_t,
- size_t *)
+int (*BIO_meth_get_write_ex(const BIO_METHOD *biom))(BIO *, const char *, size_t,
+ size_t *)
{
return biom->bwrite;
}
@@ -89,7 +89,7 @@ int bwrite_conv(BIO *bio, const char *data, size_t datal, size_t *written)
}
int BIO_meth_set_write(BIO_METHOD *biom,
- int (*bwrite) (BIO *, const char *, int))
+ int (*bwrite)(BIO *, const char *, int))
{
biom->bwrite_old = bwrite;
biom->bwrite = bwrite_conv;
@@ -97,7 +97,7 @@ int BIO_meth_set_write(BIO_METHOD *biom,
}
int BIO_meth_set_write_ex(BIO_METHOD *biom,
- int (*bwrite) (BIO *, const char *, size_t, size_t *))
+ int (*bwrite)(BIO *, const char *, size_t, size_t *))
{
biom->bwrite_old = NULL;
biom->bwrite = bwrite;
@@ -105,12 +105,12 @@ int BIO_meth_set_write_ex(BIO_METHOD *biom,
}
#ifndef OPENSSL_NO_DEPRECATED_3_5
-int (*BIO_meth_get_read(const BIO_METHOD *biom)) (BIO *, char *, int)
+int (*BIO_meth_get_read(const BIO_METHOD *biom))(BIO *, char *, int)
{
return biom->bread_old;
}
-int (*BIO_meth_get_read_ex(const BIO_METHOD *biom)) (BIO *, char *, size_t, size_t *)
+int (*BIO_meth_get_read_ex(const BIO_METHOD *biom))(BIO *, char *, size_t, size_t *)
{
return biom->bread;
}
@@ -137,7 +137,7 @@ int bread_conv(BIO *bio, char *data, size_t datal, size_t *readbytes)
}
int BIO_meth_set_read(BIO_METHOD *biom,
- int (*bread) (BIO *, char *, int))
+ int (*bread)(BIO *, char *, int))
{
biom->bread_old = bread;
biom->bread = bread_conv;
@@ -145,7 +145,7 @@ int BIO_meth_set_read(BIO_METHOD *biom,
}
int BIO_meth_set_read_ex(BIO_METHOD *biom,
- int (*bread) (BIO *, char *, size_t, size_t *))
+ int (*bread)(BIO *, char *, size_t, size_t *))
{
biom->bread_old = NULL;
biom->bread = bread;
@@ -153,110 +153,112 @@ int BIO_meth_set_read_ex(BIO_METHOD *biom,
}
#ifndef OPENSSL_NO_DEPRECATED_3_5
-int (*BIO_meth_get_puts(const BIO_METHOD *biom)) (BIO *, const char *)
+int (*BIO_meth_get_puts(const BIO_METHOD *biom))(BIO *, const char *)
{
return biom->bputs;
}
#endif
int BIO_meth_set_puts(BIO_METHOD *biom,
- int (*bputs) (BIO *, const char *))
+ int (*bputs)(BIO *, const char *))
{
biom->bputs = bputs;
return 1;
}
#ifndef OPENSSL_NO_DEPRECATED_3_5
-int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int)
+int (*BIO_meth_get_gets(const BIO_METHOD *biom))(BIO *, char *, int)
{
return biom->bgets;
}
#endif
int BIO_meth_set_gets(BIO_METHOD *biom,
- int (*bgets) (BIO *, char *, int))
+ int (*bgets)(BIO *, char *, int))
{
biom->bgets = bgets;
return 1;
}
#ifndef OPENSSL_NO_DEPRECATED_3_5
-long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *)
+long (*BIO_meth_get_ctrl(const BIO_METHOD *biom))(BIO *, int, long, void *)
{
return biom->ctrl;
}
#endif
int BIO_meth_set_ctrl(BIO_METHOD *biom,
- long (*ctrl) (BIO *, int, long, void *))
+ long (*ctrl)(BIO *, int, long, void *))
{
biom->ctrl = ctrl;
return 1;
}
#ifndef OPENSSL_NO_DEPRECATED_3_5
-int (*BIO_meth_get_create(const BIO_METHOD *biom)) (BIO *)
+int (*BIO_meth_get_create(const BIO_METHOD *biom))(BIO *)
{
return biom->create;
}
#endif
-int BIO_meth_set_create(BIO_METHOD *biom, int (*create) (BIO *))
+int BIO_meth_set_create(BIO_METHOD *biom, int (*create)(BIO *))
{
biom->create = create;
return 1;
}
#ifndef OPENSSL_NO_DEPRECATED_3_5
-int (*BIO_meth_get_destroy(const BIO_METHOD *biom)) (BIO *)
+int (*BIO_meth_get_destroy(const BIO_METHOD *biom))(BIO *)
{
return biom->destroy;
}
#endif
-int BIO_meth_set_destroy(BIO_METHOD *biom, int (*destroy) (BIO *))
+int BIO_meth_set_destroy(BIO_METHOD *biom, int (*destroy)(BIO *))
{
biom->destroy = destroy;
return 1;
}
#ifndef OPENSSL_NO_DEPRECATED_3_5
-long (*BIO_meth_get_callback_ctrl(const BIO_METHOD *biom)) (BIO *, int, BIO_info_cb *)
+long (*BIO_meth_get_callback_ctrl(const BIO_METHOD *biom))(BIO *, int, BIO_info_cb *)
{
return biom->callback_ctrl;
}
#endif
int BIO_meth_set_callback_ctrl(BIO_METHOD *biom,
- long (*callback_ctrl) (BIO *, int,
- BIO_info_cb *))
+ long (*callback_ctrl)(BIO *, int,
+ BIO_info_cb *))
{
biom->callback_ctrl = callback_ctrl;
return 1;
}
int BIO_meth_set_sendmmsg(BIO_METHOD *biom,
- int (*bsendmmsg) (BIO *, BIO_MSG *, size_t, size_t, uint64_t, size_t *))
+ int (*bsendmmsg)(BIO *, BIO_MSG *, size_t, size_t, uint64_t, size_t *))
{
biom->bsendmmsg = bsendmmsg;
return 1;
}
#ifndef OPENSSL_NO_DEPRECATED_3_5
-int (*BIO_meth_get_sendmmsg(const BIO_METHOD *biom))(BIO *, BIO_MSG *, size_t, size_t, uint64_t, size_t *) {
+int (*BIO_meth_get_sendmmsg(const BIO_METHOD *biom))(BIO *, BIO_MSG *, size_t, size_t, uint64_t, size_t *)
+{
return biom->bsendmmsg;
}
#endif
int BIO_meth_set_recvmmsg(BIO_METHOD *biom,
- int (*brecvmmsg) (BIO *, BIO_MSG *, size_t, size_t, uint64_t, size_t *))
+ int (*brecvmmsg)(BIO *, BIO_MSG *, size_t, size_t, uint64_t, size_t *))
{
biom->brecvmmsg = brecvmmsg;
return 1;
}
#ifndef OPENSSL_NO_DEPRECATED_3_5
-int (*BIO_meth_get_recvmmsg(const BIO_METHOD *biom))(BIO *, BIO_MSG *, size_t, size_t, uint64_t, size_t *) {
+int (*BIO_meth_get_recvmmsg(const BIO_METHOD *biom))(BIO *, BIO_MSG *, size_t, size_t, uint64_t, size_t *)
+{
return biom->brecvmmsg;
}
#endif
diff --git a/crypto/bio/bio_print.c b/crypto/bio/bio_print.c
index 06ffdf74c6..2a78cd6373 100644
--- a/crypto/bio/bio_print.c
+++ b/crypto/bio/bio_print.c
@@ -15,7 +15,6 @@
#include <openssl/bio.h>
#include <openssl/configuration.h>
-
int BIO_printf(BIO *bio, const char *format, ...)
{
va_list args;
@@ -54,10 +53,10 @@ static int msvc_bio_vprintf(BIO *bio, const char *format, va_list args)
char *abuf;
int ret, sz;
- sz = _vsnprintf_s(buf, sizeof (buf), _TRUNCATE, format, args);
+ sz = _vsnprintf_s(buf, sizeof(buf), _TRUNCATE, format, args);
if (sz == -1) {
sz = _vscprintf(format, args) + 1;
- abuf = (char *) OPENSSL_malloc(sz);
+ abuf = (char *)OPENSSL_malloc(sz);
if (abuf == NULL) {
ret = -1;
} else {
@@ -109,11 +108,11 @@ int BIO_vprintf(BIO *bio, const char *format, va_list args)
* call to vsnprintf() here uses args we got in function argument.
* The second call is going to use cp_args we made earlier.
*/
- sz = vsnprintf(buf, sizeof (buf), format, args);
+ sz = vsnprintf(buf, sizeof(buf), format, args);
if (sz >= 0) {
- if ((size_t)sz > sizeof (buf)) {
+ if ((size_t)sz > sizeof(buf)) {
sz += 1;
- abuf = (char *) OPENSSL_malloc(sz);
+ abuf = (char *)OPENSSL_malloc(sz);
if (abuf == NULL) {
ret = -1;
} else {
@@ -122,8 +121,8 @@ int BIO_vprintf(BIO *bio, const char *format, va_list args)
OPENSSL_free(abuf);
}
} else {
- /* vsnprintf returns length not including nul-terminator */
- ret = BIO_write(bio, buf, sz);
+ /* vsnprintf returns length not including nul-terminator */
+ ret = BIO_write(bio, buf, sz);
}
}
#endif
diff --git a/crypto/bio/bio_sock.c b/crypto/bio/bio_sock.c
index 7271a14012..5b793b9af1 100644
--- a/crypto/bio/bio_sock.c
+++ b/crypto/bio/bio_sock.c
@@ -12,43 +12,43 @@
#include "bio_local.h"
#ifndef OPENSSL_NO_SOCK
-# define SOCKET_PROTOCOL IPPROTO_TCP
-# ifdef SO_MAXCONN
-# define MAX_LISTEN SO_MAXCONN
-# elif defined(SOMAXCONN)
-# define MAX_LISTEN SOMAXCONN
-# else
-# define MAX_LISTEN 32
-# endif
-# if defined(OPENSSL_SYS_WINDOWS)
+#define SOCKET_PROTOCOL IPPROTO_TCP
+#ifdef SO_MAXCONN
+#define MAX_LISTEN SO_MAXCONN
+#elif defined(SOMAXCONN)
+#define MAX_LISTEN SOMAXCONN
+#else
+#define MAX_LISTEN 32
+#endif
+#if defined(OPENSSL_SYS_WINDOWS)
static int wsa_init_done = 0;
-# endif
-
-# if defined __TANDEM
-# include <unistd.h>
-# include <sys/time.h> /* select */
-# elif defined _WIN32
-# include <winsock.h> /* for type fd_set */
-# else
-# include <unistd.h>
-# if defined __VMS
-# include <sys/socket.h>
-# elif defined _HPUX_SOURCE
-# include <sys/time.h>
-# else
-# include <sys/select.h>
-# endif
-# endif
-# include "internal/sockets.h" /* for openssl_fdset() */
-
-# ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#endif
+
+#if defined __TANDEM
+#include <unistd.h>
+#include <sys/time.h> /* select */
+#elif defined _WIN32
+#include <winsock.h> /* for type fd_set */
+#else
+#include <unistd.h>
+#if defined __VMS
+#include <sys/socket.h>
+#elif defined _HPUX_SOURCE
+#include <sys/time.h>
+#else
+#include <sys/select.h>
+#endif
+#endif
+#include "internal/sockets.h" /* for openssl_fdset() */
+
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
int BIO_get_host_ip(const char *str, unsigned char *ip)
{
BIO_ADDRINFO *res = NULL;
int ret = 0;
if (BIO_sock_init() != 1)
- return 0; /* don't generate another error code here */
+ return 0; /* don't generate another error code here */
if (BIO_lookup(str, NULL, BIO_LOOKUP_CLIENT, AF_INET, SOCK_STREAM, &res)) {
size_t l;
@@ -82,7 +82,7 @@ int BIO_get_port(const char *str, unsigned short *port_ptr)
}
if (BIO_sock_init() != 1)
- return 0; /* don't generate another error code here */
+ return 0; /* don't generate another error code here */
if (BIO_lookup(NULL, str, BIO_LOOKUP_CLIENT, AF_INET, SOCK_STREAM, &res)) {
if (BIO_ADDRINFO_family(res) != AF_INET) {
@@ -98,7 +98,7 @@ int BIO_get_port(const char *str, unsigned short *port_ptr)
return ret;
}
-# endif
+#endif
int BIO_sock_error(int sock)
{
@@ -118,7 +118,7 @@ int BIO_sock_error(int sock)
return j;
}
-# ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
struct hostent *BIO_gethostbyname(const char *name)
{
/*
@@ -127,16 +127,16 @@ struct hostent *BIO_gethostbyname(const char *name)
*/
return gethostbyname(name);
}
-# endif
+#endif
-# ifdef BIO_HAVE_WSAMSG
+#ifdef BIO_HAVE_WSAMSG
LPFN_WSARECVMSG bio_WSARecvMsg;
LPFN_WSASENDMSG bio_WSASendMsg;
-# endif
+#endif
int BIO_sock_init(void)
{
-# ifdef OPENSSL_SYS_WINDOWS
+#ifdef OPENSSL_SYS_WINDOWS
static struct WSAData wsa_state;
if (!wsa_init_done) {
@@ -150,7 +150,7 @@ int BIO_sock_init(void)
*/
if (WSAStartup(0x0202, &wsa_state) != 0) {
ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling wsastartup()");
+ "calling wsastartup()");
ERR_raise(ERR_LIB_BIO, BIO_R_WSASTARTUP);
return -1;
}
@@ -160,7 +160,7 @@ int BIO_sock_init(void)
* Instead, their function pointers must be loaded via this elaborate
* process...
*/
-# ifdef BIO_HAVE_WSAMSG
+#ifdef BIO_HAVE_WSAMSG
{
GUID id_WSARecvMsg = WSAID_WSARECVMSG;
GUID id_WSASendMsg = WSAID_WSASENDMSG;
@@ -170,53 +170,55 @@ int BIO_sock_init(void)
s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
if (s != INVALID_SOCKET) {
if (WSAIoctl(s, SIO_GET_EXTENSION_FUNCTION_POINTER,
- &id_WSARecvMsg, sizeof(id_WSARecvMsg),
- &bio_WSARecvMsg, sizeof(bio_WSARecvMsg),
- &len_out, NULL, NULL) != 0
+ &id_WSARecvMsg, sizeof(id_WSARecvMsg),
+ &bio_WSARecvMsg, sizeof(bio_WSARecvMsg),
+ &len_out, NULL, NULL)
+ != 0
|| len_out != sizeof(bio_WSARecvMsg))
bio_WSARecvMsg = NULL;
if (WSAIoctl(s, SIO_GET_EXTENSION_FUNCTION_POINTER,
- &id_WSASendMsg, sizeof(id_WSASendMsg),
- &bio_WSASendMsg, sizeof(bio_WSASendMsg),
- &len_out, NULL, NULL) != 0
+ &id_WSASendMsg, sizeof(id_WSASendMsg),
+ &bio_WSASendMsg, sizeof(bio_WSASendMsg),
+ &len_out, NULL, NULL)
+ != 0
|| len_out != sizeof(bio_WSASendMsg))
bio_WSASendMsg = NULL;
closesocket(s);
}
}
-# endif
+#endif
}
-# endif /* OPENSSL_SYS_WINDOWS */
-# ifdef WATT32
+#endif /* OPENSSL_SYS_WINDOWS */
+#ifdef WATT32
extern int _watt_do_exit;
- _watt_do_exit = 0; /* don't make sock_init() call exit() */
+ _watt_do_exit = 0; /* don't make sock_init() call exit() */
if (sock_init())
return -1;
-# endif
+#endif
return 1;
}
void bio_sock_cleanup_int(void)
{
-# ifdef OPENSSL_SYS_WINDOWS
+#ifdef OPENSSL_SYS_WINDOWS
if (wsa_init_done) {
wsa_init_done = 0;
WSACleanup();
}
-# endif
+#endif
}
int BIO_socket_ioctl(int fd, long type, void *arg)
{
int i;
-# ifdef __DJGPP__
+#ifdef __DJGPP__
i = ioctlsocket(fd, type, (char *)arg);
-# else
-# if defined(OPENSSL_SYS_VMS)
+#else
+#if defined(OPENSSL_SYS_VMS)
/*-
* 2011-02-18 SMS.
* VMS ioctl() can't tolerate a 64-bit "void *arg", but we
@@ -224,31 +226,31 @@ int BIO_socket_ioctl(int fd, long type, void *arg)
* so we arrange a local copy with a short pointer, and use
* that, instead.
*/
-# if __INITIAL_POINTER_SIZE == 64
-# define ARG arg_32p
-# pragma pointer_size save
-# pragma pointer_size 32
+#if __INITIAL_POINTER_SIZE == 64
+#define ARG arg_32p
+#pragma pointer_size save
+#pragma pointer_size 32
unsigned long arg_32;
unsigned long *arg_32p;
-# pragma pointer_size restore
+#pragma pointer_size restore
arg_32p = &arg_32;
arg_32 = *((unsigned long *)arg);
-# else /* __INITIAL_POINTER_SIZE == 64 */
-# define ARG arg
-# endif /* __INITIAL_POINTER_SIZE == 64 [else] */
-# else /* defined(OPENSSL_SYS_VMS) */
-# define ARG arg
-# endif /* defined(OPENSSL_SYS_VMS) [else] */
+#else /* __INITIAL_POINTER_SIZE == 64 */
+#define ARG arg
+#endif /* __INITIAL_POINTER_SIZE == 64 [else] */
+#else /* defined(OPENSSL_SYS_VMS) */
+#define ARG arg
+#endif /* defined(OPENSSL_SYS_VMS) [else] */
i = ioctlsocket(fd, type, ARG);
-# endif /* __DJGPP__ */
+#endif /* __DJGPP__ */
if (i < 0)
ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling ioctlsocket()");
+ "calling ioctlsocket()");
return i;
}
-# ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
int BIO_get_accept_socket(char *host, int bind_mode)
{
int s = INVALID_SOCKET;
@@ -265,18 +267,19 @@ int BIO_get_accept_socket(char *host, int bind_mode)
goto err;
if ((s = BIO_socket(BIO_ADDRINFO_family(res), BIO_ADDRINFO_socktype(res),
- BIO_ADDRINFO_protocol(res), 0)) == INVALID_SOCKET) {
+ BIO_ADDRINFO_protocol(res), 0))
+ == INVALID_SOCKET) {
s = INVALID_SOCKET;
goto err;
}
if (!BIO_listen(s, BIO_ADDRINFO_address(res),
- bind_mode ? BIO_SOCK_REUSEADDR : 0)) {
+ bind_mode ? BIO_SOCK_REUSEADDR : 0)) {
BIO_closesocket(s);
s = INVALID_SOCKET;
}
- err:
+err:
BIO_ADDRINFO_free(res);
OPENSSL_free(h);
OPENSSL_free(p);
@@ -296,7 +299,7 @@ int BIO_accept(int sock, char **ip_port)
goto end;
}
ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling accept()");
+ "calling accept()");
ERR_raise(ERR_LIB_BIO, BIO_R_ACCEPT_ERROR);
goto end;
}
@@ -323,27 +326,27 @@ int BIO_accept(int sock, char **ip_port)
OPENSSL_free(port);
}
- end:
+end:
return ret;
}
-# endif
+#endif
int BIO_set_tcp_ndelay(int s, int on)
{
int ret = 0;
-# if defined(TCP_NODELAY) && (defined(IPPROTO_TCP) || defined(SOL_TCP))
+#if defined(TCP_NODELAY) && (defined(IPPROTO_TCP) || defined(SOL_TCP))
int opt;
-# ifdef SOL_TCP
+#ifdef SOL_TCP
opt = SOL_TCP;
-# else
-# ifdef IPPROTO_TCP
+#else
+#ifdef IPPROTO_TCP
opt = IPPROTO_TCP;
-# endif
-# endif
+#endif
+#endif
ret = setsockopt(s, opt, TCP_NODELAY, (char *)&on, sizeof(on));
-# endif
+#endif
return (ret == 0);
}
@@ -353,69 +356,67 @@ int BIO_socket_nbio(int s, int mode)
int l;
l = mode;
-# ifdef FIONBIO
+#ifdef FIONBIO
l = mode;
ret = BIO_socket_ioctl(s, FIONBIO, &l);
-# elif defined(F_GETFL) && defined(F_SETFL) && (defined(O_NONBLOCK) || defined(FNDELAY))
+#elif defined(F_GETFL) && defined(F_SETFL) && (defined(O_NONBLOCK) || defined(FNDELAY))
/* make sure this call always pushes an error level; BIO_socket_ioctl() does so, so we do too. */
l = fcntl(s, F_GETFL, 0);
if (l == -1) {
ERR_raise_data(ERR_LIB_SYS, get_last_sys_error(),
- "calling fcntl()");
+ "calling fcntl()");
ret = -1;
} else {
-# if defined(O_NONBLOCK)
+#if defined(O_NONBLOCK)
l &= ~O_NONBLOCK;
-# else
+#else
l &= ~FNDELAY; /* BSD4.x */
-# endif
+#endif
if (mode) {
-# if defined(O_NONBLOCK)
+#if defined(O_NONBLOCK)
l |= O_NONBLOCK;
-# else
+#else
l |= FNDELAY; /* BSD4.x */
-# endif
+#endif
}
ret = fcntl(s, F_SETFL, l);
if (ret < 0) {
ERR_raise_data(ERR_LIB_SYS, get_last_sys_error(),
- "calling fcntl()");
+ "calling fcntl()");
}
}
-# else
+#else
/* make sure this call always pushes an error level; BIO_socket_ioctl() does so, so we do too. */
ERR_raise(ERR_LIB_BIO, ERR_R_PASSED_INVALID_ARGUMENT);
-# endif
+#endif
return (ret == 0);
}
int BIO_sock_info(int sock,
- enum BIO_sock_info_type type, union BIO_sock_info_u *info)
+ enum BIO_sock_info_type type, union BIO_sock_info_u *info)
{
switch (type) {
- case BIO_SOCK_INFO_ADDRESS:
- {
- socklen_t addr_len;
- int ret = 0;
- addr_len = sizeof(*info->addr);
- ret = getsockname(sock, BIO_ADDR_sockaddr_noconst(info->addr),
- &addr_len);
- if (ret == -1) {
- ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling getsockname()");
- ERR_raise(ERR_LIB_BIO, BIO_R_GETSOCKNAME_ERROR);
- return 0;
- }
- if ((size_t)addr_len > sizeof(*info->addr)) {
- ERR_raise(ERR_LIB_BIO, BIO_R_GETSOCKNAME_TRUNCATED_ADDRESS);
- return 0;
- }
+ case BIO_SOCK_INFO_ADDRESS: {
+ socklen_t addr_len;
+ int ret = 0;
+ addr_len = sizeof(*info->addr);
+ ret = getsockname(sock, BIO_ADDR_sockaddr_noconst(info->addr),
+ &addr_len);
+ if (ret == -1) {
+ ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
+ "calling getsockname()");
+ ERR_raise(ERR_LIB_BIO, BIO_R_GETSOCKNAME_ERROR);
+ return 0;
+ }
+ if ((size_t)addr_len > sizeof(*info->addr)) {
+ ERR_raise(ERR_LIB_BIO, BIO_R_GETSOCKNAME_TRUNCATED_ADDRESS);
+ return 0;
}
- break;
+ } break;
default:
ERR_raise(ERR_LIB_BIO, BIO_R_UNKNOWN_INFO_TYPE);
return 0;
@@ -430,16 +431,16 @@ int BIO_sock_info(int sock,
*/
int BIO_socket_wait(int fd, int for_read, time_t max_time)
{
-# if defined(OPENSSL_SYS_WINDOWS) || !defined(POLLIN)
+#if defined(OPENSSL_SYS_WINDOWS) || !defined(POLLIN)
fd_set confds;
struct timeval tv;
time_t now;
-# ifdef _WIN32
+#ifdef _WIN32
if ((SOCKET)fd == INVALID_SOCKET)
-# else
+#else
if (fd < 0 || fd >= FD_SETSIZE)
-# endif
+#endif
return -1;
if (max_time == 0)
return 1;
@@ -453,8 +454,8 @@ int BIO_socket_wait(int fd, int for_read, time_t max_time)
tv.tv_usec = 0;
tv.tv_sec = (long)(max_time - now); /* might overflow */
return select(fd + 1, for_read ? &confds : NULL,
- for_read ? NULL : &confds, NULL, &tv);
-# else
+ for_read ? NULL : &confds, NULL, &tv);
+#else
struct pollfd confds;
time_t now;
@@ -470,6 +471,6 @@ int BIO_socket_wait(int fd, int for_read, time_t max_time)
confds.fd = fd;
confds.events = for_read ? POLLIN : POLLOUT;
return poll(&confds, 1, (int)(max_time - now) * 1000);
-# endif
+#endif
}
#endif /* !defined(OPENSSL_NO_SOCK) */
diff --git a/crypto/bio/bio_sock2.c b/crypto/bio/bio_sock2.c
index aa9772bc46..a9face301a 100644
--- a/crypto/bio/bio_sock2.c
+++ b/crypto/bio/bio_sock2.c
@@ -18,13 +18,13 @@
#include <openssl/err.h>
#ifndef OPENSSL_NO_SOCK
-# ifdef SO_MAXCONN
-# define MAX_LISTEN SO_MAXCONN
-# elif defined(SOMAXCONN)
-# define MAX_LISTEN SOMAXCONN
-# else
-# define MAX_LISTEN 32
-# endif
+#ifdef SO_MAXCONN
+#define MAX_LISTEN SO_MAXCONN
+#elif defined(SOMAXCONN)
+#define MAX_LISTEN SOMAXCONN
+#else
+#define MAX_LISTEN 32
+#endif
/*-
* BIO_socket - create a socket
@@ -49,7 +49,7 @@ int BIO_socket(int domain, int socktype, int protocol, int options)
sock = socket(domain, socktype, protocol);
if (sock == -1) {
ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling socket()");
+ "calling socket()");
ERR_raise(ERR_LIB_BIO, BIO_R_UNABLE_TO_CREATE_SOCKET);
return INVALID_SOCKET;
}
@@ -92,9 +92,10 @@ int BIO_connect(int sock, const BIO_ADDR *addr, int options)
if (options & BIO_SOCK_KEEPALIVE) {
if (setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE,
- (const void *)&on, sizeof(on)) != 0) {
+ (const void *)&on, sizeof(on))
+ != 0) {
ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling setsockopt()");
+ "calling setsockopt()");
ERR_raise(ERR_LIB_BIO, BIO_R_UNABLE_TO_KEEPALIVE);
return 0;
}
@@ -102,16 +103,17 @@ int BIO_connect(int sock, const BIO_ADDR *addr, int options)
if (options & BIO_SOCK_NODELAY) {
if (setsockopt(sock, IPPROTO_TCP, TCP_NODELAY,
- (const void *)&on, sizeof(on)) != 0) {
+ (const void *)&on, sizeof(on))
+ != 0) {
ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling setsockopt()");
+ "calling setsockopt()");
ERR_raise(ERR_LIB_BIO, BIO_R_UNABLE_TO_NODELAY);
return 0;
}
}
if (options & BIO_SOCK_TFO) {
-# if defined(OSSL_TFO_CLIENT_FLAG)
-# if defined(OSSL_TFO_SYSCTL_CLIENT)
+#if defined(OSSL_TFO_CLIENT_FLAG)
+#if defined(OSSL_TFO_SYSCTL_CLIENT)
int enabled = 0;
size_t enabledlen = sizeof(enabled);
@@ -125,7 +127,7 @@ int BIO_connect(int sock, const BIO_ADDR *addr, int options)
ERR_raise(ERR_LIB_BIO, BIO_R_TFO_DISABLED);
return 0;
}
-# elif defined(OSSL_TFO_SYSCTL)
+#elif defined(OSSL_TFO_SYSCTL)
int enabled = 0;
size_t enabledlen = sizeof(enabled);
@@ -139,44 +141,47 @@ int BIO_connect(int sock, const BIO_ADDR *addr, int options)
ERR_raise(ERR_LIB_BIO, BIO_R_TFO_DISABLED);
return 0;
}
-# endif
-# endif
-# if defined(OSSL_TFO_CONNECTX)
+#endif
+#endif
+#if defined(OSSL_TFO_CONNECTX)
sa_endpoints_t sae;
memset(&sae, 0, sizeof(sae));
sae.sae_dstaddr = BIO_ADDR_sockaddr(addr);
sae.sae_dstaddrlen = BIO_ADDR_sockaddr_size(addr);
if (connectx(sock, &sae, SAE_ASSOCID_ANY,
- CONNECT_DATA_IDEMPOTENT | CONNECT_RESUME_ON_READ_WRITE,
- NULL, 0, NULL, NULL) == -1) {
+ CONNECT_DATA_IDEMPOTENT | CONNECT_RESUME_ON_READ_WRITE,
+ NULL, 0, NULL, NULL)
+ == -1) {
if (!BIO_sock_should_retry(-1)) {
ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling connectx()");
+ "calling connectx()");
ERR_raise(ERR_LIB_BIO, BIO_R_CONNECT_ERROR);
}
return 0;
}
-# endif
-# if defined(OSSL_TFO_CLIENT_SOCKOPT)
+#endif
+#if defined(OSSL_TFO_CLIENT_SOCKOPT)
if (setsockopt(sock, IPPROTO_TCP, OSSL_TFO_CLIENT_SOCKOPT,
- (const void *)&on, sizeof(on)) != 0) {
+ (const void *)&on, sizeof(on))
+ != 0) {
ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling setsockopt()");
+ "calling setsockopt()");
ERR_raise(ERR_LIB_BIO, BIO_R_UNABLE_TO_TFO);
return 0;
}
-# endif
-# if defined(OSSL_TFO_DO_NOT_CONNECT)
+#endif
+#if defined(OSSL_TFO_DO_NOT_CONNECT)
return 1;
-# endif
+#endif
}
if (connect(sock, BIO_ADDR_sockaddr(addr),
- BIO_ADDR_sockaddr_size(addr)) == -1) {
+ BIO_ADDR_sockaddr_size(addr))
+ == -1) {
if (!BIO_sock_should_retry(-1)) {
ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling connect()");
+ "calling connect()");
ERR_raise(ERR_LIB_BIO, BIO_R_CONNECT_ERROR);
}
return 0;
@@ -202,34 +207,35 @@ int BIO_connect(int sock, const BIO_ADDR *addr, int options)
*/
int BIO_bind(int sock, const BIO_ADDR *addr, int options)
{
-# ifndef OPENSSL_SYS_WINDOWS
+#ifndef OPENSSL_SYS_WINDOWS
int on = 1;
-# endif
+#endif
if (sock == -1) {
ERR_raise(ERR_LIB_BIO, BIO_R_INVALID_SOCKET);
return 0;
}
-# ifndef OPENSSL_SYS_WINDOWS
+#ifndef OPENSSL_SYS_WINDOWS
/*
* SO_REUSEADDR has different behavior on Windows than on
* other operating systems, don't set it there.
*/
if (options & BIO_SOCK_REUSEADDR) {
if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR,
- (const void *)&on, sizeof(on)) != 0) {
+ (const void *)&on, sizeof(on))
+ != 0) {
ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling setsockopt()");
+ "calling setsockopt()");
ERR_raise(ERR_LIB_BIO, BIO_R_UNABLE_TO_REUSEADDR);
return 0;
}
}
-# endif
+#endif
if (bind(sock, BIO_ADDR_sockaddr(addr), BIO_ADDR_sockaddr_size(addr)) != 0) {
ERR_raise_data(ERR_LIB_SYS, get_last_socket_error() /* may be 0 */,
- "calling bind()");
+ "calling bind()");
ERR_raise(ERR_LIB_BIO, BIO_R_UNABLE_TO_BIND_SOCKET);
return 0;
}
@@ -287,10 +293,11 @@ int BIO_listen(int sock, const BIO_ADDR *addr, int options)
}
if (getsockopt(sock, SOL_SOCKET, SO_TYPE,
- (void *)&socktype, &socktype_len) != 0
+ (void *)&socktype, &socktype_len)
+ != 0
|| socktype_len != sizeof(socktype)) {
ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling getsockopt()");
+ "calling getsockopt()");
ERR_raise(ERR_LIB_BIO, BIO_R_GETTING_SOCKTYPE);
return 0;
}
@@ -300,9 +307,10 @@ int BIO_listen(int sock, const BIO_ADDR *addr, int options)
if (options & BIO_SOCK_KEEPALIVE) {
if (setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE,
- (const void *)&on, sizeof(on)) != 0) {
+ (const void *)&on, sizeof(on))
+ != 0) {
ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling setsockopt()");
+ "calling setsockopt()");
ERR_raise(ERR_LIB_BIO, BIO_R_UNABLE_TO_KEEPALIVE);
return 0;
}
@@ -310,16 +318,17 @@ int BIO_listen(int sock, const BIO_ADDR *addr, int options)
if (options & BIO_SOCK_NODELAY) {
if (setsockopt(sock, IPPROTO_TCP, TCP_NODELAY,
- (const void *)&on, sizeof(on)) != 0) {
+ (const void *)&on, sizeof(on))
+ != 0) {
ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling setsockopt()");
+ "calling setsockopt()");
ERR_raise(ERR_LIB_BIO, BIO_R_UNABLE_TO_NODELAY);
return 0;
}
}
- /* On OpenBSD it is always IPv6 only with IPv6 sockets thus read-only */
-# if defined(IPV6_V6ONLY) && !defined(__OpenBSD__)
+ /* On OpenBSD it is always IPv6 only with IPv6 sockets thus read-only */
+#if defined(IPV6_V6ONLY) && !defined(__OpenBSD__)
if (BIO_ADDR_family(addr) == AF_INET6) {
/*
* Note: Windows default of IPV6_V6ONLY is ON, and Linux is OFF.
@@ -327,34 +336,35 @@ int BIO_listen(int sock, const BIO_ADDR *addr, int options)
*/
on = options & BIO_SOCK_V6_ONLY ? 1 : 0;
if (setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY,
- (const void *)&on, sizeof(on)) != 0) {
+ (const void *)&on, sizeof(on))
+ != 0) {
ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling setsockopt()");
+ "calling setsockopt()");
ERR_raise(ERR_LIB_BIO, BIO_R_LISTEN_V6_ONLY);
return 0;
}
}
-# endif
+#endif
if (!BIO_bind(sock, addr, options))
return 0;
if (socktype != SOCK_DGRAM && listen(sock, MAX_LISTEN) == -1) {
ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling listen()");
+ "calling listen()");
ERR_raise(ERR_LIB_BIO, BIO_R_UNABLE_TO_LISTEN_SOCKET);
return 0;
}
-# if defined(OSSL_TFO_SERVER_SOCKOPT)
+#if defined(OSSL_TFO_SERVER_SOCKOPT)
/*
* Must do it explicitly after listen() for macOS, still
* works fine on other OS's
*/
if ((options & BIO_SOCK_TFO) && socktype != SOCK_DGRAM) {
int q = OSSL_TFO_SERVER_SOCKOPT_VALUE;
-# if defined(OSSL_TFO_CLIENT_FLAG)
-# if defined(OSSL_TFO_SYSCTL_SERVER)
+#if defined(OSSL_TFO_CLIENT_FLAG)
+#if defined(OSSL_TFO_SYSCTL_SERVER)
int enabled = 0;
size_t enabledlen = sizeof(enabled);
@@ -368,7 +378,7 @@ int BIO_listen(int sock, const BIO_ADDR *addr, int options)
ERR_raise(ERR_LIB_BIO, BIO_R_TFO_DISABLED);
return 0;
}
-# elif defined(OSSL_TFO_SYSCTL)
+#elif defined(OSSL_TFO_SYSCTL)
int enabled = 0;
size_t enabledlen = sizeof(enabled);
@@ -382,17 +392,18 @@ int BIO_listen(int sock, const BIO_ADDR *addr, int options)
ERR_raise(ERR_LIB_BIO, BIO_R_TFO_DISABLED);
return 0;
}
-# endif
-# endif
+#endif
+#endif
if (setsockopt(sock, IPPROTO_TCP, OSSL_TFO_SERVER_SOCKOPT,
- (void *)&q, sizeof(q)) < 0) {
+ (void *)&q, sizeof(q))
+ < 0) {
ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling setsockopt()");
+ "calling setsockopt()");
ERR_raise(ERR_LIB_BIO, BIO_R_UNABLE_TO_TFO);
return 0;
}
}
-# endif
+#endif
return 1;
}
@@ -413,11 +424,11 @@ int BIO_accept_ex(int accept_sock, BIO_ADDR *addr_, int options)
len = sizeof(*addr);
accepted_sock = accept(accept_sock,
- BIO_ADDR_sockaddr_noconst(addr), &len);
+ BIO_ADDR_sockaddr_noconst(addr), &len);
if (accepted_sock == -1) {
if (!BIO_sock_should_retry(accepted_sock)) {
ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling accept()");
+ "calling accept()");
ERR_raise(ERR_LIB_BIO, BIO_R_ACCEPT_ERROR);
}
return INVALID_SOCKET;
diff --git a/crypto/bio/bss_acpt.c b/crypto/bio/bss_acpt.c
index 881cfe50ca..80e62df825 100644
--- a/crypto/bio/bss_acpt.c
+++ b/crypto/bio/bss_acpt.c
@@ -18,7 +18,7 @@
typedef struct bio_accept_st {
int state;
int accept_family;
- int bind_mode; /* Socket mode for BIO_listen */
+ int bind_mode; /* Socket mode for BIO_listen */
int accepted_mode; /* Socket mode for BIO_accept (set on accepted sock) */
char *param_addr;
char *param_serv;
@@ -27,7 +27,7 @@ typedef struct bio_accept_st {
BIO_ADDRINFO *addr_first;
const BIO_ADDRINFO *addr_iter;
- BIO_ADDR cache_accepting_addr; /* Useful if we asked for port 0 */
+ BIO_ADDR cache_accepting_addr; /* Useful if we asked for port 0 */
char *cache_accepting_name, *cache_accepting_serv;
BIO_ADDR cache_peer_addr;
char *cache_peer_name, *cache_peer_serv;
@@ -46,12 +46,12 @@ static void acpt_close_socket(BIO *data);
static BIO_ACCEPT *BIO_ACCEPT_new(void);
static void BIO_ACCEPT_free(BIO_ACCEPT *a);
-# define ACPT_S_BEFORE 1
-# define ACPT_S_GET_ADDR 2
-# define ACPT_S_CREATE_SOCKET 3
-# define ACPT_S_LISTEN 4
-# define ACPT_S_ACCEPT 5
-# define ACPT_S_OK 6
+#define ACPT_S_BEFORE 1
+#define ACPT_S_GET_ADDR 2
+#define ACPT_S_CREATE_SOCKET 3
+#define ACPT_S_LISTEN 4
+#define ACPT_S_ACCEPT 5
+#define ACPT_S_OK 6
static const BIO_METHOD methods_acceptp = {
BIO_TYPE_ACCEPT,
@@ -61,11 +61,11 @@ static const BIO_METHOD methods_acceptp = {
bread_conv,
acpt_read,
acpt_puts,
- NULL, /* connect_gets, */
+ NULL, /* connect_gets, */
acpt_ctrl,
acpt_new,
acpt_free,
- NULL, /* connect_callback_ctrl */
+ NULL, /* connect_callback_ctrl */
};
const BIO_METHOD *BIO_s_accept(void)
@@ -155,9 +155,9 @@ static int acpt_state(BIO *b, BIO_ACCEPT *c)
case ACPT_S_BEFORE:
if (c->param_addr == NULL && c->param_serv == NULL) {
ERR_raise_data(ERR_LIB_BIO,
- BIO_R_NO_ACCEPT_ADDR_OR_SERVICE_SPECIFIED,
- "hostname=%s, service=%s",
- c->param_addr, c->param_serv);
+ BIO_R_NO_ACCEPT_ADDR_OR_SERVICE_SPECIFIED,
+ "hostname=%s, service=%s",
+ c->param_addr, c->param_serv);
goto exit_loop;
}
@@ -177,37 +177,37 @@ static int acpt_state(BIO *b, BIO_ACCEPT *c)
c->state = ACPT_S_GET_ADDR;
break;
- case ACPT_S_GET_ADDR:
- {
- int family = AF_UNSPEC;
- switch (c->accept_family) {
- case BIO_FAMILY_IPV6:
- if (1) { /* This is a trick we use to avoid bit rot.
- * at least the "else" part will always be
- * compiled.
- */
+ case ACPT_S_GET_ADDR: {
+ int family = AF_UNSPEC;
+ switch (c->accept_family) {
+ case BIO_FAMILY_IPV6:
+ if (1) { /* This is a trick we use to avoid bit rot.
+ * at least the "else" part will always be
+ * compiled.
+ */
#if OPENSSL_USE_IPV6
- family = AF_INET6;
- } else {
+ family = AF_INET6;
+ } else {
#endif
- ERR_raise(ERR_LIB_BIO, BIO_R_UNAVAILABLE_IP_FAMILY);
- goto exit_loop;
- }
- break;
- case BIO_FAMILY_IPV4:
- family = AF_INET;
- break;
- case BIO_FAMILY_IPANY:
- family = AF_UNSPEC;
- break;
- default:
- ERR_raise(ERR_LIB_BIO, BIO_R_UNSUPPORTED_IP_FAMILY);
+ ERR_raise(ERR_LIB_BIO, BIO_R_UNAVAILABLE_IP_FAMILY);
goto exit_loop;
}
- if (BIO_lookup(c->param_addr, c->param_serv, BIO_LOOKUP_SERVER,
- family, SOCK_STREAM, &c->addr_first) == 0)
- goto exit_loop;
+ break;
+ case BIO_FAMILY_IPV4:
+ family = AF_INET;
+ break;
+ case BIO_FAMILY_IPANY:
+ family = AF_UNSPEC;
+ break;
+ default:
+ ERR_raise(ERR_LIB_BIO, BIO_R_UNSUPPORTED_IP_FAMILY);
+ goto exit_loop;
}
+ if (BIO_lookup(c->param_addr, c->param_serv, BIO_LOOKUP_SERVER,
+ family, SOCK_STREAM, &c->addr_first)
+ == 0)
+ goto exit_loop;
+ }
if (c->addr_first == NULL) {
ERR_raise(ERR_LIB_BIO, BIO_R_LOOKUP_RETURNED_NOTHING);
goto exit_loop;
@@ -219,8 +219,8 @@ static int acpt_state(BIO *b, BIO_ACCEPT *c)
case ACPT_S_CREATE_SOCKET:
ERR_set_mark();
s = BIO_socket(BIO_ADDRINFO_family(c->addr_iter),
- BIO_ADDRINFO_socktype(c->addr_iter),
- BIO_ADDRINFO_protocol(c->addr_iter), 0);
+ BIO_ADDRINFO_socktype(c->addr_iter),
+ BIO_ADDRINFO_protocol(c->addr_iter), 0);
if (s == (int)INVALID_SOCKET) {
if ((c->addr_iter = BIO_ADDRINFO_next(c->addr_iter)) != NULL) {
/*
@@ -231,8 +231,8 @@ static int acpt_state(BIO *b, BIO_ACCEPT *c)
}
ERR_clear_last_mark();
ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling socket(%s, %s)",
- c->param_addr, c->param_serv);
+ "calling socket(%s, %s)",
+ c->param_addr, c->param_serv);
ERR_raise(ERR_LIB_BIO, BIO_R_UNABLE_TO_CREATE_SOCKET);
goto exit_loop;
}
@@ -242,24 +242,23 @@ static int acpt_state(BIO *b, BIO_ACCEPT *c)
s = -1;
break;
- case ACPT_S_LISTEN:
- {
- if (!BIO_listen(c->accept_sock,
- BIO_ADDRINFO_address(c->addr_iter),
- c->bind_mode)) {
- BIO_closesocket(c->accept_sock);
- c->accept_sock = (int)INVALID_SOCKET;
- b->num = (int)INVALID_SOCKET;
- goto exit_loop;
- }
+ case ACPT_S_LISTEN: {
+ if (!BIO_listen(c->accept_sock,
+ BIO_ADDRINFO_address(c->addr_iter),
+ c->bind_mode)) {
+ BIO_closesocket(c->accept_sock);
+ c->accept_sock = (int)INVALID_SOCKET;
+ b->num = (int)INVALID_SOCKET;
+ goto exit_loop;
}
+ }
{
union BIO_sock_info_u info;
info.addr = &c->cache_accepting_addr;
if (!BIO_sock_info(c->accept_sock, BIO_SOCK_INFO_ADDRESS,
- &info)) {
+ &info)) {
BIO_closesocket(c->accept_sock);
c->accept_sock = (int)INVALID_SOCKET;
b->num = (int)INVALID_SOCKET;
@@ -267,10 +266,8 @@ static int acpt_state(BIO *b, BIO_ACCEPT *c)
}
}
- c->cache_accepting_name =
- BIO_ADDR_hostname_string(&c->cache_accepting_addr, 1);
- c->cache_accepting_serv =
- BIO_ADDR_service_string(&c->cache_accepting_addr, 1);
+ c->cache_accepting_name = BIO_ADDR_hostname_string(&c->cache_accepting_addr, 1);
+ c->cache_accepting_serv = BIO_ADDR_service_string(&c->cache_accepting_addr, 1);
c->state = ACPT_S_ACCEPT;
s = -1;
ret = 1;
@@ -290,7 +287,7 @@ static int acpt_state(BIO *b, BIO_ACCEPT *c)
c->cache_peer_serv = NULL;
s = BIO_accept_ex(c->accept_sock, &c->cache_peer_addr,
- c->accepted_mode);
+ c->accepted_mode);
/* If the returned socket is invalid, this might still be
* retryable
@@ -332,10 +329,8 @@ static int acpt_state(BIO *b, BIO_ACCEPT *c)
if (BIO_push(b, bio) == NULL)
goto exit_loop;
- c->cache_peer_name =
- BIO_ADDR_hostname_string(&c->cache_peer_addr, 1);
- c->cache_peer_serv =
- BIO_ADDR_service_string(&c->cache_peer_addr, 1);
+ c->cache_peer_name = BIO_ADDR_hostname_string(&c->cache_peer_addr, 1);
+ c->cache_peer_serv = BIO_ADDR_service_string(&c->cache_peer_addr, 1);
c->state = ACPT_S_OK;
bio = NULL;
ret = 1;
@@ -355,12 +350,12 @@ static int acpt_state(BIO *b, BIO_ACCEPT *c)
}
}
- exit_loop:
+exit_loop:
if (bio != NULL)
BIO_free(bio);
else if (s >= 0)
BIO_closesocket(s);
- end:
+end:
return ret;
}
@@ -435,9 +430,9 @@ static long acpt_ctrl(BIO *b, int cmd, long num, void *ptr)
OPENSSL_free(data->param_addr);
data->param_addr = NULL;
ret = BIO_parse_hostserv(ptr,
- &data->param_addr,
- &data->param_serv,
- BIO_PARSE_PRIO_SERV);
+ &data->param_addr,
+ &data->param_serv,
+ BIO_PARSE_PRIO_SERV);
if (hold_serv != data->param_serv)
OPENSSL_free(hold_serv);
if (ret > 0)
diff --git a/crypto/bio/bss_bio.c b/crypto/bio/bss_bio.c
index 24ebcc15b0..5470777f95 100644
--- a/crypto/bio/bss_bio.c
+++ b/crypto/bio/bss_bio.c
@@ -43,11 +43,11 @@ static const BIO_METHOD methods_biop = {
bread_conv,
bio_read,
bio_puts,
- NULL /* no bio_gets */ ,
+ NULL /* no bio_gets */,
bio_ctrl,
bio_new,
bio_free,
- NULL /* no bio_callback_ctrl */
+ NULL /* no bio_callback_ctrl */
};
const BIO_METHOD *BIO_s_bio(void)
@@ -56,21 +56,21 @@ const BIO_METHOD *BIO_s_bio(void)
}
struct bio_bio_st {
- BIO *peer; /* NULL if buf == NULL. If peer != NULL, then
- * peer->ptr is also a bio_bio_st, and its
- * "peer" member points back to us. peer !=
- * NULL iff init != 0 in the BIO. */
+ BIO *peer; /* NULL if buf == NULL. If peer != NULL, then
+ * peer->ptr is also a bio_bio_st, and its
+ * "peer" member points back to us. peer !=
+ * NULL iff init != 0 in the BIO. */
/* This is for what we write (i.e. reading uses peer's struct): */
- int closed; /* valid iff peer != NULL */
- size_t len; /* valid iff buf != NULL; 0 if peer == NULL */
- size_t offset; /* valid iff buf != NULL; 0 if len == 0 */
+ int closed; /* valid iff peer != NULL */
+ size_t len; /* valid iff buf != NULL; 0 if peer == NULL */
+ size_t offset; /* valid iff buf != NULL; 0 if len == 0 */
size_t size;
- char *buf; /* "size" elements (if != NULL) */
- size_t request; /* valid iff peer != NULL; 0 if len != 0,
- * otherwise set by peer to number of bytes
- * it (unsuccessfully) tried to read, never
- * more than buffer space (size-len)
- * warrants. */
+ char *buf; /* "size" elements (if != NULL) */
+ size_t request; /* valid iff peer != NULL; 0 if len != 0,
+ * otherwise set by peer to number of bytes
+ * it (unsuccessfully) tried to read, never
+ * more than buffer space (size-len)
+ * warrants. */
};
static int bio_new(BIO *bio)
@@ -124,14 +124,14 @@ static int bio_read(BIO *bio, char *buf, int size_)
assert(peer_b != NULL);
assert(peer_b->buf != NULL);
- peer_b->request = 0; /* will be set in "retry_read" situation */
+ peer_b->request = 0; /* will be set in "retry_read" situation */
if (buf == NULL || size == 0)
return 0;
if (peer_b->len == 0) {
if (peer_b->closed)
- return 0; /* writer has closed, and no data is left */
+ return 0; /* writer has closed, and no data is left */
else {
BIO_set_retry_read(bio); /* buffer is empty */
if (size <= peer_b->size)
@@ -154,7 +154,7 @@ static int bio_read(BIO *bio, char *buf, int size_)
rest = size;
assert(rest > 0);
- do { /* one or two iterations */
+ do { /* one or two iterations */
size_t chunk;
assert(rest <= peer_b->len);
@@ -180,8 +180,7 @@ static int bio_read(BIO *bio, char *buf, int size_)
peer_b->offset = 0;
}
rest -= chunk;
- }
- while (rest);
+ } while (rest);
return (int)size;
}
@@ -242,7 +241,7 @@ static ossl_ssize_t bio_nread(BIO *bio, char **buf, size_t num_)
if (num_ > OSSL_SSIZE_MAX)
num = OSSL_SSIZE_MAX;
else
- num = (ossl_ssize_t) num_;
+ num = (ossl_ssize_t)num_;
available = bio_nread0(bio, buf);
if (num > available)
@@ -304,7 +303,7 @@ static int bio_write(BIO *bio, const char *buf, int num_)
rest = num;
assert(rest > 0);
- do { /* one or two iterations */
+ do { /* one or two iterations */
size_t write_offset;
size_t chunk;
@@ -329,8 +328,7 @@ static int bio_write(BIO *bio, const char *buf, int num_)
rest -= chunk;
buf += chunk;
- }
- while (rest);
+ } while (rest);
return (int)num;
}
@@ -398,7 +396,7 @@ static ossl_ssize_t bio_nwrite(BIO *bio, char **buf, size_t num_)
if (num_ > OSSL_SSIZE_MAX)
num = OSSL_SSIZE_MAX;
else
- num = (ossl_ssize_t) num_;
+ num = (ossl_ssize_t)num_;
space = bio_nwrite0(bio, buf);
if (num > space)
@@ -446,16 +444,14 @@ static long bio_ctrl(BIO *bio, int cmd, long num, void *ptr)
ret = (long)b->size;
break;
- case BIO_C_MAKE_BIO_PAIR:
- {
- BIO *other_bio = ptr;
+ case BIO_C_MAKE_BIO_PAIR: {
+ BIO *other_bio = ptr;
- if (bio_make_pair(bio, other_bio))
- ret = 1;
- else
- ret = 0;
- }
- break;
+ if (bio_make_pair(bio, other_bio))
+ ret = 1;
+ else
+ ret = 0;
+ } break;
case BIO_C_DESTROY_BIO_PAIR:
/*
@@ -681,7 +677,7 @@ static void bio_destroy_pair(BIO *bio)
/* Exported convenience functions */
int BIO_new_bio_pair(BIO **bio1_p, size_t writebuf1,
- BIO **bio2_p, size_t writebuf2)
+ BIO **bio2_p, size_t writebuf2)
{
BIO *bio1 = NULL, *bio2 = NULL;
long r;
@@ -713,7 +709,7 @@ int BIO_new_bio_pair(BIO **bio1_p, size_t writebuf1,
goto err;
ret = 1;
- err:
+err:
if (ret == 0) {
BIO_free(bio1);
bio1 = NULL;
diff --git a/crypto/bio/bss_conn.c b/crypto/bio/bss_conn.c
index 783de8ffd6..0d52e8e05f 100644
--- a/crypto/bio/bss_conn.c
+++ b/crypto/bio/bss_conn.c
@@ -23,9 +23,9 @@ typedef struct bio_connect_st {
char *param_hostname;
char *param_service;
int connect_mode;
-# ifndef OPENSSL_NO_KTLS
+#ifndef OPENSSL_NO_KTLS
unsigned char record_type;
-# endif
+#endif
int tfo_first;
BIO_ADDRINFO *addr_first;
@@ -56,22 +56,22 @@ static int conn_new(BIO *h);
static int conn_free(BIO *data);
static long conn_callback_ctrl(BIO *h, int cmd, BIO_info_cb *);
static int conn_sendmmsg(BIO *h, BIO_MSG *m, size_t s, size_t n,
- uint64_t f, size_t *mp);
+ uint64_t f, size_t *mp);
static int conn_recvmmsg(BIO *h, BIO_MSG *m, size_t s, size_t n,
- uint64_t f, size_t *mp);
+ uint64_t f, size_t *mp);
static int conn_state(BIO *b, BIO_CONNECT *c);
static void conn_close_socket(BIO *data);
static BIO_CONNECT *BIO_CONNECT_new(void);
static void BIO_CONNECT_free(BIO_CONNECT *a);
-#define BIO_CONN_S_BEFORE 1
-#define BIO_CONN_S_GET_ADDR 2
-#define BIO_CONN_S_CREATE_SOCKET 3
-#define BIO_CONN_S_CONNECT 4
-#define BIO_CONN_S_OK 5
-#define BIO_CONN_S_BLOCKED_CONNECT 6
-#define BIO_CONN_S_CONNECT_ERROR 7
+#define BIO_CONN_S_BEFORE 1
+#define BIO_CONN_S_GET_ADDR 2
+#define BIO_CONN_S_CREATE_SOCKET 3
+#define BIO_CONN_S_CONNECT 4
+#define BIO_CONN_S_OK 5
+#define BIO_CONN_S_BLOCKED_CONNECT 6
+#define BIO_CONN_S_CONNECT_ERROR 7
static const BIO_METHOD methods_connectp = {
BIO_TYPE_CONNECT,
@@ -121,47 +121,47 @@ static int conn_state(BIO *b, BIO_CONNECT *c)
case BIO_CONN_S_BEFORE:
if (c->param_hostname == NULL && c->param_service == NULL) {
ERR_raise_data(ERR_LIB_BIO,
- BIO_R_NO_HOSTNAME_OR_SERVICE_SPECIFIED,
- "hostname=%s service=%s",
- c->param_hostname, c->param_service);
+ BIO_R_NO_HOSTNAME_OR_SERVICE_SPECIFIED,
+ "hostname=%s service=%s",
+ c->param_hostname, c->param_service);
goto exit_loop;
}
c->state = BIO_CONN_S_GET_ADDR;
break;
- case BIO_CONN_S_GET_ADDR:
- {
- int family = AF_UNSPEC;
- switch (c->connect_family) {
- case BIO_FAMILY_IPV6:
- if (1) { /* This is a trick we use to avoid bit rot.
- * at least the "else" part will always be
- * compiled.
- */
+ case BIO_CONN_S_GET_ADDR: {
+ int family = AF_UNSPEC;
+ switch (c->connect_family) {
+ case BIO_FAMILY_IPV6:
+ if (1) { /* This is a trick we use to avoid bit rot.
+ * at least the "else" part will always be
+ * compiled.
+ */
#if OPENSSL_USE_IPV6
- family = AF_INET6;
- } else {
+ family = AF_INET6;
+ } else {
#endif
- ERR_raise(ERR_LIB_BIO, BIO_R_UNAVAILABLE_IP_FAMILY);
- goto exit_loop;
- }
- break;
- case BIO_FAMILY_IPV4:
- family = AF_INET;
- break;
- case BIO_FAMILY_IPANY:
- family = AF_UNSPEC;
- break;
- default:
- ERR_raise(ERR_LIB_BIO, BIO_R_UNSUPPORTED_IP_FAMILY);
+ ERR_raise(ERR_LIB_BIO, BIO_R_UNAVAILABLE_IP_FAMILY);
goto exit_loop;
}
- if (BIO_lookup(c->param_hostname, c->param_service,
- BIO_LOOKUP_CLIENT,
- family, c->connect_sock_type,
- &c->addr_first) == 0)
- goto exit_loop;
+ break;
+ case BIO_FAMILY_IPV4:
+ family = AF_INET;
+ break;
+ case BIO_FAMILY_IPANY:
+ family = AF_UNSPEC;
+ break;
+ default:
+ ERR_raise(ERR_LIB_BIO, BIO_R_UNSUPPORTED_IP_FAMILY);
+ goto exit_loop;
}
+ if (BIO_lookup(c->param_hostname, c->param_service,
+ BIO_LOOKUP_CLIENT,
+ family, c->connect_sock_type,
+ &c->addr_first)
+ == 0)
+ goto exit_loop;
+ }
if (c->addr_first == NULL) {
ERR_raise(ERR_LIB_BIO, BIO_R_LOOKUP_RETURNED_NOTHING);
goto exit_loop;
@@ -172,12 +172,12 @@ static int conn_state(BIO *b, BIO_CONNECT *c)
case BIO_CONN_S_CREATE_SOCKET:
ret = BIO_socket(BIO_ADDRINFO_family(c->addr_iter),
- BIO_ADDRINFO_socktype(c->addr_iter),
- BIO_ADDRINFO_protocol(c->addr_iter), 0);
+ BIO_ADDRINFO_socktype(c->addr_iter),
+ BIO_ADDRINFO_protocol(c->addr_iter), 0);
if (ret == (int)INVALID_SOCKET) {
ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling socket(%s, %s)",
- c->param_hostname, c->param_service);
+ "calling socket(%s, %s)",
+ c->param_hostname, c->param_service);
ERR_raise(ERR_LIB_BIO, BIO_R_UNABLE_TO_CREATE_SOCKET);
goto exit_loop;
}
@@ -202,7 +202,7 @@ static int conn_state(BIO *b, BIO_CONNECT *c)
b->retry_reason = BIO_RR_CONNECT;
ERR_pop_to_mark();
} else if ((c->addr_iter = BIO_ADDRINFO_next(c->addr_iter))
- != NULL) {
+ != NULL) {
/*
* if there are more addresses to try, do that first
*/
@@ -213,8 +213,8 @@ static int conn_state(BIO *b, BIO_CONNECT *c)
} else {
ERR_clear_last_mark();
ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling connect(%s, %s)",
- c->param_hostname, c->param_service);
+ "calling connect(%s, %s)",
+ c->param_hostname, c->param_service);
c->state = BIO_CONN_S_CONNECT_ERROR;
break;
}
@@ -243,8 +243,8 @@ static int conn_state(BIO *b, BIO_CONNECT *c)
break;
}
ERR_raise_data(ERR_LIB_SYS, i,
- "calling connect(%s, %s)",
- c->param_hostname, c->param_service);
+ "calling connect(%s, %s)",
+ c->param_hostname, c->param_service);
ERR_raise(ERR_LIB_BIO, BIO_R_NBIO_CONNECT_ERROR);
ret = 0;
goto exit_loop;
@@ -275,10 +275,10 @@ static int conn_state(BIO *b, BIO_CONNECT *c)
}
/* Loop does not exit */
- exit_loop:
+exit_loop:
if (cb != NULL)
ret = cb((BIO *)b, c->state, ret);
- end:
+end:
return ret;
}
@@ -375,11 +375,11 @@ static int conn_read(BIO *b, char *out, int outl)
if (out != NULL) {
clear_socket_error();
-# ifndef OPENSSL_NO_KTLS
+#ifndef OPENSSL_NO_KTLS
if (BIO_get_ktls_recv(b))
ret = ktls_read_record(b->num, out, outl);
else
-# endif
+#endif
ret = readsocket(b->num, out, outl);
BIO_clear_retry_flags(b);
if (ret <= 0) {
@@ -412,7 +412,7 @@ static int conn_write(BIO *b, const char *in, int inl)
}
clear_socket_error();
-# ifndef OPENSSL_NO_KTLS
+#ifndef OPENSSL_NO_KTLS
if (BIO_should_ktls_ctrl_msg_flag(b)) {
ret = ktls_send_ctrl_message(b->num, data->record_type, in, inl);
if (ret >= 0) {
@@ -420,16 +420,16 @@ static int conn_write(BIO *b, const char *in, int inl)
BIO_clear_ktls_ctrl_msg_flag(b);
}
} else
-# endif
-# if defined(OSSL_TFO_SENDTO)
- if (data->tfo_first) {
+#endif
+#if defined(OSSL_TFO_SENDTO)
+ if (data->tfo_first) {
int peerlen = BIO_ADDRINFO_sockaddr_size(data->addr_iter);
ret = sendto(b->num, in, inl, OSSL_TFO_SENDTO,
- BIO_ADDRINFO_sockaddr(data->addr_iter), peerlen);
+ BIO_ADDRINFO_sockaddr(data->addr_iter), peerlen);
data->tfo_first = 0;
} else
-# endif
+#endif
ret = writesocket(b->num, in, inl);
BIO_clear_retry_flags(b);
if (ret <= 0) {
@@ -447,9 +447,9 @@ static long conn_ctrl(BIO *b, int cmd, long num, void *ptr)
long ret = 1;
BIO_CONNECT *data;
const BIO_ADDR *dg_addr;
-# ifndef OPENSSL_NO_KTLS
+#ifndef OPENSSL_NO_KTLS
ktls_crypto_info_t *crypto_info;
-# endif
+#endif
data = (BIO_CONNECT *)b->ptr;
@@ -480,11 +480,11 @@ static long conn_ctrl(BIO *b, int cmd, long num, void *ptr)
*pptr = (const char *)BIO_ADDRINFO_address(data->addr_iter);
} else if (num == 3) {
switch (BIO_ADDRINFO_family(data->addr_iter)) {
-# if OPENSSL_USE_IPV6
+#if OPENSSL_USE_IPV6
case AF_INET6:
ret = BIO_FAMILY_IPV6;
break;
-# endif
+#endif
case AF_INET:
ret = BIO_FAMILY_IPV4;
break;
@@ -517,9 +517,9 @@ static long conn_ctrl(BIO *b, int cmd, long num, void *ptr)
OPENSSL_free(data->param_hostname);
data->param_hostname = NULL;
ret = BIO_parse_hostserv(ptr,
- &data->param_hostname,
- &data->param_service,
- BIO_PARSE_PRIO_HOST);
+ &data->param_hostname,
+ &data->param_service,
+ BIO_PARSE_PRIO_HOST);
if (hold_service != data->param_service)
OPENSSL_free(hold_service);
} else if (num == 1) { /* BIO_set_conn_port */
@@ -593,21 +593,19 @@ static long conn_ctrl(BIO *b, int cmd, long num, void *ptr)
break;
case BIO_CTRL_GET_RPOLL_DESCRIPTOR:
- case BIO_CTRL_GET_WPOLL_DESCRIPTOR:
- {
- BIO_POLL_DESCRIPTOR *pd = ptr;
+ case BIO_CTRL_GET_WPOLL_DESCRIPTOR: {
+ BIO_POLL_DESCRIPTOR *pd = ptr;
- if (data->state != BIO_CONN_S_OK)
- conn_state(b, data); /* best effort */
+ if (data->state != BIO_CONN_S_OK)
+ conn_state(b, data); /* best effort */
- if (data->state >= BIO_CONN_S_CREATE_SOCKET) {
- pd->type = BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD;
- pd->value.fd = b->num;
- } else {
- ret = 0;
- }
+ if (data->state >= BIO_CONN_S_CREATE_SOCKET) {
+ pd->type = BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD;
+ pd->value.fd = b->num;
+ } else {
+ ret = 0;
}
- break;
+ } break;
case BIO_C_SET_NBIO:
if (num != 0)
data->connect_mode |= BIO_SOCK_NONBLOCK;
@@ -657,37 +655,33 @@ static long conn_ctrl(BIO *b, int cmd, long num, void *ptr)
break;
case BIO_CTRL_FLUSH:
break;
- case BIO_CTRL_DUP:
- {
- dbio = (BIO *)ptr;
- if (data->param_hostname)
- BIO_set_conn_hostname(dbio, data->param_hostname);
- if (data->param_service)
- BIO_set_conn_port(dbio, data->param_service);
- BIO_set_conn_ip_family(dbio, data->connect_family);
- BIO_set_conn_mode(dbio, data->connect_mode);
- /*
- * FIXME: the cast of the function seems unlikely to be a good
- * idea
- */
- (void)BIO_set_info_callback(dbio, data->info_callback);
- }
- break;
+ case BIO_CTRL_DUP: {
+ dbio = (BIO *)ptr;
+ if (data->param_hostname)
+ BIO_set_conn_hostname(dbio, data->param_hostname);
+ if (data->param_service)
+ BIO_set_conn_port(dbio, data->param_service);
+ BIO_set_conn_ip_family(dbio, data->connect_family);
+ BIO_set_conn_mode(dbio, data->connect_mode);
+ /*
+ * FIXME: the cast of the function seems unlikely to be a good
+ * idea
+ */
+ (void)BIO_set_info_callback(dbio, data->info_callback);
+ } break;
case BIO_CTRL_SET_CALLBACK:
ret = 0; /* use callback ctrl */
break;
- case BIO_CTRL_GET_CALLBACK:
- {
- BIO_info_cb **fptr;
+ case BIO_CTRL_GET_CALLBACK: {
+ BIO_info_cb **fptr;
- fptr = (BIO_info_cb **)ptr;
- *fptr = data->info_callback;
- }
- break;
+ fptr = (BIO_info_cb **)ptr;
+ *fptr = data->info_callback;
+ } break;
case BIO_CTRL_EOF:
ret = (b->flags & BIO_FLAGS_IN_EOF) != 0;
break;
-# ifndef OPENSSL_NO_KTLS
+#ifndef OPENSSL_NO_KTLS
case BIO_CTRL_SET_KTLS:
crypto_info = (ktls_crypto_info_t *)ptr;
ret = ktls_start(b->num, crypto_info, num);
@@ -712,7 +706,7 @@ static long conn_ctrl(BIO *b, int cmd, long num, void *ptr)
if (ret)
BIO_set_ktls_zerocopy_sendfile_flag(b);
break;
-# endif
+#endif
default:
ret = 0;
break;
@@ -728,11 +722,9 @@ static long conn_callback_ctrl(BIO *b, int cmd, BIO_info_cb *fp)
data = (BIO_CONNECT *)b->ptr;
switch (cmd) {
- case BIO_CTRL_SET_CALLBACK:
- {
- data->info_callback = fp;
- }
- break;
+ case BIO_CTRL_SET_CALLBACK: {
+ data->info_callback = fp;
+ } break;
default:
ret = 0;
break;
@@ -785,11 +777,11 @@ int conn_gets(BIO *bio, char *buf, int size)
clear_socket_error();
while (size-- > 1) {
-# ifndef OPENSSL_NO_KTLS
+#ifndef OPENSSL_NO_KTLS
if (BIO_get_ktls_recv(bio))
ret = ktls_read_record(bio->num, ptr, 1);
else
-# endif
+#endif
ret = readsocket(bio->num, ptr, 1);
BIO_clear_retry_flags(bio);
if (ret <= 0) {
@@ -807,7 +799,7 @@ int conn_gets(BIO *bio, char *buf, int size)
}
static int conn_sendmmsg(BIO *bio, BIO_MSG *msg, size_t stride, size_t num_msgs,
- uint64_t flags, size_t *msgs_processed)
+ uint64_t flags, size_t *msgs_processed)
{
int ret;
BIO_CONNECT *data;
@@ -834,11 +826,11 @@ static int conn_sendmmsg(BIO *bio, BIO_MSG *msg, size_t stride, size_t num_msgs,
}
return BIO_sendmmsg(data->dgram_bio, msg, stride, num_msgs,
- flags, msgs_processed);
+ flags, msgs_processed);
}
static int conn_recvmmsg(BIO *bio, BIO_MSG *msg, size_t stride, size_t num_msgs,
- uint64_t flags, size_t *msgs_processed)
+ uint64_t flags, size_t *msgs_processed)
{
int ret;
BIO_CONNECT *data;
@@ -865,7 +857,7 @@ static int conn_recvmmsg(BIO *bio, BIO_MSG *msg, size_t stride, size_t num_msgs,
}
return BIO_recvmmsg(data->dgram_bio, msg, stride, num_msgs,
- flags, msgs_processed);
+ flags, msgs_processed);
}
BIO *BIO_new_connect(const char *str)
diff --git a/crypto/bio/bss_core.c b/crypto/bio/bss_core.c
index b9a8eff346..fb9b59caef 100644
--- a/crypto/bio/bss_core.c
+++ b/crypto/bio/bss_core.c
@@ -38,7 +38,7 @@ static ossl_inline BIO_CORE_GLOBALS *get_globals(OSSL_LIB_CTX *libctx)
}
static int bio_core_read_ex(BIO *bio, char *data, size_t data_len,
- size_t *bytes_read)
+ size_t *bytes_read)
{
BIO_CORE_GLOBALS *bcgbl = get_globals(bio->libctx);
@@ -48,7 +48,7 @@ static int bio_core_read_ex(BIO *bio, char *data, size_t data_len,
}
static int bio_core_write_ex(BIO *bio, const char *data, size_t data_len,
- size_t *written)
+ size_t *written)
{
BIO_CORE_GLOBALS *bcgbl = get_globals(bio->libctx);
@@ -149,7 +149,7 @@ int ossl_bio_init_core(OSSL_LIB_CTX *libctx, const OSSL_DISPATCH *fns)
BIO_CORE_GLOBALS *bcgbl = get_globals(libctx);
if (bcgbl == NULL)
- return 0;
+ return 0;
for (; fns->function_id != 0; fns++) {
switch (fns->function_id) {
diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c
index 803744ebfe..b723733825 100644
--- a/crypto/bio/bss_dgram.c
+++ b/crypto/bio/bss_dgram.c
@@ -8,7 +8,7 @@
*/
#ifndef _GNU_SOURCE
-# define _GNU_SOURCE
+#define _GNU_SOURCE
#endif
#include <stdio.h>
@@ -18,126 +18,124 @@
#include "bio_local.h"
#ifndef OPENSSL_NO_DGRAM
-# ifndef OPENSSL_NO_SCTP
-# include <netinet/sctp.h>
-# include <fcntl.h>
-# define OPENSSL_SCTP_DATA_CHUNK_TYPE 0x00
-# define OPENSSL_SCTP_FORWARD_CUM_TSN_CHUNK_TYPE 0xc0
-# endif
+#ifndef OPENSSL_NO_SCTP
+#include <netinet/sctp.h>
+#include <fcntl.h>
+#define OPENSSL_SCTP_DATA_CHUNK_TYPE 0x00
+#define OPENSSL_SCTP_FORWARD_CUM_TSN_CHUNK_TYPE 0xc0
+#endif
-# if defined(OPENSSL_SYS_LINUX) && !defined(IP_MTU)
-# define IP_MTU 14 /* linux is lame */
-# endif
+#if defined(OPENSSL_SYS_LINUX) && !defined(IP_MTU)
+#define IP_MTU 14 /* linux is lame */
+#endif
-# if OPENSSL_USE_IPV6 && !defined(IPPROTO_IPV6)
-# define IPPROTO_IPV6 41 /* windows is lame */
-# endif
+#if OPENSSL_USE_IPV6 && !defined(IPPROTO_IPV6)
+#define IPPROTO_IPV6 41 /* windows is lame */
+#endif
-# if defined(__FreeBSD__) && defined(IN6_IS_ADDR_V4MAPPED)
+#if defined(__FreeBSD__) && defined(IN6_IS_ADDR_V4MAPPED)
/* Standard definition causes type-punning problems. */
-# undef IN6_IS_ADDR_V4MAPPED
-# define s6_addr32 __u6_addr.__u6_addr32
-# define IN6_IS_ADDR_V4MAPPED(a) \
- (((a)->s6_addr32[0] == 0) && \
- ((a)->s6_addr32[1] == 0) && \
- ((a)->s6_addr32[2] == htonl(0x0000ffff)))
-# endif
+#undef IN6_IS_ADDR_V4MAPPED
+#define s6_addr32 __u6_addr.__u6_addr32
+#define IN6_IS_ADDR_V4MAPPED(a) \
+ (((a)->s6_addr32[0] == 0) && ((a)->s6_addr32[1] == 0) && ((a)->s6_addr32[2] == htonl(0x0000ffff)))
+#endif
/* Determine what method to use for BIO_sendmmsg and BIO_recvmmsg. */
-# define M_METHOD_NONE 0
-# define M_METHOD_RECVMMSG 1
-# define M_METHOD_RECVMSG 2
-# define M_METHOD_RECVFROM 3
-# define M_METHOD_WSARECVMSG 4
-
-# if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
-# if !(__GLIBC_PREREQ(2, 14))
-# undef NO_RECVMMSG
- /*
- * Some old glibc versions may have recvmmsg and MSG_WAITFORONE flag, but
- * not sendmmsg. We need both so force this to be disabled on these old
- * versions
- */
-# define NO_RECVMMSG
-# endif
-# endif
-# if defined(__GNU__)
- /* GNU/Hurd does not have IP_PKTINFO yet */
- #undef NO_RECVMSG
- #define NO_RECVMSG
-# endif
-# if (defined(__ANDROID_API__) && __ANDROID_API__ < 21) || defined(_AIX)
-# undef NO_RECVMMSG
-# define NO_RECVMMSG
-# endif
-# if !defined(M_METHOD)
-# if defined(OPENSSL_SYS_WINDOWS) && defined(BIO_HAVE_WSAMSG) && !defined(NO_WSARECVMSG)
-# define M_METHOD M_METHOD_WSARECVMSG
-# elif !defined(OPENSSL_SYS_WINDOWS) && defined(MSG_WAITFORONE) && !defined(NO_RECVMMSG)
-# define M_METHOD M_METHOD_RECVMMSG
-# elif !defined(OPENSSL_SYS_WINDOWS) && defined(CMSG_LEN) && !defined(NO_RECVMSG)
-# define M_METHOD M_METHOD_RECVMSG
-# elif !defined(NO_RECVFROM)
-# define M_METHOD M_METHOD_RECVFROM
-# else
-# define M_METHOD M_METHOD_NONE
-# endif
-# endif
-
-# if defined(OPENSSL_SYS_WINDOWS)
-# define BIO_CMSG_SPACE(x) WSA_CMSG_SPACE(x)
-# define BIO_CMSG_FIRSTHDR(x) WSA_CMSG_FIRSTHDR(x)
-# define BIO_CMSG_NXTHDR(x, y) WSA_CMSG_NXTHDR(x, y)
-# define BIO_CMSG_DATA(x) WSA_CMSG_DATA(x)
-# define BIO_CMSG_LEN(x) WSA_CMSG_LEN(x)
-# define MSGHDR_TYPE WSAMSG
-# define CMSGHDR_TYPE WSACMSGHDR
-# else
-# define MSGHDR_TYPE struct msghdr
-# define CMSGHDR_TYPE struct cmsghdr
-# define BIO_CMSG_SPACE(x) CMSG_SPACE(x)
-# define BIO_CMSG_FIRSTHDR(x) CMSG_FIRSTHDR(x)
-# define BIO_CMSG_NXTHDR(x, y) CMSG_NXTHDR(x, y)
-# define BIO_CMSG_DATA(x) CMSG_DATA(x)
-# define BIO_CMSG_LEN(x) CMSG_LEN(x)
-# endif
-
-# if M_METHOD == M_METHOD_RECVMMSG \
- || M_METHOD == M_METHOD_RECVMSG \
+#define M_METHOD_NONE 0
+#define M_METHOD_RECVMMSG 1
+#define M_METHOD_RECVMSG 2
+#define M_METHOD_RECVFROM 3
+#define M_METHOD_WSARECVMSG 4
+
+#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+#if !(__GLIBC_PREREQ(2, 14))
+#undef NO_RECVMMSG
+/*
+ * Some old glibc versions may have recvmmsg and MSG_WAITFORONE flag, but
+ * not sendmmsg. We need both so force this to be disabled on these old
+ * versions
+ */
+#define NO_RECVMMSG
+#endif
+#endif
+#if defined(__GNU__)
+/* GNU/Hurd does not have IP_PKTINFO yet */
+#undef NO_RECVMSG
+#define NO_RECVMSG
+#endif
+#if (defined(__ANDROID_API__) && __ANDROID_API__ < 21) || defined(_AIX)
+#undef NO_RECVMMSG
+#define NO_RECVMMSG
+#endif
+#if !defined(M_METHOD)
+#if defined(OPENSSL_SYS_WINDOWS) && defined(BIO_HAVE_WSAMSG) && !defined(NO_WSARECVMSG)
+#define M_METHOD M_METHOD_WSARECVMSG
+#elif !defined(OPENSSL_SYS_WINDOWS) && defined(MSG_WAITFORONE) && !defined(NO_RECVMMSG)
+#define M_METHOD M_METHOD_RECVMMSG
+#elif !defined(OPENSSL_SYS_WINDOWS) && defined(CMSG_LEN) && !defined(NO_RECVMSG)
+#define M_METHOD M_METHOD_RECVMSG
+#elif !defined(NO_RECVFROM)
+#define M_METHOD M_METHOD_RECVFROM
+#else
+#define M_METHOD M_METHOD_NONE
+#endif
+#endif
+
+#if defined(OPENSSL_SYS_WINDOWS)
+#define BIO_CMSG_SPACE(x) WSA_CMSG_SPACE(x)
+#define BIO_CMSG_FIRSTHDR(x) WSA_CMSG_FIRSTHDR(x)
+#define BIO_CMSG_NXTHDR(x, y) WSA_CMSG_NXTHDR(x, y)
+#define BIO_CMSG_DATA(x) WSA_CMSG_DATA(x)
+#define BIO_CMSG_LEN(x) WSA_CMSG_LEN(x)
+#define MSGHDR_TYPE WSAMSG
+#define CMSGHDR_TYPE WSACMSGHDR
+#else
+#define MSGHDR_TYPE struct msghdr
+#define CMSGHDR_TYPE struct cmsghdr
+#define BIO_CMSG_SPACE(x) CMSG_SPACE(x)
+#define BIO_CMSG_FIRSTHDR(x) CMSG_FIRSTHDR(x)
+#define BIO_CMSG_NXTHDR(x, y) CMSG_NXTHDR(x, y)
+#define BIO_CMSG_DATA(x) CMSG_DATA(x)
+#define BIO_CMSG_LEN(x) CMSG_LEN(x)
+#endif
+
+#if M_METHOD == M_METHOD_RECVMMSG \
+ || M_METHOD == M_METHOD_RECVMSG \
|| M_METHOD == M_METHOD_WSARECVMSG
-# if defined(__APPLE__)
- /*
- * CMSG_SPACE is not a constant expression on OSX even though POSIX
- * says it's supposed to be. This should be adequate.
- */
-# define BIO_CMSG_ALLOC_LEN 64
-# else
-# if defined(IPV6_PKTINFO)
-# define BIO_CMSG_ALLOC_LEN_1 BIO_CMSG_SPACE(sizeof(struct in6_pktinfo))
-# else
-# define BIO_CMSG_ALLOC_LEN_1 0
-# endif
-# if defined(IP_PKTINFO)
-# define BIO_CMSG_ALLOC_LEN_2 BIO_CMSG_SPACE(sizeof(struct in_pktinfo))
-# else
-# define BIO_CMSG_ALLOC_LEN_2 0
-# endif
-# if defined(IP_RECVDSTADDR)
-# define BIO_CMSG_ALLOC_LEN_3 BIO_CMSG_SPACE(sizeof(struct in_addr))
-# else
-# define BIO_CMSG_ALLOC_LEN_3 0
-# endif
-# define BIO_MAX(X,Y) ((X) > (Y) ? (X) : (Y))
-# define BIO_CMSG_ALLOC_LEN \
- BIO_MAX(BIO_CMSG_ALLOC_LEN_1, \
- BIO_MAX(BIO_CMSG_ALLOC_LEN_2, BIO_CMSG_ALLOC_LEN_3))
-# endif
-# if (defined(IP_PKTINFO) || defined(IP_RECVDSTADDR)) && defined(IPV6_RECVPKTINFO)
-# define SUPPORT_LOCAL_ADDR
-# endif
-# endif
-
-# define BIO_MSG_N(array, stride, n) (*(BIO_MSG *)((char *)(array) + (n)*(stride)))
+#if defined(__APPLE__)
+/*
+ * CMSG_SPACE is not a constant expression on OSX even though POSIX
+ * says it's supposed to be. This should be adequate.
+ */
+#define BIO_CMSG_ALLOC_LEN 64
+#else
+#if defined(IPV6_PKTINFO)
+#define BIO_CMSG_ALLOC_LEN_1 BIO_CMSG_SPACE(sizeof(struct in6_pktinfo))
+#else
+#define BIO_CMSG_ALLOC_LEN_1 0
+#endif
+#if defined(IP_PKTINFO)
+#define BIO_CMSG_ALLOC_LEN_2 BIO_CMSG_SPACE(sizeof(struct in_pktinfo))
+#else
+#define BIO_CMSG_ALLOC_LEN_2 0
+#endif
+#if defined(IP_RECVDSTADDR)
+#define BIO_CMSG_ALLOC_LEN_3 BIO_CMSG_SPACE(sizeof(struct in_addr))
+#else
+#define BIO_CMSG_ALLOC_LEN_3 0
+#endif
+#define BIO_MAX(X, Y) ((X) > (Y) ? (X) : (Y))
+#define BIO_CMSG_ALLOC_LEN \
+ BIO_MAX(BIO_CMSG_ALLOC_LEN_1, \
+ BIO_MAX(BIO_CMSG_ALLOC_LEN_2, BIO_CMSG_ALLOC_LEN_3))
+#endif
+#if (defined(IP_PKTINFO) || defined(IP_RECVDSTADDR)) && defined(IPV6_RECVPKTINFO)
+#define SUPPORT_LOCAL_ADDR
+#endif
+#endif
+
+#define BIO_MSG_N(array, stride, n) (*(BIO_MSG *)((char *)(array) + (n) * (stride)))
static int dgram_write(BIO *h, const char *buf, int num);
static int dgram_read(BIO *h, char *buf, int size);
@@ -147,13 +145,13 @@ static int dgram_new(BIO *h);
static int dgram_free(BIO *data);
static int dgram_clear(BIO *bio);
static int dgram_sendmmsg(BIO *b, BIO_MSG *msg,
- size_t stride, size_t num_msg,
- uint64_t flags, size_t *num_processed);
+ size_t stride, size_t num_msg,
+ uint64_t flags, size_t *num_processed);
static int dgram_recvmmsg(BIO *b, BIO_MSG *msg,
- size_t stride, size_t num_msg,
- uint64_t flags, size_t *num_processed);
+ size_t stride, size_t num_msg,
+ uint64_t flags, size_t *num_processed);
-# ifndef OPENSSL_NO_SCTP
+#ifndef OPENSSL_NO_SCTP
static int dgram_sctp_write(BIO *h, const char *buf, int num);
static int dgram_sctp_read(BIO *h, char *buf, int size);
static int dgram_sctp_puts(BIO *h, const char *str);
@@ -162,11 +160,10 @@ static int dgram_sctp_new(BIO *h);
static int dgram_sctp_free(BIO *data);
static int dgram_sctp_wait_for_dry(BIO *b);
static int dgram_sctp_msg_waiting(BIO *b);
-# ifdef SCTP_AUTHENTICATION_EVENT
-static void dgram_sctp_handle_auth_free_key_event(BIO *b, union sctp_notification
- *snp);
-# endif
-# endif
+#ifdef SCTP_AUTHENTICATION_EVENT
+static void dgram_sctp_handle_auth_free_key_event(BIO *b, union sctp_notification *snp);
+#endif
+#endif
static int BIO_dgram_should_retry(int s);
@@ -178,16 +175,16 @@ static const BIO_METHOD methods_dgramp = {
bread_conv,
dgram_read,
dgram_puts,
- NULL, /* dgram_gets, */
+ NULL, /* dgram_gets, */
dgram_ctrl,
dgram_new,
dgram_free,
- NULL, /* dgram_callback_ctrl */
+ NULL, /* dgram_callback_ctrl */
dgram_sendmmsg,
dgram_recvmmsg,
};
-# ifndef OPENSSL_NO_SCTP
+#ifndef OPENSSL_NO_SCTP
static const BIO_METHOD methods_dgramp_sctp = {
BIO_TYPE_DGRAM_SCTP,
"datagram sctp socket",
@@ -196,15 +193,15 @@ static const BIO_METHOD methods_dgramp_sctp = {
bread_conv,
dgram_sctp_read,
dgram_sctp_puts,
- NULL, /* dgram_gets, */
+ NULL, /* dgram_gets, */
dgram_sctp_ctrl,
dgram_sctp_new,
dgram_sctp_free,
- NULL, /* dgram_callback_ctrl */
- NULL, /* sendmmsg */
- NULL, /* recvmmsg */
+ NULL, /* dgram_callback_ctrl */
+ NULL, /* sendmmsg */
+ NULL, /* recvmmsg */
};
-# endif
+#endif
typedef struct bio_dgram_data_st {
BIO_ADDR peer;
@@ -218,7 +215,7 @@ typedef struct bio_dgram_data_st {
char local_addr_enabled;
} bio_dgram_data;
-# ifndef OPENSSL_NO_SCTP
+#ifndef OPENSSL_NO_SCTP
typedef struct bio_dgram_sctp_save_message_st {
BIO *bio;
char *data;
@@ -243,7 +240,7 @@ typedef struct bio_dgram_sctp_data_st {
int save_shutdown;
int peer_auth_tested;
} bio_dgram_sctp_data;
-# endif
+#endif
const BIO_METHOD *BIO_s_datagram(void)
{
@@ -302,33 +299,34 @@ static int dgram_clear(BIO *a)
static void dgram_adjust_rcv_timeout(BIO *b)
{
-# if defined(SO_RCVTIMEO)
+#if defined(SO_RCVTIMEO)
bio_dgram_data *data = (bio_dgram_data *)b->ptr;
OSSL_TIME timeleft;
/* Is a timer active? */
if (!ossl_time_is_zero(data->next_timeout)) {
/* Read current socket timeout */
-# ifdef OPENSSL_SYS_WINDOWS
+#ifdef OPENSSL_SYS_WINDOWS
int timeout;
int sz = sizeof(timeout);
if (getsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO,
- (void *)&timeout, &sz) < 0)
+ (void *)&timeout, &sz)
+ < 0)
ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling getsockopt()");
+ "calling getsockopt()");
else
data->socket_timeout = ossl_ms2time(timeout);
-# else
+#else
struct timeval tv;
socklen_t sz = sizeof(tv);
if (getsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO, &tv, &sz) < 0)
ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling getsockopt()");
+ "calling getsockopt()");
else
data->socket_timeout = ossl_time_from_timeval(tv);
-# endif
+#endif
/* Calculate time left until timer expires */
timeleft = ossl_time_subtract(data->next_timeout, ossl_time_now());
@@ -341,22 +339,24 @@ static void dgram_adjust_rcv_timeout(BIO *b)
*/
if (ossl_time_is_zero(data->socket_timeout)
|| ossl_time_compare(data->socket_timeout, timeleft) >= 0) {
-# ifdef OPENSSL_SYS_WINDOWS
+#ifdef OPENSSL_SYS_WINDOWS
timeout = (int)ossl_time2ms(timeleft);
if (setsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO,
- (void *)&timeout, sizeof(timeout)) < 0)
+ (void *)&timeout, sizeof(timeout))
+ < 0)
ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling setsockopt()");
-# else
+ "calling setsockopt()");
+#else
tv = ossl_time_to_timeval(timeleft);
if (setsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO, &tv,
- sizeof(tv)) < 0)
+ sizeof(tv))
+ < 0)
ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling setsockopt()");
-# endif
+ "calling setsockopt()");
+#endif
}
}
-# endif
+#endif
}
static void dgram_update_local_addr(BIO *b)
@@ -372,37 +372,38 @@ static void dgram_update_local_addr(BIO *b)
BIO_ADDR_clear(&data->local_addr);
}
-# if M_METHOD == M_METHOD_RECVMMSG || M_METHOD == M_METHOD_RECVMSG || M_METHOD == M_METHOD_WSARECVMSG
+#if M_METHOD == M_METHOD_RECVMMSG || M_METHOD == M_METHOD_RECVMSG || M_METHOD == M_METHOD_WSARECVMSG
static int dgram_get_sock_family(BIO *b)
{
bio_dgram_data *data = (bio_dgram_data *)b->ptr;
return data->local_addr.sa.sa_family;
}
-# endif
+#endif
static void dgram_reset_rcv_timeout(BIO *b)
{
-# if defined(SO_RCVTIMEO)
+#if defined(SO_RCVTIMEO)
bio_dgram_data *data = (bio_dgram_data *)b->ptr;
/* Is a timer active? */
if (!ossl_time_is_zero(data->next_timeout)) {
-# ifdef OPENSSL_SYS_WINDOWS
+#ifdef OPENSSL_SYS_WINDOWS
int timeout = (int)ossl_time2ms(data->socket_timeout);
if (setsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO,
- (void *)&timeout, sizeof(timeout)) < 0)
+ (void *)&timeout, sizeof(timeout))
+ < 0)
ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling setsockopt()");
-# else
+ "calling setsockopt()");
+#else
struct timeval tv = ossl_time_to_timeval(data->socket_timeout);
if (setsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)) < 0)
ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling setsockopt()");
-# endif
+ "calling setsockopt()");
+#endif
}
-# endif
+#endif
}
static int dgram_read(BIO *b, char *out, int outl)
@@ -421,7 +422,7 @@ static int dgram_read(BIO *b, char *out, int outl)
if (data->peekmode)
flags = MSG_PEEK;
ret = recvfrom(b->num, out, outl, flags,
- BIO_ADDR_sockaddr_noconst(&peer), &len);
+ BIO_ADDR_sockaddr_noconst(&peer), &len);
if (!data->connected && ret >= 0)
BIO_ctrl(b, BIO_CTRL_DGRAM_SET_PEER, 0, &peer);
@@ -451,7 +452,7 @@ static int dgram_write(BIO *b, const char *in, int inl)
int peerlen = BIO_ADDR_sockaddr_size(&data->peer);
ret = sendto(b->num, in, inl, 0,
- BIO_ADDR_sockaddr(&data->peer), peerlen);
+ BIO_ADDR_sockaddr(&data->peer), peerlen);
}
BIO_clear_retry_flags(b);
@@ -475,27 +476,25 @@ static long dgram_get_mtu_overhead(BIO_ADDR *addr)
*/
ret = 28;
break;
-# if OPENSSL_USE_IPV6
- case AF_INET6:
- {
-# ifdef IN6_IS_ADDR_V4MAPPED
- struct in6_addr tmp_addr;
+#if OPENSSL_USE_IPV6
+ case AF_INET6: {
+#ifdef IN6_IS_ADDR_V4MAPPED
+ struct in6_addr tmp_addr;
- if (BIO_ADDR_rawaddress(addr, &tmp_addr, NULL)
- && IN6_IS_ADDR_V4MAPPED(&tmp_addr))
- /*
- * Assume this is UDP - 20 bytes for IP, 8 bytes for UDP
- */
- ret = 28;
- else
-# endif
+ if (BIO_ADDR_rawaddress(addr, &tmp_addr, NULL)
+ && IN6_IS_ADDR_V4MAPPED(&tmp_addr))
+ /*
+ * Assume this is UDP - 20 bytes for IP, 8 bytes for UDP
+ */
+ ret = 28;
+ else
+#endif
/*
* Assume this is UDP - 40 bytes for IP, 8 bytes for UDP
*/
ret = 48;
- }
- break;
-# endif
+ } break;
+#endif
default:
/* We don't know. Go with the historical default */
ret = 28;
@@ -505,62 +504,66 @@ static long dgram_get_mtu_overhead(BIO_ADDR *addr)
}
/* Enables appropriate destination address reception option on the socket. */
-# if defined(SUPPORT_LOCAL_ADDR)
-static int enable_local_addr(BIO *b, int enable) {
+#if defined(SUPPORT_LOCAL_ADDR)
+static int enable_local_addr(BIO *b, int enable)
+{
int af = dgram_get_sock_family(b);
if (af == AF_INET) {
-# if defined(IP_PKTINFO)
+#if defined(IP_PKTINFO)
/* IP_PKTINFO is preferred */
if (setsockopt(b->num, IPPROTO_IP, IP_PKTINFO,
- (void *)&enable, sizeof(enable)) < 0)
+ (void *)&enable, sizeof(enable))
+ < 0)
return 0;
return 1;
-# elif defined(IP_RECVDSTADDR)
+#elif defined(IP_RECVDSTADDR)
/* Fall back to IP_RECVDSTADDR */
if (setsockopt(b->num, IPPROTO_IP, IP_RECVDSTADDR,
- &enable, sizeof(enable)) < 0)
+ &enable, sizeof(enable))
+ < 0)
return 0;
return 1;
-# endif
+#endif
}
-# if OPENSSL_USE_IPV6
+#if OPENSSL_USE_IPV6
if (af == AF_INET6) {
-# if defined(IPV6_RECVPKTINFO)
+#if defined(IPV6_RECVPKTINFO)
if (setsockopt(b->num, IPPROTO_IPV6, IPV6_RECVPKTINFO,
- &enable, sizeof(enable)) < 0)
+ &enable, sizeof(enable))
+ < 0)
return 0;
return 1;
-# endif
+#endif
}
-# endif
+#endif
return 0;
}
-# endif
+#endif
static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
{
long ret = 1;
int *ip;
bio_dgram_data *data = NULL;
-# ifndef __DJGPP__
+#ifndef __DJGPP__
/* There are currently no cases where this is used on djgpp/watt32. */
int sockopt_val = 0;
-# endif
+#endif
int d_errno;
-# if defined(OPENSSL_SYS_LINUX) && (defined(IP_MTU_DISCOVER) || defined(IP_MTU))
- socklen_t sockopt_len; /* assume that system supporting IP_MTU is
- * modern enough to define socklen_t */
+#if defined(OPENSSL_SYS_LINUX) && (defined(IP_MTU_DISCOVER) || defined(IP_MTU))
+ socklen_t sockopt_len; /* assume that system supporting IP_MTU is
+ * modern enough to define socklen_t */
socklen_t addr_len;
BIO_ADDR addr;
-# endif
+#endif
struct sockaddr_storage ss;
socklen_t ss_len = sizeof(ss);
@@ -584,12 +587,12 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
BIO_ADDR_make(&data->peer, BIO_ADDR_sockaddr((BIO_ADDR *)&ss));
data->connected = 1;
}
-# if defined(SUPPORT_LOCAL_ADDR)
+#if defined(SUPPORT_LOCAL_ADDR)
if (data->local_addr_enabled) {
if (enable_local_addr(b, 1) < 1)
data->local_addr_enabled = 0;
}
-# endif
+#endif
break;
case BIO_C_GET_FD:
if (b->init) {
@@ -619,8 +622,8 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
break;
/* (Linux)kernel sets DF bit on outgoing IP packets */
case BIO_CTRL_DGRAM_MTU_DISCOVER:
-# if defined(OPENSSL_SYS_LINUX) && defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DO)
- addr_len = (socklen_t) sizeof(addr);
+#if defined(OPENSSL_SYS_LINUX) && defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DO)
+ addr_len = (socklen_t)sizeof(addr);
BIO_ADDR_clear(&addr);
if (getsockname(b->num, &addr.sa, &addr_len) < 0) {
ret = 0;
@@ -630,30 +633,32 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
case AF_INET:
sockopt_val = IP_PMTUDISC_DO;
if ((ret = setsockopt(b->num, IPPROTO_IP, IP_MTU_DISCOVER,
- &sockopt_val, sizeof(sockopt_val))) < 0)
+ &sockopt_val, sizeof(sockopt_val)))
+ < 0)
ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling setsockopt()");
+ "calling setsockopt()");
break;
-# if OPENSSL_USE_IPV6 && defined(IPV6_MTU_DISCOVER) && defined(IPV6_PMTUDISC_DO)
+#if OPENSSL_USE_IPV6 && defined(IPV6_MTU_DISCOVER) && defined(IPV6_PMTUDISC_DO)
case AF_INET6:
sockopt_val = IPV6_PMTUDISC_DO;
if ((ret = setsockopt(b->num, IPPROTO_IPV6, IPV6_MTU_DISCOVER,
- &sockopt_val, sizeof(sockopt_val))) < 0)
+ &sockopt_val, sizeof(sockopt_val)))
+ < 0)
ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling setsockopt()");
+ "calling setsockopt()");
break;
-# endif
+#endif
default:
ret = -1;
break;
}
-# else
+#else
ret = -1;
-# endif
+#endif
break;
case BIO_CTRL_DGRAM_QUERY_MTU:
-# if defined(OPENSSL_SYS_LINUX) && defined(IP_MTU)
- addr_len = (socklen_t) sizeof(addr);
+#if defined(OPENSSL_SYS_LINUX) && defined(IP_MTU)
+ addr_len = (socklen_t)sizeof(addr);
BIO_ADDR_clear(&addr);
if (getsockname(b->num, &addr.sa, &addr_len) < 0) {
ret = 0;
@@ -662,20 +667,21 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
sockopt_len = sizeof(sockopt_val);
switch (addr.sa.sa_family) {
case AF_INET:
- if ((ret =
- getsockopt(b->num, IPPROTO_IP, IP_MTU, (void *)&sockopt_val,
- &sockopt_len)) < 0 || sockopt_val < 0) {
+ if ((ret = getsockopt(b->num, IPPROTO_IP, IP_MTU, (void *)&sockopt_val,
+ &sockopt_len))
+ < 0
+ || sockopt_val < 0) {
ret = 0;
} else {
data->mtu = sockopt_val - dgram_get_mtu_overhead(&addr);
ret = data->mtu;
}
break;
-# if OPENSSL_USE_IPV6 && defined(IPV6_MTU)
+#if OPENSSL_USE_IPV6 && defined(IPV6_MTU)
case AF_INET6:
- if ((ret =
- getsockopt(b->num, IPPROTO_IPV6, IPV6_MTU,
- (void *)&sockopt_val, &sockopt_len)) < 0
+ if ((ret = getsockopt(b->num, IPPROTO_IPV6, IPV6_MTU,
+ (void *)&sockopt_val, &sockopt_len))
+ < 0
|| sockopt_val < 0) {
ret = 0;
} else {
@@ -683,14 +689,14 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
ret = data->mtu;
}
break;
-# endif
+#endif
default:
ret = 0;
break;
}
-# else
+#else
ret = 0;
-# endif
+#endif
break;
case BIO_CTRL_DGRAM_GET_FALLBACK_MTU:
ret = -dgram_get_mtu_overhead(&data->peer);
@@ -698,20 +704,18 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
case AF_INET:
ret += 576;
break;
-# if OPENSSL_USE_IPV6
- case AF_INET6:
- {
-# ifdef IN6_IS_ADDR_V4MAPPED
- struct in6_addr tmp_addr;
- if (BIO_ADDR_rawaddress(&data->peer, &tmp_addr, NULL)
- && IN6_IS_ADDR_V4MAPPED(&tmp_addr))
- ret += 576;
- else
-# endif
- ret += 1280;
- }
- break;
-# endif
+#if OPENSSL_USE_IPV6
+ case AF_INET6: {
+#ifdef IN6_IS_ADDR_V4MAPPED
+ struct in6_addr tmp_addr;
+ if (BIO_ADDR_rawaddress(&data->peer, &tmp_addr, NULL)
+ && IN6_IS_ADDR_V4MAPPED(&tmp_addr))
+ ret += 576;
+ else
+#endif
+ ret += 1280;
+ } break;
+#endif
default:
ret += 576;
break;
@@ -743,28 +747,26 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
case BIO_CTRL_DGRAM_SET_PEER:
BIO_ADDR_make(&data->peer, BIO_ADDR_sockaddr((BIO_ADDR *)ptr));
break;
- case BIO_CTRL_DGRAM_DETECT_PEER_ADDR:
- {
- BIO_ADDR xaddr, *p = &data->peer;
- socklen_t xaddr_len = sizeof(xaddr.sa);
-
- if (BIO_ADDR_family(p) == AF_UNSPEC) {
- if (getpeername(b->num, (void *)&xaddr.sa, &xaddr_len) == 0
- && BIO_ADDR_family(&xaddr) != AF_UNSPEC) {
- p = &xaddr;
- } else {
- ret = 0;
- break;
- }
+ case BIO_CTRL_DGRAM_DETECT_PEER_ADDR: {
+ BIO_ADDR xaddr, *p = &data->peer;
+ socklen_t xaddr_len = sizeof(xaddr.sa);
+
+ if (BIO_ADDR_family(p) == AF_UNSPEC) {
+ if (getpeername(b->num, (void *)&xaddr.sa, &xaddr_len) == 0
+ && BIO_ADDR_family(&xaddr) != AF_UNSPEC) {
+ p = &xaddr;
+ } else {
+ ret = 0;
+ break;
}
+ }
- ret = BIO_ADDR_sockaddr_size(p);
- if (num == 0 || num > ret)
- num = ret;
+ ret = BIO_ADDR_sockaddr_size(p);
+ if (num == 0 || num > ret)
+ num = ret;
- memcpy(ptr, p, (ret = num));
- }
- break;
+ memcpy(ptr, p, (ret = num));
+ } break;
case BIO_C_SET_NBIO:
if (!BIO_socket_nbio(b->num, num != 0))
ret = 0;
@@ -772,129 +774,133 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
case BIO_CTRL_DGRAM_SET_NEXT_TIMEOUT:
data->next_timeout = ossl_time_from_timeval(*(struct timeval *)ptr);
break;
-# if defined(SO_RCVTIMEO)
+#if defined(SO_RCVTIMEO)
case BIO_CTRL_DGRAM_SET_RECV_TIMEOUT:
-# ifdef OPENSSL_SYS_WINDOWS
- {
- struct timeval *tv = (struct timeval *)ptr;
- int timeout = tv->tv_sec * 1000 + tv->tv_usec / 1000;
-
- if ((ret = setsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO,
- (void *)&timeout, sizeof(timeout))) < 0)
- ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling setsockopt()");
- }
-# else
+#ifdef OPENSSL_SYS_WINDOWS
+ {
+ struct timeval *tv = (struct timeval *)ptr;
+ int timeout = tv->tv_sec * 1000 + tv->tv_usec / 1000;
+
+ if ((ret = setsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO,
+ (void *)&timeout, sizeof(timeout)))
+ < 0)
+ ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
+ "calling setsockopt()");
+ }
+#else
if ((ret = setsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO, ptr,
- sizeof(struct timeval))) < 0)
+ sizeof(struct timeval)))
+ < 0)
ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling setsockopt()");
-# endif
- break;
- case BIO_CTRL_DGRAM_GET_RECV_TIMEOUT:
- {
-# ifdef OPENSSL_SYS_WINDOWS
- int sz = 0;
- int timeout;
- struct timeval *tv = (struct timeval *)ptr;
-
- sz = sizeof(timeout);
- if ((ret = getsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO,
- (void *)&timeout, &sz)) < 0) {
- ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling getsockopt()");
- } else {
- tv->tv_sec = timeout / 1000;
- tv->tv_usec = (timeout % 1000) * 1000;
- ret = sizeof(*tv);
- }
-# else
- socklen_t sz = sizeof(struct timeval);
+ "calling setsockopt()");
+#endif
+ break;
+ case BIO_CTRL_DGRAM_GET_RECV_TIMEOUT: {
+#ifdef OPENSSL_SYS_WINDOWS
+ int sz = 0;
+ int timeout;
+ struct timeval *tv = (struct timeval *)ptr;
- if ((ret = getsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO,
- ptr, &sz)) < 0) {
- ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling getsockopt()");
- } else if (!ossl_assert((size_t)sz == sizeof(struct timeval))) {
- ERR_raise_data(ERR_LIB_BIO, ERR_R_INTERNAL_ERROR,
- "Unexpected getsockopt(SO_RCVTIMEO) return size");
- ret = -1;
- } else {
- ret = (int)sz;
- }
-# endif
+ sz = sizeof(timeout);
+ if ((ret = getsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO,
+ (void *)&timeout, &sz))
+ < 0) {
+ ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
+ "calling getsockopt()");
+ } else {
+ tv->tv_sec = timeout / 1000;
+ tv->tv_usec = (timeout % 1000) * 1000;
+ ret = sizeof(*tv);
}
- break;
-# endif
-# if defined(SO_SNDTIMEO)
- case BIO_CTRL_DGRAM_SET_SEND_TIMEOUT:
-# ifdef OPENSSL_SYS_WINDOWS
- {
- struct timeval *tv = (struct timeval *)ptr;
- int timeout = tv->tv_sec * 1000 + tv->tv_usec / 1000;
+#else
+ socklen_t sz = sizeof(struct timeval);
- if ((ret = setsockopt(b->num, SOL_SOCKET, SO_SNDTIMEO,
- (void *)&timeout, sizeof(timeout))) < 0)
- ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling setsockopt()");
+ if ((ret = getsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO,
+ ptr, &sz))
+ < 0) {
+ ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
+ "calling getsockopt()");
+ } else if (!ossl_assert((size_t)sz == sizeof(struct timeval))) {
+ ERR_raise_data(ERR_LIB_BIO, ERR_R_INTERNAL_ERROR,
+ "Unexpected getsockopt(SO_RCVTIMEO) return size");
+ ret = -1;
+ } else {
+ ret = (int)sz;
}
-# else
+#endif
+ } break;
+#endif
+#if defined(SO_SNDTIMEO)
+ case BIO_CTRL_DGRAM_SET_SEND_TIMEOUT:
+#ifdef OPENSSL_SYS_WINDOWS
+ {
+ struct timeval *tv = (struct timeval *)ptr;
+ int timeout = tv->tv_sec * 1000 + tv->tv_usec / 1000;
+
+ if ((ret = setsockopt(b->num, SOL_SOCKET, SO_SNDTIMEO,
+ (void *)&timeout, sizeof(timeout)))
+ < 0)
+ ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
+ "calling setsockopt()");
+ }
+#else
if ((ret = setsockopt(b->num, SOL_SOCKET, SO_SNDTIMEO, ptr,
- sizeof(struct timeval))) < 0)
+ sizeof(struct timeval)))
+ < 0)
ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling setsockopt()");
-# endif
- break;
- case BIO_CTRL_DGRAM_GET_SEND_TIMEOUT:
- {
-# ifdef OPENSSL_SYS_WINDOWS
- int sz = 0;
- int timeout;
- struct timeval *tv = (struct timeval *)ptr;
-
- sz = sizeof(timeout);
- if ((ret = getsockopt(b->num, SOL_SOCKET, SO_SNDTIMEO,
- (void *)&timeout, &sz)) < 0) {
- ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling getsockopt()");
- } else {
- tv->tv_sec = timeout / 1000;
- tv->tv_usec = (timeout % 1000) * 1000;
- ret = sizeof(*tv);
- }
-# else
- socklen_t sz = sizeof(struct timeval);
+ "calling setsockopt()");
+#endif
+ break;
+ case BIO_CTRL_DGRAM_GET_SEND_TIMEOUT: {
+#ifdef OPENSSL_SYS_WINDOWS
+ int sz = 0;
+ int timeout;
+ struct timeval *tv = (struct timeval *)ptr;
- if ((ret = getsockopt(b->num, SOL_SOCKET, SO_SNDTIMEO,
- ptr, &sz)) < 0) {
- ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling getsockopt()");
- } else if (!ossl_assert((size_t)sz == sizeof(struct timeval))) {
- ERR_raise_data(ERR_LIB_BIO, ERR_R_INTERNAL_ERROR,
- "Unexpected getsockopt(SO_SNDTIMEO) return size");
- ret = -1;
- } else {
- ret = (int)sz;
- }
-# endif
+ sz = sizeof(timeout);
+ if ((ret = getsockopt(b->num, SOL_SOCKET, SO_SNDTIMEO,
+ (void *)&timeout, &sz))
+ < 0) {
+ ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
+ "calling getsockopt()");
+ } else {
+ tv->tv_sec = timeout / 1000;
+ tv->tv_usec = (timeout % 1000) * 1000;
+ ret = sizeof(*tv);
}
- break;
-# endif
+#else
+ socklen_t sz = sizeof(struct timeval);
+
+ if ((ret = getsockopt(b->num, SOL_SOCKET, SO_SNDTIMEO,
+ ptr, &sz))
+ < 0) {
+ ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
+ "calling getsockopt()");
+ } else if (!ossl_assert((size_t)sz == sizeof(struct timeval))) {
+ ERR_raise_data(ERR_LIB_BIO, ERR_R_INTERNAL_ERROR,
+ "Unexpected getsockopt(SO_SNDTIMEO) return size");
+ ret = -1;
+ } else {
+ ret = (int)sz;
+ }
+#endif
+ } break;
+#endif
case BIO_CTRL_DGRAM_GET_SEND_TIMER_EXP:
/* fall-through */
case BIO_CTRL_DGRAM_GET_RECV_TIMER_EXP:
-# ifdef OPENSSL_SYS_WINDOWS
+#ifdef OPENSSL_SYS_WINDOWS
d_errno = (data->_errno == WSAETIMEDOUT);
-# else
+#else
d_errno = (data->_errno == EAGAIN);
-# endif
+#endif
if (d_errno) {
ret = 1;
data->_errno = 0;
} else
ret = 0;
break;
-# ifdef EMSGSIZE
+#ifdef EMSGSIZE
case BIO_CTRL_DGRAM_MTU_EXCEEDED:
if (data->_errno == EMSGSIZE) {
ret = 1;
@@ -902,54 +908,59 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
} else
ret = 0;
break;
-# endif
+#endif
case BIO_CTRL_DGRAM_SET_DONT_FRAG:
switch (data->peer.sa.sa_family) {
case AF_INET:
-# if defined(IP_DONTFRAG)
+#if defined(IP_DONTFRAG)
sockopt_val = num ? 1 : 0;
if ((ret = setsockopt(b->num, IPPROTO_IP, IP_DONTFRAG,
- &sockopt_val, sizeof(sockopt_val))) < 0)
+ &sockopt_val, sizeof(sockopt_val)))
+ < 0)
ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling setsockopt()");
-# elif defined(OPENSSL_SYS_LINUX) && defined(IP_MTU_DISCOVER) && defined (IP_PMTUDISC_PROBE)
+ "calling setsockopt()");
+#elif defined(OPENSSL_SYS_LINUX) && defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_PROBE)
sockopt_val = num ? IP_PMTUDISC_PROBE : IP_PMTUDISC_DONT;
if ((ret = setsockopt(b->num, IPPROTO_IP, IP_MTU_DISCOVER,
- &sockopt_val, sizeof(sockopt_val))) < 0)
+ &sockopt_val, sizeof(sockopt_val)))
+ < 0)
ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling setsockopt()");
-# elif defined(OPENSSL_SYS_WINDOWS) && defined(IP_DONTFRAGMENT)
+ "calling setsockopt()");
+#elif defined(OPENSSL_SYS_WINDOWS) && defined(IP_DONTFRAGMENT)
sockopt_val = num ? 1 : 0;
if ((ret = setsockopt(b->num, IPPROTO_IP, IP_DONTFRAGMENT,
- (const char *)&sockopt_val,
- sizeof(sockopt_val))) < 0)
+ (const char *)&sockopt_val,
+ sizeof(sockopt_val)))
+ < 0)
ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling setsockopt()");
-# else
+ "calling setsockopt()");
+#else
ret = -1;
-# endif
+#endif
break;
-# if OPENSSL_USE_IPV6
+#if OPENSSL_USE_IPV6
case AF_INET6:
-# if defined(IPV6_DONTFRAG)
+#if defined(IPV6_DONTFRAG)
sockopt_val = num ? 1 : 0;
if ((ret = setsockopt(b->num, IPPROTO_IPV6, IPV6_DONTFRAG,
- (const void *)&sockopt_val,
- sizeof(sockopt_val))) < 0)
+ (const void *)&sockopt_val,
+ sizeof(sockopt_val)))
+ < 0)
ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling setsockopt()");
+ "calling setsockopt()");
-# elif defined(OPENSSL_SYS_LINUX) && defined(IPV6_MTU_DISCOVER)
+#elif defined(OPENSSL_SYS_LINUX) && defined(IPV6_MTU_DISCOVER)
sockopt_val = num ? IPV6_PMTUDISC_PROBE : IPV6_PMTUDISC_DONT;
if ((ret = setsockopt(b->num, IPPROTO_IPV6, IPV6_MTU_DISCOVER,
- &sockopt_val, sizeof(sockopt_val))) < 0)
+ &sockopt_val, sizeof(sockopt_val)))
+ < 0)
ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
- "calling setsockopt()");
-# else
+ "calling setsockopt()");
+#else
ret = -1;
-# endif
+#endif
break;
-# endif
+#endif
default:
ret = -1;
break;
@@ -972,15 +983,15 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
break;
case BIO_CTRL_DGRAM_GET_LOCAL_ADDR_CAP:
-# if defined(SUPPORT_LOCAL_ADDR)
+#if defined(SUPPORT_LOCAL_ADDR)
ret = 1;
-# else
+#else
ret = 0;
-# endif
+#endif
break;
case BIO_CTRL_DGRAM_SET_LOCAL_ADDR_ENABLE:
-# if defined(SUPPORT_LOCAL_ADDR)
+#if defined(SUPPORT_LOCAL_ADDR)
num = num > 0;
if (num != data->local_addr_enabled) {
if (enable_local_addr(b, num) < 1) {
@@ -990,9 +1001,9 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
data->local_addr_enabled = (char)num;
}
-# else
+#else
ret = 0;
-# endif
+#endif
break;
case BIO_CTRL_DGRAM_GET_LOCAL_ADDR_ENABLE:
@@ -1001,20 +1012,18 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
case BIO_CTRL_DGRAM_GET_EFFECTIVE_CAPS:
ret = (long)(BIO_DGRAM_CAP_HANDLES_DST_ADDR
- | BIO_DGRAM_CAP_HANDLES_SRC_ADDR
- | BIO_DGRAM_CAP_PROVIDES_DST_ADDR
- | BIO_DGRAM_CAP_PROVIDES_SRC_ADDR);
+ | BIO_DGRAM_CAP_HANDLES_SRC_ADDR
+ | BIO_DGRAM_CAP_PROVIDES_DST_ADDR
+ | BIO_DGRAM_CAP_PROVIDES_SRC_ADDR);
break;
case BIO_CTRL_GET_RPOLL_DESCRIPTOR:
- case BIO_CTRL_GET_WPOLL_DESCRIPTOR:
- {
- BIO_POLL_DESCRIPTOR *pd = ptr;
+ case BIO_CTRL_GET_WPOLL_DESCRIPTOR: {
+ BIO_POLL_DESCRIPTOR *pd = ptr;
- pd->type = BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD;
- pd->value.fd = b->num;
- }
- break;
+ pd->type = BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD;
+ pd->value.fd = b->num;
+ } break;
default:
ret = 0;
@@ -1037,9 +1046,9 @@ static int dgram_puts(BIO *bp, const char *str)
return ret;
}
-# if M_METHOD == M_METHOD_WSARECVMSG
+#if M_METHOD == M_METHOD_WSARECVMSG
static void translate_msg_win(BIO *b, WSAMSG *mh, WSABUF *iov,
- unsigned char *control, BIO_MSG *msg)
+ unsigned char *control, BIO_MSG *msg)
{
iov->len = msg->data_len;
iov->buf = msg->data;
@@ -1048,10 +1057,10 @@ static void translate_msg_win(BIO *b, WSAMSG *mh, WSABUF *iov,
mh->name = msg->peer != NULL ? &msg->peer->sa : NULL;
if (msg->peer != NULL && dgram_get_sock_family(b) == AF_INET)
mh->namelen = sizeof(struct sockaddr_in);
-# if OPENSSL_USE_IPV6
+#if OPENSSL_USE_IPV6
else if (msg->peer != NULL && dgram_get_sock_family(b) == AF_INET6)
mh->namelen = sizeof(struct sockaddr_in6);
-# endif
+#endif
else
mh->namelen = 0;
@@ -1062,23 +1071,23 @@ static void translate_msg_win(BIO *b, WSAMSG *mh, WSABUF *iov,
* the control buffer even if we aren't actually going to examine the
* result.
*/
- mh->lpBuffers = iov;
- mh->dwBufferCount = 1;
- mh->Control.len = BIO_CMSG_ALLOC_LEN;
- mh->Control.buf = control;
- mh->dwFlags = 0;
+ mh->lpBuffers = iov;
+ mh->dwBufferCount = 1;
+ mh->Control.len = BIO_CMSG_ALLOC_LEN;
+ mh->Control.buf = control;
+ mh->dwFlags = 0;
}
-# endif
+#endif
-# if M_METHOD == M_METHOD_RECVMMSG || M_METHOD == M_METHOD_RECVMSG
+#if M_METHOD == M_METHOD_RECVMMSG || M_METHOD == M_METHOD_RECVMSG
/* Translates a BIO_MSG to a msghdr and iovec. */
static void translate_msg(BIO *b, struct msghdr *mh, struct iovec *iov,
- unsigned char *control, BIO_MSG *msg)
+ unsigned char *control, BIO_MSG *msg)
{
bio_dgram_data *data;
iov->iov_base = msg->data;
- iov->iov_len = msg->data_len;
+ iov->iov_len = msg->data_len;
data = (bio_dgram_data *)b->ptr;
if (data->connected == 0) {
@@ -1086,10 +1095,10 @@ static void translate_msg(BIO *b, struct msghdr *mh, struct iovec *iov,
mh->msg_name = msg->peer != NULL ? &msg->peer->sa : NULL;
if (msg->peer != NULL && dgram_get_sock_family(b) == AF_INET)
mh->msg_namelen = sizeof(struct sockaddr_in);
-# if OPENSSL_USE_IPV6
+#if OPENSSL_USE_IPV6
else if (msg->peer != NULL && dgram_get_sock_family(b) == AF_INET6)
mh->msg_namelen = sizeof(struct sockaddr_in6);
-# endif
+#endif
else
mh->msg_namelen = 0;
} else {
@@ -1097,108 +1106,107 @@ static void translate_msg(BIO *b, struct msghdr *mh, struct iovec *iov,
mh->msg_namelen = 0;
}
- mh->msg_iov = iov;
- mh->msg_iovlen = 1;
- mh->msg_control = msg->local != NULL ? control : NULL;
- mh->msg_controllen = msg->local != NULL ? BIO_CMSG_ALLOC_LEN : 0;
- mh->msg_flags = 0;
+ mh->msg_iov = iov;
+ mh->msg_iovlen = 1;
+ mh->msg_control = msg->local != NULL ? control : NULL;
+ mh->msg_controllen = msg->local != NULL ? BIO_CMSG_ALLOC_LEN : 0;
+ mh->msg_flags = 0;
}
-# endif
+#endif
-# if M_METHOD == M_METHOD_RECVMMSG || M_METHOD == M_METHOD_RECVMSG || M_METHOD == M_METHOD_WSARECVMSG
+#if M_METHOD == M_METHOD_RECVMMSG || M_METHOD == M_METHOD_RECVMSG || M_METHOD == M_METHOD_WSARECVMSG
/* Extracts destination address from the control buffer. */
-static int extract_local(BIO *b, MSGHDR_TYPE *mh, BIO_ADDR *local) {
-# if defined(IP_PKTINFO) || defined(IP_RECVDSTADDR) || defined(IPV6_PKTINFO)
+static int extract_local(BIO *b, MSGHDR_TYPE *mh, BIO_ADDR *local)
+{
+#if defined(IP_PKTINFO) || defined(IP_RECVDSTADDR) || defined(IPV6_PKTINFO)
CMSGHDR_TYPE *cmsg;
int af = dgram_get_sock_family(b);
for (cmsg = BIO_CMSG_FIRSTHDR(mh); cmsg != NULL;
- cmsg = BIO_CMSG_NXTHDR(mh, cmsg)) {
+ cmsg = BIO_CMSG_NXTHDR(mh, cmsg)) {
if (af == AF_INET) {
if (cmsg->cmsg_level != IPPROTO_IP)
continue;
-# if defined(IP_PKTINFO)
+#if defined(IP_PKTINFO)
if (cmsg->cmsg_type != IP_PKTINFO)
continue;
- local->s_in.sin_addr =
- ((struct in_pktinfo *)BIO_CMSG_DATA(cmsg))->ipi_addr;
+ local->s_in.sin_addr = ((struct in_pktinfo *)BIO_CMSG_DATA(cmsg))->ipi_addr;
-# elif defined(IP_RECVDSTADDR)
+#elif defined(IP_RECVDSTADDR)
if (cmsg->cmsg_type != IP_RECVDSTADDR)
continue;
local->s_in.sin_addr = *(struct in_addr *)BIO_CMSG_DATA(cmsg);
-# endif
+#endif
-# if defined(IP_PKTINFO) || defined(IP_RECVDSTADDR)
+#if defined(IP_PKTINFO) || defined(IP_RECVDSTADDR)
{
bio_dgram_data *data = b->ptr;
local->s_in.sin_family = AF_INET;
- local->s_in.sin_port = data->local_addr.s_in.sin_port;
+ local->s_in.sin_port = data->local_addr.s_in.sin_port;
}
return 1;
-# endif
+#endif
}
-# if OPENSSL_USE_IPV6
+#if OPENSSL_USE_IPV6
else if (af == AF_INET6) {
if (cmsg->cmsg_level != IPPROTO_IPV6)
continue;
-# if defined(IPV6_RECVPKTINFO)
+#if defined(IPV6_RECVPKTINFO)
if (cmsg->cmsg_type != IPV6_PKTINFO)
continue;
{
bio_dgram_data *data = b->ptr;
- local->s_in6.sin6_addr =
- ((struct in6_pktinfo *)BIO_CMSG_DATA(cmsg))->ipi6_addr;
- local->s_in6.sin6_family = AF_INET6;
- local->s_in6.sin6_port = data->local_addr.s_in6.sin6_port;
- local->s_in6.sin6_scope_id =
- data->local_addr.s_in6.sin6_scope_id;
+ local->s_in6.sin6_addr = ((struct in6_pktinfo *)BIO_CMSG_DATA(cmsg))->ipi6_addr;
+ local->s_in6.sin6_family = AF_INET6;
+ local->s_in6.sin6_port = data->local_addr.s_in6.sin6_port;
+ local->s_in6.sin6_scope_id = data->local_addr.s_in6.sin6_scope_id;
local->s_in6.sin6_flowinfo = 0;
}
return 1;
-# endif
+#endif
}
-# endif
+#endif
}
-# endif
+#endif
return 0;
}
-static int pack_local(BIO *b, MSGHDR_TYPE *mh, const BIO_ADDR *local) {
+static int pack_local(BIO *b, MSGHDR_TYPE *mh, const BIO_ADDR *local)
+{
int af = dgram_get_sock_family(b);
-# if defined(IP_PKTINFO) || defined(IP_RECVDSTADDR) || defined(IPV6_PKTINFO)
+#if defined(IP_PKTINFO) || defined(IP_RECVDSTADDR) || defined(IPV6_PKTINFO)
CMSGHDR_TYPE *cmsg;
bio_dgram_data *data = b->ptr;
-# endif
+#endif
if (af == AF_INET) {
-# if defined(IP_PKTINFO)
+#if defined(IP_PKTINFO)
struct in_pktinfo *info;
-# if defined(OPENSSL_SYS_WINDOWS)
+#if defined(OPENSSL_SYS_WINDOWS)
cmsg = (CMSGHDR_TYPE *)mh->Control.buf;
-# else
+#else
cmsg = (CMSGHDR_TYPE *)mh->msg_control;
-# endif
+#endif
- cmsg->cmsg_len = BIO_CMSG_LEN(sizeof(struct in_pktinfo));
+ cmsg->cmsg_len = BIO_CMSG_LEN(sizeof(struct in_pktinfo));
cmsg->cmsg_level = IPPROTO_IP;
- cmsg->cmsg_type = IP_PKTINFO;
+ cmsg->cmsg_type = IP_PKTINFO;
info = (struct in_pktinfo *)BIO_CMSG_DATA(cmsg);
-# if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_CYGWIN) && !defined(__FreeBSD__) && !defined(__QNX__)
- info->ipi_spec_dst = local->s_in.sin_addr;
-# endif
- info->ipi_addr.s_addr = 0;
- info->ipi_ifindex = 0;
+#if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_CYGWIN) && !defined(__FreeBSD__) && !defined(__QNX__)
+ info->ipi_spec_dst = local->s_in.sin_addr;
+#endif
+ info->ipi_addr.s_addr = 0;
+ info->ipi_ifindex = 0;
/*
* We cannot override source port using this API, therefore
@@ -1212,14 +1220,14 @@ static int pack_local(BIO *b, MSGHDR_TYPE *mh, const BIO_ADDR *local) {
return 0;
}
-# if defined(OPENSSL_SYS_WINDOWS)
+#if defined(OPENSSL_SYS_WINDOWS)
mh->Control.len = BIO_CMSG_SPACE(sizeof(struct in_pktinfo));
-# else
+#else
mh->msg_controllen = BIO_CMSG_SPACE(sizeof(struct in_pktinfo));
-# endif
+#endif
return 1;
-# elif defined(IP_SENDSRCADDR)
+#elif defined(IP_SENDSRCADDR)
struct in_addr *info;
/*
@@ -1230,15 +1238,15 @@ static int pack_local(BIO *b, MSGHDR_TYPE *mh, const BIO_ADDR *local) {
* BSD thing, so we don't need an explicit test for BSD here.
*/
if (local->s_in.sin_addr.s_addr == data->local_addr.s_in.sin_addr.s_addr) {
- mh->msg_control = NULL;
+ mh->msg_control = NULL;
mh->msg_controllen = 0;
return 1;
}
cmsg = (struct cmsghdr *)mh->msg_control;
- cmsg->cmsg_len = BIO_CMSG_LEN(sizeof(struct in_addr));
+ cmsg->cmsg_len = BIO_CMSG_LEN(sizeof(struct in_addr));
cmsg->cmsg_level = IPPROTO_IP;
- cmsg->cmsg_type = IP_SENDSRCADDR;
+ cmsg->cmsg_type = IP_SENDSRCADDR;
info = (struct in_addr *)BIO_CMSG_DATA(cmsg);
*info = local->s_in.sin_addr;
@@ -1252,25 +1260,25 @@ static int pack_local(BIO *b, MSGHDR_TYPE *mh, const BIO_ADDR *local) {
mh->msg_controllen = BIO_CMSG_SPACE(sizeof(struct in_addr));
return 1;
-# endif
+#endif
}
-# if OPENSSL_USE_IPV6
+#if OPENSSL_USE_IPV6
else if (af == AF_INET6) {
-# if defined(IPV6_PKTINFO)
+#if defined(IPV6_PKTINFO)
struct in6_pktinfo *info;
-# if defined(OPENSSL_SYS_WINDOWS)
+#if defined(OPENSSL_SYS_WINDOWS)
cmsg = (CMSGHDR_TYPE *)mh->Control.buf;
-# else
+#else
cmsg = (CMSGHDR_TYPE *)mh->msg_control;
-# endif
- cmsg->cmsg_len = BIO_CMSG_LEN(sizeof(struct in6_pktinfo));
+#endif
+ cmsg->cmsg_len = BIO_CMSG_LEN(sizeof(struct in6_pktinfo));
cmsg->cmsg_level = IPPROTO_IPV6;
- cmsg->cmsg_type = IPV6_PKTINFO;
+ cmsg->cmsg_type = IPV6_PKTINFO;
info = (struct in6_pktinfo *)BIO_CMSG_DATA(cmsg);
- info->ipi6_addr = local->s_in6.sin6_addr;
- info->ipi6_ifindex = 0;
+ info->ipi6_addr = local->s_in6.sin6_addr;
+ info->ipi6_ifindex = 0;
/*
* See comment above, but also applies to the other fields
@@ -1288,39 +1296,40 @@ static int pack_local(BIO *b, MSGHDR_TYPE *mh, const BIO_ADDR *local) {
return 0;
}
-# if defined(OPENSSL_SYS_WINDOWS)
+#if defined(OPENSSL_SYS_WINDOWS)
mh->Control.len = BIO_CMSG_SPACE(sizeof(struct in6_pktinfo));
-# else
+#else
mh->msg_controllen = BIO_CMSG_SPACE(sizeof(struct in6_pktinfo));
-# endif
+#endif
return 1;
-# endif
+#endif
}
-# endif
+#endif
return 0;
}
-# endif
+#endif
/*
* Converts flags passed to BIO_sendmmsg or BIO_recvmmsg to syscall flags. You
* should mask out any system flags returned by this function you cannot support
* in a particular circumstance. Currently no flags are defined.
*/
-# if M_METHOD != M_METHOD_NONE
-static int translate_flags(uint64_t flags) {
+#if M_METHOD != M_METHOD_NONE
+static int translate_flags(uint64_t flags)
+{
return 0;
}
-# endif
+#endif
static int dgram_sendmmsg(BIO *b, BIO_MSG *msg, size_t stride,
- size_t num_msg, uint64_t flags, size_t *num_processed)
+ size_t num_msg, uint64_t flags, size_t *num_processed)
{
-# if M_METHOD != M_METHOD_NONE && M_METHOD != M_METHOD_RECVMSG
+#if M_METHOD != M_METHOD_NONE && M_METHOD != M_METHOD_RECVMSG
int ret;
-# endif
-# if M_METHOD == M_METHOD_RECVMMSG
-# define BIO_MAX_MSGS_PER_CALL 64
+#endif
+#if M_METHOD == M_METHOD_RECVMMSG
+#define BIO_MAX_MSGS_PER_CALL 64
int sysflags;
bio_dgram_data *data = (bio_dgram_data *)b->ptr;
size_t i;
@@ -1328,7 +1337,7 @@ static int dgram_sendmmsg(BIO *b, BIO_MSG *msg, size_t stride,
struct iovec iov[BIO_MAX_MSGS_PER_CALL];
unsigned char control[BIO_MAX_MSGS_PER_CALL][BIO_CMSG_ALLOC_LEN];
int have_local_enabled = data->local_addr_enabled;
-# elif M_METHOD == M_METHOD_RECVMSG
+#elif M_METHOD == M_METHOD_RECVMSG
int sysflags;
bio_dgram_data *data = (bio_dgram_data *)b->ptr;
ossl_ssize_t l;
@@ -1336,17 +1345,17 @@ static int dgram_sendmmsg(BIO *b, BIO_MSG *msg, size_t stride,
struct iovec iov;
unsigned char control[BIO_CMSG_ALLOC_LEN];
int have_local_enabled = data->local_addr_enabled;
-# elif M_METHOD == M_METHOD_WSARECVMSG
+#elif M_METHOD == M_METHOD_WSARECVMSG
bio_dgram_data *data = (bio_dgram_data *)b->ptr;
int have_local_enabled = data->local_addr_enabled;
WSAMSG wmsg;
WSABUF wbuf;
DWORD num_bytes_sent = 0;
unsigned char control[BIO_CMSG_ALLOC_LEN];
-# endif
-# if M_METHOD == M_METHOD_RECVFROM || M_METHOD == M_METHOD_WSARECVMSG
+#endif
+#if M_METHOD == M_METHOD_RECVFROM || M_METHOD == M_METHOD_WSARECVMSG
int sysflags;
-# endif
+#endif
if (num_msg == 0) {
*num_processed = 0;
@@ -1356,11 +1365,11 @@ static int dgram_sendmmsg(BIO *b, BIO_MSG *msg, size_t stride,
if (num_msg > OSSL_SSIZE_MAX)
num_msg = OSSL_SSIZE_MAX;
-# if M_METHOD != M_METHOD_NONE
+#if M_METHOD != M_METHOD_NONE
sysflags = translate_flags(flags);
-# endif
+#endif
-# if M_METHOD == M_METHOD_RECVMMSG
+#if M_METHOD == M_METHOD_RECVMMSG
/*
* In the sendmmsg/recvmmsg case, we need to allocate our translated struct
* msghdr and struct iovec on the stack to support multithreaded use. Thus
@@ -1373,7 +1382,7 @@ static int dgram_sendmmsg(BIO *b, BIO_MSG *msg, size_t stride,
for (i = 0; i < num_msg; ++i) {
translate_msg(b, &mh[i].msg_hdr, &iov[i],
- control[i], &BIO_MSG_N(msg, stride, i));
+ control[i], &BIO_MSG_N(msg, stride, i));
/* If local address was requested, it must have been enabled */
if (BIO_MSG_N(msg, stride, i).local != NULL) {
@@ -1384,7 +1393,8 @@ static int dgram_sendmmsg(BIO *b, BIO_MSG *msg, size_t stride,
}
if (pack_local(b, &mh[i].msg_hdr,
- BIO_MSG_N(msg, stride, i).local) < 1) {
+ BIO_MSG_N(msg, stride, i).local)
+ < 1) {
ERR_raise(ERR_LIB_BIO, BIO_R_LOCAL_ADDR_NOT_AVAILABLE);
*num_processed = 0;
return 0;
@@ -1402,13 +1412,13 @@ static int dgram_sendmmsg(BIO *b, BIO_MSG *msg, size_t stride,
for (i = 0; i < (size_t)ret; ++i) {
BIO_MSG_N(msg, stride, i).data_len = mh[i].msg_len;
- BIO_MSG_N(msg, stride, i).flags = 0;
+ BIO_MSG_N(msg, stride, i).flags = 0;
}
*num_processed = (size_t)ret;
return 1;
-# elif M_METHOD == M_METHOD_RECVMSG
+#elif M_METHOD == M_METHOD_RECVMSG
/*
* If sendmsg is available, use it.
*/
@@ -1435,13 +1445,13 @@ static int dgram_sendmmsg(BIO *b, BIO_MSG *msg, size_t stride,
return 0;
}
- msg->data_len = (size_t)l;
- msg->flags = 0;
- *num_processed = 1;
+ msg->data_len = (size_t)l;
+ msg->flags = 0;
+ *num_processed = 1;
return 1;
-# elif M_METHOD == M_METHOD_WSARECVMSG || M_METHOD == M_METHOD_RECVFROM
-# if M_METHOD == M_METHOD_WSARECVMSG
+#elif M_METHOD == M_METHOD_WSARECVMSG || M_METHOD == M_METHOD_RECVFROM
+#if M_METHOD == M_METHOD_WSARECVMSG
if (bio_WSASendMsg != NULL) {
/* WSASendMsg-based implementation for Windows. */
translate_msg_win(b, &wmsg, &wbuf, control, msg);
@@ -1468,11 +1478,11 @@ static int dgram_sendmmsg(BIO *b, BIO_MSG *msg, size_t stride,
}
msg[0].data_len = num_bytes_sent;
- msg[0].flags = 0;
- *num_processed = 1;
+ msg[0].flags = 0;
+ *num_processed = 1;
return 1;
}
-# endif
+#endif
/*
* Fallback to sendto and send a single message.
@@ -1488,14 +1498,14 @@ static int dgram_sendmmsg(BIO *b, BIO_MSG *msg, size_t stride,
}
ret = sendto(b->num, msg[0].data,
-# if defined(OPENSSL_SYS_WINDOWS)
- (int)msg[0].data_len,
-# else
- msg[0].data_len,
-# endif
- sysflags,
- msg[0].peer != NULL ? BIO_ADDR_sockaddr(msg[0].peer) : NULL,
- msg[0].peer != NULL ? BIO_ADDR_sockaddr_size(msg[0].peer) : 0);
+#if defined(OPENSSL_SYS_WINDOWS)
+ (int)msg[0].data_len,
+#else
+ msg[0].data_len,
+#endif
+ sysflags,
+ msg[0].peer != NULL ? BIO_ADDR_sockaddr(msg[0].peer) : NULL,
+ msg[0].peer != NULL ? BIO_ADDR_sockaddr_size(msg[0].peer) : 0);
if (ret <= 0) {
ERR_raise(ERR_LIB_SYS, get_last_socket_error());
*num_processed = 0;
@@ -1503,25 +1513,25 @@ static int dgram_sendmmsg(BIO *b, BIO_MSG *msg, size_t stride,
}
msg[0].data_len = ret;
- msg[0].flags = 0;
- *num_processed = 1;
+ msg[0].flags = 0;
+ *num_processed = 1;
return 1;
-# else
+#else
ERR_raise(ERR_LIB_BIO, BIO_R_UNSUPPORTED_METHOD);
*num_processed = 0;
return 0;
-# endif
+#endif
}
static int dgram_recvmmsg(BIO *b, BIO_MSG *msg,
- size_t stride, size_t num_msg,
- uint64_t flags, size_t *num_processed)
+ size_t stride, size_t num_msg,
+ uint64_t flags, size_t *num_processed)
{
-# if M_METHOD != M_METHOD_NONE && M_METHOD != M_METHOD_RECVMSG
+#if M_METHOD != M_METHOD_NONE && M_METHOD != M_METHOD_RECVMSG
int ret;
-# endif
-# if M_METHOD == M_METHOD_RECVMMSG
+#endif
+#if M_METHOD == M_METHOD_RECVMMSG
int sysflags;
bio_dgram_data *data = (bio_dgram_data *)b->ptr;
size_t i;
@@ -1529,7 +1539,7 @@ static int dgram_recvmmsg(BIO *b, BIO_MSG *msg,
struct iovec iov[BIO_MAX_MSGS_PER_CALL];
unsigned char control[BIO_MAX_MSGS_PER_CALL][BIO_CMSG_ALLOC_LEN];
int have_local_enabled = data->local_addr_enabled;
-# elif M_METHOD == M_METHOD_RECVMSG
+#elif M_METHOD == M_METHOD_RECVMSG
int sysflags;
bio_dgram_data *data = (bio_dgram_data *)b->ptr;
ossl_ssize_t l;
@@ -1537,18 +1547,18 @@ static int dgram_recvmmsg(BIO *b, BIO_MSG *msg,
struct iovec iov;
unsigned char control[BIO_CMSG_ALLOC_LEN];
int have_local_enabled = data->local_addr_enabled;
-# elif M_METHOD == M_METHOD_WSARECVMSG
+#elif M_METHOD == M_METHOD_WSARECVMSG
bio_dgram_data *data = (bio_dgram_data *)b->ptr;
int have_local_enabled = data->local_addr_enabled;
WSAMSG wmsg;
WSABUF wbuf;
DWORD num_bytes_received = 0;
unsigned char control[BIO_CMSG_ALLOC_LEN];
-# endif
-# if M_METHOD == M_METHOD_RECVFROM || M_METHOD == M_METHOD_WSARECVMSG
+#endif
+#if M_METHOD == M_METHOD_RECVFROM || M_METHOD == M_METHOD_WSARECVMSG
int sysflags;
socklen_t slen;
-# endif
+#endif
if (num_msg == 0) {
*num_processed = 0;
@@ -1558,11 +1568,11 @@ static int dgram_recvmmsg(BIO *b, BIO_MSG *msg,
if (num_msg > OSSL_SSIZE_MAX)
num_msg = OSSL_SSIZE_MAX;
-# if M_METHOD != M_METHOD_NONE
+#if M_METHOD != M_METHOD_NONE
sysflags = translate_flags(flags);
-# endif
+#endif
-# if M_METHOD == M_METHOD_RECVMMSG
+#if M_METHOD == M_METHOD_RECVMMSG
/*
* In the sendmmsg/recvmmsg case, we need to allocate our translated struct
* msghdr and struct iovec on the stack to support multithreaded use. Thus
@@ -1575,7 +1585,7 @@ static int dgram_recvmmsg(BIO *b, BIO_MSG *msg,
for (i = 0; i < num_msg; ++i) {
translate_msg(b, &mh[i].msg_hdr, &iov[i],
- control[i], &BIO_MSG_N(msg, stride, i));
+ control[i], &BIO_MSG_N(msg, stride, i));
/* If local address was requested, it must have been enabled */
if (BIO_MSG_N(msg, stride, i).local != NULL && !have_local_enabled) {
@@ -1595,14 +1605,15 @@ static int dgram_recvmmsg(BIO *b, BIO_MSG *msg,
for (i = 0; i < (size_t)ret; ++i) {
BIO_MSG_N(msg, stride, i).data_len = mh[i].msg_len;
- BIO_MSG_N(msg, stride, i).flags = 0;
+ BIO_MSG_N(msg, stride, i).flags = 0;
/*
* *(msg->peer) will have been filled in by recvmmsg;
* for msg->local we parse the control data returned
*/
if (BIO_MSG_N(msg, stride, i).local != NULL)
if (extract_local(b, &mh[i].msg_hdr,
- BIO_MSG_N(msg, stride, i).local) < 1)
+ BIO_MSG_N(msg, stride, i).local)
+ < 1)
/*
* It appears BSDs do not support local addresses for
* loopback sockets. In this case, just clear the local
@@ -1615,7 +1626,7 @@ static int dgram_recvmmsg(BIO *b, BIO_MSG *msg,
*num_processed = (size_t)ret;
return 1;
-# elif M_METHOD == M_METHOD_RECVMSG
+#elif M_METHOD == M_METHOD_RECVMSG
/*
* If recvmsg is available, use it.
*/
@@ -1639,8 +1650,8 @@ static int dgram_recvmmsg(BIO *b, BIO_MSG *msg,
return 0;
}
- msg->data_len = (size_t)l;
- msg->flags = 0;
+ msg->data_len = (size_t)l;
+ msg->flags = 0;
if (msg->local != NULL)
if (extract_local(b, &mh, msg->local) < 1)
@@ -1670,8 +1681,8 @@ static int dgram_recvmmsg(BIO *b, BIO_MSG *msg,
*num_processed = 1;
return 1;
-# elif M_METHOD == M_METHOD_RECVFROM || M_METHOD == M_METHOD_WSARECVMSG
-# if M_METHOD == M_METHOD_WSARECVMSG
+#elif M_METHOD == M_METHOD_RECVFROM || M_METHOD == M_METHOD_WSARECVMSG
+#if M_METHOD == M_METHOD_WSARECVMSG
if (bio_WSARecvMsg != NULL) {
/* WSARecvMsg-based implementation for Windows. */
translate_msg_win(b, &wmsg, &wbuf, control, msg);
@@ -1691,7 +1702,7 @@ static int dgram_recvmmsg(BIO *b, BIO_MSG *msg,
}
msg[0].data_len = num_bytes_received;
- msg[0].flags = 0;
+ msg[0].flags = 0;
if (msg[0].local != NULL)
if (extract_local(b, &wmsg, msg[0].local) < 1)
/*
@@ -1715,7 +1726,7 @@ static int dgram_recvmmsg(BIO *b, BIO_MSG *msg,
*num_processed = 1;
return 1;
}
-# endif
+#endif
/*
* Fallback to recvfrom and receive a single message.
@@ -1732,14 +1743,14 @@ static int dgram_recvmmsg(BIO *b, BIO_MSG *msg,
slen = sizeof(*msg[0].peer);
ret = recvfrom(b->num, msg[0].data,
-# if defined(OPENSSL_SYS_WINDOWS)
- (int)msg[0].data_len,
-# else
- msg[0].data_len,
-# endif
- sysflags,
- msg[0].peer != NULL ? &msg[0].peer->sa : NULL,
- msg[0].peer != NULL ? &slen : NULL);
+#if defined(OPENSSL_SYS_WINDOWS)
+ (int)msg[0].data_len,
+#else
+ msg[0].data_len,
+#endif
+ sysflags,
+ msg[0].peer != NULL ? &msg[0].peer->sa : NULL,
+ msg[0].peer != NULL ? &slen : NULL);
if (ret <= 0) {
ERR_raise(ERR_LIB_SYS, get_last_socket_error());
*num_processed = 0;
@@ -1747,18 +1758,18 @@ static int dgram_recvmmsg(BIO *b, BIO_MSG *msg,
}
msg[0].data_len = ret;
- msg[0].flags = 0;
+ msg[0].flags = 0;
*num_processed = 1;
return 1;
-# else
+#else
ERR_raise(ERR_LIB_BIO, BIO_R_UNSUPPORTED_METHOD);
*num_processed = 0;
return 0;
-# endif
+#endif
}
-# ifndef OPENSSL_NO_SCTP
+#ifndef OPENSSL_NO_SCTP
const BIO_METHOD *BIO_s_datagram_sctp(void)
{
return &methods_dgramp_sctp;
@@ -1773,13 +1784,13 @@ BIO *BIO_new_dgram_sctp(int fd, int close_flag)
struct sctp_authchunk auth;
struct sctp_authchunks *authchunks;
socklen_t sockopt_len;
-# ifdef SCTP_AUTHENTICATION_EVENT
-# ifdef SCTP_EVENT
+#ifdef SCTP_AUTHENTICATION_EVENT
+#ifdef SCTP_EVENT
struct sctp_event event;
-# else
+#else
struct sctp_event_subscribe event;
-# endif
-# endif
+#endif
+#endif
bio = BIO_new(BIO_s_datagram_sctp());
if (bio == NULL)
@@ -1788,23 +1799,21 @@ BIO *BIO_new_dgram_sctp(int fd, int close_flag)
/* Activate SCTP-AUTH for DATA and FORWARD-TSN chunks */
auth.sauth_chunk = OPENSSL_SCTP_DATA_CHUNK_TYPE;
- ret =
- setsockopt(fd, IPPROTO_SCTP, SCTP_AUTH_CHUNK, &auth,
- sizeof(struct sctp_authchunk));
+ ret = setsockopt(fd, IPPROTO_SCTP, SCTP_AUTH_CHUNK, &auth,
+ sizeof(struct sctp_authchunk));
if (ret < 0) {
BIO_vfree(bio);
ERR_raise_data(ERR_LIB_BIO, ERR_R_SYS_LIB,
- "Ensure SCTP AUTH chunks are enabled in kernel");
+ "Ensure SCTP AUTH chunks are enabled in kernel");
return NULL;
}
auth.sauth_chunk = OPENSSL_SCTP_FORWARD_CUM_TSN_CHUNK_TYPE;
- ret =
- setsockopt(fd, IPPROTO_SCTP, SCTP_AUTH_CHUNK, &auth,
- sizeof(struct sctp_authchunk));
+ ret = setsockopt(fd, IPPROTO_SCTP, SCTP_AUTH_CHUNK, &auth,
+ sizeof(struct sctp_authchunk));
if (ret < 0) {
BIO_vfree(bio);
ERR_raise_data(ERR_LIB_BIO, ERR_R_SYS_LIB,
- "Ensure SCTP AUTH chunks are enabled in kernel");
+ "Ensure SCTP AUTH chunks are enabled in kernel");
return NULL;
}
@@ -1814,14 +1823,14 @@ BIO *BIO_new_dgram_sctp(int fd, int close_flag)
* connected socket won't use it. Similarly with connect(): the socket
* prior to connection must be activated for SCTP-AUTH
*/
- sockopt_len = (socklen_t) (sizeof(sctp_assoc_t) + 256 * sizeof(uint8_t));
+ sockopt_len = (socklen_t)(sizeof(sctp_assoc_t) + 256 * sizeof(uint8_t));
authchunks = OPENSSL_zalloc(sockopt_len);
if (authchunks == NULL) {
BIO_vfree(bio);
return NULL;
}
ret = getsockopt(fd, IPPROTO_SCTP, SCTP_LOCAL_AUTH_CHUNKS, authchunks,
- &sockopt_len);
+ &sockopt_len);
if (ret < 0) {
OPENSSL_free(authchunks);
BIO_vfree(bio);
@@ -1829,8 +1838,8 @@ BIO *BIO_new_dgram_sctp(int fd, int close_flag)
}
for (p = (unsigned char *)authchunks->gauth_chunks;
- p < (unsigned char *)authchunks + sockopt_len;
- p += sizeof(uint8_t)) {
+ p < (unsigned char *)authchunks + sockopt_len;
+ p += sizeof(uint8_t)) {
if (*p == OPENSSL_SCTP_DATA_CHUNK_TYPE)
auth_data = 1;
if (*p == OPENSSL_SCTP_FORWARD_CUM_TSN_CHUNK_TYPE)
@@ -1842,26 +1851,25 @@ BIO *BIO_new_dgram_sctp(int fd, int close_flag)
if (!auth_data || !auth_forward) {
BIO_vfree(bio);
ERR_raise_data(ERR_LIB_BIO, ERR_R_SYS_LIB,
- "Ensure SCTP AUTH chunks are enabled on the "
- "underlying socket");
+ "Ensure SCTP AUTH chunks are enabled on the "
+ "underlying socket");
return NULL;
}
-# ifdef SCTP_AUTHENTICATION_EVENT
-# ifdef SCTP_EVENT
+#ifdef SCTP_AUTHENTICATION_EVENT
+#ifdef SCTP_EVENT
memset(&event, 0, sizeof(event));
event.se_assoc_id = 0;
event.se_type = SCTP_AUTHENTICATION_EVENT;
event.se_on = 1;
- ret =
- setsockopt(fd, IPPROTO_SCTP, SCTP_EVENT, &event,
- sizeof(struct sctp_event));
+ ret = setsockopt(fd, IPPROTO_SCTP, SCTP_EVENT, &event,
+ sizeof(struct sctp_event));
if (ret < 0) {
BIO_vfree(bio);
return NULL;
}
-# else
- sockopt_len = (socklen_t) sizeof(struct sctp_event_subscribe);
+#else
+ sockopt_len = (socklen_t)sizeof(struct sctp_event_subscribe);
ret = getsockopt(fd, IPPROTO_SCTP, SCTP_EVENTS, &event, &sockopt_len);
if (ret < 0) {
BIO_vfree(bio);
@@ -1870,23 +1878,21 @@ BIO *BIO_new_dgram_sctp(int fd, int close_flag)
event.sctp_authentication_event = 1;
- ret =
- setsockopt(fd, IPPROTO_SCTP, SCTP_EVENTS, &event,
- sizeof(struct sctp_event_subscribe));
+ ret = setsockopt(fd, IPPROTO_SCTP, SCTP_EVENTS, &event,
+ sizeof(struct sctp_event_subscribe));
if (ret < 0) {
BIO_vfree(bio);
return NULL;
}
-# endif
-# endif
+#endif
+#endif
/*
* Disable partial delivery by setting the min size larger than the max
* record size of 2^14 + 2048 + 13
*/
- ret =
- setsockopt(fd, IPPROTO_SCTP, SCTP_PARTIAL_DELIVERY_POINT, &optval,
- sizeof(optval));
+ ret = setsockopt(fd, IPPROTO_SCTP, SCTP_PARTIAL_DELIVERY_POINT, &optval,
+ sizeof(optval));
if (ret < 0) {
BIO_vfree(bio);
return NULL;
@@ -1908,9 +1914,9 @@ static int dgram_sctp_new(BIO *bi)
bi->num = 0;
if ((data = OPENSSL_zalloc(sizeof(*data))) == NULL)
return 0;
-# ifdef SCTP_PR_SCTP_NONE
+#ifdef SCTP_PR_SCTP_NONE
data->prinfo.pr_policy = SCTP_PR_SCTP_NONE;
-# endif
+#endif
bi->ptr = data;
bi->flags = 0;
@@ -1926,16 +1932,16 @@ static int dgram_sctp_free(BIO *a)
if (!dgram_clear(a))
return 0;
- data = (bio_dgram_sctp_data *) a->ptr;
+ data = (bio_dgram_sctp_data *)a->ptr;
if (data != NULL)
OPENSSL_free(data);
return 1;
}
-# ifdef SCTP_AUTHENTICATION_EVENT
+#ifdef SCTP_AUTHENTICATION_EVENT
void dgram_sctp_handle_auth_free_key_event(BIO *b,
- union sctp_notification *snp)
+ union sctp_notification *snp)
{
int ret;
struct sctp_authkey_event *authkeyevent = &snp->sn_auth_event;
@@ -1946,16 +1952,16 @@ void dgram_sctp_handle_auth_free_key_event(BIO *b,
/* delete key */
authkeyid.scact_keynumber = authkeyevent->auth_keynumber;
ret = setsockopt(b->num, IPPROTO_SCTP, SCTP_AUTH_DELETE_KEY,
- &authkeyid, sizeof(struct sctp_authkeyid));
+ &authkeyid, sizeof(struct sctp_authkeyid));
}
}
-# endif
+#endif
static int dgram_sctp_read(BIO *b, char *out, int outl)
{
int ret = 0, n = 0, i, optval;
socklen_t optlen;
- bio_dgram_sctp_data *data = (bio_dgram_sctp_data *) b->ptr;
+ bio_dgram_sctp_data *data = (bio_dgram_sctp_data *)b->ptr;
struct msghdr msg;
struct iovec iov;
struct cmsghdr *cmsg;
@@ -1985,10 +1991,10 @@ static int dgram_sctp_read(BIO *b, char *out, int outl)
if (msg.msg_controllen > 0) {
for (cmsg = CMSG_FIRSTHDR(&msg); cmsg;
- cmsg = CMSG_NXTHDR(&msg, cmsg)) {
+ cmsg = CMSG_NXTHDR(&msg, cmsg)) {
if (cmsg->cmsg_level != IPPROTO_SCTP)
continue;
-# ifdef SCTP_RCVINFO
+#ifdef SCTP_RCVINFO
if (cmsg->cmsg_type == SCTP_RCVINFO) {
struct sctp_rcvinfo *rcvinfo;
@@ -2001,13 +2007,12 @@ static int dgram_sctp_read(BIO *b, char *out, int outl)
data->rcvinfo.rcv_cumtsn = rcvinfo->rcv_cumtsn;
data->rcvinfo.rcv_context = rcvinfo->rcv_context;
}
-# endif
-# ifdef SCTP_SNDRCV
+#endif
+#ifdef SCTP_SNDRCV
if (cmsg->cmsg_type == SCTP_SNDRCV) {
struct sctp_sndrcvinfo *sndrcvinfo;
- sndrcvinfo =
- (struct sctp_sndrcvinfo *)CMSG_DATA(cmsg);
+ sndrcvinfo = (struct sctp_sndrcvinfo *)CMSG_DATA(cmsg);
data->rcvinfo.rcv_sid = sndrcvinfo->sinfo_stream;
data->rcvinfo.rcv_ssn = sndrcvinfo->sinfo_ssn;
data->rcvinfo.rcv_flags = sndrcvinfo->sinfo_flags;
@@ -2016,7 +2021,7 @@ static int dgram_sctp_read(BIO *b, char *out, int outl)
data->rcvinfo.rcv_cumtsn = sndrcvinfo->sinfo_cumtsn;
data->rcvinfo.rcv_context = sndrcvinfo->sinfo_context;
}
-# endif
+#endif
}
}
@@ -2028,29 +2033,29 @@ static int dgram_sctp_read(BIO *b, char *out, int outl)
memset(&snp, 0, sizeof(snp));
memcpy(&snp, out, (size_t)n < sizeof(snp) ? (size_t)n : sizeof(snp));
if (snp.sn_header.sn_type == SCTP_SENDER_DRY_EVENT) {
-# ifdef SCTP_EVENT
+#ifdef SCTP_EVENT
struct sctp_event event;
-# else
+#else
struct sctp_event_subscribe event;
socklen_t eventsize;
-# endif
+#endif
/* disable sender dry event */
-# ifdef SCTP_EVENT
+#ifdef SCTP_EVENT
memset(&event, 0, sizeof(event));
event.se_assoc_id = 0;
event.se_type = SCTP_SENDER_DRY_EVENT;
event.se_on = 0;
i = setsockopt(b->num, IPPROTO_SCTP, SCTP_EVENT, &event,
- sizeof(struct sctp_event));
+ sizeof(struct sctp_event));
if (i < 0) {
ret = i;
break;
}
-# else
+#else
eventsize = sizeof(struct sctp_event_subscribe);
i = getsockopt(b->num, IPPROTO_SCTP, SCTP_EVENTS, &event,
- &eventsize);
+ &eventsize);
if (i < 0) {
ret = i;
break;
@@ -2059,29 +2064,28 @@ static int dgram_sctp_read(BIO *b, char *out, int outl)
event.sctp_sender_dry_event = 0;
i = setsockopt(b->num, IPPROTO_SCTP, SCTP_EVENTS, &event,
- sizeof(struct sctp_event_subscribe));
+ sizeof(struct sctp_event_subscribe));
if (i < 0) {
ret = i;
break;
}
-# endif
+#endif
}
-# ifdef SCTP_AUTHENTICATION_EVENT
+#ifdef SCTP_AUTHENTICATION_EVENT
if (snp.sn_header.sn_type == SCTP_AUTHENTICATION_EVENT)
dgram_sctp_handle_auth_free_key_event(b, &snp);
-# endif
+#endif
if (data->handle_notifications != NULL)
data->handle_notifications(b, data->notification_context,
- (void *)out);
+ (void *)out);
memset(out, 0, outl);
} else {
ret += n;
}
- }
- while ((msg.msg_flags & MSG_NOTIFICATION) && (msg.msg_flags & MSG_EOR)
- && (ret < outl));
+ } while ((msg.msg_flags & MSG_NOTIFICATION) && (msg.msg_flags & MSG_EOR)
+ && (ret < outl));
if (ret > 0 && !(msg.msg_flags & MSG_EOR)) {
/* Partial message read, this should never happen! */
@@ -2097,7 +2101,7 @@ static int dgram_sctp_read(BIO *b, char *out, int outl)
* Test if socket buffer can handle max record size (2^14 + 2048
* + 13)
*/
- optlen = (socklen_t) sizeof(int);
+ optlen = (socklen_t)sizeof(int);
ret = getsockopt(b->num, SOL_SOCKET, SO_RCVBUF, &optval, &optlen);
if (ret >= 0 && !ossl_assert(optval >= 18445))
return -1;
@@ -2106,10 +2110,9 @@ static int dgram_sctp_read(BIO *b, char *out, int outl)
* Test if SCTP doesn't partially deliver below max record size
* (2^14 + 2048 + 13)
*/
- optlen = (socklen_t) sizeof(int);
- ret =
- getsockopt(b->num, IPPROTO_SCTP, SCTP_PARTIAL_DELIVERY_POINT,
- &optval, &optlen);
+ optlen = (socklen_t)sizeof(int);
+ ret = getsockopt(b->num, IPPROTO_SCTP, SCTP_PARTIAL_DELIVERY_POINT,
+ &optval, &optlen);
if (ret >= 0 && !ossl_assert(optval >= 18445))
return -1;
@@ -2142,19 +2145,18 @@ static int dgram_sctp_read(BIO *b, char *out, int outl)
unsigned char *p;
struct sctp_authchunks *authchunks;
- optlen =
- (socklen_t) (sizeof(sctp_assoc_t) + 256 * sizeof(uint8_t));
+ optlen = (socklen_t)(sizeof(sctp_assoc_t) + 256 * sizeof(uint8_t));
authchunks = OPENSSL_malloc(optlen);
if (authchunks == NULL)
return -1;
memset(authchunks, 0, optlen);
ii = getsockopt(b->num, IPPROTO_SCTP, SCTP_PEER_AUTH_CHUNKS,
- authchunks, &optlen);
+ authchunks, &optlen);
if (ii >= 0)
for (p = (unsigned char *)authchunks->gauth_chunks;
- p < (unsigned char *)authchunks + optlen;
- p += sizeof(uint8_t)) {
+ p < (unsigned char *)authchunks + optlen;
+ p += sizeof(uint8_t)) {
if (*p == OPENSSL_SCTP_DATA_CHUNK_TYPE)
auth_data = 1;
if (*p == OPENSSL_SCTP_FORWARD_CUM_TSN_CHUNK_TYPE)
@@ -2185,22 +2187,21 @@ static int dgram_sctp_read(BIO *b, char *out, int outl)
static int dgram_sctp_write(BIO *b, const char *in, int inl)
{
int ret;
- bio_dgram_sctp_data *data = (bio_dgram_sctp_data *) b->ptr;
+ bio_dgram_sctp_data *data = (bio_dgram_sctp_data *)b->ptr;
struct bio_dgram_sctp_sndinfo *sinfo = &(data->sndinfo);
struct bio_dgram_sctp_prinfo *pinfo = &(data->prinfo);
struct bio_dgram_sctp_sndinfo handshake_sinfo;
struct iovec iov[1];
struct msghdr msg;
struct cmsghdr *cmsg;
-# if defined(SCTP_SNDINFO) && defined(SCTP_PRINFO)
- char cmsgbuf[CMSG_SPACE(sizeof(struct sctp_sndinfo)) +
- CMSG_SPACE(sizeof(struct sctp_prinfo))];
+#if defined(SCTP_SNDINFO) && defined(SCTP_PRINFO)
+ char cmsgbuf[CMSG_SPACE(sizeof(struct sctp_sndinfo)) + CMSG_SPACE(sizeof(struct sctp_prinfo))];
struct sctp_sndinfo *sndinfo;
struct sctp_prinfo *prinfo;
-# else
+#else
char cmsgbuf[CMSG_SPACE(sizeof(struct sctp_sndrcvinfo))];
struct sctp_sndrcvinfo *sndrcvinfo;
-# endif
+#endif
clear_socket_error();
@@ -2210,9 +2211,9 @@ static int dgram_sctp_write(BIO *b, const char *in, int inl)
*/
if (in[0] != 23) {
memset(&handshake_sinfo, 0, sizeof(handshake_sinfo));
-# ifdef SCTP_SACK_IMMEDIATELY
+#ifdef SCTP_SACK_IMMEDIATELY
handshake_sinfo.snd_flags = SCTP_SACK_IMMEDIATELY;
-# endif
+#endif
sinfo = &handshake_sinfo;
}
@@ -2234,10 +2235,10 @@ static int dgram_sctp_write(BIO *b, const char *in, int inl)
msg.msg_namelen = 0;
msg.msg_iov = iov;
msg.msg_iovlen = 1;
- msg.msg_control = (caddr_t) cmsgbuf;
+ msg.msg_control = (caddr_t)cmsgbuf;
msg.msg_controllen = 0;
msg.msg_flags = 0;
-# if defined(SCTP_SNDINFO) && defined(SCTP_PRINFO)
+#if defined(SCTP_SNDINFO) && defined(SCTP_PRINFO)
cmsg = (struct cmsghdr *)cmsgbuf;
cmsg->cmsg_level = IPPROTO_SCTP;
cmsg->cmsg_type = SCTP_SNDINFO;
@@ -2250,8 +2251,7 @@ static int dgram_sctp_write(BIO *b, const char *in, int inl)
sndinfo->snd_context = sinfo->snd_context;
msg.msg_controllen += CMSG_SPACE(sizeof(struct sctp_sndinfo));
- cmsg =
- (struct cmsghdr *)&cmsgbuf[CMSG_SPACE(sizeof(struct sctp_sndinfo))];
+ cmsg = (struct cmsghdr *)&cmsgbuf[CMSG_SPACE(sizeof(struct sctp_sndinfo))];
cmsg->cmsg_level = IPPROTO_SCTP;
cmsg->cmsg_type = SCTP_PRINFO;
cmsg->cmsg_len = CMSG_LEN(sizeof(struct sctp_prinfo));
@@ -2260,7 +2260,7 @@ static int dgram_sctp_write(BIO *b, const char *in, int inl)
prinfo->pr_policy = pinfo->pr_policy;
prinfo->pr_value = pinfo->pr_value;
msg.msg_controllen += CMSG_SPACE(sizeof(struct sctp_prinfo));
-# else
+#else
cmsg = (struct cmsghdr *)cmsgbuf;
cmsg->cmsg_level = IPPROTO_SCTP;
cmsg->cmsg_type = SCTP_SNDRCV;
@@ -2269,14 +2269,14 @@ static int dgram_sctp_write(BIO *b, const char *in, int inl)
memset(sndrcvinfo, 0, sizeof(*sndrcvinfo));
sndrcvinfo->sinfo_stream = sinfo->snd_sid;
sndrcvinfo->sinfo_flags = sinfo->snd_flags;
-# ifdef __FreeBSD__
+#ifdef __FreeBSD__
sndrcvinfo->sinfo_flags |= pinfo->pr_policy;
-# endif
+#endif
sndrcvinfo->sinfo_ppid = sinfo->snd_ppid;
sndrcvinfo->sinfo_context = sinfo->snd_context;
sndrcvinfo->sinfo_timetolive = pinfo->pr_value;
msg.msg_controllen += CMSG_SPACE(sizeof(struct sctp_sndrcvinfo));
-# endif
+#endif
ret = sendmsg(b->num, &msg, 0);
@@ -2298,7 +2298,7 @@ static long dgram_sctp_ctrl(BIO *b, int cmd, long num, void *ptr)
struct sctp_authkeyid authkeyid;
struct sctp_authkey *authkey = NULL;
- data = (bio_dgram_sctp_data *) b->ptr;
+ data = (bio_dgram_sctp_data *)b->ptr;
switch (cmd) {
case BIO_CTRL_DGRAM_QUERY_MTU:
@@ -2339,9 +2339,8 @@ static long dgram_sctp_ctrl(BIO *b, int cmd, long num, void *ptr)
else
data->in_handshake = 0;
- ret =
- setsockopt(b->num, IPPROTO_SCTP, SCTP_NODELAY,
- &data->in_handshake, sizeof(int));
+ ret = setsockopt(b->num, IPPROTO_SCTP, SCTP_NODELAY,
+ &data->in_handshake, sizeof(int));
break;
case BIO_CTRL_DGRAM_SCTP_ADD_AUTH_KEY:
/*
@@ -2350,9 +2349,8 @@ static long dgram_sctp_ctrl(BIO *b, int cmd, long num, void *ptr)
/* Get active key */
sockopt_len = sizeof(struct sctp_authkeyid);
- ret =
- getsockopt(b->num, IPPROTO_SCTP, SCTP_AUTH_ACTIVE_KEY, &authkeyid,
- &sockopt_len);
+ ret = getsockopt(b->num, IPPROTO_SCTP, SCTP_AUTH_ACTIVE_KEY, &authkeyid,
+ &sockopt_len);
if (ret < 0)
break;
@@ -2365,18 +2363,17 @@ static long dgram_sctp_ctrl(BIO *b, int cmd, long num, void *ptr)
}
memset(authkey, 0, sockopt_len);
authkey->sca_keynumber = authkeyid.scact_keynumber + 1;
-# ifndef __FreeBSD__
+#ifndef __FreeBSD__
/*
* This field is missing in FreeBSD 8.2 and earlier, and FreeBSD 8.3
* and higher work without it.
*/
authkey->sca_keylength = 64;
-# endif
+#endif
memcpy(&authkey->sca_key[0], ptr, 64 * sizeof(uint8_t));
- ret =
- setsockopt(b->num, IPPROTO_SCTP, SCTP_AUTH_KEY, authkey,
- sockopt_len);
+ ret = setsockopt(b->num, IPPROTO_SCTP, SCTP_AUTH_KEY, authkey,
+ sockopt_len);
OPENSSL_free(authkey);
authkey = NULL;
if (ret < 0)
@@ -2384,7 +2381,7 @@ static long dgram_sctp_ctrl(BIO *b, int cmd, long num, void *ptr)
/* Reset active key */
ret = setsockopt(b->num, IPPROTO_SCTP, SCTP_AUTH_ACTIVE_KEY,
- &authkeyid, sizeof(struct sctp_authkeyid));
+ &authkeyid, sizeof(struct sctp_authkeyid));
if (ret < 0)
break;
@@ -2394,16 +2391,15 @@ static long dgram_sctp_ctrl(BIO *b, int cmd, long num, void *ptr)
/* Get active key */
sockopt_len = sizeof(struct sctp_authkeyid);
- ret =
- getsockopt(b->num, IPPROTO_SCTP, SCTP_AUTH_ACTIVE_KEY, &authkeyid,
- &sockopt_len);
+ ret = getsockopt(b->num, IPPROTO_SCTP, SCTP_AUTH_ACTIVE_KEY, &authkeyid,
+ &sockopt_len);
if (ret < 0)
break;
/* Set active key */
authkeyid.scact_keynumber = authkeyid.scact_keynumber + 1;
ret = setsockopt(b->num, IPPROTO_SCTP, SCTP_AUTH_ACTIVE_KEY,
- &authkeyid, sizeof(struct sctp_authkeyid));
+ &authkeyid, sizeof(struct sctp_authkeyid));
if (ret < 0)
break;
@@ -2430,9 +2426,8 @@ static long dgram_sctp_ctrl(BIO *b, int cmd, long num, void *ptr)
if (data->ccs_rcvd == 1 && data->ccs_sent == 1) {
/* Get active key */
sockopt_len = sizeof(struct sctp_authkeyid);
- ret =
- getsockopt(b->num, IPPROTO_SCTP, SCTP_AUTH_ACTIVE_KEY,
- &authkeyid, &sockopt_len);
+ ret = getsockopt(b->num, IPPROTO_SCTP, SCTP_AUTH_ACTIVE_KEY,
+ &authkeyid, &sockopt_len);
if (ret < 0)
break;
@@ -2441,22 +2436,22 @@ static long dgram_sctp_ctrl(BIO *b, int cmd, long num, void *ptr)
* SCTP_AUTHENTICATION_EVENT is not available.
*/
authkeyid.scact_keynumber = authkeyid.scact_keynumber - 1;
-# ifdef SCTP_AUTH_DEACTIVATE_KEY
+#ifdef SCTP_AUTH_DEACTIVATE_KEY
sockopt_len = sizeof(struct sctp_authkeyid);
ret = setsockopt(b->num, IPPROTO_SCTP, SCTP_AUTH_DEACTIVATE_KEY,
- &authkeyid, sockopt_len);
+ &authkeyid, sockopt_len);
if (ret < 0)
break;
-# endif
-# ifndef SCTP_AUTHENTICATION_EVENT
+#endif
+#ifndef SCTP_AUTHENTICATION_EVENT
if (authkeyid.scact_keynumber > 0) {
authkeyid.scact_keynumber = authkeyid.scact_keynumber - 1;
ret = setsockopt(b->num, IPPROTO_SCTP, SCTP_AUTH_DELETE_KEY,
- &authkeyid, sizeof(struct sctp_authkeyid));
+ &authkeyid, sizeof(struct sctp_authkeyid));
if (ret < 0)
break;
}
-# endif
+#endif
data->ccs_rcvd = 0;
data->ccs_sent = 0;
@@ -2531,10 +2526,10 @@ static long dgram_sctp_ctrl(BIO *b, int cmd, long num, void *ptr)
}
int BIO_dgram_sctp_notification_cb(BIO *b,
- BIO_dgram_sctp_notification_handler_fn handle_notifications,
- void *context)
+ BIO_dgram_sctp_notification_handler_fn handle_notifications,
+ void *context)
{
- bio_dgram_sctp_data *data = (bio_dgram_sctp_data *) b->ptr;
+ bio_dgram_sctp_data *data = (bio_dgram_sctp_data *)b->ptr;
if (handle_notifications != NULL) {
data->handle_notifications = handle_notifications;
@@ -2571,24 +2566,23 @@ static int dgram_sctp_wait_for_dry(BIO *b)
union sctp_notification snp;
struct msghdr msg;
struct iovec iov;
-# ifdef SCTP_EVENT
+#ifdef SCTP_EVENT
struct sctp_event event;
-# else
+#else
struct sctp_event_subscribe event;
socklen_t eventsize;
-# endif
- bio_dgram_sctp_data *data = (bio_dgram_sctp_data *) b->ptr;
+#endif
+ bio_dgram_sctp_data *data = (bio_dgram_sctp_data *)b->ptr;
/* set sender dry event */
-# ifdef SCTP_EVENT
+#ifdef SCTP_EVENT
memset(&event, 0, sizeof(event));
event.se_assoc_id = 0;
event.se_type = SCTP_SENDER_DRY_EVENT;
event.se_on = 1;
- ret =
- setsockopt(b->num, IPPROTO_SCTP, SCTP_EVENT, &event,
- sizeof(struct sctp_event));
-# else
+ ret = setsockopt(b->num, IPPROTO_SCTP, SCTP_EVENT, &event,
+ sizeof(struct sctp_event));
+#else
eventsize = sizeof(struct sctp_event_subscribe);
ret = getsockopt(b->num, IPPROTO_SCTP, SCTP_EVENTS, &event, &eventsize);
if (ret < 0)
@@ -2596,10 +2590,9 @@ static int dgram_sctp_wait_for_dry(BIO *b)
event.sctp_sender_dry_event = 1;
- ret =
- setsockopt(b->num, IPPROTO_SCTP, SCTP_EVENTS, &event,
- sizeof(struct sctp_event_subscribe));
-# endif
+ ret = setsockopt(b->num, IPPROTO_SCTP, SCTP_EVENTS, &event,
+ sizeof(struct sctp_event_subscribe));
+#endif
if (ret < 0)
return -1;
@@ -2650,39 +2643,36 @@ static int dgram_sctp_wait_for_dry(BIO *b)
is_dry = 1;
/* disable sender dry event */
-# ifdef SCTP_EVENT
+#ifdef SCTP_EVENT
memset(&event, 0, sizeof(event));
event.se_assoc_id = 0;
event.se_type = SCTP_SENDER_DRY_EVENT;
event.se_on = 0;
- ret =
- setsockopt(b->num, IPPROTO_SCTP, SCTP_EVENT, &event,
- sizeof(struct sctp_event));
-# else
- eventsize = (socklen_t) sizeof(struct sctp_event_subscribe);
- ret =
- getsockopt(b->num, IPPROTO_SCTP, SCTP_EVENTS, &event,
- &eventsize);
+ ret = setsockopt(b->num, IPPROTO_SCTP, SCTP_EVENT, &event,
+ sizeof(struct sctp_event));
+#else
+ eventsize = (socklen_t)sizeof(struct sctp_event_subscribe);
+ ret = getsockopt(b->num, IPPROTO_SCTP, SCTP_EVENTS, &event,
+ &eventsize);
if (ret < 0)
return -1;
event.sctp_sender_dry_event = 0;
- ret =
- setsockopt(b->num, IPPROTO_SCTP, SCTP_EVENTS, &event,
- sizeof(struct sctp_event_subscribe));
-# endif
+ ret = setsockopt(b->num, IPPROTO_SCTP, SCTP_EVENTS, &event,
+ sizeof(struct sctp_event_subscribe));
+#endif
if (ret < 0)
return -1;
}
-# ifdef SCTP_AUTHENTICATION_EVENT
+#ifdef SCTP_AUTHENTICATION_EVENT
if (snp.sn_header.sn_type == SCTP_AUTHENTICATION_EVENT)
dgram_sctp_handle_auth_free_key_event(b, &snp);
-# endif
+#endif
if (data->handle_notifications != NULL)
data->handle_notifications(b, data->notification_context,
- (void *)&snp);
+ (void *)&snp);
/* found notification, peek again */
memset(&snp, 0, sizeof(snp));
@@ -2732,7 +2722,7 @@ static int dgram_sctp_msg_waiting(BIO *b)
union sctp_notification snp;
struct msghdr msg;
struct iovec iov;
- bio_dgram_sctp_data *data = (bio_dgram_sctp_data *) b->ptr;
+ bio_dgram_sctp_data *data = (bio_dgram_sctp_data *)b->ptr;
/* Check if there are any messages waiting to be read */
do {
@@ -2754,10 +2744,10 @@ static int dgram_sctp_msg_waiting(BIO *b)
/* if notification, process and try again */
if (n > 0 && (msg.msg_flags & MSG_NOTIFICATION)) {
-# ifdef SCTP_AUTHENTICATION_EVENT
+#ifdef SCTP_AUTHENTICATION_EVENT
if (snp.sn_header.sn_type == SCTP_AUTHENTICATION_EVENT)
dgram_sctp_handle_auth_free_key_event(b, &snp);
-# endif
+#endif
memset(&snp, 0, sizeof(snp));
iov.iov_base = (char *)&snp;
@@ -2773,7 +2763,7 @@ static int dgram_sctp_msg_waiting(BIO *b)
if (data->handle_notifications != NULL)
data->handle_notifications(b, data->notification_context,
- (void *)&snp);
+ (void *)&snp);
}
} while (n > 0 && (msg.msg_flags & MSG_NOTIFICATION));
@@ -2793,7 +2783,7 @@ static int dgram_sctp_puts(BIO *bp, const char *str)
ret = dgram_sctp_write(bp, str, n);
return ret;
}
-# endif
+#endif
static int BIO_dgram_should_retry(int i)
{
@@ -2802,13 +2792,13 @@ static int BIO_dgram_should_retry(int i)
if ((i == 0) || (i == -1)) {
err = get_last_socket_error();
-# if defined(OPENSSL_SYS_WINDOWS)
+#if defined(OPENSSL_SYS_WINDOWS)
/*
* If the socket return value (i) is -1 and err is unexpectedly 0 at
* this point, the error code was overwritten by another system call
* before this error handling is called.
*/
-# endif
+#endif
return BIO_dgram_non_fatal_error(err);
}
@@ -2818,43 +2808,43 @@ static int BIO_dgram_should_retry(int i)
int BIO_dgram_non_fatal_error(int err)
{
switch (err) {
-# if defined(OPENSSL_SYS_WINDOWS)
-# if defined(WSAEWOULDBLOCK)
+#if defined(OPENSSL_SYS_WINDOWS)
+#if defined(WSAEWOULDBLOCK)
case WSAEWOULDBLOCK:
-# endif
-# endif
+#endif
+#endif
-# ifdef EWOULDBLOCK
-# ifdef WSAEWOULDBLOCK
-# if WSAEWOULDBLOCK != EWOULDBLOCK
+#ifdef EWOULDBLOCK
+#ifdef WSAEWOULDBLOCK
+#if WSAEWOULDBLOCK != EWOULDBLOCK
case EWOULDBLOCK:
-# endif
-# else
+#endif
+#else
case EWOULDBLOCK:
-# endif
-# endif
+#endif
+#endif
-# ifdef EINTR
+#ifdef EINTR
case EINTR:
-# endif
+#endif
-# ifdef EAGAIN
-# if EWOULDBLOCK != EAGAIN
+#ifdef EAGAIN
+#if EWOULDBLOCK != EAGAIN
case EAGAIN:
-# endif
-# endif
+#endif
+#endif
-# ifdef EPROTO
+#ifdef EPROTO
case EPROTO:
-# endif
+#endif
-# ifdef EINPROGRESS
+#ifdef EINPROGRESS
case EINPROGRESS:
-# endif
+#endif
-# ifdef EALREADY
+#ifdef EALREADY
case EALREADY:
-# endif
+#endif
return 1;
default:
diff --git a/crypto/bio/bss_dgram_pair.c b/crypto/bio/bss_dgram_pair.c
index e061208ad6..bd9b7b892c 100644
--- a/crypto/bio/bss_dgram_pair.c
+++ b/crypto/bio/bss_dgram_pair.c
@@ -46,9 +46,9 @@ static int ring_buf_init(struct ring_buf *r, size_t nbytes)
static void ring_buf_destroy(struct ring_buf *r)
{
OPENSSL_free(r->start);
- r->start = NULL;
- r->len = 0;
- r->count = 0;
+ r->start = NULL;
+ r->len = 0;
+ r->count = 0;
}
/*
@@ -141,7 +141,7 @@ static int ring_buf_resize(struct ring_buf *r, size_t nbytes)
size_t offset = nbytes - r->len;
memmove(new_start + r->idx[1] + offset, new_start + r->idx[1],
- r->len - r->idx[1]);
+ r->len - r->idx[1]);
r->idx[1] += offset;
}
} else {
@@ -184,17 +184,17 @@ static int dgram_pair_init(BIO *bio);
static int dgram_mem_init(BIO *bio);
static int dgram_pair_free(BIO *bio);
static int dgram_pair_sendmmsg(BIO *b, BIO_MSG *msg, size_t stride,
- size_t num_msg, uint64_t flags,
- size_t *num_processed);
+ size_t num_msg, uint64_t flags,
+ size_t *num_processed);
static int dgram_pair_recvmmsg(BIO *b, BIO_MSG *msg, size_t stride,
- size_t num_msg, uint64_t flags,
- size_t *num_processed);
+ size_t num_msg, uint64_t flags,
+ size_t *num_processed);
static int dgram_pair_ctrl_destroy_bio_pair(BIO *bio1);
static size_t dgram_pair_read_inner(struct bio_dgram_pair_st *b, uint8_t *buf,
- size_t sz);
+ size_t sz);
-#define BIO_MSG_N(array, n) (*(BIO_MSG *)((char *)(array) + (n)*stride))
+#define BIO_MSG_N(array, n) (*(BIO_MSG *)((char *)(array) + (n) * stride))
static const BIO_METHOD dgram_pair_method = {
BIO_TYPE_DGRAM_PAIR,
@@ -264,10 +264,10 @@ struct bio_dgram_pair_st {
* reads.
*/
CRYPTO_RWLOCK *lock;
- unsigned int no_trunc : 1; /* Reads fail if they would truncate */
+ unsigned int no_trunc : 1; /* Reads fail if they would truncate */
unsigned int local_addr_enable : 1; /* Can use BIO_MSG->local? */
- unsigned int role : 1; /* Determines lock order */
- unsigned int grows_on_write : 1; /* Set for BIO_s_dgram_mem only */
+ unsigned int role : 1; /* Determines lock order */
+ unsigned int grows_on_write : 1; /* Set for BIO_s_dgram_mem only */
};
#define MIN_BUF_LEN (1024)
@@ -281,7 +281,7 @@ static int dgram_pair_init(BIO *bio)
if (b == NULL)
return 0;
- b->mtu = 1472; /* conservative default MTU */
+ b->mtu = 1472; /* conservative default MTU */
/* default buffer size */
b->req_buf_len = 9 * (sizeof(struct dgram_hdr) + b->mtu);
@@ -348,7 +348,7 @@ static int dgram_pair_ctrl_make_bio_pair(BIO *bio1, BIO *bio2)
/* Ensure the BIO we have been passed is actually a dgram pair BIO. */
if (bio1->method != &dgram_pair_method || bio2->method != &dgram_pair_method) {
ERR_raise_data(ERR_LIB_BIO, BIO_R_INVALID_ARGUMENT,
- "both BIOs must be BIO_dgram_pair");
+ "both BIOs must be BIO_dgram_pair");
return 0;
}
@@ -366,12 +366,12 @@ static int dgram_pair_ctrl_make_bio_pair(BIO *bio1, BIO *bio2)
*/
if (b1->peer != NULL || b2->peer != NULL) {
ERR_raise_data(ERR_LIB_BIO, BIO_R_IN_USE,
- "cannot associate a BIO_dgram_pair which is already in use");
+ "cannot associate a BIO_dgram_pair which is already in use");
return 0;
}
if (!ossl_assert(b1->req_buf_len >= MIN_BUF_LEN
- && b2->req_buf_len >= MIN_BUF_LEN)) {
+ && b2->req_buf_len >= MIN_BUF_LEN)) {
ERR_raise(ERR_LIB_BIO, BIO_R_UNINITIALIZED);
return 0;
}
@@ -389,12 +389,12 @@ static int dgram_pair_ctrl_make_bio_pair(BIO *bio1, BIO *bio2)
return 0;
}
- b1->peer = bio2;
- b2->peer = bio1;
- b1->role = 0;
- b2->role = 1;
- bio1->init = 1;
- bio2->init = 1;
+ b1->peer = bio2;
+ b2->peer = bio1;
+ b1->role = 0;
+ b2->role = 1;
+ bio1->init = 1;
+ bio2->init = 1;
return 1;
}
@@ -443,7 +443,6 @@ static int dgram_pair_ctrl_eof(BIO *bio)
if (!is_dgram_pair(b))
return 0;
-
peerb = b->peer->ptr;
if (!ossl_assert(peerb != NULL))
return -1;
@@ -508,13 +507,13 @@ static size_t dgram_pair_ctrl_pending(BIO *bio)
if (CRYPTO_THREAD_write_lock(readb->lock) == 0)
return 0;
- saved_idx = readb->rbuf.idx[1];
+ saved_idx = readb->rbuf.idx[1];
saved_count = readb->rbuf.count;
l = dgram_pair_read_inner(readb, (uint8_t *)&hdr, sizeof(hdr));
readb->rbuf.idx[1] = saved_idx;
- readb->rbuf.count = saved_count;
+ readb->rbuf.count = saved_count;
CRYPTO_THREAD_unlock(readb->lock);
@@ -561,8 +560,7 @@ static int dgram_pair_ctrl_get_local_addr_cap(BIO *bio)
else
readb = b;
- return (~readb->cap & (BIO_DGRAM_CAP_HANDLES_SRC_ADDR
- | BIO_DGRAM_CAP_PROVIDES_DST_ADDR)) == 0;
+ return (~readb->cap & (BIO_DGRAM_CAP_HANDLES_SRC_ADDR | BIO_DGRAM_CAP_PROVIDES_DST_ADDR)) == 0;
}
/* BIO_dgram_get_effective_caps (BIO_CTRL_DGRAM_GET_EFFECTIVE_CAPS) */
@@ -801,7 +799,7 @@ static long dgram_pair_ctrl(BIO *bio, int cmd, long num, void *ptr)
}
int BIO_new_bio_dgram_pair(BIO **pbio1, size_t writebuf1,
- BIO **pbio2, size_t writebuf2)
+ BIO **pbio2, size_t writebuf2)
{
int ret = 0;
long r;
@@ -881,8 +879,8 @@ static size_t dgram_pair_read_inner(struct bio_dgram_pair_st *b, uint8_t *buf, s
if (buf != NULL)
buf += src_len;
- total_read += src_len;
- sz -= src_len;
+ total_read += src_len;
+ sz -= src_len;
}
return total_read;
@@ -893,8 +891,8 @@ static size_t dgram_pair_read_inner(struct bio_dgram_pair_st *b, uint8_t *buf, s
* response code.
*/
static ossl_ssize_t dgram_pair_read_actual(BIO *bio, char *buf, size_t sz,
- BIO_ADDR *local, BIO_ADDR *peer,
- int is_multi)
+ BIO_ADDR *local, BIO_ADDR *peer,
+ int is_multi)
{
size_t l, trunc = 0, saved_idx, saved_count;
struct bio_dgram_pair_st *b = bio->ptr, *readb;
@@ -924,7 +922,7 @@ static ossl_ssize_t dgram_pair_read_actual(BIO *bio, char *buf, size_t sz,
return -BIO_R_LOCAL_ADDR_NOT_AVAILABLE;
/* Read the header. */
- saved_idx = readb->rbuf.idx[1];
+ saved_idx = readb->rbuf.idx[1];
saved_count = readb->rbuf.count;
l = dgram_pair_read_inner(readb, (uint8_t *)&hdr, sizeof(hdr));
if (l == 0) {
@@ -949,7 +947,7 @@ static ossl_ssize_t dgram_pair_read_actual(BIO *bio, char *buf, size_t sz,
if (b->no_trunc) {
/* Restore original state. */
readb->rbuf.idx[1] = saved_idx;
- readb->rbuf.count = saved_count;
+ readb->rbuf.count = saved_count;
return -BIO_R_NON_FATAL;
}
}
@@ -970,14 +968,14 @@ static ossl_ssize_t dgram_pair_read_actual(BIO *bio, char *buf, size_t sz,
if (local != NULL)
*local = hdr.dst_addr;
if (peer != NULL)
- *peer = hdr.src_addr;
+ *peer = hdr.src_addr;
return (ossl_ssize_t)l;
}
/* Threadsafe */
static int dgram_pair_lock_both_write(struct bio_dgram_pair_st *a,
- struct bio_dgram_pair_st *b)
+ struct bio_dgram_pair_st *b)
{
struct bio_dgram_pair_st *x, *y;
@@ -1002,7 +1000,7 @@ static int dgram_pair_lock_both_write(struct bio_dgram_pair_st *a,
}
static void dgram_pair_unlock_both(struct bio_dgram_pair_st *a,
- struct bio_dgram_pair_st *b)
+ struct bio_dgram_pair_st *b)
{
CRYPTO_THREAD_unlock(a->lock);
CRYPTO_THREAD_unlock(b->lock);
@@ -1052,9 +1050,9 @@ static int dgram_pair_read(BIO *bio, char *buf, int sz_)
/* Threadsafe */
static int dgram_pair_recvmmsg(BIO *bio, BIO_MSG *msg,
- size_t stride, size_t num_msg,
- uint64_t flags,
- size_t *num_processed)
+ size_t stride, size_t num_msg,
+ uint64_t flags,
+ size_t *num_processed)
{
int ret;
ossl_ssize_t l;
@@ -1087,7 +1085,7 @@ static int dgram_pair_recvmmsg(BIO *bio, BIO_MSG *msg,
for (i = 0; i < num_msg; ++i) {
m = &BIO_MSG_N(msg, i);
l = dgram_pair_read_actual(bio, m->data, m->data_len,
- m->local, m->peer, 1);
+ m->local, m->peer, 1);
if (l < 0) {
*num_processed = i;
if (i > 0) {
@@ -1100,7 +1098,7 @@ static int dgram_pair_recvmmsg(BIO *bio, BIO_MSG *msg,
}
m->data_len = l;
- m->flags = 0;
+ m->flags = 0;
}
*num_processed = i;
@@ -1170,7 +1168,7 @@ static ossl_inline size_t compute_rbuf_growth(size_t target, size_t current)
/* Must hold local write lock */
static size_t dgram_pair_write_inner(struct bio_dgram_pair_st *b,
- const uint8_t *buf, size_t sz)
+ const uint8_t *buf, size_t sz)
{
size_t total_written = 0;
@@ -1206,9 +1204,9 @@ static size_t dgram_pair_write_inner(struct bio_dgram_pair_st *b,
memcpy(dst_buf, buf, dst_len);
ring_buf_push(&b->rbuf, dst_len);
- buf += dst_len;
- sz -= dst_len;
- total_written += dst_len;
+ buf += dst_len;
+ sz -= dst_len;
+ total_written += dst_len;
}
return total_written;
@@ -1219,13 +1217,13 @@ static size_t dgram_pair_write_inner(struct bio_dgram_pair_st *b,
* response code.
*/
static ossl_ssize_t dgram_pair_write_actual(BIO *bio, const char *buf, size_t sz,
- const BIO_ADDR *local, const BIO_ADDR *peer,
- int is_multi)
+ const BIO_ADDR *local, const BIO_ADDR *peer,
+ int is_multi)
{
static const BIO_ADDR zero_addr;
size_t saved_idx, saved_count;
struct bio_dgram_pair_st *b = bio->ptr, *readb;
- struct dgram_hdr hdr = {0};
+ struct dgram_hdr hdr = { 0 };
if (!is_multi)
BIO_clear_retry_flags(bio);
@@ -1255,16 +1253,16 @@ static ossl_ssize_t dgram_pair_write_actual(BIO *bio, const char *buf, size_t sz
local = b->local_addr;
hdr.src_addr = (local != NULL ? *local : zero_addr);
- saved_idx = b->rbuf.idx[0];
+ saved_idx = b->rbuf.idx[0];
saved_count = b->rbuf.count;
if (dgram_pair_write_inner(b, (const uint8_t *)&hdr, sizeof(hdr)) != sizeof(hdr)
- || dgram_pair_write_inner(b, (const uint8_t *)buf, sz) != sz) {
+ || dgram_pair_write_inner(b, (const uint8_t *)buf, sz) != sz) {
/*
* We were not able to push the header and the entirety of the payload
* onto the ring buffer, so abort and roll back the ring buffer state.
*/
b->rbuf.idx[0] = saved_idx;
- b->rbuf.count = saved_count;
+ b->rbuf.count = saved_count;
if (!is_multi)
BIO_set_retry_write(bio);
return -BIO_R_NON_FATAL;
@@ -1304,8 +1302,8 @@ static int dgram_pair_write(BIO *bio, const char *buf, int sz_)
/* Threadsafe */
static int dgram_pair_sendmmsg(BIO *bio, BIO_MSG *msg,
- size_t stride, size_t num_msg,
- uint64_t flags, size_t *num_processed)
+ size_t stride, size_t num_msg,
+ uint64_t flags, size_t *num_processed)
{
ossl_ssize_t l;
BIO_MSG *m;
@@ -1327,7 +1325,7 @@ static int dgram_pair_sendmmsg(BIO *bio, BIO_MSG *msg,
for (i = 0; i < num_msg; ++i) {
m = &BIO_MSG_N(msg, i);
l = dgram_pair_write_actual(bio, m->data, m->data_len,
- m->local, m->peer, 1);
+ m->local, m->peer, 1);
if (l < 0) {
*num_processed = i;
if (i > 0) {
diff --git a/crypto/bio/bss_fd.c b/crypto/bio/bss_fd.c
index f4d979575c..eb0119d63c 100644
--- a/crypto/bio/bss_fd.c
+++ b/crypto/bio/bss_fd.c
@@ -69,7 +69,7 @@ static const BIO_METHOD methods_fdp = {
fd_ctrl,
fd_new,
fd_free,
- NULL, /* fd_callback_ctrl */
+ NULL, /* fd_callback_ctrl */
};
const BIO_METHOD *BIO_s_fd(void)
@@ -215,7 +215,7 @@ static int fd_gets(BIO *bp, char *buf, int size)
while (ptr < end && fd_read(bp, ptr, 1) > 0) {
if (*ptr++ == '\n')
- break;
+ break;
}
ptr[0] = '\0';
@@ -241,41 +241,41 @@ int BIO_fd_non_fatal_error(int err)
{
switch (err) {
-# ifdef EWOULDBLOCK
-# ifdef WSAEWOULDBLOCK
-# if WSAEWOULDBLOCK != EWOULDBLOCK
+#ifdef EWOULDBLOCK
+#ifdef WSAEWOULDBLOCK
+#if WSAEWOULDBLOCK != EWOULDBLOCK
case EWOULDBLOCK:
-# endif
-# else
+#endif
+#else
case EWOULDBLOCK:
-# endif
-# endif
+#endif
+#endif
-# if defined(ENOTCONN)
+#if defined(ENOTCONN)
case ENOTCONN:
-# endif
+#endif
-# ifdef EINTR
+#ifdef EINTR
case EINTR:
-# endif
+#endif
-# ifdef EAGAIN
-# if EWOULDBLOCK != EAGAIN
+#ifdef EAGAIN
+#if EWOULDBLOCK != EAGAIN
case EAGAIN:
-# endif
-# endif
+#endif
+#endif
-# ifdef EPROTO
+#ifdef EPROTO
case EPROTO:
-# endif
+#endif
-# ifdef EINPROGRESS
+#ifdef EINPROGRESS
case EINPROGRESS:
-# endif
+#endif
-# ifdef EALREADY
+#ifdef EALREADY
case EALREADY:
-# endif
+#endif
return 1;
default:
break;
diff --git a/crypto/bio/bss_file.c b/crypto/bio/bss_file.c
index 88cb0eda86..5d9300e74e 100644
--- a/crypto/bio/bss_file.c
+++ b/crypto/bio/bss_file.c
@@ -20,9 +20,9 @@
* of 32-bit platforms which allow for sequential access of large files
* without extra "magic" comprise *BSD, Darwin, IRIX...
*/
-# ifndef _FILE_OFFSET_BITS
-# define _FILE_OFFSET_BITS 64
-# endif
+#ifndef _FILE_OFFSET_BITS
+#define _FILE_OFFSET_BITS 64
+#endif
#endif
#include <stdio.h>
@@ -51,12 +51,12 @@ static const BIO_METHOD methods_filep = {
file_ctrl,
file_new,
file_free,
- NULL, /* file_callback_ctrl */
+ NULL, /* file_callback_ctrl */
};
BIO *BIO_new_file(const char *filename, const char *mode)
{
- BIO *ret;
+ BIO *ret;
FILE *file = openssl_fopen(filename, mode);
int fp_flags = BIO_CLOSE;
@@ -65,13 +65,13 @@ BIO *BIO_new_file(const char *filename, const char *mode)
if (file == NULL) {
ERR_raise_data(ERR_LIB_SYS, get_last_sys_error(),
- "calling fopen(%s, %s)",
- filename, mode);
+ "calling fopen(%s, %s)",
+ filename, mode);
if (errno == ENOENT
#ifdef ENXIO
|| errno == ENXIO
#endif
- )
+ )
ERR_raise(ERR_LIB_BIO, BIO_R_NO_SUCH_FILE);
else
ERR_raise(ERR_LIB_BIO, ERR_R_SYS_LIB);
@@ -144,9 +144,10 @@ static int file_read(BIO *b, char *out, int outl)
ret = (int)fread(out, 1, outl, (FILE *)b->ptr);
if (ret == 0
&& (b->flags & BIO_FLAGS_UPLINK_INTERNAL
- ? UP_ferror((FILE *)b->ptr) : ferror((FILE *)b->ptr))) {
+ ? UP_ferror((FILE *)b->ptr)
+ : ferror((FILE *)b->ptr))) {
ERR_raise_data(ERR_LIB_SYS, get_last_sys_error(),
- "calling fread()");
+ "calling fread()");
ERR_raise(ERR_LIB_BIO, ERR_R_SYS_LIB);
ret = -1;
}
@@ -209,33 +210,32 @@ static long file_ctrl(BIO *b, int cmd, long num, void *ptr)
b->shutdown = (int)num & BIO_CLOSE;
b->ptr = ptr;
b->init = 1;
-# if BIO_FLAGS_UPLINK_INTERNAL!=0
-# if defined(__MINGW32__) && defined(__MSVCRT__) && !defined(_IOB_ENTRIES)
-# define _IOB_ENTRIES 20
-# endif
+#if BIO_FLAGS_UPLINK_INTERNAL != 0
+#if defined(__MINGW32__) && defined(__MSVCRT__) && !defined(_IOB_ENTRIES)
+#define _IOB_ENTRIES 20
+#endif
/* Safety net to catch purely internal BIO_set_fp calls */
-# if (defined(_MSC_VER) && _MSC_VER>=1900) || defined(__BORLANDC__)
+#if (defined(_MSC_VER) && _MSC_VER >= 1900) || defined(__BORLANDC__)
if (ptr == stdin || ptr == stdout || ptr == stderr)
BIO_clear_flags(b, BIO_FLAGS_UPLINK_INTERNAL);
-# elif defined(_IOB_ENTRIES)
- if ((size_t)ptr >= (size_t)stdin &&
- (size_t)ptr < (size_t)(stdin + _IOB_ENTRIES))
+#elif defined(_IOB_ENTRIES)
+ if ((size_t)ptr >= (size_t)stdin && (size_t)ptr < (size_t)(stdin + _IOB_ENTRIES))
BIO_clear_flags(b, BIO_FLAGS_UPLINK_INTERNAL);
-# endif
-# endif
-# ifdef UP_fsetmod
+#endif
+#endif
+#ifdef UP_fsetmod
if (b->flags & BIO_FLAGS_UPLINK_INTERNAL)
UP_fsetmod(b->ptr, (char)((num & BIO_FP_TEXT) ? 't' : 'b'));
else
-# endif
+#endif
{
-# if defined(OPENSSL_SYS_WINDOWS)
+#if defined(OPENSSL_SYS_WINDOWS)
int fd = _fileno((FILE *)ptr);
if (num & BIO_FP_TEXT)
_setmode(fd, _O_TEXT);
else
_setmode(fd, _O_BINARY);
-# elif defined(OPENSSL_SYS_MSDOS)
+#elif defined(OPENSSL_SYS_MSDOS)
int fd = fileno((FILE *)ptr);
/* Set correct text/binary mode */
if (num & BIO_FP_TEXT)
@@ -248,11 +248,11 @@ static long file_ctrl(BIO *b, int cmd, long num, void *ptr)
} else
_setmode(fd, _O_BINARY);
}
-# elif defined(OPENSSL_SYS_WIN32_CYGWIN)
+#elif defined(OPENSSL_SYS_WIN32_CYGWIN)
int fd = fileno((FILE *)ptr);
if (!(num & BIO_FP_TEXT))
setmode(fd, O_BINARY);
-# endif
+#endif
}
break;
case BIO_C_SET_FILENAME:
@@ -274,20 +274,20 @@ static long file_ctrl(BIO *b, int cmd, long num, void *ptr)
ret = 0;
break;
}
-# if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WINDOWS)
+#if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WINDOWS)
if (!(num & BIO_FP_TEXT))
OPENSSL_strlcat(p, "b", sizeof(p));
else
OPENSSL_strlcat(p, "t", sizeof(p));
-# elif defined(OPENSSL_SYS_WIN32_CYGWIN)
+#elif defined(OPENSSL_SYS_WIN32_CYGWIN)
if (!(num & BIO_FP_TEXT))
OPENSSL_strlcat(p, "b", sizeof(p));
-# endif
+#endif
fp = openssl_fopen(ptr, p);
if (fp == NULL) {
ERR_raise_data(ERR_LIB_SYS, get_last_sys_error(),
- "calling fopen(%s, %s)",
- (const char *)ptr, p);
+ "calling fopen(%s, %s)",
+ (const char *)ptr, p);
ERR_raise(ERR_LIB_BIO, ERR_R_SYS_LIB);
ret = 0;
break;
@@ -312,10 +312,11 @@ static long file_ctrl(BIO *b, int cmd, long num, void *ptr)
break;
case BIO_CTRL_FLUSH:
st = b->flags & BIO_FLAGS_UPLINK_INTERNAL
- ? UP_fflush(b->ptr) : fflush((FILE *)b->ptr);
+ ? UP_fflush(b->ptr)
+ : fflush((FILE *)b->ptr);
if (st == EOF) {
ERR_raise_data(ERR_LIB_SYS, get_last_sys_error(),
- "calling fflush()");
+ "calling fflush()");
ERR_raise(ERR_LIB_BIO, ERR_R_SYS_LIB);
ret = 0;
}
@@ -349,7 +350,7 @@ static int file_gets(BIO *bp, char *buf, int size)
}
if (buf[0] != '\0')
ret = (int)strlen(buf);
- err:
+err:
return ret;
}
@@ -407,7 +408,7 @@ static const BIO_METHOD methods_filep = {
file_ctrl,
file_new,
file_free,
- NULL, /* file_callback_ctrl */
+ NULL, /* file_callback_ctrl */
};
const BIO_METHOD *BIO_s_file(void)
@@ -420,4 +421,4 @@ BIO *BIO_new_file(const char *filename, const char *mode)
return NULL;
}
-#endif /* OPENSSL_NO_STDIO */
+#endif /* OPENSSL_NO_STDIO */
diff --git a/crypto/bio/bss_log.c b/crypto/bio/bss_log.c
index f587cab2f8..8f8e180468 100644
--- a/crypto/bio/bss_log.c
+++ b/crypto/bio/bss_log.c
@@ -25,26 +25,26 @@
#if defined(OPENSSL_SYS_WINCE)
#elif defined(OPENSSL_SYS_WIN32)
#elif defined(__wasi__)
-# define NO_SYSLOG
+#define NO_SYSLOG
#elif defined(OPENSSL_SYS_VMS)
-# include <opcdef.h>
-# include <descrip.h>
-# include <lib$routines.h>
-# include <starlet.h>
+#include <opcdef.h>
+#include <descrip.h>
+#include <lib$routines.h>
+#include <starlet.h>
/* Some compiler options may mask the declaration of "_malloc32". */
-# if __INITIAL_POINTER_SIZE && defined _ANSI_C_SOURCE
-# if __INITIAL_POINTER_SIZE == 64
-# pragma pointer_size save
-# pragma pointer_size 32
+#if __INITIAL_POINTER_SIZE && defined _ANSI_C_SOURCE
+#if __INITIAL_POINTER_SIZE == 64
+#pragma pointer_size save
+#pragma pointer_size 32
void *_malloc32(__size_t);
-# pragma pointer_size restore
-# endif /* __INITIAL_POINTER_SIZE == 64 */
-# endif /* __INITIAL_POINTER_SIZE && defined
- * _ANSI_C_SOURCE */
+#pragma pointer_size restore
+#endif /* __INITIAL_POINTER_SIZE == 64 */
+#endif /* __INITIAL_POINTER_SIZE && defined \
+ * _ANSI_C_SOURCE */
#elif defined(__DJGPP__) && defined(OPENSSL_NO_SOCK)
-# define NO_SYSLOG
+#define NO_SYSLOG
#elif (!defined(MSDOS) || defined(WATT32)) && !defined(OPENSSL_SYS_VXWORKS) && !defined(NO_SYSLOG)
-# include <syslog.h>
+#include <syslog.h>
#endif
#include <openssl/buffer.h>
@@ -52,30 +52,30 @@ void *_malloc32(__size_t);
#ifndef NO_SYSLOG
-# if defined(OPENSSL_SYS_WIN32)
-# define LOG_EMERG 0
-# define LOG_ALERT 1
-# define LOG_CRIT 2
-# define LOG_ERR 3
-# define LOG_WARNING 4
-# define LOG_NOTICE 5
-# define LOG_INFO 6
-# define LOG_DEBUG 7
-
-# define LOG_DAEMON (3<<3)
-# elif defined(OPENSSL_SYS_VMS)
+#if defined(OPENSSL_SYS_WIN32)
+#define LOG_EMERG 0
+#define LOG_ALERT 1
+#define LOG_CRIT 2
+#define LOG_ERR 3
+#define LOG_WARNING 4
+#define LOG_NOTICE 5
+#define LOG_INFO 6
+#define LOG_DEBUG 7
+
+#define LOG_DAEMON (3 << 3)
+#elif defined(OPENSSL_SYS_VMS)
/* On VMS, we don't really care about these, but we need them to compile */
-# define LOG_EMERG 0
-# define LOG_ALERT 1
-# define LOG_CRIT 2
-# define LOG_ERR 3
-# define LOG_WARNING 4
-# define LOG_NOTICE 5
-# define LOG_INFO 6
-# define LOG_DEBUG 7
-
-# define LOG_DAEMON OPC$M_NM_NTWORK
-# endif
+#define LOG_EMERG 0
+#define LOG_ALERT 1
+#define LOG_CRIT 2
+#define LOG_ERR 3
+#define LOG_WARNING 4
+#define LOG_NOTICE 5
+#define LOG_INFO 6
+#define LOG_DEBUG 7
+
+#define LOG_DAEMON OPC$M_NM_NTWORK
+#endif
static int slg_write(BIO *h, const char *buf, int num);
static int slg_puts(BIO *h, const char *str);
@@ -91,14 +91,14 @@ static const BIO_METHOD methods_slg = {
"syslog",
bwrite_conv,
slg_write,
- NULL, /* slg_write_old, */
- NULL, /* slg_read, */
+ NULL, /* slg_write_old, */
+ NULL, /* slg_read, */
slg_puts,
NULL,
slg_ctrl,
slg_new,
slg_free,
- NULL, /* slg_callback_ctrl */
+ NULL, /* slg_callback_ctrl */
};
const BIO_METHOD *BIO_s_log(void)
@@ -134,66 +134,26 @@ static int slg_write(BIO *b, const char *in, int inl)
char str[10];
int log_level;
} mapping[] = {
- {
- 6, "PANIC ", LOG_EMERG
- },
- {
- 6, "EMERG ", LOG_EMERG
- },
- {
- 4, "EMR ", LOG_EMERG
- },
- {
- 6, "ALERT ", LOG_ALERT
- },
- {
- 4, "ALR ", LOG_ALERT
- },
- {
- 5, "CRIT ", LOG_CRIT
- },
- {
- 4, "CRI ", LOG_CRIT
- },
- {
- 6, "ERROR ", LOG_ERR
- },
- {
- 4, "ERR ", LOG_ERR
- },
- {
- 8, "WARNING ", LOG_WARNING
- },
- {
- 5, "WARN ", LOG_WARNING
- },
- {
- 4, "WAR ", LOG_WARNING
- },
- {
- 7, "NOTICE ", LOG_NOTICE
- },
- {
- 5, "NOTE ", LOG_NOTICE
- },
- {
- 4, "NOT ", LOG_NOTICE
- },
- {
- 5, "INFO ", LOG_INFO
- },
- {
- 4, "INF ", LOG_INFO
- },
- {
- 6, "DEBUG ", LOG_DEBUG
- },
- {
- 4, "DBG ", LOG_DEBUG
- },
- {
- 0, "", LOG_ERR
- }
+ { 6, "PANIC ", LOG_EMERG },
+ { 6, "EMERG ", LOG_EMERG },
+ { 4, "EMR ", LOG_EMERG },
+ { 6, "ALERT ", LOG_ALERT },
+ { 4, "ALR ", LOG_ALERT },
+ { 5, "CRIT ", LOG_CRIT },
+ { 4, "CRI ", LOG_CRIT },
+ { 6, "ERROR ", LOG_ERR },
+ { 4, "ERR ", LOG_ERR },
+ { 8, "WARNING ", LOG_WARNING },
+ { 5, "WARN ", LOG_WARNING },
+ { 4, "WAR ", LOG_WARNING },
+ { 7, "NOTICE ", LOG_NOTICE },
+ { 5, "NOTE ", LOG_NOTICE },
+ { 4, "NOT ", LOG_NOTICE },
+ { 5, "INFO ", LOG_INFO },
+ { 4, "INF ", LOG_INFO },
+ { 6, "DEBUG ", LOG_DEBUG },
+ { 4, "DBG ", LOG_DEBUG },
+ { 0, "", LOG_ERR }
/* The default */
};
@@ -238,7 +198,7 @@ static int slg_puts(BIO *bp, const char *str)
return ret;
}
-# if defined(OPENSSL_SYS_WIN32)
+#if defined(OPENSSL_SYS_WIN32)
static void xopenlog(BIO *bp, char *name, int level)
{
@@ -291,11 +251,11 @@ static void xsyslog(BIO *bp, int priority, const char *string)
static void xcloselog(BIO *bp)
{
if (bp->ptr)
- DeregisterEventSource((HANDLE) (bp->ptr));
+ DeregisterEventSource((HANDLE)(bp->ptr));
bp->ptr = NULL;
}
-# elif defined(OPENSSL_SYS_VMS)
+#elif defined(OPENSSL_SYS_VMS)
static int VMS_OPC_target = LOG_DAEMON;
@@ -309,21 +269,21 @@ static void xsyslog(BIO *bp, int priority, const char *string)
struct dsc$descriptor_s opc_dsc;
/* Arrange 32-bit pointer to opcdef buffer and malloc(), if needed. */
-# if __INITIAL_POINTER_SIZE == 64
-# pragma pointer_size save
-# pragma pointer_size 32
-# define OPCDEF_TYPE __char_ptr32
-# define OPCDEF_MALLOC _malloc32
-# else /* __INITIAL_POINTER_SIZE == 64 */
-# define OPCDEF_TYPE char *
-# define OPCDEF_MALLOC OPENSSL_malloc
-# endif /* __INITIAL_POINTER_SIZE == 64 [else] */
+#if __INITIAL_POINTER_SIZE == 64
+#pragma pointer_size save
+#pragma pointer_size 32
+#define OPCDEF_TYPE __char_ptr32
+#define OPCDEF_MALLOC _malloc32
+#else /* __INITIAL_POINTER_SIZE == 64 */
+#define OPCDEF_TYPE char *
+#define OPCDEF_MALLOC OPENSSL_malloc
+#endif /* __INITIAL_POINTER_SIZE == 64 [else] */
struct opcdef *opcdef_p;
-# if __INITIAL_POINTER_SIZE == 64
-# pragma pointer_size restore
-# endif /* __INITIAL_POINTER_SIZE == 64 */
+#if __INITIAL_POINTER_SIZE == 64
+#pragma pointer_size restore
+#endif /* __INITIAL_POINTER_SIZE == 64 */
char buf[10240];
unsigned int len;
@@ -374,7 +334,7 @@ static void xsyslog(BIO *bp, int priority, const char *string)
opc_dsc.dsc$b_dtype = DSC$K_DTYPE_T;
opc_dsc.dsc$b_class = DSC$K_CLASS_S;
- opc_dsc.dsc$a_pointer = (OPCDEF_TYPE) opcdef_p;
+ opc_dsc.dsc$a_pointer = (OPCDEF_TYPE)opcdef_p;
opc_dsc.dsc$w_length = len + 8;
sys$sndopr(opc_dsc, 0);
@@ -386,15 +346,15 @@ static void xcloselog(BIO *bp)
{
}
-# else /* Unix/Watt32 */
+#else /* Unix/Watt32 */
static void xopenlog(BIO *bp, char *name, int level)
{
-# ifdef WATT32 /* djgpp/DOS */
+#ifdef WATT32 /* djgpp/DOS */
openlog(name, LOG_PID | LOG_CONS | LOG_NDELAY, level);
-# else
+#else
openlog(name, LOG_PID | LOG_CONS, level);
-# endif
+#endif
}
static void xsyslog(BIO *bp, int priority, const char *string)
@@ -407,11 +367,11 @@ static void xcloselog(BIO *bp)
closelog();
}
-# endif /* Unix */
+#endif /* Unix */
-#else /* NO_SYSLOG */
+#else /* NO_SYSLOG */
const BIO_METHOD *BIO_s_log(void)
{
return NULL;
}
-#endif /* NO_SYSLOG */
+#endif /* NO_SYSLOG */
diff --git a/crypto/bio/bss_mem.c b/crypto/bio/bss_mem.c
index 305d2b6848..7d817fecd0 100644
--- a/crypto/bio/bss_mem.c
+++ b/crypto/bio/bss_mem.c
@@ -35,7 +35,7 @@ static const BIO_METHOD mem_method = {
mem_ctrl,
mem_new,
mem_free,
- NULL, /* mem_callback_ctrl */
+ NULL, /* mem_callback_ctrl */
};
static const BIO_METHOD secmem_method = {
@@ -50,7 +50,7 @@ static const BIO_METHOD secmem_method = {
mem_ctrl,
secmem_new,
mem_free,
- NULL, /* mem_callback_ctrl */
+ NULL, /* mem_callback_ctrl */
};
/*
@@ -60,7 +60,7 @@ static const BIO_METHOD secmem_method = {
* to be used for reset.
*/
typedef struct bio_buf_mem_st {
- struct buf_mem_st *buf; /* allocated buffer */
+ struct buf_mem_st *buf; /* allocated buffer */
struct buf_mem_st *readp; /* read pointer */
} BIO_BUF_MEM;
@@ -235,7 +235,7 @@ static int mem_write(BIO *b, const char *in, int inl)
memcpy(bbm->buf->data + blen, in, inl);
*bbm->readp = *bbm->buf;
ret = inl;
- end:
+end:
return ret;
}
@@ -244,7 +244,7 @@ static long mem_ctrl(BIO *b, int cmd, long num, void *ptr)
long ret = 1;
char **pptr;
BIO_BUF_MEM *bbm = (BIO_BUF_MEM *)b->ptr;
- BUF_MEM *bm, *bo; /* bio_mem, bio_other */
+ BUF_MEM *bm, *bo; /* bio_mem, bio_other */
ossl_ssize_t off, remain;
if (b->flags & BIO_FLAGS_MEM_RDONLY) {
@@ -275,7 +275,7 @@ static long mem_ctrl(BIO *b, int cmd, long num, void *ptr)
break;
case BIO_C_FILE_SEEK:
if (num < 0 || num > off + remain)
- return -1; /* Can't see outside of the current buffer */
+ return -1; /* Can't see outside of the current buffer */
bm->data = (num != 0) ? bo->data + num : bo->data;
bm->length = bo->length - num;
@@ -351,7 +351,7 @@ static int mem_gets(BIO *bp, char *buf, int size)
if (bp->flags & BIO_FLAGS_MEM_RDONLY)
bm = bbm->buf;
BIO_clear_retry_flags(bp);
- j = bm->length < INT_MAX ? (int)bm->length: INT_MAX;
+ j = bm->length < INT_MAX ? (int)bm->length : INT_MAX;
if ((size - 1) < j)
j = size - 1;
if (j <= 0) {
diff --git a/crypto/bio/bss_null.c b/crypto/bio/bss_null.c
index abc43b0599..ba51be7a0c 100644
--- a/crypto/bio/bss_null.c
+++ b/crypto/bio/bss_null.c
@@ -29,7 +29,7 @@ static const BIO_METHOD null_method = {
null_ctrl,
NULL,
NULL,
- NULL, /* null_callback_ctrl */
+ NULL, /* null_callback_ctrl */
};
const BIO_METHOD *BIO_s_null(void)
diff --git a/crypto/bio/bss_sock.c b/crypto/bio/bss_sock.c
index 0d8d132d6e..11a8ce200c 100644
--- a/crypto/bio/bss_sock.c
+++ b/crypto/bio/bss_sock.c
@@ -16,17 +16,17 @@
#ifndef OPENSSL_NO_SOCK
-# include <openssl/bio.h>
+#include <openssl/bio.h>
-# ifdef WATT32
+#ifdef WATT32
/* Watt-32 uses same names */
-# undef sock_write
-# undef sock_read
-# undef sock_puts
-# define sock_write SockWrite
-# define sock_read SockRead
-# define sock_puts SockPuts
-# endif
+#undef sock_write
+#undef sock_read
+#undef sock_puts
+#define sock_write SockWrite
+#define sock_read SockRead
+#define sock_puts SockPuts
+#endif
struct bss_sock_st {
BIO_ADDR tfo_peer;
@@ -52,11 +52,11 @@ static const BIO_METHOD methods_sockp = {
bread_conv,
sock_read,
sock_puts,
- NULL, /* sock_gets, */
+ NULL, /* sock_gets, */
sock_ctrl,
sock_new,
sock_free,
- NULL, /* sock_callback_ctrl */
+ NULL, /* sock_callback_ctrl */
};
const BIO_METHOD *BIO_s_socket(void)
@@ -108,11 +108,11 @@ static int sock_read(BIO *b, char *out, int outl)
if (out != NULL) {
clear_socket_error();
-# ifndef OPENSSL_NO_KTLS
+#ifndef OPENSSL_NO_KTLS
if (BIO_get_ktls_recv(b))
ret = ktls_read_record(b->num, out, outl);
else
-# endif
+#endif
ret = readsocket(b->num, out, outl);
BIO_clear_retry_flags(b);
if (ret <= 0) {
@@ -128,12 +128,12 @@ static int sock_read(BIO *b, char *out, int outl)
static int sock_write(BIO *b, const char *in, int inl)
{
int ret = 0;
-# if !defined(OPENSSL_NO_KTLS) || defined(OSSL_TFO_SENDTO)
+#if !defined(OPENSSL_NO_KTLS) || defined(OSSL_TFO_SENDTO)
struct bss_sock_st *data = (struct bss_sock_st *)b->ptr;
-# endif
+#endif
clear_socket_error();
-# ifndef OPENSSL_NO_KTLS
+#ifndef OPENSSL_NO_KTLS
if (BIO_should_ktls_ctrl_msg_flag(b)) {
unsigned char record_type = data->ktls_record_type;
ret = ktls_send_ctrl_message(b->num, record_type, in, inl);
@@ -142,17 +142,17 @@ static int sock_write(BIO *b, const char *in, int inl)
BIO_clear_ktls_ctrl_msg_flag(b);
}
} else
-# endif
-# if defined(OSSL_TFO_SENDTO)
- if (data->tfo_first) {
+#endif
+#if defined(OSSL_TFO_SENDTO)
+ if (data->tfo_first) {
struct bss_sock_st *data = (struct bss_sock_st *)b->ptr;
socklen_t peerlen = BIO_ADDR_sockaddr_size(&data->tfo_peer);
ret = sendto(b->num, in, inl, OSSL_TFO_SENDTO,
- BIO_ADDR_sockaddr(&data->tfo_peer), peerlen);
+ BIO_ADDR_sockaddr(&data->tfo_peer), peerlen);
data->tfo_first = 0;
} else
-# endif
+#endif
ret = writesocket(b->num, in, inl);
BIO_clear_retry_flags(b);
if (ret <= 0) {
@@ -167,9 +167,9 @@ static long sock_ctrl(BIO *b, int cmd, long num, void *ptr)
long ret = 1;
int *ip;
struct bss_sock_st *data = (struct bss_sock_st *)b->ptr;
-# ifndef OPENSSL_NO_KTLS
+#ifndef OPENSSL_NO_KTLS
ktls_crypto_info_t *crypto_info;
-# endif
+#endif
switch (cmd) {
case BIO_C_SET_FD:
@@ -205,20 +205,18 @@ static long sock_ctrl(BIO *b, int cmd, long num, void *ptr)
ret = 1;
break;
case BIO_CTRL_GET_RPOLL_DESCRIPTOR:
- case BIO_CTRL_GET_WPOLL_DESCRIPTOR:
- {
- BIO_POLL_DESCRIPTOR *pd = ptr;
+ case BIO_CTRL_GET_WPOLL_DESCRIPTOR: {
+ BIO_POLL_DESCRIPTOR *pd = ptr;
- if (!b->init) {
- ret = 0;
- break;
- }
-
- pd->type = BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD;
- pd->value.fd = b->num;
+ if (!b->init) {
+ ret = 0;
+ break;
}
- break;
-# ifndef OPENSSL_NO_KTLS
+
+ pd->type = BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD;
+ pd->value.fd = b->num;
+ } break;
+#ifndef OPENSSL_NO_KTLS
case BIO_CTRL_SET_KTLS:
crypto_info = (ktls_crypto_info_t *)ptr;
ret = ktls_start(b->num, crypto_info, num);
@@ -243,7 +241,7 @@ static long sock_ctrl(BIO *b, int cmd, long num, void *ptr)
if (ret)
BIO_set_ktls_zerocopy_sendfile_flag(b);
break;
-# endif
+#endif
case BIO_CTRL_EOF:
ret = (b->flags & BIO_FLAGS_IN_EOF) != 0;
break;
@@ -259,7 +257,7 @@ static long sock_ctrl(BIO *b, int cmd, long num, void *ptr)
case BIO_C_SET_CONNECT:
if (ptr != NULL && num == 2) {
ret = BIO_ADDR_make(&data->tfo_peer,
- BIO_ADDR_sockaddr((const BIO_ADDR *)ptr));
+ BIO_ADDR_sockaddr((const BIO_ADDR *)ptr));
if (ret)
data->tfo_first = 1;
} else {
@@ -298,23 +296,23 @@ int BIO_sock_should_retry(int i)
int BIO_sock_non_fatal_error(int err)
{
-# if defined(OPENSSL_SYS_WINDOWS)
+#if defined(OPENSSL_SYS_WINDOWS)
return err == WSAEWOULDBLOCK
|| err == WSAENOTCONN
|| err == WSAEINTR
|| err == WSAEINPROGRESS
|| err == WSAEALREADY;
-# else /* POSIX.1-2001 */
+#else /* POSIX.1-2001 */
return err == EWOULDBLOCK
|| err == EAGAIN
|| err == ENOTCONN
|| err == EINTR
-# if !defined(__DJGPP__) && !defined(OPENSSL_SYS_TANDEM)
+#if !defined(__DJGPP__) && !defined(OPENSSL_SYS_TANDEM)
|| err == EPROTO
-# endif
+#endif
|| err == EINPROGRESS
|| err == EALREADY;
-# endif
+#endif
}
-#endif /* #ifndef OPENSSL_NO_SOCK */
+#endif /* #ifndef OPENSSL_NO_SOCK */
diff --git a/crypto/bio/ossl_core_bio.c b/crypto/bio/ossl_core_bio.c
index 8d21115b65..79fb54abd9 100644
--- a/crypto/bio/ossl_core_bio.c
+++ b/crypto/bio/ossl_core_bio.c
@@ -90,13 +90,13 @@ OSSL_CORE_BIO *ossl_core_bio_new_mem_buf(const void *buf, int len)
}
int ossl_core_bio_read_ex(OSSL_CORE_BIO *cb, void *data, size_t dlen,
- size_t *readbytes)
+ size_t *readbytes)
{
return BIO_read_ex(cb->bio, data, dlen, readbytes);
}
int ossl_core_bio_write_ex(OSSL_CORE_BIO *cb, const void *data, size_t dlen,
- size_t *written)
+ size_t *written)
{
return BIO_write_ex(cb->bio, data, dlen, written);
}
diff --git a/crypto/bn/asm/x86_64-gcc.c b/crypto/bn/asm/x86_64-gcc.c
index 7049a4f382..7edb77806e 100644
--- a/crypto/bn/asm/x86_64-gcc.c
+++ b/crypto/bn/asm/x86_64-gcc.c
@@ -8,7 +8,7 @@
*/
#include "../bn_local.h"
-#if !(defined(__GNUC__) && __GNUC__>=2)
+#if !(defined(__GNUC__) && __GNUC__ >= 2)
/* clang-format off */
# include "../bn_asm.c" /* kind of dirty hack for Sun Studio */
/* clang-format on */
@@ -65,52 +65,54 @@
* machine.
*/
-# undef mul
-# undef mul_add
+#undef mul
+#undef mul_add
/*-
* "m"(a), "+m"(r) is the way to favor DirectPath µ-code;
* "g"(0) let the compiler to decide where does it
* want to keep the value of zero;
*/
-# define mul_add(r,a,word,carry) do { \
- register BN_ULONG high,low; \
- asm ("mulq %3" \
- : "=a"(low),"=d"(high) \
- : "a"(word),"m"(a) \
- : "cc"); \
- asm ("addq %2,%0; adcq %3,%1" \
- : "+r"(carry),"+d"(high)\
- : "a"(low),"g"(0) \
- : "cc"); \
- asm ("addq %2,%0; adcq %3,%1" \
- : "+m"(r),"+d"(high) \
- : "r"(carry),"g"(0) \
- : "cc"); \
- carry=high; \
- } while (0)
-
-# define mul(r,a,word,carry) do { \
- register BN_ULONG high,low; \
- asm ("mulq %3" \
- : "=a"(low),"=d"(high) \
- : "a"(word),"g"(a) \
- : "cc"); \
- asm ("addq %2,%0; adcq %3,%1" \
- : "+r"(carry),"+d"(high)\
- : "a"(low),"g"(0) \
- : "cc"); \
- (r)=carry, carry=high; \
- } while (0)
-# undef sqr
-# define sqr(r0,r1,a) \
- asm ("mulq %2" \
- : "=a"(r0),"=d"(r1) \
- : "a"(a) \
- : "cc");
+#define mul_add(r, a, word, carry) \
+ do { \
+ register BN_ULONG high, low; \
+ asm("mulq %3" \
+ : "=a"(low), "=d"(high) \
+ : "a"(word), "m"(a) \
+ : "cc"); \
+ asm("addq %2,%0; adcq %3,%1" \
+ : "+r"(carry), "+d"(high) \
+ : "a"(low), "g"(0) \
+ : "cc"); \
+ asm("addq %2,%0; adcq %3,%1" \
+ : "+m"(r), "+d"(high) \
+ : "r"(carry), "g"(0) \
+ : "cc"); \
+ carry = high; \
+ } while (0)
+
+#define mul(r, a, word, carry) \
+ do { \
+ register BN_ULONG high, low; \
+ asm("mulq %3" \
+ : "=a"(low), "=d"(high) \
+ : "a"(word), "g"(a) \
+ : "cc"); \
+ asm("addq %2,%0; adcq %3,%1" \
+ : "+r"(carry), "+d"(high) \
+ : "a"(low), "g"(0) \
+ : "cc"); \
+ (r) = carry, carry = high; \
+ } while (0)
+#undef sqr
+#define sqr(r0, r1, a) \
+ asm("mulq %2" \
+ : "=a"(r0), "=d"(r1) \
+ : "a"(a) \
+ : "cc");
BN_ULONG bn_mul_add_words(BN_ULONG *rp, const BN_ULONG *ap, int num,
- BN_ULONG w)
+ BN_ULONG w)
{
BN_ULONG c1 = 0;
@@ -197,15 +199,15 @@ BN_ULONG bn_div_words(BN_ULONG h, BN_ULONG l, BN_ULONG d)
{
BN_ULONG ret, waste;
- asm("divq %4":"=a"(ret), "=d"(waste)
- : "a"(l), "d"(h), "r"(d)
- : "cc");
+ asm("divq %4" : "=a"(ret), "=d"(waste)
+ : "a"(l), "d"(h), "r"(d)
+ : "cc");
return ret;
}
BN_ULONG bn_add_words(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
- int n)
+ int n)
{
BN_ULONG ret;
size_t i = 0;
@@ -213,26 +215,26 @@ BN_ULONG bn_add_words(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
if (n <= 0)
return 0;
- asm volatile (" subq %0,%0 \n" /* clear carry */
- " jmp 1f \n"
- ".p2align 4 \n"
- "1: movq (%4,%2,8),%0 \n"
- " adcq (%5,%2,8),%0 \n"
- " movq %0,(%3,%2,8) \n"
- " lea 1(%2),%2 \n"
- " dec %1 \n"
- " jnz 1b \n"
- " sbbq %0,%0 \n"
- :"=&r" (ret), "+c"(n), "+r"(i)
- :"r"(rp), "r"(ap), "r"(bp)
- :"cc", "memory");
+ asm volatile(" subq %0,%0 \n" /* clear carry */
+ " jmp 1f \n"
+ ".p2align 4 \n"
+ "1: movq (%4,%2,8),%0 \n"
+ " adcq (%5,%2,8),%0 \n"
+ " movq %0,(%3,%2,8) \n"
+ " lea 1(%2),%2 \n"
+ " dec %1 \n"
+ " jnz 1b \n"
+ " sbbq %0,%0 \n"
+ : "=&r"(ret), "+c"(n), "+r"(i)
+ : "r"(rp), "r"(ap), "r"(bp)
+ : "cc", "memory");
return ret & 1;
}
-# ifndef SIMICS
+#ifndef SIMICS
BN_ULONG bn_sub_words(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
- int n)
+ int n)
{
BN_ULONG ret;
size_t i = 0;
@@ -240,25 +242,25 @@ BN_ULONG bn_sub_words(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
if (n <= 0)
return 0;
- asm volatile (" subq %0,%0 \n" /* clear borrow */
- " jmp 1f \n"
- ".p2align 4 \n"
- "1: movq (%4,%2,8),%0 \n"
- " sbbq (%5,%2,8),%0 \n"
- " movq %0,(%3,%2,8) \n"
- " lea 1(%2),%2 \n"
- " dec %1 \n"
- " jnz 1b \n"
- " sbbq %0,%0 \n"
- :"=&r" (ret), "+c"(n), "+r"(i)
- :"r"(rp), "r"(ap), "r"(bp)
- :"cc", "memory");
+ asm volatile(" subq %0,%0 \n" /* clear borrow */
+ " jmp 1f \n"
+ ".p2align 4 \n"
+ "1: movq (%4,%2,8),%0 \n"
+ " sbbq (%5,%2,8),%0 \n"
+ " movq %0,(%3,%2,8) \n"
+ " lea 1(%2),%2 \n"
+ " dec %1 \n"
+ " jnz 1b \n"
+ " sbbq %0,%0 \n"
+ : "=&r"(ret), "+c"(n), "+r"(i)
+ : "r"(rp), "r"(ap), "r"(bp)
+ : "cc", "memory");
return ret & 1;
}
-# else
+#else
/* Simics 1.4<7 has buggy sbbq:-( */
-# define BN_MASK2 0xffffffffffffffffL
+#define BN_MASK2 0xffffffffffffffffL
BN_ULONG bn_sub_words(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n)
{
BN_ULONG t1, t2;
@@ -306,7 +308,7 @@ BN_ULONG bn_sub_words(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n)
}
return c;
}
-# endif
+#endif
/* mul_add_c(a,b,c0,c1,c2) -- c+=a*b for three word number c=(c2,c1,c0) */
/* mul_add_c2(a,b,c0,c1,c2) -- c+=2*a*b for three word number c=(c2,c1,c0) */
@@ -320,77 +322,91 @@ BN_ULONG bn_sub_words(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n)
* Keep in mind that carrying into high part of multiplication result
* can not overflow, because it cannot be all-ones.
*/
-# if 0
+#if 0
/* original macros are kept for reference purposes */
-# define mul_add_c(a,b,c0,c1,c2) do { \
- BN_ULONG ta = (a), tb = (b); \
- BN_ULONG lo, hi; \
- BN_UMULT_LOHI(lo,hi,ta,tb); \
- c0 += lo; hi += (c0<lo)?1:0; \
- c1 += hi; c2 += (c1<hi)?1:0; \
- } while(0)
-
-# define mul_add_c2(a,b,c0,c1,c2) do { \
- BN_ULONG ta = (a), tb = (b); \
- BN_ULONG lo, hi, tt; \
- BN_UMULT_LOHI(lo,hi,ta,tb); \
- c0 += lo; tt = hi+((c0<lo)?1:0); \
- c1 += tt; c2 += (c1<tt)?1:0; \
- c0 += lo; hi += (c0<lo)?1:0; \
- c1 += hi; c2 += (c1<hi)?1:0; \
- } while(0)
-
-# define sqr_add_c(a,i,c0,c1,c2) do { \
- BN_ULONG ta = (a)[i]; \
- BN_ULONG lo, hi; \
- BN_UMULT_LOHI(lo,hi,ta,ta); \
- c0 += lo; hi += (c0<lo)?1:0; \
- c1 += hi; c2 += (c1<hi)?1:0; \
- } while(0)
-# else
-# define mul_add_c(a,b,c0,c1,c2) do { \
- BN_ULONG t1,t2; \
- asm ("mulq %3" \
- : "=a"(t1),"=d"(t2) \
- : "a"(a),"m"(b) \
- : "cc"); \
- asm ("addq %3,%0; adcq %4,%1; adcq %5,%2" \
- : "+r"(c0),"+r"(c1),"+r"(c2) \
- : "r"(t1),"r"(t2),"g"(0) \
- : "cc"); \
- } while (0)
-
-# define sqr_add_c(a,i,c0,c1,c2) do { \
- BN_ULONG t1,t2; \
- asm ("mulq %2" \
- : "=a"(t1),"=d"(t2) \
- : "a"(a[i]) \
- : "cc"); \
- asm ("addq %3,%0; adcq %4,%1; adcq %5,%2" \
- : "+r"(c0),"+r"(c1),"+r"(c2) \
- : "r"(t1),"r"(t2),"g"(0) \
- : "cc"); \
- } while (0)
-
-# define mul_add_c2(a,b,c0,c1,c2) do { \
- BN_ULONG t1,t2; \
- asm ("mulq %3" \
- : "=a"(t1),"=d"(t2) \
- : "a"(a),"m"(b) \
- : "cc"); \
- asm ("addq %3,%0; adcq %4,%1; adcq %5,%2" \
- : "+r"(c0),"+r"(c1),"+r"(c2) \
- : "r"(t1),"r"(t2),"g"(0) \
- : "cc"); \
- asm ("addq %3,%0; adcq %4,%1; adcq %5,%2" \
- : "+r"(c0),"+r"(c1),"+r"(c2) \
- : "r"(t1),"r"(t2),"g"(0) \
- : "cc"); \
- } while (0)
-# endif
-
-# define sqr_add_c2(a,i,j,c0,c1,c2) \
- mul_add_c2((a)[i],(a)[j],c0,c1,c2)
+#define mul_add_c(a, b, c0, c1, c2) \
+ do { \
+ BN_ULONG ta = (a), tb = (b); \
+ BN_ULONG lo, hi; \
+ BN_UMULT_LOHI(lo, hi, ta, tb); \
+ c0 += lo; \
+ hi += (c0 < lo) ? 1 : 0; \
+ c1 += hi; \
+ c2 += (c1 < hi) ? 1 : 0; \
+ } while (0)
+
+#define mul_add_c2(a, b, c0, c1, c2) \
+ do { \
+ BN_ULONG ta = (a), tb = (b); \
+ BN_ULONG lo, hi, tt; \
+ BN_UMULT_LOHI(lo, hi, ta, tb); \
+ c0 += lo; \
+ tt = hi + ((c0 < lo) ? 1 : 0); \
+ c1 += tt; \
+ c2 += (c1 < tt) ? 1 : 0; \
+ c0 += lo; \
+ hi += (c0 < lo) ? 1 : 0; \
+ c1 += hi; \
+ c2 += (c1 < hi) ? 1 : 0; \
+ } while (0)
+
+#define sqr_add_c(a, i, c0, c1, c2) \
+ do { \
+ BN_ULONG ta = (a)[i]; \
+ BN_ULONG lo, hi; \
+ BN_UMULT_LOHI(lo, hi, ta, ta); \
+ c0 += lo; \
+ hi += (c0 < lo) ? 1 : 0; \
+ c1 += hi; \
+ c2 += (c1 < hi) ? 1 : 0; \
+ } while (0)
+#else
+#define mul_add_c(a, b, c0, c1, c2) \
+ do { \
+ BN_ULONG t1, t2; \
+ asm("mulq %3" \
+ : "=a"(t1), "=d"(t2) \
+ : "a"(a), "m"(b) \
+ : "cc"); \
+ asm("addq %3,%0; adcq %4,%1; adcq %5,%2" \
+ : "+r"(c0), "+r"(c1), "+r"(c2) \
+ : "r"(t1), "r"(t2), "g"(0) \
+ : "cc"); \
+ } while (0)
+
+#define sqr_add_c(a, i, c0, c1, c2) \
+ do { \
+ BN_ULONG t1, t2; \
+ asm("mulq %2" \
+ : "=a"(t1), "=d"(t2) \
+ : "a"(a[i]) \
+ : "cc"); \
+ asm("addq %3,%0; adcq %4,%1; adcq %5,%2" \
+ : "+r"(c0), "+r"(c1), "+r"(c2) \
+ : "r"(t1), "r"(t2), "g"(0) \
+ : "cc"); \
+ } while (0)
+
+#define mul_add_c2(a, b, c0, c1, c2) \
+ do { \
+ BN_ULONG t1, t2; \
+ asm("mulq %3" \
+ : "=a"(t1), "=d"(t2) \
+ : "a"(a), "m"(b) \
+ : "cc"); \
+ asm("addq %3,%0; adcq %4,%1; adcq %5,%2" \
+ : "+r"(c0), "+r"(c1), "+r"(c2) \
+ : "r"(t1), "r"(t2), "g"(0) \
+ : "cc"); \
+ asm("addq %3,%0; adcq %4,%1; adcq %5,%2" \
+ : "+r"(c0), "+r"(c1), "+r"(c2) \
+ : "r"(t1), "r"(t2), "g"(0) \
+ : "cc"); \
+ } while (0)
+#endif
+
+#define sqr_add_c2(a, i, j, c0, c1, c2) \
+ mul_add_c2((a)[i], (a)[j], c0, c1, c2)
void bn_mul_comba8(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b)
{
diff --git a/crypto/bn/bn_add.c b/crypto/bn/bn_add.c
index 10dbdadbe4..88d77c534f 100644
--- a/crypto/bn/bn_add.c
+++ b/crypto/bn/bn_add.c
@@ -135,7 +135,7 @@ int BN_usub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b)
min = b->top;
dif = max - min;
- if (dif < 0) { /* hmm... should not be happening */
+ if (dif < 0) { /* hmm... should not be happening */
ERR_raise(ERR_LIB_BN, BN_R_ARG2_LT_ARG3);
return 0;
}
@@ -168,4 +168,3 @@ int BN_usub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b)
return 1;
}
-
diff --git a/crypto/bn/bn_asm.c b/crypto/bn/bn_asm.c
index c39907a7df..0a77f1b070 100644
--- a/crypto/bn/bn_asm.c
+++ b/crypto/bn/bn_asm.c
@@ -15,7 +15,7 @@
#if defined(BN_LLONG) || defined(BN_UMULT_HIGH)
BN_ULONG bn_mul_add_words(BN_ULONG *rp, const BN_ULONG *ap, int num,
- BN_ULONG w)
+ BN_ULONG w)
{
BN_ULONG c1 = 0;
@@ -23,7 +23,7 @@ BN_ULONG bn_mul_add_words(BN_ULONG *rp, const BN_ULONG *ap, int num,
if (num <= 0)
return c1;
-# ifndef OPENSSL_SMALL_FOOTPRINT
+#ifndef OPENSSL_SMALL_FOOTPRINT
while (num & ~3) {
mul_add(rp[0], ap[0], w, c1);
mul_add(rp[1], ap[1], w, c1);
@@ -33,7 +33,7 @@ BN_ULONG bn_mul_add_words(BN_ULONG *rp, const BN_ULONG *ap, int num,
rp += 4;
num -= 4;
}
-# endif
+#endif
while (num) {
mul_add(rp[0], ap[0], w, c1);
ap++;
@@ -52,7 +52,7 @@ BN_ULONG bn_mul_words(BN_ULONG *rp, const BN_ULONG *ap, int num, BN_ULONG w)
if (num <= 0)
return c1;
-# ifndef OPENSSL_SMALL_FOOTPRINT
+#ifndef OPENSSL_SMALL_FOOTPRINT
while (num & ~3) {
mul(rp[0], ap[0], w, c1);
mul(rp[1], ap[1], w, c1);
@@ -62,7 +62,7 @@ BN_ULONG bn_mul_words(BN_ULONG *rp, const BN_ULONG *ap, int num, BN_ULONG w)
rp += 4;
num -= 4;
}
-# endif
+#endif
while (num) {
mul(rp[0], ap[0], w, c1);
ap++;
@@ -78,7 +78,7 @@ void bn_sqr_words(BN_ULONG *r, const BN_ULONG *a, int n)
if (n <= 0)
return;
-# ifndef OPENSSL_SMALL_FOOTPRINT
+#ifndef OPENSSL_SMALL_FOOTPRINT
while (n & ~3) {
sqr(r[0], r[1], a[0]);
sqr(r[2], r[3], a[1]);
@@ -88,7 +88,7 @@ void bn_sqr_words(BN_ULONG *r, const BN_ULONG *a, int n)
r += 8;
n -= 4;
}
-# endif
+#endif
while (n) {
sqr(r[0], r[1], a[0]);
a++;
@@ -97,11 +97,11 @@ void bn_sqr_words(BN_ULONG *r, const BN_ULONG *a, int n)
}
}
-#else /* !(defined(BN_LLONG) ||
- * defined(BN_UMULT_HIGH)) */
+#else /* !(defined(BN_LLONG) || \
+ * defined(BN_UMULT_HIGH)) */
BN_ULONG bn_mul_add_words(BN_ULONG *rp, const BN_ULONG *ap, int num,
- BN_ULONG w)
+ BN_ULONG w)
{
BN_ULONG c = 0;
BN_ULONG bl, bh;
@@ -113,7 +113,7 @@ BN_ULONG bn_mul_add_words(BN_ULONG *rp, const BN_ULONG *ap, int num,
bl = LBITS(w);
bh = HBITS(w);
-# ifndef OPENSSL_SMALL_FOOTPRINT
+#ifndef OPENSSL_SMALL_FOOTPRINT
while (num & ~3) {
mul_add(rp[0], ap[0], bl, bh, c);
mul_add(rp[1], ap[1], bl, bh, c);
@@ -123,7 +123,7 @@ BN_ULONG bn_mul_add_words(BN_ULONG *rp, const BN_ULONG *ap, int num,
rp += 4;
num -= 4;
}
-# endif
+#endif
while (num) {
mul_add(rp[0], ap[0], bl, bh, c);
ap++;
@@ -145,7 +145,7 @@ BN_ULONG bn_mul_words(BN_ULONG *rp, const BN_ULONG *ap, int num, BN_ULONG w)
bl = LBITS(w);
bh = HBITS(w);
-# ifndef OPENSSL_SMALL_FOOTPRINT
+#ifndef OPENSSL_SMALL_FOOTPRINT
while (num & ~3) {
mul(rp[0], ap[0], bl, bh, carry);
mul(rp[1], ap[1], bl, bh, carry);
@@ -155,7 +155,7 @@ BN_ULONG bn_mul_words(BN_ULONG *rp, const BN_ULONG *ap, int num, BN_ULONG w)
rp += 4;
num -= 4;
}
-# endif
+#endif
while (num) {
mul(rp[0], ap[0], bl, bh, carry);
ap++;
@@ -171,7 +171,7 @@ void bn_sqr_words(BN_ULONG *r, const BN_ULONG *a, int n)
if (n <= 0)
return;
-# ifndef OPENSSL_SMALL_FOOTPRINT
+#ifndef OPENSSL_SMALL_FOOTPRINT
while (n & ~3) {
sqr64(r[0], r[1], a[0]);
sqr64(r[2], r[3], a[1]);
@@ -181,7 +181,7 @@ void bn_sqr_words(BN_ULONG *r, const BN_ULONG *a, int n)
r += 8;
n -= 4;
}
-# endif
+#endif
while (n) {
sqr64(r[0], r[1], a[0]);
a++;
@@ -190,14 +190,14 @@ void bn_sqr_words(BN_ULONG *r, const BN_ULONG *a, int n)
}
}
-#endif /* !(defined(BN_LLONG) ||
- * defined(BN_UMULT_HIGH)) */
+#endif /* !(defined(BN_LLONG) || \
+ * defined(BN_UMULT_HIGH)) */
#if defined(BN_LLONG) && defined(BN_DIV2W)
BN_ULONG bn_div_words(BN_ULONG h, BN_ULONG l, BN_ULONG d)
{
- return ((BN_ULONG)(((((BN_ULLONG) h) << BN_BITS2) | l) / (BN_ULLONG) d));
+ return ((BN_ULONG)(((((BN_ULLONG)h) << BN_BITS2) | l) / (BN_ULLONG)d));
}
#else
@@ -236,8 +236,7 @@ BN_ULONG bn_div_words(BN_ULONG h, BN_ULONG l, BN_ULONG d)
tl = dl * q;
for (;;) {
t = h - th;
- if ((t & BN_MASK2h) ||
- ((tl) <= ((t << BN_BITS4) | ((l & BN_MASK2h) >> BN_BITS4))))
+ if ((t & BN_MASK2h) || ((tl) <= ((t << BN_BITS4) | ((l & BN_MASK2h) >> BN_BITS4))))
break;
q--;
th -= dh;
@@ -266,11 +265,11 @@ BN_ULONG bn_div_words(BN_ULONG h, BN_ULONG l, BN_ULONG d)
ret |= q;
return ret;
}
-#endif /* !defined(BN_LLONG) && defined(BN_DIV2W) */
+#endif /* !defined(BN_LLONG) && defined(BN_DIV2W) */
#ifdef BN_LLONG
BN_ULONG bn_add_words(BN_ULONG *r, const BN_ULONG *a, const BN_ULONG *b,
- int n)
+ int n)
{
BN_ULLONG ll = 0;
@@ -278,18 +277,18 @@ BN_ULONG bn_add_words(BN_ULONG *r, const BN_ULONG *a, const BN_ULONG *b,
if (n <= 0)
return (BN_ULONG)0;
-# ifndef OPENSSL_SMALL_FOOTPRINT
+#ifndef OPENSSL_SMALL_FOOTPRINT
while (n & ~3) {
- ll += (BN_ULLONG) a[0] + b[0];
+ ll += (BN_ULLONG)a[0] + b[0];
r[0] = (BN_ULONG)ll & BN_MASK2;
ll >>= BN_BITS2;
- ll += (BN_ULLONG) a[1] + b[1];
+ ll += (BN_ULLONG)a[1] + b[1];
r[1] = (BN_ULONG)ll & BN_MASK2;
ll >>= BN_BITS2;
- ll += (BN_ULLONG) a[2] + b[2];
+ ll += (BN_ULLONG)a[2] + b[2];
r[2] = (BN_ULONG)ll & BN_MASK2;
ll >>= BN_BITS2;
- ll += (BN_ULLONG) a[3] + b[3];
+ ll += (BN_ULLONG)a[3] + b[3];
r[3] = (BN_ULONG)ll & BN_MASK2;
ll >>= BN_BITS2;
a += 4;
@@ -297,9 +296,9 @@ BN_ULONG bn_add_words(BN_ULONG *r, const BN_ULONG *a, const BN_ULONG *b,
r += 4;
n -= 4;
}
-# endif
+#endif
while (n) {
- ll += (BN_ULLONG) a[0] + b[0];
+ ll += (BN_ULLONG)a[0] + b[0];
r[0] = (BN_ULONG)ll & BN_MASK2;
ll >>= BN_BITS2;
a++;
@@ -309,9 +308,9 @@ BN_ULONG bn_add_words(BN_ULONG *r, const BN_ULONG *a, const BN_ULONG *b,
}
return (BN_ULONG)ll;
}
-#else /* !BN_LLONG */
+#else /* !BN_LLONG */
BN_ULONG bn_add_words(BN_ULONG *r, const BN_ULONG *a, const BN_ULONG *b,
- int n)
+ int n)
{
BN_ULONG c, l, t;
@@ -320,7 +319,7 @@ BN_ULONG bn_add_words(BN_ULONG *r, const BN_ULONG *a, const BN_ULONG *b,
return (BN_ULONG)0;
c = 0;
-# ifndef OPENSSL_SMALL_FOOTPRINT
+#ifndef OPENSSL_SMALL_FOOTPRINT
while (n & ~3) {
t = a[0];
t = (t + c) & BN_MASK2;
@@ -351,7 +350,7 @@ BN_ULONG bn_add_words(BN_ULONG *r, const BN_ULONG *a, const BN_ULONG *b,
r += 4;
n -= 4;
}
-# endif
+#endif
while (n) {
t = a[0];
t = (t + c) & BN_MASK2;
@@ -366,10 +365,10 @@ BN_ULONG bn_add_words(BN_ULONG *r, const BN_ULONG *a, const BN_ULONG *b,
}
return (BN_ULONG)c;
}
-#endif /* !BN_LLONG */
+#endif /* !BN_LLONG */
BN_ULONG bn_sub_words(BN_ULONG *r, const BN_ULONG *a, const BN_ULONG *b,
- int n)
+ int n)
{
BN_ULONG t1, t2;
int c = 0;
@@ -382,28 +381,28 @@ BN_ULONG bn_sub_words(BN_ULONG *r, const BN_ULONG *a, const BN_ULONG *b,
while (n & ~3) {
t1 = a[0];
t2 = (t1 - c) & BN_MASK2;
- c = (t2 > t1);
+ c = (t2 > t1);
t1 = b[0];
t1 = (t2 - t1) & BN_MASK2;
r[0] = t1;
c += (t1 > t2);
t1 = a[1];
t2 = (t1 - c) & BN_MASK2;
- c = (t2 > t1);
+ c = (t2 > t1);
t1 = b[1];
t1 = (t2 - t1) & BN_MASK2;
r[1] = t1;
c += (t1 > t2);
t1 = a[2];
t2 = (t1 - c) & BN_MASK2;
- c = (t2 > t1);
+ c = (t2 > t1);
t1 = b[2];
t1 = (t2 - t1) & BN_MASK2;
r[2] = t1;
c += (t1 > t2);
t1 = a[3];
t2 = (t1 - c) & BN_MASK2;
- c = (t2 > t1);
+ c = (t2 > t1);
t1 = b[3];
t1 = (t2 - t1) & BN_MASK2;
r[3] = t1;
@@ -417,7 +416,7 @@ BN_ULONG bn_sub_words(BN_ULONG *r, const BN_ULONG *a, const BN_ULONG *b,
while (n) {
t1 = a[0];
t2 = (t1 - c) & BN_MASK2;
- c = (t2 > t1);
+ c = (t2 > t1);
t1 = b[0];
t1 = (t2 - t1) & BN_MASK2;
r[0] = t1;
@@ -440,148 +439,188 @@ BN_ULONG bn_sub_words(BN_ULONG *r, const BN_ULONG *a, const BN_ULONG *b,
* c=(c2,c1,c0)
*/
-# ifdef BN_LLONG
+#ifdef BN_LLONG
/*
* Keep in mind that additions to multiplication result can not
* overflow, because its high half cannot be all-ones.
*/
-# define mul_add_c(a,b,c0,c1,c2) do { \
- BN_ULONG hi; \
- BN_ULLONG t = (BN_ULLONG)(a)*(b); \
- t += c0; /* no carry */ \
- c0 = (BN_ULONG)Lw(t); \
- hi = (BN_ULONG)Hw(t); \
- c1 = (c1+hi)&BN_MASK2; c2 += (c1<hi); \
- } while(0)
-
-# define mul_add_c2(a,b,c0,c1,c2) do { \
- BN_ULONG hi; \
- BN_ULLONG t = (BN_ULLONG)(a)*(b); \
- BN_ULLONG tt = t+c0; /* no carry */ \
- c0 = (BN_ULONG)Lw(tt); \
- hi = (BN_ULONG)Hw(tt); \
- c1 = (c1+hi)&BN_MASK2; c2 += (c1<hi); \
- t += c0; /* no carry */ \
- c0 = (BN_ULONG)Lw(t); \
- hi = (BN_ULONG)Hw(t); \
- c1 = (c1+hi)&BN_MASK2; c2 += (c1<hi); \
- } while(0)
-
-# define sqr_add_c(a,i,c0,c1,c2) do { \
- BN_ULONG hi; \
- BN_ULLONG t = (BN_ULLONG)a[i]*a[i]; \
- t += c0; /* no carry */ \
- c0 = (BN_ULONG)Lw(t); \
- hi = (BN_ULONG)Hw(t); \
- c1 = (c1+hi)&BN_MASK2; c2 += (c1<hi); \
- } while(0)
-
-# define sqr_add_c2(a,i,j,c0,c1,c2) \
- mul_add_c2((a)[i],(a)[j],c0,c1,c2)
-
-# elif defined(BN_UMULT_LOHI)
+#define mul_add_c(a, b, c0, c1, c2) \
+ do { \
+ BN_ULONG hi; \
+ BN_ULLONG t = (BN_ULLONG)(a) * (b); \
+ t += c0; /* no carry */ \
+ c0 = (BN_ULONG)Lw(t); \
+ hi = (BN_ULONG)Hw(t); \
+ c1 = (c1 + hi) & BN_MASK2; \
+ c2 += (c1 < hi); \
+ } while (0)
+
+#define mul_add_c2(a, b, c0, c1, c2) \
+ do { \
+ BN_ULONG hi; \
+ BN_ULLONG t = (BN_ULLONG)(a) * (b); \
+ BN_ULLONG tt = t + c0; /* no carry */ \
+ c0 = (BN_ULONG)Lw(tt); \
+ hi = (BN_ULONG)Hw(tt); \
+ c1 = (c1 + hi) & BN_MASK2; \
+ c2 += (c1 < hi); \
+ t += c0; /* no carry */ \
+ c0 = (BN_ULONG)Lw(t); \
+ hi = (BN_ULONG)Hw(t); \
+ c1 = (c1 + hi) & BN_MASK2; \
+ c2 += (c1 < hi); \
+ } while (0)
+
+#define sqr_add_c(a, i, c0, c1, c2) \
+ do { \
+ BN_ULONG hi; \
+ BN_ULLONG t = (BN_ULLONG)a[i] * a[i]; \
+ t += c0; /* no carry */ \
+ c0 = (BN_ULONG)Lw(t); \
+ hi = (BN_ULONG)Hw(t); \
+ c1 = (c1 + hi) & BN_MASK2; \
+ c2 += (c1 < hi); \
+ } while (0)
+
+#define sqr_add_c2(a, i, j, c0, c1, c2) \
+ mul_add_c2((a)[i], (a)[j], c0, c1, c2)
+
+#elif defined(BN_UMULT_LOHI)
/*
* Keep in mind that additions to hi can not overflow, because
* the high word of a multiplication result cannot be all-ones.
*/
-# define mul_add_c(a,b,c0,c1,c2) do { \
- BN_ULONG ta = (a), tb = (b); \
- BN_ULONG lo, hi; \
- BN_UMULT_LOHI(lo,hi,ta,tb); \
- c0 += lo; hi += (c0<lo); \
- c1 += hi; c2 += (c1<hi); \
- } while(0)
-
-# define mul_add_c2(a,b,c0,c1,c2) do { \
- BN_ULONG ta = (a), tb = (b); \
- BN_ULONG lo, hi, tt; \
- BN_UMULT_LOHI(lo,hi,ta,tb); \
- c0 += lo; tt = hi + (c0<lo); \
- c1 += tt; c2 += (c1<tt); \
- c0 += lo; hi += (c0<lo); \
- c1 += hi; c2 += (c1<hi); \
- } while(0)
-
-# define sqr_add_c(a,i,c0,c1,c2) do { \
- BN_ULONG ta = (a)[i]; \
- BN_ULONG lo, hi; \
- BN_UMULT_LOHI(lo,hi,ta,ta); \
- c0 += lo; hi += (c0<lo); \
- c1 += hi; c2 += (c1<hi); \
- } while(0)
-
-# define sqr_add_c2(a,i,j,c0,c1,c2) \
- mul_add_c2((a)[i],(a)[j],c0,c1,c2)
-
-# elif defined(BN_UMULT_HIGH)
+#define mul_add_c(a, b, c0, c1, c2) \
+ do { \
+ BN_ULONG ta = (a), tb = (b); \
+ BN_ULONG lo, hi; \
+ BN_UMULT_LOHI(lo, hi, ta, tb); \
+ c0 += lo; \
+ hi += (c0 < lo); \
+ c1 += hi; \
+ c2 += (c1 < hi); \
+ } while (0)
+
+#define mul_add_c2(a, b, c0, c1, c2) \
+ do { \
+ BN_ULONG ta = (a), tb = (b); \
+ BN_ULONG lo, hi, tt; \
+ BN_UMULT_LOHI(lo, hi, ta, tb); \
+ c0 += lo; \
+ tt = hi + (c0 < lo); \
+ c1 += tt; \
+ c2 += (c1 < tt); \
+ c0 += lo; \
+ hi += (c0 < lo); \
+ c1 += hi; \
+ c2 += (c1 < hi); \
+ } while (0)
+
+#define sqr_add_c(a, i, c0, c1, c2) \
+ do { \
+ BN_ULONG ta = (a)[i]; \
+ BN_ULONG lo, hi; \
+ BN_UMULT_LOHI(lo, hi, ta, ta); \
+ c0 += lo; \
+ hi += (c0 < lo); \
+ c1 += hi; \
+ c2 += (c1 < hi); \
+ } while (0)
+
+#define sqr_add_c2(a, i, j, c0, c1, c2) \
+ mul_add_c2((a)[i], (a)[j], c0, c1, c2)
+
+#elif defined(BN_UMULT_HIGH)
/*
* Keep in mind that additions to hi can not overflow, because
* the high word of a multiplication result cannot be all-ones.
*/
-# define mul_add_c(a,b,c0,c1,c2) do { \
- BN_ULONG ta = (a), tb = (b); \
- BN_ULONG lo = ta * tb; \
- BN_ULONG hi = BN_UMULT_HIGH(ta,tb); \
- c0 += lo; hi += (c0<lo); \
- c1 += hi; c2 += (c1<hi); \
- } while(0)
-
-# define mul_add_c2(a,b,c0,c1,c2) do { \
- BN_ULONG ta = (a), tb = (b), tt; \
- BN_ULONG lo = ta * tb; \
- BN_ULONG hi = BN_UMULT_HIGH(ta,tb); \
- c0 += lo; tt = hi + (c0<lo); \
- c1 += tt; c2 += (c1<tt); \
- c0 += lo; hi += (c0<lo); \
- c1 += hi; c2 += (c1<hi); \
- } while(0)
-
-# define sqr_add_c(a,i,c0,c1,c2) do { \
- BN_ULONG ta = (a)[i]; \
- BN_ULONG lo = ta * ta; \
- BN_ULONG hi = BN_UMULT_HIGH(ta,ta); \
- c0 += lo; hi += (c0<lo); \
- c1 += hi; c2 += (c1<hi); \
- } while(0)
-
-# define sqr_add_c2(a,i,j,c0,c1,c2) \
- mul_add_c2((a)[i],(a)[j],c0,c1,c2)
-
-# else /* !BN_LLONG */
+#define mul_add_c(a, b, c0, c1, c2) \
+ do { \
+ BN_ULONG ta = (a), tb = (b); \
+ BN_ULONG lo = ta * tb; \
+ BN_ULONG hi = BN_UMULT_HIGH(ta, tb); \
+ c0 += lo; \
+ hi += (c0 < lo); \
+ c1 += hi; \
+ c2 += (c1 < hi); \
+ } while (0)
+
+#define mul_add_c2(a, b, c0, c1, c2) \
+ do { \
+ BN_ULONG ta = (a), tb = (b), tt; \
+ BN_ULONG lo = ta * tb; \
+ BN_ULONG hi = BN_UMULT_HIGH(ta, tb); \
+ c0 += lo; \
+ tt = hi + (c0 < lo); \
+ c1 += tt; \
+ c2 += (c1 < tt); \
+ c0 += lo; \
+ hi += (c0 < lo); \
+ c1 += hi; \
+ c2 += (c1 < hi); \
+ } while (0)
+
+#define sqr_add_c(a, i, c0, c1, c2) \
+ do { \
+ BN_ULONG ta = (a)[i]; \
+ BN_ULONG lo = ta * ta; \
+ BN_ULONG hi = BN_UMULT_HIGH(ta, ta); \
+ c0 += lo; \
+ hi += (c0 < lo); \
+ c1 += hi; \
+ c2 += (c1 < hi); \
+ } while (0)
+
+#define sqr_add_c2(a, i, j, c0, c1, c2) \
+ mul_add_c2((a)[i], (a)[j], c0, c1, c2)
+
+#else /* !BN_LLONG */
/*
* Keep in mind that additions to hi can not overflow, because
* the high word of a multiplication result cannot be all-ones.
*/
-# define mul_add_c(a,b,c0,c1,c2) do { \
- BN_ULONG lo = LBITS(a), hi = HBITS(a); \
- BN_ULONG bl = LBITS(b), bh = HBITS(b); \
- mul64(lo,hi,bl,bh); \
- c0 = (c0+lo)&BN_MASK2; hi += (c0<lo); \
- c1 = (c1+hi)&BN_MASK2; c2 += (c1<hi); \
- } while(0)
-
-# define mul_add_c2(a,b,c0,c1,c2) do { \
- BN_ULONG tt; \
- BN_ULONG lo = LBITS(a), hi = HBITS(a); \
- BN_ULONG bl = LBITS(b), bh = HBITS(b); \
- mul64(lo,hi,bl,bh); \
- tt = hi; \
- c0 = (c0+lo)&BN_MASK2; tt += (c0<lo); \
- c1 = (c1+tt)&BN_MASK2; c2 += (c1<tt); \
- c0 = (c0+lo)&BN_MASK2; hi += (c0<lo); \
- c1 = (c1+hi)&BN_MASK2; c2 += (c1<hi); \
- } while(0)
-
-# define sqr_add_c(a,i,c0,c1,c2) do { \
- BN_ULONG lo, hi; \
- sqr64(lo,hi,(a)[i]); \
- c0 = (c0+lo)&BN_MASK2; hi += (c0<lo); \
- c1 = (c1+hi)&BN_MASK2; c2 += (c1<hi); \
- } while(0)
-
-# define sqr_add_c2(a,i,j,c0,c1,c2) \
- mul_add_c2((a)[i],(a)[j],c0,c1,c2)
-# endif /* !BN_LLONG */
+#define mul_add_c(a, b, c0, c1, c2) \
+ do { \
+ BN_ULONG lo = LBITS(a), hi = HBITS(a); \
+ BN_ULONG bl = LBITS(b), bh = HBITS(b); \
+ mul64(lo, hi, bl, bh); \
+ c0 = (c0 + lo) & BN_MASK2; \
+ hi += (c0 < lo); \
+ c1 = (c1 + hi) & BN_MASK2; \
+ c2 += (c1 < hi); \
+ } while (0)
+
+#define mul_add_c2(a, b, c0, c1, c2) \
+ do { \
+ BN_ULONG tt; \
+ BN_ULONG lo = LBITS(a), hi = HBITS(a); \
+ BN_ULONG bl = LBITS(b), bh = HBITS(b); \
+ mul64(lo, hi, bl, bh); \
+ tt = hi; \
+ c0 = (c0 + lo) & BN_MASK2; \
+ tt += (c0 < lo); \
+ c1 = (c1 + tt) & BN_MASK2; \
+ c2 += (c1 < tt); \
+ c0 = (c0 + lo) & BN_MASK2; \
+ hi += (c0 < lo); \
+ c1 = (c1 + hi) & BN_MASK2; \
+ c2 += (c1 < hi); \
+ } while (0)
+
+#define sqr_add_c(a, i, c0, c1, c2) \
+ do { \
+ BN_ULONG lo, hi; \
+ sqr64(lo, hi, (a)[i]); \
+ c0 = (c0 + lo) & BN_MASK2; \
+ hi += (c0 < lo); \
+ c1 = (c1 + hi) & BN_MASK2; \
+ c2 += (c1 < hi); \
+ } while (0)
+
+#define sqr_add_c2(a, i, j, c0, c1, c2) \
+ mul_add_c2((a)[i], (a)[j], c0, c1, c2)
+#endif /* !BN_LLONG */
void bn_mul_comba8(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b)
{
@@ -833,9 +872,9 @@ void bn_sqr_comba4(BN_ULONG *r, const BN_ULONG *a)
r[7] = c2;
}
-# ifdef OPENSSL_NO_ASM
-# ifdef OPENSSL_BN_ASM_MONT
-# include <alloca.h>
+#ifdef OPENSSL_NO_ASM
+#ifdef OPENSSL_BN_ASM_MONT
+#include <alloca.h>
/*
* This is essentially reference implementation, which may or may not
* result in performance improvement. E.g. on IA-32 this routine was
@@ -850,35 +889,35 @@ void bn_sqr_comba4(BN_ULONG *r, const BN_ULONG *a)
* [and are known to] differ and are to be documented elsewhere.
*/
int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
- const BN_ULONG *np, const BN_ULONG *n0p, int num)
+ const BN_ULONG *np, const BN_ULONG *n0p, int num)
{
BN_ULONG c0, c1, ml, *tp, n0;
-# ifdef mul64
+#ifdef mul64
BN_ULONG mh;
-# endif
+#endif
volatile BN_ULONG *vp;
int i = 0, j;
-# if 0 /* template for platform-specific
- * implementation */
+#if 0 /* template for platform-specific \
+ * implementation */
if (ap == bp)
return bn_sqr_mont(rp, ap, np, n0p, num);
-# endif
+#endif
vp = tp = alloca((num + 2) * sizeof(BN_ULONG));
n0 = *n0p;
c0 = 0;
ml = bp[0];
-# ifdef mul64
+#ifdef mul64
mh = HBITS(ml);
ml = LBITS(ml);
for (j = 0; j < num; ++j)
mul(tp[j], ap[j], ml, mh, c0);
-# else
+#else
for (j = 0; j < num; ++j)
mul(tp[j], ap[j], ml, c0);
-# endif
+#endif
tp[num] = c0;
tp[num + 1] = 0;
@@ -887,36 +926,36 @@ int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
for (i = 0; i < num; i++) {
c0 = 0;
ml = bp[i];
-# ifdef mul64
+#ifdef mul64
mh = HBITS(ml);
ml = LBITS(ml);
for (j = 0; j < num; ++j)
mul_add(tp[j], ap[j], ml, mh, c0);
-# else
+#else
for (j = 0; j < num; ++j)
mul_add(tp[j], ap[j], ml, c0);
-# endif
+#endif
c1 = (tp[num] + c0) & BN_MASK2;
tp[num] = c1;
tp[num + 1] = (c1 < c0 ? 1 : 0);
- enter:
+ enter:
c1 = tp[0];
ml = (c1 * n0) & BN_MASK2;
c0 = 0;
-# ifdef mul64
+#ifdef mul64
mh = HBITS(ml);
ml = LBITS(ml);
mul_add(c1, np[0], ml, mh, c0);
-# else
+#else
mul_add(c1, ml, np[0], c0);
-# endif
+#endif
for (j = 1; j < num; j++) {
c1 = tp[j];
-# ifdef mul64
+#ifdef mul64
mul_add(c1, np[j], ml, mh, c0);
-# else
+#else
mul_add(c1, ml, np[j], c0);
-# endif
+#endif
tp[j - 1] = c1 & BN_MASK2;
}
c1 = (tp[num] + c0) & BN_MASK2;
@@ -938,21 +977,21 @@ int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
vp[num + 1] = 0;
return 1;
}
-# else
+#else
/*
* Return value of 0 indicates that multiplication/convolution was not
* performed to signal the caller to fall down to alternative/original
* code-path.
*/
int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
- const BN_ULONG *np, const BN_ULONG *n0, int num)
+ const BN_ULONG *np, const BN_ULONG *n0, int num)
{
return 0;
}
-# endif /* OPENSSL_BN_ASM_MONT */
-# endif
+#endif /* OPENSSL_BN_ASM_MONT */
+#endif
-#else /* !BN_MUL_COMBA */
+#else /* !BN_MUL_COMBA */
/* hmm... is it faster just to do a multiply? */
void bn_sqr_comba4(BN_ULONG *r, const BN_ULONG *a)
@@ -987,11 +1026,11 @@ void bn_mul_comba8(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b)
r[15] = bn_mul_add_words(&(r[7]), a, 8, b[7]);
}
-# ifdef OPENSSL_NO_ASM
-# ifdef OPENSSL_BN_ASM_MONT
-# include <alloca.h>
+#ifdef OPENSSL_NO_ASM
+#ifdef OPENSSL_BN_ASM_MONT
+#include <alloca.h>
int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
- const BN_ULONG *np, const BN_ULONG *n0p, int num)
+ const BN_ULONG *np, const BN_ULONG *n0p, int num)
{
BN_ULONG c0, c1, *tp, n0 = *n0p;
volatile BN_ULONG *vp;
@@ -1030,13 +1069,13 @@ int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
vp[num + 1] = 0;
return 1;
}
-# else
+#else
int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
- const BN_ULONG *np, const BN_ULONG *n0, int num)
+ const BN_ULONG *np, const BN_ULONG *n0, int num)
{
return 0;
}
-# endif /* OPENSSL_BN_ASM_MONT */
-# endif
+#endif /* OPENSSL_BN_ASM_MONT */
+#endif
-#endif /* !BN_MUL_COMBA */
+#endif /* !BN_MUL_COMBA */
diff --git a/crypto/bn/bn_blind.c b/crypto/bn/bn_blind.c
index e03f299791..7722ed1e48 100644
--- a/crypto/bn/bn_blind.c
+++ b/crypto/bn/bn_blind.c
@@ -11,19 +11,19 @@
#include "internal/cryptlib.h"
#include "bn_local.h"
-#define BN_BLINDING_COUNTER 32
+#define BN_BLINDING_COUNTER 32
struct bn_blinding_st {
BIGNUM *A;
BIGNUM *Ai;
BIGNUM *e;
- BIGNUM *mod; /* just a reference */
+ BIGNUM *mod; /* just a reference */
CRYPTO_THREAD_ID tid;
int counter;
unsigned long flags;
BN_MONT_CTX *m_ctx;
- int (*bn_mod_exp) (BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
- const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
+ int (*bn_mod_exp)(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
+ const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
CRYPTO_RWLOCK *lock;
};
@@ -71,7 +71,7 @@ BN_BLINDING *BN_BLINDING_new(const BIGNUM *A, const BIGNUM *Ai, BIGNUM *mod)
return ret;
- err:
+err:
BN_BLINDING_free(ret);
return NULL;
}
@@ -100,8 +100,7 @@ int BN_BLINDING_update(BN_BLINDING *b, BN_CTX *ctx)
if (b->counter == -1)
b->counter = 0;
- if (++b->counter == BN_BLINDING_COUNTER && b->e != NULL &&
- !(b->flags & BN_BLINDING_NO_RECREATE)) {
+ if (++b->counter == BN_BLINDING_COUNTER && b->e != NULL && !(b->flags & BN_BLINDING_NO_RECREATE)) {
/* re-create blinding parameters */
if (!BN_BLINDING_create_param(b, NULL, NULL, ctx, NULL, NULL))
goto err;
@@ -118,7 +117,7 @@ int BN_BLINDING_update(BN_BLINDING *b, BN_CTX *ctx)
}
ret = 1;
- err:
+err:
if (b->counter == BN_BLINDING_COUNTER)
b->counter = 0;
return ret;
@@ -163,7 +162,7 @@ int BN_BLINDING_invert(BIGNUM *n, BN_BLINDING *b, BN_CTX *ctx)
}
int BN_BLINDING_invert_ex(BIGNUM *n, const BIGNUM *r, BN_BLINDING *b,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
int ret;
@@ -230,14 +229,14 @@ void BN_BLINDING_set_flags(BN_BLINDING *b, unsigned long flags)
}
BN_BLINDING *BN_BLINDING_create_param(BN_BLINDING *b,
- const BIGNUM *e, BIGNUM *m, BN_CTX *ctx,
- int (*bn_mod_exp) (BIGNUM *r,
- const BIGNUM *a,
- const BIGNUM *p,
- const BIGNUM *m,
- BN_CTX *ctx,
- BN_MONT_CTX *m_ctx),
- BN_MONT_CTX *m_ctx)
+ const BIGNUM *e, BIGNUM *m, BN_CTX *ctx,
+ int (*bn_mod_exp)(BIGNUM *r,
+ const BIGNUM *a,
+ const BIGNUM *p,
+ const BIGNUM *m,
+ BN_CTX *ctx,
+ BN_MONT_CTX *m_ctx),
+ BN_MONT_CTX *m_ctx)
{
int retry_counter = 32;
BN_BLINDING *ret = NULL;
@@ -301,7 +300,7 @@ BN_BLINDING *BN_BLINDING_create_param(BN_BLINDING *b,
}
return ret;
- err:
+err:
if (b == NULL) {
BN_BLINDING_free(ret);
ret = NULL;
diff --git a/crypto/bn/bn_const.c b/crypto/bn/bn_const.c
index 190a363912..974868feca 100644
--- a/crypto/bn/bn_const.c
+++ b/crypto/bn/bn_const.c
@@ -12,7 +12,6 @@
#define COPY_BN(dst, src) (dst != NULL) ? BN_copy(dst, &src) : BN_dup(&src)
-
/*-
* "First Oakley Default Group" from RFC2409, section 6.1.
*
@@ -25,18 +24,102 @@
BIGNUM *BN_get_rfc2409_prime_768(BIGNUM *bn)
{
static const unsigned char RFC2409_PRIME_768[] = {
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xC9, 0x0F, 0xDA, 0xA2, 0x21, 0x68, 0xC2, 0x34,
- 0xC4, 0xC6, 0x62, 0x8B, 0x80, 0xDC, 0x1C, 0xD1,
- 0x29, 0x02, 0x4E, 0x08, 0x8A, 0x67, 0xCC, 0x74,
- 0x02, 0x0B, 0xBE, 0xA6, 0x3B, 0x13, 0x9B, 0x22,
- 0x51, 0x4A, 0x08, 0x79, 0x8E, 0x34, 0x04, 0xDD,
- 0xEF, 0x95, 0x19, 0xB3, 0xCD, 0x3A, 0x43, 0x1B,
- 0x30, 0x2B, 0x0A, 0x6D, 0xF2, 0x5F, 0x14, 0x37,
- 0x4F, 0xE1, 0x35, 0x6D, 0x6D, 0x51, 0xC2, 0x45,
- 0xE4, 0x85, 0xB5, 0x76, 0x62, 0x5E, 0x7E, 0xC6,
- 0xF4, 0x4C, 0x42, 0xE9, 0xA6, 0x3A, 0x36, 0x20,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xC9,
+ 0x0F,
+ 0xDA,
+ 0xA2,
+ 0x21,
+ 0x68,
+ 0xC2,
+ 0x34,
+ 0xC4,
+ 0xC6,
+ 0x62,
+ 0x8B,
+ 0x80,
+ 0xDC,
+ 0x1C,
+ 0xD1,
+ 0x29,
+ 0x02,
+ 0x4E,
+ 0x08,
+ 0x8A,
+ 0x67,
+ 0xCC,
+ 0x74,
+ 0x02,
+ 0x0B,
+ 0xBE,
+ 0xA6,
+ 0x3B,
+ 0x13,
+ 0x9B,
+ 0x22,
+ 0x51,
+ 0x4A,
+ 0x08,
+ 0x79,
+ 0x8E,
+ 0x34,
+ 0x04,
+ 0xDD,
+ 0xEF,
+ 0x95,
+ 0x19,
+ 0xB3,
+ 0xCD,
+ 0x3A,
+ 0x43,
+ 0x1B,
+ 0x30,
+ 0x2B,
+ 0x0A,
+ 0x6D,
+ 0xF2,
+ 0x5F,
+ 0x14,
+ 0x37,
+ 0x4F,
+ 0xE1,
+ 0x35,
+ 0x6D,
+ 0x6D,
+ 0x51,
+ 0xC2,
+ 0x45,
+ 0xE4,
+ 0x85,
+ 0xB5,
+ 0x76,
+ 0x62,
+ 0x5E,
+ 0x7E,
+ 0xC6,
+ 0xF4,
+ 0x4C,
+ 0x42,
+ 0xE9,
+ 0xA6,
+ 0x3A,
+ 0x36,
+ 0x20,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
};
return BN_bin2bn(RFC2409_PRIME_768, sizeof(RFC2409_PRIME_768), bn);
}
@@ -53,22 +136,134 @@ BIGNUM *BN_get_rfc2409_prime_768(BIGNUM *bn)
BIGNUM *BN_get_rfc2409_prime_1024(BIGNUM *bn)
{
static const unsigned char RFC2409_PRIME_1024[] = {
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xC9, 0x0F, 0xDA, 0xA2, 0x21, 0x68, 0xC2, 0x34,
- 0xC4, 0xC6, 0x62, 0x8B, 0x80, 0xDC, 0x1C, 0xD1,
- 0x29, 0x02, 0x4E, 0x08, 0x8A, 0x67, 0xCC, 0x74,
- 0x02, 0x0B, 0xBE, 0xA6, 0x3B, 0x13, 0x9B, 0x22,
- 0x51, 0x4A, 0x08, 0x79, 0x8E, 0x34, 0x04, 0xDD,
- 0xEF, 0x95, 0x19, 0xB3, 0xCD, 0x3A, 0x43, 0x1B,
- 0x30, 0x2B, 0x0A, 0x6D, 0xF2, 0x5F, 0x14, 0x37,
- 0x4F, 0xE1, 0x35, 0x6D, 0x6D, 0x51, 0xC2, 0x45,
- 0xE4, 0x85, 0xB5, 0x76, 0x62, 0x5E, 0x7E, 0xC6,
- 0xF4, 0x4C, 0x42, 0xE9, 0xA6, 0x37, 0xED, 0x6B,
- 0x0B, 0xFF, 0x5C, 0xB6, 0xF4, 0x06, 0xB7, 0xED,
- 0xEE, 0x38, 0x6B, 0xFB, 0x5A, 0x89, 0x9F, 0xA5,
- 0xAE, 0x9F, 0x24, 0x11, 0x7C, 0x4B, 0x1F, 0xE6,
- 0x49, 0x28, 0x66, 0x51, 0xEC, 0xE6, 0x53, 0x81,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xC9,
+ 0x0F,
+ 0xDA,
+ 0xA2,
+ 0x21,
+ 0x68,
+ 0xC2,
+ 0x34,
+ 0xC4,
+ 0xC6,
+ 0x62,
+ 0x8B,
+ 0x80,
+ 0xDC,
+ 0x1C,
+ 0xD1,
+ 0x29,
+ 0x02,
+ 0x4E,
+ 0x08,
+ 0x8A,
+ 0x67,
+ 0xCC,
+ 0x74,
+ 0x02,
+ 0x0B,
+ 0xBE,
+ 0xA6,
+ 0x3B,
+ 0x13,
+ 0x9B,
+ 0x22,
+ 0x51,
+ 0x4A,
+ 0x08,
+ 0x79,
+ 0x8E,
+ 0x34,
+ 0x04,
+ 0xDD,
+ 0xEF,
+ 0x95,
+ 0x19,
+ 0xB3,
+ 0xCD,
+ 0x3A,
+ 0x43,
+ 0x1B,
+ 0x30,
+ 0x2B,
+ 0x0A,
+ 0x6D,
+ 0xF2,
+ 0x5F,
+ 0x14,
+ 0x37,
+ 0x4F,
+ 0xE1,
+ 0x35,
+ 0x6D,
+ 0x6D,
+ 0x51,
+ 0xC2,
+ 0x45,
+ 0xE4,
+ 0x85,
+ 0xB5,
+ 0x76,
+ 0x62,
+ 0x5E,
+ 0x7E,
+ 0xC6,
+ 0xF4,
+ 0x4C,
+ 0x42,
+ 0xE9,
+ 0xA6,
+ 0x37,
+ 0xED,
+ 0x6B,
+ 0x0B,
+ 0xFF,
+ 0x5C,
+ 0xB6,
+ 0xF4,
+ 0x06,
+ 0xB7,
+ 0xED,
+ 0xEE,
+ 0x38,
+ 0x6B,
+ 0xFB,
+ 0x5A,
+ 0x89,
+ 0x9F,
+ 0xA5,
+ 0xAE,
+ 0x9F,
+ 0x24,
+ 0x11,
+ 0x7C,
+ 0x4B,
+ 0x1F,
+ 0xE6,
+ 0x49,
+ 0x28,
+ 0x66,
+ 0x51,
+ 0xEC,
+ 0xE6,
+ 0x53,
+ 0x81,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
};
return BN_bin2bn(RFC2409_PRIME_1024, sizeof(RFC2409_PRIME_1024), bn);
}
diff --git a/crypto/bn/bn_conv.c b/crypto/bn/bn_conv.c
index 3fcb12c755..f295e5db9a 100644
--- a/crypto/bn/bn_conv.c
+++ b/crypto/bn/bn_conv.c
@@ -37,7 +37,7 @@ char *BN_bn2hex(const BIGNUM *a)
}
}
*p = '\0';
- err:
+err:
return buf;
}
@@ -61,7 +61,7 @@ char *BN_bn2dec(const BIGNUM *a)
*/
i = BN_num_bits(a) * 3;
num = (i / 10 + i / 1000 + 1) + 1;
- tbytes = num + 3; /* negative and terminator and one spare? */
+ tbytes = num + 3; /* negative and terminator and one spare? */
bn_data_num = num / BN_DEC_NUM + 1;
bn_data = OPENSSL_malloc_array(bn_data_num, sizeof(BN_ULONG));
buf = OPENSSL_malloc(tbytes);
@@ -106,7 +106,7 @@ char *BN_bn2dec(const BIGNUM *a)
}
}
ok = 1;
- err:
+err:
OPENSSL_free(bn_data);
BN_free(t);
if (ok)
@@ -158,7 +158,7 @@ int BN_hex2bn(BIGNUM **bn, const char *a)
if (bn_expand(ret, i * 4) == NULL)
goto err;
- j = i; /* least significant 'hex' */
+ j = i; /* least significant 'hex' */
m = 0;
h = 0;
while (j > 0) {
@@ -168,7 +168,7 @@ int BN_hex2bn(BIGNUM **bn, const char *a)
c = a[j - m];
k = OPENSSL_hexchar2int(c);
if (k < 0)
- k = 0; /* paranoia */
+ k = 0; /* paranoia */
l = (l << 4) | k;
if (--m <= 0) {
@@ -187,7 +187,7 @@ int BN_hex2bn(BIGNUM **bn, const char *a)
if (ret->top != 0)
ret->neg = neg;
return num;
- err:
+err:
if (*bn == NULL)
BN_free(ret);
return 0;
@@ -257,7 +257,7 @@ int BN_dec2bn(BIGNUM **bn, const char *a)
if (ret->top != 0)
ret->neg = neg;
return num;
- err:
+err:
if (*bn == NULL)
BN_free(ret);
return 0;
diff --git a/crypto/bn/bn_ctx.c b/crypto/bn/bn_ctx.c
index 42dad852ca..201b356561 100644
--- a/crypto/bn/bn_ctx.c
+++ b/crypto/bn/bn_ctx.c
@@ -12,9 +12,9 @@
#include "bn_local.h"
/* How many bignums are in each "pool item"; */
-#define BN_CTX_POOL_SIZE 16
+#define BN_CTX_POOL_SIZE 16
/* The stack frame info is resizing, set a first-time expansion size; */
-#define BN_CTX_START_FRAMES 32
+#define BN_CTX_START_FRAMES 32
/***********/
/* BN_POOL */
@@ -86,10 +86,10 @@ static void ctxdbg(BIO *channel, const char *text, BN_CTX *ctx)
BN_STACK *stack = &ctx->stack;
BIO_printf(channel, "%s\n", text);
- BIO_printf(channel, " (%16p): ", (void*)ctx);
+ BIO_printf(channel, " (%16p): ", (void *)ctx);
while (bnidx < ctx->used) {
BIO_printf(channel, "%03x ",
- item->vals[bnidx++ % BN_CTX_POOL_SIZE].dmax);
+ item->vals[bnidx++ % BN_CTX_POOL_SIZE].dmax);
if (!(bnidx % BN_CTX_POOL_SIZE))
item = item->next;
}
@@ -106,13 +106,17 @@ static void ctxdbg(BIO *channel, const char *text, BN_CTX *ctx)
BIO_printf(channel, "\n");
}
-# define CTXDBG(str, ctx) \
- OSSL_TRACE_BEGIN(BN_CTX) { \
- ctxdbg(trc_out, str, ctx); \
- } OSSL_TRACE_END(BN_CTX)
+#define CTXDBG(str, ctx) \
+ OSSL_TRACE_BEGIN(BN_CTX) \
+ { \
+ ctxdbg(trc_out, str, ctx); \
+ } \
+ OSSL_TRACE_END(BN_CTX)
#else
/* We do not want tracing in FIPS module */
-# define CTXDBG(str, ctx) do {} while(0)
+#define CTXDBG(str, ctx) \
+ do { \
+ } while (0)
#endif /* FIPS_MODULE */
BN_CTX *BN_CTX_new_ex(OSSL_LIB_CTX *ctx)
@@ -156,11 +160,12 @@ void BN_CTX_free(BN_CTX *ctx)
if (ctx == NULL)
return;
#ifndef FIPS_MODULE
- OSSL_TRACE_BEGIN(BN_CTX) {
+ OSSL_TRACE_BEGIN(BN_CTX)
+ {
BN_POOL_ITEM *pool = ctx->pool.head;
BIO_printf(trc_out,
- "BN_CTX_free(): stack-size=%d, pool-bignums=%d\n",
- ctx->stack.size, ctx->pool.size);
+ "BN_CTX_free(): stack-size=%d, pool-bignums=%d\n",
+ ctx->stack.size, ctx->pool.size);
BIO_printf(trc_out, " dmaxs: ");
while (pool) {
unsigned loop = 0;
@@ -169,7 +174,8 @@ void BN_CTX_free(BN_CTX *ctx)
pool = pool->next;
}
BIO_printf(trc_out, "\n");
- } OSSL_TRACE_END(BN_CTX);
+ }
+ OSSL_TRACE_END(BN_CTX);
#endif
BN_STACK_finish(&ctx->stack);
BN_POOL_finish(&ctx->pool);
@@ -257,13 +263,11 @@ static void BN_STACK_finish(BN_STACK *st)
st->indexes = NULL;
}
-
static int BN_STACK_push(BN_STACK *st, unsigned int idx)
{
if (st->depth == st->size) {
/* Need to expand */
- unsigned int newsize =
- st->size ? (st->size * 3 / 2) : BN_CTX_START_FRAMES;
+ unsigned int newsize = st->size ? (st->size * 3 / 2) : BN_CTX_START_FRAMES;
unsigned int *newitems;
if ((newitems = OPENSSL_malloc_array(newsize, sizeof(*newitems))) == NULL)
@@ -308,7 +312,6 @@ static void BN_POOL_finish(BN_POOL *p)
}
}
-
static BIGNUM *BN_POOL_get(BN_POOL *p, int flag)
{
BIGNUM *bn;
diff --git a/crypto/bn/bn_depr.c b/crypto/bn/bn_depr.c
index d55397016a..01f753ba84 100644
--- a/crypto/bn/bn_depr.c
+++ b/crypto/bn/bn_depr.c
@@ -20,8 +20,8 @@
#include "bn_local.h"
BIGNUM *BN_generate_prime(BIGNUM *ret, int bits, int safe,
- const BIGNUM *add, const BIGNUM *rem,
- void (*callback) (int, int, void *), void *cb_arg)
+ const BIGNUM *add, const BIGNUM *rem,
+ void (*callback)(int, int, void *), void *cb_arg)
{
BN_GENCB cb;
BIGNUM *rnd = NULL;
@@ -38,14 +38,14 @@ BIGNUM *BN_generate_prime(BIGNUM *ret, int bits, int safe,
/* we have a prime :-) */
return rnd;
- err:
+err:
BN_free(rnd);
return NULL;
}
int BN_is_prime(const BIGNUM *a, int checks,
- void (*callback) (int, int, void *), BN_CTX *ctx_passed,
- void *cb_arg)
+ void (*callback)(int, int, void *), BN_CTX *ctx_passed,
+ void *cb_arg)
{
BN_GENCB cb;
BN_GENCB_set_old(&cb, callback, cb_arg);
@@ -53,9 +53,9 @@ int BN_is_prime(const BIGNUM *a, int checks,
}
int BN_is_prime_fasttest(const BIGNUM *a, int checks,
- void (*callback) (int, int, void *),
- BN_CTX *ctx_passed, void *cb_arg,
- int do_trial_division)
+ void (*callback)(int, int, void *),
+ BN_CTX *ctx_passed, void *cb_arg,
+ int do_trial_division)
{
BN_GENCB cb;
BN_GENCB_set_old(&cb, callback, cb_arg);
diff --git a/crypto/bn/bn_dh.c b/crypto/bn/bn_dh.c
index c0967e534c..542c33d6a8 100644
--- a/crypto/bn/bn_dh.c
+++ b/crypto/bn/bn_dh.c
@@ -10,18 +10,18 @@
#include "bn_local.h"
#include "internal/nelem.h"
-# include <openssl/dh.h>
-# include "crypto/bn_dh.h"
+#include <openssl/dh.h>
+#include "crypto/bn_dh.h"
-# if BN_BITS2 == 64
-# define BN_DEF(lo, hi) (BN_ULONG)hi << 32 | lo
-# else
-# define BN_DEF(lo, hi) lo, hi
-# endif
+#if BN_BITS2 == 64
+#define BN_DEF(lo, hi) (BN_ULONG) hi << 32 | lo
+#else
+#define BN_DEF(lo, hi) lo, hi
+#endif
/* DH parameters from RFC3526 */
-# ifndef FIPS_MODULE
+#ifndef FIPS_MODULE
/*
* "1536-bit MODP Group" from RFC3526, Section 2.
*
@@ -59,7 +59,7 @@ static const BN_ULONG modp_1536_q[] = {
BN_DEF(0x4533E63A, 0x94812704), BN_DEF(0xC06E0E68, 0x62633145),
BN_DEF(0x10B4611A, 0xE487ED51), BN_DEF(0xFFFFFFFF, 0x7FFFFFFF)
};
-# endif /* FIPS_MODULE */
+#endif /* FIPS_MODULE */
/*-
* "2048-bit MODP Group" from RFC3526, Section 3.
@@ -88,22 +88,38 @@ static const BN_ULONG modp_2048_p[] = {
};
/* q = (p - 1) / 2 */
static const BN_ULONG modp_2048_q[] = {
- BN_DEF(0xFFFFFFFF, 0x7FFFFFFF), BN_DEF(0x45565534, 0x0AB9472D),
- BN_DEF(0x4C7D0288, 0x8AE9130C), BN_DEF(0x754AB572, 0x1CCAA4BE),
- BN_DEF(0x4AAC0B8C, 0xEF15E5FB), BN_DEF(0x37A62964, 0xDAE2AEF8),
- BN_DEF(0x7603D147, 0xCD93C1D1), BN_DEF(0x0C074301, 0xF1CF3B96),
- BN_DEF(0x171B671D, 0x19482F23), BN_DEF(0x650C10BE, 0x78BA3604),
- BN_DEF(0x255E4C02, 0xB3861AA7), BN_DEF(0xB84B4B36, 0xCF6A9483),
- BN_DEF(0x1042A95D, 0x0E3179AB), BN_DEF(0xEE51D6CB, 0xC1B2AE91),
- BN_DEF(0x7E9267AF, 0x348B1FD4), BN_DEF(0x0E2AE9CD, 0xCC6D241B),
- BN_DEF(0x50B1DF82, 0xE1003E5C), BN_DEF(0xF6722D9E, 0x24943328),
- BN_DEF(0xBE258FF3, 0xD74F9208), BN_DEF(0xAD44CFD2, 0xF71C35FD),
- BN_DEF(0x7A035BF6, 0x85FFAE5B), BN_DEF(0xD31BF6B5, 0x7A262174),
- BN_DEF(0x312F3F63, 0xF242DABB), BN_DEF(0xB6A8E122, 0xA7F09AB6),
- BN_DEF(0xF92F8A1B, 0x98158536), BN_DEF(0xE69D218D, 0xF7CA8CD9),
- BN_DEF(0xC71A026E, 0x28A5043C), BN_DEF(0x1D89CD91, 0x0105DF53),
- BN_DEF(0x4533E63A, 0x94812704), BN_DEF(0xC06E0E68, 0x62633145),
- BN_DEF(0x10B4611A, 0xE487ED51), BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
+ BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
+ BN_DEF(0x45565534, 0x0AB9472D),
+ BN_DEF(0x4C7D0288, 0x8AE9130C),
+ BN_DEF(0x754AB572, 0x1CCAA4BE),
+ BN_DEF(0x4AAC0B8C, 0xEF15E5FB),
+ BN_DEF(0x37A62964, 0xDAE2AEF8),
+ BN_DEF(0x7603D147, 0xCD93C1D1),
+ BN_DEF(0x0C074301, 0xF1CF3B96),
+ BN_DEF(0x171B671D, 0x19482F23),
+ BN_DEF(0x650C10BE, 0x78BA3604),
+ BN_DEF(0x255E4C02, 0xB3861AA7),
+ BN_DEF(0xB84B4B36, 0xCF6A9483),
+ BN_DEF(0x1042A95D, 0x0E3179AB),
+ BN_DEF(0xEE51D6CB, 0xC1B2AE91),
+ BN_DEF(0x7E9267AF, 0x348B1FD4),
+ BN_DEF(0x0E2AE9CD, 0xCC6D241B),
+ BN_DEF(0x50B1DF82, 0xE1003E5C),
+ BN_DEF(0xF6722D9E, 0x24943328),
+ BN_DEF(0xBE258FF3, 0xD74F9208),
+ BN_DEF(0xAD44CFD2, 0xF71C35FD),
+ BN_DEF(0x7A035BF6, 0x85FFAE5B),
+ BN_DEF(0xD31BF6B5, 0x7A262174),
+ BN_DEF(0x312F3F63, 0xF242DABB),
+ BN_DEF(0xB6A8E122, 0xA7F09AB6),
+ BN_DEF(0xF92F8A1B, 0x98158536),
+ BN_DEF(0xE69D218D, 0xF7CA8CD9),
+ BN_DEF(0xC71A026E, 0x28A5043C),
+ BN_DEF(0x1D89CD91, 0x0105DF53),
+ BN_DEF(0x4533E63A, 0x94812704),
+ BN_DEF(0xC06E0E68, 0x62633145),
+ BN_DEF(0x10B4611A, 0xE487ED51),
+ BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
};
/*-
@@ -141,30 +157,54 @@ static const BN_ULONG modp_3072_p[] = {
};
/* q = (p - 1) / 2 */
static const BN_ULONG modp_3072_q[] = {
- BN_DEF(0xFFFFFFFF, 0x7FFFFFFF), BN_DEF(0x549D6965, 0x25C16890),
- BN_DEF(0x707E8847, 0xA1EDADFE), BN_DEF(0x3A72D598, 0x047127D0),
- BN_DEF(0x5D6CA371, 0x3B84C460), BN_DEF(0xBD30AEB6, 0x5DF08BAB),
- BN_DEF(0x0BBD9006, 0x290F958C), BN_DEF(0x9F643532, 0x6C3B0139),
- BN_DEF(0x6CC50432, 0xF897FD03), BN_DEF(0x0D697735, 0xE771E913),
- BN_DEF(0x2512B0CE, 0x8F464A70), BN_DEF(0x6D8499EB, 0xD5FAD746),
- BN_DEF(0xD370F263, 0xD9CB87C2), BN_DEF(0xAE83063E, 0x457538AB),
- BN_DEF(0x2C6DF785, 0x767DC282), BN_DEF(0xEF8E5D32, 0xD42A90D5),
- BN_DEF(0x82283D19, 0xD6998B86), BN_DEF(0x45556216, 0x0AB9472D),
- BN_DEF(0x4C7D0288, 0x8AE9130C), BN_DEF(0x754AB572, 0x1CCAA4BE),
- BN_DEF(0x4AAC0B8C, 0xEF15E5FB), BN_DEF(0x37A62964, 0xDAE2AEF8),
- BN_DEF(0x7603D147, 0xCD93C1D1), BN_DEF(0x0C074301, 0xF1CF3B96),
- BN_DEF(0x171B671D, 0x19482F23), BN_DEF(0x650C10BE, 0x78BA3604),
- BN_DEF(0x255E4C02, 0xB3861AA7), BN_DEF(0xB84B4B36, 0xCF6A9483),
- BN_DEF(0x1042A95D, 0x0E3179AB), BN_DEF(0xEE51D6CB, 0xC1B2AE91),
- BN_DEF(0x7E9267AF, 0x348B1FD4), BN_DEF(0x0E2AE9CD, 0xCC6D241B),
- BN_DEF(0x50B1DF82, 0xE1003E5C), BN_DEF(0xF6722D9E, 0x24943328),
- BN_DEF(0xBE258FF3, 0xD74F9208), BN_DEF(0xAD44CFD2, 0xF71C35FD),
- BN_DEF(0x7A035BF6, 0x85FFAE5B), BN_DEF(0xD31BF6B5, 0x7A262174),
- BN_DEF(0x312F3F63, 0xF242DABB), BN_DEF(0xB6A8E122, 0xA7F09AB6),
- BN_DEF(0xF92F8A1B, 0x98158536), BN_DEF(0xE69D218D, 0xF7CA8CD9),
- BN_DEF(0xC71A026E, 0x28A5043C), BN_DEF(0x1D89CD91, 0x0105DF53),
- BN_DEF(0x4533E63A, 0x94812704), BN_DEF(0xC06E0E68, 0x62633145),
- BN_DEF(0x10B4611A, 0xE487ED51), BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
+ BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
+ BN_DEF(0x549D6965, 0x25C16890),
+ BN_DEF(0x707E8847, 0xA1EDADFE),
+ BN_DEF(0x3A72D598, 0x047127D0),
+ BN_DEF(0x5D6CA371, 0x3B84C460),
+ BN_DEF(0xBD30AEB6, 0x5DF08BAB),
+ BN_DEF(0x0BBD9006, 0x290F958C),
+ BN_DEF(0x9F643532, 0x6C3B0139),
+ BN_DEF(0x6CC50432, 0xF897FD03),
+ BN_DEF(0x0D697735, 0xE771E913),
+ BN_DEF(0x2512B0CE, 0x8F464A70),
+ BN_DEF(0x6D8499EB, 0xD5FAD746),
+ BN_DEF(0xD370F263, 0xD9CB87C2),
+ BN_DEF(0xAE83063E, 0x457538AB),
+ BN_DEF(0x2C6DF785, 0x767DC282),
+ BN_DEF(0xEF8E5D32, 0xD42A90D5),
+ BN_DEF(0x82283D19, 0xD6998B86),
+ BN_DEF(0x45556216, 0x0AB9472D),
+ BN_DEF(0x4C7D0288, 0x8AE9130C),
+ BN_DEF(0x754AB572, 0x1CCAA4BE),
+ BN_DEF(0x4AAC0B8C, 0xEF15E5FB),
+ BN_DEF(0x37A62964, 0xDAE2AEF8),
+ BN_DEF(0x7603D147, 0xCD93C1D1),
+ BN_DEF(0x0C074301, 0xF1CF3B96),
+ BN_DEF(0x171B671D, 0x19482F23),
+ BN_DEF(0x650C10BE, 0x78BA3604),
+ BN_DEF(0x255E4C02, 0xB3861AA7),
+ BN_DEF(0xB84B4B36, 0xCF6A9483),
+ BN_DEF(0x1042A95D, 0x0E3179AB),
+ BN_DEF(0xEE51D6CB, 0xC1B2AE91),
+ BN_DEF(0x7E9267AF, 0x348B1FD4),
+ BN_DEF(0x0E2AE9CD, 0xCC6D241B),
+ BN_DEF(0x50B1DF82, 0xE1003E5C),
+ BN_DEF(0xF6722D9E, 0x24943328),
+ BN_DEF(0xBE258FF3, 0xD74F9208),
+ BN_DEF(0xAD44CFD2, 0xF71C35FD),
+ BN_DEF(0x7A035BF6, 0x85FFAE5B),
+ BN_DEF(0xD31BF6B5, 0x7A262174),
+ BN_DEF(0x312F3F63, 0xF242DABB),
+ BN_DEF(0xB6A8E122, 0xA7F09AB6),
+ BN_DEF(0xF92F8A1B, 0x98158536),
+ BN_DEF(0xE69D218D, 0xF7CA8CD9),
+ BN_DEF(0xC71A026E, 0x28A5043C),
+ BN_DEF(0x1D89CD91, 0x0105DF53),
+ BN_DEF(0x4533E63A, 0x94812704),
+ BN_DEF(0xC06E0E68, 0x62633145),
+ BN_DEF(0x10B4611A, 0xE487ED51),
+ BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
};
/*-
@@ -210,38 +250,70 @@ static const BN_ULONG modp_4096_p[] = {
};
/* q = (p - 1) / 2 */
static const BN_ULONG modp_4096_q[] = {
- BN_DEF(0xFFFFFFFF, 0xFFFFFFFF), BN_DEF(0x9A0318CC, 0xA6FA1AE4),
- BN_DEF(0x48536047, 0xC37FDBEE), BN_DEF(0x46C7EEE0, 0xC9DA754C),
- BN_DEF(0xEAD82D54, 0x68034893), BN_DEF(0x10B8240E, 0xDC0DEEBB),
- BN_DEF(0x67716BD7, 0x8FB094B8), BN_DEF(0x28ADF3F6, 0x119DD0C3),
- BN_DEF(0xD04861D1, 0xCCD94B27), BN_DEF(0xA735E02E, 0x143E2CA3),
- BN_DEF(0x0FDF6553, 0x97477E0A), BN_DEF(0x826F477C, 0x6DDDE16D),
- BN_DEF(0x156A2674, 0x12C1F4E5), BN_DEF(0x5B0A85ED, 0x0D4A341A),
- BN_DEF(0x357A711E, 0x4CE1938C), BN_DEF(0x5EDD2D93, 0xC438CD08),
- BN_DEF(0x53C3F36B, 0x8D391E09), BN_DEF(0x54908400, 0x25C16890),
- BN_DEF(0x707E8847, 0xA1EDADFE), BN_DEF(0x3A72D598, 0x047127D0),
- BN_DEF(0x5D6CA371, 0x3B84C460), BN_DEF(0xBD30AEB6, 0x5DF08BAB),
- BN_DEF(0x0BBD9006, 0x290F958C), BN_DEF(0x9F643532, 0x6C3B0139),
- BN_DEF(0x6CC50432, 0xF897FD03), BN_DEF(0x0D697735, 0xE771E913),
- BN_DEF(0x2512B0CE, 0x8F464A70), BN_DEF(0x6D8499EB, 0xD5FAD746),
- BN_DEF(0xD370F263, 0xD9CB87C2), BN_DEF(0xAE83063E, 0x457538AB),
- BN_DEF(0x2C6DF785, 0x767DC282), BN_DEF(0xEF8E5D32, 0xD42A90D5),
- BN_DEF(0x82283D19, 0xD6998B86), BN_DEF(0x45556216, 0x0AB9472D),
- BN_DEF(0x4C7D0288, 0x8AE9130C), BN_DEF(0x754AB572, 0x1CCAA4BE),
- BN_DEF(0x4AAC0B8C, 0xEF15E5FB), BN_DEF(0x37A62964, 0xDAE2AEF8),
- BN_DEF(0x7603D147, 0xCD93C1D1), BN_DEF(0x0C074301, 0xF1CF3B96),
- BN_DEF(0x171B671D, 0x19482F23), BN_DEF(0x650C10BE, 0x78BA3604),
- BN_DEF(0x255E4C02, 0xB3861AA7), BN_DEF(0xB84B4B36, 0xCF6A9483),
- BN_DEF(0x1042A95D, 0x0E3179AB), BN_DEF(0xEE51D6CB, 0xC1B2AE91),
- BN_DEF(0x7E9267AF, 0x348B1FD4), BN_DEF(0x0E2AE9CD, 0xCC6D241B),
- BN_DEF(0x50B1DF82, 0xE1003E5C), BN_DEF(0xF6722D9E, 0x24943328),
- BN_DEF(0xBE258FF3, 0xD74F9208), BN_DEF(0xAD44CFD2, 0xF71C35FD),
- BN_DEF(0x7A035BF6, 0x85FFAE5B), BN_DEF(0xD31BF6B5, 0x7A262174),
- BN_DEF(0x312F3F63, 0xF242DABB), BN_DEF(0xB6A8E122, 0xA7F09AB6),
- BN_DEF(0xF92F8A1B, 0x98158536), BN_DEF(0xE69D218D, 0xF7CA8CD9),
- BN_DEF(0xC71A026E, 0x28A5043C), BN_DEF(0x1D89CD91, 0x0105DF53),
- BN_DEF(0x4533E63A, 0x94812704), BN_DEF(0xC06E0E68, 0x62633145),
- BN_DEF(0x10B4611A, 0xE487ED51), BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
+ BN_DEF(0xFFFFFFFF, 0xFFFFFFFF),
+ BN_DEF(0x9A0318CC, 0xA6FA1AE4),
+ BN_DEF(0x48536047, 0xC37FDBEE),
+ BN_DEF(0x46C7EEE0, 0xC9DA754C),
+ BN_DEF(0xEAD82D54, 0x68034893),
+ BN_DEF(0x10B8240E, 0xDC0DEEBB),
+ BN_DEF(0x67716BD7, 0x8FB094B8),
+ BN_DEF(0x28ADF3F6, 0x119DD0C3),
+ BN_DEF(0xD04861D1, 0xCCD94B27),
+ BN_DEF(0xA735E02E, 0x143E2CA3),
+ BN_DEF(0x0FDF6553, 0x97477E0A),
+ BN_DEF(0x826F477C, 0x6DDDE16D),
+ BN_DEF(0x156A2674, 0x12C1F4E5),
+ BN_DEF(0x5B0A85ED, 0x0D4A341A),
+ BN_DEF(0x357A711E, 0x4CE1938C),
+ BN_DEF(0x5EDD2D93, 0xC438CD08),
+ BN_DEF(0x53C3F36B, 0x8D391E09),
+ BN_DEF(0x54908400, 0x25C16890),
+ BN_DEF(0x707E8847, 0xA1EDADFE),
+ BN_DEF(0x3A72D598, 0x047127D0),
+ BN_DEF(0x5D6CA371, 0x3B84C460),
+ BN_DEF(0xBD30AEB6, 0x5DF08BAB),
+ BN_DEF(0x0BBD9006, 0x290F958C),
+ BN_DEF(0x9F643532, 0x6C3B0139),
+ BN_DEF(0x6CC50432, 0xF897FD03),
+ BN_DEF(0x0D697735, 0xE771E913),
+ BN_DEF(0x2512B0CE, 0x8F464A70),
+ BN_DEF(0x6D8499EB, 0xD5FAD746),
+ BN_DEF(0xD370F263, 0xD9CB87C2),
+ BN_DEF(0xAE83063E, 0x457538AB),
+ BN_DEF(0x2C6DF785, 0x767DC282),
+ BN_DEF(0xEF8E5D32, 0xD42A90D5),
+ BN_DEF(0x82283D19, 0xD6998B86),
+ BN_DEF(0x45556216, 0x0AB9472D),
+ BN_DEF(0x4C7D0288, 0x8AE9130C),
+ BN_DEF(0x754AB572, 0x1CCAA4BE),
+ BN_DEF(0x4AAC0B8C, 0xEF15E5FB),
+ BN_DEF(0x37A62964, 0xDAE2AEF8),
+ BN_DEF(0x7603D147, 0xCD93C1D1),
+ BN_DEF(0x0C074301, 0xF1CF3B96),
+ BN_DEF(0x171B671D, 0x19482F23),
+ BN_DEF(0x650C10BE, 0x78BA3604),
+ BN_DEF(0x255E4C02, 0xB3861AA7),
+ BN_DEF(0xB84B4B36, 0xCF6A9483),
+ BN_DEF(0x1042A95D, 0x0E3179AB),
+ BN_DEF(0xEE51D6CB, 0xC1B2AE91),
+ BN_DEF(0x7E9267AF, 0x348B1FD4),
+ BN_DEF(0x0E2AE9CD, 0xCC6D241B),
+ BN_DEF(0x50B1DF82, 0xE1003E5C),
+ BN_DEF(0xF6722D9E, 0x24943328),
+ BN_DEF(0xBE258FF3, 0xD74F9208),
+ BN_DEF(0xAD44CFD2, 0xF71C35FD),
+ BN_DEF(0x7A035BF6, 0x85FFAE5B),
+ BN_DEF(0xD31BF6B5, 0x7A262174),
+ BN_DEF(0x312F3F63, 0xF242DABB),
+ BN_DEF(0xB6A8E122, 0xA7F09AB6),
+ BN_DEF(0xF92F8A1B, 0x98158536),
+ BN_DEF(0xE69D218D, 0xF7CA8CD9),
+ BN_DEF(0xC71A026E, 0x28A5043C),
+ BN_DEF(0x1D89CD91, 0x0105DF53),
+ BN_DEF(0x4533E63A, 0x94812704),
+ BN_DEF(0xC06E0E68, 0x62633145),
+ BN_DEF(0x10B4611A, 0xE487ED51),
+ BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
};
/*-
@@ -303,54 +375,102 @@ static const BN_ULONG modp_6144_p[] = {
};
/* q = (p - 1) / 2 */
static const BN_ULONG modp_6144_q[] = {
- BN_DEF(0xFFFFFFFF, 0x7FFFFFFF), BN_DEF(0x36E62012, 0x734A7C8F),
- BN_DEF(0x85BA3A6B, 0x095F96AD), BN_DEF(0x1FA43077, 0x021F47B3),
- BN_DEF(0xB71E0234, 0x1C3FF46B), BN_DEF(0x17794B19, 0x6D2B64F6),
- BN_DEF(0xD189EAAE, 0x758CE658), BN_DEF(0xC50FDFF8, 0x7AA8551E),
- BN_DEF(0xDBE2ED3B, 0x0350EAC5), BN_DEF(0x794DF194, 0x53CB8AF7),
- BN_DEF(0x07C01BF0, 0x0A662F69), BN_DEF(0x5FA470EC, 0x6647B6BF),
- BN_DEF(0x15A0AA55, 0xA5EA03D9), BN_DEF(0xFFAC2D62, 0x078EA2DB),
- BN_DEF(0x1B66445F, 0x91D4BD3F), BN_DEF(0xDF63F479, 0x2CF3E4BF),
- BN_DEF(0xC8058E4F, 0x5AD42018), BN_DEF(0xA34C0641, 0x6AAF3817),
- BN_DEF(0x373A7F7B, 0xFA416BE7), BN_DEF(0xE8B90E81, 0x7819750A),
- BN_DEF(0xE325C976, 0xACC1E500), BN_DEF(0x9BC6695F, 0x37DC7A00),
- BN_DEF(0x95EBD7A1, 0x999028A8), BN_DEF(0xF36612A5, 0xEDBF8A23),
- BN_DEF(0x676A5D8D, 0xA267365D), BN_DEF(0xE7CD8A76, 0x6D1F6DF5),
- BN_DEF(0x432D448C, 0x8BCB93D8), BN_DEF(0xC813EC18, 0x583529F6),
- BN_DEF(0xA09800D7, 0x72ED9C17), BN_DEF(0x56CF2987, 0xFC7FCA03),
- BN_DEF(0x1EDD1BDE, 0x64BA8F3B), BN_DEF(0x3013236F, 0x60EA6E59),
- BN_DEF(0x693E3813, 0x1B61FD5A), BN_DEF(0x9A014249, 0xA6FA1AE4),
- BN_DEF(0x48536047, 0xC37FDBEE), BN_DEF(0x46C7EEE0, 0xC9DA754C),
- BN_DEF(0xEAD82D54, 0x68034893), BN_DEF(0x10B8240E, 0xDC0DEEBB),
- BN_DEF(0x67716BD7, 0x8FB094B8), BN_DEF(0x28ADF3F6, 0x119DD0C3),
- BN_DEF(0xD04861D1, 0xCCD94B27), BN_DEF(0xA735E02E, 0x143E2CA3),
- BN_DEF(0x0FDF6553, 0x97477E0A), BN_DEF(0x826F477C, 0x6DDDE16D),
- BN_DEF(0x156A2674, 0x12C1F4E5), BN_DEF(0x5B0A85ED, 0x0D4A341A),
- BN_DEF(0x357A711E, 0x4CE1938C), BN_DEF(0x5EDD2D93, 0xC438CD08),
- BN_DEF(0x53C3F36B, 0x8D391E09), BN_DEF(0x54908400, 0x25C16890),
- BN_DEF(0x707E8847, 0xA1EDADFE), BN_DEF(0x3A72D598, 0x047127D0),
- BN_DEF(0x5D6CA371, 0x3B84C460), BN_DEF(0xBD30AEB6, 0x5DF08BAB),
- BN_DEF(0x0BBD9006, 0x290F958C), BN_DEF(0x9F643532, 0x6C3B0139),
- BN_DEF(0x6CC50432, 0xF897FD03), BN_DEF(0x0D697735, 0xE771E913),
- BN_DEF(0x2512B0CE, 0x8F464A70), BN_DEF(0x6D8499EB, 0xD5FAD746),
- BN_DEF(0xD370F263, 0xD9CB87C2), BN_DEF(0xAE83063E, 0x457538AB),
- BN_DEF(0x2C6DF785, 0x767DC282), BN_DEF(0xEF8E5D32, 0xD42A90D5),
- BN_DEF(0x82283D19, 0xD6998B86), BN_DEF(0x45556216, 0x0AB9472D),
- BN_DEF(0x4C7D0288, 0x8AE9130C), BN_DEF(0x754AB572, 0x1CCAA4BE),
- BN_DEF(0x4AAC0B8C, 0xEF15E5FB), BN_DEF(0x37A62964, 0xDAE2AEF8),
- BN_DEF(0x7603D147, 0xCD93C1D1), BN_DEF(0x0C074301, 0xF1CF3B96),
- BN_DEF(0x171B671D, 0x19482F23), BN_DEF(0x650C10BE, 0x78BA3604),
- BN_DEF(0x255E4C02, 0xB3861AA7), BN_DEF(0xB84B4B36, 0xCF6A9483),
- BN_DEF(0x1042A95D, 0x0E3179AB), BN_DEF(0xEE51D6CB, 0xC1B2AE91),
- BN_DEF(0x7E9267AF, 0x348B1FD4), BN_DEF(0x0E2AE9CD, 0xCC6D241B),
- BN_DEF(0x50B1DF82, 0xE1003E5C), BN_DEF(0xF6722D9E, 0x24943328),
- BN_DEF(0xBE258FF3, 0xD74F9208), BN_DEF(0xAD44CFD2, 0xF71C35FD),
- BN_DEF(0x7A035BF6, 0x85FFAE5B), BN_DEF(0xD31BF6B5, 0x7A262174),
- BN_DEF(0x312F3F63, 0xF242DABB), BN_DEF(0xB6A8E122, 0xA7F09AB6),
- BN_DEF(0xF92F8A1B, 0x98158536), BN_DEF(0xE69D218D, 0xF7CA8CD9),
- BN_DEF(0xC71A026E, 0x28A5043C), BN_DEF(0x1D89CD91, 0x0105DF53),
- BN_DEF(0x4533E63A, 0x94812704), BN_DEF(0xC06E0E68, 0x62633145),
- BN_DEF(0x10B4611A, 0xE487ED51), BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
+ BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
+ BN_DEF(0x36E62012, 0x734A7C8F),
+ BN_DEF(0x85BA3A6B, 0x095F96AD),
+ BN_DEF(0x1FA43077, 0x021F47B3),
+ BN_DEF(0xB71E0234, 0x1C3FF46B),
+ BN_DEF(0x17794B19, 0x6D2B64F6),
+ BN_DEF(0xD189EAAE, 0x758CE658),
+ BN_DEF(0xC50FDFF8, 0x7AA8551E),
+ BN_DEF(0xDBE2ED3B, 0x0350EAC5),
+ BN_DEF(0x794DF194, 0x53CB8AF7),
+ BN_DEF(0x07C01BF0, 0x0A662F69),
+ BN_DEF(0x5FA470EC, 0x6647B6BF),
+ BN_DEF(0x15A0AA55, 0xA5EA03D9),
+ BN_DEF(0xFFAC2D62, 0x078EA2DB),
+ BN_DEF(0x1B66445F, 0x91D4BD3F),
+ BN_DEF(0xDF63F479, 0x2CF3E4BF),
+ BN_DEF(0xC8058E4F, 0x5AD42018),
+ BN_DEF(0xA34C0641, 0x6AAF3817),
+ BN_DEF(0x373A7F7B, 0xFA416BE7),
+ BN_DEF(0xE8B90E81, 0x7819750A),
+ BN_DEF(0xE325C976, 0xACC1E500),
+ BN_DEF(0x9BC6695F, 0x37DC7A00),
+ BN_DEF(0x95EBD7A1, 0x999028A8),
+ BN_DEF(0xF36612A5, 0xEDBF8A23),
+ BN_DEF(0x676A5D8D, 0xA267365D),
+ BN_DEF(0xE7CD8A76, 0x6D1F6DF5),
+ BN_DEF(0x432D448C, 0x8BCB93D8),
+ BN_DEF(0xC813EC18, 0x583529F6),
+ BN_DEF(0xA09800D7, 0x72ED9C17),
+ BN_DEF(0x56CF2987, 0xFC7FCA03),
+ BN_DEF(0x1EDD1BDE, 0x64BA8F3B),
+ BN_DEF(0x3013236F, 0x60EA6E59),
+ BN_DEF(0x693E3813, 0x1B61FD5A),
+ BN_DEF(0x9A014249, 0xA6FA1AE4),
+ BN_DEF(0x48536047, 0xC37FDBEE),
+ BN_DEF(0x46C7EEE0, 0xC9DA754C),
+ BN_DEF(0xEAD82D54, 0x68034893),
+ BN_DEF(0x10B8240E, 0xDC0DEEBB),
+ BN_DEF(0x67716BD7, 0x8FB094B8),
+ BN_DEF(0x28ADF3F6, 0x119DD0C3),
+ BN_DEF(0xD04861D1, 0xCCD94B27),
+ BN_DEF(0xA735E02E, 0x143E2CA3),
+ BN_DEF(0x0FDF6553, 0x97477E0A),
+ BN_DEF(0x826F477C, 0x6DDDE16D),
+ BN_DEF(0x156A2674, 0x12C1F4E5),
+ BN_DEF(0x5B0A85ED, 0x0D4A341A),
+ BN_DEF(0x357A711E, 0x4CE1938C),
+ BN_DEF(0x5EDD2D93, 0xC438CD08),
+ BN_DEF(0x53C3F36B, 0x8D391E09),
+ BN_DEF(0x54908400, 0x25C16890),
+ BN_DEF(0x707E8847, 0xA1EDADFE),
+ BN_DEF(0x3A72D598, 0x047127D0),
+ BN_DEF(0x5D6CA371, 0x3B84C460),
+ BN_DEF(0xBD30AEB6, 0x5DF08BAB),
+ BN_DEF(0x0BBD9006, 0x290F958C),
+ BN_DEF(0x9F643532, 0x6C3B0139),
+ BN_DEF(0x6CC50432, 0xF897FD03),
+ BN_DEF(0x0D697735, 0xE771E913),
+ BN_DEF(0x2512B0CE, 0x8F464A70),
+ BN_DEF(0x6D8499EB, 0xD5FAD746),
+ BN_DEF(0xD370F263, 0xD9CB87C2),
+ BN_DEF(0xAE83063E, 0x457538AB),
+ BN_DEF(0x2C6DF785, 0x767DC282),
+ BN_DEF(0xEF8E5D32, 0xD42A90D5),
+ BN_DEF(0x82283D19, 0xD6998B86),
+ BN_DEF(0x45556216, 0x0AB9472D),
+ BN_DEF(0x4C7D0288, 0x8AE9130C),
+ BN_DEF(0x754AB572, 0x1CCAA4BE),
+ BN_DEF(0x4AAC0B8C, 0xEF15E5FB),
+ BN_DEF(0x37A62964, 0xDAE2AEF8),
+ BN_DEF(0x7603D147, 0xCD93C1D1),
+ BN_DEF(0x0C074301, 0xF1CF3B96),
+ BN_DEF(0x171B671D, 0x19482F23),
+ BN_DEF(0x650C10BE, 0x78BA3604),
+ BN_DEF(0x255E4C02, 0xB3861AA7),
+ BN_DEF(0xB84B4B36, 0xCF6A9483),
+ BN_DEF(0x1042A95D, 0x0E3179AB),
+ BN_DEF(0xEE51D6CB, 0xC1B2AE91),
+ BN_DEF(0x7E9267AF, 0x348B1FD4),
+ BN_DEF(0x0E2AE9CD, 0xCC6D241B),
+ BN_DEF(0x50B1DF82, 0xE1003E5C),
+ BN_DEF(0xF6722D9E, 0x24943328),
+ BN_DEF(0xBE258FF3, 0xD74F9208),
+ BN_DEF(0xAD44CFD2, 0xF71C35FD),
+ BN_DEF(0x7A035BF6, 0x85FFAE5B),
+ BN_DEF(0xD31BF6B5, 0x7A262174),
+ BN_DEF(0x312F3F63, 0xF242DABB),
+ BN_DEF(0xB6A8E122, 0xA7F09AB6),
+ BN_DEF(0xF92F8A1B, 0x98158536),
+ BN_DEF(0xE69D218D, 0xF7CA8CD9),
+ BN_DEF(0xC71A026E, 0x28A5043C),
+ BN_DEF(0x1D89CD91, 0x0105DF53),
+ BN_DEF(0x4533E63A, 0x94812704),
+ BN_DEF(0xC06E0E68, 0x62633145),
+ BN_DEF(0x10B4611A, 0xE487ED51),
+ BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
};
/*
@@ -428,70 +548,134 @@ static const BN_ULONG modp_8192_p[] = {
};
/* q = (p - 1) / 2 */
static const BN_ULONG modp_8192_q[] = {
- BN_DEF(0xFFFFFFFF, 0xFFFFFFFF), BN_DEF(0xCC76E9EF, 0xB064C06E),
- BN_DEF(0x405CB738, 0xE40FAB74), BN_DEF(0x3B2B4A6F, 0x4F182871),
- BN_DEF(0xAB3BF4D5, 0xCAAC7223), BN_DEF(0x7E013723, 0xE48C86D3),
- BN_DEF(0x6AF71C15, 0xC44D0017), BN_DEF(0xA40E366B, 0x2004A1C5),
- BN_DEF(0x75C3CFC9, 0x1AC8237A), BN_DEF(0x8F67D134, 0xFD79B5E1),
- BN_DEF(0xBF73A6B9, 0xD8EA885E), BN_DEF(0xAEF6BF50, 0xFCD5A40C),
- BN_DEF(0x8423428E, 0xB2798E62), BN_DEF(0xD012AEE0, 0x22CBF44C),
- BN_DEF(0x3A55B51B, 0xEF988770), BN_DEF(0x1FA27C16, 0x369509FC),
- BN_DEF(0xD9D13C53, 0x03159E7A), BN_DEF(0xF6ADEE9D, 0x3CB41981),
- BN_DEF(0xD16043F4, 0xFD4EA5BF), BN_DEF(0x17C1C2EE, 0xA5E5E443),
- BN_DEF(0x36751835, 0x9A39FE32), BN_DEF(0x0D11F863, 0x89F5ABD4),
- BN_DEF(0x5201BE03, 0x91111702), BN_DEF(0x7E42456C, 0xF1FEDC5F),
- BN_DEF(0xF1CEB296, 0x11C78B65), BN_DEF(0x15F8E4BC, 0x1A11DA3A),
- BN_DEF(0x2D727AB4, 0x1D55B1CE), BN_DEF(0xB5D21233, 0x92BB7B49),
- BN_DEF(0xC57E23F6, 0x3A0FD3DF), BN_DEF(0x46CEE980, 0x1DE4195B),
- BN_DEF(0x39DC98DD, 0x6C5F6268), BN_DEF(0x54996FC6, 0x1C3BBE5B),
- BN_DEF(0x897F72F2, 0xBA51C937), BN_DEF(0x36DF08AC, 0x734A7C8F),
- BN_DEF(0x85BA3A6B, 0x095F96AD), BN_DEF(0x1FA43077, 0x021F47B3),
- BN_DEF(0xB71E0234, 0x1C3FF46B), BN_DEF(0x17794B19, 0x6D2B64F6),
- BN_DEF(0xD189EAAE, 0x758CE658), BN_DEF(0xC50FDFF8, 0x7AA8551E),
- BN_DEF(0xDBE2ED3B, 0x0350EAC5), BN_DEF(0x794DF194, 0x53CB8AF7),
- BN_DEF(0x07C01BF0, 0x0A662F69), BN_DEF(0x5FA470EC, 0x6647B6BF),
- BN_DEF(0x15A0AA55, 0xA5EA03D9), BN_DEF(0xFFAC2D62, 0x078EA2DB),
- BN_DEF(0x1B66445F, 0x91D4BD3F), BN_DEF(0xDF63F479, 0x2CF3E4BF),
- BN_DEF(0xC8058E4F, 0x5AD42018), BN_DEF(0xA34C0641, 0x6AAF3817),
- BN_DEF(0x373A7F7B, 0xFA416BE7), BN_DEF(0xE8B90E81, 0x7819750A),
- BN_DEF(0xE325C976, 0xACC1E500), BN_DEF(0x9BC6695F, 0x37DC7A00),
- BN_DEF(0x95EBD7A1, 0x999028A8), BN_DEF(0xF36612A5, 0xEDBF8A23),
- BN_DEF(0x676A5D8D, 0xA267365D), BN_DEF(0xE7CD8A76, 0x6D1F6DF5),
- BN_DEF(0x432D448C, 0x8BCB93D8), BN_DEF(0xC813EC18, 0x583529F6),
- BN_DEF(0xA09800D7, 0x72ED9C17), BN_DEF(0x56CF2987, 0xFC7FCA03),
- BN_DEF(0x1EDD1BDE, 0x64BA8F3B), BN_DEF(0x3013236F, 0x60EA6E59),
- BN_DEF(0x693E3813, 0x1B61FD5A), BN_DEF(0x9A014249, 0xA6FA1AE4),
- BN_DEF(0x48536047, 0xC37FDBEE), BN_DEF(0x46C7EEE0, 0xC9DA754C),
- BN_DEF(0xEAD82D54, 0x68034893), BN_DEF(0x10B8240E, 0xDC0DEEBB),
- BN_DEF(0x67716BD7, 0x8FB094B8), BN_DEF(0x28ADF3F6, 0x119DD0C3),
- BN_DEF(0xD04861D1, 0xCCD94B27), BN_DEF(0xA735E02E, 0x143E2CA3),
- BN_DEF(0x0FDF6553, 0x97477E0A), BN_DEF(0x826F477C, 0x6DDDE16D),
- BN_DEF(0x156A2674, 0x12C1F4E5), BN_DEF(0x5B0A85ED, 0x0D4A341A),
- BN_DEF(0x357A711E, 0x4CE1938C), BN_DEF(0x5EDD2D93, 0xC438CD08),
- BN_DEF(0x53C3F36B, 0x8D391E09), BN_DEF(0x54908400, 0x25C16890),
- BN_DEF(0x707E8847, 0xA1EDADFE), BN_DEF(0x3A72D598, 0x047127D0),
- BN_DEF(0x5D6CA371, 0x3B84C460), BN_DEF(0xBD30AEB6, 0x5DF08BAB),
- BN_DEF(0x0BBD9006, 0x290F958C), BN_DEF(0x9F643532, 0x6C3B0139),
- BN_DEF(0x6CC50432, 0xF897FD03), BN_DEF(0x0D697735, 0xE771E913),
- BN_DEF(0x2512B0CE, 0x8F464A70), BN_DEF(0x6D8499EB, 0xD5FAD746),
- BN_DEF(0xD370F263, 0xD9CB87C2), BN_DEF(0xAE83063E, 0x457538AB),
- BN_DEF(0x2C6DF785, 0x767DC282), BN_DEF(0xEF8E5D32, 0xD42A90D5),
- BN_DEF(0x82283D19, 0xD6998B86), BN_DEF(0x45556216, 0x0AB9472D),
- BN_DEF(0x4C7D0288, 0x8AE9130C), BN_DEF(0x754AB572, 0x1CCAA4BE),
- BN_DEF(0x4AAC0B8C, 0xEF15E5FB), BN_DEF(0x37A62964, 0xDAE2AEF8),
- BN_DEF(0x7603D147, 0xCD93C1D1), BN_DEF(0x0C074301, 0xF1CF3B96),
- BN_DEF(0x171B671D, 0x19482F23), BN_DEF(0x650C10BE, 0x78BA3604),
- BN_DEF(0x255E4C02, 0xB3861AA7), BN_DEF(0xB84B4B36, 0xCF6A9483),
- BN_DEF(0x1042A95D, 0x0E3179AB), BN_DEF(0xEE51D6CB, 0xC1B2AE91),
- BN_DEF(0x7E9267AF, 0x348B1FD4), BN_DEF(0x0E2AE9CD, 0xCC6D241B),
- BN_DEF(0x50B1DF82, 0xE1003E5C), BN_DEF(0xF6722D9E, 0x24943328),
- BN_DEF(0xBE258FF3, 0xD74F9208), BN_DEF(0xAD44CFD2, 0xF71C35FD),
- BN_DEF(0x7A035BF6, 0x85FFAE5B), BN_DEF(0xD31BF6B5, 0x7A262174),
- BN_DEF(0x312F3F63, 0xF242DABB), BN_DEF(0xB6A8E122, 0xA7F09AB6),
- BN_DEF(0xF92F8A1B, 0x98158536), BN_DEF(0xE69D218D, 0xF7CA8CD9),
- BN_DEF(0xC71A026E, 0x28A5043C), BN_DEF(0x1D89CD91, 0x0105DF53),
- BN_DEF(0x4533E63A, 0x94812704), BN_DEF(0xC06E0E68, 0x62633145),
- BN_DEF(0x10B4611A, 0xE487ED51), BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
+ BN_DEF(0xFFFFFFFF, 0xFFFFFFFF),
+ BN_DEF(0xCC76E9EF, 0xB064C06E),
+ BN_DEF(0x405CB738, 0xE40FAB74),
+ BN_DEF(0x3B2B4A6F, 0x4F182871),
+ BN_DEF(0xAB3BF4D5, 0xCAAC7223),
+ BN_DEF(0x7E013723, 0xE48C86D3),
+ BN_DEF(0x6AF71C15, 0xC44D0017),
+ BN_DEF(0xA40E366B, 0x2004A1C5),
+ BN_DEF(0x75C3CFC9, 0x1AC8237A),
+ BN_DEF(0x8F67D134, 0xFD79B5E1),
+ BN_DEF(0xBF73A6B9, 0xD8EA885E),
+ BN_DEF(0xAEF6BF50, 0xFCD5A40C),
+ BN_DEF(0x8423428E, 0xB2798E62),
+ BN_DEF(0xD012AEE0, 0x22CBF44C),
+ BN_DEF(0x3A55B51B, 0xEF988770),
+ BN_DEF(0x1FA27C16, 0x369509FC),
+ BN_DEF(0xD9D13C53, 0x03159E7A),
+ BN_DEF(0xF6ADEE9D, 0x3CB41981),
+ BN_DEF(0xD16043F4, 0xFD4EA5BF),
+ BN_DEF(0x17C1C2EE, 0xA5E5E443),
+ BN_DEF(0x36751835, 0x9A39FE32),
+ BN_DEF(0x0D11F863, 0x89F5ABD4),
+ BN_DEF(0x5201BE03, 0x91111702),
+ BN_DEF(0x7E42456C, 0xF1FEDC5F),
+ BN_DEF(0xF1CEB296, 0x11C78B65),
+ BN_DEF(0x15F8E4BC, 0x1A11DA3A),
+ BN_DEF(0x2D727AB4, 0x1D55B1CE),
+ BN_DEF(0xB5D21233, 0x92BB7B49),
+ BN_DEF(0xC57E23F6, 0x3A0FD3DF),
+ BN_DEF(0x46CEE980, 0x1DE4195B),
+ BN_DEF(0x39DC98DD, 0x6C5F6268),
+ BN_DEF(0x54996FC6, 0x1C3BBE5B),
+ BN_DEF(0x897F72F2, 0xBA51C937),
+ BN_DEF(0x36DF08AC, 0x734A7C8F),
+ BN_DEF(0x85BA3A6B, 0x095F96AD),
+ BN_DEF(0x1FA43077, 0x021F47B3),
+ BN_DEF(0xB71E0234, 0x1C3FF46B),
+ BN_DEF(0x17794B19, 0x6D2B64F6),
+ BN_DEF(0xD189EAAE, 0x758CE658),
+ BN_DEF(0xC50FDFF8, 0x7AA8551E),
+ BN_DEF(0xDBE2ED3B, 0x0350EAC5),
+ BN_DEF(0x794DF194, 0x53CB8AF7),
+ BN_DEF(0x07C01BF0, 0x0A662F69),
+ BN_DEF(0x5FA470EC, 0x6647B6BF),
+ BN_DEF(0x15A0AA55, 0xA5EA03D9),
+ BN_DEF(0xFFAC2D62, 0x078EA2DB),
+ BN_DEF(0x1B66445F, 0x91D4BD3F),
+ BN_DEF(0xDF63F479, 0x2CF3E4BF),
+ BN_DEF(0xC8058E4F, 0x5AD42018),
+ BN_DEF(0xA34C0641, 0x6AAF3817),
+ BN_DEF(0x373A7F7B, 0xFA416BE7),
+ BN_DEF(0xE8B90E81, 0x7819750A),
+ BN_DEF(0xE325C976, 0xACC1E500),
+ BN_DEF(0x9BC6695F, 0x37DC7A00),
+ BN_DEF(0x95EBD7A1, 0x999028A8),
+ BN_DEF(0xF36612A5, 0xEDBF8A23),
+ BN_DEF(0x676A5D8D, 0xA267365D),
+ BN_DEF(0xE7CD8A76, 0x6D1F6DF5),
+ BN_DEF(0x432D448C, 0x8BCB93D8),
+ BN_DEF(0xC813EC18, 0x583529F6),
+ BN_DEF(0xA09800D7, 0x72ED9C17),
+ BN_DEF(0x56CF2987, 0xFC7FCA03),
+ BN_DEF(0x1EDD1BDE, 0x64BA8F3B),
+ BN_DEF(0x3013236F, 0x60EA6E59),
+ BN_DEF(0x693E3813, 0x1B61FD5A),
+ BN_DEF(0x9A014249, 0xA6FA1AE4),
+ BN_DEF(0x48536047, 0xC37FDBEE),
+ BN_DEF(0x46C7EEE0, 0xC9DA754C),
+ BN_DEF(0xEAD82D54, 0x68034893),
+ BN_DEF(0x10B8240E, 0xDC0DEEBB),
+ BN_DEF(0x67716BD7, 0x8FB094B8),
+ BN_DEF(0x28ADF3F6, 0x119DD0C3),
+ BN_DEF(0xD04861D1, 0xCCD94B27),
+ BN_DEF(0xA735E02E, 0x143E2CA3),
+ BN_DEF(0x0FDF6553, 0x97477E0A),
+ BN_DEF(0x826F477C, 0x6DDDE16D),
+ BN_DEF(0x156A2674, 0x12C1F4E5),
+ BN_DEF(0x5B0A85ED, 0x0D4A341A),
+ BN_DEF(0x357A711E, 0x4CE1938C),
+ BN_DEF(0x5EDD2D93, 0xC438CD08),
+ BN_DEF(0x53C3F36B, 0x8D391E09),
+ BN_DEF(0x54908400, 0x25C16890),
+ BN_DEF(0x707E8847, 0xA1EDADFE),
+ BN_DEF(0x3A72D598, 0x047127D0),
+ BN_DEF(0x5D6CA371, 0x3B84C460),
+ BN_DEF(0xBD30AEB6, 0x5DF08BAB),
+ BN_DEF(0x0BBD9006, 0x290F958C),
+ BN_DEF(0x9F643532, 0x6C3B0139),
+ BN_DEF(0x6CC50432, 0xF897FD03),
+ BN_DEF(0x0D697735, 0xE771E913),
+ BN_DEF(0x2512B0CE, 0x8F464A70),
+ BN_DEF(0x6D8499EB, 0xD5FAD746),
+ BN_DEF(0xD370F263, 0xD9CB87C2),
+ BN_DEF(0xAE83063E, 0x457538AB),
+ BN_DEF(0x2C6DF785, 0x767DC282),
+ BN_DEF(0xEF8E5D32, 0xD42A90D5),
+ BN_DEF(0x82283D19, 0xD6998B86),
+ BN_DEF(0x45556216, 0x0AB9472D),
+ BN_DEF(0x4C7D0288, 0x8AE9130C),
+ BN_DEF(0x754AB572, 0x1CCAA4BE),
+ BN_DEF(0x4AAC0B8C, 0xEF15E5FB),
+ BN_DEF(0x37A62964, 0xDAE2AEF8),
+ BN_DEF(0x7603D147, 0xCD93C1D1),
+ BN_DEF(0x0C074301, 0xF1CF3B96),
+ BN_DEF(0x171B671D, 0x19482F23),
+ BN_DEF(0x650C10BE, 0x78BA3604),
+ BN_DEF(0x255E4C02, 0xB3861AA7),
+ BN_DEF(0xB84B4B36, 0xCF6A9483),
+ BN_DEF(0x1042A95D, 0x0E3179AB),
+ BN_DEF(0xEE51D6CB, 0xC1B2AE91),
+ BN_DEF(0x7E9267AF, 0x348B1FD4),
+ BN_DEF(0x0E2AE9CD, 0xCC6D241B),
+ BN_DEF(0x50B1DF82, 0xE1003E5C),
+ BN_DEF(0xF6722D9E, 0x24943328),
+ BN_DEF(0xBE258FF3, 0xD74F9208),
+ BN_DEF(0xAD44CFD2, 0xF71C35FD),
+ BN_DEF(0x7A035BF6, 0x85FFAE5B),
+ BN_DEF(0xD31BF6B5, 0x7A262174),
+ BN_DEF(0x312F3F63, 0xF242DABB),
+ BN_DEF(0xB6A8E122, 0xA7F09AB6),
+ BN_DEF(0xF92F8A1B, 0x98158536),
+ BN_DEF(0xE69D218D, 0xF7CA8CD9),
+ BN_DEF(0xC71A026E, 0x28A5043C),
+ BN_DEF(0x1D89CD91, 0x0105DF53),
+ BN_DEF(0x4533E63A, 0x94812704),
+ BN_DEF(0xC06E0E68, 0x62633145),
+ BN_DEF(0x10B4611A, 0xE487ED51),
+ BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
};
/* DH parameters from RFC5114 */
@@ -623,22 +807,38 @@ static const BN_ULONG ffdhe2048_p[] = {
};
/* q = (p - 1) / 2 */
static const BN_ULONG ffdhe2048_q[] = {
- BN_DEF(0xFFFFFFFF, 0xFFFFFFFF), BN_DEF(0x30942E4B, 0x4435A11C),
- BN_DEF(0x60D977FD, 0x6379A513), BN_DEF(0xBE8B41D9, 0xE2C778C1),
- BN_DEF(0x17611002, 0x9DDAFE5E), BN_DEF(0xA637D6B9, 0xE1FF1D8D),
- BN_DEF(0x777940C1, 0xC7278919), BN_DEF(0x74C2C1FF, 0xC8B97F4E),
- BN_DEF(0x941A17B0, 0x601A0266), BN_DEF(0xE6FBF176, 0x4F017E70),
- BN_DEF(0x770536B8, 0x8583D3E4), BN_DEF(0xB1B95D8C, 0x572B76F3),
- BN_DEF(0xEF1CA6FA, 0x0EA7A151), BN_DEF(0xB06BFA34, 0xDCB56D5B),
- BN_DEF(0xD96471FD, 0xE88454A5), BN_DEF(0x59927DB0, 0x5E0558C1),
- BN_DEF(0xA41D3CBD, 0x98566527), BN_DEF(0x9B56F39A, 0x0EF8AC50),
- BN_DEF(0x79F7F439, 0xF15344ED), BN_DEF(0x707345BB, 0xCC278638),
- BN_DEF(0x3FABE49A, 0xDAAB89AF), BN_DEF(0x9EF68D79, 0x42B1B2AA),
- BN_DEF(0xAF833768, 0x9219FA8F), BN_DEF(0xEAFEB2B0, 0x69EF8F6A),
- BN_DEF(0x576230BD, 0x7B40D901), BN_DEF(0xB1863AEC, 0xBE97F1B1),
- BN_DEF(0x124D9F7C, 0xE649CEE7), BN_DEF(0x8A3219FD, 0xD4F09B20),
- BN_DEF(0xE7169B4A, 0xEC5CE2C1), BN_DEF(0x139E9E78, 0x57EE2B10),
- BN_DEF(0x515DA54D, 0xD6FC2A2C), BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
+ BN_DEF(0xFFFFFFFF, 0xFFFFFFFF),
+ BN_DEF(0x30942E4B, 0x4435A11C),
+ BN_DEF(0x60D977FD, 0x6379A513),
+ BN_DEF(0xBE8B41D9, 0xE2C778C1),
+ BN_DEF(0x17611002, 0x9DDAFE5E),
+ BN_DEF(0xA637D6B9, 0xE1FF1D8D),
+ BN_DEF(0x777940C1, 0xC7278919),
+ BN_DEF(0x74C2C1FF, 0xC8B97F4E),
+ BN_DEF(0x941A17B0, 0x601A0266),
+ BN_DEF(0xE6FBF176, 0x4F017E70),
+ BN_DEF(0x770536B8, 0x8583D3E4),
+ BN_DEF(0xB1B95D8C, 0x572B76F3),
+ BN_DEF(0xEF1CA6FA, 0x0EA7A151),
+ BN_DEF(0xB06BFA34, 0xDCB56D5B),
+ BN_DEF(0xD96471FD, 0xE88454A5),
+ BN_DEF(0x59927DB0, 0x5E0558C1),
+ BN_DEF(0xA41D3CBD, 0x98566527),
+ BN_DEF(0x9B56F39A, 0x0EF8AC50),
+ BN_DEF(0x79F7F439, 0xF15344ED),
+ BN_DEF(0x707345BB, 0xCC278638),
+ BN_DEF(0x3FABE49A, 0xDAAB89AF),
+ BN_DEF(0x9EF68D79, 0x42B1B2AA),
+ BN_DEF(0xAF833768, 0x9219FA8F),
+ BN_DEF(0xEAFEB2B0, 0x69EF8F6A),
+ BN_DEF(0x576230BD, 0x7B40D901),
+ BN_DEF(0xB1863AEC, 0xBE97F1B1),
+ BN_DEF(0x124D9F7C, 0xE649CEE7),
+ BN_DEF(0x8A3219FD, 0xD4F09B20),
+ BN_DEF(0xE7169B4A, 0xEC5CE2C1),
+ BN_DEF(0x139E9E78, 0x57EE2B10),
+ BN_DEF(0x515DA54D, 0xD6FC2A2C),
+ BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
};
static const BN_ULONG ffdhe3072_p[] = {
@@ -669,30 +869,54 @@ static const BN_ULONG ffdhe3072_p[] = {
};
/* q = (p - 1) / 2 */
static const BN_ULONG ffdhe3072_q[] = {
- BN_DEF(0xFFFFFFFF, 0xFFFFFFFF), BN_DEF(0xB363171B, 0x12F20E95),
- BN_DEF(0x1FEACEBE, 0x9E0D9077), BN_DEF(0xFD29EEF7, 0x055E6835),
- BN_DEF(0x6AE22427, 0x0EDFCD21), BN_DEF(0xCD86F56D, 0xD5E290CB),
- BN_DEF(0x911B1D06, 0x743695E2), BN_DEF(0xCE4EFB4F, 0xAE574155),
- BN_DEF(0x38FAA5FF, 0xB279710F), BN_DEF(0x716BA6E9, 0x7A7EA229),
- BN_DEF(0xDE21BCA2, 0x5A098649), BN_DEF(0xC289C938, 0x577F0984),
- BN_DEF(0x60C36C8E, 0x2CC6587D), BN_DEF(0x48FBFBF7, 0xBD6C8E93),
- BN_DEF(0xEB736483, 0x30DA37E4), BN_DEF(0x7CCE011C, 0xDE1A7A6F),
- BN_DEF(0xB28C81AD, 0x6F1AAD9D), BN_DEF(0x308FE7EE, 0x4435A11C),
- BN_DEF(0x60D977FD, 0x6379A513), BN_DEF(0xBE8B41D9, 0xE2C778C1),
- BN_DEF(0x17611002, 0x9DDAFE5E), BN_DEF(0xA637D6B9, 0xE1FF1D8D),
- BN_DEF(0x777940C1, 0xC7278919), BN_DEF(0x74C2C1FF, 0xC8B97F4E),
- BN_DEF(0x941A17B0, 0x601A0266), BN_DEF(0xE6FBF176, 0x4F017E70),
- BN_DEF(0x770536B8, 0x8583D3E4), BN_DEF(0xB1B95D8C, 0x572B76F3),
- BN_DEF(0xEF1CA6FA, 0x0EA7A151), BN_DEF(0xB06BFA34, 0xDCB56D5B),
- BN_DEF(0xD96471FD, 0xE88454A5), BN_DEF(0x59927DB0, 0x5E0558C1),
- BN_DEF(0xA41D3CBD, 0x98566527), BN_DEF(0x9B56F39A, 0x0EF8AC50),
- BN_DEF(0x79F7F439, 0xF15344ED), BN_DEF(0x707345BB, 0xCC278638),
- BN_DEF(0x3FABE49A, 0xDAAB89AF), BN_DEF(0x9EF68D79, 0x42B1B2AA),
- BN_DEF(0xAF833768, 0x9219FA8F), BN_DEF(0xEAFEB2B0, 0x69EF8F6A),
- BN_DEF(0x576230BD, 0x7B40D901), BN_DEF(0xB1863AEC, 0xBE97F1B1),
- BN_DEF(0x124D9F7C, 0xE649CEE7), BN_DEF(0x8A3219FD, 0xD4F09B20),
- BN_DEF(0xE7169B4A, 0xEC5CE2C1), BN_DEF(0x139E9E78, 0x57EE2B10),
- BN_DEF(0x515DA54D, 0xD6FC2A2C), BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
+ BN_DEF(0xFFFFFFFF, 0xFFFFFFFF),
+ BN_DEF(0xB363171B, 0x12F20E95),
+ BN_DEF(0x1FEACEBE, 0x9E0D9077),
+ BN_DEF(0xFD29EEF7, 0x055E6835),
+ BN_DEF(0x6AE22427, 0x0EDFCD21),
+ BN_DEF(0xCD86F56D, 0xD5E290CB),
+ BN_DEF(0x911B1D06, 0x743695E2),
+ BN_DEF(0xCE4EFB4F, 0xAE574155),
+ BN_DEF(0x38FAA5FF, 0xB279710F),
+ BN_DEF(0x716BA6E9, 0x7A7EA229),
+ BN_DEF(0xDE21BCA2, 0x5A098649),
+ BN_DEF(0xC289C938, 0x577F0984),
+ BN_DEF(0x60C36C8E, 0x2CC6587D),
+ BN_DEF(0x48FBFBF7, 0xBD6C8E93),
+ BN_DEF(0xEB736483, 0x30DA37E4),
+ BN_DEF(0x7CCE011C, 0xDE1A7A6F),
+ BN_DEF(0xB28C81AD, 0x6F1AAD9D),
+ BN_DEF(0x308FE7EE, 0x4435A11C),
+ BN_DEF(0x60D977FD, 0x6379A513),
+ BN_DEF(0xBE8B41D9, 0xE2C778C1),
+ BN_DEF(0x17611002, 0x9DDAFE5E),
+ BN_DEF(0xA637D6B9, 0xE1FF1D8D),
+ BN_DEF(0x777940C1, 0xC7278919),
+ BN_DEF(0x74C2C1FF, 0xC8B97F4E),
+ BN_DEF(0x941A17B0, 0x601A0266),
+ BN_DEF(0xE6FBF176, 0x4F017E70),
+ BN_DEF(0x770536B8, 0x8583D3E4),
+ BN_DEF(0xB1B95D8C, 0x572B76F3),
+ BN_DEF(0xEF1CA6FA, 0x0EA7A151),
+ BN_DEF(0xB06BFA34, 0xDCB56D5B),
+ BN_DEF(0xD96471FD, 0xE88454A5),
+ BN_DEF(0x59927DB0, 0x5E0558C1),
+ BN_DEF(0xA41D3CBD, 0x98566527),
+ BN_DEF(0x9B56F39A, 0x0EF8AC50),
+ BN_DEF(0x79F7F439, 0xF15344ED),
+ BN_DEF(0x707345BB, 0xCC278638),
+ BN_DEF(0x3FABE49A, 0xDAAB89AF),
+ BN_DEF(0x9EF68D79, 0x42B1B2AA),
+ BN_DEF(0xAF833768, 0x9219FA8F),
+ BN_DEF(0xEAFEB2B0, 0x69EF8F6A),
+ BN_DEF(0x576230BD, 0x7B40D901),
+ BN_DEF(0xB1863AEC, 0xBE97F1B1),
+ BN_DEF(0x124D9F7C, 0xE649CEE7),
+ BN_DEF(0x8A3219FD, 0xD4F09B20),
+ BN_DEF(0xE7169B4A, 0xEC5CE2C1),
+ BN_DEF(0x139E9E78, 0x57EE2B10),
+ BN_DEF(0x515DA54D, 0xD6FC2A2C),
+ BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
};
static const BN_ULONG ffdhe4096_p[] = {
@@ -731,38 +955,70 @@ static const BN_ULONG ffdhe4096_p[] = {
};
/* q = (p - 1) / 2 */
static const BN_ULONG ffdhe4096_q[] = {
- BN_DEF(0xFFFFFFFF, 0x7FFFFFFF), BN_DEF(0x2F32AFB5, 0xE345003F),
- BN_DEF(0xFA20C170, 0xA6DAD428), BN_DEF(0x3FC45235, 0xC764DAAD),
- BN_DEF(0xE764BEE7, 0x054148E6), BN_DEF(0xFCC68566, 0x15276754),
- BN_DEF(0xB8A0001E, 0x0D0EDC9E), BN_DEF(0x99E5C5BD, 0x0494CCD1),
- BN_DEF(0xB8D6801C, 0x36E3BC7C), BN_DEF(0x48C09862, 0x5483B005),
- BN_DEF(0x96CF3419, 0x76B50F00), BN_DEF(0x77DA18C5, 0x389AE443),
- BN_DEF(0xBF18E63D, 0x43FAADD2), BN_DEF(0xAA81A002, 0x3BB1E78E),
- BN_DEF(0x6B4FB68C, 0x563EAFA1), BN_DEF(0x72C42BDB, 0xBC9874F2),
- BN_DEF(0x8B26FA7D, 0xB737A961), BN_DEF(0xB34F0F78, 0x12F20E95),
- BN_DEF(0x1FEACEBE, 0x9E0D9077), BN_DEF(0xFD29EEF7, 0x055E6835),
- BN_DEF(0x6AE22427, 0x0EDFCD21), BN_DEF(0xCD86F56D, 0xD5E290CB),
- BN_DEF(0x911B1D06, 0x743695E2), BN_DEF(0xCE4EFB4F, 0xAE574155),
- BN_DEF(0x38FAA5FF, 0xB279710F), BN_DEF(0x716BA6E9, 0x7A7EA229),
- BN_DEF(0xDE21BCA2, 0x5A098649), BN_DEF(0xC289C938, 0x577F0984),
- BN_DEF(0x60C36C8E, 0x2CC6587D), BN_DEF(0x48FBFBF7, 0xBD6C8E93),
- BN_DEF(0xEB736483, 0x30DA37E4), BN_DEF(0x7CCE011C, 0xDE1A7A6F),
- BN_DEF(0xB28C81AD, 0x6F1AAD9D), BN_DEF(0x308FE7EE, 0x4435A11C),
- BN_DEF(0x60D977FD, 0x6379A513), BN_DEF(0xBE8B41D9, 0xE2C778C1),
- BN_DEF(0x17611002, 0x9DDAFE5E), BN_DEF(0xA637D6B9, 0xE1FF1D8D),
- BN_DEF(0x777940C1, 0xC7278919), BN_DEF(0x74C2C1FF, 0xC8B97F4E),
- BN_DEF(0x941A17B0, 0x601A0266), BN_DEF(0xE6FBF176, 0x4F017E70),
- BN_DEF(0x770536B8, 0x8583D3E4), BN_DEF(0xB1B95D8C, 0x572B76F3),
- BN_DEF(0xEF1CA6FA, 0x0EA7A151), BN_DEF(0xB06BFA34, 0xDCB56D5B),
- BN_DEF(0xD96471FD, 0xE88454A5), BN_DEF(0x59927DB0, 0x5E0558C1),
- BN_DEF(0xA41D3CBD, 0x98566527), BN_DEF(0x9B56F39A, 0x0EF8AC50),
- BN_DEF(0x79F7F439, 0xF15344ED), BN_DEF(0x707345BB, 0xCC278638),
- BN_DEF(0x3FABE49A, 0xDAAB89AF), BN_DEF(0x9EF68D79, 0x42B1B2AA),
- BN_DEF(0xAF833768, 0x9219FA8F), BN_DEF(0xEAFEB2B0, 0x69EF8F6A),
- BN_DEF(0x576230BD, 0x7B40D901), BN_DEF(0xB1863AEC, 0xBE97F1B1),
- BN_DEF(0x124D9F7C, 0xE649CEE7), BN_DEF(0x8A3219FD, 0xD4F09B20),
- BN_DEF(0xE7169B4A, 0xEC5CE2C1), BN_DEF(0x139E9E78, 0x57EE2B10),
- BN_DEF(0x515DA54D, 0xD6FC2A2C), BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
+ BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
+ BN_DEF(0x2F32AFB5, 0xE345003F),
+ BN_DEF(0xFA20C170, 0xA6DAD428),
+ BN_DEF(0x3FC45235, 0xC764DAAD),
+ BN_DEF(0xE764BEE7, 0x054148E6),
+ BN_DEF(0xFCC68566, 0x15276754),
+ BN_DEF(0xB8A0001E, 0x0D0EDC9E),
+ BN_DEF(0x99E5C5BD, 0x0494CCD1),
+ BN_DEF(0xB8D6801C, 0x36E3BC7C),
+ BN_DEF(0x48C09862, 0x5483B005),
+ BN_DEF(0x96CF3419, 0x76B50F00),
+ BN_DEF(0x77DA18C5, 0x389AE443),
+ BN_DEF(0xBF18E63D, 0x43FAADD2),
+ BN_DEF(0xAA81A002, 0x3BB1E78E),
+ BN_DEF(0x6B4FB68C, 0x563EAFA1),
+ BN_DEF(0x72C42BDB, 0xBC9874F2),
+ BN_DEF(0x8B26FA7D, 0xB737A961),
+ BN_DEF(0xB34F0F78, 0x12F20E95),
+ BN_DEF(0x1FEACEBE, 0x9E0D9077),
+ BN_DEF(0xFD29EEF7, 0x055E6835),
+ BN_DEF(0x6AE22427, 0x0EDFCD21),
+ BN_DEF(0xCD86F56D, 0xD5E290CB),
+ BN_DEF(0x911B1D06, 0x743695E2),
+ BN_DEF(0xCE4EFB4F, 0xAE574155),
+ BN_DEF(0x38FAA5FF, 0xB279710F),
+ BN_DEF(0x716BA6E9, 0x7A7EA229),
+ BN_DEF(0xDE21BCA2, 0x5A098649),
+ BN_DEF(0xC289C938, 0x577F0984),
+ BN_DEF(0x60C36C8E, 0x2CC6587D),
+ BN_DEF(0x48FBFBF7, 0xBD6C8E93),
+ BN_DEF(0xEB736483, 0x30DA37E4),
+ BN_DEF(0x7CCE011C, 0xDE1A7A6F),
+ BN_DEF(0xB28C81AD, 0x6F1AAD9D),
+ BN_DEF(0x308FE7EE, 0x4435A11C),
+ BN_DEF(0x60D977FD, 0x6379A513),
+ BN_DEF(0xBE8B41D9, 0xE2C778C1),
+ BN_DEF(0x17611002, 0x9DDAFE5E),
+ BN_DEF(0xA637D6B9, 0xE1FF1D8D),
+ BN_DEF(0x777940C1, 0xC7278919),
+ BN_DEF(0x74C2C1FF, 0xC8B97F4E),
+ BN_DEF(0x941A17B0, 0x601A0266),
+ BN_DEF(0xE6FBF176, 0x4F017E70),
+ BN_DEF(0x770536B8, 0x8583D3E4),
+ BN_DEF(0xB1B95D8C, 0x572B76F3),
+ BN_DEF(0xEF1CA6FA, 0x0EA7A151),
+ BN_DEF(0xB06BFA34, 0xDCB56D5B),
+ BN_DEF(0xD96471FD, 0xE88454A5),
+ BN_DEF(0x59927DB0, 0x5E0558C1),
+ BN_DEF(0xA41D3CBD, 0x98566527),
+ BN_DEF(0x9B56F39A, 0x0EF8AC50),
+ BN_DEF(0x79F7F439, 0xF15344ED),
+ BN_DEF(0x707345BB, 0xCC278638),
+ BN_DEF(0x3FABE49A, 0xDAAB89AF),
+ BN_DEF(0x9EF68D79, 0x42B1B2AA),
+ BN_DEF(0xAF833768, 0x9219FA8F),
+ BN_DEF(0xEAFEB2B0, 0x69EF8F6A),
+ BN_DEF(0x576230BD, 0x7B40D901),
+ BN_DEF(0xB1863AEC, 0xBE97F1B1),
+ BN_DEF(0x124D9F7C, 0xE649CEE7),
+ BN_DEF(0x8A3219FD, 0xD4F09B20),
+ BN_DEF(0xE7169B4A, 0xEC5CE2C1),
+ BN_DEF(0x139E9E78, 0x57EE2B10),
+ BN_DEF(0x515DA54D, 0xD6FC2A2C),
+ BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
};
static const BN_ULONG ffdhe6144_p[] = {
@@ -817,54 +1073,102 @@ static const BN_ULONG ffdhe6144_p[] = {
};
/* q = (p - 1) / 2 */
static const BN_ULONG ffdhe6144_q[] = {
- BN_DEF(0xFFFFFFFF, 0xFFFFFFFF), BN_DEF(0x68720732, 0x5207194E),
- BN_DEF(0xBC9C6D6A, 0xD20EAB86), BN_DEF(0x6A18B0E0, 0xB1534A93),
- BN_DEF(0x4D6D8F34, 0x1FEEA547), BN_DEF(0xEE35C06B, 0x2D9DB8FC),
- BN_DEF(0x63139582, 0xF64E8C08), BN_DEF(0xE5677A01, 0xC66796EA),
- BN_DEF(0xE4ADC88B, 0x724FA91A), BN_DEF(0xDC2A19C5, 0x282EE416),
- BN_DEF(0x8AB15423, 0x31149618), BN_DEF(0x3573BFAF, 0x6B9581BA),
- BN_DEF(0xA316A9C6, 0x7CE4848D), BN_DEF(0x23D33E5F, 0x05746DAC),
- BN_DEF(0x91308B41, 0x59D39CE0), BN_DEF(0x95140DFB, 0x77556011),
- BN_DEF(0x3BE57CC9, 0xCA63328F), BN_DEF(0xCA595DE0, 0x3B1F2725),
- BN_DEF(0x003BECDA, 0xAC3F1C6D), BN_DEF(0x0C1811E1, 0x3FD94FC6),
- BN_DEF(0xFCF1D137, 0x855F60FF), BN_DEF(0x1A8288F1, 0x50077849),
- BN_DEF(0x6DB1A06C, 0x5C2A9917), BN_DEF(0xD4D4B488, 0xD29238FB),
- BN_DEF(0xA67EDA3B, 0x9C40A3FD), BN_DEF(0x2723020F, 0xCD8FAE1F),
- BN_DEF(0xFE67F638, 0x66D6832B), BN_DEF(0xA6380E1D, 0x59C74619),
- BN_DEF(0x58E07EA6, 0x48BDEEB2), BN_DEF(0x4DBB1264, 0x1DDA2A19),
- BN_DEF(0x657A9F53, 0x11DD2221), BN_DEF(0x1C29951D, 0x2733BE96),
- BN_DEF(0x2281B63D, 0x05FEB25B), BN_DEF(0x2F06EC81, 0xE345003F),
- BN_DEF(0xFA20C170, 0xA6DAD428), BN_DEF(0x3FC45235, 0xC764DAAD),
- BN_DEF(0xE764BEE7, 0x054148E6), BN_DEF(0xFCC68566, 0x15276754),
- BN_DEF(0xB8A0001E, 0x0D0EDC9E), BN_DEF(0x99E5C5BD, 0x0494CCD1),
- BN_DEF(0xB8D6801C, 0x36E3BC7C), BN_DEF(0x48C09862, 0x5483B005),
- BN_DEF(0x96CF3419, 0x76B50F00), BN_DEF(0x77DA18C5, 0x389AE443),
- BN_DEF(0xBF18E63D, 0x43FAADD2), BN_DEF(0xAA81A002, 0x3BB1E78E),
- BN_DEF(0x6B4FB68C, 0x563EAFA1), BN_DEF(0x72C42BDB, 0xBC9874F2),
- BN_DEF(0x8B26FA7D, 0xB737A961), BN_DEF(0xB34F0F78, 0x12F20E95),
- BN_DEF(0x1FEACEBE, 0x9E0D9077), BN_DEF(0xFD29EEF7, 0x055E6835),
- BN_DEF(0x6AE22427, 0x0EDFCD21), BN_DEF(0xCD86F56D, 0xD5E290CB),
- BN_DEF(0x911B1D06, 0x743695E2), BN_DEF(0xCE4EFB4F, 0xAE574155),
- BN_DEF(0x38FAA5FF, 0xB279710F), BN_DEF(0x716BA6E9, 0x7A7EA229),
- BN_DEF(0xDE21BCA2, 0x5A098649), BN_DEF(0xC289C938, 0x577F0984),
- BN_DEF(0x60C36C8E, 0x2CC6587D), BN_DEF(0x48FBFBF7, 0xBD6C8E93),
- BN_DEF(0xEB736483, 0x30DA37E4), BN_DEF(0x7CCE011C, 0xDE1A7A6F),
- BN_DEF(0xB28C81AD, 0x6F1AAD9D), BN_DEF(0x308FE7EE, 0x4435A11C),
- BN_DEF(0x60D977FD, 0x6379A513), BN_DEF(0xBE8B41D9, 0xE2C778C1),
- BN_DEF(0x17611002, 0x9DDAFE5E), BN_DEF(0xA637D6B9, 0xE1FF1D8D),
- BN_DEF(0x777940C1, 0xC7278919), BN_DEF(0x74C2C1FF, 0xC8B97F4E),
- BN_DEF(0x941A17B0, 0x601A0266), BN_DEF(0xE6FBF176, 0x4F017E70),
- BN_DEF(0x770536B8, 0x8583D3E4), BN_DEF(0xB1B95D8C, 0x572B76F3),
- BN_DEF(0xEF1CA6FA, 0x0EA7A151), BN_DEF(0xB06BFA34, 0xDCB56D5B),
- BN_DEF(0xD96471FD, 0xE88454A5), BN_DEF(0x59927DB0, 0x5E0558C1),
- BN_DEF(0xA41D3CBD, 0x98566527), BN_DEF(0x9B56F39A, 0x0EF8AC50),
- BN_DEF(0x79F7F439, 0xF15344ED), BN_DEF(0x707345BB, 0xCC278638),
- BN_DEF(0x3FABE49A, 0xDAAB89AF), BN_DEF(0x9EF68D79, 0x42B1B2AA),
- BN_DEF(0xAF833768, 0x9219FA8F), BN_DEF(0xEAFEB2B0, 0x69EF8F6A),
- BN_DEF(0x576230BD, 0x7B40D901), BN_DEF(0xB1863AEC, 0xBE97F1B1),
- BN_DEF(0x124D9F7C, 0xE649CEE7), BN_DEF(0x8A3219FD, 0xD4F09B20),
- BN_DEF(0xE7169B4A, 0xEC5CE2C1), BN_DEF(0x139E9E78, 0x57EE2B10),
- BN_DEF(0x515DA54D, 0xD6FC2A2C), BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
+ BN_DEF(0xFFFFFFFF, 0xFFFFFFFF),
+ BN_DEF(0x68720732, 0x5207194E),
+ BN_DEF(0xBC9C6D6A, 0xD20EAB86),
+ BN_DEF(0x6A18B0E0, 0xB1534A93),
+ BN_DEF(0x4D6D8F34, 0x1FEEA547),
+ BN_DEF(0xEE35C06B, 0x2D9DB8FC),
+ BN_DEF(0x63139582, 0xF64E8C08),
+ BN_DEF(0xE5677A01, 0xC66796EA),
+ BN_DEF(0xE4ADC88B, 0x724FA91A),
+ BN_DEF(0xDC2A19C5, 0x282EE416),
+ BN_DEF(0x8AB15423, 0x31149618),
+ BN_DEF(0x3573BFAF, 0x6B9581BA),
+ BN_DEF(0xA316A9C6, 0x7CE4848D),
+ BN_DEF(0x23D33E5F, 0x05746DAC),
+ BN_DEF(0x91308B41, 0x59D39CE0),
+ BN_DEF(0x95140DFB, 0x77556011),
+ BN_DEF(0x3BE57CC9, 0xCA63328F),
+ BN_DEF(0xCA595DE0, 0x3B1F2725),
+ BN_DEF(0x003BECDA, 0xAC3F1C6D),
+ BN_DEF(0x0C1811E1, 0x3FD94FC6),
+ BN_DEF(0xFCF1D137, 0x855F60FF),
+ BN_DEF(0x1A8288F1, 0x50077849),
+ BN_DEF(0x6DB1A06C, 0x5C2A9917),
+ BN_DEF(0xD4D4B488, 0xD29238FB),
+ BN_DEF(0xA67EDA3B, 0x9C40A3FD),
+ BN_DEF(0x2723020F, 0xCD8FAE1F),
+ BN_DEF(0xFE67F638, 0x66D6832B),
+ BN_DEF(0xA6380E1D, 0x59C74619),
+ BN_DEF(0x58E07EA6, 0x48BDEEB2),
+ BN_DEF(0x4DBB1264, 0x1DDA2A19),
+ BN_DEF(0x657A9F53, 0x11DD2221),
+ BN_DEF(0x1C29951D, 0x2733BE96),
+ BN_DEF(0x2281B63D, 0x05FEB25B),
+ BN_DEF(0x2F06EC81, 0xE345003F),
+ BN_DEF(0xFA20C170, 0xA6DAD428),
+ BN_DEF(0x3FC45235, 0xC764DAAD),
+ BN_DEF(0xE764BEE7, 0x054148E6),
+ BN_DEF(0xFCC68566, 0x15276754),
+ BN_DEF(0xB8A0001E, 0x0D0EDC9E),
+ BN_DEF(0x99E5C5BD, 0x0494CCD1),
+ BN_DEF(0xB8D6801C, 0x36E3BC7C),
+ BN_DEF(0x48C09862, 0x5483B005),
+ BN_DEF(0x96CF3419, 0x76B50F00),
+ BN_DEF(0x77DA18C5, 0x389AE443),
+ BN_DEF(0xBF18E63D, 0x43FAADD2),
+ BN_DEF(0xAA81A002, 0x3BB1E78E),
+ BN_DEF(0x6B4FB68C, 0x563EAFA1),
+ BN_DEF(0x72C42BDB, 0xBC9874F2),
+ BN_DEF(0x8B26FA7D, 0xB737A961),
+ BN_DEF(0xB34F0F78, 0x12F20E95),
+ BN_DEF(0x1FEACEBE, 0x9E0D9077),
+ BN_DEF(0xFD29EEF7, 0x055E6835),
+ BN_DEF(0x6AE22427, 0x0EDFCD21),
+ BN_DEF(0xCD86F56D, 0xD5E290CB),
+ BN_DEF(0x911B1D06, 0x743695E2),
+ BN_DEF(0xCE4EFB4F, 0xAE574155),
+ BN_DEF(0x38FAA5FF, 0xB279710F),
+ BN_DEF(0x716BA6E9, 0x7A7EA229),
+ BN_DEF(0xDE21BCA2, 0x5A098649),
+ BN_DEF(0xC289C938, 0x577F0984),
+ BN_DEF(0x60C36C8E, 0x2CC6587D),
+ BN_DEF(0x48FBFBF7, 0xBD6C8E93),
+ BN_DEF(0xEB736483, 0x30DA37E4),
+ BN_DEF(0x7CCE011C, 0xDE1A7A6F),
+ BN_DEF(0xB28C81AD, 0x6F1AAD9D),
+ BN_DEF(0x308FE7EE, 0x4435A11C),
+ BN_DEF(0x60D977FD, 0x6379A513),
+ BN_DEF(0xBE8B41D9, 0xE2C778C1),
+ BN_DEF(0x17611002, 0x9DDAFE5E),
+ BN_DEF(0xA637D6B9, 0xE1FF1D8D),
+ BN_DEF(0x777940C1, 0xC7278919),
+ BN_DEF(0x74C2C1FF, 0xC8B97F4E),
+ BN_DEF(0x941A17B0, 0x601A0266),
+ BN_DEF(0xE6FBF176, 0x4F017E70),
+ BN_DEF(0x770536B8, 0x8583D3E4),
+ BN_DEF(0xB1B95D8C, 0x572B76F3),
+ BN_DEF(0xEF1CA6FA, 0x0EA7A151),
+ BN_DEF(0xB06BFA34, 0xDCB56D5B),
+ BN_DEF(0xD96471FD, 0xE88454A5),
+ BN_DEF(0x59927DB0, 0x5E0558C1),
+ BN_DEF(0xA41D3CBD, 0x98566527),
+ BN_DEF(0x9B56F39A, 0x0EF8AC50),
+ BN_DEF(0x79F7F439, 0xF15344ED),
+ BN_DEF(0x707345BB, 0xCC278638),
+ BN_DEF(0x3FABE49A, 0xDAAB89AF),
+ BN_DEF(0x9EF68D79, 0x42B1B2AA),
+ BN_DEF(0xAF833768, 0x9219FA8F),
+ BN_DEF(0xEAFEB2B0, 0x69EF8F6A),
+ BN_DEF(0x576230BD, 0x7B40D901),
+ BN_DEF(0xB1863AEC, 0xBE97F1B1),
+ BN_DEF(0x124D9F7C, 0xE649CEE7),
+ BN_DEF(0x8A3219FD, 0xD4F09B20),
+ BN_DEF(0xE7169B4A, 0xEC5CE2C1),
+ BN_DEF(0x139E9E78, 0x57EE2B10),
+ BN_DEF(0x515DA54D, 0xD6FC2A2C),
+ BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
};
static const BN_ULONG ffdhe8192_p[] = {
@@ -935,81 +1239,146 @@ static const BN_ULONG ffdhe8192_p[] = {
};
/* q = (p - 1) / 2 */
static const BN_ULONG ffdhe8192_q[] = {
- BN_DEF(0xFFFFFFFF, 0x7FFFFFFF), BN_DEF(0xE2E32126, 0x6B4645DB),
- BN_DEF(0x41C7FC46, 0x008F154A), BN_DEF(0x54FA30A7, 0x84117283),
- BN_DEF(0xFBD4221E, 0xCBE88EA4), BN_DEF(0x9833BF86, 0x535DFEF2),
- BN_DEF(0x60FF437F, 0x17BA0F7C), BN_DEF(0x2EB8D43F, 0x7D7D5F0E),
- BN_DEF(0xFDF2C518, 0x6F697DD5), BN_DEF(0x39585337, 0x5B42AEFF),
- BN_DEF(0x5D4527F4, 0x8F7E4670), BN_DEF(0x1F97D22B, 0xC1FC0EA5),
- BN_DEF(0xD2BBF118, 0x50FF183A), BN_DEF(0x446CE050, 0xEADC00CA),
- BN_DEF(0xD6CD4AFC, 0xB1240B66), BN_DEF(0x286090BD, 0x4CF4F18B),
- BN_DEF(0x07211E7E, 0x28D5348F), BN_DEF(0x1C137296, 0x0E10BF36),
- BN_DEF(0x84B81FF7, 0x28D45498), BN_DEF(0xB523073A, 0x5DB84CC3),
- BN_DEF(0x4E435811, 0xAA0FE346), BN_DEF(0x237EC128, 0x2C8B0660),
- BN_DEF(0x1AE1AFAE, 0x1423605D), BN_DEF(0xC5BAC141, 0x2A282563),
- BN_DEF(0xE95782F2, 0x149C441C), BN_DEF(0x600DEB81, 0xE596078E),
- BN_DEF(0x3E499332, 0xAAAD97BA), BN_DEF(0x51D5C414, 0xC35B18A1),
- BN_DEF(0xFB258877, 0x05C661DE), BN_DEF(0xF6E8E62F, 0xB43FF5B4),
- BN_DEF(0x64A84EA1, 0x7ED91FE7), BN_DEF(0xECA8D732, 0x0F212D18),
- BN_DEF(0x7B00641C, 0x1B568026), BN_DEF(0x67FA3555, 0x5207194E),
- BN_DEF(0xBC9C6D6A, 0xD20EAB86), BN_DEF(0x6A18B0E0, 0xB1534A93),
- BN_DEF(0x4D6D8F34, 0x1FEEA547), BN_DEF(0xEE35C06B, 0x2D9DB8FC),
- BN_DEF(0x63139582, 0xF64E8C08), BN_DEF(0xE5677A01, 0xC66796EA),
- BN_DEF(0xE4ADC88B, 0x724FA91A), BN_DEF(0xDC2A19C5, 0x282EE416),
- BN_DEF(0x8AB15423, 0x31149618), BN_DEF(0x3573BFAF, 0x6B9581BA),
- BN_DEF(0xA316A9C6, 0x7CE4848D), BN_DEF(0x23D33E5F, 0x05746DAC),
- BN_DEF(0x91308B41, 0x59D39CE0), BN_DEF(0x95140DFB, 0x77556011),
- BN_DEF(0x3BE57CC9, 0xCA63328F), BN_DEF(0xCA595DE0, 0x3B1F2725),
- BN_DEF(0x003BECDA, 0xAC3F1C6D), BN_DEF(0x0C1811E1, 0x3FD94FC6),
- BN_DEF(0xFCF1D137, 0x855F60FF), BN_DEF(0x1A8288F1, 0x50077849),
- BN_DEF(0x6DB1A06C, 0x5C2A9917), BN_DEF(0xD4D4B488, 0xD29238FB),
- BN_DEF(0xA67EDA3B, 0x9C40A3FD), BN_DEF(0x2723020F, 0xCD8FAE1F),
- BN_DEF(0xFE67F638, 0x66D6832B), BN_DEF(0xA6380E1D, 0x59C74619),
- BN_DEF(0x58E07EA6, 0x48BDEEB2), BN_DEF(0x4DBB1264, 0x1DDA2A19),
- BN_DEF(0x657A9F53, 0x11DD2221), BN_DEF(0x1C29951D, 0x2733BE96),
- BN_DEF(0x2281B63D, 0x05FEB25B), BN_DEF(0x2F06EC81, 0xE345003F),
- BN_DEF(0xFA20C170, 0xA6DAD428), BN_DEF(0x3FC45235, 0xC764DAAD),
- BN_DEF(0xE764BEE7, 0x054148E6), BN_DEF(0xFCC68566, 0x15276754),
- BN_DEF(0xB8A0001E, 0x0D0EDC9E), BN_DEF(0x99E5C5BD, 0x0494CCD1),
- BN_DEF(0xB8D6801C, 0x36E3BC7C), BN_DEF(0x48C09862, 0x5483B005),
- BN_DEF(0x96CF3419, 0x76B50F00), BN_DEF(0x77DA18C5, 0x389AE443),
- BN_DEF(0xBF18E63D, 0x43FAADD2), BN_DEF(0xAA81A002, 0x3BB1E78E),
- BN_DEF(0x6B4FB68C, 0x563EAFA1), BN_DEF(0x72C42BDB, 0xBC9874F2),
- BN_DEF(0x8B26FA7D, 0xB737A961), BN_DEF(0xB34F0F78, 0x12F20E95),
- BN_DEF(0x1FEACEBE, 0x9E0D9077), BN_DEF(0xFD29EEF7, 0x055E6835),
- BN_DEF(0x6AE22427, 0x0EDFCD21), BN_DEF(0xCD86F56D, 0xD5E290CB),
- BN_DEF(0x911B1D06, 0x743695E2), BN_DEF(0xCE4EFB4F, 0xAE574155),
- BN_DEF(0x38FAA5FF, 0xB279710F), BN_DEF(0x716BA6E9, 0x7A7EA229),
- BN_DEF(0xDE21BCA2, 0x5A098649), BN_DEF(0xC289C938, 0x577F0984),
- BN_DEF(0x60C36C8E, 0x2CC6587D), BN_DEF(0x48FBFBF7, 0xBD6C8E93),
- BN_DEF(0xEB736483, 0x30DA37E4), BN_DEF(0x7CCE011C, 0xDE1A7A6F),
- BN_DEF(0xB28C81AD, 0x6F1AAD9D), BN_DEF(0x308FE7EE, 0x4435A11C),
- BN_DEF(0x60D977FD, 0x6379A513), BN_DEF(0xBE8B41D9, 0xE2C778C1),
- BN_DEF(0x17611002, 0x9DDAFE5E), BN_DEF(0xA637D6B9, 0xE1FF1D8D),
- BN_DEF(0x777940C1, 0xC7278919), BN_DEF(0x74C2C1FF, 0xC8B97F4E),
- BN_DEF(0x941A17B0, 0x601A0266), BN_DEF(0xE6FBF176, 0x4F017E70),
- BN_DEF(0x770536B8, 0x8583D3E4), BN_DEF(0xB1B95D8C, 0x572B76F3),
- BN_DEF(0xEF1CA6FA, 0x0EA7A151), BN_DEF(0xB06BFA34, 0xDCB56D5B),
- BN_DEF(0xD96471FD, 0xE88454A5), BN_DEF(0x59927DB0, 0x5E0558C1),
- BN_DEF(0xA41D3CBD, 0x98566527), BN_DEF(0x9B56F39A, 0x0EF8AC50),
- BN_DEF(0x79F7F439, 0xF15344ED), BN_DEF(0x707345BB, 0xCC278638),
- BN_DEF(0x3FABE49A, 0xDAAB89AF), BN_DEF(0x9EF68D79, 0x42B1B2AA),
- BN_DEF(0xAF833768, 0x9219FA8F), BN_DEF(0xEAFEB2B0, 0x69EF8F6A),
- BN_DEF(0x576230BD, 0x7B40D901), BN_DEF(0xB1863AEC, 0xBE97F1B1),
- BN_DEF(0x124D9F7C, 0xE649CEE7), BN_DEF(0x8A3219FD, 0xD4F09B20),
- BN_DEF(0xE7169B4A, 0xEC5CE2C1), BN_DEF(0x139E9E78, 0x57EE2B10),
- BN_DEF(0x515DA54D, 0xD6FC2A2C), BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
+ BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
+ BN_DEF(0xE2E32126, 0x6B4645DB),
+ BN_DEF(0x41C7FC46, 0x008F154A),
+ BN_DEF(0x54FA30A7, 0x84117283),
+ BN_DEF(0xFBD4221E, 0xCBE88EA4),
+ BN_DEF(0x9833BF86, 0x535DFEF2),
+ BN_DEF(0x60FF437F, 0x17BA0F7C),
+ BN_DEF(0x2EB8D43F, 0x7D7D5F0E),
+ BN_DEF(0xFDF2C518, 0x6F697DD5),
+ BN_DEF(0x39585337, 0x5B42AEFF),
+ BN_DEF(0x5D4527F4, 0x8F7E4670),
+ BN_DEF(0x1F97D22B, 0xC1FC0EA5),
+ BN_DEF(0xD2BBF118, 0x50FF183A),
+ BN_DEF(0x446CE050, 0xEADC00CA),
+ BN_DEF(0xD6CD4AFC, 0xB1240B66),
+ BN_DEF(0x286090BD, 0x4CF4F18B),
+ BN_DEF(0x07211E7E, 0x28D5348F),
+ BN_DEF(0x1C137296, 0x0E10BF36),
+ BN_DEF(0x84B81FF7, 0x28D45498),
+ BN_DEF(0xB523073A, 0x5DB84CC3),
+ BN_DEF(0x4E435811, 0xAA0FE346),
+ BN_DEF(0x237EC128, 0x2C8B0660),
+ BN_DEF(0x1AE1AFAE, 0x1423605D),
+ BN_DEF(0xC5BAC141, 0x2A282563),
+ BN_DEF(0xE95782F2, 0x149C441C),
+ BN_DEF(0x600DEB81, 0xE596078E),
+ BN_DEF(0x3E499332, 0xAAAD97BA),
+ BN_DEF(0x51D5C414, 0xC35B18A1),
+ BN_DEF(0xFB258877, 0x05C661DE),
+ BN_DEF(0xF6E8E62F, 0xB43FF5B4),
+ BN_DEF(0x64A84EA1, 0x7ED91FE7),
+ BN_DEF(0xECA8D732, 0x0F212D18),
+ BN_DEF(0x7B00641C, 0x1B568026),
+ BN_DEF(0x67FA3555, 0x5207194E),
+ BN_DEF(0xBC9C6D6A, 0xD20EAB86),
+ BN_DEF(0x6A18B0E0, 0xB1534A93),
+ BN_DEF(0x4D6D8F34, 0x1FEEA547),
+ BN_DEF(0xEE35C06B, 0x2D9DB8FC),
+ BN_DEF(0x63139582, 0xF64E8C08),
+ BN_DEF(0xE5677A01, 0xC66796EA),
+ BN_DEF(0xE4ADC88B, 0x724FA91A),
+ BN_DEF(0xDC2A19C5, 0x282EE416),
+ BN_DEF(0x8AB15423, 0x31149618),
+ BN_DEF(0x3573BFAF, 0x6B9581BA),
+ BN_DEF(0xA316A9C6, 0x7CE4848D),
+ BN_DEF(0x23D33E5F, 0x05746DAC),
+ BN_DEF(0x91308B41, 0x59D39CE0),
+ BN_DEF(0x95140DFB, 0x77556011),
+ BN_DEF(0x3BE57CC9, 0xCA63328F),
+ BN_DEF(0xCA595DE0, 0x3B1F2725),
+ BN_DEF(0x003BECDA, 0xAC3F1C6D),
+ BN_DEF(0x0C1811E1, 0x3FD94FC6),
+ BN_DEF(0xFCF1D137, 0x855F60FF),
+ BN_DEF(0x1A8288F1, 0x50077849),
+ BN_DEF(0x6DB1A06C, 0x5C2A9917),
+ BN_DEF(0xD4D4B488, 0xD29238FB),
+ BN_DEF(0xA67EDA3B, 0x9C40A3FD),
+ BN_DEF(0x2723020F, 0xCD8FAE1F),
+ BN_DEF(0xFE67F638, 0x66D6832B),
+ BN_DEF(0xA6380E1D, 0x59C74619),
+ BN_DEF(0x58E07EA6, 0x48BDEEB2),
+ BN_DEF(0x4DBB1264, 0x1DDA2A19),
+ BN_DEF(0x657A9F53, 0x11DD2221),
+ BN_DEF(0x1C29951D, 0x2733BE96),
+ BN_DEF(0x2281B63D, 0x05FEB25B),
+ BN_DEF(0x2F06EC81, 0xE345003F),
+ BN_DEF(0xFA20C170, 0xA6DAD428),
+ BN_DEF(0x3FC45235, 0xC764DAAD),
+ BN_DEF(0xE764BEE7, 0x054148E6),
+ BN_DEF(0xFCC68566, 0x15276754),
+ BN_DEF(0xB8A0001E, 0x0D0EDC9E),
+ BN_DEF(0x99E5C5BD, 0x0494CCD1),
+ BN_DEF(0xB8D6801C, 0x36E3BC7C),
+ BN_DEF(0x48C09862, 0x5483B005),
+ BN_DEF(0x96CF3419, 0x76B50F00),
+ BN_DEF(0x77DA18C5, 0x389AE443),
+ BN_DEF(0xBF18E63D, 0x43FAADD2),
+ BN_DEF(0xAA81A002, 0x3BB1E78E),
+ BN_DEF(0x6B4FB68C, 0x563EAFA1),
+ BN_DEF(0x72C42BDB, 0xBC9874F2),
+ BN_DEF(0x8B26FA7D, 0xB737A961),
+ BN_DEF(0xB34F0F78, 0x12F20E95),
+ BN_DEF(0x1FEACEBE, 0x9E0D9077),
+ BN_DEF(0xFD29EEF7, 0x055E6835),
+ BN_DEF(0x6AE22427, 0x0EDFCD21),
+ BN_DEF(0xCD86F56D, 0xD5E290CB),
+ BN_DEF(0x911B1D06, 0x743695E2),
+ BN_DEF(0xCE4EFB4F, 0xAE574155),
+ BN_DEF(0x38FAA5FF, 0xB279710F),
+ BN_DEF(0x716BA6E9, 0x7A7EA229),
+ BN_DEF(0xDE21BCA2, 0x5A098649),
+ BN_DEF(0xC289C938, 0x577F0984),
+ BN_DEF(0x60C36C8E, 0x2CC6587D),
+ BN_DEF(0x48FBFBF7, 0xBD6C8E93),
+ BN_DEF(0xEB736483, 0x30DA37E4),
+ BN_DEF(0x7CCE011C, 0xDE1A7A6F),
+ BN_DEF(0xB28C81AD, 0x6F1AAD9D),
+ BN_DEF(0x308FE7EE, 0x4435A11C),
+ BN_DEF(0x60D977FD, 0x6379A513),
+ BN_DEF(0xBE8B41D9, 0xE2C778C1),
+ BN_DEF(0x17611002, 0x9DDAFE5E),
+ BN_DEF(0xA637D6B9, 0xE1FF1D8D),
+ BN_DEF(0x777940C1, 0xC7278919),
+ BN_DEF(0x74C2C1FF, 0xC8B97F4E),
+ BN_DEF(0x941A17B0, 0x601A0266),
+ BN_DEF(0xE6FBF176, 0x4F017E70),
+ BN_DEF(0x770536B8, 0x8583D3E4),
+ BN_DEF(0xB1B95D8C, 0x572B76F3),
+ BN_DEF(0xEF1CA6FA, 0x0EA7A151),
+ BN_DEF(0xB06BFA34, 0xDCB56D5B),
+ BN_DEF(0xD96471FD, 0xE88454A5),
+ BN_DEF(0x59927DB0, 0x5E0558C1),
+ BN_DEF(0xA41D3CBD, 0x98566527),
+ BN_DEF(0x9B56F39A, 0x0EF8AC50),
+ BN_DEF(0x79F7F439, 0xF15344ED),
+ BN_DEF(0x707345BB, 0xCC278638),
+ BN_DEF(0x3FABE49A, 0xDAAB89AF),
+ BN_DEF(0x9EF68D79, 0x42B1B2AA),
+ BN_DEF(0xAF833768, 0x9219FA8F),
+ BN_DEF(0xEAFEB2B0, 0x69EF8F6A),
+ BN_DEF(0x576230BD, 0x7B40D901),
+ BN_DEF(0xB1863AEC, 0xBE97F1B1),
+ BN_DEF(0x124D9F7C, 0xE649CEE7),
+ BN_DEF(0x8A3219FD, 0xD4F09B20),
+ BN_DEF(0xE7169B4A, 0xEC5CE2C1),
+ BN_DEF(0x139E9E78, 0x57EE2B10),
+ BN_DEF(0x515DA54D, 0xD6FC2A2C),
+ BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
};
/* Macro to make a BIGNUM from static data */
-# define make_dh_bn(x) \
+#define make_dh_bn(x) \
extern const BIGNUM ossl_bignum_##x; \
const BIGNUM ossl_bignum_##x = { \
- (BN_ULONG *) x, \
+ (BN_ULONG *)x, \
OSSL_NELEM(x), \
OSSL_NELEM(x), \
- 0, BN_FLG_STATIC_DATA };
+ 0, BN_FLG_STATIC_DATA \
+ };
static const BN_ULONG value_2 = 2;
@@ -1018,37 +1387,37 @@ const BIGNUM ossl_bignum_const_2 = {
};
make_dh_bn(dh1024_160_p)
-make_dh_bn(dh1024_160_q)
-make_dh_bn(dh1024_160_g)
-make_dh_bn(dh2048_224_p)
-make_dh_bn(dh2048_224_q)
-make_dh_bn(dh2048_224_g)
-make_dh_bn(dh2048_256_p)
-make_dh_bn(dh2048_256_q)
-make_dh_bn(dh2048_256_g)
+ make_dh_bn(dh1024_160_q)
+ make_dh_bn(dh1024_160_g)
+ make_dh_bn(dh2048_224_p)
+ make_dh_bn(dh2048_224_q)
+ make_dh_bn(dh2048_224_g)
+ make_dh_bn(dh2048_256_p)
+ make_dh_bn(dh2048_256_q)
+ make_dh_bn(dh2048_256_g)
-make_dh_bn(ffdhe2048_p)
-make_dh_bn(ffdhe2048_q)
-make_dh_bn(ffdhe3072_p)
-make_dh_bn(ffdhe3072_q)
-make_dh_bn(ffdhe4096_p)
-make_dh_bn(ffdhe4096_q)
-make_dh_bn(ffdhe6144_p)
-make_dh_bn(ffdhe6144_q)
-make_dh_bn(ffdhe8192_p)
-make_dh_bn(ffdhe8192_q)
+ make_dh_bn(ffdhe2048_p)
+ make_dh_bn(ffdhe2048_q)
+ make_dh_bn(ffdhe3072_p)
+ make_dh_bn(ffdhe3072_q)
+ make_dh_bn(ffdhe4096_p)
+ make_dh_bn(ffdhe4096_q)
+ make_dh_bn(ffdhe6144_p)
+ make_dh_bn(ffdhe6144_q)
+ make_dh_bn(ffdhe8192_p)
+ make_dh_bn(ffdhe8192_q)
-# ifndef FIPS_MODULE
-make_dh_bn(modp_1536_p)
-make_dh_bn(modp_1536_q)
-# endif
-make_dh_bn(modp_2048_p)
-make_dh_bn(modp_2048_q)
-make_dh_bn(modp_3072_p)
-make_dh_bn(modp_3072_q)
-make_dh_bn(modp_4096_p)
-make_dh_bn(modp_4096_q)
-make_dh_bn(modp_6144_p)
-make_dh_bn(modp_6144_q)
-make_dh_bn(modp_8192_p)
-make_dh_bn(modp_8192_q)
+#ifndef FIPS_MODULE
+ make_dh_bn(modp_1536_p)
+ make_dh_bn(modp_1536_q)
+#endif
+ make_dh_bn(modp_2048_p)
+ make_dh_bn(modp_2048_q)
+ make_dh_bn(modp_3072_p)
+ make_dh_bn(modp_3072_q)
+ make_dh_bn(modp_4096_p)
+ make_dh_bn(modp_4096_q)
+ make_dh_bn(modp_6144_p)
+ make_dh_bn(modp_6144_q)
+ make_dh_bn(modp_8192_p)
+ make_dh_bn(modp_8192_q)
diff --git a/crypto/bn/bn_div.c b/crypto/bn/bn_div.c
index ff66baa48f..fc61d70a9d 100644
--- a/crypto/bn/bn_div.c
+++ b/crypto/bn/bn_div.c
@@ -87,22 +87,22 @@ int BN_div(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m, const BIGNUM *d,
#else
-# if defined(BN_DIV3W)
+#if defined(BN_DIV3W)
BN_ULONG bn_div_3_words(const BN_ULONG *m, BN_ULONG d1, BN_ULONG d0);
-# elif 0
+#elif 0
/*
* This is #if-ed away, because it's a reference for assembly implementations,
* where it can and should be made constant-time. But if you want to test it,
* just replace 0 with 1.
*/
-# if BN_BITS2 == 64 && defined(__SIZEOF_INT128__) && __SIZEOF_INT128__==16
-# undef BN_ULLONG
-# define BN_ULLONG uint128_t
-# define BN_LLONG
-# endif
-
-# ifdef BN_LLONG
-# define BN_DIV3W
+#if BN_BITS2 == 64 && defined(__SIZEOF_INT128__) && __SIZEOF_INT128__ == 16
+#undef BN_ULLONG
+#define BN_ULLONG uint128_t
+#define BN_LLONG
+#endif
+
+#ifdef BN_LLONG
+#define BN_DIV3W
/*
* Interface is somewhat quirky, |m| is pointer to most significant limb,
* and less significant limb is referred at |m[-1]|. This means that caller
@@ -128,15 +128,15 @@ static BN_ULONG bn_div_3_words(const BN_ULONG *m, BN_ULONG d1, BN_ULONG d0)
D >>= 1;
}
- mask = 0 - (Q >> (BN_BITS2 - 1)); /* does it overflow? */
+ mask = 0 - (Q >> (BN_BITS2 - 1)); /* does it overflow? */
Q <<= 1;
Q |= (R >= D);
return (Q | mask) & BN_MASK2;
}
-# endif
-# endif
+#endif
+#endif
static int bn_left_align(BIGNUM *num)
{
@@ -145,8 +145,8 @@ static int bn_left_align(BIGNUM *num)
int rshift = BN_num_bits_word(d[top - 1]), lshift, i;
lshift = BN_BITS2 - rshift;
- rshift %= BN_BITS2; /* say no to undefined behaviour */
- rmask = (BN_ULONG)0 - rshift; /* rmask = 0 - (rshift != 0) */
+ rshift %= BN_BITS2; /* say no to undefined behaviour */
+ rmask = (BN_ULONG)0 - rshift; /* rmask = 0 - (rshift != 0) */
rmask |= rmask >> 8;
for (i = 0, m = 0; i < top; i++) {
@@ -158,45 +158,47 @@ static int bn_left_align(BIGNUM *num)
return lshift;
}
-# if !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) \
+#if !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) \
&& !defined(PEDANTIC) && !defined(BN_DIV3W)
-# if defined(__GNUC__) && __GNUC__>=2
-# if defined(__i386) || defined (__i386__)
- /*-
- * There were two reasons for implementing this template:
- * - GNU C generates a call to a function (__udivdi3 to be exact)
- * in reply to ((((BN_ULLONG)n0)<<BN_BITS2)|n1)/d0 (I fail to
- * understand why...);
- * - divl doesn't only calculate quotient, but also leaves
- * remainder in %edx which we can definitely use here:-)
- */
-# undef bn_div_words
-# define bn_div_words(n0,n1,d0) \
- ({ asm volatile ( \
- "divl %4" \
- : "=a"(q), "=d"(rem) \
- : "a"(n1), "d"(n0), "r"(d0) \
- : "cc"); \
- q; \
- })
-# define REMAINDER_IS_ALREADY_CALCULATED
-# elif defined(__x86_64) && defined(SIXTY_FOUR_BIT_LONG)
- /*
- * Same story here, but it's 128-bit by 64-bit division. Wow!
- */
-# undef bn_div_words
-# define bn_div_words(n0,n1,d0) \
- ({ asm volatile ( \
- "divq %4" \
- : "=a"(q), "=d"(rem) \
- : "a"(n1), "d"(n0), "r"(d0) \
- : "cc"); \
- q; \
- })
-# define REMAINDER_IS_ALREADY_CALCULATED
-# endif /* __<cpu> */
-# endif /* __GNUC__ */
-# endif /* OPENSSL_NO_ASM */
+#if defined(__GNUC__) && __GNUC__ >= 2
+#if defined(__i386) || defined(__i386__)
+/*-
+ * There were two reasons for implementing this template:
+ * - GNU C generates a call to a function (__udivdi3 to be exact)
+ * in reply to ((((BN_ULLONG)n0)<<BN_BITS2)|n1)/d0 (I fail to
+ * understand why...);
+ * - divl doesn't only calculate quotient, but also leaves
+ * remainder in %edx which we can definitely use here:-)
+ */
+#undef bn_div_words
+#define bn_div_words(n0, n1, d0) \
+ ({ \
+ asm volatile( \
+ "divl %4" \
+ : "=a"(q), "=d"(rem) \
+ : "a"(n1), "d"(n0), "r"(d0) \
+ : "cc"); \
+ q; \
+ })
+#define REMAINDER_IS_ALREADY_CALCULATED
+#elif defined(__x86_64) && defined(SIXTY_FOUR_BIT_LONG)
+/*
+ * Same story here, but it's 128-bit by 64-bit division. Wow!
+ */
+#undef bn_div_words
+#define bn_div_words(n0, n1, d0) \
+ ({ \
+ asm volatile( \
+ "divq %4" \
+ : "=a"(q), "=d"(rem) \
+ : "a"(n1), "d"(n0), "r"(d0) \
+ : "cc"); \
+ q; \
+ })
+#define REMAINDER_IS_ALREADY_CALCULATED
+#endif /* __<cpu> */
+#endif /* __GNUC__ */
+#endif /* OPENSSL_NO_ASM */
/*-
* BN_div computes dv := num / divisor, rounding towards
@@ -207,7 +209,7 @@ static int bn_left_align(BIGNUM *num)
* If 'dv' or 'rm' is NULL, the respective value is not returned.
*/
int BN_div(BIGNUM *dv, BIGNUM *rm, const BIGNUM *num, const BIGNUM *divisor,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
int ret;
@@ -262,7 +264,7 @@ int BN_div(BIGNUM *dv, BIGNUM *rm, const BIGNUM *num, const BIGNUM *divisor,
* divisor's length is considered public;
*/
int bn_div_fixed_top(BIGNUM *dv, BIGNUM *rm, const BIGNUM *num,
- const BIGNUM *divisor, BN_CTX *ctx)
+ const BIGNUM *divisor, BN_CTX *ctx)
{
int norm_shift, i, j, loop;
BIGNUM *tmp, *snum, *sdiv, *res;
@@ -342,58 +344,58 @@ int bn_div_fixed_top(BIGNUM *dv, BIGNUM *rm, const BIGNUM *num,
* the first part of the loop uses the top two words of snum and sdiv
* to calculate a BN_ULONG q such that | wnum - sdiv * q | < sdiv
*/
-# if defined(BN_DIV3W)
+#if defined(BN_DIV3W)
q = bn_div_3_words(wnumtop, d1, d0);
-# else
+#else
BN_ULONG n0, n1, rem = 0;
n0 = wnumtop[0];
n1 = wnumtop[-1];
if (n0 == d0)
q = BN_MASK2;
- else { /* n0 < d0 */
+ else { /* n0 < d0 */
BN_ULONG n2 = (wnumtop == wnum) ? 0 : wnumtop[-2];
-# ifdef BN_LLONG
+#ifdef BN_LLONG
BN_ULLONG t2;
-# if defined(BN_LLONG) && defined(BN_DIV2W) && !defined(bn_div_words)
- q = (BN_ULONG)(((((BN_ULLONG) n0) << BN_BITS2) | n1) / d0);
-# else
+#if defined(BN_LLONG) && defined(BN_DIV2W) && !defined(bn_div_words)
+ q = (BN_ULONG)(((((BN_ULLONG)n0) << BN_BITS2) | n1) / d0);
+#else
q = bn_div_words(n0, n1, d0);
-# endif
+#endif
-# ifndef REMAINDER_IS_ALREADY_CALCULATED
+#ifndef REMAINDER_IS_ALREADY_CALCULATED
/*
* rem doesn't have to be BN_ULLONG. The least we
* know it's less that d0, isn't it?
*/
rem = (n1 - q * d0) & BN_MASK2;
-# endif
- t2 = (BN_ULLONG) d1 *q;
+#endif
+ t2 = (BN_ULLONG)d1 * q;
for (;;) {
- if (t2 <= ((((BN_ULLONG) rem) << BN_BITS2) | n2))
+ if (t2 <= ((((BN_ULLONG)rem) << BN_BITS2) | n2))
break;
q--;
rem += d0;
if (rem < d0)
- break; /* don't let rem overflow */
+ break; /* don't let rem overflow */
t2 -= d1;
}
-# else /* !BN_LLONG */
+#else /* !BN_LLONG */
BN_ULONG t2l, t2h;
q = bn_div_words(n0, n1, d0);
-# ifndef REMAINDER_IS_ALREADY_CALCULATED
+#ifndef REMAINDER_IS_ALREADY_CALCULATED
rem = (n1 - q * d0) & BN_MASK2;
-# endif
+#endif
-# if defined(BN_UMULT_LOHI)
+#if defined(BN_UMULT_LOHI)
BN_UMULT_LOHI(t2l, t2h, d1, q);
-# elif defined(BN_UMULT_HIGH)
+#elif defined(BN_UMULT_HIGH)
t2l = d1 * q;
t2h = BN_UMULT_HIGH(d1, q);
-# else
+#else
{
BN_ULONG ql, qh;
t2l = LBITS(d1);
@@ -402,7 +404,7 @@ int bn_div_fixed_top(BIGNUM *dv, BIGNUM *rm, const BIGNUM *num,
qh = HBITS(q);
mul64(t2l, t2h, ql, qh); /* t2=(BN_ULLONG)d1*q; */
}
-# endif
+#endif
for (;;) {
if ((t2h < rem) || ((t2h == rem) && (t2l <= n2)))
@@ -410,14 +412,14 @@ int bn_div_fixed_top(BIGNUM *dv, BIGNUM *rm, const BIGNUM *num,
q--;
rem += d0;
if (rem < d0)
- break; /* don't let rem overflow */
+ break; /* don't let rem overflow */
if (t2l < d1)
t2h--;
t2l -= d1;
}
-# endif /* !BN_LLONG */
+#endif /* !BN_LLONG */
}
-# endif /* !BN_DIV3W */
+#endif /* !BN_DIV3W */
l0 = bn_mul_words(tmp->d, sdiv->d, div_n, q);
tmp->d[div_n] = l0;
@@ -452,7 +454,7 @@ int bn_div_fixed_top(BIGNUM *dv, BIGNUM *rm, const BIGNUM *num,
BN_CTX_end(ctx);
return 1;
- err:
+err:
bn_check_top(rm);
BN_CTX_end(ctx);
return 0;
diff --git a/crypto/bn/bn_err.c b/crypto/bn/bn_err.c
index 953be9ed47..84aaf75b52 100644
--- a/crypto/bn/bn_err.c
+++ b/crypto/bn/bn_err.c
@@ -15,33 +15,33 @@
#ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA BN_str_reasons[] = {
- {ERR_PACK(ERR_LIB_BN, 0, BN_R_ARG2_LT_ARG3), "arg2 lt arg3"},
- {ERR_PACK(ERR_LIB_BN, 0, BN_R_BAD_RECIPROCAL), "bad reciprocal"},
- {ERR_PACK(ERR_LIB_BN, 0, BN_R_BIGNUM_TOO_LONG), "bignum too long"},
- {ERR_PACK(ERR_LIB_BN, 0, BN_R_BITS_TOO_SMALL), "bits too small"},
- {ERR_PACK(ERR_LIB_BN, 0, BN_R_CALLED_WITH_EVEN_MODULUS),
- "called with even modulus"},
- {ERR_PACK(ERR_LIB_BN, 0, BN_R_DIV_BY_ZERO), "div by zero"},
- {ERR_PACK(ERR_LIB_BN, 0, BN_R_ENCODING_ERROR), "encoding error"},
- {ERR_PACK(ERR_LIB_BN, 0, BN_R_EXPAND_ON_STATIC_BIGNUM_DATA),
- "expand on static bignum data"},
- {ERR_PACK(ERR_LIB_BN, 0, BN_R_INPUT_NOT_REDUCED), "input not reduced"},
- {ERR_PACK(ERR_LIB_BN, 0, BN_R_INVALID_LENGTH), "invalid length"},
- {ERR_PACK(ERR_LIB_BN, 0, BN_R_INVALID_RANGE), "invalid range"},
- {ERR_PACK(ERR_LIB_BN, 0, BN_R_INVALID_SHIFT), "invalid shift"},
- {ERR_PACK(ERR_LIB_BN, 0, BN_R_NOT_A_SQUARE), "not a square"},
- {ERR_PACK(ERR_LIB_BN, 0, BN_R_NOT_INITIALIZED), "not initialized"},
- {ERR_PACK(ERR_LIB_BN, 0, BN_R_NO_INVERSE), "no inverse"},
- {ERR_PACK(ERR_LIB_BN, 0, BN_R_NO_PRIME_CANDIDATE), "no prime candidate"},
- {ERR_PACK(ERR_LIB_BN, 0, BN_R_NO_SOLUTION), "no solution"},
- {ERR_PACK(ERR_LIB_BN, 0, BN_R_NO_SUITABLE_DIGEST), "no suitable digest"},
- {ERR_PACK(ERR_LIB_BN, 0, BN_R_PRIVATE_KEY_TOO_LARGE),
- "private key too large"},
- {ERR_PACK(ERR_LIB_BN, 0, BN_R_P_IS_NOT_PRIME), "p is not prime"},
- {ERR_PACK(ERR_LIB_BN, 0, BN_R_TOO_MANY_ITERATIONS), "too many iterations"},
- {ERR_PACK(ERR_LIB_BN, 0, BN_R_TOO_MANY_TEMPORARY_VARIABLES),
- "too many temporary variables"},
- {0, NULL}
+ { ERR_PACK(ERR_LIB_BN, 0, BN_R_ARG2_LT_ARG3), "arg2 lt arg3" },
+ { ERR_PACK(ERR_LIB_BN, 0, BN_R_BAD_RECIPROCAL), "bad reciprocal" },
+ { ERR_PACK(ERR_LIB_BN, 0, BN_R_BIGNUM_TOO_LONG), "bignum too long" },
+ { ERR_PACK(ERR_LIB_BN, 0, BN_R_BITS_TOO_SMALL), "bits too small" },
+ { ERR_PACK(ERR_LIB_BN, 0, BN_R_CALLED_WITH_EVEN_MODULUS),
+ "called with even modulus" },
+ { ERR_PACK(ERR_LIB_BN, 0, BN_R_DIV_BY_ZERO), "div by zero" },
+ { ERR_PACK(ERR_LIB_BN, 0, BN_R_ENCODING_ERROR), "encoding error" },
+ { ERR_PACK(ERR_LIB_BN, 0, BN_R_EXPAND_ON_STATIC_BIGNUM_DATA),
+ "expand on static bignum data" },
+ { ERR_PACK(ERR_LIB_BN, 0, BN_R_INPUT_NOT_REDUCED), "input not reduced" },
+ { ERR_PACK(ERR_LIB_BN, 0, BN_R_INVALID_LENGTH), "invalid length" },
+ { ERR_PACK(ERR_LIB_BN, 0, BN_R_INVALID_RANGE), "invalid range" },
+ { ERR_PACK(ERR_LIB_BN, 0, BN_R_INVALID_SHIFT), "invalid shift" },
+ { ERR_PACK(ERR_LIB_BN, 0, BN_R_NOT_A_SQUARE), "not a square" },
+ { ERR_PACK(ERR_LIB_BN, 0, BN_R_NOT_INITIALIZED), "not initialized" },
+ { ERR_PACK(ERR_LIB_BN, 0, BN_R_NO_INVERSE), "no inverse" },
+ { ERR_PACK(ERR_LIB_BN, 0, BN_R_NO_PRIME_CANDIDATE), "no prime candidate" },
+ { ERR_PACK(ERR_LIB_BN, 0, BN_R_NO_SOLUTION), "no solution" },
+ { ERR_PACK(ERR_LIB_BN, 0, BN_R_NO_SUITABLE_DIGEST), "no suitable digest" },
+ { ERR_PACK(ERR_LIB_BN, 0, BN_R_PRIVATE_KEY_TOO_LARGE),
+ "private key too large" },
+ { ERR_PACK(ERR_LIB_BN, 0, BN_R_P_IS_NOT_PRIME), "p is not prime" },
+ { ERR_PACK(ERR_LIB_BN, 0, BN_R_TOO_MANY_ITERATIONS), "too many iterations" },
+ { ERR_PACK(ERR_LIB_BN, 0, BN_R_TOO_MANY_TEMPORARY_VARIABLES),
+ "too many temporary variables" },
+ { 0, NULL }
};
#endif
diff --git a/crypto/bn/bn_exp.c b/crypto/bn/bn_exp.c
index ae6d9a2100..a44b2d3712 100644
--- a/crypto/bn/bn_exp.c
+++ b/crypto/bn/bn_exp.c
@@ -13,28 +13,28 @@
#include <stdlib.h>
#ifdef _WIN32
-# include <malloc.h>
-# ifndef alloca
-# define alloca _alloca
-# endif
+#include <malloc.h>
+#ifndef alloca
+#define alloca _alloca
+#endif
#elif defined(__GNUC__)
-# ifndef alloca
-# define alloca(s) __builtin_alloca((s))
-# endif
+#ifndef alloca
+#define alloca(s) __builtin_alloca((s))
+#endif
#elif defined(__sun)
-# include <alloca.h>
+#include <alloca.h>
#endif
#include "rsaz_exp.h"
#undef SPARC_T4_MONT
#if defined(OPENSSL_BN_ASM_MONT) && (defined(__sparc__) || defined(__sparc))
-# include "crypto/sparc_arch.h"
-# define SPARC_T4_MONT
+#include "crypto/sparc_arch.h"
+#define SPARC_T4_MONT
#endif
/* maximum precomputation table size for *variable* sliding windows */
-#define TABLE_SIZE 32
+#define TABLE_SIZE 32
/*
* Beyond this limit the constant time code is disabled due to
@@ -52,7 +52,7 @@ int BN_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
BIGNUM *v, *rr;
if (BN_get_flags(p, BN_FLG_CONSTTIME) != 0
- || BN_get_flags(a, BN_FLG_CONSTTIME) != 0) {
+ || BN_get_flags(a, BN_FLG_CONSTTIME) != 0) {
/* BN_FLG_CONSTTIME only supported by BN_mod_exp_mont() */
ERR_raise(ERR_LIB_BN, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
return 0;
@@ -88,14 +88,14 @@ int BN_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
goto err;
ret = 1;
- err:
+err:
BN_CTX_end(ctx);
bn_check_top(r);
return ret;
}
int BN_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, const BIGNUM *m,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
int ret;
@@ -140,7 +140,7 @@ int BN_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, const BIGNUM *m,
#ifdef MONT_MUL_MOD
if (BN_is_odd(m)) {
-# ifdef MONT_EXP_WORD
+#ifdef MONT_EXP_WORD
if (a->top == 1 && !a->neg
&& (BN_get_flags(p, BN_FLG_CONSTTIME) == 0)
&& (BN_get_flags(a, BN_FLG_CONSTTIME) == 0)
@@ -148,7 +148,7 @@ int BN_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, const BIGNUM *m,
BN_ULONG A = a->d[0];
ret = BN_mod_exp_mont_word(r, A, p, m, ctx, NULL);
} else
-# endif
+#endif
ret = BN_mod_exp_mont(r, a, p, m, ctx, NULL);
} else
#endif
@@ -167,7 +167,7 @@ int BN_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, const BIGNUM *m,
}
int BN_mod_exp_recp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
- const BIGNUM *m, BN_CTX *ctx)
+ const BIGNUM *m, BN_CTX *ctx)
{
int i, j, bits, ret = 0, wstart, wend, window;
int start = 1;
@@ -177,8 +177,8 @@ int BN_mod_exp_recp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
BN_RECP_CTX recp;
if (BN_get_flags(p, BN_FLG_CONSTTIME) != 0
- || BN_get_flags(a, BN_FLG_CONSTTIME) != 0
- || BN_get_flags(m, BN_FLG_CONSTTIME) != 0) {
+ || BN_get_flags(a, BN_FLG_CONSTTIME) != 0
+ || BN_get_flags(m, BN_FLG_CONSTTIME) != 0) {
/* BN_FLG_CONSTTIME only supported by BN_mod_exp_mont() */
ERR_raise(ERR_LIB_BN, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
return 0;
@@ -217,7 +217,7 @@ int BN_mod_exp_recp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
}
if (!BN_nnmod(val[0], a, m, ctx))
- goto err; /* 1 */
+ goto err; /* 1 */
if (BN_is_zero(val[0])) {
BN_zero(r);
ret = 1;
@@ -227,20 +227,19 @@ int BN_mod_exp_recp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
window = BN_window_bits_for_exponent_size(bits);
if (window > 1) {
if (!BN_mod_mul_reciprocal(aa, val[0], val[0], &recp, ctx))
- goto err; /* 2 */
+ goto err; /* 2 */
j = 1 << (window - 1);
for (i = 1; i < j; i++) {
- if (((val[i] = BN_CTX_get(ctx)) == NULL) ||
- !BN_mod_mul_reciprocal(val[i], val[i - 1], aa, &recp, ctx))
+ if (((val[i] = BN_CTX_get(ctx)) == NULL) || !BN_mod_mul_reciprocal(val[i], val[i - 1], aa, &recp, ctx))
goto err;
}
}
- start = 1; /* This is used to avoid multiplication etc
- * when there is only the value '1' in the
- * buffer. */
- wstart = bits - 1; /* The top bit of the window */
- wend = 0; /* The bottom bit of the window */
+ start = 1; /* This is used to avoid multiplication etc
+ * when there is only the value '1' in the
+ * buffer. */
+ wstart = bits - 1; /* The top bit of the window */
+ wend = 0; /* The bottom bit of the window */
if (r == p) {
BIGNUM *p_dup = BN_CTX_get(ctx);
@@ -254,7 +253,7 @@ int BN_mod_exp_recp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
goto err;
for (;;) {
- int wvalue; /* The 'value' of the window */
+ int wvalue; /* The 'value' of the window */
if (BN_is_bit_set(p, wstart) == 0) {
if (!start)
@@ -302,7 +301,7 @@ int BN_mod_exp_recp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
break;
}
ret = 1;
- err:
+err:
BN_CTX_end(ctx);
BN_RECP_CTX_free(&recp);
bn_check_top(r);
@@ -310,7 +309,7 @@ int BN_mod_exp_recp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
}
int BN_mod_exp_mont(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
- const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *in_mont)
+ const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *in_mont)
{
int i, j, bits, ret = 0, wstart, wend, window;
int start = 1;
@@ -375,28 +374,27 @@ int BN_mod_exp_mont(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
} else
aa = a;
if (!bn_to_mont_fixed_top(val[0], aa, mont, ctx))
- goto err; /* 1 */
+ goto err; /* 1 */
window = BN_window_bits_for_exponent_size(bits);
if (window > 1) {
if (!bn_mul_mont_fixed_top(d, val[0], val[0], mont, ctx))
- goto err; /* 2 */
+ goto err; /* 2 */
j = 1 << (window - 1);
for (i = 1; i < j; i++) {
- if (((val[i] = BN_CTX_get(ctx)) == NULL) ||
- !bn_mul_mont_fixed_top(val[i], val[i - 1], d, mont, ctx))
+ if (((val[i] = BN_CTX_get(ctx)) == NULL) || !bn_mul_mont_fixed_top(val[i], val[i - 1], d, mont, ctx))
goto err;
}
}
- start = 1; /* This is used to avoid multiplication etc
- * when there is only the value '1' in the
- * buffer. */
- wstart = bits - 1; /* The top bit of the window */
- wend = 0; /* The bottom bit of the window */
+ start = 1; /* This is used to avoid multiplication etc
+ * when there is only the value '1' in the
+ * buffer. */
+ wstart = bits - 1; /* The top bit of the window */
+ wend = 0; /* The bottom bit of the window */
-#if 1 /* by Shay Gueron's suggestion */
- j = m->top; /* borrow j */
+#if 1 /* by Shay Gueron's suggestion */
+ j = m->top; /* borrow j */
if (m->d[j - 1] & (((BN_ULONG)1) << (BN_BITS2 - 1))) {
if (bn_wexpand(r, j) == NULL)
goto err;
@@ -408,10 +406,10 @@ int BN_mod_exp_mont(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
r->flags |= BN_FLG_FIXED_TOP;
} else
#endif
- if (!bn_to_mont_fixed_top(r, BN_value_one(), mont, ctx))
+ if (!bn_to_mont_fixed_top(r, BN_value_one(), mont, ctx))
goto err;
for (;;) {
- int wvalue; /* The 'value' of the window */
+ int wvalue; /* The 'value' of the window */
if (BN_is_bit_set(p, wstart) == 0) {
if (!start) {
@@ -466,8 +464,8 @@ int BN_mod_exp_mont(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
*/
#if defined(SPARC_T4_MONT)
if (OPENSSL_sparcv9cap_P[0] & (SPARCV9_VIS3 | SPARCV9_PREFER_FPU)) {
- j = mont->N.top; /* borrow j */
- val[0]->d[0] = 1; /* borrow val[0] */
+ j = mont->N.top; /* borrow j */
+ val[0]->d[0] = 1; /* borrow val[0] */
for (i = 1; i < j; i++)
val[0]->d[i] = 0;
val[0]->top = j;
@@ -475,10 +473,10 @@ int BN_mod_exp_mont(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
goto err;
} else
#endif
- if (!BN_from_montgomery(rr, r, mont, ctx))
+ if (!BN_from_montgomery(rr, r, mont, ctx))
goto err;
ret = 1;
- err:
+err:
if (in_mont == NULL)
BN_MONT_CTX_free(mont);
BN_CTX_end(ctx);
@@ -513,16 +511,16 @@ static BN_ULONG bn_get_bits(const BIGNUM *a, int bitpos)
*/
static int MOD_EXP_CTIME_COPY_TO_PREBUF(const BIGNUM *b, int top,
- unsigned char *buf, int idx,
- int window)
+ unsigned char *buf, int idx,
+ int window)
{
int i, j;
int width = 1 << window;
BN_ULONG *table = (BN_ULONG *)buf;
if (top > b->top)
- top = b->top; /* this works because 'buf' is explicitly
- * zeroed */
+ top = b->top; /* this works because 'buf' is explicitly
+ * zeroed */
for (i = 0, j = idx; i < top; i++, j += width) {
table[j] = b->d[i];
}
@@ -531,8 +529,8 @@ static int MOD_EXP_CTIME_COPY_TO_PREBUF(const BIGNUM *b, int top,
}
static int MOD_EXP_CTIME_COPY_FROM_PREBUF(BIGNUM *b, int top,
- unsigned char *buf, int idx,
- int window)
+ unsigned char *buf, int idx,
+ int window)
{
int i, j;
int width = 1 << window;
@@ -554,8 +552,7 @@ static int MOD_EXP_CTIME_COPY_FROM_PREBUF(BIGNUM *b, int top,
BN_ULONG acc = 0;
for (j = 0; j < width; j++) {
- acc |= table[j] &
- ((BN_ULONG)0 - (constant_time_eq_int(j,idx)&1));
+ acc |= table[j] & ((BN_ULONG)0 - (constant_time_eq_int(j, idx) & 1));
}
b->d[i] = acc;
@@ -564,23 +561,20 @@ static int MOD_EXP_CTIME_COPY_FROM_PREBUF(BIGNUM *b, int top,
int xstride = 1 << (window - 2);
BN_ULONG y0, y1, y2, y3;
- i = idx >> (window - 2); /* equivalent of idx / xstride */
- idx &= xstride - 1; /* equivalent of idx % xstride */
+ i = idx >> (window - 2); /* equivalent of idx / xstride */
+ idx &= xstride - 1; /* equivalent of idx % xstride */
- y0 = (BN_ULONG)0 - (constant_time_eq_int(i,0)&1);
- y1 = (BN_ULONG)0 - (constant_time_eq_int(i,1)&1);
- y2 = (BN_ULONG)0 - (constant_time_eq_int(i,2)&1);
- y3 = (BN_ULONG)0 - (constant_time_eq_int(i,3)&1);
+ y0 = (BN_ULONG)0 - (constant_time_eq_int(i, 0) & 1);
+ y1 = (BN_ULONG)0 - (constant_time_eq_int(i, 1) & 1);
+ y2 = (BN_ULONG)0 - (constant_time_eq_int(i, 2) & 1);
+ y3 = (BN_ULONG)0 - (constant_time_eq_int(i, 3) & 1);
for (i = 0; i < top; i++, table += width) {
BN_ULONG acc = 0;
for (j = 0; j < xstride; j++) {
- acc |= ( (table[j + 0 * xstride] & y0) |
- (table[j + 1 * xstride] & y1) |
- (table[j + 2 * xstride] & y2) |
- (table[j + 3 * xstride] & y3) )
- & ((BN_ULONG)0 - (constant_time_eq_int(j,idx)&1));
+ acc |= ((table[j + 0 * xstride] & y0) | (table[j + 1 * xstride] & y1) | (table[j + 2 * xstride] & y2) | (table[j + 3 * xstride] & y3))
+ & ((BN_ULONG)0 - (constant_time_eq_int(j, idx) & 1));
}
b->d[i] = acc;
@@ -597,7 +591,7 @@ static int MOD_EXP_CTIME_COPY_FROM_PREBUF(BIGNUM *b, int top,
* multiple.
*/
#define MOD_EXP_CTIME_ALIGN(x_) \
- ((unsigned char*)(x_) + (MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH - (((size_t)(x_)) & (MOD_EXP_CTIME_MIN_CACHE_LINE_MASK))))
+ ((unsigned char *)(x_) + (MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH - (((size_t)(x_)) & (MOD_EXP_CTIME_MIN_CACHE_LINE_MASK))))
/*
* This variant of BN_mod_exp_mont() uses fixed windows and the special
@@ -607,8 +601,8 @@ static int MOD_EXP_CTIME_COPY_FROM_PREBUF(BIGNUM *b, int top,
* http://www.daemonology.net/hyperthreading-considered-harmful/)
*/
int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
- const BIGNUM *m, BN_CTX *ctx,
- BN_MONT_CTX *in_mont)
+ const BIGNUM *m, BN_CTX *ctx,
+ BN_MONT_CTX *in_mont)
{
int i, bits, ret = 0, window, wvalue, wmask, window0;
int top;
@@ -686,7 +680,7 @@ int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
if (NULL == bn_wexpand(rr, 16))
goto err;
RSAZ_1024_mod_exp_avx2(rr->d, a->d, p->d, m->d, mont->RR.d,
- mont->n0[0]);
+ mont->n0[0]);
rr->top = 16;
rr->neg = 0;
bn_correct_top(rr);
@@ -707,16 +701,14 @@ int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
/* Get the window size to use with size of p. */
window = BN_window_bits_for_ctime_exponent_size(bits);
#if defined(SPARC_T4_MONT)
- if (window >= 5 && (top & 15) == 0 && top <= 64 &&
- (OPENSSL_sparcv9cap_P[1] & (CFR_MONTMUL | CFR_MONTSQR)) ==
- (CFR_MONTMUL | CFR_MONTSQR) && (t4 = OPENSSL_sparcv9cap_P[0]))
+ if (window >= 5 && (top & 15) == 0 && top <= 64 && (OPENSSL_sparcv9cap_P[1] & (CFR_MONTMUL | CFR_MONTSQR)) == (CFR_MONTMUL | CFR_MONTSQR) && (t4 = OPENSSL_sparcv9cap_P[0]))
window = 5;
else
#endif
#if defined(OPENSSL_BN_ASM_MONT5)
- if (window >= 5 && top <= BN_SOFT_LIMIT) {
- window = 5; /* ~5% improvement for RSA2048 sign, and even
- * for RSA4096 */
+ if (window >= 5 && top <= BN_SOFT_LIMIT) {
+ window = 5; /* ~5% improvement for RSA2048 sign, and even
+ * for RSA4096 */
/* reserve space for mont->N.d[] copy */
powerbufLen += top * sizeof(mont->N.d[0]);
}
@@ -728,17 +720,13 @@ int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
* of am, am itself and tmp.
*/
numPowers = 1 << window;
- powerbufLen += sizeof(m->d[0]) * (top * numPowers +
- ((2 * top) >
- numPowers ? (2 * top) : numPowers));
+ powerbufLen += sizeof(m->d[0]) * (top * numPowers + ((2 * top) > numPowers ? (2 * top) : numPowers));
#ifdef alloca
if (powerbufLen < 3072)
- powerbufFree =
- alloca(powerbufLen + MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH);
+ powerbufFree = alloca(powerbufLen + MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH);
else
#endif
- if ((powerbufFree =
- OPENSSL_malloc(powerbufLen + MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH))
+ if ((powerbufFree = OPENSSL_malloc(powerbufLen + MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH))
== NULL)
goto err;
@@ -759,7 +747,7 @@ int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
tmp.flags = am.flags = BN_FLG_STATIC_DATA;
/* prepare a^0 in Montgomery domain */
-#if 1 /* by Shay Gueron's suggestion */
+#if 1 /* by Shay Gueron's suggestion */
if (m->d[top - 1] & (((BN_ULONG)1) << (BN_BITS2 - 1))) {
/* 2^(top*BN_BITS2) - m */
tmp.d[0] = (0 - m->d[0]) & BN_MASK2;
@@ -769,7 +757,7 @@ int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
tmp.flags |= BN_FLG_FIXED_TOP;
} else
#endif
- if (!bn_to_mont_fixed_top(&tmp, BN_value_one(), mont, ctx))
+ if (!bn_to_mont_fixed_top(&tmp, BN_value_one(), mont, ctx))
goto err;
/* prepare a^1 in Montgomery domain */
@@ -781,61 +769,61 @@ int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
#if defined(SPARC_T4_MONT)
if (t4) {
- typedef int (*bn_pwr5_mont_f) (BN_ULONG *tp, const BN_ULONG *np,
- const BN_ULONG *n0, const void *table,
- int power, int bits);
- int bn_pwr5_mont_t4_8(BN_ULONG *tp, const BN_ULONG *np,
- const BN_ULONG *n0, const void *table,
- int power, int bits);
- int bn_pwr5_mont_t4_16(BN_ULONG *tp, const BN_ULONG *np,
- const BN_ULONG *n0, const void *table,
- int power, int bits);
- int bn_pwr5_mont_t4_24(BN_ULONG *tp, const BN_ULONG *np,
- const BN_ULONG *n0, const void *table,
- int power, int bits);
- int bn_pwr5_mont_t4_32(BN_ULONG *tp, const BN_ULONG *np,
- const BN_ULONG *n0, const void *table,
- int power, int bits);
+ typedef int (*bn_pwr5_mont_f)(BN_ULONG *tp, const BN_ULONG *np,
+ const BN_ULONG *n0, const void *table,
+ int power, int bits);
+ int bn_pwr5_mont_t4_8(BN_ULONG * tp, const BN_ULONG *np,
+ const BN_ULONG *n0, const void *table,
+ int power, int bits);
+ int bn_pwr5_mont_t4_16(BN_ULONG * tp, const BN_ULONG *np,
+ const BN_ULONG *n0, const void *table,
+ int power, int bits);
+ int bn_pwr5_mont_t4_24(BN_ULONG * tp, const BN_ULONG *np,
+ const BN_ULONG *n0, const void *table,
+ int power, int bits);
+ int bn_pwr5_mont_t4_32(BN_ULONG * tp, const BN_ULONG *np,
+ const BN_ULONG *n0, const void *table,
+ int power, int bits);
static const bn_pwr5_mont_f pwr5_funcs[4] = {
bn_pwr5_mont_t4_8, bn_pwr5_mont_t4_16,
bn_pwr5_mont_t4_24, bn_pwr5_mont_t4_32
};
bn_pwr5_mont_f pwr5_worker = pwr5_funcs[top / 16 - 1];
- typedef int (*bn_mul_mont_f) (BN_ULONG *rp, const BN_ULONG *ap,
- const void *bp, const BN_ULONG *np,
- const BN_ULONG *n0);
- int bn_mul_mont_t4_8(BN_ULONG *rp, const BN_ULONG *ap, const void *bp,
- const BN_ULONG *np, const BN_ULONG *n0);
- int bn_mul_mont_t4_16(BN_ULONG *rp, const BN_ULONG *ap,
- const void *bp, const BN_ULONG *np,
- const BN_ULONG *n0);
- int bn_mul_mont_t4_24(BN_ULONG *rp, const BN_ULONG *ap,
- const void *bp, const BN_ULONG *np,
- const BN_ULONG *n0);
- int bn_mul_mont_t4_32(BN_ULONG *rp, const BN_ULONG *ap,
- const void *bp, const BN_ULONG *np,
- const BN_ULONG *n0);
+ typedef int (*bn_mul_mont_f)(BN_ULONG *rp, const BN_ULONG *ap,
+ const void *bp, const BN_ULONG *np,
+ const BN_ULONG *n0);
+ int bn_mul_mont_t4_8(BN_ULONG * rp, const BN_ULONG *ap, const void *bp,
+ const BN_ULONG *np, const BN_ULONG *n0);
+ int bn_mul_mont_t4_16(BN_ULONG * rp, const BN_ULONG *ap,
+ const void *bp, const BN_ULONG *np,
+ const BN_ULONG *n0);
+ int bn_mul_mont_t4_24(BN_ULONG * rp, const BN_ULONG *ap,
+ const void *bp, const BN_ULONG *np,
+ const BN_ULONG *n0);
+ int bn_mul_mont_t4_32(BN_ULONG * rp, const BN_ULONG *ap,
+ const void *bp, const BN_ULONG *np,
+ const BN_ULONG *n0);
static const bn_mul_mont_f mul_funcs[4] = {
bn_mul_mont_t4_8, bn_mul_mont_t4_16,
bn_mul_mont_t4_24, bn_mul_mont_t4_32
};
bn_mul_mont_f mul_worker = mul_funcs[top / 16 - 1];
- void bn_mul_mont_vis3(BN_ULONG *rp, const BN_ULONG *ap,
- const void *bp, const BN_ULONG *np,
- const BN_ULONG *n0, int num);
- void bn_mul_mont_t4(BN_ULONG *rp, const BN_ULONG *ap,
- const void *bp, const BN_ULONG *np,
- const BN_ULONG *n0, int num);
- void bn_mul_mont_gather5_t4(BN_ULONG *rp, const BN_ULONG *ap,
- const void *table, const BN_ULONG *np,
- const BN_ULONG *n0, int num, int power);
+ void bn_mul_mont_vis3(BN_ULONG * rp, const BN_ULONG *ap,
+ const void *bp, const BN_ULONG *np,
+ const BN_ULONG *n0, int num);
+ void bn_mul_mont_t4(BN_ULONG * rp, const BN_ULONG *ap,
+ const void *bp, const BN_ULONG *np,
+ const BN_ULONG *n0, int num);
+ void bn_mul_mont_gather5_t4(BN_ULONG * rp, const BN_ULONG *ap,
+ const void *table, const BN_ULONG *np,
+ const BN_ULONG *n0, int num, int power);
void bn_flip_n_scatter5_t4(const BN_ULONG *inp, size_t num,
- void *table, size_t power);
- void bn_gather5_t4(BN_ULONG *out, size_t num,
- void *table, size_t power);
- void bn_flip_t4(BN_ULONG *dst, BN_ULONG *src, size_t num);
+ void *table, size_t power);
+ void bn_gather5_t4(BN_ULONG * out, size_t num,
+ void *table, size_t power);
+ void bn_flip_t4(BN_ULONG * dst, BN_ULONG * src, size_t num);
BN_ULONG *np = mont->N.d, *n0 = mont->n0;
int stride = 5 * (6 - (top / 16 - 1)); /* multiple of 5, but less
@@ -852,15 +840,13 @@ int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
bn_flip_n_scatter5_t4(tmp.d, top, powerbuf, 0);
bn_flip_n_scatter5_t4(am.d, top, powerbuf, 1);
- if (!(*mul_worker) (tmp.d, am.d, am.d, np, n0) &&
- !(*mul_worker) (tmp.d, am.d, am.d, np, n0))
+ if (!(*mul_worker)(tmp.d, am.d, am.d, np, n0) && !(*mul_worker)(tmp.d, am.d, am.d, np, n0))
bn_mul_mont_vis3(tmp.d, am.d, am.d, np, n0, top);
bn_flip_n_scatter5_t4(tmp.d, top, powerbuf, 2);
for (i = 3; i < 32; i++) {
/* Calculate a^i = a^(i-1) * a */
- if (!(*mul_worker) (tmp.d, tmp.d, am.d, np, n0) &&
- !(*mul_worker) (tmp.d, tmp.d, am.d, np, n0))
+ if (!(*mul_worker)(tmp.d, tmp.d, am.d, np, n0) && !(*mul_worker)(tmp.d, tmp.d, am.d, np, n0))
bn_mul_mont_vis3(tmp.d, tmp.d, am.d, np, n0, top);
bn_flip_n_scatter5_t4(tmp.d, top, powerbuf, i);
}
@@ -892,10 +878,10 @@ int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
bits -= stride;
wvalue = bn_get_bits(p, bits);
- if ((*pwr5_worker) (tmp.d, np, n0, powerbuf, wvalue, stride))
+ if ((*pwr5_worker)(tmp.d, np, n0, powerbuf, wvalue, stride))
continue;
/* retry once and fall back */
- if ((*pwr5_worker) (tmp.d, np, n0, powerbuf, wvalue, stride))
+ if ((*pwr5_worker)(tmp.d, np, n0, powerbuf, wvalue, stride))
continue;
bits += stride - 5;
@@ -907,7 +893,7 @@ int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
bn_mul_mont_t4(tmp.d, tmp.d, tmp.d, np, n0, top);
bn_mul_mont_t4(tmp.d, tmp.d, tmp.d, np, n0, top);
bn_mul_mont_gather5_t4(tmp.d, tmp.d, powerbuf, np, n0, top,
- wvalue);
+ wvalue);
}
bn_flip_t4(tmp.d, tmp.d, top);
@@ -919,7 +905,7 @@ int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
} else
#endif
#if defined(OPENSSL_BN_ASM_MONT5)
- if (window == 5 && top > 1) {
+ if (window == 5 && top > 1) {
/*
* This optimization uses ideas from https://eprint.iacr.org/2011/239,
* specifically optimization of cache-timing attack countermeasures,
@@ -937,15 +923,15 @@ int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
* Given those inputs, |bn_mul_mont| may not give reduced
* output, but it will still produce "almost" reduced output.
*/
- void bn_mul_mont_gather5(BN_ULONG *rp, const BN_ULONG *ap,
- const void *table, const BN_ULONG *np,
- const BN_ULONG *n0, int num, int power);
+ void bn_mul_mont_gather5(BN_ULONG * rp, const BN_ULONG *ap,
+ const void *table, const BN_ULONG *np,
+ const BN_ULONG *n0, int num, int power);
void bn_scatter5(const BN_ULONG *inp, size_t num,
- void *table, size_t power);
- void bn_gather5(BN_ULONG *out, size_t num, void *table, size_t power);
- void bn_power5(BN_ULONG *rp, const BN_ULONG *ap,
- const void *table, const BN_ULONG *np,
- const BN_ULONG *n0, int num, int power);
+ void *table, size_t power);
+ void bn_gather5(BN_ULONG * out, size_t num, void *table, size_t power);
+ void bn_power5(BN_ULONG * rp, const BN_ULONG *ap,
+ const void *table, const BN_ULONG *np,
+ const BN_ULONG *n0, int num, int power);
int bn_get_bits5(const BN_ULONG *ap, int off);
BN_ULONG *n0 = mont->n0, *np;
@@ -970,13 +956,13 @@ int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
bn_mul_mont(tmp.d, am.d, am.d, np, n0, top);
bn_scatter5(tmp.d, top, powerbuf, 2);
-# if 0
+#if 0
for (i = 3; i < 32; i++) {
/* Calculate a^i = a^(i-1) * a */
bn_mul_mont_gather5(tmp.d, am.d, powerbuf, np, n0, top, i - 1);
bn_scatter5(tmp.d, top, powerbuf, i);
}
-# else
+#else
/* same as above, but uses squaring for 1/2 of operations */
for (i = 4; i < 32; i *= 2) {
bn_mul_mont(tmp.d, tmp.d, tmp.d, np, n0, top);
@@ -1001,7 +987,7 @@ int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
bn_mul_mont_gather5(tmp.d, am.d, powerbuf, np, n0, top, i - 1);
bn_scatter5(tmp.d, top, powerbuf, i);
}
-# endif
+#endif
/*
* The exponent may not have a whole number of fixed-size windows.
* To simplify the main loop, the initial window has between 1 and
@@ -1026,12 +1012,12 @@ int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
bn_mul_mont(tmp.d, tmp.d, tmp.d, np, n0, top);
bn_mul_mont(tmp.d, tmp.d, tmp.d, np, n0, top);
bn_mul_mont_gather5(tmp.d, tmp.d, powerbuf, np, n0, top,
- bn_get_bits5(p->d, bits -= 5));
+ bn_get_bits5(p->d, bits -= 5));
}
} else {
while (bits > 0) {
bn_power5(tmp.d, tmp.d, powerbuf, np, n0, top,
- bn_get_bits5(p->d, bits -= 5));
+ bn_get_bits5(p->d, bits -= 5));
}
}
@@ -1050,7 +1036,7 @@ int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
} else
#endif
{
- fallback:
+ fallback:
if (!MOD_EXP_CTIME_COPY_TO_PREBUF(&tmp, top, powerbuf, 0, window))
goto err;
if (!MOD_EXP_CTIME_COPY_TO_PREBUF(&am, top, powerbuf, 1, window))
@@ -1066,14 +1052,14 @@ int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
if (!bn_mul_mont_fixed_top(&tmp, &am, &am, mont, ctx))
goto err;
if (!MOD_EXP_CTIME_COPY_TO_PREBUF(&tmp, top, powerbuf, 2,
- window))
+ window))
goto err;
for (i = 3; i < numPowers; i++) {
/* Calculate a^i = a^(i-1) * a */
if (!bn_mul_mont_fixed_top(&tmp, &am, &tmp, mont, ctx))
goto err;
if (!MOD_EXP_CTIME_COPY_TO_PREBUF(&tmp, top, powerbuf, i,
- window))
+ window))
goto err;
}
}
@@ -1089,7 +1075,7 @@ int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
bits -= window0;
wvalue = bn_get_bits(p, bits) & wmask;
if (!MOD_EXP_CTIME_COPY_FROM_PREBUF(&tmp, top, powerbuf, wvalue,
- window))
+ window))
goto err;
wmask = (1 << window) - 1;
@@ -1120,7 +1106,7 @@ int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
* Fetch the appropriate pre-computed value from the pre-buf
*/
if (!MOD_EXP_CTIME_COPY_FROM_PREBUF(&am, top, powerbuf, wvalue,
- window))
+ window))
goto err;
/* Multiply the result into the intermediate result */
@@ -1136,17 +1122,17 @@ int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
*/
#if defined(SPARC_T4_MONT)
if (OPENSSL_sparcv9cap_P[0] & (SPARCV9_VIS3 | SPARCV9_PREFER_FPU)) {
- am.d[0] = 1; /* borrow am */
+ am.d[0] = 1; /* borrow am */
for (i = 1; i < top; i++)
am.d[i] = 0;
if (!BN_mod_mul_montgomery(rr, &tmp, &am, mont, ctx))
goto err;
} else
#endif
- if (!bn_from_mont_fixed_top(rr, &tmp, mont, ctx))
+ if (!bn_from_mont_fixed_top(rr, &tmp, mont, ctx))
goto err;
ret = 1;
- err:
+err:
if (in_mont == NULL)
BN_MONT_CTX_free(mont);
if (powerbuf != NULL) {
@@ -1158,8 +1144,8 @@ int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
}
int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
- const BIGNUM *m, BN_CTX *ctx,
- BN_MONT_CTX *in_mont)
+ const BIGNUM *m, BN_CTX *ctx,
+ BN_MONT_CTX *in_mont)
{
bn_check_top(a);
bn_check_top(p);
@@ -1171,7 +1157,7 @@ int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
}
int BN_mod_exp_mont_word(BIGNUM *rr, BN_ULONG a, const BIGNUM *p,
- const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *in_mont)
+ const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *in_mont)
{
BN_MONT_CTX *mont = NULL;
int b, bits, ret = 0;
@@ -1179,10 +1165,9 @@ int BN_mod_exp_mont_word(BIGNUM *rr, BN_ULONG a, const BIGNUM *p,
BN_ULONG w, next_w;
BIGNUM *r, *t;
BIGNUM *swap_tmp;
-#define BN_MOD_MUL_WORD(r, w, m) \
- (BN_mul_word(r, (w)) && \
- (/* BN_ucmp(r, (m)) < 0 ? 1 :*/ \
- (BN_mod(t, r, m, ctx) && (swap_tmp = r, r = t, t = swap_tmp, 1))))
+#define BN_MOD_MUL_WORD(r, w, m) \
+ (BN_mul_word(r, (w)) && (/* BN_ucmp(r, (m)) < 0 ? 1 :*/ \
+ (BN_mod(t, r, m, ctx) && (swap_tmp = r, r = t, t = swap_tmp, 1))))
/*
* BN_MOD_MUL_WORD is only used with 'w' large, so the BN_ucmp test is
* probably more overhead than always using BN_mod (which uses BN_copy if
@@ -1194,10 +1179,10 @@ int BN_mod_exp_mont_word(BIGNUM *rr, BN_ULONG a, const BIGNUM *p,
* the modulus).
*/
#define BN_TO_MONTGOMERY_WORD(r, w, mont) \
- (BN_set_word(r, (w)) && BN_to_montgomery(r, r, (mont), ctx))
+ (BN_set_word(r, (w)) && BN_to_montgomery(r, r, (mont), ctx))
if (BN_get_flags(p, BN_FLG_CONSTTIME) != 0
- || BN_get_flags(m, BN_FLG_CONSTTIME) != 0) {
+ || BN_get_flags(m, BN_FLG_CONSTTIME) != 0) {
/* BN_FLG_CONSTTIME only supported by BN_mod_exp_mont() */
ERR_raise(ERR_LIB_BN, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
return 0;
@@ -1211,7 +1196,7 @@ int BN_mod_exp_mont_word(BIGNUM *rr, BN_ULONG a, const BIGNUM *p,
return 0;
}
if (m->top == 1)
- a %= m->d[0]; /* make sure that 'a' is reduced */
+ a %= m->d[0]; /* make sure that 'a' is reduced */
bits = BN_num_bits(p);
if (bits == 0) {
@@ -1245,12 +1230,12 @@ int BN_mod_exp_mont_word(BIGNUM *rr, BN_ULONG a, const BIGNUM *p,
goto err;
}
- r_is_one = 1; /* except for Montgomery factor */
+ r_is_one = 1; /* except for Montgomery factor */
/* bits-1 >= 0 */
/* The result is accumulated in the product r*w. */
- w = a; /* bit 'bits-1' of 'p' is always set */
+ w = a; /* bit 'bits-1' of 'p' is always set */
for (b = bits - 2; b >= 0; b--) {
/* First, square r*w. */
next_w = w * w;
@@ -1301,7 +1286,7 @@ int BN_mod_exp_mont_word(BIGNUM *rr, BN_ULONG a, const BIGNUM *p,
}
}
- if (r_is_one) { /* can happen only if a == 1 */
+ if (r_is_one) { /* can happen only if a == 1 */
if (!BN_one(rr))
goto err;
} else {
@@ -1309,7 +1294,7 @@ int BN_mod_exp_mont_word(BIGNUM *rr, BN_ULONG a, const BIGNUM *p,
goto err;
}
ret = 1;
- err:
+err:
if (in_mont == NULL)
BN_MONT_CTX_free(mont);
BN_CTX_end(ctx);
@@ -1319,7 +1304,7 @@ int BN_mod_exp_mont_word(BIGNUM *rr, BN_ULONG a, const BIGNUM *p,
/* The old fallback, simple version :-) */
int BN_mod_exp_simple(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
- const BIGNUM *m, BN_CTX *ctx)
+ const BIGNUM *m, BN_CTX *ctx)
{
int i, j, bits, ret = 0, wstart, wend, window;
int start = 1;
@@ -1328,8 +1313,8 @@ int BN_mod_exp_simple(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
BIGNUM *val[TABLE_SIZE];
if (BN_get_flags(p, BN_FLG_CONSTTIME) != 0
- || BN_get_flags(a, BN_FLG_CONSTTIME) != 0
- || BN_get_flags(m, BN_FLG_CONSTTIME) != 0) {
+ || BN_get_flags(a, BN_FLG_CONSTTIME) != 0
+ || BN_get_flags(m, BN_FLG_CONSTTIME) != 0) {
/* BN_FLG_CONSTTIME only supported by BN_mod_exp_mont() */
ERR_raise(ERR_LIB_BN, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
return 0;
@@ -1359,7 +1344,7 @@ int BN_mod_exp_simple(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
goto err;
if (!BN_nnmod(val[0], a, m, ctx))
- goto err; /* 1 */
+ goto err; /* 1 */
if (BN_is_zero(val[0])) {
BN_zero(r);
ret = 1;
@@ -1369,20 +1354,19 @@ int BN_mod_exp_simple(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
window = BN_window_bits_for_exponent_size(bits);
if (window > 1) {
if (!BN_mod_mul(d, val[0], val[0], m, ctx))
- goto err; /* 2 */
+ goto err; /* 2 */
j = 1 << (window - 1);
for (i = 1; i < j; i++) {
- if (((val[i] = BN_CTX_get(ctx)) == NULL) ||
- !BN_mod_mul(val[i], val[i - 1], d, m, ctx))
+ if (((val[i] = BN_CTX_get(ctx)) == NULL) || !BN_mod_mul(val[i], val[i - 1], d, m, ctx))
goto err;
}
}
- start = 1; /* This is used to avoid multiplication etc
- * when there is only the value '1' in the
- * buffer. */
- wstart = bits - 1; /* The top bit of the window */
- wend = 0; /* The bottom bit of the window */
+ start = 1; /* This is used to avoid multiplication etc
+ * when there is only the value '1' in the
+ * buffer. */
+ wstart = bits - 1; /* The top bit of the window */
+ wend = 0; /* The bottom bit of the window */
if (r == p) {
BIGNUM *p_dup = BN_CTX_get(ctx);
@@ -1396,7 +1380,7 @@ int BN_mod_exp_simple(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
goto err;
for (;;) {
- int wvalue; /* The 'value' of the window */
+ int wvalue; /* The 'value' of the window */
if (BN_is_bit_set(p, wstart) == 0) {
if (!start)
@@ -1444,7 +1428,7 @@ int BN_mod_exp_simple(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
break;
}
ret = 1;
- err:
+err:
BN_CTX_end(ctx);
bn_check_top(r);
return ret;
@@ -1458,10 +1442,10 @@ int BN_mod_exp_simple(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
* it falls back to two BN_mod_exp_mont_consttime() calls.
*/
int BN_mod_exp_mont_consttime_x2(BIGNUM *rr1, const BIGNUM *a1, const BIGNUM *p1,
- const BIGNUM *m1, BN_MONT_CTX *in_mont1,
- BIGNUM *rr2, const BIGNUM *a2, const BIGNUM *p2,
- const BIGNUM *m2, BN_MONT_CTX *in_mont2,
- BN_CTX *ctx)
+ const BIGNUM *m1, BN_MONT_CTX *in_mont1,
+ BIGNUM *rr2, const BIGNUM *a2, const BIGNUM *p2,
+ const BIGNUM *m2, BN_MONT_CTX *in_mont2,
+ BN_CTX *ctx)
{
int ret = 0;
@@ -1469,13 +1453,7 @@ int BN_mod_exp_mont_consttime_x2(BIGNUM *rr1, const BIGNUM *a1, const BIGNUM *p1
BN_MONT_CTX *mont1 = NULL;
BN_MONT_CTX *mont2 = NULL;
- if ((ossl_rsaz_avx512ifma_eligible() || ossl_rsaz_avxifma_eligible()) &&
- (((a1->top == 16) && (p1->top == 16) && (BN_num_bits(m1) == 1024) &&
- (a2->top == 16) && (p2->top == 16) && (BN_num_bits(m2) == 1024)) ||
- ((a1->top == 24) && (p1->top == 24) && (BN_num_bits(m1) == 1536) &&
- (a2->top == 24) && (p2->top == 24) && (BN_num_bits(m2) == 1536)) ||
- ((a1->top == 32) && (p1->top == 32) && (BN_num_bits(m1) == 2048) &&
- (a2->top == 32) && (p2->top == 32) && (BN_num_bits(m2) == 2048)))) {
+ if ((ossl_rsaz_avx512ifma_eligible() || ossl_rsaz_avxifma_eligible()) && (((a1->top == 16) && (p1->top == 16) && (BN_num_bits(m1) == 1024) && (a2->top == 16) && (p2->top == 16) && (BN_num_bits(m2) == 1024)) || ((a1->top == 24) && (p1->top == 24) && (BN_num_bits(m1) == 1536) && (a2->top == 24) && (p2->top == 24) && (BN_num_bits(m2) == 1536)) || ((a1->top == 32) && (p1->top == 32) && (BN_num_bits(m1) == 2048) && (a2->top == 32) && (p2->top == 32) && (BN_num_bits(m2) == 2048)))) {
int topn = a1->top;
/* Modulus bits of |m1| and |m2| are equal */
@@ -1505,10 +1483,10 @@ int BN_mod_exp_mont_consttime_x2(BIGNUM *rr1, const BIGNUM *a1, const BIGNUM *p1
}
ret = ossl_rsaz_mod_exp_avx512_x2(rr1->d, a1->d, p1->d, m1->d,
- mont1->RR.d, mont1->n0[0],
- rr2->d, a2->d, p2->d, m2->d,
- mont2->RR.d, mont2->n0[0],
- mod_bits);
+ mont1->RR.d, mont1->n0[0],
+ rr2->d, a2->d, p2->d, m2->d,
+ mont2->RR.d, mont2->n0[0],
+ mod_bits);
rr1->top = topn;
rr1->neg = 0;
diff --git a/crypto/bn/bn_exp2.c b/crypto/bn/bn_exp2.c
index f5e29fd14d..53b1ab3fde 100644
--- a/crypto/bn/bn_exp2.c
+++ b/crypto/bn/bn_exp2.c
@@ -11,14 +11,13 @@
#include "internal/cryptlib.h"
#include "bn_local.h"
-#define TABLE_SIZE 32
+#define TABLE_SIZE 32
int BN_mod_exp2_mont(BIGNUM *rr, const BIGNUM *a1, const BIGNUM *p1,
- const BIGNUM *a2, const BIGNUM *p2, const BIGNUM *m,
- BN_CTX *ctx, BN_MONT_CTX *in_mont)
+ const BIGNUM *a2, const BIGNUM *p2, const BIGNUM *m,
+ BN_CTX *ctx, BN_MONT_CTX *in_mont)
{
- int i, j, bits, b, bits1, bits2, ret =
- 0, wpos1, wpos2, window1, window2, wvalue1, wvalue2;
+ int i, j, bits, b, bits1, bits2, ret = 0, wpos1, wpos2, window1, window2, wvalue1, wvalue2;
int r_is_one = 1;
BIGNUM *d, *r;
const BIGNUM *a_mod_m;
@@ -88,8 +87,7 @@ int BN_mod_exp2_mont(BIGNUM *rr, const BIGNUM *a1, const BIGNUM *p1,
j = 1 << (window1 - 1);
for (i = 1; i < j; i++) {
- if (((val1[i] = BN_CTX_get(ctx)) == NULL) ||
- !BN_mod_mul_montgomery(val1[i], val1[i - 1], d, mont, ctx))
+ if (((val1[i] = BN_CTX_get(ctx)) == NULL) || !BN_mod_mul_montgomery(val1[i], val1[i - 1], d, mont, ctx))
goto err;
}
}
@@ -116,20 +114,19 @@ int BN_mod_exp2_mont(BIGNUM *rr, const BIGNUM *a1, const BIGNUM *p1,
j = 1 << (window2 - 1);
for (i = 1; i < j; i++) {
- if (((val2[i] = BN_CTX_get(ctx)) == NULL) ||
- !BN_mod_mul_montgomery(val2[i], val2[i - 1], d, mont, ctx))
+ if (((val2[i] = BN_CTX_get(ctx)) == NULL) || !BN_mod_mul_montgomery(val2[i], val2[i - 1], d, mont, ctx))
goto err;
}
}
/* Now compute the power product, using independent windows. */
r_is_one = 1;
- wvalue1 = 0; /* The 'value' of the first window */
- wvalue2 = 0; /* The 'value' of the second window */
- wpos1 = 0; /* If wvalue1 > 0, the bottom bit of the
- * first window */
- wpos2 = 0; /* If wvalue2 > 0, the bottom bit of the
- * second window */
+ wvalue1 = 0; /* The 'value' of the first window */
+ wvalue2 = 0; /* The 'value' of the second window */
+ wpos1 = 0; /* If wvalue1 > 0, the bottom bit of the
+ * first window */
+ wpos2 = 0; /* If wvalue2 > 0, the bottom bit of the
+ * second window */
if (!BN_to_montgomery(r, BN_value_one(), mont, ctx))
goto err;
@@ -192,7 +189,7 @@ int BN_mod_exp2_mont(BIGNUM *rr, const BIGNUM *a1, const BIGNUM *p1,
if (!BN_from_montgomery(rr, r, mont, ctx))
goto err;
ret = 1;
- err:
+err:
if (in_mont == NULL)
BN_MONT_CTX_free(mont);
BN_CTX_end(ctx);
diff --git a/crypto/bn/bn_gcd.c b/crypto/bn/bn_gcd.c
index e09b6a3d72..59865f9728 100644
--- a/crypto/bn/bn_gcd.c
+++ b/crypto/bn/bn_gcd.c
@@ -18,10 +18,9 @@
* This is a static function, we ensure all callers in this file pass valid
* arguments: all passed pointers here are non-NULL.
*/
-static ossl_inline
-BIGNUM *bn_mod_inverse_no_branch(BIGNUM *in,
- const BIGNUM *a, const BIGNUM *n,
- BN_CTX *ctx, int *pnoinv)
+static ossl_inline BIGNUM *bn_mod_inverse_no_branch(BIGNUM *in,
+ const BIGNUM *a, const BIGNUM *n,
+ BN_CTX *ctx, int *pnoinv)
{
BIGNUM *A, *B, *X, *Y, *M, *D, *T, *R = NULL;
BIGNUM *ret = NULL;
@@ -62,7 +61,7 @@ BIGNUM *bn_mod_inverse_no_branch(BIGNUM *in,
* Turn BN_FLG_CONSTTIME flag on, so that when BN_div is invoked,
* BN_div_no_branch will be called eventually.
*/
- {
+ {
BIGNUM local_B;
bn_init(&local_B);
BN_with_flags(&local_B, B, BN_FLG_CONSTTIME);
@@ -111,8 +110,8 @@ BIGNUM *bn_mod_inverse_no_branch(BIGNUM *in,
* (**) sign*Y*a == D*B + M (mod |n|).
*/
- tmp = A; /* keep the BIGNUM object, the value does not
- * matter */
+ tmp = A; /* keep the BIGNUM object, the value does not
+ * matter */
/* (A, B) := (B, A mod B) ... */
A = B;
@@ -144,8 +143,8 @@ BIGNUM *bn_mod_inverse_no_branch(BIGNUM *in,
if (!BN_add(tmp, tmp, Y))
goto err;
- M = Y; /* keep the BIGNUM object, the value does not
- * matter */
+ M = Y; /* keep the BIGNUM object, the value does not
+ * matter */
Y = X;
X = tmp;
sign = -sign;
@@ -183,7 +182,7 @@ BIGNUM *bn_mod_inverse_no_branch(BIGNUM *in,
ret = R;
*pnoinv = 0;
- err:
+err:
if ((ret == NULL) && (in == NULL))
BN_free(R);
BN_CTX_end(ctx);
@@ -196,8 +195,8 @@ BIGNUM *bn_mod_inverse_no_branch(BIGNUM *in,
* all pointers passed here are assumed non-NULL.
*/
BIGNUM *int_bn_mod_inverse(BIGNUM *in,
- const BIGNUM *a, const BIGNUM *n, BN_CTX *ctx,
- int *pnoinv)
+ const BIGNUM *a, const BIGNUM *n, BN_CTX *ctx,
+ int *pnoinv)
{
BIGNUM *A, *B, *X, *Y, *M, *D, *T, *R = NULL;
BIGNUM *ret = NULL;
@@ -416,7 +415,7 @@ BIGNUM *int_bn_mod_inverse(BIGNUM *in,
* (**) sign*Y*a == D*B + M (mod |n|).
*/
- tmp = A; /* keep the BIGNUM object, the value does not matter */
+ tmp = A; /* keep the BIGNUM object, the value does not matter */
/* (A, B) := (B, A mod B) ... */
A = B;
@@ -469,7 +468,7 @@ BIGNUM *int_bn_mod_inverse(BIGNUM *in,
goto err;
}
- M = Y; /* keep the BIGNUM object, the value does not matter */
+ M = Y; /* keep the BIGNUM object, the value does not matter */
Y = X;
X = tmp;
sign = -sign;
@@ -504,7 +503,7 @@ BIGNUM *int_bn_mod_inverse(BIGNUM *in,
goto err;
}
ret = R;
- err:
+err:
if ((ret == NULL) && (in == NULL))
BN_free(R);
BN_CTX_end(ctx);
@@ -514,7 +513,7 @@ BIGNUM *int_bn_mod_inverse(BIGNUM *in,
/* solves ax == 1 (mod n) */
BIGNUM *BN_mod_inverse(BIGNUM *in,
- const BIGNUM *a, const BIGNUM *n, BN_CTX *ctx)
+ const BIGNUM *a, const BIGNUM *n, BN_CTX *ctx)
{
BN_CTX *new_ctx = NULL;
BIGNUM *rv;
@@ -621,7 +620,7 @@ int BN_gcd(BIGNUM *r, const BIGNUM *in_a, const BIGNUM *in_b, BN_CTX *ctx)
pow2_flag &= constant_time_is_zero_bn(pow2_numbits_temp);
pow2_shifts += (int)pow2_flag;
pow2_numbits = constant_time_select_bn(pow2_condition_mask,
- pow2_numbits, pow2_numbits_temp);
+ pow2_numbits, pow2_numbits_temp);
}
pow2_numbits = ~pow2_numbits;
pow2_shifts *= BN_BITS2;
@@ -670,7 +669,7 @@ int BN_gcd(BIGNUM *r, const BIGNUM *in_a, const BIGNUM *in_b, BN_CTX *ctx)
BN_consttime_swap((unsigned int)g->d[0] & 1 /* g is odd */
/* make sure g->top > 0 (i.e. if top == 0 then g == 0 always) */
& (~((unsigned int)(g->top - 1) >> (sizeof(g->top) * 8 - 1))),
- g, temp, top);
+ g, temp, top);
if (!BN_rshift1(g, g))
goto err;
}
@@ -684,7 +683,7 @@ int BN_gcd(BIGNUM *r, const BIGNUM *in_a, const BIGNUM *in_b, BN_CTX *ctx)
ret = 1;
- err:
+err:
BN_CTX_end(ctx);
bn_check_top(r);
return ret;
diff --git a/crypto/bn/bn_gf2m.c b/crypto/bn/bn_gf2m.c
index 01b757d5f3..7ca6587fb4 100644
--- a/crypto/bn/bn_gf2m.c
+++ b/crypto/bn/bn_gf2m.c
@@ -15,51 +15,42 @@
#include "bn_local.h"
#ifndef OPENSSL_NO_EC2M
-# include <openssl/ec.h>
+#include <openssl/ec.h>
/*
* Maximum number of iterations before BN_GF2m_mod_solve_quad_arr should
* fail.
*/
-# define MAX_ITERATIONS 50
-
-# define SQR_nibble(w) ((((w) & 8) << 3) \
- | (((w) & 4) << 2) \
- | (((w) & 2) << 1) \
- | ((w) & 1))
+#define MAX_ITERATIONS 50
+#define SQR_nibble(w) ((((w) & 8) << 3) \
+ | (((w) & 4) << 2) \
+ | (((w) & 2) << 1) \
+ | ((w) & 1))
/* Platform-specific macros to accelerate squaring. */
-# if defined(SIXTY_FOUR_BIT) || defined(SIXTY_FOUR_BIT_LONG)
-# define SQR1(w) \
- SQR_nibble((w) >> 60) << 56 | SQR_nibble((w) >> 56) << 48 | \
- SQR_nibble((w) >> 52) << 40 | SQR_nibble((w) >> 48) << 32 | \
- SQR_nibble((w) >> 44) << 24 | SQR_nibble((w) >> 40) << 16 | \
- SQR_nibble((w) >> 36) << 8 | SQR_nibble((w) >> 32)
-# define SQR0(w) \
- SQR_nibble((w) >> 28) << 56 | SQR_nibble((w) >> 24) << 48 | \
- SQR_nibble((w) >> 20) << 40 | SQR_nibble((w) >> 16) << 32 | \
- SQR_nibble((w) >> 12) << 24 | SQR_nibble((w) >> 8) << 16 | \
- SQR_nibble((w) >> 4) << 8 | SQR_nibble((w) )
-# endif
-# ifdef THIRTY_TWO_BIT
-# define SQR1(w) \
- SQR_nibble((w) >> 28) << 24 | SQR_nibble((w) >> 24) << 16 | \
- SQR_nibble((w) >> 20) << 8 | SQR_nibble((w) >> 16)
-# define SQR0(w) \
- SQR_nibble((w) >> 12) << 24 | SQR_nibble((w) >> 8) << 16 | \
- SQR_nibble((w) >> 4) << 8 | SQR_nibble((w) )
-# endif
-
-# if !defined(OPENSSL_BN_ASM_GF2m)
+#if defined(SIXTY_FOUR_BIT) || defined(SIXTY_FOUR_BIT_LONG)
+#define SQR1(w) \
+ SQR_nibble((w) >> 60) << 56 | SQR_nibble((w) >> 56) << 48 | SQR_nibble((w) >> 52) << 40 | SQR_nibble((w) >> 48) << 32 | SQR_nibble((w) >> 44) << 24 | SQR_nibble((w) >> 40) << 16 | SQR_nibble((w) >> 36) << 8 | SQR_nibble((w) >> 32)
+#define SQR0(w) \
+ SQR_nibble((w) >> 28) << 56 | SQR_nibble((w) >> 24) << 48 | SQR_nibble((w) >> 20) << 40 | SQR_nibble((w) >> 16) << 32 | SQR_nibble((w) >> 12) << 24 | SQR_nibble((w) >> 8) << 16 | SQR_nibble((w) >> 4) << 8 | SQR_nibble((w))
+#endif
+#ifdef THIRTY_TWO_BIT
+#define SQR1(w) \
+ SQR_nibble((w) >> 28) << 24 | SQR_nibble((w) >> 24) << 16 | SQR_nibble((w) >> 20) << 8 | SQR_nibble((w) >> 16)
+#define SQR0(w) \
+ SQR_nibble((w) >> 12) << 24 | SQR_nibble((w) >> 8) << 16 | SQR_nibble((w) >> 4) << 8 | SQR_nibble((w))
+#endif
+
+#if !defined(OPENSSL_BN_ASM_GF2m)
/*
* Product of two polynomials a, b each with degree < BN_BITS2 - 1, result is
* a polynomial r with degree < 2 * BN_BITS - 1 The caller MUST ensure that
* the variables have the right amount of space allocated.
*/
-# ifdef THIRTY_TWO_BIT
+#ifdef THIRTY_TWO_BIT
static void bn_GF2m_mul_1x1(BN_ULONG *r1, BN_ULONG *r0, const BN_ULONG a,
- const BN_ULONG b)
+ const BN_ULONG b)
{
register BN_ULONG h, l, s;
BN_ULONG tab[8], top2b = a >> 30;
@@ -125,10 +116,10 @@ static void bn_GF2m_mul_1x1(BN_ULONG *r1, BN_ULONG *r0, const BN_ULONG a,
*r1 = h;
*r0 = l;
}
-# endif
-# if defined(SIXTY_FOUR_BIT) || defined(SIXTY_FOUR_BIT_LONG)
+#endif
+#if defined(SIXTY_FOUR_BIT) || defined(SIXTY_FOUR_BIT_LONG)
static void bn_GF2m_mul_1x1(BN_ULONG *r1, BN_ULONG *r0, const BN_ULONG a,
- const BN_ULONG b)
+ const BN_ULONG b)
{
register BN_ULONG h, l, s;
BN_ULONG tab[16], top3b = a >> 61;
@@ -222,7 +213,7 @@ static void bn_GF2m_mul_1x1(BN_ULONG *r1, BN_ULONG *r0, const BN_ULONG a,
*r1 = h;
*r0 = l;
}
-# endif
+#endif
/*
* Product of two polynomials a, b each with degree < 2 * BN_BITS2 - 1,
@@ -230,7 +221,7 @@ static void bn_GF2m_mul_1x1(BN_ULONG *r1, BN_ULONG *r0, const BN_ULONG a,
* ensure that the variables have the right amount of space allocated.
*/
static void bn_GF2m_mul_2x2(BN_ULONG *r, const BN_ULONG a1, const BN_ULONG a0,
- const BN_ULONG b1, const BN_ULONG b0)
+ const BN_ULONG b1, const BN_ULONG b0)
{
BN_ULONG m1, m0;
/* r[3] = h1, r[2] = h0; r[1] = l1; r[0] = l0 */
@@ -238,13 +229,13 @@ static void bn_GF2m_mul_2x2(BN_ULONG *r, const BN_ULONG a1, const BN_ULONG a0,
bn_GF2m_mul_1x1(r + 1, r, a0, b0);
bn_GF2m_mul_1x1(&m1, &m0, a0 ^ a1, b0 ^ b1);
/* Correction on m1 ^= l1 ^ h1; m0 ^= l0 ^ h0; */
- r[2] ^= m1 ^ r[1] ^ r[3]; /* h0 ^= m1 ^ l1 ^ h1; */
+ r[2] ^= m1 ^ r[1] ^ r[3]; /* h0 ^= m1 ^ l1 ^ h1; */
r[1] = r[3] ^ r[2] ^ r[0] ^ m1 ^ m0; /* l1 ^= l0 ^ h0 ^ m0; */
}
-# else
+#else
void bn_GF2m_mul_2x2(BN_ULONG *r, BN_ULONG a1, BN_ULONG a0, BN_ULONG b1,
- BN_ULONG b0);
-# endif
+ BN_ULONG b0);
+#endif
/*
* Add polynomials a and b and store result in r; r could be a or b, a and b
@@ -362,7 +353,7 @@ int BN_GF2m_mod_arr(BIGNUM *r, const BIGNUM *a, const int p[])
z[dN] = (z[dN] << d1) >> d1;
else
z[dN] = 0;
- z[0] ^= zz; /* reduction t^0 component */
+ z[0] ^= zz; /* reduction t^0 component */
for (k = 1; p[k] != 0; k++) {
BN_ULONG tmp_ulong;
@@ -375,7 +366,6 @@ int BN_GF2m_mod_arr(BIGNUM *r, const BIGNUM *a, const int p[])
if (d0 && (tmp_ulong = zz >> d1))
z[n + 1] ^= tmp_ulong;
}
-
}
bn_correct_top(r);
@@ -409,7 +399,7 @@ int BN_GF2m_mod(BIGNUM *r, const BIGNUM *a, const BIGNUM *p)
* the result in r. r could be a or b; a could be b.
*/
int BN_GF2m_mod_mul_arr(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
- const int p[], BN_CTX *ctx)
+ const int p[], BN_CTX *ctx)
{
int zlen, i, j, k, ret = 0;
BIGNUM *s;
@@ -451,7 +441,7 @@ int BN_GF2m_mod_mul_arr(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
ret = 1;
bn_check_top(r);
- err:
+err:
BN_CTX_end(ctx);
return ret;
}
@@ -464,7 +454,7 @@ int BN_GF2m_mod_mul_arr(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
* BN_GF2m_mod_mul_arr function.
*/
int BN_GF2m_mod_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
- const BIGNUM *p, BN_CTX *ctx)
+ const BIGNUM *p, BN_CTX *ctx)
{
int ret = 0;
const int max = BN_num_bits(p) + 1;
@@ -484,14 +474,14 @@ int BN_GF2m_mod_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
}
ret = BN_GF2m_mod_mul_arr(r, a, b, arr, ctx);
bn_check_top(r);
- err:
+err:
OPENSSL_free(arr);
return ret;
}
/* Square a, reduce the result mod p, and store it in a. r could be a. */
int BN_GF2m_mod_sqr_arr(BIGNUM *r, const BIGNUM *a, const int p[],
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
int i, ret = 0;
BIGNUM *s;
@@ -514,7 +504,7 @@ int BN_GF2m_mod_sqr_arr(BIGNUM *r, const BIGNUM *a, const int p[],
goto err;
bn_check_top(r);
ret = 1;
- err:
+err:
BN_CTX_end(ctx);
return ret;
}
@@ -544,7 +534,7 @@ int BN_GF2m_mod_sqr(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
}
ret = BN_GF2m_mod_sqr_arr(r, a, arr, ctx);
bn_check_top(r);
- err:
+err:
OPENSSL_free(arr);
return ret;
}
@@ -556,7 +546,7 @@ int BN_GF2m_mod_sqr(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
* Curve Cryptography Over Binary Fields".
*/
static int BN_GF2m_mod_inv_vartime(BIGNUM *r, const BIGNUM *a,
- const BIGNUM *p, BN_CTX *ctx)
+ const BIGNUM *p, BN_CTX *ctx)
{
BIGNUM *b, *c = NULL, *u = NULL, *v = NULL, *tmp;
int ret = 0;
@@ -580,7 +570,7 @@ static int BN_GF2m_mod_inv_vartime(BIGNUM *r, const BIGNUM *a,
if (!BN_copy(v, p))
goto err;
-# if 0
+#if 0
if (!BN_one(b))
goto err;
@@ -615,7 +605,7 @@ static int BN_GF2m_mod_inv_vartime(BIGNUM *r, const BIGNUM *a,
if (!BN_GF2m_add(b, b, c))
goto err;
}
-# else
+#else
{
int i;
int ubits = BN_num_bits(u);
@@ -630,22 +620,22 @@ static int BN_GF2m_mod_inv_vartime(BIGNUM *r, const BIGNUM *a,
udp[i] = 0;
u->top = top;
if (!bn_wexpand(b, top))
- goto err;
+ goto err;
bdp = b->d;
bdp[0] = 1;
for (i = 1; i < top; i++)
bdp[i] = 0;
b->top = top;
if (!bn_wexpand(c, top))
- goto err;
+ goto err;
cdp = c->d;
for (i = 0; i < top; i++)
cdp[i] = 0;
c->top = top;
- vdp = v->d; /* It pays off to "cache" *->d pointers,
- * because it allows optimizer to be more
- * aggressive. But we don't have to "cache"
- * p->d, because *p is declared 'const'... */
+ vdp = v->d; /* It pays off to "cache" *->d pointers,
+ * because it allows optimizer to be more
+ * aggressive. But we don't have to "cache"
+ * p->d, because *p is declared 'const'... */
while (1) {
while (ubits && !(udp[0] & 1)) {
BN_ULONG u0, u1, b0, b1, mask;
@@ -704,20 +694,20 @@ static int BN_GF2m_mod_inv_vartime(BIGNUM *r, const BIGNUM *a,
}
bn_correct_top(b);
}
-# endif
+#endif
if (!BN_copy(r, b))
goto err;
bn_check_top(r);
ret = 1;
- err:
-# ifdef BN_DEBUG
+err:
+#ifdef BN_DEBUG
/* BN_CTX_end would complain about the expanded form */
bn_correct_top(c);
bn_correct_top(u);
bn_correct_top(v);
-# endif
+#endif
BN_CTX_end(ctx);
return ret;
}
@@ -745,7 +735,7 @@ int BN_GF2m_mod_inv(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
/* generate blinding value */
do {
if (!BN_priv_rand_ex(b, numbits - 1,
- BN_RAND_TOP_ANY, BN_RAND_BOTTOM_ANY, 0, ctx))
+ BN_RAND_TOP_ANY, BN_RAND_BOTTOM_ANY, 0, ctx))
goto err;
} while (BN_is_zero(b));
@@ -763,7 +753,7 @@ int BN_GF2m_mod_inv(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
ret = 1;
- err:
+err:
BN_CTX_end(ctx);
return ret;
}
@@ -775,7 +765,7 @@ int BN_GF2m_mod_inv(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
* use the BN_GF2m_mod_inv function.
*/
int BN_GF2m_mod_inv_arr(BIGNUM *r, const BIGNUM *xx, const int p[],
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
BIGNUM *field;
int ret = 0;
@@ -790,7 +780,7 @@ int BN_GF2m_mod_inv_arr(BIGNUM *r, const BIGNUM *xx, const int p[],
ret = BN_GF2m_mod_inv(r, xx, field, ctx);
bn_check_top(r);
- err:
+err:
BN_CTX_end(ctx);
return ret;
}
@@ -800,7 +790,7 @@ int BN_GF2m_mod_inv_arr(BIGNUM *r, const BIGNUM *xx, const int p[],
* or y, x could equal y.
*/
int BN_GF2m_mod_div(BIGNUM *r, const BIGNUM *y, const BIGNUM *x,
- const BIGNUM *p, BN_CTX *ctx)
+ const BIGNUM *p, BN_CTX *ctx)
{
BIGNUM *xinv = NULL;
int ret = 0;
@@ -821,7 +811,7 @@ int BN_GF2m_mod_div(BIGNUM *r, const BIGNUM *y, const BIGNUM *x,
bn_check_top(r);
ret = 1;
- err:
+err:
BN_CTX_end(ctx);
return ret;
}
@@ -833,7 +823,7 @@ int BN_GF2m_mod_div(BIGNUM *r, const BIGNUM *y, const BIGNUM *x,
* convenience; for best performance, use the BN_GF2m_mod_div function.
*/
int BN_GF2m_mod_div_arr(BIGNUM *r, const BIGNUM *yy, const BIGNUM *xx,
- const int p[], BN_CTX *ctx)
+ const int p[], BN_CTX *ctx)
{
BIGNUM *field;
int ret = 0;
@@ -850,7 +840,7 @@ int BN_GF2m_mod_div_arr(BIGNUM *r, const BIGNUM *yy, const BIGNUM *xx,
ret = BN_GF2m_mod_div(r, yy, xx, field, ctx);
bn_check_top(r);
- err:
+err:
BN_CTX_end(ctx);
return ret;
}
@@ -861,7 +851,7 @@ int BN_GF2m_mod_div_arr(BIGNUM *r, const BIGNUM *yy, const BIGNUM *xx,
* P1363.
*/
int BN_GF2m_mod_exp_arr(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
- const int p[], BN_CTX *ctx)
+ const int p[], BN_CTX *ctx)
{
int ret = 0, i, n;
BIGNUM *u;
@@ -895,7 +885,7 @@ int BN_GF2m_mod_exp_arr(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
goto err;
bn_check_top(r);
ret = 1;
- err:
+err:
BN_CTX_end(ctx);
return ret;
}
@@ -907,7 +897,7 @@ int BN_GF2m_mod_exp_arr(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
* for best performance, use the BN_GF2m_mod_exp_arr function.
*/
int BN_GF2m_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
- const BIGNUM *p, BN_CTX *ctx)
+ const BIGNUM *p, BN_CTX *ctx)
{
int ret = 0;
const int max = BN_num_bits(p) + 1;
@@ -927,7 +917,7 @@ int BN_GF2m_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
}
ret = BN_GF2m_mod_exp_arr(r, a, b, arr, ctx);
bn_check_top(r);
- err:
+err:
OPENSSL_free(arr);
return ret;
}
@@ -937,7 +927,7 @@ int BN_GF2m_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
* r could be a. Uses exponentiation as in algorithm A.4.1 from IEEE P1363.
*/
int BN_GF2m_mod_sqrt_arr(BIGNUM *r, const BIGNUM *a, const int p[],
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
int ret = 0;
BIGNUM *u;
@@ -959,7 +949,7 @@ int BN_GF2m_mod_sqrt_arr(BIGNUM *r, const BIGNUM *a, const int p[],
ret = BN_GF2m_mod_exp_arr(r, a, u, p, ctx);
bn_check_top(r);
- err:
+err:
BN_CTX_end(ctx);
return ret;
}
@@ -989,7 +979,7 @@ int BN_GF2m_mod_sqrt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
}
ret = BN_GF2m_mod_sqrt_arr(r, a, arr, ctx);
bn_check_top(r);
- err:
+err:
OPENSSL_free(arr);
return ret;
}
@@ -999,7 +989,7 @@ int BN_GF2m_mod_sqrt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
* 0. Uses algorithms A.4.7 and A.4.6 from IEEE P1363.
*/
int BN_GF2m_mod_solve_quad_arr(BIGNUM *r, const BIGNUM *a_, const int p[],
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
int ret = 0, count = 0, j;
BIGNUM *a, *z, *rho, *w, *w2, *tmp;
@@ -1028,7 +1018,7 @@ int BN_GF2m_mod_solve_quad_arr(BIGNUM *r, const BIGNUM *a_, const int p[],
goto err;
}
- if (p[0] & 0x1) { /* m is odd */
+ if (p[0] & 0x1) { /* m is odd */
/* compute half-trace of a */
if (!BN_copy(z, a))
goto err;
@@ -1041,7 +1031,7 @@ int BN_GF2m_mod_solve_quad_arr(BIGNUM *r, const BIGNUM *a_, const int p[],
goto err;
}
- } else { /* m is even */
+ } else { /* m is even */
rho = BN_CTX_get(ctx);
w2 = BN_CTX_get(ctx);
@@ -1050,7 +1040,7 @@ int BN_GF2m_mod_solve_quad_arr(BIGNUM *r, const BIGNUM *a_, const int p[],
goto err;
do {
if (!BN_priv_rand_ex(rho, p[0], BN_RAND_TOP_ONE, BN_RAND_BOTTOM_ANY,
- 0, ctx))
+ 0, ctx))
goto err;
if (!BN_GF2m_mod_arr(rho, rho, p))
goto err;
@@ -1092,7 +1082,7 @@ int BN_GF2m_mod_solve_quad_arr(BIGNUM *r, const BIGNUM *a_, const int p[],
ret = 1;
- err:
+err:
BN_CTX_end(ctx);
return ret;
}
@@ -1104,7 +1094,7 @@ int BN_GF2m_mod_solve_quad_arr(BIGNUM *r, const BIGNUM *a_, const int p[],
* for best performance, use the BN_GF2m_mod_solve_quad_arr function.
*/
int BN_GF2m_mod_solve_quad(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
int ret = 0;
const int max = BN_num_bits(p) + 1;
@@ -1123,7 +1113,7 @@ int BN_GF2m_mod_solve_quad(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
}
ret = BN_GF2m_mod_solve_quad_arr(r, a, arr, ctx);
bn_check_top(r);
- err:
+err:
OPENSSL_free(arr);
return ret;
}
diff --git a/crypto/bn/bn_intern.c b/crypto/bn/bn_intern.c
index b01c93c6f5..f963d42b86 100644
--- a/crypto/bn/bn_intern.c
+++ b/crypto/bn/bn_intern.c
@@ -36,14 +36,14 @@ signed char *bn_compute_wNAF(const BIGNUM *scalar, int w, size_t *ret_len)
return r;
}
- if (w <= 0 || w > 7) { /* 'signed char' can represent integers with
- * absolute values less than 2^7 */
+ if (w <= 0 || w > 7) { /* 'signed char' can represent integers with
+ * absolute values less than 2^7 */
ERR_raise(ERR_LIB_BN, ERR_R_INTERNAL_ERROR);
goto err;
}
- bit = 1 << w; /* at most 128 */
- next_bit = bit << 1; /* at most 256 */
- mask = next_bit - 1; /* at most 255 */
+ bit = 1 << w; /* at most 128 */
+ next_bit = bit << 1; /* at most 256 */
+ mask = next_bit - 1; /* at most 255 */
if (BN_is_negative(scalar)) {
sign = -1;
@@ -77,7 +77,7 @@ signed char *bn_compute_wNAF(const BIGNUM *scalar, int w, size_t *ret_len)
if (window_val & bit) {
digit = window_val - next_bit; /* -2^w < digit < 0 */
-#if 1 /* modified wNAF */
+#if 1 /* modified wNAF */
if (j + w + 1 >= len) {
/*
* Special case for generating modified wNAFs:
@@ -129,7 +129,7 @@ signed char *bn_compute_wNAF(const BIGNUM *scalar, int w, size_t *ret_len)
*ret_len = j;
return r;
- err:
+err:
OPENSSL_free(r);
return NULL;
}
diff --git a/crypto/bn/bn_kron.c b/crypto/bn/bn_kron.c
index 8258536dca..b24bdd1c07 100644
--- a/crypto/bn/bn_kron.c
+++ b/crypto/bn/bn_kron.c
@@ -11,13 +11,13 @@
#include "bn_local.h"
/* least significant word */
-#define BN_lsw(n) (((n)->top == 0) ? (BN_ULONG) 0 : (n)->d[0])
+#define BN_lsw(n) (((n)->top == 0) ? (BN_ULONG)0 : (n)->d[0])
/* Returns -2 for errors because both -1 and 0 are valid results. */
int BN_kronecker(const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
{
int i;
- int ret = -2; /* avoid 'uninitialized' warning */
+ int ret = -2; /* avoid 'uninitialized' warning */
int err = 0;
BIGNUM *A, *B, *tmp;
/*-
@@ -131,7 +131,7 @@ int BN_kronecker(const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
B = tmp;
tmp->neg = 0;
}
- end:
+end:
BN_CTX_end(ctx);
if (err)
return -2;
diff --git a/crypto/bn/bn_lib.c b/crypto/bn/bn_lib.c
index f830fe7335..618c59cb69 100644
--- a/crypto/bn/bn_lib.c
+++ b/crypto/bn/bn_lib.c
@@ -28,7 +28,7 @@
* 8 - 256 == 8192
*/
static int bn_limit_bits = 0;
-static int bn_limit_num = 8; /* (1<<bn_limit_bits) */
+static int bn_limit_num = 8; /* (1<<bn_limit_bits) */
static int bn_limit_bits_low = 0;
static int bn_limit_num_low = 8; /* (1<<bn_limit_bits_low) */
static int bn_limit_bits_high = 0;
@@ -94,9 +94,9 @@ const BIGNUM *BN_value_one(void)
* https://mta.openssl.org/pipermail/openssl-users/2018-August/008465.html
*/
#if defined(_MSC_VER) && defined(_ARM_) && defined(_WIN32_WCE) \
- && _MSC_VER>=1400 && _MSC_VER<1501
-# define MS_BROKEN_BN_num_bits_word
-# pragma optimize("", off)
+ && _MSC_VER >= 1400 && _MSC_VER < 1501
+#define MS_BROKEN_BN_num_bits_word
+#pragma optimize("", off)
#endif
int BN_num_bits_word(BN_ULONG l)
{
@@ -143,15 +143,14 @@ int BN_num_bits_word(BN_ULONG l)
return bits;
}
#ifdef MS_BROKEN_BN_num_bits_word
-# pragma optimize("", on)
+#pragma optimize("", on)
#endif
/*
* This function still leaks `a->dmax`: it's caller's responsibility to
* expand the input `a` in advance to a public length.
*/
-static ossl_inline
-int bn_num_bits_consttime(const BIGNUM *a)
+static ossl_inline int bn_num_bits_consttime(const BIGNUM *a)
{
int j, ret;
unsigned int mask, past_i;
@@ -210,7 +209,6 @@ static void bn_free_d(BIGNUM *a, int clear)
OPENSSL_free(a->d);
}
-
void BN_clear_free(BIGNUM *a)
{
if (a == NULL)
@@ -355,10 +353,7 @@ BIGNUM *BN_copy(BIGNUM *a, const BIGNUM *b)
return a;
}
-#define FLAGS_DATA(flags) ((flags) & (BN_FLG_STATIC_DATA \
- | BN_FLG_CONSTTIME \
- | BN_FLG_SECURE \
- | BN_FLG_FIXED_TOP))
+#define FLAGS_DATA(flags) ((flags) & (BN_FLG_STATIC_DATA | BN_FLG_CONSTTIME | BN_FLG_SECURE | BN_FLG_FIXED_TOP))
#define FLAGS_STRUCT(flags) ((flags) & (BN_FLG_MALLOCED))
void BN_swap(BIGNUM *a, BIGNUM *b)
@@ -429,11 +424,13 @@ int BN_set_word(BIGNUM *a, BN_ULONG w)
return 1;
}
-typedef enum {BIG, LITTLE} endianness_t;
-typedef enum {SIGNED, UNSIGNED} signedness_t;
+typedef enum { BIG,
+ LITTLE } endianness_t;
+typedef enum { SIGNED,
+ UNSIGNED } signedness_t;
static BIGNUM *bin2bn(const unsigned char *s, int len, BIGNUM *ret,
- endianness_t endianness, signedness_t signedness)
+ endianness_t endianness, signedness_t signedness)
{
int inc;
const unsigned char *s2;
@@ -489,7 +486,7 @@ static BIGNUM *bin2bn(const unsigned char *s, int len, BIGNUM *ret,
* Skip leading sign extensions (the value of |xor|).
* This is the only spot where |s2| and |inc2| are used.
*/
- for ( ; len > 0 && *s2 == xor; s2 += inc2, len--)
+ for (; len > 0 && *s2 == xor; s2 += inc2, len--)
continue;
/*
@@ -514,8 +511,8 @@ static BIGNUM *bin2bn(const unsigned char *s, int len, BIGNUM *ret,
ret->top = n;
ret->neg = neg;
for (i = 0; n-- > 0; i++) {
- BN_ULONG l = 0; /* Accumulator */
- unsigned int m = 0; /* Offset in a bignum chunk, in bits */
+ BN_ULONG l = 0; /* Accumulator */
+ unsigned int m = 0; /* Offset in a bignum chunk, in bits */
for (; len > 0 && m < BN_BYTES * 8; len--, s += inc, m += 8) {
BN_ULONG byte_xored = *s ^ xor;
@@ -545,7 +542,7 @@ BIGNUM *BN_signed_bin2bn(const unsigned char *s, int len, BIGNUM *ret)
}
static int bn2binpad(const BIGNUM *a, unsigned char *to, int tolen,
- endianness_t endianness, signedness_t signedness)
+ endianness_t endianness, signedness_t signedness)
{
int inc;
int n, n8;
@@ -559,7 +556,7 @@ static int bn2binpad(const BIGNUM *a, unsigned char *to, int tolen,
* even for padded output, so it works out...
*/
n8 = BN_num_bits(a);
- n = (n8 + 7) / 8; /* This is what BN_num_bytes() does */
+ n = (n8 + 7) / 8; /* This is what BN_num_bytes() does */
/* Take note of the signedness of the bignum */
if (signedness == SIGNED) {
@@ -573,8 +570,8 @@ static int bn2binpad(const BIGNUM *a, unsigned char *to, int tolen,
* to 2's complement.
*/
ext = (n * 8 == n8)
- ? !a->neg /* MSbit set on nonnegative bignum */
- : a->neg; /* MSbit unset on negative bignum */
+ ? !a->neg /* MSbit set on nonnegative bignum */
+ : a->neg; /* MSbit unset on negative bignum */
}
if (tolen == -1) {
@@ -584,7 +581,7 @@ static int bn2binpad(const BIGNUM *a, unsigned char *to, int tolen,
bn_correct_top(&temp);
n8 = BN_num_bits(&temp);
- n = (n8 + 7) / 8; /* This is what BN_num_bytes() does */
+ n = (n8 + 7) / 8; /* This is what BN_num_bytes() does */
if (tolen < n + ext)
return -1;
}
@@ -606,7 +603,7 @@ static int bn2binpad(const BIGNUM *a, unsigned char *to, int tolen,
inc = 1;
} else {
inc = -1;
- to += tolen - 1; /* Move to the last byte, not beyond */
+ to += tolen - 1; /* Move to the last byte, not beyond */
}
lasti = atop - 1;
@@ -715,14 +712,14 @@ int BN_ucmp(const BIGNUM *a, const BIGNUM *b)
bp = b->d;
if (BN_get_flags(a, BN_FLG_CONSTTIME)
- && a->top == b->top) {
+ && a->top == b->top) {
int res = 0;
for (i = 0; i < b->top; i++) {
res = constant_time_select_int((int)constant_time_lt_bn(ap[i], bp[i]),
- -1, res);
+ -1, res);
res = constant_time_select_int((int)constant_time_lt_bn(bp[i], ap[i]),
- 1, res);
+ 1, res);
}
return res;
}
@@ -923,13 +920,13 @@ int bn_cmp_part_words(const BN_ULONG *a, const BN_ULONG *b, int cl, int dl)
if (dl < 0) {
for (i = dl; i < 0; i++) {
if (b[n - i] != 0)
- return -1; /* a < b */
+ return -1; /* a < b */
}
}
if (dl > 0) {
for (i = dl; i > 0; i--) {
if (a[n + i] != 0)
- return 1; /* a > b */
+ return 1; /* a > b */
}
}
return bn_cmp_words(a, b, cl);
@@ -1062,7 +1059,7 @@ int ossl_bn_is_word_fixed_top(const BIGNUM *a, const BN_ULONG w)
for (i = 1; i < a->top; i++)
res = constant_time_select_int((int)constant_time_is_zero_bn(ap[i]),
- res, 0);
+ res, 0);
return res;
}
@@ -1077,7 +1074,7 @@ int BN_is_negative(const BIGNUM *a)
}
int BN_to_montgomery(BIGNUM *r, const BIGNUM *a, BN_MONT_CTX *mont,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
return BN_mod_mul_montgomery(r, a, &(mont->RR), mont, ctx);
}
@@ -1089,8 +1086,8 @@ void BN_with_flags(BIGNUM *dest, const BIGNUM *b, int flags)
dest->dmax = b->dmax;
dest->neg = b->neg;
dest->flags = ((dest->flags & BN_FLG_MALLOCED)
- | (b->flags & ~BN_FLG_MALLOCED)
- | BN_FLG_STATIC_DATA | flags);
+ | (b->flags & ~BN_FLG_MALLOCED)
+ | BN_FLG_STATIC_DATA | flags);
}
BN_GENCB *BN_GENCB_new(void)
@@ -1121,8 +1118,8 @@ int BN_get_flags(const BIGNUM *b, int n)
}
/* Populate a BN_GENCB structure with an "old"-style callback */
-void BN_GENCB_set_old(BN_GENCB *gencb, void (*callback) (int, int, void *),
- void *cb_arg)
+void BN_GENCB_set_old(BN_GENCB *gencb, void (*callback)(int, int, void *),
+ void *cb_arg)
{
BN_GENCB *tmp_gencb = gencb;
tmp_gencb->ver = 1;
@@ -1131,8 +1128,8 @@ void BN_GENCB_set_old(BN_GENCB *gencb, void (*callback) (int, int, void *),
}
/* Populate a BN_GENCB structure with a "new"-style callback */
-void BN_GENCB_set(BN_GENCB *gencb, int (*callback) (int, int, BN_GENCB *),
- void *cb_arg)
+void BN_GENCB_set(BN_GENCB *gencb, int (*callback)(int, int, BN_GENCB *),
+ void *cb_arg)
{
BN_GENCB *tmp_gencb = gencb;
tmp_gencb->ver = 2;
diff --git a/crypto/bn/bn_local.h b/crypto/bn/bn_local.h
index bb889d6116..e73cba1733 100644
--- a/crypto/bn/bn_local.h
+++ b/crypto/bn/bn_local.h
@@ -8,12 +8,12 @@
*/
#ifndef OSSL_CRYPTO_BN_LOCAL_H
-# define OSSL_CRYPTO_BN_LOCAL_H
+#define OSSL_CRYPTO_BN_LOCAL_H
-# include <openssl/opensslconf.h>
-# include "internal/cryptlib.h"
-# include "internal/numbers.h"
-# include "crypto/bn.h"
+#include <openssl/opensslconf.h>
+#include "internal/cryptlib.h"
+#include "internal/numbers.h"
+#include "crypto/bn.h"
/*
* These preprocessor symbols control various aspects of the bignum headers
@@ -25,12 +25,12 @@
* mismanagement of bignum internals. Enable BN_RAND_DEBUG is known to
* break some of the OpenSSL tests.
*/
-# if defined(BN_RAND_DEBUG) && !defined(BN_DEBUG)
-# define BN_DEBUG
-# endif
-# if defined(BN_RAND_DEBUG)
-# include <openssl/rand.h>
-# endif
+#if defined(BN_RAND_DEBUG) && !defined(BN_DEBUG)
+#define BN_DEBUG
+#endif
+#if defined(BN_RAND_DEBUG)
+#include <openssl/rand.h>
+#endif
/*
* This should limit the stack usage due to alloca to about 4K.
@@ -48,15 +48,15 @@
* "./config -DBN_SOFT_LIMIT=<limit>" if necessary, and the O/S specific
* stack limit is known and taken into consideration.
*/
-# ifndef BN_SOFT_LIMIT
-# define BN_SOFT_LIMIT (4096 / BN_BYTES)
-# endif
+#ifndef BN_SOFT_LIMIT
+#define BN_SOFT_LIMIT (4096 / BN_BYTES)
+#endif
-# ifndef OPENSSL_SMALL_FOOTPRINT
-# define BN_MUL_COMBA
-# define BN_SQR_COMBA
-# define BN_RECURSION
-# endif
+#ifndef OPENSSL_SMALL_FOOTPRINT
+#define BN_MUL_COMBA
+#define BN_SQR_COMBA
+#define BN_RECURSION
+#endif
/*
* This next option uses the C libraries (2 word)/(1 word) function. If it is
@@ -70,63 +70,61 @@
* this should be on. Again this in only really a problem on machines using
* "long long's", are 32bit, and are not using my assembler code.
*/
-# if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WINDOWS) || \
- defined(OPENSSL_SYS_WIN32) || defined(linux)
-# define BN_DIV2W
-# endif
+#if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) || defined(linux)
+#define BN_DIV2W
+#endif
/*
* 64-bit processor with LP64 ABI
*/
-# ifdef SIXTY_FOUR_BIT_LONG
-# define BN_ULLONG unsigned long long
-# define BN_BITS4 32
-# define BN_MASK2 (0xffffffffffffffffL)
-# define BN_MASK2l (0xffffffffL)
-# define BN_MASK2h (0xffffffff00000000L)
-# define BN_MASK2h1 (0xffffffff80000000L)
-# define BN_DEC_CONV (10000000000000000000UL)
-# define BN_DEC_NUM 19
-# define BN_DEC_FMT1 "%lu"
-# define BN_DEC_FMT2 "%019lu"
-# endif
+#ifdef SIXTY_FOUR_BIT_LONG
+#define BN_ULLONG unsigned long long
+#define BN_BITS4 32
+#define BN_MASK2 (0xffffffffffffffffL)
+#define BN_MASK2l (0xffffffffL)
+#define BN_MASK2h (0xffffffff00000000L)
+#define BN_MASK2h1 (0xffffffff80000000L)
+#define BN_DEC_CONV (10000000000000000000UL)
+#define BN_DEC_NUM 19
+#define BN_DEC_FMT1 "%lu"
+#define BN_DEC_FMT2 "%019lu"
+#endif
/*
* 64-bit processor other than LP64 ABI
*/
-# ifdef SIXTY_FOUR_BIT
-# undef BN_LLONG
-# undef BN_ULLONG
-# define BN_BITS4 32
-# define BN_MASK2 (0xffffffffffffffffLL)
-# define BN_MASK2l (0xffffffffL)
-# define BN_MASK2h (0xffffffff00000000LL)
-# define BN_MASK2h1 (0xffffffff80000000LL)
-# define BN_DEC_CONV (10000000000000000000ULL)
-# define BN_DEC_NUM 19
-# define BN_DEC_FMT1 "%llu"
-# define BN_DEC_FMT2 "%019llu"
-# endif
-
-# ifdef THIRTY_TWO_BIT
-# ifdef BN_LLONG
-# if defined(_WIN32) && !defined(__GNUC__)
-# define BN_ULLONG unsigned __int64
-# else
-# define BN_ULLONG unsigned long long
-# endif
-# endif
-# define BN_BITS4 16
-# define BN_MASK2 (0xffffffffL)
-# define BN_MASK2l (0xffff)
-# define BN_MASK2h1 (0xffff8000L)
-# define BN_MASK2h (0xffff0000L)
-# define BN_DEC_CONV (1000000000L)
-# define BN_DEC_NUM 9
-# define BN_DEC_FMT1 "%u"
-# define BN_DEC_FMT2 "%09u"
-# endif
+#ifdef SIXTY_FOUR_BIT
+#undef BN_LLONG
+#undef BN_ULLONG
+#define BN_BITS4 32
+#define BN_MASK2 (0xffffffffffffffffLL)
+#define BN_MASK2l (0xffffffffL)
+#define BN_MASK2h (0xffffffff00000000LL)
+#define BN_MASK2h1 (0xffffffff80000000LL)
+#define BN_DEC_CONV (10000000000000000000ULL)
+#define BN_DEC_NUM 19
+#define BN_DEC_FMT1 "%llu"
+#define BN_DEC_FMT2 "%019llu"
+#endif
+#ifdef THIRTY_TWO_BIT
+#ifdef BN_LLONG
+#if defined(_WIN32) && !defined(__GNUC__)
+#define BN_ULLONG unsigned __int64
+#else
+#define BN_ULLONG unsigned long long
+#endif
+#endif
+#define BN_BITS4 16
+#define BN_MASK2 (0xffffffffL)
+#define BN_MASK2l (0xffff)
+#define BN_MASK2h1 (0xffff8000L)
+#define BN_MASK2h (0xffff0000L)
+#define BN_DEC_CONV (1000000000L)
+#define BN_DEC_NUM 9
+#define BN_DEC_FMT1 "%u"
+#define BN_DEC_FMT2 "%09u"
+#endif
/*-
* Bignum consistency macros
@@ -157,10 +155,10 @@
* coverage for openssl's own code.
*/
-# ifdef BN_DEBUG
+#ifdef BN_DEBUG
/* ossl_assert() isn't fit for BN_DEBUG purposes, use assert() instead */
-# include <assert.h>
+#include <assert.h>
/*
* The new BN_FLG_FIXED_TOP flag marks vectors that were not treated with
@@ -171,97 +169,96 @@
* observe it anyway. Moreover, optimizing compiler would actually remove
* all operations manipulating the bit in question in non-BN_DEBUG build.
*/
-# define BN_FLG_FIXED_TOP 0x10000
-# ifdef BN_RAND_DEBUG
-# define bn_pollute(a) \
- do { \
- const BIGNUM *_bnum1 = (a); \
- if (_bnum1->top < _bnum1->dmax) { \
- unsigned char _tmp_char; \
- /* We cast away const without the compiler knowing, any \
- * *genuinely* constant variables that aren't mutable \
- * wouldn't be constructed with top!=dmax. */ \
- BN_ULONG *_not_const; \
- memcpy(&_not_const, &_bnum1->d, sizeof(_not_const)); \
- (void)RAND_bytes(&_tmp_char, 1); /* Debug only - safe to ignore error return */\
- memset(_not_const + _bnum1->top, _tmp_char, \
- sizeof(*_not_const) * (_bnum1->dmax - _bnum1->top)); \
- } \
- } while(0)
-# else
-# define bn_pollute(a)
-# endif
-# define bn_check_top(a) \
- do { \
- const BIGNUM *_bnum2 = (a); \
- if (_bnum2 != NULL) { \
- int _top = _bnum2->top; \
- if (_top == 0) { \
- assert(!_bnum2->neg); \
- } else if ((_bnum2->flags & BN_FLG_FIXED_TOP) == 0) { \
- assert(_bnum2->d[_top - 1] != 0); \
- } \
- bn_pollute(_bnum2); \
- } \
- } while(0)
-
-# define bn_fix_top(a) bn_check_top(a)
-
-# define bn_check_size(bn, bits) bn_wcheck_size(bn, ((bits+BN_BITS2-1))/BN_BITS2)
-# define bn_wcheck_size(bn, words) \
- do { \
- const BIGNUM *_bnum2 = (bn); \
- assert((words) <= (_bnum2)->dmax && \
- (words) >= (_bnum2)->top); \
- /* avoid unused variable warning with NDEBUG */ \
- (void)(_bnum2); \
- } while(0)
-
-# else /* !BN_DEBUG */
-
-# define BN_FLG_FIXED_TOP 0
-# define bn_pollute(a)
-# define bn_check_top(a)
-# define bn_fix_top(a) bn_correct_top(a)
-# define bn_check_size(bn, bits)
-# define bn_wcheck_size(bn, words)
-
-# endif
+#define BN_FLG_FIXED_TOP 0x10000
+#ifdef BN_RAND_DEBUG
+#define bn_pollute(a) \
+ do { \
+ const BIGNUM *_bnum1 = (a); \
+ if (_bnum1->top < _bnum1->dmax) { \
+ unsigned char _tmp_char; \
+ /* We cast away const without the compiler knowing, any \
+ * *genuinely* constant variables that aren't mutable \
+ * wouldn't be constructed with top!=dmax. */ \
+ BN_ULONG *_not_const; \
+ memcpy(&_not_const, &_bnum1->d, sizeof(_not_const)); \
+ (void)RAND_bytes(&_tmp_char, 1); /* Debug only - safe to ignore error return */ \
+ memset(_not_const + _bnum1->top, _tmp_char, \
+ sizeof(*_not_const) * (_bnum1->dmax - _bnum1->top)); \
+ } \
+ } while (0)
+#else
+#define bn_pollute(a)
+#endif
+#define bn_check_top(a) \
+ do { \
+ const BIGNUM *_bnum2 = (a); \
+ if (_bnum2 != NULL) { \
+ int _top = _bnum2->top; \
+ if (_top == 0) { \
+ assert(!_bnum2->neg); \
+ } else if ((_bnum2->flags & BN_FLG_FIXED_TOP) == 0) { \
+ assert(_bnum2->d[_top - 1] != 0); \
+ } \
+ bn_pollute(_bnum2); \
+ } \
+ } while (0)
+
+#define bn_fix_top(a) bn_check_top(a)
+
+#define bn_check_size(bn, bits) bn_wcheck_size(bn, ((bits + BN_BITS2 - 1)) / BN_BITS2)
+#define bn_wcheck_size(bn, words) \
+ do { \
+ const BIGNUM *_bnum2 = (bn); \
+ assert((words) <= (_bnum2)->dmax && (words) >= (_bnum2)->top); \
+ /* avoid unused variable warning with NDEBUG */ \
+ (void)(_bnum2); \
+ } while (0)
+
+#else /* !BN_DEBUG */
+
+#define BN_FLG_FIXED_TOP 0
+#define bn_pollute(a)
+#define bn_check_top(a)
+#define bn_fix_top(a) bn_correct_top(a)
+#define bn_check_size(bn, bits)
+#define bn_wcheck_size(bn, words)
+
+#endif
BN_ULONG bn_mul_add_words(BN_ULONG *rp, const BN_ULONG *ap, int num,
- BN_ULONG w);
+ BN_ULONG w);
BN_ULONG bn_mul_words(BN_ULONG *rp, const BN_ULONG *ap, int num, BN_ULONG w);
void bn_sqr_words(BN_ULONG *rp, const BN_ULONG *ap, int num);
BN_ULONG bn_div_words(BN_ULONG h, BN_ULONG l, BN_ULONG d);
BN_ULONG bn_add_words(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
- int num);
+ int num);
BN_ULONG bn_sub_words(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
- int num);
+ int num);
struct bignum_st {
- BN_ULONG *d; /*
- * Pointer to an array of 'BN_BITS2' bit
- * chunks. These chunks are organised in
- * a least significant chunk first order.
- */
- int top; /* Index of last used d +1. */
+ BN_ULONG *d; /*
+ * Pointer to an array of 'BN_BITS2' bit
+ * chunks. These chunks are organised in
+ * a least significant chunk first order.
+ */
+ int top; /* Index of last used d +1. */
/* The next are internal book keeping for bn_expand. */
- int dmax; /* Size of the d array. */
- int neg; /* one if the number is negative */
+ int dmax; /* Size of the d array. */
+ int neg; /* one if the number is negative */
int flags;
};
/* Used for montgomery multiplication */
struct bn_mont_ctx_st {
- BIGNUM RR; /* used to convert to montgomery form,
- possibly zero-padded */
- BIGNUM N; /* The modulus */
- BIGNUM Ni; /* R*(1/R mod N) - N*Ni = 1 (Ni is only
- * stored for bignum algorithm) */
- BN_ULONG n0[2]; /* least significant word(s) of Ni; (type
- * changed with 0.9.9, was "BN_ULONG n0;"
- * before) */
- int ri; /* number of bits in R */
+ BIGNUM RR; /* used to convert to montgomery form,
+ possibly zero-padded */
+ BIGNUM N; /* The modulus */
+ BIGNUM Ni; /* R*(1/R mod N) - N*Ni = 1 (Ni is only
+ * stored for bignum algorithm) */
+ BN_ULONG n0[2]; /* least significant word(s) of Ni; (type
+ * changed with 0.9.9, was "BN_ULONG n0;"
+ * before) */
+ int ri; /* number of bits in R */
int flags;
};
@@ -270,8 +267,8 @@ struct bn_mont_ctx_st {
* threads
*/
struct bn_recp_ctx_st {
- BIGNUM N; /* the divisor */
- BIGNUM Nr; /* the reciprocal */
+ BIGNUM N; /* the divisor */
+ BIGNUM Nr; /* the reciprocal */
int num_bits;
int shift;
int flags;
@@ -279,13 +276,13 @@ struct bn_recp_ctx_st {
/* Used for slow "generation" functions. */
struct bn_gencb_st {
- unsigned int ver; /* To handle binary (in)compatibility */
- void *arg; /* callback-specific data */
+ unsigned int ver; /* To handle binary (in)compatibility */
+ void *arg; /* callback-specific data */
union {
/* if (ver==1) - handles old style callbacks */
- void (*cb_1) (int, int, void *);
+ void (*cb_1)(int, int, void *);
/* if (ver==2) - new callback style */
- int (*cb_2) (int, int, BN_GENCB *);
+ int (*cb_2)(int, int, BN_GENCB *);
} cb;
};
@@ -314,18 +311,18 @@ struct bn_gencb_st {
* (with draws in between). Very small exponents are often selected
* with low Hamming weight, so we use w = 1 for b <= 23.
*/
-# define BN_window_bits_for_exponent_size(b) \
- ((b) > 671 ? 6 : \
- (b) > 239 ? 5 : \
- (b) > 79 ? 4 : \
- (b) > 23 ? 3 : 1)
+#define BN_window_bits_for_exponent_size(b) \
+ ((b) > 671 ? 6 : (b) > 239 ? 5 \
+ : (b) > 79 ? 4 \
+ : (b) > 23 ? 3 \
+ : 1)
/*
* BN_mod_exp_mont_consttime is based on the assumption that the L1 data cache
* line width of the target processor is at least the following value.
*/
-# define MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH ( 64 )
-# define MOD_EXP_CTIME_MIN_CACHE_LINE_MASK (MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH - 1)
+#define MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH (64)
+#define MOD_EXP_CTIME_MIN_CACHE_LINE_MASK (MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH - 1)
/*
* Window sizes optimized for fixed window size modular exponentiation
@@ -336,34 +333,34 @@ struct bn_gencb_st {
* log_2(32)=5 and log_2(64)=6 respectively. A window size of 7 should only be
* used on processors that have a 128 byte or greater cache line size.
*/
-# if MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH == 64
+#if MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH == 64
-# define BN_window_bits_for_ctime_exponent_size(b) \
- ((b) > 937 ? 6 : \
- (b) > 306 ? 5 : \
- (b) > 89 ? 4 : \
- (b) > 22 ? 3 : 1)
-# define BN_MAX_WINDOW_BITS_FOR_CTIME_EXPONENT_SIZE (6)
+#define BN_window_bits_for_ctime_exponent_size(b) \
+ ((b) > 937 ? 6 : (b) > 306 ? 5 \
+ : (b) > 89 ? 4 \
+ : (b) > 22 ? 3 \
+ : 1)
+#define BN_MAX_WINDOW_BITS_FOR_CTIME_EXPONENT_SIZE (6)
-# elif MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH == 32
+#elif MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH == 32
-# define BN_window_bits_for_ctime_exponent_size(b) \
- ((b) > 306 ? 5 : \
- (b) > 89 ? 4 : \
- (b) > 22 ? 3 : 1)
-# define BN_MAX_WINDOW_BITS_FOR_CTIME_EXPONENT_SIZE (5)
+#define BN_window_bits_for_ctime_exponent_size(b) \
+ ((b) > 306 ? 5 : (b) > 89 ? 4 \
+ : (b) > 22 ? 3 \
+ : 1)
+#define BN_MAX_WINDOW_BITS_FOR_CTIME_EXPONENT_SIZE (5)
-# endif
+#endif
/* Pentium pro 16,16,16,32,64 */
/* Alpha 16,16,16,16.64 */
-# define BN_MULL_SIZE_NORMAL (16)/* 32 */
-# define BN_MUL_RECURSIVE_SIZE_NORMAL (16)/* 32 less than */
-# define BN_SQR_RECURSIVE_SIZE_NORMAL (16)/* 32 */
-# define BN_MUL_LOW_RECURSIVE_SIZE_NORMAL (32)/* 32 */
-# define BN_MONT_CTX_SET_SIZE_WORD (64)/* 32 */
+#define BN_MULL_SIZE_NORMAL (16) /* 32 */
+#define BN_MUL_RECURSIVE_SIZE_NORMAL (16) /* 32 less than */
+#define BN_SQR_RECURSIVE_SIZE_NORMAL (16) /* 32 */
+#define BN_MUL_LOW_RECURSIVE_SIZE_NORMAL (32) /* 32 */
+#define BN_MONT_CTX_SET_SIZE_WORD (64) /* 32 */
-# if !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) && !defined(PEDANTIC)
+#if !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) && !defined(PEDANTIC)
/*
* BN_UMULT_HIGH section.
* If the compiler doesn't support 2*N integer type, then you have to
@@ -380,258 +377,273 @@ struct bn_gencb_st {
* what BN_UMULT_HIGH macro is about:-) Note that more recent compilers do
* support 2*64 integer type, which is also used here.
*/
-# if defined(__SIZEOF_INT128__) && __SIZEOF_INT128__==16 && \
- (defined(SIXTY_FOUR_BIT) || defined(SIXTY_FOUR_BIT_LONG))
-# define BN_UMULT_HIGH(a,b) (((uint128_t)(a)*(b))>>64)
-# define BN_UMULT_LOHI(low,high,a,b) ({ \
+#if defined(__SIZEOF_INT128__) && __SIZEOF_INT128__ == 16 && (defined(SIXTY_FOUR_BIT) || defined(SIXTY_FOUR_BIT_LONG))
+#define BN_UMULT_HIGH(a, b) (((uint128_t)(a) * (b)) >> 64)
+#define BN_UMULT_LOHI(low, high, a, b) ({ \
uint128_t ret=(uint128_t)(a)*(b); \
- (high)=ret>>64; (low)=ret; })
-# elif defined(__alpha) && (defined(SIXTY_FOUR_BIT_LONG) || defined(SIXTY_FOUR_BIT))
-# if defined(__DECC)
-# include <c_asm.h>
-# define BN_UMULT_HIGH(a,b) (BN_ULONG)asm("umulh %a0,%a1,%v0",(a),(b))
-# elif defined(__GNUC__) && __GNUC__>=2
-# define BN_UMULT_HIGH(a,b) ({ \
+ (high)=ret>>64; (low)=ret; })
+#elif defined(__alpha) && (defined(SIXTY_FOUR_BIT_LONG) || defined(SIXTY_FOUR_BIT))
+#if defined(__DECC)
+#include <c_asm.h>
+#define BN_UMULT_HIGH(a, b) (BN_ULONG) asm("umulh %a0,%a1,%v0", (a), (b))
+#elif defined(__GNUC__) && __GNUC__ >= 2
+#define BN_UMULT_HIGH(a, b) ({ \
register BN_ULONG ret; \
asm ("umulh %1,%2,%0" \
: "=r"(ret) \
: "r"(a), "r"(b)); \
- ret; })
-# endif /* compiler */
-# elif defined(_ARCH_PPC64) && defined(SIXTY_FOUR_BIT_LONG)
-# if defined(__GNUC__) && __GNUC__>=2
-# define BN_UMULT_HIGH(a,b) ({ \
+ ret; })
+#endif /* compiler */
+#elif defined(_ARCH_PPC64) && defined(SIXTY_FOUR_BIT_LONG)
+#if defined(__GNUC__) && __GNUC__ >= 2
+#define BN_UMULT_HIGH(a, b) ({ \
register BN_ULONG ret; \
asm ("mulhdu %0,%1,%2" \
: "=r"(ret) \
: "r"(a), "r"(b)); \
- ret; })
-# endif /* compiler */
-# elif (defined(__x86_64) || defined(__x86_64__)) && \
- (defined(SIXTY_FOUR_BIT_LONG) || defined(SIXTY_FOUR_BIT))
-# if defined(__GNUC__) && __GNUC__>=2
-# define BN_UMULT_HIGH(a,b) ({ \
+ ret; })
+#endif /* compiler */
+#elif (defined(__x86_64) || defined(__x86_64__)) && (defined(SIXTY_FOUR_BIT_LONG) || defined(SIXTY_FOUR_BIT))
+#if defined(__GNUC__) && __GNUC__ >= 2
+#define BN_UMULT_HIGH(a, b) ({ \
register BN_ULONG ret,discard; \
asm ("mulq %3" \
: "=a"(discard),"=d"(ret) \
: "a"(a), "g"(b) \
: "cc"); \
- ret; })
-# define BN_UMULT_LOHI(low,high,a,b) \
- asm ("mulq %3" \
- : "=a"(low),"=d"(high) \
- : "a"(a),"g"(b) \
- : "cc");
-# endif
-# elif (defined(_M_AMD64) || defined(_M_X64)) && defined(SIXTY_FOUR_BIT)
-# if defined(_MSC_VER) && _MSC_VER>=1400
+ ret; })
+#define BN_UMULT_LOHI(low, high, a, b) \
+ asm("mulq %3" \
+ : "=a"(low), "=d"(high) \
+ : "a"(a), "g"(b) \
+ : "cc");
+#endif
+#elif (defined(_M_AMD64) || defined(_M_X64)) && defined(SIXTY_FOUR_BIT)
+#if defined(_MSC_VER) && _MSC_VER >= 1400
unsigned __int64 __umulh(unsigned __int64 a, unsigned __int64 b);
unsigned __int64 _umul128(unsigned __int64 a, unsigned __int64 b,
- unsigned __int64 *h);
-# pragma intrinsic(__umulh,_umul128)
-# define BN_UMULT_HIGH(a,b) __umulh((a),(b))
-# define BN_UMULT_LOHI(low,high,a,b) ((low)=_umul128((a),(b),&(high)))
-# endif
-# elif defined(__mips) && (defined(SIXTY_FOUR_BIT) || defined(SIXTY_FOUR_BIT_LONG))
-# if defined(__GNUC__) && __GNUC__>=2
-# define BN_UMULT_HIGH(a,b) ({ \
+ unsigned __int64 *h);
+#pragma intrinsic(__umulh, _umul128)
+#define BN_UMULT_HIGH(a, b) __umulh((a), (b))
+#define BN_UMULT_LOHI(low, high, a, b) ((low) = _umul128((a), (b), &(high)))
+#endif
+#elif defined(__mips) && (defined(SIXTY_FOUR_BIT) || defined(SIXTY_FOUR_BIT_LONG))
+#if defined(__GNUC__) && __GNUC__ >= 2
+#define BN_UMULT_HIGH(a, b) ({ \
register BN_ULONG ret; \
asm ("dmultu %1,%2" \
: "=h"(ret) \
: "r"(a), "r"(b) : "l"); \
- ret; })
-# define BN_UMULT_LOHI(low,high,a,b) \
- asm ("dmultu %2,%3" \
- : "=l"(low),"=h"(high) \
- : "r"(a), "r"(b));
-# endif
-# elif defined(__aarch64__) && defined(SIXTY_FOUR_BIT_LONG)
-# if defined(__GNUC__) && __GNUC__>=2
-# define BN_UMULT_HIGH(a,b) ({ \
+ ret; })
+#define BN_UMULT_LOHI(low, high, a, b) \
+ asm("dmultu %2,%3" \
+ : "=l"(low), "=h"(high) \
+ : "r"(a), "r"(b));
+#endif
+#elif defined(__aarch64__) && defined(SIXTY_FOUR_BIT_LONG)
+#if defined(__GNUC__) && __GNUC__ >= 2
+#define BN_UMULT_HIGH(a, b) ({ \
register BN_ULONG ret; \
asm ("umulh %0,%1,%2" \
: "=r"(ret) \
: "r"(a), "r"(b)); \
- ret; })
-# endif
-# endif /* cpu */
-# endif /* OPENSSL_NO_ASM */
-
-# ifdef BN_RAND_DEBUG
-# define bn_clear_top2max(a) \
- { \
- int ind = (a)->dmax - (a)->top; \
- BN_ULONG *ftl = &(a)->d[(a)->top-1]; \
- for (; ind != 0; ind--) \
- *(++ftl) = 0x0; \
- }
-# else
-# define bn_clear_top2max(a)
-# endif
-
-# ifdef BN_LLONG
+ ret; })
+#endif
+#endif /* cpu */
+#endif /* OPENSSL_NO_ASM */
+
+#ifdef BN_RAND_DEBUG
+#define bn_clear_top2max(a) \
+ { \
+ int ind = (a)->dmax - (a)->top; \
+ BN_ULONG *ftl = &(a)->d[(a)->top - 1]; \
+ for (; ind != 0; ind--) \
+ *(++ftl) = 0x0; \
+ }
+#else
+#define bn_clear_top2max(a)
+#endif
+
+#ifdef BN_LLONG
/*******************************************************************
* Using the long long type, has to be twice as wide as BN_ULONG...
*/
-# define Lw(t) (((BN_ULONG)(t))&BN_MASK2)
-# define Hw(t) (((BN_ULONG)((t)>>BN_BITS2))&BN_MASK2)
-
-# define mul_add(r,a,w,c) { \
- BN_ULLONG t; \
- t=(BN_ULLONG)w * (a) + (r) + (c); \
- (r)= Lw(t); \
- (c)= Hw(t); \
- }
-
-# define mul(r,a,w,c) { \
- BN_ULLONG t; \
- t=(BN_ULLONG)w * (a) + (c); \
- (r)= Lw(t); \
- (c)= Hw(t); \
- }
-
-# define sqr(r0,r1,a) { \
- BN_ULLONG t; \
- t=(BN_ULLONG)(a)*(a); \
- (r0)=Lw(t); \
- (r1)=Hw(t); \
- }
-
-# elif defined(BN_UMULT_LOHI)
-# define mul_add(r,a,w,c) { \
- BN_ULONG high,low,ret,tmp=(a); \
- ret = (r); \
- BN_UMULT_LOHI(low,high,w,tmp); \
- ret += (c); \
- (c) = (ret<(c)); \
- (c) += high; \
- ret += low; \
- (c) += (ret<low); \
- (r) = ret; \
- }
-
-# define mul(r,a,w,c) { \
- BN_ULONG high,low,ret,ta=(a); \
- BN_UMULT_LOHI(low,high,w,ta); \
- ret = low + (c); \
- (c) = high; \
- (c) += (ret<low); \
- (r) = ret; \
- }
-
-# define sqr(r0,r1,a) { \
- BN_ULONG tmp=(a); \
- BN_UMULT_LOHI(r0,r1,tmp,tmp); \
- }
-
-# elif defined(BN_UMULT_HIGH)
-# define mul_add(r,a,w,c) { \
- BN_ULONG high,low,ret,tmp=(a); \
- ret = (r); \
- high= BN_UMULT_HIGH(w,tmp); \
- ret += (c); \
- low = (w) * tmp; \
- (c) = (ret<(c)); \
- (c) += high; \
- ret += low; \
- (c) += (ret<low); \
- (r) = ret; \
- }
-
-# define mul(r,a,w,c) { \
- BN_ULONG high,low,ret,ta=(a); \
- low = (w) * ta; \
- high= BN_UMULT_HIGH(w,ta); \
- ret = low + (c); \
- (c) = high; \
- (c) += (ret<low); \
- (r) = ret; \
- }
-
-# define sqr(r0,r1,a) { \
- BN_ULONG tmp=(a); \
+#define Lw(t) (((BN_ULONG)(t)) & BN_MASK2)
+#define Hw(t) (((BN_ULONG)((t) >> BN_BITS2)) & BN_MASK2)
+
+#define mul_add(r, a, w, c) \
+ { \
+ BN_ULLONG t; \
+ t = (BN_ULLONG)w * (a) + (r) + (c); \
+ (r) = Lw(t); \
+ (c) = Hw(t); \
+ }
+
+#define mul(r, a, w, c) \
+ { \
+ BN_ULLONG t; \
+ t = (BN_ULLONG)w * (a) + (c); \
+ (r) = Lw(t); \
+ (c) = Hw(t); \
+ }
+
+#define sqr(r0, r1, a) \
+ { \
+ BN_ULLONG t; \
+ t = (BN_ULLONG)(a) * (a); \
+ (r0) = Lw(t); \
+ (r1) = Hw(t); \
+ }
+
+#elif defined(BN_UMULT_LOHI)
+#define mul_add(r, a, w, c) \
+ { \
+ BN_ULONG high, low, ret, tmp = (a); \
+ ret = (r); \
+ BN_UMULT_LOHI(low, high, w, tmp); \
+ ret += (c); \
+ (c) = (ret < (c)); \
+ (c) += high; \
+ ret += low; \
+ (c) += (ret < low); \
+ (r) = ret; \
+ }
+
+#define mul(r, a, w, c) \
+ { \
+ BN_ULONG high, low, ret, ta = (a); \
+ BN_UMULT_LOHI(low, high, w, ta); \
+ ret = low + (c); \
+ (c) = high; \
+ (c) += (ret < low); \
+ (r) = ret; \
+ }
+
+#define sqr(r0, r1, a) \
+ { \
+ BN_ULONG tmp = (a); \
+ BN_UMULT_LOHI(r0, r1, tmp, tmp); \
+ }
+
+#elif defined(BN_UMULT_HIGH)
+#define mul_add(r, a, w, c) \
+ { \
+ BN_ULONG high, low, ret, tmp = (a); \
+ ret = (r); \
+ high = BN_UMULT_HIGH(w, tmp); \
+ ret += (c); \
+ low = (w) * tmp; \
+ (c) = (ret < (c)); \
+ (c) += high; \
+ ret += low; \
+ (c) += (ret < low); \
+ (r) = ret; \
+ }
+
+#define mul(r, a, w, c) \
+ { \
+ BN_ULONG high, low, ret, ta = (a); \
+ low = (w) * ta; \
+ high = BN_UMULT_HIGH(w, ta); \
+ ret = low + (c); \
+ (c) = high; \
+ (c) += (ret < low); \
+ (r) = ret; \
+ }
+
+#define sqr(r0, r1, a) \
+ { \
+ BN_ULONG tmp = (a); \
(r0) = tmp * tmp; \
- (r1) = BN_UMULT_HIGH(tmp,tmp); \
- }
+ (r1) = BN_UMULT_HIGH(tmp, tmp); \
+ }
-# else
+#else
/*************************************************************
* No long long type
*/
-# define LBITS(a) ((a)&BN_MASK2l)
-# define HBITS(a) (((a)>>BN_BITS4)&BN_MASK2l)
-# define L2HBITS(a) (((a)<<BN_BITS4)&BN_MASK2)
-
-# define LLBITS(a) ((a)&BN_MASKl)
-# define LHBITS(a) (((a)>>BN_BITS2)&BN_MASKl)
-# define LL2HBITS(a) ((BN_ULLONG)((a)&BN_MASKl)<<BN_BITS2)
-
-# define mul64(l,h,bl,bh) \
- { \
- BN_ULONG m,m1,lt,ht; \
- \
- lt=l; \
- ht=h; \
- m =(bh)*(lt); \
- lt=(bl)*(lt); \
- m1=(bl)*(ht); \
- ht =(bh)*(ht); \
- m=(m+m1)&BN_MASK2; ht += L2HBITS((BN_ULONG)(m < m1)); \
- ht+=HBITS(m); \
- m1=L2HBITS(m); \
- lt=(lt+m1)&BN_MASK2; ht += (lt < m1); \
- (l)=lt; \
- (h)=ht; \
- }
-
-# define sqr64(lo,ho,in) \
- { \
- BN_ULONG l,h,m; \
- \
- h=(in); \
- l=LBITS(h); \
- h=HBITS(h); \
- m =(l)*(h); \
- l*=l; \
- h*=h; \
- h+=(m&BN_MASK2h1)>>(BN_BITS4-1); \
- m =(m&BN_MASK2l)<<(BN_BITS4+1); \
- l=(l+m)&BN_MASK2; h += (l < m); \
- (lo)=l; \
- (ho)=h; \
- }
-
-# define mul_add(r,a,bl,bh,c) { \
- BN_ULONG l,h; \
- \
- h= (a); \
- l=LBITS(h); \
- h=HBITS(h); \
- mul64(l,h,(bl),(bh)); \
- \
- /* non-multiply part */ \
- l=(l+(c))&BN_MASK2; h += (l < (c)); \
- (c)=(r); \
- l=(l+(c))&BN_MASK2; h += (l < (c)); \
- (c)=h&BN_MASK2; \
- (r)=l; \
- }
-
-# define mul(r,a,bl,bh,c) { \
- BN_ULONG l,h; \
- \
- h= (a); \
- l=LBITS(h); \
- h=HBITS(h); \
- mul64(l,h,(bl),(bh)); \
- \
- /* non-multiply part */ \
- l+=(c); h += ((l&BN_MASK2) < (c)); \
- (c)=h&BN_MASK2; \
- (r)=l&BN_MASK2; \
- }
-# endif /* !BN_LLONG */
+#define LBITS(a) ((a) & BN_MASK2l)
+#define HBITS(a) (((a) >> BN_BITS4) & BN_MASK2l)
+#define L2HBITS(a) (((a) << BN_BITS4) & BN_MASK2)
+
+#define LLBITS(a) ((a) & BN_MASKl)
+#define LHBITS(a) (((a) >> BN_BITS2) & BN_MASKl)
+#define LL2HBITS(a) ((BN_ULLONG)((a) & BN_MASKl) << BN_BITS2)
+
+#define mul64(l, h, bl, bh) \
+ { \
+ BN_ULONG m, m1, lt, ht; \
+ \
+ lt = l; \
+ ht = h; \
+ m = (bh) * (lt); \
+ lt = (bl) * (lt); \
+ m1 = (bl) * (ht); \
+ ht = (bh) * (ht); \
+ m = (m + m1) & BN_MASK2; \
+ ht += L2HBITS((BN_ULONG)(m < m1)); \
+ ht += HBITS(m); \
+ m1 = L2HBITS(m); \
+ lt = (lt + m1) & BN_MASK2; \
+ ht += (lt < m1); \
+ (l) = lt; \
+ (h) = ht; \
+ }
+
+#define sqr64(lo, ho, in) \
+ { \
+ BN_ULONG l, h, m; \
+ \
+ h = (in); \
+ l = LBITS(h); \
+ h = HBITS(h); \
+ m = (l) * (h); \
+ l *= l; \
+ h *= h; \
+ h += (m & BN_MASK2h1) >> (BN_BITS4 - 1); \
+ m = (m & BN_MASK2l) << (BN_BITS4 + 1); \
+ l = (l + m) & BN_MASK2; \
+ h += (l < m); \
+ (lo) = l; \
+ (ho) = h; \
+ }
+
+#define mul_add(r, a, bl, bh, c) \
+ { \
+ BN_ULONG l, h; \
+ \
+ h = (a); \
+ l = LBITS(h); \
+ h = HBITS(h); \
+ mul64(l, h, (bl), (bh)); \
+ \
+ /* non-multiply part */ \
+ l = (l + (c)) & BN_MASK2; \
+ h += (l < (c)); \
+ (c) = (r); \
+ l = (l + (c)) & BN_MASK2; \
+ h += (l < (c)); \
+ (c) = h & BN_MASK2; \
+ (r) = l; \
+ }
+
+#define mul(r, a, bl, bh, c) \
+ { \
+ BN_ULONG l, h; \
+ \
+ h = (a); \
+ l = LBITS(h); \
+ h = HBITS(h); \
+ mul64(l, h, (bl), (bh)); \
+ \
+ /* non-multiply part */ \
+ l += (c); \
+ h += ((l & BN_MASK2) < (c)); \
+ (c) = h & BN_MASK2; \
+ (r) = l & BN_MASK2; \
+ }
+#endif /* !BN_LLONG */
void BN_RECP_CTX_init(BN_RECP_CTX *recp);
void BN_MONT_CTX_init(BN_MONT_CTX *ctx);
@@ -646,34 +658,34 @@ void bn_sqr_comba4(BN_ULONG *r, const BN_ULONG *a);
int bn_cmp_words(const BN_ULONG *a, const BN_ULONG *b, int n);
int bn_cmp_part_words(const BN_ULONG *a, const BN_ULONG *b, int cl, int dl);
void bn_mul_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n2,
- int dna, int dnb, BN_ULONG *t);
+ int dna, int dnb, BN_ULONG *t);
void bn_mul_part_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b,
- int n, int tna, int tnb, BN_ULONG *t);
+ int n, int tna, int tnb, BN_ULONG *t);
void bn_sqr_recursive(BN_ULONG *r, const BN_ULONG *a, int n2, BN_ULONG *t);
void bn_mul_low_normal(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n);
void bn_mul_low_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n2,
- BN_ULONG *t);
+ BN_ULONG *t);
BN_ULONG bn_sub_part_words(BN_ULONG *r, const BN_ULONG *a, const BN_ULONG *b,
- int cl, int dl);
+ int cl, int dl);
int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
- const BN_ULONG *np, const BN_ULONG *n0, int num);
+ const BN_ULONG *np, const BN_ULONG *n0, int num);
void bn_correct_top_consttime(BIGNUM *a);
BIGNUM *int_bn_mod_inverse(BIGNUM *in,
- const BIGNUM *a, const BIGNUM *n, BN_CTX *ctx,
- int *noinv);
+ const BIGNUM *a, const BIGNUM *n, BN_CTX *ctx,
+ int *noinv);
static ossl_inline BIGNUM *bn_expand(BIGNUM *a, int bits)
{
if (bits > (INT_MAX - BN_BITS2 + 1))
return NULL;
- if (((bits+BN_BITS2-1)/BN_BITS2) <= (a)->dmax)
+ if (((bits + BN_BITS2 - 1) / BN_BITS2) <= (a)->dmax)
return a;
- return bn_expand2((a),(bits+BN_BITS2-1)/BN_BITS2);
+ return bn_expand2((a), (bits + BN_BITS2 - 1) / BN_BITS2);
}
int ossl_bn_check_prime(const BIGNUM *w, int checks, BN_CTX *ctx,
- int do_trial_division, BN_GENCB *cb);
+ int do_trial_division, BN_GENCB *cb);
#endif
diff --git a/crypto/bn/bn_mod.c b/crypto/bn/bn_mod.c
index 3506edbe2d..ae08729545 100644
--- a/crypto/bn/bn_mod.c
+++ b/crypto/bn/bn_mod.c
@@ -28,11 +28,11 @@ int BN_nnmod(BIGNUM *r, const BIGNUM *m, const BIGNUM *d, BN_CTX *ctx)
if (!r->neg)
return 1;
/* now -|d| < r < 0, so we have to set r := r + |d| */
- return (d->neg ? BN_sub : BN_add) (r, r, d);
+ return (d->neg ? BN_sub : BN_add)(r, r, d);
}
int BN_mod_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
if (!BN_add(r, a, b))
return 0;
@@ -52,7 +52,7 @@ int BN_mod_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m,
* move depending on whether or not subtraction borrowed.
*/
int bn_mod_add_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
- const BIGNUM *m)
+ const BIGNUM *m)
{
size_t i, ai, bi, mtop = m->top;
BN_ULONG storage[1024 / BN_BITS2];
@@ -101,7 +101,7 @@ int bn_mod_add_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
}
int BN_mod_add_quick(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
- const BIGNUM *m)
+ const BIGNUM *m)
{
int ret = bn_mod_add_fixed_top(r, a, b, m);
@@ -112,7 +112,7 @@ int BN_mod_add_quick(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
}
int BN_mod_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
if (!BN_sub(r, a, b))
return 0;
@@ -134,7 +134,7 @@ int BN_mod_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m,
* Thus it takes up to two conditional additions to make |r| positive.
*/
int bn_mod_sub_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
- const BIGNUM *m)
+ const BIGNUM *m)
{
size_t i, ai, bi, mtop = m->top;
BN_ULONG borrow, carry, ta, tb, mask, *rp;
@@ -188,7 +188,7 @@ int bn_mod_sub_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
* less than m
*/
int BN_mod_sub_quick(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
- const BIGNUM *m)
+ const BIGNUM *m)
{
if (r == m) {
ERR_raise(ERR_LIB_BN, ERR_R_PASSED_INVALID_ARGUMENT);
@@ -204,7 +204,7 @@ int BN_mod_sub_quick(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
/* slow but works */
int BN_mod_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
BIGNUM *t;
int ret = 0;
@@ -227,7 +227,7 @@ int BN_mod_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m,
goto err;
bn_check_top(r);
ret = 1;
- err:
+err:
BN_CTX_end(ctx);
return ret;
}
@@ -263,7 +263,7 @@ int BN_mod_lshift1_quick(BIGNUM *r, const BIGNUM *a, const BIGNUM *m)
}
int BN_mod_lshift(BIGNUM *r, const BIGNUM *a, int n, const BIGNUM *m,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
BIGNUM *abs_m = NULL;
int ret;
diff --git a/crypto/bn/bn_mont.c b/crypto/bn/bn_mont.c
index 86cf891ff1..384e64c3f8 100644
--- a/crypto/bn/bn_mont.c
+++ b/crypto/bn/bn_mont.c
@@ -17,14 +17,14 @@
#include "internal/cryptlib.h"
#include "bn_local.h"
-#define MONT_WORD /* use the faster word-based algorithm */
+#define MONT_WORD /* use the faster word-based algorithm */
#ifdef MONT_WORD
static int bn_from_montgomery_word(BIGNUM *ret, BIGNUM *r, BN_MONT_CTX *mont);
#endif
int BN_mod_mul_montgomery(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
- BN_MONT_CTX *mont, BN_CTX *ctx)
+ BN_MONT_CTX *mont, BN_CTX *ctx)
{
int ret = bn_mul_mont_fixed_top(r, a, b, mont, ctx);
@@ -35,7 +35,7 @@ int BN_mod_mul_montgomery(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
}
int bn_mul_mont_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
- BN_MONT_CTX *mont, BN_CTX *ctx)
+ BN_MONT_CTX *mont, BN_CTX *ctx)
{
BIGNUM *tmp;
int ret = 0;
@@ -79,7 +79,7 @@ int bn_mul_mont_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
goto err;
#endif
ret = 1;
- err:
+err:
BN_CTX_end(ctx);
return ret;
}
@@ -99,7 +99,7 @@ static int bn_from_montgomery_word(BIGNUM *ret, BIGNUM *r, BN_MONT_CTX *mont)
return 1;
}
- max = (2 * nl); /* carry is stored separately */
+ max = (2 * nl); /* carry is stored separately */
if (bn_wexpand(r, max) == NULL)
return 0;
@@ -157,10 +157,10 @@ static int bn_from_montgomery_word(BIGNUM *ret, BIGNUM *r, BN_MONT_CTX *mont)
return 1;
}
-#endif /* MONT_WORD */
+#endif /* MONT_WORD */
int BN_from_montgomery(BIGNUM *ret, const BIGNUM *a, BN_MONT_CTX *mont,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
int retn;
@@ -172,7 +172,7 @@ int BN_from_montgomery(BIGNUM *ret, const BIGNUM *a, BN_MONT_CTX *mont,
}
int bn_from_mont_fixed_top(BIGNUM *ret, const BIGNUM *a, BN_MONT_CTX *mont,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
int retn = 0;
#ifdef MONT_WORD
@@ -183,7 +183,7 @@ int bn_from_mont_fixed_top(BIGNUM *ret, const BIGNUM *a, BN_MONT_CTX *mont,
retn = bn_from_montgomery_word(ret, t, mont);
}
BN_CTX_end(ctx);
-#else /* !MONT_WORD */
+#else /* !MONT_WORD */
BIGNUM *t1, *t2;
BN_CTX_start(ctx);
@@ -213,14 +213,14 @@ int bn_from_mont_fixed_top(BIGNUM *ret, const BIGNUM *a, BN_MONT_CTX *mont,
}
retn = 1;
bn_check_top(ret);
- err:
+err:
BN_CTX_end(ctx);
-#endif /* MONT_WORD */
+#endif /* MONT_WORD */
return retn;
}
int bn_to_mont_fixed_top(BIGNUM *r, const BIGNUM *a, BN_MONT_CTX *mont,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
return bn_mul_mont_fixed_top(r, a, &(mont->RR), mont, ctx);
}
@@ -269,9 +269,9 @@ int BN_MONT_CTX_set(BN_MONT_CTX *mont, const BIGNUM *mod, BN_CTX *ctx)
BN_CTX_start(ctx);
if ((Ri = BN_CTX_get(ctx)) == NULL)
goto err;
- R = &(mont->RR); /* grab RR as a temp */
+ R = &(mont->RR); /* grab RR as a temp */
if (!BN_copy(&(mont->N), mod))
- goto err; /* Set N */
+ goto err; /* Set N */
if (BN_get_flags(mod, BN_FLG_CONSTTIME) != 0)
BN_set_flags(&(mont->N), BN_FLG_CONSTTIME);
mont->N.neg = 0;
@@ -291,7 +291,7 @@ int BN_MONT_CTX_set(BN_MONT_CTX *mont, const BIGNUM *mod, BN_CTX *ctx)
mont->ri = (BN_num_bits(mod) + (BN_BITS2 - 1)) / BN_BITS2 * BN_BITS2;
-# if defined(OPENSSL_BN_ASM_MONT) && (BN_BITS2<=32)
+#if defined(OPENSSL_BN_ASM_MONT) && (BN_BITS2 <= 32)
/*
* Only certain BN_BITS2<=32 platforms actually make use of n0[1],
* and we could use the #else case (with a shorter R value) for the
@@ -314,11 +314,11 @@ int BN_MONT_CTX_set(BN_MONT_CTX *mont, const BIGNUM *mod, BN_CTX *ctx)
else if ((BN_mod_inverse(Ri, R, &tmod, ctx)) == NULL)
goto err;
if (!BN_lshift(Ri, Ri, 2 * BN_BITS2))
- goto err; /* R*Ri */
+ goto err; /* R*Ri */
if (!BN_is_zero(Ri)) {
if (!BN_sub_word(Ri, 1))
goto err;
- } else { /* if N mod word size == 1 */
+ } else { /* if N mod word size == 1 */
if (bn_expand(Ri, (int)sizeof(BN_ULONG) * 2) == NULL)
goto err;
@@ -335,12 +335,12 @@ int BN_MONT_CTX_set(BN_MONT_CTX *mont, const BIGNUM *mod, BN_CTX *ctx)
*/
mont->n0[0] = (Ri->top > 0) ? Ri->d[0] : 0;
mont->n0[1] = (Ri->top > 1) ? Ri->d[1] : 0;
-# else
+#else
BN_zero(R);
if (!(BN_set_bit(R, BN_BITS2)))
- goto err; /* R */
+ goto err; /* R */
- buf[0] = mod->d[0]; /* tmod = N mod word size */
+ buf[0] = mod->d[0]; /* tmod = N mod word size */
buf[1] = 0;
tmod.top = buf[0] != 0 ? 1 : 0;
/* Ri = R^-1 mod N */
@@ -349,14 +349,14 @@ int BN_MONT_CTX_set(BN_MONT_CTX *mont, const BIGNUM *mod, BN_CTX *ctx)
else if ((BN_mod_inverse(Ri, R, &tmod, ctx)) == NULL)
goto err;
if (!BN_lshift(Ri, Ri, BN_BITS2))
- goto err; /* R*Ri */
+ goto err; /* R*Ri */
if (!BN_is_zero(Ri)) {
if (!BN_sub_word(Ri, 1))
goto err;
- } else { /* if N mod word size == 1 */
+ } else { /* if N mod word size == 1 */
if (!BN_set_word(Ri, BN_MASK2))
- goto err; /* Ri-- (mod word size) */
+ goto err; /* Ri-- (mod word size) */
}
if (!BN_div(Ri, NULL, Ri, &tmod, ctx))
goto err;
@@ -365,19 +365,19 @@ int BN_MONT_CTX_set(BN_MONT_CTX *mont, const BIGNUM *mod, BN_CTX *ctx)
*/
mont->n0[0] = (Ri->top > 0) ? Ri->d[0] : 0;
mont->n0[1] = 0;
-# endif
+#endif
}
-#else /* !MONT_WORD */
- { /* bignum version */
+#else /* !MONT_WORD */
+ { /* bignum version */
mont->ri = BN_num_bits(&mont->N);
BN_zero(R);
if (!BN_set_bit(R, mont->ri))
- goto err; /* R = 2^ri */
+ goto err; /* R = 2^ri */
/* Ri = R^-1 mod N */
if ((BN_mod_inverse(Ri, R, &mont->N, ctx)) == NULL)
goto err;
if (!BN_lshift(Ri, Ri, mont->ri))
- goto err; /* R*Ri */
+ goto err; /* R*Ri */
if (!BN_sub_word(Ri, 1))
goto err;
/*
@@ -401,7 +401,7 @@ int BN_MONT_CTX_set(BN_MONT_CTX *mont, const BIGNUM *mod, BN_CTX *ctx)
mont->RR.flags |= BN_FLG_FIXED_TOP;
ret = 1;
- err:
+err:
BN_CTX_end(ctx);
return ret;
}
@@ -424,7 +424,7 @@ BN_MONT_CTX *BN_MONT_CTX_copy(BN_MONT_CTX *to, BN_MONT_CTX *from)
}
BN_MONT_CTX *BN_MONT_CTX_set_locked(BN_MONT_CTX **pmont, CRYPTO_RWLOCK *lock,
- const BIGNUM *mod, BN_CTX *ctx)
+ const BIGNUM *mod, BN_CTX *ctx)
{
BN_MONT_CTX *ret;
@@ -467,7 +467,7 @@ BN_MONT_CTX *BN_MONT_CTX_set_locked(BN_MONT_CTX **pmont, CRYPTO_RWLOCK *lock,
}
int ossl_bn_mont_ctx_set(BN_MONT_CTX *ctx, const BIGNUM *modulus, int ri, const unsigned char *rr,
- int rrlen, uint32_t nlo, uint32_t nhi)
+ int rrlen, uint32_t nlo, uint32_t nhi)
{
if (BN_copy(&ctx->N, modulus) == NULL)
return 0;
@@ -481,7 +481,7 @@ int ossl_bn_mont_ctx_set(BN_MONT_CTX *ctx, const BIGNUM *modulus, int ri, const
ctx->n0[0] = nlo;
ctx->n0[1] = 0;
#else
- ctx->n0[0] = ((BN_ULONG)nhi << 32)| nlo;
+ ctx->n0[0] = ((BN_ULONG)nhi << 32) | nlo;
ctx->n0[1] = 0;
#endif
diff --git a/crypto/bn/bn_mpi.c b/crypto/bn/bn_mpi.c
index 4eba0ae570..d2a86a3ead 100644
--- a/crypto/bn/bn_mpi.c
+++ b/crypto/bn/bn_mpi.c
@@ -49,8 +49,7 @@ BIGNUM *BN_mpi2bn(const unsigned char *d, int n, BIGNUM *ain)
ERR_raise(ERR_LIB_BN, BN_R_INVALID_LENGTH);
return NULL;
}
- len = ((long)d[0] << 24) | ((long)d[1] << 16) | ((int)d[2] << 8) | (int)
- d[3];
+ len = ((long)d[0] << 24) | ((long)d[1] << 16) | ((int)d[2] << 8) | (int)d[3];
if ((len + 4) != n) {
ERR_raise(ERR_LIB_BN, BN_R_ENCODING_ERROR);
return NULL;
diff --git a/crypto/bn/bn_mul.c b/crypto/bn/bn_mul.c
index c3864b8c69..ff4bf2ca25 100644
--- a/crypto/bn/bn_mul.c
+++ b/crypto/bn/bn_mul.c
@@ -25,8 +25,8 @@
*/
BN_ULONG bn_sub_part_words(BN_ULONG *r,
- const BN_ULONG *a, const BN_ULONG *b,
- int cl, int dl)
+ const BN_ULONG *a, const BN_ULONG *b,
+ int cl, int dl)
{
BN_ULONG c, t;
@@ -173,20 +173,20 @@ BN_ULONG bn_sub_part_words(BN_ULONG *r,
*/
/* dnX may not be positive, but n2/2+dnX has to be */
void bn_mul_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n2,
- int dna, int dnb, BN_ULONG *t)
+ int dna, int dnb, BN_ULONG *t)
{
int n = n2 / 2, c1, c2;
int tna = n + dna, tnb = n + dnb;
unsigned int neg, zero;
BN_ULONG ln, lo, *p;
-# ifdef BN_MUL_COMBA
-# if 0
+#ifdef BN_MUL_COMBA
+#if 0
if (n2 == 4) {
bn_mul_comba4(r, a, b);
return;
}
-# endif
+#endif
/*
* Only call bn_mul_comba 8 if n2 == 8 and the two arrays are complete
* [steve]
@@ -195,13 +195,13 @@ void bn_mul_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n2,
bn_mul_comba8(r, a, b);
return;
}
-# endif /* BN_MUL_COMBA */
+#endif /* BN_MUL_COMBA */
/* Else do normal multiply */
if (n2 < BN_MUL_RECURSIVE_SIZE_NORMAL) {
bn_mul_normal(r, a, n2 + dna, b, n2 + dnb);
if ((dna + dnb) < 0)
memset(&r[2 * n2 + dna + dnb], 0,
- sizeof(BN_ULONG) * -(dna + dnb));
+ sizeof(BN_ULONG) * -(dna + dnb));
return;
}
/* r=(a[0]-a[1])*(b[1]-b[0]) */
@@ -240,7 +240,7 @@ void bn_mul_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n2,
break;
}
-# ifdef BN_MUL_COMBA
+#ifdef BN_MUL_COMBA
if (n == 4 && dna == 0 && dnb == 0) { /* XXX: bn_mul_comba4 could take
* extra args to do this well */
if (!zero)
@@ -261,7 +261,7 @@ void bn_mul_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n2,
bn_mul_comba8(r, a, b);
bn_mul_comba8(&(r[n2]), &(a[n]), &(b[n]));
} else
-# endif /* BN_MUL_COMBA */
+#endif /* BN_MUL_COMBA */
{
p = &(t[n2 * 2]);
if (!zero)
@@ -280,7 +280,7 @@ void bn_mul_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n2,
c1 = (int)(bn_add_words(t, r, &(r[n2]), n2));
- if (neg) { /* if t[32] is negative */
+ if (neg) { /* if t[32] is negative */
c1 -= (int)(bn_sub_words(&(t[n2]), t, &(t[n2]), n2));
} else {
/* Might have a carry */
@@ -320,7 +320,7 @@ void bn_mul_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n2,
*/
/* tnX may not be negative but less than n */
void bn_mul_part_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n,
- int tna, int tnb, BN_ULONG *t)
+ int tna, int tnb, BN_ULONG *t)
{
int i, j, n2 = n * 2;
int c1, c2, neg;
@@ -364,14 +364,14 @@ void bn_mul_part_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n,
* The zero case isn't yet implemented here. The speedup would probably
* be negligible.
*/
-# if 0
+#if 0
if (n == 4) {
bn_mul_comba4(&(t[n2]), t, &(t[n]));
bn_mul_comba4(r, a, b);
bn_mul_normal(&(r[n2]), &(a[n]), tn, &(b[n]), tn);
memset(&r[n2 + tn * 2], 0, sizeof(*r) * (n2 - tn * 2));
} else
-# endif
+#endif
if (n == 8) {
bn_mul_comba8(&(t[n2]), t, &(t[n]));
bn_mul_comba8(r, a, b);
@@ -391,14 +391,14 @@ void bn_mul_part_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n,
j = tnb - i;
if (j == 0) {
bn_mul_recursive(&(r[n2]), &(a[n]), &(b[n]),
- i, tna - i, tnb - i, p);
+ i, tna - i, tnb - i, p);
memset(&r[n2 + i * 2], 0, sizeof(*r) * (n2 - i * 2));
- } else if (j > 0) { /* eg, n == 16, i == 8 and tn == 11 */
+ } else if (j > 0) { /* eg, n == 16, i == 8 and tn == 11 */
bn_mul_part_recursive(&(r[n2]), &(a[n]), &(b[n]),
- i, tna - i, tnb - i, p);
+ i, tna - i, tnb - i, p);
memset(&(r[n2 + tna + tnb]), 0,
- sizeof(BN_ULONG) * (n2 - tna - tnb));
- } else { /* (j < 0) eg, n == 16, i == 8 and tn == 5 */
+ sizeof(BN_ULONG) * (n2 - tna - tnb));
+ } else { /* (j < 0) eg, n == 16, i == 8 and tn == 5 */
memset(&r[n2], 0, sizeof(*r) * n2);
if (tna < BN_MUL_RECURSIVE_SIZE_NORMAL
@@ -413,13 +413,13 @@ void bn_mul_part_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n,
*/
if (i < tna || i < tnb) {
bn_mul_part_recursive(&(r[n2]),
- &(a[n]), &(b[n]),
- i, tna - i, tnb - i, p);
+ &(a[n]), &(b[n]),
+ i, tna - i, tnb - i, p);
break;
} else if (i == tna || i == tnb) {
bn_mul_recursive(&(r[n2]),
- &(a[n]), &(b[n]),
- i, tna - i, tnb - i, p);
+ &(a[n]), &(b[n]),
+ i, tna - i, tnb - i, p);
break;
}
}
@@ -435,7 +435,7 @@ void bn_mul_part_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n,
c1 = (int)(bn_add_words(t, r, &(r[n2]), n2));
- if (neg) { /* if t[32] is negative */
+ if (neg) { /* if t[32] is negative */
c1 -= (int)(bn_sub_words(&(t[n2]), t, &(t[n2]), n2));
} else {
/* Might have a carry */
@@ -475,7 +475,7 @@ void bn_mul_part_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n,
* r needs to be n2 words and t needs to be n2*2
*/
void bn_mul_low_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n2,
- BN_ULONG *t)
+ BN_ULONG *t)
{
int n = n2 / 2;
@@ -492,7 +492,7 @@ void bn_mul_low_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n2,
bn_add_words(&(r[n]), &(r[n]), &(t[n]), n);
}
}
-#endif /* BN_RECURSION */
+#endif /* BN_RECURSION */
int BN_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
{
@@ -542,7 +542,7 @@ int bn_mul_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
#endif
#ifdef BN_MUL_COMBA
if (i == 0) {
-# if 0
+#if 0
if (al == 4) {
if (bn_wexpand(rr, 8) == NULL)
goto err;
@@ -550,7 +550,7 @@ int bn_mul_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
bn_mul_comba4(rr->d, a->d, b->d);
goto end;
}
-# endif
+#endif
if (al == 8) {
if (bn_wexpand(rr, 16) == NULL)
goto err;
@@ -559,7 +559,7 @@ int bn_mul_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
goto end;
}
}
-#endif /* BN_MUL_COMBA */
+#endif /* BN_MUL_COMBA */
#ifdef BN_RECURSION
if ((al >= BN_MULL_SIZE_NORMAL) && (bl >= BN_MULL_SIZE_NORMAL)) {
if (i >= -1 && i <= 1) {
@@ -585,8 +585,8 @@ int bn_mul_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
if (bn_wexpand(rr, k * 4) == NULL)
goto err;
bn_mul_part_recursive(rr->d, a->d, b->d,
- j, al - j, bl - j, t->d);
- } else { /* al <= j || bl <= j */
+ j, al - j, bl - j, t->d);
+ } else { /* al <= j || bl <= j */
if (bn_wexpand(t, k * 2) == NULL)
goto err;
@@ -598,14 +598,14 @@ int bn_mul_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
goto end;
}
}
-#endif /* BN_RECURSION */
+#endif /* BN_RECURSION */
if (bn_wexpand(rr, top) == NULL)
goto err;
rr->top = top;
bn_mul_normal(rr->d, a->d, al, b->d, bl);
#if defined(BN_MUL_COMBA) || defined(BN_RECURSION)
- end:
+end:
#endif
rr->neg = a->neg ^ b->neg;
rr->flags |= BN_FLG_FIXED_TOP;
@@ -613,7 +613,7 @@ int bn_mul_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
goto err;
ret = 1;
- err:
+err:
bn_check_top(r);
BN_CTX_end(ctx);
return ret;
@@ -633,7 +633,6 @@ void bn_mul_normal(BN_ULONG *r, BN_ULONG *a, int na, BN_ULONG *b, int nb)
ltmp = a;
a = b;
b = ltmp;
-
}
rr = &(r[na]);
if (nb <= 0) {
diff --git a/crypto/bn/bn_nist.c b/crypto/bn/bn_nist.c
index 527ecb34d8..aa084996e4 100644
--- a/crypto/bn/bn_nist.c
+++ b/crypto/bn/bn_nist.c
@@ -10,18 +10,18 @@
#include "bn_local.h"
#include "internal/cryptlib.h"
-#define BN_NIST_192_TOP (192+BN_BITS2-1)/BN_BITS2
-#define BN_NIST_224_TOP (224+BN_BITS2-1)/BN_BITS2
-#define BN_NIST_256_TOP (256+BN_BITS2-1)/BN_BITS2
-#define BN_NIST_384_TOP (384+BN_BITS2-1)/BN_BITS2
-#define BN_NIST_521_TOP (521+BN_BITS2-1)/BN_BITS2
+#define BN_NIST_192_TOP (192 + BN_BITS2 - 1) / BN_BITS2
+#define BN_NIST_224_TOP (224 + BN_BITS2 - 1) / BN_BITS2
+#define BN_NIST_256_TOP (256 + BN_BITS2 - 1) / BN_BITS2
+#define BN_NIST_384_TOP (384 + BN_BITS2 - 1) / BN_BITS2
+#define BN_NIST_521_TOP (521 + BN_BITS2 - 1) / BN_BITS2
/* pre-computed tables are "carry-less" values of modulus*(i+1) */
#if BN_BITS2 == 64
static const BN_ULONG _nist_p_192[][BN_NIST_192_TOP] = {
- {0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFEULL, 0xFFFFFFFFFFFFFFFFULL},
- {0xFFFFFFFFFFFFFFFEULL, 0xFFFFFFFFFFFFFFFDULL, 0xFFFFFFFFFFFFFFFFULL},
- {0xFFFFFFFFFFFFFFFDULL, 0xFFFFFFFFFFFFFFFCULL, 0xFFFFFFFFFFFFFFFFULL}
+ { 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFEULL, 0xFFFFFFFFFFFFFFFFULL },
+ { 0xFFFFFFFFFFFFFFFEULL, 0xFFFFFFFFFFFFFFFDULL, 0xFFFFFFFFFFFFFFFFULL },
+ { 0xFFFFFFFFFFFFFFFDULL, 0xFFFFFFFFFFFFFFFCULL, 0xFFFFFFFFFFFFFFFFULL }
};
static const BN_ULONG _nist_p_192_sqr[] = {
@@ -30,11 +30,11 @@ static const BN_ULONG _nist_p_192_sqr[] = {
};
static const BN_ULONG _nist_p_224[][BN_NIST_224_TOP] = {
- {0x0000000000000001ULL, 0xFFFFFFFF00000000ULL,
- 0xFFFFFFFFFFFFFFFFULL, 0x00000000FFFFFFFFULL},
- {0x0000000000000002ULL, 0xFFFFFFFE00000000ULL,
- 0xFFFFFFFFFFFFFFFFULL, 0x00000001FFFFFFFFULL} /* this one is
- * "carry-full" */
+ { 0x0000000000000001ULL, 0xFFFFFFFF00000000ULL,
+ 0xFFFFFFFFFFFFFFFFULL, 0x00000000FFFFFFFFULL },
+ { 0x0000000000000002ULL, 0xFFFFFFFE00000000ULL,
+ 0xFFFFFFFFFFFFFFFFULL, 0x00000001FFFFFFFFULL } /* this one is
+ * "carry-full" */
};
static const BN_ULONG _nist_p_224_sqr[] = {
@@ -45,16 +45,16 @@ static const BN_ULONG _nist_p_224_sqr[] = {
};
static const BN_ULONG _nist_p_256[][BN_NIST_256_TOP] = {
- {0xFFFFFFFFFFFFFFFFULL, 0x00000000FFFFFFFFULL,
- 0x0000000000000000ULL, 0xFFFFFFFF00000001ULL},
- {0xFFFFFFFFFFFFFFFEULL, 0x00000001FFFFFFFFULL,
- 0x0000000000000000ULL, 0xFFFFFFFE00000002ULL},
- {0xFFFFFFFFFFFFFFFDULL, 0x00000002FFFFFFFFULL,
- 0x0000000000000000ULL, 0xFFFFFFFD00000003ULL},
- {0xFFFFFFFFFFFFFFFCULL, 0x00000003FFFFFFFFULL,
- 0x0000000000000000ULL, 0xFFFFFFFC00000004ULL},
- {0xFFFFFFFFFFFFFFFBULL, 0x00000004FFFFFFFFULL,
- 0x0000000000000000ULL, 0xFFFFFFFB00000005ULL},
+ { 0xFFFFFFFFFFFFFFFFULL, 0x00000000FFFFFFFFULL,
+ 0x0000000000000000ULL, 0xFFFFFFFF00000001ULL },
+ { 0xFFFFFFFFFFFFFFFEULL, 0x00000001FFFFFFFFULL,
+ 0x0000000000000000ULL, 0xFFFFFFFE00000002ULL },
+ { 0xFFFFFFFFFFFFFFFDULL, 0x00000002FFFFFFFFULL,
+ 0x0000000000000000ULL, 0xFFFFFFFD00000003ULL },
+ { 0xFFFFFFFFFFFFFFFCULL, 0x00000003FFFFFFFFULL,
+ 0x0000000000000000ULL, 0xFFFFFFFC00000004ULL },
+ { 0xFFFFFFFFFFFFFFFBULL, 0x00000004FFFFFFFFULL,
+ 0x0000000000000000ULL, 0xFFFFFFFB00000005ULL },
};
static const BN_ULONG _nist_p_256_sqr[] = {
@@ -65,16 +65,16 @@ static const BN_ULONG _nist_p_256_sqr[] = {
};
static const BN_ULONG _nist_p_384[][BN_NIST_384_TOP] = {
- {0x00000000FFFFFFFFULL, 0xFFFFFFFF00000000ULL, 0xFFFFFFFFFFFFFFFEULL,
- 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL},
- {0x00000001FFFFFFFEULL, 0xFFFFFFFE00000000ULL, 0xFFFFFFFFFFFFFFFDULL,
- 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL},
- {0x00000002FFFFFFFDULL, 0xFFFFFFFD00000000ULL, 0xFFFFFFFFFFFFFFFCULL,
- 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL},
- {0x00000003FFFFFFFCULL, 0xFFFFFFFC00000000ULL, 0xFFFFFFFFFFFFFFFBULL,
- 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL},
- {0x00000004FFFFFFFBULL, 0xFFFFFFFB00000000ULL, 0xFFFFFFFFFFFFFFFAULL,
- 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL},
+ { 0x00000000FFFFFFFFULL, 0xFFFFFFFF00000000ULL, 0xFFFFFFFFFFFFFFFEULL,
+ 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL },
+ { 0x00000001FFFFFFFEULL, 0xFFFFFFFE00000000ULL, 0xFFFFFFFFFFFFFFFDULL,
+ 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL },
+ { 0x00000002FFFFFFFDULL, 0xFFFFFFFD00000000ULL, 0xFFFFFFFFFFFFFFFCULL,
+ 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL },
+ { 0x00000003FFFFFFFCULL, 0xFFFFFFFC00000000ULL, 0xFFFFFFFFFFFFFFFBULL,
+ 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL },
+ { 0x00000004FFFFFFFBULL, 0xFFFFFFFB00000000ULL, 0xFFFFFFFFFFFFFFFAULL,
+ 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL },
};
static const BN_ULONG _nist_p_384_sqr[] = {
@@ -102,9 +102,9 @@ static const BN_ULONG _nist_p_521_sqr[] = {
};
#elif BN_BITS2 == 32
static const BN_ULONG _nist_p_192[][BN_NIST_192_TOP] = {
- {0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF},
- {0xFFFFFFFE, 0xFFFFFFFF, 0xFFFFFFFD, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF},
- {0xFFFFFFFD, 0xFFFFFFFF, 0xFFFFFFFC, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF}
+ { 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
+ { 0xFFFFFFFE, 0xFFFFFFFF, 0xFFFFFFFD, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
+ { 0xFFFFFFFD, 0xFFFFFFFF, 0xFFFFFFFC, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF }
};
static const BN_ULONG _nist_p_192_sqr[] = {
@@ -113,10 +113,10 @@ static const BN_ULONG _nist_p_192_sqr[] = {
};
static const BN_ULONG _nist_p_224[][BN_NIST_224_TOP] = {
- {0x00000001, 0x00000000, 0x00000000, 0xFFFFFFFF,
- 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF},
- {0x00000002, 0x00000000, 0x00000000, 0xFFFFFFFE,
- 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF}
+ { 0x00000001, 0x00000000, 0x00000000, 0xFFFFFFFF,
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
+ { 0x00000002, 0x00000000, 0x00000000, 0xFFFFFFFE,
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF }
};
static const BN_ULONG _nist_p_224_sqr[] = {
@@ -127,16 +127,16 @@ static const BN_ULONG _nist_p_224_sqr[] = {
};
static const BN_ULONG _nist_p_256[][BN_NIST_256_TOP] = {
- {0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000,
- 0x00000000, 0x00000000, 0x00000001, 0xFFFFFFFF},
- {0xFFFFFFFE, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000001,
- 0x00000000, 0x00000000, 0x00000002, 0xFFFFFFFE},
- {0xFFFFFFFD, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000002,
- 0x00000000, 0x00000000, 0x00000003, 0xFFFFFFFD},
- {0xFFFFFFFC, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000003,
- 0x00000000, 0x00000000, 0x00000004, 0xFFFFFFFC},
- {0xFFFFFFFB, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000004,
- 0x00000000, 0x00000000, 0x00000005, 0xFFFFFFFB},
+ { 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000,
+ 0x00000000, 0x00000000, 0x00000001, 0xFFFFFFFF },
+ { 0xFFFFFFFE, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000001,
+ 0x00000000, 0x00000000, 0x00000002, 0xFFFFFFFE },
+ { 0xFFFFFFFD, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000002,
+ 0x00000000, 0x00000000, 0x00000003, 0xFFFFFFFD },
+ { 0xFFFFFFFC, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000003,
+ 0x00000000, 0x00000000, 0x00000004, 0xFFFFFFFC },
+ { 0xFFFFFFFB, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000004,
+ 0x00000000, 0x00000000, 0x00000005, 0xFFFFFFFB },
};
static const BN_ULONG _nist_p_256_sqr[] = {
@@ -147,16 +147,16 @@ static const BN_ULONG _nist_p_256_sqr[] = {
};
static const BN_ULONG _nist_p_384[][BN_NIST_384_TOP] = {
- {0xFFFFFFFF, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFF,
- 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF},
- {0xFFFFFFFE, 0x00000001, 0x00000000, 0xFFFFFFFE, 0xFFFFFFFD, 0xFFFFFFFF,
- 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF},
- {0xFFFFFFFD, 0x00000002, 0x00000000, 0xFFFFFFFD, 0xFFFFFFFC, 0xFFFFFFFF,
- 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF},
- {0xFFFFFFFC, 0x00000003, 0x00000000, 0xFFFFFFFC, 0xFFFFFFFB, 0xFFFFFFFF,
- 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF},
- {0xFFFFFFFB, 0x00000004, 0x00000000, 0xFFFFFFFB, 0xFFFFFFFA, 0xFFFFFFFF,
- 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF},
+ { 0xFFFFFFFF, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFF,
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
+ { 0xFFFFFFFE, 0x00000001, 0x00000000, 0xFFFFFFFE, 0xFFFFFFFD, 0xFFFFFFFF,
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
+ { 0xFFFFFFFD, 0x00000002, 0x00000000, 0xFFFFFFFD, 0xFFFFFFFC, 0xFFFFFFFF,
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
+ { 0xFFFFFFFC, 0x00000003, 0x00000000, 0xFFFFFFFC, 0xFFFFFFFB, 0xFFFFFFFF,
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
+ { 0xFFFFFFFB, 0x00000004, 0x00000000, 0xFFFFFFFB, 0xFFFFFFFA, 0xFFFFFFFF,
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
};
static const BN_ULONG _nist_p_384_sqr[] = {
@@ -169,8 +169,7 @@ static const BN_ULONG _nist_p_384_sqr[] = {
static const BN_ULONG _nist_p_521[] = { 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
- 0xFFFFFFFF, 0x000001FF
-};
+ 0xFFFFFFFF, 0x000001FF };
static const BN_ULONG _nist_p_521_sqr[] = {
0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -181,7 +180,7 @@ static const BN_ULONG _nist_p_521_sqr[] = {
0xFFFFFFFF, 0xFFFFFFFF, 0x0003FFFF
};
#else
-# error "unsupported BN_BITS2"
+#error "unsupported BN_BITS2"
#endif
static const BIGNUM ossl_bignum_nist_p_192 = {
@@ -263,15 +262,15 @@ const BIGNUM *BN_get0_nist_prime_521(void)
* paid for making it a macro.
*/
#define nist_cp_bn_0(dst, src_in, top, max) \
-{ \
- int ii; \
- const BN_ULONG *src = src_in; \
+ { \
+ int ii; \
+ const BN_ULONG *src = src_in; \
\
- for (ii = 0; ii < top; ii++) \
- (dst)[ii] = src[ii]; \
- for (; ii < max; ii++) \
- (dst)[ii] = 0; \
-}
+ for (ii = 0; ii < top; ii++) \
+ (dst)[ii] = src[ii]; \
+ for (; ii < max; ii++) \
+ (dst)[ii] = 0; \
+ }
static void nist_cp_bn(BN_ULONG *dst, const BN_ULONG *src, int top)
{
@@ -282,42 +281,42 @@ static void nist_cp_bn(BN_ULONG *dst, const BN_ULONG *src, int top)
}
#if BN_BITS2 == 64
-# define bn_cp_64(to, n, from, m) (to)[n] = (m>=0)?((from)[m]):0;
-# define bn_64_set_0(to, n) (to)[n] = (BN_ULONG)0;
+#define bn_cp_64(to, n, from, m) (to)[n] = (m >= 0) ? ((from)[m]) : 0;
+#define bn_64_set_0(to, n) (to)[n] = (BN_ULONG)0;
/*
* two following macros are implemented under assumption that they
* are called in a sequence with *ascending* n, i.e. as they are...
*/
-# define bn_cp_32_naked(to, n, from, m) (((n)&1)?(to[(n)/2]|=((m)&1)?(from[(m)/2]&BN_MASK2h):(from[(m)/2]<<32))\
- :(to[(n)/2] =((m)&1)?(from[(m)/2]>>32):(from[(m)/2]&BN_MASK2l)))
-# define bn_32_set_0(to, n) (((n)&1)?(to[(n)/2]&=BN_MASK2l):(to[(n)/2]=0));
-# define bn_cp_32(to,n,from,m) ((m)>=0)?bn_cp_32_naked(to,n,from,m):bn_32_set_0(to,n)
-# if defined(L_ENDIAN)
-# if defined(__arch64__)
-# define NIST_INT64 long
-# else
-# define NIST_INT64 long long
-# endif
-# endif
+#define bn_cp_32_naked(to, n, from, m) (((n) & 1) ? (to[(n) / 2] |= ((m) & 1) ? (from[(m) / 2] & BN_MASK2h) : (from[(m) / 2] << 32)) \
+ : (to[(n) / 2] = ((m) & 1) ? (from[(m) / 2] >> 32) : (from[(m) / 2] & BN_MASK2l)))
+#define bn_32_set_0(to, n) (((n) & 1) ? (to[(n) / 2] &= BN_MASK2l) : (to[(n) / 2] = 0));
+#define bn_cp_32(to, n, from, m) ((m) >= 0) ? bn_cp_32_naked(to, n, from, m) : bn_32_set_0(to, n)
+#if defined(L_ENDIAN)
+#if defined(__arch64__)
+#define NIST_INT64 long
#else
-# define bn_cp_64(to, n, from, m) \
- { \
- bn_cp_32(to, (n)*2, from, (m)*2); \
- bn_cp_32(to, (n)*2+1, from, (m)*2+1); \
- }
-# define bn_64_set_0(to, n) \
- { \
- bn_32_set_0(to, (n)*2); \
- bn_32_set_0(to, (n)*2+1); \
- }
-# define bn_cp_32(to, n, from, m) (to)[n] = (m>=0)?((from)[m]):0;
-# define bn_32_set_0(to, n) (to)[n] = (BN_ULONG)0;
-# if defined(_WIN32) && !defined(__GNUC__)
-# define NIST_INT64 __int64
-# elif defined(BN_LLONG)
-# define NIST_INT64 long long
-# endif
-#endif /* BN_BITS2 != 64 */
+#define NIST_INT64 long long
+#endif
+#endif
+#else
+#define bn_cp_64(to, n, from, m) \
+ { \
+ bn_cp_32(to, (n) * 2, from, (m) * 2); \
+ bn_cp_32(to, (n) * 2 + 1, from, (m) * 2 + 1); \
+ }
+#define bn_64_set_0(to, n) \
+ { \
+ bn_32_set_0(to, (n) * 2); \
+ bn_32_set_0(to, (n) * 2 + 1); \
+ }
+#define bn_cp_32(to, n, from, m) (to)[n] = (m >= 0) ? ((from)[m]) : 0;
+#define bn_32_set_0(to, n) (to)[n] = (BN_ULONG)0;
+#if defined(_WIN32) && !defined(__GNUC__)
+#define NIST_INT64 __int64
+#elif defined(BN_LLONG)
+#define NIST_INT64 long long
+#endif
+#endif /* BN_BITS2 != 64 */
#ifdef NIST_INT64
/* Helpers to load/store a 32-bit word (uint32_t) from/into a memory
@@ -341,23 +340,22 @@ static ossl_inline void store_lo32(void *ptr, NIST_INT64 val)
}
#endif /* NIST_INT64 */
-#define nist_set_192(to, from, a1, a2, a3) \
- { \
- bn_cp_64(to, 0, from, (a3) - 3) \
- bn_cp_64(to, 1, from, (a2) - 3) \
- bn_cp_64(to, 2, from, (a1) - 3) \
- }
+#define nist_set_192(to, from, a1, a2, a3) \
+ { \
+ bn_cp_64(to, 0, from, (a3) - 3) \
+ bn_cp_64(to, 1, from, (a2) - 3) \
+ bn_cp_64(to, 2, from, (a1) - 3) \
+ }
int BN_nist_mod_192(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
int top = a->top, i;
int carry;
register BN_ULONG *r_d, *a_d = a->d;
union {
BN_ULONG bn[BN_NIST_192_TOP];
- unsigned int ui[BN_NIST_192_TOP * sizeof(BN_ULONG) /
- sizeof(unsigned int)];
+ unsigned int ui[BN_NIST_192_TOP * sizeof(BN_ULONG) / sizeof(unsigned int)];
} buf;
BN_ULONG c_d[BN_NIST_192_TOP], *res;
static const BIGNUM ossl_bignum_nist_p_192_sqr = {
@@ -388,11 +386,11 @@ int BN_nist_mod_192(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
r_d = a_d;
nist_cp_bn_0(buf.bn, a_d + BN_NIST_192_TOP, top - BN_NIST_192_TOP,
- BN_NIST_192_TOP);
+ BN_NIST_192_TOP);
#if defined(NIST_INT64)
{
- NIST_INT64 acc; /* accumulator */
+ NIST_INT64 acc; /* accumulator */
unsigned int *rp = (unsigned int *)r_d;
const unsigned int *bp = (const unsigned int *)buf.ui;
@@ -444,13 +442,13 @@ int BN_nist_mod_192(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
nist_set_192(t_d, buf.bn, 4, 4, 0);
carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_192_TOP);
nist_set_192(t_d, buf.bn, 5, 5, 5)
- carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_192_TOP);
+ carry
+ += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_192_TOP);
}
#endif
if (carry > 0)
- carry =
- (int)bn_sub_words(r_d, r_d, _nist_p_192[carry - 1],
- BN_NIST_192_TOP);
+ carry = (int)bn_sub_words(r_d, r_d, _nist_p_192[carry - 1],
+ BN_NIST_192_TOP);
else
carry = 1;
@@ -470,30 +468,29 @@ int BN_nist_mod_192(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
return 1;
}
-typedef BN_ULONG (*bn_addsub_f) (BN_ULONG *, const BN_ULONG *,
- const BN_ULONG *, int);
-
-#define nist_set_224(to, from, a1, a2, a3, a4, a5, a6, a7) \
- { \
- bn_cp_32(to, 0, from, (a7) - 7) \
- bn_cp_32(to, 1, from, (a6) - 7) \
- bn_cp_32(to, 2, from, (a5) - 7) \
- bn_cp_32(to, 3, from, (a4) - 7) \
- bn_cp_32(to, 4, from, (a3) - 7) \
- bn_cp_32(to, 5, from, (a2) - 7) \
- bn_cp_32(to, 6, from, (a1) - 7) \
- }
+typedef BN_ULONG (*bn_addsub_f)(BN_ULONG *, const BN_ULONG *,
+ const BN_ULONG *, int);
+
+#define nist_set_224(to, from, a1, a2, a3, a4, a5, a6, a7) \
+ { \
+ bn_cp_32(to, 0, from, (a7) - 7) \
+ bn_cp_32(to, 1, from, (a6) - 7) \
+ bn_cp_32(to, 2, from, (a5) - 7) \
+ bn_cp_32(to, 3, from, (a4) - 7) \
+ bn_cp_32(to, 4, from, (a3) - 7) \
+ bn_cp_32(to, 5, from, (a2) - 7) \
+ bn_cp_32(to, 6, from, (a1) - 7) \
+ }
int BN_nist_mod_224(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
int top = a->top, i;
int carry;
BN_ULONG *r_d, *a_d = a->d;
union {
BN_ULONG bn[BN_NIST_224_TOP];
- unsigned int ui[BN_NIST_224_TOP * sizeof(BN_ULONG) /
- sizeof(unsigned int)];
+ unsigned int ui[BN_NIST_224_TOP * sizeof(BN_ULONG) / sizeof(unsigned int)];
} buf;
BN_ULONG c_d[BN_NIST_224_TOP], *res;
bn_addsub_f adjust;
@@ -524,22 +521,22 @@ int BN_nist_mod_224(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
} else
r_d = a_d;
-#if BN_BITS2==64
+#if BN_BITS2 == 64
/* copy upper 256 bits of 448 bit number ... */
nist_cp_bn_0(c_d, a_d + (BN_NIST_224_TOP - 1),
- top - (BN_NIST_224_TOP - 1), BN_NIST_224_TOP);
+ top - (BN_NIST_224_TOP - 1), BN_NIST_224_TOP);
/* ... and right shift by 32 to obtain upper 224 bits */
nist_set_224(buf.bn, c_d, 14, 13, 12, 11, 10, 9, 8);
/* truncate lower part to 224 bits too */
r_d[BN_NIST_224_TOP - 1] &= BN_MASK2l;
#else
nist_cp_bn_0(buf.bn, a_d + BN_NIST_224_TOP, top - BN_NIST_224_TOP,
- BN_NIST_224_TOP);
+ BN_NIST_224_TOP);
#endif
-#if defined(NIST_INT64) && BN_BITS2!=64
+#if defined(NIST_INT64) && BN_BITS2 != 64
{
- NIST_INT64 acc; /* accumulator */
+ NIST_INT64 acc; /* accumulator */
unsigned int *rp = (unsigned int *)r_d;
const unsigned int *bp = (const unsigned int *)buf.ui;
@@ -588,9 +585,9 @@ int BN_nist_mod_224(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
rp[6] = (unsigned int)acc;
carry = (int)(acc >> 32);
-# if BN_BITS2==64
+#if BN_BITS2 == 64
rp[7] = carry;
-# endif
+#endif
}
#else
{
@@ -605,17 +602,16 @@ int BN_nist_mod_224(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
nist_set_224(t_d, buf.bn, 0, 0, 0, 0, 13, 12, 11);
carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_224_TOP);
-# if BN_BITS2==64
+#if BN_BITS2 == 64
carry = (int)(r_d[BN_NIST_224_TOP - 1] >> 32);
-# endif
+#endif
}
#endif
adjust = bn_sub_words;
if (carry > 0) {
- carry =
- (int)bn_sub_words(r_d, r_d, _nist_p_224[carry - 1],
- BN_NIST_224_TOP);
-#if BN_BITS2==64
+ carry = (int)bn_sub_words(r_d, r_d, _nist_p_224[carry - 1],
+ BN_NIST_224_TOP);
+#if BN_BITS2 == 64
carry = (int)(~(r_d[BN_NIST_224_TOP - 1] >> 32)) & 1;
#endif
} else if (carry < 0) {
@@ -626,15 +622,14 @@ int BN_nist_mod_224(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
* compared to the modulus and conditionally adjusted by
* *subtracting* the latter.
*/
- carry =
- (int)bn_add_words(r_d, r_d, _nist_p_224[-carry - 1],
- BN_NIST_224_TOP);
+ carry = (int)bn_add_words(r_d, r_d, _nist_p_224[-carry - 1],
+ BN_NIST_224_TOP);
adjust = carry ? bn_sub_words : bn_add_words;
} else
carry = 1;
/* otherwise it's effectively same as in BN_nist_mod_192... */
- res = ((*adjust) (c_d, r_d, _nist_p_224[0], BN_NIST_224_TOP) && carry)
+ res = ((*adjust)(c_d, r_d, _nist_p_224[0], BN_NIST_224_TOP) && carry)
? r_d
: c_d;
nist_cp_bn(r_d, res, BN_NIST_224_TOP);
@@ -644,28 +639,27 @@ int BN_nist_mod_224(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
return 1;
}
-#define nist_set_256(to, from, a1, a2, a3, a4, a5, a6, a7, a8) \
- { \
- bn_cp_32(to, 0, from, (a8) - 8) \
- bn_cp_32(to, 1, from, (a7) - 8) \
- bn_cp_32(to, 2, from, (a6) - 8) \
- bn_cp_32(to, 3, from, (a5) - 8) \
- bn_cp_32(to, 4, from, (a4) - 8) \
- bn_cp_32(to, 5, from, (a3) - 8) \
- bn_cp_32(to, 6, from, (a2) - 8) \
- bn_cp_32(to, 7, from, (a1) - 8) \
- }
+#define nist_set_256(to, from, a1, a2, a3, a4, a5, a6, a7, a8) \
+ { \
+ bn_cp_32(to, 0, from, (a8) - 8) \
+ bn_cp_32(to, 1, from, (a7) - 8) \
+ bn_cp_32(to, 2, from, (a6) - 8) \
+ bn_cp_32(to, 3, from, (a5) - 8) \
+ bn_cp_32(to, 4, from, (a4) - 8) \
+ bn_cp_32(to, 5, from, (a3) - 8) \
+ bn_cp_32(to, 6, from, (a2) - 8) \
+ bn_cp_32(to, 7, from, (a1) - 8) \
+ }
int BN_nist_mod_256(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
int i, top = a->top;
int carry = 0;
register BN_ULONG *a_d = a->d, *r_d;
union {
BN_ULONG bn[BN_NIST_256_TOP];
- unsigned int ui[BN_NIST_256_TOP * sizeof(BN_ULONG) /
- sizeof(unsigned int)];
+ unsigned int ui[BN_NIST_256_TOP * sizeof(BN_ULONG) / sizeof(unsigned int)];
} buf;
BN_ULONG c_d[BN_NIST_256_TOP], *res;
bn_addsub_f adjust;
@@ -697,11 +691,11 @@ int BN_nist_mod_256(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
r_d = a_d;
nist_cp_bn_0(buf.bn, a_d + BN_NIST_256_TOP, top - BN_NIST_256_TOP,
- BN_NIST_256_TOP);
+ BN_NIST_256_TOP);
#if defined(NIST_INT64)
{
- NIST_INT64 acc; /* accumulator */
+ NIST_INT64 acc; /* accumulator */
unsigned int *rp = (unsigned int *)r_d;
const unsigned int *bp = (const unsigned int *)buf.ui;
@@ -850,24 +844,21 @@ int BN_nist_mod_256(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
*/
nist_set_256(t_d, buf.bn, 13, 0, 11, 10, 9, 0, 15, 14);
carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_256_TOP);
-
}
#endif
/* see BN_nist_mod_224 for explanation */
adjust = bn_sub_words;
if (carry > 0)
- carry =
- (int)bn_sub_words(r_d, r_d, _nist_p_256[carry - 1],
- BN_NIST_256_TOP);
+ carry = (int)bn_sub_words(r_d, r_d, _nist_p_256[carry - 1],
+ BN_NIST_256_TOP);
else if (carry < 0) {
- carry =
- (int)bn_add_words(r_d, r_d, _nist_p_256[-carry - 1],
- BN_NIST_256_TOP);
+ carry = (int)bn_add_words(r_d, r_d, _nist_p_256[-carry - 1],
+ BN_NIST_256_TOP);
adjust = carry ? bn_sub_words : bn_add_words;
} else
carry = 1;
- res = ((*adjust) (c_d, r_d, _nist_p_256[0], BN_NIST_256_TOP) && carry)
+ res = ((*adjust)(c_d, r_d, _nist_p_256[0], BN_NIST_256_TOP) && carry)
? r_d
: c_d;
nist_cp_bn(r_d, res, BN_NIST_256_TOP);
@@ -877,32 +868,31 @@ int BN_nist_mod_256(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
return 1;
}
-#define nist_set_384(to,from,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,a11,a12) \
- { \
- bn_cp_32(to, 0, from, (a12) - 12) \
- bn_cp_32(to, 1, from, (a11) - 12) \
- bn_cp_32(to, 2, from, (a10) - 12) \
- bn_cp_32(to, 3, from, (a9) - 12) \
- bn_cp_32(to, 4, from, (a8) - 12) \
- bn_cp_32(to, 5, from, (a7) - 12) \
- bn_cp_32(to, 6, from, (a6) - 12) \
- bn_cp_32(to, 7, from, (a5) - 12) \
- bn_cp_32(to, 8, from, (a4) - 12) \
- bn_cp_32(to, 9, from, (a3) - 12) \
- bn_cp_32(to, 10, from, (a2) - 12) \
- bn_cp_32(to, 11, from, (a1) - 12) \
- }
+#define nist_set_384(to, from, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12) \
+ { \
+ bn_cp_32(to, 0, from, (a12) - 12) \
+ bn_cp_32(to, 1, from, (a11) - 12) \
+ bn_cp_32(to, 2, from, (a10) - 12) \
+ bn_cp_32(to, 3, from, (a9) - 12) \
+ bn_cp_32(to, 4, from, (a8) - 12) \
+ bn_cp_32(to, 5, from, (a7) - 12) \
+ bn_cp_32(to, 6, from, (a6) - 12) \
+ bn_cp_32(to, 7, from, (a5) - 12) \
+ bn_cp_32(to, 8, from, (a4) - 12) \
+ bn_cp_32(to, 9, from, (a3) - 12) \
+ bn_cp_32(to, 10, from, (a2) - 12) \
+ bn_cp_32(to, 11, from, (a1) - 12) \
+ }
int BN_nist_mod_384(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
int i, top = a->top;
int carry = 0;
register BN_ULONG *r_d, *a_d = a->d;
union {
BN_ULONG bn[BN_NIST_384_TOP];
- unsigned int ui[BN_NIST_384_TOP * sizeof(BN_ULONG) /
- sizeof(unsigned int)];
+ unsigned int ui[BN_NIST_384_TOP * sizeof(BN_ULONG) / sizeof(unsigned int)];
} buf;
BN_ULONG c_d[BN_NIST_384_TOP], *res;
bn_addsub_f adjust;
@@ -934,11 +924,11 @@ int BN_nist_mod_384(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
r_d = a_d;
nist_cp_bn_0(buf.bn, a_d + BN_NIST_384_TOP, top - BN_NIST_384_TOP,
- BN_NIST_384_TOP);
+ BN_NIST_384_TOP);
#if defined(NIST_INT64)
{
- NIST_INT64 acc; /* accumulator */
+ NIST_INT64 acc; /* accumulator */
unsigned int *rp = (unsigned int *)r_d;
const unsigned int *bp = (const unsigned int *)buf.ui;
@@ -1077,9 +1067,8 @@ int BN_nist_mod_384(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
}
*ap = c;
}
- carry =
- (int)bn_add_words(r_d + (128 / BN_BITS2), r_d + (128 / BN_BITS2),
- t_d, BN_NIST_256_TOP);
+ carry = (int)bn_add_words(r_d + (128 / BN_BITS2), r_d + (128 / BN_BITS2),
+ t_d, BN_NIST_256_TOP);
/*
* S2
*/
@@ -1088,13 +1077,13 @@ int BN_nist_mod_384(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
* S3
*/
nist_set_384(t_d, buf.bn, 20, 19, 18, 17, 16, 15, 14, 13, 12, 23, 22,
- 21);
+ 21);
carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_384_TOP);
/*
* S4
*/
nist_set_384(t_d, buf.bn, 19, 18, 17, 16, 15, 14, 13, 12, 20, 0, 23,
- 0);
+ 0);
carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_384_TOP);
/*
* S5
@@ -1110,7 +1099,7 @@ int BN_nist_mod_384(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
* D1
*/
nist_set_384(t_d, buf.bn, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12,
- 23);
+ 23);
carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_384_TOP);
/*
* D2
@@ -1122,24 +1111,21 @@ int BN_nist_mod_384(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
*/
nist_set_384(t_d, buf.bn, 0, 0, 0, 0, 0, 0, 0, 23, 23, 0, 0, 0);
carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_384_TOP);
-
}
#endif
/* see BN_nist_mod_224 for explanation */
adjust = bn_sub_words;
if (carry > 0)
- carry =
- (int)bn_sub_words(r_d, r_d, _nist_p_384[carry - 1],
- BN_NIST_384_TOP);
+ carry = (int)bn_sub_words(r_d, r_d, _nist_p_384[carry - 1],
+ BN_NIST_384_TOP);
else if (carry < 0) {
- carry =
- (int)bn_add_words(r_d, r_d, _nist_p_384[-carry - 1],
- BN_NIST_384_TOP);
+ carry = (int)bn_add_words(r_d, r_d, _nist_p_384[-carry - 1],
+ BN_NIST_384_TOP);
adjust = carry ? bn_sub_words : bn_add_words;
} else
carry = 1;
- res = ((*adjust) (c_d, r_d, _nist_p_384[0], BN_NIST_384_TOP) && carry)
+ res = ((*adjust)(c_d, r_d, _nist_p_384[0], BN_NIST_384_TOP) && carry)
? r_d
: c_d;
nist_cp_bn(r_d, res, BN_NIST_384_TOP);
@@ -1149,12 +1135,12 @@ int BN_nist_mod_384(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
return 1;
}
-#define BN_NIST_521_RSHIFT (521%BN_BITS2)
-#define BN_NIST_521_LSHIFT (BN_BITS2-BN_NIST_521_RSHIFT)
-#define BN_NIST_521_TOP_MASK ((BN_ULONG)BN_MASK2>>BN_NIST_521_LSHIFT)
+#define BN_NIST_521_RSHIFT (521 % BN_BITS2)
+#define BN_NIST_521_LSHIFT (BN_BITS2 - BN_NIST_521_RSHIFT)
+#define BN_NIST_521_TOP_MASK ((BN_ULONG)BN_MASK2 >> BN_NIST_521_LSHIFT)
int BN_nist_mod_521(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
int top = a->top, i;
BN_ULONG *r_d, *a_d = a->d, t_d[BN_NIST_521_TOP], val, tmp, *res;
@@ -1187,7 +1173,7 @@ int BN_nist_mod_521(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
/* upper 521 bits, copy ... */
nist_cp_bn_0(t_d, a_d + (BN_NIST_521_TOP - 1),
- top - (BN_NIST_521_TOP - 1), BN_NIST_521_TOP);
+ top - (BN_NIST_521_TOP - 1), BN_NIST_521_TOP);
/* ... and right shift */
for (val = t_d[0], i = 0; i < BN_NIST_521_TOP - 1; i++) {
#if 0
@@ -1200,8 +1186,7 @@ int BN_nist_mod_521(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
val = t_d[i + 1];
t_d[i] = (tmp | val << BN_NIST_521_LSHIFT) & BN_MASK2;
#else
- t_d[i] = (val >> BN_NIST_521_RSHIFT |
- (tmp = t_d[i + 1]) << BN_NIST_521_LSHIFT) & BN_MASK2;
+ t_d[i] = (val >> BN_NIST_521_RSHIFT | (tmp = t_d[i + 1]) << BN_NIST_521_LSHIFT) & BN_MASK2;
val = tmp;
#endif
}
@@ -1211,7 +1196,7 @@ int BN_nist_mod_521(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
bn_add_words(r_d, r_d, t_d, BN_NIST_521_TOP);
res = bn_sub_words(t_d, r_d, _nist_p_521,
- BN_NIST_521_TOP)
+ BN_NIST_521_TOP)
? r_d
: t_d;
nist_cp_bn(r_d, res, BN_NIST_521_TOP);
@@ -1221,8 +1206,9 @@ int BN_nist_mod_521(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
return 1;
}
-int (*BN_nist_mod_func(const BIGNUM *p)) (BIGNUM *r, const BIGNUM *a,
- const BIGNUM *field, BN_CTX *ctx) {
+int (*BN_nist_mod_func(const BIGNUM *p))(BIGNUM *r, const BIGNUM *a,
+ const BIGNUM *field, BN_CTX *ctx)
+{
if (BN_ucmp(&ossl_bignum_nist_p_192, p) == 0)
return BN_nist_mod_192;
if (BN_ucmp(&ossl_bignum_nist_p_224, p) == 0)
diff --git a/crypto/bn/bn_ppc.c b/crypto/bn/bn_ppc.c
index 80f705edde..049ffa50da 100644
--- a/crypto/bn/bn_ppc.c
+++ b/crypto/bn/bn_ppc.c
@@ -13,18 +13,18 @@
#include "bn_local.h"
int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
- const BN_ULONG *np, const BN_ULONG *n0, int num)
+ const BN_ULONG *np, const BN_ULONG *n0, int num)
{
- int bn_mul_mont_int(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
- const BN_ULONG *np, const BN_ULONG *n0, int num);
- int bn_mul4x_mont_int(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
- const BN_ULONG *np, const BN_ULONG *n0, int num);
- int bn_mul_mont_fixed_n6(BN_ULONG *rp, const BN_ULONG *ap,
- const BN_ULONG *bp, const BN_ULONG *np,
- const BN_ULONG *n0, int num);
- int bn_mul_mont_300_fixed_n6(BN_ULONG *rp, const BN_ULONG *ap,
- const BN_ULONG *bp, const BN_ULONG *np,
- const BN_ULONG *n0, int num);
+ int bn_mul_mont_int(BN_ULONG * rp, const BN_ULONG *ap, const BN_ULONG *bp,
+ const BN_ULONG *np, const BN_ULONG *n0, int num);
+ int bn_mul4x_mont_int(BN_ULONG * rp, const BN_ULONG *ap, const BN_ULONG *bp,
+ const BN_ULONG *np, const BN_ULONG *n0, int num);
+ int bn_mul_mont_fixed_n6(BN_ULONG * rp, const BN_ULONG *ap,
+ const BN_ULONG *bp, const BN_ULONG *np,
+ const BN_ULONG *n0, int num);
+ int bn_mul_mont_300_fixed_n6(BN_ULONG * rp, const BN_ULONG *ap,
+ const BN_ULONG *bp, const BN_ULONG *np,
+ const BN_ULONG *n0, int num);
if (num < 4)
return 0;
@@ -42,14 +42,14 @@ int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
#if defined(_ARCH_PPC64) && !defined(__ILP32__)
/* Minerva side-channel fix danny */
-# if defined(USE_FIXED_N6)
+#if defined(USE_FIXED_N6)
if (num == 6) {
if (OPENSSL_ppccap_P & PPC_MADD300)
return bn_mul_mont_300_fixed_n6(rp, ap, bp, np, n0, num);
else
return bn_mul_mont_fixed_n6(rp, ap, bp, np, n0, num);
}
-# endif
+#endif
#endif
return bn_mul_mont_int(rp, ap, bp, np, n0, num);
diff --git a/crypto/bn/bn_prime.c b/crypto/bn/bn_prime.c
index 6d85cbb17e..6e911b4cbf 100644
--- a/crypto/bn/bn_prime.c
+++ b/crypto/bn/bn_prime.c
@@ -20,19 +20,19 @@
#include "bn_prime.h"
static int probable_prime(BIGNUM *rnd, int bits, int safe, prime_t *mods,
- BN_CTX *ctx);
+ BN_CTX *ctx);
static int probable_prime_dh(BIGNUM *rnd, int bits, int safe, prime_t *mods,
- const BIGNUM *add, const BIGNUM *rem,
- BN_CTX *ctx);
+ const BIGNUM *add, const BIGNUM *rem,
+ BN_CTX *ctx);
static int bn_is_prime_int(const BIGNUM *w, int checks, BN_CTX *ctx,
- int do_trial_division, BN_GENCB *cb);
+ int do_trial_division, BN_GENCB *cb);
#define square(x) ((BN_ULONG)(x) * (BN_ULONG)(x))
#if BN_BITS2 == 64
-# define BN_DEF(lo, hi) (BN_ULONG)hi<<32|lo
+#define BN_DEF(lo, hi) (BN_ULONG) hi << 32 | lo
#else
-# define BN_DEF(lo, hi) lo, hi
+#define BN_DEF(lo, hi) lo, hi
#endif
/*
@@ -121,8 +121,8 @@ int BN_GENCB_call(BN_GENCB *cb, int a, int b)
}
int BN_generate_prime_ex2(BIGNUM *ret, int bits, int safe,
- const BIGNUM *add, const BIGNUM *rem, BN_GENCB *cb,
- BN_CTX *ctx)
+ const BIGNUM *add, const BIGNUM *rem, BN_GENCB *cb,
+ BN_CTX *ctx)
{
BIGNUM *t;
int found = 0;
@@ -152,7 +152,7 @@ int BN_generate_prime_ex2(BIGNUM *ret, int bits, int safe,
t = BN_CTX_get(ctx);
if (t == NULL)
goto err;
- loop:
+loop:
/* make a random number and set the top and bottom bits */
if (add == NULL) {
if (!probable_prime(ret, bits, safe, mods, ctx))
@@ -200,7 +200,7 @@ int BN_generate_prime_ex2(BIGNUM *ret, int bits, int safe,
}
/* we have a prime :-) */
found = 1;
- err:
+err:
OPENSSL_free(mods);
BN_CTX_end(ctx);
bn_check_top(ret);
@@ -209,7 +209,7 @@ int BN_generate_prime_ex2(BIGNUM *ret, int bits, int safe,
#ifndef FIPS_MODULE
int BN_generate_prime_ex(BIGNUM *ret, int bits, int safe,
- const BIGNUM *add, const BIGNUM *rem, BN_GENCB *cb)
+ const BIGNUM *add, const BIGNUM *rem, BN_GENCB *cb)
{
BN_CTX *ctx = BN_CTX_new();
int retval;
@@ -226,13 +226,13 @@ int BN_generate_prime_ex(BIGNUM *ret, int bits, int safe,
#ifndef OPENSSL_NO_DEPRECATED_3_0
int BN_is_prime_ex(const BIGNUM *a, int checks, BN_CTX *ctx_passed,
- BN_GENCB *cb)
+ BN_GENCB *cb)
{
return ossl_bn_check_prime(a, checks, ctx_passed, 0, cb);
}
int BN_is_prime_fasttest_ex(const BIGNUM *w, int checks, BN_CTX *ctx,
- int do_trial_division, BN_GENCB *cb)
+ int do_trial_division, BN_GENCB *cb)
{
return ossl_bn_check_prime(w, checks, ctx, do_trial_division, cb);
}
@@ -240,7 +240,7 @@ int BN_is_prime_fasttest_ex(const BIGNUM *w, int checks, BN_CTX *ctx,
/* Wrapper around bn_is_prime_int that sets the minimum number of checks */
int ossl_bn_check_prime(const BIGNUM *w, int checks, BN_CTX *ctx,
- int do_trial_division, BN_GENCB *cb)
+ int do_trial_division, BN_GENCB *cb)
{
int min_checks = bn_mr_min_checks(BN_num_bits(w));
@@ -256,7 +256,7 @@ int ossl_bn_check_prime(const BIGNUM *w, int checks, BN_CTX *ctx,
* (MR rounds) passed in is used without being clamped to a minimum value.
*/
int ossl_bn_check_generated_prime(const BIGNUM *w, int checks, BN_CTX *ctx,
- BN_GENCB *cb)
+ BN_GENCB *cb)
{
return bn_is_prime_int(w, checks, ctx, 1, cb);
}
@@ -273,7 +273,7 @@ int BN_check_prime(const BIGNUM *p, BN_CTX *ctx, BN_GENCB *cb)
* Returns 0 when composite, 1 when probable prime, -1 on error.
*/
static int bn_is_prime_int(const BIGNUM *w, int checks, BN_CTX *ctx,
- int do_trial_division, BN_GENCB *cb)
+ int do_trial_division, BN_GENCB *cb)
{
int i, status, ret = -1;
#ifndef FIPS_MODULE
@@ -345,7 +345,7 @@ err:
* returns 0 if there was an error, otherwise it returns 1.
*/
int ossl_bn_miller_rabin_is_prime(const BIGNUM *w, int iterations, BN_CTX *ctx,
- BN_GENCB *cb, int enhanced, int *status)
+ BN_GENCB *cb, int enhanced, int *status)
{
int i, j, a, ret = 0;
BIGNUM *g, *w1, *w3, *x, *m, *z, *b;
@@ -397,7 +397,7 @@ int ossl_bn_miller_rabin_is_prime(const BIGNUM *w, int iterations, BN_CTX *ctx,
for (i = 0; i < iterations; ++i) {
/* (Step 4.1) obtain a Random string of bits b where 1 < b < w-1 */
if (!BN_priv_rand_range_ex(b, w3, 0, ctx)
- || !BN_add_word(b, 2)) /* 1 < b < w-1 */
+ || !BN_add_word(b, 2)) /* 1 < b < w-1 */
goto err;
if (enhanced) {
@@ -418,7 +418,7 @@ int ossl_bn_miller_rabin_is_prime(const BIGNUM *w, int iterations, BN_CTX *ctx,
if (BN_is_one(z) || BN_cmp(z, w1) == 0)
goto outer_loop;
/* (Step 4.7) for j = 1 to a-1 */
- for (j = 1; j < a ; ++j) {
+ for (j = 1; j < a; ++j) {
/* (Step 4.7.1 - 4.7.2) x = z. z = x^2 mod w */
if (!BN_copy(x, z) || !BN_mod_mul(z, x, x, w, ctx))
goto err;
@@ -439,7 +439,7 @@ int ossl_bn_miller_rabin_is_prime(const BIGNUM *w, int iterations, BN_CTX *ctx,
/* (Step 4.11) x = b^(w-1) mod w */
if (!BN_copy(x, z))
goto err;
-composite:
+ composite:
if (enhanced) {
/* (Step 4.1.2) g = GCD(x-1, w) */
if (!BN_sub_word(x, 1) || !BN_gcd(g, x, w, ctx))
@@ -454,7 +454,7 @@ composite:
}
ret = 1;
goto err;
-outer_loop: ;
+ outer_loop:;
/* (Step 4.1.5) */
if (!BN_GENCB_call(cb, 1, i))
goto err;
@@ -485,16 +485,16 @@ err:
* Returns 1 on success and 0 on error.
*/
static int probable_prime(BIGNUM *rnd, int bits, int safe, prime_t *mods,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
int i;
BN_ULONG delta;
int trial_divisions = calc_trial_divisions(bits);
BN_ULONG maxdelta = BN_MASK2 - primes[trial_divisions - 1];
- again:
+again:
if (!BN_priv_rand_ex(rnd, bits, BN_RAND_TOP_TWO, BN_RAND_BOTTOM_ODD, 0,
- ctx))
+ ctx))
return 0;
if (safe && !BN_set_bit(rnd, 1))
return 0;
@@ -503,10 +503,10 @@ static int probable_prime(BIGNUM *rnd, int bits, int safe, prime_t *mods,
BN_ULONG mod = BN_mod_word(rnd, (BN_ULONG)primes[i]);
if (mod == (BN_ULONG)-1)
return 0;
- mods[i] = (prime_t) mod;
+ mods[i] = (prime_t)mod;
}
delta = 0;
- loop:
+loop:
for (i = 1; i < trial_divisions; i++) {
/*
* check that rnd is a prime and also that
@@ -516,7 +516,7 @@ static int probable_prime(BIGNUM *rnd, int bits, int safe, prime_t *mods,
* we check only the primes up to sqrt(rnd)
*/
if (bits <= 31 && delta <= 0x7fffffff
- && square(primes[i]) > BN_get_word(rnd) + delta)
+ && square(primes[i]) > BN_get_word(rnd) + delta)
break;
if (safe ? (mods[i] + delta) % primes[i] <= 1
: (mods[i] + delta) % primes[i] == 0) {
@@ -543,8 +543,8 @@ static int probable_prime(BIGNUM *rnd, int bits, int safe, prime_t *mods,
* Returns 1 on success and 0 on error.
*/
static int probable_prime_dh(BIGNUM *rnd, int bits, int safe, prime_t *mods,
- const BIGNUM *add, const BIGNUM *rem,
- BN_CTX *ctx)
+ const BIGNUM *add, const BIGNUM *rem,
+ BN_CTX *ctx)
{
int i, ret = 0;
BIGNUM *t1;
@@ -559,7 +559,7 @@ static int probable_prime_dh(BIGNUM *rnd, int bits, int safe, prime_t *mods,
if (maxdelta > BN_MASK2 - BN_get_word(add))
maxdelta = BN_MASK2 - BN_get_word(add);
- again:
+again:
if (!BN_rand_ex(rnd, bits, BN_RAND_TOP_ONE, BN_RAND_BOTTOM_ODD, 0, ctx))
goto err;
@@ -578,7 +578,7 @@ static int probable_prime_dh(BIGNUM *rnd, int bits, int safe, prime_t *mods,
}
if (BN_num_bits(rnd) < bits
- || BN_get_word(rnd) < (safe ? 5u : 3u)) {
+ || BN_get_word(rnd) < (safe ? 5u : 3u)) {
if (!BN_add(rnd, rnd, add))
goto err;
}
@@ -588,14 +588,14 @@ static int probable_prime_dh(BIGNUM *rnd, int bits, int safe, prime_t *mods,
BN_ULONG mod = BN_mod_word(rnd, (BN_ULONG)primes[i]);
if (mod == (BN_ULONG)-1)
goto err;
- mods[i] = (prime_t) mod;
+ mods[i] = (prime_t)mod;
}
delta = 0;
- loop:
+loop:
for (i = 1; i < trial_divisions; i++) {
/* check that rnd is a prime */
if (bits <= 31 && delta <= 0x7fffffff
- && square(primes[i]) > BN_get_word(rnd) + delta)
+ && square(primes[i]) > BN_get_word(rnd) + delta)
break;
/* rnd mod p == 1 implies q = (rnd-1)/2 is divisible by p */
if (safe ? (mods[i] + delta) % primes[i] <= 1
@@ -610,7 +610,7 @@ static int probable_prime_dh(BIGNUM *rnd, int bits, int safe, prime_t *mods,
goto err;
ret = 1;
- err:
+err:
BN_CTX_end(ctx);
bn_check_top(rnd);
return ret;
diff --git a/crypto/bn/bn_print.c b/crypto/bn/bn_print.c
index ccc954c5b1..a04e6cf0c2 100644
--- a/crypto/bn/bn_print.c
+++ b/crypto/bn/bn_print.c
@@ -49,7 +49,7 @@ int BN_print(BIO *bp, const BIGNUM *a)
}
}
ret = 1;
- end:
+end:
return ret;
}
@@ -62,10 +62,10 @@ char *BN_options(void)
init++;
#ifdef BN_LLONG
BIO_snprintf(data, sizeof(data), "bn(%zu,%zu)",
- sizeof(BN_ULLONG) * 8, sizeof(BN_ULONG) * 8);
+ sizeof(BN_ULLONG) * 8, sizeof(BN_ULONG) * 8);
#else
BIO_snprintf(data, sizeof(data), "bn(%zu,%zu)",
- sizeof(BN_ULONG) * 8, sizeof(BN_ULONG) * 8);
+ sizeof(BN_ULONG) * 8, sizeof(BN_ULONG) * 8);
#endif
}
return data;
diff --git a/crypto/bn/bn_rand.c b/crypto/bn/bn_rand.c
index da537a07a9..18b5bf8ef8 100644
--- a/crypto/bn/bn_rand.c
+++ b/crypto/bn/bn_rand.c
@@ -17,11 +17,13 @@
#include <openssl/evp.h>
typedef enum bnrand_flag_e {
- NORMAL, TESTING, PRIVATE
+ NORMAL,
+ TESTING,
+ PRIVATE
} BNRAND_FLAG;
static int bnrand(BNRAND_FLAG flag, BIGNUM *rnd, int bits, int top, int bottom,
- unsigned int strength, BN_CTX *ctx)
+ unsigned int strength, BN_CTX *ctx)
{
unsigned char *buf = NULL;
int b, ret = 0, bit, bytes, mask;
@@ -82,12 +84,12 @@ static int bnrand(BNRAND_FLAG flag, BIGNUM *rnd, int bits, int top, int bottom,
}
}
buf[0] &= ~mask;
- if (bottom) /* set bottom bit if requested */
+ if (bottom) /* set bottom bit if requested */
buf[bytes - 1] |= 1;
if (!BN_bin2bn(buf, bytes, rnd))
goto err;
ret = 1;
- err:
+err:
OPENSSL_clear_free(buf, bytes);
bn_check_top(rnd);
return ret;
@@ -98,7 +100,7 @@ toosmall:
}
int BN_rand_ex(BIGNUM *rnd, int bits, int top, int bottom,
- unsigned int strength, BN_CTX *ctx)
+ unsigned int strength, BN_CTX *ctx)
{
return bnrand(NORMAL, rnd, bits, top, bottom, strength, ctx);
}
@@ -115,7 +117,7 @@ int BN_bntest_rand(BIGNUM *rnd, int bits, int top, int bottom)
#endif
int BN_priv_rand_ex(BIGNUM *rnd, int bits, int top, int bottom,
- unsigned int strength, BN_CTX *ctx)
+ unsigned int strength, BN_CTX *ctx)
{
return bnrand(PRIVATE, rnd, bits, top, bottom, strength, ctx);
}
@@ -129,7 +131,7 @@ int BN_priv_rand(BIGNUM *rnd, int bits, int top, int bottom)
/* random number r: 0 <= r < range */
static int bnrand_range(BNRAND_FLAG flag, BIGNUM *r, const BIGNUM *range,
- unsigned int strength, BN_CTX *ctx)
+ unsigned int strength, BN_CTX *ctx)
{
int n;
int count = 100;
@@ -144,7 +146,7 @@ static int bnrand_range(BNRAND_FLAG flag, BIGNUM *r, const BIGNUM *range,
return 0;
}
- n = BN_num_bits(range); /* n > 0 */
+ n = BN_num_bits(range); /* n > 0 */
/* BN_is_bit_set(range, n - 1) always holds */
@@ -157,7 +159,7 @@ static int bnrand_range(BNRAND_FLAG flag, BIGNUM *r, const BIGNUM *range,
*/
do {
if (!bnrand(flag, r, n + 1, BN_RAND_TOP_ANY, BN_RAND_BOTTOM_ANY,
- strength, ctx))
+ strength, ctx))
return 0;
/*
@@ -179,21 +181,19 @@ static int bnrand_range(BNRAND_FLAG flag, BIGNUM *r, const BIGNUM *range,
return 0;
}
- }
- while (BN_cmp(r, range) >= 0);
+ } while (BN_cmp(r, range) >= 0);
} else {
do {
/* range = 11..._2 or range = 101..._2 */
if (!bnrand(flag, r, n, BN_RAND_TOP_ANY, BN_RAND_BOTTOM_ANY,
- strength, ctx))
+ strength, ctx))
return 0;
if (!--count) {
ERR_raise(ERR_LIB_BN, BN_R_TOO_MANY_ITERATIONS);
return 0;
}
- }
- while (BN_cmp(r, range) >= 0);
+ } while (BN_cmp(r, range) >= 0);
}
bn_check_top(r);
@@ -201,7 +201,7 @@ static int bnrand_range(BNRAND_FLAG flag, BIGNUM *r, const BIGNUM *range,
}
int BN_rand_range_ex(BIGNUM *r, const BIGNUM *range, unsigned int strength,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
return bnrand_range(NORMAL, r, range, strength, ctx);
}
@@ -214,7 +214,7 @@ int BN_rand_range(BIGNUM *r, const BIGNUM *range)
#endif
int BN_priv_rand_range_ex(BIGNUM *r, const BIGNUM *range, unsigned int strength,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
return bnrand_range(PRIVATE, r, range, strength, ctx);
}
@@ -225,7 +225,7 @@ int BN_priv_rand_range(BIGNUM *r, const BIGNUM *range)
return bnrand_range(PRIVATE, r, range, 0, NULL);
}
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
int BN_pseudo_rand(BIGNUM *rnd, int bits, int top, int bottom)
{
return BN_rand(rnd, bits, top, bottom);
@@ -235,11 +235,11 @@ int BN_pseudo_rand_range(BIGNUM *r, const BIGNUM *range)
{
return BN_rand_range(r, range);
}
-# endif
+#endif
#endif
int ossl_bn_priv_rand_range_fixed_top(BIGNUM *r, const BIGNUM *range,
- unsigned int strength, BN_CTX *ctx)
+ unsigned int strength, BN_CTX *ctx)
{
int n;
int count = 100;
@@ -254,7 +254,7 @@ int ossl_bn_priv_rand_range_fixed_top(BIGNUM *r, const BIGNUM *range,
return 0;
}
- n = BN_num_bits(range); /* n > 0 */
+ n = BN_num_bits(range); /* n > 0 */
/* BN_is_bit_set(range, n - 1) always holds */
@@ -264,7 +264,7 @@ int ossl_bn_priv_rand_range_fixed_top(BIGNUM *r, const BIGNUM *range,
BN_set_flags(r, BN_FLG_CONSTTIME);
do {
if (!bnrand(PRIVATE, r, n + 1, BN_RAND_TOP_ONE, BN_RAND_BOTTOM_ANY,
- strength, ctx))
+ strength, ctx))
return 0;
if (!--count) {
@@ -272,8 +272,7 @@ int ossl_bn_priv_rand_range_fixed_top(BIGNUM *r, const BIGNUM *range,
return 0;
}
ossl_bn_mask_bits_fixed_top(r, n);
- }
- while (BN_ucmp(r, range) >= 0);
+ } while (BN_ucmp(r, range) >= 0);
#ifdef BN_DEBUG
/* With BN_DEBUG on a fixed top number cannot be returned */
bn_correct_top(r);
@@ -292,9 +291,9 @@ int ossl_bn_priv_rand_range_fixed_top(BIGNUM *r, const BIGNUM *range,
* used.
*/
int ossl_bn_gen_dsa_nonce_fixed_top(BIGNUM *out, const BIGNUM *range,
- const BIGNUM *priv,
- const unsigned char *message,
- size_t message_len, BN_CTX *ctx)
+ const BIGNUM *priv,
+ const unsigned char *message,
+ size_t message_len, BN_CTX *ctx)
{
EVP_MD_CTX *mdctx = EVP_MD_CTX_new();
/*
@@ -308,7 +307,7 @@ int ossl_bn_gen_dsa_nonce_fixed_top(BIGNUM *out, const BIGNUM *range,
const unsigned num_k_bytes = BN_num_bytes(range) + 1;
unsigned char private_bytes[96];
unsigned char *k_bytes = NULL;
- const int max_n = 64; /* Pr(failure to generate) < 2^max_n */
+ const int max_n = 64; /* Pr(failure to generate) < 2^max_n */
int n;
int ret = 0;
EVP_MD *md = NULL;
@@ -344,17 +343,18 @@ int ossl_bn_gen_dsa_nonce_fixed_top(BIGNUM *out, const BIGNUM *range,
for (done = 1; done < num_k_bytes;) {
if (RAND_priv_bytes_ex(libctx, random_bytes, sizeof(random_bytes),
- 0) <= 0)
+ 0)
+ <= 0)
goto end;
if (!EVP_DigestInit_ex(mdctx, md, NULL)
- || !EVP_DigestUpdate(mdctx, &i, sizeof(i))
- || !EVP_DigestUpdate(mdctx, private_bytes,
- sizeof(private_bytes))
- || !EVP_DigestUpdate(mdctx, message, message_len)
- || !EVP_DigestUpdate(mdctx, random_bytes,
- sizeof(random_bytes))
- || !EVP_DigestFinal_ex(mdctx, digest, NULL))
+ || !EVP_DigestUpdate(mdctx, &i, sizeof(i))
+ || !EVP_DigestUpdate(mdctx, private_bytes,
+ sizeof(private_bytes))
+ || !EVP_DigestUpdate(mdctx, message, message_len)
+ || !EVP_DigestUpdate(mdctx, random_bytes,
+ sizeof(random_bytes))
+ || !EVP_DigestFinal_ex(mdctx, digest, NULL))
goto end;
todo = num_k_bytes - done;
@@ -384,7 +384,7 @@ int ossl_bn_gen_dsa_nonce_fixed_top(BIGNUM *out, const BIGNUM *range,
/* Failed to generate anything */
ERR_raise(ERR_LIB_BN, ERR_R_INTERNAL_ERROR);
- end:
+end:
EVP_MD_CTX_free(mdctx);
EVP_MD_free(md);
OPENSSL_clear_free(k_bytes, num_k_bytes);
@@ -395,13 +395,13 @@ int ossl_bn_gen_dsa_nonce_fixed_top(BIGNUM *out, const BIGNUM *range,
}
int BN_generate_dsa_nonce(BIGNUM *out, const BIGNUM *range,
- const BIGNUM *priv, const unsigned char *message,
- size_t message_len, BN_CTX *ctx)
+ const BIGNUM *priv, const unsigned char *message,
+ size_t message_len, BN_CTX *ctx)
{
int ret;
ret = ossl_bn_gen_dsa_nonce_fixed_top(out, range, priv, message,
- message_len, ctx);
+ message_len, ctx);
/*
* This call makes the BN_generate_dsa_nonce non-const-time, thus we
* do not use it internally. But fixed_top BNs currently cannot be returned
diff --git a/crypto/bn/bn_recp.c b/crypto/bn/bn_recp.c
index 83fd175c43..26fb737e25 100644
--- a/crypto/bn/bn_recp.c
+++ b/crypto/bn/bn_recp.c
@@ -51,7 +51,7 @@ int BN_RECP_CTX_set(BN_RECP_CTX *recp, const BIGNUM *d, BN_CTX *ctx)
}
int BN_mod_mul_reciprocal(BIGNUM *r, const BIGNUM *x, const BIGNUM *y,
- BN_RECP_CTX *recp, BN_CTX *ctx)
+ BN_RECP_CTX *recp, BN_CTX *ctx)
{
int ret = 0;
BIGNUM *a;
@@ -70,17 +70,17 @@ int BN_mod_mul_reciprocal(BIGNUM *r, const BIGNUM *x, const BIGNUM *y,
}
ca = a;
} else
- ca = x; /* Just do the mod */
+ ca = x; /* Just do the mod */
ret = BN_div_recp(NULL, r, ca, recp, ctx);
- err:
+err:
BN_CTX_end(ctx);
bn_check_top(r);
return ret;
}
int BN_div_recp(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m,
- BN_RECP_CTX *recp, BN_CTX *ctx)
+ BN_RECP_CTX *recp, BN_CTX *ctx)
{
int i, j, ret = 0;
BIGNUM *a, *b, *d, *r;
@@ -156,7 +156,7 @@ int BN_div_recp(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m,
r->neg = BN_is_zero(r) ? 0 : m->neg;
d->neg = m->neg ^ recp->N.neg;
ret = 1;
- err:
+err:
BN_CTX_end(ctx);
bn_check_top(dv);
bn_check_top(rem);
@@ -185,7 +185,7 @@ int BN_reciprocal(BIGNUM *r, const BIGNUM *m, int len, BN_CTX *ctx)
goto err;
ret = len;
- err:
+err:
bn_check_top(r);
BN_CTX_end(ctx);
return ret;
diff --git a/crypto/bn/bn_rsa_fips186_5.c b/crypto/bn/bn_rsa_fips186_5.c
index 3a03ed9704..d483ba3ae5 100644
--- a/crypto/bn/bn_rsa_fips186_5.c
+++ b/crypto/bn/bn_rsa_fips186_5.c
@@ -29,9 +29,9 @@
#include "internal/nelem.h"
#if BN_BITS2 == 64
-# define BN_DEF(lo, hi) (BN_ULONG)hi<<32|lo
+#define BN_DEF(lo, hi) (BN_ULONG) hi << 32 | lo
#else
-# define BN_DEF(lo, hi) lo, hi
+#define BN_DEF(lo, hi) lo, hi
#endif
/* 1 / sqrt(2) * 2^256, rounded up */
@@ -108,7 +108,7 @@ static int bn_rsa_fips186_5_aux_prime_min_size(int nbits)
* The maximum length or 0 if nbits is invalid.
*/
static int bn_rsa_fips186_5_aux_prime_max_sum_size_for_prob_primes(int nbits,
- uint32_t c)
+ uint32_t c)
{
int reduce_bits = (c == 0) ? 0 : 3;
@@ -135,9 +135,9 @@ static int bn_rsa_fips186_5_aux_prime_max_sum_size_for_prob_primes(int nbits,
* Returns: 1 on success otherwise it returns 0.
*/
static int bn_rsa_fips186_5_find_aux_prob_prime(const BIGNUM *Xp1,
- BIGNUM *p1, BN_CTX *ctx,
- int rounds,
- BN_GENCB *cb)
+ BIGNUM *p1, BN_CTX *ctx,
+ int rounds,
+ BN_GENCB *cb)
{
int ret = 0;
int i = 0;
@@ -190,11 +190,11 @@ err:
* Returns: 1 on success otherwise it returns 0.
*/
int ossl_bn_rsa_fips186_5_gen_prob_primes(BIGNUM *p, BIGNUM *Xpout,
- BIGNUM *p1, BIGNUM *p2,
- const BIGNUM *Xp, const BIGNUM *Xp1,
- const BIGNUM *Xp2, int nlen,
- const BIGNUM *e, BN_CTX *ctx,
- BN_GENCB *cb, uint32_t c)
+ BIGNUM *p1, BIGNUM *p2,
+ const BIGNUM *Xp, const BIGNUM *Xp1,
+ const BIGNUM *Xp2, int nlen,
+ const BIGNUM *e, BN_CTX *ctx,
+ BN_GENCB *cb, uint32_t c)
{
int ret = 0;
BIGNUM *p1i = NULL, *p2i = NULL, *Xp1i = NULL, *Xp2i = NULL;
@@ -221,28 +221,27 @@ int ossl_bn_rsa_fips186_5_gen_prob_primes(BIGNUM *p, BIGNUM *Xpout,
if (Xp1 == NULL) {
/* Set the top and bottom bits to make it odd and the correct size */
if (!BN_priv_rand_ex(Xp1i, bitlen, BN_RAND_TOP_ONE, BN_RAND_BOTTOM_ODD,
- 0, ctx))
+ 0, ctx))
goto err;
}
/* (Steps 4.1/5.1): Randomly generate Xp2 if it is not passed in */
if (Xp2 == NULL) {
/* Set the top and bottom bits to make it odd and the correct size */
if (!BN_priv_rand_ex(Xp2i, bitlen, BN_RAND_TOP_ONE, BN_RAND_BOTTOM_ODD,
- 0, ctx))
+ 0, ctx))
goto err;
}
/* (Steps 4.2/5.2) - find first auxiliary probable primes */
if (!bn_rsa_fips186_5_find_aux_prob_prime(Xp1i, p1i, ctx, rounds, cb)
- || !bn_rsa_fips186_5_find_aux_prob_prime(Xp2i, p2i, ctx, rounds, cb))
+ || !bn_rsa_fips186_5_find_aux_prob_prime(Xp2i, p2i, ctx, rounds, cb))
goto err;
/* (FIPS 186-5 Table A.1) auxiliary prime Max length check */
- if ((BN_num_bits(p1i) + BN_num_bits(p2i)) >=
- bn_rsa_fips186_5_aux_prime_max_sum_size_for_prob_primes(nlen, c))
+ if ((BN_num_bits(p1i) + BN_num_bits(p2i)) >= bn_rsa_fips186_5_aux_prime_max_sum_size_for_prob_primes(nlen, c))
goto err;
/* (Steps 4.3/5.3) - generate prime */
if (!ossl_bn_rsa_fips186_5_derive_prime(p, Xpout, Xp, p1i, p2i, nlen, e,
- ctx, cb, c))
+ ctx, cb, c))
goto err;
ret = 1;
err:
@@ -259,8 +258,7 @@ err:
return ret;
}
-static ossl_inline
-int get_multiple_of_y_congruent_to_cmod8(BIGNUM *y, const BIGNUM *r1r2x2, int c)
+static ossl_inline int get_multiple_of_y_congruent_to_cmod8(BIGNUM *y, const BIGNUM *r1r2x2, int c)
{
int i = 0;
@@ -302,9 +300,9 @@ int get_multiple_of_y_congruent_to_cmod8(BIGNUM *y, const BIGNUM *r1r2x2, int c)
* Y, X, r1, r2, e are not NULL.
*/
int ossl_bn_rsa_fips186_5_derive_prime(BIGNUM *Y, BIGNUM *X, const BIGNUM *Xin,
- const BIGNUM *r1, const BIGNUM *r2,
- int nlen, const BIGNUM *e,
- BN_CTX *ctx, BN_GENCB *cb, uint32_t c)
+ const BIGNUM *r1, const BIGNUM *r2,
+ int nlen, const BIGNUM *e,
+ BN_CTX *ctx, BN_GENCB *cb, uint32_t c)
{
int ret = 0;
int i, imax, rounds;
@@ -341,7 +339,7 @@ int ossl_bn_rsa_fips186_5_derive_prime(BIGNUM *Y, BIGNUM *X, const BIGNUM *Xin,
if (bits < BN_num_bits(&ossl_bn_inv_sqrt_2))
goto err;
if (!BN_lshift(base, &ossl_bn_inv_sqrt_2,
- bits - BN_num_bits(&ossl_bn_inv_sqrt_2))
+ bits - BN_num_bits(&ossl_bn_inv_sqrt_2))
|| !BN_lshift(range, BN_value_one(), bits)
|| !BN_sub(range, range, base))
goto err;
@@ -423,7 +421,7 @@ int ossl_bn_rsa_fips186_5_derive_prime(BIGNUM *Y, BIGNUM *X, const BIGNUM *Xin,
/* (Step 7) If GCD(Y-1) == 1 & Y is probably prime then return Y */
if (BN_copy(y1, Y) == NULL
- || !BN_sub_word(y1, 1))
+ || !BN_sub_word(y1, 1))
goto err;
if (BN_are_coprime(y1, e, ctx)) {
diff --git a/crypto/bn/bn_s390x.c b/crypto/bn/bn_s390x.c
index 984bba5009..599f4eba58 100644
--- a/crypto/bn/bn_s390x.c
+++ b/crypto/bn/bn_s390x.c
@@ -12,16 +12,16 @@
#ifdef S390X_MOD_EXP
-# include <sys/types.h>
-# include <sys/stat.h>
-# include <fcntl.h>
-# include <asm/zcrypt.h>
-# include <sys/ioctl.h>
-# include <unistd.h>
-# include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <asm/zcrypt.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
+#include <errno.h>
static int s390x_mod_exp_hw(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
- const BIGNUM *m)
+ const BIGNUM *m)
{
struct ica_rsa_modexpo me;
unsigned char *buffer;
@@ -63,13 +63,13 @@ static int s390x_mod_exp_hw(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
*/
OPENSSL_s390xcex_nodev = 1;
}
- dealloc:
+dealloc:
OPENSSL_clear_free(buffer, 4 * size);
return res;
}
int s390x_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
- const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx)
+ const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx)
{
if (s390x_mod_exp_hw(r, a, p, m) == 1)
return 1;
@@ -77,7 +77,7 @@ int s390x_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
}
int s390x_crt(BIGNUM *r, const BIGNUM *i, const BIGNUM *p, const BIGNUM *q,
- const BIGNUM *dmp, const BIGNUM *dmq, const BIGNUM *iqmp)
+ const BIGNUM *dmp, const BIGNUM *dmq, const BIGNUM *iqmp)
{
struct ica_rsa_modexpo_crt crt;
unsigned char *buffer, *part;
@@ -140,20 +140,20 @@ int s390x_crt(BIGNUM *r, const BIGNUM *i, const BIGNUM *p, const BIGNUM *q,
*/
OPENSSL_s390xcex_nodev = 1;
}
- dealloc:
+dealloc:
OPENSSL_clear_free(buffer, 9 * size + 24);
return res;
}
#else
int s390x_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
- const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx)
+ const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx)
{
return BN_mod_exp_mont(r, a, p, m, ctx, m_ctx);
}
int s390x_crt(BIGNUM *r, const BIGNUM *i, const BIGNUM *p, const BIGNUM *q,
- const BIGNUM *dmp, const BIGNUM *dmq, const BIGNUM *iqmp)
+ const BIGNUM *dmp, const BIGNUM *dmq, const BIGNUM *iqmp)
{
return 0;
}
diff --git a/crypto/bn/bn_shift.c b/crypto/bn/bn_shift.c
index eae801bc89..1ba635096e 100644
--- a/crypto/bn/bn_shift.c
+++ b/crypto/bn/bn_shift.c
@@ -120,8 +120,8 @@ int bn_lshift_fixed_top(BIGNUM *r, const BIGNUM *a, int n)
if (a->top != 0) {
lb = (unsigned int)n % BN_BITS2;
rb = BN_BITS2 - lb;
- rb %= BN_BITS2; /* say no to undefined behaviour */
- rmask = (BN_ULONG)0 - rb; /* rmask = 0 - (rb != 0) */
+ rb %= BN_BITS2; /* say no to undefined behaviour */
+ rmask = (BN_ULONG)0 - rb; /* rmask = 0 - (rb != 0) */
rmask |= rmask >> 8;
f = &(a->d[0]);
t = &(r->d[nw]);
@@ -191,8 +191,8 @@ int bn_rshift_fixed_top(BIGNUM *r, const BIGNUM *a, int n)
rb = (unsigned int)n % BN_BITS2;
lb = BN_BITS2 - rb;
- lb %= BN_BITS2; /* say no to undefined behaviour */
- mask = (BN_ULONG)0 - lb; /* mask = 0 - (lb != 0) */
+ lb %= BN_BITS2; /* say no to undefined behaviour */
+ mask = (BN_ULONG)0 - lb; /* mask = 0 - (lb != 0) */
mask |= mask >> 8;
top = a->top - nw;
if (r != a && bn_wexpand(r, top) == NULL)
diff --git a/crypto/bn/bn_sparc.c b/crypto/bn/bn_sparc.c
index a810c3b1fa..a236e42dfa 100644
--- a/crypto/bn/bn_sparc.c
+++ b/crypto/bn/bn_sparc.c
@@ -11,66 +11,61 @@
#include <openssl/bn.h>
#include "internal/cryptlib.h"
#include "crypto/sparc_arch.h"
-#include "bn_local.h" /* for definition of bn_mul_mont */
+#include "bn_local.h" /* for definition of bn_mul_mont */
int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
- const BN_ULONG *np, const BN_ULONG *n0, int num)
+ const BN_ULONG *np, const BN_ULONG *n0, int num)
{
- int bn_mul_mont_vis3(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
- const BN_ULONG *np, const BN_ULONG *n0, int num);
- int bn_mul_mont_fpu(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
- const BN_ULONG *np, const BN_ULONG *n0, int num);
- int bn_mul_mont_int(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
- const BN_ULONG *np, const BN_ULONG *n0, int num);
+ int bn_mul_mont_vis3(BN_ULONG * rp, const BN_ULONG *ap, const BN_ULONG *bp,
+ const BN_ULONG *np, const BN_ULONG *n0, int num);
+ int bn_mul_mont_fpu(BN_ULONG * rp, const BN_ULONG *ap, const BN_ULONG *bp,
+ const BN_ULONG *np, const BN_ULONG *n0, int num);
+ int bn_mul_mont_int(BN_ULONG * rp, const BN_ULONG *ap, const BN_ULONG *bp,
+ const BN_ULONG *np, const BN_ULONG *n0, int num);
if (!(num & 1) && num >= 6) {
- if ((num & 15) == 0 && num <= 64 &&
- (OPENSSL_sparcv9cap_P[1] & (CFR_MONTMUL | CFR_MONTSQR)) ==
- (CFR_MONTMUL | CFR_MONTSQR)) {
- typedef int (*bn_mul_mont_f) (BN_ULONG *rp, const BN_ULONG *ap,
- const BN_ULONG *bp,
- const BN_ULONG *np,
- const BN_ULONG *n0);
- int bn_mul_mont_t4_8(BN_ULONG *rp, const BN_ULONG *ap,
- const BN_ULONG *bp, const BN_ULONG *np,
- const BN_ULONG *n0);
- int bn_mul_mont_t4_16(BN_ULONG *rp, const BN_ULONG *ap,
- const BN_ULONG *bp, const BN_ULONG *np,
- const BN_ULONG *n0);
- int bn_mul_mont_t4_24(BN_ULONG *rp, const BN_ULONG *ap,
- const BN_ULONG *bp, const BN_ULONG *np,
- const BN_ULONG *n0);
- int bn_mul_mont_t4_32(BN_ULONG *rp, const BN_ULONG *ap,
- const BN_ULONG *bp, const BN_ULONG *np,
- const BN_ULONG *n0);
+ if ((num & 15) == 0 && num <= 64 && (OPENSSL_sparcv9cap_P[1] & (CFR_MONTMUL | CFR_MONTSQR)) == (CFR_MONTMUL | CFR_MONTSQR)) {
+ typedef int (*bn_mul_mont_f)(BN_ULONG *rp, const BN_ULONG *ap,
+ const BN_ULONG *bp,
+ const BN_ULONG *np,
+ const BN_ULONG *n0);
+ int bn_mul_mont_t4_8(BN_ULONG * rp, const BN_ULONG *ap,
+ const BN_ULONG *bp, const BN_ULONG *np,
+ const BN_ULONG *n0);
+ int bn_mul_mont_t4_16(BN_ULONG * rp, const BN_ULONG *ap,
+ const BN_ULONG *bp, const BN_ULONG *np,
+ const BN_ULONG *n0);
+ int bn_mul_mont_t4_24(BN_ULONG * rp, const BN_ULONG *ap,
+ const BN_ULONG *bp, const BN_ULONG *np,
+ const BN_ULONG *n0);
+ int bn_mul_mont_t4_32(BN_ULONG * rp, const BN_ULONG *ap,
+ const BN_ULONG *bp, const BN_ULONG *np,
+ const BN_ULONG *n0);
static const bn_mul_mont_f funcs[4] = {
bn_mul_mont_t4_8, bn_mul_mont_t4_16,
bn_mul_mont_t4_24, bn_mul_mont_t4_32
};
bn_mul_mont_f worker = funcs[num / 16 - 1];
- if ((*worker) (rp, ap, bp, np, n0))
+ if ((*worker)(rp, ap, bp, np, n0))
return 1;
/* retry once and fall back */
- if ((*worker) (rp, ap, bp, np, n0))
+ if ((*worker)(rp, ap, bp, np, n0))
return 1;
return bn_mul_mont_vis3(rp, ap, bp, np, n0, num);
}
if ((OPENSSL_sparcv9cap_P[0] & SPARCV9_VIS3))
return bn_mul_mont_vis3(rp, ap, bp, np, n0, num);
else if (num >= 8 &&
- /*
- * bn_mul_mont_fpu doesn't use FMADD, we just use the
- * flag to detect when FPU path is preferable in cases
- * when current heuristics is unreliable. [it works
- * out because FMADD-capable processors where FPU
- * code path is undesirable are also VIS3-capable and
- * VIS3 code path takes precedence.]
- */
- ( (OPENSSL_sparcv9cap_P[0] & SPARCV9_FMADD) ||
- (OPENSSL_sparcv9cap_P[0] &
- (SPARCV9_PREFER_FPU | SPARCV9_VIS1)) ==
- (SPARCV9_PREFER_FPU | SPARCV9_VIS1) ))
+ /*
+ * bn_mul_mont_fpu doesn't use FMADD, we just use the
+ * flag to detect when FPU path is preferable in cases
+ * when current heuristics is unreliable. [it works
+ * out because FMADD-capable processors where FPU
+ * code path is undesirable are also VIS3-capable and
+ * VIS3 code path takes precedence.]
+ */
+ ((OPENSSL_sparcv9cap_P[0] & SPARCV9_FMADD) || (OPENSSL_sparcv9cap_P[0] & (SPARCV9_PREFER_FPU | SPARCV9_VIS1)) == (SPARCV9_PREFER_FPU | SPARCV9_VIS1)))
return bn_mul_mont_fpu(rp, ap, bp, np, n0, num);
}
return bn_mul_mont_int(rp, ap, bp, np, n0, num);
diff --git a/crypto/bn/bn_sqr.c b/crypto/bn/bn_sqr.c
index 990bed90b5..34b33a30a3 100644
--- a/crypto/bn/bn_sqr.c
+++ b/crypto/bn/bn_sqr.c
@@ -45,7 +45,7 @@ int bn_sqr_fixed_top(BIGNUM *r, const BIGNUM *a, BN_CTX *ctx)
if (rr == NULL || tmp == NULL)
goto err;
- max = 2 * al; /* Non-zero (from above) */
+ max = 2 * al; /* Non-zero (from above) */
if (bn_wexpand(rr, max) == NULL)
goto err;
@@ -98,7 +98,7 @@ int bn_sqr_fixed_top(BIGNUM *r, const BIGNUM *a, BN_CTX *ctx)
goto err;
ret = 1;
- err:
+err:
bn_check_top(rr);
bn_check_top(tmp);
BN_CTX_end(ctx);
@@ -160,18 +160,18 @@ void bn_sqr_recursive(BN_ULONG *r, const BN_ULONG *a, int n2, BN_ULONG *t)
BN_ULONG ln, lo, *p;
if (n2 == 4) {
-# ifndef BN_SQR_COMBA
+#ifndef BN_SQR_COMBA
bn_sqr_normal(r, a, 4, t);
-# else
+#else
bn_sqr_comba4(r, a);
-# endif
+#endif
return;
} else if (n2 == 8) {
-# ifndef BN_SQR_COMBA
+#ifndef BN_SQR_COMBA
bn_sqr_normal(r, a, 8, t);
-# else
+#else
bn_sqr_comba8(r, a);
-# endif
+#endif
return;
}
if (n2 < BN_SQR_RECURSIVE_SIZE_NORMAL) {
diff --git a/crypto/bn/bn_sqrt.c b/crypto/bn/bn_sqrt.c
index 5c77e72132..4b4bc7d5d1 100644
--- a/crypto/bn/bn_sqrt.c
+++ b/crypto/bn/bn_sqrt.c
@@ -171,7 +171,7 @@ BIGNUM *BN_mod_sqrt(BIGNUM *in, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
* find some y that is not a square.
*/
if (!BN_copy(q, p))
- goto end; /* use 'q' as temp */
+ goto end; /* use 'q' as temp */
q->neg = 0;
i = 2;
do {
@@ -186,7 +186,7 @@ BIGNUM *BN_mod_sqrt(BIGNUM *in, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
if (!BN_priv_rand_ex(y, BN_num_bits(p), 0, 0, 0, ctx))
goto end;
if (BN_ucmp(y, p) >= 0) {
- if (!(p->neg ? BN_add : BN_sub) (y, y, p))
+ if (!(p->neg ? BN_add : BN_sub)(y, y, p))
goto end;
}
/* now 0 <= y < |p| */
@@ -203,8 +203,7 @@ BIGNUM *BN_mod_sqrt(BIGNUM *in, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
ERR_raise(ERR_LIB_BN, BN_R_P_IS_NOT_PRIME);
goto end;
}
- }
- while (r == 1 && ++i < 82);
+ } while (r == 1 && ++i < 82);
if (r != -1) {
/*
@@ -255,7 +254,7 @@ BIGNUM *BN_mod_sqrt(BIGNUM *in, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
goto end;
/* x := a^((q-1)/2) */
- if (BN_is_zero(t)) { /* special case: p = 2^e + 1 */
+ if (BN_is_zero(t)) { /* special case: p = 2^e + 1 */
if (!BN_nnmod(t, A, p, ctx))
goto end;
if (BN_is_zero(t)) {
@@ -339,7 +338,7 @@ BIGNUM *BN_mod_sqrt(BIGNUM *in, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
e = i;
}
- vrfy:
+vrfy:
if (!err) {
/*
* verify the result -- the input might have been not a square (test
@@ -355,7 +354,7 @@ BIGNUM *BN_mod_sqrt(BIGNUM *in, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
}
}
- end:
+end:
if (err) {
if (ret != in)
BN_clear_free(ret);
diff --git a/crypto/bn/bn_srp.c b/crypto/bn/bn_srp.c
index ffb8fc61e0..1cc30a56dd 100644
--- a/crypto/bn/bn_srp.c
+++ b/crypto/bn/bn_srp.c
@@ -15,19 +15,19 @@
#include <openssl/srp.h>
#include "crypto/bn_srp.h"
-# if (BN_BYTES == 8)
-# if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__)
-# define bn_pack4(a1,a2,a3,a4) ((a1##UI64<<48)|(a2##UI64<<32)|(a3##UI64<<16)|a4##UI64)
-# elif defined(__arch64__)
-# define bn_pack4(a1,a2,a3,a4) ((a1##UL<<48)|(a2##UL<<32)|(a3##UL<<16)|a4##UL)
-# else
-# define bn_pack4(a1,a2,a3,a4) ((a1##ULL<<48)|(a2##ULL<<32)|(a3##ULL<<16)|a4##ULL)
-# endif
-# elif (BN_BYTES == 4)
-# define bn_pack4(a1,a2,a3,a4) ((a3##UL<<16)|a4##UL), ((a1##UL<<16)|a2##UL)
-# else
-# error "unsupported BN_BYTES"
-# endif
+#if (BN_BYTES == 8)
+#if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__)
+#define bn_pack4(a1, a2, a3, a4) ((a1##UI64 << 48) | (a2##UI64 << 32) | (a3##UI64 << 16) | a4##UI64)
+#elif defined(__arch64__)
+#define bn_pack4(a1, a2, a3, a4) ((a1##UL << 48) | (a2##UL << 32) | (a3##UL << 16) | a4##UL)
+#else
+#define bn_pack4(a1, a2, a3, a4) ((a1##ULL << 48) | (a2##ULL << 32) | (a3##ULL << 16) | a4##ULL)
+#endif
+#elif (BN_BYTES == 4)
+#define bn_pack4(a1, a2, a3, a4) ((a3##UL << 16) | a4##UL), ((a1##UL << 16) | a2##UL)
+#else
+#error "unsupported BN_BYTES"
+#endif
static const BN_ULONG bn_group_1024_value[] = {
bn_pack4(0x9FC6, 0x1D2F, 0xC0EB, 0x06E3),
diff --git a/crypto/bn/bn_word.c b/crypto/bn/bn_word.c
index 93c014793e..80c5413e80 100644
--- a/crypto/bn/bn_word.c
+++ b/crypto/bn/bn_word.c
@@ -51,8 +51,7 @@ BN_ULONG BN_mod_word(const BIGNUM *a, BN_ULONG w)
ret = ((ret << BN_BITS4) | ((a->d[i] >> BN_BITS4) & BN_MASK2l)) % w;
ret = ((ret << BN_BITS4) | (a->d[i] & BN_MASK2l)) % w;
#else
- ret = (BN_ULLONG) (((ret << (BN_ULLONG) BN_BITS2) | a->d[i]) %
- (BN_ULLONG) w);
+ ret = (BN_ULLONG)(((ret << (BN_ULLONG)BN_BITS2) | a->d[i]) % (BN_ULLONG)w);
#endif
}
return (BN_ULONG)ret;
diff --git a/crypto/bn/bn_x931p.c b/crypto/bn/bn_x931p.c
index 20d35cf7af..2a86f7391b 100644
--- a/crypto/bn/bn_x931p.c
+++ b/crypto/bn/bn_x931p.c
@@ -21,7 +21,7 @@
*/
static int bn_x931_derive_pi(BIGNUM *pi, const BIGNUM *Xpi, BN_CTX *ctx,
- BN_GENCB *cb)
+ BN_GENCB *cb)
{
int i = 0, is_prime;
if (!BN_copy(pi, Xpi))
@@ -51,9 +51,9 @@ static int bn_x931_derive_pi(BIGNUM *pi, const BIGNUM *Xpi, BN_CTX *ctx,
*/
int BN_X931_derive_prime_ex(BIGNUM *p, BIGNUM *p1, BIGNUM *p2,
- const BIGNUM *Xp, const BIGNUM *Xp1,
- const BIGNUM *Xp2, const BIGNUM *e, BN_CTX *ctx,
- BN_GENCB *cb)
+ const BIGNUM *Xp, const BIGNUM *Xp1,
+ const BIGNUM *Xp2, const BIGNUM *e, BN_CTX *ctx,
+ BN_GENCB *cb)
{
int ret = 0;
@@ -147,7 +147,7 @@ int BN_X931_derive_prime_ex(BIGNUM *p, BIGNUM *p1, BIGNUM *p2,
ret = 1;
- err:
+err:
BN_CTX_end(ctx);
@@ -176,7 +176,7 @@ int BN_X931_generate_Xpq(BIGNUM *Xp, BIGNUM *Xq, int nbits, BN_CTX *ctx)
* exceeded.
*/
if (!BN_priv_rand_ex(Xp, nbits, BN_RAND_TOP_TWO, BN_RAND_BOTTOM_ANY, 0,
- ctx))
+ ctx))
return 0;
BN_CTX_start(ctx);
@@ -186,7 +186,7 @@ int BN_X931_generate_Xpq(BIGNUM *Xp, BIGNUM *Xq, int nbits, BN_CTX *ctx)
for (i = 0; i < 1000; i++) {
if (!BN_priv_rand_ex(Xq, nbits, BN_RAND_TOP_TWO, BN_RAND_BOTTOM_ANY, 0,
- ctx))
+ ctx))
goto err;
/* Check that |Xp - Xq| > 2^(nbits - 100) */
@@ -203,7 +203,7 @@ int BN_X931_generate_Xpq(BIGNUM *Xp, BIGNUM *Xq, int nbits, BN_CTX *ctx)
return 0;
- err:
+err:
BN_CTX_end(ctx);
return 0;
}
@@ -217,9 +217,9 @@ int BN_X931_generate_Xpq(BIGNUM *Xp, BIGNUM *Xq, int nbits, BN_CTX *ctx)
*/
int BN_X931_generate_prime_ex(BIGNUM *p, BIGNUM *p1, BIGNUM *p2,
- BIGNUM *Xp1, BIGNUM *Xp2,
- const BIGNUM *Xp,
- const BIGNUM *e, BN_CTX *ctx, BN_GENCB *cb)
+ BIGNUM *Xp1, BIGNUM *Xp2,
+ const BIGNUM *Xp,
+ const BIGNUM *e, BN_CTX *ctx, BN_GENCB *cb)
{
int ret = 0;
@@ -240,9 +240,8 @@ int BN_X931_generate_prime_ex(BIGNUM *p, BIGNUM *p1, BIGNUM *p2,
ret = 1;
- error:
+error:
BN_CTX_end(ctx);
return ret;
-
}
diff --git a/crypto/bn/rsaz_exp.c b/crypto/bn/rsaz_exp.c
index 80b583f35a..b52eacb44a 100644
--- a/crypto/bn/rsaz_exp.c
+++ b/crypto/bn/rsaz_exp.c
@@ -25,15 +25,15 @@ NON_EMPTY_TRANSLATION_UNIT
*/
void rsaz_1024_norm2red_avx2(void *red, const void *norm);
void rsaz_1024_mul_avx2(void *ret, const void *a, const void *b,
- const void *n, BN_ULONG k);
+ const void *n, BN_ULONG k);
void rsaz_1024_sqr_avx2(void *ret, const void *a, const void *n, BN_ULONG k,
- int cnt);
+ int cnt);
void rsaz_1024_scatter5_avx2(void *tbl, const void *val, int i);
void rsaz_1024_gather5_avx2(void *val, const void *tbl, int i);
void rsaz_1024_red2norm_avx2(void *norm, const void *red);
#if defined(__SUNPRO_C)
-# pragma align 64(one,two80)
+#pragma align 64(one, two80)
#endif
ALIGN64 static const BN_ULONG one[40] = {
@@ -47,10 +47,10 @@ ALIGN64 static const BN_ULONG two80[40] = {
};
void RSAZ_1024_mod_exp_avx2(BN_ULONG result_norm[16],
- const BN_ULONG base_norm[16],
- const BN_ULONG exponent[16],
- const BN_ULONG m_norm[16], const BN_ULONG RR[16],
- BN_ULONG k0)
+ const BN_ULONG base_norm[16],
+ const BN_ULONG exponent[16],
+ const BN_ULONG m_norm[16], const BN_ULONG RR[16],
+ BN_ULONG k0)
{
unsigned char storage[320 * 3 + 32 * 9 * 16 + 64]; /* 5.5KB */
unsigned char *p_str = storage + (64 - ((size_t)storage % 64));
@@ -64,9 +64,9 @@ void RSAZ_1024_mod_exp_avx2(BN_ULONG result_norm[16],
if ((((size_t)p_str & 4095) + 320) >> 12) {
result = p_str;
a_inv = p_str + 320;
- m = p_str + 320 * 2; /* should not cross page */
+ m = p_str + 320 * 2; /* should not cross page */
} else {
- m = p_str; /* should not cross page */
+ m = p_str; /* should not cross page */
result = p_str + 320;
a_inv = p_str + 320 * 2;
}
@@ -206,7 +206,7 @@ void RSAZ_1024_mod_exp_avx2(BN_ULONG result_norm[16],
index = 1014;
- while (index > -1) { /* loop for the remaining 127 windows */
+ while (index > -1) { /* loop for the remaining 127 windows */
rsaz_1024_sqr_avx2(result, result, m, k0, 5);
@@ -241,20 +241,20 @@ void RSAZ_1024_mod_exp_avx2(BN_ULONG result_norm[16],
* See crypto/bn/rsaz-x86_64.pl for further details.
*/
void rsaz_512_mul(void *ret, const void *a, const void *b, const void *n,
- BN_ULONG k);
+ BN_ULONG k);
void rsaz_512_mul_scatter4(void *ret, const void *a, const void *n,
- BN_ULONG k, const void *tbl, unsigned int power);
+ BN_ULONG k, const void *tbl, unsigned int power);
void rsaz_512_mul_gather4(void *ret, const void *a, const void *tbl,
- const void *n, BN_ULONG k, unsigned int power);
+ const void *n, BN_ULONG k, unsigned int power);
void rsaz_512_mul_by_one(void *ret, const void *a, const void *n, BN_ULONG k);
void rsaz_512_sqr(void *ret, const void *a, const void *n, BN_ULONG k,
- int cnt);
+ int cnt);
void rsaz_512_scatter4(void *tbl, const BN_ULONG *val, int power);
void rsaz_512_gather4(BN_ULONG *val, const void *tbl, int power);
void RSAZ_512_mod_exp(BN_ULONG result[8],
- const BN_ULONG base[8], const BN_ULONG exponent[8],
- const BN_ULONG m[8], BN_ULONG k0, const BN_ULONG RR[8])
+ const BN_ULONG base[8], const BN_ULONG exponent[8],
+ const BN_ULONG m[8], BN_ULONG k0, const BN_ULONG RR[8])
{
unsigned char storage[16 * 8 * 8 + 64 * 2 + 64]; /* 1.2KB */
unsigned char *table = storage + (64 - ((size_t)storage % 64));
diff --git a/crypto/bn/rsaz_exp.h b/crypto/bn/rsaz_exp.h
index f1e2470054..65b66be0d3 100644
--- a/crypto/bn/rsaz_exp.h
+++ b/crypto/bn/rsaz_exp.h
@@ -13,52 +13,49 @@
*/
#ifndef OSSL_CRYPTO_BN_RSAZ_EXP_H
-# define OSSL_CRYPTO_BN_RSAZ_EXP_H
+#define OSSL_CRYPTO_BN_RSAZ_EXP_H
-# undef RSAZ_ENABLED
-# if defined(OPENSSL_BN_ASM_MONT) && \
- (defined(__x86_64) || defined(__x86_64__) || \
- defined(_M_AMD64) || defined(_M_X64))
-# define RSAZ_ENABLED
+#undef RSAZ_ENABLED
+#if defined(OPENSSL_BN_ASM_MONT) && (defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64))
+#define RSAZ_ENABLED
-# include <openssl/bn.h>
-# include "internal/constant_time.h"
-# include "bn_local.h"
+#include <openssl/bn.h>
+#include "internal/constant_time.h"
+#include "bn_local.h"
void RSAZ_1024_mod_exp_avx2(BN_ULONG result[16],
- const BN_ULONG base_norm[16],
- const BN_ULONG exponent[16],
- const BN_ULONG m_norm[16], const BN_ULONG RR[16],
- BN_ULONG k0);
+ const BN_ULONG base_norm[16],
+ const BN_ULONG exponent[16],
+ const BN_ULONG m_norm[16], const BN_ULONG RR[16],
+ BN_ULONG k0);
int rsaz_avx2_eligible(void);
void RSAZ_512_mod_exp(BN_ULONG result[8],
- const BN_ULONG base_norm[8], const BN_ULONG exponent[8],
- const BN_ULONG m_norm[8], BN_ULONG k0,
- const BN_ULONG RR[8]);
-
+ const BN_ULONG base_norm[8], const BN_ULONG exponent[8],
+ const BN_ULONG m_norm[8], BN_ULONG k0,
+ const BN_ULONG RR[8]);
int ossl_rsaz_avx512ifma_eligible(void);
int ossl_rsaz_avxifma_eligible(void);
int ossl_rsaz_mod_exp_avx512_x2(BN_ULONG *res1,
- const BN_ULONG *base1,
- const BN_ULONG *exponent1,
- const BN_ULONG *m1,
- const BN_ULONG *RR1,
- BN_ULONG k0_1,
- BN_ULONG *res2,
- const BN_ULONG *base2,
- const BN_ULONG *exponent2,
- const BN_ULONG *m2,
- const BN_ULONG *RR2,
- BN_ULONG k0_2,
- int factor_size);
+ const BN_ULONG *base1,
+ const BN_ULONG *exponent1,
+ const BN_ULONG *m1,
+ const BN_ULONG *RR1,
+ BN_ULONG k0_1,
+ BN_ULONG *res2,
+ const BN_ULONG *base2,
+ const BN_ULONG *exponent2,
+ const BN_ULONG *m2,
+ const BN_ULONG *RR2,
+ BN_ULONG k0_2,
+ int factor_size);
static ossl_inline void bn_select_words(BN_ULONG *r, BN_ULONG mask,
- const BN_ULONG *a,
- const BN_ULONG *b, size_t num)
+ const BN_ULONG *a,
+ const BN_ULONG *b, size_t num)
{
size_t i;
@@ -68,15 +65,15 @@ static ossl_inline void bn_select_words(BN_ULONG *r, BN_ULONG mask,
}
static ossl_inline BN_ULONG bn_reduce_once_in_place(BN_ULONG *r,
- BN_ULONG carry,
- const BN_ULONG *m,
- BN_ULONG *tmp, size_t num)
+ BN_ULONG carry,
+ const BN_ULONG *m,
+ BN_ULONG *tmp, size_t num)
{
carry -= bn_sub_words(tmp, r, m, (int)num);
bn_select_words(r, carry, r /* tmp < 0 */, tmp /* tmp >= 0 */, num);
return carry;
}
-# endif
+#endif
#endif
diff --git a/crypto/bn/rsaz_exp_x2.c b/crypto/bn/rsaz_exp_x2.c
index 023d0cc30e..b9368fc045 100644
--- a/crypto/bn/rsaz_exp_x2.c
+++ b/crypto/bn/rsaz_exp_x2.c
@@ -21,28 +21,28 @@
#ifndef RSAZ_ENABLED
NON_EMPTY_TRANSLATION_UNIT
#else
-# include <assert.h>
-# include <string.h>
+#include <assert.h>
+#include <string.h>
-# define ALIGN_OF(ptr, boundary) \
+#define ALIGN_OF(ptr, boundary) \
((unsigned char *)(ptr) + (boundary - (((size_t)(ptr)) & (boundary - 1))))
/* Internal radix */
-# define DIGIT_SIZE (52)
+#define DIGIT_SIZE (52)
/* 52-bit mask */
-# define DIGIT_MASK ((uint64_t)0xFFFFFFFFFFFFF)
+#define DIGIT_MASK ((uint64_t)0xFFFFFFFFFFFFF)
-# define BITS2WORD8_SIZE(x) (((x) + 7) >> 3)
-# define BITS2WORD64_SIZE(x) (((x) + 63) >> 6)
+#define BITS2WORD8_SIZE(x) (((x) + 7) >> 3)
+#define BITS2WORD64_SIZE(x) (((x) + 63) >> 6)
/* Number of registers required to hold |digits_num| amount of qword digits */
-# define NUMBER_OF_REGISTERS(digits_num, register_size) \
+#define NUMBER_OF_REGISTERS(digits_num, register_size) \
(((digits_num) * 64 + (register_size) - 1) / (register_size))
static ossl_inline uint64_t get_digit(const uint8_t *in, int in_len);
static ossl_inline void put_digit(uint8_t *out, int out_len, uint64_t digit);
static void to_words52(BN_ULONG *out, int out_len, const BN_ULONG *in,
- int in_bitsize);
+ int in_bitsize);
static void from_words52(BN_ULONG *bn_out, int out_bitsize, const BN_ULONG *in);
static ossl_inline void set_bit(BN_ULONG *a, int idx);
@@ -66,99 +66,108 @@ static ossl_inline int number_of_digits(int bitsize, int digit_size)
*/
void ossl_rsaz_amm52x20_x1_ifma256(BN_ULONG *res, const BN_ULONG *a,
- const BN_ULONG *b, const BN_ULONG *m,
- BN_ULONG k0);
+ const BN_ULONG *b, const BN_ULONG *m,
+ BN_ULONG k0);
void ossl_rsaz_amm52x20_x2_ifma256(BN_ULONG *out, const BN_ULONG *a,
- const BN_ULONG *b, const BN_ULONG *m,
- const BN_ULONG k0[2]);
+ const BN_ULONG *b, const BN_ULONG *m,
+ const BN_ULONG k0[2]);
void ossl_extract_multiplier_2x20_win5(BN_ULONG *red_Y,
- const BN_ULONG *red_table,
- int red_table_idx1, int red_table_idx2);
+ const BN_ULONG *red_table,
+ int red_table_idx1, int red_table_idx2);
void ossl_rsaz_amm52x30_x1_ifma256(BN_ULONG *res, const BN_ULONG *a,
- const BN_ULONG *b, const BN_ULONG *m,
- BN_ULONG k0);
+ const BN_ULONG *b, const BN_ULONG *m,
+ BN_ULONG k0);
void ossl_rsaz_amm52x30_x2_ifma256(BN_ULONG *out, const BN_ULONG *a,
- const BN_ULONG *b, const BN_ULONG *m,
- const BN_ULONG k0[2]);
+ const BN_ULONG *b, const BN_ULONG *m,
+ const BN_ULONG k0[2]);
void ossl_extract_multiplier_2x30_win5(BN_ULONG *red_Y,
- const BN_ULONG *red_table,
- int red_table_idx1, int red_table_idx2);
+ const BN_ULONG *red_table,
+ int red_table_idx1, int red_table_idx2);
void ossl_rsaz_amm52x40_x1_ifma256(BN_ULONG *res, const BN_ULONG *a,
- const BN_ULONG *b, const BN_ULONG *m,
- BN_ULONG k0);
+ const BN_ULONG *b, const BN_ULONG *m,
+ BN_ULONG k0);
void ossl_rsaz_amm52x40_x2_ifma256(BN_ULONG *out, const BN_ULONG *a,
- const BN_ULONG *b, const BN_ULONG *m,
- const BN_ULONG k0[2]);
+ const BN_ULONG *b, const BN_ULONG *m,
+ const BN_ULONG k0[2]);
void ossl_extract_multiplier_2x40_win5(BN_ULONG *red_Y,
- const BN_ULONG *red_table,
- int red_table_idx1, int red_table_idx2);
+ const BN_ULONG *red_table,
+ int red_table_idx1, int red_table_idx2);
void ossl_rsaz_amm52x20_x1_avxifma256(BN_ULONG *res, const BN_ULONG *a,
- const BN_ULONG *b, const BN_ULONG *m,
- BN_ULONG k0);
+ const BN_ULONG *b, const BN_ULONG *m,
+ BN_ULONG k0);
void ossl_rsaz_amm52x20_x2_avxifma256(BN_ULONG *out, const BN_ULONG *a,
- const BN_ULONG *b, const BN_ULONG *m,
- const BN_ULONG k0[2]);
+ const BN_ULONG *b, const BN_ULONG *m,
+ const BN_ULONG k0[2]);
void ossl_extract_multiplier_2x20_win5_avx(BN_ULONG *red_Y,
- const BN_ULONG *red_table,
- int red_table_idx1,
- int red_table_idx2);
+ const BN_ULONG *red_table,
+ int red_table_idx1,
+ int red_table_idx2);
void ossl_rsaz_amm52x30_x1_avxifma256(BN_ULONG *res, const BN_ULONG *a,
- const BN_ULONG *b, const BN_ULONG *m,
- BN_ULONG k0);
+ const BN_ULONG *b, const BN_ULONG *m,
+ BN_ULONG k0);
void ossl_rsaz_amm52x30_x2_avxifma256(BN_ULONG *out, const BN_ULONG *a,
- const BN_ULONG *b, const BN_ULONG *m,
- const BN_ULONG k0[2]);
+ const BN_ULONG *b, const BN_ULONG *m,
+ const BN_ULONG k0[2]);
void ossl_extract_multiplier_2x30_win5_avx(BN_ULONG *red_Y,
- const BN_ULONG *red_table,
- int red_table_idx1,
- int red_table_idx2);
+ const BN_ULONG *red_table,
+ int red_table_idx1,
+ int red_table_idx2);
void ossl_rsaz_amm52x40_x1_avxifma256(BN_ULONG *res, const BN_ULONG *a,
- const BN_ULONG *b, const BN_ULONG *m,
- BN_ULONG k0);
+ const BN_ULONG *b, const BN_ULONG *m,
+ BN_ULONG k0);
void ossl_rsaz_amm52x40_x2_avxifma256(BN_ULONG *out, const BN_ULONG *a,
- const BN_ULONG *b, const BN_ULONG *m,
- const BN_ULONG k0[2]);
+ const BN_ULONG *b, const BN_ULONG *m,
+ const BN_ULONG k0[2]);
void ossl_extract_multiplier_2x40_win5_avx(BN_ULONG *red_Y,
- const BN_ULONG *red_table,
- int red_table_idx1,
- int red_table_idx2);
+ const BN_ULONG *red_table,
+ int red_table_idx1,
+ int red_table_idx2);
typedef void (*AMM)(BN_ULONG *res, const BN_ULONG *a, const BN_ULONG *b,
- const BN_ULONG *m, BN_ULONG k0);
+ const BN_ULONG *m, BN_ULONG k0);
static AMM ossl_rsaz_amm52_x1[] = {
- ossl_rsaz_amm52x20_x1_avxifma256, ossl_rsaz_amm52x20_x1_ifma256,
- ossl_rsaz_amm52x30_x1_avxifma256, ossl_rsaz_amm52x30_x1_ifma256,
- ossl_rsaz_amm52x40_x1_avxifma256, ossl_rsaz_amm52x40_x1_ifma256,
+ ossl_rsaz_amm52x20_x1_avxifma256,
+ ossl_rsaz_amm52x20_x1_ifma256,
+ ossl_rsaz_amm52x30_x1_avxifma256,
+ ossl_rsaz_amm52x30_x1_ifma256,
+ ossl_rsaz_amm52x40_x1_avxifma256,
+ ossl_rsaz_amm52x40_x1_ifma256,
};
typedef void (*DAMM)(BN_ULONG *res, const BN_ULONG *a, const BN_ULONG *b,
- const BN_ULONG *m, const BN_ULONG k0[2]);
+ const BN_ULONG *m, const BN_ULONG k0[2]);
static DAMM ossl_rsaz_amm52_x2[] = {
- ossl_rsaz_amm52x20_x2_avxifma256, ossl_rsaz_amm52x20_x2_ifma256,
- ossl_rsaz_amm52x30_x2_avxifma256, ossl_rsaz_amm52x30_x2_ifma256,
- ossl_rsaz_amm52x40_x2_avxifma256, ossl_rsaz_amm52x40_x2_ifma256,
+ ossl_rsaz_amm52x20_x2_avxifma256,
+ ossl_rsaz_amm52x20_x2_ifma256,
+ ossl_rsaz_amm52x30_x2_avxifma256,
+ ossl_rsaz_amm52x30_x2_ifma256,
+ ossl_rsaz_amm52x40_x2_avxifma256,
+ ossl_rsaz_amm52x40_x2_ifma256,
};
typedef void (*DEXTRACT)(BN_ULONG *res, const BN_ULONG *red_table,
- int red_table_idx, int tbl_idx);
+ int red_table_idx, int tbl_idx);
static const DEXTRACT ossl_extract_multiplier_win5[] = {
- ossl_extract_multiplier_2x20_win5_avx, ossl_extract_multiplier_2x20_win5,
- ossl_extract_multiplier_2x30_win5_avx, ossl_extract_multiplier_2x30_win5,
- ossl_extract_multiplier_2x40_win5_avx, ossl_extract_multiplier_2x40_win5,
+ ossl_extract_multiplier_2x20_win5_avx,
+ ossl_extract_multiplier_2x20_win5,
+ ossl_extract_multiplier_2x30_win5_avx,
+ ossl_extract_multiplier_2x30_win5,
+ ossl_extract_multiplier_2x40_win5_avx,
+ ossl_extract_multiplier_2x40_win5,
};
static int RSAZ_mod_exp_x2_ifma256(BN_ULONG *res, const BN_ULONG *base,
- const BN_ULONG *exp[2], const BN_ULONG *m,
- const BN_ULONG *rr, const BN_ULONG k0[2],
- int modulus_bitsize);
+ const BN_ULONG *exp[2], const BN_ULONG *m,
+ const BN_ULONG *rr, const BN_ULONG k0[2],
+ int modulus_bitsize);
/*
* Dual Montgomery modular exponentiation using prime moduli of the
@@ -190,18 +199,18 @@ static int RSAZ_mod_exp_x2_ifma256(BN_ULONG *res, const BN_ULONG *base,
* 1 in case of success.
*/
int ossl_rsaz_mod_exp_avx512_x2(BN_ULONG *res1,
- const BN_ULONG *base1,
- const BN_ULONG *exp1,
- const BN_ULONG *m1,
- const BN_ULONG *rr1,
- BN_ULONG k0_1,
- BN_ULONG *res2,
- const BN_ULONG *base2,
- const BN_ULONG *exp2,
- const BN_ULONG *m2,
- const BN_ULONG *rr2,
- BN_ULONG k0_2,
- int factor_size)
+ const BN_ULONG *base1,
+ const BN_ULONG *exp1,
+ const BN_ULONG *m1,
+ const BN_ULONG *rr1,
+ BN_ULONG k0_1,
+ BN_ULONG *res2,
+ const BN_ULONG *base2,
+ const BN_ULONG *exp2,
+ const BN_ULONG *m2,
+ const BN_ULONG *rr2,
+ BN_ULONG k0_2,
+ int factor_size)
{
int ret = 0;
@@ -223,10 +232,10 @@ int ossl_rsaz_mod_exp_avx512_x2(BN_ULONG *res1,
BN_ULONG *storage = NULL;
BN_ULONG *storage_aligned = NULL;
int storage_len_bytes = 7 * regs_capacity * sizeof(BN_ULONG)
- + 64 /* alignment */;
+ + 64 /* alignment */;
- const BN_ULONG *exp[2] = {0};
- BN_ULONG k0[2] = {0};
+ const BN_ULONG *exp[2] = { 0 };
+ BN_ULONG k0[2] = { 0 };
/* AMM = Almost Montgomery Multiplication */
AMM amm = NULL;
int avx512ifma = !!ossl_rsaz_avx512ifma_eligible();
@@ -244,19 +253,19 @@ int ossl_rsaz_mod_exp_avx512_x2(BN_ULONG *res1,
/* Memory layout for red(undant) representations */
base1_red = storage_aligned;
base2_red = storage_aligned + 1 * regs_capacity;
- m1_red = storage_aligned + 2 * regs_capacity;
- m2_red = storage_aligned + 3 * regs_capacity;
- rr1_red = storage_aligned + 4 * regs_capacity;
- rr2_red = storage_aligned + 5 * regs_capacity;
+ m1_red = storage_aligned + 2 * regs_capacity;
+ m2_red = storage_aligned + 3 * regs_capacity;
+ rr1_red = storage_aligned + 4 * regs_capacity;
+ rr2_red = storage_aligned + 5 * regs_capacity;
coeff_red = storage_aligned + 6 * regs_capacity;
/* Convert base_i, m_i, rr_i, from regular to 52-bit radix */
to_words52(base1_red, regs_capacity, base1, factor_size);
to_words52(base2_red, regs_capacity, base2, factor_size);
- to_words52(m1_red, regs_capacity, m1, factor_size);
- to_words52(m2_red, regs_capacity, m2, factor_size);
- to_words52(rr1_red, regs_capacity, rr1, factor_size);
- to_words52(rr2_red, regs_capacity, rr2, factor_size);
+ to_words52(m1_red, regs_capacity, m1, factor_size);
+ to_words52(m2_red, regs_capacity, m2, factor_size);
+ to_words52(rr1_red, regs_capacity, rr1, factor_size);
+ to_words52(rr2_red, regs_capacity, rr2, factor_size);
/*
* Compute target domain Montgomery converters RR' for each modulus
@@ -278,11 +287,11 @@ int ossl_rsaz_mod_exp_avx512_x2(BN_ULONG *res1,
/* (1) in reduced domain representation */
set_bit(coeff_red, 64 * (int)(coeff_pow / 52) + coeff_pow % 52);
- amm(rr1_red, rr1_red, rr1_red, m1_red, k0_1); /* (2) for m1 */
- amm(rr1_red, rr1_red, coeff_red, m1_red, k0_1); /* (3) for m1 */
+ amm(rr1_red, rr1_red, rr1_red, m1_red, k0_1); /* (2) for m1 */
+ amm(rr1_red, rr1_red, coeff_red, m1_red, k0_1); /* (3) for m1 */
- amm(rr2_red, rr2_red, rr2_red, m2_red, k0_2); /* (2) for m2 */
- amm(rr2_red, rr2_red, coeff_red, m2_red, k0_2); /* (3) for m2 */
+ amm(rr2_red, rr2_red, rr2_red, m2_red, k0_2); /* (2) for m2 */
+ amm(rr2_red, rr2_red, coeff_red, m2_red, k0_2); /* (3) for m2 */
exp[0] = exp1;
exp[1] = exp2;
@@ -292,7 +301,7 @@ int ossl_rsaz_mod_exp_avx512_x2(BN_ULONG *res1,
/* Dual (2-exps in parallel) exponentiation */
ret = RSAZ_mod_exp_x2_ifma256(rr1_red, base1_red, exp, m1_red, rr1_red,
- k0, factor_size);
+ k0, factor_size);
if (!ret)
goto err;
@@ -337,12 +346,12 @@ err:
* \return (void).
*/
int RSAZ_mod_exp_x2_ifma256(BN_ULONG *out,
- const BN_ULONG *base,
- const BN_ULONG *exp[2],
- const BN_ULONG *m,
- const BN_ULONG *rr,
- const BN_ULONG k0[2],
- int modulus_bitsize)
+ const BN_ULONG *base,
+ const BN_ULONG *exp[2],
+ const BN_ULONG *m,
+ const BN_ULONG *rr,
+ const BN_ULONG k0[2],
+ int modulus_bitsize)
{
int ret = 0;
int idx;
@@ -352,9 +361,9 @@ int RSAZ_mod_exp_x2_ifma256(BN_ULONG *out,
int exp_win_mask = (1U << exp_win_size) - 1;
/*
- * Number of digits (64-bit words) in redundant representation to handle
- * modulus bits
- */
+ * Number of digits (64-bit words) in redundant representation to handle
+ * modulus bits
+ */
int red_digits = 0;
int exp_digits = 0;
@@ -363,12 +372,12 @@ int RSAZ_mod_exp_x2_ifma256(BN_ULONG *out,
int storage_len_bytes = 0;
/* Red(undant) result Y and multiplier X */
- BN_ULONG *red_Y = NULL; /* [2][red_digits] */
- BN_ULONG *red_X = NULL; /* [2][red_digits] */
+ BN_ULONG *red_Y = NULL; /* [2][red_digits] */
+ BN_ULONG *red_X = NULL; /* [2][red_digits] */
/* Pre-computed table of base powers */
BN_ULONG *red_table = NULL; /* [1U << exp_win_size][2][red_digits] */
/* Expanded exponent */
- BN_ULONG *expz = NULL; /* [2][exp_digits + 1] */
+ BN_ULONG *expz = NULL; /* [2][exp_digits + 1] */
/* Dual AMM */
DAMM damm = NULL;
@@ -380,7 +389,7 @@ int RSAZ_mod_exp_x2_ifma256(BN_ULONG *out,
* Squaring is done using multiplication now. That can be a subject of
* optimization in future.
*/
-# define DAMS(r,a,m,k0) damm((r),(a),(a),(m),(k0))
+#define DAMS(r, a, m, k0) damm((r), (a), (a), (m), (k0))
if (modulus_bitsize != 1024 && modulus_bitsize != 1536 && modulus_bitsize != 2048)
goto err;
@@ -406,22 +415,22 @@ int RSAZ_mod_exp_x2_ifma256(BN_ULONG *out,
goto err;
}
- storage_len_bytes = (2 * red_digits /* red_Y */
- + 2 * red_digits /* red_X */
- + 2 * red_digits * (1U << exp_win_size) /* red_table */
- + 2 * (exp_digits + 1)) /* expz */
- * sizeof(BN_ULONG)
- + 64; /* alignment */
+ storage_len_bytes = (2 * red_digits /* red_Y */
+ + 2 * red_digits /* red_X */
+ + 2 * red_digits * (1U << exp_win_size) /* red_table */
+ + 2 * (exp_digits + 1)) /* expz */
+ * sizeof(BN_ULONG)
+ + 64; /* alignment */
storage = (BN_ULONG *)OPENSSL_zalloc(storage_len_bytes);
if (storage == NULL)
goto err;
storage_aligned = (BN_ULONG *)ALIGN_OF(storage, 64);
- red_Y = storage_aligned;
- red_X = red_Y + 2 * red_digits;
+ red_Y = storage_aligned;
+ red_X = red_Y + 2 * red_digits;
red_table = red_X + 2 * red_digits;
- expz = red_table + 2 * red_digits * (1U << exp_win_size);
+ expz = red_table + 2 * red_digits * (1U << exp_win_size);
/*
* Compute table of powers base^i, i = 0, ..., (2^EXP_WIN_SIZE) - 1
@@ -430,15 +439,15 @@ int RSAZ_mod_exp_x2_ifma256(BN_ULONG *out,
*/
red_X[0 * red_digits] = 1;
red_X[1 * red_digits] = 1;
- damm(&red_table[0 * 2 * red_digits], (const BN_ULONG*)red_X, rr, m, k0);
- damm(&red_table[1 * 2 * red_digits], base, rr, m, k0);
+ damm(&red_table[0 * 2 * red_digits], (const BN_ULONG *)red_X, rr, m, k0);
+ damm(&red_table[1 * 2 * red_digits], base, rr, m, k0);
for (idx = 1; idx < (int)((1U << exp_win_size) / 2); idx++) {
DAMS(&red_table[(2 * idx + 0) * 2 * red_digits],
- &red_table[(1 * idx) * 2 * red_digits], m, k0);
+ &red_table[(1 * idx) * 2 * red_digits], m, k0);
damm(&red_table[(2 * idx + 1) * 2 * red_digits],
- &red_table[(2 * idx) * 2 * red_digits],
- &red_table[1 * 2 * red_digits], m, k0);
+ &red_table[(2 * idx) * 2 * red_digits],
+ &red_table[1 * 2 * red_digits], m, k0);
}
/* Copy and expand exponents */
@@ -479,7 +488,7 @@ int RSAZ_mod_exp_x2_ifma256(BN_ULONG *out,
red_table_idx_0 >>= exp_chunk_shift;
red_table_idx_1 >>= exp_chunk_shift;
- extract(&red_Y[0 * red_digits], (const BN_ULONG*)red_table, (int)red_table_idx_0, (int)red_table_idx_1);
+ extract(&red_Y[0 * red_digits], (const BN_ULONG *)red_table, (int)red_table_idx_0, (int)red_table_idx_1);
/* Process other exp windows */
for (exp_bit_no -= exp_win_size; exp_bit_no >= 0; exp_bit_no -= exp_win_size) {
@@ -520,17 +529,17 @@ int RSAZ_mod_exp_x2_ifma256(BN_ULONG *out,
red_table_idx_1 &= table_idx_mask;
}
- extract(&red_X[0 * red_digits], (const BN_ULONG*)red_table, (int)red_table_idx_0, (int)red_table_idx_1);
+ extract(&red_X[0 * red_digits], (const BN_ULONG *)red_table, (int)red_table_idx_0, (int)red_table_idx_1);
}
/* Series of squaring */
- DAMS((BN_ULONG*)red_Y, (const BN_ULONG*)red_Y, m, k0);
- DAMS((BN_ULONG*)red_Y, (const BN_ULONG*)red_Y, m, k0);
- DAMS((BN_ULONG*)red_Y, (const BN_ULONG*)red_Y, m, k0);
- DAMS((BN_ULONG*)red_Y, (const BN_ULONG*)red_Y, m, k0);
- DAMS((BN_ULONG*)red_Y, (const BN_ULONG*)red_Y, m, k0);
+ DAMS((BN_ULONG *)red_Y, (const BN_ULONG *)red_Y, m, k0);
+ DAMS((BN_ULONG *)red_Y, (const BN_ULONG *)red_Y, m, k0);
+ DAMS((BN_ULONG *)red_Y, (const BN_ULONG *)red_Y, m, k0);
+ DAMS((BN_ULONG *)red_Y, (const BN_ULONG *)red_Y, m, k0);
+ DAMS((BN_ULONG *)red_Y, (const BN_ULONG *)red_Y, m, k0);
- damm((BN_ULONG*)red_Y, (const BN_ULONG*)red_Y, (const BN_ULONG*)red_X, m, k0);
+ damm((BN_ULONG *)red_Y, (const BN_ULONG *)red_Y, (const BN_ULONG *)red_X, m, k0);
}
}
@@ -549,7 +558,7 @@ int RSAZ_mod_exp_x2_ifma256(BN_ULONG *out,
memset(red_X, 0, 2 * red_digits * sizeof(BN_ULONG));
red_X[0 * red_digits] = 1;
red_X[1 * red_digits] = 1;
- damm(out, (const BN_ULONG*)red_Y, (const BN_ULONG*)red_X, m, k0);
+ damm(out, (const BN_ULONG *)red_Y, (const BN_ULONG *)red_X, m, k0);
ret = 1;
@@ -583,7 +592,7 @@ static ossl_inline uint64_t get_digit(const uint8_t *in, int in_len)
* words in redundant (base=2^52) one.
*/
static void to_words52(BN_ULONG *out, int out_len,
- const BN_ULONG *in, int in_bitsize)
+ const BN_ULONG *in, int in_bitsize)
{
uint8_t *in_str = NULL;
@@ -655,7 +664,7 @@ static void from_words52(BN_ULONG *out, int out_bitsize, const BN_ULONG *in)
uint8_t *out_str = (uint8_t *)out;
for (; out_bitsize >= (2 * DIGIT_SIZE);
- out_bitsize -= (2 * DIGIT_SIZE), in += 2) {
+ out_bitsize -= (2 * DIGIT_SIZE), in += 2) {
uint64_t digit;
digit = in[0];
@@ -671,7 +680,7 @@ static void from_words52(BN_ULONG *out, int out_bitsize, const BN_ULONG *in)
out_str += 6;
out_bitsize -= DIGIT_SIZE;
put_digit(out_str, BITS2WORD8_SIZE(out_bitsize),
- (in[1] << 4 | in[0] >> 48));
+ (in[1] << 4 | in[0] >> 48));
} else if (out_bitsize) {
put_digit(out_str, BITS2WORD8_SIZE(out_bitsize), in[0]);
}
diff --git a/crypto/bsearch.c b/crypto/bsearch.c
index f812c4f8ef..192ccbeb91 100644
--- a/crypto/bsearch.c
+++ b/crypto/bsearch.c
@@ -11,8 +11,8 @@
#include "internal/cryptlib.h"
const void *ossl_bsearch(const void *key, const void *base, int num,
- int size, int (*cmp) (const void *, const void *),
- int flags)
+ int size, int (*cmp)(const void *, const void *),
+ int flags)
{
const char *base_ = base;
int l, h, i = 0, c = 0;
@@ -25,7 +25,7 @@ const void *ossl_bsearch(const void *key, const void *base, int num,
while (l < h) {
i = (l + h) / 2;
p = &(base_[i * size]);
- c = (*cmp) (key, p);
+ c = (*cmp)(key, p);
if (c < 0)
h = i;
else if (c > 0)
@@ -36,7 +36,7 @@ const void *ossl_bsearch(const void *key, const void *base, int num,
if (c != 0 && !(flags & OSSL_BSEARCH_VALUE_ON_NOMATCH))
p = NULL;
else if (c == 0 && (flags & OSSL_BSEARCH_FIRST_VALUE_ON_MATCH)) {
- while (i > 0 && (*cmp) (key, &(base_[(i - 1) * size])) == 0)
+ while (i > 0 && (*cmp)(key, &(base_[(i - 1) * size])) == 0)
i--;
p = &(base_[i * size]);
}
diff --git a/crypto/buffer/buf_err.c b/crypto/buffer/buf_err.c
index 9233b0a23c..32209c0829 100644
--- a/crypto/buffer/buf_err.c
+++ b/crypto/buffer/buf_err.c
@@ -15,7 +15,7 @@
#ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA BUF_str_reasons[] = {
- {0, NULL}
+ { 0, NULL }
};
#endif
diff --git a/crypto/camellia/camellia.c b/crypto/camellia/camellia.c
index a4de9f891a..cd9521a019 100644
--- a/crypto/camellia/camellia.c
+++ b/crypto/camellia/camellia.c
@@ -50,11 +50,11 @@
#include <string.h>
#include <stdlib.h>
-#define RightRotate(x, s) ( ((x) >> (s)) + ((x) << (32 - s)) )
-#define LeftRotate(x, s) ( ((x) << (s)) + ((x) >> (32 - s)) )
+#define RightRotate(x, s) (((x) >> (s)) + ((x) << (32 - s)))
+#define LeftRotate(x, s) (((x) << (s)) + ((x) >> (32 - s)))
-#define GETU32(p) (((u32)(p)[0] << 24) ^ ((u32)(p)[1] << 16) ^ ((u32)(p)[2] << 8) ^ ((u32)(p)[3]))
-#define PUTU32(p,v) ((p)[0] = (u8)((v) >> 24), (p)[1] = (u8)((v) >> 16), (p)[2] = (u8)((v) >> 8), (p)[3] = (u8)(v))
+#define GETU32(p) (((u32)(p)[0] << 24) ^ ((u32)(p)[1] << 16) ^ ((u32)(p)[2] << 8) ^ ((u32)(p)[3]))
+#define PUTU32(p, v) ((p)[0] = (u8)((v) >> 24), (p)[1] = (u8)((v) >> 16), (p)[2] = (u8)((v) >> 8), (p)[3] = (u8)(v))
/* S-box data */
#define SBOX1_1110 Camellia_SBOX[0]
@@ -62,178 +62,178 @@
#define SBOX2_0222 Camellia_SBOX[2]
#define SBOX3_3033 Camellia_SBOX[3]
static const u32 Camellia_SBOX[][256] = {
- {0x70707000, 0x82828200, 0x2c2c2c00, 0xececec00, 0xb3b3b300, 0x27272700,
- 0xc0c0c000, 0xe5e5e500, 0xe4e4e400, 0x85858500, 0x57575700, 0x35353500,
- 0xeaeaea00, 0x0c0c0c00, 0xaeaeae00, 0x41414100, 0x23232300, 0xefefef00,
- 0x6b6b6b00, 0x93939300, 0x45454500, 0x19191900, 0xa5a5a500, 0x21212100,
- 0xededed00, 0x0e0e0e00, 0x4f4f4f00, 0x4e4e4e00, 0x1d1d1d00, 0x65656500,
- 0x92929200, 0xbdbdbd00, 0x86868600, 0xb8b8b800, 0xafafaf00, 0x8f8f8f00,
- 0x7c7c7c00, 0xebebeb00, 0x1f1f1f00, 0xcecece00, 0x3e3e3e00, 0x30303000,
- 0xdcdcdc00, 0x5f5f5f00, 0x5e5e5e00, 0xc5c5c500, 0x0b0b0b00, 0x1a1a1a00,
- 0xa6a6a600, 0xe1e1e100, 0x39393900, 0xcacaca00, 0xd5d5d500, 0x47474700,
- 0x5d5d5d00, 0x3d3d3d00, 0xd9d9d900, 0x01010100, 0x5a5a5a00, 0xd6d6d600,
- 0x51515100, 0x56565600, 0x6c6c6c00, 0x4d4d4d00, 0x8b8b8b00, 0x0d0d0d00,
- 0x9a9a9a00, 0x66666600, 0xfbfbfb00, 0xcccccc00, 0xb0b0b000, 0x2d2d2d00,
- 0x74747400, 0x12121200, 0x2b2b2b00, 0x20202000, 0xf0f0f000, 0xb1b1b100,
- 0x84848400, 0x99999900, 0xdfdfdf00, 0x4c4c4c00, 0xcbcbcb00, 0xc2c2c200,
- 0x34343400, 0x7e7e7e00, 0x76767600, 0x05050500, 0x6d6d6d00, 0xb7b7b700,
- 0xa9a9a900, 0x31313100, 0xd1d1d100, 0x17171700, 0x04040400, 0xd7d7d700,
- 0x14141400, 0x58585800, 0x3a3a3a00, 0x61616100, 0xdedede00, 0x1b1b1b00,
- 0x11111100, 0x1c1c1c00, 0x32323200, 0x0f0f0f00, 0x9c9c9c00, 0x16161600,
- 0x53535300, 0x18181800, 0xf2f2f200, 0x22222200, 0xfefefe00, 0x44444400,
- 0xcfcfcf00, 0xb2b2b200, 0xc3c3c300, 0xb5b5b500, 0x7a7a7a00, 0x91919100,
- 0x24242400, 0x08080800, 0xe8e8e800, 0xa8a8a800, 0x60606000, 0xfcfcfc00,
- 0x69696900, 0x50505000, 0xaaaaaa00, 0xd0d0d000, 0xa0a0a000, 0x7d7d7d00,
- 0xa1a1a100, 0x89898900, 0x62626200, 0x97979700, 0x54545400, 0x5b5b5b00,
- 0x1e1e1e00, 0x95959500, 0xe0e0e000, 0xffffff00, 0x64646400, 0xd2d2d200,
- 0x10101000, 0xc4c4c400, 0x00000000, 0x48484800, 0xa3a3a300, 0xf7f7f700,
- 0x75757500, 0xdbdbdb00, 0x8a8a8a00, 0x03030300, 0xe6e6e600, 0xdadada00,
- 0x09090900, 0x3f3f3f00, 0xdddddd00, 0x94949400, 0x87878700, 0x5c5c5c00,
- 0x83838300, 0x02020200, 0xcdcdcd00, 0x4a4a4a00, 0x90909000, 0x33333300,
- 0x73737300, 0x67676700, 0xf6f6f600, 0xf3f3f300, 0x9d9d9d00, 0x7f7f7f00,
- 0xbfbfbf00, 0xe2e2e200, 0x52525200, 0x9b9b9b00, 0xd8d8d800, 0x26262600,
- 0xc8c8c800, 0x37373700, 0xc6c6c600, 0x3b3b3b00, 0x81818100, 0x96969600,
- 0x6f6f6f00, 0x4b4b4b00, 0x13131300, 0xbebebe00, 0x63636300, 0x2e2e2e00,
- 0xe9e9e900, 0x79797900, 0xa7a7a700, 0x8c8c8c00, 0x9f9f9f00, 0x6e6e6e00,
- 0xbcbcbc00, 0x8e8e8e00, 0x29292900, 0xf5f5f500, 0xf9f9f900, 0xb6b6b600,
- 0x2f2f2f00, 0xfdfdfd00, 0xb4b4b400, 0x59595900, 0x78787800, 0x98989800,
- 0x06060600, 0x6a6a6a00, 0xe7e7e700, 0x46464600, 0x71717100, 0xbababa00,
- 0xd4d4d400, 0x25252500, 0xababab00, 0x42424200, 0x88888800, 0xa2a2a200,
- 0x8d8d8d00, 0xfafafa00, 0x72727200, 0x07070700, 0xb9b9b900, 0x55555500,
- 0xf8f8f800, 0xeeeeee00, 0xacacac00, 0x0a0a0a00, 0x36363600, 0x49494900,
- 0x2a2a2a00, 0x68686800, 0x3c3c3c00, 0x38383800, 0xf1f1f100, 0xa4a4a400,
- 0x40404000, 0x28282800, 0xd3d3d300, 0x7b7b7b00, 0xbbbbbb00, 0xc9c9c900,
- 0x43434300, 0xc1c1c100, 0x15151500, 0xe3e3e300, 0xadadad00, 0xf4f4f400,
- 0x77777700, 0xc7c7c700, 0x80808000, 0x9e9e9e00},
- {0x70700070, 0x2c2c002c, 0xb3b300b3, 0xc0c000c0, 0xe4e400e4, 0x57570057,
- 0xeaea00ea, 0xaeae00ae, 0x23230023, 0x6b6b006b, 0x45450045, 0xa5a500a5,
- 0xeded00ed, 0x4f4f004f, 0x1d1d001d, 0x92920092, 0x86860086, 0xafaf00af,
- 0x7c7c007c, 0x1f1f001f, 0x3e3e003e, 0xdcdc00dc, 0x5e5e005e, 0x0b0b000b,
- 0xa6a600a6, 0x39390039, 0xd5d500d5, 0x5d5d005d, 0xd9d900d9, 0x5a5a005a,
- 0x51510051, 0x6c6c006c, 0x8b8b008b, 0x9a9a009a, 0xfbfb00fb, 0xb0b000b0,
- 0x74740074, 0x2b2b002b, 0xf0f000f0, 0x84840084, 0xdfdf00df, 0xcbcb00cb,
- 0x34340034, 0x76760076, 0x6d6d006d, 0xa9a900a9, 0xd1d100d1, 0x04040004,
- 0x14140014, 0x3a3a003a, 0xdede00de, 0x11110011, 0x32320032, 0x9c9c009c,
- 0x53530053, 0xf2f200f2, 0xfefe00fe, 0xcfcf00cf, 0xc3c300c3, 0x7a7a007a,
- 0x24240024, 0xe8e800e8, 0x60600060, 0x69690069, 0xaaaa00aa, 0xa0a000a0,
- 0xa1a100a1, 0x62620062, 0x54540054, 0x1e1e001e, 0xe0e000e0, 0x64640064,
- 0x10100010, 0x00000000, 0xa3a300a3, 0x75750075, 0x8a8a008a, 0xe6e600e6,
- 0x09090009, 0xdddd00dd, 0x87870087, 0x83830083, 0xcdcd00cd, 0x90900090,
- 0x73730073, 0xf6f600f6, 0x9d9d009d, 0xbfbf00bf, 0x52520052, 0xd8d800d8,
- 0xc8c800c8, 0xc6c600c6, 0x81810081, 0x6f6f006f, 0x13130013, 0x63630063,
- 0xe9e900e9, 0xa7a700a7, 0x9f9f009f, 0xbcbc00bc, 0x29290029, 0xf9f900f9,
- 0x2f2f002f, 0xb4b400b4, 0x78780078, 0x06060006, 0xe7e700e7, 0x71710071,
- 0xd4d400d4, 0xabab00ab, 0x88880088, 0x8d8d008d, 0x72720072, 0xb9b900b9,
- 0xf8f800f8, 0xacac00ac, 0x36360036, 0x2a2a002a, 0x3c3c003c, 0xf1f100f1,
- 0x40400040, 0xd3d300d3, 0xbbbb00bb, 0x43430043, 0x15150015, 0xadad00ad,
- 0x77770077, 0x80800080, 0x82820082, 0xecec00ec, 0x27270027, 0xe5e500e5,
- 0x85850085, 0x35350035, 0x0c0c000c, 0x41410041, 0xefef00ef, 0x93930093,
- 0x19190019, 0x21210021, 0x0e0e000e, 0x4e4e004e, 0x65650065, 0xbdbd00bd,
- 0xb8b800b8, 0x8f8f008f, 0xebeb00eb, 0xcece00ce, 0x30300030, 0x5f5f005f,
- 0xc5c500c5, 0x1a1a001a, 0xe1e100e1, 0xcaca00ca, 0x47470047, 0x3d3d003d,
- 0x01010001, 0xd6d600d6, 0x56560056, 0x4d4d004d, 0x0d0d000d, 0x66660066,
- 0xcccc00cc, 0x2d2d002d, 0x12120012, 0x20200020, 0xb1b100b1, 0x99990099,
- 0x4c4c004c, 0xc2c200c2, 0x7e7e007e, 0x05050005, 0xb7b700b7, 0x31310031,
- 0x17170017, 0xd7d700d7, 0x58580058, 0x61610061, 0x1b1b001b, 0x1c1c001c,
- 0x0f0f000f, 0x16160016, 0x18180018, 0x22220022, 0x44440044, 0xb2b200b2,
- 0xb5b500b5, 0x91910091, 0x08080008, 0xa8a800a8, 0xfcfc00fc, 0x50500050,
- 0xd0d000d0, 0x7d7d007d, 0x89890089, 0x97970097, 0x5b5b005b, 0x95950095,
- 0xffff00ff, 0xd2d200d2, 0xc4c400c4, 0x48480048, 0xf7f700f7, 0xdbdb00db,
- 0x03030003, 0xdada00da, 0x3f3f003f, 0x94940094, 0x5c5c005c, 0x02020002,
- 0x4a4a004a, 0x33330033, 0x67670067, 0xf3f300f3, 0x7f7f007f, 0xe2e200e2,
- 0x9b9b009b, 0x26260026, 0x37370037, 0x3b3b003b, 0x96960096, 0x4b4b004b,
- 0xbebe00be, 0x2e2e002e, 0x79790079, 0x8c8c008c, 0x6e6e006e, 0x8e8e008e,
- 0xf5f500f5, 0xb6b600b6, 0xfdfd00fd, 0x59590059, 0x98980098, 0x6a6a006a,
- 0x46460046, 0xbaba00ba, 0x25250025, 0x42420042, 0xa2a200a2, 0xfafa00fa,
- 0x07070007, 0x55550055, 0xeeee00ee, 0x0a0a000a, 0x49490049, 0x68680068,
- 0x38380038, 0xa4a400a4, 0x28280028, 0x7b7b007b, 0xc9c900c9, 0xc1c100c1,
- 0xe3e300e3, 0xf4f400f4, 0xc7c700c7, 0x9e9e009e},
- {0x00e0e0e0, 0x00050505, 0x00585858, 0x00d9d9d9, 0x00676767, 0x004e4e4e,
- 0x00818181, 0x00cbcbcb, 0x00c9c9c9, 0x000b0b0b, 0x00aeaeae, 0x006a6a6a,
- 0x00d5d5d5, 0x00181818, 0x005d5d5d, 0x00828282, 0x00464646, 0x00dfdfdf,
- 0x00d6d6d6, 0x00272727, 0x008a8a8a, 0x00323232, 0x004b4b4b, 0x00424242,
- 0x00dbdbdb, 0x001c1c1c, 0x009e9e9e, 0x009c9c9c, 0x003a3a3a, 0x00cacaca,
- 0x00252525, 0x007b7b7b, 0x000d0d0d, 0x00717171, 0x005f5f5f, 0x001f1f1f,
- 0x00f8f8f8, 0x00d7d7d7, 0x003e3e3e, 0x009d9d9d, 0x007c7c7c, 0x00606060,
- 0x00b9b9b9, 0x00bebebe, 0x00bcbcbc, 0x008b8b8b, 0x00161616, 0x00343434,
- 0x004d4d4d, 0x00c3c3c3, 0x00727272, 0x00959595, 0x00ababab, 0x008e8e8e,
- 0x00bababa, 0x007a7a7a, 0x00b3b3b3, 0x00020202, 0x00b4b4b4, 0x00adadad,
- 0x00a2a2a2, 0x00acacac, 0x00d8d8d8, 0x009a9a9a, 0x00171717, 0x001a1a1a,
- 0x00353535, 0x00cccccc, 0x00f7f7f7, 0x00999999, 0x00616161, 0x005a5a5a,
- 0x00e8e8e8, 0x00242424, 0x00565656, 0x00404040, 0x00e1e1e1, 0x00636363,
- 0x00090909, 0x00333333, 0x00bfbfbf, 0x00989898, 0x00979797, 0x00858585,
- 0x00686868, 0x00fcfcfc, 0x00ececec, 0x000a0a0a, 0x00dadada, 0x006f6f6f,
- 0x00535353, 0x00626262, 0x00a3a3a3, 0x002e2e2e, 0x00080808, 0x00afafaf,
- 0x00282828, 0x00b0b0b0, 0x00747474, 0x00c2c2c2, 0x00bdbdbd, 0x00363636,
- 0x00222222, 0x00383838, 0x00646464, 0x001e1e1e, 0x00393939, 0x002c2c2c,
- 0x00a6a6a6, 0x00303030, 0x00e5e5e5, 0x00444444, 0x00fdfdfd, 0x00888888,
- 0x009f9f9f, 0x00656565, 0x00878787, 0x006b6b6b, 0x00f4f4f4, 0x00232323,
- 0x00484848, 0x00101010, 0x00d1d1d1, 0x00515151, 0x00c0c0c0, 0x00f9f9f9,
- 0x00d2d2d2, 0x00a0a0a0, 0x00555555, 0x00a1a1a1, 0x00414141, 0x00fafafa,
- 0x00434343, 0x00131313, 0x00c4c4c4, 0x002f2f2f, 0x00a8a8a8, 0x00b6b6b6,
- 0x003c3c3c, 0x002b2b2b, 0x00c1c1c1, 0x00ffffff, 0x00c8c8c8, 0x00a5a5a5,
- 0x00202020, 0x00898989, 0x00000000, 0x00909090, 0x00474747, 0x00efefef,
- 0x00eaeaea, 0x00b7b7b7, 0x00151515, 0x00060606, 0x00cdcdcd, 0x00b5b5b5,
- 0x00121212, 0x007e7e7e, 0x00bbbbbb, 0x00292929, 0x000f0f0f, 0x00b8b8b8,
- 0x00070707, 0x00040404, 0x009b9b9b, 0x00949494, 0x00212121, 0x00666666,
- 0x00e6e6e6, 0x00cecece, 0x00ededed, 0x00e7e7e7, 0x003b3b3b, 0x00fefefe,
- 0x007f7f7f, 0x00c5c5c5, 0x00a4a4a4, 0x00373737, 0x00b1b1b1, 0x004c4c4c,
- 0x00919191, 0x006e6e6e, 0x008d8d8d, 0x00767676, 0x00030303, 0x002d2d2d,
- 0x00dedede, 0x00969696, 0x00262626, 0x007d7d7d, 0x00c6c6c6, 0x005c5c5c,
- 0x00d3d3d3, 0x00f2f2f2, 0x004f4f4f, 0x00191919, 0x003f3f3f, 0x00dcdcdc,
- 0x00797979, 0x001d1d1d, 0x00525252, 0x00ebebeb, 0x00f3f3f3, 0x006d6d6d,
- 0x005e5e5e, 0x00fbfbfb, 0x00696969, 0x00b2b2b2, 0x00f0f0f0, 0x00313131,
- 0x000c0c0c, 0x00d4d4d4, 0x00cfcfcf, 0x008c8c8c, 0x00e2e2e2, 0x00757575,
- 0x00a9a9a9, 0x004a4a4a, 0x00575757, 0x00848484, 0x00111111, 0x00454545,
- 0x001b1b1b, 0x00f5f5f5, 0x00e4e4e4, 0x000e0e0e, 0x00737373, 0x00aaaaaa,
- 0x00f1f1f1, 0x00dddddd, 0x00595959, 0x00141414, 0x006c6c6c, 0x00929292,
- 0x00545454, 0x00d0d0d0, 0x00787878, 0x00707070, 0x00e3e3e3, 0x00494949,
- 0x00808080, 0x00505050, 0x00a7a7a7, 0x00f6f6f6, 0x00777777, 0x00939393,
- 0x00868686, 0x00838383, 0x002a2a2a, 0x00c7c7c7, 0x005b5b5b, 0x00e9e9e9,
- 0x00eeeeee, 0x008f8f8f, 0x00010101, 0x003d3d3d},
- {0x38003838, 0x41004141, 0x16001616, 0x76007676, 0xd900d9d9, 0x93009393,
- 0x60006060, 0xf200f2f2, 0x72007272, 0xc200c2c2, 0xab00abab, 0x9a009a9a,
- 0x75007575, 0x06000606, 0x57005757, 0xa000a0a0, 0x91009191, 0xf700f7f7,
- 0xb500b5b5, 0xc900c9c9, 0xa200a2a2, 0x8c008c8c, 0xd200d2d2, 0x90009090,
- 0xf600f6f6, 0x07000707, 0xa700a7a7, 0x27002727, 0x8e008e8e, 0xb200b2b2,
- 0x49004949, 0xde00dede, 0x43004343, 0x5c005c5c, 0xd700d7d7, 0xc700c7c7,
- 0x3e003e3e, 0xf500f5f5, 0x8f008f8f, 0x67006767, 0x1f001f1f, 0x18001818,
- 0x6e006e6e, 0xaf00afaf, 0x2f002f2f, 0xe200e2e2, 0x85008585, 0x0d000d0d,
- 0x53005353, 0xf000f0f0, 0x9c009c9c, 0x65006565, 0xea00eaea, 0xa300a3a3,
- 0xae00aeae, 0x9e009e9e, 0xec00ecec, 0x80008080, 0x2d002d2d, 0x6b006b6b,
- 0xa800a8a8, 0x2b002b2b, 0x36003636, 0xa600a6a6, 0xc500c5c5, 0x86008686,
- 0x4d004d4d, 0x33003333, 0xfd00fdfd, 0x66006666, 0x58005858, 0x96009696,
- 0x3a003a3a, 0x09000909, 0x95009595, 0x10001010, 0x78007878, 0xd800d8d8,
- 0x42004242, 0xcc00cccc, 0xef00efef, 0x26002626, 0xe500e5e5, 0x61006161,
- 0x1a001a1a, 0x3f003f3f, 0x3b003b3b, 0x82008282, 0xb600b6b6, 0xdb00dbdb,
- 0xd400d4d4, 0x98009898, 0xe800e8e8, 0x8b008b8b, 0x02000202, 0xeb00ebeb,
- 0x0a000a0a, 0x2c002c2c, 0x1d001d1d, 0xb000b0b0, 0x6f006f6f, 0x8d008d8d,
- 0x88008888, 0x0e000e0e, 0x19001919, 0x87008787, 0x4e004e4e, 0x0b000b0b,
- 0xa900a9a9, 0x0c000c0c, 0x79007979, 0x11001111, 0x7f007f7f, 0x22002222,
- 0xe700e7e7, 0x59005959, 0xe100e1e1, 0xda00dada, 0x3d003d3d, 0xc800c8c8,
- 0x12001212, 0x04000404, 0x74007474, 0x54005454, 0x30003030, 0x7e007e7e,
- 0xb400b4b4, 0x28002828, 0x55005555, 0x68006868, 0x50005050, 0xbe00bebe,
- 0xd000d0d0, 0xc400c4c4, 0x31003131, 0xcb00cbcb, 0x2a002a2a, 0xad00adad,
- 0x0f000f0f, 0xca00caca, 0x70007070, 0xff00ffff, 0x32003232, 0x69006969,
- 0x08000808, 0x62006262, 0x00000000, 0x24002424, 0xd100d1d1, 0xfb00fbfb,
- 0xba00baba, 0xed00eded, 0x45004545, 0x81008181, 0x73007373, 0x6d006d6d,
- 0x84008484, 0x9f009f9f, 0xee00eeee, 0x4a004a4a, 0xc300c3c3, 0x2e002e2e,
- 0xc100c1c1, 0x01000101, 0xe600e6e6, 0x25002525, 0x48004848, 0x99009999,
- 0xb900b9b9, 0xb300b3b3, 0x7b007b7b, 0xf900f9f9, 0xce00cece, 0xbf00bfbf,
- 0xdf00dfdf, 0x71007171, 0x29002929, 0xcd00cdcd, 0x6c006c6c, 0x13001313,
- 0x64006464, 0x9b009b9b, 0x63006363, 0x9d009d9d, 0xc000c0c0, 0x4b004b4b,
- 0xb700b7b7, 0xa500a5a5, 0x89008989, 0x5f005f5f, 0xb100b1b1, 0x17001717,
- 0xf400f4f4, 0xbc00bcbc, 0xd300d3d3, 0x46004646, 0xcf00cfcf, 0x37003737,
- 0x5e005e5e, 0x47004747, 0x94009494, 0xfa00fafa, 0xfc00fcfc, 0x5b005b5b,
- 0x97009797, 0xfe00fefe, 0x5a005a5a, 0xac00acac, 0x3c003c3c, 0x4c004c4c,
- 0x03000303, 0x35003535, 0xf300f3f3, 0x23002323, 0xb800b8b8, 0x5d005d5d,
- 0x6a006a6a, 0x92009292, 0xd500d5d5, 0x21002121, 0x44004444, 0x51005151,
- 0xc600c6c6, 0x7d007d7d, 0x39003939, 0x83008383, 0xdc00dcdc, 0xaa00aaaa,
- 0x7c007c7c, 0x77007777, 0x56005656, 0x05000505, 0x1b001b1b, 0xa400a4a4,
- 0x15001515, 0x34003434, 0x1e001e1e, 0x1c001c1c, 0xf800f8f8, 0x52005252,
- 0x20002020, 0x14001414, 0xe900e9e9, 0xbd00bdbd, 0xdd00dddd, 0xe400e4e4,
- 0xa100a1a1, 0xe000e0e0, 0x8a008a8a, 0xf100f1f1, 0xd600d6d6, 0x7a007a7a,
- 0xbb00bbbb, 0xe300e3e3, 0x40004040, 0x4f004f4f}
+ { 0x70707000, 0x82828200, 0x2c2c2c00, 0xececec00, 0xb3b3b300, 0x27272700,
+ 0xc0c0c000, 0xe5e5e500, 0xe4e4e400, 0x85858500, 0x57575700, 0x35353500,
+ 0xeaeaea00, 0x0c0c0c00, 0xaeaeae00, 0x41414100, 0x23232300, 0xefefef00,
+ 0x6b6b6b00, 0x93939300, 0x45454500, 0x19191900, 0xa5a5a500, 0x21212100,
+ 0xededed00, 0x0e0e0e00, 0x4f4f4f00, 0x4e4e4e00, 0x1d1d1d00, 0x65656500,
+ 0x92929200, 0xbdbdbd00, 0x86868600, 0xb8b8b800, 0xafafaf00, 0x8f8f8f00,
+ 0x7c7c7c00, 0xebebeb00, 0x1f1f1f00, 0xcecece00, 0x3e3e3e00, 0x30303000,
+ 0xdcdcdc00, 0x5f5f5f00, 0x5e5e5e00, 0xc5c5c500, 0x0b0b0b00, 0x1a1a1a00,
+ 0xa6a6a600, 0xe1e1e100, 0x39393900, 0xcacaca00, 0xd5d5d500, 0x47474700,
+ 0x5d5d5d00, 0x3d3d3d00, 0xd9d9d900, 0x01010100, 0x5a5a5a00, 0xd6d6d600,
+ 0x51515100, 0x56565600, 0x6c6c6c00, 0x4d4d4d00, 0x8b8b8b00, 0x0d0d0d00,
+ 0x9a9a9a00, 0x66666600, 0xfbfbfb00, 0xcccccc00, 0xb0b0b000, 0x2d2d2d00,
+ 0x74747400, 0x12121200, 0x2b2b2b00, 0x20202000, 0xf0f0f000, 0xb1b1b100,
+ 0x84848400, 0x99999900, 0xdfdfdf00, 0x4c4c4c00, 0xcbcbcb00, 0xc2c2c200,
+ 0x34343400, 0x7e7e7e00, 0x76767600, 0x05050500, 0x6d6d6d00, 0xb7b7b700,
+ 0xa9a9a900, 0x31313100, 0xd1d1d100, 0x17171700, 0x04040400, 0xd7d7d700,
+ 0x14141400, 0x58585800, 0x3a3a3a00, 0x61616100, 0xdedede00, 0x1b1b1b00,
+ 0x11111100, 0x1c1c1c00, 0x32323200, 0x0f0f0f00, 0x9c9c9c00, 0x16161600,
+ 0x53535300, 0x18181800, 0xf2f2f200, 0x22222200, 0xfefefe00, 0x44444400,
+ 0xcfcfcf00, 0xb2b2b200, 0xc3c3c300, 0xb5b5b500, 0x7a7a7a00, 0x91919100,
+ 0x24242400, 0x08080800, 0xe8e8e800, 0xa8a8a800, 0x60606000, 0xfcfcfc00,
+ 0x69696900, 0x50505000, 0xaaaaaa00, 0xd0d0d000, 0xa0a0a000, 0x7d7d7d00,
+ 0xa1a1a100, 0x89898900, 0x62626200, 0x97979700, 0x54545400, 0x5b5b5b00,
+ 0x1e1e1e00, 0x95959500, 0xe0e0e000, 0xffffff00, 0x64646400, 0xd2d2d200,
+ 0x10101000, 0xc4c4c400, 0x00000000, 0x48484800, 0xa3a3a300, 0xf7f7f700,
+ 0x75757500, 0xdbdbdb00, 0x8a8a8a00, 0x03030300, 0xe6e6e600, 0xdadada00,
+ 0x09090900, 0x3f3f3f00, 0xdddddd00, 0x94949400, 0x87878700, 0x5c5c5c00,
+ 0x83838300, 0x02020200, 0xcdcdcd00, 0x4a4a4a00, 0x90909000, 0x33333300,
+ 0x73737300, 0x67676700, 0xf6f6f600, 0xf3f3f300, 0x9d9d9d00, 0x7f7f7f00,
+ 0xbfbfbf00, 0xe2e2e200, 0x52525200, 0x9b9b9b00, 0xd8d8d800, 0x26262600,
+ 0xc8c8c800, 0x37373700, 0xc6c6c600, 0x3b3b3b00, 0x81818100, 0x96969600,
+ 0x6f6f6f00, 0x4b4b4b00, 0x13131300, 0xbebebe00, 0x63636300, 0x2e2e2e00,
+ 0xe9e9e900, 0x79797900, 0xa7a7a700, 0x8c8c8c00, 0x9f9f9f00, 0x6e6e6e00,
+ 0xbcbcbc00, 0x8e8e8e00, 0x29292900, 0xf5f5f500, 0xf9f9f900, 0xb6b6b600,
+ 0x2f2f2f00, 0xfdfdfd00, 0xb4b4b400, 0x59595900, 0x78787800, 0x98989800,
+ 0x06060600, 0x6a6a6a00, 0xe7e7e700, 0x46464600, 0x71717100, 0xbababa00,
+ 0xd4d4d400, 0x25252500, 0xababab00, 0x42424200, 0x88888800, 0xa2a2a200,
+ 0x8d8d8d00, 0xfafafa00, 0x72727200, 0x07070700, 0xb9b9b900, 0x55555500,
+ 0xf8f8f800, 0xeeeeee00, 0xacacac00, 0x0a0a0a00, 0x36363600, 0x49494900,
+ 0x2a2a2a00, 0x68686800, 0x3c3c3c00, 0x38383800, 0xf1f1f100, 0xa4a4a400,
+ 0x40404000, 0x28282800, 0xd3d3d300, 0x7b7b7b00, 0xbbbbbb00, 0xc9c9c900,
+ 0x43434300, 0xc1c1c100, 0x15151500, 0xe3e3e300, 0xadadad00, 0xf4f4f400,
+ 0x77777700, 0xc7c7c700, 0x80808000, 0x9e9e9e00 },
+ { 0x70700070, 0x2c2c002c, 0xb3b300b3, 0xc0c000c0, 0xe4e400e4, 0x57570057,
+ 0xeaea00ea, 0xaeae00ae, 0x23230023, 0x6b6b006b, 0x45450045, 0xa5a500a5,
+ 0xeded00ed, 0x4f4f004f, 0x1d1d001d, 0x92920092, 0x86860086, 0xafaf00af,
+ 0x7c7c007c, 0x1f1f001f, 0x3e3e003e, 0xdcdc00dc, 0x5e5e005e, 0x0b0b000b,
+ 0xa6a600a6, 0x39390039, 0xd5d500d5, 0x5d5d005d, 0xd9d900d9, 0x5a5a005a,
+ 0x51510051, 0x6c6c006c, 0x8b8b008b, 0x9a9a009a, 0xfbfb00fb, 0xb0b000b0,
+ 0x74740074, 0x2b2b002b, 0xf0f000f0, 0x84840084, 0xdfdf00df, 0xcbcb00cb,
+ 0x34340034, 0x76760076, 0x6d6d006d, 0xa9a900a9, 0xd1d100d1, 0x04040004,
+ 0x14140014, 0x3a3a003a, 0xdede00de, 0x11110011, 0x32320032, 0x9c9c009c,
+ 0x53530053, 0xf2f200f2, 0xfefe00fe, 0xcfcf00cf, 0xc3c300c3, 0x7a7a007a,
+ 0x24240024, 0xe8e800e8, 0x60600060, 0x69690069, 0xaaaa00aa, 0xa0a000a0,
+ 0xa1a100a1, 0x62620062, 0x54540054, 0x1e1e001e, 0xe0e000e0, 0x64640064,
+ 0x10100010, 0x00000000, 0xa3a300a3, 0x75750075, 0x8a8a008a, 0xe6e600e6,
+ 0x09090009, 0xdddd00dd, 0x87870087, 0x83830083, 0xcdcd00cd, 0x90900090,
+ 0x73730073, 0xf6f600f6, 0x9d9d009d, 0xbfbf00bf, 0x52520052, 0xd8d800d8,
+ 0xc8c800c8, 0xc6c600c6, 0x81810081, 0x6f6f006f, 0x13130013, 0x63630063,
+ 0xe9e900e9, 0xa7a700a7, 0x9f9f009f, 0xbcbc00bc, 0x29290029, 0xf9f900f9,
+ 0x2f2f002f, 0xb4b400b4, 0x78780078, 0x06060006, 0xe7e700e7, 0x71710071,
+ 0xd4d400d4, 0xabab00ab, 0x88880088, 0x8d8d008d, 0x72720072, 0xb9b900b9,
+ 0xf8f800f8, 0xacac00ac, 0x36360036, 0x2a2a002a, 0x3c3c003c, 0xf1f100f1,
+ 0x40400040, 0xd3d300d3, 0xbbbb00bb, 0x43430043, 0x15150015, 0xadad00ad,
+ 0x77770077, 0x80800080, 0x82820082, 0xecec00ec, 0x27270027, 0xe5e500e5,
+ 0x85850085, 0x35350035, 0x0c0c000c, 0x41410041, 0xefef00ef, 0x93930093,
+ 0x19190019, 0x21210021, 0x0e0e000e, 0x4e4e004e, 0x65650065, 0xbdbd00bd,
+ 0xb8b800b8, 0x8f8f008f, 0xebeb00eb, 0xcece00ce, 0x30300030, 0x5f5f005f,
+ 0xc5c500c5, 0x1a1a001a, 0xe1e100e1, 0xcaca00ca, 0x47470047, 0x3d3d003d,
+ 0x01010001, 0xd6d600d6, 0x56560056, 0x4d4d004d, 0x0d0d000d, 0x66660066,
+ 0xcccc00cc, 0x2d2d002d, 0x12120012, 0x20200020, 0xb1b100b1, 0x99990099,
+ 0x4c4c004c, 0xc2c200c2, 0x7e7e007e, 0x05050005, 0xb7b700b7, 0x31310031,
+ 0x17170017, 0xd7d700d7, 0x58580058, 0x61610061, 0x1b1b001b, 0x1c1c001c,
+ 0x0f0f000f, 0x16160016, 0x18180018, 0x22220022, 0x44440044, 0xb2b200b2,
+ 0xb5b500b5, 0x91910091, 0x08080008, 0xa8a800a8, 0xfcfc00fc, 0x50500050,
+ 0xd0d000d0, 0x7d7d007d, 0x89890089, 0x97970097, 0x5b5b005b, 0x95950095,
+ 0xffff00ff, 0xd2d200d2, 0xc4c400c4, 0x48480048, 0xf7f700f7, 0xdbdb00db,
+ 0x03030003, 0xdada00da, 0x3f3f003f, 0x94940094, 0x5c5c005c, 0x02020002,
+ 0x4a4a004a, 0x33330033, 0x67670067, 0xf3f300f3, 0x7f7f007f, 0xe2e200e2,
+ 0x9b9b009b, 0x26260026, 0x37370037, 0x3b3b003b, 0x96960096, 0x4b4b004b,
+ 0xbebe00be, 0x2e2e002e, 0x79790079, 0x8c8c008c, 0x6e6e006e, 0x8e8e008e,
+ 0xf5f500f5, 0xb6b600b6, 0xfdfd00fd, 0x59590059, 0x98980098, 0x6a6a006a,
+ 0x46460046, 0xbaba00ba, 0x25250025, 0x42420042, 0xa2a200a2, 0xfafa00fa,
+ 0x07070007, 0x55550055, 0xeeee00ee, 0x0a0a000a, 0x49490049, 0x68680068,
+ 0x38380038, 0xa4a400a4, 0x28280028, 0x7b7b007b, 0xc9c900c9, 0xc1c100c1,
+ 0xe3e300e3, 0xf4f400f4, 0xc7c700c7, 0x9e9e009e },
+ { 0x00e0e0e0, 0x00050505, 0x00585858, 0x00d9d9d9, 0x00676767, 0x004e4e4e,
+ 0x00818181, 0x00cbcbcb, 0x00c9c9c9, 0x000b0b0b, 0x00aeaeae, 0x006a6a6a,
+ 0x00d5d5d5, 0x00181818, 0x005d5d5d, 0x00828282, 0x00464646, 0x00dfdfdf,
+ 0x00d6d6d6, 0x00272727, 0x008a8a8a, 0x00323232, 0x004b4b4b, 0x00424242,
+ 0x00dbdbdb, 0x001c1c1c, 0x009e9e9e, 0x009c9c9c, 0x003a3a3a, 0x00cacaca,
+ 0x00252525, 0x007b7b7b, 0x000d0d0d, 0x00717171, 0x005f5f5f, 0x001f1f1f,
+ 0x00f8f8f8, 0x00d7d7d7, 0x003e3e3e, 0x009d9d9d, 0x007c7c7c, 0x00606060,
+ 0x00b9b9b9, 0x00bebebe, 0x00bcbcbc, 0x008b8b8b, 0x00161616, 0x00343434,
+ 0x004d4d4d, 0x00c3c3c3, 0x00727272, 0x00959595, 0x00ababab, 0x008e8e8e,
+ 0x00bababa, 0x007a7a7a, 0x00b3b3b3, 0x00020202, 0x00b4b4b4, 0x00adadad,
+ 0x00a2a2a2, 0x00acacac, 0x00d8d8d8, 0x009a9a9a, 0x00171717, 0x001a1a1a,
+ 0x00353535, 0x00cccccc, 0x00f7f7f7, 0x00999999, 0x00616161, 0x005a5a5a,
+ 0x00e8e8e8, 0x00242424, 0x00565656, 0x00404040, 0x00e1e1e1, 0x00636363,
+ 0x00090909, 0x00333333, 0x00bfbfbf, 0x00989898, 0x00979797, 0x00858585,
+ 0x00686868, 0x00fcfcfc, 0x00ececec, 0x000a0a0a, 0x00dadada, 0x006f6f6f,
+ 0x00535353, 0x00626262, 0x00a3a3a3, 0x002e2e2e, 0x00080808, 0x00afafaf,
+ 0x00282828, 0x00b0b0b0, 0x00747474, 0x00c2c2c2, 0x00bdbdbd, 0x00363636,
+ 0x00222222, 0x00383838, 0x00646464, 0x001e1e1e, 0x00393939, 0x002c2c2c,
+ 0x00a6a6a6, 0x00303030, 0x00e5e5e5, 0x00444444, 0x00fdfdfd, 0x00888888,
+ 0x009f9f9f, 0x00656565, 0x00878787, 0x006b6b6b, 0x00f4f4f4, 0x00232323,
+ 0x00484848, 0x00101010, 0x00d1d1d1, 0x00515151, 0x00c0c0c0, 0x00f9f9f9,
+ 0x00d2d2d2, 0x00a0a0a0, 0x00555555, 0x00a1a1a1, 0x00414141, 0x00fafafa,
+ 0x00434343, 0x00131313, 0x00c4c4c4, 0x002f2f2f, 0x00a8a8a8, 0x00b6b6b6,
+ 0x003c3c3c, 0x002b2b2b, 0x00c1c1c1, 0x00ffffff, 0x00c8c8c8, 0x00a5a5a5,
+ 0x00202020, 0x00898989, 0x00000000, 0x00909090, 0x00474747, 0x00efefef,
+ 0x00eaeaea, 0x00b7b7b7, 0x00151515, 0x00060606, 0x00cdcdcd, 0x00b5b5b5,
+ 0x00121212, 0x007e7e7e, 0x00bbbbbb, 0x00292929, 0x000f0f0f, 0x00b8b8b8,
+ 0x00070707, 0x00040404, 0x009b9b9b, 0x00949494, 0x00212121, 0x00666666,
+ 0x00e6e6e6, 0x00cecece, 0x00ededed, 0x00e7e7e7, 0x003b3b3b, 0x00fefefe,
+ 0x007f7f7f, 0x00c5c5c5, 0x00a4a4a4, 0x00373737, 0x00b1b1b1, 0x004c4c4c,
+ 0x00919191, 0x006e6e6e, 0x008d8d8d, 0x00767676, 0x00030303, 0x002d2d2d,
+ 0x00dedede, 0x00969696, 0x00262626, 0x007d7d7d, 0x00c6c6c6, 0x005c5c5c,
+ 0x00d3d3d3, 0x00f2f2f2, 0x004f4f4f, 0x00191919, 0x003f3f3f, 0x00dcdcdc,
+ 0x00797979, 0x001d1d1d, 0x00525252, 0x00ebebeb, 0x00f3f3f3, 0x006d6d6d,
+ 0x005e5e5e, 0x00fbfbfb, 0x00696969, 0x00b2b2b2, 0x00f0f0f0, 0x00313131,
+ 0x000c0c0c, 0x00d4d4d4, 0x00cfcfcf, 0x008c8c8c, 0x00e2e2e2, 0x00757575,
+ 0x00a9a9a9, 0x004a4a4a, 0x00575757, 0x00848484, 0x00111111, 0x00454545,
+ 0x001b1b1b, 0x00f5f5f5, 0x00e4e4e4, 0x000e0e0e, 0x00737373, 0x00aaaaaa,
+ 0x00f1f1f1, 0x00dddddd, 0x00595959, 0x00141414, 0x006c6c6c, 0x00929292,
+ 0x00545454, 0x00d0d0d0, 0x00787878, 0x00707070, 0x00e3e3e3, 0x00494949,
+ 0x00808080, 0x00505050, 0x00a7a7a7, 0x00f6f6f6, 0x00777777, 0x00939393,
+ 0x00868686, 0x00838383, 0x002a2a2a, 0x00c7c7c7, 0x005b5b5b, 0x00e9e9e9,
+ 0x00eeeeee, 0x008f8f8f, 0x00010101, 0x003d3d3d },
+ { 0x38003838, 0x41004141, 0x16001616, 0x76007676, 0xd900d9d9, 0x93009393,
+ 0x60006060, 0xf200f2f2, 0x72007272, 0xc200c2c2, 0xab00abab, 0x9a009a9a,
+ 0x75007575, 0x06000606, 0x57005757, 0xa000a0a0, 0x91009191, 0xf700f7f7,
+ 0xb500b5b5, 0xc900c9c9, 0xa200a2a2, 0x8c008c8c, 0xd200d2d2, 0x90009090,
+ 0xf600f6f6, 0x07000707, 0xa700a7a7, 0x27002727, 0x8e008e8e, 0xb200b2b2,
+ 0x49004949, 0xde00dede, 0x43004343, 0x5c005c5c, 0xd700d7d7, 0xc700c7c7,
+ 0x3e003e3e, 0xf500f5f5, 0x8f008f8f, 0x67006767, 0x1f001f1f, 0x18001818,
+ 0x6e006e6e, 0xaf00afaf, 0x2f002f2f, 0xe200e2e2, 0x85008585, 0x0d000d0d,
+ 0x53005353, 0xf000f0f0, 0x9c009c9c, 0x65006565, 0xea00eaea, 0xa300a3a3,
+ 0xae00aeae, 0x9e009e9e, 0xec00ecec, 0x80008080, 0x2d002d2d, 0x6b006b6b,
+ 0xa800a8a8, 0x2b002b2b, 0x36003636, 0xa600a6a6, 0xc500c5c5, 0x86008686,
+ 0x4d004d4d, 0x33003333, 0xfd00fdfd, 0x66006666, 0x58005858, 0x96009696,
+ 0x3a003a3a, 0x09000909, 0x95009595, 0x10001010, 0x78007878, 0xd800d8d8,
+ 0x42004242, 0xcc00cccc, 0xef00efef, 0x26002626, 0xe500e5e5, 0x61006161,
+ 0x1a001a1a, 0x3f003f3f, 0x3b003b3b, 0x82008282, 0xb600b6b6, 0xdb00dbdb,
+ 0xd400d4d4, 0x98009898, 0xe800e8e8, 0x8b008b8b, 0x02000202, 0xeb00ebeb,
+ 0x0a000a0a, 0x2c002c2c, 0x1d001d1d, 0xb000b0b0, 0x6f006f6f, 0x8d008d8d,
+ 0x88008888, 0x0e000e0e, 0x19001919, 0x87008787, 0x4e004e4e, 0x0b000b0b,
+ 0xa900a9a9, 0x0c000c0c, 0x79007979, 0x11001111, 0x7f007f7f, 0x22002222,
+ 0xe700e7e7, 0x59005959, 0xe100e1e1, 0xda00dada, 0x3d003d3d, 0xc800c8c8,
+ 0x12001212, 0x04000404, 0x74007474, 0x54005454, 0x30003030, 0x7e007e7e,
+ 0xb400b4b4, 0x28002828, 0x55005555, 0x68006868, 0x50005050, 0xbe00bebe,
+ 0xd000d0d0, 0xc400c4c4, 0x31003131, 0xcb00cbcb, 0x2a002a2a, 0xad00adad,
+ 0x0f000f0f, 0xca00caca, 0x70007070, 0xff00ffff, 0x32003232, 0x69006969,
+ 0x08000808, 0x62006262, 0x00000000, 0x24002424, 0xd100d1d1, 0xfb00fbfb,
+ 0xba00baba, 0xed00eded, 0x45004545, 0x81008181, 0x73007373, 0x6d006d6d,
+ 0x84008484, 0x9f009f9f, 0xee00eeee, 0x4a004a4a, 0xc300c3c3, 0x2e002e2e,
+ 0xc100c1c1, 0x01000101, 0xe600e6e6, 0x25002525, 0x48004848, 0x99009999,
+ 0xb900b9b9, 0xb300b3b3, 0x7b007b7b, 0xf900f9f9, 0xce00cece, 0xbf00bfbf,
+ 0xdf00dfdf, 0x71007171, 0x29002929, 0xcd00cdcd, 0x6c006c6c, 0x13001313,
+ 0x64006464, 0x9b009b9b, 0x63006363, 0x9d009d9d, 0xc000c0c0, 0x4b004b4b,
+ 0xb700b7b7, 0xa500a5a5, 0x89008989, 0x5f005f5f, 0xb100b1b1, 0x17001717,
+ 0xf400f4f4, 0xbc00bcbc, 0xd300d3d3, 0x46004646, 0xcf00cfcf, 0x37003737,
+ 0x5e005e5e, 0x47004747, 0x94009494, 0xfa00fafa, 0xfc00fcfc, 0x5b005b5b,
+ 0x97009797, 0xfe00fefe, 0x5a005a5a, 0xac00acac, 0x3c003c3c, 0x4c004c4c,
+ 0x03000303, 0x35003535, 0xf300f3f3, 0x23002323, 0xb800b8b8, 0x5d005d5d,
+ 0x6a006a6a, 0x92009292, 0xd500d5d5, 0x21002121, 0x44004444, 0x51005151,
+ 0xc600c6c6, 0x7d007d7d, 0x39003939, 0x83008383, 0xdc00dcdc, 0xaa00aaaa,
+ 0x7c007c7c, 0x77007777, 0x56005656, 0x05000505, 0x1b001b1b, 0xa400a4a4,
+ 0x15001515, 0x34003434, 0x1e001e1e, 0x1c001c1c, 0xf800f8f8, 0x52005252,
+ 0x20002020, 0x14001414, 0xe900e9e9, 0xbd00bdbd, 0xdd00dddd, 0xe400e4e4,
+ 0xa100a1a1, 0xe000e0e0, 0x8a008a8a, 0xf100f1f1, 0xd600d6d6, 0x7a007a7a,
+ 0xbb00bbbb, 0xe300e3e3, 0x40004040, 0x4f004f4f }
};
/* Key generation constants */
@@ -250,38 +250,40 @@ static const u32 SIGMA[] = {
* ~16 registers. For platforms with less registers [well, x86 to be
* specific] assembler version should be/is provided anyway...
*/
-#define Camellia_Feistel(_s0,_s1,_s2,_s3,_key) do {\
- register u32 _t0,_t1,_t2,_t3;\
-\
- _t0 = _s0 ^ (_key)[0];\
- _t3 = SBOX4_4404[_t0&0xff];\
- _t1 = _s1 ^ (_key)[1];\
- _t3 ^= SBOX3_3033[(_t0 >> 8)&0xff];\
- _t2 = SBOX1_1110[_t1&0xff];\
- _t3 ^= SBOX2_0222[(_t0 >> 16)&0xff];\
- _t2 ^= SBOX4_4404[(_t1 >> 8)&0xff];\
- _t3 ^= SBOX1_1110[(_t0 >> 24)];\
- _t2 ^= _t3;\
- _t3 = RightRotate(_t3,8);\
- _t2 ^= SBOX3_3033[(_t1 >> 16)&0xff];\
- _s3 ^= _t3;\
- _t2 ^= SBOX2_0222[(_t1 >> 24)];\
- _s2 ^= _t2; \
- _s3 ^= _t2;\
-} while(0)
+#define Camellia_Feistel(_s0, _s1, _s2, _s3, _key) \
+ do { \
+ register u32 _t0, _t1, _t2, _t3; \
+ \
+ _t0 = _s0 ^ (_key)[0]; \
+ _t3 = SBOX4_4404[_t0 & 0xff]; \
+ _t1 = _s1 ^ (_key)[1]; \
+ _t3 ^= SBOX3_3033[(_t0 >> 8) & 0xff]; \
+ _t2 = SBOX1_1110[_t1 & 0xff]; \
+ _t3 ^= SBOX2_0222[(_t0 >> 16) & 0xff]; \
+ _t2 ^= SBOX4_4404[(_t1 >> 8) & 0xff]; \
+ _t3 ^= SBOX1_1110[(_t0 >> 24)]; \
+ _t2 ^= _t3; \
+ _t3 = RightRotate(_t3, 8); \
+ _t2 ^= SBOX3_3033[(_t1 >> 16) & 0xff]; \
+ _s3 ^= _t3; \
+ _t2 ^= SBOX2_0222[(_t1 >> 24)]; \
+ _s2 ^= _t2; \
+ _s3 ^= _t2; \
+ } while (0)
/*
* Note that n has to be less than 32. Rotations for larger amount
* of bits are achieved by "rotating" order of s-elements and
* adjusting n accordingly, e.g. RotLeft128(s1,s2,s3,s0,n-32).
*/
-#define RotLeft128(_s0,_s1,_s2,_s3,_n) do {\
- u32 _t0=_s0>>(32-_n);\
- _s0 = (_s0<<_n) | (_s1>>(32-_n));\
- _s1 = (_s1<<_n) | (_s2>>(32-_n));\
- _s2 = (_s2<<_n) | (_s3>>(32-_n));\
- _s3 = (_s3<<_n) | _t0;\
-} while (0)
+#define RotLeft128(_s0, _s1, _s2, _s3, _n) \
+ do { \
+ u32 _t0 = _s0 >> (32 - _n); \
+ _s0 = (_s0 << _n) | (_s1 >> (32 - _n)); \
+ _s1 = (_s1 << _n) | (_s2 >> (32 - _n)); \
+ _s2 = (_s2 << _n) | (_s3 >> (32 - _n)); \
+ _s3 = (_s3 << _n) | _t0; \
+ } while (0)
int Camellia_Ekeygen(int keyBitLength, const u8 *rawKey, KEY_TABLE_TYPE k)
{
@@ -343,7 +345,7 @@ int Camellia_Ekeygen(int keyBitLength, const u8 *rawKey, KEY_TABLE_TYPE k)
RotLeft128(s0, s1, s2, s3, 17); /* KL <<<111 */
k[44] = s0, k[45] = s1, k[46] = s2, k[47] = s3;
- return 3; /* grand rounds */
+ return 3; /* grand rounds */
} else {
k[12] = s0, k[13] = s1, k[14] = s2, k[15] = s3;
s0 ^= k[8], s1 ^= k[9], s2 ^= k[10], s3 ^= k[11];
@@ -388,7 +390,7 @@ int Camellia_Ekeygen(int keyBitLength, const u8 *rawKey, KEY_TABLE_TYPE k)
RotLeft128(s2, s3, s0, s1, 2); /* KL <<<111 */
k[60] = s2, k[61] = s3, k[62] = s0, k[63] = s1;
- return 4; /* grand rounds */
+ return 4; /* grand rounds */
}
/*
* It is possible to perform certain precalculations, which
@@ -401,8 +403,8 @@ int Camellia_Ekeygen(int keyBitLength, const u8 *rawKey, KEY_TABLE_TYPE k)
}
void Camellia_EncryptBlock_Rounds(int grandRounds, const u8 plaintext[],
- const KEY_TABLE_TYPE keyTable,
- u8 ciphertext[])
+ const KEY_TABLE_TYPE keyTable,
+ u8 ciphertext[])
{
register u32 s0, s1, s2, s3;
const u32 *k = keyTable, *kend = keyTable + grandRounds * 16;
@@ -447,15 +449,15 @@ void Camellia_EncryptBlock_Rounds(int grandRounds, const u8 plaintext[],
}
void Camellia_EncryptBlock(int keyBitLength, const u8 plaintext[],
- const KEY_TABLE_TYPE keyTable, u8 ciphertext[])
+ const KEY_TABLE_TYPE keyTable, u8 ciphertext[])
{
Camellia_EncryptBlock_Rounds(keyBitLength == 128 ? 3 : 4,
- plaintext, keyTable, ciphertext);
+ plaintext, keyTable, ciphertext);
}
void Camellia_DecryptBlock_Rounds(int grandRounds, const u8 ciphertext[],
- const KEY_TABLE_TYPE keyTable,
- u8 plaintext[])
+ const KEY_TABLE_TYPE keyTable,
+ u8 plaintext[])
{
u32 s0, s1, s2, s3;
const u32 *k = keyTable + grandRounds * 16, *kend = keyTable + 4;
@@ -500,8 +502,8 @@ void Camellia_DecryptBlock_Rounds(int grandRounds, const u8 ciphertext[],
}
void Camellia_DecryptBlock(int keyBitLength, const u8 ciphertext[],
- const KEY_TABLE_TYPE keyTable, u8 plaintext[])
+ const KEY_TABLE_TYPE keyTable, u8 plaintext[])
{
Camellia_DecryptBlock_Rounds(keyBitLength == 128 ? 3 : 4,
- ciphertext, keyTable, plaintext);
+ ciphertext, keyTable, plaintext);
}
diff --git a/crypto/camellia/cmll_cbc.c b/crypto/camellia/cmll_cbc.c
index 140681a9bd..51d8310b48 100644
--- a/crypto/camellia/cmll_cbc.c
+++ b/crypto/camellia/cmll_cbc.c
@@ -17,14 +17,14 @@
#include <openssl/modes.h>
void Camellia_cbc_encrypt(const unsigned char *in, unsigned char *out,
- size_t len, const CAMELLIA_KEY *key,
- unsigned char *ivec, const int enc)
+ size_t len, const CAMELLIA_KEY *key,
+ unsigned char *ivec, const int enc)
{
if (enc)
CRYPTO_cbc128_encrypt(in, out, len, key, ivec,
- (block128_f) Camellia_encrypt);
+ (block128_f)Camellia_encrypt);
else
CRYPTO_cbc128_decrypt(in, out, len, key, ivec,
- (block128_f) Camellia_decrypt);
+ (block128_f)Camellia_decrypt);
}
diff --git a/crypto/camellia/cmll_cfb.c b/crypto/camellia/cmll_cfb.c
index 8a92572d93..ea4ab67512 100644
--- a/crypto/camellia/cmll_cfb.c
+++ b/crypto/camellia/cmll_cfb.c
@@ -23,27 +23,27 @@
*/
void Camellia_cfb128_encrypt(const unsigned char *in, unsigned char *out,
- size_t length, const CAMELLIA_KEY *key,
- unsigned char *ivec, int *num, const int enc)
+ size_t length, const CAMELLIA_KEY *key,
+ unsigned char *ivec, int *num, const int enc)
{
CRYPTO_cfb128_encrypt(in, out, length, key, ivec, num, enc,
- (block128_f) Camellia_encrypt);
+ (block128_f)Camellia_encrypt);
}
/* N.B. This expects the input to be packed, MS bit first */
void Camellia_cfb1_encrypt(const unsigned char *in, unsigned char *out,
- size_t length, const CAMELLIA_KEY *key,
- unsigned char *ivec, int *num, const int enc)
+ size_t length, const CAMELLIA_KEY *key,
+ unsigned char *ivec, int *num, const int enc)
{
CRYPTO_cfb128_1_encrypt(in, out, length, key, ivec, num, enc,
- (block128_f) Camellia_encrypt);
+ (block128_f)Camellia_encrypt);
}
void Camellia_cfb8_encrypt(const unsigned char *in, unsigned char *out,
- size_t length, const CAMELLIA_KEY *key,
- unsigned char *ivec, int *num, const int enc)
+ size_t length, const CAMELLIA_KEY *key,
+ unsigned char *ivec, int *num, const int enc)
{
CRYPTO_cfb128_8_encrypt(in, out, length, key, ivec, num, enc,
- (block128_f) Camellia_encrypt);
+ (block128_f)Camellia_encrypt);
}
diff --git a/crypto/camellia/cmll_ctr.c b/crypto/camellia/cmll_ctr.c
index 26d875e34c..58a89d7131 100644
--- a/crypto/camellia/cmll_ctr.c
+++ b/crypto/camellia/cmll_ctr.c
@@ -17,12 +17,12 @@
#include <openssl/modes.h>
void Camellia_ctr128_encrypt(const unsigned char *in, unsigned char *out,
- size_t length, const CAMELLIA_KEY *key,
- unsigned char ivec[CAMELLIA_BLOCK_SIZE],
- unsigned char ecount_buf[CAMELLIA_BLOCK_SIZE],
- unsigned int *num)
+ size_t length, const CAMELLIA_KEY *key,
+ unsigned char ivec[CAMELLIA_BLOCK_SIZE],
+ unsigned char ecount_buf[CAMELLIA_BLOCK_SIZE],
+ unsigned int *num)
{
CRYPTO_ctr128_encrypt(in, out, length, key, ivec, ecount_buf, num,
- (block128_f) Camellia_encrypt);
+ (block128_f)Camellia_encrypt);
}
diff --git a/crypto/camellia/cmll_ecb.c b/crypto/camellia/cmll_ecb.c
index 86ffbd51e6..fddf7c7837 100644
--- a/crypto/camellia/cmll_ecb.c
+++ b/crypto/camellia/cmll_ecb.c
@@ -17,7 +17,7 @@
#include "cmll_local.h"
void Camellia_ecb_encrypt(const unsigned char *in, unsigned char *out,
- const CAMELLIA_KEY *key, const int enc)
+ const CAMELLIA_KEY *key, const int enc)
{
if (CAMELLIA_ENCRYPT == enc)
Camellia_encrypt(in, out, key);
diff --git a/crypto/camellia/cmll_local.h b/crypto/camellia/cmll_local.h
index c1d940d3d8..f585994ff9 100644
--- a/crypto/camellia/cmll_local.h
+++ b/crypto/camellia/cmll_local.h
@@ -23,21 +23,21 @@
*/
#ifndef OSSL_CRYPTO_CAMELLIA_CMLL_LOCAL_H
-# define OSSL_CRYPTO_CAMELLIA_CMLL_LOCAL_H
+#define OSSL_CRYPTO_CAMELLIA_CMLL_LOCAL_H
typedef unsigned int u32;
typedef unsigned char u8;
int Camellia_Ekeygen(int keyBitLength, const u8 *rawKey,
- KEY_TABLE_TYPE keyTable);
+ KEY_TABLE_TYPE keyTable);
void Camellia_EncryptBlock_Rounds(int grandRounds, const u8 plaintext[],
- const KEY_TABLE_TYPE keyTable,
- u8 ciphertext[]);
+ const KEY_TABLE_TYPE keyTable,
+ u8 ciphertext[]);
void Camellia_DecryptBlock_Rounds(int grandRounds, const u8 ciphertext[],
- const KEY_TABLE_TYPE keyTable,
- u8 plaintext[]);
+ const KEY_TABLE_TYPE keyTable,
+ u8 plaintext[]);
void Camellia_EncryptBlock(int keyBitLength, const u8 plaintext[],
- const KEY_TABLE_TYPE keyTable, u8 ciphertext[]);
+ const KEY_TABLE_TYPE keyTable, u8 ciphertext[]);
void Camellia_DecryptBlock(int keyBitLength, const u8 ciphertext[],
- const KEY_TABLE_TYPE keyTable, u8 plaintext[]);
-#endif /* #ifndef OSSL_CRYPTO_CAMELLIA_CMLL_LOCAL_H */
+ const KEY_TABLE_TYPE keyTable, u8 plaintext[]);
+#endif /* #ifndef OSSL_CRYPTO_CAMELLIA_CMLL_LOCAL_H */
diff --git a/crypto/camellia/cmll_misc.c b/crypto/camellia/cmll_misc.c
index f98dff7e3d..30db3a380c 100644
--- a/crypto/camellia/cmll_misc.c
+++ b/crypto/camellia/cmll_misc.c
@@ -18,7 +18,7 @@
#include "cmll_local.h"
int Camellia_set_key(const unsigned char *userKey, const int bits,
- CAMELLIA_KEY *key)
+ CAMELLIA_KEY *key)
{
if (!userKey || !key)
return -1;
@@ -29,13 +29,13 @@ int Camellia_set_key(const unsigned char *userKey, const int bits,
}
void Camellia_encrypt(const unsigned char *in, unsigned char *out,
- const CAMELLIA_KEY *key)
+ const CAMELLIA_KEY *key)
{
Camellia_EncryptBlock_Rounds(key->grand_rounds, in, key->u.rd_key, out);
}
void Camellia_decrypt(const unsigned char *in, unsigned char *out,
- const CAMELLIA_KEY *key)
+ const CAMELLIA_KEY *key)
{
Camellia_DecryptBlock_Rounds(key->grand_rounds, in, key->u.rd_key, out);
}
diff --git a/crypto/camellia/cmll_ofb.c b/crypto/camellia/cmll_ofb.c
index 4eeb0b5b75..93d146c0d6 100644
--- a/crypto/camellia/cmll_ofb.c
+++ b/crypto/camellia/cmll_ofb.c
@@ -22,9 +22,9 @@
* used is contained in *num;
*/
void Camellia_ofb128_encrypt(const unsigned char *in, unsigned char *out,
- size_t length, const CAMELLIA_KEY *key,
- unsigned char *ivec, int *num)
+ size_t length, const CAMELLIA_KEY *key,
+ unsigned char *ivec, int *num)
{
CRYPTO_ofb128_encrypt(in, out, length, key, ivec, num,
- (block128_f) Camellia_encrypt);
+ (block128_f)Camellia_encrypt);
}
diff --git a/crypto/cast/c_cfb64.c b/crypto/cast/c_cfb64.c
index 97081734ec..4170f77a78 100644
--- a/crypto/cast/c_cfb64.c
+++ b/crypto/cast/c_cfb64.c
@@ -23,8 +23,8 @@
*/
void CAST_cfb64_encrypt(const unsigned char *in, unsigned char *out,
- long length, const CAST_KEY *schedule,
- unsigned char *ivec, int *num, int enc)
+ long length, const CAST_KEY *schedule,
+ unsigned char *ivec, int *num, int enc)
{
register CAST_LONG v0, v1, t;
register int n = *num;
diff --git a/crypto/cast/c_ecb.c b/crypto/cast/c_ecb.c
index a0ab660f84..2f847fdde7 100644
--- a/crypto/cast/c_ecb.c
+++ b/crypto/cast/c_ecb.c
@@ -18,7 +18,7 @@
#include <openssl/opensslv.h>
void CAST_ecb_encrypt(const unsigned char *in, unsigned char *out,
- const CAST_KEY *ks, int enc)
+ const CAST_KEY *ks, int enc)
{
CAST_LONG l, d[2];
diff --git a/crypto/cast/c_enc.c b/crypto/cast/c_enc.c
index 4ed945a508..0879373707 100644
--- a/crypto/cast/c_enc.c
+++ b/crypto/cast/c_enc.c
@@ -81,8 +81,8 @@ void CAST_decrypt(CAST_LONG *data, const CAST_KEY *key)
}
void CAST_cbc_encrypt(const unsigned char *in, unsigned char *out,
- long length, const CAST_KEY *ks, unsigned char *iv,
- int enc)
+ long length, const CAST_KEY *ks, unsigned char *iv,
+ int enc)
{
register CAST_LONG tin0, tin1;
register CAST_LONG tout0, tout1, xor0, xor1;
diff --git a/crypto/cast/c_ofb64.c b/crypto/cast/c_ofb64.c
index d4aa10ff68..431446ab5f 100644
--- a/crypto/cast/c_ofb64.c
+++ b/crypto/cast/c_ofb64.c
@@ -22,8 +22,8 @@
* used is contained in *num;
*/
void CAST_ofb64_encrypt(const unsigned char *in, unsigned char *out,
- long length, const CAST_KEY *schedule,
- unsigned char *ivec, int *num)
+ long length, const CAST_KEY *schedule,
+ unsigned char *ivec, int *num)
{
register CAST_LONG v0, v1, t;
register int n = *num;
diff --git a/crypto/cast/c_skey.c b/crypto/cast/c_skey.c
index 030e20ea31..953c6e8efe 100644
--- a/crypto/cast/c_skey.c
+++ b/crypto/cast/c_skey.c
@@ -17,12 +17,12 @@
#include "cast_local.h"
#include "cast_s.h"
-#define CAST_exp(l,A,a,n) \
- A[n/4]=l; \
- a[n+3]=(l )&0xff; \
- a[n+2]=(l>> 8)&0xff; \
- a[n+1]=(l>>16)&0xff; \
- a[n+0]=(l>>24)&0xff;
+#define CAST_exp(l, A, a, n) \
+ A[n / 4] = l; \
+ a[n + 3] = (l) & 0xff; \
+ a[n + 2] = (l >> 8) & 0xff; \
+ a[n + 1] = (l >> 16) & 0xff; \
+ a[n + 0] = (l >> 24) & 0xff;
#define S4 CAST_S_table4
#define S5 CAST_S_table5
@@ -53,8 +53,7 @@ void CAST_set_key(CAST_KEY *key, int len, const unsigned char *data)
X[0] = ((x[0] << 24) | (x[1] << 16) | (x[2] << 8) | x[3]) & 0xffffffffL;
X[1] = ((x[4] << 24) | (x[5] << 16) | (x[6] << 8) | x[7]) & 0xffffffffL;
X[2] = ((x[8] << 24) | (x[9] << 16) | (x[10] << 8) | x[11]) & 0xffffffffL;
- X[3] =
- ((x[12] << 24) | (x[13] << 16) | (x[14] << 8) | x[15]) & 0xffffffffL;
+ X[3] = ((x[12] << 24) | (x[13] << 16) | (x[14] << 8) | x[15]) & 0xffffffffL;
for (;;) {
l = X[0] ^ S4[x[13]] ^ S5[x[15]] ^ S6[x[12]] ^ S7[x[14]] ^ S6[x[8]];
diff --git a/crypto/cast/cast_local.h b/crypto/cast/cast_local.h
index e99fe0882a..f24b8bccdc 100644
--- a/crypto/cast/cast_local.h
+++ b/crypto/cast/cast_local.h
@@ -8,129 +8,154 @@
*/
#ifdef OPENSSL_SYS_WIN32
-# include <stdlib.h>
+#include <stdlib.h>
#endif
/* NOTE - c is not incremented as per n2l */
-#define n2ln(c,l1,l2,n) { \
- c+=n; \
- l1=l2=0; \
- switch (n) { \
- case 8: l2 =((unsigned long)(*(--(c)))) ; \
- /* fall through */ \
- case 7: l2|=((unsigned long)(*(--(c))))<< 8; \
- /* fall through */ \
- case 6: l2|=((unsigned long)(*(--(c))))<<16; \
- /* fall through */ \
- case 5: l2|=((unsigned long)(*(--(c))))<<24; \
- /* fall through */ \
- case 4: l1 =((unsigned long)(*(--(c)))) ; \
- /* fall through */ \
- case 3: l1|=((unsigned long)(*(--(c))))<< 8; \
- /* fall through */ \
- case 2: l1|=((unsigned long)(*(--(c))))<<16; \
- /* fall through */ \
- case 1: l1|=((unsigned long)(*(--(c))))<<24; \
- } \
- }
+#define n2ln(c, l1, l2, n) \
+ { \
+ c += n; \
+ l1 = l2 = 0; \
+ switch (n) { \
+ case 8: \
+ l2 = ((unsigned long)(*(--(c)))); \
+ /* fall through */ \
+ case 7: \
+ l2 |= ((unsigned long)(*(--(c)))) << 8; \
+ /* fall through */ \
+ case 6: \
+ l2 |= ((unsigned long)(*(--(c)))) << 16; \
+ /* fall through */ \
+ case 5: \
+ l2 |= ((unsigned long)(*(--(c)))) << 24; \
+ /* fall through */ \
+ case 4: \
+ l1 = ((unsigned long)(*(--(c)))); \
+ /* fall through */ \
+ case 3: \
+ l1 |= ((unsigned long)(*(--(c)))) << 8; \
+ /* fall through */ \
+ case 2: \
+ l1 |= ((unsigned long)(*(--(c)))) << 16; \
+ /* fall through */ \
+ case 1: \
+ l1 |= ((unsigned long)(*(--(c)))) << 24; \
+ } \
+ }
/* NOTE - c is not incremented as per l2n */
-#define l2nn(l1,l2,c,n) { \
- c+=n; \
- switch (n) { \
- case 8: *(--(c))=(unsigned char)(((l2) )&0xff); \
- /* fall through */ \
- case 7: *(--(c))=(unsigned char)(((l2)>> 8)&0xff); \
- /* fall through */ \
- case 6: *(--(c))=(unsigned char)(((l2)>>16)&0xff); \
- /* fall through */ \
- case 5: *(--(c))=(unsigned char)(((l2)>>24)&0xff); \
- /* fall through */ \
- case 4: *(--(c))=(unsigned char)(((l1) )&0xff); \
- /* fall through */ \
- case 3: *(--(c))=(unsigned char)(((l1)>> 8)&0xff); \
- /* fall through */ \
- case 2: *(--(c))=(unsigned char)(((l1)>>16)&0xff); \
- /* fall through */ \
- case 1: *(--(c))=(unsigned char)(((l1)>>24)&0xff); \
- } \
- }
+#define l2nn(l1, l2, c, n) \
+ { \
+ c += n; \
+ switch (n) { \
+ case 8: \
+ *(--(c)) = (unsigned char)(((l2)) & 0xff); \
+ /* fall through */ \
+ case 7: \
+ *(--(c)) = (unsigned char)(((l2) >> 8) & 0xff); \
+ /* fall through */ \
+ case 6: \
+ *(--(c)) = (unsigned char)(((l2) >> 16) & 0xff); \
+ /* fall through */ \
+ case 5: \
+ *(--(c)) = (unsigned char)(((l2) >> 24) & 0xff); \
+ /* fall through */ \
+ case 4: \
+ *(--(c)) = (unsigned char)(((l1)) & 0xff); \
+ /* fall through */ \
+ case 3: \
+ *(--(c)) = (unsigned char)(((l1) >> 8) & 0xff); \
+ /* fall through */ \
+ case 2: \
+ *(--(c)) = (unsigned char)(((l1) >> 16) & 0xff); \
+ /* fall through */ \
+ case 1: \
+ *(--(c)) = (unsigned char)(((l1) >> 24) & 0xff); \
+ } \
+ }
#undef n2l
-#define n2l(c,l) (l =((unsigned long)(*((c)++)))<<24L, \
- l|=((unsigned long)(*((c)++)))<<16L, \
- l|=((unsigned long)(*((c)++)))<< 8L, \
- l|=((unsigned long)(*((c)++))))
+#define n2l(c, l) (l = ((unsigned long)(*((c)++))) << 24L, \
+ l |= ((unsigned long)(*((c)++))) << 16L, \
+ l |= ((unsigned long)(*((c)++))) << 8L, \
+ l |= ((unsigned long)(*((c)++))))
#undef l2n
-#define l2n(l,c) (*((c)++)=(unsigned char)(((l)>>24L)&0xff), \
- *((c)++)=(unsigned char)(((l)>>16L)&0xff), \
- *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \
- *((c)++)=(unsigned char)(((l) )&0xff))
+#define l2n(l, c) (*((c)++) = (unsigned char)(((l) >> 24L) & 0xff), \
+ *((c)++) = (unsigned char)(((l) >> 16L) & 0xff), \
+ *((c)++) = (unsigned char)(((l) >> 8L) & 0xff), \
+ *((c)++) = (unsigned char)(((l)) & 0xff))
#if defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER)
-# define ROTL(a,n) (_lrotl(a,n))
+#define ROTL(a, n) (_lrotl(a, n))
#else
-# define ROTL(a,n) ((((a)<<(n))&0xffffffffL)|((a)>>((32-(n))&31)))
+#define ROTL(a, n) ((((a) << (n)) & 0xffffffffL) | ((a) >> ((32 - (n)) & 31)))
#endif
-#define C_M 0x3fc
-#define C_0 22L
-#define C_1 14L
-#define C_2 6L
-#define C_3 2L /* left shift */
+#define C_M 0x3fc
+#define C_0 22L
+#define C_1 14L
+#define C_2 6L
+#define C_3 2L /* left shift */
/* The rotate has an extra 16 added to it to help the x86 asm */
#if defined(CAST_PTR)
-# define E_CAST(n,key,L,R,OP1,OP2,OP3) \
- { \
- int i; \
- t=(key[n*2] OP1 R)&0xffffffffL; \
- i=key[n*2+1]; \
- t=ROTL(t,i); \
- L^= (((((*(CAST_LONG *)((unsigned char *) \
- CAST_S_table0+((t>>C_2)&C_M)) OP2 \
- *(CAST_LONG *)((unsigned char *) \
- CAST_S_table1+((t<<C_3)&C_M)))&0xffffffffL) OP3 \
- *(CAST_LONG *)((unsigned char *) \
- CAST_S_table2+((t>>C_0)&C_M)))&0xffffffffL) OP1 \
- *(CAST_LONG *)((unsigned char *) \
- CAST_S_table3+((t>>C_1)&C_M)))&0xffffffffL; \
- }
+#define E_CAST(n, key, L, R, OP1, OP2, OP3) \
+ { \
+ int i; \
+ t = (key[n * 2] OP1 R) & 0xffffffffL; \
+ i = key[n * 2 + 1]; \
+ t = ROTL(t, i); \
+ L ^= (((((*(CAST_LONG *)((unsigned char *) \
+ CAST_S_table0 \
+ + ((t >> C_2) & C_M)) OP2 \
+ * (CAST_LONG *)((unsigned char *) \
+ CAST_S_table1 \
+ + ((t << C_3) & C_M))) \
+ & 0xffffffffL) OP3 \
+ * (CAST_LONG *)((unsigned char *) \
+ CAST_S_table2 \
+ + ((t >> C_0) & C_M))) \
+ & 0xffffffffL) OP1 \
+ * (CAST_LONG *)((unsigned char *) \
+ CAST_S_table3 \
+ + ((t >> C_1) & C_M))) \
+ & 0xffffffffL; \
+ }
#elif defined(CAST_PTR2)
-# define E_CAST(n,key,L,R,OP1,OP2,OP3) \
- { \
- int i; \
- CAST_LONG u,v,w; \
- w=(key[n*2] OP1 R)&0xffffffffL; \
- i=key[n*2+1]; \
- w=ROTL(w,i); \
- u=w>>C_2; \
- v=w<<C_3; \
- u&=C_M; \
- v&=C_M; \
- t= *(CAST_LONG *)((unsigned char *)CAST_S_table0+u); \
- u=w>>C_0; \
- t=(t OP2 *(CAST_LONG *)((unsigned char *)CAST_S_table1+v))&0xffffffffL;\
- v=w>>C_1; \
- u&=C_M; \
- v&=C_M; \
- t=(t OP3 *(CAST_LONG *)((unsigned char *)CAST_S_table2+u)&0xffffffffL);\
- t=(t OP1 *(CAST_LONG *)((unsigned char *)CAST_S_table3+v)&0xffffffffL);\
- L^=(t&0xffffffff); \
- }
+#define E_CAST(n, key, L, R, OP1, OP2, OP3) \
+ { \
+ int i; \
+ CAST_LONG u, v, w; \
+ w = (key[n * 2] OP1 R) & 0xffffffffL; \
+ i = key[n * 2 + 1]; \
+ w = ROTL(w, i); \
+ u = w >> C_2; \
+ v = w << C_3; \
+ u &= C_M; \
+ v &= C_M; \
+ t = *(CAST_LONG *)((unsigned char *)CAST_S_table0 + u); \
+ u = w >> C_0; \
+ t = (t OP2 * (CAST_LONG *)((unsigned char *)CAST_S_table1 + v)) & 0xffffffffL; \
+ v = w >> C_1; \
+ u &= C_M; \
+ v &= C_M; \
+ t = (t OP3 * (CAST_LONG *)((unsigned char *)CAST_S_table2 + u) & 0xffffffffL); \
+ t = (t OP1 * (CAST_LONG *)((unsigned char *)CAST_S_table3 + v) & 0xffffffffL); \
+ L ^= (t & 0xffffffff); \
+ }
#else
-# define E_CAST(n,key,L,R,OP1,OP2,OP3) \
- { \
- CAST_LONG a,b,c,d; \
- t=(key[n*2] OP1 R)&0xffffffff; \
- t=ROTL(t,(key[n*2+1])); \
- a=CAST_S_table0[(t>> 8)&0xff]; \
- b=CAST_S_table1[(t )&0xff]; \
- c=CAST_S_table2[(t>>24)&0xff]; \
- d=CAST_S_table3[(t>>16)&0xff]; \
- L^=(((((a OP2 b)&0xffffffffL) OP3 c)&0xffffffffL) OP1 d)&0xffffffffL; \
- }
+#define E_CAST(n, key, L, R, OP1, OP2, OP3) \
+ { \
+ CAST_LONG a, b, c, d; \
+ t = (key[n * 2] OP1 R) & 0xffffffff; \
+ t = ROTL(t, (key[n * 2 + 1])); \
+ a = CAST_S_table0[(t >> 8) & 0xff]; \
+ b = CAST_S_table1[(t) & 0xff]; \
+ c = CAST_S_table2[(t >> 24) & 0xff]; \
+ d = CAST_S_table3[(t >> 16) & 0xff]; \
+ L ^= (((((a OP2 b) & 0xffffffffL) OP3 c) & 0xffffffffL) OP1 d) & 0xffffffffL; \
+ }
#endif
extern const CAST_LONG CAST_S_table0[256];
diff --git a/crypto/cast/cast_s.h b/crypto/cast/cast_s.h
index 57163d17e1..345b4dd731 100644
--- a/crypto/cast/cast_s.h
+++ b/crypto/cast/cast_s.h
@@ -8,537 +8,2073 @@
*/
const CAST_LONG CAST_S_table0[256] = {
- 0x30fb40d4, 0x9fa0ff0b, 0x6beccd2f, 0x3f258c7a,
- 0x1e213f2f, 0x9c004dd3, 0x6003e540, 0xcf9fc949,
- 0xbfd4af27, 0x88bbbdb5, 0xe2034090, 0x98d09675,
- 0x6e63a0e0, 0x15c361d2, 0xc2e7661d, 0x22d4ff8e,
- 0x28683b6f, 0xc07fd059, 0xff2379c8, 0x775f50e2,
- 0x43c340d3, 0xdf2f8656, 0x887ca41a, 0xa2d2bd2d,
- 0xa1c9e0d6, 0x346c4819, 0x61b76d87, 0x22540f2f,
- 0x2abe32e1, 0xaa54166b, 0x22568e3a, 0xa2d341d0,
- 0x66db40c8, 0xa784392f, 0x004dff2f, 0x2db9d2de,
- 0x97943fac, 0x4a97c1d8, 0x527644b7, 0xb5f437a7,
- 0xb82cbaef, 0xd751d159, 0x6ff7f0ed, 0x5a097a1f,
- 0x827b68d0, 0x90ecf52e, 0x22b0c054, 0xbc8e5935,
- 0x4b6d2f7f, 0x50bb64a2, 0xd2664910, 0xbee5812d,
- 0xb7332290, 0xe93b159f, 0xb48ee411, 0x4bff345d,
- 0xfd45c240, 0xad31973f, 0xc4f6d02e, 0x55fc8165,
- 0xd5b1caad, 0xa1ac2dae, 0xa2d4b76d, 0xc19b0c50,
- 0x882240f2, 0x0c6e4f38, 0xa4e4bfd7, 0x4f5ba272,
- 0x564c1d2f, 0xc59c5319, 0xb949e354, 0xb04669fe,
- 0xb1b6ab8a, 0xc71358dd, 0x6385c545, 0x110f935d,
- 0x57538ad5, 0x6a390493, 0xe63d37e0, 0x2a54f6b3,
- 0x3a787d5f, 0x6276a0b5, 0x19a6fcdf, 0x7a42206a,
- 0x29f9d4d5, 0xf61b1891, 0xbb72275e, 0xaa508167,
- 0x38901091, 0xc6b505eb, 0x84c7cb8c, 0x2ad75a0f,
- 0x874a1427, 0xa2d1936b, 0x2ad286af, 0xaa56d291,
- 0xd7894360, 0x425c750d, 0x93b39e26, 0x187184c9,
- 0x6c00b32d, 0x73e2bb14, 0xa0bebc3c, 0x54623779,
- 0x64459eab, 0x3f328b82, 0x7718cf82, 0x59a2cea6,
- 0x04ee002e, 0x89fe78e6, 0x3fab0950, 0x325ff6c2,
- 0x81383f05, 0x6963c5c8, 0x76cb5ad6, 0xd49974c9,
- 0xca180dcf, 0x380782d5, 0xc7fa5cf6, 0x8ac31511,
- 0x35e79e13, 0x47da91d0, 0xf40f9086, 0xa7e2419e,
- 0x31366241, 0x051ef495, 0xaa573b04, 0x4a805d8d,
- 0x548300d0, 0x00322a3c, 0xbf64cddf, 0xba57a68e,
- 0x75c6372b, 0x50afd341, 0xa7c13275, 0x915a0bf5,
- 0x6b54bfab, 0x2b0b1426, 0xab4cc9d7, 0x449ccd82,
- 0xf7fbf265, 0xab85c5f3, 0x1b55db94, 0xaad4e324,
- 0xcfa4bd3f, 0x2deaa3e2, 0x9e204d02, 0xc8bd25ac,
- 0xeadf55b3, 0xd5bd9e98, 0xe31231b2, 0x2ad5ad6c,
- 0x954329de, 0xadbe4528, 0xd8710f69, 0xaa51c90f,
- 0xaa786bf6, 0x22513f1e, 0xaa51a79b, 0x2ad344cc,
- 0x7b5a41f0, 0xd37cfbad, 0x1b069505, 0x41ece491,
- 0xb4c332e6, 0x032268d4, 0xc9600acc, 0xce387e6d,
- 0xbf6bb16c, 0x6a70fb78, 0x0d03d9c9, 0xd4df39de,
- 0xe01063da, 0x4736f464, 0x5ad328d8, 0xb347cc96,
- 0x75bb0fc3, 0x98511bfb, 0x4ffbcc35, 0xb58bcf6a,
- 0xe11f0abc, 0xbfc5fe4a, 0xa70aec10, 0xac39570a,
- 0x3f04442f, 0x6188b153, 0xe0397a2e, 0x5727cb79,
- 0x9ceb418f, 0x1cacd68d, 0x2ad37c96, 0x0175cb9d,
- 0xc69dff09, 0xc75b65f0, 0xd9db40d8, 0xec0e7779,
- 0x4744ead4, 0xb11c3274, 0xdd24cb9e, 0x7e1c54bd,
- 0xf01144f9, 0xd2240eb1, 0x9675b3fd, 0xa3ac3755,
- 0xd47c27af, 0x51c85f4d, 0x56907596, 0xa5bb15e6,
- 0x580304f0, 0xca042cf1, 0x011a37ea, 0x8dbfaadb,
- 0x35ba3e4a, 0x3526ffa0, 0xc37b4d09, 0xbc306ed9,
- 0x98a52666, 0x5648f725, 0xff5e569d, 0x0ced63d0,
- 0x7c63b2cf, 0x700b45e1, 0xd5ea50f1, 0x85a92872,
- 0xaf1fbda7, 0xd4234870, 0xa7870bf3, 0x2d3b4d79,
- 0x42e04198, 0x0cd0ede7, 0x26470db8, 0xf881814c,
- 0x474d6ad7, 0x7c0c5e5c, 0xd1231959, 0x381b7298,
- 0xf5d2f4db, 0xab838653, 0x6e2f1e23, 0x83719c9e,
- 0xbd91e046, 0x9a56456e, 0xdc39200c, 0x20c8c571,
- 0x962bda1c, 0xe1e696ff, 0xb141ab08, 0x7cca89b9,
- 0x1a69e783, 0x02cc4843, 0xa2f7c579, 0x429ef47d,
- 0x427b169c, 0x5ac9f049, 0xdd8f0f00, 0x5c8165bf,
+ 0x30fb40d4,
+ 0x9fa0ff0b,
+ 0x6beccd2f,
+ 0x3f258c7a,
+ 0x1e213f2f,
+ 0x9c004dd3,
+ 0x6003e540,
+ 0xcf9fc949,
+ 0xbfd4af27,
+ 0x88bbbdb5,
+ 0xe2034090,
+ 0x98d09675,
+ 0x6e63a0e0,
+ 0x15c361d2,
+ 0xc2e7661d,
+ 0x22d4ff8e,
+ 0x28683b6f,
+ 0xc07fd059,
+ 0xff2379c8,
+ 0x775f50e2,
+ 0x43c340d3,
+ 0xdf2f8656,
+ 0x887ca41a,
+ 0xa2d2bd2d,
+ 0xa1c9e0d6,
+ 0x346c4819,
+ 0x61b76d87,
+ 0x22540f2f,
+ 0x2abe32e1,
+ 0xaa54166b,
+ 0x22568e3a,
+ 0xa2d341d0,
+ 0x66db40c8,
+ 0xa784392f,
+ 0x004dff2f,
+ 0x2db9d2de,
+ 0x97943fac,
+ 0x4a97c1d8,
+ 0x527644b7,
+ 0xb5f437a7,
+ 0xb82cbaef,
+ 0xd751d159,
+ 0x6ff7f0ed,
+ 0x5a097a1f,
+ 0x827b68d0,
+ 0x90ecf52e,
+ 0x22b0c054,
+ 0xbc8e5935,
+ 0x4b6d2f7f,
+ 0x50bb64a2,
+ 0xd2664910,
+ 0xbee5812d,
+ 0xb7332290,
+ 0xe93b159f,
+ 0xb48ee411,
+ 0x4bff345d,
+ 0xfd45c240,
+ 0xad31973f,
+ 0xc4f6d02e,
+ 0x55fc8165,
+ 0xd5b1caad,
+ 0xa1ac2dae,
+ 0xa2d4b76d,
+ 0xc19b0c50,
+ 0x882240f2,
+ 0x0c6e4f38,
+ 0xa4e4bfd7,
+ 0x4f5ba272,
+ 0x564c1d2f,
+ 0xc59c5319,
+ 0xb949e354,
+ 0xb04669fe,
+ 0xb1b6ab8a,
+ 0xc71358dd,
+ 0x6385c545,
+ 0x110f935d,
+ 0x57538ad5,
+ 0x6a390493,
+ 0xe63d37e0,
+ 0x2a54f6b3,
+ 0x3a787d5f,
+ 0x6276a0b5,
+ 0x19a6fcdf,
+ 0x7a42206a,
+ 0x29f9d4d5,
+ 0xf61b1891,
+ 0xbb72275e,
+ 0xaa508167,
+ 0x38901091,
+ 0xc6b505eb,
+ 0x84c7cb8c,
+ 0x2ad75a0f,
+ 0x874a1427,
+ 0xa2d1936b,
+ 0x2ad286af,
+ 0xaa56d291,
+ 0xd7894360,
+ 0x425c750d,
+ 0x93b39e26,
+ 0x187184c9,
+ 0x6c00b32d,
+ 0x73e2bb14,
+ 0xa0bebc3c,
+ 0x54623779,
+ 0x64459eab,
+ 0x3f328b82,
+ 0x7718cf82,
+ 0x59a2cea6,
+ 0x04ee002e,
+ 0x89fe78e6,
+ 0x3fab0950,
+ 0x325ff6c2,
+ 0x81383f05,
+ 0x6963c5c8,
+ 0x76cb5ad6,
+ 0xd49974c9,
+ 0xca180dcf,
+ 0x380782d5,
+ 0xc7fa5cf6,
+ 0x8ac31511,
+ 0x35e79e13,
+ 0x47da91d0,
+ 0xf40f9086,
+ 0xa7e2419e,
+ 0x31366241,
+ 0x051ef495,
+ 0xaa573b04,
+ 0x4a805d8d,
+ 0x548300d0,
+ 0x00322a3c,
+ 0xbf64cddf,
+ 0xba57a68e,
+ 0x75c6372b,
+ 0x50afd341,
+ 0xa7c13275,
+ 0x915a0bf5,
+ 0x6b54bfab,
+ 0x2b0b1426,
+ 0xab4cc9d7,
+ 0x449ccd82,
+ 0xf7fbf265,
+ 0xab85c5f3,
+ 0x1b55db94,
+ 0xaad4e324,
+ 0xcfa4bd3f,
+ 0x2deaa3e2,
+ 0x9e204d02,
+ 0xc8bd25ac,
+ 0xeadf55b3,
+ 0xd5bd9e98,
+ 0xe31231b2,
+ 0x2ad5ad6c,
+ 0x954329de,
+ 0xadbe4528,
+ 0xd8710f69,
+ 0xaa51c90f,
+ 0xaa786bf6,
+ 0x22513f1e,
+ 0xaa51a79b,
+ 0x2ad344cc,
+ 0x7b5a41f0,
+ 0xd37cfbad,
+ 0x1b069505,
+ 0x41ece491,
+ 0xb4c332e6,
+ 0x032268d4,
+ 0xc9600acc,
+ 0xce387e6d,
+ 0xbf6bb16c,
+ 0x6a70fb78,
+ 0x0d03d9c9,
+ 0xd4df39de,
+ 0xe01063da,
+ 0x4736f464,
+ 0x5ad328d8,
+ 0xb347cc96,
+ 0x75bb0fc3,
+ 0x98511bfb,
+ 0x4ffbcc35,
+ 0xb58bcf6a,
+ 0xe11f0abc,
+ 0xbfc5fe4a,
+ 0xa70aec10,
+ 0xac39570a,
+ 0x3f04442f,
+ 0x6188b153,
+ 0xe0397a2e,
+ 0x5727cb79,
+ 0x9ceb418f,
+ 0x1cacd68d,
+ 0x2ad37c96,
+ 0x0175cb9d,
+ 0xc69dff09,
+ 0xc75b65f0,
+ 0xd9db40d8,
+ 0xec0e7779,
+ 0x4744ead4,
+ 0xb11c3274,
+ 0xdd24cb9e,
+ 0x7e1c54bd,
+ 0xf01144f9,
+ 0xd2240eb1,
+ 0x9675b3fd,
+ 0xa3ac3755,
+ 0xd47c27af,
+ 0x51c85f4d,
+ 0x56907596,
+ 0xa5bb15e6,
+ 0x580304f0,
+ 0xca042cf1,
+ 0x011a37ea,
+ 0x8dbfaadb,
+ 0x35ba3e4a,
+ 0x3526ffa0,
+ 0xc37b4d09,
+ 0xbc306ed9,
+ 0x98a52666,
+ 0x5648f725,
+ 0xff5e569d,
+ 0x0ced63d0,
+ 0x7c63b2cf,
+ 0x700b45e1,
+ 0xd5ea50f1,
+ 0x85a92872,
+ 0xaf1fbda7,
+ 0xd4234870,
+ 0xa7870bf3,
+ 0x2d3b4d79,
+ 0x42e04198,
+ 0x0cd0ede7,
+ 0x26470db8,
+ 0xf881814c,
+ 0x474d6ad7,
+ 0x7c0c5e5c,
+ 0xd1231959,
+ 0x381b7298,
+ 0xf5d2f4db,
+ 0xab838653,
+ 0x6e2f1e23,
+ 0x83719c9e,
+ 0xbd91e046,
+ 0x9a56456e,
+ 0xdc39200c,
+ 0x20c8c571,
+ 0x962bda1c,
+ 0xe1e696ff,
+ 0xb141ab08,
+ 0x7cca89b9,
+ 0x1a69e783,
+ 0x02cc4843,
+ 0xa2f7c579,
+ 0x429ef47d,
+ 0x427b169c,
+ 0x5ac9f049,
+ 0xdd8f0f00,
+ 0x5c8165bf,
};
const CAST_LONG CAST_S_table1[256] = {
- 0x1f201094, 0xef0ba75b, 0x69e3cf7e, 0x393f4380,
- 0xfe61cf7a, 0xeec5207a, 0x55889c94, 0x72fc0651,
- 0xada7ef79, 0x4e1d7235, 0xd55a63ce, 0xde0436ba,
- 0x99c430ef, 0x5f0c0794, 0x18dcdb7d, 0xa1d6eff3,
- 0xa0b52f7b, 0x59e83605, 0xee15b094, 0xe9ffd909,
- 0xdc440086, 0xef944459, 0xba83ccb3, 0xe0c3cdfb,
- 0xd1da4181, 0x3b092ab1, 0xf997f1c1, 0xa5e6cf7b,
- 0x01420ddb, 0xe4e7ef5b, 0x25a1ff41, 0xe180f806,
- 0x1fc41080, 0x179bee7a, 0xd37ac6a9, 0xfe5830a4,
- 0x98de8b7f, 0x77e83f4e, 0x79929269, 0x24fa9f7b,
- 0xe113c85b, 0xacc40083, 0xd7503525, 0xf7ea615f,
- 0x62143154, 0x0d554b63, 0x5d681121, 0xc866c359,
- 0x3d63cf73, 0xcee234c0, 0xd4d87e87, 0x5c672b21,
- 0x071f6181, 0x39f7627f, 0x361e3084, 0xe4eb573b,
- 0x602f64a4, 0xd63acd9c, 0x1bbc4635, 0x9e81032d,
- 0x2701f50c, 0x99847ab4, 0xa0e3df79, 0xba6cf38c,
- 0x10843094, 0x2537a95e, 0xf46f6ffe, 0xa1ff3b1f,
- 0x208cfb6a, 0x8f458c74, 0xd9e0a227, 0x4ec73a34,
- 0xfc884f69, 0x3e4de8df, 0xef0e0088, 0x3559648d,
- 0x8a45388c, 0x1d804366, 0x721d9bfd, 0xa58684bb,
- 0xe8256333, 0x844e8212, 0x128d8098, 0xfed33fb4,
- 0xce280ae1, 0x27e19ba5, 0xd5a6c252, 0xe49754bd,
- 0xc5d655dd, 0xeb667064, 0x77840b4d, 0xa1b6a801,
- 0x84db26a9, 0xe0b56714, 0x21f043b7, 0xe5d05860,
- 0x54f03084, 0x066ff472, 0xa31aa153, 0xdadc4755,
- 0xb5625dbf, 0x68561be6, 0x83ca6b94, 0x2d6ed23b,
- 0xeccf01db, 0xa6d3d0ba, 0xb6803d5c, 0xaf77a709,
- 0x33b4a34c, 0x397bc8d6, 0x5ee22b95, 0x5f0e5304,
- 0x81ed6f61, 0x20e74364, 0xb45e1378, 0xde18639b,
- 0x881ca122, 0xb96726d1, 0x8049a7e8, 0x22b7da7b,
- 0x5e552d25, 0x5272d237, 0x79d2951c, 0xc60d894c,
- 0x488cb402, 0x1ba4fe5b, 0xa4b09f6b, 0x1ca815cf,
- 0xa20c3005, 0x8871df63, 0xb9de2fcb, 0x0cc6c9e9,
- 0x0beeff53, 0xe3214517, 0xb4542835, 0x9f63293c,
- 0xee41e729, 0x6e1d2d7c, 0x50045286, 0x1e6685f3,
- 0xf33401c6, 0x30a22c95, 0x31a70850, 0x60930f13,
- 0x73f98417, 0xa1269859, 0xec645c44, 0x52c877a9,
- 0xcdff33a6, 0xa02b1741, 0x7cbad9a2, 0x2180036f,
- 0x50d99c08, 0xcb3f4861, 0xc26bd765, 0x64a3f6ab,
- 0x80342676, 0x25a75e7b, 0xe4e6d1fc, 0x20c710e6,
- 0xcdf0b680, 0x17844d3b, 0x31eef84d, 0x7e0824e4,
- 0x2ccb49eb, 0x846a3bae, 0x8ff77888, 0xee5d60f6,
- 0x7af75673, 0x2fdd5cdb, 0xa11631c1, 0x30f66f43,
- 0xb3faec54, 0x157fd7fa, 0xef8579cc, 0xd152de58,
- 0xdb2ffd5e, 0x8f32ce19, 0x306af97a, 0x02f03ef8,
- 0x99319ad5, 0xc242fa0f, 0xa7e3ebb0, 0xc68e4906,
- 0xb8da230c, 0x80823028, 0xdcdef3c8, 0xd35fb171,
- 0x088a1bc8, 0xbec0c560, 0x61a3c9e8, 0xbca8f54d,
- 0xc72feffa, 0x22822e99, 0x82c570b4, 0xd8d94e89,
- 0x8b1c34bc, 0x301e16e6, 0x273be979, 0xb0ffeaa6,
- 0x61d9b8c6, 0x00b24869, 0xb7ffce3f, 0x08dc283b,
- 0x43daf65a, 0xf7e19798, 0x7619b72f, 0x8f1c9ba4,
- 0xdc8637a0, 0x16a7d3b1, 0x9fc393b7, 0xa7136eeb,
- 0xc6bcc63e, 0x1a513742, 0xef6828bc, 0x520365d6,
- 0x2d6a77ab, 0x3527ed4b, 0x821fd216, 0x095c6e2e,
- 0xdb92f2fb, 0x5eea29cb, 0x145892f5, 0x91584f7f,
- 0x5483697b, 0x2667a8cc, 0x85196048, 0x8c4bacea,
- 0x833860d4, 0x0d23e0f9, 0x6c387e8a, 0x0ae6d249,
- 0xb284600c, 0xd835731d, 0xdcb1c647, 0xac4c56ea,
- 0x3ebd81b3, 0x230eabb0, 0x6438bc87, 0xf0b5b1fa,
- 0x8f5ea2b3, 0xfc184642, 0x0a036b7a, 0x4fb089bd,
- 0x649da589, 0xa345415e, 0x5c038323, 0x3e5d3bb9,
- 0x43d79572, 0x7e6dd07c, 0x06dfdf1e, 0x6c6cc4ef,
- 0x7160a539, 0x73bfbe70, 0x83877605, 0x4523ecf1,
+ 0x1f201094,
+ 0xef0ba75b,
+ 0x69e3cf7e,
+ 0x393f4380,
+ 0xfe61cf7a,
+ 0xeec5207a,
+ 0x55889c94,
+ 0x72fc0651,
+ 0xada7ef79,
+ 0x4e1d7235,
+ 0xd55a63ce,
+ 0xde0436ba,
+ 0x99c430ef,
+ 0x5f0c0794,
+ 0x18dcdb7d,
+ 0xa1d6eff3,
+ 0xa0b52f7b,
+ 0x59e83605,
+ 0xee15b094,
+ 0xe9ffd909,
+ 0xdc440086,
+ 0xef944459,
+ 0xba83ccb3,
+ 0xe0c3cdfb,
+ 0xd1da4181,
+ 0x3b092ab1,
+ 0xf997f1c1,
+ 0xa5e6cf7b,
+ 0x01420ddb,
+ 0xe4e7ef5b,
+ 0x25a1ff41,
+ 0xe180f806,
+ 0x1fc41080,
+ 0x179bee7a,
+ 0xd37ac6a9,
+ 0xfe5830a4,
+ 0x98de8b7f,
+ 0x77e83f4e,
+ 0x79929269,
+ 0x24fa9f7b,
+ 0xe113c85b,
+ 0xacc40083,
+ 0xd7503525,
+ 0xf7ea615f,
+ 0x62143154,
+ 0x0d554b63,
+ 0x5d681121,
+ 0xc866c359,
+ 0x3d63cf73,
+ 0xcee234c0,
+ 0xd4d87e87,
+ 0x5c672b21,
+ 0x071f6181,
+ 0x39f7627f,
+ 0x361e3084,
+ 0xe4eb573b,
+ 0x602f64a4,
+ 0xd63acd9c,
+ 0x1bbc4635,
+ 0x9e81032d,
+ 0x2701f50c,
+ 0x99847ab4,
+ 0xa0e3df79,
+ 0xba6cf38c,
+ 0x10843094,
+ 0x2537a95e,
+ 0xf46f6ffe,
+ 0xa1ff3b1f,
+ 0x208cfb6a,
+ 0x8f458c74,
+ 0xd9e0a227,
+ 0x4ec73a34,
+ 0xfc884f69,
+ 0x3e4de8df,
+ 0xef0e0088,
+ 0x3559648d,
+ 0x8a45388c,
+ 0x1d804366,
+ 0x721d9bfd,
+ 0xa58684bb,
+ 0xe8256333,
+ 0x844e8212,
+ 0x128d8098,
+ 0xfed33fb4,
+ 0xce280ae1,
+ 0x27e19ba5,
+ 0xd5a6c252,
+ 0xe49754bd,
+ 0xc5d655dd,
+ 0xeb667064,
+ 0x77840b4d,
+ 0xa1b6a801,
+ 0x84db26a9,
+ 0xe0b56714,
+ 0x21f043b7,
+ 0xe5d05860,
+ 0x54f03084,
+ 0x066ff472,
+ 0xa31aa153,
+ 0xdadc4755,
+ 0xb5625dbf,
+ 0x68561be6,
+ 0x83ca6b94,
+ 0x2d6ed23b,
+ 0xeccf01db,
+ 0xa6d3d0ba,
+ 0xb6803d5c,
+ 0xaf77a709,
+ 0x33b4a34c,
+ 0x397bc8d6,
+ 0x5ee22b95,
+ 0x5f0e5304,
+ 0x81ed6f61,
+ 0x20e74364,
+ 0xb45e1378,
+ 0xde18639b,
+ 0x881ca122,
+ 0xb96726d1,
+ 0x8049a7e8,
+ 0x22b7da7b,
+ 0x5e552d25,
+ 0x5272d237,
+ 0x79d2951c,
+ 0xc60d894c,
+ 0x488cb402,
+ 0x1ba4fe5b,
+ 0xa4b09f6b,
+ 0x1ca815cf,
+ 0xa20c3005,
+ 0x8871df63,
+ 0xb9de2fcb,
+ 0x0cc6c9e9,
+ 0x0beeff53,
+ 0xe3214517,
+ 0xb4542835,
+ 0x9f63293c,
+ 0xee41e729,
+ 0x6e1d2d7c,
+ 0x50045286,
+ 0x1e6685f3,
+ 0xf33401c6,
+ 0x30a22c95,
+ 0x31a70850,
+ 0x60930f13,
+ 0x73f98417,
+ 0xa1269859,
+ 0xec645c44,
+ 0x52c877a9,
+ 0xcdff33a6,
+ 0xa02b1741,
+ 0x7cbad9a2,
+ 0x2180036f,
+ 0x50d99c08,
+ 0xcb3f4861,
+ 0xc26bd765,
+ 0x64a3f6ab,
+ 0x80342676,
+ 0x25a75e7b,
+ 0xe4e6d1fc,
+ 0x20c710e6,
+ 0xcdf0b680,
+ 0x17844d3b,
+ 0x31eef84d,
+ 0x7e0824e4,
+ 0x2ccb49eb,
+ 0x846a3bae,
+ 0x8ff77888,
+ 0xee5d60f6,
+ 0x7af75673,
+ 0x2fdd5cdb,
+ 0xa11631c1,
+ 0x30f66f43,
+ 0xb3faec54,
+ 0x157fd7fa,
+ 0xef8579cc,
+ 0xd152de58,
+ 0xdb2ffd5e,
+ 0x8f32ce19,
+ 0x306af97a,
+ 0x02f03ef8,
+ 0x99319ad5,
+ 0xc242fa0f,
+ 0xa7e3ebb0,
+ 0xc68e4906,
+ 0xb8da230c,
+ 0x80823028,
+ 0xdcdef3c8,
+ 0xd35fb171,
+ 0x088a1bc8,
+ 0xbec0c560,
+ 0x61a3c9e8,
+ 0xbca8f54d,
+ 0xc72feffa,
+ 0x22822e99,
+ 0x82c570b4,
+ 0xd8d94e89,
+ 0x8b1c34bc,
+ 0x301e16e6,
+ 0x273be979,
+ 0xb0ffeaa6,
+ 0x61d9b8c6,
+ 0x00b24869,
+ 0xb7ffce3f,
+ 0x08dc283b,
+ 0x43daf65a,
+ 0xf7e19798,
+ 0x7619b72f,
+ 0x8f1c9ba4,
+ 0xdc8637a0,
+ 0x16a7d3b1,
+ 0x9fc393b7,
+ 0xa7136eeb,
+ 0xc6bcc63e,
+ 0x1a513742,
+ 0xef6828bc,
+ 0x520365d6,
+ 0x2d6a77ab,
+ 0x3527ed4b,
+ 0x821fd216,
+ 0x095c6e2e,
+ 0xdb92f2fb,
+ 0x5eea29cb,
+ 0x145892f5,
+ 0x91584f7f,
+ 0x5483697b,
+ 0x2667a8cc,
+ 0x85196048,
+ 0x8c4bacea,
+ 0x833860d4,
+ 0x0d23e0f9,
+ 0x6c387e8a,
+ 0x0ae6d249,
+ 0xb284600c,
+ 0xd835731d,
+ 0xdcb1c647,
+ 0xac4c56ea,
+ 0x3ebd81b3,
+ 0x230eabb0,
+ 0x6438bc87,
+ 0xf0b5b1fa,
+ 0x8f5ea2b3,
+ 0xfc184642,
+ 0x0a036b7a,
+ 0x4fb089bd,
+ 0x649da589,
+ 0xa345415e,
+ 0x5c038323,
+ 0x3e5d3bb9,
+ 0x43d79572,
+ 0x7e6dd07c,
+ 0x06dfdf1e,
+ 0x6c6cc4ef,
+ 0x7160a539,
+ 0x73bfbe70,
+ 0x83877605,
+ 0x4523ecf1,
};
const CAST_LONG CAST_S_table2[256] = {
- 0x8defc240, 0x25fa5d9f, 0xeb903dbf, 0xe810c907,
- 0x47607fff, 0x369fe44b, 0x8c1fc644, 0xaececa90,
- 0xbeb1f9bf, 0xeefbcaea, 0xe8cf1950, 0x51df07ae,
- 0x920e8806, 0xf0ad0548, 0xe13c8d83, 0x927010d5,
- 0x11107d9f, 0x07647db9, 0xb2e3e4d4, 0x3d4f285e,
- 0xb9afa820, 0xfade82e0, 0xa067268b, 0x8272792e,
- 0x553fb2c0, 0x489ae22b, 0xd4ef9794, 0x125e3fbc,
- 0x21fffcee, 0x825b1bfd, 0x9255c5ed, 0x1257a240,
- 0x4e1a8302, 0xbae07fff, 0x528246e7, 0x8e57140e,
- 0x3373f7bf, 0x8c9f8188, 0xa6fc4ee8, 0xc982b5a5,
- 0xa8c01db7, 0x579fc264, 0x67094f31, 0xf2bd3f5f,
- 0x40fff7c1, 0x1fb78dfc, 0x8e6bd2c1, 0x437be59b,
- 0x99b03dbf, 0xb5dbc64b, 0x638dc0e6, 0x55819d99,
- 0xa197c81c, 0x4a012d6e, 0xc5884a28, 0xccc36f71,
- 0xb843c213, 0x6c0743f1, 0x8309893c, 0x0feddd5f,
- 0x2f7fe850, 0xd7c07f7e, 0x02507fbf, 0x5afb9a04,
- 0xa747d2d0, 0x1651192e, 0xaf70bf3e, 0x58c31380,
- 0x5f98302e, 0x727cc3c4, 0x0a0fb402, 0x0f7fef82,
- 0x8c96fdad, 0x5d2c2aae, 0x8ee99a49, 0x50da88b8,
- 0x8427f4a0, 0x1eac5790, 0x796fb449, 0x8252dc15,
- 0xefbd7d9b, 0xa672597d, 0xada840d8, 0x45f54504,
- 0xfa5d7403, 0xe83ec305, 0x4f91751a, 0x925669c2,
- 0x23efe941, 0xa903f12e, 0x60270df2, 0x0276e4b6,
- 0x94fd6574, 0x927985b2, 0x8276dbcb, 0x02778176,
- 0xf8af918d, 0x4e48f79e, 0x8f616ddf, 0xe29d840e,
- 0x842f7d83, 0x340ce5c8, 0x96bbb682, 0x93b4b148,
- 0xef303cab, 0x984faf28, 0x779faf9b, 0x92dc560d,
- 0x224d1e20, 0x8437aa88, 0x7d29dc96, 0x2756d3dc,
- 0x8b907cee, 0xb51fd240, 0xe7c07ce3, 0xe566b4a1,
- 0xc3e9615e, 0x3cf8209d, 0x6094d1e3, 0xcd9ca341,
- 0x5c76460e, 0x00ea983b, 0xd4d67881, 0xfd47572c,
- 0xf76cedd9, 0xbda8229c, 0x127dadaa, 0x438a074e,
- 0x1f97c090, 0x081bdb8a, 0x93a07ebe, 0xb938ca15,
- 0x97b03cff, 0x3dc2c0f8, 0x8d1ab2ec, 0x64380e51,
- 0x68cc7bfb, 0xd90f2788, 0x12490181, 0x5de5ffd4,
- 0xdd7ef86a, 0x76a2e214, 0xb9a40368, 0x925d958f,
- 0x4b39fffa, 0xba39aee9, 0xa4ffd30b, 0xfaf7933b,
- 0x6d498623, 0x193cbcfa, 0x27627545, 0x825cf47a,
- 0x61bd8ba0, 0xd11e42d1, 0xcead04f4, 0x127ea392,
- 0x10428db7, 0x8272a972, 0x9270c4a8, 0x127de50b,
- 0x285ba1c8, 0x3c62f44f, 0x35c0eaa5, 0xe805d231,
- 0x428929fb, 0xb4fcdf82, 0x4fb66a53, 0x0e7dc15b,
- 0x1f081fab, 0x108618ae, 0xfcfd086d, 0xf9ff2889,
- 0x694bcc11, 0x236a5cae, 0x12deca4d, 0x2c3f8cc5,
- 0xd2d02dfe, 0xf8ef5896, 0xe4cf52da, 0x95155b67,
- 0x494a488c, 0xb9b6a80c, 0x5c8f82bc, 0x89d36b45,
- 0x3a609437, 0xec00c9a9, 0x44715253, 0x0a874b49,
- 0xd773bc40, 0x7c34671c, 0x02717ef6, 0x4feb5536,
- 0xa2d02fff, 0xd2bf60c4, 0xd43f03c0, 0x50b4ef6d,
- 0x07478cd1, 0x006e1888, 0xa2e53f55, 0xb9e6d4bc,
- 0xa2048016, 0x97573833, 0xd7207d67, 0xde0f8f3d,
- 0x72f87b33, 0xabcc4f33, 0x7688c55d, 0x7b00a6b0,
- 0x947b0001, 0x570075d2, 0xf9bb88f8, 0x8942019e,
- 0x4264a5ff, 0x856302e0, 0x72dbd92b, 0xee971b69,
- 0x6ea22fde, 0x5f08ae2b, 0xaf7a616d, 0xe5c98767,
- 0xcf1febd2, 0x61efc8c2, 0xf1ac2571, 0xcc8239c2,
- 0x67214cb8, 0xb1e583d1, 0xb7dc3e62, 0x7f10bdce,
- 0xf90a5c38, 0x0ff0443d, 0x606e6dc6, 0x60543a49,
- 0x5727c148, 0x2be98a1d, 0x8ab41738, 0x20e1be24,
- 0xaf96da0f, 0x68458425, 0x99833be5, 0x600d457d,
- 0x282f9350, 0x8334b362, 0xd91d1120, 0x2b6d8da0,
- 0x642b1e31, 0x9c305a00, 0x52bce688, 0x1b03588a,
- 0xf7baefd5, 0x4142ed9c, 0xa4315c11, 0x83323ec5,
- 0xdfef4636, 0xa133c501, 0xe9d3531c, 0xee353783,
+ 0x8defc240,
+ 0x25fa5d9f,
+ 0xeb903dbf,
+ 0xe810c907,
+ 0x47607fff,
+ 0x369fe44b,
+ 0x8c1fc644,
+ 0xaececa90,
+ 0xbeb1f9bf,
+ 0xeefbcaea,
+ 0xe8cf1950,
+ 0x51df07ae,
+ 0x920e8806,
+ 0xf0ad0548,
+ 0xe13c8d83,
+ 0x927010d5,
+ 0x11107d9f,
+ 0x07647db9,
+ 0xb2e3e4d4,
+ 0x3d4f285e,
+ 0xb9afa820,
+ 0xfade82e0,
+ 0xa067268b,
+ 0x8272792e,
+ 0x553fb2c0,
+ 0x489ae22b,
+ 0xd4ef9794,
+ 0x125e3fbc,
+ 0x21fffcee,
+ 0x825b1bfd,
+ 0x9255c5ed,
+ 0x1257a240,
+ 0x4e1a8302,
+ 0xbae07fff,
+ 0x528246e7,
+ 0x8e57140e,
+ 0x3373f7bf,
+ 0x8c9f8188,
+ 0xa6fc4ee8,
+ 0xc982b5a5,
+ 0xa8c01db7,
+ 0x579fc264,
+ 0x67094f31,
+ 0xf2bd3f5f,
+ 0x40fff7c1,
+ 0x1fb78dfc,
+ 0x8e6bd2c1,
+ 0x437be59b,
+ 0x99b03dbf,
+ 0xb5dbc64b,
+ 0x638dc0e6,
+ 0x55819d99,
+ 0xa197c81c,
+ 0x4a012d6e,
+ 0xc5884a28,
+ 0xccc36f71,
+ 0xb843c213,
+ 0x6c0743f1,
+ 0x8309893c,
+ 0x0feddd5f,
+ 0x2f7fe850,
+ 0xd7c07f7e,
+ 0x02507fbf,
+ 0x5afb9a04,
+ 0xa747d2d0,
+ 0x1651192e,
+ 0xaf70bf3e,
+ 0x58c31380,
+ 0x5f98302e,
+ 0x727cc3c4,
+ 0x0a0fb402,
+ 0x0f7fef82,
+ 0x8c96fdad,
+ 0x5d2c2aae,
+ 0x8ee99a49,
+ 0x50da88b8,
+ 0x8427f4a0,
+ 0x1eac5790,
+ 0x796fb449,
+ 0x8252dc15,
+ 0xefbd7d9b,
+ 0xa672597d,
+ 0xada840d8,
+ 0x45f54504,
+ 0xfa5d7403,
+ 0xe83ec305,
+ 0x4f91751a,
+ 0x925669c2,
+ 0x23efe941,
+ 0xa903f12e,
+ 0x60270df2,
+ 0x0276e4b6,
+ 0x94fd6574,
+ 0x927985b2,
+ 0x8276dbcb,
+ 0x02778176,
+ 0xf8af918d,
+ 0x4e48f79e,
+ 0x8f616ddf,
+ 0xe29d840e,
+ 0x842f7d83,
+ 0x340ce5c8,
+ 0x96bbb682,
+ 0x93b4b148,
+ 0xef303cab,
+ 0x984faf28,
+ 0x779faf9b,
+ 0x92dc560d,
+ 0x224d1e20,
+ 0x8437aa88,
+ 0x7d29dc96,
+ 0x2756d3dc,
+ 0x8b907cee,
+ 0xb51fd240,
+ 0xe7c07ce3,
+ 0xe566b4a1,
+ 0xc3e9615e,
+ 0x3cf8209d,
+ 0x6094d1e3,
+ 0xcd9ca341,
+ 0x5c76460e,
+ 0x00ea983b,
+ 0xd4d67881,
+ 0xfd47572c,
+ 0xf76cedd9,
+ 0xbda8229c,
+ 0x127dadaa,
+ 0x438a074e,
+ 0x1f97c090,
+ 0x081bdb8a,
+ 0x93a07ebe,
+ 0xb938ca15,
+ 0x97b03cff,
+ 0x3dc2c0f8,
+ 0x8d1ab2ec,
+ 0x64380e51,
+ 0x68cc7bfb,
+ 0xd90f2788,
+ 0x12490181,
+ 0x5de5ffd4,
+ 0xdd7ef86a,
+ 0x76a2e214,
+ 0xb9a40368,
+ 0x925d958f,
+ 0x4b39fffa,
+ 0xba39aee9,
+ 0xa4ffd30b,
+ 0xfaf7933b,
+ 0x6d498623,
+ 0x193cbcfa,
+ 0x27627545,
+ 0x825cf47a,
+ 0x61bd8ba0,
+ 0xd11e42d1,
+ 0xcead04f4,
+ 0x127ea392,
+ 0x10428db7,
+ 0x8272a972,
+ 0x9270c4a8,
+ 0x127de50b,
+ 0x285ba1c8,
+ 0x3c62f44f,
+ 0x35c0eaa5,
+ 0xe805d231,
+ 0x428929fb,
+ 0xb4fcdf82,
+ 0x4fb66a53,
+ 0x0e7dc15b,
+ 0x1f081fab,
+ 0x108618ae,
+ 0xfcfd086d,
+ 0xf9ff2889,
+ 0x694bcc11,
+ 0x236a5cae,
+ 0x12deca4d,
+ 0x2c3f8cc5,
+ 0xd2d02dfe,
+ 0xf8ef5896,
+ 0xe4cf52da,
+ 0x95155b67,
+ 0x494a488c,
+ 0xb9b6a80c,
+ 0x5c8f82bc,
+ 0x89d36b45,
+ 0x3a609437,
+ 0xec00c9a9,
+ 0x44715253,
+ 0x0a874b49,
+ 0xd773bc40,
+ 0x7c34671c,
+ 0x02717ef6,
+ 0x4feb5536,
+ 0xa2d02fff,
+ 0xd2bf60c4,
+ 0xd43f03c0,
+ 0x50b4ef6d,
+ 0x07478cd1,
+ 0x006e1888,
+ 0xa2e53f55,
+ 0xb9e6d4bc,
+ 0xa2048016,
+ 0x97573833,
+ 0xd7207d67,
+ 0xde0f8f3d,
+ 0x72f87b33,
+ 0xabcc4f33,
+ 0x7688c55d,
+ 0x7b00a6b0,
+ 0x947b0001,
+ 0x570075d2,
+ 0xf9bb88f8,
+ 0x8942019e,
+ 0x4264a5ff,
+ 0x856302e0,
+ 0x72dbd92b,
+ 0xee971b69,
+ 0x6ea22fde,
+ 0x5f08ae2b,
+ 0xaf7a616d,
+ 0xe5c98767,
+ 0xcf1febd2,
+ 0x61efc8c2,
+ 0xf1ac2571,
+ 0xcc8239c2,
+ 0x67214cb8,
+ 0xb1e583d1,
+ 0xb7dc3e62,
+ 0x7f10bdce,
+ 0xf90a5c38,
+ 0x0ff0443d,
+ 0x606e6dc6,
+ 0x60543a49,
+ 0x5727c148,
+ 0x2be98a1d,
+ 0x8ab41738,
+ 0x20e1be24,
+ 0xaf96da0f,
+ 0x68458425,
+ 0x99833be5,
+ 0x600d457d,
+ 0x282f9350,
+ 0x8334b362,
+ 0xd91d1120,
+ 0x2b6d8da0,
+ 0x642b1e31,
+ 0x9c305a00,
+ 0x52bce688,
+ 0x1b03588a,
+ 0xf7baefd5,
+ 0x4142ed9c,
+ 0xa4315c11,
+ 0x83323ec5,
+ 0xdfef4636,
+ 0xa133c501,
+ 0xe9d3531c,
+ 0xee353783,
};
const CAST_LONG CAST_S_table3[256] = {
- 0x9db30420, 0x1fb6e9de, 0xa7be7bef, 0xd273a298,
- 0x4a4f7bdb, 0x64ad8c57, 0x85510443, 0xfa020ed1,
- 0x7e287aff, 0xe60fb663, 0x095f35a1, 0x79ebf120,
- 0xfd059d43, 0x6497b7b1, 0xf3641f63, 0x241e4adf,
- 0x28147f5f, 0x4fa2b8cd, 0xc9430040, 0x0cc32220,
- 0xfdd30b30, 0xc0a5374f, 0x1d2d00d9, 0x24147b15,
- 0xee4d111a, 0x0fca5167, 0x71ff904c, 0x2d195ffe,
- 0x1a05645f, 0x0c13fefe, 0x081b08ca, 0x05170121,
- 0x80530100, 0xe83e5efe, 0xac9af4f8, 0x7fe72701,
- 0xd2b8ee5f, 0x06df4261, 0xbb9e9b8a, 0x7293ea25,
- 0xce84ffdf, 0xf5718801, 0x3dd64b04, 0xa26f263b,
- 0x7ed48400, 0x547eebe6, 0x446d4ca0, 0x6cf3d6f5,
- 0x2649abdf, 0xaea0c7f5, 0x36338cc1, 0x503f7e93,
- 0xd3772061, 0x11b638e1, 0x72500e03, 0xf80eb2bb,
- 0xabe0502e, 0xec8d77de, 0x57971e81, 0xe14f6746,
- 0xc9335400, 0x6920318f, 0x081dbb99, 0xffc304a5,
- 0x4d351805, 0x7f3d5ce3, 0xa6c866c6, 0x5d5bcca9,
- 0xdaec6fea, 0x9f926f91, 0x9f46222f, 0x3991467d,
- 0xa5bf6d8e, 0x1143c44f, 0x43958302, 0xd0214eeb,
- 0x022083b8, 0x3fb6180c, 0x18f8931e, 0x281658e6,
- 0x26486e3e, 0x8bd78a70, 0x7477e4c1, 0xb506e07c,
- 0xf32d0a25, 0x79098b02, 0xe4eabb81, 0x28123b23,
- 0x69dead38, 0x1574ca16, 0xdf871b62, 0x211c40b7,
- 0xa51a9ef9, 0x0014377b, 0x041e8ac8, 0x09114003,
- 0xbd59e4d2, 0xe3d156d5, 0x4fe876d5, 0x2f91a340,
- 0x557be8de, 0x00eae4a7, 0x0ce5c2ec, 0x4db4bba6,
- 0xe756bdff, 0xdd3369ac, 0xec17b035, 0x06572327,
- 0x99afc8b0, 0x56c8c391, 0x6b65811c, 0x5e146119,
- 0x6e85cb75, 0xbe07c002, 0xc2325577, 0x893ff4ec,
- 0x5bbfc92d, 0xd0ec3b25, 0xb7801ab7, 0x8d6d3b24,
- 0x20c763ef, 0xc366a5fc, 0x9c382880, 0x0ace3205,
- 0xaac9548a, 0xeca1d7c7, 0x041afa32, 0x1d16625a,
- 0x6701902c, 0x9b757a54, 0x31d477f7, 0x9126b031,
- 0x36cc6fdb, 0xc70b8b46, 0xd9e66a48, 0x56e55a79,
- 0x026a4ceb, 0x52437eff, 0x2f8f76b4, 0x0df980a5,
- 0x8674cde3, 0xedda04eb, 0x17a9be04, 0x2c18f4df,
- 0xb7747f9d, 0xab2af7b4, 0xefc34d20, 0x2e096b7c,
- 0x1741a254, 0xe5b6a035, 0x213d42f6, 0x2c1c7c26,
- 0x61c2f50f, 0x6552daf9, 0xd2c231f8, 0x25130f69,
- 0xd8167fa2, 0x0418f2c8, 0x001a96a6, 0x0d1526ab,
- 0x63315c21, 0x5e0a72ec, 0x49bafefd, 0x187908d9,
- 0x8d0dbd86, 0x311170a7, 0x3e9b640c, 0xcc3e10d7,
- 0xd5cad3b6, 0x0caec388, 0xf73001e1, 0x6c728aff,
- 0x71eae2a1, 0x1f9af36e, 0xcfcbd12f, 0xc1de8417,
- 0xac07be6b, 0xcb44a1d8, 0x8b9b0f56, 0x013988c3,
- 0xb1c52fca, 0xb4be31cd, 0xd8782806, 0x12a3a4e2,
- 0x6f7de532, 0x58fd7eb6, 0xd01ee900, 0x24adffc2,
- 0xf4990fc5, 0x9711aac5, 0x001d7b95, 0x82e5e7d2,
- 0x109873f6, 0x00613096, 0xc32d9521, 0xada121ff,
- 0x29908415, 0x7fbb977f, 0xaf9eb3db, 0x29c9ed2a,
- 0x5ce2a465, 0xa730f32c, 0xd0aa3fe8, 0x8a5cc091,
- 0xd49e2ce7, 0x0ce454a9, 0xd60acd86, 0x015f1919,
- 0x77079103, 0xdea03af6, 0x78a8565e, 0xdee356df,
- 0x21f05cbe, 0x8b75e387, 0xb3c50651, 0xb8a5c3ef,
- 0xd8eeb6d2, 0xe523be77, 0xc2154529, 0x2f69efdf,
- 0xafe67afb, 0xf470c4b2, 0xf3e0eb5b, 0xd6cc9876,
- 0x39e4460c, 0x1fda8538, 0x1987832f, 0xca007367,
- 0xa99144f8, 0x296b299e, 0x492fc295, 0x9266beab,
- 0xb5676e69, 0x9bd3ddda, 0xdf7e052f, 0xdb25701c,
- 0x1b5e51ee, 0xf65324e6, 0x6afce36c, 0x0316cc04,
- 0x8644213e, 0xb7dc59d0, 0x7965291f, 0xccd6fd43,
- 0x41823979, 0x932bcdf6, 0xb657c34d, 0x4edfd282,
- 0x7ae5290c, 0x3cb9536b, 0x851e20fe, 0x9833557e,
- 0x13ecf0b0, 0xd3ffb372, 0x3f85c5c1, 0x0aef7ed2,
+ 0x9db30420,
+ 0x1fb6e9de,
+ 0xa7be7bef,
+ 0xd273a298,
+ 0x4a4f7bdb,
+ 0x64ad8c57,
+ 0x85510443,
+ 0xfa020ed1,
+ 0x7e287aff,
+ 0xe60fb663,
+ 0x095f35a1,
+ 0x79ebf120,
+ 0xfd059d43,
+ 0x6497b7b1,
+ 0xf3641f63,
+ 0x241e4adf,
+ 0x28147f5f,
+ 0x4fa2b8cd,
+ 0xc9430040,
+ 0x0cc32220,
+ 0xfdd30b30,
+ 0xc0a5374f,
+ 0x1d2d00d9,
+ 0x24147b15,
+ 0xee4d111a,
+ 0x0fca5167,
+ 0x71ff904c,
+ 0x2d195ffe,
+ 0x1a05645f,
+ 0x0c13fefe,
+ 0x081b08ca,
+ 0x05170121,
+ 0x80530100,
+ 0xe83e5efe,
+ 0xac9af4f8,
+ 0x7fe72701,
+ 0xd2b8ee5f,
+ 0x06df4261,
+ 0xbb9e9b8a,
+ 0x7293ea25,
+ 0xce84ffdf,
+ 0xf5718801,
+ 0x3dd64b04,
+ 0xa26f263b,
+ 0x7ed48400,
+ 0x547eebe6,
+ 0x446d4ca0,
+ 0x6cf3d6f5,
+ 0x2649abdf,
+ 0xaea0c7f5,
+ 0x36338cc1,
+ 0x503f7e93,
+ 0xd3772061,
+ 0x11b638e1,
+ 0x72500e03,
+ 0xf80eb2bb,
+ 0xabe0502e,
+ 0xec8d77de,
+ 0x57971e81,
+ 0xe14f6746,
+ 0xc9335400,
+ 0x6920318f,
+ 0x081dbb99,
+ 0xffc304a5,
+ 0x4d351805,
+ 0x7f3d5ce3,
+ 0xa6c866c6,
+ 0x5d5bcca9,
+ 0xdaec6fea,
+ 0x9f926f91,
+ 0x9f46222f,
+ 0x3991467d,
+ 0xa5bf6d8e,
+ 0x1143c44f,
+ 0x43958302,
+ 0xd0214eeb,
+ 0x022083b8,
+ 0x3fb6180c,
+ 0x18f8931e,
+ 0x281658e6,
+ 0x26486e3e,
+ 0x8bd78a70,
+ 0x7477e4c1,
+ 0xb506e07c,
+ 0xf32d0a25,
+ 0x79098b02,
+ 0xe4eabb81,
+ 0x28123b23,
+ 0x69dead38,
+ 0x1574ca16,
+ 0xdf871b62,
+ 0x211c40b7,
+ 0xa51a9ef9,
+ 0x0014377b,
+ 0x041e8ac8,
+ 0x09114003,
+ 0xbd59e4d2,
+ 0xe3d156d5,
+ 0x4fe876d5,
+ 0x2f91a340,
+ 0x557be8de,
+ 0x00eae4a7,
+ 0x0ce5c2ec,
+ 0x4db4bba6,
+ 0xe756bdff,
+ 0xdd3369ac,
+ 0xec17b035,
+ 0x06572327,
+ 0x99afc8b0,
+ 0x56c8c391,
+ 0x6b65811c,
+ 0x5e146119,
+ 0x6e85cb75,
+ 0xbe07c002,
+ 0xc2325577,
+ 0x893ff4ec,
+ 0x5bbfc92d,
+ 0xd0ec3b25,
+ 0xb7801ab7,
+ 0x8d6d3b24,
+ 0x20c763ef,
+ 0xc366a5fc,
+ 0x9c382880,
+ 0x0ace3205,
+ 0xaac9548a,
+ 0xeca1d7c7,
+ 0x041afa32,
+ 0x1d16625a,
+ 0x6701902c,
+ 0x9b757a54,
+ 0x31d477f7,
+ 0x9126b031,
+ 0x36cc6fdb,
+ 0xc70b8b46,
+ 0xd9e66a48,
+ 0x56e55a79,
+ 0x026a4ceb,
+ 0x52437eff,
+ 0x2f8f76b4,
+ 0x0df980a5,
+ 0x8674cde3,
+ 0xedda04eb,
+ 0x17a9be04,
+ 0x2c18f4df,
+ 0xb7747f9d,
+ 0xab2af7b4,
+ 0xefc34d20,
+ 0x2e096b7c,
+ 0x1741a254,
+ 0xe5b6a035,
+ 0x213d42f6,
+ 0x2c1c7c26,
+ 0x61c2f50f,
+ 0x6552daf9,
+ 0xd2c231f8,
+ 0x25130f69,
+ 0xd8167fa2,
+ 0x0418f2c8,
+ 0x001a96a6,
+ 0x0d1526ab,
+ 0x63315c21,
+ 0x5e0a72ec,
+ 0x49bafefd,
+ 0x187908d9,
+ 0x8d0dbd86,
+ 0x311170a7,
+ 0x3e9b640c,
+ 0xcc3e10d7,
+ 0xd5cad3b6,
+ 0x0caec388,
+ 0xf73001e1,
+ 0x6c728aff,
+ 0x71eae2a1,
+ 0x1f9af36e,
+ 0xcfcbd12f,
+ 0xc1de8417,
+ 0xac07be6b,
+ 0xcb44a1d8,
+ 0x8b9b0f56,
+ 0x013988c3,
+ 0xb1c52fca,
+ 0xb4be31cd,
+ 0xd8782806,
+ 0x12a3a4e2,
+ 0x6f7de532,
+ 0x58fd7eb6,
+ 0xd01ee900,
+ 0x24adffc2,
+ 0xf4990fc5,
+ 0x9711aac5,
+ 0x001d7b95,
+ 0x82e5e7d2,
+ 0x109873f6,
+ 0x00613096,
+ 0xc32d9521,
+ 0xada121ff,
+ 0x29908415,
+ 0x7fbb977f,
+ 0xaf9eb3db,
+ 0x29c9ed2a,
+ 0x5ce2a465,
+ 0xa730f32c,
+ 0xd0aa3fe8,
+ 0x8a5cc091,
+ 0xd49e2ce7,
+ 0x0ce454a9,
+ 0xd60acd86,
+ 0x015f1919,
+ 0x77079103,
+ 0xdea03af6,
+ 0x78a8565e,
+ 0xdee356df,
+ 0x21f05cbe,
+ 0x8b75e387,
+ 0xb3c50651,
+ 0xb8a5c3ef,
+ 0xd8eeb6d2,
+ 0xe523be77,
+ 0xc2154529,
+ 0x2f69efdf,
+ 0xafe67afb,
+ 0xf470c4b2,
+ 0xf3e0eb5b,
+ 0xd6cc9876,
+ 0x39e4460c,
+ 0x1fda8538,
+ 0x1987832f,
+ 0xca007367,
+ 0xa99144f8,
+ 0x296b299e,
+ 0x492fc295,
+ 0x9266beab,
+ 0xb5676e69,
+ 0x9bd3ddda,
+ 0xdf7e052f,
+ 0xdb25701c,
+ 0x1b5e51ee,
+ 0xf65324e6,
+ 0x6afce36c,
+ 0x0316cc04,
+ 0x8644213e,
+ 0xb7dc59d0,
+ 0x7965291f,
+ 0xccd6fd43,
+ 0x41823979,
+ 0x932bcdf6,
+ 0xb657c34d,
+ 0x4edfd282,
+ 0x7ae5290c,
+ 0x3cb9536b,
+ 0x851e20fe,
+ 0x9833557e,
+ 0x13ecf0b0,
+ 0xd3ffb372,
+ 0x3f85c5c1,
+ 0x0aef7ed2,
};
const CAST_LONG CAST_S_table4[256] = {
- 0x7ec90c04, 0x2c6e74b9, 0x9b0e66df, 0xa6337911,
- 0xb86a7fff, 0x1dd358f5, 0x44dd9d44, 0x1731167f,
- 0x08fbf1fa, 0xe7f511cc, 0xd2051b00, 0x735aba00,
- 0x2ab722d8, 0x386381cb, 0xacf6243a, 0x69befd7a,
- 0xe6a2e77f, 0xf0c720cd, 0xc4494816, 0xccf5c180,
- 0x38851640, 0x15b0a848, 0xe68b18cb, 0x4caadeff,
- 0x5f480a01, 0x0412b2aa, 0x259814fc, 0x41d0efe2,
- 0x4e40b48d, 0x248eb6fb, 0x8dba1cfe, 0x41a99b02,
- 0x1a550a04, 0xba8f65cb, 0x7251f4e7, 0x95a51725,
- 0xc106ecd7, 0x97a5980a, 0xc539b9aa, 0x4d79fe6a,
- 0xf2f3f763, 0x68af8040, 0xed0c9e56, 0x11b4958b,
- 0xe1eb5a88, 0x8709e6b0, 0xd7e07156, 0x4e29fea7,
- 0x6366e52d, 0x02d1c000, 0xc4ac8e05, 0x9377f571,
- 0x0c05372a, 0x578535f2, 0x2261be02, 0xd642a0c9,
- 0xdf13a280, 0x74b55bd2, 0x682199c0, 0xd421e5ec,
- 0x53fb3ce8, 0xc8adedb3, 0x28a87fc9, 0x3d959981,
- 0x5c1ff900, 0xfe38d399, 0x0c4eff0b, 0x062407ea,
- 0xaa2f4fb1, 0x4fb96976, 0x90c79505, 0xb0a8a774,
- 0xef55a1ff, 0xe59ca2c2, 0xa6b62d27, 0xe66a4263,
- 0xdf65001f, 0x0ec50966, 0xdfdd55bc, 0x29de0655,
- 0x911e739a, 0x17af8975, 0x32c7911c, 0x89f89468,
- 0x0d01e980, 0x524755f4, 0x03b63cc9, 0x0cc844b2,
- 0xbcf3f0aa, 0x87ac36e9, 0xe53a7426, 0x01b3d82b,
- 0x1a9e7449, 0x64ee2d7e, 0xcddbb1da, 0x01c94910,
- 0xb868bf80, 0x0d26f3fd, 0x9342ede7, 0x04a5c284,
- 0x636737b6, 0x50f5b616, 0xf24766e3, 0x8eca36c1,
- 0x136e05db, 0xfef18391, 0xfb887a37, 0xd6e7f7d4,
- 0xc7fb7dc9, 0x3063fcdf, 0xb6f589de, 0xec2941da,
- 0x26e46695, 0xb7566419, 0xf654efc5, 0xd08d58b7,
- 0x48925401, 0xc1bacb7f, 0xe5ff550f, 0xb6083049,
- 0x5bb5d0e8, 0x87d72e5a, 0xab6a6ee1, 0x223a66ce,
- 0xc62bf3cd, 0x9e0885f9, 0x68cb3e47, 0x086c010f,
- 0xa21de820, 0xd18b69de, 0xf3f65777, 0xfa02c3f6,
- 0x407edac3, 0xcbb3d550, 0x1793084d, 0xb0d70eba,
- 0x0ab378d5, 0xd951fb0c, 0xded7da56, 0x4124bbe4,
- 0x94ca0b56, 0x0f5755d1, 0xe0e1e56e, 0x6184b5be,
- 0x580a249f, 0x94f74bc0, 0xe327888e, 0x9f7b5561,
- 0xc3dc0280, 0x05687715, 0x646c6bd7, 0x44904db3,
- 0x66b4f0a3, 0xc0f1648a, 0x697ed5af, 0x49e92ff6,
- 0x309e374f, 0x2cb6356a, 0x85808573, 0x4991f840,
- 0x76f0ae02, 0x083be84d, 0x28421c9a, 0x44489406,
- 0x736e4cb8, 0xc1092910, 0x8bc95fc6, 0x7d869cf4,
- 0x134f616f, 0x2e77118d, 0xb31b2be1, 0xaa90b472,
- 0x3ca5d717, 0x7d161bba, 0x9cad9010, 0xaf462ba2,
- 0x9fe459d2, 0x45d34559, 0xd9f2da13, 0xdbc65487,
- 0xf3e4f94e, 0x176d486f, 0x097c13ea, 0x631da5c7,
- 0x445f7382, 0x175683f4, 0xcdc66a97, 0x70be0288,
- 0xb3cdcf72, 0x6e5dd2f3, 0x20936079, 0x459b80a5,
- 0xbe60e2db, 0xa9c23101, 0xeba5315c, 0x224e42f2,
- 0x1c5c1572, 0xf6721b2c, 0x1ad2fff3, 0x8c25404e,
- 0x324ed72f, 0x4067b7fd, 0x0523138e, 0x5ca3bc78,
- 0xdc0fd66e, 0x75922283, 0x784d6b17, 0x58ebb16e,
- 0x44094f85, 0x3f481d87, 0xfcfeae7b, 0x77b5ff76,
- 0x8c2302bf, 0xaaf47556, 0x5f46b02a, 0x2b092801,
- 0x3d38f5f7, 0x0ca81f36, 0x52af4a8a, 0x66d5e7c0,
- 0xdf3b0874, 0x95055110, 0x1b5ad7a8, 0xf61ed5ad,
- 0x6cf6e479, 0x20758184, 0xd0cefa65, 0x88f7be58,
- 0x4a046826, 0x0ff6f8f3, 0xa09c7f70, 0x5346aba0,
- 0x5ce96c28, 0xe176eda3, 0x6bac307f, 0x376829d2,
- 0x85360fa9, 0x17e3fe2a, 0x24b79767, 0xf5a96b20,
- 0xd6cd2595, 0x68ff1ebf, 0x7555442c, 0xf19f06be,
- 0xf9e0659a, 0xeeb9491d, 0x34010718, 0xbb30cab8,
- 0xe822fe15, 0x88570983, 0x750e6249, 0xda627e55,
- 0x5e76ffa8, 0xb1534546, 0x6d47de08, 0xefe9e7d4,
+ 0x7ec90c04,
+ 0x2c6e74b9,
+ 0x9b0e66df,
+ 0xa6337911,
+ 0xb86a7fff,
+ 0x1dd358f5,
+ 0x44dd9d44,
+ 0x1731167f,
+ 0x08fbf1fa,
+ 0xe7f511cc,
+ 0xd2051b00,
+ 0x735aba00,
+ 0x2ab722d8,
+ 0x386381cb,
+ 0xacf6243a,
+ 0x69befd7a,
+ 0xe6a2e77f,
+ 0xf0c720cd,
+ 0xc4494816,
+ 0xccf5c180,
+ 0x38851640,
+ 0x15b0a848,
+ 0xe68b18cb,
+ 0x4caadeff,
+ 0x5f480a01,
+ 0x0412b2aa,
+ 0x259814fc,
+ 0x41d0efe2,
+ 0x4e40b48d,
+ 0x248eb6fb,
+ 0x8dba1cfe,
+ 0x41a99b02,
+ 0x1a550a04,
+ 0xba8f65cb,
+ 0x7251f4e7,
+ 0x95a51725,
+ 0xc106ecd7,
+ 0x97a5980a,
+ 0xc539b9aa,
+ 0x4d79fe6a,
+ 0xf2f3f763,
+ 0x68af8040,
+ 0xed0c9e56,
+ 0x11b4958b,
+ 0xe1eb5a88,
+ 0x8709e6b0,
+ 0xd7e07156,
+ 0x4e29fea7,
+ 0x6366e52d,
+ 0x02d1c000,
+ 0xc4ac8e05,
+ 0x9377f571,
+ 0x0c05372a,
+ 0x578535f2,
+ 0x2261be02,
+ 0xd642a0c9,
+ 0xdf13a280,
+ 0x74b55bd2,
+ 0x682199c0,
+ 0xd421e5ec,
+ 0x53fb3ce8,
+ 0xc8adedb3,
+ 0x28a87fc9,
+ 0x3d959981,
+ 0x5c1ff900,
+ 0xfe38d399,
+ 0x0c4eff0b,
+ 0x062407ea,
+ 0xaa2f4fb1,
+ 0x4fb96976,
+ 0x90c79505,
+ 0xb0a8a774,
+ 0xef55a1ff,
+ 0xe59ca2c2,
+ 0xa6b62d27,
+ 0xe66a4263,
+ 0xdf65001f,
+ 0x0ec50966,
+ 0xdfdd55bc,
+ 0x29de0655,
+ 0x911e739a,
+ 0x17af8975,
+ 0x32c7911c,
+ 0x89f89468,
+ 0x0d01e980,
+ 0x524755f4,
+ 0x03b63cc9,
+ 0x0cc844b2,
+ 0xbcf3f0aa,
+ 0x87ac36e9,
+ 0xe53a7426,
+ 0x01b3d82b,
+ 0x1a9e7449,
+ 0x64ee2d7e,
+ 0xcddbb1da,
+ 0x01c94910,
+ 0xb868bf80,
+ 0x0d26f3fd,
+ 0x9342ede7,
+ 0x04a5c284,
+ 0x636737b6,
+ 0x50f5b616,
+ 0xf24766e3,
+ 0x8eca36c1,
+ 0x136e05db,
+ 0xfef18391,
+ 0xfb887a37,
+ 0xd6e7f7d4,
+ 0xc7fb7dc9,
+ 0x3063fcdf,
+ 0xb6f589de,
+ 0xec2941da,
+ 0x26e46695,
+ 0xb7566419,
+ 0xf654efc5,
+ 0xd08d58b7,
+ 0x48925401,
+ 0xc1bacb7f,
+ 0xe5ff550f,
+ 0xb6083049,
+ 0x5bb5d0e8,
+ 0x87d72e5a,
+ 0xab6a6ee1,
+ 0x223a66ce,
+ 0xc62bf3cd,
+ 0x9e0885f9,
+ 0x68cb3e47,
+ 0x086c010f,
+ 0xa21de820,
+ 0xd18b69de,
+ 0xf3f65777,
+ 0xfa02c3f6,
+ 0x407edac3,
+ 0xcbb3d550,
+ 0x1793084d,
+ 0xb0d70eba,
+ 0x0ab378d5,
+ 0xd951fb0c,
+ 0xded7da56,
+ 0x4124bbe4,
+ 0x94ca0b56,
+ 0x0f5755d1,
+ 0xe0e1e56e,
+ 0x6184b5be,
+ 0x580a249f,
+ 0x94f74bc0,
+ 0xe327888e,
+ 0x9f7b5561,
+ 0xc3dc0280,
+ 0x05687715,
+ 0x646c6bd7,
+ 0x44904db3,
+ 0x66b4f0a3,
+ 0xc0f1648a,
+ 0x697ed5af,
+ 0x49e92ff6,
+ 0x309e374f,
+ 0x2cb6356a,
+ 0x85808573,
+ 0x4991f840,
+ 0x76f0ae02,
+ 0x083be84d,
+ 0x28421c9a,
+ 0x44489406,
+ 0x736e4cb8,
+ 0xc1092910,
+ 0x8bc95fc6,
+ 0x7d869cf4,
+ 0x134f616f,
+ 0x2e77118d,
+ 0xb31b2be1,
+ 0xaa90b472,
+ 0x3ca5d717,
+ 0x7d161bba,
+ 0x9cad9010,
+ 0xaf462ba2,
+ 0x9fe459d2,
+ 0x45d34559,
+ 0xd9f2da13,
+ 0xdbc65487,
+ 0xf3e4f94e,
+ 0x176d486f,
+ 0x097c13ea,
+ 0x631da5c7,
+ 0x445f7382,
+ 0x175683f4,
+ 0xcdc66a97,
+ 0x70be0288,
+ 0xb3cdcf72,
+ 0x6e5dd2f3,
+ 0x20936079,
+ 0x459b80a5,
+ 0xbe60e2db,
+ 0xa9c23101,
+ 0xeba5315c,
+ 0x224e42f2,
+ 0x1c5c1572,
+ 0xf6721b2c,
+ 0x1ad2fff3,
+ 0x8c25404e,
+ 0x324ed72f,
+ 0x4067b7fd,
+ 0x0523138e,
+ 0x5ca3bc78,
+ 0xdc0fd66e,
+ 0x75922283,
+ 0x784d6b17,
+ 0x58ebb16e,
+ 0x44094f85,
+ 0x3f481d87,
+ 0xfcfeae7b,
+ 0x77b5ff76,
+ 0x8c2302bf,
+ 0xaaf47556,
+ 0x5f46b02a,
+ 0x2b092801,
+ 0x3d38f5f7,
+ 0x0ca81f36,
+ 0x52af4a8a,
+ 0x66d5e7c0,
+ 0xdf3b0874,
+ 0x95055110,
+ 0x1b5ad7a8,
+ 0xf61ed5ad,
+ 0x6cf6e479,
+ 0x20758184,
+ 0xd0cefa65,
+ 0x88f7be58,
+ 0x4a046826,
+ 0x0ff6f8f3,
+ 0xa09c7f70,
+ 0x5346aba0,
+ 0x5ce96c28,
+ 0xe176eda3,
+ 0x6bac307f,
+ 0x376829d2,
+ 0x85360fa9,
+ 0x17e3fe2a,
+ 0x24b79767,
+ 0xf5a96b20,
+ 0xd6cd2595,
+ 0x68ff1ebf,
+ 0x7555442c,
+ 0xf19f06be,
+ 0xf9e0659a,
+ 0xeeb9491d,
+ 0x34010718,
+ 0xbb30cab8,
+ 0xe822fe15,
+ 0x88570983,
+ 0x750e6249,
+ 0xda627e55,
+ 0x5e76ffa8,
+ 0xb1534546,
+ 0x6d47de08,
+ 0xefe9e7d4,
};
const CAST_LONG CAST_S_table5[256] = {
- 0xf6fa8f9d, 0x2cac6ce1, 0x4ca34867, 0xe2337f7c,
- 0x95db08e7, 0x016843b4, 0xeced5cbc, 0x325553ac,
- 0xbf9f0960, 0xdfa1e2ed, 0x83f0579d, 0x63ed86b9,
- 0x1ab6a6b8, 0xde5ebe39, 0xf38ff732, 0x8989b138,
- 0x33f14961, 0xc01937bd, 0xf506c6da, 0xe4625e7e,
- 0xa308ea99, 0x4e23e33c, 0x79cbd7cc, 0x48a14367,
- 0xa3149619, 0xfec94bd5, 0xa114174a, 0xeaa01866,
- 0xa084db2d, 0x09a8486f, 0xa888614a, 0x2900af98,
- 0x01665991, 0xe1992863, 0xc8f30c60, 0x2e78ef3c,
- 0xd0d51932, 0xcf0fec14, 0xf7ca07d2, 0xd0a82072,
- 0xfd41197e, 0x9305a6b0, 0xe86be3da, 0x74bed3cd,
- 0x372da53c, 0x4c7f4448, 0xdab5d440, 0x6dba0ec3,
- 0x083919a7, 0x9fbaeed9, 0x49dbcfb0, 0x4e670c53,
- 0x5c3d9c01, 0x64bdb941, 0x2c0e636a, 0xba7dd9cd,
- 0xea6f7388, 0xe70bc762, 0x35f29adb, 0x5c4cdd8d,
- 0xf0d48d8c, 0xb88153e2, 0x08a19866, 0x1ae2eac8,
- 0x284caf89, 0xaa928223, 0x9334be53, 0x3b3a21bf,
- 0x16434be3, 0x9aea3906, 0xefe8c36e, 0xf890cdd9,
- 0x80226dae, 0xc340a4a3, 0xdf7e9c09, 0xa694a807,
- 0x5b7c5ecc, 0x221db3a6, 0x9a69a02f, 0x68818a54,
- 0xceb2296f, 0x53c0843a, 0xfe893655, 0x25bfe68a,
- 0xb4628abc, 0xcf222ebf, 0x25ac6f48, 0xa9a99387,
- 0x53bddb65, 0xe76ffbe7, 0xe967fd78, 0x0ba93563,
- 0x8e342bc1, 0xe8a11be9, 0x4980740d, 0xc8087dfc,
- 0x8de4bf99, 0xa11101a0, 0x7fd37975, 0xda5a26c0,
- 0xe81f994f, 0x9528cd89, 0xfd339fed, 0xb87834bf,
- 0x5f04456d, 0x22258698, 0xc9c4c83b, 0x2dc156be,
- 0x4f628daa, 0x57f55ec5, 0xe2220abe, 0xd2916ebf,
- 0x4ec75b95, 0x24f2c3c0, 0x42d15d99, 0xcd0d7fa0,
- 0x7b6e27ff, 0xa8dc8af0, 0x7345c106, 0xf41e232f,
- 0x35162386, 0xe6ea8926, 0x3333b094, 0x157ec6f2,
- 0x372b74af, 0x692573e4, 0xe9a9d848, 0xf3160289,
- 0x3a62ef1d, 0xa787e238, 0xf3a5f676, 0x74364853,
- 0x20951063, 0x4576698d, 0xb6fad407, 0x592af950,
- 0x36f73523, 0x4cfb6e87, 0x7da4cec0, 0x6c152daa,
- 0xcb0396a8, 0xc50dfe5d, 0xfcd707ab, 0x0921c42f,
- 0x89dff0bb, 0x5fe2be78, 0x448f4f33, 0x754613c9,
- 0x2b05d08d, 0x48b9d585, 0xdc049441, 0xc8098f9b,
- 0x7dede786, 0xc39a3373, 0x42410005, 0x6a091751,
- 0x0ef3c8a6, 0x890072d6, 0x28207682, 0xa9a9f7be,
- 0xbf32679d, 0xd45b5b75, 0xb353fd00, 0xcbb0e358,
- 0x830f220a, 0x1f8fb214, 0xd372cf08, 0xcc3c4a13,
- 0x8cf63166, 0x061c87be, 0x88c98f88, 0x6062e397,
- 0x47cf8e7a, 0xb6c85283, 0x3cc2acfb, 0x3fc06976,
- 0x4e8f0252, 0x64d8314d, 0xda3870e3, 0x1e665459,
- 0xc10908f0, 0x513021a5, 0x6c5b68b7, 0x822f8aa0,
- 0x3007cd3e, 0x74719eef, 0xdc872681, 0x073340d4,
- 0x7e432fd9, 0x0c5ec241, 0x8809286c, 0xf592d891,
- 0x08a930f6, 0x957ef305, 0xb7fbffbd, 0xc266e96f,
- 0x6fe4ac98, 0xb173ecc0, 0xbc60b42a, 0x953498da,
- 0xfba1ae12, 0x2d4bd736, 0x0f25faab, 0xa4f3fceb,
- 0xe2969123, 0x257f0c3d, 0x9348af49, 0x361400bc,
- 0xe8816f4a, 0x3814f200, 0xa3f94043, 0x9c7a54c2,
- 0xbc704f57, 0xda41e7f9, 0xc25ad33a, 0x54f4a084,
- 0xb17f5505, 0x59357cbe, 0xedbd15c8, 0x7f97c5ab,
- 0xba5ac7b5, 0xb6f6deaf, 0x3a479c3a, 0x5302da25,
- 0x653d7e6a, 0x54268d49, 0x51a477ea, 0x5017d55b,
- 0xd7d25d88, 0x44136c76, 0x0404a8c8, 0xb8e5a121,
- 0xb81a928a, 0x60ed5869, 0x97c55b96, 0xeaec991b,
- 0x29935913, 0x01fdb7f1, 0x088e8dfa, 0x9ab6f6f5,
- 0x3b4cbf9f, 0x4a5de3ab, 0xe6051d35, 0xa0e1d855,
- 0xd36b4cf1, 0xf544edeb, 0xb0e93524, 0xbebb8fbd,
- 0xa2d762cf, 0x49c92f54, 0x38b5f331, 0x7128a454,
- 0x48392905, 0xa65b1db8, 0x851c97bd, 0xd675cf2f,
+ 0xf6fa8f9d,
+ 0x2cac6ce1,
+ 0x4ca34867,
+ 0xe2337f7c,
+ 0x95db08e7,
+ 0x016843b4,
+ 0xeced5cbc,
+ 0x325553ac,
+ 0xbf9f0960,
+ 0xdfa1e2ed,
+ 0x83f0579d,
+ 0x63ed86b9,
+ 0x1ab6a6b8,
+ 0xde5ebe39,
+ 0xf38ff732,
+ 0x8989b138,
+ 0x33f14961,
+ 0xc01937bd,
+ 0xf506c6da,
+ 0xe4625e7e,
+ 0xa308ea99,
+ 0x4e23e33c,
+ 0x79cbd7cc,
+ 0x48a14367,
+ 0xa3149619,
+ 0xfec94bd5,
+ 0xa114174a,
+ 0xeaa01866,
+ 0xa084db2d,
+ 0x09a8486f,
+ 0xa888614a,
+ 0x2900af98,
+ 0x01665991,
+ 0xe1992863,
+ 0xc8f30c60,
+ 0x2e78ef3c,
+ 0xd0d51932,
+ 0xcf0fec14,
+ 0xf7ca07d2,
+ 0xd0a82072,
+ 0xfd41197e,
+ 0x9305a6b0,
+ 0xe86be3da,
+ 0x74bed3cd,
+ 0x372da53c,
+ 0x4c7f4448,
+ 0xdab5d440,
+ 0x6dba0ec3,
+ 0x083919a7,
+ 0x9fbaeed9,
+ 0x49dbcfb0,
+ 0x4e670c53,
+ 0x5c3d9c01,
+ 0x64bdb941,
+ 0x2c0e636a,
+ 0xba7dd9cd,
+ 0xea6f7388,
+ 0xe70bc762,
+ 0x35f29adb,
+ 0x5c4cdd8d,
+ 0xf0d48d8c,
+ 0xb88153e2,
+ 0x08a19866,
+ 0x1ae2eac8,
+ 0x284caf89,
+ 0xaa928223,
+ 0x9334be53,
+ 0x3b3a21bf,
+ 0x16434be3,
+ 0x9aea3906,
+ 0xefe8c36e,
+ 0xf890cdd9,
+ 0x80226dae,
+ 0xc340a4a3,
+ 0xdf7e9c09,
+ 0xa694a807,
+ 0x5b7c5ecc,
+ 0x221db3a6,
+ 0x9a69a02f,
+ 0x68818a54,
+ 0xceb2296f,
+ 0x53c0843a,
+ 0xfe893655,
+ 0x25bfe68a,
+ 0xb4628abc,
+ 0xcf222ebf,
+ 0x25ac6f48,
+ 0xa9a99387,
+ 0x53bddb65,
+ 0xe76ffbe7,
+ 0xe967fd78,
+ 0x0ba93563,
+ 0x8e342bc1,
+ 0xe8a11be9,
+ 0x4980740d,
+ 0xc8087dfc,
+ 0x8de4bf99,
+ 0xa11101a0,
+ 0x7fd37975,
+ 0xda5a26c0,
+ 0xe81f994f,
+ 0x9528cd89,
+ 0xfd339fed,
+ 0xb87834bf,
+ 0x5f04456d,
+ 0x22258698,
+ 0xc9c4c83b,
+ 0x2dc156be,
+ 0x4f628daa,
+ 0x57f55ec5,
+ 0xe2220abe,
+ 0xd2916ebf,
+ 0x4ec75b95,
+ 0x24f2c3c0,
+ 0x42d15d99,
+ 0xcd0d7fa0,
+ 0x7b6e27ff,
+ 0xa8dc8af0,
+ 0x7345c106,
+ 0xf41e232f,
+ 0x35162386,
+ 0xe6ea8926,
+ 0x3333b094,
+ 0x157ec6f2,
+ 0x372b74af,
+ 0x692573e4,
+ 0xe9a9d848,
+ 0xf3160289,
+ 0x3a62ef1d,
+ 0xa787e238,
+ 0xf3a5f676,
+ 0x74364853,
+ 0x20951063,
+ 0x4576698d,
+ 0xb6fad407,
+ 0x592af950,
+ 0x36f73523,
+ 0x4cfb6e87,
+ 0x7da4cec0,
+ 0x6c152daa,
+ 0xcb0396a8,
+ 0xc50dfe5d,
+ 0xfcd707ab,
+ 0x0921c42f,
+ 0x89dff0bb,
+ 0x5fe2be78,
+ 0x448f4f33,
+ 0x754613c9,
+ 0x2b05d08d,
+ 0x48b9d585,
+ 0xdc049441,
+ 0xc8098f9b,
+ 0x7dede786,
+ 0xc39a3373,
+ 0x42410005,
+ 0x6a091751,
+ 0x0ef3c8a6,
+ 0x890072d6,
+ 0x28207682,
+ 0xa9a9f7be,
+ 0xbf32679d,
+ 0xd45b5b75,
+ 0xb353fd00,
+ 0xcbb0e358,
+ 0x830f220a,
+ 0x1f8fb214,
+ 0xd372cf08,
+ 0xcc3c4a13,
+ 0x8cf63166,
+ 0x061c87be,
+ 0x88c98f88,
+ 0x6062e397,
+ 0x47cf8e7a,
+ 0xb6c85283,
+ 0x3cc2acfb,
+ 0x3fc06976,
+ 0x4e8f0252,
+ 0x64d8314d,
+ 0xda3870e3,
+ 0x1e665459,
+ 0xc10908f0,
+ 0x513021a5,
+ 0x6c5b68b7,
+ 0x822f8aa0,
+ 0x3007cd3e,
+ 0x74719eef,
+ 0xdc872681,
+ 0x073340d4,
+ 0x7e432fd9,
+ 0x0c5ec241,
+ 0x8809286c,
+ 0xf592d891,
+ 0x08a930f6,
+ 0x957ef305,
+ 0xb7fbffbd,
+ 0xc266e96f,
+ 0x6fe4ac98,
+ 0xb173ecc0,
+ 0xbc60b42a,
+ 0x953498da,
+ 0xfba1ae12,
+ 0x2d4bd736,
+ 0x0f25faab,
+ 0xa4f3fceb,
+ 0xe2969123,
+ 0x257f0c3d,
+ 0x9348af49,
+ 0x361400bc,
+ 0xe8816f4a,
+ 0x3814f200,
+ 0xa3f94043,
+ 0x9c7a54c2,
+ 0xbc704f57,
+ 0xda41e7f9,
+ 0xc25ad33a,
+ 0x54f4a084,
+ 0xb17f5505,
+ 0x59357cbe,
+ 0xedbd15c8,
+ 0x7f97c5ab,
+ 0xba5ac7b5,
+ 0xb6f6deaf,
+ 0x3a479c3a,
+ 0x5302da25,
+ 0x653d7e6a,
+ 0x54268d49,
+ 0x51a477ea,
+ 0x5017d55b,
+ 0xd7d25d88,
+ 0x44136c76,
+ 0x0404a8c8,
+ 0xb8e5a121,
+ 0xb81a928a,
+ 0x60ed5869,
+ 0x97c55b96,
+ 0xeaec991b,
+ 0x29935913,
+ 0x01fdb7f1,
+ 0x088e8dfa,
+ 0x9ab6f6f5,
+ 0x3b4cbf9f,
+ 0x4a5de3ab,
+ 0xe6051d35,
+ 0xa0e1d855,
+ 0xd36b4cf1,
+ 0xf544edeb,
+ 0xb0e93524,
+ 0xbebb8fbd,
+ 0xa2d762cf,
+ 0x49c92f54,
+ 0x38b5f331,
+ 0x7128a454,
+ 0x48392905,
+ 0xa65b1db8,
+ 0x851c97bd,
+ 0xd675cf2f,
};
const CAST_LONG CAST_S_table6[256] = {
- 0x85e04019, 0x332bf567, 0x662dbfff, 0xcfc65693,
- 0x2a8d7f6f, 0xab9bc912, 0xde6008a1, 0x2028da1f,
- 0x0227bce7, 0x4d642916, 0x18fac300, 0x50f18b82,
- 0x2cb2cb11, 0xb232e75c, 0x4b3695f2, 0xb28707de,
- 0xa05fbcf6, 0xcd4181e9, 0xe150210c, 0xe24ef1bd,
- 0xb168c381, 0xfde4e789, 0x5c79b0d8, 0x1e8bfd43,
- 0x4d495001, 0x38be4341, 0x913cee1d, 0x92a79c3f,
- 0x089766be, 0xbaeeadf4, 0x1286becf, 0xb6eacb19,
- 0x2660c200, 0x7565bde4, 0x64241f7a, 0x8248dca9,
- 0xc3b3ad66, 0x28136086, 0x0bd8dfa8, 0x356d1cf2,
- 0x107789be, 0xb3b2e9ce, 0x0502aa8f, 0x0bc0351e,
- 0x166bf52a, 0xeb12ff82, 0xe3486911, 0xd34d7516,
- 0x4e7b3aff, 0x5f43671b, 0x9cf6e037, 0x4981ac83,
- 0x334266ce, 0x8c9341b7, 0xd0d854c0, 0xcb3a6c88,
- 0x47bc2829, 0x4725ba37, 0xa66ad22b, 0x7ad61f1e,
- 0x0c5cbafa, 0x4437f107, 0xb6e79962, 0x42d2d816,
- 0x0a961288, 0xe1a5c06e, 0x13749e67, 0x72fc081a,
- 0xb1d139f7, 0xf9583745, 0xcf19df58, 0xbec3f756,
- 0xc06eba30, 0x07211b24, 0x45c28829, 0xc95e317f,
- 0xbc8ec511, 0x38bc46e9, 0xc6e6fa14, 0xbae8584a,
- 0xad4ebc46, 0x468f508b, 0x7829435f, 0xf124183b,
- 0x821dba9f, 0xaff60ff4, 0xea2c4e6d, 0x16e39264,
- 0x92544a8b, 0x009b4fc3, 0xaba68ced, 0x9ac96f78,
- 0x06a5b79a, 0xb2856e6e, 0x1aec3ca9, 0xbe838688,
- 0x0e0804e9, 0x55f1be56, 0xe7e5363b, 0xb3a1f25d,
- 0xf7debb85, 0x61fe033c, 0x16746233, 0x3c034c28,
- 0xda6d0c74, 0x79aac56c, 0x3ce4e1ad, 0x51f0c802,
- 0x98f8f35a, 0x1626a49f, 0xeed82b29, 0x1d382fe3,
- 0x0c4fb99a, 0xbb325778, 0x3ec6d97b, 0x6e77a6a9,
- 0xcb658b5c, 0xd45230c7, 0x2bd1408b, 0x60c03eb7,
- 0xb9068d78, 0xa33754f4, 0xf430c87d, 0xc8a71302,
- 0xb96d8c32, 0xebd4e7be, 0xbe8b9d2d, 0x7979fb06,
- 0xe7225308, 0x8b75cf77, 0x11ef8da4, 0xe083c858,
- 0x8d6b786f, 0x5a6317a6, 0xfa5cf7a0, 0x5dda0033,
- 0xf28ebfb0, 0xf5b9c310, 0xa0eac280, 0x08b9767a,
- 0xa3d9d2b0, 0x79d34217, 0x021a718d, 0x9ac6336a,
- 0x2711fd60, 0x438050e3, 0x069908a8, 0x3d7fedc4,
- 0x826d2bef, 0x4eeb8476, 0x488dcf25, 0x36c9d566,
- 0x28e74e41, 0xc2610aca, 0x3d49a9cf, 0xbae3b9df,
- 0xb65f8de6, 0x92aeaf64, 0x3ac7d5e6, 0x9ea80509,
- 0xf22b017d, 0xa4173f70, 0xdd1e16c3, 0x15e0d7f9,
- 0x50b1b887, 0x2b9f4fd5, 0x625aba82, 0x6a017962,
- 0x2ec01b9c, 0x15488aa9, 0xd716e740, 0x40055a2c,
- 0x93d29a22, 0xe32dbf9a, 0x058745b9, 0x3453dc1e,
- 0xd699296e, 0x496cff6f, 0x1c9f4986, 0xdfe2ed07,
- 0xb87242d1, 0x19de7eae, 0x053e561a, 0x15ad6f8c,
- 0x66626c1c, 0x7154c24c, 0xea082b2a, 0x93eb2939,
- 0x17dcb0f0, 0x58d4f2ae, 0x9ea294fb, 0x52cf564c,
- 0x9883fe66, 0x2ec40581, 0x763953c3, 0x01d6692e,
- 0xd3a0c108, 0xa1e7160e, 0xe4f2dfa6, 0x693ed285,
- 0x74904698, 0x4c2b0edd, 0x4f757656, 0x5d393378,
- 0xa132234f, 0x3d321c5d, 0xc3f5e194, 0x4b269301,
- 0xc79f022f, 0x3c997e7e, 0x5e4f9504, 0x3ffafbbd,
- 0x76f7ad0e, 0x296693f4, 0x3d1fce6f, 0xc61e45be,
- 0xd3b5ab34, 0xf72bf9b7, 0x1b0434c0, 0x4e72b567,
- 0x5592a33d, 0xb5229301, 0xcfd2a87f, 0x60aeb767,
- 0x1814386b, 0x30bcc33d, 0x38a0c07d, 0xfd1606f2,
- 0xc363519b, 0x589dd390, 0x5479f8e6, 0x1cb8d647,
- 0x97fd61a9, 0xea7759f4, 0x2d57539d, 0x569a58cf,
- 0xe84e63ad, 0x462e1b78, 0x6580f87e, 0xf3817914,
- 0x91da55f4, 0x40a230f3, 0xd1988f35, 0xb6e318d2,
- 0x3ffa50bc, 0x3d40f021, 0xc3c0bdae, 0x4958c24c,
- 0x518f36b2, 0x84b1d370, 0x0fedce83, 0x878ddada,
- 0xf2a279c7, 0x94e01be8, 0x90716f4b, 0x954b8aa3,
+ 0x85e04019,
+ 0x332bf567,
+ 0x662dbfff,
+ 0xcfc65693,
+ 0x2a8d7f6f,
+ 0xab9bc912,
+ 0xde6008a1,
+ 0x2028da1f,
+ 0x0227bce7,
+ 0x4d642916,
+ 0x18fac300,
+ 0x50f18b82,
+ 0x2cb2cb11,
+ 0xb232e75c,
+ 0x4b3695f2,
+ 0xb28707de,
+ 0xa05fbcf6,
+ 0xcd4181e9,
+ 0xe150210c,
+ 0xe24ef1bd,
+ 0xb168c381,
+ 0xfde4e789,
+ 0x5c79b0d8,
+ 0x1e8bfd43,
+ 0x4d495001,
+ 0x38be4341,
+ 0x913cee1d,
+ 0x92a79c3f,
+ 0x089766be,
+ 0xbaeeadf4,
+ 0x1286becf,
+ 0xb6eacb19,
+ 0x2660c200,
+ 0x7565bde4,
+ 0x64241f7a,
+ 0x8248dca9,
+ 0xc3b3ad66,
+ 0x28136086,
+ 0x0bd8dfa8,
+ 0x356d1cf2,
+ 0x107789be,
+ 0xb3b2e9ce,
+ 0x0502aa8f,
+ 0x0bc0351e,
+ 0x166bf52a,
+ 0xeb12ff82,
+ 0xe3486911,
+ 0xd34d7516,
+ 0x4e7b3aff,
+ 0x5f43671b,
+ 0x9cf6e037,
+ 0x4981ac83,
+ 0x334266ce,
+ 0x8c9341b7,
+ 0xd0d854c0,
+ 0xcb3a6c88,
+ 0x47bc2829,
+ 0x4725ba37,
+ 0xa66ad22b,
+ 0x7ad61f1e,
+ 0x0c5cbafa,
+ 0x4437f107,
+ 0xb6e79962,
+ 0x42d2d816,
+ 0x0a961288,
+ 0xe1a5c06e,
+ 0x13749e67,
+ 0x72fc081a,
+ 0xb1d139f7,
+ 0xf9583745,
+ 0xcf19df58,
+ 0xbec3f756,
+ 0xc06eba30,
+ 0x07211b24,
+ 0x45c28829,
+ 0xc95e317f,
+ 0xbc8ec511,
+ 0x38bc46e9,
+ 0xc6e6fa14,
+ 0xbae8584a,
+ 0xad4ebc46,
+ 0x468f508b,
+ 0x7829435f,
+ 0xf124183b,
+ 0x821dba9f,
+ 0xaff60ff4,
+ 0xea2c4e6d,
+ 0x16e39264,
+ 0x92544a8b,
+ 0x009b4fc3,
+ 0xaba68ced,
+ 0x9ac96f78,
+ 0x06a5b79a,
+ 0xb2856e6e,
+ 0x1aec3ca9,
+ 0xbe838688,
+ 0x0e0804e9,
+ 0x55f1be56,
+ 0xe7e5363b,
+ 0xb3a1f25d,
+ 0xf7debb85,
+ 0x61fe033c,
+ 0x16746233,
+ 0x3c034c28,
+ 0xda6d0c74,
+ 0x79aac56c,
+ 0x3ce4e1ad,
+ 0x51f0c802,
+ 0x98f8f35a,
+ 0x1626a49f,
+ 0xeed82b29,
+ 0x1d382fe3,
+ 0x0c4fb99a,
+ 0xbb325778,
+ 0x3ec6d97b,
+ 0x6e77a6a9,
+ 0xcb658b5c,
+ 0xd45230c7,
+ 0x2bd1408b,
+ 0x60c03eb7,
+ 0xb9068d78,
+ 0xa33754f4,
+ 0xf430c87d,
+ 0xc8a71302,
+ 0xb96d8c32,
+ 0xebd4e7be,
+ 0xbe8b9d2d,
+ 0x7979fb06,
+ 0xe7225308,
+ 0x8b75cf77,
+ 0x11ef8da4,
+ 0xe083c858,
+ 0x8d6b786f,
+ 0x5a6317a6,
+ 0xfa5cf7a0,
+ 0x5dda0033,
+ 0xf28ebfb0,
+ 0xf5b9c310,
+ 0xa0eac280,
+ 0x08b9767a,
+ 0xa3d9d2b0,
+ 0x79d34217,
+ 0x021a718d,
+ 0x9ac6336a,
+ 0x2711fd60,
+ 0x438050e3,
+ 0x069908a8,
+ 0x3d7fedc4,
+ 0x826d2bef,
+ 0x4eeb8476,
+ 0x488dcf25,
+ 0x36c9d566,
+ 0x28e74e41,
+ 0xc2610aca,
+ 0x3d49a9cf,
+ 0xbae3b9df,
+ 0xb65f8de6,
+ 0x92aeaf64,
+ 0x3ac7d5e6,
+ 0x9ea80509,
+ 0xf22b017d,
+ 0xa4173f70,
+ 0xdd1e16c3,
+ 0x15e0d7f9,
+ 0x50b1b887,
+ 0x2b9f4fd5,
+ 0x625aba82,
+ 0x6a017962,
+ 0x2ec01b9c,
+ 0x15488aa9,
+ 0xd716e740,
+ 0x40055a2c,
+ 0x93d29a22,
+ 0xe32dbf9a,
+ 0x058745b9,
+ 0x3453dc1e,
+ 0xd699296e,
+ 0x496cff6f,
+ 0x1c9f4986,
+ 0xdfe2ed07,
+ 0xb87242d1,
+ 0x19de7eae,
+ 0x053e561a,
+ 0x15ad6f8c,
+ 0x66626c1c,
+ 0x7154c24c,
+ 0xea082b2a,
+ 0x93eb2939,
+ 0x17dcb0f0,
+ 0x58d4f2ae,
+ 0x9ea294fb,
+ 0x52cf564c,
+ 0x9883fe66,
+ 0x2ec40581,
+ 0x763953c3,
+ 0x01d6692e,
+ 0xd3a0c108,
+ 0xa1e7160e,
+ 0xe4f2dfa6,
+ 0x693ed285,
+ 0x74904698,
+ 0x4c2b0edd,
+ 0x4f757656,
+ 0x5d393378,
+ 0xa132234f,
+ 0x3d321c5d,
+ 0xc3f5e194,
+ 0x4b269301,
+ 0xc79f022f,
+ 0x3c997e7e,
+ 0x5e4f9504,
+ 0x3ffafbbd,
+ 0x76f7ad0e,
+ 0x296693f4,
+ 0x3d1fce6f,
+ 0xc61e45be,
+ 0xd3b5ab34,
+ 0xf72bf9b7,
+ 0x1b0434c0,
+ 0x4e72b567,
+ 0x5592a33d,
+ 0xb5229301,
+ 0xcfd2a87f,
+ 0x60aeb767,
+ 0x1814386b,
+ 0x30bcc33d,
+ 0x38a0c07d,
+ 0xfd1606f2,
+ 0xc363519b,
+ 0x589dd390,
+ 0x5479f8e6,
+ 0x1cb8d647,
+ 0x97fd61a9,
+ 0xea7759f4,
+ 0x2d57539d,
+ 0x569a58cf,
+ 0xe84e63ad,
+ 0x462e1b78,
+ 0x6580f87e,
+ 0xf3817914,
+ 0x91da55f4,
+ 0x40a230f3,
+ 0xd1988f35,
+ 0xb6e318d2,
+ 0x3ffa50bc,
+ 0x3d40f021,
+ 0xc3c0bdae,
+ 0x4958c24c,
+ 0x518f36b2,
+ 0x84b1d370,
+ 0x0fedce83,
+ 0x878ddada,
+ 0xf2a279c7,
+ 0x94e01be8,
+ 0x90716f4b,
+ 0x954b8aa3,
};
const CAST_LONG CAST_S_table7[256] = {
- 0xe216300d, 0xbbddfffc, 0xa7ebdabd, 0x35648095,
- 0x7789f8b7, 0xe6c1121b, 0x0e241600, 0x052ce8b5,
- 0x11a9cfb0, 0xe5952f11, 0xece7990a, 0x9386d174,
- 0x2a42931c, 0x76e38111, 0xb12def3a, 0x37ddddfc,
- 0xde9adeb1, 0x0a0cc32c, 0xbe197029, 0x84a00940,
- 0xbb243a0f, 0xb4d137cf, 0xb44e79f0, 0x049eedfd,
- 0x0b15a15d, 0x480d3168, 0x8bbbde5a, 0x669ded42,
- 0xc7ece831, 0x3f8f95e7, 0x72df191b, 0x7580330d,
- 0x94074251, 0x5c7dcdfa, 0xabbe6d63, 0xaa402164,
- 0xb301d40a, 0x02e7d1ca, 0x53571dae, 0x7a3182a2,
- 0x12a8ddec, 0xfdaa335d, 0x176f43e8, 0x71fb46d4,
- 0x38129022, 0xce949ad4, 0xb84769ad, 0x965bd862,
- 0x82f3d055, 0x66fb9767, 0x15b80b4e, 0x1d5b47a0,
- 0x4cfde06f, 0xc28ec4b8, 0x57e8726e, 0x647a78fc,
- 0x99865d44, 0x608bd593, 0x6c200e03, 0x39dc5ff6,
- 0x5d0b00a3, 0xae63aff2, 0x7e8bd632, 0x70108c0c,
- 0xbbd35049, 0x2998df04, 0x980cf42a, 0x9b6df491,
- 0x9e7edd53, 0x06918548, 0x58cb7e07, 0x3b74ef2e,
- 0x522fffb1, 0xd24708cc, 0x1c7e27cd, 0xa4eb215b,
- 0x3cf1d2e2, 0x19b47a38, 0x424f7618, 0x35856039,
- 0x9d17dee7, 0x27eb35e6, 0xc9aff67b, 0x36baf5b8,
- 0x09c467cd, 0xc18910b1, 0xe11dbf7b, 0x06cd1af8,
- 0x7170c608, 0x2d5e3354, 0xd4de495a, 0x64c6d006,
- 0xbcc0c62c, 0x3dd00db3, 0x708f8f34, 0x77d51b42,
- 0x264f620f, 0x24b8d2bf, 0x15c1b79e, 0x46a52564,
- 0xf8d7e54e, 0x3e378160, 0x7895cda5, 0x859c15a5,
- 0xe6459788, 0xc37bc75f, 0xdb07ba0c, 0x0676a3ab,
- 0x7f229b1e, 0x31842e7b, 0x24259fd7, 0xf8bef472,
- 0x835ffcb8, 0x6df4c1f2, 0x96f5b195, 0xfd0af0fc,
- 0xb0fe134c, 0xe2506d3d, 0x4f9b12ea, 0xf215f225,
- 0xa223736f, 0x9fb4c428, 0x25d04979, 0x34c713f8,
- 0xc4618187, 0xea7a6e98, 0x7cd16efc, 0x1436876c,
- 0xf1544107, 0xbedeee14, 0x56e9af27, 0xa04aa441,
- 0x3cf7c899, 0x92ecbae6, 0xdd67016d, 0x151682eb,
- 0xa842eedf, 0xfdba60b4, 0xf1907b75, 0x20e3030f,
- 0x24d8c29e, 0xe139673b, 0xefa63fb8, 0x71873054,
- 0xb6f2cf3b, 0x9f326442, 0xcb15a4cc, 0xb01a4504,
- 0xf1e47d8d, 0x844a1be5, 0xbae7dfdc, 0x42cbda70,
- 0xcd7dae0a, 0x57e85b7a, 0xd53f5af6, 0x20cf4d8c,
- 0xcea4d428, 0x79d130a4, 0x3486ebfb, 0x33d3cddc,
- 0x77853b53, 0x37effcb5, 0xc5068778, 0xe580b3e6,
- 0x4e68b8f4, 0xc5c8b37e, 0x0d809ea2, 0x398feb7c,
- 0x132a4f94, 0x43b7950e, 0x2fee7d1c, 0x223613bd,
- 0xdd06caa2, 0x37df932b, 0xc4248289, 0xacf3ebc3,
- 0x5715f6b7, 0xef3478dd, 0xf267616f, 0xc148cbe4,
- 0x9052815e, 0x5e410fab, 0xb48a2465, 0x2eda7fa4,
- 0xe87b40e4, 0xe98ea084, 0x5889e9e1, 0xefd390fc,
- 0xdd07d35b, 0xdb485694, 0x38d7e5b2, 0x57720101,
- 0x730edebc, 0x5b643113, 0x94917e4f, 0x503c2fba,
- 0x646f1282, 0x7523d24a, 0xe0779695, 0xf9c17a8f,
- 0x7a5b2121, 0xd187b896, 0x29263a4d, 0xba510cdf,
- 0x81f47c9f, 0xad1163ed, 0xea7b5965, 0x1a00726e,
- 0x11403092, 0x00da6d77, 0x4a0cdd61, 0xad1f4603,
- 0x605bdfb0, 0x9eedc364, 0x22ebe6a8, 0xcee7d28a,
- 0xa0e736a0, 0x5564a6b9, 0x10853209, 0xc7eb8f37,
- 0x2de705ca, 0x8951570f, 0xdf09822b, 0xbd691a6c,
- 0xaa12e4f2, 0x87451c0f, 0xe0f6a27a, 0x3ada4819,
- 0x4cf1764f, 0x0d771c2b, 0x67cdb156, 0x350d8384,
- 0x5938fa0f, 0x42399ef3, 0x36997b07, 0x0e84093d,
- 0x4aa93e61, 0x8360d87b, 0x1fa98b0c, 0x1149382c,
- 0xe97625a5, 0x0614d1b7, 0x0e25244b, 0x0c768347,
- 0x589e8d82, 0x0d2059d1, 0xa466bb1e, 0xf8da0a82,
- 0x04f19130, 0xba6e4ec0, 0x99265164, 0x1ee7230d,
- 0x50b2ad80, 0xeaee6801, 0x8db2a283, 0xea8bf59e,
+ 0xe216300d,
+ 0xbbddfffc,
+ 0xa7ebdabd,
+ 0x35648095,
+ 0x7789f8b7,
+ 0xe6c1121b,
+ 0x0e241600,
+ 0x052ce8b5,
+ 0x11a9cfb0,
+ 0xe5952f11,
+ 0xece7990a,
+ 0x9386d174,
+ 0x2a42931c,
+ 0x76e38111,
+ 0xb12def3a,
+ 0x37ddddfc,
+ 0xde9adeb1,
+ 0x0a0cc32c,
+ 0xbe197029,
+ 0x84a00940,
+ 0xbb243a0f,
+ 0xb4d137cf,
+ 0xb44e79f0,
+ 0x049eedfd,
+ 0x0b15a15d,
+ 0x480d3168,
+ 0x8bbbde5a,
+ 0x669ded42,
+ 0xc7ece831,
+ 0x3f8f95e7,
+ 0x72df191b,
+ 0x7580330d,
+ 0x94074251,
+ 0x5c7dcdfa,
+ 0xabbe6d63,
+ 0xaa402164,
+ 0xb301d40a,
+ 0x02e7d1ca,
+ 0x53571dae,
+ 0x7a3182a2,
+ 0x12a8ddec,
+ 0xfdaa335d,
+ 0x176f43e8,
+ 0x71fb46d4,
+ 0x38129022,
+ 0xce949ad4,
+ 0xb84769ad,
+ 0x965bd862,
+ 0x82f3d055,
+ 0x66fb9767,
+ 0x15b80b4e,
+ 0x1d5b47a0,
+ 0x4cfde06f,
+ 0xc28ec4b8,
+ 0x57e8726e,
+ 0x647a78fc,
+ 0x99865d44,
+ 0x608bd593,
+ 0x6c200e03,
+ 0x39dc5ff6,
+ 0x5d0b00a3,
+ 0xae63aff2,
+ 0x7e8bd632,
+ 0x70108c0c,
+ 0xbbd35049,
+ 0x2998df04,
+ 0x980cf42a,
+ 0x9b6df491,
+ 0x9e7edd53,
+ 0x06918548,
+ 0x58cb7e07,
+ 0x3b74ef2e,
+ 0x522fffb1,
+ 0xd24708cc,
+ 0x1c7e27cd,
+ 0xa4eb215b,
+ 0x3cf1d2e2,
+ 0x19b47a38,
+ 0x424f7618,
+ 0x35856039,
+ 0x9d17dee7,
+ 0x27eb35e6,
+ 0xc9aff67b,
+ 0x36baf5b8,
+ 0x09c467cd,
+ 0xc18910b1,
+ 0xe11dbf7b,
+ 0x06cd1af8,
+ 0x7170c608,
+ 0x2d5e3354,
+ 0xd4de495a,
+ 0x64c6d006,
+ 0xbcc0c62c,
+ 0x3dd00db3,
+ 0x708f8f34,
+ 0x77d51b42,
+ 0x264f620f,
+ 0x24b8d2bf,
+ 0x15c1b79e,
+ 0x46a52564,
+ 0xf8d7e54e,
+ 0x3e378160,
+ 0x7895cda5,
+ 0x859c15a5,
+ 0xe6459788,
+ 0xc37bc75f,
+ 0xdb07ba0c,
+ 0x0676a3ab,
+ 0x7f229b1e,
+ 0x31842e7b,
+ 0x24259fd7,
+ 0xf8bef472,
+ 0x835ffcb8,
+ 0x6df4c1f2,
+ 0x96f5b195,
+ 0xfd0af0fc,
+ 0xb0fe134c,
+ 0xe2506d3d,
+ 0x4f9b12ea,
+ 0xf215f225,
+ 0xa223736f,
+ 0x9fb4c428,
+ 0x25d04979,
+ 0x34c713f8,
+ 0xc4618187,
+ 0xea7a6e98,
+ 0x7cd16efc,
+ 0x1436876c,
+ 0xf1544107,
+ 0xbedeee14,
+ 0x56e9af27,
+ 0xa04aa441,
+ 0x3cf7c899,
+ 0x92ecbae6,
+ 0xdd67016d,
+ 0x151682eb,
+ 0xa842eedf,
+ 0xfdba60b4,
+ 0xf1907b75,
+ 0x20e3030f,
+ 0x24d8c29e,
+ 0xe139673b,
+ 0xefa63fb8,
+ 0x71873054,
+ 0xb6f2cf3b,
+ 0x9f326442,
+ 0xcb15a4cc,
+ 0xb01a4504,
+ 0xf1e47d8d,
+ 0x844a1be5,
+ 0xbae7dfdc,
+ 0x42cbda70,
+ 0xcd7dae0a,
+ 0x57e85b7a,
+ 0xd53f5af6,
+ 0x20cf4d8c,
+ 0xcea4d428,
+ 0x79d130a4,
+ 0x3486ebfb,
+ 0x33d3cddc,
+ 0x77853b53,
+ 0x37effcb5,
+ 0xc5068778,
+ 0xe580b3e6,
+ 0x4e68b8f4,
+ 0xc5c8b37e,
+ 0x0d809ea2,
+ 0x398feb7c,
+ 0x132a4f94,
+ 0x43b7950e,
+ 0x2fee7d1c,
+ 0x223613bd,
+ 0xdd06caa2,
+ 0x37df932b,
+ 0xc4248289,
+ 0xacf3ebc3,
+ 0x5715f6b7,
+ 0xef3478dd,
+ 0xf267616f,
+ 0xc148cbe4,
+ 0x9052815e,
+ 0x5e410fab,
+ 0xb48a2465,
+ 0x2eda7fa4,
+ 0xe87b40e4,
+ 0xe98ea084,
+ 0x5889e9e1,
+ 0xefd390fc,
+ 0xdd07d35b,
+ 0xdb485694,
+ 0x38d7e5b2,
+ 0x57720101,
+ 0x730edebc,
+ 0x5b643113,
+ 0x94917e4f,
+ 0x503c2fba,
+ 0x646f1282,
+ 0x7523d24a,
+ 0xe0779695,
+ 0xf9c17a8f,
+ 0x7a5b2121,
+ 0xd187b896,
+ 0x29263a4d,
+ 0xba510cdf,
+ 0x81f47c9f,
+ 0xad1163ed,
+ 0xea7b5965,
+ 0x1a00726e,
+ 0x11403092,
+ 0x00da6d77,
+ 0x4a0cdd61,
+ 0xad1f4603,
+ 0x605bdfb0,
+ 0x9eedc364,
+ 0x22ebe6a8,
+ 0xcee7d28a,
+ 0xa0e736a0,
+ 0x5564a6b9,
+ 0x10853209,
+ 0xc7eb8f37,
+ 0x2de705ca,
+ 0x8951570f,
+ 0xdf09822b,
+ 0xbd691a6c,
+ 0xaa12e4f2,
+ 0x87451c0f,
+ 0xe0f6a27a,
+ 0x3ada4819,
+ 0x4cf1764f,
+ 0x0d771c2b,
+ 0x67cdb156,
+ 0x350d8384,
+ 0x5938fa0f,
+ 0x42399ef3,
+ 0x36997b07,
+ 0x0e84093d,
+ 0x4aa93e61,
+ 0x8360d87b,
+ 0x1fa98b0c,
+ 0x1149382c,
+ 0xe97625a5,
+ 0x0614d1b7,
+ 0x0e25244b,
+ 0x0c768347,
+ 0x589e8d82,
+ 0x0d2059d1,
+ 0xa466bb1e,
+ 0xf8da0a82,
+ 0x04f19130,
+ 0xba6e4ec0,
+ 0x99265164,
+ 0x1ee7230d,
+ 0x50b2ad80,
+ 0xeaee6801,
+ 0x8db2a283,
+ 0xea8bf59e,
};
diff --git a/crypto/chacha/chacha_enc.c b/crypto/chacha/chacha_enc.c
index f6fbc11988..3cd4f0188d 100644
--- a/crypto/chacha/chacha_enc.c
+++ b/crypto/chacha/chacha_enc.c
@@ -22,43 +22,43 @@ typedef union {
u8 c[64];
} chacha_buf;
-# define ROTATE(v, n) (((v) << (n)) | ((v) >> (32 - (n))))
-
-# ifndef PEDANTIC
-# if defined(__GNUC__) && __GNUC__>=2 && \
- !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
-# if defined(__riscv_zbb) || defined(__riscv_zbkb)
-# if __riscv_xlen == 64
-# undef ROTATE
-# define ROTATE(x, n) ({ u32 ret; \
+#define ROTATE(v, n) (((v) << (n)) | ((v) >> (32 - (n))))
+
+#ifndef PEDANTIC
+#if defined(__GNUC__) && __GNUC__ >= 2 && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
+#if defined(__riscv_zbb) || defined(__riscv_zbkb)
+#if __riscv_xlen == 64
+#undef ROTATE
+#define ROTATE(x, n) ({ u32 ret; \
asm ("roriw %0, %1, %2" \
: "=r"(ret) \
- : "r"(x), "i"(32 - (n))); ret;})
-# endif
-# if __riscv_xlen == 32
-# undef ROTATE
-# define ROTATE(x, n) ({ u32 ret; \
+ : "r"(x), "i"(32 - (n))); ret; })
+#endif
+#if __riscv_xlen == 32
+#undef ROTATE
+#define ROTATE(x, n) ({ u32 ret; \
asm ("rori %0, %1, %2" \
: "=r"(ret) \
- : "r"(x), "i"(32 - (n))); ret;})
-# endif
-# endif
-# endif
-# endif
-
-# define U32TO8_LITTLE(p, v) do { \
- (p)[0] = (u8)(v >> 0); \
- (p)[1] = (u8)(v >> 8); \
- (p)[2] = (u8)(v >> 16); \
- (p)[3] = (u8)(v >> 24); \
- } while(0)
+ : "r"(x), "i"(32 - (n))); ret; })
+#endif
+#endif
+#endif
+#endif
+
+#define U32TO8_LITTLE(p, v) \
+ do { \
+ (p)[0] = (u8)(v >> 0); \
+ (p)[1] = (u8)(v >> 8); \
+ (p)[2] = (u8)(v >> 16); \
+ (p)[3] = (u8)(v >> 24); \
+ } while (0)
/* QUARTERROUND updates a, b, c, d with a ChaCha "quarter" round. */
-# define QUARTERROUND(a,b,c,d) ( \
- x[a] += x[b], x[d] = ROTATE((x[d] ^ x[a]),16), \
- x[c] += x[d], x[b] = ROTATE((x[b] ^ x[c]),12), \
- x[a] += x[b], x[d] = ROTATE((x[d] ^ x[a]), 8), \
- x[c] += x[d], x[b] = ROTATE((x[b] ^ x[c]), 7) )
+#define QUARTERROUND(a, b, c, d) ( \
+ x[a] += x[b], x[d] = ROTATE((x[d] ^ x[a]), 16), \
+ x[c] += x[d], x[b] = ROTATE((x[b] ^ x[c]), 12), \
+ x[a] += x[b], x[d] = ROTATE((x[d] ^ x[a]), 8), \
+ x[c] += x[d], x[b] = ROTATE((x[b] ^ x[c]), 7))
/* chacha_core performs 20 rounds of ChaCha on the input words in
* |input| and writes the 64 output bytes to |output|. */
@@ -92,10 +92,10 @@ static void chacha20_core(chacha_buf *output, const u32 input[16])
#ifdef INCLUDE_C_CHACHA20
void ChaCha20_ctr32_c(unsigned char *out, const unsigned char *inp, size_t len,
- const unsigned int key[8], const unsigned int counter[4])
+ const unsigned int key[8], const unsigned int counter[4])
#else
void ChaCha20_ctr32(unsigned char *out, const unsigned char *inp, size_t len,
- const unsigned int key[8], const unsigned int counter[4])
+ const unsigned int key[8], const unsigned int counter[4])
#endif
{
u32 input[16];
@@ -104,17 +104,17 @@ void ChaCha20_ctr32(unsigned char *out, const unsigned char *inp, size_t len,
/* sigma constant "expand 32-byte k" in little-endian encoding */
input[0] = ((u32)ossl_toascii('e')) | ((u32)ossl_toascii('x') << 8)
- | ((u32)ossl_toascii('p') << 16)
- | ((u32)ossl_toascii('a') << 24);
+ | ((u32)ossl_toascii('p') << 16)
+ | ((u32)ossl_toascii('a') << 24);
input[1] = ((u32)ossl_toascii('n')) | ((u32)ossl_toascii('d') << 8)
- | ((u32)ossl_toascii(' ') << 16)
- | ((u32)ossl_toascii('3') << 24);
+ | ((u32)ossl_toascii(' ') << 16)
+ | ((u32)ossl_toascii('3') << 24);
input[2] = ((u32)ossl_toascii('2')) | ((u32)ossl_toascii('-') << 8)
- | ((u32)ossl_toascii('b') << 16)
- | ((u32)ossl_toascii('y') << 24);
+ | ((u32)ossl_toascii('b') << 16)
+ | ((u32)ossl_toascii('y') << 24);
input[3] = ((u32)ossl_toascii('t')) | ((u32)ossl_toascii('e') << 8)
- | ((u32)ossl_toascii(' ') << 16)
- | ((u32)ossl_toascii('k') << 24);
+ | ((u32)ossl_toascii(' ') << 16)
+ | ((u32)ossl_toascii('k') << 24);
input[4] = key[0];
input[5] = key[1];
diff --git a/crypto/chacha/chacha_ppc.c b/crypto/chacha/chacha_ppc.c
index 91ed85eaf0..b36881a833 100644
--- a/crypto/chacha/chacha_ppc.c
+++ b/crypto/chacha/chacha_ppc.c
@@ -15,28 +15,29 @@
#include "crypto/ppc_arch.h"
void ChaCha20_ctr32_int(unsigned char *out, const unsigned char *inp,
- size_t len, const unsigned int key[8],
- const unsigned int counter[4]);
+ size_t len, const unsigned int key[8],
+ const unsigned int counter[4]);
void ChaCha20_ctr32_vmx(unsigned char *out, const unsigned char *inp,
- size_t len, const unsigned int key[8],
- const unsigned int counter[4]);
+ size_t len, const unsigned int key[8],
+ const unsigned int counter[4]);
void ChaCha20_ctr32_vsx(unsigned char *out, const unsigned char *inp,
- size_t len, const unsigned int key[8],
- const unsigned int counter[4]);
+ size_t len, const unsigned int key[8],
+ const unsigned int counter[4]);
void ChaCha20_ctr32_vsx_p10(unsigned char *out, const unsigned char *inp,
- size_t len, const unsigned int key[8],
- const unsigned int counter[4]);
+ size_t len, const unsigned int key[8],
+ const unsigned int counter[4]);
void ChaCha20_ctr32(unsigned char *out, const unsigned char *inp,
- size_t len, const unsigned int key[8],
- const unsigned int counter[4])
+ size_t len, const unsigned int key[8],
+ const unsigned int counter[4])
{
#if !defined(OPENSSL_SYS_AIX) && !defined(OPENSSL_SYS_MACOSX)
- OPENSSL_ppccap_P & PPC_BRD31
- ? ChaCha20_ctr32_vsx_p10(out, inp, len, key, counter) :
+ OPENSSL_ppccap_P &PPC_BRD31
+ ? ChaCha20_ctr32_vsx_p10(out, inp, len, key, counter)
+ :
#endif
- OPENSSL_ppccap_P & PPC_CRYPTO207
- ? ChaCha20_ctr32_vsx(out, inp, len, key, counter)
- : OPENSSL_ppccap_P & PPC_ALTIVEC
- ? ChaCha20_ctr32_vmx(out, inp, len, key, counter)
- : ChaCha20_ctr32_int(out, inp, len, key, counter);
+ OPENSSL_ppccap_P &PPC_CRYPTO207
+ ? ChaCha20_ctr32_vsx(out, inp, len, key, counter)
+ : OPENSSL_ppccap_P &PPC_ALTIVEC
+ ? ChaCha20_ctr32_vmx(out, inp, len, key, counter)
+ : ChaCha20_ctr32_int(out, inp, len, key, counter);
}
diff --git a/crypto/chacha/chacha_riscv.c b/crypto/chacha/chacha_riscv.c
index 6721eaa112..c9f17b35d8 100644
--- a/crypto/chacha/chacha_riscv.c
+++ b/crypto/chacha/chacha_riscv.c
@@ -41,19 +41,19 @@
#include "crypto/riscv_arch.h"
void ChaCha20_ctr32_v_zbb_zvkb(unsigned char *out, const unsigned char *inp,
- size_t len, const unsigned int key[8],
- const unsigned int counter[4]);
+ size_t len, const unsigned int key[8],
+ const unsigned int counter[4]);
void ChaCha20_ctr32_v_zbb(unsigned char *out, const unsigned char *inp,
- size_t len, const unsigned int key[8],
- const unsigned int counter[4]);
+ size_t len, const unsigned int key[8],
+ const unsigned int counter[4]);
void ChaCha20_ctr32(unsigned char *out, const unsigned char *inp, size_t len,
- const unsigned int key[8], const unsigned int counter[4])
+ const unsigned int key[8], const unsigned int counter[4])
{
if (len > CHACHA_BLK_SIZE && RISCV_HAS_ZBB() && riscv_vlen() >= 128
- && (size_t)out % sizeof(size_t) == 0
- && (size_t)inp % sizeof(size_t) == 0) {
+ && (size_t)out % sizeof(size_t) == 0
+ && (size_t)inp % sizeof(size_t) == 0) {
if (RISCV_HAS_ZVKB()) {
ChaCha20_ctr32_v_zbb_zvkb(out, inp, len, key, counter);
} else {
diff --git a/crypto/cmac/cmac.c b/crypto/cmac/cmac.c
index ad357c8b8c..f25524a2f6 100644
--- a/crypto/cmac/cmac.c
+++ b/crypto/cmac/cmac.c
@@ -110,7 +110,7 @@ int CMAC_CTX_copy(CMAC_CTX *out, const CMAC_CTX *in)
}
int ossl_cmac_init(CMAC_CTX *ctx, const void *key, size_t keylen,
- const EVP_CIPHER *cipher, const OSSL_PARAM param[])
+ const EVP_CIPHER *cipher, const OSSL_PARAM param[])
{
static const unsigned char zero_iv[EVP_MAX_BLOCK_LENGTH] = { 0 };
int block_len;
@@ -167,7 +167,7 @@ int ossl_cmac_init(CMAC_CTX *ctx, const void *key, size_t keylen,
}
int CMAC_Init(CMAC_CTX *ctx, const void *key, size_t keylen,
- const EVP_CIPHER *cipher, ENGINE *impl)
+ const EVP_CIPHER *cipher, ENGINE *impl)
{
if (!ossl_assert(impl == NULL))
return 0;
@@ -240,7 +240,6 @@ int CMAC_Update(CMAC_CTX *ctx, const void *in, size_t dlen)
memcpy(ctx->last_block, data, dlen);
ctx->nlast_block = (int)dlen;
return 1;
-
}
int CMAC_Final(CMAC_CTX *ctx, unsigned char *out, size_t *poutlen)
diff --git a/crypto/cmp/cmp_asn.c b/crypto/cmp/cmp_asn.c
index 101accd9f1..740e4466a1 100644
--- a/crypto/cmp/cmp_asn.c
+++ b/crypto/cmp/cmp_asn.c
@@ -36,14 +36,12 @@ ASN1_SEQUENCE(OSSL_CMP_CHALLENGE) = {
} ASN1_SEQUENCE_END(OSSL_CMP_CHALLENGE)
IMPLEMENT_ASN1_FUNCTIONS(OSSL_CMP_CHALLENGE)
-ASN1_ITEM_TEMPLATE(OSSL_CMP_POPODECKEYCHALLCONTENT) =
- ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0,
- OSSL_CMP_POPODECKEYCHALLCONTENT, OSSL_CMP_CHALLENGE)
+ASN1_ITEM_TEMPLATE(OSSL_CMP_POPODECKEYCHALLCONTENT) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0,
+ OSSL_CMP_POPODECKEYCHALLCONTENT, OSSL_CMP_CHALLENGE)
ASN1_ITEM_TEMPLATE_END(OSSL_CMP_POPODECKEYCHALLCONTENT)
-ASN1_ITEM_TEMPLATE(OSSL_CMP_POPODECKEYRESPCONTENT) =
- ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0,
- OSSL_CMP_POPODECKEYRESPCONTENT, ASN1_INTEGER)
+ASN1_ITEM_TEMPLATE(OSSL_CMP_POPODECKEYRESPCONTENT) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0,
+ OSSL_CMP_POPODECKEYRESPCONTENT, ASN1_INTEGER)
ASN1_ITEM_TEMPLATE_END(OSSL_CMP_POPODECKEYRESPCONTENT)
ASN1_SEQUENCE(OSSL_CMP_CAKEYUPDANNCONTENT) = {
@@ -61,76 +59,74 @@ ASN1_SEQUENCE(OSSL_CMP_ERRORMSGCONTENT) = {
ASN1_OPT(OSSL_CMP_ERRORMSGCONTENT, errorCode, ASN1_INTEGER),
/* OSSL_CMP_PKIFREETEXT is a ASN1_UTF8STRING sequence, so used directly */
ASN1_SEQUENCE_OF_OPT(OSSL_CMP_ERRORMSGCONTENT, errorDetails,
- ASN1_UTF8STRING)
+ ASN1_UTF8STRING)
} ASN1_SEQUENCE_END(OSSL_CMP_ERRORMSGCONTENT)
IMPLEMENT_ASN1_FUNCTIONS(OSSL_CMP_ERRORMSGCONTENT)
ASN1_ADB_TEMPLATE(infotypeandvalue_default) = ASN1_OPT(OSSL_CMP_ITAV,
- infoValue.other,
- ASN1_ANY);
+ infoValue.other,
+ ASN1_ANY);
/* ITAV means InfoTypeAndValue */
ASN1_ADB(OSSL_CMP_ITAV) = {
/* OSSL_CMP_CMPCERTIFICATE is effectively X509 so it is used directly */
- ADB_ENTRY(NID_id_it_caProtEncCert, ASN1_OPT(OSSL_CMP_ITAV,
- infoValue.caProtEncCert, X509)),
+ ADB_ENTRY(NID_id_it_caProtEncCert, ASN1_OPT(OSSL_CMP_ITAV, infoValue.caProtEncCert, X509)),
ADB_ENTRY(NID_id_it_signKeyPairTypes,
- ASN1_SEQUENCE_OF_OPT(OSSL_CMP_ITAV,
- infoValue.signKeyPairTypes, X509_ALGOR)),
+ ASN1_SEQUENCE_OF_OPT(OSSL_CMP_ITAV,
+ infoValue.signKeyPairTypes, X509_ALGOR)),
ADB_ENTRY(NID_id_it_encKeyPairTypes,
- ASN1_SEQUENCE_OF_OPT(OSSL_CMP_ITAV,
- infoValue.encKeyPairTypes, X509_ALGOR)),
+ ASN1_SEQUENCE_OF_OPT(OSSL_CMP_ITAV,
+ infoValue.encKeyPairTypes, X509_ALGOR)),
ADB_ENTRY(NID_id_it_preferredSymmAlg,
- ASN1_OPT(OSSL_CMP_ITAV, infoValue.preferredSymmAlg,
- X509_ALGOR)),
+ ASN1_OPT(OSSL_CMP_ITAV, infoValue.preferredSymmAlg,
+ X509_ALGOR)),
ADB_ENTRY(NID_id_it_caKeyUpdateInfo,
- ASN1_OPT(OSSL_CMP_ITAV, infoValue.caKeyUpdateInfo,
- OSSL_CMP_CAKEYUPDANNCONTENT)),
+ ASN1_OPT(OSSL_CMP_ITAV, infoValue.caKeyUpdateInfo,
+ OSSL_CMP_CAKEYUPDANNCONTENT)),
ADB_ENTRY(NID_id_it_currentCRL,
- ASN1_OPT(OSSL_CMP_ITAV, infoValue.currentCRL, X509_CRL)),
+ ASN1_OPT(OSSL_CMP_ITAV, infoValue.currentCRL, X509_CRL)),
ADB_ENTRY(NID_id_it_unsupportedOIDs,
- ASN1_SEQUENCE_OF_OPT(OSSL_CMP_ITAV,
- infoValue.unsupportedOIDs, ASN1_OBJECT)),
+ ASN1_SEQUENCE_OF_OPT(OSSL_CMP_ITAV,
+ infoValue.unsupportedOIDs, ASN1_OBJECT)),
ADB_ENTRY(NID_id_it_keyPairParamReq,
- ASN1_OPT(OSSL_CMP_ITAV, infoValue.keyPairParamReq,
- ASN1_OBJECT)),
+ ASN1_OPT(OSSL_CMP_ITAV, infoValue.keyPairParamReq,
+ ASN1_OBJECT)),
ADB_ENTRY(NID_id_it_keyPairParamRep,
- ASN1_OPT(OSSL_CMP_ITAV, infoValue.keyPairParamRep,
- X509_ALGOR)),
+ ASN1_OPT(OSSL_CMP_ITAV, infoValue.keyPairParamRep,
+ X509_ALGOR)),
ADB_ENTRY(NID_id_it_revPassphrase,
- ASN1_OPT(OSSL_CMP_ITAV, infoValue.revPassphrase,
- OSSL_CRMF_ENCRYPTEDVALUE)),
+ ASN1_OPT(OSSL_CMP_ITAV, infoValue.revPassphrase,
+ OSSL_CRMF_ENCRYPTEDVALUE)),
ADB_ENTRY(NID_id_it_implicitConfirm,
- ASN1_OPT(OSSL_CMP_ITAV, infoValue.implicitConfirm,
- ASN1_NULL)),
+ ASN1_OPT(OSSL_CMP_ITAV, infoValue.implicitConfirm,
+ ASN1_NULL)),
ADB_ENTRY(NID_id_it_confirmWaitTime,
- ASN1_OPT(OSSL_CMP_ITAV, infoValue.confirmWaitTime,
- ASN1_GENERALIZEDTIME)),
+ ASN1_OPT(OSSL_CMP_ITAV, infoValue.confirmWaitTime,
+ ASN1_GENERALIZEDTIME)),
ADB_ENTRY(NID_id_it_origPKIMessage,
- ASN1_OPT(OSSL_CMP_ITAV, infoValue.origPKIMessage,
- OSSL_CMP_MSGS)),
+ ASN1_OPT(OSSL_CMP_ITAV, infoValue.origPKIMessage,
+ OSSL_CMP_MSGS)),
ADB_ENTRY(NID_id_it_suppLangTags,
- ASN1_SEQUENCE_OF_OPT(OSSL_CMP_ITAV, infoValue.suppLangTagsValue,
- ASN1_UTF8STRING)),
+ ASN1_SEQUENCE_OF_OPT(OSSL_CMP_ITAV, infoValue.suppLangTagsValue,
+ ASN1_UTF8STRING)),
ADB_ENTRY(NID_id_it_caCerts,
- ASN1_SEQUENCE_OF_OPT(OSSL_CMP_ITAV, infoValue.caCerts, X509)),
+ ASN1_SEQUENCE_OF_OPT(OSSL_CMP_ITAV, infoValue.caCerts, X509)),
ADB_ENTRY(NID_id_it_rootCaCert,
- ASN1_OPT(OSSL_CMP_ITAV, infoValue.rootCaCert, X509)),
+ ASN1_OPT(OSSL_CMP_ITAV, infoValue.rootCaCert, X509)),
ADB_ENTRY(NID_id_it_rootCaKeyUpdate,
- ASN1_OPT(OSSL_CMP_ITAV, infoValue.rootCaKeyUpdate,
- OSSL_CMP_ROOTCAKEYUPDATE)),
+ ASN1_OPT(OSSL_CMP_ITAV, infoValue.rootCaKeyUpdate,
+ OSSL_CMP_ROOTCAKEYUPDATE)),
ADB_ENTRY(NID_id_it_certReqTemplate,
- ASN1_OPT(OSSL_CMP_ITAV, infoValue.certReqTemplate,
- OSSL_CMP_CERTREQTEMPLATE)),
+ ASN1_OPT(OSSL_CMP_ITAV, infoValue.certReqTemplate,
+ OSSL_CMP_CERTREQTEMPLATE)),
ADB_ENTRY(NID_id_it_certProfile,
- ASN1_SEQUENCE_OF_OPT(OSSL_CMP_ITAV, infoValue.certProfile,
- ASN1_UTF8STRING)),
+ ASN1_SEQUENCE_OF_OPT(OSSL_CMP_ITAV, infoValue.certProfile,
+ ASN1_UTF8STRING)),
ADB_ENTRY(NID_id_it_crlStatusList,
- ASN1_SEQUENCE_OF_OPT(OSSL_CMP_ITAV, infoValue.crlStatusList,
- OSSL_CMP_CRLSTATUS)),
+ ASN1_SEQUENCE_OF_OPT(OSSL_CMP_ITAV, infoValue.crlStatusList,
+ OSSL_CMP_CRLSTATUS)),
ADB_ENTRY(NID_id_it_crls,
- ASN1_SEQUENCE_OF_OPT(OSSL_CMP_ITAV, infoValue.crls, X509_CRL))
-} ASN1_ADB_END(OSSL_CMP_ITAV, 0, infoType, 0,
- &infotypeandvalue_default_tt, NULL);
+ ASN1_SEQUENCE_OF_OPT(OSSL_CMP_ITAV, infoValue.crls, X509_CRL))
+} ASN1_ADB_END(OSSL_CMP_ITAV, 0, infoType, 0, &infotypeandvalue_default_tt, NULL);
ASN1_SEQUENCE(OSSL_CMP_ITAV) = {
ASN1_SIMPLE(OSSL_CMP_ITAV, infoType, ASN1_OBJECT),
@@ -147,16 +143,15 @@ ASN1_SEQUENCE(OSSL_CMP_ROOTCAKEYUPDATE) = {
} ASN1_SEQUENCE_END(OSSL_CMP_ROOTCAKEYUPDATE)
IMPLEMENT_ASN1_FUNCTIONS(OSSL_CMP_ROOTCAKEYUPDATE)
-ASN1_ITEM_TEMPLATE(OSSL_CMP_ATAVS) =
- ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0,
- OSSL_CMP_ATAVS, OSSL_CRMF_ATTRIBUTETYPEANDVALUE)
+ASN1_ITEM_TEMPLATE(OSSL_CMP_ATAVS) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0,
+ OSSL_CMP_ATAVS, OSSL_CRMF_ATTRIBUTETYPEANDVALUE)
ASN1_ITEM_TEMPLATE_END(OSSL_CMP_ATAVS)
IMPLEMENT_ASN1_FUNCTIONS(OSSL_CMP_ATAVS)
ASN1_SEQUENCE(OSSL_CMP_CERTREQTEMPLATE) = {
ASN1_SIMPLE(OSSL_CMP_CERTREQTEMPLATE, certTemplate, OSSL_CRMF_CERTTEMPLATE),
ASN1_SEQUENCE_OF_OPT(OSSL_CMP_CERTREQTEMPLATE, keySpec,
- OSSL_CRMF_ATTRIBUTETYPEANDVALUE)
+ OSSL_CRMF_ATTRIBUTETYPEANDVALUE)
} ASN1_SEQUENCE_END(OSSL_CMP_CERTREQTEMPLATE)
IMPLEMENT_ASN1_FUNCTIONS(OSSL_CMP_CERTREQTEMPLATE)
@@ -185,7 +180,7 @@ OSSL_CMP_ITAV *OSSL_CMP_ITAV_create(ASN1_OBJECT *type, ASN1_TYPE *value)
}
void OSSL_CMP_ITAV_set0(OSSL_CMP_ITAV *itav, ASN1_OBJECT *type,
- ASN1_TYPE *value)
+ ASN1_TYPE *value)
{
itav->infoType = type;
itav->infoValue.other = value;
@@ -206,7 +201,7 @@ ASN1_TYPE *OSSL_CMP_ITAV_get0_value(const OSSL_CMP_ITAV *itav)
}
int OSSL_CMP_ITAV_push0_stack_item(STACK_OF(OSSL_CMP_ITAV) **itav_sk_p,
- OSSL_CMP_ITAV *itav)
+ OSSL_CMP_ITAV *itav)
{
int created = 0;
@@ -224,7 +219,7 @@ int OSSL_CMP_ITAV_push0_stack_item(STACK_OF(OSSL_CMP_ITAV) **itav_sk_p,
goto err;
return 1;
- err:
+err:
if (created) {
sk_OSSL_CMP_ITAV_free(*itav_sk_p);
*itav_sk_p = NULL;
@@ -245,7 +240,7 @@ OSSL_CMP_ITAV
}
int OSSL_CMP_ITAV_get0_certProfile(const OSSL_CMP_ITAV *itav,
- STACK_OF(ASN1_UTF8STRING) **out)
+ STACK_OF(ASN1_UTF8STRING) **out)
{
if (itav == NULL || out == NULL) {
ERR_raise(ERR_LIB_CMP, ERR_R_PASSED_NULL_PARAMETER);
@@ -266,8 +261,7 @@ OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_caCerts(const STACK_OF(X509) *caCerts)
if (itav == NULL)
return NULL;
if (sk_X509_num(caCerts) > 0
- && (itav->infoValue.caCerts =
- sk_X509_deep_copy(caCerts, X509_dup, X509_free)) == NULL) {
+ && (itav->infoValue.caCerts = sk_X509_deep_copy(caCerts, X509_dup, X509_free)) == NULL) {
OSSL_CMP_ITAV_free(itav);
return NULL;
}
@@ -286,7 +280,8 @@ int OSSL_CMP_ITAV_get0_caCerts(const OSSL_CMP_ITAV *itav, STACK_OF(X509) **out)
return 0;
}
*out = sk_X509_num(itav->infoValue.caCerts) > 0
- ? itav->infoValue.caCerts : NULL;
+ ? itav->infoValue.caCerts
+ : NULL;
return 1;
}
@@ -297,7 +292,7 @@ OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_rootCaCert(const X509 *rootCaCert)
if (itav == NULL)
return NULL;
if (rootCaCert != NULL
- && (itav->infoValue.rootCaCert = X509_dup(rootCaCert)) == NULL) {
+ && (itav->infoValue.rootCaCert = X509_dup(rootCaCert)) == NULL) {
OSSL_CMP_ITAV_free(itav);
return NULL;
}
@@ -319,8 +314,8 @@ int OSSL_CMP_ITAV_get0_rootCaCert(const OSSL_CMP_ITAV *itav, X509 **out)
return 1;
}
OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_rootCaKeyUpdate(const X509 *newWithNew,
- const X509 *newWithOld,
- const X509 *oldWithNew)
+ const X509 *newWithOld,
+ const X509 *oldWithNew)
{
OSSL_CMP_ITAV *itav;
OSSL_CMP_ROOTCAKEYUPDATE *upd = NULL;
@@ -346,15 +341,15 @@ OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_rootCaKeyUpdate(const X509 *newWithNew,
itav->infoValue.rootCaKeyUpdate = upd;
return itav;
- err:
+err:
OSSL_CMP_ROOTCAKEYUPDATE_free(upd);
return NULL;
}
int OSSL_CMP_ITAV_get0_rootCaKeyUpdate(const OSSL_CMP_ITAV *itav,
- X509 **newWithNew,
- X509 **newWithOld,
- X509 **oldWithNew)
+ X509 **newWithNew,
+ X509 **newWithOld,
+ X509 **oldWithNew)
{
OSSL_CMP_ROOTCAKEYUPDATE *upd;
@@ -377,7 +372,7 @@ int OSSL_CMP_ITAV_get0_rootCaKeyUpdate(const OSSL_CMP_ITAV *itav,
OSSL_CMP_ITAV
*OSSL_CMP_ITAV_new0_certReqTemplate(OSSL_CRMF_CERTTEMPLATE *certTemplate,
- OSSL_CMP_ATAVS *keySpec)
+ OSSL_CMP_ATAVS *keySpec)
{
OSSL_CMP_ITAV *itav;
OSSL_CMP_CERTREQTEMPLATE *tmpl;
@@ -403,8 +398,8 @@ OSSL_CMP_ITAV
}
int OSSL_CMP_ITAV_get1_certReqTemplate(const OSSL_CMP_ITAV *itav,
- OSSL_CRMF_CERTTEMPLATE **certTemplate,
- OSSL_CMP_ATAVS **keySpec)
+ OSSL_CRMF_CERTTEMPLATE **certTemplate,
+ OSSL_CMP_ATAVS **keySpec)
{
OSSL_CMP_CERTREQTEMPLATE *tpl;
@@ -441,22 +436,22 @@ int OSSL_CMP_ITAV_get1_certReqTemplate(const OSSL_CMP_ITAV *itav,
if (type == NULL) {
ERR_raise_data(ERR_LIB_CMP, CMP_R_INVALID_KEYSPEC,
- "keySpec with index %d in certReqTemplate does not exist",
- i);
+ "keySpec with index %d in certReqTemplate does not exist",
+ i);
goto err;
}
nid = OBJ_obj2nid(type);
if (nid != NID_id_regCtrl_algId
- && nid != NID_id_regCtrl_rsaKeyLen) {
+ && nid != NID_id_regCtrl_rsaKeyLen) {
name = OBJ_nid2ln(nid);
if (name == NULL)
name = OBJ_nid2sn(nid);
if (name == NULL)
name = "<undef>";
ERR_raise_data(ERR_LIB_CMP, CMP_R_INVALID_KEYSPEC,
- "keySpec with index %d in certReqTemplate has invalid type %s",
- i, name);
+ "keySpec with index %d in certReqTemplate has invalid type %s",
+ i, name);
goto err;
}
OSSL_CMP_ATAV_push1(keySpec, atav);
@@ -464,7 +459,7 @@ int OSSL_CMP_ITAV_get1_certReqTemplate(const OSSL_CMP_ITAV *itav,
}
return 1;
- err:
+err:
OSSL_CRMF_CERTTEMPLATE_free(*certTemplate);
*certTemplate = NULL;
sk_OSSL_CMP_ATAV_pop_free(*keySpec, OSSL_CMP_ATAV_free);
@@ -484,7 +479,7 @@ OSSL_CMP_ATAV *OSSL_CMP_ATAV_create(ASN1_OBJECT *type, ASN1_TYPE *value)
}
void OSSL_CMP_ATAV_set0(OSSL_CMP_ATAV *atav, ASN1_OBJECT *type,
- ASN1_TYPE *value)
+ ASN1_TYPE *value)
{
atav->type = type;
atav->value.other = value;
@@ -509,7 +504,7 @@ OSSL_CMP_ATAV *OSSL_CMP_ATAV_new_algId(const X509_ALGOR *alg)
if ((dup = X509_ALGOR_dup(alg)) == NULL)
return NULL;
res = OSSL_CMP_ATAV_create(OBJ_nid2obj(NID_id_regCtrl_algId),
- (ASN1_TYPE *)dup);
+ (ASN1_TYPE *)dup);
if (res == NULL)
X509_ALGOR_free(dup);
return res;
@@ -535,7 +530,8 @@ OSSL_CMP_ATAV *OSSL_CMP_ATAV_new_rsaKeyLen(int len)
return NULL;
if (!ASN1_INTEGER_set(aint, len)
|| (res = OSSL_CMP_ATAV_create(OBJ_nid2obj(NID_id_regCtrl_rsaKeyLen),
- (ASN1_TYPE *)aint)) == NULL)
+ (ASN1_TYPE *)aint))
+ == NULL)
ASN1_INTEGER_free(aint);
return res;
}
@@ -545,7 +541,7 @@ int OSSL_CMP_ATAV_get_rsaKeyLen(const OSSL_CMP_ATAV *atav)
int64_t val;
if (atav == NULL || OBJ_obj2nid(atav->type) != NID_id_regCtrl_rsaKeyLen
- || !ASN1_INTEGER_get_int64(&val, atav->value.rsaKeyLen))
+ || !ASN1_INTEGER_get_int64(&val, atav->value.rsaKeyLen))
return -1;
if (val <= 0 || val > INT_MAX)
return -2;
@@ -581,7 +577,7 @@ int OSSL_CMP_ATAV_push1(OSSL_CMP_ATAVS **sk_p, const OSSL_CMP_ATAV *atav)
return 1;
OSSL_CRMF_ATTRIBUTETYPEANDVALUE_free(dup);
- err:
+err:
if (created) {
sk_OSSL_CRMF_ATTRIBUTETYPEANDVALUE_free(*sk_p);
*sk_p = NULL;
@@ -602,7 +598,7 @@ OSSL_CMP_ITAV
}
int OSSL_CMP_ITAV_get0_crlStatusList(const OSSL_CMP_ITAV *itav,
- STACK_OF(OSSL_CMP_CRLSTATUS) **out)
+ STACK_OF(OSSL_CMP_CRLSTATUS) **out)
{
if (itav == NULL || out == NULL) {
ERR_raise(ERR_LIB_CMP, ERR_R_PASSED_NULL_PARAMETER);
@@ -617,8 +613,8 @@ int OSSL_CMP_ITAV_get0_crlStatusList(const OSSL_CMP_ITAV *itav,
}
OSSL_CMP_CRLSTATUS *OSSL_CMP_CRLSTATUS_new1(const DIST_POINT_NAME *dpn,
- const GENERAL_NAMES *issuer,
- const ASN1_TIME *thisUpdate)
+ const GENERAL_NAMES *issuer,
+ const ASN1_TIME *thisUpdate)
{
OSSL_CMP_CRLSOURCE *crlsource;
OSSL_CMP_CRLSTATUS *crlstatus;
@@ -642,18 +638,18 @@ OSSL_CMP_CRLSTATUS *OSSL_CMP_CRLSTATUS_new1(const DIST_POINT_NAME *dpn,
goto err;
} else {
crlsource->type = OSSL_CMP_CRLSOURCE_ISSUER;
- if ((crlsource->value.issuer =
- sk_GENERAL_NAME_deep_copy(issuer, GENERAL_NAME_dup,
- GENERAL_NAME_free)) == NULL)
+ if ((crlsource->value.issuer = sk_GENERAL_NAME_deep_copy(issuer, GENERAL_NAME_dup,
+ GENERAL_NAME_free))
+ == NULL)
goto err;
}
if (thisUpdate != NULL
- && (crlstatus->thisUpdate = ASN1_TIME_dup(thisUpdate)) == NULL)
+ && (crlstatus->thisUpdate = ASN1_TIME_dup(thisUpdate)) == NULL)
goto err;
return crlstatus;
- err:
+err:
OSSL_CMP_CRLSTATUS_free(crlstatus);
return NULL;
}
@@ -684,7 +680,7 @@ static int gennames_allowed(GENERAL_NAMES *names, int only_DN)
}
OSSL_CMP_CRLSTATUS *OSSL_CMP_CRLSTATUS_create(const X509_CRL *crl,
- const X509 *cert, int only_DN)
+ const X509 *cert, int only_DN)
{
STACK_OF(DIST_POINT) *crldps = NULL;
ISSUING_DIST_POINT *idp = NULL;
@@ -723,7 +719,7 @@ OSSL_CMP_CRLSTATUS *OSSL_CMP_CRLSTATUS_create(const X509_CRL *crl,
return NULL;
}
idp = X509_CRL_get_ext_d2i(crl,
- NID_issuing_distribution_point, NULL, NULL);
+ NID_issuing_distribution_point, NULL, NULL);
if (idp != NULL && idp->distpoint != NULL)
dpn = idp->distpoint;
}
@@ -748,7 +744,7 @@ OSSL_CMP_CRLSTATUS *OSSL_CMP_CRLSTATUS_create(const X509_CRL *crl,
}
status = OSSL_CMP_CRLSTATUS_new1(dpn, CRLissuer, last);
- end:
+end:
sk_DIST_POINT_pop_free(crldps, DIST_POINT_free);
ISSUING_DIST_POINT_free(idp);
AUTHORITY_KEYID_free(akid);
@@ -757,8 +753,8 @@ OSSL_CMP_CRLSTATUS *OSSL_CMP_CRLSTATUS_create(const X509_CRL *crl,
}
int OSSL_CMP_CRLSTATUS_get0(const OSSL_CMP_CRLSTATUS *crlstatus,
- DIST_POINT_NAME **dpn, GENERAL_NAMES **issuer,
- ASN1_TIME **thisUpdate)
+ DIST_POINT_NAME **dpn, GENERAL_NAMES **issuer,
+ ASN1_TIME **thisUpdate)
{
OSSL_CMP_CRLSOURCE *crlsource;
@@ -797,8 +793,8 @@ OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_crls(const X509_CRL *crl)
if (crl != NULL) {
if ((crls = sk_X509_CRL_new_reserve(NULL, 1)) == NULL
- || (crl_copy = X509_CRL_dup(crl)) == NULL
- || !sk_X509_CRL_push(crls, crl_copy))
+ || (crl_copy = X509_CRL_dup(crl)) == NULL
+ || !sk_X509_CRL_push(crls, crl_copy))
goto err;
crl_copy = NULL; /* ownership transferred to crls */
}
@@ -807,7 +803,7 @@ OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_crls(const X509_CRL *crl)
itav->infoValue.crls = crls;
return itav;
- err:
+err:
OPENSSL_free(crl_copy);
sk_X509_CRL_free(crls);
OSSL_CMP_ITAV_free(itav);
@@ -849,7 +845,7 @@ int ossl_cmp_asn1_get_int(const ASN1_INTEGER *a)
}
static int ossl_cmp_msg_cb(int operation, ASN1_VALUE **pval,
- ossl_unused const ASN1_ITEM *it, void *exarg)
+ ossl_unused const ASN1_ITEM *it, void *exarg)
{
OSSL_CMP_MSG *msg = (OSSL_CMP_MSG *)*pval;
@@ -858,28 +854,22 @@ static int ossl_cmp_msg_cb(int operation, ASN1_VALUE **pval,
OPENSSL_free(msg->propq);
break;
- case ASN1_OP_DUP_POST:
- {
- OSSL_CMP_MSG *old = exarg;
+ case ASN1_OP_DUP_POST: {
+ OSSL_CMP_MSG *old = exarg;
- if (!ossl_cmp_msg_set0_libctx(msg, old->libctx, old->propq))
- return 0;
- }
- break;
- case ASN1_OP_GET0_LIBCTX:
- {
- OSSL_LIB_CTX **libctx = exarg;
+ if (!ossl_cmp_msg_set0_libctx(msg, old->libctx, old->propq))
+ return 0;
+ } break;
+ case ASN1_OP_GET0_LIBCTX: {
+ OSSL_LIB_CTX **libctx = exarg;
- *libctx = msg->libctx;
- }
- break;
- case ASN1_OP_GET0_PROPQ:
- {
- const char **propq = exarg;
+ *libctx = msg->libctx;
+ } break;
+ case ASN1_OP_GET0_PROPQ: {
+ const char **propq = exarg;
- *propq = msg->propq;
- }
- break;
+ *propq = msg->propq;
+ } break;
default:
break;
}
@@ -891,17 +881,17 @@ ASN1_CHOICE(OSSL_CMP_CERTORENCCERT) = {
/* OSSL_CMP_CMPCERTIFICATE is effectively X509 so it is used directly */
ASN1_EXP(OSSL_CMP_CERTORENCCERT, value.certificate, X509, 0),
ASN1_EXP(OSSL_CMP_CERTORENCCERT, value.encryptedCert,
- OSSL_CRMF_ENCRYPTEDKEY, 1),
+ OSSL_CRMF_ENCRYPTEDKEY, 1),
} ASN1_CHOICE_END(OSSL_CMP_CERTORENCCERT)
IMPLEMENT_ASN1_FUNCTIONS(OSSL_CMP_CERTORENCCERT)
ASN1_SEQUENCE(OSSL_CMP_CERTIFIEDKEYPAIR) = {
ASN1_SIMPLE(OSSL_CMP_CERTIFIEDKEYPAIR, certOrEncCert,
- OSSL_CMP_CERTORENCCERT),
+ OSSL_CMP_CERTORENCCERT),
ASN1_EXP_OPT(OSSL_CMP_CERTIFIEDKEYPAIR, privateKey,
- OSSL_CRMF_ENCRYPTEDKEY, 0),
+ OSSL_CRMF_ENCRYPTEDKEY, 0),
ASN1_EXP_OPT(OSSL_CMP_CERTIFIEDKEYPAIR, publicationInfo,
- OSSL_CRMF_PKIPUBLICATIONINFO, 1)
+ OSSL_CRMF_PKIPUBLICATIONINFO, 1)
} ASN1_SEQUENCE_END(OSSL_CMP_CERTIFIEDKEYPAIR)
IMPLEMENT_ASN1_FUNCTIONS(OSSL_CMP_CERTIFIEDKEYPAIR)
@@ -911,15 +901,14 @@ ASN1_SEQUENCE(OSSL_CMP_REVDETAILS) = {
} ASN1_SEQUENCE_END(OSSL_CMP_REVDETAILS)
IMPLEMENT_ASN1_FUNCTIONS(OSSL_CMP_REVDETAILS)
-ASN1_ITEM_TEMPLATE(OSSL_CMP_REVREQCONTENT) =
- ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, OSSL_CMP_REVREQCONTENT,
- OSSL_CMP_REVDETAILS)
+ASN1_ITEM_TEMPLATE(OSSL_CMP_REVREQCONTENT) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, OSSL_CMP_REVREQCONTENT,
+ OSSL_CMP_REVDETAILS)
ASN1_ITEM_TEMPLATE_END(OSSL_CMP_REVREQCONTENT)
ASN1_SEQUENCE(OSSL_CMP_REVREPCONTENT) = {
ASN1_SEQUENCE_OF(OSSL_CMP_REVREPCONTENT, status, OSSL_CMP_PKISI),
ASN1_EXP_SEQUENCE_OF_OPT(OSSL_CMP_REVREPCONTENT, revCerts, OSSL_CRMF_CERTID,
- 0),
+ 0),
ASN1_EXP_SEQUENCE_OF_OPT(OSSL_CMP_REVREPCONTENT, crls, X509_CRL, 1)
} ASN1_SEQUENCE_END(OSSL_CMP_REVREPCONTENT)
IMPLEMENT_ASN1_FUNCTIONS(OSSL_CMP_REVREPCONTENT)
@@ -929,12 +918,11 @@ ASN1_SEQUENCE(OSSL_CMP_KEYRECREPCONTENT) = {
ASN1_EXP_OPT(OSSL_CMP_KEYRECREPCONTENT, newSigCert, X509, 0),
ASN1_EXP_SEQUENCE_OF_OPT(OSSL_CMP_KEYRECREPCONTENT, caCerts, X509, 1),
ASN1_EXP_SEQUENCE_OF_OPT(OSSL_CMP_KEYRECREPCONTENT, keyPairHist,
- OSSL_CMP_CERTIFIEDKEYPAIR, 2)
+ OSSL_CMP_CERTIFIEDKEYPAIR, 2)
} ASN1_SEQUENCE_END(OSSL_CMP_KEYRECREPCONTENT)
IMPLEMENT_ASN1_FUNCTIONS(OSSL_CMP_KEYRECREPCONTENT)
-ASN1_ITEM_TEMPLATE(OSSL_CMP_PKISTATUS) =
- ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_UNIVERSAL, 0, status, ASN1_INTEGER)
+ASN1_ITEM_TEMPLATE(OSSL_CMP_PKISTATUS) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_UNIVERSAL, 0, status, ASN1_INTEGER)
ASN1_ITEM_TEMPLATE_END(OSSL_CMP_PKISTATUS)
ASN1_SEQUENCE(OSSL_CMP_PKISI) = {
@@ -955,16 +943,15 @@ ASN1_SEQUENCE(OSSL_CMP_CERTSTATUS) = {
} ASN1_SEQUENCE_END(OSSL_CMP_CERTSTATUS)
IMPLEMENT_ASN1_FUNCTIONS(OSSL_CMP_CERTSTATUS)
-ASN1_ITEM_TEMPLATE(OSSL_CMP_CERTCONFIRMCONTENT) =
- ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, OSSL_CMP_CERTCONFIRMCONTENT,
- OSSL_CMP_CERTSTATUS)
+ASN1_ITEM_TEMPLATE(OSSL_CMP_CERTCONFIRMCONTENT) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, OSSL_CMP_CERTCONFIRMCONTENT,
+ OSSL_CMP_CERTSTATUS)
ASN1_ITEM_TEMPLATE_END(OSSL_CMP_CERTCONFIRMCONTENT)
ASN1_SEQUENCE(OSSL_CMP_CERTRESPONSE) = {
ASN1_SIMPLE(OSSL_CMP_CERTRESPONSE, certReqId, ASN1_INTEGER),
ASN1_SIMPLE(OSSL_CMP_CERTRESPONSE, status, OSSL_CMP_PKISI),
ASN1_OPT(OSSL_CMP_CERTRESPONSE, certifiedKeyPair,
- OSSL_CMP_CERTIFIEDKEYPAIR),
+ OSSL_CMP_CERTIFIEDKEYPAIR),
ASN1_OPT(OSSL_CMP_CERTRESPONSE, rspInfo, ASN1_OCTET_STRING)
} ASN1_SEQUENCE_END(OSSL_CMP_CERTRESPONSE)
IMPLEMENT_ASN1_FUNCTIONS(OSSL_CMP_CERTRESPONSE)
@@ -974,9 +961,8 @@ ASN1_SEQUENCE(OSSL_CMP_POLLREQ) = {
} ASN1_SEQUENCE_END(OSSL_CMP_POLLREQ)
IMPLEMENT_ASN1_FUNCTIONS(OSSL_CMP_POLLREQ)
-ASN1_ITEM_TEMPLATE(OSSL_CMP_POLLREQCONTENT) =
- ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, OSSL_CMP_POLLREQCONTENT,
- OSSL_CMP_POLLREQ)
+ASN1_ITEM_TEMPLATE(OSSL_CMP_POLLREQCONTENT) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, OSSL_CMP_POLLREQCONTENT,
+ OSSL_CMP_POLLREQ)
ASN1_ITEM_TEMPLATE_END(OSSL_CMP_POLLREQCONTENT)
ASN1_SEQUENCE(OSSL_CMP_POLLREP) = {
@@ -986,10 +972,9 @@ ASN1_SEQUENCE(OSSL_CMP_POLLREP) = {
} ASN1_SEQUENCE_END(OSSL_CMP_POLLREP)
IMPLEMENT_ASN1_FUNCTIONS(OSSL_CMP_POLLREP)
-ASN1_ITEM_TEMPLATE(OSSL_CMP_POLLREPCONTENT) =
- ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0,
- OSSL_CMP_POLLREPCONTENT,
- OSSL_CMP_POLLREP)
+ASN1_ITEM_TEMPLATE(OSSL_CMP_POLLREPCONTENT) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0,
+ OSSL_CMP_POLLREPCONTENT,
+ OSSL_CMP_POLLREP)
ASN1_ITEM_TEMPLATE_END(OSSL_CMP_POLLREPCONTENT)
ASN1_SEQUENCE(OSSL_CMP_CERTREPMESSAGE) = {
@@ -999,19 +984,16 @@ ASN1_SEQUENCE(OSSL_CMP_CERTREPMESSAGE) = {
} ASN1_SEQUENCE_END(OSSL_CMP_CERTREPMESSAGE)
IMPLEMENT_ASN1_FUNCTIONS(OSSL_CMP_CERTREPMESSAGE)
-ASN1_ITEM_TEMPLATE(OSSL_CMP_GENMSGCONTENT) =
- ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, OSSL_CMP_GENMSGCONTENT,
- OSSL_CMP_ITAV)
+ASN1_ITEM_TEMPLATE(OSSL_CMP_GENMSGCONTENT) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, OSSL_CMP_GENMSGCONTENT,
+ OSSL_CMP_ITAV)
ASN1_ITEM_TEMPLATE_END(OSSL_CMP_GENMSGCONTENT)
-ASN1_ITEM_TEMPLATE(OSSL_CMP_GENREPCONTENT) =
- ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, OSSL_CMP_GENREPCONTENT,
- OSSL_CMP_ITAV)
+ASN1_ITEM_TEMPLATE(OSSL_CMP_GENREPCONTENT) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, OSSL_CMP_GENREPCONTENT,
+ OSSL_CMP_ITAV)
ASN1_ITEM_TEMPLATE_END(OSSL_CMP_GENREPCONTENT)
-ASN1_ITEM_TEMPLATE(OSSL_CMP_CRLANNCONTENT) =
- ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0,
- OSSL_CMP_CRLANNCONTENT, X509_CRL)
+ASN1_ITEM_TEMPLATE(OSSL_CMP_CRLANNCONTENT) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0,
+ OSSL_CMP_CRLANNCONTENT, X509_CRL)
ASN1_ITEM_TEMPLATE_END(OSSL_CMP_CRLANNCONTENT)
ASN1_CHOICE(OSSL_CMP_PKIBODY) = {
@@ -1021,9 +1003,9 @@ ASN1_CHOICE(OSSL_CMP_PKIBODY) = {
ASN1_EXP(OSSL_CMP_PKIBODY, value.cp, OSSL_CMP_CERTREPMESSAGE, 3),
ASN1_EXP(OSSL_CMP_PKIBODY, value.p10cr, X509_REQ, 4),
ASN1_EXP(OSSL_CMP_PKIBODY, value.popdecc,
- OSSL_CMP_POPODECKEYCHALLCONTENT, 5),
+ OSSL_CMP_POPODECKEYCHALLCONTENT, 5),
ASN1_EXP(OSSL_CMP_PKIBODY, value.popdecr,
- OSSL_CMP_POPODECKEYRESPCONTENT, 6),
+ OSSL_CMP_POPODECKEYRESPCONTENT, 6),
ASN1_EXP(OSSL_CMP_PKIBODY, value.kur, OSSL_CRMF_MSGS, 7),
ASN1_EXP(OSSL_CMP_PKIBODY, value.kup, OSSL_CMP_CERTREPMESSAGE, 8),
ASN1_EXP(OSSL_CMP_PKIBODY, value.krr, OSSL_CRMF_MSGS, 9),
@@ -1061,7 +1043,7 @@ ASN1_SEQUENCE(OSSL_CMP_PKIHEADER) = {
/* OSSL_CMP_PKIFREETEXT is a ASN1_UTF8STRING sequence, so used directly */
ASN1_EXP_SEQUENCE_OF_OPT(OSSL_CMP_PKIHEADER, freeText, ASN1_UTF8STRING, 7),
ASN1_EXP_SEQUENCE_OF_OPT(OSSL_CMP_PKIHEADER, generalInfo,
- OSSL_CMP_ITAV, 8)
+ OSSL_CMP_ITAV, 8)
} ASN1_SEQUENCE_END(OSSL_CMP_PKIHEADER)
IMPLEMENT_ASN1_FUNCTIONS(OSSL_CMP_PKIHEADER)
@@ -1080,7 +1062,6 @@ ASN1_SEQUENCE_cb(OSSL_CMP_MSG, ossl_cmp_msg_cb) = {
} ASN1_SEQUENCE_END_cb(OSSL_CMP_MSG, OSSL_CMP_MSG)
IMPLEMENT_ASN1_DUP_FUNCTION(OSSL_CMP_MSG)
-ASN1_ITEM_TEMPLATE(OSSL_CMP_MSGS) =
- ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, OSSL_CMP_MSGS,
- OSSL_CMP_MSG)
+ASN1_ITEM_TEMPLATE(OSSL_CMP_MSGS) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, OSSL_CMP_MSGS,
+ OSSL_CMP_MSG)
ASN1_ITEM_TEMPLATE_END(OSSL_CMP_MSGS)
diff --git a/crypto/cmp/cmp_client.c b/crypto/cmp/cmp_client.c
index 4488dd3236..3e5973158d 100644
--- a/crypto/cmp/cmp_client.c
+++ b/crypto/cmp/cmp_client.c
@@ -12,7 +12,7 @@
#include "cmp_local.h"
#define IS_CREP(t) ((t) == OSSL_CMP_PKIBODY_IP || (t) == OSSL_CMP_PKIBODY_CP \
- || (t) == OSSL_CMP_PKIBODY_KUP)
+ || (t) == OSSL_CMP_PKIBODY_KUP)
/*-
* Evaluate whether there's an exception (violating the standard) configured for
@@ -20,9 +20,9 @@
* Returns 1 on acceptance, 0 on rejection, or -1 on (internal) error.
*/
static int unprotected_exception(const OSSL_CMP_CTX *ctx,
- const OSSL_CMP_MSG *rep,
- int invalid_protection,
- ossl_unused int expected_type)
+ const OSSL_CMP_MSG *rep,
+ int invalid_protection,
+ ossl_unused int expected_type)
{
int rcvd_type = OSSL_CMP_MSG_get_bodytype(rep /* may be NULL */);
const char *msg_type = NULL;
@@ -37,18 +37,16 @@ static int unprotected_exception(const OSSL_CMP_CTX *ctx,
case OSSL_CMP_PKIBODY_ERROR:
msg_type = "error response";
break;
- case OSSL_CMP_PKIBODY_RP:
- {
- OSSL_CMP_PKISI *si =
- ossl_cmp_revrepcontent_get_pkisi(rep->body->value.rp,
- OSSL_CMP_REVREQSID);
-
- if (si == NULL)
- return -1;
- if (ossl_cmp_pkisi_get_status(si) == OSSL_CMP_PKISTATUS_rejection)
- msg_type = "revocation response message with rejection status";
- break;
- }
+ case OSSL_CMP_PKIBODY_RP: {
+ OSSL_CMP_PKISI *si = ossl_cmp_revrepcontent_get_pkisi(rep->body->value.rp,
+ OSSL_CMP_REVREQSID);
+
+ if (si == NULL)
+ return -1;
+ if (ossl_cmp_pkisi_get_status(si) == OSSL_CMP_PKISTATUS_rejection)
+ msg_type = "revocation response message with rejection status";
+ break;
+ }
case OSSL_CMP_PKIBODY_PKICONF:
msg_type = "PKI Confirmation message";
break;
@@ -56,8 +54,7 @@ static int unprotected_exception(const OSSL_CMP_CTX *ctx,
if (IS_CREP(rcvd_type)) {
int any_rid = OSSL_CMP_CERTREQID_NONE;
OSSL_CMP_CERTREPMESSAGE *crepmsg = rep->body->value.ip;
- OSSL_CMP_CERTRESPONSE *crep =
- ossl_cmp_certrepmessage_get0_certresponse(crepmsg, any_rid);
+ OSSL_CMP_CERTRESPONSE *crep = ossl_cmp_certrepmessage_get0_certresponse(crepmsg, any_rid);
if (sk_OSSL_CMP_CERTRESPONSE_num(crepmsg->response) > 1)
return -1;
@@ -71,7 +68,7 @@ static int unprotected_exception(const OSSL_CMP_CTX *ctx,
if (msg_type == NULL)
return 0;
ossl_cmp_log2(WARN, ctx, "ignoring %s protection of %s",
- invalid_protection ? "invalid" : "missing", msg_type);
+ invalid_protection ? "invalid" : "missing", msg_type);
return 1;
}
@@ -91,7 +88,7 @@ static int save_statusInfo(OSSL_CMP_CTX *ctx, OSSL_CMP_PKISI *si)
ctx->failInfoCode = ossl_cmp_pkisi_get_pkifailureinfo(si);
if (!ossl_cmp_ctx_set0_statusString(ctx, sk_ASN1_UTF8STRING_new_null())
- || (ctx->statusString == NULL))
+ || (ctx->statusString == NULL))
return 0;
ss = si->statusString; /* may be NULL */
@@ -120,7 +117,7 @@ static int is_crep_with_waiting(const OSSL_CMP_MSG *resp, int rid)
crep = ossl_cmp_certrepmessage_get0_certresponse(crepmsg, rid);
return (crep != NULL
- && ossl_cmp_pkisi_get_status(crep->status)
+ && ossl_cmp_pkisi_get_status(crep->status)
== OSSL_CMP_PKISTATUS_waiting);
}
@@ -131,13 +128,11 @@ static int is_crep_with_waiting(const OSSL_CMP_MSG *resp, int rid)
* Regardless of success, caller is responsible for freeing *rep (unless NULL).
*/
static int send_receive_check(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *req,
- OSSL_CMP_MSG **rep, int expected_type)
+ OSSL_CMP_MSG **rep, int expected_type)
{
- int begin_transaction =
- expected_type != OSSL_CMP_PKIBODY_POLLREP
+ int begin_transaction = expected_type != OSSL_CMP_PKIBODY_POLLREP
&& expected_type != OSSL_CMP_PKIBODY_PKICONF;
- const char *req_type_str =
- ossl_cmp_bodytype_to_string(OSSL_CMP_MSG_get_bodytype(req));
+ const char *req_type_str = ossl_cmp_bodytype_to_string(OSSL_CMP_MSG_get_bodytype(req));
const char *expected_type_str = ossl_cmp_bodytype_to_string(expected_type);
int bak_msg_timeout = ctx->msg_timeout;
int bt;
@@ -179,10 +174,9 @@ static int send_receive_check(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *req,
if (*rep == NULL) {
ERR_raise_data(ERR_LIB_CMP,
- ctx->total_timeout != 0 && time(NULL) >= ctx->end_time ?
- CMP_R_TOTAL_TIMEOUT : CMP_R_TRANSFER_ERROR,
- "request sent: %s, expected response: %s",
- req_type_str, expected_type_str);
+ ctx->total_timeout != 0 && time(NULL) >= ctx->end_time ? CMP_R_TOTAL_TIMEOUT : CMP_R_TRANSFER_ERROR,
+ "request sent: %s, expected response: %s",
+ req_type_str, expected_type_str);
return 0;
}
@@ -193,15 +187,15 @@ static int send_receive_check(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *req,
* the following msg verification may also produce log entries and may fail.
*/
ossl_cmp_log2(INFO, ctx, "received %s%s", ossl_cmp_bodytype_to_string(bt),
- ossl_cmp_is_error_with_waiting(*rep) ? " (waiting)" : "");
+ ossl_cmp_is_error_with_waiting(*rep) ? " (waiting)" : "");
/* copy received extraCerts to ctx->extraCertsIn so they can be retrieved */
if (bt != OSSL_CMP_PKIBODY_POLLREP && bt != OSSL_CMP_PKIBODY_PKICONF
- && !ossl_cmp_ctx_set1_extraCertsIn(ctx, (*rep)->extraCerts))
+ && !ossl_cmp_ctx_set1_extraCertsIn(ctx, (*rep)->extraCerts))
return 0;
if (!ossl_cmp_msg_check_update(ctx, *rep, unprotected_exception,
- expected_type))
+ expected_type))
return 0;
/*
@@ -213,33 +207,34 @@ static int send_receive_check(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *req,
*/
if (bt == expected_type
|| (expected_type == OSSL_CMP_PKIBODY_POLLREP
- ? bt != OSSL_CMP_PKIBODY_ERROR
- : ossl_cmp_is_error_with_waiting(*rep)))
+ ? bt != OSSL_CMP_PKIBODY_ERROR
+ : ossl_cmp_is_error_with_waiting(*rep)))
return 1;
/* received message type is not one of the expected ones (e.g., error) */
- ERR_raise(ERR_LIB_CMP, bt == OSSL_CMP_PKIBODY_ERROR ? CMP_R_RECEIVED_ERROR :
- CMP_R_UNEXPECTED_PKIBODY); /* in next line for mkerr.pl */
+ ERR_raise(ERR_LIB_CMP, bt == OSSL_CMP_PKIBODY_ERROR ? CMP_R_RECEIVED_ERROR : CMP_R_UNEXPECTED_PKIBODY); /* in next line for mkerr.pl */
if (bt != OSSL_CMP_PKIBODY_ERROR) {
ERR_add_error_data(3, "message type is '",
- ossl_cmp_bodytype_to_string(bt), "'");
+ ossl_cmp_bodytype_to_string(bt), "'");
} else {
OSSL_CMP_ERRORMSGCONTENT *emc = (*rep)->body->value.error;
OSSL_CMP_PKISI *si = emc->pKIStatusInfo;
char buf[OSSL_CMP_PKISI_BUFLEN];
if (save_statusInfo(ctx, si)
- && OSSL_CMP_CTX_snprint_PKIStatus(ctx, buf,
- sizeof(buf)) != NULL)
+ && OSSL_CMP_CTX_snprint_PKIStatus(ctx, buf,
+ sizeof(buf))
+ != NULL)
ERR_add_error_data(1, buf);
if (emc->errorCode != NULL
- && BIO_snprintf(buf, sizeof(buf), "; errorCode: %08lX",
- ASN1_INTEGER_get(emc->errorCode)) > 0)
+ && BIO_snprintf(buf, sizeof(buf), "; errorCode: %08lX",
+ ASN1_INTEGER_get(emc->errorCode))
+ > 0)
ERR_add_error_data(1, buf);
if (emc->errorDetails != NULL) {
char *text = ossl_sk_ASN1_UTF8STRING2text(emc->errorDetails, ", ",
- OSSL_CMP_PKISI_BUFLEN - 1);
+ OSSL_CMP_PKISI_BUFLEN - 1);
if (text != NULL && *text != '\0')
ERR_add_error_data(2, "; errorDetails: ", text);
@@ -271,13 +266,13 @@ static int send_receive_check(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *req,
* or a response with 'waiting' status has been received).
*/
static int poll_for_response(OSSL_CMP_CTX *ctx, int sleep, int rid,
- OSSL_CMP_MSG **rep, int *checkAfter)
+ OSSL_CMP_MSG **rep, int *checkAfter)
{
OSSL_CMP_MSG *preq = NULL;
OSSL_CMP_MSG *prep = NULL;
ossl_cmp_info(ctx,
- "received 'waiting' PKIStatus, starting to poll for response");
+ "received 'waiting' PKIStatus, starting to poll for response");
*rep = NULL;
for (;;) {
if ((preq = ossl_cmp_pollReq_new(ctx, rid)) == NULL)
@@ -306,32 +301,34 @@ static int poll_for_response(OSSL_CMP_CTX *ctx, int sleep, int rid,
ERR_raise(ERR_LIB_CMP, CMP_R_BAD_CHECKAFTER_IN_POLLREP);
goto err;
}
- if (check_after < 0 || (uint64_t)check_after
- > (sleep ? ULONG_MAX / 1000 : INT_MAX)) {
+ if (check_after < 0 || (uint64_t)check_after > (sleep ? ULONG_MAX / 1000 : INT_MAX)) {
ERR_raise(ERR_LIB_CMP, CMP_R_CHECKAFTER_OUT_OF_RANGE);
if (BIO_snprintf(str, OSSL_CMP_PKISI_BUFLEN, "value = %jd",
- check_after) >= 0)
+ check_after)
+ >= 0)
ERR_add_error_data(1, str);
goto err;
}
if (pollRep->reason == NULL
- || (len = BIO_snprintf(str, OSSL_CMP_PKISI_BUFLEN,
- " with reason = '")) < 0) {
+ || (len = BIO_snprintf(str, OSSL_CMP_PKISI_BUFLEN,
+ " with reason = '"))
+ < 0) {
*str = '\0';
} else {
char *text = ossl_sk_ASN1_UTF8STRING2text(pollRep->reason, ", ",
- sizeof(str) - len - 2);
+ sizeof(str) - len - 2);
if (text == NULL
- || BIO_snprintf(str + len, sizeof(str) - len,
- "%s'", text) < 0)
+ || BIO_snprintf(str + len, sizeof(str) - len,
+ "%s'", text)
+ < 0)
*str = '\0';
OPENSSL_free(text);
}
ossl_cmp_log2(INFO, ctx,
- "received polling response%s; checkAfter = %ld seconds",
- str, check_after);
+ "received polling response%s; checkAfter = %ld seconds",
+ str, check_after);
if (ctx->total_timeout != 0) { /* timeout is not infinite */
const int exp = OSSL_CMP_EXPECTED_RESP_TIME;
@@ -358,12 +355,12 @@ static int poll_for_response(OSSL_CMP_CTX *ctx, int sleep, int rid,
return -1; /* exits the loop */
}
} else if (is_crep_with_waiting(prep, rid)
- || ossl_cmp_is_error_with_waiting(prep)) {
+ || ossl_cmp_is_error_with_waiting(prep)) {
/* received status must not be 'waiting' */
(void)ossl_cmp_exchange_error(ctx, OSSL_CMP_PKISTATUS_rejection,
- OSSL_CMP_CTX_FAILINFO_badRequest,
- "polling already started",
- 0 /* errorCode */, NULL);
+ OSSL_CMP_CTX_FAILINFO_badRequest,
+ "polling already started",
+ 0 /* errorCode */, NULL);
ERR_raise(ERR_LIB_CMP, CMP_R_UNEXPECTED_PKISTATUS);
goto err;
} else {
@@ -380,7 +377,7 @@ static int poll_for_response(OSSL_CMP_CTX *ctx, int sleep, int rid,
*rep = prep;
return 1;
- err:
+err:
(void)ossl_cmp_ctx_set1_first_senderNonce(ctx, NULL);
OSSL_CMP_MSG_free(preq);
OSSL_CMP_MSG_free(prep);
@@ -388,7 +385,7 @@ static int poll_for_response(OSSL_CMP_CTX *ctx, int sleep, int rid,
}
static int save_senderNonce_if_waiting(OSSL_CMP_CTX *ctx,
- const OSSL_CMP_MSG *rep, int rid)
+ const OSSL_CMP_MSG *rep, int rid)
{
/*
* Lightweight CMP Profile section 4.4 states: the senderNonce of the
@@ -396,7 +393,7 @@ static int save_senderNonce_if_waiting(OSSL_CMP_CTX *ctx,
* the recipNonce of the final response to be received after polling.
*/
if ((is_crep_with_waiting(rep, rid)
- || ossl_cmp_is_error_with_waiting(rep))
+ || ossl_cmp_is_error_with_waiting(rep))
&& !ossl_cmp_ctx_set1_first_senderNonce(ctx, ctx->senderNonce))
return 0;
@@ -408,7 +405,7 @@ static int save_senderNonce_if_waiting(OSSL_CMP_CTX *ctx,
* Polling for ip/cp/kup/ with 'waiting' status is handled by cert_response().
*/
static int send_receive_also_delayed(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *req,
- OSSL_CMP_MSG **rep, int expected_type)
+ OSSL_CMP_MSG **rep, int expected_type)
{
if (!send_receive_check(ctx, req, rep, expected_type))
@@ -426,7 +423,8 @@ static int send_receive_also_delayed(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *req,
*rep = NULL;
if (poll_for_response(ctx, 1 /* can sleep */, OSSL_CMP_CERTREQID_NONE,
- rep, NULL /* checkAfter */) <= 0) {
+ rep, NULL /* checkAfter */)
+ <= 0) {
ERR_raise(ERR_LIB_CMP, CMP_R_POLLING_FAILED);
return 0;
}
@@ -443,7 +441,7 @@ static int send_receive_also_delayed(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *req,
* not modifying ctx->status during the certConf exchange
*/
int ossl_cmp_exchange_certConf(OSSL_CMP_CTX *ctx, int certReqId,
- int fail_info, const char *txt)
+ int fail_info, const char *txt)
{
OSSL_CMP_MSG *certConf;
OSSL_CMP_MSG *PKIconf = NULL;
@@ -455,9 +453,9 @@ int ossl_cmp_exchange_certConf(OSSL_CMP_CTX *ctx, int certReqId,
goto err;
res = send_receive_also_delayed(ctx, certConf, &PKIconf,
- OSSL_CMP_PKIBODY_PKICONF);
+ OSSL_CMP_PKIBODY_PKICONF);
- err:
+err:
OSSL_CMP_MSG_free(certConf);
OSSL_CMP_MSG_free(PKIconf);
return res;
@@ -465,7 +463,7 @@ int ossl_cmp_exchange_certConf(OSSL_CMP_CTX *ctx, int certReqId,
/* Send given error and check response */
int ossl_cmp_exchange_error(OSSL_CMP_CTX *ctx, int status, int fail_info,
- const char *txt, int errorCode, const char *details)
+ const char *txt, int errorCode, const char *details)
{
OSSL_CMP_MSG *error = NULL;
OSSL_CMP_PKISI *si = NULL;
@@ -480,9 +478,9 @@ int ossl_cmp_exchange_error(OSSL_CMP_CTX *ctx, int status, int fail_info,
goto err;
res = send_receive_also_delayed(ctx, error,
- &PKIconf, OSSL_CMP_PKIBODY_PKICONF);
+ &PKIconf, OSSL_CMP_PKIBODY_PKICONF);
- err:
+err:
OSSL_CMP_MSG_free(error);
OSSL_CMP_PKISI_free(si);
OSSL_CMP_MSG_free(PKIconf);
@@ -495,7 +493,7 @@ int ossl_cmp_exchange_error(OSSL_CMP_CTX *ctx, int status, int fail_info,
* Returns NULL if not found or on error.
*/
static X509 *get1_cert_status(OSSL_CMP_CTX *ctx, int bodytype,
- OSSL_CMP_CERTRESPONSE *crep)
+ OSSL_CMP_CERTRESPONSE *crep)
{
char buf[OSSL_CMP_PKISI_BUFLEN];
X509 *crt = NULL;
@@ -506,7 +504,7 @@ static X509 *get1_cert_status(OSSL_CMP_CTX *ctx, int bodytype,
switch (ossl_cmp_pkisi_get_status(crep->status)) {
case OSSL_CMP_PKISTATUS_waiting:
ossl_cmp_err(ctx,
- "received \"waiting\" status for cert when actually aiming to extract cert");
+ "received \"waiting\" status for cert when actually aiming to extract cert");
ERR_raise(ERR_LIB_CMP, CMP_R_ENCOUNTERED_WAITING);
goto err;
case OSSL_CMP_PKISTATUS_grantedWithMods:
@@ -521,11 +519,11 @@ static X509 *get1_cert_status(OSSL_CMP_CTX *ctx, int bodytype,
goto err;
case OSSL_CMP_PKISTATUS_revocationWarning:
ossl_cmp_warn(ctx,
- "received \"revocationWarning\" - a revocation of the cert is imminent");
+ "received \"revocationWarning\" - a revocation of the cert is imminent");
break;
case OSSL_CMP_PKISTATUS_revocationNotification:
ossl_cmp_warn(ctx,
- "received \"revocationNotification\" - a revocation of the cert has occurred");
+ "received \"revocationNotification\" - a revocation of the cert has occurred");
break;
case OSSL_CMP_PKISTATUS_keyUpdateWarning:
if (bodytype != OSSL_CMP_PKIBODY_KUR) {
@@ -535,8 +533,8 @@ static X509 *get1_cert_status(OSSL_CMP_CTX *ctx, int bodytype,
break;
default:
ossl_cmp_log1(ERROR, ctx,
- "received unsupported PKIStatus %d for certificate",
- ctx->status);
+ "received unsupported PKIStatus %d for certificate",
+ ctx->status);
ERR_raise(ERR_LIB_CMP, CMP_R_UNKNOWN_PKISTATUS);
goto err;
}
@@ -546,7 +544,7 @@ static X509 *get1_cert_status(OSSL_CMP_CTX *ctx, int bodytype,
return crt;
- err:
+err:
if (OSSL_CMP_CTX_snprint_PKIStatus(ctx, buf, sizeof(buf)) != NULL)
ERR_add_error_data(1, buf);
return NULL;
@@ -570,7 +568,7 @@ static X509 *get1_cert_status(OSSL_CMP_CTX *ctx, int bodytype,
* an EE must be able to validate the certificates it gets enrolled.
*/
int OSSL_CMP_certConf_cb(OSSL_CMP_CTX *ctx, X509 *cert, int fail_info,
- const char **text)
+ const char **text)
{
X509_STORE *out_trusted = OSSL_CMP_CTX_get_certConf_cb_arg(ctx);
STACK_OF(X509) *chain = NULL;
@@ -583,7 +581,7 @@ int OSSL_CMP_certConf_cb(OSSL_CMP_CTX *ctx, X509 *cert, int fail_info,
if (out_trusted == NULL) {
ossl_cmp_debug(ctx, "trying to build chain for newly enrolled cert");
chain = X509_build_chain(cert, ctx->untrusted, out_trusted,
- 0, ctx->libctx, ctx->propq);
+ 0, ctx->libctx, ctx->propq);
} else {
X509_STORE_CTX *csc = X509_STORE_CTX_new_ex(ctx->libctx, ctx->propq);
@@ -594,16 +592,16 @@ int OSSL_CMP_certConf_cb(OSSL_CMP_CTX *ctx, X509 *cert, int fail_info,
goto err;
/* disable any cert status/revocation checking etc. */
X509_VERIFY_PARAM_clear_flags(X509_STORE_CTX_get0_param(csc),
- ~(X509_V_FLAG_USE_CHECK_TIME
- | X509_V_FLAG_NO_CHECK_TIME
- | X509_V_FLAG_PARTIAL_CHAIN
- | X509_V_FLAG_POLICY_CHECK));
+ ~(X509_V_FLAG_USE_CHECK_TIME
+ | X509_V_FLAG_NO_CHECK_TIME
+ | X509_V_FLAG_PARTIAL_CHAIN
+ | X509_V_FLAG_POLICY_CHECK));
if (X509_verify_cert(csc) <= 0)
goto err;
if (!ossl_x509_add_certs_new(&chain, X509_STORE_CTX_get0_chain(csc),
- X509_ADD_FLAG_UP_REF | X509_ADD_FLAG_NO_DUP
- | X509_ADD_FLAG_NO_SS)) {
+ X509_ADD_FLAG_UP_REF | X509_ADD_FLAG_NO_DUP
+ | X509_ADD_FLAG_NO_SS)) {
sk_X509_free(chain);
chain = NULL;
}
@@ -619,14 +617,14 @@ int OSSL_CMP_certConf_cb(OSSL_CMP_CTX *ctx, X509 *cert, int fail_info,
fail_info = 1 << OSSL_CMP_PKIFAILUREINFO_incorrectData;
} else {
ossl_cmp_debug(ctx,
- "success validating newly enrolled cert");
+ "success validating newly enrolled cert");
}
} else if (chain == NULL) {
ossl_cmp_warn(ctx, "could not build approximate chain for newly enrolled cert, resorting to received extraCerts");
chain = OSSL_CMP_CTX_get1_extraCertsIn(ctx);
} else {
ossl_cmp_debug(ctx,
- "success building approximate chain for newly enrolled cert");
+ "success building approximate chain for newly enrolled cert");
}
(void)ossl_cmp_ctx_set1_newChain(ctx, chain);
OSSL_STACK_OF_X509_free(chain);
@@ -643,9 +641,9 @@ int OSSL_CMP_certConf_cb(OSSL_CMP_CTX *ctx, X509 *cert, int fail_info,
* Regardless of success, caller is responsible for freeing *resp (unless NULL).
*/
static int cert_response(OSSL_CMP_CTX *ctx, int sleep, int rid,
- OSSL_CMP_MSG **resp, int *checkAfter,
- ossl_unused int req_type,
- ossl_unused int expected_type)
+ OSSL_CMP_MSG **resp, int *checkAfter,
+ ossl_unused int req_type,
+ ossl_unused int expected_type)
{
EVP_PKEY *rkey = NULL;
int fail_info = 0; /* no failure */
@@ -662,7 +660,7 @@ static int cert_response(OSSL_CMP_CTX *ctx, int sleep, int rid,
if (!ossl_assert(ctx != NULL))
return 0;
- retry:
+retry:
rcvd_type = OSSL_CMP_MSG_get_bodytype(*resp);
if (IS_CREP(rcvd_type)) {
crepmsg = (*resp)->body->value.ip; /* same for cp and kup */
@@ -737,14 +735,14 @@ static int cert_response(OSSL_CMP_CTX *ctx, int sleep, int rid,
* to the context so that they can be retrieved if necessary
*/
if (crepmsg != NULL && crepmsg->caPubs != NULL
- && !ossl_cmp_ctx_set1_caPubs(ctx, crepmsg->caPubs))
+ && !ossl_cmp_ctx_set1_caPubs(ctx, crepmsg->caPubs))
return 0;
subj = X509_NAME_oneline(X509_get_subject_name(cert), NULL, 0);
rkey = ossl_cmp_ctx_get0_newPubkey(ctx);
if (rkey != NULL
/* X509_check_private_key() also works if rkey is just public key */
- && !(X509_check_private_key(ctx->newCert, rkey))) {
+ && !(X509_check_private_key(ctx->newCert, rkey))) {
fail_info = 1 << OSSL_CMP_PKIFAILUREINFO_incorrectData;
txt = "public key in new certificate does not match our enrollment key";
/*-
@@ -763,17 +761,17 @@ static int cert_response(OSSL_CMP_CTX *ctx, int sleep, int rid,
*/
cb = ctx->certConf_cb != NULL ? ctx->certConf_cb : OSSL_CMP_certConf_cb;
if ((fail_info = cb(ctx, ctx->newCert, fail_info, &txt)) != 0
- && txt == NULL)
+ && txt == NULL)
txt = "CMP client did not accept it";
if (fail_info != 0) /* immediately log error before any certConf exchange */
ossl_cmp_log1(ERROR, ctx,
- "rejecting newly enrolled cert with subject: %s", subj);
+ "rejecting newly enrolled cert with subject: %s", subj);
/*
* certConf exchange should better be moved to do_certreq_seq() such that
* also more low-level errors with CertReqMessages get reported to server
*/
if (!ctx->disableConfirm
- && !ossl_cmp_hdr_has_implicitConfirm((*resp)->header)) {
+ && !ossl_cmp_hdr_has_implicitConfirm((*resp)->header)) {
if (!ossl_cmp_exchange_certConf(ctx, rid, fail_info, txt))
ret = 0;
}
@@ -781,8 +779,8 @@ static int cert_response(OSSL_CMP_CTX *ctx, int sleep, int rid,
/* not throwing failure earlier as transfer_cb may call ERR_clear_error() */
if (fail_info != 0) {
ERR_raise_data(ERR_LIB_CMP, CMP_R_CERTIFICATE_NOT_ACCEPTED,
- "rejecting newly enrolled cert with subject: %s; %s",
- subj, txt);
+ "rejecting newly enrolled cert with subject: %s; %s",
+ subj, txt);
ctx->status = OSSL_CMP_PKISTATUS_rejection;
ret = 0;
}
@@ -791,8 +789,8 @@ static int cert_response(OSSL_CMP_CTX *ctx, int sleep, int rid,
}
static int initial_certreq(OSSL_CMP_CTX *ctx,
- int req_type, const OSSL_CRMF_MSG *crm,
- OSSL_CMP_MSG **p_rep, int rep_type)
+ int req_type, const OSSL_CRMF_MSG *crm,
+ OSSL_CMP_MSG **p_rep, int rep_type)
{
OSSL_CMP_MSG *req;
int res;
@@ -812,7 +810,7 @@ static int initial_certreq(OSSL_CMP_CTX *ctx,
}
int OSSL_CMP_try_certreq(OSSL_CMP_CTX *ctx, int req_type,
- const OSSL_CRMF_MSG *crm, int *checkAfter)
+ const OSSL_CRMF_MSG *crm, int *checkAfter)
{
OSSL_CMP_MSG *rep = NULL;
int is_p10 = req_type == OSSL_CMP_PKIBODY_P10CR;
@@ -834,16 +832,16 @@ int OSSL_CMP_try_certreq(OSSL_CMP_CTX *ctx, int req_type,
} else {
if (req_type < 0)
return ossl_cmp_exchange_error(ctx, OSSL_CMP_PKISTATUS_rejection,
- 0, "polling aborted",
- 0 /* errorCode */, "by application");
+ 0, "polling aborted",
+ 0 /* errorCode */, "by application");
res = poll_for_response(ctx, 0 /* no sleep */, rid, &rep, checkAfter);
if (res <= 0) /* waiting or error */
return res;
}
res = cert_response(ctx, 0 /* no sleep */, rid, &rep, checkAfter,
- req_type, rep_type);
+ req_type, rep_type);
- err:
+err:
OSSL_CMP_MSG_free(rep);
return res;
}
@@ -856,7 +854,7 @@ int OSSL_CMP_try_certreq(OSSL_CMP_CTX *ctx, int req_type,
* Returns pointer to received certificate, or NULL if none was received.
*/
X509 *OSSL_CMP_exec_certreq(OSSL_CMP_CTX *ctx, int req_type,
- const OSSL_CRMF_MSG *crm)
+ const OSSL_CRMF_MSG *crm)
{
OSSL_CMP_MSG *rep = NULL;
int is_p10 = req_type == OSSL_CMP_PKIBODY_P10CR;
@@ -880,7 +878,7 @@ X509 *OSSL_CMP_exec_certreq(OSSL_CMP_CTX *ctx, int req_type,
goto err;
result = ctx->newCert;
- err:
+err:
OSSL_CMP_MSG_free(rep);
return result;
}
@@ -951,7 +949,7 @@ int OSSL_CMP_exec_RR_ses(OSSL_CMP_CTX *ctx)
case OSSL_CMP_PKISTATUS_revocationNotification:
/* interpretation as warning or error depends on CA */
ossl_cmp_warn(ctx,
- "revocation accepted (PKIStatus=revocationNotification)");
+ "revocation accepted (PKIStatus=revocationNotification)");
ret = 1;
break;
case OSSL_CMP_PKISTATUS_waiting:
@@ -966,11 +964,9 @@ int OSSL_CMP_exec_RR_ses(OSSL_CMP_CTX *ctx)
/* check any present CertId in optional revCerts field */
if (sk_OSSL_CRMF_CERTID_num(rrep->revCerts) >= 1) {
OSSL_CRMF_CERTID *cid;
- OSSL_CRMF_CERTTEMPLATE *tmpl =
- sk_OSSL_CMP_REVDETAILS_value(rr->body->value.rr, rsid)->certDetails;
+ OSSL_CRMF_CERTTEMPLATE *tmpl = sk_OSSL_CMP_REVDETAILS_value(rr->body->value.rr, rsid)->certDetails;
const X509_NAME *issuer = OSSL_CRMF_CERTTEMPLATE_get0_issuer(tmpl);
- const ASN1_INTEGER *serial =
- OSSL_CRMF_CERTTEMPLATE_get0_serialNumber(tmpl);
+ const ASN1_INTEGER *serial = OSSL_CRMF_CERTTEMPLATE_get0_serialNumber(tmpl);
if (sk_OSSL_CRMF_CERTID_num(rrep->revCerts) != num_RevDetails) {
ERR_raise(ERR_LIB_CMP, CMP_R_WRONG_RP_COMPONENT_COUNT);
@@ -990,7 +986,8 @@ int OSSL_CMP_exec_RR_ses(OSSL_CMP_CTX *ctx)
#endif
}
if (ASN1_INTEGER_cmp(serial,
- OSSL_CRMF_CERTID_get0_serialNumber(cid)) != 0) {
+ OSSL_CRMF_CERTID_get0_serialNumber(cid))
+ != 0) {
#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
ERR_raise(ERR_LIB_CMP, CMP_R_WRONG_SERIAL_IN_RP);
ret = 0;
@@ -1006,12 +1003,12 @@ int OSSL_CMP_exec_RR_ses(OSSL_CMP_CTX *ctx)
goto err;
}
- err:
+err:
if (ret == 0
- && OSSL_CMP_CTX_snprint_PKIStatus(ctx, buf, sizeof(buf)) != NULL)
+ && OSSL_CMP_CTX_snprint_PKIStatus(ctx, buf, sizeof(buf)) != NULL)
ERR_add_error_data(1, buf);
- end:
+end:
OSSL_CMP_MSG_free(rr);
OSSL_CMP_MSG_free(rp);
return ret;
@@ -1043,7 +1040,7 @@ STACK_OF(OSSL_CMP_ITAV) *OSSL_CMP_exec_GENM_ses(OSSL_CMP_CTX *ctx)
/* received stack of itavs not to be freed with the genp */
genp->body->value.genp = NULL;
- err:
+err:
OSSL_CMP_MSG_free(genm);
OSSL_CMP_MSG_free(genp);
diff --git a/crypto/cmp/cmp_ctx.c b/crypto/cmp/cmp_ctx.c
index 25912a3237..979ce7fa97 100644
--- a/crypto/cmp/cmp_ctx.c
+++ b/crypto/cmp/cmp_ctx.c
@@ -14,15 +14,15 @@
#define DEFINE_OSSL_CMP_CTX_get0(FIELD, TYPE) \
DEFINE_OSSL_CMP_CTX_get0_NAME(FIELD, FIELD, TYPE)
-#define DEFINE_OSSL_CMP_CTX_get0_NAME(NAME, FIELD, TYPE) \
-TYPE *OSSL_CMP_CTX_get0_##NAME(const OSSL_CMP_CTX *ctx) \
-{ \
- if (ctx == NULL) { \
- ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT); \
- return NULL; \
- } \
- return ctx->FIELD; \
-}
+#define DEFINE_OSSL_CMP_CTX_get0_NAME(NAME, FIELD, TYPE) \
+ TYPE *OSSL_CMP_CTX_get0_##NAME(const OSSL_CMP_CTX *ctx) \
+ { \
+ if (ctx == NULL) { \
+ ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT); \
+ return NULL; \
+ } \
+ return ctx->FIELD; \
+ }
/*
* Get current certificate store containing trusted root CA certs
@@ -31,36 +31,36 @@ DEFINE_OSSL_CMP_CTX_get0_NAME(trusted, trusted, X509_STORE)
#define DEFINE_OSSL_set0(PREFIX, FIELD, TYPE) \
DEFINE_OSSL_set0_NAME(PREFIX, FIELD, FIELD, TYPE)
-#define DEFINE_OSSL_set0_NAME(PREFIX, NAME, FIELD, TYPE) \
-int PREFIX##_set0##_##NAME(OSSL_CMP_CTX *ctx, TYPE *val) \
-{ \
- if (ctx == NULL) { \
- ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT); \
- return 0; \
- } \
- TYPE##_free(ctx->FIELD); \
- ctx->FIELD = val; \
- return 1; \
-}
+#define DEFINE_OSSL_set0_NAME(PREFIX, NAME, FIELD, TYPE) \
+ int PREFIX##_set0##_##NAME(OSSL_CMP_CTX *ctx, TYPE *val) \
+ { \
+ if (ctx == NULL) { \
+ ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT); \
+ return 0; \
+ } \
+ TYPE##_free(ctx->FIELD); \
+ ctx->FIELD = val; \
+ return 1; \
+ }
-/*
- * Set certificate store containing trusted (root) CA certs and possibly CRLs
- * and a cert verification callback function used for CMP server authentication.
- * Any already existing store entry is freed. Given NULL, the entry is reset.
- */
-DEFINE_OSSL_set0_NAME(OSSL_CMP_CTX, trusted, trusted, X509_STORE)
+ /*
+ * Set certificate store containing trusted (root) CA certs and possibly CRLs
+ * and a cert verification callback function used for CMP server authentication.
+ * Any already existing store entry is freed. Given NULL, the entry is reset.
+ */
+ DEFINE_OSSL_set0_NAME(OSSL_CMP_CTX, trusted, trusted, X509_STORE)
-DEFINE_OSSL_CMP_CTX_get0(libctx, OSSL_LIB_CTX)
-DEFINE_OSSL_CMP_CTX_get0(propq, const char)
+ DEFINE_OSSL_CMP_CTX_get0(libctx, OSSL_LIB_CTX)
+ DEFINE_OSSL_CMP_CTX_get0(propq, const char)
-/* Get current list of non-trusted intermediate certs */
-DEFINE_OSSL_CMP_CTX_get0(untrusted, STACK_OF(X509))
+ /* Get current list of non-trusted intermediate certs */
+ DEFINE_OSSL_CMP_CTX_get0(untrusted, STACK_OF(X509))
-/*
- * Set untrusted certificates for path construction in authentication of
- * the CMP server and potentially others (TLS server, newly enrolled cert).
- */
-int OSSL_CMP_CTX_set1_untrusted(OSSL_CMP_CTX *ctx, STACK_OF(X509) *certs)
+ /*
+ * Set untrusted certificates for path construction in authentication of
+ * the CMP server and potentially others (TLS server, newly enrolled cert).
+ */
+ int OSSL_CMP_CTX_set1_untrusted(OSSL_CMP_CTX *ctx, STACK_OF(X509) *certs)
{
STACK_OF(X509) *untrusted = NULL;
@@ -69,12 +69,12 @@ int OSSL_CMP_CTX_set1_untrusted(OSSL_CMP_CTX *ctx, STACK_OF(X509) *certs)
return 0;
}
if (!ossl_x509_add_certs_new(&untrusted, certs,
- X509_ADD_FLAG_UP_REF | X509_ADD_FLAG_NO_DUP))
+ X509_ADD_FLAG_UP_REF | X509_ADD_FLAG_NO_DUP))
goto err;
OSSL_STACK_OF_X509_free(ctx->untrusted);
ctx->untrusted = untrusted;
return 1;
- err:
+err:
OSSL_STACK_OF_X509_free(untrusted);
return 0;
}
@@ -136,7 +136,7 @@ OSSL_CMP_CTX *OSSL_CMP_CTX_new(OSSL_LIB_CTX *libctx, const char *propq)
/* all other elements are initialized to 0 or NULL, respectively */
return ctx;
- err:
+err:
OSSL_CMP_CTX_free(ctx);
return NULL;
}
@@ -244,62 +244,62 @@ void OSSL_CMP_CTX_free(OSSL_CMP_CTX *ctx)
OPENSSL_free(ctx);
}
-#define DEFINE_OSSL_set(PREFIX, FIELD, TYPE) \
-int PREFIX##_set_##FIELD(OSSL_CMP_CTX *ctx, TYPE val) \
-{ \
- if (ctx == NULL) { \
- ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT); \
- return 0; \
- } \
- ctx->FIELD = val; \
- return 1; \
-}
+#define DEFINE_OSSL_set(PREFIX, FIELD, TYPE) \
+ int PREFIX##_set_##FIELD(OSSL_CMP_CTX *ctx, TYPE val) \
+ { \
+ if (ctx == NULL) { \
+ ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT); \
+ return 0; \
+ } \
+ ctx->FIELD = val; \
+ return 1; \
+ }
DEFINE_OSSL_set(ossl_cmp_ctx, status, int)
-#define DEFINE_OSSL_get(PREFIX, FIELD, TYPE, ERR_RET) \
-TYPE PREFIX##_get_##FIELD(const OSSL_CMP_CTX *ctx) \
-{ \
- if (ctx == NULL) { \
- ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT); \
- return ERR_RET; \
- } \
- return ctx->FIELD; \
-}
+#define DEFINE_OSSL_get(PREFIX, FIELD, TYPE, ERR_RET) \
+ TYPE PREFIX##_get_##FIELD(const OSSL_CMP_CTX *ctx) \
+ { \
+ if (ctx == NULL) { \
+ ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT); \
+ return ERR_RET; \
+ } \
+ return ctx->FIELD; \
+ }
-/*
- * Returns the PKIStatus from the last CertRepMessage
- * or Revocation Response or error message, -1 on error
- */
-DEFINE_OSSL_get(OSSL_CMP_CTX, status, int, -1)
+ /*
+ * Returns the PKIStatus from the last CertRepMessage
+ * or Revocation Response or error message, -1 on error
+ */
+ DEFINE_OSSL_get(OSSL_CMP_CTX, status, int, -1)
-/*
- * Returns the statusString from the last CertRepMessage
- * or Revocation Response or error message, NULL on error
- */
-DEFINE_OSSL_CMP_CTX_get0(statusString, OSSL_CMP_PKIFREETEXT)
+ /*
+ * Returns the statusString from the last CertRepMessage
+ * or Revocation Response or error message, NULL on error
+ */
+ DEFINE_OSSL_CMP_CTX_get0(statusString, OSSL_CMP_PKIFREETEXT)
-DEFINE_OSSL_set0(ossl_cmp_ctx, statusString, OSSL_CMP_PKIFREETEXT)
+ DEFINE_OSSL_set0(ossl_cmp_ctx, statusString, OSSL_CMP_PKIFREETEXT)
-/* Set callback function for checking if the cert is ok or should be rejected */
-DEFINE_OSSL_set(OSSL_CMP_CTX, certConf_cb, OSSL_CMP_certConf_cb_t)
+ /* Set callback function for checking if the cert is ok or should be rejected */
+ DEFINE_OSSL_set(OSSL_CMP_CTX, certConf_cb, OSSL_CMP_certConf_cb_t)
-/*
- * Set argument, respectively a pointer to a structure containing arguments,
- * optionally to be used by the certConf callback.
- */
-DEFINE_OSSL_set(OSSL_CMP_CTX, certConf_cb_arg, void *)
+ /*
+ * Set argument, respectively a pointer to a structure containing arguments,
+ * optionally to be used by the certConf callback.
+ */
+ DEFINE_OSSL_set(OSSL_CMP_CTX, certConf_cb_arg, void *)
-/*
- * Get argument, respectively the pointer to a structure containing arguments,
- * optionally to be used by certConf callback.
- * Returns callback argument set previously (NULL if not set or on error)
- */
-DEFINE_OSSL_get(OSSL_CMP_CTX, certConf_cb_arg, void *, NULL)
+ /*
+ * Get argument, respectively the pointer to a structure containing arguments,
+ * optionally to be used by certConf callback.
+ * Returns callback argument set previously (NULL if not set or on error)
+ */
+ DEFINE_OSSL_get(OSSL_CMP_CTX, certConf_cb_arg, void *, NULL)
#ifndef OPENSSL_NO_TRACE
-static size_t ossl_cmp_log_trace_cb(const char *buf, size_t cnt,
- int category, int cmd, void *vdata)
+ static size_t ossl_cmp_log_trace_cb(const char *buf, size_t cnt,
+ int category, int cmd, void *vdata)
{
OSSL_CMP_CTX *ctx = vdata;
const char *msg;
@@ -319,11 +319,11 @@ static size_t ossl_cmp_log_trace_cb(const char *buf, size_t cnt,
goto end; /* suppress output since severity is not sufficient */
if (!ctx->log_cb(func != NULL ? func : "(no func)",
- file != NULL ? file : "(no file)",
- line, level, msg))
+ file != NULL ? file : "(no file)",
+ line, level, msg))
cnt = 0;
- end:
+end:
OPENSSL_free(func);
OPENSSL_free(file);
return cnt;
@@ -332,8 +332,8 @@ static size_t ossl_cmp_log_trace_cb(const char *buf, size_t cnt,
/* Print CMP log messages (i.e., diagnostic info) via the log cb of the ctx */
int ossl_cmp_print_log(OSSL_CMP_severity level, const OSSL_CMP_CTX *ctx,
- const char *func, const char *file, int line,
- const char *level_str, const char *format, ...)
+ const char *func, const char *file, int line,
+ const char *level_str, const char *format, ...)
{
va_list args;
char hugebuf[1024 * 2];
@@ -359,17 +359,19 @@ int ossl_cmp_print_log(OSSL_CMP_severity level, const OSSL_CMP_CTX *ctx,
#ifndef OPENSSL_NO_TRACE
if (OSSL_TRACE_ENABLED(CMP)) {
- OSSL_TRACE_BEGIN(CMP) {
- int printed =
- BIO_snprintf(hugebuf, sizeof(hugebuf),
- "%s:%s:%d:" OSSL_CMP_LOG_PREFIX "%s: ",
- func, file, line, level_str);
+ OSSL_TRACE_BEGIN(CMP)
+ {
+ int printed = BIO_snprintf(hugebuf, sizeof(hugebuf),
+ "%s:%s:%d:" OSSL_CMP_LOG_PREFIX "%s: ",
+ func, file, line, level_str);
if (printed > 0 && (size_t)printed < sizeof(hugebuf)) {
if (BIO_vsnprintf(hugebuf + printed,
- sizeof(hugebuf) - printed, format, args) > 0)
+ sizeof(hugebuf) - printed, format, args)
+ > 0)
res = BIO_puts(trc_out, hugebuf) > 0;
}
- } OSSL_TRACE_END(CMP);
+ }
+ OSSL_TRACE_END(CMP);
}
#else /* compensate for disabled trace API */
{
@@ -393,7 +395,7 @@ int OSSL_CMP_CTX_set_log_cb(OSSL_CMP_CTX *ctx, OSSL_CMP_log_cb_t cb)
#ifndef OPENSSL_NO_TRACE
/* do also in case cb == NULL, to switch off logging output: */
if (!OSSL_trace_set_callback(OSSL_TRACE_CATEGORY_CMP,
- ossl_cmp_log_trace_cb, ctx))
+ ossl_cmp_log_trace_cb, ctx))
return 0;
#endif
@@ -413,19 +415,18 @@ void OSSL_CMP_CTX_print_errors(const OSSL_CMP_CTX *ctx)
* (i.e., the user name) when using PBMAC.
*/
int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx,
- const unsigned char *ref, int len)
+ const unsigned char *ref, int len)
{
if (ctx == NULL) {
ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT);
return 0;
}
- return
- ossl_cmp_asn1_octet_string_set1_bytes(&ctx->referenceValue, ref, len);
+ return ossl_cmp_asn1_octet_string_set1_bytes(&ctx->referenceValue, ref, len);
}
/* Set or clear the password to be used for protecting messages with PBMAC */
int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx,
- const unsigned char *sec, int len)
+ const unsigned char *sec, int len)
{
ASN1_OCTET_STRING *secretValue = NULL;
@@ -443,57 +444,57 @@ int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx,
return 1;
}
-#define DEFINE_OSSL_CMP_CTX_get1_certs(FIELD) \
-STACK_OF(X509) *OSSL_CMP_CTX_get1_##FIELD(const OSSL_CMP_CTX *ctx) \
-{ \
- if (ctx == NULL) { \
- ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT); \
- return NULL; \
- } \
- return X509_chain_up_ref(ctx->FIELD); \
-}
+#define DEFINE_OSSL_CMP_CTX_get1_certs(FIELD) \
+ STACK_OF(X509) *OSSL_CMP_CTX_get1_##FIELD(const OSSL_CMP_CTX *ctx) \
+ { \
+ if (ctx == NULL) { \
+ ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT); \
+ return NULL; \
+ } \
+ return X509_chain_up_ref(ctx->FIELD); \
+ }
/* Returns the cert chain computed by OSSL_CMP_certConf_cb(), NULL on error */
DEFINE_OSSL_CMP_CTX_get1_certs(newChain)
-#define DEFINE_OSSL_set1_certs(PREFIX, FIELD) \
-int PREFIX##_set1_##FIELD(OSSL_CMP_CTX *ctx, STACK_OF(X509) *certs) \
-{ \
- if (ctx == NULL) { \
- ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT); \
- return 0; \
- } \
- OSSL_STACK_OF_X509_free(ctx->FIELD); \
- ctx->FIELD = NULL; \
- return certs == NULL || (ctx->FIELD = X509_chain_up_ref(certs)) != NULL; \
-}
-
-/*
- * Copies any given stack of inbound X509 certificates to newChain
- * of the OSSL_CMP_CTX structure so that they may be retrieved later.
- */
-DEFINE_OSSL_set1_certs(ossl_cmp_ctx, newChain)
-
-/* Returns the stack of extraCerts received in CertRepMessage, NULL on error */
-DEFINE_OSSL_CMP_CTX_get1_certs(extraCertsIn)
-
-/*
- * Copies any given stack of inbound X509 certificates to extraCertsIn
- * of the OSSL_CMP_CTX structure so that they may be retrieved later.
- */
-DEFINE_OSSL_set1_certs(ossl_cmp_ctx, extraCertsIn)
-
-/*
- * Copies any given stack as the new stack of X509
- * certificates to send out in the extraCerts field.
- */
-DEFINE_OSSL_set1_certs(OSSL_CMP_CTX, extraCertsOut)
+#define DEFINE_OSSL_set1_certs(PREFIX, FIELD) \
+ int PREFIX##_set1_##FIELD(OSSL_CMP_CTX *ctx, STACK_OF(X509) *certs) \
+ { \
+ if (ctx == NULL) { \
+ ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT); \
+ return 0; \
+ } \
+ OSSL_STACK_OF_X509_free(ctx->FIELD); \
+ ctx->FIELD = NULL; \
+ return certs == NULL || (ctx->FIELD = X509_chain_up_ref(certs)) != NULL; \
+ }
-/*
- * Add the given policy info object
- * to the X509_EXTENSIONS of the requested certificate template.
- */
-int OSSL_CMP_CTX_push0_policy(OSSL_CMP_CTX *ctx, POLICYINFO *pinfo)
+ /*
+ * Copies any given stack of inbound X509 certificates to newChain
+ * of the OSSL_CMP_CTX structure so that they may be retrieved later.
+ */
+ DEFINE_OSSL_set1_certs(ossl_cmp_ctx, newChain)
+
+ /* Returns the stack of extraCerts received in CertRepMessage, NULL on error */
+ DEFINE_OSSL_CMP_CTX_get1_certs(extraCertsIn)
+
+ /*
+ * Copies any given stack of inbound X509 certificates to extraCertsIn
+ * of the OSSL_CMP_CTX structure so that they may be retrieved later.
+ */
+ DEFINE_OSSL_set1_certs(ossl_cmp_ctx, extraCertsIn)
+
+ /*
+ * Copies any given stack as the new stack of X509
+ * certificates to send out in the extraCerts field.
+ */
+ DEFINE_OSSL_set1_certs(OSSL_CMP_CTX, extraCertsOut)
+
+ /*
+ * Add the given policy info object
+ * to the X509_EXTENSIONS of the requested certificate template.
+ */
+ int OSSL_CMP_CTX_push0_policy(OSSL_CMP_CTX *ctx, POLICYINFO *pinfo)
{
if (ctx == NULL || pinfo == NULL) {
ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT);
@@ -501,7 +502,7 @@ int OSSL_CMP_CTX_push0_policy(OSSL_CMP_CTX *ctx, POLICYINFO *pinfo)
}
if (ctx->policies == NULL
- && (ctx->policies = CERTIFICATEPOLICIES_new()) == NULL)
+ && (ctx->policies = CERTIFICATEPOLICIES_new()) == NULL)
return 0;
return sk_POLICYINFO_push(ctx->policies, pinfo);
@@ -530,8 +531,8 @@ int OSSL_CMP_CTX_reset_geninfo_ITAVs(OSSL_CMP_CTX *ctx)
DEFINE_OSSL_CMP_CTX_get0(geninfo_ITAVs, STACK_OF(OSSL_CMP_ITAV))
-/* Add an itav for the body of outgoing general messages */
-int OSSL_CMP_CTX_push0_genm_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav)
+ /* Add an itav for the body of outgoing general messages */
+ int OSSL_CMP_CTX_push0_genm_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav)
{
if (ctx == NULL) {
ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT);
@@ -547,82 +548,82 @@ int OSSL_CMP_CTX_push0_genm_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav)
*/
DEFINE_OSSL_CMP_CTX_get1_certs(caPubs)
-/*
- * Copies any given stack of certificates to the given
- * OSSL_CMP_CTX structure so that they may be retrieved later.
- */
-DEFINE_OSSL_set1_certs(ossl_cmp_ctx, caPubs)
+ /*
+ * Copies any given stack of certificates to the given
+ * OSSL_CMP_CTX structure so that they may be retrieved later.
+ */
+ DEFINE_OSSL_set1_certs(ossl_cmp_ctx, caPubs)
#define char_dup OPENSSL_strdup
#define char_free OPENSSL_free
-#define DEFINE_OSSL_CMP_CTX_set1(FIELD, TYPE) /* this uses _dup */ \
-int OSSL_CMP_CTX_set1_##FIELD(OSSL_CMP_CTX *ctx, const TYPE *val) \
-{ \
- TYPE *val_dup = NULL; \
- \
- if (ctx == NULL) { \
- ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT); \
- return 0; \
- } \
- \
- if (val != NULL && (val_dup = TYPE##_dup(val)) == NULL) \
- return 0; \
- TYPE##_free(ctx->FIELD); \
- ctx->FIELD = val_dup; \
- return 1; \
-}
+#define DEFINE_OSSL_CMP_CTX_set1(FIELD, TYPE) /* this uses _dup */ \
+ int OSSL_CMP_CTX_set1_##FIELD(OSSL_CMP_CTX *ctx, const TYPE *val) \
+ { \
+ TYPE *val_dup = NULL; \
+ \
+ if (ctx == NULL) { \
+ ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT); \
+ return 0; \
+ } \
+ \
+ if (val != NULL && (val_dup = TYPE##_dup(val)) == NULL) \
+ return 0; \
+ TYPE##_free(ctx->FIELD); \
+ ctx->FIELD = val_dup; \
+ return 1; \
+ }
#define X509_invalid(cert) (!ossl_x509v3_cache_extensions(cert))
#define EVP_PKEY_invalid(key) 0
-#define DEFINE_OSSL_set1_up_ref(PREFIX, FIELD, TYPE) \
-int PREFIX##_set1_##FIELD(OSSL_CMP_CTX *ctx, TYPE *val) \
-{ \
- if (ctx == NULL) { \
- ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT); \
- return 0; \
- } \
- \
- /* prevent misleading error later on malformed cert or provider issue */ \
- if (val != NULL && TYPE##_invalid(val)) { \
- ERR_raise(ERR_LIB_CMP, CMP_R_POTENTIALLY_INVALID_CERTIFICATE); \
- return 0; \
- } \
- if (val != NULL && !TYPE##_up_ref(val)) \
- return 0; \
- TYPE##_free(ctx->FIELD); \
- ctx->FIELD = val; \
- return 1; \
-}
+#define DEFINE_OSSL_set1_up_ref(PREFIX, FIELD, TYPE) \
+ int PREFIX##_set1_##FIELD(OSSL_CMP_CTX *ctx, TYPE *val) \
+ { \
+ if (ctx == NULL) { \
+ ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT); \
+ return 0; \
+ } \
+ \
+ /* prevent misleading error later on malformed cert or provider issue */ \
+ if (val != NULL && TYPE##_invalid(val)) { \
+ ERR_raise(ERR_LIB_CMP, CMP_R_POTENTIALLY_INVALID_CERTIFICATE); \
+ return 0; \
+ } \
+ if (val != NULL && !TYPE##_up_ref(val)) \
+ return 0; \
+ TYPE##_free(ctx->FIELD); \
+ ctx->FIELD = val; \
+ return 1; \
+ }
-DEFINE_OSSL_set1_up_ref(ossl_cmp_ctx, validatedSrvCert, X509)
+ DEFINE_OSSL_set1_up_ref(ossl_cmp_ctx, validatedSrvCert, X509)
-/*
- * Pins the server certificate to be directly trusted (even if it is expired)
- * for verifying response messages.
- * Cert pointer is not consumed. It may be NULL to clear the entry.
- */
-DEFINE_OSSL_set1_up_ref(OSSL_CMP_CTX, srvCert, X509)
+ /*
+ * Pins the server certificate to be directly trusted (even if it is expired)
+ * for verifying response messages.
+ * Cert pointer is not consumed. It may be NULL to clear the entry.
+ */
+ DEFINE_OSSL_set1_up_ref(OSSL_CMP_CTX, srvCert, X509)
-/* Set the X509 name of the recipient to be placed in the PKIHeader */
-DEFINE_OSSL_CMP_CTX_set1(recipient, X509_NAME)
+ /* Set the X509 name of the recipient to be placed in the PKIHeader */
+ DEFINE_OSSL_CMP_CTX_set1(recipient, X509_NAME)
-/* Store the X509 name of the expected sender in the PKIHeader of responses */
-DEFINE_OSSL_CMP_CTX_set1(expected_sender, X509_NAME)
+ /* Store the X509 name of the expected sender in the PKIHeader of responses */
+ DEFINE_OSSL_CMP_CTX_set1(expected_sender, X509_NAME)
-/* Set the X509 name of the issuer to be placed in the certTemplate */
-DEFINE_OSSL_CMP_CTX_set1(issuer, X509_NAME)
+ /* Set the X509 name of the issuer to be placed in the certTemplate */
+ DEFINE_OSSL_CMP_CTX_set1(issuer, X509_NAME)
-/* Set the ASN1_INTEGER serial to be placed in the certTemplate for rr */
-DEFINE_OSSL_CMP_CTX_set1(serialNumber, ASN1_INTEGER)
-/*
- * Set the subject name that will be placed in the certificate
- * request. This will be the subject name on the received certificate.
- */
-DEFINE_OSSL_CMP_CTX_set1(subjectName, X509_NAME)
+ /* Set the ASN1_INTEGER serial to be placed in the certTemplate for rr */
+ DEFINE_OSSL_CMP_CTX_set1(serialNumber, ASN1_INTEGER)
+ /*
+ * Set the subject name that will be placed in the certificate
+ * request. This will be the subject name on the received certificate.
+ */
+ DEFINE_OSSL_CMP_CTX_set1(subjectName, X509_NAME)
-/* Set the X.509v3 certificate request extensions to be used in IR/CR/KUR */
-int OSSL_CMP_CTX_set0_reqExtensions(OSSL_CMP_CTX *ctx, X509_EXTENSIONS *exts)
+ /* Set the X.509v3 certificate request extensions to be used in IR/CR/KUR */
+ int OSSL_CMP_CTX_set0_reqExtensions(OSSL_CMP_CTX *ctx, X509_EXTENSIONS *exts)
{
if (ctx == NULL) {
ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT);
@@ -630,7 +631,7 @@ int OSSL_CMP_CTX_set0_reqExtensions(OSSL_CMP_CTX *ctx, X509_EXTENSIONS *exts)
}
if (sk_GENERAL_NAME_num(ctx->subjectAltNames) > 0 && exts != NULL
- && X509v3_get_ext_by_NID(exts, NID_subject_alt_name, -1) >= 0) {
+ && X509v3_get_ext_by_NID(exts, NID_subject_alt_name, -1) >= 0) {
ERR_raise(ERR_LIB_CMP, CMP_R_MULTIPLE_SAN_SOURCES);
return 0;
}
@@ -649,7 +650,8 @@ int OSSL_CMP_CTX_reqExtensions_have_SAN(OSSL_CMP_CTX *ctx)
/* if one of the following conditions 'fail' this is not an error */
return ctx->reqExtensions != NULL
&& X509v3_get_ext_by_NID(ctx->reqExtensions,
- NID_subject_alt_name, -1) >= 0;
+ NID_subject_alt_name, -1)
+ >= 0;
}
/*
@@ -657,7 +659,7 @@ int OSSL_CMP_CTX_reqExtensions_have_SAN(OSSL_CMP_CTX *ctx)
* request's extensions field to request subject alternative names.
*/
int OSSL_CMP_CTX_push1_subjectAltName(OSSL_CMP_CTX *ctx,
- const GENERAL_NAME *name)
+ const GENERAL_NAME *name)
{
GENERAL_NAME *name_dup;
@@ -672,7 +674,7 @@ int OSSL_CMP_CTX_push1_subjectAltName(OSSL_CMP_CTX *ctx,
}
if (ctx->subjectAltNames == NULL
- && (ctx->subjectAltNames = sk_GENERAL_NAME_new_null()) == NULL)
+ && (ctx->subjectAltNames = sk_GENERAL_NAME_new_null()) == NULL)
return 0;
if ((name_dup = GENERAL_NAME_dup(name)) == NULL)
return 0;
@@ -689,8 +691,8 @@ int OSSL_CMP_CTX_push1_subjectAltName(OSSL_CMP_CTX *ctx,
*/
DEFINE_OSSL_set1_up_ref(OSSL_CMP_CTX, cert, X509)
-int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted,
- STACK_OF(X509) *candidates)
+ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted,
+ STACK_OF(X509) *candidates)
{
STACK_OF(X509) *chain;
@@ -700,12 +702,12 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted,
}
if (!ossl_x509_add_certs_new(&ctx->untrusted, candidates,
- X509_ADD_FLAG_UP_REF | X509_ADD_FLAG_NO_DUP))
+ X509_ADD_FLAG_UP_REF | X509_ADD_FLAG_NO_DUP))
return 0;
ossl_cmp_debug(ctx, "trying to build chain for own CMP signer cert");
chain = X509_build_chain(ctx->cert, ctx->untrusted, own_trusted, 0,
- ctx->libctx, ctx->propq);
+ ctx->libctx, ctx->propq);
if (chain == NULL) {
ERR_raise(ERR_LIB_CMP, CMP_R_FAILED_BUILDING_OWN_CHAIN);
return 0;
@@ -723,29 +725,29 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted,
*/
DEFINE_OSSL_set1_up_ref(OSSL_CMP_CTX, oldCert, X509)
-/* Set the PKCS#10 CSR to be sent in P10CR */
-DEFINE_OSSL_CMP_CTX_set1(p10CSR, X509_REQ)
+ /* Set the PKCS#10 CSR to be sent in P10CR */
+ DEFINE_OSSL_CMP_CTX_set1(p10CSR, X509_REQ)
-/*
- * Set the (newly received in IP/KUP/CP) certificate in the context.
- * This only permits for one cert to be enrolled at a time.
- */
-DEFINE_OSSL_set0(ossl_cmp_ctx, newCert, X509)
+ /*
+ * Set the (newly received in IP/KUP/CP) certificate in the context.
+ * This only permits for one cert to be enrolled at a time.
+ */
+ DEFINE_OSSL_set0(ossl_cmp_ctx, newCert, X509)
-/* Get successfully validated server cert, if any, of current transaction */
-DEFINE_OSSL_CMP_CTX_get0(validatedSrvCert, X509)
+ /* Get successfully validated server cert, if any, of current transaction */
+ DEFINE_OSSL_CMP_CTX_get0(validatedSrvCert, X509)
-/*
- * Get the (newly received in IP/KUP/CP) client certificate from the context
- * This only permits for one client cert to be received...
- */
-DEFINE_OSSL_CMP_CTX_get0(newCert, X509)
+ /*
+ * Get the (newly received in IP/KUP/CP) client certificate from the context
+ * This only permits for one client cert to be received...
+ */
+ DEFINE_OSSL_CMP_CTX_get0(newCert, X509)
-/* Set the client's current private key */
-DEFINE_OSSL_set1_up_ref(OSSL_CMP_CTX, pkey, EVP_PKEY)
+ /* Set the client's current private key */
+ DEFINE_OSSL_set1_up_ref(OSSL_CMP_CTX, pkey, EVP_PKEY)
-/* Set new key pair. Used e.g. when doing Key Update */
-int OSSL_CMP_CTX_set0_newPkey(OSSL_CMP_CTX *ctx, int priv, EVP_PKEY *pkey)
+ /* Set new key pair. Used e.g. when doing Key Update */
+ int OSSL_CMP_CTX_set0_newPkey(OSSL_CMP_CTX *ctx, int priv, EVP_PKEY *pkey)
{
if (ctx == NULL) {
ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT);
@@ -789,80 +791,80 @@ EVP_PKEY *ossl_cmp_ctx_get0_newPubkey(const OSSL_CMP_CTX *ctx)
return ctx->pkey;
}
-#define DEFINE_set1_ASN1_OCTET_STRING(PREFIX, FIELD) \
-int PREFIX##_set1_##FIELD(OSSL_CMP_CTX *ctx, const ASN1_OCTET_STRING *id) \
-{ \
- if (ctx == NULL) { \
- ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT); \
- return 0; \
- } \
- return ossl_cmp_asn1_octet_string_set1(&ctx->FIELD, id); \
-}
+#define DEFINE_set1_ASN1_OCTET_STRING(PREFIX, FIELD) \
+ int PREFIX##_set1_##FIELD(OSSL_CMP_CTX *ctx, const ASN1_OCTET_STRING *id) \
+ { \
+ if (ctx == NULL) { \
+ ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT); \
+ return 0; \
+ } \
+ return ossl_cmp_asn1_octet_string_set1(&ctx->FIELD, id); \
+ }
/* Set the given transactionID to the context */
DEFINE_set1_ASN1_OCTET_STRING(OSSL_CMP_CTX, transactionID)
-/* Set the nonce to be used for the recipNonce in the message created next */
-DEFINE_set1_ASN1_OCTET_STRING(ossl_cmp_ctx, recipNonce)
+ /* Set the nonce to be used for the recipNonce in the message created next */
+ DEFINE_set1_ASN1_OCTET_STRING(ossl_cmp_ctx, recipNonce)
-/* Stores the given nonce as the last senderNonce sent out */
-DEFINE_set1_ASN1_OCTET_STRING(OSSL_CMP_CTX, senderNonce)
+ /* Stores the given nonce as the last senderNonce sent out */
+ DEFINE_set1_ASN1_OCTET_STRING(OSSL_CMP_CTX, senderNonce)
-/* store the first req sender nonce for verifying delayed delivery */
-DEFINE_set1_ASN1_OCTET_STRING(ossl_cmp_ctx, first_senderNonce)
+ /* store the first req sender nonce for verifying delayed delivery */
+ DEFINE_set1_ASN1_OCTET_STRING(ossl_cmp_ctx, first_senderNonce)
-/* Set the proxy server to use for HTTP(S) connections */
-DEFINE_OSSL_CMP_CTX_set1(proxy, char)
+ /* Set the proxy server to use for HTTP(S) connections */
+ DEFINE_OSSL_CMP_CTX_set1(proxy, char)
-/* Set the (HTTP) hostname of the CMP server */
-DEFINE_OSSL_CMP_CTX_set1(server, char)
+ /* Set the (HTTP) hostname of the CMP server */
+ DEFINE_OSSL_CMP_CTX_set1(server, char)
-/* Set the server exclusion list of the HTTP proxy server */
-DEFINE_OSSL_CMP_CTX_set1(no_proxy, char)
+ /* Set the server exclusion list of the HTTP proxy server */
+ DEFINE_OSSL_CMP_CTX_set1(no_proxy, char)
#ifndef OPENSSL_NO_HTTP
-/* Set the http connect/disconnect callback function to be used for HTTP(S) */
-DEFINE_OSSL_set(OSSL_CMP_CTX, http_cb, OSSL_HTTP_bio_cb_t)
+ /* Set the http connect/disconnect callback function to be used for HTTP(S) */
+ DEFINE_OSSL_set(OSSL_CMP_CTX, http_cb, OSSL_HTTP_bio_cb_t)
-/* Set argument optionally to be used by the http connect/disconnect callback */
-DEFINE_OSSL_set(OSSL_CMP_CTX, http_cb_arg, void *)
+ /* Set argument optionally to be used by the http connect/disconnect callback */
+ DEFINE_OSSL_set(OSSL_CMP_CTX, http_cb_arg, void *)
-/*
- * Get argument optionally to be used by the http connect/disconnect callback
- * Returns callback argument set previously (NULL if not set or on error)
- */
-DEFINE_OSSL_get(OSSL_CMP_CTX, http_cb_arg, void *, NULL)
+ /*
+ * Get argument optionally to be used by the http connect/disconnect callback
+ * Returns callback argument set previously (NULL if not set or on error)
+ */
+ DEFINE_OSSL_get(OSSL_CMP_CTX, http_cb_arg, void *, NULL)
#endif
-/* Set callback function for sending CMP request and receiving response */
-DEFINE_OSSL_set(OSSL_CMP_CTX, transfer_cb, OSSL_CMP_transfer_cb_t)
+ /* Set callback function for sending CMP request and receiving response */
+ DEFINE_OSSL_set(OSSL_CMP_CTX, transfer_cb, OSSL_CMP_transfer_cb_t)
-/* Set argument optionally to be used by the transfer callback */
-DEFINE_OSSL_set(OSSL_CMP_CTX, transfer_cb_arg, void *)
+ /* Set argument optionally to be used by the transfer callback */
+ DEFINE_OSSL_set(OSSL_CMP_CTX, transfer_cb_arg, void *)
-/*
- * Get argument optionally to be used by the transfer callback.
- * Returns callback argument set previously (NULL if not set or on error)
- */
-DEFINE_OSSL_get(OSSL_CMP_CTX, transfer_cb_arg, void *, NULL)
+ /*
+ * Get argument optionally to be used by the transfer callback.
+ * Returns callback argument set previously (NULL if not set or on error)
+ */
+ DEFINE_OSSL_get(OSSL_CMP_CTX, transfer_cb_arg, void *, NULL)
-/** Set the HTTP server port to be used */
-DEFINE_OSSL_set(OSSL_CMP_CTX, serverPort, int)
+ /** Set the HTTP server port to be used */
+ DEFINE_OSSL_set(OSSL_CMP_CTX, serverPort, int)
-/* Set the HTTP path to be used on the server (e.g "pkix/") */
-DEFINE_OSSL_CMP_CTX_set1(serverPath, char)
+ /* Set the HTTP path to be used on the server (e.g "pkix/") */
+ DEFINE_OSSL_CMP_CTX_set1(serverPath, char)
-/* Set the failInfo error code as bit encoding in OSSL_CMP_CTX */
-DEFINE_OSSL_set(ossl_cmp_ctx, failInfoCode, int)
+ /* Set the failInfo error code as bit encoding in OSSL_CMP_CTX */
+ DEFINE_OSSL_set(ossl_cmp_ctx, failInfoCode, int)
-/*
- * Get the failInfo error code in OSSL_CMP_CTX as bit encoding.
- * Returns bit string as integer on success, -1 on error
- */
-DEFINE_OSSL_get(OSSL_CMP_CTX, failInfoCode, int, -1)
+ /*
+ * Get the failInfo error code in OSSL_CMP_CTX as bit encoding.
+ * Returns bit string as integer on success, -1 on error
+ */
+ DEFINE_OSSL_get(OSSL_CMP_CTX, failInfoCode, int, -1)
-/* Set a Boolean or integer option of the context to the "val" arg */
-int OSSL_CMP_CTX_set_option(OSSL_CMP_CTX *ctx, int opt, int val)
+ /* Set a Boolean or integer option of the context to the "val" arg */
+ int OSSL_CMP_CTX_set_option(OSSL_CMP_CTX *ctx, int opt, int val)
{
int min_val;
diff --git a/crypto/cmp/cmp_err.c b/crypto/cmp/cmp_err.c
index 6d87d7b463..fe1d8b3d1d 100644
--- a/crypto/cmp/cmp_err.c
+++ b/crypto/cmp/cmp_err.c
@@ -14,193 +14,193 @@
#ifndef OPENSSL_NO_CMP
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA CMP_str_reasons[] = {
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ALGORITHM_NOT_SUPPORTED),
- "algorithm not supported"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_BAD_CHECKAFTER_IN_POLLREP),
- "bad checkafter in pollrep"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_BAD_REQUEST_ID), "bad request id"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_CERTHASH_UNMATCHED), "certhash unmatched"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_CERTID_NOT_FOUND), "certid not found"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_CERTIFICATE_NOT_ACCEPTED),
- "certificate not accepted"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_CERTIFICATE_NOT_FOUND),
- "certificate not found"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_CERTREQMSG_NOT_FOUND),
- "certreqmsg not found"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_CERTRESPONSE_NOT_FOUND),
- "certresponse not found"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_CERT_AND_KEY_DO_NOT_MATCH),
- "cert and key do not match"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_CHECKAFTER_OUT_OF_RANGE),
- "checkafter out of range"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ENCOUNTERED_KEYUPDATEWARNING),
- "encountered keyupdatewarning"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ENCOUNTERED_WAITING),
- "encountered waiting"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CALCULATING_PROTECTION),
- "error calculating protection"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CREATING_CERTCONF),
- "error creating certconf"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CREATING_CERTREP),
- "error creating certrep"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CREATING_CERTREQ),
- "error creating certreq"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CREATING_ERROR),
- "error creating error"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CREATING_GENM),
- "error creating genm"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CREATING_GENP),
- "error creating genp"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CREATING_PKICONF),
- "error creating pkiconf"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CREATING_POLLREP),
- "error creating pollrep"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CREATING_POLLREQ),
- "error creating pollreq"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CREATING_RP), "error creating rp"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CREATING_RR), "error creating rr"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_PARSING_PKISTATUS),
- "error parsing pkistatus"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_PROCESSING_MESSAGE),
- "error processing message"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_PROTECTING_MESSAGE),
- "error protecting message"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_SETTING_CERTHASH),
- "error setting certhash"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_UNEXPECTED_CERTCONF),
- "error unexpected certconf"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_VALIDATING_PROTECTION),
- "error validating protection"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_VALIDATING_SIGNATURE),
- "error validating signature"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_EXPECTED_POLLREQ), "expected pollreq"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_FAILED_BUILDING_OWN_CHAIN),
- "failed building own chain"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_FAILED_EXTRACTING_CENTRAL_GEN_KEY),
- "failed extracting central gen key"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_FAILED_EXTRACTING_PUBKEY),
- "failed extracting pubkey"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_FAILURE_OBTAINING_RANDOM),
- "failure obtaining random"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_FAIL_INFO_OUT_OF_RANGE),
- "fail info out of range"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_GENERATE_CERTREQTEMPLATE),
- "generate certreqtemplate"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_GENERATE_CRLSTATUS),
- "error creating crlstatus"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_GETTING_GENP), "getting genp"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_GET_ITAV), "get itav"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_INVALID_ARGS), "invalid args"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_INVALID_GENP), "invalid genp"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_INVALID_KEYSPEC), "invalid keyspec"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_INVALID_OPTION), "invalid option"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_INVALID_ROOTCAKEYUPDATE),
- "invalid rootcakeyupdate"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_CENTRAL_GEN_KEY),
- "missing central gen key"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_CERTID), "missing certid"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_KEY_INPUT_FOR_CREATING_PROTECTION),
- "missing key input for creating protection"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_KEY_USAGE_DIGITALSIGNATURE),
- "missing key usage digitalsignature"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_P10CSR), "missing p10csr"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_PBM_SECRET), "missing pbm secret"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_PRIVATE_KEY),
- "missing private key"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_PRIVATE_KEY_FOR_POPO),
- "missing private key for popo"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_PROTECTION), "missing protection"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_PUBLIC_KEY), "missing public key"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_REFERENCE_CERT),
- "missing reference cert"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_SECRET), "missing secret"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_SENDER_IDENTIFICATION),
- "missing sender identification"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_TRUST_ANCHOR),
- "missing trust anchor"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_TRUST_STORE),
- "missing trust store"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MULTIPLE_REQUESTS_NOT_SUPPORTED),
- "multiple requests not supported"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MULTIPLE_RESPONSES_NOT_SUPPORTED),
- "multiple responses not supported"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MULTIPLE_SAN_SOURCES),
- "multiple san sources"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_NO_STDIO), "no stdio"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_NO_SUITABLE_SENDER_CERT),
- "no suitable sender cert"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_NULL_ARGUMENT), "null argument"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_PKIBODY_ERROR), "pkibody error"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_PKISTATUSINFO_NOT_FOUND),
- "pkistatusinfo not found"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_POLLING_FAILED), "polling failed"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_POTENTIALLY_INVALID_CERTIFICATE),
- "potentially invalid certificate"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_RECEIVED_ERROR), "received error"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_RECIPNONCE_UNMATCHED),
- "recipnonce unmatched"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_REQUEST_NOT_ACCEPTED),
- "request not accepted"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_REQUEST_REJECTED_BY_SERVER),
- "request rejected by server"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_SENDER_GENERALNAME_TYPE_NOT_SUPPORTED),
- "sender generalname type not supported"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_SRVCERT_DOES_NOT_VALIDATE_MSG),
- "srvcert does not validate msg"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_TOTAL_TIMEOUT), "total timeout"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_TRANSACTIONID_UNMATCHED),
- "transactionid unmatched"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_TRANSFER_ERROR), "transfer error"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNCLEAN_CTX), "unclean ctx"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNEXPECTED_CENTRAL_GEN_KEY),
- "unexpected central gen key"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNEXPECTED_CERTPROFILE),
- "unexpected certprofile"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNEXPECTED_CRLSTATUSLIST),
- "unexpected crlstatuslist"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNEXPECTED_PKIBODY), "unexpected pkibody"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNEXPECTED_PKISTATUS),
- "unexpected pkistatus"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNEXPECTED_POLLREQ), "unexpected pollreq"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNEXPECTED_PVNO), "unexpected pvno"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNEXPECTED_SENDER), "unexpected sender"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNKNOWN_ALGORITHM_ID),
- "unknown algorithm id"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNKNOWN_CERT_TYPE), "unknown cert type"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNKNOWN_CRL_ISSUER), "unknown crl issuer"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNKNOWN_PKISTATUS), "unknown pkistatus"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNSUPPORTED_ALGORITHM),
- "unsupported algorithm"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNSUPPORTED_KEY_TYPE),
- "unsupported key type"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNSUPPORTED_PKIBODY),
- "unsupported pkibody"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNSUPPORTED_PROTECTION_ALG_DHBASEDMAC),
- "unsupported protection alg dhbasedmac"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_VALUE_TOO_LARGE), "value too large"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_VALUE_TOO_SMALL), "value too small"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_WRONG_ALGORITHM_OID),
- "wrong algorithm oid"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_WRONG_CERTID), "wrong certid"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_WRONG_CERTID_IN_RP), "wrong certid in rp"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_WRONG_PBM_VALUE), "wrong pbm value"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_WRONG_RP_COMPONENT_COUNT),
- "wrong rp component count"},
- {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_WRONG_SERIAL_IN_RP), "wrong serial in rp"},
- {0, NULL}
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ALGORITHM_NOT_SUPPORTED),
+ "algorithm not supported" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_BAD_CHECKAFTER_IN_POLLREP),
+ "bad checkafter in pollrep" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_BAD_REQUEST_ID), "bad request id" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_CERTHASH_UNMATCHED), "certhash unmatched" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_CERTID_NOT_FOUND), "certid not found" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_CERTIFICATE_NOT_ACCEPTED),
+ "certificate not accepted" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_CERTIFICATE_NOT_FOUND),
+ "certificate not found" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_CERTREQMSG_NOT_FOUND),
+ "certreqmsg not found" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_CERTRESPONSE_NOT_FOUND),
+ "certresponse not found" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_CERT_AND_KEY_DO_NOT_MATCH),
+ "cert and key do not match" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_CHECKAFTER_OUT_OF_RANGE),
+ "checkafter out of range" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ENCOUNTERED_KEYUPDATEWARNING),
+ "encountered keyupdatewarning" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ENCOUNTERED_WAITING),
+ "encountered waiting" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CALCULATING_PROTECTION),
+ "error calculating protection" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CREATING_CERTCONF),
+ "error creating certconf" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CREATING_CERTREP),
+ "error creating certrep" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CREATING_CERTREQ),
+ "error creating certreq" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CREATING_ERROR),
+ "error creating error" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CREATING_GENM),
+ "error creating genm" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CREATING_GENP),
+ "error creating genp" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CREATING_PKICONF),
+ "error creating pkiconf" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CREATING_POLLREP),
+ "error creating pollrep" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CREATING_POLLREQ),
+ "error creating pollreq" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CREATING_RP), "error creating rp" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CREATING_RR), "error creating rr" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_PARSING_PKISTATUS),
+ "error parsing pkistatus" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_PROCESSING_MESSAGE),
+ "error processing message" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_PROTECTING_MESSAGE),
+ "error protecting message" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_SETTING_CERTHASH),
+ "error setting certhash" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_UNEXPECTED_CERTCONF),
+ "error unexpected certconf" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_VALIDATING_PROTECTION),
+ "error validating protection" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_VALIDATING_SIGNATURE),
+ "error validating signature" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_EXPECTED_POLLREQ), "expected pollreq" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_FAILED_BUILDING_OWN_CHAIN),
+ "failed building own chain" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_FAILED_EXTRACTING_CENTRAL_GEN_KEY),
+ "failed extracting central gen key" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_FAILED_EXTRACTING_PUBKEY),
+ "failed extracting pubkey" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_FAILURE_OBTAINING_RANDOM),
+ "failure obtaining random" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_FAIL_INFO_OUT_OF_RANGE),
+ "fail info out of range" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_GENERATE_CERTREQTEMPLATE),
+ "generate certreqtemplate" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_GENERATE_CRLSTATUS),
+ "error creating crlstatus" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_GETTING_GENP), "getting genp" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_GET_ITAV), "get itav" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_INVALID_ARGS), "invalid args" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_INVALID_GENP), "invalid genp" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_INVALID_KEYSPEC), "invalid keyspec" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_INVALID_OPTION), "invalid option" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_INVALID_ROOTCAKEYUPDATE),
+ "invalid rootcakeyupdate" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_CENTRAL_GEN_KEY),
+ "missing central gen key" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_CERTID), "missing certid" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_KEY_INPUT_FOR_CREATING_PROTECTION),
+ "missing key input for creating protection" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_KEY_USAGE_DIGITALSIGNATURE),
+ "missing key usage digitalsignature" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_P10CSR), "missing p10csr" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_PBM_SECRET), "missing pbm secret" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_PRIVATE_KEY),
+ "missing private key" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_PRIVATE_KEY_FOR_POPO),
+ "missing private key for popo" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_PROTECTION), "missing protection" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_PUBLIC_KEY), "missing public key" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_REFERENCE_CERT),
+ "missing reference cert" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_SECRET), "missing secret" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_SENDER_IDENTIFICATION),
+ "missing sender identification" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_TRUST_ANCHOR),
+ "missing trust anchor" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_TRUST_STORE),
+ "missing trust store" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MULTIPLE_REQUESTS_NOT_SUPPORTED),
+ "multiple requests not supported" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MULTIPLE_RESPONSES_NOT_SUPPORTED),
+ "multiple responses not supported" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MULTIPLE_SAN_SOURCES),
+ "multiple san sources" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_NO_STDIO), "no stdio" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_NO_SUITABLE_SENDER_CERT),
+ "no suitable sender cert" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_NULL_ARGUMENT), "null argument" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_PKIBODY_ERROR), "pkibody error" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_PKISTATUSINFO_NOT_FOUND),
+ "pkistatusinfo not found" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_POLLING_FAILED), "polling failed" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_POTENTIALLY_INVALID_CERTIFICATE),
+ "potentially invalid certificate" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_RECEIVED_ERROR), "received error" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_RECIPNONCE_UNMATCHED),
+ "recipnonce unmatched" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_REQUEST_NOT_ACCEPTED),
+ "request not accepted" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_REQUEST_REJECTED_BY_SERVER),
+ "request rejected by server" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_SENDER_GENERALNAME_TYPE_NOT_SUPPORTED),
+ "sender generalname type not supported" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_SRVCERT_DOES_NOT_VALIDATE_MSG),
+ "srvcert does not validate msg" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_TOTAL_TIMEOUT), "total timeout" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_TRANSACTIONID_UNMATCHED),
+ "transactionid unmatched" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_TRANSFER_ERROR), "transfer error" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNCLEAN_CTX), "unclean ctx" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNEXPECTED_CENTRAL_GEN_KEY),
+ "unexpected central gen key" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNEXPECTED_CERTPROFILE),
+ "unexpected certprofile" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNEXPECTED_CRLSTATUSLIST),
+ "unexpected crlstatuslist" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNEXPECTED_PKIBODY), "unexpected pkibody" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNEXPECTED_PKISTATUS),
+ "unexpected pkistatus" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNEXPECTED_POLLREQ), "unexpected pollreq" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNEXPECTED_PVNO), "unexpected pvno" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNEXPECTED_SENDER), "unexpected sender" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNKNOWN_ALGORITHM_ID),
+ "unknown algorithm id" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNKNOWN_CERT_TYPE), "unknown cert type" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNKNOWN_CRL_ISSUER), "unknown crl issuer" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNKNOWN_PKISTATUS), "unknown pkistatus" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNSUPPORTED_ALGORITHM),
+ "unsupported algorithm" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNSUPPORTED_KEY_TYPE),
+ "unsupported key type" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNSUPPORTED_PKIBODY),
+ "unsupported pkibody" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNSUPPORTED_PROTECTION_ALG_DHBASEDMAC),
+ "unsupported protection alg dhbasedmac" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_VALUE_TOO_LARGE), "value too large" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_VALUE_TOO_SMALL), "value too small" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_WRONG_ALGORITHM_OID),
+ "wrong algorithm oid" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_WRONG_CERTID), "wrong certid" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_WRONG_CERTID_IN_RP), "wrong certid in rp" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_WRONG_PBM_VALUE), "wrong pbm value" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_WRONG_RP_COMPONENT_COUNT),
+ "wrong rp component count" },
+ { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_WRONG_SERIAL_IN_RP), "wrong serial in rp" },
+ { 0, NULL }
};
-# endif
+#endif
int ossl_err_load_CMP_strings(void)
{
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(CMP_str_reasons[0].error) == NULL)
ERR_load_strings_const(CMP_str_reasons);
-# endif
+#endif
return 1;
}
#else
diff --git a/crypto/cmp/cmp_genm.c b/crypto/cmp/cmp_genm.c
index 4028699fbc..1966be60ec 100644
--- a/crypto/cmp/cmp_genm.c
+++ b/crypto/cmp/cmp_genm.c
@@ -19,30 +19,29 @@ static const X509_VERIFY_PARAM *get0_trustedStore_vpm(const OSSL_CMP_CTX *ctx)
}
static void cert_msg(const char *func, const char *file, int lineno,
- OSSL_CMP_severity level, OSSL_CMP_CTX *ctx,
- const char *source, X509 *cert, const char *msg)
+ OSSL_CMP_severity level, OSSL_CMP_CTX *ctx,
+ const char *source, X509 *cert, const char *msg)
{
char *subj = X509_NAME_oneline(X509_get_subject_name(cert), NULL, 0);
ossl_cmp_print_log(level, ctx, func, file, lineno,
- level == OSSL_CMP_LOG_WARNING ? "WARN" : "ERR",
- "certificate from '%s' with subject '%s' %s",
- source, subj, msg);
+ level == OSSL_CMP_LOG_WARNING ? "WARN" : "ERR",
+ "certificate from '%s' with subject '%s' %s",
+ source, subj, msg);
OPENSSL_free(subj);
}
/* use |type_CA| -1 (no CA type check) or 0 (must be EE) or 1 (must be CA) */
static int ossl_X509_check(OSSL_CMP_CTX *ctx, const char *source, X509 *cert,
- int type_CA, const X509_VERIFY_PARAM *vpm)
+ int type_CA, const X509_VERIFY_PARAM *vpm)
{
uint32_t ex_flags = X509_get_extension_flags(cert);
int ret, err;
- OSSL_CMP_severity level =
- vpm == NULL ? OSSL_CMP_LOG_WARNING : OSSL_CMP_LOG_ERR;
+ OSSL_CMP_severity level = vpm == NULL ? OSSL_CMP_LOG_WARNING : OSSL_CMP_LOG_ERR;
ret = ossl_x509_check_certificate_times(vpm, cert, &err);
if (!ret) {
- const char * msg;
+ const char *msg;
switch (err) {
case X509_V_ERR_CERT_NOT_YET_VALID:
@@ -62,15 +61,15 @@ static int ossl_X509_check(OSSL_CMP_CTX *ctx, const char *source, X509 *cert,
break;
}
cert_msg(OPENSSL_FUNC, OPENSSL_FILE, OPENSSL_LINE, level, ctx,
- source, cert, msg);
+ source, cert, msg);
}
if (type_CA >= 0 && (ex_flags & EXFLAG_V1) == 0) {
int is_CA = (ex_flags & EXFLAG_CA) != 0;
if ((type_CA != 0) != is_CA) {
cert_msg(OPENSSL_FUNC, OPENSSL_FILE, OPENSSL_LINE, level, ctx,
- source, cert,
- is_CA ? "is not an EE cert" : "is not a CA cert");
+ source, cert,
+ is_CA ? "is not an EE cert" : "is not a CA cert");
ret = 0;
}
}
@@ -78,22 +77,22 @@ static int ossl_X509_check(OSSL_CMP_CTX *ctx, const char *source, X509 *cert,
}
static int ossl_X509_check_all(OSSL_CMP_CTX *ctx, const char *source,
- STACK_OF(X509) *certs,
- int type_CA, const X509_VERIFY_PARAM *vpm)
+ STACK_OF(X509) *certs,
+ int type_CA, const X509_VERIFY_PARAM *vpm)
{
int i;
int ret = 1;
for (i = 0; i < sk_X509_num(certs /* may be NULL */); i++)
ret = ossl_X509_check(ctx, source,
- sk_X509_value(certs, i), type_CA, vpm)
+ sk_X509_value(certs, i), type_CA, vpm)
&& ret; /* Having 'ret' after the '&&', all certs are checked. */
return ret;
}
static OSSL_CMP_ITAV *get_genm_itav(OSSL_CMP_CTX *ctx,
- OSSL_CMP_ITAV *req, /* gets consumed */
- int expected, const char *desc)
+ OSSL_CMP_ITAV *req, /* gets consumed */
+ int expected, const char *desc)
{
STACK_OF(OSSL_CMP_ITAV) *itavs = NULL;
int i, n;
@@ -104,7 +103,7 @@ static OSSL_CMP_ITAV *get_genm_itav(OSSL_CMP_CTX *ctx,
}
if (OSSL_CMP_CTX_get_status(ctx) != OSSL_CMP_PKISTATUS_unspecified) {
ERR_raise_data(ERR_LIB_CMP, CMP_R_UNCLEAN_CTX,
- "client context in unsuitable state; should call CMPclient_reinit() before");
+ "client context in unsuitable state; should call CMPclient_reinit() before");
goto err;
}
@@ -115,21 +114,21 @@ static OSSL_CMP_ITAV *get_genm_itav(OSSL_CMP_CTX *ctx,
if (itavs == NULL) {
if (OSSL_CMP_CTX_get_status(ctx) != OSSL_CMP_PKISTATUS_request)
ERR_raise_data(ERR_LIB_CMP, CMP_R_GETTING_GENP,
- "with infoType %s", desc);
+ "with infoType %s", desc);
return NULL;
}
if ((n = sk_OSSL_CMP_ITAV_num(itavs)) <= 0) {
ERR_raise_data(ERR_LIB_CMP, CMP_R_INVALID_GENP,
- "response on genm requesting infoType %s does not include suitable value", desc);
+ "response on genm requesting infoType %s does not include suitable value", desc);
sk_OSSL_CMP_ITAV_free(itavs);
return NULL;
}
if (n > 1)
ossl_cmp_log2(WARN, ctx,
- "response on genm contains %d ITAVs; will use the first ITAV with infoType id-it-%s",
- n, desc);
+ "response on genm contains %d ITAVs; will use the first ITAV with infoType id-it-%s",
+ n, desc);
for (i = 0; i < n; i++) {
OSSL_CMP_ITAV *itav = sk_OSSL_CMP_ITAV_shift(itavs);
ASN1_OBJECT *obj = OSSL_CMP_ITAV_get0_type(itav);
@@ -149,9 +148,9 @@ static OSSL_CMP_ITAV *get_genm_itav(OSSL_CMP_CTX *ctx,
OSSL_CMP_ITAV_free(itav);
}
ERR_raise_data(ERR_LIB_CMP, CMP_R_INVALID_GENP,
- "could not find any ITAV for %s", desc);
+ "could not find any ITAV for %s", desc);
- err:
+err:
sk_OSSL_CMP_ITAV_free(itavs);
OSSL_CMP_ITAV_free(req);
return NULL;
@@ -180,19 +179,19 @@ int OSSL_CMP_get1_caCerts(OSSL_CMP_CTX *ctx, STACK_OF(X509) **out)
goto end;
if (!ossl_X509_check_all(ctx, "genp", certs, 1 /* CA */,
- get0_trustedStore_vpm(ctx))) {
+ get0_trustedStore_vpm(ctx))) {
ret = 0;
goto end;
}
*out = sk_X509_new_reserve(NULL, sk_X509_num(certs));
if (!X509_add_certs(*out, certs,
- X509_ADD_FLAG_UP_REF | X509_ADD_FLAG_NO_DUP)) {
+ X509_ADD_FLAG_UP_REF | X509_ADD_FLAG_NO_DUP)) {
sk_X509_pop_free(*out, X509_free);
*out = NULL;
ret = 0;
}
- end:
+end:
OSSL_CMP_ITAV_free(itav);
return ret;
}
@@ -200,16 +199,15 @@ int OSSL_CMP_get1_caCerts(OSSL_CMP_CTX *ctx, STACK_OF(X509) **out)
static int selfsigned_verify_cb(int ok, X509_STORE_CTX *store_ctx)
{
if (ok == 0
- && X509_STORE_CTX_get_error_depth(store_ctx) == 0
- && X509_STORE_CTX_get_error(store_ctx)
+ && X509_STORE_CTX_get_error_depth(store_ctx) == 0
+ && X509_STORE_CTX_get_error(store_ctx)
== X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT) {
/* in this case, custom chain building */
int i;
STACK_OF(X509) *trust;
STACK_OF(X509) *chain = X509_STORE_CTX_get0_chain(store_ctx);
STACK_OF(X509) *untrusted = X509_STORE_CTX_get0_untrusted(store_ctx);
- X509_STORE_CTX_check_issued_fn check_issued =
- X509_STORE_CTX_get_check_issued(store_ctx);
+ X509_STORE_CTX_check_issued_fn check_issued = X509_STORE_CTX_get_check_issued(store_ctx);
X509 *cert = sk_X509_value(chain, 0); /* target cert */
X509 *issuer;
@@ -242,8 +240,8 @@ static int selfsigned_verify_cb(int ok, X509_STORE_CTX *store_ctx)
/* vanilla X509_verify_cert() does not support self-signed certs as target */
static int verify_ss_cert(OSSL_LIB_CTX *libctx, const char *propq,
- X509_STORE *ts, STACK_OF(X509) *untrusted,
- X509 *target)
+ X509_STORE *ts, STACK_OF(X509) *untrusted,
+ X509 *target)
{
X509_STORE_CTX *csc = NULL;
int ok = 0;
@@ -254,20 +252,20 @@ static int verify_ss_cert(OSSL_LIB_CTX *libctx, const char *propq,
}
if ((csc = X509_STORE_CTX_new_ex(libctx, propq)) == NULL
- || !X509_STORE_CTX_init(csc, ts, target, untrusted))
+ || !X509_STORE_CTX_init(csc, ts, target, untrusted))
goto err;
X509_STORE_CTX_set_verify_cb(csc, selfsigned_verify_cb);
ok = X509_verify_cert(csc) > 0;
- err:
+err:
X509_STORE_CTX_free(csc);
return ok;
}
static int
verify_ss_cert_trans(OSSL_CMP_CTX *ctx, X509 *trusted /* may be NULL */,
- X509 *trans /* the only untrusted cert, may be NULL */,
- X509 *target, const char *desc)
+ X509 *trans /* the only untrusted cert, may be NULL */,
+ X509 *target, const char *desc)
{
X509_STORE *ts = OSSL_CMP_CTX_get0_trusted(ctx);
STACK_OF(X509) *untrusted = NULL;
@@ -284,19 +282,18 @@ verify_ss_cert_trans(OSSL_CMP_CTX *ctx, X509 *trusted /* may be NULL */,
}
if (trans != NULL
- && !ossl_x509_add_cert_new(&untrusted, trans, X509_ADD_FLAG_UP_REF))
+ && !ossl_x509_add_cert_new(&untrusted, trans, X509_ADD_FLAG_UP_REF))
goto err;
res = verify_ss_cert(OSSL_CMP_CTX_get0_libctx(ctx),
- OSSL_CMP_CTX_get0_propq(ctx),
- ts, untrusted, target);
+ OSSL_CMP_CTX_get0_propq(ctx),
+ ts, untrusted, target);
if (!res)
ERR_raise_data(ERR_LIB_CMP, CMP_R_INVALID_ROOTCAKEYUPDATE,
- "failed to validate %s certificate received in genp %s",
- desc, trusted == NULL ? "using trust store"
- : "with given certificate as trust anchor");
+ "failed to validate %s certificate received in genp %s",
+ desc, trusted == NULL ? "using trust store" : "with given certificate as trust anchor");
- err:
+err:
sk_X509_pop_free(untrusted, X509_free);
if (trusted != NULL)
X509_STORE_free(ts);
@@ -304,8 +301,8 @@ verify_ss_cert_trans(OSSL_CMP_CTX *ctx, X509 *trusted /* may be NULL */,
}
int OSSL_CMP_get1_rootCaKeyUpdate(OSSL_CMP_CTX *ctx,
- const X509 *oldWithOld, X509 **newWithNew,
- X509 **newWithOld, X509 **oldWithNew)
+ const X509 *oldWithOld, X509 **newWithNew,
+ X509 **newWithOld, X509 **oldWithNew)
{
X509 *oldWithOld_copy = NULL, *my_newWithOld, *my_oldWithNew;
OSSL_CMP_ITAV *req, *itav;
@@ -324,7 +321,7 @@ int OSSL_CMP_get1_rootCaKeyUpdate(OSSL_CMP_CTX *ctx,
return 0;
if (!OSSL_CMP_ITAV_get0_rootCaKeyUpdate(itav, newWithNew,
- &my_newWithOld, &my_oldWithNew))
+ &my_newWithOld, &my_oldWithNew))
goto end;
/* no root CA cert update available */
if (*newWithNew == NULL) {
@@ -334,41 +331,39 @@ int OSSL_CMP_get1_rootCaKeyUpdate(OSSL_CMP_CTX *ctx,
if ((oldWithOld_copy = X509_dup(oldWithOld)) == NULL && oldWithOld != NULL)
goto end;
if (!verify_ss_cert_trans(ctx, oldWithOld_copy, my_newWithOld,
- *newWithNew, "newWithNew")) {
+ *newWithNew, "newWithNew")) {
ERR_raise(ERR_LIB_CMP, CMP_R_INVALID_ROOTCAKEYUPDATE);
goto end;
}
if (oldWithOld != NULL && my_oldWithNew != NULL
&& !verify_ss_cert_trans(ctx, *newWithNew, my_oldWithNew,
- oldWithOld_copy, "oldWithOld")) {
+ oldWithOld_copy, "oldWithOld")) {
ERR_raise(ERR_LIB_CMP, CMP_R_INVALID_ROOTCAKEYUPDATE);
goto end;
}
if (!X509_up_ref(*newWithNew))
goto end;
- if (newWithOld != NULL &&
- (*newWithOld = my_newWithOld) != NULL && !X509_up_ref(*newWithOld))
+ if (newWithOld != NULL && (*newWithOld = my_newWithOld) != NULL && !X509_up_ref(*newWithOld))
goto free;
- if (oldWithNew == NULL ||
- (*oldWithNew = my_oldWithNew) == NULL || X509_up_ref(*oldWithNew)) {
+ if (oldWithNew == NULL || (*oldWithNew = my_oldWithNew) == NULL || X509_up_ref(*oldWithNew)) {
res = 1;
goto end;
}
if (newWithOld != NULL)
X509_free(*newWithOld);
- free:
+free:
X509_free(*newWithNew);
- end:
+end:
OSSL_CMP_ITAV_free(itav);
X509_free(oldWithOld_copy);
return res;
}
int OSSL_CMP_get1_crlUpdate(OSSL_CMP_CTX *ctx, const X509 *crlcert,
- const X509_CRL *last_crl,
- X509_CRL **crl)
+ const X509_CRL *last_crl,
+ X509_CRL **crl)
{
OSSL_CMP_CRLSTATUS *status = NULL;
STACK_OF(OSSL_CMP_CRLSTATUS) *list = NULL;
@@ -409,8 +404,8 @@ int OSSL_CMP_get1_crlUpdate(OSSL_CMP_CTX *ctx, const X509 *crlcert,
}
if (sk_X509_CRL_num(crls) != 1) {
ERR_raise_data(ERR_LIB_CMP, CMP_R_INVALID_GENP,
- "Unexpected number of CRLs in genp: %d",
- sk_X509_CRL_num(crls));
+ "Unexpected number of CRLs in genp: %d",
+ sk_X509_CRL_num(crls));
goto end;
}
@@ -419,7 +414,7 @@ int OSSL_CMP_get1_crlUpdate(OSSL_CMP_CTX *ctx, const X509 *crlcert,
goto end;
}
res = 1;
- end:
+end:
OSSL_CMP_CRLSTATUS_free(status);
sk_OSSL_CMP_CRLSTATUS_free(list);
OSSL_CMP_ITAV_free(itav);
@@ -427,8 +422,8 @@ int OSSL_CMP_get1_crlUpdate(OSSL_CMP_CTX *ctx, const X509 *crlcert,
}
int OSSL_CMP_get1_certReqTemplate(OSSL_CMP_CTX *ctx,
- OSSL_CRMF_CERTTEMPLATE **certTemplate,
- OSSL_CMP_ATAVS **keySpec)
+ OSSL_CRMF_CERTTEMPLATE **certTemplate,
+ OSSL_CMP_ATAVS **keySpec)
{
OSSL_CMP_ITAV *req, *itav = NULL;
int res = 0;
@@ -447,14 +442,15 @@ int OSSL_CMP_get1_certReqTemplate(OSSL_CMP_CTX *ctx,
}
if ((itav = get_genm_itav(ctx, req, NID_id_it_certReqTemplate,
- "certReqTemplate")) == NULL)
+ "certReqTemplate"))
+ == NULL)
return 0;
if (!OSSL_CMP_ITAV_get1_certReqTemplate(itav, certTemplate, keySpec))
goto end;
res = 1;
- end:
+end:
OSSL_CMP_ITAV_free(itav);
return res;
}
diff --git a/crypto/cmp/cmp_hdr.c b/crypto/cmp/cmp_hdr.c
index 7915ffab2b..305ce10843 100644
--- a/crypto/cmp/cmp_hdr.c
+++ b/crypto/cmp/cmp_hdr.c
@@ -35,13 +35,12 @@ int ossl_cmp_hdr_get_pvno(const OSSL_CMP_PKIHEADER *hdr)
int ossl_cmp_hdr_get_protection_nid(const OSSL_CMP_PKIHEADER *hdr)
{
if (!ossl_assert(hdr != NULL)
- || hdr->protectionAlg == NULL)
+ || hdr->protectionAlg == NULL)
return NID_undef;
return OBJ_obj2nid(hdr->protectionAlg->algorithm);
}
-ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_transactionID(const
- OSSL_CMP_PKIHEADER *hdr)
+ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_transactionID(const OSSL_CMP_PKIHEADER *hdr)
{
if (hdr == NULL) {
ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT);
@@ -67,7 +66,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr)
}
STACK_OF(OSSL_CMP_ITAV)
- *OSSL_CMP_HDR_get0_geninfo_ITAVs(const OSSL_CMP_PKIHEADER *hdr)
+*OSSL_CMP_HDR_get0_geninfo_ITAVs(const OSSL_CMP_PKIHEADER *hdr)
{
if (hdr == NULL) {
ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT);
@@ -107,7 +106,7 @@ int ossl_cmp_hdr_update_messageTime(OSSL_CMP_PKIHEADER *hdr)
if (!ossl_assert(hdr != NULL))
return 0;
if (hdr->messageTime == NULL
- && (hdr->messageTime = ASN1_GENERALIZEDTIME_new()) == NULL)
+ && (hdr->messageTime = ASN1_GENERALIZEDTIME_new()) == NULL)
return 0;
return ASN1_GENERALIZEDTIME_set(hdr->messageTime, time(NULL)) != NULL;
}
@@ -127,7 +126,7 @@ static int set_random(ASN1_OCTET_STRING **tgt, OSSL_CMP_CTX *ctx, int len)
}
int ossl_cmp_hdr_set1_senderKID(OSSL_CMP_PKIHEADER *hdr,
- const ASN1_OCTET_STRING *senderKID)
+ const ASN1_OCTET_STRING *senderKID)
{
if (!ossl_assert(hdr != NULL))
return 0;
@@ -141,7 +140,7 @@ int ossl_cmp_hdr_push0_freeText(OSSL_CMP_PKIHEADER *hdr, ASN1_UTF8STRING *text)
return 0;
if (hdr->freeText == NULL
- && (hdr->freeText = sk_ASN1_UTF8STRING_new_null()) == NULL)
+ && (hdr->freeText = sk_ASN1_UTF8STRING_new_null()) == NULL)
return 0;
return sk_ASN1_UTF8STRING_push(hdr->freeText, text);
@@ -153,16 +152,15 @@ int ossl_cmp_hdr_push1_freeText(OSSL_CMP_PKIHEADER *hdr, ASN1_UTF8STRING *text)
return 0;
if (hdr->freeText == NULL
- && (hdr->freeText = sk_ASN1_UTF8STRING_new_null()) == NULL)
+ && (hdr->freeText = sk_ASN1_UTF8STRING_new_null()) == NULL)
return 0;
- return
- ossl_cmp_sk_ASN1_UTF8STRING_push_str(hdr->freeText, (char *)text->data,
- text->length);
+ return ossl_cmp_sk_ASN1_UTF8STRING_push_str(hdr->freeText, (char *)text->data,
+ text->length);
}
int ossl_cmp_hdr_generalInfo_push0_item(OSSL_CMP_PKIHEADER *hdr,
- OSSL_CMP_ITAV *itav)
+ OSSL_CMP_ITAV *itav)
{
if (!ossl_assert(hdr != NULL && itav != NULL))
return 0;
@@ -170,7 +168,7 @@ int ossl_cmp_hdr_generalInfo_push0_item(OSSL_CMP_PKIHEADER *hdr,
}
int ossl_cmp_hdr_generalInfo_push1_items(OSSL_CMP_PKIHEADER *hdr,
- const STACK_OF(OSSL_CMP_ITAV) *itavs)
+ const STACK_OF(OSSL_CMP_ITAV) *itavs)
{
int i;
OSSL_CMP_ITAV *itav;
@@ -202,13 +200,14 @@ int ossl_cmp_hdr_set_implicitConfirm(OSSL_CMP_PKIHEADER *hdr)
if (asn1null == NULL)
return 0;
if ((itav = OSSL_CMP_ITAV_create(OBJ_nid2obj(NID_id_it_implicitConfirm),
- asn1null)) == NULL)
+ asn1null))
+ == NULL)
goto err;
if (!ossl_cmp_hdr_generalInfo_push0_item(hdr, itav))
goto err;
return 1;
- err:
+err:
ASN1_TYPE_free(asn1null);
OSSL_CMP_ITAV_free(itav);
return 0;
@@ -228,7 +227,7 @@ int ossl_cmp_hdr_has_implicitConfirm(const OSSL_CMP_PKIHEADER *hdr)
for (i = 0; i < itavCount; i++) {
itav = sk_OSSL_CMP_ITAV_value(hdr->generalInfo, i);
if (itav != NULL
- && OBJ_obj2nid(itav->infoType) == NID_id_it_implicitConfirm)
+ && OBJ_obj2nid(itav->infoType) == NID_id_it_implicitConfirm)
return 1;
}
@@ -250,17 +249,17 @@ int ossl_cmp_hdr_set_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_PKIHEADER *hdr)
char *tid;
if (!set_random(&ctx->transactionID, ctx,
- OSSL_CMP_TRANSACTIONID_LENGTH))
+ OSSL_CMP_TRANSACTIONID_LENGTH))
return 0;
tid = i2s_ASN1_OCTET_STRING(NULL, ctx->transactionID);
if (tid != NULL)
ossl_cmp_log1(DEBUG, ctx,
- "Starting new transaction with ID=%s", tid);
+ "Starting new transaction with ID=%s", tid);
OPENSSL_free(tid);
}
return ossl_cmp_asn1_octet_string_set1(&hdr->transactionID,
- ctx->transactionID);
+ ctx->transactionID);
}
/* fill in all fields of the hdr according to the info given in ctx */
@@ -280,10 +279,9 @@ int ossl_cmp_hdr_init(OSSL_CMP_CTX *ctx, OSSL_CMP_PKIHEADER *hdr)
* If no protection cert nor oldCert nor CSR nor subject is given,
* sender name is not known to the client and thus set to NULL-DN
*/
- sender = ctx->cert != NULL ? X509_get_subject_name(ctx->cert) :
- ctx->oldCert != NULL ? X509_get_subject_name(ctx->oldCert) :
- ctx->p10CSR != NULL ? X509_REQ_get_subject_name(ctx->p10CSR) :
- ctx->subjectName;
+ sender = ctx->cert != NULL ? X509_get_subject_name(ctx->cert) : ctx->oldCert != NULL ? X509_get_subject_name(ctx->oldCert)
+ : ctx->p10CSR != NULL ? X509_REQ_get_subject_name(ctx->p10CSR)
+ : ctx->subjectName;
if (!ossl_cmp_hdr_set1_sender(hdr, sender))
return 0;
@@ -306,8 +304,8 @@ int ossl_cmp_hdr_init(OSSL_CMP_CTX *ctx, OSSL_CMP_PKIHEADER *hdr)
return 0;
if (ctx->recipNonce != NULL
- && !ossl_cmp_asn1_octet_string_set1(&hdr->recipNonce,
- ctx->recipNonce))
+ && !ossl_cmp_asn1_octet_string_set1(&hdr->recipNonce,
+ ctx->recipNonce))
return 0;
if (!ossl_cmp_hdr_set_transactionID(ctx, hdr))
@@ -338,7 +336,7 @@ int ossl_cmp_hdr_init(OSSL_CMP_CTX *ctx, OSSL_CMP_PKIHEADER *hdr)
* -- (this field is intended for human consumption)
*/
if (ctx->freeText != NULL
- && !ossl_cmp_hdr_push1_freeText(hdr, ctx->freeText))
+ && !ossl_cmp_hdr_push1_freeText(hdr, ctx->freeText))
return 0;
return 1;
diff --git a/crypto/cmp/cmp_http.c b/crypto/cmp/cmp_http.c
index 63de131407..5f42a85623 100644
--- a/crypto/cmp/cmp_http.c
+++ b/crypto/cmp/cmp_http.c
@@ -18,11 +18,11 @@ static int keep_alive(int want_keep_alive, int body_type, BIO **bios)
* Ask for persistent connection only if may need more round trips.
* Do so even with disableConfirm because polling might be needed.
*/
- && body_type != OSSL_CMP_PKIBODY_IR
- && body_type != OSSL_CMP_PKIBODY_CR
- && body_type != OSSL_CMP_PKIBODY_P10CR
- && body_type != OSSL_CMP_PKIBODY_KUR
- && body_type != OSSL_CMP_PKIBODY_POLLREQ)
+ && body_type != OSSL_CMP_PKIBODY_IR
+ && body_type != OSSL_CMP_PKIBODY_CR
+ && body_type != OSSL_CMP_PKIBODY_P10CR
+ && body_type != OSSL_CMP_PKIBODY_KUR
+ && body_type != OSSL_CMP_PKIBODY_POLLREQ)
want_keep_alive = 0;
return want_keep_alive;
}
@@ -31,7 +31,7 @@ static int keep_alive(int want_keep_alive, int body_type, BIO **bios)
* Send the PKIMessage req and on success return the response, else NULL.
*/
OSSL_CMP_MSG *OSSL_CMP_MSG_http_perform(OSSL_CMP_CTX *ctx,
- const OSSL_CMP_MSG *req)
+ const OSSL_CMP_MSG *req)
{
char server_port[32] = { '\0' };
STACK_OF(CONF_VALUE) *headers = NULL;
@@ -56,7 +56,7 @@ OSSL_CMP_MSG *OSSL_CMP_MSG_http_perform(OSSL_CMP_CTX *ctx,
if (ctx->serverPort != 0)
BIO_snprintf(server_port, sizeof(server_port), "%d", ctx->serverPort);
tls_used = ctx->tls_used >= 0 ? ctx->tls_used != 0
- : OSSL_CMP_CTX_get_http_cb_arg(ctx) != NULL; /* backward compat */
+ : OSSL_CMP_CTX_get_http_cb_arg(ctx) != NULL; /* backward compat */
if (ctx->http_ctx == NULL) { /* using existing connection or yet not set up own connection */
const char *path = ctx->serverPath;
@@ -66,26 +66,26 @@ OSSL_CMP_MSG *OSSL_CMP_MSG_http_perform(OSSL_CMP_CTX *ctx,
path++;
if (bios == NULL)
ossl_cmp_log4(DEBUG, ctx,
- "connecting to CMP server via http%s://%s:%s/%s",
- tls_used ? "s" : "", ctx->server, server_port, path);
+ "connecting to CMP server via http%s://%s:%s/%s",
+ tls_used ? "s" : "", ctx->server, server_port, path);
else
ossl_cmp_log3(DEBUG, ctx,
- "using existing connection with CMP server %s:%s and HTTP path /%s",
- ctx->server, server_port, path);
+ "using existing connection with CMP server %s:%s and HTTP path /%s",
+ ctx->server, server_port, path);
}
rsp = OSSL_HTTP_transfer(&ctx->http_ctx, ctx->server, server_port,
- ctx->serverPath, tls_used,
- ctx->proxy, ctx->no_proxy,
- bios == NULL ? NULL : bios[0] /* bio */,
- bios == NULL ? NULL : bios[1] /* rbio */,
- ctx->http_cb, OSSL_CMP_CTX_get_http_cb_arg(ctx),
- 0 /* buf_size */, headers,
- content_type_pkix, req_mem,
- content_type_pkix, 1 /* expect_asn1 */,
- OSSL_HTTP_DEFAULT_MAX_RESP_LEN,
- ctx->msg_timeout,
- keep_alive(ctx->keep_alive, req->body->type, bios));
+ ctx->serverPath, tls_used,
+ ctx->proxy, ctx->no_proxy,
+ bios == NULL ? NULL : bios[0] /* bio */,
+ bios == NULL ? NULL : bios[1] /* rbio */,
+ ctx->http_cb, OSSL_CMP_CTX_get_http_cb_arg(ctx),
+ 0 /* buf_size */, headers,
+ content_type_pkix, req_mem,
+ content_type_pkix, 1 /* expect_asn1 */,
+ OSSL_HTTP_DEFAULT_MAX_RESP_LEN,
+ ctx->msg_timeout,
+ keep_alive(ctx->keep_alive, req->body->type, bios));
BIO_free(req_mem);
res = (OSSL_CMP_MSG *)ASN1_item_d2i_bio(it, rsp, NULL);
BIO_free(rsp);
@@ -101,7 +101,7 @@ OSSL_CMP_MSG *OSSL_CMP_MSG_http_perform(OSSL_CMP_CTX *ctx,
*/
if (res != NULL)
ossl_cmp_debug(ctx, "finished reading response from CMP server");
- err:
+err:
sk_CONF_VALUE_pop_free(headers, X509V3_conf_free);
return res;
}
diff --git a/crypto/cmp/cmp_local.h b/crypto/cmp/cmp_local.h
index e4185834b5..07475d6a43 100644
--- a/crypto/cmp/cmp_local.h
+++ b/crypto/cmp/cmp_local.h
@@ -10,13 +10,13 @@
*/
#ifndef OSSL_CRYPTO_CMP_LOCAL_H
-# define OSSL_CRYPTO_CMP_LOCAL_H
+#define OSSL_CRYPTO_CMP_LOCAL_H
-# include <openssl/cmp.h>
-# include "crypto/x509.h"
-# include "internal/cryptlib.h"
+#include <openssl/cmp.h>
+#include "crypto/x509.h"
+#include "internal/cryptlib.h"
-# define IS_NULL_DN(name) (X509_NAME_get_entry(name, 0) == NULL)
+#define IS_NULL_DN(name) (X509_NAME_get_entry(name, 0) == NULL)
/*
* this structure is used to store the context for CMP sessions
@@ -43,10 +43,10 @@ struct ossl_cmp_ctx_st {
int tls_used; /* whether to use TLS for client-side HTTP connections */
/* attempts polling for a response if a 'waiting' PKIStatus is received */
time_t end_time; /* session start time + totaltimeout */
-# ifndef OPENSSL_NO_HTTP
+#ifndef OPENSSL_NO_HTTP
OSSL_HTTP_bio_cb_t http_cb;
void *http_cb_arg; /* allows to store optional argument to cb */
-# endif
+#endif
/* server authentication */
/*
@@ -809,63 +809,63 @@ int ossl_cmp_asn1_get_int(const ASN1_INTEGER *a);
/* from cmp_util.c */
const char *ossl_cmp_log_parse_metadata(const char *buf,
- OSSL_CMP_severity *level, char **func,
- char **file, int *line);
-# define ossl_cmp_add_error_data(txt) ERR_add_error_txt(" : ", txt)
-# define ossl_cmp_add_error_line(txt) ERR_add_error_txt("\n", txt)
+ OSSL_CMP_severity *level, char **func,
+ char **file, int *line);
+#define ossl_cmp_add_error_data(txt) ERR_add_error_txt(" : ", txt)
+#define ossl_cmp_add_error_line(txt) ERR_add_error_txt("\n", txt)
/* The two functions manipulating X509_STORE could be generally useful */
int ossl_cmp_X509_STORE_add1_certs(X509_STORE *store, STACK_OF(X509) *certs,
- int only_self_issued);
+ int only_self_issued);
STACK_OF(X509) *ossl_cmp_X509_STORE_get1_certs(X509_STORE *store);
int ossl_cmp_sk_ASN1_UTF8STRING_push_str(STACK_OF(ASN1_UTF8STRING) *sk,
- const char *text, int len);
+ const char *text, int len);
int ossl_cmp_asn1_octet_string_set1(ASN1_OCTET_STRING **tgt,
- const ASN1_OCTET_STRING *src);
+ const ASN1_OCTET_STRING *src);
int ossl_cmp_asn1_octet_string_set1_bytes(ASN1_OCTET_STRING **tgt,
- const unsigned char *bytes, int len);
+ const unsigned char *bytes, int len);
/* from cmp_ctx.c */
int ossl_cmp_print_log(OSSL_CMP_severity level, const OSSL_CMP_CTX *ctx,
- const char *func, const char *file, int line,
- const char *level_str, const char *format, ...);
-# define ossl_cmp_log(level, ctx, msg) \
+ const char *func, const char *file, int line,
+ const char *level_str, const char *format, ...);
+#define ossl_cmp_log(level, ctx, msg) \
ossl_cmp_print_log(OSSL_CMP_LOG_##level, ctx, OPENSSL_FUNC, OPENSSL_FILE, \
- OPENSSL_LINE, #level, "%s", msg)
-# define ossl_cmp_log1(level, ctx, fmt, arg1) \
+ OPENSSL_LINE, #level, "%s", msg)
+#define ossl_cmp_log1(level, ctx, fmt, arg1) \
ossl_cmp_print_log(OSSL_CMP_LOG_##level, ctx, OPENSSL_FUNC, OPENSSL_FILE, \
- OPENSSL_LINE, #level, fmt, arg1)
-# define ossl_cmp_log2(level, ctx, fmt, arg1, arg2) \
+ OPENSSL_LINE, #level, fmt, arg1)
+#define ossl_cmp_log2(level, ctx, fmt, arg1, arg2) \
ossl_cmp_print_log(OSSL_CMP_LOG_##level, ctx, OPENSSL_FUNC, OPENSSL_FILE, \
- OPENSSL_LINE, #level, fmt, arg1, arg2)
-# define ossl_cmp_log3(level, ctx, fmt, arg1, arg2, arg3) \
+ OPENSSL_LINE, #level, fmt, arg1, arg2)
+#define ossl_cmp_log3(level, ctx, fmt, arg1, arg2, arg3) \
ossl_cmp_print_log(OSSL_CMP_LOG_##level, ctx, OPENSSL_FUNC, OPENSSL_FILE, \
- OPENSSL_LINE, #level, fmt, arg1, arg2, arg3)
-# define ossl_cmp_log4(level, ctx, fmt, arg1, arg2, arg3, arg4) \
+ OPENSSL_LINE, #level, fmt, arg1, arg2, arg3)
+#define ossl_cmp_log4(level, ctx, fmt, arg1, arg2, arg3, arg4) \
ossl_cmp_print_log(OSSL_CMP_LOG_##level, ctx, OPENSSL_FUNC, OPENSSL_FILE, \
- OPENSSL_LINE, #level, fmt, arg1, arg2, arg3, arg4)
-# define OSSL_CMP_LOG_ERROR OSSL_CMP_LOG_ERR
-# define OSSL_CMP_LOG_WARN OSSL_CMP_LOG_WARNING
-# define ossl_cmp_alert(ctx, msg) ossl_cmp_log(ALERT, ctx, msg)
-# define ossl_cmp_err(ctx, msg) ossl_cmp_log(ERROR, ctx, msg)
-# define ossl_cmp_warn(ctx, msg) ossl_cmp_log(WARN, ctx, msg)
-# define ossl_cmp_info(ctx, msg) ossl_cmp_log(INFO, ctx, msg)
-# define ossl_cmp_debug(ctx, msg) ossl_cmp_log(DEBUG, ctx, msg)
-# define ossl_cmp_trace(ctx, msg) ossl_cmp_log(TRACE, ctx, msg)
+ OPENSSL_LINE, #level, fmt, arg1, arg2, arg3, arg4)
+#define OSSL_CMP_LOG_ERROR OSSL_CMP_LOG_ERR
+#define OSSL_CMP_LOG_WARN OSSL_CMP_LOG_WARNING
+#define ossl_cmp_alert(ctx, msg) ossl_cmp_log(ALERT, ctx, msg)
+#define ossl_cmp_err(ctx, msg) ossl_cmp_log(ERROR, ctx, msg)
+#define ossl_cmp_warn(ctx, msg) ossl_cmp_log(WARN, ctx, msg)
+#define ossl_cmp_info(ctx, msg) ossl_cmp_log(INFO, ctx, msg)
+#define ossl_cmp_debug(ctx, msg) ossl_cmp_log(DEBUG, ctx, msg)
+#define ossl_cmp_trace(ctx, msg) ossl_cmp_log(TRACE, ctx, msg)
int ossl_cmp_ctx_set1_validatedSrvCert(OSSL_CMP_CTX *ctx, X509 *cert);
int ossl_cmp_ctx_set_status(OSSL_CMP_CTX *ctx, int status);
int ossl_cmp_ctx_set0_statusString(OSSL_CMP_CTX *ctx,
- OSSL_CMP_PKIFREETEXT *text);
+ OSSL_CMP_PKIFREETEXT *text);
int ossl_cmp_ctx_set_failInfoCode(OSSL_CMP_CTX *ctx, int fail_info);
int ossl_cmp_ctx_set0_newCert(OSSL_CMP_CTX *ctx, X509 *cert);
int ossl_cmp_ctx_set1_newChain(OSSL_CMP_CTX *ctx, STACK_OF(X509) *newChain);
int ossl_cmp_ctx_set1_caPubs(OSSL_CMP_CTX *ctx, STACK_OF(X509) *caPubs);
int ossl_cmp_ctx_set1_extraCertsIn(OSSL_CMP_CTX *ctx,
- STACK_OF(X509) *extraCertsIn);
+ STACK_OF(X509) *extraCertsIn);
int ossl_cmp_ctx_set1_recipNonce(OSSL_CMP_CTX *ctx,
- const ASN1_OCTET_STRING *nonce);
+ const ASN1_OCTET_STRING *nonce);
EVP_PKEY *ossl_cmp_ctx_get0_newPubkey(const OSSL_CMP_CTX *ctx);
int ossl_cmp_ctx_set1_first_senderNonce(OSSL_CMP_CTX *ctx,
- const ASN1_OCTET_STRING *nonce);
+ const ASN1_OCTET_STRING *nonce);
/* from cmp_status.c */
int ossl_cmp_pkisi_get_status(const OSSL_CMP_PKISI *si);
@@ -884,104 +884,104 @@ int ossl_cmp_hdr_set1_sender(OSSL_CMP_PKIHEADER *hdr, const X509_NAME *nm);
int ossl_cmp_hdr_set1_recipient(OSSL_CMP_PKIHEADER *hdr, const X509_NAME *nm);
int ossl_cmp_hdr_update_messageTime(OSSL_CMP_PKIHEADER *hdr);
int ossl_cmp_hdr_set1_senderKID(OSSL_CMP_PKIHEADER *hdr,
- const ASN1_OCTET_STRING *senderKID);
+ const ASN1_OCTET_STRING *senderKID);
int ossl_cmp_hdr_push0_freeText(OSSL_CMP_PKIHEADER *hdr, ASN1_UTF8STRING *text);
int ossl_cmp_hdr_push1_freeText(OSSL_CMP_PKIHEADER *hdr, ASN1_UTF8STRING *text);
int ossl_cmp_hdr_generalInfo_push0_item(OSSL_CMP_PKIHEADER *hdr,
- OSSL_CMP_ITAV *itav);
+ OSSL_CMP_ITAV *itav);
int ossl_cmp_hdr_generalInfo_push1_items(OSSL_CMP_PKIHEADER *hdr,
- const STACK_OF(OSSL_CMP_ITAV) *itavs);
+ const STACK_OF(OSSL_CMP_ITAV) *itavs);
int ossl_cmp_hdr_set_implicitConfirm(OSSL_CMP_PKIHEADER *hdr);
int ossl_cmp_hdr_has_implicitConfirm(const OSSL_CMP_PKIHEADER *hdr);
-# define OSSL_CMP_TRANSACTIONID_LENGTH 16
-# define OSSL_CMP_SENDERNONCE_LENGTH 16
+#define OSSL_CMP_TRANSACTIONID_LENGTH 16
+#define OSSL_CMP_SENDERNONCE_LENGTH 16
int ossl_cmp_hdr_set_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_PKIHEADER *hdr);
int ossl_cmp_hdr_init(OSSL_CMP_CTX *ctx, OSSL_CMP_PKIHEADER *hdr);
/* from cmp_msg.c */
/* OSSL_CMP_MSG bodytype ASN.1 choice IDs */
-# define OSSL_CMP_PKIBODY_IR 0
-# define OSSL_CMP_PKIBODY_IP 1
-# define OSSL_CMP_PKIBODY_CR 2
-# define OSSL_CMP_PKIBODY_CP 3
-# define OSSL_CMP_PKIBODY_P10CR 4
-# define OSSL_CMP_PKIBODY_POPDECC 5
-# define OSSL_CMP_PKIBODY_POPDECR 6
-# define OSSL_CMP_PKIBODY_KUR 7
-# define OSSL_CMP_PKIBODY_KUP 8
-# define OSSL_CMP_PKIBODY_KRR 9
-# define OSSL_CMP_PKIBODY_KRP 10
-# define OSSL_CMP_PKIBODY_RR 11
-# define OSSL_CMP_PKIBODY_RP 12
-# define OSSL_CMP_PKIBODY_CCR 13
-# define OSSL_CMP_PKIBODY_CCP 14
-# define OSSL_CMP_PKIBODY_CKUANN 15
-# define OSSL_CMP_PKIBODY_CANN 16
-# define OSSL_CMP_PKIBODY_RANN 17
-# define OSSL_CMP_PKIBODY_CRLANN 18
-# define OSSL_CMP_PKIBODY_PKICONF 19
-# define OSSL_CMP_PKIBODY_NESTED 20
-# define OSSL_CMP_PKIBODY_GENM 21
-# define OSSL_CMP_PKIBODY_GENP 22
-# define OSSL_CMP_PKIBODY_ERROR 23
-# define OSSL_CMP_PKIBODY_CERTCONF 24
-# define OSSL_CMP_PKIBODY_POLLREQ 25
-# define OSSL_CMP_PKIBODY_POLLREP 26
-# define OSSL_CMP_PKIBODY_TYPE_MAX OSSL_CMP_PKIBODY_POLLREP
+#define OSSL_CMP_PKIBODY_IR 0
+#define OSSL_CMP_PKIBODY_IP 1
+#define OSSL_CMP_PKIBODY_CR 2
+#define OSSL_CMP_PKIBODY_CP 3
+#define OSSL_CMP_PKIBODY_P10CR 4
+#define OSSL_CMP_PKIBODY_POPDECC 5
+#define OSSL_CMP_PKIBODY_POPDECR 6
+#define OSSL_CMP_PKIBODY_KUR 7
+#define OSSL_CMP_PKIBODY_KUP 8
+#define OSSL_CMP_PKIBODY_KRR 9
+#define OSSL_CMP_PKIBODY_KRP 10
+#define OSSL_CMP_PKIBODY_RR 11
+#define OSSL_CMP_PKIBODY_RP 12
+#define OSSL_CMP_PKIBODY_CCR 13
+#define OSSL_CMP_PKIBODY_CCP 14
+#define OSSL_CMP_PKIBODY_CKUANN 15
+#define OSSL_CMP_PKIBODY_CANN 16
+#define OSSL_CMP_PKIBODY_RANN 17
+#define OSSL_CMP_PKIBODY_CRLANN 18
+#define OSSL_CMP_PKIBODY_PKICONF 19
+#define OSSL_CMP_PKIBODY_NESTED 20
+#define OSSL_CMP_PKIBODY_GENM 21
+#define OSSL_CMP_PKIBODY_GENP 22
+#define OSSL_CMP_PKIBODY_ERROR 23
+#define OSSL_CMP_PKIBODY_CERTCONF 24
+#define OSSL_CMP_PKIBODY_POLLREQ 25
+#define OSSL_CMP_PKIBODY_POLLREP 26
+#define OSSL_CMP_PKIBODY_TYPE_MAX OSSL_CMP_PKIBODY_POLLREP
/* certReqId for the first - and so far only - certificate request */
-# define OSSL_CMP_CERTREQID 0
-# define OSSL_CMP_CERTREQID_NONE -1
-# define OSSL_CMP_CERTREQID_INVALID -2
+#define OSSL_CMP_CERTREQID 0
+#define OSSL_CMP_CERTREQID_NONE -1
+#define OSSL_CMP_CERTREQID_INVALID -2
/* sequence id for the first - and so far only - revocation request */
-# define OSSL_CMP_REVREQSID 0
+#define OSSL_CMP_REVREQSID 0
int ossl_cmp_msg_set0_libctx(OSSL_CMP_MSG *msg, OSSL_LIB_CTX *libctx,
- const char *propq);
+ const char *propq);
const char *ossl_cmp_bodytype_to_string(int type);
int ossl_cmp_msg_set_bodytype(OSSL_CMP_MSG *msg, int type);
OSSL_CMP_MSG *ossl_cmp_msg_create(OSSL_CMP_CTX *ctx, int bodytype);
OSSL_CMP_MSG *ossl_cmp_certreq_new(OSSL_CMP_CTX *ctx, int bodytype,
- const OSSL_CRMF_MSG *crm);
+ const OSSL_CRMF_MSG *crm);
OSSL_CMP_MSG *ossl_cmp_certrep_new(OSSL_CMP_CTX *ctx, int bodytype,
- int certReqId, const OSSL_CMP_PKISI *si,
- X509 *cert, const EVP_PKEY *pkey,
- const X509 *encryption_recip,
- STACK_OF(X509) *chain, STACK_OF(X509) *caPubs,
- int unprotectedErrors);
+ int certReqId, const OSSL_CMP_PKISI *si,
+ X509 *cert, const EVP_PKEY *pkey,
+ const X509 *encryption_recip,
+ STACK_OF(X509) *chain, STACK_OF(X509) *caPubs,
+ int unprotectedErrors);
OSSL_CMP_MSG *ossl_cmp_rr_new(OSSL_CMP_CTX *ctx);
OSSL_CMP_MSG *ossl_cmp_rp_new(OSSL_CMP_CTX *ctx, const OSSL_CMP_PKISI *si,
- const OSSL_CRMF_CERTID *cid,
- int unprotectedErrors);
+ const OSSL_CRMF_CERTID *cid,
+ int unprotectedErrors);
OSSL_CMP_MSG *ossl_cmp_pkiconf_new(OSSL_CMP_CTX *ctx);
OSSL_CMP_MSG *ossl_cmp_pollRep_new(OSSL_CMP_CTX *ctx, int crid,
- int64_t poll_after);
+ int64_t poll_after);
int ossl_cmp_msg_gen_push0_ITAV(OSSL_CMP_MSG *msg, OSSL_CMP_ITAV *itav);
int ossl_cmp_msg_gen_push1_ITAVs(OSSL_CMP_MSG *msg,
- const STACK_OF(OSSL_CMP_ITAV) *itavs);
+ const STACK_OF(OSSL_CMP_ITAV) *itavs);
OSSL_CMP_MSG *ossl_cmp_genm_new(OSSL_CMP_CTX *ctx);
OSSL_CMP_MSG *ossl_cmp_genp_new(OSSL_CMP_CTX *ctx,
- const STACK_OF(OSSL_CMP_ITAV) *itavs);
+ const STACK_OF(OSSL_CMP_ITAV) *itavs);
OSSL_CMP_MSG *ossl_cmp_error_new(OSSL_CMP_CTX *ctx, const OSSL_CMP_PKISI *si,
- int64_t errorCode, const char *details,
- int unprotected);
+ int64_t errorCode, const char *details,
+ int unprotected);
int ossl_cmp_certstatus_set0_certHash(OSSL_CMP_CERTSTATUS *certStatus,
- ASN1_OCTET_STRING *hash);
+ ASN1_OCTET_STRING *hash);
OSSL_CMP_MSG *ossl_cmp_certConf_new(OSSL_CMP_CTX *ctx, int certReqId,
- int fail_info, const char *text);
+ int fail_info, const char *text);
OSSL_CMP_MSG *ossl_cmp_pollReq_new(OSSL_CMP_CTX *ctx, int crid);
OSSL_CMP_MSG *ossl_cmp_pollRep_new(OSSL_CMP_CTX *ctx, int crid,
- int64_t poll_after);
+ int64_t poll_after);
OSSL_CMP_PKISI *
ossl_cmp_revrepcontent_get_pkisi(OSSL_CMP_REVREPCONTENT *rrep, int rsid);
OSSL_CRMF_CERTID *ossl_cmp_revrepcontent_get_CertId(OSSL_CMP_REVREPCONTENT *rc,
- int rsid);
+ int rsid);
OSSL_CMP_POLLREP *
ossl_cmp_pollrepcontent_get0_pollrep(const OSSL_CMP_POLLREPCONTENT *prc,
- int rid);
+ int rid);
OSSL_CMP_CERTRESPONSE *
ossl_cmp_certrepmessage_get0_certresponse(const OSSL_CMP_CERTREPMESSAGE *crm,
- int rid);
+ int rid);
X509 *ossl_cmp_certresponse_get1_cert(const OSSL_CMP_CTX *ctx,
- const OSSL_CMP_CERTRESPONSE *crep);
+ const OSSL_CMP_CERTRESPONSE *crep);
OSSL_CMP_MSG *ossl_cmp_msg_load(const char *file);
int ossl_cmp_is_error_with_waiting(const OSSL_CMP_MSG *msg);
@@ -989,26 +989,26 @@ int ossl_cmp_is_error_with_waiting(const OSSL_CMP_MSG *msg);
void ossl_cmp_set_own_chain(OSSL_CMP_CTX *ctx);
int ossl_cmp_msg_add_extraCerts(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
ASN1_BIT_STRING *ossl_cmp_calc_protection(const OSSL_CMP_CTX *ctx,
- const OSSL_CMP_MSG *msg);
+ const OSSL_CMP_MSG *msg);
int ossl_cmp_msg_protect(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
/* from cmp_vfy.c */
typedef int (*ossl_cmp_allow_unprotected_cb_t)(const OSSL_CMP_CTX *ctx,
- const OSSL_CMP_MSG *msg,
- int invalid_protection, int arg);
+ const OSSL_CMP_MSG *msg,
+ int invalid_protection, int arg);
int ossl_cmp_msg_check_update(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg,
- ossl_cmp_allow_unprotected_cb_t cb, int cb_arg);
+ ossl_cmp_allow_unprotected_cb_t cb, int cb_arg);
int ossl_cmp_msg_check_received(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg,
- ossl_cmp_allow_unprotected_cb_t cb, int cb_arg);
+ ossl_cmp_allow_unprotected_cb_t cb, int cb_arg);
int ossl_cmp_verify_popo(const OSSL_CMP_CTX *ctx,
- const OSSL_CMP_MSG *msg, int accept_RAVerified);
+ const OSSL_CMP_MSG *msg, int accept_RAVerified);
/* from cmp_client.c */
/* expected max time per msg round trip, used for last try during polling: */
-# define OSSL_CMP_EXPECTED_RESP_TIME 2
+#define OSSL_CMP_EXPECTED_RESP_TIME 2
int ossl_cmp_exchange_certConf(OSSL_CMP_CTX *ctx, int certReqId,
- int fail_info, const char *txt);
+ int fail_info, const char *txt);
int ossl_cmp_exchange_error(OSSL_CMP_CTX *ctx, int status, int fail_info,
- const char *txt, int errorCode, const char *detail);
+ const char *txt, int errorCode, const char *detail);
#endif /* !defined(OSSL_CRYPTO_CMP_LOCAL_H) */
diff --git a/crypto/cmp/cmp_msg.c b/crypto/cmp/cmp_msg.c
index 4e3a4c8ad2..c72a7e09cd 100644
--- a/crypto/cmp/cmp_msg.c
+++ b/crypto/cmp/cmp_msg.c
@@ -20,7 +20,7 @@ OSSL_CMP_MSG *OSSL_CMP_MSG_new(OSSL_LIB_CTX *libctx, const char *propq)
OSSL_CMP_MSG *msg = NULL;
msg = (OSSL_CMP_MSG *)ASN1_item_new_ex(ASN1_ITEM_rptr(OSSL_CMP_MSG),
- libctx, propq);
+ libctx, propq);
if (!ossl_cmp_msg_set0_libctx(msg, libctx, propq)) {
OSSL_CMP_MSG_free(msg);
msg = NULL;
@@ -39,7 +39,7 @@ void OSSL_CMP_MSG_free(OSSL_CMP_MSG *msg)
* Use OSSL_CMP_MSG_new() instead if possible.
*/
int ossl_cmp_msg_set0_libctx(OSSL_CMP_MSG *msg, OSSL_LIB_CTX *libctx,
- const char *propq)
+ const char *propq)
{
if (msg != NULL) {
msg->libctx = libctx;
@@ -66,11 +66,33 @@ OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg)
const char *ossl_cmp_bodytype_to_string(int type)
{
static const char *const type_names[] = {
- "IR", "IP", "CR", "CP", "P10CR",
- "POPDECC", "POPDECR", "KUR", "KUP",
- "KRR", "KRP", "RR", "RP", "CCR", "CCP",
- "CKUANN", "CANN", "RANN", "CRLANN", "PKICONF", "NESTED",
- "GENM", "GENP", "ERROR", "CERTCONF", "POLLREQ", "POLLREP",
+ "IR",
+ "IP",
+ "CR",
+ "CP",
+ "P10CR",
+ "POPDECC",
+ "POPDECR",
+ "KUR",
+ "KUP",
+ "KRR",
+ "KRP",
+ "RR",
+ "RP",
+ "CCR",
+ "CCP",
+ "CKUANN",
+ "CANN",
+ "RANN",
+ "CRLANN",
+ "PKICONF",
+ "NESTED",
+ "GENM",
+ "GENP",
+ "ERROR",
+ "CERTCONF",
+ "POLLREQ",
+ "POLLREP",
};
if (type < 0 || type > OSSL_CMP_PKIBODY_TYPE_MAX)
@@ -162,11 +184,11 @@ OSSL_CMP_MSG *ossl_cmp_msg_create(OSSL_CMP_CTX *ctx, int bodytype)
if ((msg = OSSL_CMP_MSG_new(ctx->libctx, ctx->propq)) == NULL)
return NULL;
if (!ossl_cmp_hdr_init(ctx, msg->header)
- || !ossl_cmp_msg_set_bodytype(msg, bodytype))
+ || !ossl_cmp_msg_set_bodytype(msg, bodytype))
goto err;
if (ctx->geninfo_ITAVs != NULL
- && !ossl_cmp_hdr_generalInfo_push1_items(msg->header,
- ctx->geninfo_ITAVs))
+ && !ossl_cmp_hdr_generalInfo_push1_items(msg->header,
+ ctx->geninfo_ITAVs))
goto err;
switch (bodytype) {
@@ -203,8 +225,7 @@ OSSL_CMP_MSG *ossl_cmp_msg_create(OSSL_CMP_CTX *ctx, int bodytype)
return msg;
case OSSL_CMP_PKIBODY_CERTCONF:
- if ((msg->body->value.certConf =
- sk_OSSL_CMP_CERTSTATUS_new_null()) == NULL)
+ if ((msg->body->value.certConf = sk_OSSL_CMP_CERTSTATUS_new_null()) == NULL)
goto err;
return msg;
case OSSL_CMP_PKIBODY_PKICONF:
@@ -238,17 +259,17 @@ OSSL_CMP_MSG *ossl_cmp_msg_create(OSSL_CMP_CTX *ctx, int bodytype)
goto err;
}
- err:
+err:
OSSL_CMP_MSG_free(msg);
return NULL;
}
-#define HAS_SAN(ctx) \
+#define HAS_SAN(ctx) \
(sk_GENERAL_NAME_num((ctx)->subjectAltNames) > 0 \
- || OSSL_CMP_CTX_reqExtensions_have_SAN(ctx) == 1)
+ || OSSL_CMP_CTX_reqExtensions_have_SAN(ctx) == 1)
static const X509_NAME *determine_subj(OSSL_CMP_CTX *ctx, int for_KUR,
- const X509_NAME *ref_subj)
+ const X509_NAME *ref_subj)
{
if (ctx->subjectName != NULL)
return IS_NULL_DN(ctx->subjectName) ? NULL : ctx->subjectName;
@@ -272,8 +293,7 @@ OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid)
/* refcert defaults to current client cert */
EVP_PKEY *rkey = ossl_cmp_ctx_get0_newPubkey(ctx);
STACK_OF(GENERAL_NAME) *default_sans = NULL;
- const X509_NAME *ref_subj =
- refcert != NULL ? X509_get_subject_name(refcert) : NULL;
+ const X509_NAME *ref_subj = refcert != NULL ? X509_get_subject_name(refcert) : NULL;
const X509_NAME *subject = determine_subj(ctx, for_KUR, ref_subj);
const X509_NAME *issuer = ctx->issuer != NULL || refcert == NULL
? (IS_NULL_DN(ctx->issuer) ? NULL : ctx->issuer)
@@ -297,17 +317,17 @@ OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid)
return NULL;
tmpl = OSSL_CRMF_MSG_get0_tmpl(crm);
if (!OSSL_CRMF_MSG_set_certReqId(crm, rid)
- /*
- * fill certTemplate, corresponding to CertificationRequestInfo
- * of PKCS#10. The rkey param cannot be NULL so far -
- * it could be NULL if centralized key creation was supported
- */
- || !OSSL_CRMF_CERTTEMPLATE_fill(OSSL_CRMF_MSG_get0_tmpl(crm), rkey,
- subject, issuer, NULL /* serial */))
+ /*
+ * fill certTemplate, corresponding to CertificationRequestInfo
+ * of PKCS#10. The rkey param cannot be NULL so far -
+ * it could be NULL if centralized key creation was supported
+ */
+ || !OSSL_CRMF_CERTTEMPLATE_fill(OSSL_CRMF_MSG_get0_tmpl(crm), rkey,
+ subject, issuer, NULL /* serial */))
goto err;
if (rkey != NULL && central_keygen)
X509_PUBKEY_set0_public_key(OSSL_CRMF_CERTTEMPLATE_get0_publicKey(tmpl),
- NULL, 0);
+ NULL, 0);
if (ctx->days != 0) {
time_t now = time(NULL);
@@ -315,8 +335,8 @@ OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid)
ASN1_TIME *notAfter = ASN1_TIME_adj(NULL, now, ctx->days, 0);
if (notBefore == NULL
- || notAfter == NULL
- || !OSSL_CRMF_MSG_set0_validity(crm, notBefore, notAfter)) {
+ || notAfter == NULL
+ || !OSSL_CRMF_MSG_set0_validity(crm, notBefore, notAfter)) {
ASN1_TIME_free(notBefore);
ASN1_TIME_free(notAfter);
goto err;
@@ -325,24 +345,24 @@ OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid)
/* extensions */
if (ctx->p10CSR != NULL
- && (exts = X509_REQ_get_extensions(ctx->p10CSR)) == NULL)
+ && (exts = X509_REQ_get_extensions(ctx->p10CSR)) == NULL)
goto err;
if (!ctx->SubjectAltName_nodefault && !HAS_SAN(ctx) && refcert != NULL
&& (default_sans = X509V3_get_d2i(X509_get0_extensions(refcert),
- NID_subject_alt_name, NULL, NULL))
- != NULL
- && !add1_extension(&exts, NID_subject_alt_name, crit, default_sans))
+ NID_subject_alt_name, NULL, NULL))
+ != NULL
+ && !add1_extension(&exts, NID_subject_alt_name, crit, default_sans))
goto err;
if (sk_X509_EXTENSION_num(ctx->reqExtensions) > 0 /* augment/override existing ones */
- && X509v3_add_extensions(&exts, ctx->reqExtensions) == NULL)
+ && X509v3_add_extensions(&exts, ctx->reqExtensions) == NULL)
goto err;
if (sk_GENERAL_NAME_num(ctx->subjectAltNames) > 0
- && !add1_extension(&exts, NID_subject_alt_name,
- crit, ctx->subjectAltNames))
+ && !add1_extension(&exts, NID_subject_alt_name,
+ crit, ctx->subjectAltNames))
goto err;
if (ctx->policies != NULL
- && !add1_extension(&exts, NID_certificate_policies,
- ctx->setPoliciesCritical, ctx->policies))
+ && !add1_extension(&exts, NID_certificate_policies,
+ ctx->setPoliciesCritical, ctx->policies))
goto err;
if (!OSSL_CRMF_MSG_set0_extensions(crm, exts))
goto err;
@@ -351,9 +371,8 @@ OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid)
/* for KUR, set OldCertId according to D.6 */
if (for_KUR && refcert != NULL) {
- OSSL_CRMF_CERTID *cid =
- OSSL_CRMF_CERTID_gen(X509_get_issuer_name(refcert),
- X509_get0_serialNumber(refcert));
+ OSSL_CRMF_CERTID *cid = OSSL_CRMF_CERTID_gen(X509_get_issuer_name(refcert),
+ X509_get0_serialNumber(refcert));
int ret;
if (cid == NULL)
@@ -366,18 +385,18 @@ OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid)
goto end;
- err:
+err:
OSSL_CRMF_MSG_free(crm);
crm = NULL;
- end:
+end:
sk_X509_EXTENSION_pop_free(exts, X509_EXTENSION_free);
sk_GENERAL_NAME_pop_free(default_sans, GENERAL_NAME_free);
return crm;
}
OSSL_CMP_MSG *ossl_cmp_certreq_new(OSSL_CMP_CTX *ctx, int type,
- const OSSL_CRMF_MSG *crm)
+ const OSSL_CRMF_MSG *crm)
{
OSSL_CMP_MSG *msg;
OSSL_CRMF_MSG *local_crm = NULL;
@@ -386,7 +405,7 @@ OSSL_CMP_MSG *ossl_cmp_certreq_new(OSSL_CMP_CTX *ctx, int type,
return NULL;
if (type != OSSL_CMP_PKIBODY_IR && type != OSSL_CMP_PKIBODY_CR
- && type != OSSL_CMP_PKIBODY_KUR && type != OSSL_CMP_PKIBODY_P10CR) {
+ && type != OSSL_CMP_PKIBODY_KUR && type != OSSL_CMP_PKIBODY_P10CR) {
ERR_raise(ERR_LIB_CMP, CMP_R_INVALID_ARGS);
return NULL;
}
@@ -414,12 +433,12 @@ OSSL_CMP_MSG *ossl_cmp_certreq_new(OSSL_CMP_CTX *ctx, int type,
}
if (crm == NULL) {
local_crm = OSSL_CMP_CTX_setup_CRM(ctx,
- type == OSSL_CMP_PKIBODY_KUR,
- OSSL_CMP_CERTREQID);
+ type == OSSL_CMP_PKIBODY_KUR,
+ OSSL_CMP_CERTREQID);
if (local_crm == NULL
|| !OSSL_CRMF_MSG_create_popo(ctx->popoMethod, local_crm,
- privkey, ctx->digest,
- ctx->libctx, ctx->propq))
+ privkey, ctx->digest,
+ ctx->libctx, ctx->propq))
goto err;
} else {
if ((local_crm = OSSL_CRMF_MSG_dup(crm)) == NULL)
@@ -437,7 +456,7 @@ OSSL_CMP_MSG *ossl_cmp_certreq_new(OSSL_CMP_CTX *ctx, int type,
return msg;
- err:
+err:
ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_CREATING_CERTREQ);
OSSL_CRMF_MSG_free(local_crm);
OSSL_CMP_MSG_free(msg);
@@ -464,14 +483,14 @@ static OSSL_CRMF_ENCRYPTEDKEY *enc_privkey(OSSL_CMP_CTX *ctx, const EVP_PKEY *pk
ossl_cmp_set_own_chain(ctx);
cipher = EVP_CIPHER_fetch(ctx->libctx, SN_aes_256_cbc, ctx->propq);
envData = ossl_cms_sign_encrypt(privbio, ctx->cert, ctx->chain, ctx->pkey, CMS_BINARY,
- encryption_recips, cipher, CMS_BINARY,
- ctx->libctx, ctx->propq);
+ encryption_recips, cipher, CMS_BINARY,
+ ctx->libctx, ctx->propq);
EVP_CIPHER_free(cipher);
if (envData == NULL)
goto err;
ek = OSSL_CRMF_ENCRYPTEDKEY_init_envdata(envData);
- err:
+err:
sk_X509_pop_free(encryption_recips, X509_free);
BIO_free(privbio);
if (ek == NULL)
@@ -482,11 +501,11 @@ static OSSL_CRMF_ENCRYPTEDKEY *enc_privkey(OSSL_CMP_CTX *ctx, const EVP_PKEY *pk
#endif
OSSL_CMP_MSG *ossl_cmp_certrep_new(OSSL_CMP_CTX *ctx, int bodytype,
- int certReqId, const OSSL_CMP_PKISI *si,
- X509 *cert, const EVP_PKEY *pkey,
- const X509 *encryption_recip,
- STACK_OF(X509) *chain, STACK_OF(X509) *caPubs,
- int unprotectedErrors)
+ int certReqId, const OSSL_CMP_PKISI *si,
+ X509 *cert, const EVP_PKEY *pkey,
+ const X509 *encryption_recip,
+ STACK_OF(X509) *chain, STACK_OF(X509) *caPubs,
+ int unprotectedErrors)
{
OSSL_CMP_MSG *msg = NULL;
OSSL_CMP_CERTREPMESSAGE *repMsg = NULL;
@@ -509,12 +528,12 @@ OSSL_CMP_MSG *ossl_cmp_certrep_new(OSSL_CMP_CTX *ctx, int bodytype,
goto err;
OSSL_CMP_PKISI_free(resp->status);
if ((resp->status = OSSL_CMP_PKISI_dup(si)) == NULL
- || !ASN1_INTEGER_set(resp->certReqId, certReqId))
+ || !ASN1_INTEGER_set(resp->certReqId, certReqId))
goto err;
status = ossl_cmp_pkisi_get_status(resp->status);
if (status != OSSL_CMP_PKISTATUS_rejection
- && status != OSSL_CMP_PKISTATUS_waiting && cert != NULL) {
+ && status != OSSL_CMP_PKISTATUS_waiting && cert != NULL) {
if (encryption_recip != NULL) {
ERR_raise(ERR_LIB_CMP, ERR_R_UNSUPPORTED);
goto err;
@@ -523,8 +542,7 @@ OSSL_CMP_MSG *ossl_cmp_certrep_new(OSSL_CMP_CTX *ctx, int bodytype,
if ((resp->certifiedKeyPair = OSSL_CMP_CERTIFIEDKEYPAIR_new())
== NULL)
goto err;
- resp->certifiedKeyPair->certOrEncCert->type =
- OSSL_CMP_CERTORENCCERT_CERTIFICATE;
+ resp->certifiedKeyPair->certOrEncCert->type = OSSL_CMP_CERTORENCCERT_CERTIFICATE;
if (!X509_up_ref(cert))
goto err;
resp->certifiedKeyPair->certOrEncCert->value.certificate = cert;
@@ -545,21 +563,21 @@ OSSL_CMP_MSG *ossl_cmp_certrep_new(OSSL_CMP_CTX *ctx, int bodytype,
resp = NULL;
if (bodytype == OSSL_CMP_PKIBODY_IP && caPubs != NULL
- && (repMsg->caPubs = X509_chain_up_ref(caPubs)) == NULL)
+ && (repMsg->caPubs = X509_chain_up_ref(caPubs)) == NULL)
goto err;
if (sk_X509_num(chain) > 0
&& !ossl_x509_add_certs_new(&msg->extraCerts, chain,
- X509_ADD_FLAG_UP_REF | X509_ADD_FLAG_NO_DUP))
+ X509_ADD_FLAG_UP_REF | X509_ADD_FLAG_NO_DUP))
goto err;
if (!unprotectedErrors
- || ossl_cmp_pkisi_get_status(si) != OSSL_CMP_PKISTATUS_rejection)
+ || ossl_cmp_pkisi_get_status(si) != OSSL_CMP_PKISTATUS_rejection)
if (!ossl_cmp_msg_protect(ctx, msg))
goto err;
return msg;
- err:
+err:
ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_CREATING_CERTREP);
OSSL_CMP_CERTRESPONSE_free(resp);
OSSL_CMP_MSG_free(msg);
@@ -577,8 +595,8 @@ OSSL_CMP_MSG *ossl_cmp_rr_new(OSSL_CMP_CTX *ctx)
int ret;
if (!ossl_assert(ctx != NULL
- && (ctx->oldCert != NULL || ctx->p10CSR != NULL
- || (ctx->serialNumber != NULL && ctx->issuer != NULL))))
+ && (ctx->oldCert != NULL || ctx->p10CSR != NULL
+ || (ctx->serialNumber != NULL && ctx->issuer != NULL))))
return NULL;
if ((rd = OSSL_CMP_REVDETAILS_new()) == NULL)
@@ -599,14 +617,14 @@ OSSL_CMP_MSG *ossl_cmp_rr_new(OSSL_CMP_CTX *ctx)
/* Fill the template from the contents of the certificate to be revoked */
ret = OSSL_CRMF_CERTTEMPLATE_fill(rd->certDetails, pubkey, subject,
- issuer, serialNumber);
+ issuer, serialNumber);
if (!ret)
goto err;
/* revocation reason code is optional */
if (ctx->revocationReason != CRL_REASON_NONE
- && !add_crl_reason_extension(&rd->crlEntryDetails,
- ctx->revocationReason))
+ && !add_crl_reason_extension(&rd->crlEntryDetails,
+ ctx->revocationReason))
goto err;
if ((msg = ossl_cmp_msg_create(ctx, OSSL_CMP_PKIBODY_RR)) == NULL)
@@ -622,7 +640,7 @@ OSSL_CMP_MSG *ossl_cmp_rr_new(OSSL_CMP_CTX *ctx)
return msg;
- err:
+err:
ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_CREATING_RR);
OSSL_CMP_MSG_free(msg);
OSSL_CMP_REVDETAILS_free(rd);
@@ -630,7 +648,7 @@ OSSL_CMP_MSG *ossl_cmp_rr_new(OSSL_CMP_CTX *ctx)
}
OSSL_CMP_MSG *ossl_cmp_rp_new(OSSL_CMP_CTX *ctx, const OSSL_CMP_PKISI *si,
- const OSSL_CRMF_CERTID *cid, int unprotectedErrors)
+ const OSSL_CRMF_CERTID *cid, int unprotectedErrors)
{
OSSL_CMP_REVREPCONTENT *rep = NULL;
OSSL_CMP_PKISI *si1 = NULL;
@@ -645,7 +663,7 @@ OSSL_CMP_MSG *ossl_cmp_rp_new(OSSL_CMP_CTX *ctx, const OSSL_CMP_PKISI *si,
rep = msg->body->value.rp;
if ((si1 = OSSL_CMP_PKISI_dup(si)) == NULL
- || !sk_OSSL_CMP_PKISI_push(rep->status, si1))
+ || !sk_OSSL_CMP_PKISI_push(rep->status, si1))
goto err;
si1 = NULL; /* ownership transferred to rep->status */
@@ -654,20 +672,20 @@ OSSL_CMP_MSG *ossl_cmp_rp_new(OSSL_CMP_CTX *ctx, const OSSL_CMP_PKISI *si,
goto err;
if (cid != NULL) {
if ((cid_copy = OSSL_CRMF_CERTID_dup(cid)) == NULL
- || !sk_OSSL_CRMF_CERTID_push(rep->revCerts, cid_copy))
+ || !sk_OSSL_CRMF_CERTID_push(rep->revCerts, cid_copy))
goto err;
cid_copy = NULL; /* ownership transferred to rep->revCerts */
}
if (!unprotectedErrors
- || ossl_cmp_pkisi_get_status(si) != OSSL_CMP_PKISTATUS_rejection)
+ || ossl_cmp_pkisi_get_status(si) != OSSL_CMP_PKISTATUS_rejection)
if (!ossl_cmp_msg_protect(ctx, msg))
goto err;
return msg;
- err:
+err:
ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_CREATING_RP);
OSSL_CMP_PKISI_free(si1);
OSSL_CRMF_CERTID_free(cid_copy);
@@ -687,7 +705,7 @@ OSSL_CMP_MSG *ossl_cmp_pkiconf_new(OSSL_CMP_CTX *ctx)
if (ossl_cmp_msg_protect(ctx, msg))
return msg;
- err:
+err:
ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_CREATING_PKICONF);
OSSL_CMP_MSG_free(msg);
return NULL;
@@ -702,7 +720,7 @@ int ossl_cmp_msg_gen_push0_ITAV(OSSL_CMP_MSG *msg, OSSL_CMP_ITAV *itav)
bodytype = OSSL_CMP_MSG_get_bodytype(msg);
if (bodytype != OSSL_CMP_PKIBODY_GENM
- && bodytype != OSSL_CMP_PKIBODY_GENP) {
+ && bodytype != OSSL_CMP_PKIBODY_GENP) {
ERR_raise(ERR_LIB_CMP, CMP_R_INVALID_ARGS);
return 0;
}
@@ -712,7 +730,7 @@ int ossl_cmp_msg_gen_push0_ITAV(OSSL_CMP_MSG *msg, OSSL_CMP_ITAV *itav)
}
int ossl_cmp_msg_gen_push1_ITAVs(OSSL_CMP_MSG *msg,
- const STACK_OF(OSSL_CMP_ITAV) *itavs)
+ const STACK_OF(OSSL_CMP_ITAV) *itavs)
{
int i;
OSSL_CMP_ITAV *itav = NULL;
@@ -723,7 +741,7 @@ int ossl_cmp_msg_gen_push1_ITAVs(OSSL_CMP_MSG *msg,
for (i = 0; i < sk_OSSL_CMP_ITAV_num(itavs); i++) {
itav = OSSL_CMP_ITAV_dup(sk_OSSL_CMP_ITAV_value(itavs, i));
if (itav == NULL
- || !ossl_cmp_msg_gen_push0_ITAV(msg, itav)) {
+ || !ossl_cmp_msg_gen_push0_ITAV(msg, itav)) {
OSSL_CMP_ITAV_free(itav);
return 0;
}
@@ -736,8 +754,8 @@ int ossl_cmp_msg_gen_push1_ITAVs(OSSL_CMP_MSG *msg,
* returns a pointer to the PKIMessage on success, NULL on error
*/
static OSSL_CMP_MSG *gen_new(OSSL_CMP_CTX *ctx,
- const STACK_OF(OSSL_CMP_ITAV) *itavs,
- int body_type, int err_code)
+ const STACK_OF(OSSL_CMP_ITAV) *itavs,
+ int body_type, int err_code)
{
OSSL_CMP_MSG *msg = NULL;
@@ -755,7 +773,7 @@ static OSSL_CMP_MSG *gen_new(OSSL_CMP_CTX *ctx,
return msg;
- err:
+err:
ERR_raise(ERR_LIB_CMP, err_code);
OSSL_CMP_MSG_free(msg);
return NULL;
@@ -764,19 +782,19 @@ static OSSL_CMP_MSG *gen_new(OSSL_CMP_CTX *ctx,
OSSL_CMP_MSG *ossl_cmp_genm_new(OSSL_CMP_CTX *ctx)
{
return gen_new(ctx, ctx->genm_ITAVs,
- OSSL_CMP_PKIBODY_GENM, CMP_R_ERROR_CREATING_GENM);
+ OSSL_CMP_PKIBODY_GENM, CMP_R_ERROR_CREATING_GENM);
}
OSSL_CMP_MSG *ossl_cmp_genp_new(OSSL_CMP_CTX *ctx,
- const STACK_OF(OSSL_CMP_ITAV) *itavs)
+ const STACK_OF(OSSL_CMP_ITAV) *itavs)
{
return gen_new(ctx, itavs,
- OSSL_CMP_PKIBODY_GENP, CMP_R_ERROR_CREATING_GENP);
+ OSSL_CMP_PKIBODY_GENP, CMP_R_ERROR_CREATING_GENP);
}
OSSL_CMP_MSG *ossl_cmp_error_new(OSSL_CMP_CTX *ctx, const OSSL_CMP_PKISI *si,
- int64_t errorCode, const char *details,
- int unprotected)
+ int64_t errorCode, const char *details,
+ int unprotected)
{
OSSL_CMP_MSG *msg = NULL;
const char *lib = NULL, *reason = NULL;
@@ -797,7 +815,7 @@ OSSL_CMP_MSG *ossl_cmp_error_new(OSSL_CMP_CTX *ctx, const OSSL_CMP_PKISI *si,
if (!ASN1_INTEGER_set_int64(msg->body->value.error->errorCode, errorCode))
goto err;
if (errorCode > 0
- && (uint64_t)errorCode < ((uint64_t)ERR_SYSTEM_FLAG << 1)) {
+ && (uint64_t)errorCode < ((uint64_t)ERR_SYSTEM_FLAG << 1)) {
lib = ERR_lib_error_string((unsigned long)errorCode);
reason = ERR_reason_error_string((unsigned long)errorCode);
}
@@ -806,13 +824,13 @@ OSSL_CMP_MSG *ossl_cmp_error_new(OSSL_CMP_CTX *ctx, const OSSL_CMP_PKISI *si,
goto err;
msg->body->value.error->errorDetails = ft;
if (lib != NULL && *lib != '\0'
- && !ossl_cmp_sk_ASN1_UTF8STRING_push_str(ft, lib, -1))
+ && !ossl_cmp_sk_ASN1_UTF8STRING_push_str(ft, lib, -1))
goto err;
if (reason != NULL && *reason != '\0'
- && !ossl_cmp_sk_ASN1_UTF8STRING_push_str(ft, reason, -1))
+ && !ossl_cmp_sk_ASN1_UTF8STRING_push_str(ft, reason, -1))
goto err;
if (details != NULL
- && !ossl_cmp_sk_ASN1_UTF8STRING_push_str(ft, details, -1))
+ && !ossl_cmp_sk_ASN1_UTF8STRING_push_str(ft, details, -1))
goto err;
}
@@ -820,7 +838,7 @@ OSSL_CMP_MSG *ossl_cmp_error_new(OSSL_CMP_CTX *ctx, const OSSL_CMP_PKISI *si,
goto err;
return msg;
- err:
+err:
ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_CREATING_ERROR);
OSSL_CMP_MSG_free(msg);
return NULL;
@@ -832,7 +850,7 @@ OSSL_CMP_MSG *ossl_cmp_error_new(OSSL_CMP_CTX *ctx, const OSSL_CMP_PKISI *si,
* to confirm that the certificate was received successfully.
*/
int ossl_cmp_certstatus_set0_certHash(OSSL_CMP_CERTSTATUS *certStatus,
- ASN1_OCTET_STRING *hash)
+ ASN1_OCTET_STRING *hash)
{
if (!ossl_assert(certStatus != NULL))
return 0;
@@ -842,7 +860,7 @@ int ossl_cmp_certstatus_set0_certHash(OSSL_CMP_CERTSTATUS *certStatus,
}
OSSL_CMP_MSG *ossl_cmp_certConf_new(OSSL_CMP_CTX *ctx, int certReqId,
- int fail_info, const char *text)
+ int fail_info, const char *text)
{
OSSL_CMP_MSG *msg = NULL;
OSSL_CMP_CERTSTATUS *certStatus = NULL;
@@ -852,8 +870,8 @@ OSSL_CMP_MSG *ossl_cmp_certConf_new(OSSL_CMP_CTX *ctx, int certReqId,
OSSL_CMP_PKISI *sinfo;
if (!ossl_assert(ctx != NULL && ctx->newCert != NULL
- && (certReqId == OSSL_CMP_CERTREQID
- || certReqId == OSSL_CMP_CERTREQID_NONE)))
+ && (certReqId == OSSL_CMP_CERTREQID
+ || certReqId == OSSL_CMP_CERTREQID_NONE)))
return NULL;
if ((unsigned)fail_info > OSSL_CMP_PKIFAILUREINFO_MAX_BIT_PATTERN) {
@@ -903,9 +921,7 @@ OSSL_CMP_MSG *ossl_cmp_certConf_new(OSSL_CMP_CTX *ctx, int certReqId,
* be provided in the statusInfo field, perhaps for auditing purposes at
* the CA/RA.
*/
- sinfo = fail_info != 0 ?
- OSSL_CMP_STATUSINFO_new(OSSL_CMP_PKISTATUS_rejection, fail_info, text) :
- OSSL_CMP_STATUSINFO_new(OSSL_CMP_PKISTATUS_accepted, 0, text);
+ sinfo = fail_info != 0 ? OSSL_CMP_STATUSINFO_new(OSSL_CMP_PKISTATUS_rejection, fail_info, text) : OSSL_CMP_STATUSINFO_new(OSSL_CMP_PKISTATUS_accepted, 0, text);
if (sinfo == NULL)
goto err;
certStatus->statusInfo = sinfo;
@@ -915,7 +931,7 @@ OSSL_CMP_MSG *ossl_cmp_certConf_new(OSSL_CMP_CTX *ctx, int certReqId,
return msg;
- err:
+err:
ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_CREATING_CERTCONF);
OSSL_CMP_MSG_free(msg);
ASN1_OCTET_STRING_free(certHash);
@@ -934,8 +950,8 @@ OSSL_CMP_MSG *ossl_cmp_pollReq_new(OSSL_CMP_CTX *ctx, int crid)
goto err;
if ((preq = OSSL_CMP_POLLREQ_new()) == NULL
- || !ASN1_INTEGER_set(preq->certReqId, crid)
- || !sk_OSSL_CMP_POLLREQ_push(msg->body->value.pollReq, preq))
+ || !ASN1_INTEGER_set(preq->certReqId, crid)
+ || !sk_OSSL_CMP_POLLREQ_push(msg->body->value.pollReq, preq))
goto err;
preq = NULL;
@@ -944,7 +960,7 @@ OSSL_CMP_MSG *ossl_cmp_pollReq_new(OSSL_CMP_CTX *ctx, int crid)
return msg;
- err:
+err:
ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_CREATING_POLLREQ);
OSSL_CMP_POLLREQ_free(preq);
OSSL_CMP_MSG_free(msg);
@@ -952,7 +968,7 @@ OSSL_CMP_MSG *ossl_cmp_pollReq_new(OSSL_CMP_CTX *ctx, int crid)
}
OSSL_CMP_MSG *ossl_cmp_pollRep_new(OSSL_CMP_CTX *ctx, int crid,
- int64_t poll_after)
+ int64_t poll_after)
{
OSSL_CMP_MSG *msg;
OSSL_CMP_POLLREP *prep;
@@ -975,7 +991,7 @@ OSSL_CMP_MSG *ossl_cmp_pollRep_new(OSSL_CMP_CTX *ctx, int crid,
goto err;
return msg;
- err:
+err:
ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_CREATING_POLLREP);
OSSL_CMP_MSG_free(msg);
return NULL;
@@ -1047,7 +1063,7 @@ static int suitable_rid(const ASN1_INTEGER *certReqId, int rid)
*/
OSSL_CMP_POLLREP *
ossl_cmp_pollrepcontent_get0_pollrep(const OSSL_CMP_POLLREPCONTENT *prc,
- int rid)
+ int rid)
{
OSSL_CMP_POLLREP *pollRep = NULL;
int i;
@@ -1062,7 +1078,7 @@ ossl_cmp_pollrepcontent_get0_pollrep(const OSSL_CMP_POLLREPCONTENT *prc,
}
ERR_raise_data(ERR_LIB_CMP, CMP_R_CERTRESPONSE_NOT_FOUND,
- "expected certReqId = %d", rid);
+ "expected certReqId = %d", rid);
return NULL;
}
@@ -1073,7 +1089,7 @@ ossl_cmp_pollrepcontent_get0_pollrep(const OSSL_CMP_POLLREPCONTENT *prc,
*/
OSSL_CMP_CERTRESPONSE *
ossl_cmp_certrepmessage_get0_certresponse(const OSSL_CMP_CERTREPMESSAGE *crm,
- int rid)
+ int rid)
{
OSSL_CMP_CERTRESPONSE *crep = NULL;
int i;
@@ -1088,7 +1104,7 @@ ossl_cmp_certrepmessage_get0_certresponse(const OSSL_CMP_CERTREPMESSAGE *crm,
}
ERR_raise_data(ERR_LIB_CMP, CMP_R_CERTRESPONSE_NOT_FOUND,
- "expected certReqId = %d", rid);
+ "expected certReqId = %d", rid);
return NULL;
}
@@ -1123,10 +1139,10 @@ X509 *ossl_cmp_certresponse_get1_cert(const OSSL_CMP_CTX *ctx, const OSSL_CMP_CE
}
/* found encrypted private key, try to extract */
pkey = OSSL_CRMF_ENCRYPTEDKEY_get1_pkey(encr_key, ctx->trusted,
- ctx->untrusted,
- ctx->pkey, ctx->cert,
- ctx->secretValue,
- ctx->libctx, ctx->propq);
+ ctx->untrusted,
+ ctx->pkey, ctx->cert,
+ ctx->secretValue,
+ ctx->libctx, ctx->propq);
if (pkey == NULL) {
ERR_raise(ERR_LIB_CMP, CMP_R_FAILED_EXTRACTING_CENTRAL_GEN_KEY);
return NULL;
@@ -1151,7 +1167,7 @@ X509 *ossl_cmp_certresponse_get1_cert(const OSSL_CMP_CTX *ctx, const OSSL_CMP_CE
return NULL;
}
crt = OSSL_CRMF_ENCRYPTEDKEY_get1_encCert(coec->value.encryptedCert,
- ctx->libctx, ctx->propq, pkey, 0);
+ ctx->libctx, ctx->propq, pkey, 0);
break;
default:
ERR_raise(ERR_LIB_CMP, CMP_R_UNKNOWN_CERT_TYPE);
@@ -1174,7 +1190,7 @@ int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg)
if (!ossl_cmp_hdr_set_transactionID(ctx, msg->header))
return 0;
return msg->header->protectionAlg == NULL
- || ossl_cmp_msg_protect(ctx, msg);
+ || ossl_cmp_msg_protect(ctx, msg);
}
int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg)
@@ -1186,13 +1202,13 @@ int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg)
if (ctx->recipNonce == NULL) /* nothing to do for 1st msg in transaction */
return 1;
if (!ossl_cmp_asn1_octet_string_set1(&msg->header->recipNonce,
- ctx->recipNonce))
+ ctx->recipNonce))
return 0;
return msg->header->protectionAlg == NULL || ossl_cmp_msg_protect(ctx, msg);
}
OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx,
- const char *propq)
+ const char *propq)
{
OSSL_CMP_MSG *msg;
BIO *bio = NULL;
@@ -1209,7 +1225,7 @@ OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx,
}
if ((bio = BIO_new_file(file, "rb")) == NULL
- || d2i_OSSL_CMP_MSG_bio(bio, &msg) == NULL) {
+ || d2i_OSSL_CMP_MSG_bio(bio, &msg) == NULL) {
OSSL_CMP_MSG_free(msg);
msg = NULL;
}
@@ -1236,25 +1252,25 @@ int OSSL_CMP_MSG_write(const char *file, const OSSL_CMP_MSG *msg)
}
OSSL_CMP_MSG *d2i_OSSL_CMP_MSG(OSSL_CMP_MSG **msg, const unsigned char **in,
- long len)
+ long len)
{
OSSL_LIB_CTX *libctx = NULL;
const char *propq = NULL;
if (msg != NULL && *msg != NULL) {
- libctx = (*msg)->libctx;
+ libctx = (*msg)->libctx;
propq = (*msg)->propq;
}
return (OSSL_CMP_MSG *)ASN1_item_d2i_ex((ASN1_VALUE **)msg, in, len,
- ASN1_ITEM_rptr(OSSL_CMP_MSG),
- libctx, propq);
+ ASN1_ITEM_rptr(OSSL_CMP_MSG),
+ libctx, propq);
}
int i2d_OSSL_CMP_MSG(const OSSL_CMP_MSG *msg, unsigned char **out)
{
return ASN1_item_i2d((const ASN1_VALUE *)msg, out,
- ASN1_ITEM_rptr(OSSL_CMP_MSG));
+ ASN1_ITEM_rptr(OSSL_CMP_MSG));
}
OSSL_CMP_MSG *d2i_OSSL_CMP_MSG_bio(BIO *bio, OSSL_CMP_MSG **msg)
@@ -1263,12 +1279,12 @@ OSSL_CMP_MSG *d2i_OSSL_CMP_MSG_bio(BIO *bio, OSSL_CMP_MSG **msg)
const char *propq = NULL;
if (msg != NULL && *msg != NULL) {
- libctx = (*msg)->libctx;
+ libctx = (*msg)->libctx;
propq = (*msg)->propq;
}
return ASN1_item_d2i_bio_ex(ASN1_ITEM_rptr(OSSL_CMP_MSG), bio, msg, libctx,
- propq);
+ propq);
}
int i2d_OSSL_CMP_MSG_bio(BIO *bio, const OSSL_CMP_MSG *msg)
@@ -1282,6 +1298,6 @@ int ossl_cmp_is_error_with_waiting(const OSSL_CMP_MSG *msg)
return 0;
return (OSSL_CMP_MSG_get_bodytype(msg) == OSSL_CMP_PKIBODY_ERROR
- && ossl_cmp_pkisi_get_status(msg->body->value.error->pKIStatusInfo)
+ && ossl_cmp_pkisi_get_status(msg->body->value.error->pKIStatusInfo)
== OSSL_CMP_PKISTATUS_waiting);
}
diff --git a/crypto/cmp/cmp_protect.c b/crypto/cmp/cmp_protect.c
index e12f8fc397..651b3ff324 100644
--- a/crypto/cmp/cmp_protect.c
+++ b/crypto/cmp/cmp_protect.c
@@ -24,7 +24,7 @@
* returns ASN1_BIT_STRING representing the protection on success, else NULL
*/
ASN1_BIT_STRING *ossl_cmp_calc_protection(const OSSL_CMP_CTX *ctx,
- const OSSL_CMP_MSG *msg)
+ const OSSL_CMP_MSG *msg)
{
ASN1_BIT_STRING *prot = NULL;
OSSL_CMP_PROTECTEDPART prot_part;
@@ -80,9 +80,9 @@ ASN1_BIT_STRING *ossl_cmp_calc_protection(const OSSL_CMP_CTX *ctx,
}
if (!OSSL_CRMF_pbm_new(ctx->libctx, ctx->propq,
- pbm, prot_part_der, prot_part_der_len,
- ctx->secretValue->data, ctx->secretValue->length,
- &protection, &sig_len))
+ pbm, prot_part_der, prot_part_der_len,
+ ctx->secretValue->data, ctx->secretValue->length,
+ &protection, &sig_len))
goto end;
if (sig_len > INT_MAX || (prot = ASN1_BIT_STRING_new()) == NULL)
@@ -104,7 +104,7 @@ ASN1_BIT_STRING *ossl_cmp_calc_protection(const OSSL_CMP_CTX *ctx,
if (ctx->pkey == NULL) {
ERR_raise(ERR_LIB_CMP,
- CMP_R_MISSING_KEY_INPUT_FOR_CREATING_PROTECTION);
+ CMP_R_MISSING_KEY_INPUT_FOR_CREATING_PROTECTION);
return NULL;
}
if (EVP_PKEY_get_default_digest_name(ctx->pkey, name, sizeof(name)) > 0
@@ -114,9 +114,10 @@ ASN1_BIT_STRING *ossl_cmp_calc_protection(const OSSL_CMP_CTX *ctx,
if ((prot = ASN1_BIT_STRING_new()) == NULL)
return NULL;
if (ASN1_item_sign_ex(ASN1_ITEM_rptr(OSSL_CMP_PROTECTEDPART),
- msg->header->protectionAlg, /* sets X509_ALGOR */
- NULL, prot, &prot_part, NULL, ctx->pkey, md,
- ctx->libctx, ctx->propq) != 0)
+ msg->header->protectionAlg, /* sets X509_ALGOR */
+ NULL, prot, &prot_part, NULL, ctx->pkey, md,
+ ctx->libctx, ctx->propq)
+ != 0)
return prot;
ASN1_BIT_STRING_free(prot);
return NULL;
@@ -131,7 +132,7 @@ void ossl_cmp_set_own_chain(OSSL_CMP_CTX *ctx)
if (ctx->chain == NULL) {
ossl_cmp_debug(ctx, "trying to build chain for own CMP signer cert");
ctx->chain = X509_build_chain(ctx->cert, ctx->untrusted, NULL, 0,
- ctx->libctx, ctx->propq);
+ ctx->libctx, ctx->propq);
if (ctx->chain != NULL) {
ossl_cmp_debug(ctx, "success building chain for own CMP signer cert");
} else {
@@ -150,7 +151,7 @@ int ossl_cmp_msg_add_extraCerts(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg)
/* Add first ctx->cert and its chain if using signature-based protection */
if (!ctx->unprotectedSend && ctx->secretValue == NULL
- && ctx->cert != NULL && ctx->pkey != NULL) {
+ && ctx->cert != NULL && ctx->pkey != NULL) {
int prepend = X509_ADD_FLAG_UP_REF | X509_ADD_FLAG_NO_DUP
| X509_ADD_FLAG_PREPEND | X509_ADD_FLAG_NO_SS;
@@ -168,7 +169,7 @@ int ossl_cmp_msg_add_extraCerts(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg)
/* add any additional certificates from ctx->extraCertsOut */
if (!ossl_x509_add_certs_new(&msg->extraCerts, ctx->extraCertsOut,
- X509_ADD_FLAG_UP_REF | X509_ADD_FLAG_NO_DUP))
+ X509_ADD_FLAG_UP_REF | X509_ADD_FLAG_NO_DUP))
return 0;
/* in case extraCerts are empty list avoid empty ASN.1 sequence */
@@ -195,8 +196,8 @@ static X509_ALGOR *pbmac_algor(const OSSL_CMP_CTX *ctx)
return NULL;
pbm = OSSL_CRMF_pbmp_new(ctx->libctx, ctx->pbm_slen,
- EVP_MD_get_type(ctx->pbm_owf), ctx->pbm_itercnt,
- ctx->pbm_mac);
+ EVP_MD_get_type(ctx->pbm_owf), ctx->pbm_itercnt,
+ ctx->pbm_mac);
pbm_str = ASN1_STRING_new();
if (pbm == NULL || pbm_str == NULL)
goto err;
@@ -205,8 +206,8 @@ static X509_ALGOR *pbmac_algor(const OSSL_CMP_CTX *ctx)
if (!ASN1_STRING_set(pbm_str, pbm_der, pbm_der_len))
goto err;
alg = ossl_X509_ALGOR_from_nid(NID_id_PasswordBasedMAC,
- V_ASN1_SEQUENCE, pbm_str);
- err:
+ V_ASN1_SEQUENCE, pbm_str);
+err:
if (alg == NULL)
ASN1_STRING_free(pbm_str);
OPENSSL_free(pbm_der);
@@ -215,7 +216,7 @@ static X509_ALGOR *pbmac_algor(const OSSL_CMP_CTX *ctx)
}
static int set_senderKID(const OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg,
- const ASN1_OCTET_STRING *id)
+ const ASN1_OCTET_STRING *id)
{
if (id == NULL)
id = ctx->referenceValue; /* standard for PBM, fallback for sig-based */
@@ -273,12 +274,12 @@ int ossl_cmp_msg_protect(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg)
*/
} else {
ERR_raise(ERR_LIB_CMP,
- CMP_R_MISSING_KEY_INPUT_FOR_CREATING_PROTECTION);
+ CMP_R_MISSING_KEY_INPUT_FOR_CREATING_PROTECTION);
goto err;
}
if (!ctx->unprotectedSend
/* protect according to msg->header->protectionAlg partly set above */
- && ((msg->protection = ossl_cmp_calc_protection(ctx, msg)) == NULL))
+ && ((msg->protection = ossl_cmp_calc_protection(ctx, msg)) == NULL))
goto err;
/*
@@ -296,11 +297,11 @@ int ossl_cmp_msg_protect(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg)
* the senderKID must be set, where we took the referenceValue as fallback.
*/
if (!(ossl_cmp_general_name_is_NULL_DN(msg->header->sender)
- && msg->header->senderKID == NULL))
+ && msg->header->senderKID == NULL))
return 1;
ERR_raise(ERR_LIB_CMP, CMP_R_MISSING_SENDER_IDENTIFICATION);
- err:
+err:
ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_PROTECTING_MESSAGE);
return 0;
}
diff --git a/crypto/cmp/cmp_server.c b/crypto/cmp/cmp_server.c
index f4fed6743f..8a321ecbd9 100644
--- a/crypto/cmp/cmp_server.c
+++ b/crypto/cmp/cmp_server.c
@@ -16,9 +16,9 @@
/* the context for the generic CMP server */
struct ossl_cmp_srv_ctx_st {
OSSL_CMP_CTX *ctx; /* CMP client context reused for transactionID etc. */
- void *custom_ctx; /* application-specific server context */
- int certReqId; /* of ir/cr/kur, OSSL_CMP_CERTREQID_NONE for p10cr */
- int polling; /* current transaction is in polling mode */
+ void *custom_ctx; /* application-specific server context */
+ int certReqId; /* of ir/cr/kur, OSSL_CMP_CERTREQID_NONE for p10cr */
+ int polling; /* current transaction is in polling mode */
OSSL_CMP_SRV_cert_request_cb_t process_cert_request;
OSSL_CMP_SRV_rr_cb_t process_rr;
@@ -30,9 +30,9 @@ struct ossl_cmp_srv_ctx_st {
OSSL_CMP_SRV_clean_transaction_cb_t clean_transaction;
int sendUnprotectedErrors; /* Send error and rejection msgs unprotected */
- int acceptUnprotected; /* Accept requests with no/invalid prot. */
- int acceptRAVerified; /* Accept ir/cr/kur with POPO RAVerified */
- int grantImplicitConfirm; /* Grant implicit confirmation if requested */
+ int acceptUnprotected; /* Accept requests with no/invalid prot. */
+ int acceptRAVerified; /* Accept ir/cr/kur with POPO RAVerified */
+ int grantImplicitConfirm; /* Grant implicit confirmation if requested */
}; /* OSSL_CMP_SRV_CTX */
@@ -59,18 +59,18 @@ OSSL_CMP_SRV_CTX *OSSL_CMP_SRV_CTX_new(OSSL_LIB_CTX *libctx, const char *propq)
/* all other elements are initialized to 0 or NULL, respectively */
return ctx;
- err:
+err:
OSSL_CMP_SRV_CTX_free(ctx);
return NULL;
}
int OSSL_CMP_SRV_CTX_init(OSSL_CMP_SRV_CTX *srv_ctx, void *custom_ctx,
- OSSL_CMP_SRV_cert_request_cb_t process_cert_request,
- OSSL_CMP_SRV_rr_cb_t process_rr,
- OSSL_CMP_SRV_genm_cb_t process_genm,
- OSSL_CMP_SRV_error_cb_t process_error,
- OSSL_CMP_SRV_certConf_cb_t process_certConf,
- OSSL_CMP_SRV_pollReq_cb_t process_pollReq)
+ OSSL_CMP_SRV_cert_request_cb_t process_cert_request,
+ OSSL_CMP_SRV_rr_cb_t process_rr,
+ OSSL_CMP_SRV_genm_cb_t process_genm,
+ OSSL_CMP_SRV_error_cb_t process_error,
+ OSSL_CMP_SRV_certConf_cb_t process_certConf,
+ OSSL_CMP_SRV_pollReq_cb_t process_pollReq)
{
if (srv_ctx == NULL) {
ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT);
@@ -87,8 +87,8 @@ int OSSL_CMP_SRV_CTX_init(OSSL_CMP_SRV_CTX *srv_ctx, void *custom_ctx,
}
int OSSL_CMP_SRV_CTX_init_trans(OSSL_CMP_SRV_CTX *srv_ctx,
- OSSL_CMP_SRV_delayed_delivery_cb_t delay,
- OSSL_CMP_SRV_clean_transaction_cb_t clean)
+ OSSL_CMP_SRV_delayed_delivery_cb_t delay,
+ OSSL_CMP_SRV_clean_transaction_cb_t clean)
{
if (srv_ctx == NULL) {
ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT);
@@ -118,7 +118,7 @@ void *OSSL_CMP_SRV_CTX_get0_custom_ctx(const OSSL_CMP_SRV_CTX *srv_ctx)
}
int OSSL_CMP_SRV_CTX_set_send_unprotected_errors(OSSL_CMP_SRV_CTX *srv_ctx,
- int val)
+ int val)
{
if (srv_ctx == NULL) {
ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT);
@@ -149,7 +149,7 @@ int OSSL_CMP_SRV_CTX_set_accept_raverified(OSSL_CMP_SRV_CTX *srv_ctx, int val)
}
int OSSL_CMP_SRV_CTX_set_grant_implicit_confirm(OSSL_CMP_SRV_CTX *srv_ctx,
- int val)
+ int val)
{
if (srv_ctx == NULL) {
ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT);
@@ -161,7 +161,7 @@ int OSSL_CMP_SRV_CTX_set_grant_implicit_confirm(OSSL_CMP_SRV_CTX *srv_ctx,
/* return error msg with waiting status if polling is initiated, else NULL */
static OSSL_CMP_MSG *delayed_delivery(OSSL_CMP_SRV_CTX *srv_ctx,
- const OSSL_CMP_MSG *req)
+ const OSSL_CMP_MSG *req)
{
int ret;
unsigned long err;
@@ -172,7 +172,7 @@ static OSSL_CMP_MSG *delayed_delivery(OSSL_CMP_SRV_CTX *srv_ctx,
OSSL_CMP_MSG *msg;
if (!ossl_assert(srv_ctx != NULL && srv_ctx->ctx != NULL && req != NULL
- && srv_ctx->delayed_delivery != NULL))
+ && srv_ctx->delayed_delivery != NULL))
return NULL;
ret = srv_ctx->delayed_delivery(srv_ctx, req);
@@ -194,7 +194,7 @@ static OSSL_CMP_MSG *delayed_delivery(OSSL_CMP_SRV_CTX *srv_ctx,
return NULL;
msg = ossl_cmp_error_new(srv_ctx->ctx, si, errorCode, details,
- srv_ctx->sendUnprotectedErrors);
+ srv_ctx->sendUnprotectedErrors);
OSSL_CMP_PKISI_free(si);
return msg;
}
@@ -205,7 +205,7 @@ static OSSL_CMP_MSG *delayed_delivery(OSSL_CMP_SRV_CTX *srv_ctx,
* returns an ip/cp/kup on success and NULL on error
*/
static OSSL_CMP_MSG *process_cert_request(OSSL_CMP_SRV_CTX *srv_ctx,
- const OSSL_CMP_MSG *req)
+ const OSSL_CMP_MSG *req)
{
OSSL_CMP_MSG *msg = NULL;
OSSL_CMP_PKISI *si = NULL;
@@ -265,26 +265,26 @@ static OSSL_CMP_MSG *process_cert_request(OSSL_CMP_SRV_CTX *srv_ctx,
&& !ossl_cmp_verify_popo(srv_ctx->ctx, req, srv_ctx->acceptRAVerified)) {
/* Proof of possession could not be verified */
si = OSSL_CMP_STATUSINFO_new(OSSL_CMP_PKISTATUS_rejection,
- 1 << OSSL_CMP_PKIFAILUREINFO_badPOP,
- ERR_reason_error_string(ERR_peek_error()));
+ 1 << OSSL_CMP_PKIFAILUREINFO_badPOP,
+ ERR_reason_error_string(ERR_peek_error()));
if (si == NULL)
return NULL;
} else {
OSSL_CMP_PKIHEADER *hdr = OSSL_CMP_MSG_get0_header(req);
si = srv_ctx->process_cert_request(srv_ctx, req, certReqId, crm, p10cr,
- &certOut, &chainOut, &caPubs);
+ &certOut, &chainOut, &caPubs);
if (si == NULL)
goto err;
if (ossl_cmp_pkisi_get_status(si) == OSSL_CMP_PKISTATUS_waiting)
srv_ctx->polling = 1;
/* set OSSL_CMP_OPT_IMPLICIT_CONFIRM if and only if transaction ends */
if (!OSSL_CMP_CTX_set_option(srv_ctx->ctx,
- OSSL_CMP_OPT_IMPLICIT_CONFIRM,
- ossl_cmp_hdr_has_implicitConfirm(hdr)
- && srv_ctx->grantImplicitConfirm
- /* do not set if polling starts: */
- && certOut != NULL))
+ OSSL_CMP_OPT_IMPLICIT_CONFIRM,
+ ossl_cmp_hdr_has_implicitConfirm(hdr)
+ && srv_ctx->grantImplicitConfirm
+ /* do not set if polling starts: */
+ && certOut != NULL))
goto err;
if (central_keygen == 1
&& srv_ctx->ctx->newPkey_priv && srv_ctx->ctx->newPkey != NULL)
@@ -292,13 +292,13 @@ static OSSL_CMP_MSG *process_cert_request(OSSL_CMP_SRV_CTX *srv_ctx,
}
msg = ossl_cmp_certrep_new(srv_ctx->ctx, bodytype, certReqId, si,
- certOut, keyOut, NULL /* enc */, chainOut, caPubs,
- srv_ctx->sendUnprotectedErrors);
+ certOut, keyOut, NULL /* enc */, chainOut, caPubs,
+ srv_ctx->sendUnprotectedErrors);
/* When supporting OSSL_CRMF_POPO_KEYENC, "enc" will need to be set */
if (msg == NULL)
ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_CREATING_CERTREP);
- err:
+err:
OSSL_CMP_PKISI_free(si);
X509_free(certOut);
OSSL_CMP_CTX_set0_newPkey(srv_ctx->ctx, 0, NULL);
@@ -308,7 +308,7 @@ static OSSL_CMP_MSG *process_cert_request(OSSL_CMP_SRV_CTX *srv_ctx,
}
static OSSL_CMP_MSG *process_rr(OSSL_CMP_SRV_CTX *srv_ctx,
- const OSSL_CMP_MSG *req)
+ const OSSL_CMP_MSG *req)
{
OSSL_CMP_MSG *msg = NULL;
OSSL_CMP_REVDETAILS *details;
@@ -335,16 +335,17 @@ static OSSL_CMP_MSG *process_rr(OSSL_CMP_SRV_CTX *srv_ctx,
issuer = OSSL_CRMF_CERTTEMPLATE_get0_issuer(tmpl);
serial = OSSL_CRMF_CERTTEMPLATE_get0_serialNumber(tmpl);
if (issuer != NULL && serial != NULL
- && (certId = OSSL_CRMF_CERTID_gen(issuer, serial)) == NULL)
+ && (certId = OSSL_CRMF_CERTID_gen(issuer, serial)) == NULL)
return NULL;
if ((si = srv_ctx->process_rr(srv_ctx, req, issuer, serial)) == NULL)
goto err;
if ((msg = ossl_cmp_rp_new(srv_ctx->ctx, si, certId,
- srv_ctx->sendUnprotectedErrors)) == NULL)
+ srv_ctx->sendUnprotectedErrors))
+ == NULL)
ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_CREATING_RR);
- err:
+err:
OSSL_CRMF_CERTID_free(certId);
OSSL_CMP_PKISI_free(si);
return msg;
@@ -355,7 +356,7 @@ static OSSL_CMP_MSG *process_rr(OSSL_CMP_SRV_CTX *srv_ctx,
* incoming message
*/
static OSSL_CMP_MSG *process_genm(OSSL_CMP_SRV_CTX *srv_ctx,
- const OSSL_CMP_MSG *req)
+ const OSSL_CMP_MSG *req)
{
OSSL_CMP_GENMSGCONTENT *itavs;
OSSL_CMP_MSG *msg;
@@ -372,7 +373,7 @@ static OSSL_CMP_MSG *process_genm(OSSL_CMP_SRV_CTX *srv_ctx,
}
static OSSL_CMP_MSG *process_error(OSSL_CMP_SRV_CTX *srv_ctx,
- const OSSL_CMP_MSG *req)
+ const OSSL_CMP_MSG *req)
{
OSSL_CMP_ERRORMSGCONTENT *errorContent;
OSSL_CMP_MSG *msg;
@@ -381,7 +382,7 @@ static OSSL_CMP_MSG *process_error(OSSL_CMP_SRV_CTX *srv_ctx,
return NULL;
errorContent = req->body->value.error;
srv_ctx->process_error(srv_ctx, req, errorContent->pKIStatusInfo,
- errorContent->errorCode, errorContent->errorDetails);
+ errorContent->errorCode, errorContent->errorDetails);
if ((msg = ossl_cmp_pkiconf_new(srv_ctx->ctx)) == NULL)
ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_CREATING_PKICONF);
@@ -389,7 +390,7 @@ static OSSL_CMP_MSG *process_error(OSSL_CMP_SRV_CTX *srv_ctx,
}
static OSSL_CMP_MSG *process_certConf(OSSL_CMP_SRV_CTX *srv_ctx,
- const OSSL_CMP_MSG *req)
+ const OSSL_CMP_MSG *req)
{
OSSL_CMP_CTX *ctx;
OSSL_CMP_CERTCONFIRMCONTENT *ccc;
@@ -405,7 +406,7 @@ static OSSL_CMP_MSG *process_certConf(OSSL_CMP_SRV_CTX *srv_ctx,
num = sk_OSSL_CMP_CERTSTATUS_num(ccc);
if (OSSL_CMP_CTX_get_option(ctx, OSSL_CMP_OPT_IMPLICIT_CONFIRM) == 1
- || ctx->status != OSSL_CMP_PKISTATUS_trans) {
+ || ctx->status != OSSL_CMP_PKISTATUS_trans) {
ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_UNEXPECTED_CERTCONF);
return NULL;
}
@@ -436,8 +437,8 @@ static OSSL_CMP_MSG *process_certConf(OSSL_CMP_SRV_CTX *srv_ctx,
const char *str = ossl_cmp_PKIStatus_to_string(pki_status);
ossl_cmp_log2(INFO, ctx, "certificate rejected by client %s %s",
- str == NULL ? "without" : "with",
- str == NULL ? "PKIStatus" : str);
+ str == NULL ? "without" : "with",
+ str == NULL ? "PKIStatus" : str);
}
}
@@ -448,12 +449,12 @@ static OSSL_CMP_MSG *process_certConf(OSSL_CMP_SRV_CTX *srv_ctx,
/* pollReq is handled separately, to avoid recursive call */
static OSSL_CMP_MSG *process_non_polling_request(OSSL_CMP_SRV_CTX *srv_ctx,
- const OSSL_CMP_MSG *req)
+ const OSSL_CMP_MSG *req)
{
OSSL_CMP_MSG *rsp = NULL;
if (!ossl_assert(srv_ctx != NULL && srv_ctx->ctx != NULL && req != NULL
- && req->body != NULL))
+ && req->body != NULL))
return NULL;
switch (OSSL_CMP_MSG_get_bodytype(req)) {
@@ -503,7 +504,7 @@ static OSSL_CMP_MSG *process_non_polling_request(OSSL_CMP_SRV_CTX *srv_ctx,
}
static OSSL_CMP_MSG *process_pollReq(OSSL_CMP_SRV_CTX *srv_ctx,
- const OSSL_CMP_MSG *req)
+ const OSSL_CMP_MSG *req)
{
OSSL_CMP_POLLREQCONTENT *prc;
OSSL_CMP_POLLREQ *pr;
@@ -529,7 +530,7 @@ static OSSL_CMP_MSG *process_pollReq(OSSL_CMP_SRV_CTX *srv_ctx,
pr = sk_OSSL_CMP_POLLREQ_value(prc, 0);
certReqId = ossl_cmp_asn1_get_int(pr->certReqId);
if (!srv_ctx->process_pollReq(srv_ctx, req, certReqId,
- &orig_req, &check_after))
+ &orig_req, &check_after))
return NULL;
if (orig_req != NULL) {
@@ -538,7 +539,8 @@ static OSSL_CMP_MSG *process_pollReq(OSSL_CMP_SRV_CTX *srv_ctx,
OSSL_CMP_MSG_free(orig_req);
} else {
if ((msg = ossl_cmp_pollRep_new(srv_ctx->ctx, certReqId,
- check_after)) == NULL)
+ check_after))
+ == NULL)
ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_CREATING_POLLREP);
}
return msg;
@@ -549,16 +551,16 @@ static OSSL_CMP_MSG *process_pollReq(OSSL_CMP_SRV_CTX *srv_ctx,
* Return 1 on acceptance, 0 on rejection, or -1 on (internal) error.
*/
static int unprotected_exception(const OSSL_CMP_CTX *ctx,
- const OSSL_CMP_MSG *req,
- int invalid_protection,
- int accept_unprotected_requests)
+ const OSSL_CMP_MSG *req,
+ int invalid_protection,
+ int accept_unprotected_requests)
{
if (!ossl_assert(ctx != NULL && req != NULL))
return -1;
if (accept_unprotected_requests) {
ossl_cmp_log1(WARN, ctx, "ignoring %s protection of request message",
- invalid_protection ? "invalid" : "missing");
+ invalid_protection ? "invalid" : "missing");
return 1;
}
if (OSSL_CMP_MSG_get_bodytype(req) == OSSL_CMP_PKIBODY_ERROR
@@ -573,7 +575,7 @@ static int unprotected_exception(const OSSL_CMP_CTX *ctx,
* returns created message and NULL on internal error
*/
OSSL_CMP_MSG *OSSL_CMP_SRV_process_request(OSSL_CMP_SRV_CTX *srv_ctx,
- const OSSL_CMP_MSG *req)
+ const OSSL_CMP_MSG *req)
{
OSSL_CMP_CTX *ctx;
ASN1_OCTET_STRING *backup_secret;
@@ -583,8 +585,8 @@ OSSL_CMP_MSG *OSSL_CMP_SRV_process_request(OSSL_CMP_SRV_CTX *srv_ctx,
OSSL_CMP_MSG *rsp = NULL;
if (srv_ctx == NULL || srv_ctx->ctx == NULL
- || req == NULL || req->body == NULL
- || (hdr = OSSL_CMP_MSG_get0_header(req)) == NULL) {
+ || req == NULL || req->body == NULL
+ || (hdr = OSSL_CMP_MSG_get0_header(req)) == NULL) {
ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT);
return 0;
}
@@ -592,7 +594,7 @@ OSSL_CMP_MSG *OSSL_CMP_SRV_process_request(OSSL_CMP_SRV_CTX *srv_ctx,
backup_secret = ctx->secretValue;
req_type = OSSL_CMP_MSG_get_bodytype(req);
ossl_cmp_log1(DEBUG, ctx,
- "received %s", ossl_cmp_bodytype_to_string(req_type));
+ "received %s", ossl_cmp_bodytype_to_string(req_type));
/*
* Some things need to be done already before validating the message in
@@ -606,7 +608,7 @@ OSSL_CMP_MSG *OSSL_CMP_SRV_process_request(OSSL_CMP_SRV_CTX *srv_ctx,
goto err;
if (srv_ctx->polling && req_type != OSSL_CMP_PKIBODY_POLLREQ
- && req_type != OSSL_CMP_PKIBODY_ERROR) {
+ && req_type != OSSL_CMP_PKIBODY_ERROR) {
ERR_raise(ERR_LIB_CMP, CMP_R_EXPECTED_POLLREQ);
goto err;
}
@@ -624,17 +626,17 @@ OSSL_CMP_MSG *OSSL_CMP_SRV_process_request(OSSL_CMP_SRV_CTX *srv_ctx,
if (tid != NULL)
ossl_cmp_log1(WARN, ctx,
- "Assuming that last transaction with ID=%s got aborted",
- tid);
+ "Assuming that last transaction with ID=%s got aborted",
+ tid);
OPENSSL_free(tid);
}
/* start of a new transaction, reset transactionID and senderNonce */
if (!OSSL_CMP_CTX_set1_transactionID(ctx, NULL)
- || !OSSL_CMP_CTX_set1_senderNonce(ctx, NULL))
+ || !OSSL_CMP_CTX_set1_senderNonce(ctx, NULL))
goto err;
if (srv_ctx->clean_transaction != NULL
- && !srv_ctx->clean_transaction(srv_ctx, NULL)) {
+ && !srv_ctx->clean_transaction(srv_ctx, NULL)) {
ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_PROCESSING_MESSAGE);
goto err;
}
@@ -651,9 +653,9 @@ OSSL_CMP_MSG *OSSL_CMP_SRV_process_request(OSSL_CMP_SRV_CTX *srv_ctx,
}
req_verified = ossl_cmp_msg_check_update(ctx, req, unprotected_exception,
- srv_ctx->acceptUnprotected);
+ srv_ctx->acceptUnprotected);
if (ctx->secretValue != NULL && ctx->pkey != NULL
- && ossl_cmp_hdr_get_protection_nid(hdr) != NID_id_PasswordBasedMAC)
+ && ossl_cmp_hdr_get_protection_nid(hdr) != NID_id_PasswordBasedMAC)
ctx->secretValue = NULL; /* use MSG_SIG_ALG when protecting rsp */
if (!req_verified)
goto err;
@@ -671,7 +673,7 @@ OSSL_CMP_MSG *OSSL_CMP_SRV_process_request(OSSL_CMP_SRV_CTX *srv_ctx,
rsp = process_non_polling_request(srv_ctx, req);
}
- err:
+err:
if (rsp == NULL) {
/* on error, try to respond with CMP error message to client */
const char *data = NULL, *reason = NULL;
@@ -697,20 +699,20 @@ OSSL_CMP_MSG *OSSL_CMP_SRV_process_request(OSSL_CMP_SRV_CTX *srv_ctx,
data = NULL;
reason = ERR_reason_error_string(err);
if ((si = OSSL_CMP_STATUSINFO_new(OSSL_CMP_PKISTATUS_rejection,
- fail_info, reason)) != NULL) {
+ fail_info, reason))
+ != NULL) {
rsp = ossl_cmp_error_new(srv_ctx->ctx, si, err,
- data, srv_ctx->sendUnprotectedErrors);
+ data, srv_ctx->sendUnprotectedErrors);
OSSL_CMP_PKISI_free(si);
}
}
OSSL_CMP_CTX_print_errors(ctx);
ctx->secretValue = backup_secret;
- rsp_type =
- rsp != NULL ? OSSL_CMP_MSG_get_bodytype(rsp) : OSSL_CMP_PKIBODY_ERROR;
+ rsp_type = rsp != NULL ? OSSL_CMP_MSG_get_bodytype(rsp) : OSSL_CMP_PKIBODY_ERROR;
if (rsp != NULL)
ossl_cmp_log1(DEBUG, ctx,
- "sending %s", ossl_cmp_bodytype_to_string(rsp_type));
+ "sending %s", ossl_cmp_bodytype_to_string(rsp_type));
else
ossl_cmp_log(ERR, ctx, "cannot send proper CMP response");
@@ -754,7 +756,7 @@ OSSL_CMP_MSG *OSSL_CMP_SRV_process_request(OSSL_CMP_SRV_CTX *srv_ctx,
* error stack.
*/
OSSL_CMP_MSG *OSSL_CMP_CTX_server_perform(OSSL_CMP_CTX *client_ctx,
- const OSSL_CMP_MSG *req)
+ const OSSL_CMP_MSG *req)
{
OSSL_CMP_SRV_CTX *srv_ctx = NULL;
diff --git a/crypto/cmp/cmp_status.c b/crypto/cmp/cmp_status.c
index 29930c3b9e..40e1ee671e 100644
--- a/crypto/cmp/cmp_status.c
+++ b/crypto/cmp/cmp_status.c
@@ -17,7 +17,7 @@
int ossl_cmp_pkisi_get_status(const OSSL_CMP_PKISI *si)
{
- int res ;
+ int res;
if (!ossl_assert(si != NULL && si->status != NULL))
return -1;
@@ -44,7 +44,7 @@ const char *ossl_cmp_PKIStatus_to_string(int status)
return "PKIStatus: key update warning - update already done for the cert";
default:
ERR_raise_data(ERR_LIB_CMP, CMP_R_ERROR_PARSING_PKISTATUS,
- "PKIStatus: invalid=%d", status);
+ "PKIStatus: invalid=%d", status);
return NULL;
}
}
@@ -152,10 +152,9 @@ int ossl_cmp_pkisi_check_pkifailureinfo(const OSSL_CMP_PKISI *si, int bit_index)
* place human-readable error string created from PKIStatusInfo in given buffer
* returns pointer to the same buffer containing the string, or NULL on error
*/
-static
-char *snprint_PKIStatusInfo_parts(int status, int fail_info,
- const OSSL_CMP_PKIFREETEXT *status_strings,
- char *buf, size_t bufsize)
+static char *snprint_PKIStatusInfo_parts(int status, int fail_info,
+ const OSSL_CMP_PKIFREETEXT *status_strings,
+ char *buf, size_t bufsize)
{
int failure;
const char *status_string, *failure_string;
@@ -167,14 +166,14 @@ char *snprint_PKIStatusInfo_parts(int status, int fail_info,
char *write_ptr = buf;
if (buf == NULL
- || status < 0
- || (status_string = ossl_cmp_PKIStatus_to_string(status)) == NULL)
+ || status < 0
+ || (status_string = ossl_cmp_PKIStatus_to_string(status)) == NULL)
return NULL;
-#define ADVANCE_BUFFER \
- if (printed_chars < 0 || (size_t)printed_chars >= bufsize) \
- return NULL; \
- write_ptr += printed_chars; \
+#define ADVANCE_BUFFER \
+ if (printed_chars < 0 || (size_t)printed_chars >= bufsize) \
+ return NULL; \
+ write_ptr += printed_chars; \
bufsize -= printed_chars;
printed_chars = BIO_snprintf(write_ptr, bufsize, "%s", status_string);
@@ -192,8 +191,8 @@ char *snprint_PKIStatusInfo_parts(int status, int fail_info,
failure_string = CMP_PKIFAILUREINFO_to_string(failure);
if (failure_string != NULL) {
printed_chars = BIO_snprintf(write_ptr, bufsize, "%s%s",
- failinfo_found ? ", " : "",
- failure_string);
+ failinfo_found ? ", " : "",
+ failure_string);
ADVANCE_BUFFER;
failinfo_found = 1;
}
@@ -201,7 +200,7 @@ char *snprint_PKIStatusInfo_parts(int status, int fail_info,
}
}
if (!failinfo_found && status != OSSL_CMP_PKISTATUS_accepted
- && status != OSSL_CMP_PKISTATUS_grantedWithMods) {
+ && status != OSSL_CMP_PKISTATUS_grantedWithMods) {
printed_chars = BIO_snprintf(write_ptr, bufsize, "; <no failure info>");
ADVANCE_BUFFER;
}
@@ -210,14 +209,14 @@ char *snprint_PKIStatusInfo_parts(int status, int fail_info,
n_status_strings = sk_ASN1_UTF8STRING_num(status_strings);
if (n_status_strings > 0) {
printed_chars = BIO_snprintf(write_ptr, bufsize, "; StatusString%s: ",
- n_status_strings > 1 ? "s" : "");
+ n_status_strings > 1 ? "s" : "");
ADVANCE_BUFFER;
for (i = 0; i < n_status_strings; i++) {
text = sk_ASN1_UTF8STRING_value(status_strings, i);
printed_chars = BIO_snprintf(write_ptr, bufsize, "\"%.*s\"%s",
- ASN1_STRING_length(text),
- ASN1_STRING_get0_data(text),
- i < n_status_strings - 1 ? ", " : "");
+ ASN1_STRING_length(text),
+ ASN1_STRING_get0_data(text),
+ i < n_status_strings - 1 ? ", " : "");
ADVANCE_BUFFER;
}
}
@@ -226,7 +225,7 @@ char *snprint_PKIStatusInfo_parts(int status, int fail_info,
}
char *OSSL_CMP_snprint_PKIStatusInfo(const OSSL_CMP_PKISI *statusInfo,
- char *buf, size_t bufsize)
+ char *buf, size_t bufsize)
{
int failure_info;
@@ -238,12 +237,12 @@ char *OSSL_CMP_snprint_PKIStatusInfo(const OSSL_CMP_PKISI *statusInfo,
failure_info = ossl_cmp_pkisi_get_pkifailureinfo(statusInfo);
return snprint_PKIStatusInfo_parts(ASN1_INTEGER_get(statusInfo->status),
- failure_info,
- statusInfo->statusString, buf, bufsize);
+ failure_info,
+ statusInfo->statusString, buf, bufsize);
}
char *OSSL_CMP_CTX_snprint_PKIStatus(const OSSL_CMP_CTX *ctx, char *buf,
- size_t bufsize)
+ size_t bufsize)
{
if (ctx == NULL) {
ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT);
@@ -251,9 +250,9 @@ char *OSSL_CMP_CTX_snprint_PKIStatus(const OSSL_CMP_CTX *ctx, char *buf,
}
return snprint_PKIStatusInfo_parts(OSSL_CMP_CTX_get_status(ctx),
- OSSL_CMP_CTX_get_failInfoCode(ctx),
- OSSL_CMP_CTX_get0_statusString(ctx),
- buf, bufsize);
+ OSSL_CMP_CTX_get_failInfoCode(ctx),
+ OSSL_CMP_CTX_get0_statusString(ctx),
+ buf, bufsize);
}
/*-
@@ -263,7 +262,7 @@ char *OSSL_CMP_CTX_snprint_PKIStatus(const OSSL_CMP_CTX *ctx, char *buf,
* and TS_RESP_CTX_add_failure_info() in ../ts/ts_rsp_sign.c
*/
OSSL_CMP_PKISI *OSSL_CMP_STATUSINFO_new(int status, int fail_info,
- const char *text)
+ const char *text)
{
OSSL_CMP_PKISI *si = OSSL_CMP_PKISI_new();
ASN1_UTF8STRING *utf8_text = NULL;
@@ -276,7 +275,7 @@ OSSL_CMP_PKISI *OSSL_CMP_STATUSINFO_new(int status, int fail_info,
if (text != NULL) {
if ((utf8_text = ASN1_UTF8STRING_new()) == NULL
- || !ASN1_STRING_set(utf8_text, text, -1))
+ || !ASN1_STRING_set(utf8_text, text, -1))
goto err;
if ((si->statusString = sk_ASN1_UTF8STRING_new_null()) == NULL)
goto err;
@@ -289,7 +288,7 @@ OSSL_CMP_PKISI *OSSL_CMP_STATUSINFO_new(int status, int fail_info,
for (failure = 0; failure <= OSSL_CMP_PKIFAILUREINFO_MAX; failure++) {
if ((fail_info & (1 << failure)) != 0) {
if (si->failInfo == NULL
- && (si->failInfo = ASN1_BIT_STRING_new()) == NULL)
+ && (si->failInfo = ASN1_BIT_STRING_new()) == NULL)
goto err;
if (!ASN1_BIT_STRING_set_bit(si->failInfo, failure, 1))
goto err;
@@ -297,7 +296,7 @@ OSSL_CMP_PKISI *OSSL_CMP_STATUSINFO_new(int status, int fail_info,
}
return si;
- err:
+err:
OSSL_CMP_PKISI_free(si);
ASN1_UTF8STRING_free(utf8_text);
return NULL;
diff --git a/crypto/cmp/cmp_util.c b/crypto/cmp/cmp_util.c
index 50294308bf..5c710addf2 100644
--- a/crypto/cmp/cmp_util.c
+++ b/crypto/cmp/cmp_util.c
@@ -25,13 +25,13 @@ int OSSL_CMP_log_open(void) /* is designed to be idempotent */
#ifdef OPENSSL_NO_TRACE
return 1;
#else
-# ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_STDIO
BIO *bio = BIO_new_fp(stdout, BIO_NOCLOSE);
if (bio != NULL && OSSL_trace_set_channel(OSSL_TRACE_CATEGORY_CMP, bio))
return 1;
BIO_free(bio);
-# endif
+#endif
ERR_raise(ERR_LIB_CMP, CMP_R_NO_STDIO);
return 0;
#endif
@@ -59,21 +59,19 @@ static OSSL_CMP_severity parse_level(const char *level)
if (len > max_level_len)
return -1;
OPENSSL_strlcpy(level_copy, level, len + 1);
- return
- strcmp(level_copy, "EMERG") == 0 ? OSSL_CMP_LOG_EMERG :
- strcmp(level_copy, "ALERT") == 0 ? OSSL_CMP_LOG_ALERT :
- strcmp(level_copy, "CRIT") == 0 ? OSSL_CMP_LOG_CRIT :
- strcmp(level_copy, "ERROR") == 0 ? OSSL_CMP_LOG_ERR :
- strcmp(level_copy, "WARN") == 0 ? OSSL_CMP_LOG_WARNING :
- strcmp(level_copy, "NOTE") == 0 ? OSSL_CMP_LOG_NOTICE :
- strcmp(level_copy, "INFO") == 0 ? OSSL_CMP_LOG_INFO :
- strcmp(level_copy, "DEBUG") == 0 ? OSSL_CMP_LOG_DEBUG :
- -1;
+ return strcmp(level_copy, "EMERG") == 0 ? OSSL_CMP_LOG_EMERG : strcmp(level_copy, "ALERT") == 0 ? OSSL_CMP_LOG_ALERT
+ : strcmp(level_copy, "CRIT") == 0 ? OSSL_CMP_LOG_CRIT
+ : strcmp(level_copy, "ERROR") == 0 ? OSSL_CMP_LOG_ERR
+ : strcmp(level_copy, "WARN") == 0 ? OSSL_CMP_LOG_WARNING
+ : strcmp(level_copy, "NOTE") == 0 ? OSSL_CMP_LOG_NOTICE
+ : strcmp(level_copy, "INFO") == 0 ? OSSL_CMP_LOG_INFO
+ : strcmp(level_copy, "DEBUG") == 0 ? OSSL_CMP_LOG_DEBUG
+ : -1;
}
const char *ossl_cmp_log_parse_metadata(const char *buf,
- OSSL_CMP_severity *level,
- char **func, char **file, int *line)
+ OSSL_CMP_severity *level,
+ char **func, char **file, int *line)
{
const char *p_func = buf;
const char *p_file = buf == NULL ? NULL : strchr(buf, ':');
@@ -121,29 +119,31 @@ static const char *improve_location_name(const char *func, const char *fallback)
return func == NULL ? UNKNOWN_FUNC : func;
return func == NULL || *func == '\0' || strcmp(func, UNKNOWN_FUNC) == 0
- ? fallback : func;
+ ? fallback
+ : func;
}
int OSSL_CMP_print_to_bio(BIO *bio, const char *component, const char *file,
- int line, OSSL_CMP_severity level, const char *msg)
+ int line, OSSL_CMP_severity level, const char *msg)
{
- const char *level_string =
- level == OSSL_CMP_LOG_EMERG ? "EMERG" :
- level == OSSL_CMP_LOG_ALERT ? "ALERT" :
- level == OSSL_CMP_LOG_CRIT ? "CRIT" :
- level == OSSL_CMP_LOG_ERR ? "error" :
- level == OSSL_CMP_LOG_WARNING ? "warning" :
- level == OSSL_CMP_LOG_NOTICE ? "NOTE" :
- level == OSSL_CMP_LOG_INFO ? "info" :
- level == OSSL_CMP_LOG_DEBUG ? "DEBUG" : "(unknown level)";
+ const char *level_string = level == OSSL_CMP_LOG_EMERG ? "EMERG" : level == OSSL_CMP_LOG_ALERT ? "ALERT"
+ : level == OSSL_CMP_LOG_CRIT ? "CRIT"
+ : level == OSSL_CMP_LOG_ERR ? "error"
+ : level == OSSL_CMP_LOG_WARNING ? "warning"
+ : level == OSSL_CMP_LOG_NOTICE ? "NOTE"
+ : level == OSSL_CMP_LOG_INFO ? "info"
+ : level == OSSL_CMP_LOG_DEBUG ? "DEBUG"
+ : "(unknown level)";
#ifndef NDEBUG
if (BIO_printf(bio, "%s:%s:%d:", improve_location_name(component, "CMP"),
- file, line) < 0)
+ file, line)
+ < 0)
return 0;
#endif
- return BIO_printf(bio, OSSL_CMP_LOG_PREFIX"%s: %s\n",
- level_string, msg) >= 0;
+ return BIO_printf(bio, OSSL_CMP_LOG_PREFIX "%s: %s\n",
+ level_string, msg)
+ >= 0;
}
#define ERR_PRINT_BUF_SIZE 4096
@@ -156,8 +156,7 @@ void OSSL_CMP_print_errors_cb(OSSL_CMP_log_cb_t log_fn)
int line, flags;
while ((err = ERR_get_error_all(&file, &line, &func, &data, &flags)) != 0) {
- const char *component =
- improve_location_name(func, ERR_lib_error_string(err));
+ const char *component = improve_location_name(func, ERR_lib_error_string(err));
unsigned long reason = ERR_GET_REASON(err);
const char *rs = NULL;
char rsbuf[256];
@@ -185,7 +184,7 @@ void OSSL_CMP_print_errors_cb(OSSL_CMP_log_cb_t log_fn)
if (bio != NULL) {
OSSL_CMP_print_to_bio(bio, component, file, line,
- OSSL_CMP_LOG_ERR, msg);
+ OSSL_CMP_LOG_ERR, msg);
BIO_free(bio);
}
#else
@@ -199,7 +198,7 @@ void OSSL_CMP_print_errors_cb(OSSL_CMP_log_cb_t log_fn)
}
int ossl_cmp_X509_STORE_add1_certs(X509_STORE *store, STACK_OF(X509) *certs,
- int only_self_signed)
+ int only_self_signed)
{
int i;
@@ -220,7 +219,7 @@ int ossl_cmp_X509_STORE_add1_certs(X509_STORE *store, STACK_OF(X509) *certs,
}
int ossl_cmp_sk_ASN1_UTF8STRING_push_str(STACK_OF(ASN1_UTF8STRING) *sk,
- const char *text, int len)
+ const char *text, int len)
{
ASN1_UTF8STRING *utf8string;
@@ -234,13 +233,13 @@ int ossl_cmp_sk_ASN1_UTF8STRING_push_str(STACK_OF(ASN1_UTF8STRING) *sk,
goto err;
return 1;
- err:
+err:
ASN1_UTF8STRING_free(utf8string);
return 0;
}
int ossl_cmp_asn1_octet_string_set1(ASN1_OCTET_STRING **tgt,
- const ASN1_OCTET_STRING *src)
+ const ASN1_OCTET_STRING *src)
{
ASN1_OCTET_STRING *new;
@@ -264,7 +263,7 @@ int ossl_cmp_asn1_octet_string_set1(ASN1_OCTET_STRING **tgt,
}
int ossl_cmp_asn1_octet_string_set1_bytes(ASN1_OCTET_STRING **tgt,
- const unsigned char *bytes, int len)
+ const unsigned char *bytes, int len)
{
ASN1_OCTET_STRING *new = NULL;
@@ -274,7 +273,7 @@ int ossl_cmp_asn1_octet_string_set1_bytes(ASN1_OCTET_STRING **tgt,
}
if (bytes != NULL) {
if ((new = ASN1_OCTET_STRING_new()) == NULL
- || !(ASN1_OCTET_STRING_set(new, bytes, len))) {
+ || !(ASN1_OCTET_STRING_set(new, bytes, len))) {
ASN1_OCTET_STRING_free(new);
return 0;
}
diff --git a/crypto/cmp/cmp_vfy.c b/crypto/cmp/cmp_vfy.c
index bccdce2428..a62d639075 100644
--- a/crypto/cmp/cmp_vfy.c
+++ b/crypto/cmp/cmp_vfy.c
@@ -15,7 +15,7 @@
/* Verify a message protected by signature according to RFC section 5.1.3.3 */
static int verify_signature(const OSSL_CMP_CTX *cmp_ctx,
- const OSSL_CMP_MSG *msg, X509 *cert)
+ const OSSL_CMP_MSG *msg, X509 *cert)
{
OSSL_CMP_PROTECTEDPART prot_part;
EVP_PKEY *pubkey = NULL;
@@ -30,7 +30,7 @@ static int verify_signature(const OSSL_CMP_CTX *cmp_ctx,
return 0;
/* verify that keyUsage, if present, contains digitalSignature */
if (!cmp_ctx->ignore_keyusage
- && (X509_get_key_usage(cert) & X509v3_KU_DIGITAL_SIGNATURE) == 0) {
+ && (X509_get_key_usage(cert) & X509v3_KU_DIGITAL_SIGNATURE) == 0) {
ERR_raise(ERR_LIB_CMP, CMP_R_MISSING_KEY_USAGE_DIGITALSIGNATURE);
goto sig_err;
}
@@ -45,21 +45,22 @@ static int verify_signature(const OSSL_CMP_CTX *cmp_ctx,
prot_part.body = msg->body;
if (ASN1_item_verify_ex(ASN1_ITEM_rptr(OSSL_CMP_PROTECTEDPART),
- msg->header->protectionAlg, msg->protection,
- &prot_part, NULL, pubkey, cmp_ctx->libctx,
- cmp_ctx->propq) > 0) {
+ msg->header->protectionAlg, msg->protection,
+ &prot_part, NULL, pubkey, cmp_ctx->libctx,
+ cmp_ctx->propq)
+ > 0) {
res = 1;
goto end;
}
- sig_err:
+sig_err:
res = ossl_x509_print_ex_brief(bio, cert, X509_FLAG_NO_EXTENSIONS);
ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_VALIDATING_SIGNATURE);
if (res)
ERR_add_error_mem_bio("\n", bio);
res = 0;
- end:
+end:
EVP_PKEY_free(pubkey);
BIO_free(bio);
@@ -77,10 +78,11 @@ static int verify_PBMAC(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg)
return 0; /* failed to generate protection string! */
valid = msg->protection != NULL && msg->protection->length >= 0
- && msg->protection->type == protection->type
- && msg->protection->length == protection->length
- && CRYPTO_memcmp(msg->protection->data, protection->data,
- protection->length) == 0;
+ && msg->protection->type == protection->type
+ && msg->protection->length == protection->length
+ && CRYPTO_memcmp(msg->protection->data, protection->data,
+ protection->length)
+ == 0;
ASN1_BIT_STRING_free(protection);
if (!valid)
ERR_raise(ERR_LIB_CMP, CMP_R_WRONG_PBM_VALUE);
@@ -96,7 +98,7 @@ static int verify_PBMAC(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg)
* Returns 1 on successful validation and 0 otherwise.
*/
int OSSL_CMP_validate_cert_path(const OSSL_CMP_CTX *ctx,
- X509_STORE *trusted_store, X509 *cert)
+ X509_STORE *trusted_store, X509 *cert)
{
int valid = 0;
X509_STORE_CTX *csc = NULL;
@@ -113,8 +115,8 @@ int OSSL_CMP_validate_cert_path(const OSSL_CMP_CTX *ctx,
}
if ((csc = X509_STORE_CTX_new_ex(ctx->libctx, ctx->propq)) == NULL
- || !X509_STORE_CTX_init(csc, trusted_store,
- cert, ctx->untrusted))
+ || !X509_STORE_CTX_init(csc, trusted_store,
+ cert, ctx->untrusted))
goto err;
valid = X509_verify_cert(csc) > 0;
@@ -124,7 +126,7 @@ int OSSL_CMP_validate_cert_path(const OSSL_CMP_CTX *ctx,
if (!valid && ERR_GET_REASON(err) != CMP_R_POTENTIALLY_INVALID_CERTIFICATE)
ERR_raise(ERR_LIB_CMP, CMP_R_POTENTIALLY_INVALID_CERTIFICATE);
- err:
+err:
/* directly output any fresh errors, needed for check_msg_find_cert() */
OSSL_CMP_CTX_print_errors(ctx);
X509_STORE_CTX_free(csc);
@@ -140,7 +142,7 @@ static int verify_cb_cert(X509_STORE *ts, X509 *cert, int err)
if (ts == NULL || (verify_cb = X509_STORE_get_verify_cb(ts)) == NULL)
return ok;
if ((csc = X509_STORE_CTX_new()) != NULL
- && X509_STORE_CTX_init(csc, ts, cert, NULL)) {
+ && X509_STORE_CTX_init(csc, ts, cert, NULL)) {
X509_STORE_CTX_set_error(csc, err);
X509_STORE_CTX_set_current_cert(csc, cert);
ok = (*verify_cb)(0, csc);
@@ -151,8 +153,8 @@ static int verify_cb_cert(X509_STORE *ts, X509 *cert, int err)
/* Return 0 if expect_name != NULL and there is no matching actual_name */
static int check_name(const OSSL_CMP_CTX *ctx, int log_success,
- const char *actual_desc, const X509_NAME *actual_name,
- const char *expect_desc, const X509_NAME *expect_name)
+ const char *actual_desc, const X509_NAME *actual_name,
+ const char *expect_desc, const X509_NAME *expect_name)
{
char *str;
@@ -168,7 +170,7 @@ static int check_name(const OSSL_CMP_CTX *ctx, int log_success,
if (X509_NAME_cmp(actual_name, expect_name) == 0) {
if (log_success && str != NULL)
ossl_cmp_log3(INFO, ctx, " %s matches %s: %s",
- actual_desc, expect_desc, str);
+ actual_desc, expect_desc, str);
OPENSSL_free(str);
return 1;
}
@@ -184,8 +186,8 @@ static int check_name(const OSSL_CMP_CTX *ctx, int log_success,
/* Return 0 if skid != NULL and there is no matching subject key ID in cert */
static int check_kid(const OSSL_CMP_CTX *ctx,
- const ASN1_OCTET_STRING *ckid,
- const ASN1_OCTET_STRING *skid)
+ const ASN1_OCTET_STRING *ckid,
+ const ASN1_OCTET_STRING *skid)
{
char *str;
@@ -215,7 +217,7 @@ static int check_kid(const OSSL_CMP_CTX *ctx,
}
static int already_checked(const X509 *cert,
- const STACK_OF(X509) *already_checked)
+ const STACK_OF(X509) *already_checked)
{
int i;
@@ -234,10 +236,10 @@ static int already_checked(const X509 *cert,
* Returns 0 on error or not acceptable, else 1.
*/
static int cert_acceptable(const OSSL_CMP_CTX *ctx,
- const char *desc1, const char *desc2, X509 *cert,
- const STACK_OF(X509) *already_checked1,
- const STACK_OF(X509) *already_checked2,
- const OSSL_CMP_MSG *msg)
+ const char *desc1, const char *desc2, X509 *cert,
+ const STACK_OF(X509) *already_checked1,
+ const STACK_OF(X509) *already_checked2,
+ const OSSL_CMP_MSG *msg)
{
X509_STORE *ts = ctx->trusted;
int self_issued = X509_check_issued(cert, cert) == X509_V_OK;
@@ -246,7 +248,7 @@ static int cert_acceptable(const OSSL_CMP_CTX *ctx,
int err;
ossl_cmp_log3(INFO, ctx, " considering %s%s %s with..",
- self_issued ? "self-issued ": "", desc1, desc2);
+ self_issued ? "self-issued " : "", desc1, desc2);
if ((str = X509_NAME_oneline(X509_get_subject_name(cert), NULL, 0)) != NULL)
ossl_cmp_log1(INFO, ctx, " subject = %s", str);
OPENSSL_free(str);
@@ -258,7 +260,7 @@ static int cert_acceptable(const OSSL_CMP_CTX *ctx,
}
if (already_checked(cert, already_checked1)
- || already_checked(cert, already_checked2)) {
+ || already_checked(cert, already_checked2)) {
ossl_cmp_info(ctx, " cert has already been checked");
return 0;
}
@@ -286,13 +288,13 @@ static int cert_acceptable(const OSSL_CMP_CTX *ctx,
ossl_cmp_warn(ctx, message);
if (ctx->log_cb != NULL /* logging not temporarily disabled */
- && verify_cb_cert(ts, cert, err) <= 0)
+ && verify_cb_cert(ts, cert, err) <= 0)
return 0;
}
if (!check_name(ctx, 1,
- "cert subject", X509_get_subject_name(cert),
- "sender field", msg->header->sender->d.directoryName))
+ "cert subject", X509_get_subject_name(cert),
+ "sender field", msg->header->sender->d.directoryName))
return 0;
if (!check_kid(ctx, X509_get0_subject_key_id(cert), msg->header->senderKID))
@@ -312,13 +314,13 @@ static int cert_acceptable(const OSSL_CMP_CTX *ctx,
}
static int check_cert_path(const OSSL_CMP_CTX *ctx, X509_STORE *store,
- X509 *scrt)
+ X509 *scrt)
{
if (OSSL_CMP_validate_cert_path(ctx, store, scrt))
return 1;
ossl_cmp_warn(ctx,
- "msg signature validates but cert path validation failed");
+ "msg signature validates but cert path validation failed");
return 0;
}
@@ -330,7 +332,7 @@ static int check_cert_path(const OSSL_CMP_CTX *ctx, X509_STORE *store,
* provided it also can validate the newly enrolled certificate
*/
static int check_cert_path_3gpp(const OSSL_CMP_CTX *ctx,
- const OSSL_CMP_MSG *msg, X509 *scrt)
+ const OSSL_CMP_MSG *msg, X509 *scrt)
{
int valid = 0;
X509_STORE *store;
@@ -339,23 +341,22 @@ static int check_cert_path_3gpp(const OSSL_CMP_CTX *ctx,
return 0;
if ((store = X509_STORE_new()) == NULL
- || !ossl_cmp_X509_STORE_add1_certs(store, msg->extraCerts,
- 1 /* self-issued only */))
+ || !ossl_cmp_X509_STORE_add1_certs(store, msg->extraCerts,
+ 1 /* self-issued only */))
goto err;
/* store does not include CRLs */
valid = OSSL_CMP_validate_cert_path(ctx, store, scrt);
if (!valid) {
ossl_cmp_warn(ctx,
- "also exceptional 3GPP mode cert path validation failed");
+ "also exceptional 3GPP mode cert path validation failed");
} else if (OSSL_CMP_MSG_get_bodytype(msg) == OSSL_CMP_PKIBODY_IP) {
/*
* verify that the newly enrolled certificate (which assumed rid ==
* OSSL_CMP_CERTREQID) can also be validated with the same trusted store
*/
- OSSL_CMP_CERTRESPONSE *crep =
- ossl_cmp_certrepmessage_get0_certresponse(msg->body->value.ip,
- OSSL_CMP_CERTREQID);
+ OSSL_CMP_CERTRESPONSE *crep = ossl_cmp_certrepmessage_get0_certresponse(msg->body->value.ip,
+ OSSL_CMP_CERTREQID);
X509 *newcrt = NULL;
valid = crep != NULL
@@ -364,16 +365,16 @@ static int check_cert_path_3gpp(const OSSL_CMP_CTX *ctx,
X509_free(newcrt);
}
- err:
+err:
X509_STORE_free(store);
return valid;
}
static int check_msg_given_cert(const OSSL_CMP_CTX *ctx, X509 *cert,
- const OSSL_CMP_MSG *msg)
+ const OSSL_CMP_MSG *msg)
{
return cert_acceptable(ctx, "previously validated", "sender cert",
- cert, NULL, NULL, msg)
+ cert, NULL, NULL, msg)
&& (check_cert_path(ctx, ctx->trusted, cert)
|| check_cert_path_3gpp(ctx, msg, cert));
}
@@ -384,10 +385,10 @@ static int check_msg_given_cert(const OSSL_CMP_CTX *ctx, X509 *cert,
* On success cache the found cert using ossl_cmp_ctx_set1_validatedSrvCert().
*/
static int check_msg_with_certs(OSSL_CMP_CTX *ctx, const STACK_OF(X509) *certs,
- const char *desc,
- const STACK_OF(X509) *already_checked1,
- const STACK_OF(X509) *already_checked2,
- const OSSL_CMP_MSG *msg, int mode_3gpp)
+ const char *desc,
+ const STACK_OF(X509) *already_checked1,
+ const STACK_OF(X509) *already_checked2,
+ const OSSL_CMP_MSG *msg, int mode_3gpp)
{
int in_extraCerts = already_checked1 == NULL;
int n_acceptable_certs = 0;
@@ -404,7 +405,7 @@ static int check_msg_with_certs(OSSL_CMP_CTX *ctx, const STACK_OF(X509) *certs,
if (!ossl_assert(cert != NULL))
return 0;
if (!cert_acceptable(ctx, "cert from", desc, cert,
- already_checked1, already_checked2, msg))
+ already_checked1, already_checked2, msg))
continue;
n_acceptable_certs++;
if (mode_3gpp ? check_cert_path_3gpp(ctx, msg, cert)
@@ -424,36 +425,33 @@ static int check_msg_with_certs(OSSL_CMP_CTX *ctx, const STACK_OF(X509) *certs,
* On success cache the found cert using ossl_cmp_ctx_set1_validatedSrvCert().
*/
static int check_msg_all_certs(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg,
- int mode_3gpp)
+ int mode_3gpp)
{
int ret = 0;
if (ctx->permitTAInExtraCertsForIR
- && OSSL_CMP_MSG_get_bodytype(msg) == OSSL_CMP_PKIBODY_IP)
- ossl_cmp_info(ctx, mode_3gpp ?
- "normal mode failed; trying now 3GPP mode trusting extraCerts"
- : "trying first normal mode using trust store");
+ && OSSL_CMP_MSG_get_bodytype(msg) == OSSL_CMP_PKIBODY_IP)
+ ossl_cmp_info(ctx, mode_3gpp ? "normal mode failed; trying now 3GPP mode trusting extraCerts" : "trying first normal mode using trust store");
else if (mode_3gpp)
return 0;
if (check_msg_with_certs(ctx, msg->extraCerts, "extraCerts",
- NULL, NULL, msg, mode_3gpp))
+ NULL, NULL, msg, mode_3gpp))
return 1;
if (check_msg_with_certs(ctx, ctx->untrusted, "untrusted certs",
- msg->extraCerts, NULL, msg, mode_3gpp))
+ msg->extraCerts, NULL, msg, mode_3gpp))
return 1;
if (ctx->trusted == NULL) {
- ossl_cmp_warn(ctx, mode_3gpp ? "no self-issued extraCerts"
- : "no trusted store");
+ ossl_cmp_warn(ctx, mode_3gpp ? "no self-issued extraCerts" : "no trusted store");
} else {
STACK_OF(X509) *trusted = X509_STORE_get1_all_certs(ctx->trusted);
ret = check_msg_with_certs(ctx, trusted,
- mode_3gpp ? "self-issued extraCerts"
- : "certs in trusted store",
- msg->extraCerts, ctx->untrusted,
- msg, mode_3gpp);
+ mode_3gpp ? "self-issued extraCerts"
+ : "certs in trusted store",
+ msg->extraCerts, ctx->untrusted,
+ msg, mode_3gpp);
OSSL_STACK_OF_X509_free(trusted);
}
return ret;
@@ -502,12 +500,12 @@ static int check_msg_find_cert(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg)
(void)ossl_cmp_ctx_set1_validatedSrvCert(ctx, NULL);
/* re-do the above check (just) for adding diagnostic information */
ossl_cmp_info(ctx,
- "trying to verify msg signature with previously validated cert");
+ "trying to verify msg signature with previously validated cert");
(void)check_msg_given_cert(ctx, scrt, msg);
}
res = check_msg_all_certs(ctx, msg, 0 /* using ctx->trusted */)
- || check_msg_all_certs(ctx, msg, 1 /* 3gpp */);
+ || check_msg_all_certs(ctx, msg, 1 /* 3gpp */);
ctx->log_cb = backup_log_cb;
if (res) {
/* discard any diagnostic information on trying to use certs */
@@ -542,7 +540,7 @@ static int check_msg_find_cert(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg)
ERR_add_error_txt(NULL, skid_str);
}
- end:
+end:
OPENSSL_free(sname);
OPENSSL_free(skid_str);
return res;
@@ -570,13 +568,13 @@ int OSSL_CMP_validate_msg(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg)
ossl_cmp_debug(ctx, "validating CMP message");
if (ctx == NULL || msg == NULL
- || msg->header == NULL || msg->body == NULL) {
+ || msg->header == NULL || msg->body == NULL) {
ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT);
return 0;
}
if (msg->header->protectionAlg == NULL /* unprotected message */
- || msg->protection == NULL || msg->protection->data == NULL) {
+ || msg->protection == NULL || msg->protection->data == NULL) {
ERR_raise(ERR_LIB_CMP, CMP_R_MISSING_PROTECTION);
return 0;
}
@@ -616,7 +614,7 @@ int OSSL_CMP_validate_msg(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg)
break;
}
ossl_cmp_debug(ctx,
- "successfully validated PBM-based CMP message protection");
+ "successfully validated PBM-based CMP message protection");
return 1;
}
ossl_cmp_warn(ctx, "verifying PBM-based CMP message protection failed");
@@ -643,15 +641,15 @@ int OSSL_CMP_validate_msg(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg)
}
if (check_msg_find_cert(ctx, msg)) {
ossl_cmp_log1(DEBUG, ctx,
- "successfully validated signature-based CMP message protection using trust store%s",
- ctx->permitTAInExtraCertsForIR ? " or 3GPP mode": "");
+ "successfully validated signature-based CMP message protection using trust store%s",
+ ctx->permitTAInExtraCertsForIR ? " or 3GPP mode" : "");
return 1;
}
} else { /* use pinned sender cert */
/* use ctx->srvCert for signature check even if not acceptable */
if (verify_signature(ctx, msg, scrt)) {
ossl_cmp_debug(ctx,
- "successfully validated signature-based CMP message protection using pinned server cert");
+ "successfully validated signature-based CMP message protection using pinned server cert");
return ossl_cmp_ctx_set1_validatedSrvCert(ctx, scrt);
}
ossl_cmp_warn(ctx, "CMP message signature verification failed");
@@ -663,7 +661,7 @@ int OSSL_CMP_validate_msg(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg)
}
static int check_transactionID_or_nonce(ASN1_OCTET_STRING *expected,
- ASN1_OCTET_STRING *actual, int reason)
+ ASN1_OCTET_STRING *actual, int reason)
{
if (expected != NULL
&& (actual == NULL || ASN1_OCTET_STRING_cmp(expected, actual) != 0)) {
@@ -671,12 +669,12 @@ static int check_transactionID_or_nonce(ASN1_OCTET_STRING *expected,
char *expected_str, *actual_str;
expected_str = i2s_ASN1_OCTET_STRING(NULL, expected);
- actual_str = actual == NULL ? NULL: i2s_ASN1_OCTET_STRING(NULL, actual);
+ actual_str = actual == NULL ? NULL : i2s_ASN1_OCTET_STRING(NULL, actual);
ERR_raise_data(ERR_LIB_CMP, reason,
- "expected = %s, actual = %s",
- expected_str == NULL ? "?" : expected_str,
- actual == NULL ? "(none)" :
- actual_str == NULL ? "?" : actual_str);
+ "expected = %s, actual = %s",
+ expected_str == NULL ? "?" : expected_str,
+ actual == NULL ? "(none)" : actual_str == NULL ? "?"
+ : actual_str);
OPENSSL_free(expected_str);
OPENSSL_free(actual_str);
return 0;
@@ -706,7 +704,7 @@ static int check_transactionID_or_nonce(ASN1_OCTET_STRING *expected,
* Returns 1 on success, 0 on error.
*/
int ossl_cmp_msg_check_update(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg,
- ossl_cmp_allow_unprotected_cb_t cb, int cb_arg)
+ ossl_cmp_allow_unprotected_cb_t cb, int cb_arg)
{
OSSL_CMP_PKIHEADER *hdr;
const X509_NAME *expected_sender;
@@ -740,10 +738,10 @@ int ossl_cmp_msg_check_update(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg,
* misused certificate of an unauthorized entity of a trusted hierarchy.
*/
if (!check_name(ctx, 0, "sender DN field", actual_sender,
- "expected sender", expected_sender)) {
+ "expected sender", expected_sender)) {
str = X509_NAME_oneline(actual_sender, NULL, 0);
ERR_raise_data(ERR_LIB_CMP, CMP_R_UNEXPECTED_SENDER,
- str != NULL ? str : "<unknown>");
+ str != NULL ? str : "<unknown>");
OPENSSL_free(str);
return 0;
}
@@ -753,7 +751,7 @@ int ossl_cmp_msg_check_update(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg,
num_added = sk_X509_num(msg->extraCerts);
if (num_added > 10)
ossl_cmp_log1(WARN, ctx, "received CMP message contains %d extraCerts",
- num_added);
+ num_added);
/*
* Store any provided extraCerts in ctx for use in OSSL_CMP_validate_msg()
* and for future use, such that they are available to ctx->certConf_cb and
@@ -765,9 +763,9 @@ int ossl_cmp_msg_check_update(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg,
*/
num_untrusted = ctx->untrusted == NULL ? 0 : sk_X509_num(ctx->untrusted);
res = ossl_x509_add_certs_new(&ctx->untrusted, msg->extraCerts,
- /* this allows self-signed certs */
- X509_ADD_FLAG_UP_REF | X509_ADD_FLAG_NO_DUP
- | X509_ADD_FLAG_PREPEND);
+ /* this allows self-signed certs */
+ X509_ADD_FLAG_UP_REF | X509_ADD_FLAG_NO_DUP
+ | X509_ADD_FLAG_PREPEND);
num_added = (ctx->untrusted == NULL ? 0 : sk_X509_num(ctx->untrusted))
- num_untrusted;
if (!res) {
@@ -802,7 +800,7 @@ int ossl_cmp_msg_check_update(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg,
/* check CMP version number in header */
if (ossl_cmp_hdr_get_pvno(hdr) != OSSL_CMP_PVNO_2
- && ossl_cmp_hdr_get_pvno(hdr) != OSSL_CMP_PVNO_3) {
+ && ossl_cmp_hdr_get_pvno(hdr) != OSSL_CMP_PVNO_3) {
#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
ERR_raise(ERR_LIB_CMP, CMP_R_UNEXPECTED_PVNO);
return 0;
@@ -818,7 +816,7 @@ int ossl_cmp_msg_check_update(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg,
/* compare received transactionID with the expected one in previous msg */
if (!check_transactionID_or_nonce(ctx->transactionID, hdr->transactionID,
- CMP_R_TRANSACTIONID_UNMATCHED))
+ CMP_R_TRANSACTIONID_UNMATCHED))
return 0;
/*
@@ -828,14 +826,14 @@ int ossl_cmp_msg_check_update(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg,
(void)ERR_set_mark();
/* compare received nonce with the one we sent */
if (!check_transactionID_or_nonce(ctx->senderNonce, hdr->recipNonce,
- CMP_R_RECIPNONCE_UNMATCHED)) {
+ CMP_R_RECIPNONCE_UNMATCHED)) {
/* check if we are polling and received final response */
if (ctx->first_senderNonce == NULL
|| OSSL_CMP_MSG_get_bodytype(msg) == OSSL_CMP_PKIBODY_POLLREP
/* compare received nonce with our sender nonce at poll start */
|| !check_transactionID_or_nonce(ctx->first_senderNonce,
- hdr->recipNonce,
- CMP_R_RECIPNONCE_UNMATCHED)) {
+ hdr->recipNonce,
+ CMP_R_RECIPNONCE_UNMATCHED)) {
(void)ERR_clear_last_mark();
return 0;
}
@@ -884,30 +882,29 @@ int ossl_cmp_msg_check_update(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg,
}
int ossl_cmp_verify_popo(const OSSL_CMP_CTX *ctx,
- const OSSL_CMP_MSG *msg, int acceptRAVerified)
+ const OSSL_CMP_MSG *msg, int acceptRAVerified)
{
if (!ossl_assert(msg != NULL && msg->body != NULL))
return 0;
switch (msg->body->type) {
- case OSSL_CMP_PKIBODY_P10CR:
- {
- X509_REQ *req = msg->body->value.p10cr;
+ case OSSL_CMP_PKIBODY_P10CR: {
+ X509_REQ *req = msg->body->value.p10cr;
- if (X509_REQ_verify_ex(req, X509_REQ_get0_pubkey(req), ctx->libctx,
- ctx->propq) <= 0) {
+ if (X509_REQ_verify_ex(req, X509_REQ_get0_pubkey(req), ctx->libctx,
+ ctx->propq)
+ <= 0) {
#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
- ERR_raise(ERR_LIB_CMP, CMP_R_REQUEST_NOT_ACCEPTED);
- return 0;
+ ERR_raise(ERR_LIB_CMP, CMP_R_REQUEST_NOT_ACCEPTED);
+ return 0;
#endif
- }
}
- break;
+ } break;
case OSSL_CMP_PKIBODY_IR:
case OSSL_CMP_PKIBODY_CR:
case OSSL_CMP_PKIBODY_KUR:
if (!OSSL_CRMF_MSGS_verify_popo(msg->body->value.ir, OSSL_CMP_CERTREQID,
- acceptRAVerified,
- ctx->libctx, ctx->propq)) {
+ acceptRAVerified,
+ ctx->libctx, ctx->propq)) {
#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
return 0;
#endif
diff --git a/crypto/cms/cms_asn1.c b/crypto/cms/cms_asn1.c
index e2f0040dfb..22c809d716 100644
--- a/crypto/cms/cms_asn1.c
+++ b/crypto/cms/cms_asn1.c
@@ -13,38 +13,29 @@
#include <openssl/cms.h>
#include "cms_local.h"
-
ASN1_SEQUENCE(CMS_IssuerAndSerialNumber) = {
- ASN1_SIMPLE(CMS_IssuerAndSerialNumber, issuer, X509_NAME),
- ASN1_SIMPLE(CMS_IssuerAndSerialNumber, serialNumber, ASN1_INTEGER)
+ ASN1_SIMPLE(CMS_IssuerAndSerialNumber, issuer, X509_NAME),
+ ASN1_SIMPLE(CMS_IssuerAndSerialNumber, serialNumber, ASN1_INTEGER)
} ASN1_SEQUENCE_END(CMS_IssuerAndSerialNumber)
ASN1_SEQUENCE(CMS_OtherCertificateFormat) = {
- ASN1_SIMPLE(CMS_OtherCertificateFormat, otherCertFormat, ASN1_OBJECT),
- ASN1_OPT(CMS_OtherCertificateFormat, otherCert, ASN1_ANY)
+ ASN1_SIMPLE(CMS_OtherCertificateFormat, otherCertFormat, ASN1_OBJECT),
+ ASN1_OPT(CMS_OtherCertificateFormat, otherCert, ASN1_ANY)
} static_ASN1_SEQUENCE_END(CMS_OtherCertificateFormat)
-ASN1_CHOICE(CMS_CertificateChoices) = {
- ASN1_SIMPLE(CMS_CertificateChoices, d.certificate, X509),
- ASN1_IMP(CMS_CertificateChoices, d.extendedCertificate, ASN1_SEQUENCE, 0),
- ASN1_IMP(CMS_CertificateChoices, d.v1AttrCert, ASN1_SEQUENCE, 1),
- ASN1_IMP(CMS_CertificateChoices, d.v2AttrCert, ASN1_SEQUENCE, 2),
- ASN1_IMP(CMS_CertificateChoices, d.other, CMS_OtherCertificateFormat, 3)
-} ASN1_CHOICE_END(CMS_CertificateChoices)
+ ASN1_CHOICE(CMS_CertificateChoices)
+ = { ASN1_SIMPLE(CMS_CertificateChoices, d.certificate, X509), ASN1_IMP(CMS_CertificateChoices, d.extendedCertificate, ASN1_SEQUENCE, 0), ASN1_IMP(CMS_CertificateChoices, d.v1AttrCert, ASN1_SEQUENCE, 1), ASN1_IMP(CMS_CertificateChoices, d.v2AttrCert, ASN1_SEQUENCE, 2), ASN1_IMP(CMS_CertificateChoices, d.other, CMS_OtherCertificateFormat, 3) } ASN1_CHOICE_END(CMS_CertificateChoices)
ASN1_CHOICE(CMS_SignerIdentifier) = {
- ASN1_SIMPLE(CMS_SignerIdentifier, d.issuerAndSerialNumber, CMS_IssuerAndSerialNumber),
- ASN1_IMP(CMS_SignerIdentifier, d.subjectKeyIdentifier, ASN1_OCTET_STRING, 0)
+ ASN1_SIMPLE(CMS_SignerIdentifier, d.issuerAndSerialNumber, CMS_IssuerAndSerialNumber),
+ ASN1_IMP(CMS_SignerIdentifier, d.subjectKeyIdentifier, ASN1_OCTET_STRING, 0)
} static_ASN1_CHOICE_END(CMS_SignerIdentifier)
-ASN1_NDEF_SEQUENCE(CMS_EncapsulatedContentInfo) = {
- ASN1_SIMPLE(CMS_EncapsulatedContentInfo, eContentType, ASN1_OBJECT),
- ASN1_NDEF_EXP_OPT(CMS_EncapsulatedContentInfo, eContent, ASN1_OCTET_STRING_NDEF, 0)
-} static_ASN1_NDEF_SEQUENCE_END(CMS_EncapsulatedContentInfo)
+ ASN1_NDEF_SEQUENCE(CMS_EncapsulatedContentInfo)
+ = { ASN1_SIMPLE(CMS_EncapsulatedContentInfo, eContentType, ASN1_OBJECT), ASN1_NDEF_EXP_OPT(CMS_EncapsulatedContentInfo, eContent, ASN1_OCTET_STRING_NDEF, 0) } static_ASN1_NDEF_SEQUENCE_END(CMS_EncapsulatedContentInfo)
-/* Minor tweak to operation: free up signer key, cert */
-static int cms_si_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
- void *exarg)
+ /* Minor tweak to operation: free up signer key, cert */
+ static int cms_si_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, void *exarg)
{
if (operation == ASN1_OP_FREE_POST) {
CMS_SignerInfo *si = (CMS_SignerInfo *)*pval;
@@ -57,42 +48,39 @@ static int cms_si_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
}
ASN1_SEQUENCE_cb(CMS_SignerInfo, cms_si_cb) = {
- ASN1_EMBED(CMS_SignerInfo, version, INT32),
- ASN1_SIMPLE(CMS_SignerInfo, sid, CMS_SignerIdentifier),
- ASN1_SIMPLE(CMS_SignerInfo, digestAlgorithm, X509_ALGOR),
- ASN1_IMP_SET_OF_OPT(CMS_SignerInfo, signedAttrs, X509_ATTRIBUTE, 0),
- ASN1_SIMPLE(CMS_SignerInfo, signatureAlgorithm, X509_ALGOR),
- ASN1_SIMPLE(CMS_SignerInfo, signature, ASN1_OCTET_STRING),
- ASN1_IMP_SET_OF_OPT(CMS_SignerInfo, unsignedAttrs, X509_ATTRIBUTE, 1)
+ ASN1_EMBED(CMS_SignerInfo, version, INT32),
+ ASN1_SIMPLE(CMS_SignerInfo, sid, CMS_SignerIdentifier),
+ ASN1_SIMPLE(CMS_SignerInfo, digestAlgorithm, X509_ALGOR),
+ ASN1_IMP_SET_OF_OPT(CMS_SignerInfo, signedAttrs, X509_ATTRIBUTE, 0),
+ ASN1_SIMPLE(CMS_SignerInfo, signatureAlgorithm, X509_ALGOR),
+ ASN1_SIMPLE(CMS_SignerInfo, signature, ASN1_OCTET_STRING),
+ ASN1_IMP_SET_OF_OPT(CMS_SignerInfo, unsignedAttrs, X509_ATTRIBUTE, 1)
} ASN1_SEQUENCE_END_cb(CMS_SignerInfo, CMS_SignerInfo)
ASN1_SEQUENCE(CMS_OtherRevocationInfoFormat) = {
- ASN1_SIMPLE(CMS_OtherRevocationInfoFormat, otherRevInfoFormat, ASN1_OBJECT),
- ASN1_OPT(CMS_OtherRevocationInfoFormat, otherRevInfo, ASN1_ANY)
+ ASN1_SIMPLE(CMS_OtherRevocationInfoFormat, otherRevInfoFormat, ASN1_OBJECT),
+ ASN1_OPT(CMS_OtherRevocationInfoFormat, otherRevInfo, ASN1_ANY)
} static_ASN1_SEQUENCE_END(CMS_OtherRevocationInfoFormat)
-ASN1_CHOICE(CMS_RevocationInfoChoice) = {
- ASN1_SIMPLE(CMS_RevocationInfoChoice, d.crl, X509_CRL),
- ASN1_IMP(CMS_RevocationInfoChoice, d.other, CMS_OtherRevocationInfoFormat, 1)
-} ASN1_CHOICE_END(CMS_RevocationInfoChoice)
+ ASN1_CHOICE(CMS_RevocationInfoChoice)
+ = { ASN1_SIMPLE(CMS_RevocationInfoChoice, d.crl, X509_CRL), ASN1_IMP(CMS_RevocationInfoChoice, d.other, CMS_OtherRevocationInfoFormat, 1) } ASN1_CHOICE_END(CMS_RevocationInfoChoice)
ASN1_NDEF_SEQUENCE(CMS_SignedData) = {
- ASN1_EMBED(CMS_SignedData, version, INT32),
- ASN1_SET_OF(CMS_SignedData, digestAlgorithms, X509_ALGOR),
- ASN1_SIMPLE(CMS_SignedData, encapContentInfo, CMS_EncapsulatedContentInfo),
- ASN1_IMP_SET_OF_OPT(CMS_SignedData, certificates, CMS_CertificateChoices, 0),
- ASN1_IMP_SET_OF_OPT(CMS_SignedData, crls, CMS_RevocationInfoChoice, 1),
- ASN1_SET_OF(CMS_SignedData, signerInfos, CMS_SignerInfo)
+ ASN1_EMBED(CMS_SignedData, version, INT32),
+ ASN1_SET_OF(CMS_SignedData, digestAlgorithms, X509_ALGOR),
+ ASN1_SIMPLE(CMS_SignedData, encapContentInfo, CMS_EncapsulatedContentInfo),
+ ASN1_IMP_SET_OF_OPT(CMS_SignedData, certificates, CMS_CertificateChoices, 0),
+ ASN1_IMP_SET_OF_OPT(CMS_SignedData, crls, CMS_RevocationInfoChoice, 1),
+ ASN1_SET_OF(CMS_SignedData, signerInfos, CMS_SignerInfo)
} ASN1_NDEF_SEQUENCE_END(CMS_SignedData)
IMPLEMENT_ASN1_ALLOC_FUNCTIONS(CMS_SignedData)
ASN1_SEQUENCE(CMS_OriginatorInfo) = {
- ASN1_IMP_SET_OF_OPT(CMS_OriginatorInfo, certificates, CMS_CertificateChoices, 0),
- ASN1_IMP_SET_OF_OPT(CMS_OriginatorInfo, crls, CMS_RevocationInfoChoice, 1)
+ ASN1_IMP_SET_OF_OPT(CMS_OriginatorInfo, certificates, CMS_CertificateChoices, 0),
+ ASN1_IMP_SET_OF_OPT(CMS_OriginatorInfo, crls, CMS_RevocationInfoChoice, 1)
} static_ASN1_SEQUENCE_END(CMS_OriginatorInfo)
-static int cms_ec_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
- void *exarg)
+ static int cms_ec_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, void *exarg)
{
CMS_EncryptedContentInfo *ec = (CMS_EncryptedContentInfo *)*pval;
@@ -102,36 +90,35 @@ static int cms_ec_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
}
ASN1_NDEF_SEQUENCE_cb(CMS_EncryptedContentInfo, cms_ec_cb) = {
- ASN1_SIMPLE(CMS_EncryptedContentInfo, contentType, ASN1_OBJECT),
- ASN1_SIMPLE(CMS_EncryptedContentInfo, contentEncryptionAlgorithm, X509_ALGOR),
- ASN1_IMP_OPT(CMS_EncryptedContentInfo, encryptedContent, ASN1_OCTET_STRING_NDEF, 0)
+ ASN1_SIMPLE(CMS_EncryptedContentInfo, contentType, ASN1_OBJECT),
+ ASN1_SIMPLE(CMS_EncryptedContentInfo, contentEncryptionAlgorithm, X509_ALGOR),
+ ASN1_IMP_OPT(CMS_EncryptedContentInfo, encryptedContent, ASN1_OCTET_STRING_NDEF, 0)
} ASN1_NDEF_SEQUENCE_END_cb(CMS_EncryptedContentInfo, CMS_EncryptedContentInfo)
ASN1_SEQUENCE(CMS_KeyTransRecipientInfo) = {
- ASN1_EMBED(CMS_KeyTransRecipientInfo, version, INT32),
- ASN1_SIMPLE(CMS_KeyTransRecipientInfo, rid, CMS_SignerIdentifier),
- ASN1_SIMPLE(CMS_KeyTransRecipientInfo, keyEncryptionAlgorithm, X509_ALGOR),
- ASN1_SIMPLE(CMS_KeyTransRecipientInfo, encryptedKey, ASN1_OCTET_STRING)
+ ASN1_EMBED(CMS_KeyTransRecipientInfo, version, INT32),
+ ASN1_SIMPLE(CMS_KeyTransRecipientInfo, rid, CMS_SignerIdentifier),
+ ASN1_SIMPLE(CMS_KeyTransRecipientInfo, keyEncryptionAlgorithm, X509_ALGOR),
+ ASN1_SIMPLE(CMS_KeyTransRecipientInfo, encryptedKey, ASN1_OCTET_STRING)
} ASN1_SEQUENCE_END(CMS_KeyTransRecipientInfo)
ASN1_SEQUENCE(CMS_OtherKeyAttribute) = {
- ASN1_SIMPLE(CMS_OtherKeyAttribute, keyAttrId, ASN1_OBJECT),
- ASN1_OPT(CMS_OtherKeyAttribute, keyAttr, ASN1_ANY)
+ ASN1_SIMPLE(CMS_OtherKeyAttribute, keyAttrId, ASN1_OBJECT),
+ ASN1_OPT(CMS_OtherKeyAttribute, keyAttr, ASN1_ANY)
} ASN1_SEQUENCE_END(CMS_OtherKeyAttribute)
ASN1_SEQUENCE(CMS_RecipientKeyIdentifier) = {
- ASN1_SIMPLE(CMS_RecipientKeyIdentifier, subjectKeyIdentifier, ASN1_OCTET_STRING),
- ASN1_OPT(CMS_RecipientKeyIdentifier, date, ASN1_GENERALIZEDTIME),
- ASN1_OPT(CMS_RecipientKeyIdentifier, other, CMS_OtherKeyAttribute)
+ ASN1_SIMPLE(CMS_RecipientKeyIdentifier, subjectKeyIdentifier, ASN1_OCTET_STRING),
+ ASN1_OPT(CMS_RecipientKeyIdentifier, date, ASN1_GENERALIZEDTIME),
+ ASN1_OPT(CMS_RecipientKeyIdentifier, other, CMS_OtherKeyAttribute)
} ASN1_SEQUENCE_END(CMS_RecipientKeyIdentifier)
ASN1_CHOICE(CMS_KeyAgreeRecipientIdentifier) = {
- ASN1_SIMPLE(CMS_KeyAgreeRecipientIdentifier, d.issuerAndSerialNumber, CMS_IssuerAndSerialNumber),
- ASN1_IMP(CMS_KeyAgreeRecipientIdentifier, d.rKeyId, CMS_RecipientKeyIdentifier, 0)
+ ASN1_SIMPLE(CMS_KeyAgreeRecipientIdentifier, d.issuerAndSerialNumber, CMS_IssuerAndSerialNumber),
+ ASN1_IMP(CMS_KeyAgreeRecipientIdentifier, d.rKeyId, CMS_RecipientKeyIdentifier, 0)
} static_ASN1_CHOICE_END(CMS_KeyAgreeRecipientIdentifier)
-static int cms_rek_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
- void *exarg)
+ static int cms_rek_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, void *exarg)
{
CMS_RecipientEncryptedKey *rek = (CMS_RecipientEncryptedKey *)*pval;
if (operation == ASN1_OP_FREE_POST) {
@@ -141,23 +128,22 @@ static int cms_rek_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
}
ASN1_SEQUENCE_cb(CMS_RecipientEncryptedKey, cms_rek_cb) = {
- ASN1_SIMPLE(CMS_RecipientEncryptedKey, rid, CMS_KeyAgreeRecipientIdentifier),
- ASN1_SIMPLE(CMS_RecipientEncryptedKey, encryptedKey, ASN1_OCTET_STRING)
+ ASN1_SIMPLE(CMS_RecipientEncryptedKey, rid, CMS_KeyAgreeRecipientIdentifier),
+ ASN1_SIMPLE(CMS_RecipientEncryptedKey, encryptedKey, ASN1_OCTET_STRING)
} ASN1_SEQUENCE_END_cb(CMS_RecipientEncryptedKey, CMS_RecipientEncryptedKey)
ASN1_SEQUENCE(CMS_OriginatorPublicKey) = {
- ASN1_SIMPLE(CMS_OriginatorPublicKey, algorithm, X509_ALGOR),
- ASN1_SIMPLE(CMS_OriginatorPublicKey, publicKey, ASN1_BIT_STRING)
+ ASN1_SIMPLE(CMS_OriginatorPublicKey, algorithm, X509_ALGOR),
+ ASN1_SIMPLE(CMS_OriginatorPublicKey, publicKey, ASN1_BIT_STRING)
} ASN1_SEQUENCE_END(CMS_OriginatorPublicKey)
ASN1_CHOICE(CMS_OriginatorIdentifierOrKey) = {
- ASN1_SIMPLE(CMS_OriginatorIdentifierOrKey, d.issuerAndSerialNumber, CMS_IssuerAndSerialNumber),
- ASN1_IMP(CMS_OriginatorIdentifierOrKey, d.subjectKeyIdentifier, ASN1_OCTET_STRING, 0),
- ASN1_IMP(CMS_OriginatorIdentifierOrKey, d.originatorKey, CMS_OriginatorPublicKey, 1)
+ ASN1_SIMPLE(CMS_OriginatorIdentifierOrKey, d.issuerAndSerialNumber, CMS_IssuerAndSerialNumber),
+ ASN1_IMP(CMS_OriginatorIdentifierOrKey, d.subjectKeyIdentifier, ASN1_OCTET_STRING, 0),
+ ASN1_IMP(CMS_OriginatorIdentifierOrKey, d.originatorKey, CMS_OriginatorPublicKey, 1)
} static_ASN1_CHOICE_END(CMS_OriginatorIdentifierOrKey)
-static int cms_kari_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
- void *exarg)
+ static int cms_kari_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, void *exarg)
{
CMS_KeyAgreeRecipientInfo *kari = (CMS_KeyAgreeRecipientInfo *)*pval;
if (operation == ASN1_OP_NEW_POST) {
@@ -174,35 +160,31 @@ static int cms_kari_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
}
ASN1_SEQUENCE_cb(CMS_KeyAgreeRecipientInfo, cms_kari_cb) = {
- ASN1_EMBED(CMS_KeyAgreeRecipientInfo, version, INT32),
- ASN1_EXP(CMS_KeyAgreeRecipientInfo, originator, CMS_OriginatorIdentifierOrKey, 0),
- ASN1_EXP_OPT(CMS_KeyAgreeRecipientInfo, ukm, ASN1_OCTET_STRING, 1),
- ASN1_SIMPLE(CMS_KeyAgreeRecipientInfo, keyEncryptionAlgorithm, X509_ALGOR),
- ASN1_SEQUENCE_OF(CMS_KeyAgreeRecipientInfo, recipientEncryptedKeys, CMS_RecipientEncryptedKey)
+ ASN1_EMBED(CMS_KeyAgreeRecipientInfo, version, INT32),
+ ASN1_EXP(CMS_KeyAgreeRecipientInfo, originator, CMS_OriginatorIdentifierOrKey, 0),
+ ASN1_EXP_OPT(CMS_KeyAgreeRecipientInfo, ukm, ASN1_OCTET_STRING, 1),
+ ASN1_SIMPLE(CMS_KeyAgreeRecipientInfo, keyEncryptionAlgorithm, X509_ALGOR),
+ ASN1_SEQUENCE_OF(CMS_KeyAgreeRecipientInfo, recipientEncryptedKeys, CMS_RecipientEncryptedKey)
} ASN1_SEQUENCE_END_cb(CMS_KeyAgreeRecipientInfo, CMS_KeyAgreeRecipientInfo)
ASN1_SEQUENCE(CMS_KEKIdentifier) = {
- ASN1_SIMPLE(CMS_KEKIdentifier, keyIdentifier, ASN1_OCTET_STRING),
- ASN1_OPT(CMS_KEKIdentifier, date, ASN1_GENERALIZEDTIME),
- ASN1_OPT(CMS_KEKIdentifier, other, CMS_OtherKeyAttribute)
+ ASN1_SIMPLE(CMS_KEKIdentifier, keyIdentifier, ASN1_OCTET_STRING),
+ ASN1_OPT(CMS_KEKIdentifier, date, ASN1_GENERALIZEDTIME),
+ ASN1_OPT(CMS_KEKIdentifier, other, CMS_OtherKeyAttribute)
} static_ASN1_SEQUENCE_END(CMS_KEKIdentifier)
-ASN1_SEQUENCE(CMS_KEKRecipientInfo) = {
- ASN1_EMBED(CMS_KEKRecipientInfo, version, INT32),
- ASN1_SIMPLE(CMS_KEKRecipientInfo, kekid, CMS_KEKIdentifier),
- ASN1_SIMPLE(CMS_KEKRecipientInfo, keyEncryptionAlgorithm, X509_ALGOR),
- ASN1_SIMPLE(CMS_KEKRecipientInfo, encryptedKey, ASN1_OCTET_STRING)
-} ASN1_SEQUENCE_END(CMS_KEKRecipientInfo)
+ ASN1_SEQUENCE(CMS_KEKRecipientInfo)
+ = { ASN1_EMBED(CMS_KEKRecipientInfo, version, INT32), ASN1_SIMPLE(CMS_KEKRecipientInfo, kekid, CMS_KEKIdentifier), ASN1_SIMPLE(CMS_KEKRecipientInfo, keyEncryptionAlgorithm, X509_ALGOR), ASN1_SIMPLE(CMS_KEKRecipientInfo, encryptedKey, ASN1_OCTET_STRING) } ASN1_SEQUENCE_END(CMS_KEKRecipientInfo)
ASN1_SEQUENCE(CMS_PasswordRecipientInfo) = {
- ASN1_EMBED(CMS_PasswordRecipientInfo, version, INT32),
- ASN1_IMP_OPT(CMS_PasswordRecipientInfo, keyDerivationAlgorithm, X509_ALGOR, 0),
- ASN1_SIMPLE(CMS_PasswordRecipientInfo, keyEncryptionAlgorithm, X509_ALGOR),
- ASN1_SIMPLE(CMS_PasswordRecipientInfo, encryptedKey, ASN1_OCTET_STRING)
+ ASN1_EMBED(CMS_PasswordRecipientInfo, version, INT32),
+ ASN1_IMP_OPT(CMS_PasswordRecipientInfo, keyDerivationAlgorithm, X509_ALGOR, 0),
+ ASN1_SIMPLE(CMS_PasswordRecipientInfo, keyEncryptionAlgorithm, X509_ALGOR),
+ ASN1_SIMPLE(CMS_PasswordRecipientInfo, encryptedKey, ASN1_OCTET_STRING)
} ASN1_SEQUENCE_END(CMS_PasswordRecipientInfo)
static int cms_kemri_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
- void *exarg)
+ void *exarg)
{
CMS_KEMRecipientInfo *kemri = (CMS_KEMRecipientInfo *)*pval;
@@ -221,36 +203,35 @@ static int cms_kemri_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
}
ASN1_SEQUENCE_cb(CMS_KEMRecipientInfo, cms_kemri_cb) = {
- ASN1_EMBED(CMS_KEMRecipientInfo, version, INT32),
- ASN1_SIMPLE(CMS_KEMRecipientInfo, rid, CMS_SignerIdentifier),
- ASN1_SIMPLE(CMS_KEMRecipientInfo, kem, X509_ALGOR),
- ASN1_SIMPLE(CMS_KEMRecipientInfo, kemct, ASN1_OCTET_STRING),
- ASN1_SIMPLE(CMS_KEMRecipientInfo, kdf, X509_ALGOR),
- ASN1_EMBED(CMS_KEMRecipientInfo, kekLength, INT32),
- ASN1_EXP_OPT(CMS_KEMRecipientInfo, ukm, ASN1_OCTET_STRING, 0),
- ASN1_SIMPLE(CMS_KEMRecipientInfo, wrap, X509_ALGOR),
- ASN1_SIMPLE(CMS_KEMRecipientInfo, encryptedKey, ASN1_OCTET_STRING)
+ ASN1_EMBED(CMS_KEMRecipientInfo, version, INT32),
+ ASN1_SIMPLE(CMS_KEMRecipientInfo, rid, CMS_SignerIdentifier),
+ ASN1_SIMPLE(CMS_KEMRecipientInfo, kem, X509_ALGOR),
+ ASN1_SIMPLE(CMS_KEMRecipientInfo, kemct, ASN1_OCTET_STRING),
+ ASN1_SIMPLE(CMS_KEMRecipientInfo, kdf, X509_ALGOR),
+ ASN1_EMBED(CMS_KEMRecipientInfo, kekLength, INT32),
+ ASN1_EXP_OPT(CMS_KEMRecipientInfo, ukm, ASN1_OCTET_STRING, 0),
+ ASN1_SIMPLE(CMS_KEMRecipientInfo, wrap, X509_ALGOR),
+ ASN1_SIMPLE(CMS_KEMRecipientInfo, encryptedKey, ASN1_OCTET_STRING)
} ASN1_SEQUENCE_END_cb(CMS_KEMRecipientInfo, CMS_KEMRecipientInfo)
ASN1_ADB_TEMPLATE(ori_def) = ASN1_SIMPLE(CMS_OtherRecipientInfo, d.other, ASN1_ANY);
ASN1_ADB(CMS_OtherRecipientInfo) = {
- ADB_ENTRY(NID_id_smime_ori_kem, ASN1_SIMPLE(CMS_OtherRecipientInfo, d.kemri,
- CMS_KEMRecipientInfo))
+ ADB_ENTRY(NID_id_smime_ori_kem, ASN1_SIMPLE(CMS_OtherRecipientInfo, d.kemri, CMS_KEMRecipientInfo))
} ASN1_ADB_END(CMS_OtherRecipientInfo, 0, oriType, 0, &ori_def_tt, NULL);
DECLARE_ASN1_FUNCTIONS(CMS_OtherRecipientInfo)
ASN1_SEQUENCE(CMS_OtherRecipientInfo) = {
- ASN1_SIMPLE(CMS_OtherRecipientInfo, oriType, ASN1_OBJECT),
- ASN1_ADB_OBJECT(CMS_OtherRecipientInfo)
+ ASN1_SIMPLE(CMS_OtherRecipientInfo, oriType, ASN1_OBJECT),
+ ASN1_ADB_OBJECT(CMS_OtherRecipientInfo)
} ASN1_SEQUENCE_END(CMS_OtherRecipientInfo)
IMPLEMENT_ASN1_FUNCTIONS(CMS_OtherRecipientInfo)
/* Free up RecipientInfo additional data */
static int cms_ri_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
- void *exarg)
+ void *exarg)
{
if (operation == ASN1_OP_FREE_PRE) {
CMS_RecipientInfo *ri = (CMS_RecipientInfo *)*pval;
@@ -288,82 +269,83 @@ static int cms_ri_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
}
ASN1_CHOICE_cb(CMS_RecipientInfo, cms_ri_cb) = {
- ASN1_SIMPLE(CMS_RecipientInfo, d.ktri, CMS_KeyTransRecipientInfo),
- ASN1_IMP(CMS_RecipientInfo, d.kari, CMS_KeyAgreeRecipientInfo, 1),
- ASN1_IMP(CMS_RecipientInfo, d.kekri, CMS_KEKRecipientInfo, 2),
- ASN1_IMP(CMS_RecipientInfo, d.pwri, CMS_PasswordRecipientInfo, 3),
- ASN1_IMP(CMS_RecipientInfo, d.ori, CMS_OtherRecipientInfo, 4)
+ ASN1_SIMPLE(CMS_RecipientInfo, d.ktri, CMS_KeyTransRecipientInfo),
+ ASN1_IMP(CMS_RecipientInfo, d.kari, CMS_KeyAgreeRecipientInfo, 1),
+ ASN1_IMP(CMS_RecipientInfo, d.kekri, CMS_KEKRecipientInfo, 2),
+ ASN1_IMP(CMS_RecipientInfo, d.pwri, CMS_PasswordRecipientInfo, 3),
+ ASN1_IMP(CMS_RecipientInfo, d.ori, CMS_OtherRecipientInfo, 4)
} ASN1_CHOICE_END_cb(CMS_RecipientInfo, CMS_RecipientInfo, encoded_type)
ASN1_NDEF_SEQUENCE(CMS_EnvelopedData) = {
- ASN1_EMBED(CMS_EnvelopedData, version, INT32),
- ASN1_IMP_OPT(CMS_EnvelopedData, originatorInfo, CMS_OriginatorInfo, 0),
- ASN1_SET_OF(CMS_EnvelopedData, recipientInfos, CMS_RecipientInfo),
- ASN1_SIMPLE(CMS_EnvelopedData, encryptedContentInfo, CMS_EncryptedContentInfo),
- ASN1_IMP_SET_OF_OPT(CMS_EnvelopedData, unprotectedAttrs, X509_ATTRIBUTE, 1)
+ ASN1_EMBED(CMS_EnvelopedData, version, INT32),
+ ASN1_IMP_OPT(CMS_EnvelopedData, originatorInfo, CMS_OriginatorInfo, 0),
+ ASN1_SET_OF(CMS_EnvelopedData, recipientInfos, CMS_RecipientInfo),
+ ASN1_SIMPLE(CMS_EnvelopedData, encryptedContentInfo, CMS_EncryptedContentInfo),
+ ASN1_IMP_SET_OF_OPT(CMS_EnvelopedData, unprotectedAttrs, X509_ATTRIBUTE, 1)
} ASN1_NDEF_SEQUENCE_END(CMS_EnvelopedData)
IMPLEMENT_ASN1_DUP_FUNCTION(CMS_EnvelopedData)
ASN1_NDEF_SEQUENCE(CMS_DigestedData) = {
- ASN1_EMBED(CMS_DigestedData, version, INT32),
- ASN1_SIMPLE(CMS_DigestedData, digestAlgorithm, X509_ALGOR),
- ASN1_SIMPLE(CMS_DigestedData, encapContentInfo, CMS_EncapsulatedContentInfo),
- ASN1_SIMPLE(CMS_DigestedData, digest, ASN1_OCTET_STRING)
+ ASN1_EMBED(CMS_DigestedData, version, INT32),
+ ASN1_SIMPLE(CMS_DigestedData, digestAlgorithm, X509_ALGOR),
+ ASN1_SIMPLE(CMS_DigestedData, encapContentInfo, CMS_EncapsulatedContentInfo),
+ ASN1_SIMPLE(CMS_DigestedData, digest, ASN1_OCTET_STRING)
} ASN1_NDEF_SEQUENCE_END(CMS_DigestedData)
ASN1_NDEF_SEQUENCE(CMS_EncryptedData) = {
- ASN1_EMBED(CMS_EncryptedData, version, INT32),
- ASN1_SIMPLE(CMS_EncryptedData, encryptedContentInfo, CMS_EncryptedContentInfo),
- ASN1_IMP_SET_OF_OPT(CMS_EncryptedData, unprotectedAttrs, X509_ATTRIBUTE, 1)
+ ASN1_EMBED(CMS_EncryptedData, version, INT32),
+ ASN1_SIMPLE(CMS_EncryptedData, encryptedContentInfo, CMS_EncryptedContentInfo),
+ ASN1_IMP_SET_OF_OPT(CMS_EncryptedData, unprotectedAttrs, X509_ATTRIBUTE, 1)
} ASN1_NDEF_SEQUENCE_END(CMS_EncryptedData)
/* Defined in RFC 5083 - Section 2.1. AuthEnvelopedData Type */
ASN1_NDEF_SEQUENCE(CMS_AuthEnvelopedData) = {
- ASN1_EMBED(CMS_AuthEnvelopedData, version, INT32),
- ASN1_IMP_OPT(CMS_AuthEnvelopedData, originatorInfo, CMS_OriginatorInfo, 0),
- ASN1_SET_OF(CMS_AuthEnvelopedData, recipientInfos, CMS_RecipientInfo),
- ASN1_SIMPLE(CMS_AuthEnvelopedData, authEncryptedContentInfo, CMS_EncryptedContentInfo),
- ASN1_IMP_SET_OF_OPT(CMS_AuthEnvelopedData, authAttrs, X509_ALGOR, 2),
- ASN1_SIMPLE(CMS_AuthEnvelopedData, mac, ASN1_OCTET_STRING),
- ASN1_IMP_SET_OF_OPT(CMS_AuthEnvelopedData, unauthAttrs, X509_ALGOR, 3)
+ ASN1_EMBED(CMS_AuthEnvelopedData, version, INT32),
+ ASN1_IMP_OPT(CMS_AuthEnvelopedData, originatorInfo, CMS_OriginatorInfo, 0),
+ ASN1_SET_OF(CMS_AuthEnvelopedData, recipientInfos, CMS_RecipientInfo),
+ ASN1_SIMPLE(CMS_AuthEnvelopedData, authEncryptedContentInfo, CMS_EncryptedContentInfo),
+ ASN1_IMP_SET_OF_OPT(CMS_AuthEnvelopedData, authAttrs, X509_ALGOR, 2),
+ ASN1_SIMPLE(CMS_AuthEnvelopedData, mac, ASN1_OCTET_STRING),
+ ASN1_IMP_SET_OF_OPT(CMS_AuthEnvelopedData, unauthAttrs, X509_ALGOR, 3)
} ASN1_NDEF_SEQUENCE_END(CMS_AuthEnvelopedData)
ASN1_NDEF_SEQUENCE(CMS_AuthenticatedData) = {
- ASN1_EMBED(CMS_AuthenticatedData, version, INT32),
- ASN1_IMP_OPT(CMS_AuthenticatedData, originatorInfo, CMS_OriginatorInfo, 0),
- ASN1_SET_OF(CMS_AuthenticatedData, recipientInfos, CMS_RecipientInfo),
- ASN1_SIMPLE(CMS_AuthenticatedData, macAlgorithm, X509_ALGOR),
- ASN1_IMP(CMS_AuthenticatedData, digestAlgorithm, X509_ALGOR, 1),
- ASN1_SIMPLE(CMS_AuthenticatedData, encapContentInfo, CMS_EncapsulatedContentInfo),
- ASN1_IMP_SET_OF_OPT(CMS_AuthenticatedData, authAttrs, X509_ALGOR, 2),
- ASN1_SIMPLE(CMS_AuthenticatedData, mac, ASN1_OCTET_STRING),
- ASN1_IMP_SET_OF_OPT(CMS_AuthenticatedData, unauthAttrs, X509_ALGOR, 3)
+ ASN1_EMBED(CMS_AuthenticatedData, version, INT32),
+ ASN1_IMP_OPT(CMS_AuthenticatedData, originatorInfo, CMS_OriginatorInfo, 0),
+ ASN1_SET_OF(CMS_AuthenticatedData, recipientInfos, CMS_RecipientInfo),
+ ASN1_SIMPLE(CMS_AuthenticatedData, macAlgorithm, X509_ALGOR),
+ ASN1_IMP(CMS_AuthenticatedData, digestAlgorithm, X509_ALGOR, 1),
+ ASN1_SIMPLE(CMS_AuthenticatedData, encapContentInfo, CMS_EncapsulatedContentInfo),
+ ASN1_IMP_SET_OF_OPT(CMS_AuthenticatedData, authAttrs, X509_ALGOR, 2),
+ ASN1_SIMPLE(CMS_AuthenticatedData, mac, ASN1_OCTET_STRING),
+ ASN1_IMP_SET_OF_OPT(CMS_AuthenticatedData, unauthAttrs, X509_ALGOR, 3)
} static_ASN1_NDEF_SEQUENCE_END(CMS_AuthenticatedData)
-ASN1_NDEF_SEQUENCE(CMS_CompressedData) = {
- ASN1_EMBED(CMS_CompressedData, version, INT32),
- ASN1_SIMPLE(CMS_CompressedData, compressionAlgorithm, X509_ALGOR),
- ASN1_SIMPLE(CMS_CompressedData, encapContentInfo, CMS_EncapsulatedContentInfo),
-} ASN1_NDEF_SEQUENCE_END(CMS_CompressedData)
+ ASN1_NDEF_SEQUENCE(CMS_CompressedData)
+ = {
+ ASN1_EMBED(CMS_CompressedData, version, INT32),
+ ASN1_SIMPLE(CMS_CompressedData, compressionAlgorithm, X509_ALGOR),
+ ASN1_SIMPLE(CMS_CompressedData, encapContentInfo, CMS_EncapsulatedContentInfo),
+ } ASN1_NDEF_SEQUENCE_END(CMS_CompressedData)
/* This is the ANY DEFINED BY table for the top level ContentInfo structure */
ASN1_ADB_TEMPLATE(cms_default) = ASN1_EXP(CMS_ContentInfo, d.other, ASN1_ANY, 0);
ASN1_ADB(CMS_ContentInfo) = {
- ADB_ENTRY(NID_pkcs7_data, ASN1_NDEF_EXP(CMS_ContentInfo, d.data, ASN1_OCTET_STRING_NDEF, 0)),
- ADB_ENTRY(NID_pkcs7_signed, ASN1_NDEF_EXP(CMS_ContentInfo, d.signedData, CMS_SignedData, 0)),
- ADB_ENTRY(NID_pkcs7_enveloped, ASN1_NDEF_EXP(CMS_ContentInfo, d.envelopedData, CMS_EnvelopedData, 0)),
- ADB_ENTRY(NID_pkcs7_digest, ASN1_NDEF_EXP(CMS_ContentInfo, d.digestedData, CMS_DigestedData, 0)),
- ADB_ENTRY(NID_pkcs7_encrypted, ASN1_NDEF_EXP(CMS_ContentInfo, d.encryptedData, CMS_EncryptedData, 0)),
- ADB_ENTRY(NID_id_smime_ct_authEnvelopedData, ASN1_NDEF_EXP(CMS_ContentInfo, d.authEnvelopedData, CMS_AuthEnvelopedData, 0)),
- ADB_ENTRY(NID_id_smime_ct_authData, ASN1_NDEF_EXP(CMS_ContentInfo, d.authenticatedData, CMS_AuthenticatedData, 0)),
- ADB_ENTRY(NID_id_smime_ct_compressedData, ASN1_NDEF_EXP(CMS_ContentInfo, d.compressedData, CMS_CompressedData, 0)),
+ ADB_ENTRY(NID_pkcs7_data, ASN1_NDEF_EXP(CMS_ContentInfo, d.data, ASN1_OCTET_STRING_NDEF, 0)),
+ ADB_ENTRY(NID_pkcs7_signed, ASN1_NDEF_EXP(CMS_ContentInfo, d.signedData, CMS_SignedData, 0)),
+ ADB_ENTRY(NID_pkcs7_enveloped, ASN1_NDEF_EXP(CMS_ContentInfo, d.envelopedData, CMS_EnvelopedData, 0)),
+ ADB_ENTRY(NID_pkcs7_digest, ASN1_NDEF_EXP(CMS_ContentInfo, d.digestedData, CMS_DigestedData, 0)),
+ ADB_ENTRY(NID_pkcs7_encrypted, ASN1_NDEF_EXP(CMS_ContentInfo, d.encryptedData, CMS_EncryptedData, 0)),
+ ADB_ENTRY(NID_id_smime_ct_authEnvelopedData, ASN1_NDEF_EXP(CMS_ContentInfo, d.authEnvelopedData, CMS_AuthEnvelopedData, 0)),
+ ADB_ENTRY(NID_id_smime_ct_authData, ASN1_NDEF_EXP(CMS_ContentInfo, d.authenticatedData, CMS_AuthenticatedData, 0)),
+ ADB_ENTRY(NID_id_smime_ct_compressedData, ASN1_NDEF_EXP(CMS_ContentInfo, d.compressedData, CMS_CompressedData, 0)),
} ASN1_ADB_END(CMS_ContentInfo, 0, contentType, 0, &cms_default_tt, NULL);
/* CMS streaming support */
static int cms_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
- void *exarg)
+ void *exarg)
{
ASN1_STREAM_ARG *sarg = exarg;
CMS_ContentInfo *cms = NULL;
@@ -392,14 +374,13 @@ static int cms_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
case ASN1_OP_FREE_POST:
OPENSSL_free(cms->ctx.propq);
break;
-
}
return 1;
}
ASN1_NDEF_SEQUENCE_cb(CMS_ContentInfo, cms_cb) = {
- ASN1_SIMPLE(CMS_ContentInfo, contentType, ASN1_OBJECT),
- ASN1_ADB_OBJECT(CMS_ContentInfo)
+ ASN1_SIMPLE(CMS_ContentInfo, contentType, ASN1_OBJECT),
+ ASN1_ADB_OBJECT(CMS_ContentInfo)
} ASN1_NDEF_SEQUENCE_END_cb(CMS_ContentInfo, CMS_ContentInfo)
/* Specials for signed attributes */
@@ -409,8 +390,7 @@ ASN1_NDEF_SEQUENCE_cb(CMS_ContentInfo, cms_cb) = {
* encoding.
*/
-ASN1_ITEM_TEMPLATE(CMS_Attributes_Sign) =
- ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SET_ORDER, 0, CMS_ATTRIBUTES, X509_ATTRIBUTE)
+ASN1_ITEM_TEMPLATE(CMS_Attributes_Sign) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SET_ORDER, 0, CMS_ATTRIBUTES, X509_ATTRIBUTE)
ASN1_ITEM_TEMPLATE_END(CMS_Attributes_Sign)
/*
@@ -418,29 +398,23 @@ ASN1_ITEM_TEMPLATE_END(CMS_Attributes_Sign)
* SEQUENCE OF and tag it to SET OF
*/
-ASN1_ITEM_TEMPLATE(CMS_Attributes_Verify) =
- ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF | ASN1_TFLG_IMPTAG | ASN1_TFLG_UNIVERSAL,
- V_ASN1_SET, CMS_ATTRIBUTES, X509_ATTRIBUTE)
+ASN1_ITEM_TEMPLATE(CMS_Attributes_Verify) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF | ASN1_TFLG_IMPTAG | ASN1_TFLG_UNIVERSAL,
+ V_ASN1_SET, CMS_ATTRIBUTES, X509_ATTRIBUTE)
ASN1_ITEM_TEMPLATE_END(CMS_Attributes_Verify)
-
-
ASN1_CHOICE(CMS_ReceiptsFrom) = {
- ASN1_IMP_EMBED(CMS_ReceiptsFrom, d.allOrFirstTier, INT32, 0),
- ASN1_IMP_SEQUENCE_OF(CMS_ReceiptsFrom, d.receiptList, GENERAL_NAMES, 1)
+ ASN1_IMP_EMBED(CMS_ReceiptsFrom, d.allOrFirstTier, INT32, 0),
+ ASN1_IMP_SEQUENCE_OF(CMS_ReceiptsFrom, d.receiptList, GENERAL_NAMES, 1)
} static_ASN1_CHOICE_END(CMS_ReceiptsFrom)
-ASN1_SEQUENCE(CMS_ReceiptRequest) = {
- ASN1_SIMPLE(CMS_ReceiptRequest, signedContentIdentifier, ASN1_OCTET_STRING),
- ASN1_SIMPLE(CMS_ReceiptRequest, receiptsFrom, CMS_ReceiptsFrom),
- ASN1_SEQUENCE_OF(CMS_ReceiptRequest, receiptsTo, GENERAL_NAMES)
-} ASN1_SEQUENCE_END(CMS_ReceiptRequest)
+ ASN1_SEQUENCE(CMS_ReceiptRequest)
+ = { ASN1_SIMPLE(CMS_ReceiptRequest, signedContentIdentifier, ASN1_OCTET_STRING), ASN1_SIMPLE(CMS_ReceiptRequest, receiptsFrom, CMS_ReceiptsFrom), ASN1_SEQUENCE_OF(CMS_ReceiptRequest, receiptsTo, GENERAL_NAMES) } ASN1_SEQUENCE_END(CMS_ReceiptRequest)
ASN1_SEQUENCE(CMS_Receipt) = {
- ASN1_EMBED(CMS_Receipt, version, INT32),
- ASN1_SIMPLE(CMS_Receipt, contentType, ASN1_OBJECT),
- ASN1_SIMPLE(CMS_Receipt, signedContentIdentifier, ASN1_OCTET_STRING),
- ASN1_SIMPLE(CMS_Receipt, originatorSignatureValue, ASN1_OCTET_STRING)
+ ASN1_EMBED(CMS_Receipt, version, INT32),
+ ASN1_SIMPLE(CMS_Receipt, contentType, ASN1_OBJECT),
+ ASN1_SIMPLE(CMS_Receipt, signedContentIdentifier, ASN1_OCTET_STRING),
+ ASN1_SIMPLE(CMS_Receipt, originatorSignatureValue, ASN1_OCTET_STRING)
} ASN1_SEQUENCE_END(CMS_Receipt)
/*
@@ -455,13 +429,12 @@ typedef struct {
} CMS_SharedInfo;
ASN1_SEQUENCE(CMS_SharedInfo) = {
- ASN1_SIMPLE(CMS_SharedInfo, keyInfo, X509_ALGOR),
- ASN1_EXP_OPT(CMS_SharedInfo, entityUInfo, ASN1_OCTET_STRING, 0),
- ASN1_EXP_OPT(CMS_SharedInfo, suppPubInfo, ASN1_OCTET_STRING, 2),
+ ASN1_SIMPLE(CMS_SharedInfo, keyInfo, X509_ALGOR),
+ ASN1_EXP_OPT(CMS_SharedInfo, entityUInfo, ASN1_OCTET_STRING, 0),
+ ASN1_EXP_OPT(CMS_SharedInfo, suppPubInfo, ASN1_OCTET_STRING, 2),
} static_ASN1_SEQUENCE_END(CMS_SharedInfo)
-int CMS_SharedInfo_encode(unsigned char **pder, X509_ALGOR *kekalg,
- ASN1_OCTET_STRING *ukm, int keylen)
+ int CMS_SharedInfo_encode(unsigned char **pder, X509_ALGOR *kekalg, ASN1_OCTET_STRING *ukm, int keylen)
{
union {
CMS_SharedInfo *pecsi;
@@ -502,13 +475,12 @@ typedef struct {
} CMS_CMSORIforKEMOtherInfo;
ASN1_SEQUENCE(CMS_CMSORIforKEMOtherInfo) = {
- ASN1_SIMPLE(CMS_CMSORIforKEMOtherInfo, wrap, X509_ALGOR),
- ASN1_EMBED(CMS_CMSORIforKEMOtherInfo, kekLength, INT32),
- ASN1_EXP_OPT(CMS_CMSORIforKEMOtherInfo, ukm, ASN1_OCTET_STRING, 0),
+ ASN1_SIMPLE(CMS_CMSORIforKEMOtherInfo, wrap, X509_ALGOR),
+ ASN1_EMBED(CMS_CMSORIforKEMOtherInfo, kekLength, INT32),
+ ASN1_EXP_OPT(CMS_CMSORIforKEMOtherInfo, ukm, ASN1_OCTET_STRING, 0),
} static_ASN1_SEQUENCE_END(CMS_CMSORIforKEMOtherInfo)
-int CMS_CMSORIforKEMOtherInfo_encode(unsigned char **pder, X509_ALGOR *wrap,
- ASN1_OCTET_STRING *ukm, int keylen)
+ int CMS_CMSORIforKEMOtherInfo_encode(unsigned char **pder, X509_ALGOR *wrap, ASN1_OCTET_STRING *ukm, int keylen)
{
CMS_CMSORIforKEMOtherInfo kem_otherinfo;
@@ -517,5 +489,5 @@ int CMS_CMSORIforKEMOtherInfo_encode(unsigned char **pder, X509_ALGOR *wrap,
kem_otherinfo.ukm = ukm;
return ASN1_item_i2d((ASN1_VALUE *)&kem_otherinfo, pder,
- ASN1_ITEM_rptr(CMS_CMSORIforKEMOtherInfo));
+ ASN1_ITEM_rptr(CMS_CMSORIforKEMOtherInfo));
}
diff --git a/crypto/cms/cms_att.c b/crypto/cms/cms_att.c
index 64acda7263..86852afda4 100644
--- a/crypto/cms/cms_att.c
+++ b/crypto/cms/cms_att.c
@@ -25,44 +25,30 @@
* - RFC 5035 Section 5.4
*/
/* This is a signed attribute */
-#define CMS_ATTR_F_SIGNED 0x01
+#define CMS_ATTR_F_SIGNED 0x01
/* This is an unsigned attribute */
-#define CMS_ATTR_F_UNSIGNED 0x02
+#define CMS_ATTR_F_UNSIGNED 0x02
/* Must be present if there are any other attributes of the same type */
-#define CMS_ATTR_F_REQUIRED_COND 0x10
+#define CMS_ATTR_F_REQUIRED_COND 0x10
/* There can only be one instance of this attribute */
-#define CMS_ATTR_F_ONLY_ONE 0x20
+#define CMS_ATTR_F_ONLY_ONE 0x20
/* The Attribute's value must have exactly one entry */
#define CMS_ATTR_F_ONE_ATTR_VALUE 0x40
/* Attributes rules for different attributes */
static const struct {
- int nid; /* The attribute id */
+ int nid; /* The attribute id */
int flags;
} cms_attribute_properties[] = {
/* See RFC Section 11 */
- { NID_pkcs9_contentType, CMS_ATTR_F_SIGNED
- | CMS_ATTR_F_ONLY_ONE
- | CMS_ATTR_F_ONE_ATTR_VALUE
- | CMS_ATTR_F_REQUIRED_COND },
- { NID_pkcs9_messageDigest, CMS_ATTR_F_SIGNED
- | CMS_ATTR_F_ONLY_ONE
- | CMS_ATTR_F_ONE_ATTR_VALUE
- | CMS_ATTR_F_REQUIRED_COND },
- { NID_pkcs9_signingTime, CMS_ATTR_F_SIGNED
- | CMS_ATTR_F_ONLY_ONE
- | CMS_ATTR_F_ONE_ATTR_VALUE },
+ { NID_pkcs9_contentType, CMS_ATTR_F_SIGNED | CMS_ATTR_F_ONLY_ONE | CMS_ATTR_F_ONE_ATTR_VALUE | CMS_ATTR_F_REQUIRED_COND },
+ { NID_pkcs9_messageDigest, CMS_ATTR_F_SIGNED | CMS_ATTR_F_ONLY_ONE | CMS_ATTR_F_ONE_ATTR_VALUE | CMS_ATTR_F_REQUIRED_COND },
+ { NID_pkcs9_signingTime, CMS_ATTR_F_SIGNED | CMS_ATTR_F_ONLY_ONE | CMS_ATTR_F_ONE_ATTR_VALUE },
{ NID_pkcs9_countersignature, CMS_ATTR_F_UNSIGNED },
/* ESS */
- { NID_id_smime_aa_signingCertificate, CMS_ATTR_F_SIGNED
- | CMS_ATTR_F_ONLY_ONE
- | CMS_ATTR_F_ONE_ATTR_VALUE },
- { NID_id_smime_aa_signingCertificateV2, CMS_ATTR_F_SIGNED
- | CMS_ATTR_F_ONLY_ONE
- | CMS_ATTR_F_ONE_ATTR_VALUE },
- { NID_id_smime_aa_receiptRequest, CMS_ATTR_F_SIGNED
- | CMS_ATTR_F_ONLY_ONE
- | CMS_ATTR_F_ONE_ATTR_VALUE }
+ { NID_id_smime_aa_signingCertificate, CMS_ATTR_F_SIGNED | CMS_ATTR_F_ONLY_ONE | CMS_ATTR_F_ONE_ATTR_VALUE },
+ { NID_id_smime_aa_signingCertificateV2, CMS_ATTR_F_SIGNED | CMS_ATTR_F_ONLY_ONE | CMS_ATTR_F_ONE_ATTR_VALUE },
+ { NID_id_smime_aa_receiptRequest, CMS_ATTR_F_SIGNED | CMS_ATTR_F_ONLY_ONE | CMS_ATTR_F_ONE_ATTR_VALUE }
};
/* CMS SignedData Attribute utilities */
@@ -78,7 +64,7 @@ int CMS_signed_get_attr_by_NID(const CMS_SignerInfo *si, int nid, int lastpos)
}
int CMS_signed_get_attr_by_OBJ(const CMS_SignerInfo *si, const ASN1_OBJECT *obj,
- int lastpos)
+ int lastpos)
{
return X509at_get_attr_by_OBJ(si->signedAttrs, obj, lastpos);
}
@@ -101,8 +87,8 @@ int CMS_signed_add1_attr(CMS_SignerInfo *si, X509_ATTRIBUTE *attr)
}
int CMS_signed_add1_attr_by_OBJ(CMS_SignerInfo *si,
- const ASN1_OBJECT *obj, int type,
- const void *bytes, int len)
+ const ASN1_OBJECT *obj, int type,
+ const void *bytes, int len)
{
if (ossl_x509at_add1_attr_by_OBJ(&si->signedAttrs, obj, type, bytes, len))
return 1;
@@ -110,7 +96,7 @@ int CMS_signed_add1_attr_by_OBJ(CMS_SignerInfo *si,
}
int CMS_signed_add1_attr_by_NID(CMS_SignerInfo *si,
- int nid, int type, const void *bytes, int len)
+ int nid, int type, const void *bytes, int len)
{
if (ossl_x509at_add1_attr_by_NID(&si->signedAttrs, nid, type, bytes, len))
return 1;
@@ -118,18 +104,18 @@ int CMS_signed_add1_attr_by_NID(CMS_SignerInfo *si,
}
int CMS_signed_add1_attr_by_txt(CMS_SignerInfo *si,
- const char *attrname, int type,
- const void *bytes, int len)
+ const char *attrname, int type,
+ const void *bytes, int len)
{
if (ossl_x509at_add1_attr_by_txt(&si->signedAttrs, attrname, type, bytes,
- len))
+ len))
return 1;
return 0;
}
void *CMS_signed_get0_data_by_OBJ(const CMS_SignerInfo *si,
- const ASN1_OBJECT *oid,
- int lastpos, int type)
+ const ASN1_OBJECT *oid,
+ int lastpos, int type)
{
return X509at_get0_data_by_OBJ(si->signedAttrs, oid, lastpos, type);
}
@@ -140,13 +126,13 @@ int CMS_unsigned_get_attr_count(const CMS_SignerInfo *si)
}
int CMS_unsigned_get_attr_by_NID(const CMS_SignerInfo *si, int nid,
- int lastpos)
+ int lastpos)
{
return X509at_get_attr_by_NID(si->unsignedAttrs, nid, lastpos);
}
int CMS_unsigned_get_attr_by_OBJ(const CMS_SignerInfo *si,
- const ASN1_OBJECT *obj, int lastpos)
+ const ASN1_OBJECT *obj, int lastpos)
{
return X509at_get_attr_by_OBJ(si->unsignedAttrs, obj, lastpos);
}
@@ -169,8 +155,8 @@ int CMS_unsigned_add1_attr(CMS_SignerInfo *si, X509_ATTRIBUTE *attr)
}
int CMS_unsigned_add1_attr_by_OBJ(CMS_SignerInfo *si,
- const ASN1_OBJECT *obj, int type,
- const void *bytes, int len)
+ const ASN1_OBJECT *obj, int type,
+ const void *bytes, int len)
{
if (ossl_x509at_add1_attr_by_OBJ(&si->unsignedAttrs, obj, type, bytes, len))
return 1;
@@ -178,8 +164,8 @@ int CMS_unsigned_add1_attr_by_OBJ(CMS_SignerInfo *si,
}
int CMS_unsigned_add1_attr_by_NID(CMS_SignerInfo *si,
- int nid, int type,
- const void *bytes, int len)
+ int nid, int type,
+ const void *bytes, int len)
{
if (ossl_x509at_add1_attr_by_NID(&si->unsignedAttrs, nid, type, bytes, len))
return 1;
@@ -187,17 +173,17 @@ int CMS_unsigned_add1_attr_by_NID(CMS_SignerInfo *si,
}
int CMS_unsigned_add1_attr_by_txt(CMS_SignerInfo *si,
- const char *attrname, int type,
- const void *bytes, int len)
+ const char *attrname, int type,
+ const void *bytes, int len)
{
if (ossl_x509at_add1_attr_by_txt(&si->unsignedAttrs, attrname,
- type, bytes, len))
+ type, bytes, len))
return 1;
return 0;
}
void *CMS_unsigned_get0_data_by_OBJ(CMS_SignerInfo *si, ASN1_OBJECT *oid,
- int lastpos, int type)
+ int lastpos, int type)
{
return X509at_get0_data_by_OBJ(si->unsignedAttrs, oid, lastpos, type);
}
@@ -209,8 +195,8 @@ void *CMS_unsigned_get0_data_by_OBJ(CMS_SignerInfo *si, ASN1_OBJECT *oid,
* If an attribute was found *lastpos returns the index of the found attribute.
*/
static X509_ATTRIBUTE *cms_attrib_get(int nid,
- const STACK_OF(X509_ATTRIBUTE) *attrs,
- int *lastpos)
+ const STACK_OF(X509_ATTRIBUTE) *attrs,
+ int *lastpos)
{
X509_ATTRIBUTE *at;
int loc;
@@ -225,8 +211,8 @@ static X509_ATTRIBUTE *cms_attrib_get(int nid,
}
static int cms_check_attribute(int nid, int flags, int type,
- const STACK_OF(X509_ATTRIBUTE) *attrs,
- int have_attrs)
+ const STACK_OF(X509_ATTRIBUTE) *attrs,
+ int have_attrs)
{
int lastpos = -1;
X509_ATTRIBUTE *at = cms_attrib_get(nid, attrs, &lastpos);
@@ -244,7 +230,7 @@ static int cms_check_attribute(int nid, int flags, int type,
&& count != 1)
/* There should be at least one value */
|| count == 0)
- return 0;
+ return 0;
} else {
/* fail if a required attribute is missing */
if (have_attrs
@@ -276,9 +262,9 @@ int ossl_cms_si_check_attributes(const CMS_SignerInfo *si)
int flags = cms_attribute_properties[i].flags;
if (!cms_check_attribute(nid, flags, CMS_ATTR_F_SIGNED,
- si->signedAttrs, have_signed_attrs)
+ si->signedAttrs, have_signed_attrs)
|| !cms_check_attribute(nid, flags, CMS_ATTR_F_UNSIGNED,
- si->unsignedAttrs, have_unsigned_attrs)) {
+ si->unsignedAttrs, have_unsigned_attrs)) {
ERR_raise(ERR_LIB_CMS, CMS_R_ATTRIBUTE_ERROR);
return 0;
}
diff --git a/crypto/cms/cms_cd.c b/crypto/cms/cms_cd.c
index 3000268480..3c649f0bd2 100644
--- a/crypto/cms/cms_cd.c
+++ b/crypto/cms/cms_cd.c
@@ -22,8 +22,8 @@
/* CMS CompressedData Utilities */
CMS_ContentInfo *ossl_cms_CompressedData_create(int comp_nid,
- OSSL_LIB_CTX *libctx,
- const char *propq)
+ OSSL_LIB_CTX *libctx,
+ const char *propq)
{
CMS_ContentInfo *cms;
CMS_CompressedData *cd;
@@ -51,14 +51,14 @@ CMS_ContentInfo *ossl_cms_CompressedData_create(int comp_nid,
cd->version = 0;
(void)X509_ALGOR_set0(cd->compressionAlgorithm,
- OBJ_nid2obj(NID_zlib_compression),
- V_ASN1_UNDEF, NULL); /* cannot fail */
+ OBJ_nid2obj(NID_zlib_compression),
+ V_ASN1_UNDEF, NULL); /* cannot fail */
cd->encapContentInfo->eContentType = OBJ_nid2obj(NID_pkcs7_data);
return cms;
- err:
+err:
CMS_ContentInfo_free(cms);
return NULL;
}
diff --git a/crypto/cms/cms_dd.c b/crypto/cms/cms_dd.c
index 40b20249a3..aff9af63ca 100644
--- a/crypto/cms/cms_dd.c
+++ b/crypto/cms/cms_dd.c
@@ -18,8 +18,8 @@
/* CMS DigestedData Utilities */
CMS_ContentInfo *ossl_cms_DigestedData_create(const EVP_MD *md,
- OSSL_LIB_CTX *libctx,
- const char *propq)
+ OSSL_LIB_CTX *libctx,
+ const char *propq)
{
CMS_ContentInfo *cms;
CMS_DigestedData *dd;
@@ -43,7 +43,7 @@ CMS_ContentInfo *ossl_cms_DigestedData_create(const EVP_MD *md,
return cms;
- err:
+err:
CMS_ContentInfo_free(cms);
return NULL;
}
@@ -53,11 +53,11 @@ BIO *ossl_cms_DigestedData_init_bio(const CMS_ContentInfo *cms)
CMS_DigestedData *dd = cms->d.digestedData;
return ossl_cms_DigestAlgorithm_init_bio(dd->digestAlgorithm,
- ossl_cms_get0_cmsctx(cms));
+ ossl_cms_get0_cmsctx(cms));
}
int ossl_cms_DigestedData_do_final(const CMS_ContentInfo *cms, BIO *chain,
- int verify)
+ int verify)
{
EVP_MD_CTX *mctx = EVP_MD_CTX_new();
unsigned char md[EVP_MAX_MD_SIZE];
@@ -94,9 +94,8 @@ int ossl_cms_DigestedData_do_final(const CMS_ContentInfo *cms, BIO *chain,
r = 1;
}
- err:
+err:
EVP_MD_CTX_free(mctx);
return r;
-
}
diff --git a/crypto/cms/cms_dh.c b/crypto/cms/cms_dh.c
index 9bd0b160ce..a10df73b10 100644
--- a/crypto/cms/cms_dh.c
+++ b/crypto/cms/cms_dh.c
@@ -18,7 +18,7 @@
#include "cms_local.h"
static int dh_cms_set_peerkey(EVP_PKEY_CTX *pctx,
- X509_ALGOR *alg, ASN1_BIT_STRING *pubkey)
+ X509_ALGOR *alg, ASN1_BIT_STRING *pubkey)
{
const ASN1_OBJECT *aoid;
int atype;
@@ -64,13 +64,13 @@ static int dh_cms_set_peerkey(EVP_PKEY_CTX *pctx,
pkpeer = EVP_PKEY_new();
if (pkpeer == NULL
- || !EVP_PKEY_copy_parameters(pkpeer, pk)
- || EVP_PKEY_set1_encoded_public_key(pkpeer, buf, plen) <= 0)
+ || !EVP_PKEY_copy_parameters(pkpeer, pk)
+ || EVP_PKEY_set1_encoded_public_key(pkpeer, buf, plen) <= 0)
goto err;
if (EVP_PKEY_derive_set_peer(pctx, pkpeer) > 0)
rv = 1;
- err:
+err:
ASN1_INTEGER_free(public_key);
BN_free(bnpub);
OPENSSL_free(buf);
@@ -104,7 +104,7 @@ static int dh_cms_set_shared_info(EVP_PKEY_CTX *pctx, CMS_RecipientInfo *ri)
}
if (EVP_PKEY_CTX_set_dh_kdf_type(pctx, EVP_PKEY_DH_KDF_X9_42) <= 0
- || EVP_PKEY_CTX_set_dh_kdf_md(pctx, EVP_sha1()) <= 0)
+ || EVP_PKEY_CTX_set_dh_kdf_md(pctx, EVP_sha1()) <= 0)
goto err;
if (alg->parameter->type != V_ASN1_SEQUENCE)
@@ -136,7 +136,7 @@ static int dh_cms_set_shared_info(EVP_PKEY_CTX *pctx, CMS_RecipientInfo *ri)
goto err;
/* Use OBJ_nid2obj to ensure we use built in OID that isn't freed */
if (EVP_PKEY_CTX_set0_dh_kdf_oid(pctx,
- OBJ_nid2obj(EVP_CIPHER_get_type(kekcipher)))
+ OBJ_nid2obj(EVP_CIPHER_get_type(kekcipher)))
<= 0)
goto err;
@@ -152,7 +152,7 @@ static int dh_cms_set_shared_info(EVP_PKEY_CTX *pctx, CMS_RecipientInfo *ri)
dukm = NULL;
rv = 1;
- err:
+err:
X509_ALGOR_free(kekalg);
EVP_CIPHER_free(kekcipher);
OPENSSL_free(dukm);
@@ -171,9 +171,9 @@ static int dh_cms_decrypt(CMS_RecipientInfo *ri)
ASN1_BIT_STRING *pubkey;
if (!CMS_RecipientInfo_kari_get0_orig_id(ri, &alg, &pubkey,
- NULL, NULL, NULL))
+ NULL, NULL, NULL))
return 0;
- if (alg == NULL || pubkey == NULL)
+ if (alg == NULL || pubkey == NULL)
return 0;
if (!dh_cms_set_peerkey(pctx, alg, pubkey)) {
ERR_raise(ERR_LIB_CMS, CMS_R_PEER_KEY_ERROR);
@@ -212,7 +212,7 @@ static int dh_cms_encrypt(CMS_RecipientInfo *ri)
/* Get ephemeral key */
pkey = EVP_PKEY_CTX_get0_pkey(pctx);
if (!CMS_RecipientInfo_kari_get0_orig_id(ri, &talg, &pubkey,
- NULL, NULL, NULL))
+ NULL, NULL, NULL))
goto err;
/* Is everything uninitialised? */
@@ -239,7 +239,7 @@ static int dh_cms_encrypt(CMS_RecipientInfo *ri)
penc = NULL;
(void)X509_ALGOR_set0(talg, OBJ_nid2obj(NID_dhpublicnumber),
- V_ASN1_UNDEF, NULL); /* cannot fail */
+ V_ASN1_UNDEF, NULL); /* cannot fail */
}
/* See if custom parameters set */
@@ -317,11 +317,11 @@ static int dh_cms_encrypt(CMS_RecipientInfo *ri)
ASN1_STRING_set0(wrap_str, penc, penclen);
penc = NULL;
rv = X509_ALGOR_set0(talg, OBJ_nid2obj(NID_id_smime_alg_ESDH),
- V_ASN1_SEQUENCE, wrap_str);
+ V_ASN1_SEQUENCE, wrap_str);
if (!rv)
ASN1_STRING_free(wrap_str);
- err:
+err:
OPENSSL_free(penc);
X509_ALGOR_free(wrap_alg);
OPENSSL_free(dukm);
diff --git a/crypto/cms/cms_ec.c b/crypto/cms/cms_ec.c
index 6e9962ed6e..ff8adad616 100644
--- a/crypto/cms/cms_ec.c
+++ b/crypto/cms/cms_ec.c
@@ -18,7 +18,7 @@
#include "cms_local.h"
static EVP_PKEY *pkey_type2param(int ptype, const void *pval,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_LIB_CTX *libctx, const char *propq)
{
EVP_PKEY *pkey = NULL;
EVP_PKEY_CTX *pctx = NULL;
@@ -31,7 +31,7 @@ static EVP_PKEY *pkey_type2param(int ptype, const void *pval,
int selection = OSSL_KEYMGMT_SELECT_ALL_PARAMETERS;
ctx = OSSL_DECODER_CTX_new_for_pkey(&pkey, "DER", NULL, "EC",
- selection, libctx, propq);
+ selection, libctx, propq);
if (ctx == NULL)
goto err;
@@ -50,7 +50,7 @@ static EVP_PKEY *pkey_type2param(int ptype, const void *pval,
if (pctx == NULL || EVP_PKEY_paramgen_init(pctx) <= 0)
goto err;
if (OBJ_obj2txt(groupname, sizeof(groupname), poid, 0) <= 0
- || EVP_PKEY_CTX_set_group_name(pctx, groupname) <= 0) {
+ || EVP_PKEY_CTX_set_group_name(pctx, groupname) <= 0) {
ERR_raise(ERR_LIB_CMS, CMS_R_DECODE_ERROR);
goto err;
}
@@ -63,7 +63,7 @@ static EVP_PKEY *pkey_type2param(int ptype, const void *pval,
ERR_raise(ERR_LIB_CMS, CMS_R_DECODE_ERROR);
return NULL;
- err:
+err:
EVP_PKEY_free(pkey);
EVP_PKEY_CTX_free(pctx);
OSSL_DECODER_CTX_free(ctx);
@@ -71,7 +71,7 @@ static EVP_PKEY *pkey_type2param(int ptype, const void *pval,
}
static int ecdh_cms_set_peerkey(EVP_PKEY_CTX *pctx,
- X509_ALGOR *alg, ASN1_BIT_STRING *pubkey)
+ X509_ALGOR *alg, ASN1_BIT_STRING *pubkey)
{
const ASN1_OBJECT *aoid;
int atype;
@@ -100,8 +100,8 @@ static int ecdh_cms_set_peerkey(EVP_PKEY_CTX *pctx,
goto err;
} else {
pkpeer = pkey_type2param(atype, aval,
- EVP_PKEY_CTX_get0_libctx(pctx),
- EVP_PKEY_CTX_get0_propq(pctx));
+ EVP_PKEY_CTX_get0_libctx(pctx),
+ EVP_PKEY_CTX_get0_propq(pctx));
if (pkpeer == NULL)
goto err;
}
@@ -116,7 +116,7 @@ static int ecdh_cms_set_peerkey(EVP_PKEY_CTX *pctx,
if (EVP_PKEY_derive_set_peer(pctx, pkpeer) > 0)
rv = 1;
- err:
+err:
EVP_PKEY_free(pkpeer);
return rv;
}
@@ -210,7 +210,7 @@ static int ecdh_cms_set_shared_info(EVP_PKEY_CTX *pctx, CMS_RecipientInfo *ri)
der = NULL;
rv = 1;
- err:
+err:
EVP_CIPHER_free(kekcipher);
X509_ALGOR_free(kekalg);
OPENSSL_free(der);
@@ -230,7 +230,7 @@ static int ecdh_cms_decrypt(CMS_RecipientInfo *ri)
ASN1_BIT_STRING *pubkey;
if (!CMS_RecipientInfo_kari_get0_orig_id(ri, &alg, &pubkey,
- NULL, NULL, NULL))
+ NULL, NULL, NULL))
return 0;
if (alg == NULL || pubkey == NULL)
return 0;
@@ -270,7 +270,7 @@ static int ecdh_cms_encrypt(CMS_RecipientInfo *ri)
/* Get ephemeral key */
pkey = EVP_PKEY_CTX_get0_pkey(pctx);
if (!CMS_RecipientInfo_kari_get0_orig_id(ri, &talg, &pubkey,
- NULL, NULL, NULL))
+ NULL, NULL, NULL))
goto err;
X509_ALGOR_get0(&aoid, NULL, NULL, talg);
/* Is everything uninitialised? */
@@ -286,7 +286,7 @@ static int ecdh_cms_encrypt(CMS_RecipientInfo *ri)
penc = NULL;
(void)X509_ALGOR_set0(talg, OBJ_nid2obj(NID_X9_62_id_ecPublicKey),
- V_ASN1_UNDEF, NULL); /* cannot fail */
+ V_ASN1_UNDEF, NULL); /* cannot fail */
}
/* See if custom parameters set */
@@ -373,7 +373,7 @@ static int ecdh_cms_encrypt(CMS_RecipientInfo *ri)
if (!rv)
ASN1_STRING_free(wrap_str);
- err:
+err:
OPENSSL_free(penc);
X509_ALGOR_free(wrap_alg);
return rv;
diff --git a/crypto/cms/cms_enc.c b/crypto/cms/cms_enc.c
index c68ee46278..2b0ccd62a1 100644
--- a/crypto/cms/cms_enc.c
+++ b/crypto/cms/cms_enc.c
@@ -23,7 +23,7 @@
/* Return BIO based on EncryptedContentInfo and key */
BIO *ossl_cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec,
- const CMS_CTX *cms_ctx, int auth)
+ const CMS_CTX *cms_ctx, int auth)
{
BIO *b;
EVP_CIPHER_CTX *ctx;
@@ -64,7 +64,7 @@ BIO *ossl_cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec,
}
if (cipher != NULL) {
fetched_ciph = EVP_CIPHER_fetch(libctx, EVP_CIPHER_get0_name(cipher),
- propq);
+ propq);
if (fetched_ciph != NULL)
cipher = fetched_ciph;
}
@@ -110,8 +110,9 @@ BIO *ossl_cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec,
}
piv = aparams.iv;
if (ec->taglen > 0
- && EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG,
- (int)ec->taglen, ec->tag) <= 0) {
+ && EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG,
+ (int)ec->taglen, ec->tag)
+ <= 0) {
ERR_raise(ERR_LIB_CMS, CMS_R_CIPHER_AEAD_SET_TAG_ERROR);
goto err;
}
@@ -139,7 +140,6 @@ BIO *ossl_cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec,
keep_key = 1;
else
ERR_clear_error();
-
}
if (ec->keylen != tkeylen) {
@@ -198,7 +198,7 @@ BIO *ossl_cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec,
}
ok = 1;
- err:
+err:
EVP_CIPHER_free(fetched_ciph);
if (!keep_key || !ok) {
OPENSSL_clear_free(ec->key, ec->keylen);
@@ -212,9 +212,9 @@ BIO *ossl_cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec,
}
int ossl_cms_EncryptedContent_init(CMS_EncryptedContentInfo *ec,
- const EVP_CIPHER *cipher,
- const unsigned char *key, size_t keylen,
- const CMS_CTX *cms_ctx)
+ const EVP_CIPHER *cipher,
+ const unsigned char *key, size_t keylen,
+ const CMS_CTX *cms_ctx)
{
ec->cipher = cipher;
if (key) {
@@ -229,7 +229,7 @@ int ossl_cms_EncryptedContent_init(CMS_EncryptedContentInfo *ec,
}
int CMS_EncryptedData_set1_key(CMS_ContentInfo *cms, const EVP_CIPHER *ciph,
- const unsigned char *key, size_t keylen)
+ const unsigned char *key, size_t keylen)
{
CMS_EncryptedContentInfo *ec;
@@ -259,7 +259,7 @@ int CMS_EncryptedData_set1_key(CMS_ContentInfo *cms, const EVP_CIPHER *ciph,
}
ec = cms->d.encryptedData->encryptedContentInfo;
return ossl_cms_EncryptedContent_init(ec, ciph, key, keylen,
- ossl_cms_get0_cmsctx(cms));
+ ossl_cms_get0_cmsctx(cms));
}
BIO *ossl_cms_EncryptedData_init_bio(const CMS_ContentInfo *cms)
@@ -269,5 +269,5 @@ BIO *ossl_cms_EncryptedData_init_bio(const CMS_ContentInfo *cms)
if (enc->encryptedContentInfo->cipher && enc->unprotectedAttrs)
enc->version = 2;
return ossl_cms_EncryptedContent_init_bio(enc->encryptedContentInfo,
- ossl_cms_get0_cmsctx(cms), 0);
+ ossl_cms_get0_cmsctx(cms), 0);
}
diff --git a/crypto/cms/cms_env.c b/crypto/cms/cms_env.c
index c7448769db..2243820bb2 100644
--- a/crypto/cms/cms_env.c
+++ b/crypto/cms/cms_env.c
@@ -31,7 +31,7 @@
static void cms_env_set_version(CMS_EnvelopedData *env);
#define CMS_ENVELOPED_STANDARD 1
-#define CMS_ENVELOPED_AUTH 2
+#define CMS_ENVELOPED_AUTH 2
static int cms_get_enveloped_type_simple(const CMS_ContentInfo *cms)
{
@@ -85,8 +85,7 @@ static CMS_EnvelopedData *cms_enveloped_data_init(CMS_ContentInfo *cms)
return NULL;
}
cms->d.envelopedData->version = 0;
- cms->d.envelopedData->encryptedContentInfo->contentType =
- OBJ_nid2obj(NID_pkcs7_data);
+ cms->d.envelopedData->encryptedContentInfo->contentType = OBJ_nid2obj(NID_pkcs7_data);
ASN1_OBJECT_free(cms->contentType);
cms->contentType = OBJ_nid2obj(NID_pkcs7_enveloped);
return cms->d.envelopedData;
@@ -105,8 +104,7 @@ cms_auth_enveloped_data_init(CMS_ContentInfo *cms)
}
/* Defined in RFC 5083 - Section 2.1. "AuthEnvelopedData Type" */
cms->d.authEnvelopedData->version = 0;
- cms->d.authEnvelopedData->authEncryptedContentInfo->contentType =
- OBJ_nid2obj(NID_pkcs7_data);
+ cms->d.authEnvelopedData->authEncryptedContentInfo->contentType = OBJ_nid2obj(NID_pkcs7_data);
ASN1_OBJECT_free(cms->contentType);
cms->contentType = OBJ_nid2obj(NID_id_smime_ct_authEnvelopedData);
return cms->d.authEnvelopedData;
@@ -166,11 +164,11 @@ CMS_EncryptedContentInfo *ossl_cms_get0_env_enc_content(const CMS_ContentInfo *c
switch (cms_get_enveloped_type(cms)) {
case CMS_ENVELOPED_STANDARD:
return cms->d.envelopedData == NULL ? NULL
- : cms->d.envelopedData->encryptedContentInfo;
+ : cms->d.envelopedData->encryptedContentInfo;
case CMS_ENVELOPED_AUTH:
return cms->d.authEnvelopedData == NULL ? NULL
- : cms->d.authEnvelopedData->authEncryptedContentInfo;
+ : cms->d.authEnvelopedData->authEncryptedContentInfo;
default:
return NULL;
@@ -208,8 +206,8 @@ void ossl_cms_RecipientInfos_set_cmsctx(CMS_ContentInfo *cms)
case CMS_RECIPINFO_TRANS:
ri->d.ktri->cms_ctx = ctx;
ossl_x509_set0_libctx(ri->d.ktri->recip,
- ossl_cms_ctx_get0_libctx(ctx),
- ossl_cms_ctx_get0_propq(ctx));
+ ossl_cms_ctx_get0_libctx(ctx),
+ ossl_cms_ctx_get0_propq(ctx));
break;
case CMS_RECIPINFO_KEK:
ri->d.kekri->cms_ctx = ctx;
@@ -244,8 +242,8 @@ EVP_PKEY_CTX *CMS_RecipientInfo_get0_pkey_ctx(CMS_RecipientInfo *ri)
}
CMS_ContentInfo *CMS_EnvelopedData_create_ex(const EVP_CIPHER *cipher,
- OSSL_LIB_CTX *libctx,
- const char *propq)
+ OSSL_LIB_CTX *libctx,
+ const char *propq)
{
CMS_ContentInfo *cms;
CMS_EnvelopedData *env;
@@ -258,10 +256,10 @@ CMS_ContentInfo *CMS_EnvelopedData_create_ex(const EVP_CIPHER *cipher,
goto err;
if (!ossl_cms_EncryptedContent_init(env->encryptedContentInfo, cipher, NULL,
- 0, ossl_cms_get0_cmsctx(cms)))
+ 0, ossl_cms_get0_cmsctx(cms)))
goto err;
return cms;
- err:
+err:
CMS_ContentInfo_free(cms);
ERR_raise(ERR_LIB_CMS, ERR_R_CMS_LIB);
return NULL;
@@ -273,9 +271,9 @@ CMS_ContentInfo *CMS_EnvelopedData_create(const EVP_CIPHER *cipher)
}
BIO *CMS_EnvelopedData_decrypt(CMS_EnvelopedData *env, BIO *detached_data,
- EVP_PKEY *pkey, X509 *cert,
- ASN1_OCTET_STRING *secret, unsigned int flags,
- OSSL_LIB_CTX *libctx, const char *propq)
+ EVP_PKEY *pkey, X509 *cert,
+ ASN1_OCTET_STRING *secret, unsigned int flags,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
CMS_ContentInfo *ci;
BIO *bio = NULL;
@@ -287,19 +285,19 @@ BIO *CMS_EnvelopedData_decrypt(CMS_EnvelopedData *env, BIO *detached_data,
}
if ((ci = CMS_ContentInfo_new_ex(libctx, propq)) == NULL
- || (bio = BIO_new(BIO_s_mem())) == NULL)
+ || (bio = BIO_new(BIO_s_mem())) == NULL)
goto end;
ci->contentType = OBJ_nid2obj(NID_pkcs7_enveloped);
ci->d.envelopedData = env;
if (secret != NULL
- && CMS_decrypt_set1_password(ci, (unsigned char *)
- ASN1_STRING_get0_data(secret),
- ASN1_STRING_length(secret)) != 1)
+ && CMS_decrypt_set1_password(ci, (unsigned char *)ASN1_STRING_get0_data(secret),
+ ASN1_STRING_length(secret))
+ != 1)
goto end;
res = CMS_decrypt(ci, secret == NULL ? pkey : NULL,
- secret == NULL ? cert : NULL, detached_data, bio, flags);
+ secret == NULL ? cert : NULL, detached_data, bio, flags);
- end:
+end:
if (ci != NULL) {
ci->d.envelopedData = NULL; /* do not indirectly free |env| */
ci->contentType = NULL;
@@ -314,7 +312,7 @@ BIO *CMS_EnvelopedData_decrypt(CMS_EnvelopedData *env, BIO *detached_data,
CMS_ContentInfo *
CMS_AuthEnvelopedData_create_ex(const EVP_CIPHER *cipher, OSSL_LIB_CTX *libctx,
- const char *propq)
+ const char *propq)
{
CMS_ContentInfo *cms;
CMS_AuthEnvelopedData *aenv;
@@ -326,17 +324,16 @@ CMS_AuthEnvelopedData_create_ex(const EVP_CIPHER *cipher, OSSL_LIB_CTX *libctx,
if (aenv == NULL)
goto merr;
if (!ossl_cms_EncryptedContent_init(aenv->authEncryptedContentInfo,
- cipher, NULL, 0,
- ossl_cms_get0_cmsctx(cms)))
+ cipher, NULL, 0,
+ ossl_cms_get0_cmsctx(cms)))
goto merr;
return cms;
- merr:
+merr:
CMS_ContentInfo_free(cms);
ERR_raise(ERR_LIB_CMS, ERR_R_CMS_LIB);
return NULL;
}
-
CMS_ContentInfo *CMS_AuthEnvelopedData_create(const EVP_CIPHER *cipher)
{
return CMS_AuthEnvelopedData_create_ex(cipher, NULL, NULL);
@@ -347,8 +344,8 @@ CMS_ContentInfo *CMS_AuthEnvelopedData_create(const EVP_CIPHER *cipher)
/* Initialise a ktri based on passed certificate and key */
static int cms_RecipientInfo_ktri_init(CMS_RecipientInfo *ri, X509 *recip,
- EVP_PKEY *pk, unsigned int flags,
- const CMS_CTX *ctx)
+ EVP_PKEY *pk, unsigned int flags,
+ const CMS_CTX *ctx)
{
CMS_KeyTransRecipientInfo *ktri;
int idtype;
@@ -389,8 +386,8 @@ static int cms_RecipientInfo_ktri_init(CMS_RecipientInfo *ri, X509 *recip,
if (flags & CMS_KEY_PARAM) {
ktri->pctx = EVP_PKEY_CTX_new_from_pkey(ossl_cms_ctx_get0_libctx(ctx),
- ktri->pkey,
- ossl_cms_ctx_get0_propq(ctx));
+ ktri->pkey,
+ ossl_cms_ctx_get0_propq(ctx));
if (ktri->pctx == NULL)
return 0;
if (EVP_PKEY_encrypt_init(ktri->pctx) <= 0)
@@ -405,8 +402,8 @@ static int cms_RecipientInfo_ktri_init(CMS_RecipientInfo *ri, X509 *recip,
*/
CMS_RecipientInfo *CMS_add1_recipient(CMS_ContentInfo *cms, X509 *recip,
- EVP_PKEY *originatorPrivKey,
- X509 *originator, unsigned int flags)
+ EVP_PKEY *originatorPrivKey,
+ X509 *originator, unsigned int flags)
{
CMS_RecipientInfo *ri = NULL;
STACK_OF(CMS_RecipientInfo) *ris;
@@ -439,7 +436,7 @@ CMS_RecipientInfo *CMS_add1_recipient(CMS_ContentInfo *cms, X509 *recip,
case CMS_RECIPINFO_AGREE:
if (!ossl_cms_RecipientInfo_kari_init(ri, recip, pk, originator,
- originatorPrivKey, flags, ctx))
+ originatorPrivKey, flags, ctx))
goto err;
break;
@@ -451,7 +448,6 @@ CMS_RecipientInfo *CMS_add1_recipient(CMS_ContentInfo *cms, X509 *recip,
default:
ERR_raise(ERR_LIB_CMS, CMS_R_NOT_SUPPORTED_FOR_THIS_KEY_TYPE);
goto err;
-
}
if (!sk_CMS_RecipientInfo_push(ris, ri)) {
@@ -461,21 +457,20 @@ CMS_RecipientInfo *CMS_add1_recipient(CMS_ContentInfo *cms, X509 *recip,
return ri;
- err:
+err:
M_ASN1_free_of(ri, CMS_RecipientInfo);
return NULL;
-
}
CMS_RecipientInfo *CMS_add1_recipient_cert(CMS_ContentInfo *cms, X509 *recip,
- unsigned int flags)
+ unsigned int flags)
{
- return CMS_add1_recipient(cms, recip, NULL, NULL, flags);
+ return CMS_add1_recipient(cms, recip, NULL, NULL, flags);
}
int CMS_RecipientInfo_ktri_get0_algs(CMS_RecipientInfo *ri,
- EVP_PKEY **pk, X509 **recip,
- X509_ALGOR **palg)
+ EVP_PKEY **pk, X509 **recip,
+ X509_ALGOR **palg)
{
CMS_KeyTransRecipientInfo *ktri;
if (ri->type != CMS_RECIPINFO_TRANS) {
@@ -495,9 +490,9 @@ int CMS_RecipientInfo_ktri_get0_algs(CMS_RecipientInfo *ri,
}
int CMS_RecipientInfo_ktri_get0_signer_id(CMS_RecipientInfo *ri,
- ASN1_OCTET_STRING **keyid,
- X509_NAME **issuer,
- ASN1_INTEGER **sno)
+ ASN1_OCTET_STRING **keyid,
+ X509_NAME **issuer,
+ ASN1_INTEGER **sno)
{
CMS_KeyTransRecipientInfo *ktri;
if (ri->type != CMS_RECIPINFO_TRANS) {
@@ -507,7 +502,7 @@ int CMS_RecipientInfo_ktri_get0_signer_id(CMS_RecipientInfo *ri,
ktri = ri->d.ktri;
return ossl_cms_SignerIdentifier_get0_signer_id(ktri->rid, keyid, issuer,
- sno);
+ sno);
}
int CMS_RecipientInfo_ktri_cert_cmp(CMS_RecipientInfo *ri, X509 *cert)
@@ -533,7 +528,7 @@ int CMS_RecipientInfo_set0_pkey(CMS_RecipientInfo *ri, EVP_PKEY *pkey)
/* Encrypt content key in key transport recipient info */
static int cms_RecipientInfo_ktri_encrypt(const CMS_ContentInfo *cms,
- CMS_RecipientInfo *ri)
+ CMS_RecipientInfo *ri)
{
CMS_KeyTransRecipientInfo *ktri;
CMS_EncryptedContentInfo *ec;
@@ -558,8 +553,8 @@ static int cms_RecipientInfo_ktri_encrypt(const CMS_ContentInfo *cms,
goto err;
} else {
pctx = EVP_PKEY_CTX_new_from_pkey(ossl_cms_ctx_get0_libctx(ctx),
- ktri->pkey,
- ossl_cms_ctx_get0_propq(ctx));
+ ktri->pkey,
+ ossl_cms_ctx_get0_propq(ctx));
if (pctx == NULL)
return 0;
@@ -582,7 +577,7 @@ static int cms_RecipientInfo_ktri_encrypt(const CMS_ContentInfo *cms,
ret = 1;
- err:
+err:
EVP_PKEY_CTX_free(pctx);
ktri->pctx = NULL;
OPENSSL_free(ek);
@@ -592,7 +587,7 @@ static int cms_RecipientInfo_ktri_encrypt(const CMS_ContentInfo *cms,
/* Decrypt content key from KTRI */
static int cms_RecipientInfo_ktri_decrypt(CMS_ContentInfo *cms,
- CMS_RecipientInfo *ri)
+ CMS_RecipientInfo *ri)
{
CMS_KeyTransRecipientInfo *ktri = ri->d.ktri;
EVP_PKEY *pkey = ktri->pkey;
@@ -615,7 +610,7 @@ static int cms_RecipientInfo_ktri_decrypt(CMS_ContentInfo *cms,
}
if (cms->d.envelopedData->encryptedContentInfo->havenocert
- && !cms->d.envelopedData->encryptedContentInfo->debug) {
+ && !cms->d.envelopedData->encryptedContentInfo->debug) {
X509_ALGOR *calg = ec->contentEncryptionAlgorithm;
char name[OSSL_MAX_NAME_SIZE];
@@ -657,8 +652,9 @@ static int cms_RecipientInfo_ktri_decrypt(CMS_ContentInfo *cms,
EVP_PKEY_CTX_ctrl_str(ktri->pctx, "rsa_pkcs1_implicit_rejection", "0");
if (evp_pkey_decrypt_alloc(ktri->pctx, &ek, &eklen, fixlen,
- ktri->encryptedKey->data,
- ktri->encryptedKey->length) <= 0)
+ ktri->encryptedKey->data,
+ ktri->encryptedKey->length)
+ <= 0)
goto err;
ret = 1;
@@ -667,7 +663,7 @@ static int cms_RecipientInfo_ktri_decrypt(CMS_ContentInfo *cms,
ec->key = ek;
ec->keylen = eklen;
- err:
+err:
EVP_PKEY_CTX_free(ktri->pctx);
ktri->pctx = NULL;
if (!ret)
@@ -679,7 +675,7 @@ static int cms_RecipientInfo_ktri_decrypt(CMS_ContentInfo *cms,
/* Key Encrypted Key (KEK) RecipientInfo routines */
int CMS_RecipientInfo_kekri_id_cmp(CMS_RecipientInfo *ri,
- const unsigned char *id, size_t idlen)
+ const unsigned char *id, size_t idlen)
{
ASN1_OCTET_STRING tmp_os;
CMS_KEKRecipientInfo *kekri;
@@ -715,11 +711,11 @@ static size_t aes_wrap_keylen(int nid)
}
CMS_RecipientInfo *CMS_add0_recipient_key(CMS_ContentInfo *cms, int nid,
- unsigned char *key, size_t keylen,
- unsigned char *id, size_t idlen,
- ASN1_GENERALIZEDTIME *date,
- ASN1_OBJECT *otherTypeId,
- ASN1_TYPE *otherType)
+ unsigned char *key, size_t keylen,
+ unsigned char *id, size_t idlen,
+ ASN1_GENERALIZEDTIME *date,
+ ASN1_OBJECT *otherTypeId,
+ ASN1_TYPE *otherType)
{
CMS_RecipientInfo *ri = NULL;
CMS_KEKRecipientInfo *kekri;
@@ -760,7 +756,6 @@ CMS_RecipientInfo *CMS_add0_recipient_key(CMS_ContentInfo *cms, int nid,
ERR_raise(ERR_LIB_CMS, CMS_R_INVALID_KEY_LENGTH);
goto err;
}
-
}
/* Initialize recipient info */
@@ -809,21 +804,21 @@ CMS_RecipientInfo *CMS_add0_recipient_key(CMS_ContentInfo *cms, int nid,
}
(void)X509_ALGOR_set0(kekri->keyEncryptionAlgorithm, OBJ_nid2obj(nid),
- V_ASN1_UNDEF, NULL); /* cannot fail */
+ V_ASN1_UNDEF, NULL); /* cannot fail */
return ri;
- err:
+err:
M_ASN1_free_of(ri, CMS_RecipientInfo);
return NULL;
}
int CMS_RecipientInfo_kekri_get0_id(CMS_RecipientInfo *ri,
- X509_ALGOR **palg,
- ASN1_OCTET_STRING **pid,
- ASN1_GENERALIZEDTIME **pdate,
- ASN1_OBJECT **potherid,
- ASN1_TYPE **pothertype)
+ X509_ALGOR **palg,
+ ASN1_OCTET_STRING **pid,
+ ASN1_GENERALIZEDTIME **pdate,
+ ASN1_OBJECT **potherid,
+ ASN1_TYPE **pothertype)
{
CMS_KEKIdentifier *rkid;
if (ri->type != CMS_RECIPINFO_KEK) {
@@ -853,7 +848,7 @@ int CMS_RecipientInfo_kekri_get0_id(CMS_RecipientInfo *ri,
}
int CMS_RecipientInfo_set0_key(CMS_RecipientInfo *ri,
- unsigned char *key, size_t keylen)
+ unsigned char *key, size_t keylen)
{
CMS_KEKRecipientInfo *kekri;
if (ri->type != CMS_RECIPINFO_KEK) {
@@ -885,14 +880,13 @@ static EVP_CIPHER *cms_get_key_wrap_cipher(size_t keylen, const CMS_CTX *ctx)
return NULL;
}
return EVP_CIPHER_fetch(ossl_cms_ctx_get0_libctx(ctx), alg,
- ossl_cms_ctx_get0_propq(ctx));
+ ossl_cms_ctx_get0_propq(ctx));
}
-
/* Encrypt content key in KEK recipient info */
static int cms_RecipientInfo_kekri_encrypt(const CMS_ContentInfo *cms,
- CMS_RecipientInfo *ri)
+ CMS_RecipientInfo *ri)
{
CMS_EncryptedContentInfo *ec;
CMS_KEKRecipientInfo *kekri;
@@ -934,8 +928,8 @@ static int cms_RecipientInfo_kekri_encrypt(const CMS_ContentInfo *cms,
EVP_CIPHER_CTX_set_flags(ctx, EVP_CIPHER_CTX_FLAG_WRAP_ALLOW);
if (!EVP_EncryptInit_ex(ctx, cipher, NULL, kekri->key, NULL)
- || !EVP_EncryptUpdate(ctx, wkey, &wkeylen, ec->key, (int)ec->keylen)
- || !EVP_EncryptFinal_ex(ctx, wkey + wkeylen, &outlen)) {
+ || !EVP_EncryptUpdate(ctx, wkey, &wkeylen, ec->key, (int)ec->keylen)
+ || !EVP_EncryptFinal_ex(ctx, wkey + wkeylen, &outlen)) {
ERR_raise(ERR_LIB_CMS, CMS_R_WRAP_ERROR);
goto err;
}
@@ -949,7 +943,7 @@ static int cms_RecipientInfo_kekri_encrypt(const CMS_ContentInfo *cms,
r = 1;
- err:
+err:
EVP_CIPHER_free(cipher);
if (!r)
OPENSSL_free(wkey);
@@ -961,7 +955,7 @@ static int cms_RecipientInfo_kekri_encrypt(const CMS_ContentInfo *cms,
/* Decrypt content key in KEK recipient info */
static int cms_RecipientInfo_kekri_decrypt(CMS_ContentInfo *cms,
- CMS_RecipientInfo *ri)
+ CMS_RecipientInfo *ri)
{
CMS_EncryptedContentInfo *ec;
CMS_KEKRecipientInfo *kekri;
@@ -1014,10 +1008,10 @@ static int cms_RecipientInfo_kekri_decrypt(CMS_ContentInfo *cms,
}
if (!EVP_DecryptInit_ex(ctx, cipher, NULL, kekri->key, NULL)
- || !EVP_DecryptUpdate(ctx, ukey, &ukeylen,
- kekri->encryptedKey->data,
- kekri->encryptedKey->length)
- || !EVP_DecryptFinal_ex(ctx, ukey + ukeylen, &outlen)) {
+ || !EVP_DecryptUpdate(ctx, ukey, &ukeylen,
+ kekri->encryptedKey->data,
+ kekri->encryptedKey->length)
+ || !EVP_DecryptFinal_ex(ctx, ukey + ukeylen, &outlen)) {
ERR_raise(ERR_LIB_CMS, CMS_R_UNWRAP_ERROR);
goto err;
}
@@ -1029,7 +1023,7 @@ static int cms_RecipientInfo_kekri_decrypt(CMS_ContentInfo *cms,
r = 1;
- err:
+err:
EVP_CIPHER_free(cipher);
if (!r)
OPENSSL_free(ukey);
@@ -1136,7 +1130,7 @@ static void cms_env_set_version(CMS_EnvelopedData *env)
env->version = 3;
return;
} else if (ri->type != CMS_RECIPINFO_TRANS
- || ri->d.ktri->version != 0) {
+ || ri->d.ktri->version != 0) {
env->version = 2;
}
}
@@ -1148,7 +1142,7 @@ static void cms_env_set_version(CMS_EnvelopedData *env)
}
static int cms_env_encrypt_content_key(const CMS_ContentInfo *cms,
- STACK_OF(CMS_RecipientInfo) *ris)
+ STACK_OF(CMS_RecipientInfo) *ris)
{
int i;
CMS_RecipientInfo *ri;
@@ -1173,8 +1167,8 @@ static BIO *cms_EnvelopedData_Decryption_init_bio(CMS_ContentInfo *cms)
{
CMS_EncryptedContentInfo *ec = cms->d.envelopedData->encryptedContentInfo;
BIO *contentBio = ossl_cms_EncryptedContent_init_bio(ec,
- ossl_cms_get0_cmsctx(cms),
- 0);
+ ossl_cms_get0_cmsctx(cms),
+ 0);
EVP_CIPHER_CTX *ctx = NULL;
if (contentBio == NULL)
@@ -1190,9 +1184,11 @@ static BIO *cms_EnvelopedData_Decryption_init_bio(CMS_ContentInfo *cms)
* deal with it using special ctrl function
*/
if ((EVP_CIPHER_get_flags(EVP_CIPHER_CTX_get0_cipher(ctx))
- & EVP_CIPH_FLAG_CIPHER_WITH_MAC) != 0
- && EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_PROCESS_UNPROTECTED, 0,
- cms->d.envelopedData->unprotectedAttrs) <= 0) {
+ & EVP_CIPH_FLAG_CIPHER_WITH_MAC)
+ != 0
+ && EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_PROCESS_UNPROTECTED, 0,
+ cms->d.envelopedData->unprotectedAttrs)
+ <= 0) {
BIO_free(contentBio);
return NULL;
}
@@ -1228,7 +1224,7 @@ static BIO *cms_EnvelopedData_Encryption_init_bio(CMS_ContentInfo *cms)
ok = 1;
- err:
+err:
cms_env_clear_ec(ec);
if (ok)
return ret;
@@ -1239,8 +1235,8 @@ static BIO *cms_EnvelopedData_Encryption_init_bio(CMS_ContentInfo *cms)
BIO *ossl_cms_EnvelopedData_init_bio(CMS_ContentInfo *cms)
{
if (cms->d.envelopedData->encryptedContentInfo->cipher != NULL) {
- /* If cipher is set it's encryption */
- return cms_EnvelopedData_Encryption_init_bio(cms);
+ /* If cipher is set it's encryption */
+ return cms_EnvelopedData_Encryption_init_bio(cms);
}
/* If cipher is not set it's decryption */
@@ -1280,7 +1276,7 @@ BIO *ossl_cms_AuthEnvelopedData_init_bio(CMS_ContentInfo *cms)
ok = 1;
- err:
+err:
cms_env_clear_ec(ec);
if (ok)
return ret;
@@ -1310,7 +1306,8 @@ int ossl_cms_EnvelopedData_final(CMS_ContentInfo *cms, BIO *chain)
* deal with it using special ctrl function
*/
if ((EVP_CIPHER_get_flags(EVP_CIPHER_CTX_get0_cipher(ctx))
- & EVP_CIPH_FLAG_CIPHER_WITH_MAC) != 0) {
+ & EVP_CIPH_FLAG_CIPHER_WITH_MAC)
+ != 0) {
if (env->unprotectedAttrs == NULL)
env->unprotectedAttrs = sk_X509_ATTRIBUTE_new_null();
@@ -1320,7 +1317,8 @@ int ossl_cms_EnvelopedData_final(CMS_ContentInfo *cms, BIO *chain)
}
if (EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_PROCESS_UNPROTECTED,
- 1, env->unprotectedAttrs) <= 0) {
+ 1, env->unprotectedAttrs)
+ <= 0) {
ERR_raise(ERR_LIB_CMS, CMS_R_CTRL_FAILURE);
return 0;
}
@@ -1347,9 +1345,10 @@ int ossl_cms_AuthEnvelopedData_final(CMS_ContentInfo *cms, BIO *cmsbio)
taglen = EVP_CIPHER_CTX_get_tag_length(ctx);
if (taglen <= 0
- || (tag = OPENSSL_malloc(taglen)) == NULL
- || EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_GET_TAG, taglen,
- tag) <= 0) {
+ || (tag = OPENSSL_malloc(taglen)) == NULL
+ || EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_GET_TAG, taglen,
+ tag)
+ <= 0) {
ERR_raise(ERR_LIB_CMS, CMS_R_CIPHER_GET_TAG);
goto err;
}
@@ -1433,7 +1432,7 @@ int ossl_cms_pkey_is_ri_type_supported(EVP_PKEY *pk, int ri_type)
int i, r;
i = pk->ameth->pkey_ctrl(pk, ASN1_PKEY_CTRL_CMS_IS_RI_TYPE_SUPPORTED,
- ri_type, &r);
+ ri_type, &r);
if (i > 0)
return r;
}
@@ -1446,7 +1445,7 @@ int ossl_cms_pkey_is_ri_type_supported(EVP_PKEY *pk, int ri_type)
}
int ossl_cms_RecipientInfo_wrap_init(CMS_RecipientInfo *ri,
- const EVP_CIPHER *cipher)
+ const EVP_CIPHER *cipher)
{
const CMS_CTX *cms_ctx;
EVP_CIPHER_CTX *ctx;
@@ -1483,7 +1482,7 @@ int ossl_cms_RecipientInfo_wrap_init(CMS_RecipientInfo *ri,
}
if ((EVP_CIPHER_get_flags(cipher) & EVP_CIPH_FLAG_GET_WRAP_CIPHER) != 0) {
ret = EVP_CIPHER_meth_get_ctrl(cipher)(NULL, EVP_CTRL_GET_WRAP_CIPHER,
- 0, &kekcipher);
+ 0, &kekcipher);
if (ret <= 0)
return 0;
@@ -1504,7 +1503,7 @@ int ossl_cms_RecipientInfo_wrap_init(CMS_RecipientInfo *ri,
kekcipher_name = SN_id_smime_alg_CMS3DESwrap;
else
#endif
- if (keylen <= 16)
+ if (keylen <= 16)
kekcipher_name = SN_id_aes128_wrap;
else if (keylen <= 24)
kekcipher_name = SN_id_aes192_wrap;
@@ -1512,8 +1511,8 @@ int ossl_cms_RecipientInfo_wrap_init(CMS_RecipientInfo *ri,
kekcipher_name = SN_id_aes256_wrap;
enc:
fetched_kekcipher = EVP_CIPHER_fetch(ossl_cms_ctx_get0_libctx(cms_ctx),
- kekcipher_name,
- ossl_cms_ctx_get0_propq(cms_ctx));
+ kekcipher_name,
+ ossl_cms_ctx_get0_propq(cms_ctx));
if (fetched_kekcipher == NULL)
return 0;
ret = EVP_EncryptInit_ex(ctx, fetched_kekcipher, NULL, NULL, NULL);
diff --git a/crypto/cms/cms_err.c b/crypto/cms/cms_err.c
index d883ace9a1..14ef7f1190 100644
--- a/crypto/cms/cms_err.c
+++ b/crypto/cms/cms_err.c
@@ -14,176 +14,176 @@
#ifndef OPENSSL_NO_CMS
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA CMS_str_reasons[] = {
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ADD_SIGNER_ERROR), "add signer error"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ATTRIBUTE_ERROR), "attribute error"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CERTIFICATE_ALREADY_PRESENT),
- "certificate already present"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CERTIFICATE_HAS_NO_KEYID),
- "certificate has no keyid"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CERTIFICATE_VERIFY_ERROR),
- "certificate verify error"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CIPHER_AEAD_IN_ENVELOPED_DATA),
- "cipher aead in enveloped data"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CIPHER_AEAD_SET_TAG_ERROR),
- "cipher aead set tag error"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CIPHER_GET_TAG), "cipher get tag"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CIPHER_INITIALISATION_ERROR),
- "cipher initialisation error"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CIPHER_PARAMETER_INITIALISATION_ERROR),
- "cipher parameter initialisation error"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CMS_DATAFINAL_ERROR),
- "cms datafinal error"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CMS_LIB), "cms lib"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CONTENTIDENTIFIER_MISMATCH),
- "contentidentifier mismatch"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CONTENT_NOT_FOUND), "content not found"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CONTENT_TYPE_MISMATCH),
- "content type mismatch"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CONTENT_TYPE_NOT_COMPRESSED_DATA),
- "content type not compressed data"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CONTENT_TYPE_NOT_ENVELOPED_DATA),
- "content type not enveloped data"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CONTENT_TYPE_NOT_SIGNED_DATA),
- "content type not signed data"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CONTENT_VERIFY_ERROR),
- "content verify error"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CTRL_ERROR), "ctrl error"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CTRL_FAILURE), "ctrl failure"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_DECODE_ERROR), "decode error"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_DECRYPT_ERROR), "decrypt error"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ERROR_GETTING_PUBLIC_KEY),
- "error getting public key"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ERROR_READING_MESSAGEDIGEST_ATTRIBUTE),
- "error reading messagedigest attribute"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ERROR_SETTING_KEY), "error setting key"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ERROR_SETTING_RECIPIENTINFO),
- "error setting recipientinfo"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ERROR_UNSUPPORTED_STATIC_KEY_AGREEMENT),
- "error unsupported static key agreement"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ESS_SIGNING_CERTID_MISMATCH_ERROR),
- "ess signing certid mismatch error"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_INVALID_ENCRYPTED_KEY_LENGTH),
- "invalid encrypted key length"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_INVALID_KEY_ENCRYPTION_PARAMETER),
- "invalid key encryption parameter"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_INVALID_KEY_LENGTH), "invalid key length"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_INVALID_LABEL), "invalid label"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_INVALID_OAEP_PARAMETERS),
- "invalid oaep parameters"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_KDF_PARAMETER_ERROR),
- "kdf parameter error"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_MD_BIO_INIT_ERROR), "md bio init error"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_MESSAGEDIGEST_ATTRIBUTE_WRONG_LENGTH),
- "messagedigest attribute wrong length"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_MESSAGEDIGEST_WRONG_LENGTH),
- "messagedigest wrong length"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_MSGSIGDIGEST_ERROR), "msgsigdigest error"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_MSGSIGDIGEST_VERIFICATION_FAILURE),
- "msgsigdigest verification failure"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_MSGSIGDIGEST_WRONG_LENGTH),
- "msgsigdigest wrong length"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NEED_ONE_SIGNER), "need one signer"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NOT_A_SIGNED_RECEIPT),
- "not a signed receipt"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NOT_ENCRYPTED_DATA), "not encrypted data"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NOT_KEK), "not kek"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NOT_KEM), "not kem"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NOT_KEY_AGREEMENT), "not key agreement"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NOT_KEY_TRANSPORT), "not key transport"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NOT_PWRI), "not pwri"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NOT_SUPPORTED_FOR_THIS_KEY_TYPE),
- "not supported for this key type"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_CIPHER), "no cipher"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_CONTENT), "no content"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_CONTENT_TYPE), "no content type"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_DEFAULT_DIGEST), "no default digest"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_DIGEST_SET), "no digest set"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_KEY), "no key"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_KEY_OR_CERT), "no key or cert"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_MATCHING_DIGEST), "no matching digest"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_MATCHING_RECIPIENT),
- "no matching recipient"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_MATCHING_SIGNATURE),
- "no matching signature"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_MSGSIGDIGEST), "no msgsigdigest"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_PASSWORD), "no password"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_PRIVATE_KEY), "no private key"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_PUBLIC_KEY), "no public key"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_RECEIPT_REQUEST), "no receipt request"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_SIGNERS), "no signers"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_OPERATION_UNSUPPORTED),
- "operation unsupported"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_PEER_KEY_ERROR), "peer key error"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE),
- "private key does not match certificate"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_RECEIPT_DECODE_ERROR),
- "receipt decode error"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_RECIPIENT_ERROR), "recipient error"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_SHARED_INFO_ERROR), "shared info error"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_SIGNER_CERTIFICATE_NOT_FOUND),
- "signer certificate not found"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_SIGNFINAL_ERROR), "signfinal error"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_SMIME_TEXT_ERROR), "smime text error"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_STORE_INIT_ERROR), "store init error"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_TYPE_NOT_COMPRESSED_DATA),
- "type not compressed data"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_TYPE_NOT_DATA), "type not data"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_TYPE_NOT_DIGESTED_DATA),
- "type not digested data"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_TYPE_NOT_ENCRYPTED_DATA),
- "type not encrypted data"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_TYPE_NOT_ENVELOPED_DATA),
- "type not enveloped data"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNABLE_TO_FINALIZE_CONTEXT),
- "unable to finalize context"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNKNOWN_CIPHER), "unknown cipher"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNKNOWN_DIGEST_ALGORITHM),
- "unknown digest algorithm"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNKNOWN_ID), "unknown id"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNKNOWN_KDF_ALGORITHM),
- "unknown kdf algorithm"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_COMPRESSION_ALGORITHM),
- "unsupported compression algorithm"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_CONTENT_ENCRYPTION_ALGORITHM),
- "unsupported content encryption algorithm"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_CONTENT_TYPE),
- "unsupported content type"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_ENCRYPTION_TYPE),
- "unsupported encryption type"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_KDF_ALGORITHM),
- "unsupported kdf algorithm"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_KEK_ALGORITHM),
- "unsupported kek algorithm"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_KEY_ENCRYPTION_ALGORITHM),
- "unsupported key encryption algorithm"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_LABEL_SOURCE),
- "unsupported label source"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_RECIPIENTINFO_TYPE),
- "unsupported recipientinfo type"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_RECIPIENT_TYPE),
- "unsupported recipient type"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_SIGNATURE_ALGORITHM),
- "unsupported signature algorithm"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_TYPE), "unsupported type"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNWRAP_ERROR), "unwrap error"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNWRAP_FAILURE), "unwrap failure"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_VERIFICATION_FAILURE),
- "verification failure"},
- {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_WRAP_ERROR), "wrap error"},
- {0, NULL}
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ADD_SIGNER_ERROR), "add signer error" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ATTRIBUTE_ERROR), "attribute error" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CERTIFICATE_ALREADY_PRESENT),
+ "certificate already present" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CERTIFICATE_HAS_NO_KEYID),
+ "certificate has no keyid" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CERTIFICATE_VERIFY_ERROR),
+ "certificate verify error" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CIPHER_AEAD_IN_ENVELOPED_DATA),
+ "cipher aead in enveloped data" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CIPHER_AEAD_SET_TAG_ERROR),
+ "cipher aead set tag error" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CIPHER_GET_TAG), "cipher get tag" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CIPHER_INITIALISATION_ERROR),
+ "cipher initialisation error" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CIPHER_PARAMETER_INITIALISATION_ERROR),
+ "cipher parameter initialisation error" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CMS_DATAFINAL_ERROR),
+ "cms datafinal error" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CMS_LIB), "cms lib" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CONTENTIDENTIFIER_MISMATCH),
+ "contentidentifier mismatch" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CONTENT_NOT_FOUND), "content not found" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CONTENT_TYPE_MISMATCH),
+ "content type mismatch" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CONTENT_TYPE_NOT_COMPRESSED_DATA),
+ "content type not compressed data" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CONTENT_TYPE_NOT_ENVELOPED_DATA),
+ "content type not enveloped data" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CONTENT_TYPE_NOT_SIGNED_DATA),
+ "content type not signed data" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CONTENT_VERIFY_ERROR),
+ "content verify error" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CTRL_ERROR), "ctrl error" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CTRL_FAILURE), "ctrl failure" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_DECODE_ERROR), "decode error" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_DECRYPT_ERROR), "decrypt error" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ERROR_GETTING_PUBLIC_KEY),
+ "error getting public key" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ERROR_READING_MESSAGEDIGEST_ATTRIBUTE),
+ "error reading messagedigest attribute" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ERROR_SETTING_KEY), "error setting key" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ERROR_SETTING_RECIPIENTINFO),
+ "error setting recipientinfo" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ERROR_UNSUPPORTED_STATIC_KEY_AGREEMENT),
+ "error unsupported static key agreement" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ESS_SIGNING_CERTID_MISMATCH_ERROR),
+ "ess signing certid mismatch error" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_INVALID_ENCRYPTED_KEY_LENGTH),
+ "invalid encrypted key length" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_INVALID_KEY_ENCRYPTION_PARAMETER),
+ "invalid key encryption parameter" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_INVALID_KEY_LENGTH), "invalid key length" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_INVALID_LABEL), "invalid label" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_INVALID_OAEP_PARAMETERS),
+ "invalid oaep parameters" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_KDF_PARAMETER_ERROR),
+ "kdf parameter error" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_MD_BIO_INIT_ERROR), "md bio init error" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_MESSAGEDIGEST_ATTRIBUTE_WRONG_LENGTH),
+ "messagedigest attribute wrong length" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_MESSAGEDIGEST_WRONG_LENGTH),
+ "messagedigest wrong length" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_MSGSIGDIGEST_ERROR), "msgsigdigest error" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_MSGSIGDIGEST_VERIFICATION_FAILURE),
+ "msgsigdigest verification failure" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_MSGSIGDIGEST_WRONG_LENGTH),
+ "msgsigdigest wrong length" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NEED_ONE_SIGNER), "need one signer" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NOT_A_SIGNED_RECEIPT),
+ "not a signed receipt" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NOT_ENCRYPTED_DATA), "not encrypted data" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NOT_KEK), "not kek" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NOT_KEM), "not kem" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NOT_KEY_AGREEMENT), "not key agreement" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NOT_KEY_TRANSPORT), "not key transport" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NOT_PWRI), "not pwri" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NOT_SUPPORTED_FOR_THIS_KEY_TYPE),
+ "not supported for this key type" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_CIPHER), "no cipher" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_CONTENT), "no content" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_CONTENT_TYPE), "no content type" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_DEFAULT_DIGEST), "no default digest" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_DIGEST_SET), "no digest set" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_KEY), "no key" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_KEY_OR_CERT), "no key or cert" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_MATCHING_DIGEST), "no matching digest" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_MATCHING_RECIPIENT),
+ "no matching recipient" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_MATCHING_SIGNATURE),
+ "no matching signature" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_MSGSIGDIGEST), "no msgsigdigest" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_PASSWORD), "no password" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_PRIVATE_KEY), "no private key" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_PUBLIC_KEY), "no public key" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_RECEIPT_REQUEST), "no receipt request" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_SIGNERS), "no signers" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_OPERATION_UNSUPPORTED),
+ "operation unsupported" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_PEER_KEY_ERROR), "peer key error" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE),
+ "private key does not match certificate" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_RECEIPT_DECODE_ERROR),
+ "receipt decode error" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_RECIPIENT_ERROR), "recipient error" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_SHARED_INFO_ERROR), "shared info error" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_SIGNER_CERTIFICATE_NOT_FOUND),
+ "signer certificate not found" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_SIGNFINAL_ERROR), "signfinal error" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_SMIME_TEXT_ERROR), "smime text error" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_STORE_INIT_ERROR), "store init error" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_TYPE_NOT_COMPRESSED_DATA),
+ "type not compressed data" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_TYPE_NOT_DATA), "type not data" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_TYPE_NOT_DIGESTED_DATA),
+ "type not digested data" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_TYPE_NOT_ENCRYPTED_DATA),
+ "type not encrypted data" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_TYPE_NOT_ENVELOPED_DATA),
+ "type not enveloped data" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNABLE_TO_FINALIZE_CONTEXT),
+ "unable to finalize context" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNKNOWN_CIPHER), "unknown cipher" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNKNOWN_DIGEST_ALGORITHM),
+ "unknown digest algorithm" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNKNOWN_ID), "unknown id" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNKNOWN_KDF_ALGORITHM),
+ "unknown kdf algorithm" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_COMPRESSION_ALGORITHM),
+ "unsupported compression algorithm" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_CONTENT_ENCRYPTION_ALGORITHM),
+ "unsupported content encryption algorithm" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_CONTENT_TYPE),
+ "unsupported content type" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_ENCRYPTION_TYPE),
+ "unsupported encryption type" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_KDF_ALGORITHM),
+ "unsupported kdf algorithm" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_KEK_ALGORITHM),
+ "unsupported kek algorithm" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_KEY_ENCRYPTION_ALGORITHM),
+ "unsupported key encryption algorithm" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_LABEL_SOURCE),
+ "unsupported label source" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_RECIPIENTINFO_TYPE),
+ "unsupported recipientinfo type" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_RECIPIENT_TYPE),
+ "unsupported recipient type" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_SIGNATURE_ALGORITHM),
+ "unsupported signature algorithm" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_TYPE), "unsupported type" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNWRAP_ERROR), "unwrap error" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNWRAP_FAILURE), "unwrap failure" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_VERIFICATION_FAILURE),
+ "verification failure" },
+ { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_WRAP_ERROR), "wrap error" },
+ { 0, NULL }
};
-# endif
+#endif
int ossl_err_load_CMS_strings(void)
{
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(CMS_str_reasons[0].error) == NULL)
ERR_load_strings_const(CMS_str_reasons);
-# endif
+#endif
return 1;
}
#else
diff --git a/crypto/cms/cms_ess.c b/crypto/cms/cms_ess.c
index 0885a68216..480e1c8b1d 100644
--- a/crypto/cms/cms_ess.c
+++ b/crypto/cms/cms_ess.c
@@ -50,7 +50,7 @@ int CMS_get1_ReceiptRequest(CMS_SignerInfo *si, CMS_ReceiptRequest **prr)
* or -1 on attribute parsing failure.
*/
static int ossl_cms_signerinfo_get_signing_cert(const CMS_SignerInfo *si,
- ESS_SIGNING_CERT **psc)
+ ESS_SIGNING_CERT **psc)
{
ASN1_STRING *str;
ESS_SIGNING_CERT *sc;
@@ -77,7 +77,7 @@ static int ossl_cms_signerinfo_get_signing_cert(const CMS_SignerInfo *si,
* or -1 on attribute parsing failure.
*/
static int ossl_cms_signerinfo_get_signing_cert_v2(const CMS_SignerInfo *si,
- ESS_SIGNING_CERT_V2 **psc)
+ ESS_SIGNING_CERT_V2 **psc)
{
ASN1_STRING *str;
ESS_SIGNING_CERT_V2 *sc;
@@ -100,7 +100,7 @@ static int ossl_cms_signerinfo_get_signing_cert_v2(const CMS_SignerInfo *si,
}
int ossl_cms_check_signing_certs(const CMS_SignerInfo *si,
- const STACK_OF(X509) *chain)
+ const STACK_OF(X509) *chain)
{
ESS_SIGNING_CERT *ss = NULL;
ESS_SIGNING_CERT_V2 *ssv2 = NULL;
@@ -133,7 +133,8 @@ CMS_ReceiptRequest *CMS_ReceiptRequest_create0_ex(
goto err;
}
if (RAND_bytes_ex(libctx, rr->signedContentIdentifier->data, 32,
- 0) <= 0)
+ 0)
+ <= 0)
goto err;
}
@@ -150,10 +151,9 @@ CMS_ReceiptRequest *CMS_ReceiptRequest_create0_ex(
return rr;
- err:
+err:
CMS_ReceiptRequest_free(rr);
return NULL;
-
}
CMS_ReceiptRequest *CMS_ReceiptRequest_create0(
@@ -161,7 +161,7 @@ CMS_ReceiptRequest *CMS_ReceiptRequest_create0(
STACK_OF(GENERAL_NAMES) *receiptList, STACK_OF(GENERAL_NAMES) *receiptsTo)
{
return CMS_ReceiptRequest_create0_ex(id, idlen, allorfirst, receiptList,
- receiptsTo, NULL);
+ receiptsTo, NULL);
}
int CMS_add1_ReceiptRequest(CMS_SignerInfo *si, CMS_ReceiptRequest *rr)
@@ -176,25 +176,24 @@ int CMS_add1_ReceiptRequest(CMS_SignerInfo *si, CMS_ReceiptRequest *rr)
}
if (!CMS_signed_add1_attr_by_NID(si, NID_id_smime_aa_receiptRequest,
- V_ASN1_SEQUENCE, rrder, rrderlen)) {
+ V_ASN1_SEQUENCE, rrder, rrderlen)) {
ERR_raise(ERR_LIB_CMS, ERR_R_CMS_LIB);
goto err;
}
r = 1;
- err:
+err:
OPENSSL_free(rrder);
return r;
-
}
void CMS_ReceiptRequest_get0_values(CMS_ReceiptRequest *rr,
- ASN1_STRING **pcid,
- int *pallorfirst,
- STACK_OF(GENERAL_NAMES) **plist,
- STACK_OF(GENERAL_NAMES) **prto)
+ ASN1_STRING **pcid,
+ int *pallorfirst,
+ STACK_OF(GENERAL_NAMES) **plist,
+ STACK_OF(GENERAL_NAMES) **prto)
{
if (pcid != NULL)
*pcid = rr->signedContentIdentifier;
@@ -216,16 +215,16 @@ void CMS_ReceiptRequest_get0_values(CMS_ReceiptRequest *rr,
/* Digest a SignerInfo structure for msgSigDigest attribute processing */
static int cms_msgSigDigest(CMS_SignerInfo *si,
- unsigned char *dig, unsigned int *diglen)
+ unsigned char *dig, unsigned int *diglen)
{
const EVP_MD *md = EVP_get_digestbyobj(si->digestAlgorithm->algorithm);
if (md == NULL)
return 0;
if (!ossl_asn1_item_digest_ex(ASN1_ITEM_rptr(CMS_Attributes_Verify), md,
- si->signedAttrs, dig, diglen,
- ossl_cms_ctx_get0_libctx(si->cms_ctx),
- ossl_cms_ctx_get0_propq(si->cms_ctx)))
+ si->signedAttrs, dig, diglen,
+ ossl_cms_ctx_get0_libctx(si->cms_ctx),
+ ossl_cms_ctx_get0_propq(si->cms_ctx)))
return 0;
return 1;
}
@@ -242,7 +241,7 @@ int ossl_cms_msgSigDigest_add1(CMS_SignerInfo *dest, CMS_SignerInfo *src)
return 0;
}
if (!CMS_signed_add1_attr_by_NID(dest, NID_id_smime_aa_msgSigDigest,
- V_ASN1_OCTET_STRING, dig, diglen)) {
+ V_ASN1_OCTET_STRING, dig, diglen)) {
ERR_raise(ERR_LIB_CMS, ERR_R_CMS_LIB);
return 0;
}
@@ -312,9 +311,8 @@ int ossl_cms_Receipt_verify(CMS_ContentInfo *cms, CMS_ContentInfo *req_cms)
/* Get msgSigDigest value and compare */
msig = CMS_signed_get0_data_by_OBJ(si,
- OBJ_nid2obj
- (NID_id_smime_aa_msgSigDigest), -3,
- V_ASN1_OCTET_STRING);
+ OBJ_nid2obj(NID_id_smime_aa_msgSigDigest), -3,
+ V_ASN1_OCTET_STRING);
if (!msig) {
ERR_raise(ERR_LIB_CMS, CMS_R_NO_MSGSIGDIGEST);
@@ -339,8 +337,8 @@ int ossl_cms_Receipt_verify(CMS_ContentInfo *cms, CMS_ContentInfo *req_cms)
/* Compare content types */
octype = CMS_signed_get0_data_by_OBJ(osi,
- OBJ_nid2obj(NID_pkcs9_contentType),
- -3, V_ASN1_OBJECT);
+ OBJ_nid2obj(NID_pkcs9_contentType),
+ -3, V_ASN1_OBJECT);
if (!octype) {
ERR_raise(ERR_LIB_CMS, CMS_R_NO_CONTENT_TYPE);
goto err;
@@ -361,18 +359,17 @@ int ossl_cms_Receipt_verify(CMS_ContentInfo *cms, CMS_ContentInfo *req_cms)
}
if (ASN1_STRING_cmp(rr->signedContentIdentifier,
- rct->signedContentIdentifier)) {
+ rct->signedContentIdentifier)) {
ERR_raise(ERR_LIB_CMS, CMS_R_CONTENTIDENTIFIER_MISMATCH);
goto err;
}
r = 1;
- err:
+err:
CMS_ReceiptRequest_free(rr);
M_ASN1_free_of(rct, CMS_Receipt);
return r;
-
}
/*
@@ -399,8 +396,8 @@ ASN1_OCTET_STRING *ossl_cms_encode_Receipt(CMS_SignerInfo *si)
/* Get original content type */
ctype = CMS_signed_get0_data_by_OBJ(si,
- OBJ_nid2obj(NID_pkcs9_contentType),
- -3, V_ASN1_OBJECT);
+ OBJ_nid2obj(NID_pkcs9_contentType),
+ -3, V_ASN1_OBJECT);
if (!ctype) {
ERR_raise(ERR_LIB_CMS, CMS_R_NO_CONTENT_TYPE);
goto err;
@@ -413,7 +410,7 @@ ASN1_OCTET_STRING *ossl_cms_encode_Receipt(CMS_SignerInfo *si)
os = ASN1_item_pack(&rct, ASN1_ITEM_rptr(CMS_Receipt), NULL);
- err:
+err:
CMS_ReceiptRequest_free(rr);
return os;
}
diff --git a/crypto/cms/cms_io.c b/crypto/cms/cms_io.c
index f5d70e84ce..14a758da5d 100644
--- a/crypto/cms/cms_io.c
+++ b/crypto/cms/cms_io.c
@@ -40,8 +40,8 @@ CMS_ContentInfo *d2i_CMS_bio(BIO *bp, CMS_ContentInfo **cms)
const CMS_CTX *ctx = ossl_cms_get0_cmsctx(cms == NULL ? NULL : *cms);
ci = ASN1_item_d2i_bio_ex(ASN1_ITEM_rptr(CMS_ContentInfo), bp, cms,
- ossl_cms_ctx_get0_libctx(ctx),
- ossl_cms_ctx_get0_propq(ctx));
+ ossl_cms_ctx_get0_libctx(ctx),
+ ossl_cms_ctx_get0_propq(ctx));
if (ci != NULL) {
ERR_set_mark();
ossl_cms_resolve_libctx(ci);
@@ -60,7 +60,7 @@ IMPLEMENT_PEM_rw(CMS, CMS_ContentInfo, PEM_STRING_CMS, CMS_ContentInfo)
BIO *BIO_new_CMS(BIO *out, CMS_ContentInfo *cms)
{
return BIO_new_NDEF(out, (ASN1_VALUE *)cms,
- ASN1_ITEM_rptr(CMS_ContentInfo));
+ ASN1_ITEM_rptr(CMS_ContentInfo));
}
/* CMS wrappers round generalised stream and MIME routines */
@@ -68,14 +68,14 @@ BIO *BIO_new_CMS(BIO *out, CMS_ContentInfo *cms)
int i2d_CMS_bio_stream(BIO *out, CMS_ContentInfo *cms, BIO *in, int flags)
{
return i2d_ASN1_bio_stream(out, (ASN1_VALUE *)cms, in, flags,
- ASN1_ITEM_rptr(CMS_ContentInfo));
+ ASN1_ITEM_rptr(CMS_ContentInfo));
}
int PEM_write_bio_CMS_stream(BIO *out, CMS_ContentInfo *cms, BIO *in,
- int flags)
+ int flags)
{
return PEM_write_bio_ASN1_stream(out, (ASN1_VALUE *)cms, in, flags,
- "CMS", ASN1_ITEM_rptr(CMS_ContentInfo));
+ "CMS", ASN1_ITEM_rptr(CMS_ContentInfo));
}
int SMIME_write_CMS(BIO *bio, CMS_ContentInfo *cms, BIO *data, int flags)
@@ -91,23 +91,23 @@ int SMIME_write_CMS(BIO *bio, CMS_ContentInfo *cms, BIO *data, int flags)
mdalgs = NULL;
return SMIME_write_ASN1_ex(bio, (ASN1_VALUE *)cms, data, flags, ctype_nid,
- econt_nid, mdalgs,
- ASN1_ITEM_rptr(CMS_ContentInfo),
- ossl_cms_ctx_get0_libctx(ctx),
- ossl_cms_ctx_get0_propq(ctx));
+ econt_nid, mdalgs,
+ ASN1_ITEM_rptr(CMS_ContentInfo),
+ ossl_cms_ctx_get0_libctx(ctx),
+ ossl_cms_ctx_get0_propq(ctx));
}
CMS_ContentInfo *SMIME_read_CMS_ex(BIO *bio, int flags, BIO **bcont,
- CMS_ContentInfo **cms)
+ CMS_ContentInfo **cms)
{
CMS_ContentInfo *ci;
const CMS_CTX *ctx = ossl_cms_get0_cmsctx(cms == NULL ? NULL : *cms);
ci = (CMS_ContentInfo *)SMIME_read_ASN1_ex(bio, flags, bcont,
- ASN1_ITEM_rptr(CMS_ContentInfo),
- (ASN1_VALUE **)cms,
- ossl_cms_ctx_get0_libctx(ctx),
- ossl_cms_ctx_get0_propq(ctx));
+ ASN1_ITEM_rptr(CMS_ContentInfo),
+ (ASN1_VALUE **)cms,
+ ossl_cms_ctx_get0_libctx(ctx),
+ ossl_cms_ctx_get0_propq(ctx));
if (ci != NULL) {
ERR_set_mark();
ossl_cms_resolve_libctx(ci);
diff --git a/crypto/cms/cms_kari.c b/crypto/cms/cms_kari.c
index 4d476757bc..e6f6e16790 100644
--- a/crypto/cms/cms_kari.c
+++ b/crypto/cms/cms_kari.c
@@ -20,8 +20,8 @@
/* Key Agreement Recipient Info (KARI) routines */
int CMS_RecipientInfo_kari_get0_alg(CMS_RecipientInfo *ri,
- X509_ALGOR **palg,
- ASN1_OCTET_STRING **pukm)
+ X509_ALGOR **palg,
+ ASN1_OCTET_STRING **pukm)
{
if (ri->type != CMS_RECIPINFO_AGREE) {
ERR_raise(ERR_LIB_CMS, CMS_R_NOT_KEY_AGREEMENT);
@@ -47,11 +47,11 @@ STACK_OF(CMS_RecipientEncryptedKey)
}
int CMS_RecipientInfo_kari_get0_orig_id(CMS_RecipientInfo *ri,
- X509_ALGOR **pubalg,
- ASN1_BIT_STRING **pubkey,
- ASN1_OCTET_STRING **keyid,
- X509_NAME **issuer,
- ASN1_INTEGER **sno)
+ X509_ALGOR **pubalg,
+ ASN1_BIT_STRING **pubkey,
+ ASN1_OCTET_STRING **keyid,
+ X509_NAME **issuer,
+ ASN1_INTEGER **sno)
{
CMS_OriginatorIdentifierOrKey *oik;
@@ -105,10 +105,10 @@ int CMS_RecipientInfo_kari_orig_id_cmp(CMS_RecipientInfo *ri, X509 *cert)
}
int CMS_RecipientEncryptedKey_get0_id(CMS_RecipientEncryptedKey *rek,
- ASN1_OCTET_STRING **keyid,
- ASN1_GENERALIZEDTIME **tm,
- CMS_OtherKeyAttribute **other,
- X509_NAME **issuer, ASN1_INTEGER **sno)
+ ASN1_OCTET_STRING **keyid,
+ ASN1_GENERALIZEDTIME **tm,
+ CMS_OtherKeyAttribute **other,
+ X509_NAME **issuer, ASN1_INTEGER **sno)
{
CMS_KeyAgreeRecipientIdentifier *rid = rek->rid;
@@ -140,7 +140,7 @@ int CMS_RecipientEncryptedKey_get0_id(CMS_RecipientEncryptedKey *rek,
}
int CMS_RecipientEncryptedKey_cert_cmp(CMS_RecipientEncryptedKey *rek,
- X509 *cert)
+ X509 *cert)
{
CMS_KeyAgreeRecipientIdentifier *rid = rek->rid;
@@ -148,13 +148,13 @@ int CMS_RecipientEncryptedKey_cert_cmp(CMS_RecipientEncryptedKey *rek,
return ossl_cms_ias_cert_cmp(rid->d.issuerAndSerialNumber, cert);
else if (rid->type == CMS_REK_KEYIDENTIFIER)
return ossl_cms_keyid_cert_cmp(rid->d.rKeyId->subjectKeyIdentifier,
- cert);
+ cert);
else
return -1;
}
int CMS_RecipientInfo_kari_set0_pkey_and_peer(CMS_RecipientInfo *ri,
- EVP_PKEY *pk, X509 *peer)
+ EVP_PKEY *pk, X509 *peer)
{
EVP_PKEY_CTX *pctx;
CMS_KeyAgreeRecipientInfo *kari = ri->d.kari;
@@ -165,8 +165,8 @@ int CMS_RecipientInfo_kari_set0_pkey_and_peer(CMS_RecipientInfo *ri,
return 1;
pctx = EVP_PKEY_CTX_new_from_pkey(ossl_cms_ctx_get0_libctx(kari->cms_ctx),
- pk,
- ossl_cms_ctx_get0_propq(kari->cms_ctx));
+ pk,
+ ossl_cms_ctx_get0_propq(kari->cms_ctx));
if (pctx == NULL || EVP_PKEY_derive_init(pctx) <= 0)
goto err;
@@ -179,7 +179,7 @@ int CMS_RecipientInfo_kari_set0_pkey_and_peer(CMS_RecipientInfo *ri,
kari->pctx = pctx;
return 1;
- err:
+err:
EVP_PKEY_CTX_free(pctx);
return 0;
}
@@ -202,8 +202,8 @@ EVP_CIPHER_CTX *CMS_RecipientInfo_kari_get0_ctx(CMS_RecipientInfo *ri)
*/
static int cms_kek_cipher(unsigned char **pout, size_t *poutlen,
- const unsigned char *in, size_t inlen,
- CMS_KeyAgreeRecipientInfo *kari, int enc)
+ const unsigned char *in, size_t inlen,
+ CMS_KeyAgreeRecipientInfo *kari, int enc)
{
/* Key encryption key */
unsigned char kek[EVP_MAX_KEY_LENGTH];
@@ -233,7 +233,7 @@ static int cms_kek_cipher(unsigned char **pout, size_t *poutlen,
*poutlen = (size_t)outlen;
rv = 1;
- err:
+err:
OPENSSL_cleanse(kek, keklen);
if (!rv)
OPENSSL_free(out);
@@ -245,8 +245,8 @@ static int cms_kek_cipher(unsigned char **pout, size_t *poutlen,
}
int CMS_RecipientInfo_kari_decrypt(CMS_ContentInfo *cms,
- CMS_RecipientInfo *ri,
- CMS_RecipientEncryptedKey *rek)
+ CMS_RecipientInfo *ri,
+ CMS_RecipientEncryptedKey *rek)
{
int rv = 0;
unsigned char *enckey = NULL, *cek = NULL;
@@ -268,14 +268,14 @@ int CMS_RecipientInfo_kari_decrypt(CMS_ContentInfo *cms,
ec->keylen = ceklen;
cek = NULL;
rv = 1;
- err:
+err:
OPENSSL_free(cek);
return rv;
}
/* Create ephemeral key and initialise context based on it */
static int cms_kari_create_ephemeral_key(CMS_KeyAgreeRecipientInfo *kari,
- EVP_PKEY *pk)
+ EVP_PKEY *pk)
{
EVP_PKEY_CTX *pctx = NULL;
EVP_PKEY *ekey = NULL;
@@ -299,7 +299,7 @@ static int cms_kari_create_ephemeral_key(CMS_KeyAgreeRecipientInfo *kari,
goto err;
kari->pctx = pctx;
rv = 1;
- err:
+err:
if (!rv)
EVP_PKEY_CTX_free(pctx);
EVP_PKEY_free(ekey);
@@ -308,23 +308,23 @@ static int cms_kari_create_ephemeral_key(CMS_KeyAgreeRecipientInfo *kari,
/* Set originator private key and initialise context based on it */
static int cms_kari_set_originator_private_key(CMS_KeyAgreeRecipientInfo *kari,
- EVP_PKEY *originatorPrivKey )
+ EVP_PKEY *originatorPrivKey)
{
EVP_PKEY_CTX *pctx = NULL;
int rv = 0;
const CMS_CTX *ctx = kari->cms_ctx;
pctx = EVP_PKEY_CTX_new_from_pkey(ossl_cms_ctx_get0_libctx(ctx),
- originatorPrivKey,
- ossl_cms_ctx_get0_propq(ctx));
+ originatorPrivKey,
+ ossl_cms_ctx_get0_propq(ctx));
if (pctx == NULL)
goto err;
if (EVP_PKEY_derive_init(pctx) <= 0)
- goto err;
+ goto err;
kari->pctx = pctx;
rv = 1;
- err:
+err:
if (rv == 0)
EVP_PKEY_CTX_free(pctx);
return rv;
@@ -332,10 +332,10 @@ static int cms_kari_set_originator_private_key(CMS_KeyAgreeRecipientInfo *kari,
/* Initialise a kari based on passed certificate and key */
-int ossl_cms_RecipientInfo_kari_init(CMS_RecipientInfo *ri, X509 *recip,
- EVP_PKEY *recipPubKey, X509 *originator,
- EVP_PKEY *originatorPrivKey,
- unsigned int flags, const CMS_CTX *ctx)
+int ossl_cms_RecipientInfo_kari_init(CMS_RecipientInfo *ri, X509 *recip,
+ EVP_PKEY *recipPubKey, X509 *originator,
+ EVP_PKEY *originatorPrivKey,
+ unsigned int flags, const CMS_CTX *ctx)
{
CMS_KeyAgreeRecipientInfo *kari;
CMS_RecipientEncryptedKey *rek = NULL;
@@ -383,16 +383,16 @@ int ossl_cms_RecipientInfo_kari_init(CMS_RecipientInfo *ri, X509 *recip,
return 0;
if (flags & CMS_USE_ORIGINATOR_KEYID) {
- oik->type = CMS_OIK_KEYIDENTIFIER;
- oik->d.subjectKeyIdentifier = ASN1_OCTET_STRING_new();
- if (oik->d.subjectKeyIdentifier == NULL)
- return 0;
- if (!ossl_cms_set1_keyid(&oik->d.subjectKeyIdentifier, originator))
- return 0;
+ oik->type = CMS_OIK_KEYIDENTIFIER;
+ oik->d.subjectKeyIdentifier = ASN1_OCTET_STRING_new();
+ if (oik->d.subjectKeyIdentifier == NULL)
+ return 0;
+ if (!ossl_cms_set1_keyid(&oik->d.subjectKeyIdentifier, originator))
+ return 0;
} else {
- oik->type = CMS_REK_ISSUER_SERIAL;
- if (!ossl_cms_set1_ias(&oik->d.issuerAndSerialNumber, originator))
- return 0;
+ oik->type = CMS_REK_ISSUER_SERIAL;
+ if (!ossl_cms_set1_ias(&oik->d.issuerAndSerialNumber, originator))
+ return 0;
}
if (!cms_kari_set_originator_private_key(kari, originatorPrivKey))
@@ -409,7 +409,7 @@ int ossl_cms_RecipientInfo_kari_init(CMS_RecipientInfo *ri, X509 *recip,
/* Encrypt content key in key agreement recipient info */
int ossl_cms_RecipientInfo_kari_encrypt(const CMS_ContentInfo *cms,
- CMS_RecipientInfo *ri)
+ CMS_RecipientInfo *ri)
{
CMS_KeyAgreeRecipientInfo *kari;
CMS_EncryptedContentInfo *ec;
@@ -456,7 +456,7 @@ int ossl_cms_RecipientInfo_kari_encrypt(const CMS_ContentInfo *cms,
if (EVP_PKEY_derive_set_peer(kari->pctx, rek->pkey) <= 0)
return 0;
if (!cms_kek_cipher(&enckey, &enckeylen, ec->key, ec->keylen,
- kari, 1))
+ kari, 1))
return 0;
ASN1_STRING_set0(rek->encryptedKey, enckey, (int)enckeylen);
}
diff --git a/crypto/cms/cms_kem.c b/crypto/cms/cms_kem.c
index 198a4dab3c..232ed56244 100644
--- a/crypto/cms/cms_kem.c
+++ b/crypto/cms/cms_kem.c
@@ -103,7 +103,7 @@ static int kem_cms_encrypt(CMS_RecipientInfo *ri)
* for a default KDF.
*/
params[0] = OSSL_PARAM_construct_octet_string(OSSL_PKEY_PARAM_CMS_KEMRI_KDF_ALGORITHM,
- kemri_x509_algor, sizeof(kemri_x509_algor));
+ kemri_x509_algor, sizeof(kemri_x509_algor));
params[1] = OSSL_PARAM_construct_end();
if (!EVP_PKEY_get_params(pkey, params))
goto err;
diff --git a/crypto/cms/cms_kemri.c b/crypto/cms/cms_kemri.c
index b3a07c19ae..d5900ecfc4 100644
--- a/crypto/cms/cms_kemri.c
+++ b/crypto/cms/cms_kemri.c
@@ -21,8 +21,8 @@
/* KEM Recipient Info (KEMRI) routines */
int ossl_cms_RecipientInfo_kemri_get0_alg(CMS_RecipientInfo *ri,
- uint32_t **pkekLength,
- X509_ALGOR **pwrap)
+ uint32_t **pkekLength,
+ X509_ALGOR **pwrap)
{
if (ri->type != CMS_RECIPINFO_KEM) {
ERR_raise(ERR_LIB_CMS, CMS_R_NOT_KEM);
@@ -61,7 +61,7 @@ int CMS_RecipientInfo_kemri_set0_pkey(CMS_RecipientInfo *ri, EVP_PKEY *pk)
if (pk != NULL) {
pctx = EVP_PKEY_CTX_new_from_pkey(ossl_cms_ctx_get0_libctx(kemri->cms_ctx), pk,
- ossl_cms_ctx_get0_propq(kemri->cms_ctx));
+ ossl_cms_ctx_get0_propq(kemri->cms_ctx));
if (pctx == NULL || EVP_PKEY_decapsulate_init(pctx, NULL) <= 0)
goto err;
@@ -77,8 +77,8 @@ err:
/* Initialise a kemri based on passed certificate and key */
int ossl_cms_RecipientInfo_kemri_init(CMS_RecipientInfo *ri, X509 *recip,
- EVP_PKEY *recipPubKey, unsigned int flags,
- const CMS_CTX *ctx)
+ EVP_PKEY *recipPubKey, unsigned int flags,
+ const CMS_CTX *ctx)
{
CMS_OtherRecipientInfo *ori;
CMS_KEMRecipientInfo *kemri;
@@ -122,8 +122,8 @@ int ossl_cms_RecipientInfo_kemri_init(CMS_RecipientInfo *ri, X509 *recip,
return 0;
kemri->pctx = EVP_PKEY_CTX_new_from_pkey(ossl_cms_ctx_get0_libctx(ctx),
- recipPubKey,
- ossl_cms_ctx_get0_propq(ctx));
+ recipPubKey,
+ ossl_cms_ctx_get0_propq(ctx));
if (kemri->pctx == NULL)
return 0;
if (EVP_PKEY_encapsulate_init(kemri->pctx, NULL) <= 0)
@@ -147,8 +147,8 @@ X509_ALGOR *CMS_RecipientInfo_kemri_get0_kdf_alg(CMS_RecipientInfo *ri)
}
int CMS_RecipientInfo_kemri_set_ukm(CMS_RecipientInfo *ri,
- const unsigned char *ukm,
- int ukmLength)
+ const unsigned char *ukm,
+ int ukmLength)
{
CMS_KEMRecipientInfo *kemri;
ASN1_OCTET_STRING *ukm_str;
@@ -200,7 +200,7 @@ static EVP_KDF_CTX *create_kdf_ctx(CMS_KEMRecipientInfo *kemri)
goto err;
kdf = EVP_KDF_fetch(ossl_cms_ctx_get0_libctx(kemri->cms_ctx), kdf_alg,
- ossl_cms_ctx_get0_propq(kemri->cms_ctx));
+ ossl_cms_ctx_get0_propq(kemri->cms_ctx));
if (kdf == NULL)
goto err;
@@ -211,8 +211,8 @@ err:
}
static int kdf_derive(unsigned char *kek, size_t keklen,
- const unsigned char *ss, size_t sslen,
- CMS_KEMRecipientInfo *kemri)
+ const unsigned char *ss, size_t sslen,
+ CMS_KEMRecipientInfo *kemri)
{
EVP_KDF_CTX *kctx = NULL;
OSSL_PARAM params[3];
@@ -221,7 +221,7 @@ static int kdf_derive(unsigned char *kek, size_t keklen,
int rv = 0;
infolen = CMS_CMSORIforKEMOtherInfo_encode(&infoder, kemri->wrap, kemri->ukm,
- kemri->kekLength);
+ kemri->kekLength);
if (infolen <= 0)
goto err;
@@ -230,9 +230,9 @@ static int kdf_derive(unsigned char *kek, size_t keklen,
goto err;
params[0] = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_KEY,
- (unsigned char *)ss, sslen);
+ (unsigned char *)ss, sslen);
params[1] = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_INFO,
- (char *)infoder, infolen);
+ (char *)infoder, infolen);
params[2] = OSSL_PARAM_construct_end();
if (EVP_KDF_derive(kctx, kek, keklen, params) <= 0)
@@ -252,9 +252,9 @@ err:
*/
static int cms_kek_cipher(unsigned char **pout, size_t *poutlen,
- const unsigned char *ss, size_t sslen,
- const unsigned char *in, size_t inlen,
- CMS_KEMRecipientInfo *kemri, int enc)
+ const unsigned char *ss, size_t sslen,
+ const unsigned char *in, size_t inlen,
+ CMS_KEMRecipientInfo *kemri, int enc)
{
/* Key encryption key */
unsigned char kek[EVP_MAX_KEY_LENGTH];
@@ -299,7 +299,7 @@ err:
/* Encrypt content key in KEM recipient info */
int ossl_cms_RecipientInfo_kemri_encrypt(const CMS_ContentInfo *cms,
- CMS_RecipientInfo *ri)
+ CMS_RecipientInfo *ri)
{
CMS_KEMRecipientInfo *kemri;
CMS_EncryptedContentInfo *ec;
@@ -341,7 +341,7 @@ int ossl_cms_RecipientInfo_kemri_encrypt(const CMS_ContentInfo *cms,
kem_ct = NULL;
if (!cms_kek_cipher(&enckey, &enckeylen, kem_secret, kem_secret_len, ec->key, ec->keylen,
- kemri, 1))
+ kemri, 1))
goto err;
ASN1_STRING_set0(kemri->encryptedKey, enckey, (int)enckeylen);
@@ -353,7 +353,7 @@ err:
}
int ossl_cms_RecipientInfo_kemri_decrypt(const CMS_ContentInfo *cms,
- CMS_RecipientInfo *ri)
+ CMS_RecipientInfo *ri)
{
CMS_KEMRecipientInfo *kemri;
CMS_EncryptedContentInfo *ec;
diff --git a/crypto/cms/cms_lib.c b/crypto/cms/cms_lib.c
index 9b87d16565..1454e4758b 100644
--- a/crypto/cms/cms_lib.c
+++ b/crypto/cms/cms_lib.c
@@ -22,21 +22,22 @@
#include "internal/cms.h"
static STACK_OF(CMS_CertificateChoices)
-**cms_get0_certificate_choices(CMS_ContentInfo *cms);
+ **
+ cms_get0_certificate_choices(CMS_ContentInfo *cms);
IMPLEMENT_ASN1_ALLOC_FUNCTIONS(CMS_ContentInfo)
IMPLEMENT_ASN1_PRINT_FUNCTION(CMS_ContentInfo)
CMS_ContentInfo *d2i_CMS_ContentInfo(CMS_ContentInfo **a,
- const unsigned char **in, long len)
+ const unsigned char **in, long len)
{
CMS_ContentInfo *ci;
const CMS_CTX *ctx = ossl_cms_get0_cmsctx(a == NULL ? NULL : *a);
ci = (CMS_ContentInfo *)ASN1_item_d2i_ex((ASN1_VALUE **)a, in, len,
- (CMS_ContentInfo_it()),
- ossl_cms_ctx_get0_libctx(ctx),
- ossl_cms_ctx_get0_propq(ctx));
+ (CMS_ContentInfo_it()),
+ ossl_cms_ctx_get0_libctx(ctx),
+ ossl_cms_ctx_get0_propq(ctx));
if (ci != NULL) {
ERR_set_mark();
ossl_cms_resolve_libctx(ci);
@@ -55,7 +56,7 @@ CMS_ContentInfo *CMS_ContentInfo_new_ex(OSSL_LIB_CTX *libctx, const char *propq)
CMS_ContentInfo *ci;
ci = (CMS_ContentInfo *)ASN1_item_new_ex(ASN1_ITEM_rptr(CMS_ContentInfo),
- libctx, propq);
+ libctx, propq);
if (ci != NULL) {
ci->ctx.libctx = libctx;
ci->ctx.propq = NULL;
@@ -194,7 +195,6 @@ err:
if (!icont)
BIO_free(cont);
return NULL;
-
}
/* unfortunately cannot constify SMIME_write_ASN1() due to this function */
@@ -209,8 +209,8 @@ int CMS_dataFinal_ex(CMS_ContentInfo *cms, BIO *cmsbio, BIO *data)
}
int ossl_cms_DataFinal(CMS_ContentInfo *cms, BIO *cmsbio, BIO *data,
- const unsigned char *precomp_md,
- unsigned int precomp_mdlen)
+ const unsigned char *precomp_md,
+ unsigned int precomp_mdlen)
{
ASN1_OCTET_STRING **pos = CMS_get0_content(cms);
@@ -250,7 +250,7 @@ int ossl_cms_DataFinal(CMS_ContentInfo *cms, BIO *cmsbio, BIO *data,
case NID_pkcs7_signed:
return ossl_cms_SignedData_final(cms, cmsbio, data,
- precomp_md, precomp_mdlen);
+ precomp_md, precomp_mdlen);
case NID_pkcs7_digest:
return ossl_cms_DigestedData_do_final(cms, cmsbio, 0);
@@ -287,7 +287,7 @@ ASN1_OCTET_STRING **CMS_get0_content(CMS_ContentInfo *cms)
case NID_id_smime_ct_authEnvelopedData:
return &cms->d.authEnvelopedData->authEncryptedContentInfo
- ->encryptedContent;
+ ->encryptedContent;
case NID_id_smime_ct_authData:
return &cms->d.authenticatedData->encapContentInfo->eContent;
@@ -300,7 +300,6 @@ ASN1_OCTET_STRING **CMS_get0_content(CMS_ContentInfo *cms)
return &cms->d.other->value.octet_string;
ERR_raise(ERR_LIB_CMS, CMS_R_UNSUPPORTED_CONTENT_TYPE);
return NULL;
-
}
}
@@ -327,7 +326,7 @@ static ASN1_OBJECT **cms_get0_econtent_type(CMS_ContentInfo *cms)
case NID_id_smime_ct_authEnvelopedData:
return &cms->d.authEnvelopedData->authEncryptedContentInfo
- ->contentType;
+ ->contentType;
case NID_id_smime_ct_authData:
return &cms->d.authenticatedData->encapContentInfo->eContentType;
@@ -337,7 +336,6 @@ static ASN1_OBJECT **cms_get0_econtent_type(CMS_ContentInfo *cms)
default:
ERR_raise(ERR_LIB_CMS, CMS_R_UNSUPPORTED_CONTENT_TYPE);
return NULL;
-
}
}
@@ -407,7 +405,7 @@ int CMS_set_detached(CMS_ContentInfo *cms, int detached)
/* Create a digest BIO from an X509_ALGOR structure */
BIO *ossl_cms_DigestAlgorithm_init_bio(X509_ALGOR *digestAlgorithm,
- const CMS_CTX *ctx)
+ const CMS_CTX *ctx)
{
BIO *mdbio = NULL;
const ASN1_OBJECT *digestoid;
@@ -421,7 +419,7 @@ BIO *ossl_cms_DigestAlgorithm_init_bio(X509_ALGOR *digestAlgorithm,
(void)ERR_set_mark();
fetched_digest = EVP_MD_fetch(ossl_cms_ctx_get0_libctx(ctx), alg,
- ossl_cms_ctx_get0_propq(ctx));
+ ossl_cms_ctx_get0_propq(ctx));
if (fetched_digest != NULL)
digest = fetched_digest;
@@ -451,7 +449,7 @@ BIO *ossl_cms_DigestAlgorithm_init_bio(X509_ALGOR *digestAlgorithm,
if (BIO_get_md_ctx(mdbio, &mdctx) <= 0 || mdctx == NULL)
goto err;
params[0] = OSSL_PARAM_construct_size_t(OSSL_DIGEST_PARAM_XOFLEN,
- &xof_len);
+ &xof_len);
params[1] = OSSL_PARAM_construct_end();
if (!EVP_MD_CTX_set_params(mdctx, params))
goto err;
@@ -459,7 +457,7 @@ BIO *ossl_cms_DigestAlgorithm_init_bio(X509_ALGOR *digestAlgorithm,
}
EVP_MD_free(fetched_digest);
return mdbio;
- err:
+err:
EVP_MD_free(fetched_digest);
BIO_free(mdbio);
return NULL;
@@ -468,7 +466,7 @@ BIO *ossl_cms_DigestAlgorithm_init_bio(X509_ALGOR *digestAlgorithm,
/* Locate a message digest content from a BIO chain based on SignerInfo */
int ossl_cms_DigestAlgorithm_find_ctx(EVP_MD_CTX *mctx, BIO *chain,
- X509_ALGOR *mdalg)
+ X509_ALGOR *mdalg)
{
int nid;
const ASN1_OBJECT *mdoid;
@@ -495,7 +493,8 @@ int ossl_cms_DigestAlgorithm_find_ctx(EVP_MD_CTX *mctx, BIO *chain,
}
static STACK_OF(CMS_CertificateChoices)
-**cms_get0_certificate_choices(CMS_ContentInfo *cms)
+ **
+ cms_get0_certificate_choices(CMS_ContentInfo *cms)
{
switch (OBJ_obj2nid(cms->contentType)) {
@@ -515,7 +514,6 @@ static STACK_OF(CMS_CertificateChoices)
default:
ERR_raise(ERR_LIB_CMS, CMS_R_UNSUPPORTED_CONTENT_TYPE);
return NULL;
-
}
}
@@ -578,7 +576,8 @@ int CMS_add1_cert(CMS_ContentInfo *cms, X509 *cert)
}
static STACK_OF(CMS_RevocationInfoChoice)
-**cms_get0_revocation_choices(CMS_ContentInfo *cms)
+ **
+ cms_get0_revocation_choices(CMS_ContentInfo *cms)
{
switch (OBJ_obj2nid(cms->contentType)) {
@@ -598,7 +597,6 @@ static STACK_OF(CMS_RevocationInfoChoice)
default:
ERR_raise(ERR_LIB_CMS, CMS_R_UNSUPPORTED_CONTENT_TYPE);
return NULL;
-
}
}
@@ -680,7 +678,7 @@ int ossl_cms_get1_certs_ex(CMS_ContentInfo *cms, STACK_OF(X509) **certs)
cch = sk_CMS_CertificateChoices_value(*pcerts, i);
if (cch->type == 0) {
if (!X509_add_cert(*certs, cch->d.certificate,
- X509_ADD_FLAG_UP_REF)) {
+ X509_ADD_FLAG_UP_REF)) {
OSSL_STACK_OF_X509_free(*certs);
*certs = NULL;
return 0;
@@ -773,7 +771,7 @@ int ossl_cms_set1_ias(CMS_IssuerAndSerialNumber **pias, X509 *cert)
M_ASN1_free_of(*pias, CMS_IssuerAndSerialNumber);
*pias = ias;
return 1;
- err:
+err:
M_ASN1_free_of(ias, CMS_IssuerAndSerialNumber);
return 0;
}
@@ -798,10 +796,10 @@ int ossl_cms_set1_keyid(ASN1_OCTET_STRING **pkeyid, X509 *cert)
}
CMS_EnvelopedData *ossl_cms_sign_encrypt(BIO *data, X509 *sign_cert, STACK_OF(X509) *certs,
- EVP_PKEY *sign_key, unsigned int sign_flags,
- STACK_OF(X509) *enc_recip, const EVP_CIPHER *cipher,
- unsigned int enc_flags, OSSL_LIB_CTX *libctx,
- const char *propq)
+ EVP_PKEY *sign_key, unsigned int sign_flags,
+ STACK_OF(X509) *enc_recip, const EVP_CIPHER *cipher,
+ unsigned int enc_flags, OSSL_LIB_CTX *libctx,
+ const char *propq)
{
CMS_EnvelopedData *evd = NULL;
BIO *privbio = NULL, *signbio = NULL;
@@ -825,7 +823,7 @@ CMS_EnvelopedData *ossl_cms_sign_encrypt(BIO *data, X509 *sign_cert, STACK_OF(X5
goto err;
evd = CMS_EnvelopedData_dup(evpcms->d.envelopedData);
- err:
+err:
BIO_free(privbio);
BIO_free(signbio);
CMS_ContentInfo_free(signcms);
diff --git a/crypto/cms/cms_local.h b/crypto/cms/cms_local.h
index 168609bbe8..24426d5747 100644
--- a/crypto/cms/cms_local.h
+++ b/crypto/cms/cms_local.h
@@ -8,9 +8,9 @@
*/
#ifndef OSSL_CRYPTO_CMS_LOCAL_H
-# define OSSL_CRYPTO_CMS_LOCAL_H
+#define OSSL_CRYPTO_CMS_LOCAL_H
-# include <openssl/x509.h>
+#include <openssl/x509.h>
/*
* Cryptographic message syntax (CMS) structures: taken from RFC3852
@@ -327,8 +327,8 @@ struct CMS_RevocationInfoChoice_st {
} d;
};
-# define CMS_REVCHOICE_CRL 0
-# define CMS_REVCHOICE_OTHER 1
+#define CMS_REVCHOICE_CRL 0
+#define CMS_REVCHOICE_OTHER 1
struct CMS_OtherRevocationInfoFormat_st {
ASN1_OBJECT *otherRevInfoFormat;
@@ -346,11 +346,11 @@ struct CMS_CertificateChoices {
} d;
};
-# define CMS_CERTCHOICE_CERT 0
-# define CMS_CERTCHOICE_EXCERT 1
-# define CMS_CERTCHOICE_V1ACERT 2
-# define CMS_CERTCHOICE_V2ACERT 3
-# define CMS_CERTCHOICE_OTHER 4
+#define CMS_CERTCHOICE_CERT 0
+#define CMS_CERTCHOICE_EXCERT 1
+#define CMS_CERTCHOICE_V1ACERT 2
+#define CMS_CERTCHOICE_V2ACERT 3
+#define CMS_CERTCHOICE_OTHER 4
struct CMS_OtherCertificateFormat_st {
ASN1_OBJECT *otherCertFormat;
@@ -405,18 +405,18 @@ DECLARE_ASN1_ITEM(CMS_RecipientInfo)
DECLARE_ASN1_ITEM(CMS_PasswordRecipientInfo)
DECLARE_ASN1_ALLOC_FUNCTIONS(CMS_IssuerAndSerialNumber)
-# define CMS_SIGNERINFO_ISSUER_SERIAL 0
-# define CMS_SIGNERINFO_KEYIDENTIFIER 1
+#define CMS_SIGNERINFO_ISSUER_SERIAL 0
+#define CMS_SIGNERINFO_KEYIDENTIFIER 1
-# define CMS_RECIPINFO_ISSUER_SERIAL 0
-# define CMS_RECIPINFO_KEYIDENTIFIER 1
+#define CMS_RECIPINFO_ISSUER_SERIAL 0
+#define CMS_RECIPINFO_KEYIDENTIFIER 1
-# define CMS_REK_ISSUER_SERIAL 0
-# define CMS_REK_KEYIDENTIFIER 1
+#define CMS_REK_ISSUER_SERIAL 0
+#define CMS_REK_KEYIDENTIFIER 1
-# define CMS_OIK_ISSUER_SERIAL 0
-# define CMS_OIK_KEYIDENTIFIER 1
-# define CMS_OIK_PUBKEY 2
+#define CMS_OIK_ISSUER_SERIAL 0
+#define CMS_OIK_KEYIDENTIFIER 1
+#define CMS_OIK_PUBKEY 2
BIO *ossl_cms_content_bio(CMS_ContentInfo *cms);
const CMS_CTX *ossl_cms_get0_cmsctx(const CMS_ContentInfo *cms);
@@ -426,37 +426,37 @@ void ossl_cms_resolve_libctx(CMS_ContentInfo *ci);
CMS_ContentInfo *ossl_cms_Data_create(OSSL_LIB_CTX *ctx, const char *propq);
int ossl_cms_DataFinal(CMS_ContentInfo *cms, BIO *cmsbio, BIO *data,
- const unsigned char *precomp_md,
- unsigned int precomp_mdlen);
+ const unsigned char *precomp_md,
+ unsigned int precomp_mdlen);
CMS_ContentInfo *ossl_cms_DigestedData_create(const EVP_MD *md,
- OSSL_LIB_CTX *libctx,
- const char *propq);
+ OSSL_LIB_CTX *libctx,
+ const char *propq);
BIO *ossl_cms_DigestedData_init_bio(const CMS_ContentInfo *cms);
int ossl_cms_DigestedData_do_final(const CMS_ContentInfo *cms,
- BIO *chain, int verify);
+ BIO *chain, int verify);
BIO *ossl_cms_SignedData_init_bio(CMS_ContentInfo *cms);
int ossl_cms_SignedData_final(CMS_ContentInfo *cms, BIO *chain, BIO *data,
- const unsigned char *precomp_md,
- unsigned int precomp_mdlen);
+ const unsigned char *precomp_md,
+ unsigned int precomp_mdlen);
int ossl_cms_set1_SignerIdentifier(CMS_SignerIdentifier *sid, X509 *cert,
- int type, const CMS_CTX *ctx);
+ int type, const CMS_CTX *ctx);
int ossl_cms_SignerIdentifier_get0_signer_id(CMS_SignerIdentifier *sid,
- ASN1_OCTET_STRING **keyid,
- X509_NAME **issuer,
- ASN1_INTEGER **sno);
+ ASN1_OCTET_STRING **keyid,
+ X509_NAME **issuer,
+ ASN1_INTEGER **sno);
int ossl_cms_SignerIdentifier_cert_cmp(CMS_SignerIdentifier *sid, X509 *cert);
CMS_ContentInfo *ossl_cms_CompressedData_create(int comp_nid,
- OSSL_LIB_CTX *libctx,
- const char *propq);
+ OSSL_LIB_CTX *libctx,
+ const char *propq);
BIO *ossl_cms_CompressedData_init_bio(const CMS_ContentInfo *cms);
BIO *ossl_cms_DigestAlgorithm_init_bio(X509_ALGOR *digestAlgorithm,
- const CMS_CTX *ctx);
+ const CMS_CTX *ctx);
int ossl_cms_DigestAlgorithm_find_ctx(EVP_MD_CTX *mctx, BIO *chain,
- X509_ALGOR *mdalg);
+ X509_ALGOR *mdalg);
int ossl_cms_ias_cert_cmp(CMS_IssuerAndSerialNumber *ias, X509 *cert);
int ossl_cms_keyid_cert_cmp(ASN1_OCTET_STRING *keyid, X509 *cert);
@@ -464,12 +464,12 @@ int ossl_cms_set1_ias(CMS_IssuerAndSerialNumber **pias, X509 *cert);
int ossl_cms_set1_keyid(ASN1_OCTET_STRING **pkeyid, X509 *cert);
BIO *ossl_cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec,
- const CMS_CTX *ctx, int auth);
+ const CMS_CTX *ctx, int auth);
BIO *ossl_cms_EncryptedData_init_bio(const CMS_ContentInfo *cms);
int ossl_cms_EncryptedContent_init(CMS_EncryptedContentInfo *ec,
- const EVP_CIPHER *cipher,
- const unsigned char *key, size_t keylen,
- const CMS_CTX *ctx);
+ const EVP_CIPHER *cipher,
+ const unsigned char *key, size_t keylen,
+ const CMS_CTX *ctx);
int ossl_cms_Receipt_verify(CMS_ContentInfo *cms, CMS_ContentInfo *req_cms);
int ossl_cms_msgSigDigest_add1(CMS_SignerInfo *dest, CMS_SignerInfo *src);
@@ -493,38 +493,37 @@ int ossl_cms_RecipientInfo_wrap_init(CMS_RecipientInfo *ri, const EVP_CIPHER *ci
/* KARI routines */
int ossl_cms_RecipientInfo_kari_init(CMS_RecipientInfo *ri, X509 *recip,
- EVP_PKEY *recipPubKey, X509 *originator,
- EVP_PKEY *originatorPrivKey,
- unsigned int flags,
- const CMS_CTX *ctx);
+ EVP_PKEY *recipPubKey, X509 *originator,
+ EVP_PKEY *originatorPrivKey,
+ unsigned int flags,
+ const CMS_CTX *ctx);
int ossl_cms_RecipientInfo_kari_encrypt(const CMS_ContentInfo *cms,
- CMS_RecipientInfo *ri);
+ CMS_RecipientInfo *ri);
/* KEMRI routines */
int ossl_cms_RecipientInfo_kemri_get0_alg(CMS_RecipientInfo *ri,
- uint32_t **pkekLength,
- X509_ALGOR **pwrap);
+ uint32_t **pkekLength,
+ X509_ALGOR **pwrap);
int ossl_cms_RecipientInfo_kemri_init(CMS_RecipientInfo *ri, X509 *recip,
- EVP_PKEY *recipPubKey, unsigned int flags,
- const CMS_CTX *ctx);
+ EVP_PKEY *recipPubKey, unsigned int flags,
+ const CMS_CTX *ctx);
int ossl_cms_RecipientInfo_kemri_encrypt(const CMS_ContentInfo *cms,
- CMS_RecipientInfo *ri);
+ CMS_RecipientInfo *ri);
int ossl_cms_RecipientInfo_kemri_decrypt(const CMS_ContentInfo *cms,
- CMS_RecipientInfo *ri);
+ CMS_RecipientInfo *ri);
int CMS_CMSORIforKEMOtherInfo_encode(unsigned char **pder, X509_ALGOR *wrap,
- ASN1_OCTET_STRING *ukm, int keylen);
+ ASN1_OCTET_STRING *ukm, int keylen);
/* PWRI routines */
int ossl_cms_RecipientInfo_pwri_crypt(const CMS_ContentInfo *cms,
- CMS_RecipientInfo *ri, int en_de);
+ CMS_RecipientInfo *ri, int en_de);
/* SignerInfo routines */
int ossl_cms_si_check_attributes(const CMS_SignerInfo *si);
void ossl_cms_SignerInfos_set_cmsctx(CMS_ContentInfo *cms);
-
/* ESS routines */
int ossl_cms_check_signing_certs(const CMS_SignerInfo *si,
- const STACK_OF(X509) *chain);
+ const STACK_OF(X509) *chain);
int ossl_cms_dh_envelope(CMS_RecipientInfo *ri, int decrypt);
int ossl_cms_ecdh_envelope(CMS_RecipientInfo *ri, int decrypt);
diff --git a/crypto/cms/cms_pwri.c b/crypto/cms/cms_pwri.c
index 9e71c628f0..ac869a37f9 100644
--- a/crypto/cms/cms_pwri.c
+++ b/crypto/cms/cms_pwri.c
@@ -20,7 +20,7 @@
#include "cms_local.h"
int CMS_RecipientInfo_set0_password(CMS_RecipientInfo *ri,
- unsigned char *pass, ossl_ssize_t passlen)
+ unsigned char *pass, ossl_ssize_t passlen)
{
CMS_PasswordRecipientInfo *pwri;
if (ri->type != CMS_RECIPINFO_PASS) {
@@ -37,11 +37,11 @@ int CMS_RecipientInfo_set0_password(CMS_RecipientInfo *ri,
}
CMS_RecipientInfo *CMS_add0_recipient_password(CMS_ContentInfo *cms,
- int iter, int wrap_nid,
- int pbe_nid,
- unsigned char *pass,
- ossl_ssize_t passlen,
- const EVP_CIPHER *kekciph)
+ int iter, int wrap_nid,
+ int pbe_nid,
+ unsigned char *pass,
+ ossl_ssize_t passlen,
+ const EVP_CIPHER *kekciph)
{
STACK_OF(CMS_RecipientInfo) *ris;
CMS_RecipientInfo *ri = NULL;
@@ -157,8 +157,7 @@ CMS_RecipientInfo *CMS_add0_recipient_password(CMS_ContentInfo *cms,
}
if (!ASN1_item_pack(encalg, ASN1_ITEM_rptr(X509_ALGOR),
- &pwri->keyEncryptionAlgorithm->parameter->
- value.sequence)) {
+ &pwri->keyEncryptionAlgorithm->parameter->value.sequence)) {
ERR_raise(ERR_LIB_CMS, ERR_R_ASN1_LIB);
goto err;
}
@@ -170,7 +169,7 @@ CMS_RecipientInfo *CMS_add0_recipient_password(CMS_ContentInfo *cms,
/* Setup PBE algorithm */
pwri->keyDerivationAlgorithm = PKCS5_pbkdf2_set_ex(iter, NULL, 0, -1, -1,
- cms_ctx->libctx);
+ cms_ctx->libctx);
if (pwri->keyDerivationAlgorithm == NULL)
goto err;
@@ -185,13 +184,12 @@ CMS_RecipientInfo *CMS_add0_recipient_password(CMS_ContentInfo *cms,
return ri;
- err:
+err:
EVP_CIPHER_CTX_free(ctx);
if (ri)
M_ASN1_free_of(ri, CMS_RecipientInfo);
X509_ALGOR_free(encalg);
return NULL;
-
}
/*
@@ -200,8 +198,8 @@ CMS_RecipientInfo *CMS_add0_recipient_password(CMS_ContentInfo *cms,
*/
static int kek_unwrap_key(unsigned char *out, size_t *outlen,
- const unsigned char *in, size_t inlen,
- EVP_CIPHER_CTX *ctx)
+ const unsigned char *in, size_t inlen,
+ EVP_CIPHER_CTX *ctx)
{
int blocklen = EVP_CIPHER_CTX_get_block_size(ctx);
unsigned char *tmp;
@@ -222,14 +220,14 @@ static int kek_unwrap_key(unsigned char *out, size_t *outlen,
return 0;
/* setup IV by decrypting last two blocks */
if (!EVP_DecryptUpdate(ctx, tmp + inlen - 2 * blocklen, &outl,
- in + inlen - 2 * blocklen, blocklen * 2)
+ in + inlen - 2 * blocklen, blocklen * 2)
/*
* Do a decrypt of last decrypted block to set IV to correct value
* output it to start of buffer so we don't corrupt decrypted block
* this works because buffer is at least two block lengths long.
*/
|| !EVP_DecryptUpdate(ctx, tmp, &outl,
- tmp + inlen - blocklen, blocklen)
+ tmp + inlen - blocklen, blocklen)
/* Can now decrypt first n - 1 blocks */
|| !EVP_DecryptUpdate(ctx, tmp, &outl, in, (int)(inlen - blocklen))
@@ -250,15 +248,14 @@ static int kek_unwrap_key(unsigned char *out, size_t *outlen,
*outlen = (size_t)tmp[0];
memcpy(out, tmp + 4, *outlen);
rv = 1;
- err:
+err:
OPENSSL_clear_free(tmp, inlen);
return rv;
-
}
static int kek_wrap_key(unsigned char *out, size_t *outlen,
- const unsigned char *in, size_t inlen,
- EVP_CIPHER_CTX *ctx, const CMS_CTX *cms_ctx)
+ const unsigned char *in, size_t inlen,
+ EVP_CIPHER_CTX *ctx, const CMS_CTX *cms_ctx)
{
size_t blocklen = EVP_CIPHER_CTX_get_block_size(ctx);
size_t olen;
@@ -291,7 +288,8 @@ static int kek_wrap_key(unsigned char *out, size_t *outlen,
/* Add random padding to end */
if (olen > inlen + 4
&& RAND_bytes_ex(ossl_cms_ctx_get0_libctx(cms_ctx), out + 4 + inlen,
- olen - 4 - inlen, 0) <= 0)
+ olen - 4 - inlen, 0)
+ <= 0)
return 0;
/* Encrypt twice */
if (!EVP_EncryptUpdate(ctx, out, &dummy, out, (int)olen)
@@ -307,7 +305,7 @@ static int kek_wrap_key(unsigned char *out, size_t *outlen,
/* Encrypt/Decrypt content key in PWRI recipient info */
int ossl_cms_RecipientInfo_pwri_crypt(const CMS_ContentInfo *cms,
- CMS_RecipientInfo *ri, int en_de)
+ CMS_RecipientInfo *ri, int en_de)
{
CMS_EncryptedContentInfo *ec;
CMS_PasswordRecipientInfo *pwri;
@@ -336,7 +334,7 @@ int ossl_cms_RecipientInfo_pwri_crypt(const CMS_ContentInfo *cms,
}
kekalg = ASN1_TYPE_unpack_sequence(ASN1_ITEM_rptr(X509_ALGOR),
- algtmp->parameter);
+ algtmp->parameter);
if (kekalg == NULL) {
ERR_raise(ERR_LIB_CMS, CMS_R_INVALID_KEY_ENCRYPTION_PARAMETER);
@@ -345,7 +343,7 @@ int ossl_cms_RecipientInfo_pwri_crypt(const CMS_ContentInfo *cms,
OBJ_obj2txt(name, sizeof(name), kekalg->algorithm, 0);
kekcipher = EVP_CIPHER_fetch(ossl_cms_ctx_get0_libctx(cms_ctx), name,
- ossl_cms_ctx_get0_propq(cms_ctx));
+ ossl_cms_ctx_get0_propq(cms_ctx));
if (kekcipher == NULL) {
ERR_raise(ERR_LIB_CMS, CMS_R_UNKNOWN_CIPHER);
@@ -371,9 +369,9 @@ int ossl_cms_RecipientInfo_pwri_crypt(const CMS_ContentInfo *cms,
/* Finish password based key derivation to setup key in "ctx" */
if (!EVP_PBE_CipherInit_ex(algtmp->algorithm,
- (char *)pwri->pass, (int)pwri->passlen,
- algtmp->parameter, kekctx, en_de,
- cms_ctx->libctx, cms_ctx->propq)) {
+ (char *)pwri->pass, (int)pwri->passlen,
+ algtmp->parameter, kekctx, en_de,
+ cms_ctx->libctx, cms_ctx->propq)) {
ERR_raise(ERR_LIB_CMS, ERR_R_EVP_LIB);
goto err;
}
@@ -399,8 +397,8 @@ int ossl_cms_RecipientInfo_pwri_crypt(const CMS_ContentInfo *cms,
if (key == NULL)
goto err;
if (!kek_unwrap_key(key, &keylen,
- pwri->encryptedKey->data,
- pwri->encryptedKey->length, kekctx)) {
+ pwri->encryptedKey->data,
+ pwri->encryptedKey->length, kekctx)) {
ERR_raise(ERR_LIB_CMS, CMS_R_UNWRAP_FAILURE);
goto err;
}
@@ -408,12 +406,11 @@ int ossl_cms_RecipientInfo_pwri_crypt(const CMS_ContentInfo *cms,
OPENSSL_clear_free(ec->key, ec->keylen);
ec->key = key;
ec->keylen = keylen;
-
}
r = 1;
- err:
+err:
EVP_CIPHER_free(kekcipher);
EVP_CIPHER_CTX_free(kekctx);
@@ -422,5 +419,4 @@ int ossl_cms_RecipientInfo_pwri_crypt(const CMS_ContentInfo *cms,
X509_ALGOR_free(kekalg);
return r;
-
}
diff --git a/crypto/cms/cms_rsa.c b/crypto/cms/cms_rsa.c
index 875ed6b087..9b12d90885 100644
--- a/crypto/cms/cms_rsa.c
+++ b/crypto/cms/cms_rsa.c
@@ -21,7 +21,7 @@ static RSA_OAEP_PARAMS *rsa_oaep_decode(const X509_ALGOR *alg)
RSA_OAEP_PARAMS *oaep;
oaep = ASN1_TYPE_unpack_sequence(ASN1_ITEM_rptr(RSA_OAEP_PARAMS),
- alg->parameter);
+ alg->parameter);
if (oaep == NULL)
return NULL;
@@ -99,14 +99,14 @@ static int rsa_cms_decrypt(CMS_RecipientInfo *ri)
if (EVP_PKEY_CTX_set_rsa_mgf1_md(pkctx, mgf1md) <= 0)
goto err;
if (label != NULL
- && EVP_PKEY_CTX_set0_rsa_oaep_label(pkctx, label, labellen) <= 0) {
+ && EVP_PKEY_CTX_set0_rsa_oaep_label(pkctx, label, labellen) <= 0) {
OPENSSL_free(label);
goto err;
}
/* Carry on */
rv = 1;
- err:
+err:
RSA_OAEP_PARAMS_free(oaep);
return rv;
}
@@ -130,7 +130,7 @@ static int rsa_cms_encrypt(CMS_RecipientInfo *ri)
}
if (pad_mode == RSA_PKCS1_PADDING)
return X509_ALGOR_set0(alg, OBJ_nid2obj(NID_rsaEncryption),
- V_ASN1_NULL, NULL);
+ V_ASN1_NULL, NULL);
/* Not supported */
if (pad_mode != RSA_PKCS1_OAEP_PADDING)
@@ -158,7 +158,7 @@ static int rsa_cms_encrypt(CMS_RecipientInfo *ri)
goto err;
oaep->pSourceFunc = ossl_X509_ALGOR_from_nid(NID_pSpecified,
- V_ASN1_OCTET_STRING, los);
+ V_ASN1_OCTET_STRING, los);
if (oaep->pSourceFunc == NULL)
goto err;
@@ -171,7 +171,7 @@ static int rsa_cms_encrypt(CMS_RecipientInfo *ri)
goto err;
os = NULL;
rv = 1;
- err:
+err:
RSA_OAEP_PARAMS_free(oaep);
ASN1_STRING_free(os);
ASN1_OCTET_STRING_free(los);
@@ -209,7 +209,7 @@ static int rsa_cms_sign(CMS_SignerInfo *si)
}
if (pad_mode == RSA_PKCS1_PADDING)
return X509_ALGOR_set0(alg, OBJ_nid2obj(NID_rsaEncryption),
- V_ASN1_NULL, NULL);
+ V_ASN1_NULL, NULL);
/* We don't support it */
if (pad_mode != RSA_PKCS1_PSS_PADDING)
diff --git a/crypto/cms/cms_sd.c b/crypto/cms/cms_sd.c
index a0df0af922..8e60e6e559 100644
--- a/crypto/cms/cms_sd.c
+++ b/crypto/cms/cms_sd.c
@@ -42,8 +42,7 @@ static CMS_SignedData *cms_signed_data_init(CMS_ContentInfo *cms)
return NULL;
}
cms->d.signedData->version = 1;
- cms->d.signedData->encapContentInfo->eContentType =
- OBJ_nid2obj(NID_pkcs7_data);
+ cms->d.signedData->encapContentInfo->eContentType = OBJ_nid2obj(NID_pkcs7_data);
cms->d.signedData->encapContentInfo->partial = 1;
ASN1_OBJECT_free(cms->contentType);
cms->contentType = OBJ_nid2obj(NID_pkcs7_signed);
@@ -109,7 +108,6 @@ static void cms_sd_set_version(CMS_SignedData *sd)
if (sd->version < 1)
sd->version = 1;
-
}
/*
@@ -130,7 +128,8 @@ static int cms_set_si_contentType_attr(CMS_ContentInfo *cms, CMS_SignerInfo *si)
/* Add the contentType attribute */
return CMS_signed_add1_attr_by_NID(si, NID_pkcs9_contentType,
- V_ASN1_OBJECT, ctype, -1) > 0;
+ V_ASN1_OBJECT, ctype, -1)
+ > 0;
}
/* Copy an existing messageDigest value */
@@ -150,20 +149,19 @@ static int cms_copy_messageDigest(CMS_ContentInfo *cms, CMS_SignerInfo *si)
if (CMS_signed_get_attr_count(sitmp) < 0)
continue;
if (OBJ_cmp(si->digestAlgorithm->algorithm,
- sitmp->digestAlgorithm->algorithm))
+ sitmp->digestAlgorithm->algorithm))
continue;
messageDigest = CMS_signed_get0_data_by_OBJ(sitmp,
- OBJ_nid2obj
- (NID_pkcs9_messageDigest),
- -3, V_ASN1_OCTET_STRING);
+ OBJ_nid2obj(NID_pkcs9_messageDigest),
+ -3, V_ASN1_OCTET_STRING);
if (!messageDigest) {
ERR_raise(ERR_LIB_CMS, CMS_R_ERROR_READING_MESSAGEDIGEST_ATTRIBUTE);
return 0;
}
if (CMS_signed_add1_attr_by_NID(si, NID_pkcs9_messageDigest,
- V_ASN1_OCTET_STRING,
- messageDigest, -1))
+ V_ASN1_OCTET_STRING,
+ messageDigest, -1))
return 1;
else
return 0;
@@ -173,7 +171,7 @@ static int cms_copy_messageDigest(CMS_ContentInfo *cms, CMS_SignerInfo *si)
}
int ossl_cms_set1_SignerIdentifier(CMS_SignerIdentifier *sid, X509 *cert,
- int type, const CMS_CTX *ctx)
+ int type, const CMS_CTX *ctx)
{
switch (type) {
case CMS_SIGNERINFO_ISSUER_SERIAL:
@@ -197,9 +195,9 @@ int ossl_cms_set1_SignerIdentifier(CMS_SignerIdentifier *sid, X509 *cert,
}
int ossl_cms_SignerIdentifier_get0_signer_id(CMS_SignerIdentifier *sid,
- ASN1_OCTET_STRING **keyid,
- X509_NAME **issuer,
- ASN1_INTEGER **sno)
+ ASN1_OCTET_STRING **keyid,
+ X509_NAME **issuer,
+ ASN1_INTEGER **sno)
{
if (sid->type == CMS_SIGNERINFO_ISSUER_SERIAL) {
if (issuer)
@@ -230,7 +228,9 @@ static int cms_signature_nomd(EVP_PKEY *pkey)
char def_md[80];
return EVP_PKEY_get_default_digest_name(pkey, def_md, sizeof(def_md)) == 2
- && strcmp(def_md, "UNDEF") == 0 ? 1 : 0;
+ && strcmp(def_md, "UNDEF") == 0
+ ? 1
+ : 0;
}
/* Method to map any, incl. provider-implemented PKEY types to OIDs */
@@ -293,7 +293,7 @@ static int cms_sd_asn1_ctrl(CMS_SignerInfo *si, int cmd)
/* Add SigningCertificate signed attribute to the signer info. */
static int ossl_cms_add1_signing_cert(CMS_SignerInfo *si,
- const ESS_SIGNING_CERT *sc)
+ const ESS_SIGNING_CERT *sc)
{
ASN1_STRING *seq = NULL;
unsigned char *p, *pp = NULL;
@@ -311,14 +311,14 @@ static int ossl_cms_add1_signing_cert(CMS_SignerInfo *si,
}
OPENSSL_free(pp);
ret = CMS_signed_add1_attr_by_NID(si, NID_id_smime_aa_signingCertificate,
- V_ASN1_SEQUENCE, seq, -1);
+ V_ASN1_SEQUENCE, seq, -1);
ASN1_STRING_free(seq);
return ret;
}
/* Add SigningCertificateV2 signed attribute to the signer info. */
static int ossl_cms_add1_signing_cert_v2(CMS_SignerInfo *si,
- const ESS_SIGNING_CERT_V2 *sc)
+ const ESS_SIGNING_CERT_V2 *sc)
{
ASN1_STRING *seq = NULL;
unsigned char *p, *pp = NULL;
@@ -336,7 +336,7 @@ static int ossl_cms_add1_signing_cert_v2(CMS_SignerInfo *si,
}
OPENSSL_free(pp);
ret = CMS_signed_add1_attr_by_NID(si, NID_id_smime_aa_signingCertificateV2,
- V_ASN1_SEQUENCE, seq, -1);
+ V_ASN1_SEQUENCE, seq, -1);
ASN1_STRING_free(seq);
return ret;
}
@@ -345,28 +345,136 @@ static const struct {
const char *name;
int md_nid;
int md_a_must; /* md is a 'MUST' */
- int noattr_md_nid; /* in case of 'without signed attributes' */
+ int noattr_md_nid; /* in case of 'without signed attributes' */
int noattr_md_a_must; /* noattr_md is a 'MUST' not a 'SHOULD' */
} key2data[] = {
- { "ML-DSA-44", NID_shake256, 0, NID_sha512, 0, },
- { "ML-DSA-65", NID_shake256, 0, NID_sha512, 0, },
- { "ML-DSA-87", NID_shake256, 0, NID_sha512, 0, },
- { "ED25519", NID_sha512, 0, NID_sha512, 1, }, /* RFC 8419 */
+ {
+ "ML-DSA-44",
+ NID_shake256,
+ 0,
+ NID_sha512,
+ 0,
+ },
+ {
+ "ML-DSA-65",
+ NID_shake256,
+ 0,
+ NID_sha512,
+ 0,
+ },
+ {
+ "ML-DSA-87",
+ NID_shake256,
+ 0,
+ NID_sha512,
+ 0,
+ },
+ {
+ "ED25519",
+ NID_sha512,
+ 0,
+ NID_sha512,
+ 1,
+ }, /* RFC 8419 */
/* RFC 8419 3.1 ED448: id-shake256-len MUST be used => NID_undef for now */
- { "ED448", NID_undef, 1, NID_shake256, 1, },
- { "SLH-DSA-SHA2-128f", NID_sha256, 0, NID_sha256, 0, }, /* RFC 9814 */
- { "SLH-DSA-SHA2-128s", NID_sha256, 0, NID_sha256, 0, },
- { "SLH-DSA-SHA2-192f", NID_sha512, 0, NID_sha512, 0, },
- { "SLH-DSA-SHA2-192s", NID_sha512, 0, NID_sha512, 0, },
- { "SLH-DSA-SHA2-256f", NID_sha512, 0, NID_sha512, 0, },
- { "SLH-DSA-SHA2-256s", NID_sha512, 0, NID_sha512, 0, },
- { "SLH-DSA-SHAKE-128f", NID_shake128, 0, NID_shake128, 0, },
- { "SLH-DSA-SHAKE-128s", NID_shake128, 0, NID_shake128, 0, },
- { "SLH-DSA-SHAKE-192f", NID_shake256, 0, NID_shake256, 0, },
- { "SLH-DSA-SHAKE-192s", NID_shake256, 0, NID_shake256, 0, },
- { "SLH-DSA-SHAKE-256f", NID_shake256, 0, NID_shake256, 0, },
- { "SLH-DSA-SHAKE-256s", NID_shake256, 0, NID_shake256, 0, },
- { NULL, NID_undef, 0, NID_undef, 0, } /* last */
+ {
+ "ED448",
+ NID_undef,
+ 1,
+ NID_shake256,
+ 1,
+ },
+ {
+ "SLH-DSA-SHA2-128f",
+ NID_sha256,
+ 0,
+ NID_sha256,
+ 0,
+ }, /* RFC 9814 */
+ {
+ "SLH-DSA-SHA2-128s",
+ NID_sha256,
+ 0,
+ NID_sha256,
+ 0,
+ },
+ {
+ "SLH-DSA-SHA2-192f",
+ NID_sha512,
+ 0,
+ NID_sha512,
+ 0,
+ },
+ {
+ "SLH-DSA-SHA2-192s",
+ NID_sha512,
+ 0,
+ NID_sha512,
+ 0,
+ },
+ {
+ "SLH-DSA-SHA2-256f",
+ NID_sha512,
+ 0,
+ NID_sha512,
+ 0,
+ },
+ {
+ "SLH-DSA-SHA2-256s",
+ NID_sha512,
+ 0,
+ NID_sha512,
+ 0,
+ },
+ {
+ "SLH-DSA-SHAKE-128f",
+ NID_shake128,
+ 0,
+ NID_shake128,
+ 0,
+ },
+ {
+ "SLH-DSA-SHAKE-128s",
+ NID_shake128,
+ 0,
+ NID_shake128,
+ 0,
+ },
+ {
+ "SLH-DSA-SHAKE-192f",
+ NID_shake256,
+ 0,
+ NID_shake256,
+ 0,
+ },
+ {
+ "SLH-DSA-SHAKE-192s",
+ NID_shake256,
+ 0,
+ NID_shake256,
+ 0,
+ },
+ {
+ "SLH-DSA-SHAKE-256f",
+ NID_shake256,
+ 0,
+ NID_shake256,
+ 0,
+ },
+ {
+ "SLH-DSA-SHAKE-256s",
+ NID_shake256,
+ 0,
+ NID_shake256,
+ 0,
+ },
+ {
+ NULL,
+ NID_undef,
+ 0,
+ NID_undef,
+ 0,
+ } /* last */
};
static const char *cms_mdless_signing(EVP_PKEY *pkey)
@@ -396,16 +504,15 @@ static const EVP_MD *ossl_cms_get_default_md(EVP_PKEY *pk, int *md_a_must)
}
}
- if (def_nid == NID_undef &&
- EVP_PKEY_get_default_digest_nid(pk, &def_nid) <= 0) {
+ if (def_nid == NID_undef && EVP_PKEY_get_default_digest_nid(pk, &def_nid) <= 0) {
ERR_raise_data(ERR_LIB_CMS, CMS_R_NO_DEFAULT_DIGEST,
- "pkey nid=%d", EVP_PKEY_get_id(pk));
+ "pkey nid=%d", EVP_PKEY_get_id(pk));
return NULL;
}
md = EVP_get_digestbynid(def_nid);
if (md == NULL)
ERR_raise_data(ERR_LIB_CMS, CMS_R_NO_DEFAULT_DIGEST,
- "default md nid=%d", def_nid);
+ "default md nid=%d", def_nid);
return md;
}
@@ -459,8 +566,8 @@ static int ossl_cms_adjust_md(EVP_PKEY *pk, const EVP_MD **md, unsigned int flag
}
CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms,
- X509 *signer, EVP_PKEY *pk, const EVP_MD *md,
- unsigned int flags)
+ X509 *signer, EVP_PKEY *pk, const EVP_MD *md,
+ unsigned int flags)
{
CMS_SignedData *sd;
CMS_SignerInfo *si = NULL;
@@ -545,7 +652,7 @@ CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms,
}
if (!(flags & CMS_KEY_PARAM) && !cms_sd_asn1_ctrl(si, 0)) {
ERR_raise_data(ERR_LIB_CMS, CMS_R_UNSUPPORTED_SIGNATURE_ALGORITHM,
- "pkey nid=%d", EVP_PKEY_get_id(pk));
+ "pkey nid=%d", EVP_PKEY_get_id(pk));
goto err;
}
if (!(flags & CMS_NOATTR)) {
@@ -587,13 +694,15 @@ CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms,
if (EVP_MD_is_a(md, SN_sha1)) {
if ((sc = OSSL_ESS_signing_cert_new_init(signer,
- NULL, 1)) == NULL)
+ NULL, 1))
+ == NULL)
goto err;
add_sc = ossl_cms_add1_signing_cert(si, sc);
ESS_SIGNING_CERT_free(sc);
} else {
if ((sc2 = OSSL_ESS_signing_cert_v2_new_init(md, signer,
- NULL, 1)) == NULL)
+ NULL, 1))
+ == NULL)
goto err;
add_sc = ossl_cms_add1_signing_cert_v2(si, sc2);
ESS_SIGNING_CERT_V2_free(sc2);
@@ -606,8 +715,7 @@ CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms,
goto err;
if (!cms_set_si_contentType_attr(cms, si))
goto err;
- if (!(flags & (CMS_PARTIAL | CMS_KEY_PARAM)) &&
- !CMS_SignerInfo_sign(si))
+ if (!(flags & (CMS_PARTIAL | CMS_KEY_PARAM)) && !CMS_SignerInfo_sign(si))
goto err;
}
}
@@ -622,8 +730,8 @@ CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms,
if (flags & CMS_KEY_PARAM) {
if (flags & CMS_NOATTR) {
si->pctx = EVP_PKEY_CTX_new_from_pkey(ossl_cms_ctx_get0_libctx(ctx),
- si->pkey,
- ossl_cms_ctx_get0_propq(ctx));
+ si->pkey,
+ ossl_cms_ctx_get0_propq(ctx));
if (si->pctx == NULL)
goto err;
if (EVP_PKEY_sign_init(si->pctx) <= 0)
@@ -631,14 +739,14 @@ CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms,
if (EVP_PKEY_CTX_set_signature_md(si->pctx, md) <= 0)
goto err;
} else if (EVP_DigestSignInit_ex(si->mctx, &si->pctx,
- EVP_MD_get0_name(md),
- ossl_cms_ctx_get0_libctx(ctx),
- ossl_cms_ctx_get0_propq(ctx),
- pk, NULL) <= 0) {
+ EVP_MD_get0_name(md),
+ ossl_cms_ctx_get0_libctx(ctx),
+ ossl_cms_ctx_get0_propq(ctx),
+ pk, NULL)
+ <= 0) {
si->pctx = NULL;
goto err;
- }
- else {
+ } else {
EVP_MD_CTX_set_flags(si->mctx, EVP_MD_CTX_FLAG_KEEP_PKEY_CTX);
}
}
@@ -650,7 +758,7 @@ CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms,
}
return si;
- err:
+err:
M_ASN1_free_of(si, CMS_SignerInfo);
return NULL;
}
@@ -689,18 +797,18 @@ static int cms_add1_signingTime(CMS_SignerInfo *si, ASN1_TIME *t)
}
if (CMS_signed_add1_attr_by_NID(si, NID_pkcs9_signingTime,
- tt->type, tt, -1) <= 0) {
+ tt->type, tt, -1)
+ <= 0) {
ERR_raise(ERR_LIB_CMS, ERR_R_CMS_LIB);
goto err;
}
r = 1;
- err:
+err:
if (t == NULL)
ASN1_TIME_free(tt);
return r;
-
}
EVP_PKEY_CTX *CMS_SignerInfo_get0_pkey_ctx(CMS_SignerInfo *si)
@@ -732,7 +840,7 @@ STACK_OF(X509) *CMS_get0_signers(CMS_ContentInfo *cms)
si = sk_CMS_SignerInfo_value(sinfos, i);
if (si->signer != NULL) {
if (!ossl_x509_add_cert_new(&signers, si->signer,
- X509_ADD_FLAG_DEFAULT)) {
+ X509_ADD_FLAG_DEFAULT)) {
sk_X509_free(signers);
return NULL;
}
@@ -754,8 +862,8 @@ void CMS_SignerInfo_set1_signer_cert(CMS_SignerInfo *si, X509 *signer)
}
int CMS_SignerInfo_get0_signer_id(CMS_SignerInfo *si,
- ASN1_OCTET_STRING **keyid,
- X509_NAME **issuer, ASN1_INTEGER **sno)
+ ASN1_OCTET_STRING **keyid,
+ X509_NAME **issuer, ASN1_INTEGER **sno)
{
return ossl_cms_SignerIdentifier_get0_signer_id(si->sid, keyid, issuer, sno);
}
@@ -766,7 +874,7 @@ int CMS_SignerInfo_cert_cmp(CMS_SignerInfo *si, X509 *cert)
}
int CMS_set1_signers_certs(CMS_ContentInfo *cms, STACK_OF(X509) *scerts,
- unsigned int flags)
+ unsigned int flags)
{
CMS_SignedData *sd;
CMS_SignerInfo *si;
@@ -813,8 +921,8 @@ int CMS_set1_signers_certs(CMS_ContentInfo *cms, STACK_OF(X509) *scerts,
}
void CMS_SignerInfo_get0_algs(CMS_SignerInfo *si, EVP_PKEY **pk,
- X509 **signer, X509_ALGOR **pdig,
- X509_ALGOR **psig)
+ X509 **signer, X509_ALGOR **pdig,
+ X509_ALGOR **psig)
{
if (pk != NULL)
*pk = si->pkey;
@@ -832,7 +940,7 @@ ASN1_OCTET_STRING *CMS_SignerInfo_get0_signature(CMS_SignerInfo *si)
}
static int cms_bio_read(BIO *in,
- unsigned char **buffer, size_t *buffer_len)
+ unsigned char **buffer, size_t *buffer_len)
{
unsigned char *tmp;
size_t offset = 0;
@@ -868,8 +976,8 @@ err:
}
static int cms_EVP_PKEY_sign(EVP_PKEY_CTX *pctx, BIO *in,
- unsigned char *sig, size_t *sig_len,
- int has_msg_update)
+ unsigned char *sig, size_t *sig_len,
+ int has_msg_update)
{
size_t buffer_len;
int ret;
@@ -901,7 +1009,7 @@ static int cms_EVP_PKEY_sign(EVP_PKEY_CTX *pctx, BIO *in,
}
static int cms_EVP_PKEY_verify(EVP_PKEY_CTX *pctx, BIO *in, unsigned char *sig,
- size_t siglen, int has_msg_update)
+ size_t siglen, int has_msg_update)
{
size_t buffer_len;
int ret;
@@ -936,10 +1044,10 @@ static int cms_EVP_PKEY_verify(EVP_PKEY_CTX *pctx, BIO *in, unsigned char *sig,
}
static int cms_SignerInfo_content_sign(CMS_ContentInfo *cms,
- CMS_SignerInfo *si, BIO *chain,
- BIO *data,
- const unsigned char *md,
- unsigned int mdlen)
+ CMS_SignerInfo *si, BIO *chain,
+ BIO *data,
+ const unsigned char *md,
+ unsigned int mdlen)
{
EVP_MD_CTX *mctx = EVP_MD_CTX_new();
int r = 0;
@@ -976,7 +1084,7 @@ static int cms_SignerInfo_content_sign(CMS_ContentInfo *cms,
md = computed_md;
}
if (!CMS_signed_add1_attr_by_NID(si, NID_pkcs9_messageDigest,
- V_ASN1_OCTET_STRING, md, mdlen))
+ V_ASN1_OCTET_STRING, md, mdlen))
goto err;
/* Copy content type across */
if (!cms_set_si_contentType_attr(cms, si))
@@ -1038,12 +1146,13 @@ static int cms_SignerInfo_content_sign(CMS_ContentInfo *cms,
sig_len = siglen;
has_msg_update = EVP_SIGNATURE_has_message_update(sig_alg);
if (cms_EVP_PKEY_sign(pctx, data, sig, &sig_len,
- has_msg_update) != 1)
+ has_msg_update)
+ != 1)
goto err;
siglen = (unsigned int)sig_len;
} else {
if (!EVP_SignFinal_ex(mctx, sig, &siglen, si->pkey, libctx,
- ossl_cms_ctx_get0_propq(ctx))) {
+ ossl_cms_ctx_get0_propq(ctx))) {
ERR_raise(ERR_LIB_CMS, CMS_R_SIGNFINAL_ERROR);
goto err;
}
@@ -1054,7 +1163,7 @@ static int cms_SignerInfo_content_sign(CMS_ContentInfo *cms,
r = 1;
- err:
+err:
OPENSSL_free(sig);
EVP_MD_CTX_free(mctx);
EVP_PKEY_CTX_free(pctx);
@@ -1063,8 +1172,8 @@ static int cms_SignerInfo_content_sign(CMS_ContentInfo *cms,
}
int ossl_cms_SignedData_final(CMS_ContentInfo *cms, BIO *chain, BIO *data,
- const unsigned char *precomp_md,
- unsigned int precomp_mdlen)
+ const unsigned char *precomp_md,
+ unsigned int precomp_mdlen)
{
STACK_OF(CMS_SignerInfo) *sinfos;
CMS_SignerInfo *si;
@@ -1074,7 +1183,7 @@ int ossl_cms_SignedData_final(CMS_ContentInfo *cms, BIO *chain, BIO *data,
for (i = 0; i < sk_CMS_SignerInfo_num(sinfos); i++) {
si = sk_CMS_SignerInfo_value(sinfos, i);
if (!cms_SignerInfo_content_sign(cms, si, chain, data,
- precomp_md, precomp_mdlen))
+ precomp_md, precomp_mdlen))
return 0;
}
cms->d.signedData->encapContentInfo->partial = 0;
@@ -1092,7 +1201,8 @@ int CMS_SignerInfo_sign(CMS_SignerInfo *si)
char md_name_buf[OSSL_MAX_NAME_SIZE], *md_name;
if (OBJ_obj2txt(md_name_buf, sizeof(md_name_buf),
- si->digestAlgorithm->algorithm, 0) <= 0)
+ si->digestAlgorithm->algorithm, 0)
+ <= 0)
return 0;
md_name = cms_signature_nomd(si->pkey) ? NULL : md_name_buf;
@@ -1110,9 +1220,10 @@ int CMS_SignerInfo_sign(CMS_SignerInfo *si)
} else {
EVP_MD_CTX_reset(mctx);
if (EVP_DigestSignInit_ex(mctx, &pctx, md_name,
- ossl_cms_ctx_get0_libctx(ctx),
- ossl_cms_ctx_get0_propq(ctx), si->pkey,
- NULL) <= 0)
+ ossl_cms_ctx_get0_libctx(ctx),
+ ossl_cms_ctx_get0_propq(ctx), si->pkey,
+ NULL)
+ <= 0)
goto err;
EVP_MD_CTX_set_flags(mctx, EVP_MD_CTX_FLAG_KEEP_PKEY_CTX);
si->pctx = pctx;
@@ -1120,13 +1231,14 @@ int CMS_SignerInfo_sign(CMS_SignerInfo *si)
if (md_name == NULL) {
if (ASN1_item_sign_ctx(ASN1_ITEM_rptr(CMS_Attributes_Sign), NULL,
- NULL, si->signature, si->signedAttrs, mctx) <= 0)
+ NULL, si->signature, si->signedAttrs, mctx)
+ <= 0)
goto err;
return 1;
}
alen = ASN1_item_i2d((ASN1_VALUE *)si->signedAttrs, &abuf,
- ASN1_ITEM_rptr(CMS_Attributes_Sign));
+ ASN1_ITEM_rptr(CMS_Attributes_Sign));
if (alen < 0 || abuf == NULL)
goto err;
if (EVP_DigestSignUpdate(mctx, abuf, alen) <= 0)
@@ -1146,7 +1258,7 @@ int CMS_SignerInfo_sign(CMS_SignerInfo *si)
return 1;
- err:
+err:
OPENSSL_free(abuf);
EVP_MD_CTX_reset(mctx);
return 0;
@@ -1174,9 +1286,9 @@ int CMS_SignerInfo_verify(CMS_SignerInfo *si)
if (cms_signature_nomd(si->pkey)) {
r = ASN1_item_verify_ex(ASN1_ITEM_rptr(CMS_Attributes_Sign),
- si->signatureAlgorithm, si->signature,
- si->signedAttrs, NULL, si->pkey,
- libctx, propq);
+ si->signatureAlgorithm, si->signature,
+ si->signedAttrs, NULL, si->pkey,
+ libctx, propq);
if (r <= 0)
ERR_raise(ERR_LIB_CMS, CMS_R_VERIFICATION_FAILURE);
return r;
@@ -1208,7 +1320,8 @@ int CMS_SignerInfo_verify(CMS_SignerInfo *si)
si->pctx = NULL;
}
if (EVP_DigestVerifyInit_ex(mctx, &si->pctx, EVP_MD_get0_name(md), libctx,
- propq, si->pkey, NULL) <= 0) {
+ propq, si->pkey, NULL)
+ <= 0) {
si->pctx = NULL;
goto err;
}
@@ -1218,7 +1331,7 @@ int CMS_SignerInfo_verify(CMS_SignerInfo *si)
goto err;
alen = ASN1_item_i2d((ASN1_VALUE *)si->signedAttrs, &abuf,
- ASN1_ITEM_rptr(CMS_Attributes_Verify));
+ ASN1_ITEM_rptr(CMS_Attributes_Verify));
if (abuf == NULL || alen < 0)
goto err;
r = EVP_DigestVerifyUpdate(mctx, abuf, alen);
@@ -1228,10 +1341,10 @@ int CMS_SignerInfo_verify(CMS_SignerInfo *si)
goto err;
}
r = EVP_DigestVerifyFinal(mctx,
- si->signature->data, si->signature->length);
+ si->signature->data, si->signature->length);
if (r <= 0)
ERR_raise(ERR_LIB_CMS, CMS_R_VERIFICATION_FAILURE);
- err:
+err:
EVP_MD_free(fetched_md);
EVP_MD_CTX_reset(mctx);
return r;
@@ -1255,7 +1368,7 @@ BIO *ossl_cms_SignedData_init_bio(CMS_ContentInfo *cms)
digestAlgorithm = sk_X509_ALGOR_value(sd->digestAlgorithms, i);
mdbio = ossl_cms_DigestAlgorithm_init_bio(digestAlgorithm,
- ossl_cms_get0_cmsctx(cms));
+ ossl_cms_get0_cmsctx(cms));
if (mdbio == NULL)
goto err;
if (chain != NULL)
@@ -1264,7 +1377,7 @@ BIO *ossl_cms_SignedData_init_bio(CMS_ContentInfo *cms)
chain = mdbio;
}
return chain;
- err:
+err:
BIO_free_all(chain);
return NULL;
}
@@ -1292,8 +1405,8 @@ int CMS_SignerInfo_verify_ex(CMS_SignerInfo *si, BIO *chain, BIO *data)
/* If we have any signed attributes look for messageDigest value */
if (CMS_signed_get_attr_count(si) >= 0) {
os = CMS_signed_get0_data_by_OBJ(si,
- OBJ_nid2obj(NID_pkcs9_messageDigest),
- -3, V_ASN1_OCTET_STRING);
+ OBJ_nid2obj(NID_pkcs9_messageDigest),
+ -3, V_ASN1_OCTET_STRING);
if (os == NULL) {
ERR_raise(ERR_LIB_CMS, CMS_R_ERROR_READING_MESSAGEDIGEST_ATTRIBUTE);
goto err;
@@ -1329,7 +1442,7 @@ int CMS_SignerInfo_verify_ex(CMS_SignerInfo *si, BIO *chain, BIO *data)
int has_msg_update;
pkctx = EVP_PKEY_CTX_new_from_pkey(libctx, si->pkey,
- ossl_cms_ctx_get0_propq(ctx));
+ ossl_cms_ctx_get0_propq(ctx));
if (pkctx == NULL)
goto err;
@@ -1347,7 +1460,7 @@ int CMS_SignerInfo_verify_ex(CMS_SignerInfo *si, BIO *chain, BIO *data)
has_msg_update = EVP_SIGNATURE_has_message_update(sig_alg);
r = cms_EVP_PKEY_verify(pkctx, data, si->signature->data,
- si->signature->length, has_msg_update);
+ si->signature->length, has_msg_update);
} else {
if (EVP_PKEY_verify_init(pkctx) <= 0)
goto err;
@@ -1361,7 +1474,7 @@ int CMS_SignerInfo_verify_ex(CMS_SignerInfo *si, BIO *chain, BIO *data)
si->pctx = NULL;
r = EVP_PKEY_verify(pkctx, si->signature->data,
- si->signature->length, mval, mlen);
+ si->signature->length, mval, mlen);
}
if (r <= 0) {
ERR_raise(ERR_LIB_CMS, CMS_R_VERIFICATION_FAILURE);
@@ -1369,20 +1482,19 @@ int CMS_SignerInfo_verify_ex(CMS_SignerInfo *si, BIO *chain, BIO *data)
}
}
- err:
+err:
EVP_PKEY_CTX_free(pkctx);
EVP_MD_CTX_free(mctx);
EVP_SIGNATURE_free(sig_alg);
OPENSSL_free(buffer);
return r;
-
}
BIO *CMS_SignedData_verify(CMS_SignedData *sd, BIO *detached_data,
- STACK_OF(X509) *scerts, X509_STORE *store,
- STACK_OF(X509) *extra, STACK_OF(X509_CRL) *crls,
- unsigned int flags,
- OSSL_LIB_CTX *libctx, const char *propq)
+ STACK_OF(X509) *scerts, X509_STORE *store,
+ STACK_OF(X509) *extra, STACK_OF(X509_CRL) *crls,
+ unsigned int flags,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
CMS_ContentInfo *ci;
BIO *bio = NULL;
@@ -1408,7 +1520,7 @@ BIO *CMS_SignedData_verify(CMS_SignedData *sd, BIO *detached_data,
goto end;
res = CMS_verify(ci, scerts, store, detached_data, bio, flags);
- end:
+end:
if (ci != NULL)
ci->d.signedData = NULL; /* do not indirectly free |sd| */
CMS_ContentInfo_free(ci);
@@ -1428,13 +1540,13 @@ int CMS_add_smimecap(CMS_SignerInfo *si, STACK_OF(X509_ALGOR) *algs)
if (smderlen <= 0)
return 0;
r = CMS_signed_add1_attr_by_NID(si, NID_SMIMECapabilities,
- V_ASN1_SEQUENCE, smder, smderlen);
+ V_ASN1_SEQUENCE, smder, smderlen);
OPENSSL_free(smder);
return r;
}
int CMS_add_simple_smimecap(STACK_OF(X509_ALGOR) **algs,
- int algnid, int keysize)
+ int algnid, int keysize)
{
X509_ALGOR *alg;
ASN1_INTEGER *key = NULL;
@@ -1446,8 +1558,7 @@ int CMS_add_simple_smimecap(STACK_OF(X509_ALGOR) **algs,
return 0;
}
}
- alg = ossl_X509_ALGOR_from_nid(algnid, key != NULL ? V_ASN1_INTEGER :
- V_ASN1_UNDEF, key);
+ alg = ossl_X509_ALGOR_from_nid(algnid, key != NULL ? V_ASN1_INTEGER : V_ASN1_UNDEF, key);
if (alg == NULL) {
ASN1_INTEGER_free(key);
return 0;
diff --git a/crypto/cms/cms_smime.c b/crypto/cms/cms_smime.c
index cd3cd97ae0..fe631b27a2 100644
--- a/crypto/cms/cms_smime.c
+++ b/crypto/cms/cms_smime.c
@@ -69,11 +69,10 @@ static int cms_copy_content(BIO *out, BIO *in, unsigned int flags)
}
r = 1;
- err:
+err:
if (tmpout != out)
BIO_free(tmpout);
return r;
-
}
static int check_content(CMS_ContentInfo *cms)
@@ -120,7 +119,7 @@ int CMS_data(CMS_ContentInfo *cms, BIO *out, unsigned int flags)
}
CMS_ContentInfo *CMS_data_create_ex(BIO *in, unsigned int flags,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_LIB_CTX *libctx, const char *propq)
{
CMS_ContentInfo *cms = ossl_cms_Data_create(libctx, propq);
@@ -140,7 +139,7 @@ CMS_ContentInfo *CMS_data_create(BIO *in, unsigned int flags)
}
int CMS_digest_verify(CMS_ContentInfo *cms, BIO *dcont, BIO *out,
- unsigned int flags)
+ unsigned int flags)
{
BIO *cont;
int r;
@@ -165,8 +164,8 @@ int CMS_digest_verify(CMS_ContentInfo *cms, BIO *dcont, BIO *out,
}
CMS_ContentInfo *CMS_digest_create_ex(BIO *in, const EVP_MD *md,
- unsigned int flags, OSSL_LIB_CTX *ctx,
- const char *propq)
+ unsigned int flags, OSSL_LIB_CTX *ctx,
+ const char *propq)
{
CMS_ContentInfo *cms;
@@ -191,14 +190,14 @@ CMS_ContentInfo *CMS_digest_create_ex(BIO *in, const EVP_MD *md,
}
CMS_ContentInfo *CMS_digest_create(BIO *in, const EVP_MD *md,
- unsigned int flags)
+ unsigned int flags)
{
return CMS_digest_create_ex(in, md, flags, NULL, NULL);
}
int CMS_EncryptedData_decrypt(CMS_ContentInfo *cms,
- const unsigned char *key, size_t keylen,
- BIO *dcont, BIO *out, unsigned int flags)
+ const unsigned char *key, size_t keylen,
+ BIO *dcont, BIO *out, unsigned int flags)
{
BIO *cont;
int r;
@@ -222,10 +221,10 @@ int CMS_EncryptedData_decrypt(CMS_ContentInfo *cms,
}
CMS_ContentInfo *CMS_EncryptedData_encrypt_ex(BIO *in, const EVP_CIPHER *cipher,
- const unsigned char *key,
- size_t keylen, unsigned int flags,
- OSSL_LIB_CTX *libctx,
- const char *propq)
+ const unsigned char *key,
+ size_t keylen, unsigned int flags,
+ OSSL_LIB_CTX *libctx,
+ const char *propq)
{
CMS_ContentInfo *cms;
@@ -246,32 +245,32 @@ CMS_ContentInfo *CMS_EncryptedData_encrypt_ex(BIO *in, const EVP_CIPHER *cipher,
|| CMS_final(cms, in, NULL, flags))
return cms;
- err:
+err:
CMS_ContentInfo_free(cms);
return NULL;
}
CMS_ContentInfo *CMS_EncryptedData_encrypt(BIO *in, const EVP_CIPHER *cipher,
- const unsigned char *key,
- size_t keylen, unsigned int flags)
+ const unsigned char *key,
+ size_t keylen, unsigned int flags)
{
return CMS_EncryptedData_encrypt_ex(in, cipher, key, keylen, flags, NULL,
- NULL);
+ NULL);
}
static int cms_signerinfo_verify_cert(CMS_SignerInfo *si,
- X509_STORE *store,
- STACK_OF(X509) *untrusted,
- STACK_OF(X509_CRL) *crls,
- STACK_OF(X509) **chain,
- const CMS_CTX *cms_ctx)
+ X509_STORE *store,
+ STACK_OF(X509) *untrusted,
+ STACK_OF(X509_CRL) *crls,
+ STACK_OF(X509) **chain,
+ const CMS_CTX *cms_ctx)
{
X509_STORE_CTX *ctx;
X509 *signer;
int i, j, r = 0;
ctx = X509_STORE_CTX_new_ex(ossl_cms_ctx_get0_libctx(cms_ctx),
- ossl_cms_ctx_get0_propq(cms_ctx));
+ ossl_cms_ctx_get0_propq(cms_ctx));
if (ctx == NULL) {
ERR_raise(ERR_LIB_CMS, ERR_R_X509_LIB);
goto err;
@@ -289,7 +288,7 @@ static int cms_signerinfo_verify_cert(CMS_SignerInfo *si,
if (i <= 0) {
j = X509_STORE_CTX_get_error(ctx);
ERR_raise_data(ERR_LIB_CMS, CMS_R_CERTIFICATE_VERIFY_ERROR,
- "Verify error: %s", X509_verify_cert_error_string(j));
+ "Verify error: %s", X509_verify_cert_error_string(j));
goto err;
}
r = 1;
@@ -297,15 +296,14 @@ static int cms_signerinfo_verify_cert(CMS_SignerInfo *si,
/* also send back the trust chain when required */
if (chain != NULL)
*chain = X509_STORE_CTX_get1_chain(ctx);
- err:
+err:
X509_STORE_CTX_free(ctx);
return r;
-
}
/* This strongly overlaps with PKCS7_verify() */
int CMS_verify(CMS_ContentInfo *cms, STACK_OF(X509) *certs,
- X509_STORE *store, BIO *dcont, BIO *out, unsigned int flags)
+ X509_STORE *store, BIO *dcont, BIO *out, unsigned int flags)
{
CMS_SignerInfo *si;
STACK_OF(CMS_SignerInfo) *sinfos;
@@ -365,8 +363,7 @@ int CMS_verify(CMS_ContentInfo *cms, STACK_OF(X509) *certs,
goto err;
if (sk_X509_num(certs) > 0
&& !ossl_x509_add_certs_new(&untrusted, certs,
- X509_ADD_FLAG_UP_REF |
- X509_ADD_FLAG_NO_DUP))
+ X509_ADD_FLAG_UP_REF | X509_ADD_FLAG_NO_DUP))
goto err;
if ((flags & CMS_NOCRL) == 0
@@ -376,8 +373,8 @@ int CMS_verify(CMS_ContentInfo *cms, STACK_OF(X509) *certs,
si = sk_CMS_SignerInfo_value(sinfos, i);
if (!cms_signerinfo_verify_cert(si, store, untrusted, crls,
- si_chains ? &si_chains[i] : NULL,
- ctx))
+ si_chains ? &si_chains[i] : NULL,
+ ctx))
goto err;
}
}
@@ -457,7 +454,6 @@ int CMS_verify(CMS_ContentInfo *cms, STACK_OF(X509) *certs,
if (!cms_copy_content(out, cmsbio, flags))
goto err;
-
}
if (!(flags & CMS_NO_CONTENT_VERIFY)) {
for (i = 0; i < sk_CMS_SignerInfo_num(sinfos); i++) {
@@ -470,7 +466,7 @@ int CMS_verify(CMS_ContentInfo *cms, STACK_OF(X509) *certs,
}
ret = 1;
- err:
+err:
if (!(flags & SMIME_BINARY) && dcont) {
do_free_upto(cmsbio, tmpout);
if (tmpin != dcont)
@@ -485,7 +481,7 @@ int CMS_verify(CMS_ContentInfo *cms, STACK_OF(X509) *certs,
if (out != tmpout)
BIO_free_all(tmpout);
- err2:
+err2:
if (si_chains != NULL) {
for (i = 0; i < scount; ++i)
OSSL_STACK_OF_X509_free(si_chains[i]);
@@ -498,8 +494,8 @@ int CMS_verify(CMS_ContentInfo *cms, STACK_OF(X509) *certs,
}
int CMS_verify_receipt(CMS_ContentInfo *rcms, CMS_ContentInfo *ocms,
- STACK_OF(X509) *certs,
- X509_STORE *store, unsigned int flags)
+ STACK_OF(X509) *certs,
+ X509_STORE *store, unsigned int flags)
{
int r;
@@ -511,9 +507,9 @@ int CMS_verify_receipt(CMS_ContentInfo *rcms, CMS_ContentInfo *ocms,
}
CMS_ContentInfo *CMS_sign_ex(X509 *signcert, EVP_PKEY *pkey,
- STACK_OF(X509) *certs, BIO *data,
- unsigned int flags, OSSL_LIB_CTX *libctx,
- const char *propq)
+ STACK_OF(X509) *certs, BIO *data,
+ unsigned int flags, OSSL_LIB_CTX *libctx,
+ const char *propq)
{
CMS_ContentInfo *cms;
int i;
@@ -525,7 +521,7 @@ CMS_ContentInfo *CMS_sign_ex(X509 *signcert, EVP_PKEY *pkey,
}
if (flags & CMS_ASCIICRLF
&& !CMS_set1_eContentType(cms,
- OBJ_nid2obj(NID_id_ct_asciiTextWithCRLF))) {
+ OBJ_nid2obj(NID_id_ct_asciiTextWithCRLF))) {
ERR_raise(ERR_LIB_CMS, ERR_R_CMS_LIB);
goto err;
}
@@ -553,20 +549,20 @@ CMS_ContentInfo *CMS_sign_ex(X509 *signcert, EVP_PKEY *pkey,
else
goto err;
- err:
+err:
CMS_ContentInfo_free(cms);
return NULL;
}
CMS_ContentInfo *CMS_sign(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs,
- BIO *data, unsigned int flags)
+ BIO *data, unsigned int flags)
{
return CMS_sign_ex(signcert, pkey, certs, data, flags, NULL, NULL);
}
CMS_ContentInfo *CMS_sign_receipt(CMS_SignerInfo *si,
- X509 *signcert, EVP_PKEY *pkey,
- STACK_OF(X509) *certs, unsigned int flags)
+ X509 *signcert, EVP_PKEY *pkey,
+ STACK_OF(X509) *certs, unsigned int flags)
{
CMS_SignerInfo *rct_si;
CMS_ContentInfo *cms = NULL;
@@ -586,8 +582,8 @@ CMS_ContentInfo *CMS_sign_receipt(CMS_SignerInfo *si,
/* Initialize signed data */
cms = CMS_sign_ex(NULL, NULL, certs, NULL, flags,
- ossl_cms_ctx_get0_libctx(ctx),
- ossl_cms_ctx_get0_propq(ctx));
+ ossl_cms_ctx_get0_libctx(ctx),
+ ossl_cms_ctx_get0_propq(ctx));
if (cms == NULL)
goto err;
@@ -627,28 +623,26 @@ CMS_ContentInfo *CMS_sign_receipt(CMS_SignerInfo *si,
r = 1;
- err:
+err:
BIO_free(rct_cont);
if (r)
return cms;
CMS_ContentInfo_free(cms);
ASN1_OCTET_STRING_free(os);
return NULL;
-
}
CMS_ContentInfo *CMS_encrypt_ex(STACK_OF(X509) *certs, BIO *data,
- const EVP_CIPHER *cipher, unsigned int flags,
- OSSL_LIB_CTX *libctx, const char *propq)
+ const EVP_CIPHER *cipher, unsigned int flags,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
CMS_ContentInfo *cms;
int i;
X509 *recip;
-
cms = (EVP_CIPHER_get_flags(cipher) & EVP_CIPH_FLAG_AEAD_CIPHER)
- ? CMS_AuthEnvelopedData_create_ex(cipher, libctx, propq)
- : CMS_EnvelopedData_create_ex(cipher, libctx, propq);
+ ? CMS_AuthEnvelopedData_create_ex(cipher, libctx, propq)
+ : CMS_EnvelopedData_create_ex(cipher, libctx, propq);
if (cms == NULL) {
ERR_raise(ERR_LIB_CMS, ERR_R_CMS_LIB);
goto err;
@@ -670,20 +664,20 @@ CMS_ContentInfo *CMS_encrypt_ex(STACK_OF(X509) *certs, BIO *data,
else
ERR_raise(ERR_LIB_CMS, ERR_R_CMS_LIB);
- err:
+err:
CMS_ContentInfo_free(cms);
return NULL;
}
CMS_ContentInfo *CMS_encrypt(STACK_OF(X509) *certs, BIO *data,
- const EVP_CIPHER *cipher, unsigned int flags)
+ const EVP_CIPHER *cipher, unsigned int flags)
{
return CMS_encrypt_ex(certs, data, cipher, flags, NULL, NULL);
}
static int cms_kari_set1_pkey_and_peer(CMS_ContentInfo *cms,
- CMS_RecipientInfo *ri,
- EVP_PKEY *pk, X509 *cert, X509 *peer)
+ CMS_RecipientInfo *ri,
+ EVP_PKEY *pk, X509 *cert, X509 *peer)
{
int i;
STACK_OF(CMS_RecipientEncryptedKey) *reks;
@@ -708,11 +702,11 @@ static int cms_kari_set1_pkey_and_peer(CMS_ContentInfo *cms,
int CMS_decrypt_set1_pkey(CMS_ContentInfo *cms, EVP_PKEY *pk, X509 *cert)
{
- return CMS_decrypt_set1_pkey_and_peer(cms, pk, cert, NULL);
+ return CMS_decrypt_set1_pkey_and_peer(cms, pk, cert, NULL);
}
int CMS_decrypt_set1_pkey_and_peer(CMS_ContentInfo *cms, EVP_PKEY *pk,
- X509 *cert, X509 *peer)
+ X509 *cert, X509 *peer)
{
STACK_OF(CMS_RecipientInfo) *ris = CMS_get0_RecipientInfos(cms);
CMS_RecipientInfo *ri;
@@ -732,8 +726,8 @@ int CMS_decrypt_set1_pkey_and_peer(CMS_ContentInfo *cms, EVP_PKEY *pk,
cms_pkey_ri_type = ossl_cms_pkey_get_ri_type(pk);
if (cms_pkey_ri_type == CMS_RECIPINFO_NONE) {
- ERR_raise(ERR_LIB_CMS, CMS_R_NOT_SUPPORTED_FOR_THIS_KEY_TYPE);
- return 0;
+ ERR_raise(ERR_LIB_CMS, CMS_R_NOT_SUPPORTED_FOR_THIS_KEY_TYPE);
+ return 0;
}
for (i = 0; i < sk_CMS_RecipientInfo_num(ris); i++) {
@@ -801,12 +795,11 @@ int CMS_decrypt_set1_pkey_and_peer(CMS_ContentInfo *cms, EVP_PKEY *pk,
if (!match_ri)
ERR_raise(ERR_LIB_CMS, CMS_R_NO_MATCHING_RECIPIENT);
return 0;
-
}
int CMS_decrypt_set1_key(CMS_ContentInfo *cms,
- unsigned char *key, size_t keylen,
- const unsigned char *id, size_t idlen)
+ unsigned char *key, size_t keylen,
+ const unsigned char *id, size_t idlen)
{
STACK_OF(CMS_RecipientInfo) *ris;
CMS_RecipientInfo *ri;
@@ -820,7 +813,7 @@ int CMS_decrypt_set1_key(CMS_ContentInfo *cms,
/* If we have an id, try matching RecipientInfo, else try them all */
if (id == NULL
- || (CMS_RecipientInfo_kekri_id_cmp(ri, id, idlen) == 0)) {
+ || (CMS_RecipientInfo_kekri_id_cmp(ri, id, idlen) == 0)) {
match_ri = 1;
CMS_RecipientInfo_set0_key(ri, key, keylen);
r = CMS_RecipientInfo_decrypt(cms, ri);
@@ -838,11 +831,10 @@ int CMS_decrypt_set1_key(CMS_ContentInfo *cms,
if (!match_ri)
ERR_raise(ERR_LIB_CMS, CMS_R_NO_MATCHING_RECIPIENT);
return 0;
-
}
int CMS_decrypt_set1_password(CMS_ContentInfo *cms,
- unsigned char *pass, ossl_ssize_t passlen)
+ unsigned char *pass, ossl_ssize_t passlen)
{
STACK_OF(CMS_RecipientInfo) *ris = CMS_get0_RecipientInfos(cms);
CMS_RecipientInfo *ri;
@@ -873,11 +865,10 @@ int CMS_decrypt_set1_password(CMS_ContentInfo *cms,
if (!match_ri)
ERR_raise(ERR_LIB_CMS, CMS_R_NO_MATCHING_RECIPIENT);
return 0;
-
}
int CMS_decrypt(CMS_ContentInfo *cms, EVP_PKEY *pk, X509 *cert,
- BIO *dcont, BIO *out, unsigned int flags)
+ BIO *dcont, BIO *out, unsigned int flags)
{
int r;
BIO *cont;
@@ -885,7 +876,7 @@ int CMS_decrypt(CMS_ContentInfo *cms, EVP_PKEY *pk, X509 *cert,
int nid = OBJ_obj2nid(CMS_get0_type(cms));
if (nid != NID_pkcs7_enveloped
- && nid != NID_id_smime_ct_authEnvelopedData) {
+ && nid != NID_id_smime_ct_authEnvelopedData) {
ERR_raise(ERR_LIB_CMS, CMS_R_TYPE_NOT_ENVELOPED_DATA);
return 0;
}
@@ -933,12 +924,11 @@ err:
do_free_upto(cmsbio, dcont);
return ret;
-
}
int CMS_final_digest(CMS_ContentInfo *cms,
- const unsigned char *md, unsigned int mdlen,
- BIO *dcont, unsigned int flags)
+ const unsigned char *md, unsigned int mdlen,
+ BIO *dcont, unsigned int flags)
{
BIO *cmsbio;
int ret = 0;
@@ -964,7 +954,7 @@ err:
#ifndef OPENSSL_NO_ZLIB
int CMS_uncompress(CMS_ContentInfo *cms, BIO *dcont, BIO *out,
- unsigned int flags)
+ unsigned int flags)
{
BIO *cont;
int r;
@@ -1008,7 +998,7 @@ CMS_ContentInfo *CMS_compress(BIO *in, int comp_nid, unsigned int flags)
#else
int CMS_uncompress(CMS_ContentInfo *cms, BIO *dcont, BIO *out,
- unsigned int flags)
+ unsigned int flags)
{
ERR_raise(ERR_LIB_CMS, CMS_R_UNSUPPORTED_COMPRESSION_ALGORITHM);
return 0;
diff --git a/crypto/comp/c_brotli.c b/crypto/comp/c_brotli.c
index 0475297a9a..d262ec6a4e 100644
--- a/crypto/comp/c_brotli.c
+++ b/crypto/comp/c_brotli.c
@@ -23,11 +23,11 @@
COMP_METHOD *COMP_brotli(void);
#ifdef OPENSSL_NO_BROTLI
-# undef BROTLI_SHARED
+#undef BROTLI_SHARED
#else
-# include <brotli/decode.h>
-# include <brotli/encode.h>
+#include <brotli/decode.h>
+#include <brotli/encode.h>
/* memory allocations functions for brotli initialisation */
static void *brotli_alloc(void *opaque, size_t size)
@@ -46,12 +46,12 @@ static void brotli_free(void *opaque, void *address)
* work. Therefore, all BROTLI routines are loaded at run time
* and we do not link to a .LIB file when BROTLI_SHARED is set.
*/
-# if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
-# include <windows.h>
-# endif
+#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
+#include <windows.h>
+#endif
-# ifdef BROTLI_SHARED
-# include "internal/dso.h"
+#ifdef BROTLI_SHARED
+#include "internal/dso.h"
/* Function pointers */
typedef BrotliEncoderState *(*encode_init_ft)(brotli_alloc_func, brotli_free_func, void *);
@@ -87,23 +87,22 @@ static decode_oneshot_ft p_decode_oneshot = NULL;
static DSO *brotli_encode_dso = NULL;
static DSO *brotli_decode_dso = NULL;
-# define BrotliEncoderCreateInstance p_encode_init
-# define BrotliEncoderCompressStream p_encode_stream
-# define BrotliEncoderHasMoreOutput p_encode_has_more
-# define BrotliEncoderDestroyInstance p_encode_end
-# define BrotliEncoderCompress p_encode_oneshot
-
-# define BrotliDecoderCreateInstance p_decode_init
-# define BrotliDecoderDecompressStream p_decode_stream
-# define BrotliDecoderHasMoreOutput p_decode_has_more
-# define BrotliDecoderDestroyInstance p_decode_end
-# define BrotliDecoderGetErrorCode p_decode_error
-# define BrotliDecoderErrorString p_decode_error_string
-# define BrotliDecoderIsFinished p_decode_is_finished
-# define BrotliDecoderDecompress p_decode_oneshot
+#define BrotliEncoderCreateInstance p_encode_init
+#define BrotliEncoderCompressStream p_encode_stream
+#define BrotliEncoderHasMoreOutput p_encode_has_more
+#define BrotliEncoderDestroyInstance p_encode_end
+#define BrotliEncoderCompress p_encode_oneshot
-# endif /* ifdef BROTLI_SHARED */
+#define BrotliDecoderCreateInstance p_decode_init
+#define BrotliDecoderDecompressStream p_decode_stream
+#define BrotliDecoderHasMoreOutput p_decode_has_more
+#define BrotliDecoderDestroyInstance p_decode_end
+#define BrotliDecoderGetErrorCode p_decode_error
+#define BrotliDecoderErrorString p_decode_error_string
+#define BrotliDecoderIsFinished p_decode_is_finished
+#define BrotliDecoderDecompress p_decode_oneshot
+#endif /* ifdef BROTLI_SHARED */
struct brotli_state {
BrotliEncoderState *encoder;
@@ -127,7 +126,7 @@ static int brotli_stateful_init(COMP_CTX *ctx)
ctx->data = state;
return 1;
- err:
+err:
BrotliDecoderDestroyInstance(state->decoder);
BrotliEncoderDestroyInstance(state->encoder);
OPENSSL_free(state);
@@ -147,8 +146,8 @@ static void brotli_stateful_finish(COMP_CTX *ctx)
}
static ossl_ssize_t brotli_stateful_compress_block(COMP_CTX *ctx, unsigned char *out,
- size_t olen, unsigned char *in,
- size_t ilen)
+ size_t olen, unsigned char *in,
+ size_t ilen)
{
BROTLI_BOOL done;
struct brotli_state *state = ctx->data;
@@ -169,11 +168,11 @@ static ossl_ssize_t brotli_stateful_compress_block(COMP_CTX *ctx, unsigned char
* output buffer space
*/
done = BrotliEncoderCompressStream(state->encoder, BROTLI_OPERATION_FLUSH,
- &in_avail, (const uint8_t**)&in,
- &out_avail, &out, NULL);
+ &in_avail, (const uint8_t **)&in,
+ &out_avail, &out, NULL);
if (done == BROTLI_FALSE
- || in_avail != 0
- || BrotliEncoderHasMoreOutput(state->encoder))
+ || in_avail != 0
+ || BrotliEncoderHasMoreOutput(state->encoder))
return -1;
if (out_avail > olen)
@@ -182,8 +181,8 @@ static ossl_ssize_t brotli_stateful_compress_block(COMP_CTX *ctx, unsigned char
}
static ossl_ssize_t brotli_stateful_expand_block(COMP_CTX *ctx, unsigned char *out,
- size_t olen, unsigned char *in,
- size_t ilen)
+ size_t olen, unsigned char *in,
+ size_t ilen)
{
BrotliDecoderResult result;
struct brotli_state *state = ctx->data;
@@ -197,11 +196,11 @@ static ossl_ssize_t brotli_stateful_expand_block(COMP_CTX *ctx, unsigned char *o
return 0;
result = BrotliDecoderDecompressStream(state->decoder, &in_avail,
- (const uint8_t**)&in, &out_avail,
- &out, NULL);
+ (const uint8_t **)&in, &out_avail,
+ &out, NULL);
if (result == BROTLI_DECODER_RESULT_ERROR
- || in_avail != 0
- || BrotliDecoderHasMoreOutput(state->decoder))
+ || in_avail != 0
+ || BrotliDecoderHasMoreOutput(state->decoder))
return -1;
if (out_avail > olen)
@@ -228,8 +227,8 @@ static void brotli_oneshot_finish(COMP_CTX *ctx)
}
static ossl_ssize_t brotli_oneshot_compress_block(COMP_CTX *ctx, unsigned char *out,
- size_t olen, unsigned char *in,
- size_t ilen)
+ size_t olen, unsigned char *in,
+ size_t ilen)
{
size_t out_size = olen;
ossl_ssize_t ret;
@@ -238,8 +237,9 @@ static ossl_ssize_t brotli_oneshot_compress_block(COMP_CTX *ctx, unsigned char *
return 0;
if (BrotliEncoderCompress(BROTLI_DEFAULT_QUALITY, BROTLI_DEFAULT_WINDOW,
- BROTLI_DEFAULT_MODE, ilen, in,
- &out_size, out) == BROTLI_FALSE)
+ BROTLI_DEFAULT_MODE, ilen, in,
+ &out_size, out)
+ == BROTLI_FALSE)
return -1;
if (out_size > OSSL_SSIZE_MAX)
@@ -251,8 +251,8 @@ static ossl_ssize_t brotli_oneshot_compress_block(COMP_CTX *ctx, unsigned char *
}
static ossl_ssize_t brotli_oneshot_expand_block(COMP_CTX *ctx, unsigned char *out,
- size_t olen, unsigned char *in,
- size_t ilen)
+ size_t olen, unsigned char *in,
+ size_t ilen)
{
size_t out_size = olen;
ossl_ssize_t ret;
@@ -283,14 +283,14 @@ static COMP_METHOD brotli_oneshot_method = {
static CRYPTO_ONCE brotli_once = CRYPTO_ONCE_STATIC_INIT;
DEFINE_RUN_ONCE_STATIC(ossl_comp_brotli_init)
{
-# ifdef BROTLI_SHARED
-# if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
-# define LIBBROTLIENC "BROTLIENC"
-# define LIBBROTLIDEC "BROTLIDEC"
-# else
-# define LIBBROTLIENC "brotlienc"
-# define LIBBROTLIDEC "brotlidec"
-# endif
+#ifdef BROTLI_SHARED
+#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
+#define LIBBROTLIENC "BROTLIENC"
+#define LIBBROTLIDEC "BROTLIDEC"
+#else
+#define LIBBROTLIENC "brotlienc"
+#define LIBBROTLIDEC "brotlidec"
+#endif
brotli_encode_dso = DSO_load(NULL, LIBBROTLIENC, NULL, 0);
if (brotli_encode_dso != NULL) {
@@ -314,14 +314,14 @@ DEFINE_RUN_ONCE_STATIC(ossl_comp_brotli_init)
}
if (p_encode_init == NULL || p_encode_stream == NULL || p_encode_has_more == NULL
- || p_encode_end == NULL || p_encode_oneshot == NULL || p_decode_init == NULL
- || p_decode_stream == NULL || p_decode_has_more == NULL || p_decode_end == NULL
- || p_decode_error == NULL || p_decode_error_string == NULL || p_decode_is_finished == NULL
- || p_decode_oneshot == NULL) {
+ || p_encode_end == NULL || p_encode_oneshot == NULL || p_decode_init == NULL
+ || p_decode_stream == NULL || p_decode_has_more == NULL || p_decode_end == NULL
+ || p_decode_error == NULL || p_decode_error_string == NULL || p_decode_is_finished == NULL
+ || p_decode_oneshot == NULL) {
ossl_comp_brotli_cleanup();
return 0;
}
-# endif
+#endif
return 1;
}
#endif /* ifndef BROTLI / else */
@@ -394,14 +394,14 @@ typedef struct {
unsigned char *buf;
size_t bufsize;
BrotliEncoderState *state;
- int mode; /* Encoder mode to use */
+ int mode; /* Encoder mode to use */
int done;
unsigned char *ptr;
size_t count;
} encode;
} BIO_BROTLI_CTX;
-# define BROTLI_DEFAULT_BUFSIZE 1024
+#define BROTLI_DEFAULT_BUFSIZE 1024
static int bio_brotli_new(BIO *bi);
static int bio_brotli_free(BIO *bi);
@@ -419,8 +419,8 @@ static const BIO_METHOD bio_meth_brotli = {
/* TODO: Convert to new style read function */
bread_conv,
bio_brotli_read,
- NULL, /* bio_brotli_puts, */
- NULL, /* bio_brotli_gets, */
+ NULL, /* bio_brotli_puts, */
+ NULL, /* bio_brotli_gets, */
bio_brotli_ctrl,
bio_brotli_new,
bio_brotli_free,
@@ -443,12 +443,12 @@ static int bio_brotli_new(BIO *bi)
{
BIO_BROTLI_CTX *ctx;
-# ifdef BROTLI_SHARED
+#ifdef BROTLI_SHARED
if (!RUN_ONCE(&brotli_once, ossl_comp_brotli_init)) {
ERR_raise(ERR_LIB_COMP, COMP_R_BROTLI_NOT_SUPPORTED);
return 0;
}
-# endif
+#endif
ctx = OPENSSL_zalloc(sizeof(*ctx));
if (ctx == NULL) {
ERR_raise(ERR_LIB_COMP, ERR_R_MALLOC_FAILURE);
@@ -468,7 +468,7 @@ static int bio_brotli_new(BIO *bi)
return 1;
- err:
+err:
ERR_raise(ERR_LIB_COMP, ERR_R_MALLOC_FAILURE);
BrotliDecoderDestroyInstance(ctx->decode.state);
BrotliEncoderDestroyInstance(ctx->encode.state);
@@ -533,8 +533,8 @@ static int bio_brotli_read(BIO *b, char *out, int outl)
for (;;) {
/* Decompress while data available */
while (ctx->decode.avail_in > 0 || BrotliDecoderHasMoreOutput(ctx->decode.state)) {
- bret = BrotliDecoderDecompressStream(ctx->decode.state, &ctx->decode.avail_in, (const uint8_t**)&ctx->decode.next_in,
- &ctx->decode.avail_out, &ctx->decode.next_out, NULL);
+ bret = BrotliDecoderDecompressStream(ctx->decode.state, &ctx->decode.avail_in, (const uint8_t **)&ctx->decode.next_in,
+ &ctx->decode.avail_out, &ctx->decode.next_out, NULL);
if (bret == BROTLI_DECODER_RESULT_ERROR) {
ERR_raise(ERR_LIB_COMP, COMP_R_BROTLI_DECODE_ERROR);
ERR_add_error_data(1, BrotliDecoderErrorString(BrotliDecoderGetErrorCode(ctx->decode.state)));
@@ -633,8 +633,8 @@ static int bio_brotli_write(BIO *b, const char *in, int inl)
ctx->encode.next_out = ctx->encode.buf;
ctx->encode.avail_out = ctx->encode.bufsize;
/* Compress some more */
- brret = BrotliEncoderCompressStream(ctx->encode.state, BROTLI_OPERATION_FLUSH, &ctx->encode.avail_in, (const uint8_t**)&ctx->encode.next_in,
- &ctx->encode.avail_out, &ctx->encode.next_out, NULL);
+ brret = BrotliEncoderCompressStream(ctx->encode.state, BROTLI_OPERATION_FLUSH, &ctx->encode.avail_in, (const uint8_t **)&ctx->encode.next_in,
+ &ctx->encode.avail_out, &ctx->encode.next_out, NULL);
if (brret != BROTLI_TRUE) {
ERR_raise(ERR_LIB_COMP, COMP_R_BROTLI_ENCODE_ERROR);
ERR_add_error_data(1, "brotli encoder error");
@@ -683,7 +683,7 @@ static int bio_brotli_flush(BIO *b)
ctx->encode.avail_out = ctx->encode.bufsize;
/* Compress some more */
brret = BrotliEncoderCompressStream(ctx->encode.state, BROTLI_OPERATION_FINISH, &ctx->encode.avail_in,
- (const uint8_t**)&ctx->encode.next_in, &ctx->encode.avail_out, &ctx->encode.next_out, NULL);
+ (const uint8_t **)&ctx->encode.next_in, &ctx->encode.avail_out, &ctx->encode.next_out, NULL);
if (brret != BROTLI_TRUE) {
ERR_raise(ERR_LIB_COMP, COMP_R_BROTLI_ENCODE_ERROR);
ERR_add_error_data(1, "brotli encoder error");
@@ -766,7 +766,7 @@ static long bio_brotli_ctrl(BIO *b, int cmd, long num, void *ptr)
BIO_copy_next_retry(b);
break;
- case BIO_CTRL_WPENDING:
+ case BIO_CTRL_WPENDING:
if (BrotliEncoderHasMoreOutput(ctx->encode.state))
ret = 1;
else
@@ -783,7 +783,6 @@ static long bio_brotli_ctrl(BIO *b, int cmd, long num, void *ptr)
default:
ret = BIO_ctrl(next, cmd, num, ptr);
break;
-
}
return ret;
diff --git a/crypto/comp/c_zlib.c b/crypto/comp/c_zlib.c
index fb447c57fe..602259c821 100644
--- a/crypto/comp/c_zlib.c
+++ b/crypto/comp/c_zlib.c
@@ -21,19 +21,19 @@
COMP_METHOD *COMP_zlib(void);
#ifdef OPENSSL_NO_ZLIB
-# undef ZLIB_SHARED
+#undef ZLIB_SHARED
#else
-# include <zlib.h>
+#include <zlib.h>
static int zlib_stateful_init(COMP_CTX *ctx);
static void zlib_stateful_finish(COMP_CTX *ctx);
static ossl_ssize_t zlib_stateful_compress_block(COMP_CTX *ctx, unsigned char *out,
- size_t olen, unsigned char *in,
- size_t ilen);
+ size_t olen, unsigned char *in,
+ size_t ilen);
static ossl_ssize_t zlib_stateful_expand_block(COMP_CTX *ctx, unsigned char *out,
- size_t olen, unsigned char *in,
- size_t ilen);
+ size_t olen, unsigned char *in,
+ size_t ilen);
/* memory allocations functions for zlib initialisation */
static void *zlib_zalloc(void *opaque, unsigned int no, unsigned int size)
@@ -49,7 +49,6 @@ static void zlib_zfree(void *opaque, void *address)
OPENSSL_free(address);
}
-
static COMP_METHOD zlib_stateful_method = {
NID_zlib_compression,
LN_zlib_compression,
@@ -65,28 +64,28 @@ static COMP_METHOD zlib_stateful_method = {
* work. Therefore, all ZLIB routines are loaded at run time
* and we do not link to a .LIB file when ZLIB_SHARED is set.
*/
-# if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
-# include <windows.h>
-# endif /* !(OPENSSL_SYS_WINDOWS ||
- * OPENSSL_SYS_WIN32) */
+#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
+#include <windows.h>
+#endif /* !(OPENSSL_SYS_WINDOWS || \
+ * OPENSSL_SYS_WIN32) */
-# ifdef ZLIB_SHARED
-# include "internal/dso.h"
+#ifdef ZLIB_SHARED
+#include "internal/dso.h"
/* Function pointers */
-typedef int (*compress_ft) (Bytef *dest, uLongf *destLen,
- const Bytef *source, uLong sourceLen);
-typedef int (*uncompress_ft) (Bytef *dest, uLongf *destLen,
- const Bytef *source, uLong sourceLen);
-typedef int (*inflateEnd_ft) (z_streamp strm);
-typedef int (*inflate_ft) (z_streamp strm, int flush);
-typedef int (*inflateInit__ft) (z_streamp strm,
- const char *version, int stream_size);
-typedef int (*deflateEnd_ft) (z_streamp strm);
-typedef int (*deflate_ft) (z_streamp strm, int flush);
-typedef int (*deflateInit__ft) (z_streamp strm, int level,
- const char *version, int stream_size);
-typedef const char *(*zError__ft) (int err);
+typedef int (*compress_ft)(Bytef *dest, uLongf *destLen,
+ const Bytef *source, uLong sourceLen);
+typedef int (*uncompress_ft)(Bytef *dest, uLongf *destLen,
+ const Bytef *source, uLong sourceLen);
+typedef int (*inflateEnd_ft)(z_streamp strm);
+typedef int (*inflate_ft)(z_streamp strm, int flush);
+typedef int (*inflateInit__ft)(z_streamp strm,
+ const char *version, int stream_size);
+typedef int (*deflateEnd_ft)(z_streamp strm);
+typedef int (*deflate_ft)(z_streamp strm, int flush);
+typedef int (*deflateInit__ft)(z_streamp strm, int level,
+ const char *version, int stream_size);
+typedef const char *(*zError__ft)(int err);
static compress_ft p_compress = NULL;
static uncompress_ft p_uncompress = NULL;
static inflateEnd_ft p_inflateEnd = NULL;
@@ -99,16 +98,16 @@ static zError__ft p_zError = NULL;
static DSO *zlib_dso = NULL;
-# define compress p_compress
-# define uncompress p_uncompress
-# define inflateEnd p_inflateEnd
-# define inflate p_inflate
-# define inflateInit_ p_inflateInit_
-# define deflateEnd p_deflateEnd
-# define deflate p_deflate
-# define deflateInit_ p_deflateInit_
-# define zError p_zError
-# endif /* ZLIB_SHARED */
+#define compress p_compress
+#define uncompress p_uncompress
+#define inflateEnd p_inflateEnd
+#define inflate p_inflate
+#define inflateInit_ p_inflateInit_
+#define deflateEnd p_deflateEnd
+#define deflate p_deflate
+#define deflateInit_ p_deflateInit_
+#define zError p_zError
+#endif /* ZLIB_SHARED */
struct zlib_state {
z_stream istream;
@@ -138,13 +137,13 @@ static int zlib_stateful_init(COMP_CTX *ctx)
state->ostream.next_in = Z_NULL;
state->ostream.next_out = Z_NULL;
err = deflateInit_(&state->ostream, Z_DEFAULT_COMPRESSION,
- ZLIB_VERSION, sizeof(z_stream));
+ ZLIB_VERSION, sizeof(z_stream));
if (err != Z_OK)
goto err;
ctx->data = state;
return 1;
- err:
+err:
OPENSSL_free(state);
return 0;
}
@@ -158,8 +157,8 @@ static void zlib_stateful_finish(COMP_CTX *ctx)
}
static ossl_ssize_t zlib_stateful_compress_block(COMP_CTX *ctx, unsigned char *out,
- size_t olen, unsigned char *in,
- size_t ilen)
+ size_t olen, unsigned char *in,
+ size_t ilen)
{
int err = Z_OK;
struct zlib_state *state = ctx->data;
@@ -181,8 +180,8 @@ static ossl_ssize_t zlib_stateful_compress_block(COMP_CTX *ctx, unsigned char *o
}
static ossl_ssize_t zlib_stateful_expand_block(COMP_CTX *ctx, unsigned char *out,
- size_t olen, unsigned char *in,
- size_t ilen)
+ size_t olen, unsigned char *in,
+ size_t ilen)
{
int err = Z_OK;
struct zlib_state *state = ctx->data;
@@ -215,8 +214,8 @@ static void zlib_oneshot_finish(COMP_CTX *ctx)
}
static ossl_ssize_t zlib_oneshot_compress_block(COMP_CTX *ctx, unsigned char *out,
- size_t olen, unsigned char *in,
- size_t ilen)
+ size_t olen, unsigned char *in,
+ size_t ilen)
{
uLongf out_size;
@@ -237,8 +236,8 @@ static ossl_ssize_t zlib_oneshot_compress_block(COMP_CTX *ctx, unsigned char *ou
}
static ossl_ssize_t zlib_oneshot_expand_block(COMP_CTX *ctx, unsigned char *out,
- size_t olen, unsigned char *in,
- size_t ilen)
+ size_t olen, unsigned char *in,
+ size_t ilen)
{
uLongf out_size;
@@ -270,39 +269,39 @@ static COMP_METHOD zlib_oneshot_method = {
static CRYPTO_ONCE zlib_once = CRYPTO_ONCE_STATIC_INIT;
DEFINE_RUN_ONCE_STATIC(ossl_comp_zlib_init)
{
-# ifdef ZLIB_SHARED
+#ifdef ZLIB_SHARED
/* LIBZ may be externally defined, and we should respect that value */
-# ifndef LIBZ
-# if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
-# define LIBZ "ZLIB1"
-# elif defined(OPENSSL_SYS_VMS)
-# define LIBZ "LIBZ"
-# else
-# define LIBZ "z"
-# endif
-# endif
+#ifndef LIBZ
+#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
+#define LIBZ "ZLIB1"
+#elif defined(OPENSSL_SYS_VMS)
+#define LIBZ "LIBZ"
+#else
+#define LIBZ "z"
+#endif
+#endif
zlib_dso = DSO_load(NULL, LIBZ, NULL, 0);
if (zlib_dso != NULL) {
- p_compress = (compress_ft) DSO_bind_func(zlib_dso, "compress");
- p_uncompress = (compress_ft) DSO_bind_func(zlib_dso, "uncompress");
- p_inflateEnd = (inflateEnd_ft) DSO_bind_func(zlib_dso, "inflateEnd");
- p_inflate = (inflate_ft) DSO_bind_func(zlib_dso, "inflate");
- p_inflateInit_ = (inflateInit__ft) DSO_bind_func(zlib_dso, "inflateInit_");
- p_deflateEnd = (deflateEnd_ft) DSO_bind_func(zlib_dso, "deflateEnd");
- p_deflate = (deflate_ft) DSO_bind_func(zlib_dso, "deflate");
- p_deflateInit_ = (deflateInit__ft) DSO_bind_func(zlib_dso, "deflateInit_");
- p_zError = (zError__ft) DSO_bind_func(zlib_dso, "zError");
+ p_compress = (compress_ft)DSO_bind_func(zlib_dso, "compress");
+ p_uncompress = (compress_ft)DSO_bind_func(zlib_dso, "uncompress");
+ p_inflateEnd = (inflateEnd_ft)DSO_bind_func(zlib_dso, "inflateEnd");
+ p_inflate = (inflate_ft)DSO_bind_func(zlib_dso, "inflate");
+ p_inflateInit_ = (inflateInit__ft)DSO_bind_func(zlib_dso, "inflateInit_");
+ p_deflateEnd = (deflateEnd_ft)DSO_bind_func(zlib_dso, "deflateEnd");
+ p_deflate = (deflate_ft)DSO_bind_func(zlib_dso, "deflate");
+ p_deflateInit_ = (deflateInit__ft)DSO_bind_func(zlib_dso, "deflateInit_");
+ p_zError = (zError__ft)DSO_bind_func(zlib_dso, "zError");
if (p_compress == NULL || p_uncompress == NULL || p_inflateEnd == NULL
- || p_inflate == NULL || p_inflateInit_ == NULL
- || p_deflateEnd == NULL || p_deflate == NULL
- || p_deflateInit_ == NULL || p_zError == NULL) {
+ || p_inflate == NULL || p_inflateInit_ == NULL
+ || p_deflateEnd == NULL || p_deflate == NULL
+ || p_deflateInit_ == NULL || p_zError == NULL) {
ossl_comp_zlib_cleanup();
return 0;
}
}
-# endif
+#endif
return 1;
}
#endif
@@ -345,19 +344,19 @@ void ossl_comp_zlib_cleanup(void)
/* Zlib based compression/decompression filter BIO */
typedef struct {
- unsigned char *ibuf; /* Input buffer */
- int ibufsize; /* Buffer size */
- z_stream zin; /* Input decompress context */
- unsigned char *obuf; /* Output buffer */
- int obufsize; /* Output buffer size */
- unsigned char *optr; /* Position in output buffer */
- int ocount; /* Amount of data in output buffer */
- int odone; /* deflate EOF */
- int comp_level; /* Compression level to use */
- z_stream zout; /* Output compression context */
+ unsigned char *ibuf; /* Input buffer */
+ int ibufsize; /* Buffer size */
+ z_stream zin; /* Input decompress context */
+ unsigned char *obuf; /* Output buffer */
+ int obufsize; /* Output buffer size */
+ unsigned char *optr; /* Position in output buffer */
+ int ocount; /* Amount of data in output buffer */
+ int odone; /* deflate EOF */
+ int comp_level; /* Compression level to use */
+ z_stream zout; /* Output compression context */
} BIO_ZLIB_CTX;
-# define ZLIB_DEFAULT_BUFSIZE 1024
+#define ZLIB_DEFAULT_BUFSIZE 1024
static int bio_zlib_new(BIO *bi);
static int bio_zlib_free(BIO *bi);
@@ -373,8 +372,8 @@ static const BIO_METHOD bio_meth_zlib = {
bio_zlib_write,
bread_conv,
bio_zlib_read,
- NULL, /* bio_zlib_puts, */
- NULL, /* bio_zlib_gets, */
+ NULL, /* bio_zlib_puts, */
+ NULL, /* bio_zlib_gets, */
bio_zlib_ctrl,
bio_zlib_new,
bio_zlib_free,
@@ -396,12 +395,12 @@ static int bio_zlib_new(BIO *bi)
{
BIO_ZLIB_CTX *ctx;
-# ifdef ZLIB_SHARED
+#ifdef ZLIB_SHARED
if (!RUN_ONCE(&zlib_once, ossl_comp_zlib_init)) {
ERR_raise(ERR_LIB_COMP, COMP_R_ZLIB_NOT_SUPPORTED);
return 0;
}
-# endif
+#endif
ctx = OPENSSL_zalloc(sizeof(*ctx));
if (ctx == NULL)
return 0;
@@ -460,7 +459,7 @@ static int bio_zlib_read(BIO *b, char *out, int outl)
return 0;
if ((ret = inflateInit(zin)) != Z_OK) {
ERR_raise_data(ERR_LIB_COMP, COMP_R_ZLIB_INFLATE_ERROR,
- "zlib error: %s", zError(ret));
+ "zlib error: %s", zError(ret));
return 0;
}
zin->next_in = ctx->ibuf;
@@ -476,7 +475,7 @@ static int bio_zlib_read(BIO *b, char *out, int outl)
ret = inflate(zin, 0);
if ((ret != Z_OK) && (ret != Z_STREAM_END)) {
ERR_raise_data(ERR_LIB_COMP, COMP_R_ZLIB_INFLATE_ERROR,
- "zlib error: %s", zError(ret));
+ "zlib error: %s", zError(ret));
return 0;
}
/* If EOF or we've read everything then return */
@@ -525,7 +524,7 @@ static int bio_zlib_write(BIO *b, const char *in, int inl)
ctx->ocount = 0;
if ((ret = deflateInit(zout, ctx->comp_level)) != Z_OK) {
ERR_raise_data(ERR_LIB_COMP, COMP_R_ZLIB_DEFLATE_ERROR,
- "zlib error: %s", zError(ret));
+ "zlib error: %s", zError(ret));
return 0;
}
zout->next_out = ctx->obuf;
@@ -564,7 +563,7 @@ static int bio_zlib_write(BIO *b, const char *in, int inl)
ret = deflate(zout, 0);
if (ret != Z_OK) {
ERR_raise_data(ERR_LIB_COMP, COMP_R_ZLIB_DEFLATE_ERROR,
- "zlib error: %s", zError(ret));
+ "zlib error: %s", zError(ret));
return 0;
}
ctx->ocount = ctx->obufsize - zout->avail_out;
@@ -613,7 +612,7 @@ static int bio_zlib_flush(BIO *b)
ctx->odone = 1;
else if (ret != Z_OK) {
ERR_raise_data(ERR_LIB_COMP, COMP_R_ZLIB_DEFLATE_ERROR,
- "zlib error: %s", zError(ret));
+ "zlib error: %s", zError(ret));
return 0;
}
ctx->ocount = ctx->obufsize - zout->avail_out;
@@ -705,7 +704,6 @@ static long bio_zlib_ctrl(BIO *b, int cmd, long num, void *ptr)
default:
ret = BIO_ctrl(next, cmd, num, ptr);
break;
-
}
return ret;
diff --git a/crypto/comp/c_zstd.c b/crypto/comp/c_zstd.c
index 193e3d8654..a9c881f8f9 100644
--- a/crypto/comp/c_zstd.c
+++ b/crypto/comp/c_zstd.c
@@ -26,24 +26,24 @@
COMP_METHOD *COMP_zstd(void);
#ifdef OPENSSL_NO_ZSTD
-# undef ZSTD_SHARED
+#undef ZSTD_SHARED
#else
-# ifndef ZSTD_SHARED
-# define ZSTD_STATIC_LINKING_ONLY
-# endif
-# include <zstd.h>
+#ifndef ZSTD_SHARED
+#define ZSTD_STATIC_LINKING_ONLY
+#endif
+#include <zstd.h>
/* Note: There is also a linux zstd.h file in the kernel source */
-# ifndef ZSTD_H_235446
-# error Wrong (i.e. linux) zstd.h included.
-# endif
+#ifndef ZSTD_H_235446
+#error Wrong (i.e. linux) zstd.h included.
+#endif
-# if ZSTD_VERSION_MAJOR != 1 || ZSTD_VERSION_MINOR < 4
-# error Expecting version 1.4 or greater of ZSTD 1.x
-# endif
+#if ZSTD_VERSION_MAJOR != 1 || ZSTD_VERSION_MINOR < 4
+#error Expecting version 1.4 or greater of ZSTD 1.x
+#endif
-# ifndef ZSTD_SHARED
+#ifndef ZSTD_SHARED
/* memory allocations functions for zstd initialisation */
static void *zstd_alloc(void *opaque, size_t size)
{
@@ -60,7 +60,7 @@ static ZSTD_customMem zstd_mem_funcs = {
zstd_free,
NULL
};
-# endif
+#endif
/*
* When OpenSSL is built on Windows, we do not want to require that
@@ -68,28 +68,28 @@ static ZSTD_customMem zstd_mem_funcs = {
* work. Therefore, all ZSTD routines are loaded at run time
* and we do not link to a .LIB file when ZSTD_SHARED is set.
*/
-# if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
-# include <windows.h>
-# endif
+#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
+#include <windows.h>
+#endif
-# ifdef ZSTD_SHARED
-# include "internal/dso.h"
+#ifdef ZSTD_SHARED
+#include "internal/dso.h"
/* Function pointers */
-typedef ZSTD_CStream* (*createCStream_ft)(void);
-typedef size_t (*initCStream_ft)(ZSTD_CStream*, int);
-typedef size_t (*freeCStream_ft)(ZSTD_CStream*);
-typedef size_t (*compressStream2_ft)(ZSTD_CCtx*, ZSTD_outBuffer*, ZSTD_inBuffer*, ZSTD_EndDirective);
-typedef size_t (*flushStream_ft)(ZSTD_CStream*, ZSTD_outBuffer*);
-typedef size_t (*endStream_ft)(ZSTD_CStream*, ZSTD_outBuffer*);
-typedef size_t (*compress_ft)(void*, size_t, const void*, size_t, int);
-typedef ZSTD_DStream* (*createDStream_ft)(void);
-typedef size_t (*initDStream_ft)(ZSTD_DStream*);
-typedef size_t (*freeDStream_ft)(ZSTD_DStream*);
-typedef size_t (*decompressStream_ft)(ZSTD_DStream*, ZSTD_outBuffer*, ZSTD_inBuffer*);
-typedef size_t (*decompress_ft)(void*, size_t, const void*, size_t);
+typedef ZSTD_CStream *(*createCStream_ft)(void);
+typedef size_t (*initCStream_ft)(ZSTD_CStream *, int);
+typedef size_t (*freeCStream_ft)(ZSTD_CStream *);
+typedef size_t (*compressStream2_ft)(ZSTD_CCtx *, ZSTD_outBuffer *, ZSTD_inBuffer *, ZSTD_EndDirective);
+typedef size_t (*flushStream_ft)(ZSTD_CStream *, ZSTD_outBuffer *);
+typedef size_t (*endStream_ft)(ZSTD_CStream *, ZSTD_outBuffer *);
+typedef size_t (*compress_ft)(void *, size_t, const void *, size_t, int);
+typedef ZSTD_DStream *(*createDStream_ft)(void);
+typedef size_t (*initDStream_ft)(ZSTD_DStream *);
+typedef size_t (*freeDStream_ft)(ZSTD_DStream *);
+typedef size_t (*decompressStream_ft)(ZSTD_DStream *, ZSTD_outBuffer *, ZSTD_inBuffer *);
+typedef size_t (*decompress_ft)(void *, size_t, const void *, size_t);
typedef unsigned (*isError_ft)(size_t);
-typedef const char* (*getErrorName_ft)(size_t);
+typedef const char *(*getErrorName_ft)(size_t);
typedef size_t (*DStreamInSize_ft)(void);
typedef size_t (*CStreamInSize_ft)(void);
@@ -112,24 +112,24 @@ static CStreamInSize_ft p_CStreamInSize = NULL;
static DSO *zstd_dso = NULL;
-# define ZSTD_createCStream p_createCStream
-# define ZSTD_initCStream p_initCStream
-# define ZSTD_freeCStream p_freeCStream
-# define ZSTD_compressStream2 p_compressStream2
-# define ZSTD_flushStream p_flushStream
-# define ZSTD_endStream p_endStream
-# define ZSTD_compress p_compress
-# define ZSTD_createDStream p_createDStream
-# define ZSTD_initDStream p_initDStream
-# define ZSTD_freeDStream p_freeDStream
-# define ZSTD_decompressStream p_decompressStream
-# define ZSTD_decompress p_decompress
-# define ZSTD_isError p_isError
-# define ZSTD_getErrorName p_getErrorName
-# define ZSTD_DStreamInSize p_DStreamInSize
-# define ZSTD_CStreamInSize p_CStreamInSize
-
-# endif /* ifdef ZSTD_SHARED */
+#define ZSTD_createCStream p_createCStream
+#define ZSTD_initCStream p_initCStream
+#define ZSTD_freeCStream p_freeCStream
+#define ZSTD_compressStream2 p_compressStream2
+#define ZSTD_flushStream p_flushStream
+#define ZSTD_endStream p_endStream
+#define ZSTD_compress p_compress
+#define ZSTD_createDStream p_createDStream
+#define ZSTD_initDStream p_initDStream
+#define ZSTD_freeDStream p_freeDStream
+#define ZSTD_decompressStream p_decompressStream
+#define ZSTD_decompress p_decompress
+#define ZSTD_isError p_isError
+#define ZSTD_getErrorName p_getErrorName
+#define ZSTD_DStreamInSize p_DStreamInSize
+#define ZSTD_CStreamInSize p_CStreamInSize
+
+#endif /* ifdef ZSTD_SHARED */
struct zstd_state {
ZSTD_CStream *compressor;
@@ -143,27 +143,27 @@ static int zstd_stateful_init(COMP_CTX *ctx)
if (state == NULL)
return 0;
-# ifdef ZSTD_SHARED
+#ifdef ZSTD_SHARED
state->compressor = ZSTD_createCStream();
-# else
+#else
state->compressor = ZSTD_createCStream_advanced(zstd_mem_funcs);
-# endif
+#endif
if (state->compressor == NULL)
goto err;
ZSTD_initCStream(state->compressor, ZSTD_CLEVEL_DEFAULT);
-# ifdef ZSTD_SHARED
+#ifdef ZSTD_SHARED
state->decompressor = ZSTD_createDStream();
-# else
+#else
state->decompressor = ZSTD_createDStream_advanced(zstd_mem_funcs);
-# endif
+#endif
if (state->decompressor == NULL)
goto err;
ZSTD_initDStream(state->decompressor);
ctx->data = state;
return 1;
- err:
+err:
ZSTD_freeCStream(state->compressor);
ZSTD_freeDStream(state->decompressor);
OPENSSL_free(state);
@@ -183,8 +183,8 @@ static void zstd_stateful_finish(COMP_CTX *ctx)
}
static ossl_ssize_t zstd_stateful_compress_block(COMP_CTX *ctx, unsigned char *out,
- size_t olen, unsigned char *in,
- size_t ilen)
+ size_t olen, unsigned char *in,
+ size_t ilen)
{
ZSTD_inBuffer inbuf;
ZSTD_outBuffer outbuf;
@@ -232,7 +232,7 @@ static ossl_ssize_t zstd_stateful_compress_block(COMP_CTX *ctx, unsigned char *o
if (ZSTD_isError(ret))
return -1;
- end:
+end:
if (outbuf.pos > OSSL_SSIZE_MAX)
return -1;
fret = (ossl_ssize_t)outbuf.pos;
@@ -242,8 +242,8 @@ static ossl_ssize_t zstd_stateful_compress_block(COMP_CTX *ctx, unsigned char *o
}
static ossl_ssize_t zstd_stateful_expand_block(COMP_CTX *ctx, unsigned char *out,
- size_t olen, unsigned char *in,
- size_t ilen)
+ size_t olen, unsigned char *in,
+ size_t ilen)
{
ZSTD_inBuffer inbuf;
ZSTD_outBuffer outbuf;
@@ -283,7 +283,6 @@ static ossl_ssize_t zstd_stateful_expand_block(COMP_CTX *ctx, unsigned char *out
return fret;
}
-
static COMP_METHOD zstd_stateful_method = {
NID_zstd,
LN_zstd,
@@ -303,8 +302,8 @@ static void zstd_oneshot_finish(COMP_CTX *ctx)
}
static ossl_ssize_t zstd_oneshot_compress_block(COMP_CTX *ctx, unsigned char *out,
- size_t olen, unsigned char *in,
- size_t ilen)
+ size_t olen, unsigned char *in,
+ size_t ilen)
{
size_t out_size;
ossl_ssize_t ret;
@@ -326,8 +325,8 @@ static ossl_ssize_t zstd_oneshot_compress_block(COMP_CTX *ctx, unsigned char *ou
}
static ossl_ssize_t zstd_oneshot_expand_block(COMP_CTX *ctx, unsigned char *out,
- size_t olen, unsigned char *in,
- size_t ilen)
+ size_t olen, unsigned char *in,
+ size_t ilen)
{
size_t out_size;
ossl_ssize_t ret;
@@ -360,12 +359,12 @@ static COMP_METHOD zstd_oneshot_method = {
static CRYPTO_ONCE zstd_once = CRYPTO_ONCE_STATIC_INIT;
DEFINE_RUN_ONCE_STATIC(ossl_comp_zstd_init)
{
-# ifdef ZSTD_SHARED
-# if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
-# define LIBZSTD "LIBZSTD"
-# else
-# define LIBZSTD "zstd"
-# endif
+#ifdef ZSTD_SHARED
+#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
+#define LIBZSTD "LIBZSTD"
+#else
+#define LIBZSTD "zstd"
+#endif
zstd_dso = DSO_load(NULL, LIBZSTD, NULL, 0);
if (zstd_dso != NULL) {
@@ -388,15 +387,15 @@ DEFINE_RUN_ONCE_STATIC(ossl_comp_zstd_init)
}
if (p_createCStream == NULL || p_initCStream == NULL || p_freeCStream == NULL
- || p_compressStream2 == NULL || p_flushStream == NULL || p_endStream == NULL
- || p_compress == NULL || p_createDStream == NULL || p_initDStream == NULL
- || p_freeDStream == NULL || p_decompressStream == NULL || p_decompress == NULL
- || p_isError == NULL || p_getErrorName == NULL || p_DStreamInSize == NULL
- || p_CStreamInSize == NULL) {
+ || p_compressStream2 == NULL || p_flushStream == NULL || p_endStream == NULL
+ || p_compress == NULL || p_createDStream == NULL || p_initDStream == NULL
+ || p_freeDStream == NULL || p_decompressStream == NULL || p_decompress == NULL
+ || p_isError == NULL || p_getErrorName == NULL || p_DStreamInSize == NULL
+ || p_CStreamInSize == NULL) {
ossl_comp_zstd_cleanup();
return 0;
}
-# endif
+#endif
return 1;
}
#endif /* ifndef ZSTD / else */
@@ -457,7 +456,7 @@ typedef struct {
ZSTD_DStream *state;
ZSTD_inBuffer inbuf; /* has const src */
size_t bufsize;
- void* buffer;
+ void *buffer;
} decompress;
struct { /* output structure */
ZSTD_CStream *state;
@@ -467,7 +466,7 @@ typedef struct {
} compress;
} BIO_ZSTD_CTX;
-# define ZSTD_DEFAULT_BUFSIZE 1024
+#define ZSTD_DEFAULT_BUFSIZE 1024
static int bio_zstd_new(BIO *bi);
static int bio_zstd_free(BIO *bi);
@@ -485,8 +484,8 @@ static const BIO_METHOD bio_meth_zstd = {
/* TODO: Convert to new style read function */
bread_conv,
bio_zstd_read,
- NULL, /* bio_zstd_puts, */
- NULL, /* bio_zstd_gets, */
+ NULL, /* bio_zstd_puts, */
+ NULL, /* bio_zstd_gets, */
bio_zstd_ctrl,
bio_zstd_new,
bio_zstd_free,
@@ -508,34 +507,34 @@ static int bio_zstd_new(BIO *bi)
{
BIO_ZSTD_CTX *ctx;
-# ifdef ZSTD_SHARED
+#ifdef ZSTD_SHARED
(void)COMP_zstd();
if (zstd_dso == NULL) {
ERR_raise(ERR_LIB_COMP, COMP_R_ZSTD_NOT_SUPPORTED);
return 0;
}
-# endif
+#endif
ctx = OPENSSL_zalloc(sizeof(*ctx));
if (ctx == NULL) {
ERR_raise(ERR_LIB_COMP, ERR_R_MALLOC_FAILURE);
return 0;
}
-# ifdef ZSTD_SHARED
- ctx->decompress.state = ZSTD_createDStream();
-# else
- ctx->decompress.state = ZSTD_createDStream_advanced(zstd_mem_funcs);
-# endif
+#ifdef ZSTD_SHARED
+ ctx->decompress.state = ZSTD_createDStream();
+#else
+ ctx->decompress.state = ZSTD_createDStream_advanced(zstd_mem_funcs);
+#endif
if (ctx->decompress.state == NULL)
goto err;
ZSTD_initDStream(ctx->decompress.state);
ctx->decompress.bufsize = ZSTD_DStreamInSize();
-# ifdef ZSTD_SHARED
+#ifdef ZSTD_SHARED
ctx->compress.state = ZSTD_createCStream();
-# else
+#else
ctx->compress.state = ZSTD_createCStream_advanced(zstd_mem_funcs);
-# endif
+#endif
if (ctx->compress.state == NULL)
goto err;
ZSTD_initCStream(ctx->compress.state, ZSTD_CLEVEL_DEFAULT);
@@ -545,7 +544,7 @@ static int bio_zstd_new(BIO *bi)
BIO_set_data(bi, ctx);
return 1;
- err:
+err:
ERR_raise(ERR_LIB_COMP, ERR_R_MALLOC_FAILURE);
ZSTD_freeDStream(ctx->decompress.state);
ZSTD_freeCStream(ctx->compress.state);
@@ -668,8 +667,8 @@ static int bio_zstd_write(BIO *b, const char *in, int inl)
for (;;) {
/* If data in output buffer write it first */
while (ctx->compress.write_pos < ctx->compress.outbuf.pos) {
- ret = BIO_write(next, (unsigned char*)ctx->compress.outbuf.dst + ctx->compress.write_pos,
- (int)(ctx->compress.outbuf.pos - ctx->compress.write_pos));
+ ret = BIO_write(next, (unsigned char *)ctx->compress.outbuf.dst + ctx->compress.write_pos,
+ (int)(ctx->compress.outbuf.pos - ctx->compress.write_pos));
if (ret <= 0) {
BIO_copy_next_retry(b);
if (ret < 0 && inBuf.pos == 0)
@@ -720,8 +719,8 @@ static int bio_zstd_flush(BIO *b)
for (;;) {
/* If data in output buffer write it first */
while (ctx->compress.write_pos < ctx->compress.outbuf.pos) {
- ret = BIO_write(next, (unsigned char*)ctx->compress.outbuf.dst + ctx->compress.write_pos,
- (int)(ctx->compress.outbuf.pos - ctx->compress.write_pos));
+ ret = BIO_write(next, (unsigned char *)ctx->compress.outbuf.dst + ctx->compress.write_pos,
+ (int)(ctx->compress.outbuf.pos - ctx->compress.write_pos));
if (ret <= 0) {
BIO_copy_next_retry(b);
return ret;
@@ -826,7 +825,7 @@ static long bio_zstd_ctrl(BIO *b, int cmd, long num, void *ptr)
BIO_copy_next_retry(b);
break;
- case BIO_CTRL_WPENDING:
+ case BIO_CTRL_WPENDING:
if (ctx->compress.outbuf.pos < ctx->compress.outbuf.size)
ret = 1;
else
@@ -843,7 +842,6 @@ static long bio_zstd_ctrl(BIO *b, int cmd, long num, void *ptr)
default:
ret = BIO_ctrl(next, cmd, num, ptr);
break;
-
}
return ret;
diff --git a/crypto/comp/comp_err.c b/crypto/comp/comp_err.c
index 2345da693e..0aa0dc6302 100644
--- a/crypto/comp/comp_err.c
+++ b/crypto/comp/comp_err.c
@@ -14,39 +14,39 @@
#ifndef OPENSSL_NO_COMP
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA COMP_str_reasons[] = {
- {ERR_PACK(ERR_LIB_COMP, 0, COMP_R_BROTLI_DECODE_ERROR),
- "brotli decode error"},
- {ERR_PACK(ERR_LIB_COMP, 0, COMP_R_BROTLI_ENCODE_ERROR),
- "brotli encode error"},
- {ERR_PACK(ERR_LIB_COMP, 0, COMP_R_BROTLI_NOT_SUPPORTED),
- "brotli not supported"},
- {ERR_PACK(ERR_LIB_COMP, 0, COMP_R_ZLIB_DEFLATE_ERROR),
- "zlib deflate error"},
- {ERR_PACK(ERR_LIB_COMP, 0, COMP_R_ZLIB_INFLATE_ERROR),
- "zlib inflate error"},
- {ERR_PACK(ERR_LIB_COMP, 0, COMP_R_ZLIB_NOT_SUPPORTED),
- "zlib not supported"},
- {ERR_PACK(ERR_LIB_COMP, 0, COMP_R_ZSTD_COMPRESS_ERROR),
- "zstd compress error"},
- {ERR_PACK(ERR_LIB_COMP, 0, COMP_R_ZSTD_DECODE_ERROR), "zstd decode error"},
- {ERR_PACK(ERR_LIB_COMP, 0, COMP_R_ZSTD_DECOMPRESS_ERROR),
- "zstd decompress error"},
- {ERR_PACK(ERR_LIB_COMP, 0, COMP_R_ZSTD_NOT_SUPPORTED),
- "zstd not supported"},
- {0, NULL}
+ { ERR_PACK(ERR_LIB_COMP, 0, COMP_R_BROTLI_DECODE_ERROR),
+ "brotli decode error" },
+ { ERR_PACK(ERR_LIB_COMP, 0, COMP_R_BROTLI_ENCODE_ERROR),
+ "brotli encode error" },
+ { ERR_PACK(ERR_LIB_COMP, 0, COMP_R_BROTLI_NOT_SUPPORTED),
+ "brotli not supported" },
+ { ERR_PACK(ERR_LIB_COMP, 0, COMP_R_ZLIB_DEFLATE_ERROR),
+ "zlib deflate error" },
+ { ERR_PACK(ERR_LIB_COMP, 0, COMP_R_ZLIB_INFLATE_ERROR),
+ "zlib inflate error" },
+ { ERR_PACK(ERR_LIB_COMP, 0, COMP_R_ZLIB_NOT_SUPPORTED),
+ "zlib not supported" },
+ { ERR_PACK(ERR_LIB_COMP, 0, COMP_R_ZSTD_COMPRESS_ERROR),
+ "zstd compress error" },
+ { ERR_PACK(ERR_LIB_COMP, 0, COMP_R_ZSTD_DECODE_ERROR), "zstd decode error" },
+ { ERR_PACK(ERR_LIB_COMP, 0, COMP_R_ZSTD_DECOMPRESS_ERROR),
+ "zstd decompress error" },
+ { ERR_PACK(ERR_LIB_COMP, 0, COMP_R_ZSTD_NOT_SUPPORTED),
+ "zstd not supported" },
+ { 0, NULL }
};
-# endif
+#endif
int ossl_err_load_COMP_strings(void)
{
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(COMP_str_reasons[0].error) == NULL)
ERR_load_strings_const(COMP_str_reasons);
-# endif
+#endif
return 1;
}
#else
diff --git a/crypto/comp/comp_lib.c b/crypto/comp/comp_lib.c
index 7105c2cb63..d0b0b227b5 100644
--- a/crypto/comp/comp_lib.c
+++ b/crypto/comp/comp_lib.c
@@ -62,7 +62,7 @@ void COMP_CTX_free(COMP_CTX *ctx)
}
int COMP_compress_block(COMP_CTX *ctx, unsigned char *out, int olen,
- unsigned char *in, int ilen)
+ unsigned char *in, int ilen)
{
int ret;
if (ctx->meth->compress == NULL) {
@@ -77,7 +77,7 @@ int COMP_compress_block(COMP_CTX *ctx, unsigned char *out, int olen,
}
int COMP_expand_block(COMP_CTX *ctx, unsigned char *out, int olen,
- unsigned char *in, int ilen)
+ unsigned char *in, int ilen)
{
int ret;
@@ -92,7 +92,7 @@ int COMP_expand_block(COMP_CTX *ctx, unsigned char *out, int olen,
return ret;
}
-int COMP_CTX_get_type(const COMP_CTX* comp)
+int COMP_CTX_get_type(const COMP_CTX *comp)
{
return comp->meth ? comp->meth->type : NID_undef;
}
diff --git a/crypto/comp/comp_local.h b/crypto/comp/comp_local.h
index d8be9271a0..fbc5ab318c 100644
--- a/crypto/comp/comp_local.h
+++ b/crypto/comp/comp_local.h
@@ -8,16 +8,16 @@
*/
struct comp_method_st {
- int type; /* NID for compression library */
- const char *name; /* A text string to identify the library */
- int (*init) (COMP_CTX *ctx);
- void (*finish) (COMP_CTX *ctx);
- ossl_ssize_t (*compress) (COMP_CTX *ctx,
- unsigned char *out, size_t olen,
- unsigned char *in, size_t ilen);
- ossl_ssize_t (*expand) (COMP_CTX *ctx,
- unsigned char *out, size_t olen,
- unsigned char *in, size_t ilen);
+ int type; /* NID for compression library */
+ const char *name; /* A text string to identify the library */
+ int (*init)(COMP_CTX *ctx);
+ void (*finish)(COMP_CTX *ctx);
+ ossl_ssize_t (*compress)(COMP_CTX *ctx,
+ unsigned char *out, size_t olen,
+ unsigned char *in, size_t ilen);
+ ossl_ssize_t (*expand)(COMP_CTX *ctx,
+ unsigned char *out, size_t olen,
+ unsigned char *in, size_t ilen);
};
struct comp_ctx_st {
@@ -26,5 +26,5 @@ struct comp_ctx_st {
unsigned long compress_out;
unsigned long expand_in;
unsigned long expand_out;
- void* data;
+ void *data;
};
diff --git a/crypto/comp_methods.c b/crypto/comp_methods.c
index d4f00c1a54..2b282dc0e1 100644
--- a/crypto/comp_methods.c
+++ b/crypto/comp_methods.c
@@ -14,9 +14,9 @@
#include "internal/cryptlib.h"
#include "internal/comp.h"
-#define SSL_COMP_NULL_IDX 0
-#define SSL_COMP_ZLIB_IDX 1
-#define SSL_COMP_NUM_IDX 2
+#define SSL_COMP_NULL_IDX 0
+#define SSL_COMP_ZLIB_IDX 1
+#define SSL_COMP_NUM_IDX 2
#ifndef OPENSSL_NO_COMP
static int sk_comp_cmp(const SSL_COMP *const *a, const SSL_COMP *const *b)
diff --git a/crypto/conf/conf_api.c b/crypto/conf/conf_api.c
index 4c03328a59..0e43990811 100644
--- a/crypto/conf/conf_api.c
+++ b/crypto/conf/conf_api.c
@@ -32,7 +32,7 @@ CONF_VALUE *_CONF_get_section(const CONF *conf, const char *section)
}
STACK_OF(CONF_VALUE) *_CONF_get_section_values(const CONF *conf,
- const char *section)
+ const char *section)
{
CONF_VALUE *v;
@@ -64,7 +64,7 @@ int _CONF_add_string(CONF *conf, CONF_VALUE *section, CONF_VALUE *value)
}
char *_CONF_get_string(const CONF *conf, const char *section,
- const char *name)
+ const char *name)
{
CONF_VALUE *v, vv;
char *p;
@@ -205,7 +205,7 @@ CONF_VALUE *_CONF_new_section(CONF *conf, const char *section)
goto err;
return v;
- err:
+err:
sk_CONF_VALUE_free(sk);
if (v != NULL)
OPENSSL_free(v->section);
diff --git a/crypto/conf/conf_def.c b/crypto/conf/conf_def.c
index b8e7195ae9..e41fdbe6c7 100644
--- a/crypto/conf/conf_def.c
+++ b/crypto/conf/conf_def.c
@@ -13,8 +13,8 @@
#include <string.h>
#include "internal/e_os.h" /* struct stat */
#ifdef __TANDEM
-# include <sys/types.h> /* needed for stat.h */
-# include <sys/stat.h> /* struct stat */
+#include <sys/types.h> /* needed for stat.h */
+#include <sys/stat.h> /* struct stat */
#endif
#include "internal/cryptlib.h"
#include "internal/o_dir.h"
@@ -26,21 +26,21 @@
#include <openssl/buffer.h>
#include <openssl/err.h>
#ifndef OPENSSL_NO_POSIX_IO
-# include <sys/stat.h>
-# ifdef _WIN32
-# define stat _stat
-# endif
+#include <sys/stat.h>
+#ifdef _WIN32
+#define stat _stat
+#endif
#endif
#ifndef S_ISDIR
-# define S_ISDIR(a) (((a) & S_IFMT) == S_IFDIR)
+#define S_ISDIR(a) (((a) & S_IFMT) == S_IFDIR)
#endif
/*
* The maximum length we can grow a value to after variable expansion. 64k
* should be more than enough for all reasonable uses.
*/
-#define MAX_CONF_VALUE_LENGTH 65536
+#define MAX_CONF_VALUE_LENGTH 65536
static int is_keytype(const CONF *conf, char c, unsigned short type);
static char *eat_ws(CONF *conf, char *p);
@@ -50,10 +50,10 @@ static void clear_comments(CONF *conf, char *p);
static int str_copy(CONF *conf, char *section, char **to, char *from);
static char *scan_quote(CONF *conf, char *p);
static char *scan_dquote(CONF *conf, char *p);
-#define scan_esc(conf,p) (((IS_EOF((conf),(p)[1]))?((p)+1):((p)+2)))
+#define scan_esc(conf, p) (((IS_EOF((conf), (p)[1])) ? ((p) + 1) : ((p) + 2)))
#ifndef OPENSSL_NO_POSIX_IO
static BIO *process_include(char *include, OPENSSL_DIR_CTX **dirctx,
- char **dirpath);
+ char **dirpath);
static BIO *get_next_file(const char *path, OPENSSL_DIR_CTX **dirctx);
#endif
@@ -188,7 +188,6 @@ static int def_load(CONF *conf, const char *name, long *line)
return ret;
}
-
/* Parse a boolean value and fill in *flag. Return 0 on error. */
static int parsebool(const char *pval, int *flag)
{
@@ -196,7 +195,7 @@ static int parsebool(const char *pval, int *flag)
|| OPENSSL_strcasecmp(pval, "true") == 0) {
*flag = 1;
} else if (OPENSSL_strcasecmp(pval, "off") == 0
- || OPENSSL_strcasecmp(pval, "false") == 0) {
+ || OPENSSL_strcasecmp(pval, "false") == 0) {
*flag = 0;
} else {
ERR_raise(ERR_LIB_CONF, CONF_R_INVALID_PRAGMA);
@@ -208,7 +207,7 @@ static int parsebool(const char *pval, int *flag)
static int def_load_bio(CONF *conf, BIO *in, long *line)
{
/* The macro BUFSIZE conflicts with a system macro in VxWorks */
-#define CONFBUFSIZE 512
+#define CONFBUFSIZE 512
int bufnum = 0, i, ii;
BUF_MEM *buff = NULL;
char *s, *p, *end;
@@ -259,7 +258,7 @@ static int def_load_bio(CONF *conf, BIO *in, long *line)
}
p = &(buff->data[bufnum]);
*p = '\0';
- read_retry:
+ read_retry:
if (in != NULL && BIO_gets(in, p, CONFBUFSIZE - 1) < 0)
goto err;
p[CONFBUFSIZE - 1] = '\0';
@@ -267,7 +266,7 @@ static int def_load_bio(CONF *conf, BIO *in, long *line)
if (first_call) {
/* Other BOMs imply unsupported multibyte encoding,
* so don't strip them and let the error raise */
- const unsigned char utf8_bom[3] = {0xEF, 0xBB, 0xBF};
+ const unsigned char utf8_bom[3] = { 0xEF, 0xBB, 0xBF };
if (i >= 3 && memcmp(p, utf8_bom, 3) == 0) {
memmove(p, p + 3, i - 3);
@@ -317,10 +316,10 @@ static int def_load_bio(CONF *conf, BIO *in, long *line)
* we removed some trailing stuff so there is a new line on the end.
*/
if (ii && i == ii)
- again = 1; /* long line */
+ again = 1; /* long line */
else {
p[i] = '\0';
- eline++; /* another input line */
+ eline++; /* another input line */
}
/* we now have a line with trailing \r\n removed */
@@ -349,14 +348,14 @@ static int def_load_bio(CONF *conf, BIO *in, long *line)
clear_comments(conf, buf);
s = eat_ws(conf, buf);
if (IS_EOF(conf, *s))
- continue; /* blank line */
+ continue; /* blank line */
if (*s == '[') {
char *ss;
s++;
start = eat_ws(conf, s);
ss = start;
- again:
+ again:
end = eat_alpha_numeric(conf, ss);
p = eat_ws(conf, end);
if (*p != ']') {
@@ -485,7 +484,7 @@ static int def_load_bio(CONF *conf, BIO *in, long *line)
}
if (conf->flag_abspath
- && !ossl_is_absolute_path(include_path)) {
+ && !ossl_is_absolute_path(include_path)) {
ERR_raise(ERR_LIB_CONF, CONF_R_RELATIVE_PATH);
OPENSSL_free(include_path);
goto err;
@@ -523,7 +522,7 @@ static int def_load_bio(CONF *conf, BIO *in, long *line)
continue;
} else if (*p != '=') {
ERR_raise_data(ERR_LIB_CONF, CONF_R_MISSING_EQUAL_SIGN,
- "HERE-->%s", p);
+ "HERE-->%s", p);
goto err;
}
*end = '\0';
@@ -546,7 +545,7 @@ static int def_load_bio(CONF *conf, BIO *in, long *line)
tv = _CONF_new_section(conf, psection);
if (tv == NULL) {
ERR_raise(ERR_LIB_CONF,
- CONF_R_UNABLE_TO_CREATE_NEW_SECTION);
+ CONF_R_UNABLE_TO_CREATE_NEW_SECTION);
goto err;
}
} else
@@ -567,7 +566,7 @@ static int def_load_bio(CONF *conf, BIO *in, long *line)
sk_BIO_free(biosk);
return 1;
- err:
+err:
BUF_MEM_free(buff);
OPENSSL_free(section);
/*
@@ -697,9 +696,9 @@ static int str_copy(CONF *conf, char *section, char **pto, char *from)
} else if (IS_EOF(conf, *from))
break;
else if (*from == '$'
- && (!conf->flag_dollarid
- || from[1] == '{'
- || from[1] == '(')) {
+ && (!conf->flag_dollarid
+ || from[1] == '{'
+ || from[1] == '(')) {
size_t newsize;
/* try to expand it */
@@ -717,7 +716,7 @@ static int str_copy(CONF *conf, char *section, char **pto, char *from)
cp = section;
e = np = s;
while (IS_ALNUM(conf, *e)
- || (conf->flag_dollarid && IS_DOLLAR(conf, *e)))
+ || (conf->flag_dollarid && IS_DOLLAR(conf, *e)))
e++;
if ((e[0] == ':') && (e[1] == ':')) {
cp = np;
@@ -727,7 +726,7 @@ static int str_copy(CONF *conf, char *section, char **pto, char *from)
e += 2;
np = e;
while (IS_ALNUM(conf, *e)
- || (conf->flag_dollarid && IS_DOLLAR(conf, *e)))
+ || (conf->flag_dollarid && IS_DOLLAR(conf, *e)))
e++;
}
r = *e;
@@ -786,7 +785,7 @@ static int str_copy(CONF *conf, char *section, char **pto, char *from)
*pto = buf->data;
OPENSSL_free(buf);
return 1;
- err:
+err:
BUF_MEM_free(buf);
return 0;
}
@@ -798,7 +797,7 @@ static int str_copy(CONF *conf, char *section, char **pto, char *from)
* also an opened directory context and the include path.
*/
static BIO *process_include(char *include, OPENSSL_DIR_CTX **dirctx,
- char **dirpath)
+ char **dirpath)
{
struct stat st;
BIO *next;
@@ -812,7 +811,7 @@ static BIO *process_include(char *include, OPENSSL_DIR_CTX **dirctx,
if (S_ISDIR(st.st_mode)) {
if (*dirctx != NULL) {
ERR_raise_data(ERR_LIB_CONF, CONF_R_RECURSIVE_DIRECTORY_INCLUDE,
- "%s", include);
+ "%s", include);
return NULL;
}
/* a directory, load its contents */
@@ -840,9 +839,8 @@ static BIO *get_next_file(const char *path, OPENSSL_DIR_CTX **dirctx)
namelen = strlen(filename);
-
if ((namelen > 5
- && OPENSSL_strcasecmp(filename + namelen - 5, ".conf") == 0)
+ && OPENSSL_strcasecmp(filename + namelen - 5, ".conf") == 0)
|| (namelen > 4
&& OPENSSL_strcasecmp(filename + namelen - 4, ".cnf") == 0)) {
size_t newlen;
@@ -886,16 +884,16 @@ static BIO *get_next_file(const char *path, OPENSSL_DIR_CTX **dirctx)
static int is_keytype(const CONF *conf, char c, unsigned short type)
{
- const unsigned short *keytypes = (const unsigned short *) conf->meth_data;
+ const unsigned short *keytypes = (const unsigned short *)conf->meth_data;
unsigned char key = (unsigned char)c;
#ifdef CHARSET_EBCDIC
-# if CHAR_BIT > 8
+#if CHAR_BIT > 8
if (key > 255) {
/* key is out of range for os_toascii table */
return 0;
}
-# endif
+#endif
/* convert key from ebcdic to ascii */
key = os_toascii[key];
#endif
@@ -936,7 +934,7 @@ static char *eat_alpha_numeric(CONF *conf, char *p)
continue;
}
if (!(IS_ALNUM_PUNCT(conf, *p)
- || (conf->flag_dollarid && IS_DOLLAR(conf, *p))))
+ || (conf->flag_dollarid && IS_DOLLAR(conf, *p))))
return p;
p++;
}
diff --git a/crypto/conf/conf_err.c b/crypto/conf/conf_err.c
index 9f1309c507..0dd42e0f43 100644
--- a/crypto/conf/conf_err.c
+++ b/crypto/conf/conf_err.c
@@ -15,51 +15,51 @@
#ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA CONF_str_reasons[] = {
- {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_ERROR_LOADING_DSO), "error loading dso"},
- {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_INVALID_PRAGMA), "invalid pragma"},
- {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_LIST_CANNOT_BE_NULL),
- "list cannot be null"},
- {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_MANDATORY_BRACES_IN_VARIABLE_EXPANSION),
- "mandatory braces in variable expansion"},
- {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_MISSING_CLOSE_SQUARE_BRACKET),
- "missing close square bracket"},
- {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_MISSING_EQUAL_SIGN),
- "missing equal sign"},
- {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_MISSING_INIT_FUNCTION),
- "missing init function"},
- {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_MODULE_INITIALIZATION_ERROR),
- "module initialization error"},
- {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_NO_CLOSE_BRACE), "no close brace"},
- {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_NO_CONF), "no conf"},
- {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_NO_CONF_OR_ENVIRONMENT_VARIABLE),
- "no conf or environment variable"},
- {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_NO_SECTION), "no section"},
- {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_NO_SUCH_FILE), "no such file"},
- {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_NO_VALUE), "no value"},
- {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_NUMBER_TOO_LARGE), "number too large"},
- {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_OPENSSL_CONF_REFERENCES_MISSING_SECTION),
- "openssl conf references missing section"},
- {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_RECURSIVE_DIRECTORY_INCLUDE),
- "recursive directory include"},
- {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_RECURSIVE_SECTION_REFERENCE),
- "recursive section reference"},
- {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_RELATIVE_PATH), "relative path"},
- {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_SSL_COMMAND_SECTION_EMPTY),
- "ssl command section empty"},
- {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_SSL_COMMAND_SECTION_NOT_FOUND),
- "ssl command section not found"},
- {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_SSL_SECTION_EMPTY), "ssl section empty"},
- {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_SSL_SECTION_NOT_FOUND),
- "ssl section not found"},
- {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_UNABLE_TO_CREATE_NEW_SECTION),
- "unable to create new section"},
- {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_UNKNOWN_MODULE_NAME),
- "unknown module name"},
- {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_VARIABLE_EXPANSION_TOO_LONG),
- "variable expansion too long"},
- {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_VARIABLE_HAS_NO_VALUE),
- "variable has no value"},
- {0, NULL}
+ { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_ERROR_LOADING_DSO), "error loading dso" },
+ { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_INVALID_PRAGMA), "invalid pragma" },
+ { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_LIST_CANNOT_BE_NULL),
+ "list cannot be null" },
+ { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_MANDATORY_BRACES_IN_VARIABLE_EXPANSION),
+ "mandatory braces in variable expansion" },
+ { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_MISSING_CLOSE_SQUARE_BRACKET),
+ "missing close square bracket" },
+ { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_MISSING_EQUAL_SIGN),
+ "missing equal sign" },
+ { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_MISSING_INIT_FUNCTION),
+ "missing init function" },
+ { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_MODULE_INITIALIZATION_ERROR),
+ "module initialization error" },
+ { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_NO_CLOSE_BRACE), "no close brace" },
+ { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_NO_CONF), "no conf" },
+ { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_NO_CONF_OR_ENVIRONMENT_VARIABLE),
+ "no conf or environment variable" },
+ { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_NO_SECTION), "no section" },
+ { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_NO_SUCH_FILE), "no such file" },
+ { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_NO_VALUE), "no value" },
+ { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_NUMBER_TOO_LARGE), "number too large" },
+ { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_OPENSSL_CONF_REFERENCES_MISSING_SECTION),
+ "openssl conf references missing section" },
+ { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_RECURSIVE_DIRECTORY_INCLUDE),
+ "recursive directory include" },
+ { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_RECURSIVE_SECTION_REFERENCE),
+ "recursive section reference" },
+ { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_RELATIVE_PATH), "relative path" },
+ { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_SSL_COMMAND_SECTION_EMPTY),
+ "ssl command section empty" },
+ { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_SSL_COMMAND_SECTION_NOT_FOUND),
+ "ssl command section not found" },
+ { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_SSL_SECTION_EMPTY), "ssl section empty" },
+ { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_SSL_SECTION_NOT_FOUND),
+ "ssl section not found" },
+ { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_UNABLE_TO_CREATE_NEW_SECTION),
+ "unable to create new section" },
+ { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_UNKNOWN_MODULE_NAME),
+ "unknown module name" },
+ { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_VARIABLE_EXPANSION_TOO_LONG),
+ "variable expansion too long" },
+ { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_VARIABLE_HAS_NO_VALUE),
+ "variable has no value" },
+ { 0, NULL }
};
#endif
diff --git a/crypto/conf/conf_lib.c b/crypto/conf/conf_lib.c
index a8b41b66a2..6efd95283e 100644
--- a/crypto/conf/conf_lib.c
+++ b/crypto/conf/conf_lib.c
@@ -44,7 +44,7 @@ int CONF_set_default_method(CONF_METHOD *meth)
}
LHASH_OF(CONF_VALUE) *CONF_load(LHASH_OF(CONF_VALUE) *conf, const char *file,
- long *eline)
+ long *eline)
{
LHASH_OF(CONF_VALUE) *ltmp;
BIO *in = NULL;
@@ -67,7 +67,7 @@ LHASH_OF(CONF_VALUE) *CONF_load(LHASH_OF(CONF_VALUE) *conf, const char *file,
#ifndef OPENSSL_NO_STDIO
LHASH_OF(CONF_VALUE) *CONF_load_fp(LHASH_OF(CONF_VALUE) *conf, FILE *fp,
- long *eline)
+ long *eline)
{
BIO *btmp;
LHASH_OF(CONF_VALUE) *ltmp;
@@ -82,7 +82,7 @@ LHASH_OF(CONF_VALUE) *CONF_load_fp(LHASH_OF(CONF_VALUE) *conf, FILE *fp,
#endif
LHASH_OF(CONF_VALUE) *CONF_load_bio(LHASH_OF(CONF_VALUE) *conf, BIO *bp,
- long *eline)
+ long *eline)
{
CONF ctmp;
int ret;
@@ -96,7 +96,7 @@ LHASH_OF(CONF_VALUE) *CONF_load_bio(LHASH_OF(CONF_VALUE) *conf, BIO *bp,
}
STACK_OF(CONF_VALUE) *CONF_get_section(LHASH_OF(CONF_VALUE) *conf,
- const char *section)
+ const char *section)
{
if (conf == NULL) {
return NULL;
@@ -109,7 +109,7 @@ STACK_OF(CONF_VALUE) *CONF_get_section(LHASH_OF(CONF_VALUE) *conf,
}
char *CONF_get_string(LHASH_OF(CONF_VALUE) *conf, const char *group,
- const char *name)
+ const char *name)
{
if (conf == NULL) {
return NCONF_get_string(NULL, group, name);
@@ -122,7 +122,7 @@ char *CONF_get_string(LHASH_OF(CONF_VALUE) *conf, const char *group,
}
long CONF_get_number(LHASH_OF(CONF_VALUE) *conf, const char *group,
- const char *name)
+ const char *name)
{
int status;
long result = 0;
@@ -314,7 +314,7 @@ char *NCONF_get_string(const CONF *conf, const char *group, const char *name)
return NULL;
}
ERR_raise_data(ERR_LIB_CONF, CONF_R_NO_VALUE,
- "group=%s name=%s", group, name);
+ "group=%s name=%s", group, name);
return NULL;
}
@@ -329,7 +329,7 @@ static int default_to_int(const CONF *conf, char c)
}
int NCONF_get_number_e(const CONF *conf, const char *group, const char *name,
- long *result)
+ long *result)
{
char *str;
long res;
@@ -367,7 +367,7 @@ int NCONF_get_number_e(const CONF *conf, const char *group, const char *name,
}
long _CONF_get_number(const CONF *conf, const char *section,
- const char *name)
+ const char *name)
{
int status;
long result = 0;
@@ -420,7 +420,6 @@ OPENSSL_INIT_SETTINGS *OPENSSL_INIT_new(void)
return ret;
}
-
#ifndef OPENSSL_NO_STDIO
/*
* If CRYPTO_set_mem_functions is called after this, then
@@ -429,7 +428,7 @@ OPENSSL_INIT_SETTINGS *OPENSSL_INIT_new(void)
* strdup & free instead of OPENSSL_strdup & OPENSSL_free.
*/
int OPENSSL_INIT_set_config_filename(OPENSSL_INIT_SETTINGS *settings,
- const char *filename)
+ const char *filename)
{
char *newfilename = NULL;
@@ -446,7 +445,7 @@ int OPENSSL_INIT_set_config_filename(OPENSSL_INIT_SETTINGS *settings,
}
void OPENSSL_INIT_set_config_file_flags(OPENSSL_INIT_SETTINGS *settings,
- unsigned long flags)
+ unsigned long flags)
{
settings->flags = flags;
}
@@ -458,7 +457,7 @@ void OPENSSL_INIT_set_config_file_flags(OPENSSL_INIT_SETTINGS *settings,
* strdup & free instead of OPENSSL_strdup & OPENSSL_free.
*/
int OPENSSL_INIT_set_config_appname(OPENSSL_INIT_SETTINGS *settings,
- const char *appname)
+ const char *appname)
{
char *newappname = NULL;
diff --git a/crypto/conf/conf_mod.c b/crypto/conf/conf_mod.c
index b1010ee9c6..998c0538e3 100644
--- a/crypto/conf/conf_mod.c
+++ b/crypto/conf/conf_mod.c
@@ -37,15 +37,15 @@ static CRYPTO_ONCE load_builtin_modules = CRYPTO_ONCE_STATIC_INIT;
static void module_free(CONF_MODULE *md);
static void module_finish(CONF_IMODULE *imod);
static int module_run(const CONF *cnf, const char *name, const char *value,
- unsigned long flags);
+ unsigned long flags);
static CONF_MODULE *module_add(DSO *dso, const char *name,
- conf_init_func *ifunc,
- conf_finish_func *ffunc);
+ conf_init_func *ifunc,
+ conf_finish_func *ffunc);
static CONF_MODULE *module_find(const char *name);
static int module_init(CONF_MODULE *pmod, const char *name, const char *value,
- const CONF *cnf);
+ const CONF *cnf);
static CONF_MODULE *module_load_dso(const CONF *cnf, const char *name,
- const char *value);
+ const char *value);
static int conf_modules_finish_int(void);
@@ -90,7 +90,7 @@ static int conf_diagnostics(const CONF *cnf)
/* Main function: load modules from a CONF structure */
int CONF_modules_load(const CONF *cnf, const char *appname,
- unsigned long flags)
+ unsigned long flags)
{
STACK_OF(CONF_VALUE) *values;
CONF_VALUE *vl;
@@ -102,9 +102,9 @@ int CONF_modules_load(const CONF *cnf, const char *appname,
if (conf_diagnostics(cnf))
flags &= ~(CONF_MFLAGS_IGNORE_ERRORS
- | CONF_MFLAGS_IGNORE_RETURN_CODES
- | CONF_MFLAGS_SILENT
- | CONF_MFLAGS_IGNORE_MISSING_FILE);
+ | CONF_MFLAGS_IGNORE_RETURN_CODES
+ | CONF_MFLAGS_SILENT
+ | CONF_MFLAGS_IGNORE_MISSING_FILE);
ERR_set_mark();
if (appname)
@@ -125,8 +125,8 @@ int CONF_modules_load(const CONF *cnf, const char *appname,
if (!(flags & CONF_MFLAGS_SILENT)) {
ERR_clear_last_mark();
ERR_raise_data(ERR_LIB_CONF,
- CONF_R_OPENSSL_CONF_REFERENCES_MISSING_SECTION,
- "openssl_conf=%s", vsection);
+ CONF_R_OPENSSL_CONF_REFERENCES_MISSING_SECTION,
+ "openssl_conf=%s", vsection);
} else {
ERR_pop_to_mark();
}
@@ -139,7 +139,7 @@ int CONF_modules_load(const CONF *cnf, const char *appname,
ERR_set_mark();
ret = module_run(cnf, vl->name, vl->value, flags);
OSSL_TRACE3(CONF, "Running module %s (%s) returned %d\n",
- vl->name, vl->value, ret);
+ vl->name, vl->value, ret);
if (ret <= 0)
if (!(flags & CONF_MFLAGS_IGNORE_ERRORS)) {
ERR_clear_last_mark();
@@ -149,11 +149,10 @@ int CONF_modules_load(const CONF *cnf, const char *appname,
}
return 1;
-
}
int CONF_modules_load_file_ex(OSSL_LIB_CTX *libctx, const char *filename,
- const char *appname, unsigned long flags)
+ const char *appname, unsigned long flags)
{
char *file = NULL;
CONF *conf = NULL;
@@ -179,8 +178,7 @@ int CONF_modules_load_file_ex(OSSL_LIB_CTX *libctx, const char *filename,
goto err;
if (NCONF_load(conf, file, NULL) <= 0) {
- if ((flags & CONF_MFLAGS_IGNORE_MISSING_FILE) &&
- (ERR_GET_REASON(ERR_peek_last_error()) == CONF_R_NO_SUCH_FILE)) {
+ if ((flags & CONF_MFLAGS_IGNORE_MISSING_FILE) && (ERR_GET_REASON(ERR_peek_last_error()) == CONF_R_NO_SUCH_FILE)) {
ret = 1;
}
goto err;
@@ -190,7 +188,7 @@ int CONF_modules_load_file_ex(OSSL_LIB_CTX *libctx, const char *filename,
/* CONF_modules_load() might change the diagnostics setting, reread it. */
diagnostics = OSSL_LIB_CTX_get_conf_diagnostics(libctx);
- err:
+err:
if (filename == NULL)
OPENSSL_free(file);
NCONF_free(conf);
@@ -207,7 +205,7 @@ int CONF_modules_load_file_ex(OSSL_LIB_CTX *libctx, const char *filename,
}
int CONF_modules_load_file(const char *filename,
- const char *appname, unsigned long flags)
+ const char *appname, unsigned long flags)
{
return CONF_modules_load_file_ex(NULL, filename, appname, flags);
}
@@ -219,7 +217,7 @@ DEFINE_RUN_ONCE_STATIC(do_load_builtin_modules)
}
static int module_run(const CONF *cnf, const char *name, const char *value,
- unsigned long flags)
+ unsigned long flags)
{
CONF_MODULE *md;
int ret;
@@ -236,7 +234,7 @@ static int module_run(const CONF *cnf, const char *name, const char *value,
if (!md) {
if (!(flags & CONF_MFLAGS_SILENT)) {
ERR_raise_data(ERR_LIB_CONF, CONF_R_UNKNOWN_MODULE_NAME,
- "module=%s", name);
+ "module=%s", name);
}
return -1;
}
@@ -246,8 +244,8 @@ static int module_run(const CONF *cnf, const char *name, const char *value,
if (ret <= 0) {
if (!(flags & CONF_MFLAGS_SILENT))
ERR_raise_data(ERR_LIB_CONF, CONF_R_MODULE_INITIALIZATION_ERROR,
- "module=%s, value=%s retcode=%-8d",
- name, value, ret);
+ "module=%s, value=%s retcode=%-8d",
+ name, value, ret);
}
return ret;
@@ -255,7 +253,7 @@ static int module_run(const CONF *cnf, const char *name, const char *value,
/* Load a module from a DSO */
static CONF_MODULE *module_load_dso(const CONF *cnf,
- const char *name, const char *value)
+ const char *name, const char *value)
{
DSO *dso = NULL;
conf_init_func *ifunc;
@@ -288,7 +286,7 @@ static CONF_MODULE *module_load_dso(const CONF *cnf,
return md;
- err:
+err:
DSO_free(dso);
ERR_raise_data(ERR_LIB_CONF, errcode, "module=%s, path=%s", name, path);
return NULL;
@@ -296,7 +294,7 @@ static CONF_MODULE *module_load_dso(const CONF *cnf,
/* add module to list */
static CONF_MODULE *module_add(DSO *dso, const char *name,
- conf_init_func *ifunc, conf_finish_func *ffunc)
+ conf_init_func *ifunc, conf_finish_func *ffunc)
{
CONF_MODULE *tmod = NULL;
STACK_OF(CONF_MODULE) *old_modules;
@@ -337,7 +335,7 @@ static CONF_MODULE *module_add(DSO *dso, const char *name,
sk_CONF_MODULE_free(old_modules);
return tmod;
- err:
+err:
ossl_rcu_write_unlock(module_list_lock);
if (tmod != NULL) {
OPENSSL_free(tmod->name);
@@ -390,7 +388,7 @@ static CONF_MODULE *module_find(const char *name)
/* initialize a module */
static int module_init(CONF_MODULE *pmod, const char *name, const char *value,
- const CONF *cnf)
+ const CONF *cnf)
{
int ret = 1;
int init_called = 0;
@@ -454,13 +452,13 @@ static int module_init(CONF_MODULE *pmod, const char *name, const char *value,
sk_CONF_IMODULE_free(old_modules);
return ret;
- err:
+err:
/* We've started the module so we'd better finish it */
if (pmod->finish && init_called)
pmod->finish(imod);
- memerr:
+memerr:
if (imod) {
OPENSSL_free(imod->name);
OPENSSL_free(imod->value);
@@ -468,7 +466,6 @@ static int module_init(CONF_MODULE *pmod, const char *name, const char *value,
}
return -1;
-
}
/*
@@ -521,7 +518,6 @@ void CONF_modules_unload(int all)
ossl_synchronize_rcu(module_list_lock);
sk_CONF_MODULE_free(old_modules);
sk_CONF_MODULE_pop_free(to_delete, module_free);
-
}
/* unload a single module */
@@ -584,7 +580,7 @@ static void module_finish(CONF_IMODULE *imod)
/* Add a static module to OpenSSL */
int CONF_module_add(const char *name, conf_init_func *ifunc,
- conf_finish_func *ffunc)
+ conf_finish_func *ffunc)
{
if (module_add(NULL, name, ifunc, ffunc))
return 1;
@@ -689,8 +685,8 @@ char *CONF_get1_default_config_file(void)
*/
int CONF_parse_list(const char *list_, int sep, int nospc,
- int (*list_cb) (const char *elem, int len, void *usr),
- void *arg)
+ int (*list_cb)(const char *elem, int len, void *usr),
+ void *arg)
{
int ret;
const char *lstart, *tmpend, *p;
diff --git a/crypto/conf/conf_sap.c b/crypto/conf/conf_sap.c
index 8d65b393ab..e801c0d032 100644
--- a/crypto/conf/conf_sap.c
+++ b/crypto/conf/conf_sap.c
@@ -16,7 +16,7 @@
#include <openssl/asn1.h>
#if defined(_WIN32) && !defined(__BORLANDC__)
-# define strdup _strdup
+#define strdup _strdup
#endif
/*
@@ -62,12 +62,12 @@ int ossl_config_int(const OPENSSL_INIT_SETTINGS *settings)
#ifdef OPENSSL_INIT_DEBUG
fprintf(stderr, "OPENSSL_INIT: ossl_config_int(%s, %s, %lu)\n",
- filename, appname, flags);
+ filename, appname, flags);
#endif
#ifndef OPENSSL_SYS_UEFI
ret = CONF_modules_load_file_ex(OSSL_LIB_CTX_get0_global_default(),
- filename, appname, flags);
+ filename, appname, flags);
#else
ret = 1;
#endif
diff --git a/crypto/conf/conf_ssl.c b/crypto/conf/conf_ssl.c
index bc1706aca5..9ad57195d9 100644
--- a/crypto/conf/conf_ssl.c
+++ b/crypto/conf/conf_ssl.c
@@ -60,8 +60,7 @@ static int ssl_module_init(CONF_IMODULE *md, const CONF *cnf)
ssl_conf_section = CONF_imodule_get_value(md);
cmd_lists = NCONF_get_section(cnf, ssl_conf_section);
if (sk_CONF_VALUE_num(cmd_lists) <= 0) {
- int rcode =
- cmd_lists == NULL
+ int rcode = cmd_lists == NULL
? CONF_R_SSL_SECTION_NOT_FOUND
: CONF_R_SSL_SECTION_EMPTY;
@@ -89,13 +88,12 @@ static int ssl_module_init(CONF_IMODULE *md, const CONF *cnf)
STACK_OF(CONF_VALUE) *cmds = NCONF_get_section(cnf, sect->value);
if (sk_CONF_VALUE_num(cmds) <= 0) {
- int rcode =
- cmds == NULL
+ int rcode = cmds == NULL
? CONF_R_SSL_COMMAND_SECTION_NOT_FOUND
: CONF_R_SSL_COMMAND_SECTION_EMPTY;
ERR_raise_data(ERR_LIB_CONF, rcode,
- "name=%s, value=%s", sect->name, sect->value);
+ "name=%s, value=%s", sect->name, sect->value);
goto err;
}
ssl_name->name = OPENSSL_strdup(sect->name);
@@ -122,10 +120,9 @@ static int ssl_module_init(CONF_IMODULE *md, const CONF *cnf)
if (cmd->cmd == NULL || cmd->arg == NULL)
goto err;
}
-
}
rv = 1;
- err:
+err:
if (rv == 0)
ssl_module_free(md);
return rv;
@@ -138,7 +135,7 @@ static int ssl_module_init(CONF_IMODULE *md, const CONF *cnf)
*/
const SSL_CONF_CMD *conf_ssl_get(CONF_IMODULE *md, size_t idx, const char **name, size_t *cnt)
{
- SSL_MODULE *ssl = md != NULL ? CONF_imodule_get_usr_data(md): NULL;
+ SSL_MODULE *ssl = md != NULL ? CONF_imodule_get_usr_data(md) : NULL;
if (ssl == NULL || ssl->names == NULL)
return NULL;
@@ -155,7 +152,7 @@ const SSL_CONF_CMD *conf_ssl_get(CONF_IMODULE *md, size_t idx, const char **name
*/
int conf_ssl_name_find(CONF_IMODULE *md, const char *name, size_t *idx)
{
- SSL_MODULE *ssl = md != NULL ? CONF_imodule_get_usr_data(md): NULL;
+ SSL_MODULE *ssl = md != NULL ? CONF_imodule_get_usr_data(md) : NULL;
const struct ssl_conf_name_st *nm;
size_t i;
@@ -178,7 +175,7 @@ int conf_ssl_name_find(CONF_IMODULE *md, const char *name, size_t *idx)
* argument is returned in |*arg|.
*/
void conf_ssl_get_cmd(const SSL_CONF_CMD *cmd, size_t idx, char **cmdstr,
- char **arg)
+ char **arg)
{
*cmdstr = cmd[idx].cmd;
*arg = cmd[idx].arg;
diff --git a/crypto/context.c b/crypto/context.c
index 80c29a2161..c25a0bd656 100644
--- a/crypto/context.c
+++ b/crypto/context.c
@@ -242,7 +242,7 @@ static int context_init(OSSL_LIB_CTX *ctx)
return 1;
- err:
+err:
context_deinit_objs(ctx);
if (exdata_done)
@@ -287,7 +287,6 @@ static void context_deinit_objs(OSSL_LIB_CTX *ctx)
ctx->decoder_cache = NULL;
}
-
/* P2. We want encoder_store to be cleaned up before the provider store */
if (ctx->encoder_store != NULL) {
ossl_method_store_free(ctx->encoder_store);
@@ -382,7 +381,6 @@ static void context_deinit_objs(OSSL_LIB_CTX *ctx)
ctx->comp_methods = NULL;
}
#endif
-
}
static int context_deinit(OSSL_LIB_CTX *ctx)
@@ -476,7 +474,7 @@ OSSL_LIB_CTX *OSSL_LIB_CTX_new(void)
#ifndef FIPS_MODULE
OSSL_LIB_CTX *OSSL_LIB_CTX_new_from_dispatch(const OSSL_CORE_HANDLE *handle,
- const OSSL_DISPATCH *in)
+ const OSSL_DISPATCH *in)
{
OSSL_LIB_CTX *ctx = OSSL_LIB_CTX_new();
@@ -492,7 +490,7 @@ OSSL_LIB_CTX *OSSL_LIB_CTX_new_from_dispatch(const OSSL_CORE_HANDLE *handle,
}
OSSL_LIB_CTX *OSSL_LIB_CTX_new_child(const OSSL_CORE_HANDLE *handle,
- const OSSL_DISPATCH *in)
+ const OSSL_DISPATCH *in)
{
OSSL_LIB_CTX *ctx = OSSL_LIB_CTX_new_from_dispatch(handle, in);
diff --git a/crypto/core_algorithm.c b/crypto/core_algorithm.c
index 16055bad30..8741067da2 100644
--- a/crypto/core_algorithm.c
+++ b/crypto/core_algorithm.c
@@ -15,15 +15,15 @@
struct algorithm_data_st {
OSSL_LIB_CTX *libctx;
- int operation_id; /* May be zero for finding them all */
+ int operation_id; /* May be zero for finding them all */
int (*pre)(OSSL_PROVIDER *, int operation_id, int no_store, void *data,
- int *result);
+ int *result);
int (*reserve_store)(int no_store, void *data);
void (*fn)(OSSL_PROVIDER *, const OSSL_ALGORITHM *, int no_store,
- void *data);
+ void *data);
int (*unreserve_store)(void *data);
int (*post)(OSSL_PROVIDER *, int operation_id, int no_store, void *data,
- int *result);
+ int *result);
void *data;
};
@@ -40,7 +40,7 @@ struct algorithm_data_st {
* 1 if successful so far, and adding should continue
*/
static int algorithm_do_map(OSSL_PROVIDER *provider, const OSSL_ALGORITHM *map,
- int cur_operation, int no_store, void *cbdata)
+ int cur_operation, int no_store, void *cbdata)
{
struct algorithm_data_st *data = cbdata;
int ret = 0;
@@ -54,7 +54,7 @@ static int algorithm_do_map(OSSL_PROVIDER *provider, const OSSL_ALGORITHM *map,
/* If there is no pre-condition function, assume "yes" */
ret = 1;
} else if (!data->pre(provider, cur_operation, no_store, data->data,
- &ret)) {
+ &ret)) {
/* Error, bail out! */
ret = -1;
goto end;
@@ -82,12 +82,12 @@ static int algorithm_do_map(OSSL_PROVIDER *provider, const OSSL_ALGORITHM *map,
/* If there is no post-condition function, assume "yes" */
ret = 1;
} else if (!data->post(provider, cur_operation, no_store, data->data,
- &ret)) {
+ &ret)) {
/* Error, bail out! */
ret = -1;
}
- end:
+end:
data->unreserve_store(data->data);
return ret;
@@ -111,14 +111,14 @@ static int algorithm_do_this(OSSL_PROVIDER *provider, void *cbdata)
first_operation = last_operation = data->operation_id;
for (cur_operation = first_operation;
- cur_operation <= last_operation;
- cur_operation++) {
- int no_store = 0; /* Assume caching is ok */
+ cur_operation <= last_operation;
+ cur_operation++) {
+ int no_store = 0; /* Assume caching is ok */
const OSSL_ALGORITHM *map = NULL;
int ret = 0;
map = ossl_provider_query_operation(provider, cur_operation,
- &no_store);
+ &no_store);
ret = algorithm_do_map(provider, map, cur_operation, no_store, data);
ossl_provider_unquery_operation(provider, cur_operation, map);
@@ -135,19 +135,21 @@ static int algorithm_do_this(OSSL_PROVIDER *provider, void *cbdata)
}
void ossl_algorithm_do_all(OSSL_LIB_CTX *libctx, int operation_id,
- OSSL_PROVIDER *provider,
- int (*pre)(OSSL_PROVIDER *, int operation_id,
- int no_store, void *data, int *result),
- int (*reserve_store)(int no_store, void *data),
- void (*fn)(OSSL_PROVIDER *provider,
- const OSSL_ALGORITHM *algo,
- int no_store, void *data),
- int (*unreserve_store)(void *data),
- int (*post)(OSSL_PROVIDER *, int operation_id,
- int no_store, void *data, int *result),
- void *data)
+ OSSL_PROVIDER *provider,
+ int (*pre)(OSSL_PROVIDER *, int operation_id,
+ int no_store, void *data, int *result),
+ int (*reserve_store)(int no_store, void *data),
+ void (*fn)(OSSL_PROVIDER *provider,
+ const OSSL_ALGORITHM *algo,
+ int no_store, void *data),
+ int (*unreserve_store)(void *data),
+ int (*post)(OSSL_PROVIDER *, int operation_id,
+ int no_store, void *data, int *result),
+ void *data)
{
- struct algorithm_data_st cbdata = { 0, };
+ struct algorithm_data_st cbdata = {
+ 0,
+ };
cbdata.libctx = libctx;
cbdata.operation_id = operation_id;
@@ -169,7 +171,7 @@ void ossl_algorithm_do_all(OSSL_LIB_CTX *libctx, int operation_id,
* a programming error in the functions up the call stack.
*/
if (!ossl_assert(ossl_lib_ctx_get_concrete(libctx)
- == ossl_lib_ctx_get_concrete(libctx2)))
+ == ossl_lib_ctx_get_concrete(libctx2)))
return;
cbdata.libctx = libctx2;
diff --git a/crypto/core_fetch.c b/crypto/core_fetch.c
index a0ab97b105..3293f70372 100644
--- a/crypto/core_fetch.c
+++ b/crypto/core_fetch.c
@@ -58,8 +58,8 @@ static int ossl_method_construct_unreserve_store(void *cbdata)
}
static int ossl_method_construct_precondition(OSSL_PROVIDER *provider,
- int operation_id, int no_store,
- void *cbdata, int *result)
+ int operation_id, int no_store,
+ void *cbdata, int *result)
{
if (!ossl_assert(result != NULL)) {
ERR_raise(ERR_LIB_CRYPTO, ERR_R_PASSED_NULL_PARAMETER);
@@ -85,8 +85,8 @@ static int ossl_method_construct_precondition(OSSL_PROVIDER *provider,
}
static int ossl_method_construct_postcondition(OSSL_PROVIDER *provider,
- int operation_id, int no_store,
- void *cbdata, int *result)
+ int operation_id, int no_store,
+ void *cbdata, int *result)
{
if (!ossl_assert(result != NULL)) {
ERR_raise(ERR_LIB_CRYPTO, ERR_R_PASSED_NULL_PARAMETER);
@@ -101,8 +101,8 @@ static int ossl_method_construct_postcondition(OSSL_PROVIDER *provider,
}
static void ossl_method_construct_this(OSSL_PROVIDER *provider,
- const OSSL_ALGORITHM *algo,
- int no_store, void *cbdata)
+ const OSSL_ALGORITHM *algo,
+ int no_store, void *cbdata)
{
struct construct_data_st *data = cbdata;
void *method = NULL;
@@ -112,8 +112,8 @@ static void ossl_method_construct_this(OSSL_PROVIDER *provider,
return;
OSSL_TRACE2(QUERY,
- "ossl_method_construct_this: putting an algo to the store %p with no_store %d\n",
- (void *)data->store, no_store);
+ "ossl_method_construct_this: putting an algo to the store %p with no_store %d\n",
+ (void *)data->store, no_store);
/*
* Note regarding putting the method in stores:
*
@@ -125,15 +125,15 @@ static void ossl_method_construct_this(OSSL_PROVIDER *provider,
* of the passed method.
*/
data->mcm->put(no_store ? data->store : NULL, method, provider, algo->algorithm_names,
- algo->property_definition, data->mcm_data);
+ algo->property_definition, data->mcm_data);
/* refcnt-- because we're dropping the reference */
data->mcm->destruct(method, data->mcm_data);
}
void *ossl_method_construct(OSSL_LIB_CTX *libctx, int operation_id,
- OSSL_PROVIDER **provider_rw, int force_store,
- OSSL_METHOD_CONSTRUCT_METHOD *mcm, void *mcm_data)
+ OSSL_PROVIDER **provider_rw, int force_store,
+ OSSL_METHOD_CONSTRUCT_METHOD *mcm, void *mcm_data)
{
void *method = NULL;
OSSL_PROVIDER *provider = provider_rw != NULL ? *provider_rw : NULL;
@@ -155,17 +155,17 @@ void *ossl_method_construct(OSSL_LIB_CTX *libctx, int operation_id,
cbdata.mcm = mcm;
cbdata.mcm_data = mcm_data;
ossl_algorithm_do_all(libctx, operation_id, provider,
- ossl_method_construct_precondition,
- ossl_method_construct_reserve_store,
- ossl_method_construct_this,
- ossl_method_construct_unreserve_store,
- ossl_method_construct_postcondition,
- &cbdata);
+ ossl_method_construct_precondition,
+ ossl_method_construct_reserve_store,
+ ossl_method_construct_this,
+ ossl_method_construct_unreserve_store,
+ ossl_method_construct_postcondition,
+ &cbdata);
/* If there is a temporary store, try there first */
if (cbdata.store != NULL)
method = mcm->get(cbdata.store, (const OSSL_PROVIDER **)provider_rw,
- mcm_data);
+ mcm_data);
/* If no method was found yet, try the global store */
if (method == NULL)
diff --git a/crypto/core_namemap.c b/crypto/core_namemap.c
index e1672c8884..822656eaef 100644
--- a/crypto/core_namemap.c
+++ b/crypto/core_namemap.c
@@ -36,14 +36,14 @@ DEFINE_STACK_OF(NAMES)
struct ossl_namemap_st {
/* Flags */
- unsigned int stored:1; /* If 1, it's stored in a library context */
+ unsigned int stored : 1; /* If 1, it's stored in a library context */
- HT *namenum_ht; /* Name->number mapping */
+ HT *namenum_ht; /* Name->number mapping */
CRYPTO_RWLOCK *lock;
STACK_OF(NAMES) *numnames;
- TSAN_QUALIFIER int max_number; /* Current max number */
+ TSAN_QUALIFIER int max_number; /* Current max number */
};
static void name_string_free(char *name)
@@ -110,8 +110,8 @@ int ossl_namemap_empty(OSSL_NAMEMAP *namemap)
* return value of 0 means that the callback was not called for any names.
*/
int ossl_namemap_doall_names(const OSSL_NAMEMAP *namemap, int number,
- void (*fn)(const char *name, void *data),
- void *data)
+ void (*fn)(const char *name, void *data),
+ void *data)
{
int i;
NAMES *names;
@@ -170,7 +170,7 @@ int ossl_namemap_name2num(const OSSL_NAMEMAP *namemap, const char *name)
}
int ossl_namemap_name2num_n(const OSSL_NAMEMAP *namemap,
- const char *name, size_t name_len)
+ const char *name, size_t name_len)
{
int number = 0;
HT_VALUE *val;
@@ -197,7 +197,7 @@ int ossl_namemap_name2num_n(const OSSL_NAMEMAP *namemap,
}
const char *ossl_namemap_num2name(const OSSL_NAMEMAP *namemap, int number,
- int idx)
+ int idx)
{
NAMES *names;
const char *ret = NULL;
@@ -219,7 +219,7 @@ const char *ossl_namemap_num2name(const OSSL_NAMEMAP *namemap, int number,
/* This function is not thread safe, the namemap must be locked */
static int numname_insert(OSSL_NAMEMAP *namemap, int number,
- const char *name)
+ const char *name)
{
NAMES *names;
char *tmpname;
@@ -251,7 +251,7 @@ static int numname_insert(OSSL_NAMEMAP *namemap, int number,
}
return number;
- err:
+err:
if (number <= 0)
sk_OPENSSL_STRING_pop_free(names, name_string_free);
OPENSSL_free(tmpname);
@@ -260,7 +260,7 @@ static int numname_insert(OSSL_NAMEMAP *namemap, int number,
/* This function is not thread safe, the namemap must be locked */
static int namemap_add_name(OSSL_NAMEMAP *namemap, int number,
- const char *name)
+ const char *name)
{
int ret;
HT_VALUE val = { 0 };
@@ -292,7 +292,7 @@ static int namemap_add_name(OSSL_NAMEMAP *namemap, int number,
}
int ossl_namemap_add_name(OSSL_NAMEMAP *namemap, int number,
- const char *name)
+ const char *name)
{
int tmp_number;
@@ -312,7 +312,7 @@ int ossl_namemap_add_name(OSSL_NAMEMAP *namemap, int number,
}
int ossl_namemap_add_names(OSSL_NAMEMAP *namemap, int number,
- const char *names, const char separator)
+ const char *names, const char separator)
{
char *tmp, *p, *q, *endp;
@@ -338,10 +338,10 @@ int ossl_namemap_add_names(OSSL_NAMEMAP *namemap, int number,
size_t l;
if ((q = strchr(p, separator)) == NULL) {
- l = strlen(p); /* offset to \0 */
+ l = strlen(p); /* offset to \0 */
q = p + l;
} else {
- l = q - p; /* offset to the next separator */
+ l = q - p; /* offset to the next separator */
*q++ = '\0';
}
@@ -357,8 +357,8 @@ int ossl_namemap_add_names(OSSL_NAMEMAP *namemap, int number,
number = this_number;
} else if (this_number != 0 && this_number != number) {
ERR_raise_data(ERR_LIB_CRYPTO, CRYPTO_R_CONFLICTING_NAMES,
- "\"%s\" has an existing different identity %d (from \"%s\")",
- p, this_number, names);
+ "\"%s\" has an existing different identity %d (from \"%s\")",
+ p, this_number, names);
number = 0;
goto end;
}
@@ -376,14 +376,14 @@ int ossl_namemap_add_names(OSSL_NAMEMAP *namemap, int number,
number = this_number;
} else if (this_number != number) {
ERR_raise_data(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR,
- "Got number %d when expecting %d",
- this_number, number);
+ "Got number %d when expecting %d",
+ this_number, number);
number = 0;
goto end;
}
}
- end:
+end:
CRYPTO_THREAD_unlock(namemap->lock);
OPENSSL_free(tmp);
return number;
@@ -399,7 +399,7 @@ int ossl_namemap_add_names(OSSL_NAMEMAP *namemap, int number,
/* Creates an initial namemap with names found in the legacy method db */
static void get_legacy_evp_names(int base_nid, int nid, const char *pem_name,
- void *arg)
+ void *arg)
{
int num = 0;
ASN1_OBJECT *obj;
@@ -439,9 +439,9 @@ static void get_legacy_md_names(const OBJ_NAME *on, void *arg)
get_legacy_evp_names(NID_undef, EVP_MD_get_type(md), NULL, arg);
}
-# ifndef OPENSSL_NO_DEPRECATED_3_6
+#ifndef OPENSSL_NO_DEPRECATED_3_6
static void get_legacy_pkey_meth_names(const EVP_PKEY_ASN1_METHOD *ameth,
- void *arg)
+ void *arg)
{
int nid = 0, base_nid = 0, flags = 0;
const char *pem_name = NULL;
@@ -478,7 +478,7 @@ static void get_legacy_pkey_meth_names(const EVP_PKEY_ASN1_METHOD *ameth,
}
}
}
-# endif /* OPENSSL_NO_DEPRECATED_3_6 */
+#endif /* OPENSSL_NO_DEPRECATED_3_6 */
#endif
/*-
@@ -491,8 +491,7 @@ OSSL_NAMEMAP *ossl_namemap_stored(OSSL_LIB_CTX *libctx)
#ifndef FIPS_MODULE
int nms;
#endif
- OSSL_NAMEMAP *namemap =
- ossl_lib_ctx_get_data(libctx, OSSL_LIB_CTX_NAMEMAP_INDEX);
+ OSSL_NAMEMAP *namemap = ossl_lib_ctx_get_data(libctx, OSSL_LIB_CTX_NAMEMAP_INDEX);
if (namemap == NULL)
return NULL;
@@ -511,12 +510,13 @@ OSSL_NAMEMAP *ossl_namemap_stored(OSSL_LIB_CTX *libctx)
/* Before pilfering, we make sure the legacy database is populated */
OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS
- | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL);
+ | OPENSSL_INIT_ADD_ALL_DIGESTS,
+ NULL);
OBJ_NAME_do_all(OBJ_NAME_TYPE_CIPHER_METH,
- get_legacy_cipher_names, namemap);
+ get_legacy_cipher_names, namemap);
OBJ_NAME_do_all(OBJ_NAME_TYPE_MD_METH,
- get_legacy_md_names, namemap);
+ get_legacy_md_names, namemap);
/*
* Some old providers (<= 3.5) may not have the rsassaPSS alias which
@@ -529,7 +529,7 @@ OSSL_NAMEMAP *ossl_namemap_stored(OSSL_LIB_CTX *libctx)
ossl_namemap_add_name(namemap, num, "RSASSA-PSS");
ossl_namemap_add_name(namemap, num, "1.2.840.113549.1.1.10");
}
-# ifndef OPENSSL_NO_DEPRECATED_3_6
+#ifndef OPENSSL_NO_DEPRECATED_3_6
{
int i, end;
@@ -537,7 +537,7 @@ OSSL_NAMEMAP *ossl_namemap_stored(OSSL_LIB_CTX *libctx)
for (i = 0, end = EVP_PKEY_asn1_get_count(); i < end; i++)
get_legacy_pkey_meth_names(EVP_PKEY_asn1_get0(i), namemap);
}
-# endif
+#endif
}
#endif
@@ -565,7 +565,7 @@ OSSL_NAMEMAP *ossl_namemap_new(OSSL_LIB_CTX *libctx)
return namemap;
- err:
+err:
ossl_namemap_free(namemap);
return NULL;
}
diff --git a/crypto/cpt_err.c b/crypto/cpt_err.c
index bbcad8e51d..e102782978 100644
--- a/crypto/cpt_err.c
+++ b/crypto/cpt_err.c
@@ -15,66 +15,66 @@
#ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA CRYPTO_str_reasons[] = {
- {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_BAD_ALGORITHM_NAME),
- "bad algorithm name"},
- {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_CONFLICTING_NAMES),
- "conflicting names"},
- {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_HEX_STRING_TOO_SHORT),
- "hex string too short"},
- {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_ILLEGAL_HEX_DIGIT),
- "illegal hex digit"},
- {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_INSUFFICIENT_DATA_SPACE),
- "insufficient data space"},
- {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_INSUFFICIENT_PARAM_SIZE),
- "insufficient param size"},
- {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_INSUFFICIENT_SECURE_DATA_SPACE),
- "insufficient secure data space"},
- {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_INTEGER_OVERFLOW),
- "integer overflow"},
- {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_INVALID_NEGATIVE_VALUE),
- "invalid negative value"},
- {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_INVALID_NULL_ARGUMENT),
- "invalid null argument"},
- {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_INVALID_OSSL_PARAM_TYPE),
- "invalid ossl param type"},
- {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_NO_PARAMS_TO_MERGE),
- "no params to merge"},
- {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_NO_SPACE_FOR_TERMINATING_NULL),
- "no space for terminating null"},
- {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_ODD_NUMBER_OF_DIGITS),
- "odd number of digits"},
- {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_PARAM_CANNOT_BE_REPRESENTED_EXACTLY),
- "param cannot be represented exactly"},
- {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_PARAM_NOT_INTEGER_TYPE),
- "param not integer type"},
- {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_PARAM_OF_INCOMPATIBLE_TYPE),
- "param of incompatible type"},
- {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_PARAM_UNSIGNED_INTEGER_NEGATIVE_VALUE_UNSUPPORTED),
- "param unsigned integer negative value unsupported"},
- {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_PARAM_UNSUPPORTED_FLOATING_POINT_FORMAT),
- "param unsupported floating point format"},
- {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_PARAM_VALUE_TOO_LARGE_FOR_DESTINATION),
- "param value too large for destination"},
- {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_PROVIDER_ALREADY_EXISTS),
- "provider already exists"},
- {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_PROVIDER_SECTION_ERROR),
- "provider section error"},
- {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_RANDOM_SECTION_ERROR),
- "random section error"},
- {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_SECURE_MALLOC_FAILURE),
- "secure malloc failure"},
- {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_STRING_TOO_LONG), "string too long"},
- {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_TOO_MANY_BYTES), "too many bytes"},
- {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_TOO_MANY_NAMES), "too many names"},
- {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_TOO_MANY_RECORDS),
- "too many records"},
- {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_TOO_SMALL_BUFFER),
- "too small buffer"},
- {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_UNKNOWN_NAME_IN_RANDOM_SECTION),
- "unknown name in random section"},
- {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_ZERO_LENGTH_NUMBER),
- "zero length number"},
- {0, NULL}
+ { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_BAD_ALGORITHM_NAME),
+ "bad algorithm name" },
+ { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_CONFLICTING_NAMES),
+ "conflicting names" },
+ { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_HEX_STRING_TOO_SHORT),
+ "hex string too short" },
+ { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_ILLEGAL_HEX_DIGIT),
+ "illegal hex digit" },
+ { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_INSUFFICIENT_DATA_SPACE),
+ "insufficient data space" },
+ { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_INSUFFICIENT_PARAM_SIZE),
+ "insufficient param size" },
+ { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_INSUFFICIENT_SECURE_DATA_SPACE),
+ "insufficient secure data space" },
+ { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_INTEGER_OVERFLOW),
+ "integer overflow" },
+ { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_INVALID_NEGATIVE_VALUE),
+ "invalid negative value" },
+ { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_INVALID_NULL_ARGUMENT),
+ "invalid null argument" },
+ { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_INVALID_OSSL_PARAM_TYPE),
+ "invalid ossl param type" },
+ { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_NO_PARAMS_TO_MERGE),
+ "no params to merge" },
+ { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_NO_SPACE_FOR_TERMINATING_NULL),
+ "no space for terminating null" },
+ { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_ODD_NUMBER_OF_DIGITS),
+ "odd number of digits" },
+ { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_PARAM_CANNOT_BE_REPRESENTED_EXACTLY),
+ "param cannot be represented exactly" },
+ { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_PARAM_NOT_INTEGER_TYPE),
+ "param not integer type" },
+ { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_PARAM_OF_INCOMPATIBLE_TYPE),
+ "param of incompatible type" },
+ { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_PARAM_UNSIGNED_INTEGER_NEGATIVE_VALUE_UNSUPPORTED),
+ "param unsigned integer negative value unsupported" },
+ { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_PARAM_UNSUPPORTED_FLOATING_POINT_FORMAT),
+ "param unsupported floating point format" },
+ { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_PARAM_VALUE_TOO_LARGE_FOR_DESTINATION),
+ "param value too large for destination" },
+ { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_PROVIDER_ALREADY_EXISTS),
+ "provider already exists" },
+ { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_PROVIDER_SECTION_ERROR),
+ "provider section error" },
+ { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_RANDOM_SECTION_ERROR),
+ "random section error" },
+ { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_SECURE_MALLOC_FAILURE),
+ "secure malloc failure" },
+ { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_STRING_TOO_LONG), "string too long" },
+ { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_TOO_MANY_BYTES), "too many bytes" },
+ { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_TOO_MANY_NAMES), "too many names" },
+ { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_TOO_MANY_RECORDS),
+ "too many records" },
+ { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_TOO_SMALL_BUFFER),
+ "too small buffer" },
+ { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_UNKNOWN_NAME_IN_RANDOM_SECTION),
+ "unknown name in random section" },
+ { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_ZERO_LENGTH_NUMBER),
+ "zero length number" },
+ { 0, NULL }
};
#endif
diff --git a/crypto/cpuid.c b/crypto/cpuid.c
index c061377708..d659135919 100644
--- a/crypto/cpuid.c
+++ b/crypto/cpuid.c
@@ -10,13 +10,11 @@
#include "internal/e_os.h"
#include "crypto/cryptlib.h"
-#if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
- defined(__x86_64) || defined(__x86_64__) || \
- defined(_M_AMD64) || defined(_M_X64)
+#if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)
extern unsigned int OPENSSL_ia32cap_P[OPENSSL_IA32CAP_P_MAX_INDEXES];
-# if defined(OPENSSL_CPUID_OBJ)
+#if defined(OPENSSL_CPUID_OBJ)
/*
* Purpose of these minimalistic and character-type-agnostic subroutines
@@ -27,9 +25,9 @@ extern unsigned int OPENSSL_ia32cap_P[OPENSSL_IA32CAP_P_MAX_INDEXES];
* between the sets, while the rest would be simply rejected by ossl_is*
* subroutines.
*/
-# ifdef _WIN32
+#ifdef _WIN32
typedef WCHAR variant_char;
-# define OPENSSL_IA32CAP_P_MAX_CHAR_SIZE 256
+#define OPENSSL_IA32CAP_P_MAX_CHAR_SIZE 256
static variant_char *ossl_getenv(const char *name)
{
/*
@@ -42,12 +40,12 @@ static variant_char *ossl_getenv(const char *name)
return (len > 0 && len < OPENSSL_IA32CAP_P_MAX_CHAR_SIZE) ? value : NULL;
}
-# else
+#else
typedef char variant_char;
-# define ossl_getenv getenv
-# endif
+#define ossl_getenv getenv
+#endif
-# include "crypto/ctype.h"
+#include "crypto/ctype.h"
static int todigit(variant_char c)
{
@@ -78,7 +76,8 @@ static uint64_t ossl_strtouint64(const variant_char *str)
}
static variant_char *ossl_strchr(const variant_char *str, char srch)
-{ variant_char c;
+{
+ variant_char c;
while ((c = *str)) {
if (c == srch)
@@ -89,7 +88,7 @@ static variant_char *ossl_strchr(const variant_char *str, char srch)
return NULL;
}
-# define OPENSSL_CPUID_SETUP
+#define OPENSSL_CPUID_SETUP
typedef uint64_t IA32CAP;
void OPENSSL_cpuid_setup(void)
@@ -112,7 +111,7 @@ void OPENSSL_cpuid_setup(void)
if (off) {
IA32CAP mask = vec;
vec = OPENSSL_ia32_cpuid(OPENSSL_ia32cap_P) & ~mask;
- if (mask & (1<<24)) {
+ if (mask & (1 << 24)) {
/*
* User disables FXSR bit, mask even other capabilities
* that operate exclusively on XMM, so we don't have to
@@ -121,7 +120,7 @@ void OPENSSL_cpuid_setup(void)
* do it in x86_64 case, but we can safely assume that
* x86_64 users won't actually flip this flag.
*/
- vec &= ~((IA32CAP)(1<<1|1<<11|1<<25|1<<28) << 32);
+ vec &= ~((IA32CAP)(1 << 1 | 1 << 11 | 1 << 25 | 1 << 28) << 32);
}
} else if (env[0] == ':') {
vec = OPENSSL_ia32_cpuid(OPENSSL_ia32cap_P);
@@ -170,17 +169,17 @@ void OPENSSL_cpuid_setup(void)
OPENSSL_ia32cap_P[0] = (unsigned int)vec | (1 << 10);
OPENSSL_ia32cap_P[1] = (unsigned int)(vec >> 32);
}
-# else
+#else
unsigned int OPENSSL_ia32cap_P[OPENSSL_IA32CAP_P_MAX_INDEXES];
-# endif
+#endif
#endif
#ifndef OPENSSL_CPUID_OBJ
-# ifndef OPENSSL_CPUID_SETUP
+#ifndef OPENSSL_CPUID_SETUP
void OPENSSL_cpuid_setup(void)
{
}
-# endif
+#endif
/*
* The rest are functions that are defined in the same assembler files as
@@ -195,7 +194,7 @@ void OPENSSL_cpuid_setup(void)
*
* There are also assembler versions of this function.
*/
-# undef CRYPTO_memcmp
+#undef CRYPTO_memcmp
int CRYPTO_memcmp(const void *in_a, const void *in_b, size_t len)
{
size_t i;
diff --git a/crypto/crmf/crmf_asn.c b/crypto/crmf/crmf_asn.c
index fb3f85a653..f3cedefc56 100644
--- a/crypto/crmf/crmf_asn.c
+++ b/crypto/crmf/crmf_asn.c
@@ -24,16 +24,16 @@ IMPLEMENT_ASN1_FUNCTIONS(OSSL_CRMF_PRIVATEKEYINFO)
ASN1_CHOICE(OSSL_CRMF_ENCKEYWITHID_IDENTIFIER) = {
ASN1_SIMPLE(OSSL_CRMF_ENCKEYWITHID_IDENTIFIER,
- value.string, ASN1_UTF8STRING),
+ value.string, ASN1_UTF8STRING),
ASN1_SIMPLE(OSSL_CRMF_ENCKEYWITHID_IDENTIFIER,
- value.generalName, GENERAL_NAME)
+ value.generalName, GENERAL_NAME)
} ASN1_CHOICE_END(OSSL_CRMF_ENCKEYWITHID_IDENTIFIER)
IMPLEMENT_ASN1_FUNCTIONS(OSSL_CRMF_ENCKEYWITHID_IDENTIFIER)
ASN1_SEQUENCE(OSSL_CRMF_ENCKEYWITHID) = {
ASN1_SIMPLE(OSSL_CRMF_ENCKEYWITHID, privateKey, OSSL_CRMF_PRIVATEKEYINFO),
ASN1_OPT(OSSL_CRMF_ENCKEYWITHID, identifier,
- OSSL_CRMF_ENCKEYWITHID_IDENTIFIER)
+ OSSL_CRMF_ENCKEYWITHID_IDENTIFIER)
} ASN1_SEQUENCE_END(OSSL_CRMF_ENCKEYWITHID)
IMPLEMENT_ASN1_FUNCTIONS(OSSL_CRMF_ENCKEYWITHID)
@@ -78,7 +78,7 @@ IMPLEMENT_ASN1_FUNCTIONS(OSSL_CRMF_SINGLEPUBINFO)
ASN1_SEQUENCE(OSSL_CRMF_PKIPUBLICATIONINFO) = {
ASN1_SIMPLE(OSSL_CRMF_PKIPUBLICATIONINFO, action, ASN1_INTEGER),
ASN1_SEQUENCE_OF_OPT(OSSL_CRMF_PKIPUBLICATIONINFO, pubInfos,
- OSSL_CRMF_SINGLEPUBINFO)
+ OSSL_CRMF_SINGLEPUBINFO)
} ASN1_SEQUENCE_END(OSSL_CRMF_PKIPUBLICATIONINFO)
IMPLEMENT_ASN1_FUNCTIONS(OSSL_CRMF_PKIPUBLICATIONINFO)
IMPLEMENT_ASN1_DUP_FUNCTION(OSSL_CRMF_PKIPUBLICATIONINFO)
@@ -109,22 +109,22 @@ IMPLEMENT_ASN1_FUNCTIONS(OSSL_CRMF_PBMPARAMETER)
ASN1_CHOICE(OSSL_CRMF_POPOSIGNINGKEYINPUT_AUTHINFO) = {
ASN1_EXP(OSSL_CRMF_POPOSIGNINGKEYINPUT_AUTHINFO, value.sender,
- GENERAL_NAME, 0),
+ GENERAL_NAME, 0),
ASN1_SIMPLE(OSSL_CRMF_POPOSIGNINGKEYINPUT_AUTHINFO, value.publicKeyMAC,
- OSSL_CRMF_PKMACVALUE)
+ OSSL_CRMF_PKMACVALUE)
} ASN1_CHOICE_END(OSSL_CRMF_POPOSIGNINGKEYINPUT_AUTHINFO)
IMPLEMENT_ASN1_FUNCTIONS(OSSL_CRMF_POPOSIGNINGKEYINPUT_AUTHINFO)
ASN1_SEQUENCE(OSSL_CRMF_POPOSIGNINGKEYINPUT) = {
ASN1_SIMPLE(OSSL_CRMF_POPOSIGNINGKEYINPUT, authInfo,
- OSSL_CRMF_POPOSIGNINGKEYINPUT_AUTHINFO),
+ OSSL_CRMF_POPOSIGNINGKEYINPUT_AUTHINFO),
ASN1_SIMPLE(OSSL_CRMF_POPOSIGNINGKEYINPUT, publicKey, X509_PUBKEY)
} ASN1_SEQUENCE_END(OSSL_CRMF_POPOSIGNINGKEYINPUT)
IMPLEMENT_ASN1_FUNCTIONS(OSSL_CRMF_POPOSIGNINGKEYINPUT)
ASN1_SEQUENCE(OSSL_CRMF_POPOSIGNINGKEY) = {
ASN1_IMP_OPT(OSSL_CRMF_POPOSIGNINGKEY, poposkInput,
- OSSL_CRMF_POPOSIGNINGKEYINPUT, 0),
+ OSSL_CRMF_POPOSIGNINGKEYINPUT, 0),
ASN1_SIMPLE(OSSL_CRMF_POPOSIGNINGKEY, algorithmIdentifier, X509_ALGOR),
ASN1_SIMPLE(OSSL_CRMF_POPOSIGNINGKEY, signature, ASN1_BIT_STRING)
} ASN1_SEQUENCE_END(OSSL_CRMF_POPOSIGNINGKEY)
@@ -138,39 +138,37 @@ ASN1_CHOICE(OSSL_CRMF_POPO) = {
} ASN1_CHOICE_END(OSSL_CRMF_POPO)
IMPLEMENT_ASN1_FUNCTIONS(OSSL_CRMF_POPO)
-ASN1_ADB_TEMPLATE(attributetypeandvalue_default) =
- ASN1_OPT(OSSL_CRMF_ATTRIBUTETYPEANDVALUE, value.other, ASN1_ANY);
+ASN1_ADB_TEMPLATE(attributetypeandvalue_default) = ASN1_OPT(OSSL_CRMF_ATTRIBUTETYPEANDVALUE, value.other, ASN1_ANY);
ASN1_ADB(OSSL_CRMF_ATTRIBUTETYPEANDVALUE) = {
ADB_ENTRY(NID_id_regCtrl_regToken,
- ASN1_SIMPLE(OSSL_CRMF_ATTRIBUTETYPEANDVALUE,
- value.regToken, ASN1_UTF8STRING)),
+ ASN1_SIMPLE(OSSL_CRMF_ATTRIBUTETYPEANDVALUE,
+ value.regToken, ASN1_UTF8STRING)),
ADB_ENTRY(NID_id_regCtrl_authenticator,
- ASN1_SIMPLE(OSSL_CRMF_ATTRIBUTETYPEANDVALUE,
- value.authenticator, ASN1_UTF8STRING)),
+ ASN1_SIMPLE(OSSL_CRMF_ATTRIBUTETYPEANDVALUE,
+ value.authenticator, ASN1_UTF8STRING)),
ADB_ENTRY(NID_id_regCtrl_pkiPublicationInfo,
- ASN1_SIMPLE(OSSL_CRMF_ATTRIBUTETYPEANDVALUE,
- value.pkiPublicationInfo,
- OSSL_CRMF_PKIPUBLICATIONINFO)),
+ ASN1_SIMPLE(OSSL_CRMF_ATTRIBUTETYPEANDVALUE,
+ value.pkiPublicationInfo,
+ OSSL_CRMF_PKIPUBLICATIONINFO)),
ADB_ENTRY(NID_id_regCtrl_oldCertID,
- ASN1_SIMPLE(OSSL_CRMF_ATTRIBUTETYPEANDVALUE,
- value.oldCertID, OSSL_CRMF_CERTID)),
+ ASN1_SIMPLE(OSSL_CRMF_ATTRIBUTETYPEANDVALUE,
+ value.oldCertID, OSSL_CRMF_CERTID)),
ADB_ENTRY(NID_id_regCtrl_protocolEncrKey,
- ASN1_SIMPLE(OSSL_CRMF_ATTRIBUTETYPEANDVALUE,
- value.protocolEncrKey, X509_PUBKEY)),
+ ASN1_SIMPLE(OSSL_CRMF_ATTRIBUTETYPEANDVALUE,
+ value.protocolEncrKey, X509_PUBKEY)),
ADB_ENTRY(NID_id_regCtrl_algId,
- ASN1_SIMPLE(OSSL_CRMF_ATTRIBUTETYPEANDVALUE,
- value.algId, X509_ALGOR)),
+ ASN1_SIMPLE(OSSL_CRMF_ATTRIBUTETYPEANDVALUE,
+ value.algId, X509_ALGOR)),
ADB_ENTRY(NID_id_regCtrl_rsaKeyLen,
- ASN1_SIMPLE(OSSL_CRMF_ATTRIBUTETYPEANDVALUE,
- value.rsaKeyLen, ASN1_INTEGER)),
+ ASN1_SIMPLE(OSSL_CRMF_ATTRIBUTETYPEANDVALUE,
+ value.rsaKeyLen, ASN1_INTEGER)),
ADB_ENTRY(NID_id_regInfo_utf8Pairs,
- ASN1_SIMPLE(OSSL_CRMF_ATTRIBUTETYPEANDVALUE,
- value.utf8Pairs, ASN1_UTF8STRING)),
+ ASN1_SIMPLE(OSSL_CRMF_ATTRIBUTETYPEANDVALUE,
+ value.utf8Pairs, ASN1_UTF8STRING)),
ADB_ENTRY(NID_id_regInfo_certReq,
- ASN1_SIMPLE(OSSL_CRMF_ATTRIBUTETYPEANDVALUE,
- value.certReq, OSSL_CRMF_CERTREQUEST)),
-} ASN1_ADB_END(OSSL_CRMF_ATTRIBUTETYPEANDVALUE, 0, type, 0,
- &attributetypeandvalue_default_tt, NULL);
+ ASN1_SIMPLE(OSSL_CRMF_ATTRIBUTETYPEANDVALUE,
+ value.certReq, OSSL_CRMF_CERTREQUEST)),
+} ASN1_ADB_END(OSSL_CRMF_ATTRIBUTETYPEANDVALUE, 0, type, 0, &attributetypeandvalue_default_tt, NULL);
ASN1_SEQUENCE(OSSL_CRMF_ATTRIBUTETYPEANDVALUE) = {
ASN1_SIMPLE(OSSL_CRMF_ATTRIBUTETYPEANDVALUE, type, ASN1_OBJECT),
@@ -182,7 +180,7 @@ IMPLEMENT_ASN1_DUP_FUNCTION(OSSL_CRMF_ATTRIBUTETYPEANDVALUE)
ASN1_SEQUENCE(OSSL_CRMF_OPTIONALVALIDITY) = {
ASN1_EXP_OPT(OSSL_CRMF_OPTIONALVALIDITY, notBefore, ASN1_TIME, 0),
- ASN1_EXP_OPT(OSSL_CRMF_OPTIONALVALIDITY, notAfter, ASN1_TIME, 1)
+ ASN1_EXP_OPT(OSSL_CRMF_OPTIONALVALIDITY, notAfter, ASN1_TIME, 1)
} ASN1_SEQUENCE_END(OSSL_CRMF_OPTIONALVALIDITY)
IMPLEMENT_ASN1_FUNCTIONS(OSSL_CRMF_OPTIONALVALIDITY)
@@ -200,7 +198,7 @@ ASN1_SEQUENCE(OSSL_CRMF_CERTTEMPLATE) = {
ASN1_IMP_OPT(OSSL_CRMF_CERTTEMPLATE, signingAlg, X509_ALGOR, 2),
ASN1_EXP_OPT(OSSL_CRMF_CERTTEMPLATE, issuer, X509_NAME, 3),
ASN1_IMP_OPT(OSSL_CRMF_CERTTEMPLATE, validity,
- OSSL_CRMF_OPTIONALVALIDITY, 4),
+ OSSL_CRMF_OPTIONALVALIDITY, 4),
ASN1_EXP_OPT(OSSL_CRMF_CERTTEMPLATE, subject, X509_NAME, 5),
ASN1_IMP_OPT(OSSL_CRMF_CERTTEMPLATE, publicKey, X509_PUBKEY, 6),
/* issuerUID is deprecated in version 2 */
@@ -208,7 +206,7 @@ ASN1_SEQUENCE(OSSL_CRMF_CERTTEMPLATE) = {
/* subjectUID is deprecated in version 2 */
ASN1_IMP_OPT(OSSL_CRMF_CERTTEMPLATE, subjectUID, ASN1_BIT_STRING, 8),
ASN1_IMP_SEQUENCE_OF_OPT(OSSL_CRMF_CERTTEMPLATE, extensions,
- X509_EXTENSION, 9),
+ X509_EXTENSION, 9),
} ASN1_SEQUENCE_END(OSSL_CRMF_CERTTEMPLATE)
IMPLEMENT_ASN1_FUNCTIONS(OSSL_CRMF_CERTTEMPLATE)
IMPLEMENT_ASN1_DUP_FUNCTION(OSSL_CRMF_CERTTEMPLATE)
@@ -217,7 +215,7 @@ ASN1_SEQUENCE(OSSL_CRMF_CERTREQUEST) = {
ASN1_SIMPLE(OSSL_CRMF_CERTREQUEST, certReqId, ASN1_INTEGER),
ASN1_SIMPLE(OSSL_CRMF_CERTREQUEST, certTemplate, OSSL_CRMF_CERTTEMPLATE),
ASN1_SEQUENCE_OF_OPT(OSSL_CRMF_CERTREQUEST, controls,
- OSSL_CRMF_ATTRIBUTETYPEANDVALUE)
+ OSSL_CRMF_ATTRIBUTETYPEANDVALUE)
} ASN1_SEQUENCE_END(OSSL_CRMF_CERTREQUEST)
IMPLEMENT_ASN1_FUNCTIONS(OSSL_CRMF_CERTREQUEST)
IMPLEMENT_ASN1_DUP_FUNCTION(OSSL_CRMF_CERTREQUEST)
@@ -226,13 +224,12 @@ ASN1_SEQUENCE(OSSL_CRMF_MSG) = {
ASN1_SIMPLE(OSSL_CRMF_MSG, certReq, OSSL_CRMF_CERTREQUEST),
ASN1_OPT(OSSL_CRMF_MSG, popo, OSSL_CRMF_POPO),
ASN1_SEQUENCE_OF_OPT(OSSL_CRMF_MSG, regInfo,
- OSSL_CRMF_ATTRIBUTETYPEANDVALUE)
+ OSSL_CRMF_ATTRIBUTETYPEANDVALUE)
} ASN1_SEQUENCE_END(OSSL_CRMF_MSG)
IMPLEMENT_ASN1_FUNCTIONS(OSSL_CRMF_MSG)
IMPLEMENT_ASN1_DUP_FUNCTION(OSSL_CRMF_MSG)
-ASN1_ITEM_TEMPLATE(OSSL_CRMF_MSGS) =
- ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0,
- OSSL_CRMF_MSGS, OSSL_CRMF_MSG)
+ASN1_ITEM_TEMPLATE(OSSL_CRMF_MSGS) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0,
+ OSSL_CRMF_MSGS, OSSL_CRMF_MSG)
ASN1_ITEM_TEMPLATE_END(OSSL_CRMF_MSGS)
IMPLEMENT_ASN1_FUNCTIONS(OSSL_CRMF_MSGS)
diff --git a/crypto/crmf/crmf_err.c b/crypto/crmf/crmf_err.c
index 55c543d563..5441d6ccd2 100644
--- a/crypto/crmf/crmf_err.c
+++ b/crypto/crmf/crmf_err.c
@@ -14,74 +14,74 @@
#ifndef OPENSSL_NO_CRMF
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA CRMF_str_reasons[] = {
- {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_BAD_PBM_ITERATIONCOUNT),
- "bad pbm iterationcount"},
- {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_CMS_NOT_SUPPORTED), "cms not supported"},
- {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_CRMFERROR), "crmferror"},
- {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_ERROR), "error"},
- {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_ERROR_DECODING_CERTIFICATE),
- "error decoding certificate"},
- {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_ERROR_DECODING_ENCRYPTEDKEY),
- "error decoding encryptedkey"},
- {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_ERROR_DECRYPTING_CERTIFICATE),
- "error decrypting certificate"},
- {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_ERROR_DECRYPTING_ENCRYPTEDKEY),
- "error decrypting encryptedkey"},
- {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_ERROR_DECRYPTING_ENCRYPTEDVALUE),
- "error decrypting encryptedvalue"},
- {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_ERROR_DECRYPTING_SYMMETRIC_KEY),
- "error decrypting symmetric key"},
- {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_ERROR_SETTING_PURPOSE),
- "error setting purpose"},
- {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_ERROR_SIGNING_POPO),
- "error signing popo"},
- {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_ERROR_VERIFYING_ENCRYPTEDKEY),
- "error verifying encryptedkey"},
- {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_FAILURE_OBTAINING_RANDOM),
- "failure obtaining random"},
- {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_ITERATIONCOUNT_BELOW_100),
- "iterationcount below 100"},
- {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_MALFORMED_IV), "malformed iv"},
- {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_NULL_ARGUMENT), "null argument"},
- {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_POPOSKINPUT_NOT_SUPPORTED),
- "poposkinput not supported"},
- {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_POPO_INCONSISTENT_CENTRAL_KEYGEN),
- "popo inconsistent central keygen"},
- {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_POPO_INCONSISTENT_PUBLIC_KEY),
- "popo inconsistent public key"},
- {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_POPO_MISSING), "popo missing"},
- {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_POPO_MISSING_PUBLIC_KEY),
- "popo missing public key"},
- {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_POPO_MISSING_SUBJECT),
- "popo missing subject"},
- {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_POPO_RAVERIFIED_NOT_ACCEPTED),
- "popo raverified not accepted"},
- {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_SETTING_MAC_ALGOR_FAILURE),
- "setting mac algor failure"},
- {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_SETTING_OWF_ALGOR_FAILURE),
- "setting owf algor failure"},
- {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_UNSUPPORTED_ALGORITHM),
- "unsupported algorithm"},
- {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_UNSUPPORTED_CIPHER),
- "unsupported cipher"},
- {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_UNSUPPORTED_METHOD_FOR_CREATING_POPO),
- "unsupported method for creating popo"},
- {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_UNSUPPORTED_POPO_METHOD),
- "unsupported popo method"},
- {0, NULL}
+ { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_BAD_PBM_ITERATIONCOUNT),
+ "bad pbm iterationcount" },
+ { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_CMS_NOT_SUPPORTED), "cms not supported" },
+ { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_CRMFERROR), "crmferror" },
+ { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_ERROR), "error" },
+ { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_ERROR_DECODING_CERTIFICATE),
+ "error decoding certificate" },
+ { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_ERROR_DECODING_ENCRYPTEDKEY),
+ "error decoding encryptedkey" },
+ { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_ERROR_DECRYPTING_CERTIFICATE),
+ "error decrypting certificate" },
+ { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_ERROR_DECRYPTING_ENCRYPTEDKEY),
+ "error decrypting encryptedkey" },
+ { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_ERROR_DECRYPTING_ENCRYPTEDVALUE),
+ "error decrypting encryptedvalue" },
+ { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_ERROR_DECRYPTING_SYMMETRIC_KEY),
+ "error decrypting symmetric key" },
+ { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_ERROR_SETTING_PURPOSE),
+ "error setting purpose" },
+ { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_ERROR_SIGNING_POPO),
+ "error signing popo" },
+ { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_ERROR_VERIFYING_ENCRYPTEDKEY),
+ "error verifying encryptedkey" },
+ { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_FAILURE_OBTAINING_RANDOM),
+ "failure obtaining random" },
+ { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_ITERATIONCOUNT_BELOW_100),
+ "iterationcount below 100" },
+ { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_MALFORMED_IV), "malformed iv" },
+ { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_NULL_ARGUMENT), "null argument" },
+ { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_POPOSKINPUT_NOT_SUPPORTED),
+ "poposkinput not supported" },
+ { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_POPO_INCONSISTENT_CENTRAL_KEYGEN),
+ "popo inconsistent central keygen" },
+ { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_POPO_INCONSISTENT_PUBLIC_KEY),
+ "popo inconsistent public key" },
+ { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_POPO_MISSING), "popo missing" },
+ { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_POPO_MISSING_PUBLIC_KEY),
+ "popo missing public key" },
+ { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_POPO_MISSING_SUBJECT),
+ "popo missing subject" },
+ { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_POPO_RAVERIFIED_NOT_ACCEPTED),
+ "popo raverified not accepted" },
+ { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_SETTING_MAC_ALGOR_FAILURE),
+ "setting mac algor failure" },
+ { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_SETTING_OWF_ALGOR_FAILURE),
+ "setting owf algor failure" },
+ { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_UNSUPPORTED_ALGORITHM),
+ "unsupported algorithm" },
+ { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_UNSUPPORTED_CIPHER),
+ "unsupported cipher" },
+ { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_UNSUPPORTED_METHOD_FOR_CREATING_POPO),
+ "unsupported method for creating popo" },
+ { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_UNSUPPORTED_POPO_METHOD),
+ "unsupported popo method" },
+ { 0, NULL }
};
-# endif
+#endif
int ossl_err_load_CRMF_strings(void)
{
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(CRMF_str_reasons[0].error) == NULL)
ERR_load_strings_const(CRMF_str_reasons);
-# endif
+#endif
return 1;
}
#else
diff --git a/crypto/crmf/crmf_lib.c b/crypto/crmf/crmf_lib.c
index bafa4ae169..3792c2e83b 100644
--- a/crypto/crmf/crmf_lib.c
+++ b/crypto/crmf/crmf_lib.c
@@ -37,43 +37,43 @@
* valt = Value Type
* ctrlinf = "regCtrl" or "regInfo"
*/
-#define IMPLEMENT_CRMF_CTRL_FUNC(atyp, valt, ctrlinf) \
-valt *OSSL_CRMF_MSG_get0_##ctrlinf##_##atyp(const OSSL_CRMF_MSG *msg) \
-{ \
- int i; \
- STACK_OF(OSSL_CRMF_ATTRIBUTETYPEANDVALUE) *controls; \
- OSSL_CRMF_ATTRIBUTETYPEANDVALUE *atav = NULL; \
- \
- if (msg == NULL || msg->certReq == NULL) \
- return NULL; \
- controls = msg->certReq->controls; \
- for (i = 0; i < sk_OSSL_CRMF_ATTRIBUTETYPEANDVALUE_num(controls); i++) { \
- atav = sk_OSSL_CRMF_ATTRIBUTETYPEANDVALUE_value(controls, i); \
- if (OBJ_obj2nid(atav->type) == NID_id_##ctrlinf##_##atyp) \
- return atav->value.atyp; \
- } \
- return NULL; \
-} \
- \
-int OSSL_CRMF_MSG_set1_##ctrlinf##_##atyp(OSSL_CRMF_MSG *msg, const valt *in) \
-{ \
- OSSL_CRMF_ATTRIBUTETYPEANDVALUE *atav = NULL; \
- \
- if (msg == NULL || in == NULL) \
- goto err; \
- if ((atav = OSSL_CRMF_ATTRIBUTETYPEANDVALUE_new()) == NULL) \
- goto err; \
- if ((atav->type = OBJ_nid2obj(NID_id_##ctrlinf##_##atyp)) == NULL) \
- goto err; \
- if ((atav->value.atyp = valt##_dup(in)) == NULL) \
- goto err; \
- if (!OSSL_CRMF_MSG_push0_##ctrlinf(msg, atav)) \
- goto err; \
- return 1; \
- err: \
- OSSL_CRMF_ATTRIBUTETYPEANDVALUE_free(atav); \
- return 0; \
-}
+#define IMPLEMENT_CRMF_CTRL_FUNC(atyp, valt, ctrlinf) \
+ valt *OSSL_CRMF_MSG_get0_##ctrlinf##_##atyp(const OSSL_CRMF_MSG *msg) \
+ { \
+ int i; \
+ STACK_OF(OSSL_CRMF_ATTRIBUTETYPEANDVALUE) *controls; \
+ OSSL_CRMF_ATTRIBUTETYPEANDVALUE *atav = NULL; \
+ \
+ if (msg == NULL || msg->certReq == NULL) \
+ return NULL; \
+ controls = msg->certReq->controls; \
+ for (i = 0; i < sk_OSSL_CRMF_ATTRIBUTETYPEANDVALUE_num(controls); i++) { \
+ atav = sk_OSSL_CRMF_ATTRIBUTETYPEANDVALUE_value(controls, i); \
+ if (OBJ_obj2nid(atav->type) == NID_id_##ctrlinf##_##atyp) \
+ return atav->value.atyp; \
+ } \
+ return NULL; \
+ } \
+ \
+ int OSSL_CRMF_MSG_set1_##ctrlinf##_##atyp(OSSL_CRMF_MSG *msg, const valt *in) \
+ { \
+ OSSL_CRMF_ATTRIBUTETYPEANDVALUE *atav = NULL; \
+ \
+ if (msg == NULL || in == NULL) \
+ goto err; \
+ if ((atav = OSSL_CRMF_ATTRIBUTETYPEANDVALUE_new()) == NULL) \
+ goto err; \
+ if ((atav->type = OBJ_nid2obj(NID_id_##ctrlinf##_##atyp)) == NULL) \
+ goto err; \
+ if ((atav->value.atyp = valt##_dup(in)) == NULL) \
+ goto err; \
+ if (!OSSL_CRMF_MSG_push0_##ctrlinf(msg, atav)) \
+ goto err; \
+ return 1; \
+ err: \
+ OSSL_CRMF_ATTRIBUTETYPEANDVALUE_free(atav); \
+ return 0; \
+ }
/*-
* Pushes the given control attribute into the controls stack of a CertRequest
@@ -81,7 +81,7 @@ int OSSL_CRMF_MSG_set1_##ctrlinf##_##atyp(OSSL_CRMF_MSG *msg, const valt *in) \
* returns 1 on success, 0 on error
*/
static int OSSL_CRMF_MSG_push0_regCtrl(OSSL_CRMF_MSG *crm,
- OSSL_CRMF_ATTRIBUTETYPEANDVALUE *ctrl)
+ OSSL_CRMF_ATTRIBUTETYPEANDVALUE *ctrl)
{
int new = 0;
@@ -100,7 +100,7 @@ static int OSSL_CRMF_MSG_push0_regCtrl(OSSL_CRMF_MSG *crm,
goto err;
return 1;
- err:
+err:
if (new != 0) {
sk_OSSL_CRMF_ATTRIBUTETYPEANDVALUE_free(crm->certReq->controls);
crm->certReq->controls = NULL;
@@ -116,11 +116,11 @@ IMPLEMENT_CRMF_CTRL_FUNC(regToken, ASN1_STRING, regCtrl)
IMPLEMENT_CRMF_CTRL_FUNC(authenticator, ASN1_UTF8STRING, regCtrl)
int OSSL_CRMF_MSG_set0_SinglePubInfo(OSSL_CRMF_SINGLEPUBINFO *spi,
- int method, GENERAL_NAME *nm)
+ int method, GENERAL_NAME *nm)
{
if (spi == NULL
- || method < OSSL_CRMF_PUB_METHOD_DONTCARE
- || method > OSSL_CRMF_PUB_METHOD_LDAP) {
+ || method < OSSL_CRMF_PUB_METHOD_DONTCARE
+ || method > OSSL_CRMF_PUB_METHOD_LDAP) {
ERR_raise(ERR_LIB_CRMF, ERR_R_PASSED_INVALID_ARGUMENT);
return 0;
}
@@ -132,9 +132,8 @@ int OSSL_CRMF_MSG_set0_SinglePubInfo(OSSL_CRMF_SINGLEPUBINFO *spi,
return 1;
}
-int
-OSSL_CRMF_MSG_PKIPublicationInfo_push0_SinglePubInfo(OSSL_CRMF_PKIPUBLICATIONINFO *pi,
- OSSL_CRMF_SINGLEPUBINFO *spi)
+int OSSL_CRMF_MSG_PKIPublicationInfo_push0_SinglePubInfo(OSSL_CRMF_PKIPUBLICATIONINFO *pi,
+ OSSL_CRMF_SINGLEPUBINFO *spi)
{
if (pi == NULL || spi == NULL) {
ERR_raise(ERR_LIB_CRMF, CRMF_R_NULL_ARGUMENT);
@@ -149,11 +148,11 @@ OSSL_CRMF_MSG_PKIPublicationInfo_push0_SinglePubInfo(OSSL_CRMF_PKIPUBLICATIONINF
}
int OSSL_CRMF_MSG_set_PKIPublicationInfo_action(OSSL_CRMF_PKIPUBLICATIONINFO *pi,
- int action)
+ int action)
{
if (pi == NULL
- || action < OSSL_CRMF_PUB_ACTION_DONTPUBLISH
- || action > OSSL_CRMF_PUB_ACTION_PLEASEPUBLISH) {
+ || action < OSSL_CRMF_PUB_ACTION_DONTPUBLISH
+ || action > OSSL_CRMF_PUB_ACTION_PLEASEPUBLISH) {
ERR_raise(ERR_LIB_CRMF, ERR_R_PASSED_INVALID_ARGUMENT);
return 0;
}
@@ -163,13 +162,13 @@ int OSSL_CRMF_MSG_set_PKIPublicationInfo_action(OSSL_CRMF_PKIPUBLICATIONINFO *pi
/* id-regCtrl-pkiPublicationInfo Control (section 6.3) */
IMPLEMENT_CRMF_CTRL_FUNC(pkiPublicationInfo, OSSL_CRMF_PKIPUBLICATIONINFO,
- regCtrl)
+ regCtrl)
/* id-regCtrl-oldCertID Control (section 6.5) from the given */
IMPLEMENT_CRMF_CTRL_FUNC(oldCertID, OSSL_CRMF_CERTID, regCtrl)
OSSL_CRMF_CERTID *OSSL_CRMF_CERTID_gen(const X509_NAME *issuer,
- const ASN1_INTEGER *serial)
+ const ASN1_INTEGER *serial)
{
OSSL_CRMF_CERTID *cid = NULL;
@@ -191,7 +190,7 @@ OSSL_CRMF_CERTID *OSSL_CRMF_CERTID_gen(const X509_NAME *issuer,
return cid;
- err:
+err:
OSSL_CRMF_CERTID_free(cid);
return NULL;
}
@@ -207,7 +206,7 @@ IMPLEMENT_CRMF_CTRL_FUNC(protocolEncrKey, X509_PUBKEY, regCtrl)
* returns 1 on success, 0 on error
*/
static int OSSL_CRMF_MSG_push0_regInfo(OSSL_CRMF_MSG *crm,
- OSSL_CRMF_ATTRIBUTETYPEANDVALUE *ri)
+ OSSL_CRMF_ATTRIBUTETYPEANDVALUE *ri)
{
STACK_OF(OSSL_CRMF_ATTRIBUTETYPEANDVALUE) *info = NULL;
@@ -224,7 +223,7 @@ static int OSSL_CRMF_MSG_push0_regInfo(OSSL_CRMF_MSG *crm,
goto err;
return 1;
- err:
+err:
if (info != NULL)
crm->regInfo = NULL;
sk_OSSL_CRMF_ATTRIBUTETYPEANDVALUE_free(info);
@@ -248,7 +247,7 @@ OSSL_CRMF_CERTTEMPLATE *OSSL_CRMF_MSG_get0_tmpl(const OSSL_CRMF_MSG *crm)
}
int OSSL_CRMF_MSG_set0_validity(OSSL_CRMF_MSG *crm,
- ASN1_TIME *notBefore, ASN1_TIME *notAfter)
+ ASN1_TIME *notBefore, ASN1_TIME *notAfter)
{
OSSL_CRMF_OPTIONALVALIDITY *vld;
OSSL_CRMF_CERTTEMPLATE *tmpl = OSSL_CRMF_MSG_get0_tmpl(crm);
@@ -306,7 +305,7 @@ int OSSL_CRMF_MSG_get_certReqId(const OSSL_CRMF_MSG *crm)
}
int OSSL_CRMF_MSG_set0_extensions(OSSL_CRMF_MSG *crm,
- X509_EXTENSIONS *exts)
+ X509_EXTENSIONS *exts)
{
OSSL_CRMF_CERTTEMPLATE *tmpl = OSSL_CRMF_MSG_get0_tmpl(crm);
@@ -326,7 +325,7 @@ int OSSL_CRMF_MSG_set0_extensions(OSSL_CRMF_MSG *crm,
}
int OSSL_CRMF_MSG_push0_extension(OSSL_CRMF_MSG *crm,
- X509_EXTENSION *ext)
+ X509_EXTENSION *ext)
{
int new = 0;
OSSL_CRMF_CERTTEMPLATE *tmpl = OSSL_CRMF_MSG_get0_tmpl(crm);
@@ -345,7 +344,7 @@ int OSSL_CRMF_MSG_push0_extension(OSSL_CRMF_MSG *crm,
if (!sk_X509_EXTENSION_push(tmpl->extensions, ext))
goto err;
return 1;
- err:
+err:
if (new != 0) {
sk_X509_EXTENSION_free(tmpl->extensions);
tmpl->extensions = NULL;
@@ -354,9 +353,9 @@ int OSSL_CRMF_MSG_push0_extension(OSSL_CRMF_MSG *crm,
}
static int create_popo_signature(OSSL_CRMF_POPOSIGNINGKEY *ps,
- const OSSL_CRMF_CERTREQUEST *cr,
- EVP_PKEY *pkey, const EVP_MD *digest,
- OSSL_LIB_CTX *libctx, const char *propq)
+ const OSSL_CRMF_CERTREQUEST *cr,
+ EVP_PKEY *pkey, const EVP_MD *digest,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
char name[80] = "";
EVP_PKEY *pub;
@@ -376,21 +375,22 @@ static int create_popo_signature(OSSL_CRMF_POPOSIGNINGKEY *ps,
}
if (EVP_PKEY_get_default_digest_name(pkey, name, sizeof(name)) > 0
- && strcmp(name, "UNDEF") == 0) /* at least for Ed25519, Ed448 */
+ && strcmp(name, "UNDEF") == 0) /* at least for Ed25519, Ed448 */
digest = NULL;
if (ASN1_item_sign_ex(ASN1_ITEM_rptr(OSSL_CRMF_CERTREQUEST),
- ps->algorithmIdentifier, /* sets this X509_ALGOR */
- NULL, ps->signature, /* sets the ASN1_BIT_STRING */
- cr, NULL, pkey, digest, libctx, propq) != 0)
+ ps->algorithmIdentifier, /* sets this X509_ALGOR */
+ NULL, ps->signature, /* sets the ASN1_BIT_STRING */
+ cr, NULL, pkey, digest, libctx, propq)
+ != 0)
return 1;
ERR_raise(ERR_LIB_CRMF, CRMF_R_ERROR_SIGNING_POPO);
return 0;
}
int OSSL_CRMF_MSG_create_popo(int meth, OSSL_CRMF_MSG *crm,
- EVP_PKEY *pkey, const EVP_MD *digest,
- OSSL_LIB_CTX *libctx, const char *propq)
+ EVP_PKEY *pkey, const EVP_MD *digest,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
OSSL_CRMF_POPO *pp = NULL;
ASN1_INTEGER *tag = NULL;
@@ -412,30 +412,27 @@ int OSSL_CRMF_MSG_create_popo(int meth, OSSL_CRMF_MSG *crm,
goto err;
break;
- case OSSL_CRMF_POPO_SIGNATURE:
- {
- OSSL_CRMF_POPOSIGNINGKEY *ps = OSSL_CRMF_POPOSIGNINGKEY_new();
-
- if (ps == NULL)
- goto err;
- if (!create_popo_signature(ps, crm->certReq, pkey, digest,
- libctx, propq)) {
- OSSL_CRMF_POPOSIGNINGKEY_free(ps);
- goto err;
- }
- pp->value.signature = ps;
+ case OSSL_CRMF_POPO_SIGNATURE: {
+ OSSL_CRMF_POPOSIGNINGKEY *ps = OSSL_CRMF_POPOSIGNINGKEY_new();
+
+ if (ps == NULL)
+ goto err;
+ if (!create_popo_signature(ps, crm->certReq, pkey, digest,
+ libctx, propq)) {
+ OSSL_CRMF_POPOSIGNINGKEY_free(ps);
+ goto err;
}
- break;
+ pp->value.signature = ps;
+ } break;
case OSSL_CRMF_POPO_KEYENC:
if ((pp->value.keyEncipherment = OSSL_CRMF_POPOPRIVKEY_new()) == NULL)
goto err;
tag = ASN1_INTEGER_new();
- pp->value.keyEncipherment->type =
- OSSL_CRMF_POPOPRIVKEY_SUBSEQUENTMESSAGE;
+ pp->value.keyEncipherment->type = OSSL_CRMF_POPOPRIVKEY_SUBSEQUENTMESSAGE;
pp->value.keyEncipherment->value.subsequentMessage = tag;
if (tag == NULL
- || !ASN1_INTEGER_set(tag, OSSL_CRMF_SUBSEQUENTMESSAGE_ENCRCERT))
+ || !ASN1_INTEGER_set(tag, OSSL_CRMF_SUBSEQUENTMESSAGE_ENCRCERT))
goto err;
break;
@@ -444,20 +441,20 @@ int OSSL_CRMF_MSG_create_popo(int meth, OSSL_CRMF_MSG *crm,
goto err;
}
- end:
+end:
OSSL_CRMF_POPO_free(crm->popo);
crm->popo = pp;
return 1;
- err:
+err:
OSSL_CRMF_POPO_free(pp);
return 0;
}
/* verifies the Proof-of-Possession of the request with the given rid in reqs */
int OSSL_CRMF_MSGS_verify_popo(const OSSL_CRMF_MSGS *reqs,
- int rid, int acceptRAVerified,
- OSSL_LIB_CTX *libctx, const char *propq)
+ int rid, int acceptRAVerified,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
OSSL_CRMF_MSG *req = NULL;
X509_PUBKEY *pubkey = NULL;
@@ -520,8 +517,9 @@ int OSSL_CRMF_MSGS_verify_popo(const OSSL_CRMF_MSGS *reqs,
asn = req->certReq;
}
if (ASN1_item_verify_ex(it, sig->algorithmIdentifier, sig->signature,
- asn, NULL, X509_PUBKEY_get0(pubkey), libctx,
- propq) < 1)
+ asn, NULL, X509_PUBKEY_get0(pubkey), libctx,
+ propq)
+ < 1)
return 0;
break;
case OSSL_CRMF_POPO_KEYENC:
@@ -577,20 +575,17 @@ X509_PUBKEY
return tmpl != NULL ? tmpl->publicKey : NULL;
}
-const ASN1_INTEGER
-*OSSL_CRMF_CERTTEMPLATE_get0_serialNumber(const OSSL_CRMF_CERTTEMPLATE *tmpl)
+const ASN1_INTEGER *OSSL_CRMF_CERTTEMPLATE_get0_serialNumber(const OSSL_CRMF_CERTTEMPLATE *tmpl)
{
return tmpl != NULL ? tmpl->serialNumber : NULL;
}
-const X509_NAME
-*OSSL_CRMF_CERTTEMPLATE_get0_subject(const OSSL_CRMF_CERTTEMPLATE *tmpl)
+const X509_NAME *OSSL_CRMF_CERTTEMPLATE_get0_subject(const OSSL_CRMF_CERTTEMPLATE *tmpl)
{
return tmpl != NULL ? tmpl->subject : NULL;
}
-const X509_NAME
-*OSSL_CRMF_CERTTEMPLATE_get0_issuer(const OSSL_CRMF_CERTTEMPLATE *tmpl)
+const X509_NAME *OSSL_CRMF_CERTTEMPLATE_get0_issuer(const OSSL_CRMF_CERTTEMPLATE *tmpl)
{
return tmpl != NULL ? tmpl->issuer : NULL;
}
@@ -603,12 +598,11 @@ X509_EXTENSIONS
const X509_NAME *OSSL_CRMF_CERTID_get0_issuer(const OSSL_CRMF_CERTID *cid)
{
- return cid != NULL && cid->issuer->type == GEN_DIRNAME ?
- cid->issuer->d.directoryName : NULL;
+ return cid != NULL && cid->issuer->type == GEN_DIRNAME ? cid->issuer->d.directoryName : NULL;
}
const ASN1_INTEGER *OSSL_CRMF_CERTID_get0_serialNumber(const OSSL_CRMF_CERTID
- *cid)
+ *cid)
{
return cid != NULL ? cid->serialNumber : NULL;
}
@@ -618,10 +612,10 @@ const ASN1_INTEGER *OSSL_CRMF_CERTID_get0_serialNumber(const OSSL_CRMF_CERTID
* Any other NULL argument will leave the respective field unchanged.
*/
int OSSL_CRMF_CERTTEMPLATE_fill(OSSL_CRMF_CERTTEMPLATE *tmpl,
- EVP_PKEY *pubkey,
- const X509_NAME *subject,
- const X509_NAME *issuer,
- const ASN1_INTEGER *serial)
+ EVP_PKEY *pubkey,
+ const X509_NAME *subject,
+ const X509_NAME *issuer,
+ const ASN1_INTEGER *serial)
{
if (tmpl == NULL) {
ERR_raise(ERR_LIB_CRMF, CRMF_R_NULL_ARGUMENT);
@@ -659,16 +653,16 @@ static int check_cmKGA(ossl_unused const X509_PURPOSE *purpose, const X509 *x, i
}
ret = 0;
- end:
+end:
sk_ASN1_OBJECT_pop_free(ekus, ASN1_OBJECT_free);
return ret;
}
#endif /* OPENSSL_NO_CMS */
EVP_PKEY *OSSL_CRMF_ENCRYPTEDKEY_get1_pkey(const OSSL_CRMF_ENCRYPTEDKEY *encryptedKey,
- X509_STORE *ts, STACK_OF(X509) *extra, EVP_PKEY *pkey,
- X509 *cert, ASN1_OCTET_STRING *secret,
- OSSL_LIB_CTX *libctx, const char *propq)
+ X509_STORE *ts, STACK_OF(X509) *extra, EVP_PKEY *pkey,
+ X509 *cert, ASN1_OCTET_STRING *secret,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
#ifndef OPENSSL_NO_CMS
BIO *bio = NULL;
@@ -689,7 +683,7 @@ EVP_PKEY *OSSL_CRMF_ENCRYPTEDKEY_get1_pkey(const OSSL_CRMF_ENCRYPTEDKEY *encrypt
int len;
p = OSSL_CRMF_ENCRYPTEDVALUE_decrypt(encryptedKey->value.encryptedValue,
- libctx, propq, pkey, &len);
+ libctx, propq, pkey, &len);
if ((p_copy = p) != NULL)
ret = d2i_AutoPrivateKey_ex(NULL, &p_copy, len, libctx, propq);
OPENSSL_free(p);
@@ -702,8 +696,9 @@ EVP_PKEY *OSSL_CRMF_ENCRYPTEDKEY_get1_pkey(const OSSL_CRMF_ENCRYPTEDKEY *encrypt
return NULL;
}
if ((bio = CMS_EnvelopedData_decrypt(encryptedKey->value.envelopedData,
- NULL, pkey, cert, secret, 0,
- libctx, propq)) == NULL) {
+ NULL, pkey, cert, secret, 0,
+ libctx, propq))
+ == NULL) {
ERR_raise(ERR_LIB_CRMF, CRMF_R_ERROR_DECRYPTING_ENCRYPTEDKEY);
goto end;
}
@@ -714,7 +709,7 @@ EVP_PKEY *OSSL_CRMF_ENCRYPTEDKEY_get1_pkey(const OSSL_CRMF_ENCRYPTEDKEY *encrypt
if ((purpose_id = X509_PURPOSE_get_by_sname(SN_cmKGA)) < 0) {
purpose_id = X509_PURPOSE_get_unused_id(libctx);
if (!X509_PURPOSE_add(purpose_id, X509_TRUST_COMPAT, 0, check_cmKGA,
- LN_cmKGA, SN_cmKGA, NULL))
+ LN_cmKGA, SN_cmKGA, NULL))
goto end;
}
if ((vpm = X509_STORE_get0_param(ts)) == NULL)
@@ -728,7 +723,7 @@ EVP_PKEY *OSSL_CRMF_ENCRYPTEDKEY_get1_pkey(const OSSL_CRMF_ENCRYPTEDKEY *encrypt
}
pkey_bio = CMS_SignedData_verify(sd, NULL, NULL /* scerts */, ts,
- extra, NULL, 0, libctx, propq);
+ extra, NULL, 0, libctx, propq);
if (!X509_STORE_set_purpose(ts, bak_purpose_id)) {
ERR_raise(ERR_LIB_CRMF, CRMF_R_ERROR_SETTING_PURPOSE);
@@ -744,7 +739,7 @@ EVP_PKEY *OSSL_CRMF_ENCRYPTEDKEY_get1_pkey(const OSSL_CRMF_ENCRYPTEDKEY *encrypt
if ((ret = d2i_PrivateKey_ex_bio(pkey_bio, NULL, libctx, propq)) == NULL)
ERR_raise(ERR_LIB_CRMF, CRMF_R_ERROR_DECODING_ENCRYPTEDKEY);
- end:
+end:
CMS_SignedData_free(sd);
BIO_free(bio);
BIO_free(pkey_bio);
@@ -757,10 +752,9 @@ EVP_PKEY *OSSL_CRMF_ENCRYPTEDKEY_get1_pkey(const OSSL_CRMF_ENCRYPTEDKEY *encrypt
#endif /* OPENSSL_NO_CMS */
}
-unsigned char
-*OSSL_CRMF_ENCRYPTEDVALUE_decrypt(const OSSL_CRMF_ENCRYPTEDVALUE *enc,
- OSSL_LIB_CTX *libctx, const char *propq,
- EVP_PKEY *pkey, int *outlen)
+unsigned char *OSSL_CRMF_ENCRYPTEDVALUE_decrypt(const OSSL_CRMF_ENCRYPTEDVALUE *enc,
+ OSSL_LIB_CTX *libctx, const char *propq,
+ EVP_PKEY *pkey, int *outlen)
{
EVP_CIPHER_CTX *evp_ctx = NULL; /* context for symmetric encryption */
unsigned char *ek = NULL; /* decrypted symmetric encryption key */
@@ -779,7 +773,7 @@ unsigned char
}
*outlen = 0;
if (enc == NULL || enc->symmAlg == NULL || enc->encSymmKey == NULL
- || enc->encValue == NULL || pkey == NULL) {
+ || enc->encValue == NULL || pkey == NULL) {
ERR_raise(ERR_LIB_CRMF, CRMF_R_NULL_ARGUMENT);
return NULL;
}
@@ -806,12 +800,13 @@ unsigned char
int retval;
if (EVP_PKEY_decrypt(pkctx, NULL, &eksize,
- encKey->data, encKey->length) <= 0
- || (ek = OPENSSL_malloc(eksize)) == NULL)
+ encKey->data, encKey->length)
+ <= 0
+ || (ek = OPENSSL_malloc(eksize)) == NULL)
goto end;
retval = EVP_PKEY_decrypt(pkctx, ek, &eksize, encKey->data, encKey->length);
failure = ~constant_time_is_zero_s(constant_time_msb(retval)
- | constant_time_is_zero(retval));
+ | constant_time_is_zero(retval));
failure |= ~constant_time_eq_s(eksize, (size_t)cikeysize);
if (failure) {
ERR_clear_error(); /* error state may have sensitive information */
@@ -824,30 +819,29 @@ unsigned char
if ((iv = OPENSSL_malloc(EVP_CIPHER_get_iv_length(cipher))) == NULL)
goto end;
if (ASN1_TYPE_get_octetstring(enc->symmAlg->parameter, iv,
- EVP_CIPHER_get_iv_length(cipher))
+ EVP_CIPHER_get_iv_length(cipher))
!= EVP_CIPHER_get_iv_length(cipher)) {
ERR_raise(ERR_LIB_CRMF, CRMF_R_MALFORMED_IV);
goto end;
}
- if ((out = OPENSSL_malloc(enc->encValue->length +
- EVP_CIPHER_get_block_size(cipher))) == NULL
- || (evp_ctx = EVP_CIPHER_CTX_new()) == NULL)
+ if ((out = OPENSSL_malloc(enc->encValue->length + EVP_CIPHER_get_block_size(cipher))) == NULL
+ || (evp_ctx = EVP_CIPHER_CTX_new()) == NULL)
goto end;
EVP_CIPHER_CTX_set_padding(evp_ctx, 0);
if (!EVP_DecryptInit(evp_ctx, cipher, ek, iv)
- || !EVP_DecryptUpdate(evp_ctx, out, outlen,
- enc->encValue->data,
- enc->encValue->length)
- || !EVP_DecryptFinal(evp_ctx, out + *outlen, &n)) {
+ || !EVP_DecryptUpdate(evp_ctx, out, outlen,
+ enc->encValue->data,
+ enc->encValue->length)
+ || !EVP_DecryptFinal(evp_ctx, out + *outlen, &n)) {
ERR_raise(ERR_LIB_CRMF, CRMF_R_ERROR_DECRYPTING_ENCRYPTEDVALUE);
goto end;
}
*outlen += n;
ret = 1;
- end:
+end:
EVP_PKEY_CTX_free(pkctx);
EVP_CIPHER_CTX_free(evp_ctx);
EVP_CIPHER_free(cipher);
@@ -867,8 +861,8 @@ unsigned char
* returns NULL on error or if no certificate available
*/
X509 *OSSL_CRMF_ENCRYPTEDVALUE_get1_encCert(const OSSL_CRMF_ENCRYPTEDVALUE *ecert,
- OSSL_LIB_CTX *libctx, const char *propq,
- EVP_PKEY *pkey)
+ OSSL_LIB_CTX *libctx, const char *propq,
+ EVP_PKEY *pkey)
{
unsigned char *buf = NULL;
const unsigned char *p;
@@ -885,7 +879,7 @@ X509 *OSSL_CRMF_ENCRYPTEDVALUE_get1_encCert(const OSSL_CRMF_ENCRYPTEDVALUE *ecer
cert = NULL;
}
- end:
+end:
OPENSSL_free(buf);
return cert;
}
@@ -897,8 +891,8 @@ X509 *OSSL_CRMF_ENCRYPTEDVALUE_get1_encCert(const OSSL_CRMF_ENCRYPTEDVALUE *ecer
* returns NULL on error or if no certificate available
*/
X509 *OSSL_CRMF_ENCRYPTEDKEY_get1_encCert(const OSSL_CRMF_ENCRYPTEDKEY *ecert,
- OSSL_LIB_CTX *libctx, const char *propq,
- EVP_PKEY *pkey, unsigned int flags)
+ OSSL_LIB_CTX *libctx, const char *propq,
+ EVP_PKEY *pkey, unsigned int flags)
{
#ifndef OPENSSL_NO_CMS
BIO *bio;
@@ -907,11 +901,11 @@ X509 *OSSL_CRMF_ENCRYPTEDKEY_get1_encCert(const OSSL_CRMF_ENCRYPTEDKEY *ecert,
if (ecert->type != OSSL_CRMF_ENCRYPTEDKEY_ENVELOPEDDATA)
return OSSL_CRMF_ENCRYPTEDVALUE_get1_encCert(ecert->value.encryptedValue,
- libctx, propq, pkey);
+ libctx, propq, pkey);
#ifndef OPENSSL_NO_CMS
bio = CMS_EnvelopedData_decrypt(ecert->value.envelopedData, NULL,
- pkey, NULL /* cert */, NULL, flags,
- libctx, propq);
+ pkey, NULL /* cert */, NULL, flags,
+ libctx, propq);
if (bio == NULL)
return NULL;
cert = d2i_X509_bio(bio, NULL);
diff --git a/crypto/crmf/crmf_local.h b/crypto/crmf/crmf_local.h
index d193368bd3..17bf989116 100644
--- a/crypto/crmf/crmf_local.h
+++ b/crypto/crmf/crmf_local.h
@@ -12,9 +12,9 @@
*/
#ifndef OSSL_CRYPTO_CRMF_LOCAL_H
-# define OSSL_CRYPTO_CRMF_LOCAL_H
+#define OSSL_CRYPTO_CRMF_LOCAL_H
-# include "internal/crmf.h"
+#include "internal/crmf.h"
/*-
* EncryptedValue ::= SEQUENCE {
@@ -36,10 +36,10 @@
* }
*/
struct ossl_crmf_encryptedvalue_st {
- X509_ALGOR *intendedAlg; /* 0 */
- X509_ALGOR *symmAlg; /* 1 */
- ASN1_BIT_STRING *encSymmKey; /* 2 */
- X509_ALGOR *keyAlg; /* 3 */
+ X509_ALGOR *intendedAlg; /* 0 */
+ X509_ALGOR *symmAlg; /* 1 */
+ ASN1_BIT_STRING *encSymmKey; /* 2 */
+ X509_ALGOR *keyAlg; /* 3 */
ASN1_OCTET_STRING *valueHint; /* 4 */
ASN1_BIT_STRING *encValue;
} /* OSSL_CRMF_ENCRYPTEDVALUE */;
@@ -51,15 +51,15 @@ struct ossl_crmf_encryptedvalue_st {
* -- The encrypted private key MUST be placed in the envelopedData
* -- encryptedContentInfo encryptedContent OCTET STRING.
*/
-# define OSSL_CRMF_ENCRYPTEDKEY_ENVELOPEDDATA 1
+#define OSSL_CRMF_ENCRYPTEDKEY_ENVELOPEDDATA 1
struct ossl_crmf_encryptedkey_st {
int type;
union {
OSSL_CRMF_ENCRYPTEDVALUE *encryptedValue; /* 0 */ /* Deprecated */
-# ifndef OPENSSL_NO_CMS
+#ifndef OPENSSL_NO_CMS
CMS_EnvelopedData *envelopedData; /* 1 */
-# endif
+#endif
} value;
} /* OSSL_CRMF_ENCRYPTEDKEY */;
@@ -223,7 +223,7 @@ struct ossl_crmf_pbmparameter_st {
ASN1_INTEGER *iterationCount;
X509_ALGOR *mac;
} /* OSSL_CRMF_PBMPARAMETER */;
-# define OSSL_CRMF_PBM_MAX_ITERATION_COUNT 100000 /* if too large allows DoS */
+#define OSSL_CRMF_PBM_MAX_ITERATION_COUNT 100000 /* if too large allows DoS */
/*-
* POPOSigningKeyInput ::= SEQUENCE {
diff --git a/crypto/crmf/crmf_pbm.c b/crypto/crmf/crmf_pbm.c
index 0b72e661b2..7f326a0b6a 100644
--- a/crypto/crmf/crmf_pbm.c
+++ b/crypto/crmf/crmf_pbm.c
@@ -25,8 +25,8 @@
* returns pointer to OSSL_CRMF_PBMPARAMETER on success, NULL on error
*/
OSSL_CRMF_PBMPARAMETER *OSSL_CRMF_pbmp_new(OSSL_LIB_CTX *libctx, size_t slen,
- int owfnid, size_t itercnt,
- int macnid)
+ int owfnid, size_t itercnt,
+ int macnid)
{
OSSL_CRMF_PBMPARAMETER *pbm = NULL;
unsigned char *salt = NULL;
@@ -94,7 +94,7 @@ OSSL_CRMF_PBMPARAMETER *OSSL_CRMF_pbmp_new(OSSL_LIB_CTX *libctx, size_t slen,
OPENSSL_free(salt);
return pbm;
- err:
+err:
OPENSSL_free(salt);
OSSL_CRMF_PBMPARAMETER_free(pbm);
return NULL;
@@ -113,10 +113,10 @@ OSSL_CRMF_PBMPARAMETER *OSSL_CRMF_pbmp_new(OSSL_LIB_CTX *libctx, size_t slen,
*/
/* could be combined with other MAC calculations in the library */
int OSSL_CRMF_pbm_new(OSSL_LIB_CTX *libctx, const char *propq,
- const OSSL_CRMF_PBMPARAMETER *pbmp,
- const unsigned char *msg, size_t msglen,
- const unsigned char *sec, size_t seclen,
- unsigned char **out, size_t *outlen)
+ const OSSL_CRMF_PBMPARAMETER *pbmp,
+ const unsigned char *msg, size_t msglen,
+ const unsigned char *sec, size_t seclen,
+ unsigned char **out, size_t *outlen)
{
int mac_nid, hmac_md_nid = NID_undef;
char mdname[OSSL_MAX_NAME_SIZE];
@@ -130,7 +130,7 @@ int OSSL_CRMF_pbm_new(OSSL_LIB_CTX *libctx, const char *propq,
int ok = 0;
if (out == NULL || pbmp == NULL || pbmp->mac == NULL
- || pbmp->mac->algorithm == NULL || msg == NULL || sec == NULL) {
+ || pbmp->mac->algorithm == NULL || msg == NULL || sec == NULL) {
ERR_raise(ERR_LIB_CRMF, CRMF_R_NULL_ARGUMENT);
goto err;
}
@@ -163,8 +163,8 @@ int OSSL_CRMF_pbm_new(OSSL_LIB_CTX *libctx, const char *propq,
if (!EVP_DigestFinal_ex(ctx, basekey, &bklen))
goto err;
if (!ASN1_INTEGER_get_int64(&iterations, pbmp->iterationCount)
- || iterations < 100 /* min from RFC */
- || iterations > OSSL_CRMF_PBM_MAX_ITERATION_COUNT) {
+ || iterations < 100 /* min from RFC */
+ || iterations > OSSL_CRMF_PBM_MAX_ITERATION_COUNT) {
ERR_raise(ERR_LIB_CRMF, CRMF_R_BAD_PBM_ITERATIONCOUNT);
goto err;
}
@@ -188,18 +188,20 @@ int OSSL_CRMF_pbm_new(OSSL_LIB_CTX *libctx, const char *propq,
if (!EVP_PBE_find(EVP_PBE_TYPE_PRF, mac_nid, NULL, &hmac_md_nid, NULL)
|| OBJ_obj2txt(hmac_mdname, sizeof(hmac_mdname),
- OBJ_nid2obj(hmac_md_nid), 0) <= 0) {
+ OBJ_nid2obj(hmac_md_nid), 0)
+ <= 0) {
ERR_raise(ERR_LIB_CRMF, CRMF_R_UNSUPPORTED_ALGORITHM);
goto err;
}
/* could be generalized to allow non-HMAC: */
if (EVP_Q_mac(libctx, "HMAC", propq, hmac_mdname, NULL, basekey, bklen,
- msg, msglen, mac_res, EVP_MAX_MD_SIZE, outlen) == NULL)
+ msg, msglen, mac_res, EVP_MAX_MD_SIZE, outlen)
+ == NULL)
goto err;
ok = 1;
- err:
+err:
OPENSSL_cleanse(basekey, bklen);
EVP_MD_free(owf);
EVP_MD_CTX_free(ctx);
diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index b28d81450f..7624574103 100644
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -13,28 +13,28 @@
#include <openssl/safestack.h>
#if defined(_WIN32) && !defined(OPENSSL_SYS_UEFI)
-# include <tchar.h>
-# include <signal.h>
-# ifdef __WATCOMC__
-# if defined(_UNICODE) || defined(__UNICODE__)
-# define _vsntprintf _vsnwprintf
-# else
-# define _vsntprintf _vsnprintf
-# endif
-# endif
-# ifdef _MSC_VER
-# define alloca _alloca
-# endif
+#include <tchar.h>
+#include <signal.h>
+#ifdef __WATCOMC__
+#if defined(_UNICODE) || defined(__UNICODE__)
+#define _vsntprintf _vsnwprintf
+#else
+#define _vsntprintf _vsnprintf
+#endif
+#endif
+#ifdef _MSC_VER
+#define alloca _alloca
+#endif
-# if defined(_WIN32_WINNT) && _WIN32_WINNT>=0x0333
-# ifdef OPENSSL_SYS_WIN_CORE
+#if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0333
+#ifdef OPENSSL_SYS_WIN_CORE
int OPENSSL_isservice(void)
{
/* OneCore API cannot interact with GUI */
return 1;
}
-# else
+#else
int OPENSSL_isservice(void)
{
HWINSTA h;
@@ -66,20 +66,19 @@ int OPENSSL_isservice(void)
if (h == NULL)
return -1;
- if (GetUserObjectInformationW(h, UOI_NAME, NULL, 0, &len) ||
- GetLastError() != ERROR_INSUFFICIENT_BUFFER)
+ if (GetUserObjectInformationW(h, UOI_NAME, NULL, 0, &len) || GetLastError() != ERROR_INSUFFICIENT_BUFFER)
return -1;
if (len > 512)
- return -1; /* paranoia */
- len++, len &= ~1; /* paranoia */
+ return -1; /* paranoia */
+ len++, len &= ~1; /* paranoia */
name = (WCHAR *)alloca(len + sizeof(WCHAR));
if (!GetUserObjectInformationW(h, UOI_NAME, name, len, &len))
return -1;
- len++, len &= ~1; /* paranoia */
+ len++, len &= ~1; /* paranoia */
name[len / sizeof(WCHAR)] = L'\0'; /* paranoia */
-# if 1
+#if 1
/*
* This doesn't cover "interactive" services [working with real
* WinSta0's] nor programs started non-interactively by Task Scheduler
@@ -87,21 +86,21 @@ int OPENSSL_isservice(void)
*/
if (wcsstr(name, L"Service-0x"))
return 1;
-# else
+#else
/* This covers all non-interactive programs such as services. */
if (!wcsstr(name, L"WinSta0"))
return 1;
-# endif
+#endif
else
return 0;
}
-# endif
-# else
+#endif
+#else
int OPENSSL_isservice(void)
{
return 0;
}
-# endif
+#endif
void OPENSSL_showfatal(const char *fmta, ...)
{
@@ -114,22 +113,21 @@ void OPENSSL_showfatal(const char *fmta, ...)
* Windows CE does not have a concept of a console application,
* so we need to guard the check.
*/
-# ifdef STD_ERROR_HANDLE
+#ifdef STD_ERROR_HANDLE
HANDLE h;
- if ((h = GetStdHandle(STD_ERROR_HANDLE)) != NULL &&
- GetFileType(h) != FILE_TYPE_UNKNOWN) {
+ if ((h = GetStdHandle(STD_ERROR_HANDLE)) != NULL && GetFileType(h) != FILE_TYPE_UNKNOWN) {
/* must be console application */
int len;
DWORD out;
va_start(ap, fmta);
len = _vsnprintf((char *)buf, sizeof(buf), fmta, ap);
- WriteFile(h, buf, len < 0 ? sizeof(buf) : (DWORD) len, &out, NULL);
+ WriteFile(h, buf, len < 0 ? sizeof(buf) : (DWORD)len, &out, NULL);
va_end(ap);
return;
}
-# endif
+#endif
if (sizeof(TCHAR) == sizeof(char))
fmt = (const TCHAR *)fmta;
@@ -191,19 +189,19 @@ void OPENSSL_showfatal(const char *fmta, ...)
buf[OSSL_NELEM(buf) - 1] = _T('\0');
va_end(ap);
-# if defined(_WIN32_WINNT) && _WIN32_WINNT>=0x0333
-# ifdef OPENSSL_SYS_WIN_CORE
+#if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0333
+#ifdef OPENSSL_SYS_WIN_CORE
/* ONECORE is always NONGUI and NT >= 0x0601 */
-# if !defined(NDEBUG)
- /*
- * We are in a situation where we tried to report a critical
- * error and this failed for some reason. As a last resort,
- * in debug builds, send output to the debugger or any other
- * tool like DebugView which can monitor the output.
- */
- OutputDebugString(buf);
-# endif
-# else
+#if !defined(NDEBUG)
+ /*
+ * We are in a situation where we tried to report a critical
+ * error and this failed for some reason. As a last resort,
+ * in debug builds, send output to the debugger or any other
+ * tool like DebugView which can monitor the output.
+ */
+ OutputDebugString(buf);
+#endif
+#else
/* this -------------v--- guards NT-specific calls */
if (check_winnt() && OPENSSL_isservice() > 0) {
HANDLE hEventLog = RegisterEventSource(NULL, _T("OpenSSL"));
@@ -212,8 +210,8 @@ void OPENSSL_showfatal(const char *fmta, ...)
const TCHAR *pmsg = buf;
if (!ReportEvent(hEventLog, EVENTLOG_ERROR_TYPE, 0, 0, NULL,
- 1, 0, &pmsg, NULL)) {
-# if !defined(NDEBUG)
+ 1, 0, &pmsg, NULL)) {
+#if !defined(NDEBUG)
/*
* We are in a situation where we tried to report a critical
* error and this failed for some reason. As a last resort,
@@ -221,7 +219,7 @@ void OPENSSL_showfatal(const char *fmta, ...)
* tool like DebugView which can monitor the output.
*/
OutputDebugString(pmsg);
-# endif
+#endif
}
(void)DeregisterEventSource(hEventLog);
@@ -229,10 +227,10 @@ void OPENSSL_showfatal(const char *fmta, ...)
} else {
MessageBox(NULL, buf, _T("OpenSSL: FATAL"), MB_OK | MB_ICONERROR);
}
-# endif
-# else
+#endif
+#else
MessageBox(NULL, buf, _T("OpenSSL: FATAL"), MB_OK | MB_ICONERROR);
-# endif
+#endif
}
#else
void OPENSSL_showfatal(const char *fmta, ...)
@@ -255,16 +253,16 @@ int OPENSSL_isservice(void)
void OPENSSL_die(const char *message, const char *file, int line)
{
OPENSSL_showfatal("%s:%d: OpenSSL internal error: %s\n",
- file, line, message);
+ file, line, message);
#if !defined(_WIN32) || defined(OPENSSL_SYS_UEFI)
abort();
#else
/*
* Win32 abort() customarily shows a dialog, but we just did that...
*/
-# if !defined(_WIN32_WCE)
+#if !defined(_WIN32_WCE)
raise(SIGABRT);
-# endif
+#endif
_exit(3);
#endif
}
@@ -275,8 +273,8 @@ void OPENSSL_die(const char *message, const char *file, int line)
* This is used by platform version identification tools.
* Do not inline this procedure or make it static.
*/
-# define OPENSSL_VPROC_STRING_(x) x##_CRYPTO
-# define OPENSSL_VPROC_STRING(x) OPENSSL_VPROC_STRING_(x)
-# define OPENSSL_VPROC_FUNC OPENSSL_VPROC_STRING(OPENSSL_VPROC)
-void OPENSSL_VPROC_FUNC(void) {}
+#define OPENSSL_VPROC_STRING_(x) x##_CRYPTO
+#define OPENSSL_VPROC_STRING(x) OPENSSL_VPROC_STRING_(x)
+#define OPENSSL_VPROC_FUNC OPENSSL_VPROC_STRING(OPENSSL_VPROC)
+void OPENSSL_VPROC_FUNC(void) { }
#endif /* __TANDEM */
diff --git a/crypto/ct/ct_b64.c b/crypto/ct/ct_b64.c
index eb3b06bd18..a292a95627 100644
--- a/crypto/ct/ct_b64.c
+++ b/crypto/ct/ct_b64.c
@@ -59,13 +59,13 @@ err:
}
SCT *SCT_new_from_base64(unsigned char version, const char *logid_base64,
- ct_log_entry_type_t entry_type, uint64_t timestamp,
- const char *extensions_base64,
- const char *signature_base64)
+ ct_log_entry_type_t entry_type, uint64_t timestamp,
+ const char *extensions_base64,
+ const char *signature_base64)
{
SCT *sct = SCT_new();
unsigned char *dec = NULL;
- const unsigned char* p = NULL;
+ const unsigned char *p = NULL;
int declen;
if (sct == NULL) {
@@ -118,7 +118,7 @@ SCT *SCT_new_from_base64(unsigned char version, const char *logid_base64,
return sct;
- err:
+err:
OPENSSL_free(dec);
SCT_free(sct);
return NULL;
@@ -131,8 +131,8 @@ SCT *SCT_new_from_base64(unsigned char version, const char *logid_base64,
* -1 on internal (malloc) failure
*/
int CTLOG_new_from_base64_ex(CTLOG **ct_log, const char *pkey_base64,
- const char *name, OSSL_LIB_CTX *libctx,
- const char *propq)
+ const char *name, OSSL_LIB_CTX *libctx,
+ const char *propq)
{
unsigned char *pkey_der = NULL;
int pkey_der_len;
@@ -168,7 +168,7 @@ int CTLOG_new_from_base64_ex(CTLOG **ct_log, const char *pkey_base64,
}
int CTLOG_new_from_base64(CTLOG **ct_log, const char *pkey_base64,
- const char *name)
+ const char *name)
{
return CTLOG_new_from_base64_ex(ct_log, pkey_base64, name, NULL, NULL);
}
diff --git a/crypto/ct/ct_err.c b/crypto/ct/ct_err.c
index c4dd05119e..21d9061b9b 100644
--- a/crypto/ct/ct_err.c
+++ b/crypto/ct/ct_err.c
@@ -14,46 +14,46 @@
#ifndef OPENSSL_NO_CT
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA CT_str_reasons[] = {
- {ERR_PACK(ERR_LIB_CT, 0, CT_R_BASE64_DECODE_ERROR), "base64 decode error"},
- {ERR_PACK(ERR_LIB_CT, 0, CT_R_INVALID_LOG_ID_LENGTH),
- "invalid log id length"},
- {ERR_PACK(ERR_LIB_CT, 0, CT_R_LOG_CONF_INVALID), "log conf invalid"},
- {ERR_PACK(ERR_LIB_CT, 0, CT_R_LOG_CONF_INVALID_KEY),
- "log conf invalid key"},
- {ERR_PACK(ERR_LIB_CT, 0, CT_R_LOG_CONF_MISSING_DESCRIPTION),
- "log conf missing description"},
- {ERR_PACK(ERR_LIB_CT, 0, CT_R_LOG_CONF_MISSING_KEY),
- "log conf missing key"},
- {ERR_PACK(ERR_LIB_CT, 0, CT_R_LOG_KEY_INVALID), "log key invalid"},
- {ERR_PACK(ERR_LIB_CT, 0, CT_R_SCT_FUTURE_TIMESTAMP),
- "sct future timestamp"},
- {ERR_PACK(ERR_LIB_CT, 0, CT_R_SCT_INVALID), "sct invalid"},
- {ERR_PACK(ERR_LIB_CT, 0, CT_R_SCT_INVALID_SIGNATURE),
- "sct invalid signature"},
- {ERR_PACK(ERR_LIB_CT, 0, CT_R_SCT_LIST_INVALID), "sct list invalid"},
- {ERR_PACK(ERR_LIB_CT, 0, CT_R_SCT_LOG_ID_MISMATCH), "sct log id mismatch"},
- {ERR_PACK(ERR_LIB_CT, 0, CT_R_SCT_NOT_SET), "sct not set"},
- {ERR_PACK(ERR_LIB_CT, 0, CT_R_SCT_UNSUPPORTED_VERSION),
- "sct unsupported version"},
- {ERR_PACK(ERR_LIB_CT, 0, CT_R_UNRECOGNIZED_SIGNATURE_NID),
- "unrecognized signature nid"},
- {ERR_PACK(ERR_LIB_CT, 0, CT_R_UNSUPPORTED_ENTRY_TYPE),
- "unsupported entry type"},
- {ERR_PACK(ERR_LIB_CT, 0, CT_R_UNSUPPORTED_VERSION), "unsupported version"},
- {0, NULL}
+ { ERR_PACK(ERR_LIB_CT, 0, CT_R_BASE64_DECODE_ERROR), "base64 decode error" },
+ { ERR_PACK(ERR_LIB_CT, 0, CT_R_INVALID_LOG_ID_LENGTH),
+ "invalid log id length" },
+ { ERR_PACK(ERR_LIB_CT, 0, CT_R_LOG_CONF_INVALID), "log conf invalid" },
+ { ERR_PACK(ERR_LIB_CT, 0, CT_R_LOG_CONF_INVALID_KEY),
+ "log conf invalid key" },
+ { ERR_PACK(ERR_LIB_CT, 0, CT_R_LOG_CONF_MISSING_DESCRIPTION),
+ "log conf missing description" },
+ { ERR_PACK(ERR_LIB_CT, 0, CT_R_LOG_CONF_MISSING_KEY),
+ "log conf missing key" },
+ { ERR_PACK(ERR_LIB_CT, 0, CT_R_LOG_KEY_INVALID), "log key invalid" },
+ { ERR_PACK(ERR_LIB_CT, 0, CT_R_SCT_FUTURE_TIMESTAMP),
+ "sct future timestamp" },
+ { ERR_PACK(ERR_LIB_CT, 0, CT_R_SCT_INVALID), "sct invalid" },
+ { ERR_PACK(ERR_LIB_CT, 0, CT_R_SCT_INVALID_SIGNATURE),
+ "sct invalid signature" },
+ { ERR_PACK(ERR_LIB_CT, 0, CT_R_SCT_LIST_INVALID), "sct list invalid" },
+ { ERR_PACK(ERR_LIB_CT, 0, CT_R_SCT_LOG_ID_MISMATCH), "sct log id mismatch" },
+ { ERR_PACK(ERR_LIB_CT, 0, CT_R_SCT_NOT_SET), "sct not set" },
+ { ERR_PACK(ERR_LIB_CT, 0, CT_R_SCT_UNSUPPORTED_VERSION),
+ "sct unsupported version" },
+ { ERR_PACK(ERR_LIB_CT, 0, CT_R_UNRECOGNIZED_SIGNATURE_NID),
+ "unrecognized signature nid" },
+ { ERR_PACK(ERR_LIB_CT, 0, CT_R_UNSUPPORTED_ENTRY_TYPE),
+ "unsupported entry type" },
+ { ERR_PACK(ERR_LIB_CT, 0, CT_R_UNSUPPORTED_VERSION), "unsupported version" },
+ { 0, NULL }
};
-# endif
+#endif
int ossl_err_load_CT_strings(void)
{
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(CT_str_reasons[0].error) == NULL)
ERR_load_strings_const(CT_str_reasons);
-# endif
+#endif
return 1;
}
#else
diff --git a/crypto/ct/ct_local.h b/crypto/ct/ct_local.h
index e5614ddf5e..d2f6c48cbd 100644
--- a/crypto/ct/ct_local.h
+++ b/crypto/ct/ct_local.h
@@ -18,40 +18,41 @@
* From RFC6962: opaque SerializedSCT<1..2^16-1>; struct { SerializedSCT
* sct_list <1..2^16-1>; } SignedCertificateTimestampList;
*/
-# define MAX_SCT_SIZE 65535
-# define MAX_SCT_LIST_SIZE MAX_SCT_SIZE
+#define MAX_SCT_SIZE 65535
+#define MAX_SCT_LIST_SIZE MAX_SCT_SIZE
/*
* Macros to read and write integers in network-byte order.
*/
-#define n2s(c,s) ((s=(((unsigned int)((c)[0]))<< 8)| \
- (((unsigned int)((c)[1])) )),c+=2)
-
-#define s2n(s,c) ((c[0]=(unsigned char)(((s)>> 8)&0xff), \
- c[1]=(unsigned char)(((s) )&0xff)),c+=2)
-
-#define l2n3(l,c) ((c[0]=(unsigned char)(((l)>>16)&0xff), \
- c[1]=(unsigned char)(((l)>> 8)&0xff), \
- c[2]=(unsigned char)(((l) )&0xff)),c+=3)
-
-#define n2l8(c,l) (l =((uint64_t)(*((c)++)))<<56, \
- l|=((uint64_t)(*((c)++)))<<48, \
- l|=((uint64_t)(*((c)++)))<<40, \
- l|=((uint64_t)(*((c)++)))<<32, \
- l|=((uint64_t)(*((c)++)))<<24, \
- l|=((uint64_t)(*((c)++)))<<16, \
- l|=((uint64_t)(*((c)++)))<< 8, \
- l|=((uint64_t)(*((c)++))))
-
-#define l2n8(l,c) (*((c)++)=(unsigned char)(((l)>>56)&0xff), \
- *((c)++)=(unsigned char)(((l)>>48)&0xff), \
- *((c)++)=(unsigned char)(((l)>>40)&0xff), \
- *((c)++)=(unsigned char)(((l)>>32)&0xff), \
- *((c)++)=(unsigned char)(((l)>>24)&0xff), \
- *((c)++)=(unsigned char)(((l)>>16)&0xff), \
- *((c)++)=(unsigned char)(((l)>> 8)&0xff), \
- *((c)++)=(unsigned char)(((l) )&0xff))
+#define n2s(c, s) ((s = (((unsigned int)((c)[0])) << 8) | (((unsigned int)((c)[1])))), c += 2)
+
+#define s2n(s, c) ((c[0] = (unsigned char)(((s) >> 8) & 0xff), \
+ c[1] = (unsigned char)(((s)) & 0xff)), \
+ c += 2)
+
+#define l2n3(l, c) ((c[0] = (unsigned char)(((l) >> 16) & 0xff), \
+ c[1] = (unsigned char)(((l) >> 8) & 0xff), \
+ c[2] = (unsigned char)(((l)) & 0xff)), \
+ c += 3)
+
+#define n2l8(c, l) (l = ((uint64_t)(*((c)++))) << 56, \
+ l |= ((uint64_t)(*((c)++))) << 48, \
+ l |= ((uint64_t)(*((c)++))) << 40, \
+ l |= ((uint64_t)(*((c)++))) << 32, \
+ l |= ((uint64_t)(*((c)++))) << 24, \
+ l |= ((uint64_t)(*((c)++))) << 16, \
+ l |= ((uint64_t)(*((c)++))) << 8, \
+ l |= ((uint64_t)(*((c)++))))
+
+#define l2n8(l, c) (*((c)++) = (unsigned char)(((l) >> 56) & 0xff), \
+ *((c)++) = (unsigned char)(((l) >> 48) & 0xff), \
+ *((c)++) = (unsigned char)(((l) >> 40) & 0xff), \
+ *((c)++) = (unsigned char)(((l) >> 32) & 0xff), \
+ *((c)++) = (unsigned char)(((l) >> 24) & 0xff), \
+ *((c)++) = (unsigned char)(((l) >> 16) & 0xff), \
+ *((c)++) = (unsigned char)(((l) >> 8) & 0xff), \
+ *((c)++) = (unsigned char)(((l)) & 0xff))
/* Signed Certificate Timestamp */
struct sct_st {
@@ -63,10 +64,10 @@ struct sct_st {
unsigned char *log_id;
size_t log_id_len;
/*
- * Note, we cannot distinguish between an unset timestamp, and one
- * that is set to 0. However since CT didn't exist in 1970, no real
- * SCT should ever be set as such.
- */
+ * Note, we cannot distinguish between an unset timestamp, and one
+ * that is set to 0. However since CT didn't exist in 1970, no real
+ * SCT should ever be set as such.
+ */
uint64_t timestamp;
unsigned char *ext;
size_t ext_len;
@@ -191,24 +192,24 @@ __owur int SCT_is_complete(const SCT *sct);
__owur int SCT_signature_is_complete(const SCT *sct);
/*
-* Serialize (to TLS format) an |sct| signature and write it to |out|.
-* If |out| is null, no signature will be output but the length will be returned.
-* If |out| points to a null pointer, a string will be allocated to hold the
-* TLS-format signature. It is the responsibility of the caller to free it.
-* If |out| points to an allocated string, the signature will be written to it.
-* The length of the signature in TLS format will be returned.
-*/
+ * Serialize (to TLS format) an |sct| signature and write it to |out|.
+ * If |out| is null, no signature will be output but the length will be returned.
+ * If |out| points to a null pointer, a string will be allocated to hold the
+ * TLS-format signature. It is the responsibility of the caller to free it.
+ * If |out| points to an allocated string, the signature will be written to it.
+ * The length of the signature in TLS format will be returned.
+ */
__owur int i2o_SCT_signature(const SCT *sct, unsigned char **out);
/*
-* Parses an SCT signature in TLS format and populates the |sct| with it.
-* |in| should be a pointer to a string containing the TLS-format signature.
-* |in| will be advanced to the end of the signature if parsing succeeds.
-* |len| should be the length of the signature in |in|.
-* Returns the number of bytes parsed, or a negative integer if an error occurs.
-* If an error occurs, the SCT's signature NID may be updated whilst the
-* signature field itself remains unset.
-*/
+ * Parses an SCT signature in TLS format and populates the |sct| with it.
+ * |in| should be a pointer to a string containing the TLS-format signature.
+ * |in| will be advanced to the end of the signature if parsing succeeds.
+ * |len| should be the length of the signature in |in|.
+ * Returns the number of bytes parsed, or a negative integer if an error occurs.
+ * If an error occurs, the SCT's signature NID may be updated whilst the
+ * signature field itself remains unset.
+ */
__owur int o2i_SCT_signature(SCT *sct, const unsigned char **in, size_t len);
/*
diff --git a/crypto/ct/ct_log.c b/crypto/ct/ct_log.c
index 95084dc76f..b9990dc9a0 100644
--- a/crypto/ct/ct_log.c
+++ b/crypto/ct/ct_log.c
@@ -56,7 +56,7 @@ static CTLOG_STORE_LOAD_CTX *ctlog_store_load_ctx_new(void);
* Deletes a CT log store load context.
* Does not delete any of the fields.
*/
-static void ctlog_store_load_ctx_free(CTLOG_STORE_LOAD_CTX* ctx);
+static void ctlog_store_load_ctx_free(CTLOG_STORE_LOAD_CTX *ctx);
static CTLOG_STORE_LOAD_CTX *ctlog_store_load_ctx_new(void)
{
@@ -65,7 +65,7 @@ static CTLOG_STORE_LOAD_CTX *ctlog_store_load_ctx_new(void)
return ctx;
}
-static void ctlog_store_load_ctx_free(CTLOG_STORE_LOAD_CTX* ctx)
+static void ctlog_store_load_ctx_free(CTLOG_STORE_LOAD_CTX *ctx)
{
OPENSSL_free(ctx);
}
@@ -90,7 +90,7 @@ static int ct_v1_log_id_from_pkey(CTLOG *log, EVP_PKEY *pkey)
}
ret = EVP_Digest(pkey_der, pkey_der_len, log->log_id, &len, sha256,
- NULL);
+ NULL);
err:
EVP_MD_free(sha256);
OPENSSL_free(pkey_der);
@@ -138,7 +138,7 @@ void CTLOG_STORE_free(CTLOG_STORE *store)
}
static int ctlog_new_from_conf(CTLOG_STORE *store, CTLOG **ct_log,
- const CONF *conf, const char *section)
+ const CONF *conf, const char *section)
{
const char *description = NCONF_get_string(conf, section, "description");
char *pkey_base64;
@@ -155,7 +155,7 @@ static int ctlog_new_from_conf(CTLOG_STORE *store, CTLOG **ct_log,
}
return CTLOG_new_from_base64_ex(ct_log, pkey_base64, description,
- store->libctx, store->propq);
+ store->libctx, store->propq);
}
int CTLOG_STORE_load_default_file(CTLOG_STORE *store)
@@ -163,7 +163,7 @@ int CTLOG_STORE_load_default_file(CTLOG_STORE *store)
const char *fpath = ossl_safe_getenv(CTLOG_FILE_EVP);
if (fpath == NULL)
- fpath = CTLOG_FILE;
+ fpath = CTLOG_FILE;
return CTLOG_STORE_load_file(store, fpath);
}
@@ -175,7 +175,7 @@ int CTLOG_STORE_load_default_file(CTLOG_STORE *store)
* It may stop parsing and returns -1 on any internal (malloc) error.
*/
static int ctlog_store_load_log(const char *log_name, int log_name_len,
- void *arg)
+ void *arg)
{
CTLOG_STORE_LOAD_CTX *load_ctx = arg;
CTLOG *ct_log = NULL;
@@ -216,7 +216,7 @@ int CTLOG_STORE_load_file(CTLOG_STORE *store, const char *file)
{
int ret = 0;
char *enabled_logs;
- CTLOG_STORE_LOAD_CTX* load_ctx = ctlog_store_load_ctx_new();
+ CTLOG_STORE_LOAD_CTX *load_ctx = ctlog_store_load_ctx_new();
if (load_ctx == NULL)
return 0;
@@ -236,8 +236,7 @@ int CTLOG_STORE_load_file(CTLOG_STORE *store, const char *file)
goto end;
}
- if (!CONF_parse_list(enabled_logs, ',', 1, ctlog_store_load_log, load_ctx) ||
- load_ctx->invalid_log_entries > 0) {
+ if (!CONF_parse_list(enabled_logs, ',', 1, ctlog_store_load_log, load_ctx) || load_ctx->invalid_log_entries > 0) {
ERR_raise(ERR_LIB_CT, CT_R_LOG_CONF_INVALID);
goto end;
}
@@ -255,7 +254,7 @@ end:
* Copies the name.
*/
CTLOG *CTLOG_new_ex(EVP_PKEY *public_key, const char *name, OSSL_LIB_CTX *libctx,
- const char *propq)
+ const char *propq)
{
CTLOG *ret = OPENSSL_zalloc(sizeof(*ret));
@@ -305,7 +304,7 @@ const char *CTLOG_get0_name(const CTLOG *log)
}
void CTLOG_get0_log_id(const CTLOG *log, const uint8_t **log_id,
- size_t *log_id_len)
+ size_t *log_id_len)
{
*log_id = log->log_id;
*log_id_len = CT_V1_HASHLEN;
@@ -321,8 +320,8 @@ EVP_PKEY *CTLOG_get0_public_key(const CTLOG *log)
* Returns NULL if no match found.
*/
const CTLOG *CTLOG_STORE_get0_log_by_id(const CTLOG_STORE *store,
- const uint8_t *log_id,
- size_t log_id_len)
+ const uint8_t *log_id,
+ size_t log_id_len)
{
int i;
diff --git a/crypto/ct/ct_oct.c b/crypto/ct/ct_oct.c
index c2d2732162..770027741c 100644
--- a/crypto/ct/ct_oct.c
+++ b/crypto/ct/ct_oct.c
@@ -8,7 +8,7 @@
*/
#ifdef OPENSSL_NO_CT
-# error "CT is disabled"
+#error "CT is disabled"
#endif
#include <limits.h>
@@ -166,10 +166,10 @@ int i2o_SCT_signature(const SCT *sct, unsigned char **out)
}
/*
- * (1 byte) Hash algorithm
- * (1 byte) Signature algorithm
- * (2 bytes + ?) Signature
- */
+ * (1 byte) Hash algorithm
+ * (1 byte) Signature algorithm
+ * (2 bytes + ?) Signature
+ */
len = 4 + sct->sig_len;
if (out != NULL) {
@@ -253,7 +253,7 @@ err:
}
STACK_OF(SCT) *o2i_SCT_LIST(STACK_OF(SCT) **a, const unsigned char **pp,
- size_t len)
+ size_t len)
{
STACK_OF(SCT) *sk = NULL;
size_t list_len, sct_len;
@@ -310,7 +310,7 @@ STACK_OF(SCT) *o2i_SCT_LIST(STACK_OF(SCT) **a, const unsigned char **pp,
*a = sk;
return sk;
- err:
+err:
if (a == NULL || *a == NULL)
SCT_LIST_free(sk);
return NULL;
@@ -344,8 +344,8 @@ int i2o_SCT_LIST(const STACK_OF(SCT) *a, unsigned char **pp)
goto err;
s2n(sct_len, p2);
} else {
- if ((sct_len = i2o_SCT(sk_SCT_value(a, i), NULL)) == -1)
- goto err;
+ if ((sct_len = i2o_SCT(sk_SCT_value(a, i), NULL)) == -1)
+ goto err;
}
len2 += 2 + sct_len;
}
@@ -361,7 +361,7 @@ int i2o_SCT_LIST(const STACK_OF(SCT) *a, unsigned char **pp)
}
return (int)len2;
- err:
+err:
if (is_pp_new) {
OPENSSL_free(*pp);
*pp = NULL;
@@ -370,7 +370,7 @@ int i2o_SCT_LIST(const STACK_OF(SCT) *a, unsigned char **pp)
}
STACK_OF(SCT) *d2i_SCT_LIST(STACK_OF(SCT) **a, const unsigned char **pp,
- long len)
+ long len)
{
ASN1_OCTET_STRING *oct = NULL;
STACK_OF(SCT) *sk = NULL;
diff --git a/crypto/ct/ct_policy.c b/crypto/ct/ct_policy.c
index 725be7ce2a..c7b8d8d73f 100644
--- a/crypto/ct/ct_policy.c
+++ b/crypto/ct/ct_policy.c
@@ -8,7 +8,7 @@
*/
#ifdef OPENSSL_NO_CT
-# error "CT is disabled"
+#error "CT is disabled"
#endif
#include <openssl/ct.h>
@@ -26,7 +26,7 @@
static const time_t SCT_CLOCK_DRIFT_TOLERANCE = 300;
CT_POLICY_EVAL_CTX *CT_POLICY_EVAL_CTX_new_ex(OSSL_LIB_CTX *libctx,
- const char *propq)
+ const char *propq)
{
CT_POLICY_EVAL_CTX *ctx = OPENSSL_zalloc(sizeof(CT_POLICY_EVAL_CTX));
OSSL_TIME now;
@@ -44,7 +44,7 @@ CT_POLICY_EVAL_CTX *CT_POLICY_EVAL_CTX_new_ex(OSSL_LIB_CTX *libctx,
}
now = ossl_time_add(ossl_time_now(),
- ossl_seconds2time(SCT_CLOCK_DRIFT_TOLERANCE));
+ ossl_seconds2time(SCT_CLOCK_DRIFT_TOLERANCE));
ctx->epoch_time_in_ms = ossl_time2ms(now);
return ctx;
@@ -82,7 +82,7 @@ int CT_POLICY_EVAL_CTX_set1_issuer(CT_POLICY_EVAL_CTX *ctx, X509 *issuer)
}
void CT_POLICY_EVAL_CTX_set_shared_CTLOG_STORE(CT_POLICY_EVAL_CTX *ctx,
- CTLOG_STORE *log_store)
+ CTLOG_STORE *log_store)
{
ctx->log_store = log_store;
}
@@ -92,12 +92,12 @@ void CT_POLICY_EVAL_CTX_set_time(CT_POLICY_EVAL_CTX *ctx, uint64_t time_in_ms)
ctx->epoch_time_in_ms = time_in_ms;
}
-X509* CT_POLICY_EVAL_CTX_get0_cert(const CT_POLICY_EVAL_CTX *ctx)
+X509 *CT_POLICY_EVAL_CTX_get0_cert(const CT_POLICY_EVAL_CTX *ctx)
{
return ctx->cert;
}
-X509* CT_POLICY_EVAL_CTX_get0_issuer(const CT_POLICY_EVAL_CTX *ctx)
+X509 *CT_POLICY_EVAL_CTX_get0_issuer(const CT_POLICY_EVAL_CTX *ctx)
{
return ctx->issuer;
}
diff --git a/crypto/ct/ct_prn.c b/crypto/ct/ct_prn.c
index 5798a6703e..64323a8e50 100644
--- a/crypto/ct/ct_prn.c
+++ b/crypto/ct/ct_prn.c
@@ -8,7 +8,7 @@
*/
#ifdef OPENSSL_NO_CT
-# error "CT is disabled"
+#error "CT is disabled"
#endif
#include <openssl/asn1.h>
@@ -34,14 +34,14 @@ static void timestamp_print(uint64_t timestamp, BIO *out)
if (gen == NULL)
return;
ASN1_GENERALIZEDTIME_adj(gen, (time_t)0,
- (int)(timestamp / 86400000),
- (timestamp % 86400000) / 1000);
+ (int)(timestamp / 86400000),
+ (timestamp % 86400000) / 1000);
/*
* Note GeneralizedTime from ASN1_GENERALIZETIME_adj is always 15
* characters long with a final Z. Update it with fractional seconds.
*/
BIO_snprintf(genstr, sizeof(genstr), "%.14s.%03dZ",
- ASN1_STRING_get0_data(gen), (unsigned int)(timestamp % 1000));
+ ASN1_STRING_get0_data(gen), (unsigned int)(timestamp % 1000));
if (ASN1_GENERALIZEDTIME_set_string(gen, genstr))
ASN1_GENERALIZEDTIME_print(out, gen);
ASN1_GENERALIZEDTIME_free(gen);
@@ -68,13 +68,13 @@ const char *SCT_validation_status_string(const SCT *sct)
}
void SCT_print(const SCT *sct, BIO *out, int indent,
- const CTLOG_STORE *log_store)
+ const CTLOG_STORE *log_store)
{
const CTLOG *log = NULL;
if (log_store != NULL) {
log = CTLOG_STORE_get0_log_by_id(log_store, sct->log_id,
- sct->log_id_len);
+ sct->log_id_len);
}
BIO_printf(out, "%*sSigned Certificate Timestamp:", indent, "");
@@ -90,7 +90,7 @@ void SCT_print(const SCT *sct, BIO *out, int indent,
if (log != NULL) {
BIO_printf(out, "\n%*sLog : %s", indent + 4, "",
- CTLOG_get0_name(log));
+ CTLOG_get0_name(log));
}
BIO_printf(out, "\n%*sLog ID : ", indent + 4, "");
@@ -112,7 +112,7 @@ void SCT_print(const SCT *sct, BIO *out, int indent,
}
void SCT_LIST_print(const STACK_OF(SCT) *sct_list, BIO *out, int indent,
- const char *separator, const CTLOG_STORE *log_store)
+ const char *separator, const CTLOG_STORE *log_store)
{
int sct_count = sk_SCT_num(sct_list);
int i;
diff --git a/crypto/ct/ct_sct.c b/crypto/ct/ct_sct.c
index ec87d02309..4a59f7dd88 100644
--- a/crypto/ct/ct_sct.c
+++ b/crypto/ct/ct_sct.c
@@ -8,7 +8,7 @@
*/
#ifdef OPENSSL_NO_CT
-# error "CT disabled"
+#error "CT disabled"
#endif
#include <openssl/ct.h>
@@ -110,7 +110,6 @@ int SCT_set1_log_id(SCT *sct, const unsigned char *log_id, size_t log_id_len)
return 1;
}
-
void SCT_set_timestamp(SCT *sct, uint64_t timestamp)
{
sct->timestamp = timestamp;
@@ -248,8 +247,7 @@ int SCT_is_complete(const SCT *sct)
int SCT_signature_is_complete(const SCT *sct)
{
- return SCT_get_signature_nid(sct) != NID_undef &&
- sct->sig != NULL && sct->sig_len > 0;
+ return SCT_get_signature_nid(sct) != NID_undef && sct->sig != NULL && sct->sig_len > 0;
}
sct_source_t SCT_get_source(const SCT *sct)
@@ -296,7 +294,7 @@ int SCT_validate(SCT *sct, const CT_POLICY_EVAL_CTX *ctx)
}
log = CTLOG_STORE_get0_log_by_id(ctx->log_store,
- sct->log_id, sct->log_id_len);
+ sct->log_id, sct->log_id_len);
/* Similarly, an SCT from an unknown log also cannot be validated. */
if (log == NULL) {
@@ -352,8 +350,7 @@ int SCT_validate(SCT *sct, const CT_POLICY_EVAL_CTX *ctx)
if (SCT_CTX_set1_cert(sctx, ctx->cert, NULL) != 1)
sct->validation_status = SCT_VALIDATION_STATUS_UNVERIFIED;
else
- sct->validation_status = SCT_CTX_verify(sctx, sct) == 1 ?
- SCT_VALIDATION_STATUS_VALID : SCT_VALIDATION_STATUS_INVALID;
+ sct->validation_status = SCT_CTX_verify(sctx, sct) == 1 ? SCT_VALIDATION_STATUS_VALID : SCT_VALIDATION_STATUS_INVALID;
end:
is_sct_valid = sct->validation_status == SCT_VALIDATION_STATUS_VALID;
diff --git a/crypto/ct/ct_sct_ctx.c b/crypto/ct/ct_sct_ctx.c
index effd724a0a..af5be04eff 100644
--- a/crypto/ct/ct_sct_ctx.c
+++ b/crypto/ct/ct_sct_ctx.c
@@ -8,7 +8,7 @@
*/
#ifdef OPENSSL_NO_CT
-# error "CT is disabled"
+#error "CT is disabled"
#endif
#include <stddef.h>
@@ -81,9 +81,9 @@ __owur static int ct_x509_cert_fixup(X509 *cert, X509 *presigner)
return 1;
preidx = ct_x509_get_ext(presigner, NID_authority_key_identifier,
- &pre_akid_ext_is_dup);
+ &pre_akid_ext_is_dup);
certidx = ct_x509_get_ext(cert, NID_authority_key_identifier,
- &cert_akid_ext_is_dup);
+ &cert_akid_ext_is_dup);
/* An error occurred whilst searching for the extension */
if (preidx < -1 || certidx < -1)
@@ -109,8 +109,7 @@ __owur static int ct_x509_cert_fixup(X509 *cert, X509 *presigner)
if (preext == NULL || certext == NULL)
return 0;
preextdata = X509_EXTENSION_get_data(preext);
- if (preextdata == NULL ||
- !X509_EXTENSION_set_data(certext, preextdata))
+ if (preextdata == NULL || !X509_EXTENSION_set_data(certext, preextdata))
return 0;
}
return 1;
@@ -199,7 +198,7 @@ err:
}
__owur static int ct_public_key_hash(SCT_CTX *sctx, X509_PUBKEY *pkey,
- unsigned char **hash, size_t *hash_len)
+ unsigned char **hash, size_t *hash_len)
{
int ret = 0;
unsigned char *md = NULL, *der = NULL;
@@ -235,7 +234,7 @@ __owur static int ct_public_key_hash(SCT_CTX *sctx, X509_PUBKEY *pkey,
md = NULL;
ret = 1;
- err:
+err:
EVP_MD_free(sha256);
OPENSSL_free(md);
OPENSSL_free(der);
diff --git a/crypto/ct/ct_vfy.c b/crypto/ct/ct_vfy.c
index 27fb79f403..342a0e6587 100644
--- a/crypto/ct/ct_vfy.c
+++ b/crypto/ct/ct_vfy.c
@@ -98,9 +98,7 @@ int SCT_CTX_verify(const SCT_CTX *sctx, const SCT *sct)
EVP_MD_CTX *ctx = NULL;
int ret = 0;
- if (!SCT_is_complete(sct) || sctx->pkey == NULL ||
- sct->entry_type == CT_LOG_ENTRY_TYPE_NOT_SET ||
- (sct->entry_type == CT_LOG_ENTRY_TYPE_PRECERT && sctx->ihash == NULL)) {
+ if (!SCT_is_complete(sct) || sctx->pkey == NULL || sct->entry_type == CT_LOG_ENTRY_TYPE_NOT_SET || (sct->entry_type == CT_LOG_ENTRY_TYPE_PRECERT && sctx->ihash == NULL)) {
ERR_raise(ERR_LIB_CT, CT_R_SCT_NOT_SET);
return 0;
}
@@ -108,8 +106,7 @@ int SCT_CTX_verify(const SCT_CTX *sctx, const SCT *sct)
ERR_raise(ERR_LIB_CT, CT_R_SCT_UNSUPPORTED_VERSION);
return 0;
}
- if (sct->log_id_len != sctx->pkeyhashlen ||
- memcmp(sct->log_id, sctx->pkeyhash, sctx->pkeyhashlen) != 0) {
+ if (sct->log_id_len != sctx->pkeyhashlen || memcmp(sct->log_id, sctx->pkeyhash, sctx->pkeyhashlen) != 0) {
ERR_raise(ERR_LIB_CT, CT_R_SCT_LOG_ID_MISMATCH);
return 0;
}
@@ -123,7 +120,7 @@ int SCT_CTX_verify(const SCT_CTX *sctx, const SCT *sct)
goto end;
if (!EVP_DigestVerifyInit_ex(ctx, NULL, "SHA2-256", sctx->libctx,
- sctx->propq, sctx->pkey, NULL))
+ sctx->propq, sctx->pkey, NULL))
goto end;
if (!sct_ctx_update(ctx, sctx, sct))
diff --git a/crypto/ct/ct_x509v3.c b/crypto/ct/ct_x509v3.c
index 1284ec711d..c78a92e9d6 100644
--- a/crypto/ct/ct_x509v3.c
+++ b/crypto/ct/ct_x509v3.c
@@ -8,7 +8,7 @@
*/
#ifdef OPENSSL_NO_CT
-# error "CT is disabled"
+#error "CT is disabled"
#endif
#include "ct_local.h"
@@ -20,11 +20,11 @@ static char *i2s_poison(const X509V3_EXT_METHOD *method, void *val)
static void *s2i_poison(const X509V3_EXT_METHOD *method, X509V3_CTX *ctx, const char *str)
{
- return ASN1_NULL_new();
+ return ASN1_NULL_new();
}
static int i2r_SCT_LIST(X509V3_EXT_METHOD *method, STACK_OF(SCT) *sct_list,
- BIO *out, int indent)
+ BIO *out, int indent)
{
SCT_LIST_print(sct_list, out, indent, "\n", NULL);
return 1;
@@ -47,22 +47,22 @@ static int set_sct_list_source(STACK_OF(SCT) *s, sct_source_t source)
}
static STACK_OF(SCT) *x509_ext_d2i_SCT_LIST(STACK_OF(SCT) **a,
- const unsigned char **pp,
- long len)
+ const unsigned char **pp,
+ long len)
{
- STACK_OF(SCT) *s = d2i_SCT_LIST(a, pp, len);
+ STACK_OF(SCT) *s = d2i_SCT_LIST(a, pp, len);
- if (set_sct_list_source(s, SCT_SOURCE_X509V3_EXTENSION) != 1) {
- SCT_LIST_free(s);
- *a = NULL;
- return NULL;
- }
- return s;
+ if (set_sct_list_source(s, SCT_SOURCE_X509V3_EXTENSION) != 1) {
+ SCT_LIST_free(s);
+ *a = NULL;
+ return NULL;
+ }
+ return s;
}
static STACK_OF(SCT) *ocsp_ext_d2i_SCT_LIST(STACK_OF(SCT) **a,
- const unsigned char **pp,
- long len)
+ const unsigned char **pp,
+ long len)
{
STACK_OF(SCT) *s = d2i_SCT_LIST(a, pp, len);
@@ -78,27 +78,27 @@ static STACK_OF(SCT) *ocsp_ext_d2i_SCT_LIST(STACK_OF(SCT) **a,
const X509V3_EXT_METHOD ossl_v3_ct_scts[3] = {
/* X509v3 extension in certificates that contains SCTs */
{ NID_ct_precert_scts, 0, NULL,
- NULL, (X509V3_EXT_FREE)SCT_LIST_free,
- (X509V3_EXT_D2I)x509_ext_d2i_SCT_LIST, (X509V3_EXT_I2D)i2d_SCT_LIST,
- NULL, NULL,
- NULL, NULL,
- (X509V3_EXT_I2R)i2r_SCT_LIST, NULL,
- NULL },
+ NULL, (X509V3_EXT_FREE)SCT_LIST_free,
+ (X509V3_EXT_D2I)x509_ext_d2i_SCT_LIST, (X509V3_EXT_I2D)i2d_SCT_LIST,
+ NULL, NULL,
+ NULL, NULL,
+ (X509V3_EXT_I2R)i2r_SCT_LIST, NULL,
+ NULL },
/* X509v3 extension to mark a certificate as a pre-certificate */
{ NID_ct_precert_poison, 0, ASN1_ITEM_ref(ASN1_NULL),
- NULL, NULL, NULL, NULL,
- i2s_poison, s2i_poison,
- NULL, NULL,
- NULL, NULL,
- NULL },
+ NULL, NULL, NULL, NULL,
+ i2s_poison, s2i_poison,
+ NULL, NULL,
+ NULL, NULL,
+ NULL },
/* OCSP extension that contains SCTs */
{ NID_ct_cert_scts, 0, NULL,
- 0, (X509V3_EXT_FREE)SCT_LIST_free,
- (X509V3_EXT_D2I)ocsp_ext_d2i_SCT_LIST, (X509V3_EXT_I2D)i2d_SCT_LIST,
- NULL, NULL,
- NULL, NULL,
- (X509V3_EXT_I2R)i2r_SCT_LIST, NULL,
- NULL },
+ 0, (X509V3_EXT_FREE)SCT_LIST_free,
+ (X509V3_EXT_D2I)ocsp_ext_d2i_SCT_LIST, (X509V3_EXT_I2D)i2d_SCT_LIST,
+ NULL, NULL,
+ NULL, NULL,
+ (X509V3_EXT_I2R)i2r_SCT_LIST, NULL,
+ NULL },
};
diff --git a/crypto/ctype.c b/crypto/ctype.c
index 48b3025ba5..686fe64165 100644
--- a/crypto/ctype.c
+++ b/crypto/ctype.c
@@ -19,208 +19,208 @@
* Characters outside of the seven bit ASCII range are detected before indexing.
*/
static const unsigned short ctype_char_map[128] = {
- /* 00 nul */ CTYPE_MASK_cntrl,
- /* 01 soh */ CTYPE_MASK_cntrl,
- /* 02 stx */ CTYPE_MASK_cntrl,
- /* 03 etx */ CTYPE_MASK_cntrl,
- /* 04 eot */ CTYPE_MASK_cntrl,
- /* 05 enq */ CTYPE_MASK_cntrl,
- /* 06 ack */ CTYPE_MASK_cntrl,
- /* 07 \a */ CTYPE_MASK_cntrl,
- /* 08 \b */ CTYPE_MASK_cntrl,
- /* 09 \t */ CTYPE_MASK_blank | CTYPE_MASK_cntrl | CTYPE_MASK_space,
- /* 0A \n */ CTYPE_MASK_cntrl | CTYPE_MASK_space,
- /* 0B \v */ CTYPE_MASK_cntrl | CTYPE_MASK_space,
- /* 0C \f */ CTYPE_MASK_cntrl | CTYPE_MASK_space,
- /* 0D \r */ CTYPE_MASK_cntrl | CTYPE_MASK_space,
- /* 0E so */ CTYPE_MASK_cntrl,
- /* 0F si */ CTYPE_MASK_cntrl,
- /* 10 dle */ CTYPE_MASK_cntrl,
- /* 11 dc1 */ CTYPE_MASK_cntrl,
- /* 12 dc2 */ CTYPE_MASK_cntrl,
- /* 13 dc3 */ CTYPE_MASK_cntrl,
- /* 14 dc4 */ CTYPE_MASK_cntrl,
- /* 15 nak */ CTYPE_MASK_cntrl,
- /* 16 syn */ CTYPE_MASK_cntrl,
- /* 17 etb */ CTYPE_MASK_cntrl,
- /* 18 can */ CTYPE_MASK_cntrl,
- /* 19 em */ CTYPE_MASK_cntrl,
- /* 1A sub */ CTYPE_MASK_cntrl,
- /* 1B esc */ CTYPE_MASK_cntrl,
- /* 1C fs */ CTYPE_MASK_cntrl,
- /* 1D gs */ CTYPE_MASK_cntrl,
- /* 1E rs */ CTYPE_MASK_cntrl,
- /* 1F us */ CTYPE_MASK_cntrl,
- /* 20 */ CTYPE_MASK_blank | CTYPE_MASK_print | CTYPE_MASK_space
- | CTYPE_MASK_asn1print,
- /* 21 ! */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
- /* 22 " */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
- /* 23 # */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
- /* 24 $ */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
- /* 25 % */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
- /* 26 & */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
- /* 27 ' */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct
- | CTYPE_MASK_asn1print,
- /* 28 ( */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct
- | CTYPE_MASK_asn1print,
- /* 29 ) */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct
- | CTYPE_MASK_asn1print,
- /* 2A * */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
- /* 2B + */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct
- | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 2C , */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct
- | CTYPE_MASK_asn1print,
- /* 2D - */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct
- | CTYPE_MASK_asn1print,
- /* 2E . */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct
- | CTYPE_MASK_asn1print,
- /* 2F / */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct
- | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 30 0 */ CTYPE_MASK_digit | CTYPE_MASK_graph | CTYPE_MASK_print
- | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 31 1 */ CTYPE_MASK_digit | CTYPE_MASK_graph | CTYPE_MASK_print
- | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 32 2 */ CTYPE_MASK_digit | CTYPE_MASK_graph | CTYPE_MASK_print
- | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 33 3 */ CTYPE_MASK_digit | CTYPE_MASK_graph | CTYPE_MASK_print
- | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 34 4 */ CTYPE_MASK_digit | CTYPE_MASK_graph | CTYPE_MASK_print
- | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 35 5 */ CTYPE_MASK_digit | CTYPE_MASK_graph | CTYPE_MASK_print
- | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 36 6 */ CTYPE_MASK_digit | CTYPE_MASK_graph | CTYPE_MASK_print
- | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 37 7 */ CTYPE_MASK_digit | CTYPE_MASK_graph | CTYPE_MASK_print
- | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 38 8 */ CTYPE_MASK_digit | CTYPE_MASK_graph | CTYPE_MASK_print
- | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 39 9 */ CTYPE_MASK_digit | CTYPE_MASK_graph | CTYPE_MASK_print
- | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 3A : */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct
- | CTYPE_MASK_asn1print,
- /* 3B ; */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
- /* 3C < */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
- /* 3D = */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct
- | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 3E > */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
- /* 3F ? */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct
- | CTYPE_MASK_asn1print,
- /* 40 @ */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
- /* 41 A */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
- | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 42 B */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
- | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 43 C */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
- | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 44 D */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
- | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 45 E */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
- | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 46 F */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
- | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 47 G */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
- | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 48 H */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
- | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 49 I */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
- | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 4A J */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
- | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 4B K */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
- | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 4C L */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
- | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 4D M */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
- | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 4E N */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
- | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 4F O */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
- | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 50 P */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
- | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 51 Q */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
- | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 52 R */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
- | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 53 S */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
- | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 54 T */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
- | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 55 U */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
- | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 56 V */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
- | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 57 W */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
- | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 58 X */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
- | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 59 Y */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
- | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 5A Z */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
- | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 5B [ */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
- /* 5C \ */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
- /* 5D ] */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
- /* 5E ^ */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
- /* 5F _ */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
- /* 60 ` */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
- /* 61 a */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
- | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 62 b */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
- | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 63 c */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
- | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 64 d */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
- | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 65 e */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
- | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 66 f */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
- | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 67 g */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
- | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 68 h */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
- | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 69 i */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
- | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 6A j */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
- | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 6B k */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
- | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 6C l */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
- | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 6D m */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
- | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 6E n */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
- | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 6F o */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
- | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 70 p */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
- | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 71 q */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
- | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 72 r */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
- | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 73 s */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
- | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 74 t */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
- | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 75 u */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
- | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 76 v */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
- | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 77 w */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
- | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 78 x */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
- | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 79 y */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
- | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 7A z */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
- | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
- /* 7B { */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
- /* 7C | */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
- /* 7D } */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
- /* 7E ~ */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
- /* 7F del */ CTYPE_MASK_cntrl
+ /* 00 nul */ CTYPE_MASK_cntrl,
+ /* 01 soh */ CTYPE_MASK_cntrl,
+ /* 02 stx */ CTYPE_MASK_cntrl,
+ /* 03 etx */ CTYPE_MASK_cntrl,
+ /* 04 eot */ CTYPE_MASK_cntrl,
+ /* 05 enq */ CTYPE_MASK_cntrl,
+ /* 06 ack */ CTYPE_MASK_cntrl,
+ /* 07 \a */ CTYPE_MASK_cntrl,
+ /* 08 \b */ CTYPE_MASK_cntrl,
+ /* 09 \t */ CTYPE_MASK_blank | CTYPE_MASK_cntrl | CTYPE_MASK_space,
+ /* 0A \n */ CTYPE_MASK_cntrl | CTYPE_MASK_space,
+ /* 0B \v */ CTYPE_MASK_cntrl | CTYPE_MASK_space,
+ /* 0C \f */ CTYPE_MASK_cntrl | CTYPE_MASK_space,
+ /* 0D \r */ CTYPE_MASK_cntrl | CTYPE_MASK_space,
+ /* 0E so */ CTYPE_MASK_cntrl,
+ /* 0F si */ CTYPE_MASK_cntrl,
+ /* 10 dle */ CTYPE_MASK_cntrl,
+ /* 11 dc1 */ CTYPE_MASK_cntrl,
+ /* 12 dc2 */ CTYPE_MASK_cntrl,
+ /* 13 dc3 */ CTYPE_MASK_cntrl,
+ /* 14 dc4 */ CTYPE_MASK_cntrl,
+ /* 15 nak */ CTYPE_MASK_cntrl,
+ /* 16 syn */ CTYPE_MASK_cntrl,
+ /* 17 etb */ CTYPE_MASK_cntrl,
+ /* 18 can */ CTYPE_MASK_cntrl,
+ /* 19 em */ CTYPE_MASK_cntrl,
+ /* 1A sub */ CTYPE_MASK_cntrl,
+ /* 1B esc */ CTYPE_MASK_cntrl,
+ /* 1C fs */ CTYPE_MASK_cntrl,
+ /* 1D gs */ CTYPE_MASK_cntrl,
+ /* 1E rs */ CTYPE_MASK_cntrl,
+ /* 1F us */ CTYPE_MASK_cntrl,
+ /* 20 */ CTYPE_MASK_blank | CTYPE_MASK_print | CTYPE_MASK_space
+ | CTYPE_MASK_asn1print,
+ /* 21 ! */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
+ /* 22 " */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
+ /* 23 # */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
+ /* 24 $ */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
+ /* 25 % */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
+ /* 26 & */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
+ /* 27 ' */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct
+ | CTYPE_MASK_asn1print,
+ /* 28 ( */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct
+ | CTYPE_MASK_asn1print,
+ /* 29 ) */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct
+ | CTYPE_MASK_asn1print,
+ /* 2A * */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
+ /* 2B + */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct
+ | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 2C , */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct
+ | CTYPE_MASK_asn1print,
+ /* 2D - */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct
+ | CTYPE_MASK_asn1print,
+ /* 2E . */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct
+ | CTYPE_MASK_asn1print,
+ /* 2F / */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct
+ | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 30 0 */ CTYPE_MASK_digit | CTYPE_MASK_graph | CTYPE_MASK_print
+ | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 31 1 */ CTYPE_MASK_digit | CTYPE_MASK_graph | CTYPE_MASK_print
+ | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 32 2 */ CTYPE_MASK_digit | CTYPE_MASK_graph | CTYPE_MASK_print
+ | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 33 3 */ CTYPE_MASK_digit | CTYPE_MASK_graph | CTYPE_MASK_print
+ | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 34 4 */ CTYPE_MASK_digit | CTYPE_MASK_graph | CTYPE_MASK_print
+ | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 35 5 */ CTYPE_MASK_digit | CTYPE_MASK_graph | CTYPE_MASK_print
+ | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 36 6 */ CTYPE_MASK_digit | CTYPE_MASK_graph | CTYPE_MASK_print
+ | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 37 7 */ CTYPE_MASK_digit | CTYPE_MASK_graph | CTYPE_MASK_print
+ | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 38 8 */ CTYPE_MASK_digit | CTYPE_MASK_graph | CTYPE_MASK_print
+ | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 39 9 */ CTYPE_MASK_digit | CTYPE_MASK_graph | CTYPE_MASK_print
+ | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 3A : */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct
+ | CTYPE_MASK_asn1print,
+ /* 3B ; */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
+ /* 3C < */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
+ /* 3D = */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct
+ | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 3E > */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
+ /* 3F ? */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct
+ | CTYPE_MASK_asn1print,
+ /* 40 @ */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
+ /* 41 A */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+ | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 42 B */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+ | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 43 C */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+ | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 44 D */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+ | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 45 E */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+ | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 46 F */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+ | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 47 G */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+ | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 48 H */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+ | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 49 I */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+ | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 4A J */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+ | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 4B K */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+ | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 4C L */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+ | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 4D M */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+ | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 4E N */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+ | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 4F O */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+ | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 50 P */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+ | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 51 Q */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+ | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 52 R */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+ | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 53 S */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+ | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 54 T */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+ | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 55 U */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+ | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 56 V */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+ | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 57 W */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+ | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 58 X */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+ | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 59 Y */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+ | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 5A Z */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+ | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 5B [ */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
+ /* 5C \ */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
+ /* 5D ] */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
+ /* 5E ^ */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
+ /* 5F _ */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
+ /* 60 ` */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
+ /* 61 a */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+ | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 62 b */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+ | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 63 c */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+ | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 64 d */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+ | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 65 e */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+ | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 66 f */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+ | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 67 g */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+ | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 68 h */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+ | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 69 i */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+ | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 6A j */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+ | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 6B k */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+ | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 6C l */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+ | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 6D m */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+ | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 6E n */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+ | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 6F o */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+ | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 70 p */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+ | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 71 q */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+ | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 72 r */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+ | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 73 s */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+ | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 74 t */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+ | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 75 u */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+ | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 76 v */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+ | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 77 w */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+ | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 78 x */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+ | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 79 y */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+ | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 7A z */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+ | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+ /* 7B { */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
+ /* 7C | */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
+ /* 7D } */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
+ /* 7E ~ */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
+ /* 7F del */ CTYPE_MASK_cntrl
};
#ifdef CHARSET_EBCDIC
@@ -262,9 +262,9 @@ int ossl_ctype_check(int c, unsigned int mask)
* accessing memory via ctype_char_map[].
*/
-#define ASCII_IS_DIGIT(c) (c >= 0x30 && c <= 0x39)
-#define ASCII_IS_UPPER(c) (c >= 0x41 && c <= 0x5A)
-#define ASCII_IS_LOWER(c) (c >= 0x61 && c <= 0x7A)
+#define ASCII_IS_DIGIT(c) (c >= 0x30 && c <= 0x39)
+#define ASCII_IS_UPPER(c) (c >= 0x41 && c <= 0x5A)
+#define ASCII_IS_LOWER(c) (c >= 0x61 && c <= 0x7A)
int ossl_isdigit(int c)
{
diff --git a/crypto/cversion.c b/crypto/cversion.c
index 1d21c1b70c..98f7e2798b 100644
--- a/crypto/cversion.c
+++ b/crypto/cversion.c
@@ -60,14 +60,14 @@ static CRYPTO_ONCE version_strings_once = CRYPTO_ONCE_STATIC_INIT;
DEFINE_RUN_ONCE_STATIC(version_strings_setup)
{
BIO_snprintf(openssldir, sizeof(openssldir), "OPENSSLDIR: \"%s\"",
- ossl_get_openssldir());
+ ossl_get_openssldir());
BIO_snprintf(modulesdir, sizeof(modulesdir), "MODULESDIR: \"%s\"",
- ossl_get_modulesdir());
+ ossl_get_modulesdir());
return 1;
}
-# define TOSTR(x) #x
-# define OSSL_WINCTX_STRING "OSSL_WINCTX: \"" TOSTR(OSSL_WINCTX) "\""
+#define TOSTR(x) #x
+#define OSSL_WINCTX_STRING "OSSL_WINCTX: \"" TOSTR(OSSL_WINCTX) "\""
#endif
@@ -98,17 +98,17 @@ const char *OpenSSL_version(int t)
return modulesdir;
#else
case OPENSSL_DIR:
-# ifdef OPENSSLDIR
+#ifdef OPENSSLDIR
return "OPENSSLDIR: \"" OPENSSLDIR "\"";
-# else
+#else
return "OPENSSLDIR: N/A";
-# endif
+#endif
case OPENSSL_MODULES_DIR:
-# ifdef MODULESDIR
+#ifdef MODULESDIR
return "MODULESDIR: \"" MODULESDIR "\"";
-# else
+#else
return "MODULESDIR: N/A";
-# endif
+#endif
#endif
case OPENSSL_CPU_INFO:
if (OPENSSL_info(OPENSSL_INFO_CPU_SETTINGS) != NULL)
diff --git a/crypto/defaults.c b/crypto/defaults.c
index debf134850..b98d5eaabc 100644
--- a/crypto/defaults.c
+++ b/crypto/defaults.c
@@ -15,12 +15,13 @@
#if defined(_WIN32) && defined(OSSL_WINCTX)
-# define TOSTR(x) #x
-# define MAKESTR(x) TOSTR(x)
-# define NOQUOTE(x) x
-# if defined(OSSL_WINCTX)
-# define REGISTRY_KEY "SOFTWARE\\WOW6432Node\\OpenSSL" "-" MAKESTR(OPENSSL_VERSION_MAJOR) "." MAKESTR(OPENSSL_VERSION_MINOR) "-" MAKESTR(OSSL_WINCTX)
-# endif
+#define TOSTR(x) #x
+#define MAKESTR(x) TOSTR(x)
+#define NOQUOTE(x) x
+#if defined(OSSL_WINCTX)
+#define REGISTRY_KEY "SOFTWARE\\WOW6432Node\\OpenSSL" \
+ "-" MAKESTR(OPENSSL_VERSION_MAJOR) "." MAKESTR(OPENSSL_VERSION_MINOR) "-" MAKESTR(OSSL_WINCTX)
+#endif
/**
* @brief The directory where OpenSSL is installed.
@@ -52,7 +53,7 @@ static char *modulesdirptr = NULL;
static char *get_windows_regdirs(char *dst, DWORD dstsizebytes, LPCWSTR valuename)
{
char *retval = NULL;
-# ifdef REGISTRY_KEY
+#ifdef REGISTRY_KEY
DWORD keysizebytes;
DWORD ktype;
HKEY hkey;
@@ -61,14 +62,14 @@ static char *get_windows_regdirs(char *dst, DWORD dstsizebytes, LPCWSTR valuenam
LPCWSTR tempstr = NULL;
ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE,
- TEXT(REGISTRY_KEY), KEY_WOW64_32KEY,
- KEY_QUERY_VALUE, &hkey);
+ TEXT(REGISTRY_KEY), KEY_WOW64_32KEY,
+ KEY_QUERY_VALUE, &hkey);
if (ret != ERROR_SUCCESS)
goto out;
/* Always use wide call so we can avoid extra encoding conversions on the output */
ret = RegQueryValueExW(hkey, valuename, NULL, &ktype, NULL,
- &keysizebytes);
+ &keysizebytes);
if (ret != ERROR_SUCCESS)
goto out;
if (ktype != REG_EXPAND_SZ && ktype != REG_SZ)
@@ -86,18 +87,19 @@ static char *get_windows_regdirs(char *dst, DWORD dstsizebytes, LPCWSTR valuenam
goto out;
if (RegQueryValueExW(hkey, valuename,
- NULL, &ktype, (LPBYTE)tempstr, &keysizebytes) != ERROR_SUCCESS)
+ NULL, &ktype, (LPBYTE)tempstr, &keysizebytes)
+ != ERROR_SUCCESS)
goto out;
if (!WideCharToMultiByte(CP_UTF8, 0, tempstr, -1, dst, dstsizebytes,
- NULL, NULL))
+ NULL, NULL))
goto out;
retval = dst;
out:
OPENSSL_free(tempstr);
RegCloseKey(hkey);
-# endif /* REGISTRY_KEY */
+#endif /* REGISTRY_KEY */
return retval;
}
@@ -133,11 +135,11 @@ DEFINE_RUN_ONCE_STATIC(do_defaults_setup)
*/
const char *ossl_get_openssldir(void)
{
-#if defined(_WIN32) && defined (OSSL_WINCTX)
+#if defined(_WIN32) && defined(OSSL_WINCTX)
if (!RUN_ONCE(&defaults_setup_init, do_defaults_setup))
return NULL;
return (const char *)openssldirptr;
-# else
+#else
return OPENSSLDIR;
#endif
}
@@ -165,7 +167,7 @@ const char *ossl_get_modulesdir(void)
*/
const char *ossl_get_wininstallcontext(void)
{
-#if defined(_WIN32) && defined (OSSL_WINCTX)
+#if defined(_WIN32) && defined(OSSL_WINCTX)
return MAKESTR(OSSL_WINCTX);
#else
return "Undefined";
diff --git a/crypto/der_writer.c b/crypto/der_writer.c
index bd330785f9..5efd481aab 100644
--- a/crypto/der_writer.c
+++ b/crypto/der_writer.c
@@ -49,8 +49,8 @@ static int int_end_context(WPACKET *pkt, int tag)
}
int ossl_DER_w_precompiled(WPACKET *pkt, int tag,
- const unsigned char *precompiled,
- size_t precompiled_n)
+ const unsigned char *precompiled,
+ size_t precompiled_n)
{
return int_start_context(pkt, tag)
&& WPACKET_memcpy(pkt, precompiled, precompiled_n)
@@ -68,7 +68,7 @@ int ossl_DER_w_boolean(WPACKET *pkt, int tag, int b)
}
int ossl_DER_w_octet_string(WPACKET *pkt, int tag,
- const unsigned char *data, size_t data_n)
+ const unsigned char *data, size_t data_n)
{
return int_start_context(pkt, tag)
&& WPACKET_start_sub_packet(pkt)
@@ -91,9 +91,9 @@ int ossl_DER_w_octet_string_uint32(WPACKET *pkt, int tag, uint32_t value)
}
static int int_der_w_integer(WPACKET *pkt, int tag,
- int (*put_bytes)(WPACKET *pkt, const void *v,
- unsigned int *top_byte),
- const void *v)
+ int (*put_bytes)(WPACKET *pkt, const void *v,
+ unsigned int *top_byte),
+ const void *v)
{
unsigned int top_byte = 0;
@@ -107,7 +107,7 @@ static int int_der_w_integer(WPACKET *pkt, int tag,
}
static int int_put_bytes_uint32(WPACKET *pkt, const void *v,
- unsigned int *top_byte)
+ unsigned int *top_byte)
{
const uint32_t *value = v;
uint32_t tmp = *value;
@@ -131,14 +131,13 @@ int ossl_DER_w_uint32(WPACKET *pkt, int tag, uint32_t v)
}
static int int_put_bytes_bn(WPACKET *pkt, const void *v,
- unsigned int *top_byte)
+ unsigned int *top_byte)
{
unsigned char *p = NULL;
size_t n = BN_num_bytes(v);
/* The BIGNUM limbs are in LE order */
- *top_byte =
- ((bn_get_words(v) [(n - 1) / BN_BYTES]) >> (8 * ((n - 1) % BN_BYTES)))
+ *top_byte = ((bn_get_words(v)[(n - 1) / BN_BYTES]) >> (8 * ((n - 1) % BN_BYTES)))
& 0xFF;
if (!WPACKET_allocate_bytes(pkt, n, &p))
@@ -193,7 +192,7 @@ int ossl_DER_w_end_sequence(WPACKET *pkt, int tag)
&& WPACKET_close(pkt)
&& WPACKET_get_total_written(pkt, &size2)
&& (size1 == size2
- ? WPACKET_set_flags(pkt, WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH)
- : WPACKET_put_bytes_u8(pkt, DER_F_CONSTRUCTED | DER_P_SEQUENCE))
+ ? WPACKET_set_flags(pkt, WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH)
+ : WPACKET_put_bytes_u8(pkt, DER_F_CONSTRUCTED | DER_P_SEQUENCE))
&& int_end_context(pkt, tag);
}
diff --git a/crypto/des/cbc_cksm.c b/crypto/des/cbc_cksm.c
index d8ab38bf23..b44f348690 100644
--- a/crypto/des/cbc_cksm.c
+++ b/crypto/des/cbc_cksm.c
@@ -16,8 +16,8 @@
#include "des_local.h"
DES_LONG DES_cbc_cksum(const unsigned char *in, DES_cblock *output,
- long length, DES_key_schedule *schedule,
- const_DES_cblock *ivec)
+ long length, DES_key_schedule *schedule,
+ const_DES_cblock *ivec)
{
register DES_LONG tout0, tout1, tin0, tin1;
register long l = length;
diff --git a/crypto/des/cfb64ede.c b/crypto/des/cfb64ede.c
index c8e4e5cd2d..26613a05fe 100644
--- a/crypto/des/cfb64ede.c
+++ b/crypto/des/cfb64ede.c
@@ -22,9 +22,9 @@
*/
void DES_ede3_cfb64_encrypt(const unsigned char *in, unsigned char *out,
- long length, DES_key_schedule *ks1,
- DES_key_schedule *ks2, DES_key_schedule *ks3,
- DES_cblock *ivec, int *num, int enc)
+ long length, DES_key_schedule *ks1,
+ DES_key_schedule *ks2, DES_key_schedule *ks3,
+ DES_cblock *ivec, int *num, int enc)
{
register DES_LONG v0, v1;
register long l = length;
@@ -89,9 +89,9 @@ void DES_ede3_cfb64_encrypt(const unsigned char *in, unsigned char *out,
*/
void DES_ede3_cfb_encrypt(const unsigned char *in, unsigned char *out,
- int numbits, long length, DES_key_schedule *ks1,
- DES_key_schedule *ks2, DES_key_schedule *ks3,
- DES_cblock *ivec, int enc)
+ int numbits, long length, DES_key_schedule *ks1,
+ DES_key_schedule *ks2, DES_key_schedule *ks3,
+ DES_cblock *ivec, int enc)
{
register DES_LONG d0, d1, v0, v1;
register unsigned long l = length, n = ((unsigned int)numbits + 7) / 8;
diff --git a/crypto/des/cfb64enc.c b/crypto/des/cfb64enc.c
index 93ebf76825..3ddd6819e2 100644
--- a/crypto/des/cfb64enc.c
+++ b/crypto/des/cfb64enc.c
@@ -22,8 +22,8 @@
*/
void DES_cfb64_encrypt(const unsigned char *in, unsigned char *out,
- long length, DES_key_schedule *schedule,
- DES_cblock *ivec, int *num, int enc)
+ long length, DES_key_schedule *schedule,
+ DES_cblock *ivec, int *num, int enc)
{
register DES_LONG v0, v1;
register long l = length;
diff --git a/crypto/des/cfb_enc.c b/crypto/des/cfb_enc.c
index 51c4dd2ab9..35b244b0e2 100644
--- a/crypto/des/cfb_enc.c
+++ b/crypto/des/cfb_enc.c
@@ -28,13 +28,12 @@
* will not be compatible with any encryption prior to that date. Ben.
*/
void DES_cfb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
- long length, DES_key_schedule *schedule,
- DES_cblock *ivec, int enc)
+ long length, DES_key_schedule *schedule,
+ DES_cblock *ivec, int enc)
{
register DES_LONG d0, d1, v0, v1;
register unsigned long l = length;
- register int num = numbits / 8, n = (numbits + 7) / 8, i, rem =
- numbits % 8;
+ register int num = numbits / 8, n = (numbits + 7) / 8, i, rem = numbits % 8;
DES_LONG ti[2];
unsigned char *iv;
#ifndef L_ENDIAN
@@ -90,8 +89,7 @@ void DES_cfb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
memmove(ovec, ovec + num, 8);
else
for (i = 0; i < 8; ++i)
- ovec[i] = ovec[i + num] << rem |
- ovec[i + num + 1] >> (8 - rem);
+ ovec[i] = ovec[i + num] << rem | ovec[i + num + 1] >> (8 - rem);
#ifdef L_ENDIAN
v0 = sh[0], v1 = sh[1];
#else
@@ -133,8 +131,7 @@ void DES_cfb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
memmove(ovec, ovec + num, 8);
else
for (i = 0; i < 8; ++i)
- ovec[i] = ovec[i + num] << rem |
- ovec[i + num + 1] >> (8 - rem);
+ ovec[i] = ovec[i + num] << rem | ovec[i + num + 1] >> (8 - rem);
#ifdef L_ENDIAN
v0 = sh[0], v1 = sh[1];
#else
diff --git a/crypto/des/des_enc.c b/crypto/des/des_enc.c
index 37a424cd4e..4d1f8775ab 100644
--- a/crypto/des/des_enc.c
+++ b/crypto/des/des_enc.c
@@ -43,39 +43,39 @@ void DES_encrypt1(DES_LONG *data, DES_key_schedule *ks, int enc)
* loop
*/
if (enc) {
- D_ENCRYPT(l, r, 0); /* 1 */
- D_ENCRYPT(r, l, 2); /* 2 */
- D_ENCRYPT(l, r, 4); /* 3 */
- D_ENCRYPT(r, l, 6); /* 4 */
- D_ENCRYPT(l, r, 8); /* 5 */
- D_ENCRYPT(r, l, 10); /* 6 */
- D_ENCRYPT(l, r, 12); /* 7 */
- D_ENCRYPT(r, l, 14); /* 8 */
- D_ENCRYPT(l, r, 16); /* 9 */
- D_ENCRYPT(r, l, 18); /* 10 */
- D_ENCRYPT(l, r, 20); /* 11 */
- D_ENCRYPT(r, l, 22); /* 12 */
- D_ENCRYPT(l, r, 24); /* 13 */
- D_ENCRYPT(r, l, 26); /* 14 */
- D_ENCRYPT(l, r, 28); /* 15 */
- D_ENCRYPT(r, l, 30); /* 16 */
+ D_ENCRYPT(l, r, 0); /* 1 */
+ D_ENCRYPT(r, l, 2); /* 2 */
+ D_ENCRYPT(l, r, 4); /* 3 */
+ D_ENCRYPT(r, l, 6); /* 4 */
+ D_ENCRYPT(l, r, 8); /* 5 */
+ D_ENCRYPT(r, l, 10); /* 6 */
+ D_ENCRYPT(l, r, 12); /* 7 */
+ D_ENCRYPT(r, l, 14); /* 8 */
+ D_ENCRYPT(l, r, 16); /* 9 */
+ D_ENCRYPT(r, l, 18); /* 10 */
+ D_ENCRYPT(l, r, 20); /* 11 */
+ D_ENCRYPT(r, l, 22); /* 12 */
+ D_ENCRYPT(l, r, 24); /* 13 */
+ D_ENCRYPT(r, l, 26); /* 14 */
+ D_ENCRYPT(l, r, 28); /* 15 */
+ D_ENCRYPT(r, l, 30); /* 16 */
} else {
- D_ENCRYPT(l, r, 30); /* 16 */
- D_ENCRYPT(r, l, 28); /* 15 */
- D_ENCRYPT(l, r, 26); /* 14 */
- D_ENCRYPT(r, l, 24); /* 13 */
- D_ENCRYPT(l, r, 22); /* 12 */
- D_ENCRYPT(r, l, 20); /* 11 */
- D_ENCRYPT(l, r, 18); /* 10 */
- D_ENCRYPT(r, l, 16); /* 9 */
- D_ENCRYPT(l, r, 14); /* 8 */
- D_ENCRYPT(r, l, 12); /* 7 */
- D_ENCRYPT(l, r, 10); /* 6 */
- D_ENCRYPT(r, l, 8); /* 5 */
- D_ENCRYPT(l, r, 6); /* 4 */
- D_ENCRYPT(r, l, 4); /* 3 */
- D_ENCRYPT(l, r, 2); /* 2 */
- D_ENCRYPT(r, l, 0); /* 1 */
+ D_ENCRYPT(l, r, 30); /* 16 */
+ D_ENCRYPT(r, l, 28); /* 15 */
+ D_ENCRYPT(l, r, 26); /* 14 */
+ D_ENCRYPT(r, l, 24); /* 13 */
+ D_ENCRYPT(l, r, 22); /* 12 */
+ D_ENCRYPT(r, l, 20); /* 11 */
+ D_ENCRYPT(l, r, 18); /* 10 */
+ D_ENCRYPT(r, l, 16); /* 9 */
+ D_ENCRYPT(l, r, 14); /* 8 */
+ D_ENCRYPT(r, l, 12); /* 7 */
+ D_ENCRYPT(l, r, 10); /* 6 */
+ D_ENCRYPT(r, l, 8); /* 5 */
+ D_ENCRYPT(l, r, 6); /* 4 */
+ D_ENCRYPT(r, l, 4); /* 3 */
+ D_ENCRYPT(l, r, 2); /* 2 */
+ D_ENCRYPT(r, l, 0); /* 1 */
}
/* rotate and clear the top bits on machines with 8byte longs */
@@ -112,39 +112,39 @@ void DES_encrypt2(DES_LONG *data, DES_key_schedule *ks, int enc)
* loop
*/
if (enc) {
- D_ENCRYPT(l, r, 0); /* 1 */
- D_ENCRYPT(r, l, 2); /* 2 */
- D_ENCRYPT(l, r, 4); /* 3 */
- D_ENCRYPT(r, l, 6); /* 4 */
- D_ENCRYPT(l, r, 8); /* 5 */
- D_ENCRYPT(r, l, 10); /* 6 */
- D_ENCRYPT(l, r, 12); /* 7 */
- D_ENCRYPT(r, l, 14); /* 8 */
- D_ENCRYPT(l, r, 16); /* 9 */
- D_ENCRYPT(r, l, 18); /* 10 */
- D_ENCRYPT(l, r, 20); /* 11 */
- D_ENCRYPT(r, l, 22); /* 12 */
- D_ENCRYPT(l, r, 24); /* 13 */
- D_ENCRYPT(r, l, 26); /* 14 */
- D_ENCRYPT(l, r, 28); /* 15 */
- D_ENCRYPT(r, l, 30); /* 16 */
+ D_ENCRYPT(l, r, 0); /* 1 */
+ D_ENCRYPT(r, l, 2); /* 2 */
+ D_ENCRYPT(l, r, 4); /* 3 */
+ D_ENCRYPT(r, l, 6); /* 4 */
+ D_ENCRYPT(l, r, 8); /* 5 */
+ D_ENCRYPT(r, l, 10); /* 6 */
+ D_ENCRYPT(l, r, 12); /* 7 */
+ D_ENCRYPT(r, l, 14); /* 8 */
+ D_ENCRYPT(l, r, 16); /* 9 */
+ D_ENCRYPT(r, l, 18); /* 10 */
+ D_ENCRYPT(l, r, 20); /* 11 */
+ D_ENCRYPT(r, l, 22); /* 12 */
+ D_ENCRYPT(l, r, 24); /* 13 */
+ D_ENCRYPT(r, l, 26); /* 14 */
+ D_ENCRYPT(l, r, 28); /* 15 */
+ D_ENCRYPT(r, l, 30); /* 16 */
} else {
- D_ENCRYPT(l, r, 30); /* 16 */
- D_ENCRYPT(r, l, 28); /* 15 */
- D_ENCRYPT(l, r, 26); /* 14 */
- D_ENCRYPT(r, l, 24); /* 13 */
- D_ENCRYPT(l, r, 22); /* 12 */
- D_ENCRYPT(r, l, 20); /* 11 */
- D_ENCRYPT(l, r, 18); /* 10 */
- D_ENCRYPT(r, l, 16); /* 9 */
- D_ENCRYPT(l, r, 14); /* 8 */
- D_ENCRYPT(r, l, 12); /* 7 */
- D_ENCRYPT(l, r, 10); /* 6 */
- D_ENCRYPT(r, l, 8); /* 5 */
- D_ENCRYPT(l, r, 6); /* 4 */
- D_ENCRYPT(r, l, 4); /* 3 */
- D_ENCRYPT(l, r, 2); /* 2 */
- D_ENCRYPT(r, l, 0); /* 1 */
+ D_ENCRYPT(l, r, 30); /* 16 */
+ D_ENCRYPT(r, l, 28); /* 15 */
+ D_ENCRYPT(l, r, 26); /* 14 */
+ D_ENCRYPT(r, l, 24); /* 13 */
+ D_ENCRYPT(l, r, 22); /* 12 */
+ D_ENCRYPT(r, l, 20); /* 11 */
+ D_ENCRYPT(l, r, 18); /* 10 */
+ D_ENCRYPT(r, l, 16); /* 9 */
+ D_ENCRYPT(l, r, 14); /* 8 */
+ D_ENCRYPT(r, l, 12); /* 7 */
+ D_ENCRYPT(l, r, 10); /* 6 */
+ D_ENCRYPT(r, l, 8); /* 5 */
+ D_ENCRYPT(l, r, 6); /* 4 */
+ D_ENCRYPT(r, l, 4); /* 3 */
+ D_ENCRYPT(l, r, 2); /* 2 */
+ D_ENCRYPT(r, l, 0); /* 1 */
}
/* rotate and clear the top bits on machines with 8byte longs */
data[0] = ROTATE(l, 3) & 0xffffffffL;
@@ -153,7 +153,7 @@ void DES_encrypt2(DES_LONG *data, DES_key_schedule *ks, int enc)
}
void DES_encrypt3(DES_LONG *data, DES_key_schedule *ks1,
- DES_key_schedule *ks2, DES_key_schedule *ks3)
+ DES_key_schedule *ks2, DES_key_schedule *ks3)
{
register DES_LONG l, r;
@@ -173,7 +173,7 @@ void DES_encrypt3(DES_LONG *data, DES_key_schedule *ks1,
}
void DES_decrypt3(DES_LONG *data, DES_key_schedule *ks1,
- DES_key_schedule *ks2, DES_key_schedule *ks3)
+ DES_key_schedule *ks2, DES_key_schedule *ks3)
{
register DES_LONG l, r;
@@ -194,15 +194,15 @@ void DES_decrypt3(DES_LONG *data, DES_key_schedule *ks1,
#ifndef DES_DEFAULT_OPTIONS
-# undef CBC_ENC_C__DONT_UPDATE_IV
+#undef CBC_ENC_C__DONT_UPDATE_IV
/* clang-format off */
# include "ncbc_enc.c" /* DES_ncbc_encrypt */
/* clang-format on */
void DES_ede3_cbc_encrypt(const unsigned char *input, unsigned char *output,
- long length, DES_key_schedule *ks1,
- DES_key_schedule *ks2, DES_key_schedule *ks3,
- DES_cblock *ivec, int enc)
+ long length, DES_key_schedule *ks1,
+ DES_key_schedule *ks2, DES_key_schedule *ks3,
+ DES_cblock *ivec, int enc)
{
register DES_LONG tin0, tin1;
register DES_LONG tout0, tout1, xor0, xor1;
@@ -304,4 +304,4 @@ void DES_ede3_cbc_encrypt(const unsigned char *input, unsigned char *output,
tin[0] = tin[1] = 0;
}
-#endif /* DES_DEFAULT_OPTIONS */
+#endif /* DES_DEFAULT_OPTIONS */
diff --git a/crypto/des/des_local.h b/crypto/des/des_local.h
index d43f2c8737..8d08aca7e6 100644
--- a/crypto/des/des_local.h
+++ b/crypto/des/des_local.h
@@ -8,132 +8,159 @@
*/
#ifndef OSSL_CRYPTO_DES_LOCAL_H
-# define OSSL_CRYPTO_DES_LOCAL_H
+#define OSSL_CRYPTO_DES_LOCAL_H
-# include <openssl/e_os2.h>
+#include <openssl/e_os2.h>
-# include <stdio.h>
-# include <stdlib.h>
-# include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
-# include <openssl/des.h>
+#include <openssl/des.h>
-# ifdef OPENSSL_BUILD_SHLIBCRYPTO
-# undef OPENSSL_EXTERN
-# define OPENSSL_EXTERN OPENSSL_EXPORT
-# endif
+#ifdef OPENSSL_BUILD_SHLIBCRYPTO
+#undef OPENSSL_EXTERN
+#define OPENSSL_EXTERN OPENSSL_EXPORT
+#endif
-# define ITERATIONS 16
-# define HALF_ITERATIONS 8
+#define ITERATIONS 16
+#define HALF_ITERATIONS 8
-# define c2l(c,l) (l =((DES_LONG)(*((c)++))) , \
- l|=((DES_LONG)(*((c)++)))<< 8L, \
- l|=((DES_LONG)(*((c)++)))<<16L, \
- l|=((DES_LONG)(*((c)++)))<<24L)
+#define c2l(c, l) (l = ((DES_LONG)(*((c)++))), \
+ l |= ((DES_LONG)(*((c)++))) << 8L, \
+ l |= ((DES_LONG)(*((c)++))) << 16L, \
+ l |= ((DES_LONG)(*((c)++))) << 24L)
/* NOTE - c is not incremented as per c2l */
-# define c2ln(c,l1,l2,n) { \
- c+=n; \
- l1=l2=0; \
- switch (n) { \
- case 8: l2 =((DES_LONG)(*(--(c))))<<24L; \
- /* fall through */ \
- case 7: l2|=((DES_LONG)(*(--(c))))<<16L; \
- /* fall through */ \
- case 6: l2|=((DES_LONG)(*(--(c))))<< 8L; \
- /* fall through */ \
- case 5: l2|=((DES_LONG)(*(--(c)))); \
- /* fall through */ \
- case 4: l1 =((DES_LONG)(*(--(c))))<<24L; \
- /* fall through */ \
- case 3: l1|=((DES_LONG)(*(--(c))))<<16L; \
- /* fall through */ \
- case 2: l1|=((DES_LONG)(*(--(c))))<< 8L; \
- /* fall through */ \
- case 1: l1|=((DES_LONG)(*(--(c)))); \
- } \
- }
-
-# define l2c(l,c) (*((c)++)=(unsigned char)(((l) )&0xff), \
- *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \
- *((c)++)=(unsigned char)(((l)>>16L)&0xff), \
- *((c)++)=(unsigned char)(((l)>>24L)&0xff))
+#define c2ln(c, l1, l2, n) \
+ { \
+ c += n; \
+ l1 = l2 = 0; \
+ switch (n) { \
+ case 8: \
+ l2 = ((DES_LONG)(*(--(c)))) << 24L; \
+ /* fall through */ \
+ case 7: \
+ l2 |= ((DES_LONG)(*(--(c)))) << 16L; \
+ /* fall through */ \
+ case 6: \
+ l2 |= ((DES_LONG)(*(--(c)))) << 8L; \
+ /* fall through */ \
+ case 5: \
+ l2 |= ((DES_LONG)(*(--(c)))); \
+ /* fall through */ \
+ case 4: \
+ l1 = ((DES_LONG)(*(--(c)))) << 24L; \
+ /* fall through */ \
+ case 3: \
+ l1 |= ((DES_LONG)(*(--(c)))) << 16L; \
+ /* fall through */ \
+ case 2: \
+ l1 |= ((DES_LONG)(*(--(c)))) << 8L; \
+ /* fall through */ \
+ case 1: \
+ l1 |= ((DES_LONG)(*(--(c)))); \
+ } \
+ }
+
+#define l2c(l, c) (*((c)++) = (unsigned char)(((l)) & 0xff), \
+ *((c)++) = (unsigned char)(((l) >> 8L) & 0xff), \
+ *((c)++) = (unsigned char)(((l) >> 16L) & 0xff), \
+ *((c)++) = (unsigned char)(((l) >> 24L) & 0xff))
/* NOTE - c is not incremented as per l2c */
-# define l2cn(l1,l2,c,n) { \
- c+=n; \
- switch (n) { \
- case 8: *(--(c))=(unsigned char)(((l2)>>24L)&0xff); \
- /* fall through */ \
- case 7: *(--(c))=(unsigned char)(((l2)>>16L)&0xff); \
- /* fall through */ \
- case 6: *(--(c))=(unsigned char)(((l2)>> 8L)&0xff); \
- /* fall through */ \
- case 5: *(--(c))=(unsigned char)(((l2) )&0xff); \
- /* fall through */ \
- case 4: *(--(c))=(unsigned char)(((l1)>>24L)&0xff); \
- /* fall through */ \
- case 3: *(--(c))=(unsigned char)(((l1)>>16L)&0xff); \
- /* fall through */ \
- case 2: *(--(c))=(unsigned char)(((l1)>> 8L)&0xff); \
- /* fall through */ \
- case 1: *(--(c))=(unsigned char)(((l1) )&0xff); \
- } \
- }
-
-# if defined(_MSC_VER)
-# define ROTATE(a,n) (_lrotr(a,n))
-# elif defined(__ICC)
-# define ROTATE(a,n) (_rotr(a,n))
-# elif defined(__GNUC__) && __GNUC__>=2 && !defined(__STRICT_ANSI__) && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) && !defined(PEDANTIC)
-# if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__)
-# define ROTATE(a,n) ({ register unsigned int ret; \
- asm ("rorl %1,%0" \
- : "=r"(ret) \
- : "I"(n),"0"(a) \
- : "cc"); \
- ret; \
- })
-# elif defined(__riscv_zbb) || defined(__riscv_zbkb)
-# if __riscv_xlen == 64
-# define ROTATE(x, n) ({ register unsigned int ret; \
+#define l2cn(l1, l2, c, n) \
+ { \
+ c += n; \
+ switch (n) { \
+ case 8: \
+ *(--(c)) = (unsigned char)(((l2) >> 24L) & 0xff); \
+ /* fall through */ \
+ case 7: \
+ *(--(c)) = (unsigned char)(((l2) >> 16L) & 0xff); \
+ /* fall through */ \
+ case 6: \
+ *(--(c)) = (unsigned char)(((l2) >> 8L) & 0xff); \
+ /* fall through */ \
+ case 5: \
+ *(--(c)) = (unsigned char)(((l2)) & 0xff); \
+ /* fall through */ \
+ case 4: \
+ *(--(c)) = (unsigned char)(((l1) >> 24L) & 0xff); \
+ /* fall through */ \
+ case 3: \
+ *(--(c)) = (unsigned char)(((l1) >> 16L) & 0xff); \
+ /* fall through */ \
+ case 2: \
+ *(--(c)) = (unsigned char)(((l1) >> 8L) & 0xff); \
+ /* fall through */ \
+ case 1: \
+ *(--(c)) = (unsigned char)(((l1)) & 0xff); \
+ } \
+ }
+
+#if defined(_MSC_VER)
+#define ROTATE(a, n) (_lrotr(a, n))
+#elif defined(__ICC)
+#define ROTATE(a, n) (_rotr(a, n))
+#elif defined(__GNUC__) && __GNUC__ >= 2 && !defined(__STRICT_ANSI__) && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) && !defined(PEDANTIC)
+#if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__)
+#define ROTATE(a, n) ({ \
+ register unsigned int ret; \
+ asm("rorl %1,%0" \
+ : "=r"(ret) \
+ : "I"(n), "0"(a) \
+ : "cc"); \
+ ret; \
+})
+#elif defined(__riscv_zbb) || defined(__riscv_zbkb)
+#if __riscv_xlen == 64
+#define ROTATE(x, n) ({ register unsigned int ret; \
asm ("roriw %0, %1, %2" \
: "=r"(ret) \
: "r"(x), "i"(n)); ret; })
-# endif
-# if __riscv_xlen == 32
-# define ROTATE(x, n) ({ register unsigned int ret; \
+#endif
+#if __riscv_xlen == 32
+#define ROTATE(x, n) ({ register unsigned int ret; \
asm ("rori %0, %1, %2" \
: "=r"(ret) \
: "r"(x), "i"(n)); ret; })
-# endif
-# endif
-# endif
-# ifndef ROTATE
-# define ROTATE(a,n) (((a)>>(n))+((a)<<(32-(n))))
-# endif
+#endif
+#endif
+#endif
+#ifndef ROTATE
+#define ROTATE(a, n) (((a) >> (n)) + ((a) << (32 - (n))))
+#endif
/*
* Don't worry about the LOAD_DATA() stuff, that is used by fcrypt() to add
* it's little bit to the front
*/
-# ifdef DES_FCRYPT
-
-# define LOAD_DATA_tmp(R,S,u,t,E0,E1) \
- { DES_LONG tmp; LOAD_DATA(R,S,u,t,E0,E1,tmp); }
-
-# define LOAD_DATA(R,S,u,t,E0,E1,tmp) \
- t=R^(R>>16L); \
- u=t&E0; t&=E1; \
- tmp=(u<<16); u^=R^s[S ]; u^=tmp; \
- tmp=(t<<16); t^=R^s[S+1]; t^=tmp
-# else
-# define LOAD_DATA_tmp(a,b,c,d,e,f) LOAD_DATA(a,b,c,d,e,f,g)
-# define LOAD_DATA(R,S,u,t,E0,E1,tmp) \
- u=R^s[S ]; \
- t=R^s[S+1]
-# endif
+#ifdef DES_FCRYPT
+
+#define LOAD_DATA_tmp(R, S, u, t, E0, E1) \
+ { \
+ DES_LONG tmp; \
+ LOAD_DATA(R, S, u, t, E0, E1, tmp); \
+ }
+
+#define LOAD_DATA(R, S, u, t, E0, E1, tmp) \
+ t = R ^ (R >> 16L); \
+ u = t & E0; \
+ t &= E1; \
+ tmp = (u << 16); \
+ u ^= R ^ s[S]; \
+ u ^= tmp; \
+ tmp = (t << 16); \
+ t ^= R ^ s[S + 1]; \
+ t ^= tmp
+#else
+#define LOAD_DATA_tmp(a, b, c, d, e, f) LOAD_DATA(a, b, c, d, e, f, g)
+#define LOAD_DATA(R, S, u, t, E0, E1, tmp) \
+ u = R ^ s[S]; \
+ t = R ^ s[S + 1]
+#endif
/*
* It recently occurred to me that 0^0^0^0^0^0^0 == 0, so there is no reason
@@ -141,84 +168,78 @@
* since things can be xored directly into L
*/
-# define D_ENCRYPT(LL,R,S) { \
- LOAD_DATA_tmp(R,S,u,t,E0,E1); \
- t=ROTATE(t,4); \
- LL^= \
- DES_SPtrans[0][(u>> 2L)&0x3f]^ \
- DES_SPtrans[2][(u>>10L)&0x3f]^ \
- DES_SPtrans[4][(u>>18L)&0x3f]^ \
- DES_SPtrans[6][(u>>26L)&0x3f]^ \
- DES_SPtrans[1][(t>> 2L)&0x3f]^ \
- DES_SPtrans[3][(t>>10L)&0x3f]^ \
- DES_SPtrans[5][(t>>18L)&0x3f]^ \
- DES_SPtrans[7][(t>>26L)&0x3f]; }
-
- /*-
- * IP and FP
- * The problem is more of a geometric problem that random bit fiddling.
- 0 1 2 3 4 5 6 7 62 54 46 38 30 22 14 6
- 8 9 10 11 12 13 14 15 60 52 44 36 28 20 12 4
- 16 17 18 19 20 21 22 23 58 50 42 34 26 18 10 2
- 24 25 26 27 28 29 30 31 to 56 48 40 32 24 16 8 0
-
- 32 33 34 35 36 37 38 39 63 55 47 39 31 23 15 7
- 40 41 42 43 44 45 46 47 61 53 45 37 29 21 13 5
- 48 49 50 51 52 53 54 55 59 51 43 35 27 19 11 3
- 56 57 58 59 60 61 62 63 57 49 41 33 25 17 9 1
-
- The output has been subject to swaps of the form
- 0 1 -> 3 1 but the odd and even bits have been put into
- 2 3 2 0
- different words. The main trick is to remember that
- t=((l>>size)^r)&(mask);
- r^=t;
- l^=(t<<size);
- can be used to swap and move bits between words.
-
- So l = 0 1 2 3 r = 16 17 18 19
- 4 5 6 7 20 21 22 23
- 8 9 10 11 24 25 26 27
- 12 13 14 15 28 29 30 31
- becomes (for size == 2 and mask == 0x3333)
- t = 2^16 3^17 -- -- l = 0 1 16 17 r = 2 3 18 19
- 6^20 7^21 -- -- 4 5 20 21 6 7 22 23
- 10^24 11^25 -- -- 8 9 24 25 10 11 24 25
- 14^28 15^29 -- -- 12 13 28 29 14 15 28 29
-
- Thanks for hints from Richard Outerbridge - he told me IP&FP
- could be done in 15 xor, 10 shifts and 5 ands.
- When I finally started to think of the problem in 2D
- I first got ~42 operations without xors. When I remembered
- how to use xors :-) I got it to its final state.
- */
-# define PERM_OP(a,b,t,n,m) ((t)=((((a)>>(n))^(b))&(m)),\
- (b)^=(t),\
- (a)^=((t)<<(n)))
-
-# define IP(l,r) \
- { \
- register DES_LONG tt; \
- PERM_OP(r,l,tt, 4,0x0f0f0f0fL); \
- PERM_OP(l,r,tt,16,0x0000ffffL); \
- PERM_OP(r,l,tt, 2,0x33333333L); \
- PERM_OP(l,r,tt, 8,0x00ff00ffL); \
- PERM_OP(r,l,tt, 1,0x55555555L); \
- }
-
-# define FP(l,r) \
- { \
- register DES_LONG tt; \
- PERM_OP(l,r,tt, 1,0x55555555L); \
- PERM_OP(r,l,tt, 8,0x00ff00ffL); \
- PERM_OP(l,r,tt, 2,0x33333333L); \
- PERM_OP(r,l,tt,16,0x0000ffffL); \
- PERM_OP(l,r,tt, 4,0x0f0f0f0fL); \
- }
+#define D_ENCRYPT(LL, R, S) \
+ { \
+ LOAD_DATA_tmp(R, S, u, t, E0, E1); \
+ t = ROTATE(t, 4); \
+ LL ^= DES_SPtrans[0][(u >> 2L) & 0x3f] ^ DES_SPtrans[2][(u >> 10L) & 0x3f] ^ DES_SPtrans[4][(u >> 18L) & 0x3f] ^ DES_SPtrans[6][(u >> 26L) & 0x3f] ^ DES_SPtrans[1][(t >> 2L) & 0x3f] ^ DES_SPtrans[3][(t >> 10L) & 0x3f] ^ DES_SPtrans[5][(t >> 18L) & 0x3f] ^ DES_SPtrans[7][(t >> 26L) & 0x3f]; \
+ }
+
+/*-
+ * IP and FP
+ * The problem is more of a geometric problem that random bit fiddling.
+ 0 1 2 3 4 5 6 7 62 54 46 38 30 22 14 6
+ 8 9 10 11 12 13 14 15 60 52 44 36 28 20 12 4
+16 17 18 19 20 21 22 23 58 50 42 34 26 18 10 2
+24 25 26 27 28 29 30 31 to 56 48 40 32 24 16 8 0
+
+32 33 34 35 36 37 38 39 63 55 47 39 31 23 15 7
+40 41 42 43 44 45 46 47 61 53 45 37 29 21 13 5
+48 49 50 51 52 53 54 55 59 51 43 35 27 19 11 3
+56 57 58 59 60 61 62 63 57 49 41 33 25 17 9 1
+
+The output has been subject to swaps of the form
+0 1 -> 3 1 but the odd and even bits have been put into
+2 3 2 0
+different words. The main trick is to remember that
+t=((l>>size)^r)&(mask);
+r^=t;
+l^=(t<<size);
+can be used to swap and move bits between words.
+
+So l = 0 1 2 3 r = 16 17 18 19
+ 4 5 6 7 20 21 22 23
+ 8 9 10 11 24 25 26 27
+ 12 13 14 15 28 29 30 31
+becomes (for size == 2 and mask == 0x3333)
+ t = 2^16 3^17 -- -- l = 0 1 16 17 r = 2 3 18 19
+ 6^20 7^21 -- -- 4 5 20 21 6 7 22 23
+ 10^24 11^25 -- -- 8 9 24 25 10 11 24 25
+ 14^28 15^29 -- -- 12 13 28 29 14 15 28 29
+
+Thanks for hints from Richard Outerbridge - he told me IP&FP
+could be done in 15 xor, 10 shifts and 5 ands.
+When I finally started to think of the problem in 2D
+I first got ~42 operations without xors. When I remembered
+how to use xors :-) I got it to its final state.
+*/
+#define PERM_OP(a, b, t, n, m) ((t) = ((((a) >> (n)) ^ (b)) & (m)), \
+ (b) ^= (t), \
+ (a) ^= ((t) << (n)))
+
+#define IP(l, r) \
+ { \
+ register DES_LONG tt; \
+ PERM_OP(r, l, tt, 4, 0x0f0f0f0fL); \
+ PERM_OP(l, r, tt, 16, 0x0000ffffL); \
+ PERM_OP(r, l, tt, 2, 0x33333333L); \
+ PERM_OP(l, r, tt, 8, 0x00ff00ffL); \
+ PERM_OP(r, l, tt, 1, 0x55555555L); \
+ }
+
+#define FP(l, r) \
+ { \
+ register DES_LONG tt; \
+ PERM_OP(l, r, tt, 1, 0x55555555L); \
+ PERM_OP(r, l, tt, 8, 0x00ff00ffL); \
+ PERM_OP(l, r, tt, 2, 0x33333333L); \
+ PERM_OP(r, l, tt, 16, 0x0000ffffL); \
+ PERM_OP(l, r, tt, 4, 0x0f0f0f0fL); \
+ }
extern const DES_LONG DES_SPtrans[8][64];
void fcrypt_body(DES_LONG *out, DES_key_schedule *ks,
- DES_LONG Eswap0, DES_LONG Eswap1);
+ DES_LONG Eswap0, DES_LONG Eswap1);
#endif
diff --git a/crypto/des/ecb3_enc.c b/crypto/des/ecb3_enc.c
index 48e524dc36..8348dc8cc1 100644
--- a/crypto/des/ecb3_enc.c
+++ b/crypto/des/ecb3_enc.c
@@ -16,8 +16,8 @@
#include "des_local.h"
void DES_ecb3_encrypt(const_DES_cblock *input, DES_cblock *output,
- DES_key_schedule *ks1, DES_key_schedule *ks2,
- DES_key_schedule *ks3, int enc)
+ DES_key_schedule *ks1, DES_key_schedule *ks2,
+ DES_key_schedule *ks3, int enc)
{
register DES_LONG l0, l1;
DES_LONG ll[2];
diff --git a/crypto/des/ecb_enc.c b/crypto/des/ecb_enc.c
index c230a3737c..7f2e90badb 100644
--- a/crypto/des/ecb_enc.c
+++ b/crypto/des/ecb_enc.c
@@ -17,7 +17,6 @@
#include <openssl/opensslv.h>
#include <openssl/bio.h>
-
const char *DES_options(void)
{
static int init = 1;
@@ -34,7 +33,7 @@ const char *DES_options(void)
}
void DES_ecb_encrypt(const_DES_cblock *input, DES_cblock *output,
- DES_key_schedule *ks, int enc)
+ DES_key_schedule *ks, int enc)
{
register DES_LONG l;
DES_LONG ll[2];
diff --git a/crypto/des/fcrypt.c b/crypto/des/fcrypt.c
index c3827a61c9..ebf5ce0ee0 100644
--- a/crypto/des/fcrypt.c
+++ b/crypto/des/fcrypt.c
@@ -16,12 +16,12 @@
/* NOCW */
#include <stdio.h>
#ifdef _OSD_POSIX
-# ifndef CHARSET_EBCDIC
-# define CHARSET_EBCDIC 1
-# endif
+#ifndef CHARSET_EBCDIC
+#define CHARSET_EBCDIC 1
+#endif
#endif
#ifdef CHARSET_EBCDIC
-# include <openssl/ebcdic.h>
+#include <openssl/ebcdic.h>
#endif
#include <openssl/crypto.h>
@@ -32,22 +32,134 @@
* implementations do.
*/
static const unsigned char con_salt[128] = {
- 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9,
- 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF, 0xE0, 0xE1,
- 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9,
- 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF, 0xF0, 0xF1,
- 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9,
- 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF, 0x00, 0x01,
- 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09,
- 0x0A, 0x0B, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A,
- 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12,
- 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A,
- 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x22,
- 0x23, 0x24, 0x25, 0x20, 0x21, 0x22, 0x23, 0x24,
- 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C,
- 0x2D, 0x2E, 0x2F, 0x30, 0x31, 0x32, 0x33, 0x34,
- 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C,
- 0x3D, 0x3E, 0x3F, 0x40, 0x41, 0x42, 0x43, 0x44,
+ 0xD2,
+ 0xD3,
+ 0xD4,
+ 0xD5,
+ 0xD6,
+ 0xD7,
+ 0xD8,
+ 0xD9,
+ 0xDA,
+ 0xDB,
+ 0xDC,
+ 0xDD,
+ 0xDE,
+ 0xDF,
+ 0xE0,
+ 0xE1,
+ 0xE2,
+ 0xE3,
+ 0xE4,
+ 0xE5,
+ 0xE6,
+ 0xE7,
+ 0xE8,
+ 0xE9,
+ 0xEA,
+ 0xEB,
+ 0xEC,
+ 0xED,
+ 0xEE,
+ 0xEF,
+ 0xF0,
+ 0xF1,
+ 0xF2,
+ 0xF3,
+ 0xF4,
+ 0xF5,
+ 0xF6,
+ 0xF7,
+ 0xF8,
+ 0xF9,
+ 0xFA,
+ 0xFB,
+ 0xFC,
+ 0xFD,
+ 0xFE,
+ 0xFF,
+ 0x00,
+ 0x01,
+ 0x02,
+ 0x03,
+ 0x04,
+ 0x05,
+ 0x06,
+ 0x07,
+ 0x08,
+ 0x09,
+ 0x0A,
+ 0x0B,
+ 0x05,
+ 0x06,
+ 0x07,
+ 0x08,
+ 0x09,
+ 0x0A,
+ 0x0B,
+ 0x0C,
+ 0x0D,
+ 0x0E,
+ 0x0F,
+ 0x10,
+ 0x11,
+ 0x12,
+ 0x13,
+ 0x14,
+ 0x15,
+ 0x16,
+ 0x17,
+ 0x18,
+ 0x19,
+ 0x1A,
+ 0x1B,
+ 0x1C,
+ 0x1D,
+ 0x1E,
+ 0x1F,
+ 0x20,
+ 0x21,
+ 0x22,
+ 0x23,
+ 0x24,
+ 0x25,
+ 0x20,
+ 0x21,
+ 0x22,
+ 0x23,
+ 0x24,
+ 0x25,
+ 0x26,
+ 0x27,
+ 0x28,
+ 0x29,
+ 0x2A,
+ 0x2B,
+ 0x2C,
+ 0x2D,
+ 0x2E,
+ 0x2F,
+ 0x30,
+ 0x31,
+ 0x32,
+ 0x33,
+ 0x34,
+ 0x35,
+ 0x36,
+ 0x37,
+ 0x38,
+ 0x39,
+ 0x3A,
+ 0x3B,
+ 0x3C,
+ 0x3D,
+ 0x3E,
+ 0x3F,
+ 0x40,
+ 0x41,
+ 0x42,
+ 0x43,
+ 0x44,
};
static const unsigned char cov_2char[64] = {
@@ -69,7 +181,7 @@ char *DES_crypt(const char *buf, const char *salt)
return DES_fcrypt(buf, salt, buff);
#else
char e_salt[2 + 1];
- char e_buf[32 + 1]; /* replace 32 by 8 ? */
+ char e_buf[32 + 1]; /* replace 32 by 8 ? */
char *ret;
if (salt[0] == '\0' || salt[1] == '\0')
diff --git a/crypto/des/fcrypt_b.c b/crypto/des/fcrypt_b.c
index e843e0e643..1212e37a53 100644
--- a/crypto/des/fcrypt_b.c
+++ b/crypto/des/fcrypt_b.c
@@ -20,16 +20,16 @@
#undef DES_FCRYPT
#undef PERM_OP
-#define PERM_OP(a,b,t,n,m) ((t)=((((a)>>(n))^(b))&(m)),\
- (b)^=(t),\
- (a)^=((t)<<(n)))
+#define PERM_OP(a, b, t, n, m) ((t) = ((((a) >> (n)) ^ (b)) & (m)), \
+ (b) ^= (t), \
+ (a) ^= ((t) << (n)))
#undef HPERM_OP
-#define HPERM_OP(a,t,n,m) ((t)=((((a)<<(16-(n)))^(a))&(m)),\
- (a)=(a)^(t)^(t>>(16-(n))))\
+#define HPERM_OP(a, t, n, m) ((t) = ((((a) << (16 - (n))) ^ (a)) & (m)), \
+ (a) = (a) ^ (t) ^ (t >> (16 - (n))))
void fcrypt_body(DES_LONG *out, DES_key_schedule *ks, DES_LONG Eswap0,
- DES_LONG Eswap1)
+ DES_LONG Eswap1)
{
register DES_LONG l, r, t, u;
register DES_LONG *s;
@@ -44,22 +44,22 @@ void fcrypt_body(DES_LONG *out, DES_key_schedule *ks, DES_LONG Eswap0,
E1 = Eswap1;
for (j = 0; j < 25; j++) {
- D_ENCRYPT(l, r, 0); /* 1 */
- D_ENCRYPT(r, l, 2); /* 2 */
- D_ENCRYPT(l, r, 4); /* 3 */
- D_ENCRYPT(r, l, 6); /* 4 */
- D_ENCRYPT(l, r, 8); /* 5 */
- D_ENCRYPT(r, l, 10); /* 6 */
- D_ENCRYPT(l, r, 12); /* 7 */
- D_ENCRYPT(r, l, 14); /* 8 */
- D_ENCRYPT(l, r, 16); /* 9 */
- D_ENCRYPT(r, l, 18); /* 10 */
- D_ENCRYPT(l, r, 20); /* 11 */
- D_ENCRYPT(r, l, 22); /* 12 */
- D_ENCRYPT(l, r, 24); /* 13 */
- D_ENCRYPT(r, l, 26); /* 14 */
- D_ENCRYPT(l, r, 28); /* 15 */
- D_ENCRYPT(r, l, 30); /* 16 */
+ D_ENCRYPT(l, r, 0); /* 1 */
+ D_ENCRYPT(r, l, 2); /* 2 */
+ D_ENCRYPT(l, r, 4); /* 3 */
+ D_ENCRYPT(r, l, 6); /* 4 */
+ D_ENCRYPT(l, r, 8); /* 5 */
+ D_ENCRYPT(r, l, 10); /* 6 */
+ D_ENCRYPT(l, r, 12); /* 7 */
+ D_ENCRYPT(r, l, 14); /* 8 */
+ D_ENCRYPT(l, r, 16); /* 9 */
+ D_ENCRYPT(r, l, 18); /* 10 */
+ D_ENCRYPT(l, r, 20); /* 11 */
+ D_ENCRYPT(r, l, 22); /* 12 */
+ D_ENCRYPT(l, r, 24); /* 13 */
+ D_ENCRYPT(r, l, 26); /* 14 */
+ D_ENCRYPT(l, r, 28); /* 15 */
+ D_ENCRYPT(r, l, 30); /* 16 */
t = l;
l = r;
r = t;
@@ -67,11 +67,11 @@ void fcrypt_body(DES_LONG *out, DES_key_schedule *ks, DES_LONG Eswap0,
l = ROTATE(l, 3) & 0xffffffffL;
r = ROTATE(r, 3) & 0xffffffffL;
- PERM_OP(l, r, t, 1, 0x55555555L);
- PERM_OP(r, l, t, 8, 0x00ff00ffL);
- PERM_OP(l, r, t, 2, 0x33333333L);
+ PERM_OP(l, r, t, 1, 0x55555555L);
+ PERM_OP(r, l, t, 8, 0x00ff00ffL);
+ PERM_OP(l, r, t, 2, 0x33333333L);
PERM_OP(r, l, t, 16, 0x0000ffffL);
- PERM_OP(l, r, t, 4, 0x0f0f0f0fL);
+ PERM_OP(l, r, t, 4, 0x0f0f0f0fL);
out[0] = r;
out[1] = l;
diff --git a/crypto/des/ncbc_enc.c b/crypto/des/ncbc_enc.c
index e8decf1fbe..3f2feb90e5 100644
--- a/crypto/des/ncbc_enc.c
+++ b/crypto/des/ncbc_enc.c
@@ -17,11 +17,11 @@
#ifdef CBC_ENC_C__DONT_UPDATE_IV
void DES_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
- DES_key_schedule *_schedule, DES_cblock *ivec, int enc)
+ DES_key_schedule *_schedule, DES_cblock *ivec, int enc)
#else
void DES_ncbc_encrypt(const unsigned char *in, unsigned char *out,
- long length, DES_key_schedule *_schedule,
- DES_cblock *ivec, int enc)
+ long length, DES_key_schedule *_schedule,
+ DES_cblock *ivec, int enc)
#endif
{
register DES_LONG tin0, tin1;
diff --git a/crypto/des/ofb64ede.c b/crypto/des/ofb64ede.c
index edcfac8530..b0f9f0441c 100644
--- a/crypto/des/ofb64ede.c
+++ b/crypto/des/ofb64ede.c
@@ -21,9 +21,9 @@
* used is contained in *num;
*/
void DES_ede3_ofb64_encrypt(register const unsigned char *in,
- register unsigned char *out, long length,
- DES_key_schedule *k1, DES_key_schedule *k2,
- DES_key_schedule *k3, DES_cblock *ivec, int *num)
+ register unsigned char *out, long length,
+ DES_key_schedule *k1, DES_key_schedule *k2,
+ DES_key_schedule *k3, DES_cblock *ivec, int *num)
{
register DES_LONG v0, v1;
register int n = *num;
diff --git a/crypto/des/ofb64enc.c b/crypto/des/ofb64enc.c
index 73d4e21d2f..df4e2077e9 100644
--- a/crypto/des/ofb64enc.c
+++ b/crypto/des/ofb64enc.c
@@ -21,8 +21,8 @@
* used is contained in *num;
*/
void DES_ofb64_encrypt(register const unsigned char *in,
- register unsigned char *out, long length,
- DES_key_schedule *schedule, DES_cblock *ivec, int *num)
+ register unsigned char *out, long length,
+ DES_key_schedule *schedule, DES_cblock *ivec, int *num)
{
register DES_LONG v0, v1, t;
register int n = *num;
diff --git a/crypto/des/ofb_enc.c b/crypto/des/ofb_enc.c
index 50c7f4c432..24c184c55e 100644
--- a/crypto/des/ofb_enc.c
+++ b/crypto/des/ofb_enc.c
@@ -22,8 +22,8 @@
* will come from the 3rd and half the 4th byte.
*/
void DES_ofb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
- long length, DES_key_schedule *schedule,
- DES_cblock *ivec)
+ long length, DES_key_schedule *schedule,
+ DES_cblock *ivec)
{
register DES_LONG d0, d1, vv0, vv1, v0, v1, n = (numbits + 7) / 8;
register DES_LONG mask0, mask1;
@@ -72,10 +72,10 @@ void DES_ofb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
} else if (num == 64) {
v0 = vv0;
v1 = vv1;
- } else if (num > 32) { /* && num != 64 */
+ } else if (num > 32) { /* && num != 64 */
v0 = ((v1 >> (num - 32)) | (vv0 << (64 - num))) & 0xffffffffL;
v1 = ((vv0 >> (num - 32)) | (vv1 << (64 - num))) & 0xffffffffL;
- } else { /* num < 32 */
+ } else { /* num < 32 */
v0 = ((v0 >> num) | (v1 << (32 - num))) & 0xffffffffL;
v1 = ((v1 >> num) | (vv0 << (32 - num))) & 0xffffffffL;
diff --git a/crypto/des/pcbc_enc.c b/crypto/des/pcbc_enc.c
index dd9eb1a927..33aaf43168 100644
--- a/crypto/des/pcbc_enc.c
+++ b/crypto/des/pcbc_enc.c
@@ -16,8 +16,8 @@
#include "des_local.h"
void DES_pcbc_encrypt(const unsigned char *input, unsigned char *output,
- long length, DES_key_schedule *schedule,
- DES_cblock *ivec, int enc)
+ long length, DES_key_schedule *schedule,
+ DES_cblock *ivec, int enc)
{
register DES_LONG sin0, sin1, xor0, xor1, tout0, tout1;
DES_LONG tin[2];
diff --git a/crypto/des/qud_cksm.c b/crypto/des/qud_cksm.c
index 9f68399077..d519c48a2f 100644
--- a/crypto/des/qud_cksm.c
+++ b/crypto/des/qud_cksm.c
@@ -23,16 +23,16 @@
#include "des_local.h"
#define Q_B0(a) (((DES_LONG)(a)))
-#define Q_B1(a) (((DES_LONG)(a))<<8)
-#define Q_B2(a) (((DES_LONG)(a))<<16)
-#define Q_B3(a) (((DES_LONG)(a))<<24)
+#define Q_B1(a) (((DES_LONG)(a)) << 8)
+#define Q_B2(a) (((DES_LONG)(a)) << 16)
+#define Q_B3(a) (((DES_LONG)(a)) << 24)
/* used to scramble things a bit */
/* Got the value MIT uses via brute force :-) 2/10/90 eay */
-#define NOISE ((DES_LONG)83653421L)
+#define NOISE ((DES_LONG)83653421L)
DES_LONG DES_quad_cksum(const unsigned char *input, DES_cblock output[],
- long length, int out_count, DES_cblock *seed)
+ long length, int out_count, DES_cblock *seed)
{
DES_LONG z0, z1, t0, t1;
int i;
@@ -44,10 +44,8 @@ DES_LONG DES_quad_cksum(const unsigned char *input, DES_cblock output[],
out_count = 1;
lp = (DES_LONG *)&(output[0])[0];
- z0 = Q_B0((*seed)[0]) | Q_B1((*seed)[1]) | Q_B2((*seed)[2]) |
- Q_B3((*seed)[3]);
- z1 = Q_B0((*seed)[4]) | Q_B1((*seed)[5]) | Q_B2((*seed)[6]) |
- Q_B3((*seed)[7]);
+ z0 = Q_B0((*seed)[0]) | Q_B1((*seed)[1]) | Q_B2((*seed)[2]) | Q_B3((*seed)[3]);
+ z1 = Q_B0((*seed)[4]) | Q_B1((*seed)[5]) | Q_B2((*seed)[6]) | Q_B3((*seed)[7]);
for (i = 0; ((i < 4) && (i < out_count)); i++) {
cp = input;
@@ -66,9 +64,9 @@ DES_LONG DES_quad_cksum(const unsigned char *input, DES_cblock output[],
t1 = z1;
/* square, well sort of square */
z0 = ((((t0 * t0) & 0xffffffffL) + ((t1 * t1) & 0xffffffffL))
- & 0xffffffffL) % 0x7fffffffL;
- z1 = ((t0 * ((t1 + NOISE) & 0xffffffffL)) & 0xffffffffL) %
- 0x7fffffffL;
+ & 0xffffffffL)
+ % 0x7fffffffL;
+ z1 = ((t0 * ((t1 + NOISE) & 0xffffffffL)) & 0xffffffffL) % 0x7fffffffL;
}
if (lp != NULL) {
/*
diff --git a/crypto/des/set_key.c b/crypto/des/set_key.c
index 5c958cdbb6..ae17c50925 100644
--- a/crypto/des/set_key.c
+++ b/crypto/des/set_key.c
@@ -93,23 +93,23 @@ int DES_check_key_parity(const_DES_cblock *key)
*/
static const DES_cblock weak_keys[] = {
/* weak keys */
- {0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01},
- {0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE},
- {0x1F, 0x1F, 0x1F, 0x1F, 0x0E, 0x0E, 0x0E, 0x0E},
- {0xE0, 0xE0, 0xE0, 0xE0, 0xF1, 0xF1, 0xF1, 0xF1},
+ { 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 },
+ { 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE },
+ { 0x1F, 0x1F, 0x1F, 0x1F, 0x0E, 0x0E, 0x0E, 0x0E },
+ { 0xE0, 0xE0, 0xE0, 0xE0, 0xF1, 0xF1, 0xF1, 0xF1 },
/* semi-weak keys */
- {0x01, 0xFE, 0x01, 0xFE, 0x01, 0xFE, 0x01, 0xFE},
- {0xFE, 0x01, 0xFE, 0x01, 0xFE, 0x01, 0xFE, 0x01},
- {0x1F, 0xE0, 0x1F, 0xE0, 0x0E, 0xF1, 0x0E, 0xF1},
- {0xE0, 0x1F, 0xE0, 0x1F, 0xF1, 0x0E, 0xF1, 0x0E},
- {0x01, 0xE0, 0x01, 0xE0, 0x01, 0xF1, 0x01, 0xF1},
- {0xE0, 0x01, 0xE0, 0x01, 0xF1, 0x01, 0xF1, 0x01},
- {0x1F, 0xFE, 0x1F, 0xFE, 0x0E, 0xFE, 0x0E, 0xFE},
- {0xFE, 0x1F, 0xFE, 0x1F, 0xFE, 0x0E, 0xFE, 0x0E},
- {0x01, 0x1F, 0x01, 0x1F, 0x01, 0x0E, 0x01, 0x0E},
- {0x1F, 0x01, 0x1F, 0x01, 0x0E, 0x01, 0x0E, 0x01},
- {0xE0, 0xFE, 0xE0, 0xFE, 0xF1, 0xFE, 0xF1, 0xFE},
- {0xFE, 0xE0, 0xFE, 0xE0, 0xFE, 0xF1, 0xFE, 0xF1}
+ { 0x01, 0xFE, 0x01, 0xFE, 0x01, 0xFE, 0x01, 0xFE },
+ { 0xFE, 0x01, 0xFE, 0x01, 0xFE, 0x01, 0xFE, 0x01 },
+ { 0x1F, 0xE0, 0x1F, 0xE0, 0x0E, 0xF1, 0x0E, 0xF1 },
+ { 0xE0, 0x1F, 0xE0, 0x1F, 0xF1, 0x0E, 0xF1, 0x0E },
+ { 0x01, 0xE0, 0x01, 0xE0, 0x01, 0xF1, 0x01, 0xF1 },
+ { 0xE0, 0x01, 0xE0, 0x01, 0xF1, 0x01, 0xF1, 0x01 },
+ { 0x1F, 0xFE, 0x1F, 0xFE, 0x0E, 0xFE, 0x0E, 0xFE },
+ { 0xFE, 0x1F, 0xFE, 0x1F, 0xFE, 0x0E, 0xFE, 0x0E },
+ { 0x01, 0x1F, 0x01, 0x1F, 0x01, 0x0E, 0x01, 0x0E },
+ { 0x1F, 0x01, 0x1F, 0x01, 0x0E, 0x01, 0x0E, 0x01 },
+ { 0xE0, 0xFE, 0xE0, 0xFE, 0xF1, 0xFE, 0xF1, 0xFE },
+ { 0xFE, 0xE0, 0xFE, 0xE0, 0xFE, 0xF1, 0xFE, 0xF1 }
};
/*
@@ -136,162 +136,546 @@ int DES_is_weak_key(const_DES_cblock *key)
* (a)=((a)^((t)<<(n))))
*/
-#define HPERM_OP(a,t,n,m) ((t)=((((a)<<(16-(n)))^(a))&(m)),\
- (a)=(a)^(t)^(t>>(16-(n))))
+#define HPERM_OP(a, t, n, m) ((t) = ((((a) << (16 - (n))) ^ (a)) & (m)), \
+ (a) = (a) ^ (t) ^ (t >> (16 - (n))))
static const DES_LONG des_skb[8][64] = {
{
- /* for C bits (numbered as per FIPS 46) 1 2 3 4 5 6 */
- 0x00000000L, 0x00000010L, 0x20000000L, 0x20000010L,
- 0x00010000L, 0x00010010L, 0x20010000L, 0x20010010L,
- 0x00000800L, 0x00000810L, 0x20000800L, 0x20000810L,
- 0x00010800L, 0x00010810L, 0x20010800L, 0x20010810L,
- 0x00000020L, 0x00000030L, 0x20000020L, 0x20000030L,
- 0x00010020L, 0x00010030L, 0x20010020L, 0x20010030L,
- 0x00000820L, 0x00000830L, 0x20000820L, 0x20000830L,
- 0x00010820L, 0x00010830L, 0x20010820L, 0x20010830L,
- 0x00080000L, 0x00080010L, 0x20080000L, 0x20080010L,
- 0x00090000L, 0x00090010L, 0x20090000L, 0x20090010L,
- 0x00080800L, 0x00080810L, 0x20080800L, 0x20080810L,
- 0x00090800L, 0x00090810L, 0x20090800L, 0x20090810L,
- 0x00080020L, 0x00080030L, 0x20080020L, 0x20080030L,
- 0x00090020L, 0x00090030L, 0x20090020L, 0x20090030L,
- 0x00080820L, 0x00080830L, 0x20080820L, 0x20080830L,
- 0x00090820L, 0x00090830L, 0x20090820L, 0x20090830L,
- },
+ /* for C bits (numbered as per FIPS 46) 1 2 3 4 5 6 */
+ 0x00000000L,
+ 0x00000010L,
+ 0x20000000L,
+ 0x20000010L,
+ 0x00010000L,
+ 0x00010010L,
+ 0x20010000L,
+ 0x20010010L,
+ 0x00000800L,
+ 0x00000810L,
+ 0x20000800L,
+ 0x20000810L,
+ 0x00010800L,
+ 0x00010810L,
+ 0x20010800L,
+ 0x20010810L,
+ 0x00000020L,
+ 0x00000030L,
+ 0x20000020L,
+ 0x20000030L,
+ 0x00010020L,
+ 0x00010030L,
+ 0x20010020L,
+ 0x20010030L,
+ 0x00000820L,
+ 0x00000830L,
+ 0x20000820L,
+ 0x20000830L,
+ 0x00010820L,
+ 0x00010830L,
+ 0x20010820L,
+ 0x20010830L,
+ 0x00080000L,
+ 0x00080010L,
+ 0x20080000L,
+ 0x20080010L,
+ 0x00090000L,
+ 0x00090010L,
+ 0x20090000L,
+ 0x20090010L,
+ 0x00080800L,
+ 0x00080810L,
+ 0x20080800L,
+ 0x20080810L,
+ 0x00090800L,
+ 0x00090810L,
+ 0x20090800L,
+ 0x20090810L,
+ 0x00080020L,
+ 0x00080030L,
+ 0x20080020L,
+ 0x20080030L,
+ 0x00090020L,
+ 0x00090030L,
+ 0x20090020L,
+ 0x20090030L,
+ 0x00080820L,
+ 0x00080830L,
+ 0x20080820L,
+ 0x20080830L,
+ 0x00090820L,
+ 0x00090830L,
+ 0x20090820L,
+ 0x20090830L,
+ },
{
- /* for C bits (numbered as per FIPS 46) 7 8 10 11 12 13 */
- 0x00000000L, 0x02000000L, 0x00002000L, 0x02002000L,
- 0x00200000L, 0x02200000L, 0x00202000L, 0x02202000L,
- 0x00000004L, 0x02000004L, 0x00002004L, 0x02002004L,
- 0x00200004L, 0x02200004L, 0x00202004L, 0x02202004L,
- 0x00000400L, 0x02000400L, 0x00002400L, 0x02002400L,
- 0x00200400L, 0x02200400L, 0x00202400L, 0x02202400L,
- 0x00000404L, 0x02000404L, 0x00002404L, 0x02002404L,
- 0x00200404L, 0x02200404L, 0x00202404L, 0x02202404L,
- 0x10000000L, 0x12000000L, 0x10002000L, 0x12002000L,
- 0x10200000L, 0x12200000L, 0x10202000L, 0x12202000L,
- 0x10000004L, 0x12000004L, 0x10002004L, 0x12002004L,
- 0x10200004L, 0x12200004L, 0x10202004L, 0x12202004L,
- 0x10000400L, 0x12000400L, 0x10002400L, 0x12002400L,
- 0x10200400L, 0x12200400L, 0x10202400L, 0x12202400L,
- 0x10000404L, 0x12000404L, 0x10002404L, 0x12002404L,
- 0x10200404L, 0x12200404L, 0x10202404L, 0x12202404L,
- },
+ /* for C bits (numbered as per FIPS 46) 7 8 10 11 12 13 */
+ 0x00000000L,
+ 0x02000000L,
+ 0x00002000L,
+ 0x02002000L,
+ 0x00200000L,
+ 0x02200000L,
+ 0x00202000L,
+ 0x02202000L,
+ 0x00000004L,
+ 0x02000004L,
+ 0x00002004L,
+ 0x02002004L,
+ 0x00200004L,
+ 0x02200004L,
+ 0x00202004L,
+ 0x02202004L,
+ 0x00000400L,
+ 0x02000400L,
+ 0x00002400L,
+ 0x02002400L,
+ 0x00200400L,
+ 0x02200400L,
+ 0x00202400L,
+ 0x02202400L,
+ 0x00000404L,
+ 0x02000404L,
+ 0x00002404L,
+ 0x02002404L,
+ 0x00200404L,
+ 0x02200404L,
+ 0x00202404L,
+ 0x02202404L,
+ 0x10000000L,
+ 0x12000000L,
+ 0x10002000L,
+ 0x12002000L,
+ 0x10200000L,
+ 0x12200000L,
+ 0x10202000L,
+ 0x12202000L,
+ 0x10000004L,
+ 0x12000004L,
+ 0x10002004L,
+ 0x12002004L,
+ 0x10200004L,
+ 0x12200004L,
+ 0x10202004L,
+ 0x12202004L,
+ 0x10000400L,
+ 0x12000400L,
+ 0x10002400L,
+ 0x12002400L,
+ 0x10200400L,
+ 0x12200400L,
+ 0x10202400L,
+ 0x12202400L,
+ 0x10000404L,
+ 0x12000404L,
+ 0x10002404L,
+ 0x12002404L,
+ 0x10200404L,
+ 0x12200404L,
+ 0x10202404L,
+ 0x12202404L,
+ },
{
- /* for C bits (numbered as per FIPS 46) 14 15 16 17 19 20 */
- 0x00000000L, 0x00000001L, 0x00040000L, 0x00040001L,
- 0x01000000L, 0x01000001L, 0x01040000L, 0x01040001L,
- 0x00000002L, 0x00000003L, 0x00040002L, 0x00040003L,
- 0x01000002L, 0x01000003L, 0x01040002L, 0x01040003L,
- 0x00000200L, 0x00000201L, 0x00040200L, 0x00040201L,
- 0x01000200L, 0x01000201L, 0x01040200L, 0x01040201L,
- 0x00000202L, 0x00000203L, 0x00040202L, 0x00040203L,
- 0x01000202L, 0x01000203L, 0x01040202L, 0x01040203L,
- 0x08000000L, 0x08000001L, 0x08040000L, 0x08040001L,
- 0x09000000L, 0x09000001L, 0x09040000L, 0x09040001L,
- 0x08000002L, 0x08000003L, 0x08040002L, 0x08040003L,
- 0x09000002L, 0x09000003L, 0x09040002L, 0x09040003L,
- 0x08000200L, 0x08000201L, 0x08040200L, 0x08040201L,
- 0x09000200L, 0x09000201L, 0x09040200L, 0x09040201L,
- 0x08000202L, 0x08000203L, 0x08040202L, 0x08040203L,
- 0x09000202L, 0x09000203L, 0x09040202L, 0x09040203L,
- },
+ /* for C bits (numbered as per FIPS 46) 14 15 16 17 19 20 */
+ 0x00000000L,
+ 0x00000001L,
+ 0x00040000L,
+ 0x00040001L,
+ 0x01000000L,
+ 0x01000001L,
+ 0x01040000L,
+ 0x01040001L,
+ 0x00000002L,
+ 0x00000003L,
+ 0x00040002L,
+ 0x00040003L,
+ 0x01000002L,
+ 0x01000003L,
+ 0x01040002L,
+ 0x01040003L,
+ 0x00000200L,
+ 0x00000201L,
+ 0x00040200L,
+ 0x00040201L,
+ 0x01000200L,
+ 0x01000201L,
+ 0x01040200L,
+ 0x01040201L,
+ 0x00000202L,
+ 0x00000203L,
+ 0x00040202L,
+ 0x00040203L,
+ 0x01000202L,
+ 0x01000203L,
+ 0x01040202L,
+ 0x01040203L,
+ 0x08000000L,
+ 0x08000001L,
+ 0x08040000L,
+ 0x08040001L,
+ 0x09000000L,
+ 0x09000001L,
+ 0x09040000L,
+ 0x09040001L,
+ 0x08000002L,
+ 0x08000003L,
+ 0x08040002L,
+ 0x08040003L,
+ 0x09000002L,
+ 0x09000003L,
+ 0x09040002L,
+ 0x09040003L,
+ 0x08000200L,
+ 0x08000201L,
+ 0x08040200L,
+ 0x08040201L,
+ 0x09000200L,
+ 0x09000201L,
+ 0x09040200L,
+ 0x09040201L,
+ 0x08000202L,
+ 0x08000203L,
+ 0x08040202L,
+ 0x08040203L,
+ 0x09000202L,
+ 0x09000203L,
+ 0x09040202L,
+ 0x09040203L,
+ },
{
- /* for C bits (numbered as per FIPS 46) 21 23 24 26 27 28 */
- 0x00000000L, 0x00100000L, 0x00000100L, 0x00100100L,
- 0x00000008L, 0x00100008L, 0x00000108L, 0x00100108L,
- 0x00001000L, 0x00101000L, 0x00001100L, 0x00101100L,
- 0x00001008L, 0x00101008L, 0x00001108L, 0x00101108L,
- 0x04000000L, 0x04100000L, 0x04000100L, 0x04100100L,
- 0x04000008L, 0x04100008L, 0x04000108L, 0x04100108L,
- 0x04001000L, 0x04101000L, 0x04001100L, 0x04101100L,
- 0x04001008L, 0x04101008L, 0x04001108L, 0x04101108L,
- 0x00020000L, 0x00120000L, 0x00020100L, 0x00120100L,
- 0x00020008L, 0x00120008L, 0x00020108L, 0x00120108L,
- 0x00021000L, 0x00121000L, 0x00021100L, 0x00121100L,
- 0x00021008L, 0x00121008L, 0x00021108L, 0x00121108L,
- 0x04020000L, 0x04120000L, 0x04020100L, 0x04120100L,
- 0x04020008L, 0x04120008L, 0x04020108L, 0x04120108L,
- 0x04021000L, 0x04121000L, 0x04021100L, 0x04121100L,
- 0x04021008L, 0x04121008L, 0x04021108L, 0x04121108L,
- },
+ /* for C bits (numbered as per FIPS 46) 21 23 24 26 27 28 */
+ 0x00000000L,
+ 0x00100000L,
+ 0x00000100L,
+ 0x00100100L,
+ 0x00000008L,
+ 0x00100008L,
+ 0x00000108L,
+ 0x00100108L,
+ 0x00001000L,
+ 0x00101000L,
+ 0x00001100L,
+ 0x00101100L,
+ 0x00001008L,
+ 0x00101008L,
+ 0x00001108L,
+ 0x00101108L,
+ 0x04000000L,
+ 0x04100000L,
+ 0x04000100L,
+ 0x04100100L,
+ 0x04000008L,
+ 0x04100008L,
+ 0x04000108L,
+ 0x04100108L,
+ 0x04001000L,
+ 0x04101000L,
+ 0x04001100L,
+ 0x04101100L,
+ 0x04001008L,
+ 0x04101008L,
+ 0x04001108L,
+ 0x04101108L,
+ 0x00020000L,
+ 0x00120000L,
+ 0x00020100L,
+ 0x00120100L,
+ 0x00020008L,
+ 0x00120008L,
+ 0x00020108L,
+ 0x00120108L,
+ 0x00021000L,
+ 0x00121000L,
+ 0x00021100L,
+ 0x00121100L,
+ 0x00021008L,
+ 0x00121008L,
+ 0x00021108L,
+ 0x00121108L,
+ 0x04020000L,
+ 0x04120000L,
+ 0x04020100L,
+ 0x04120100L,
+ 0x04020008L,
+ 0x04120008L,
+ 0x04020108L,
+ 0x04120108L,
+ 0x04021000L,
+ 0x04121000L,
+ 0x04021100L,
+ 0x04121100L,
+ 0x04021008L,
+ 0x04121008L,
+ 0x04021108L,
+ 0x04121108L,
+ },
{
- /* for D bits (numbered as per FIPS 46) 1 2 3 4 5 6 */
- 0x00000000L, 0x10000000L, 0x00010000L, 0x10010000L,
- 0x00000004L, 0x10000004L, 0x00010004L, 0x10010004L,
- 0x20000000L, 0x30000000L, 0x20010000L, 0x30010000L,
- 0x20000004L, 0x30000004L, 0x20010004L, 0x30010004L,
- 0x00100000L, 0x10100000L, 0x00110000L, 0x10110000L,
- 0x00100004L, 0x10100004L, 0x00110004L, 0x10110004L,
- 0x20100000L, 0x30100000L, 0x20110000L, 0x30110000L,
- 0x20100004L, 0x30100004L, 0x20110004L, 0x30110004L,
- 0x00001000L, 0x10001000L, 0x00011000L, 0x10011000L,
- 0x00001004L, 0x10001004L, 0x00011004L, 0x10011004L,
- 0x20001000L, 0x30001000L, 0x20011000L, 0x30011000L,
- 0x20001004L, 0x30001004L, 0x20011004L, 0x30011004L,
- 0x00101000L, 0x10101000L, 0x00111000L, 0x10111000L,
- 0x00101004L, 0x10101004L, 0x00111004L, 0x10111004L,
- 0x20101000L, 0x30101000L, 0x20111000L, 0x30111000L,
- 0x20101004L, 0x30101004L, 0x20111004L, 0x30111004L,
- },
+ /* for D bits (numbered as per FIPS 46) 1 2 3 4 5 6 */
+ 0x00000000L,
+ 0x10000000L,
+ 0x00010000L,
+ 0x10010000L,
+ 0x00000004L,
+ 0x10000004L,
+ 0x00010004L,
+ 0x10010004L,
+ 0x20000000L,
+ 0x30000000L,
+ 0x20010000L,
+ 0x30010000L,
+ 0x20000004L,
+ 0x30000004L,
+ 0x20010004L,
+ 0x30010004L,
+ 0x00100000L,
+ 0x10100000L,
+ 0x00110000L,
+ 0x10110000L,
+ 0x00100004L,
+ 0x10100004L,
+ 0x00110004L,
+ 0x10110004L,
+ 0x20100000L,
+ 0x30100000L,
+ 0x20110000L,
+ 0x30110000L,
+ 0x20100004L,
+ 0x30100004L,
+ 0x20110004L,
+ 0x30110004L,
+ 0x00001000L,
+ 0x10001000L,
+ 0x00011000L,
+ 0x10011000L,
+ 0x00001004L,
+ 0x10001004L,
+ 0x00011004L,
+ 0x10011004L,
+ 0x20001000L,
+ 0x30001000L,
+ 0x20011000L,
+ 0x30011000L,
+ 0x20001004L,
+ 0x30001004L,
+ 0x20011004L,
+ 0x30011004L,
+ 0x00101000L,
+ 0x10101000L,
+ 0x00111000L,
+ 0x10111000L,
+ 0x00101004L,
+ 0x10101004L,
+ 0x00111004L,
+ 0x10111004L,
+ 0x20101000L,
+ 0x30101000L,
+ 0x20111000L,
+ 0x30111000L,
+ 0x20101004L,
+ 0x30101004L,
+ 0x20111004L,
+ 0x30111004L,
+ },
{
- /* for D bits (numbered as per FIPS 46) 8 9 11 12 13 14 */
- 0x00000000L, 0x08000000L, 0x00000008L, 0x08000008L,
- 0x00000400L, 0x08000400L, 0x00000408L, 0x08000408L,
- 0x00020000L, 0x08020000L, 0x00020008L, 0x08020008L,
- 0x00020400L, 0x08020400L, 0x00020408L, 0x08020408L,
- 0x00000001L, 0x08000001L, 0x00000009L, 0x08000009L,
- 0x00000401L, 0x08000401L, 0x00000409L, 0x08000409L,
- 0x00020001L, 0x08020001L, 0x00020009L, 0x08020009L,
- 0x00020401L, 0x08020401L, 0x00020409L, 0x08020409L,
- 0x02000000L, 0x0A000000L, 0x02000008L, 0x0A000008L,
- 0x02000400L, 0x0A000400L, 0x02000408L, 0x0A000408L,
- 0x02020000L, 0x0A020000L, 0x02020008L, 0x0A020008L,
- 0x02020400L, 0x0A020400L, 0x02020408L, 0x0A020408L,
- 0x02000001L, 0x0A000001L, 0x02000009L, 0x0A000009L,
- 0x02000401L, 0x0A000401L, 0x02000409L, 0x0A000409L,
- 0x02020001L, 0x0A020001L, 0x02020009L, 0x0A020009L,
- 0x02020401L, 0x0A020401L, 0x02020409L, 0x0A020409L,
- },
+ /* for D bits (numbered as per FIPS 46) 8 9 11 12 13 14 */
+ 0x00000000L,
+ 0x08000000L,
+ 0x00000008L,
+ 0x08000008L,
+ 0x00000400L,
+ 0x08000400L,
+ 0x00000408L,
+ 0x08000408L,
+ 0x00020000L,
+ 0x08020000L,
+ 0x00020008L,
+ 0x08020008L,
+ 0x00020400L,
+ 0x08020400L,
+ 0x00020408L,
+ 0x08020408L,
+ 0x00000001L,
+ 0x08000001L,
+ 0x00000009L,
+ 0x08000009L,
+ 0x00000401L,
+ 0x08000401L,
+ 0x00000409L,
+ 0x08000409L,
+ 0x00020001L,
+ 0x08020001L,
+ 0x00020009L,
+ 0x08020009L,
+ 0x00020401L,
+ 0x08020401L,
+ 0x00020409L,
+ 0x08020409L,
+ 0x02000000L,
+ 0x0A000000L,
+ 0x02000008L,
+ 0x0A000008L,
+ 0x02000400L,
+ 0x0A000400L,
+ 0x02000408L,
+ 0x0A000408L,
+ 0x02020000L,
+ 0x0A020000L,
+ 0x02020008L,
+ 0x0A020008L,
+ 0x02020400L,
+ 0x0A020400L,
+ 0x02020408L,
+ 0x0A020408L,
+ 0x02000001L,
+ 0x0A000001L,
+ 0x02000009L,
+ 0x0A000009L,
+ 0x02000401L,
+ 0x0A000401L,
+ 0x02000409L,
+ 0x0A000409L,
+ 0x02020001L,
+ 0x0A020001L,
+ 0x02020009L,
+ 0x0A020009L,
+ 0x02020401L,
+ 0x0A020401L,
+ 0x02020409L,
+ 0x0A020409L,
+ },
{
- /* for D bits (numbered as per FIPS 46) 16 17 18 19 20 21 */
- 0x00000000L, 0x00000100L, 0x00080000L, 0x00080100L,
- 0x01000000L, 0x01000100L, 0x01080000L, 0x01080100L,
- 0x00000010L, 0x00000110L, 0x00080010L, 0x00080110L,
- 0x01000010L, 0x01000110L, 0x01080010L, 0x01080110L,
- 0x00200000L, 0x00200100L, 0x00280000L, 0x00280100L,
- 0x01200000L, 0x01200100L, 0x01280000L, 0x01280100L,
- 0x00200010L, 0x00200110L, 0x00280010L, 0x00280110L,
- 0x01200010L, 0x01200110L, 0x01280010L, 0x01280110L,
- 0x00000200L, 0x00000300L, 0x00080200L, 0x00080300L,
- 0x01000200L, 0x01000300L, 0x01080200L, 0x01080300L,
- 0x00000210L, 0x00000310L, 0x00080210L, 0x00080310L,
- 0x01000210L, 0x01000310L, 0x01080210L, 0x01080310L,
- 0x00200200L, 0x00200300L, 0x00280200L, 0x00280300L,
- 0x01200200L, 0x01200300L, 0x01280200L, 0x01280300L,
- 0x00200210L, 0x00200310L, 0x00280210L, 0x00280310L,
- 0x01200210L, 0x01200310L, 0x01280210L, 0x01280310L,
- },
+ /* for D bits (numbered as per FIPS 46) 16 17 18 19 20 21 */
+ 0x00000000L,
+ 0x00000100L,
+ 0x00080000L,
+ 0x00080100L,
+ 0x01000000L,
+ 0x01000100L,
+ 0x01080000L,
+ 0x01080100L,
+ 0x00000010L,
+ 0x00000110L,
+ 0x00080010L,
+ 0x00080110L,
+ 0x01000010L,
+ 0x01000110L,
+ 0x01080010L,
+ 0x01080110L,
+ 0x00200000L,
+ 0x00200100L,
+ 0x00280000L,
+ 0x00280100L,
+ 0x01200000L,
+ 0x01200100L,
+ 0x01280000L,
+ 0x01280100L,
+ 0x00200010L,
+ 0x00200110L,
+ 0x00280010L,
+ 0x00280110L,
+ 0x01200010L,
+ 0x01200110L,
+ 0x01280010L,
+ 0x01280110L,
+ 0x00000200L,
+ 0x00000300L,
+ 0x00080200L,
+ 0x00080300L,
+ 0x01000200L,
+ 0x01000300L,
+ 0x01080200L,
+ 0x01080300L,
+ 0x00000210L,
+ 0x00000310L,
+ 0x00080210L,
+ 0x00080310L,
+ 0x01000210L,
+ 0x01000310L,
+ 0x01080210L,
+ 0x01080310L,
+ 0x00200200L,
+ 0x00200300L,
+ 0x00280200L,
+ 0x00280300L,
+ 0x01200200L,
+ 0x01200300L,
+ 0x01280200L,
+ 0x01280300L,
+ 0x00200210L,
+ 0x00200310L,
+ 0x00280210L,
+ 0x00280310L,
+ 0x01200210L,
+ 0x01200310L,
+ 0x01280210L,
+ 0x01280310L,
+ },
{
- /* for D bits (numbered as per FIPS 46) 22 23 24 25 27 28 */
- 0x00000000L, 0x04000000L, 0x00040000L, 0x04040000L,
- 0x00000002L, 0x04000002L, 0x00040002L, 0x04040002L,
- 0x00002000L, 0x04002000L, 0x00042000L, 0x04042000L,
- 0x00002002L, 0x04002002L, 0x00042002L, 0x04042002L,
- 0x00000020L, 0x04000020L, 0x00040020L, 0x04040020L,
- 0x00000022L, 0x04000022L, 0x00040022L, 0x04040022L,
- 0x00002020L, 0x04002020L, 0x00042020L, 0x04042020L,
- 0x00002022L, 0x04002022L, 0x00042022L, 0x04042022L,
- 0x00000800L, 0x04000800L, 0x00040800L, 0x04040800L,
- 0x00000802L, 0x04000802L, 0x00040802L, 0x04040802L,
- 0x00002800L, 0x04002800L, 0x00042800L, 0x04042800L,
- 0x00002802L, 0x04002802L, 0x00042802L, 0x04042802L,
- 0x00000820L, 0x04000820L, 0x00040820L, 0x04040820L,
- 0x00000822L, 0x04000822L, 0x00040822L, 0x04040822L,
- 0x00002820L, 0x04002820L, 0x00042820L, 0x04042820L,
- 0x00002822L, 0x04002822L, 0x00042822L, 0x04042822L,
- }
+ /* for D bits (numbered as per FIPS 46) 22 23 24 25 27 28 */
+ 0x00000000L,
+ 0x04000000L,
+ 0x00040000L,
+ 0x04040000L,
+ 0x00000002L,
+ 0x04000002L,
+ 0x00040002L,
+ 0x04040002L,
+ 0x00002000L,
+ 0x04002000L,
+ 0x00042000L,
+ 0x04042000L,
+ 0x00002002L,
+ 0x04002002L,
+ 0x00042002L,
+ 0x04042002L,
+ 0x00000020L,
+ 0x04000020L,
+ 0x00040020L,
+ 0x04040020L,
+ 0x00000022L,
+ 0x04000022L,
+ 0x00040022L,
+ 0x04040022L,
+ 0x00002020L,
+ 0x04002020L,
+ 0x00042020L,
+ 0x04042020L,
+ 0x00002022L,
+ 0x04002022L,
+ 0x00042022L,
+ 0x04042022L,
+ 0x00000800L,
+ 0x04000800L,
+ 0x00040800L,
+ 0x04040800L,
+ 0x00000802L,
+ 0x04000802L,
+ 0x00040802L,
+ 0x04040802L,
+ 0x00002800L,
+ 0x04002800L,
+ 0x00042800L,
+ 0x04042800L,
+ 0x00002802L,
+ 0x04002802L,
+ 0x00042802L,
+ 0x04042802L,
+ 0x00000820L,
+ 0x04000820L,
+ 0x00040820L,
+ 0x04040820L,
+ 0x00000822L,
+ 0x04000822L,
+ 0x00040822L,
+ 0x04040822L,
+ 0x00002820L,
+ 0x04002820L,
+ 0x00042820L,
+ 0x04042820L,
+ 0x00002822L,
+ 0x04002822L,
+ 0x00042822L,
+ 0x04042822L,
+ }
};
/* Return values as DES_set_key_checked() but always set the key */
@@ -325,8 +709,8 @@ int DES_set_key_checked(const_DES_cblock *key, DES_key_schedule *schedule)
void DES_set_key_unchecked(const_DES_cblock *key, DES_key_schedule *schedule)
{
static const int shifts2[16] = {
- 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0
- };
+ 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0
+ };
register DES_LONG c, d, t, s, t2;
register const unsigned char *in;
register DES_LONG *k;
@@ -352,8 +736,7 @@ void DES_set_key_unchecked(const_DES_cblock *key, DES_key_schedule *schedule)
PERM_OP(d, c, t, 1, 0x55555555L);
PERM_OP(c, d, t, 8, 0x00ff00ffL);
PERM_OP(d, c, t, 1, 0x55555555L);
- d = (((d & 0x000000ffL) << 16L) | (d & 0x0000ff00L) |
- ((d & 0x00ff0000L) >> 16L) | ((c & 0xf0000000L) >> 4L));
+ d = (((d & 0x000000ffL) << 16L) | (d & 0x0000ff00L) | ((d & 0x00ff0000L) >> 16L) | ((c & 0xf0000000L) >> 4L));
c &= 0x0fffffffL;
for (i = 0; i < ITERATIONS; i++) {
@@ -370,15 +753,8 @@ void DES_set_key_unchecked(const_DES_cblock *key, DES_key_schedule *schedule)
* could be a few less shifts but I am to lazy at this point in time
* to investigate
*/
- s = des_skb[0][(c) & 0x3f] |
- des_skb[1][((c >> 6L) & 0x03) | ((c >> 7L) & 0x3c)] |
- des_skb[2][((c >> 13L) & 0x0f) | ((c >> 14L) & 0x30)] |
- des_skb[3][((c >> 20L) & 0x01) | ((c >> 21L) & 0x06) |
- ((c >> 22L) & 0x38)];
- t = des_skb[4][(d) & 0x3f] |
- des_skb[5][((d >> 7L) & 0x03) | ((d >> 8L) & 0x3c)] |
- des_skb[6][(d >> 15L) & 0x3f] |
- des_skb[7][((d >> 21L) & 0x0f) | ((d >> 22L) & 0x30)];
+ s = des_skb[0][(c) & 0x3f] | des_skb[1][((c >> 6L) & 0x03) | ((c >> 7L) & 0x3c)] | des_skb[2][((c >> 13L) & 0x0f) | ((c >> 14L) & 0x30)] | des_skb[3][((c >> 20L) & 0x01) | ((c >> 21L) & 0x06) | ((c >> 22L) & 0x38)];
+ t = des_skb[4][(d) & 0x3f] | des_skb[5][((d >> 7L) & 0x03) | ((d >> 8L) & 0x3c)] | des_skb[6][(d >> 15L) & 0x3f] | des_skb[7][((d >> 21L) & 0x0f) | ((d >> 22L) & 0x30)];
/* table contained 0213 4657 */
t2 = ((t << 16L) | (s & 0x0000ffffL)) & 0xffffffffL;
diff --git a/crypto/des/spr.h b/crypto/des/spr.h
index 1fe3394ba0..955fbc2989 100644
--- a/crypto/des/spr.h
+++ b/crypto/des/spr.h
@@ -10,154 +10,538 @@
const DES_LONG DES_SPtrans[8][64] = {
{
/* nibble 0 */
- 0x02080800L, 0x00080000L, 0x02000002L, 0x02080802L,
- 0x02000000L, 0x00080802L, 0x00080002L, 0x02000002L,
- 0x00080802L, 0x02080800L, 0x02080000L, 0x00000802L,
- 0x02000802L, 0x02000000L, 0x00000000L, 0x00080002L,
- 0x00080000L, 0x00000002L, 0x02000800L, 0x00080800L,
- 0x02080802L, 0x02080000L, 0x00000802L, 0x02000800L,
- 0x00000002L, 0x00000800L, 0x00080800L, 0x02080002L,
- 0x00000800L, 0x02000802L, 0x02080002L, 0x00000000L,
- 0x00000000L, 0x02080802L, 0x02000800L, 0x00080002L,
- 0x02080800L, 0x00080000L, 0x00000802L, 0x02000800L,
- 0x02080002L, 0x00000800L, 0x00080800L, 0x02000002L,
- 0x00080802L, 0x00000002L, 0x02000002L, 0x02080000L,
- 0x02080802L, 0x00080800L, 0x02080000L, 0x02000802L,
- 0x02000000L, 0x00000802L, 0x00080002L, 0x00000000L,
- 0x00080000L, 0x02000000L, 0x02000802L, 0x02080800L,
- 0x00000002L, 0x02080002L, 0x00000800L, 0x00080802L,
+ 0x02080800L,
+ 0x00080000L,
+ 0x02000002L,
+ 0x02080802L,
+ 0x02000000L,
+ 0x00080802L,
+ 0x00080002L,
+ 0x02000002L,
+ 0x00080802L,
+ 0x02080800L,
+ 0x02080000L,
+ 0x00000802L,
+ 0x02000802L,
+ 0x02000000L,
+ 0x00000000L,
+ 0x00080002L,
+ 0x00080000L,
+ 0x00000002L,
+ 0x02000800L,
+ 0x00080800L,
+ 0x02080802L,
+ 0x02080000L,
+ 0x00000802L,
+ 0x02000800L,
+ 0x00000002L,
+ 0x00000800L,
+ 0x00080800L,
+ 0x02080002L,
+ 0x00000800L,
+ 0x02000802L,
+ 0x02080002L,
+ 0x00000000L,
+ 0x00000000L,
+ 0x02080802L,
+ 0x02000800L,
+ 0x00080002L,
+ 0x02080800L,
+ 0x00080000L,
+ 0x00000802L,
+ 0x02000800L,
+ 0x02080002L,
+ 0x00000800L,
+ 0x00080800L,
+ 0x02000002L,
+ 0x00080802L,
+ 0x00000002L,
+ 0x02000002L,
+ 0x02080000L,
+ 0x02080802L,
+ 0x00080800L,
+ 0x02080000L,
+ 0x02000802L,
+ 0x02000000L,
+ 0x00000802L,
+ 0x00080002L,
+ 0x00000000L,
+ 0x00080000L,
+ 0x02000000L,
+ 0x02000802L,
+ 0x02080800L,
+ 0x00000002L,
+ 0x02080002L,
+ 0x00000800L,
+ 0x00080802L,
},
{
/* nibble 1 */
- 0x40108010L, 0x00000000L, 0x00108000L, 0x40100000L,
- 0x40000010L, 0x00008010L, 0x40008000L, 0x00108000L,
- 0x00008000L, 0x40100010L, 0x00000010L, 0x40008000L,
- 0x00100010L, 0x40108000L, 0x40100000L, 0x00000010L,
- 0x00100000L, 0x40008010L, 0x40100010L, 0x00008000L,
- 0x00108010L, 0x40000000L, 0x00000000L, 0x00100010L,
- 0x40008010L, 0x00108010L, 0x40108000L, 0x40000010L,
- 0x40000000L, 0x00100000L, 0x00008010L, 0x40108010L,
- 0x00100010L, 0x40108000L, 0x40008000L, 0x00108010L,
- 0x40108010L, 0x00100010L, 0x40000010L, 0x00000000L,
- 0x40000000L, 0x00008010L, 0x00100000L, 0x40100010L,
- 0x00008000L, 0x40000000L, 0x00108010L, 0x40008010L,
- 0x40108000L, 0x00008000L, 0x00000000L, 0x40000010L,
- 0x00000010L, 0x40108010L, 0x00108000L, 0x40100000L,
- 0x40100010L, 0x00100000L, 0x00008010L, 0x40008000L,
- 0x40008010L, 0x00000010L, 0x40100000L, 0x00108000L,
+ 0x40108010L,
+ 0x00000000L,
+ 0x00108000L,
+ 0x40100000L,
+ 0x40000010L,
+ 0x00008010L,
+ 0x40008000L,
+ 0x00108000L,
+ 0x00008000L,
+ 0x40100010L,
+ 0x00000010L,
+ 0x40008000L,
+ 0x00100010L,
+ 0x40108000L,
+ 0x40100000L,
+ 0x00000010L,
+ 0x00100000L,
+ 0x40008010L,
+ 0x40100010L,
+ 0x00008000L,
+ 0x00108010L,
+ 0x40000000L,
+ 0x00000000L,
+ 0x00100010L,
+ 0x40008010L,
+ 0x00108010L,
+ 0x40108000L,
+ 0x40000010L,
+ 0x40000000L,
+ 0x00100000L,
+ 0x00008010L,
+ 0x40108010L,
+ 0x00100010L,
+ 0x40108000L,
+ 0x40008000L,
+ 0x00108010L,
+ 0x40108010L,
+ 0x00100010L,
+ 0x40000010L,
+ 0x00000000L,
+ 0x40000000L,
+ 0x00008010L,
+ 0x00100000L,
+ 0x40100010L,
+ 0x00008000L,
+ 0x40000000L,
+ 0x00108010L,
+ 0x40008010L,
+ 0x40108000L,
+ 0x00008000L,
+ 0x00000000L,
+ 0x40000010L,
+ 0x00000010L,
+ 0x40108010L,
+ 0x00108000L,
+ 0x40100000L,
+ 0x40100010L,
+ 0x00100000L,
+ 0x00008010L,
+ 0x40008000L,
+ 0x40008010L,
+ 0x00000010L,
+ 0x40100000L,
+ 0x00108000L,
},
{
/* nibble 2 */
- 0x04000001L, 0x04040100L, 0x00000100L, 0x04000101L,
- 0x00040001L, 0x04000000L, 0x04000101L, 0x00040100L,
- 0x04000100L, 0x00040000L, 0x04040000L, 0x00000001L,
- 0x04040101L, 0x00000101L, 0x00000001L, 0x04040001L,
- 0x00000000L, 0x00040001L, 0x04040100L, 0x00000100L,
- 0x00000101L, 0x04040101L, 0x00040000L, 0x04000001L,
- 0x04040001L, 0x04000100L, 0x00040101L, 0x04040000L,
- 0x00040100L, 0x00000000L, 0x04000000L, 0x00040101L,
- 0x04040100L, 0x00000100L, 0x00000001L, 0x00040000L,
- 0x00000101L, 0x00040001L, 0x04040000L, 0x04000101L,
- 0x00000000L, 0x04040100L, 0x00040100L, 0x04040001L,
- 0x00040001L, 0x04000000L, 0x04040101L, 0x00000001L,
- 0x00040101L, 0x04000001L, 0x04000000L, 0x04040101L,
- 0x00040000L, 0x04000100L, 0x04000101L, 0x00040100L,
- 0x04000100L, 0x00000000L, 0x04040001L, 0x00000101L,
- 0x04000001L, 0x00040101L, 0x00000100L, 0x04040000L,
+ 0x04000001L,
+ 0x04040100L,
+ 0x00000100L,
+ 0x04000101L,
+ 0x00040001L,
+ 0x04000000L,
+ 0x04000101L,
+ 0x00040100L,
+ 0x04000100L,
+ 0x00040000L,
+ 0x04040000L,
+ 0x00000001L,
+ 0x04040101L,
+ 0x00000101L,
+ 0x00000001L,
+ 0x04040001L,
+ 0x00000000L,
+ 0x00040001L,
+ 0x04040100L,
+ 0x00000100L,
+ 0x00000101L,
+ 0x04040101L,
+ 0x00040000L,
+ 0x04000001L,
+ 0x04040001L,
+ 0x04000100L,
+ 0x00040101L,
+ 0x04040000L,
+ 0x00040100L,
+ 0x00000000L,
+ 0x04000000L,
+ 0x00040101L,
+ 0x04040100L,
+ 0x00000100L,
+ 0x00000001L,
+ 0x00040000L,
+ 0x00000101L,
+ 0x00040001L,
+ 0x04040000L,
+ 0x04000101L,
+ 0x00000000L,
+ 0x04040100L,
+ 0x00040100L,
+ 0x04040001L,
+ 0x00040001L,
+ 0x04000000L,
+ 0x04040101L,
+ 0x00000001L,
+ 0x00040101L,
+ 0x04000001L,
+ 0x04000000L,
+ 0x04040101L,
+ 0x00040000L,
+ 0x04000100L,
+ 0x04000101L,
+ 0x00040100L,
+ 0x04000100L,
+ 0x00000000L,
+ 0x04040001L,
+ 0x00000101L,
+ 0x04000001L,
+ 0x00040101L,
+ 0x00000100L,
+ 0x04040000L,
},
{
/* nibble 3 */
- 0x00401008L, 0x10001000L, 0x00000008L, 0x10401008L,
- 0x00000000L, 0x10400000L, 0x10001008L, 0x00400008L,
- 0x10401000L, 0x10000008L, 0x10000000L, 0x00001008L,
- 0x10000008L, 0x00401008L, 0x00400000L, 0x10000000L,
- 0x10400008L, 0x00401000L, 0x00001000L, 0x00000008L,
- 0x00401000L, 0x10001008L, 0x10400000L, 0x00001000L,
- 0x00001008L, 0x00000000L, 0x00400008L, 0x10401000L,
- 0x10001000L, 0x10400008L, 0x10401008L, 0x00400000L,
- 0x10400008L, 0x00001008L, 0x00400000L, 0x10000008L,
- 0x00401000L, 0x10001000L, 0x00000008L, 0x10400000L,
- 0x10001008L, 0x00000000L, 0x00001000L, 0x00400008L,
- 0x00000000L, 0x10400008L, 0x10401000L, 0x00001000L,
- 0x10000000L, 0x10401008L, 0x00401008L, 0x00400000L,
- 0x10401008L, 0x00000008L, 0x10001000L, 0x00401008L,
- 0x00400008L, 0x00401000L, 0x10400000L, 0x10001008L,
- 0x00001008L, 0x10000000L, 0x10000008L, 0x10401000L,
+ 0x00401008L,
+ 0x10001000L,
+ 0x00000008L,
+ 0x10401008L,
+ 0x00000000L,
+ 0x10400000L,
+ 0x10001008L,
+ 0x00400008L,
+ 0x10401000L,
+ 0x10000008L,
+ 0x10000000L,
+ 0x00001008L,
+ 0x10000008L,
+ 0x00401008L,
+ 0x00400000L,
+ 0x10000000L,
+ 0x10400008L,
+ 0x00401000L,
+ 0x00001000L,
+ 0x00000008L,
+ 0x00401000L,
+ 0x10001008L,
+ 0x10400000L,
+ 0x00001000L,
+ 0x00001008L,
+ 0x00000000L,
+ 0x00400008L,
+ 0x10401000L,
+ 0x10001000L,
+ 0x10400008L,
+ 0x10401008L,
+ 0x00400000L,
+ 0x10400008L,
+ 0x00001008L,
+ 0x00400000L,
+ 0x10000008L,
+ 0x00401000L,
+ 0x10001000L,
+ 0x00000008L,
+ 0x10400000L,
+ 0x10001008L,
+ 0x00000000L,
+ 0x00001000L,
+ 0x00400008L,
+ 0x00000000L,
+ 0x10400008L,
+ 0x10401000L,
+ 0x00001000L,
+ 0x10000000L,
+ 0x10401008L,
+ 0x00401008L,
+ 0x00400000L,
+ 0x10401008L,
+ 0x00000008L,
+ 0x10001000L,
+ 0x00401008L,
+ 0x00400008L,
+ 0x00401000L,
+ 0x10400000L,
+ 0x10001008L,
+ 0x00001008L,
+ 0x10000000L,
+ 0x10000008L,
+ 0x10401000L,
},
{
/* nibble 4 */
- 0x08000000L, 0x00010000L, 0x00000400L, 0x08010420L,
- 0x08010020L, 0x08000400L, 0x00010420L, 0x08010000L,
- 0x00010000L, 0x00000020L, 0x08000020L, 0x00010400L,
- 0x08000420L, 0x08010020L, 0x08010400L, 0x00000000L,
- 0x00010400L, 0x08000000L, 0x00010020L, 0x00000420L,
- 0x08000400L, 0x00010420L, 0x00000000L, 0x08000020L,
- 0x00000020L, 0x08000420L, 0x08010420L, 0x00010020L,
- 0x08010000L, 0x00000400L, 0x00000420L, 0x08010400L,
- 0x08010400L, 0x08000420L, 0x00010020L, 0x08010000L,
- 0x00010000L, 0x00000020L, 0x08000020L, 0x08000400L,
- 0x08000000L, 0x00010400L, 0x08010420L, 0x00000000L,
- 0x00010420L, 0x08000000L, 0x00000400L, 0x00010020L,
- 0x08000420L, 0x00000400L, 0x00000000L, 0x08010420L,
- 0x08010020L, 0x08010400L, 0x00000420L, 0x00010000L,
- 0x00010400L, 0x08010020L, 0x08000400L, 0x00000420L,
- 0x00000020L, 0x00010420L, 0x08010000L, 0x08000020L,
+ 0x08000000L,
+ 0x00010000L,
+ 0x00000400L,
+ 0x08010420L,
+ 0x08010020L,
+ 0x08000400L,
+ 0x00010420L,
+ 0x08010000L,
+ 0x00010000L,
+ 0x00000020L,
+ 0x08000020L,
+ 0x00010400L,
+ 0x08000420L,
+ 0x08010020L,
+ 0x08010400L,
+ 0x00000000L,
+ 0x00010400L,
+ 0x08000000L,
+ 0x00010020L,
+ 0x00000420L,
+ 0x08000400L,
+ 0x00010420L,
+ 0x00000000L,
+ 0x08000020L,
+ 0x00000020L,
+ 0x08000420L,
+ 0x08010420L,
+ 0x00010020L,
+ 0x08010000L,
+ 0x00000400L,
+ 0x00000420L,
+ 0x08010400L,
+ 0x08010400L,
+ 0x08000420L,
+ 0x00010020L,
+ 0x08010000L,
+ 0x00010000L,
+ 0x00000020L,
+ 0x08000020L,
+ 0x08000400L,
+ 0x08000000L,
+ 0x00010400L,
+ 0x08010420L,
+ 0x00000000L,
+ 0x00010420L,
+ 0x08000000L,
+ 0x00000400L,
+ 0x00010020L,
+ 0x08000420L,
+ 0x00000400L,
+ 0x00000000L,
+ 0x08010420L,
+ 0x08010020L,
+ 0x08010400L,
+ 0x00000420L,
+ 0x00010000L,
+ 0x00010400L,
+ 0x08010020L,
+ 0x08000400L,
+ 0x00000420L,
+ 0x00000020L,
+ 0x00010420L,
+ 0x08010000L,
+ 0x08000020L,
},
{
/* nibble 5 */
- 0x80000040L, 0x00200040L, 0x00000000L, 0x80202000L,
- 0x00200040L, 0x00002000L, 0x80002040L, 0x00200000L,
- 0x00002040L, 0x80202040L, 0x00202000L, 0x80000000L,
- 0x80002000L, 0x80000040L, 0x80200000L, 0x00202040L,
- 0x00200000L, 0x80002040L, 0x80200040L, 0x00000000L,
- 0x00002000L, 0x00000040L, 0x80202000L, 0x80200040L,
- 0x80202040L, 0x80200000L, 0x80000000L, 0x00002040L,
- 0x00000040L, 0x00202000L, 0x00202040L, 0x80002000L,
- 0x00002040L, 0x80000000L, 0x80002000L, 0x00202040L,
- 0x80202000L, 0x00200040L, 0x00000000L, 0x80002000L,
- 0x80000000L, 0x00002000L, 0x80200040L, 0x00200000L,
- 0x00200040L, 0x80202040L, 0x00202000L, 0x00000040L,
- 0x80202040L, 0x00202000L, 0x00200000L, 0x80002040L,
- 0x80000040L, 0x80200000L, 0x00202040L, 0x00000000L,
- 0x00002000L, 0x80000040L, 0x80002040L, 0x80202000L,
- 0x80200000L, 0x00002040L, 0x00000040L, 0x80200040L,
+ 0x80000040L,
+ 0x00200040L,
+ 0x00000000L,
+ 0x80202000L,
+ 0x00200040L,
+ 0x00002000L,
+ 0x80002040L,
+ 0x00200000L,
+ 0x00002040L,
+ 0x80202040L,
+ 0x00202000L,
+ 0x80000000L,
+ 0x80002000L,
+ 0x80000040L,
+ 0x80200000L,
+ 0x00202040L,
+ 0x00200000L,
+ 0x80002040L,
+ 0x80200040L,
+ 0x00000000L,
+ 0x00002000L,
+ 0x00000040L,
+ 0x80202000L,
+ 0x80200040L,
+ 0x80202040L,
+ 0x80200000L,
+ 0x80000000L,
+ 0x00002040L,
+ 0x00000040L,
+ 0x00202000L,
+ 0x00202040L,
+ 0x80002000L,
+ 0x00002040L,
+ 0x80000000L,
+ 0x80002000L,
+ 0x00202040L,
+ 0x80202000L,
+ 0x00200040L,
+ 0x00000000L,
+ 0x80002000L,
+ 0x80000000L,
+ 0x00002000L,
+ 0x80200040L,
+ 0x00200000L,
+ 0x00200040L,
+ 0x80202040L,
+ 0x00202000L,
+ 0x00000040L,
+ 0x80202040L,
+ 0x00202000L,
+ 0x00200000L,
+ 0x80002040L,
+ 0x80000040L,
+ 0x80200000L,
+ 0x00202040L,
+ 0x00000000L,
+ 0x00002000L,
+ 0x80000040L,
+ 0x80002040L,
+ 0x80202000L,
+ 0x80200000L,
+ 0x00002040L,
+ 0x00000040L,
+ 0x80200040L,
},
{
/* nibble 6 */
- 0x00004000L, 0x00000200L, 0x01000200L, 0x01000004L,
- 0x01004204L, 0x00004004L, 0x00004200L, 0x00000000L,
- 0x01000000L, 0x01000204L, 0x00000204L, 0x01004000L,
- 0x00000004L, 0x01004200L, 0x01004000L, 0x00000204L,
- 0x01000204L, 0x00004000L, 0x00004004L, 0x01004204L,
- 0x00000000L, 0x01000200L, 0x01000004L, 0x00004200L,
- 0x01004004L, 0x00004204L, 0x01004200L, 0x00000004L,
- 0x00004204L, 0x01004004L, 0x00000200L, 0x01000000L,
- 0x00004204L, 0x01004000L, 0x01004004L, 0x00000204L,
- 0x00004000L, 0x00000200L, 0x01000000L, 0x01004004L,
- 0x01000204L, 0x00004204L, 0x00004200L, 0x00000000L,
- 0x00000200L, 0x01000004L, 0x00000004L, 0x01000200L,
- 0x00000000L, 0x01000204L, 0x01000200L, 0x00004200L,
- 0x00000204L, 0x00004000L, 0x01004204L, 0x01000000L,
- 0x01004200L, 0x00000004L, 0x00004004L, 0x01004204L,
- 0x01000004L, 0x01004200L, 0x01004000L, 0x00004004L,
+ 0x00004000L,
+ 0x00000200L,
+ 0x01000200L,
+ 0x01000004L,
+ 0x01004204L,
+ 0x00004004L,
+ 0x00004200L,
+ 0x00000000L,
+ 0x01000000L,
+ 0x01000204L,
+ 0x00000204L,
+ 0x01004000L,
+ 0x00000004L,
+ 0x01004200L,
+ 0x01004000L,
+ 0x00000204L,
+ 0x01000204L,
+ 0x00004000L,
+ 0x00004004L,
+ 0x01004204L,
+ 0x00000000L,
+ 0x01000200L,
+ 0x01000004L,
+ 0x00004200L,
+ 0x01004004L,
+ 0x00004204L,
+ 0x01004200L,
+ 0x00000004L,
+ 0x00004204L,
+ 0x01004004L,
+ 0x00000200L,
+ 0x01000000L,
+ 0x00004204L,
+ 0x01004000L,
+ 0x01004004L,
+ 0x00000204L,
+ 0x00004000L,
+ 0x00000200L,
+ 0x01000000L,
+ 0x01004004L,
+ 0x01000204L,
+ 0x00004204L,
+ 0x00004200L,
+ 0x00000000L,
+ 0x00000200L,
+ 0x01000004L,
+ 0x00000004L,
+ 0x01000200L,
+ 0x00000000L,
+ 0x01000204L,
+ 0x01000200L,
+ 0x00004200L,
+ 0x00000204L,
+ 0x00004000L,
+ 0x01004204L,
+ 0x01000000L,
+ 0x01004200L,
+ 0x00000004L,
+ 0x00004004L,
+ 0x01004204L,
+ 0x01000004L,
+ 0x01004200L,
+ 0x01004000L,
+ 0x00004004L,
},
{
/* nibble 7 */
- 0x20800080L, 0x20820000L, 0x00020080L, 0x00000000L,
- 0x20020000L, 0x00800080L, 0x20800000L, 0x20820080L,
- 0x00000080L, 0x20000000L, 0x00820000L, 0x00020080L,
- 0x00820080L, 0x20020080L, 0x20000080L, 0x20800000L,
- 0x00020000L, 0x00820080L, 0x00800080L, 0x20020000L,
- 0x20820080L, 0x20000080L, 0x00000000L, 0x00820000L,
- 0x20000000L, 0x00800000L, 0x20020080L, 0x20800080L,
- 0x00800000L, 0x00020000L, 0x20820000L, 0x00000080L,
- 0x00800000L, 0x00020000L, 0x20000080L, 0x20820080L,
- 0x00020080L, 0x20000000L, 0x00000000L, 0x00820000L,
- 0x20800080L, 0x20020080L, 0x20020000L, 0x00800080L,
- 0x20820000L, 0x00000080L, 0x00800080L, 0x20020000L,
- 0x20820080L, 0x00800000L, 0x20800000L, 0x20000080L,
- 0x00820000L, 0x00020080L, 0x20020080L, 0x20800000L,
- 0x00000080L, 0x20820000L, 0x00820080L, 0x00000000L,
- 0x20000000L, 0x20800080L, 0x00020000L, 0x00820080L,
+ 0x20800080L,
+ 0x20820000L,
+ 0x00020080L,
+ 0x00000000L,
+ 0x20020000L,
+ 0x00800080L,
+ 0x20800000L,
+ 0x20820080L,
+ 0x00000080L,
+ 0x20000000L,
+ 0x00820000L,
+ 0x00020080L,
+ 0x00820080L,
+ 0x20020080L,
+ 0x20000080L,
+ 0x20800000L,
+ 0x00020000L,
+ 0x00820080L,
+ 0x00800080L,
+ 0x20020000L,
+ 0x20820080L,
+ 0x20000080L,
+ 0x00000000L,
+ 0x00820000L,
+ 0x20000000L,
+ 0x00800000L,
+ 0x20020080L,
+ 0x20800080L,
+ 0x00800000L,
+ 0x00020000L,
+ 0x20820000L,
+ 0x00000080L,
+ 0x00800000L,
+ 0x00020000L,
+ 0x20000080L,
+ 0x20820080L,
+ 0x00020080L,
+ 0x20000000L,
+ 0x00000000L,
+ 0x00820000L,
+ 0x20800080L,
+ 0x20020080L,
+ 0x20020000L,
+ 0x00800080L,
+ 0x20820000L,
+ 0x00000080L,
+ 0x00800080L,
+ 0x20020000L,
+ 0x20820080L,
+ 0x00800000L,
+ 0x20800000L,
+ 0x20000080L,
+ 0x00820000L,
+ 0x00020080L,
+ 0x20020080L,
+ 0x20800000L,
+ 0x00000080L,
+ 0x20820000L,
+ 0x00820080L,
+ 0x00000000L,
+ 0x20000000L,
+ 0x20800080L,
+ 0x00020000L,
+ 0x00820080L,
}
};
diff --git a/crypto/des/xcbc_enc.c b/crypto/des/xcbc_enc.c
index 8ad1f1db6d..0507e44790 100644
--- a/crypto/des/xcbc_enc.c
+++ b/crypto/des/xcbc_enc.c
@@ -18,9 +18,9 @@
/* RSA's DESX */
void DES_xcbc_encrypt(const unsigned char *in, unsigned char *out,
- long length, DES_key_schedule *schedule,
- DES_cblock *ivec, const_DES_cblock *inw,
- const_DES_cblock *outw, int enc)
+ long length, DES_key_schedule *schedule,
+ DES_cblock *ivec, const_DES_cblock *inw,
+ const_DES_cblock *outw, int enc)
{
register DES_LONG tin0, tin1;
register DES_LONG tout0, tout1, xor0, xor1;
diff --git a/crypto/deterministic_nonce.c b/crypto/deterministic_nonce.c
index 6f757e5551..afd319795e 100644
--- a/crypto/deterministic_nonce.c
+++ b/crypto/deterministic_nonce.c
@@ -26,7 +26,7 @@
* Returns: 1 if successful, or 0 otherwise.
*/
static int bits2int(BIGNUM *out, int qlen_bits,
- const unsigned char *in, size_t inlen)
+ const unsigned char *in, size_t inlen)
{
int blen_bits = (int)(inlen * 8);
int shift;
@@ -53,7 +53,7 @@ static int bits2int(BIGNUM *out, int qlen_bits,
* Returns: 1 if successful, or 0 otherwise.
*/
static int bits2int_consttime(BIGNUM *out, int qlen_bits,
- const unsigned char *in, size_t inlen)
+ const unsigned char *in, size_t inlen)
{
int blen_bits = (int)((inlen - sizeof(BN_ULONG)) * 8);
int shift;
@@ -97,24 +97,24 @@ static int int2octets(unsigned char *out, const BIGNUM *num, int rlen)
* Returns: 1 if successful, or 0 otherwise.
*/
static int bits2octets(unsigned char *out, const BIGNUM *q, int qlen_bits,
- int rlen, const unsigned char *in, size_t inlen)
+ int rlen, const unsigned char *in, size_t inlen)
{
- int ret = 0;
- BIGNUM *z = BN_new();
+ int ret = 0;
+ BIGNUM *z = BN_new();
- if (z == NULL
- || !bits2int(z, qlen_bits, in, inlen))
- goto err;
+ if (z == NULL
+ || !bits2int(z, qlen_bits, in, inlen))
+ goto err;
- /* z2 = z1 mod q (Do a simple subtract, since z1 < 2^qlen_bits) */
- if (BN_cmp(z, q) >= 0
- && !BN_usub(z, z, q))
- goto err;
+ /* z2 = z1 mod q (Do a simple subtract, since z1 < 2^qlen_bits) */
+ if (BN_cmp(z, q) >= 0
+ && !BN_usub(z, z, q))
+ goto err;
- ret = int2octets(out, z, rlen);
+ ret = int2octets(out, z, rlen);
err:
- BN_free(z);
- return ret;
+ BN_free(z);
+ return ret;
}
/*
@@ -129,9 +129,9 @@ err:
* Returns: The created KDF HMAC_DRBG object if successful, or NULL otherwise.
*/
static EVP_KDF_CTX *kdf_setup(const char *digestname,
- const unsigned char *entropy, size_t entropylen,
- const unsigned char *nonce, size_t noncelen,
- OSSL_LIB_CTX *libctx, const char *propq)
+ const unsigned char *entropy, size_t entropylen,
+ const unsigned char *nonce, size_t noncelen,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
EVP_KDF_CTX *ctx = NULL;
EVP_KDF *kdf = NULL;
@@ -145,14 +145,14 @@ static EVP_KDF_CTX *kdf_setup(const char *digestname,
p = params;
*p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST,
- (char *)digestname, 0);
+ (char *)digestname, 0);
if (propq != NULL)
*p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_PROPERTIES,
- (char *)propq, 0);
+ (char *)propq, 0);
*p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_HMACDRBG_ENTROPY,
- (void *)entropy, entropylen);
+ (void *)entropy, entropylen);
*p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_HMACDRBG_NONCE,
- (void *)nonce, noncelen);
+ (void *)nonce, noncelen);
*p = OSSL_PARAM_construct_end();
if (EVP_KDF_CTX_set_params(ctx, params) <= 0)
@@ -179,11 +179,11 @@ err:
* Returns: 1 if successful, or 0 otherwise.
*/
int ossl_gen_deterministic_nonce_rfc6979(BIGNUM *out, const BIGNUM *q,
- const BIGNUM *priv,
- const unsigned char *hm, size_t hmlen,
- const char *digestname,
- OSSL_LIB_CTX *libctx,
- const char *propq)
+ const BIGNUM *priv,
+ const unsigned char *hm, size_t hmlen,
+ const char *digestname,
+ OSSL_LIB_CTX *libctx,
+ const char *propq)
{
EVP_KDF_CTX *kdfctx = NULL;
int ret = 0, rlen = 0, qlen_bits = 0;
@@ -213,7 +213,7 @@ int ossl_gen_deterministic_nonce_rfc6979(BIGNUM *out, const BIGNUM *q,
memset(T, 0xff, prefsz);
if (!int2octets(entropyx, priv, rlen)
- || !bits2octets(nonceh, q, qlen_bits, rlen, hm, hmlen))
+ || !bits2octets(nonceh, q, qlen_bits, rlen, hm, hmlen))
goto end;
kdfctx = kdf_setup(digestname, entropyx, rlen, nonceh, rlen, libctx, propq);
@@ -222,11 +222,11 @@ int ossl_gen_deterministic_nonce_rfc6979(BIGNUM *out, const BIGNUM *q,
do {
if (!EVP_KDF_derive(kdfctx, rbits, rlen, NULL)
- || !bits2int_consttime(out, qlen_bits, T, rlen + prefsz))
+ || !bits2int_consttime(out, qlen_bits, T, rlen + prefsz))
goto end;
} while (ossl_bn_is_word_fixed_top(out, 0)
- || ossl_bn_is_word_fixed_top(out, 1)
- || BN_ucmp(out, q) >= 0);
+ || ossl_bn_is_word_fixed_top(out, 1)
+ || BN_ucmp(out, q) >= 0);
#ifdef BN_DEBUG
/* With BN_DEBUG on a fixed top number cannot be returned */
bn_correct_top(out);
diff --git a/crypto/dh/dh_ameth.c b/crypto/dh/dh_ameth.c
index 1d93aef825..44cae47f25 100644
--- a/crypto/dh/dh_ameth.c
+++ b/crypto/dh/dh_ameth.c
@@ -32,7 +32,7 @@
*/
static DH *d2i_dhp(const EVP_PKEY *pkey, const unsigned char **pp,
- long length)
+ long length)
{
DH *dh = NULL;
int is_dhx = (pkey->ameth == &ossl_dhx_asn1_meth);
@@ -102,7 +102,7 @@ static int dh_pub_decode(EVP_PKEY *pkey, const X509_PUBKEY *pubkey)
EVP_PKEY_assign(pkey, pkey->ameth->pkey_id, dh);
return 1;
- err:
+err:
ASN1_INTEGER_free(public_key);
DH_free(dh);
return 0;
@@ -145,10 +145,10 @@ static int dh_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
}
if (X509_PUBKEY_set0_param(pk, OBJ_nid2obj(pkey->ameth->pkey_id),
- ptype, str, penc, penclen))
+ ptype, str, penc, penclen))
return 1;
- err:
+err:
OPENSSL_free(penc);
ASN1_STRING_free(str);
@@ -213,19 +213,19 @@ static int dh_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
}
if (!PKCS8_pkey_set0(p8, OBJ_nid2obj(pkey->ameth->pkey_id), 0,
- V_ASN1_SEQUENCE, params, dp, dplen)) {
+ V_ASN1_SEQUENCE, params, dp, dplen)) {
OPENSSL_clear_free(dp, dplen);
goto err;
}
return 1;
- err:
+err:
ASN1_STRING_free(params);
return 0;
}
static int dh_param_decode(EVP_PKEY *pkey,
- const unsigned char **pder, int derlen)
+ const unsigned char **pder, int derlen)
{
DH *dh;
@@ -258,7 +258,7 @@ static int do_dh_print(BIO *bp, const DH *x, int indent, int ptype)
pub_key = NULL;
if (x->params.p == NULL || (ptype == 2 && priv_key == NULL)
- || (ptype > 0 && pub_key == NULL)) {
+ || (ptype > 0 && pub_key == NULL)) {
reason = ERR_R_PASSED_NULL_PARAMETER;
goto err;
}
@@ -271,7 +271,7 @@ static int do_dh_print(BIO *bp, const DH *x, int indent, int ptype)
ktype = "DH Parameters";
if (!BIO_indent(bp, indent, 128)
- || BIO_printf(bp, "%s: (%d bit)\n", ktype, DH_bits(x)) <= 0)
+ || BIO_printf(bp, "%s: (%d bit)\n", ktype, DH_bits(x)) <= 0)
goto err;
indent += 4;
@@ -285,14 +285,15 @@ static int do_dh_print(BIO *bp, const DH *x, int indent, int ptype)
if (x->length != 0) {
if (!BIO_indent(bp, indent, 128)
- || BIO_printf(bp, "recommended-private-length: %d bits\n",
- (int)x->length) <= 0)
+ || BIO_printf(bp, "recommended-private-length: %d bits\n",
+ (int)x->length)
+ <= 0)
goto err;
}
return 1;
- err:
+err:
ERR_raise(ERR_LIB_DH, reason);
return 0;
}
@@ -315,7 +316,7 @@ static int dh_security_bits(const EVP_PKEY *pkey)
static int dh_cmp_parameters(const EVP_PKEY *a, const EVP_PKEY *b)
{
return ossl_ffc_params_cmp(&a->pkey.dh->params, &b->pkey.dh->params,
- a->ameth != &ossl_dhx_asn1_meth);
+ a->ameth != &ossl_dhx_asn1_meth);
}
static int int_dh_param_copy(DH *to, const DH *from, int is_x942)
@@ -351,7 +352,7 @@ static int dh_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from)
return 0;
}
return int_dh_param_copy(to->pkey.dh, from->pkey.dh,
- from->ameth == &ossl_dhx_asn1_meth);
+ from->ameth == &ossl_dhx_asn1_meth);
}
static int dh_missing_parameters(const EVP_PKEY *a)
@@ -372,19 +373,19 @@ static int dh_pub_cmp(const EVP_PKEY *a, const EVP_PKEY *b)
}
static int dh_param_print(BIO *bp, const EVP_PKEY *pkey, int indent,
- ASN1_PCTX *ctx)
+ ASN1_PCTX *ctx)
{
return do_dh_print(bp, pkey->pkey.dh, indent, 0);
}
static int dh_public_print(BIO *bp, const EVP_PKEY *pkey, int indent,
- ASN1_PCTX *ctx)
+ ASN1_PCTX *ctx)
{
return do_dh_print(bp, pkey->pkey.dh, indent, 1);
}
static int dh_private_print(BIO *bp, const EVP_PKEY *pkey, int indent,
- ASN1_PCTX *ctx)
+ ASN1_PCTX *ctx)
{
return do_dh_print(bp, pkey->pkey.dh, indent, 2);
}
@@ -402,12 +403,12 @@ static int dh_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2)
/* We should only be here if we have a legacy key */
if (!ossl_assert(evp_pkey_is_legacy(pkey)))
return 0;
- dh = (DH *) evp_pkey_get0_DH_int(pkey);
+ dh = (DH *)evp_pkey_get0_DH_int(pkey);
if (dh == NULL)
return 0;
return ossl_dh_buf2key(dh, arg2, arg1);
case ASN1_PKEY_CTRL_GET1_TLS_ENCPT:
- dh = (DH *) EVP_PKEY_get0_DH(pkey);
+ dh = (DH *)EVP_PKEY_get0_DH(pkey);
if (dh == NULL)
return 0;
return (int)ossl_dh_key2buf(dh, arg2, 0, 1);
@@ -422,7 +423,6 @@ static int dhx_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2)
default:
return -2;
}
-
}
static int dh_pkey_public_check(const EVP_PKEY *pkey)
@@ -450,8 +450,8 @@ static size_t dh_pkey_dirty_cnt(const EVP_PKEY *pkey)
}
static int dh_pkey_export_to(const EVP_PKEY *from, void *to_keydata,
- OSSL_FUNC_keymgmt_import_fn *importer,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_FUNC_keymgmt_import_fn *importer,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
DH *dh = from->pkey.dh;
OSSL_PARAM_BLD *tmpl;
@@ -489,7 +489,7 @@ static int dh_pkey_export_to(const EVP_PKEY *from, void *to_keydata,
}
if (priv_key != NULL) {
if (!OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_PRIV_KEY,
- priv_key))
+ priv_key))
goto err;
selection |= OSSL_KEYMGMT_SELECT_PRIVATE_KEY;
}
@@ -507,7 +507,7 @@ err:
}
static int dh_pkey_import_from_type(const OSSL_PARAM params[], void *vpctx,
- int type)
+ int type)
{
EVP_PKEY_CTX *pctx = vpctx;
EVP_PKEY *pkey = EVP_PKEY_CTX_get0_pkey(pctx);
diff --git a/crypto/dh/dh_asn1.c b/crypto/dh/dh_asn1.c
index edfed926fd..6112d513a5 100644
--- a/crypto/dh/dh_asn1.c
+++ b/crypto/dh/dh_asn1.c
@@ -23,7 +23,7 @@
/* Override the default free and new methods */
static int dh_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
- void *exarg)
+ void *exarg)
{
if (operation == ASN1_OP_NEW_PRE) {
*pval = (ASN1_VALUE *)DH_new();
@@ -46,9 +46,9 @@ static int dh_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
}
ASN1_SEQUENCE_cb(DHparams, dh_cb) = {
- ASN1_SIMPLE(DH, params.p, BIGNUM),
- ASN1_SIMPLE(DH, params.g, BIGNUM),
- ASN1_OPT_EMBED(DH, length, ZINT32),
+ ASN1_SIMPLE(DH, params.p, BIGNUM),
+ ASN1_SIMPLE(DH, params.g, BIGNUM),
+ ASN1_OPT_EMBED(DH, length, ZINT32),
} ASN1_SEQUENCE_END_cb(DH, DHparams)
IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(DH, DHparams, DHparams)
@@ -72,20 +72,21 @@ typedef struct {
} int_dhx942_dh;
ASN1_SEQUENCE(DHvparams) = {
- ASN1_SIMPLE(int_dhvparams, seed, ASN1_BIT_STRING),
- ASN1_SIMPLE(int_dhvparams, counter, BIGNUM)
+ ASN1_SIMPLE(int_dhvparams, seed, ASN1_BIT_STRING),
+ ASN1_SIMPLE(int_dhvparams, counter, BIGNUM)
} static_ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-ASN1_SEQUENCE(DHxparams) = {
- ASN1_SIMPLE(int_dhx942_dh, p, BIGNUM),
- ASN1_SIMPLE(int_dhx942_dh, g, BIGNUM),
- ASN1_SIMPLE(int_dhx942_dh, q, BIGNUM),
- ASN1_OPT(int_dhx942_dh, j, BIGNUM),
- ASN1_OPT(int_dhx942_dh, vparams, DHvparams),
-} static_ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-
-int_dhx942_dh *d2i_int_dhx(int_dhx942_dh **a,
- const unsigned char **pp, long length);
+ ASN1_SEQUENCE(DHxparams)
+ = {
+ ASN1_SIMPLE(int_dhx942_dh, p, BIGNUM),
+ ASN1_SIMPLE(int_dhx942_dh, g, BIGNUM),
+ ASN1_SIMPLE(int_dhx942_dh, q, BIGNUM),
+ ASN1_OPT(int_dhx942_dh, j, BIGNUM),
+ ASN1_OPT(int_dhx942_dh, vparams, DHvparams),
+ } static_ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
+
+ int_dhx942_dh
+ * d2i_int_dhx(int_dhx942_dh * *a, const unsigned char **pp, long length);
int i2d_int_dhx(const int_dhx942_dh *a, unsigned char **pp);
IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(int_dhx942_dh, DHxparams, int_dhx)
@@ -118,8 +119,8 @@ DH *d2i_DHxparams(DH **a, const unsigned char **pp, long length)
/* The counter has a maximum value of 4 * numbits(p) - 1 */
int counter = (int)BN_get_word(dhx->vparams->counter);
ossl_ffc_params_set_validate_params(params, dhx->vparams->seed->data,
- dhx->vparams->seed->length,
- counter);
+ dhx->vparams->seed->length,
+ counter);
ASN1_BIT_STRING_free(dhx->vparams->seed);
BN_free(dhx->vparams->counter);
OPENSSL_free(dhx->vparams);
@@ -143,7 +144,7 @@ int i2d_DHxparams(const DH *dh, unsigned char **pp)
int counter;
ossl_ffc_params_get0_pqg(params, (const BIGNUM **)&dhx.p,
- (const BIGNUM **)&dhx.q, (const BIGNUM **)&dhx.g);
+ (const BIGNUM **)&dhx.q, (const BIGNUM **)&dhx.g);
dhx.j = params->j;
ossl_ffc_params_get_validate_params(params, &seed.data, &seedlen, &counter);
seed.length = (int)seedlen;
diff --git a/crypto/dh/dh_backend.c b/crypto/dh/dh_backend.c
index ee7a67b71b..4a3e2b2e42 100644
--- a/crypto/dh/dh_backend.c
+++ b/crypto/dh/dh_backend.c
@@ -16,7 +16,7 @@
#include <openssl/err.h>
#include <openssl/core_names.h>
#ifndef FIPS_MODULE
-# include <openssl/x509.h>
+#include <openssl/x509.h>
#endif
#include "internal/param_build_set.h"
#include "crypto/dh.h"
@@ -47,8 +47,7 @@ int ossl_dh_params_fromdata(DH *dh, const OSSL_PARAM params[])
if (!dh_ffc_params_fromdata(dh, params))
return 0;
- param_priv_len =
- OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_DH_PRIV_LEN);
+ param_priv_len = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_DH_PRIV_LEN);
if (param_priv_len != NULL
&& (!OSSL_PARAM_get_long(param_priv_len, &priv_len)
|| !DH_set_length(dh, priv_len)))
@@ -82,14 +81,14 @@ int ossl_dh_key_fromdata(DH *dh, const OSSL_PARAM params[], int include_private)
return 1;
- err:
+err:
BN_clear_free(priv_key);
BN_free(pub_key);
return 0;
}
int ossl_dh_params_todata(DH *dh, OSSL_PARAM_BLD *bld, OSSL_PARAM *privlen,
- const FFC_OSSL_PARAMS *pp)
+ const FFC_OSSL_PARAMS *pp)
{
const long l = DH_get_length(dh);
@@ -102,7 +101,7 @@ int ossl_dh_params_todata(DH *dh, OSSL_PARAM_BLD *bld, OSSL_PARAM *privlen,
}
int ossl_dh_key_todata(DH *dh, OSSL_PARAM_BLD *bld, OSSL_PARAM *pubkey,
- OSSL_PARAM *privkey, int include_private)
+ OSSL_PARAM *privkey, int include_private)
{
const BIGNUM *priv = NULL, *pub = NULL;
@@ -167,20 +166,20 @@ DH *ossl_dh_dup(const DH *dh, int selection)
#ifndef FIPS_MODULE
if (!CRYPTO_dup_ex_data(CRYPTO_EX_INDEX_DH,
- &dupkey->ex_data, &dh->ex_data))
+ &dupkey->ex_data, &dh->ex_data))
goto err;
#endif
return dupkey;
- err:
+err:
DH_free(dupkey);
return NULL;
}
#ifndef FIPS_MODULE
DH *ossl_dh_key_from_pkcs8(const PKCS8_PRIV_KEY_INFO *p8inf,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_LIB_CTX *libctx, const char *propq)
{
const unsigned char *p, *pm;
int pklen, pmlen;
@@ -233,12 +232,12 @@ DH *ossl_dh_key_from_pkcs8(const PKCS8_PRIV_KEY_INFO *p8inf,
goto done;
- decerr:
+decerr:
ERR_raise(ERR_LIB_DH, EVP_R_DECODE_ERROR);
- dherr:
+dherr:
DH_free(dh);
dh = NULL;
- done:
+done:
ASN1_STRING_clear_free(privkey);
return dh;
}
diff --git a/crypto/dh/dh_check.c b/crypto/dh/dh_check.c
index 2d899dc96f..3002609b68 100644
--- a/crypto/dh/dh_check.c
+++ b/crypto/dh/dh_check.c
@@ -64,7 +64,7 @@ int DH_check_params(const DH *dh, int *ret)
* validity tests.
*/
return ossl_ffc_params_FIPS186_4_validate(dh->libctx, &dh->params,
- FFC_PARAM_TYPE_DH, ret, NULL);
+ FFC_PARAM_TYPE_DH, ret, NULL);
}
#else
int DH_check_params(const DH *dh, int *ret)
@@ -98,7 +98,7 @@ int DH_check_params(const DH *dh, int *ret)
*ret |= DH_MODULUS_TOO_LARGE;
ok = 1;
- err:
+err:
BN_CTX_end(ctx);
BN_CTX_free(ctx);
return ok;
@@ -221,7 +221,7 @@ int DH_check(const DH *dh, int *ret)
*ret |= DH_CHECK_P_NOT_SAFE_PRIME;
}
ok = 1;
- err:
+err:
BN_CTX_end(ctx);
BN_CTX_free(ctx);
return ok;
@@ -273,7 +273,7 @@ int DH_check_pub_key(const DH *dh, const BIGNUM *pub_key, int *ret)
int ossl_dh_check_pub_key_partial(const DH *dh, const BIGNUM *pub_key, int *ret)
{
return ossl_ffc_validate_public_key_partial(&dh->params, pub_key, ret)
- && *ret == 0;
+ && *ret == 0;
}
int ossl_dh_check_priv_key(const DH *dh, const BIGNUM *priv_key, int *ret)
@@ -350,7 +350,7 @@ int ossl_dh_check_pairwise(const DH *dh, int return_on_null_numbers)
if (st == NULL)
goto err;
OSSL_SELF_TEST_onbegin(st, OSSL_SELF_TEST_TYPE_PCT,
- OSSL_SELF_TEST_DESC_PCT_DH);
+ OSSL_SELF_TEST_DESC_PCT_DH);
ctx = BN_CTX_new_ex(dh->libctx);
if (ctx == NULL)
@@ -366,7 +366,7 @@ int ossl_dh_check_pairwise(const DH *dh, int return_on_null_numbers)
#ifdef FIPS_MODULE
{
int len;
- unsigned char bytes[1024] = {0}; /* Max key size of 8192 bits */
+ unsigned char bytes[1024] = { 0 }; /* Max key size of 8192 bits */
if (BN_num_bytes(pub_key) > (int)sizeof(bytes))
goto err;
@@ -378,7 +378,7 @@ int ossl_dh_check_pairwise(const DH *dh, int return_on_null_numbers)
#endif
/* check it matches the existing public_key */
ret = BN_cmp(pub_key, dh->pub_key) == 0;
- err:
+err:
BN_free(pub_key);
BN_CTX_free(ctx);
diff --git a/crypto/dh/dh_depr.c b/crypto/dh/dh_depr.c
index 5822d511d9..50336c1359 100644
--- a/crypto/dh/dh_depr.c
+++ b/crypto/dh/dh_depr.c
@@ -23,7 +23,7 @@
#include <openssl/dh.h>
DH *DH_generate_parameters(int prime_len, int generator,
- void (*callback) (int, int, void *), void *cb_arg)
+ void (*callback)(int, int, void *), void *cb_arg)
{
BN_GENCB *cb;
DH *ret = NULL;
diff --git a/crypto/dh/dh_err.c b/crypto/dh/dh_err.c
index 4d6d2acd98..63c6d98a3b 100644
--- a/crypto/dh/dh_err.c
+++ b/crypto/dh/dh_err.c
@@ -14,62 +14,62 @@
#ifndef OPENSSL_NO_DH
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA DH_str_reasons[] = {
- {ERR_PACK(ERR_LIB_DH, 0, DH_R_BAD_FFC_PARAMETERS), "bad ffc parameters"},
- {ERR_PACK(ERR_LIB_DH, 0, DH_R_BAD_GENERATOR), "bad generator"},
- {ERR_PACK(ERR_LIB_DH, 0, DH_R_BN_DECODE_ERROR), "bn decode error"},
- {ERR_PACK(ERR_LIB_DH, 0, DH_R_BN_ERROR), "bn error"},
- {ERR_PACK(ERR_LIB_DH, 0, DH_R_CHECK_INVALID_J_VALUE),
- "check invalid j value"},
- {ERR_PACK(ERR_LIB_DH, 0, DH_R_CHECK_INVALID_Q_VALUE),
- "check invalid q value"},
- {ERR_PACK(ERR_LIB_DH, 0, DH_R_CHECK_PUBKEY_INVALID),
- "check pubkey invalid"},
- {ERR_PACK(ERR_LIB_DH, 0, DH_R_CHECK_PUBKEY_TOO_LARGE),
- "check pubkey too large"},
- {ERR_PACK(ERR_LIB_DH, 0, DH_R_CHECK_PUBKEY_TOO_SMALL),
- "check pubkey too small"},
- {ERR_PACK(ERR_LIB_DH, 0, DH_R_CHECK_P_NOT_PRIME), "check p not prime"},
- {ERR_PACK(ERR_LIB_DH, 0, DH_R_CHECK_P_NOT_SAFE_PRIME),
- "check p not safe prime"},
- {ERR_PACK(ERR_LIB_DH, 0, DH_R_CHECK_Q_NOT_PRIME), "check q not prime"},
- {ERR_PACK(ERR_LIB_DH, 0, DH_R_DECODE_ERROR), "decode error"},
- {ERR_PACK(ERR_LIB_DH, 0, DH_R_INVALID_PARAMETER_NAME),
- "invalid parameter name"},
- {ERR_PACK(ERR_LIB_DH, 0, DH_R_INVALID_PARAMETER_NID),
- "invalid parameter nid"},
- {ERR_PACK(ERR_LIB_DH, 0, DH_R_INVALID_PUBKEY), "invalid public key"},
- {ERR_PACK(ERR_LIB_DH, 0, DH_R_INVALID_SECRET), "invalid secret"},
- {ERR_PACK(ERR_LIB_DH, 0, DH_R_INVALID_SIZE), "invalid size"},
- {ERR_PACK(ERR_LIB_DH, 0, DH_R_KDF_PARAMETER_ERROR), "kdf parameter error"},
- {ERR_PACK(ERR_LIB_DH, 0, DH_R_KEYS_NOT_SET), "keys not set"},
- {ERR_PACK(ERR_LIB_DH, 0, DH_R_MISSING_PUBKEY), "missing pubkey"},
- {ERR_PACK(ERR_LIB_DH, 0, DH_R_MODULUS_TOO_LARGE), "modulus too large"},
- {ERR_PACK(ERR_LIB_DH, 0, DH_R_MODULUS_TOO_SMALL), "modulus too small"},
- {ERR_PACK(ERR_LIB_DH, 0, DH_R_NOT_SUITABLE_GENERATOR),
- "not suitable generator"},
- {ERR_PACK(ERR_LIB_DH, 0, DH_R_NO_PARAMETERS_SET), "no parameters set"},
- {ERR_PACK(ERR_LIB_DH, 0, DH_R_NO_PRIVATE_VALUE), "no private value"},
- {ERR_PACK(ERR_LIB_DH, 0, DH_R_PARAMETER_ENCODING_ERROR),
- "parameter encoding error"},
- {ERR_PACK(ERR_LIB_DH, 0, DH_R_PEER_KEY_ERROR), "peer key error"},
- {ERR_PACK(ERR_LIB_DH, 0, DH_R_Q_TOO_LARGE), "q too large"},
- {ERR_PACK(ERR_LIB_DH, 0, DH_R_SHARED_INFO_ERROR), "shared info error"},
- {ERR_PACK(ERR_LIB_DH, 0, DH_R_UNABLE_TO_CHECK_GENERATOR),
- "unable to check generator"},
- {0, NULL}
+ { ERR_PACK(ERR_LIB_DH, 0, DH_R_BAD_FFC_PARAMETERS), "bad ffc parameters" },
+ { ERR_PACK(ERR_LIB_DH, 0, DH_R_BAD_GENERATOR), "bad generator" },
+ { ERR_PACK(ERR_LIB_DH, 0, DH_R_BN_DECODE_ERROR), "bn decode error" },
+ { ERR_PACK(ERR_LIB_DH, 0, DH_R_BN_ERROR), "bn error" },
+ { ERR_PACK(ERR_LIB_DH, 0, DH_R_CHECK_INVALID_J_VALUE),
+ "check invalid j value" },
+ { ERR_PACK(ERR_LIB_DH, 0, DH_R_CHECK_INVALID_Q_VALUE),
+ "check invalid q value" },
+ { ERR_PACK(ERR_LIB_DH, 0, DH_R_CHECK_PUBKEY_INVALID),
+ "check pubkey invalid" },
+ { ERR_PACK(ERR_LIB_DH, 0, DH_R_CHECK_PUBKEY_TOO_LARGE),
+ "check pubkey too large" },
+ { ERR_PACK(ERR_LIB_DH, 0, DH_R_CHECK_PUBKEY_TOO_SMALL),
+ "check pubkey too small" },
+ { ERR_PACK(ERR_LIB_DH, 0, DH_R_CHECK_P_NOT_PRIME), "check p not prime" },
+ { ERR_PACK(ERR_LIB_DH, 0, DH_R_CHECK_P_NOT_SAFE_PRIME),
+ "check p not safe prime" },
+ { ERR_PACK(ERR_LIB_DH, 0, DH_R_CHECK_Q_NOT_PRIME), "check q not prime" },
+ { ERR_PACK(ERR_LIB_DH, 0, DH_R_DECODE_ERROR), "decode error" },
+ { ERR_PACK(ERR_LIB_DH, 0, DH_R_INVALID_PARAMETER_NAME),
+ "invalid parameter name" },
+ { ERR_PACK(ERR_LIB_DH, 0, DH_R_INVALID_PARAMETER_NID),
+ "invalid parameter nid" },
+ { ERR_PACK(ERR_LIB_DH, 0, DH_R_INVALID_PUBKEY), "invalid public key" },
+ { ERR_PACK(ERR_LIB_DH, 0, DH_R_INVALID_SECRET), "invalid secret" },
+ { ERR_PACK(ERR_LIB_DH, 0, DH_R_INVALID_SIZE), "invalid size" },
+ { ERR_PACK(ERR_LIB_DH, 0, DH_R_KDF_PARAMETER_ERROR), "kdf parameter error" },
+ { ERR_PACK(ERR_LIB_DH, 0, DH_R_KEYS_NOT_SET), "keys not set" },
+ { ERR_PACK(ERR_LIB_DH, 0, DH_R_MISSING_PUBKEY), "missing pubkey" },
+ { ERR_PACK(ERR_LIB_DH, 0, DH_R_MODULUS_TOO_LARGE), "modulus too large" },
+ { ERR_PACK(ERR_LIB_DH, 0, DH_R_MODULUS_TOO_SMALL), "modulus too small" },
+ { ERR_PACK(ERR_LIB_DH, 0, DH_R_NOT_SUITABLE_GENERATOR),
+ "not suitable generator" },
+ { ERR_PACK(ERR_LIB_DH, 0, DH_R_NO_PARAMETERS_SET), "no parameters set" },
+ { ERR_PACK(ERR_LIB_DH, 0, DH_R_NO_PRIVATE_VALUE), "no private value" },
+ { ERR_PACK(ERR_LIB_DH, 0, DH_R_PARAMETER_ENCODING_ERROR),
+ "parameter encoding error" },
+ { ERR_PACK(ERR_LIB_DH, 0, DH_R_PEER_KEY_ERROR), "peer key error" },
+ { ERR_PACK(ERR_LIB_DH, 0, DH_R_Q_TOO_LARGE), "q too large" },
+ { ERR_PACK(ERR_LIB_DH, 0, DH_R_SHARED_INFO_ERROR), "shared info error" },
+ { ERR_PACK(ERR_LIB_DH, 0, DH_R_UNABLE_TO_CHECK_GENERATOR),
+ "unable to check generator" },
+ { 0, NULL }
};
-# endif
+#endif
int ossl_err_load_DH_strings(void)
{
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(DH_str_reasons[0].error) == NULL)
ERR_load_strings_const(DH_str_reasons);
-# endif
+#endif
return 1;
}
#else
diff --git a/crypto/dh/dh_gen.c b/crypto/dh/dh_gen.c
index b73bfb7f3b..094b6e70c7 100644
--- a/crypto/dh/dh_gen.c
+++ b/crypto/dh/dh_gen.c
@@ -33,24 +33,24 @@
#ifndef FIPS_MODULE
static int dh_builtin_genparams(DH *ret, int prime_len, int generator,
- BN_GENCB *cb);
+ BN_GENCB *cb);
#endif /* FIPS_MODULE */
int ossl_dh_generate_ffc_parameters(DH *dh, int type, int pbits, int qbits,
- BN_GENCB *cb)
+ BN_GENCB *cb)
{
int ret, res;
#ifndef FIPS_MODULE
if (type == DH_PARAMGEN_TYPE_FIPS_186_2)
ret = ossl_ffc_params_FIPS186_2_generate(dh->libctx, &dh->params,
- FFC_PARAM_TYPE_DH,
- pbits, qbits, &res, cb);
+ FFC_PARAM_TYPE_DH,
+ pbits, qbits, &res, cb);
else
#endif
ret = ossl_ffc_params_FIPS186_4_generate(dh->libctx, &dh->params,
- FFC_PARAM_TYPE_DH,
- pbits, qbits, &res, cb);
+ FFC_PARAM_TYPE_DH,
+ pbits, qbits, &res, cb);
if (ret > 0)
dh->dirty_cnt++;
return ret;
@@ -113,7 +113,7 @@ static int dh_gen_named_group(OSSL_LIB_CTX *libctx, DH *ret, int prime_len)
#endif /* FIPS_MODULE */
int DH_generate_parameters_ex(DH *ret, int prime_len, int generator,
- BN_GENCB *cb)
+ BN_GENCB *cb)
{
#ifdef FIPS_MODULE
if (generator != 2)
@@ -154,7 +154,7 @@ int DH_generate_parameters_ex(DH *ret, int prime_len, int generator,
* for 5, p mod 60 == 59
*/
static int dh_builtin_genparams(DH *ret, int prime_len, int generator,
- BN_GENCB *cb)
+ BN_GENCB *cb)
{
BIGNUM *t1, *t2;
int g, ok = -1;
@@ -222,10 +222,11 @@ static int dh_builtin_genparams(DH *ret, int prime_len, int generator,
goto err;
/* We are using safe prime p, set key length equivalent to RFC 7919 */
ret->length = (2 * ossl_ifc_ffc_compute_security_bits(prime_len)
- + 24) / 25 * 25;
+ + 24)
+ / 25 * 25;
ret->dirty_cnt++;
ok = 1;
- err:
+err:
if (ok == -1) {
ERR_raise(ERR_LIB_DH, ERR_R_BN_LIB);
ok = 0;
diff --git a/crypto/dh/dh_group_params.c b/crypto/dh/dh_group_params.c
index 460bd8f009..dd2fa7da15 100644
--- a/crypto/dh/dh_group_params.c
+++ b/crypto/dh/dh_group_params.c
@@ -68,8 +68,9 @@ void ossl_dh_cache_named_group(DH *dh)
return;
if ((group = ossl_ffc_numbers_to_dh_named_group(dh->params.p,
- dh->params.q,
- dh->params.g)) != NULL) {
+ dh->params.q,
+ dh->params.g))
+ != NULL) {
if (dh->params.q == NULL)
dh->params.q = (BIGNUM *)ossl_ffc_named_group_get_q(group);
/* cache the nid and default key length */
diff --git a/crypto/dh/dh_kdf.c b/crypto/dh/dh_kdf.c
index 64f8064d9d..898bd7f517 100644
--- a/crypto/dh/dh_kdf.c
+++ b/crypto/dh/dh_kdf.c
@@ -25,11 +25,11 @@
/* Key derivation function from X9.63/SECG */
int ossl_dh_kdf_X9_42_asn1(unsigned char *out, size_t outlen,
- const unsigned char *Z, size_t Zlen,
- const char *cek_alg,
- const unsigned char *ukm, size_t ukmlen,
- const EVP_MD *md,
- OSSL_LIB_CTX *libctx, const char *propq)
+ const unsigned char *Z, size_t Zlen,
+ const char *cek_alg,
+ const unsigned char *ukm, size_t ukmlen,
+ const EVP_MD *md,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
int ret = 0;
EVP_KDF_CTX *kctx = NULL;
@@ -45,14 +45,14 @@ int ossl_dh_kdf_X9_42_asn1(unsigned char *out, size_t outlen,
goto err;
*p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST,
- (char *)mdname, 0);
+ (char *)mdname, 0);
*p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_KEY,
- (unsigned char *)Z, Zlen);
+ (unsigned char *)Z, Zlen);
if (ukm != NULL)
*p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_UKM,
- (unsigned char *)ukm, ukmlen);
+ (unsigned char *)ukm, ukmlen);
*p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_CEK_ALG,
- (char *)cek_alg, 0);
+ (char *)cek_alg, 0);
*p = OSSL_PARAM_construct_end();
ret = EVP_KDF_derive(kctx, out, outlen, params) > 0;
err:
@@ -63,9 +63,9 @@ err:
#if !defined(FIPS_MODULE)
int DH_KDF_X9_42(unsigned char *out, size_t outlen,
- const unsigned char *Z, size_t Zlen,
- ASN1_OBJECT *key_oid,
- const unsigned char *ukm, size_t ukmlen, const EVP_MD *md)
+ const unsigned char *Z, size_t Zlen,
+ ASN1_OBJECT *key_oid,
+ const unsigned char *ukm, size_t ukmlen, const EVP_MD *md)
{
char key_alg[OSSL_MAX_NAME_SIZE];
const OSSL_PROVIDER *prov = EVP_MD_get0_provider(md);
@@ -75,6 +75,6 @@ int DH_KDF_X9_42(unsigned char *out, size_t outlen,
return 0;
return ossl_dh_kdf_X9_42_asn1(out, outlen, Z, Zlen, key_alg,
- ukm, ukmlen, md, libctx, NULL);
+ ukm, ukmlen, md, libctx, NULL);
}
#endif /* !defined(FIPS_MODULE) */
diff --git a/crypto/dh/dh_key.c b/crypto/dh/dh_key.c
index 1f28edeaf6..3f45a8d8f0 100644
--- a/crypto/dh/dh_key.c
+++ b/crypto/dh/dh_key.c
@@ -21,15 +21,15 @@
#include "crypto/security_bits.h"
#ifdef FIPS_MODULE
-# define MIN_STRENGTH 112
+#define MIN_STRENGTH 112
#else
-# define MIN_STRENGTH 80
+#define MIN_STRENGTH 80
#endif
static int generate_key(DH *dh);
static int dh_bn_mod_exp(const DH *dh, BIGNUM *r,
- const BIGNUM *a, const BIGNUM *p,
- const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
+ const BIGNUM *a, const BIGNUM *p,
+ const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
static int dh_init(DH *dh);
static int dh_finish(DH *dh);
@@ -76,7 +76,7 @@ int ossl_dh_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
if (dh->flags & DH_FLAG_CACHE_MONT_P) {
mont = BN_MONT_CTX_set_locked(&dh->method_mont_p,
- dh->lock, dh->params.p, ctx);
+ dh->lock, dh->params.p, ctx);
BN_set_flags(dh->priv_key, BN_FLG_CONSTTIME);
if (!mont)
goto err;
@@ -84,7 +84,7 @@ int ossl_dh_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
/* (Step 1) Z = pub_key^priv_key mod p */
if (!dh->meth->bn_mod_exp(dh, z, pub_key, dh->priv_key, dh->params.p, ctx,
- mont)) {
+ mont)) {
ERR_raise(ERR_LIB_DH, ERR_R_BN_LIB);
goto err;
}
@@ -100,7 +100,7 @@ int ossl_dh_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
/* return the padded key, i.e. same number of bytes as the modulus */
ret = BN_bn2binpad(z, key, BN_num_bytes(dh->params.p));
- err:
+err:
BN_clear(z); /* (Step 2) destroy intermediate values */
BN_CTX_end(ctx);
BN_CTX_free(ctx);
@@ -187,8 +187,8 @@ const DH_METHOD *DH_get_default_method(void)
}
static int dh_bn_mod_exp(const DH *dh, BIGNUM *r,
- const BIGNUM *a, const BIGNUM *p,
- const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx)
+ const BIGNUM *a, const BIGNUM *p,
+ const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx)
{
#ifdef S390X_MOD_EXP
return s390x_mod_exp(r, a, p, m, ctx, m_ctx);
@@ -227,7 +227,7 @@ int DH_generate_key(DH *dh)
}
int ossl_dh_generate_public_key(BN_CTX *ctx, const DH *dh,
- const BIGNUM *priv_key, BIGNUM *pub_key)
+ const BIGNUM *priv_key, BIGNUM *pub_key)
{
int ret = 0;
BIGNUM *prk = BN_new();
@@ -254,7 +254,7 @@ int ossl_dh_generate_public_key(BN_CTX *ctx, const DH *dh,
/* pub_key = g^priv_key mod p */
if (!dh->meth->bn_mod_exp(dh, pub_key, dh->params.g, prk, dh->params.p,
- ctx, mont))
+ ctx, mont))
goto err;
ret = 1;
err:
@@ -311,15 +311,14 @@ static int generate_key(DH *dh)
if (generate_new_key) {
/* Is it an approved safe prime ?*/
if (DH_get_nid(dh) != NID_undef) {
- int max_strength =
- ossl_ifc_ffc_compute_security_bits(BN_num_bits(dh->params.p));
+ int max_strength = ossl_ifc_ffc_compute_security_bits(BN_num_bits(dh->params.p));
if (dh->params.q == NULL
|| dh->length > BN_num_bits(dh->params.q))
goto err;
/* dh->length = maximum bit length of generated private key */
if (!ossl_ffc_generate_private_key(ctx, &dh->params, dh->length,
- max_strength, priv_key))
+ max_strength, priv_key))
goto err;
} else {
#ifdef FIPS_MODULE
@@ -335,7 +334,7 @@ static int generate_key(DH *dh)
if (dh->length != 0 && dh->length < l)
l = dh->length;
if (!BN_priv_rand_ex(priv_key, l, BN_RAND_TOP_ONE,
- BN_RAND_BOTTOM_ANY, 0, ctx))
+ BN_RAND_BOTTOM_ANY, 0, ctx))
goto err;
/*
* We handle just one known case where g is a quadratic non-residue:
@@ -352,7 +351,7 @@ static int generate_key(DH *dh)
{
/* Do a partial check for invalid p, q, g */
if (!ossl_ffc_params_simple_validate(dh->libctx, &dh->params,
- FFC_PARAM_TYPE_DH, NULL))
+ FFC_PARAM_TYPE_DH, NULL))
goto err;
/*
* For FFC FIPS 186-4 keygen
@@ -360,9 +359,9 @@ static int generate_key(DH *dh)
* Max Private key size N = len(q)
*/
if (!ossl_ffc_generate_private_key(ctx, &dh->params,
- BN_num_bits(dh->params.q),
- MIN_STRENGTH,
- priv_key))
+ BN_num_bits(dh->params.q),
+ MIN_STRENGTH,
+ priv_key))
goto err;
}
}
@@ -375,7 +374,7 @@ static int generate_key(DH *dh)
dh->priv_key = priv_key;
dh->dirty_cnt++;
ok = 1;
- err:
+err:
if (ok != 1)
ERR_raise(ERR_LIB_DH, ERR_R_BN_LIB);
@@ -416,7 +415,7 @@ err:
}
size_t ossl_dh_key2buf(const DH *dh, unsigned char **pbuf_out, size_t size,
- int alloc)
+ int alloc)
{
const BIGNUM *pubkey;
unsigned char *pbuf = NULL;
@@ -426,8 +425,8 @@ size_t ossl_dh_key2buf(const DH *dh, unsigned char **pbuf_out, size_t size,
DH_get0_pqg(dh, &p, NULL, NULL);
DH_get0_key(dh, &pubkey, NULL);
if (p == NULL || pubkey == NULL
- || (p_size = BN_num_bytes(p)) == 0
- || BN_num_bytes(pubkey) == 0) {
+ || (p_size = BN_num_bytes(p)) == 0
+ || BN_num_bytes(pubkey) == 0) {
ERR_raise(ERR_LIB_DH, DH_R_INVALID_PUBKEY);
return 0;
}
diff --git a/crypto/dh/dh_lib.c b/crypto/dh/dh_lib.c
index 6c714e41f2..f959c0dd88 100644
--- a/crypto/dh/dh_lib.c
+++ b/crypto/dh/dh_lib.c
@@ -47,12 +47,12 @@ const DH_METHOD *ossl_dh_get_method(const DH *dh)
{
return dh->meth;
}
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
DH *DH_new(void)
{
return dh_new_intern(NULL);
}
-# endif
+#endif
DH *DH_new_method(ENGINE *engine)
{
@@ -105,7 +105,7 @@ static DH *dh_new_intern(OSSL_LIB_CTX *libctx)
return ret;
- err:
+err:
DH_free(ret);
return NULL;
}
@@ -197,7 +197,7 @@ int DH_security_bits(const DH *dh)
}
void DH_get0_pqg(const DH *dh,
- const BIGNUM **p, const BIGNUM **q, const BIGNUM **g)
+ const BIGNUM **p, const BIGNUM **q, const BIGNUM **g)
{
ossl_ffc_params_get0_pqg(&dh->params, p, q, g);
}
diff --git a/crypto/dh/dh_local.h b/crypto/dh/dh_local.h
index e4cba4c301..177f055a67 100644
--- a/crypto/dh/dh_local.h
+++ b/crypto/dh/dh_local.h
@@ -11,7 +11,7 @@
#include "internal/refcount.h"
#include "internal/ffc.h"
-#define DH_MIN_MODULUS_BITS 512
+#define DH_MIN_MODULUS_BITS 512
struct dh_st {
/*
@@ -23,8 +23,8 @@ struct dh_st {
FFC_PARAMS params;
/* max generated private key length (can be less than len(q)) */
int32_t length;
- BIGNUM *pub_key; /* g^x % p */
- BIGNUM *priv_key; /* x */
+ BIGNUM *pub_key; /* g^x % p */
+ BIGNUM *priv_key; /* x */
int flags;
BN_MONT_CTX *method_mont_p;
CRYPTO_REF_COUNT references;
@@ -42,18 +42,18 @@ struct dh_st {
struct dh_method {
char *name;
/* Methods here */
- int (*generate_key) (DH *dh);
- int (*compute_key) (unsigned char *key, const BIGNUM *pub_key, DH *dh);
+ int (*generate_key)(DH *dh);
+ int (*compute_key)(unsigned char *key, const BIGNUM *pub_key, DH *dh);
/* Can be null */
- int (*bn_mod_exp) (const DH *dh, BIGNUM *r, const BIGNUM *a,
- const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx,
- BN_MONT_CTX *m_ctx);
- int (*init) (DH *dh);
- int (*finish) (DH *dh);
+ int (*bn_mod_exp)(const DH *dh, BIGNUM *r, const BIGNUM *a,
+ const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx,
+ BN_MONT_CTX *m_ctx);
+ int (*init)(DH *dh);
+ int (*finish)(DH *dh);
int flags;
char *app_data;
/* If this is non-NULL, it will be used to generate parameters */
- int (*generate_params) (DH *dh, int prime_len, int generator,
- BN_GENCB *cb);
+ int (*generate_params)(DH *dh, int prime_len, int generator,
+ BN_GENCB *cb);
};
diff --git a/crypto/dh/dh_meth.c b/crypto/dh/dh_meth.c
index f5652e0785..809ec4209f 100644
--- a/crypto/dh/dh_meth.c
+++ b/crypto/dh/dh_meth.c
@@ -99,41 +99,38 @@ int DH_meth_set0_app_data(DH_METHOD *dhm, void *app_data)
return 1;
}
-int (*DH_meth_get_generate_key(const DH_METHOD *dhm)) (DH *)
+int (*DH_meth_get_generate_key(const DH_METHOD *dhm))(DH *)
{
return dhm->generate_key;
}
-int DH_meth_set_generate_key(DH_METHOD *dhm, int (*generate_key) (DH *))
+int DH_meth_set_generate_key(DH_METHOD *dhm, int (*generate_key)(DH *))
{
dhm->generate_key = generate_key;
return 1;
}
-int (*DH_meth_get_compute_key(const DH_METHOD *dhm))
- (unsigned char *key, const BIGNUM *pub_key, DH *dh)
+int (*DH_meth_get_compute_key(const DH_METHOD *dhm))(unsigned char *key, const BIGNUM *pub_key, DH *dh)
{
return dhm->compute_key;
}
int DH_meth_set_compute_key(DH_METHOD *dhm,
- int (*compute_key) (unsigned char *key, const BIGNUM *pub_key, DH *dh))
+ int (*compute_key)(unsigned char *key, const BIGNUM *pub_key, DH *dh))
{
dhm->compute_key = compute_key;
return 1;
}
-
-int (*DH_meth_get_bn_mod_exp(const DH_METHOD *dhm))
- (const DH *, BIGNUM *, const BIGNUM *, const BIGNUM *, const BIGNUM *,
- BN_CTX *, BN_MONT_CTX *)
+int (*DH_meth_get_bn_mod_exp(const DH_METHOD *dhm))(const DH *, BIGNUM *, const BIGNUM *, const BIGNUM *, const BIGNUM *,
+ BN_CTX *, BN_MONT_CTX *)
{
return dhm->bn_mod_exp;
}
int DH_meth_set_bn_mod_exp(DH_METHOD *dhm,
- int (*bn_mod_exp) (const DH *, BIGNUM *, const BIGNUM *, const BIGNUM *,
- const BIGNUM *, BN_CTX *, BN_MONT_CTX *))
+ int (*bn_mod_exp)(const DH *, BIGNUM *, const BIGNUM *, const BIGNUM *,
+ const BIGNUM *, BN_CTX *, BN_MONT_CTX *))
{
dhm->bn_mod_exp = bn_mod_exp;
return 1;
@@ -150,25 +147,24 @@ int DH_meth_set_init(DH_METHOD *dhm, int (*init)(DH *))
return 1;
}
-int (*DH_meth_get_finish(const DH_METHOD *dhm)) (DH *)
+int (*DH_meth_get_finish(const DH_METHOD *dhm))(DH *)
{
return dhm->finish;
}
-int DH_meth_set_finish(DH_METHOD *dhm, int (*finish) (DH *))
+int DH_meth_set_finish(DH_METHOD *dhm, int (*finish)(DH *))
{
dhm->finish = finish;
return 1;
}
-int (*DH_meth_get_generate_params(const DH_METHOD *dhm))
- (DH *, int, int, BN_GENCB *)
+int (*DH_meth_get_generate_params(const DH_METHOD *dhm))(DH *, int, int, BN_GENCB *)
{
return dhm->generate_params;
}
int DH_meth_set_generate_params(DH_METHOD *dhm,
- int (*generate_params) (DH *, int, int, BN_GENCB *))
+ int (*generate_params)(DH *, int, int, BN_GENCB *))
{
dhm->generate_params = generate_params;
return 1;
diff --git a/crypto/dh/dh_pmeth.c b/crypto/dh/dh_pmeth.c
index 192d9859e4..673426b7f3 100644
--- a/crypto/dh/dh_pmeth.c
+++ b/crypto/dh/dh_pmeth.c
@@ -80,7 +80,6 @@ static void pkey_dh_cleanup(EVP_PKEY_CTX *ctx)
}
}
-
static int pkey_dh_copy(EVP_PKEY_CTX *dst, const EVP_PKEY_CTX *src)
{
DH_PKEY_CTX *dctx, *sctx;
@@ -105,7 +104,7 @@ static int pkey_dh_copy(EVP_PKEY_CTX *dst, const EVP_PKEY_CTX *src)
if (sctx->kdf_ukm != NULL) {
dctx->kdf_ukm = OPENSSL_memdup(sctx->kdf_ukm, sctx->kdf_ukmlen);
if (dctx->kdf_ukm == NULL)
- return 0;
+ return 0;
dctx->kdf_ukmlen = sctx->kdf_ukmlen;
}
dctx->kdf_outlen = sctx->kdf_outlen;
@@ -215,12 +214,11 @@ static int pkey_dh_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
default:
return -2;
-
}
}
static int pkey_dh_ctrl_str(EVP_PKEY_CTX *ctx,
- const char *type, const char *value)
+ const char *type, const char *value)
{
if (strcmp(type, "dh_paramgen_prime_len") == 0) {
int len;
@@ -272,7 +270,7 @@ static int pkey_dh_ctrl_str(EVP_PKEY_CTX *ctx,
}
static DH *ffc_params_generate(OSSL_LIB_CTX *libctx, DH_PKEY_CTX *dctx,
- BN_GENCB *pcb)
+ BN_GENCB *pcb)
{
DH *ret;
int rv = 0;
@@ -296,20 +294,20 @@ static DH *ffc_params_generate(OSSL_LIB_CTX *libctx, DH_PKEY_CTX *dctx,
if (dctx->md != NULL)
ossl_ffc_set_digest(&ret->params, EVP_MD_get0_name(dctx->md), NULL);
-# ifndef FIPS_MODULE
+#ifndef FIPS_MODULE
if (dctx->paramgen_type == DH_PARAMGEN_TYPE_FIPS_186_2)
rv = ossl_ffc_params_FIPS186_2_generate(libctx, &ret->params,
- FFC_PARAM_TYPE_DH,
- prime_len, subprime_len, &res,
- pcb);
+ FFC_PARAM_TYPE_DH,
+ prime_len, subprime_len, &res,
+ pcb);
else
-# endif
- /* For FIPS we always use the DH_PARAMGEN_TYPE_FIPS_186_4 generator */
- if (dctx->paramgen_type >= DH_PARAMGEN_TYPE_FIPS_186_2)
- rv = ossl_ffc_params_FIPS186_4_generate(libctx, &ret->params,
- FFC_PARAM_TYPE_DH,
- prime_len, subprime_len, &res,
- pcb);
+#endif
+ /* For FIPS we always use the DH_PARAMGEN_TYPE_FIPS_186_4 generator */
+ if (dctx->paramgen_type >= DH_PARAMGEN_TYPE_FIPS_186_2)
+ rv = ossl_ffc_params_FIPS186_4_generate(libctx, &ret->params,
+ FFC_PARAM_TYPE_DH,
+ prime_len, subprime_len, &res,
+ pcb);
if (rv <= 0) {
DH_free(ret);
return NULL;
@@ -318,7 +316,7 @@ static DH *ffc_params_generate(OSSL_LIB_CTX *libctx, DH_PKEY_CTX *dctx,
}
static int pkey_dh_paramgen(EVP_PKEY_CTX *ctx,
- EVP_PKEY *pkey)
+ EVP_PKEY *pkey)
{
DH *dh = NULL;
DH_PKEY_CTX *dctx = ctx->data;
@@ -345,9 +343,9 @@ static int pkey_dh_paramgen(EVP_PKEY_CTX *ctx,
return 0;
evp_pkey_set_cb_translate(pcb, ctx);
}
-# ifdef FIPS_MODULE
+#ifdef FIPS_MODULE
dctx->paramgen_type = DH_PARAMGEN_TYPE_FIPS_186_4;
-# endif /* FIPS_MODULE */
+#endif /* FIPS_MODULE */
if (dctx->paramgen_type >= DH_PARAMGEN_TYPE_FIPS_186_2) {
dh = ffc_params_generate(NULL, dctx, pcb);
BN_GENCB_free(pcb);
@@ -362,7 +360,7 @@ static int pkey_dh_paramgen(EVP_PKEY_CTX *ctx,
return 0;
}
ret = DH_generate_parameters_ex(dh,
- dctx->prime_len, dctx->generator, pcb);
+ dctx->prime_len, dctx->generator, pcb);
BN_GENCB_free(pcb);
if (ret)
EVP_PKEY_assign_DH(pkey, dh);
@@ -394,7 +392,7 @@ static int pkey_dh_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
}
static int pkey_dh_derive(EVP_PKEY_CTX *ctx, unsigned char *key,
- size_t *keylen)
+ size_t *keylen)
{
int ret;
DH *dh;
@@ -426,8 +424,7 @@ static int pkey_dh_derive(EVP_PKEY_CTX *ctx, unsigned char *key,
return ret;
*keylen = ret;
return 1;
- }
- else if (dctx->kdf_type == EVP_PKEY_DH_KDF_X9_42) {
+ } else if (dctx->kdf_type == EVP_PKEY_DH_KDF_X9_42) {
unsigned char *Z = NULL;
int Zlen = 0;
@@ -448,11 +445,11 @@ static int pkey_dh_derive(EVP_PKEY_CTX *ctx, unsigned char *key,
if (DH_compute_key_padded(Z, dhpubbn, dh) <= 0)
goto err;
if (!DH_KDF_X9_42(key, *keylen, Z, Zlen, dctx->kdf_oid,
- dctx->kdf_ukm, dctx->kdf_ukmlen, dctx->kdf_md))
+ dctx->kdf_ukm, dctx->kdf_ukmlen, dctx->kdf_md))
goto err;
*keylen = dctx->kdf_outlen;
ret = 1;
- err:
+ err:
OPENSSL_clear_free(Z, Zlen);
return ret;
}
diff --git a/crypto/dh/dh_rfc5114.c b/crypto/dh/dh_rfc5114.c
index 7b1e0610bd..366776ce4e 100644
--- a/crypto/dh/dh_rfc5114.c
+++ b/crypto/dh/dh_rfc5114.c
@@ -25,23 +25,23 @@
* because they get wiped using BN_clear_free() when DH_free() is called.
*/
-#define make_dh(x) \
-DH *DH_get_##x(void) \
-{ \
- DH *dh = DH_new(); \
-\
- if (dh == NULL) \
- return NULL; \
- dh->params.p = BN_dup(&ossl_bignum_dh##x##_p); \
- dh->params.g = BN_dup(&ossl_bignum_dh##x##_g); \
- dh->params.q = BN_dup(&ossl_bignum_dh##x##_q); \
- if (dh->params.p == NULL || dh->params.q == NULL || dh->params.g == NULL) {\
- DH_free(dh); \
- return NULL; \
- } \
- return dh; \
-}
+#define make_dh(x) \
+ DH *DH_get_##x(void) \
+ { \
+ DH *dh = DH_new(); \
+ \
+ if (dh == NULL) \
+ return NULL; \
+ dh->params.p = BN_dup(&ossl_bignum_dh##x##_p); \
+ dh->params.g = BN_dup(&ossl_bignum_dh##x##_g); \
+ dh->params.q = BN_dup(&ossl_bignum_dh##x##_q); \
+ if (dh->params.p == NULL || dh->params.q == NULL || dh->params.g == NULL) { \
+ DH_free(dh); \
+ return NULL; \
+ } \
+ return dh; \
+ }
make_dh(1024_160)
-make_dh(2048_224)
-make_dh(2048_256)
+ make_dh(2048_224)
+ make_dh(2048_256)
diff --git a/crypto/dllmain.c b/crypto/dllmain.c
index 103700c829..78eee3f4c7 100644
--- a/crypto/dllmain.c
+++ b/crypto/dllmain.c
@@ -11,14 +11,14 @@
#include "crypto/cryptlib.h"
#if defined(_WIN32) || defined(__CYGWIN__)
-# ifdef __CYGWIN__
+#ifdef __CYGWIN__
/* pick DLL_[PROCESS|THREAD]_[ATTACH|DETACH] definitions */
-# include <windows.h>
+#include <windows.h>
/*
* this has side-effect of _WIN32 getting defined, which otherwise is
* mutually exclusive with __CYGWIN__...
*/
-# endif
+#endif
/*
* All we really need to do is remove the 'error' state when a thread
@@ -42,4 +42,3 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
return TRUE;
}
#endif
-
diff --git a/crypto/dsa/dsa_ameth.c b/crypto/dsa/dsa_ameth.c
index 169c1bb677..2480e88d1e 100644
--- a/crypto/dsa/dsa_ameth.c
+++ b/crypto/dsa/dsa_ameth.c
@@ -77,11 +77,10 @@ static int dsa_pub_decode(EVP_PKEY *pkey, const X509_PUBKEY *pubkey)
EVP_PKEY_assign_DSA(pkey, dsa);
return 1;
- err:
+err:
ASN1_INTEGER_free(public_key);
DSA_free(dsa);
return 0;
-
}
static int dsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
@@ -135,7 +134,7 @@ static int dsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
if (X509_PUBKEY_set0_param(pk, aobj, ptype, str, penc, penclen))
return 1;
- err:
+err:
OPENSSL_free(penc);
ASN1_STRING_free(str);
@@ -167,7 +166,7 @@ static int dsa_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
unsigned char *dp = NULL;
int dplen;
- if (pkey->pkey.dsa == NULL|| pkey->pkey.dsa->priv_key == NULL) {
+ if (pkey->pkey.dsa == NULL || pkey->pkey.dsa->priv_key == NULL) {
ERR_raise(ERR_LIB_DSA, DSA_R_MISSING_PARAMETERS);
goto err;
}
@@ -204,13 +203,13 @@ static int dsa_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
}
if (!PKCS8_pkey_set0(p8, OBJ_nid2obj(NID_dsa), 0,
- V_ASN1_SEQUENCE, params, dp, dplen)) {
+ V_ASN1_SEQUENCE, params, dp, dplen)) {
OPENSSL_clear_free(dp, dplen);
goto err;
}
return 1;
- err:
+err:
ASN1_STRING_free(params);
return 0;
}
@@ -313,12 +312,12 @@ static int do_dsa_print(BIO *bp, const DSA *x, int off, int ptype)
if (!ossl_ffc_params_print(bp, &x->params, off))
goto err;
ret = 1;
- err:
+err:
return ret;
}
static int dsa_param_decode(EVP_PKEY *pkey,
- const unsigned char **pder, int derlen)
+ const unsigned char **pder, int derlen)
{
DSA *dsa;
@@ -336,25 +335,25 @@ static int dsa_param_encode(const EVP_PKEY *pkey, unsigned char **pder)
}
static int dsa_param_print(BIO *bp, const EVP_PKEY *pkey, int indent,
- ASN1_PCTX *ctx)
+ ASN1_PCTX *ctx)
{
return do_dsa_print(bp, pkey->pkey.dsa, indent, 0);
}
static int dsa_pub_print(BIO *bp, const EVP_PKEY *pkey, int indent,
- ASN1_PCTX *ctx)
+ ASN1_PCTX *ctx)
{
return do_dsa_print(bp, pkey->pkey.dsa, indent, 1);
}
static int dsa_priv_print(BIO *bp, const EVP_PKEY *pkey, int indent,
- ASN1_PCTX *ctx)
+ ASN1_PCTX *ctx)
{
return do_dsa_print(bp, pkey->pkey.dsa, indent, 2);
}
static int old_dsa_priv_decode(EVP_PKEY *pkey,
- const unsigned char **pder, int derlen)
+ const unsigned char **pder, int derlen)
{
DSA *dsa;
@@ -373,7 +372,7 @@ static int old_dsa_priv_encode(const EVP_PKEY *pkey, unsigned char **pder)
}
static int dsa_sig_print(BIO *bp, const X509_ALGOR *sigalg,
- const ASN1_STRING *sig, int indent, ASN1_PCTX *pctx)
+ const ASN1_STRING *sig, int indent, ASN1_PCTX *pctx)
{
DSA_SIG *dsa_sig;
const unsigned char *p;
@@ -400,7 +399,7 @@ static int dsa_sig_print(BIO *bp, const X509_ALGOR *sigalg,
if (!ASN1_bn_print(bp, "s: ", s, NULL, indent))
goto err;
rv = 1;
- err:
+ err:
DSA_SIG_free(dsa_sig);
return rv;
}
@@ -427,8 +426,8 @@ static size_t dsa_pkey_dirty_cnt(const EVP_PKEY *pkey)
}
static int dsa_pkey_export_to(const EVP_PKEY *from, void *to_keydata,
- OSSL_FUNC_keymgmt_import_fn *importer,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_FUNC_keymgmt_import_fn *importer,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
DSA *dsa = from->pkey.dsa;
OSSL_PARAM_BLD *tmpl;
@@ -453,13 +452,13 @@ static int dsa_pkey_export_to(const EVP_PKEY *from, void *to_keydata,
selection |= OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS;
if (pub_key != NULL) {
if (!OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_PUB_KEY,
- pub_key))
+ pub_key))
goto err;
selection |= OSSL_KEYMGMT_SELECT_PUBLIC_KEY;
}
if (priv_key != NULL) {
if (!OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_PRIV_KEY,
- priv_key))
+ priv_key))
goto err;
selection |= OSSL_KEYMGMT_SELECT_PRIVATE_KEY;
}
@@ -471,7 +470,7 @@ static int dsa_pkey_export_to(const EVP_PKEY *from, void *to_keydata,
rv = importer(to_keydata, selection, params);
OSSL_PARAM_free(params);
- err:
+err:
OSSL_PARAM_BLD_free(tmpl);
return rv;
}
@@ -520,63 +519,61 @@ const EVP_PKEY_ASN1_METHOD ossl_dsa_asn1_meths[4] = {
/* This aliases NID_dsa with NID_dsa_2 */
{
- EVP_PKEY_DSA1,
- EVP_PKEY_DSA,
- ASN1_PKEY_ALIAS},
+ EVP_PKEY_DSA1,
+ EVP_PKEY_DSA,
+ ASN1_PKEY_ALIAS },
/* This aliases NID_dsaWithSHA with NID_dsaWithSHA_2 */
{
- EVP_PKEY_DSA4,
- EVP_PKEY_DSA2,
- ASN1_PKEY_ALIAS},
+ EVP_PKEY_DSA4,
+ EVP_PKEY_DSA2,
+ ASN1_PKEY_ALIAS },
/* This aliases NID_dsaWithSHA with NID_dsaWithSHA1 */
{
- EVP_PKEY_DSA3,
- EVP_PKEY_DSA2,
- ASN1_PKEY_ALIAS},
-
- {
- EVP_PKEY_DSA,
- EVP_PKEY_DSA,
- 0,
-
- "DSA",
- "OpenSSL DSA method",
-
- dsa_pub_decode,
- dsa_pub_encode,
- dsa_pub_cmp,
- dsa_pub_print,
-
- dsa_priv_decode,
- dsa_priv_encode,
- dsa_priv_print,
-
- int_dsa_size,
- dsa_bits,
- dsa_security_bits,
-
- dsa_param_decode,
- dsa_param_encode,
- dsa_missing_parameters,
- dsa_copy_parameters,
- dsa_cmp_parameters,
- dsa_param_print,
- dsa_sig_print,
-
- int_dsa_free,
- dsa_pkey_ctrl,
- old_dsa_priv_decode,
- old_dsa_priv_encode,
-
- NULL, NULL, NULL,
- NULL, NULL, NULL,
- NULL, NULL, NULL, NULL,
-
- dsa_pkey_dirty_cnt,
- dsa_pkey_export_to,
- dsa_pkey_import_from,
- dsa_pkey_copy
- }
+ EVP_PKEY_DSA3,
+ EVP_PKEY_DSA2,
+ ASN1_PKEY_ALIAS },
+
+ { EVP_PKEY_DSA,
+ EVP_PKEY_DSA,
+ 0,
+
+ "DSA",
+ "OpenSSL DSA method",
+
+ dsa_pub_decode,
+ dsa_pub_encode,
+ dsa_pub_cmp,
+ dsa_pub_print,
+
+ dsa_priv_decode,
+ dsa_priv_encode,
+ dsa_priv_print,
+
+ int_dsa_size,
+ dsa_bits,
+ dsa_security_bits,
+
+ dsa_param_decode,
+ dsa_param_encode,
+ dsa_missing_parameters,
+ dsa_copy_parameters,
+ dsa_cmp_parameters,
+ dsa_param_print,
+ dsa_sig_print,
+
+ int_dsa_free,
+ dsa_pkey_ctrl,
+ old_dsa_priv_decode,
+ old_dsa_priv_encode,
+
+ NULL, NULL, NULL,
+ NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
+
+ dsa_pkey_dirty_cnt,
+ dsa_pkey_export_to,
+ dsa_pkey_import_from,
+ dsa_pkey_copy }
};
diff --git a/crypto/dsa/dsa_asn1.c b/crypto/dsa/dsa_asn1.c
index 300ce6806d..3366610a9f 100644
--- a/crypto/dsa/dsa_asn1.c
+++ b/crypto/dsa/dsa_asn1.c
@@ -23,7 +23,7 @@
/* Override the default free and new methods */
static int dsa_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
- void *exarg)
+ void *exarg)
{
if (operation == ASN1_OP_NEW_PRE) {
*pval = (ASN1_VALUE *)DSA_new();
@@ -39,32 +39,32 @@ static int dsa_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
}
ASN1_SEQUENCE_cb(DSAPrivateKey, dsa_cb) = {
- ASN1_EMBED(DSA, version, INT32),
- ASN1_SIMPLE(DSA, params.p, BIGNUM),
- ASN1_SIMPLE(DSA, params.q, BIGNUM),
- ASN1_SIMPLE(DSA, params.g, BIGNUM),
- ASN1_SIMPLE(DSA, pub_key, BIGNUM),
- ASN1_SIMPLE(DSA, priv_key, CBIGNUM)
+ ASN1_EMBED(DSA, version, INT32),
+ ASN1_SIMPLE(DSA, params.p, BIGNUM),
+ ASN1_SIMPLE(DSA, params.q, BIGNUM),
+ ASN1_SIMPLE(DSA, params.g, BIGNUM),
+ ASN1_SIMPLE(DSA, pub_key, BIGNUM),
+ ASN1_SIMPLE(DSA, priv_key, CBIGNUM)
} static_ASN1_SEQUENCE_END_cb(DSA, DSAPrivateKey)
-IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(DSA, DSAPrivateKey, DSAPrivateKey)
+ IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(DSA, DSAPrivateKey, DSAPrivateKey)
ASN1_SEQUENCE_cb(DSAparams, dsa_cb) = {
- ASN1_SIMPLE(DSA, params.p, BIGNUM),
- ASN1_SIMPLE(DSA, params.q, BIGNUM),
- ASN1_SIMPLE(DSA, params.g, BIGNUM),
+ ASN1_SIMPLE(DSA, params.p, BIGNUM),
+ ASN1_SIMPLE(DSA, params.q, BIGNUM),
+ ASN1_SIMPLE(DSA, params.g, BIGNUM),
} static_ASN1_SEQUENCE_END_cb(DSA, DSAparams)
-IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(DSA, DSAparams, DSAparams)
+ IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(DSA, DSAparams, DSAparams)
ASN1_SEQUENCE_cb(DSAPublicKey, dsa_cb) = {
- ASN1_SIMPLE(DSA, pub_key, BIGNUM),
- ASN1_SIMPLE(DSA, params.p, BIGNUM),
- ASN1_SIMPLE(DSA, params.q, BIGNUM),
- ASN1_SIMPLE(DSA, params.g, BIGNUM)
+ ASN1_SIMPLE(DSA, pub_key, BIGNUM),
+ ASN1_SIMPLE(DSA, params.p, BIGNUM),
+ ASN1_SIMPLE(DSA, params.q, BIGNUM),
+ ASN1_SIMPLE(DSA, params.g, BIGNUM)
} static_ASN1_SEQUENCE_END_cb(DSA, DSAPublicKey)
-IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(DSA, DSAPublicKey, DSAPublicKey)
+ IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(DSA, DSAPublicKey, DSAPublicKey)
DSA *DSAparams_dup(const DSA *dsa)
{
diff --git a/crypto/dsa/dsa_backend.c b/crypto/dsa/dsa_backend.c
index 99f417cad7..e4c1c7bb01 100644
--- a/crypto/dsa/dsa_backend.c
+++ b/crypto/dsa/dsa_backend.c
@@ -16,7 +16,7 @@
#include <openssl/core_names.h>
#include <openssl/err.h>
#ifndef FIPS_MODULE
-# include <openssl/x509.h>
+#include <openssl/x509.h>
#endif
#include "crypto/dsa.h"
#include "dsa_local.h"
@@ -28,7 +28,7 @@
*/
int ossl_dsa_key_fromdata(DSA *dsa, const OSSL_PARAM params[],
- int include_private)
+ int include_private)
{
const OSSL_PARAM *param_priv_key = NULL, *param_pub_key;
BIGNUM *priv_key = NULL, *pub_key = NULL;
@@ -37,11 +37,9 @@ int ossl_dsa_key_fromdata(DSA *dsa, const OSSL_PARAM params[],
return 0;
if (include_private) {
- param_priv_key =
- OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_PRIV_KEY);
+ param_priv_key = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_PRIV_KEY);
}
- param_pub_key =
- OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_PUB_KEY);
+ param_pub_key = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_PUB_KEY);
/* It's ok if neither half is present */
if (param_priv_key == NULL && param_pub_key == NULL)
@@ -57,7 +55,7 @@ int ossl_dsa_key_fromdata(DSA *dsa, const OSSL_PARAM params[],
return 1;
- err:
+err:
BN_clear_free(priv_key);
BN_free(pub_key);
return 0;
@@ -108,20 +106,20 @@ DSA *ossl_dsa_dup(const DSA *dsa, int selection)
#ifndef FIPS_MODULE
if (!CRYPTO_dup_ex_data(CRYPTO_EX_INDEX_DSA,
- &dupkey->ex_data, &dsa->ex_data))
+ &dupkey->ex_data, &dsa->ex_data))
goto err;
#endif
return dupkey;
- err:
+err:
DSA_free(dupkey);
return NULL;
}
#ifndef FIPS_MODULE
DSA *ossl_dsa_key_from_pkcs8(const PKCS8_PRIV_KEY_INFO *p8inf,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_LIB_CTX *libctx, const char *propq)
{
const unsigned char *p, *pm;
int pklen, pmlen;
@@ -180,14 +178,14 @@ DSA *ossl_dsa_key_from_pkcs8(const PKCS8_PRIV_KEY_INFO *p8inf,
goto done;
- decerr:
+decerr:
ERR_raise(ERR_LIB_DSA, DSA_R_DECODE_ERROR);
- dsaerr:
+dsaerr:
BN_free(dsa_privkey);
BN_free(dsa_pubkey);
DSA_free(dsa);
dsa = NULL;
- done:
+done:
BN_CTX_free(ctx);
ASN1_STRING_clear_free(privkey);
return dsa;
diff --git a/crypto/dsa/dsa_check.c b/crypto/dsa/dsa_check.c
index e1375dfad9..c206688ce2 100644
--- a/crypto/dsa/dsa_check.c
+++ b/crypto/dsa/dsa_check.c
@@ -49,7 +49,7 @@ int ossl_dsa_check_params(const DSA *dsa, int checktype, int *ret)
if (checktype == OSSL_KEYMGMT_VALIDATE_QUICK_CHECK)
return ossl_ffc_params_simple_validate(dsa->libctx, &dsa->params,
- FFC_PARAM_TYPE_DSA, ret);
+ FFC_PARAM_TYPE_DSA, ret);
else
/*
* Do full FFC domain params validation according to FIPS-186-4
@@ -57,7 +57,7 @@ int ossl_dsa_check_params(const DSA *dsa, int checktype, int *ret)
* - only if possible (i.e., seed is set) in default provider
*/
return ossl_ffc_params_full_validate(dsa->libctx, &dsa->params,
- FFC_PARAM_TYPE_DSA, ret);
+ FFC_PARAM_TYPE_DSA, ret);
}
/*
@@ -69,7 +69,7 @@ int ossl_dsa_check_pub_key(const DSA *dsa, const BIGNUM *pub_key, int *ret)
return 0;
return ossl_ffc_validate_public_key(&dsa->params, pub_key, ret)
- && *ret == 0;
+ && *ret == 0;
}
/*
@@ -83,7 +83,7 @@ int ossl_dsa_check_pub_key_partial(const DSA *dsa, const BIGNUM *pub_key, int *r
return 0;
return ossl_ffc_validate_public_key_partial(&dsa->params, pub_key, ret)
- && *ret == 0;
+ && *ret == 0;
}
int ossl_dsa_check_priv_key(const DSA *dsa, const BIGNUM *priv_key, int *ret)
diff --git a/crypto/dsa/dsa_depr.c b/crypto/dsa/dsa_depr.c
index 95f8d1f3a9..b07826440e 100644
--- a/crypto/dsa/dsa_depr.c
+++ b/crypto/dsa/dsa_depr.c
@@ -29,10 +29,10 @@
#include <openssl/sha.h>
DSA *DSA_generate_parameters(int bits,
- unsigned char *seed_in, int seed_len,
- int *counter_ret, unsigned long *h_ret,
- void (*callback) (int, int, void *),
- void *cb_arg)
+ unsigned char *seed_in, int seed_len,
+ int *counter_ret, unsigned long *h_ret,
+ void (*callback)(int, int, void *),
+ void *cb_arg)
{
BN_GENCB *cb;
DSA *ret;
@@ -46,7 +46,7 @@ DSA *DSA_generate_parameters(int bits,
BN_GENCB_set_old(cb, callback, cb_arg);
if (DSA_generate_parameters_ex(ret, bits, seed_in, seed_len,
- counter_ret, h_ret, cb)) {
+ counter_ret, h_ret, cb)) {
BN_GENCB_free(cb);
return ret;
}
diff --git a/crypto/dsa/dsa_err.c b/crypto/dsa/dsa_err.c
index a92ca61664..12bc68ab56 100644
--- a/crypto/dsa/dsa_err.c
+++ b/crypto/dsa/dsa_err.c
@@ -14,40 +14,40 @@
#ifndef OPENSSL_NO_DSA
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA DSA_str_reasons[] = {
- {ERR_PACK(ERR_LIB_DSA, 0, DSA_R_BAD_FFC_PARAMETERS), "bad ffc parameters"},
- {ERR_PACK(ERR_LIB_DSA, 0, DSA_R_BAD_Q_VALUE), "bad q value"},
- {ERR_PACK(ERR_LIB_DSA, 0, DSA_R_BN_DECODE_ERROR), "bn decode error"},
- {ERR_PACK(ERR_LIB_DSA, 0, DSA_R_BN_ERROR), "bn error"},
- {ERR_PACK(ERR_LIB_DSA, 0, DSA_R_DECODE_ERROR), "decode error"},
- {ERR_PACK(ERR_LIB_DSA, 0, DSA_R_INVALID_DIGEST_TYPE),
- "invalid digest type"},
- {ERR_PACK(ERR_LIB_DSA, 0, DSA_R_INVALID_PARAMETERS), "invalid parameters"},
- {ERR_PACK(ERR_LIB_DSA, 0, DSA_R_MISSING_PARAMETERS), "missing parameters"},
- {ERR_PACK(ERR_LIB_DSA, 0, DSA_R_MISSING_PRIVATE_KEY),
- "missing private key"},
- {ERR_PACK(ERR_LIB_DSA, 0, DSA_R_MODULUS_TOO_LARGE), "modulus too large"},
- {ERR_PACK(ERR_LIB_DSA, 0, DSA_R_NO_PARAMETERS_SET), "no parameters set"},
- {ERR_PACK(ERR_LIB_DSA, 0, DSA_R_PARAMETER_ENCODING_ERROR),
- "parameter encoding error"},
- {ERR_PACK(ERR_LIB_DSA, 0, DSA_R_P_NOT_PRIME), "p not prime"},
- {ERR_PACK(ERR_LIB_DSA, 0, DSA_R_Q_NOT_PRIME), "q not prime"},
- {ERR_PACK(ERR_LIB_DSA, 0, DSA_R_SEED_LEN_SMALL),
- "seed_len is less than the length of q"},
- {ERR_PACK(ERR_LIB_DSA, 0, DSA_R_TOO_MANY_RETRIES), "too many retries"},
- {0, NULL}
+ { ERR_PACK(ERR_LIB_DSA, 0, DSA_R_BAD_FFC_PARAMETERS), "bad ffc parameters" },
+ { ERR_PACK(ERR_LIB_DSA, 0, DSA_R_BAD_Q_VALUE), "bad q value" },
+ { ERR_PACK(ERR_LIB_DSA, 0, DSA_R_BN_DECODE_ERROR), "bn decode error" },
+ { ERR_PACK(ERR_LIB_DSA, 0, DSA_R_BN_ERROR), "bn error" },
+ { ERR_PACK(ERR_LIB_DSA, 0, DSA_R_DECODE_ERROR), "decode error" },
+ { ERR_PACK(ERR_LIB_DSA, 0, DSA_R_INVALID_DIGEST_TYPE),
+ "invalid digest type" },
+ { ERR_PACK(ERR_LIB_DSA, 0, DSA_R_INVALID_PARAMETERS), "invalid parameters" },
+ { ERR_PACK(ERR_LIB_DSA, 0, DSA_R_MISSING_PARAMETERS), "missing parameters" },
+ { ERR_PACK(ERR_LIB_DSA, 0, DSA_R_MISSING_PRIVATE_KEY),
+ "missing private key" },
+ { ERR_PACK(ERR_LIB_DSA, 0, DSA_R_MODULUS_TOO_LARGE), "modulus too large" },
+ { ERR_PACK(ERR_LIB_DSA, 0, DSA_R_NO_PARAMETERS_SET), "no parameters set" },
+ { ERR_PACK(ERR_LIB_DSA, 0, DSA_R_PARAMETER_ENCODING_ERROR),
+ "parameter encoding error" },
+ { ERR_PACK(ERR_LIB_DSA, 0, DSA_R_P_NOT_PRIME), "p not prime" },
+ { ERR_PACK(ERR_LIB_DSA, 0, DSA_R_Q_NOT_PRIME), "q not prime" },
+ { ERR_PACK(ERR_LIB_DSA, 0, DSA_R_SEED_LEN_SMALL),
+ "seed_len is less than the length of q" },
+ { ERR_PACK(ERR_LIB_DSA, 0, DSA_R_TOO_MANY_RETRIES), "too many retries" },
+ { 0, NULL }
};
-# endif
+#endif
int ossl_err_load_DSA_strings(void)
{
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(DSA_str_reasons[0].error) == NULL)
ERR_load_strings_const(DSA_str_reasons);
-# endif
+#endif
return 1;
}
#else
diff --git a/crypto/dsa/dsa_gen.c b/crypto/dsa/dsa_gen.c
index a450921412..69344dd090 100644
--- a/crypto/dsa/dsa_gen.c
+++ b/crypto/dsa/dsa_gen.c
@@ -24,20 +24,20 @@
#include "dsa_local.h"
int ossl_dsa_generate_ffc_parameters(DSA *dsa, int type, int pbits, int qbits,
- BN_GENCB *cb)
+ BN_GENCB *cb)
{
int ret = 0, res;
#ifndef FIPS_MODULE
if (type == DSA_PARAMGEN_TYPE_FIPS_186_2)
ret = ossl_ffc_params_FIPS186_2_generate(dsa->libctx, &dsa->params,
- FFC_PARAM_TYPE_DSA,
- pbits, qbits, &res, cb);
+ FFC_PARAM_TYPE_DSA,
+ pbits, qbits, &res, cb);
else
#endif
ret = ossl_ffc_params_FIPS186_4_generate(dsa->libctx, &dsa->params,
- FFC_PARAM_TYPE_DSA,
- pbits, qbits, &res, cb);
+ FFC_PARAM_TYPE_DSA,
+ pbits, qbits, &res, cb);
if (ret > 0)
dsa->dirty_cnt++;
return ret;
@@ -45,26 +45,26 @@ int ossl_dsa_generate_ffc_parameters(DSA *dsa, int type, int pbits, int qbits,
#ifndef FIPS_MODULE
int DSA_generate_parameters_ex(DSA *dsa, int bits,
- const unsigned char *seed_in, int seed_len,
- int *counter_ret, unsigned long *h_ret,
- BN_GENCB *cb)
+ const unsigned char *seed_in, int seed_len,
+ int *counter_ret, unsigned long *h_ret,
+ BN_GENCB *cb)
{
if (dsa->meth->dsa_paramgen)
return dsa->meth->dsa_paramgen(dsa, bits, seed_in, seed_len,
- counter_ret, h_ret, cb);
+ counter_ret, h_ret, cb);
if (seed_in != NULL
&& !ossl_ffc_params_set_validate_params(&dsa->params, seed_in, seed_len,
- -1))
+ -1))
return 0;
/* The old code used FIPS 186-2 DSA Parameter generation */
if (bits < 2048 && seed_len <= 20) {
if (!ossl_dsa_generate_ffc_parameters(dsa, DSA_PARAMGEN_TYPE_FIPS_186_2,
- bits, 160, cb))
+ bits, 160, cb))
return 0;
} else {
if (!ossl_dsa_generate_ffc_parameters(dsa, DSA_PARAMGEN_TYPE_FIPS_186_4,
- bits, 0, cb))
+ bits, 0, cb))
return 0;
}
diff --git a/crypto/dsa/dsa_key.c b/crypto/dsa/dsa_key.c
index 1c2bab1714..aa69c3eea8 100644
--- a/crypto/dsa/dsa_key.c
+++ b/crypto/dsa/dsa_key.c
@@ -23,9 +23,9 @@
#include "dsa_local.h"
#ifdef FIPS_MODULE
-# define MIN_STRENGTH 112
+#define MIN_STRENGTH 112
#else
-# define MIN_STRENGTH 80
+#define MIN_STRENGTH 80
#endif
static int dsa_keygen(DSA *dsa);
@@ -40,7 +40,7 @@ int DSA_generate_key(DSA *dsa)
}
int ossl_dsa_generate_public_key(BN_CTX *ctx, const DSA *dsa,
- const BIGNUM *priv_key, BIGNUM *pub_key)
+ const BIGNUM *priv_key, BIGNUM *pub_key)
{
int ret = 0;
BIGNUM *prk = BN_new();
@@ -73,11 +73,11 @@ err:
* the comparison of the original public key to a newly calculated public key.
*/
static int dsa_keygen_knownanswer_test(DSA *dsa, BN_CTX *ctx,
- OSSL_CALLBACK *cb, void *cbarg)
+ OSSL_CALLBACK *cb, void *cbarg)
{
int len, ret = 0;
OSSL_SELF_TEST *st = NULL;
- unsigned char bytes[512] = {0};
+ unsigned char bytes[512] = { 0 };
BIGNUM *pub_key2 = BN_new();
if (pub_key2 == NULL)
@@ -88,7 +88,7 @@ static int dsa_keygen_knownanswer_test(DSA *dsa, BN_CTX *ctx,
goto err;
OSSL_SELF_TEST_onbegin(st, OSSL_SELF_TEST_TYPE_PCT_KAT,
- OSSL_SELF_TEST_DESC_PCT_DSA);
+ OSSL_SELF_TEST_DESC_PCT_DSA);
if (!ossl_dsa_generate_public_key(ctx, dsa, dsa->priv_key, pub_key2))
goto err;
@@ -114,7 +114,7 @@ err:
static int dsa_keygen_pairwise_test(DSA *dsa, OSSL_CALLBACK *cb, void *cbarg)
{
int ret = 0;
- unsigned char dgst[16] = {0};
+ unsigned char dgst[16] = { 0 };
unsigned int dgst_len = (unsigned int)sizeof(dgst);
DSA_SIG *sig = NULL;
OSSL_SELF_TEST *st = NULL;
@@ -124,7 +124,7 @@ static int dsa_keygen_pairwise_test(DSA *dsa, OSSL_CALLBACK *cb, void *cbarg)
goto err;
OSSL_SELF_TEST_onbegin(st, OSSL_SELF_TEST_TYPE_PCT,
- OSSL_SELF_TEST_DESC_PCT_DSA);
+ OSSL_SELF_TEST_DESC_PCT_DSA);
sig = DSA_do_sign(dgst, (int)dgst_len, dsa);
if (sig == NULL)
@@ -162,7 +162,7 @@ static int dsa_keygen(DSA *dsa)
/* Do a partial check for invalid p, q, g */
if (!ossl_ffc_params_simple_validate(dsa->libctx, &dsa->params,
- FFC_PARAM_TYPE_DSA, NULL))
+ FFC_PARAM_TYPE_DSA, NULL))
goto err;
/*
@@ -171,8 +171,8 @@ static int dsa_keygen(DSA *dsa)
* Max Private key size N = len(q)
*/
if (!ossl_ffc_generate_private_key(ctx, &dsa->params,
- BN_num_bits(dsa->params.q),
- MIN_STRENGTH, priv_key))
+ BN_num_bits(dsa->params.q),
+ MIN_STRENGTH, priv_key))
goto err;
if (dsa->pub_key == NULL) {
@@ -196,7 +196,7 @@ static int dsa_keygen(DSA *dsa)
OSSL_SELF_TEST_get_callback(dsa->libctx, &cb, &cbarg);
ok = dsa_keygen_pairwise_test(dsa, cb, cbarg)
- && dsa_keygen_knownanswer_test(dsa, ctx, cb, cbarg);
+ && dsa_keygen_knownanswer_test(dsa, ctx, cb, cbarg);
if (!ok) {
ossl_set_error_state(OSSL_SELF_TEST_TYPE_PCT);
BN_free(dsa->pub_key);
@@ -210,7 +210,7 @@ static int dsa_keygen(DSA *dsa)
#endif
dsa->dirty_cnt++;
- err:
+err:
if (pub_key != dsa->pub_key)
BN_free(pub_key);
if (priv_key != dsa->priv_key)
diff --git a/crypto/dsa/dsa_lib.c b/crypto/dsa/dsa_lib.c
index 53097e7306..01d5d8e3c1 100644
--- a/crypto/dsa/dsa_lib.c
+++ b/crypto/dsa/dsa_lib.c
@@ -35,7 +35,7 @@ void *DSA_get_ex_data(const DSA *d, int idx)
return CRYPTO_get_ex_data(&d->ex_data, idx);
}
-# ifndef OPENSSL_NO_DH
+#ifndef OPENSSL_NO_DH
DH *DSA_dup_DH(const DSA *r)
{
/*
@@ -73,13 +73,13 @@ DH *DSA_dup_DH(const DSA *r)
return ret;
- err:
+err:
BN_free(pub_key);
BN_free(priv_key);
DH_free(ret);
return NULL;
}
-# endif /* OPENSSL_NO_DH */
+#endif /* OPENSSL_NO_DH */
void DSA_clear_flags(DSA *d, int flags)
{
@@ -113,7 +113,6 @@ int DSA_set_method(DSA *dsa, const DSA_METHOD *meth)
}
#endif /* FIPS_MODULE */
-
const DSA_METHOD *DSA_get_method(DSA *d)
{
return d->meth;
@@ -146,7 +145,7 @@ static DSA *dsa_new_intern(OSSL_LIB_CTX *libctx)
#ifndef FIPS_MODULE
if (!ossl_crypto_new_ex_data_ex(libctx, CRYPTO_EX_INDEX_DSA, ret,
- &ret->ex_data))
+ &ret->ex_data))
goto err;
#endif
@@ -159,7 +158,7 @@ static DSA *dsa_new_intern(OSSL_LIB_CTX *libctx)
return ret;
- err:
+err:
DSA_free(ret);
return NULL;
}
@@ -230,7 +229,7 @@ void ossl_dsa_set0_libctx(DSA *d, OSSL_LIB_CTX *libctx)
}
void DSA_get0_pqg(const DSA *d,
- const BIGNUM **p, const BIGNUM **q, const BIGNUM **g)
+ const BIGNUM **p, const BIGNUM **q, const BIGNUM **g)
{
ossl_ffc_params_get0_pqg(&d->params, p, q, g);
}
@@ -277,7 +276,7 @@ const BIGNUM *DSA_get0_priv_key(const DSA *d)
}
void DSA_get0_key(const DSA *d,
- const BIGNUM **pub_key, const BIGNUM **priv_key)
+ const BIGNUM **pub_key, const BIGNUM **priv_key)
{
if (pub_key != NULL)
*pub_key = d->pub_key;
@@ -304,7 +303,7 @@ int DSA_security_bits(const DSA *d)
{
if (d->params.p != NULL && d->params.q != NULL)
return BN_security_bits(BN_num_bits(d->params.p),
- BN_num_bits(d->params.q));
+ BN_num_bits(d->params.q));
return -1;
}
diff --git a/crypto/dsa/dsa_local.h b/crypto/dsa/dsa_local.h
index 341f039e4f..a744463c87 100644
--- a/crypto/dsa/dsa_local.h
+++ b/crypto/dsa/dsa_local.h
@@ -19,8 +19,8 @@ struct dsa_st {
int pad;
int32_t version;
FFC_PARAMS params;
- BIGNUM *pub_key; /* y public key */
- BIGNUM *priv_key; /* x private key */
+ BIGNUM *pub_key; /* y public key */
+ BIGNUM *priv_key; /* x private key */
int flags;
/* Normally used to cache montgomery values */
BN_MONT_CTX *method_mont_p;
@@ -43,30 +43,30 @@ struct DSA_SIG_st {
struct dsa_method {
char *name;
- DSA_SIG *(*dsa_do_sign) (const unsigned char *dgst, int dlen, DSA *dsa);
- int (*dsa_sign_setup) (DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp,
- BIGNUM **rp);
- int (*dsa_do_verify) (const unsigned char *dgst, int dgst_len,
- DSA_SIG *sig, DSA *dsa);
- int (*dsa_mod_exp) (DSA *dsa, BIGNUM *rr, const BIGNUM *a1,
- const BIGNUM *p1, const BIGNUM *a2, const BIGNUM *p2,
- const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *in_mont);
+ DSA_SIG *(*dsa_do_sign)(const unsigned char *dgst, int dlen, DSA *dsa);
+ int (*dsa_sign_setup)(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp,
+ BIGNUM **rp);
+ int (*dsa_do_verify)(const unsigned char *dgst, int dgst_len,
+ DSA_SIG *sig, DSA *dsa);
+ int (*dsa_mod_exp)(DSA *dsa, BIGNUM *rr, const BIGNUM *a1,
+ const BIGNUM *p1, const BIGNUM *a2, const BIGNUM *p2,
+ const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *in_mont);
/* Can be null */
- int (*bn_mod_exp) (DSA *dsa, BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
- const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
- int (*init) (DSA *dsa);
- int (*finish) (DSA *dsa);
+ int (*bn_mod_exp)(DSA *dsa, BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
+ const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
+ int (*init)(DSA *dsa);
+ int (*finish)(DSA *dsa);
int flags;
void *app_data;
/* If this is non-NULL, it is used to generate DSA parameters */
- int (*dsa_paramgen) (DSA *dsa, int bits,
- const unsigned char *seed, int seed_len,
- int *counter_ret, unsigned long *h_ret,
- BN_GENCB *cb);
+ int (*dsa_paramgen)(DSA *dsa, int bits,
+ const unsigned char *seed, int seed_len,
+ int *counter_ret, unsigned long *h_ret,
+ BN_GENCB *cb);
/* If this is non-NULL, it is used to generate DSA keys */
- int (*dsa_keygen) (DSA *dsa);
+ int (*dsa_keygen)(DSA *dsa);
};
DSA_SIG *ossl_dsa_do_sign_int(const unsigned char *dgst, int dlen, DSA *dsa,
- unsigned int nonce_type, const char *digestname,
- OSSL_LIB_CTX *libctx, const char *propq);
+ unsigned int nonce_type, const char *digestname,
+ OSSL_LIB_CTX *libctx, const char *propq);
diff --git a/crypto/dsa/dsa_meth.c b/crypto/dsa/dsa_meth.c
index f2b759a9de..175630c290 100644
--- a/crypto/dsa/dsa_meth.c
+++ b/crypto/dsa/dsa_meth.c
@@ -100,71 +100,66 @@ int DSA_meth_set0_app_data(DSA_METHOD *dsam, void *app_data)
return 1;
}
-DSA_SIG *(*DSA_meth_get_sign(const DSA_METHOD *dsam))
- (const unsigned char *, int, DSA *)
+DSA_SIG *(*DSA_meth_get_sign(const DSA_METHOD *dsam))(const unsigned char *, int, DSA *)
{
return dsam->dsa_do_sign;
}
int DSA_meth_set_sign(DSA_METHOD *dsam,
- DSA_SIG *(*sign) (const unsigned char *, int, DSA *))
+ DSA_SIG *(*sign)(const unsigned char *, int, DSA *))
{
dsam->dsa_do_sign = sign;
return 1;
}
-int (*DSA_meth_get_sign_setup(const DSA_METHOD *dsam))
- (DSA *, BN_CTX *, BIGNUM **, BIGNUM **)
+int (*DSA_meth_get_sign_setup(const DSA_METHOD *dsam))(DSA *, BN_CTX *, BIGNUM **, BIGNUM **)
{
return dsam->dsa_sign_setup;
}
int DSA_meth_set_sign_setup(DSA_METHOD *dsam,
- int (*sign_setup) (DSA *, BN_CTX *, BIGNUM **, BIGNUM **))
+ int (*sign_setup)(DSA *, BN_CTX *, BIGNUM **, BIGNUM **))
{
dsam->dsa_sign_setup = sign_setup;
return 1;
}
-int (*DSA_meth_get_verify(const DSA_METHOD *dsam))
- (const unsigned char *, int, DSA_SIG *, DSA *)
+int (*DSA_meth_get_verify(const DSA_METHOD *dsam))(const unsigned char *, int, DSA_SIG *, DSA *)
{
return dsam->dsa_do_verify;
}
int DSA_meth_set_verify(DSA_METHOD *dsam,
- int (*verify) (const unsigned char *, int, DSA_SIG *, DSA *))
+ int (*verify)(const unsigned char *, int, DSA_SIG *, DSA *))
{
dsam->dsa_do_verify = verify;
return 1;
}
-int (*DSA_meth_get_mod_exp(const DSA_METHOD *dsam))
- (DSA *, BIGNUM *, const BIGNUM *, const BIGNUM *, const BIGNUM *,
- const BIGNUM *, const BIGNUM *, BN_CTX *, BN_MONT_CTX *)
+int (*DSA_meth_get_mod_exp(const DSA_METHOD *dsam))(DSA *, BIGNUM *, const BIGNUM *, const BIGNUM *, const BIGNUM *,
+ const BIGNUM *, const BIGNUM *, BN_CTX *, BN_MONT_CTX *)
{
return dsam->dsa_mod_exp;
}
int DSA_meth_set_mod_exp(DSA_METHOD *dsam,
- int (*mod_exp) (DSA *, BIGNUM *, const BIGNUM *, const BIGNUM *,
- const BIGNUM *, const BIGNUM *, const BIGNUM *, BN_CTX *,
- BN_MONT_CTX *))
+ int (*mod_exp)(DSA *, BIGNUM *, const BIGNUM *, const BIGNUM *,
+ const BIGNUM *, const BIGNUM *, const BIGNUM *, BN_CTX *,
+ BN_MONT_CTX *))
{
dsam->dsa_mod_exp = mod_exp;
return 1;
}
-int (*DSA_meth_get_bn_mod_exp(const DSA_METHOD *dsam))
- (DSA *, BIGNUM *, const BIGNUM *, const BIGNUM *, const BIGNUM *, BN_CTX *,
- BN_MONT_CTX *)
+int (*DSA_meth_get_bn_mod_exp(const DSA_METHOD *dsam))(DSA *, BIGNUM *, const BIGNUM *, const BIGNUM *, const BIGNUM *, BN_CTX *,
+ BN_MONT_CTX *)
{
return dsam->bn_mod_exp;
}
int DSA_meth_set_bn_mod_exp(DSA_METHOD *dsam,
- int (*bn_mod_exp) (DSA *, BIGNUM *, const BIGNUM *, const BIGNUM *,
- const BIGNUM *, BN_CTX *, BN_MONT_CTX *))
+ int (*bn_mod_exp)(DSA *, BIGNUM *, const BIGNUM *, const BIGNUM *,
+ const BIGNUM *, BN_CTX *, BN_MONT_CTX *))
{
dsam->bn_mod_exp = bn_mod_exp;
return 1;
@@ -181,38 +176,37 @@ int DSA_meth_set_init(DSA_METHOD *dsam, int (*init)(DSA *))
return 1;
}
-int (*DSA_meth_get_finish(const DSA_METHOD *dsam)) (DSA *)
+int (*DSA_meth_get_finish(const DSA_METHOD *dsam))(DSA *)
{
return dsam->finish;
}
-int DSA_meth_set_finish(DSA_METHOD *dsam, int (*finish) (DSA *))
+int DSA_meth_set_finish(DSA_METHOD *dsam, int (*finish)(DSA *))
{
dsam->finish = finish;
return 1;
}
-int (*DSA_meth_get_paramgen(const DSA_METHOD *dsam))
- (DSA *, int, const unsigned char *, int, int *, unsigned long *,
- BN_GENCB *)
+int (*DSA_meth_get_paramgen(const DSA_METHOD *dsam))(DSA *, int, const unsigned char *, int, int *, unsigned long *,
+ BN_GENCB *)
{
return dsam->dsa_paramgen;
}
int DSA_meth_set_paramgen(DSA_METHOD *dsam,
- int (*paramgen) (DSA *, int, const unsigned char *, int, int *,
- unsigned long *, BN_GENCB *))
+ int (*paramgen)(DSA *, int, const unsigned char *, int, int *,
+ unsigned long *, BN_GENCB *))
{
dsam->dsa_paramgen = paramgen;
return 1;
}
-int (*DSA_meth_get_keygen(const DSA_METHOD *dsam)) (DSA *)
+int (*DSA_meth_get_keygen(const DSA_METHOD *dsam))(DSA *)
{
return dsam->dsa_keygen;
}
-int DSA_meth_set_keygen(DSA_METHOD *dsam, int (*keygen) (DSA *))
+int DSA_meth_set_keygen(DSA_METHOD *dsam, int (*keygen)(DSA *))
{
dsam->dsa_keygen = keygen;
return 1;
diff --git a/crypto/dsa/dsa_ossl.c b/crypto/dsa/dsa_ossl.c
index a7c6930162..b6706cd52a 100644
--- a/crypto/dsa/dsa_ossl.c
+++ b/crypto/dsa/dsa_ossl.c
@@ -22,30 +22,30 @@
#include <openssl/asn1.h>
#include "internal/deterministic_nonce.h"
-#define MIN_DSA_SIGN_QBITS 128
+#define MIN_DSA_SIGN_QBITS 128
#define MAX_DSA_SIGN_RETRIES 8
static DSA_SIG *dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa);
static int dsa_sign_setup_no_digest(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp,
- BIGNUM **rp);
+ BIGNUM **rp);
static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp,
- BIGNUM **rp, const unsigned char *dgst, int dlen,
- unsigned int nonce_type, const char *digestname,
- OSSL_LIB_CTX *libctx, const char *propq);
+ BIGNUM **rp, const unsigned char *dgst, int dlen,
+ unsigned int nonce_type, const char *digestname,
+ OSSL_LIB_CTX *libctx, const char *propq);
static int dsa_do_verify(const unsigned char *dgst, int dgst_len,
- DSA_SIG *sig, DSA *dsa);
+ DSA_SIG *sig, DSA *dsa);
static int dsa_init(DSA *dsa);
static int dsa_finish(DSA *dsa);
static BIGNUM *dsa_mod_inverse_fermat(const BIGNUM *k, const BIGNUM *q,
- BN_CTX *ctx);
+ BN_CTX *ctx);
static const DSA_METHOD openssl_dsa_meth = {
"OpenSSL DSA method",
dsa_do_sign,
dsa_sign_setup_no_digest,
dsa_do_verify,
- NULL, /* dsa_mod_exp, */
- NULL, /* dsa_bn_mod_exp, */
+ NULL, /* dsa_mod_exp, */
+ NULL, /* dsa_bn_mod_exp, */
dsa_init,
dsa_finish,
DSA_FLAG_FIPS_METHOD,
@@ -74,8 +74,8 @@ const DSA_METHOD *DSA_OpenSSL(void)
}
DSA_SIG *ossl_dsa_do_sign_int(const unsigned char *dgst, int dlen, DSA *dsa,
- unsigned int nonce_type, const char *digestname,
- OSSL_LIB_CTX *libctx, const char *propq)
+ unsigned int nonce_type, const char *digestname,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
BIGNUM *kinv = NULL;
BIGNUM *m, *blind, *blindm, *tmp;
@@ -114,9 +114,9 @@ DSA_SIG *ossl_dsa_do_sign_int(const unsigned char *dgst, int dlen, DSA *dsa,
if (tmp == NULL)
goto err;
- redo:
+redo:
if (!dsa_sign_setup(dsa, ctx, &kinv, &ret->r, dgst, dlen,
- nonce_type, digestname, libctx, propq))
+ nonce_type, digestname, libctx, propq))
goto err;
if (dlen > BN_num_bytes(dsa->params.q))
@@ -145,7 +145,7 @@ DSA_SIG *ossl_dsa_do_sign_int(const unsigned char *dgst, int dlen, DSA *dsa,
*/
do {
if (!BN_priv_rand_ex(blind, BN_num_bits(dsa->params.q) - 1,
- BN_RAND_TOP_ANY, BN_RAND_BOTTOM_ANY, 0, ctx))
+ BN_RAND_TOP_ANY, BN_RAND_BOTTOM_ANY, 0, ctx))
goto err;
} while (BN_is_zero(blind));
BN_set_flags(blind, BN_FLG_CONSTTIME);
@@ -190,7 +190,7 @@ DSA_SIG *ossl_dsa_do_sign_int(const unsigned char *dgst, int dlen, DSA *dsa,
goto redo;
}
rv = 1;
- err:
+err:
if (rv == 0) {
ERR_raise(ERR_LIB_DSA, reason);
DSA_SIG_free(ret);
@@ -204,21 +204,21 @@ DSA_SIG *ossl_dsa_do_sign_int(const unsigned char *dgst, int dlen, DSA *dsa,
static DSA_SIG *dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa)
{
return ossl_dsa_do_sign_int(dgst, dlen, dsa,
- 0, NULL, NULL, NULL);
+ 0, NULL, NULL, NULL);
}
static int dsa_sign_setup_no_digest(DSA *dsa, BN_CTX *ctx_in,
- BIGNUM **kinvp, BIGNUM **rp)
+ BIGNUM **kinvp, BIGNUM **rp)
{
return dsa_sign_setup(dsa, ctx_in, kinvp, rp, NULL, 0,
- 0, NULL, NULL, NULL);
+ 0, NULL, NULL, NULL);
}
static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in,
- BIGNUM **kinvp, BIGNUM **rp,
- const unsigned char *dgst, int dlen,
- unsigned int nonce_type, const char *digestname,
- OSSL_LIB_CTX *libctx, const char *propq)
+ BIGNUM **kinvp, BIGNUM **rp,
+ const unsigned char *dgst, int dlen,
+ unsigned int nonce_type, const char *digestname,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
BN_CTX *ctx = NULL;
BIGNUM *k, *kinv = NULL, *r = *rp;
@@ -271,10 +271,10 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in,
if (nonce_type == 1) {
#ifndef FIPS_MODULE
if (!ossl_gen_deterministic_nonce_rfc6979(k, dsa->params.q,
- dsa->priv_key,
- dgst, dlen,
- digestname,
- libctx, propq))
+ dsa->priv_key,
+ dgst, dlen,
+ digestname,
+ libctx, propq))
#endif
goto err;
} else {
@@ -283,8 +283,8 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in,
* This protects the private key from a weak PRNG.
*/
if (!ossl_bn_gen_dsa_nonce_fixed_top(k, dsa->params.q,
- dsa->priv_key, dgst,
- dlen, ctx))
+ dsa->priv_key, dgst,
+ dlen, ctx))
goto err;
}
} else if (!ossl_bn_priv_rand_range_fixed_top(k, dsa->params.q, 0, ctx))
@@ -296,7 +296,7 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in,
if (dsa->flags & DSA_FLAG_CACHE_MONT_P) {
if (!BN_MONT_CTX_set_locked(&dsa->method_mont_p,
- dsa->lock, dsa->params.p, ctx))
+ dsa->lock, dsa->params.p, ctx))
goto err;
}
@@ -322,13 +322,13 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in,
BN_consttime_swap(BN_is_bit_set(l, q_bits), k, l, q_words + 2);
if ((dsa)->meth->bn_mod_exp != NULL) {
- if (!dsa->meth->bn_mod_exp(dsa, r, dsa->params.g, k, dsa->params.p,
- ctx, dsa->method_mont_p))
- goto err;
+ if (!dsa->meth->bn_mod_exp(dsa, r, dsa->params.g, k, dsa->params.p,
+ ctx, dsa->method_mont_p))
+ goto err;
} else {
- if (!BN_mod_exp_mont(r, dsa->params.g, k, dsa->params.p, ctx,
- dsa->method_mont_p))
- goto err;
+ if (!BN_mod_exp_mont(r, dsa->params.g, k, dsa->params.p, ctx,
+ dsa->method_mont_p))
+ goto err;
}
if (!BN_mod(r, r, dsa->params.q, ctx))
@@ -342,7 +342,7 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in,
*kinvp = kinv;
kinv = NULL;
ret = 1;
- err:
+err:
if (!ret)
ERR_raise(ERR_LIB_DSA, ERR_R_BN_LIB);
if (ctx != ctx_in)
@@ -353,7 +353,7 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in,
}
static int dsa_do_verify(const unsigned char *dgst, int dgst_len,
- DSA_SIG *sig, DSA *dsa)
+ DSA_SIG *sig, DSA *dsa)
{
BN_CTX *ctx;
BIGNUM *u1, *u2, *t1;
@@ -388,13 +388,11 @@ static int dsa_do_verify(const unsigned char *dgst, int dgst_len,
DSA_SIG_get0(sig, &r, &s);
- if (BN_is_zero(r) || BN_is_negative(r) ||
- BN_ucmp(r, dsa->params.q) >= 0) {
+ if (BN_is_zero(r) || BN_is_negative(r) || BN_ucmp(r, dsa->params.q) >= 0) {
ret = 0;
goto err;
}
- if (BN_is_zero(s) || BN_is_negative(s) ||
- BN_ucmp(s, dsa->params.q) >= 0) {
+ if (BN_is_zero(s) || BN_is_negative(s) || BN_ucmp(s, dsa->params.q) >= 0) {
ret = 0;
goto err;
}
@@ -426,18 +424,18 @@ static int dsa_do_verify(const unsigned char *dgst, int dgst_len,
if (dsa->flags & DSA_FLAG_CACHE_MONT_P) {
mont = BN_MONT_CTX_set_locked(&dsa->method_mont_p,
- dsa->lock, dsa->params.p, ctx);
+ dsa->lock, dsa->params.p, ctx);
if (!mont)
goto err;
}
if (dsa->meth->dsa_mod_exp != NULL) {
if (!dsa->meth->dsa_mod_exp(dsa, t1, dsa->params.g, u1, dsa->pub_key, u2,
- dsa->params.p, ctx, mont))
+ dsa->params.p, ctx, mont))
goto err;
} else {
if (!BN_mod_exp2_mont(t1, dsa->params.g, u1, dsa->pub_key, u2,
- dsa->params.p, ctx, mont))
+ dsa->params.p, ctx, mont))
goto err;
}
@@ -450,7 +448,7 @@ static int dsa_do_verify(const unsigned char *dgst, int dgst_len,
*/
ret = (BN_ucmp(u1, r) == 0);
- err:
+err:
if (ret < 0)
ERR_raise(ERR_LIB_DSA, ERR_R_BN_LIB);
BN_CTX_free(ctx);
@@ -481,7 +479,7 @@ static int dsa_finish(DSA *dsa)
* BIGNUM is returned which the caller must free.
*/
static BIGNUM *dsa_mod_inverse_fermat(const BIGNUM *k, const BIGNUM *q,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
BIGNUM *res = NULL;
BIGNUM *r, *e;
@@ -491,9 +489,9 @@ static BIGNUM *dsa_mod_inverse_fermat(const BIGNUM *k, const BIGNUM *q,
BN_CTX_start(ctx);
if ((e = BN_CTX_get(ctx)) != NULL
- && BN_set_word(r, 2)
- && BN_sub(e, q, r)
- && BN_mod_exp_mont(r, k, e, q, ctx, NULL))
+ && BN_set_word(r, 2)
+ && BN_sub(e, q, r)
+ && BN_mod_exp_mont(r, k, e, q, ctx, NULL))
res = r;
else
BN_free(r);
diff --git a/crypto/dsa/dsa_pmeth.c b/crypto/dsa/dsa_pmeth.c
index e8ca609bdf..5f92f71a75 100644
--- a/crypto/dsa/dsa_pmeth.c
+++ b/crypto/dsa/dsa_pmeth.c
@@ -26,13 +26,13 @@
typedef struct {
/* Parameter gen parameters */
- int nbits; /* size of p in bits (default: 2048) */
- int qbits; /* size of q in bits (default: 224) */
- const EVP_MD *pmd; /* MD for parameter generation */
+ int nbits; /* size of p in bits (default: 2048) */
+ int qbits; /* size of q in bits (default: 224) */
+ const EVP_MD *pmd; /* MD for parameter generation */
/* Keygen callback info */
int gentmp[2];
/* message digest */
- const EVP_MD *md; /* MD for the signature */
+ const EVP_MD *md; /* MD for the signature */
} DSA_PKEY_CTX;
static int pkey_dsa_init(EVP_PKEY_CTX *ctx)
@@ -75,8 +75,8 @@ static void pkey_dsa_cleanup(EVP_PKEY_CTX *ctx)
}
static int pkey_dsa_sign(EVP_PKEY_CTX *ctx, unsigned char *sig,
- size_t *siglen, const unsigned char *tbs,
- size_t tbslen)
+ size_t *siglen, const unsigned char *tbs,
+ size_t tbslen)
{
int ret, md_size;
unsigned int sltmp;
@@ -105,8 +105,8 @@ static int pkey_dsa_sign(EVP_PKEY_CTX *ctx, unsigned char *sig,
}
static int pkey_dsa_verify(EVP_PKEY_CTX *ctx,
- const unsigned char *sig, size_t siglen,
- const unsigned char *tbs, size_t tbslen)
+ const unsigned char *sig, size_t siglen,
+ const unsigned char *tbs, size_t tbslen)
{
int ret, md_size;
DSA_PKEY_CTX *dctx = ctx->data;
@@ -148,9 +148,7 @@ static int pkey_dsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
return 1;
case EVP_PKEY_CTRL_DSA_PARAMGEN_MD:
- if (EVP_MD_get_type((const EVP_MD *)p2) != NID_sha1 &&
- EVP_MD_get_type((const EVP_MD *)p2) != NID_sha224 &&
- EVP_MD_get_type((const EVP_MD *)p2) != NID_sha256) {
+ if (EVP_MD_get_type((const EVP_MD *)p2) != NID_sha1 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha224 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha256) {
ERR_raise(ERR_LIB_DSA, DSA_R_INVALID_DIGEST_TYPE);
return 0;
}
@@ -158,17 +156,7 @@ static int pkey_dsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
return 1;
case EVP_PKEY_CTRL_MD:
- if (EVP_MD_get_type((const EVP_MD *)p2) != NID_sha1 &&
- EVP_MD_get_type((const EVP_MD *)p2) != NID_dsa &&
- EVP_MD_get_type((const EVP_MD *)p2) != NID_dsaWithSHA &&
- EVP_MD_get_type((const EVP_MD *)p2) != NID_sha224 &&
- EVP_MD_get_type((const EVP_MD *)p2) != NID_sha256 &&
- EVP_MD_get_type((const EVP_MD *)p2) != NID_sha384 &&
- EVP_MD_get_type((const EVP_MD *)p2) != NID_sha512 &&
- EVP_MD_get_type((const EVP_MD *)p2) != NID_sha3_224 &&
- EVP_MD_get_type((const EVP_MD *)p2) != NID_sha3_256 &&
- EVP_MD_get_type((const EVP_MD *)p2) != NID_sha3_384 &&
- EVP_MD_get_type((const EVP_MD *)p2) != NID_sha3_512) {
+ if (EVP_MD_get_type((const EVP_MD *)p2) != NID_sha1 && EVP_MD_get_type((const EVP_MD *)p2) != NID_dsa && EVP_MD_get_type((const EVP_MD *)p2) != NID_dsaWithSHA && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha224 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha256 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha384 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha512 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha3_224 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha3_256 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha3_384 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha3_512) {
ERR_raise(ERR_LIB_DSA, DSA_R_INVALID_DIGEST_TYPE);
return 0;
}
@@ -189,12 +177,11 @@ static int pkey_dsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
return -2;
default:
return -2;
-
}
}
static int pkey_dsa_ctrl_str(EVP_PKEY_CTX *ctx,
- const char *type, const char *value)
+ const char *type, const char *value)
{
if (strcmp(type, "dsa_paramgen_bits") == 0) {
int nbits;
@@ -240,8 +227,8 @@ static int pkey_dsa_paramgen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
ossl_ffc_set_digest(&dsa->params, EVP_MD_get0_name(dctx->md), NULL);
ret = ossl_ffc_params_FIPS186_4_generate(NULL, &dsa->params,
- FFC_PARAM_TYPE_DSA, dctx->nbits,
- dctx->qbits, &res, pcb);
+ FFC_PARAM_TYPE_DSA, dctx->nbits,
+ dctx->qbits, &res, pcb);
BN_GENCB_free(pcb);
if (ret > 0)
EVP_PKEY_assign_DSA(pkey, dsa);
diff --git a/crypto/dsa/dsa_sign.c b/crypto/dsa/dsa_sign.c
index aab7953c0d..e5abd3632e 100644
--- a/crypto/dsa/dsa_sign.c
+++ b/crypto/dsa/dsa_sign.c
@@ -86,7 +86,7 @@ int i2d_DSA_SIG(const DSA_SIG *sig, unsigned char **ppout)
return -1;
} else if (*ppout == NULL) {
if ((buf = BUF_MEM_new()) == NULL
- || !WPACKET_init_len(&pkt, buf, 0)) {
+ || !WPACKET_init_len(&pkt, buf, 0)) {
BUF_MEM_free(buf);
return -1;
}
@@ -96,8 +96,8 @@ int i2d_DSA_SIG(const DSA_SIG *sig, unsigned char **ppout)
}
if (!ossl_encode_der_dsa_sig(&pkt, sig->r, sig->s)
- || !WPACKET_get_total_written(&pkt, &encoded_len)
- || !WPACKET_finish(&pkt)) {
+ || !WPACKET_get_total_written(&pkt, &encoded_len)
+ || !WPACKET_finish(&pkt)) {
BUF_MEM_free(buf);
WPACKET_cleanup(&pkt);
return -1;
@@ -151,9 +151,9 @@ int DSA_SIG_set0(DSA_SIG *sig, BIGNUM *r, BIGNUM *s)
}
int ossl_dsa_sign_int(int type, const unsigned char *dgst, int dlen,
- unsigned char *sig, unsigned int *siglen, DSA *dsa,
- unsigned int nonce_type, const char *digestname,
- OSSL_LIB_CTX *libctx, const char *propq)
+ unsigned char *sig, unsigned int *siglen, DSA *dsa,
+ unsigned int nonce_type, const char *digestname,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
DSA_SIG *s;
@@ -167,7 +167,7 @@ int ossl_dsa_sign_int(int type, const unsigned char *dgst, int dlen,
s = DSA_do_sign(dgst, dlen, dsa);
else
s = ossl_dsa_do_sign_int(dgst, dlen, dsa,
- nonce_type, digestname, libctx, propq);
+ nonce_type, digestname, libctx, propq);
if (s == NULL) {
*siglen = 0;
return 0;
@@ -178,10 +178,10 @@ int ossl_dsa_sign_int(int type, const unsigned char *dgst, int dlen,
}
int DSA_sign(int type, const unsigned char *dgst, int dlen,
- unsigned char *sig, unsigned int *siglen, DSA *dsa)
+ unsigned char *sig, unsigned int *siglen, DSA *dsa)
{
return ossl_dsa_sign_int(type, dgst, dlen, sig, siglen, dsa,
- 0, NULL, NULL, NULL);
+ 0, NULL, NULL, NULL);
}
/* data has already been hashed (probably with SHA or SHA-1). */
@@ -192,7 +192,7 @@ int DSA_sign(int type, const unsigned char *dgst, int dlen,
* -1: error
*/
int DSA_verify(int type, const unsigned char *dgst, int dgst_len,
- const unsigned char *sigbuf, int siglen, DSA *dsa)
+ const unsigned char *sigbuf, int siglen, DSA *dsa)
{
DSA_SIG *s;
const unsigned char *p = sigbuf;
@@ -210,7 +210,7 @@ int DSA_verify(int type, const unsigned char *dgst, int dgst_len,
if (derlen != siglen || memcmp(sigbuf, der, derlen))
goto err;
ret = DSA_do_verify(dgst, dgst_len, s, dsa);
- err:
+err:
OPENSSL_clear_free(der, derlen);
DSA_SIG_free(s);
return ret;
diff --git a/crypto/dsa/dsa_vrf.c b/crypto/dsa/dsa_vrf.c
index b0a9d965d9..0fca0b24d4 100644
--- a/crypto/dsa/dsa_vrf.c
+++ b/crypto/dsa/dsa_vrf.c
@@ -17,7 +17,7 @@
#include "dsa_local.h"
int DSA_do_verify(const unsigned char *dgst, int dgst_len, DSA_SIG *sig,
- DSA *dsa)
+ DSA *dsa)
{
return dsa->meth->dsa_do_verify(dgst, dgst_len, sig, dsa);
}
diff --git a/crypto/dso/dso_dl.c b/crypto/dso/dso_dl.c
index 7bfb02093b..ff51764dea 100644
--- a/crypto/dso/dso_dl.c
+++ b/crypto/dso/dso_dl.c
@@ -11,17 +11,17 @@
#ifdef DSO_DL
-# include <dl.h>
+#include <dl.h>
/* Part of the hack in "dl_load" ... */
-# define DSO_MAX_TRANSLATED_SIZE 256
+#define DSO_MAX_TRANSLATED_SIZE 256
static int dl_load(DSO *dso);
static int dl_unload(DSO *dso);
static DSO_FUNC_TYPE dl_bind_func(DSO *dso, const char *symname);
static char *dl_name_converter(DSO *dso, const char *filename);
static char *dl_merger(DSO *dso, const char *filespec1,
- const char *filespec2);
+ const char *filespec2);
static int dl_pathbyaddr(void *addr, char *path, int sz);
static void *dl_globallookup(const char *name);
@@ -30,11 +30,11 @@ static DSO_METHOD dso_meth_dl = {
dl_load,
dl_unload,
dl_bind_func,
- NULL, /* ctrl */
+ NULL, /* ctrl */
dl_name_converter,
dl_merger,
- NULL, /* init */
- NULL, /* finish */
+ NULL, /* init */
+ NULL, /* finish */
dl_pathbyaddr,
dl_globallookup
};
@@ -64,18 +64,16 @@ static int dl_load(DSO *dso)
ERR_raise(ERR_LIB_DSO, DSO_R_NO_FILENAME);
goto err;
}
- ptr = shl_load(filename, BIND_IMMEDIATE |
- (dso->flags & DSO_FLAG_NO_NAME_TRANSLATION ? 0 :
- DYNAMIC_PATH), 0L);
+ ptr = shl_load(filename, BIND_IMMEDIATE | (dso->flags & DSO_FLAG_NO_NAME_TRANSLATION ? 0 : DYNAMIC_PATH), 0L);
if (ptr == NULL) {
char errbuf[160];
if (openssl_strerror_r(errno, errbuf, sizeof(errbuf)))
ERR_raise_data(ERR_LIB_DSO, DSO_R_LOAD_FAILED,
- "filename(%s): %s", filename, errbuf);
+ "filename(%s): %s", filename, errbuf);
else
ERR_raise_data(ERR_LIB_DSO, DSO_R_LOAD_FAILED,
- "filename(%s): errno %d", filename, errno);
+ "filename(%s): errno %d", filename, errno);
goto err;
}
if (!sk_push(dso->meth_data, (char *)ptr)) {
@@ -88,7 +86,7 @@ static int dl_load(DSO *dso)
*/
dso->loaded_filename = filename;
return 1;
- err:
+err:
/* Cleanup! */
OPENSSL_free(filename);
if (ptr != NULL)
@@ -106,7 +104,7 @@ static int dl_unload(DSO *dso)
if (sk_num(dso->meth_data) < 1)
return 1;
/* Is this statement legal? */
- ptr = (shl_t) sk_pop(dso->meth_data);
+ ptr = (shl_t)sk_pop(dso->meth_data);
if (ptr == NULL) {
ERR_raise(ERR_LIB_DSO, DSO_R_NULL_HANDLE);
/*
@@ -132,7 +130,7 @@ static DSO_FUNC_TYPE dl_bind_func(DSO *dso, const char *symname)
ERR_raise(ERR_LIB_DSO, DSO_R_STACK_ERROR);
return NULL;
}
- ptr = (shl_t) sk_value(dso->meth_data, sk_num(dso->meth_data) - 1);
+ ptr = (shl_t)sk_value(dso->meth_data, sk_num(dso->meth_data) - 1);
if (ptr == NULL) {
ERR_raise(ERR_LIB_DSO, DSO_R_NULL_HANDLE);
return NULL;
@@ -142,10 +140,10 @@ static DSO_FUNC_TYPE dl_bind_func(DSO *dso, const char *symname)
if (openssl_strerror_r(errno, errbuf, sizeof(errbuf)))
ERR_raise_data(ERR_LIB_DSO, DSO_R_SYM_FAILURE,
- "symname(%s): %s", symname, errbuf);
+ "symname(%s): %s", symname, errbuf);
else
ERR_raise_data(ERR_LIB_DSO, DSO_R_SYM_FAILURE,
- "symname(%s): errno %d", symname, errno);
+ "symname(%s): errno %d", symname, errno);
return NULL;
}
return (DSO_FUNC_TYPE)sym;
@@ -176,13 +174,13 @@ static char *dl_merger(DSO *dso, const char *filespec1, const char *filespec2)
if (merged == NULL)
return NULL;
} else
- /*
- * This part isn't as trivial as it looks. It assumes that the
- * second file specification really is a directory, and makes no
- * checks whatsoever. Therefore, the result becomes the
- * concatenation of filespec2 followed by a slash followed by
- * filespec1.
- */
+ /*
+ * This part isn't as trivial as it looks. It assumes that the
+ * second file specification really is a directory, and makes no
+ * checks whatsoever. Therefore, the result becomes the
+ * concatenation of filespec2 followed by a slash followed by
+ * filespec1.
+ */
{
int spec2len, len;
@@ -222,7 +220,7 @@ static char *dl_name_converter(DSO *dso, const char *filename)
/* We will convert this to "%s.s?" or "lib%s.s?" */
rsize += strlen(DSO_EXTENSION); /* The length of ".s?" */
if ((DSO_flags(dso) & DSO_FLAG_NAME_TRANSLATION_EXT_ONLY) == 0)
- rsize += 3; /* The length of "lib" */
+ rsize += 3; /* The length of "lib" */
}
translated = OPENSSL_malloc(rsize);
if (translated == NULL) {
@@ -231,8 +229,10 @@ static char *dl_name_converter(DSO *dso, const char *filename)
}
if (transform)
BIO_snprintf(translated, rsize,
- (DSO_flags(dso) & DSO_FLAG_NAME_TRANSLATION_EXT_ONLY) == 0
- ? "lib%s%s" : "%s%s", filename, DSO_EXTENSION);
+ (DSO_flags(dso) & DSO_FLAG_NAME_TRANSLATION_EXT_ONLY) == 0
+ ? "lib%s%s"
+ : "%s%s",
+ filename, DSO_EXTENSION);
else
BIO_snprintf(translated, rsize, "%s", filename);
return translated;
@@ -245,7 +245,7 @@ static int dl_pathbyaddr(void *addr, char *path, int sz)
if (addr == NULL) {
union {
- int (*f) (void *, char *, int);
+ int (*f)(void *, char *, int);
void *p;
} t = {
dl_pathbyaddr
@@ -254,8 +254,7 @@ static int dl_pathbyaddr(void *addr, char *path, int sz)
}
for (i = -1; shl_get_r(i, &inf) == 0; i++) {
- if (((size_t)addr >= inf.tstart && (size_t)addr < inf.tend) ||
- ((size_t)addr >= inf.dstart && (size_t)addr < inf.dend)) {
+ if (((size_t)addr >= inf.tstart && (size_t)addr < inf.tend) || ((size_t)addr >= inf.dstart && (size_t)addr < inf.dend)) {
len = (int)strlen(inf.filename);
if (sz <= 0)
return len + 1;
@@ -277,4 +276,4 @@ static void *dl_globallookup(const char *name)
return shl_findsym(&h, name, TYPE_UNDEFINED, &ret) ? NULL : ret;
}
-#endif /* DSO_DL */
+#endif /* DSO_DL */
diff --git a/crypto/dso/dso_dlfcn.c b/crypto/dso/dso_dlfcn.c
index b5a7b7be2c..2649300974 100644
--- a/crypto/dso/dso_dlfcn.c
+++ b/crypto/dso/dso_dlfcn.c
@@ -13,7 +13,7 @@
* too late, because those headers are protected from re- inclusion.
*/
#ifndef _GNU_SOURCE
-# define _GNU_SOURCE /* make sure dladdr is declared */
+#define _GNU_SOURCE /* make sure dladdr is declared */
#endif
#include "dso_local.h"
@@ -21,29 +21,26 @@
#ifdef DSO_DLFCN
-# ifdef HAVE_DLFCN_H
-# ifdef __osf__
-# define __EXTENSIONS__
-# endif
-# include <dlfcn.h>
-# define HAVE_DLINFO 1
-# if defined(__SCO_VERSION__) || defined(_SCO_ELF) || \
- (defined(__osf__) && !defined(RTLD_NEXT)) || \
- (defined(__OpenBSD__) && !defined(RTLD_SELF)) || \
- defined(__ANDROID__) || defined(__TANDEM)
-# undef HAVE_DLINFO
-# endif
-# endif
+#ifdef HAVE_DLFCN_H
+#ifdef __osf__
+#define __EXTENSIONS__
+#endif
+#include <dlfcn.h>
+#define HAVE_DLINFO 1
+#if defined(__SCO_VERSION__) || defined(_SCO_ELF) || (defined(__osf__) && !defined(RTLD_NEXT)) || (defined(__OpenBSD__) && !defined(RTLD_SELF)) || defined(__ANDROID__) || defined(__TANDEM)
+#undef HAVE_DLINFO
+#endif
+#endif
/* Part of the hack in "dlfcn_load" ... */
-# define DSO_MAX_TRANSLATED_SIZE 256
+#define DSO_MAX_TRANSLATED_SIZE 256
static int dlfcn_load(DSO *dso);
static int dlfcn_unload(DSO *dso);
static DSO_FUNC_TYPE dlfcn_bind_func(DSO *dso, const char *symname);
static char *dlfcn_name_converter(DSO *dso, const char *filename);
static char *dlfcn_merger(DSO *dso, const char *filespec1,
- const char *filespec2);
+ const char *filespec2);
static int dlfcn_pathbyaddr(void *addr, char *path, int sz);
static void *dlfcn_globallookup(const char *name);
@@ -52,11 +49,11 @@ static DSO_METHOD dso_meth_dlfcn = {
dlfcn_load,
dlfcn_unload,
dlfcn_bind_func,
- NULL, /* ctrl */
+ NULL, /* ctrl */
dlfcn_name_converter,
dlfcn_merger,
- NULL, /* init */
- NULL, /* finish */
+ NULL, /* init */
+ NULL, /* finish */
dlfcn_pathbyaddr,
dlfcn_globallookup
};
@@ -74,19 +71,19 @@ DSO_METHOD *DSO_METHOD_openssl(void)
* relatively easily to deal with cases as we find them. Initially this is to
* cope with OpenBSD.
*/
-# if defined(__OpenBSD__) || defined(__NetBSD__)
-# ifdef DL_LAZY
-# define DLOPEN_FLAG DL_LAZY
-# else
-# ifdef RTLD_NOW
-# define DLOPEN_FLAG RTLD_NOW
-# else
-# define DLOPEN_FLAG 0
-# endif
-# endif
-# else
-# define DLOPEN_FLAG RTLD_NOW /* Hope this works everywhere else */
-# endif
+#if defined(__OpenBSD__) || defined(__NetBSD__)
+#ifdef DL_LAZY
+#define DLOPEN_FLAG DL_LAZY
+#else
+#ifdef RTLD_NOW
+#define DLOPEN_FLAG RTLD_NOW
+#else
+#define DLOPEN_FLAG 0
+#endif
+#endif
+#else
+#define DLOPEN_FLAG RTLD_NOW /* Hope this works everywhere else */
+#endif
/*
* For this DSO_METHOD, our meth_data STACK will contain; (i) the handle
@@ -105,18 +102,18 @@ static int dlfcn_load(DSO *dso)
ERR_raise(ERR_LIB_DSO, DSO_R_NO_FILENAME);
goto err;
}
-# ifdef RTLD_GLOBAL
+#ifdef RTLD_GLOBAL
if (dso->flags & DSO_FLAG_GLOBAL_SYMBOLS)
flags |= RTLD_GLOBAL;
-# endif
-# ifdef _AIX
+#endif
+#ifdef _AIX
if (filename[strlen(filename) - 1] == ')')
flags |= RTLD_MEMBER;
-# endif
+#endif
ptr = dlopen(filename, flags);
if (ptr == NULL) {
ERR_raise_data(ERR_LIB_DSO, DSO_R_LOAD_FAILED,
- "filename(%s): %s", filename, dlerror());
+ "filename(%s): %s", filename, dlerror());
goto err;
}
/*
@@ -131,7 +128,7 @@ static int dlfcn_load(DSO *dso)
/* Success */
dso->loaded_filename = filename;
return 1;
- err:
+err:
/* Cleanup! */
OPENSSL_free(filename);
if (ptr != NULL)
@@ -186,14 +183,14 @@ static DSO_FUNC_TYPE dlfcn_bind_func(DSO *dso, const char *symname)
u.dlret = dlsym(ptr, symname);
if (u.dlret == NULL) {
ERR_raise_data(ERR_LIB_DSO, DSO_R_SYM_FAILURE,
- "symname(%s): %s", symname, dlerror());
+ "symname(%s): %s", symname, dlerror());
return NULL;
}
return u.sym;
}
static char *dlfcn_merger(DSO *dso, const char *filespec1,
- const char *filespec2)
+ const char *filespec2)
{
char *merged;
@@ -254,9 +251,9 @@ static char *dlfcn_name_converter(DSO *dso, const char *filename)
transform = (strchr(filename, '/') == NULL);
if (transform) {
/* We will convert this to "%s.so" or "lib%s.so" etc */
- rsize += strlen(DSO_EXTENSION); /* The length of ".so" */
+ rsize += strlen(DSO_EXTENSION); /* The length of ".so" */
if ((DSO_flags(dso) & DSO_FLAG_NAME_TRANSLATION_EXT_ONLY) == 0)
- rsize += 3; /* The length of "lib" */
+ rsize += 3; /* The length of "lib" */
}
translated = OPENSSL_malloc(rsize);
if (translated == NULL) {
@@ -274,7 +271,7 @@ static char *dlfcn_name_converter(DSO *dso, const char *filename)
return translated;
}
-# ifdef __sgi
+#ifdef __sgi
/*-
This is a quote from IRIX manual for dladdr(3c):
@@ -288,9 +285,9 @@ This is a quote from IRIX manual for dladdr(3c):
intention to change this interface, so on a practical level, the code
below is safe to use on IRIX.
*/
-# include <rld_interface.h>
-# ifndef _RLD_INTERFACE_DLFCN_H_DLADDR
-# define _RLD_INTERFACE_DLFCN_H_DLADDR
+#include <rld_interface.h>
+#ifndef _RLD_INTERFACE_DLFCN_H_DLADDR
+#define _RLD_INTERFACE_DLFCN_H_DLADDR
typedef struct Dl_info {
const char *dli_fname;
void *dli_fbase;
@@ -300,10 +297,10 @@ typedef struct Dl_info {
int dli_reserved1;
long dli_reserved[4];
} Dl_info;
-# else
+#else
typedef struct Dl_info Dl_info;
-# endif
-# define _RLD_DLADDR 14
+#endif
+#define _RLD_DLADDR 14
static int dladdr(void *address, Dl_info *dl)
{
@@ -311,18 +308,18 @@ static int dladdr(void *address, Dl_info *dl)
v = _rld_new_interface(_RLD_DLADDR, address, dl);
return (int)v;
}
-# endif /* __sgi */
+#endif /* __sgi */
-# ifdef _AIX
+#ifdef _AIX
/*-
* See IBM's AIX Version 7.2, Technical Reference:
* Base Operating System and Extensions, Volume 1 and 2
* https://www.ibm.com/support/knowledgecenter/ssw_aix_72/com.ibm.aix.base/technicalreferences.htm
*/
-# include <sys/ldr.h>
-# include <errno.h>
+#include <sys/ldr.h>
+#include <errno.h>
/* ~ 64 * (sizeof(struct ld_info) + _XOPEN_PATH_MAX + _XOPEN_NAME_MAX) */
-# define DLFCN_LDINFO_SIZE 86976
+#define DLFCN_LDINFO_SIZE 86976
typedef struct Dl_info {
const char *dli_fname;
} Dl_info;
@@ -359,11 +356,9 @@ static int dladdr(void *ptr, Dl_info *dl)
do {
this_ldi = next_ldi;
if (((addr >= (uintptr_t)this_ldi->ldinfo_textorg)
- && (addr < ((uintptr_t)this_ldi->ldinfo_textorg +
- this_ldi->ldinfo_textsize)))
+ && (addr < ((uintptr_t)this_ldi->ldinfo_textorg + this_ldi->ldinfo_textsize)))
|| ((addr >= (uintptr_t)this_ldi->ldinfo_dataorg)
- && (addr < ((uintptr_t)this_ldi->ldinfo_dataorg +
- this_ldi->ldinfo_datasize)))) {
+ && (addr < ((uintptr_t)this_ldi->ldinfo_dataorg + this_ldi->ldinfo_datasize)))) {
char *buffer, *member;
size_t buffer_sz, member_len;
@@ -389,24 +384,23 @@ static int dladdr(void *ptr, Dl_info *dl)
errno = ENOMEM;
}
} else {
- next_ldi = (struct ld_info *)((uintptr_t)this_ldi +
- this_ldi->ldinfo_next);
+ next_ldi = (struct ld_info *)((uintptr_t)this_ldi + this_ldi->ldinfo_next);
}
} while (this_ldi->ldinfo_next && !found);
OPENSSL_free((void *)ldinfos);
return (found && dl->dli_fname != NULL);
}
-# endif /* _AIX */
+#endif /* _AIX */
static int dlfcn_pathbyaddr(void *addr, char *path, int sz)
{
-# ifdef HAVE_DLINFO
+#ifdef HAVE_DLINFO
Dl_info dli;
int len;
if (addr == NULL) {
union {
- int (*f) (void *, char *, int);
+ int (*f)(void *, char *, int);
void *p;
} t = {
dlfcn_pathbyaddr
@@ -417,23 +411,23 @@ static int dlfcn_pathbyaddr(void *addr, char *path, int sz)
if (dladdr(addr, &dli)) {
len = (int)strlen(dli.dli_fname);
if (sz <= 0) {
-# ifdef _AIX
+#ifdef _AIX
OPENSSL_free((void *)dli.dli_fname);
-# endif
+#endif
return len + 1;
}
if (len >= sz)
len = sz - 1;
memcpy(path, dli.dli_fname, len);
path[len++] = 0;
-# ifdef _AIX
+#ifdef _AIX
OPENSSL_free((void *)dli.dli_fname);
-# endif
+#endif
return len;
}
ERR_add_error_data(2, "dlfcn_pathbyaddr(): ", dlerror());
-# endif
+#endif
return -1;
}
@@ -448,4 +442,4 @@ static void *dlfcn_globallookup(const char *name)
return ret;
}
-#endif /* DSO_DLFCN */
+#endif /* DSO_DLFCN */
diff --git a/crypto/dso/dso_err.c b/crypto/dso/dso_err.c
index 6934a1b364..ec55b9a30a 100644
--- a/crypto/dso/dso_err.c
+++ b/crypto/dso/dso_err.c
@@ -14,34 +14,34 @@
#ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA DSO_str_reasons[] = {
- {ERR_PACK(ERR_LIB_DSO, 0, DSO_R_CTRL_FAILED), "control command failed"},
- {ERR_PACK(ERR_LIB_DSO, 0, DSO_R_DSO_ALREADY_LOADED), "dso already loaded"},
- {ERR_PACK(ERR_LIB_DSO, 0, DSO_R_EMPTY_FILE_STRUCTURE),
- "empty file structure"},
- {ERR_PACK(ERR_LIB_DSO, 0, DSO_R_FAILURE), "failure"},
- {ERR_PACK(ERR_LIB_DSO, 0, DSO_R_FILENAME_TOO_BIG), "filename too big"},
- {ERR_PACK(ERR_LIB_DSO, 0, DSO_R_FINISH_FAILED),
- "cleanup method function failed"},
- {ERR_PACK(ERR_LIB_DSO, 0, DSO_R_INCORRECT_FILE_SYNTAX),
- "incorrect file syntax"},
- {ERR_PACK(ERR_LIB_DSO, 0, DSO_R_LOAD_FAILED),
- "could not load the shared library"},
- {ERR_PACK(ERR_LIB_DSO, 0, DSO_R_NAME_TRANSLATION_FAILED),
- "name translation failed"},
- {ERR_PACK(ERR_LIB_DSO, 0, DSO_R_NO_FILENAME), "no filename"},
- {ERR_PACK(ERR_LIB_DSO, 0, DSO_R_NULL_HANDLE),
- "a null shared library handle was used"},
- {ERR_PACK(ERR_LIB_DSO, 0, DSO_R_SET_FILENAME_FAILED),
- "set filename failed"},
- {ERR_PACK(ERR_LIB_DSO, 0, DSO_R_STACK_ERROR),
- "the meth_data stack is corrupt"},
- {ERR_PACK(ERR_LIB_DSO, 0, DSO_R_SYM_FAILURE),
- "could not bind to the requested symbol name"},
- {ERR_PACK(ERR_LIB_DSO, 0, DSO_R_UNLOAD_FAILED),
- "could not unload the shared library"},
- {ERR_PACK(ERR_LIB_DSO, 0, DSO_R_UNSUPPORTED),
- "functionality not supported"},
- {0, NULL}
+ { ERR_PACK(ERR_LIB_DSO, 0, DSO_R_CTRL_FAILED), "control command failed" },
+ { ERR_PACK(ERR_LIB_DSO, 0, DSO_R_DSO_ALREADY_LOADED), "dso already loaded" },
+ { ERR_PACK(ERR_LIB_DSO, 0, DSO_R_EMPTY_FILE_STRUCTURE),
+ "empty file structure" },
+ { ERR_PACK(ERR_LIB_DSO, 0, DSO_R_FAILURE), "failure" },
+ { ERR_PACK(ERR_LIB_DSO, 0, DSO_R_FILENAME_TOO_BIG), "filename too big" },
+ { ERR_PACK(ERR_LIB_DSO, 0, DSO_R_FINISH_FAILED),
+ "cleanup method function failed" },
+ { ERR_PACK(ERR_LIB_DSO, 0, DSO_R_INCORRECT_FILE_SYNTAX),
+ "incorrect file syntax" },
+ { ERR_PACK(ERR_LIB_DSO, 0, DSO_R_LOAD_FAILED),
+ "could not load the shared library" },
+ { ERR_PACK(ERR_LIB_DSO, 0, DSO_R_NAME_TRANSLATION_FAILED),
+ "name translation failed" },
+ { ERR_PACK(ERR_LIB_DSO, 0, DSO_R_NO_FILENAME), "no filename" },
+ { ERR_PACK(ERR_LIB_DSO, 0, DSO_R_NULL_HANDLE),
+ "a null shared library handle was used" },
+ { ERR_PACK(ERR_LIB_DSO, 0, DSO_R_SET_FILENAME_FAILED),
+ "set filename failed" },
+ { ERR_PACK(ERR_LIB_DSO, 0, DSO_R_STACK_ERROR),
+ "the meth_data stack is corrupt" },
+ { ERR_PACK(ERR_LIB_DSO, 0, DSO_R_SYM_FAILURE),
+ "could not bind to the requested symbol name" },
+ { ERR_PACK(ERR_LIB_DSO, 0, DSO_R_UNLOAD_FAILED),
+ "could not unload the shared library" },
+ { ERR_PACK(ERR_LIB_DSO, 0, DSO_R_UNSUPPORTED),
+ "functionality not supported" },
+ { 0, NULL }
};
#endif
diff --git a/crypto/dso/dso_lib.c b/crypto/dso/dso_lib.c
index 65579cb8b3..6f51e4d35a 100644
--- a/crypto/dso/dso_lib.c
+++ b/crypto/dso/dso_lib.c
@@ -149,7 +149,7 @@ DSO *DSO_load(DSO *dso, const char *filename, DSO_METHOD *meth, int flags)
}
/* Load succeeded */
return ret;
- err:
+err:
if (allocated)
DSO_free(ret);
return NULL;
@@ -296,7 +296,7 @@ int DSO_pathbyaddr(void *addr, char *path, int sz)
ERR_raise(ERR_LIB_DSO, DSO_R_UNSUPPORTED);
return -1;
}
- return (*meth->pathbyaddr) (addr, path, sz);
+ return (*meth->pathbyaddr)(addr, path, sz);
}
DSO *DSO_dsobyaddr(void *addr, int flags)
@@ -310,7 +310,7 @@ DSO *DSO_dsobyaddr(void *addr, int flags)
filename = OPENSSL_malloc(len);
if (filename != NULL
- && DSO_pathbyaddr(addr, filename, len) == len)
+ && DSO_pathbyaddr(addr, filename, len) == len)
ret = DSO_load(NULL, filename, NULL, flags);
OPENSSL_free(filename);
@@ -325,5 +325,5 @@ void *DSO_global_lookup(const char *name)
ERR_raise(ERR_LIB_DSO, DSO_R_UNSUPPORTED);
return NULL;
}
- return (*meth->globallookup) (name);
+ return (*meth->globallookup)(name);
}
diff --git a/crypto/dso/dso_local.h b/crypto/dso/dso_local.h
index d7af0b064e..f3ec802101 100644
--- a/crypto/dso/dso_local.h
+++ b/crypto/dso/dso_local.h
@@ -70,9 +70,9 @@ struct dso_meth_st {
* successful load populates the loaded_filename field, and likewise a
* successful unload OPENSSL_frees and NULLs it out.
*/
- int (*dso_load) (DSO *dso);
+ int (*dso_load)(DSO *dso);
/* Unloads a shared library */
- int (*dso_unload) (DSO *dso);
+ int (*dso_unload)(DSO *dso);
/*
* Binds a function - assumes a return type of DSO_FUNC_TYPE. This should
* be cast to the real function prototype by the caller. Platforms that
@@ -80,12 +80,12 @@ struct dso_meth_st {
* is possible within ANSI C) are highly unlikely to have shared
* libraries at all, let alone a DSO_METHOD implemented for them.
*/
- DSO_FUNC_TYPE (*dso_bind_func) (DSO *dso, const char *symname);
+ DSO_FUNC_TYPE (*dso_bind_func)(DSO *dso, const char *symname);
/*
* The generic (yuck) "ctrl()" function. NB: Negative return values
* (rather than zero) indicate errors.
*/
- long (*dso_ctrl) (DSO *dso, int cmd, long larg, void *parg);
+ long (*dso_ctrl)(DSO *dso, int cmd, long larg, void *parg);
/*
* The default DSO_METHOD-specific function for converting filenames to a
* canonical native form.
@@ -97,10 +97,10 @@ struct dso_meth_st {
*/
DSO_MERGER_FUNC dso_merger;
/* [De]Initialisation handlers. */
- int (*init) (DSO *dso);
- int (*finish) (DSO *dso);
+ int (*init)(DSO *dso);
+ int (*finish)(DSO *dso);
/* Return pathname of the module containing location */
- int (*pathbyaddr) (void *addr, char *path, int sz);
+ int (*pathbyaddr)(void *addr, char *path, int sz);
/* Perform global symbol lookup, i.e. among *all* modules */
- void *(*globallookup) (const char *symname);
+ void *(*globallookup)(const char *symname);
};
diff --git a/crypto/dso/dso_vms.c b/crypto/dso/dso_vms.c
index 6c84bb1988..9038ce9b93 100644
--- a/crypto/dso/dso_vms.c
+++ b/crypto/dso/dso_vms.c
@@ -11,22 +11,22 @@
#ifdef OPENSSL_SYS_VMS
-# pragma message disable DOLLARID
-# include <errno.h>
-# include <rms.h>
-# include <lib$routines.h>
-# include <libfisdef.h>
-# include <stsdef.h>
-# include <descrip.h>
-# include <starlet.h>
-# include "../vms_rms.h"
+#pragma message disable DOLLARID
+#include <errno.h>
+#include <rms.h>
+#include <lib$routines.h>
+#include <libfisdef.h>
+#include <stsdef.h>
+#include <descrip.h>
+#include <starlet.h>
+#include "../vms_rms.h"
/* Some compiler options may mask the declaration of "_malloc32". */
-# define DSO_MALLOC OPENSSL_malloc
-# if __INITIAL_POINTER_SIZE && defined _ANSI_C_SOURCE
-# if __INITIAL_POINTER_SIZE == 64
-# pragma pointer_size save
-# pragma pointer_size 32
+#define DSO_MALLOC OPENSSL_malloc
+#if __INITIAL_POINTER_SIZE && defined _ANSI_C_SOURCE
+#if __INITIAL_POINTER_SIZE == 64
+#pragma pointer_size save
+#pragma pointer_size 32
void *_malloc32(__size_t);
static void *dso_malloc(__size_t num, const char *file, int line)
{
@@ -38,34 +38,34 @@ static void *dso_malloc(__size_t num, const char *file, int line)
}
return ret;
}
-# undef DSO_MALLOC
-# define DSO_MALLOC(num) dso_malloc((num), OPENSSL_FILE, OPENSSL_LINE)
-# pragma pointer_size restore
-# endif /* __INITIAL_POINTER_SIZE == 64 [else] */
-# endif /* __INITIAL_POINTER_SIZE && defined
- * _ANSI_C_SOURCE */
+#undef DSO_MALLOC
+#define DSO_MALLOC(num) dso_malloc((num), OPENSSL_FILE, OPENSSL_LINE)
+#pragma pointer_size restore
+#endif /* __INITIAL_POINTER_SIZE == 64 [else] */
+#endif /* __INITIAL_POINTER_SIZE && defined \
+ * _ANSI_C_SOURCE */
-# pragma message disable DOLLARID
+#pragma message disable DOLLARID
static int vms_load(DSO *dso);
static int vms_unload(DSO *dso);
static DSO_FUNC_TYPE vms_bind_func(DSO *dso, const char *symname);
static char *vms_name_converter(DSO *dso, const char *filename);
static char *vms_merger(DSO *dso, const char *filespec1,
- const char *filespec2);
+ const char *filespec2);
static DSO_METHOD dso_meth_vms = {
"OpenSSL 'VMS' shared library method",
vms_load,
- NULL, /* unload */
+ NULL, /* unload */
vms_bind_func,
- NULL, /* ctrl */
+ NULL, /* ctrl */
vms_name_converter,
vms_merger,
- NULL, /* init */
- NULL, /* finish */
- NULL, /* pathbyaddr */
- NULL /* globallookup */
+ NULL, /* init */
+ NULL, /* finish */
+ NULL, /* pathbyaddr */
+ NULL /* globallookup */
};
/*
@@ -101,25 +101,25 @@ static int vms_load(DSO *dso)
char *filename = DSO_convert_filename(dso, NULL);
/* Ensure 32-bit pointer for "p", and appropriate malloc() function. */
-# if __INITIAL_POINTER_SIZE && defined _ANSI_C_SOURCE
-# if __INITIAL_POINTER_SIZE == 64
-# pragma pointer_size save
-# pragma pointer_size 32
-# endif /* __INITIAL_POINTER_SIZE == 64 */
-# endif /* __INITIAL_POINTER_SIZE && defined
- * _ANSI_C_SOURCE */
+#if __INITIAL_POINTER_SIZE && defined _ANSI_C_SOURCE
+#if __INITIAL_POINTER_SIZE == 64
+#pragma pointer_size save
+#pragma pointer_size 32
+#endif /* __INITIAL_POINTER_SIZE == 64 */
+#endif /* __INITIAL_POINTER_SIZE && defined \
+ * _ANSI_C_SOURCE */
DSO_VMS_INTERNAL *p = NULL;
-# if __INITIAL_POINTER_SIZE && defined _ANSI_C_SOURCE
-# if __INITIAL_POINTER_SIZE == 64
-# pragma pointer_size restore
-# endif /* __INITIAL_POINTER_SIZE == 64 */
-# endif /* __INITIAL_POINTER_SIZE && defined
- * _ANSI_C_SOURCE */
+#if __INITIAL_POINTER_SIZE && defined _ANSI_C_SOURCE
+#if __INITIAL_POINTER_SIZE == 64
+#pragma pointer_size restore
+#endif /* __INITIAL_POINTER_SIZE == 64 */
+#endif /* __INITIAL_POINTER_SIZE && defined \
+ * _ANSI_C_SOURCE */
- const char *sp1, *sp2; /* Search result */
- const char *ext = NULL; /* possible extension to add */
+ const char *sp1, *sp2; /* Search result */
+ const char *ext = NULL; /* possible extension to add */
if (filename == NULL) {
ERR_raise(ERR_LIB_DSO, DSO_R_NO_FILENAME);
@@ -158,7 +158,7 @@ static int vms_load(DSO *dso)
if (sp1 == NULL)
sp1 = filename;
else
- sp1++; /* The byte after the found character */
+ sp1++; /* The byte after the found character */
/* Now, let's see if there's a type, and save the position in sp2 */
sp2 = strchr(sp1, '.');
/*
@@ -222,7 +222,7 @@ static int vms_load(DSO *dso)
/* Success (for now, we lie. We actually do not know...) */
dso->loaded_filename = filename;
return 1;
- err:
+err:
/* Cleanup! */
OPENSSL_free(p);
OPENSSL_free(filename);
@@ -258,8 +258,8 @@ static int vms_unload(DSO *dso)
* handler works (it makes this function return
*/
static int do_find_symbol(DSO_VMS_INTERNAL *ptr,
- struct dsc$descriptor_s *symname_dsc, void **sym,
- unsigned long flags)
+ struct dsc$descriptor_s *symname_dsc, void **sym,
+ unsigned long flags)
{
/*
* Make sure that signals are caught and returned instead of aborting the
@@ -270,16 +270,16 @@ static int do_find_symbol(DSO_VMS_INTERNAL *ptr,
if (ptr->imagename_dsc.dsc$w_length)
return lib$find_image_symbol(&ptr->filename_dsc,
- symname_dsc, sym,
- &ptr->imagename_dsc, flags);
+ symname_dsc, sym,
+ &ptr->imagename_dsc, flags);
else
return lib$find_image_symbol(&ptr->filename_dsc,
- symname_dsc, sym, 0, flags);
+ symname_dsc, sym, 0, flags);
}
-# ifndef LIB$M_FIS_MIXEDCASE
-# define LIB$M_FIS_MIXEDCASE (1 << 4);
-# endif
+#ifndef LIB$M_FIS_MIXEDCASE
+#define LIB$M_FIS_MIXEDCASE (1 << 4);
+#endif
void vms_bind_sym(DSO *dso, const char *symname, void **sym)
{
DSO_VMS_INTERNAL *ptr;
@@ -287,16 +287,16 @@ void vms_bind_sym(DSO *dso, const char *symname, void **sym)
struct dsc$descriptor_s symname_dsc;
/* Arrange 32-bit pointer to (copied) string storage, if needed. */
-# if __INITIAL_POINTER_SIZE == 64
-# define SYMNAME symname_32p
-# pragma pointer_size save
-# pragma pointer_size 32
+#if __INITIAL_POINTER_SIZE == 64
+#define SYMNAME symname_32p
+#pragma pointer_size save
+#pragma pointer_size 32
char *symname_32p;
-# pragma pointer_size restore
+#pragma pointer_size restore
char symname_32[NAMX_MAXRSS + 1];
-# else /* __INITIAL_POINTER_SIZE == 64 */
-# define SYMNAME ((char *) symname)
-# endif /* __INITIAL_POINTER_SIZE == 64 [else] */
+#else /* __INITIAL_POINTER_SIZE == 64 */
+#define SYMNAME ((char *)symname)
+#endif /* __INITIAL_POINTER_SIZE == 64 [else] */
*sym = NULL;
@@ -304,11 +304,11 @@ void vms_bind_sym(DSO *dso, const char *symname, void **sym)
ERR_raise(ERR_LIB_DSO, ERR_R_PASSED_NULL_PARAMETER);
return;
}
-# if __INITIAL_POINTER_SIZE == 64
+#if __INITIAL_POINTER_SIZE == 64
/* Copy the symbol name to storage with a 32-bit pointer. */
symname_32p = symname_32;
strcpy(symname_32p, symname);
-# endif /* __INITIAL_POINTER_SIZE == 64 [else] */
+#endif /* __INITIAL_POINTER_SIZE == 64 [else] */
symname_dsc.dsc$w_length = strlen(SYMNAME);
symname_dsc.dsc$b_dtype = DSC$K_DTYPE_T;
@@ -320,7 +320,7 @@ void vms_bind_sym(DSO *dso, const char *symname, void **sym)
return;
}
ptr = (DSO_VMS_INTERNAL *)sk_void_value(dso->meth_data,
- sk_void_num(dso->meth_data) - 1);
+ sk_void_num(dso->meth_data) - 1);
if (ptr == NULL) {
ERR_raise(ERR_LIB_DSO, DSO_R_NULL_HANDLE);
return;
@@ -352,13 +352,13 @@ void vms_bind_sym(DSO *dso, const char *symname, void **sym)
if (ptr->imagename_dsc.dsc$w_length)
ERR_raise_data(ERR_LIB_DSO, DSO_R_SYM_FAILURE,
- "Symbol %s in %s (%s): %s",
- symname, ptr->filename, ptr->imagename,
- errstring);
+ "Symbol %s in %s (%s): %s",
+ symname, ptr->filename, ptr->imagename,
+ errstring);
else
ERR_raise_data(ERR_LIB_DSO, DSO_R_SYM_FAILURE,
- "Symbol %s in %s: %s",
- symname, ptr->filename, errstring);
+ "Symbol %s in %s: %s",
+ symname, ptr->filename, errstring);
}
return;
}
@@ -373,7 +373,7 @@ static DSO_FUNC_TYPE vms_bind_func(DSO *dso, const char *symname)
}
static char *vms_merger(DSO *dso, const char *filespec1,
- const char *filespec2)
+ const char *filespec2)
{
int status;
int filespec1len, filespec2len;
@@ -383,20 +383,20 @@ static char *vms_merger(DSO *dso, const char *filespec1,
char *merged;
/* Arrange 32-bit pointer to (copied) string storage, if needed. */
-# if __INITIAL_POINTER_SIZE == 64
-# define FILESPEC1 filespec1_32p;
-# define FILESPEC2 filespec2_32p;
-# pragma pointer_size save
-# pragma pointer_size 32
+#if __INITIAL_POINTER_SIZE == 64
+#define FILESPEC1 filespec1_32p;
+#define FILESPEC2 filespec2_32p;
+#pragma pointer_size save
+#pragma pointer_size 32
char *filespec1_32p;
char *filespec2_32p;
-# pragma pointer_size restore
+#pragma pointer_size restore
char filespec1_32[NAMX_MAXRSS + 1];
char filespec2_32[NAMX_MAXRSS + 1];
-# else /* __INITIAL_POINTER_SIZE == 64 */
-# define FILESPEC1 ((char *) filespec1)
-# define FILESPEC2 ((char *) filespec2)
-# endif /* __INITIAL_POINTER_SIZE == 64 [else] */
+#else /* __INITIAL_POINTER_SIZE == 64 */
+#define FILESPEC1 ((char *)filespec1)
+#define FILESPEC2 ((char *)filespec2)
+#endif /* __INITIAL_POINTER_SIZE == 64 [else] */
if (!filespec1)
filespec1 = "";
@@ -405,13 +405,13 @@ static char *vms_merger(DSO *dso, const char *filespec1,
filespec1len = strlen(filespec1);
filespec2len = strlen(filespec2);
-# if __INITIAL_POINTER_SIZE == 64
+#if __INITIAL_POINTER_SIZE == 64
/* Copy the file names to storage with a 32-bit pointer. */
filespec1_32p = filespec1_32;
filespec2_32p = filespec2_32;
strcpy(filespec1_32p, filespec1);
strcpy(filespec2_32p, filespec2);
-# endif /* __INITIAL_POINTER_SIZE == 64 [else] */
+#endif /* __INITIAL_POINTER_SIZE == 64 [else] */
fab = cc$rms_fab;
nam = CC_RMS_NAMX;
@@ -422,7 +422,7 @@ static char *vms_merger(DSO *dso, const char *filespec1,
FAB_OR_NAML(fab, nam).FAB_OR_NAML_DNS = filespec2len;
NAMX_DNA_FNA_SET(fab)
- nam.NAMX_ESA = esa;
+ nam.NAMX_ESA = esa;
nam.NAMX_ESS = NAMX_MAXRSS;
nam.NAMX_NOP = NAM$M_SYNCHK | NAM$M_PWD;
SET_NAMX_NO_SHORT_UPCASE(nam);
@@ -449,8 +449,8 @@ static char *vms_merger(DSO *dso, const char *filespec1,
errstring[length] = '\0';
ERR_raise_data(ERR_LIB_DSO, DSO_R_FAILURE,
- "filespec \"%s\", default \"%s\": %s",
- filespec1, filespec2, errstring);
+ "filespec \"%s\", default \"%s\": %s",
+ filespec1, filespec2, errstring);
}
return NULL;
}
@@ -498,4 +498,4 @@ static char *vms_name_converter(DSO *dso, const char *filename)
return translated;
}
-#endif /* OPENSSL_SYS_VMS */
+#endif /* OPENSSL_SYS_VMS */
diff --git a/crypto/dso/dso_win32.c b/crypto/dso/dso_win32.c
index 64c1a79e93..908a3bbdc7 100644
--- a/crypto/dso/dso_win32.c
+++ b/crypto/dso/dso_win32.c
@@ -12,8 +12,8 @@
#if defined(DSO_WIN32)
-# ifdef _WIN32_WCE
-# if _WIN32_WCE < 300
+#ifdef _WIN32_WCE
+#if _WIN32_WCE < 300
static FARPROC GetProcAddressA(HMODULE hModule, LPCSTR lpProcName)
{
WCHAR lpProcNameW[64];
@@ -27,43 +27,43 @@ static FARPROC GetProcAddressA(HMODULE hModule, LPCSTR lpProcName)
return GetProcAddressW(hModule, lpProcNameW);
}
-# endif
-# undef GetProcAddress
-# define GetProcAddress GetProcAddressA
+#endif
+#undef GetProcAddress
+#define GetProcAddress GetProcAddressA
static HINSTANCE LoadLibraryA(LPCSTR lpLibFileName)
{
WCHAR *fnamw;
size_t len_0 = strlen(lpLibFileName) + 1, i;
-# ifdef _MSC_VER
+#ifdef _MSC_VER
fnamw = (WCHAR *)_alloca(len_0 * sizeof(WCHAR));
-# else
+#else
fnamw = (WCHAR *)alloca(len_0 * sizeof(WCHAR));
-# endif
+#endif
if (fnamw == NULL) {
SetLastError(ERROR_NOT_ENOUGH_MEMORY);
return NULL;
}
-# if defined(_WIN32_WCE) && _WIN32_WCE>=101
+#if defined(_WIN32_WCE) && _WIN32_WCE >= 101
if (!MultiByteToWideChar(CP_ACP, 0, lpLibFileName, len_0, fnamw, len_0))
-# endif
+#endif
for (i = 0; i < len_0; i++)
fnamw[i] = (WCHAR)lpLibFileName[i];
return LoadLibraryW(fnamw);
}
-# endif
+#endif
/* Part of the hack in "win32_load" ... */
-# define DSO_MAX_TRANSLATED_SIZE 256
+#define DSO_MAX_TRANSLATED_SIZE 256
static int win32_load(DSO *dso);
static int win32_unload(DSO *dso);
static DSO_FUNC_TYPE win32_bind_func(DSO *dso, const char *symname);
static char *win32_name_converter(DSO *dso, const char *filename);
static char *win32_merger(DSO *dso, const char *filespec1,
- const char *filespec2);
+ const char *filespec2);
static int win32_pathbyaddr(void *addr, char *path, int sz);
static void *win32_globallookup(const char *name);
@@ -74,12 +74,12 @@ static DSO_METHOD dso_meth_win32 = {
win32_load,
win32_unload,
win32_bind_func,
- NULL, /* ctrl */
+ NULL, /* ctrl */
win32_name_converter,
win32_merger,
- NULL, /* init */
- NULL, /* finish */
- win32_pathbyaddr, /* pathbyaddr */
+ NULL, /* init */
+ NULL, /* finish */
+ win32_pathbyaddr, /* pathbyaddr */
win32_globallookup
};
@@ -106,7 +106,7 @@ static int win32_load(DSO *dso)
h = LoadLibraryA(filename);
if (h == NULL) {
ERR_raise_data(ERR_LIB_DSO, DSO_R_LOAD_FAILED,
- "filename(%s)", filename);
+ "filename(%s)", filename);
goto err;
}
p = OPENSSL_malloc(sizeof(*p));
@@ -120,7 +120,7 @@ static int win32_load(DSO *dso)
/* Success */
dso->loaded_filename = filename;
return 1;
- err:
+err:
/* Cleanup ! */
OPENSSL_free(filename);
OPENSSL_free(p);
@@ -199,10 +199,12 @@ struct file_st {
};
static struct file_st *win32_splitter(DSO *dso, const char *filename,
- int assume_last_is_dir)
+ int assume_last_is_dir)
{
struct file_st *result = NULL;
- enum { IN_NODE, IN_DEVICE, IN_FILE } position;
+ enum { IN_NODE,
+ IN_DEVICE,
+ IN_FILE } position;
const char *start = filename;
char last;
@@ -281,8 +283,7 @@ static struct file_st *win32_splitter(DSO *dso, const char *filename,
filename++;
break;
}
- }
- while (last);
+ } while (last);
if (!result->nodelen)
result->node = NULL;
@@ -309,17 +310,17 @@ static char *win32_joiner(DSO *dso, const struct file_st *file_split)
if (file_split->node) {
len += 2 + file_split->nodelen; /* 2 for starting \\ */
if (file_split->predir || file_split->dir || file_split->file)
- len++; /* 1 for ending \ */
+ len++; /* 1 for ending \ */
} else if (file_split->device) {
len += file_split->devicelen + 1; /* 1 for ending : */
}
len += file_split->predirlen;
if (file_split->predir && (file_split->dir || file_split->file)) {
- len++; /* 1 for ending \ */
+ len++; /* 1 for ending \ */
}
len += file_split->dirlen;
if (file_split->dir && file_split->file) {
- len++; /* 1 for ending \ */
+ len++; /* 1 for ending \ */
}
len += file_split->filelen;
@@ -350,8 +351,7 @@ static char *win32_joiner(DSO *dso, const struct file_st *file_split)
start = file_split->predir;
while (file_split->predirlen > (start - file_split->predir)) {
const char *end = openssl_strnchr(start, '/',
- file_split->predirlen - (start -
- file_split->predir));
+ file_split->predirlen - (start - file_split->predir));
if (!end)
end = start
+ file_split->predirlen - (start - file_split->predir);
@@ -364,8 +364,7 @@ static char *win32_joiner(DSO *dso, const struct file_st *file_split)
start = file_split->dir;
while (file_split->dirlen > (start - file_split->dir)) {
const char *end = openssl_strnchr(start, '/',
- file_split->dirlen - (start -
- file_split->dir));
+ file_split->dirlen - (start - file_split->dir));
if (!end)
end = start + file_split->dirlen - (start - file_split->dir);
strncpy(&result[offset], start, end - start);
@@ -381,7 +380,7 @@ static char *win32_joiner(DSO *dso, const struct file_st *file_split)
}
static char *win32_merger(DSO *dso, const char *filespec1,
- const char *filespec2)
+ const char *filespec2)
{
char *merged = NULL;
struct file_st *filespec1_split = NULL;
@@ -423,7 +422,7 @@ static char *win32_merger(DSO *dso, const char *filespec1,
filespec1_split->dir = filespec2_split->dir;
filespec1_split->dirlen = filespec2_split->dirlen;
} else if (filespec1_split->dir[0] != '\\'
- && filespec1_split->dir[0] != '/') {
+ && filespec1_split->dir[0] != '/') {
filespec1_split->predir = filespec2_split->dir;
filespec1_split->predirlen = filespec2_split->dirlen;
}
@@ -444,9 +443,7 @@ static char *win32_name_converter(DSO *dso, const char *filename)
char *translated;
int len, transform;
- transform = ((strstr(filename, "/") == NULL) &&
- (strstr(filename, "\\") == NULL) &&
- (strstr(filename, ":") == NULL));
+ transform = ((strstr(filename, "/") == NULL) && (strstr(filename, "\\") == NULL) && (strstr(filename, ":") == NULL));
/* If transform != 0, then we convert to %s.dll, else just dupe filename */
len = (int)strlen(filename) + 1;
@@ -472,19 +469,19 @@ static const char *openssl_strnchr(const char *string, int c, size_t len)
return NULL;
}
-# include <tlhelp32.h>
-# ifdef _WIN32_WCE
-# define DLLNAME "TOOLHELP.DLL"
-# else
-# ifdef MODULEENTRY32
-# undef MODULEENTRY32 /* unmask the ASCII version! */
-# endif
-# define DLLNAME "KERNEL32.DLL"
-# endif
+#include <tlhelp32.h>
+#ifdef _WIN32_WCE
+#define DLLNAME "TOOLHELP.DLL"
+#else
+#ifdef MODULEENTRY32
+#undef MODULEENTRY32 /* unmask the ASCII version! */
+#endif
+#define DLLNAME "KERNEL32.DLL"
+#endif
-typedef HANDLE(WINAPI *CREATETOOLHELP32SNAPSHOT) (DWORD, DWORD);
-typedef BOOL(WINAPI *CLOSETOOLHELP32SNAPSHOT) (HANDLE);
-typedef BOOL(WINAPI *MODULE32) (HANDLE, MODULEENTRY32 *);
+typedef HANDLE(WINAPI *CREATETOOLHELP32SNAPSHOT)(DWORD, DWORD);
+typedef BOOL(WINAPI *CLOSETOOLHELP32SNAPSHOT)(HANDLE);
+typedef BOOL(WINAPI *MODULE32)(HANDLE, MODULEENTRY32 *);
static int win32_pathbyaddr(void *addr, char *path, int sz)
{
@@ -497,7 +494,7 @@ static int win32_pathbyaddr(void *addr, char *path, int sz)
if (addr == NULL) {
union {
- int (*f) (void *, char *, int);
+ int (*f)(void *, char *, int);
void *p;
} t = {
win32_pathbyaddr
@@ -519,20 +516,20 @@ static int win32_pathbyaddr(void *addr, char *path, int sz)
return -1;
}
/* We take the rest for granted... */
-# ifdef _WIN32_WCE
+#ifdef _WIN32_WCE
close_snap = (CLOSETOOLHELP32SNAPSHOT)
GetProcAddress(dll, "CloseToolhelp32Snapshot");
-# else
- close_snap = (CLOSETOOLHELP32SNAPSHOT) CloseHandle;
-# endif
- module_first = (MODULE32) GetProcAddress(dll, "Module32First");
- module_next = (MODULE32) GetProcAddress(dll, "Module32Next");
+#else
+ close_snap = (CLOSETOOLHELP32SNAPSHOT)CloseHandle;
+#endif
+ module_first = (MODULE32)GetProcAddress(dll, "Module32First");
+ module_next = (MODULE32)GetProcAddress(dll, "Module32Next");
/*
* Take a snapshot of current process which includes
* list of all involved modules.
*/
- hModuleSnap = (*create_snap) (TH32CS_SNAPMODULE, 0);
+ hModuleSnap = (*create_snap)(TH32CS_SNAPMODULE, 0);
if (hModuleSnap == INVALID_HANDLE_VALUE) {
FreeLibrary(dll);
ERR_raise(ERR_LIB_DSO, DSO_R_UNSUPPORTED);
@@ -541,8 +538,8 @@ static int win32_pathbyaddr(void *addr, char *path, int sz)
me32.dwSize = sizeof(me32);
- if (!(*module_first) (hModuleSnap, &me32)) {
- (*close_snap) (hModuleSnap);
+ if (!(*module_first)(hModuleSnap, &me32)) {
+ (*close_snap)(hModuleSnap);
FreeLibrary(dll);
ERR_raise(ERR_LIB_DSO, DSO_R_FAILURE);
return -1;
@@ -550,15 +547,14 @@ static int win32_pathbyaddr(void *addr, char *path, int sz)
/* Enumerate the modules to find one which includes me. */
do {
- if ((size_t) addr >= (size_t) me32.modBaseAddr &&
- (size_t) addr < (size_t) (me32.modBaseAddr + me32.modBaseSize)) {
- (*close_snap) (hModuleSnap);
+ if ((size_t)addr >= (size_t)me32.modBaseAddr && (size_t)addr < (size_t)(me32.modBaseAddr + me32.modBaseSize)) {
+ (*close_snap)(hModuleSnap);
FreeLibrary(dll);
-# ifdef _WIN32_WCE
-# if _WIN32_WCE >= 101
+#ifdef _WIN32_WCE
+#if _WIN32_WCE >= 101
return WideCharToMultiByte(CP_ACP, 0, me32.szExePath, -1,
- path, sz, NULL, NULL);
-# else
+ path, sz, NULL, NULL);
+#else
{
int i, len = (int)wcslen(me32.szExePath);
if (sz <= 0)
@@ -570,8 +566,8 @@ static int win32_pathbyaddr(void *addr, char *path, int sz)
path[len++] = '\0';
return len;
}
-# endif
-# else
+#endif
+#else
{
int len = (int)strlen(me32.szExePath);
if (sz <= 0)
@@ -582,11 +578,11 @@ static int win32_pathbyaddr(void *addr, char *path, int sz)
path[len++] = '\0';
return len;
}
-# endif
+#endif
}
- } while ((*module_next) (hModuleSnap, &me32));
+ } while ((*module_next)(hModuleSnap, &me32));
- (*close_snap) (hModuleSnap);
+ (*close_snap)(hModuleSnap);
FreeLibrary(dll);
return 0;
}
@@ -618,16 +614,16 @@ static void *win32_globallookup(const char *name)
return NULL;
}
/* We take the rest for granted... */
-# ifdef _WIN32_WCE
+#ifdef _WIN32_WCE
close_snap = (CLOSETOOLHELP32SNAPSHOT)
GetProcAddress(dll, "CloseToolhelp32Snapshot");
-# else
- close_snap = (CLOSETOOLHELP32SNAPSHOT) CloseHandle;
-# endif
- module_first = (MODULE32) GetProcAddress(dll, "Module32First");
- module_next = (MODULE32) GetProcAddress(dll, "Module32Next");
+#else
+ close_snap = (CLOSETOOLHELP32SNAPSHOT)CloseHandle;
+#endif
+ module_first = (MODULE32)GetProcAddress(dll, "Module32First");
+ module_next = (MODULE32)GetProcAddress(dll, "Module32Next");
- hModuleSnap = (*create_snap) (TH32CS_SNAPMODULE, 0);
+ hModuleSnap = (*create_snap)(TH32CS_SNAPMODULE, 0);
if (hModuleSnap == INVALID_HANDLE_VALUE) {
FreeLibrary(dll);
ERR_raise(ERR_LIB_DSO, DSO_R_UNSUPPORTED);
@@ -636,22 +632,22 @@ static void *win32_globallookup(const char *name)
me32.dwSize = sizeof(me32);
- if (!(*module_first) (hModuleSnap, &me32)) {
- (*close_snap) (hModuleSnap);
+ if (!(*module_first)(hModuleSnap, &me32)) {
+ (*close_snap)(hModuleSnap);
FreeLibrary(dll);
return NULL;
}
do {
if ((ret.f = GetProcAddress(me32.hModule, name))) {
- (*close_snap) (hModuleSnap);
+ (*close_snap)(hModuleSnap);
FreeLibrary(dll);
return ret.p;
}
- } while ((*module_next) (hModuleSnap, &me32));
+ } while ((*module_next)(hModuleSnap, &me32));
- (*close_snap) (hModuleSnap);
+ (*close_snap)(hModuleSnap);
FreeLibrary(dll);
return NULL;
}
-#endif /* DSO_WIN32 */
+#endif /* DSO_WIN32 */
diff --git a/crypto/ebcdic.c b/crypto/ebcdic.c
index 970ffc015c..eb94210826 100644
--- a/crypto/ebcdic.c
+++ b/crypto/ebcdic.c
@@ -7,14 +7,14 @@
* https://www.openssl.org/source/license.html
*/
-# include <openssl/e_os2.h>
+#include <openssl/e_os2.h>
#ifndef CHARSET_EBCDIC
NON_EMPTY_TRANSLATION_UNIT
#else
-# include <openssl/ebcdic.h>
+#include <openssl/ebcdic.h>
-# ifdef CHARSET_EBCDIC_TEST
+#ifdef CHARSET_EBCDIC_TEST
/*
* Here we're looking to test the EBCDIC code on an ASCII system so we don't do
* any translation in these tables at all.
@@ -92,7 +92,7 @@ const unsigned char os_toebcdic[256] = {
0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
};
-# elif defined(_OSD_POSIX)
+#elif defined(_OSD_POSIX)
/*
* "BS2000 OSD" is a POSIX subsystem on a main frame. It is made by Siemens
* AG, Germany, for their BS2000 mainframe machines. Within the POSIX
@@ -111,67 +111,83 @@ const unsigned char os_toebcdic[256] = {
const unsigned char os_toascii[256] = {
/*
* 00
- */ 0x00, 0x01, 0x02, 0x03, 0x85, 0x09, 0x86, 0x7f,
+ */
+ 0x00, 0x01, 0x02, 0x03, 0x85, 0x09, 0x86, 0x7f,
0x87, 0x8d, 0x8e, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, /* ................ */
/*
* 10
- */ 0x10, 0x11, 0x12, 0x13, 0x8f, 0x0a, 0x08, 0x97,
+ */
+ 0x10, 0x11, 0x12, 0x13, 0x8f, 0x0a, 0x08, 0x97,
0x18, 0x19, 0x9c, 0x9d, 0x1c, 0x1d, 0x1e, 0x1f, /* ................ */
/*
* 20
- */ 0x80, 0x81, 0x82, 0x83, 0x84, 0x92, 0x17, 0x1b,
+ */
+ 0x80, 0x81, 0x82, 0x83, 0x84, 0x92, 0x17, 0x1b,
0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x05, 0x06, 0x07, /* ................ */
/*
* 30
- */ 0x90, 0x91, 0x16, 0x93, 0x94, 0x95, 0x96, 0x04,
+ */
+ 0x90, 0x91, 0x16, 0x93, 0x94, 0x95, 0x96, 0x04,
0x98, 0x99, 0x9a, 0x9b, 0x14, 0x15, 0x9e, 0x1a, /* ................ */
/*
* 40
- */ 0x20, 0xa0, 0xe2, 0xe4, 0xe0, 0xe1, 0xe3, 0xe5,
+ */
+ 0x20, 0xa0, 0xe2, 0xe4, 0xe0, 0xe1, 0xe3, 0xe5,
0xe7, 0xf1, 0x60, 0x2e, 0x3c, 0x28, 0x2b, 0x7c, /* .........`.<(+| */
/*
* 50
- */ 0x26, 0xe9, 0xea, 0xeb, 0xe8, 0xed, 0xee, 0xef,
+ */
+ 0x26, 0xe9, 0xea, 0xeb, 0xe8, 0xed, 0xee, 0xef,
0xec, 0xdf, 0x21, 0x24, 0x2a, 0x29, 0x3b, 0x9f, /* &.........!$*);. */
/*
* 60
- */ 0x2d, 0x2f, 0xc2, 0xc4, 0xc0, 0xc1, 0xc3, 0xc5,
- 0xc7, 0xd1, 0x5e, 0x2c, 0x25, 0x5f, 0x3e, 0x3f, /*-/........^,%_>?*/
+ */
+ 0x2d, 0x2f, 0xc2, 0xc4, 0xc0, 0xc1, 0xc3, 0xc5,
+ 0xc7, 0xd1, 0x5e, 0x2c, 0x25, 0x5f, 0x3e, 0x3f, /*-/........^,%_>?*/
/*
* 70
- */ 0xf8, 0xc9, 0xca, 0xcb, 0xc8, 0xcd, 0xce, 0xcf,
+ */
+ 0xf8, 0xc9, 0xca, 0xcb, 0xc8, 0xcd, 0xce, 0xcf,
0xcc, 0xa8, 0x3a, 0x23, 0x40, 0x27, 0x3d, 0x22, /* ..........:#@'=" */
/*
* 80
- */ 0xd8, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
+ */
+ 0xd8, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
0x68, 0x69, 0xab, 0xbb, 0xf0, 0xfd, 0xfe, 0xb1, /* .abcdefghi...... */
/*
* 90
- */ 0xb0, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70,
+ */
+ 0xb0, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70,
0x71, 0x72, 0xaa, 0xba, 0xe6, 0xb8, 0xc6, 0xa4, /* .jklmnopqr...... */
/*
* a0
- */ 0xb5, 0xaf, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
+ */
+ 0xb5, 0xaf, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
0x79, 0x7a, 0xa1, 0xbf, 0xd0, 0xdd, 0xde, 0xae, /* ..stuvwxyz...... */
/*
* b0
- */ 0xa2, 0xa3, 0xa5, 0xb7, 0xa9, 0xa7, 0xb6, 0xbc,
+ */
+ 0xa2, 0xa3, 0xa5, 0xb7, 0xa9, 0xa7, 0xb6, 0xbc,
0xbd, 0xbe, 0xac, 0x5b, 0x5c, 0x5d, 0xb4, 0xd7, /* ...........[\].. */
/*
* c0
- */ 0xf9, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
+ */
+ 0xf9, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
0x48, 0x49, 0xad, 0xf4, 0xf6, 0xf2, 0xf3, 0xf5, /* .ABCDEFGHI...... */
/*
* d0
- */ 0xa6, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 0x50,
+ */
+ 0xa6, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 0x50,
0x51, 0x52, 0xb9, 0xfb, 0xfc, 0xdb, 0xfa, 0xff, /* .JKLMNOPQR...... */
/*
* e0
- */ 0xd9, 0xf7, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,
+ */
+ 0xd9, 0xf7, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,
0x59, 0x5a, 0xb2, 0xd4, 0xd6, 0xd2, 0xd3, 0xd5, /* ..STUVWXYZ...... */
/*
* f0
- */ 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+ */
+ 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
0x38, 0x39, 0xb3, 0x7b, 0xdc, 0x7d, 0xda, 0x7e /* 0123456789.{.}.~ */
};
@@ -179,71 +195,87 @@ const unsigned char os_toascii[256] = {
const unsigned char os_toebcdic[256] = {
/*
* 00
- */ 0x00, 0x01, 0x02, 0x03, 0x37, 0x2d, 0x2e, 0x2f,
+ */
+ 0x00, 0x01, 0x02, 0x03, 0x37, 0x2d, 0x2e, 0x2f,
0x16, 0x05, 0x15, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, /* ................ */
/*
* 10
- */ 0x10, 0x11, 0x12, 0x13, 0x3c, 0x3d, 0x32, 0x26,
+ */
+ 0x10, 0x11, 0x12, 0x13, 0x3c, 0x3d, 0x32, 0x26,
0x18, 0x19, 0x3f, 0x27, 0x1c, 0x1d, 0x1e, 0x1f, /* ................ */
/*
* 20
- */ 0x40, 0x5a, 0x7f, 0x7b, 0x5b, 0x6c, 0x50, 0x7d,
+ */
+ 0x40, 0x5a, 0x7f, 0x7b, 0x5b, 0x6c, 0x50, 0x7d,
0x4d, 0x5d, 0x5c, 0x4e, 0x6b, 0x60, 0x4b, 0x61, /* !"#$%&'()*+,-./ */
/*
* 30
- */ 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
+ */
+ 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
0xf8, 0xf9, 0x7a, 0x5e, 0x4c, 0x7e, 0x6e, 0x6f, /* 0123456789:;<=>? */
/*
* 40
- */ 0x7c, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
+ */
+ 0x7c, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
0xc8, 0xc9, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, /* @ABCDEFGHIJKLMNO */
/*
* 50
- */ 0xd7, 0xd8, 0xd9, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6,
+ */
+ 0xd7, 0xd8, 0xd9, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6,
0xe7, 0xe8, 0xe9, 0xbb, 0xbc, 0xbd, 0x6a, 0x6d, /* PQRSTUVWXYZ[\]^_ */
/*
* 60
- */ 0x4a, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
+ */
+ 0x4a, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
0x88, 0x89, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, /* `abcdefghijklmno */
/*
* 70
- */ 0x97, 0x98, 0x99, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6,
+ */
+ 0x97, 0x98, 0x99, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6,
0xa7, 0xa8, 0xa9, 0xfb, 0x4f, 0xfd, 0xff, 0x07, /* pqrstuvwxyz{|}~. */
/*
* 80
- */ 0x20, 0x21, 0x22, 0x23, 0x24, 0x04, 0x06, 0x08,
+ */
+ 0x20, 0x21, 0x22, 0x23, 0x24, 0x04, 0x06, 0x08,
0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x09, 0x0a, 0x14, /* ................ */
/*
* 90
- */ 0x30, 0x31, 0x25, 0x33, 0x34, 0x35, 0x36, 0x17,
+ */
+ 0x30, 0x31, 0x25, 0x33, 0x34, 0x35, 0x36, 0x17,
0x38, 0x39, 0x3a, 0x3b, 0x1a, 0x1b, 0x3e, 0x5f, /* ................ */
/*
* a0
- */ 0x41, 0xaa, 0xb0, 0xb1, 0x9f, 0xb2, 0xd0, 0xb5,
+ */
+ 0x41, 0xaa, 0xb0, 0xb1, 0x9f, 0xb2, 0xd0, 0xb5,
0x79, 0xb4, 0x9a, 0x8a, 0xba, 0xca, 0xaf, 0xa1, /* ................ */
/*
* b0
- */ 0x90, 0x8f, 0xea, 0xfa, 0xbe, 0xa0, 0xb6, 0xb3,
+ */
+ 0x90, 0x8f, 0xea, 0xfa, 0xbe, 0xa0, 0xb6, 0xb3,
0x9d, 0xda, 0x9b, 0x8b, 0xb7, 0xb8, 0xb9, 0xab, /* ................ */
/*
* c0
- */ 0x64, 0x65, 0x62, 0x66, 0x63, 0x67, 0x9e, 0x68,
+ */
+ 0x64, 0x65, 0x62, 0x66, 0x63, 0x67, 0x9e, 0x68,
0x74, 0x71, 0x72, 0x73, 0x78, 0x75, 0x76, 0x77, /* ................ */
/*
* d0
- */ 0xac, 0x69, 0xed, 0xee, 0xeb, 0xef, 0xec, 0xbf,
+ */
+ 0xac, 0x69, 0xed, 0xee, 0xeb, 0xef, 0xec, 0xbf,
0x80, 0xe0, 0xfe, 0xdd, 0xfc, 0xad, 0xae, 0x59, /* ................ */
/*
* e0
- */ 0x44, 0x45, 0x42, 0x46, 0x43, 0x47, 0x9c, 0x48,
+ */
+ 0x44, 0x45, 0x42, 0x46, 0x43, 0x47, 0x9c, 0x48,
0x54, 0x51, 0x52, 0x53, 0x58, 0x55, 0x56, 0x57, /* ................ */
/*
* f0
- */ 0x8c, 0x49, 0xcd, 0xce, 0xcb, 0xcf, 0xcc, 0xe1,
+ */
+ 0x8c, 0x49, 0xcd, 0xce, 0xcb, 0xcf, 0xcc, 0xe1,
0x70, 0xc0, 0xde, 0xdb, 0xdc, 0x8d, 0x8e, 0xdf /* ................ */
};
-# else /*_OSD_POSIX*/
+#else /*_OSD_POSIX*/
/*
* This code does basic character mapping for IBM's TPF and OS/390 operating
@@ -325,7 +357,7 @@ const unsigned char os_toebcdic[256] = {
0x8c, 0x49, 0xcd, 0xce, 0xcb, 0xcf, 0xcc, 0xe1, /* f0-ff: */
0x70, 0xdd, 0xde, 0xdb, 0xdc, 0x8d, 0x8e, 0xdf /* ................ */
};
-# endif/*_OSD_POSIX*/
+#endif /*_OSD_POSIX*/
/*
* Translate a memory block from EBCDIC (host charset) to ASCII (net charset)
diff --git a/crypto/ec/curve25519.c b/crypto/ec/curve25519.c
index 68c06ae624..c6886763ab 100644
--- a/crypto/ec/curve25519.c
+++ b/crypto/ec/curve25519.c
@@ -21,10 +21,9 @@
#include "internal/numbers.h"
-#if defined(X25519_ASM) && (defined(__x86_64) || defined(__x86_64__) || \
- defined(_M_AMD64) || defined(_M_X64))
+#if defined(X25519_ASM) && (defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64))
-# define BASE_2_64_IMPLEMENTED
+#define BASE_2_64_IMPLEMENTED
typedef uint64_t fe64[4];
@@ -45,12 +44,12 @@ void x25519_fe64_mul121666(fe64 h, fe64 f);
void x25519_fe64_add(fe64 h, const fe64 f, const fe64 g);
void x25519_fe64_sub(fe64 h, const fe64 f, const fe64 g);
void x25519_fe64_tobytes(uint8_t *s, const fe64 f);
-# define fe64_mul x25519_fe64_mul
-# define fe64_sqr x25519_fe64_sqr
-# define fe64_mul121666 x25519_fe64_mul121666
-# define fe64_add x25519_fe64_add
-# define fe64_sub x25519_fe64_sub
-# define fe64_tobytes x25519_fe64_tobytes
+#define fe64_mul x25519_fe64_mul
+#define fe64_sqr x25519_fe64_sqr
+#define fe64_mul121666 x25519_fe64_mul121666
+#define fe64_add x25519_fe64_add
+#define fe64_sub x25519_fe64_sub
+#define fe64_tobytes x25519_fe64_tobytes
static uint64_t load_8(const uint8_t *in)
{
@@ -209,7 +208,7 @@ static void fe64_invert(fe64 out, const fe64 z)
* fe64_* subroutines.
*/
static void x25519_scalar_mulx(uint8_t out[32], const uint8_t scalar[32],
- const uint8_t point[32])
+ const uint8_t point[32])
{
fe64 x1, x2, z2, x3, z3, tmp0, tmp1;
uint8_t e[32];
@@ -217,7 +216,7 @@ static void x25519_scalar_mulx(uint8_t out[32], const uint8_t scalar[32],
int pos;
memcpy(e, scalar, 32);
- e[0] &= 0xf8;
+ e[0] &= 0xf8;
e[31] &= 0x7f;
e[31] |= 0x40;
fe64_frombytes(x1, point);
@@ -261,18 +260,18 @@ static void x25519_scalar_mulx(uint8_t out[32], const uint8_t scalar[32],
}
#endif
-#if defined(X25519_ASM) \
- || ( defined(INT128_MAX) \
- && !defined(__sparc__) \
- && (!defined(__SIZEOF_LONG__) || (__SIZEOF_LONG__ == 8)) \
- && !(defined(__ANDROID__) && !defined(__clang__)) )
+#if defined(X25519_ASM) \
+ || (defined(INT128_MAX) \
+ && !defined(__sparc__) \
+ && (!defined(__SIZEOF_LONG__) || (__SIZEOF_LONG__ == 8)) \
+ && !(defined(__ANDROID__) && !defined(__clang__)))
/*
* Base 2^51 implementation. It's virtually no different from reference
* base 2^25.5 implementation in respect to lax boundary conditions for
* intermediate values and even individual limbs. So that whatever you
* know about the reference, applies even here...
*/
-# define BASE_2_51_IMPLEMENTED
+#define BASE_2_51_IMPLEMENTED
typedef uint64_t fe51[5];
@@ -309,16 +308,20 @@ static uint64_t load_6(const uint8_t *in)
static void fe51_frombytes(fe51 h, const uint8_t *s)
{
- uint64_t h0 = load_7(s); /* 56 bits */
- uint64_t h1 = load_6(s + 7) << 5; /* 53 bits */
- uint64_t h2 = load_7(s + 13) << 2; /* 58 bits */
- uint64_t h3 = load_6(s + 20) << 7; /* 55 bits */
- uint64_t h4 = (load_6(s + 26) & 0x7fffffffffff) << 4; /* 51 bits */
-
- h1 |= h0 >> 51; h0 &= MASK51;
- h2 |= h1 >> 51; h1 &= MASK51;
- h3 |= h2 >> 51; h2 &= MASK51;
- h4 |= h3 >> 51; h3 &= MASK51;
+ uint64_t h0 = load_7(s); /* 56 bits */
+ uint64_t h1 = load_6(s + 7) << 5; /* 53 bits */
+ uint64_t h2 = load_7(s + 13) << 2; /* 58 bits */
+ uint64_t h3 = load_6(s + 20) << 7; /* 55 bits */
+ uint64_t h4 = (load_6(s + 26) & 0x7fffffffffff) << 4; /* 51 bits */
+
+ h1 |= h0 >> 51;
+ h0 &= MASK51;
+ h2 |= h1 >> 51;
+ h1 &= MASK51;
+ h3 |= h2 >> 51;
+ h2 &= MASK51;
+ h4 |= h3 >> 51;
+ h3 &= MASK51;
h[0] = h0;
h[1] = h1;
@@ -345,11 +348,15 @@ static void fe51_tobytes(uint8_t *s, const fe51 h)
/* full reduce */
h0 += 19 * q;
- h1 += h0 >> 51; h0 &= MASK51;
- h2 += h1 >> 51; h1 &= MASK51;
- h3 += h2 >> 51; h2 &= MASK51;
- h4 += h3 >> 51; h3 &= MASK51;
- h4 &= MASK51;
+ h1 += h0 >> 51;
+ h0 &= MASK51;
+ h2 += h1 >> 51;
+ h1 &= MASK51;
+ h3 += h2 >> 51;
+ h2 &= MASK51;
+ h4 += h3 >> 51;
+ h3 &= MASK51;
+ h4 &= MASK51;
/* smash */
s[0] = (uint8_t)(h0 >> 0);
@@ -386,14 +393,14 @@ static void fe51_tobytes(uint8_t *s, const fe51 h)
s[31] = (uint8_t)(h4 >> 44);
}
-# if defined(X25519_ASM)
+#if defined(X25519_ASM)
void x25519_fe51_mul(fe51 h, const fe51 f, const fe51 g);
void x25519_fe51_sqr(fe51 h, const fe51 f);
void x25519_fe51_mul121666(fe51 h, fe51 f);
-# define fe51_mul x25519_fe51_mul
-# define fe51_sq x25519_fe51_sqr
-# define fe51_mul121666 x25519_fe51_mul121666
-# else
+#define fe51_mul x25519_fe51_mul
+#define fe51_sq x25519_fe51_sqr
+#define fe51_mul121666 x25519_fe51_mul121666
+#else
typedef uint128_t u128;
@@ -438,15 +445,22 @@ static void fe51_mul(fe51 h, const fe51 f, const fe51 g)
h4 += (u128)f_i * g0;
/* partial [lazy] reduction */
- h3 += (uint64_t)(h2 >> 51); g2 = (uint64_t)h2 & MASK51;
- h1 += (uint64_t)(h0 >> 51); g0 = (uint64_t)h0 & MASK51;
-
- h4 += (uint64_t)(h3 >> 51); g3 = (uint64_t)h3 & MASK51;
- g2 += (uint64_t)(h1 >> 51); g1 = (uint64_t)h1 & MASK51;
-
- g0 += (uint64_t)(h4 >> 51) * 19; g4 = (uint64_t)h4 & MASK51;
- g3 += g2 >> 51; g2 &= MASK51;
- g1 += g0 >> 51; g0 &= MASK51;
+ h3 += (uint64_t)(h2 >> 51);
+ g2 = (uint64_t)h2 & MASK51;
+ h1 += (uint64_t)(h0 >> 51);
+ g0 = (uint64_t)h0 & MASK51;
+
+ h4 += (uint64_t)(h3 >> 51);
+ g3 = (uint64_t)h3 & MASK51;
+ g2 += (uint64_t)(h1 >> 51);
+ g1 = (uint64_t)h1 & MASK51;
+
+ g0 += (uint64_t)(h4 >> 51) * 19;
+ g4 = (uint64_t)h4 & MASK51;
+ g3 += g2 >> 51;
+ g2 &= MASK51;
+ g1 += g0 >> 51;
+ g0 &= MASK51;
h[0] = g0;
h[1] = g1;
@@ -457,9 +471,9 @@ static void fe51_mul(fe51 h, const fe51 f, const fe51 g)
static void fe51_sq(fe51 h, const fe51 f)
{
-# if defined(OPENSSL_SMALL_FOOTPRINT)
+#if defined(OPENSSL_SMALL_FOOTPRINT)
fe51_mul(h, f, f);
-# else
+#else
/* dedicated squaring gives 16-25% overall improvement */
uint64_t g0 = f[0];
uint64_t g1 = f[1];
@@ -468,45 +482,55 @@ static void fe51_sq(fe51 h, const fe51 f)
uint64_t g4 = f[4];
u128 h0, h1, h2, h3, h4;
- h0 = (u128)g0 * g0; g0 *= 2;
+ h0 = (u128)g0 * g0;
+ g0 *= 2;
h1 = (u128)g0 * g1;
h2 = (u128)g0 * g2;
h3 = (u128)g0 * g3;
h4 = (u128)g0 * g4;
- g0 = g4; /* borrow g0 */
+ g0 = g4; /* borrow g0 */
h3 += (u128)g0 * (g4 *= 19);
- h2 += (u128)g1 * g1; g1 *= 2;
+ h2 += (u128)g1 * g1;
+ g1 *= 2;
h3 += (u128)g1 * g2;
h4 += (u128)g1 * g3;
h0 += (u128)g1 * g4;
- g0 = g3; /* borrow g0 */
+ g0 = g3; /* borrow g0 */
h1 += (u128)g0 * (g3 *= 19);
h2 += (u128)(g0 * 2) * g4;
- h4 += (u128)g2 * g2; g2 *= 2;
+ h4 += (u128)g2 * g2;
+ g2 *= 2;
h0 += (u128)g2 * g3;
h1 += (u128)g2 * g4;
/* partial [lazy] reduction */
- h3 += (uint64_t)(h2 >> 51); g2 = (uint64_t)h2 & MASK51;
- h1 += (uint64_t)(h0 >> 51); g0 = (uint64_t)h0 & MASK51;
-
- h4 += (uint64_t)(h3 >> 51); g3 = (uint64_t)h3 & MASK51;
- g2 += (uint64_t)(h1 >> 51); g1 = (uint64_t)h1 & MASK51;
-
- g0 += (uint64_t)(h4 >> 51) * 19; g4 = (uint64_t)h4 & MASK51;
- g3 += g2 >> 51; g2 &= MASK51;
- g1 += g0 >> 51; g0 &= MASK51;
+ h3 += (uint64_t)(h2 >> 51);
+ g2 = (uint64_t)h2 & MASK51;
+ h1 += (uint64_t)(h0 >> 51);
+ g0 = (uint64_t)h0 & MASK51;
+
+ h4 += (uint64_t)(h3 >> 51);
+ g3 = (uint64_t)h3 & MASK51;
+ g2 += (uint64_t)(h1 >> 51);
+ g1 = (uint64_t)h1 & MASK51;
+
+ g0 += (uint64_t)(h4 >> 51) * 19;
+ g4 = (uint64_t)h4 & MASK51;
+ g3 += g2 >> 51;
+ g2 &= MASK51;
+ g1 += g0 >> 51;
+ g0 &= MASK51;
h[0] = g0;
h[1] = g1;
h[2] = g2;
h[3] = g3;
h[4] = g4;
-# endif
+#endif
}
static void fe51_mul121666(fe51 h, fe51 f)
@@ -518,15 +542,22 @@ static void fe51_mul121666(fe51 h, fe51 f)
u128 h4 = f[4] * (u128)121666;
uint64_t g0, g1, g2, g3, g4;
- h3 += (uint64_t)(h2 >> 51); g2 = (uint64_t)h2 & MASK51;
- h1 += (uint64_t)(h0 >> 51); g0 = (uint64_t)h0 & MASK51;
+ h3 += (uint64_t)(h2 >> 51);
+ g2 = (uint64_t)h2 & MASK51;
+ h1 += (uint64_t)(h0 >> 51);
+ g0 = (uint64_t)h0 & MASK51;
- h4 += (uint64_t)(h3 >> 51); g3 = (uint64_t)h3 & MASK51;
- g2 += (uint64_t)(h1 >> 51); g1 = (uint64_t)h1 & MASK51;
+ h4 += (uint64_t)(h3 >> 51);
+ g3 = (uint64_t)h3 & MASK51;
+ g2 += (uint64_t)(h1 >> 51);
+ g1 = (uint64_t)h1 & MASK51;
- g0 += (uint64_t)(h4 >> 51) * 19; g4 = (uint64_t)h4 & MASK51;
- g3 += g2 >> 51; g2 &= MASK51;
- g1 += g0 >> 51; g0 &= MASK51;
+ g0 += (uint64_t)(h4 >> 51) * 19;
+ g4 = (uint64_t)h4 & MASK51;
+ g3 += g2 >> 51;
+ g2 &= MASK51;
+ g1 += g0 >> 51;
+ g0 &= MASK51;
h[0] = g0;
h[1] = g1;
@@ -534,7 +565,7 @@ static void fe51_mul121666(fe51 h, fe51 f)
h[3] = g3;
h[4] = g4;
}
-# endif
+#endif
static void fe51_add(fe51 h, const fe51 f, const fe51 g)
{
@@ -694,22 +725,22 @@ static void fe51_invert(fe51 out, const fe51 z)
* fe51_* subroutines.
*/
static void x25519_scalar_mult(uint8_t out[32], const uint8_t scalar[32],
- const uint8_t point[32])
+ const uint8_t point[32])
{
fe51 x1, x2, z2, x3, z3, tmp0, tmp1;
uint8_t e[32];
unsigned swap = 0;
int pos;
-# ifdef BASE_2_64_IMPLEMENTED
+#ifdef BASE_2_64_IMPLEMENTED
if (x25519_fe64_eligible()) {
x25519_scalar_mulx(out, scalar, point);
return;
}
-# endif
+#endif
memcpy(e, scalar, 32);
- e[0] &= 0xf8;
+ e[0] &= 0xf8;
e[31] &= 0x7f;
e[31] |= 0x40;
fe51_frombytes(x1, point);
@@ -770,7 +801,7 @@ static void x25519_scalar_mult(uint8_t out[32], const uint8_t scalar[32],
*/
typedef int32_t fe[10];
-static const int64_t kBottom21Bits = 0x1fffffLL;
+static const int64_t kBottom21Bits = 0x1fffffLL;
static const int64_t kBottom25Bits = 0x1ffffffLL;
static const int64_t kBottom26Bits = 0x3ffffffLL;
static const int64_t kTop39Bits = 0xfffffffffe000000LL;
@@ -780,7 +811,7 @@ static uint64_t load_3(const uint8_t *in)
{
uint64_t result;
- result = ((uint64_t)in[0]);
+ result = ((uint64_t)in[0]);
result |= ((uint64_t)in[1]) << 8;
result |= ((uint64_t)in[2]) << 16;
return result;
@@ -790,7 +821,7 @@ static uint64_t load_4(const uint8_t *in)
{
uint64_t result;
- result = ((uint64_t)in[0]);
+ result = ((uint64_t)in[0]);
result |= ((uint64_t)in[1]) << 8;
result |= ((uint64_t)in[2]) << 16;
result |= ((uint64_t)in[3]) << 24;
@@ -800,15 +831,15 @@ static uint64_t load_4(const uint8_t *in)
static void fe_frombytes(fe h, const uint8_t *s)
{
/* Ignores top bit of h. */
- int64_t h0 = load_4(s);
- int64_t h1 = load_3(s + 4) << 6;
- int64_t h2 = load_3(s + 7) << 5;
- int64_t h3 = load_3(s + 10) << 3;
- int64_t h4 = load_3(s + 13) << 2;
- int64_t h5 = load_4(s + 16);
- int64_t h6 = load_3(s + 20) << 7;
- int64_t h7 = load_3(s + 23) << 5;
- int64_t h8 = load_3(s + 26) << 4;
+ int64_t h0 = load_4(s);
+ int64_t h1 = load_3(s + 4) << 6;
+ int64_t h2 = load_3(s + 7) << 5;
+ int64_t h3 = load_3(s + 10) << 3;
+ int64_t h4 = load_3(s + 13) << 2;
+ int64_t h5 = load_4(s + 16);
+ int64_t h6 = load_3(s + 20) << 7;
+ int64_t h7 = load_3(s + 23) << 5;
+ int64_t h8 = load_3(s + 26) << 4;
int64_t h9 = (load_3(s + 29) & 0x7fffff) << 2;
int64_t carry0;
int64_t carry1;
@@ -821,17 +852,37 @@ static void fe_frombytes(fe h, const uint8_t *s)
int64_t carry8;
int64_t carry9;
- carry9 = h9 + (1 << 24); h0 += (carry9 >> 25) * 19; h9 -= carry9 & kTop39Bits;
- carry1 = h1 + (1 << 24); h2 += carry1 >> 25; h1 -= carry1 & kTop39Bits;
- carry3 = h3 + (1 << 24); h4 += carry3 >> 25; h3 -= carry3 & kTop39Bits;
- carry5 = h5 + (1 << 24); h6 += carry5 >> 25; h5 -= carry5 & kTop39Bits;
- carry7 = h7 + (1 << 24); h8 += carry7 >> 25; h7 -= carry7 & kTop39Bits;
-
- carry0 = h0 + (1 << 25); h1 += carry0 >> 26; h0 -= carry0 & kTop38Bits;
- carry2 = h2 + (1 << 25); h3 += carry2 >> 26; h2 -= carry2 & kTop38Bits;
- carry4 = h4 + (1 << 25); h5 += carry4 >> 26; h4 -= carry4 & kTop38Bits;
- carry6 = h6 + (1 << 25); h7 += carry6 >> 26; h6 -= carry6 & kTop38Bits;
- carry8 = h8 + (1 << 25); h9 += carry8 >> 26; h8 -= carry8 & kTop38Bits;
+ carry9 = h9 + (1 << 24);
+ h0 += (carry9 >> 25) * 19;
+ h9 -= carry9 & kTop39Bits;
+ carry1 = h1 + (1 << 24);
+ h2 += carry1 >> 25;
+ h1 -= carry1 & kTop39Bits;
+ carry3 = h3 + (1 << 24);
+ h4 += carry3 >> 25;
+ h3 -= carry3 & kTop39Bits;
+ carry5 = h5 + (1 << 24);
+ h6 += carry5 >> 25;
+ h5 -= carry5 & kTop39Bits;
+ carry7 = h7 + (1 << 24);
+ h8 += carry7 >> 25;
+ h7 -= carry7 & kTop39Bits;
+
+ carry0 = h0 + (1 << 25);
+ h1 += carry0 >> 26;
+ h0 -= carry0 & kTop38Bits;
+ carry2 = h2 + (1 << 25);
+ h3 += carry2 >> 26;
+ h2 -= carry2 & kTop38Bits;
+ carry4 = h4 + (1 << 25);
+ h5 += carry4 >> 26;
+ h4 -= carry4 & kTop38Bits;
+ carry6 = h6 + (1 << 25);
+ h7 += carry6 >> 26;
+ h6 -= carry6 & kTop38Bits;
+ carry8 = h8 + (1 << 25);
+ h9 += carry8 >> 26;
+ h8 -= carry8 & kTop38Bits;
h[0] = (int32_t)h0;
h[1] = (int32_t)h1;
@@ -883,7 +934,7 @@ static void fe_tobytes(uint8_t *s, const fe h)
int32_t h9 = h[9];
int32_t q;
- q = (19 * h9 + (((int32_t) 1) << 24)) >> 25;
+ q = (19 * h9 + (((int32_t)1) << 24)) >> 25;
q = (h0 + q) >> 26;
q = (h1 + q) >> 25;
q = (h2 + q) >> 26;
@@ -899,16 +950,25 @@ static void fe_tobytes(uint8_t *s, const fe h)
h0 += 19 * q;
/* Goal: Output h-2^255 q, which is between 0 and 2^255-20. */
- h1 += h0 >> 26; h0 &= kBottom26Bits;
- h2 += h1 >> 25; h1 &= kBottom25Bits;
- h3 += h2 >> 26; h2 &= kBottom26Bits;
- h4 += h3 >> 25; h3 &= kBottom25Bits;
- h5 += h4 >> 26; h4 &= kBottom26Bits;
- h6 += h5 >> 25; h5 &= kBottom25Bits;
- h7 += h6 >> 26; h6 &= kBottom26Bits;
- h8 += h7 >> 25; h7 &= kBottom25Bits;
- h9 += h8 >> 26; h8 &= kBottom26Bits;
- h9 &= kBottom25Bits;
+ h1 += h0 >> 26;
+ h0 &= kBottom26Bits;
+ h2 += h1 >> 25;
+ h1 &= kBottom25Bits;
+ h3 += h2 >> 26;
+ h2 &= kBottom26Bits;
+ h4 += h3 >> 25;
+ h3 &= kBottom25Bits;
+ h5 += h4 >> 26;
+ h4 &= kBottom26Bits;
+ h6 += h5 >> 25;
+ h5 &= kBottom25Bits;
+ h7 += h6 >> 26;
+ h6 &= kBottom26Bits;
+ h8 += h7 >> 25;
+ h7 &= kBottom25Bits;
+ h9 += h8 >> 26;
+ h8 &= kBottom26Bits;
+ h9 &= kBottom25Bits;
/* h10 = carry9 */
/*
@@ -917,38 +977,38 @@ static void fe_tobytes(uint8_t *s, const fe h)
* evidently 2^255 h10-2^255 q = 0.
* Goal: Output h0+...+2^230 h9.
*/
- s[ 0] = (uint8_t) (h0 >> 0);
- s[ 1] = (uint8_t) (h0 >> 8);
- s[ 2] = (uint8_t) (h0 >> 16);
- s[ 3] = (uint8_t)((h0 >> 24) | ((uint32_t)(h1) << 2));
- s[ 4] = (uint8_t) (h1 >> 6);
- s[ 5] = (uint8_t) (h1 >> 14);
- s[ 6] = (uint8_t)((h1 >> 22) | ((uint32_t)(h2) << 3));
- s[ 7] = (uint8_t) (h2 >> 5);
- s[ 8] = (uint8_t) (h2 >> 13);
- s[ 9] = (uint8_t)((h2 >> 21) | ((uint32_t)(h3) << 5));
- s[10] = (uint8_t) (h3 >> 3);
- s[11] = (uint8_t) (h3 >> 11);
+ s[0] = (uint8_t)(h0 >> 0);
+ s[1] = (uint8_t)(h0 >> 8);
+ s[2] = (uint8_t)(h0 >> 16);
+ s[3] = (uint8_t)((h0 >> 24) | ((uint32_t)(h1) << 2));
+ s[4] = (uint8_t)(h1 >> 6);
+ s[5] = (uint8_t)(h1 >> 14);
+ s[6] = (uint8_t)((h1 >> 22) | ((uint32_t)(h2) << 3));
+ s[7] = (uint8_t)(h2 >> 5);
+ s[8] = (uint8_t)(h2 >> 13);
+ s[9] = (uint8_t)((h2 >> 21) | ((uint32_t)(h3) << 5));
+ s[10] = (uint8_t)(h3 >> 3);
+ s[11] = (uint8_t)(h3 >> 11);
s[12] = (uint8_t)((h3 >> 19) | ((uint32_t)(h4) << 6));
- s[13] = (uint8_t) (h4 >> 2);
- s[14] = (uint8_t) (h4 >> 10);
- s[15] = (uint8_t) (h4 >> 18);
- s[16] = (uint8_t) (h5 >> 0);
- s[17] = (uint8_t) (h5 >> 8);
- s[18] = (uint8_t) (h5 >> 16);
+ s[13] = (uint8_t)(h4 >> 2);
+ s[14] = (uint8_t)(h4 >> 10);
+ s[15] = (uint8_t)(h4 >> 18);
+ s[16] = (uint8_t)(h5 >> 0);
+ s[17] = (uint8_t)(h5 >> 8);
+ s[18] = (uint8_t)(h5 >> 16);
s[19] = (uint8_t)((h5 >> 24) | ((uint32_t)(h6) << 1));
- s[20] = (uint8_t) (h6 >> 7);
- s[21] = (uint8_t) (h6 >> 15);
+ s[20] = (uint8_t)(h6 >> 7);
+ s[21] = (uint8_t)(h6 >> 15);
s[22] = (uint8_t)((h6 >> 23) | ((uint32_t)(h7) << 3));
- s[23] = (uint8_t) (h7 >> 5);
- s[24] = (uint8_t) (h7 >> 13);
+ s[23] = (uint8_t)(h7 >> 5);
+ s[24] = (uint8_t)(h7 >> 13);
s[25] = (uint8_t)((h7 >> 21) | ((uint32_t)(h8) << 4));
- s[26] = (uint8_t) (h8 >> 4);
- s[27] = (uint8_t) (h8 >> 12);
+ s[26] = (uint8_t)(h8 >> 4);
+ s[27] = (uint8_t)(h8 >> 12);
s[28] = (uint8_t)((h8 >> 20) | ((uint32_t)(h9) << 6));
- s[29] = (uint8_t) (h9 >> 2);
- s[30] = (uint8_t) (h9 >> 10);
- s[31] = (uint8_t) (h9 >> 18);
+ s[29] = (uint8_t)(h9 >> 2);
+ s[30] = (uint8_t)(h9 >> 10);
+ s[31] = (uint8_t)(h9 >> 18);
}
/* h = f */
@@ -1078,116 +1138,116 @@ static void fe_mul(fe h, const fe f, const fe g)
int32_t f5_2 = 2 * f5;
int32_t f7_2 = 2 * f7;
int32_t f9_2 = 2 * f9;
- int64_t f0g0 = f0 * (int64_t) g0;
- int64_t f0g1 = f0 * (int64_t) g1;
- int64_t f0g2 = f0 * (int64_t) g2;
- int64_t f0g3 = f0 * (int64_t) g3;
- int64_t f0g4 = f0 * (int64_t) g4;
- int64_t f0g5 = f0 * (int64_t) g5;
- int64_t f0g6 = f0 * (int64_t) g6;
- int64_t f0g7 = f0 * (int64_t) g7;
- int64_t f0g8 = f0 * (int64_t) g8;
- int64_t f0g9 = f0 * (int64_t) g9;
- int64_t f1g0 = f1 * (int64_t) g0;
- int64_t f1g1_2 = f1_2 * (int64_t) g1;
- int64_t f1g2 = f1 * (int64_t) g2;
- int64_t f1g3_2 = f1_2 * (int64_t) g3;
- int64_t f1g4 = f1 * (int64_t) g4;
- int64_t f1g5_2 = f1_2 * (int64_t) g5;
- int64_t f1g6 = f1 * (int64_t) g6;
- int64_t f1g7_2 = f1_2 * (int64_t) g7;
- int64_t f1g8 = f1 * (int64_t) g8;
- int64_t f1g9_38 = f1_2 * (int64_t) g9_19;
- int64_t f2g0 = f2 * (int64_t) g0;
- int64_t f2g1 = f2 * (int64_t) g1;
- int64_t f2g2 = f2 * (int64_t) g2;
- int64_t f2g3 = f2 * (int64_t) g3;
- int64_t f2g4 = f2 * (int64_t) g4;
- int64_t f2g5 = f2 * (int64_t) g5;
- int64_t f2g6 = f2 * (int64_t) g6;
- int64_t f2g7 = f2 * (int64_t) g7;
- int64_t f2g8_19 = f2 * (int64_t) g8_19;
- int64_t f2g9_19 = f2 * (int64_t) g9_19;
- int64_t f3g0 = f3 * (int64_t) g0;
- int64_t f3g1_2 = f3_2 * (int64_t) g1;
- int64_t f3g2 = f3 * (int64_t) g2;
- int64_t f3g3_2 = f3_2 * (int64_t) g3;
- int64_t f3g4 = f3 * (int64_t) g4;
- int64_t f3g5_2 = f3_2 * (int64_t) g5;
- int64_t f3g6 = f3 * (int64_t) g6;
- int64_t f3g7_38 = f3_2 * (int64_t) g7_19;
- int64_t f3g8_19 = f3 * (int64_t) g8_19;
- int64_t f3g9_38 = f3_2 * (int64_t) g9_19;
- int64_t f4g0 = f4 * (int64_t) g0;
- int64_t f4g1 = f4 * (int64_t) g1;
- int64_t f4g2 = f4 * (int64_t) g2;
- int64_t f4g3 = f4 * (int64_t) g3;
- int64_t f4g4 = f4 * (int64_t) g4;
- int64_t f4g5 = f4 * (int64_t) g5;
- int64_t f4g6_19 = f4 * (int64_t) g6_19;
- int64_t f4g7_19 = f4 * (int64_t) g7_19;
- int64_t f4g8_19 = f4 * (int64_t) g8_19;
- int64_t f4g9_19 = f4 * (int64_t) g9_19;
- int64_t f5g0 = f5 * (int64_t) g0;
- int64_t f5g1_2 = f5_2 * (int64_t) g1;
- int64_t f5g2 = f5 * (int64_t) g2;
- int64_t f5g3_2 = f5_2 * (int64_t) g3;
- int64_t f5g4 = f5 * (int64_t) g4;
- int64_t f5g5_38 = f5_2 * (int64_t) g5_19;
- int64_t f5g6_19 = f5 * (int64_t) g6_19;
- int64_t f5g7_38 = f5_2 * (int64_t) g7_19;
- int64_t f5g8_19 = f5 * (int64_t) g8_19;
- int64_t f5g9_38 = f5_2 * (int64_t) g9_19;
- int64_t f6g0 = f6 * (int64_t) g0;
- int64_t f6g1 = f6 * (int64_t) g1;
- int64_t f6g2 = f6 * (int64_t) g2;
- int64_t f6g3 = f6 * (int64_t) g3;
- int64_t f6g4_19 = f6 * (int64_t) g4_19;
- int64_t f6g5_19 = f6 * (int64_t) g5_19;
- int64_t f6g6_19 = f6 * (int64_t) g6_19;
- int64_t f6g7_19 = f6 * (int64_t) g7_19;
- int64_t f6g8_19 = f6 * (int64_t) g8_19;
- int64_t f6g9_19 = f6 * (int64_t) g9_19;
- int64_t f7g0 = f7 * (int64_t) g0;
- int64_t f7g1_2 = f7_2 * (int64_t) g1;
- int64_t f7g2 = f7 * (int64_t) g2;
- int64_t f7g3_38 = f7_2 * (int64_t) g3_19;
- int64_t f7g4_19 = f7 * (int64_t) g4_19;
- int64_t f7g5_38 = f7_2 * (int64_t) g5_19;
- int64_t f7g6_19 = f7 * (int64_t) g6_19;
- int64_t f7g7_38 = f7_2 * (int64_t) g7_19;
- int64_t f7g8_19 = f7 * (int64_t) g8_19;
- int64_t f7g9_38 = f7_2 * (int64_t) g9_19;
- int64_t f8g0 = f8 * (int64_t) g0;
- int64_t f8g1 = f8 * (int64_t) g1;
- int64_t f8g2_19 = f8 * (int64_t) g2_19;
- int64_t f8g3_19 = f8 * (int64_t) g3_19;
- int64_t f8g4_19 = f8 * (int64_t) g4_19;
- int64_t f8g5_19 = f8 * (int64_t) g5_19;
- int64_t f8g6_19 = f8 * (int64_t) g6_19;
- int64_t f8g7_19 = f8 * (int64_t) g7_19;
- int64_t f8g8_19 = f8 * (int64_t) g8_19;
- int64_t f8g9_19 = f8 * (int64_t) g9_19;
- int64_t f9g0 = f9 * (int64_t) g0;
- int64_t f9g1_38 = f9_2 * (int64_t) g1_19;
- int64_t f9g2_19 = f9 * (int64_t) g2_19;
- int64_t f9g3_38 = f9_2 * (int64_t) g3_19;
- int64_t f9g4_19 = f9 * (int64_t) g4_19;
- int64_t f9g5_38 = f9_2 * (int64_t) g5_19;
- int64_t f9g6_19 = f9 * (int64_t) g6_19;
- int64_t f9g7_38 = f9_2 * (int64_t) g7_19;
- int64_t f9g8_19 = f9 * (int64_t) g8_19;
- int64_t f9g9_38 = f9_2 * (int64_t) g9_19;
+ int64_t f0g0 = f0 * (int64_t)g0;
+ int64_t f0g1 = f0 * (int64_t)g1;
+ int64_t f0g2 = f0 * (int64_t)g2;
+ int64_t f0g3 = f0 * (int64_t)g3;
+ int64_t f0g4 = f0 * (int64_t)g4;
+ int64_t f0g5 = f0 * (int64_t)g5;
+ int64_t f0g6 = f0 * (int64_t)g6;
+ int64_t f0g7 = f0 * (int64_t)g7;
+ int64_t f0g8 = f0 * (int64_t)g8;
+ int64_t f0g9 = f0 * (int64_t)g9;
+ int64_t f1g0 = f1 * (int64_t)g0;
+ int64_t f1g1_2 = f1_2 * (int64_t)g1;
+ int64_t f1g2 = f1 * (int64_t)g2;
+ int64_t f1g3_2 = f1_2 * (int64_t)g3;
+ int64_t f1g4 = f1 * (int64_t)g4;
+ int64_t f1g5_2 = f1_2 * (int64_t)g5;
+ int64_t f1g6 = f1 * (int64_t)g6;
+ int64_t f1g7_2 = f1_2 * (int64_t)g7;
+ int64_t f1g8 = f1 * (int64_t)g8;
+ int64_t f1g9_38 = f1_2 * (int64_t)g9_19;
+ int64_t f2g0 = f2 * (int64_t)g0;
+ int64_t f2g1 = f2 * (int64_t)g1;
+ int64_t f2g2 = f2 * (int64_t)g2;
+ int64_t f2g3 = f2 * (int64_t)g3;
+ int64_t f2g4 = f2 * (int64_t)g4;
+ int64_t f2g5 = f2 * (int64_t)g5;
+ int64_t f2g6 = f2 * (int64_t)g6;
+ int64_t f2g7 = f2 * (int64_t)g7;
+ int64_t f2g8_19 = f2 * (int64_t)g8_19;
+ int64_t f2g9_19 = f2 * (int64_t)g9_19;
+ int64_t f3g0 = f3 * (int64_t)g0;
+ int64_t f3g1_2 = f3_2 * (int64_t)g1;
+ int64_t f3g2 = f3 * (int64_t)g2;
+ int64_t f3g3_2 = f3_2 * (int64_t)g3;
+ int64_t f3g4 = f3 * (int64_t)g4;
+ int64_t f3g5_2 = f3_2 * (int64_t)g5;
+ int64_t f3g6 = f3 * (int64_t)g6;
+ int64_t f3g7_38 = f3_2 * (int64_t)g7_19;
+ int64_t f3g8_19 = f3 * (int64_t)g8_19;
+ int64_t f3g9_38 = f3_2 * (int64_t)g9_19;
+ int64_t f4g0 = f4 * (int64_t)g0;
+ int64_t f4g1 = f4 * (int64_t)g1;
+ int64_t f4g2 = f4 * (int64_t)g2;
+ int64_t f4g3 = f4 * (int64_t)g3;
+ int64_t f4g4 = f4 * (int64_t)g4;
+ int64_t f4g5 = f4 * (int64_t)g5;
+ int64_t f4g6_19 = f4 * (int64_t)g6_19;
+ int64_t f4g7_19 = f4 * (int64_t)g7_19;
+ int64_t f4g8_19 = f4 * (int64_t)g8_19;
+ int64_t f4g9_19 = f4 * (int64_t)g9_19;
+ int64_t f5g0 = f5 * (int64_t)g0;
+ int64_t f5g1_2 = f5_2 * (int64_t)g1;
+ int64_t f5g2 = f5 * (int64_t)g2;
+ int64_t f5g3_2 = f5_2 * (int64_t)g3;
+ int64_t f5g4 = f5 * (int64_t)g4;
+ int64_t f5g5_38 = f5_2 * (int64_t)g5_19;
+ int64_t f5g6_19 = f5 * (int64_t)g6_19;
+ int64_t f5g7_38 = f5_2 * (int64_t)g7_19;
+ int64_t f5g8_19 = f5 * (int64_t)g8_19;
+ int64_t f5g9_38 = f5_2 * (int64_t)g9_19;
+ int64_t f6g0 = f6 * (int64_t)g0;
+ int64_t f6g1 = f6 * (int64_t)g1;
+ int64_t f6g2 = f6 * (int64_t)g2;
+ int64_t f6g3 = f6 * (int64_t)g3;
+ int64_t f6g4_19 = f6 * (int64_t)g4_19;
+ int64_t f6g5_19 = f6 * (int64_t)g5_19;
+ int64_t f6g6_19 = f6 * (int64_t)g6_19;
+ int64_t f6g7_19 = f6 * (int64_t)g7_19;
+ int64_t f6g8_19 = f6 * (int64_t)g8_19;
+ int64_t f6g9_19 = f6 * (int64_t)g9_19;
+ int64_t f7g0 = f7 * (int64_t)g0;
+ int64_t f7g1_2 = f7_2 * (int64_t)g1;
+ int64_t f7g2 = f7 * (int64_t)g2;
+ int64_t f7g3_38 = f7_2 * (int64_t)g3_19;
+ int64_t f7g4_19 = f7 * (int64_t)g4_19;
+ int64_t f7g5_38 = f7_2 * (int64_t)g5_19;
+ int64_t f7g6_19 = f7 * (int64_t)g6_19;
+ int64_t f7g7_38 = f7_2 * (int64_t)g7_19;
+ int64_t f7g8_19 = f7 * (int64_t)g8_19;
+ int64_t f7g9_38 = f7_2 * (int64_t)g9_19;
+ int64_t f8g0 = f8 * (int64_t)g0;
+ int64_t f8g1 = f8 * (int64_t)g1;
+ int64_t f8g2_19 = f8 * (int64_t)g2_19;
+ int64_t f8g3_19 = f8 * (int64_t)g3_19;
+ int64_t f8g4_19 = f8 * (int64_t)g4_19;
+ int64_t f8g5_19 = f8 * (int64_t)g5_19;
+ int64_t f8g6_19 = f8 * (int64_t)g6_19;
+ int64_t f8g7_19 = f8 * (int64_t)g7_19;
+ int64_t f8g8_19 = f8 * (int64_t)g8_19;
+ int64_t f8g9_19 = f8 * (int64_t)g9_19;
+ int64_t f9g0 = f9 * (int64_t)g0;
+ int64_t f9g1_38 = f9_2 * (int64_t)g1_19;
+ int64_t f9g2_19 = f9 * (int64_t)g2_19;
+ int64_t f9g3_38 = f9_2 * (int64_t)g3_19;
+ int64_t f9g4_19 = f9 * (int64_t)g4_19;
+ int64_t f9g5_38 = f9_2 * (int64_t)g5_19;
+ int64_t f9g6_19 = f9 * (int64_t)g6_19;
+ int64_t f9g7_38 = f9_2 * (int64_t)g7_19;
+ int64_t f9g8_19 = f9 * (int64_t)g8_19;
+ int64_t f9g9_38 = f9_2 * (int64_t)g9_19;
int64_t h0 = f0g0 + f1g9_38 + f2g8_19 + f3g7_38 + f4g6_19 + f5g5_38 + f6g4_19 + f7g3_38 + f8g2_19 + f9g1_38;
- int64_t h1 = f0g1 + f1g0 + f2g9_19 + f3g8_19 + f4g7_19 + f5g6_19 + f6g5_19 + f7g4_19 + f8g3_19 + f9g2_19;
- int64_t h2 = f0g2 + f1g1_2 + f2g0 + f3g9_38 + f4g8_19 + f5g7_38 + f6g6_19 + f7g5_38 + f8g4_19 + f9g3_38;
- int64_t h3 = f0g3 + f1g2 + f2g1 + f3g0 + f4g9_19 + f5g8_19 + f6g7_19 + f7g6_19 + f8g5_19 + f9g4_19;
- int64_t h4 = f0g4 + f1g3_2 + f2g2 + f3g1_2 + f4g0 + f5g9_38 + f6g8_19 + f7g7_38 + f8g6_19 + f9g5_38;
- int64_t h5 = f0g5 + f1g4 + f2g3 + f3g2 + f4g1 + f5g0 + f6g9_19 + f7g8_19 + f8g7_19 + f9g6_19;
- int64_t h6 = f0g6 + f1g5_2 + f2g4 + f3g3_2 + f4g2 + f5g1_2 + f6g0 + f7g9_38 + f8g8_19 + f9g7_38;
- int64_t h7 = f0g7 + f1g6 + f2g5 + f3g4 + f4g3 + f5g2 + f6g1 + f7g0 + f8g9_19 + f9g8_19;
- int64_t h8 = f0g8 + f1g7_2 + f2g6 + f3g5_2 + f4g4 + f5g3_2 + f6g2 + f7g1_2 + f8g0 + f9g9_38;
- int64_t h9 = f0g9 + f1g8 + f2g7 + f3g6 + f4g5 + f5g4 + f6g3 + f7g2 + f8g1 + f9g0 ;
+ int64_t h1 = f0g1 + f1g0 + f2g9_19 + f3g8_19 + f4g7_19 + f5g6_19 + f6g5_19 + f7g4_19 + f8g3_19 + f9g2_19;
+ int64_t h2 = f0g2 + f1g1_2 + f2g0 + f3g9_38 + f4g8_19 + f5g7_38 + f6g6_19 + f7g5_38 + f8g4_19 + f9g3_38;
+ int64_t h3 = f0g3 + f1g2 + f2g1 + f3g0 + f4g9_19 + f5g8_19 + f6g7_19 + f7g6_19 + f8g5_19 + f9g4_19;
+ int64_t h4 = f0g4 + f1g3_2 + f2g2 + f3g1_2 + f4g0 + f5g9_38 + f6g8_19 + f7g7_38 + f8g6_19 + f9g5_38;
+ int64_t h5 = f0g5 + f1g4 + f2g3 + f3g2 + f4g1 + f5g0 + f6g9_19 + f7g8_19 + f8g7_19 + f9g6_19;
+ int64_t h6 = f0g6 + f1g5_2 + f2g4 + f3g3_2 + f4g2 + f5g1_2 + f6g0 + f7g9_38 + f8g8_19 + f9g7_38;
+ int64_t h7 = f0g7 + f1g6 + f2g5 + f3g4 + f4g3 + f5g2 + f6g1 + f7g0 + f8g9_19 + f9g8_19;
+ int64_t h8 = f0g8 + f1g7_2 + f2g6 + f3g5_2 + f4g4 + f5g3_2 + f6g2 + f7g1_2 + f8g0 + f9g9_38;
+ int64_t h9 = f0g9 + f1g8 + f2g7 + f3g6 + f4g5 + f5g4 + f6g3 + f7g2 + f8g1 + f9g0;
int64_t carry0;
int64_t carry1;
int64_t carry2;
@@ -1204,46 +1264,70 @@ static void fe_mul(fe h, const fe f, const fe g)
* |h1| <= (1.65*1.65*2^51*(1+1+19+19+19+19+19+19+19+19))
* i.e. |h1| <= 1.7*2^59; narrower ranges for h3, h5, h7, h9 */
- carry0 = h0 + (1 << 25); h1 += carry0 >> 26; h0 -= carry0 & kTop38Bits;
- carry4 = h4 + (1 << 25); h5 += carry4 >> 26; h4 -= carry4 & kTop38Bits;
+ carry0 = h0 + (1 << 25);
+ h1 += carry0 >> 26;
+ h0 -= carry0 & kTop38Bits;
+ carry4 = h4 + (1 << 25);
+ h5 += carry4 >> 26;
+ h4 -= carry4 & kTop38Bits;
/* |h0| <= 2^25 */
/* |h4| <= 2^25 */
/* |h1| <= 1.71*2^59 */
/* |h5| <= 1.71*2^59 */
- carry1 = h1 + (1 << 24); h2 += carry1 >> 25; h1 -= carry1 & kTop39Bits;
- carry5 = h5 + (1 << 24); h6 += carry5 >> 25; h5 -= carry5 & kTop39Bits;
+ carry1 = h1 + (1 << 24);
+ h2 += carry1 >> 25;
+ h1 -= carry1 & kTop39Bits;
+ carry5 = h5 + (1 << 24);
+ h6 += carry5 >> 25;
+ h5 -= carry5 & kTop39Bits;
/* |h1| <= 2^24; from now on fits into int32 */
/* |h5| <= 2^24; from now on fits into int32 */
/* |h2| <= 1.41*2^60 */
/* |h6| <= 1.41*2^60 */
- carry2 = h2 + (1 << 25); h3 += carry2 >> 26; h2 -= carry2 & kTop38Bits;
- carry6 = h6 + (1 << 25); h7 += carry6 >> 26; h6 -= carry6 & kTop38Bits;
+ carry2 = h2 + (1 << 25);
+ h3 += carry2 >> 26;
+ h2 -= carry2 & kTop38Bits;
+ carry6 = h6 + (1 << 25);
+ h7 += carry6 >> 26;
+ h6 -= carry6 & kTop38Bits;
/* |h2| <= 2^25; from now on fits into int32 unchanged */
/* |h6| <= 2^25; from now on fits into int32 unchanged */
/* |h3| <= 1.71*2^59 */
/* |h7| <= 1.71*2^59 */
- carry3 = h3 + (1 << 24); h4 += carry3 >> 25; h3 -= carry3 & kTop39Bits;
- carry7 = h7 + (1 << 24); h8 += carry7 >> 25; h7 -= carry7 & kTop39Bits;
+ carry3 = h3 + (1 << 24);
+ h4 += carry3 >> 25;
+ h3 -= carry3 & kTop39Bits;
+ carry7 = h7 + (1 << 24);
+ h8 += carry7 >> 25;
+ h7 -= carry7 & kTop39Bits;
/* |h3| <= 2^24; from now on fits into int32 unchanged */
/* |h7| <= 2^24; from now on fits into int32 unchanged */
/* |h4| <= 1.72*2^34 */
/* |h8| <= 1.41*2^60 */
- carry4 = h4 + (1 << 25); h5 += carry4 >> 26; h4 -= carry4 & kTop38Bits;
- carry8 = h8 + (1 << 25); h9 += carry8 >> 26; h8 -= carry8 & kTop38Bits;
+ carry4 = h4 + (1 << 25);
+ h5 += carry4 >> 26;
+ h4 -= carry4 & kTop38Bits;
+ carry8 = h8 + (1 << 25);
+ h9 += carry8 >> 26;
+ h8 -= carry8 & kTop38Bits;
/* |h4| <= 2^25; from now on fits into int32 unchanged */
/* |h8| <= 2^25; from now on fits into int32 unchanged */
/* |h5| <= 1.01*2^24 */
/* |h9| <= 1.71*2^59 */
- carry9 = h9 + (1 << 24); h0 += (carry9 >> 25) * 19; h9 -= carry9 & kTop39Bits;
+ carry9 = h9 + (1 << 24);
+ h0 += (carry9 >> 25) * 19;
+ h9 -= carry9 & kTop39Bits;
/* |h9| <= 2^24; from now on fits into int32 unchanged */
/* |h0| <= 1.1*2^39 */
- carry0 = h0 + (1 << 25); h1 += carry0 >> 26; h0 -= carry0 & kTop38Bits;
+ carry0 = h0 + (1 << 25);
+ h1 += carry0 >> 26;
+ h0 -= carry0 & kTop38Bits;
/* |h0| <= 2^25; from now on fits into int32 unchanged */
/* |h1| <= 1.01*2^24 */
@@ -1297,71 +1381,71 @@ static void fe_sq(fe h, const fe f)
int32_t f7_38 = 38 * f7; /* 1.959375*2^30 */
int32_t f8_19 = 19 * f8; /* 1.959375*2^30 */
int32_t f9_38 = 38 * f9; /* 1.959375*2^30 */
- int64_t f0f0 = f0 * (int64_t) f0;
- int64_t f0f1_2 = f0_2 * (int64_t) f1;
- int64_t f0f2_2 = f0_2 * (int64_t) f2;
- int64_t f0f3_2 = f0_2 * (int64_t) f3;
- int64_t f0f4_2 = f0_2 * (int64_t) f4;
- int64_t f0f5_2 = f0_2 * (int64_t) f5;
- int64_t f0f6_2 = f0_2 * (int64_t) f6;
- int64_t f0f7_2 = f0_2 * (int64_t) f7;
- int64_t f0f8_2 = f0_2 * (int64_t) f8;
- int64_t f0f9_2 = f0_2 * (int64_t) f9;
- int64_t f1f1_2 = f1_2 * (int64_t) f1;
- int64_t f1f2_2 = f1_2 * (int64_t) f2;
- int64_t f1f3_4 = f1_2 * (int64_t) f3_2;
- int64_t f1f4_2 = f1_2 * (int64_t) f4;
- int64_t f1f5_4 = f1_2 * (int64_t) f5_2;
- int64_t f1f6_2 = f1_2 * (int64_t) f6;
- int64_t f1f7_4 = f1_2 * (int64_t) f7_2;
- int64_t f1f8_2 = f1_2 * (int64_t) f8;
- int64_t f1f9_76 = f1_2 * (int64_t) f9_38;
- int64_t f2f2 = f2 * (int64_t) f2;
- int64_t f2f3_2 = f2_2 * (int64_t) f3;
- int64_t f2f4_2 = f2_2 * (int64_t) f4;
- int64_t f2f5_2 = f2_2 * (int64_t) f5;
- int64_t f2f6_2 = f2_2 * (int64_t) f6;
- int64_t f2f7_2 = f2_2 * (int64_t) f7;
- int64_t f2f8_38 = f2_2 * (int64_t) f8_19;
- int64_t f2f9_38 = f2 * (int64_t) f9_38;
- int64_t f3f3_2 = f3_2 * (int64_t) f3;
- int64_t f3f4_2 = f3_2 * (int64_t) f4;
- int64_t f3f5_4 = f3_2 * (int64_t) f5_2;
- int64_t f3f6_2 = f3_2 * (int64_t) f6;
- int64_t f3f7_76 = f3_2 * (int64_t) f7_38;
- int64_t f3f8_38 = f3_2 * (int64_t) f8_19;
- int64_t f3f9_76 = f3_2 * (int64_t) f9_38;
- int64_t f4f4 = f4 * (int64_t) f4;
- int64_t f4f5_2 = f4_2 * (int64_t) f5;
- int64_t f4f6_38 = f4_2 * (int64_t) f6_19;
- int64_t f4f7_38 = f4 * (int64_t) f7_38;
- int64_t f4f8_38 = f4_2 * (int64_t) f8_19;
- int64_t f4f9_38 = f4 * (int64_t) f9_38;
- int64_t f5f5_38 = f5 * (int64_t) f5_38;
- int64_t f5f6_38 = f5_2 * (int64_t) f6_19;
- int64_t f5f7_76 = f5_2 * (int64_t) f7_38;
- int64_t f5f8_38 = f5_2 * (int64_t) f8_19;
- int64_t f5f9_76 = f5_2 * (int64_t) f9_38;
- int64_t f6f6_19 = f6 * (int64_t) f6_19;
- int64_t f6f7_38 = f6 * (int64_t) f7_38;
- int64_t f6f8_38 = f6_2 * (int64_t) f8_19;
- int64_t f6f9_38 = f6 * (int64_t) f9_38;
- int64_t f7f7_38 = f7 * (int64_t) f7_38;
- int64_t f7f8_38 = f7_2 * (int64_t) f8_19;
- int64_t f7f9_76 = f7_2 * (int64_t) f9_38;
- int64_t f8f8_19 = f8 * (int64_t) f8_19;
- int64_t f8f9_38 = f8 * (int64_t) f9_38;
- int64_t f9f9_38 = f9 * (int64_t) f9_38;
- int64_t h0 = f0f0 + f1f9_76 + f2f8_38 + f3f7_76 + f4f6_38 + f5f5_38;
+ int64_t f0f0 = f0 * (int64_t)f0;
+ int64_t f0f1_2 = f0_2 * (int64_t)f1;
+ int64_t f0f2_2 = f0_2 * (int64_t)f2;
+ int64_t f0f3_2 = f0_2 * (int64_t)f3;
+ int64_t f0f4_2 = f0_2 * (int64_t)f4;
+ int64_t f0f5_2 = f0_2 * (int64_t)f5;
+ int64_t f0f6_2 = f0_2 * (int64_t)f6;
+ int64_t f0f7_2 = f0_2 * (int64_t)f7;
+ int64_t f0f8_2 = f0_2 * (int64_t)f8;
+ int64_t f0f9_2 = f0_2 * (int64_t)f9;
+ int64_t f1f1_2 = f1_2 * (int64_t)f1;
+ int64_t f1f2_2 = f1_2 * (int64_t)f2;
+ int64_t f1f3_4 = f1_2 * (int64_t)f3_2;
+ int64_t f1f4_2 = f1_2 * (int64_t)f4;
+ int64_t f1f5_4 = f1_2 * (int64_t)f5_2;
+ int64_t f1f6_2 = f1_2 * (int64_t)f6;
+ int64_t f1f7_4 = f1_2 * (int64_t)f7_2;
+ int64_t f1f8_2 = f1_2 * (int64_t)f8;
+ int64_t f1f9_76 = f1_2 * (int64_t)f9_38;
+ int64_t f2f2 = f2 * (int64_t)f2;
+ int64_t f2f3_2 = f2_2 * (int64_t)f3;
+ int64_t f2f4_2 = f2_2 * (int64_t)f4;
+ int64_t f2f5_2 = f2_2 * (int64_t)f5;
+ int64_t f2f6_2 = f2_2 * (int64_t)f6;
+ int64_t f2f7_2 = f2_2 * (int64_t)f7;
+ int64_t f2f8_38 = f2_2 * (int64_t)f8_19;
+ int64_t f2f9_38 = f2 * (int64_t)f9_38;
+ int64_t f3f3_2 = f3_2 * (int64_t)f3;
+ int64_t f3f4_2 = f3_2 * (int64_t)f4;
+ int64_t f3f5_4 = f3_2 * (int64_t)f5_2;
+ int64_t f3f6_2 = f3_2 * (int64_t)f6;
+ int64_t f3f7_76 = f3_2 * (int64_t)f7_38;
+ int64_t f3f8_38 = f3_2 * (int64_t)f8_19;
+ int64_t f3f9_76 = f3_2 * (int64_t)f9_38;
+ int64_t f4f4 = f4 * (int64_t)f4;
+ int64_t f4f5_2 = f4_2 * (int64_t)f5;
+ int64_t f4f6_38 = f4_2 * (int64_t)f6_19;
+ int64_t f4f7_38 = f4 * (int64_t)f7_38;
+ int64_t f4f8_38 = f4_2 * (int64_t)f8_19;
+ int64_t f4f9_38 = f4 * (int64_t)f9_38;
+ int64_t f5f5_38 = f5 * (int64_t)f5_38;
+ int64_t f5f6_38 = f5_2 * (int64_t)f6_19;
+ int64_t f5f7_76 = f5_2 * (int64_t)f7_38;
+ int64_t f5f8_38 = f5_2 * (int64_t)f8_19;
+ int64_t f5f9_76 = f5_2 * (int64_t)f9_38;
+ int64_t f6f6_19 = f6 * (int64_t)f6_19;
+ int64_t f6f7_38 = f6 * (int64_t)f7_38;
+ int64_t f6f8_38 = f6_2 * (int64_t)f8_19;
+ int64_t f6f9_38 = f6 * (int64_t)f9_38;
+ int64_t f7f7_38 = f7 * (int64_t)f7_38;
+ int64_t f7f8_38 = f7_2 * (int64_t)f8_19;
+ int64_t f7f9_76 = f7_2 * (int64_t)f9_38;
+ int64_t f8f8_19 = f8 * (int64_t)f8_19;
+ int64_t f8f9_38 = f8 * (int64_t)f9_38;
+ int64_t f9f9_38 = f9 * (int64_t)f9_38;
+ int64_t h0 = f0f0 + f1f9_76 + f2f8_38 + f3f7_76 + f4f6_38 + f5f5_38;
int64_t h1 = f0f1_2 + f2f9_38 + f3f8_38 + f4f7_38 + f5f6_38;
- int64_t h2 = f0f2_2 + f1f1_2 + f3f9_76 + f4f8_38 + f5f7_76 + f6f6_19;
- int64_t h3 = f0f3_2 + f1f2_2 + f4f9_38 + f5f8_38 + f6f7_38;
- int64_t h4 = f0f4_2 + f1f3_4 + f2f2 + f5f9_76 + f6f8_38 + f7f7_38;
- int64_t h5 = f0f5_2 + f1f4_2 + f2f3_2 + f6f9_38 + f7f8_38;
- int64_t h6 = f0f6_2 + f1f5_4 + f2f4_2 + f3f3_2 + f7f9_76 + f8f8_19;
- int64_t h7 = f0f7_2 + f1f6_2 + f2f5_2 + f3f4_2 + f8f9_38;
- int64_t h8 = f0f8_2 + f1f7_4 + f2f6_2 + f3f5_4 + f4f4 + f9f9_38;
- int64_t h9 = f0f9_2 + f1f8_2 + f2f7_2 + f3f6_2 + f4f5_2;
+ int64_t h2 = f0f2_2 + f1f1_2 + f3f9_76 + f4f8_38 + f5f7_76 + f6f6_19;
+ int64_t h3 = f0f3_2 + f1f2_2 + f4f9_38 + f5f8_38 + f6f7_38;
+ int64_t h4 = f0f4_2 + f1f3_4 + f2f2 + f5f9_76 + f6f8_38 + f7f7_38;
+ int64_t h5 = f0f5_2 + f1f4_2 + f2f3_2 + f6f9_38 + f7f8_38;
+ int64_t h6 = f0f6_2 + f1f5_4 + f2f4_2 + f3f3_2 + f7f9_76 + f8f8_19;
+ int64_t h7 = f0f7_2 + f1f6_2 + f2f5_2 + f3f4_2 + f8f9_38;
+ int64_t h8 = f0f8_2 + f1f7_4 + f2f6_2 + f3f5_4 + f4f4 + f9f9_38;
+ int64_t h9 = f0f9_2 + f1f8_2 + f2f7_2 + f3f6_2 + f4f5_2;
int64_t carry0;
int64_t carry1;
int64_t carry2;
@@ -1373,24 +1457,48 @@ static void fe_sq(fe h, const fe f)
int64_t carry8;
int64_t carry9;
- carry0 = h0 + (1 << 25); h1 += carry0 >> 26; h0 -= carry0 & kTop38Bits;
- carry4 = h4 + (1 << 25); h5 += carry4 >> 26; h4 -= carry4 & kTop38Bits;
-
- carry1 = h1 + (1 << 24); h2 += carry1 >> 25; h1 -= carry1 & kTop39Bits;
- carry5 = h5 + (1 << 24); h6 += carry5 >> 25; h5 -= carry5 & kTop39Bits;
-
- carry2 = h2 + (1 << 25); h3 += carry2 >> 26; h2 -= carry2 & kTop38Bits;
- carry6 = h6 + (1 << 25); h7 += carry6 >> 26; h6 -= carry6 & kTop38Bits;
-
- carry3 = h3 + (1 << 24); h4 += carry3 >> 25; h3 -= carry3 & kTop39Bits;
- carry7 = h7 + (1 << 24); h8 += carry7 >> 25; h7 -= carry7 & kTop39Bits;
-
- carry4 = h4 + (1 << 25); h5 += carry4 >> 26; h4 -= carry4 & kTop38Bits;
- carry8 = h8 + (1 << 25); h9 += carry8 >> 26; h8 -= carry8 & kTop38Bits;
-
- carry9 = h9 + (1 << 24); h0 += (carry9 >> 25) * 19; h9 -= carry9 & kTop39Bits;
-
- carry0 = h0 + (1 << 25); h1 += carry0 >> 26; h0 -= carry0 & kTop38Bits;
+ carry0 = h0 + (1 << 25);
+ h1 += carry0 >> 26;
+ h0 -= carry0 & kTop38Bits;
+ carry4 = h4 + (1 << 25);
+ h5 += carry4 >> 26;
+ h4 -= carry4 & kTop38Bits;
+
+ carry1 = h1 + (1 << 24);
+ h2 += carry1 >> 25;
+ h1 -= carry1 & kTop39Bits;
+ carry5 = h5 + (1 << 24);
+ h6 += carry5 >> 25;
+ h5 -= carry5 & kTop39Bits;
+
+ carry2 = h2 + (1 << 25);
+ h3 += carry2 >> 26;
+ h2 -= carry2 & kTop38Bits;
+ carry6 = h6 + (1 << 25);
+ h7 += carry6 >> 26;
+ h6 -= carry6 & kTop38Bits;
+
+ carry3 = h3 + (1 << 24);
+ h4 += carry3 >> 25;
+ h3 -= carry3 & kTop39Bits;
+ carry7 = h7 + (1 << 24);
+ h8 += carry7 >> 25;
+ h7 -= carry7 & kTop39Bits;
+
+ carry4 = h4 + (1 << 25);
+ h5 += carry4 >> 26;
+ h4 -= carry4 & kTop38Bits;
+ carry8 = h8 + (1 << 25);
+ h9 += carry8 >> 26;
+ h8 -= carry8 & kTop38Bits;
+
+ carry9 = h9 + (1 << 24);
+ h0 += (carry9 >> 25) * 19;
+ h9 -= carry9 & kTop39Bits;
+
+ carry0 = h0 + (1 << 25);
+ h1 += carry0 >> 26;
+ h0 -= carry0 & kTop38Bits;
h[0] = (int32_t)h0;
h[1] = (int32_t)h1;
@@ -1528,7 +1636,7 @@ static void fe_cmov(fe f, const fe g, unsigned b)
{
size_t i;
- b = 0-b;
+ b = 0 - b;
for (i = 0; i < 10; i++) {
int32_t x = f[i] ^ g[i];
x &= b;
@@ -1546,7 +1654,7 @@ static void fe_cmov(fe f, const fe g, unsigned b)
static int fe_isnonzero(const fe f)
{
uint8_t s[32];
- static const uint8_t zero[32] = {0};
+ static const uint8_t zero[32] = { 0 };
fe_tobytes(s, f);
@@ -1606,71 +1714,71 @@ static void fe_sq2(fe h, const fe f)
int32_t f7_38 = 38 * f7; /* 1.959375*2^30 */
int32_t f8_19 = 19 * f8; /* 1.959375*2^30 */
int32_t f9_38 = 38 * f9; /* 1.959375*2^30 */
- int64_t f0f0 = f0 * (int64_t) f0;
- int64_t f0f1_2 = f0_2 * (int64_t) f1;
- int64_t f0f2_2 = f0_2 * (int64_t) f2;
- int64_t f0f3_2 = f0_2 * (int64_t) f3;
- int64_t f0f4_2 = f0_2 * (int64_t) f4;
- int64_t f0f5_2 = f0_2 * (int64_t) f5;
- int64_t f0f6_2 = f0_2 * (int64_t) f6;
- int64_t f0f7_2 = f0_2 * (int64_t) f7;
- int64_t f0f8_2 = f0_2 * (int64_t) f8;
- int64_t f0f9_2 = f0_2 * (int64_t) f9;
- int64_t f1f1_2 = f1_2 * (int64_t) f1;
- int64_t f1f2_2 = f1_2 * (int64_t) f2;
- int64_t f1f3_4 = f1_2 * (int64_t) f3_2;
- int64_t f1f4_2 = f1_2 * (int64_t) f4;
- int64_t f1f5_4 = f1_2 * (int64_t) f5_2;
- int64_t f1f6_2 = f1_2 * (int64_t) f6;
- int64_t f1f7_4 = f1_2 * (int64_t) f7_2;
- int64_t f1f8_2 = f1_2 * (int64_t) f8;
- int64_t f1f9_76 = f1_2 * (int64_t) f9_38;
- int64_t f2f2 = f2 * (int64_t) f2;
- int64_t f2f3_2 = f2_2 * (int64_t) f3;
- int64_t f2f4_2 = f2_2 * (int64_t) f4;
- int64_t f2f5_2 = f2_2 * (int64_t) f5;
- int64_t f2f6_2 = f2_2 * (int64_t) f6;
- int64_t f2f7_2 = f2_2 * (int64_t) f7;
- int64_t f2f8_38 = f2_2 * (int64_t) f8_19;
- int64_t f2f9_38 = f2 * (int64_t) f9_38;
- int64_t f3f3_2 = f3_2 * (int64_t) f3;
- int64_t f3f4_2 = f3_2 * (int64_t) f4;
- int64_t f3f5_4 = f3_2 * (int64_t) f5_2;
- int64_t f3f6_2 = f3_2 * (int64_t) f6;
- int64_t f3f7_76 = f3_2 * (int64_t) f7_38;
- int64_t f3f8_38 = f3_2 * (int64_t) f8_19;
- int64_t f3f9_76 = f3_2 * (int64_t) f9_38;
- int64_t f4f4 = f4 * (int64_t) f4;
- int64_t f4f5_2 = f4_2 * (int64_t) f5;
- int64_t f4f6_38 = f4_2 * (int64_t) f6_19;
- int64_t f4f7_38 = f4 * (int64_t) f7_38;
- int64_t f4f8_38 = f4_2 * (int64_t) f8_19;
- int64_t f4f9_38 = f4 * (int64_t) f9_38;
- int64_t f5f5_38 = f5 * (int64_t) f5_38;
- int64_t f5f6_38 = f5_2 * (int64_t) f6_19;
- int64_t f5f7_76 = f5_2 * (int64_t) f7_38;
- int64_t f5f8_38 = f5_2 * (int64_t) f8_19;
- int64_t f5f9_76 = f5_2 * (int64_t) f9_38;
- int64_t f6f6_19 = f6 * (int64_t) f6_19;
- int64_t f6f7_38 = f6 * (int64_t) f7_38;
- int64_t f6f8_38 = f6_2 * (int64_t) f8_19;
- int64_t f6f9_38 = f6 * (int64_t) f9_38;
- int64_t f7f7_38 = f7 * (int64_t) f7_38;
- int64_t f7f8_38 = f7_2 * (int64_t) f8_19;
- int64_t f7f9_76 = f7_2 * (int64_t) f9_38;
- int64_t f8f8_19 = f8 * (int64_t) f8_19;
- int64_t f8f9_38 = f8 * (int64_t) f9_38;
- int64_t f9f9_38 = f9 * (int64_t) f9_38;
- int64_t h0 = f0f0 + f1f9_76 + f2f8_38 + f3f7_76 + f4f6_38 + f5f5_38;
+ int64_t f0f0 = f0 * (int64_t)f0;
+ int64_t f0f1_2 = f0_2 * (int64_t)f1;
+ int64_t f0f2_2 = f0_2 * (int64_t)f2;
+ int64_t f0f3_2 = f0_2 * (int64_t)f3;
+ int64_t f0f4_2 = f0_2 * (int64_t)f4;
+ int64_t f0f5_2 = f0_2 * (int64_t)f5;
+ int64_t f0f6_2 = f0_2 * (int64_t)f6;
+ int64_t f0f7_2 = f0_2 * (int64_t)f7;
+ int64_t f0f8_2 = f0_2 * (int64_t)f8;
+ int64_t f0f9_2 = f0_2 * (int64_t)f9;
+ int64_t f1f1_2 = f1_2 * (int64_t)f1;
+ int64_t f1f2_2 = f1_2 * (int64_t)f2;
+ int64_t f1f3_4 = f1_2 * (int64_t)f3_2;
+ int64_t f1f4_2 = f1_2 * (int64_t)f4;
+ int64_t f1f5_4 = f1_2 * (int64_t)f5_2;
+ int64_t f1f6_2 = f1_2 * (int64_t)f6;
+ int64_t f1f7_4 = f1_2 * (int64_t)f7_2;
+ int64_t f1f8_2 = f1_2 * (int64_t)f8;
+ int64_t f1f9_76 = f1_2 * (int64_t)f9_38;
+ int64_t f2f2 = f2 * (int64_t)f2;
+ int64_t f2f3_2 = f2_2 * (int64_t)f3;
+ int64_t f2f4_2 = f2_2 * (int64_t)f4;
+ int64_t f2f5_2 = f2_2 * (int64_t)f5;
+ int64_t f2f6_2 = f2_2 * (int64_t)f6;
+ int64_t f2f7_2 = f2_2 * (int64_t)f7;
+ int64_t f2f8_38 = f2_2 * (int64_t)f8_19;
+ int64_t f2f9_38 = f2 * (int64_t)f9_38;
+ int64_t f3f3_2 = f3_2 * (int64_t)f3;
+ int64_t f3f4_2 = f3_2 * (int64_t)f4;
+ int64_t f3f5_4 = f3_2 * (int64_t)f5_2;
+ int64_t f3f6_2 = f3_2 * (int64_t)f6;
+ int64_t f3f7_76 = f3_2 * (int64_t)f7_38;
+ int64_t f3f8_38 = f3_2 * (int64_t)f8_19;
+ int64_t f3f9_76 = f3_2 * (int64_t)f9_38;
+ int64_t f4f4 = f4 * (int64_t)f4;
+ int64_t f4f5_2 = f4_2 * (int64_t)f5;
+ int64_t f4f6_38 = f4_2 * (int64_t)f6_19;
+ int64_t f4f7_38 = f4 * (int64_t)f7_38;
+ int64_t f4f8_38 = f4_2 * (int64_t)f8_19;
+ int64_t f4f9_38 = f4 * (int64_t)f9_38;
+ int64_t f5f5_38 = f5 * (int64_t)f5_38;
+ int64_t f5f6_38 = f5_2 * (int64_t)f6_19;
+ int64_t f5f7_76 = f5_2 * (int64_t)f7_38;
+ int64_t f5f8_38 = f5_2 * (int64_t)f8_19;
+ int64_t f5f9_76 = f5_2 * (int64_t)f9_38;
+ int64_t f6f6_19 = f6 * (int64_t)f6_19;
+ int64_t f6f7_38 = f6 * (int64_t)f7_38;
+ int64_t f6f8_38 = f6_2 * (int64_t)f8_19;
+ int64_t f6f9_38 = f6 * (int64_t)f9_38;
+ int64_t f7f7_38 = f7 * (int64_t)f7_38;
+ int64_t f7f8_38 = f7_2 * (int64_t)f8_19;
+ int64_t f7f9_76 = f7_2 * (int64_t)f9_38;
+ int64_t f8f8_19 = f8 * (int64_t)f8_19;
+ int64_t f8f9_38 = f8 * (int64_t)f9_38;
+ int64_t f9f9_38 = f9 * (int64_t)f9_38;
+ int64_t h0 = f0f0 + f1f9_76 + f2f8_38 + f3f7_76 + f4f6_38 + f5f5_38;
int64_t h1 = f0f1_2 + f2f9_38 + f3f8_38 + f4f7_38 + f5f6_38;
- int64_t h2 = f0f2_2 + f1f1_2 + f3f9_76 + f4f8_38 + f5f7_76 + f6f6_19;
- int64_t h3 = f0f3_2 + f1f2_2 + f4f9_38 + f5f8_38 + f6f7_38;
- int64_t h4 = f0f4_2 + f1f3_4 + f2f2 + f5f9_76 + f6f8_38 + f7f7_38;
- int64_t h5 = f0f5_2 + f1f4_2 + f2f3_2 + f6f9_38 + f7f8_38;
- int64_t h6 = f0f6_2 + f1f5_4 + f2f4_2 + f3f3_2 + f7f9_76 + f8f8_19;
- int64_t h7 = f0f7_2 + f1f6_2 + f2f5_2 + f3f4_2 + f8f9_38;
- int64_t h8 = f0f8_2 + f1f7_4 + f2f6_2 + f3f5_4 + f4f4 + f9f9_38;
- int64_t h9 = f0f9_2 + f1f8_2 + f2f7_2 + f3f6_2 + f4f5_2;
+ int64_t h2 = f0f2_2 + f1f1_2 + f3f9_76 + f4f8_38 + f5f7_76 + f6f6_19;
+ int64_t h3 = f0f3_2 + f1f2_2 + f4f9_38 + f5f8_38 + f6f7_38;
+ int64_t h4 = f0f4_2 + f1f3_4 + f2f2 + f5f9_76 + f6f8_38 + f7f7_38;
+ int64_t h5 = f0f5_2 + f1f4_2 + f2f3_2 + f6f9_38 + f7f8_38;
+ int64_t h6 = f0f6_2 + f1f5_4 + f2f4_2 + f3f3_2 + f7f9_76 + f8f8_19;
+ int64_t h7 = f0f7_2 + f1f6_2 + f2f5_2 + f3f4_2 + f8f9_38;
+ int64_t h8 = f0f8_2 + f1f7_4 + f2f6_2 + f3f5_4 + f4f4 + f9f9_38;
+ int64_t h9 = f0f9_2 + f1f8_2 + f2f7_2 + f3f6_2 + f4f5_2;
int64_t carry0;
int64_t carry1;
int64_t carry2;
@@ -1693,24 +1801,48 @@ static void fe_sq2(fe h, const fe f)
h8 += h8;
h9 += h9;
- carry0 = h0 + (1 << 25); h1 += carry0 >> 26; h0 -= carry0 & kTop38Bits;
- carry4 = h4 + (1 << 25); h5 += carry4 >> 26; h4 -= carry4 & kTop38Bits;
-
- carry1 = h1 + (1 << 24); h2 += carry1 >> 25; h1 -= carry1 & kTop39Bits;
- carry5 = h5 + (1 << 24); h6 += carry5 >> 25; h5 -= carry5 & kTop39Bits;
-
- carry2 = h2 + (1 << 25); h3 += carry2 >> 26; h2 -= carry2 & kTop38Bits;
- carry6 = h6 + (1 << 25); h7 += carry6 >> 26; h6 -= carry6 & kTop38Bits;
-
- carry3 = h3 + (1 << 24); h4 += carry3 >> 25; h3 -= carry3 & kTop39Bits;
- carry7 = h7 + (1 << 24); h8 += carry7 >> 25; h7 -= carry7 & kTop39Bits;
-
- carry4 = h4 + (1 << 25); h5 += carry4 >> 26; h4 -= carry4 & kTop38Bits;
- carry8 = h8 + (1 << 25); h9 += carry8 >> 26; h8 -= carry8 & kTop38Bits;
-
- carry9 = h9 + (1 << 24); h0 += (carry9 >> 25) * 19; h9 -= carry9 & kTop39Bits;
-
- carry0 = h0 + (1 << 25); h1 += carry0 >> 26; h0 -= carry0 & kTop38Bits;
+ carry0 = h0 + (1 << 25);
+ h1 += carry0 >> 26;
+ h0 -= carry0 & kTop38Bits;
+ carry4 = h4 + (1 << 25);
+ h5 += carry4 >> 26;
+ h4 -= carry4 & kTop38Bits;
+
+ carry1 = h1 + (1 << 24);
+ h2 += carry1 >> 25;
+ h1 -= carry1 & kTop39Bits;
+ carry5 = h5 + (1 << 24);
+ h6 += carry5 >> 25;
+ h5 -= carry5 & kTop39Bits;
+
+ carry2 = h2 + (1 << 25);
+ h3 += carry2 >> 26;
+ h2 -= carry2 & kTop38Bits;
+ carry6 = h6 + (1 << 25);
+ h7 += carry6 >> 26;
+ h6 -= carry6 & kTop38Bits;
+
+ carry3 = h3 + (1 << 24);
+ h4 += carry3 >> 25;
+ h3 -= carry3 & kTop39Bits;
+ carry7 = h7 + (1 << 24);
+ h8 += carry7 >> 25;
+ h7 -= carry7 & kTop39Bits;
+
+ carry4 = h4 + (1 << 25);
+ h5 += carry4 >> 26;
+ h4 -= carry4 & kTop38Bits;
+ carry8 = h8 + (1 << 25);
+ h9 += carry8 >> 26;
+ h8 -= carry8 & kTop38Bits;
+
+ carry9 = h9 + (1 << 24);
+ h0 += (carry9 >> 25) * 19;
+ h9 -= carry9 & kTop39Bits;
+
+ carry0 = h0 + (1 << 25);
+ h1 += carry0 >> 26;
+ h0 -= carry0 & kTop38Bits;
h[0] = (int32_t)h0;
h[1] = (int32_t)h1;
@@ -1855,13 +1987,13 @@ static void ge_p3_tobytes(uint8_t *s, const ge_p3 *h)
}
static const fe d = {
- -10913610, 13857413, -15372611, 6949391, 114729,
- -8787816, -6275908, -3247719, -18696448, -12055116
+ -10913610, 13857413, -15372611, 6949391, 114729,
+ -8787816, -6275908, -3247719, -18696448, -12055116
};
static const fe sqrtm1 = {
- -32595792, -7943725, 9377950, 3500415, 12389472,
- -272473, -25146209, -2005654, 326686, 11406482
+ -32595792, -7943725, 9377950, 3500415, 12389472,
+ -272473, -25146209, -2005654, 326686, 11406482
};
static int ge_frombytes_vartime(ge_p3 *h, const uint8_t *s)
@@ -1934,8 +2066,8 @@ static void ge_p3_to_p2(ge_p2 *r, const ge_p3 *p)
}
static const fe d2 = {
- -21827239, -5839606, -30745221, 13898782, 229458,
- 15978800, -12551817, -6495438, 29715968, 9444199
+ -21827239, -5839606, -30745221, 13898782, 229458,
+ 15978800, -12551817, -6495438, 29715968, 9444199
};
/* r = p */
@@ -2063,9 +2195,9 @@ static uint8_t equal(signed char b, signed char c)
uint8_t ub = b;
uint8_t uc = c;
uint8_t x = ub ^ uc; /* 0: yes; 1..255: no */
- uint32_t y = x; /* 0: yes; 1..255: no */
- y -= 1; /* 4294967295: yes; 0..254: no */
- y >>= 31; /* 1: yes; 0: no */
+ uint32_t y = x; /* 0: yes; 1..255: no */
+ y -= 1; /* 4294967295: yes; 0..254: no */
+ y >>= 31; /* 1: yes; 0: no */
return y;
}
@@ -2080,2114 +2212,2114 @@ static void cmov(ge_precomp *t, const ge_precomp *u, uint8_t b)
static const ge_precomp k25519Precomp[32][8] = {
{
{
- {25967493, -14356035, 29566456, 3660896, -12694345, 4014787,
- 27544626, -11754271, -6079156, 2047605},
- {-12545711, 934262, -2722910, 3049990, -727428, 9406986, 12720692,
- 5043384, 19500929, -15469378},
- {-8738181, 4489570, 9688441, -14785194, 10184609, -12363380,
- 29287919, 11864899, -24514362, -4438546},
+ { 25967493, -14356035, 29566456, 3660896, -12694345, 4014787,
+ 27544626, -11754271, -6079156, 2047605 },
+ { -12545711, 934262, -2722910, 3049990, -727428, 9406986, 12720692,
+ 5043384, 19500929, -15469378 },
+ { -8738181, 4489570, 9688441, -14785194, 10184609, -12363380,
+ 29287919, 11864899, -24514362, -4438546 },
},
{
- {-12815894, -12976347, -21581243, 11784320, -25355658, -2750717,
- -11717903, -3814571, -358445, -10211303},
- {-21703237, 6903825, 27185491, 6451973, -29577724, -9554005,
- -15616551, 11189268, -26829678, -5319081},
- {26966642, 11152617, 32442495, 15396054, 14353839, -12752335,
- -3128826, -9541118, -15472047, -4166697},
+ { -12815894, -12976347, -21581243, 11784320, -25355658, -2750717,
+ -11717903, -3814571, -358445, -10211303 },
+ { -21703237, 6903825, 27185491, 6451973, -29577724, -9554005,
+ -15616551, 11189268, -26829678, -5319081 },
+ { 26966642, 11152617, 32442495, 15396054, 14353839, -12752335,
+ -3128826, -9541118, -15472047, -4166697 },
},
{
- {15636291, -9688557, 24204773, -7912398, 616977, -16685262,
- 27787600, -14772189, 28944400, -1550024},
- {16568933, 4717097, -11556148, -1102322, 15682896, -11807043,
- 16354577, -11775962, 7689662, 11199574},
- {30464156, -5976125, -11779434, -15670865, 23220365, 15915852,
- 7512774, 10017326, -17749093, -9920357},
+ { 15636291, -9688557, 24204773, -7912398, 616977, -16685262,
+ 27787600, -14772189, 28944400, -1550024 },
+ { 16568933, 4717097, -11556148, -1102322, 15682896, -11807043,
+ 16354577, -11775962, 7689662, 11199574 },
+ { 30464156, -5976125, -11779434, -15670865, 23220365, 15915852,
+ 7512774, 10017326, -17749093, -9920357 },
},
{
- {-17036878, 13921892, 10945806, -6033431, 27105052, -16084379,
- -28926210, 15006023, 3284568, -6276540},
- {23599295, -8306047, -11193664, -7687416, 13236774, 10506355,
- 7464579, 9656445, 13059162, 10374397},
- {7798556, 16710257, 3033922, 2874086, 28997861, 2835604, 32406664,
- -3839045, -641708, -101325},
+ { -17036878, 13921892, 10945806, -6033431, 27105052, -16084379,
+ -28926210, 15006023, 3284568, -6276540 },
+ { 23599295, -8306047, -11193664, -7687416, 13236774, 10506355,
+ 7464579, 9656445, 13059162, 10374397 },
+ { 7798556, 16710257, 3033922, 2874086, 28997861, 2835604, 32406664,
+ -3839045, -641708, -101325 },
},
{
- {10861363, 11473154, 27284546, 1981175, -30064349, 12577861,
- 32867885, 14515107, -15438304, 10819380},
- {4708026, 6336745, 20377586, 9066809, -11272109, 6594696, -25653668,
- 12483688, -12668491, 5581306},
- {19563160, 16186464, -29386857, 4097519, 10237984, -4348115,
- 28542350, 13850243, -23678021, -15815942},
+ { 10861363, 11473154, 27284546, 1981175, -30064349, 12577861,
+ 32867885, 14515107, -15438304, 10819380 },
+ { 4708026, 6336745, 20377586, 9066809, -11272109, 6594696, -25653668,
+ 12483688, -12668491, 5581306 },
+ { 19563160, 16186464, -29386857, 4097519, 10237984, -4348115,
+ 28542350, 13850243, -23678021, -15815942 },
},
{
- {-15371964, -12862754, 32573250, 4720197, -26436522, 5875511,
- -19188627, -15224819, -9818940, -12085777},
- {-8549212, 109983, 15149363, 2178705, 22900618, 4543417, 3044240,
- -15689887, 1762328, 14866737},
- {-18199695, -15951423, -10473290, 1707278, -17185920, 3916101,
- -28236412, 3959421, 27914454, 4383652},
+ { -15371964, -12862754, 32573250, 4720197, -26436522, 5875511,
+ -19188627, -15224819, -9818940, -12085777 },
+ { -8549212, 109983, 15149363, 2178705, 22900618, 4543417, 3044240,
+ -15689887, 1762328, 14866737 },
+ { -18199695, -15951423, -10473290, 1707278, -17185920, 3916101,
+ -28236412, 3959421, 27914454, 4383652 },
},
{
- {5153746, 9909285, 1723747, -2777874, 30523605, 5516873, 19480852,
- 5230134, -23952439, -15175766},
- {-30269007, -3463509, 7665486, 10083793, 28475525, 1649722,
- 20654025, 16520125, 30598449, 7715701},
- {28881845, 14381568, 9657904, 3680757, -20181635, 7843316,
- -31400660, 1370708, 29794553, -1409300},
+ { 5153746, 9909285, 1723747, -2777874, 30523605, 5516873, 19480852,
+ 5230134, -23952439, -15175766 },
+ { -30269007, -3463509, 7665486, 10083793, 28475525, 1649722,
+ 20654025, 16520125, 30598449, 7715701 },
+ { 28881845, 14381568, 9657904, 3680757, -20181635, 7843316,
+ -31400660, 1370708, 29794553, -1409300 },
},
{
- {14499471, -2729599, -33191113, -4254652, 28494862, 14271267,
- 30290735, 10876454, -33154098, 2381726},
- {-7195431, -2655363, -14730155, 462251, -27724326, 3941372,
- -6236617, 3696005, -32300832, 15351955},
- {27431194, 8222322, 16448760, -3907995, -18707002, 11938355,
- -32961401, -2970515, 29551813, 10109425},
+ { 14499471, -2729599, -33191113, -4254652, 28494862, 14271267,
+ 30290735, 10876454, -33154098, 2381726 },
+ { -7195431, -2655363, -14730155, 462251, -27724326, 3941372,
+ -6236617, 3696005, -32300832, 15351955 },
+ { 27431194, 8222322, 16448760, -3907995, -18707002, 11938355,
+ -32961401, -2970515, 29551813, 10109425 },
},
},
{
{
- {-13657040, -13155431, -31283750, 11777098, 21447386, 6519384,
- -2378284, -1627556, 10092783, -4764171},
- {27939166, 14210322, 4677035, 16277044, -22964462, -12398139,
- -32508754, 12005538, -17810127, 12803510},
- {17228999, -15661624, -1233527, 300140, -1224870, -11714777,
- 30364213, -9038194, 18016357, 4397660},
+ { -13657040, -13155431, -31283750, 11777098, 21447386, 6519384,
+ -2378284, -1627556, 10092783, -4764171 },
+ { 27939166, 14210322, 4677035, 16277044, -22964462, -12398139,
+ -32508754, 12005538, -17810127, 12803510 },
+ { 17228999, -15661624, -1233527, 300140, -1224870, -11714777,
+ 30364213, -9038194, 18016357, 4397660 },
},
{
- {-10958843, -7690207, 4776341, -14954238, 27850028, -15602212,
- -26619106, 14544525, -17477504, 982639},
- {29253598, 15796703, -2863982, -9908884, 10057023, 3163536, 7332899,
- -4120128, -21047696, 9934963},
- {5793303, 16271923, -24131614, -10116404, 29188560, 1206517,
- -14747930, 4559895, -30123922, -10897950},
+ { -10958843, -7690207, 4776341, -14954238, 27850028, -15602212,
+ -26619106, 14544525, -17477504, 982639 },
+ { 29253598, 15796703, -2863982, -9908884, 10057023, 3163536, 7332899,
+ -4120128, -21047696, 9934963 },
+ { 5793303, 16271923, -24131614, -10116404, 29188560, 1206517,
+ -14747930, 4559895, -30123922, -10897950 },
},
{
- {-27643952, -11493006, 16282657, -11036493, 28414021, -15012264,
- 24191034, 4541697, -13338309, 5500568},
- {12650548, -1497113, 9052871, 11355358, -17680037, -8400164,
- -17430592, 12264343, 10874051, 13524335},
- {25556948, -3045990, 714651, 2510400, 23394682, -10415330, 33119038,
- 5080568, -22528059, 5376628},
+ { -27643952, -11493006, 16282657, -11036493, 28414021, -15012264,
+ 24191034, 4541697, -13338309, 5500568 },
+ { 12650548, -1497113, 9052871, 11355358, -17680037, -8400164,
+ -17430592, 12264343, 10874051, 13524335 },
+ { 25556948, -3045990, 714651, 2510400, 23394682, -10415330, 33119038,
+ 5080568, -22528059, 5376628 },
},
{
- {-26088264, -4011052, -17013699, -3537628, -6726793, 1920897,
- -22321305, -9447443, 4535768, 1569007},
- {-2255422, 14606630, -21692440, -8039818, 28430649, 8775819,
- -30494562, 3044290, 31848280, 12543772},
- {-22028579, 2943893, -31857513, 6777306, 13784462, -4292203,
- -27377195, -2062731, 7718482, 14474653},
+ { -26088264, -4011052, -17013699, -3537628, -6726793, 1920897,
+ -22321305, -9447443, 4535768, 1569007 },
+ { -2255422, 14606630, -21692440, -8039818, 28430649, 8775819,
+ -30494562, 3044290, 31848280, 12543772 },
+ { -22028579, 2943893, -31857513, 6777306, 13784462, -4292203,
+ -27377195, -2062731, 7718482, 14474653 },
},
{
- {2385315, 2454213, -22631320, 46603, -4437935, -15680415, 656965,
- -7236665, 24316168, -5253567},
- {13741529, 10911568, -33233417, -8603737, -20177830, -1033297,
- 33040651, -13424532, -20729456, 8321686},
- {21060490, -2212744, 15712757, -4336099, 1639040, 10656336,
- 23845965, -11874838, -9984458, 608372},
+ { 2385315, 2454213, -22631320, 46603, -4437935, -15680415, 656965,
+ -7236665, 24316168, -5253567 },
+ { 13741529, 10911568, -33233417, -8603737, -20177830, -1033297,
+ 33040651, -13424532, -20729456, 8321686 },
+ { 21060490, -2212744, 15712757, -4336099, 1639040, 10656336,
+ 23845965, -11874838, -9984458, 608372 },
},
{
- {-13672732, -15087586, -10889693, -7557059, -6036909, 11305547,
- 1123968, -6780577, 27229399, 23887},
- {-23244140, -294205, -11744728, 14712571, -29465699, -2029617,
- 12797024, -6440308, -1633405, 16678954},
- {-29500620, 4770662, -16054387, 14001338, 7830047, 9564805,
- -1508144, -4795045, -17169265, 4904953},
+ { -13672732, -15087586, -10889693, -7557059, -6036909, 11305547,
+ 1123968, -6780577, 27229399, 23887 },
+ { -23244140, -294205, -11744728, 14712571, -29465699, -2029617,
+ 12797024, -6440308, -1633405, 16678954 },
+ { -29500620, 4770662, -16054387, 14001338, 7830047, 9564805,
+ -1508144, -4795045, -17169265, 4904953 },
},
{
- {24059557, 14617003, 19037157, -15039908, 19766093, -14906429,
- 5169211, 16191880, 2128236, -4326833},
- {-16981152, 4124966, -8540610, -10653797, 30336522, -14105247,
- -29806336, 916033, -6882542, -2986532},
- {-22630907, 12419372, -7134229, -7473371, -16478904, 16739175,
- 285431, 2763829, 15736322, 4143876},
+ { 24059557, 14617003, 19037157, -15039908, 19766093, -14906429,
+ 5169211, 16191880, 2128236, -4326833 },
+ { -16981152, 4124966, -8540610, -10653797, 30336522, -14105247,
+ -29806336, 916033, -6882542, -2986532 },
+ { -22630907, 12419372, -7134229, -7473371, -16478904, 16739175,
+ 285431, 2763829, 15736322, 4143876 },
},
{
- {2379352, 11839345, -4110402, -5988665, 11274298, 794957, 212801,
- -14594663, 23527084, -16458268},
- {33431127, -11130478, -17838966, -15626900, 8909499, 8376530,
- -32625340, 4087881, -15188911, -14416214},
- {1767683, 7197987, -13205226, -2022635, -13091350, 448826, 5799055,
- 4357868, -4774191, -16323038},
+ { 2379352, 11839345, -4110402, -5988665, 11274298, 794957, 212801,
+ -14594663, 23527084, -16458268 },
+ { 33431127, -11130478, -17838966, -15626900, 8909499, 8376530,
+ -32625340, 4087881, -15188911, -14416214 },
+ { 1767683, 7197987, -13205226, -2022635, -13091350, 448826, 5799055,
+ 4357868, -4774191, -16323038 },
},
},
{
{
- {6721966, 13833823, -23523388, -1551314, 26354293, -11863321,
- 23365147, -3949732, 7390890, 2759800},
- {4409041, 2052381, 23373853, 10530217, 7676779, -12885954, 21302353,
- -4264057, 1244380, -12919645},
- {-4421239, 7169619, 4982368, -2957590, 30256825, -2777540, 14086413,
- 9208236, 15886429, 16489664},
+ { 6721966, 13833823, -23523388, -1551314, 26354293, -11863321,
+ 23365147, -3949732, 7390890, 2759800 },
+ { 4409041, 2052381, 23373853, 10530217, 7676779, -12885954, 21302353,
+ -4264057, 1244380, -12919645 },
+ { -4421239, 7169619, 4982368, -2957590, 30256825, -2777540, 14086413,
+ 9208236, 15886429, 16489664 },
},
{
- {1996075, 10375649, 14346367, 13311202, -6874135, -16438411,
- -13693198, 398369, -30606455, -712933},
- {-25307465, 9795880, -2777414, 14878809, -33531835, 14780363,
- 13348553, 12076947, -30836462, 5113182},
- {-17770784, 11797796, 31950843, 13929123, -25888302, 12288344,
- -30341101, -7336386, 13847711, 5387222},
+ { 1996075, 10375649, 14346367, 13311202, -6874135, -16438411,
+ -13693198, 398369, -30606455, -712933 },
+ { -25307465, 9795880, -2777414, 14878809, -33531835, 14780363,
+ 13348553, 12076947, -30836462, 5113182 },
+ { -17770784, 11797796, 31950843, 13929123, -25888302, 12288344,
+ -30341101, -7336386, 13847711, 5387222 },
},
{
- {-18582163, -3416217, 17824843, -2340966, 22744343, -10442611,
- 8763061, 3617786, -19600662, 10370991},
- {20246567, -14369378, 22358229, -543712, 18507283, -10413996,
- 14554437, -8746092, 32232924, 16763880},
- {9648505, 10094563, 26416693, 14745928, -30374318, -6472621,
- 11094161, 15689506, 3140038, -16510092},
+ { -18582163, -3416217, 17824843, -2340966, 22744343, -10442611,
+ 8763061, 3617786, -19600662, 10370991 },
+ { 20246567, -14369378, 22358229, -543712, 18507283, -10413996,
+ 14554437, -8746092, 32232924, 16763880 },
+ { 9648505, 10094563, 26416693, 14745928, -30374318, -6472621,
+ 11094161, 15689506, 3140038, -16510092 },
},
{
- {-16160072, 5472695, 31895588, 4744994, 8823515, 10365685,
- -27224800, 9448613, -28774454, 366295},
- {19153450, 11523972, -11096490, -6503142, -24647631, 5420647,
- 28344573, 8041113, 719605, 11671788},
- {8678025, 2694440, -6808014, 2517372, 4964326, 11152271, -15432916,
- -15266516, 27000813, -10195553},
+ { -16160072, 5472695, 31895588, 4744994, 8823515, 10365685,
+ -27224800, 9448613, -28774454, 366295 },
+ { 19153450, 11523972, -11096490, -6503142, -24647631, 5420647,
+ 28344573, 8041113, 719605, 11671788 },
+ { 8678025, 2694440, -6808014, 2517372, 4964326, 11152271, -15432916,
+ -15266516, 27000813, -10195553 },
},
{
- {-15157904, 7134312, 8639287, -2814877, -7235688, 10421742, 564065,
- 5336097, 6750977, -14521026},
- {11836410, -3979488, 26297894, 16080799, 23455045, 15735944,
- 1695823, -8819122, 8169720, 16220347},
- {-18115838, 8653647, 17578566, -6092619, -8025777, -16012763,
- -11144307, -2627664, -5990708, -14166033},
+ { -15157904, 7134312, 8639287, -2814877, -7235688, 10421742, 564065,
+ 5336097, 6750977, -14521026 },
+ { 11836410, -3979488, 26297894, 16080799, 23455045, 15735944,
+ 1695823, -8819122, 8169720, 16220347 },
+ { -18115838, 8653647, 17578566, -6092619, -8025777, -16012763,
+ -11144307, -2627664, -5990708, -14166033 },
},
{
- {-23308498, -10968312, 15213228, -10081214, -30853605, -11050004,
- 27884329, 2847284, 2655861, 1738395},
- {-27537433, -14253021, -25336301, -8002780, -9370762, 8129821,
- 21651608, -3239336, -19087449, -11005278},
- {1533110, 3437855, 23735889, 459276, 29970501, 11335377, 26030092,
- 5821408, 10478196, 8544890},
+ { -23308498, -10968312, 15213228, -10081214, -30853605, -11050004,
+ 27884329, 2847284, 2655861, 1738395 },
+ { -27537433, -14253021, -25336301, -8002780, -9370762, 8129821,
+ 21651608, -3239336, -19087449, -11005278 },
+ { 1533110, 3437855, 23735889, 459276, 29970501, 11335377, 26030092,
+ 5821408, 10478196, 8544890 },
},
{
- {32173121, -16129311, 24896207, 3921497, 22579056, -3410854,
- 19270449, 12217473, 17789017, -3395995},
- {-30552961, -2228401, -15578829, -10147201, 13243889, 517024,
- 15479401, -3853233, 30460520, 1052596},
- {-11614875, 13323618, 32618793, 8175907, -15230173, 12596687,
- 27491595, -4612359, 3179268, -9478891},
+ { 32173121, -16129311, 24896207, 3921497, 22579056, -3410854,
+ 19270449, 12217473, 17789017, -3395995 },
+ { -30552961, -2228401, -15578829, -10147201, 13243889, 517024,
+ 15479401, -3853233, 30460520, 1052596 },
+ { -11614875, 13323618, 32618793, 8175907, -15230173, 12596687,
+ 27491595, -4612359, 3179268, -9478891 },
},
{
- {31947069, -14366651, -4640583, -15339921, -15125977, -6039709,
- -14756777, -16411740, 19072640, -9511060},
- {11685058, 11822410, 3158003, -13952594, 33402194, -4165066,
- 5977896, -5215017, 473099, 5040608},
- {-20290863, 8198642, -27410132, 11602123, 1290375, -2799760,
- 28326862, 1721092, -19558642, -3131606},
+ { 31947069, -14366651, -4640583, -15339921, -15125977, -6039709,
+ -14756777, -16411740, 19072640, -9511060 },
+ { 11685058, 11822410, 3158003, -13952594, 33402194, -4165066,
+ 5977896, -5215017, 473099, 5040608 },
+ { -20290863, 8198642, -27410132, 11602123, 1290375, -2799760,
+ 28326862, 1721092, -19558642, -3131606 },
},
},
{
{
- {7881532, 10687937, 7578723, 7738378, -18951012, -2553952, 21820786,
- 8076149, -27868496, 11538389},
- {-19935666, 3899861, 18283497, -6801568, -15728660, -11249211,
- 8754525, 7446702, -5676054, 5797016},
- {-11295600, -3793569, -15782110, -7964573, 12708869, -8456199,
- 2014099, -9050574, -2369172, -5877341},
+ { 7881532, 10687937, 7578723, 7738378, -18951012, -2553952, 21820786,
+ 8076149, -27868496, 11538389 },
+ { -19935666, 3899861, 18283497, -6801568, -15728660, -11249211,
+ 8754525, 7446702, -5676054, 5797016 },
+ { -11295600, -3793569, -15782110, -7964573, 12708869, -8456199,
+ 2014099, -9050574, -2369172, -5877341 },
},
{
- {-22472376, -11568741, -27682020, 1146375, 18956691, 16640559,
- 1192730, -3714199, 15123619, 10811505},
- {14352098, -3419715, -18942044, 10822655, 32750596, 4699007, -70363,
- 15776356, -28886779, -11974553},
- {-28241164, -8072475, -4978962, -5315317, 29416931, 1847569,
- -20654173, -16484855, 4714547, -9600655},
+ { -22472376, -11568741, -27682020, 1146375, 18956691, 16640559,
+ 1192730, -3714199, 15123619, 10811505 },
+ { 14352098, -3419715, -18942044, 10822655, 32750596, 4699007, -70363,
+ 15776356, -28886779, -11974553 },
+ { -28241164, -8072475, -4978962, -5315317, 29416931, 1847569,
+ -20654173, -16484855, 4714547, -9600655 },
},
{
- {15200332, 8368572, 19679101, 15970074, -31872674, 1959451,
- 24611599, -4543832, -11745876, 12340220},
- {12876937, -10480056, 33134381, 6590940, -6307776, 14872440,
- 9613953, 8241152, 15370987, 9608631},
- {-4143277, -12014408, 8446281, -391603, 4407738, 13629032, -7724868,
- 15866074, -28210621, -8814099},
+ { 15200332, 8368572, 19679101, 15970074, -31872674, 1959451,
+ 24611599, -4543832, -11745876, 12340220 },
+ { 12876937, -10480056, 33134381, 6590940, -6307776, 14872440,
+ 9613953, 8241152, 15370987, 9608631 },
+ { -4143277, -12014408, 8446281, -391603, 4407738, 13629032, -7724868,
+ 15866074, -28210621, -8814099 },
},
{
- {26660628, -15677655, 8393734, 358047, -7401291, 992988, -23904233,
- 858697, 20571223, 8420556},
- {14620715, 13067227, -15447274, 8264467, 14106269, 15080814,
- 33531827, 12516406, -21574435, -12476749},
- {236881, 10476226, 57258, -14677024, 6472998, 2466984, 17258519,
- 7256740, 8791136, 15069930},
+ { 26660628, -15677655, 8393734, 358047, -7401291, 992988, -23904233,
+ 858697, 20571223, 8420556 },
+ { 14620715, 13067227, -15447274, 8264467, 14106269, 15080814,
+ 33531827, 12516406, -21574435, -12476749 },
+ { 236881, 10476226, 57258, -14677024, 6472998, 2466984, 17258519,
+ 7256740, 8791136, 15069930 },
},
{
- {1276410, -9371918, 22949635, -16322807, -23493039, -5702186,
- 14711875, 4874229, -30663140, -2331391},
- {5855666, 4990204, -13711848, 7294284, -7804282, 1924647, -1423175,
- -7912378, -33069337, 9234253},
- {20590503, -9018988, 31529744, -7352666, -2706834, 10650548,
- 31559055, -11609587, 18979186, 13396066},
+ { 1276410, -9371918, 22949635, -16322807, -23493039, -5702186,
+ 14711875, 4874229, -30663140, -2331391 },
+ { 5855666, 4990204, -13711848, 7294284, -7804282, 1924647, -1423175,
+ -7912378, -33069337, 9234253 },
+ { 20590503, -9018988, 31529744, -7352666, -2706834, 10650548,
+ 31559055, -11609587, 18979186, 13396066 },
},
{
- {24474287, 4968103, 22267082, 4407354, 24063882, -8325180,
- -18816887, 13594782, 33514650, 7021958},
- {-11566906, -6565505, -21365085, 15928892, -26158305, 4315421,
- -25948728, -3916677, -21480480, 12868082},
- {-28635013, 13504661, 19988037, -2132761, 21078225, 6443208,
- -21446107, 2244500, -12455797, -8089383},
+ { 24474287, 4968103, 22267082, 4407354, 24063882, -8325180,
+ -18816887, 13594782, 33514650, 7021958 },
+ { -11566906, -6565505, -21365085, 15928892, -26158305, 4315421,
+ -25948728, -3916677, -21480480, 12868082 },
+ { -28635013, 13504661, 19988037, -2132761, 21078225, 6443208,
+ -21446107, 2244500, -12455797, -8089383 },
},
{
- {-30595528, 13793479, -5852820, 319136, -25723172, -6263899,
- 33086546, 8957937, -15233648, 5540521},
- {-11630176, -11503902, -8119500, -7643073, 2620056, 1022908,
- -23710744, -1568984, -16128528, -14962807},
- {23152971, 775386, 27395463, 14006635, -9701118, 4649512, 1689819,
- 892185, -11513277, -15205948},
+ { -30595528, 13793479, -5852820, 319136, -25723172, -6263899,
+ 33086546, 8957937, -15233648, 5540521 },
+ { -11630176, -11503902, -8119500, -7643073, 2620056, 1022908,
+ -23710744, -1568984, -16128528, -14962807 },
+ { 23152971, 775386, 27395463, 14006635, -9701118, 4649512, 1689819,
+ 892185, -11513277, -15205948 },
},
{
- {9770129, 9586738, 26496094, 4324120, 1556511, -3550024, 27453819,
- 4763127, -19179614, 5867134},
- {-32765025, 1927590, 31726409, -4753295, 23962434, -16019500,
- 27846559, 5931263, -29749703, -16108455},
- {27461885, -2977536, 22380810, 1815854, -23033753, -3031938,
- 7283490, -15148073, -19526700, 7734629},
+ { 9770129, 9586738, 26496094, 4324120, 1556511, -3550024, 27453819,
+ 4763127, -19179614, 5867134 },
+ { -32765025, 1927590, 31726409, -4753295, 23962434, -16019500,
+ 27846559, 5931263, -29749703, -16108455 },
+ { 27461885, -2977536, 22380810, 1815854, -23033753, -3031938,
+ 7283490, -15148073, -19526700, 7734629 },
},
},
{
{
- {-8010264, -9590817, -11120403, 6196038, 29344158, -13430885,
- 7585295, -3176626, 18549497, 15302069},
- {-32658337, -6171222, -7672793, -11051681, 6258878, 13504381,
- 10458790, -6418461, -8872242, 8424746},
- {24687205, 8613276, -30667046, -3233545, 1863892, -1830544,
- 19206234, 7134917, -11284482, -828919},
+ { -8010264, -9590817, -11120403, 6196038, 29344158, -13430885,
+ 7585295, -3176626, 18549497, 15302069 },
+ { -32658337, -6171222, -7672793, -11051681, 6258878, 13504381,
+ 10458790, -6418461, -8872242, 8424746 },
+ { 24687205, 8613276, -30667046, -3233545, 1863892, -1830544,
+ 19206234, 7134917, -11284482, -828919 },
},
{
- {11334899, -9218022, 8025293, 12707519, 17523892, -10476071,
- 10243738, -14685461, -5066034, 16498837},
- {8911542, 6887158, -9584260, -6958590, 11145641, -9543680, 17303925,
- -14124238, 6536641, 10543906},
- {-28946384, 15479763, -17466835, 568876, -1497683, 11223454,
- -2669190, -16625574, -27235709, 8876771},
+ { 11334899, -9218022, 8025293, 12707519, 17523892, -10476071,
+ 10243738, -14685461, -5066034, 16498837 },
+ { 8911542, 6887158, -9584260, -6958590, 11145641, -9543680, 17303925,
+ -14124238, 6536641, 10543906 },
+ { -28946384, 15479763, -17466835, 568876, -1497683, 11223454,
+ -2669190, -16625574, -27235709, 8876771 },
},
{
- {-25742899, -12566864, -15649966, -846607, -33026686, -796288,
- -33481822, 15824474, -604426, -9039817},
- {10330056, 70051, 7957388, -9002667, 9764902, 15609756, 27698697,
- -4890037, 1657394, 3084098},
- {10477963, -7470260, 12119566, -13250805, 29016247, -5365589,
- 31280319, 14396151, -30233575, 15272409},
+ { -25742899, -12566864, -15649966, -846607, -33026686, -796288,
+ -33481822, 15824474, -604426, -9039817 },
+ { 10330056, 70051, 7957388, -9002667, 9764902, 15609756, 27698697,
+ -4890037, 1657394, 3084098 },
+ { 10477963, -7470260, 12119566, -13250805, 29016247, -5365589,
+ 31280319, 14396151, -30233575, 15272409 },
},
{
- {-12288309, 3169463, 28813183, 16658753, 25116432, -5630466,
- -25173957, -12636138, -25014757, 1950504},
- {-26180358, 9489187, 11053416, -14746161, -31053720, 5825630,
- -8384306, -8767532, 15341279, 8373727},
- {28685821, 7759505, -14378516, -12002860, -31971820, 4079242,
- 298136, -10232602, -2878207, 15190420},
+ { -12288309, 3169463, 28813183, 16658753, 25116432, -5630466,
+ -25173957, -12636138, -25014757, 1950504 },
+ { -26180358, 9489187, 11053416, -14746161, -31053720, 5825630,
+ -8384306, -8767532, 15341279, 8373727 },
+ { 28685821, 7759505, -14378516, -12002860, -31971820, 4079242,
+ 298136, -10232602, -2878207, 15190420 },
},
{
- {-32932876, 13806336, -14337485, -15794431, -24004620, 10940928,
- 8669718, 2742393, -26033313, -6875003},
- {-1580388, -11729417, -25979658, -11445023, -17411874, -10912854,
- 9291594, -16247779, -12154742, 6048605},
- {-30305315, 14843444, 1539301, 11864366, 20201677, 1900163,
- 13934231, 5128323, 11213262, 9168384},
+ { -32932876, 13806336, -14337485, -15794431, -24004620, 10940928,
+ 8669718, 2742393, -26033313, -6875003 },
+ { -1580388, -11729417, -25979658, -11445023, -17411874, -10912854,
+ 9291594, -16247779, -12154742, 6048605 },
+ { -30305315, 14843444, 1539301, 11864366, 20201677, 1900163,
+ 13934231, 5128323, 11213262, 9168384 },
},
{
- {-26280513, 11007847, 19408960, -940758, -18592965, -4328580,
- -5088060, -11105150, 20470157, -16398701},
- {-23136053, 9282192, 14855179, -15390078, -7362815, -14408560,
- -22783952, 14461608, 14042978, 5230683},
- {29969567, -2741594, -16711867, -8552442, 9175486, -2468974,
- 21556951, 3506042, -5933891, -12449708},
+ { -26280513, 11007847, 19408960, -940758, -18592965, -4328580,
+ -5088060, -11105150, 20470157, -16398701 },
+ { -23136053, 9282192, 14855179, -15390078, -7362815, -14408560,
+ -22783952, 14461608, 14042978, 5230683 },
+ { 29969567, -2741594, -16711867, -8552442, 9175486, -2468974,
+ 21556951, 3506042, -5933891, -12449708 },
},
{
- {-3144746, 8744661, 19704003, 4581278, -20430686, 6830683,
- -21284170, 8971513, -28539189, 15326563},
- {-19464629, 10110288, -17262528, -3503892, -23500387, 1355669,
- -15523050, 15300988, -20514118, 9168260},
- {-5353335, 4488613, -23803248, 16314347, 7780487, -15638939,
- -28948358, 9601605, 33087103, -9011387},
+ { -3144746, 8744661, 19704003, 4581278, -20430686, 6830683,
+ -21284170, 8971513, -28539189, 15326563 },
+ { -19464629, 10110288, -17262528, -3503892, -23500387, 1355669,
+ -15523050, 15300988, -20514118, 9168260 },
+ { -5353335, 4488613, -23803248, 16314347, 7780487, -15638939,
+ -28948358, 9601605, 33087103, -9011387 },
},
{
- {-19443170, -15512900, -20797467, -12445323, -29824447, 10229461,
- -27444329, -15000531, -5996870, 15664672},
- {23294591, -16632613, -22650781, -8470978, 27844204, 11461195,
- 13099750, -2460356, 18151676, 13417686},
- {-24722913, -4176517, -31150679, 5988919, -26858785, 6685065,
- 1661597, -12551441, 15271676, -15452665},
+ { -19443170, -15512900, -20797467, -12445323, -29824447, 10229461,
+ -27444329, -15000531, -5996870, 15664672 },
+ { 23294591, -16632613, -22650781, -8470978, 27844204, 11461195,
+ 13099750, -2460356, 18151676, 13417686 },
+ { -24722913, -4176517, -31150679, 5988919, -26858785, 6685065,
+ 1661597, -12551441, 15271676, -15452665 },
},
},
{
{
- {11433042, -13228665, 8239631, -5279517, -1985436, -725718,
- -18698764, 2167544, -6921301, -13440182},
- {-31436171, 15575146, 30436815, 12192228, -22463353, 9395379,
- -9917708, -8638997, 12215110, 12028277},
- {14098400, 6555944, 23007258, 5757252, -15427832, -12950502,
- 30123440, 4617780, -16900089, -655628},
+ { 11433042, -13228665, 8239631, -5279517, -1985436, -725718,
+ -18698764, 2167544, -6921301, -13440182 },
+ { -31436171, 15575146, 30436815, 12192228, -22463353, 9395379,
+ -9917708, -8638997, 12215110, 12028277 },
+ { 14098400, 6555944, 23007258, 5757252, -15427832, -12950502,
+ 30123440, 4617780, -16900089, -655628 },
},
{
- {-4026201, -15240835, 11893168, 13718664, -14809462, 1847385,
- -15819999, 10154009, 23973261, -12684474},
- {-26531820, -3695990, -1908898, 2534301, -31870557, -16550355,
- 18341390, -11419951, 32013174, -10103539},
- {-25479301, 10876443, -11771086, -14625140, -12369567, 1838104,
- 21911214, 6354752, 4425632, -837822},
+ { -4026201, -15240835, 11893168, 13718664, -14809462, 1847385,
+ -15819999, 10154009, 23973261, -12684474 },
+ { -26531820, -3695990, -1908898, 2534301, -31870557, -16550355,
+ 18341390, -11419951, 32013174, -10103539 },
+ { -25479301, 10876443, -11771086, -14625140, -12369567, 1838104,
+ 21911214, 6354752, 4425632, -837822 },
},
{
- {-10433389, -14612966, 22229858, -3091047, -13191166, 776729,
- -17415375, -12020462, 4725005, 14044970},
- {19268650, -7304421, 1555349, 8692754, -21474059, -9910664, 6347390,
- -1411784, -19522291, -16109756},
- {-24864089, 12986008, -10898878, -5558584, -11312371, -148526,
- 19541418, 8180106, 9282262, 10282508},
+ { -10433389, -14612966, 22229858, -3091047, -13191166, 776729,
+ -17415375, -12020462, 4725005, 14044970 },
+ { 19268650, -7304421, 1555349, 8692754, -21474059, -9910664, 6347390,
+ -1411784, -19522291, -16109756 },
+ { -24864089, 12986008, -10898878, -5558584, -11312371, -148526,
+ 19541418, 8180106, 9282262, 10282508 },
},
{
- {-26205082, 4428547, -8661196, -13194263, 4098402, -14165257,
- 15522535, 8372215, 5542595, -10702683},
- {-10562541, 14895633, 26814552, -16673850, -17480754, -2489360,
- -2781891, 6993761, -18093885, 10114655},
- {-20107055, -929418, 31422704, 10427861, -7110749, 6150669,
- -29091755, -11529146, 25953725, -106158},
+ { -26205082, 4428547, -8661196, -13194263, 4098402, -14165257,
+ 15522535, 8372215, 5542595, -10702683 },
+ { -10562541, 14895633, 26814552, -16673850, -17480754, -2489360,
+ -2781891, 6993761, -18093885, 10114655 },
+ { -20107055, -929418, 31422704, 10427861, -7110749, 6150669,
+ -29091755, -11529146, 25953725, -106158 },
},
{
- {-4234397, -8039292, -9119125, 3046000, 2101609, -12607294,
- 19390020, 6094296, -3315279, 12831125},
- {-15998678, 7578152, 5310217, 14408357, -33548620, -224739,
- 31575954, 6326196, 7381791, -2421839},
- {-20902779, 3296811, 24736065, -16328389, 18374254, 7318640,
- 6295303, 8082724, -15362489, 12339664},
+ { -4234397, -8039292, -9119125, 3046000, 2101609, -12607294,
+ 19390020, 6094296, -3315279, 12831125 },
+ { -15998678, 7578152, 5310217, 14408357, -33548620, -224739,
+ 31575954, 6326196, 7381791, -2421839 },
+ { -20902779, 3296811, 24736065, -16328389, 18374254, 7318640,
+ 6295303, 8082724, -15362489, 12339664 },
},
{
- {27724736, 2291157, 6088201, -14184798, 1792727, 5857634, 13848414,
- 15768922, 25091167, 14856294},
- {-18866652, 8331043, 24373479, 8541013, -701998, -9269457, 12927300,
- -12695493, -22182473, -9012899},
- {-11423429, -5421590, 11632845, 3405020, 30536730, -11674039,
- -27260765, 13866390, 30146206, 9142070},
+ { 27724736, 2291157, 6088201, -14184798, 1792727, 5857634, 13848414,
+ 15768922, 25091167, 14856294 },
+ { -18866652, 8331043, 24373479, 8541013, -701998, -9269457, 12927300,
+ -12695493, -22182473, -9012899 },
+ { -11423429, -5421590, 11632845, 3405020, 30536730, -11674039,
+ -27260765, 13866390, 30146206, 9142070 },
},
{
- {3924129, -15307516, -13817122, -10054960, 12291820, -668366,
- -27702774, 9326384, -8237858, 4171294},
- {-15921940, 16037937, 6713787, 16606682, -21612135, 2790944,
- 26396185, 3731949, 345228, -5462949},
- {-21327538, 13448259, 25284571, 1143661, 20614966, -8849387,
- 2031539, -12391231, -16253183, -13582083},
+ { 3924129, -15307516, -13817122, -10054960, 12291820, -668366,
+ -27702774, 9326384, -8237858, 4171294 },
+ { -15921940, 16037937, 6713787, 16606682, -21612135, 2790944,
+ 26396185, 3731949, 345228, -5462949 },
+ { -21327538, 13448259, 25284571, 1143661, 20614966, -8849387,
+ 2031539, -12391231, -16253183, -13582083 },
},
{
- {31016211, -16722429, 26371392, -14451233, -5027349, 14854137,
- 17477601, 3842657, 28012650, -16405420},
- {-5075835, 9368966, -8562079, -4600902, -15249953, 6970560,
- -9189873, 16292057, -8867157, 3507940},
- {29439664, 3537914, 23333589, 6997794, -17555561, -11018068,
- -15209202, -15051267, -9164929, 6580396},
+ { 31016211, -16722429, 26371392, -14451233, -5027349, 14854137,
+ 17477601, 3842657, 28012650, -16405420 },
+ { -5075835, 9368966, -8562079, -4600902, -15249953, 6970560,
+ -9189873, 16292057, -8867157, 3507940 },
+ { 29439664, 3537914, 23333589, 6997794, -17555561, -11018068,
+ -15209202, -15051267, -9164929, 6580396 },
},
},
{
{
- {-12185861, -7679788, 16438269, 10826160, -8696817, -6235611,
- 17860444, -9273846, -2095802, 9304567},
- {20714564, -4336911, 29088195, 7406487, 11426967, -5095705,
- 14792667, -14608617, 5289421, -477127},
- {-16665533, -10650790, -6160345, -13305760, 9192020, -1802462,
- 17271490, 12349094, 26939669, -3752294},
+ { -12185861, -7679788, 16438269, 10826160, -8696817, -6235611,
+ 17860444, -9273846, -2095802, 9304567 },
+ { 20714564, -4336911, 29088195, 7406487, 11426967, -5095705,
+ 14792667, -14608617, 5289421, -477127 },
+ { -16665533, -10650790, -6160345, -13305760, 9192020, -1802462,
+ 17271490, 12349094, 26939669, -3752294 },
},
{
- {-12889898, 9373458, 31595848, 16374215, 21471720, 13221525,
- -27283495, -12348559, -3698806, 117887},
- {22263325, -6560050, 3984570, -11174646, -15114008, -566785,
- 28311253, 5358056, -23319780, 541964},
- {16259219, 3261970, 2309254, -15534474, -16885711, -4581916,
- 24134070, -16705829, -13337066, -13552195},
+ { -12889898, 9373458, 31595848, 16374215, 21471720, 13221525,
+ -27283495, -12348559, -3698806, 117887 },
+ { 22263325, -6560050, 3984570, -11174646, -15114008, -566785,
+ 28311253, 5358056, -23319780, 541964 },
+ { 16259219, 3261970, 2309254, -15534474, -16885711, -4581916,
+ 24134070, -16705829, -13337066, -13552195 },
},
{
- {9378160, -13140186, -22845982, -12745264, 28198281, -7244098,
- -2399684, -717351, 690426, 14876244},
- {24977353, -314384, -8223969, -13465086, 28432343, -1176353,
- -13068804, -12297348, -22380984, 6618999},
- {-1538174, 11685646, 12944378, 13682314, -24389511, -14413193,
- 8044829, -13817328, 32239829, -5652762},
+ { 9378160, -13140186, -22845982, -12745264, 28198281, -7244098,
+ -2399684, -717351, 690426, 14876244 },
+ { 24977353, -314384, -8223969, -13465086, 28432343, -1176353,
+ -13068804, -12297348, -22380984, 6618999 },
+ { -1538174, 11685646, 12944378, 13682314, -24389511, -14413193,
+ 8044829, -13817328, 32239829, -5652762 },
},
{
- {-18603066, 4762990, -926250, 8885304, -28412480, -3187315, 9781647,
- -10350059, 32779359, 5095274},
- {-33008130, -5214506, -32264887, -3685216, 9460461, -9327423,
- -24601656, 14506724, 21639561, -2630236},
- {-16400943, -13112215, 25239338, 15531969, 3987758, -4499318,
- -1289502, -6863535, 17874574, 558605},
+ { -18603066, 4762990, -926250, 8885304, -28412480, -3187315, 9781647,
+ -10350059, 32779359, 5095274 },
+ { -33008130, -5214506, -32264887, -3685216, 9460461, -9327423,
+ -24601656, 14506724, 21639561, -2630236 },
+ { -16400943, -13112215, 25239338, 15531969, 3987758, -4499318,
+ -1289502, -6863535, 17874574, 558605 },
},
{
- {-13600129, 10240081, 9171883, 16131053, -20869254, 9599700,
- 33499487, 5080151, 2085892, 5119761},
- {-22205145, -2519528, -16381601, 414691, -25019550, 2170430,
- 30634760, -8363614, -31999993, -5759884},
- {-6845704, 15791202, 8550074, -1312654, 29928809, -12092256,
- 27534430, -7192145, -22351378, 12961482},
+ { -13600129, 10240081, 9171883, 16131053, -20869254, 9599700,
+ 33499487, 5080151, 2085892, 5119761 },
+ { -22205145, -2519528, -16381601, 414691, -25019550, 2170430,
+ 30634760, -8363614, -31999993, -5759884 },
+ { -6845704, 15791202, 8550074, -1312654, 29928809, -12092256,
+ 27534430, -7192145, -22351378, 12961482 },
},
{
- {-24492060, -9570771, 10368194, 11582341, -23397293, -2245287,
- 16533930, 8206996, -30194652, -5159638},
- {-11121496, -3382234, 2307366, 6362031, -135455, 8868177, -16835630,
- 7031275, 7589640, 8945490},
- {-32152748, 8917967, 6661220, -11677616, -1192060, -15793393,
- 7251489, -11182180, 24099109, -14456170},
+ { -24492060, -9570771, 10368194, 11582341, -23397293, -2245287,
+ 16533930, 8206996, -30194652, -5159638 },
+ { -11121496, -3382234, 2307366, 6362031, -135455, 8868177, -16835630,
+ 7031275, 7589640, 8945490 },
+ { -32152748, 8917967, 6661220, -11677616, -1192060, -15793393,
+ 7251489, -11182180, 24099109, -14456170 },
},
{
- {5019558, -7907470, 4244127, -14714356, -26933272, 6453165,
- -19118182, -13289025, -6231896, -10280736},
- {10853594, 10721687, 26480089, 5861829, -22995819, 1972175,
- -1866647, -10557898, -3363451, -6441124},
- {-17002408, 5906790, 221599, -6563147, 7828208, -13248918, 24362661,
- -2008168, -13866408, 7421392},
+ { 5019558, -7907470, 4244127, -14714356, -26933272, 6453165,
+ -19118182, -13289025, -6231896, -10280736 },
+ { 10853594, 10721687, 26480089, 5861829, -22995819, 1972175,
+ -1866647, -10557898, -3363451, -6441124 },
+ { -17002408, 5906790, 221599, -6563147, 7828208, -13248918, 24362661,
+ -2008168, -13866408, 7421392 },
},
{
- {8139927, -6546497, 32257646, -5890546, 30375719, 1886181,
- -21175108, 15441252, 28826358, -4123029},
- {6267086, 9695052, 7709135, -16603597, -32869068, -1886135,
- 14795160, -7840124, 13746021, -1742048},
- {28584902, 7787108, -6732942, -15050729, 22846041, -7571236,
- -3181936, -363524, 4771362, -8419958},
+ { 8139927, -6546497, 32257646, -5890546, 30375719, 1886181,
+ -21175108, 15441252, 28826358, -4123029 },
+ { 6267086, 9695052, 7709135, -16603597, -32869068, -1886135,
+ 14795160, -7840124, 13746021, -1742048 },
+ { 28584902, 7787108, -6732942, -15050729, 22846041, -7571236,
+ -3181936, -363524, 4771362, -8419958 },
},
},
{
{
- {24949256, 6376279, -27466481, -8174608, -18646154, -9930606,
- 33543569, -12141695, 3569627, 11342593},
- {26514989, 4740088, 27912651, 3697550, 19331575, -11472339, 6809886,
- 4608608, 7325975, -14801071},
- {-11618399, -14554430, -24321212, 7655128, -1369274, 5214312,
- -27400540, 10258390, -17646694, -8186692},
+ { 24949256, 6376279, -27466481, -8174608, -18646154, -9930606,
+ 33543569, -12141695, 3569627, 11342593 },
+ { 26514989, 4740088, 27912651, 3697550, 19331575, -11472339, 6809886,
+ 4608608, 7325975, -14801071 },
+ { -11618399, -14554430, -24321212, 7655128, -1369274, 5214312,
+ -27400540, 10258390, -17646694, -8186692 },
},
{
- {11431204, 15823007, 26570245, 14329124, 18029990, 4796082,
- -31446179, 15580664, 9280358, -3973687},
- {-160783, -10326257, -22855316, -4304997, -20861367, -13621002,
- -32810901, -11181622, -15545091, 4387441},
- {-20799378, 12194512, 3937617, -5805892, -27154820, 9340370,
- -24513992, 8548137, 20617071, -7482001},
+ { 11431204, 15823007, 26570245, 14329124, 18029990, 4796082,
+ -31446179, 15580664, 9280358, -3973687 },
+ { -160783, -10326257, -22855316, -4304997, -20861367, -13621002,
+ -32810901, -11181622, -15545091, 4387441 },
+ { -20799378, 12194512, 3937617, -5805892, -27154820, 9340370,
+ -24513992, 8548137, 20617071, -7482001 },
},
{
- {-938825, -3930586, -8714311, 16124718, 24603125, -6225393,
- -13775352, -11875822, 24345683, 10325460},
- {-19855277, -1568885, -22202708, 8714034, 14007766, 6928528,
- 16318175, -1010689, 4766743, 3552007},
- {-21751364, -16730916, 1351763, -803421, -4009670, 3950935, 3217514,
- 14481909, 10988822, -3994762},
+ { -938825, -3930586, -8714311, 16124718, 24603125, -6225393,
+ -13775352, -11875822, 24345683, 10325460 },
+ { -19855277, -1568885, -22202708, 8714034, 14007766, 6928528,
+ 16318175, -1010689, 4766743, 3552007 },
+ { -21751364, -16730916, 1351763, -803421, -4009670, 3950935, 3217514,
+ 14481909, 10988822, -3994762 },
},
{
- {15564307, -14311570, 3101243, 5684148, 30446780, -8051356,
- 12677127, -6505343, -8295852, 13296005},
- {-9442290, 6624296, -30298964, -11913677, -4670981, -2057379,
- 31521204, 9614054, -30000824, 12074674},
- {4771191, -135239, 14290749, -13089852, 27992298, 14998318,
- -1413936, -1556716, 29832613, -16391035},
+ { 15564307, -14311570, 3101243, 5684148, 30446780, -8051356,
+ 12677127, -6505343, -8295852, 13296005 },
+ { -9442290, 6624296, -30298964, -11913677, -4670981, -2057379,
+ 31521204, 9614054, -30000824, 12074674 },
+ { 4771191, -135239, 14290749, -13089852, 27992298, 14998318,
+ -1413936, -1556716, 29832613, -16391035 },
},
{
- {7064884, -7541174, -19161962, -5067537, -18891269, -2912736,
- 25825242, 5293297, -27122660, 13101590},
- {-2298563, 2439670, -7466610, 1719965, -27267541, -16328445,
- 32512469, -5317593, -30356070, -4190957},
- {-30006540, 10162316, -33180176, 3981723, -16482138, -13070044,
- 14413974, 9515896, 19568978, 9628812},
+ { 7064884, -7541174, -19161962, -5067537, -18891269, -2912736,
+ 25825242, 5293297, -27122660, 13101590 },
+ { -2298563, 2439670, -7466610, 1719965, -27267541, -16328445,
+ 32512469, -5317593, -30356070, -4190957 },
+ { -30006540, 10162316, -33180176, 3981723, -16482138, -13070044,
+ 14413974, 9515896, 19568978, 9628812 },
},
{
- {33053803, 199357, 15894591, 1583059, 27380243, -4580435, -17838894,
- -6106839, -6291786, 3437740},
- {-18978877, 3884493, 19469877, 12726490, 15913552, 13614290,
- -22961733, 70104, 7463304, 4176122},
- {-27124001, 10659917, 11482427, -16070381, 12771467, -6635117,
- -32719404, -5322751, 24216882, 5944158},
+ { 33053803, 199357, 15894591, 1583059, 27380243, -4580435, -17838894,
+ -6106839, -6291786, 3437740 },
+ { -18978877, 3884493, 19469877, 12726490, 15913552, 13614290,
+ -22961733, 70104, 7463304, 4176122 },
+ { -27124001, 10659917, 11482427, -16070381, 12771467, -6635117,
+ -32719404, -5322751, 24216882, 5944158 },
},
{
- {8894125, 7450974, -2664149, -9765752, -28080517, -12389115,
- 19345746, 14680796, 11632993, 5847885},
- {26942781, -2315317, 9129564, -4906607, 26024105, 11769399,
- -11518837, 6367194, -9727230, 4782140},
- {19916461, -4828410, -22910704, -11414391, 25606324, -5972441,
- 33253853, 8220911, 6358847, -1873857},
+ { 8894125, 7450974, -2664149, -9765752, -28080517, -12389115,
+ 19345746, 14680796, 11632993, 5847885 },
+ { 26942781, -2315317, 9129564, -4906607, 26024105, 11769399,
+ -11518837, 6367194, -9727230, 4782140 },
+ { 19916461, -4828410, -22910704, -11414391, 25606324, -5972441,
+ 33253853, 8220911, 6358847, -1873857 },
},
{
- {801428, -2081702, 16569428, 11065167, 29875704, 96627, 7908388,
- -4480480, -13538503, 1387155},
- {19646058, 5720633, -11416706, 12814209, 11607948, 12749789,
- 14147075, 15156355, -21866831, 11835260},
- {19299512, 1155910, 28703737, 14890794, 2925026, 7269399, 26121523,
- 15467869, -26560550, 5052483},
+ { 801428, -2081702, 16569428, 11065167, 29875704, 96627, 7908388,
+ -4480480, -13538503, 1387155 },
+ { 19646058, 5720633, -11416706, 12814209, 11607948, 12749789,
+ 14147075, 15156355, -21866831, 11835260 },
+ { 19299512, 1155910, 28703737, 14890794, 2925026, 7269399, 26121523,
+ 15467869, -26560550, 5052483 },
},
},
{
{
- {-3017432, 10058206, 1980837, 3964243, 22160966, 12322533, -6431123,
- -12618185, 12228557, -7003677},
- {32944382, 14922211, -22844894, 5188528, 21913450, -8719943,
- 4001465, 13238564, -6114803, 8653815},
- {22865569, -4652735, 27603668, -12545395, 14348958, 8234005,
- 24808405, 5719875, 28483275, 2841751},
+ { -3017432, 10058206, 1980837, 3964243, 22160966, 12322533, -6431123,
+ -12618185, 12228557, -7003677 },
+ { 32944382, 14922211, -22844894, 5188528, 21913450, -8719943,
+ 4001465, 13238564, -6114803, 8653815 },
+ { 22865569, -4652735, 27603668, -12545395, 14348958, 8234005,
+ 24808405, 5719875, 28483275, 2841751 },
},
{
- {-16420968, -1113305, -327719, -12107856, 21886282, -15552774,
- -1887966, -315658, 19932058, -12739203},
- {-11656086, 10087521, -8864888, -5536143, -19278573, -3055912,
- 3999228, 13239134, -4777469, -13910208},
- {1382174, -11694719, 17266790, 9194690, -13324356, 9720081,
- 20403944, 11284705, -14013818, 3093230},
+ { -16420968, -1113305, -327719, -12107856, 21886282, -15552774,
+ -1887966, -315658, 19932058, -12739203 },
+ { -11656086, 10087521, -8864888, -5536143, -19278573, -3055912,
+ 3999228, 13239134, -4777469, -13910208 },
+ { 1382174, -11694719, 17266790, 9194690, -13324356, 9720081,
+ 20403944, 11284705, -14013818, 3093230 },
},
{
- {16650921, -11037932, -1064178, 1570629, -8329746, 7352753, -302424,
- 16271225, -24049421, -6691850},
- {-21911077, -5927941, -4611316, -5560156, -31744103, -10785293,
- 24123614, 15193618, -21652117, -16739389},
- {-9935934, -4289447, -25279823, 4372842, 2087473, 10399484,
- 31870908, 14690798, 17361620, 11864968},
+ { 16650921, -11037932, -1064178, 1570629, -8329746, 7352753, -302424,
+ 16271225, -24049421, -6691850 },
+ { -21911077, -5927941, -4611316, -5560156, -31744103, -10785293,
+ 24123614, 15193618, -21652117, -16739389 },
+ { -9935934, -4289447, -25279823, 4372842, 2087473, 10399484,
+ 31870908, 14690798, 17361620, 11864968 },
},
{
- {-11307610, 6210372, 13206574, 5806320, -29017692, -13967200,
- -12331205, -7486601, -25578460, -16240689},
- {14668462, -12270235, 26039039, 15305210, 25515617, 4542480,
- 10453892, 6577524, 9145645, -6443880},
- {5974874, 3053895, -9433049, -10385191, -31865124, 3225009,
- -7972642, 3936128, -5652273, -3050304},
+ { -11307610, 6210372, 13206574, 5806320, -29017692, -13967200,
+ -12331205, -7486601, -25578460, -16240689 },
+ { 14668462, -12270235, 26039039, 15305210, 25515617, 4542480,
+ 10453892, 6577524, 9145645, -6443880 },
+ { 5974874, 3053895, -9433049, -10385191, -31865124, 3225009,
+ -7972642, 3936128, -5652273, -3050304 },
},
{
- {30625386, -4729400, -25555961, -12792866, -20484575, 7695099,
- 17097188, -16303496, -27999779, 1803632},
- {-3553091, 9865099, -5228566, 4272701, -5673832, -16689700,
- 14911344, 12196514, -21405489, 7047412},
- {20093277, 9920966, -11138194, -5343857, 13161587, 12044805,
- -32856851, 4124601, -32343828, -10257566},
+ { 30625386, -4729400, -25555961, -12792866, -20484575, 7695099,
+ 17097188, -16303496, -27999779, 1803632 },
+ { -3553091, 9865099, -5228566, 4272701, -5673832, -16689700,
+ 14911344, 12196514, -21405489, 7047412 },
+ { 20093277, 9920966, -11138194, -5343857, 13161587, 12044805,
+ -32856851, 4124601, -32343828, -10257566 },
},
{
- {-20788824, 14084654, -13531713, 7842147, 19119038, -13822605,
- 4752377, -8714640, -21679658, 2288038},
- {-26819236, -3283715, 29965059, 3039786, -14473765, 2540457,
- 29457502, 14625692, -24819617, 12570232},
- {-1063558, -11551823, 16920318, 12494842, 1278292, -5869109,
- -21159943, -3498680, -11974704, 4724943},
+ { -20788824, 14084654, -13531713, 7842147, 19119038, -13822605,
+ 4752377, -8714640, -21679658, 2288038 },
+ { -26819236, -3283715, 29965059, 3039786, -14473765, 2540457,
+ 29457502, 14625692, -24819617, 12570232 },
+ { -1063558, -11551823, 16920318, 12494842, 1278292, -5869109,
+ -21159943, -3498680, -11974704, 4724943 },
},
{
- {17960970, -11775534, -4140968, -9702530, -8876562, -1410617,
- -12907383, -8659932, -29576300, 1903856},
- {23134274, -14279132, -10681997, -1611936, 20684485, 15770816,
- -12989750, 3190296, 26955097, 14109738},
- {15308788, 5320727, -30113809, -14318877, 22902008, 7767164,
- 29425325, -11277562, 31960942, 11934971},
+ { 17960970, -11775534, -4140968, -9702530, -8876562, -1410617,
+ -12907383, -8659932, -29576300, 1903856 },
+ { 23134274, -14279132, -10681997, -1611936, 20684485, 15770816,
+ -12989750, 3190296, 26955097, 14109738 },
+ { 15308788, 5320727, -30113809, -14318877, 22902008, 7767164,
+ 29425325, -11277562, 31960942, 11934971 },
},
{
- {-27395711, 8435796, 4109644, 12222639, -24627868, 14818669,
- 20638173, 4875028, 10491392, 1379718},
- {-13159415, 9197841, 3875503, -8936108, -1383712, -5879801,
- 33518459, 16176658, 21432314, 12180697},
- {-11787308, 11500838, 13787581, -13832590, -22430679, 10140205,
- 1465425, 12689540, -10301319, -13872883},
+ { -27395711, 8435796, 4109644, 12222639, -24627868, 14818669,
+ 20638173, 4875028, 10491392, 1379718 },
+ { -13159415, 9197841, 3875503, -8936108, -1383712, -5879801,
+ 33518459, 16176658, 21432314, 12180697 },
+ { -11787308, 11500838, 13787581, -13832590, -22430679, 10140205,
+ 1465425, 12689540, -10301319, -13872883 },
},
},
{
{
- {5414091, -15386041, -21007664, 9643570, 12834970, 1186149,
- -2622916, -1342231, 26128231, 6032912},
- {-26337395, -13766162, 32496025, -13653919, 17847801, -12669156,
- 3604025, 8316894, -25875034, -10437358},
- {3296484, 6223048, 24680646, -12246460, -23052020, 5903205,
- -8862297, -4639164, 12376617, 3188849},
+ { 5414091, -15386041, -21007664, 9643570, 12834970, 1186149,
+ -2622916, -1342231, 26128231, 6032912 },
+ { -26337395, -13766162, 32496025, -13653919, 17847801, -12669156,
+ 3604025, 8316894, -25875034, -10437358 },
+ { 3296484, 6223048, 24680646, -12246460, -23052020, 5903205,
+ -8862297, -4639164, 12376617, 3188849 },
},
{
- {29190488, -14659046, 27549113, -1183516, 3520066, -10697301,
- 32049515, -7309113, -16109234, -9852307},
- {-14744486, -9309156, 735818, -598978, -20407687, -5057904,
- 25246078, -15795669, 18640741, -960977},
- {-6928835, -16430795, 10361374, 5642961, 4910474, 12345252,
- -31638386, -494430, 10530747, 1053335},
+ { 29190488, -14659046, 27549113, -1183516, 3520066, -10697301,
+ 32049515, -7309113, -16109234, -9852307 },
+ { -14744486, -9309156, 735818, -598978, -20407687, -5057904,
+ 25246078, -15795669, 18640741, -960977 },
+ { -6928835, -16430795, 10361374, 5642961, 4910474, 12345252,
+ -31638386, -494430, 10530747, 1053335 },
},
{
- {-29265967, -14186805, -13538216, -12117373, -19457059, -10655384,
- -31462369, -2948985, 24018831, 15026644},
- {-22592535, -3145277, -2289276, 5953843, -13440189, 9425631,
- 25310643, 13003497, -2314791, -15145616},
- {-27419985, -603321, -8043984, -1669117, -26092265, 13987819,
- -27297622, 187899, -23166419, -2531735},
+ { -29265967, -14186805, -13538216, -12117373, -19457059, -10655384,
+ -31462369, -2948985, 24018831, 15026644 },
+ { -22592535, -3145277, -2289276, 5953843, -13440189, 9425631,
+ 25310643, 13003497, -2314791, -15145616 },
+ { -27419985, -603321, -8043984, -1669117, -26092265, 13987819,
+ -27297622, 187899, -23166419, -2531735 },
},
{
- {-21744398, -13810475, 1844840, 5021428, -10434399, -15911473,
- 9716667, 16266922, -5070217, 726099},
- {29370922, -6053998, 7334071, -15342259, 9385287, 2247707,
- -13661962, -4839461, 30007388, -15823341},
- {-936379, 16086691, 23751945, -543318, -1167538, -5189036, 9137109,
- 730663, 9835848, 4555336},
+ { -21744398, -13810475, 1844840, 5021428, -10434399, -15911473,
+ 9716667, 16266922, -5070217, 726099 },
+ { 29370922, -6053998, 7334071, -15342259, 9385287, 2247707,
+ -13661962, -4839461, 30007388, -15823341 },
+ { -936379, 16086691, 23751945, -543318, -1167538, -5189036, 9137109,
+ 730663, 9835848, 4555336 },
},
{
- {-23376435, 1410446, -22253753, -12899614, 30867635, 15826977,
- 17693930, 544696, -11985298, 12422646},
- {31117226, -12215734, -13502838, 6561947, -9876867, -12757670,
- -5118685, -4096706, 29120153, 13924425},
- {-17400879, -14233209, 19675799, -2734756, -11006962, -5858820,
- -9383939, -11317700, 7240931, -237388},
+ { -23376435, 1410446, -22253753, -12899614, 30867635, 15826977,
+ 17693930, 544696, -11985298, 12422646 },
+ { 31117226, -12215734, -13502838, 6561947, -9876867, -12757670,
+ -5118685, -4096706, 29120153, 13924425 },
+ { -17400879, -14233209, 19675799, -2734756, -11006962, -5858820,
+ -9383939, -11317700, 7240931, -237388 },
},
{
- {-31361739, -11346780, -15007447, -5856218, -22453340, -12152771,
- 1222336, 4389483, 3293637, -15551743},
- {-16684801, -14444245, 11038544, 11054958, -13801175, -3338533,
- -24319580, 7733547, 12796905, -6335822},
- {-8759414, -10817836, -25418864, 10783769, -30615557, -9746811,
- -28253339, 3647836, 3222231, -11160462},
+ { -31361739, -11346780, -15007447, -5856218, -22453340, -12152771,
+ 1222336, 4389483, 3293637, -15551743 },
+ { -16684801, -14444245, 11038544, 11054958, -13801175, -3338533,
+ -24319580, 7733547, 12796905, -6335822 },
+ { -8759414, -10817836, -25418864, 10783769, -30615557, -9746811,
+ -28253339, 3647836, 3222231, -11160462 },
},
{
- {18606113, 1693100, -25448386, -15170272, 4112353, 10045021,
- 23603893, -2048234, -7550776, 2484985},
- {9255317, -3131197, -12156162, -1004256, 13098013, -9214866,
- 16377220, -2102812, -19802075, -3034702},
- {-22729289, 7496160, -5742199, 11329249, 19991973, -3347502,
- -31718148, 9936966, -30097688, -10618797},
+ { 18606113, 1693100, -25448386, -15170272, 4112353, 10045021,
+ 23603893, -2048234, -7550776, 2484985 },
+ { 9255317, -3131197, -12156162, -1004256, 13098013, -9214866,
+ 16377220, -2102812, -19802075, -3034702 },
+ { -22729289, 7496160, -5742199, 11329249, 19991973, -3347502,
+ -31718148, 9936966, -30097688, -10618797 },
},
{
- {21878590, -5001297, 4338336, 13643897, -3036865, 13160960,
- 19708896, 5415497, -7360503, -4109293},
- {27736861, 10103576, 12500508, 8502413, -3413016, -9633558,
- 10436918, -1550276, -23659143, -8132100},
- {19492550, -12104365, -29681976, -852630, -3208171, 12403437,
- 30066266, 8367329, 13243957, 8709688},
+ { 21878590, -5001297, 4338336, 13643897, -3036865, 13160960,
+ 19708896, 5415497, -7360503, -4109293 },
+ { 27736861, 10103576, 12500508, 8502413, -3413016, -9633558,
+ 10436918, -1550276, -23659143, -8132100 },
+ { 19492550, -12104365, -29681976, -852630, -3208171, 12403437,
+ 30066266, 8367329, 13243957, 8709688 },
},
},
{
{
- {12015105, 2801261, 28198131, 10151021, 24818120, -4743133,
- -11194191, -5645734, 5150968, 7274186},
- {2831366, -12492146, 1478975, 6122054, 23825128, -12733586,
- 31097299, 6083058, 31021603, -9793610},
- {-2529932, -2229646, 445613, 10720828, -13849527, -11505937,
- -23507731, 16354465, 15067285, -14147707},
+ { 12015105, 2801261, 28198131, 10151021, 24818120, -4743133,
+ -11194191, -5645734, 5150968, 7274186 },
+ { 2831366, -12492146, 1478975, 6122054, 23825128, -12733586,
+ 31097299, 6083058, 31021603, -9793610 },
+ { -2529932, -2229646, 445613, 10720828, -13849527, -11505937,
+ -23507731, 16354465, 15067285, -14147707 },
},
{
- {7840942, 14037873, -33364863, 15934016, -728213, -3642706,
- 21403988, 1057586, -19379462, -12403220},
- {915865, -16469274, 15608285, -8789130, -24357026, 6060030,
- -17371319, 8410997, -7220461, 16527025},
- {32922597, -556987, 20336074, -16184568, 10903705, -5384487,
- 16957574, 52992, 23834301, 6588044},
+ { 7840942, 14037873, -33364863, 15934016, -728213, -3642706,
+ 21403988, 1057586, -19379462, -12403220 },
+ { 915865, -16469274, 15608285, -8789130, -24357026, 6060030,
+ -17371319, 8410997, -7220461, 16527025 },
+ { 32922597, -556987, 20336074, -16184568, 10903705, -5384487,
+ 16957574, 52992, 23834301, 6588044 },
},
{
- {32752030, 11232950, 3381995, -8714866, 22652988, -10744103,
- 17159699, 16689107, -20314580, -1305992},
- {-4689649, 9166776, -25710296, -10847306, 11576752, 12733943,
- 7924251, -2752281, 1976123, -7249027},
- {21251222, 16309901, -2983015, -6783122, 30810597, 12967303, 156041,
- -3371252, 12331345, -8237197},
+ { 32752030, 11232950, 3381995, -8714866, 22652988, -10744103,
+ 17159699, 16689107, -20314580, -1305992 },
+ { -4689649, 9166776, -25710296, -10847306, 11576752, 12733943,
+ 7924251, -2752281, 1976123, -7249027 },
+ { 21251222, 16309901, -2983015, -6783122, 30810597, 12967303, 156041,
+ -3371252, 12331345, -8237197 },
},
{
- {8651614, -4477032, -16085636, -4996994, 13002507, 2950805,
- 29054427, -5106970, 10008136, -4667901},
- {31486080, 15114593, -14261250, 12951354, 14369431, -7387845,
- 16347321, -13662089, 8684155, -10532952},
- {19443825, 11385320, 24468943, -9659068, -23919258, 2187569,
- -26263207, -6086921, 31316348, 14219878},
+ { 8651614, -4477032, -16085636, -4996994, 13002507, 2950805,
+ 29054427, -5106970, 10008136, -4667901 },
+ { 31486080, 15114593, -14261250, 12951354, 14369431, -7387845,
+ 16347321, -13662089, 8684155, -10532952 },
+ { 19443825, 11385320, 24468943, -9659068, -23919258, 2187569,
+ -26263207, -6086921, 31316348, 14219878 },
},
{
- {-28594490, 1193785, 32245219, 11392485, 31092169, 15722801,
- 27146014, 6992409, 29126555, 9207390},
- {32382935, 1110093, 18477781, 11028262, -27411763, -7548111,
- -4980517, 10843782, -7957600, -14435730},
- {2814918, 7836403, 27519878, -7868156, -20894015, -11553689,
- -21494559, 8550130, 28346258, 1994730},
+ { -28594490, 1193785, 32245219, 11392485, 31092169, 15722801,
+ 27146014, 6992409, 29126555, 9207390 },
+ { 32382935, 1110093, 18477781, 11028262, -27411763, -7548111,
+ -4980517, 10843782, -7957600, -14435730 },
+ { 2814918, 7836403, 27519878, -7868156, -20894015, -11553689,
+ -21494559, 8550130, 28346258, 1994730 },
},
{
- {-19578299, 8085545, -14000519, -3948622, 2785838, -16231307,
- -19516951, 7174894, 22628102, 8115180},
- {-30405132, 955511, -11133838, -15078069, -32447087, -13278079,
- -25651578, 3317160, -9943017, 930272},
- {-15303681, -6833769, 28856490, 1357446, 23421993, 1057177,
- 24091212, -1388970, -22765376, -10650715},
+ { -19578299, 8085545, -14000519, -3948622, 2785838, -16231307,
+ -19516951, 7174894, 22628102, 8115180 },
+ { -30405132, 955511, -11133838, -15078069, -32447087, -13278079,
+ -25651578, 3317160, -9943017, 930272 },
+ { -15303681, -6833769, 28856490, 1357446, 23421993, 1057177,
+ 24091212, -1388970, -22765376, -10650715 },
},
{
- {-22751231, -5303997, -12907607, -12768866, -15811511, -7797053,
- -14839018, -16554220, -1867018, 8398970},
- {-31969310, 2106403, -4736360, 1362501, 12813763, 16200670,
- 22981545, -6291273, 18009408, -15772772},
- {-17220923, -9545221, -27784654, 14166835, 29815394, 7444469,
- 29551787, -3727419, 19288549, 1325865},
+ { -22751231, -5303997, -12907607, -12768866, -15811511, -7797053,
+ -14839018, -16554220, -1867018, 8398970 },
+ { -31969310, 2106403, -4736360, 1362501, 12813763, 16200670,
+ 22981545, -6291273, 18009408, -15772772 },
+ { -17220923, -9545221, -27784654, 14166835, 29815394, 7444469,
+ 29551787, -3727419, 19288549, 1325865 },
},
{
- {15100157, -15835752, -23923978, -1005098, -26450192, 15509408,
- 12376730, -3479146, 33166107, -8042750},
- {20909231, 13023121, -9209752, 16251778, -5778415, -8094914,
- 12412151, 10018715, 2213263, -13878373},
- {32529814, -11074689, 30361439, -16689753, -9135940, 1513226,
- 22922121, 6382134, -5766928, 8371348},
+ { 15100157, -15835752, -23923978, -1005098, -26450192, 15509408,
+ 12376730, -3479146, 33166107, -8042750 },
+ { 20909231, 13023121, -9209752, 16251778, -5778415, -8094914,
+ 12412151, 10018715, 2213263, -13878373 },
+ { 32529814, -11074689, 30361439, -16689753, -9135940, 1513226,
+ 22922121, 6382134, -5766928, 8371348 },
},
},
{
{
- {9923462, 11271500, 12616794, 3544722, -29998368, -1721626,
- 12891687, -8193132, -26442943, 10486144},
- {-22597207, -7012665, 8587003, -8257861, 4084309, -12970062, 361726,
- 2610596, -23921530, -11455195},
- {5408411, -1136691, -4969122, 10561668, 24145918, 14240566,
- 31319731, -4235541, 19985175, -3436086},
+ { 9923462, 11271500, 12616794, 3544722, -29998368, -1721626,
+ 12891687, -8193132, -26442943, 10486144 },
+ { -22597207, -7012665, 8587003, -8257861, 4084309, -12970062, 361726,
+ 2610596, -23921530, -11455195 },
+ { 5408411, -1136691, -4969122, 10561668, 24145918, 14240566,
+ 31319731, -4235541, 19985175, -3436086 },
},
{
- {-13994457, 16616821, 14549246, 3341099, 32155958, 13648976,
- -17577068, 8849297, 65030, 8370684},
- {-8320926, -12049626, 31204563, 5839400, -20627288, -1057277,
- -19442942, 6922164, 12743482, -9800518},
- {-2361371, 12678785, 28815050, 4759974, -23893047, 4884717,
- 23783145, 11038569, 18800704, 255233},
+ { -13994457, 16616821, 14549246, 3341099, 32155958, 13648976,
+ -17577068, 8849297, 65030, 8370684 },
+ { -8320926, -12049626, 31204563, 5839400, -20627288, -1057277,
+ -19442942, 6922164, 12743482, -9800518 },
+ { -2361371, 12678785, 28815050, 4759974, -23893047, 4884717,
+ 23783145, 11038569, 18800704, 255233 },
},
{
- {-5269658, -1773886, 13957886, 7990715, 23132995, 728773, 13393847,
- 9066957, 19258688, -14753793},
- {-2936654, -10827535, -10432089, 14516793, -3640786, 4372541,
- -31934921, 2209390, -1524053, 2055794},
- {580882, 16705327, 5468415, -2683018, -30926419, -14696000,
- -7203346, -8994389, -30021019, 7394435},
+ { -5269658, -1773886, 13957886, 7990715, 23132995, 728773, 13393847,
+ 9066957, 19258688, -14753793 },
+ { -2936654, -10827535, -10432089, 14516793, -3640786, 4372541,
+ -31934921, 2209390, -1524053, 2055794 },
+ { 580882, 16705327, 5468415, -2683018, -30926419, -14696000,
+ -7203346, -8994389, -30021019, 7394435 },
},
{
- {23838809, 1822728, -15738443, 15242727, 8318092, -3733104,
- -21672180, -3492205, -4821741, 14799921},
- {13345610, 9759151, 3371034, -16137791, 16353039, 8577942, 31129804,
- 13496856, -9056018, 7402518},
- {2286874, -4435931, -20042458, -2008336, -13696227, 5038122,
- 11006906, -15760352, 8205061, 1607563},
+ { 23838809, 1822728, -15738443, 15242727, 8318092, -3733104,
+ -21672180, -3492205, -4821741, 14799921 },
+ { 13345610, 9759151, 3371034, -16137791, 16353039, 8577942, 31129804,
+ 13496856, -9056018, 7402518 },
+ { 2286874, -4435931, -20042458, -2008336, -13696227, 5038122,
+ 11006906, -15760352, 8205061, 1607563 },
},
{
- {14414086, -8002132, 3331830, -3208217, 22249151, -5594188,
- 18364661, -2906958, 30019587, -9029278},
- {-27688051, 1585953, -10775053, 931069, -29120221, -11002319,
- -14410829, 12029093, 9944378, 8024},
- {4368715, -3709630, 29874200, -15022983, -20230386, -11410704,
- -16114594, -999085, -8142388, 5640030},
+ { 14414086, -8002132, 3331830, -3208217, 22249151, -5594188,
+ 18364661, -2906958, 30019587, -9029278 },
+ { -27688051, 1585953, -10775053, 931069, -29120221, -11002319,
+ -14410829, 12029093, 9944378, 8024 },
+ { 4368715, -3709630, 29874200, -15022983, -20230386, -11410704,
+ -16114594, -999085, -8142388, 5640030 },
},
{
- {10299610, 13746483, 11661824, 16234854, 7630238, 5998374, 9809887,
- -16694564, 15219798, -14327783},
- {27425505, -5719081, 3055006, 10660664, 23458024, 595578, -15398605,
- -1173195, -18342183, 9742717},
- {6744077, 2427284, 26042789, 2720740, -847906, 1118974, 32324614,
- 7406442, 12420155, 1994844},
+ { 10299610, 13746483, 11661824, 16234854, 7630238, 5998374, 9809887,
+ -16694564, 15219798, -14327783 },
+ { 27425505, -5719081, 3055006, 10660664, 23458024, 595578, -15398605,
+ -1173195, -18342183, 9742717 },
+ { 6744077, 2427284, 26042789, 2720740, -847906, 1118974, 32324614,
+ 7406442, 12420155, 1994844 },
},
{
- {14012521, -5024720, -18384453, -9578469, -26485342, -3936439,
- -13033478, -10909803, 24319929, -6446333},
- {16412690, -4507367, 10772641, 15929391, -17068788, -4658621,
- 10555945, -10484049, -30102368, -4739048},
- {22397382, -7767684, -9293161, -12792868, 17166287, -9755136,
- -27333065, 6199366, 21880021, -12250760},
+ { 14012521, -5024720, -18384453, -9578469, -26485342, -3936439,
+ -13033478, -10909803, 24319929, -6446333 },
+ { 16412690, -4507367, 10772641, 15929391, -17068788, -4658621,
+ 10555945, -10484049, -30102368, -4739048 },
+ { 22397382, -7767684, -9293161, -12792868, 17166287, -9755136,
+ -27333065, 6199366, 21880021, -12250760 },
},
{
- {-4283307, 5368523, -31117018, 8163389, -30323063, 3209128,
- 16557151, 8890729, 8840445, 4957760},
- {-15447727, 709327, -6919446, -10870178, -29777922, 6522332,
- -21720181, 12130072, -14796503, 5005757},
- {-2114751, -14308128, 23019042, 15765735, -25269683, 6002752,
- 10183197, -13239326, -16395286, -2176112},
+ { -4283307, 5368523, -31117018, 8163389, -30323063, 3209128,
+ 16557151, 8890729, 8840445, 4957760 },
+ { -15447727, 709327, -6919446, -10870178, -29777922, 6522332,
+ -21720181, 12130072, -14796503, 5005757 },
+ { -2114751, -14308128, 23019042, 15765735, -25269683, 6002752,
+ 10183197, -13239326, -16395286, -2176112 },
},
},
{
{
- {-19025756, 1632005, 13466291, -7995100, -23640451, 16573537,
- -32013908, -3057104, 22208662, 2000468},
- {3065073, -1412761, -25598674, -361432, -17683065, -5703415,
- -8164212, 11248527, -3691214, -7414184},
- {10379208, -6045554, 8877319, 1473647, -29291284, -12507580,
- 16690915, 2553332, -3132688, 16400289},
+ { -19025756, 1632005, 13466291, -7995100, -23640451, 16573537,
+ -32013908, -3057104, 22208662, 2000468 },
+ { 3065073, -1412761, -25598674, -361432, -17683065, -5703415,
+ -8164212, 11248527, -3691214, -7414184 },
+ { 10379208, -6045554, 8877319, 1473647, -29291284, -12507580,
+ 16690915, 2553332, -3132688, 16400289 },
},
{
- {15716668, 1254266, -18472690, 7446274, -8448918, 6344164,
- -22097271, -7285580, 26894937, 9132066},
- {24158887, 12938817, 11085297, -8177598, -28063478, -4457083,
- -30576463, 64452, -6817084, -2692882},
- {13488534, 7794716, 22236231, 5989356, 25426474, -12578208, 2350710,
- -3418511, -4688006, 2364226},
+ { 15716668, 1254266, -18472690, 7446274, -8448918, 6344164,
+ -22097271, -7285580, 26894937, 9132066 },
+ { 24158887, 12938817, 11085297, -8177598, -28063478, -4457083,
+ -30576463, 64452, -6817084, -2692882 },
+ { 13488534, 7794716, 22236231, 5989356, 25426474, -12578208, 2350710,
+ -3418511, -4688006, 2364226 },
},
{
- {16335052, 9132434, 25640582, 6678888, 1725628, 8517937, -11807024,
- -11697457, 15445875, -7798101},
- {29004207, -7867081, 28661402, -640412, -12794003, -7943086,
- 31863255, -4135540, -278050, -15759279},
- {-6122061, -14866665, -28614905, 14569919, -10857999, -3591829,
- 10343412, -6976290, -29828287, -10815811},
+ { 16335052, 9132434, 25640582, 6678888, 1725628, 8517937, -11807024,
+ -11697457, 15445875, -7798101 },
+ { 29004207, -7867081, 28661402, -640412, -12794003, -7943086,
+ 31863255, -4135540, -278050, -15759279 },
+ { -6122061, -14866665, -28614905, 14569919, -10857999, -3591829,
+ 10343412, -6976290, -29828287, -10815811 },
},
{
- {27081650, 3463984, 14099042, -4517604, 1616303, -6205604, 29542636,
- 15372179, 17293797, 960709},
- {20263915, 11434237, -5765435, 11236810, 13505955, -10857102,
- -16111345, 6493122, -19384511, 7639714},
- {-2830798, -14839232, 25403038, -8215196, -8317012, -16173699,
- 18006287, -16043750, 29994677, -15808121},
+ { 27081650, 3463984, 14099042, -4517604, 1616303, -6205604, 29542636,
+ 15372179, 17293797, 960709 },
+ { 20263915, 11434237, -5765435, 11236810, 13505955, -10857102,
+ -16111345, 6493122, -19384511, 7639714 },
+ { -2830798, -14839232, 25403038, -8215196, -8317012, -16173699,
+ 18006287, -16043750, 29994677, -15808121 },
},
{
- {9769828, 5202651, -24157398, -13631392, -28051003, -11561624,
- -24613141, -13860782, -31184575, 709464},
- {12286395, 13076066, -21775189, -1176622, -25003198, 4057652,
- -32018128, -8890874, 16102007, 13205847},
- {13733362, 5599946, 10557076, 3195751, -5557991, 8536970, -25540170,
- 8525972, 10151379, 10394400},
+ { 9769828, 5202651, -24157398, -13631392, -28051003, -11561624,
+ -24613141, -13860782, -31184575, 709464 },
+ { 12286395, 13076066, -21775189, -1176622, -25003198, 4057652,
+ -32018128, -8890874, 16102007, 13205847 },
+ { 13733362, 5599946, 10557076, 3195751, -5557991, 8536970, -25540170,
+ 8525972, 10151379, 10394400 },
},
{
- {4024660, -16137551, 22436262, 12276534, -9099015, -2686099,
- 19698229, 11743039, -33302334, 8934414},
- {-15879800, -4525240, -8580747, -2934061, 14634845, -698278,
- -9449077, 3137094, -11536886, 11721158},
- {17555939, -5013938, 8268606, 2331751, -22738815, 9761013, 9319229,
- 8835153, -9205489, -1280045},
+ { 4024660, -16137551, 22436262, 12276534, -9099015, -2686099,
+ 19698229, 11743039, -33302334, 8934414 },
+ { -15879800, -4525240, -8580747, -2934061, 14634845, -698278,
+ -9449077, 3137094, -11536886, 11721158 },
+ { 17555939, -5013938, 8268606, 2331751, -22738815, 9761013, 9319229,
+ 8835153, -9205489, -1280045 },
},
{
- {-461409, -7830014, 20614118, 16688288, -7514766, -4807119,
- 22300304, 505429, 6108462, -6183415},
- {-5070281, 12367917, -30663534, 3234473, 32617080, -8422642,
- 29880583, -13483331, -26898490, -7867459},
- {-31975283, 5726539, 26934134, 10237677, -3173717, -605053,
- 24199304, 3795095, 7592688, -14992079},
+ { -461409, -7830014, 20614118, 16688288, -7514766, -4807119,
+ 22300304, 505429, 6108462, -6183415 },
+ { -5070281, 12367917, -30663534, 3234473, 32617080, -8422642,
+ 29880583, -13483331, -26898490, -7867459 },
+ { -31975283, 5726539, 26934134, 10237677, -3173717, -605053,
+ 24199304, 3795095, 7592688, -14992079 },
},
{
- {21594432, -14964228, 17466408, -4077222, 32537084, 2739898,
- 6407723, 12018833, -28256052, 4298412},
- {-20650503, -11961496, -27236275, 570498, 3767144, -1717540,
- 13891942, -1569194, 13717174, 10805743},
- {-14676630, -15644296, 15287174, 11927123, 24177847, -8175568,
- -796431, 14860609, -26938930, -5863836},
+ { 21594432, -14964228, 17466408, -4077222, 32537084, 2739898,
+ 6407723, 12018833, -28256052, 4298412 },
+ { -20650503, -11961496, -27236275, 570498, 3767144, -1717540,
+ 13891942, -1569194, 13717174, 10805743 },
+ { -14676630, -15644296, 15287174, 11927123, 24177847, -8175568,
+ -796431, 14860609, -26938930, -5863836 },
},
},
{
{
- {12962541, 5311799, -10060768, 11658280, 18855286, -7954201,
- 13286263, -12808704, -4381056, 9882022},
- {18512079, 11319350, -20123124, 15090309, 18818594, 5271736,
- -22727904, 3666879, -23967430, -3299429},
- {-6789020, -3146043, 16192429, 13241070, 15898607, -14206114,
- -10084880, -6661110, -2403099, 5276065},
+ { 12962541, 5311799, -10060768, 11658280, 18855286, -7954201,
+ 13286263, -12808704, -4381056, 9882022 },
+ { 18512079, 11319350, -20123124, 15090309, 18818594, 5271736,
+ -22727904, 3666879, -23967430, -3299429 },
+ { -6789020, -3146043, 16192429, 13241070, 15898607, -14206114,
+ -10084880, -6661110, -2403099, 5276065 },
},
{
- {30169808, -5317648, 26306206, -11750859, 27814964, 7069267,
- 7152851, 3684982, 1449224, 13082861},
- {10342826, 3098505, 2119311, 193222, 25702612, 12233820, 23697382,
- 15056736, -21016438, -8202000},
- {-33150110, 3261608, 22745853, 7948688, 19370557, -15177665,
- -26171976, 6482814, -10300080, -11060101},
+ { 30169808, -5317648, 26306206, -11750859, 27814964, 7069267,
+ 7152851, 3684982, 1449224, 13082861 },
+ { 10342826, 3098505, 2119311, 193222, 25702612, 12233820, 23697382,
+ 15056736, -21016438, -8202000 },
+ { -33150110, 3261608, 22745853, 7948688, 19370557, -15177665,
+ -26171976, 6482814, -10300080, -11060101 },
},
{
- {32869458, -5408545, 25609743, 15678670, -10687769, -15471071,
- 26112421, 2521008, -22664288, 6904815},
- {29506923, 4457497, 3377935, -9796444, -30510046, 12935080, 1561737,
- 3841096, -29003639, -6657642},
- {10340844, -6630377, -18656632, -2278430, 12621151, -13339055,
- 30878497, -11824370, -25584551, 5181966},
+ { 32869458, -5408545, 25609743, 15678670, -10687769, -15471071,
+ 26112421, 2521008, -22664288, 6904815 },
+ { 29506923, 4457497, 3377935, -9796444, -30510046, 12935080, 1561737,
+ 3841096, -29003639, -6657642 },
+ { 10340844, -6630377, -18656632, -2278430, 12621151, -13339055,
+ 30878497, -11824370, -25584551, 5181966 },
},
{
- {25940115, -12658025, 17324188, -10307374, -8671468, 15029094,
- 24396252, -16450922, -2322852, -12388574},
- {-21765684, 9916823, -1300409, 4079498, -1028346, 11909559, 1782390,
- 12641087, 20603771, -6561742},
- {-18882287, -11673380, 24849422, 11501709, 13161720, -4768874,
- 1925523, 11914390, 4662781, 7820689},
+ { 25940115, -12658025, 17324188, -10307374, -8671468, 15029094,
+ 24396252, -16450922, -2322852, -12388574 },
+ { -21765684, 9916823, -1300409, 4079498, -1028346, 11909559, 1782390,
+ 12641087, 20603771, -6561742 },
+ { -18882287, -11673380, 24849422, 11501709, 13161720, -4768874,
+ 1925523, 11914390, 4662781, 7820689 },
},
{
- {12241050, -425982, 8132691, 9393934, 32846760, -1599620, 29749456,
- 12172924, 16136752, 15264020},
- {-10349955, -14680563, -8211979, 2330220, -17662549, -14545780,
- 10658213, 6671822, 19012087, 3772772},
- {3753511, -3421066, 10617074, 2028709, 14841030, -6721664, 28718732,
- -15762884, 20527771, 12988982},
+ { 12241050, -425982, 8132691, 9393934, 32846760, -1599620, 29749456,
+ 12172924, 16136752, 15264020 },
+ { -10349955, -14680563, -8211979, 2330220, -17662549, -14545780,
+ 10658213, 6671822, 19012087, 3772772 },
+ { 3753511, -3421066, 10617074, 2028709, 14841030, -6721664, 28718732,
+ -15762884, 20527771, 12988982 },
},
{
- {-14822485, -5797269, -3707987, 12689773, -898983, -10914866,
- -24183046, -10564943, 3299665, -12424953},
- {-16777703, -15253301, -9642417, 4978983, 3308785, 8755439, 6943197,
- 6461331, -25583147, 8991218},
- {-17226263, 1816362, -1673288, -6086439, 31783888, -8175991,
- -32948145, 7417950, -30242287, 1507265},
+ { -14822485, -5797269, -3707987, 12689773, -898983, -10914866,
+ -24183046, -10564943, 3299665, -12424953 },
+ { -16777703, -15253301, -9642417, 4978983, 3308785, 8755439, 6943197,
+ 6461331, -25583147, 8991218 },
+ { -17226263, 1816362, -1673288, -6086439, 31783888, -8175991,
+ -32948145, 7417950, -30242287, 1507265 },
},
{
- {29692663, 6829891, -10498800, 4334896, 20945975, -11906496,
- -28887608, 8209391, 14606362, -10647073},
- {-3481570, 8707081, 32188102, 5672294, 22096700, 1711240, -33020695,
- 9761487, 4170404, -2085325},
- {-11587470, 14855945, -4127778, -1531857, -26649089, 15084046,
- 22186522, 16002000, -14276837, -8400798},
+ { 29692663, 6829891, -10498800, 4334896, 20945975, -11906496,
+ -28887608, 8209391, 14606362, -10647073 },
+ { -3481570, 8707081, 32188102, 5672294, 22096700, 1711240, -33020695,
+ 9761487, 4170404, -2085325 },
+ { -11587470, 14855945, -4127778, -1531857, -26649089, 15084046,
+ 22186522, 16002000, -14276837, -8400798 },
},
{
- {-4811456, 13761029, -31703877, -2483919, -3312471, 7869047,
- -7113572, -9620092, 13240845, 10965870},
- {-7742563, -8256762, -14768334, -13656260, -23232383, 12387166,
- 4498947, 14147411, 29514390, 4302863},
- {-13413405, -12407859, 20757302, -13801832, 14785143, 8976368,
- -5061276, -2144373, 17846988, -13971927},
+ { -4811456, 13761029, -31703877, -2483919, -3312471, 7869047,
+ -7113572, -9620092, 13240845, 10965870 },
+ { -7742563, -8256762, -14768334, -13656260, -23232383, 12387166,
+ 4498947, 14147411, 29514390, 4302863 },
+ { -13413405, -12407859, 20757302, -13801832, 14785143, 8976368,
+ -5061276, -2144373, 17846988, -13971927 },
},
},
{
{
- {-2244452, -754728, -4597030, -1066309, -6247172, 1455299,
- -21647728, -9214789, -5222701, 12650267},
- {-9906797, -16070310, 21134160, 12198166, -27064575, 708126, 387813,
- 13770293, -19134326, 10958663},
- {22470984, 12369526, 23446014, -5441109, -21520802, -9698723,
- -11772496, -11574455, -25083830, 4271862},
+ { -2244452, -754728, -4597030, -1066309, -6247172, 1455299,
+ -21647728, -9214789, -5222701, 12650267 },
+ { -9906797, -16070310, 21134160, 12198166, -27064575, 708126, 387813,
+ 13770293, -19134326, 10958663 },
+ { 22470984, 12369526, 23446014, -5441109, -21520802, -9698723,
+ -11772496, -11574455, -25083830, 4271862 },
},
{
- {-25169565, -10053642, -19909332, 15361595, -5984358, 2159192,
- 75375, -4278529, -32526221, 8469673},
- {15854970, 4148314, -8893890, 7259002, 11666551, 13824734,
- -30531198, 2697372, 24154791, -9460943},
- {15446137, -15806644, 29759747, 14019369, 30811221, -9610191,
- -31582008, 12840104, 24913809, 9815020},
+ { -25169565, -10053642, -19909332, 15361595, -5984358, 2159192,
+ 75375, -4278529, -32526221, 8469673 },
+ { 15854970, 4148314, -8893890, 7259002, 11666551, 13824734,
+ -30531198, 2697372, 24154791, -9460943 },
+ { 15446137, -15806644, 29759747, 14019369, 30811221, -9610191,
+ -31582008, 12840104, 24913809, 9815020 },
},
{
- {-4709286, -5614269, -31841498, -12288893, -14443537, 10799414,
- -9103676, 13438769, 18735128, 9466238},
- {11933045, 9281483, 5081055, -5183824, -2628162, -4905629, -7727821,
- -10896103, -22728655, 16199064},
- {14576810, 379472, -26786533, -8317236, -29426508, -10812974,
- -102766, 1876699, 30801119, 2164795},
+ { -4709286, -5614269, -31841498, -12288893, -14443537, 10799414,
+ -9103676, 13438769, 18735128, 9466238 },
+ { 11933045, 9281483, 5081055, -5183824, -2628162, -4905629, -7727821,
+ -10896103, -22728655, 16199064 },
+ { 14576810, 379472, -26786533, -8317236, -29426508, -10812974,
+ -102766, 1876699, 30801119, 2164795 },
},
{
- {15995086, 3199873, 13672555, 13712240, -19378835, -4647646,
- -13081610, -15496269, -13492807, 1268052},
- {-10290614, -3659039, -3286592, 10948818, 23037027, 3794475,
- -3470338, -12600221, -17055369, 3565904},
- {29210088, -9419337, -5919792, -4952785, 10834811, -13327726,
- -16512102, -10820713, -27162222, -14030531},
+ { 15995086, 3199873, 13672555, 13712240, -19378835, -4647646,
+ -13081610, -15496269, -13492807, 1268052 },
+ { -10290614, -3659039, -3286592, 10948818, 23037027, 3794475,
+ -3470338, -12600221, -17055369, 3565904 },
+ { 29210088, -9419337, -5919792, -4952785, 10834811, -13327726,
+ -16512102, -10820713, -27162222, -14030531 },
},
{
- {-13161890, 15508588, 16663704, -8156150, -28349942, 9019123,
- -29183421, -3769423, 2244111, -14001979},
- {-5152875, -3800936, -9306475, -6071583, 16243069, 14684434,
- -25673088, -16180800, 13491506, 4641841},
- {10813417, 643330, -19188515, -728916, 30292062, -16600078,
- 27548447, -7721242, 14476989, -12767431},
+ { -13161890, 15508588, 16663704, -8156150, -28349942, 9019123,
+ -29183421, -3769423, 2244111, -14001979 },
+ { -5152875, -3800936, -9306475, -6071583, 16243069, 14684434,
+ -25673088, -16180800, 13491506, 4641841 },
+ { 10813417, 643330, -19188515, -728916, 30292062, -16600078,
+ 27548447, -7721242, 14476989, -12767431 },
},
{
- {10292079, 9984945, 6481436, 8279905, -7251514, 7032743, 27282937,
- -1644259, -27912810, 12651324},
- {-31185513, -813383, 22271204, 11835308, 10201545, 15351028,
- 17099662, 3988035, 21721536, -3148940},
- {10202177, -6545839, -31373232, -9574638, -32150642, -8119683,
- -12906320, 3852694, 13216206, 14842320},
+ { 10292079, 9984945, 6481436, 8279905, -7251514, 7032743, 27282937,
+ -1644259, -27912810, 12651324 },
+ { -31185513, -813383, 22271204, 11835308, 10201545, 15351028,
+ 17099662, 3988035, 21721536, -3148940 },
+ { 10202177, -6545839, -31373232, -9574638, -32150642, -8119683,
+ -12906320, 3852694, 13216206, 14842320 },
},
{
- {-15815640, -10601066, -6538952, -7258995, -6984659, -6581778,
- -31500847, 13765824, -27434397, 9900184},
- {14465505, -13833331, -32133984, -14738873, -27443187, 12990492,
- 33046193, 15796406, -7051866, -8040114},
- {30924417, -8279620, 6359016, -12816335, 16508377, 9071735,
- -25488601, 15413635, 9524356, -7018878},
+ { -15815640, -10601066, -6538952, -7258995, -6984659, -6581778,
+ -31500847, 13765824, -27434397, 9900184 },
+ { 14465505, -13833331, -32133984, -14738873, -27443187, 12990492,
+ 33046193, 15796406, -7051866, -8040114 },
+ { 30924417, -8279620, 6359016, -12816335, 16508377, 9071735,
+ -25488601, 15413635, 9524356, -7018878 },
},
{
- {12274201, -13175547, 32627641, -1785326, 6736625, 13267305,
- 5237659, -5109483, 15663516, 4035784},
- {-2951309, 8903985, 17349946, 601635, -16432815, -4612556,
- -13732739, -15889334, -22258478, 4659091},
- {-16916263, -4952973, -30393711, -15158821, 20774812, 15897498,
- 5736189, 15026997, -2178256, -13455585},
+ { 12274201, -13175547, 32627641, -1785326, 6736625, 13267305,
+ 5237659, -5109483, 15663516, 4035784 },
+ { -2951309, 8903985, 17349946, 601635, -16432815, -4612556,
+ -13732739, -15889334, -22258478, 4659091 },
+ { -16916263, -4952973, -30393711, -15158821, 20774812, 15897498,
+ 5736189, 15026997, -2178256, -13455585 },
},
},
{
{
- {-8858980, -2219056, 28571666, -10155518, -474467, -10105698,
- -3801496, 278095, 23440562, -290208},
- {10226241, -5928702, 15139956, 120818, -14867693, 5218603, 32937275,
- 11551483, -16571960, -7442864},
- {17932739, -12437276, -24039557, 10749060, 11316803, 7535897,
- 22503767, 5561594, -3646624, 3898661},
+ { -8858980, -2219056, 28571666, -10155518, -474467, -10105698,
+ -3801496, 278095, 23440562, -290208 },
+ { 10226241, -5928702, 15139956, 120818, -14867693, 5218603, 32937275,
+ 11551483, -16571960, -7442864 },
+ { 17932739, -12437276, -24039557, 10749060, 11316803, 7535897,
+ 22503767, 5561594, -3646624, 3898661 },
},
{
- {7749907, -969567, -16339731, -16464, -25018111, 15122143, -1573531,
- 7152530, 21831162, 1245233},
- {26958459, -14658026, 4314586, 8346991, -5677764, 11960072,
- -32589295, -620035, -30402091, -16716212},
- {-12165896, 9166947, 33491384, 13673479, 29787085, 13096535,
- 6280834, 14587357, -22338025, 13987525},
+ { 7749907, -969567, -16339731, -16464, -25018111, 15122143, -1573531,
+ 7152530, 21831162, 1245233 },
+ { 26958459, -14658026, 4314586, 8346991, -5677764, 11960072,
+ -32589295, -620035, -30402091, -16716212 },
+ { -12165896, 9166947, 33491384, 13673479, 29787085, 13096535,
+ 6280834, 14587357, -22338025, 13987525 },
},
{
- {-24349909, 7778775, 21116000, 15572597, -4833266, -5357778,
- -4300898, -5124639, -7469781, -2858068},
- {9681908, -6737123, -31951644, 13591838, -6883821, 386950, 31622781,
- 6439245, -14581012, 4091397},
- {-8426427, 1470727, -28109679, -1596990, 3978627, -5123623,
- -19622683, 12092163, 29077877, -14741988},
+ { -24349909, 7778775, 21116000, 15572597, -4833266, -5357778,
+ -4300898, -5124639, -7469781, -2858068 },
+ { 9681908, -6737123, -31951644, 13591838, -6883821, 386950, 31622781,
+ 6439245, -14581012, 4091397 },
+ { -8426427, 1470727, -28109679, -1596990, 3978627, -5123623,
+ -19622683, 12092163, 29077877, -14741988 },
},
{
- {5269168, -6859726, -13230211, -8020715, 25932563, 1763552,
- -5606110, -5505881, -20017847, 2357889},
- {32264008, -15407652, -5387735, -1160093, -2091322, -3946900,
- 23104804, -12869908, 5727338, 189038},
- {14609123, -8954470, -6000566, -16622781, -14577387, -7743898,
- -26745169, 10942115, -25888931, -14884697},
+ { 5269168, -6859726, -13230211, -8020715, 25932563, 1763552,
+ -5606110, -5505881, -20017847, 2357889 },
+ { 32264008, -15407652, -5387735, -1160093, -2091322, -3946900,
+ 23104804, -12869908, 5727338, 189038 },
+ { 14609123, -8954470, -6000566, -16622781, -14577387, -7743898,
+ -26745169, 10942115, -25888931, -14884697 },
},
{
- {20513500, 5557931, -15604613, 7829531, 26413943, -2019404,
- -21378968, 7471781, 13913677, -5137875},
- {-25574376, 11967826, 29233242, 12948236, -6754465, 4713227,
- -8940970, 14059180, 12878652, 8511905},
- {-25656801, 3393631, -2955415, -7075526, -2250709, 9366908,
- -30223418, 6812974, 5568676, -3127656},
+ { 20513500, 5557931, -15604613, 7829531, 26413943, -2019404,
+ -21378968, 7471781, 13913677, -5137875 },
+ { -25574376, 11967826, 29233242, 12948236, -6754465, 4713227,
+ -8940970, 14059180, 12878652, 8511905 },
+ { -25656801, 3393631, -2955415, -7075526, -2250709, 9366908,
+ -30223418, 6812974, 5568676, -3127656 },
},
{
- {11630004, 12144454, 2116339, 13606037, 27378885, 15676917,
- -17408753, -13504373, -14395196, 8070818},
- {27117696, -10007378, -31282771, -5570088, 1127282, 12772488,
- -29845906, 10483306, -11552749, -1028714},
- {10637467, -5688064, 5674781, 1072708, -26343588, -6982302,
- -1683975, 9177853, -27493162, 15431203},
+ { 11630004, 12144454, 2116339, 13606037, 27378885, 15676917,
+ -17408753, -13504373, -14395196, 8070818 },
+ { 27117696, -10007378, -31282771, -5570088, 1127282, 12772488,
+ -29845906, 10483306, -11552749, -1028714 },
+ { 10637467, -5688064, 5674781, 1072708, -26343588, -6982302,
+ -1683975, 9177853, -27493162, 15431203 },
},
{
- {20525145, 10892566, -12742472, 12779443, -29493034, 16150075,
- -28240519, 14943142, -15056790, -7935931},
- {-30024462, 5626926, -551567, -9981087, 753598, 11981191, 25244767,
- -3239766, -3356550, 9594024},
- {-23752644, 2636870, -5163910, -10103818, 585134, 7877383, 11345683,
- -6492290, 13352335, -10977084},
+ { 20525145, 10892566, -12742472, 12779443, -29493034, 16150075,
+ -28240519, 14943142, -15056790, -7935931 },
+ { -30024462, 5626926, -551567, -9981087, 753598, 11981191, 25244767,
+ -3239766, -3356550, 9594024 },
+ { -23752644, 2636870, -5163910, -10103818, 585134, 7877383, 11345683,
+ -6492290, 13352335, -10977084 },
},
{
- {-1931799, -5407458, 3304649, -12884869, 17015806, -4877091,
- -29783850, -7752482, -13215537, -319204},
- {20239939, 6607058, 6203985, 3483793, -18386976, -779229, -20723742,
- 15077870, -22750759, 14523817},
- {27406042, -6041657, 27423596, -4497394, 4996214, 10002360,
- -28842031, -4545494, -30172742, -4805667},
+ { -1931799, -5407458, 3304649, -12884869, 17015806, -4877091,
+ -29783850, -7752482, -13215537, -319204 },
+ { 20239939, 6607058, 6203985, 3483793, -18386976, -779229, -20723742,
+ 15077870, -22750759, 14523817 },
+ { 27406042, -6041657, 27423596, -4497394, 4996214, 10002360,
+ -28842031, -4545494, -30172742, -4805667 },
},
},
{
{
- {11374242, 12660715, 17861383, -12540833, 10935568, 1099227,
- -13886076, -9091740, -27727044, 11358504},
- {-12730809, 10311867, 1510375, 10778093, -2119455, -9145702,
- 32676003, 11149336, -26123651, 4985768},
- {-19096303, 341147, -6197485, -239033, 15756973, -8796662, -983043,
- 13794114, -19414307, -15621255},
+ { 11374242, 12660715, 17861383, -12540833, 10935568, 1099227,
+ -13886076, -9091740, -27727044, 11358504 },
+ { -12730809, 10311867, 1510375, 10778093, -2119455, -9145702,
+ 32676003, 11149336, -26123651, 4985768 },
+ { -19096303, 341147, -6197485, -239033, 15756973, -8796662, -983043,
+ 13794114, -19414307, -15621255 },
},
{
- {6490081, 11940286, 25495923, -7726360, 8668373, -8751316, 3367603,
- 6970005, -1691065, -9004790},
- {1656497, 13457317, 15370807, 6364910, 13605745, 8362338, -19174622,
- -5475723, -16796596, -5031438},
- {-22273315, -13524424, -64685, -4334223, -18605636, -10921968,
- -20571065, -7007978, -99853, -10237333},
+ { 6490081, 11940286, 25495923, -7726360, 8668373, -8751316, 3367603,
+ 6970005, -1691065, -9004790 },
+ { 1656497, 13457317, 15370807, 6364910, 13605745, 8362338, -19174622,
+ -5475723, -16796596, -5031438 },
+ { -22273315, -13524424, -64685, -4334223, -18605636, -10921968,
+ -20571065, -7007978, -99853, -10237333 },
},
{
- {17747465, 10039260, 19368299, -4050591, -20630635, -16041286,
- 31992683, -15857976, -29260363, -5511971},
- {31932027, -4986141, -19612382, 16366580, 22023614, 88450, 11371999,
- -3744247, 4882242, -10626905},
- {29796507, 37186, 19818052, 10115756, -11829032, 3352736, 18551198,
- 3272828, -5190932, -4162409},
+ { 17747465, 10039260, 19368299, -4050591, -20630635, -16041286,
+ 31992683, -15857976, -29260363, -5511971 },
+ { 31932027, -4986141, -19612382, 16366580, 22023614, 88450, 11371999,
+ -3744247, 4882242, -10626905 },
+ { 29796507, 37186, 19818052, 10115756, -11829032, 3352736, 18551198,
+ 3272828, -5190932, -4162409 },
},
{
- {12501286, 4044383, -8612957, -13392385, -32430052, 5136599,
- -19230378, -3529697, 330070, -3659409},
- {6384877, 2899513, 17807477, 7663917, -2358888, 12363165, 25366522,
- -8573892, -271295, 12071499},
- {-8365515, -4042521, 25133448, -4517355, -6211027, 2265927,
- -32769618, 1936675, -5159697, 3829363},
+ { 12501286, 4044383, -8612957, -13392385, -32430052, 5136599,
+ -19230378, -3529697, 330070, -3659409 },
+ { 6384877, 2899513, 17807477, 7663917, -2358888, 12363165, 25366522,
+ -8573892, -271295, 12071499 },
+ { -8365515, -4042521, 25133448, -4517355, -6211027, 2265927,
+ -32769618, 1936675, -5159697, 3829363 },
},
{
- {28425966, -5835433, -577090, -4697198, -14217555, 6870930, 7921550,
- -6567787, 26333140, 14267664},
- {-11067219, 11871231, 27385719, -10559544, -4585914, -11189312,
- 10004786, -8709488, -21761224, 8930324},
- {-21197785, -16396035, 25654216, -1725397, 12282012, 11008919,
- 1541940, 4757911, -26491501, -16408940},
+ { 28425966, -5835433, -577090, -4697198, -14217555, 6870930, 7921550,
+ -6567787, 26333140, 14267664 },
+ { -11067219, 11871231, 27385719, -10559544, -4585914, -11189312,
+ 10004786, -8709488, -21761224, 8930324 },
+ { -21197785, -16396035, 25654216, -1725397, 12282012, 11008919,
+ 1541940, 4757911, -26491501, -16408940 },
},
{
- {13537262, -7759490, -20604840, 10961927, -5922820, -13218065,
- -13156584, 6217254, -15943699, 13814990},
- {-17422573, 15157790, 18705543, 29619, 24409717, -260476, 27361681,
- 9257833, -1956526, -1776914},
- {-25045300, -10191966, 15366585, 15166509, -13105086, 8423556,
- -29171540, 12361135, -18685978, 4578290},
+ { 13537262, -7759490, -20604840, 10961927, -5922820, -13218065,
+ -13156584, 6217254, -15943699, 13814990 },
+ { -17422573, 15157790, 18705543, 29619, 24409717, -260476, 27361681,
+ 9257833, -1956526, -1776914 },
+ { -25045300, -10191966, 15366585, 15166509, -13105086, 8423556,
+ -29171540, 12361135, -18685978, 4578290 },
},
{
- {24579768, 3711570, 1342322, -11180126, -27005135, 14124956,
- -22544529, 14074919, 21964432, 8235257},
- {-6528613, -2411497, 9442966, -5925588, 12025640, -1487420,
- -2981514, -1669206, 13006806, 2355433},
- {-16304899, -13605259, -6632427, -5142349, 16974359, -10911083,
- 27202044, 1719366, 1141648, -12796236},
+ { 24579768, 3711570, 1342322, -11180126, -27005135, 14124956,
+ -22544529, 14074919, 21964432, 8235257 },
+ { -6528613, -2411497, 9442966, -5925588, 12025640, -1487420,
+ -2981514, -1669206, 13006806, 2355433 },
+ { -16304899, -13605259, -6632427, -5142349, 16974359, -10911083,
+ 27202044, 1719366, 1141648, -12796236 },
},
{
- {-12863944, -13219986, -8318266, -11018091, -6810145, -4843894,
- 13475066, -3133972, 32674895, 13715045},
- {11423335, -5468059, 32344216, 8962751, 24989809, 9241752,
- -13265253, 16086212, -28740881, -15642093},
- {-1409668, 12530728, -6368726, 10847387, 19531186, -14132160,
- -11709148, 7791794, -27245943, 4383347},
+ { -12863944, -13219986, -8318266, -11018091, -6810145, -4843894,
+ 13475066, -3133972, 32674895, 13715045 },
+ { 11423335, -5468059, 32344216, 8962751, 24989809, 9241752,
+ -13265253, 16086212, -28740881, -15642093 },
+ { -1409668, 12530728, -6368726, 10847387, 19531186, -14132160,
+ -11709148, 7791794, -27245943, 4383347 },
},
},
{
{
- {-28970898, 5271447, -1266009, -9736989, -12455236, 16732599,
- -4862407, -4906449, 27193557, 6245191},
- {-15193956, 5362278, -1783893, 2695834, 4960227, 12840725, 23061898,
- 3260492, 22510453, 8577507},
- {-12632451, 11257346, -32692994, 13548177, -721004, 10879011,
- 31168030, 13952092, -29571492, -3635906},
+ { -28970898, 5271447, -1266009, -9736989, -12455236, 16732599,
+ -4862407, -4906449, 27193557, 6245191 },
+ { -15193956, 5362278, -1783893, 2695834, 4960227, 12840725, 23061898,
+ 3260492, 22510453, 8577507 },
+ { -12632451, 11257346, -32692994, 13548177, -721004, 10879011,
+ 31168030, 13952092, -29571492, -3635906 },
},
{
- {3877321, -9572739, 32416692, 5405324, -11004407, -13656635,
- 3759769, 11935320, 5611860, 8164018},
- {-16275802, 14667797, 15906460, 12155291, -22111149, -9039718,
- 32003002, -8832289, 5773085, -8422109},
- {-23788118, -8254300, 1950875, 8937633, 18686727, 16459170, -905725,
- 12376320, 31632953, 190926},
+ { 3877321, -9572739, 32416692, 5405324, -11004407, -13656635,
+ 3759769, 11935320, 5611860, 8164018 },
+ { -16275802, 14667797, 15906460, 12155291, -22111149, -9039718,
+ 32003002, -8832289, 5773085, -8422109 },
+ { -23788118, -8254300, 1950875, 8937633, 18686727, 16459170, -905725,
+ 12376320, 31632953, 190926 },
},
{
- {-24593607, -16138885, -8423991, 13378746, 14162407, 6901328,
- -8288749, 4508564, -25341555, -3627528},
- {8884438, -5884009, 6023974, 10104341, -6881569, -4941533, 18722941,
- -14786005, -1672488, 827625},
- {-32720583, -16289296, -32503547, 7101210, 13354605, 2659080,
- -1800575, -14108036, -24878478, 1541286},
+ { -24593607, -16138885, -8423991, 13378746, 14162407, 6901328,
+ -8288749, 4508564, -25341555, -3627528 },
+ { 8884438, -5884009, 6023974, 10104341, -6881569, -4941533, 18722941,
+ -14786005, -1672488, 827625 },
+ { -32720583, -16289296, -32503547, 7101210, 13354605, 2659080,
+ -1800575, -14108036, -24878478, 1541286 },
},
{
- {2901347, -1117687, 3880376, -10059388, -17620940, -3612781,
- -21802117, -3567481, 20456845, -1885033},
- {27019610, 12299467, -13658288, -1603234, -12861660, -4861471,
- -19540150, -5016058, 29439641, 15138866},
- {21536104, -6626420, -32447818, -10690208, -22408077, 5175814,
- -5420040, -16361163, 7779328, 109896},
+ { 2901347, -1117687, 3880376, -10059388, -17620940, -3612781,
+ -21802117, -3567481, 20456845, -1885033 },
+ { 27019610, 12299467, -13658288, -1603234, -12861660, -4861471,
+ -19540150, -5016058, 29439641, 15138866 },
+ { 21536104, -6626420, -32447818, -10690208, -22408077, 5175814,
+ -5420040, -16361163, 7779328, 109896 },
},
{
- {30279744, 14648750, -8044871, 6425558, 13639621, -743509, 28698390,
- 12180118, 23177719, -554075},
- {26572847, 3405927, -31701700, 12890905, -19265668, 5335866,
- -6493768, 2378492, 4439158, -13279347},
- {-22716706, 3489070, -9225266, -332753, 18875722, -1140095,
- 14819434, -12731527, -17717757, -5461437},
+ { 30279744, 14648750, -8044871, 6425558, 13639621, -743509, 28698390,
+ 12180118, 23177719, -554075 },
+ { 26572847, 3405927, -31701700, 12890905, -19265668, 5335866,
+ -6493768, 2378492, 4439158, -13279347 },
+ { -22716706, 3489070, -9225266, -332753, 18875722, -1140095,
+ 14819434, -12731527, -17717757, -5461437 },
},
{
- {-5056483, 16566551, 15953661, 3767752, -10436499, 15627060,
- -820954, 2177225, 8550082, -15114165},
- {-18473302, 16596775, -381660, 15663611, 22860960, 15585581,
- -27844109, -3582739, -23260460, -8428588},
- {-32480551, 15707275, -8205912, -5652081, 29464558, 2713815,
- -22725137, 15860482, -21902570, 1494193},
+ { -5056483, 16566551, 15953661, 3767752, -10436499, 15627060,
+ -820954, 2177225, 8550082, -15114165 },
+ { -18473302, 16596775, -381660, 15663611, 22860960, 15585581,
+ -27844109, -3582739, -23260460, -8428588 },
+ { -32480551, 15707275, -8205912, -5652081, 29464558, 2713815,
+ -22725137, 15860482, -21902570, 1494193 },
},
{
- {-19562091, -14087393, -25583872, -9299552, 13127842, 759709,
- 21923482, 16529112, 8742704, 12967017},
- {-28464899, 1553205, 32536856, -10473729, -24691605, -406174,
- -8914625, -2933896, -29903758, 15553883},
- {21877909, 3230008, 9881174, 10539357, -4797115, 2841332, 11543572,
- 14513274, 19375923, -12647961},
+ { -19562091, -14087393, -25583872, -9299552, 13127842, 759709,
+ 21923482, 16529112, 8742704, 12967017 },
+ { -28464899, 1553205, 32536856, -10473729, -24691605, -406174,
+ -8914625, -2933896, -29903758, 15553883 },
+ { 21877909, 3230008, 9881174, 10539357, -4797115, 2841332, 11543572,
+ 14513274, 19375923, -12647961 },
},
{
- {8832269, -14495485, 13253511, 5137575, 5037871, 4078777, 24880818,
- -6222716, 2862653, 9455043},
- {29306751, 5123106, 20245049, -14149889, 9592566, 8447059, -2077124,
- -2990080, 15511449, 4789663},
- {-20679756, 7004547, 8824831, -9434977, -4045704, -3750736,
- -5754762, 108893, 23513200, 16652362},
+ { 8832269, -14495485, 13253511, 5137575, 5037871, 4078777, 24880818,
+ -6222716, 2862653, 9455043 },
+ { 29306751, 5123106, 20245049, -14149889, 9592566, 8447059, -2077124,
+ -2990080, 15511449, 4789663 },
+ { -20679756, 7004547, 8824831, -9434977, -4045704, -3750736,
+ -5754762, 108893, 23513200, 16652362 },
},
},
{
{
- {-33256173, 4144782, -4476029, -6579123, 10770039, -7155542,
- -6650416, -12936300, -18319198, 10212860},
- {2756081, 8598110, 7383731, -6859892, 22312759, -1105012, 21179801,
- 2600940, -9988298, -12506466},
- {-24645692, 13317462, -30449259, -15653928, 21365574, -10869657,
- 11344424, 864440, -2499677, -16710063},
+ { -33256173, 4144782, -4476029, -6579123, 10770039, -7155542,
+ -6650416, -12936300, -18319198, 10212860 },
+ { 2756081, 8598110, 7383731, -6859892, 22312759, -1105012, 21179801,
+ 2600940, -9988298, -12506466 },
+ { -24645692, 13317462, -30449259, -15653928, 21365574, -10869657,
+ 11344424, 864440, -2499677, -16710063 },
},
{
- {-26432803, 6148329, -17184412, -14474154, 18782929, -275997,
- -22561534, 211300, 2719757, 4940997},
- {-1323882, 3911313, -6948744, 14759765, -30027150, 7851207,
- 21690126, 8518463, 26699843, 5276295},
- {-13149873, -6429067, 9396249, 365013, 24703301, -10488939, 1321586,
- 149635, -15452774, 7159369},
+ { -26432803, 6148329, -17184412, -14474154, 18782929, -275997,
+ -22561534, 211300, 2719757, 4940997 },
+ { -1323882, 3911313, -6948744, 14759765, -30027150, 7851207,
+ 21690126, 8518463, 26699843, 5276295 },
+ { -13149873, -6429067, 9396249, 365013, 24703301, -10488939, 1321586,
+ 149635, -15452774, 7159369 },
},
{
- {9987780, -3404759, 17507962, 9505530, 9731535, -2165514, 22356009,
- 8312176, 22477218, -8403385},
- {18155857, -16504990, 19744716, 9006923, 15154154, -10538976,
- 24256460, -4864995, -22548173, 9334109},
- {2986088, -4911893, 10776628, -3473844, 10620590, -7083203,
- -21413845, 14253545, -22587149, 536906},
+ { 9987780, -3404759, 17507962, 9505530, 9731535, -2165514, 22356009,
+ 8312176, 22477218, -8403385 },
+ { 18155857, -16504990, 19744716, 9006923, 15154154, -10538976,
+ 24256460, -4864995, -22548173, 9334109 },
+ { 2986088, -4911893, 10776628, -3473844, 10620590, -7083203,
+ -21413845, 14253545, -22587149, 536906 },
},
{
- {4377756, 8115836, 24567078, 15495314, 11625074, 13064599, 7390551,
- 10589625, 10838060, -15420424},
- {-19342404, 867880, 9277171, -3218459, -14431572, -1986443,
- 19295826, -15796950, 6378260, 699185},
- {7895026, 4057113, -7081772, -13077756, -17886831, -323126, -716039,
- 15693155, -5045064, -13373962},
+ { 4377756, 8115836, 24567078, 15495314, 11625074, 13064599, 7390551,
+ 10589625, 10838060, -15420424 },
+ { -19342404, 867880, 9277171, -3218459, -14431572, -1986443,
+ 19295826, -15796950, 6378260, 699185 },
+ { 7895026, 4057113, -7081772, -13077756, -17886831, -323126, -716039,
+ 15693155, -5045064, -13373962 },
},
{
- {-7737563, -5869402, -14566319, -7406919, 11385654, 13201616,
- 31730678, -10962840, -3918636, -9669325},
- {10188286, -15770834, -7336361, 13427543, 22223443, 14896287,
- 30743455, 7116568, -21786507, 5427593},
- {696102, 13206899, 27047647, -10632082, 15285305, -9853179,
- 10798490, -4578720, 19236243, 12477404},
+ { -7737563, -5869402, -14566319, -7406919, 11385654, 13201616,
+ 31730678, -10962840, -3918636, -9669325 },
+ { 10188286, -15770834, -7336361, 13427543, 22223443, 14896287,
+ 30743455, 7116568, -21786507, 5427593 },
+ { 696102, 13206899, 27047647, -10632082, 15285305, -9853179,
+ 10798490, -4578720, 19236243, 12477404 },
},
{
- {-11229439, 11243796, -17054270, -8040865, -788228, -8167967,
- -3897669, 11180504, -23169516, 7733644},
- {17800790, -14036179, -27000429, -11766671, 23887827, 3149671,
- 23466177, -10538171, 10322027, 15313801},
- {26246234, 11968874, 32263343, -5468728, 6830755, -13323031,
- -15794704, -101982, -24449242, 10890804},
+ { -11229439, 11243796, -17054270, -8040865, -788228, -8167967,
+ -3897669, 11180504, -23169516, 7733644 },
+ { 17800790, -14036179, -27000429, -11766671, 23887827, 3149671,
+ 23466177, -10538171, 10322027, 15313801 },
+ { 26246234, 11968874, 32263343, -5468728, 6830755, -13323031,
+ -15794704, -101982, -24449242, 10890804 },
},
{
- {-31365647, 10271363, -12660625, -6267268, 16690207, -13062544,
- -14982212, 16484931, 25180797, -5334884},
- {-586574, 10376444, -32586414, -11286356, 19801893, 10997610,
- 2276632, 9482883, 316878, 13820577},
- {-9882808, -4510367, -2115506, 16457136, -11100081, 11674996,
- 30756178, -7515054, 30696930, -3712849},
+ { -31365647, 10271363, -12660625, -6267268, 16690207, -13062544,
+ -14982212, 16484931, 25180797, -5334884 },
+ { -586574, 10376444, -32586414, -11286356, 19801893, 10997610,
+ 2276632, 9482883, 316878, 13820577 },
+ { -9882808, -4510367, -2115506, 16457136, -11100081, 11674996,
+ 30756178, -7515054, 30696930, -3712849 },
},
{
- {32988917, -9603412, 12499366, 7910787, -10617257, -11931514,
- -7342816, -9985397, -32349517, 7392473},
- {-8855661, 15927861, 9866406, -3649411, -2396914, -16655781,
- -30409476, -9134995, 25112947, -2926644},
- {-2504044, -436966, 25621774, -5678772, 15085042, -5479877,
- -24884878, -13526194, 5537438, -13914319},
+ { 32988917, -9603412, 12499366, 7910787, -10617257, -11931514,
+ -7342816, -9985397, -32349517, 7392473 },
+ { -8855661, 15927861, 9866406, -3649411, -2396914, -16655781,
+ -30409476, -9134995, 25112947, -2926644 },
+ { -2504044, -436966, 25621774, -5678772, 15085042, -5479877,
+ -24884878, -13526194, 5537438, -13914319 },
},
},
{
{
- {-11225584, 2320285, -9584280, 10149187, -33444663, 5808648,
- -14876251, -1729667, 31234590, 6090599},
- {-9633316, 116426, 26083934, 2897444, -6364437, -2688086, 609721,
- 15878753, -6970405, -9034768},
- {-27757857, 247744, -15194774, -9002551, 23288161, -10011936,
- -23869595, 6503646, 20650474, 1804084},
+ { -11225584, 2320285, -9584280, 10149187, -33444663, 5808648,
+ -14876251, -1729667, 31234590, 6090599 },
+ { -9633316, 116426, 26083934, 2897444, -6364437, -2688086, 609721,
+ 15878753, -6970405, -9034768 },
+ { -27757857, 247744, -15194774, -9002551, 23288161, -10011936,
+ -23869595, 6503646, 20650474, 1804084 },
},
{
- {-27589786, 15456424, 8972517, 8469608, 15640622, 4439847, 3121995,
- -10329713, 27842616, -202328},
- {-15306973, 2839644, 22530074, 10026331, 4602058, 5048462, 28248656,
- 5031932, -11375082, 12714369},
- {20807691, -7270825, 29286141, 11421711, -27876523, -13868230,
- -21227475, 1035546, -19733229, 12796920},
+ { -27589786, 15456424, 8972517, 8469608, 15640622, 4439847, 3121995,
+ -10329713, 27842616, -202328 },
+ { -15306973, 2839644, 22530074, 10026331, 4602058, 5048462, 28248656,
+ 5031932, -11375082, 12714369 },
+ { 20807691, -7270825, 29286141, 11421711, -27876523, -13868230,
+ -21227475, 1035546, -19733229, 12796920 },
},
{
- {12076899, -14301286, -8785001, -11848922, -25012791, 16400684,
- -17591495, -12899438, 3480665, -15182815},
- {-32361549, 5457597, 28548107, 7833186, 7303070, -11953545,
- -24363064, -15921875, -33374054, 2771025},
- {-21389266, 421932, 26597266, 6860826, 22486084, -6737172,
- -17137485, -4210226, -24552282, 15673397},
+ { 12076899, -14301286, -8785001, -11848922, -25012791, 16400684,
+ -17591495, -12899438, 3480665, -15182815 },
+ { -32361549, 5457597, 28548107, 7833186, 7303070, -11953545,
+ -24363064, -15921875, -33374054, 2771025 },
+ { -21389266, 421932, 26597266, 6860826, 22486084, -6737172,
+ -17137485, -4210226, -24552282, 15673397 },
},
{
- {-20184622, 2338216, 19788685, -9620956, -4001265, -8740893,
- -20271184, 4733254, 3727144, -12934448},
- {6120119, 814863, -11794402, -622716, 6812205, -15747771, 2019594,
- 7975683, 31123697, -10958981},
- {30069250, -11435332, 30434654, 2958439, 18399564, -976289,
- 12296869, 9204260, -16432438, 9648165},
+ { -20184622, 2338216, 19788685, -9620956, -4001265, -8740893,
+ -20271184, 4733254, 3727144, -12934448 },
+ { 6120119, 814863, -11794402, -622716, 6812205, -15747771, 2019594,
+ 7975683, 31123697, -10958981 },
+ { 30069250, -11435332, 30434654, 2958439, 18399564, -976289,
+ 12296869, 9204260, -16432438, 9648165 },
},
{
- {32705432, -1550977, 30705658, 7451065, -11805606, 9631813, 3305266,
- 5248604, -26008332, -11377501},
- {17219865, 2375039, -31570947, -5575615, -19459679, 9219903, 294711,
- 15298639, 2662509, -16297073},
- {-1172927, -7558695, -4366770, -4287744, -21346413, -8434326,
- 32087529, -1222777, 32247248, -14389861},
+ { 32705432, -1550977, 30705658, 7451065, -11805606, 9631813, 3305266,
+ 5248604, -26008332, -11377501 },
+ { 17219865, 2375039, -31570947, -5575615, -19459679, 9219903, 294711,
+ 15298639, 2662509, -16297073 },
+ { -1172927, -7558695, -4366770, -4287744, -21346413, -8434326,
+ 32087529, -1222777, 32247248, -14389861 },
},
{
- {14312628, 1221556, 17395390, -8700143, -4945741, -8684635,
- -28197744, -9637817, -16027623, -13378845},
- {-1428825, -9678990, -9235681, 6549687, -7383069, -468664, 23046502,
- 9803137, 17597934, 2346211},
- {18510800, 15337574, 26171504, 981392, -22241552, 7827556,
- -23491134, -11323352, 3059833, -11782870},
+ { 14312628, 1221556, 17395390, -8700143, -4945741, -8684635,
+ -28197744, -9637817, -16027623, -13378845 },
+ { -1428825, -9678990, -9235681, 6549687, -7383069, -468664, 23046502,
+ 9803137, 17597934, 2346211 },
+ { 18510800, 15337574, 26171504, 981392, -22241552, 7827556,
+ -23491134, -11323352, 3059833, -11782870 },
},
{
- {10141598, 6082907, 17829293, -1947643, 9830092, 13613136,
- -25556636, -5544586, -33502212, 3592096},
- {33114168, -15889352, -26525686, -13343397, 33076705, 8716171,
- 1151462, 1521897, -982665, -6837803},
- {-32939165, -4255815, 23947181, -324178, -33072974, -12305637,
- -16637686, 3891704, 26353178, 693168},
+ { 10141598, 6082907, 17829293, -1947643, 9830092, 13613136,
+ -25556636, -5544586, -33502212, 3592096 },
+ { 33114168, -15889352, -26525686, -13343397, 33076705, 8716171,
+ 1151462, 1521897, -982665, -6837803 },
+ { -32939165, -4255815, 23947181, -324178, -33072974, -12305637,
+ -16637686, 3891704, 26353178, 693168 },
},
{
- {30374239, 1595580, -16884039, 13186931, 4600344, 406904, 9585294,
- -400668, 31375464, 14369965},
- {-14370654, -7772529, 1510301, 6434173, -18784789, -6262728,
- 32732230, -13108839, 17901441, 16011505},
- {18171223, -11934626, -12500402, 15197122, -11038147, -15230035,
- -19172240, -16046376, 8764035, 12309598},
+ { 30374239, 1595580, -16884039, 13186931, 4600344, 406904, 9585294,
+ -400668, 31375464, 14369965 },
+ { -14370654, -7772529, 1510301, 6434173, -18784789, -6262728,
+ 32732230, -13108839, 17901441, 16011505 },
+ { 18171223, -11934626, -12500402, 15197122, -11038147, -15230035,
+ -19172240, -16046376, 8764035, 12309598 },
},
},
{
{
- {5975908, -5243188, -19459362, -9681747, -11541277, 14015782,
- -23665757, 1228319, 17544096, -10593782},
- {5811932, -1715293, 3442887, -2269310, -18367348, -8359541,
- -18044043, -15410127, -5565381, 12348900},
- {-31399660, 11407555, 25755363, 6891399, -3256938, 14872274,
- -24849353, 8141295, -10632534, -585479},
+ { 5975908, -5243188, -19459362, -9681747, -11541277, 14015782,
+ -23665757, 1228319, 17544096, -10593782 },
+ { 5811932, -1715293, 3442887, -2269310, -18367348, -8359541,
+ -18044043, -15410127, -5565381, 12348900 },
+ { -31399660, 11407555, 25755363, 6891399, -3256938, 14872274,
+ -24849353, 8141295, -10632534, -585479 },
},
{
- {-12675304, 694026, -5076145, 13300344, 14015258, -14451394,
- -9698672, -11329050, 30944593, 1130208},
- {8247766, -6710942, -26562381, -7709309, -14401939, -14648910,
- 4652152, 2488540, 23550156, -271232},
- {17294316, -3788438, 7026748, 15626851, 22990044, 113481, 2267737,
- -5908146, -408818, -137719},
+ { -12675304, 694026, -5076145, 13300344, 14015258, -14451394,
+ -9698672, -11329050, 30944593, 1130208 },
+ { 8247766, -6710942, -26562381, -7709309, -14401939, -14648910,
+ 4652152, 2488540, 23550156, -271232 },
+ { 17294316, -3788438, 7026748, 15626851, 22990044, 113481, 2267737,
+ -5908146, -408818, -137719 },
},
{
- {16091085, -16253926, 18599252, 7340678, 2137637, -1221657,
- -3364161, 14550936, 3260525, -7166271},
- {-4910104, -13332887, 18550887, 10864893, -16459325, -7291596,
- -23028869, -13204905, -12748722, 2701326},
- {-8574695, 16099415, 4629974, -16340524, -20786213, -6005432,
- -10018363, 9276971, 11329923, 1862132},
+ { 16091085, -16253926, 18599252, 7340678, 2137637, -1221657,
+ -3364161, 14550936, 3260525, -7166271 },
+ { -4910104, -13332887, 18550887, 10864893, -16459325, -7291596,
+ -23028869, -13204905, -12748722, 2701326 },
+ { -8574695, 16099415, 4629974, -16340524, -20786213, -6005432,
+ -10018363, 9276971, 11329923, 1862132 },
},
{
- {14763076, -15903608, -30918270, 3689867, 3511892, 10313526,
- -21951088, 12219231, -9037963, -940300},
- {8894987, -3446094, 6150753, 3013931, 301220, 15693451, -31981216,
- -2909717, -15438168, 11595570},
- {15214962, 3537601, -26238722, -14058872, 4418657, -15230761,
- 13947276, 10730794, -13489462, -4363670},
+ { 14763076, -15903608, -30918270, 3689867, 3511892, 10313526,
+ -21951088, 12219231, -9037963, -940300 },
+ { 8894987, -3446094, 6150753, 3013931, 301220, 15693451, -31981216,
+ -2909717, -15438168, 11595570 },
+ { 15214962, 3537601, -26238722, -14058872, 4418657, -15230761,
+ 13947276, 10730794, -13489462, -4363670 },
},
{
- {-2538306, 7682793, 32759013, 263109, -29984731, -7955452,
- -22332124, -10188635, 977108, 699994},
- {-12466472, 4195084, -9211532, 550904, -15565337, 12917920,
- 19118110, -439841, -30534533, -14337913},
- {31788461, -14507657, 4799989, 7372237, 8808585, -14747943, 9408237,
- -10051775, 12493932, -5409317},
+ { -2538306, 7682793, 32759013, 263109, -29984731, -7955452,
+ -22332124, -10188635, 977108, 699994 },
+ { -12466472, 4195084, -9211532, 550904, -15565337, 12917920,
+ 19118110, -439841, -30534533, -14337913 },
+ { 31788461, -14507657, 4799989, 7372237, 8808585, -14747943, 9408237,
+ -10051775, 12493932, -5409317 },
},
{
- {-25680606, 5260744, -19235809, -6284470, -3695942, 16566087,
- 27218280, 2607121, 29375955, 6024730},
- {842132, -2794693, -4763381, -8722815, 26332018, -12405641,
- 11831880, 6985184, -9940361, 2854096},
- {-4847262, -7969331, 2516242, -5847713, 9695691, -7221186, 16512645,
- 960770, 12121869, 16648078},
+ { -25680606, 5260744, -19235809, -6284470, -3695942, 16566087,
+ 27218280, 2607121, 29375955, 6024730 },
+ { 842132, -2794693, -4763381, -8722815, 26332018, -12405641,
+ 11831880, 6985184, -9940361, 2854096 },
+ { -4847262, -7969331, 2516242, -5847713, 9695691, -7221186, 16512645,
+ 960770, 12121869, 16648078 },
},
{
- {-15218652, 14667096, -13336229, 2013717, 30598287, -464137,
- -31504922, -7882064, 20237806, 2838411},
- {-19288047, 4453152, 15298546, -16178388, 22115043, -15972604,
- 12544294, -13470457, 1068881, -12499905},
- {-9558883, -16518835, 33238498, 13506958, 30505848, -1114596,
- -8486907, -2630053, 12521378, 4845654},
+ { -15218652, 14667096, -13336229, 2013717, 30598287, -464137,
+ -31504922, -7882064, 20237806, 2838411 },
+ { -19288047, 4453152, 15298546, -16178388, 22115043, -15972604,
+ 12544294, -13470457, 1068881, -12499905 },
+ { -9558883, -16518835, 33238498, 13506958, 30505848, -1114596,
+ -8486907, -2630053, 12521378, 4845654 },
},
{
- {-28198521, 10744108, -2958380, 10199664, 7759311, -13088600,
- 3409348, -873400, -6482306, -12885870},
- {-23561822, 6230156, -20382013, 10655314, -24040585, -11621172,
- 10477734, -1240216, -3113227, 13974498},
- {12966261, 15550616, -32038948, -1615346, 21025980, -629444,
- 5642325, 7188737, 18895762, 12629579},
+ { -28198521, 10744108, -2958380, 10199664, 7759311, -13088600,
+ 3409348, -873400, -6482306, -12885870 },
+ { -23561822, 6230156, -20382013, 10655314, -24040585, -11621172,
+ 10477734, -1240216, -3113227, 13974498 },
+ { 12966261, 15550616, -32038948, -1615346, 21025980, -629444,
+ 5642325, 7188737, 18895762, 12629579 },
},
},
{
{
- {14741879, -14946887, 22177208, -11721237, 1279741, 8058600,
- 11758140, 789443, 32195181, 3895677},
- {10758205, 15755439, -4509950, 9243698, -4879422, 6879879, -2204575,
- -3566119, -8982069, 4429647},
- {-2453894, 15725973, -20436342, -10410672, -5803908, -11040220,
- -7135870, -11642895, 18047436, -15281743},
+ { 14741879, -14946887, 22177208, -11721237, 1279741, 8058600,
+ 11758140, 789443, 32195181, 3895677 },
+ { 10758205, 15755439, -4509950, 9243698, -4879422, 6879879, -2204575,
+ -3566119, -8982069, 4429647 },
+ { -2453894, 15725973, -20436342, -10410672, -5803908, -11040220,
+ -7135870, -11642895, 18047436, -15281743 },
},
{
- {-25173001, -11307165, 29759956, 11776784, -22262383, -15820455,
- 10993114, -12850837, -17620701, -9408468},
- {21987233, 700364, -24505048, 14972008, -7774265, -5718395,
- 32155026, 2581431, -29958985, 8773375},
- {-25568350, 454463, -13211935, 16126715, 25240068, 8594567,
- 20656846, 12017935, -7874389, -13920155},
+ { -25173001, -11307165, 29759956, 11776784, -22262383, -15820455,
+ 10993114, -12850837, -17620701, -9408468 },
+ { 21987233, 700364, -24505048, 14972008, -7774265, -5718395,
+ 32155026, 2581431, -29958985, 8773375 },
+ { -25568350, 454463, -13211935, 16126715, 25240068, 8594567,
+ 20656846, 12017935, -7874389, -13920155 },
},
{
- {6028182, 6263078, -31011806, -11301710, -818919, 2461772,
- -31841174, -5468042, -1721788, -2776725},
- {-12278994, 16624277, 987579, -5922598, 32908203, 1248608, 7719845,
- -4166698, 28408820, 6816612},
- {-10358094, -8237829, 19549651, -12169222, 22082623, 16147817,
- 20613181, 13982702, -10339570, 5067943},
+ { 6028182, 6263078, -31011806, -11301710, -818919, 2461772,
+ -31841174, -5468042, -1721788, -2776725 },
+ { -12278994, 16624277, 987579, -5922598, 32908203, 1248608, 7719845,
+ -4166698, 28408820, 6816612 },
+ { -10358094, -8237829, 19549651, -12169222, 22082623, 16147817,
+ 20613181, 13982702, -10339570, 5067943 },
},
{
- {-30505967, -3821767, 12074681, 13582412, -19877972, 2443951,
- -19719286, 12746132, 5331210, -10105944},
- {30528811, 3601899, -1957090, 4619785, -27361822, -15436388,
- 24180793, -12570394, 27679908, -1648928},
- {9402404, -13957065, 32834043, 10838634, -26580150, -13237195,
- 26653274, -8685565, 22611444, -12715406},
+ { -30505967, -3821767, 12074681, 13582412, -19877972, 2443951,
+ -19719286, 12746132, 5331210, -10105944 },
+ { 30528811, 3601899, -1957090, 4619785, -27361822, -15436388,
+ 24180793, -12570394, 27679908, -1648928 },
+ { 9402404, -13957065, 32834043, 10838634, -26580150, -13237195,
+ 26653274, -8685565, 22611444, -12715406 },
},
{
- {22190590, 1118029, 22736441, 15130463, -30460692, -5991321,
- 19189625, -4648942, 4854859, 6622139},
- {-8310738, -2953450, -8262579, -3388049, -10401731, -271929,
- 13424426, -3567227, 26404409, 13001963},
- {-31241838, -15415700, -2994250, 8939346, 11562230, -12840670,
- -26064365, -11621720, -15405155, 11020693},
+ { 22190590, 1118029, 22736441, 15130463, -30460692, -5991321,
+ 19189625, -4648942, 4854859, 6622139 },
+ { -8310738, -2953450, -8262579, -3388049, -10401731, -271929,
+ 13424426, -3567227, 26404409, 13001963 },
+ { -31241838, -15415700, -2994250, 8939346, 11562230, -12840670,
+ -26064365, -11621720, -15405155, 11020693 },
},
{
- {1866042, -7949489, -7898649, -10301010, 12483315, 13477547,
- 3175636, -12424163, 28761762, 1406734},
- {-448555, -1777666, 13018551, 3194501, -9580420, -11161737,
- 24760585, -4347088, 25577411, -13378680},
- {-24290378, 4759345, -690653, -1852816, 2066747, 10693769,
- -29595790, 9884936, -9368926, 4745410},
+ { 1866042, -7949489, -7898649, -10301010, 12483315, 13477547,
+ 3175636, -12424163, 28761762, 1406734 },
+ { -448555, -1777666, 13018551, 3194501, -9580420, -11161737,
+ 24760585, -4347088, 25577411, -13378680 },
+ { -24290378, 4759345, -690653, -1852816, 2066747, 10693769,
+ -29595790, 9884936, -9368926, 4745410 },
},
{
- {-9141284, 6049714, -19531061, -4341411, -31260798, 9944276,
- -15462008, -11311852, 10931924, -11931931},
- {-16561513, 14112680, -8012645, 4817318, -8040464, -11414606,
- -22853429, 10856641, -20470770, 13434654},
- {22759489, -10073434, -16766264, -1871422, 13637442, -10168091,
- 1765144, -12654326, 28445307, -5364710},
+ { -9141284, 6049714, -19531061, -4341411, -31260798, 9944276,
+ -15462008, -11311852, 10931924, -11931931 },
+ { -16561513, 14112680, -8012645, 4817318, -8040464, -11414606,
+ -22853429, 10856641, -20470770, 13434654 },
+ { 22759489, -10073434, -16766264, -1871422, 13637442, -10168091,
+ 1765144, -12654326, 28445307, -5364710 },
},
{
- {29875063, 12493613, 2795536, -3786330, 1710620, 15181182,
- -10195717, -8788675, 9074234, 1167180},
- {-26205683, 11014233, -9842651, -2635485, -26908120, 7532294,
- -18716888, -9535498, 3843903, 9367684},
- {-10969595, -6403711, 9591134, 9582310, 11349256, 108879, 16235123,
- 8601684, -139197, 4242895},
+ { 29875063, 12493613, 2795536, -3786330, 1710620, 15181182,
+ -10195717, -8788675, 9074234, 1167180 },
+ { -26205683, 11014233, -9842651, -2635485, -26908120, 7532294,
+ -18716888, -9535498, 3843903, 9367684 },
+ { -10969595, -6403711, 9591134, 9582310, 11349256, 108879, 16235123,
+ 8601684, -139197, 4242895 },
},
},
{
{
- {22092954, -13191123, -2042793, -11968512, 32186753, -11517388,
- -6574341, 2470660, -27417366, 16625501},
- {-11057722, 3042016, 13770083, -9257922, 584236, -544855, -7770857,
- 2602725, -27351616, 14247413},
- {6314175, -10264892, -32772502, 15957557, -10157730, 168750,
- -8618807, 14290061, 27108877, -1180880},
+ { 22092954, -13191123, -2042793, -11968512, 32186753, -11517388,
+ -6574341, 2470660, -27417366, 16625501 },
+ { -11057722, 3042016, 13770083, -9257922, 584236, -544855, -7770857,
+ 2602725, -27351616, 14247413 },
+ { 6314175, -10264892, -32772502, 15957557, -10157730, 168750,
+ -8618807, 14290061, 27108877, -1180880 },
},
{
- {-8586597, -7170966, 13241782, 10960156, -32991015, -13794596,
- 33547976, -11058889, -27148451, 981874},
- {22833440, 9293594, -32649448, -13618667, -9136966, 14756819,
- -22928859, -13970780, -10479804, -16197962},
- {-7768587, 3326786, -28111797, 10783824, 19178761, 14905060,
- 22680049, 13906969, -15933690, 3797899},
+ { -8586597, -7170966, 13241782, 10960156, -32991015, -13794596,
+ 33547976, -11058889, -27148451, 981874 },
+ { 22833440, 9293594, -32649448, -13618667, -9136966, 14756819,
+ -22928859, -13970780, -10479804, -16197962 },
+ { -7768587, 3326786, -28111797, 10783824, 19178761, 14905060,
+ 22680049, 13906969, -15933690, 3797899 },
},
{
- {21721356, -4212746, -12206123, 9310182, -3882239, -13653110,
- 23740224, -2709232, 20491983, -8042152},
- {9209270, -15135055, -13256557, -6167798, -731016, 15289673,
- 25947805, 15286587, 30997318, -6703063},
- {7392032, 16618386, 23946583, -8039892, -13265164, -1533858,
- -14197445, -2321576, 17649998, -250080},
+ { 21721356, -4212746, -12206123, 9310182, -3882239, -13653110,
+ 23740224, -2709232, 20491983, -8042152 },
+ { 9209270, -15135055, -13256557, -6167798, -731016, 15289673,
+ 25947805, 15286587, 30997318, -6703063 },
+ { 7392032, 16618386, 23946583, -8039892, -13265164, -1533858,
+ -14197445, -2321576, 17649998, -250080 },
},
{
- {-9301088, -14193827, 30609526, -3049543, -25175069, -1283752,
- -15241566, -9525724, -2233253, 7662146},
- {-17558673, 1763594, -33114336, 15908610, -30040870, -12174295,
- 7335080, -8472199, -3174674, 3440183},
- {-19889700, -5977008, -24111293, -9688870, 10799743, -16571957,
- 40450, -4431835, 4862400, 1133},
+ { -9301088, -14193827, 30609526, -3049543, -25175069, -1283752,
+ -15241566, -9525724, -2233253, 7662146 },
+ { -17558673, 1763594, -33114336, 15908610, -30040870, -12174295,
+ 7335080, -8472199, -3174674, 3440183 },
+ { -19889700, -5977008, -24111293, -9688870, 10799743, -16571957,
+ 40450, -4431835, 4862400, 1133 },
},
{
- {-32856209, -7873957, -5422389, 14860950, -16319031, 7956142,
- 7258061, 311861, -30594991, -7379421},
- {-3773428, -1565936, 28985340, 7499440, 24445838, 9325937, 29727763,
- 16527196, 18278453, 15405622},
- {-4381906, 8508652, -19898366, -3674424, -5984453, 15149970,
- -13313598, 843523, -21875062, 13626197},
+ { -32856209, -7873957, -5422389, 14860950, -16319031, 7956142,
+ 7258061, 311861, -30594991, -7379421 },
+ { -3773428, -1565936, 28985340, 7499440, 24445838, 9325937, 29727763,
+ 16527196, 18278453, 15405622 },
+ { -4381906, 8508652, -19898366, -3674424, -5984453, 15149970,
+ -13313598, 843523, -21875062, 13626197 },
},
{
- {2281448, -13487055, -10915418, -2609910, 1879358, 16164207,
- -10783882, 3953792, 13340839, 15928663},
- {31727126, -7179855, -18437503, -8283652, 2875793, -16390330,
- -25269894, -7014826, -23452306, 5964753},
- {4100420, -5959452, -17179337, 6017714, -18705837, 12227141,
- -26684835, 11344144, 2538215, -7570755},
+ { 2281448, -13487055, -10915418, -2609910, 1879358, 16164207,
+ -10783882, 3953792, 13340839, 15928663 },
+ { 31727126, -7179855, -18437503, -8283652, 2875793, -16390330,
+ -25269894, -7014826, -23452306, 5964753 },
+ { 4100420, -5959452, -17179337, 6017714, -18705837, 12227141,
+ -26684835, 11344144, 2538215, -7570755 },
},
{
- {-9433605, 6123113, 11159803, -2156608, 30016280, 14966241,
- -20474983, 1485421, -629256, -15958862},
- {-26804558, 4260919, 11851389, 9658551, -32017107, 16367492,
- -20205425, -13191288, 11659922, -11115118},
- {26180396, 10015009, -30844224, -8581293, 5418197, 9480663, 2231568,
- -10170080, 33100372, -1306171},
+ { -9433605, 6123113, 11159803, -2156608, 30016280, 14966241,
+ -20474983, 1485421, -629256, -15958862 },
+ { -26804558, 4260919, 11851389, 9658551, -32017107, 16367492,
+ -20205425, -13191288, 11659922, -11115118 },
+ { 26180396, 10015009, -30844224, -8581293, 5418197, 9480663, 2231568,
+ -10170080, 33100372, -1306171 },
},
{
- {15121113, -5201871, -10389905, 15427821, -27509937, -15992507,
- 21670947, 4486675, -5931810, -14466380},
- {16166486, -9483733, -11104130, 6023908, -31926798, -1364923,
- 2340060, -16254968, -10735770, -10039824},
- {28042865, -3557089, -12126526, 12259706, -3717498, -6945899,
- 6766453, -8689599, 18036436, 5803270},
+ { 15121113, -5201871, -10389905, 15427821, -27509937, -15992507,
+ 21670947, 4486675, -5931810, -14466380 },
+ { 16166486, -9483733, -11104130, 6023908, -31926798, -1364923,
+ 2340060, -16254968, -10735770, -10039824 },
+ { 28042865, -3557089, -12126526, 12259706, -3717498, -6945899,
+ 6766453, -8689599, 18036436, 5803270 },
},
},
{
{
- {-817581, 6763912, 11803561, 1585585, 10958447, -2671165, 23855391,
- 4598332, -6159431, -14117438},
- {-31031306, -14256194, 17332029, -2383520, 31312682, -5967183,
- 696309, 50292, -20095739, 11763584},
- {-594563, -2514283, -32234153, 12643980, 12650761, 14811489, 665117,
- -12613632, -19773211, -10713562},
+ { -817581, 6763912, 11803561, 1585585, 10958447, -2671165, 23855391,
+ 4598332, -6159431, -14117438 },
+ { -31031306, -14256194, 17332029, -2383520, 31312682, -5967183,
+ 696309, 50292, -20095739, 11763584 },
+ { -594563, -2514283, -32234153, 12643980, 12650761, 14811489, 665117,
+ -12613632, -19773211, -10713562 },
},
{
- {30464590, -11262872, -4127476, -12734478, 19835327, -7105613,
- -24396175, 2075773, -17020157, 992471},
- {18357185, -6994433, 7766382, 16342475, -29324918, 411174, 14578841,
- 8080033, -11574335, -10601610},
- {19598397, 10334610, 12555054, 2555664, 18821899, -10339780,
- 21873263, 16014234, 26224780, 16452269},
+ { 30464590, -11262872, -4127476, -12734478, 19835327, -7105613,
+ -24396175, 2075773, -17020157, 992471 },
+ { 18357185, -6994433, 7766382, 16342475, -29324918, 411174, 14578841,
+ 8080033, -11574335, -10601610 },
+ { 19598397, 10334610, 12555054, 2555664, 18821899, -10339780,
+ 21873263, 16014234, 26224780, 16452269 },
},
{
- {-30223925, 5145196, 5944548, 16385966, 3976735, 2009897, -11377804,
- -7618186, -20533829, 3698650},
- {14187449, 3448569, -10636236, -10810935, -22663880, -3433596,
- 7268410, -10890444, 27394301, 12015369},
- {19695761, 16087646, 28032085, 12999827, 6817792, 11427614,
- 20244189, -1312777, -13259127, -3402461},
+ { -30223925, 5145196, 5944548, 16385966, 3976735, 2009897, -11377804,
+ -7618186, -20533829, 3698650 },
+ { 14187449, 3448569, -10636236, -10810935, -22663880, -3433596,
+ 7268410, -10890444, 27394301, 12015369 },
+ { 19695761, 16087646, 28032085, 12999827, 6817792, 11427614,
+ 20244189, -1312777, -13259127, -3402461 },
},
{
- {30860103, 12735208, -1888245, -4699734, -16974906, 2256940,
- -8166013, 12298312, -8550524, -10393462},
- {-5719826, -11245325, -1910649, 15569035, 26642876, -7587760,
- -5789354, -15118654, -4976164, 12651793},
- {-2848395, 9953421, 11531313, -5282879, 26895123, -12697089,
- -13118820, -16517902, 9768698, -2533218},
+ { 30860103, 12735208, -1888245, -4699734, -16974906, 2256940,
+ -8166013, 12298312, -8550524, -10393462 },
+ { -5719826, -11245325, -1910649, 15569035, 26642876, -7587760,
+ -5789354, -15118654, -4976164, 12651793 },
+ { -2848395, 9953421, 11531313, -5282879, 26895123, -12697089,
+ -13118820, -16517902, 9768698, -2533218 },
},
{
- {-24719459, 1894651, -287698, -4704085, 15348719, -8156530,
- 32767513, 12765450, 4940095, 10678226},
- {18860224, 15980149, -18987240, -1562570, -26233012, -11071856,
- -7843882, 13944024, -24372348, 16582019},
- {-15504260, 4970268, -29893044, 4175593, -20993212, -2199756,
- -11704054, 15444560, -11003761, 7989037},
+ { -24719459, 1894651, -287698, -4704085, 15348719, -8156530,
+ 32767513, 12765450, 4940095, 10678226 },
+ { 18860224, 15980149, -18987240, -1562570, -26233012, -11071856,
+ -7843882, 13944024, -24372348, 16582019 },
+ { -15504260, 4970268, -29893044, 4175593, -20993212, -2199756,
+ -11704054, 15444560, -11003761, 7989037 },
},
{
- {31490452, 5568061, -2412803, 2182383, -32336847, 4531686,
- -32078269, 6200206, -19686113, -14800171},
- {-17308668, -15879940, -31522777, -2831, -32887382, 16375549,
- 8680158, -16371713, 28550068, -6857132},
- {-28126887, -5688091, 16837845, -1820458, -6850681, 12700016,
- -30039981, 4364038, 1155602, 5988841},
+ { 31490452, 5568061, -2412803, 2182383, -32336847, 4531686,
+ -32078269, 6200206, -19686113, -14800171 },
+ { -17308668, -15879940, -31522777, -2831, -32887382, 16375549,
+ 8680158, -16371713, 28550068, -6857132 },
+ { -28126887, -5688091, 16837845, -1820458, -6850681, 12700016,
+ -30039981, 4364038, 1155602, 5988841 },
},
{
- {21890435, -13272907, -12624011, 12154349, -7831873, 15300496,
- 23148983, -4470481, 24618407, 8283181},
- {-33136107, -10512751, 9975416, 6841041, -31559793, 16356536,
- 3070187, -7025928, 1466169, 10740210},
- {-1509399, -15488185, -13503385, -10655916, 32799044, 909394,
- -13938903, -5779719, -32164649, -15327040},
+ { 21890435, -13272907, -12624011, 12154349, -7831873, 15300496,
+ 23148983, -4470481, 24618407, 8283181 },
+ { -33136107, -10512751, 9975416, 6841041, -31559793, 16356536,
+ 3070187, -7025928, 1466169, 10740210 },
+ { -1509399, -15488185, -13503385, -10655916, 32799044, 909394,
+ -13938903, -5779719, -32164649, -15327040 },
},
{
- {3960823, -14267803, -28026090, -15918051, -19404858, 13146868,
- 15567327, 951507, -3260321, -573935},
- {24740841, 5052253, -30094131, 8961361, 25877428, 6165135,
- -24368180, 14397372, -7380369, -6144105},
- {-28888365, 3510803, -28103278, -1158478, -11238128, -10631454,
- -15441463, -14453128, -1625486, -6494814},
+ { 3960823, -14267803, -28026090, -15918051, -19404858, 13146868,
+ 15567327, 951507, -3260321, -573935 },
+ { 24740841, 5052253, -30094131, 8961361, 25877428, 6165135,
+ -24368180, 14397372, -7380369, -6144105 },
+ { -28888365, 3510803, -28103278, -1158478, -11238128, -10631454,
+ -15441463, -14453128, -1625486, -6494814 },
},
},
{
{
- {793299, -9230478, 8836302, -6235707, -27360908, -2369593, 33152843,
- -4885251, -9906200, -621852},
- {5666233, 525582, 20782575, -8038419, -24538499, 14657740, 16099374,
- 1468826, -6171428, -15186581},
- {-4859255, -3779343, -2917758, -6748019, 7778750, 11688288,
- -30404353, -9871238, -1558923, -9863646},
+ { 793299, -9230478, 8836302, -6235707, -27360908, -2369593, 33152843,
+ -4885251, -9906200, -621852 },
+ { 5666233, 525582, 20782575, -8038419, -24538499, 14657740, 16099374,
+ 1468826, -6171428, -15186581 },
+ { -4859255, -3779343, -2917758, -6748019, 7778750, 11688288,
+ -30404353, -9871238, -1558923, -9863646 },
},
{
- {10896332, -7719704, 824275, 472601, -19460308, 3009587, 25248958,
- 14783338, -30581476, -15757844},
- {10566929, 12612572, -31944212, 11118703, -12633376, 12362879,
- 21752402, 8822496, 24003793, 14264025},
- {27713862, -7355973, -11008240, 9227530, 27050101, 2504721,
- 23886875, -13117525, 13958495, -5732453},
+ { 10896332, -7719704, 824275, 472601, -19460308, 3009587, 25248958,
+ 14783338, -30581476, -15757844 },
+ { 10566929, 12612572, -31944212, 11118703, -12633376, 12362879,
+ 21752402, 8822496, 24003793, 14264025 },
+ { 27713862, -7355973, -11008240, 9227530, 27050101, 2504721,
+ 23886875, -13117525, 13958495, -5732453 },
},
{
- {-23481610, 4867226, -27247128, 3900521, 29838369, -8212291,
- -31889399, -10041781, 7340521, -15410068},
- {4646514, -8011124, -22766023, -11532654, 23184553, 8566613,
- 31366726, -1381061, -15066784, -10375192},
- {-17270517, 12723032, -16993061, 14878794, 21619651, -6197576,
- 27584817, 3093888, -8843694, 3849921},
+ { -23481610, 4867226, -27247128, 3900521, 29838369, -8212291,
+ -31889399, -10041781, 7340521, -15410068 },
+ { 4646514, -8011124, -22766023, -11532654, 23184553, 8566613,
+ 31366726, -1381061, -15066784, -10375192 },
+ { -17270517, 12723032, -16993061, 14878794, 21619651, -6197576,
+ 27584817, 3093888, -8843694, 3849921 },
},
{
- {-9064912, 2103172, 25561640, -15125738, -5239824, 9582958,
- 32477045, -9017955, 5002294, -15550259},
- {-12057553, -11177906, 21115585, -13365155, 8808712, -12030708,
- 16489530, 13378448, -25845716, 12741426},
- {-5946367, 10645103, -30911586, 15390284, -3286982, -7118677,
- 24306472, 15852464, 28834118, -7646072},
+ { -9064912, 2103172, 25561640, -15125738, -5239824, 9582958,
+ 32477045, -9017955, 5002294, -15550259 },
+ { -12057553, -11177906, 21115585, -13365155, 8808712, -12030708,
+ 16489530, 13378448, -25845716, 12741426 },
+ { -5946367, 10645103, -30911586, 15390284, -3286982, -7118677,
+ 24306472, 15852464, 28834118, -7646072 },
},
{
- {-17335748, -9107057, -24531279, 9434953, -8472084, -583362,
- -13090771, 455841, 20461858, 5491305},
- {13669248, -16095482, -12481974, -10203039, -14569770, -11893198,
- -24995986, 11293807, -28588204, -9421832},
- {28497928, 6272777, -33022994, 14470570, 8906179, -1225630,
- 18504674, -14165166, 29867745, -8795943},
+ { -17335748, -9107057, -24531279, 9434953, -8472084, -583362,
+ -13090771, 455841, 20461858, 5491305 },
+ { 13669248, -16095482, -12481974, -10203039, -14569770, -11893198,
+ -24995986, 11293807, -28588204, -9421832 },
+ { 28497928, 6272777, -33022994, 14470570, 8906179, -1225630,
+ 18504674, -14165166, 29867745, -8795943 },
},
{
- {-16207023, 13517196, -27799630, -13697798, 24009064, -6373891,
- -6367600, -13175392, 22853429, -4012011},
- {24191378, 16712145, -13931797, 15217831, 14542237, 1646131,
- 18603514, -11037887, 12876623, -2112447},
- {17902668, 4518229, -411702, -2829247, 26878217, 5258055, -12860753,
- 608397, 16031844, 3723494},
+ { -16207023, 13517196, -27799630, -13697798, 24009064, -6373891,
+ -6367600, -13175392, 22853429, -4012011 },
+ { 24191378, 16712145, -13931797, 15217831, 14542237, 1646131,
+ 18603514, -11037887, 12876623, -2112447 },
+ { 17902668, 4518229, -411702, -2829247, 26878217, 5258055, -12860753,
+ 608397, 16031844, 3723494 },
},
{
- {-28632773, 12763728, -20446446, 7577504, 33001348, -13017745,
- 17558842, -7872890, 23896954, -4314245},
- {-20005381, -12011952, 31520464, 605201, 2543521, 5991821, -2945064,
- 7229064, -9919646, -8826859},
- {28816045, 298879, -28165016, -15920938, 19000928, -1665890,
- -12680833, -2949325, -18051778, -2082915},
+ { -28632773, 12763728, -20446446, 7577504, 33001348, -13017745,
+ 17558842, -7872890, 23896954, -4314245 },
+ { -20005381, -12011952, 31520464, 605201, 2543521, 5991821, -2945064,
+ 7229064, -9919646, -8826859 },
+ { 28816045, 298879, -28165016, -15920938, 19000928, -1665890,
+ -12680833, -2949325, -18051778, -2082915 },
},
{
- {16000882, -344896, 3493092, -11447198, -29504595, -13159789,
- 12577740, 16041268, -19715240, 7847707},
- {10151868, 10572098, 27312476, 7922682, 14825339, 4723128,
- -32855931, -6519018, -10020567, 3852848},
- {-11430470, 15697596, -21121557, -4420647, 5386314, 15063598,
- 16514493, -15932110, 29330899, -15076224},
+ { 16000882, -344896, 3493092, -11447198, -29504595, -13159789,
+ 12577740, 16041268, -19715240, 7847707 },
+ { 10151868, 10572098, 27312476, 7922682, 14825339, 4723128,
+ -32855931, -6519018, -10020567, 3852848 },
+ { -11430470, 15697596, -21121557, -4420647, 5386314, 15063598,
+ 16514493, -15932110, 29330899, -15076224 },
},
},
{
{
- {-25499735, -4378794, -15222908, -6901211, 16615731, 2051784,
- 3303702, 15490, -27548796, 12314391},
- {15683520, -6003043, 18109120, -9980648, 15337968, -5997823,
- -16717435, 15921866, 16103996, -3731215},
- {-23169824, -10781249, 13588192, -1628807, -3798557, -1074929,
- -19273607, 5402699, -29815713, -9841101},
+ { -25499735, -4378794, -15222908, -6901211, 16615731, 2051784,
+ 3303702, 15490, -27548796, 12314391 },
+ { 15683520, -6003043, 18109120, -9980648, 15337968, -5997823,
+ -16717435, 15921866, 16103996, -3731215 },
+ { -23169824, -10781249, 13588192, -1628807, -3798557, -1074929,
+ -19273607, 5402699, -29815713, -9841101 },
},
{
- {23190676, 2384583, -32714340, 3462154, -29903655, -1529132,
- -11266856, 8911517, -25205859, 2739713},
- {21374101, -3554250, -33524649, 9874411, 15377179, 11831242,
- -33529904, 6134907, 4931255, 11987849},
- {-7732, -2978858, -16223486, 7277597, 105524, -322051, -31480539,
- 13861388, -30076310, 10117930},
+ { 23190676, 2384583, -32714340, 3462154, -29903655, -1529132,
+ -11266856, 8911517, -25205859, 2739713 },
+ { 21374101, -3554250, -33524649, 9874411, 15377179, 11831242,
+ -33529904, 6134907, 4931255, 11987849 },
+ { -7732, -2978858, -16223486, 7277597, 105524, -322051, -31480539,
+ 13861388, -30076310, 10117930 },
},
{
- {-29501170, -10744872, -26163768, 13051539, -25625564, 5089643,
- -6325503, 6704079, 12890019, 15728940},
- {-21972360, -11771379, -951059, -4418840, 14704840, 2695116, 903376,
- -10428139, 12885167, 8311031},
- {-17516482, 5352194, 10384213, -13811658, 7506451, 13453191,
- 26423267, 4384730, 1888765, -5435404},
+ { -29501170, -10744872, -26163768, 13051539, -25625564, 5089643,
+ -6325503, 6704079, 12890019, 15728940 },
+ { -21972360, -11771379, -951059, -4418840, 14704840, 2695116, 903376,
+ -10428139, 12885167, 8311031 },
+ { -17516482, 5352194, 10384213, -13811658, 7506451, 13453191,
+ 26423267, 4384730, 1888765, -5435404 },
},
{
- {-25817338, -3107312, -13494599, -3182506, 30896459, -13921729,
- -32251644, -12707869, -19464434, -3340243},
- {-23607977, -2665774, -526091, 4651136, 5765089, 4618330, 6092245,
- 14845197, 17151279, -9854116},
- {-24830458, -12733720, -15165978, 10367250, -29530908, -265356,
- 22825805, -7087279, -16866484, 16176525},
+ { -25817338, -3107312, -13494599, -3182506, 30896459, -13921729,
+ -32251644, -12707869, -19464434, -3340243 },
+ { -23607977, -2665774, -526091, 4651136, 5765089, 4618330, 6092245,
+ 14845197, 17151279, -9854116 },
+ { -24830458, -12733720, -15165978, 10367250, -29530908, -265356,
+ 22825805, -7087279, -16866484, 16176525 },
},
{
- {-23583256, 6564961, 20063689, 3798228, -4740178, 7359225, 2006182,
- -10363426, -28746253, -10197509},
- {-10626600, -4486402, -13320562, -5125317, 3432136, -6393229,
- 23632037, -1940610, 32808310, 1099883},
- {15030977, 5768825, -27451236, -2887299, -6427378, -15361371,
- -15277896, -6809350, 2051441, -15225865},
+ { -23583256, 6564961, 20063689, 3798228, -4740178, 7359225, 2006182,
+ -10363426, -28746253, -10197509 },
+ { -10626600, -4486402, -13320562, -5125317, 3432136, -6393229,
+ 23632037, -1940610, 32808310, 1099883 },
+ { 15030977, 5768825, -27451236, -2887299, -6427378, -15361371,
+ -15277896, -6809350, 2051441, -15225865 },
},
{
- {-3362323, -7239372, 7517890, 9824992, 23555850, 295369, 5148398,
- -14154188, -22686354, 16633660},
- {4577086, -16752288, 13249841, -15304328, 19958763, -14537274,
- 18559670, -10759549, 8402478, -9864273},
- {-28406330, -1051581, -26790155, -907698, -17212414, -11030789,
- 9453451, -14980072, 17983010, 9967138},
+ { -3362323, -7239372, 7517890, 9824992, 23555850, 295369, 5148398,
+ -14154188, -22686354, 16633660 },
+ { 4577086, -16752288, 13249841, -15304328, 19958763, -14537274,
+ 18559670, -10759549, 8402478, -9864273 },
+ { -28406330, -1051581, -26790155, -907698, -17212414, -11030789,
+ 9453451, -14980072, 17983010, 9967138 },
},
{
- {-25762494, 6524722, 26585488, 9969270, 24709298, 1220360, -1677990,
- 7806337, 17507396, 3651560},
- {-10420457, -4118111, 14584639, 15971087, -15768321, 8861010,
- 26556809, -5574557, -18553322, -11357135},
- {2839101, 14284142, 4029895, 3472686, 14402957, 12689363, -26642121,
- 8459447, -5605463, -7621941},
+ { -25762494, 6524722, 26585488, 9969270, 24709298, 1220360, -1677990,
+ 7806337, 17507396, 3651560 },
+ { -10420457, -4118111, 14584639, 15971087, -15768321, 8861010,
+ 26556809, -5574557, -18553322, -11357135 },
+ { 2839101, 14284142, 4029895, 3472686, 14402957, 12689363, -26642121,
+ 8459447, -5605463, -7621941 },
},
{
- {-4839289, -3535444, 9744961, 2871048, 25113978, 3187018, -25110813,
- -849066, 17258084, -7977739},
- {18164541, -10595176, -17154882, -1542417, 19237078, -9745295,
- 23357533, -15217008, 26908270, 12150756},
- {-30264870, -7647865, 5112249, -7036672, -1499807, -6974257, 43168,
- -5537701, -32302074, 16215819},
+ { -4839289, -3535444, 9744961, 2871048, 25113978, 3187018, -25110813,
+ -849066, 17258084, -7977739 },
+ { 18164541, -10595176, -17154882, -1542417, 19237078, -9745295,
+ 23357533, -15217008, 26908270, 12150756 },
+ { -30264870, -7647865, 5112249, -7036672, -1499807, -6974257, 43168,
+ -5537701, -32302074, 16215819 },
},
},
{
{
- {-6898905, 9824394, -12304779, -4401089, -31397141, -6276835,
- 32574489, 12532905, -7503072, -8675347},
- {-27343522, -16515468, -27151524, -10722951, 946346, 16291093,
- 254968, 7168080, 21676107, -1943028},
- {21260961, -8424752, -16831886, -11920822, -23677961, 3968121,
- -3651949, -6215466, -3556191, -7913075},
+ { -6898905, 9824394, -12304779, -4401089, -31397141, -6276835,
+ 32574489, 12532905, -7503072, -8675347 },
+ { -27343522, -16515468, -27151524, -10722951, 946346, 16291093,
+ 254968, 7168080, 21676107, -1943028 },
+ { 21260961, -8424752, -16831886, -11920822, -23677961, 3968121,
+ -3651949, -6215466, -3556191, -7913075 },
},
{
- {16544754, 13250366, -16804428, 15546242, -4583003, 12757258,
- -2462308, -8680336, -18907032, -9662799},
- {-2415239, -15577728, 18312303, 4964443, -15272530, -12653564,
- 26820651, 16690659, 25459437, -4564609},
- {-25144690, 11425020, 28423002, -11020557, -6144921, -15826224,
- 9142795, -2391602, -6432418, -1644817},
+ { 16544754, 13250366, -16804428, 15546242, -4583003, 12757258,
+ -2462308, -8680336, -18907032, -9662799 },
+ { -2415239, -15577728, 18312303, 4964443, -15272530, -12653564,
+ 26820651, 16690659, 25459437, -4564609 },
+ { -25144690, 11425020, 28423002, -11020557, -6144921, -15826224,
+ 9142795, -2391602, -6432418, -1644817 },
},
{
- {-23104652, 6253476, 16964147, -3768872, -25113972, -12296437,
- -27457225, -16344658, 6335692, 7249989},
- {-30333227, 13979675, 7503222, -12368314, -11956721, -4621693,
- -30272269, 2682242, 25993170, -12478523},
- {4364628, 5930691, 32304656, -10044554, -8054781, 15091131,
- 22857016, -10598955, 31820368, 15075278},
+ { -23104652, 6253476, 16964147, -3768872, -25113972, -12296437,
+ -27457225, -16344658, 6335692, 7249989 },
+ { -30333227, 13979675, 7503222, -12368314, -11956721, -4621693,
+ -30272269, 2682242, 25993170, -12478523 },
+ { 4364628, 5930691, 32304656, -10044554, -8054781, 15091131,
+ 22857016, -10598955, 31820368, 15075278 },
},
{
- {31879134, -8918693, 17258761, 90626, -8041836, -4917709, 24162788,
- -9650886, -17970238, 12833045},
- {19073683, 14851414, -24403169, -11860168, 7625278, 11091125,
- -19619190, 2074449, -9413939, 14905377},
- {24483667, -11935567, -2518866, -11547418, -1553130, 15355506,
- -25282080, 9253129, 27628530, -7555480},
+ { 31879134, -8918693, 17258761, 90626, -8041836, -4917709, 24162788,
+ -9650886, -17970238, 12833045 },
+ { 19073683, 14851414, -24403169, -11860168, 7625278, 11091125,
+ -19619190, 2074449, -9413939, 14905377 },
+ { 24483667, -11935567, -2518866, -11547418, -1553130, 15355506,
+ -25282080, 9253129, 27628530, -7555480 },
},
{
- {17597607, 8340603, 19355617, 552187, 26198470, -3176583, 4593324,
- -9157582, -14110875, 15297016},
- {510886, 14337390, -31785257, 16638632, 6328095, 2713355, -20217417,
- -11864220, 8683221, 2921426},
- {18606791, 11874196, 27155355, -5281482, -24031742, 6265446,
- -25178240, -1278924, 4674690, 13890525},
+ { 17597607, 8340603, 19355617, 552187, 26198470, -3176583, 4593324,
+ -9157582, -14110875, 15297016 },
+ { 510886, 14337390, -31785257, 16638632, 6328095, 2713355, -20217417,
+ -11864220, 8683221, 2921426 },
+ { 18606791, 11874196, 27155355, -5281482, -24031742, 6265446,
+ -25178240, -1278924, 4674690, 13890525 },
},
{
- {13609624, 13069022, -27372361, -13055908, 24360586, 9592974,
- 14977157, 9835105, 4389687, 288396},
- {9922506, -519394, 13613107, 5883594, -18758345, -434263, -12304062,
- 8317628, 23388070, 16052080},
- {12720016, 11937594, -31970060, -5028689, 26900120, 8561328,
- -20155687, -11632979, -14754271, -10812892},
+ { 13609624, 13069022, -27372361, -13055908, 24360586, 9592974,
+ 14977157, 9835105, 4389687, 288396 },
+ { 9922506, -519394, 13613107, 5883594, -18758345, -434263, -12304062,
+ 8317628, 23388070, 16052080 },
+ { 12720016, 11937594, -31970060, -5028689, 26900120, 8561328,
+ -20155687, -11632979, -14754271, -10812892 },
},
{
- {15961858, 14150409, 26716931, -665832, -22794328, 13603569,
- 11829573, 7467844, -28822128, 929275},
- {11038231, -11582396, -27310482, -7316562, -10498527, -16307831,
- -23479533, -9371869, -21393143, 2465074},
- {20017163, -4323226, 27915242, 1529148, 12396362, 15675764,
- 13817261, -9658066, 2463391, -4622140},
+ { 15961858, 14150409, 26716931, -665832, -22794328, 13603569,
+ 11829573, 7467844, -28822128, 929275 },
+ { 11038231, -11582396, -27310482, -7316562, -10498527, -16307831,
+ -23479533, -9371869, -21393143, 2465074 },
+ { 20017163, -4323226, 27915242, 1529148, 12396362, 15675764,
+ 13817261, -9658066, 2463391, -4622140 },
},
{
- {-16358878, -12663911, -12065183, 4996454, -1256422, 1073572,
- 9583558, 12851107, 4003896, 12673717},
- {-1731589, -15155870, -3262930, 16143082, 19294135, 13385325,
- 14741514, -9103726, 7903886, 2348101},
- {24536016, -16515207, 12715592, -3862155, 1511293, 10047386,
- -3842346, -7129159, -28377538, 10048127},
+ { -16358878, -12663911, -12065183, 4996454, -1256422, 1073572,
+ 9583558, 12851107, 4003896, 12673717 },
+ { -1731589, -15155870, -3262930, 16143082, 19294135, 13385325,
+ 14741514, -9103726, 7903886, 2348101 },
+ { 24536016, -16515207, 12715592, -3862155, 1511293, 10047386,
+ -3842346, -7129159, -28377538, 10048127 },
},
},
{
{
- {-12622226, -6204820, 30718825, 2591312, -10617028, 12192840,
- 18873298, -7297090, -32297756, 15221632},
- {-26478122, -11103864, 11546244, -1852483, 9180880, 7656409,
- -21343950, 2095755, 29769758, 6593415},
- {-31994208, -2907461, 4176912, 3264766, 12538965, -868111, 26312345,
- -6118678, 30958054, 8292160},
+ { -12622226, -6204820, 30718825, 2591312, -10617028, 12192840,
+ 18873298, -7297090, -32297756, 15221632 },
+ { -26478122, -11103864, 11546244, -1852483, 9180880, 7656409,
+ -21343950, 2095755, 29769758, 6593415 },
+ { -31994208, -2907461, 4176912, 3264766, 12538965, -868111, 26312345,
+ -6118678, 30958054, 8292160 },
},
{
- {31429822, -13959116, 29173532, 15632448, 12174511, -2760094,
- 32808831, 3977186, 26143136, -3148876},
- {22648901, 1402143, -22799984, 13746059, 7936347, 365344, -8668633,
- -1674433, -3758243, -2304625},
- {-15491917, 8012313, -2514730, -12702462, -23965846, -10254029,
- -1612713, -1535569, -16664475, 8194478},
+ { 31429822, -13959116, 29173532, 15632448, 12174511, -2760094,
+ 32808831, 3977186, 26143136, -3148876 },
+ { 22648901, 1402143, -22799984, 13746059, 7936347, 365344, -8668633,
+ -1674433, -3758243, -2304625 },
+ { -15491917, 8012313, -2514730, -12702462, -23965846, -10254029,
+ -1612713, -1535569, -16664475, 8194478 },
},
{
- {27338066, -7507420, -7414224, 10140405, -19026427, -6589889,
- 27277191, 8855376, 28572286, 3005164},
- {26287124, 4821776, 25476601, -4145903, -3764513, -15788984,
- -18008582, 1182479, -26094821, -13079595},
- {-7171154, 3178080, 23970071, 6201893, -17195577, -4489192,
- -21876275, -13982627, 32208683, -1198248},
+ { 27338066, -7507420, -7414224, 10140405, -19026427, -6589889,
+ 27277191, 8855376, 28572286, 3005164 },
+ { 26287124, 4821776, 25476601, -4145903, -3764513, -15788984,
+ -18008582, 1182479, -26094821, -13079595 },
+ { -7171154, 3178080, 23970071, 6201893, -17195577, -4489192,
+ -21876275, -13982627, 32208683, -1198248 },
},
{
- {-16657702, 2817643, -10286362, 14811298, 6024667, 13349505,
- -27315504, -10497842, -27672585, -11539858},
- {15941029, -9405932, -21367050, 8062055, 31876073, -238629,
- -15278393, -1444429, 15397331, -4130193},
- {8934485, -13485467, -23286397, -13423241, -32446090, 14047986,
- 31170398, -1441021, -27505566, 15087184},
+ { -16657702, 2817643, -10286362, 14811298, 6024667, 13349505,
+ -27315504, -10497842, -27672585, -11539858 },
+ { 15941029, -9405932, -21367050, 8062055, 31876073, -238629,
+ -15278393, -1444429, 15397331, -4130193 },
+ { 8934485, -13485467, -23286397, -13423241, -32446090, 14047986,
+ 31170398, -1441021, -27505566, 15087184 },
},
{
- {-18357243, -2156491, 24524913, -16677868, 15520427, -6360776,
- -15502406, 11461896, 16788528, -5868942},
- {-1947386, 16013773, 21750665, 3714552, -17401782, -16055433,
- -3770287, -10323320, 31322514, -11615635},
- {21426655, -5650218, -13648287, -5347537, -28812189, -4920970,
- -18275391, -14621414, 13040862, -12112948},
+ { -18357243, -2156491, 24524913, -16677868, 15520427, -6360776,
+ -15502406, 11461896, 16788528, -5868942 },
+ { -1947386, 16013773, 21750665, 3714552, -17401782, -16055433,
+ -3770287, -10323320, 31322514, -11615635 },
+ { 21426655, -5650218, -13648287, -5347537, -28812189, -4920970,
+ -18275391, -14621414, 13040862, -12112948 },
},
{
- {11293895, 12478086, -27136401, 15083750, -29307421, 14748872,
- 14555558, -13417103, 1613711, 4896935},
- {-25894883, 15323294, -8489791, -8057900, 25967126, -13425460,
- 2825960, -4897045, -23971776, -11267415},
- {-15924766, -5229880, -17443532, 6410664, 3622847, 10243618,
- 20615400, 12405433, -23753030, -8436416},
+ { 11293895, 12478086, -27136401, 15083750, -29307421, 14748872,
+ 14555558, -13417103, 1613711, 4896935 },
+ { -25894883, 15323294, -8489791, -8057900, 25967126, -13425460,
+ 2825960, -4897045, -23971776, -11267415 },
+ { -15924766, -5229880, -17443532, 6410664, 3622847, 10243618,
+ 20615400, 12405433, -23753030, -8436416 },
},
{
- {-7091295, 12556208, -20191352, 9025187, -17072479, 4333801,
- 4378436, 2432030, 23097949, -566018},
- {4565804, -16025654, 20084412, -7842817, 1724999, 189254, 24767264,
- 10103221, -18512313, 2424778},
- {366633, -11976806, 8173090, -6890119, 30788634, 5745705, -7168678,
- 1344109, -3642553, 12412659},
+ { -7091295, 12556208, -20191352, 9025187, -17072479, 4333801,
+ 4378436, 2432030, 23097949, -566018 },
+ { 4565804, -16025654, 20084412, -7842817, 1724999, 189254, 24767264,
+ 10103221, -18512313, 2424778 },
+ { 366633, -11976806, 8173090, -6890119, 30788634, 5745705, -7168678,
+ 1344109, -3642553, 12412659 },
},
{
- {-24001791, 7690286, 14929416, -168257, -32210835, -13412986,
- 24162697, -15326504, -3141501, 11179385},
- {18289522, -14724954, 8056945, 16430056, -21729724, 7842514,
- -6001441, -1486897, -18684645, -11443503},
- {476239, 6601091, -6152790, -9723375, 17503545, -4863900, 27672959,
- 13403813, 11052904, 5219329},
+ { -24001791, 7690286, 14929416, -168257, -32210835, -13412986,
+ 24162697, -15326504, -3141501, 11179385 },
+ { 18289522, -14724954, 8056945, 16430056, -21729724, 7842514,
+ -6001441, -1486897, -18684645, -11443503 },
+ { 476239, 6601091, -6152790, -9723375, 17503545, -4863900, 27672959,
+ 13403813, 11052904, 5219329 },
},
},
{
{
- {20678546, -8375738, -32671898, 8849123, -5009758, 14574752,
- 31186971, -3973730, 9014762, -8579056},
- {-13644050, -10350239, -15962508, 5075808, -1514661, -11534600,
- -33102500, 9160280, 8473550, -3256838},
- {24900749, 14435722, 17209120, -15292541, -22592275, 9878983,
- -7689309, -16335821, -24568481, 11788948},
+ { 20678546, -8375738, -32671898, 8849123, -5009758, 14574752,
+ 31186971, -3973730, 9014762, -8579056 },
+ { -13644050, -10350239, -15962508, 5075808, -1514661, -11534600,
+ -33102500, 9160280, 8473550, -3256838 },
+ { 24900749, 14435722, 17209120, -15292541, -22592275, 9878983,
+ -7689309, -16335821, -24568481, 11788948 },
},
{
- {-3118155, -11395194, -13802089, 14797441, 9652448, -6845904,
- -20037437, 10410733, -24568470, -1458691},
- {-15659161, 16736706, -22467150, 10215878, -9097177, 7563911,
- 11871841, -12505194, -18513325, 8464118},
- {-23400612, 8348507, -14585951, -861714, -3950205, -6373419,
- 14325289, 8628612, 33313881, -8370517},
+ { -3118155, -11395194, -13802089, 14797441, 9652448, -6845904,
+ -20037437, 10410733, -24568470, -1458691 },
+ { -15659161, 16736706, -22467150, 10215878, -9097177, 7563911,
+ 11871841, -12505194, -18513325, 8464118 },
+ { -23400612, 8348507, -14585951, -861714, -3950205, -6373419,
+ 14325289, 8628612, 33313881, -8370517 },
},
{
- {-20186973, -4967935, 22367356, 5271547, -1097117, -4788838,
- -24805667, -10236854, -8940735, -5818269},
- {-6948785, -1795212, -32625683, -16021179, 32635414, -7374245,
- 15989197, -12838188, 28358192, -4253904},
- {-23561781, -2799059, -32351682, -1661963, -9147719, 10429267,
- -16637684, 4072016, -5351664, 5596589},
+ { -20186973, -4967935, 22367356, 5271547, -1097117, -4788838,
+ -24805667, -10236854, -8940735, -5818269 },
+ { -6948785, -1795212, -32625683, -16021179, 32635414, -7374245,
+ 15989197, -12838188, 28358192, -4253904 },
+ { -23561781, -2799059, -32351682, -1661963, -9147719, 10429267,
+ -16637684, 4072016, -5351664, 5596589 },
},
{
- {-28236598, -3390048, 12312896, 6213178, 3117142, 16078565,
- 29266239, 2557221, 1768301, 15373193},
- {-7243358, -3246960, -4593467, -7553353, -127927, -912245, -1090902,
- -4504991, -24660491, 3442910},
- {-30210571, 5124043, 14181784, 8197961, 18964734, -11939093,
- 22597931, 7176455, -18585478, 13365930},
+ { -28236598, -3390048, 12312896, 6213178, 3117142, 16078565,
+ 29266239, 2557221, 1768301, 15373193 },
+ { -7243358, -3246960, -4593467, -7553353, -127927, -912245, -1090902,
+ -4504991, -24660491, 3442910 },
+ { -30210571, 5124043, 14181784, 8197961, 18964734, -11939093,
+ 22597931, 7176455, -18585478, 13365930 },
},
{
- {-7877390, -1499958, 8324673, 4690079, 6261860, 890446, 24538107,
- -8570186, -9689599, -3031667},
- {25008904, -10771599, -4305031, -9638010, 16265036, 15721635,
- 683793, -11823784, 15723479, -15163481},
- {-9660625, 12374379, -27006999, -7026148, -7724114, -12314514,
- 11879682, 5400171, 519526, -1235876},
+ { -7877390, -1499958, 8324673, 4690079, 6261860, 890446, 24538107,
+ -8570186, -9689599, -3031667 },
+ { 25008904, -10771599, -4305031, -9638010, 16265036, 15721635,
+ 683793, -11823784, 15723479, -15163481 },
+ { -9660625, 12374379, -27006999, -7026148, -7724114, -12314514,
+ 11879682, 5400171, 519526, -1235876 },
},
{
- {22258397, -16332233, -7869817, 14613016, -22520255, -2950923,
- -20353881, 7315967, 16648397, 7605640},
- {-8081308, -8464597, -8223311, 9719710, 19259459, -15348212,
- 23994942, -5281555, -9468848, 4763278},
- {-21699244, 9220969, -15730624, 1084137, -25476107, -2852390,
- 31088447, -7764523, -11356529, 728112},
+ { 22258397, -16332233, -7869817, 14613016, -22520255, -2950923,
+ -20353881, 7315967, 16648397, 7605640 },
+ { -8081308, -8464597, -8223311, 9719710, 19259459, -15348212,
+ 23994942, -5281555, -9468848, 4763278 },
+ { -21699244, 9220969, -15730624, 1084137, -25476107, -2852390,
+ 31088447, -7764523, -11356529, 728112 },
},
{
- {26047220, -11751471, -6900323, -16521798, 24092068, 9158119,
- -4273545, -12555558, -29365436, -5498272},
- {17510331, -322857, 5854289, 8403524, 17133918, -3112612, -28111007,
- 12327945, 10750447, 10014012},
- {-10312768, 3936952, 9156313, -8897683, 16498692, -994647,
- -27481051, -666732, 3424691, 7540221},
+ { 26047220, -11751471, -6900323, -16521798, 24092068, 9158119,
+ -4273545, -12555558, -29365436, -5498272 },
+ { 17510331, -322857, 5854289, 8403524, 17133918, -3112612, -28111007,
+ 12327945, 10750447, 10014012 },
+ { -10312768, 3936952, 9156313, -8897683, 16498692, -994647,
+ -27481051, -666732, 3424691, 7540221 },
},
{
- {30322361, -6964110, 11361005, -4143317, 7433304, 4989748, -7071422,
- -16317219, -9244265, 15258046},
- {13054562, -2779497, 19155474, 469045, -12482797, 4566042, 5631406,
- 2711395, 1062915, -5136345},
- {-19240248, -11254599, -29509029, -7499965, -5835763, 13005411,
- -6066489, 12194497, 32960380, 1459310},
+ { 30322361, -6964110, 11361005, -4143317, 7433304, 4989748, -7071422,
+ -16317219, -9244265, 15258046 },
+ { 13054562, -2779497, 19155474, 469045, -12482797, 4566042, 5631406,
+ 2711395, 1062915, -5136345 },
+ { -19240248, -11254599, -29509029, -7499965, -5835763, 13005411,
+ -6066489, 12194497, 32960380, 1459310 },
},
},
{
{
- {19852034, 7027924, 23669353, 10020366, 8586503, -6657907, 394197,
- -6101885, 18638003, -11174937},
- {31395534, 15098109, 26581030, 8030562, -16527914, -5007134,
- 9012486, -7584354, -6643087, -5442636},
- {-9192165, -2347377, -1997099, 4529534, 25766844, 607986, -13222,
- 9677543, -32294889, -6456008},
+ { 19852034, 7027924, 23669353, 10020366, 8586503, -6657907, 394197,
+ -6101885, 18638003, -11174937 },
+ { 31395534, 15098109, 26581030, 8030562, -16527914, -5007134,
+ 9012486, -7584354, -6643087, -5442636 },
+ { -9192165, -2347377, -1997099, 4529534, 25766844, 607986, -13222,
+ 9677543, -32294889, -6456008 },
},
{
- {-2444496, -149937, 29348902, 8186665, 1873760, 12489863, -30934579,
- -7839692, -7852844, -8138429},
- {-15236356, -15433509, 7766470, 746860, 26346930, -10221762,
- -27333451, 10754588, -9431476, 5203576},
- {31834314, 14135496, -770007, 5159118, 20917671, -16768096,
- -7467973, -7337524, 31809243, 7347066},
+ { -2444496, -149937, 29348902, 8186665, 1873760, 12489863, -30934579,
+ -7839692, -7852844, -8138429 },
+ { -15236356, -15433509, 7766470, 746860, 26346930, -10221762,
+ -27333451, 10754588, -9431476, 5203576 },
+ { 31834314, 14135496, -770007, 5159118, 20917671, -16768096,
+ -7467973, -7337524, 31809243, 7347066 },
},
{
- {-9606723, -11874240, 20414459, 13033986, 13716524, -11691881,
- 19797970, -12211255, 15192876, -2087490},
- {-12663563, -2181719, 1168162, -3804809, 26747877, -14138091,
- 10609330, 12694420, 33473243, -13382104},
- {33184999, 11180355, 15832085, -11385430, -1633671, 225884,
- 15089336, -11023903, -6135662, 14480053},
+ { -9606723, -11874240, 20414459, 13033986, 13716524, -11691881,
+ 19797970, -12211255, 15192876, -2087490 },
+ { -12663563, -2181719, 1168162, -3804809, 26747877, -14138091,
+ 10609330, 12694420, 33473243, -13382104 },
+ { 33184999, 11180355, 15832085, -11385430, -1633671, 225884,
+ 15089336, -11023903, -6135662, 14480053 },
},
{
- {31308717, -5619998, 31030840, -1897099, 15674547, -6582883,
- 5496208, 13685227, 27595050, 8737275},
- {-20318852, -15150239, 10933843, -16178022, 8335352, -7546022,
- -31008351, -12610604, 26498114, 66511},
- {22644454, -8761729, -16671776, 4884562, -3105614, -13559366,
- 30540766, -4286747, -13327787, -7515095},
+ { 31308717, -5619998, 31030840, -1897099, 15674547, -6582883,
+ 5496208, 13685227, 27595050, 8737275 },
+ { -20318852, -15150239, 10933843, -16178022, 8335352, -7546022,
+ -31008351, -12610604, 26498114, 66511 },
+ { 22644454, -8761729, -16671776, 4884562, -3105614, -13559366,
+ 30540766, -4286747, -13327787, -7515095 },
},
{
- {-28017847, 9834845, 18617207, -2681312, -3401956, -13307506,
- 8205540, 13585437, -17127465, 15115439},
- {23711543, -672915, 31206561, -8362711, 6164647, -9709987,
- -33535882, -1426096, 8236921, 16492939},
- {-23910559, -13515526, -26299483, -4503841, 25005590, -7687270,
- 19574902, 10071562, 6708380, -6222424},
+ { -28017847, 9834845, 18617207, -2681312, -3401956, -13307506,
+ 8205540, 13585437, -17127465, 15115439 },
+ { 23711543, -672915, 31206561, -8362711, 6164647, -9709987,
+ -33535882, -1426096, 8236921, 16492939 },
+ { -23910559, -13515526, -26299483, -4503841, 25005590, -7687270,
+ 19574902, 10071562, 6708380, -6222424 },
},
{
- {2101391, -4930054, 19702731, 2367575, -15427167, 1047675, 5301017,
- 9328700, 29955601, -11678310},
- {3096359, 9271816, -21620864, -15521844, -14847996, -7592937,
- -25892142, -12635595, -9917575, 6216608},
- {-32615849, 338663, -25195611, 2510422, -29213566, -13820213,
- 24822830, -6146567, -26767480, 7525079},
+ { 2101391, -4930054, 19702731, 2367575, -15427167, 1047675, 5301017,
+ 9328700, 29955601, -11678310 },
+ { 3096359, 9271816, -21620864, -15521844, -14847996, -7592937,
+ -25892142, -12635595, -9917575, 6216608 },
+ { -32615849, 338663, -25195611, 2510422, -29213566, -13820213,
+ 24822830, -6146567, -26767480, 7525079 },
},
{
- {-23066649, -13985623, 16133487, -7896178, -3389565, 778788,
- -910336, -2782495, -19386633, 11994101},
- {21691500, -13624626, -641331, -14367021, 3285881, -3483596,
- -25064666, 9718258, -7477437, 13381418},
- {18445390, -4202236, 14979846, 11622458, -1727110, -3582980,
- 23111648, -6375247, 28535282, 15779576},
+ { -23066649, -13985623, 16133487, -7896178, -3389565, 778788,
+ -910336, -2782495, -19386633, 11994101 },
+ { 21691500, -13624626, -641331, -14367021, 3285881, -3483596,
+ -25064666, 9718258, -7477437, 13381418 },
+ { 18445390, -4202236, 14979846, 11622458, -1727110, -3582980,
+ 23111648, -6375247, 28535282, 15779576 },
},
{
- {30098053, 3089662, -9234387, 16662135, -21306940, 11308411,
- -14068454, 12021730, 9955285, -16303356},
- {9734894, -14576830, -7473633, -9138735, 2060392, 11313496,
- -18426029, 9924399, 20194861, 13380996},
- {-26378102, -7965207, -22167821, 15789297, -18055342, -6168792,
- -1984914, 15707771, 26342023, 10146099},
+ { 30098053, 3089662, -9234387, 16662135, -21306940, 11308411,
+ -14068454, 12021730, 9955285, -16303356 },
+ { 9734894, -14576830, -7473633, -9138735, 2060392, 11313496,
+ -18426029, 9924399, 20194861, 13380996 },
+ { -26378102, -7965207, -22167821, 15789297, -18055342, -6168792,
+ -1984914, 15707771, 26342023, 10146099 },
},
},
{
{
- {-26016874, -219943, 21339191, -41388, 19745256, -2878700,
- -29637280, 2227040, 21612326, -545728},
- {-13077387, 1184228, 23562814, -5970442, -20351244, -6348714,
- 25764461, 12243797, -20856566, 11649658},
- {-10031494, 11262626, 27384172, 2271902, 26947504, -15997771, 39944,
- 6114064, 33514190, 2333242},
+ { -26016874, -219943, 21339191, -41388, 19745256, -2878700,
+ -29637280, 2227040, 21612326, -545728 },
+ { -13077387, 1184228, 23562814, -5970442, -20351244, -6348714,
+ 25764461, 12243797, -20856566, 11649658 },
+ { -10031494, 11262626, 27384172, 2271902, 26947504, -15997771, 39944,
+ 6114064, 33514190, 2333242 },
},
{
- {-21433588, -12421821, 8119782, 7219913, -21830522, -9016134,
- -6679750, -12670638, 24350578, -13450001},
- {-4116307, -11271533, -23886186, 4843615, -30088339, 690623,
- -31536088, -10406836, 8317860, 12352766},
- {18200138, -14475911, -33087759, -2696619, -23702521, -9102511,
- -23552096, -2287550, 20712163, 6719373},
+ { -21433588, -12421821, 8119782, 7219913, -21830522, -9016134,
+ -6679750, -12670638, 24350578, -13450001 },
+ { -4116307, -11271533, -23886186, 4843615, -30088339, 690623,
+ -31536088, -10406836, 8317860, 12352766 },
+ { 18200138, -14475911, -33087759, -2696619, -23702521, -9102511,
+ -23552096, -2287550, 20712163, 6719373 },
},
{
- {26656208, 6075253, -7858556, 1886072, -28344043, 4262326, 11117530,
- -3763210, 26224235, -3297458},
- {-17168938, -14854097, -3395676, -16369877, -19954045, 14050420,
- 21728352, 9493610, 18620611, -16428628},
- {-13323321, 13325349, 11432106, 5964811, 18609221, 6062965,
- -5269471, -9725556, -30701573, -16479657},
+ { 26656208, 6075253, -7858556, 1886072, -28344043, 4262326, 11117530,
+ -3763210, 26224235, -3297458 },
+ { -17168938, -14854097, -3395676, -16369877, -19954045, 14050420,
+ 21728352, 9493610, 18620611, -16428628 },
+ { -13323321, 13325349, 11432106, 5964811, 18609221, 6062965,
+ -5269471, -9725556, -30701573, -16479657 },
},
{
- {-23860538, -11233159, 26961357, 1640861, -32413112, -16737940,
- 12248509, -5240639, 13735342, 1934062},
- {25089769, 6742589, 17081145, -13406266, 21909293, -16067981,
- -15136294, -3765346, -21277997, 5473616},
- {31883677, -7961101, 1083432, -11572403, 22828471, 13290673,
- -7125085, 12469656, 29111212, -5451014},
+ { -23860538, -11233159, 26961357, 1640861, -32413112, -16737940,
+ 12248509, -5240639, 13735342, 1934062 },
+ { 25089769, 6742589, 17081145, -13406266, 21909293, -16067981,
+ -15136294, -3765346, -21277997, 5473616 },
+ { 31883677, -7961101, 1083432, -11572403, 22828471, 13290673,
+ -7125085, 12469656, 29111212, -5451014 },
},
{
- {24244947, -15050407, -26262976, 2791540, -14997599, 16666678,
- 24367466, 6388839, -10295587, 452383},
- {-25640782, -3417841, 5217916, 16224624, 19987036, -4082269,
- -24236251, -5915248, 15766062, 8407814},
- {-20406999, 13990231, 15495425, 16395525, 5377168, 15166495,
- -8917023, -4388953, -8067909, 2276718},
+ { 24244947, -15050407, -26262976, 2791540, -14997599, 16666678,
+ 24367466, 6388839, -10295587, 452383 },
+ { -25640782, -3417841, 5217916, 16224624, 19987036, -4082269,
+ -24236251, -5915248, 15766062, 8407814 },
+ { -20406999, 13990231, 15495425, 16395525, 5377168, 15166495,
+ -8917023, -4388953, -8067909, 2276718 },
},
{
- {30157918, 12924066, -17712050, 9245753, 19895028, 3368142,
- -23827587, 5096219, 22740376, -7303417},
- {2041139, -14256350, 7783687, 13876377, -25946985, -13352459,
- 24051124, 13742383, -15637599, 13295222},
- {33338237, -8505733, 12532113, 7977527, 9106186, -1715251,
- -17720195, -4612972, -4451357, -14669444},
+ { 30157918, 12924066, -17712050, 9245753, 19895028, 3368142,
+ -23827587, 5096219, 22740376, -7303417 },
+ { 2041139, -14256350, 7783687, 13876377, -25946985, -13352459,
+ 24051124, 13742383, -15637599, 13295222 },
+ { 33338237, -8505733, 12532113, 7977527, 9106186, -1715251,
+ -17720195, -4612972, -4451357, -14669444 },
},
{
- {-20045281, 5454097, -14346548, 6447146, 28862071, 1883651,
- -2469266, -4141880, 7770569, 9620597},
- {23208068, 7979712, 33071466, 8149229, 1758231, -10834995, 30945528,
- -1694323, -33502340, -14767970},
- {1439958, -16270480, -1079989, -793782, 4625402, 10647766, -5043801,
- 1220118, 30494170, -11440799},
+ { -20045281, 5454097, -14346548, 6447146, 28862071, 1883651,
+ -2469266, -4141880, 7770569, 9620597 },
+ { 23208068, 7979712, 33071466, 8149229, 1758231, -10834995, 30945528,
+ -1694323, -33502340, -14767970 },
+ { 1439958, -16270480, -1079989, -793782, 4625402, 10647766, -5043801,
+ 1220118, 30494170, -11440799 },
},
{
- {-5037580, -13028295, -2970559, -3061767, 15640974, -6701666,
- -26739026, 926050, -1684339, -13333647},
- {13908495, -3549272, 30919928, -6273825, -21521863, 7989039,
- 9021034, 9078865, 3353509, 4033511},
- {-29663431, -15113610, 32259991, -344482, 24295849, -12912123,
- 23161163, 8839127, 27485041, 7356032},
+ { -5037580, -13028295, -2970559, -3061767, 15640974, -6701666,
+ -26739026, 926050, -1684339, -13333647 },
+ { 13908495, -3549272, 30919928, -6273825, -21521863, 7989039,
+ 9021034, 9078865, 3353509, 4033511 },
+ { -29663431, -15113610, 32259991, -344482, 24295849, -12912123,
+ 23161163, 8839127, 27485041, 7356032 },
},
},
{
{
- {9661027, 705443, 11980065, -5370154, -1628543, 14661173, -6346142,
- 2625015, 28431036, -16771834},
- {-23839233, -8311415, -25945511, 7480958, -17681669, -8354183,
- -22545972, 14150565, 15970762, 4099461},
- {29262576, 16756590, 26350592, -8793563, 8529671, -11208050,
- 13617293, -9937143, 11465739, 8317062},
+ { 9661027, 705443, 11980065, -5370154, -1628543, 14661173, -6346142,
+ 2625015, 28431036, -16771834 },
+ { -23839233, -8311415, -25945511, 7480958, -17681669, -8354183,
+ -22545972, 14150565, 15970762, 4099461 },
+ { 29262576, 16756590, 26350592, -8793563, 8529671, -11208050,
+ 13617293, -9937143, 11465739, 8317062 },
},
{
- {-25493081, -6962928, 32500200, -9419051, -23038724, -2302222,
- 14898637, 3848455, 20969334, -5157516},
- {-20384450, -14347713, -18336405, 13884722, -33039454, 2842114,
- -21610826, -3649888, 11177095, 14989547},
- {-24496721, -11716016, 16959896, 2278463, 12066309, 10137771,
- 13515641, 2581286, -28487508, 9930240},
+ { -25493081, -6962928, 32500200, -9419051, -23038724, -2302222,
+ 14898637, 3848455, 20969334, -5157516 },
+ { -20384450, -14347713, -18336405, 13884722, -33039454, 2842114,
+ -21610826, -3649888, 11177095, 14989547 },
+ { -24496721, -11716016, 16959896, 2278463, 12066309, 10137771,
+ 13515641, 2581286, -28487508, 9930240 },
},
{
- {-17751622, -2097826, 16544300, -13009300, -15914807, -14949081,
- 18345767, -13403753, 16291481, -5314038},
- {-33229194, 2553288, 32678213, 9875984, 8534129, 6889387, -9676774,
- 6957617, 4368891, 9788741},
- {16660756, 7281060, -10830758, 12911820, 20108584, -8101676,
- -21722536, -8613148, 16250552, -11111103},
+ { -17751622, -2097826, 16544300, -13009300, -15914807, -14949081,
+ 18345767, -13403753, 16291481, -5314038 },
+ { -33229194, 2553288, 32678213, 9875984, 8534129, 6889387, -9676774,
+ 6957617, 4368891, 9788741 },
+ { 16660756, 7281060, -10830758, 12911820, 20108584, -8101676,
+ -21722536, -8613148, 16250552, -11111103 },
},
{
- {-19765507, 2390526, -16551031, 14161980, 1905286, 6414907, 4689584,
- 10604807, -30190403, 4782747},
- {-1354539, 14736941, -7367442, -13292886, 7710542, -14155590,
- -9981571, 4383045, 22546403, 437323},
- {31665577, -12180464, -16186830, 1491339, -18368625, 3294682,
- 27343084, 2786261, -30633590, -14097016},
+ { -19765507, 2390526, -16551031, 14161980, 1905286, 6414907, 4689584,
+ 10604807, -30190403, 4782747 },
+ { -1354539, 14736941, -7367442, -13292886, 7710542, -14155590,
+ -9981571, 4383045, 22546403, 437323 },
+ { 31665577, -12180464, -16186830, 1491339, -18368625, 3294682,
+ 27343084, 2786261, -30633590, -14097016 },
},
{
- {-14467279, -683715, -33374107, 7448552, 19294360, 14334329,
- -19690631, 2355319, -19284671, -6114373},
- {15121312, -15796162, 6377020, -6031361, -10798111, -12957845,
- 18952177, 15496498, -29380133, 11754228},
- {-2637277, -13483075, 8488727, -14303896, 12728761, -1622493,
- 7141596, 11724556, 22761615, -10134141},
+ { -14467279, -683715, -33374107, 7448552, 19294360, 14334329,
+ -19690631, 2355319, -19284671, -6114373 },
+ { 15121312, -15796162, 6377020, -6031361, -10798111, -12957845,
+ 18952177, 15496498, -29380133, 11754228 },
+ { -2637277, -13483075, 8488727, -14303896, 12728761, -1622493,
+ 7141596, 11724556, 22761615, -10134141 },
},
{
- {16918416, 11729663, -18083579, 3022987, -31015732, -13339659,
- -28741185, -12227393, 32851222, 11717399},
- {11166634, 7338049, -6722523, 4531520, -29468672, -7302055,
- 31474879, 3483633, -1193175, -4030831},
- {-185635, 9921305, 31456609, -13536438, -12013818, 13348923,
- 33142652, 6546660, -19985279, -3948376},
+ { 16918416, 11729663, -18083579, 3022987, -31015732, -13339659,
+ -28741185, -12227393, 32851222, 11717399 },
+ { 11166634, 7338049, -6722523, 4531520, -29468672, -7302055,
+ 31474879, 3483633, -1193175, -4030831 },
+ { -185635, 9921305, 31456609, -13536438, -12013818, 13348923,
+ 33142652, 6546660, -19985279, -3948376 },
},
{
- {-32460596, 11266712, -11197107, -7899103, 31703694, 3855903,
- -8537131, -12833048, -30772034, -15486313},
- {-18006477, 12709068, 3991746, -6479188, -21491523, -10550425,
- -31135347, -16049879, 10928917, 3011958},
- {-6957757, -15594337, 31696059, 334240, 29576716, 14796075,
- -30831056, -12805180, 18008031, 10258577},
+ { -32460596, 11266712, -11197107, -7899103, 31703694, 3855903,
+ -8537131, -12833048, -30772034, -15486313 },
+ { -18006477, 12709068, 3991746, -6479188, -21491523, -10550425,
+ -31135347, -16049879, 10928917, 3011958 },
+ { -6957757, -15594337, 31696059, 334240, 29576716, 14796075,
+ -30831056, -12805180, 18008031, 10258577 },
},
{
- {-22448644, 15655569, 7018479, -4410003, -30314266, -1201591,
- -1853465, 1367120, 25127874, 6671743},
- {29701166, -14373934, -10878120, 9279288, -17568, 13127210,
- 21382910, 11042292, 25838796, 4642684},
- {-20430234, 14955537, -24126347, 8124619, -5369288, -5990470,
- 30468147, -13900640, 18423289, 4177476},
+ { -22448644, 15655569, 7018479, -4410003, -30314266, -1201591,
+ -1853465, 1367120, 25127874, 6671743 },
+ { 29701166, -14373934, -10878120, 9279288, -17568, 13127210,
+ 21382910, 11042292, 25838796, 4642684 },
+ { -20430234, 14955537, -24126347, 8124619, -5369288, -5990470,
+ 30468147, -13900640, 18423289, 4177476 },
},
},
};
@@ -4292,7 +4424,7 @@ static void fe_cswap(fe f, fe g, unsigned int b)
{
size_t i;
- b = 0-b;
+ b = 0 - b;
for (i = 0; i < 10; i++) {
int32_t x = f[i] ^ g[i];
x &= b;
@@ -4324,16 +4456,16 @@ static void fe_mul121666(fe h, fe f)
int32_t f7 = f[7];
int32_t f8 = f[8];
int32_t f9 = f[9];
- int64_t h0 = f0 * (int64_t) 121666;
- int64_t h1 = f1 * (int64_t) 121666;
- int64_t h2 = f2 * (int64_t) 121666;
- int64_t h3 = f3 * (int64_t) 121666;
- int64_t h4 = f4 * (int64_t) 121666;
- int64_t h5 = f5 * (int64_t) 121666;
- int64_t h6 = f6 * (int64_t) 121666;
- int64_t h7 = f7 * (int64_t) 121666;
- int64_t h8 = f8 * (int64_t) 121666;
- int64_t h9 = f9 * (int64_t) 121666;
+ int64_t h0 = f0 * (int64_t)121666;
+ int64_t h1 = f1 * (int64_t)121666;
+ int64_t h2 = f2 * (int64_t)121666;
+ int64_t h3 = f3 * (int64_t)121666;
+ int64_t h4 = f4 * (int64_t)121666;
+ int64_t h5 = f5 * (int64_t)121666;
+ int64_t h6 = f6 * (int64_t)121666;
+ int64_t h7 = f7 * (int64_t)121666;
+ int64_t h8 = f8 * (int64_t)121666;
+ int64_t h9 = f9 * (int64_t)121666;
int64_t carry0;
int64_t carry1;
int64_t carry2;
@@ -4345,17 +4477,37 @@ static void fe_mul121666(fe h, fe f)
int64_t carry8;
int64_t carry9;
- carry9 = h9 + (1 << 24); h0 += (carry9 >> 25) * 19; h9 -= carry9 & kTop39Bits;
- carry1 = h1 + (1 << 24); h2 += carry1 >> 25; h1 -= carry1 & kTop39Bits;
- carry3 = h3 + (1 << 24); h4 += carry3 >> 25; h3 -= carry3 & kTop39Bits;
- carry5 = h5 + (1 << 24); h6 += carry5 >> 25; h5 -= carry5 & kTop39Bits;
- carry7 = h7 + (1 << 24); h8 += carry7 >> 25; h7 -= carry7 & kTop39Bits;
-
- carry0 = h0 + (1 << 25); h1 += carry0 >> 26; h0 -= carry0 & kTop38Bits;
- carry2 = h2 + (1 << 25); h3 += carry2 >> 26; h2 -= carry2 & kTop38Bits;
- carry4 = h4 + (1 << 25); h5 += carry4 >> 26; h4 -= carry4 & kTop38Bits;
- carry6 = h6 + (1 << 25); h7 += carry6 >> 26; h6 -= carry6 & kTop38Bits;
- carry8 = h8 + (1 << 25); h9 += carry8 >> 26; h8 -= carry8 & kTop38Bits;
+ carry9 = h9 + (1 << 24);
+ h0 += (carry9 >> 25) * 19;
+ h9 -= carry9 & kTop39Bits;
+ carry1 = h1 + (1 << 24);
+ h2 += carry1 >> 25;
+ h1 -= carry1 & kTop39Bits;
+ carry3 = h3 + (1 << 24);
+ h4 += carry3 >> 25;
+ h3 -= carry3 & kTop39Bits;
+ carry5 = h5 + (1 << 24);
+ h6 += carry5 >> 25;
+ h5 -= carry5 & kTop39Bits;
+ carry7 = h7 + (1 << 24);
+ h8 += carry7 >> 25;
+ h7 -= carry7 & kTop39Bits;
+
+ carry0 = h0 + (1 << 25);
+ h1 += carry0 >> 26;
+ h0 -= carry0 & kTop38Bits;
+ carry2 = h2 + (1 << 25);
+ h3 += carry2 >> 26;
+ h2 -= carry2 & kTop38Bits;
+ carry4 = h4 + (1 << 25);
+ h5 += carry4 >> 26;
+ h4 -= carry4 & kTop38Bits;
+ carry6 = h6 + (1 << 25);
+ h7 += carry6 >> 26;
+ h6 -= carry6 & kTop38Bits;
+ carry8 = h8 + (1 << 25);
+ h9 += carry8 >> 26;
+ h8 -= carry8 & kTop38Bits;
h[0] = (int32_t)h0;
h[1] = (int32_t)h1;
@@ -4370,8 +4522,9 @@ static void fe_mul121666(fe h, fe f)
}
static void x25519_scalar_mult_generic(uint8_t out[32],
- const uint8_t scalar[32],
- const uint8_t point[32]) {
+ const uint8_t scalar[32],
+ const uint8_t point[32])
+{
fe x1, x2, z2, x3, z3, tmp0, tmp1;
uint8_t e[32];
unsigned swap = 0;
@@ -4421,7 +4574,8 @@ static void x25519_scalar_mult_generic(uint8_t out[32],
}
static void x25519_scalar_mult(uint8_t out[32], const uint8_t scalar[32],
- const uint8_t point[32]) {
+ const uint8_t point[32])
+{
x25519_scalar_mult_generic(out, scalar, point);
}
#endif
@@ -4463,68 +4617,68 @@ static void slide(signed char *r, const uint8_t *a)
static const ge_precomp Bi[8] = {
{
- {25967493, -14356035, 29566456, 3660896, -12694345, 4014787, 27544626,
- -11754271, -6079156, 2047605},
- {-12545711, 934262, -2722910, 3049990, -727428, 9406986, 12720692,
- 5043384, 19500929, -15469378},
- {-8738181, 4489570, 9688441, -14785194, 10184609, -12363380, 29287919,
- 11864899, -24514362, -4438546},
+ { 25967493, -14356035, 29566456, 3660896, -12694345, 4014787, 27544626,
+ -11754271, -6079156, 2047605 },
+ { -12545711, 934262, -2722910, 3049990, -727428, 9406986, 12720692,
+ 5043384, 19500929, -15469378 },
+ { -8738181, 4489570, 9688441, -14785194, 10184609, -12363380, 29287919,
+ 11864899, -24514362, -4438546 },
},
{
- {15636291, -9688557, 24204773, -7912398, 616977, -16685262, 27787600,
- -14772189, 28944400, -1550024},
- {16568933, 4717097, -11556148, -1102322, 15682896, -11807043, 16354577,
- -11775962, 7689662, 11199574},
- {30464156, -5976125, -11779434, -15670865, 23220365, 15915852, 7512774,
- 10017326, -17749093, -9920357},
+ { 15636291, -9688557, 24204773, -7912398, 616977, -16685262, 27787600,
+ -14772189, 28944400, -1550024 },
+ { 16568933, 4717097, -11556148, -1102322, 15682896, -11807043, 16354577,
+ -11775962, 7689662, 11199574 },
+ { 30464156, -5976125, -11779434, -15670865, 23220365, 15915852, 7512774,
+ 10017326, -17749093, -9920357 },
},
{
- {10861363, 11473154, 27284546, 1981175, -30064349, 12577861, 32867885,
- 14515107, -15438304, 10819380},
- {4708026, 6336745, 20377586, 9066809, -11272109, 6594696, -25653668,
- 12483688, -12668491, 5581306},
- {19563160, 16186464, -29386857, 4097519, 10237984, -4348115, 28542350,
- 13850243, -23678021, -15815942},
+ { 10861363, 11473154, 27284546, 1981175, -30064349, 12577861, 32867885,
+ 14515107, -15438304, 10819380 },
+ { 4708026, 6336745, 20377586, 9066809, -11272109, 6594696, -25653668,
+ 12483688, -12668491, 5581306 },
+ { 19563160, 16186464, -29386857, 4097519, 10237984, -4348115, 28542350,
+ 13850243, -23678021, -15815942 },
},
{
- {5153746, 9909285, 1723747, -2777874, 30523605, 5516873, 19480852,
- 5230134, -23952439, -15175766},
- {-30269007, -3463509, 7665486, 10083793, 28475525, 1649722, 20654025,
- 16520125, 30598449, 7715701},
- {28881845, 14381568, 9657904, 3680757, -20181635, 7843316, -31400660,
- 1370708, 29794553, -1409300},
+ { 5153746, 9909285, 1723747, -2777874, 30523605, 5516873, 19480852,
+ 5230134, -23952439, -15175766 },
+ { -30269007, -3463509, 7665486, 10083793, 28475525, 1649722, 20654025,
+ 16520125, 30598449, 7715701 },
+ { 28881845, 14381568, 9657904, 3680757, -20181635, 7843316, -31400660,
+ 1370708, 29794553, -1409300 },
},
{
- {-22518993, -6692182, 14201702, -8745502, -23510406, 8844726, 18474211,
- -1361450, -13062696, 13821877},
- {-6455177, -7839871, 3374702, -4740862, -27098617, -10571707, 31655028,
- -7212327, 18853322, -14220951},
- {4566830, -12963868, -28974889, -12240689, -7602672, -2830569, -8514358,
- -10431137, 2207753, -3209784},
+ { -22518993, -6692182, 14201702, -8745502, -23510406, 8844726, 18474211,
+ -1361450, -13062696, 13821877 },
+ { -6455177, -7839871, 3374702, -4740862, -27098617, -10571707, 31655028,
+ -7212327, 18853322, -14220951 },
+ { 4566830, -12963868, -28974889, -12240689, -7602672, -2830569, -8514358,
+ -10431137, 2207753, -3209784 },
},
{
- {-25154831, -4185821, 29681144, 7868801, -6854661, -9423865, -12437364,
- -663000, -31111463, -16132436},
- {25576264, -2703214, 7349804, -11814844, 16472782, 9300885, 3844789,
- 15725684, 171356, 6466918},
- {23103977, 13316479, 9739013, -16149481, 817875, -15038942, 8965339,
- -14088058, -30714912, 16193877},
+ { -25154831, -4185821, 29681144, 7868801, -6854661, -9423865, -12437364,
+ -663000, -31111463, -16132436 },
+ { 25576264, -2703214, 7349804, -11814844, 16472782, 9300885, 3844789,
+ 15725684, 171356, 6466918 },
+ { 23103977, 13316479, 9739013, -16149481, 817875, -15038942, 8965339,
+ -14088058, -30714912, 16193877 },
},
{
- {-33521811, 3180713, -2394130, 14003687, -16903474, -16270840, 17238398,
- 4729455, -18074513, 9256800},
- {-25182317, -4174131, 32336398, 5036987, -21236817, 11360617, 22616405,
- 9761698, -19827198, 630305},
- {-13720693, 2639453, -24237460, -7406481, 9494427, -5774029, -6554551,
- -15960994, -2449256, -14291300},
+ { -33521811, 3180713, -2394130, 14003687, -16903474, -16270840, 17238398,
+ 4729455, -18074513, 9256800 },
+ { -25182317, -4174131, 32336398, 5036987, -21236817, 11360617, 22616405,
+ 9761698, -19827198, 630305 },
+ { -13720693, 2639453, -24237460, -7406481, 9494427, -5774029, -6554551,
+ -15960994, -2449256, -14291300 },
},
{
- {-3151181, -5046075, 9282714, 6866145, -31907062, -863023, -18940575,
- 15033784, 25105118, -7894876},
- {-24326370, 15950226, -31801215, -14592823, -11662737, -5090925,
- 1573892, -2625887, 2198790, -15804619},
- {-3099351, 10324967, -2241613, 7453183, -5446979, -2735503, -13812022,
- -16236442, -32461234, -12290683},
+ { -3151181, -5046075, 9282714, 6866145, -31907062, -863023, -18940575,
+ 15033784, 25105118, -7894876 },
+ { -24326370, 15950226, -31801215, -14592823, -11662737, -5090925,
+ 1573892, -2625887, 2198790, -15804619 },
+ { -3099351, 10324967, -2241613, 7453183, -5446979, -2735503, -13812022,
+ -16236442, -32461234, -12290683 },
},
};
@@ -4536,7 +4690,7 @@ static const ge_precomp Bi[8] = {
* B is the Ed25519 base point (x,4/5) with x positive.
*/
static void ge_double_scalarmult_vartime(ge_p2 *r, const uint8_t *a,
- const ge_p3 *A, const uint8_t *b)
+ const ge_p3 *A, const uint8_t *b)
{
signed char aslide[256];
signed char bslide[256];
@@ -4616,33 +4770,33 @@ static void ge_double_scalarmult_vartime(ge_p2 *r, const uint8_t *a,
* s[0]+256*s[1]+...+256^31*s[31] = s mod l
* where l = 2^252 + 27742317777372353535851937790883648493.
* Overwrites s in place.
-*/
+ */
static void x25519_sc_reduce(uint8_t *s)
{
- int64_t s0 = kBottom21Bits & load_3(s);
- int64_t s1 = kBottom21Bits & (load_4(s + 2) >> 5);
- int64_t s2 = kBottom21Bits & (load_3(s + 5) >> 2);
- int64_t s3 = kBottom21Bits & (load_4(s + 7) >> 7);
- int64_t s4 = kBottom21Bits & (load_4(s + 10) >> 4);
- int64_t s5 = kBottom21Bits & (load_3(s + 13) >> 1);
- int64_t s6 = kBottom21Bits & (load_4(s + 15) >> 6);
- int64_t s7 = kBottom21Bits & (load_3(s + 18) >> 3);
- int64_t s8 = kBottom21Bits & load_3(s + 21);
- int64_t s9 = kBottom21Bits & (load_4(s + 23) >> 5);
+ int64_t s0 = kBottom21Bits & load_3(s);
+ int64_t s1 = kBottom21Bits & (load_4(s + 2) >> 5);
+ int64_t s2 = kBottom21Bits & (load_3(s + 5) >> 2);
+ int64_t s3 = kBottom21Bits & (load_4(s + 7) >> 7);
+ int64_t s4 = kBottom21Bits & (load_4(s + 10) >> 4);
+ int64_t s5 = kBottom21Bits & (load_3(s + 13) >> 1);
+ int64_t s6 = kBottom21Bits & (load_4(s + 15) >> 6);
+ int64_t s7 = kBottom21Bits & (load_3(s + 18) >> 3);
+ int64_t s8 = kBottom21Bits & load_3(s + 21);
+ int64_t s9 = kBottom21Bits & (load_4(s + 23) >> 5);
int64_t s10 = kBottom21Bits & (load_3(s + 26) >> 2);
int64_t s11 = kBottom21Bits & (load_4(s + 28) >> 7);
int64_t s12 = kBottom21Bits & (load_4(s + 31) >> 4);
int64_t s13 = kBottom21Bits & (load_3(s + 34) >> 1);
int64_t s14 = kBottom21Bits & (load_4(s + 36) >> 6);
int64_t s15 = kBottom21Bits & (load_3(s + 39) >> 3);
- int64_t s16 = kBottom21Bits & load_3(s + 42);
+ int64_t s16 = kBottom21Bits & load_3(s + 42);
int64_t s17 = kBottom21Bits & (load_4(s + 44) >> 5);
int64_t s18 = kBottom21Bits & (load_3(s + 47) >> 2);
int64_t s19 = kBottom21Bits & (load_4(s + 49) >> 7);
int64_t s20 = kBottom21Bits & (load_4(s + 52) >> 4);
int64_t s21 = kBottom21Bits & (load_3(s + 55) >> 1);
int64_t s22 = kBottom21Bits & (load_4(s + 57) >> 6);
- int64_t s23 = (load_4(s + 60) >> 3);
+ int64_t s23 = (load_4(s + 60) >> 3);
int64_t carry0;
int64_t carry1;
int64_t carry2;
@@ -4667,7 +4821,7 @@ static void x25519_sc_reduce(uint8_t *s)
s14 -= s23 * 997805;
s15 += s23 * 136657;
s16 -= s23 * 683901;
- s23 = 0;
+ s23 = 0;
s10 += s22 * 666643;
s11 += s22 * 470296;
@@ -4675,46 +4829,46 @@ static void x25519_sc_reduce(uint8_t *s)
s13 -= s22 * 997805;
s14 += s22 * 136657;
s15 -= s22 * 683901;
- s22 = 0;
+ s22 = 0;
- s9 += s21 * 666643;
+ s9 += s21 * 666643;
s10 += s21 * 470296;
s11 += s21 * 654183;
s12 -= s21 * 997805;
s13 += s21 * 136657;
s14 -= s21 * 683901;
- s21 = 0;
+ s21 = 0;
- s8 += s20 * 666643;
- s9 += s20 * 470296;
+ s8 += s20 * 666643;
+ s9 += s20 * 470296;
s10 += s20 * 654183;
s11 -= s20 * 997805;
s12 += s20 * 136657;
s13 -= s20 * 683901;
- s20 = 0;
+ s20 = 0;
- s7 += s19 * 666643;
- s8 += s19 * 470296;
- s9 += s19 * 654183;
+ s7 += s19 * 666643;
+ s8 += s19 * 470296;
+ s9 += s19 * 654183;
s10 -= s19 * 997805;
s11 += s19 * 136657;
s12 -= s19 * 683901;
- s19 = 0;
+ s19 = 0;
- s6 += s18 * 666643;
- s7 += s18 * 470296;
- s8 += s18 * 654183;
- s9 -= s18 * 997805;
+ s6 += s18 * 666643;
+ s7 += s18 * 470296;
+ s8 += s18 * 654183;
+ s9 -= s18 * 997805;
s10 += s18 * 136657;
s11 -= s18 * 683901;
- s18 = 0;
+ s18 = 0;
carry6 = (s6 + (1 << 20)) >> 21;
- s7 += carry6;
- s6 -= carry6 * (1 << 21);
+ s7 += carry6;
+ s6 -= carry6 * (1 << 21);
carry8 = (s8 + (1 << 20)) >> 21;
- s9 += carry8;
- s8 -= carry8 * (1 << 21);
+ s9 += carry8;
+ s8 -= carry8 * (1 << 21);
carry10 = (s10 + (1 << 20)) >> 21;
s11 += carry10;
s10 -= carry10 * (1 << 21);
@@ -4729,11 +4883,11 @@ static void x25519_sc_reduce(uint8_t *s)
s16 -= carry16 * (1 << 21);
carry7 = (s7 + (1 << 20)) >> 21;
- s8 += carry7;
- s7 -= carry7 * (1 << 21);
+ s8 += carry7;
+ s7 -= carry7 * (1 << 21);
carry9 = (s9 + (1 << 20)) >> 21;
s10 += carry9;
- s9 -= carry9 * (1 << 21);
+ s9 -= carry9 * (1 << 21);
carry11 = (s11 + (1 << 20)) >> 21;
s12 += carry11;
s11 -= carry11 * (1 << 21);
@@ -4744,130 +4898,130 @@ static void x25519_sc_reduce(uint8_t *s)
s16 += carry15;
s15 -= carry15 * (1 << 21);
- s5 += s17 * 666643;
- s6 += s17 * 470296;
- s7 += s17 * 654183;
- s8 -= s17 * 997805;
- s9 += s17 * 136657;
+ s5 += s17 * 666643;
+ s6 += s17 * 470296;
+ s7 += s17 * 654183;
+ s8 -= s17 * 997805;
+ s9 += s17 * 136657;
s10 -= s17 * 683901;
- s17 = 0;
-
- s4 += s16 * 666643;
- s5 += s16 * 470296;
- s6 += s16 * 654183;
- s7 -= s16 * 997805;
- s8 += s16 * 136657;
- s9 -= s16 * 683901;
- s16 = 0;
-
- s3 += s15 * 666643;
- s4 += s15 * 470296;
- s5 += s15 * 654183;
- s6 -= s15 * 997805;
- s7 += s15 * 136657;
- s8 -= s15 * 683901;
- s15 = 0;
-
- s2 += s14 * 666643;
- s3 += s14 * 470296;
- s4 += s14 * 654183;
- s5 -= s14 * 997805;
- s6 += s14 * 136657;
- s7 -= s14 * 683901;
- s14 = 0;
-
- s1 += s13 * 666643;
- s2 += s13 * 470296;
- s3 += s13 * 654183;
- s4 -= s13 * 997805;
- s5 += s13 * 136657;
- s6 -= s13 * 683901;
- s13 = 0;
-
- s0 += s12 * 666643;
- s1 += s12 * 470296;
- s2 += s12 * 654183;
- s3 -= s12 * 997805;
- s4 += s12 * 136657;
- s5 -= s12 * 683901;
- s12 = 0;
+ s17 = 0;
+
+ s4 += s16 * 666643;
+ s5 += s16 * 470296;
+ s6 += s16 * 654183;
+ s7 -= s16 * 997805;
+ s8 += s16 * 136657;
+ s9 -= s16 * 683901;
+ s16 = 0;
+
+ s3 += s15 * 666643;
+ s4 += s15 * 470296;
+ s5 += s15 * 654183;
+ s6 -= s15 * 997805;
+ s7 += s15 * 136657;
+ s8 -= s15 * 683901;
+ s15 = 0;
+
+ s2 += s14 * 666643;
+ s3 += s14 * 470296;
+ s4 += s14 * 654183;
+ s5 -= s14 * 997805;
+ s6 += s14 * 136657;
+ s7 -= s14 * 683901;
+ s14 = 0;
+
+ s1 += s13 * 666643;
+ s2 += s13 * 470296;
+ s3 += s13 * 654183;
+ s4 -= s13 * 997805;
+ s5 += s13 * 136657;
+ s6 -= s13 * 683901;
+ s13 = 0;
+
+ s0 += s12 * 666643;
+ s1 += s12 * 470296;
+ s2 += s12 * 654183;
+ s3 -= s12 * 997805;
+ s4 += s12 * 136657;
+ s5 -= s12 * 683901;
+ s12 = 0;
carry0 = (s0 + (1 << 20)) >> 21;
- s1 += carry0;
- s0 -= carry0 * (1 << 21);
+ s1 += carry0;
+ s0 -= carry0 * (1 << 21);
carry2 = (s2 + (1 << 20)) >> 21;
- s3 += carry2;
- s2 -= carry2 * (1 << 21);
+ s3 += carry2;
+ s2 -= carry2 * (1 << 21);
carry4 = (s4 + (1 << 20)) >> 21;
- s5 += carry4;
- s4 -= carry4 * (1 << 21);
+ s5 += carry4;
+ s4 -= carry4 * (1 << 21);
carry6 = (s6 + (1 << 20)) >> 21;
s7 += carry6;
s6 -= carry6 * (1 << 21);
carry8 = (s8 + (1 << 20)) >> 21;
- s9 += carry8;
- s8 -= carry8 * (1 << 21);
+ s9 += carry8;
+ s8 -= carry8 * (1 << 21);
carry10 = (s10 + (1 << 20)) >> 21;
s11 += carry10;
s10 -= carry10 * (1 << 21);
carry1 = (s1 + (1 << 20)) >> 21;
- s2 += carry1;
- s1 -= carry1 * (1 << 21);
+ s2 += carry1;
+ s1 -= carry1 * (1 << 21);
carry3 = (s3 + (1 << 20)) >> 21;
- s4 += carry3;
- s3 -= carry3 * (1 << 21);
+ s4 += carry3;
+ s3 -= carry3 * (1 << 21);
carry5 = (s5 + (1 << 20)) >> 21;
- s6 += carry5;
- s5 -= carry5 * (1 << 21);
+ s6 += carry5;
+ s5 -= carry5 * (1 << 21);
carry7 = (s7 + (1 << 20)) >> 21;
- s8 += carry7;
- s7 -= carry7 * (1 << 21);
+ s8 += carry7;
+ s7 -= carry7 * (1 << 21);
carry9 = (s9 + (1 << 20)) >> 21;
s10 += carry9;
- s9 -= carry9 * (1 << 21);
+ s9 -= carry9 * (1 << 21);
carry11 = (s11 + (1 << 20)) >> 21;
s12 += carry11;
s11 -= carry11 * (1 << 21);
- s0 += s12 * 666643;
- s1 += s12 * 470296;
- s2 += s12 * 654183;
- s3 -= s12 * 997805;
- s4 += s12 * 136657;
- s5 -= s12 * 683901;
- s12 = 0;
+ s0 += s12 * 666643;
+ s1 += s12 * 470296;
+ s2 += s12 * 654183;
+ s3 -= s12 * 997805;
+ s4 += s12 * 136657;
+ s5 -= s12 * 683901;
+ s12 = 0;
carry0 = s0 >> 21;
- s1 += carry0;
- s0 -= carry0 * (1 << 21);
+ s1 += carry0;
+ s0 -= carry0 * (1 << 21);
carry1 = s1 >> 21;
- s2 += carry1;
- s1 -= carry1 * (1 << 21);
+ s2 += carry1;
+ s1 -= carry1 * (1 << 21);
carry2 = s2 >> 21;
- s3 += carry2;
- s2 -= carry2 * (1 << 21);
+ s3 += carry2;
+ s2 -= carry2 * (1 << 21);
carry3 = s3 >> 21;
- s4 += carry3;
- s3 -= carry3 * (1 << 21);
+ s4 += carry3;
+ s3 -= carry3 * (1 << 21);
carry4 = s4 >> 21;
- s5 += carry4;
- s4 -= carry4 * (1 << 21);
+ s5 += carry4;
+ s4 -= carry4 * (1 << 21);
carry5 = s5 >> 21;
- s6 += carry5;
- s5 -= carry5 * (1 << 21);
+ s6 += carry5;
+ s5 -= carry5 * (1 << 21);
carry6 = s6 >> 21;
- s7 += carry6;
- s6 -= carry6 * (1 << 21);
+ s7 += carry6;
+ s6 -= carry6 * (1 << 21);
carry7 = s7 >> 21;
- s8 += carry7;
- s7 -= carry7 * (1 << 21);
+ s8 += carry7;
+ s7 -= carry7 * (1 << 21);
carry8 = s8 >> 21;
- s9 += carry8;
- s8 -= carry8 * (1 << 21);
+ s9 += carry8;
+ s8 -= carry8 * (1 << 21);
carry9 = s9 >> 21;
s10 += carry9;
- s9 -= carry9 * (1 << 21);
+ s9 -= carry9 * (1 << 21);
carry10 = s10 >> 21;
s11 += carry10;
s10 -= carry10 * (1 << 21);
@@ -4875,80 +5029,80 @@ static void x25519_sc_reduce(uint8_t *s)
s12 += carry11;
s11 -= carry11 * (1 << 21);
- s0 += s12 * 666643;
- s1 += s12 * 470296;
- s2 += s12 * 654183;
- s3 -= s12 * 997805;
- s4 += s12 * 136657;
- s5 -= s12 * 683901;
- s12 = 0;
+ s0 += s12 * 666643;
+ s1 += s12 * 470296;
+ s2 += s12 * 654183;
+ s3 -= s12 * 997805;
+ s4 += s12 * 136657;
+ s5 -= s12 * 683901;
+ s12 = 0;
carry0 = s0 >> 21;
- s1 += carry0;
- s0 -= carry0 * (1 << 21);
+ s1 += carry0;
+ s0 -= carry0 * (1 << 21);
carry1 = s1 >> 21;
- s2 += carry1;
- s1 -= carry1 * (1 << 21);
+ s2 += carry1;
+ s1 -= carry1 * (1 << 21);
carry2 = s2 >> 21;
- s3 += carry2;
- s2 -= carry2 * (1 << 21);
+ s3 += carry2;
+ s2 -= carry2 * (1 << 21);
carry3 = s3 >> 21;
- s4 += carry3;
- s3 -= carry3 * (1 << 21);
+ s4 += carry3;
+ s3 -= carry3 * (1 << 21);
carry4 = s4 >> 21;
- s5 += carry4;
- s4 -= carry4 * (1 << 21);
+ s5 += carry4;
+ s4 -= carry4 * (1 << 21);
carry5 = s5 >> 21;
- s6 += carry5;
- s5 -= carry5 * (1 << 21);
+ s6 += carry5;
+ s5 -= carry5 * (1 << 21);
carry6 = s6 >> 21;
- s7 += carry6;
- s6 -= carry6 * (1 << 21);
+ s7 += carry6;
+ s6 -= carry6 * (1 << 21);
carry7 = s7 >> 21;
- s8 += carry7;
- s7 -= carry7 * (1 << 21);
+ s8 += carry7;
+ s7 -= carry7 * (1 << 21);
carry8 = s8 >> 21;
- s9 += carry8;
- s8 -= carry8 * (1 << 21);
+ s9 += carry8;
+ s8 -= carry8 * (1 << 21);
carry9 = s9 >> 21;
s10 += carry9;
- s9 -= carry9 * (1 << 21);
+ s9 -= carry9 * (1 << 21);
carry10 = s10 >> 21;
s11 += carry10;
s10 -= carry10 * (1 << 21);
- s[ 0] = (uint8_t) (s0 >> 0);
- s[ 1] = (uint8_t) (s0 >> 8);
- s[ 2] = (uint8_t)((s0 >> 16) | (s1 << 5));
- s[ 3] = (uint8_t) (s1 >> 3);
- s[ 4] = (uint8_t) (s1 >> 11);
- s[ 5] = (uint8_t)((s1 >> 19) | (s2 << 2));
- s[ 6] = (uint8_t) (s2 >> 6);
- s[ 7] = (uint8_t)((s2 >> 14) | (s3 << 7));
- s[ 8] = (uint8_t) (s3 >> 1);
- s[ 9] = (uint8_t) (s3 >> 9);
- s[10] = (uint8_t)((s3 >> 17) | (s4 << 4));
- s[11] = (uint8_t) (s4 >> 4);
- s[12] = (uint8_t) (s4 >> 12);
- s[13] = (uint8_t)((s4 >> 20) | (s5 << 1));
- s[14] = (uint8_t) (s5 >> 7);
- s[15] = (uint8_t)((s5 >> 15) | (s6 << 6));
- s[16] = (uint8_t) (s6 >> 2);
- s[17] = (uint8_t) (s6 >> 10);
- s[18] = (uint8_t)((s6 >> 18) | (s7 << 3));
- s[19] = (uint8_t) (s7 >> 5);
- s[20] = (uint8_t) (s7 >> 13);
- s[21] = (uint8_t) (s8 >> 0);
- s[22] = (uint8_t) (s8 >> 8);
- s[23] = (uint8_t)((s8 >> 16) | (s9 << 5));
- s[24] = (uint8_t) (s9 >> 3);
- s[25] = (uint8_t) (s9 >> 11);
- s[26] = (uint8_t)((s9 >> 19) | (s10 << 2));
- s[27] = (uint8_t) (s10 >> 6);
- s[28] = (uint8_t)((s10 >> 14) | (s11 << 7));
- s[29] = (uint8_t) (s11 >> 1);
- s[30] = (uint8_t) (s11 >> 9);
- s[31] = (uint8_t) (s11 >> 17);
+ s[0] = (uint8_t)(s0 >> 0);
+ s[1] = (uint8_t)(s0 >> 8);
+ s[2] = (uint8_t)((s0 >> 16) | (s1 << 5));
+ s[3] = (uint8_t)(s1 >> 3);
+ s[4] = (uint8_t)(s1 >> 11);
+ s[5] = (uint8_t)((s1 >> 19) | (s2 << 2));
+ s[6] = (uint8_t)(s2 >> 6);
+ s[7] = (uint8_t)((s2 >> 14) | (s3 << 7));
+ s[8] = (uint8_t)(s3 >> 1);
+ s[9] = (uint8_t)(s3 >> 9);
+ s[10] = (uint8_t)((s3 >> 17) | (s4 << 4));
+ s[11] = (uint8_t)(s4 >> 4);
+ s[12] = (uint8_t)(s4 >> 12);
+ s[13] = (uint8_t)((s4 >> 20) | (s5 << 1));
+ s[14] = (uint8_t)(s5 >> 7);
+ s[15] = (uint8_t)((s5 >> 15) | (s6 << 6));
+ s[16] = (uint8_t)(s6 >> 2);
+ s[17] = (uint8_t)(s6 >> 10);
+ s[18] = (uint8_t)((s6 >> 18) | (s7 << 3));
+ s[19] = (uint8_t)(s7 >> 5);
+ s[20] = (uint8_t)(s7 >> 13);
+ s[21] = (uint8_t)(s8 >> 0);
+ s[22] = (uint8_t)(s8 >> 8);
+ s[23] = (uint8_t)((s8 >> 16) | (s9 << 5));
+ s[24] = (uint8_t)(s9 >> 3);
+ s[25] = (uint8_t)(s9 >> 11);
+ s[26] = (uint8_t)((s9 >> 19) | (s10 << 2));
+ s[27] = (uint8_t)(s10 >> 6);
+ s[28] = (uint8_t)((s10 >> 14) | (s11 << 7));
+ s[29] = (uint8_t)(s11 >> 1);
+ s[30] = (uint8_t)(s11 >> 9);
+ s[31] = (uint8_t)(s11 >> 17);
}
/*
@@ -4962,44 +5116,44 @@ static void x25519_sc_reduce(uint8_t *s)
* where l = 2^252 + 27742317777372353535851937790883648493.
*/
static void sc_muladd(uint8_t *s, const uint8_t *a, const uint8_t *b,
- const uint8_t *c)
+ const uint8_t *c)
{
- int64_t a0 = kBottom21Bits & load_3(a);
- int64_t a1 = kBottom21Bits & (load_4(a + 2) >> 5);
- int64_t a2 = kBottom21Bits & (load_3(a + 5) >> 2);
- int64_t a3 = kBottom21Bits & (load_4(a + 7) >> 7);
- int64_t a4 = kBottom21Bits & (load_4(a + 10) >> 4);
- int64_t a5 = kBottom21Bits & (load_3(a + 13) >> 1);
- int64_t a6 = kBottom21Bits & (load_4(a + 15) >> 6);
- int64_t a7 = kBottom21Bits & (load_3(a + 18) >> 3);
- int64_t a8 = kBottom21Bits & load_3(a + 21);
- int64_t a9 = kBottom21Bits & (load_4(a + 23) >> 5);
+ int64_t a0 = kBottom21Bits & load_3(a);
+ int64_t a1 = kBottom21Bits & (load_4(a + 2) >> 5);
+ int64_t a2 = kBottom21Bits & (load_3(a + 5) >> 2);
+ int64_t a3 = kBottom21Bits & (load_4(a + 7) >> 7);
+ int64_t a4 = kBottom21Bits & (load_4(a + 10) >> 4);
+ int64_t a5 = kBottom21Bits & (load_3(a + 13) >> 1);
+ int64_t a6 = kBottom21Bits & (load_4(a + 15) >> 6);
+ int64_t a7 = kBottom21Bits & (load_3(a + 18) >> 3);
+ int64_t a8 = kBottom21Bits & load_3(a + 21);
+ int64_t a9 = kBottom21Bits & (load_4(a + 23) >> 5);
int64_t a10 = kBottom21Bits & (load_3(a + 26) >> 2);
- int64_t a11 = (load_4(a + 28) >> 7);
- int64_t b0 = kBottom21Bits & load_3(b);
- int64_t b1 = kBottom21Bits & (load_4(b + 2) >> 5);
- int64_t b2 = kBottom21Bits & (load_3(b + 5) >> 2);
- int64_t b3 = kBottom21Bits & (load_4(b + 7) >> 7);
- int64_t b4 = kBottom21Bits & (load_4(b + 10) >> 4);
- int64_t b5 = kBottom21Bits & (load_3(b + 13) >> 1);
- int64_t b6 = kBottom21Bits & (load_4(b + 15) >> 6);
- int64_t b7 = kBottom21Bits & (load_3(b + 18) >> 3);
- int64_t b8 = kBottom21Bits & load_3(b + 21);
- int64_t b9 = kBottom21Bits & (load_4(b + 23) >> 5);
+ int64_t a11 = (load_4(a + 28) >> 7);
+ int64_t b0 = kBottom21Bits & load_3(b);
+ int64_t b1 = kBottom21Bits & (load_4(b + 2) >> 5);
+ int64_t b2 = kBottom21Bits & (load_3(b + 5) >> 2);
+ int64_t b3 = kBottom21Bits & (load_4(b + 7) >> 7);
+ int64_t b4 = kBottom21Bits & (load_4(b + 10) >> 4);
+ int64_t b5 = kBottom21Bits & (load_3(b + 13) >> 1);
+ int64_t b6 = kBottom21Bits & (load_4(b + 15) >> 6);
+ int64_t b7 = kBottom21Bits & (load_3(b + 18) >> 3);
+ int64_t b8 = kBottom21Bits & load_3(b + 21);
+ int64_t b9 = kBottom21Bits & (load_4(b + 23) >> 5);
int64_t b10 = kBottom21Bits & (load_3(b + 26) >> 2);
- int64_t b11 = (load_4(b + 28) >> 7);
- int64_t c0 = kBottom21Bits & load_3(c);
- int64_t c1 = kBottom21Bits & (load_4(c + 2) >> 5);
- int64_t c2 = kBottom21Bits & (load_3(c + 5) >> 2);
- int64_t c3 = kBottom21Bits & (load_4(c + 7) >> 7);
- int64_t c4 = kBottom21Bits & (load_4(c + 10) >> 4);
- int64_t c5 = kBottom21Bits & (load_3(c + 13) >> 1);
- int64_t c6 = kBottom21Bits & (load_4(c + 15) >> 6);
- int64_t c7 = kBottom21Bits & (load_3(c + 18) >> 3);
- int64_t c8 = kBottom21Bits & load_3(c + 21);
- int64_t c9 = kBottom21Bits & (load_4(c + 23) >> 5);
+ int64_t b11 = (load_4(b + 28) >> 7);
+ int64_t c0 = kBottom21Bits & load_3(c);
+ int64_t c1 = kBottom21Bits & (load_4(c + 2) >> 5);
+ int64_t c2 = kBottom21Bits & (load_3(c + 5) >> 2);
+ int64_t c3 = kBottom21Bits & (load_4(c + 7) >> 7);
+ int64_t c4 = kBottom21Bits & (load_4(c + 10) >> 4);
+ int64_t c5 = kBottom21Bits & (load_3(c + 13) >> 1);
+ int64_t c6 = kBottom21Bits & (load_4(c + 15) >> 6);
+ int64_t c7 = kBottom21Bits & (load_3(c + 18) >> 3);
+ int64_t c8 = kBottom21Bits & load_3(c + 21);
+ int64_t c9 = kBottom21Bits & (load_4(c + 23) >> 5);
int64_t c10 = kBottom21Bits & (load_3(c + 26) >> 2);
- int64_t c11 = (load_4(c + 28) >> 7);
+ int64_t c11 = (load_4(c + 28) >> 7);
int64_t s0;
int64_t s1;
int64_t s2;
@@ -5048,46 +5202,46 @@ static void sc_muladd(uint8_t *s, const uint8_t *a, const uint8_t *b,
int64_t carry21;
int64_t carry22;
- s0 = c0 + a0 * b0;
- s1 = c1 + a0 * b1 + a1 * b0;
- s2 = c2 + a0 * b2 + a1 * b1 + a2 * b0;
- s3 = c3 + a0 * b3 + a1 * b2 + a2 * b1 + a3 * b0;
- s4 = c4 + a0 * b4 + a1 * b3 + a2 * b2 + a3 * b1 + a4 * b0;
- s5 = c5 + a0 * b5 + a1 * b4 + a2 * b3 + a3 * b2 + a4 * b1 + a5 * b0;
- s6 = c6 + a0 * b6 + a1 * b5 + a2 * b4 + a3 * b3 + a4 * b2 + a5 * b1 + a6 * b0;
- s7 = c7 + a0 * b7 + a1 * b6 + a2 * b5 + a3 * b4 + a4 * b3 + a5 * b2 + a6 * b1 + a7 * b0;
- s8 = c8 + a0 * b8 + a1 * b7 + a2 * b6 + a3 * b5 + a4 * b4 + a5 * b3 + a6 * b2 + a7 * b1 + a8 * b0;
- s9 = c9 + a0 * b9 + a1 * b8 + a2 * b7 + a3 * b6 + a4 * b5 + a5 * b4 + a6 * b3 + a7 * b2 + a8 * b1 + a9 * b0;
- s10 = c10 + a0 * b10 + a1 * b9 + a2 * b8 + a3 * b7 + a4 * b6 + a5 * b5 + a6 * b4 + a7 * b3 + a8 * b2 + a9 * b1 + a10 * b0;
- s11 = c11 + a0 * b11 + a1 * b10 + a2 * b9 + a3 * b8 + a4 * b7 + a5 * b6 + a6 * b5 + a7 * b4 + a8 * b3 + a9 * b2 + a10 * b1 + a11 * b0;
- s12 = a1 * b11 + a2 * b10 + a3 * b9 + a4 * b8 + a5 * b7 + a6 * b6 + a7 * b5 + a8 * b4 + a9 * b3 + a10 * b2 + a11 * b1;
- s13 = a2 * b11 + a3 * b10 + a4 * b9 + a5 * b8 + a6 * b7 + a7 * b6 + a8 * b5 + a9 * b4 + a10 * b3 + a11 * b2;
- s14 = a3 * b11 + a4 * b10 + a5 * b9 + a6 * b8 + a7 * b7 + a8 * b6 + a9 * b5 + a10 * b4 + a11 * b3;
- s15 = a4 * b11 + a5 * b10 + a6 * b9 + a7 * b8 + a8 * b7 + a9 * b6 + a10 * b5 + a11 * b4;
- s16 = a5 * b11 + a6 * b10 + a7 * b9 + a8 * b8 + a9 * b7 + a10 * b6 + a11 * b5;
- s17 = a6 * b11 + a7 * b10 + a8 * b9 + a9 * b8 + a10 * b7 + a11 * b6;
- s18 = a7 * b11 + a8 * b10 + a9 * b9 + a10 * b8 + a11 * b7;
- s19 = a8 * b11 + a9 * b10 + a10 * b9 + a11 * b8;
- s20 = a9 * b11 + a10 * b10 + a11 * b9;
- s21 = a10 * b11 + a11 * b10;
- s22 = a11 * b11;
- s23 = 0;
+ s0 = c0 + a0 * b0;
+ s1 = c1 + a0 * b1 + a1 * b0;
+ s2 = c2 + a0 * b2 + a1 * b1 + a2 * b0;
+ s3 = c3 + a0 * b3 + a1 * b2 + a2 * b1 + a3 * b0;
+ s4 = c4 + a0 * b4 + a1 * b3 + a2 * b2 + a3 * b1 + a4 * b0;
+ s5 = c5 + a0 * b5 + a1 * b4 + a2 * b3 + a3 * b2 + a4 * b1 + a5 * b0;
+ s6 = c6 + a0 * b6 + a1 * b5 + a2 * b4 + a3 * b3 + a4 * b2 + a5 * b1 + a6 * b0;
+ s7 = c7 + a0 * b7 + a1 * b6 + a2 * b5 + a3 * b4 + a4 * b3 + a5 * b2 + a6 * b1 + a7 * b0;
+ s8 = c8 + a0 * b8 + a1 * b7 + a2 * b6 + a3 * b5 + a4 * b4 + a5 * b3 + a6 * b2 + a7 * b1 + a8 * b0;
+ s9 = c9 + a0 * b9 + a1 * b8 + a2 * b7 + a3 * b6 + a4 * b5 + a5 * b4 + a6 * b3 + a7 * b2 + a8 * b1 + a9 * b0;
+ s10 = c10 + a0 * b10 + a1 * b9 + a2 * b8 + a3 * b7 + a4 * b6 + a5 * b5 + a6 * b4 + a7 * b3 + a8 * b2 + a9 * b1 + a10 * b0;
+ s11 = c11 + a0 * b11 + a1 * b10 + a2 * b9 + a3 * b8 + a4 * b7 + a5 * b6 + a6 * b5 + a7 * b4 + a8 * b3 + a9 * b2 + a10 * b1 + a11 * b0;
+ s12 = a1 * b11 + a2 * b10 + a3 * b9 + a4 * b8 + a5 * b7 + a6 * b6 + a7 * b5 + a8 * b4 + a9 * b3 + a10 * b2 + a11 * b1;
+ s13 = a2 * b11 + a3 * b10 + a4 * b9 + a5 * b8 + a6 * b7 + a7 * b6 + a8 * b5 + a9 * b4 + a10 * b3 + a11 * b2;
+ s14 = a3 * b11 + a4 * b10 + a5 * b9 + a6 * b8 + a7 * b7 + a8 * b6 + a9 * b5 + a10 * b4 + a11 * b3;
+ s15 = a4 * b11 + a5 * b10 + a6 * b9 + a7 * b8 + a8 * b7 + a9 * b6 + a10 * b5 + a11 * b4;
+ s16 = a5 * b11 + a6 * b10 + a7 * b9 + a8 * b8 + a9 * b7 + a10 * b6 + a11 * b5;
+ s17 = a6 * b11 + a7 * b10 + a8 * b9 + a9 * b8 + a10 * b7 + a11 * b6;
+ s18 = a7 * b11 + a8 * b10 + a9 * b9 + a10 * b8 + a11 * b7;
+ s19 = a8 * b11 + a9 * b10 + a10 * b9 + a11 * b8;
+ s20 = a9 * b11 + a10 * b10 + a11 * b9;
+ s21 = a10 * b11 + a11 * b10;
+ s22 = a11 * b11;
+ s23 = 0;
carry0 = (s0 + (1 << 20)) >> 21;
- s1 += carry0;
- s0 -= carry0 * (1 << 21);
+ s1 += carry0;
+ s0 -= carry0 * (1 << 21);
carry2 = (s2 + (1 << 20)) >> 21;
- s3 += carry2;
- s2 -= carry2 * (1 << 21);
+ s3 += carry2;
+ s2 -= carry2 * (1 << 21);
carry4 = (s4 + (1 << 20)) >> 21;
- s5 += carry4;
- s4 -= carry4 * (1 << 21);
+ s5 += carry4;
+ s4 -= carry4 * (1 << 21);
carry6 = (s6 + (1 << 20)) >> 21;
- s7 += carry6;
- s6 -= carry6 * (1 << 21);
+ s7 += carry6;
+ s6 -= carry6 * (1 << 21);
carry8 = (s8 + (1 << 20)) >> 21;
- s9 += carry8;
- s8 -= carry8 * (1 << 21);
+ s9 += carry8;
+ s8 -= carry8 * (1 << 21);
carry10 = (s10 + (1 << 20)) >> 21;
s11 += carry10;
s10 -= carry10 * (1 << 21);
@@ -5111,20 +5265,20 @@ static void sc_muladd(uint8_t *s, const uint8_t *a, const uint8_t *b,
s22 -= carry22 * (1 << 21);
carry1 = (s1 + (1 << 20)) >> 21;
- s2 += carry1;
- s1 -= carry1 * (1 << 21);
+ s2 += carry1;
+ s1 -= carry1 * (1 << 21);
carry3 = (s3 + (1 << 20)) >> 21;
- s4 += carry3;
- s3 -= carry3 * (1 << 21);
+ s4 += carry3;
+ s3 -= carry3 * (1 << 21);
carry5 = (s5 + (1 << 20)) >> 21;
- s6 += carry5;
- s5 -= carry5 * (1 << 21);
+ s6 += carry5;
+ s5 -= carry5 * (1 << 21);
carry7 = (s7 + (1 << 20)) >> 21;
- s8 += carry7;
- s7 -= carry7 * (1 << 21);
+ s8 += carry7;
+ s7 -= carry7 * (1 << 21);
carry9 = (s9 + (1 << 20)) >> 21;
s10 += carry9;
- s9 -= carry9 * (1 << 21);
+ s9 -= carry9 * (1 << 21);
carry11 = (s11 + (1 << 20)) >> 21;
s12 += carry11;
s11 -= carry11 * (1 << 21);
@@ -5150,7 +5304,7 @@ static void sc_muladd(uint8_t *s, const uint8_t *a, const uint8_t *b,
s14 -= s23 * 997805;
s15 += s23 * 136657;
s16 -= s23 * 683901;
- s23 = 0;
+ s23 = 0;
s10 += s22 * 666643;
s11 += s22 * 470296;
@@ -5158,46 +5312,46 @@ static void sc_muladd(uint8_t *s, const uint8_t *a, const uint8_t *b,
s13 -= s22 * 997805;
s14 += s22 * 136657;
s15 -= s22 * 683901;
- s22 = 0;
+ s22 = 0;
- s9 += s21 * 666643;
+ s9 += s21 * 666643;
s10 += s21 * 470296;
s11 += s21 * 654183;
s12 -= s21 * 997805;
s13 += s21 * 136657;
s14 -= s21 * 683901;
- s21 = 0;
+ s21 = 0;
- s8 += s20 * 666643;
- s9 += s20 * 470296;
+ s8 += s20 * 666643;
+ s9 += s20 * 470296;
s10 += s20 * 654183;
s11 -= s20 * 997805;
s12 += s20 * 136657;
s13 -= s20 * 683901;
- s20 = 0;
+ s20 = 0;
- s7 += s19 * 666643;
- s8 += s19 * 470296;
- s9 += s19 * 654183;
+ s7 += s19 * 666643;
+ s8 += s19 * 470296;
+ s9 += s19 * 654183;
s10 -= s19 * 997805;
s11 += s19 * 136657;
s12 -= s19 * 683901;
- s19 = 0;
+ s19 = 0;
- s6 += s18 * 666643;
- s7 += s18 * 470296;
- s8 += s18 * 654183;
- s9 -= s18 * 997805;
+ s6 += s18 * 666643;
+ s7 += s18 * 470296;
+ s8 += s18 * 654183;
+ s9 -= s18 * 997805;
s10 += s18 * 136657;
s11 -= s18 * 683901;
- s18 = 0;
+ s18 = 0;
carry6 = (s6 + (1 << 20)) >> 21;
- s7 += carry6;
- s6 -= carry6 * (1 << 21);
+ s7 += carry6;
+ s6 -= carry6 * (1 << 21);
carry8 = (s8 + (1 << 20)) >> 21;
- s9 += carry8;
- s8 -= carry8 * (1 << 21);
+ s9 += carry8;
+ s8 -= carry8 * (1 << 21);
carry10 = (s10 + (1 << 20)) >> 21;
s11 += carry10;
s10 -= carry10 * (1 << 21);
@@ -5212,11 +5366,11 @@ static void sc_muladd(uint8_t *s, const uint8_t *a, const uint8_t *b,
s16 -= carry16 * (1 << 21);
carry7 = (s7 + (1 << 20)) >> 21;
- s8 += carry7;
- s7 -= carry7 * (1 << 21);
+ s8 += carry7;
+ s7 -= carry7 * (1 << 21);
carry9 = (s9 + (1 << 20)) >> 21;
s10 += carry9;
- s9 -= carry9 * (1 << 21);
+ s9 -= carry9 * (1 << 21);
carry11 = (s11 + (1 << 20)) >> 21;
s12 += carry11;
s11 -= carry11 * (1 << 21);
@@ -5227,130 +5381,130 @@ static void sc_muladd(uint8_t *s, const uint8_t *a, const uint8_t *b,
s16 += carry15;
s15 -= carry15 * (1 << 21);
- s5 += s17 * 666643;
- s6 += s17 * 470296;
- s7 += s17 * 654183;
- s8 -= s17 * 997805;
- s9 += s17 * 136657;
+ s5 += s17 * 666643;
+ s6 += s17 * 470296;
+ s7 += s17 * 654183;
+ s8 -= s17 * 997805;
+ s9 += s17 * 136657;
s10 -= s17 * 683901;
- s17 = 0;
-
- s4 += s16 * 666643;
- s5 += s16 * 470296;
- s6 += s16 * 654183;
- s7 -= s16 * 997805;
- s8 += s16 * 136657;
- s9 -= s16 * 683901;
- s16 = 0;
-
- s3 += s15 * 666643;
- s4 += s15 * 470296;
- s5 += s15 * 654183;
- s6 -= s15 * 997805;
- s7 += s15 * 136657;
- s8 -= s15 * 683901;
- s15 = 0;
-
- s2 += s14 * 666643;
- s3 += s14 * 470296;
- s4 += s14 * 654183;
- s5 -= s14 * 997805;
- s6 += s14 * 136657;
- s7 -= s14 * 683901;
- s14 = 0;
-
- s1 += s13 * 666643;
- s2 += s13 * 470296;
- s3 += s13 * 654183;
- s4 -= s13 * 997805;
- s5 += s13 * 136657;
- s6 -= s13 * 683901;
- s13 = 0;
-
- s0 += s12 * 666643;
- s1 += s12 * 470296;
- s2 += s12 * 654183;
- s3 -= s12 * 997805;
- s4 += s12 * 136657;
- s5 -= s12 * 683901;
+ s17 = 0;
+
+ s4 += s16 * 666643;
+ s5 += s16 * 470296;
+ s6 += s16 * 654183;
+ s7 -= s16 * 997805;
+ s8 += s16 * 136657;
+ s9 -= s16 * 683901;
+ s16 = 0;
+
+ s3 += s15 * 666643;
+ s4 += s15 * 470296;
+ s5 += s15 * 654183;
+ s6 -= s15 * 997805;
+ s7 += s15 * 136657;
+ s8 -= s15 * 683901;
+ s15 = 0;
+
+ s2 += s14 * 666643;
+ s3 += s14 * 470296;
+ s4 += s14 * 654183;
+ s5 -= s14 * 997805;
+ s6 += s14 * 136657;
+ s7 -= s14 * 683901;
+ s14 = 0;
+
+ s1 += s13 * 666643;
+ s2 += s13 * 470296;
+ s3 += s13 * 654183;
+ s4 -= s13 * 997805;
+ s5 += s13 * 136657;
+ s6 -= s13 * 683901;
+ s13 = 0;
+
+ s0 += s12 * 666643;
+ s1 += s12 * 470296;
+ s2 += s12 * 654183;
+ s3 -= s12 * 997805;
+ s4 += s12 * 136657;
+ s5 -= s12 * 683901;
s12 = 0;
carry0 = (s0 + (1 << 20)) >> 21;
- s1 += carry0;
- s0 -= carry0 * (1 << 21);
+ s1 += carry0;
+ s0 -= carry0 * (1 << 21);
carry2 = (s2 + (1 << 20)) >> 21;
- s3 += carry2;
- s2 -= carry2 * (1 << 21);
+ s3 += carry2;
+ s2 -= carry2 * (1 << 21);
carry4 = (s4 + (1 << 20)) >> 21;
- s5 += carry4;
- s4 -= carry4 * (1 << 21);
+ s5 += carry4;
+ s4 -= carry4 * (1 << 21);
carry6 = (s6 + (1 << 20)) >> 21;
- s7 += carry6;
- s6 -= carry6 * (1 << 21);
+ s7 += carry6;
+ s6 -= carry6 * (1 << 21);
carry8 = (s8 + (1 << 20)) >> 21;
- s9 += carry8;
- s8 -= carry8 * (1 << 21);
+ s9 += carry8;
+ s8 -= carry8 * (1 << 21);
carry10 = (s10 + (1 << 20)) >> 21;
s11 += carry10;
s10 -= carry10 * (1 << 21);
carry1 = (s1 + (1 << 20)) >> 21;
- s2 += carry1;
- s1 -= carry1 * (1 << 21);
+ s2 += carry1;
+ s1 -= carry1 * (1 << 21);
carry3 = (s3 + (1 << 20)) >> 21;
- s4 += carry3;
- s3 -= carry3 * (1 << 21);
+ s4 += carry3;
+ s3 -= carry3 * (1 << 21);
carry5 = (s5 + (1 << 20)) >> 21;
- s6 += carry5;
- s5 -= carry5 * (1 << 21);
+ s6 += carry5;
+ s5 -= carry5 * (1 << 21);
carry7 = (s7 + (1 << 20)) >> 21;
- s8 += carry7;
- s7 -= carry7 * (1 << 21);
+ s8 += carry7;
+ s7 -= carry7 * (1 << 21);
carry9 = (s9 + (1 << 20)) >> 21;
s10 += carry9;
- s9 -= carry9 * (1 << 21);
+ s9 -= carry9 * (1 << 21);
carry11 = (s11 + (1 << 20)) >> 21;
s12 += carry11;
s11 -= carry11 * (1 << 21);
- s0 += s12 * 666643;
- s1 += s12 * 470296;
- s2 += s12 * 654183;
- s3 -= s12 * 997805;
- s4 += s12 * 136657;
- s5 -= s12 * 683901;
- s12 = 0;
+ s0 += s12 * 666643;
+ s1 += s12 * 470296;
+ s2 += s12 * 654183;
+ s3 -= s12 * 997805;
+ s4 += s12 * 136657;
+ s5 -= s12 * 683901;
+ s12 = 0;
carry0 = s0 >> 21;
- s1 += carry0;
- s0 -= carry0 * (1 << 21);
+ s1 += carry0;
+ s0 -= carry0 * (1 << 21);
carry1 = s1 >> 21;
- s2 += carry1;
- s1 -= carry1 * (1 << 21);
+ s2 += carry1;
+ s1 -= carry1 * (1 << 21);
carry2 = s2 >> 21;
- s3 += carry2;
- s2 -= carry2 * (1 << 21);
+ s3 += carry2;
+ s2 -= carry2 * (1 << 21);
carry3 = s3 >> 21;
- s4 += carry3;
- s3 -= carry3 * (1 << 21);
+ s4 += carry3;
+ s3 -= carry3 * (1 << 21);
carry4 = s4 >> 21;
- s5 += carry4;
- s4 -= carry4 * (1 << 21);
+ s5 += carry4;
+ s4 -= carry4 * (1 << 21);
carry5 = s5 >> 21;
- s6 += carry5;
- s5 -= carry5 * (1 << 21);
+ s6 += carry5;
+ s5 -= carry5 * (1 << 21);
carry6 = s6 >> 21;
- s7 += carry6;
- s6 -= carry6 * (1 << 21);
+ s7 += carry6;
+ s6 -= carry6 * (1 << 21);
carry7 = s7 >> 21;
- s8 += carry7;
- s7 -= carry7 * (1 << 21);
+ s8 += carry7;
+ s7 -= carry7 * (1 << 21);
carry8 = s8 >> 21;
- s9 += carry8;
- s8 -= carry8 * (1 << 21);
+ s9 += carry8;
+ s8 -= carry8 * (1 << 21);
carry9 = s9 >> 21;
s10 += carry9;
- s9 -= carry9 * (1 << 21);
+ s9 -= carry9 * (1 << 21);
carry10 = s10 >> 21;
s11 += carry10;
s10 -= carry10 * (1 << 21);
@@ -5358,94 +5512,93 @@ static void sc_muladd(uint8_t *s, const uint8_t *a, const uint8_t *b,
s12 += carry11;
s11 -= carry11 * (1 << 21);
- s0 += s12 * 666643;
- s1 += s12 * 470296;
- s2 += s12 * 654183;
- s3 -= s12 * 997805;
- s4 += s12 * 136657;
- s5 -= s12 * 683901;
- s12 = 0;
+ s0 += s12 * 666643;
+ s1 += s12 * 470296;
+ s2 += s12 * 654183;
+ s3 -= s12 * 997805;
+ s4 += s12 * 136657;
+ s5 -= s12 * 683901;
+ s12 = 0;
carry0 = s0 >> 21;
- s1 += carry0;
- s0 -= carry0 * (1 << 21);
+ s1 += carry0;
+ s0 -= carry0 * (1 << 21);
carry1 = s1 >> 21;
- s2 += carry1;
- s1 -= carry1 * (1 << 21);
+ s2 += carry1;
+ s1 -= carry1 * (1 << 21);
carry2 = s2 >> 21;
- s3 += carry2;
- s2 -= carry2 * (1 << 21);
+ s3 += carry2;
+ s2 -= carry2 * (1 << 21);
carry3 = s3 >> 21;
- s4 += carry3;
- s3 -= carry3 * (1 << 21);
+ s4 += carry3;
+ s3 -= carry3 * (1 << 21);
carry4 = s4 >> 21;
- s5 += carry4;
- s4 -= carry4 * (1 << 21);
+ s5 += carry4;
+ s4 -= carry4 * (1 << 21);
carry5 = s5 >> 21;
- s6 += carry5;
- s5 -= carry5 * (1 << 21);
+ s6 += carry5;
+ s5 -= carry5 * (1 << 21);
carry6 = s6 >> 21;
- s7 += carry6;
- s6 -= carry6 * (1 << 21);
+ s7 += carry6;
+ s6 -= carry6 * (1 << 21);
carry7 = s7 >> 21;
- s8 += carry7;
- s7 -= carry7 * (1 << 21);
+ s8 += carry7;
+ s7 -= carry7 * (1 << 21);
carry8 = s8 >> 21;
- s9 += carry8;
- s8 -= carry8 * (1 << 21);
+ s9 += carry8;
+ s8 -= carry8 * (1 << 21);
carry9 = s9 >> 21;
s10 += carry9;
- s9 -= carry9 * (1 << 21);
+ s9 -= carry9 * (1 << 21);
carry10 = s10 >> 21;
s11 += carry10;
s10 -= carry10 * (1 << 21);
- s[ 0] = (uint8_t) (s0 >> 0);
- s[ 1] = (uint8_t) (s0 >> 8);
- s[ 2] = (uint8_t)((s0 >> 16) | (s1 << 5));
- s[ 3] = (uint8_t) (s1 >> 3);
- s[ 4] = (uint8_t) (s1 >> 11);
- s[ 5] = (uint8_t)((s1 >> 19) | (s2 << 2));
- s[ 6] = (uint8_t) (s2 >> 6);
- s[ 7] = (uint8_t)((s2 >> 14) | (s3 << 7));
- s[ 8] = (uint8_t) (s3 >> 1);
- s[ 9] = (uint8_t) (s3 >> 9);
- s[10] = (uint8_t)((s3 >> 17) | (s4 << 4));
- s[11] = (uint8_t) (s4 >> 4);
- s[12] = (uint8_t) (s4 >> 12);
- s[13] = (uint8_t)((s4 >> 20) | (s5 << 1));
- s[14] = (uint8_t) (s5 >> 7);
- s[15] = (uint8_t)((s5 >> 15) | (s6 << 6));
- s[16] = (uint8_t) (s6 >> 2);
- s[17] = (uint8_t) (s6 >> 10);
- s[18] = (uint8_t)((s6 >> 18) | (s7 << 3));
- s[19] = (uint8_t) (s7 >> 5);
- s[20] = (uint8_t) (s7 >> 13);
- s[21] = (uint8_t) (s8 >> 0);
- s[22] = (uint8_t) (s8 >> 8);
- s[23] = (uint8_t)((s8 >> 16) | (s9 << 5));
- s[24] = (uint8_t) (s9 >> 3);
- s[25] = (uint8_t) (s9 >> 11);
- s[26] = (uint8_t)((s9 >> 19) | (s10 << 2));
- s[27] = (uint8_t) (s10 >> 6);
+ s[0] = (uint8_t)(s0 >> 0);
+ s[1] = (uint8_t)(s0 >> 8);
+ s[2] = (uint8_t)((s0 >> 16) | (s1 << 5));
+ s[3] = (uint8_t)(s1 >> 3);
+ s[4] = (uint8_t)(s1 >> 11);
+ s[5] = (uint8_t)((s1 >> 19) | (s2 << 2));
+ s[6] = (uint8_t)(s2 >> 6);
+ s[7] = (uint8_t)((s2 >> 14) | (s3 << 7));
+ s[8] = (uint8_t)(s3 >> 1);
+ s[9] = (uint8_t)(s3 >> 9);
+ s[10] = (uint8_t)((s3 >> 17) | (s4 << 4));
+ s[11] = (uint8_t)(s4 >> 4);
+ s[12] = (uint8_t)(s4 >> 12);
+ s[13] = (uint8_t)((s4 >> 20) | (s5 << 1));
+ s[14] = (uint8_t)(s5 >> 7);
+ s[15] = (uint8_t)((s5 >> 15) | (s6 << 6));
+ s[16] = (uint8_t)(s6 >> 2);
+ s[17] = (uint8_t)(s6 >> 10);
+ s[18] = (uint8_t)((s6 >> 18) | (s7 << 3));
+ s[19] = (uint8_t)(s7 >> 5);
+ s[20] = (uint8_t)(s7 >> 13);
+ s[21] = (uint8_t)(s8 >> 0);
+ s[22] = (uint8_t)(s8 >> 8);
+ s[23] = (uint8_t)((s8 >> 16) | (s9 << 5));
+ s[24] = (uint8_t)(s9 >> 3);
+ s[25] = (uint8_t)(s9 >> 11);
+ s[26] = (uint8_t)((s9 >> 19) | (s10 << 2));
+ s[27] = (uint8_t)(s10 >> 6);
s[28] = (uint8_t)((s10 >> 14) | (s11 << 7));
- s[29] = (uint8_t) (s11 >> 1);
- s[30] = (uint8_t) (s11 >> 9);
- s[31] = (uint8_t) (s11 >> 17);
+ s[29] = (uint8_t)(s11 >> 1);
+ s[30] = (uint8_t)(s11 >> 9);
+ s[31] = (uint8_t)(s11 >> 17);
}
static int hash_init_with_dom(EVP_MD_CTX *hash_ctx,
- EVP_MD *sha512,
- const uint8_t dom2flag,
- const uint8_t phflag,
- const uint8_t *context,
- const size_t context_len)
+ EVP_MD *sha512,
+ const uint8_t dom2flag,
+ const uint8_t phflag,
+ const uint8_t *context,
+ const size_t context_len)
{
/* ASCII: "SigEd25519 no Ed25519 collisions", in hex for EBCDIC compatibility */
- const char dom_s[] =
- "\x53\x69\x67\x45\x64\x32\x35\x35\x31\x39\x20\x6e"
- "\x6f\x20\x45\x64\x32\x35\x35\x31\x39\x20\x63\x6f"
- "\x6c\x6c\x69\x73\x69\x6f\x6e\x73";
+ const char dom_s[] = "\x53\x69\x67\x45\x64\x32\x35\x35\x31\x39\x20\x6e"
+ "\x6f\x20\x45\x64\x32\x35\x35\x31\x39\x20\x63\x6f"
+ "\x6c\x6c\x69\x73\x69\x6f\x6e\x73";
uint8_t dom[2];
if (!EVP_DigestInit_ex(hash_ctx, sha512, NULL))
@@ -5461,7 +5614,7 @@ static int hash_init_with_dom(EVP_MD_CTX *hash_ctx,
dom[0] = (uint8_t)(phflag >= 1 ? 1 : 0);
dom[1] = (uint8_t)context_len;
- if (!EVP_DigestUpdate(hash_ctx, dom_s, sizeof(dom_s)-1)
+ if (!EVP_DigestUpdate(hash_ctx, dom_s, sizeof(dom_s) - 1)
|| !EVP_DigestUpdate(hash_ctx, dom, sizeof(dom))
|| !EVP_DigestUpdate(hash_ctx, context, context_len)) {
return 0;
@@ -5470,12 +5623,11 @@ static int hash_init_with_dom(EVP_MD_CTX *hash_ctx,
return 1;
}
-int
-ossl_ed25519_sign(uint8_t *out_sig, const uint8_t *tbs, size_t tbs_len,
- const uint8_t public_key[32], const uint8_t private_key[32],
- const uint8_t dom2flag, const uint8_t phflag, const uint8_t csflag,
- const uint8_t *context, size_t context_len,
- OSSL_LIB_CTX *libctx, const char *propq)
+int ossl_ed25519_sign(uint8_t *out_sig, const uint8_t *tbs, size_t tbs_len,
+ const uint8_t public_key[32], const uint8_t private_key[32],
+ const uint8_t dom2flag, const uint8_t phflag, const uint8_t csflag,
+ const uint8_t *context, size_t context_len,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
uint8_t az[SHA512_DIGEST_LENGTH];
uint8_t nonce[SHA512_DIGEST_LENGTH];
@@ -5543,8 +5695,7 @@ err:
* does this check internally.
* For some reason the FIPS ACVP requires a EDDSA KeyVer test.
*/
-int
-ossl_ed25519_pubkey_verify(const uint8_t *pub, size_t pub_len)
+int ossl_ed25519_pubkey_verify(const uint8_t *pub, size_t pub_len)
{
ge_p3 A;
@@ -5555,12 +5706,11 @@ ossl_ed25519_pubkey_verify(const uint8_t *pub, size_t pub_len)
static const char allzeroes[15];
-int
-ossl_ed25519_verify(const uint8_t *tbs, size_t tbs_len,
- const uint8_t signature[64], const uint8_t public_key[32],
- const uint8_t dom2flag, const uint8_t phflag, const uint8_t csflag,
- const uint8_t *context, size_t context_len,
- OSSL_LIB_CTX *libctx, const char *propq)
+int ossl_ed25519_verify(const uint8_t *tbs, size_t tbs_len,
+ const uint8_t signature[64], const uint8_t public_key[32],
+ const uint8_t dom2flag, const uint8_t phflag, const uint8_t csflag,
+ const uint8_t *context, size_t context_len,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
int i;
ge_p3 A;
@@ -5661,10 +5811,9 @@ err:
return res;
}
-int
-ossl_ed25519_public_from_private(OSSL_LIB_CTX *ctx, uint8_t out_public_key[32],
- const uint8_t private_key[32],
- const char *propq)
+int ossl_ed25519_public_from_private(OSSL_LIB_CTX *ctx, uint8_t out_public_key[32],
+ const uint8_t private_key[32],
+ const char *propq)
{
uint8_t az[SHA512_DIGEST_LENGTH];
ge_p3 A;
@@ -5692,19 +5841,17 @@ ossl_ed25519_public_from_private(OSSL_LIB_CTX *ctx, uint8_t out_public_key[32],
return 1;
}
-int
-ossl_x25519(uint8_t out_shared_key[32], const uint8_t private_key[32],
- const uint8_t peer_public_value[32])
+int ossl_x25519(uint8_t out_shared_key[32], const uint8_t private_key[32],
+ const uint8_t peer_public_value[32])
{
- static const uint8_t kZeros[32] = {0};
+ static const uint8_t kZeros[32] = { 0 };
x25519_scalar_mult(out_shared_key, private_key, peer_public_value);
/* The all-zero output results when the input is a point of small order. */
return CRYPTO_memcmp(kZeros, out_shared_key, 32) != 0;
}
-void
-ossl_x25519_public_from_private(uint8_t out_public_value[32],
- const uint8_t private_key[32])
+void ossl_x25519_public_from_private(uint8_t out_public_value[32],
+ const uint8_t private_key[32])
{
uint8_t e[32];
ge_p3 A;
diff --git a/crypto/ec/curve448/arch_32/arch_intrinsics.h b/crypto/ec/curve448/arch_32/arch_intrinsics.h
index 7a54903ac9..6a2bf46a53 100644
--- a/crypto/ec/curve448/arch_32/arch_intrinsics.h
+++ b/crypto/ec/curve448/arch_32/arch_intrinsics.h
@@ -11,17 +11,17 @@
*/
#ifndef OSSL_CRYPTO_EC_CURVE448_ARCH_32_INTRINSICS_H
-# define OSSL_CRYPTO_EC_CURVE448_ARCH_32_INTRINSICS_H
+#define OSSL_CRYPTO_EC_CURVE448_ARCH_32_INTRINSICS_H
#include "internal/constant_time.h"
-# define ARCH_WORD_BITS 32
+#define ARCH_WORD_BITS 32
-#define word_is_zero(a) constant_time_is_zero_32(a)
+#define word_is_zero(a) constant_time_is_zero_32(a)
static ossl_inline uint64_t widemul(uint32_t a, uint32_t b)
{
return ((uint64_t)a) * b;
}
-#endif /* OSSL_CRYPTO_EC_CURVE448_ARCH_32_INTRINSICS_H */
+#endif /* OSSL_CRYPTO_EC_CURVE448_ARCH_32_INTRINSICS_H */
diff --git a/crypto/ec/curve448/arch_32/f_impl.h b/crypto/ec/curve448/arch_32/f_impl.h
index 5cd25c04e1..017844c11d 100644
--- a/crypto/ec/curve448/arch_32/f_impl.h
+++ b/crypto/ec/curve448/arch_32/f_impl.h
@@ -11,14 +11,18 @@
*/
#ifndef OSSL_CRYPTO_EC_CURVE448_ARCH_32_F_IMPL_H
-# define OSSL_CRYPTO_EC_CURVE448_ARCH_32_F_IMPL_H
+#define OSSL_CRYPTO_EC_CURVE448_ARCH_32_F_IMPL_H
-# define GF_HEADROOM 2
-# define LIMB(x) ((x) & ((1 << 28) - 1)), ((x) >> 28)
-# define FIELD_LITERAL(a, b, c, d, e, f, g, h) \
- {{LIMB(a), LIMB(b), LIMB(c), LIMB(d), LIMB(e), LIMB(f), LIMB(g), LIMB(h)}}
+#define GF_HEADROOM 2
+#define LIMB(x) ((x) & ((1 << 28) - 1)), ((x) >> 28)
+#define FIELD_LITERAL(a, b, c, d, e, f, g, h) \
+ { \
+ { \
+ LIMB(a), LIMB(b), LIMB(c), LIMB(d), LIMB(e), LIMB(f), LIMB(g), LIMB(h) \
+ } \
+ }
-# define LIMB_PLACE_VALUE(i) 28
+#define LIMB_PLACE_VALUE(i) 28
void gf_add_RAW(gf out, const gf a, const gf b)
{
@@ -57,4 +61,4 @@ void gf_weak_reduce(gf a)
a->limb[0] = (a->limb[0] & mask) + tmp;
}
-#endif /* OSSL_CRYPTO_EC_CURVE448_ARCH_32_F_IMPL_H */
+#endif /* OSSL_CRYPTO_EC_CURVE448_ARCH_32_F_IMPL_H */
diff --git a/crypto/ec/curve448/arch_32/f_impl32.c b/crypto/ec/curve448/arch_32/f_impl32.c
index 140c73c64f..783344f7d3 100644
--- a/crypto/ec/curve448/arch_32/f_impl32.c
+++ b/crypto/ec/curve448/arch_32/f_impl32.c
@@ -19,9 +19,9 @@
NON_EMPTY_TRANSLATION_UNIT
#else
-# include "../field.h"
+#include "../field.h"
-void ossl_gf_mul(gf_s * RESTRICT cs, const gf as, const gf bs)
+void ossl_gf_mul(gf_s *RESTRICT cs, const gf as, const gf bs)
{
const uint32_t *a = as->limb, *b = bs->limb;
uint32_t *c = cs->limb;
@@ -70,7 +70,7 @@ void ossl_gf_mul(gf_s * RESTRICT cs, const gf as, const gf bs)
c[1] += ((uint32_t)(accum1));
}
-void ossl_gf_mulw_unsigned(gf_s * RESTRICT cs, const gf as, uint32_t b)
+void ossl_gf_mulw_unsigned(gf_s *RESTRICT cs, const gf as, uint32_t b)
{
const uint32_t *a = as->limb;
uint32_t *c = cs->limb;
@@ -98,8 +98,8 @@ void ossl_gf_mulw_unsigned(gf_s * RESTRICT cs, const gf as, uint32_t b)
c[1] += (uint32_t)(accum8 >> 28);
}
-void ossl_gf_sqr(gf_s * RESTRICT cs, const gf as)
+void ossl_gf_sqr(gf_s *RESTRICT cs, const gf as)
{
- ossl_gf_mul(cs, as, as); /* Performs better with a dedicated square */
+ ossl_gf_mul(cs, as, as); /* Performs better with a dedicated square */
}
#endif
diff --git a/crypto/ec/curve448/arch_64/arch_intrinsics.h b/crypto/ec/curve448/arch_64/arch_intrinsics.h
index e12b8cf226..09f0fdf34e 100644
--- a/crypto/ec/curve448/arch_64/arch_intrinsics.h
+++ b/crypto/ec/curve448/arch_64/arch_intrinsics.h
@@ -11,17 +11,17 @@
*/
#ifndef OSSL_CRYPTO_EC_CURVE448_ARCH_64_INTRINSICS_H
-# define OSSL_CRYPTO_EC_CURVE448_ARCH_64_INTRINSICS_H
+#define OSSL_CRYPTO_EC_CURVE448_ARCH_64_INTRINSICS_H
-# include "internal/constant_time.h"
+#include "internal/constant_time.h"
-# define ARCH_WORD_BITS 64
+#define ARCH_WORD_BITS 64
-# define word_is_zero(a) constant_time_is_zero_64(a)
+#define word_is_zero(a) constant_time_is_zero_64(a)
static ossl_inline uint128_t widemul(uint64_t a, uint64_t b)
{
- return ((uint128_t) a) * b;
+ return ((uint128_t)a) * b;
}
-#endif /* OSSL_CRYPTO_EC_CURVE448_ARCH_64_INTRINSICS_H */
+#endif /* OSSL_CRYPTO_EC_CURVE448_ARCH_64_INTRINSICS_H */
diff --git a/crypto/ec/curve448/arch_64/f_impl.h b/crypto/ec/curve448/arch_64/f_impl.h
index faaeb8d994..3e27820171 100644
--- a/crypto/ec/curve448/arch_64/f_impl.h
+++ b/crypto/ec/curve448/arch_64/f_impl.h
@@ -11,12 +11,17 @@
*/
#ifndef OSSL_CRYPTO_EC_CURVE448_ARCH_64_F_IMPL_H
-# define OSSL_CRYPTO_EC_CURVE448_ARCH_64_F_IMPL_H
+#define OSSL_CRYPTO_EC_CURVE448_ARCH_64_F_IMPL_H
-# define GF_HEADROOM 9999 /* Everything is reduced anyway */
-# define FIELD_LITERAL(a,b,c,d,e,f,g,h) {{a,b,c,d,e,f,g,h}}
+#define GF_HEADROOM 9999 /* Everything is reduced anyway */
+#define FIELD_LITERAL(a, b, c, d, e, f, g, h) \
+ { \
+ { \
+ a, b, c, d, e, f, g, h \
+ } \
+ }
-# define LIMB_PLACE_VALUE(i) 56
+#define LIMB_PLACE_VALUE(i) 56
void gf_add_RAW(gf out, const gf a, const gf b)
{
@@ -55,4 +60,4 @@ void gf_weak_reduce(gf a)
a->limb[0] = (a->limb[0] & mask) + tmp;
}
-#endif /* OSSL_CRYPTO_EC_CURVE448_ARCH_64_F_IMPL_H */
+#endif /* OSSL_CRYPTO_EC_CURVE448_ARCH_64_F_IMPL_H */
diff --git a/crypto/ec/curve448/arch_64/f_impl64.c b/crypto/ec/curve448/arch_64/f_impl64.c
index 06cc33a964..73c481deea 100644
--- a/crypto/ec/curve448/arch_64/f_impl64.c
+++ b/crypto/ec/curve448/arch_64/f_impl64.c
@@ -19,9 +19,9 @@
NON_EMPTY_TRANSLATION_UNIT
#else
-# include "../field.h"
+#include "../field.h"
-void ossl_gf_mul(gf_s * RESTRICT cs, const gf as, const gf bs)
+void ossl_gf_mul(gf_s *RESTRICT cs, const gf as, const gf bs)
{
const uint64_t *a = as->limb, *b = bs->limb;
uint64_t *c = cs->limb;
@@ -73,7 +73,7 @@ void ossl_gf_mul(gf_s * RESTRICT cs, const gf as, const gf bs)
c[1] += ((uint64_t)(accum1));
}
-void ossl_gf_mulw_unsigned(gf_s * RESTRICT cs, const gf as, uint32_t b)
+void ossl_gf_mulw_unsigned(gf_s *RESTRICT cs, const gf as, uint32_t b)
{
const uint64_t *a = as->limb;
uint64_t *c = cs->limb;
@@ -99,7 +99,7 @@ void ossl_gf_mulw_unsigned(gf_s * RESTRICT cs, const gf as, uint32_t b)
c[1] += accum4 >> 56;
}
-void ossl_gf_sqr(gf_s * RESTRICT cs, const gf as)
+void ossl_gf_sqr(gf_s *RESTRICT cs, const gf as)
{
const uint64_t *a = as->limb;
uint64_t *c = cs->limb;
diff --git a/crypto/ec/curve448/curve448.c b/crypto/ec/curve448/curve448.c
index 1db78ee5c6..1a31f86355 100644
--- a/crypto/ec/curve448/curve448.c
+++ b/crypto/ec/curve448/curve448.c
@@ -23,20 +23,16 @@
#define C448_WNAF_FIXED_TABLE_BITS 5
#define C448_WNAF_VAR_TABLE_BITS 3
-#define EDWARDS_D (-39081)
+#define EDWARDS_D (-39081)
static const curve448_scalar_t precomputed_scalarmul_adjustment = {
- {
- {
- SC_LIMB(0xc873d6d54a7bb0cfULL), SC_LIMB(0xe933d8d723a70aadULL),
- SC_LIMB(0xbb124b65129c96fdULL), SC_LIMB(0x00000008335dc163ULL)
- }
- }
+ { { SC_LIMB(0xc873d6d54a7bb0cfULL), SC_LIMB(0xe933d8d723a70aadULL),
+ SC_LIMB(0xbb124b65129c96fdULL), SC_LIMB(0x00000008335dc163ULL) } }
};
#define TWISTED_D (EDWARDS_D - 1)
-#define WBITS C448_WORD_BITS /* NB this may be different from ARCH_WORD_BITS */
+#define WBITS C448_WORD_BITS /* NB this may be different from ARCH_WORD_BITS */
/* Inverse. */
static void gf_invert(gf y, const gf x, int assert_nonzero)
@@ -44,38 +40,38 @@ static void gf_invert(gf y, const gf x, int assert_nonzero)
mask_t ret;
gf t1, t2;
- ossl_gf_sqr(t1, x); /* o^2 */
- ret = gf_isr(t2, t1); /* +-1/sqrt(o^2) = +-1/o */
+ ossl_gf_sqr(t1, x); /* o^2 */
+ ret = gf_isr(t2, t1); /* +-1/sqrt(o^2) = +-1/o */
(void)ret;
if (assert_nonzero)
assert(ret);
ossl_gf_sqr(t1, t2);
- ossl_gf_mul(t2, t1, x); /* not direct to y in case of alias. */
+ ossl_gf_mul(t2, t1, x); /* not direct to y in case of alias. */
gf_copy(y, t2);
}
/** identity = (0,1) */
const curve448_point_t ossl_curve448_point_identity = {
- {{{{0}}}, {{{1}}}, {{{1}}}, {{{0}}}}
+ { { { { 0 } } }, { { { 1 } } }, { { { 1 } } }, { { { 0 } } } }
};
static void point_double_internal(curve448_point_t p, const curve448_point_t q,
- int before_double)
+ int before_double)
{
gf a, b, c, d;
ossl_gf_sqr(c, q->x);
ossl_gf_sqr(a, q->y);
- gf_add_nr(d, c, a); /* 2+e */
+ gf_add_nr(d, c, a); /* 2+e */
gf_add_nr(p->t, q->y, q->x); /* 2+e */
ossl_gf_sqr(b, p->t);
- gf_subx_nr(b, b, d, 3); /* 4+e */
- gf_sub_nr(p->t, a, c); /* 3+e */
+ gf_subx_nr(b, b, d, 3); /* 4+e */
+ gf_sub_nr(p->t, a, c); /* 3+e */
ossl_gf_sqr(p->x, q->z);
gf_add_nr(p->z, p->x, p->x); /* 2+e */
gf_subx_nr(a, p->z, p->t, 4); /* 6+e */
if (GF_HEADROOM == 5)
- gf_weak_reduce(a); /* or 1+e */
+ gf_weak_reduce(a); /* or 1+e */
ossl_gf_mul(p->x, a, b);
ossl_gf_mul(p->z, p->t, a);
ossl_gf_mul(p->y, p->t, d);
@@ -124,19 +120,19 @@ static void niels_to_pt(curve448_point_t e, const niels_t n)
}
static void add_niels_to_pt(curve448_point_t d, const niels_t e,
- int before_double)
+ int before_double)
{
gf a, b, c;
- gf_sub_nr(b, d->y, d->x); /* 3+e */
+ gf_sub_nr(b, d->y, d->x); /* 3+e */
ossl_gf_mul(a, e->a, b);
- gf_add_nr(b, d->x, d->y); /* 2+e */
+ gf_add_nr(b, d->x, d->y); /* 2+e */
ossl_gf_mul(d->y, e->b, b);
ossl_gf_mul(d->x, e->c, d->t);
- gf_add_nr(c, a, d->y); /* 2+e */
- gf_sub_nr(b, d->y, a); /* 3+e */
+ gf_add_nr(c, a, d->y); /* 2+e */
+ gf_sub_nr(b, d->y, a); /* 3+e */
gf_sub_nr(d->y, d->z, d->x); /* 3+e */
- gf_add_nr(a, d->x, d->z); /* 2+e */
+ gf_add_nr(a, d->x, d->z); /* 2+e */
ossl_gf_mul(d->z, a, d->y);
ossl_gf_mul(d->x, d->y, b);
ossl_gf_mul(d->y, a, c);
@@ -145,19 +141,19 @@ static void add_niels_to_pt(curve448_point_t d, const niels_t e,
}
static void sub_niels_from_pt(curve448_point_t d, const niels_t e,
- int before_double)
+ int before_double)
{
gf a, b, c;
- gf_sub_nr(b, d->y, d->x); /* 3+e */
+ gf_sub_nr(b, d->y, d->x); /* 3+e */
ossl_gf_mul(a, e->b, b);
- gf_add_nr(b, d->x, d->y); /* 2+e */
+ gf_add_nr(b, d->x, d->y); /* 2+e */
ossl_gf_mul(d->y, e->a, b);
ossl_gf_mul(d->x, e->c, d->t);
- gf_add_nr(c, a, d->y); /* 2+e */
- gf_sub_nr(b, d->y, a); /* 3+e */
+ gf_add_nr(c, a, d->y); /* 2+e */
+ gf_sub_nr(b, d->y, a); /* 3+e */
gf_add_nr(d->y, d->z, d->x); /* 2+e */
- gf_sub_nr(a, d->z, d->x); /* 3+e */
+ gf_sub_nr(a, d->z, d->x); /* 3+e */
ossl_gf_mul(d->z, a, d->y);
ossl_gf_mul(d->x, d->y, b);
ossl_gf_mul(d->y, a, c);
@@ -166,7 +162,7 @@ static void sub_niels_from_pt(curve448_point_t d, const niels_t e,
}
static void add_pniels_to_pt(curve448_point_t p, const pniels_t pn,
- int before_double)
+ int before_double)
{
gf L0;
@@ -176,7 +172,7 @@ static void add_pniels_to_pt(curve448_point_t p, const pniels_t pn,
}
static void sub_pniels_from_pt(curve448_point_t p, const pniels_t pn,
- int before_double)
+ int before_double)
{
gf L0;
@@ -187,7 +183,7 @@ static void sub_pniels_from_pt(curve448_point_t p, const pniels_t pn,
c448_bool_t
ossl_curve448_point_eq(const curve448_point_t p,
- const curve448_point_t q)
+ const curve448_point_t q)
{
mask_t succ;
gf a, b;
@@ -221,17 +217,16 @@ ossl_curve448_point_valid(const curve448_point_t p)
return mask_to_bool(out);
}
-static ossl_inline void constant_time_lookup_niels(niels_s * RESTRICT ni,
- const niels_t *table,
- int nelts, int idx)
+static ossl_inline void constant_time_lookup_niels(niels_s *RESTRICT ni,
+ const niels_t *table,
+ int nelts, int idx)
{
constant_time_lookup(ni, table, sizeof(niels_s), nelts, idx);
}
-void
-ossl_curve448_precomputed_scalarmul(curve448_point_t out,
- const curve448_precomputed_s *table,
- const curve448_scalar_t scalar)
+void ossl_curve448_precomputed_scalarmul(curve448_point_t out,
+ const curve448_precomputed_s *table,
+ const curve448_scalar_t scalar)
{
unsigned int i, j, k;
const unsigned int n = COMBS_N, t = COMBS_T, s = COMBS_S;
@@ -253,8 +248,7 @@ ossl_curve448_precomputed_scalarmul(curve448_point_t out,
unsigned int bit = (i - 1) + s * (k + j * t);
if (bit < C448_SCALAR_BITS)
- tab |=
- (scalar1x->limb[bit / WBITS] >> (bit % WBITS) & 1) << k;
+ tab |= (scalar1x->limb[bit / WBITS] >> (bit % WBITS) & 1) << k;
}
invert = (tab >> (t - 1)) - 1;
@@ -262,7 +256,7 @@ ossl_curve448_precomputed_scalarmul(curve448_point_t out,
tab &= (1 << (t - 1)) - 1;
constant_time_lookup_niels(ni, &table->table[j << (t - 1)],
- 1 << (t - 1), tab);
+ 1 << (t - 1), tab);
cond_neg_niels(ni, invert);
if ((i != s) || j != 0)
@@ -276,10 +270,9 @@ ossl_curve448_precomputed_scalarmul(curve448_point_t out,
OPENSSL_cleanse(scalar1x, sizeof(scalar1x));
}
-void
-ossl_curve448_point_mul_by_ratio_and_encode_like_eddsa(
- uint8_t enc[EDDSA_448_PUBLIC_BYTES],
- const curve448_point_t p)
+void ossl_curve448_point_mul_by_ratio_and_encode_like_eddsa(
+ uint8_t enc[EDDSA_448_PUBLIC_BYTES],
+ const curve448_point_t p)
{
gf x, y, z, t;
curve448_point_t q;
@@ -326,8 +319,8 @@ ossl_curve448_point_mul_by_ratio_and_encode_like_eddsa(
c448_error_t
ossl_curve448_point_decode_like_eddsa_and_mul_by_ratio(
- curve448_point_t p,
- const uint8_t enc[EDDSA_448_PUBLIC_BYTES])
+ curve448_point_t p,
+ const uint8_t enc[EDDSA_448_PUBLIC_BYTES])
{
uint8_t enc2[EDDSA_448_PUBLIC_BYTES];
mask_t low;
@@ -342,14 +335,14 @@ ossl_curve448_point_decode_like_eddsa_and_mul_by_ratio(
succ &= word_is_zero(enc2[EDDSA_448_PRIVATE_BYTES - 1]);
ossl_gf_sqr(p->x, p->y);
- gf_sub(p->z, ONE, p->x); /* num = 1-y^2 */
+ gf_sub(p->z, ONE, p->x); /* num = 1-y^2 */
gf_mulw(p->t, p->x, EDWARDS_D); /* dy^2 */
- gf_sub(p->t, ONE, p->t); /* denom = 1-dy^2 or 1-d + dy^2 */
+ gf_sub(p->t, ONE, p->t); /* denom = 1-dy^2 or 1-d + dy^2 */
ossl_gf_mul(p->x, p->z, p->t);
succ &= gf_isr(p->t, p->x); /* 1/sqrt(num * denom) */
- ossl_gf_mul(p->x, p->t, p->z); /* sqrt(num / denom) */
+ ossl_gf_mul(p->x, p->t, p->z); /* sqrt(num / denom) */
gf_cond_neg(p->x, gf_lobit(p->x) ^ low);
gf_copy(p->z, ONE);
@@ -385,8 +378,8 @@ ossl_curve448_point_decode_like_eddsa_and_mul_by_ratio(
c448_error_t
ossl_x448_int(uint8_t out[X_PUBLIC_BYTES],
- const uint8_t base[X_PUBLIC_BYTES],
- const uint8_t scalar[X_PRIVATE_BYTES])
+ const uint8_t base[X_PUBLIC_BYTES],
+ const uint8_t scalar[X_PRIVATE_BYTES])
{
gf x1, x2, z2, x3, z3, t1, t2;
int t;
@@ -410,7 +403,7 @@ ossl_x448_int(uint8_t out[X_PUBLIC_BYTES],
sb = -1;
k_t = (sb >> (t % 8)) & 1;
- k_t = 0 - k_t; /* set to all 0s or all 1s */
+ k_t = 0 - k_t; /* set to all 0s or all 1s */
swap ^= k_t;
gf_cond_swap(x2, x3, swap);
@@ -422,26 +415,26 @@ ossl_x448_int(uint8_t out[X_PUBLIC_BYTES],
* comments, "2+e" is saying that the coefficients are at most 2+epsilon
* times the reduction limit.
*/
- gf_add_nr(t1, x2, z2); /* A = x2 + z2 */ /* 2+e */
- gf_sub_nr(t2, x2, z2); /* B = x2 - z2 */ /* 3+e */
- gf_sub_nr(z2, x3, z3); /* D = x3 - z3 */ /* 3+e */
- ossl_gf_mul(x2, t1, z2); /* DA */
- gf_add_nr(z2, z3, x3); /* C = x3 + z3 */ /* 2+e */
- ossl_gf_mul(x3, t2, z2); /* CB */
- gf_sub_nr(z3, x2, x3); /* DA-CB */ /* 3+e */
- ossl_gf_sqr(z2, z3); /* (DA-CB)^2 */
- ossl_gf_mul(z3, x1, z2); /* z3 = x1(DA-CB)^2 */
- gf_add_nr(z2, x2, x3); /* (DA+CB) */ /* 2+e */
- ossl_gf_sqr(x3, z2); /* x3 = (DA+CB)^2 */
-
- ossl_gf_sqr(z2, t1); /* AA = A^2 */
- ossl_gf_sqr(t1, t2); /* BB = B^2 */
- ossl_gf_mul(x2, z2, t1); /* x2 = AA*BB */
- gf_sub_nr(t2, z2, t1); /* E = AA-BB */ /* 3+e */
+ gf_add_nr(t1, x2, z2); /* A = x2 + z2 */ /* 2+e */
+ gf_sub_nr(t2, x2, z2); /* B = x2 - z2 */ /* 3+e */
+ gf_sub_nr(z2, x3, z3); /* D = x3 - z3 */ /* 3+e */
+ ossl_gf_mul(x2, t1, z2); /* DA */
+ gf_add_nr(z2, z3, x3); /* C = x3 + z3 */ /* 2+e */
+ ossl_gf_mul(x3, t2, z2); /* CB */
+ gf_sub_nr(z3, x2, x3); /* DA-CB */ /* 3+e */
+ ossl_gf_sqr(z2, z3); /* (DA-CB)^2 */
+ ossl_gf_mul(z3, x1, z2); /* z3 = x1(DA-CB)^2 */
+ gf_add_nr(z2, x2, x3); /* (DA+CB) */ /* 2+e */
+ ossl_gf_sqr(x3, z2); /* x3 = (DA+CB)^2 */
+
+ ossl_gf_sqr(z2, t1); /* AA = A^2 */
+ ossl_gf_sqr(t1, t2); /* BB = B^2 */
+ ossl_gf_mul(x2, z2, t1); /* x2 = AA*BB */
+ gf_sub_nr(t2, z2, t1); /* E = AA-BB */ /* 3+e */
gf_mulw(t1, t2, -EDWARDS_D); /* E*-d = a24*E */
- gf_add_nr(t1, t1, z2); /* AA + a24*E */ /* 2+e */
- ossl_gf_mul(z2, t2, t1); /* z2 = E(AA+a24*E) */
+ gf_add_nr(t1, t1, z2); /* AA + a24*E */ /* 2+e */
+ ossl_gf_mul(z2, t2, t1); /* z2 = E(AA+a24*E) */
}
/* Finish */
@@ -463,23 +456,22 @@ ossl_x448_int(uint8_t out[X_PUBLIC_BYTES],
return c448_succeed_if(mask_to_bool(nz));
}
-void
-ossl_curve448_point_mul_by_ratio_and_encode_like_x448(uint8_t
- out[X_PUBLIC_BYTES],
- const curve448_point_t p)
+void ossl_curve448_point_mul_by_ratio_and_encode_like_x448(uint8_t
+ out[X_PUBLIC_BYTES],
+ const curve448_point_t p)
{
curve448_point_t q;
curve448_point_copy(q, p);
- gf_invert(q->t, q->x, 0); /* 1/x */
- ossl_gf_mul(q->z, q->t, q->y); /* y/x */
- ossl_gf_sqr(q->y, q->z); /* (y/x)^2 */
+ gf_invert(q->t, q->x, 0); /* 1/x */
+ ossl_gf_mul(q->z, q->t, q->y); /* y/x */
+ ossl_gf_sqr(q->y, q->z); /* (y/x)^2 */
gf_serialize(out, q->y, 1);
ossl_curve448_point_destroy(q);
}
void ossl_x448_derive_public_key(uint8_t out[X_PUBLIC_BYTES],
- const uint8_t scalar[X_PRIVATE_BYTES])
+ const uint8_t scalar[X_PRIVATE_BYTES])
{
/* Scalar conditioning */
uint8_t scalar2[X_PRIVATE_BYTES];
@@ -500,7 +492,7 @@ void ossl_x448_derive_public_key(uint8_t out[X_PUBLIC_BYTES],
ossl_curve448_scalar_halve(the_scalar, the_scalar);
ossl_curve448_precomputed_scalarmul(p, ossl_curve448_precomputed_base,
- the_scalar);
+ the_scalar);
ossl_curve448_point_mul_by_ratio_and_encode_like_x448(out, p);
ossl_curve448_point_destroy(p);
}
@@ -511,9 +503,9 @@ struct smvt_control {
};
#if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3))
-# define NUMTRAILINGZEROS __builtin_ctz
+#define NUMTRAILINGZEROS __builtin_ctz
#else
-# define NUMTRAILINGZEROS numtrailingzeros
+#define NUMTRAILINGZEROS numtrailingzeros
static uint32_t numtrailingzeros(uint32_t i)
{
uint32_t tmp;
@@ -551,9 +543,9 @@ static uint32_t numtrailingzeros(uint32_t i)
#endif
static int recode_wnaf(struct smvt_control *control,
- /* [nbits/(table_bits + 1) + 3] */
- const curve448_scalar_t scalar,
- unsigned int table_bits)
+ /* [nbits/(table_bits + 1) + 3] */
+ const curve448_scalar_t scalar,
+ unsigned int table_bits)
{
unsigned int table_size = C448_SCALAR_BITS / (table_bits + 1) + 3;
int position = table_size - 1; /* at the end */
@@ -578,7 +570,8 @@ static int recode_wnaf(struct smvt_control *control,
if (w < (C448_SCALAR_BITS - 1) / 16 + 1) {
/* Refill the 16 high bits of current */
current += (uint32_t)((scalar->limb[w / B_OVER_16]
- >> (16 * (w % B_OVER_16))) << 16);
+ >> (16 * (w % B_OVER_16)))
+ << 16);
}
while (current & 0xFFFF) {
@@ -614,8 +607,8 @@ static int recode_wnaf(struct smvt_control *control,
}
static void prepare_wnaf_table(pniels_t *output,
- const curve448_point_t working,
- unsigned int tbits)
+ const curve448_point_t working,
+ unsigned int tbits)
{
curve448_point_t tmp;
int i;
@@ -641,18 +634,15 @@ static void prepare_wnaf_table(pniels_t *output,
OPENSSL_cleanse(twop, sizeof(twop));
}
-void
-ossl_curve448_base_double_scalarmul_non_secret(curve448_point_t combo,
- const curve448_scalar_t scalar1,
- const curve448_point_t base2,
- const curve448_scalar_t scalar2)
+void ossl_curve448_base_double_scalarmul_non_secret(curve448_point_t combo,
+ const curve448_scalar_t scalar1,
+ const curve448_point_t base2,
+ const curve448_scalar_t scalar2)
{
const int table_bits_var = C448_WNAF_VAR_TABLE_BITS;
const int table_bits_pre = C448_WNAF_FIXED_TABLE_BITS;
- struct smvt_control control_var[C448_SCALAR_BITS /
- (C448_WNAF_VAR_TABLE_BITS + 1) + 3];
- struct smvt_control control_pre[C448_SCALAR_BITS /
- (C448_WNAF_FIXED_TABLE_BITS + 1) + 3];
+ struct smvt_control control_var[C448_SCALAR_BITS / (C448_WNAF_VAR_TABLE_BITS + 1) + 3];
+ struct smvt_control control_pre[C448_SCALAR_BITS / (C448_WNAF_FIXED_TABLE_BITS + 1) + 3];
int ncb_pre = recode_wnaf(control_pre, scalar1, table_bits_pre);
int ncb_var = recode_wnaf(control_var, scalar2, table_bits_var);
pniels_t precmp_var[1 << C448_WNAF_VAR_TABLE_BITS];
@@ -671,8 +661,8 @@ ossl_curve448_base_double_scalarmul_non_secret(curve448_point_t combo,
} else if (i == control_pre[0].power && i >= 0) {
pniels_to_pt(combo, precmp_var[control_var[0].addend >> 1]);
add_niels_to_pt(combo,
- ossl_curve448_wnaf_base[control_pre[0].addend >> 1],
- i);
+ ossl_curve448_wnaf_base[control_pre[0].addend >> 1],
+ i);
contv++;
contp++;
} else {
@@ -692,12 +682,13 @@ ossl_curve448_base_double_scalarmul_non_secret(curve448_point_t combo,
if (control_var[contv].addend > 0)
add_pniels_to_pt(combo,
- precmp_var[control_var[contv].addend >> 1],
- i && !cp);
+ precmp_var[control_var[contv].addend >> 1],
+ i && !cp);
else
sub_pniels_from_pt(combo,
- precmp_var[(-control_var[contv].addend)
- >> 1], i && !cp);
+ precmp_var[(-control_var[contv].addend)
+ >> 1],
+ i && !cp);
contv++;
}
@@ -706,12 +697,16 @@ ossl_curve448_base_double_scalarmul_non_secret(curve448_point_t combo,
if (control_pre[contp].addend > 0)
add_niels_to_pt(combo,
- ossl_curve448_wnaf_base[control_pre[contp].addend
- >> 1], i);
+ ossl_curve448_wnaf_base[control_pre[contp].addend
+ >> 1],
+ i);
else
sub_niels_from_pt(combo,
- ossl_curve448_wnaf_base[(-control_pre
- [contp].addend) >> 1], i);
+ ossl_curve448_wnaf_base[(-control_pre
+ [contp]
+ .addend)
+ >> 1],
+ i);
contp++;
}
}
@@ -733,14 +728,14 @@ void ossl_curve448_point_destroy(curve448_point_t point)
}
int ossl_x448(uint8_t out_shared_key[56], const uint8_t private_key[56],
- const uint8_t peer_public_value[56])
+ const uint8_t peer_public_value[56])
{
return ossl_x448_int(out_shared_key, peer_public_value, private_key)
- == C448_SUCCESS;
+ == C448_SUCCESS;
}
void ossl_x448_public_from_private(uint8_t out_public_value[56],
- const uint8_t private_key[56])
+ const uint8_t private_key[56])
{
ossl_x448_derive_public_key(out_public_value, private_key);
}
diff --git a/crypto/ec/curve448/curve448_local.h b/crypto/ec/curve448/curve448_local.h
index 5c569ea8b9..96a1ad00e7 100644
--- a/crypto/ec/curve448/curve448_local.h
+++ b/crypto/ec/curve448/curve448_local.h
@@ -7,7 +7,7 @@
* https://www.openssl.org/source/license.html
*/
#ifndef OSSL_CRYPTO_EC_CURVE448_LOCAL_H
-# define OSSL_CRYPTO_EC_CURVE448_LOCAL_H
-# include "curve448utils.h"
+#define OSSL_CRYPTO_EC_CURVE448_LOCAL_H
+#include "curve448utils.h"
-#endif /* OSSL_CRYPTO_EC_CURVE448_LOCAL_H */
+#endif /* OSSL_CRYPTO_EC_CURVE448_LOCAL_H */
diff --git a/crypto/ec/curve448/curve448_tables.c b/crypto/ec/curve448/curve448_tables.c
index 0c6f626b3e..f3888378fb 100644
--- a/crypto/ec/curve448/curve448_tables.c
+++ b/crypto/ec/curve448/curve448_tables.c
@@ -14,1470 +14,1578 @@
#include "point_448.h"
static const curve448_precomputed_s curve448_precomputed_base_table = {
- {
- {{
- {FIELD_LITERAL(0x00cc3b062366f4ccULL, 0x003d6e34e314aa3cULL,
- 0x00d51c0a7521774dULL, 0x0094e060eec6ab8bULL,
- 0x00d21291b4d80082ULL, 0x00befed12b55ef1eULL,
- 0x00c3dd2df5c94518ULL, 0x00e0a7b112b8d4e6ULL)},
- {FIELD_LITERAL(0x0019eb5608d8723aULL, 0x00d1bab52fb3aedbULL,
- 0x00270a7311ebc90cULL, 0x0037c12b91be7f13ULL,
- 0x005be16cd8b5c704ULL, 0x003e181acda888e1ULL,
- 0x00bc1f00fc3fc6d0ULL, 0x00d3839bfa319e20ULL)},
- {FIELD_LITERAL(0x003caeb88611909fULL, 0x00ea8b378c4df3d4ULL,
- 0x00b3295b95a5a19aULL, 0x00a65f97514bdfb5ULL,
- 0x00b39efba743cab1ULL, 0x0016ba98b862fd2dULL,
- 0x0001508812ee71d7ULL, 0x000a75740eea114aULL)},
- }}, {{
- {FIELD_LITERAL(0x00ebcf0eb649f823ULL, 0x00166d332e98ea03ULL,
- 0x0059ddf64f5cd5f6ULL, 0x0047763123d9471bULL,
- 0x00a64065c53ef62fULL, 0x00978e44c480153dULL,
- 0x000b5b2a0265f194ULL, 0x0046a24b9f32965aULL)},
- {FIELD_LITERAL(0x00b9eef787034df0ULL, 0x0020bc24de3390cdULL,
- 0x000022160bae99bbULL, 0x00ae66e886e97946ULL,
- 0x0048d4bbe02cbb8bULL, 0x0072ba97b34e38d4ULL,
- 0x00eae7ec8f03e85aULL, 0x005ba92ecf808b2cULL)},
- {FIELD_LITERAL(0x00c9cfbbe74258fdULL, 0x00843a979ea9eaa7ULL,
- 0x000cbb4371cfbe90ULL, 0x0059bac8f7f0a628ULL,
- 0x004b3dff882ff530ULL, 0x0011869df4d90733ULL,
- 0x00595aa71f4abfc2ULL, 0x0070e2d38990c2e6ULL)},
- }}, {{
- {FIELD_LITERAL(0x00de2010c0a01733ULL, 0x00c739a612e24297ULL,
- 0x00a7212643141d7cULL, 0x00f88444f6b67c11ULL,
- 0x00484b7b16ec28f2ULL, 0x009c1b8856af9c68ULL,
- 0x00ff4669591fe9d6ULL, 0x0054974be08a32c8ULL)},
- {FIELD_LITERAL(0x0010de3fd682ceedULL, 0x008c07642d83ca4eULL,
- 0x0013bb064e00a1ccULL, 0x009411ae27870e11ULL,
- 0x00ea8e5b4d531223ULL, 0x0032fe7d2aaece2eULL,
- 0x00d989e243e7bb41ULL, 0x000fe79a508e9b8bULL)},
- {FIELD_LITERAL(0x005e0426b9bfc5b1ULL, 0x0041a5b1d29ee4faULL,
- 0x0015b0def7774391ULL, 0x00bc164f1f51af01ULL,
- 0x00d543b0942797b9ULL, 0x003c129b6398099cULL,
- 0x002b114c6e5adf18ULL, 0x00b4e630e4018a7bULL)},
- }}, {{
- {FIELD_LITERAL(0x00d490afc95f8420ULL, 0x00b096bf50c1d9b9ULL,
- 0x00799fd707679866ULL, 0x007c74d9334afbeaULL,
- 0x00efaa8be80ff4edULL, 0x0075c4943bb81694ULL,
- 0x00c21c2fca161f36ULL, 0x00e77035d492bfeeULL)},
- {FIELD_LITERAL(0x006658a190dd6661ULL, 0x00e0e9bab38609a6ULL,
- 0x0028895c802237edULL, 0x006a0229c494f587ULL,
- 0x002dcde96c9916b7ULL, 0x00d158822de16218ULL,
- 0x00173b917a06856fULL, 0x00ca78a79ae07326ULL)},
- {FIELD_LITERAL(0x00e35bfc79caced4ULL, 0x0087238a3e1fe3bbULL,
- 0x00bcbf0ff4ceff5bULL, 0x00a19c1c94099b91ULL,
- 0x0071e102b49db976ULL, 0x0059e3d004eada1eULL,
- 0x008da78afa58a47eULL, 0x00579c8ebf269187ULL)},
- }}, {{
- {FIELD_LITERAL(0x00a16c2905eee75fULL, 0x009d4bcaea2c7e1dULL,
- 0x00d3bd79bfad19dfULL, 0x0050da745193342cULL,
- 0x006abdb8f6b29ab1ULL, 0x00a24fe0a4fef7efULL,
- 0x0063730da1057dfbULL, 0x00a08c312c8eb108ULL)},
- {FIELD_LITERAL(0x00b583be005375beULL, 0x00a40c8f8a4e3df4ULL,
- 0x003fac4a8f5bdbf7ULL, 0x00d4481d872cd718ULL,
- 0x004dc8749cdbaefeULL, 0x00cce740d5e5c975ULL,
- 0x000b1c1f4241fd21ULL, 0x00a76de1b4e1cd07ULL)},
- {FIELD_LITERAL(0x007a076500d30b62ULL, 0x000a6e117b7f090fULL,
- 0x00c8712ae7eebd9aULL, 0x000fbd6c1d5f6ff7ULL,
- 0x003a7977246ebf11ULL, 0x00166ed969c6600eULL,
- 0x00aa42e469c98becULL, 0x00dc58f307cf0666ULL)},
- }}, {{
- {FIELD_LITERAL(0x004b491f65a9a28bULL, 0x006a10309e8a55b7ULL,
- 0x00b67210185187efULL, 0x00cf6497b12d9b8fULL,
- 0x0085778c56e2b1baULL, 0x0015b4c07a814d85ULL,
- 0x00686479e62da561ULL, 0x008de5d88f114916ULL)},
- {FIELD_LITERAL(0x00e37c88d6bba7b1ULL, 0x003e4577e1b8d433ULL,
- 0x0050d8ea5f510ec0ULL, 0x0042fc9f2da9ef59ULL,
- 0x003bd074c1141420ULL, 0x00561b8b7b68774eULL,
- 0x00232e5e5d1013a3ULL, 0x006b7f2cb3d7e73fULL)},
- {FIELD_LITERAL(0x004bdd0f0b41e6a0ULL, 0x001773057c405d24ULL,
- 0x006029f99915bd97ULL, 0x006a5ba70a17fe2fULL,
- 0x0046111977df7e08ULL, 0x004d8124c89fb6b7ULL,
- 0x00580983b2bb2724ULL, 0x00207bf330d6f3feULL)},
- }}, {{
- {FIELD_LITERAL(0x007efdc93972a48bULL, 0x002f5e50e78d5feeULL,
- 0x0080dc11d61c7fe5ULL, 0x0065aa598707245bULL,
- 0x009abba2300641beULL, 0x000c68787656543aULL,
- 0x00ffe0fef2dc0a17ULL, 0x00007ffbd6cb4f3aULL)},
- {FIELD_LITERAL(0x0036012f2b836efcULL, 0x00458c126d6b5fbcULL,
- 0x00a34436d719ad1eULL, 0x0097be6167117deaULL,
- 0x0009c219c879cff3ULL, 0x0065564493e60755ULL,
- 0x00993ac94a8cdec0ULL, 0x002d4885a4d0dbafULL)},
- {FIELD_LITERAL(0x00598b60b4c068baULL, 0x00c547a0be7f1afdULL,
- 0x009582164acf12afULL, 0x00af4acac4fbbe40ULL,
- 0x005f6ca7c539121aULL, 0x003b6e752ebf9d66ULL,
- 0x00f08a30d5cac5d4ULL, 0x00e399bb5f97c5a9ULL)},
- }}, {{
- {FIELD_LITERAL(0x007445a0409c0a66ULL, 0x00a65c369f3829c0ULL,
- 0x0031d248a4f74826ULL, 0x006817f34defbe8eULL,
- 0x00649741d95ebf2eULL, 0x00d46466ab16b397ULL,
- 0x00fdc35703bee414ULL, 0x00343b43334525f8ULL)},
- {FIELD_LITERAL(0x001796bea93f6401ULL, 0x00090c5a42e85269ULL,
- 0x00672412ba1252edULL, 0x001201d47b6de7deULL,
- 0x006877bccfe66497ULL, 0x00b554fd97a4c161ULL,
- 0x009753f42dbac3cfULL, 0x00e983e3e378270aULL)},
- {FIELD_LITERAL(0x00ac3eff18849872ULL, 0x00f0eea3bff05690ULL,
- 0x00a6d72c21dd505dULL, 0x001b832642424169ULL,
- 0x00a6813017b540e5ULL, 0x00a744bd71b385cdULL,
- 0x0022a7d089130a7bULL, 0x004edeec9a133486ULL)},
- }}, {{
- {FIELD_LITERAL(0x00b2d6729196e8a9ULL, 0x0088a9bb2031cef4ULL,
- 0x00579e7787dc1567ULL, 0x0030f49feb059190ULL,
- 0x00a0b1d69c7f7d8fULL, 0x0040bdcc6d9d806fULL,
- 0x00d76c4037edd095ULL, 0x00bbf24376415dd7ULL)},
- {FIELD_LITERAL(0x00240465ff5a7197ULL, 0x00bb97e76caf27d0ULL,
- 0x004b4edbf8116d39ULL, 0x001d8586f708cbaaULL,
- 0x000f8ee8ff8e4a50ULL, 0x00dde5a1945dd622ULL,
- 0x00e6fc1c0957e07cULL, 0x0041c9cdabfd88a0ULL)},
- {FIELD_LITERAL(0x005344b0bf5b548cULL, 0x002957d0b705cc99ULL,
- 0x00f586a70390553dULL, 0x0075b3229f583cc3ULL,
- 0x00a1aa78227490e4ULL, 0x001bf09cf7957717ULL,
- 0x00cf6bf344325f52ULL, 0x0065bd1c23ca3ecfULL)},
- }}, {{
- {FIELD_LITERAL(0x009bff3b3239363cULL, 0x00e17368796ef7c0ULL,
- 0x00528b0fe0971f3aULL, 0x0008014fc8d4a095ULL,
- 0x00d09f2e8a521ec4ULL, 0x006713ab5dde5987ULL,
- 0x0003015758e0dbb1ULL, 0x00215999f1ba212dULL)},
- {FIELD_LITERAL(0x002c88e93527da0eULL, 0x0077c78f3456aad5ULL,
- 0x0071087a0a389d1cULL, 0x00934dac1fb96dbdULL,
- 0x008470e801162697ULL, 0x005bc2196cd4ad49ULL,
- 0x00e535601d5087c3ULL, 0x00769888700f497fULL)},
- {FIELD_LITERAL(0x00da7a4b557298adULL, 0x0019d2589ea5df76ULL,
- 0x00ef3e38be0c6497ULL, 0x00a9644e1312609aULL,
- 0x004592f61b2558daULL, 0x0082c1df510d7e46ULL,
- 0x0042809a535c0023ULL, 0x00215bcb5afd7757ULL)},
- }}, {{
- {FIELD_LITERAL(0x002b9df55a1a4213ULL, 0x00dcfc3b464a26beULL,
- 0x00c4f9e07a8144d5ULL, 0x00c8e0617a92b602ULL,
- 0x008e3c93accafae0ULL, 0x00bf1bcb95b2ca60ULL,
- 0x004ce2426a613bf3ULL, 0x00266cac58e40921ULL)},
- {FIELD_LITERAL(0x008456d5db76e8f0ULL, 0x0032ca9cab2ce163ULL,
- 0x0059f2b8bf91abcfULL, 0x0063c2a021712788ULL,
- 0x00f86155af22f72dULL, 0x00db98b2a6c005a0ULL,
- 0x00ac6e416a693ac4ULL, 0x007a93572af53226ULL)},
- {FIELD_LITERAL(0x0087767520f0de22ULL, 0x0091f64012279fb5ULL,
- 0x001050f1f0644999ULL, 0x004f097a2477ad3cULL,
- 0x006b37913a9947bdULL, 0x001a3d78645af241ULL,
- 0x0057832bbb3008a7ULL, 0x002c1d902b80dc20ULL)},
- }}, {{
- {FIELD_LITERAL(0x001a6002bf178877ULL, 0x009bce168aa5af50ULL,
- 0x005fc318ff04a7f5ULL, 0x0052818f55c36461ULL,
- 0x008768f5d4b24afbULL, 0x0037ffbae7b69c85ULL,
- 0x0018195a4b61edc0ULL, 0x001e12ea088434b2ULL)},
- {FIELD_LITERAL(0x0047d3f804e7ab07ULL, 0x00a809ab5f905260ULL,
- 0x00b3ffc7cdaf306dULL, 0x00746e8ec2d6e509ULL,
- 0x00d0dade8887a645ULL, 0x00acceeebde0dd37ULL,
- 0x009bc2579054686bULL, 0x0023804f97f1c2bfULL)},
- {FIELD_LITERAL(0x0043e2e2e50b80d7ULL, 0x00143aafe4427e0fULL,
- 0x005594aaecab855bULL, 0x008b12ccaaecbc01ULL,
- 0x002deeb091082bc3ULL, 0x009cca4be2ae7514ULL,
- 0x00142b96e696d047ULL, 0x00ad2a2b1c05256aULL)},
- }}, {{
- {FIELD_LITERAL(0x003914f2f144b78bULL, 0x007a95dd8bee6f68ULL,
- 0x00c7f4384d61c8e6ULL, 0x004e51eb60f1bdb2ULL,
- 0x00f64be7aa4621d8ULL, 0x006797bfec2f0ac0ULL,
- 0x007d17aab3c75900ULL, 0x001893e73cac8bc5ULL)},
- {FIELD_LITERAL(0x00140360b768665bULL, 0x00b68aca4967f977ULL,
- 0x0001089b66195ae4ULL, 0x00fe71122185e725ULL,
- 0x000bca2618d49637ULL, 0x00a54f0557d7e98aULL,
- 0x00cdcd2f91d6f417ULL, 0x00ab8c13741fd793ULL)},
- {FIELD_LITERAL(0x00725ee6b1e549e0ULL, 0x007124a0769777faULL,
- 0x000b68fdad07ae42ULL, 0x0085b909cd4952dfULL,
- 0x0092d2e3c81606f4ULL, 0x009f22f6cac099a0ULL,
- 0x00f59da57f2799a8ULL, 0x00f06c090122f777ULL)},
- }}, {{
- {FIELD_LITERAL(0x00ce0bed0a3532bcULL, 0x001a5048a22df16bULL,
- 0x00e31db4cbad8bf1ULL, 0x00e89292120cf00eULL,
- 0x007d1dd1a9b00034ULL, 0x00e2a9041ff8f680ULL,
- 0x006a4c837ae596e7ULL, 0x00713af1068070b3ULL)},
- {FIELD_LITERAL(0x00c4fe64ce66d04bULL, 0x00b095d52e09b3d7ULL,
- 0x00758bbecb1a3a8eULL, 0x00f35cce8d0650c0ULL,
- 0x002b878aa5984473ULL, 0x0062e0a3b7544ddcULL,
- 0x00b25b290ed116feULL, 0x007b0f6abe0bebf2ULL)},
- {FIELD_LITERAL(0x0081d4e3addae0a8ULL, 0x003410c836c7ffccULL,
- 0x00c8129ad89e4314ULL, 0x000e3d5a23922dcdULL,
- 0x00d91e46f29c31f3ULL, 0x006c728cde8c5947ULL,
- 0x002bc655ba2566c0ULL, 0x002ca94721533108ULL)},
- }}, {{
- {FIELD_LITERAL(0x0051e4b3f764d8a9ULL, 0x0019792d46e904a0ULL,
- 0x00853bc13dbc8227ULL, 0x000840208179f12dULL,
- 0x0068243474879235ULL, 0x0013856fbfe374d0ULL,
- 0x00bda12fe8676424ULL, 0x00bbb43635926eb2ULL)},
- {FIELD_LITERAL(0x0012cdc880a93982ULL, 0x003c495b21cd1b58ULL,
- 0x00b7e5c93f22a26eULL, 0x0044aa82dfb99458ULL,
- 0x009ba092cdffe9c0ULL, 0x00a14b3ab2083b73ULL,
- 0x000271c2f70e1c4bULL, 0x00eea9cac0f66eb8ULL)},
- {FIELD_LITERAL(0x001a1847c4ac5480ULL, 0x00b1b412935bb03aULL,
- 0x00f74285983bf2b2ULL, 0x00624138b5b5d0f1ULL,
- 0x008820c0b03d38bfULL, 0x00b94e50a18c1572ULL,
- 0x0060f6934841798fULL, 0x00c52f5d66d6ebe2ULL)},
- }}, {{
- {FIELD_LITERAL(0x00da23d59f9bcea6ULL, 0x00e0f27007a06a4bULL,
- 0x00128b5b43a6758cULL, 0x000cf50190fa8b56ULL,
- 0x00fc877aba2b2d72ULL, 0x00623bef52edf53fULL,
- 0x00e6af6b819669e2ULL, 0x00e314dc34fcaa4fULL)},
- {FIELD_LITERAL(0x0066e5eddd164d1eULL, 0x00418a7c6fe28238ULL,
- 0x0002e2f37e962c25ULL, 0x00f01f56b5975306ULL,
- 0x0048842fa503875cULL, 0x0057b0e968078143ULL,
- 0x00ff683024f3d134ULL, 0x0082ae28fcad12e4ULL)},
- {FIELD_LITERAL(0x0011ddfd21260e42ULL, 0x00d05b0319a76892ULL,
- 0x00183ea4368e9b8fULL, 0x00b0815662affc96ULL,
- 0x00b466a5e7ce7c88ULL, 0x00db93b07506e6eeULL,
- 0x0033885f82f62401ULL, 0x0086f9090ec9b419ULL)},
- }}, {{
- {FIELD_LITERAL(0x00d95d1c5fcb435aULL, 0x0016d1ed6b5086f9ULL,
- 0x00792aa0b7e54d71ULL, 0x0067b65715f1925dULL,
- 0x00a219755ec6176bULL, 0x00bc3f026b12c28fULL,
- 0x00700c897ffeb93eULL, 0x0089b83f6ec50b46ULL)},
- {FIELD_LITERAL(0x003c97e6384da36eULL, 0x00423d53eac81a09ULL,
- 0x00b70d68f3cdce35ULL, 0x00ee7959b354b92cULL,
- 0x00f4e9718819c8caULL, 0x009349f12acbffe9ULL,
- 0x005aee7b62cb7da6ULL, 0x00d97764154ffc86ULL)},
- {FIELD_LITERAL(0x00526324babb46dcULL, 0x002ee99b38d7bf9eULL,
- 0x007ea51794706ef4ULL, 0x00abeb04da6e3c39ULL,
- 0x006b457c1d281060ULL, 0x00fe243e9a66c793ULL,
- 0x00378de0fb6c6ee4ULL, 0x003e4194b9c3cb93ULL)},
- }}, {{
- {FIELD_LITERAL(0x00fed3cd80ca2292ULL, 0x0015b043a73ca613ULL,
- 0x000a9fd7bf9be227ULL, 0x003b5e03de2db983ULL,
- 0x005af72d46904ef7ULL, 0x00c0f1b5c49faa99ULL,
- 0x00dc86fc3bd305e1ULL, 0x00c92f08c1cb1797ULL)},
- {FIELD_LITERAL(0x0079680ce111ed3bULL, 0x001a1ed82806122cULL,
- 0x000c2e7466d15df3ULL, 0x002c407f6f7150fdULL,
- 0x00c5e7c96b1b0ce3ULL, 0x009aa44626863ff9ULL,
- 0x00887b8b5b80be42ULL, 0x00b6023cec964825ULL)},
- {FIELD_LITERAL(0x00e4a8e1048970c8ULL, 0x0062887b7830a302ULL,
- 0x00bcf1c8cd81402bULL, 0x0056dbb81a68f5beULL,
- 0x0014eced83f12452ULL, 0x00139e1a510150dfULL,
- 0x00bb81140a82d1a3ULL, 0x000febcc1aaf1aa7ULL)},
- }}, {{
- {FIELD_LITERAL(0x00a7527958238159ULL, 0x0013ec9537a84cd6ULL,
- 0x001d7fee7d562525ULL, 0x00b9eefa6191d5e5ULL,
- 0x00dbc97db70bcb8aULL, 0x00481affc7a4d395ULL,
- 0x006f73d3e70c31bbULL, 0x00183f324ed96a61ULL)},
- {FIELD_LITERAL(0x0039dd7ce7fc6860ULL, 0x00d64f6425653da1ULL,
- 0x003e037c7f57d0afULL, 0x0063477a06e2bcf2ULL,
- 0x001727dbb7ac67e6ULL, 0x0049589f5efafe2eULL,
- 0x00fc0fef2e813d54ULL, 0x008baa5d087fb50dULL)},
- {FIELD_LITERAL(0x0024fb59d9b457c7ULL, 0x00a7d4e060223e4cULL,
- 0x00c118d1b555fd80ULL, 0x0082e216c732f22aULL,
- 0x00cd2a2993089504ULL, 0x003638e836a3e13dULL,
- 0x000d855ee89b4729ULL, 0x008ec5b7d4810c91ULL)},
- }}, {{
- {FIELD_LITERAL(0x001bf51f7d65cdfdULL, 0x00d14cdafa16a97dULL,
- 0x002c38e60fcd10e7ULL, 0x00a27446e393efbdULL,
- 0x000b5d8946a71fddULL, 0x0063df2cde128f2fULL,
- 0x006c8679569b1888ULL, 0x0059ffc4925d732dULL)},
- {FIELD_LITERAL(0x00ece96f95f2b66fULL, 0x00ece7952813a27bULL,
- 0x0026fc36592e489eULL, 0x007157d1a2de0f66ULL,
- 0x00759dc111d86ddfULL, 0x0012881e5780bb0fULL,
- 0x00c8ccc83ad29496ULL, 0x0012b9bd1929eb71ULL)},
- {FIELD_LITERAL(0x000fa15a20da5df0ULL, 0x00349ddb1a46cd31ULL,
- 0x002c512ad1d8e726ULL, 0x00047611f669318dULL,
- 0x009e68fba591e17eULL, 0x004320dffa803906ULL,
- 0x00a640874951a3d3ULL, 0x00b6353478baa24fULL)},
- }}, {{
- {FIELD_LITERAL(0x009696510000d333ULL, 0x00ec2f788bc04826ULL,
- 0x000e4d02b1f67ba5ULL, 0x00659aa8dace08b6ULL,
- 0x00d7a38a3a3ae533ULL, 0x008856defa8c746bULL,
- 0x004d7a4402d3da1aULL, 0x00ea82e06229260fULL)},
- {FIELD_LITERAL(0x006a15bb20f75c0cULL, 0x0079a144027a5d0cULL,
- 0x00d19116ce0b4d70ULL, 0x0059b83bcb0b268eULL,
- 0x005f58f63f16c127ULL, 0x0079958318ee2c37ULL,
- 0x00defbb063d07f82ULL, 0x00f1f0b931d2d446ULL)},
- {FIELD_LITERAL(0x00cb5e4c3c35d422ULL, 0x008df885ca43577fULL,
- 0x00fa50b16ca3e471ULL, 0x005a0e58e17488c8ULL,
- 0x00b2ceccd6d34d19ULL, 0x00f01d5d235e36e9ULL,
- 0x00db2e7e4be6ca44ULL, 0x00260ab77f35fccdULL)},
- }}, {{
- {FIELD_LITERAL(0x006f6fd9baac61d5ULL, 0x002a7710a020a895ULL,
- 0x009de0db7fc03d4dULL, 0x00cdedcb1875f40bULL,
- 0x00050caf9b6b1e22ULL, 0x005e3a6654456ab0ULL,
- 0x00775fdf8c4423d4ULL, 0x0028701ea5738b5dULL)},
- {FIELD_LITERAL(0x009ffd90abfeae96ULL, 0x00cba3c2b624a516ULL,
- 0x005ef08bcee46c91ULL, 0x00e6fde30afb6185ULL,
- 0x00f0b4db4f818ce4ULL, 0x006c54f45d2127f5ULL,
- 0x00040125035854c7ULL, 0x00372658a3287e13ULL)},
- {FIELD_LITERAL(0x00d7070fb1beb2abULL, 0x0078fc845a93896bULL,
- 0x006894a4b2f224a6ULL, 0x005bdd8192b9dbdeULL,
- 0x00b38839874b3a9eULL, 0x00f93618b04b7a57ULL,
- 0x003e3ec75fd2c67eULL, 0x00bf5e6bfc29494aULL)},
- }}, {{
- {FIELD_LITERAL(0x00f19224ebba2aa5ULL, 0x0074f89d358e694dULL,
- 0x00eea486597135adULL, 0x0081579a4555c7e1ULL,
- 0x0010b9b872930a9dULL, 0x00f002e87a30ecc0ULL,
- 0x009b9d66b6de56e2ULL, 0x00a3c4f45e8004ebULL)},
- {FIELD_LITERAL(0x0045e8dda9400888ULL, 0x002ff12e5fc05db7ULL,
- 0x00a7098d54afe69cULL, 0x00cdbe846a500585ULL,
- 0x00879c1593ca1882ULL, 0x003f7a7fea76c8b0ULL,
- 0x002cd73dd0c8e0a1ULL, 0x00645d6ce96f51feULL)},
- {FIELD_LITERAL(0x002b7e83e123d6d6ULL, 0x00398346f7419c80ULL,
- 0x0042922e55940163ULL, 0x005e7fc5601886a3ULL,
- 0x00e88f2cee1d3103ULL, 0x00e7fab135f2e377ULL,
- 0x00b059984dbf0dedULL, 0x0009ce080faa5bb8ULL)},
- }}, {{
- {FIELD_LITERAL(0x0085e78af7758979ULL, 0x00275a4ee1631a3aULL,
- 0x00d26bc0ed78b683ULL, 0x004f8355ea21064fULL,
- 0x00d618e1a32696e5ULL, 0x008d8d7b150e5680ULL,
- 0x00a74cd854b278d2ULL, 0x001dd62702203ea0ULL)},
- {FIELD_LITERAL(0x00f89335c2a59286ULL, 0x00a0f5c905d55141ULL,
- 0x00b41fb836ee9382ULL, 0x00e235d51730ca43ULL,
- 0x00a5cb37b5c0a69aULL, 0x009b966ffe136c45ULL,
- 0x00cb2ea10bf80ed1ULL, 0x00fb2b370b40dc35ULL)},
- {FIELD_LITERAL(0x00d687d16d4ee8baULL, 0x0071520bdd069dffULL,
- 0x00de85c60d32355dULL, 0x0087d2e3565102f4ULL,
- 0x00cde391b8dfc9aaULL, 0x00e18d69efdfefe5ULL,
- 0x004a9d0591954e91ULL, 0x00fa36dd8b50eee5ULL)},
- }}, {{
- {FIELD_LITERAL(0x002e788749a865f7ULL, 0x006e4dc3116861eaULL,
- 0x009f1428c37276e6ULL, 0x00e7d2e0fc1e1226ULL,
- 0x003aeebc6b6c45f6ULL, 0x0071a8073bf500c9ULL,
- 0x004b22ad986b530cULL, 0x00f439e63c0d79d4ULL)},
- {FIELD_LITERAL(0x006bc3d53011f470ULL, 0x00032d6e692b83e8ULL,
- 0x00059722f497cd0bULL, 0x0009b4e6f0c497ccULL,
- 0x0058a804b7cce6c0ULL, 0x002b71d3302bbd5dULL,
- 0x00e2f82a36765fceULL, 0x008dded99524c703ULL)},
- {FIELD_LITERAL(0x004d058953747d64ULL, 0x00701940fe79aa6fULL,
- 0x00a620ac71c760bfULL, 0x009532b611158b75ULL,
- 0x00547ed7f466f300ULL, 0x003cb5ab53a8401aULL,
- 0x00c7763168ce3120ULL, 0x007e48e33e4b9ab2ULL)},
- }}, {{
- {FIELD_LITERAL(0x001b2fc57bf3c738ULL, 0x006a3f918993fb80ULL,
- 0x0026f7a14fdec288ULL, 0x0075a2cdccef08dbULL,
- 0x00d3ecbc9eecdbf1ULL, 0x0048c40f06e5bf7fULL,
- 0x00d63e423009896bULL, 0x000598bc99c056a8ULL)},
- {FIELD_LITERAL(0x002f194eaafa46dcULL, 0x008e38f57fe87613ULL,
- 0x00dc8e5ae25f4ab2ULL, 0x000a17809575e6bdULL,
- 0x00d3ec7923ba366aULL, 0x003a7e72e0ad75e3ULL,
- 0x0010024b88436e0aULL, 0x00ed3c5444b64051ULL)},
- {FIELD_LITERAL(0x00831fc1340af342ULL, 0x00c9645669466d35ULL,
- 0x007692b4cc5a080fULL, 0x009fd4a47ac9259fULL,
- 0x001eeddf7d45928bULL, 0x003c0446fc45f28bULL,
- 0x002c0713aa3e2507ULL, 0x0095706935f0f41eULL)},
- }}, {{
- {FIELD_LITERAL(0x00766ae4190ec6d8ULL, 0x0065768cabc71380ULL,
- 0x00b902598416cdc2ULL, 0x00380021ad38df52ULL,
- 0x008f0b89d6551134ULL, 0x004254d4cc62c5a5ULL,
- 0x000d79f4484b9b94ULL, 0x00b516732ae3c50eULL)},
- {FIELD_LITERAL(0x001fb73475c45509ULL, 0x00d2b2e5ea43345aULL,
- 0x00cb3c3842077bd1ULL, 0x0029f90ad820946eULL,
- 0x007c11b2380778aaULL, 0x009e54ece62c1704ULL,
- 0x004bc60c41ca01c3ULL, 0x004525679a5a0b03ULL)},
- {FIELD_LITERAL(0x00c64fbddbed87b3ULL, 0x0040601d11731faaULL,
- 0x009c22475b6f9d67ULL, 0x0024b79dae875f15ULL,
- 0x00616fed3f02c3b0ULL, 0x0000cf39f6af2d3bULL,
- 0x00c46bac0aa9a688ULL, 0x00ab23e2800da204ULL)},
- }}, {{
- {FIELD_LITERAL(0x000b3a37617632b0ULL, 0x00597199fe1cfb6cULL,
- 0x0042a7ccdfeafdd6ULL, 0x004cc9f15ebcea17ULL,
- 0x00f436e596a6b4a4ULL, 0x00168861142df0d8ULL,
- 0x000753edfec26af5ULL, 0x000c495d7e388116ULL)},
- {FIELD_LITERAL(0x0017085f4a346148ULL, 0x00c7cf7a37f62272ULL,
- 0x001776e129bc5c30ULL, 0x009955134c9eef2aULL,
- 0x001ba5bdf1df07beULL, 0x00ec39497103a55cULL,
- 0x006578354fda6cfbULL, 0x005f02719d4f15eeULL)},
- {FIELD_LITERAL(0x0052b9d9b5d9655dULL, 0x00d4ec7ba1b461c3ULL,
- 0x00f95df4974f280bULL, 0x003d8e5ca11aeb51ULL,
- 0x00d4981eb5a70b26ULL, 0x000af9a4f6659f29ULL,
- 0x004598c846faeb43ULL, 0x0049d9a183a47670ULL)},
- }}, {{
- {FIELD_LITERAL(0x000a72d23dcb3f1fULL, 0x00a3737f84011727ULL,
- 0x00f870c0fbbf4a47ULL, 0x00a7aadd04b5c9caULL,
- 0x000c7715c67bd072ULL, 0x00015a136afcd74eULL,
- 0x0080d5caea499634ULL, 0x0026b448ec7514b7ULL)},
- {FIELD_LITERAL(0x00b60167d9e7d065ULL, 0x00e60ba0d07381e8ULL,
- 0x003a4f17b725c2d4ULL, 0x006c19fe176b64faULL,
- 0x003b57b31af86ccbULL, 0x0021047c286180fdULL,
- 0x00bdc8fb00c6dbb6ULL, 0x00fe4a9f4bab4f3fULL)},
- {FIELD_LITERAL(0x0088ffc3a16111f7ULL, 0x009155e4245d0bc8ULL,
- 0x00851d68220572d5ULL, 0x00557ace1e514d29ULL,
- 0x0031d7c339d91022ULL, 0x00101d0ae2eaceeaULL,
- 0x00246ab3f837b66aULL, 0x00d5216d381ff530ULL)},
- }}, {{
- {FIELD_LITERAL(0x0057e7ea35f36daeULL, 0x00f47d7ad15de22eULL,
- 0x00d757ea4b105115ULL, 0x008311457d579d7eULL,
- 0x00b49b75b1edd4ebULL, 0x0081c7ff742fd63aULL,
- 0x00ddda3187433df6ULL, 0x00475727d55f9c66ULL)},
- {FIELD_LITERAL(0x00a6295218dc136aULL, 0x00563b3af0e9c012ULL,
- 0x00d3753b0145db1bULL, 0x004550389c043dc1ULL,
- 0x00ea94ae27401bdfULL, 0x002b0b949f2b7956ULL,
- 0x00c63f780ad8e23cULL, 0x00e591c47d6bab15ULL)},
- {FIELD_LITERAL(0x00416c582b058eb6ULL, 0x004107da5b2cc695ULL,
- 0x00b3cd2556aeec64ULL, 0x00c0b418267e57a1ULL,
- 0x001799293579bd2eULL, 0x0046ed44590e4d07ULL,
- 0x001d7459b3630a1eULL, 0x00c6afba8b6696aaULL)},
- }}, {{
- {FIELD_LITERAL(0x008d6009b26da3f8ULL, 0x00898e88ca06b1caULL,
- 0x00edb22b2ed7fe62ULL, 0x00fbc93516aabe80ULL,
- 0x008b4b470c42ce0dULL, 0x00e0032ba7d0dcbbULL,
- 0x00d76da3a956ecc8ULL, 0x007f20fe74e3852aULL)},
- {FIELD_LITERAL(0x002419222c607674ULL, 0x00a7f23af89188b3ULL,
- 0x00ad127284e73d1cULL, 0x008bba582fae1c51ULL,
- 0x00fc6aa7ca9ecab1ULL, 0x003df5319eb6c2baULL,
- 0x002a05af8a8b199aULL, 0x004bf8354558407cULL)},
- {FIELD_LITERAL(0x00ce7d4a30f0fcbfULL, 0x00d02c272629f03dULL,
- 0x0048c001f7400bc2ULL, 0x002c21368011958dULL,
- 0x0098a550391e96b5ULL, 0x002d80b66390f379ULL,
- 0x001fa878760cc785ULL, 0x001adfce54b613d5ULL)},
- }}, {{
- {FIELD_LITERAL(0x001ed4dc71fa2523ULL, 0x005d0bff19bf9b5cULL,
- 0x00c3801cee065a64ULL, 0x001ed0b504323fbfULL,
- 0x0003ab9fdcbbc593ULL, 0x00df82070178b8d2ULL,
- 0x00a2bcaa9c251f85ULL, 0x00c628a3674bd02eULL)},
- {FIELD_LITERAL(0x006b7a0674f9f8deULL, 0x00a742414e5c7cffULL,
- 0x0041cbf3c6e13221ULL, 0x00e3a64fd207af24ULL,
- 0x0087c05f15fbe8d1ULL, 0x004c50936d9e8a33ULL,
- 0x001306ec21042b6dULL, 0x00a4f4137d1141c2ULL)},
- {FIELD_LITERAL(0x0009e6fb921568b0ULL, 0x00b3c60120219118ULL,
- 0x002a6c3460dd503aULL, 0x009db1ef11654b54ULL,
- 0x0063e4bf0be79601ULL, 0x00670d34bb2592b9ULL,
- 0x00dcee2f6c4130ceULL, 0x00b2682e88e77f54ULL)},
- }}, {{
- {FIELD_LITERAL(0x000d5b4b3da135abULL, 0x00838f3e5064d81dULL,
- 0x00d44eb50f6d94edULL, 0x0008931ab502ac6dULL,
- 0x00debe01ca3d3586ULL, 0x0025c206775f0641ULL,
- 0x005ad4b6ae912763ULL, 0x007e2c318ad8f247ULL)},
- {FIELD_LITERAL(0x00ddbe0750dd1addULL, 0x004b3c7b885844b8ULL,
- 0x00363e7ecf12f1aeULL, 0x0062e953e6438f9dULL,
- 0x0023cc73b076afe9ULL, 0x00b09fa083b4da32ULL,
- 0x00c7c3d2456c541dULL, 0x005b591ec6b694d4ULL)},
- {FIELD_LITERAL(0x0028656e19d62fcfULL, 0x0052a4af03df148dULL,
- 0x00122765ddd14e42ULL, 0x00f2252904f67157ULL,
- 0x004741965b636f3aULL, 0x006441d296132cb9ULL,
- 0x005e2106f956a5b7ULL, 0x00247029592d335cULL)},
- }}, {{
- {FIELD_LITERAL(0x003fe038eb92f894ULL, 0x000e6da1b72e8e32ULL,
- 0x003a1411bfcbe0faULL, 0x00b55d473164a9e4ULL,
- 0x00b9a775ac2df48dULL, 0x0002ddf350659e21ULL,
- 0x00a279a69eb19cb3ULL, 0x00f844eab25cba44ULL)},
- {FIELD_LITERAL(0x00c41d1f9c1f1ac1ULL, 0x007b2df4e9f19146ULL,
- 0x00b469355fd5ba7aULL, 0x00b5e1965afc852aULL,
- 0x00388d5f1e2d8217ULL, 0x0022079e4c09ae93ULL,
- 0x0014268acd4ef518ULL, 0x00c1dd8d9640464cULL)},
- {FIELD_LITERAL(0x0038526adeed0c55ULL, 0x00dd68c607e3fe85ULL,
- 0x00f746ddd48a5d57ULL, 0x0042f2952b963b7cULL,
- 0x001cbbd6876d5ec2ULL, 0x005e341470bca5c2ULL,
- 0x00871d41e085f413ULL, 0x00e53ab098f45732ULL)},
- }}, {{
- {FIELD_LITERAL(0x004d51124797c831ULL, 0x008f5ae3750347adULL,
- 0x0070ced94c1a0c8eULL, 0x00f6db2043898e64ULL,
- 0x000d00c9a5750cd0ULL, 0x000741ec59bad712ULL,
- 0x003c9d11aab37b7fULL, 0x00a67ba169807714ULL)},
- {FIELD_LITERAL(0x00adb2c1566e8b8fULL, 0x0096c68a35771a9aULL,
- 0x00869933356f334aULL, 0x00ba9c93459f5962ULL,
- 0x009ec73fb6e8ca4bULL, 0x003c3802c27202e1ULL,
- 0x0031f5b733e0c008ULL, 0x00f9058c19611fa9ULL)},
- {FIELD_LITERAL(0x00238f01814a3421ULL, 0x00c325a44b6cce28ULL,
- 0x002136f97aeb0e73ULL, 0x000cac8268a4afe2ULL,
- 0x0022fd218da471b3ULL, 0x009dcd8dfff8def9ULL,
- 0x00cb9f8181d999bbULL, 0x00143ae56edea349ULL)},
- }}, {{
- {FIELD_LITERAL(0x0000623bf87622c5ULL, 0x00a1966fdd069496ULL,
- 0x00c315b7b812f9fcULL, 0x00bdf5efcd128b97ULL,
- 0x001d464f532e3e16ULL, 0x003cd94f081bfd7eULL,
- 0x00ed9dae12ce4009ULL, 0x002756f5736eee70ULL)},
- {FIELD_LITERAL(0x00a5187e6ee7341bULL, 0x00e6d52e82d83b6eULL,
- 0x00df3c41323094a7ULL, 0x00b3324f444e9de9ULL,
- 0x00689eb21a35bfe5ULL, 0x00f16363becd548dULL,
- 0x00e187cc98e7f60fULL, 0x00127d9062f0ccabULL)},
- {FIELD_LITERAL(0x004ad71b31c29e40ULL, 0x00a5fcace12fae29ULL,
- 0x004425b5597280edULL, 0x00e7ef5d716c3346ULL,
- 0x0010b53ada410ac8ULL, 0x0092310226060c9bULL,
- 0x0091c26128729c7eULL, 0x0088b42900f8ec3bULL)},
- }}, {{
- {FIELD_LITERAL(0x00f1e26e9762d4a8ULL, 0x00d9d74082183414ULL,
- 0x00ffec9bd57a0282ULL, 0x000919e128fd497aULL,
- 0x00ab7ae7d00fe5f8ULL, 0x0054dc442851ff68ULL,
- 0x00c9ebeb3b861687ULL, 0x00507f7cab8b698fULL)},
- {FIELD_LITERAL(0x00c13c5aae3ae341ULL, 0x009c6c9ed98373e7ULL,
- 0x00098f26864577a8ULL, 0x0015b886e9488b45ULL,
- 0x0037692c42aadba5ULL, 0x00b83170b8e7791cULL,
- 0x001670952ece1b44ULL, 0x00fd932a39276da2ULL)},
- {FIELD_LITERAL(0x0081a3259bef3398ULL, 0x005480fff416107bULL,
- 0x00ce4f607d21be98ULL, 0x003ffc084b41df9bULL,
- 0x0043d0bb100502d1ULL, 0x00ec35f575ba3261ULL,
- 0x00ca18f677300ef3ULL, 0x00e8bb0a827d8548ULL)},
- }}, {{
- {FIELD_LITERAL(0x00df76b3328ada72ULL, 0x002e20621604a7c2ULL,
- 0x00f910638a105b09ULL, 0x00ef4724d96ef2cdULL,
- 0x00377d83d6b8a2f7ULL, 0x00b4f48805ade324ULL,
- 0x001cd5da8b152018ULL, 0x0045af671a20ca7fULL)},
- {FIELD_LITERAL(0x009ae3b93a56c404ULL, 0x004a410b7a456699ULL,
- 0x00023a619355e6b2ULL, 0x009cdc7297387257ULL,
- 0x0055b94d4ae70d04ULL, 0x002cbd607f65b005ULL,
- 0x003208b489697166ULL, 0x00ea2aa058867370ULL)},
- {FIELD_LITERAL(0x00f29d2598ee3f32ULL, 0x00b4ac5385d82adcULL,
- 0x007633eaf04df19bULL, 0x00aa2d3d77ceab01ULL,
- 0x004a2302fcbb778aULL, 0x00927f225d5afa34ULL,
- 0x004a8e9d5047f237ULL, 0x008224ae9dbce530ULL)},
- }}, {{
- {FIELD_LITERAL(0x001cf640859b02f8ULL, 0x00758d1d5d5ce427ULL,
- 0x00763c784ef4604cULL, 0x005fa81aee205270ULL,
- 0x00ac537bfdfc44cbULL, 0x004b919bd342d670ULL,
- 0x00238508d9bf4b7aULL, 0x00154888795644f3ULL)},
- {FIELD_LITERAL(0x00c845923c084294ULL, 0x00072419a201bc25ULL,
- 0x0045f408b5f8e669ULL, 0x00e9d6a186b74dfeULL,
- 0x00e19108c68fa075ULL, 0x0017b91d874177b7ULL,
- 0x002f0ca2c7912c5aULL, 0x009400aa385a90a2ULL)},
- {FIELD_LITERAL(0x0071110b01482184ULL, 0x00cfed0044f2bef8ULL,
- 0x0034f2901cf4662eULL, 0x003b4ae2a67f9834ULL,
- 0x00cca9b96fe94810ULL, 0x00522507ae77abd0ULL,
- 0x00bac7422721e73eULL, 0x0066622b0f3a62b0ULL)},
- }}, {{
- {FIELD_LITERAL(0x00f8ac5cf4705b6aULL, 0x00867d82dcb457e3ULL,
- 0x007e13ab2ccc2ce9ULL, 0x009ee9a018d3930eULL,
- 0x008370f8ecb42df8ULL, 0x002d9f019add263eULL,
- 0x003302385b92d196ULL, 0x00a15654536e2c0cULL)},
- {FIELD_LITERAL(0x0026ef1614e160afULL, 0x00c023f9edfc9c76ULL,
- 0x00cff090da5f57baULL, 0x0076db7a66643ae9ULL,
- 0x0019462f8c646999ULL, 0x008fec00b3854b22ULL,
- 0x00d55041692a0a1cULL, 0x0065db894215ca00ULL)},
- {FIELD_LITERAL(0x00a925036e0a451cULL, 0x002a0390c36b6cc1ULL,
- 0x00f27020d90894f4ULL, 0x008d90d52cbd3d7fULL,
- 0x00e1d0137392f3b8ULL, 0x00f017c158b51a8fULL,
- 0x00cac313d3ed7dbcULL, 0x00b99a81e3eb42d3ULL)},
- }}, {{
- {FIELD_LITERAL(0x00b54850275fe626ULL, 0x0053a3fd1ec71140ULL,
- 0x00e3d2d7dbe096faULL, 0x00e4ac7b595cce4cULL,
- 0x0077bad449c0a494ULL, 0x00b7c98814afd5b3ULL,
- 0x0057226f58486cf9ULL, 0x00b1557154f0cc57ULL)},
- {FIELD_LITERAL(0x008cc9cd236315c0ULL, 0x0031d9c5b39fda54ULL,
- 0x00a5713ef37e1171ULL, 0x00293d5ae2886325ULL,
- 0x00c4aba3e05015e1ULL, 0x0003f35ef78e4fc6ULL,
- 0x0039d6bd3ac1527bULL, 0x0019d7c3afb77106ULL)},
- {FIELD_LITERAL(0x007b162931a985afULL, 0x00ad40a2e0daa713ULL,
- 0x006df27c4009f118ULL, 0x00503e9f4e2e8becULL,
- 0x00751a77c82c182dULL, 0x000298937769245bULL,
- 0x00ffb1e8fabf9ee5ULL, 0x0008334706e09abeULL)},
- }}, {{
- {FIELD_LITERAL(0x00dbca4e98a7dcd9ULL, 0x00ee29cfc78bde99ULL,
- 0x00e4a3b6995f52e9ULL, 0x0045d70189ae8096ULL,
- 0x00fd2a8a3b9b0d1bULL, 0x00af1793b107d8e1ULL,
- 0x00dbf92cbe4afa20ULL, 0x00da60f798e3681dULL)},
- {FIELD_LITERAL(0x004246bfcecc627aULL, 0x004ba431246c03a4ULL,
- 0x00bd1d101872d497ULL, 0x003b73d3f185ee16ULL,
- 0x001feb2e2678c0e3ULL, 0x00ff13c5a89dec76ULL,
- 0x00ed06042e771d8fULL, 0x00a4fd2a897a83ddULL)},
- {FIELD_LITERAL(0x009a4a3be50d6597ULL, 0x00de3165fc5a1096ULL,
- 0x004f3f56e345b0c7ULL, 0x00f7bf721d5ab8bcULL,
- 0x004313e47b098c50ULL, 0x00e4c7d5c0e1adbbULL,
- 0x002e3e3db365051eULL, 0x00a480c2cd6a96fbULL)},
- }}, {{
- {FIELD_LITERAL(0x00417fa30a7119edULL, 0x00af257758419751ULL,
- 0x00d358a487b463d4ULL, 0x0089703cc720b00dULL,
- 0x00ce56314ff7f271ULL, 0x0064db171ade62c1ULL,
- 0x00640b36d4a22fedULL, 0x00424eb88696d23fULL)},
- {FIELD_LITERAL(0x004ede34af2813f3ULL, 0x00d4a8e11c9e8216ULL,
- 0x004796d5041de8a5ULL, 0x00c4c6b4d21cc987ULL,
- 0x00e8a433ee07fa1eULL, 0x0055720b5abcc5a1ULL,
- 0x008873ea9c74b080ULL, 0x005b3fec1ab65d48ULL)},
- {FIELD_LITERAL(0x0047e5277db70ec5ULL, 0x000a096c66db7d6bULL,
- 0x00b4164cc1730159ULL, 0x004a9f783fe720feULL,
- 0x00a8177b94449dbcULL, 0x0095a24ff49a599fULL,
- 0x0069c1c578250cbcULL, 0x00452019213debf4ULL)},
- }}, {{
- {FIELD_LITERAL(0x0021ce99e09ebda3ULL, 0x00fcbd9f91875ad0ULL,
- 0x009bbf6b7b7a0b5fULL, 0x00388886a69b1940ULL,
- 0x00926a56d0f81f12ULL, 0x00e12903c3358d46ULL,
- 0x005dfce4e8e1ce9dULL, 0x0044cfa94e2f7e23ULL)},
- {FIELD_LITERAL(0x001bd59c09e982eaULL, 0x00f72daeb937b289ULL,
- 0x0018b76dca908e0eULL, 0x00edb498512384adULL,
- 0x00ce0243b6cc9538ULL, 0x00f96ff690cb4e70ULL,
- 0x007c77bf9f673c8dULL, 0x005bf704c088a528ULL)},
- {FIELD_LITERAL(0x0093d4628dcb33beULL, 0x0095263d51d42582ULL,
- 0x0049b3222458fe06ULL, 0x00e7fce73b653a7fULL,
- 0x003ca2ebce60b369ULL, 0x00c5de239a32bea4ULL,
- 0x0063b8b3d71fb6bfULL, 0x0039aeeb78a1a839ULL)},
- }}, {{
- {FIELD_LITERAL(0x007dc52da400336cULL, 0x001fded1e15b9457ULL,
- 0x00902e00f5568e3aULL, 0x00219bef40456d2dULL,
- 0x005684161fb3dbc9ULL, 0x004a4e9be49a76eaULL,
- 0x006e685ae88b78ffULL, 0x0021c42f13042d3cULL)},
- {FIELD_LITERAL(0x00fb22bb5fd3ce50ULL, 0x0017b48aada7ae54ULL,
- 0x00fd5c44ad19a536ULL, 0x000ccc4e4e55e45cULL,
- 0x00fd637d45b4c3f5ULL, 0x0038914e023c37cfULL,
- 0x00ac1881d6a8d898ULL, 0x00611ed8d3d943a8ULL)},
- {FIELD_LITERAL(0x0056e2259d113d2bULL, 0x00594819b284ec16ULL,
- 0x00c7bf794bb36696ULL, 0x00721ee75097cdc6ULL,
- 0x00f71be9047a2892ULL, 0x00df6ba142564edfULL,
- 0x0069580b7a184e8dULL, 0x00f056e38fca0feeULL)},
- }}, {{
- {FIELD_LITERAL(0x009df98566a18c6dULL, 0x00cf3a200968f219ULL,
- 0x0044ba60da6d9086ULL, 0x00dbc9c0e344da03ULL,
- 0x000f9401c4466855ULL, 0x00d46a57c5b0a8d1ULL,
- 0x00875a635d7ac7c6ULL, 0x00ef4a933b7e0ae6ULL)},
- {FIELD_LITERAL(0x005e8694077a1535ULL, 0x008bef75f71c8f1dULL,
- 0x000a7c1316423511ULL, 0x00906e1d70604320ULL,
- 0x003fc46c1a2ffbd6ULL, 0x00d1d5022e68f360ULL,
- 0x002515fba37bbf46ULL, 0x00ca16234e023b44ULL)},
- {FIELD_LITERAL(0x00787c99561f4690ULL, 0x00a857a8c1561f27ULL,
- 0x00a10df9223c09feULL, 0x00b98a9562e3b154ULL,
- 0x004330b8744c3ed2ULL, 0x00e06812807ec5c4ULL,
- 0x00e4cf6a7db9f1e3ULL, 0x00d95b089f132a34ULL)},
- }}, {{
- {FIELD_LITERAL(0x002922b39ca33eecULL, 0x0090d12a5f3ab194ULL,
- 0x00ab60c02fb5f8edULL, 0x00188d292abba1cfULL,
- 0x00e10edec9698f6eULL, 0x0069a4d9934133c8ULL,
- 0x0024aac40e6d3d06ULL, 0x001702c2177661b0ULL)},
- {FIELD_LITERAL(0x00139078397030bdULL, 0x000e3c447e859a00ULL,
- 0x0064a5b334c82393ULL, 0x00b8aabeb7358093ULL,
- 0x00020778bb9ae73bULL, 0x0032ee94c7892a18ULL,
- 0x008215253cb41bdaULL, 0x005e2797593517aeULL)},
- {FIELD_LITERAL(0x0083765a5f855d4aULL, 0x0051b6d1351b8ee2ULL,
- 0x00116de548b0f7bbULL, 0x0087bd88703affa0ULL,
- 0x0095b2cc34d7fdd2ULL, 0x0084cd81b53f0bc8ULL,
- 0x008562fc995350edULL, 0x00a39abb193651e3ULL)},
- }}, {{
- {FIELD_LITERAL(0x0019e23f0474b114ULL, 0x00eb94c2ad3b437eULL,
- 0x006ddb34683b75acULL, 0x00391f9209b564c6ULL,
- 0x00083b3bb3bff7aaULL, 0x00eedcd0f6dceefcULL,
- 0x00b50817f794fe01ULL, 0x0036474deaaa75c9ULL)},
- {FIELD_LITERAL(0x0091868594265aa2ULL, 0x00797accae98ca6dULL,
- 0x0008d8c5f0f8a184ULL, 0x00d1f4f1c2b2fe6eULL,
- 0x0036783dfb48a006ULL, 0x008c165120503527ULL,
- 0x0025fd780058ce9bULL, 0x0068beb007be7d27ULL)},
- {FIELD_LITERAL(0x00d0ff88aa7c90c2ULL, 0x00b2c60dacf53394ULL,
- 0x0094a7284d9666d6ULL, 0x00bed9022ce7a19dULL,
- 0x00c51553f0cd7682ULL, 0x00c3fb870b124992ULL,
- 0x008d0bc539956c9bULL, 0x00fc8cf258bb8885ULL)},
- }}, {{
- {FIELD_LITERAL(0x003667bf998406f8ULL, 0x0000115c43a12975ULL,
- 0x001e662f3b20e8fdULL, 0x0019ffa534cb24ebULL,
- 0x00016be0dc8efb45ULL, 0x00ff76a8b26243f5ULL,
- 0x00ae20d241a541e3ULL, 0x0069bd6af13cd430ULL)},
- {FIELD_LITERAL(0x0045fdc16487cda3ULL, 0x00b2d8e844cf2ed7ULL,
- 0x00612c50e88c1607ULL, 0x00a08aabc66c1672ULL,
- 0x006031fdcbb24d97ULL, 0x001b639525744b93ULL,
- 0x004409d62639ab17ULL, 0x00a1853d0347ab1dULL)},
- {FIELD_LITERAL(0x0075a1a56ebf5c21ULL, 0x00a3e72be9ac53edULL,
- 0x00efcde1629170c2ULL, 0x0004225fe91ef535ULL,
- 0x0088049fc73dfda7ULL, 0x004abc74857e1288ULL,
- 0x0024e2434657317cULL, 0x00d98cb3d3e5543cULL)},
- }}, {{
- {FIELD_LITERAL(0x00b4b53eab6bdb19ULL, 0x009b22d8b43711d0ULL,
- 0x00d948b9d961785dULL, 0x00cb167b6f279eadULL,
- 0x00191de3a678e1c9ULL, 0x00d9dd9511095c2eULL,
- 0x00f284324cd43067ULL, 0x00ed74fa535151ddULL)},
- {FIELD_LITERAL(0x007e32c049b5c477ULL, 0x009d2bfdbd9bcfd8ULL,
- 0x00636e93045938c6ULL, 0x007fde4af7687298ULL,
- 0x0046a5184fafa5d3ULL, 0x0079b1e7f13a359bULL,
- 0x00875adf1fb927d6ULL, 0x00333e21c61bcad2ULL)},
- {FIELD_LITERAL(0x00048014f73d8b8dULL, 0x0075684aa0966388ULL,
- 0x0092be7df06dc47cULL, 0x0097cebcd0f5568aULL,
- 0x005a7004d9c4c6a9ULL, 0x00b0ecbb659924c7ULL,
- 0x00d90332dd492a7cULL, 0x0057fc14df11493dULL)},
- }}, {{
- {FIELD_LITERAL(0x0008ed8ea0ad95beULL, 0x0041d324b9709645ULL,
- 0x00e25412257a19b4ULL, 0x0058df9f3423d8d2ULL,
- 0x00a9ab20def71304ULL, 0x009ae0dbf8ac4a81ULL,
- 0x00c9565977e4392aULL, 0x003c9269444baf55ULL)},
- {FIELD_LITERAL(0x007df6cbb926830bULL, 0x00d336058ae37865ULL,
- 0x007af47dac696423ULL, 0x0048d3011ec64ac8ULL,
- 0x006b87666e40049fULL, 0x0036a2e0e51303d7ULL,
- 0x00ba319bd79dbc55ULL, 0x003e2737ecc94f53ULL)},
- {FIELD_LITERAL(0x00d296ff726272d9ULL, 0x00f6d097928fcf57ULL,
- 0x00e0e616a55d7013ULL, 0x00deaf454ed9eac7ULL,
- 0x0073a56bedef4d92ULL, 0x006ccfdf6fc92e19ULL,
- 0x009d1ee1371a7218ULL, 0x00ee3c2ee4462d80ULL)},
- }}, {{
- {FIELD_LITERAL(0x00437bce9bccdf9dULL, 0x00e0c8e2f85dc0a3ULL,
- 0x00c91a7073995a19ULL, 0x00856ec9fe294559ULL,
- 0x009e4b33394b156eULL, 0x00e245b0dc497e5cULL,
- 0x006a54e687eeaeffULL, 0x00f1cd1cd00fdb7cULL)},
- {FIELD_LITERAL(0x008132ae5c5d8cd1ULL, 0x00121d68324a1d9fULL,
- 0x00d6be9dafcb8c76ULL, 0x00684d9070edf745ULL,
- 0x00519fbc96d7448eULL, 0x00388182fdc1f27eULL,
- 0x000235baed41f158ULL, 0x00bf6cf6f1a1796aULL)},
- {FIELD_LITERAL(0x002adc4b4d148219ULL, 0x003084ada0d3a90aULL,
- 0x0046de8aab0f2e4eULL, 0x00452d342a67b5fdULL,
- 0x00d4b50f01d4de21ULL, 0x00db6d9fc0cefb79ULL,
- 0x008c184c86a462cdULL, 0x00e17c83764d42daULL)},
- }}, {{
- {FIELD_LITERAL(0x007b2743b9a1e01aULL, 0x007847ffd42688c4ULL,
- 0x006c7844d610a316ULL, 0x00f0cb8b250aa4b0ULL,
- 0x00a19060143b3ae6ULL, 0x0014eb10b77cfd80ULL,
- 0x000170905729dd06ULL, 0x00063b5b9cd72477ULL)},
- {FIELD_LITERAL(0x00ce382dc7993d92ULL, 0x00021153e938b4c8ULL,
- 0x00096f7567f48f51ULL, 0x0058f81ddfe4b0d5ULL,
- 0x00cc379a56b355c7ULL, 0x002c760770d3e819ULL,
- 0x00ee22d1d26e5a40ULL, 0x00de6d93d5b082d7ULL)},
- {FIELD_LITERAL(0x000a91a42c52e056ULL, 0x00185f6b77fce7eaULL,
- 0x000803c51962f6b5ULL, 0x0022528582ba563dULL,
- 0x0043f8040e9856d6ULL, 0x0085a29ec81fb860ULL,
- 0x005f9a611549f5ffULL, 0x00c1f974ecbd4b06ULL)},
- }}, {{
- {FIELD_LITERAL(0x005b64c6fd65ec97ULL, 0x00c1fdd7f877bc7fULL,
- 0x000d9cc6c89f841cULL, 0x005c97b7f1aff9adULL,
- 0x0075e3c61475d47eULL, 0x001ecb1ba8153011ULL,
- 0x00fe7f1c8d71d40dULL, 0x003fa9757a229832ULL)},
- {FIELD_LITERAL(0x00ffc5c89d2b0cbaULL, 0x00d363d42e3e6fc3ULL,
- 0x0019a1a0118e2e8aULL, 0x00f7baeff48882e1ULL,
- 0x001bd5af28c6b514ULL, 0x0055476ca2253cb2ULL,
- 0x00d8eb1977e2ddf3ULL, 0x00b173b1adb228a1ULL)},
- {FIELD_LITERAL(0x00f2cb99dd0ad707ULL, 0x00e1e08b6859ddd8ULL,
- 0x000008f2d0650bccULL, 0x00d7ed392f8615c3ULL,
- 0x00976750a94da27fULL, 0x003e83bb0ecb69baULL,
- 0x00df8e8d15c14ac6ULL, 0x00f9f7174295d9c2ULL)},
- }}, {{
- {FIELD_LITERAL(0x00f11cc8e0e70bcbULL, 0x00e5dc689974e7ddULL,
- 0x0014e409f9ee5870ULL, 0x00826e6689acbd63ULL,
- 0x008a6f4e3d895d88ULL, 0x00b26a8da41fd4adULL,
- 0x000fb7723f83efd7ULL, 0x009c749db0a5f6c3ULL)},
- {FIELD_LITERAL(0x002389319450f9baULL, 0x003677f31aa1250aULL,
- 0x0092c3db642f38cbULL, 0x00f8b64c0dfc9773ULL,
- 0x00cd49fe3505b795ULL, 0x0068105a4090a510ULL,
- 0x00df0ba2072a8bb6ULL, 0x00eb396143afd8beULL)},
- {FIELD_LITERAL(0x00a0d4ecfb24cdffULL, 0x00ddaf8008ba6479ULL,
- 0x00f0b3e36d4b0f44ULL, 0x003734bd3af1f146ULL,
- 0x00b87e2efc75527eULL, 0x00d230df55ddab50ULL,
- 0x002613257ae56c1dULL, 0x00bc0946d135934dULL)},
- }}, {{
- {FIELD_LITERAL(0x00468711bd994651ULL, 0x0033108fa67561bfULL,
- 0x0089d760192a54b4ULL, 0x00adc433de9f1871ULL,
- 0x000467d05f36e050ULL, 0x007847e0f0579f7fULL,
- 0x00a2314ad320052dULL, 0x00b3a93649f0b243ULL)},
- {FIELD_LITERAL(0x0067f8f0c4fe26c9ULL, 0x0079c4a3cc8f67b9ULL,
- 0x0082b1e62f23550dULL, 0x00f2d409caefd7f5ULL,
- 0x0080e67dcdb26e81ULL, 0x0087ae993ea1f98aULL,
- 0x00aa108becf61d03ULL, 0x001acf11efb608a3ULL)},
- {FIELD_LITERAL(0x008225febbab50d9ULL, 0x00f3b605e4dd2083ULL,
- 0x00a32b28189e23d2ULL, 0x00d507e5e5eb4c97ULL,
- 0x005a1a84e302821fULL, 0x0006f54c1c5f08c7ULL,
- 0x00a347c8cb2843f0ULL, 0x0009f73e9544bfa5ULL)},
- }}, {{
- {FIELD_LITERAL(0x006c59c9ae744185ULL, 0x009fc32f1b4282cdULL,
- 0x004d6348ca59b1acULL, 0x00105376881be067ULL,
- 0x00af4096013147dcULL, 0x004abfb5a5cb3124ULL,
- 0x000d2a7f8626c354ULL, 0x009c6ed568e07431ULL)},
- {FIELD_LITERAL(0x00e828333c297f8bULL, 0x009ef3cf8c3f7e1fULL,
- 0x00ab45f8fff31cb9ULL, 0x00c8b4178cb0b013ULL,
- 0x00d0c50dd3260a3fULL, 0x0097126ac257f5bcULL,
- 0x0042376cc90c705aULL, 0x001d96fdb4a1071eULL)},
- {FIELD_LITERAL(0x00542d44d89ee1a8ULL, 0x00306642e0442d98ULL,
- 0x0090853872b87338ULL, 0x002362cbf22dc044ULL,
- 0x002c222adff663b8ULL, 0x0067c924495fcb79ULL,
- 0x000e621d983c977cULL, 0x00df77a9eccb66fbULL)},
- }}, {{
- {FIELD_LITERAL(0x002809e4bbf1814aULL, 0x00b9e854f9fafb32ULL,
- 0x00d35e67c10f7a67ULL, 0x008f1bcb76e748cfULL,
- 0x004224d9515687d2ULL, 0x005ba0b774e620c4ULL,
- 0x00b5e57db5d54119ULL, 0x00e15babe5683282ULL)},
- {FIELD_LITERAL(0x00832d02369b482cULL, 0x00cba52ff0d93450ULL,
- 0x003fa9c908d554dbULL, 0x008d1e357b54122fULL,
- 0x00abd91c2dc950c6ULL, 0x007eff1df4c0ec69ULL,
- 0x003f6aeb13fb2d31ULL, 0x00002d6179fc5b2cULL)},
- {FIELD_LITERAL(0x0046c9eda81c9c89ULL, 0x00b60cb71c8f62fcULL,
- 0x0022f5a683baa558ULL, 0x00f87319fccdf997ULL,
- 0x009ca09b51ce6a22ULL, 0x005b12baf4af7d77ULL,
- 0x008a46524a1e33e2ULL, 0x00035a77e988be0dULL)},
- }}, {{
- {FIELD_LITERAL(0x00a7efe46a7dbe2fULL, 0x002f66fd55014fe7ULL,
- 0x006a428afa1ff026ULL, 0x0056caaa9604ab72ULL,
- 0x0033f3bcd7fac8aeULL, 0x00ccb1aa01c86764ULL,
- 0x00158d1edf13bf40ULL, 0x009848ee76fcf3b4ULL)},
- {FIELD_LITERAL(0x00a9e7730a819691ULL, 0x00d9cc73c4992b70ULL,
- 0x00e299bde067de5aULL, 0x008c314eb705192aULL,
- 0x00e7226f17e8a3ccULL, 0x0029dfd956e65a47ULL,
- 0x0053a8e839073b12ULL, 0x006f942b2ab1597eULL)},
- {FIELD_LITERAL(0x001c3d780ecd5e39ULL, 0x0094f247fbdcc5feULL,
- 0x00d5c786fd527764ULL, 0x00b6f4da74f0db2aULL,
- 0x0080f1f8badcd5fcULL, 0x00f36a373ad2e23bULL,
- 0x00f804f9f4343bf2ULL, 0x00d1af40ec623982ULL)},
- }}, {{
- {FIELD_LITERAL(0x0082aeace5f1b144ULL, 0x00f68b3108cf4dd3ULL,
- 0x00634af01dde3020ULL, 0x000beab5df5c2355ULL,
- 0x00e8b790d1b49b0bULL, 0x00e48d15854e36f4ULL,
- 0x0040ab2d95f3db9fULL, 0x002711c4ed9e899aULL)},
- {FIELD_LITERAL(0x0039343746531ebeULL, 0x00c8509d835d429dULL,
- 0x00e79eceff6b0018ULL, 0x004abfd31e8efce5ULL,
- 0x007bbfaaa1e20210ULL, 0x00e3be89c193e179ULL,
- 0x001c420f4c31d585ULL, 0x00f414a315bef5aeULL)},
- {FIELD_LITERAL(0x007c296a24990df8ULL, 0x00d5d07525a75588ULL,
- 0x00dd8e113e94b7e7ULL, 0x007bbc58febe0cc8ULL,
- 0x0029f51af9bfcad3ULL, 0x007e9311ec7ab6f3ULL,
- 0x009a884de1676343ULL, 0x0050d5f2dce84be9ULL)},
- }}, {{
- {FIELD_LITERAL(0x005fa020cca2450aULL, 0x00491c29db6416d8ULL,
- 0x0037cefe3f9f9a85ULL, 0x003d405230647066ULL,
- 0x0049e835f0fdbe89ULL, 0x00feb78ac1a0815cULL,
- 0x00828e4b32dc9724ULL, 0x00db84f2dc8d6fd4ULL)},
- {FIELD_LITERAL(0x0098cddc8b39549aULL, 0x006da37e3b05d22cULL,
- 0x00ce633cfd4eb3cbULL, 0x00fda288ef526acdULL,
- 0x0025338878c5d30aULL, 0x00f34438c4e5a1b4ULL,
- 0x00584efea7c310f1ULL, 0x0041a551f1b660adULL)},
- {FIELD_LITERAL(0x00d7f7a8fbd6437aULL, 0x0062872413bf3753ULL,
- 0x00ad4bbcb43c584bULL, 0x007fe49be601d7e3ULL,
- 0x0077c659789babf4ULL, 0x00eb45fcb06a741bULL,
- 0x005ce244913f9708ULL, 0x0088426401736326ULL)},
- }}, {{
- {FIELD_LITERAL(0x007bf562ca768d7cULL, 0x006c1f3a174e387cULL,
- 0x00f024b447fee939ULL, 0x007e7af75f01143fULL,
- 0x003adb70b4eed89dULL, 0x00e43544021ad79aULL,
- 0x0091f7f7042011f6ULL, 0x0093c1a1ee3a0ddcULL)},
- {FIELD_LITERAL(0x00a0b68ec1eb72d2ULL, 0x002c03235c0d45a0ULL,
- 0x00553627323fe8c5ULL, 0x006186e94b17af94ULL,
- 0x00a9906196e29f14ULL, 0x0025b3aee6567733ULL,
- 0x007e0dd840080517ULL, 0x0018eb5801a4ba93ULL)},
- {FIELD_LITERAL(0x00d7fe7017bf6a40ULL, 0x006e3f0624be0c42ULL,
- 0x00ffbba205358245ULL, 0x00f9fc2cf8194239ULL,
- 0x008d93b37bf15b4eULL, 0x006ddf2e38be8e95ULL,
- 0x002b6e79bf5fcff9ULL, 0x00ab355da425e2deULL)},
- }}, {{
- {FIELD_LITERAL(0x00938f97e20be973ULL, 0x0099141a36aaf306ULL,
- 0x0057b0ca29e545a1ULL, 0x0085db571f9fbc13ULL,
- 0x008b333c554b4693ULL, 0x0043ab6ef3e241cbULL,
- 0x0054fb20aa1e5c70ULL, 0x00be0ff852760adfULL)},
- {FIELD_LITERAL(0x003973d8938971d6ULL, 0x002aca26fa80c1f5ULL,
- 0x00108af1faa6b513ULL, 0x00daae275d7924e6ULL,
- 0x0053634ced721308ULL, 0x00d2355fe0bbd443ULL,
- 0x00357612b2d22095ULL, 0x00f9bb9dd4136cf3ULL)},
- {FIELD_LITERAL(0x002bff12cf5e03a5ULL, 0x001bdb1fa8a19cf8ULL,
- 0x00c91c6793f84d39ULL, 0x00f869f1b2eba9afULL,
- 0x0059bc547dc3236bULL, 0x00d91611d6d38689ULL,
- 0x00e062daaa2c0214ULL, 0x00ed3c047cc2bc82ULL)},
- }}, {{
- {FIELD_LITERAL(0x000050d70c32b31aULL, 0x001939d576d437b3ULL,
- 0x00d709e598bf9fe6ULL, 0x00a885b34bd2ee9eULL,
- 0x00dd4b5c08ab1a50ULL, 0x0091bebd50b55639ULL,
- 0x00cf79ff64acdbc6ULL, 0x006067a39d826336ULL)},
- {FIELD_LITERAL(0x0062dd0fb31be374ULL, 0x00fcc96b84c8e727ULL,
- 0x003f64f1375e6ae3ULL, 0x0057d9b6dd1af004ULL,
- 0x00d6a167b1103c7bULL, 0x00dd28f3180fb537ULL,
- 0x004ff27ad7167128ULL, 0x008934c33461f2acULL)},
- {FIELD_LITERAL(0x0065b472b7900043ULL, 0x00ba7efd2ff1064bULL,
- 0x000b67d6c4c3020fULL, 0x0012d28469f4e46dULL,
- 0x0031c32939703ec7ULL, 0x00b49f0bce133066ULL,
- 0x00f7e10416181d47ULL, 0x005c90f51867eeccULL)},
- }}, {{
- {FIELD_LITERAL(0x0051207abd179101ULL, 0x00fc2a5c20d9c5daULL,
- 0x00fb9d5f2701b6dfULL, 0x002dd040fdea82b8ULL,
- 0x00f163b0738442ffULL, 0x00d9736bd68855b8ULL,
- 0x00e0d8e93005e61cULL, 0x00df5a40b3988570ULL)},
- {FIELD_LITERAL(0x0006918f5dfce6dcULL, 0x00d4bf1c793c57fbULL,
- 0x0069a3f649435364ULL, 0x00e89a50e5b0cd6eULL,
- 0x00b9f6a237e973afULL, 0x006d4ed8b104e41dULL,
- 0x00498946a3924cd2ULL, 0x00c136ec5ac9d4f7ULL)},
- {FIELD_LITERAL(0x0011a9c290ac5336ULL, 0x002b9a2d4a6a6533ULL,
- 0x009a8a68c445d937ULL, 0x00361b27b07e5e5cULL,
- 0x003c043b1755b974ULL, 0x00b7eb66cf1155eeULL,
- 0x0077af5909eefff2ULL, 0x0098f609877cc806ULL)},
- }}, {{
- {FIELD_LITERAL(0x00ab13af436bf8f4ULL, 0x000bcf0a0dac8574ULL,
- 0x00d50c864f705045ULL, 0x00c40e611debc842ULL,
- 0x0085010489bd5caaULL, 0x007c5050acec026fULL,
- 0x00f67d943c8da6d1ULL, 0x00de1da0278074c6ULL)},
- {FIELD_LITERAL(0x00b373076597455fULL, 0x00e83f1af53ac0f5ULL,
- 0x0041f63c01dc6840ULL, 0x0097dea19b0c6f4bULL,
- 0x007f9d63b4c1572cULL, 0x00e692d492d0f5f0ULL,
- 0x00cbcb392e83b4adULL, 0x0069c0f39ed9b1a8ULL)},
- {FIELD_LITERAL(0x00861030012707c9ULL, 0x009fbbdc7fd4aafbULL,
- 0x008f591d6b554822ULL, 0x00df08a41ea18adeULL,
- 0x009d7d83e642abeaULL, 0x0098c71bda3b78ffULL,
- 0x0022c89e7021f005ULL, 0x0044d29a3fe1e3c4ULL)},
- }}, {{
- {FIELD_LITERAL(0x00e748cd7b5c52f2ULL, 0x00ea9df883f89cc3ULL,
- 0x0018970df156b6c7ULL, 0x00c5a46c2a33a847ULL,
- 0x00cbde395e32aa09ULL, 0x0072474ebb423140ULL,
- 0x00fb00053086a23dULL, 0x001dafcfe22d4e1fULL)},
- {FIELD_LITERAL(0x00c903ee6d825540ULL, 0x00add6c4cf98473eULL,
- 0x007636efed4227f1ULL, 0x00905124ae55e772ULL,
- 0x00e6b38fab12ed53ULL, 0x0045e132b863fe55ULL,
- 0x003974662edb366aULL, 0x00b1787052be8208ULL)},
- {FIELD_LITERAL(0x00a614b00d775c7cULL, 0x00d7c78941cc7754ULL,
- 0x00422dd68b5dabc4ULL, 0x00a6110f0167d28bULL,
- 0x00685a309c252886ULL, 0x00b439ffd5143660ULL,
- 0x003656e29ee7396fULL, 0x00c7c9b9ed5ad854ULL)},
- }}, {{
- {FIELD_LITERAL(0x0040f7e7c5b37bf2ULL, 0x0064e4dc81181bbaULL,
- 0x00a8767ae2a366b6ULL, 0x001496b4f90546f2ULL,
- 0x002a28493f860441ULL, 0x0021f59513049a3aULL,
- 0x00852d369a8b7ee3ULL, 0x00dd2e7d8b7d30a9ULL)},
- {FIELD_LITERAL(0x00006e34a35d9fbcULL, 0x00eee4e48b2f019aULL,
- 0x006b344743003a5fULL, 0x00541d514f04a7e3ULL,
- 0x00e81f9ee7647455ULL, 0x005e2b916c438f81ULL,
- 0x00116f8137b7eff0ULL, 0x009bd3decc7039d1ULL)},
- {FIELD_LITERAL(0x0005d226f434110dULL, 0x00af8288b8ef21d5ULL,
- 0x004a7a52ef181c8cULL, 0x00be0b781b4b06deULL,
- 0x00e6e3627ded07e1ULL, 0x00e43aa342272b8bULL,
- 0x00e86ab424577d84ULL, 0x00fb292c566e35bbULL)},
- }}, {{
- {FIELD_LITERAL(0x00334f5303ea1222ULL, 0x00dfb3dbeb0a5d3eULL,
- 0x002940d9592335c1ULL, 0x00706a7a63e8938aULL,
- 0x005a533558bc4cafULL, 0x00558e33192022a9ULL,
- 0x00970d9faf74c133ULL, 0x002979fcb63493caULL)},
- {FIELD_LITERAL(0x00e38abece3c82abULL, 0x005a51f18a2c7a86ULL,
- 0x009dafa2e86d592eULL, 0x00495a62eb688678ULL,
- 0x00b79df74c0eb212ULL, 0x0023e8cc78b75982ULL,
- 0x005998cb91075e13ULL, 0x00735aa9ba61bc76ULL)},
- {FIELD_LITERAL(0x00d9f7a82ddbe628ULL, 0x00a1fc782889ae0fULL,
- 0x0071ffda12d14b66ULL, 0x0037cf4eca7fb3d5ULL,
- 0x00c80bc242c58808ULL, 0x0075bf8c2d08c863ULL,
- 0x008d41f31afc52a7ULL, 0x00197962ecf38741ULL)},
- }}, {{
- {FIELD_LITERAL(0x006e9f475cccf2eeULL, 0x00454b9cd506430cULL,
- 0x00224a4fb79ee479ULL, 0x0062e3347ef0b5e2ULL,
- 0x0034fd2a3512232aULL, 0x00b8b3cb0f457046ULL,
- 0x00eb20165daa38ecULL, 0x00128eebc2d9c0f7ULL)},
- {FIELD_LITERAL(0x00bfc5fa1e4ea21fULL, 0x00c21d7b6bb892e6ULL,
- 0x00cf043f3acf0291ULL, 0x00c13f2f849b3c90ULL,
- 0x00d1a97ebef10891ULL, 0x0061e130a445e7feULL,
- 0x0019513fdedbf22bULL, 0x001d60c813bff841ULL)},
- {FIELD_LITERAL(0x0019561c7fcf0213ULL, 0x00e3dca6843ebd77ULL,
- 0x0068ea95b9ca920eULL, 0x009bdfb70f253595ULL,
- 0x00c68f59186aa02aULL, 0x005aee1cca1c3039ULL,
- 0x00ab79a8a937a1ceULL, 0x00b9a0e549959e6fULL)},
- }}, {{
- {FIELD_LITERAL(0x00c79e0b6d97dfbdULL, 0x00917c71fd2bc6e8ULL,
- 0x00db7529ccfb63d8ULL, 0x00be5be957f17866ULL,
- 0x00a9e11fdc2cdac1ULL, 0x007b91a8e1f44443ULL,
- 0x00a3065e4057d80fULL, 0x004825f5b8d5f6d4ULL)},
- {FIELD_LITERAL(0x003e4964fa8a8fc8ULL, 0x00f6a1cdbcf41689ULL,
- 0x00943cb18fe7fda7ULL, 0x00606dafbf34440aULL,
- 0x005d37a86399c789ULL, 0x00e79a2a69417403ULL,
- 0x00fe34f7e68b8866ULL, 0x0011f448ed2df10eULL)},
- {FIELD_LITERAL(0x00f1f57efcc1fcc4ULL, 0x00513679117de154ULL,
- 0x002e5b5b7c86d8c3ULL, 0x009f6486561f9cfbULL,
- 0x00169e74b0170cf7ULL, 0x00900205af4af696ULL,
- 0x006acfddb77853f3ULL, 0x00df184c90f31068ULL)},
- }}, {{
- {FIELD_LITERAL(0x00b37396c3320791ULL, 0x00fc7b67175c5783ULL,
- 0x00c36d2cd73ecc38ULL, 0x0080ebcc0b328fc5ULL,
- 0x0043a5b22b35d35dULL, 0x00466c9f1713c9daULL,
- 0x0026ad346dcaa8daULL, 0x007c684e701183a6ULL)},
- {FIELD_LITERAL(0x00fd579ffb691713ULL, 0x00b76af4f81c412dULL,
- 0x00f239de96110f82ULL, 0x00e965fb437f0306ULL,
- 0x00ca7e9436900921ULL, 0x00e487f1325fa24aULL,
- 0x00633907de476380ULL, 0x00721c62ac5b8ea0ULL)},
- {FIELD_LITERAL(0x00c0d54e542eb4f9ULL, 0x004ed657171c8dcfULL,
- 0x00b743a4f7c2a39bULL, 0x00fd9f93ed6cc567ULL,
- 0x00307fae3113e58bULL, 0x0058aa577c93c319ULL,
- 0x00d254556f35b346ULL, 0x00491aada2203f0dULL)},
- }}, {{
- {FIELD_LITERAL(0x00dff3103786ff34ULL, 0x000144553b1f20c3ULL,
- 0x0095613baeb930e4ULL, 0x00098058275ea5d4ULL,
- 0x007cd1402b046756ULL, 0x0074d74e4d58aee3ULL,
- 0x005f93fc343ff69bULL, 0x00873df17296b3b0ULL)},
- {FIELD_LITERAL(0x00c4a1fb48635413ULL, 0x00b5dd54423ad59fULL,
- 0x009ff5d53fd24a88ULL, 0x003c98d267fc06a7ULL,
- 0x002db7cb20013641ULL, 0x00bd1d6716e191f2ULL,
- 0x006dbc8b29094241ULL, 0x0044bbf233dafa2cULL)},
- {FIELD_LITERAL(0x0055838d41f531e6ULL, 0x00bf6a2dd03c81b2ULL,
- 0x005827a061c4839eULL, 0x0000de2cbb36aac3ULL,
- 0x002efa29d9717478ULL, 0x00f9e928cc8a77baULL,
- 0x00c134b458def9efULL, 0x00958a182223fc48ULL)},
- }}, {{
- {FIELD_LITERAL(0x000a9ee23c06881fULL, 0x002c727d3d871945ULL,
- 0x00f47d971512d24aULL, 0x00671e816f9ef31aULL,
- 0x00883af2cfaad673ULL, 0x00601f98583d6c9aULL,
- 0x00b435f5adc79655ULL, 0x00ad87b71c04bff2ULL)},
- {FIELD_LITERAL(0x007860d99db787cfULL, 0x00fda8983018f4a8ULL,
- 0x008c8866bac4743cULL, 0x00ef471f84c82a3fULL,
- 0x00abea5976d3b8e7ULL, 0x00714882896cd015ULL,
- 0x00b49fae584ddac5ULL, 0x008e33a1a0b69c81ULL)},
- {FIELD_LITERAL(0x007b6ee2c9e8a9ecULL, 0x002455dbbd89d622ULL,
- 0x006490cf4eaab038ULL, 0x00d925f6c3081561ULL,
- 0x00153b3047de7382ULL, 0x003b421f8bdceb6fULL,
- 0x00761a4a5049da78ULL, 0x00980348c5202433ULL)},
- }}, {{
- {FIELD_LITERAL(0x007f8a43da97dd5cULL, 0x00058539c800fc7bULL,
- 0x0040f3cf5a28414aULL, 0x00d68dd0d95283d6ULL,
- 0x004adce9da90146eULL, 0x00befa41c7d4f908ULL,
- 0x007603bc2e3c3060ULL, 0x00bdf360ab3545dbULL)},
- {FIELD_LITERAL(0x00eebfd4e2312cc3ULL, 0x00474b2564e4fc8cULL,
- 0x003303ef14b1da9bULL, 0x003c93e0e66beb1dULL,
- 0x0013619b0566925aULL, 0x008817c24d901bf3ULL,
- 0x00b62bd8898d218bULL, 0x0075a7716f1e88a2ULL)},
- {FIELD_LITERAL(0x0009218da1e6890fULL, 0x0026907f5fd02575ULL,
- 0x004dabed5f19d605ULL, 0x003abf181870249dULL,
- 0x00b52fd048cc92c4ULL, 0x00b6dd51e415a5c5ULL,
- 0x00d9eb82bd2b4014ULL, 0x002c865a43b46b43ULL)},
- }}, {{
- {FIELD_LITERAL(0x0070047189452f4cULL, 0x00f7ad12e1ce78d5ULL,
- 0x00af1ba51ec44a8bULL, 0x005f39f63e667cd6ULL,
- 0x00058eac4648425eULL, 0x00d7fdab42bea03bULL,
- 0x0028576a5688de15ULL, 0x00af973209e77c10ULL)},
- {FIELD_LITERAL(0x00c338b915d8fef0ULL, 0x00a893292045c39aULL,
- 0x0028ab4f2eba6887ULL, 0x0060743cb519fd61ULL,
- 0x0006213964093ac0ULL, 0x007c0b7a43f6266dULL,
- 0x008e3557c4fa5bdaULL, 0x002da976de7b8d9dULL)},
- {FIELD_LITERAL(0x0048729f8a8b6dcdULL, 0x00fe23b85cc4d323ULL,
- 0x00e7384d16e4db0eULL, 0x004a423970678942ULL,
- 0x00ec0b763345d4baULL, 0x00c477b9f99ed721ULL,
- 0x00c29dad3777b230ULL, 0x001c517b466f7df6ULL)},
- }}, {{
- {FIELD_LITERAL(0x006366c380f7b574ULL, 0x001c7d1f09ff0438ULL,
- 0x003e20a7301f5b22ULL, 0x00d3efb1916d28f6ULL,
- 0x0049f4f81060ce83ULL, 0x00c69d91ea43ced1ULL,
- 0x002b6f3e5cd269edULL, 0x005b0fb22ce9ec65ULL)},
- {FIELD_LITERAL(0x00aa2261022d883fULL, 0x00ebcca4548010acULL,
- 0x002528512e28a437ULL, 0x0070ca7676b66082ULL,
- 0x0084bda170f7c6d3ULL, 0x00581b4747c9b8bbULL,
- 0x005c96a01061c7e2ULL, 0x00fb7c4a362b5273ULL)},
- {FIELD_LITERAL(0x00c30020eb512d02ULL, 0x0060f288283a4d26ULL,
- 0x00b7ed13becde260ULL, 0x0075ebb74220f6e9ULL,
- 0x00701079fcfe8a1fULL, 0x001c28fcdff58938ULL,
- 0x002e4544b8f4df6bULL, 0x0060c5bc4f1a7d73ULL)},
- }}, {{
- {FIELD_LITERAL(0x00ae307cf069f701ULL, 0x005859f222dd618bULL,
- 0x00212d6c46ec0b0dULL, 0x00a0fe4642afb62dULL,
- 0x00420d8e4a0a8903ULL, 0x00a80ff639bdf7b0ULL,
- 0x0019bee1490b5d8eULL, 0x007439e4b9c27a86ULL)},
- {FIELD_LITERAL(0x00a94700032a093fULL, 0x0076e96c225216e7ULL,
- 0x00a63a4316e45f91ULL, 0x007d8bbb4645d3b2ULL,
- 0x00340a6ff22793ebULL, 0x006f935d4572aeb7ULL,
- 0x00b1fb69f00afa28ULL, 0x009e8f3423161ed3ULL)},
- {FIELD_LITERAL(0x009ef49c6b5ced17ULL, 0x00a555e6269e9f0aULL,
- 0x007e6f1d79ec73b5ULL, 0x009ac78695a32ac4ULL,
- 0x0001d77fbbcd5682ULL, 0x008cea1fee0aaeedULL,
- 0x00f42bea82a53462ULL, 0x002e46ab96cafcc9ULL)},
- }}, {{
- {FIELD_LITERAL(0x0051cfcc5885377aULL, 0x00dce566cb1803caULL,
- 0x00430c7643f2c7d4ULL, 0x00dce1a1337bdcc0ULL,
- 0x0010d5bd7283c128ULL, 0x003b1b547f9b46feULL,
- 0x000f245e37e770abULL, 0x007b72511f022b37ULL)},
- {FIELD_LITERAL(0x0060db815bc4786cULL, 0x006fab25beedc434ULL,
- 0x00c610d06084797cULL, 0x000c48f08537bec0ULL,
- 0x0031aba51c5b93daULL, 0x007968fa6e01f347ULL,
- 0x0030070da52840c6ULL, 0x00c043c225a4837fULL)},
- {FIELD_LITERAL(0x001bcfd00649ee93ULL, 0x006dceb47e2a0fd5ULL,
- 0x00f2cebda0cf8fd0ULL, 0x00b6b9d9d1fbdec3ULL,
- 0x00815262e6490611ULL, 0x00ef7f5ce3176760ULL,
- 0x00e49cd0c998d58bULL, 0x005fc6cc269ba57cULL)},
- }}, {{
- {FIELD_LITERAL(0x008940211aa0d633ULL, 0x00addae28136571dULL,
- 0x00d68fdbba20d673ULL, 0x003bc6129bc9e21aULL,
- 0x000346cf184ebe9aULL, 0x0068774d741ebc7fULL,
- 0x0019d5e9e6966557ULL, 0x0003cbd7f981b651ULL)},
- {FIELD_LITERAL(0x004a2902926f8d3fULL, 0x00ad79b42637ab75ULL,
- 0x0088f60b90f2d4e8ULL, 0x0030f54ef0e398c4ULL,
- 0x00021dc9bf99681eULL, 0x007ebf66fde74ee3ULL,
- 0x004ade654386e9a4ULL, 0x00e7485066be4c27ULL)},
- {FIELD_LITERAL(0x00445f1263983be0ULL, 0x004cf371dda45e6aULL,
- 0x00744a89d5a310e7ULL, 0x001f20ce4f904833ULL,
- 0x00e746edebe66e29ULL, 0x000912ab1f6c153dULL,
- 0x00f61d77d9b2444cULL, 0x0001499cd6647610ULL)},
- }}
- }
+ { { {
+ { FIELD_LITERAL(0x00cc3b062366f4ccULL, 0x003d6e34e314aa3cULL,
+ 0x00d51c0a7521774dULL, 0x0094e060eec6ab8bULL,
+ 0x00d21291b4d80082ULL, 0x00befed12b55ef1eULL,
+ 0x00c3dd2df5c94518ULL, 0x00e0a7b112b8d4e6ULL) },
+ { FIELD_LITERAL(0x0019eb5608d8723aULL, 0x00d1bab52fb3aedbULL,
+ 0x00270a7311ebc90cULL, 0x0037c12b91be7f13ULL,
+ 0x005be16cd8b5c704ULL, 0x003e181acda888e1ULL,
+ 0x00bc1f00fc3fc6d0ULL, 0x00d3839bfa319e20ULL) },
+ { FIELD_LITERAL(0x003caeb88611909fULL, 0x00ea8b378c4df3d4ULL,
+ 0x00b3295b95a5a19aULL, 0x00a65f97514bdfb5ULL,
+ 0x00b39efba743cab1ULL, 0x0016ba98b862fd2dULL,
+ 0x0001508812ee71d7ULL, 0x000a75740eea114aULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00ebcf0eb649f823ULL, 0x00166d332e98ea03ULL,
+ 0x0059ddf64f5cd5f6ULL, 0x0047763123d9471bULL,
+ 0x00a64065c53ef62fULL, 0x00978e44c480153dULL,
+ 0x000b5b2a0265f194ULL, 0x0046a24b9f32965aULL) },
+ { FIELD_LITERAL(0x00b9eef787034df0ULL, 0x0020bc24de3390cdULL,
+ 0x000022160bae99bbULL, 0x00ae66e886e97946ULL,
+ 0x0048d4bbe02cbb8bULL, 0x0072ba97b34e38d4ULL,
+ 0x00eae7ec8f03e85aULL, 0x005ba92ecf808b2cULL) },
+ { FIELD_LITERAL(0x00c9cfbbe74258fdULL, 0x00843a979ea9eaa7ULL,
+ 0x000cbb4371cfbe90ULL, 0x0059bac8f7f0a628ULL,
+ 0x004b3dff882ff530ULL, 0x0011869df4d90733ULL,
+ 0x00595aa71f4abfc2ULL, 0x0070e2d38990c2e6ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00de2010c0a01733ULL, 0x00c739a612e24297ULL,
+ 0x00a7212643141d7cULL, 0x00f88444f6b67c11ULL,
+ 0x00484b7b16ec28f2ULL, 0x009c1b8856af9c68ULL,
+ 0x00ff4669591fe9d6ULL, 0x0054974be08a32c8ULL) },
+ { FIELD_LITERAL(0x0010de3fd682ceedULL, 0x008c07642d83ca4eULL,
+ 0x0013bb064e00a1ccULL, 0x009411ae27870e11ULL,
+ 0x00ea8e5b4d531223ULL, 0x0032fe7d2aaece2eULL,
+ 0x00d989e243e7bb41ULL, 0x000fe79a508e9b8bULL) },
+ { FIELD_LITERAL(0x005e0426b9bfc5b1ULL, 0x0041a5b1d29ee4faULL,
+ 0x0015b0def7774391ULL, 0x00bc164f1f51af01ULL,
+ 0x00d543b0942797b9ULL, 0x003c129b6398099cULL,
+ 0x002b114c6e5adf18ULL, 0x00b4e630e4018a7bULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00d490afc95f8420ULL, 0x00b096bf50c1d9b9ULL,
+ 0x00799fd707679866ULL, 0x007c74d9334afbeaULL,
+ 0x00efaa8be80ff4edULL, 0x0075c4943bb81694ULL,
+ 0x00c21c2fca161f36ULL, 0x00e77035d492bfeeULL) },
+ { FIELD_LITERAL(0x006658a190dd6661ULL, 0x00e0e9bab38609a6ULL,
+ 0x0028895c802237edULL, 0x006a0229c494f587ULL,
+ 0x002dcde96c9916b7ULL, 0x00d158822de16218ULL,
+ 0x00173b917a06856fULL, 0x00ca78a79ae07326ULL) },
+ { FIELD_LITERAL(0x00e35bfc79caced4ULL, 0x0087238a3e1fe3bbULL,
+ 0x00bcbf0ff4ceff5bULL, 0x00a19c1c94099b91ULL,
+ 0x0071e102b49db976ULL, 0x0059e3d004eada1eULL,
+ 0x008da78afa58a47eULL, 0x00579c8ebf269187ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00a16c2905eee75fULL, 0x009d4bcaea2c7e1dULL,
+ 0x00d3bd79bfad19dfULL, 0x0050da745193342cULL,
+ 0x006abdb8f6b29ab1ULL, 0x00a24fe0a4fef7efULL,
+ 0x0063730da1057dfbULL, 0x00a08c312c8eb108ULL) },
+ { FIELD_LITERAL(0x00b583be005375beULL, 0x00a40c8f8a4e3df4ULL,
+ 0x003fac4a8f5bdbf7ULL, 0x00d4481d872cd718ULL,
+ 0x004dc8749cdbaefeULL, 0x00cce740d5e5c975ULL,
+ 0x000b1c1f4241fd21ULL, 0x00a76de1b4e1cd07ULL) },
+ { FIELD_LITERAL(0x007a076500d30b62ULL, 0x000a6e117b7f090fULL,
+ 0x00c8712ae7eebd9aULL, 0x000fbd6c1d5f6ff7ULL,
+ 0x003a7977246ebf11ULL, 0x00166ed969c6600eULL,
+ 0x00aa42e469c98becULL, 0x00dc58f307cf0666ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x004b491f65a9a28bULL, 0x006a10309e8a55b7ULL,
+ 0x00b67210185187efULL, 0x00cf6497b12d9b8fULL,
+ 0x0085778c56e2b1baULL, 0x0015b4c07a814d85ULL,
+ 0x00686479e62da561ULL, 0x008de5d88f114916ULL) },
+ { FIELD_LITERAL(0x00e37c88d6bba7b1ULL, 0x003e4577e1b8d433ULL,
+ 0x0050d8ea5f510ec0ULL, 0x0042fc9f2da9ef59ULL,
+ 0x003bd074c1141420ULL, 0x00561b8b7b68774eULL,
+ 0x00232e5e5d1013a3ULL, 0x006b7f2cb3d7e73fULL) },
+ { FIELD_LITERAL(0x004bdd0f0b41e6a0ULL, 0x001773057c405d24ULL,
+ 0x006029f99915bd97ULL, 0x006a5ba70a17fe2fULL,
+ 0x0046111977df7e08ULL, 0x004d8124c89fb6b7ULL,
+ 0x00580983b2bb2724ULL, 0x00207bf330d6f3feULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x007efdc93972a48bULL, 0x002f5e50e78d5feeULL,
+ 0x0080dc11d61c7fe5ULL, 0x0065aa598707245bULL,
+ 0x009abba2300641beULL, 0x000c68787656543aULL,
+ 0x00ffe0fef2dc0a17ULL, 0x00007ffbd6cb4f3aULL) },
+ { FIELD_LITERAL(0x0036012f2b836efcULL, 0x00458c126d6b5fbcULL,
+ 0x00a34436d719ad1eULL, 0x0097be6167117deaULL,
+ 0x0009c219c879cff3ULL, 0x0065564493e60755ULL,
+ 0x00993ac94a8cdec0ULL, 0x002d4885a4d0dbafULL) },
+ { FIELD_LITERAL(0x00598b60b4c068baULL, 0x00c547a0be7f1afdULL,
+ 0x009582164acf12afULL, 0x00af4acac4fbbe40ULL,
+ 0x005f6ca7c539121aULL, 0x003b6e752ebf9d66ULL,
+ 0x00f08a30d5cac5d4ULL, 0x00e399bb5f97c5a9ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x007445a0409c0a66ULL, 0x00a65c369f3829c0ULL,
+ 0x0031d248a4f74826ULL, 0x006817f34defbe8eULL,
+ 0x00649741d95ebf2eULL, 0x00d46466ab16b397ULL,
+ 0x00fdc35703bee414ULL, 0x00343b43334525f8ULL) },
+ { FIELD_LITERAL(0x001796bea93f6401ULL, 0x00090c5a42e85269ULL,
+ 0x00672412ba1252edULL, 0x001201d47b6de7deULL,
+ 0x006877bccfe66497ULL, 0x00b554fd97a4c161ULL,
+ 0x009753f42dbac3cfULL, 0x00e983e3e378270aULL) },
+ { FIELD_LITERAL(0x00ac3eff18849872ULL, 0x00f0eea3bff05690ULL,
+ 0x00a6d72c21dd505dULL, 0x001b832642424169ULL,
+ 0x00a6813017b540e5ULL, 0x00a744bd71b385cdULL,
+ 0x0022a7d089130a7bULL, 0x004edeec9a133486ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00b2d6729196e8a9ULL, 0x0088a9bb2031cef4ULL,
+ 0x00579e7787dc1567ULL, 0x0030f49feb059190ULL,
+ 0x00a0b1d69c7f7d8fULL, 0x0040bdcc6d9d806fULL,
+ 0x00d76c4037edd095ULL, 0x00bbf24376415dd7ULL) },
+ { FIELD_LITERAL(0x00240465ff5a7197ULL, 0x00bb97e76caf27d0ULL,
+ 0x004b4edbf8116d39ULL, 0x001d8586f708cbaaULL,
+ 0x000f8ee8ff8e4a50ULL, 0x00dde5a1945dd622ULL,
+ 0x00e6fc1c0957e07cULL, 0x0041c9cdabfd88a0ULL) },
+ { FIELD_LITERAL(0x005344b0bf5b548cULL, 0x002957d0b705cc99ULL,
+ 0x00f586a70390553dULL, 0x0075b3229f583cc3ULL,
+ 0x00a1aa78227490e4ULL, 0x001bf09cf7957717ULL,
+ 0x00cf6bf344325f52ULL, 0x0065bd1c23ca3ecfULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x009bff3b3239363cULL, 0x00e17368796ef7c0ULL,
+ 0x00528b0fe0971f3aULL, 0x0008014fc8d4a095ULL,
+ 0x00d09f2e8a521ec4ULL, 0x006713ab5dde5987ULL,
+ 0x0003015758e0dbb1ULL, 0x00215999f1ba212dULL) },
+ { FIELD_LITERAL(0x002c88e93527da0eULL, 0x0077c78f3456aad5ULL,
+ 0x0071087a0a389d1cULL, 0x00934dac1fb96dbdULL,
+ 0x008470e801162697ULL, 0x005bc2196cd4ad49ULL,
+ 0x00e535601d5087c3ULL, 0x00769888700f497fULL) },
+ { FIELD_LITERAL(0x00da7a4b557298adULL, 0x0019d2589ea5df76ULL,
+ 0x00ef3e38be0c6497ULL, 0x00a9644e1312609aULL,
+ 0x004592f61b2558daULL, 0x0082c1df510d7e46ULL,
+ 0x0042809a535c0023ULL, 0x00215bcb5afd7757ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x002b9df55a1a4213ULL, 0x00dcfc3b464a26beULL,
+ 0x00c4f9e07a8144d5ULL, 0x00c8e0617a92b602ULL,
+ 0x008e3c93accafae0ULL, 0x00bf1bcb95b2ca60ULL,
+ 0x004ce2426a613bf3ULL, 0x00266cac58e40921ULL) },
+ { FIELD_LITERAL(0x008456d5db76e8f0ULL, 0x0032ca9cab2ce163ULL,
+ 0x0059f2b8bf91abcfULL, 0x0063c2a021712788ULL,
+ 0x00f86155af22f72dULL, 0x00db98b2a6c005a0ULL,
+ 0x00ac6e416a693ac4ULL, 0x007a93572af53226ULL) },
+ { FIELD_LITERAL(0x0087767520f0de22ULL, 0x0091f64012279fb5ULL,
+ 0x001050f1f0644999ULL, 0x004f097a2477ad3cULL,
+ 0x006b37913a9947bdULL, 0x001a3d78645af241ULL,
+ 0x0057832bbb3008a7ULL, 0x002c1d902b80dc20ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x001a6002bf178877ULL, 0x009bce168aa5af50ULL,
+ 0x005fc318ff04a7f5ULL, 0x0052818f55c36461ULL,
+ 0x008768f5d4b24afbULL, 0x0037ffbae7b69c85ULL,
+ 0x0018195a4b61edc0ULL, 0x001e12ea088434b2ULL) },
+ { FIELD_LITERAL(0x0047d3f804e7ab07ULL, 0x00a809ab5f905260ULL,
+ 0x00b3ffc7cdaf306dULL, 0x00746e8ec2d6e509ULL,
+ 0x00d0dade8887a645ULL, 0x00acceeebde0dd37ULL,
+ 0x009bc2579054686bULL, 0x0023804f97f1c2bfULL) },
+ { FIELD_LITERAL(0x0043e2e2e50b80d7ULL, 0x00143aafe4427e0fULL,
+ 0x005594aaecab855bULL, 0x008b12ccaaecbc01ULL,
+ 0x002deeb091082bc3ULL, 0x009cca4be2ae7514ULL,
+ 0x00142b96e696d047ULL, 0x00ad2a2b1c05256aULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x003914f2f144b78bULL, 0x007a95dd8bee6f68ULL,
+ 0x00c7f4384d61c8e6ULL, 0x004e51eb60f1bdb2ULL,
+ 0x00f64be7aa4621d8ULL, 0x006797bfec2f0ac0ULL,
+ 0x007d17aab3c75900ULL, 0x001893e73cac8bc5ULL) },
+ { FIELD_LITERAL(0x00140360b768665bULL, 0x00b68aca4967f977ULL,
+ 0x0001089b66195ae4ULL, 0x00fe71122185e725ULL,
+ 0x000bca2618d49637ULL, 0x00a54f0557d7e98aULL,
+ 0x00cdcd2f91d6f417ULL, 0x00ab8c13741fd793ULL) },
+ { FIELD_LITERAL(0x00725ee6b1e549e0ULL, 0x007124a0769777faULL,
+ 0x000b68fdad07ae42ULL, 0x0085b909cd4952dfULL,
+ 0x0092d2e3c81606f4ULL, 0x009f22f6cac099a0ULL,
+ 0x00f59da57f2799a8ULL, 0x00f06c090122f777ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00ce0bed0a3532bcULL, 0x001a5048a22df16bULL,
+ 0x00e31db4cbad8bf1ULL, 0x00e89292120cf00eULL,
+ 0x007d1dd1a9b00034ULL, 0x00e2a9041ff8f680ULL,
+ 0x006a4c837ae596e7ULL, 0x00713af1068070b3ULL) },
+ { FIELD_LITERAL(0x00c4fe64ce66d04bULL, 0x00b095d52e09b3d7ULL,
+ 0x00758bbecb1a3a8eULL, 0x00f35cce8d0650c0ULL,
+ 0x002b878aa5984473ULL, 0x0062e0a3b7544ddcULL,
+ 0x00b25b290ed116feULL, 0x007b0f6abe0bebf2ULL) },
+ { FIELD_LITERAL(0x0081d4e3addae0a8ULL, 0x003410c836c7ffccULL,
+ 0x00c8129ad89e4314ULL, 0x000e3d5a23922dcdULL,
+ 0x00d91e46f29c31f3ULL, 0x006c728cde8c5947ULL,
+ 0x002bc655ba2566c0ULL, 0x002ca94721533108ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x0051e4b3f764d8a9ULL, 0x0019792d46e904a0ULL,
+ 0x00853bc13dbc8227ULL, 0x000840208179f12dULL,
+ 0x0068243474879235ULL, 0x0013856fbfe374d0ULL,
+ 0x00bda12fe8676424ULL, 0x00bbb43635926eb2ULL) },
+ { FIELD_LITERAL(0x0012cdc880a93982ULL, 0x003c495b21cd1b58ULL,
+ 0x00b7e5c93f22a26eULL, 0x0044aa82dfb99458ULL,
+ 0x009ba092cdffe9c0ULL, 0x00a14b3ab2083b73ULL,
+ 0x000271c2f70e1c4bULL, 0x00eea9cac0f66eb8ULL) },
+ { FIELD_LITERAL(0x001a1847c4ac5480ULL, 0x00b1b412935bb03aULL,
+ 0x00f74285983bf2b2ULL, 0x00624138b5b5d0f1ULL,
+ 0x008820c0b03d38bfULL, 0x00b94e50a18c1572ULL,
+ 0x0060f6934841798fULL, 0x00c52f5d66d6ebe2ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00da23d59f9bcea6ULL, 0x00e0f27007a06a4bULL,
+ 0x00128b5b43a6758cULL, 0x000cf50190fa8b56ULL,
+ 0x00fc877aba2b2d72ULL, 0x00623bef52edf53fULL,
+ 0x00e6af6b819669e2ULL, 0x00e314dc34fcaa4fULL) },
+ { FIELD_LITERAL(0x0066e5eddd164d1eULL, 0x00418a7c6fe28238ULL,
+ 0x0002e2f37e962c25ULL, 0x00f01f56b5975306ULL,
+ 0x0048842fa503875cULL, 0x0057b0e968078143ULL,
+ 0x00ff683024f3d134ULL, 0x0082ae28fcad12e4ULL) },
+ { FIELD_LITERAL(0x0011ddfd21260e42ULL, 0x00d05b0319a76892ULL,
+ 0x00183ea4368e9b8fULL, 0x00b0815662affc96ULL,
+ 0x00b466a5e7ce7c88ULL, 0x00db93b07506e6eeULL,
+ 0x0033885f82f62401ULL, 0x0086f9090ec9b419ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00d95d1c5fcb435aULL, 0x0016d1ed6b5086f9ULL,
+ 0x00792aa0b7e54d71ULL, 0x0067b65715f1925dULL,
+ 0x00a219755ec6176bULL, 0x00bc3f026b12c28fULL,
+ 0x00700c897ffeb93eULL, 0x0089b83f6ec50b46ULL) },
+ { FIELD_LITERAL(0x003c97e6384da36eULL, 0x00423d53eac81a09ULL,
+ 0x00b70d68f3cdce35ULL, 0x00ee7959b354b92cULL,
+ 0x00f4e9718819c8caULL, 0x009349f12acbffe9ULL,
+ 0x005aee7b62cb7da6ULL, 0x00d97764154ffc86ULL) },
+ { FIELD_LITERAL(0x00526324babb46dcULL, 0x002ee99b38d7bf9eULL,
+ 0x007ea51794706ef4ULL, 0x00abeb04da6e3c39ULL,
+ 0x006b457c1d281060ULL, 0x00fe243e9a66c793ULL,
+ 0x00378de0fb6c6ee4ULL, 0x003e4194b9c3cb93ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00fed3cd80ca2292ULL, 0x0015b043a73ca613ULL,
+ 0x000a9fd7bf9be227ULL, 0x003b5e03de2db983ULL,
+ 0x005af72d46904ef7ULL, 0x00c0f1b5c49faa99ULL,
+ 0x00dc86fc3bd305e1ULL, 0x00c92f08c1cb1797ULL) },
+ { FIELD_LITERAL(0x0079680ce111ed3bULL, 0x001a1ed82806122cULL,
+ 0x000c2e7466d15df3ULL, 0x002c407f6f7150fdULL,
+ 0x00c5e7c96b1b0ce3ULL, 0x009aa44626863ff9ULL,
+ 0x00887b8b5b80be42ULL, 0x00b6023cec964825ULL) },
+ { FIELD_LITERAL(0x00e4a8e1048970c8ULL, 0x0062887b7830a302ULL,
+ 0x00bcf1c8cd81402bULL, 0x0056dbb81a68f5beULL,
+ 0x0014eced83f12452ULL, 0x00139e1a510150dfULL,
+ 0x00bb81140a82d1a3ULL, 0x000febcc1aaf1aa7ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00a7527958238159ULL, 0x0013ec9537a84cd6ULL,
+ 0x001d7fee7d562525ULL, 0x00b9eefa6191d5e5ULL,
+ 0x00dbc97db70bcb8aULL, 0x00481affc7a4d395ULL,
+ 0x006f73d3e70c31bbULL, 0x00183f324ed96a61ULL) },
+ { FIELD_LITERAL(0x0039dd7ce7fc6860ULL, 0x00d64f6425653da1ULL,
+ 0x003e037c7f57d0afULL, 0x0063477a06e2bcf2ULL,
+ 0x001727dbb7ac67e6ULL, 0x0049589f5efafe2eULL,
+ 0x00fc0fef2e813d54ULL, 0x008baa5d087fb50dULL) },
+ { FIELD_LITERAL(0x0024fb59d9b457c7ULL, 0x00a7d4e060223e4cULL,
+ 0x00c118d1b555fd80ULL, 0x0082e216c732f22aULL,
+ 0x00cd2a2993089504ULL, 0x003638e836a3e13dULL,
+ 0x000d855ee89b4729ULL, 0x008ec5b7d4810c91ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x001bf51f7d65cdfdULL, 0x00d14cdafa16a97dULL,
+ 0x002c38e60fcd10e7ULL, 0x00a27446e393efbdULL,
+ 0x000b5d8946a71fddULL, 0x0063df2cde128f2fULL,
+ 0x006c8679569b1888ULL, 0x0059ffc4925d732dULL) },
+ { FIELD_LITERAL(0x00ece96f95f2b66fULL, 0x00ece7952813a27bULL,
+ 0x0026fc36592e489eULL, 0x007157d1a2de0f66ULL,
+ 0x00759dc111d86ddfULL, 0x0012881e5780bb0fULL,
+ 0x00c8ccc83ad29496ULL, 0x0012b9bd1929eb71ULL) },
+ { FIELD_LITERAL(0x000fa15a20da5df0ULL, 0x00349ddb1a46cd31ULL,
+ 0x002c512ad1d8e726ULL, 0x00047611f669318dULL,
+ 0x009e68fba591e17eULL, 0x004320dffa803906ULL,
+ 0x00a640874951a3d3ULL, 0x00b6353478baa24fULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x009696510000d333ULL, 0x00ec2f788bc04826ULL,
+ 0x000e4d02b1f67ba5ULL, 0x00659aa8dace08b6ULL,
+ 0x00d7a38a3a3ae533ULL, 0x008856defa8c746bULL,
+ 0x004d7a4402d3da1aULL, 0x00ea82e06229260fULL) },
+ { FIELD_LITERAL(0x006a15bb20f75c0cULL, 0x0079a144027a5d0cULL,
+ 0x00d19116ce0b4d70ULL, 0x0059b83bcb0b268eULL,
+ 0x005f58f63f16c127ULL, 0x0079958318ee2c37ULL,
+ 0x00defbb063d07f82ULL, 0x00f1f0b931d2d446ULL) },
+ { FIELD_LITERAL(0x00cb5e4c3c35d422ULL, 0x008df885ca43577fULL,
+ 0x00fa50b16ca3e471ULL, 0x005a0e58e17488c8ULL,
+ 0x00b2ceccd6d34d19ULL, 0x00f01d5d235e36e9ULL,
+ 0x00db2e7e4be6ca44ULL, 0x00260ab77f35fccdULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x006f6fd9baac61d5ULL, 0x002a7710a020a895ULL,
+ 0x009de0db7fc03d4dULL, 0x00cdedcb1875f40bULL,
+ 0x00050caf9b6b1e22ULL, 0x005e3a6654456ab0ULL,
+ 0x00775fdf8c4423d4ULL, 0x0028701ea5738b5dULL) },
+ { FIELD_LITERAL(0x009ffd90abfeae96ULL, 0x00cba3c2b624a516ULL,
+ 0x005ef08bcee46c91ULL, 0x00e6fde30afb6185ULL,
+ 0x00f0b4db4f818ce4ULL, 0x006c54f45d2127f5ULL,
+ 0x00040125035854c7ULL, 0x00372658a3287e13ULL) },
+ { FIELD_LITERAL(0x00d7070fb1beb2abULL, 0x0078fc845a93896bULL,
+ 0x006894a4b2f224a6ULL, 0x005bdd8192b9dbdeULL,
+ 0x00b38839874b3a9eULL, 0x00f93618b04b7a57ULL,
+ 0x003e3ec75fd2c67eULL, 0x00bf5e6bfc29494aULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00f19224ebba2aa5ULL, 0x0074f89d358e694dULL,
+ 0x00eea486597135adULL, 0x0081579a4555c7e1ULL,
+ 0x0010b9b872930a9dULL, 0x00f002e87a30ecc0ULL,
+ 0x009b9d66b6de56e2ULL, 0x00a3c4f45e8004ebULL) },
+ { FIELD_LITERAL(0x0045e8dda9400888ULL, 0x002ff12e5fc05db7ULL,
+ 0x00a7098d54afe69cULL, 0x00cdbe846a500585ULL,
+ 0x00879c1593ca1882ULL, 0x003f7a7fea76c8b0ULL,
+ 0x002cd73dd0c8e0a1ULL, 0x00645d6ce96f51feULL) },
+ { FIELD_LITERAL(0x002b7e83e123d6d6ULL, 0x00398346f7419c80ULL,
+ 0x0042922e55940163ULL, 0x005e7fc5601886a3ULL,
+ 0x00e88f2cee1d3103ULL, 0x00e7fab135f2e377ULL,
+ 0x00b059984dbf0dedULL, 0x0009ce080faa5bb8ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x0085e78af7758979ULL, 0x00275a4ee1631a3aULL,
+ 0x00d26bc0ed78b683ULL, 0x004f8355ea21064fULL,
+ 0x00d618e1a32696e5ULL, 0x008d8d7b150e5680ULL,
+ 0x00a74cd854b278d2ULL, 0x001dd62702203ea0ULL) },
+ { FIELD_LITERAL(0x00f89335c2a59286ULL, 0x00a0f5c905d55141ULL,
+ 0x00b41fb836ee9382ULL, 0x00e235d51730ca43ULL,
+ 0x00a5cb37b5c0a69aULL, 0x009b966ffe136c45ULL,
+ 0x00cb2ea10bf80ed1ULL, 0x00fb2b370b40dc35ULL) },
+ { FIELD_LITERAL(0x00d687d16d4ee8baULL, 0x0071520bdd069dffULL,
+ 0x00de85c60d32355dULL, 0x0087d2e3565102f4ULL,
+ 0x00cde391b8dfc9aaULL, 0x00e18d69efdfefe5ULL,
+ 0x004a9d0591954e91ULL, 0x00fa36dd8b50eee5ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x002e788749a865f7ULL, 0x006e4dc3116861eaULL,
+ 0x009f1428c37276e6ULL, 0x00e7d2e0fc1e1226ULL,
+ 0x003aeebc6b6c45f6ULL, 0x0071a8073bf500c9ULL,
+ 0x004b22ad986b530cULL, 0x00f439e63c0d79d4ULL) },
+ { FIELD_LITERAL(0x006bc3d53011f470ULL, 0x00032d6e692b83e8ULL,
+ 0x00059722f497cd0bULL, 0x0009b4e6f0c497ccULL,
+ 0x0058a804b7cce6c0ULL, 0x002b71d3302bbd5dULL,
+ 0x00e2f82a36765fceULL, 0x008dded99524c703ULL) },
+ { FIELD_LITERAL(0x004d058953747d64ULL, 0x00701940fe79aa6fULL,
+ 0x00a620ac71c760bfULL, 0x009532b611158b75ULL,
+ 0x00547ed7f466f300ULL, 0x003cb5ab53a8401aULL,
+ 0x00c7763168ce3120ULL, 0x007e48e33e4b9ab2ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x001b2fc57bf3c738ULL, 0x006a3f918993fb80ULL,
+ 0x0026f7a14fdec288ULL, 0x0075a2cdccef08dbULL,
+ 0x00d3ecbc9eecdbf1ULL, 0x0048c40f06e5bf7fULL,
+ 0x00d63e423009896bULL, 0x000598bc99c056a8ULL) },
+ { FIELD_LITERAL(0x002f194eaafa46dcULL, 0x008e38f57fe87613ULL,
+ 0x00dc8e5ae25f4ab2ULL, 0x000a17809575e6bdULL,
+ 0x00d3ec7923ba366aULL, 0x003a7e72e0ad75e3ULL,
+ 0x0010024b88436e0aULL, 0x00ed3c5444b64051ULL) },
+ { FIELD_LITERAL(0x00831fc1340af342ULL, 0x00c9645669466d35ULL,
+ 0x007692b4cc5a080fULL, 0x009fd4a47ac9259fULL,
+ 0x001eeddf7d45928bULL, 0x003c0446fc45f28bULL,
+ 0x002c0713aa3e2507ULL, 0x0095706935f0f41eULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00766ae4190ec6d8ULL, 0x0065768cabc71380ULL,
+ 0x00b902598416cdc2ULL, 0x00380021ad38df52ULL,
+ 0x008f0b89d6551134ULL, 0x004254d4cc62c5a5ULL,
+ 0x000d79f4484b9b94ULL, 0x00b516732ae3c50eULL) },
+ { FIELD_LITERAL(0x001fb73475c45509ULL, 0x00d2b2e5ea43345aULL,
+ 0x00cb3c3842077bd1ULL, 0x0029f90ad820946eULL,
+ 0x007c11b2380778aaULL, 0x009e54ece62c1704ULL,
+ 0x004bc60c41ca01c3ULL, 0x004525679a5a0b03ULL) },
+ { FIELD_LITERAL(0x00c64fbddbed87b3ULL, 0x0040601d11731faaULL,
+ 0x009c22475b6f9d67ULL, 0x0024b79dae875f15ULL,
+ 0x00616fed3f02c3b0ULL, 0x0000cf39f6af2d3bULL,
+ 0x00c46bac0aa9a688ULL, 0x00ab23e2800da204ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x000b3a37617632b0ULL, 0x00597199fe1cfb6cULL,
+ 0x0042a7ccdfeafdd6ULL, 0x004cc9f15ebcea17ULL,
+ 0x00f436e596a6b4a4ULL, 0x00168861142df0d8ULL,
+ 0x000753edfec26af5ULL, 0x000c495d7e388116ULL) },
+ { FIELD_LITERAL(0x0017085f4a346148ULL, 0x00c7cf7a37f62272ULL,
+ 0x001776e129bc5c30ULL, 0x009955134c9eef2aULL,
+ 0x001ba5bdf1df07beULL, 0x00ec39497103a55cULL,
+ 0x006578354fda6cfbULL, 0x005f02719d4f15eeULL) },
+ { FIELD_LITERAL(0x0052b9d9b5d9655dULL, 0x00d4ec7ba1b461c3ULL,
+ 0x00f95df4974f280bULL, 0x003d8e5ca11aeb51ULL,
+ 0x00d4981eb5a70b26ULL, 0x000af9a4f6659f29ULL,
+ 0x004598c846faeb43ULL, 0x0049d9a183a47670ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x000a72d23dcb3f1fULL, 0x00a3737f84011727ULL,
+ 0x00f870c0fbbf4a47ULL, 0x00a7aadd04b5c9caULL,
+ 0x000c7715c67bd072ULL, 0x00015a136afcd74eULL,
+ 0x0080d5caea499634ULL, 0x0026b448ec7514b7ULL) },
+ { FIELD_LITERAL(0x00b60167d9e7d065ULL, 0x00e60ba0d07381e8ULL,
+ 0x003a4f17b725c2d4ULL, 0x006c19fe176b64faULL,
+ 0x003b57b31af86ccbULL, 0x0021047c286180fdULL,
+ 0x00bdc8fb00c6dbb6ULL, 0x00fe4a9f4bab4f3fULL) },
+ { FIELD_LITERAL(0x0088ffc3a16111f7ULL, 0x009155e4245d0bc8ULL,
+ 0x00851d68220572d5ULL, 0x00557ace1e514d29ULL,
+ 0x0031d7c339d91022ULL, 0x00101d0ae2eaceeaULL,
+ 0x00246ab3f837b66aULL, 0x00d5216d381ff530ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x0057e7ea35f36daeULL, 0x00f47d7ad15de22eULL,
+ 0x00d757ea4b105115ULL, 0x008311457d579d7eULL,
+ 0x00b49b75b1edd4ebULL, 0x0081c7ff742fd63aULL,
+ 0x00ddda3187433df6ULL, 0x00475727d55f9c66ULL) },
+ { FIELD_LITERAL(0x00a6295218dc136aULL, 0x00563b3af0e9c012ULL,
+ 0x00d3753b0145db1bULL, 0x004550389c043dc1ULL,
+ 0x00ea94ae27401bdfULL, 0x002b0b949f2b7956ULL,
+ 0x00c63f780ad8e23cULL, 0x00e591c47d6bab15ULL) },
+ { FIELD_LITERAL(0x00416c582b058eb6ULL, 0x004107da5b2cc695ULL,
+ 0x00b3cd2556aeec64ULL, 0x00c0b418267e57a1ULL,
+ 0x001799293579bd2eULL, 0x0046ed44590e4d07ULL,
+ 0x001d7459b3630a1eULL, 0x00c6afba8b6696aaULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x008d6009b26da3f8ULL, 0x00898e88ca06b1caULL,
+ 0x00edb22b2ed7fe62ULL, 0x00fbc93516aabe80ULL,
+ 0x008b4b470c42ce0dULL, 0x00e0032ba7d0dcbbULL,
+ 0x00d76da3a956ecc8ULL, 0x007f20fe74e3852aULL) },
+ { FIELD_LITERAL(0x002419222c607674ULL, 0x00a7f23af89188b3ULL,
+ 0x00ad127284e73d1cULL, 0x008bba582fae1c51ULL,
+ 0x00fc6aa7ca9ecab1ULL, 0x003df5319eb6c2baULL,
+ 0x002a05af8a8b199aULL, 0x004bf8354558407cULL) },
+ { FIELD_LITERAL(0x00ce7d4a30f0fcbfULL, 0x00d02c272629f03dULL,
+ 0x0048c001f7400bc2ULL, 0x002c21368011958dULL,
+ 0x0098a550391e96b5ULL, 0x002d80b66390f379ULL,
+ 0x001fa878760cc785ULL, 0x001adfce54b613d5ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x001ed4dc71fa2523ULL, 0x005d0bff19bf9b5cULL,
+ 0x00c3801cee065a64ULL, 0x001ed0b504323fbfULL,
+ 0x0003ab9fdcbbc593ULL, 0x00df82070178b8d2ULL,
+ 0x00a2bcaa9c251f85ULL, 0x00c628a3674bd02eULL) },
+ { FIELD_LITERAL(0x006b7a0674f9f8deULL, 0x00a742414e5c7cffULL,
+ 0x0041cbf3c6e13221ULL, 0x00e3a64fd207af24ULL,
+ 0x0087c05f15fbe8d1ULL, 0x004c50936d9e8a33ULL,
+ 0x001306ec21042b6dULL, 0x00a4f4137d1141c2ULL) },
+ { FIELD_LITERAL(0x0009e6fb921568b0ULL, 0x00b3c60120219118ULL,
+ 0x002a6c3460dd503aULL, 0x009db1ef11654b54ULL,
+ 0x0063e4bf0be79601ULL, 0x00670d34bb2592b9ULL,
+ 0x00dcee2f6c4130ceULL, 0x00b2682e88e77f54ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x000d5b4b3da135abULL, 0x00838f3e5064d81dULL,
+ 0x00d44eb50f6d94edULL, 0x0008931ab502ac6dULL,
+ 0x00debe01ca3d3586ULL, 0x0025c206775f0641ULL,
+ 0x005ad4b6ae912763ULL, 0x007e2c318ad8f247ULL) },
+ { FIELD_LITERAL(0x00ddbe0750dd1addULL, 0x004b3c7b885844b8ULL,
+ 0x00363e7ecf12f1aeULL, 0x0062e953e6438f9dULL,
+ 0x0023cc73b076afe9ULL, 0x00b09fa083b4da32ULL,
+ 0x00c7c3d2456c541dULL, 0x005b591ec6b694d4ULL) },
+ { FIELD_LITERAL(0x0028656e19d62fcfULL, 0x0052a4af03df148dULL,
+ 0x00122765ddd14e42ULL, 0x00f2252904f67157ULL,
+ 0x004741965b636f3aULL, 0x006441d296132cb9ULL,
+ 0x005e2106f956a5b7ULL, 0x00247029592d335cULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x003fe038eb92f894ULL, 0x000e6da1b72e8e32ULL,
+ 0x003a1411bfcbe0faULL, 0x00b55d473164a9e4ULL,
+ 0x00b9a775ac2df48dULL, 0x0002ddf350659e21ULL,
+ 0x00a279a69eb19cb3ULL, 0x00f844eab25cba44ULL) },
+ { FIELD_LITERAL(0x00c41d1f9c1f1ac1ULL, 0x007b2df4e9f19146ULL,
+ 0x00b469355fd5ba7aULL, 0x00b5e1965afc852aULL,
+ 0x00388d5f1e2d8217ULL, 0x0022079e4c09ae93ULL,
+ 0x0014268acd4ef518ULL, 0x00c1dd8d9640464cULL) },
+ { FIELD_LITERAL(0x0038526adeed0c55ULL, 0x00dd68c607e3fe85ULL,
+ 0x00f746ddd48a5d57ULL, 0x0042f2952b963b7cULL,
+ 0x001cbbd6876d5ec2ULL, 0x005e341470bca5c2ULL,
+ 0x00871d41e085f413ULL, 0x00e53ab098f45732ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x004d51124797c831ULL, 0x008f5ae3750347adULL,
+ 0x0070ced94c1a0c8eULL, 0x00f6db2043898e64ULL,
+ 0x000d00c9a5750cd0ULL, 0x000741ec59bad712ULL,
+ 0x003c9d11aab37b7fULL, 0x00a67ba169807714ULL) },
+ { FIELD_LITERAL(0x00adb2c1566e8b8fULL, 0x0096c68a35771a9aULL,
+ 0x00869933356f334aULL, 0x00ba9c93459f5962ULL,
+ 0x009ec73fb6e8ca4bULL, 0x003c3802c27202e1ULL,
+ 0x0031f5b733e0c008ULL, 0x00f9058c19611fa9ULL) },
+ { FIELD_LITERAL(0x00238f01814a3421ULL, 0x00c325a44b6cce28ULL,
+ 0x002136f97aeb0e73ULL, 0x000cac8268a4afe2ULL,
+ 0x0022fd218da471b3ULL, 0x009dcd8dfff8def9ULL,
+ 0x00cb9f8181d999bbULL, 0x00143ae56edea349ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x0000623bf87622c5ULL, 0x00a1966fdd069496ULL,
+ 0x00c315b7b812f9fcULL, 0x00bdf5efcd128b97ULL,
+ 0x001d464f532e3e16ULL, 0x003cd94f081bfd7eULL,
+ 0x00ed9dae12ce4009ULL, 0x002756f5736eee70ULL) },
+ { FIELD_LITERAL(0x00a5187e6ee7341bULL, 0x00e6d52e82d83b6eULL,
+ 0x00df3c41323094a7ULL, 0x00b3324f444e9de9ULL,
+ 0x00689eb21a35bfe5ULL, 0x00f16363becd548dULL,
+ 0x00e187cc98e7f60fULL, 0x00127d9062f0ccabULL) },
+ { FIELD_LITERAL(0x004ad71b31c29e40ULL, 0x00a5fcace12fae29ULL,
+ 0x004425b5597280edULL, 0x00e7ef5d716c3346ULL,
+ 0x0010b53ada410ac8ULL, 0x0092310226060c9bULL,
+ 0x0091c26128729c7eULL, 0x0088b42900f8ec3bULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00f1e26e9762d4a8ULL, 0x00d9d74082183414ULL,
+ 0x00ffec9bd57a0282ULL, 0x000919e128fd497aULL,
+ 0x00ab7ae7d00fe5f8ULL, 0x0054dc442851ff68ULL,
+ 0x00c9ebeb3b861687ULL, 0x00507f7cab8b698fULL) },
+ { FIELD_LITERAL(0x00c13c5aae3ae341ULL, 0x009c6c9ed98373e7ULL,
+ 0x00098f26864577a8ULL, 0x0015b886e9488b45ULL,
+ 0x0037692c42aadba5ULL, 0x00b83170b8e7791cULL,
+ 0x001670952ece1b44ULL, 0x00fd932a39276da2ULL) },
+ { FIELD_LITERAL(0x0081a3259bef3398ULL, 0x005480fff416107bULL,
+ 0x00ce4f607d21be98ULL, 0x003ffc084b41df9bULL,
+ 0x0043d0bb100502d1ULL, 0x00ec35f575ba3261ULL,
+ 0x00ca18f677300ef3ULL, 0x00e8bb0a827d8548ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00df76b3328ada72ULL, 0x002e20621604a7c2ULL,
+ 0x00f910638a105b09ULL, 0x00ef4724d96ef2cdULL,
+ 0x00377d83d6b8a2f7ULL, 0x00b4f48805ade324ULL,
+ 0x001cd5da8b152018ULL, 0x0045af671a20ca7fULL) },
+ { FIELD_LITERAL(0x009ae3b93a56c404ULL, 0x004a410b7a456699ULL,
+ 0x00023a619355e6b2ULL, 0x009cdc7297387257ULL,
+ 0x0055b94d4ae70d04ULL, 0x002cbd607f65b005ULL,
+ 0x003208b489697166ULL, 0x00ea2aa058867370ULL) },
+ { FIELD_LITERAL(0x00f29d2598ee3f32ULL, 0x00b4ac5385d82adcULL,
+ 0x007633eaf04df19bULL, 0x00aa2d3d77ceab01ULL,
+ 0x004a2302fcbb778aULL, 0x00927f225d5afa34ULL,
+ 0x004a8e9d5047f237ULL, 0x008224ae9dbce530ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x001cf640859b02f8ULL, 0x00758d1d5d5ce427ULL,
+ 0x00763c784ef4604cULL, 0x005fa81aee205270ULL,
+ 0x00ac537bfdfc44cbULL, 0x004b919bd342d670ULL,
+ 0x00238508d9bf4b7aULL, 0x00154888795644f3ULL) },
+ { FIELD_LITERAL(0x00c845923c084294ULL, 0x00072419a201bc25ULL,
+ 0x0045f408b5f8e669ULL, 0x00e9d6a186b74dfeULL,
+ 0x00e19108c68fa075ULL, 0x0017b91d874177b7ULL,
+ 0x002f0ca2c7912c5aULL, 0x009400aa385a90a2ULL) },
+ { FIELD_LITERAL(0x0071110b01482184ULL, 0x00cfed0044f2bef8ULL,
+ 0x0034f2901cf4662eULL, 0x003b4ae2a67f9834ULL,
+ 0x00cca9b96fe94810ULL, 0x00522507ae77abd0ULL,
+ 0x00bac7422721e73eULL, 0x0066622b0f3a62b0ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00f8ac5cf4705b6aULL, 0x00867d82dcb457e3ULL,
+ 0x007e13ab2ccc2ce9ULL, 0x009ee9a018d3930eULL,
+ 0x008370f8ecb42df8ULL, 0x002d9f019add263eULL,
+ 0x003302385b92d196ULL, 0x00a15654536e2c0cULL) },
+ { FIELD_LITERAL(0x0026ef1614e160afULL, 0x00c023f9edfc9c76ULL,
+ 0x00cff090da5f57baULL, 0x0076db7a66643ae9ULL,
+ 0x0019462f8c646999ULL, 0x008fec00b3854b22ULL,
+ 0x00d55041692a0a1cULL, 0x0065db894215ca00ULL) },
+ { FIELD_LITERAL(0x00a925036e0a451cULL, 0x002a0390c36b6cc1ULL,
+ 0x00f27020d90894f4ULL, 0x008d90d52cbd3d7fULL,
+ 0x00e1d0137392f3b8ULL, 0x00f017c158b51a8fULL,
+ 0x00cac313d3ed7dbcULL, 0x00b99a81e3eb42d3ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00b54850275fe626ULL, 0x0053a3fd1ec71140ULL,
+ 0x00e3d2d7dbe096faULL, 0x00e4ac7b595cce4cULL,
+ 0x0077bad449c0a494ULL, 0x00b7c98814afd5b3ULL,
+ 0x0057226f58486cf9ULL, 0x00b1557154f0cc57ULL) },
+ { FIELD_LITERAL(0x008cc9cd236315c0ULL, 0x0031d9c5b39fda54ULL,
+ 0x00a5713ef37e1171ULL, 0x00293d5ae2886325ULL,
+ 0x00c4aba3e05015e1ULL, 0x0003f35ef78e4fc6ULL,
+ 0x0039d6bd3ac1527bULL, 0x0019d7c3afb77106ULL) },
+ { FIELD_LITERAL(0x007b162931a985afULL, 0x00ad40a2e0daa713ULL,
+ 0x006df27c4009f118ULL, 0x00503e9f4e2e8becULL,
+ 0x00751a77c82c182dULL, 0x000298937769245bULL,
+ 0x00ffb1e8fabf9ee5ULL, 0x0008334706e09abeULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00dbca4e98a7dcd9ULL, 0x00ee29cfc78bde99ULL,
+ 0x00e4a3b6995f52e9ULL, 0x0045d70189ae8096ULL,
+ 0x00fd2a8a3b9b0d1bULL, 0x00af1793b107d8e1ULL,
+ 0x00dbf92cbe4afa20ULL, 0x00da60f798e3681dULL) },
+ { FIELD_LITERAL(0x004246bfcecc627aULL, 0x004ba431246c03a4ULL,
+ 0x00bd1d101872d497ULL, 0x003b73d3f185ee16ULL,
+ 0x001feb2e2678c0e3ULL, 0x00ff13c5a89dec76ULL,
+ 0x00ed06042e771d8fULL, 0x00a4fd2a897a83ddULL) },
+ { FIELD_LITERAL(0x009a4a3be50d6597ULL, 0x00de3165fc5a1096ULL,
+ 0x004f3f56e345b0c7ULL, 0x00f7bf721d5ab8bcULL,
+ 0x004313e47b098c50ULL, 0x00e4c7d5c0e1adbbULL,
+ 0x002e3e3db365051eULL, 0x00a480c2cd6a96fbULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00417fa30a7119edULL, 0x00af257758419751ULL,
+ 0x00d358a487b463d4ULL, 0x0089703cc720b00dULL,
+ 0x00ce56314ff7f271ULL, 0x0064db171ade62c1ULL,
+ 0x00640b36d4a22fedULL, 0x00424eb88696d23fULL) },
+ { FIELD_LITERAL(0x004ede34af2813f3ULL, 0x00d4a8e11c9e8216ULL,
+ 0x004796d5041de8a5ULL, 0x00c4c6b4d21cc987ULL,
+ 0x00e8a433ee07fa1eULL, 0x0055720b5abcc5a1ULL,
+ 0x008873ea9c74b080ULL, 0x005b3fec1ab65d48ULL) },
+ { FIELD_LITERAL(0x0047e5277db70ec5ULL, 0x000a096c66db7d6bULL,
+ 0x00b4164cc1730159ULL, 0x004a9f783fe720feULL,
+ 0x00a8177b94449dbcULL, 0x0095a24ff49a599fULL,
+ 0x0069c1c578250cbcULL, 0x00452019213debf4ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x0021ce99e09ebda3ULL, 0x00fcbd9f91875ad0ULL,
+ 0x009bbf6b7b7a0b5fULL, 0x00388886a69b1940ULL,
+ 0x00926a56d0f81f12ULL, 0x00e12903c3358d46ULL,
+ 0x005dfce4e8e1ce9dULL, 0x0044cfa94e2f7e23ULL) },
+ { FIELD_LITERAL(0x001bd59c09e982eaULL, 0x00f72daeb937b289ULL,
+ 0x0018b76dca908e0eULL, 0x00edb498512384adULL,
+ 0x00ce0243b6cc9538ULL, 0x00f96ff690cb4e70ULL,
+ 0x007c77bf9f673c8dULL, 0x005bf704c088a528ULL) },
+ { FIELD_LITERAL(0x0093d4628dcb33beULL, 0x0095263d51d42582ULL,
+ 0x0049b3222458fe06ULL, 0x00e7fce73b653a7fULL,
+ 0x003ca2ebce60b369ULL, 0x00c5de239a32bea4ULL,
+ 0x0063b8b3d71fb6bfULL, 0x0039aeeb78a1a839ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x007dc52da400336cULL, 0x001fded1e15b9457ULL,
+ 0x00902e00f5568e3aULL, 0x00219bef40456d2dULL,
+ 0x005684161fb3dbc9ULL, 0x004a4e9be49a76eaULL,
+ 0x006e685ae88b78ffULL, 0x0021c42f13042d3cULL) },
+ { FIELD_LITERAL(0x00fb22bb5fd3ce50ULL, 0x0017b48aada7ae54ULL,
+ 0x00fd5c44ad19a536ULL, 0x000ccc4e4e55e45cULL,
+ 0x00fd637d45b4c3f5ULL, 0x0038914e023c37cfULL,
+ 0x00ac1881d6a8d898ULL, 0x00611ed8d3d943a8ULL) },
+ { FIELD_LITERAL(0x0056e2259d113d2bULL, 0x00594819b284ec16ULL,
+ 0x00c7bf794bb36696ULL, 0x00721ee75097cdc6ULL,
+ 0x00f71be9047a2892ULL, 0x00df6ba142564edfULL,
+ 0x0069580b7a184e8dULL, 0x00f056e38fca0feeULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x009df98566a18c6dULL, 0x00cf3a200968f219ULL,
+ 0x0044ba60da6d9086ULL, 0x00dbc9c0e344da03ULL,
+ 0x000f9401c4466855ULL, 0x00d46a57c5b0a8d1ULL,
+ 0x00875a635d7ac7c6ULL, 0x00ef4a933b7e0ae6ULL) },
+ { FIELD_LITERAL(0x005e8694077a1535ULL, 0x008bef75f71c8f1dULL,
+ 0x000a7c1316423511ULL, 0x00906e1d70604320ULL,
+ 0x003fc46c1a2ffbd6ULL, 0x00d1d5022e68f360ULL,
+ 0x002515fba37bbf46ULL, 0x00ca16234e023b44ULL) },
+ { FIELD_LITERAL(0x00787c99561f4690ULL, 0x00a857a8c1561f27ULL,
+ 0x00a10df9223c09feULL, 0x00b98a9562e3b154ULL,
+ 0x004330b8744c3ed2ULL, 0x00e06812807ec5c4ULL,
+ 0x00e4cf6a7db9f1e3ULL, 0x00d95b089f132a34ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x002922b39ca33eecULL, 0x0090d12a5f3ab194ULL,
+ 0x00ab60c02fb5f8edULL, 0x00188d292abba1cfULL,
+ 0x00e10edec9698f6eULL, 0x0069a4d9934133c8ULL,
+ 0x0024aac40e6d3d06ULL, 0x001702c2177661b0ULL) },
+ { FIELD_LITERAL(0x00139078397030bdULL, 0x000e3c447e859a00ULL,
+ 0x0064a5b334c82393ULL, 0x00b8aabeb7358093ULL,
+ 0x00020778bb9ae73bULL, 0x0032ee94c7892a18ULL,
+ 0x008215253cb41bdaULL, 0x005e2797593517aeULL) },
+ { FIELD_LITERAL(0x0083765a5f855d4aULL, 0x0051b6d1351b8ee2ULL,
+ 0x00116de548b0f7bbULL, 0x0087bd88703affa0ULL,
+ 0x0095b2cc34d7fdd2ULL, 0x0084cd81b53f0bc8ULL,
+ 0x008562fc995350edULL, 0x00a39abb193651e3ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x0019e23f0474b114ULL, 0x00eb94c2ad3b437eULL,
+ 0x006ddb34683b75acULL, 0x00391f9209b564c6ULL,
+ 0x00083b3bb3bff7aaULL, 0x00eedcd0f6dceefcULL,
+ 0x00b50817f794fe01ULL, 0x0036474deaaa75c9ULL) },
+ { FIELD_LITERAL(0x0091868594265aa2ULL, 0x00797accae98ca6dULL,
+ 0x0008d8c5f0f8a184ULL, 0x00d1f4f1c2b2fe6eULL,
+ 0x0036783dfb48a006ULL, 0x008c165120503527ULL,
+ 0x0025fd780058ce9bULL, 0x0068beb007be7d27ULL) },
+ { FIELD_LITERAL(0x00d0ff88aa7c90c2ULL, 0x00b2c60dacf53394ULL,
+ 0x0094a7284d9666d6ULL, 0x00bed9022ce7a19dULL,
+ 0x00c51553f0cd7682ULL, 0x00c3fb870b124992ULL,
+ 0x008d0bc539956c9bULL, 0x00fc8cf258bb8885ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x003667bf998406f8ULL, 0x0000115c43a12975ULL,
+ 0x001e662f3b20e8fdULL, 0x0019ffa534cb24ebULL,
+ 0x00016be0dc8efb45ULL, 0x00ff76a8b26243f5ULL,
+ 0x00ae20d241a541e3ULL, 0x0069bd6af13cd430ULL) },
+ { FIELD_LITERAL(0x0045fdc16487cda3ULL, 0x00b2d8e844cf2ed7ULL,
+ 0x00612c50e88c1607ULL, 0x00a08aabc66c1672ULL,
+ 0x006031fdcbb24d97ULL, 0x001b639525744b93ULL,
+ 0x004409d62639ab17ULL, 0x00a1853d0347ab1dULL) },
+ { FIELD_LITERAL(0x0075a1a56ebf5c21ULL, 0x00a3e72be9ac53edULL,
+ 0x00efcde1629170c2ULL, 0x0004225fe91ef535ULL,
+ 0x0088049fc73dfda7ULL, 0x004abc74857e1288ULL,
+ 0x0024e2434657317cULL, 0x00d98cb3d3e5543cULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00b4b53eab6bdb19ULL, 0x009b22d8b43711d0ULL,
+ 0x00d948b9d961785dULL, 0x00cb167b6f279eadULL,
+ 0x00191de3a678e1c9ULL, 0x00d9dd9511095c2eULL,
+ 0x00f284324cd43067ULL, 0x00ed74fa535151ddULL) },
+ { FIELD_LITERAL(0x007e32c049b5c477ULL, 0x009d2bfdbd9bcfd8ULL,
+ 0x00636e93045938c6ULL, 0x007fde4af7687298ULL,
+ 0x0046a5184fafa5d3ULL, 0x0079b1e7f13a359bULL,
+ 0x00875adf1fb927d6ULL, 0x00333e21c61bcad2ULL) },
+ { FIELD_LITERAL(0x00048014f73d8b8dULL, 0x0075684aa0966388ULL,
+ 0x0092be7df06dc47cULL, 0x0097cebcd0f5568aULL,
+ 0x005a7004d9c4c6a9ULL, 0x00b0ecbb659924c7ULL,
+ 0x00d90332dd492a7cULL, 0x0057fc14df11493dULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x0008ed8ea0ad95beULL, 0x0041d324b9709645ULL,
+ 0x00e25412257a19b4ULL, 0x0058df9f3423d8d2ULL,
+ 0x00a9ab20def71304ULL, 0x009ae0dbf8ac4a81ULL,
+ 0x00c9565977e4392aULL, 0x003c9269444baf55ULL) },
+ { FIELD_LITERAL(0x007df6cbb926830bULL, 0x00d336058ae37865ULL,
+ 0x007af47dac696423ULL, 0x0048d3011ec64ac8ULL,
+ 0x006b87666e40049fULL, 0x0036a2e0e51303d7ULL,
+ 0x00ba319bd79dbc55ULL, 0x003e2737ecc94f53ULL) },
+ { FIELD_LITERAL(0x00d296ff726272d9ULL, 0x00f6d097928fcf57ULL,
+ 0x00e0e616a55d7013ULL, 0x00deaf454ed9eac7ULL,
+ 0x0073a56bedef4d92ULL, 0x006ccfdf6fc92e19ULL,
+ 0x009d1ee1371a7218ULL, 0x00ee3c2ee4462d80ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00437bce9bccdf9dULL, 0x00e0c8e2f85dc0a3ULL,
+ 0x00c91a7073995a19ULL, 0x00856ec9fe294559ULL,
+ 0x009e4b33394b156eULL, 0x00e245b0dc497e5cULL,
+ 0x006a54e687eeaeffULL, 0x00f1cd1cd00fdb7cULL) },
+ { FIELD_LITERAL(0x008132ae5c5d8cd1ULL, 0x00121d68324a1d9fULL,
+ 0x00d6be9dafcb8c76ULL, 0x00684d9070edf745ULL,
+ 0x00519fbc96d7448eULL, 0x00388182fdc1f27eULL,
+ 0x000235baed41f158ULL, 0x00bf6cf6f1a1796aULL) },
+ { FIELD_LITERAL(0x002adc4b4d148219ULL, 0x003084ada0d3a90aULL,
+ 0x0046de8aab0f2e4eULL, 0x00452d342a67b5fdULL,
+ 0x00d4b50f01d4de21ULL, 0x00db6d9fc0cefb79ULL,
+ 0x008c184c86a462cdULL, 0x00e17c83764d42daULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x007b2743b9a1e01aULL, 0x007847ffd42688c4ULL,
+ 0x006c7844d610a316ULL, 0x00f0cb8b250aa4b0ULL,
+ 0x00a19060143b3ae6ULL, 0x0014eb10b77cfd80ULL,
+ 0x000170905729dd06ULL, 0x00063b5b9cd72477ULL) },
+ { FIELD_LITERAL(0x00ce382dc7993d92ULL, 0x00021153e938b4c8ULL,
+ 0x00096f7567f48f51ULL, 0x0058f81ddfe4b0d5ULL,
+ 0x00cc379a56b355c7ULL, 0x002c760770d3e819ULL,
+ 0x00ee22d1d26e5a40ULL, 0x00de6d93d5b082d7ULL) },
+ { FIELD_LITERAL(0x000a91a42c52e056ULL, 0x00185f6b77fce7eaULL,
+ 0x000803c51962f6b5ULL, 0x0022528582ba563dULL,
+ 0x0043f8040e9856d6ULL, 0x0085a29ec81fb860ULL,
+ 0x005f9a611549f5ffULL, 0x00c1f974ecbd4b06ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x005b64c6fd65ec97ULL, 0x00c1fdd7f877bc7fULL,
+ 0x000d9cc6c89f841cULL, 0x005c97b7f1aff9adULL,
+ 0x0075e3c61475d47eULL, 0x001ecb1ba8153011ULL,
+ 0x00fe7f1c8d71d40dULL, 0x003fa9757a229832ULL) },
+ { FIELD_LITERAL(0x00ffc5c89d2b0cbaULL, 0x00d363d42e3e6fc3ULL,
+ 0x0019a1a0118e2e8aULL, 0x00f7baeff48882e1ULL,
+ 0x001bd5af28c6b514ULL, 0x0055476ca2253cb2ULL,
+ 0x00d8eb1977e2ddf3ULL, 0x00b173b1adb228a1ULL) },
+ { FIELD_LITERAL(0x00f2cb99dd0ad707ULL, 0x00e1e08b6859ddd8ULL,
+ 0x000008f2d0650bccULL, 0x00d7ed392f8615c3ULL,
+ 0x00976750a94da27fULL, 0x003e83bb0ecb69baULL,
+ 0x00df8e8d15c14ac6ULL, 0x00f9f7174295d9c2ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00f11cc8e0e70bcbULL, 0x00e5dc689974e7ddULL,
+ 0x0014e409f9ee5870ULL, 0x00826e6689acbd63ULL,
+ 0x008a6f4e3d895d88ULL, 0x00b26a8da41fd4adULL,
+ 0x000fb7723f83efd7ULL, 0x009c749db0a5f6c3ULL) },
+ { FIELD_LITERAL(0x002389319450f9baULL, 0x003677f31aa1250aULL,
+ 0x0092c3db642f38cbULL, 0x00f8b64c0dfc9773ULL,
+ 0x00cd49fe3505b795ULL, 0x0068105a4090a510ULL,
+ 0x00df0ba2072a8bb6ULL, 0x00eb396143afd8beULL) },
+ { FIELD_LITERAL(0x00a0d4ecfb24cdffULL, 0x00ddaf8008ba6479ULL,
+ 0x00f0b3e36d4b0f44ULL, 0x003734bd3af1f146ULL,
+ 0x00b87e2efc75527eULL, 0x00d230df55ddab50ULL,
+ 0x002613257ae56c1dULL, 0x00bc0946d135934dULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00468711bd994651ULL, 0x0033108fa67561bfULL,
+ 0x0089d760192a54b4ULL, 0x00adc433de9f1871ULL,
+ 0x000467d05f36e050ULL, 0x007847e0f0579f7fULL,
+ 0x00a2314ad320052dULL, 0x00b3a93649f0b243ULL) },
+ { FIELD_LITERAL(0x0067f8f0c4fe26c9ULL, 0x0079c4a3cc8f67b9ULL,
+ 0x0082b1e62f23550dULL, 0x00f2d409caefd7f5ULL,
+ 0x0080e67dcdb26e81ULL, 0x0087ae993ea1f98aULL,
+ 0x00aa108becf61d03ULL, 0x001acf11efb608a3ULL) },
+ { FIELD_LITERAL(0x008225febbab50d9ULL, 0x00f3b605e4dd2083ULL,
+ 0x00a32b28189e23d2ULL, 0x00d507e5e5eb4c97ULL,
+ 0x005a1a84e302821fULL, 0x0006f54c1c5f08c7ULL,
+ 0x00a347c8cb2843f0ULL, 0x0009f73e9544bfa5ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x006c59c9ae744185ULL, 0x009fc32f1b4282cdULL,
+ 0x004d6348ca59b1acULL, 0x00105376881be067ULL,
+ 0x00af4096013147dcULL, 0x004abfb5a5cb3124ULL,
+ 0x000d2a7f8626c354ULL, 0x009c6ed568e07431ULL) },
+ { FIELD_LITERAL(0x00e828333c297f8bULL, 0x009ef3cf8c3f7e1fULL,
+ 0x00ab45f8fff31cb9ULL, 0x00c8b4178cb0b013ULL,
+ 0x00d0c50dd3260a3fULL, 0x0097126ac257f5bcULL,
+ 0x0042376cc90c705aULL, 0x001d96fdb4a1071eULL) },
+ { FIELD_LITERAL(0x00542d44d89ee1a8ULL, 0x00306642e0442d98ULL,
+ 0x0090853872b87338ULL, 0x002362cbf22dc044ULL,
+ 0x002c222adff663b8ULL, 0x0067c924495fcb79ULL,
+ 0x000e621d983c977cULL, 0x00df77a9eccb66fbULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x002809e4bbf1814aULL, 0x00b9e854f9fafb32ULL,
+ 0x00d35e67c10f7a67ULL, 0x008f1bcb76e748cfULL,
+ 0x004224d9515687d2ULL, 0x005ba0b774e620c4ULL,
+ 0x00b5e57db5d54119ULL, 0x00e15babe5683282ULL) },
+ { FIELD_LITERAL(0x00832d02369b482cULL, 0x00cba52ff0d93450ULL,
+ 0x003fa9c908d554dbULL, 0x008d1e357b54122fULL,
+ 0x00abd91c2dc950c6ULL, 0x007eff1df4c0ec69ULL,
+ 0x003f6aeb13fb2d31ULL, 0x00002d6179fc5b2cULL) },
+ { FIELD_LITERAL(0x0046c9eda81c9c89ULL, 0x00b60cb71c8f62fcULL,
+ 0x0022f5a683baa558ULL, 0x00f87319fccdf997ULL,
+ 0x009ca09b51ce6a22ULL, 0x005b12baf4af7d77ULL,
+ 0x008a46524a1e33e2ULL, 0x00035a77e988be0dULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00a7efe46a7dbe2fULL, 0x002f66fd55014fe7ULL,
+ 0x006a428afa1ff026ULL, 0x0056caaa9604ab72ULL,
+ 0x0033f3bcd7fac8aeULL, 0x00ccb1aa01c86764ULL,
+ 0x00158d1edf13bf40ULL, 0x009848ee76fcf3b4ULL) },
+ { FIELD_LITERAL(0x00a9e7730a819691ULL, 0x00d9cc73c4992b70ULL,
+ 0x00e299bde067de5aULL, 0x008c314eb705192aULL,
+ 0x00e7226f17e8a3ccULL, 0x0029dfd956e65a47ULL,
+ 0x0053a8e839073b12ULL, 0x006f942b2ab1597eULL) },
+ { FIELD_LITERAL(0x001c3d780ecd5e39ULL, 0x0094f247fbdcc5feULL,
+ 0x00d5c786fd527764ULL, 0x00b6f4da74f0db2aULL,
+ 0x0080f1f8badcd5fcULL, 0x00f36a373ad2e23bULL,
+ 0x00f804f9f4343bf2ULL, 0x00d1af40ec623982ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x0082aeace5f1b144ULL, 0x00f68b3108cf4dd3ULL,
+ 0x00634af01dde3020ULL, 0x000beab5df5c2355ULL,
+ 0x00e8b790d1b49b0bULL, 0x00e48d15854e36f4ULL,
+ 0x0040ab2d95f3db9fULL, 0x002711c4ed9e899aULL) },
+ { FIELD_LITERAL(0x0039343746531ebeULL, 0x00c8509d835d429dULL,
+ 0x00e79eceff6b0018ULL, 0x004abfd31e8efce5ULL,
+ 0x007bbfaaa1e20210ULL, 0x00e3be89c193e179ULL,
+ 0x001c420f4c31d585ULL, 0x00f414a315bef5aeULL) },
+ { FIELD_LITERAL(0x007c296a24990df8ULL, 0x00d5d07525a75588ULL,
+ 0x00dd8e113e94b7e7ULL, 0x007bbc58febe0cc8ULL,
+ 0x0029f51af9bfcad3ULL, 0x007e9311ec7ab6f3ULL,
+ 0x009a884de1676343ULL, 0x0050d5f2dce84be9ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x005fa020cca2450aULL, 0x00491c29db6416d8ULL,
+ 0x0037cefe3f9f9a85ULL, 0x003d405230647066ULL,
+ 0x0049e835f0fdbe89ULL, 0x00feb78ac1a0815cULL,
+ 0x00828e4b32dc9724ULL, 0x00db84f2dc8d6fd4ULL) },
+ { FIELD_LITERAL(0x0098cddc8b39549aULL, 0x006da37e3b05d22cULL,
+ 0x00ce633cfd4eb3cbULL, 0x00fda288ef526acdULL,
+ 0x0025338878c5d30aULL, 0x00f34438c4e5a1b4ULL,
+ 0x00584efea7c310f1ULL, 0x0041a551f1b660adULL) },
+ { FIELD_LITERAL(0x00d7f7a8fbd6437aULL, 0x0062872413bf3753ULL,
+ 0x00ad4bbcb43c584bULL, 0x007fe49be601d7e3ULL,
+ 0x0077c659789babf4ULL, 0x00eb45fcb06a741bULL,
+ 0x005ce244913f9708ULL, 0x0088426401736326ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x007bf562ca768d7cULL, 0x006c1f3a174e387cULL,
+ 0x00f024b447fee939ULL, 0x007e7af75f01143fULL,
+ 0x003adb70b4eed89dULL, 0x00e43544021ad79aULL,
+ 0x0091f7f7042011f6ULL, 0x0093c1a1ee3a0ddcULL) },
+ { FIELD_LITERAL(0x00a0b68ec1eb72d2ULL, 0x002c03235c0d45a0ULL,
+ 0x00553627323fe8c5ULL, 0x006186e94b17af94ULL,
+ 0x00a9906196e29f14ULL, 0x0025b3aee6567733ULL,
+ 0x007e0dd840080517ULL, 0x0018eb5801a4ba93ULL) },
+ { FIELD_LITERAL(0x00d7fe7017bf6a40ULL, 0x006e3f0624be0c42ULL,
+ 0x00ffbba205358245ULL, 0x00f9fc2cf8194239ULL,
+ 0x008d93b37bf15b4eULL, 0x006ddf2e38be8e95ULL,
+ 0x002b6e79bf5fcff9ULL, 0x00ab355da425e2deULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00938f97e20be973ULL, 0x0099141a36aaf306ULL,
+ 0x0057b0ca29e545a1ULL, 0x0085db571f9fbc13ULL,
+ 0x008b333c554b4693ULL, 0x0043ab6ef3e241cbULL,
+ 0x0054fb20aa1e5c70ULL, 0x00be0ff852760adfULL) },
+ { FIELD_LITERAL(0x003973d8938971d6ULL, 0x002aca26fa80c1f5ULL,
+ 0x00108af1faa6b513ULL, 0x00daae275d7924e6ULL,
+ 0x0053634ced721308ULL, 0x00d2355fe0bbd443ULL,
+ 0x00357612b2d22095ULL, 0x00f9bb9dd4136cf3ULL) },
+ { FIELD_LITERAL(0x002bff12cf5e03a5ULL, 0x001bdb1fa8a19cf8ULL,
+ 0x00c91c6793f84d39ULL, 0x00f869f1b2eba9afULL,
+ 0x0059bc547dc3236bULL, 0x00d91611d6d38689ULL,
+ 0x00e062daaa2c0214ULL, 0x00ed3c047cc2bc82ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x000050d70c32b31aULL, 0x001939d576d437b3ULL,
+ 0x00d709e598bf9fe6ULL, 0x00a885b34bd2ee9eULL,
+ 0x00dd4b5c08ab1a50ULL, 0x0091bebd50b55639ULL,
+ 0x00cf79ff64acdbc6ULL, 0x006067a39d826336ULL) },
+ { FIELD_LITERAL(0x0062dd0fb31be374ULL, 0x00fcc96b84c8e727ULL,
+ 0x003f64f1375e6ae3ULL, 0x0057d9b6dd1af004ULL,
+ 0x00d6a167b1103c7bULL, 0x00dd28f3180fb537ULL,
+ 0x004ff27ad7167128ULL, 0x008934c33461f2acULL) },
+ { FIELD_LITERAL(0x0065b472b7900043ULL, 0x00ba7efd2ff1064bULL,
+ 0x000b67d6c4c3020fULL, 0x0012d28469f4e46dULL,
+ 0x0031c32939703ec7ULL, 0x00b49f0bce133066ULL,
+ 0x00f7e10416181d47ULL, 0x005c90f51867eeccULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x0051207abd179101ULL, 0x00fc2a5c20d9c5daULL,
+ 0x00fb9d5f2701b6dfULL, 0x002dd040fdea82b8ULL,
+ 0x00f163b0738442ffULL, 0x00d9736bd68855b8ULL,
+ 0x00e0d8e93005e61cULL, 0x00df5a40b3988570ULL) },
+ { FIELD_LITERAL(0x0006918f5dfce6dcULL, 0x00d4bf1c793c57fbULL,
+ 0x0069a3f649435364ULL, 0x00e89a50e5b0cd6eULL,
+ 0x00b9f6a237e973afULL, 0x006d4ed8b104e41dULL,
+ 0x00498946a3924cd2ULL, 0x00c136ec5ac9d4f7ULL) },
+ { FIELD_LITERAL(0x0011a9c290ac5336ULL, 0x002b9a2d4a6a6533ULL,
+ 0x009a8a68c445d937ULL, 0x00361b27b07e5e5cULL,
+ 0x003c043b1755b974ULL, 0x00b7eb66cf1155eeULL,
+ 0x0077af5909eefff2ULL, 0x0098f609877cc806ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00ab13af436bf8f4ULL, 0x000bcf0a0dac8574ULL,
+ 0x00d50c864f705045ULL, 0x00c40e611debc842ULL,
+ 0x0085010489bd5caaULL, 0x007c5050acec026fULL,
+ 0x00f67d943c8da6d1ULL, 0x00de1da0278074c6ULL) },
+ { FIELD_LITERAL(0x00b373076597455fULL, 0x00e83f1af53ac0f5ULL,
+ 0x0041f63c01dc6840ULL, 0x0097dea19b0c6f4bULL,
+ 0x007f9d63b4c1572cULL, 0x00e692d492d0f5f0ULL,
+ 0x00cbcb392e83b4adULL, 0x0069c0f39ed9b1a8ULL) },
+ { FIELD_LITERAL(0x00861030012707c9ULL, 0x009fbbdc7fd4aafbULL,
+ 0x008f591d6b554822ULL, 0x00df08a41ea18adeULL,
+ 0x009d7d83e642abeaULL, 0x0098c71bda3b78ffULL,
+ 0x0022c89e7021f005ULL, 0x0044d29a3fe1e3c4ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00e748cd7b5c52f2ULL, 0x00ea9df883f89cc3ULL,
+ 0x0018970df156b6c7ULL, 0x00c5a46c2a33a847ULL,
+ 0x00cbde395e32aa09ULL, 0x0072474ebb423140ULL,
+ 0x00fb00053086a23dULL, 0x001dafcfe22d4e1fULL) },
+ { FIELD_LITERAL(0x00c903ee6d825540ULL, 0x00add6c4cf98473eULL,
+ 0x007636efed4227f1ULL, 0x00905124ae55e772ULL,
+ 0x00e6b38fab12ed53ULL, 0x0045e132b863fe55ULL,
+ 0x003974662edb366aULL, 0x00b1787052be8208ULL) },
+ { FIELD_LITERAL(0x00a614b00d775c7cULL, 0x00d7c78941cc7754ULL,
+ 0x00422dd68b5dabc4ULL, 0x00a6110f0167d28bULL,
+ 0x00685a309c252886ULL, 0x00b439ffd5143660ULL,
+ 0x003656e29ee7396fULL, 0x00c7c9b9ed5ad854ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x0040f7e7c5b37bf2ULL, 0x0064e4dc81181bbaULL,
+ 0x00a8767ae2a366b6ULL, 0x001496b4f90546f2ULL,
+ 0x002a28493f860441ULL, 0x0021f59513049a3aULL,
+ 0x00852d369a8b7ee3ULL, 0x00dd2e7d8b7d30a9ULL) },
+ { FIELD_LITERAL(0x00006e34a35d9fbcULL, 0x00eee4e48b2f019aULL,
+ 0x006b344743003a5fULL, 0x00541d514f04a7e3ULL,
+ 0x00e81f9ee7647455ULL, 0x005e2b916c438f81ULL,
+ 0x00116f8137b7eff0ULL, 0x009bd3decc7039d1ULL) },
+ { FIELD_LITERAL(0x0005d226f434110dULL, 0x00af8288b8ef21d5ULL,
+ 0x004a7a52ef181c8cULL, 0x00be0b781b4b06deULL,
+ 0x00e6e3627ded07e1ULL, 0x00e43aa342272b8bULL,
+ 0x00e86ab424577d84ULL, 0x00fb292c566e35bbULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00334f5303ea1222ULL, 0x00dfb3dbeb0a5d3eULL,
+ 0x002940d9592335c1ULL, 0x00706a7a63e8938aULL,
+ 0x005a533558bc4cafULL, 0x00558e33192022a9ULL,
+ 0x00970d9faf74c133ULL, 0x002979fcb63493caULL) },
+ { FIELD_LITERAL(0x00e38abece3c82abULL, 0x005a51f18a2c7a86ULL,
+ 0x009dafa2e86d592eULL, 0x00495a62eb688678ULL,
+ 0x00b79df74c0eb212ULL, 0x0023e8cc78b75982ULL,
+ 0x005998cb91075e13ULL, 0x00735aa9ba61bc76ULL) },
+ { FIELD_LITERAL(0x00d9f7a82ddbe628ULL, 0x00a1fc782889ae0fULL,
+ 0x0071ffda12d14b66ULL, 0x0037cf4eca7fb3d5ULL,
+ 0x00c80bc242c58808ULL, 0x0075bf8c2d08c863ULL,
+ 0x008d41f31afc52a7ULL, 0x00197962ecf38741ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x006e9f475cccf2eeULL, 0x00454b9cd506430cULL,
+ 0x00224a4fb79ee479ULL, 0x0062e3347ef0b5e2ULL,
+ 0x0034fd2a3512232aULL, 0x00b8b3cb0f457046ULL,
+ 0x00eb20165daa38ecULL, 0x00128eebc2d9c0f7ULL) },
+ { FIELD_LITERAL(0x00bfc5fa1e4ea21fULL, 0x00c21d7b6bb892e6ULL,
+ 0x00cf043f3acf0291ULL, 0x00c13f2f849b3c90ULL,
+ 0x00d1a97ebef10891ULL, 0x0061e130a445e7feULL,
+ 0x0019513fdedbf22bULL, 0x001d60c813bff841ULL) },
+ { FIELD_LITERAL(0x0019561c7fcf0213ULL, 0x00e3dca6843ebd77ULL,
+ 0x0068ea95b9ca920eULL, 0x009bdfb70f253595ULL,
+ 0x00c68f59186aa02aULL, 0x005aee1cca1c3039ULL,
+ 0x00ab79a8a937a1ceULL, 0x00b9a0e549959e6fULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00c79e0b6d97dfbdULL, 0x00917c71fd2bc6e8ULL,
+ 0x00db7529ccfb63d8ULL, 0x00be5be957f17866ULL,
+ 0x00a9e11fdc2cdac1ULL, 0x007b91a8e1f44443ULL,
+ 0x00a3065e4057d80fULL, 0x004825f5b8d5f6d4ULL) },
+ { FIELD_LITERAL(0x003e4964fa8a8fc8ULL, 0x00f6a1cdbcf41689ULL,
+ 0x00943cb18fe7fda7ULL, 0x00606dafbf34440aULL,
+ 0x005d37a86399c789ULL, 0x00e79a2a69417403ULL,
+ 0x00fe34f7e68b8866ULL, 0x0011f448ed2df10eULL) },
+ { FIELD_LITERAL(0x00f1f57efcc1fcc4ULL, 0x00513679117de154ULL,
+ 0x002e5b5b7c86d8c3ULL, 0x009f6486561f9cfbULL,
+ 0x00169e74b0170cf7ULL, 0x00900205af4af696ULL,
+ 0x006acfddb77853f3ULL, 0x00df184c90f31068ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00b37396c3320791ULL, 0x00fc7b67175c5783ULL,
+ 0x00c36d2cd73ecc38ULL, 0x0080ebcc0b328fc5ULL,
+ 0x0043a5b22b35d35dULL, 0x00466c9f1713c9daULL,
+ 0x0026ad346dcaa8daULL, 0x007c684e701183a6ULL) },
+ { FIELD_LITERAL(0x00fd579ffb691713ULL, 0x00b76af4f81c412dULL,
+ 0x00f239de96110f82ULL, 0x00e965fb437f0306ULL,
+ 0x00ca7e9436900921ULL, 0x00e487f1325fa24aULL,
+ 0x00633907de476380ULL, 0x00721c62ac5b8ea0ULL) },
+ { FIELD_LITERAL(0x00c0d54e542eb4f9ULL, 0x004ed657171c8dcfULL,
+ 0x00b743a4f7c2a39bULL, 0x00fd9f93ed6cc567ULL,
+ 0x00307fae3113e58bULL, 0x0058aa577c93c319ULL,
+ 0x00d254556f35b346ULL, 0x00491aada2203f0dULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00dff3103786ff34ULL, 0x000144553b1f20c3ULL,
+ 0x0095613baeb930e4ULL, 0x00098058275ea5d4ULL,
+ 0x007cd1402b046756ULL, 0x0074d74e4d58aee3ULL,
+ 0x005f93fc343ff69bULL, 0x00873df17296b3b0ULL) },
+ { FIELD_LITERAL(0x00c4a1fb48635413ULL, 0x00b5dd54423ad59fULL,
+ 0x009ff5d53fd24a88ULL, 0x003c98d267fc06a7ULL,
+ 0x002db7cb20013641ULL, 0x00bd1d6716e191f2ULL,
+ 0x006dbc8b29094241ULL, 0x0044bbf233dafa2cULL) },
+ { FIELD_LITERAL(0x0055838d41f531e6ULL, 0x00bf6a2dd03c81b2ULL,
+ 0x005827a061c4839eULL, 0x0000de2cbb36aac3ULL,
+ 0x002efa29d9717478ULL, 0x00f9e928cc8a77baULL,
+ 0x00c134b458def9efULL, 0x00958a182223fc48ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x000a9ee23c06881fULL, 0x002c727d3d871945ULL,
+ 0x00f47d971512d24aULL, 0x00671e816f9ef31aULL,
+ 0x00883af2cfaad673ULL, 0x00601f98583d6c9aULL,
+ 0x00b435f5adc79655ULL, 0x00ad87b71c04bff2ULL) },
+ { FIELD_LITERAL(0x007860d99db787cfULL, 0x00fda8983018f4a8ULL,
+ 0x008c8866bac4743cULL, 0x00ef471f84c82a3fULL,
+ 0x00abea5976d3b8e7ULL, 0x00714882896cd015ULL,
+ 0x00b49fae584ddac5ULL, 0x008e33a1a0b69c81ULL) },
+ { FIELD_LITERAL(0x007b6ee2c9e8a9ecULL, 0x002455dbbd89d622ULL,
+ 0x006490cf4eaab038ULL, 0x00d925f6c3081561ULL,
+ 0x00153b3047de7382ULL, 0x003b421f8bdceb6fULL,
+ 0x00761a4a5049da78ULL, 0x00980348c5202433ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x007f8a43da97dd5cULL, 0x00058539c800fc7bULL,
+ 0x0040f3cf5a28414aULL, 0x00d68dd0d95283d6ULL,
+ 0x004adce9da90146eULL, 0x00befa41c7d4f908ULL,
+ 0x007603bc2e3c3060ULL, 0x00bdf360ab3545dbULL) },
+ { FIELD_LITERAL(0x00eebfd4e2312cc3ULL, 0x00474b2564e4fc8cULL,
+ 0x003303ef14b1da9bULL, 0x003c93e0e66beb1dULL,
+ 0x0013619b0566925aULL, 0x008817c24d901bf3ULL,
+ 0x00b62bd8898d218bULL, 0x0075a7716f1e88a2ULL) },
+ { FIELD_LITERAL(0x0009218da1e6890fULL, 0x0026907f5fd02575ULL,
+ 0x004dabed5f19d605ULL, 0x003abf181870249dULL,
+ 0x00b52fd048cc92c4ULL, 0x00b6dd51e415a5c5ULL,
+ 0x00d9eb82bd2b4014ULL, 0x002c865a43b46b43ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x0070047189452f4cULL, 0x00f7ad12e1ce78d5ULL,
+ 0x00af1ba51ec44a8bULL, 0x005f39f63e667cd6ULL,
+ 0x00058eac4648425eULL, 0x00d7fdab42bea03bULL,
+ 0x0028576a5688de15ULL, 0x00af973209e77c10ULL) },
+ { FIELD_LITERAL(0x00c338b915d8fef0ULL, 0x00a893292045c39aULL,
+ 0x0028ab4f2eba6887ULL, 0x0060743cb519fd61ULL,
+ 0x0006213964093ac0ULL, 0x007c0b7a43f6266dULL,
+ 0x008e3557c4fa5bdaULL, 0x002da976de7b8d9dULL) },
+ { FIELD_LITERAL(0x0048729f8a8b6dcdULL, 0x00fe23b85cc4d323ULL,
+ 0x00e7384d16e4db0eULL, 0x004a423970678942ULL,
+ 0x00ec0b763345d4baULL, 0x00c477b9f99ed721ULL,
+ 0x00c29dad3777b230ULL, 0x001c517b466f7df6ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x006366c380f7b574ULL, 0x001c7d1f09ff0438ULL,
+ 0x003e20a7301f5b22ULL, 0x00d3efb1916d28f6ULL,
+ 0x0049f4f81060ce83ULL, 0x00c69d91ea43ced1ULL,
+ 0x002b6f3e5cd269edULL, 0x005b0fb22ce9ec65ULL) },
+ { FIELD_LITERAL(0x00aa2261022d883fULL, 0x00ebcca4548010acULL,
+ 0x002528512e28a437ULL, 0x0070ca7676b66082ULL,
+ 0x0084bda170f7c6d3ULL, 0x00581b4747c9b8bbULL,
+ 0x005c96a01061c7e2ULL, 0x00fb7c4a362b5273ULL) },
+ { FIELD_LITERAL(0x00c30020eb512d02ULL, 0x0060f288283a4d26ULL,
+ 0x00b7ed13becde260ULL, 0x0075ebb74220f6e9ULL,
+ 0x00701079fcfe8a1fULL, 0x001c28fcdff58938ULL,
+ 0x002e4544b8f4df6bULL, 0x0060c5bc4f1a7d73ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00ae307cf069f701ULL, 0x005859f222dd618bULL,
+ 0x00212d6c46ec0b0dULL, 0x00a0fe4642afb62dULL,
+ 0x00420d8e4a0a8903ULL, 0x00a80ff639bdf7b0ULL,
+ 0x0019bee1490b5d8eULL, 0x007439e4b9c27a86ULL) },
+ { FIELD_LITERAL(0x00a94700032a093fULL, 0x0076e96c225216e7ULL,
+ 0x00a63a4316e45f91ULL, 0x007d8bbb4645d3b2ULL,
+ 0x00340a6ff22793ebULL, 0x006f935d4572aeb7ULL,
+ 0x00b1fb69f00afa28ULL, 0x009e8f3423161ed3ULL) },
+ { FIELD_LITERAL(0x009ef49c6b5ced17ULL, 0x00a555e6269e9f0aULL,
+ 0x007e6f1d79ec73b5ULL, 0x009ac78695a32ac4ULL,
+ 0x0001d77fbbcd5682ULL, 0x008cea1fee0aaeedULL,
+ 0x00f42bea82a53462ULL, 0x002e46ab96cafcc9ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x0051cfcc5885377aULL, 0x00dce566cb1803caULL,
+ 0x00430c7643f2c7d4ULL, 0x00dce1a1337bdcc0ULL,
+ 0x0010d5bd7283c128ULL, 0x003b1b547f9b46feULL,
+ 0x000f245e37e770abULL, 0x007b72511f022b37ULL) },
+ { FIELD_LITERAL(0x0060db815bc4786cULL, 0x006fab25beedc434ULL,
+ 0x00c610d06084797cULL, 0x000c48f08537bec0ULL,
+ 0x0031aba51c5b93daULL, 0x007968fa6e01f347ULL,
+ 0x0030070da52840c6ULL, 0x00c043c225a4837fULL) },
+ { FIELD_LITERAL(0x001bcfd00649ee93ULL, 0x006dceb47e2a0fd5ULL,
+ 0x00f2cebda0cf8fd0ULL, 0x00b6b9d9d1fbdec3ULL,
+ 0x00815262e6490611ULL, 0x00ef7f5ce3176760ULL,
+ 0x00e49cd0c998d58bULL, 0x005fc6cc269ba57cULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x008940211aa0d633ULL, 0x00addae28136571dULL,
+ 0x00d68fdbba20d673ULL, 0x003bc6129bc9e21aULL,
+ 0x000346cf184ebe9aULL, 0x0068774d741ebc7fULL,
+ 0x0019d5e9e6966557ULL, 0x0003cbd7f981b651ULL) },
+ { FIELD_LITERAL(0x004a2902926f8d3fULL, 0x00ad79b42637ab75ULL,
+ 0x0088f60b90f2d4e8ULL, 0x0030f54ef0e398c4ULL,
+ 0x00021dc9bf99681eULL, 0x007ebf66fde74ee3ULL,
+ 0x004ade654386e9a4ULL, 0x00e7485066be4c27ULL) },
+ { FIELD_LITERAL(0x00445f1263983be0ULL, 0x004cf371dda45e6aULL,
+ 0x00744a89d5a310e7ULL, 0x001f20ce4f904833ULL,
+ 0x00e746edebe66e29ULL, 0x000912ab1f6c153dULL,
+ 0x00f61d77d9b2444cULL, 0x0001499cd6647610ULL) },
+ } } }
};
const struct curve448_precomputed_s *ossl_curve448_precomputed_base
= &curve448_precomputed_base_table;
static const niels_t curve448_wnaf_base_table[32] = {
- {{
- {FIELD_LITERAL(0x00303cda6feea532ULL, 0x00860f1d5a3850e4ULL,
- 0x00226b9fa4728ccdULL, 0x00e822938a0a0c0cULL,
- 0x00263a61c9ea9216ULL, 0x001204029321b828ULL,
- 0x006a468360983c65ULL, 0x0002846f0a782143ULL)},
- {FIELD_LITERAL(0x00303cda6feea532ULL, 0x00860f1d5a3850e4ULL,
- 0x00226b9fa4728ccdULL, 0x006822938a0a0c0cULL,
- 0x00263a61c9ea9215ULL, 0x001204029321b828ULL,
- 0x006a468360983c65ULL, 0x0082846f0a782143ULL)},
- {FIELD_LITERAL(0x00ef8e22b275198dULL, 0x00b0eb141a0b0e8bULL,
- 0x001f6789da3cb38cULL, 0x006d2ff8ed39073eULL,
- 0x00610bdb69a167f3ULL, 0x00571f306c9689b4ULL,
- 0x00f557e6f84b2df8ULL, 0x002affd38b2c86dbULL)},
- }}, {{
- {FIELD_LITERAL(0x00cea0fc8d2e88b5ULL, 0x00821612d69f1862ULL,
- 0x0074c283b3e67522ULL, 0x005a195ba05a876dULL,
- 0x000cddfe557feea4ULL, 0x008046c795bcc5e5ULL,
- 0x00540969f4d6e119ULL, 0x00d27f96d6b143d5ULL)},
- {FIELD_LITERAL(0x000c3b1019d474e8ULL, 0x00e19533e4952284ULL,
- 0x00cc9810ba7c920aULL, 0x00f103d2785945acULL,
- 0x00bfa5696cc69b34ULL, 0x00a8d3d51e9ca839ULL,
- 0x005623cb459586b9ULL, 0x00eae7ce1cd52e9eULL)},
- {FIELD_LITERAL(0x0005a178751dd7d8ULL, 0x002cc3844c69c42fULL,
- 0x00acbfe5efe10539ULL, 0x009c20f43431a65aULL,
- 0x008435d96374a7b3ULL, 0x009ee57566877bd3ULL,
- 0x0044691725ed4757ULL, 0x001e87bb2fe2c6b2ULL)},
- }}, {{
- {FIELD_LITERAL(0x000cedc4debf7a04ULL, 0x002ffa45000470acULL,
- 0x002e9f9678201915ULL, 0x0017da1208c4fe72ULL,
- 0x007d558cc7d656cbULL, 0x0037a827287cf289ULL,
- 0x00142472d3441819ULL, 0x009c21f166cf8dd1ULL)},
- {FIELD_LITERAL(0x003ef83af164b2f2ULL, 0x000949a5a0525d0dULL,
- 0x00f4498186cac051ULL, 0x00e77ac09ef126d2ULL,
- 0x0073ae0b2c9296e9ULL, 0x001c163f6922e3edULL,
- 0x0062946159321beaULL, 0x00cfb79b22990b39ULL)},
- {FIELD_LITERAL(0x00b001431ca9e654ULL, 0x002d7e5eabcc9a3aULL,
- 0x0052e8114c2f6747ULL, 0x0079ac4f94487f92ULL,
- 0x00bffd919b5d749cULL, 0x00261f92ad15e620ULL,
- 0x00718397b7a97895ULL, 0x00c1443e6ebbc0c4ULL)},
- }}, {{
- {FIELD_LITERAL(0x00eacd90c1e0a049ULL, 0x008977935b149fbeULL,
- 0x0004cb9ba11c93dcULL, 0x009fbd5b3470844dULL,
- 0x004bc18c9bfc22cfULL, 0x0057679a991839f3ULL,
- 0x00ef15b76fb4092eULL, 0x0074a5173a225041ULL)},
- {FIELD_LITERAL(0x003f5f9d7ec4777bULL, 0x00ab2e733c919c94ULL,
- 0x001bb6c035245ae5ULL, 0x00a325a49a883630ULL,
- 0x0033e9a9ea3cea2fULL, 0x00e442a1eaa0e844ULL,
- 0x00b2116d5b0e71b8ULL, 0x00c16abed6d64047ULL)},
- {FIELD_LITERAL(0x00c560b5ed051165ULL, 0x001945adc5d65094ULL,
- 0x00e221865710f910ULL, 0x00cc12bc9e9b8cebULL,
- 0x004faa9518914e35ULL, 0x0017476d89d42f6dULL,
- 0x00b8f637c8fa1c8bULL, 0x0088c7d2790864b8ULL)},
- }}, {{
- {FIELD_LITERAL(0x00ef7eafc1c69be6ULL, 0x0085d3855778fbeaULL,
- 0x002c8d5b450cb6f5ULL, 0x004e77de5e1e7fecULL,
- 0x0047c057893abdedULL, 0x001b430b85d51e16ULL,
- 0x00965c7b45640c3cULL, 0x00487b2bb1162b97ULL)},
- {FIELD_LITERAL(0x0099c73a311beec2ULL, 0x00a3eff38d8912adULL,
- 0x002efa9d1d7e8972ULL, 0x00f717ae1e14d126ULL,
- 0x002833f795850c8bULL, 0x0066c12ad71486bdULL,
- 0x00ae9889da4820ebULL, 0x00d6044309555c08ULL)},
- {FIELD_LITERAL(0x004b1c5283d15e41ULL, 0x00669d8ea308ff75ULL,
- 0x0004390233f762a1ULL, 0x00e1d67b83cb6cecULL,
- 0x003eebaa964c78b1ULL, 0x006b0aff965eb664ULL,
- 0x00b313d4470bdc37ULL, 0x008814ffcb3cb9d8ULL)},
- }}, {{
- {FIELD_LITERAL(0x009724b8ce68db70ULL, 0x007678b5ed006f3dULL,
- 0x00bdf4b89c0abd73ULL, 0x00299748e04c7c6dULL,
- 0x00ddd86492c3c977ULL, 0x00c5a7febfa30a99ULL,
- 0x00ed84715b4b02bbULL, 0x00319568adf70486ULL)},
- {FIELD_LITERAL(0x0070ff2d864de5bbULL, 0x005a37eeb637ee95ULL,
- 0x0033741c258de160ULL, 0x00e6ca5cb1988f46ULL,
- 0x001ceabd92a24661ULL, 0x0030957bd500fe40ULL,
- 0x001c3362afe912c5ULL, 0x005187889f678bd2ULL)},
- {FIELD_LITERAL(0x0086835fc62bbdc7ULL, 0x009c3516ca4910a1ULL,
- 0x00956c71f8d00783ULL, 0x0095c78fcf63235fULL,
- 0x00fc7ff6ba05c222ULL, 0x00cdd8b3f8d74a52ULL,
- 0x00ac5ae16de8256eULL, 0x00e9d4be8ed48624ULL)},
- }}, {{
- {FIELD_LITERAL(0x00c0ce11405df2d8ULL, 0x004e3f37b293d7b6ULL,
- 0x002410172e1ac6dbULL, 0x00b8dbff4bf8143dULL,
- 0x003a7b409d56eb66ULL, 0x003e0f6a0dfef9afULL,
- 0x0081c4e4d3645be1ULL, 0x00ce76076b127623ULL)},
- {FIELD_LITERAL(0x00f6ee0f98974239ULL, 0x0042d89af07d3a4fULL,
- 0x00846b7fe84346b5ULL, 0x006a21fc6a8d39a1ULL,
- 0x00ac8bc2541ff2d9ULL, 0x006d4e2a77732732ULL,
- 0x009a39b694cc3f2fULL, 0x0085c0aa2a404c8fULL)},
- {FIELD_LITERAL(0x00b261101a218548ULL, 0x00c1cae96424277bULL,
- 0x00869da0a77dd268ULL, 0x00bc0b09f8ec83eaULL,
- 0x00d61027f8e82ba9ULL, 0x00aa4c85999dce67ULL,
- 0x00eac3132b9f3fe1ULL, 0x00fb9b0cf1c695d2ULL)},
- }}, {{
- {FIELD_LITERAL(0x0043079295512f0dULL, 0x0046a009861758e0ULL,
- 0x003ee2842a807378ULL, 0x0034cc9d1298e4faULL,
- 0x009744eb4d31b3eeULL, 0x00afacec96650cd0ULL,
- 0x00ac891b313761aeULL, 0x00e864d6d26e708aULL)},
- {FIELD_LITERAL(0x00a84d7c8a23b491ULL, 0x0088e19aa868b27fULL,
- 0x0005986d43e78ce9ULL, 0x00f28012f0606d28ULL,
- 0x0017ded7e10249b3ULL, 0x005ed4084b23af9bULL,
- 0x00b9b0a940564472ULL, 0x00ad9056cceeb1f4ULL)},
- {FIELD_LITERAL(0x00db91b357fe755eULL, 0x00a1aa544b15359cULL,
- 0x00af4931a0195574ULL, 0x007686124fe11aefULL,
- 0x00d1ead3c7b9ef7eULL, 0x00aaf5fc580f8c15ULL,
- 0x00e727be147ee1ecULL, 0x003c61c1e1577b86ULL)},
- }}, {{
- {FIELD_LITERAL(0x009d3fca983220cfULL, 0x00cd11acbc853dc4ULL,
- 0x0017590409d27f1dULL, 0x00d2176698082802ULL,
- 0x00fa01251b2838c8ULL, 0x00dd297a0d9b51c6ULL,
- 0x00d76c92c045820aULL, 0x00534bc7c46c9033ULL)},
- {FIELD_LITERAL(0x0080ed9bc9b07338ULL, 0x00fceac7745d2652ULL,
- 0x008a9d55f5f2cc69ULL, 0x0096ce72df301ac5ULL,
- 0x00f53232e7974d87ULL, 0x0071728c7ae73947ULL,
- 0x0090507602570778ULL, 0x00cb81cfd883b1b2ULL)},
- {FIELD_LITERAL(0x005011aadea373daULL, 0x003a8578ec896034ULL,
- 0x00f20a6535fa6d71ULL, 0x005152d31e5a87cfULL,
- 0x002bac1c8e68ca31ULL, 0x00b0e323db4c1381ULL,
- 0x00f1d596b7d5ae25ULL, 0x00eae458097cb4e0ULL)},
- }}, {{
- {FIELD_LITERAL(0x00920ac80f9b0d21ULL, 0x00f80f7f73401246ULL,
- 0x0086d37849b557d6ULL, 0x0002bd4b317b752eULL,
- 0x00b26463993a42bbULL, 0x002070422a73b129ULL,
- 0x00341acaa0380cb3ULL, 0x00541914dd66a1b2ULL)},
- {FIELD_LITERAL(0x00c1513cd66abe8cULL, 0x000139e01118944dULL,
- 0x0064abbcb8080bbbULL, 0x00b3b08202473142ULL,
- 0x00c629ef25da2403ULL, 0x00f0aec3310d9b7fULL,
- 0x0050b2227472d8cdULL, 0x00f6c8a922d41fb4ULL)},
- {FIELD_LITERAL(0x001075ccf26b7b1fULL, 0x00bb6bb213170433ULL,
- 0x00e9491ad262da79ULL, 0x009ef4f48d2d384cULL,
- 0x008992770766f09dULL, 0x001584396b6b1101ULL,
- 0x00af3f8676c9feefULL, 0x0024603c40269118ULL)},
- }}, {{
- {FIELD_LITERAL(0x009dd7b31319527cULL, 0x001e7ac948d873a9ULL,
- 0x00fa54b46ef9673aULL, 0x0066efb8d5b02fe6ULL,
- 0x00754b1d3928aeaeULL, 0x0004262ac72a6f6bULL,
- 0x0079b7d49a6eb026ULL, 0x003126a753540102ULL)},
- {FIELD_LITERAL(0x009666e24f693947ULL, 0x00f714311269d45fULL,
- 0x0010ffac1d0c851cULL, 0x0066e80c37363497ULL,
- 0x00f1f4ad010c60b0ULL, 0x0015c87408470ff7ULL,
- 0x00651d5e9c7766a4ULL, 0x008138819d7116deULL)},
- {FIELD_LITERAL(0x003934b11c57253bULL, 0x00ef308edf21f46eULL,
- 0x00e54e99c7a16198ULL, 0x0080d57135764e63ULL,
- 0x00751c27b946bc24ULL, 0x00dd389ce4e9e129ULL,
- 0x00a1a2bfd1cd84dcULL, 0x002fae73e5149b32ULL)},
- }}, {{
- {FIELD_LITERAL(0x00911657dffb4cddULL, 0x00c100b7cc553d06ULL,
- 0x00449d075ec467ccULL, 0x007062100bc64e70ULL,
- 0x0043cf86f7bd21e7ULL, 0x00f401dc4b797deaULL,
- 0x005224afb2f62e65ULL, 0x00d1ede3fb5a42beULL)},
- {FIELD_LITERAL(0x00f2ba36a41aa144ULL, 0x00a0c22d946ee18fULL,
- 0x008aae8ef9a14f99ULL, 0x00eef4d79b19bb36ULL,
- 0x008e75ce3d27b1fcULL, 0x00a65daa03b29a27ULL,
- 0x00d9cc83684eb145ULL, 0x009e1ed80cc2ed74ULL)},
- {FIELD_LITERAL(0x00bed953d1997988ULL, 0x00b93ed175a24128ULL,
- 0x00871c5963fb6365ULL, 0x00ca2df20014a787ULL,
- 0x00f5d9c1d0b34322ULL, 0x00f6f5942818db0aULL,
- 0x004cc091f49c9906ULL, 0x00e8a188a60bff9fULL)},
- }}, {{
- {FIELD_LITERAL(0x0032c7762032fae8ULL, 0x00e4087232e0bc21ULL,
- 0x00f767344b6e8d85ULL, 0x00bbf369b76c2aa2ULL,
- 0x008a1f46c6e1570cULL, 0x001368cd9780369fULL,
- 0x007359a39d079430ULL, 0x0003646512921434ULL)},
- {FIELD_LITERAL(0x007c4b47ca7c73e7ULL, 0x005396221039734bULL,
- 0x008b64ddf0e45d7eULL, 0x00bfad5af285e6c2ULL,
- 0x008ec711c5b1a1a8ULL, 0x00cf663301237f98ULL,
- 0x00917ee3f1655126ULL, 0x004152f337efedd8ULL)},
- {FIELD_LITERAL(0x0007c7edc9305daaULL, 0x000a6664f273701cULL,
- 0x00f6e78795e200b1ULL, 0x005d05b9ecd2473eULL,
- 0x0014f5f17c865786ULL, 0x00c7fd2d166fa995ULL,
- 0x004939a2d8eb80e0ULL, 0x002244ba0942c199ULL)},
- }}, {{
- {FIELD_LITERAL(0x00321e767f0262cfULL, 0x002e57d776caf68eULL,
- 0x00bf2c94814f0437ULL, 0x00c339196acd622fULL,
- 0x001db4cce71e2770ULL, 0x001ded5ddba6eee2ULL,
- 0x0078608ab1554c8dULL, 0x00067fe0ab76365bULL)},
- {FIELD_LITERAL(0x00f09758e11e3985ULL, 0x00169efdbd64fad3ULL,
- 0x00e8889b7d6dacd6ULL, 0x0035cdd58ea88209ULL,
- 0x00bcda47586d7f49ULL, 0x003cdddcb2879088ULL,
- 0x0016da70187e954bULL, 0x009556ea2e92aacdULL)},
- {FIELD_LITERAL(0x008cab16bd1ff897ULL, 0x00b389972cdf753fULL,
- 0x00ea8ed1e46dfdc0ULL, 0x004fe7ef94c589f4ULL,
- 0x002b8ae9b805ecf3ULL, 0x0025c08d892874a5ULL,
- 0x0023938e98d44c4cULL, 0x00f759134cabf69cULL)},
- }}, {{
- {FIELD_LITERAL(0x006c2a84678e4b3bULL, 0x007a194aacd1868fULL,
- 0x00ed0225af424761ULL, 0x00da0a6f293c64b8ULL,
- 0x001062ac5c6a7a18ULL, 0x0030f5775a8aeef4ULL,
- 0x0002acaad76b7af0ULL, 0x00410b8fd63a579fULL)},
- {FIELD_LITERAL(0x001ec59db3d9590eULL, 0x001e9e3f1c3f182dULL,
- 0x0045a9c3ec2cab14ULL, 0x0008198572aeb673ULL,
- 0x00773b74068bd167ULL, 0x0012535eaa395434ULL,
- 0x0044dba9e3bbb74aULL, 0x002fba4d3c74bd0eULL)},
- {FIELD_LITERAL(0x0042bf08fe66922cULL, 0x003318b8fbb49e8cULL,
- 0x00d75946004aa14cULL, 0x00f601586b42bf1cULL,
- 0x00c74cf1d912fe66ULL, 0x00abcb36974b30adULL,
- 0x007eb78720c9d2b8ULL, 0x009f54ab7bd4df85ULL)},
- }}, {{
- {FIELD_LITERAL(0x00db9fc948f73826ULL, 0x00fa8b3746ed8ee9ULL,
- 0x00132cb65aafbeb2ULL, 0x00c36ff3fe7925b8ULL,
- 0x00837daed353d2feULL, 0x00ec661be0667cf4ULL,
- 0x005beb8ed2e90204ULL, 0x00d77dd69e564967ULL)},
- {FIELD_LITERAL(0x0042e6268b861751ULL, 0x0008dd0469500c16ULL,
- 0x00b51b57c338a3fdULL, 0x00cc4497d85cff6bULL,
- 0x002f13d6b57c34a4ULL, 0x0083652eaf301105ULL,
- 0x00cc344294cc93a8ULL, 0x0060f4d02810e270ULL)},
- {FIELD_LITERAL(0x00a8954363cd518bULL, 0x00ad171124bccb7bULL,
- 0x0065f46a4adaae00ULL, 0x001b1a5b2a96e500ULL,
- 0x0043fe24f8233285ULL, 0x0066996d8ae1f2c3ULL,
- 0x00c530f3264169f9ULL, 0x00c0f92d07cf6a57ULL)},
- }}, {{
- {FIELD_LITERAL(0x0036a55c6815d943ULL, 0x008c8d1def993db3ULL,
- 0x002e0e1e8ff7318fULL, 0x00d883a4b92db00aULL,
- 0x002f5e781ae33906ULL, 0x001a72adb235c06dULL,
- 0x00f2e59e736e9caaULL, 0x001a4b58e3031914ULL)},
- {FIELD_LITERAL(0x00d73bfae5e00844ULL, 0x00bf459766fb5f52ULL,
- 0x0061b4f5a5313cdeULL, 0x004392d4c3b95514ULL,
- 0x000d3551b1077523ULL, 0x0000998840ee5d71ULL,
- 0x006de6e340448b7bULL, 0x00251aa504875d6eULL)},
- {FIELD_LITERAL(0x003bf343427ac342ULL, 0x00adc0a78642b8c5ULL,
- 0x0003b893175a8314ULL, 0x0061a34ade5703bcULL,
- 0x00ea3ea8bb71d632ULL, 0x00be0df9a1f198c2ULL,
- 0x0046dd8e7c1635fbULL, 0x00f1523fdd25d5e5ULL)},
- }}, {{
- {FIELD_LITERAL(0x00633f63fc9dd406ULL, 0x00e713ff80e04a43ULL,
- 0x0060c6e970f2d621ULL, 0x00a57cd7f0df1891ULL,
- 0x00f2406a550650bbULL, 0x00b064290efdc684ULL,
- 0x001eab0144d17916ULL, 0x00cd15f863c293abULL)},
- {FIELD_LITERAL(0x0029cec55273f70dULL, 0x007044ee275c6340ULL,
- 0x0040f637a93015e2ULL, 0x00338bb78db5aae9ULL,
- 0x001491b2a6132147ULL, 0x00a125d6cfe6bde3ULL,
- 0x005f7ac561ba8669ULL, 0x001d5eaea3fbaacfULL)},
- {FIELD_LITERAL(0x00054e9635e3be31ULL, 0x000e43f31e2872beULL,
- 0x00d05b1c9e339841ULL, 0x006fac50bd81fd98ULL,
- 0x00cdc7852eaebb09ULL, 0x004ff519b061991bULL,
- 0x009099e8107d4c85ULL, 0x00273e24c36a4a61ULL)},
- }}, {{
- {FIELD_LITERAL(0x00070b4441ef2c46ULL, 0x00efa5b02801a109ULL,
- 0x00bf0b8c3ee64adfULL, 0x008a67e0b3452e98ULL,
- 0x001916b1f2fa7a74ULL, 0x00d781a78ff6cdc3ULL,
- 0x008682ce57e5c919ULL, 0x00cc1109dd210da3ULL)},
- {FIELD_LITERAL(0x00cae8aaff388663ULL, 0x005e983a35dda1c7ULL,
- 0x007ab1030d8e37f4ULL, 0x00e48940f5d032feULL,
- 0x006a36f9ef30b331ULL, 0x009be6f03958c757ULL,
- 0x0086231ceba91400ULL, 0x008bd0f7b823e7aaULL)},
- {FIELD_LITERAL(0x00cf881ebef5a45aULL, 0x004ebea78e7c6f2cULL,
- 0x0090da9209cf26a0ULL, 0x00de2b2e4c775b84ULL,
- 0x0071d6031c3c15aeULL, 0x00d9e927ef177d70ULL,
- 0x00894ee8c23896fdULL, 0x00e3b3b401e41aadULL)},
- }}, {{
- {FIELD_LITERAL(0x00204fef26864170ULL, 0x00819269c5dee0f8ULL,
- 0x00bfb4713ec97966ULL, 0x0026339a6f34df78ULL,
- 0x001f26e64c761dc2ULL, 0x00effe3af313cb60ULL,
- 0x00e17b70138f601bULL, 0x00f16e1ccd9ede5eULL)},
- {FIELD_LITERAL(0x005d9a8353fdb2dbULL, 0x0055cc2048c698f0ULL,
- 0x00f6c4ac89657218ULL, 0x00525034d73faeb2ULL,
- 0x00435776fbda3c7dULL, 0x0070ea5312323cbcULL,
- 0x007a105d44d069fbULL, 0x006dbc8d6dc786aaULL)},
- {FIELD_LITERAL(0x0017cff19cd394ecULL, 0x00fef7b810922587ULL,
- 0x00e6483970dff548ULL, 0x00ddf36ad6874264ULL,
- 0x00e61778523fcce2ULL, 0x0093a66c0c93b24aULL,
- 0x00fd367114db7f86ULL, 0x007652d7ddce26ddULL)},
- }}, {{
- {FIELD_LITERAL(0x00d92ced7ba12843ULL, 0x00aea9c7771e86e7ULL,
- 0x0046639693354f7bULL, 0x00a628dbb6a80c47ULL,
- 0x003a0b0507372953ULL, 0x00421113ab45c0d9ULL,
- 0x00e545f08362ab7aULL, 0x0028ce087b4d6d96ULL)},
- {FIELD_LITERAL(0x00a67ee7cf9f99ebULL, 0x005713b275f2ff68ULL,
- 0x00f1d536a841513dULL, 0x00823b59b024712eULL,
- 0x009c46b9d0d38cecULL, 0x00cdb1595aa2d7d4ULL,
- 0x008375b3423d9af8ULL, 0x000ab0b516d978f7ULL)},
- {FIELD_LITERAL(0x00428dcb3c510b0fULL, 0x00585607ea24bb4eULL,
- 0x003736bf1603687aULL, 0x00c47e568c4fe3c7ULL,
- 0x003cd00282848605ULL, 0x0043a487c3b91939ULL,
- 0x004ffc04e1095a06ULL, 0x00a4c989a3d4b918ULL)},
- }}, {{
- {FIELD_LITERAL(0x00a8778d0e429f7aULL, 0x004c02b059105a68ULL,
- 0x0016653b609da3ffULL, 0x00d5107bd1a12d27ULL,
- 0x00b4708f9a771cabULL, 0x00bb63b662033f69ULL,
- 0x0072f322240e7215ULL, 0x0019445b59c69222ULL)},
- {FIELD_LITERAL(0x00cf4f6069a658e6ULL, 0x0053ca52859436a6ULL,
- 0x0064b994d7e3e117ULL, 0x00cb469b9a07f534ULL,
- 0x00cfb68f399e9d47ULL, 0x00f0dcb8dac1c6e7ULL,
- 0x00f2ab67f538b3a5ULL, 0x0055544f178ab975ULL)},
- {FIELD_LITERAL(0x0099b7a2685d538cULL, 0x00e2f1897b7c0018ULL,
- 0x003adac8ce48dae3ULL, 0x00089276d5c50c0cULL,
- 0x00172fca07ad6717ULL, 0x00cb1a72f54069e5ULL,
- 0x004ee42f133545b3ULL, 0x00785f8651362f16ULL)},
- }}, {{
- {FIELD_LITERAL(0x0049cbac38509e11ULL, 0x0015234505d42cdfULL,
- 0x00794fb0b5840f1cULL, 0x00496437344045a5ULL,
- 0x0031b6d944e4f9b0ULL, 0x00b207318ac1f5d8ULL,
- 0x0000c840da7f5c5dULL, 0x00526f373a5c8814ULL)},
- {FIELD_LITERAL(0x002c7b7742d1dfd9ULL, 0x002cabeb18623c01ULL,
- 0x00055f5e3e044446ULL, 0x006c20f3b4ef54baULL,
- 0x00c600141ec6b35fULL, 0x00354f437f1a32a3ULL,
- 0x00bac4624a3520f9ULL, 0x00c483f734a90691ULL)},
- {FIELD_LITERAL(0x0053a737d422918dULL, 0x00f7fca1d8758625ULL,
- 0x00c360336dadb04cULL, 0x00f38e3d9158a1b8ULL,
- 0x0069ce3b418e84c6ULL, 0x005d1697eca16eadULL,
- 0x00f8bd6a35ece13dULL, 0x007885dfc2b5afeaULL)},
- }}, {{
- {FIELD_LITERAL(0x00c3617ae260776cULL, 0x00b20dc3e96922d7ULL,
- 0x00a1a7802246706aULL, 0x00ca6505a5240244ULL,
- 0x002246b62d919782ULL, 0x001439102d7aa9b3ULL,
- 0x00e8af1139e6422cULL, 0x00c888d1b52f2b05ULL)},
- {FIELD_LITERAL(0x005b67690ffd41d9ULL, 0x005294f28df516f9ULL,
- 0x00a879272412fcb9ULL, 0x00098b629a6d1c8dULL,
- 0x00fabd3c8050865aULL, 0x00cd7e5b0a3879c5ULL,
- 0x00153238210f3423ULL, 0x00357cac101e9f42ULL)},
- {FIELD_LITERAL(0x008917b454444fb7ULL, 0x00f59247c97e441bULL,
- 0x00a6200a6815152dULL, 0x0009a4228601d254ULL,
- 0x001c0360559bd374ULL, 0x007563362039cb36ULL,
- 0x00bd75b48d74e32bULL, 0x0017f515ac3499e8ULL)},
- }}, {{
- {FIELD_LITERAL(0x001532a7ffe41c5aULL, 0x00eb1edce358d6bfULL,
- 0x00ddbacc7b678a7bULL, 0x008a7b70f3c841a3ULL,
- 0x00f1923bf27d3f4cULL, 0x000b2713ed8f7873ULL,
- 0x00aaf67e29047902ULL, 0x0044994a70b3976dULL)},
- {FIELD_LITERAL(0x00d54e802082d42cULL, 0x00a55aa0dce7cc6cULL,
- 0x006477b96073f146ULL, 0x0082efe4ceb43594ULL,
- 0x00a922bcba026845ULL, 0x0077f19d1ab75182ULL,
- 0x00c2bb2737846e59ULL, 0x0004d7eec791dd33ULL)},
- {FIELD_LITERAL(0x0044588d1a81d680ULL, 0x00b0a9097208e4f8ULL,
- 0x00212605350dc57eULL, 0x0028717cd2871123ULL,
- 0x00fb083c100fd979ULL, 0x0045a056ce063fdfULL,
- 0x00a5d604b4dd6a41ULL, 0x001dabc08ba4e236ULL)},
- }}, {{
- {FIELD_LITERAL(0x00c4887198d7a7faULL, 0x00244f98fb45784aULL,
- 0x0045911e15a15d01ULL, 0x001d323d374c0966ULL,
- 0x00967c3915196562ULL, 0x0039373abd2f3c67ULL,
- 0x000d2c5614312423ULL, 0x0041cf2215442ce3ULL)},
- {FIELD_LITERAL(0x008ede889ada7f06ULL, 0x001611e91de2e135ULL,
- 0x00fdb9a458a471b9ULL, 0x00563484e03710d1ULL,
- 0x0031cc81925e3070ULL, 0x0062c97b3af80005ULL,
- 0x00fa733eea28edebULL, 0x00e82457e1ebbc88ULL)},
- {FIELD_LITERAL(0x006a0df5fe9b6f59ULL, 0x00a0d4ff46040d92ULL,
- 0x004a7cedb6f93250ULL, 0x00d1df8855b8c357ULL,
- 0x00e73a46086fd058ULL, 0x0048fb0add6dfe59ULL,
- 0x001e03a28f1b4e3dULL, 0x00a871c993308d76ULL)},
- }}, {{
- {FIELD_LITERAL(0x0030dbb2d1766ec8ULL, 0x00586c0ad138555eULL,
- 0x00d1a34f9e91c77cULL, 0x0063408ad0e89014ULL,
- 0x00d61231b05f6f5bULL, 0x0009abf569f5fd8aULL,
- 0x00aec67a110f1c43ULL, 0x0031d1a790938dd7ULL)},
- {FIELD_LITERAL(0x006cded841e2a862ULL, 0x00198d60af0ab6fbULL,
- 0x0018f09db809e750ULL, 0x004e6ac676016263ULL,
- 0x00eafcd1620969cbULL, 0x002c9784ca34917dULL,
- 0x0054f00079796de7ULL, 0x00d9fab5c5972204ULL)},
- {FIELD_LITERAL(0x004bd0fee2438a83ULL, 0x00b571e62b0f83bdULL,
- 0x0059287d7ce74800ULL, 0x00fb3631b645c3f0ULL,
- 0x00a018e977f78494ULL, 0x0091e27065c27b12ULL,
- 0x007696c1817165e0ULL, 0x008c40be7c45ba3aULL)},
- }}, {{
- {FIELD_LITERAL(0x00a0f326327cb684ULL, 0x001c7d0f672680ffULL,
- 0x008c1c81ffb112d1ULL, 0x00f8f801674eddc8ULL,
- 0x00e926d5d48c2a9dULL, 0x005bd6d954c6fe9aULL,
- 0x004c6b24b4e33703ULL, 0x00d05eb5c09105ccULL)},
- {FIELD_LITERAL(0x00d61731caacf2cfULL, 0x002df0c7609e01c5ULL,
- 0x00306172208b1e2bULL, 0x00b413fe4fb2b686ULL,
- 0x00826d360902a221ULL, 0x003f8d056e67e7f7ULL,
- 0x0065025b0175e989ULL, 0x00369add117865ebULL)},
- {FIELD_LITERAL(0x00aaf895aec2fa11ULL, 0x000f892bc313eb52ULL,
- 0x005b1c794dad050bULL, 0x003f8ec4864cec14ULL,
- 0x00af81058d0b90e5ULL, 0x00ebe43e183997bbULL,
- 0x00a9d610f9f3e615ULL, 0x007acd8eec2e88d3ULL)},
- }}, {{
- {FIELD_LITERAL(0x0049b2fab13812a3ULL, 0x00846db32cd60431ULL,
- 0x000177fa578c8d6cULL, 0x00047d0e2ad4bc51ULL,
- 0x00b158ba38d1e588ULL, 0x006a45daad79e3f3ULL,
- 0x000997b93cab887bULL, 0x00c47ea42fa23dc3ULL)},
- {FIELD_LITERAL(0x0012b6fef7aeb1caULL, 0x009412768194b6a7ULL,
- 0x00ff0d351f23ab93ULL, 0x007e8a14c1aff71bULL,
- 0x006c1c0170c512bcULL, 0x0016243ea02ab2e5ULL,
- 0x007bb6865b303f3eULL, 0x0015ce6b29b159f4ULL)},
- {FIELD_LITERAL(0x009961cd02e68108ULL, 0x00e2035d3a1d0836ULL,
- 0x005d51f69b5e1a1dULL, 0x004bccb4ea36edcdULL,
- 0x0069be6a7aeef268ULL, 0x0063f4dd9de8d5a7ULL,
- 0x006283783092ca35ULL, 0x0075a31af2c35409ULL)},
- }}, {{
- {FIELD_LITERAL(0x00c412365162e8cfULL, 0x00012283fb34388aULL,
- 0x003e6543babf39e2ULL, 0x00eead6b3a804978ULL,
- 0x0099c0314e8b326fULL, 0x00e98e0a8d477a4fULL,
- 0x00d2eb96b127a687ULL, 0x00ed8d7df87571bbULL)},
- {FIELD_LITERAL(0x00777463e308cacfULL, 0x00c8acb93950132dULL,
- 0x00ebddbf4ca48b2cULL, 0x0026ad7ca0795a0aULL,
- 0x00f99a3d9a715064ULL, 0x000d60bcf9d4dfccULL,
- 0x005e65a73a437a06ULL, 0x0019d536a8db56c8ULL)},
- {FIELD_LITERAL(0x00192d7dd558d135ULL, 0x0027cd6a8323ffa7ULL,
- 0x00239f1a412dc1e7ULL, 0x0046b4b3be74fc5cULL,
- 0x0020c47a2bef5bceULL, 0x00aa17e48f43862bULL,
- 0x00f7e26c96342e5fULL, 0x0008011c530f39a9ULL)},
- }}, {{
- {FIELD_LITERAL(0x00aad4ac569bf0f1ULL, 0x00a67adc90b27740ULL,
- 0x0048551369a5751aULL, 0x0031252584a3306aULL,
- 0x0084e15df770e6fcULL, 0x00d7bba1c74b5805ULL,
- 0x00a80ef223af1012ULL, 0x0089c85ceb843a34ULL)},
- {FIELD_LITERAL(0x00c4545be4a54004ULL, 0x0099e11f60357e6cULL,
- 0x001f3936d19515a6ULL, 0x007793df84341a6eULL,
- 0x0051061886717ffaULL, 0x00e9b0a660b28f85ULL,
- 0x0044ea685892de0dULL, 0x000257d2a1fda9d9ULL)},
- {FIELD_LITERAL(0x007e8b01b24ac8a8ULL, 0x006cf3b0b5ca1337ULL,
- 0x00f1607d3e36a570ULL, 0x0039b7fab82991a1ULL,
- 0x00231777065840c5ULL, 0x00998e5afdd346f9ULL,
- 0x00b7dc3e64acc85fULL, 0x00baacc748013ad6ULL)},
- }}, {{
- {FIELD_LITERAL(0x008ea6a4177580bfULL, 0x005fa1953e3f0378ULL,
- 0x005fe409ac74d614ULL, 0x00452327f477e047ULL,
- 0x00a4018507fb6073ULL, 0x007b6e71951caac8ULL,
- 0x0012b42ab8a6ce91ULL, 0x0080eca677294ab7ULL)},
- {FIELD_LITERAL(0x00a53edc023ba69bULL, 0x00c6afa83ddde2e8ULL,
- 0x00c3f638b307b14eULL, 0x004a357a64414062ULL,
- 0x00e4d94d8b582dc9ULL, 0x001739caf71695b7ULL,
- 0x0012431b2ae28de1ULL, 0x003b6bc98682907cULL)},
- {FIELD_LITERAL(0x008a9a93be1f99d6ULL, 0x0079fa627cc699c8ULL,
- 0x00b0cfb134ba84c8ULL, 0x001c4b778249419aULL,
- 0x00df4ab3d9c44f40ULL, 0x009f596e6c1a9e3cULL,
- 0x001979c0df237316ULL, 0x00501e953a919b87ULL)},
- }}
+ { {
+ { FIELD_LITERAL(0x00303cda6feea532ULL, 0x00860f1d5a3850e4ULL,
+ 0x00226b9fa4728ccdULL, 0x00e822938a0a0c0cULL,
+ 0x00263a61c9ea9216ULL, 0x001204029321b828ULL,
+ 0x006a468360983c65ULL, 0x0002846f0a782143ULL) },
+ { FIELD_LITERAL(0x00303cda6feea532ULL, 0x00860f1d5a3850e4ULL,
+ 0x00226b9fa4728ccdULL, 0x006822938a0a0c0cULL,
+ 0x00263a61c9ea9215ULL, 0x001204029321b828ULL,
+ 0x006a468360983c65ULL, 0x0082846f0a782143ULL) },
+ { FIELD_LITERAL(0x00ef8e22b275198dULL, 0x00b0eb141a0b0e8bULL,
+ 0x001f6789da3cb38cULL, 0x006d2ff8ed39073eULL,
+ 0x00610bdb69a167f3ULL, 0x00571f306c9689b4ULL,
+ 0x00f557e6f84b2df8ULL, 0x002affd38b2c86dbULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00cea0fc8d2e88b5ULL, 0x00821612d69f1862ULL,
+ 0x0074c283b3e67522ULL, 0x005a195ba05a876dULL,
+ 0x000cddfe557feea4ULL, 0x008046c795bcc5e5ULL,
+ 0x00540969f4d6e119ULL, 0x00d27f96d6b143d5ULL) },
+ { FIELD_LITERAL(0x000c3b1019d474e8ULL, 0x00e19533e4952284ULL,
+ 0x00cc9810ba7c920aULL, 0x00f103d2785945acULL,
+ 0x00bfa5696cc69b34ULL, 0x00a8d3d51e9ca839ULL,
+ 0x005623cb459586b9ULL, 0x00eae7ce1cd52e9eULL) },
+ { FIELD_LITERAL(0x0005a178751dd7d8ULL, 0x002cc3844c69c42fULL,
+ 0x00acbfe5efe10539ULL, 0x009c20f43431a65aULL,
+ 0x008435d96374a7b3ULL, 0x009ee57566877bd3ULL,
+ 0x0044691725ed4757ULL, 0x001e87bb2fe2c6b2ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x000cedc4debf7a04ULL, 0x002ffa45000470acULL,
+ 0x002e9f9678201915ULL, 0x0017da1208c4fe72ULL,
+ 0x007d558cc7d656cbULL, 0x0037a827287cf289ULL,
+ 0x00142472d3441819ULL, 0x009c21f166cf8dd1ULL) },
+ { FIELD_LITERAL(0x003ef83af164b2f2ULL, 0x000949a5a0525d0dULL,
+ 0x00f4498186cac051ULL, 0x00e77ac09ef126d2ULL,
+ 0x0073ae0b2c9296e9ULL, 0x001c163f6922e3edULL,
+ 0x0062946159321beaULL, 0x00cfb79b22990b39ULL) },
+ { FIELD_LITERAL(0x00b001431ca9e654ULL, 0x002d7e5eabcc9a3aULL,
+ 0x0052e8114c2f6747ULL, 0x0079ac4f94487f92ULL,
+ 0x00bffd919b5d749cULL, 0x00261f92ad15e620ULL,
+ 0x00718397b7a97895ULL, 0x00c1443e6ebbc0c4ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00eacd90c1e0a049ULL, 0x008977935b149fbeULL,
+ 0x0004cb9ba11c93dcULL, 0x009fbd5b3470844dULL,
+ 0x004bc18c9bfc22cfULL, 0x0057679a991839f3ULL,
+ 0x00ef15b76fb4092eULL, 0x0074a5173a225041ULL) },
+ { FIELD_LITERAL(0x003f5f9d7ec4777bULL, 0x00ab2e733c919c94ULL,
+ 0x001bb6c035245ae5ULL, 0x00a325a49a883630ULL,
+ 0x0033e9a9ea3cea2fULL, 0x00e442a1eaa0e844ULL,
+ 0x00b2116d5b0e71b8ULL, 0x00c16abed6d64047ULL) },
+ { FIELD_LITERAL(0x00c560b5ed051165ULL, 0x001945adc5d65094ULL,
+ 0x00e221865710f910ULL, 0x00cc12bc9e9b8cebULL,
+ 0x004faa9518914e35ULL, 0x0017476d89d42f6dULL,
+ 0x00b8f637c8fa1c8bULL, 0x0088c7d2790864b8ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00ef7eafc1c69be6ULL, 0x0085d3855778fbeaULL,
+ 0x002c8d5b450cb6f5ULL, 0x004e77de5e1e7fecULL,
+ 0x0047c057893abdedULL, 0x001b430b85d51e16ULL,
+ 0x00965c7b45640c3cULL, 0x00487b2bb1162b97ULL) },
+ { FIELD_LITERAL(0x0099c73a311beec2ULL, 0x00a3eff38d8912adULL,
+ 0x002efa9d1d7e8972ULL, 0x00f717ae1e14d126ULL,
+ 0x002833f795850c8bULL, 0x0066c12ad71486bdULL,
+ 0x00ae9889da4820ebULL, 0x00d6044309555c08ULL) },
+ { FIELD_LITERAL(0x004b1c5283d15e41ULL, 0x00669d8ea308ff75ULL,
+ 0x0004390233f762a1ULL, 0x00e1d67b83cb6cecULL,
+ 0x003eebaa964c78b1ULL, 0x006b0aff965eb664ULL,
+ 0x00b313d4470bdc37ULL, 0x008814ffcb3cb9d8ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x009724b8ce68db70ULL, 0x007678b5ed006f3dULL,
+ 0x00bdf4b89c0abd73ULL, 0x00299748e04c7c6dULL,
+ 0x00ddd86492c3c977ULL, 0x00c5a7febfa30a99ULL,
+ 0x00ed84715b4b02bbULL, 0x00319568adf70486ULL) },
+ { FIELD_LITERAL(0x0070ff2d864de5bbULL, 0x005a37eeb637ee95ULL,
+ 0x0033741c258de160ULL, 0x00e6ca5cb1988f46ULL,
+ 0x001ceabd92a24661ULL, 0x0030957bd500fe40ULL,
+ 0x001c3362afe912c5ULL, 0x005187889f678bd2ULL) },
+ { FIELD_LITERAL(0x0086835fc62bbdc7ULL, 0x009c3516ca4910a1ULL,
+ 0x00956c71f8d00783ULL, 0x0095c78fcf63235fULL,
+ 0x00fc7ff6ba05c222ULL, 0x00cdd8b3f8d74a52ULL,
+ 0x00ac5ae16de8256eULL, 0x00e9d4be8ed48624ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00c0ce11405df2d8ULL, 0x004e3f37b293d7b6ULL,
+ 0x002410172e1ac6dbULL, 0x00b8dbff4bf8143dULL,
+ 0x003a7b409d56eb66ULL, 0x003e0f6a0dfef9afULL,
+ 0x0081c4e4d3645be1ULL, 0x00ce76076b127623ULL) },
+ { FIELD_LITERAL(0x00f6ee0f98974239ULL, 0x0042d89af07d3a4fULL,
+ 0x00846b7fe84346b5ULL, 0x006a21fc6a8d39a1ULL,
+ 0x00ac8bc2541ff2d9ULL, 0x006d4e2a77732732ULL,
+ 0x009a39b694cc3f2fULL, 0x0085c0aa2a404c8fULL) },
+ { FIELD_LITERAL(0x00b261101a218548ULL, 0x00c1cae96424277bULL,
+ 0x00869da0a77dd268ULL, 0x00bc0b09f8ec83eaULL,
+ 0x00d61027f8e82ba9ULL, 0x00aa4c85999dce67ULL,
+ 0x00eac3132b9f3fe1ULL, 0x00fb9b0cf1c695d2ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x0043079295512f0dULL, 0x0046a009861758e0ULL,
+ 0x003ee2842a807378ULL, 0x0034cc9d1298e4faULL,
+ 0x009744eb4d31b3eeULL, 0x00afacec96650cd0ULL,
+ 0x00ac891b313761aeULL, 0x00e864d6d26e708aULL) },
+ { FIELD_LITERAL(0x00a84d7c8a23b491ULL, 0x0088e19aa868b27fULL,
+ 0x0005986d43e78ce9ULL, 0x00f28012f0606d28ULL,
+ 0x0017ded7e10249b3ULL, 0x005ed4084b23af9bULL,
+ 0x00b9b0a940564472ULL, 0x00ad9056cceeb1f4ULL) },
+ { FIELD_LITERAL(0x00db91b357fe755eULL, 0x00a1aa544b15359cULL,
+ 0x00af4931a0195574ULL, 0x007686124fe11aefULL,
+ 0x00d1ead3c7b9ef7eULL, 0x00aaf5fc580f8c15ULL,
+ 0x00e727be147ee1ecULL, 0x003c61c1e1577b86ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x009d3fca983220cfULL, 0x00cd11acbc853dc4ULL,
+ 0x0017590409d27f1dULL, 0x00d2176698082802ULL,
+ 0x00fa01251b2838c8ULL, 0x00dd297a0d9b51c6ULL,
+ 0x00d76c92c045820aULL, 0x00534bc7c46c9033ULL) },
+ { FIELD_LITERAL(0x0080ed9bc9b07338ULL, 0x00fceac7745d2652ULL,
+ 0x008a9d55f5f2cc69ULL, 0x0096ce72df301ac5ULL,
+ 0x00f53232e7974d87ULL, 0x0071728c7ae73947ULL,
+ 0x0090507602570778ULL, 0x00cb81cfd883b1b2ULL) },
+ { FIELD_LITERAL(0x005011aadea373daULL, 0x003a8578ec896034ULL,
+ 0x00f20a6535fa6d71ULL, 0x005152d31e5a87cfULL,
+ 0x002bac1c8e68ca31ULL, 0x00b0e323db4c1381ULL,
+ 0x00f1d596b7d5ae25ULL, 0x00eae458097cb4e0ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00920ac80f9b0d21ULL, 0x00f80f7f73401246ULL,
+ 0x0086d37849b557d6ULL, 0x0002bd4b317b752eULL,
+ 0x00b26463993a42bbULL, 0x002070422a73b129ULL,
+ 0x00341acaa0380cb3ULL, 0x00541914dd66a1b2ULL) },
+ { FIELD_LITERAL(0x00c1513cd66abe8cULL, 0x000139e01118944dULL,
+ 0x0064abbcb8080bbbULL, 0x00b3b08202473142ULL,
+ 0x00c629ef25da2403ULL, 0x00f0aec3310d9b7fULL,
+ 0x0050b2227472d8cdULL, 0x00f6c8a922d41fb4ULL) },
+ { FIELD_LITERAL(0x001075ccf26b7b1fULL, 0x00bb6bb213170433ULL,
+ 0x00e9491ad262da79ULL, 0x009ef4f48d2d384cULL,
+ 0x008992770766f09dULL, 0x001584396b6b1101ULL,
+ 0x00af3f8676c9feefULL, 0x0024603c40269118ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x009dd7b31319527cULL, 0x001e7ac948d873a9ULL,
+ 0x00fa54b46ef9673aULL, 0x0066efb8d5b02fe6ULL,
+ 0x00754b1d3928aeaeULL, 0x0004262ac72a6f6bULL,
+ 0x0079b7d49a6eb026ULL, 0x003126a753540102ULL) },
+ { FIELD_LITERAL(0x009666e24f693947ULL, 0x00f714311269d45fULL,
+ 0x0010ffac1d0c851cULL, 0x0066e80c37363497ULL,
+ 0x00f1f4ad010c60b0ULL, 0x0015c87408470ff7ULL,
+ 0x00651d5e9c7766a4ULL, 0x008138819d7116deULL) },
+ { FIELD_LITERAL(0x003934b11c57253bULL, 0x00ef308edf21f46eULL,
+ 0x00e54e99c7a16198ULL, 0x0080d57135764e63ULL,
+ 0x00751c27b946bc24ULL, 0x00dd389ce4e9e129ULL,
+ 0x00a1a2bfd1cd84dcULL, 0x002fae73e5149b32ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00911657dffb4cddULL, 0x00c100b7cc553d06ULL,
+ 0x00449d075ec467ccULL, 0x007062100bc64e70ULL,
+ 0x0043cf86f7bd21e7ULL, 0x00f401dc4b797deaULL,
+ 0x005224afb2f62e65ULL, 0x00d1ede3fb5a42beULL) },
+ { FIELD_LITERAL(0x00f2ba36a41aa144ULL, 0x00a0c22d946ee18fULL,
+ 0x008aae8ef9a14f99ULL, 0x00eef4d79b19bb36ULL,
+ 0x008e75ce3d27b1fcULL, 0x00a65daa03b29a27ULL,
+ 0x00d9cc83684eb145ULL, 0x009e1ed80cc2ed74ULL) },
+ { FIELD_LITERAL(0x00bed953d1997988ULL, 0x00b93ed175a24128ULL,
+ 0x00871c5963fb6365ULL, 0x00ca2df20014a787ULL,
+ 0x00f5d9c1d0b34322ULL, 0x00f6f5942818db0aULL,
+ 0x004cc091f49c9906ULL, 0x00e8a188a60bff9fULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x0032c7762032fae8ULL, 0x00e4087232e0bc21ULL,
+ 0x00f767344b6e8d85ULL, 0x00bbf369b76c2aa2ULL,
+ 0x008a1f46c6e1570cULL, 0x001368cd9780369fULL,
+ 0x007359a39d079430ULL, 0x0003646512921434ULL) },
+ { FIELD_LITERAL(0x007c4b47ca7c73e7ULL, 0x005396221039734bULL,
+ 0x008b64ddf0e45d7eULL, 0x00bfad5af285e6c2ULL,
+ 0x008ec711c5b1a1a8ULL, 0x00cf663301237f98ULL,
+ 0x00917ee3f1655126ULL, 0x004152f337efedd8ULL) },
+ { FIELD_LITERAL(0x0007c7edc9305daaULL, 0x000a6664f273701cULL,
+ 0x00f6e78795e200b1ULL, 0x005d05b9ecd2473eULL,
+ 0x0014f5f17c865786ULL, 0x00c7fd2d166fa995ULL,
+ 0x004939a2d8eb80e0ULL, 0x002244ba0942c199ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00321e767f0262cfULL, 0x002e57d776caf68eULL,
+ 0x00bf2c94814f0437ULL, 0x00c339196acd622fULL,
+ 0x001db4cce71e2770ULL, 0x001ded5ddba6eee2ULL,
+ 0x0078608ab1554c8dULL, 0x00067fe0ab76365bULL) },
+ { FIELD_LITERAL(0x00f09758e11e3985ULL, 0x00169efdbd64fad3ULL,
+ 0x00e8889b7d6dacd6ULL, 0x0035cdd58ea88209ULL,
+ 0x00bcda47586d7f49ULL, 0x003cdddcb2879088ULL,
+ 0x0016da70187e954bULL, 0x009556ea2e92aacdULL) },
+ { FIELD_LITERAL(0x008cab16bd1ff897ULL, 0x00b389972cdf753fULL,
+ 0x00ea8ed1e46dfdc0ULL, 0x004fe7ef94c589f4ULL,
+ 0x002b8ae9b805ecf3ULL, 0x0025c08d892874a5ULL,
+ 0x0023938e98d44c4cULL, 0x00f759134cabf69cULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x006c2a84678e4b3bULL, 0x007a194aacd1868fULL,
+ 0x00ed0225af424761ULL, 0x00da0a6f293c64b8ULL,
+ 0x001062ac5c6a7a18ULL, 0x0030f5775a8aeef4ULL,
+ 0x0002acaad76b7af0ULL, 0x00410b8fd63a579fULL) },
+ { FIELD_LITERAL(0x001ec59db3d9590eULL, 0x001e9e3f1c3f182dULL,
+ 0x0045a9c3ec2cab14ULL, 0x0008198572aeb673ULL,
+ 0x00773b74068bd167ULL, 0x0012535eaa395434ULL,
+ 0x0044dba9e3bbb74aULL, 0x002fba4d3c74bd0eULL) },
+ { FIELD_LITERAL(0x0042bf08fe66922cULL, 0x003318b8fbb49e8cULL,
+ 0x00d75946004aa14cULL, 0x00f601586b42bf1cULL,
+ 0x00c74cf1d912fe66ULL, 0x00abcb36974b30adULL,
+ 0x007eb78720c9d2b8ULL, 0x009f54ab7bd4df85ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00db9fc948f73826ULL, 0x00fa8b3746ed8ee9ULL,
+ 0x00132cb65aafbeb2ULL, 0x00c36ff3fe7925b8ULL,
+ 0x00837daed353d2feULL, 0x00ec661be0667cf4ULL,
+ 0x005beb8ed2e90204ULL, 0x00d77dd69e564967ULL) },
+ { FIELD_LITERAL(0x0042e6268b861751ULL, 0x0008dd0469500c16ULL,
+ 0x00b51b57c338a3fdULL, 0x00cc4497d85cff6bULL,
+ 0x002f13d6b57c34a4ULL, 0x0083652eaf301105ULL,
+ 0x00cc344294cc93a8ULL, 0x0060f4d02810e270ULL) },
+ { FIELD_LITERAL(0x00a8954363cd518bULL, 0x00ad171124bccb7bULL,
+ 0x0065f46a4adaae00ULL, 0x001b1a5b2a96e500ULL,
+ 0x0043fe24f8233285ULL, 0x0066996d8ae1f2c3ULL,
+ 0x00c530f3264169f9ULL, 0x00c0f92d07cf6a57ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x0036a55c6815d943ULL, 0x008c8d1def993db3ULL,
+ 0x002e0e1e8ff7318fULL, 0x00d883a4b92db00aULL,
+ 0x002f5e781ae33906ULL, 0x001a72adb235c06dULL,
+ 0x00f2e59e736e9caaULL, 0x001a4b58e3031914ULL) },
+ { FIELD_LITERAL(0x00d73bfae5e00844ULL, 0x00bf459766fb5f52ULL,
+ 0x0061b4f5a5313cdeULL, 0x004392d4c3b95514ULL,
+ 0x000d3551b1077523ULL, 0x0000998840ee5d71ULL,
+ 0x006de6e340448b7bULL, 0x00251aa504875d6eULL) },
+ { FIELD_LITERAL(0x003bf343427ac342ULL, 0x00adc0a78642b8c5ULL,
+ 0x0003b893175a8314ULL, 0x0061a34ade5703bcULL,
+ 0x00ea3ea8bb71d632ULL, 0x00be0df9a1f198c2ULL,
+ 0x0046dd8e7c1635fbULL, 0x00f1523fdd25d5e5ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00633f63fc9dd406ULL, 0x00e713ff80e04a43ULL,
+ 0x0060c6e970f2d621ULL, 0x00a57cd7f0df1891ULL,
+ 0x00f2406a550650bbULL, 0x00b064290efdc684ULL,
+ 0x001eab0144d17916ULL, 0x00cd15f863c293abULL) },
+ { FIELD_LITERAL(0x0029cec55273f70dULL, 0x007044ee275c6340ULL,
+ 0x0040f637a93015e2ULL, 0x00338bb78db5aae9ULL,
+ 0x001491b2a6132147ULL, 0x00a125d6cfe6bde3ULL,
+ 0x005f7ac561ba8669ULL, 0x001d5eaea3fbaacfULL) },
+ { FIELD_LITERAL(0x00054e9635e3be31ULL, 0x000e43f31e2872beULL,
+ 0x00d05b1c9e339841ULL, 0x006fac50bd81fd98ULL,
+ 0x00cdc7852eaebb09ULL, 0x004ff519b061991bULL,
+ 0x009099e8107d4c85ULL, 0x00273e24c36a4a61ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00070b4441ef2c46ULL, 0x00efa5b02801a109ULL,
+ 0x00bf0b8c3ee64adfULL, 0x008a67e0b3452e98ULL,
+ 0x001916b1f2fa7a74ULL, 0x00d781a78ff6cdc3ULL,
+ 0x008682ce57e5c919ULL, 0x00cc1109dd210da3ULL) },
+ { FIELD_LITERAL(0x00cae8aaff388663ULL, 0x005e983a35dda1c7ULL,
+ 0x007ab1030d8e37f4ULL, 0x00e48940f5d032feULL,
+ 0x006a36f9ef30b331ULL, 0x009be6f03958c757ULL,
+ 0x0086231ceba91400ULL, 0x008bd0f7b823e7aaULL) },
+ { FIELD_LITERAL(0x00cf881ebef5a45aULL, 0x004ebea78e7c6f2cULL,
+ 0x0090da9209cf26a0ULL, 0x00de2b2e4c775b84ULL,
+ 0x0071d6031c3c15aeULL, 0x00d9e927ef177d70ULL,
+ 0x00894ee8c23896fdULL, 0x00e3b3b401e41aadULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00204fef26864170ULL, 0x00819269c5dee0f8ULL,
+ 0x00bfb4713ec97966ULL, 0x0026339a6f34df78ULL,
+ 0x001f26e64c761dc2ULL, 0x00effe3af313cb60ULL,
+ 0x00e17b70138f601bULL, 0x00f16e1ccd9ede5eULL) },
+ { FIELD_LITERAL(0x005d9a8353fdb2dbULL, 0x0055cc2048c698f0ULL,
+ 0x00f6c4ac89657218ULL, 0x00525034d73faeb2ULL,
+ 0x00435776fbda3c7dULL, 0x0070ea5312323cbcULL,
+ 0x007a105d44d069fbULL, 0x006dbc8d6dc786aaULL) },
+ { FIELD_LITERAL(0x0017cff19cd394ecULL, 0x00fef7b810922587ULL,
+ 0x00e6483970dff548ULL, 0x00ddf36ad6874264ULL,
+ 0x00e61778523fcce2ULL, 0x0093a66c0c93b24aULL,
+ 0x00fd367114db7f86ULL, 0x007652d7ddce26ddULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00d92ced7ba12843ULL, 0x00aea9c7771e86e7ULL,
+ 0x0046639693354f7bULL, 0x00a628dbb6a80c47ULL,
+ 0x003a0b0507372953ULL, 0x00421113ab45c0d9ULL,
+ 0x00e545f08362ab7aULL, 0x0028ce087b4d6d96ULL) },
+ { FIELD_LITERAL(0x00a67ee7cf9f99ebULL, 0x005713b275f2ff68ULL,
+ 0x00f1d536a841513dULL, 0x00823b59b024712eULL,
+ 0x009c46b9d0d38cecULL, 0x00cdb1595aa2d7d4ULL,
+ 0x008375b3423d9af8ULL, 0x000ab0b516d978f7ULL) },
+ { FIELD_LITERAL(0x00428dcb3c510b0fULL, 0x00585607ea24bb4eULL,
+ 0x003736bf1603687aULL, 0x00c47e568c4fe3c7ULL,
+ 0x003cd00282848605ULL, 0x0043a487c3b91939ULL,
+ 0x004ffc04e1095a06ULL, 0x00a4c989a3d4b918ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00a8778d0e429f7aULL, 0x004c02b059105a68ULL,
+ 0x0016653b609da3ffULL, 0x00d5107bd1a12d27ULL,
+ 0x00b4708f9a771cabULL, 0x00bb63b662033f69ULL,
+ 0x0072f322240e7215ULL, 0x0019445b59c69222ULL) },
+ { FIELD_LITERAL(0x00cf4f6069a658e6ULL, 0x0053ca52859436a6ULL,
+ 0x0064b994d7e3e117ULL, 0x00cb469b9a07f534ULL,
+ 0x00cfb68f399e9d47ULL, 0x00f0dcb8dac1c6e7ULL,
+ 0x00f2ab67f538b3a5ULL, 0x0055544f178ab975ULL) },
+ { FIELD_LITERAL(0x0099b7a2685d538cULL, 0x00e2f1897b7c0018ULL,
+ 0x003adac8ce48dae3ULL, 0x00089276d5c50c0cULL,
+ 0x00172fca07ad6717ULL, 0x00cb1a72f54069e5ULL,
+ 0x004ee42f133545b3ULL, 0x00785f8651362f16ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x0049cbac38509e11ULL, 0x0015234505d42cdfULL,
+ 0x00794fb0b5840f1cULL, 0x00496437344045a5ULL,
+ 0x0031b6d944e4f9b0ULL, 0x00b207318ac1f5d8ULL,
+ 0x0000c840da7f5c5dULL, 0x00526f373a5c8814ULL) },
+ { FIELD_LITERAL(0x002c7b7742d1dfd9ULL, 0x002cabeb18623c01ULL,
+ 0x00055f5e3e044446ULL, 0x006c20f3b4ef54baULL,
+ 0x00c600141ec6b35fULL, 0x00354f437f1a32a3ULL,
+ 0x00bac4624a3520f9ULL, 0x00c483f734a90691ULL) },
+ { FIELD_LITERAL(0x0053a737d422918dULL, 0x00f7fca1d8758625ULL,
+ 0x00c360336dadb04cULL, 0x00f38e3d9158a1b8ULL,
+ 0x0069ce3b418e84c6ULL, 0x005d1697eca16eadULL,
+ 0x00f8bd6a35ece13dULL, 0x007885dfc2b5afeaULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00c3617ae260776cULL, 0x00b20dc3e96922d7ULL,
+ 0x00a1a7802246706aULL, 0x00ca6505a5240244ULL,
+ 0x002246b62d919782ULL, 0x001439102d7aa9b3ULL,
+ 0x00e8af1139e6422cULL, 0x00c888d1b52f2b05ULL) },
+ { FIELD_LITERAL(0x005b67690ffd41d9ULL, 0x005294f28df516f9ULL,
+ 0x00a879272412fcb9ULL, 0x00098b629a6d1c8dULL,
+ 0x00fabd3c8050865aULL, 0x00cd7e5b0a3879c5ULL,
+ 0x00153238210f3423ULL, 0x00357cac101e9f42ULL) },
+ { FIELD_LITERAL(0x008917b454444fb7ULL, 0x00f59247c97e441bULL,
+ 0x00a6200a6815152dULL, 0x0009a4228601d254ULL,
+ 0x001c0360559bd374ULL, 0x007563362039cb36ULL,
+ 0x00bd75b48d74e32bULL, 0x0017f515ac3499e8ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x001532a7ffe41c5aULL, 0x00eb1edce358d6bfULL,
+ 0x00ddbacc7b678a7bULL, 0x008a7b70f3c841a3ULL,
+ 0x00f1923bf27d3f4cULL, 0x000b2713ed8f7873ULL,
+ 0x00aaf67e29047902ULL, 0x0044994a70b3976dULL) },
+ { FIELD_LITERAL(0x00d54e802082d42cULL, 0x00a55aa0dce7cc6cULL,
+ 0x006477b96073f146ULL, 0x0082efe4ceb43594ULL,
+ 0x00a922bcba026845ULL, 0x0077f19d1ab75182ULL,
+ 0x00c2bb2737846e59ULL, 0x0004d7eec791dd33ULL) },
+ { FIELD_LITERAL(0x0044588d1a81d680ULL, 0x00b0a9097208e4f8ULL,
+ 0x00212605350dc57eULL, 0x0028717cd2871123ULL,
+ 0x00fb083c100fd979ULL, 0x0045a056ce063fdfULL,
+ 0x00a5d604b4dd6a41ULL, 0x001dabc08ba4e236ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00c4887198d7a7faULL, 0x00244f98fb45784aULL,
+ 0x0045911e15a15d01ULL, 0x001d323d374c0966ULL,
+ 0x00967c3915196562ULL, 0x0039373abd2f3c67ULL,
+ 0x000d2c5614312423ULL, 0x0041cf2215442ce3ULL) },
+ { FIELD_LITERAL(0x008ede889ada7f06ULL, 0x001611e91de2e135ULL,
+ 0x00fdb9a458a471b9ULL, 0x00563484e03710d1ULL,
+ 0x0031cc81925e3070ULL, 0x0062c97b3af80005ULL,
+ 0x00fa733eea28edebULL, 0x00e82457e1ebbc88ULL) },
+ { FIELD_LITERAL(0x006a0df5fe9b6f59ULL, 0x00a0d4ff46040d92ULL,
+ 0x004a7cedb6f93250ULL, 0x00d1df8855b8c357ULL,
+ 0x00e73a46086fd058ULL, 0x0048fb0add6dfe59ULL,
+ 0x001e03a28f1b4e3dULL, 0x00a871c993308d76ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x0030dbb2d1766ec8ULL, 0x00586c0ad138555eULL,
+ 0x00d1a34f9e91c77cULL, 0x0063408ad0e89014ULL,
+ 0x00d61231b05f6f5bULL, 0x0009abf569f5fd8aULL,
+ 0x00aec67a110f1c43ULL, 0x0031d1a790938dd7ULL) },
+ { FIELD_LITERAL(0x006cded841e2a862ULL, 0x00198d60af0ab6fbULL,
+ 0x0018f09db809e750ULL, 0x004e6ac676016263ULL,
+ 0x00eafcd1620969cbULL, 0x002c9784ca34917dULL,
+ 0x0054f00079796de7ULL, 0x00d9fab5c5972204ULL) },
+ { FIELD_LITERAL(0x004bd0fee2438a83ULL, 0x00b571e62b0f83bdULL,
+ 0x0059287d7ce74800ULL, 0x00fb3631b645c3f0ULL,
+ 0x00a018e977f78494ULL, 0x0091e27065c27b12ULL,
+ 0x007696c1817165e0ULL, 0x008c40be7c45ba3aULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00a0f326327cb684ULL, 0x001c7d0f672680ffULL,
+ 0x008c1c81ffb112d1ULL, 0x00f8f801674eddc8ULL,
+ 0x00e926d5d48c2a9dULL, 0x005bd6d954c6fe9aULL,
+ 0x004c6b24b4e33703ULL, 0x00d05eb5c09105ccULL) },
+ { FIELD_LITERAL(0x00d61731caacf2cfULL, 0x002df0c7609e01c5ULL,
+ 0x00306172208b1e2bULL, 0x00b413fe4fb2b686ULL,
+ 0x00826d360902a221ULL, 0x003f8d056e67e7f7ULL,
+ 0x0065025b0175e989ULL, 0x00369add117865ebULL) },
+ { FIELD_LITERAL(0x00aaf895aec2fa11ULL, 0x000f892bc313eb52ULL,
+ 0x005b1c794dad050bULL, 0x003f8ec4864cec14ULL,
+ 0x00af81058d0b90e5ULL, 0x00ebe43e183997bbULL,
+ 0x00a9d610f9f3e615ULL, 0x007acd8eec2e88d3ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x0049b2fab13812a3ULL, 0x00846db32cd60431ULL,
+ 0x000177fa578c8d6cULL, 0x00047d0e2ad4bc51ULL,
+ 0x00b158ba38d1e588ULL, 0x006a45daad79e3f3ULL,
+ 0x000997b93cab887bULL, 0x00c47ea42fa23dc3ULL) },
+ { FIELD_LITERAL(0x0012b6fef7aeb1caULL, 0x009412768194b6a7ULL,
+ 0x00ff0d351f23ab93ULL, 0x007e8a14c1aff71bULL,
+ 0x006c1c0170c512bcULL, 0x0016243ea02ab2e5ULL,
+ 0x007bb6865b303f3eULL, 0x0015ce6b29b159f4ULL) },
+ { FIELD_LITERAL(0x009961cd02e68108ULL, 0x00e2035d3a1d0836ULL,
+ 0x005d51f69b5e1a1dULL, 0x004bccb4ea36edcdULL,
+ 0x0069be6a7aeef268ULL, 0x0063f4dd9de8d5a7ULL,
+ 0x006283783092ca35ULL, 0x0075a31af2c35409ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00c412365162e8cfULL, 0x00012283fb34388aULL,
+ 0x003e6543babf39e2ULL, 0x00eead6b3a804978ULL,
+ 0x0099c0314e8b326fULL, 0x00e98e0a8d477a4fULL,
+ 0x00d2eb96b127a687ULL, 0x00ed8d7df87571bbULL) },
+ { FIELD_LITERAL(0x00777463e308cacfULL, 0x00c8acb93950132dULL,
+ 0x00ebddbf4ca48b2cULL, 0x0026ad7ca0795a0aULL,
+ 0x00f99a3d9a715064ULL, 0x000d60bcf9d4dfccULL,
+ 0x005e65a73a437a06ULL, 0x0019d536a8db56c8ULL) },
+ { FIELD_LITERAL(0x00192d7dd558d135ULL, 0x0027cd6a8323ffa7ULL,
+ 0x00239f1a412dc1e7ULL, 0x0046b4b3be74fc5cULL,
+ 0x0020c47a2bef5bceULL, 0x00aa17e48f43862bULL,
+ 0x00f7e26c96342e5fULL, 0x0008011c530f39a9ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x00aad4ac569bf0f1ULL, 0x00a67adc90b27740ULL,
+ 0x0048551369a5751aULL, 0x0031252584a3306aULL,
+ 0x0084e15df770e6fcULL, 0x00d7bba1c74b5805ULL,
+ 0x00a80ef223af1012ULL, 0x0089c85ceb843a34ULL) },
+ { FIELD_LITERAL(0x00c4545be4a54004ULL, 0x0099e11f60357e6cULL,
+ 0x001f3936d19515a6ULL, 0x007793df84341a6eULL,
+ 0x0051061886717ffaULL, 0x00e9b0a660b28f85ULL,
+ 0x0044ea685892de0dULL, 0x000257d2a1fda9d9ULL) },
+ { FIELD_LITERAL(0x007e8b01b24ac8a8ULL, 0x006cf3b0b5ca1337ULL,
+ 0x00f1607d3e36a570ULL, 0x0039b7fab82991a1ULL,
+ 0x00231777065840c5ULL, 0x00998e5afdd346f9ULL,
+ 0x00b7dc3e64acc85fULL, 0x00baacc748013ad6ULL) },
+ } },
+ { {
+ { FIELD_LITERAL(0x008ea6a4177580bfULL, 0x005fa1953e3f0378ULL,
+ 0x005fe409ac74d614ULL, 0x00452327f477e047ULL,
+ 0x00a4018507fb6073ULL, 0x007b6e71951caac8ULL,
+ 0x0012b42ab8a6ce91ULL, 0x0080eca677294ab7ULL) },
+ { FIELD_LITERAL(0x00a53edc023ba69bULL, 0x00c6afa83ddde2e8ULL,
+ 0x00c3f638b307b14eULL, 0x004a357a64414062ULL,
+ 0x00e4d94d8b582dc9ULL, 0x001739caf71695b7ULL,
+ 0x0012431b2ae28de1ULL, 0x003b6bc98682907cULL) },
+ { FIELD_LITERAL(0x008a9a93be1f99d6ULL, 0x0079fa627cc699c8ULL,
+ 0x00b0cfb134ba84c8ULL, 0x001c4b778249419aULL,
+ 0x00df4ab3d9c44f40ULL, 0x009f596e6c1a9e3cULL,
+ 0x001979c0df237316ULL, 0x00501e953a919b87ULL) },
+ } }
};
const niels_t *ossl_curve448_wnaf_base = curve448_wnaf_base_table;
diff --git a/crypto/ec/curve448/curve448utils.h b/crypto/ec/curve448/curve448utils.h
index 664c6e6ff3..c3ca6ba53e 100644
--- a/crypto/ec/curve448/curve448utils.h
+++ b/crypto/ec/curve448/curve448utils.h
@@ -11,11 +11,11 @@
*/
#ifndef OSSL_CRYPTO_EC_CURVE448UTILS_H
-# define OSSL_CRYPTO_EC_CURVE448UTILS_H
+#define OSSL_CRYPTO_EC_CURVE448UTILS_H
-# include <openssl/e_os2.h>
+#include <openssl/e_os2.h>
-# include "internal/numbers.h"
+#include "internal/numbers.h"
/*
* Internal word types. Somewhat tricky. This could be decided separately per
@@ -24,18 +24,18 @@
* header was built with eg arch_neon, you might end up linking a library built
* with arch_arm32.
*/
-# ifndef C448_WORD_BITS
-# if (defined(__SIZEOF_INT128__) && (__SIZEOF_INT128__ == 16)) \
- && !defined(__sparc__) \
- && (!defined(__SIZEOF_LONG__) || (__SIZEOF_LONG__ == 8))
+#ifndef C448_WORD_BITS
+#if (defined(__SIZEOF_INT128__) && (__SIZEOF_INT128__ == 16)) \
+ && !defined(__sparc__) \
+ && (!defined(__SIZEOF_LONG__) || (__SIZEOF_LONG__ == 8))
-# define C448_WORD_BITS 64 /* The number of bits in a word */
-# else
-# define C448_WORD_BITS 32 /* The number of bits in a word */
-# endif
-# endif
+#define C448_WORD_BITS 64 /* The number of bits in a word */
+#else
+#define C448_WORD_BITS 32 /* The number of bits in a word */
+#endif
+#endif
-# if C448_WORD_BITS == 64
+#if C448_WORD_BITS == 64
/* Word size for internal computations */
typedef uint64_t c448_word_t;
/* Signed word size for internal computations */
@@ -46,7 +46,7 @@ typedef uint64_t c448_bool_t;
typedef uint128_t c448_dword_t;
/* Signed double-word size for internal computations */
typedef int128_t c448_dsword_t;
-# elif C448_WORD_BITS == 32
+#elif C448_WORD_BITS == 32
/* Word size for internal computations */
typedef uint32_t c448_word_t;
/* Signed word size for internal computations */
@@ -57,26 +57,26 @@ typedef uint32_t c448_bool_t;
typedef uint64_t c448_dword_t;
/* Signed double-word size for internal computations */
typedef int64_t c448_dsword_t;
-# else
-# error "Only supporting C448_WORD_BITS = 32 or 64 for now"
-# endif
+#else
+#error "Only supporting C448_WORD_BITS = 32 or 64 for now"
+#endif
/* C448_TRUE = -1 so that C448_TRUE & x = x */
-# define C448_TRUE (0 - (c448_bool_t)1)
+#define C448_TRUE (0 - (c448_bool_t)1)
/* C448_FALSE = 0 so that C448_FALSE & x = 0 */
-# define C448_FALSE 0
+#define C448_FALSE 0
/* Another boolean type used to indicate success or failure. */
typedef enum {
C448_SUCCESS = -1, /**< The operation succeeded. */
- C448_FAILURE = 0 /**< The operation failed. */
+ C448_FAILURE = 0 /**< The operation failed. */
} c448_error_t;
/* Return success if x is true */
static ossl_inline c448_error_t c448_succeed_if(c448_bool_t x)
{
- return (c448_error_t) x;
+ return (c448_error_t)x;
}
-#endif /* __C448_COMMON_H__ */
+#endif /* __C448_COMMON_H__ */
diff --git a/crypto/ec/curve448/ed448.h b/crypto/ec/curve448/ed448.h
index f4f01892d3..1c94649557 100644
--- a/crypto/ec/curve448/ed448.h
+++ b/crypto/ec/curve448/ed448.h
@@ -11,25 +11,24 @@
*/
#ifndef OSSL_CRYPTO_EC_CURVE448_ED448_H
-# define OSSL_CRYPTO_EC_CURVE448_ED448_H
+#define OSSL_CRYPTO_EC_CURVE448_ED448_H
-# include "point_448.h"
+#include "point_448.h"
/* Number of bytes in an EdDSA public key. */
-# define EDDSA_448_PUBLIC_BYTES 57
+#define EDDSA_448_PUBLIC_BYTES 57
/* Number of bytes in an EdDSA private key. */
-# define EDDSA_448_PRIVATE_BYTES EDDSA_448_PUBLIC_BYTES
+#define EDDSA_448_PRIVATE_BYTES EDDSA_448_PUBLIC_BYTES
/* Number of bytes in an EdDSA signature. */
-# define EDDSA_448_SIGNATURE_BYTES (EDDSA_448_PUBLIC_BYTES + \
- EDDSA_448_PRIVATE_BYTES)
+#define EDDSA_448_SIGNATURE_BYTES (EDDSA_448_PUBLIC_BYTES + EDDSA_448_PRIVATE_BYTES)
/* EdDSA encoding ratio. */
-# define C448_EDDSA_ENCODE_RATIO 4
+#define C448_EDDSA_ENCODE_RATIO 4
/* EdDSA decoding ratio. */
-# define C448_EDDSA_DECODE_RATIO (4 / 4)
+#define C448_EDDSA_DECODE_RATIO (4 / 4)
/*
* EdDSA key generation. This function uses a different (non-Decaf) encoding.
@@ -39,10 +38,10 @@
*/
c448_error_t
ossl_c448_ed448_derive_public_key(
- OSSL_LIB_CTX *ctx,
- uint8_t pubkey [EDDSA_448_PUBLIC_BYTES],
- const uint8_t privkey [EDDSA_448_PRIVATE_BYTES],
- const char *propq);
+ OSSL_LIB_CTX *ctx,
+ uint8_t pubkey[EDDSA_448_PUBLIC_BYTES],
+ const uint8_t privkey[EDDSA_448_PRIVATE_BYTES],
+ const char *propq);
/*
* EdDSA signing.
@@ -63,13 +62,13 @@ ossl_c448_ed448_derive_public_key(
*/
c448_error_t
ossl_c448_ed448_sign(OSSL_LIB_CTX *ctx,
- uint8_t signature[EDDSA_448_SIGNATURE_BYTES],
- const uint8_t privkey[EDDSA_448_PRIVATE_BYTES],
- const uint8_t pubkey[EDDSA_448_PUBLIC_BYTES],
- const uint8_t *message, size_t message_len,
- uint8_t prehashed, const uint8_t *context,
- size_t context_len,
- const char *propq);
+ uint8_t signature[EDDSA_448_SIGNATURE_BYTES],
+ const uint8_t privkey[EDDSA_448_PRIVATE_BYTES],
+ const uint8_t pubkey[EDDSA_448_PUBLIC_BYTES],
+ const uint8_t *message, size_t message_len,
+ uint8_t prehashed, const uint8_t *context,
+ size_t context_len,
+ const char *propq);
/*
* EdDSA signing with prehash.
@@ -89,13 +88,13 @@ ossl_c448_ed448_sign(OSSL_LIB_CTX *ctx,
*/
c448_error_t
ossl_c448_ed448_sign_prehash(OSSL_LIB_CTX *ctx,
- uint8_t signature[EDDSA_448_SIGNATURE_BYTES],
- const uint8_t privkey[EDDSA_448_PRIVATE_BYTES],
- const uint8_t pubkey[EDDSA_448_PUBLIC_BYTES],
- const uint8_t hash[64],
- const uint8_t *context,
- size_t context_len,
- const char *propq);
+ uint8_t signature[EDDSA_448_SIGNATURE_BYTES],
+ const uint8_t privkey[EDDSA_448_PRIVATE_BYTES],
+ const uint8_t pubkey[EDDSA_448_PUBLIC_BYTES],
+ const uint8_t hash[64],
+ const uint8_t *context,
+ size_t context_len,
+ const char *propq);
/*
* EdDSA signature verification.
@@ -117,14 +116,14 @@ ossl_c448_ed448_sign_prehash(OSSL_LIB_CTX *ctx,
*/
c448_error_t
ossl_c448_ed448_verify(OSSL_LIB_CTX *ctx,
- const uint8_t
- signature[EDDSA_448_SIGNATURE_BYTES],
- const uint8_t
- pubkey[EDDSA_448_PUBLIC_BYTES],
- const uint8_t *message, size_t message_len,
- uint8_t prehashed, const uint8_t *context,
- uint8_t context_len,
- const char *propq);
+ const uint8_t
+ signature[EDDSA_448_SIGNATURE_BYTES],
+ const uint8_t
+ pubkey[EDDSA_448_PUBLIC_BYTES],
+ const uint8_t *message, size_t message_len,
+ uint8_t prehashed, const uint8_t *context,
+ uint8_t context_len,
+ const char *propq);
/*
* EdDSA signature verification.
@@ -145,13 +144,13 @@ ossl_c448_ed448_verify(OSSL_LIB_CTX *ctx,
*/
c448_error_t
ossl_c448_ed448_verify_prehash(
- OSSL_LIB_CTX *ctx,
- const uint8_t signature[EDDSA_448_SIGNATURE_BYTES],
- const uint8_t pubkey[EDDSA_448_PUBLIC_BYTES],
- const uint8_t hash[64],
- const uint8_t *context,
- uint8_t context_len,
- const char *propq);
+ OSSL_LIB_CTX *ctx,
+ const uint8_t signature[EDDSA_448_SIGNATURE_BYTES],
+ const uint8_t pubkey[EDDSA_448_PUBLIC_BYTES],
+ const uint8_t hash[64],
+ const uint8_t *context,
+ uint8_t context_len,
+ const char *propq);
/*
* EdDSA point encoding. Used internally, exposed externally.
@@ -176,10 +175,9 @@ ossl_c448_ed448_verify_prehash(
* enc (out): The encoded point.
* p (in): The point.
*/
-void
-ossl_curve448_point_mul_by_ratio_and_encode_like_eddsa(
- uint8_t enc [EDDSA_448_PUBLIC_BYTES],
- const curve448_point_t p);
+void ossl_curve448_point_mul_by_ratio_and_encode_like_eddsa(
+ uint8_t enc[EDDSA_448_PUBLIC_BYTES],
+ const curve448_point_t p);
/*
* EdDSA point decoding. Multiplies by C448_EDDSA_DECODE_RATIO, and
@@ -192,8 +190,8 @@ ossl_curve448_point_mul_by_ratio_and_encode_like_eddsa(
*/
c448_error_t
ossl_curve448_point_decode_like_eddsa_and_mul_by_ratio(
- curve448_point_t p,
- const uint8_t enc[EDDSA_448_PUBLIC_BYTES]);
+ curve448_point_t p,
+ const uint8_t enc[EDDSA_448_PUBLIC_BYTES]);
/*
* EdDSA to ECDH private key conversion
@@ -205,9 +203,9 @@ ossl_curve448_point_decode_like_eddsa_and_mul_by_ratio(
*/
c448_error_t
ossl_c448_ed448_convert_private_key_to_x448(
- OSSL_LIB_CTX *ctx,
- uint8_t x[X448_PRIVATE_BYTES],
- const uint8_t ed[EDDSA_448_PRIVATE_BYTES],
- const char *propq);
+ OSSL_LIB_CTX *ctx,
+ uint8_t x[X448_PRIVATE_BYTES],
+ const uint8_t ed[EDDSA_448_PRIVATE_BYTES],
+ const char *propq);
-#endif /* OSSL_CRYPTO_EC_CURVE448_ED448_H */
+#endif /* OSSL_CRYPTO_EC_CURVE448_ED448_H */
diff --git a/crypto/ec/curve448/eddsa.c b/crypto/ec/curve448/eddsa.c
index 080486e9f3..f90ee2e82d 100644
--- a/crypto/ec/curve448/eddsa.c
+++ b/crypto/ec/curve448/eddsa.c
@@ -21,8 +21,8 @@
#define COFACTOR 4
static c448_error_t oneshot_hash(OSSL_LIB_CTX *ctx, uint8_t *out, size_t outlen,
- const uint8_t *in, size_t inlen,
- const char *propq)
+ const uint8_t *in, size_t inlen,
+ const char *propq)
{
EVP_MD_CTX *hashctx = EVP_MD_CTX_new();
EVP_MD *shake256 = NULL;
@@ -36,12 +36,12 @@ static c448_error_t oneshot_hash(OSSL_LIB_CTX *ctx, uint8_t *out, size_t outlen,
goto err;
if (!EVP_DigestInit_ex(hashctx, shake256, NULL)
- || !EVP_DigestUpdate(hashctx, in, inlen)
- || !EVP_DigestFinalXOF(hashctx, out, outlen))
+ || !EVP_DigestUpdate(hashctx, in, inlen)
+ || !EVP_DigestFinalXOF(hashctx, out, outlen))
goto err;
ret = C448_SUCCESS;
- err:
+err:
EVP_MD_CTX_free(hashctx);
EVP_MD_free(shake256);
return ret;
@@ -55,11 +55,11 @@ static void clamp(uint8_t secret_scalar_ser[EDDSA_448_PRIVATE_BYTES])
}
static c448_error_t hash_init_with_dom(OSSL_LIB_CTX *ctx, EVP_MD_CTX *hashctx,
- uint8_t prehashed,
- uint8_t for_prehash,
- const uint8_t *context,
- size_t context_len,
- const char *propq)
+ uint8_t prehashed,
+ uint8_t for_prehash,
+ const uint8_t *context,
+ size_t context_len,
+ const char *propq)
{
/* ASCII: "SigEd448", in hex for EBCDIC compatibility */
const char dom_s[] = "\x53\x69\x67\x45\x64\x34\x34\x38";
@@ -70,7 +70,7 @@ static c448_error_t hash_init_with_dom(OSSL_LIB_CTX *ctx, EVP_MD_CTX *hashctx,
return C448_FAILURE;
dom[0] = (uint8_t)(2 - (prehashed == 0 ? 1 : 0)
- - (for_prehash == 0 ? 1 : 0));
+ - (for_prehash == 0 ? 1 : 0));
dom[1] = (uint8_t)context_len;
shake256 = EVP_MD_fetch(ctx, "SHAKE256", propq);
@@ -78,9 +78,9 @@ static c448_error_t hash_init_with_dom(OSSL_LIB_CTX *ctx, EVP_MD_CTX *hashctx,
return C448_FAILURE;
if (!EVP_DigestInit_ex(hashctx, shake256, NULL)
- || !EVP_DigestUpdate(hashctx, dom_s, sizeof(dom_s)-1)
- || !EVP_DigestUpdate(hashctx, dom, sizeof(dom))
- || !EVP_DigestUpdate(hashctx, context, context_len)) {
+ || !EVP_DigestUpdate(hashctx, dom_s, sizeof(dom_s) - 1)
+ || !EVP_DigestUpdate(hashctx, dom, sizeof(dom))
+ || !EVP_DigestUpdate(hashctx, context, context_len)) {
EVP_MD_free(shake256);
return C448_FAILURE;
}
@@ -92,23 +92,23 @@ static c448_error_t hash_init_with_dom(OSSL_LIB_CTX *ctx, EVP_MD_CTX *hashctx,
/* In this file because it uses the hash */
c448_error_t
ossl_c448_ed448_convert_private_key_to_x448(
- OSSL_LIB_CTX *ctx,
- uint8_t x[X448_PRIVATE_BYTES],
- const uint8_t ed [EDDSA_448_PRIVATE_BYTES],
- const char *propq)
+ OSSL_LIB_CTX *ctx,
+ uint8_t x[X448_PRIVATE_BYTES],
+ const uint8_t ed[EDDSA_448_PRIVATE_BYTES],
+ const char *propq)
{
/* pass the private key through oneshot_hash function */
/* and keep the first X448_PRIVATE_BYTES bytes */
return oneshot_hash(ctx, x, X448_PRIVATE_BYTES, ed,
- EDDSA_448_PRIVATE_BYTES, propq);
+ EDDSA_448_PRIVATE_BYTES, propq);
}
c448_error_t
ossl_c448_ed448_derive_public_key(
- OSSL_LIB_CTX *ctx,
- uint8_t pubkey[EDDSA_448_PUBLIC_BYTES],
- const uint8_t privkey[EDDSA_448_PRIVATE_BYTES],
- const char *propq)
+ OSSL_LIB_CTX *ctx,
+ uint8_t pubkey[EDDSA_448_PUBLIC_BYTES],
+ const uint8_t privkey[EDDSA_448_PRIVATE_BYTES],
+ const char *propq)
{
/* only this much used for keygen */
uint8_t secret_scalar_ser[EDDSA_448_PRIVATE_BYTES];
@@ -117,15 +117,15 @@ ossl_c448_ed448_derive_public_key(
curve448_point_t p;
if (!oneshot_hash(ctx, secret_scalar_ser, sizeof(secret_scalar_ser),
- privkey,
- EDDSA_448_PRIVATE_BYTES,
- propq))
+ privkey,
+ EDDSA_448_PRIVATE_BYTES,
+ propq))
return C448_FAILURE;
clamp(secret_scalar_ser);
ossl_curve448_scalar_decode_long(secret_scalar, secret_scalar_ser,
- sizeof(secret_scalar_ser));
+ sizeof(secret_scalar_ser));
/*
* Since we are going to mul_by_cofactor during encoding, divide by it
@@ -139,7 +139,7 @@ ossl_c448_ed448_derive_public_key(
ossl_curve448_scalar_halve(secret_scalar, secret_scalar);
ossl_curve448_precomputed_scalarmul(p, ossl_curve448_precomputed_base,
- secret_scalar);
+ secret_scalar);
ossl_curve448_point_mul_by_ratio_and_encode_like_eddsa(pubkey, p);
@@ -153,12 +153,12 @@ ossl_c448_ed448_derive_public_key(
c448_error_t
ossl_c448_ed448_sign(OSSL_LIB_CTX *ctx,
- uint8_t signature[EDDSA_448_SIGNATURE_BYTES],
- const uint8_t privkey[EDDSA_448_PRIVATE_BYTES],
- const uint8_t pubkey[EDDSA_448_PUBLIC_BYTES],
- const uint8_t *message, size_t message_len,
- uint8_t prehashed, const uint8_t *context,
- size_t context_len, const char *propq)
+ uint8_t signature[EDDSA_448_SIGNATURE_BYTES],
+ const uint8_t privkey[EDDSA_448_PRIVATE_BYTES],
+ const uint8_t pubkey[EDDSA_448_PUBLIC_BYTES],
+ const uint8_t *message, size_t message_len,
+ uint8_t prehashed, const uint8_t *context,
+ size_t context_len, const char *propq)
{
curve448_scalar_t secret_scalar;
EVP_MD_CTX *hashctx = EVP_MD_CTX_new();
@@ -179,19 +179,19 @@ ossl_c448_ed448_sign(OSSL_LIB_CTX *ctx,
uint8_t expanded[EDDSA_448_PRIVATE_BYTES * 2];
if (!oneshot_hash(ctx, expanded, sizeof(expanded), privkey,
- EDDSA_448_PRIVATE_BYTES, propq))
+ EDDSA_448_PRIVATE_BYTES, propq))
goto err;
clamp(expanded);
ossl_curve448_scalar_decode_long(secret_scalar, expanded,
- EDDSA_448_PRIVATE_BYTES);
+ EDDSA_448_PRIVATE_BYTES);
/* Hash to create the nonce */
if (!hash_init_with_dom(ctx, hashctx, prehashed, 0, context,
- context_len, propq)
- || !EVP_DigestUpdate(hashctx,
- expanded + EDDSA_448_PRIVATE_BYTES,
- EDDSA_448_PRIVATE_BYTES)
- || !EVP_DigestUpdate(hashctx, message, message_len)) {
+ context_len, propq)
+ || !EVP_DigestUpdate(hashctx,
+ expanded + EDDSA_448_PRIVATE_BYTES,
+ EDDSA_448_PRIVATE_BYTES)
+ || !EVP_DigestUpdate(hashctx, message, message_len)) {
OPENSSL_cleanse(expanded, sizeof(expanded));
goto err;
}
@@ -218,7 +218,7 @@ ossl_c448_ed448_sign(OSSL_LIB_CTX *ctx,
ossl_curve448_scalar_halve(nonce_scalar_2, nonce_scalar_2);
ossl_curve448_precomputed_scalarmul(p, ossl_curve448_precomputed_base,
- nonce_scalar_2);
+ nonce_scalar_2);
ossl_curve448_point_mul_by_ratio_and_encode_like_eddsa(nonce_point, p);
ossl_curve448_point_destroy(p);
ossl_curve448_scalar_destroy(nonce_scalar_2);
@@ -229,15 +229,15 @@ ossl_c448_ed448_sign(OSSL_LIB_CTX *ctx,
/* Compute the challenge */
if (!hash_init_with_dom(ctx, hashctx, prehashed, 0, context, context_len,
- propq)
- || !EVP_DigestUpdate(hashctx, nonce_point, sizeof(nonce_point))
- || !EVP_DigestUpdate(hashctx, pubkey, EDDSA_448_PUBLIC_BYTES)
- || !EVP_DigestUpdate(hashctx, message, message_len)
- || !EVP_DigestFinalXOF(hashctx, challenge, sizeof(challenge)))
+ propq)
+ || !EVP_DigestUpdate(hashctx, nonce_point, sizeof(nonce_point))
+ || !EVP_DigestUpdate(hashctx, pubkey, EDDSA_448_PUBLIC_BYTES)
+ || !EVP_DigestUpdate(hashctx, message, message_len)
+ || !EVP_DigestFinalXOF(hashctx, challenge, sizeof(challenge)))
goto err;
ossl_curve448_scalar_decode_long(challenge_scalar, challenge,
- sizeof(challenge));
+ sizeof(challenge));
OPENSSL_cleanse(challenge, sizeof(challenge));
}
@@ -247,29 +247,29 @@ ossl_c448_ed448_sign(OSSL_LIB_CTX *ctx,
OPENSSL_cleanse(signature, EDDSA_448_SIGNATURE_BYTES);
memcpy(signature, nonce_point, sizeof(nonce_point));
ossl_curve448_scalar_encode(&signature[EDDSA_448_PUBLIC_BYTES],
- challenge_scalar);
+ challenge_scalar);
ossl_curve448_scalar_destroy(secret_scalar);
ossl_curve448_scalar_destroy(nonce_scalar);
ossl_curve448_scalar_destroy(challenge_scalar);
ret = C448_SUCCESS;
- err:
+err:
EVP_MD_CTX_free(hashctx);
return ret;
}
c448_error_t
ossl_c448_ed448_sign_prehash(
- OSSL_LIB_CTX *ctx,
- uint8_t signature[EDDSA_448_SIGNATURE_BYTES],
- const uint8_t privkey[EDDSA_448_PRIVATE_BYTES],
- const uint8_t pubkey[EDDSA_448_PUBLIC_BYTES],
- const uint8_t hash[64], const uint8_t *context,
- size_t context_len, const char *propq)
+ OSSL_LIB_CTX *ctx,
+ uint8_t signature[EDDSA_448_SIGNATURE_BYTES],
+ const uint8_t privkey[EDDSA_448_PRIVATE_BYTES],
+ const uint8_t pubkey[EDDSA_448_PUBLIC_BYTES],
+ const uint8_t hash[64], const uint8_t *context,
+ size_t context_len, const char *propq)
{
return ossl_c448_ed448_sign(ctx, signature, privkey, pubkey, hash, 64, 1,
- context, context_len, propq);
+ context, context_len, propq);
}
static c448_error_t
@@ -285,12 +285,12 @@ c448_ed448_pubkey_verify(const uint8_t *pub, size_t pub_len)
c448_error_t
ossl_c448_ed448_verify(
- OSSL_LIB_CTX *ctx,
- const uint8_t signature[EDDSA_448_SIGNATURE_BYTES],
- const uint8_t pubkey[EDDSA_448_PUBLIC_BYTES],
- const uint8_t *message, size_t message_len,
- uint8_t prehashed, const uint8_t *context,
- uint8_t context_len, const char *propq)
+ OSSL_LIB_CTX *ctx,
+ const uint8_t signature[EDDSA_448_SIGNATURE_BYTES],
+ const uint8_t pubkey[EDDSA_448_PUBLIC_BYTES],
+ const uint8_t *message, size_t message_len,
+ uint8_t prehashed, const uint8_t *context,
+ uint8_t context_len, const char *propq)
{
curve448_point_t pk_point, r_point;
c448_error_t error;
@@ -321,14 +321,12 @@ ossl_c448_ed448_verify(
if (i < 0)
return C448_FAILURE;
- error =
- ossl_curve448_point_decode_like_eddsa_and_mul_by_ratio(pk_point, pubkey);
+ error = ossl_curve448_point_decode_like_eddsa_and_mul_by_ratio(pk_point, pubkey);
if (C448_SUCCESS != error)
return error;
- error =
- ossl_curve448_point_decode_like_eddsa_and_mul_by_ratio(r_point, signature);
+ error = ossl_curve448_point_decode_like_eddsa_and_mul_by_ratio(r_point, signature);
if (C448_SUCCESS != error)
return error;
@@ -338,57 +336,57 @@ ossl_c448_ed448_verify(
uint8_t challenge[2 * EDDSA_448_PRIVATE_BYTES];
if (hashctx == NULL
- || !hash_init_with_dom(ctx, hashctx, prehashed, 0, context,
- context_len, propq)
- || !EVP_DigestUpdate(hashctx, signature, EDDSA_448_PUBLIC_BYTES)
- || !EVP_DigestUpdate(hashctx, pubkey, EDDSA_448_PUBLIC_BYTES)
- || !EVP_DigestUpdate(hashctx, message, message_len)
- || !EVP_DigestFinalXOF(hashctx, challenge, sizeof(challenge))) {
+ || !hash_init_with_dom(ctx, hashctx, prehashed, 0, context,
+ context_len, propq)
+ || !EVP_DigestUpdate(hashctx, signature, EDDSA_448_PUBLIC_BYTES)
+ || !EVP_DigestUpdate(hashctx, pubkey, EDDSA_448_PUBLIC_BYTES)
+ || !EVP_DigestUpdate(hashctx, message, message_len)
+ || !EVP_DigestFinalXOF(hashctx, challenge, sizeof(challenge))) {
EVP_MD_CTX_free(hashctx);
return C448_FAILURE;
}
EVP_MD_CTX_free(hashctx);
ossl_curve448_scalar_decode_long(challenge_scalar, challenge,
- sizeof(challenge));
+ sizeof(challenge));
OPENSSL_cleanse(challenge, sizeof(challenge));
}
ossl_curve448_scalar_sub(challenge_scalar, ossl_curve448_scalar_zero,
- challenge_scalar);
+ challenge_scalar);
ossl_curve448_scalar_decode_long(response_scalar,
- &signature[EDDSA_448_PUBLIC_BYTES],
- EDDSA_448_PRIVATE_BYTES);
+ &signature[EDDSA_448_PUBLIC_BYTES],
+ EDDSA_448_PRIVATE_BYTES);
/* pk_point = -c(x(P)) + (cx + k)G = kG */
ossl_curve448_base_double_scalarmul_non_secret(pk_point,
- response_scalar,
- pk_point, challenge_scalar);
+ response_scalar,
+ pk_point, challenge_scalar);
return c448_succeed_if(ossl_curve448_point_eq(pk_point, r_point));
}
c448_error_t
ossl_c448_ed448_verify_prehash(
- OSSL_LIB_CTX *ctx,
- const uint8_t signature[EDDSA_448_SIGNATURE_BYTES],
- const uint8_t pubkey[EDDSA_448_PUBLIC_BYTES],
- const uint8_t hash[64], const uint8_t *context,
- uint8_t context_len, const char *propq)
+ OSSL_LIB_CTX *ctx,
+ const uint8_t signature[EDDSA_448_SIGNATURE_BYTES],
+ const uint8_t pubkey[EDDSA_448_PUBLIC_BYTES],
+ const uint8_t hash[64], const uint8_t *context,
+ uint8_t context_len, const char *propq)
{
return ossl_c448_ed448_verify(ctx, signature, pubkey, hash, 64, 1, context,
- context_len, propq);
+ context_len, propq);
}
-int
-ossl_ed448_sign(OSSL_LIB_CTX *ctx, uint8_t *out_sig,
- const uint8_t *message, size_t message_len,
- const uint8_t public_key[57], const uint8_t private_key[57],
- const uint8_t *context, size_t context_len,
- const uint8_t phflag, const char *propq)
+int ossl_ed448_sign(OSSL_LIB_CTX *ctx, uint8_t *out_sig,
+ const uint8_t *message, size_t message_len,
+ const uint8_t public_key[57], const uint8_t private_key[57],
+ const uint8_t *context, size_t context_len,
+ const uint8_t phflag, const char *propq)
{
return ossl_c448_ed448_sign(ctx, out_sig, private_key, public_key, message,
- message_len, phflag, context, context_len,
- propq) == C448_SUCCESS;
+ message_len, phflag, context, context_len,
+ propq)
+ == C448_SUCCESS;
}
/*
@@ -396,28 +394,27 @@ ossl_ed448_sign(OSSL_LIB_CTX *ctx, uint8_t *out_sig,
* does this check internally.
* For some reason the FIPS ACVP requires a EDDSA KeyVer test.
*/
-int
-ossl_ed448_pubkey_verify(const uint8_t *pub, size_t pub_len)
+int ossl_ed448_pubkey_verify(const uint8_t *pub, size_t pub_len)
{
return c448_ed448_pubkey_verify(pub, pub_len);
}
-int
-ossl_ed448_verify(OSSL_LIB_CTX *ctx,
- const uint8_t *message, size_t message_len,
- const uint8_t signature[114], const uint8_t public_key[57],
- const uint8_t *context, size_t context_len,
- const uint8_t phflag, const char *propq)
+int ossl_ed448_verify(OSSL_LIB_CTX *ctx,
+ const uint8_t *message, size_t message_len,
+ const uint8_t signature[114], const uint8_t public_key[57],
+ const uint8_t *context, size_t context_len,
+ const uint8_t phflag, const char *propq)
{
return ossl_c448_ed448_verify(ctx, signature, public_key, message,
- message_len, phflag, context, (uint8_t)context_len,
- propq) == C448_SUCCESS;
+ message_len, phflag, context, (uint8_t)context_len,
+ propq)
+ == C448_SUCCESS;
}
-int
-ossl_ed448_public_from_private(OSSL_LIB_CTX *ctx, uint8_t out_public_key[57],
- const uint8_t private_key[57], const char *propq)
+int ossl_ed448_public_from_private(OSSL_LIB_CTX *ctx, uint8_t out_public_key[57],
+ const uint8_t private_key[57], const char *propq)
{
return ossl_c448_ed448_derive_public_key(ctx, out_public_key, private_key,
- propq) == C448_SUCCESS;
+ propq)
+ == C448_SUCCESS;
}
diff --git a/crypto/ec/curve448/f_generic.c b/crypto/ec/curve448/f_generic.c
index 9a4675a8b3..ad605b65e8 100644
--- a/crypto/ec/curve448/f_generic.c
+++ b/crypto/ec/curve448/f_generic.c
@@ -13,8 +13,8 @@
static const gf MODULUS = {
FIELD_LITERAL(0xffffffffffffffULL, 0xffffffffffffffULL, 0xffffffffffffffULL,
- 0xffffffffffffffULL, 0xfffffffffffffeULL, 0xffffffffffffffULL,
- 0xffffffffffffffULL, 0xffffffffffffffULL)
+ 0xffffffffffffffULL, 0xfffffffffffffeULL, 0xffffffffffffffULL,
+ 0xffffffffffffffULL, 0xffffffffffffffULL)
};
/* Serialize to wire format. */
@@ -32,7 +32,7 @@ void gf_serialize(uint8_t serial[SER_BYTES], const gf x, int with_hibit)
for (i = 0; i < (with_hibit ? X_SER_BYTES : SER_BYTES); i++) {
if (fill < 8 && j < NLIMBS) {
- buffer |= ((dword_t) red->limb[LIMBPERM(j)]) << fill;
+ buffer |= ((dword_t)red->limb[LIMBPERM(j)]) << fill;
fill += LIMB_PLACE_VALUE(LIMBPERM(j));
j++;
}
@@ -64,7 +64,7 @@ mask_t gf_lobit(const gf x)
/* Deserialize from wire format; return -1 on success and 0 on failure. */
mask_t gf_deserialize(gf x, const uint8_t serial[SER_BYTES], int with_hibit,
- uint8_t hi_nmask)
+ uint8_t hi_nmask)
{
unsigned int j = 0, fill = 0;
dword_t buffer = 0;
@@ -80,19 +80,16 @@ mask_t gf_deserialize(gf x, const uint8_t serial[SER_BYTES], int with_hibit,
sj = serial[j];
if (j == nbytes - 1)
sj &= ~hi_nmask;
- buffer |= ((dword_t) sj) << fill;
+ buffer |= ((dword_t)sj) << fill;
fill += 8;
j++;
}
- x->limb[LIMBPERM(i)] = (word_t)
- ((i < NLIMBS - 1) ? buffer & LIMB_MASK(LIMBPERM(i)) : buffer);
+ x->limb[LIMBPERM(i)] = (word_t)((i < NLIMBS - 1) ? buffer & LIMB_MASK(LIMBPERM(i)) : buffer);
fill -= LIMB_PLACE_VALUE(LIMBPERM(i));
buffer >>= LIMB_PLACE_VALUE(LIMBPERM(i));
- scarry =
- (scarry + x->limb[LIMBPERM(i)] -
- MODULUS->limb[LIMBPERM(i)]) >> (8 * sizeof(word_t));
+ scarry = (scarry + x->limb[LIMBPERM(i)] - MODULUS->limb[LIMBPERM(i)]) >> (8 * sizeof(word_t));
}
- succ = with_hibit ? 0 - (mask_t) 1 : ~gf_hibit(x);
+ succ = with_hibit ? 0 - (mask_t)1 : ~gf_hibit(x);
return succ & word_is_zero((word_t)buffer) & ~word_is_zero((word_t)scarry);
}
@@ -105,7 +102,7 @@ void gf_strong_reduce(gf a)
unsigned int i;
/* first, clear high */
- gf_weak_reduce(a); /* Determined to have negligible perf impact. */
+ gf_weak_reduce(a); /* Determined to have negligible perf impact. */
/* now the total is less than 2p */
@@ -128,9 +125,7 @@ void gf_strong_reduce(gf a)
/* add it back */
for (i = 0; i < NLIMBS; i++) {
- carry =
- carry + a->limb[LIMBPERM(i)] +
- (scarry_0 & MODULUS->limb[LIMBPERM(i)]);
+ carry = carry + a->limb[LIMBPERM(i)] + (scarry_0 & MODULUS->limb[LIMBPERM(i)]);
a->limb[LIMBPERM(i)] = carry & LIMB_MASK(LIMBPERM(i));
carry >>= LIMB_PLACE_VALUE(LIMBPERM(i));
}
diff --git a/crypto/ec/curve448/field.h b/crypto/ec/curve448/field.h
index 80b1355b77..5de942f042 100644
--- a/crypto/ec/curve448/field.h
+++ b/crypto/ec/curve448/field.h
@@ -11,35 +11,35 @@
*/
#ifndef OSSL_CRYPTO_EC_CURVE448_FIELD_H
-# define OSSL_CRYPTO_EC_CURVE448_FIELD_H
-
-# include "internal/constant_time.h"
-# include <string.h>
-# include <assert.h>
-# include "word.h"
-
-# define NLIMBS (64/sizeof(word_t))
-# define X_SER_BYTES 56
-# define SER_BYTES 56
-
-# if defined(__GNUC__) || defined(__clang__)
-# define INLINE_UNUSED __inline__ __attribute__((__unused__,__always_inline__))
-# define RESTRICT __restrict__
-# define ALIGNED __attribute__((__aligned__(16)))
-# else
-# define INLINE_UNUSED ossl_inline
-# define RESTRICT
-# define ALIGNED
-# endif
+#define OSSL_CRYPTO_EC_CURVE448_FIELD_H
+
+#include "internal/constant_time.h"
+#include <string.h>
+#include <assert.h>
+#include "word.h"
+
+#define NLIMBS (64 / sizeof(word_t))
+#define X_SER_BYTES 56
+#define SER_BYTES 56
+
+#if defined(__GNUC__) || defined(__clang__)
+#define INLINE_UNUSED __inline__ __attribute__((__unused__, __always_inline__))
+#define RESTRICT __restrict__
+#define ALIGNED __attribute__((__aligned__(16)))
+#else
+#define INLINE_UNUSED ossl_inline
+#define RESTRICT
+#define ALIGNED
+#endif
typedef struct gf_s {
word_t limb[NLIMBS];
} ALIGNED gf_s, gf[1];
/* RFC 7748 support */
-# define X_PUBLIC_BYTES X_SER_BYTES
-# define X_PRIVATE_BYTES X_PUBLIC_BYTES
-# define X_PRIVATE_BITS 448
+#define X_PUBLIC_BYTES X_SER_BYTES
+#define X_PRIVATE_BYTES X_PUBLIC_BYTES
+#define X_PRIVATE_BITS 448
static INLINE_UNUSED void gf_copy(gf out, const gf a)
{
@@ -54,9 +54,9 @@ static INLINE_UNUSED void gf_weak_reduce(gf inout);
void gf_strong_reduce(gf inout);
void gf_add(gf out, const gf a, const gf b);
void gf_sub(gf out, const gf a, const gf b);
-void ossl_gf_mul(gf_s * RESTRICT out, const gf a, const gf b);
-void ossl_gf_mulw_unsigned(gf_s * RESTRICT out, const gf a, uint32_t b);
-void ossl_gf_sqr(gf_s * RESTRICT out, const gf a);
+void ossl_gf_mul(gf_s *RESTRICT out, const gf a, const gf b);
+void ossl_gf_mulw_unsigned(gf_s *RESTRICT out, const gf a, uint32_t b);
+void ossl_gf_sqr(gf_s *RESTRICT out, const gf a);
mask_t gf_isr(gf a, const gf x); /** a^2 x = 1, QNR, or 0 if x=0. Return true if successful */
mask_t gf_eq(const gf x, const gf y);
mask_t gf_lobit(const gf x);
@@ -64,22 +64,21 @@ mask_t gf_hibit(const gf x);
void gf_serialize(uint8_t serial[SER_BYTES], const gf x, int with_highbit);
mask_t gf_deserialize(gf x, const uint8_t serial[SER_BYTES], int with_hibit,
- uint8_t hi_nmask);
-
-
-# define LIMBPERM(i) (i)
-# if (ARCH_WORD_BITS == 32)
-# include "arch_32/f_impl.h" /* Bring in the inline implementations */
-# define LIMB_MASK(i) (((1)<<LIMB_PLACE_VALUE(i))-1)
-# elif (ARCH_WORD_BITS == 64)
-# include "arch_64/f_impl.h" /* Bring in the inline implementations */
-# define LIMB_MASK(i) (((1ULL)<<LIMB_PLACE_VALUE(i))-1)
-# endif
+ uint8_t hi_nmask);
+
+#define LIMBPERM(i) (i)
+#if (ARCH_WORD_BITS == 32)
+#include "arch_32/f_impl.h" /* Bring in the inline implementations */
+#define LIMB_MASK(i) (((1) << LIMB_PLACE_VALUE(i)) - 1)
+#elif (ARCH_WORD_BITS == 64)
+#include "arch_64/f_impl.h" /* Bring in the inline implementations */
+#define LIMB_MASK(i) (((1ULL) << LIMB_PLACE_VALUE(i)) - 1)
+#endif
-static const gf ZERO = {{{0}}}, ONE = {{{1}}};
+static const gf ZERO = { { { 0 } } }, ONE = { { { 1 } } };
/* Square x, n times. */
-static ossl_inline void gf_sqrn(gf_s * RESTRICT y, const gf x, int n)
+static ossl_inline void gf_sqrn(gf_s *RESTRICT y, const gf x, int n)
{
gf tmp;
@@ -98,7 +97,7 @@ static ossl_inline void gf_sqrn(gf_s * RESTRICT y, const gf x, int n)
}
}
-# define gf_add_nr gf_add_RAW
+#define gf_add_nr gf_add_RAW
/* Subtract mod p. Bias by 2 and don't reduce */
static ossl_inline void gf_sub_nr(gf c, const gf a, const gf b)
@@ -137,11 +136,11 @@ static ossl_inline void gf_cond_sel(gf x, const gf y, const gf z, mask_t is_z)
for (i = 0; i < NLIMBS; i++) {
#if ARCH_WORD_BITS == 32
x[0].limb[i] = constant_time_select_32(is_z, z[0].limb[i],
- y[0].limb[i]);
+ y[0].limb[i]);
#else
/* Must be 64 bit */
x[0].limb[i] = constant_time_select_64(is_z, z[0].limb[i],
- y[0].limb[i]);
+ y[0].limb[i]);
#endif
}
}
@@ -156,7 +155,7 @@ static ossl_inline void gf_cond_neg(gf x, mask_t neg)
}
/* Constant time, if (swap) (x,y) = (y,x); */
-static ossl_inline void gf_cond_swap(gf x, gf_s * RESTRICT y, mask_t swap)
+static ossl_inline void gf_cond_swap(gf x, gf_s *RESTRICT y, mask_t swap)
{
size_t i;
@@ -170,4 +169,4 @@ static ossl_inline void gf_cond_swap(gf x, gf_s * RESTRICT y, mask_t swap)
}
}
-#endif /* OSSL_CRYPTO_EC_CURVE448_FIELD_H */
+#endif /* OSSL_CRYPTO_EC_CURVE448_FIELD_H */
diff --git a/crypto/ec/curve448/point_448.h b/crypto/ec/curve448/point_448.h
index 96a54558d6..5e98d2f3d9 100644
--- a/crypto/ec/curve448/point_448.h
+++ b/crypto/ec/curve448/point_448.h
@@ -11,10 +11,10 @@
*/
#ifndef OSSL_CRYPTO_EC_CURVE448_POINT_448_H
-# define OSSL_CRYPTO_EC_CURVE448_POINT_448_H
+#define OSSL_CRYPTO_EC_CURVE448_POINT_448_H
-# include "curve448utils.h"
-# include "field.h"
+#include "curve448utils.h"
+#include "field.h"
/* Comb config: number of combs, n, t, s. */
#define COMBS_N 5
@@ -35,22 +35,22 @@ struct curve448_precomputed_s {
niels_t table[COMBS_N << (COMBS_T - 1)];
};
-# define C448_SCALAR_LIMBS ((446-1)/C448_WORD_BITS+1)
+#define C448_SCALAR_LIMBS ((446 - 1) / C448_WORD_BITS + 1)
/* The number of bits in a scalar */
-# define C448_SCALAR_BITS 446
+#define C448_SCALAR_BITS 446
/* Number of bytes in a serialized scalar. */
-# define C448_SCALAR_BYTES 56
+#define C448_SCALAR_BYTES 56
/* X448 encoding ratio. */
-# define X448_ENCODE_RATIO 2
+#define X448_ENCODE_RATIO 2
/* Number of bytes in an x448 public key */
-# define X448_PUBLIC_BYTES 56
+#define X448_PUBLIC_BYTES 56
/* Number of bytes in an x448 private key */
-# define X448_PRIVATE_BYTES 56
+#define X448_PRIVATE_BYTES 56
/* Twisted Edwards extended homogeneous coordinates */
typedef struct curve448_point_s {
@@ -94,7 +94,7 @@ extern const niels_t *ossl_curve448_wnaf_base;
*/
c448_error_t
ossl_curve448_scalar_decode(curve448_scalar_t out,
- const unsigned char ser[C448_SCALAR_BYTES]);
+ const unsigned char ser[C448_SCALAR_BYTES]);
/*
* Read a scalar from wire format or from bytes. Reduces mod scalar prime.
@@ -103,9 +103,8 @@ ossl_curve448_scalar_decode(curve448_scalar_t out,
* ser_len (in): Length of serialized form.
* out (out): Deserialized form.
*/
-void
-ossl_curve448_scalar_decode_long(curve448_scalar_t out,
- const unsigned char *ser, size_t ser_len);
+void ossl_curve448_scalar_decode_long(curve448_scalar_t out,
+ const unsigned char *ser, size_t ser_len);
/*
* Serialize a scalar to wire format.
@@ -113,9 +112,8 @@ ossl_curve448_scalar_decode_long(curve448_scalar_t out,
* ser (out): Serialized form of a scalar.
* s (in): Deserialized scalar.
*/
-void
-ossl_curve448_scalar_encode(unsigned char ser[C448_SCALAR_BYTES],
- const curve448_scalar_t s);
+void ossl_curve448_scalar_encode(unsigned char ser[C448_SCALAR_BYTES],
+ const curve448_scalar_t s);
/*
* Add two scalars. |a|, |b| and |out| may alias each other.
@@ -124,9 +122,8 @@ ossl_curve448_scalar_encode(unsigned char ser[C448_SCALAR_BYTES],
* b (in): Another scalar.
* out (out): a+b.
*/
-void
-ossl_curve448_scalar_add(curve448_scalar_t out,
- const curve448_scalar_t a, const curve448_scalar_t b);
+void ossl_curve448_scalar_add(curve448_scalar_t out,
+ const curve448_scalar_t a, const curve448_scalar_t b);
/*
* Subtract two scalars. |a|, |b| and |out| may alias each other.
@@ -134,9 +131,8 @@ ossl_curve448_scalar_add(curve448_scalar_t out,
* b (in): Another scalar.
* out (out): a-b.
*/
-void
-ossl_curve448_scalar_sub(curve448_scalar_t out,
- const curve448_scalar_t a, const curve448_scalar_t b);
+void ossl_curve448_scalar_sub(curve448_scalar_t out,
+ const curve448_scalar_t a, const curve448_scalar_t b);
/*
* Multiply two scalars. |a|, |b| and |out| may alias each other.
@@ -145,18 +141,16 @@ ossl_curve448_scalar_sub(curve448_scalar_t out,
* b (in): Another scalar.
* out (out): a*b.
*/
-void
-ossl_curve448_scalar_mul(curve448_scalar_t out,
- const curve448_scalar_t a, const curve448_scalar_t b);
+void ossl_curve448_scalar_mul(curve448_scalar_t out,
+ const curve448_scalar_t a, const curve448_scalar_t b);
/*
-* Halve a scalar. |a| and |out| may alias each other.
-*
-* a (in): A scalar.
-* out (out): a/2.
-*/
-void
-ossl_curve448_scalar_halve(curve448_scalar_t out, const curve448_scalar_t a);
+ * Halve a scalar. |a| and |out| may alias each other.
+ *
+ * a (in): A scalar.
+ * out (out): a/2.
+ */
+void ossl_curve448_scalar_halve(curve448_scalar_t out, const curve448_scalar_t a);
/*
* Copy a scalar. The scalars may alias each other, in which case this
@@ -166,7 +160,7 @@ ossl_curve448_scalar_halve(curve448_scalar_t out, const curve448_scalar_t a);
* out (out): Will become a copy of a.
*/
static ossl_inline void curve448_scalar_copy(curve448_scalar_t out,
- const curve448_scalar_t a)
+ const curve448_scalar_t a)
{
*out = *a;
}
@@ -179,7 +173,7 @@ static ossl_inline void curve448_scalar_copy(curve448_scalar_t out,
* b (in): Any point.
*/
static ossl_inline void curve448_point_copy(curve448_point_t a,
- const curve448_point_t b)
+ const curve448_point_t b)
{
*a = *b;
}
@@ -197,7 +191,7 @@ static ossl_inline void curve448_point_copy(curve448_point_t a,
*/
__owur c448_bool_t
ossl_curve448_point_eq(const curve448_point_t a,
- const curve448_point_t b);
+ const curve448_point_t b);
/*
* Double a point. Equivalent to curve448_point_add(two_a,a,a), but potentially
@@ -206,8 +200,7 @@ ossl_curve448_point_eq(const curve448_point_t a,
* two_a (out): The sum a+a.
* a (in): A point.
*/
-void
-ossl_curve448_point_double(curve448_point_t two_a, const curve448_point_t a);
+void ossl_curve448_point_double(curve448_point_t two_a, const curve448_point_t a);
/*
* RFC 7748 Diffie-Hellman scalarmul. This function uses a different
@@ -224,8 +217,8 @@ ossl_curve448_point_double(curve448_point_t two_a, const curve448_point_t a);
*/
__owur c448_error_t
ossl_x448_int(uint8_t out[X448_PUBLIC_BYTES],
- const uint8_t base[X448_PUBLIC_BYTES],
- const uint8_t scalar[X448_PRIVATE_BYTES]);
+ const uint8_t base[X448_PUBLIC_BYTES],
+ const uint8_t scalar[X448_PRIVATE_BYTES]);
/*
* Multiply a point by X448_ENCODE_RATIO, then encode it like RFC 7748.
@@ -246,10 +239,9 @@ ossl_x448_int(uint8_t out[X448_PUBLIC_BYTES],
* out (out): The scaled and encoded point.
* p (in): The point to be scaled and encoded.
*/
-void
-ossl_curve448_point_mul_by_ratio_and_encode_like_x448(
- uint8_t out[X448_PUBLIC_BYTES],
- const curve448_point_t p);
+void ossl_curve448_point_mul_by_ratio_and_encode_like_x448(
+ uint8_t out[X448_PUBLIC_BYTES],
+ const curve448_point_t p);
/*
* RFC 7748 Diffie-Hellman base point scalarmul. This function uses a different
@@ -258,9 +250,8 @@ ossl_curve448_point_mul_by_ratio_and_encode_like_x448(
* out (out): The scaled point base*scalar
* scalar (in): The scalar to multiply by.
*/
-void
-ossl_x448_derive_public_key(uint8_t out[X448_PUBLIC_BYTES],
- const uint8_t scalar[X448_PRIVATE_BYTES]);
+void ossl_x448_derive_public_key(uint8_t out[X448_PUBLIC_BYTES],
+ const uint8_t scalar[X448_PRIVATE_BYTES]);
/*
* Multiply a precomputed base point by a scalar: out = scalar*base.
@@ -269,10 +260,9 @@ ossl_x448_derive_public_key(uint8_t out[X448_PUBLIC_BYTES],
* base (in): The point to be scaled.
* scalar (in): The scalar to multiply by.
*/
-void
-ossl_curve448_precomputed_scalarmul(curve448_point_t scaled,
- const curve448_precomputed_s *base,
- const curve448_scalar_t scalar);
+void ossl_curve448_precomputed_scalarmul(curve448_point_t scaled,
+ const curve448_precomputed_s *base,
+ const curve448_scalar_t scalar);
/*
* Multiply two base points by two scalars:
@@ -289,11 +279,10 @@ ossl_curve448_precomputed_scalarmul(curve448_point_t scaled,
* Warning: This function takes variable time, and may leak the scalars used.
* It is designed for signature verification.
*/
-void
-ossl_curve448_base_double_scalarmul_non_secret(curve448_point_t combo,
- const curve448_scalar_t scalar1,
- const curve448_point_t base2,
- const curve448_scalar_t scalar2);
+void ossl_curve448_base_double_scalarmul_non_secret(curve448_point_t combo,
+ const curve448_scalar_t scalar1,
+ const curve448_point_t base2,
+ const curve448_scalar_t scalar2);
/*
* Test that a point is valid, for debugging purposes.
@@ -313,4 +302,4 @@ void ossl_curve448_scalar_destroy(curve448_scalar_t scalar);
/* Overwrite point with zeros. */
void ossl_curve448_point_destroy(curve448_point_t point);
-#endif /* OSSL_CRYPTO_EC_CURVE448_POINT_448_H */
+#endif /* OSSL_CRYPTO_EC_CURVE448_POINT_448_H */
diff --git a/crypto/ec/curve448/scalar.c b/crypto/ec/curve448/scalar.c
index 99c0d83db1..191b0b4fd2 100644
--- a/crypto/ec/curve448/scalar.c
+++ b/crypto/ec/curve448/scalar.c
@@ -14,41 +14,30 @@
#include "word.h"
#include "point_448.h"
-static const c448_word_t MONTGOMERY_FACTOR = (c448_word_t) 0x3bd440fae918bc5ULL;
+static const c448_word_t MONTGOMERY_FACTOR = (c448_word_t)0x3bd440fae918bc5ULL;
static const curve448_scalar_t sc_p = {
- {
- {
- SC_LIMB(0x2378c292ab5844f3ULL), SC_LIMB(0x216cc2728dc58f55ULL),
- SC_LIMB(0xc44edb49aed63690ULL), SC_LIMB(0xffffffff7cca23e9ULL),
- SC_LIMB(0xffffffffffffffffULL), SC_LIMB(0xffffffffffffffffULL),
- SC_LIMB(0x3fffffffffffffffULL)
- }
- }
-}, sc_r2 = {
- {
- {
-
- SC_LIMB(0xe3539257049b9b60ULL), SC_LIMB(0x7af32c4bc1b195d9ULL),
- SC_LIMB(0x0d66de2388ea1859ULL), SC_LIMB(0xae17cf725ee4d838ULL),
- SC_LIMB(0x1a9cc14ba3c47c44ULL), SC_LIMB(0x2052bcb7e4d070afULL),
- SC_LIMB(0x3402a939f823b729ULL)
- }
- }
-};
+ { { SC_LIMB(0x2378c292ab5844f3ULL), SC_LIMB(0x216cc2728dc58f55ULL),
+ SC_LIMB(0xc44edb49aed63690ULL), SC_LIMB(0xffffffff7cca23e9ULL),
+ SC_LIMB(0xffffffffffffffffULL), SC_LIMB(0xffffffffffffffffULL),
+ SC_LIMB(0x3fffffffffffffffULL) } }
+},
+ sc_r2 = { { {
+
+ SC_LIMB(0xe3539257049b9b60ULL), SC_LIMB(0x7af32c4bc1b195d9ULL), SC_LIMB(0x0d66de2388ea1859ULL), SC_LIMB(0xae17cf725ee4d838ULL), SC_LIMB(0x1a9cc14ba3c47c44ULL), SC_LIMB(0x2052bcb7e4d070afULL), SC_LIMB(0x3402a939f823b729ULL) } } };
-#define WBITS C448_WORD_BITS /* NB this may be different from ARCH_WORD_BITS */
+#define WBITS C448_WORD_BITS /* NB this may be different from ARCH_WORD_BITS */
-const curve448_scalar_t ossl_curve448_scalar_one = {{{1}}};
-const curve448_scalar_t ossl_curve448_scalar_zero = {{{0}}};
+const curve448_scalar_t ossl_curve448_scalar_one = { { { 1 } } };
+const curve448_scalar_t ossl_curve448_scalar_zero = { { { 0 } } };
/*
* {extra,accum} - sub +? p
* Must have extra <= 1
*/
static void sc_subx(curve448_scalar_t out,
- const c448_word_t accum[C448_SCALAR_LIMBS],
- const curve448_scalar_t sub,
- const curve448_scalar_t p, c448_word_t extra)
+ const c448_word_t accum[C448_SCALAR_LIMBS],
+ const curve448_scalar_t sub,
+ const curve448_scalar_t p, c448_word_t extra)
{
c448_dsword_t chain = 0;
unsigned int i;
@@ -59,7 +48,7 @@ static void sc_subx(curve448_scalar_t out,
out->limb[i] = (c448_word_t)chain;
chain >>= WBITS;
}
- borrow = (c448_word_t)chain + extra; /* = 0 or -1 */
+ borrow = (c448_word_t)chain + extra; /* = 0 or -1 */
chain = 0;
for (i = 0; i < C448_SCALAR_LIMBS; i++) {
@@ -70,7 +59,7 @@ static void sc_subx(curve448_scalar_t out,
}
static void sc_montmul(curve448_scalar_t out, const curve448_scalar_t a,
- const curve448_scalar_t b)
+ const curve448_scalar_t b)
{
unsigned int i, j;
c448_word_t accum[C448_SCALAR_LIMBS + 1] = { 0 };
@@ -82,7 +71,7 @@ static void sc_montmul(curve448_scalar_t out, const curve448_scalar_t a,
c448_dword_t chain = 0;
for (j = 0; j < C448_SCALAR_LIMBS; j++) {
- chain += ((c448_dword_t) mand) * mier[j] + accum[j];
+ chain += ((c448_dword_t)mand) * mier[j] + accum[j];
accum[j] = (c448_word_t)chain;
chain >>= WBITS;
}
@@ -92,7 +81,7 @@ static void sc_montmul(curve448_scalar_t out, const curve448_scalar_t a,
chain = 0;
mier = sc_p->limb;
for (j = 0; j < C448_SCALAR_LIMBS; j++) {
- chain += (c448_dword_t) mand *mier[j] + accum[j];
+ chain += (c448_dword_t)mand * mier[j] + accum[j];
if (j)
accum[j - 1] = (c448_word_t)chain;
chain >>= WBITS;
@@ -107,22 +96,20 @@ static void sc_montmul(curve448_scalar_t out, const curve448_scalar_t a,
}
void ossl_curve448_scalar_mul(curve448_scalar_t out, const curve448_scalar_t a,
- const curve448_scalar_t b)
+ const curve448_scalar_t b)
{
sc_montmul(out, a, b);
sc_montmul(out, out, sc_r2);
}
-void
-ossl_curve448_scalar_sub(curve448_scalar_t out, const curve448_scalar_t a,
- const curve448_scalar_t b)
+void ossl_curve448_scalar_sub(curve448_scalar_t out, const curve448_scalar_t a,
+ const curve448_scalar_t b)
{
sc_subx(out, a->limb, b, sc_p, 0);
}
-void
-ossl_curve448_scalar_add(curve448_scalar_t out, const curve448_scalar_t a,
- const curve448_scalar_t b)
+void ossl_curve448_scalar_add(curve448_scalar_t out, const curve448_scalar_t a,
+ const curve448_scalar_t b)
{
c448_dword_t chain = 0;
unsigned int i;
@@ -136,8 +123,8 @@ ossl_curve448_scalar_add(curve448_scalar_t out, const curve448_scalar_t a,
}
static ossl_inline void scalar_decode_short(curve448_scalar_t s,
- const unsigned char *ser,
- size_t nbytes)
+ const unsigned char *ser,
+ size_t nbytes)
{
size_t i, j, k = 0;
@@ -145,14 +132,14 @@ static ossl_inline void scalar_decode_short(curve448_scalar_t s,
c448_word_t out = 0;
for (j = 0; j < sizeof(c448_word_t) && k < nbytes; j++, k++)
- out |= ((c448_word_t) ser[k]) << (8 * j);
+ out |= ((c448_word_t)ser[k]) << (8 * j);
s->limb[i] = out;
}
}
c448_error_t
ossl_curve448_scalar_decode(curve448_scalar_t s,
- const unsigned char ser[C448_SCALAR_BYTES])
+ const unsigned char ser[C448_SCALAR_BYTES])
{
unsigned int i;
c448_dsword_t accum = 0;
@@ -172,9 +159,8 @@ void ossl_curve448_scalar_destroy(curve448_scalar_t scalar)
OPENSSL_cleanse(scalar, sizeof(curve448_scalar_t));
}
-void
-ossl_curve448_scalar_decode_long(curve448_scalar_t s,
- const unsigned char *ser, size_t ser_len)
+void ossl_curve448_scalar_decode_long(curve448_scalar_t s,
+ const unsigned char *ser, size_t ser_len)
{
size_t i;
curve448_scalar_t t1, t2;
@@ -210,9 +196,8 @@ ossl_curve448_scalar_decode_long(curve448_scalar_t s,
ossl_curve448_scalar_destroy(t2);
}
-void
-ossl_curve448_scalar_encode(unsigned char ser[C448_SCALAR_BYTES],
- const curve448_scalar_t s)
+void ossl_curve448_scalar_encode(unsigned char ser[C448_SCALAR_BYTES],
+ const curve448_scalar_t s)
{
unsigned int i, j, k = 0;
@@ -222,8 +207,7 @@ ossl_curve448_scalar_encode(unsigned char ser[C448_SCALAR_BYTES],
}
}
-void
-ossl_curve448_scalar_halve(curve448_scalar_t out, const curve448_scalar_t a)
+void ossl_curve448_scalar_halve(curve448_scalar_t out, const curve448_scalar_t a)
{
c448_word_t mask = 0 - (a->limb[0] & 1);
c448_dword_t chain = 0;
diff --git a/crypto/ec/curve448/word.h b/crypto/ec/curve448/word.h
index f8292eef88..8137be6abb 100644
--- a/crypto/ec/curve448/word.h
+++ b/crypto/ec/curve448/word.h
@@ -11,47 +11,47 @@
*/
#ifndef OSSL_CRYPTO_EC_CURVE448_WORD_H
-# define OSSL_CRYPTO_EC_CURVE448_WORD_H
+#define OSSL_CRYPTO_EC_CURVE448_WORD_H
-# include <string.h>
-# include <assert.h>
-# include <stdlib.h>
-# include <openssl/e_os2.h>
-# include "curve448utils.h"
+#include <string.h>
+#include <assert.h>
+#include <stdlib.h>
+#include <openssl/e_os2.h>
+#include "curve448utils.h"
-# ifdef INT128_MAX
-# include "arch_64/arch_intrinsics.h"
-# else
-# include "arch_32/arch_intrinsics.h"
-# endif
+#ifdef INT128_MAX
+#include "arch_64/arch_intrinsics.h"
+#else
+#include "arch_32/arch_intrinsics.h"
+#endif
-# if (ARCH_WORD_BITS == 64)
+#if (ARCH_WORD_BITS == 64)
typedef uint64_t word_t, mask_t;
typedef uint128_t dword_t;
typedef int32_t hsword_t;
typedef int64_t sword_t;
typedef int128_t dsword_t;
-# elif (ARCH_WORD_BITS == 32)
+#elif (ARCH_WORD_BITS == 32)
typedef uint32_t word_t, mask_t;
typedef uint64_t dword_t;
typedef int16_t hsword_t;
typedef int32_t sword_t;
typedef int64_t dsword_t;
-# else
-# error "For now, we only support 32- and 64-bit architectures."
-# endif
+#else
+#error "For now, we only support 32- and 64-bit architectures."
+#endif
/*
* Scalar limbs are keyed off of the API word size instead of the arch word
* size.
*/
-# if C448_WORD_BITS == 64
-# define SC_LIMB(x) (x)
-# elif C448_WORD_BITS == 32
-# define SC_LIMB(x) ((uint32_t)(x)),((x) >> 32)
-# else
-# error "For now we only support 32- and 64-bit architectures."
-# endif
+#if C448_WORD_BITS == 64
+#define SC_LIMB(x) (x)
+#elif C448_WORD_BITS == 32
+#define SC_LIMB(x) ((uint32_t)(x)), ((x) >> 32)
+#else
+#error "For now we only support 32- and 64-bit architectures."
+#endif
/*
* The plan on booleans: The external interface uses c448_bool_t, but this
@@ -83,4 +83,4 @@ static ossl_inline mask_t bool_to_mask(c448_bool_t m)
return ret;
}
-#endif /* OSSL_CRYPTO_EC_CURVE448_WORD_H */
+#endif /* OSSL_CRYPTO_EC_CURVE448_WORD_H */
diff --git a/crypto/ec/ec2_oct.c b/crypto/ec/ec2_oct.c
index 2394e67cfa..9113ac60fd 100644
--- a/crypto/ec/ec2_oct.c
+++ b/crypto/ec/ec2_oct.c
@@ -37,9 +37,9 @@
* (and additionally fail to cite the EUROCRYPT '92 publication as prior art).
*/
int ossl_ec_GF2m_simple_set_compressed_coordinates(const EC_GROUP *group,
- EC_POINT *point,
- const BIGNUM *x_, int y_bit,
- BN_CTX *ctx)
+ EC_POINT *point,
+ const BIGNUM *x_, int y_bit,
+ BN_CTX *ctx)
{
BIGNUM *tmp, *x, *y, *z;
int ret = 0, z0;
@@ -109,7 +109,7 @@ int ossl_ec_GF2m_simple_set_compressed_coordinates(const EC_GROUP *group,
ret = 1;
- err:
+err:
BN_CTX_end(ctx);
#ifndef FIPS_MODULE
BN_CTX_free(new_ctx);
@@ -123,9 +123,9 @@ int ossl_ec_GF2m_simple_set_compressed_coordinates(const EC_GROUP *group,
* an error will be returned.
*/
size_t ossl_ec_GF2m_simple_point2oct(const EC_GROUP *group,
- const EC_POINT *point,
- point_conversion_form_t form,
- unsigned char *buf, size_t len, BN_CTX *ctx)
+ const EC_POINT *point,
+ point_conversion_form_t form,
+ unsigned char *buf, size_t len, BN_CTX *ctx)
{
size_t ret;
int used_ctx = 0;
@@ -156,9 +156,7 @@ size_t ossl_ec_GF2m_simple_point2oct(const EC_GROUP *group,
/* ret := required output buffer length */
field_len = (EC_GROUP_get_degree(group) + 7) / 8;
- ret =
- (form ==
- POINT_CONVERSION_COMPRESSED) ? 1 + field_len : 1 + 2 * field_len;
+ ret = (form == POINT_CONVERSION_COMPRESSED) ? 1 + field_len : 1 + 2 * field_len;
/* if 'buf' is NULL, just return required length */
if (buf != NULL) {
@@ -240,7 +238,7 @@ size_t ossl_ec_GF2m_simple_point2oct(const EC_GROUP *group,
#endif
return ret;
- err:
+err:
if (used_ctx)
BN_CTX_end(ctx);
#ifndef FIPS_MODULE
@@ -254,8 +252,8 @@ size_t ossl_ec_GF2m_simple_point2oct(const EC_GROUP *group,
* simple implementation only uses affine coordinates.
*/
int ossl_ec_GF2m_simple_oct2point(const EC_GROUP *group, EC_POINT *point,
- const unsigned char *buf, size_t len,
- BN_CTX *ctx)
+ const unsigned char *buf, size_t len,
+ BN_CTX *ctx)
{
point_conversion_form_t form;
int y_bit, m;
@@ -308,9 +306,7 @@ int ossl_ec_GF2m_simple_oct2point(const EC_GROUP *group, EC_POINT *point,
m = EC_GROUP_get_degree(group);
field_len = (m + 7) / 8;
- enc_len =
- (form ==
- POINT_CONVERSION_COMPRESSED) ? 1 + field_len : 1 + 2 * field_len;
+ enc_len = (form == POINT_CONVERSION_COMPRESSED) ? 1 + field_len : 1 + 2 * field_len;
if (len != (size_t)enc_len) {
ERR_raise(ERR_LIB_EC, EC_R_INVALID_ENCODING);
@@ -380,7 +376,7 @@ int ossl_ec_GF2m_simple_oct2point(const EC_GROUP *group, EC_POINT *point,
ret = 1;
- err:
+err:
BN_CTX_end(ctx);
#ifndef FIPS_MODULE
BN_CTX_free(new_ctx);
diff --git a/crypto/ec/ec2_smpl.c b/crypto/ec/ec2_smpl.c
index 13e702684e..17f814e4c9 100644
--- a/crypto/ec/ec2_smpl.c
+++ b/crypto/ec/ec2_smpl.c
@@ -86,11 +86,9 @@ int ossl_ec_GF2m_simple_group_copy(EC_GROUP *dest, const EC_GROUP *src)
dest->poly[3] = src->poly[3];
dest->poly[4] = src->poly[4];
dest->poly[5] = src->poly[5];
- if (bn_wexpand(dest->a, (int)(dest->poly[0] + BN_BITS2 - 1) / BN_BITS2) ==
- NULL)
+ if (bn_wexpand(dest->a, (int)(dest->poly[0] + BN_BITS2 - 1) / BN_BITS2) == NULL)
return 0;
- if (bn_wexpand(dest->b, (int)(dest->poly[0] + BN_BITS2 - 1) / BN_BITS2) ==
- NULL)
+ if (bn_wexpand(dest->b, (int)(dest->poly[0] + BN_BITS2 - 1) / BN_BITS2) == NULL)
return 0;
bn_set_all_zero(dest->a);
bn_set_all_zero(dest->b);
@@ -99,8 +97,8 @@ int ossl_ec_GF2m_simple_group_copy(EC_GROUP *dest, const EC_GROUP *src)
/* Set the curve parameters of an EC_GROUP structure. */
int ossl_ec_GF2m_simple_group_set_curve(EC_GROUP *group,
- const BIGNUM *p, const BIGNUM *a,
- const BIGNUM *b, BN_CTX *ctx)
+ const BIGNUM *p, const BIGNUM *a,
+ const BIGNUM *b, BN_CTX *ctx)
{
int ret = 0, i;
@@ -130,7 +128,7 @@ int ossl_ec_GF2m_simple_group_set_curve(EC_GROUP *group,
bn_set_all_zero(group->b);
ret = 1;
- err:
+err:
return ret;
}
@@ -139,7 +137,7 @@ int ossl_ec_GF2m_simple_group_set_curve(EC_GROUP *group,
* then there values will not be set but the method will return with success.
*/
int ossl_ec_GF2m_simple_group_get_curve(const EC_GROUP *group, BIGNUM *p,
- BIGNUM *a, BIGNUM *b, BN_CTX *ctx)
+ BIGNUM *a, BIGNUM *b, BN_CTX *ctx)
{
int ret = 0;
@@ -160,7 +158,7 @@ int ossl_ec_GF2m_simple_group_get_curve(const EC_GROUP *group, BIGNUM *p,
ret = 1;
- err:
+err:
return ret;
}
@@ -178,7 +176,7 @@ int ossl_ec_GF2m_simple_group_get_degree(const EC_GROUP *group)
* elliptic curve <=> b != 0 (mod p)
*/
int ossl_ec_GF2m_simple_group_check_discriminant(const EC_GROUP *group,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
int ret = 0;
BIGNUM *b;
@@ -210,7 +208,7 @@ int ossl_ec_GF2m_simple_group_check_discriminant(const EC_GROUP *group,
ret = 1;
- err:
+err:
BN_CTX_end(ctx);
#ifndef FIPS_MODULE
BN_CTX_free(new_ctx);
@@ -274,7 +272,7 @@ int ossl_ec_GF2m_simple_point_copy(EC_POINT *dest, const EC_POINT *src)
* represented by having Z=0.
*/
int ossl_ec_GF2m_simple_point_set_to_infinity(const EC_GROUP *group,
- EC_POINT *point)
+ EC_POINT *point)
{
point->Z_is_one = 0;
BN_zero(point->Z);
@@ -286,10 +284,10 @@ int ossl_ec_GF2m_simple_point_set_to_infinity(const EC_GROUP *group,
* the simple implementation only uses affine coordinates.
*/
int ossl_ec_GF2m_simple_point_set_affine_coordinates(const EC_GROUP *group,
- EC_POINT *point,
- const BIGNUM *x,
- const BIGNUM *y,
- BN_CTX *ctx)
+ EC_POINT *point,
+ const BIGNUM *x,
+ const BIGNUM *y,
+ BN_CTX *ctx)
{
int ret = 0;
if (x == NULL || y == NULL) {
@@ -309,7 +307,7 @@ int ossl_ec_GF2m_simple_point_set_affine_coordinates(const EC_GROUP *group,
point->Z_is_one = 1;
ret = 1;
- err:
+err:
return ret;
}
@@ -318,9 +316,9 @@ int ossl_ec_GF2m_simple_point_set_affine_coordinates(const EC_GROUP *group,
* implementation only uses affine coordinates.
*/
int ossl_ec_GF2m_simple_point_get_affine_coordinates(const EC_GROUP *group,
- const EC_POINT *point,
- BIGNUM *x, BIGNUM *y,
- BN_CTX *ctx)
+ const EC_POINT *point,
+ BIGNUM *x, BIGNUM *y,
+ BN_CTX *ctx)
{
int ret = 0;
@@ -345,7 +343,7 @@ int ossl_ec_GF2m_simple_point_get_affine_coordinates(const EC_GROUP *group,
}
ret = 1;
- err:
+err:
return ret;
}
@@ -354,7 +352,7 @@ int ossl_ec_GF2m_simple_point_get_affine_coordinates(const EC_GROUP *group,
* b. Uses algorithm A.10.2 of IEEE P1363.
*/
int ossl_ec_GF2m_simple_add(const EC_GROUP *group, EC_POINT *r,
- const EC_POINT *a, const EC_POINT *b, BN_CTX *ctx)
+ const EC_POINT *a, const EC_POINT *b, BN_CTX *ctx)
{
BIGNUM *x0, *y0, *x1, *y1, *x2, *y2, *s, *t;
int ret = 0;
@@ -462,7 +460,7 @@ int ossl_ec_GF2m_simple_add(const EC_GROUP *group, EC_POINT *r,
ret = 1;
- err:
+err:
BN_CTX_end(ctx);
#ifndef FIPS_MODULE
BN_CTX_free(new_ctx);
@@ -475,13 +473,13 @@ int ossl_ec_GF2m_simple_add(const EC_GROUP *group, EC_POINT *r,
* A.10.2 of IEEE P1363.
*/
int ossl_ec_GF2m_simple_dbl(const EC_GROUP *group, EC_POINT *r,
- const EC_POINT *a, BN_CTX *ctx)
+ const EC_POINT *a, BN_CTX *ctx)
{
return ossl_ec_GF2m_simple_add(group, r, a, a, ctx);
}
int ossl_ec_GF2m_simple_invert(const EC_GROUP *group, EC_POINT *point,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
if (EC_POINT_is_at_infinity(group, point) || BN_is_zero(point->Y))
/* point is its own inverse */
@@ -495,7 +493,7 @@ int ossl_ec_GF2m_simple_invert(const EC_GROUP *group, EC_POINT *point,
/* Indicates whether the given point is the point at infinity. */
int ossl_ec_GF2m_simple_is_at_infinity(const EC_GROUP *group,
- const EC_POINT *point)
+ const EC_POINT *point)
{
return BN_is_zero(point->Z);
}
@@ -506,13 +504,13 @@ int ossl_ec_GF2m_simple_is_at_infinity(const EC_GROUP *group,
* y^2 + x*y = x^3 + a*x^2 + b.
*/
int ossl_ec_GF2m_simple_is_on_curve(const EC_GROUP *group, const EC_POINT *point,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
int ret = -1;
BIGNUM *lh, *y2;
- int (*field_mul) (const EC_GROUP *, BIGNUM *, const BIGNUM *,
- const BIGNUM *, BN_CTX *);
- int (*field_sqr) (const EC_GROUP *, BIGNUM *, const BIGNUM *, BN_CTX *);
+ int (*field_mul)(const EC_GROUP *, BIGNUM *, const BIGNUM *,
+ const BIGNUM *, BN_CTX *);
+ int (*field_sqr)(const EC_GROUP *, BIGNUM *, const BIGNUM *, BN_CTX *);
#ifndef FIPS_MODULE
BN_CTX *new_ctx = NULL;
#endif
@@ -563,7 +561,7 @@ int ossl_ec_GF2m_simple_is_on_curve(const EC_GROUP *group, const EC_POINT *point
goto err;
ret = BN_is_zero(lh);
- err:
+err:
BN_CTX_end(ctx);
#ifndef FIPS_MODULE
BN_CTX_free(new_ctx);
@@ -579,7 +577,7 @@ int ossl_ec_GF2m_simple_is_on_curve(const EC_GROUP *group, const EC_POINT *point
* 1 not equal
*/
int ossl_ec_GF2m_simple_cmp(const EC_GROUP *group, const EC_POINT *a,
- const EC_POINT *b, BN_CTX *ctx)
+ const EC_POINT *b, BN_CTX *ctx)
{
BIGNUM *aX, *aY, *bX, *bY;
int ret = -1;
@@ -620,7 +618,7 @@ int ossl_ec_GF2m_simple_cmp(const EC_GROUP *group, const EC_POINT *a,
goto err;
ret = ((BN_cmp(aX, bX) == 0) && BN_cmp(aY, bY) == 0) ? 0 : 1;
- err:
+err:
BN_CTX_end(ctx);
#ifndef FIPS_MODULE
BN_CTX_free(new_ctx);
@@ -630,7 +628,7 @@ int ossl_ec_GF2m_simple_cmp(const EC_GROUP *group, const EC_POINT *a,
/* Forces the given EC_POINT to internally use affine coordinates. */
int ossl_ec_GF2m_simple_make_affine(const EC_GROUP *group, EC_POINT *point,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
BIGNUM *x, *y;
int ret = 0;
@@ -667,7 +665,7 @@ int ossl_ec_GF2m_simple_make_affine(const EC_GROUP *group, EC_POINT *point,
ret = 1;
- err:
+err:
BN_CTX_end(ctx);
#ifndef FIPS_MODULE
BN_CTX_free(new_ctx);
@@ -679,7 +677,7 @@ int ossl_ec_GF2m_simple_make_affine(const EC_GROUP *group, EC_POINT *point,
* Forces each of the EC_POINTs in the given array to use affine coordinates.
*/
int ossl_ec_GF2m_simple_points_make_affine(const EC_GROUP *group, size_t num,
- EC_POINT *points[], BN_CTX *ctx)
+ EC_POINT *points[], BN_CTX *ctx)
{
size_t i;
@@ -693,21 +691,21 @@ int ossl_ec_GF2m_simple_points_make_affine(const EC_GROUP *group, size_t num,
/* Wrapper to simple binary polynomial field multiplication implementation. */
int ossl_ec_GF2m_simple_field_mul(const EC_GROUP *group, BIGNUM *r,
- const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
+ const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
{
return BN_GF2m_mod_mul_arr(r, a, b, group->poly, ctx);
}
/* Wrapper to simple binary polynomial field squaring implementation. */
int ossl_ec_GF2m_simple_field_sqr(const EC_GROUP *group, BIGNUM *r,
- const BIGNUM *a, BN_CTX *ctx)
+ const BIGNUM *a, BN_CTX *ctx)
{
return BN_GF2m_mod_sqr_arr(r, a, group->poly, ctx);
}
/* Wrapper to simple binary polynomial field division implementation. */
int ossl_ec_GF2m_simple_field_div(const EC_GROUP *group, BIGNUM *r,
- const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
+ const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
{
return BN_GF2m_mod_div(r, a, b, group->field, ctx);
}
@@ -718,10 +716,9 @@ int ossl_ec_GF2m_simple_field_div(const EC_GROUP *group, BIGNUM *r,
* Modified to blind s and r independently.
* s:= p, r := 2p
*/
-static
-int ec_GF2m_simple_ladder_pre(const EC_GROUP *group,
- EC_POINT *r, EC_POINT *s,
- EC_POINT *p, BN_CTX *ctx)
+static int ec_GF2m_simple_ladder_pre(const EC_GROUP *group,
+ EC_POINT *r, EC_POINT *s,
+ EC_POINT *p, BN_CTX *ctx)
{
/* if p is not affine, something is wrong */
if (p->Z_is_one == 0)
@@ -730,7 +727,7 @@ int ec_GF2m_simple_ladder_pre(const EC_GROUP *group,
/* s blinding: make sure lambda (s->Z here) is not zero */
do {
if (!BN_priv_rand_ex(s->Z, BN_num_bits(group->field) - 1,
- BN_RAND_TOP_ANY, BN_RAND_BOTTOM_ANY, 0, ctx)) {
+ BN_RAND_TOP_ANY, BN_RAND_BOTTOM_ANY, 0, ctx)) {
ERR_raise(ERR_LIB_EC, ERR_R_BN_LIB);
return 0;
}
@@ -738,21 +735,21 @@ int ec_GF2m_simple_ladder_pre(const EC_GROUP *group,
/* if field_encode defined convert between representations */
if ((group->meth->field_encode != NULL
- && !group->meth->field_encode(group, s->Z, s->Z, ctx))
+ && !group->meth->field_encode(group, s->Z, s->Z, ctx))
|| !group->meth->field_mul(group, s->X, p->X, s->Z, ctx))
return 0;
/* r blinding: make sure lambda (r->Y here for storage) is not zero */
do {
if (!BN_priv_rand_ex(r->Y, BN_num_bits(group->field) - 1,
- BN_RAND_TOP_ANY, BN_RAND_BOTTOM_ANY, 0, ctx)) {
+ BN_RAND_TOP_ANY, BN_RAND_BOTTOM_ANY, 0, ctx)) {
ERR_raise(ERR_LIB_EC, ERR_R_BN_LIB);
return 0;
}
} while (BN_is_zero(r->Y));
if ((group->meth->field_encode != NULL
- && !group->meth->field_encode(group, r->Y, r->Y, ctx))
+ && !group->meth->field_encode(group, r->Y, r->Y, ctx))
|| !group->meth->field_sqr(group, r->Z, p->X, ctx)
|| !group->meth->field_sqr(group, r->X, r->Z, ctx)
|| !BN_GF2m_add(r->X, r->X, group->b)
@@ -771,10 +768,9 @@ int ec_GF2m_simple_ladder_pre(const EC_GROUP *group,
* http://www.hyperelliptic.org/EFD/g12o/auto-code/shortw/xz/ladder/mladd-2003-s.op3
* s := r + s, r := 2r
*/
-static
-int ec_GF2m_simple_ladder_step(const EC_GROUP *group,
- EC_POINT *r, EC_POINT *s,
- EC_POINT *p, BN_CTX *ctx)
+static int ec_GF2m_simple_ladder_step(const EC_GROUP *group,
+ EC_POINT *r, EC_POINT *s,
+ EC_POINT *p, BN_CTX *ctx)
{
if (!group->meth->field_mul(group, r->Y, r->Z, s->X, ctx)
|| !group->meth->field_mul(group, s->X, r->X, s->Z, ctx)
@@ -801,10 +797,9 @@ int ec_GF2m_simple_ladder_step(const EC_GROUP *group,
* without Precomputation" (Lopez and Dahab, CHES 1999),
* Appendix Alg Mxy.
*/
-static
-int ec_GF2m_simple_ladder_post(const EC_GROUP *group,
- EC_POINT *r, EC_POINT *s,
- EC_POINT *p, BN_CTX *ctx)
+static int ec_GF2m_simple_ladder_post(const EC_GROUP *group,
+ EC_POINT *r, EC_POINT *s,
+ EC_POINT *p, BN_CTX *ctx)
{
int ret = 0;
BIGNUM *t0, *t1, *t2 = NULL;
@@ -859,17 +854,16 @@ int ec_GF2m_simple_ladder_post(const EC_GROUP *group,
ret = 1;
- err:
+err:
BN_CTX_end(ctx);
return ret;
}
-static
-int ec_GF2m_simple_points_mul(const EC_GROUP *group, EC_POINT *r,
- const BIGNUM *scalar, size_t num,
- const EC_POINT *points[],
- const BIGNUM *scalars[],
- BN_CTX *ctx)
+static int ec_GF2m_simple_points_mul(const EC_GROUP *group, EC_POINT *r,
+ const BIGNUM *scalar, size_t num,
+ const EC_POINT *points[],
+ const BIGNUM *scalars[],
+ BN_CTX *ctx)
{
int ret = 0;
EC_POINT *t = NULL;
@@ -916,7 +910,7 @@ int ec_GF2m_simple_points_mul(const EC_GROUP *group, EC_POINT *r,
ret = 1;
- err:
+err:
EC_POINT_free(t);
return ret;
}
@@ -927,7 +921,7 @@ int ec_GF2m_simple_points_mul(const EC_GROUP *group, EC_POINT *r,
* SCA hardening is with blinding: BN_GF2m_mod_inv does that.
*/
static int ec_GF2m_simple_field_inv(const EC_GROUP *group, BIGNUM *r,
- const BIGNUM *a, BN_CTX *ctx)
+ const BIGNUM *a, BN_CTX *ctx)
{
int ret;
diff --git a/crypto/ec/ec_ameth.c b/crypto/ec/ec_ameth.c
index 56008eb7bd..541d9936e5 100644
--- a/crypto/ec/ec_ameth.c
+++ b/crypto/ec/ec_ameth.c
@@ -37,7 +37,7 @@ static int eckey_param2type(int *pptype, void **ppval, const EC_KEY *ec_key)
}
if (EC_GROUP_get_asn1_flag(group)
&& (nid = EC_GROUP_get_curve_name(group)))
- /* we have a 'named curve' => just set the OID */
+ /* we have a 'named curve' => just set the OID */
{
ASN1_OBJECT *asn1obj = OBJ_nid2obj(nid);
@@ -47,7 +47,7 @@ static int eckey_param2type(int *pptype, void **ppval, const EC_KEY *ec_key)
}
*ppval = asn1obj;
*pptype = V_ASN1_OBJECT;
- } else { /* explicit parameters */
+ } else { /* explicit parameters */
ASN1_STRING *pstr = NULL;
pstr = ASN1_STRING_new();
@@ -88,9 +88,9 @@ static int eckey_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
if (penclen <= 0)
goto err;
if (X509_PUBKEY_set0_param(pk, OBJ_nid2obj(EVP_PKEY_EC),
- ptype, pval, penc, penclen))
+ ptype, pval, penc, penclen))
return 1;
- err:
+err:
if (ptype == V_ASN1_SEQUENCE)
ASN1_STRING_free(pval);
OPENSSL_free(penc);
@@ -123,7 +123,7 @@ static int eckey_pub_decode(EVP_PKEY *pkey, const X509_PUBKEY *pubkey)
EVP_PKEY_assign_EC_KEY(pkey, eckey);
return 1;
- ecerr:
+ecerr:
EC_KEY_free(eckey);
return 0;
}
@@ -133,7 +133,7 @@ static int eckey_pub_cmp(const EVP_PKEY *a, const EVP_PKEY *b)
int r;
const EC_GROUP *group = EC_KEY_get0_group(b->pkey.ec);
const EC_POINT *pa = EC_KEY_get0_public_key(a->pkey.ec),
- *pb = EC_KEY_get0_public_key(b->pkey.ec);
+ *pb = EC_KEY_get0_public_key(b->pkey.ec);
if (group == NULL || pa == NULL || pb == NULL)
return -2;
@@ -146,7 +146,7 @@ static int eckey_pub_cmp(const EVP_PKEY *a, const EVP_PKEY *b)
}
static int eckey_priv_decode_ex(EVP_PKEY *pkey, const PKCS8_PRIV_KEY_INFO *p8,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_LIB_CTX *libctx, const char *propq)
{
int ret = 0;
EC_KEY *eckey = ossl_ec_key_from_pkcs8(p8, libctx, propq);
@@ -188,7 +188,7 @@ static int eckey_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
}
if (!PKCS8_pkey_set0(p8, OBJ_nid2obj(NID_X9_62_id_ecPublicKey), 0,
- ptype, pval, ep, eplen)) {
+ ptype, pval, ep, eplen)) {
ERR_raise(ERR_LIB_EC, ERR_R_ASN1_LIB);
OPENSSL_clear_free(ep, eplen);
goto err;
@@ -196,7 +196,7 @@ static int eckey_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
return 1;
- err:
+err:
if (ptype == V_ASN1_SEQUENCE)
ASN1_STRING_free(pval);
return 0;
@@ -251,7 +251,7 @@ static int ec_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from)
goto err;
EC_GROUP_free(group);
return 1;
- err:
+err:
EC_GROUP_free(group);
return 0;
}
@@ -259,7 +259,7 @@ static int ec_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from)
static int ec_cmp_parameters(const EVP_PKEY *a, const EVP_PKEY *b)
{
const EC_GROUP *group_a = EC_KEY_get0_group(a->pkey.ec),
- *group_b = EC_KEY_get0_group(b->pkey.ec);
+ *group_b = EC_KEY_get0_group(b->pkey.ec);
if (group_a == NULL || group_b == NULL)
return -2;
@@ -315,7 +315,8 @@ static int do_EC_KEY_print(BIO *bp, const EC_KEY *x, int off, ec_print_t ktype)
if (!BIO_indent(bp, off, 128))
goto err;
if (BIO_printf(bp, "%s: (%d bit)\n", ecstr,
- EC_GROUP_order_bits(group)) <= 0)
+ EC_GROUP_order_bits(group))
+ <= 0)
goto err;
if (privlen != 0) {
@@ -335,7 +336,7 @@ static int do_EC_KEY_print(BIO *bp, const EC_KEY *x, int off, ec_print_t ktype)
if (!ECPKParameters_print(bp, group, off))
goto err;
ret = 1;
- err:
+err:
if (!ret)
ERR_raise(ERR_LIB_EC, ERR_R_EC_LIB);
OPENSSL_clear_free(priv, privlen);
@@ -344,7 +345,7 @@ static int do_EC_KEY_print(BIO *bp, const EC_KEY *x, int off, ec_print_t ktype)
}
static int eckey_param_decode(EVP_PKEY *pkey,
- const unsigned char **pder, int derlen)
+ const unsigned char **pder, int derlen)
{
EC_KEY *eckey;
@@ -360,25 +361,25 @@ static int eckey_param_encode(const EVP_PKEY *pkey, unsigned char **pder)
}
static int eckey_param_print(BIO *bp, const EVP_PKEY *pkey, int indent,
- ASN1_PCTX *ctx)
+ ASN1_PCTX *ctx)
{
return do_EC_KEY_print(bp, pkey->pkey.ec, indent, EC_KEY_PRINT_PARAM);
}
static int eckey_pub_print(BIO *bp, const EVP_PKEY *pkey, int indent,
- ASN1_PCTX *ctx)
+ ASN1_PCTX *ctx)
{
return do_EC_KEY_print(bp, pkey->pkey.ec, indent, EC_KEY_PRINT_PUBLIC);
}
static int eckey_priv_print(BIO *bp, const EVP_PKEY *pkey, int indent,
- ASN1_PCTX *ctx)
+ ASN1_PCTX *ctx)
{
return do_EC_KEY_print(bp, pkey->pkey.ec, indent, EC_KEY_PRINT_PRIVATE);
}
static int old_ec_priv_decode(EVP_PKEY *pkey,
- const unsigned char **pder, int derlen)
+ const unsigned char **pder, int derlen)
{
EC_KEY *ec;
@@ -400,7 +401,7 @@ static int ec_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2)
if (EVP_PKEY_get_id(pkey) == EVP_PKEY_SM2) {
/* For SM2, the only valid digest-alg is SM3 */
*(int *)arg2 = NID_sm3;
- return 2; /* Make it mandatory */
+ return 2; /* Make it mandatory */
}
*(int *)arg2 = NID_sha256;
return 1;
@@ -413,7 +414,7 @@ static int ec_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2)
case ASN1_PKEY_CTRL_GET1_TLS_ENCPT:
return (int)EC_KEY_key2buf(EVP_PKEY_get0_EC_KEY(pkey),
- POINT_CONVERSION_UNCOMPRESSED, arg2, NULL);
+ POINT_CONVERSION_UNCOMPRESSED, arg2, NULL);
default:
return -2;
@@ -462,16 +463,14 @@ static int ec_pkey_param_check(const EVP_PKEY *pkey)
return EC_GROUP_check(eckey->group, NULL);
}
-static
-size_t ec_pkey_dirty_cnt(const EVP_PKEY *pkey)
+static size_t ec_pkey_dirty_cnt(const EVP_PKEY *pkey)
{
return pkey->pkey.ec->dirty_cnt;
}
-static
-int ec_pkey_export_to(const EVP_PKEY *from, void *to_keydata,
- OSSL_FUNC_keymgmt_import_fn *importer,
- OSSL_LIB_CTX *libctx, const char *propq)
+static int ec_pkey_export_to(const EVP_PKEY *from, void *to_keydata,
+ OSSL_FUNC_keymgmt_import_fn *importer,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
const EC_KEY *eckey = NULL;
const EC_GROUP *ecg = NULL;
@@ -486,8 +485,8 @@ int ec_pkey_export_to(const EVP_PKEY *from, void *to_keydata,
BN_CTX *bnctx = NULL;
if (from == NULL
- || (eckey = from->pkey.ec) == NULL
- || (ecg = EC_KEY_get0_group(eckey)) == NULL)
+ || (eckey = from->pkey.ec) == NULL
+ || (ecg = EC_KEY_get0_group(eckey)) == NULL)
return 0;
tmpl = OSSL_PARAM_BLD_new();
@@ -516,12 +515,13 @@ int ec_pkey_export_to(const EVP_PKEY *from, void *to_keydata,
point_conversion_form_t format = EC_KEY_get_conv_form(eckey);
if ((pub_key_buflen = EC_POINT_point2buf(ecg, pub_point,
- format,
- &pub_key_buf, bnctx)) == 0
+ format,
+ &pub_key_buf, bnctx))
+ == 0
|| !OSSL_PARAM_BLD_push_octet_string(tmpl,
- OSSL_PKEY_PARAM_PUB_KEY,
- pub_key_buf,
- pub_key_buflen))
+ OSSL_PKEY_PARAM_PUB_KEY,
+ pub_key_buf,
+ pub_key_buflen))
goto err;
selection |= OSSL_KEYMGMT_SELECT_PUBLIC_KEY;
}
@@ -570,8 +570,8 @@ int ec_pkey_export_to(const EVP_PKEY *from, void *to_keydata,
sz = (ecbits + 7) / 8;
if (!OSSL_PARAM_BLD_push_BN_pad(tmpl,
- OSSL_PKEY_PARAM_PRIV_KEY,
- priv_key, sz))
+ OSSL_PKEY_PARAM_PRIV_KEY,
+ priv_key, sz))
goto err;
selection |= OSSL_KEYMGMT_SELECT_PRIVATE_KEY;
@@ -580,13 +580,12 @@ int ec_pkey_export_to(const EVP_PKEY *from, void *to_keydata,
* contains a private key, so we check for the flag and export it only
* in this case.
*/
- ecdh_cofactor_mode =
- (EC_KEY_get_flags(eckey) & EC_FLAG_COFACTOR_ECDH) ? 1 : 0;
+ ecdh_cofactor_mode = (EC_KEY_get_flags(eckey) & EC_FLAG_COFACTOR_ECDH) ? 1 : 0;
/* Export the ECDH_COFACTOR_MODE parameter */
if (!OSSL_PARAM_BLD_push_int(tmpl,
- OSSL_PKEY_PARAM_USE_COFACTOR_ECDH,
- ecdh_cofactor_mode))
+ OSSL_PKEY_PARAM_USE_COFACTOR_ECDH,
+ ecdh_cofactor_mode))
goto err;
selection |= OSSL_KEYMGMT_SELECT_OTHER_PARAMETERS;
}
@@ -596,7 +595,7 @@ int ec_pkey_export_to(const EVP_PKEY *from, void *to_keydata,
/* We export, the provider imports */
rv = importer(to_keydata, selection, params);
- err:
+err:
OSSL_PARAM_BLD_free(tmpl);
OSSL_PARAM_free(params);
OPENSSL_free(pub_key_buf);
@@ -701,9 +700,9 @@ const EVP_PKEY_ASN1_METHOD ossl_eckey_asn1_meth = {
#if !defined(OPENSSL_NO_SM2)
const EVP_PKEY_ASN1_METHOD ossl_sm2_asn1_meth = {
- EVP_PKEY_SM2,
- EVP_PKEY_EC,
- ASN1_PKEY_ALIAS
+ EVP_PKEY_SM2,
+ EVP_PKEY_EC,
+ ASN1_PKEY_ALIAS
};
#endif
@@ -712,7 +711,7 @@ int EC_KEY_print(BIO *bp, const EC_KEY *x, int off)
int private = EC_KEY_get0_private_key(x) != NULL;
return do_EC_KEY_print(bp, x, off,
- private ? EC_KEY_PRINT_PRIVATE : EC_KEY_PRINT_PUBLIC);
+ private ? EC_KEY_PRINT_PRIVATE : EC_KEY_PRINT_PUBLIC);
}
int ECParameters_print(BIO *bp, const EC_KEY *x)
diff --git a/crypto/ec/ec_asn1.c b/crypto/ec/ec_asn1.c
index 0c5466619d..79acc6c6ad 100644
--- a/crypto/ec/ec_asn1.c
+++ b/crypto/ec/ec_asn1.c
@@ -73,7 +73,7 @@ struct ec_parameters_st {
ASN1_OCTET_STRING *base;
ASN1_INTEGER *order;
ASN1_INTEGER *cofactor;
-} /* ECPARAMETERS */ ;
+} /* ECPARAMETERS */;
typedef enum {
ECPKPARAMETERS_TYPE_NAMED = 0,
@@ -88,7 +88,7 @@ struct ecpk_parameters_st {
ECPARAMETERS *parameters;
ASN1_NULL *implicitlyCA;
} value;
-} /* ECPKPARAMETERS */ ;
+} /* ECPKPARAMETERS */;
/* SEC1 ECPrivateKey */
typedef struct ec_privatekey_st {
@@ -100,65 +100,56 @@ typedef struct ec_privatekey_st {
/* the OpenSSL ASN.1 definitions */
ASN1_SEQUENCE(X9_62_PENTANOMIAL) = {
- ASN1_EMBED(X9_62_PENTANOMIAL, k1, INT32),
- ASN1_EMBED(X9_62_PENTANOMIAL, k2, INT32),
- ASN1_EMBED(X9_62_PENTANOMIAL, k3, INT32)
+ ASN1_EMBED(X9_62_PENTANOMIAL, k1, INT32),
+ ASN1_EMBED(X9_62_PENTANOMIAL, k2, INT32),
+ ASN1_EMBED(X9_62_PENTANOMIAL, k3, INT32)
} static_ASN1_SEQUENCE_END(X9_62_PENTANOMIAL)
-DECLARE_ASN1_ALLOC_FUNCTIONS(X9_62_PENTANOMIAL)
+ DECLARE_ASN1_ALLOC_FUNCTIONS(X9_62_PENTANOMIAL)
IMPLEMENT_ASN1_ALLOC_FUNCTIONS(X9_62_PENTANOMIAL)
ASN1_ADB_TEMPLATE(char_two_def) = ASN1_SIMPLE(X9_62_CHARACTERISTIC_TWO, p.other, ASN1_ANY);
ASN1_ADB(X9_62_CHARACTERISTIC_TWO) = {
- ADB_ENTRY(NID_X9_62_onBasis, ASN1_SIMPLE(X9_62_CHARACTERISTIC_TWO, p.onBasis, ASN1_NULL)),
- ADB_ENTRY(NID_X9_62_tpBasis, ASN1_SIMPLE(X9_62_CHARACTERISTIC_TWO, p.tpBasis, ASN1_INTEGER)),
- ADB_ENTRY(NID_X9_62_ppBasis, ASN1_SIMPLE(X9_62_CHARACTERISTIC_TWO, p.ppBasis, X9_62_PENTANOMIAL))
+ ADB_ENTRY(NID_X9_62_onBasis, ASN1_SIMPLE(X9_62_CHARACTERISTIC_TWO, p.onBasis, ASN1_NULL)),
+ ADB_ENTRY(NID_X9_62_tpBasis, ASN1_SIMPLE(X9_62_CHARACTERISTIC_TWO, p.tpBasis, ASN1_INTEGER)),
+ ADB_ENTRY(NID_X9_62_ppBasis, ASN1_SIMPLE(X9_62_CHARACTERISTIC_TWO, p.ppBasis, X9_62_PENTANOMIAL))
} ASN1_ADB_END(X9_62_CHARACTERISTIC_TWO, 0, type, 0, &char_two_def_tt, NULL);
ASN1_SEQUENCE(X9_62_CHARACTERISTIC_TWO) = {
- ASN1_EMBED(X9_62_CHARACTERISTIC_TWO, m, INT32),
- ASN1_SIMPLE(X9_62_CHARACTERISTIC_TWO, type, ASN1_OBJECT),
- ASN1_ADB_OBJECT(X9_62_CHARACTERISTIC_TWO)
+ ASN1_EMBED(X9_62_CHARACTERISTIC_TWO, m, INT32),
+ ASN1_SIMPLE(X9_62_CHARACTERISTIC_TWO, type, ASN1_OBJECT),
+ ASN1_ADB_OBJECT(X9_62_CHARACTERISTIC_TWO)
} static_ASN1_SEQUENCE_END(X9_62_CHARACTERISTIC_TWO)
-DECLARE_ASN1_ALLOC_FUNCTIONS(X9_62_CHARACTERISTIC_TWO)
+ DECLARE_ASN1_ALLOC_FUNCTIONS(X9_62_CHARACTERISTIC_TWO)
IMPLEMENT_ASN1_ALLOC_FUNCTIONS(X9_62_CHARACTERISTIC_TWO)
ASN1_ADB_TEMPLATE(fieldID_def) = ASN1_SIMPLE(X9_62_FIELDID, p.other, ASN1_ANY);
ASN1_ADB(X9_62_FIELDID) = {
- ADB_ENTRY(NID_X9_62_prime_field, ASN1_SIMPLE(X9_62_FIELDID, p.prime, ASN1_INTEGER)),
- ADB_ENTRY(NID_X9_62_characteristic_two_field, ASN1_SIMPLE(X9_62_FIELDID, p.char_two, X9_62_CHARACTERISTIC_TWO))
+ ADB_ENTRY(NID_X9_62_prime_field, ASN1_SIMPLE(X9_62_FIELDID, p.prime, ASN1_INTEGER)),
+ ADB_ENTRY(NID_X9_62_characteristic_two_field, ASN1_SIMPLE(X9_62_FIELDID, p.char_two, X9_62_CHARACTERISTIC_TWO))
} ASN1_ADB_END(X9_62_FIELDID, 0, fieldType, 0, &fieldID_def_tt, NULL);
ASN1_SEQUENCE(X9_62_FIELDID) = {
- ASN1_SIMPLE(X9_62_FIELDID, fieldType, ASN1_OBJECT),
- ASN1_ADB_OBJECT(X9_62_FIELDID)
+ ASN1_SIMPLE(X9_62_FIELDID, fieldType, ASN1_OBJECT),
+ ASN1_ADB_OBJECT(X9_62_FIELDID)
} static_ASN1_SEQUENCE_END(X9_62_FIELDID)
-ASN1_SEQUENCE(X9_62_CURVE) = {
- ASN1_SIMPLE(X9_62_CURVE, a, ASN1_OCTET_STRING),
- ASN1_SIMPLE(X9_62_CURVE, b, ASN1_OCTET_STRING),
- ASN1_OPT(X9_62_CURVE, seed, ASN1_BIT_STRING)
-} static_ASN1_SEQUENCE_END(X9_62_CURVE)
-
-ASN1_SEQUENCE(ECPARAMETERS) = {
- ASN1_EMBED(ECPARAMETERS, version, INT32),
- ASN1_SIMPLE(ECPARAMETERS, fieldID, X9_62_FIELDID),
- ASN1_SIMPLE(ECPARAMETERS, curve, X9_62_CURVE),
- ASN1_SIMPLE(ECPARAMETERS, base, ASN1_OCTET_STRING),
- ASN1_SIMPLE(ECPARAMETERS, order, ASN1_INTEGER),
- ASN1_OPT(ECPARAMETERS, cofactor, ASN1_INTEGER)
-} ASN1_SEQUENCE_END(ECPARAMETERS)
+ ASN1_SEQUENCE(X9_62_CURVE)
+ = { ASN1_SIMPLE(X9_62_CURVE, a, ASN1_OCTET_STRING), ASN1_SIMPLE(X9_62_CURVE, b, ASN1_OCTET_STRING), ASN1_OPT(X9_62_CURVE, seed, ASN1_BIT_STRING) } static_ASN1_SEQUENCE_END(X9_62_CURVE)
+
+ ASN1_SEQUENCE(ECPARAMETERS)
+ = { ASN1_EMBED(ECPARAMETERS, version, INT32), ASN1_SIMPLE(ECPARAMETERS, fieldID, X9_62_FIELDID), ASN1_SIMPLE(ECPARAMETERS, curve, X9_62_CURVE), ASN1_SIMPLE(ECPARAMETERS, base, ASN1_OCTET_STRING), ASN1_SIMPLE(ECPARAMETERS, order, ASN1_INTEGER), ASN1_OPT(ECPARAMETERS, cofactor, ASN1_INTEGER) } ASN1_SEQUENCE_END(ECPARAMETERS)
DECLARE_ASN1_ALLOC_FUNCTIONS(ECPARAMETERS)
IMPLEMENT_ASN1_ALLOC_FUNCTIONS(ECPARAMETERS)
ASN1_CHOICE(ECPKPARAMETERS) = {
- ASN1_SIMPLE(ECPKPARAMETERS, value.named_curve, ASN1_OBJECT),
- ASN1_SIMPLE(ECPKPARAMETERS, value.parameters, ECPARAMETERS),
- ASN1_SIMPLE(ECPKPARAMETERS, value.implicitlyCA, ASN1_NULL)
+ ASN1_SIMPLE(ECPKPARAMETERS, value.named_curve, ASN1_OBJECT),
+ ASN1_SIMPLE(ECPKPARAMETERS, value.parameters, ECPARAMETERS),
+ ASN1_SIMPLE(ECPKPARAMETERS, value.implicitlyCA, ASN1_NULL)
} ASN1_CHOICE_END(ECPKPARAMETERS)
DECLARE_ASN1_FUNCTIONS(ECPKPARAMETERS)
@@ -166,13 +157,13 @@ DECLARE_ASN1_ENCODE_FUNCTIONS_name(ECPKPARAMETERS, ECPKPARAMETERS)
IMPLEMENT_ASN1_FUNCTIONS(ECPKPARAMETERS)
ASN1_SEQUENCE(EC_PRIVATEKEY) = {
- ASN1_EMBED(EC_PRIVATEKEY, version, INT32),
- ASN1_SIMPLE(EC_PRIVATEKEY, privateKey, ASN1_OCTET_STRING),
- ASN1_EXP_OPT(EC_PRIVATEKEY, parameters, ECPKPARAMETERS, 0),
- ASN1_EXP_OPT(EC_PRIVATEKEY, publicKey, ASN1_BIT_STRING, 1)
+ ASN1_EMBED(EC_PRIVATEKEY, version, INT32),
+ ASN1_SIMPLE(EC_PRIVATEKEY, privateKey, ASN1_OCTET_STRING),
+ ASN1_EXP_OPT(EC_PRIVATEKEY, parameters, ECPKPARAMETERS, 0),
+ ASN1_EXP_OPT(EC_PRIVATEKEY, publicKey, ASN1_BIT_STRING, 1)
} static_ASN1_SEQUENCE_END(EC_PRIVATEKEY)
-DECLARE_ASN1_FUNCTIONS(EC_PRIVATEKEY)
+ DECLARE_ASN1_FUNCTIONS(EC_PRIVATEKEY)
DECLARE_ASN1_ENCODE_FUNCTIONS_name(EC_PRIVATEKEY, EC_PRIVATEKEY)
IMPLEMENT_ASN1_FUNCTIONS(EC_PRIVATEKEY)
@@ -284,7 +275,7 @@ static int ec_asn1_group2fieldid(const EC_GROUP *group, X9_62_FIELDID *field)
char_two->p.ppBasis->k1 = (long)k1;
char_two->p.ppBasis->k2 = (long)k2;
char_two->p.ppBasis->k3 = (long)k3;
- } else { /* field_type == NID_X9_62_onBasis */
+ } else { /* field_type == NID_X9_62_onBasis */
/* for ONB the parameters are (asn1) NULL */
char_two->p.onBasis = ASN1_NULL_new();
@@ -302,7 +293,7 @@ static int ec_asn1_group2fieldid(const EC_GROUP *group, X9_62_FIELDID *field)
ok = 1;
- err:
+err:
BN_free(tmp);
return ok;
}
@@ -359,7 +350,7 @@ static int ec_asn1_group2curve(const EC_GROUP *group, X9_62_CURVE *curve)
}
ossl_asn1_string_set_bits_left(curve->seed, 0);
if (!ASN1_BIT_STRING_set(curve->seed, group->seed,
- (int)group->seed_len)) {
+ (int)group->seed_len)) {
ERR_raise(ERR_LIB_EC, ERR_R_ASN1_LIB);
goto err;
}
@@ -370,7 +361,7 @@ static int ec_asn1_group2curve(const EC_GROUP *group, X9_62_CURVE *curve)
ok = 1;
- err:
+err:
OPENSSL_free(a_buf);
OPENSSL_free(b_buf);
BN_free(tmp_1);
@@ -379,7 +370,7 @@ static int ec_asn1_group2curve(const EC_GROUP *group, X9_62_CURVE *curve)
}
ECPARAMETERS *EC_GROUP_get_ecparameters(const EC_GROUP *group,
- ECPARAMETERS *params)
+ ECPARAMETERS *params)
{
size_t len = 0;
ECPARAMETERS *ret = NULL;
@@ -458,14 +449,14 @@ ECPARAMETERS *EC_GROUP_get_ecparameters(const EC_GROUP *group,
return ret;
- err:
+err:
if (params == NULL)
ECPARAMETERS_free(ret);
return NULL;
}
ECPKPARAMETERS *EC_GROUP_get_ecpkparameters(const EC_GROUP *group,
- ECPKPARAMETERS *params)
+ ECPKPARAMETERS *params)
{
int ok = 1, tmp;
ECPKPARAMETERS *ret = params;
@@ -479,7 +470,7 @@ ECPKPARAMETERS *EC_GROUP_get_ecpkparameters(const EC_GROUP *group,
if (ret->type == ECPKPARAMETERS_TYPE_NAMED)
ASN1_OBJECT_free(ret->value.named_curve);
else if (ret->type == ECPKPARAMETERS_TYPE_EXPLICIT
- && ret->value.parameters != NULL)
+ && ret->value.parameters != NULL)
ECPARAMETERS_free(ret->value.parameters);
}
@@ -505,8 +496,7 @@ ECPKPARAMETERS *EC_GROUP_get_ecpkparameters(const EC_GROUP *group,
} else {
/* use the ECPARAMETERS structure */
ret->type = ECPKPARAMETERS_TYPE_EXPLICIT;
- if ((ret->value.parameters =
- EC_GROUP_get_ecparameters(group, NULL)) == NULL)
+ if ((ret->value.parameters = EC_GROUP_get_ecparameters(group, NULL)) == NULL)
ok = 0;
}
@@ -528,8 +518,8 @@ EC_GROUP *EC_GROUP_new_from_ecparameters(const ECPARAMETERS *params)
BN_CTX *ctx = NULL;
if (params->fieldID == NULL
- || params->fieldID->fieldType == NULL
- || params->fieldID->p.ptr == NULL) {
+ || params->fieldID->fieldType == NULL
+ || params->fieldID->p.ptr == NULL) {
ERR_raise(ERR_LIB_EC, EC_R_ASN1_ERROR);
goto err;
}
@@ -541,8 +531,8 @@ EC_GROUP *EC_GROUP_new_from_ecparameters(const ECPARAMETERS *params)
* compatibility.
*/
if (params->curve == NULL
- || params->curve->a == NULL || params->curve->a->data == NULL
- || params->curve->b == NULL || params->curve->b->data == NULL) {
+ || params->curve->a == NULL || params->curve->a->data == NULL
+ || params->curve->b == NULL || params->curve->b->data == NULL) {
ERR_raise(ERR_LIB_EC, EC_R_ASN1_ERROR);
goto err;
}
@@ -616,9 +606,8 @@ EC_GROUP *EC_GROUP_new_from_ecparameters(const ECPARAMETERS *params)
goto err;
}
- if (!
- (char_two->m > penta->k3 && penta->k3 > penta->k2
- && penta->k2 > penta->k1 && penta->k1 > 0)) {
+ if (!(char_two->m > penta->k3 && penta->k3 > penta->k2
+ && penta->k2 > penta->k1 && penta->k1 > 0)) {
ERR_raise(ERR_LIB_EC, EC_R_INVALID_PENTANOMIAL_BASIS);
goto err;
}
@@ -637,7 +626,7 @@ EC_GROUP *EC_GROUP_new_from_ecparameters(const ECPARAMETERS *params)
} else if (tmp == NID_X9_62_onBasis) {
ERR_raise(ERR_LIB_EC, EC_R_NOT_IMPLEMENTED);
goto err;
- } else { /* error */
+ } else { /* error */
ERR_raise(ERR_LIB_EC, EC_R_ASN1_ERROR);
goto err;
@@ -699,14 +688,14 @@ EC_GROUP *EC_GROUP_new_from_ecparameters(const ECPARAMETERS *params)
if ((ret->seed = OPENSSL_malloc(params->curve->seed->length)) == NULL)
goto err;
memcpy(ret->seed, params->curve->seed->data,
- params->curve->seed->length);
+ params->curve->seed->length);
ret->seed_len = params->curve->seed->length;
}
if (params->order == NULL
- || params->base == NULL
- || params->base->data == NULL
- || params->base->length == 0) {
+ || params->base == NULL
+ || params->base->data == NULL
+ || params->base->length == 0) {
ERR_raise(ERR_LIB_EC, EC_R_ASN1_ERROR);
goto err;
}
@@ -715,12 +704,11 @@ EC_GROUP *EC_GROUP_new_from_ecparameters(const ECPARAMETERS *params)
goto err;
/* set the point conversion form */
- EC_GROUP_set_point_conversion_form(ret, (point_conversion_form_t)
- (params->base->data[0] & ~0x01));
+ EC_GROUP_set_point_conversion_form(ret, (point_conversion_form_t)(params->base->data[0] & ~0x01));
/* extract the ec point */
if (!EC_POINT_oct2point(ret, point, params->base->data,
- params->base->length, NULL)) {
+ params->base->length, NULL)) {
ERR_raise(ERR_LIB_EC, ERR_R_EC_LIB);
goto err;
}
@@ -770,8 +758,8 @@ EC_GROUP *EC_GROUP_new_from_ecparameters(const ECPARAMETERS *params)
goto err;
}
if ((dup = EC_GROUP_dup(ret)) == NULL
- || EC_GROUP_set_seed(dup, NULL, 0) != 1
- || !EC_GROUP_set_generator(dup, point, a, NULL)) {
+ || EC_GROUP_set_seed(dup, NULL, 0) != 1
+ || !EC_GROUP_set_generator(dup, point, a, NULL)) {
ERR_raise(ERR_LIB_EC, ERR_R_EC_LIB);
goto err;
}
@@ -826,7 +814,7 @@ EC_GROUP *EC_GROUP_new_from_ecparameters(const ECPARAMETERS *params)
ok = 1;
- err:
+err:
if (!ok) {
EC_GROUP_free(ret);
ret = NULL;
@@ -965,7 +953,8 @@ EC_KEY *d2i_ECPrivateKey(EC_KEY **a, const unsigned char **in, long len)
if (priv_key->privateKey) {
ASN1_OCTET_STRING *pkey = priv_key->privateKey;
if (EC_KEY_oct2priv(ret, ASN1_STRING_get0_data(pkey),
- ASN1_STRING_length(pkey)) == 0)
+ ASN1_STRING_length(pkey))
+ == 0)
goto err;
} else {
ERR_raise(ERR_LIB_EC, EC_R_MISSING_PRIVATE_KEY);
@@ -995,7 +984,7 @@ EC_KEY *d2i_ECPrivateKey(EC_KEY **a, const unsigned char **in, long len)
} else {
if (ret->group->meth->keygenpub == NULL
|| ret->group->meth->keygenpub(ret) == 0)
- goto err;
+ goto err;
/* Remember the original private-key-only encoding. */
ret->enc_flag |= EC_PKEY_NO_PUBKEY;
}
@@ -1007,7 +996,7 @@ EC_KEY *d2i_ECPrivateKey(EC_KEY **a, const unsigned char **in, long len)
ret->dirty_cnt++;
return ret;
- err:
+err:
if (a == NULL || *a != ret)
EC_KEY_free(ret);
EC_PRIVATEKEY_free(priv_key);
@@ -1017,13 +1006,12 @@ EC_KEY *d2i_ECPrivateKey(EC_KEY **a, const unsigned char **in, long len)
int i2d_ECPrivateKey(const EC_KEY *a, unsigned char **out)
{
int ret = 0, ok = 0;
- unsigned char *priv= NULL, *pub= NULL;
+ unsigned char *priv = NULL, *pub = NULL;
size_t privlen = 0, publen = 0;
EC_PRIVATEKEY *priv_key = NULL;
- if (a == NULL || a->group == NULL ||
- (!(a->enc_flag & EC_PKEY_NO_PUBKEY) && a->pub_key == NULL)) {
+ if (a == NULL || a->group == NULL || (!(a->enc_flag & EC_PKEY_NO_PUBKEY) && a->pub_key == NULL)) {
ERR_raise(ERR_LIB_EC, ERR_R_PASSED_NULL_PARAMETER);
goto err;
}
@@ -1046,9 +1034,9 @@ int i2d_ECPrivateKey(const EC_KEY *a, unsigned char **out)
priv = NULL;
if (!(a->enc_flag & EC_PKEY_NO_PARAMETERS)) {
- if ((priv_key->parameters =
- EC_GROUP_get_ecpkparameters(a->group,
- priv_key->parameters)) == NULL) {
+ if ((priv_key->parameters = EC_GROUP_get_ecpkparameters(a->group,
+ priv_key->parameters))
+ == NULL) {
ERR_raise(ERR_LIB_EC, ERR_R_EC_LIB);
goto err;
}
@@ -1078,7 +1066,7 @@ int i2d_ECPrivateKey(const EC_KEY *a, unsigned char **out)
goto err;
}
ok = 1;
- err:
+err:
OPENSSL_clear_free(priv, privlen);
OPENSSL_free(pub);
EC_PRIVATEKEY_free(priv_key);
@@ -1113,7 +1101,7 @@ EC_KEY *d2i_ECParameters(EC_KEY **a, const unsigned char **in, long len)
if (!d2i_ECPKParameters(&ret->group, in, len)) {
if (a == NULL || *a != ret)
- EC_KEY_free(ret);
+ EC_KEY_free(ret);
else
ret->dirty_cnt++;
return NULL;
@@ -1162,7 +1150,7 @@ int i2o_ECPublicKey(const EC_KEY *a, unsigned char **out)
}
buf_len = EC_POINT_point2oct(a->group, a->pub_key,
- a->conv_form, NULL, 0, NULL);
+ a->conv_form, NULL, 0, NULL);
if (buf_len > INT_MAX) {
ERR_raise(ERR_LIB_EC, ERR_R_PASSED_INVALID_ARGUMENT);
@@ -1178,7 +1166,7 @@ int i2o_ECPublicKey(const EC_KEY *a, unsigned char **out)
new_buffer = 1;
}
if (!EC_POINT_point2oct(a->group, a->pub_key, a->conv_form,
- *out, buf_len, NULL)) {
+ *out, buf_len, NULL)) {
ERR_raise(ERR_LIB_EC, ERR_R_EC_LIB);
if (new_buffer) {
OPENSSL_free(*out);
@@ -1251,7 +1239,7 @@ int i2d_ECDSA_SIG(const ECDSA_SIG *sig, unsigned char **ppout)
return -1;
} else if (*ppout == NULL) {
if ((buf = BUF_MEM_new()) == NULL
- || !WPACKET_init_len(&pkt, buf, 0)) {
+ || !WPACKET_init_len(&pkt, buf, 0)) {
BUF_MEM_free(buf);
return -1;
}
@@ -1261,8 +1249,8 @@ int i2d_ECDSA_SIG(const ECDSA_SIG *sig, unsigned char **ppout)
}
if (!ossl_encode_der_dsa_sig(&pkt, sig->r, sig->s)
- || !WPACKET_get_total_written(&pkt, &encoded_len)
- || !WPACKET_finish(&pkt)) {
+ || !WPACKET_get_total_written(&pkt, &encoded_len)
+ || !WPACKET_finish(&pkt)) {
BUF_MEM_free(buf);
WPACKET_cleanup(&pkt);
return -1;
diff --git a/crypto/ec/ec_backend.c b/crypto/ec/ec_backend.c
index a5c0020dc9..2062711785 100644
--- a/crypto/ec/ec_backend.c
+++ b/crypto/ec/ec_backend.c
@@ -18,7 +18,7 @@
#include <openssl/params.h>
#include <openssl/err.h>
#ifndef FIPS_MODULE
-# include <openssl/x509.h>
+#include <openssl/x509.h>
#endif
#include "crypto/bn.h"
#include "crypto/ec.h"
@@ -154,8 +154,8 @@ char *ossl_ec_pt_format_id2name(int id)
}
static int ec_group_explicit_todata(const EC_GROUP *group, OSSL_PARAM_BLD *tmpl,
- OSSL_PARAM params[], BN_CTX *bnctx,
- unsigned char **genbuf)
+ OSSL_PARAM params[], BN_CTX *bnctx,
+ unsigned char **genbuf)
{
int ret = 0, fid;
const char *field_type;
@@ -214,7 +214,7 @@ static int ec_group_explicit_todata(const EC_GROUP *group, OSSL_PARAM_BLD *tmpl,
goto err;
}
if (!ossl_param_build_set_bn(tmpl, params, OSSL_PKEY_PARAM_EC_ORDER,
- order)) {
+ order)) {
ERR_raise(ERR_LIB_EC, ERR_R_CRYPTO_LIB);
goto err;
}
@@ -223,8 +223,8 @@ static int ec_group_explicit_todata(const EC_GROUP *group, OSSL_PARAM_BLD *tmpl,
param = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_EC_FIELD_TYPE);
if (tmpl != NULL || param != NULL) {
if (!ossl_param_build_set_utf8_string(tmpl, params,
- OSSL_PKEY_PARAM_EC_FIELD_TYPE,
- field_type)) {
+ OSSL_PKEY_PARAM_EC_FIELD_TYPE,
+ field_type)) {
ERR_raise(ERR_LIB_EC, ERR_R_CRYPTO_LIB);
goto err;
}
@@ -246,8 +246,8 @@ static int ec_group_explicit_todata(const EC_GROUP *group, OSSL_PARAM_BLD *tmpl,
goto err;
}
if (!ossl_param_build_set_octet_string(tmpl, params,
- OSSL_PKEY_PARAM_EC_GENERATOR,
- *genbuf, genbuf_len)) {
+ OSSL_PKEY_PARAM_EC_GENERATOR,
+ *genbuf, genbuf_len)) {
ERR_raise(ERR_LIB_EC, ERR_R_CRYPTO_LIB);
goto err;
}
@@ -259,7 +259,7 @@ static int ec_group_explicit_todata(const EC_GROUP *group, OSSL_PARAM_BLD *tmpl,
if (cofactor != NULL
&& !ossl_param_build_set_bn(tmpl, params,
- OSSL_PKEY_PARAM_EC_COFACTOR, cofactor)) {
+ OSSL_PKEY_PARAM_EC_COFACTOR, cofactor)) {
ERR_raise(ERR_LIB_EC, ERR_R_CRYPTO_LIB);
goto err;
}
@@ -273,8 +273,8 @@ static int ec_group_explicit_todata(const EC_GROUP *group, OSSL_PARAM_BLD *tmpl,
if (seed != NULL
&& seed_len > 0
&& !ossl_param_build_set_octet_string(tmpl, params,
- OSSL_PKEY_PARAM_EC_SEED,
- seed, seed_len)) {
+ OSSL_PKEY_PARAM_EC_SEED,
+ seed, seed_len)) {
ERR_raise(ERR_LIB_EC, ERR_R_CRYPTO_LIB);
goto err;
}
@@ -285,9 +285,9 @@ err:
}
int ossl_ec_group_todata(const EC_GROUP *group, OSSL_PARAM_BLD *tmpl,
- OSSL_PARAM params[], OSSL_LIB_CTX *libctx,
- const char *propq,
- BN_CTX *bnctx, unsigned char **genbuf)
+ OSSL_PARAM params[], OSSL_LIB_CTX *libctx,
+ const char *propq,
+ BN_CTX *bnctx, unsigned char **genbuf)
{
int ret = 0, curve_nid, encoding_flag;
const char *encoding_name, *pt_form_name;
@@ -302,8 +302,8 @@ int ossl_ec_group_todata(const EC_GROUP *group, OSSL_PARAM_BLD *tmpl,
pt_form_name = ossl_ec_pt_format_id2name(genform);
if (pt_form_name == NULL
|| !ossl_param_build_set_utf8_string(
- tmpl, params,
- OSSL_PKEY_PARAM_EC_POINT_CONVERSION_FORMAT, pt_form_name)) {
+ tmpl, params,
+ OSSL_PKEY_PARAM_EC_POINT_CONVERSION_FORMAT, pt_form_name)) {
ERR_raise(ERR_LIB_EC, EC_R_INVALID_FORM);
return 0;
}
@@ -311,15 +311,15 @@ int ossl_ec_group_todata(const EC_GROUP *group, OSSL_PARAM_BLD *tmpl,
encoding_name = ec_param_encoding_id2name(encoding_flag);
if (encoding_name == NULL
|| !ossl_param_build_set_utf8_string(tmpl, params,
- OSSL_PKEY_PARAM_EC_ENCODING,
- encoding_name)) {
+ OSSL_PKEY_PARAM_EC_ENCODING,
+ encoding_name)) {
ERR_raise(ERR_LIB_EC, EC_R_INVALID_ENCODING);
return 0;
}
if (!ossl_param_build_set_int(tmpl, params,
- OSSL_PKEY_PARAM_EC_DECODED_FROM_EXPLICIT_PARAMS,
- group->decoded_from_explicit_params))
+ OSSL_PKEY_PARAM_EC_DECODED_FROM_EXPLICIT_PARAMS,
+ group->decoded_from_explicit_params))
return 0;
curve_nid = EC_GROUP_get_curve_name(group);
@@ -339,8 +339,8 @@ int ossl_ec_group_todata(const EC_GROUP *group, OSSL_PARAM_BLD *tmpl,
if (curve_name == NULL
|| !ossl_param_build_set_utf8_string(tmpl, params,
- OSSL_PKEY_PARAM_GROUP_NAME,
- curve_name)) {
+ OSSL_PKEY_PARAM_GROUP_NAME,
+ curve_name)) {
ERR_raise(ERR_LIB_EC, EC_R_INVALID_CURVE);
goto err;
}
@@ -369,7 +369,7 @@ int ossl_ec_set_ecdh_cofactor_mode(EC_KEY *ec, int mode)
if (mode < 0 || mode > 1)
return 0;
- if ((cofactor = EC_GROUP_get0_cofactor(ecg)) == NULL )
+ if ((cofactor = EC_GROUP_get0_cofactor(ecg)) == NULL)
return 0;
/* ECDH cofactor mode has no effect if cofactor is 1 */
@@ -407,11 +407,9 @@ int ossl_ec_key_fromdata(EC_KEY *ec, const OSSL_PARAM params[], int include_priv
if (ecg == NULL)
return 0;
- param_pub_key =
- OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_PUB_KEY);
+ param_pub_key = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_PUB_KEY);
if (include_private)
- param_priv_key =
- OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_PRIV_KEY);
+ param_priv_key = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_PRIV_KEY);
ctx = BN_CTX_new_ex(ossl_ec_key_get_libctx(ec));
if (ctx == NULL)
@@ -419,10 +417,10 @@ int ossl_ec_key_fromdata(EC_KEY *ec, const OSSL_PARAM params[], int include_priv
if (param_pub_key != NULL)
if (!OSSL_PARAM_get_octet_string(param_pub_key,
- (void **)&pub_key, 0, &pub_key_len)
+ (void **)&pub_key, 0, &pub_key_len)
|| (pub_point = EC_POINT_new(ecg)) == NULL
|| !EC_POINT_oct2point(ecg, pub_point, pub_key, pub_key_len, ctx))
- goto err;
+ goto err;
if (param_priv_key != NULL && include_private) {
int fixed_words;
@@ -487,7 +485,7 @@ int ossl_ec_key_fromdata(EC_KEY *ec, const OSSL_PARAM params[], int include_priv
ok = 1;
- err:
+err:
BN_CTX_free(ctx);
BN_clear_free(priv_key);
OPENSSL_free(pub_key);
@@ -503,8 +501,8 @@ int ossl_ec_group_fromdata(EC_KEY *ec, const OSSL_PARAM params[])
if (ec == NULL)
return 0;
- group = EC_GROUP_new_from_params(params, ossl_ec_key_get_libctx(ec),
- ossl_ec_key_get0_propq(ec));
+ group = EC_GROUP_new_from_params(params, ossl_ec_key_get_libctx(ec),
+ ossl_ec_key_get0_propq(ec));
if (!EC_KEY_set_group(ec, group))
goto err;
@@ -590,7 +588,6 @@ int ossl_ec_key_is_foreign(const EC_KEY *ec)
return 1;
#endif
return 0;
-
}
EC_KEY *ossl_ec_key_dup(const EC_KEY *src, int selection)
@@ -609,7 +606,7 @@ EC_KEY *ossl_ec_key_dup(const EC_KEY *src, int selection)
if (src->group != NULL
&& (selection & OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS) != 0) {
ret->group = ossl_ec_group_new_ex(src->libctx, src->propq,
- src->group->meth);
+ src->group->meth);
if (ret->group == NULL
|| !EC_GROUP_copy(ret->group, src->group))
goto err;
@@ -627,7 +624,7 @@ EC_KEY *ossl_ec_key_dup(const EC_KEY *src, int selection)
ret->pub_key = EC_POINT_new(ret->group);
if (ret->pub_key == NULL
|| !EC_POINT_copy(ret->pub_key, src->pub_key))
- goto err;
+ goto err;
}
/* copy the private key */
@@ -655,20 +652,21 @@ EC_KEY *ossl_ec_key_dup(const EC_KEY *src, int selection)
#ifndef FIPS_MODULE
if (!CRYPTO_dup_ex_data(CRYPTO_EX_INDEX_EC_KEY,
- &ret->ex_data, &src->ex_data))
+ &ret->ex_data, &src->ex_data))
goto err;
#endif
if (ret->meth != NULL && ret->meth->copy != NULL) {
if ((selection
- & OSSL_KEYMGMT_SELECT_KEYPAIR) != OSSL_KEYMGMT_SELECT_KEYPAIR)
+ & OSSL_KEYMGMT_SELECT_KEYPAIR)
+ != OSSL_KEYMGMT_SELECT_KEYPAIR)
goto err;
if (ret->meth->copy(ret, src) == 0)
goto err;
}
return ret;
- err:
+err:
EC_KEY_free(ret);
return NULL;
}
@@ -756,7 +754,7 @@ int ossl_x509_algor_is_sm2(const X509_ALGOR *palg)
}
EC_KEY *ossl_ec_key_param_from_x509_algor(const X509_ALGOR *palg,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_LIB_CTX *libctx, const char *propq)
{
int ptype = 0;
const void *pval = NULL;
@@ -774,7 +772,6 @@ EC_KEY *ossl_ec_key_param_from_x509_algor(const X509_ALGOR *palg,
const unsigned char *pm = pstr->data;
int pmlen = pstr->length;
-
if (d2i_ECParameters(&eckey, &pm, pmlen) == NULL) {
ERR_raise(ERR_LIB_EC, EC_R_DECODE_ERROR);
goto ecerr;
@@ -800,14 +797,14 @@ EC_KEY *ossl_ec_key_param_from_x509_algor(const X509_ALGOR *palg,
return eckey;
- ecerr:
+ecerr:
EC_KEY_free(eckey);
EC_GROUP_free(group);
return NULL;
}
EC_KEY *ossl_ec_key_from_pkcs8(const PKCS8_PRIV_KEY_INFO *p8inf,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_LIB_CTX *libctx, const char *propq)
{
const unsigned char *p = NULL;
int pklen;
@@ -827,7 +824,7 @@ EC_KEY *ossl_ec_key_from_pkcs8(const PKCS8_PRIV_KEY_INFO *p8inf,
}
return eckey;
- err:
+err:
EC_KEY_free(eckey);
return NULL;
}
diff --git a/crypto/ec/ec_check.c b/crypto/ec/ec_check.c
index 9ed94b328c..a112960021 100644
--- a/crypto/ec/ec_check.c
+++ b/crypto/ec/ec_check.c
@@ -17,7 +17,7 @@
#include <openssl/err.h>
int EC_GROUP_check_named_curve(const EC_GROUP *group, int nist_only,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
int nid;
BN_CTX *new_ctx = NULL;
@@ -47,9 +47,9 @@ int EC_GROUP_check(const EC_GROUP *group, BN_CTX *ctx)
{
#ifdef FIPS_MODULE
/*
- * ECC domain parameter validation.
- * See SP800-56A R3 5.5.2 "Assurances of Domain-Parameter Validity" Part 1b.
- */
+ * ECC domain parameter validation.
+ * See SP800-56A R3 5.5.2 "Assurances of Domain-Parameter Validity" Part 1b.
+ */
return EC_GROUP_check_named_curve(group, 1, ctx) >= 0 ? 1 : 0;
#else
int ret = 0;
@@ -110,7 +110,7 @@ int EC_GROUP_check(const EC_GROUP *group, BN_CTX *ctx)
ret = 1;
- err:
+err:
BN_CTX_free(new_ctx);
EC_POINT_free(point);
return ret;
diff --git a/crypto/ec/ec_curve.c b/crypto/ec/ec_curve.c
index 723f41e6ab..c6845942c2 100644
--- a/crypto/ec/ec_curve.c
+++ b/crypto/ec/ec_curve.c
@@ -23,10 +23,10 @@
#include "internal/nelem.h"
typedef struct {
- int field_type, /* either NID_X9_62_prime_field or
- * NID_X9_62_characteristic_two_field */
- seed_len, param_len;
- unsigned int cofactor; /* promoted to BN_ULONG */
+ int field_type, /* either NID_X9_62_prime_field or
+ * NID_X9_62_characteristic_two_field */
+ seed_len, param_len;
+ unsigned int cofactor; /* promoted to BN_ULONG */
} EC_CURVE_DATA;
/* the nist prime curves */
@@ -34,11 +34,8 @@ static const struct {
EC_CURVE_DATA h;
unsigned char data[20 + 24 * 6];
} _EC_NIST_PRIME_192 = {
- {
- NID_X9_62_prime_field, 20, 24, 1
- },
- {
- /* seed */
+ { NID_X9_62_prime_field, 20, 24, 1 },
+ { /* seed */
0x30, 0x45, 0xAE, 0x6F, 0xC8, 0x42, 0x2F, 0x64, 0xED, 0x57, 0x95, 0x28,
0xD3, 0x81, 0x20, 0xEA, 0xE1, 0x21, 0x96, 0xD5,
/* p */
@@ -58,19 +55,15 @@ static const struct {
0x6b, 0x24, 0xcd, 0xd5, 0x73, 0xf9, 0x77, 0xa1, 0x1e, 0x79, 0x48, 0x11,
/* order */
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0x99, 0xDE, 0xF8, 0x36, 0x14, 0x6B, 0xC9, 0xB1, 0xB4, 0xD2, 0x28, 0x31
- }
+ 0x99, 0xDE, 0xF8, 0x36, 0x14, 0x6B, 0xC9, 0xB1, 0xB4, 0xD2, 0x28, 0x31 }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[20 + 28 * 6];
} _EC_NIST_PRIME_224 = {
- {
- NID_X9_62_prime_field, 20, 28, 1
- },
- {
- /* seed */
+ { NID_X9_62_prime_field, 20, 28, 1 },
+ { /* seed */
0xBD, 0x71, 0x34, 0x47, 0x99, 0xD5, 0xC7, 0xFC, 0xDC, 0x45, 0xB5, 0x9F,
0xA3, 0xB9, 0xAB, 0x8F, 0x6A, 0x94, 0x8B, 0xC5,
/* p */
@@ -96,19 +89,15 @@ static const struct {
/* order */
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0x16, 0xA2, 0xE0, 0xB8, 0xF0, 0x3E, 0x13, 0xDD, 0x29, 0x45,
- 0x5C, 0x5C, 0x2A, 0x3D
- }
+ 0x5C, 0x5C, 0x2A, 0x3D }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[20 + 48 * 6];
} _EC_NIST_PRIME_384 = {
- {
- NID_X9_62_prime_field, 20, 48, 1
- },
- {
- /* seed */
+ { NID_X9_62_prime_field, 20, 48, 1 },
+ { /* seed */
0xA3, 0x35, 0x92, 0x6A, 0xA3, 0x19, 0xA2, 0x7A, 0x1D, 0x00, 0x89, 0x6A,
0x67, 0x73, 0xA4, 0x82, 0x7A, 0xCD, 0xAC, 0x73,
/* p */
@@ -140,19 +129,15 @@ static const struct {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xC7, 0x63, 0x4D, 0x81, 0xF4, 0x37, 0x2D, 0xDF, 0x58, 0x1A, 0x0D, 0xB2,
- 0x48, 0xB0, 0xA7, 0x7A, 0xEC, 0xEC, 0x19, 0x6A, 0xCC, 0xC5, 0x29, 0x73
- }
+ 0x48, 0xB0, 0xA7, 0x7A, 0xEC, 0xEC, 0x19, 0x6A, 0xCC, 0xC5, 0x29, 0x73 }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[20 + 66 * 6];
} _EC_NIST_PRIME_521 = {
- {
- NID_X9_62_prime_field, 20, 66, 1
- },
- {
- /* seed */
+ { NID_X9_62_prime_field, 20, 66, 1 },
+ { /* seed */
0xD0, 0x9E, 0x88, 0x00, 0x29, 0x1C, 0xB8, 0x53, 0x96, 0xCC, 0x67, 0x17,
0x39, 0x32, 0x84, 0xAA, 0xA0, 0xDA, 0x64, 0xBA,
/* p */
@@ -196,21 +181,17 @@ static const struct {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x51, 0x86,
0x87, 0x83, 0xBF, 0x2F, 0x96, 0x6B, 0x7F, 0xCC, 0x01, 0x48, 0xF7, 0x09,
0xA5, 0xD0, 0x3B, 0xB5, 0xC9, 0xB8, 0x89, 0x9C, 0x47, 0xAE, 0xBB, 0x6F,
- 0xB7, 0x1E, 0x91, 0x38, 0x64, 0x09
- }
+ 0xB7, 0x1E, 0x91, 0x38, 0x64, 0x09 }
};
-# ifndef FIPS_MODULE
+#ifndef FIPS_MODULE
/* the x9.62 prime curves (minus the nist prime curves) */
static const struct {
EC_CURVE_DATA h;
unsigned char data[20 + 24 * 6];
} _EC_X9_62_PRIME_192V2 = {
- {
- NID_X9_62_prime_field, 20, 24, 1
- },
- {
- /* seed */
+ { NID_X9_62_prime_field, 20, 24, 1 },
+ { /* seed */
0x31, 0xA9, 0x2E, 0xE2, 0x02, 0x9F, 0xD1, 0x0D, 0x90, 0x1B, 0x11, 0x3E,
0x99, 0x07, 0x10, 0xF0, 0xD2, 0x1A, 0xC6, 0xB6,
/* p */
@@ -230,19 +211,15 @@ static const struct {
0x08, 0x3d, 0xf2, 0xf2, 0xb0, 0x84, 0x7d, 0xe9, 0x70, 0xb2, 0xde, 0x15,
/* order */
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE,
- 0x5F, 0xB1, 0xA7, 0x24, 0xDC, 0x80, 0x41, 0x86, 0x48, 0xD8, 0xDD, 0x31
- }
+ 0x5F, 0xB1, 0xA7, 0x24, 0xDC, 0x80, 0x41, 0x86, 0x48, 0xD8, 0xDD, 0x31 }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[20 + 24 * 6];
} _EC_X9_62_PRIME_192V3 = {
- {
- NID_X9_62_prime_field, 20, 24, 1
- },
- {
- /* seed */
+ { NID_X9_62_prime_field, 20, 24, 1 },
+ { /* seed */
0xC4, 0x69, 0x68, 0x44, 0x35, 0xDE, 0xB3, 0x78, 0xC4, 0xB6, 0x5C, 0xA9,
0x59, 0x1E, 0x2A, 0x57, 0x63, 0x05, 0x9A, 0x2E,
/* p */
@@ -262,19 +239,15 @@ static const struct {
0x6a, 0x6d, 0xc8, 0xf9, 0x97, 0x8a, 0xca, 0x76, 0x48, 0xa9, 0x43, 0xb0,
/* order */
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0x7A, 0x62, 0xD0, 0x31, 0xC8, 0x3F, 0x42, 0x94, 0xF6, 0x40, 0xEC, 0x13
- }
+ 0x7A, 0x62, 0xD0, 0x31, 0xC8, 0x3F, 0x42, 0x94, 0xF6, 0x40, 0xEC, 0x13 }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[20 + 30 * 6];
} _EC_X9_62_PRIME_239V1 = {
- {
- NID_X9_62_prime_field, 20, 30, 1
- },
- {
- /* seed */
+ { NID_X9_62_prime_field, 20, 30, 1 },
+ { /* seed */
0xE4, 0x3B, 0xB4, 0x60, 0xF0, 0xB8, 0x0C, 0xC0, 0xC0, 0xB0, 0x75, 0x79,
0x8E, 0x94, 0x80, 0x60, 0xF8, 0x32, 0x1B, 0x7D,
/* p */
@@ -300,19 +273,15 @@ static const struct {
/* order */
0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0x7F, 0xFF, 0xFF, 0x9E, 0x5E, 0x9A, 0x9F, 0x5D, 0x90, 0x71, 0xFB, 0xD1,
- 0x52, 0x26, 0x88, 0x90, 0x9D, 0x0B
- }
+ 0x52, 0x26, 0x88, 0x90, 0x9D, 0x0B }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[20 + 30 * 6];
} _EC_X9_62_PRIME_239V2 = {
- {
- NID_X9_62_prime_field, 20, 30, 1
- },
- {
- /* seed */
+ { NID_X9_62_prime_field, 20, 30, 1 },
+ { /* seed */
0xE8, 0xB4, 0x01, 0x16, 0x04, 0x09, 0x53, 0x03, 0xCA, 0x3B, 0x80, 0x99,
0x98, 0x2B, 0xE0, 0x9F, 0xCB, 0x9A, 0xE6, 0x16,
/* p */
@@ -338,19 +307,15 @@ static const struct {
/* order */
0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0x80, 0x00, 0x00, 0xCF, 0xA7, 0xE8, 0x59, 0x43, 0x77, 0xD4, 0x14, 0xC0,
- 0x38, 0x21, 0xBC, 0x58, 0x20, 0x63
- }
+ 0x38, 0x21, 0xBC, 0x58, 0x20, 0x63 }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[20 + 30 * 6];
} _EC_X9_62_PRIME_239V3 = {
- {
- NID_X9_62_prime_field, 20, 30, 1
- },
- {
- /* seed */
+ { NID_X9_62_prime_field, 20, 30, 1 },
+ { /* seed */
0x7D, 0x73, 0x74, 0x16, 0x8F, 0xFE, 0x34, 0x71, 0xB6, 0x0A, 0x85, 0x76,
0x86, 0xA1, 0x94, 0x75, 0xD3, 0xBF, 0xA2, 0xFF,
/* p */
@@ -376,8 +341,7 @@ static const struct {
/* order */
0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0x7F, 0xFF, 0xFF, 0x97, 0x5D, 0xEB, 0x41, 0xB3, 0xA6, 0x05, 0x7C, 0x3C,
- 0x43, 0x21, 0x46, 0x52, 0x65, 0x51
- }
+ 0x43, 0x21, 0x46, 0x52, 0x65, 0x51 }
};
#endif /* FIPS_MODULE */
@@ -385,11 +349,8 @@ static const struct {
EC_CURVE_DATA h;
unsigned char data[20 + 32 * 8];
} _EC_X9_62_PRIME_256V1 = {
- {
- NID_X9_62_prime_field, 20, 32, 1
- },
- {
- /* seed */
+ { NID_X9_62_prime_field, 20, 32, 1 },
+ { /* seed */
0xC4, 0x9D, 0x36, 0x08, 0x86, 0xE7, 0x04, 0x93, 0x6A, 0x66, 0x78, 0xE1,
0x13, 0x9D, 0x26, 0xB7, 0x81, 0x9F, 0x7E, 0x90,
/* p */
@@ -423,8 +384,7 @@ static const struct {
/* RR for order */
0x66, 0xe1, 0x2d, 0x94, 0xf3, 0xd9, 0x56, 0x20, 0x28, 0x45, 0xb2, 0x39,
0x2b, 0x6b, 0xec, 0x59, 0x46, 0x99, 0x79, 0x9c, 0x49, 0xbd, 0x6f, 0xa6,
- 0x83, 0x24, 0x4c, 0x95, 0xbe, 0x79, 0xee, 0xa2
- }
+ 0x83, 0x24, 0x4c, 0x95, 0xbe, 0x79, 0xee, 0xa2 }
};
#ifndef FIPS_MODULE
@@ -433,11 +393,8 @@ static const struct {
EC_CURVE_DATA h;
unsigned char data[20 + 14 * 6];
} _EC_SECG_PRIME_112R1 = {
- {
- NID_X9_62_prime_field, 20, 14, 1
- },
- {
- /* seed */
+ { NID_X9_62_prime_field, 20, 14, 1 },
+ { /* seed */
0x00, 0xF5, 0x0B, 0x02, 0x8E, 0x4D, 0x69, 0x6E, 0x67, 0x68, 0x75, 0x61,
0x51, 0x75, 0x29, 0x04, 0x72, 0x78, 0x3F, 0xB1,
/* p */
@@ -457,19 +414,15 @@ static const struct {
0x75, 0x00,
/* order */
0xDB, 0x7C, 0x2A, 0xBF, 0x62, 0xE3, 0x5E, 0x76, 0x28, 0xDF, 0xAC, 0x65,
- 0x61, 0xC5
- }
+ 0x61, 0xC5 }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[20 + 14 * 6];
} _EC_SECG_PRIME_112R2 = {
- {
- NID_X9_62_prime_field, 20, 14, 4
- },
- {
- /* seed */
+ { NID_X9_62_prime_field, 20, 14, 4 },
+ { /* seed */
0x00, 0x27, 0x57, 0xA1, 0x11, 0x4D, 0x69, 0x6E, 0x67, 0x68, 0x75, 0x61,
0x51, 0x75, 0x53, 0x16, 0xC0, 0x5E, 0x0B, 0xD4,
/* p */
@@ -489,19 +442,15 @@ static const struct {
0x6e, 0x97,
/* order */
0x36, 0xDF, 0x0A, 0xAF, 0xD8, 0xB8, 0xD7, 0x59, 0x7C, 0xA1, 0x05, 0x20,
- 0xD0, 0x4B
- }
+ 0xD0, 0x4B }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[20 + 16 * 6];
} _EC_SECG_PRIME_128R1 = {
- {
- NID_X9_62_prime_field, 20, 16, 1
- },
- {
- /* seed */
+ { NID_X9_62_prime_field, 20, 16, 1 },
+ { /* seed */
0x00, 0x0E, 0x0D, 0x4D, 0x69, 0x6E, 0x67, 0x68, 0x75, 0x61, 0x51, 0x75,
0x0C, 0xC0, 0x3A, 0x44, 0x73, 0xD0, 0x36, 0x79,
/* p */
@@ -521,19 +470,15 @@ static const struct {
0xdd, 0xed, 0x7a, 0x83,
/* order */
0xFF, 0xFF, 0xFF, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x75, 0xA3, 0x0D, 0x1B,
- 0x90, 0x38, 0xA1, 0x15
- }
+ 0x90, 0x38, 0xA1, 0x15 }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[20 + 16 * 6];
} _EC_SECG_PRIME_128R2 = {
- {
- NID_X9_62_prime_field, 20, 16, 4
- },
- {
- /* seed */
+ { NID_X9_62_prime_field, 20, 16, 4 },
+ { /* seed */
0x00, 0x4D, 0x69, 0x6E, 0x67, 0x68, 0x75, 0x61, 0x51, 0x75, 0x12, 0xD8,
0xF0, 0x34, 0x31, 0xFC, 0xE6, 0x3B, 0x88, 0xF4,
/* p */
@@ -553,19 +498,15 @@ static const struct {
0x5f, 0xc3, 0x4b, 0x44,
/* order */
0x3F, 0xFF, 0xFF, 0xFF, 0x7F, 0xFF, 0xFF, 0xFF, 0xBE, 0x00, 0x24, 0x72,
- 0x06, 0x13, 0xB5, 0xA3
- }
+ 0x06, 0x13, 0xB5, 0xA3 }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[0 + 21 * 6];
} _EC_SECG_PRIME_160K1 = {
- {
- NID_X9_62_prime_field, 0, 21, 1
- },
- {
- /* no seed */
+ { NID_X9_62_prime_field, 0, 21, 1 },
+ { /* no seed */
/* p */
0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0xFF, 0xAC, 0x73,
@@ -583,19 +524,15 @@ static const struct {
0x86, 0x53, 0x17, 0x33, 0xc3, 0xf0, 0x3c, 0x4f, 0xee,
/* order */
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xB8,
- 0xFA, 0x16, 0xDF, 0xAB, 0x9A, 0xCA, 0x16, 0xB6, 0xB3
- }
+ 0xFA, 0x16, 0xDF, 0xAB, 0x9A, 0xCA, 0x16, 0xB6, 0xB3 }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[20 + 21 * 6];
} _EC_SECG_PRIME_160R1 = {
- {
- NID_X9_62_prime_field, 20, 21, 1
- },
- {
- /* seed */
+ { NID_X9_62_prime_field, 20, 21, 1 },
+ { /* seed */
0x10, 0x53, 0xCD, 0xE4, 0x2C, 0x14, 0xD6, 0x96, 0xE6, 0x76, 0x87, 0x56,
0x15, 0x17, 0x53, 0x3B, 0xF3, 0xF8, 0x33, 0x45,
/* p */
@@ -615,19 +552,15 @@ static const struct {
0x12, 0x04, 0x23, 0x51, 0x37, 0x7a, 0xc5, 0xfb, 0x32,
/* order */
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xF4,
- 0xC8, 0xF9, 0x27, 0xAE, 0xD3, 0xCA, 0x75, 0x22, 0x57
- }
+ 0xC8, 0xF9, 0x27, 0xAE, 0xD3, 0xCA, 0x75, 0x22, 0x57 }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[20 + 21 * 6];
} _EC_SECG_PRIME_160R2 = {
- {
- NID_X9_62_prime_field, 20, 21, 1
- },
- {
- /* seed */
+ { NID_X9_62_prime_field, 20, 21, 1 },
+ { /* seed */
0xB9, 0x9B, 0x99, 0xB0, 0x99, 0xB3, 0x23, 0xE0, 0x27, 0x09, 0xA4, 0xD6,
0x96, 0xE6, 0x76, 0x87, 0x56, 0x15, 0x17, 0x51,
/* p */
@@ -647,19 +580,15 @@ static const struct {
0x0d, 0xf9, 0x98, 0x2c, 0xfe, 0xa7, 0xd4, 0x3f, 0x2e,
/* order */
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x35,
- 0x1E, 0xE7, 0x86, 0xA8, 0x18, 0xF3, 0xA1, 0xA1, 0x6B
- }
+ 0x1E, 0xE7, 0x86, 0xA8, 0x18, 0xF3, 0xA1, 0xA1, 0x6B }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[0 + 24 * 6];
} _EC_SECG_PRIME_192K1 = {
- {
- NID_X9_62_prime_field, 0, 24, 1
- },
- {
- /* no seed */
+ { NID_X9_62_prime_field, 0, 24, 1 },
+ { /* no seed */
/* p */
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0xFF, 0xEE, 0x37,
@@ -677,19 +606,15 @@ static const struct {
0x15, 0xbe, 0x86, 0x34, 0x40, 0x82, 0xaa, 0x88, 0xd9, 0x5e, 0x2f, 0x9d,
/* order */
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE,
- 0x26, 0xF2, 0xFC, 0x17, 0x0F, 0x69, 0x46, 0x6A, 0x74, 0xDE, 0xFD, 0x8D
- }
+ 0x26, 0xF2, 0xFC, 0x17, 0x0F, 0x69, 0x46, 0x6A, 0x74, 0xDE, 0xFD, 0x8D }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[0 + 29 * 6];
} _EC_SECG_PRIME_224K1 = {
- {
- NID_X9_62_prime_field, 0, 29, 1
- },
- {
- /* no seed */
+ { NID_X9_62_prime_field, 0, 29, 1 },
+ { /* no seed */
/* p */
0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -713,19 +638,15 @@ static const struct {
/* order */
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x01, 0xDC, 0xE8, 0xD2, 0xEC, 0x61, 0x84, 0xCA, 0xF0, 0xA9,
- 0x71, 0x76, 0x9F, 0xB1, 0xF7
- }
+ 0x71, 0x76, 0x9F, 0xB1, 0xF7 }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[0 + 32 * 6];
} _EC_SECG_PRIME_256K1 = {
- {
- NID_X9_62_prime_field, 0, 32, 1
- },
- {
- /* no seed */
+ { NID_X9_62_prime_field, 0, 32, 1 },
+ { /* no seed */
/* p */
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -749,8 +670,7 @@ static const struct {
/* order */
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFE, 0xBA, 0xAE, 0xDC, 0xE6, 0xAF, 0x48, 0xA0, 0x3B,
- 0xBF, 0xD2, 0x5E, 0x8C, 0xD0, 0x36, 0x41, 0x41
- }
+ 0xBF, 0xD2, 0x5E, 0x8C, 0xD0, 0x36, 0x41, 0x41 }
};
/* some wap/wtls curves */
@@ -758,11 +678,8 @@ static const struct {
EC_CURVE_DATA h;
unsigned char data[0 + 15 * 6];
} _EC_WTLS_8 = {
- {
- NID_X9_62_prime_field, 0, 15, 1
- },
- {
- /* no seed */
+ { NID_X9_62_prime_field, 0, 15, 1 },
+ { /* no seed */
/* p */
0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFD, 0xE7,
@@ -780,19 +697,15 @@ static const struct {
0x00, 0x00, 0x02,
/* order */
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xEC, 0xEA, 0x55, 0x1A,
- 0xD8, 0x37, 0xE9
- }
+ 0xD8, 0x37, 0xE9 }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[0 + 21 * 6];
} _EC_WTLS_9 = {
- {
- NID_X9_62_prime_field, 0, 21, 1
- },
- {
- /* no seed */
+ { NID_X9_62_prime_field, 0, 21, 1 },
+ { /* no seed */
/* p */
0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x80, 0x8F,
@@ -810,19 +723,15 @@ static const struct {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
/* order */
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xCD,
- 0xC9, 0x8A, 0xE0, 0xE2, 0xDE, 0x57, 0x4A, 0xBF, 0x33
- }
+ 0xC9, 0x8A, 0xE0, 0xE2, 0xDE, 0x57, 0x4A, 0xBF, 0x33 }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[0 + 28 * 6];
} _EC_WTLS_12 = {
- {
- NID_X9_62_prime_field, 0, 28, 1
- },
- {
- /* no seed */
+ { NID_X9_62_prime_field, 0, 28, 1 },
+ { /* no seed */
/* p */
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -846,8 +755,7 @@ static const struct {
/* order */
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0x16, 0xA2, 0xE0, 0xB8, 0xF0, 0x3E, 0x13, 0xDD, 0x29, 0x45,
- 0x5C, 0x5C, 0x2A, 0x3D
- }
+ 0x5C, 0x5C, 0x2A, 0x3D }
};
#endif /* FIPS_MODULE */
@@ -855,16 +763,13 @@ static const struct {
/* characteristic two curves */
-# ifndef FIPS_MODULE
+#ifndef FIPS_MODULE
static const struct {
EC_CURVE_DATA h;
unsigned char data[20 + 15 * 6];
} _EC_SECG_CHAR2_113R1 = {
- {
- NID_X9_62_characteristic_two_field, 20, 15, 2
- },
- {
- /* seed */
+ { NID_X9_62_characteristic_two_field, 20, 15, 2 },
+ { /* seed */
0x10, 0xE7, 0x23, 0xAB, 0x14, 0xD6, 0x96, 0xE6, 0x76, 0x87, 0x56, 0x15,
0x17, 0x56, 0xFE, 0xBF, 0x8F, 0xCB, 0x49, 0xA9,
/* p */
@@ -884,19 +789,15 @@ static const struct {
0xD3, 0x18, 0x86,
/* order */
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD9, 0xCC, 0xEC, 0x8A,
- 0x39, 0xE5, 0x6F
- }
+ 0x39, 0xE5, 0x6F }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[20 + 15 * 6];
} _EC_SECG_CHAR2_113R2 = {
- {
- NID_X9_62_characteristic_two_field, 20, 15, 2
- },
- {
- /* seed */
+ { NID_X9_62_characteristic_two_field, 20, 15, 2 },
+ { /* seed */
0x10, 0xC0, 0xFB, 0x15, 0x76, 0x08, 0x60, 0xDE, 0xF1, 0xEE, 0xF4, 0xD6,
0x96, 0xE6, 0x76, 0x87, 0x56, 0x15, 0x17, 0x5D,
/* p */
@@ -916,19 +817,15 @@ static const struct {
0xBA, 0xBA, 0x1D,
/* order */
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08, 0x78, 0x9B, 0x24,
- 0x96, 0xAF, 0x93
- }
+ 0x96, 0xAF, 0x93 }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[20 + 17 * 6];
} _EC_SECG_CHAR2_131R1 = {
- {
- NID_X9_62_characteristic_two_field, 20, 17, 2
- },
- {
- /* seed */
+ { NID_X9_62_characteristic_two_field, 20, 17, 2 },
+ { /* seed */
0x4D, 0x69, 0x6E, 0x67, 0x68, 0x75, 0x61, 0x51, 0x75, 0x98, 0x5B, 0xD3,
0xAD, 0xBA, 0xDA, 0x21, 0xB4, 0x3A, 0x97, 0xE2,
/* p */
@@ -948,19 +845,15 @@ static const struct {
0x1B, 0x4E, 0xF9, 0xE1, 0x50,
/* order */
0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x31, 0x23, 0x95,
- 0x3A, 0x94, 0x64, 0xB5, 0x4D
- }
+ 0x3A, 0x94, 0x64, 0xB5, 0x4D }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[20 + 17 * 6];
} _EC_SECG_CHAR2_131R2 = {
- {
- NID_X9_62_characteristic_two_field, 20, 17, 2
- },
- {
- /* seed */
+ { NID_X9_62_characteristic_two_field, 20, 17, 2 },
+ { /* seed */
0x98, 0x5B, 0xD3, 0xAD, 0xBA, 0xD4, 0xD6, 0x96, 0xE6, 0x76, 0x87, 0x56,
0x15, 0x17, 0x5A, 0x21, 0xB4, 0x3A, 0x97, 0xE3,
/* p */
@@ -980,20 +873,16 @@ static const struct {
0x5D, 0xE9, 0xEB, 0x24, 0x0F,
/* order */
0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x69, 0x54, 0xA2,
- 0x33, 0x04, 0x9B, 0xA9, 0x8F
- }
+ 0x33, 0x04, 0x9B, 0xA9, 0x8F }
};
-# endif /* FIPS_MODULE */
+#endif /* FIPS_MODULE */
static const struct {
EC_CURVE_DATA h;
unsigned char data[0 + 21 * 6];
} _EC_NIST_CHAR2_163K = {
- {
- NID_X9_62_characteristic_two_field, 0, 21, 2
- },
- {
- /* no seed */
+ { NID_X9_62_characteristic_two_field, 0, 21, 2 },
+ { /* no seed */
/* p */
0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC9,
@@ -1011,20 +900,16 @@ static const struct {
0x80, 0x05, 0x36, 0xD5, 0x38, 0xCC, 0xDA, 0xA3, 0xD9,
/* order */
0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01,
- 0x08, 0xA2, 0xE0, 0xCC, 0x0D, 0x99, 0xF8, 0xA5, 0xEF
- }
+ 0x08, 0xA2, 0xE0, 0xCC, 0x0D, 0x99, 0xF8, 0xA5, 0xEF }
};
-# ifndef FIPS_MODULE
+#ifndef FIPS_MODULE
static const struct {
EC_CURVE_DATA h;
unsigned char data[0 + 21 * 6];
} _EC_SECG_CHAR2_163R1 = {
- {
- NID_X9_62_characteristic_two_field, 0, 21, 2
- },
- {
- /* p */
+ { NID_X9_62_characteristic_two_field, 0, 21, 2 },
+ { /* p */
0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC9,
/* a */
@@ -1041,20 +926,16 @@ static const struct {
0xFC, 0xE3, 0xC8, 0x09, 0x88, 0xF4, 0x1F, 0xF8, 0x83,
/* order */
0x03, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x48,
- 0xAA, 0xB6, 0x89, 0xC2, 0x9C, 0xA7, 0x10, 0x27, 0x9B
- }
+ 0xAA, 0xB6, 0x89, 0xC2, 0x9C, 0xA7, 0x10, 0x27, 0x9B }
};
-# endif /* FIPS_MODULE */
+#endif /* FIPS_MODULE */
static const struct {
EC_CURVE_DATA h;
unsigned char data[0 + 21 * 6];
} _EC_NIST_CHAR2_163B = {
- {
- NID_X9_62_characteristic_two_field, 0, 21, 2
- },
- {
- /* p */
+ { NID_X9_62_characteristic_two_field, 0, 21, 2 },
+ { /* p */
0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC9,
/* a */
@@ -1071,20 +952,16 @@ static const struct {
0x45, 0xB1, 0x1C, 0x5C, 0x0C, 0x79, 0x73, 0x24, 0xF1,
/* order */
0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x92,
- 0xFE, 0x77, 0xE7, 0x0C, 0x12, 0xA4, 0x23, 0x4C, 0x33
- }
+ 0xFE, 0x77, 0xE7, 0x0C, 0x12, 0xA4, 0x23, 0x4C, 0x33 }
};
-# ifndef FIPS_MODULE
+#ifndef FIPS_MODULE
static const struct {
EC_CURVE_DATA h;
unsigned char data[20 + 25 * 6];
} _EC_SECG_CHAR2_193R1 = {
- {
- NID_X9_62_characteristic_two_field, 20, 25, 2
- },
- {
- /* seed */
+ { NID_X9_62_characteristic_two_field, 20, 25, 2 },
+ { /* seed */
0x10, 0x3F, 0xAE, 0xC7, 0x4D, 0x69, 0x6E, 0x67, 0x68, 0x75, 0x61, 0x51,
0x75, 0x77, 0x7F, 0xC5, 0xB1, 0x91, 0xEF, 0x30,
/* p */
@@ -1110,19 +987,15 @@ static const struct {
/* order */
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0xC7, 0xF3, 0x4A, 0x77, 0x8F, 0x44, 0x3A, 0xCC, 0x92, 0x0E, 0xBA,
- 0x49
- }
+ 0x49 }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[20 + 25 * 6];
} _EC_SECG_CHAR2_193R2 = {
- {
- NID_X9_62_characteristic_two_field, 20, 25, 2
- },
- {
- /* seed */
+ { NID_X9_62_characteristic_two_field, 20, 25, 2 },
+ { /* seed */
0x10, 0xB7, 0xB4, 0xD6, 0x96, 0xE6, 0x76, 0x87, 0x56, 0x15, 0x17, 0x51,
0x37, 0xC8, 0xA1, 0x6F, 0xD0, 0xDA, 0x22, 0x11,
/* p */
@@ -1148,20 +1021,16 @@ static const struct {
/* order */
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x01, 0x5A, 0xAB, 0x56, 0x1B, 0x00, 0x54, 0x13, 0xCC, 0xD4, 0xEE, 0x99,
- 0xD5
- }
+ 0xD5 }
};
-# endif /* FIPS_MODULE */
+#endif /* FIPS_MODULE */
static const struct {
EC_CURVE_DATA h;
unsigned char data[0 + 30 * 6];
} _EC_NIST_CHAR2_233K = {
- {
- NID_X9_62_characteristic_two_field, 0, 30, 4
- },
- {
- /* no seed */
+ { NID_X9_62_characteristic_two_field, 0, 30, 4 },
+ { /* no seed */
/* p */
0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
@@ -1185,19 +1054,15 @@ static const struct {
/* order */
0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x06, 0x9D, 0x5B, 0xB9, 0x15, 0xBC, 0xD4, 0x6E, 0xFB,
- 0x1A, 0xD5, 0xF1, 0x73, 0xAB, 0xDF
- }
+ 0x1A, 0xD5, 0xF1, 0x73, 0xAB, 0xDF }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[20 + 30 * 6];
} _EC_NIST_CHAR2_233B = {
- {
- NID_X9_62_characteristic_two_field, 20, 30, 2
- },
- {
- /* seed */
+ { NID_X9_62_characteristic_two_field, 20, 30, 2 },
+ { /* seed */
0x74, 0xD5, 0x9F, 0xF0, 0x7F, 0x6B, 0x41, 0x3D, 0x0E, 0xA1, 0x4B, 0x34,
0x4B, 0x20, 0xA2, 0xDB, 0x04, 0x9B, 0x50, 0xC3,
/* p */
@@ -1223,8 +1088,7 @@ static const struct {
/* order */
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x13, 0xE9, 0x74, 0xE7, 0x2F, 0x8A, 0x69, 0x22, 0x03,
- 0x1D, 0x26, 0x03, 0xCF, 0xE0, 0xD7
- }
+ 0x1D, 0x26, 0x03, 0xCF, 0xE0, 0xD7 }
};
#ifndef FIPS_MODULE
@@ -1232,11 +1096,8 @@ static const struct {
EC_CURVE_DATA h;
unsigned char data[0 + 30 * 6];
} _EC_SECG_CHAR2_239K1 = {
- {
- NID_X9_62_characteristic_two_field, 0, 30, 4
- },
- {
- /* no seed */
+ { NID_X9_62_characteristic_two_field, 0, 30, 4 },
+ { /* no seed */
/* p */
0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1260,20 +1121,16 @@ static const struct {
/* order */
0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x5A, 0x79, 0xFE, 0xC6, 0x7C, 0xB6, 0xE9, 0x1F, 0x1C,
- 0x1D, 0xA8, 0x00, 0xE4, 0x78, 0xA5
- }
+ 0x1D, 0xA8, 0x00, 0xE4, 0x78, 0xA5 }
};
-# endif /* FIPS_MODULE */
+#endif /* FIPS_MODULE */
static const struct {
EC_CURVE_DATA h;
unsigned char data[0 + 36 * 6];
} _EC_NIST_CHAR2_283K = {
- {
- NID_X9_62_characteristic_two_field, 0, 36, 4
- },
- {
- /* no seed */
+ { NID_X9_62_characteristic_two_field, 0, 36, 4 },
+ { /* no seed */
/* p */
0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1297,19 +1154,15 @@ static const struct {
/* order */
0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xE9, 0xAE, 0x2E, 0xD0, 0x75, 0x77,
- 0x26, 0x5D, 0xFF, 0x7F, 0x94, 0x45, 0x1E, 0x06, 0x1E, 0x16, 0x3C, 0x61
- }
+ 0x26, 0x5D, 0xFF, 0x7F, 0x94, 0x45, 0x1E, 0x06, 0x1E, 0x16, 0x3C, 0x61 }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[20 + 36 * 6];
} _EC_NIST_CHAR2_283B = {
- {
- NID_X9_62_characteristic_two_field, 20, 36, 2
- },
- {
- /* seed */
+ { NID_X9_62_characteristic_two_field, 20, 36, 2 },
+ { /* seed */
0x77, 0xE2, 0xB0, 0x73, 0x70, 0xEB, 0x0F, 0x83, 0x2A, 0x6D, 0xD5, 0xB6,
0x2D, 0xFC, 0x88, 0xCD, 0x06, 0xBB, 0x84, 0xBE,
/* p */
@@ -1335,19 +1188,15 @@ static const struct {
/* order */
0x03, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xEF, 0x90, 0x39, 0x96, 0x60, 0xFC,
- 0x93, 0x8A, 0x90, 0x16, 0x5B, 0x04, 0x2A, 0x7C, 0xEF, 0xAD, 0xB3, 0x07
- }
+ 0x93, 0x8A, 0x90, 0x16, 0x5B, 0x04, 0x2A, 0x7C, 0xEF, 0xAD, 0xB3, 0x07 }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[0 + 52 * 6];
} _EC_NIST_CHAR2_409K = {
- {
- NID_X9_62_characteristic_two_field, 0, 52, 4
- },
- {
- /* no seed */
+ { NID_X9_62_characteristic_two_field, 0, 52, 4 },
+ { /* no seed */
/* p */
0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1383,19 +1232,15 @@ static const struct {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFE, 0x5F, 0x83, 0xB2, 0xD4, 0xEA, 0x20, 0x40, 0x0E, 0xC4,
0x55, 0x7D, 0x5E, 0xD3, 0xE3, 0xE7, 0xCA, 0x5B, 0x4B, 0x5C, 0x83, 0xB8,
- 0xE0, 0x1E, 0x5F, 0xCF
- }
+ 0xE0, 0x1E, 0x5F, 0xCF }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[20 + 52 * 6];
} _EC_NIST_CHAR2_409B = {
- {
- NID_X9_62_characteristic_two_field, 20, 52, 2
- },
- {
- /* seed */
+ { NID_X9_62_characteristic_two_field, 20, 52, 2 },
+ { /* seed */
0x40, 0x99, 0xB5, 0xA4, 0x57, 0xF9, 0xD6, 0x9F, 0x79, 0x21, 0x3D, 0x09,
0x4C, 0x4B, 0xCD, 0x4D, 0x42, 0x62, 0x21, 0x0B,
/* p */
@@ -1433,19 +1278,15 @@ static const struct {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x01, 0xE2, 0xAA, 0xD6, 0xA6, 0x12, 0xF3, 0x33, 0x07, 0xBE,
0x5F, 0xA4, 0x7C, 0x3C, 0x9E, 0x05, 0x2F, 0x83, 0x81, 0x64, 0xCD, 0x37,
- 0xD9, 0xA2, 0x11, 0x73
- }
+ 0xD9, 0xA2, 0x11, 0x73 }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[0 + 72 * 6];
} _EC_NIST_CHAR2_571K = {
- {
- NID_X9_62_characteristic_two_field, 0, 72, 4
- },
- {
- /* no seed */
+ { NID_X9_62_characteristic_two_field, 0, 72, 4 },
+ { /* no seed */
/* p */
0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1487,19 +1328,15 @@ static const struct {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x13, 0x18, 0x50, 0xE1, 0xF1, 0x9A, 0x63, 0xE4, 0xB3, 0x91, 0xA8, 0xDB,
0x91, 0x7F, 0x41, 0x38, 0xB6, 0x30, 0xD8, 0x4B, 0xE5, 0xD6, 0x39, 0x38,
- 0x1E, 0x91, 0xDE, 0xB4, 0x5C, 0xFE, 0x77, 0x8F, 0x63, 0x7C, 0x10, 0x01
- }
+ 0x1E, 0x91, 0xDE, 0xB4, 0x5C, 0xFE, 0x77, 0x8F, 0x63, 0x7C, 0x10, 0x01 }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[20 + 72 * 6];
} _EC_NIST_CHAR2_571B = {
- {
- NID_X9_62_characteristic_two_field, 20, 72, 2
- },
- {
- /* seed */
+ { NID_X9_62_characteristic_two_field, 20, 72, 2 },
+ { /* seed */
0x2A, 0xA0, 0x58, 0xF7, 0x3A, 0x0E, 0x33, 0xAB, 0x48, 0x6B, 0x0F, 0x61,
0x04, 0x10, 0xC5, 0x3A, 0x7F, 0x13, 0x23, 0x10,
/* p */
@@ -1543,20 +1380,16 @@ static const struct {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xE6, 0x61, 0xCE, 0x18, 0xFF, 0x55, 0x98, 0x73, 0x08, 0x05, 0x9B, 0x18,
0x68, 0x23, 0x85, 0x1E, 0xC7, 0xDD, 0x9C, 0xA1, 0x16, 0x1D, 0xE9, 0x3D,
- 0x51, 0x74, 0xD6, 0x6E, 0x83, 0x82, 0xE9, 0xBB, 0x2F, 0xE8, 0x4E, 0x47
- }
+ 0x51, 0x74, 0xD6, 0x6E, 0x83, 0x82, 0xE9, 0xBB, 0x2F, 0xE8, 0x4E, 0x47 }
};
-# ifndef FIPS_MODULE
+#ifndef FIPS_MODULE
static const struct {
EC_CURVE_DATA h;
unsigned char data[20 + 21 * 6];
} _EC_X9_62_CHAR2_163V1 = {
- {
- NID_X9_62_characteristic_two_field, 20, 21, 2
- },
- {
- /* seed */
+ { NID_X9_62_characteristic_two_field, 20, 21, 2 },
+ { /* seed */
0xD2, 0xC0, 0xFB, 0x15, 0x76, 0x08, 0x60, 0xDE, 0xF1, 0xEE, 0xF4, 0xD6,
0x96, 0xE6, 0x76, 0x87, 0x56, 0x15, 0x17, 0x54,
/* p */
@@ -1576,19 +1409,15 @@ static const struct {
0xF7, 0xEA, 0x58, 0x48, 0xAE, 0xF0, 0xB7, 0xCA, 0x9F,
/* order */
0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xE6,
- 0x0F, 0xC8, 0x82, 0x1C, 0xC7, 0x4D, 0xAE, 0xAF, 0xC1
- }
+ 0x0F, 0xC8, 0x82, 0x1C, 0xC7, 0x4D, 0xAE, 0xAF, 0xC1 }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[20 + 21 * 6];
} _EC_X9_62_CHAR2_163V2 = {
- {
- NID_X9_62_characteristic_two_field, 20, 21, 2
- },
- {
- /* seed */
+ { NID_X9_62_characteristic_two_field, 20, 21, 2 },
+ { /* seed */
0x53, 0x81, 0x4C, 0x05, 0x0D, 0x44, 0xD6, 0x96, 0xE6, 0x76, 0x87, 0x56,
0x15, 0x17, 0x58, 0x0C, 0xA4, 0xE2, 0x9F, 0xFD,
/* p */
@@ -1608,19 +1437,15 @@ static const struct {
0x90, 0x02, 0x1B, 0x23, 0x86, 0xDF, 0xD1, 0x9F, 0xC5,
/* order */
0x03, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xF6,
- 0x4D, 0xE1, 0x15, 0x1A, 0xDB, 0xB7, 0x8F, 0x10, 0xA7
- }
+ 0x4D, 0xE1, 0x15, 0x1A, 0xDB, 0xB7, 0x8F, 0x10, 0xA7 }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[20 + 21 * 6];
} _EC_X9_62_CHAR2_163V3 = {
- {
- NID_X9_62_characteristic_two_field, 20, 21, 2
- },
- {
- /* seed */
+ { NID_X9_62_characteristic_two_field, 20, 21, 2 },
+ { /* seed */
0x50, 0xCB, 0xF1, 0xD9, 0x5C, 0xA9, 0x4D, 0x69, 0x6E, 0x67, 0x68, 0x75,
0x61, 0x51, 0x75, 0xF1, 0x6A, 0x36, 0xA3, 0xB8,
/* p */
@@ -1640,19 +1465,15 @@ static const struct {
0xF3, 0x71, 0x8B, 0x89, 0x3D, 0xF5, 0x9A, 0x05, 0xD0,
/* order */
0x03, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0x1A,
- 0xEE, 0x14, 0x0F, 0x11, 0x0A, 0xFF, 0x96, 0x13, 0x09
- }
+ 0xEE, 0x14, 0x0F, 0x11, 0x0A, 0xFF, 0x96, 0x13, 0x09 }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[0 + 23 * 6];
} _EC_X9_62_CHAR2_176V1 = {
- {
- NID_X9_62_characteristic_two_field, 0, 23, 0xFF6E
- },
- {
- /* no seed */
+ { NID_X9_62_characteristic_two_field, 0, 23, 0xFF6E },
+ { /* no seed */
/* p */
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x07,
@@ -1670,19 +1491,15 @@ static const struct {
0x7D, 0x61, 0xB4, 0x36, 0xE1, 0xD9, 0x2B, 0xB1, 0x6A, 0x56, 0x2C,
/* order */
0x00, 0x00, 0x01, 0x00, 0x92, 0x53, 0x73, 0x97, 0xEC, 0xA4, 0xF6, 0x14,
- 0x57, 0x99, 0xD6, 0x2B, 0x0A, 0x19, 0xCE, 0x06, 0xFE, 0x26, 0xAD
- }
+ 0x57, 0x99, 0xD6, 0x2B, 0x0A, 0x19, 0xCE, 0x06, 0xFE, 0x26, 0xAD }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[20 + 24 * 6];
} _EC_X9_62_CHAR2_191V1 = {
- {
- NID_X9_62_characteristic_two_field, 20, 24, 2
- },
- {
- /* seed */
+ { NID_X9_62_characteristic_two_field, 20, 24, 2 },
+ { /* seed */
0x4E, 0x13, 0xCA, 0x54, 0x27, 0x44, 0xD6, 0x96, 0xE6, 0x76, 0x87, 0x56,
0x15, 0x17, 0x55, 0x2F, 0x27, 0x9A, 0x8C, 0x84,
/* p */
@@ -1702,19 +1519,15 @@ static const struct {
0x0E, 0xA2, 0x45, 0xCA, 0x24, 0x18, 0xEA, 0x0E, 0xF9, 0x80, 0x18, 0xFB,
/* order */
0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x04, 0xA2, 0x0E, 0x90, 0xC3, 0x90, 0x67, 0xC8, 0x93, 0xBB, 0xB9, 0xA5
- }
+ 0x04, 0xA2, 0x0E, 0x90, 0xC3, 0x90, 0x67, 0xC8, 0x93, 0xBB, 0xB9, 0xA5 }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[20 + 24 * 6];
} _EC_X9_62_CHAR2_191V2 = {
- {
- NID_X9_62_characteristic_two_field, 20, 24, 4
- },
- {
- /* seed */
+ { NID_X9_62_characteristic_two_field, 20, 24, 4 },
+ { /* seed */
0x08, 0x71, 0xEF, 0x2F, 0xEF, 0x24, 0xD6, 0x96, 0xE6, 0x76, 0x87, 0x56,
0x15, 0x17, 0x58, 0xBE, 0xE0, 0xD9, 0x5C, 0x15,
/* p */
@@ -1734,19 +1547,15 @@ static const struct {
0xD9, 0x21, 0x3A, 0x3E, 0x1C, 0xF3, 0x7A, 0xEC, 0x43, 0x7D, 0x66, 0x8A,
/* order */
0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x50, 0x50, 0x8C, 0xB8, 0x9F, 0x65, 0x28, 0x24, 0xE0, 0x6B, 0x81, 0x73
- }
+ 0x50, 0x50, 0x8C, 0xB8, 0x9F, 0x65, 0x28, 0x24, 0xE0, 0x6B, 0x81, 0x73 }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[20 + 24 * 6];
} _EC_X9_62_CHAR2_191V3 = {
- {
- NID_X9_62_characteristic_two_field, 20, 24, 6
- },
- {
- /* seed */
+ { NID_X9_62_characteristic_two_field, 20, 24, 6 },
+ { /* seed */
0xE0, 0x53, 0x51, 0x2D, 0xC6, 0x84, 0xD6, 0x96, 0xE6, 0x76, 0x87, 0x56,
0x15, 0x17, 0x50, 0x67, 0xAE, 0x78, 0x6D, 0x1F,
/* p */
@@ -1766,19 +1575,15 @@ static const struct {
0x6E, 0x6A, 0xD3, 0x4C, 0xE0, 0xA7, 0x7C, 0xD7, 0x12, 0x7B, 0x06, 0xBE,
/* order */
0x15, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
- 0x61, 0x0C, 0x0B, 0x19, 0x68, 0x12, 0xBF, 0xB6, 0x28, 0x8A, 0x3E, 0xA3
- }
+ 0x61, 0x0C, 0x0B, 0x19, 0x68, 0x12, 0xBF, 0xB6, 0x28, 0x8A, 0x3E, 0xA3 }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[0 + 27 * 6];
} _EC_X9_62_CHAR2_208W1 = {
- {
- NID_X9_62_characteristic_two_field, 0, 27, 0xFE48
- },
- {
- /* no seed */
+ { NID_X9_62_characteristic_two_field, 0, 27, 0xFE48 },
+ { /* no seed */
/* p */
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1802,19 +1607,15 @@ static const struct {
/* order */
0x00, 0x00, 0x01, 0x01, 0xBA, 0xF9, 0x5C, 0x97, 0x23, 0xC5, 0x7B, 0x6C,
0x21, 0xDA, 0x2E, 0xFF, 0x2D, 0x5E, 0xD5, 0x88, 0xBD, 0xD5, 0x71, 0x7E,
- 0x21, 0x2F, 0x9D
- }
+ 0x21, 0x2F, 0x9D }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[20 + 30 * 6];
} _EC_X9_62_CHAR2_239V1 = {
- {
- NID_X9_62_characteristic_two_field, 20, 30, 4
- },
- {
- /* seed */
+ { NID_X9_62_characteristic_two_field, 20, 30, 4 },
+ { /* seed */
0xD3, 0x4B, 0x9A, 0x4D, 0x69, 0x6E, 0x67, 0x68, 0x75, 0x61, 0x51, 0x75,
0xCA, 0x71, 0xB9, 0x20, 0xBF, 0xEF, 0xB0, 0x5D,
/* p */
@@ -1840,19 +1641,15 @@ static const struct {
/* order */
0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x0F, 0x4D, 0x42, 0xFF, 0xE1, 0x49, 0x2A, 0x49, 0x93,
- 0xF1, 0xCA, 0xD6, 0x66, 0xE4, 0x47
- }
+ 0xF1, 0xCA, 0xD6, 0x66, 0xE4, 0x47 }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[20 + 30 * 6];
} _EC_X9_62_CHAR2_239V2 = {
- {
- NID_X9_62_characteristic_two_field, 20, 30, 6
- },
- {
- /* seed */
+ { NID_X9_62_characteristic_two_field, 20, 30, 6 },
+ { /* seed */
0x2A, 0xA6, 0x98, 0x2F, 0xDF, 0xA4, 0xD6, 0x96, 0xE6, 0x76, 0x87, 0x56,
0x15, 0x17, 0x5D, 0x26, 0x67, 0x27, 0x27, 0x7D,
/* p */
@@ -1878,19 +1675,15 @@ static const struct {
/* order */
0x15, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
0x55, 0x55, 0x55, 0x3C, 0x6F, 0x28, 0x85, 0x25, 0x9C, 0x31, 0xE3, 0xFC,
- 0xDF, 0x15, 0x46, 0x24, 0x52, 0x2D
- }
+ 0xDF, 0x15, 0x46, 0x24, 0x52, 0x2D }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[20 + 30 * 6];
} _EC_X9_62_CHAR2_239V3 = {
- {
- NID_X9_62_characteristic_two_field, 20, 30, 0xA
- },
- {
- /* seed */
+ { NID_X9_62_characteristic_two_field, 20, 30, 0xA },
+ { /* seed */
0x9E, 0x07, 0x6F, 0x4D, 0x69, 0x6E, 0x67, 0x68, 0x75, 0x61, 0x51, 0x75,
0xE1, 0x1E, 0x9F, 0xDD, 0x77, 0xF9, 0x20, 0x41,
/* p */
@@ -1916,19 +1709,15 @@ static const struct {
/* order */
0x0C, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC,
0xCC, 0xCC, 0xCC, 0xAC, 0x49, 0x12, 0xD2, 0xD9, 0xDF, 0x90, 0x3E, 0xF9,
- 0x88, 0x8B, 0x8A, 0x0E, 0x4C, 0xFF
- }
+ 0x88, 0x8B, 0x8A, 0x0E, 0x4C, 0xFF }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[0 + 35 * 6];
} _EC_X9_62_CHAR2_272W1 = {
- {
- NID_X9_62_characteristic_two_field, 0, 35, 0xFF06
- },
- {
- /* no seed */
+ { NID_X9_62_characteristic_two_field, 0, 35, 0xFF06 },
+ { /* no seed */
/* p */
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1952,19 +1741,15 @@ static const struct {
/* order */
0x00, 0x00, 0x01, 0x00, 0xFA, 0xF5, 0x13, 0x54, 0xE0, 0xE3, 0x9E, 0x48,
0x92, 0xDF, 0x6E, 0x31, 0x9C, 0x72, 0xC8, 0x16, 0x16, 0x03, 0xFA, 0x45,
- 0xAA, 0x7B, 0x99, 0x8A, 0x16, 0x7B, 0x8F, 0x1E, 0x62, 0x95, 0x21
- }
+ 0xAA, 0x7B, 0x99, 0x8A, 0x16, 0x7B, 0x8F, 0x1E, 0x62, 0x95, 0x21 }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[0 + 39 * 6];
} _EC_X9_62_CHAR2_304W1 = {
- {
- NID_X9_62_characteristic_two_field, 0, 39, 0xFE2E
- },
- {
- /* no seed */
+ { NID_X9_62_characteristic_two_field, 0, 39, 0xFE2E },
+ { /* no seed */
/* p */
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1994,19 +1779,15 @@ static const struct {
0x00, 0x00, 0x01, 0x01, 0xD5, 0x56, 0x57, 0x2A, 0xAB, 0xAC, 0x80, 0x01,
0x01, 0xD5, 0x56, 0x57, 0x2A, 0xAB, 0xAC, 0x80, 0x01, 0x02, 0x2D, 0x5C,
0x91, 0xDD, 0x17, 0x3F, 0x8F, 0xB5, 0x61, 0xDA, 0x68, 0x99, 0x16, 0x44,
- 0x43, 0x05, 0x1D
- }
+ 0x43, 0x05, 0x1D }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[20 + 45 * 6];
} _EC_X9_62_CHAR2_359V1 = {
- {
- NID_X9_62_characteristic_two_field, 20, 45, 0x4C
- },
- {
- /* seed */
+ { NID_X9_62_characteristic_two_field, 20, 45, 0x4C },
+ { /* seed */
0x2B, 0x35, 0x49, 0x20, 0xB7, 0x24, 0xD6, 0x96, 0xE6, 0x76, 0x87, 0x56,
0x15, 0x17, 0x58, 0x5B, 0xA1, 0x33, 0x2D, 0xC6,
/* p */
@@ -2038,19 +1819,15 @@ static const struct {
0x01, 0xAF, 0x28, 0x6B, 0xCA, 0x1A, 0xF2, 0x86, 0xBC, 0xA1, 0xAF, 0x28,
0x6B, 0xCA, 0x1A, 0xF2, 0x86, 0xBC, 0xA1, 0xAF, 0x28, 0x6B, 0xC9, 0xFB,
0x8F, 0x6B, 0x85, 0xC5, 0x56, 0x89, 0x2C, 0x20, 0xA7, 0xEB, 0x96, 0x4F,
- 0xE7, 0x71, 0x9E, 0x74, 0xF4, 0x90, 0x75, 0x8D, 0x3B
- }
+ 0xE7, 0x71, 0x9E, 0x74, 0xF4, 0x90, 0x75, 0x8D, 0x3B }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[0 + 47 * 6];
} _EC_X9_62_CHAR2_368W1 = {
- {
- NID_X9_62_characteristic_two_field, 0, 47, 0xFF70
- },
- {
- /* no seed */
+ { NID_X9_62_characteristic_two_field, 0, 47, 0xFF70 },
+ { /* no seed */
/* p */
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -2080,19 +1857,15 @@ static const struct {
0x00, 0x00, 0x01, 0x00, 0x90, 0x51, 0x2D, 0xA9, 0xAF, 0x72, 0xB0, 0x83,
0x49, 0xD9, 0x8A, 0x5D, 0xD4, 0xC7, 0xB0, 0x53, 0x2E, 0xCA, 0x51, 0xCE,
0x03, 0xE2, 0xD1, 0x0F, 0x3B, 0x7A, 0xC5, 0x79, 0xBD, 0x87, 0xE9, 0x09,
- 0xAE, 0x40, 0xA6, 0xF1, 0x31, 0xE9, 0xCF, 0xCE, 0x5B, 0xD9, 0x67
- }
+ 0xAE, 0x40, 0xA6, 0xF1, 0x31, 0xE9, 0xCF, 0xCE, 0x5B, 0xD9, 0x67 }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[0 + 54 * 6];
} _EC_X9_62_CHAR2_431R1 = {
- {
- NID_X9_62_characteristic_two_field, 0, 54, 0x2760
- },
- {
- /* no seed */
+ { NID_X9_62_characteristic_two_field, 0, 54, 0x2760 },
+ { /* no seed */
/* p */
0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -2128,19 +1901,15 @@ static const struct {
0x34, 0x03, 0x40, 0x34, 0x03, 0x40, 0x34, 0x03, 0x40, 0x34, 0x03, 0x40,
0x34, 0x03, 0x40, 0x34, 0x03, 0x23, 0xC3, 0x13, 0xFA, 0xB5, 0x05, 0x89,
0x70, 0x3B, 0x5E, 0xC6, 0x8D, 0x35, 0x87, 0xFE, 0xC6, 0x0D, 0x16, 0x1C,
- 0xC1, 0x49, 0xC1, 0xAD, 0x4A, 0x91
- }
+ 0xC1, 0x49, 0xC1, 0xAD, 0x4A, 0x91 }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[0 + 15 * 6];
} _EC_WTLS_1 = {
- {
- NID_X9_62_characteristic_two_field, 0, 15, 2
- },
- {
- /* no seed */
+ { NID_X9_62_characteristic_two_field, 0, 15, 2 },
+ { /* no seed */
/* p */
0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x02, 0x01,
@@ -2158,8 +1927,7 @@ static const struct {
0xEB, 0xCC, 0x15,
/* order */
0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xBF, 0x91, 0xAF,
- 0x6D, 0xEA, 0x73
- }
+ 0x6D, 0xEA, 0x73 }
};
/* IPSec curves */
@@ -2172,11 +1940,8 @@ static const struct {
EC_CURVE_DATA h;
unsigned char data[0 + 20 * 6];
} _EC_IPSEC_155_ID3 = {
- {
- NID_X9_62_characteristic_two_field, 0, 20, 3
- },
- {
- /* no seed */
+ { NID_X9_62_characteristic_two_field, 0, 20, 3 },
+ { /* no seed */
/* p */
0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
@@ -2194,8 +1959,7 @@ static const struct {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xc8,
/* order */
0x02, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xC7, 0xF3,
- 0xC7, 0x88, 0x1B, 0xD0, 0x86, 0x8F, 0xA8, 0x6C
- }
+ 0xC7, 0x88, 0x1B, 0xD0, 0x86, 0x8F, 0xA8, 0x6C }
};
/*
@@ -2207,11 +1971,8 @@ static const struct {
EC_CURVE_DATA h;
unsigned char data[0 + 24 * 6];
} _EC_IPSEC_185_ID4 = {
- {
- NID_X9_62_characteristic_two_field, 0, 24, 2
- },
- {
- /* no seed */
+ { NID_X9_62_characteristic_two_field, 0, 24, 2 },
+ { /* no seed */
/* p */
0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
@@ -2229,10 +1990,9 @@ static const struct {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d,
/* order */
0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xED, 0xF9, 0x7C, 0x44, 0xDB, 0x9F, 0x24, 0x20, 0xBA, 0xFC, 0xA7, 0x5E
- }
+ 0xED, 0xF9, 0x7C, 0x44, 0xDB, 0x9F, 0x24, 0x20, 0xBA, 0xFC, 0xA7, 0x5E }
};
-# endif /* FIPS_MODULE */
+#endif /* FIPS_MODULE */
#endif /* OPENSSL_NO_EC2M */
/*
@@ -2248,11 +2008,8 @@ static const struct {
EC_CURVE_DATA h;
unsigned char data[0 + 20 * 6];
} _EC_brainpoolP160r1 = {
- {
- NID_X9_62_prime_field, 0, 20, 1
- },
- {
- /* no seed */
+ { NID_X9_62_prime_field, 0, 20, 1 },
+ { /* no seed */
/* p */
0xE9, 0x5E, 0x4A, 0x5F, 0x73, 0x70, 0x59, 0xDC, 0x60, 0xDF, 0xC7, 0xAD,
0x95, 0xB3, 0xD8, 0x13, 0x95, 0x15, 0x62, 0x0F,
@@ -2270,19 +2027,15 @@ static const struct {
0x66, 0x9C, 0x97, 0x63, 0x16, 0xDA, 0x63, 0x21,
/* order */
0xE9, 0x5E, 0x4A, 0x5F, 0x73, 0x70, 0x59, 0xDC, 0x60, 0xDF, 0x59, 0x91,
- 0xD4, 0x50, 0x29, 0x40, 0x9E, 0x60, 0xFC, 0x09
- }
+ 0xD4, 0x50, 0x29, 0x40, 0x9E, 0x60, 0xFC, 0x09 }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[0 + 20 * 6];
} _EC_brainpoolP160t1 = {
- {
- NID_X9_62_prime_field, 0, 20, 1
- },
- {
- /* no seed */
+ { NID_X9_62_prime_field, 0, 20, 1 },
+ { /* no seed */
/* p */
0xE9, 0x5E, 0x4A, 0x5F, 0x73, 0x70, 0x59, 0xDC, 0x60, 0xDF, 0xC7, 0xAD,
0x95, 0xB3, 0xD8, 0x13, 0x95, 0x15, 0x62, 0x0F,
@@ -2300,19 +2053,15 @@ static const struct {
0x24, 0x43, 0x77, 0x21, 0x52, 0xC9, 0xE0, 0xAD,
/* order */
0xE9, 0x5E, 0x4A, 0x5F, 0x73, 0x70, 0x59, 0xDC, 0x60, 0xDF, 0x59, 0x91,
- 0xD4, 0x50, 0x29, 0x40, 0x9E, 0x60, 0xFC, 0x09
- }
+ 0xD4, 0x50, 0x29, 0x40, 0x9E, 0x60, 0xFC, 0x09 }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[0 + 24 * 6];
} _EC_brainpoolP192r1 = {
- {
- NID_X9_62_prime_field, 0, 24, 1
- },
- {
- /* no seed */
+ { NID_X9_62_prime_field, 0, 24, 1 },
+ { /* no seed */
/* p */
0xC3, 0x02, 0xF4, 0x1D, 0x93, 0x2A, 0x36, 0xCD, 0xA7, 0xA3, 0x46, 0x30,
0x93, 0xD1, 0x8D, 0xB7, 0x8F, 0xCE, 0x47, 0x6D, 0xE1, 0xA8, 0x62, 0x97,
@@ -2330,19 +2079,15 @@ static const struct {
0xC1, 0x49, 0x00, 0x02, 0xE6, 0x77, 0x3F, 0xA2, 0xFA, 0x29, 0x9B, 0x8F,
/* order */
0xC3, 0x02, 0xF4, 0x1D, 0x93, 0x2A, 0x36, 0xCD, 0xA7, 0xA3, 0x46, 0x2F,
- 0x9E, 0x9E, 0x91, 0x6B, 0x5B, 0xE8, 0xF1, 0x02, 0x9A, 0xC4, 0xAC, 0xC1
- }
+ 0x9E, 0x9E, 0x91, 0x6B, 0x5B, 0xE8, 0xF1, 0x02, 0x9A, 0xC4, 0xAC, 0xC1 }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[0 + 24 * 6];
} _EC_brainpoolP192t1 = {
- {
- NID_X9_62_prime_field, 0, 24, 1
- },
- {
- /* no seed */
+ { NID_X9_62_prime_field, 0, 24, 1 },
+ { /* no seed */
/* p */
0xC3, 0x02, 0xF4, 0x1D, 0x93, 0x2A, 0x36, 0xCD, 0xA7, 0xA3, 0x46, 0x30,
0x93, 0xD1, 0x8D, 0xB7, 0x8F, 0xCE, 0x47, 0x6D, 0xE1, 0xA8, 0x62, 0x97,
@@ -2360,19 +2105,15 @@ static const struct {
0x44, 0x9D, 0x00, 0x84, 0xB7, 0xE5, 0xB3, 0xDE, 0x7C, 0xCC, 0x01, 0xC9,
/* order */
0xC3, 0x02, 0xF4, 0x1D, 0x93, 0x2A, 0x36, 0xCD, 0xA7, 0xA3, 0x46, 0x2F,
- 0x9E, 0x9E, 0x91, 0x6B, 0x5B, 0xE8, 0xF1, 0x02, 0x9A, 0xC4, 0xAC, 0xC1
- }
+ 0x9E, 0x9E, 0x91, 0x6B, 0x5B, 0xE8, 0xF1, 0x02, 0x9A, 0xC4, 0xAC, 0xC1 }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[0 + 28 * 6];
} _EC_brainpoolP224r1 = {
- {
- NID_X9_62_prime_field, 0, 28, 1
- },
- {
- /* no seed */
+ { NID_X9_62_prime_field, 0, 28, 1 },
+ { /* no seed */
/* p */
0xD7, 0xC1, 0x34, 0xAA, 0x26, 0x43, 0x66, 0x86, 0x2A, 0x18, 0x30, 0x25,
0x75, 0xD1, 0xD7, 0x87, 0xB0, 0x9F, 0x07, 0x57, 0x97, 0xDA, 0x89, 0xF5,
@@ -2396,19 +2137,15 @@ static const struct {
/* order */
0xD7, 0xC1, 0x34, 0xAA, 0x26, 0x43, 0x66, 0x86, 0x2A, 0x18, 0x30, 0x25,
0x75, 0xD0, 0xFB, 0x98, 0xD1, 0x16, 0xBC, 0x4B, 0x6D, 0xDE, 0xBC, 0xA3,
- 0xA5, 0xA7, 0x93, 0x9F
- }
+ 0xA5, 0xA7, 0x93, 0x9F }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[0 + 28 * 6];
} _EC_brainpoolP224t1 = {
- {
- NID_X9_62_prime_field, 0, 28, 1
- },
- {
- /* no seed */
+ { NID_X9_62_prime_field, 0, 28, 1 },
+ { /* no seed */
/* p */
0xD7, 0xC1, 0x34, 0xAA, 0x26, 0x43, 0x66, 0x86, 0x2A, 0x18, 0x30, 0x25,
0x75, 0xD1, 0xD7, 0x87, 0xB0, 0x9F, 0x07, 0x57, 0x97, 0xDA, 0x89, 0xF5,
@@ -2432,19 +2169,15 @@ static const struct {
/* order */
0xD7, 0xC1, 0x34, 0xAA, 0x26, 0x43, 0x66, 0x86, 0x2A, 0x18, 0x30, 0x25,
0x75, 0xD0, 0xFB, 0x98, 0xD1, 0x16, 0xBC, 0x4B, 0x6D, 0xDE, 0xBC, 0xA3,
- 0xA5, 0xA7, 0x93, 0x9F
- }
+ 0xA5, 0xA7, 0x93, 0x9F }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[0 + 32 * 6];
} _EC_brainpoolP256r1 = {
- {
- NID_X9_62_prime_field, 0, 32, 1
- },
- {
- /* no seed */
+ { NID_X9_62_prime_field, 0, 32, 1 },
+ { /* no seed */
/* p */
0xA9, 0xFB, 0x57, 0xDB, 0xA1, 0xEE, 0xA9, 0xBC, 0x3E, 0x66, 0x0A, 0x90,
0x9D, 0x83, 0x8D, 0x72, 0x6E, 0x3B, 0xF6, 0x23, 0xD5, 0x26, 0x20, 0x28,
@@ -2468,19 +2201,15 @@ static const struct {
/* order */
0xA9, 0xFB, 0x57, 0xDB, 0xA1, 0xEE, 0xA9, 0xBC, 0x3E, 0x66, 0x0A, 0x90,
0x9D, 0x83, 0x8D, 0x71, 0x8C, 0x39, 0x7A, 0xA3, 0xB5, 0x61, 0xA6, 0xF7,
- 0x90, 0x1E, 0x0E, 0x82, 0x97, 0x48, 0x56, 0xA7
- }
+ 0x90, 0x1E, 0x0E, 0x82, 0x97, 0x48, 0x56, 0xA7 }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[0 + 32 * 6];
} _EC_brainpoolP256t1 = {
- {
- NID_X9_62_prime_field, 0, 32, 1
- },
- {
- /* no seed */
+ { NID_X9_62_prime_field, 0, 32, 1 },
+ { /* no seed */
/* p */
0xA9, 0xFB, 0x57, 0xDB, 0xA1, 0xEE, 0xA9, 0xBC, 0x3E, 0x66, 0x0A, 0x90,
0x9D, 0x83, 0x8D, 0x72, 0x6E, 0x3B, 0xF6, 0x23, 0xD5, 0x26, 0x20, 0x28,
@@ -2504,19 +2233,15 @@ static const struct {
/* order */
0xA9, 0xFB, 0x57, 0xDB, 0xA1, 0xEE, 0xA9, 0xBC, 0x3E, 0x66, 0x0A, 0x90,
0x9D, 0x83, 0x8D, 0x71, 0x8C, 0x39, 0x7A, 0xA3, 0xB5, 0x61, 0xA6, 0xF7,
- 0x90, 0x1E, 0x0E, 0x82, 0x97, 0x48, 0x56, 0xA7
- }
+ 0x90, 0x1E, 0x0E, 0x82, 0x97, 0x48, 0x56, 0xA7 }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[0 + 40 * 6];
} _EC_brainpoolP320r1 = {
- {
- NID_X9_62_prime_field, 0, 40, 1
- },
- {
- /* no seed */
+ { NID_X9_62_prime_field, 0, 40, 1 },
+ { /* no seed */
/* p */
0xD3, 0x5E, 0x47, 0x20, 0x36, 0xBC, 0x4F, 0xB7, 0xE1, 0x3C, 0x78, 0x5E,
0xD2, 0x01, 0xE0, 0x65, 0xF9, 0x8F, 0xCF, 0xA6, 0xF6, 0xF4, 0x0D, 0xEF,
@@ -2546,19 +2271,15 @@ static const struct {
0xD3, 0x5E, 0x47, 0x20, 0x36, 0xBC, 0x4F, 0xB7, 0xE1, 0x3C, 0x78, 0x5E,
0xD2, 0x01, 0xE0, 0x65, 0xF9, 0x8F, 0xCF, 0xA5, 0xB6, 0x8F, 0x12, 0xA3,
0x2D, 0x48, 0x2E, 0xC7, 0xEE, 0x86, 0x58, 0xE9, 0x86, 0x91, 0x55, 0x5B,
- 0x44, 0xC5, 0x93, 0x11
- }
+ 0x44, 0xC5, 0x93, 0x11 }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[0 + 40 * 6];
} _EC_brainpoolP320t1 = {
- {
- NID_X9_62_prime_field, 0, 40, 1
- },
- {
- /* no seed */
+ { NID_X9_62_prime_field, 0, 40, 1 },
+ { /* no seed */
/* p */
0xD3, 0x5E, 0x47, 0x20, 0x36, 0xBC, 0x4F, 0xB7, 0xE1, 0x3C, 0x78, 0x5E,
0xD2, 0x01, 0xE0, 0x65, 0xF9, 0x8F, 0xCF, 0xA6, 0xF6, 0xF4, 0x0D, 0xEF,
@@ -2588,19 +2309,15 @@ static const struct {
0xD3, 0x5E, 0x47, 0x20, 0x36, 0xBC, 0x4F, 0xB7, 0xE1, 0x3C, 0x78, 0x5E,
0xD2, 0x01, 0xE0, 0x65, 0xF9, 0x8F, 0xCF, 0xA5, 0xB6, 0x8F, 0x12, 0xA3,
0x2D, 0x48, 0x2E, 0xC7, 0xEE, 0x86, 0x58, 0xE9, 0x86, 0x91, 0x55, 0x5B,
- 0x44, 0xC5, 0x93, 0x11
- }
+ 0x44, 0xC5, 0x93, 0x11 }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[0 + 48 * 6];
} _EC_brainpoolP384r1 = {
- {
- NID_X9_62_prime_field, 0, 48, 1
- },
- {
- /* no seed */
+ { NID_X9_62_prime_field, 0, 48, 1 },
+ { /* no seed */
/* p */
0x8C, 0xB9, 0x1E, 0x82, 0xA3, 0x38, 0x6D, 0x28, 0x0F, 0x5D, 0x6F, 0x7E,
0x50, 0xE6, 0x41, 0xDF, 0x15, 0x2F, 0x71, 0x09, 0xED, 0x54, 0x56, 0xB4,
@@ -2630,19 +2347,15 @@ static const struct {
0x8C, 0xB9, 0x1E, 0x82, 0xA3, 0x38, 0x6D, 0x28, 0x0F, 0x5D, 0x6F, 0x7E,
0x50, 0xE6, 0x41, 0xDF, 0x15, 0x2F, 0x71, 0x09, 0xED, 0x54, 0x56, 0xB3,
0x1F, 0x16, 0x6E, 0x6C, 0xAC, 0x04, 0x25, 0xA7, 0xCF, 0x3A, 0xB6, 0xAF,
- 0x6B, 0x7F, 0xC3, 0x10, 0x3B, 0x88, 0x32, 0x02, 0xE9, 0x04, 0x65, 0x65
- }
+ 0x6B, 0x7F, 0xC3, 0x10, 0x3B, 0x88, 0x32, 0x02, 0xE9, 0x04, 0x65, 0x65 }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[0 + 48 * 6];
} _EC_brainpoolP384t1 = {
- {
- NID_X9_62_prime_field, 0, 48, 1
- },
- {
- /* no seed */
+ { NID_X9_62_prime_field, 0, 48, 1 },
+ { /* no seed */
/* p */
0x8C, 0xB9, 0x1E, 0x82, 0xA3, 0x38, 0x6D, 0x28, 0x0F, 0x5D, 0x6F, 0x7E,
0x50, 0xE6, 0x41, 0xDF, 0x15, 0x2F, 0x71, 0x09, 0xED, 0x54, 0x56, 0xB4,
@@ -2672,19 +2385,15 @@ static const struct {
0x8C, 0xB9, 0x1E, 0x82, 0xA3, 0x38, 0x6D, 0x28, 0x0F, 0x5D, 0x6F, 0x7E,
0x50, 0xE6, 0x41, 0xDF, 0x15, 0x2F, 0x71, 0x09, 0xED, 0x54, 0x56, 0xB3,
0x1F, 0x16, 0x6E, 0x6C, 0xAC, 0x04, 0x25, 0xA7, 0xCF, 0x3A, 0xB6, 0xAF,
- 0x6B, 0x7F, 0xC3, 0x10, 0x3B, 0x88, 0x32, 0x02, 0xE9, 0x04, 0x65, 0x65
- }
+ 0x6B, 0x7F, 0xC3, 0x10, 0x3B, 0x88, 0x32, 0x02, 0xE9, 0x04, 0x65, 0x65 }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[0 + 64 * 6];
} _EC_brainpoolP512r1 = {
- {
- NID_X9_62_prime_field, 0, 64, 1
- },
- {
- /* no seed */
+ { NID_X9_62_prime_field, 0, 64, 1 },
+ { /* no seed */
/* p */
0xAA, 0xDD, 0x9D, 0xB8, 0xDB, 0xE9, 0xC4, 0x8B, 0x3F, 0xD4, 0xE6, 0xAE,
0x33, 0xC9, 0xFC, 0x07, 0xCB, 0x30, 0x8D, 0xB3, 0xB3, 0xC9, 0xD2, 0x0E,
@@ -2726,19 +2435,15 @@ static const struct {
0xD6, 0x63, 0x9C, 0xCA, 0x70, 0x33, 0x08, 0x70, 0x55, 0x3E, 0x5C, 0x41,
0x4C, 0xA9, 0x26, 0x19, 0x41, 0x86, 0x61, 0x19, 0x7F, 0xAC, 0x10, 0x47,
0x1D, 0xB1, 0xD3, 0x81, 0x08, 0x5D, 0xDA, 0xDD, 0xB5, 0x87, 0x96, 0x82,
- 0x9C, 0xA9, 0x00, 0x69
- }
+ 0x9C, 0xA9, 0x00, 0x69 }
};
static const struct {
EC_CURVE_DATA h;
unsigned char data[0 + 64 * 6];
} _EC_brainpoolP512t1 = {
- {
- NID_X9_62_prime_field, 0, 64, 1
- },
- {
- /* no seed */
+ { NID_X9_62_prime_field, 0, 64, 1 },
+ { /* no seed */
/* p */
0xAA, 0xDD, 0x9D, 0xB8, 0xDB, 0xE9, 0xC4, 0x8B, 0x3F, 0xD4, 0xE6, 0xAE,
0x33, 0xC9, 0xFC, 0x07, 0xCB, 0x30, 0x8D, 0xB3, 0xB3, 0xC9, 0xD2, 0x0E,
@@ -2780,8 +2485,7 @@ static const struct {
0xD6, 0x63, 0x9C, 0xCA, 0x70, 0x33, 0x08, 0x70, 0x55, 0x3E, 0x5C, 0x41,
0x4C, 0xA9, 0x26, 0x19, 0x41, 0x86, 0x61, 0x19, 0x7F, 0xAC, 0x10, 0x47,
0x1D, 0xB1, 0xD3, 0x81, 0x08, 0x5D, 0xDA, 0xDD, 0xB5, 0x87, 0x96, 0x82,
- 0x9C, 0xA9, 0x00, 0x69
- }
+ 0x9C, 0xA9, 0x00, 0x69 }
};
#endif /* FIPS_MODULE */
@@ -2790,36 +2494,208 @@ static const struct {
EC_CURVE_DATA h;
unsigned char data[0 + 32 * 6];
} _EC_sm2p256v1 = {
- {
- NID_X9_62_prime_field, 0, 32, 1
- },
+ { NID_X9_62_prime_field, 0, 32, 1 },
{
/* no seed */
/* p */
- 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
- 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
- 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
- /* a */
- 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
- 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
- 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc,
- /* b */
- 0x28, 0xe9, 0xfa, 0x9e, 0x9d, 0x9f, 0x5e, 0x34, 0x4d, 0x5a, 0x9e, 0x4b,
- 0xcf, 0x65, 0x09, 0xa7, 0xf3, 0x97, 0x89, 0xf5, 0x15, 0xab, 0x8f, 0x92,
- 0xdd, 0xbc, 0xbd, 0x41, 0x4d, 0x94, 0x0e, 0x93,
- /* x */
- 0x32, 0xc4, 0xae, 0x2c, 0x1f, 0x19, 0x81, 0x19, 0x5f, 0x99, 0x04, 0x46,
- 0x6a, 0x39, 0xc9, 0x94, 0x8f, 0xe3, 0x0b, 0xbf, 0xf2, 0x66, 0x0b, 0xe1,
- 0x71, 0x5a, 0x45, 0x89, 0x33, 0x4c, 0x74, 0xc7,
- /* y */
- 0xbc, 0x37, 0x36, 0xa2, 0xf4, 0xf6, 0x77, 0x9c, 0x59, 0xbd, 0xce, 0xe3,
- 0x6b, 0x69, 0x21, 0x53, 0xd0, 0xa9, 0x87, 0x7c, 0xc6, 0x2a, 0x47, 0x40,
- 0x02, 0xdf, 0x32, 0xe5, 0x21, 0x39, 0xf0, 0xa0,
- /* order */
- 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
- 0xff, 0xff, 0xff, 0xff, 0x72, 0x03, 0xdf, 0x6b, 0x21, 0xc6, 0x05, 0x2b,
- 0x53, 0xbb, 0xf4, 0x09, 0x39, 0xd5, 0x41, 0x23,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xfe,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0x00,
+ 0x00,
+ 0x00,
+ 0x00,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xff,
+ /* a */
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xfe,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0x00,
+ 0x00,
+ 0x00,
+ 0x00,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xfc,
+ /* b */
+ 0x28,
+ 0xe9,
+ 0xfa,
+ 0x9e,
+ 0x9d,
+ 0x9f,
+ 0x5e,
+ 0x34,
+ 0x4d,
+ 0x5a,
+ 0x9e,
+ 0x4b,
+ 0xcf,
+ 0x65,
+ 0x09,
+ 0xa7,
+ 0xf3,
+ 0x97,
+ 0x89,
+ 0xf5,
+ 0x15,
+ 0xab,
+ 0x8f,
+ 0x92,
+ 0xdd,
+ 0xbc,
+ 0xbd,
+ 0x41,
+ 0x4d,
+ 0x94,
+ 0x0e,
+ 0x93,
+ /* x */
+ 0x32,
+ 0xc4,
+ 0xae,
+ 0x2c,
+ 0x1f,
+ 0x19,
+ 0x81,
+ 0x19,
+ 0x5f,
+ 0x99,
+ 0x04,
+ 0x46,
+ 0x6a,
+ 0x39,
+ 0xc9,
+ 0x94,
+ 0x8f,
+ 0xe3,
+ 0x0b,
+ 0xbf,
+ 0xf2,
+ 0x66,
+ 0x0b,
+ 0xe1,
+ 0x71,
+ 0x5a,
+ 0x45,
+ 0x89,
+ 0x33,
+ 0x4c,
+ 0x74,
+ 0xc7,
+ /* y */
+ 0xbc,
+ 0x37,
+ 0x36,
+ 0xa2,
+ 0xf4,
+ 0xf6,
+ 0x77,
+ 0x9c,
+ 0x59,
+ 0xbd,
+ 0xce,
+ 0xe3,
+ 0x6b,
+ 0x69,
+ 0x21,
+ 0x53,
+ 0xd0,
+ 0xa9,
+ 0x87,
+ 0x7c,
+ 0xc6,
+ 0x2a,
+ 0x47,
+ 0x40,
+ 0x02,
+ 0xdf,
+ 0x32,
+ 0xe5,
+ 0x21,
+ 0x39,
+ 0xf0,
+ 0xa0,
+ /* order */
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xfe,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0xff,
+ 0x72,
+ 0x03,
+ 0xdf,
+ 0x6b,
+ 0x21,
+ 0xc6,
+ 0x05,
+ 0x2b,
+ 0x53,
+ 0xbb,
+ 0xf4,
+ 0x09,
+ 0x39,
+ 0xd5,
+ 0x41,
+ 0x23,
}
};
#endif /* OPENSSL_NO_SM2 */
@@ -2827,7 +2703,7 @@ static const struct {
typedef struct _ec_list_element_st {
int nid;
const EC_CURVE_DATA *data;
- const EC_METHOD *(*meth) (void);
+ const EC_METHOD *(*meth)(void);
const char *comment;
} ec_list_element;
@@ -2835,73 +2711,73 @@ typedef struct _ec_list_element_st {
static const ec_list_element curve_list[] = {
/* prime field curves */
/* secg curves */
- {NID_secp224r1, &_EC_NIST_PRIME_224.h,
-# if !defined(OPENSSL_NO_EC_NISTP_64_GCC_128)
- EC_GFp_nistp224_method,
-# else
- 0,
-# endif
- "NIST/SECG curve over a 224 bit prime field"},
+ { NID_secp224r1, &_EC_NIST_PRIME_224.h,
+#if !defined(OPENSSL_NO_EC_NISTP_64_GCC_128)
+ EC_GFp_nistp224_method,
+#else
+ 0,
+#endif
+ "NIST/SECG curve over a 224 bit prime field" },
/* SECG secp256r1 is the same as X9.62 prime256v1 and hence omitted */
- {NID_secp384r1, &_EC_NIST_PRIME_384.h,
-# if defined(S390X_EC_ASM)
- EC_GFp_s390x_nistp384_method,
-# elif !defined(OPENSSL_NO_EC_NISTP_64_GCC_128)
- ossl_ec_GFp_nistp384_method,
-# else
- 0,
-# endif
- "NIST/SECG curve over a 384 bit prime field"},
-
- {NID_secp521r1, &_EC_NIST_PRIME_521.h,
-# if defined(S390X_EC_ASM)
- EC_GFp_s390x_nistp521_method,
-# elif !defined(OPENSSL_NO_EC_NISTP_64_GCC_128)
- EC_GFp_nistp521_method,
-# else
- 0,
-# endif
- "NIST/SECG curve over a 521 bit prime field"},
+ { NID_secp384r1, &_EC_NIST_PRIME_384.h,
+#if defined(S390X_EC_ASM)
+ EC_GFp_s390x_nistp384_method,
+#elif !defined(OPENSSL_NO_EC_NISTP_64_GCC_128)
+ ossl_ec_GFp_nistp384_method,
+#else
+ 0,
+#endif
+ "NIST/SECG curve over a 384 bit prime field" },
+
+ { NID_secp521r1, &_EC_NIST_PRIME_521.h,
+#if defined(S390X_EC_ASM)
+ EC_GFp_s390x_nistp521_method,
+#elif !defined(OPENSSL_NO_EC_NISTP_64_GCC_128)
+ EC_GFp_nistp521_method,
+#else
+ 0,
+#endif
+ "NIST/SECG curve over a 521 bit prime field" },
/* X9.62 curves */
- {NID_X9_62_prime192v1, &_EC_NIST_PRIME_192.h, 0,
- "NIST/X9.62/SECG curve over a 192 bit prime field"},
- {NID_X9_62_prime256v1, &_EC_X9_62_PRIME_256V1.h,
-# if defined(ECP_NISTZ256_ASM)
- EC_GFp_nistz256_method,
-# elif defined(S390X_EC_ASM)
- EC_GFp_s390x_nistp256_method,
-# elif !defined(OPENSSL_NO_EC_NISTP_64_GCC_128)
- EC_GFp_nistp256_method,
-# else
- 0,
-# endif
- "X9.62/SECG curve over a 256 bit prime field"},
-
-# ifndef OPENSSL_NO_EC2M
+ { NID_X9_62_prime192v1, &_EC_NIST_PRIME_192.h, 0,
+ "NIST/X9.62/SECG curve over a 192 bit prime field" },
+ { NID_X9_62_prime256v1, &_EC_X9_62_PRIME_256V1.h,
+#if defined(ECP_NISTZ256_ASM)
+ EC_GFp_nistz256_method,
+#elif defined(S390X_EC_ASM)
+ EC_GFp_s390x_nistp256_method,
+#elif !defined(OPENSSL_NO_EC_NISTP_64_GCC_128)
+ EC_GFp_nistp256_method,
+#else
+ 0,
+#endif
+ "X9.62/SECG curve over a 256 bit prime field" },
+
+#ifndef OPENSSL_NO_EC2M
/* characteristic two field curves */
/* NIST/SECG curves */
- {NID_sect163k1, &_EC_NIST_CHAR2_163K.h, 0,
- "NIST/SECG/WTLS curve over a 163 bit binary field"},
- {NID_sect163r2, &_EC_NIST_CHAR2_163B.h, 0,
- "NIST/SECG curve over a 163 bit binary field"},
- {NID_sect233k1, &_EC_NIST_CHAR2_233K.h, 0,
- "NIST/SECG/WTLS curve over a 233 bit binary field"},
- {NID_sect233r1, &_EC_NIST_CHAR2_233B.h, 0,
- "NIST/SECG/WTLS curve over a 233 bit binary field"},
- {NID_sect283k1, &_EC_NIST_CHAR2_283K.h, 0,
- "NIST/SECG curve over a 283 bit binary field"},
- {NID_sect283r1, &_EC_NIST_CHAR2_283B.h, 0,
- "NIST/SECG curve over a 283 bit binary field"},
- {NID_sect409k1, &_EC_NIST_CHAR2_409K.h, 0,
- "NIST/SECG curve over a 409 bit binary field"},
- {NID_sect409r1, &_EC_NIST_CHAR2_409B.h, 0,
- "NIST/SECG curve over a 409 bit binary field"},
- {NID_sect571k1, &_EC_NIST_CHAR2_571K.h, 0,
- "NIST/SECG curve over a 571 bit binary field"},
- {NID_sect571r1, &_EC_NIST_CHAR2_571B.h, 0,
- "NIST/SECG curve over a 571 bit binary field"},
-# endif
+ { NID_sect163k1, &_EC_NIST_CHAR2_163K.h, 0,
+ "NIST/SECG/WTLS curve over a 163 bit binary field" },
+ { NID_sect163r2, &_EC_NIST_CHAR2_163B.h, 0,
+ "NIST/SECG curve over a 163 bit binary field" },
+ { NID_sect233k1, &_EC_NIST_CHAR2_233K.h, 0,
+ "NIST/SECG/WTLS curve over a 233 bit binary field" },
+ { NID_sect233r1, &_EC_NIST_CHAR2_233B.h, 0,
+ "NIST/SECG/WTLS curve over a 233 bit binary field" },
+ { NID_sect283k1, &_EC_NIST_CHAR2_283K.h, 0,
+ "NIST/SECG curve over a 283 bit binary field" },
+ { NID_sect283r1, &_EC_NIST_CHAR2_283B.h, 0,
+ "NIST/SECG curve over a 283 bit binary field" },
+ { NID_sect409k1, &_EC_NIST_CHAR2_409K.h, 0,
+ "NIST/SECG curve over a 409 bit binary field" },
+ { NID_sect409r1, &_EC_NIST_CHAR2_409B.h, 0,
+ "NIST/SECG curve over a 409 bit binary field" },
+ { NID_sect571k1, &_EC_NIST_CHAR2_571K.h, 0,
+ "NIST/SECG curve over a 571 bit binary field" },
+ { NID_sect571r1, &_EC_NIST_CHAR2_571B.h, 0,
+ "NIST/SECG curve over a 571 bit binary field" },
+#endif
};
#else
@@ -2909,225 +2785,225 @@ static const ec_list_element curve_list[] = {
static const ec_list_element curve_list[] = {
/* prime field curves */
/* secg curves */
- {NID_secp112r1, &_EC_SECG_PRIME_112R1.h, 0,
- "SECG/WTLS curve over a 112 bit prime field"},
- {NID_secp112r2, &_EC_SECG_PRIME_112R2.h, 0,
- "SECG curve over a 112 bit prime field"},
- {NID_secp128r1, &_EC_SECG_PRIME_128R1.h, 0,
- "SECG curve over a 128 bit prime field"},
- {NID_secp128r2, &_EC_SECG_PRIME_128R2.h, 0,
- "SECG curve over a 128 bit prime field"},
- {NID_secp160k1, &_EC_SECG_PRIME_160K1.h, 0,
- "SECG curve over a 160 bit prime field"},
- {NID_secp160r1, &_EC_SECG_PRIME_160R1.h, 0,
- "SECG curve over a 160 bit prime field"},
- {NID_secp160r2, &_EC_SECG_PRIME_160R2.h, 0,
- "SECG/WTLS curve over a 160 bit prime field"},
+ { NID_secp112r1, &_EC_SECG_PRIME_112R1.h, 0,
+ "SECG/WTLS curve over a 112 bit prime field" },
+ { NID_secp112r2, &_EC_SECG_PRIME_112R2.h, 0,
+ "SECG curve over a 112 bit prime field" },
+ { NID_secp128r1, &_EC_SECG_PRIME_128R1.h, 0,
+ "SECG curve over a 128 bit prime field" },
+ { NID_secp128r2, &_EC_SECG_PRIME_128R2.h, 0,
+ "SECG curve over a 128 bit prime field" },
+ { NID_secp160k1, &_EC_SECG_PRIME_160K1.h, 0,
+ "SECG curve over a 160 bit prime field" },
+ { NID_secp160r1, &_EC_SECG_PRIME_160R1.h, 0,
+ "SECG curve over a 160 bit prime field" },
+ { NID_secp160r2, &_EC_SECG_PRIME_160R2.h, 0,
+ "SECG/WTLS curve over a 160 bit prime field" },
/* SECG secp192r1 is the same as X9.62 prime192v1 and hence omitted */
- {NID_secp192k1, &_EC_SECG_PRIME_192K1.h, 0,
- "SECG curve over a 192 bit prime field"},
- {NID_secp224k1, &_EC_SECG_PRIME_224K1.h, 0,
- "SECG curve over a 224 bit prime field"},
-# ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
- {NID_secp224r1, &_EC_NIST_PRIME_224.h, EC_GFp_nistp224_method,
- "NIST/SECG curve over a 224 bit prime field"},
-# else
- {NID_secp224r1, &_EC_NIST_PRIME_224.h, 0,
- "NIST/SECG curve over a 224 bit prime field"},
-# endif
- {NID_secp256k1, &_EC_SECG_PRIME_256K1.h, 0,
- "SECG curve over a 256 bit prime field"},
+ { NID_secp192k1, &_EC_SECG_PRIME_192K1.h, 0,
+ "SECG curve over a 192 bit prime field" },
+ { NID_secp224k1, &_EC_SECG_PRIME_224K1.h, 0,
+ "SECG curve over a 224 bit prime field" },
+#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
+ { NID_secp224r1, &_EC_NIST_PRIME_224.h, EC_GFp_nistp224_method,
+ "NIST/SECG curve over a 224 bit prime field" },
+#else
+ { NID_secp224r1, &_EC_NIST_PRIME_224.h, 0,
+ "NIST/SECG curve over a 224 bit prime field" },
+#endif
+ { NID_secp256k1, &_EC_SECG_PRIME_256K1.h, 0,
+ "SECG curve over a 256 bit prime field" },
/* SECG secp256r1 is the same as X9.62 prime256v1 and hence omitted */
- {NID_secp384r1, &_EC_NIST_PRIME_384.h,
-# if defined(S390X_EC_ASM)
- EC_GFp_s390x_nistp384_method,
-# elif !defined(OPENSSL_NO_EC_NISTP_64_GCC_128)
- ossl_ec_GFp_nistp384_method,
-# else
- 0,
-# endif
- "NIST/SECG curve over a 384 bit prime field"},
- {NID_secp521r1, &_EC_NIST_PRIME_521.h,
-# if defined(S390X_EC_ASM)
- EC_GFp_s390x_nistp521_method,
-# elif !defined(OPENSSL_NO_EC_NISTP_64_GCC_128)
- EC_GFp_nistp521_method,
-# else
- 0,
-# endif
- "NIST/SECG curve over a 521 bit prime field"},
+ { NID_secp384r1, &_EC_NIST_PRIME_384.h,
+#if defined(S390X_EC_ASM)
+ EC_GFp_s390x_nistp384_method,
+#elif !defined(OPENSSL_NO_EC_NISTP_64_GCC_128)
+ ossl_ec_GFp_nistp384_method,
+#else
+ 0,
+#endif
+ "NIST/SECG curve over a 384 bit prime field" },
+ { NID_secp521r1, &_EC_NIST_PRIME_521.h,
+#if defined(S390X_EC_ASM)
+ EC_GFp_s390x_nistp521_method,
+#elif !defined(OPENSSL_NO_EC_NISTP_64_GCC_128)
+ EC_GFp_nistp521_method,
+#else
+ 0,
+#endif
+ "NIST/SECG curve over a 521 bit prime field" },
/* X9.62 curves */
- {NID_X9_62_prime192v1, &_EC_NIST_PRIME_192.h, 0,
- "NIST/X9.62/SECG curve over a 192 bit prime field"},
- {NID_X9_62_prime192v2, &_EC_X9_62_PRIME_192V2.h, 0,
- "X9.62 curve over a 192 bit prime field"},
- {NID_X9_62_prime192v3, &_EC_X9_62_PRIME_192V3.h, 0,
- "X9.62 curve over a 192 bit prime field"},
- {NID_X9_62_prime239v1, &_EC_X9_62_PRIME_239V1.h, 0,
- "X9.62 curve over a 239 bit prime field"},
- {NID_X9_62_prime239v2, &_EC_X9_62_PRIME_239V2.h, 0,
- "X9.62 curve over a 239 bit prime field"},
- {NID_X9_62_prime239v3, &_EC_X9_62_PRIME_239V3.h, 0,
- "X9.62 curve over a 239 bit prime field"},
- {NID_X9_62_prime256v1, &_EC_X9_62_PRIME_256V1.h,
-# if defined(ECP_NISTZ256_ASM)
- EC_GFp_nistz256_method,
-# elif defined(S390X_EC_ASM)
- EC_GFp_s390x_nistp256_method,
-# elif !defined(OPENSSL_NO_EC_NISTP_64_GCC_128)
- EC_GFp_nistp256_method,
-# else
- 0,
-# endif
- "X9.62/SECG curve over a 256 bit prime field"},
-# ifndef OPENSSL_NO_EC2M
+ { NID_X9_62_prime192v1, &_EC_NIST_PRIME_192.h, 0,
+ "NIST/X9.62/SECG curve over a 192 bit prime field" },
+ { NID_X9_62_prime192v2, &_EC_X9_62_PRIME_192V2.h, 0,
+ "X9.62 curve over a 192 bit prime field" },
+ { NID_X9_62_prime192v3, &_EC_X9_62_PRIME_192V3.h, 0,
+ "X9.62 curve over a 192 bit prime field" },
+ { NID_X9_62_prime239v1, &_EC_X9_62_PRIME_239V1.h, 0,
+ "X9.62 curve over a 239 bit prime field" },
+ { NID_X9_62_prime239v2, &_EC_X9_62_PRIME_239V2.h, 0,
+ "X9.62 curve over a 239 bit prime field" },
+ { NID_X9_62_prime239v3, &_EC_X9_62_PRIME_239V3.h, 0,
+ "X9.62 curve over a 239 bit prime field" },
+ { NID_X9_62_prime256v1, &_EC_X9_62_PRIME_256V1.h,
+#if defined(ECP_NISTZ256_ASM)
+ EC_GFp_nistz256_method,
+#elif defined(S390X_EC_ASM)
+ EC_GFp_s390x_nistp256_method,
+#elif !defined(OPENSSL_NO_EC_NISTP_64_GCC_128)
+ EC_GFp_nistp256_method,
+#else
+ 0,
+#endif
+ "X9.62/SECG curve over a 256 bit prime field" },
+#ifndef OPENSSL_NO_EC2M
/* characteristic two field curves */
/* NIST/SECG curves */
- {NID_sect113r1, &_EC_SECG_CHAR2_113R1.h, 0,
- "SECG curve over a 113 bit binary field"},
- {NID_sect113r2, &_EC_SECG_CHAR2_113R2.h, 0,
- "SECG curve over a 113 bit binary field"},
- {NID_sect131r1, &_EC_SECG_CHAR2_131R1.h, 0,
- "SECG/WTLS curve over a 131 bit binary field"},
- {NID_sect131r2, &_EC_SECG_CHAR2_131R2.h, 0,
- "SECG curve over a 131 bit binary field"},
- {NID_sect163k1, &_EC_NIST_CHAR2_163K.h, 0,
- "NIST/SECG/WTLS curve over a 163 bit binary field"},
- {NID_sect163r1, &_EC_SECG_CHAR2_163R1.h, 0,
- "SECG curve over a 163 bit binary field"},
- {NID_sect163r2, &_EC_NIST_CHAR2_163B.h, 0,
- "NIST/SECG curve over a 163 bit binary field"},
- {NID_sect193r1, &_EC_SECG_CHAR2_193R1.h, 0,
- "SECG curve over a 193 bit binary field"},
- {NID_sect193r2, &_EC_SECG_CHAR2_193R2.h, 0,
- "SECG curve over a 193 bit binary field"},
- {NID_sect233k1, &_EC_NIST_CHAR2_233K.h, 0,
- "NIST/SECG/WTLS curve over a 233 bit binary field"},
- {NID_sect233r1, &_EC_NIST_CHAR2_233B.h, 0,
- "NIST/SECG/WTLS curve over a 233 bit binary field"},
- {NID_sect239k1, &_EC_SECG_CHAR2_239K1.h, 0,
- "SECG curve over a 239 bit binary field"},
- {NID_sect283k1, &_EC_NIST_CHAR2_283K.h, 0,
- "NIST/SECG curve over a 283 bit binary field"},
- {NID_sect283r1, &_EC_NIST_CHAR2_283B.h, 0,
- "NIST/SECG curve over a 283 bit binary field"},
- {NID_sect409k1, &_EC_NIST_CHAR2_409K.h, 0,
- "NIST/SECG curve over a 409 bit binary field"},
- {NID_sect409r1, &_EC_NIST_CHAR2_409B.h, 0,
- "NIST/SECG curve over a 409 bit binary field"},
- {NID_sect571k1, &_EC_NIST_CHAR2_571K.h, 0,
- "NIST/SECG curve over a 571 bit binary field"},
- {NID_sect571r1, &_EC_NIST_CHAR2_571B.h, 0,
- "NIST/SECG curve over a 571 bit binary field"},
+ { NID_sect113r1, &_EC_SECG_CHAR2_113R1.h, 0,
+ "SECG curve over a 113 bit binary field" },
+ { NID_sect113r2, &_EC_SECG_CHAR2_113R2.h, 0,
+ "SECG curve over a 113 bit binary field" },
+ { NID_sect131r1, &_EC_SECG_CHAR2_131R1.h, 0,
+ "SECG/WTLS curve over a 131 bit binary field" },
+ { NID_sect131r2, &_EC_SECG_CHAR2_131R2.h, 0,
+ "SECG curve over a 131 bit binary field" },
+ { NID_sect163k1, &_EC_NIST_CHAR2_163K.h, 0,
+ "NIST/SECG/WTLS curve over a 163 bit binary field" },
+ { NID_sect163r1, &_EC_SECG_CHAR2_163R1.h, 0,
+ "SECG curve over a 163 bit binary field" },
+ { NID_sect163r2, &_EC_NIST_CHAR2_163B.h, 0,
+ "NIST/SECG curve over a 163 bit binary field" },
+ { NID_sect193r1, &_EC_SECG_CHAR2_193R1.h, 0,
+ "SECG curve over a 193 bit binary field" },
+ { NID_sect193r2, &_EC_SECG_CHAR2_193R2.h, 0,
+ "SECG curve over a 193 bit binary field" },
+ { NID_sect233k1, &_EC_NIST_CHAR2_233K.h, 0,
+ "NIST/SECG/WTLS curve over a 233 bit binary field" },
+ { NID_sect233r1, &_EC_NIST_CHAR2_233B.h, 0,
+ "NIST/SECG/WTLS curve over a 233 bit binary field" },
+ { NID_sect239k1, &_EC_SECG_CHAR2_239K1.h, 0,
+ "SECG curve over a 239 bit binary field" },
+ { NID_sect283k1, &_EC_NIST_CHAR2_283K.h, 0,
+ "NIST/SECG curve over a 283 bit binary field" },
+ { NID_sect283r1, &_EC_NIST_CHAR2_283B.h, 0,
+ "NIST/SECG curve over a 283 bit binary field" },
+ { NID_sect409k1, &_EC_NIST_CHAR2_409K.h, 0,
+ "NIST/SECG curve over a 409 bit binary field" },
+ { NID_sect409r1, &_EC_NIST_CHAR2_409B.h, 0,
+ "NIST/SECG curve over a 409 bit binary field" },
+ { NID_sect571k1, &_EC_NIST_CHAR2_571K.h, 0,
+ "NIST/SECG curve over a 571 bit binary field" },
+ { NID_sect571r1, &_EC_NIST_CHAR2_571B.h, 0,
+ "NIST/SECG curve over a 571 bit binary field" },
/* X9.62 curves */
- {NID_X9_62_c2pnb163v1, &_EC_X9_62_CHAR2_163V1.h, 0,
- "X9.62 curve over a 163 bit binary field"},
- {NID_X9_62_c2pnb163v2, &_EC_X9_62_CHAR2_163V2.h, 0,
- "X9.62 curve over a 163 bit binary field"},
- {NID_X9_62_c2pnb163v3, &_EC_X9_62_CHAR2_163V3.h, 0,
- "X9.62 curve over a 163 bit binary field"},
- {NID_X9_62_c2pnb176v1, &_EC_X9_62_CHAR2_176V1.h, 0,
- "X9.62 curve over a 176 bit binary field"},
- {NID_X9_62_c2tnb191v1, &_EC_X9_62_CHAR2_191V1.h, 0,
- "X9.62 curve over a 191 bit binary field"},
- {NID_X9_62_c2tnb191v2, &_EC_X9_62_CHAR2_191V2.h, 0,
- "X9.62 curve over a 191 bit binary field"},
- {NID_X9_62_c2tnb191v3, &_EC_X9_62_CHAR2_191V3.h, 0,
- "X9.62 curve over a 191 bit binary field"},
- {NID_X9_62_c2pnb208w1, &_EC_X9_62_CHAR2_208W1.h, 0,
- "X9.62 curve over a 208 bit binary field"},
- {NID_X9_62_c2tnb239v1, &_EC_X9_62_CHAR2_239V1.h, 0,
- "X9.62 curve over a 239 bit binary field"},
- {NID_X9_62_c2tnb239v2, &_EC_X9_62_CHAR2_239V2.h, 0,
- "X9.62 curve over a 239 bit binary field"},
- {NID_X9_62_c2tnb239v3, &_EC_X9_62_CHAR2_239V3.h, 0,
- "X9.62 curve over a 239 bit binary field"},
- {NID_X9_62_c2pnb272w1, &_EC_X9_62_CHAR2_272W1.h, 0,
- "X9.62 curve over a 272 bit binary field"},
- {NID_X9_62_c2pnb304w1, &_EC_X9_62_CHAR2_304W1.h, 0,
- "X9.62 curve over a 304 bit binary field"},
- {NID_X9_62_c2tnb359v1, &_EC_X9_62_CHAR2_359V1.h, 0,
- "X9.62 curve over a 359 bit binary field"},
- {NID_X9_62_c2pnb368w1, &_EC_X9_62_CHAR2_368W1.h, 0,
- "X9.62 curve over a 368 bit binary field"},
- {NID_X9_62_c2tnb431r1, &_EC_X9_62_CHAR2_431R1.h, 0,
- "X9.62 curve over a 431 bit binary field"},
+ { NID_X9_62_c2pnb163v1, &_EC_X9_62_CHAR2_163V1.h, 0,
+ "X9.62 curve over a 163 bit binary field" },
+ { NID_X9_62_c2pnb163v2, &_EC_X9_62_CHAR2_163V2.h, 0,
+ "X9.62 curve over a 163 bit binary field" },
+ { NID_X9_62_c2pnb163v3, &_EC_X9_62_CHAR2_163V3.h, 0,
+ "X9.62 curve over a 163 bit binary field" },
+ { NID_X9_62_c2pnb176v1, &_EC_X9_62_CHAR2_176V1.h, 0,
+ "X9.62 curve over a 176 bit binary field" },
+ { NID_X9_62_c2tnb191v1, &_EC_X9_62_CHAR2_191V1.h, 0,
+ "X9.62 curve over a 191 bit binary field" },
+ { NID_X9_62_c2tnb191v2, &_EC_X9_62_CHAR2_191V2.h, 0,
+ "X9.62 curve over a 191 bit binary field" },
+ { NID_X9_62_c2tnb191v3, &_EC_X9_62_CHAR2_191V3.h, 0,
+ "X9.62 curve over a 191 bit binary field" },
+ { NID_X9_62_c2pnb208w1, &_EC_X9_62_CHAR2_208W1.h, 0,
+ "X9.62 curve over a 208 bit binary field" },
+ { NID_X9_62_c2tnb239v1, &_EC_X9_62_CHAR2_239V1.h, 0,
+ "X9.62 curve over a 239 bit binary field" },
+ { NID_X9_62_c2tnb239v2, &_EC_X9_62_CHAR2_239V2.h, 0,
+ "X9.62 curve over a 239 bit binary field" },
+ { NID_X9_62_c2tnb239v3, &_EC_X9_62_CHAR2_239V3.h, 0,
+ "X9.62 curve over a 239 bit binary field" },
+ { NID_X9_62_c2pnb272w1, &_EC_X9_62_CHAR2_272W1.h, 0,
+ "X9.62 curve over a 272 bit binary field" },
+ { NID_X9_62_c2pnb304w1, &_EC_X9_62_CHAR2_304W1.h, 0,
+ "X9.62 curve over a 304 bit binary field" },
+ { NID_X9_62_c2tnb359v1, &_EC_X9_62_CHAR2_359V1.h, 0,
+ "X9.62 curve over a 359 bit binary field" },
+ { NID_X9_62_c2pnb368w1, &_EC_X9_62_CHAR2_368W1.h, 0,
+ "X9.62 curve over a 368 bit binary field" },
+ { NID_X9_62_c2tnb431r1, &_EC_X9_62_CHAR2_431R1.h, 0,
+ "X9.62 curve over a 431 bit binary field" },
/*
* the WAP/WTLS curves [unlike SECG, spec has its own OIDs for curves
* from X9.62]
*/
- {NID_wap_wsg_idm_ecid_wtls1, &_EC_WTLS_1.h, 0,
- "WTLS curve over a 113 bit binary field"},
- {NID_wap_wsg_idm_ecid_wtls3, &_EC_NIST_CHAR2_163K.h, 0,
- "NIST/SECG/WTLS curve over a 163 bit binary field"},
- {NID_wap_wsg_idm_ecid_wtls4, &_EC_SECG_CHAR2_113R1.h, 0,
- "SECG curve over a 113 bit binary field"},
- {NID_wap_wsg_idm_ecid_wtls5, &_EC_X9_62_CHAR2_163V1.h, 0,
- "X9.62 curve over a 163 bit binary field"},
-# endif
- {NID_wap_wsg_idm_ecid_wtls6, &_EC_SECG_PRIME_112R1.h, 0,
- "SECG/WTLS curve over a 112 bit prime field"},
- {NID_wap_wsg_idm_ecid_wtls7, &_EC_SECG_PRIME_160R2.h, 0,
- "SECG/WTLS curve over a 160 bit prime field"},
- {NID_wap_wsg_idm_ecid_wtls8, &_EC_WTLS_8.h, 0,
- "WTLS curve over a 112 bit prime field"},
- {NID_wap_wsg_idm_ecid_wtls9, &_EC_WTLS_9.h, 0,
- "WTLS curve over a 160 bit prime field"},
-# ifndef OPENSSL_NO_EC2M
- {NID_wap_wsg_idm_ecid_wtls10, &_EC_NIST_CHAR2_233K.h, 0,
- "NIST/SECG/WTLS curve over a 233 bit binary field"},
- {NID_wap_wsg_idm_ecid_wtls11, &_EC_NIST_CHAR2_233B.h, 0,
- "NIST/SECG/WTLS curve over a 233 bit binary field"},
-# endif
- {NID_wap_wsg_idm_ecid_wtls12, &_EC_WTLS_12.h, 0,
- "WTLS curve over a 224 bit prime field"},
-# ifndef OPENSSL_NO_EC2M
+ { NID_wap_wsg_idm_ecid_wtls1, &_EC_WTLS_1.h, 0,
+ "WTLS curve over a 113 bit binary field" },
+ { NID_wap_wsg_idm_ecid_wtls3, &_EC_NIST_CHAR2_163K.h, 0,
+ "NIST/SECG/WTLS curve over a 163 bit binary field" },
+ { NID_wap_wsg_idm_ecid_wtls4, &_EC_SECG_CHAR2_113R1.h, 0,
+ "SECG curve over a 113 bit binary field" },
+ { NID_wap_wsg_idm_ecid_wtls5, &_EC_X9_62_CHAR2_163V1.h, 0,
+ "X9.62 curve over a 163 bit binary field" },
+#endif
+ { NID_wap_wsg_idm_ecid_wtls6, &_EC_SECG_PRIME_112R1.h, 0,
+ "SECG/WTLS curve over a 112 bit prime field" },
+ { NID_wap_wsg_idm_ecid_wtls7, &_EC_SECG_PRIME_160R2.h, 0,
+ "SECG/WTLS curve over a 160 bit prime field" },
+ { NID_wap_wsg_idm_ecid_wtls8, &_EC_WTLS_8.h, 0,
+ "WTLS curve over a 112 bit prime field" },
+ { NID_wap_wsg_idm_ecid_wtls9, &_EC_WTLS_9.h, 0,
+ "WTLS curve over a 160 bit prime field" },
+#ifndef OPENSSL_NO_EC2M
+ { NID_wap_wsg_idm_ecid_wtls10, &_EC_NIST_CHAR2_233K.h, 0,
+ "NIST/SECG/WTLS curve over a 233 bit binary field" },
+ { NID_wap_wsg_idm_ecid_wtls11, &_EC_NIST_CHAR2_233B.h, 0,
+ "NIST/SECG/WTLS curve over a 233 bit binary field" },
+#endif
+ { NID_wap_wsg_idm_ecid_wtls12, &_EC_WTLS_12.h, 0,
+ "WTLS curve over a 224 bit prime field" },
+#ifndef OPENSSL_NO_EC2M
/* IPSec curves */
- {NID_ipsec3, &_EC_IPSEC_155_ID3.h, 0,
- "\n\tIPSec/IKE/Oakley curve #3 over a 155 bit binary field.\n"
- "\tNot suitable for ECDSA.\n\tQuestionable extension field!"},
- {NID_ipsec4, &_EC_IPSEC_185_ID4.h, 0,
- "\n\tIPSec/IKE/Oakley curve #4 over a 185 bit binary field.\n"
- "\tNot suitable for ECDSA.\n\tQuestionable extension field!"},
-# endif
+ { NID_ipsec3, &_EC_IPSEC_155_ID3.h, 0,
+ "\n\tIPSec/IKE/Oakley curve #3 over a 155 bit binary field.\n"
+ "\tNot suitable for ECDSA.\n\tQuestionable extension field!" },
+ { NID_ipsec4, &_EC_IPSEC_185_ID4.h, 0,
+ "\n\tIPSec/IKE/Oakley curve #4 over a 185 bit binary field.\n"
+ "\tNot suitable for ECDSA.\n\tQuestionable extension field!" },
+#endif
/* brainpool curves */
- {NID_brainpoolP160r1, &_EC_brainpoolP160r1.h, 0,
- "RFC 5639 curve over a 160 bit prime field"},
- {NID_brainpoolP160t1, &_EC_brainpoolP160t1.h, 0,
- "RFC 5639 curve over a 160 bit prime field"},
- {NID_brainpoolP192r1, &_EC_brainpoolP192r1.h, 0,
- "RFC 5639 curve over a 192 bit prime field"},
- {NID_brainpoolP192t1, &_EC_brainpoolP192t1.h, 0,
- "RFC 5639 curve over a 192 bit prime field"},
- {NID_brainpoolP224r1, &_EC_brainpoolP224r1.h, 0,
- "RFC 5639 curve over a 224 bit prime field"},
- {NID_brainpoolP224t1, &_EC_brainpoolP224t1.h, 0,
- "RFC 5639 curve over a 224 bit prime field"},
- {NID_brainpoolP256r1, &_EC_brainpoolP256r1.h, 0,
- "RFC 5639 curve over a 256 bit prime field"},
- {NID_brainpoolP256t1, &_EC_brainpoolP256t1.h, 0,
- "RFC 5639 curve over a 256 bit prime field"},
- {NID_brainpoolP320r1, &_EC_brainpoolP320r1.h, 0,
- "RFC 5639 curve over a 320 bit prime field"},
- {NID_brainpoolP320t1, &_EC_brainpoolP320t1.h, 0,
- "RFC 5639 curve over a 320 bit prime field"},
- {NID_brainpoolP384r1, &_EC_brainpoolP384r1.h, 0,
- "RFC 5639 curve over a 384 bit prime field"},
- {NID_brainpoolP384t1, &_EC_brainpoolP384t1.h, 0,
- "RFC 5639 curve over a 384 bit prime field"},
- {NID_brainpoolP512r1, &_EC_brainpoolP512r1.h, 0,
- "RFC 5639 curve over a 512 bit prime field"},
- {NID_brainpoolP512t1, &_EC_brainpoolP512t1.h, 0,
- "RFC 5639 curve over a 512 bit prime field"},
+ { NID_brainpoolP160r1, &_EC_brainpoolP160r1.h, 0,
+ "RFC 5639 curve over a 160 bit prime field" },
+ { NID_brainpoolP160t1, &_EC_brainpoolP160t1.h, 0,
+ "RFC 5639 curve over a 160 bit prime field" },
+ { NID_brainpoolP192r1, &_EC_brainpoolP192r1.h, 0,
+ "RFC 5639 curve over a 192 bit prime field" },
+ { NID_brainpoolP192t1, &_EC_brainpoolP192t1.h, 0,
+ "RFC 5639 curve over a 192 bit prime field" },
+ { NID_brainpoolP224r1, &_EC_brainpoolP224r1.h, 0,
+ "RFC 5639 curve over a 224 bit prime field" },
+ { NID_brainpoolP224t1, &_EC_brainpoolP224t1.h, 0,
+ "RFC 5639 curve over a 224 bit prime field" },
+ { NID_brainpoolP256r1, &_EC_brainpoolP256r1.h, 0,
+ "RFC 5639 curve over a 256 bit prime field" },
+ { NID_brainpoolP256t1, &_EC_brainpoolP256t1.h, 0,
+ "RFC 5639 curve over a 256 bit prime field" },
+ { NID_brainpoolP320r1, &_EC_brainpoolP320r1.h, 0,
+ "RFC 5639 curve over a 320 bit prime field" },
+ { NID_brainpoolP320t1, &_EC_brainpoolP320t1.h, 0,
+ "RFC 5639 curve over a 320 bit prime field" },
+ { NID_brainpoolP384r1, &_EC_brainpoolP384r1.h, 0,
+ "RFC 5639 curve over a 384 bit prime field" },
+ { NID_brainpoolP384t1, &_EC_brainpoolP384t1.h, 0,
+ "RFC 5639 curve over a 384 bit prime field" },
+ { NID_brainpoolP512r1, &_EC_brainpoolP512r1.h, 0,
+ "RFC 5639 curve over a 512 bit prime field" },
+ { NID_brainpoolP512t1, &_EC_brainpoolP512t1.h, 0,
+ "RFC 5639 curve over a 512 bit prime field" },
#ifndef OPENSSL_NO_SM2
- {NID_sm2, &_EC_sm2p256v1.h,
-# ifdef ECP_SM2P256_ASM
- EC_GFp_sm2p256_method,
-# else
- 0,
-# endif
- "SM2 curve over a 256 bit prime field"},
-# endif
+ { NID_sm2, &_EC_sm2p256v1.h,
+#ifdef ECP_SM2P256_ASM
+ EC_GFp_sm2p256_method,
+#else
+ 0,
+#endif
+ "SM2 curve over a 256 bit prime field" },
+#endif
};
#endif /* FIPS_MODULE */
@@ -3148,14 +3024,13 @@ static const ec_list_element *ec_curve_nid2curve(int nid)
}
static EC_GROUP *ec_group_new_from_data(OSSL_LIB_CTX *libctx,
- const char *propq,
- const ec_list_element curve)
+ const char *propq,
+ const ec_list_element curve)
{
EC_GROUP *group = NULL;
EC_POINT *P = NULL;
BN_CTX *ctx = NULL;
- BIGNUM *p = NULL, *a = NULL, *b = NULL, *x = NULL, *y = NULL, *order =
- NULL;
+ BIGNUM *p = NULL, *a = NULL, *b = NULL, *x = NULL, *y = NULL, *order = NULL;
int ok = 0;
int seed_len, param_len;
const EC_METHOD *meth;
@@ -3165,7 +3040,7 @@ static EC_GROUP *ec_group_new_from_data(OSSL_LIB_CTX *libctx,
/* If no curve data curve method must handle everything */
if (curve.data == NULL)
return ossl_ec_group_new_ex(libctx, propq,
- curve.meth != NULL ? curve.meth() : NULL);
+ curve.meth != NULL ? curve.meth() : NULL);
if ((ctx = BN_CTX_new_ex(libctx)) == NULL) {
ERR_raise(ERR_LIB_EC, ERR_R_BN_LIB);
@@ -3184,7 +3059,7 @@ static EC_GROUP *ec_group_new_from_data(OSSL_LIB_CTX *libctx,
goto err;
}
if (group->meth->group_full_init != NULL) {
- if (!group->meth->group_full_init(group, params)){
+ if (!group->meth->group_full_init(group, params)) {
ERR_raise(ERR_LIB_EC, ERR_R_EC_LIB);
goto err;
}
@@ -3194,7 +3069,7 @@ static EC_GROUP *ec_group_new_from_data(OSSL_LIB_CTX *libctx,
}
}
- params += seed_len; /* skip seed */
+ params += seed_len; /* skip seed */
if ((p = BN_bin2bn(params + 0 * param_len, param_len, NULL)) == NULL
|| (a = BN_bin2bn(params + 1 * param_len, param_len, NULL)) == NULL
@@ -3215,8 +3090,8 @@ static EC_GROUP *ec_group_new_from_data(OSSL_LIB_CTX *libctx,
}
}
#ifndef OPENSSL_NO_EC2M
- else { /* field_type ==
- * NID_X9_62_characteristic_two_field */
+ else { /* field_type ==
+ * NID_X9_62_characteristic_two_field */
if ((group = EC_GROUP_new_curve_GF2m(p, a, b, ctx)) == NULL) {
ERR_raise(ERR_LIB_EC, ERR_R_EC_LIB);
@@ -3294,7 +3169,7 @@ static EC_GROUP *ec_group_new_from_data(OSSL_LIB_CTX *libctx,
#endif
ok = 1;
- err:
+err:
if (!ok) {
EC_GROUP_free(group);
group = NULL;
@@ -3311,7 +3186,7 @@ static EC_GROUP *ec_group_new_from_data(OSSL_LIB_CTX *libctx,
}
EC_GROUP *EC_GROUP_new_by_curve_name_ex(OSSL_LIB_CTX *libctx, const char *propq,
- int nid)
+ int nid)
{
EC_GROUP *ret = NULL;
const ec_list_element *curve;
@@ -3320,7 +3195,7 @@ EC_GROUP *EC_GROUP_new_by_curve_name_ex(OSSL_LIB_CTX *libctx, const char *propq,
|| (ret = ec_group_new_from_data(libctx, propq, *curve)) == NULL) {
#ifndef FIPS_MODULE
ERR_raise_data(ERR_LIB_EC, EC_R_UNKNOWN_GROUP,
- "name=%s", OBJ_nid2sn(nid));
+ "name=%s", OBJ_nid2sn(nid));
#else
ERR_raise(ERR_LIB_EC, EC_R_UNKNOWN_GROUP);
#endif
@@ -3383,7 +3258,7 @@ int ossl_ec_curve_nid_from_params(const EC_GROUP *group, BN_CTX *ctx)
const EC_POINT *generator = NULL;
const BIGNUM *cofactor = NULL;
/* An array of BIGNUMs for (p, a, b, x, y, order) */
- BIGNUM *bn[NUM_BN_FIELDS] = {NULL, NULL, NULL, NULL, NULL, NULL};
+ BIGNUM *bn[NUM_BN_FIELDS] = { NULL, NULL, NULL, NULL, NULL, NULL };
/* Use the optional named curve nid as a search field */
nid = EC_GROUP_get_curve_name(group);
@@ -3421,20 +3296,20 @@ int ossl_ec_curve_nid_from_params(const EC_GROUP *group, BN_CTX *ctx)
*/
/* Get p, a & b */
if (!(EC_GROUP_get_curve(group, bn[0], bn[1], bn[2], ctx)
- && ((generator = EC_GROUP_get0_generator(group)) != NULL)
- /* Get x & y */
- && EC_POINT_get_affine_coordinates(group, generator, bn[3], bn[4], ctx)
- /* Get order */
- && EC_GROUP_get_order(group, bn[5], ctx)))
+ && ((generator = EC_GROUP_get0_generator(group)) != NULL)
+ /* Get x & y */
+ && EC_POINT_get_affine_coordinates(group, generator, bn[3], bn[4], ctx)
+ /* Get order */
+ && EC_GROUP_get_order(group, bn[5], ctx)))
goto end;
- /*
+ /*
* Convert the bignum array to bytes that are joined together to form
* a single buffer that contains data for all fields.
* (p, a, b, x, y, order) are all zero padded to be the same size.
*/
for (i = 0; i < NUM_BN_FIELDS; ++i) {
- if (BN_bn2binpad(bn[i], ¶m_bytes[i*param_len], param_len) <= 0)
+ if (BN_bn2binpad(bn[i], ¶m_bytes[i * param_len], param_len) <= 0)
goto end;
}
@@ -3456,10 +3331,10 @@ int ossl_ec_curve_nid_from_params(const EC_GROUP *group, BN_CTX *ctx)
/* Check the optional seed (ignore if its not set) */
&& (data->seed_len == 0 || seed_len == 0
|| ((size_t)data->seed_len == seed_len
- && memcmp(params_seed, seed, seed_len) == 0))
+ && memcmp(params_seed, seed, seed_len) == 0))
/* Check that the groups params match the built-in curve params */
&& memcmp(param_bytes, params, param_len * NUM_BN_FIELDS)
- == 0) {
+ == 0) {
ret = curve.nid;
goto end;
}
diff --git a/crypto/ec/ec_cvt.c b/crypto/ec/ec_cvt.c
index 7b5d0f5ceb..3bf9a35dba 100644
--- a/crypto/ec/ec_cvt.c
+++ b/crypto/ec/ec_cvt.c
@@ -19,7 +19,7 @@
#include "ec_local.h"
EC_GROUP *EC_GROUP_new_curve_GFp(const BIGNUM *p, const BIGNUM *a,
- const BIGNUM *b, BN_CTX *ctx)
+ const BIGNUM *b, BN_CTX *ctx)
{
const EC_METHOD *meth;
EC_GROUP *ret;
@@ -68,7 +68,7 @@ EC_GROUP *EC_GROUP_new_curve_GFp(const BIGNUM *p, const BIGNUM *a,
#ifndef OPENSSL_NO_EC2M
EC_GROUP *EC_GROUP_new_curve_GF2m(const BIGNUM *p, const BIGNUM *a,
- const BIGNUM *b, BN_CTX *ctx)
+ const BIGNUM *b, BN_CTX *ctx)
{
const EC_METHOD *meth;
EC_GROUP *ret;
diff --git a/crypto/ec/ec_deprecated.c b/crypto/ec/ec_deprecated.c
index 0db211807f..dd4bb520be 100644
--- a/crypto/ec/ec_deprecated.c
+++ b/crypto/ec/ec_deprecated.c
@@ -19,9 +19,9 @@
#ifndef OPENSSL_NO_DEPRECATED_3_0
BIGNUM *EC_POINT_point2bn(const EC_GROUP *group,
- const EC_POINT *point,
- point_conversion_form_t form,
- BIGNUM *ret, BN_CTX *ctx)
+ const EC_POINT *point,
+ point_conversion_form_t form,
+ BIGNUM *ret, BN_CTX *ctx)
{
size_t buf_len = 0;
unsigned char *buf;
@@ -39,7 +39,7 @@ BIGNUM *EC_POINT_point2bn(const EC_GROUP *group,
}
EC_POINT *EC_POINT_bn2point(const EC_GROUP *group,
- const BIGNUM *bn, EC_POINT *point, BN_CTX *ctx)
+ const BIGNUM *bn, EC_POINT *point, BN_CTX *ctx)
{
int buf_len = 0;
unsigned char *buf;
diff --git a/crypto/ec/ec_err.c b/crypto/ec/ec_err.c
index 480376686b..4e3152d0df 100644
--- a/crypto/ec/ec_err.c
+++ b/crypto/ec/ec_err.c
@@ -14,121 +14,121 @@
#ifndef OPENSSL_NO_EC
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA EC_str_reasons[] = {
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_ASN1_ERROR), "asn1 error"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_BAD_SIGNATURE), "bad signature"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_BIGNUM_OUT_OF_RANGE), "bignum out of range"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_BUFFER_TOO_SMALL), "buffer too small"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_CANNOT_INVERT), "cannot invert"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_COORDINATES_OUT_OF_RANGE),
- "coordinates out of range"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_CURVE_DOES_NOT_SUPPORT_ECDH),
- "curve does not support ecdh"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_CURVE_DOES_NOT_SUPPORT_ECDSA),
- "curve does not support ecdsa"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_CURVE_DOES_NOT_SUPPORT_SIGNING),
- "curve does not support signing"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_DECODE_ERROR), "decode error"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_DISCRIMINANT_IS_ZERO),
- "discriminant is zero"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_EC_GROUP_NEW_BY_NAME_FAILURE),
- "ec group new by name failure"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_EXPLICIT_PARAMS_NOT_SUPPORTED),
- "explicit params not supported"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_FAILED_MAKING_PUBLIC_KEY),
- "failed making public key"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_FIELD_TOO_LARGE), "field too large"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_GF2M_NOT_SUPPORTED), "gf2m not supported"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_GROUP2PKPARAMETERS_FAILURE),
- "group2pkparameters failure"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_I2D_ECPKPARAMETERS_FAILURE),
- "i2d ecpkparameters failure"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_INCOMPATIBLE_OBJECTS),
- "incompatible objects"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_A), "invalid a"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_ARGUMENT), "invalid argument"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_B), "invalid b"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_COFACTOR), "invalid cofactor"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_COMPRESSED_POINT),
- "invalid compressed point"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_COMPRESSION_BIT),
- "invalid compression bit"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_CURVE), "invalid curve"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_DIGEST), "invalid digest"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_DIGEST_TYPE), "invalid digest type"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_ENCODING), "invalid encoding"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_FIELD), "invalid field"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_FORM), "invalid form"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_GENERATOR), "invalid generator"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_GROUP_ORDER), "invalid group order"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_KEY), "invalid key"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_LENGTH), "invalid length"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_NAMED_GROUP_CONVERSION),
- "invalid named group conversion"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_OUTPUT_LENGTH),
- "invalid output length"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_P), "invalid p"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_PEER_KEY), "invalid peer key"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_PENTANOMIAL_BASIS),
- "invalid pentanomial basis"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_PRIVATE_KEY), "invalid private key"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_SEED), "invalid seed"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_TRINOMIAL_BASIS),
- "invalid trinomial basis"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_KDF_PARAMETER_ERROR), "kdf parameter error"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_KEYS_NOT_SET), "keys not set"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_LADDER_POST_FAILURE), "ladder post failure"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_LADDER_PRE_FAILURE), "ladder pre failure"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_LADDER_STEP_FAILURE), "ladder step failure"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_MISSING_OID), "missing OID"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_MISSING_PARAMETERS), "missing parameters"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_MISSING_PRIVATE_KEY), "missing private key"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_NEED_NEW_SETUP_VALUES),
- "need new setup values"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_NOT_A_NIST_PRIME), "not a NIST prime"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_NOT_IMPLEMENTED), "not implemented"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_NOT_INITIALIZED), "not initialized"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_NO_PARAMETERS_SET), "no parameters set"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_NO_PRIVATE_VALUE), "no private value"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_OPERATION_NOT_SUPPORTED),
- "operation not supported"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_PASSED_NULL_PARAMETER),
- "passed null parameter"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_PEER_KEY_ERROR), "peer key error"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_POINT_ARITHMETIC_FAILURE),
- "point arithmetic failure"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_POINT_AT_INFINITY), "point at infinity"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_POINT_COORDINATES_BLIND_FAILURE),
- "point coordinates blind failure"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_POINT_IS_NOT_ON_CURVE),
- "point is not on curve"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_RANDOM_NUMBER_GENERATION_FAILED),
- "random number generation failed"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_SHARED_INFO_ERROR), "shared info error"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_SLOT_FULL), "slot full"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_TOO_MANY_RETRIES), "too many retries"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_UNDEFINED_GENERATOR), "undefined generator"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_UNDEFINED_ORDER), "undefined order"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_UNKNOWN_COFACTOR), "unknown cofactor"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_UNKNOWN_GROUP), "unknown group"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_UNKNOWN_ORDER), "unknown order"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_UNSUPPORTED_FIELD), "unsupported field"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_WRONG_CURVE_PARAMETERS),
- "wrong curve parameters"},
- {ERR_PACK(ERR_LIB_EC, 0, EC_R_WRONG_ORDER), "wrong order"},
- {0, NULL}
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_ASN1_ERROR), "asn1 error" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_BAD_SIGNATURE), "bad signature" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_BIGNUM_OUT_OF_RANGE), "bignum out of range" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_BUFFER_TOO_SMALL), "buffer too small" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_CANNOT_INVERT), "cannot invert" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_COORDINATES_OUT_OF_RANGE),
+ "coordinates out of range" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_CURVE_DOES_NOT_SUPPORT_ECDH),
+ "curve does not support ecdh" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_CURVE_DOES_NOT_SUPPORT_ECDSA),
+ "curve does not support ecdsa" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_CURVE_DOES_NOT_SUPPORT_SIGNING),
+ "curve does not support signing" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_DECODE_ERROR), "decode error" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_DISCRIMINANT_IS_ZERO),
+ "discriminant is zero" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_EC_GROUP_NEW_BY_NAME_FAILURE),
+ "ec group new by name failure" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_EXPLICIT_PARAMS_NOT_SUPPORTED),
+ "explicit params not supported" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_FAILED_MAKING_PUBLIC_KEY),
+ "failed making public key" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_FIELD_TOO_LARGE), "field too large" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_GF2M_NOT_SUPPORTED), "gf2m not supported" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_GROUP2PKPARAMETERS_FAILURE),
+ "group2pkparameters failure" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_I2D_ECPKPARAMETERS_FAILURE),
+ "i2d ecpkparameters failure" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_INCOMPATIBLE_OBJECTS),
+ "incompatible objects" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_A), "invalid a" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_ARGUMENT), "invalid argument" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_B), "invalid b" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_COFACTOR), "invalid cofactor" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_COMPRESSED_POINT),
+ "invalid compressed point" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_COMPRESSION_BIT),
+ "invalid compression bit" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_CURVE), "invalid curve" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_DIGEST), "invalid digest" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_DIGEST_TYPE), "invalid digest type" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_ENCODING), "invalid encoding" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_FIELD), "invalid field" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_FORM), "invalid form" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_GENERATOR), "invalid generator" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_GROUP_ORDER), "invalid group order" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_KEY), "invalid key" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_LENGTH), "invalid length" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_NAMED_GROUP_CONVERSION),
+ "invalid named group conversion" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_OUTPUT_LENGTH),
+ "invalid output length" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_P), "invalid p" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_PEER_KEY), "invalid peer key" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_PENTANOMIAL_BASIS),
+ "invalid pentanomial basis" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_PRIVATE_KEY), "invalid private key" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_SEED), "invalid seed" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_TRINOMIAL_BASIS),
+ "invalid trinomial basis" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_KDF_PARAMETER_ERROR), "kdf parameter error" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_KEYS_NOT_SET), "keys not set" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_LADDER_POST_FAILURE), "ladder post failure" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_LADDER_PRE_FAILURE), "ladder pre failure" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_LADDER_STEP_FAILURE), "ladder step failure" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_MISSING_OID), "missing OID" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_MISSING_PARAMETERS), "missing parameters" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_MISSING_PRIVATE_KEY), "missing private key" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_NEED_NEW_SETUP_VALUES),
+ "need new setup values" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_NOT_A_NIST_PRIME), "not a NIST prime" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_NOT_IMPLEMENTED), "not implemented" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_NOT_INITIALIZED), "not initialized" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_NO_PARAMETERS_SET), "no parameters set" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_NO_PRIVATE_VALUE), "no private value" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_OPERATION_NOT_SUPPORTED),
+ "operation not supported" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_PASSED_NULL_PARAMETER),
+ "passed null parameter" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_PEER_KEY_ERROR), "peer key error" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_POINT_ARITHMETIC_FAILURE),
+ "point arithmetic failure" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_POINT_AT_INFINITY), "point at infinity" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_POINT_COORDINATES_BLIND_FAILURE),
+ "point coordinates blind failure" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_POINT_IS_NOT_ON_CURVE),
+ "point is not on curve" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_RANDOM_NUMBER_GENERATION_FAILED),
+ "random number generation failed" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_SHARED_INFO_ERROR), "shared info error" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_SLOT_FULL), "slot full" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_TOO_MANY_RETRIES), "too many retries" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_UNDEFINED_GENERATOR), "undefined generator" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_UNDEFINED_ORDER), "undefined order" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_UNKNOWN_COFACTOR), "unknown cofactor" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_UNKNOWN_GROUP), "unknown group" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_UNKNOWN_ORDER), "unknown order" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_UNSUPPORTED_FIELD), "unsupported field" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_WRONG_CURVE_PARAMETERS),
+ "wrong curve parameters" },
+ { ERR_PACK(ERR_LIB_EC, 0, EC_R_WRONG_ORDER), "wrong order" },
+ { 0, NULL }
};
-# endif
+#endif
int ossl_err_load_EC_strings(void)
{
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(EC_str_reasons[0].error) == NULL)
ERR_load_strings_const(EC_str_reasons);
-# endif
+#endif
return 1;
}
#else
diff --git a/crypto/ec/ec_key.c b/crypto/ec/ec_key.c
index 46b4db87dc..a2a4a7401e 100644
--- a/crypto/ec/ec_key.c
+++ b/crypto/ec/ec_key.c
@@ -25,7 +25,7 @@
#include "crypto/bn.h"
static int ecdsa_keygen_pairwise_test(EC_KEY *eckey, OSSL_CALLBACK *cb,
- void *cbarg);
+ void *cbarg);
#ifndef FIPS_MODULE
EC_KEY *EC_KEY_new(void)
@@ -40,7 +40,7 @@ EC_KEY *EC_KEY_new_ex(OSSL_LIB_CTX *ctx, const char *propq)
}
EC_KEY *EC_KEY_new_by_curve_name_ex(OSSL_LIB_CTX *ctx, const char *propq,
- int nid)
+ int nid)
{
EC_KEY *ret = EC_KEY_new_ex(ctx, propq);
if (ret == NULL)
@@ -114,7 +114,7 @@ EC_KEY *EC_KEY_copy(EC_KEY *dest, const EC_KEY *src)
/* clear the old group */
EC_GROUP_free(dest->group);
dest->group = ossl_ec_group_new_ex(src->libctx, src->propq,
- src->group->meth);
+ src->group->meth);
if (dest->group == NULL)
return NULL;
if (!EC_GROUP_copy(dest->group, src->group))
@@ -144,7 +144,6 @@ EC_KEY *EC_KEY_copy(EC_KEY *dest, const EC_KEY *src)
}
}
-
/* copy the rest */
dest->enc_flag = src->enc_flag;
dest->conv_form = src->conv_form;
@@ -152,7 +151,7 @@ EC_KEY *EC_KEY_copy(EC_KEY *dest, const EC_KEY *src)
dest->flags = src->flags;
#ifndef FIPS_MODULE
if (!CRYPTO_dup_ex_data(CRYPTO_EX_INDEX_EC_KEY,
- &dest->ex_data, &src->ex_data))
+ &dest->ex_data, &src->ex_data))
return NULL;
#endif
@@ -229,11 +228,11 @@ int ossl_ec_key_gen(EC_KEY *eckey)
* the comparison of the original public key to a newly calculated public key.
*/
static int ecdsa_keygen_knownanswer_test(EC_KEY *eckey, BN_CTX *ctx,
- OSSL_CALLBACK *cb, void *cbarg)
+ OSSL_CALLBACK *cb, void *cbarg)
{
int len, ret = 0;
OSSL_SELF_TEST *st = NULL;
- unsigned char bytes[512] = {0};
+ unsigned char bytes[512] = { 0 };
EC_POINT *pub_key2 = NULL;
st = OSSL_SELF_TEST_new(cb, cbarg);
@@ -241,7 +240,7 @@ static int ecdsa_keygen_knownanswer_test(EC_KEY *eckey, BN_CTX *ctx,
return 0;
OSSL_SELF_TEST_onbegin(st, OSSL_SELF_TEST_TYPE_PCT_KAT,
- OSSL_SELF_TEST_DESC_PCT_ECDSA);
+ OSSL_SELF_TEST_DESC_PCT_ECDSA);
if ((pub_key2 = EC_POINT_new(eckey->group)) == NULL)
goto err;
@@ -254,7 +253,7 @@ static int ecdsa_keygen_knownanswer_test(EC_KEY *eckey, BN_CTX *ctx,
goto err;
len = BN_bn2bin(pub_key2->X, bytes);
if (OSSL_SELF_TEST_oncorrupt_byte(st, bytes)
- && BN_bin2bn(bytes, len, pub_key2->X) == NULL)
+ && BN_bin2bn(bytes, len, pub_key2->X) == NULL)
goto err;
ret = !EC_POINT_cmp(eckey->group, eckey->pub_key, pub_key2, ctx);
@@ -331,7 +330,7 @@ static int ec_generate_key(EC_KEY *eckey, int pairwise_test)
do
if (!BN_priv_rand_range_ex(priv_key, order, 0, ctx))
goto err;
- while (BN_is_zero(priv_key)) ;
+ while (BN_is_zero(priv_key));
if (eckey->pub_key == NULL) {
pub_key = EC_POINT_new(group);
@@ -362,7 +361,7 @@ static int ec_generate_key(EC_KEY *eckey, int pairwise_test)
OSSL_SELF_TEST_get_callback(eckey->libctx, &cb, &cbarg);
ok = ecdsa_keygen_pairwise_test(eckey, cb, cbarg)
- && ecdsa_keygen_knownanswer_test(eckey, ctx, cb, cbarg);
+ && ecdsa_keygen_knownanswer_test(eckey, ctx, cb, cbarg);
}
err:
/* Step (9): If there is an error return an invalid keypair. */
@@ -386,7 +385,7 @@ err:
* derive the private key.
*/
int ossl_ec_generate_key_dhkem(EC_KEY *eckey,
- const unsigned char *ikm, size_t ikmlen)
+ const unsigned char *ikm, size_t ikmlen)
{
int ok = 0;
@@ -435,7 +434,7 @@ int ossl_ec_key_simple_generate_public_key(EC_KEY *eckey)
* pub_key = priv_key * G (where G is a point on the curve)
*/
ret = EC_POINT_mul(eckey->group, eckey->pub_key, eckey->priv_key, NULL,
- NULL, ctx);
+ NULL, ctx);
BN_CTX_free(ctx);
if (ret == 1)
@@ -605,9 +604,9 @@ int ossl_ec_key_pairwise_check(const EC_KEY *eckey, BN_CTX *ctx)
EC_POINT *point = NULL;
if (eckey == NULL
- || eckey->group == NULL
- || eckey->pub_key == NULL
- || eckey->priv_key == NULL) {
+ || eckey->group == NULL
+ || eckey->pub_key == NULL
+ || eckey->priv_key == NULL) {
ERR_raise(ERR_LIB_EC, ERR_R_PASSED_NULL_PARAMETER);
return 0;
}
@@ -616,7 +615,6 @@ int ossl_ec_key_pairwise_check(const EC_KEY *eckey, BN_CTX *ctx)
if (point == NULL)
goto err;
-
if (!EC_POINT_mul(eckey->group, point, eckey->priv_key, NULL, NULL, ctx)) {
ERR_raise(ERR_LIB_EC, ERR_R_EC_LIB);
goto err;
@@ -631,7 +629,6 @@ err:
return ret;
}
-
/*
* ECC Key validation as specified in SP800-56A R3.
* Section 5.6.2.3.3 ECC Full Public-Key Validation
@@ -669,7 +666,7 @@ err:
}
int EC_KEY_set_public_key_affine_coordinates(EC_KEY *key, BIGNUM *x,
- BIGNUM *y)
+ BIGNUM *y)
{
BN_CTX *ctx = NULL;
BIGNUM *tx, *ty;
@@ -718,12 +715,11 @@ int EC_KEY_set_public_key_affine_coordinates(EC_KEY *key, BIGNUM *x,
ok = 1;
- err:
+err:
BN_CTX_end(ctx);
BN_CTX_free(ctx);
EC_POINT_free(point);
return ok;
-
}
OSSL_LIB_CTX *ossl_ec_key_get_libctx(const EC_KEY *key)
@@ -938,7 +934,7 @@ int EC_KEY_decoded_from_explicit_params(const EC_KEY *key)
}
size_t EC_KEY_key2buf(const EC_KEY *key, point_conversion_form_t form,
- unsigned char **pbuf, BN_CTX *ctx)
+ unsigned char **pbuf, BN_CTX *ctx)
{
if (key == NULL || key->pub_key == NULL || key->group == NULL)
return 0;
@@ -946,7 +942,7 @@ size_t EC_KEY_key2buf(const EC_KEY *key, point_conversion_form_t form,
}
int EC_KEY_oct2key(EC_KEY *key, const unsigned char *buf, size_t len,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
if (key == NULL || key->group == NULL)
return 0;
@@ -970,7 +966,7 @@ int EC_KEY_oct2key(EC_KEY *key, const unsigned char *buf, size_t len,
}
size_t EC_KEY_priv2oct(const EC_KEY *eckey,
- unsigned char *buf, size_t len)
+ unsigned char *buf, size_t len)
{
if (eckey->group == NULL || eckey->group->meth == NULL)
return 0;
@@ -983,7 +979,7 @@ size_t EC_KEY_priv2oct(const EC_KEY *eckey,
}
size_t ossl_ec_key_simple_priv2oct(const EC_KEY *eckey,
- unsigned char *buf, size_t len)
+ unsigned char *buf, size_t len)
{
int buf_len;
@@ -1022,7 +1018,7 @@ int EC_KEY_oct2priv(EC_KEY *eckey, const unsigned char *buf, size_t len)
}
int ossl_ec_key_simple_oct2priv(EC_KEY *eckey, const unsigned char *buf,
- size_t len)
+ size_t len)
{
if (len > INT_MAX) {
ERR_raise(ERR_LIB_EC, ERR_R_PASSED_INVALID_ARGUMENT);
@@ -1079,10 +1075,10 @@ int EC_KEY_can_sign(const EC_KEY *eckey)
* omitted here.
*/
static int ecdsa_keygen_pairwise_test(EC_KEY *eckey, OSSL_CALLBACK *cb,
- void *cbarg)
+ void *cbarg)
{
int ret = 0;
- unsigned char dgst[16] = {0};
+ unsigned char dgst[16] = { 0 };
int dgst_len = (int)sizeof(dgst);
ECDSA_SIG *sig = NULL;
OSSL_SELF_TEST *st = NULL;
@@ -1092,7 +1088,7 @@ static int ecdsa_keygen_pairwise_test(EC_KEY *eckey, OSSL_CALLBACK *cb,
return 0;
OSSL_SELF_TEST_onbegin(st, OSSL_SELF_TEST_TYPE_PCT,
- OSSL_SELF_TEST_DESC_PCT_ECDSA);
+ OSSL_SELF_TEST_DESC_PCT_ECDSA);
sig = ECDSA_do_sign(dgst, dgst_len, eckey);
if (sig == NULL)
diff --git a/crypto/ec/ec_kmeth.c b/crypto/ec/ec_kmeth.c
index 88323d69ba..b98bdd578e 100644
--- a/crypto/ec/ec_kmeth.c
+++ b/crypto/ec/ec_kmeth.c
@@ -21,7 +21,7 @@
static const EC_KEY_METHOD openssl_ec_key_method = {
"OpenSSL EC_KEY method",
0,
- 0,0,0,0,0,0,
+ 0, 0, 0, 0, 0, 0,
ossl_ec_key_gen,
ossl_ecdh_compute_key,
ossl_ecdsa_sign,
@@ -106,7 +106,7 @@ EC_KEY *ossl_ec_key_new_method_int(OSSL_LIB_CTX *libctx, const char *propq)
}
return ret;
- err:
+err:
EC_KEY_free(ret);
return NULL;
}
@@ -121,9 +121,9 @@ EC_KEY *EC_KEY_new_method(ossl_unused ENGINE *engine)
#endif
int ECDH_compute_key(void *out, size_t outlen, const EC_POINT *pub_key,
- const EC_KEY *eckey,
- void *(*KDF) (const void *in, size_t inlen, void *out,
- size_t *outlen))
+ const EC_KEY *eckey,
+ void *(*KDF)(const void *in, size_t inlen, void *out,
+ size_t *outlen))
{
unsigned char *sec = NULL;
size_t seclen;
@@ -167,14 +167,14 @@ void EC_KEY_METHOD_free(EC_KEY_METHOD *meth)
}
void EC_KEY_METHOD_set_init(EC_KEY_METHOD *meth,
- int (*init)(EC_KEY *key),
- void (*finish)(EC_KEY *key),
- int (*copy)(EC_KEY *dest, const EC_KEY *src),
- int (*set_group)(EC_KEY *key, const EC_GROUP *grp),
- int (*set_private)(EC_KEY *key,
- const BIGNUM *priv_key),
- int (*set_public)(EC_KEY *key,
- const EC_POINT *pub_key))
+ int (*init)(EC_KEY *key),
+ void (*finish)(EC_KEY *key),
+ int (*copy)(EC_KEY *dest, const EC_KEY *src),
+ int (*set_group)(EC_KEY *key, const EC_GROUP *grp),
+ int (*set_private)(EC_KEY *key,
+ const BIGNUM *priv_key),
+ int (*set_public)(EC_KEY *key,
+ const EC_POINT *pub_key))
{
meth->init = init;
meth->finish = finish;
@@ -185,33 +185,33 @@ void EC_KEY_METHOD_set_init(EC_KEY_METHOD *meth,
}
void EC_KEY_METHOD_set_keygen(EC_KEY_METHOD *meth,
- int (*keygen)(EC_KEY *key))
+ int (*keygen)(EC_KEY *key))
{
meth->keygen = keygen;
}
void EC_KEY_METHOD_set_compute_key(EC_KEY_METHOD *meth,
- int (*ckey)(unsigned char **psec,
- size_t *pseclen,
- const EC_POINT *pub_key,
- const EC_KEY *ecdh))
+ int (*ckey)(unsigned char **psec,
+ size_t *pseclen,
+ const EC_POINT *pub_key,
+ const EC_KEY *ecdh))
{
meth->compute_key = ckey;
}
void EC_KEY_METHOD_set_sign(EC_KEY_METHOD *meth,
- int (*sign)(int type, const unsigned char *dgst,
- int dlen, unsigned char *sig,
- unsigned int *siglen,
- const BIGNUM *kinv, const BIGNUM *r,
- EC_KEY *eckey),
- int (*sign_setup)(EC_KEY *eckey, BN_CTX *ctx_in,
- BIGNUM **kinvp, BIGNUM **rp),
- ECDSA_SIG *(*sign_sig)(const unsigned char *dgst,
- int dgst_len,
- const BIGNUM *in_kinv,
- const BIGNUM *in_r,
- EC_KEY *eckey))
+ int (*sign)(int type, const unsigned char *dgst,
+ int dlen, unsigned char *sig,
+ unsigned int *siglen,
+ const BIGNUM *kinv, const BIGNUM *r,
+ EC_KEY *eckey),
+ int (*sign_setup)(EC_KEY *eckey, BN_CTX *ctx_in,
+ BIGNUM **kinvp, BIGNUM **rp),
+ ECDSA_SIG *(*sign_sig)(const unsigned char *dgst,
+ int dgst_len,
+ const BIGNUM *in_kinv,
+ const BIGNUM *in_r,
+ EC_KEY *eckey))
{
meth->sign = sign;
meth->sign_setup = sign_setup;
@@ -219,29 +219,28 @@ void EC_KEY_METHOD_set_sign(EC_KEY_METHOD *meth,
}
void EC_KEY_METHOD_set_verify(EC_KEY_METHOD *meth,
- int (*verify)(int type, const unsigned
- char *dgst, int dgst_len,
- const unsigned char *sigbuf,
- int sig_len, EC_KEY *eckey),
- int (*verify_sig)(const unsigned char *dgst,
- int dgst_len,
- const ECDSA_SIG *sig,
- EC_KEY *eckey))
+ int (*verify)(int type, const unsigned char *dgst, int dgst_len,
+ const unsigned char *sigbuf,
+ int sig_len, EC_KEY *eckey),
+ int (*verify_sig)(const unsigned char *dgst,
+ int dgst_len,
+ const ECDSA_SIG *sig,
+ EC_KEY *eckey))
{
meth->verify = verify;
meth->verify_sig = verify_sig;
}
void EC_KEY_METHOD_get_init(const EC_KEY_METHOD *meth,
- int (**pinit)(EC_KEY *key),
- void (**pfinish)(EC_KEY *key),
- int (**pcopy)(EC_KEY *dest, const EC_KEY *src),
- int (**pset_group)(EC_KEY *key,
- const EC_GROUP *grp),
- int (**pset_private)(EC_KEY *key,
- const BIGNUM *priv_key),
- int (**pset_public)(EC_KEY *key,
- const EC_POINT *pub_key))
+ int (**pinit)(EC_KEY *key),
+ void (**pfinish)(EC_KEY *key),
+ int (**pcopy)(EC_KEY *dest, const EC_KEY *src),
+ int (**pset_group)(EC_KEY *key,
+ const EC_GROUP *grp),
+ int (**pset_private)(EC_KEY *key,
+ const BIGNUM *priv_key),
+ int (**pset_public)(EC_KEY *key,
+ const EC_POINT *pub_key))
{
if (pinit != NULL)
*pinit = meth->init;
@@ -258,35 +257,35 @@ void EC_KEY_METHOD_get_init(const EC_KEY_METHOD *meth,
}
void EC_KEY_METHOD_get_keygen(const EC_KEY_METHOD *meth,
- int (**pkeygen)(EC_KEY *key))
+ int (**pkeygen)(EC_KEY *key))
{
if (pkeygen != NULL)
*pkeygen = meth->keygen;
}
void EC_KEY_METHOD_get_compute_key(const EC_KEY_METHOD *meth,
- int (**pck)(unsigned char **pout,
- size_t *poutlen,
- const EC_POINT *pub_key,
- const EC_KEY *ecdh))
+ int (**pck)(unsigned char **pout,
+ size_t *poutlen,
+ const EC_POINT *pub_key,
+ const EC_KEY *ecdh))
{
if (pck != NULL)
*pck = meth->compute_key;
}
void EC_KEY_METHOD_get_sign(const EC_KEY_METHOD *meth,
- int (**psign)(int type, const unsigned char *dgst,
- int dlen, unsigned char *sig,
- unsigned int *siglen,
- const BIGNUM *kinv, const BIGNUM *r,
- EC_KEY *eckey),
- int (**psign_setup)(EC_KEY *eckey, BN_CTX *ctx_in,
- BIGNUM **kinvp, BIGNUM **rp),
- ECDSA_SIG *(**psign_sig)(const unsigned char *dgst,
- int dgst_len,
- const BIGNUM *in_kinv,
- const BIGNUM *in_r,
- EC_KEY *eckey))
+ int (**psign)(int type, const unsigned char *dgst,
+ int dlen, unsigned char *sig,
+ unsigned int *siglen,
+ const BIGNUM *kinv, const BIGNUM *r,
+ EC_KEY *eckey),
+ int (**psign_setup)(EC_KEY *eckey, BN_CTX *ctx_in,
+ BIGNUM **kinvp, BIGNUM **rp),
+ ECDSA_SIG *(**psign_sig)(const unsigned char *dgst,
+ int dgst_len,
+ const BIGNUM *in_kinv,
+ const BIGNUM *in_r,
+ EC_KEY *eckey))
{
if (psign != NULL)
*psign = meth->sign;
@@ -297,14 +296,13 @@ void EC_KEY_METHOD_get_sign(const EC_KEY_METHOD *meth,
}
void EC_KEY_METHOD_get_verify(const EC_KEY_METHOD *meth,
- int (**pverify)(int type, const unsigned
- char *dgst, int dgst_len,
- const unsigned char *sigbuf,
- int sig_len, EC_KEY *eckey),
- int (**pverify_sig)(const unsigned char *dgst,
- int dgst_len,
- const ECDSA_SIG *sig,
- EC_KEY *eckey))
+ int (**pverify)(int type, const unsigned char *dgst, int dgst_len,
+ const unsigned char *sigbuf,
+ int sig_len, EC_KEY *eckey),
+ int (**pverify_sig)(const unsigned char *dgst,
+ int dgst_len,
+ const ECDSA_SIG *sig,
+ EC_KEY *eckey))
{
if (pverify != NULL)
*pverify = meth->verify;
diff --git a/crypto/ec/ec_lib.c b/crypto/ec/ec_lib.c
index b55677fb1f..13dcd29b11 100644
--- a/crypto/ec/ec_lib.c
+++ b/crypto/ec/ec_lib.c
@@ -28,7 +28,7 @@
/* functions for EC_GROUP objects */
EC_GROUP *ossl_ec_group_new_ex(OSSL_LIB_CTX *libctx, const char *propq,
- const EC_METHOD *meth)
+ const EC_METHOD *meth)
{
EC_GROUP *ret;
@@ -66,7 +66,7 @@ EC_GROUP *ossl_ec_group_new_ex(OSSL_LIB_CTX *libctx, const char *propq,
goto err;
return ret;
- err:
+err:
BN_free(ret->order);
BN_free(ret->cofactor);
OPENSSL_free(ret->propq);
@@ -75,12 +75,12 @@ EC_GROUP *ossl_ec_group_new_ex(OSSL_LIB_CTX *libctx, const char *propq,
}
#ifndef OPENSSL_NO_DEPRECATED_3_0
-# ifndef FIPS_MODULE
+#ifndef FIPS_MODULE
EC_GROUP *EC_GROUP_new(const EC_METHOD *meth)
{
return ossl_ec_group_new_ex(NULL, NULL, meth);
}
-# endif
+#endif
#endif
void EC_pre_comp_free(EC_GROUP *group)
@@ -281,12 +281,12 @@ EC_GROUP *EC_GROUP_dup(const EC_GROUP *a)
ok = 1;
- err:
+err:
if (!ok) {
EC_GROUP_free(t);
return NULL;
}
- return t;
+ return t;
}
#ifndef OPENSSL_NO_DEPRECATED_3_0
@@ -316,7 +316,8 @@ static int ec_precompute_mont_data(EC_GROUP *);
*
* Otherwise, zero cofactor and return success.
*/
-static int ec_guess_cofactor(EC_GROUP *group) {
+static int ec_guess_cofactor(EC_GROUP *group)
+{
int ret = 0;
BN_CTX *ctx = NULL;
BIGNUM *q = NULL;
@@ -358,14 +359,14 @@ static int ec_guess_cofactor(EC_GROUP *group) {
|| !BN_div(group->cofactor, NULL, group->cofactor, group->order, ctx))
goto err;
ret = 1;
- err:
+err:
BN_CTX_end(ctx);
BN_CTX_free(ctx);
return ret;
}
int EC_GROUP_set_generator(EC_GROUP *group, const EC_POINT *generator,
- const BIGNUM *order, const BIGNUM *cofactor)
+ const BIGNUM *order, const BIGNUM *cofactor)
{
if (generator == NULL) {
ERR_raise(ERR_LIB_EC, ERR_R_PASSED_NULL_PARAMETER);
@@ -465,7 +466,7 @@ int EC_GROUP_order_bits(const EC_GROUP *group)
}
int EC_GROUP_get_cofactor(const EC_GROUP *group, BIGNUM *cofactor,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
if (group->cofactor == NULL)
@@ -484,8 +485,7 @@ const BIGNUM *EC_GROUP_get0_cofactor(const EC_GROUP *group)
void EC_GROUP_set_curve_name(EC_GROUP *group, int nid)
{
group->curve_name = nid;
- group->asn1_flag =
- (nid != NID_undef)
+ group->asn1_flag = (nid != NID_undef)
? OPENSSL_EC_NAMED_CURVE
: OPENSSL_EC_EXPLICIT_CURVE;
}
@@ -516,13 +516,13 @@ int EC_GROUP_get_asn1_flag(const EC_GROUP *group)
}
void EC_GROUP_set_point_conversion_form(EC_GROUP *group,
- point_conversion_form_t form)
+ point_conversion_form_t form)
{
group->asn1_form = form;
}
point_conversion_form_t EC_GROUP_get_point_conversion_form(const EC_GROUP
- *group)
+ *group)
{
return group->asn1_form;
}
@@ -555,7 +555,7 @@ size_t EC_GROUP_get_seed_len(const EC_GROUP *group)
}
int EC_GROUP_set_curve(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a,
- const BIGNUM *b, BN_CTX *ctx)
+ const BIGNUM *b, BN_CTX *ctx)
{
if (group->meth->group_set_curve == 0) {
ERR_raise(ERR_LIB_EC, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
@@ -565,7 +565,7 @@ int EC_GROUP_set_curve(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a,
}
int EC_GROUP_get_curve(const EC_GROUP *group, BIGNUM *p, BIGNUM *a, BIGNUM *b,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
if (group->meth->group_get_curve == NULL) {
ERR_raise(ERR_LIB_EC, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
@@ -576,30 +576,30 @@ int EC_GROUP_get_curve(const EC_GROUP *group, BIGNUM *p, BIGNUM *a, BIGNUM *b,
#ifndef OPENSSL_NO_DEPRECATED_3_0
int EC_GROUP_set_curve_GFp(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a,
- const BIGNUM *b, BN_CTX *ctx)
+ const BIGNUM *b, BN_CTX *ctx)
{
return EC_GROUP_set_curve(group, p, a, b, ctx);
}
int EC_GROUP_get_curve_GFp(const EC_GROUP *group, BIGNUM *p, BIGNUM *a,
- BIGNUM *b, BN_CTX *ctx)
+ BIGNUM *b, BN_CTX *ctx)
{
return EC_GROUP_get_curve(group, p, a, b, ctx);
}
-# ifndef OPENSSL_NO_EC2M
+#ifndef OPENSSL_NO_EC2M
int EC_GROUP_set_curve_GF2m(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a,
- const BIGNUM *b, BN_CTX *ctx)
+ const BIGNUM *b, BN_CTX *ctx)
{
return EC_GROUP_set_curve(group, p, a, b, ctx);
}
int EC_GROUP_get_curve_GF2m(const EC_GROUP *group, BIGNUM *p, BIGNUM *a,
- BIGNUM *b, BN_CTX *ctx)
+ BIGNUM *b, BN_CTX *ctx)
{
return EC_GROUP_get_curve(group, p, a, b, ctx);
}
-# endif
+#endif
#endif
int EC_GROUP_get_degree(const EC_GROUP *group)
@@ -632,8 +632,7 @@ int EC_GROUP_cmp(const EC_GROUP *a, const EC_GROUP *b, BN_CTX *ctx)
if (EC_GROUP_get_field_type(a) != EC_GROUP_get_field_type(b))
return 1;
/* compare the curve name (if present in both) */
- if (EC_GROUP_get_curve_name(a) && EC_GROUP_get_curve_name(b) &&
- EC_GROUP_get_curve_name(a) != EC_GROUP_get_curve_name(b))
+ if (EC_GROUP_get_curve_name(a) && EC_GROUP_get_curve_name(b) && EC_GROUP_get_curve_name(a) != EC_GROUP_get_curve_name(b))
return 1;
if (a->meth->flags & EC_FLAGS_CUSTOM_CURVE)
return 0;
@@ -664,8 +663,7 @@ int EC_GROUP_cmp(const EC_GROUP *a, const EC_GROUP *b, BN_CTX *ctx)
* XXX This approach assumes that the external representation of curves
* over the same field type is the same.
*/
- if (!a->meth->group_get_curve(a, a1, a2, a3, ctx) ||
- !b->meth->group_get_curve(b, b1, b2, b3, ctx))
+ if (!a->meth->group_get_curve(a, a1, a2, a3, ctx) || !b->meth->group_get_curve(b, b1, b2, b3, ctx))
r = 1;
/* return 1 if the curve parameters are different */
@@ -674,8 +672,7 @@ int EC_GROUP_cmp(const EC_GROUP *a, const EC_GROUP *b, BN_CTX *ctx)
/* XXX EC_POINT_cmp() assumes that the methods are equal */
/* return 1 if the generators are different */
- if (r || EC_POINT_cmp(a, EC_GROUP_get0_generator(a),
- EC_GROUP_get0_generator(b), ctx) != 0)
+ if (r || EC_POINT_cmp(a, EC_GROUP_get0_generator(a), EC_GROUP_get0_generator(b), ctx) != 0)
r = 1;
if (!r) {
@@ -775,9 +772,9 @@ int EC_POINT_copy(EC_POINT *dest, const EC_POINT *src)
return 0;
}
if (dest->meth != src->meth
- || (dest->curve_name != src->curve_name
- && dest->curve_name != 0
- && src->curve_name != 0)) {
+ || (dest->curve_name != src->curve_name
+ && dest->curve_name != 0
+ && src->curve_name != 0)) {
ERR_raise(ERR_LIB_EC, EC_R_INCOMPATIBLE_OBJECTS);
return 0;
}
@@ -827,9 +824,9 @@ int EC_POINT_set_to_infinity(const EC_GROUP *group, EC_POINT *point)
#ifndef OPENSSL_NO_DEPRECATED_3_0
int EC_POINT_set_Jprojective_coordinates_GFp(const EC_GROUP *group,
- EC_POINT *point, const BIGNUM *x,
- const BIGNUM *y, const BIGNUM *z,
- BN_CTX *ctx)
+ EC_POINT *point, const BIGNUM *x,
+ const BIGNUM *y, const BIGNUM *z,
+ BN_CTX *ctx)
{
if (group->meth->field_type != NID_X9_62_prime_field) {
ERR_raise(ERR_LIB_EC, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
@@ -840,13 +837,13 @@ int EC_POINT_set_Jprojective_coordinates_GFp(const EC_GROUP *group,
return 0;
}
return ossl_ec_GFp_simple_set_Jprojective_coordinates_GFp(group, point,
- x, y, z, ctx);
+ x, y, z, ctx);
}
int EC_POINT_get_Jprojective_coordinates_GFp(const EC_GROUP *group,
- const EC_POINT *point, BIGNUM *x,
- BIGNUM *y, BIGNUM *z,
- BN_CTX *ctx)
+ const EC_POINT *point, BIGNUM *x,
+ BIGNUM *y, BIGNUM *z,
+ BN_CTX *ctx)
{
if (group->meth->field_type != NID_X9_62_prime_field) {
ERR_raise(ERR_LIB_EC, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
@@ -857,13 +854,13 @@ int EC_POINT_get_Jprojective_coordinates_GFp(const EC_GROUP *group,
return 0;
}
return ossl_ec_GFp_simple_get_Jprojective_coordinates_GFp(group, point,
- x, y, z, ctx);
+ x, y, z, ctx);
}
#endif
int EC_POINT_set_affine_coordinates(const EC_GROUP *group, EC_POINT *point,
- const BIGNUM *x, const BIGNUM *y,
- BN_CTX *ctx)
+ const BIGNUM *x, const BIGNUM *y,
+ BN_CTX *ctx)
{
if (group->meth->point_set_affine_coordinates == NULL) {
ERR_raise(ERR_LIB_EC, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
@@ -885,25 +882,25 @@ int EC_POINT_set_affine_coordinates(const EC_GROUP *group, EC_POINT *point,
#ifndef OPENSSL_NO_DEPRECATED_3_0
int EC_POINT_set_affine_coordinates_GFp(const EC_GROUP *group,
- EC_POINT *point, const BIGNUM *x,
- const BIGNUM *y, BN_CTX *ctx)
+ EC_POINT *point, const BIGNUM *x,
+ const BIGNUM *y, BN_CTX *ctx)
{
return EC_POINT_set_affine_coordinates(group, point, x, y, ctx);
}
-# ifndef OPENSSL_NO_EC2M
+#ifndef OPENSSL_NO_EC2M
int EC_POINT_set_affine_coordinates_GF2m(const EC_GROUP *group,
- EC_POINT *point, const BIGNUM *x,
- const BIGNUM *y, BN_CTX *ctx)
+ EC_POINT *point, const BIGNUM *x,
+ const BIGNUM *y, BN_CTX *ctx)
{
return EC_POINT_set_affine_coordinates(group, point, x, y, ctx);
}
-# endif
+#endif
#endif
int EC_POINT_get_affine_coordinates(const EC_GROUP *group,
- const EC_POINT *point, BIGNUM *x, BIGNUM *y,
- BN_CTX *ctx)
+ const EC_POINT *point, BIGNUM *x, BIGNUM *y,
+ BN_CTX *ctx)
{
if (group->meth->point_get_affine_coordinates == NULL) {
ERR_raise(ERR_LIB_EC, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
@@ -922,24 +919,24 @@ int EC_POINT_get_affine_coordinates(const EC_GROUP *group,
#ifndef OPENSSL_NO_DEPRECATED_3_0
int EC_POINT_get_affine_coordinates_GFp(const EC_GROUP *group,
- const EC_POINT *point, BIGNUM *x,
- BIGNUM *y, BN_CTX *ctx)
+ const EC_POINT *point, BIGNUM *x,
+ BIGNUM *y, BN_CTX *ctx)
{
return EC_POINT_get_affine_coordinates(group, point, x, y, ctx);
}
-# ifndef OPENSSL_NO_EC2M
+#ifndef OPENSSL_NO_EC2M
int EC_POINT_get_affine_coordinates_GF2m(const EC_GROUP *group,
- const EC_POINT *point, BIGNUM *x,
- BIGNUM *y, BN_CTX *ctx)
+ const EC_POINT *point, BIGNUM *x,
+ BIGNUM *y, BN_CTX *ctx)
{
return EC_POINT_get_affine_coordinates(group, point, x, y, ctx);
}
-# endif
+#endif
#endif
int EC_POINT_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a,
- const EC_POINT *b, BN_CTX *ctx)
+ const EC_POINT *b, BN_CTX *ctx)
{
if (group->meth->add == 0) {
ERR_raise(ERR_LIB_EC, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
@@ -954,7 +951,7 @@ int EC_POINT_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a,
}
int EC_POINT_dbl(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
if (group->meth->dbl == 0) {
ERR_raise(ERR_LIB_EC, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
@@ -1001,7 +998,7 @@ int EC_POINT_is_at_infinity(const EC_GROUP *group, const EC_POINT *point)
* -1: An error occurred
*/
int EC_POINT_is_on_curve(const EC_GROUP *group, const EC_POINT *point,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
if (group->meth->is_on_curve == 0) {
ERR_raise(ERR_LIB_EC, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
@@ -1015,7 +1012,7 @@ int EC_POINT_is_on_curve(const EC_GROUP *group, const EC_POINT *point,
}
int EC_POINT_cmp(const EC_GROUP *group, const EC_POINT *a, const EC_POINT *b,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
if (group->meth->point_cmp == 0) {
ERR_raise(ERR_LIB_EC, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
@@ -1043,7 +1040,7 @@ int EC_POINT_make_affine(const EC_GROUP *group, EC_POINT *point, BN_CTX *ctx)
}
int EC_POINTs_make_affine(const EC_GROUP *group, size_t num,
- EC_POINT *points[], BN_CTX *ctx)
+ EC_POINT *points[], BN_CTX *ctx)
{
size_t i;
@@ -1069,8 +1066,8 @@ int EC_POINTs_make_affine(const EC_GROUP *group, size_t num,
#ifndef OPENSSL_NO_DEPRECATED_3_0
int EC_POINTs_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
- size_t num, const EC_POINT *points[],
- const BIGNUM *scalars[], BN_CTX *ctx)
+ size_t num, const EC_POINT *points[],
+ const BIGNUM *scalars[], BN_CTX *ctx)
{
int ret = 0;
size_t i = 0;
@@ -1116,7 +1113,7 @@ int EC_POINTs_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
#endif
int EC_POINT_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *g_scalar,
- const EC_POINT *point, const BIGNUM *p_scalar, BN_CTX *ctx)
+ const EC_POINT *point, const BIGNUM *p_scalar, BN_CTX *ctx)
{
int ret = 0;
size_t num;
@@ -1165,7 +1162,7 @@ int EC_GROUP_precompute_mult(EC_GROUP *group, BN_CTX *ctx)
if (group->meth->precompute_mult != 0)
return group->meth->precompute_mult(group, ctx);
else
- return 1; /* nothing to do, so report success */
+ return 1; /* nothing to do, so report success */
}
int EC_GROUP_have_precompute_mult(const EC_GROUP *group)
@@ -1177,8 +1174,8 @@ int EC_GROUP_have_precompute_mult(const EC_GROUP *group)
if (group->meth->have_precompute_mult != 0)
return group->meth->have_precompute_mult(group);
else
- return 0; /* cannot tell whether precomputation has
- * been performed */
+ return 0; /* cannot tell whether precomputation has
+ * been performed */
}
#endif
@@ -1209,7 +1206,7 @@ static int ec_precompute_mont_data(EC_GROUP *group)
ret = 1;
- err:
+err:
BN_CTX_free(ctx);
return ret;
@@ -1235,7 +1232,7 @@ int ossl_ec_group_simple_order_bits(const EC_GROUP *group)
}
static int ec_field_inverse_mod_ord(const EC_GROUP *group, BIGNUM *r,
- const BIGNUM *x, BN_CTX *ctx)
+ const BIGNUM *x, BN_CTX *ctx)
{
BIGNUM *e = NULL;
int ret = 0;
@@ -1274,7 +1271,7 @@ static int ec_field_inverse_mod_ord(const EC_GROUP *group, BIGNUM *r,
ret = 1;
- err:
+err:
BN_CTX_end(ctx);
#ifndef FIPS_MODULE
BN_CTX_free(new_ctx);
@@ -1296,7 +1293,7 @@ static int ec_field_inverse_mod_ord(const EC_GROUP *group, BIGNUM *r,
* other functionality.
*/
int ossl_ec_group_do_inverse_ord(const EC_GROUP *group, BIGNUM *res,
- const BIGNUM *x, BN_CTX *ctx)
+ const BIGNUM *x, BN_CTX *ctx)
{
if (group->meth->field_inverse_mod_ord != NULL)
return group->meth->field_inverse_mod_ord(group, res, x, ctx);
@@ -1315,7 +1312,7 @@ int ossl_ec_group_do_inverse_ord(const EC_GROUP *group, BIGNUM *res,
* support coordinate blinding.
*/
int ossl_ec_point_blind_coordinates(const EC_GROUP *group, EC_POINT *p,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
if (group->meth->blind_coordinates == NULL)
return 1; /* ignore if not implemented */
@@ -1333,8 +1330,8 @@ int EC_GROUP_get_basis_type(const EC_GROUP *group)
/* Find the last non-zero element of group->poly[] */
for (i = 0;
- i < (int)OSSL_NELEM(group->poly) && group->poly[i] != 0;
- i++)
+ i < (int)OSSL_NELEM(group->poly) && group->poly[i] != 0;
+ i++)
continue;
if (i == 4)
@@ -1354,7 +1351,7 @@ int EC_GROUP_get_trinomial_basis(const EC_GROUP *group, unsigned int *k)
if (EC_GROUP_get_field_type(group) != NID_X9_62_characteristic_two_field
|| !((group->poly[0] != 0) && (group->poly[1] != 0)
- && (group->poly[2] == 0))) {
+ && (group->poly[2] == 0))) {
ERR_raise(ERR_LIB_EC, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
return 0;
}
@@ -1366,15 +1363,15 @@ int EC_GROUP_get_trinomial_basis(const EC_GROUP *group, unsigned int *k)
}
int EC_GROUP_get_pentanomial_basis(const EC_GROUP *group, unsigned int *k1,
- unsigned int *k2, unsigned int *k3)
+ unsigned int *k2, unsigned int *k3)
{
if (group == NULL)
return 0;
if (EC_GROUP_get_field_type(group) != NID_X9_62_characteristic_two_field
|| !((group->poly[0] != 0) && (group->poly[1] != 0)
- && (group->poly[2] != 0) && (group->poly[3] != 0)
- && (group->poly[4] == 0))) {
+ && (group->poly[2] != 0) && (group->poly[3] != 0)
+ && (group->poly[4] == 0))) {
ERR_raise(ERR_LIB_EC, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
return 0;
}
@@ -1403,9 +1400,9 @@ int EC_GROUP_get_pentanomial_basis(const EC_GROUP *group, unsigned int *k1,
* mathematically wrong anyway and should not be used.
*/
static EC_GROUP *ec_group_explicit_to_named(const EC_GROUP *group,
- OSSL_LIB_CTX *libctx,
- const char *propq,
- BN_CTX *ctx)
+ OSSL_LIB_CTX *libctx,
+ const char *propq,
+ BN_CTX *ctx)
{
EC_GROUP *ret_group = NULL, *dup = NULL;
int curve_name_nid;
@@ -1415,8 +1412,8 @@ static EC_GROUP *ec_group_explicit_to_named(const EC_GROUP *group,
int no_seed = (EC_GROUP_get0_seed(group) == NULL);
if ((dup = EC_GROUP_dup(group)) == NULL
- || EC_GROUP_set_seed(dup, NULL, 0) != 1
- || !EC_GROUP_set_generator(dup, point, order, NULL))
+ || EC_GROUP_set_seed(dup, NULL, 0) != 1
+ || !EC_GROUP_set_generator(dup, point, order, NULL))
goto err;
if ((curve_name_nid = ossl_ec_curve_nid_from_params(dup, ctx)) != NID_undef) {
/*
@@ -1428,7 +1425,7 @@ static EC_GROUP *ec_group_explicit_to_named(const EC_GROUP *group,
* parameters with one created from a named group.
*/
-# ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
+#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
/*
* NID_wap_wsg_idm_ecid_wtls12 and NID_secp224r1 are both aliases for
* the same curve, we prefer the SECP nid when matching explicit
@@ -1436,7 +1433,7 @@ static EC_GROUP *ec_group_explicit_to_named(const EC_GROUP *group,
*/
if (curve_name_nid == NID_wap_wsg_idm_ecid_wtls12)
curve_name_nid = NID_secp224r1;
-# endif /* !def(OPENSSL_NO_EC_NISTP_64_GCC_128) */
+#endif /* !def(OPENSSL_NO_EC_NISTP_64_GCC_128) */
ret_group = EC_GROUP_new_by_curve_name_ex(libctx, propq, curve_name_nid);
if (ret_group == NULL)
@@ -1474,7 +1471,7 @@ err:
#endif /* FIPS_MODULE */
static EC_GROUP *group_new_from_name(const OSSL_PARAM *p,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_LIB_CTX *libctx, const char *propq)
{
int ok = 0, nid;
const char *curve_name = NULL;
@@ -1539,7 +1536,7 @@ int ossl_ec_group_set_params(EC_GROUP *group, const OSSL_PARAM params[])
}
EC_GROUP *EC_GROUP_new_from_params(const OSSL_PARAM params[],
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_LIB_CTX *libctx, const char *propq)
{
const OSSL_PARAM *ptmp;
EC_GROUP *group = NULL;
@@ -1570,7 +1567,7 @@ EC_GROUP *EC_GROUP_new_from_params(const OSSL_PARAM params[],
}
ptmp = OSSL_PARAM_locate_const(params,
- OSSL_PKEY_PARAM_EC_DECODED_FROM_EXPLICIT_PARAMS);
+ OSSL_PKEY_PARAM_EC_DECODED_FROM_EXPLICIT_PARAMS);
if (ptmp != NULL && !OSSL_PARAM_get_int(ptmp, &decoded)) {
ERR_raise(ERR_LIB_EC, EC_R_WRONG_CURVE_PARAMETERS);
EC_GROUP_free(group);
@@ -1608,7 +1605,8 @@ EC_GROUP *EC_GROUP_new_from_params(const OSSL_PARAM params[],
if (OPENSSL_strcasecmp(ptmp->data, SN_X9_62_prime_field) == 0) {
is_prime_field = 1;
} else if (OPENSSL_strcasecmp(ptmp->data,
- SN_X9_62_characteristic_two_field) == 0) {
+ SN_X9_62_characteristic_two_field)
+ == 0) {
is_prime_field = 0;
} else {
/* Invalid field */
@@ -1648,10 +1646,10 @@ EC_GROUP *EC_GROUP_new_from_params(const OSSL_PARAM params[],
/* create the EC_GROUP structure */
group = EC_GROUP_new_curve_GFp(p, a, b, bnctx);
} else {
-# ifdef OPENSSL_NO_EC2M
+#ifdef OPENSSL_NO_EC2M
ERR_raise(ERR_LIB_EC, EC_R_GF2M_NOT_SUPPORTED);
goto err;
-# else
+#else
/* create the EC_GROUP structure */
group = EC_GROUP_new_curve_GF2m(p, a, b, NULL);
if (group != NULL) {
@@ -1661,7 +1659,7 @@ EC_GROUP *EC_GROUP_new_from_params(const OSSL_PARAM params[],
goto err;
}
}
-# endif /* OPENSSL_NO_EC2M */
+#endif /* OPENSSL_NO_EC2M */
}
if (group == NULL) {
@@ -1691,7 +1689,7 @@ EC_GROUP *EC_GROUP_new_from_params(const OSSL_PARAM params[],
if ((point = EC_POINT_new(group)) == NULL)
goto err;
EC_GROUP_set_point_conversion_form(group,
- (point_conversion_form_t)buf[0] & ~0x01);
+ (point_conversion_form_t)buf[0] & ~0x01);
if (!EC_POINT_oct2point(group, point, buf, ptmp->data_size, bnctx)) {
ERR_raise(ERR_LIB_EC, EC_R_INVALID_GENERATOR);
goto err;
@@ -1750,7 +1748,7 @@ EC_GROUP *EC_GROUP_new_from_params(const OSSL_PARAM params[],
/* We've imported the group from explicit parameters, set it so. */
group->decoded_from_explicit_params = 1;
ok = 1;
- err:
+err:
if (!ok) {
EC_GROUP_free(group);
group = NULL;
@@ -1764,7 +1762,7 @@ EC_GROUP *EC_GROUP_new_from_params(const OSSL_PARAM params[],
}
OSSL_PARAM *EC_GROUP_to_params(const EC_GROUP *group, OSSL_LIB_CTX *libctx,
- const char *propq, BN_CTX *bnctx)
+ const char *propq, BN_CTX *bnctx)
{
OSSL_PARAM_BLD *tmpl = NULL;
BN_CTX *new_bnctx = NULL;
@@ -1790,7 +1788,7 @@ OSSL_PARAM *EC_GROUP_to_params(const EC_GROUP *group, OSSL_LIB_CTX *libctx,
params = OSSL_PARAM_BLD_to_param(tmpl);
- err:
+err:
OSSL_PARAM_BLD_free(tmpl);
OPENSSL_free(gen_buf);
BN_CTX_end(bnctx);
diff --git a/crypto/ec/ec_local.h b/crypto/ec/ec_local.h
index 80729f370f..c6a5753005 100644
--- a/crypto/ec/ec_local.h
+++ b/crypto/ec/ec_local.h
@@ -17,19 +17,19 @@
#include "crypto/ec.h"
#if defined(__SUNPRO_C)
-# if __SUNPRO_C >= 0x520
-# pragma error_messages (off,E_ARRAY_OF_INCOMPLETE_NONAME,E_ARRAY_OF_INCOMPLETE)
-# endif
+#if __SUNPRO_C >= 0x520
+#pragma error_messages(off, E_ARRAY_OF_INCOMPLETE_NONAME, E_ARRAY_OF_INCOMPLETE)
+#endif
#endif
/* Use default functions for poin2oct, oct2point and compressed coordinates */
-#define EC_FLAGS_DEFAULT_OCT 0x1
+#define EC_FLAGS_DEFAULT_OCT 0x1
/* Use custom formats for EC_GROUP, EC_POINT and EC_KEY */
-#define EC_FLAGS_CUSTOM_CURVE 0x2
+#define EC_FLAGS_CUSTOM_CURVE 0x2
/* Curve does not support signing operations */
-#define EC_FLAGS_NO_SIGN 0x4
+#define EC_FLAGS_NO_SIGN 0x4
#ifdef OPENSSL_NO_DEPRECATED_3_0
typedef struct ec_method_st EC_METHOD;
@@ -44,33 +44,33 @@ struct ec_method_st {
/* Various method flags */
int flags;
/* used by EC_METHOD_get_field_type: */
- int field_type; /* a NID */
+ int field_type; /* a NID */
/*
* used by EC_GROUP_new, EC_GROUP_free, EC_GROUP_clear_free,
* EC_GROUP_copy:
*/
- int (*group_init) (EC_GROUP *);
- void (*group_finish) (EC_GROUP *);
- void (*group_clear_finish) (EC_GROUP *);
- int (*group_copy) (EC_GROUP *, const EC_GROUP *);
+ int (*group_init)(EC_GROUP *);
+ void (*group_finish)(EC_GROUP *);
+ void (*group_clear_finish)(EC_GROUP *);
+ int (*group_copy)(EC_GROUP *, const EC_GROUP *);
/* used by EC_GROUP_set_curve, EC_GROUP_get_curve: */
- int (*group_set_curve) (EC_GROUP *, const BIGNUM *p, const BIGNUM *a,
- const BIGNUM *b, BN_CTX *);
- int (*group_get_curve) (const EC_GROUP *, BIGNUM *p, BIGNUM *a, BIGNUM *b,
- BN_CTX *);
+ int (*group_set_curve)(EC_GROUP *, const BIGNUM *p, const BIGNUM *a,
+ const BIGNUM *b, BN_CTX *);
+ int (*group_get_curve)(const EC_GROUP *, BIGNUM *p, BIGNUM *a, BIGNUM *b,
+ BN_CTX *);
/* used by EC_GROUP_get_degree: */
- int (*group_get_degree) (const EC_GROUP *);
- int (*group_order_bits) (const EC_GROUP *);
+ int (*group_get_degree)(const EC_GROUP *);
+ int (*group_order_bits)(const EC_GROUP *);
/* used by EC_GROUP_check: */
- int (*group_check_discriminant) (const EC_GROUP *, BN_CTX *);
+ int (*group_check_discriminant)(const EC_GROUP *, BN_CTX *);
/*
* used by EC_POINT_new, EC_POINT_free, EC_POINT_clear_free,
* EC_POINT_copy:
*/
- int (*point_init) (EC_POINT *);
- void (*point_finish) (EC_POINT *);
- void (*point_clear_finish) (EC_POINT *);
- int (*point_copy) (EC_POINT *, const EC_POINT *);
+ int (*point_init)(EC_POINT *);
+ void (*point_finish)(EC_POINT *);
+ void (*point_clear_finish)(EC_POINT *);
+ int (*point_copy)(EC_POINT *, const EC_POINT *);
/*-
* used by EC_POINT_set_to_infinity,
* EC_POINT_set_Jprojective_coordinates_GFp,
@@ -79,37 +79,37 @@ struct ec_method_st {
* EC_POINT_get_affine_coordinates,
* EC_POINT_set_compressed_coordinates:
*/
- int (*point_set_to_infinity) (const EC_GROUP *, EC_POINT *);
- int (*point_set_affine_coordinates) (const EC_GROUP *, EC_POINT *,
- const BIGNUM *x, const BIGNUM *y,
- BN_CTX *);
- int (*point_get_affine_coordinates) (const EC_GROUP *, const EC_POINT *,
- BIGNUM *x, BIGNUM *y, BN_CTX *);
- int (*point_set_compressed_coordinates) (const EC_GROUP *, EC_POINT *,
- const BIGNUM *x, int y_bit,
- BN_CTX *);
+ int (*point_set_to_infinity)(const EC_GROUP *, EC_POINT *);
+ int (*point_set_affine_coordinates)(const EC_GROUP *, EC_POINT *,
+ const BIGNUM *x, const BIGNUM *y,
+ BN_CTX *);
+ int (*point_get_affine_coordinates)(const EC_GROUP *, const EC_POINT *,
+ BIGNUM *x, BIGNUM *y, BN_CTX *);
+ int (*point_set_compressed_coordinates)(const EC_GROUP *, EC_POINT *,
+ const BIGNUM *x, int y_bit,
+ BN_CTX *);
/* used by EC_POINT_point2oct, EC_POINT_oct2point: */
- size_t (*point2oct) (const EC_GROUP *, const EC_POINT *,
- point_conversion_form_t form, unsigned char *buf,
- size_t len, BN_CTX *);
- int (*oct2point) (const EC_GROUP *, EC_POINT *, const unsigned char *buf,
- size_t len, BN_CTX *);
+ size_t (*point2oct)(const EC_GROUP *, const EC_POINT *,
+ point_conversion_form_t form, unsigned char *buf,
+ size_t len, BN_CTX *);
+ int (*oct2point)(const EC_GROUP *, EC_POINT *, const unsigned char *buf,
+ size_t len, BN_CTX *);
/* used by EC_POINT_add, EC_POINT_dbl, ECP_POINT_invert: */
- int (*add) (const EC_GROUP *, EC_POINT *r, const EC_POINT *a,
- const EC_POINT *b, BN_CTX *);
- int (*dbl) (const EC_GROUP *, EC_POINT *r, const EC_POINT *a, BN_CTX *);
- int (*invert) (const EC_GROUP *, EC_POINT *, BN_CTX *);
+ int (*add)(const EC_GROUP *, EC_POINT *r, const EC_POINT *a,
+ const EC_POINT *b, BN_CTX *);
+ int (*dbl)(const EC_GROUP *, EC_POINT *r, const EC_POINT *a, BN_CTX *);
+ int (*invert)(const EC_GROUP *, EC_POINT *, BN_CTX *);
/*
* used by EC_POINT_is_at_infinity, EC_POINT_is_on_curve, EC_POINT_cmp:
*/
- int (*is_at_infinity) (const EC_GROUP *, const EC_POINT *);
- int (*is_on_curve) (const EC_GROUP *, const EC_POINT *, BN_CTX *);
- int (*point_cmp) (const EC_GROUP *, const EC_POINT *a, const EC_POINT *b,
- BN_CTX *);
+ int (*is_at_infinity)(const EC_GROUP *, const EC_POINT *);
+ int (*is_on_curve)(const EC_GROUP *, const EC_POINT *, BN_CTX *);
+ int (*point_cmp)(const EC_GROUP *, const EC_POINT *a, const EC_POINT *b,
+ BN_CTX *);
/* used by EC_POINT_make_affine, EC_POINTs_make_affine: */
- int (*make_affine) (const EC_GROUP *, EC_POINT *, BN_CTX *);
- int (*points_make_affine) (const EC_GROUP *, size_t num, EC_POINT *[],
- BN_CTX *);
+ int (*make_affine)(const EC_GROUP *, EC_POINT *, BN_CTX *);
+ int (*points_make_affine)(const EC_GROUP *, size_t num, EC_POINT *[],
+ BN_CTX *);
/*
* used by EC_POINTs_mul, EC_POINT_mul, EC_POINT_precompute_mult,
* EC_POINT_have_precompute_mult (default implementations are used if the
@@ -132,11 +132,11 @@ struct ec_method_st {
* may treat it as an unusual input, without any constant-timeness
* guarantee.
*/
- int (*mul) (const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
- size_t num, const EC_POINT *points[], const BIGNUM *scalars[],
- BN_CTX *);
- int (*precompute_mult) (EC_GROUP *group, BN_CTX *);
- int (*have_precompute_mult) (const EC_GROUP *group);
+ int (*mul)(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
+ size_t num, const EC_POINT *points[], const BIGNUM *scalars[],
+ BN_CTX *);
+ int (*precompute_mult)(EC_GROUP *group, BN_CTX *);
+ int (*have_precompute_mult)(const EC_GROUP *group);
/* internal functions */
/*
* 'field_mul', 'field_sqr', and 'field_div' can be used by 'add' and
@@ -144,25 +144,25 @@ struct ec_method_st {
* with different optimized implementations of expensive field
* operations:
*/
- int (*field_mul) (const EC_GROUP *, BIGNUM *r, const BIGNUM *a,
- const BIGNUM *b, BN_CTX *);
- int (*field_sqr) (const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CTX *);
- int (*field_div) (const EC_GROUP *, BIGNUM *r, const BIGNUM *a,
- const BIGNUM *b, BN_CTX *);
+ int (*field_mul)(const EC_GROUP *, BIGNUM *r, const BIGNUM *a,
+ const BIGNUM *b, BN_CTX *);
+ int (*field_sqr)(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CTX *);
+ int (*field_div)(const EC_GROUP *, BIGNUM *r, const BIGNUM *a,
+ const BIGNUM *b, BN_CTX *);
/*-
* 'field_inv' computes the multiplicative inverse of a in the field,
* storing the result in r.
*
* If 'a' is zero (or equivalent), you'll get an EC_R_CANNOT_INVERT error.
*/
- int (*field_inv) (const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CTX *);
+ int (*field_inv)(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CTX *);
/* e.g. to Montgomery */
- int (*field_encode) (const EC_GROUP *, BIGNUM *r, const BIGNUM *a,
- BN_CTX *);
+ int (*field_encode)(const EC_GROUP *, BIGNUM *r, const BIGNUM *a,
+ BN_CTX *);
/* e.g. from Montgomery */
- int (*field_decode) (const EC_GROUP *, BIGNUM *r, const BIGNUM *a,
- BN_CTX *);
- int (*field_set_to_one) (const EC_GROUP *, BIGNUM *r, BN_CTX *);
+ int (*field_decode)(const EC_GROUP *, BIGNUM *r, const BIGNUM *a,
+ BN_CTX *);
+ int (*field_set_to_one)(const EC_GROUP *, BIGNUM *r, BN_CTX *);
/* private key operations */
size_t (*priv2oct)(const EC_KEY *eckey, unsigned char *buf, size_t len);
int (*oct2priv)(EC_KEY *eckey, const unsigned char *buf, size_t len);
@@ -174,28 +174,28 @@ struct ec_method_st {
void (*keyfinish)(EC_KEY *eckey);
/* custom ECDH operation */
int (*ecdh_compute_key)(unsigned char **pout, size_t *poutlen,
- const EC_POINT *pub_key, const EC_KEY *ecdh);
+ const EC_POINT *pub_key, const EC_KEY *ecdh);
/* custom ECDSA */
int (*ecdsa_sign_setup)(EC_KEY *eckey, BN_CTX *ctx, BIGNUM **kinvp,
- BIGNUM **rp);
+ BIGNUM **rp);
ECDSA_SIG *(*ecdsa_sign_sig)(const unsigned char *dgst, int dgstlen,
- const BIGNUM *kinv, const BIGNUM *r,
- EC_KEY *eckey);
+ const BIGNUM *kinv, const BIGNUM *r,
+ EC_KEY *eckey);
int (*ecdsa_verify_sig)(const unsigned char *dgst, int dgstlen,
- const ECDSA_SIG *sig, EC_KEY *eckey);
+ const ECDSA_SIG *sig, EC_KEY *eckey);
/* Inverse modulo order */
int (*field_inverse_mod_ord)(const EC_GROUP *, BIGNUM *r,
- const BIGNUM *x, BN_CTX *);
+ const BIGNUM *x, BN_CTX *);
int (*blind_coordinates)(const EC_GROUP *group, EC_POINT *p, BN_CTX *ctx);
int (*ladder_pre)(const EC_GROUP *group,
- EC_POINT *r, EC_POINT *s,
- EC_POINT *p, BN_CTX *ctx);
+ EC_POINT *r, EC_POINT *s,
+ EC_POINT *p, BN_CTX *ctx);
int (*ladder_step)(const EC_GROUP *group,
- EC_POINT *r, EC_POINT *s,
- EC_POINT *p, BN_CTX *ctx);
+ EC_POINT *r, EC_POINT *s,
+ EC_POINT *p, BN_CTX *ctx);
int (*ladder_post)(const EC_GROUP *group,
- EC_POINT *r, EC_POINT *s,
- EC_POINT *p, BN_CTX *ctx);
+ EC_POINT *r, EC_POINT *s,
+ EC_POINT *p, BN_CTX *ctx);
int (*group_full_init)(EC_GROUP *group, const unsigned char *data);
};
@@ -211,15 +211,15 @@ typedef struct ec_pre_comp_st EC_PRE_COMP;
struct ec_group_st {
const EC_METHOD *meth;
- EC_POINT *generator; /* optional */
+ EC_POINT *generator; /* optional */
BIGNUM *order, *cofactor;
- int curve_name; /* optional NID for named curve */
- int asn1_flag; /* flag to control the asn1 encoding */
+ int curve_name; /* optional NID for named curve */
+ int asn1_flag; /* flag to control the asn1 encoding */
int decoded_from_explicit_params; /* set if decoded from explicit
* curve parameters encoding */
point_conversion_form_t asn1_form;
- unsigned char *seed; /* optional seed for parameters (appears in
- * ASN1) */
+ unsigned char *seed; /* optional seed for parameters (appears in
+ * ASN1) */
size_t seed_len;
/*
* The following members are handled by the method functions, even if
@@ -254,8 +254,8 @@ struct ec_group_st {
/* method-specific */
void *field_data2;
/* method-specific */
- int (*field_mod_func) (BIGNUM *, const BIGNUM *, const BIGNUM *,
- BN_CTX *);
+ int (*field_mod_func)(BIGNUM *, const BIGNUM *, const BIGNUM *,
+ BN_CTX *);
/* data for ECDSA inverse */
BN_MONT_CTX *mont_data;
@@ -266,7 +266,11 @@ struct ec_group_st {
*/
enum {
PCT_none,
- PCT_nistp224, PCT_nistp256, PCT_nistp384, PCT_nistp521, PCT_nistz256,
+ PCT_nistp224,
+ PCT_nistp256,
+ PCT_nistp384,
+ PCT_nistp521,
+ PCT_nistz256,
PCT_ec
} pre_comp_type;
union {
@@ -317,19 +321,19 @@ struct ec_point_st {
*/
BIGNUM *X;
BIGNUM *Y;
- BIGNUM *Z; /* Jacobian projective coordinates: * (X, Y,
- * Z) represents (X/Z^2, Y/Z^3) if Z != 0 */
- int Z_is_one; /* enable optimized point arithmetic for
- * special case */
+ BIGNUM *Z; /* Jacobian projective coordinates: * (X, Y,
+ * Z) represents (X/Z^2, Y/Z^3) if Z != 0 */
+ int Z_is_one; /* enable optimized point arithmetic for
+ * special case */
};
static ossl_inline int ec_point_is_compat(const EC_POINT *point,
- const EC_GROUP *group)
+ const EC_GROUP *group)
{
return group->meth == point->meth
- && (group->curve_name == 0
- || point->curve_name == 0
- || group->curve_name == point->curve_name);
+ && (group->curve_name == 0
+ || point->curve_name == 0
+ || group->curve_name == point->curve_name);
}
NISTP224_PRE_COMP *EC_nistp224_pre_comp_dup(NISTP224_PRE_COMP *);
@@ -353,8 +357,8 @@ void EC_ec_pre_comp_free(EC_PRE_COMP *);
* group->method->mul is 0)
*/
int ossl_ec_wNAF_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
- size_t num, const EC_POINT *points[],
- const BIGNUM *scalars[], BN_CTX *);
+ size_t num, const EC_POINT *points[],
+ const BIGNUM *scalars[], BN_CTX *);
int ossl_ec_wNAF_precompute_mult(EC_GROUP *group, BN_CTX *);
int ossl_ec_wNAF_have_precompute_mult(const EC_GROUP *group);
@@ -364,10 +368,10 @@ void ossl_ec_GFp_simple_group_finish(EC_GROUP *);
void ossl_ec_GFp_simple_group_clear_finish(EC_GROUP *);
int ossl_ec_GFp_simple_group_copy(EC_GROUP *, const EC_GROUP *);
int ossl_ec_GFp_simple_group_set_curve(EC_GROUP *, const BIGNUM *p,
- const BIGNUM *a, const BIGNUM *b,
- BN_CTX *);
+ const BIGNUM *a, const BIGNUM *b,
+ BN_CTX *);
int ossl_ec_GFp_simple_group_get_curve(const EC_GROUP *, BIGNUM *p, BIGNUM *a,
- BIGNUM *b, BN_CTX *);
+ BIGNUM *b, BN_CTX *);
int ossl_ec_GFp_simple_group_get_degree(const EC_GROUP *);
int ossl_ec_GFp_simple_group_check_discriminant(const EC_GROUP *, BN_CTX *);
int ossl_ec_GFp_simple_point_init(EC_POINT *);
@@ -376,88 +380,88 @@ void ossl_ec_GFp_simple_point_clear_finish(EC_POINT *);
int ossl_ec_GFp_simple_point_copy(EC_POINT *, const EC_POINT *);
int ossl_ec_GFp_simple_point_set_to_infinity(const EC_GROUP *, EC_POINT *);
int ossl_ec_GFp_simple_set_Jprojective_coordinates_GFp(const EC_GROUP *,
- EC_POINT *,
- const BIGNUM *x,
- const BIGNUM *y,
- const BIGNUM *z,
- BN_CTX *);
+ EC_POINT *,
+ const BIGNUM *x,
+ const BIGNUM *y,
+ const BIGNUM *z,
+ BN_CTX *);
int ossl_ec_GFp_simple_get_Jprojective_coordinates_GFp(const EC_GROUP *,
- const EC_POINT *,
- BIGNUM *x,
- BIGNUM *y, BIGNUM *z,
- BN_CTX *);
+ const EC_POINT *,
+ BIGNUM *x,
+ BIGNUM *y, BIGNUM *z,
+ BN_CTX *);
int ossl_ec_GFp_simple_point_set_affine_coordinates(const EC_GROUP *, EC_POINT *,
- const BIGNUM *x,
- const BIGNUM *y, BN_CTX *);
+ const BIGNUM *x,
+ const BIGNUM *y, BN_CTX *);
int ossl_ec_GFp_simple_point_get_affine_coordinates(const EC_GROUP *,
- const EC_POINT *, BIGNUM *x,
- BIGNUM *y, BN_CTX *);
+ const EC_POINT *, BIGNUM *x,
+ BIGNUM *y, BN_CTX *);
int ossl_ec_GFp_simple_set_compressed_coordinates(const EC_GROUP *, EC_POINT *,
- const BIGNUM *x, int y_bit,
- BN_CTX *);
+ const BIGNUM *x, int y_bit,
+ BN_CTX *);
size_t ossl_ec_GFp_simple_point2oct(const EC_GROUP *, const EC_POINT *,
- point_conversion_form_t form,
- unsigned char *buf, size_t len, BN_CTX *);
+ point_conversion_form_t form,
+ unsigned char *buf, size_t len, BN_CTX *);
int ossl_ec_GFp_simple_oct2point(const EC_GROUP *, EC_POINT *,
- const unsigned char *buf, size_t len, BN_CTX *);
+ const unsigned char *buf, size_t len, BN_CTX *);
int ossl_ec_GFp_simple_add(const EC_GROUP *, EC_POINT *r, const EC_POINT *a,
- const EC_POINT *b, BN_CTX *);
+ const EC_POINT *b, BN_CTX *);
int ossl_ec_GFp_simple_dbl(const EC_GROUP *, EC_POINT *r, const EC_POINT *a,
- BN_CTX *);
+ BN_CTX *);
int ossl_ec_GFp_simple_invert(const EC_GROUP *, EC_POINT *, BN_CTX *);
int ossl_ec_GFp_simple_is_at_infinity(const EC_GROUP *, const EC_POINT *);
int ossl_ec_GFp_simple_is_on_curve(const EC_GROUP *, const EC_POINT *, BN_CTX *);
int ossl_ec_GFp_simple_cmp(const EC_GROUP *, const EC_POINT *a,
- const EC_POINT *b, BN_CTX *);
+ const EC_POINT *b, BN_CTX *);
int ossl_ec_GFp_simple_make_affine(const EC_GROUP *, EC_POINT *, BN_CTX *);
int ossl_ec_GFp_simple_points_make_affine(const EC_GROUP *, size_t num,
- EC_POINT *[], BN_CTX *);
+ EC_POINT *[], BN_CTX *);
int ossl_ec_GFp_simple_field_mul(const EC_GROUP *, BIGNUM *r, const BIGNUM *a,
- const BIGNUM *b, BN_CTX *);
+ const BIGNUM *b, BN_CTX *);
int ossl_ec_GFp_simple_field_sqr(const EC_GROUP *, BIGNUM *r, const BIGNUM *a,
- BN_CTX *);
+ BN_CTX *);
int ossl_ec_GFp_simple_field_inv(const EC_GROUP *, BIGNUM *r, const BIGNUM *a,
- BN_CTX *);
+ BN_CTX *);
int ossl_ec_GFp_simple_blind_coordinates(const EC_GROUP *group, EC_POINT *p,
- BN_CTX *ctx);
+ BN_CTX *ctx);
int ossl_ec_GFp_simple_ladder_pre(const EC_GROUP *group,
- EC_POINT *r, EC_POINT *s,
- EC_POINT *p, BN_CTX *ctx);
+ EC_POINT *r, EC_POINT *s,
+ EC_POINT *p, BN_CTX *ctx);
int ossl_ec_GFp_simple_ladder_step(const EC_GROUP *group,
- EC_POINT *r, EC_POINT *s,
- EC_POINT *p, BN_CTX *ctx);
+ EC_POINT *r, EC_POINT *s,
+ EC_POINT *p, BN_CTX *ctx);
int ossl_ec_GFp_simple_ladder_post(const EC_GROUP *group,
- EC_POINT *r, EC_POINT *s,
- EC_POINT *p, BN_CTX *ctx);
+ EC_POINT *r, EC_POINT *s,
+ EC_POINT *p, BN_CTX *ctx);
/* method functions in ecp_mont.c */
int ossl_ec_GFp_mont_group_init(EC_GROUP *);
int ossl_ec_GFp_mont_group_set_curve(EC_GROUP *, const BIGNUM *p,
- const BIGNUM *a,
- const BIGNUM *b, BN_CTX *);
+ const BIGNUM *a,
+ const BIGNUM *b, BN_CTX *);
void ossl_ec_GFp_mont_group_finish(EC_GROUP *);
void ossl_ec_GFp_mont_group_clear_finish(EC_GROUP *);
int ossl_ec_GFp_mont_group_copy(EC_GROUP *, const EC_GROUP *);
int ossl_ec_GFp_mont_field_mul(const EC_GROUP *, BIGNUM *r, const BIGNUM *a,
- const BIGNUM *b, BN_CTX *);
+ const BIGNUM *b, BN_CTX *);
int ossl_ec_GFp_mont_field_sqr(const EC_GROUP *, BIGNUM *r, const BIGNUM *a,
- BN_CTX *);
+ BN_CTX *);
int ossl_ec_GFp_mont_field_inv(const EC_GROUP *, BIGNUM *r, const BIGNUM *a,
- BN_CTX *);
+ BN_CTX *);
int ossl_ec_GFp_mont_field_encode(const EC_GROUP *, BIGNUM *r, const BIGNUM *a,
- BN_CTX *);
+ BN_CTX *);
int ossl_ec_GFp_mont_field_decode(const EC_GROUP *, BIGNUM *r, const BIGNUM *a,
- BN_CTX *);
+ BN_CTX *);
int ossl_ec_GFp_mont_field_set_to_one(const EC_GROUP *, BIGNUM *r, BN_CTX *);
/* method functions in ecp_nist.c */
int ossl_ec_GFp_nist_group_copy(EC_GROUP *dest, const EC_GROUP *src);
int ossl_ec_GFp_nist_group_set_curve(EC_GROUP *, const BIGNUM *p,
- const BIGNUM *a, const BIGNUM *b, BN_CTX *);
+ const BIGNUM *a, const BIGNUM *b, BN_CTX *);
int ossl_ec_GFp_nist_field_mul(const EC_GROUP *, BIGNUM *r, const BIGNUM *a,
- const BIGNUM *b, BN_CTX *);
+ const BIGNUM *b, BN_CTX *);
int ossl_ec_GFp_nist_field_sqr(const EC_GROUP *, BIGNUM *r, const BIGNUM *a,
- BN_CTX *);
+ BN_CTX *);
/* method functions in ec2_smpl.c */
int ossl_ec_GF2m_simple_group_init(EC_GROUP *);
@@ -465,10 +469,10 @@ void ossl_ec_GF2m_simple_group_finish(EC_GROUP *);
void ossl_ec_GF2m_simple_group_clear_finish(EC_GROUP *);
int ossl_ec_GF2m_simple_group_copy(EC_GROUP *, const EC_GROUP *);
int ossl_ec_GF2m_simple_group_set_curve(EC_GROUP *, const BIGNUM *p,
- const BIGNUM *a, const BIGNUM *b,
- BN_CTX *);
+ const BIGNUM *a, const BIGNUM *b,
+ BN_CTX *);
int ossl_ec_GF2m_simple_group_get_curve(const EC_GROUP *, BIGNUM *p, BIGNUM *a,
- BIGNUM *b, BN_CTX *);
+ BIGNUM *b, BN_CTX *);
int ossl_ec_GF2m_simple_group_get_degree(const EC_GROUP *);
int ossl_ec_GF2m_simple_group_check_discriminant(const EC_GROUP *, BN_CTX *);
int ossl_ec_GF2m_simple_point_init(EC_POINT *);
@@ -477,101 +481,101 @@ void ossl_ec_GF2m_simple_point_clear_finish(EC_POINT *);
int ossl_ec_GF2m_simple_point_copy(EC_POINT *, const EC_POINT *);
int ossl_ec_GF2m_simple_point_set_to_infinity(const EC_GROUP *, EC_POINT *);
int ossl_ec_GF2m_simple_point_set_affine_coordinates(const EC_GROUP *,
- EC_POINT *,
- const BIGNUM *x,
- const BIGNUM *y, BN_CTX *);
+ EC_POINT *,
+ const BIGNUM *x,
+ const BIGNUM *y, BN_CTX *);
int ossl_ec_GF2m_simple_point_get_affine_coordinates(const EC_GROUP *,
- const EC_POINT *, BIGNUM *x,
- BIGNUM *y, BN_CTX *);
+ const EC_POINT *, BIGNUM *x,
+ BIGNUM *y, BN_CTX *);
int ossl_ec_GF2m_simple_set_compressed_coordinates(const EC_GROUP *, EC_POINT *,
- const BIGNUM *x, int y_bit,
- BN_CTX *);
+ const BIGNUM *x, int y_bit,
+ BN_CTX *);
size_t ossl_ec_GF2m_simple_point2oct(const EC_GROUP *, const EC_POINT *,
- point_conversion_form_t form,
- unsigned char *buf, size_t len, BN_CTX *);
+ point_conversion_form_t form,
+ unsigned char *buf, size_t len, BN_CTX *);
int ossl_ec_GF2m_simple_oct2point(const EC_GROUP *, EC_POINT *,
- const unsigned char *buf, size_t len, BN_CTX *);
+ const unsigned char *buf, size_t len, BN_CTX *);
int ossl_ec_GF2m_simple_add(const EC_GROUP *, EC_POINT *r, const EC_POINT *a,
- const EC_POINT *b, BN_CTX *);
+ const EC_POINT *b, BN_CTX *);
int ossl_ec_GF2m_simple_dbl(const EC_GROUP *, EC_POINT *r, const EC_POINT *a,
- BN_CTX *);
+ BN_CTX *);
int ossl_ec_GF2m_simple_invert(const EC_GROUP *, EC_POINT *, BN_CTX *);
int ossl_ec_GF2m_simple_is_at_infinity(const EC_GROUP *, const EC_POINT *);
int ossl_ec_GF2m_simple_is_on_curve(const EC_GROUP *, const EC_POINT *, BN_CTX *);
int ossl_ec_GF2m_simple_cmp(const EC_GROUP *, const EC_POINT *a,
- const EC_POINT *b, BN_CTX *);
+ const EC_POINT *b, BN_CTX *);
int ossl_ec_GF2m_simple_make_affine(const EC_GROUP *, EC_POINT *, BN_CTX *);
int ossl_ec_GF2m_simple_points_make_affine(const EC_GROUP *, size_t num,
- EC_POINT *[], BN_CTX *);
+ EC_POINT *[], BN_CTX *);
int ossl_ec_GF2m_simple_field_mul(const EC_GROUP *, BIGNUM *r, const BIGNUM *a,
- const BIGNUM *b, BN_CTX *);
+ const BIGNUM *b, BN_CTX *);
int ossl_ec_GF2m_simple_field_sqr(const EC_GROUP *, BIGNUM *r, const BIGNUM *a,
- BN_CTX *);
+ BN_CTX *);
int ossl_ec_GF2m_simple_field_div(const EC_GROUP *, BIGNUM *r, const BIGNUM *a,
- const BIGNUM *b, BN_CTX *);
+ const BIGNUM *b, BN_CTX *);
#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
-# ifdef B_ENDIAN
-# error "Can not enable ec_nistp_64_gcc_128 on big-endian systems"
-# endif
+#ifdef B_ENDIAN
+#error "Can not enable ec_nistp_64_gcc_128 on big-endian systems"
+#endif
/* method functions in ecp_nistp224.c */
int ossl_ec_GFp_nistp224_group_init(EC_GROUP *group);
int ossl_ec_GFp_nistp224_group_set_curve(EC_GROUP *group, const BIGNUM *p,
- const BIGNUM *a, const BIGNUM *n,
- BN_CTX *);
+ const BIGNUM *a, const BIGNUM *n,
+ BN_CTX *);
int ossl_ec_GFp_nistp224_point_get_affine_coordinates(const EC_GROUP *group,
- const EC_POINT *point,
- BIGNUM *x, BIGNUM *y,
- BN_CTX *ctx);
+ const EC_POINT *point,
+ BIGNUM *x, BIGNUM *y,
+ BN_CTX *ctx);
int ossl_ec_GFp_nistp224_mul(const EC_GROUP *group, EC_POINT *r,
- const BIGNUM *scalar, size_t num,
- const EC_POINT *points[], const BIGNUM *scalars[],
- BN_CTX *);
+ const BIGNUM *scalar, size_t num,
+ const EC_POINT *points[], const BIGNUM *scalars[],
+ BN_CTX *);
int ossl_ec_GFp_nistp224_points_mul(const EC_GROUP *group, EC_POINT *r,
- const BIGNUM *scalar, size_t num,
- const EC_POINT *points[],
- const BIGNUM *scalars[], BN_CTX *ctx);
+ const BIGNUM *scalar, size_t num,
+ const EC_POINT *points[],
+ const BIGNUM *scalars[], BN_CTX *ctx);
int ossl_ec_GFp_nistp224_precompute_mult(EC_GROUP *group, BN_CTX *ctx);
int ossl_ec_GFp_nistp224_have_precompute_mult(const EC_GROUP *group);
/* method functions in ecp_nistp256.c */
int ossl_ec_GFp_nistp256_group_init(EC_GROUP *group);
int ossl_ec_GFp_nistp256_group_set_curve(EC_GROUP *group, const BIGNUM *p,
- const BIGNUM *a, const BIGNUM *n,
- BN_CTX *);
+ const BIGNUM *a, const BIGNUM *n,
+ BN_CTX *);
int ossl_ec_GFp_nistp256_point_get_affine_coordinates(const EC_GROUP *group,
- const EC_POINT *point,
- BIGNUM *x, BIGNUM *y,
- BN_CTX *ctx);
+ const EC_POINT *point,
+ BIGNUM *x, BIGNUM *y,
+ BN_CTX *ctx);
int ossl_ec_GFp_nistp256_mul(const EC_GROUP *group, EC_POINT *r,
- const BIGNUM *scalar, size_t num,
- const EC_POINT *points[], const BIGNUM *scalars[],
- BN_CTX *);
+ const BIGNUM *scalar, size_t num,
+ const EC_POINT *points[], const BIGNUM *scalars[],
+ BN_CTX *);
int ossl_ec_GFp_nistp256_points_mul(const EC_GROUP *group, EC_POINT *r,
- const BIGNUM *scalar, size_t num,
- const EC_POINT *points[],
- const BIGNUM *scalars[], BN_CTX *ctx);
+ const BIGNUM *scalar, size_t num,
+ const EC_POINT *points[],
+ const BIGNUM *scalars[], BN_CTX *ctx);
int ossl_ec_GFp_nistp256_precompute_mult(EC_GROUP *group, BN_CTX *ctx);
int ossl_ec_GFp_nistp256_have_precompute_mult(const EC_GROUP *group);
/* method functions in ecp_nistp384.c */
int ossl_ec_GFp_nistp384_group_init(EC_GROUP *group);
int ossl_ec_GFp_nistp384_group_set_curve(EC_GROUP *group, const BIGNUM *p,
- const BIGNUM *a, const BIGNUM *n,
- BN_CTX *);
+ const BIGNUM *a, const BIGNUM *n,
+ BN_CTX *);
int ossl_ec_GFp_nistp384_point_get_affine_coordinates(const EC_GROUP *group,
- const EC_POINT *point,
- BIGNUM *x, BIGNUM *y,
- BN_CTX *ctx);
+ const EC_POINT *point,
+ BIGNUM *x, BIGNUM *y,
+ BN_CTX *ctx);
int ossl_ec_GFp_nistp384_mul(const EC_GROUP *group, EC_POINT *r,
- const BIGNUM *scalar, size_t num,
- const EC_POINT *points[], const BIGNUM *scalars[],
- BN_CTX *);
+ const BIGNUM *scalar, size_t num,
+ const EC_POINT *points[], const BIGNUM *scalars[],
+ BN_CTX *);
int ossl_ec_GFp_nistp384_points_mul(const EC_GROUP *group, EC_POINT *r,
- const BIGNUM *scalar, size_t num,
- const EC_POINT *points[],
- const BIGNUM *scalars[], BN_CTX *ctx);
+ const BIGNUM *scalar, size_t num,
+ const EC_POINT *points[],
+ const BIGNUM *scalars[], BN_CTX *ctx);
int ossl_ec_GFp_nistp384_precompute_mult(EC_GROUP *group, BN_CTX *ctx);
int ossl_ec_GFp_nistp384_have_precompute_mult(const EC_GROUP *group);
const EC_METHOD *ossl_ec_GFp_nistp384_method(void);
@@ -579,45 +583,39 @@ const EC_METHOD *ossl_ec_GFp_nistp384_method(void);
/* method functions in ecp_nistp521.c */
int ossl_ec_GFp_nistp521_group_init(EC_GROUP *group);
int ossl_ec_GFp_nistp521_group_set_curve(EC_GROUP *group, const BIGNUM *p,
- const BIGNUM *a, const BIGNUM *n,
- BN_CTX *);
+ const BIGNUM *a, const BIGNUM *n,
+ BN_CTX *);
int ossl_ec_GFp_nistp521_point_get_affine_coordinates(const EC_GROUP *group,
- const EC_POINT *point,
- BIGNUM *x, BIGNUM *y,
- BN_CTX *ctx);
+ const EC_POINT *point,
+ BIGNUM *x, BIGNUM *y,
+ BN_CTX *ctx);
int ossl_ec_GFp_nistp521_mul(const EC_GROUP *group, EC_POINT *r,
- const BIGNUM *scalar, size_t num,
- const EC_POINT *points[], const BIGNUM *scalars[],
- BN_CTX *);
+ const BIGNUM *scalar, size_t num,
+ const EC_POINT *points[], const BIGNUM *scalars[],
+ BN_CTX *);
int ossl_ec_GFp_nistp521_points_mul(const EC_GROUP *group, EC_POINT *r,
- const BIGNUM *scalar, size_t num,
- const EC_POINT *points[],
- const BIGNUM *scalars[], BN_CTX *ctx);
+ const BIGNUM *scalar, size_t num,
+ const EC_POINT *points[],
+ const BIGNUM *scalars[], BN_CTX *ctx);
int ossl_ec_GFp_nistp521_precompute_mult(EC_GROUP *group, BN_CTX *ctx);
int ossl_ec_GFp_nistp521_have_precompute_mult(const EC_GROUP *group);
/* utility functions in ecp_nistputil.c */
void ossl_ec_GFp_nistp_points_make_affine_internal(size_t num, void *point_array,
- size_t felem_size,
- void *tmp_felems,
- void (*felem_one) (void *out),
- int (*felem_is_zero)
- (const void *in),
- void (*felem_assign)
- (void *out, const void *in),
- void (*felem_square)
- (void *out, const void *in),
- void (*felem_mul)
- (void *out,
- const void *in1,
- const void *in2),
- void (*felem_inv)
- (void *out, const void *in),
- void (*felem_contract)
- (void *out, const void *in));
+ size_t felem_size,
+ void *tmp_felems,
+ void (*felem_one)(void *out),
+ int (*felem_is_zero)(const void *in),
+ void (*felem_assign)(void *out, const void *in),
+ void (*felem_square)(void *out, const void *in),
+ void (*felem_mul)(void *out,
+ const void *in1,
+ const void *in2),
+ void (*felem_inv)(void *out, const void *in),
+ void (*felem_contract)(void *out, const void *in));
void ossl_ec_GFp_nistp_recode_scalar_bits(unsigned char *sign,
- unsigned char *digit,
- unsigned char in);
+ unsigned char *digit,
+ unsigned char in);
#endif
int ossl_ec_group_simple_order_bits(const EC_GROUP *group);
@@ -630,7 +628,7 @@ int ossl_ec_group_simple_order_bits(const EC_GROUP *group);
* \return newly created EC_GROUP object or NULL in case of an error.
*/
EC_GROUP *ossl_ec_group_new_ex(OSSL_LIB_CTX *libctx, const char *propq,
- const EC_METHOD *meth);
+ const EC_METHOD *meth);
#ifdef ECP_NISTZ256_ASM
/** Returns GFp methods using montgomery multiplication, with x86-64 optimized
@@ -646,9 +644,9 @@ const EC_METHOD *EC_GFp_s390x_nistp521_method(void);
#endif
size_t ossl_ec_key_simple_priv2oct(const EC_KEY *eckey,
- unsigned char *buf, size_t len);
+ unsigned char *buf, size_t len);
int ossl_ec_key_simple_oct2priv(EC_KEY *eckey, const unsigned char *buf,
- size_t len);
+ size_t len);
int ossl_ec_key_simple_generate_key(EC_KEY *eckey);
int ossl_ec_key_simple_generate_public_key(EC_KEY *eckey);
int ossl_ec_key_simple_check_key(const EC_KEY *eckey);
@@ -673,31 +671,30 @@ struct ec_key_method_st {
int (*set_public)(EC_KEY *key, const EC_POINT *pub_key);
int (*keygen)(EC_KEY *key);
int (*compute_key)(unsigned char **pout, size_t *poutlen,
- const EC_POINT *pub_key, const EC_KEY *ecdh);
- int (*sign)(int type, const unsigned char *dgst, int dlen, unsigned char
- *sig, unsigned int *siglen, const BIGNUM *kinv,
- const BIGNUM *r, EC_KEY *eckey);
+ const EC_POINT *pub_key, const EC_KEY *ecdh);
+ int (*sign)(int type, const unsigned char *dgst, int dlen, unsigned char *sig, unsigned int *siglen, const BIGNUM *kinv,
+ const BIGNUM *r, EC_KEY *eckey);
int (*sign_setup)(EC_KEY *eckey, BN_CTX *ctx_in, BIGNUM **kinvp,
- BIGNUM **rp);
+ BIGNUM **rp);
ECDSA_SIG *(*sign_sig)(const unsigned char *dgst, int dgst_len,
- const BIGNUM *in_kinv, const BIGNUM *in_r,
- EC_KEY *eckey);
+ const BIGNUM *in_kinv, const BIGNUM *in_r,
+ EC_KEY *eckey);
int (*verify)(int type, const unsigned char *dgst, int dgst_len,
- const unsigned char *sigbuf, int sig_len, EC_KEY *eckey);
+ const unsigned char *sigbuf, int sig_len, EC_KEY *eckey);
int (*verify_sig)(const unsigned char *dgst, int dgst_len,
- const ECDSA_SIG *sig, EC_KEY *eckey);
+ const ECDSA_SIG *sig, EC_KEY *eckey);
};
-#define EC_KEY_METHOD_DYNAMIC 1
+#define EC_KEY_METHOD_DYNAMIC 1
EC_KEY *ossl_ec_key_new_method_int(OSSL_LIB_CTX *libctx, const char *propq);
int ossl_ec_key_gen(EC_KEY *eckey);
int ossl_ecdh_compute_key(unsigned char **pout, size_t *poutlen,
- const EC_POINT *pub_key, const EC_KEY *ecdh);
+ const EC_POINT *pub_key, const EC_KEY *ecdh);
int ossl_ecdh_simple_compute_key(unsigned char **pout, size_t *poutlen,
- const EC_POINT *pub_key, const EC_KEY *ecdh);
+ const EC_POINT *pub_key, const EC_KEY *ecdh);
struct ECDSA_SIG_st {
BIGNUM *r;
@@ -705,25 +702,24 @@ struct ECDSA_SIG_st {
};
int ossl_ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, BIGNUM **kinvp,
- BIGNUM **rp);
+ BIGNUM **rp);
int ossl_ecdsa_sign(int type, const unsigned char *dgst, int dlen,
- unsigned char *sig, unsigned int *siglen,
- const BIGNUM *kinv, const BIGNUM *r, EC_KEY *eckey);
+ unsigned char *sig, unsigned int *siglen,
+ const BIGNUM *kinv, const BIGNUM *r, EC_KEY *eckey);
ECDSA_SIG *ossl_ecdsa_sign_sig(const unsigned char *dgst, int dgst_len,
- const BIGNUM *in_kinv, const BIGNUM *in_r,
- EC_KEY *eckey);
+ const BIGNUM *in_kinv, const BIGNUM *in_r,
+ EC_KEY *eckey);
int ossl_ecdsa_verify(int type, const unsigned char *dgst, int dgst_len,
- const unsigned char *sigbuf, int sig_len, EC_KEY *eckey);
+ const unsigned char *sigbuf, int sig_len, EC_KEY *eckey);
int ossl_ecdsa_verify_sig(const unsigned char *dgst, int dgst_len,
- const ECDSA_SIG *sig, EC_KEY *eckey);
+ const ECDSA_SIG *sig, EC_KEY *eckey);
int ossl_ecdsa_simple_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, BIGNUM **kinvp,
- BIGNUM **rp);
+ BIGNUM **rp);
ECDSA_SIG *ossl_ecdsa_simple_sign_sig(const unsigned char *dgst, int dgst_len,
- const BIGNUM *in_kinv, const BIGNUM *in_r,
- EC_KEY *eckey);
+ const BIGNUM *in_kinv, const BIGNUM *in_r,
+ EC_KEY *eckey);
int ossl_ecdsa_simple_verify_sig(const unsigned char *dgst, int dgst_len,
- const ECDSA_SIG *sig, EC_KEY *eckey);
-
+ const ECDSA_SIG *sig, EC_KEY *eckey);
/*-
* This functions computes a single point multiplication over the EC group,
@@ -755,15 +751,15 @@ int ossl_ecdsa_simple_verify_sig(const unsigned char *dgst, int dgst_len,
* Returns 1 on success, 0 otherwise.
*/
int ossl_ec_scalar_mul_ladder(const EC_GROUP *group, EC_POINT *r,
- const BIGNUM *scalar, const EC_POINT *point,
- BN_CTX *ctx);
+ const BIGNUM *scalar, const EC_POINT *point,
+ BN_CTX *ctx);
int ossl_ec_point_blind_coordinates(const EC_GROUP *group, EC_POINT *p,
- BN_CTX *ctx);
+ BN_CTX *ctx);
static ossl_inline int ec_point_ladder_pre(const EC_GROUP *group,
- EC_POINT *r, EC_POINT *s,
- EC_POINT *p, BN_CTX *ctx)
+ EC_POINT *r, EC_POINT *s,
+ EC_POINT *p, BN_CTX *ctx)
{
if (group->meth->ladder_pre != NULL)
return group->meth->ladder_pre(group, r, s, p, ctx);
@@ -776,8 +772,8 @@ static ossl_inline int ec_point_ladder_pre(const EC_GROUP *group,
}
static ossl_inline int ec_point_ladder_step(const EC_GROUP *group,
- EC_POINT *r, EC_POINT *s,
- EC_POINT *p, BN_CTX *ctx)
+ EC_POINT *r, EC_POINT *s,
+ EC_POINT *p, BN_CTX *ctx)
{
if (group->meth->ladder_step != NULL)
return group->meth->ladder_step(group, r, s, p, ctx);
@@ -787,12 +783,11 @@ static ossl_inline int ec_point_ladder_step(const EC_GROUP *group,
return 0;
return 1;
-
}
static ossl_inline int ec_point_ladder_post(const EC_GROUP *group,
- EC_POINT *r, EC_POINT *s,
- EC_POINT *p, BN_CTX *ctx)
+ EC_POINT *r, EC_POINT *s,
+ EC_POINT *p, BN_CTX *ctx)
{
if (group->meth->ladder_post != NULL)
return group->meth->ladder_post(group, r, s, p, ctx);
diff --git a/crypto/ec/ec_mult.c b/crypto/ec/ec_mult.c
index 8fb15da55f..4b5e08ecae 100644
--- a/crypto/ec/ec_mult.c
+++ b/crypto/ec/ec_mult.c
@@ -35,15 +35,15 @@
/* structure for precomputed multiples of the generator */
struct ec_pre_comp_st {
- const EC_GROUP *group; /* parent EC_GROUP object */
- size_t blocksize; /* block size for wNAF splitting */
- size_t numblocks; /* max. number of blocks for which we have
- * precomputation */
- size_t w; /* window size */
- EC_POINT **points; /* array with pre-calculated multiples of
- * generator: 'num' pointers to EC_POINT
- * objects followed by a NULL */
- size_t num; /* numblocks * 2^(w-1) */
+ const EC_GROUP *group; /* parent EC_GROUP object */
+ size_t blocksize; /* block size for wNAF splitting */
+ size_t numblocks; /* max. number of blocks for which we have
+ * precomputation */
+ size_t w; /* window size */
+ EC_POINT **points; /* array with pre-calculated multiples of
+ * generator: 'num' pointers to EC_POINT
+ * objects followed by a NULL */
+ size_t num; /* numblocks * 2^(w-1) */
CRYPTO_REF_COUNT references;
};
@@ -59,8 +59,8 @@ static EC_PRE_COMP *ec_pre_comp_new(const EC_GROUP *group)
return ret;
ret->group = group;
- ret->blocksize = 8; /* default */
- ret->w = 4; /* default */
+ ret->blocksize = 8; /* default */
+ ret->w = 4; /* default */
if (!CRYPTO_NEW_REF(&ret->references, 1)) {
OPENSSL_free(ret);
@@ -101,11 +101,12 @@ void EC_ec_pre_comp_free(EC_PRE_COMP *pre)
OPENSSL_free(pre);
}
-#define EC_POINT_BN_set_flags(P, flags) do { \
- BN_set_flags((P)->X, (flags)); \
- BN_set_flags((P)->Y, (flags)); \
- BN_set_flags((P)->Z, (flags)); \
-} while(0)
+#define EC_POINT_BN_set_flags(P, flags) \
+ do { \
+ BN_set_flags((P)->X, (flags)); \
+ BN_set_flags((P)->Y, (flags)); \
+ BN_set_flags((P)->Z, (flags)); \
+ } while (0)
/*-
* This functions computes a single point multiplication over the EC group,
@@ -137,8 +138,8 @@ void EC_ec_pre_comp_free(EC_PRE_COMP *pre)
* Returns 1 on success, 0 otherwise.
*/
int ossl_ec_scalar_mul_ladder(const EC_GROUP *group, EC_POINT *r,
- const BIGNUM *scalar, const EC_POINT *point,
- BN_CTX *ctx)
+ const BIGNUM *scalar, const EC_POINT *point,
+ BN_CTX *ctx)
{
int i, cardinality_bits, group_top, kbit, pbit, Z_is_one;
EC_POINT *p = NULL;
@@ -261,10 +262,9 @@ int ossl_ec_scalar_mul_ladder(const EC_GROUP *group, EC_POINT *r,
}
/* ensure input point is in affine coords for ladder step efficiency */
- if (!p->Z_is_one && (group->meth->make_affine == NULL
- || !group->meth->make_affine(group, p, ctx))) {
- ERR_raise(ERR_LIB_EC, ERR_R_EC_LIB);
- goto err;
+ if (!p->Z_is_one && (group->meth->make_affine == NULL || !group->meth->make_affine(group, p, ctx))) {
+ ERR_raise(ERR_LIB_EC, ERR_R_EC_LIB);
+ goto err;
}
/* Initialize the Montgomery ladder */
@@ -276,14 +276,15 @@ int ossl_ec_scalar_mul_ladder(const EC_GROUP *group, EC_POINT *r,
/* top bit is a 1, in a fixed pos */
pbit = 1;
-#define EC_POINT_CSWAP(c, a, b, w, t) do { \
+#define EC_POINT_CSWAP(c, a, b, w, t) \
+ do { \
BN_consttime_swap(c, (a)->X, (b)->X, w); \
BN_consttime_swap(c, (a)->Y, (b)->Y, w); \
BN_consttime_swap(c, (a)->Z, (b)->Z, w); \
t = ((a)->Z_is_one ^ (b)->Z_is_one) & (c); \
(a)->Z_is_one ^= (t); \
(b)->Z_is_one ^= (t); \
-} while(0)
+ } while (0)
/*-
* The ladder step, with branches, is
@@ -370,7 +371,7 @@ int ossl_ec_scalar_mul_ladder(const EC_GROUP *group, EC_POINT *r,
ret = 1;
- err:
+err:
EC_POINT_free(p);
EC_POINT_clear_free(s);
BN_CTX_end(ctx);
@@ -385,14 +386,12 @@ int ossl_ec_scalar_mul_ladder(const EC_GROUP *group, EC_POINT *r,
* sometimes smaller windows will give better performance (thus the
* boundaries should be increased)
*/
-#define EC_window_bits_for_scalar_size(b) \
- ((size_t) \
- ((b) >= 2000 ? 6 : \
- (b) >= 800 ? 5 : \
- (b) >= 300 ? 4 : \
- (b) >= 70 ? 3 : \
- (b) >= 20 ? 2 : \
- 1))
+#define EC_window_bits_for_scalar_size(b) \
+ ((size_t)((b) >= 2000 ? 6 : (b) >= 800 ? 5 \
+ : (b) >= 300 ? 4 \
+ : (b) >= 70 ? 3 \
+ : (b) >= 20 ? 2 \
+ : 1))
/*-
* Compute
@@ -402,8 +401,8 @@ int ossl_ec_scalar_mul_ladder(const EC_GROUP *group, EC_POINT *r,
* in the addition if scalar != NULL
*/
int ossl_ec_wNAF_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
- size_t num, const EC_POINT *points[],
- const BIGNUM *scalars[], BN_CTX *ctx)
+ size_t num, const EC_POINT *points[],
+ const BIGNUM *scalars[], BN_CTX *ctx)
{
const EC_POINT *generator = NULL;
EC_POINT *tmp = NULL;
@@ -414,19 +413,19 @@ int ossl_ec_wNAF_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
int k;
int r_is_inverted = 0;
int r_is_at_infinity = 1;
- size_t *wsize = NULL; /* individual window sizes */
- signed char **wNAF = NULL; /* individual wNAFs */
+ size_t *wsize = NULL; /* individual window sizes */
+ signed char **wNAF = NULL; /* individual wNAFs */
size_t *wNAF_len = NULL;
size_t max_len = 0;
size_t num_val;
- EC_POINT **val = NULL; /* precomputation */
+ EC_POINT **val = NULL; /* precomputation */
EC_POINT **v;
EC_POINT ***val_sub = NULL; /* pointers to sub-arrays of 'val' or
* 'pre_comp->points' */
const EC_PRE_COMP *pre_comp = NULL;
- int num_scalar = 0; /* flag: will be set to 1 if 'scalar' must be
- * treated like other scalars, i.e.
- * precomputation is not available */
+ int num_scalar = 0; /* flag: will be set to 1 if 'scalar' must be
+ * treated like other scalars, i.e.
+ * precomputation is not available */
int ret = 0;
if (!BN_is_zero(group->order) && !BN_is_zero(group->cofactor)) {
@@ -455,7 +454,7 @@ int ossl_ec_wNAF_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
* actually set and we always call the ladder version.
*/
return ossl_ec_scalar_mul_ladder(group, r, scalars[0], points[0],
- ctx);
+ ctx);
}
}
@@ -470,8 +469,7 @@ int ossl_ec_wNAF_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
pre_comp = group->pre_comp.ec;
if (pre_comp && pre_comp->numblocks
- && (EC_POINT_cmp(group, generator, pre_comp->points[0], ctx) ==
- 0)) {
+ && (EC_POINT_cmp(group, generator, pre_comp->points[0], ctx) == 0)) {
blocksize = pre_comp->blocksize;
/*
@@ -497,8 +495,8 @@ int ossl_ec_wNAF_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
/* can't use precomputation */
pre_comp = NULL;
numblocks = 1;
- num_scalar = 1; /* treat 'scalar' like 'num'-th element of
- * 'scalars' */
+ num_scalar = 1; /* treat 'scalar' like 'num'-th element of
+ * 'scalars' */
}
}
@@ -512,7 +510,7 @@ int ossl_ec_wNAF_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
/* Ensure wNAF is initialised in case we end up going to err */
if (wNAF != NULL)
- wNAF[0] = NULL; /* preliminary pivot */
+ wNAF[0] = NULL; /* preliminary pivot */
if (wsize == NULL || wNAF_len == NULL || wNAF == NULL || val_sub == NULL)
goto err;
@@ -528,10 +526,9 @@ int ossl_ec_wNAF_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
bits = i < num ? BN_num_bits(scalars[i]) : BN_num_bits(scalar);
wsize[i] = EC_window_bits_for_scalar_size(bits);
num_val += (size_t)1 << (wsize[i] - 1);
- wNAF[i + 1] = NULL; /* make sure we always have a pivot */
- wNAF[i] =
- bn_compute_wNAF((i < num ? scalars[i] : scalar), (int)wsize[i],
- &wNAF_len[i]);
+ wNAF[i + 1] = NULL; /* make sure we always have a pivot */
+ wNAF[i] = bn_compute_wNAF((i < num ? scalars[i] : scalar), (int)wsize[i],
+ &wNAF_len[i]);
if (wNAF[i] == NULL)
goto err;
if (wNAF_len[i] > max_len)
@@ -654,7 +651,7 @@ int ossl_ec_wNAF_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
val = OPENSSL_malloc_array(num_val + 1, sizeof(val[0]));
if (val == NULL)
goto err;
- val[num_val] = NULL; /* pivot element */
+ val[num_val] = NULL; /* pivot element */
/* allocate points for precomputation */
v = val;
@@ -695,8 +692,7 @@ int ossl_ec_wNAF_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
if (!EC_POINT_dbl(group, tmp, val_sub[i][0], ctx))
goto err;
for (j = 1; j < ((size_t)1 << (wsize[i] - 1)); j++) {
- if (!EC_POINT_add
- (group, val_sub[i][j], val_sub[i][j - 1], tmp, ctx))
+ if (!EC_POINT_add(group, val_sub[i][j], val_sub[i][j - 1], tmp, ctx))
goto err;
}
}
@@ -756,8 +752,7 @@ int ossl_ec_wNAF_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
r_is_at_infinity = 0;
} else {
- if (!EC_POINT_add
- (group, r, r, val_sub[i][digit >> 1], ctx))
+ if (!EC_POINT_add(group, r, r, val_sub[i][digit >> 1], ctx))
goto err;
}
}
@@ -776,7 +771,7 @@ int ossl_ec_wNAF_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
ret = 1;
- err:
+err:
EC_POINT_free(tmp);
OPENSSL_free(wsize);
OPENSSL_free(wNAF_len);
@@ -888,7 +883,7 @@ int ossl_ec_wNAF_precompute_mult(EC_GROUP *group, BN_CTX *ctx)
goto err;
var = points;
- var[num] = NULL; /* pivot */
+ var[num] = NULL; /* pivot */
for (i = 0; i < num; i++) {
if ((var[i] = EC_POINT_new(group)) == NULL) {
ERR_raise(ERR_LIB_EC, ERR_R_EC_LIB);
@@ -958,7 +953,7 @@ int ossl_ec_wNAF_precompute_mult(EC_GROUP *group, BN_CTX *ctx)
pre_comp = NULL;
ret = 1;
- err:
+err:
if (used_ctx)
BN_CTX_end(ctx);
#ifndef FIPS_MODULE
diff --git a/crypto/ec/ec_oct.c b/crypto/ec/ec_oct.c
index 886e5fd310..8055ad6c70 100644
--- a/crypto/ec/ec_oct.c
+++ b/crypto/ec/ec_oct.c
@@ -22,7 +22,7 @@
#include "ec_local.h"
int EC_POINT_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *point,
- const BIGNUM *x, int y_bit, BN_CTX *ctx)
+ const BIGNUM *x, int y_bit, BN_CTX *ctx)
{
if (group->meth->point_set_compressed_coordinates == NULL
&& !(group->meth->flags & EC_FLAGS_DEFAULT_OCT)) {
@@ -36,7 +36,7 @@ int EC_POINT_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *point,
if (group->meth->flags & EC_FLAGS_DEFAULT_OCT) {
if (group->meth->field_type == NID_X9_62_prime_field)
return ossl_ec_GFp_simple_set_compressed_coordinates(group, point, x,
- y_bit, ctx);
+ y_bit, ctx);
else
#ifdef OPENSSL_NO_EC2M
{
@@ -45,34 +45,34 @@ int EC_POINT_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *point,
}
#else
return ossl_ec_GF2m_simple_set_compressed_coordinates(group, point,
- x, y_bit, ctx);
+ x, y_bit, ctx);
#endif
}
return group->meth->point_set_compressed_coordinates(group, point, x,
- y_bit, ctx);
+ y_bit, ctx);
}
#ifndef OPENSSL_NO_DEPRECATED_3_0
int EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *group,
- EC_POINT *point, const BIGNUM *x,
- int y_bit, BN_CTX *ctx)
+ EC_POINT *point, const BIGNUM *x,
+ int y_bit, BN_CTX *ctx)
{
return EC_POINT_set_compressed_coordinates(group, point, x, y_bit, ctx);
}
-# ifndef OPENSSL_NO_EC2M
+#ifndef OPENSSL_NO_EC2M
int EC_POINT_set_compressed_coordinates_GF2m(const EC_GROUP *group,
- EC_POINT *point, const BIGNUM *x,
- int y_bit, BN_CTX *ctx)
+ EC_POINT *point, const BIGNUM *x,
+ int y_bit, BN_CTX *ctx)
{
return EC_POINT_set_compressed_coordinates(group, point, x, y_bit, ctx);
}
-# endif
+#endif
#endif
size_t EC_POINT_point2oct(const EC_GROUP *group, const EC_POINT *point,
- point_conversion_form_t form, unsigned char *buf,
- size_t len, BN_CTX *ctx)
+ point_conversion_form_t form, unsigned char *buf,
+ size_t len, BN_CTX *ctx)
{
if (point == NULL) {
ERR_raise(ERR_LIB_EC, ERR_R_PASSED_NULL_PARAMETER);
@@ -90,7 +90,7 @@ size_t EC_POINT_point2oct(const EC_GROUP *group, const EC_POINT *point,
if (group->meth->flags & EC_FLAGS_DEFAULT_OCT) {
if (group->meth->field_type == NID_X9_62_prime_field)
return ossl_ec_GFp_simple_point2oct(group, point, form, buf, len,
- ctx);
+ ctx);
else
#ifdef OPENSSL_NO_EC2M
{
@@ -99,7 +99,7 @@ size_t EC_POINT_point2oct(const EC_GROUP *group, const EC_POINT *point,
}
#else
return ossl_ec_GF2m_simple_point2oct(group, point,
- form, buf, len, ctx);
+ form, buf, len, ctx);
#endif
}
@@ -107,7 +107,7 @@ size_t EC_POINT_point2oct(const EC_GROUP *group, const EC_POINT *point,
}
int EC_POINT_oct2point(const EC_GROUP *group, EC_POINT *point,
- const unsigned char *buf, size_t len, BN_CTX *ctx)
+ const unsigned char *buf, size_t len, BN_CTX *ctx)
{
if (group->meth->oct2point == 0
&& !(group->meth->flags & EC_FLAGS_DEFAULT_OCT)) {
@@ -135,8 +135,8 @@ int EC_POINT_oct2point(const EC_GROUP *group, EC_POINT *point,
}
size_t EC_POINT_point2buf(const EC_GROUP *group, const EC_POINT *point,
- point_conversion_form_t form,
- unsigned char **pbuf, BN_CTX *ctx)
+ point_conversion_form_t form,
+ unsigned char **pbuf, BN_CTX *ctx)
{
size_t len;
unsigned char *buf;
diff --git a/crypto/ec/ec_pmeth.c b/crypto/ec/ec_pmeth.c
index c71c243aae..b348832e38 100644
--- a/crypto/ec/ec_pmeth.c
+++ b/crypto/ec/ec_pmeth.c
@@ -102,7 +102,7 @@ static void pkey_ec_cleanup(EVP_PKEY_CTX *ctx)
}
static int pkey_ec_sign(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
- const unsigned char *tbs, size_t tbslen)
+ const unsigned char *tbs, size_t tbslen)
{
int ret, type;
unsigned int sltmp;
@@ -140,8 +140,8 @@ static int pkey_ec_sign(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
}
static int pkey_ec_verify(EVP_PKEY_CTX *ctx,
- const unsigned char *sig, size_t siglen,
- const unsigned char *tbs, size_t tbslen)
+ const unsigned char *sig, size_t siglen,
+ const unsigned char *tbs, size_t tbslen)
{
int ret, type;
EC_PKEY_CTX *dctx = ctx->data;
@@ -211,7 +211,7 @@ static int pkey_ec_derive(EVP_PKEY_CTX *ctx, unsigned char *key, size_t *keylen)
}
static int pkey_ec_kdf_derive(EVP_PKEY_CTX *ctx,
- unsigned char *key, size_t *keylen)
+ unsigned char *key, size_t *keylen)
{
EC_PKEY_CTX *dctx = ctx->data;
unsigned char *ktmp = NULL;
@@ -233,12 +233,12 @@ static int pkey_ec_kdf_derive(EVP_PKEY_CTX *ctx,
goto err;
/* Do KDF stuff */
if (!ossl_ecdh_kdf_X9_63(key, *keylen, ktmp, ktmplen,
- dctx->kdf_ukm, dctx->kdf_ukmlen, dctx->kdf_md,
- ctx->libctx, ctx->propquery))
+ dctx->kdf_ukm, dctx->kdf_ukmlen, dctx->kdf_md,
+ ctx->libctx, ctx->propquery))
goto err;
rv = 1;
- err:
+err:
OPENSSL_clear_free(ktmp, ktmplen);
return rv;
}
@@ -351,17 +351,7 @@ static int pkey_ec_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
return (int)dctx->kdf_ukmlen;
case EVP_PKEY_CTRL_MD:
- if (EVP_MD_get_type((const EVP_MD *)p2) != NID_sha1 &&
- EVP_MD_get_type((const EVP_MD *)p2) != NID_ecdsa_with_SHA1 &&
- EVP_MD_get_type((const EVP_MD *)p2) != NID_sha224 &&
- EVP_MD_get_type((const EVP_MD *)p2) != NID_sha256 &&
- EVP_MD_get_type((const EVP_MD *)p2) != NID_sha384 &&
- EVP_MD_get_type((const EVP_MD *)p2) != NID_sha512 &&
- EVP_MD_get_type((const EVP_MD *)p2) != NID_sha3_224 &&
- EVP_MD_get_type((const EVP_MD *)p2) != NID_sha3_256 &&
- EVP_MD_get_type((const EVP_MD *)p2) != NID_sha3_384 &&
- EVP_MD_get_type((const EVP_MD *)p2) != NID_sha3_512 &&
- EVP_MD_get_type((const EVP_MD *)p2) != NID_sm3) {
+ if (EVP_MD_get_type((const EVP_MD *)p2) != NID_sha1 && EVP_MD_get_type((const EVP_MD *)p2) != NID_ecdsa_with_SHA1 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha224 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha256 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha384 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha512 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha3_224 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha3_256 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha3_384 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha3_512 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sm3) {
ERR_raise(ERR_LIB_EC, EC_R_INVALID_DIGEST_TYPE);
return 0;
}
@@ -381,12 +371,11 @@ static int pkey_ec_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
default:
return -2;
-
}
}
static int pkey_ec_ctrl_str(EVP_PKEY_CTX *ctx,
- const char *type, const char *value)
+ const char *type, const char *value)
{
if (strcmp(type, "ec_paramgen_curve") == 0) {
int nid;
diff --git a/crypto/ec/ec_print.c b/crypto/ec/ec_print.c
index e14ffc002c..3c7af3bbd9 100644
--- a/crypto/ec/ec_print.c
+++ b/crypto/ec/ec_print.c
@@ -14,8 +14,8 @@
/* the return value must be freed (using OPENSSL_free()) */
char *EC_POINT_point2hex(const EC_GROUP *group,
- const EC_POINT *point,
- point_conversion_form_t form, BN_CTX *ctx)
+ const EC_POINT *point,
+ point_conversion_form_t form, BN_CTX *ctx)
{
char *ret, *p;
size_t buf_len, i;
@@ -35,13 +35,13 @@ char *EC_POINT_point2hex(const EC_GROUP *group,
p += ossl_to_hex(p, buf[i]);
*p = '\0';
- err:
+err:
OPENSSL_free(buf);
return ret;
}
EC_POINT *EC_POINT_hex2point(const EC_GROUP *group,
- const char *hex, EC_POINT *point, BN_CTX *ctx)
+ const char *hex, EC_POINT *point, BN_CTX *ctx)
{
int ok = 0;
unsigned char *oct_buf = NULL;
diff --git a/crypto/ec/ecdh_kdf.c b/crypto/ec/ecdh_kdf.c
index de63bf8500..31f297bff6 100644
--- a/crypto/ec/ecdh_kdf.c
+++ b/crypto/ec/ecdh_kdf.c
@@ -22,10 +22,10 @@
/* Key derivation function from X9.63/SECG */
int ossl_ecdh_kdf_X9_63(unsigned char *out, size_t outlen,
- const unsigned char *Z, size_t Zlen,
- const unsigned char *sinfo, size_t sinfolen,
- const EVP_MD *md,
- OSSL_LIB_CTX *libctx, const char *propq)
+ const unsigned char *Z, size_t Zlen,
+ const unsigned char *sinfo, size_t sinfolen,
+ const EVP_MD *md,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
int ret = 0;
EVP_KDF_CTX *kctx = NULL;
@@ -35,11 +35,11 @@ int ossl_ecdh_kdf_X9_63(unsigned char *out, size_t outlen,
if ((kctx = EVP_KDF_CTX_new(kdf)) != NULL) {
*p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST,
- (char *)mdname, 0);
+ (char *)mdname, 0);
*p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_KEY,
- (void *)Z, Zlen);
+ (void *)Z, Zlen);
*p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_INFO,
- (void *)sinfo, sinfolen);
+ (void *)sinfo, sinfolen);
*p = OSSL_PARAM_construct_end();
ret = EVP_KDF_derive(kctx, out, outlen, params) > 0;
@@ -55,11 +55,11 @@ int ossl_ecdh_kdf_X9_63(unsigned char *out, size_t outlen,
*/
#ifndef OPENSSL_NO_DEPRECATED_3_0
int ECDH_KDF_X9_62(unsigned char *out, size_t outlen,
- const unsigned char *Z, size_t Zlen,
- const unsigned char *sinfo, size_t sinfolen,
- const EVP_MD *md)
+ const unsigned char *Z, size_t Zlen,
+ const unsigned char *sinfo, size_t sinfolen,
+ const EVP_MD *md)
{
return ossl_ecdh_kdf_X9_63(out, outlen, Z, Zlen, sinfo, sinfolen, md, NULL,
- NULL);
+ NULL);
}
#endif
diff --git a/crypto/ec/ecdh_ossl.c b/crypto/ec/ecdh_ossl.c
index 41f7e39046..595cbb8a87 100644
--- a/crypto/ec/ecdh_ossl.c
+++ b/crypto/ec/ecdh_ossl.c
@@ -26,7 +26,7 @@
#include "ec_local.h"
int ossl_ecdh_compute_key(unsigned char **psec, size_t *pseclen,
- const EC_POINT *pub_key, const EC_KEY *ecdh)
+ const EC_POINT *pub_key, const EC_KEY *ecdh)
{
if (ecdh->group->meth->ecdh_compute_key == NULL) {
ERR_raise(ERR_LIB_EC, EC_R_CURVE_DOES_NOT_SUPPORT_ECDH);
@@ -47,7 +47,7 @@ int ossl_ecdh_compute_key(unsigned char **psec, size_t *pseclen,
* (ECC CDH) Primitive:". The steps listed below refer to SP800-56A.
*/
int ossl_ecdh_simple_compute_key(unsigned char **pout, size_t *poutlen,
- const EC_POINT *pub_key, const EC_KEY *ecdh)
+ const EC_POINT *pub_key, const EC_KEY *ecdh)
{
BN_CTX *ctx;
EC_POINT *tmp = NULL;
@@ -136,7 +136,7 @@ int ossl_ecdh_simple_compute_key(unsigned char **pout, size_t *poutlen,
ret = 1;
- err:
+err:
/* Step(4) : Destroy all intermediate calculations */
BN_clear(x);
EC_POINT_clear_free(tmp);
diff --git a/crypto/ec/ecdsa_ossl.c b/crypto/ec/ecdsa_ossl.c
index b3c3c2ff06..ad5b16df83 100644
--- a/crypto/ec/ecdsa_ossl.c
+++ b/crypto/ec/ecdsa_ossl.c
@@ -31,13 +31,13 @@
#define MAX_ECDSA_SIGN_RETRIES 8
static int ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in,
- BIGNUM **kinvp, BIGNUM **rp,
- const unsigned char *dgst, int dlen,
- unsigned int nonce_type, const char *digestname,
- OSSL_LIB_CTX *libctx, const char *propq);
+ BIGNUM **kinvp, BIGNUM **rp,
+ const unsigned char *dgst, int dlen,
+ unsigned int nonce_type, const char *digestname,
+ OSSL_LIB_CTX *libctx, const char *propq);
int ossl_ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, BIGNUM **kinvp,
- BIGNUM **rp)
+ BIGNUM **rp)
{
if (eckey->group->meth->ecdsa_sign_setup == NULL) {
ERR_raise(ERR_LIB_EC, EC_R_CURVE_DOES_NOT_SUPPORT_ECDSA);
@@ -48,8 +48,8 @@ int ossl_ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, BIGNUM **kinvp,
}
ECDSA_SIG *ossl_ecdsa_sign_sig(const unsigned char *dgst, int dgst_len,
- const BIGNUM *in_kinv, const BIGNUM *in_r,
- EC_KEY *eckey)
+ const BIGNUM *in_kinv, const BIGNUM *in_r,
+ EC_KEY *eckey)
{
if (eckey->group->meth->ecdsa_sign_sig == NULL) {
ERR_raise(ERR_LIB_EC, EC_R_CURVE_DOES_NOT_SUPPORT_ECDSA);
@@ -57,11 +57,11 @@ ECDSA_SIG *ossl_ecdsa_sign_sig(const unsigned char *dgst, int dgst_len,
}
return eckey->group->meth->ecdsa_sign_sig(dgst, dgst_len,
- in_kinv, in_r, eckey);
+ in_kinv, in_r, eckey);
}
int ossl_ecdsa_verify_sig(const unsigned char *dgst, int dgst_len,
- const ECDSA_SIG *sig, EC_KEY *eckey)
+ const ECDSA_SIG *sig, EC_KEY *eckey)
{
if (eckey->group->meth->ecdsa_verify_sig == NULL) {
ERR_raise(ERR_LIB_EC, EC_R_CURVE_DOES_NOT_SUPPORT_ECDSA);
@@ -72,8 +72,8 @@ int ossl_ecdsa_verify_sig(const unsigned char *dgst, int dgst_len,
}
int ossl_ecdsa_sign(int type, const unsigned char *dgst, int dlen,
- unsigned char *sig, unsigned int *siglen,
- const BIGNUM *kinv, const BIGNUM *r, EC_KEY *eckey)
+ unsigned char *sig, unsigned int *siglen,
+ const BIGNUM *kinv, const BIGNUM *r, EC_KEY *eckey)
{
ECDSA_SIG *s;
@@ -93,10 +93,10 @@ int ossl_ecdsa_sign(int type, const unsigned char *dgst, int dlen,
}
int ossl_ecdsa_deterministic_sign(const unsigned char *dgst, int dlen,
- unsigned char *sig, unsigned int *siglen,
- EC_KEY *eckey, unsigned int nonce_type,
- const char *digestname,
- OSSL_LIB_CTX *libctx, const char *propq)
+ unsigned char *sig, unsigned int *siglen,
+ EC_KEY *eckey, unsigned int nonce_type,
+ const char *digestname,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
ECDSA_SIG *s;
BIGNUM *kinv = NULL, *r = NULL;
@@ -113,7 +113,7 @@ int ossl_ecdsa_deterministic_sign(const unsigned char *dgst, int dlen,
*siglen = 0;
if (!ecdsa_sign_setup(eckey, NULL, &kinv, &r, dgst, dlen,
- nonce_type, digestname, libctx, propq))
+ nonce_type, digestname, libctx, propq))
return 0;
s = ECDSA_do_sign_ex(dgst, dlen, kinv, r, eckey);
@@ -130,10 +130,10 @@ end:
}
static int ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in,
- BIGNUM **kinvp, BIGNUM **rp,
- const unsigned char *dgst, int dlen,
- unsigned int nonce_type, const char *digestname,
- OSSL_LIB_CTX *libctx, const char *propq)
+ BIGNUM **kinvp, BIGNUM **rp,
+ const unsigned char *dgst, int dlen,
+ unsigned int nonce_type, const char *digestname,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
BN_CTX *ctx = NULL;
BIGNUM *k = NULL, *r = NULL, *X = NULL;
@@ -165,8 +165,8 @@ static int ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in,
}
}
- k = BN_secure_new(); /* this value is later returned in *kinvp */
- r = BN_new(); /* this value is later returned in *rp */
+ k = BN_secure_new(); /* this value is later returned in *kinvp */
+ r = BN_new(); /* this value is later returned in *rp */
X = BN_new();
if (k == NULL || r == NULL || X == NULL) {
ERR_raise(ERR_LIB_EC, ERR_R_BN_LIB);
@@ -199,13 +199,13 @@ static int ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in,
if (dgst != NULL) {
if (nonce_type == 1) {
res = ossl_gen_deterministic_nonce_rfc6979(k, order,
- priv_key,
- dgst, dlen,
- digestname,
- libctx, propq);
+ priv_key,
+ dgst, dlen,
+ digestname,
+ libctx, propq);
} else {
res = ossl_bn_gen_dsa_nonce_fixed_top(k, order, priv_key,
- dgst, dlen, ctx);
+ dgst, dlen, ctx);
}
} else {
res = ossl_bn_priv_rand_range_fixed_top(k, order, 0, ctx);
@@ -246,7 +246,7 @@ static int ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in,
*rp = r;
*kinvp = k;
ret = 1;
- err:
+err:
if (!ret) {
BN_clear_free(k);
BN_clear_free(r);
@@ -259,15 +259,15 @@ static int ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in,
}
int ossl_ecdsa_simple_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, BIGNUM **kinvp,
- BIGNUM **rp)
+ BIGNUM **rp)
{
return ecdsa_sign_setup(eckey, ctx_in, kinvp, rp, NULL, 0,
- 0, NULL, NULL, NULL);
+ 0, NULL, NULL, NULL);
}
ECDSA_SIG *ossl_ecdsa_simple_sign_sig(const unsigned char *dgst, int dgst_len,
- const BIGNUM *in_kinv, const BIGNUM *in_r,
- EC_KEY *eckey)
+ const BIGNUM *in_kinv, const BIGNUM *in_r,
+ EC_KEY *eckey)
{
int ok = 0, i;
int retries = 0;
@@ -337,7 +337,7 @@ ECDSA_SIG *ossl_ecdsa_simple_sign_sig(const unsigned char *dgst, int dgst_len,
do {
if (in_kinv == NULL || in_r == NULL) {
if (!ecdsa_sign_setup(eckey, ctx, &kinv, &ret->r, dgst, dgst_len,
- 0, NULL, NULL, NULL)) {
+ 0, NULL, NULL, NULL)) {
ERR_raise(ERR_LIB_EC, ERR_R_ECDSA_LIB);
goto err;
}
@@ -397,7 +397,7 @@ ECDSA_SIG *ossl_ecdsa_simple_sign_sig(const unsigned char *dgst, int dgst_len,
} while (1);
ok = 1;
- err:
+err:
if (!ok) {
ECDSA_SIG_free(ret);
ret = NULL;
@@ -415,7 +415,7 @@ ECDSA_SIG *ossl_ecdsa_simple_sign_sig(const unsigned char *dgst, int dgst_len,
* -1: error
*/
int ossl_ecdsa_verify(int type, const unsigned char *dgst, int dgst_len,
- const unsigned char *sigbuf, int sig_len, EC_KEY *eckey)
+ const unsigned char *sigbuf, int sig_len, EC_KEY *eckey)
{
ECDSA_SIG *s;
const unsigned char *p = sigbuf;
@@ -433,14 +433,14 @@ int ossl_ecdsa_verify(int type, const unsigned char *dgst, int dgst_len,
if (derlen != sig_len || memcmp(sigbuf, der, derlen) != 0)
goto err;
ret = ECDSA_do_verify(dgst, dgst_len, s, eckey);
- err:
+err:
OPENSSL_free(der);
ECDSA_SIG_free(s);
return ret;
}
int ossl_ecdsa_simple_verify_sig(const unsigned char *dgst, int dgst_len,
- const ECDSA_SIG *sig, EC_KEY *eckey)
+ const ECDSA_SIG *sig, EC_KEY *eckey)
{
int ret = -1, i;
BN_CTX *ctx;
@@ -451,8 +451,7 @@ int ossl_ecdsa_simple_verify_sig(const unsigned char *dgst, int dgst_len,
const EC_POINT *pub_key;
/* check input values */
- if (eckey == NULL || (group = EC_KEY_get0_group(eckey)) == NULL ||
- (pub_key = EC_KEY_get0_public_key(eckey)) == NULL || sig == NULL) {
+ if (eckey == NULL || (group = EC_KEY_get0_group(eckey)) == NULL || (pub_key = EC_KEY_get0_public_key(eckey)) == NULL || sig == NULL) {
ERR_raise(ERR_LIB_EC, EC_R_MISSING_PARAMETERS);
return -1;
}
@@ -483,11 +482,9 @@ int ossl_ecdsa_simple_verify_sig(const unsigned char *dgst, int dgst_len,
goto err;
}
- if (BN_is_zero(sig->r) || BN_is_negative(sig->r) ||
- BN_ucmp(sig->r, order) >= 0 || BN_is_zero(sig->s) ||
- BN_is_negative(sig->s) || BN_ucmp(sig->s, order) >= 0) {
+ if (BN_is_zero(sig->r) || BN_is_negative(sig->r) || BN_ucmp(sig->r, order) >= 0 || BN_is_zero(sig->s) || BN_is_negative(sig->s) || BN_ucmp(sig->s, order) >= 0) {
ERR_raise(ERR_LIB_EC, EC_R_BAD_SIGNATURE);
- ret = 0; /* signature is invalid */
+ ret = 0; /* signature is invalid */
goto err;
}
/* calculate tmp1 = inv(S) mod order */
@@ -542,7 +539,7 @@ int ossl_ecdsa_simple_verify_sig(const unsigned char *dgst, int dgst_len,
}
/* if the signature is correct u1 is equal to sig->r */
ret = (BN_ucmp(u1, sig->r) == 0);
- err:
+err:
BN_CTX_end(ctx);
BN_CTX_free(ctx);
EC_POINT_free(point);
diff --git a/crypto/ec/ecdsa_sign.c b/crypto/ec/ecdsa_sign.c
index 0c0748c84f..eef5412944 100644
--- a/crypto/ec/ecdsa_sign.c
+++ b/crypto/ec/ecdsa_sign.c
@@ -23,8 +23,8 @@ ECDSA_SIG *ECDSA_do_sign(const unsigned char *dgst, int dlen, EC_KEY *eckey)
}
ECDSA_SIG *ECDSA_do_sign_ex(const unsigned char *dgst, int dlen,
- const BIGNUM *kinv, const BIGNUM *rp,
- EC_KEY *eckey)
+ const BIGNUM *kinv, const BIGNUM *rp,
+ EC_KEY *eckey)
{
if (eckey->meth->sign_sig != NULL)
return eckey->meth->sign_sig(dgst, dlen, kinv, rp, eckey);
@@ -32,15 +32,14 @@ ECDSA_SIG *ECDSA_do_sign_ex(const unsigned char *dgst, int dlen,
return NULL;
}
-int ECDSA_sign(int type, const unsigned char *dgst, int dlen, unsigned char
- *sig, unsigned int *siglen, EC_KEY *eckey)
+int ECDSA_sign(int type, const unsigned char *dgst, int dlen, unsigned char *sig, unsigned int *siglen, EC_KEY *eckey)
{
return ECDSA_sign_ex(type, dgst, dlen, sig, siglen, NULL, NULL, eckey);
}
int ECDSA_sign_ex(int type, const unsigned char *dgst, int dlen,
- unsigned char *sig, unsigned int *siglen, const BIGNUM *kinv,
- const BIGNUM *r, EC_KEY *eckey)
+ unsigned char *sig, unsigned int *siglen, const BIGNUM *kinv,
+ const BIGNUM *r, EC_KEY *eckey)
{
if (eckey->meth->sign != NULL)
return eckey->meth->sign(type, dgst, dlen, sig, siglen, kinv, r, eckey);
@@ -49,7 +48,7 @@ int ECDSA_sign_ex(int type, const unsigned char *dgst, int dlen,
}
int ECDSA_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, BIGNUM **kinvp,
- BIGNUM **rp)
+ BIGNUM **rp)
{
if (eckey->meth->sign_setup != NULL)
return eckey->meth->sign_setup(eckey, ctx_in, kinvp, rp);
diff --git a/crypto/ec/ecdsa_vrf.c b/crypto/ec/ecdsa_vrf.c
index c148ecdb7c..4a27b400d7 100644
--- a/crypto/ec/ecdsa_vrf.c
+++ b/crypto/ec/ecdsa_vrf.c
@@ -24,7 +24,7 @@
* -1: error
*/
int ECDSA_do_verify(const unsigned char *dgst, int dgst_len,
- const ECDSA_SIG *sig, EC_KEY *eckey)
+ const ECDSA_SIG *sig, EC_KEY *eckey)
{
if (eckey->meth->verify_sig != NULL)
return eckey->meth->verify_sig(dgst, dgst_len, sig, eckey);
@@ -39,11 +39,11 @@ int ECDSA_do_verify(const unsigned char *dgst, int dgst_len,
* -1: error
*/
int ECDSA_verify(int type, const unsigned char *dgst, int dgst_len,
- const unsigned char *sigbuf, int sig_len, EC_KEY *eckey)
+ const unsigned char *sigbuf, int sig_len, EC_KEY *eckey)
{
if (eckey->meth->verify != NULL)
return eckey->meth->verify(type, dgst, dgst_len, sigbuf, sig_len,
- eckey);
+ eckey);
ERR_raise(ERR_LIB_EC, EC_R_OPERATION_NOT_SUPPORTED);
return -1;
}
diff --git a/crypto/ec/eck_prn.c b/crypto/ec/eck_prn.c
index 616fbbce03..04c40bc429 100644
--- a/crypto/ec/eck_prn.c
+++ b/crypto/ec/eck_prn.c
@@ -17,7 +17,7 @@
#include <openssl/bn.h>
#ifndef OPENSSL_NO_DEPRECATED_3_0
-# ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_STDIO
int ECPKParameters_print_fp(FILE *fp, const EC_GROUP *x, int off)
{
BIO *b;
@@ -65,7 +65,7 @@ int ECParameters_print_fp(FILE *fp, const EC_KEY *x)
#endif /* OPENSSL_NO_STDIO */
static int print_bin(BIO *fp, const char *str, const unsigned char *num,
- size_t len, int off);
+ size_t len, int off);
int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off)
{
@@ -125,8 +125,7 @@ int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off)
if (tmp_nid == NID_X9_62_characteristic_two_field)
is_char_two = 1;
- if ((p = BN_new()) == NULL || (a = BN_new()) == NULL ||
- (b = BN_new()) == NULL) {
+ if ((p = BN_new()) == NULL || (a = BN_new()) == NULL || (b = BN_new()) == NULL) {
reason = ERR_R_BN_LIB;
goto err;
}
@@ -176,12 +175,12 @@ int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off)
goto err;
if (BIO_printf(bp, "Basis Type: %s\n",
- OBJ_nid2sn(basis_type)) <= 0)
+ OBJ_nid2sn(basis_type))
+ <= 0)
goto err;
/* print the polynomial */
- if ((p != NULL) && !ASN1_bn_print(bp, "Polynomial:", p, NULL,
- off))
+ if ((p != NULL) && !ASN1_bn_print(bp, "Polynomial:", p, NULL, off))
goto err;
} else {
if ((p != NULL) && !ASN1_bn_print(bp, "Prime:", p, NULL, off))
@@ -204,14 +203,13 @@ int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off)
if ((order != NULL) && !ASN1_bn_print(bp, "Order: ", order, NULL, off))
goto err;
- if ((cofactor != NULL) && !ASN1_bn_print(bp, "Cofactor: ", cofactor,
- NULL, off))
+ if ((cofactor != NULL) && !ASN1_bn_print(bp, "Cofactor: ", cofactor, NULL, off))
goto err;
if (seed && !print_bin(bp, "Seed:", seed, seed_len, off))
goto err;
}
ret = 1;
- err:
+err:
if (!ret)
ERR_raise(ERR_LIB_EC, reason);
BN_free(p);
@@ -223,7 +221,7 @@ int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off)
}
static int print_bin(BIO *fp, const char *name, const unsigned char *buf,
- size_t len, int off)
+ size_t len, int off)
{
size_t i;
char str[128 + 1 + 4];
@@ -250,8 +248,7 @@ static int print_bin(BIO *fp, const char *name, const unsigned char *buf,
if (BIO_write(fp, str, off + 1 + 4) <= 0)
return 0;
}
- if (BIO_printf(fp, "%02x%s", buf[i], ((i + 1) == len) ? "" : ":") <=
- 0)
+ if (BIO_printf(fp, "%02x%s", buf[i], ((i + 1) == len) ? "" : ":") <= 0)
return 0;
}
if (BIO_write(fp, "\n", 1) <= 0)
diff --git a/crypto/ec/ecp_mont.c b/crypto/ec/ecp_mont.c
index f0ef12621e..2ed4a6d6c4 100644
--- a/crypto/ec/ecp_mont.c
+++ b/crypto/ec/ecp_mont.c
@@ -48,12 +48,12 @@ const EC_METHOD *EC_GFp_mont_method(void)
ossl_ec_GFp_simple_cmp,
ossl_ec_GFp_simple_make_affine,
ossl_ec_GFp_simple_points_make_affine,
- 0 /* mul */ ,
- 0 /* precompute_mult */ ,
- 0 /* have_precompute_mult */ ,
+ 0 /* mul */,
+ 0 /* precompute_mult */,
+ 0 /* have_precompute_mult */,
ossl_ec_GFp_mont_field_mul,
ossl_ec_GFp_mont_field_sqr,
- 0 /* field_div */ ,
+ 0 /* field_div */,
ossl_ec_GFp_mont_field_inv,
ossl_ec_GFp_mont_field_encode,
ossl_ec_GFp_mont_field_decode,
@@ -133,15 +133,15 @@ int ossl_ec_GFp_mont_group_copy(EC_GROUP *dest, const EC_GROUP *src)
return 1;
- err:
+err:
BN_MONT_CTX_free(dest->field_data1);
dest->field_data1 = NULL;
return 0;
}
int ossl_ec_GFp_mont_group_set_curve(EC_GROUP *group, const BIGNUM *p,
- const BIGNUM *a, const BIGNUM *b,
- BN_CTX *ctx)
+ const BIGNUM *a, const BIGNUM *b,
+ BN_CTX *ctx)
{
BN_CTX *new_ctx = NULL;
BN_MONT_CTX *mont = NULL;
@@ -186,7 +186,7 @@ int ossl_ec_GFp_mont_group_set_curve(EC_GROUP *group, const BIGNUM *p,
group->field_data2 = NULL;
}
- err:
+err:
BN_free(one);
BN_CTX_free(new_ctx);
BN_MONT_CTX_free(mont);
@@ -194,7 +194,7 @@ int ossl_ec_GFp_mont_group_set_curve(EC_GROUP *group, const BIGNUM *p,
}
int ossl_ec_GFp_mont_field_mul(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a,
- const BIGNUM *b, BN_CTX *ctx)
+ const BIGNUM *b, BN_CTX *ctx)
{
if (group->field_data1 == NULL) {
ERR_raise(ERR_LIB_EC, EC_R_NOT_INITIALIZED);
@@ -205,7 +205,7 @@ int ossl_ec_GFp_mont_field_mul(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a
}
int ossl_ec_GFp_mont_field_sqr(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
if (group->field_data1 == NULL) {
ERR_raise(ERR_LIB_EC, EC_R_NOT_INITIALIZED);
@@ -221,7 +221,7 @@ int ossl_ec_GFp_mont_field_sqr(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a
* We have a Mont structure, so SCA hardening is FLT inversion.
*/
int ossl_ec_GFp_mont_field_inv(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
BIGNUM *e = NULL;
BN_CTX *new_ctx = NULL;
@@ -231,7 +231,7 @@ int ossl_ec_GFp_mont_field_inv(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a
return 0;
if (ctx == NULL
- && (ctx = new_ctx = BN_CTX_secure_new_ex(group->libctx)) == NULL)
+ && (ctx = new_ctx = BN_CTX_secure_new_ex(group->libctx)) == NULL)
return 0;
BN_CTX_start(ctx);
@@ -258,14 +258,14 @@ int ossl_ec_GFp_mont_field_inv(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a
ret = 1;
- err:
+err:
BN_CTX_end(ctx);
BN_CTX_free(new_ctx);
return ret;
}
int ossl_ec_GFp_mont_field_encode(const EC_GROUP *group, BIGNUM *r,
- const BIGNUM *a, BN_CTX *ctx)
+ const BIGNUM *a, BN_CTX *ctx)
{
if (group->field_data1 == NULL) {
ERR_raise(ERR_LIB_EC, EC_R_NOT_INITIALIZED);
@@ -276,7 +276,7 @@ int ossl_ec_GFp_mont_field_encode(const EC_GROUP *group, BIGNUM *r,
}
int ossl_ec_GFp_mont_field_decode(const EC_GROUP *group, BIGNUM *r,
- const BIGNUM *a, BN_CTX *ctx)
+ const BIGNUM *a, BN_CTX *ctx)
{
if (group->field_data1 == NULL) {
ERR_raise(ERR_LIB_EC, EC_R_NOT_INITIALIZED);
@@ -287,7 +287,7 @@ int ossl_ec_GFp_mont_field_decode(const EC_GROUP *group, BIGNUM *r,
}
int ossl_ec_GFp_mont_field_set_to_one(const EC_GROUP *group, BIGNUM *r,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
if (group->field_data2 == NULL) {
ERR_raise(ERR_LIB_EC, EC_R_NOT_INITIALIZED);
diff --git a/crypto/ec/ecp_nist.c b/crypto/ec/ecp_nist.c
index 3efd43e64c..9c6e38b407 100644
--- a/crypto/ec/ecp_nist.c
+++ b/crypto/ec/ecp_nist.c
@@ -50,16 +50,16 @@ const EC_METHOD *EC_GFp_nist_method(void)
ossl_ec_GFp_simple_cmp,
ossl_ec_GFp_simple_make_affine,
ossl_ec_GFp_simple_points_make_affine,
- 0 /* mul */ ,
- 0 /* precompute_mult */ ,
- 0 /* have_precompute_mult */ ,
+ 0 /* mul */,
+ 0 /* precompute_mult */,
+ 0 /* have_precompute_mult */,
ossl_ec_GFp_nist_field_mul,
ossl_ec_GFp_nist_field_sqr,
- 0 /* field_div */ ,
+ 0 /* field_div */,
ossl_ec_GFp_simple_field_inv,
- 0 /* field_encode */ ,
- 0 /* field_decode */ ,
- 0, /* field_set_to_one */
+ 0 /* field_encode */,
+ 0 /* field_decode */,
+ 0, /* field_set_to_one */
ossl_ec_key_simple_priv2oct,
ossl_ec_key_simple_oct2priv,
0, /* set private */
@@ -90,8 +90,8 @@ int ossl_ec_GFp_nist_group_copy(EC_GROUP *dest, const EC_GROUP *src)
}
int ossl_ec_GFp_nist_group_set_curve(EC_GROUP *group, const BIGNUM *p,
- const BIGNUM *a, const BIGNUM *b,
- BN_CTX *ctx)
+ const BIGNUM *a, const BIGNUM *b,
+ BN_CTX *ctx)
{
int ret = 0;
BN_CTX *new_ctx = NULL;
@@ -119,14 +119,14 @@ int ossl_ec_GFp_nist_group_set_curve(EC_GROUP *group, const BIGNUM *p,
ret = ossl_ec_GFp_simple_group_set_curve(group, p, a, b, ctx);
- err:
+err:
BN_CTX_end(ctx);
BN_CTX_free(new_ctx);
return ret;
}
int ossl_ec_GFp_nist_field_mul(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a,
- const BIGNUM *b, BN_CTX *ctx)
+ const BIGNUM *b, BN_CTX *ctx)
{
int ret = 0;
BN_CTX *ctx_new = NULL;
@@ -145,13 +145,13 @@ int ossl_ec_GFp_nist_field_mul(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a
goto err;
ret = 1;
- err:
+err:
BN_CTX_free(ctx_new);
return ret;
}
int ossl_ec_GFp_nist_field_sqr(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
int ret = 0;
BN_CTX *ctx_new = NULL;
@@ -170,7 +170,7 @@ int ossl_ec_GFp_nist_field_sqr(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a
goto err;
ret = 1;
- err:
+err:
BN_CTX_free(ctx_new);
return ret;
}
diff --git a/crypto/ec/ecp_nistp224.c b/crypto/ec/ecp_nistp224.c
index 2d0c501a8f..449417414a 100644
--- a/crypto/ec/ecp_nistp224.c
+++ b/crypto/ec/ecp_nistp224.c
@@ -46,7 +46,7 @@
#include "internal/numbers.h"
#ifndef INT128_MAX
-# error "Your compiler doesn't appear to support 128-bit integer types"
+#error "Your compiler doesn't appear to support 128-bit integer types"
#endif
typedef uint8_t u8;
@@ -87,21 +87,21 @@ typedef widelimb widefelem[7];
typedef u8 felem_bytearray[28];
static const felem_bytearray nistp224_curve_params[5] = {
- {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, /* p */
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01},
- {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, /* a */
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE},
- {0xB4, 0x05, 0x0A, 0x85, 0x0C, 0x04, 0xB3, 0xAB, 0xF5, 0x41, /* b */
- 0x32, 0x56, 0x50, 0x44, 0xB0, 0xB7, 0xD7, 0xBF, 0xD8, 0xBA,
- 0x27, 0x0B, 0x39, 0x43, 0x23, 0x55, 0xFF, 0xB4},
- {0xB7, 0x0E, 0x0C, 0xBD, 0x6B, 0xB4, 0xBF, 0x7F, 0x32, 0x13, /* x */
- 0x90, 0xB9, 0x4A, 0x03, 0xC1, 0xD3, 0x56, 0xC2, 0x11, 0x22,
- 0x34, 0x32, 0x80, 0xD6, 0x11, 0x5C, 0x1D, 0x21},
- {0xbd, 0x37, 0x63, 0x88, 0xb5, 0xf7, 0x23, 0xfb, 0x4c, 0x22, /* y */
- 0xdf, 0xe6, 0xcd, 0x43, 0x75, 0xa0, 0x5a, 0x07, 0x47, 0x64,
- 0x44, 0xd5, 0x81, 0x99, 0x85, 0x00, 0x7e, 0x34}
+ { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, /* p */
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 },
+ { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, /* a */
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE },
+ { 0xB4, 0x05, 0x0A, 0x85, 0x0C, 0x04, 0xB3, 0xAB, 0xF5, 0x41, /* b */
+ 0x32, 0x56, 0x50, 0x44, 0xB0, 0xB7, 0xD7, 0xBF, 0xD8, 0xBA,
+ 0x27, 0x0B, 0x39, 0x43, 0x23, 0x55, 0xFF, 0xB4 },
+ { 0xB7, 0x0E, 0x0C, 0xBD, 0x6B, 0xB4, 0xBF, 0x7F, 0x32, 0x13, /* x */
+ 0x90, 0xB9, 0x4A, 0x03, 0xC1, 0xD3, 0x56, 0xC2, 0x11, 0x22,
+ 0x34, 0x32, 0x80, 0xD6, 0x11, 0x5C, 0x1D, 0x21 },
+ { 0xbd, 0x37, 0x63, 0x88, 0xb5, 0xf7, 0x23, 0xfb, 0x4c, 0x22, /* y */
+ 0xdf, 0xe6, 0xcd, 0x43, 0x75, 0xa0, 0x5a, 0x07, 0x47, 0x64,
+ 0x44, 0xd5, 0x81, 0x99, 0x85, 0x00, 0x7e, 0x34 }
};
/*-
@@ -136,102 +136,102 @@ static const felem_bytearray nistp224_curve_params[5] = {
* and then another four locations using the second 16 elements.
*/
static const felem gmul[2][16][3] = {
-{{{0, 0, 0, 0},
- {0, 0, 0, 0},
- {0, 0, 0, 0}},
- {{0x3280d6115c1d21, 0xc1d356c2112234, 0x7f321390b94a03, 0xb70e0cbd6bb4bf},
- {0xd5819985007e34, 0x75a05a07476444, 0xfb4c22dfe6cd43, 0xbd376388b5f723},
- {1, 0, 0, 0}},
- {{0xfd9675666ebbe9, 0xbca7664d40ce5e, 0x2242df8d8a2a43, 0x1f49bbb0f99bc5},
- {0x29e0b892dc9c43, 0xece8608436e662, 0xdc858f185310d0, 0x9812dd4eb8d321},
- {1, 0, 0, 0}},
- {{0x6d3e678d5d8eb8, 0x559eed1cb362f1, 0x16e9a3bbce8a3f, 0xeedcccd8c2a748},
- {0xf19f90ed50266d, 0xabf2b4bf65f9df, 0x313865468fafec, 0x5cb379ba910a17},
- {1, 0, 0, 0}},
- {{0x0641966cab26e3, 0x91fb2991fab0a0, 0xefec27a4e13a0b, 0x0499aa8a5f8ebe},
- {0x7510407766af5d, 0x84d929610d5450, 0x81d77aae82f706, 0x6916f6d4338c5b},
- {1, 0, 0, 0}},
- {{0xea95ac3b1f15c6, 0x086000905e82d4, 0xdd323ae4d1c8b1, 0x932b56be7685a3},
- {0x9ef93dea25dbbf, 0x41665960f390f0, 0xfdec76dbe2a8a7, 0x523e80f019062a},
- {1, 0, 0, 0}},
- {{0x822fdd26732c73, 0xa01c83531b5d0f, 0x363f37347c1ba4, 0xc391b45c84725c},
- {0xbbd5e1b2d6ad24, 0xddfbcde19dfaec, 0xc393da7e222a7f, 0x1efb7890ede244},
- {1, 0, 0, 0}},
- {{0x4c9e90ca217da1, 0xd11beca79159bb, 0xff8d33c2c98b7c, 0x2610b39409f849},
- {0x44d1352ac64da0, 0xcdbb7b2c46b4fb, 0x966c079b753c89, 0xfe67e4e820b112},
- {1, 0, 0, 0}},
- {{0xe28cae2df5312d, 0xc71b61d16f5c6e, 0x79b7619a3e7c4c, 0x05c73240899b47},
- {0x9f7f6382c73e3a, 0x18615165c56bda, 0x641fab2116fd56, 0x72855882b08394},
- {1, 0, 0, 0}},
- {{0x0469182f161c09, 0x74a98ca8d00fb5, 0xb89da93489a3e0, 0x41c98768fb0c1d},
- {0xe5ea05fb32da81, 0x3dce9ffbca6855, 0x1cfe2d3fbf59e6, 0x0e5e03408738a7},
- {1, 0, 0, 0}},
- {{0xdab22b2333e87f, 0x4430137a5dd2f6, 0xe03ab9f738beb8, 0xcb0c5d0dc34f24},
- {0x764a7df0c8fda5, 0x185ba5c3fa2044, 0x9281d688bcbe50, 0xc40331df893881},
- {1, 0, 0, 0}},
- {{0xb89530796f0f60, 0xade92bd26909a3, 0x1a0c83fb4884da, 0x1765bf22a5a984},
- {0x772a9ee75db09e, 0x23bc6c67cec16f, 0x4c1edba8b14e2f, 0xe2a215d9611369},
- {1, 0, 0, 0}},
- {{0x571e509fb5efb3, 0xade88696410552, 0xc8ae85fada74fe, 0x6c7e4be83bbde3},
- {0xff9f51160f4652, 0xb47ce2495a6539, 0xa2946c53b582f4, 0x286d2db3ee9a60},
- {1, 0, 0, 0}},
- {{0x40bbd5081a44af, 0x0995183b13926c, 0xbcefba6f47f6d0, 0x215619e9cc0057},
- {0x8bc94d3b0df45e, 0xf11c54a3694f6f, 0x8631b93cdfe8b5, 0xe7e3f4b0982db9},
- {1, 0, 0, 0}},
- {{0xb17048ab3e1c7b, 0xac38f36ff8a1d8, 0x1c29819435d2c6, 0xc813132f4c07e9},
- {0x2891425503b11f, 0x08781030579fea, 0xf5426ba5cc9674, 0x1e28ebf18562bc},
- {1, 0, 0, 0}},
- {{0x9f31997cc864eb, 0x06cd91d28b5e4c, 0xff17036691a973, 0xf1aef351497c58},
- {0xdd1f2d600564ff, 0xdead073b1402db, 0x74a684435bd693, 0xeea7471f962558},
- {1, 0, 0, 0}}},
-{{{0, 0, 0, 0},
- {0, 0, 0, 0},
- {0, 0, 0, 0}},
- {{0x9665266dddf554, 0x9613d78b60ef2d, 0xce27a34cdba417, 0xd35ab74d6afc31},
- {0x85ccdd22deb15e, 0x2137e5783a6aab, 0xa141cffd8c93c6, 0x355a1830e90f2d},
- {1, 0, 0, 0}},
- {{0x1a494eadaade65, 0xd6da4da77fe53c, 0xe7992996abec86, 0x65c3553c6090e3},
- {0xfa610b1fb09346, 0xf1c6540b8a4aaf, 0xc51a13ccd3cbab, 0x02995b1b18c28a},
- {1, 0, 0, 0}},
- {{0x7874568e7295ef, 0x86b419fbe38d04, 0xdc0690a7550d9a, 0xd3966a44beac33},
- {0x2b7280ec29132f, 0xbeaa3b6a032df3, 0xdc7dd88ae41200, 0xd25e2513e3a100},
- {1, 0, 0, 0}},
- {{0x924857eb2efafd, 0xac2bce41223190, 0x8edaa1445553fc, 0x825800fd3562d5},
- {0x8d79148ea96621, 0x23a01c3dd9ed8d, 0xaf8b219f9416b5, 0xd8db0cc277daea},
- {1, 0, 0, 0}},
- {{0x76a9c3b1a700f0, 0xe9acd29bc7e691, 0x69212d1a6b0327, 0x6322e97fe154be},
- {0x469fc5465d62aa, 0x8d41ed18883b05, 0x1f8eae66c52b88, 0xe4fcbe9325be51},
- {1, 0, 0, 0}},
- {{0x825fdf583cac16, 0x020b857c7b023a, 0x683c17744b0165, 0x14ffd0a2daf2f1},
- {0x323b36184218f9, 0x4944ec4e3b47d4, 0xc15b3080841acf, 0x0bced4b01a28bb},
- {1, 0, 0, 0}},
- {{0x92ac22230df5c4, 0x52f33b4063eda8, 0xcb3f19870c0c93, 0x40064f2ba65233},
- {0xfe16f0924f8992, 0x012da25af5b517, 0x1a57bb24f723a6, 0x06f8bc76760def},
- {1, 0, 0, 0}},
- {{0x4a7084f7817cb9, 0xbcab0738ee9a78, 0x3ec11e11d9c326, 0xdc0fe90e0f1aae},
- {0xcf639ea5f98390, 0x5c350aa22ffb74, 0x9afae98a4047b7, 0x956ec2d617fc45},
- {1, 0, 0, 0}},
- {{0x4306d648c1be6a, 0x9247cd8bc9a462, 0xf5595e377d2f2e, 0xbd1c3caff1a52e},
- {0x045e14472409d0, 0x29f3e17078f773, 0x745a602b2d4f7d, 0x191837685cdfbb},
- {1, 0, 0, 0}},
- {{0x5b6ee254a8cb79, 0x4953433f5e7026, 0xe21faeb1d1def4, 0xc4c225785c09de},
- {0x307ce7bba1e518, 0x31b125b1036db8, 0x47e91868839e8f, 0xc765866e33b9f3},
- {1, 0, 0, 0}},
- {{0x3bfece24f96906, 0x4794da641e5093, 0xde5df64f95db26, 0x297ecd89714b05},
- {0x701bd3ebb2c3aa, 0x7073b4f53cb1d5, 0x13c5665658af16, 0x9895089d66fe58},
- {1, 0, 0, 0}},
- {{0x0fef05f78c4790, 0x2d773633b05d2e, 0x94229c3a951c94, 0xbbbd70df4911bb},
- {0xb2c6963d2c1168, 0x105f47a72b0d73, 0x9fdf6111614080, 0x7b7e94b39e67b0},
- {1, 0, 0, 0}},
- {{0xad1a7d6efbe2b3, 0xf012482c0da69d, 0x6b3bdf12438345, 0x40d7558d7aa4d9},
- {0x8a09fffb5c6d3d, 0x9a356e5d9ffd38, 0x5973f15f4f9b1c, 0xdcd5f59f63c3ea},
- {1, 0, 0, 0}},
- {{0xacf39f4c5ca7ab, 0x4c8071cc5fd737, 0xc64e3602cd1184, 0x0acd4644c9abba},
- {0x6c011a36d8bf6e, 0xfecd87ba24e32a, 0x19f6f56574fad8, 0x050b204ced9405},
- {1, 0, 0, 0}},
- {{0xed4f1cae7d9a96, 0x5ceef7ad94c40a, 0x778e4a3bf3ef9b, 0x7405783dc3b55e},
- {0x32477c61b6e8c6, 0xb46a97570f018b, 0x91176d0a7e95d1, 0x3df90fbc4c7d0e},
- {1, 0, 0, 0}}}
+ { { { 0, 0, 0, 0 },
+ { 0, 0, 0, 0 },
+ { 0, 0, 0, 0 } },
+ { { 0x3280d6115c1d21, 0xc1d356c2112234, 0x7f321390b94a03, 0xb70e0cbd6bb4bf },
+ { 0xd5819985007e34, 0x75a05a07476444, 0xfb4c22dfe6cd43, 0xbd376388b5f723 },
+ { 1, 0, 0, 0 } },
+ { { 0xfd9675666ebbe9, 0xbca7664d40ce5e, 0x2242df8d8a2a43, 0x1f49bbb0f99bc5 },
+ { 0x29e0b892dc9c43, 0xece8608436e662, 0xdc858f185310d0, 0x9812dd4eb8d321 },
+ { 1, 0, 0, 0 } },
+ { { 0x6d3e678d5d8eb8, 0x559eed1cb362f1, 0x16e9a3bbce8a3f, 0xeedcccd8c2a748 },
+ { 0xf19f90ed50266d, 0xabf2b4bf65f9df, 0x313865468fafec, 0x5cb379ba910a17 },
+ { 1, 0, 0, 0 } },
+ { { 0x0641966cab26e3, 0x91fb2991fab0a0, 0xefec27a4e13a0b, 0x0499aa8a5f8ebe },
+ { 0x7510407766af5d, 0x84d929610d5450, 0x81d77aae82f706, 0x6916f6d4338c5b },
+ { 1, 0, 0, 0 } },
+ { { 0xea95ac3b1f15c6, 0x086000905e82d4, 0xdd323ae4d1c8b1, 0x932b56be7685a3 },
+ { 0x9ef93dea25dbbf, 0x41665960f390f0, 0xfdec76dbe2a8a7, 0x523e80f019062a },
+ { 1, 0, 0, 0 } },
+ { { 0x822fdd26732c73, 0xa01c83531b5d0f, 0x363f37347c1ba4, 0xc391b45c84725c },
+ { 0xbbd5e1b2d6ad24, 0xddfbcde19dfaec, 0xc393da7e222a7f, 0x1efb7890ede244 },
+ { 1, 0, 0, 0 } },
+ { { 0x4c9e90ca217da1, 0xd11beca79159bb, 0xff8d33c2c98b7c, 0x2610b39409f849 },
+ { 0x44d1352ac64da0, 0xcdbb7b2c46b4fb, 0x966c079b753c89, 0xfe67e4e820b112 },
+ { 1, 0, 0, 0 } },
+ { { 0xe28cae2df5312d, 0xc71b61d16f5c6e, 0x79b7619a3e7c4c, 0x05c73240899b47 },
+ { 0x9f7f6382c73e3a, 0x18615165c56bda, 0x641fab2116fd56, 0x72855882b08394 },
+ { 1, 0, 0, 0 } },
+ { { 0x0469182f161c09, 0x74a98ca8d00fb5, 0xb89da93489a3e0, 0x41c98768fb0c1d },
+ { 0xe5ea05fb32da81, 0x3dce9ffbca6855, 0x1cfe2d3fbf59e6, 0x0e5e03408738a7 },
+ { 1, 0, 0, 0 } },
+ { { 0xdab22b2333e87f, 0x4430137a5dd2f6, 0xe03ab9f738beb8, 0xcb0c5d0dc34f24 },
+ { 0x764a7df0c8fda5, 0x185ba5c3fa2044, 0x9281d688bcbe50, 0xc40331df893881 },
+ { 1, 0, 0, 0 } },
+ { { 0xb89530796f0f60, 0xade92bd26909a3, 0x1a0c83fb4884da, 0x1765bf22a5a984 },
+ { 0x772a9ee75db09e, 0x23bc6c67cec16f, 0x4c1edba8b14e2f, 0xe2a215d9611369 },
+ { 1, 0, 0, 0 } },
+ { { 0x571e509fb5efb3, 0xade88696410552, 0xc8ae85fada74fe, 0x6c7e4be83bbde3 },
+ { 0xff9f51160f4652, 0xb47ce2495a6539, 0xa2946c53b582f4, 0x286d2db3ee9a60 },
+ { 1, 0, 0, 0 } },
+ { { 0x40bbd5081a44af, 0x0995183b13926c, 0xbcefba6f47f6d0, 0x215619e9cc0057 },
+ { 0x8bc94d3b0df45e, 0xf11c54a3694f6f, 0x8631b93cdfe8b5, 0xe7e3f4b0982db9 },
+ { 1, 0, 0, 0 } },
+ { { 0xb17048ab3e1c7b, 0xac38f36ff8a1d8, 0x1c29819435d2c6, 0xc813132f4c07e9 },
+ { 0x2891425503b11f, 0x08781030579fea, 0xf5426ba5cc9674, 0x1e28ebf18562bc },
+ { 1, 0, 0, 0 } },
+ { { 0x9f31997cc864eb, 0x06cd91d28b5e4c, 0xff17036691a973, 0xf1aef351497c58 },
+ { 0xdd1f2d600564ff, 0xdead073b1402db, 0x74a684435bd693, 0xeea7471f962558 },
+ { 1, 0, 0, 0 } } },
+ { { { 0, 0, 0, 0 },
+ { 0, 0, 0, 0 },
+ { 0, 0, 0, 0 } },
+ { { 0x9665266dddf554, 0x9613d78b60ef2d, 0xce27a34cdba417, 0xd35ab74d6afc31 },
+ { 0x85ccdd22deb15e, 0x2137e5783a6aab, 0xa141cffd8c93c6, 0x355a1830e90f2d },
+ { 1, 0, 0, 0 } },
+ { { 0x1a494eadaade65, 0xd6da4da77fe53c, 0xe7992996abec86, 0x65c3553c6090e3 },
+ { 0xfa610b1fb09346, 0xf1c6540b8a4aaf, 0xc51a13ccd3cbab, 0x02995b1b18c28a },
+ { 1, 0, 0, 0 } },
+ { { 0x7874568e7295ef, 0x86b419fbe38d04, 0xdc0690a7550d9a, 0xd3966a44beac33 },
+ { 0x2b7280ec29132f, 0xbeaa3b6a032df3, 0xdc7dd88ae41200, 0xd25e2513e3a100 },
+ { 1, 0, 0, 0 } },
+ { { 0x924857eb2efafd, 0xac2bce41223190, 0x8edaa1445553fc, 0x825800fd3562d5 },
+ { 0x8d79148ea96621, 0x23a01c3dd9ed8d, 0xaf8b219f9416b5, 0xd8db0cc277daea },
+ { 1, 0, 0, 0 } },
+ { { 0x76a9c3b1a700f0, 0xe9acd29bc7e691, 0x69212d1a6b0327, 0x6322e97fe154be },
+ { 0x469fc5465d62aa, 0x8d41ed18883b05, 0x1f8eae66c52b88, 0xe4fcbe9325be51 },
+ { 1, 0, 0, 0 } },
+ { { 0x825fdf583cac16, 0x020b857c7b023a, 0x683c17744b0165, 0x14ffd0a2daf2f1 },
+ { 0x323b36184218f9, 0x4944ec4e3b47d4, 0xc15b3080841acf, 0x0bced4b01a28bb },
+ { 1, 0, 0, 0 } },
+ { { 0x92ac22230df5c4, 0x52f33b4063eda8, 0xcb3f19870c0c93, 0x40064f2ba65233 },
+ { 0xfe16f0924f8992, 0x012da25af5b517, 0x1a57bb24f723a6, 0x06f8bc76760def },
+ { 1, 0, 0, 0 } },
+ { { 0x4a7084f7817cb9, 0xbcab0738ee9a78, 0x3ec11e11d9c326, 0xdc0fe90e0f1aae },
+ { 0xcf639ea5f98390, 0x5c350aa22ffb74, 0x9afae98a4047b7, 0x956ec2d617fc45 },
+ { 1, 0, 0, 0 } },
+ { { 0x4306d648c1be6a, 0x9247cd8bc9a462, 0xf5595e377d2f2e, 0xbd1c3caff1a52e },
+ { 0x045e14472409d0, 0x29f3e17078f773, 0x745a602b2d4f7d, 0x191837685cdfbb },
+ { 1, 0, 0, 0 } },
+ { { 0x5b6ee254a8cb79, 0x4953433f5e7026, 0xe21faeb1d1def4, 0xc4c225785c09de },
+ { 0x307ce7bba1e518, 0x31b125b1036db8, 0x47e91868839e8f, 0xc765866e33b9f3 },
+ { 1, 0, 0, 0 } },
+ { { 0x3bfece24f96906, 0x4794da641e5093, 0xde5df64f95db26, 0x297ecd89714b05 },
+ { 0x701bd3ebb2c3aa, 0x7073b4f53cb1d5, 0x13c5665658af16, 0x9895089d66fe58 },
+ { 1, 0, 0, 0 } },
+ { { 0x0fef05f78c4790, 0x2d773633b05d2e, 0x94229c3a951c94, 0xbbbd70df4911bb },
+ { 0xb2c6963d2c1168, 0x105f47a72b0d73, 0x9fdf6111614080, 0x7b7e94b39e67b0 },
+ { 1, 0, 0, 0 } },
+ { { 0xad1a7d6efbe2b3, 0xf012482c0da69d, 0x6b3bdf12438345, 0x40d7558d7aa4d9 },
+ { 0x8a09fffb5c6d3d, 0x9a356e5d9ffd38, 0x5973f15f4f9b1c, 0xdcd5f59f63c3ea },
+ { 1, 0, 0, 0 } },
+ { { 0xacf39f4c5ca7ab, 0x4c8071cc5fd737, 0xc64e3602cd1184, 0x0acd4644c9abba },
+ { 0x6c011a36d8bf6e, 0xfecd87ba24e32a, 0x19f6f56574fad8, 0x050b204ced9405 },
+ { 1, 0, 0, 0 } },
+ { { 0xed4f1cae7d9a96, 0x5ceef7ad94c40a, 0x778e4a3bf3ef9b, 0x7405783dc3b55e },
+ { 0x32477c61b6e8c6, 0xb46a97570f018b, 0x91176d0a7e95d1, 0x3df90fbc4c7d0e },
+ { 1, 0, 0, 0 } } }
};
/* Precomputation for the group generator. */
@@ -261,9 +261,9 @@ const EC_METHOD *EC_GFp_nistp224_method(void)
ossl_ec_GFp_simple_point_set_to_infinity,
ossl_ec_GFp_simple_point_set_affine_coordinates,
ossl_ec_GFp_nistp224_point_get_affine_coordinates,
- 0 /* point_set_compressed_coordinates */ ,
- 0 /* point2oct */ ,
- 0 /* oct2point */ ,
+ 0 /* point_set_compressed_coordinates */,
+ 0 /* point2oct */,
+ 0 /* oct2point */,
ossl_ec_GFp_simple_add,
ossl_ec_GFp_simple_dbl,
ossl_ec_GFp_simple_invert,
@@ -277,11 +277,11 @@ const EC_METHOD *EC_GFp_nistp224_method(void)
ossl_ec_GFp_nistp224_have_precompute_mult,
ossl_ec_GFp_nist_field_mul,
ossl_ec_GFp_nist_field_sqr,
- 0 /* field_div */ ,
+ 0 /* field_div */,
ossl_ec_GFp_simple_field_inv,
- 0 /* field_encode */ ,
- 0 /* field_decode */ ,
- 0, /* field_set_to_one */
+ 0 /* field_encode */,
+ 0 /* field_decode */,
+ 0, /* field_set_to_one */
ossl_ec_key_simple_priv2oct,
ossl_ec_key_simple_oct2priv,
0, /* set private */
@@ -298,7 +298,7 @@ const EC_METHOD *EC_GFp_nistp224_method(void)
0, /* blind_coordinates */
0, /* ladder_pre */
0, /* ladder_step */
- 0 /* ladder_post */
+ 0 /* ladder_post */
};
return &ret;
@@ -393,10 +393,9 @@ static void felem_sum(felem out, const felem in)
/* Assumes in[i] < 2^57 */
static void felem_diff(felem out, const felem in)
{
- static const limb two58p2 = (((limb) 1) << 58) + (((limb) 1) << 2);
- static const limb two58m2 = (((limb) 1) << 58) - (((limb) 1) << 2);
- static const limb two58m42m2 = (((limb) 1) << 58) -
- (((limb) 1) << 42) - (((limb) 1) << 2);
+ static const limb two58p2 = (((limb)1) << 58) + (((limb)1) << 2);
+ static const limb two58m2 = (((limb)1) << 58) - (((limb)1) << 2);
+ static const limb two58m42m2 = (((limb)1) << 58) - (((limb)1) << 42) - (((limb)1) << 2);
/* Add 0 mod 2^224-2^96+1 to ensure out > in */
out[0] += two58p2;
@@ -414,11 +413,9 @@ static void felem_diff(felem out, const felem in)
/* Assumes in[i] < 2^119 */
static void widefelem_diff(widefelem out, const widefelem in)
{
- static const widelimb two120 = ((widelimb) 1) << 120;
- static const widelimb two120m64 = (((widelimb) 1) << 120) -
- (((widelimb) 1) << 64);
- static const widelimb two120m104m64 = (((widelimb) 1) << 120) -
- (((widelimb) 1) << 104) - (((widelimb) 1) << 64);
+ static const widelimb two120 = ((widelimb)1) << 120;
+ static const widelimb two120m64 = (((widelimb)1) << 120) - (((widelimb)1) << 64);
+ static const widelimb two120m104m64 = (((widelimb)1) << 120) - (((widelimb)1) << 104) - (((widelimb)1) << 64);
/* Add 0 mod 2^224-2^96+1 to ensure out > in */
out[0] += two120;
@@ -442,12 +439,9 @@ static void widefelem_diff(widefelem out, const widefelem in)
/* in[i] < 2^63 */
static void felem_diff_128_64(widefelem out, const felem in)
{
- static const widelimb two64p8 = (((widelimb) 1) << 64) +
- (((widelimb) 1) << 8);
- static const widelimb two64m8 = (((widelimb) 1) << 64) -
- (((widelimb) 1) << 8);
- static const widelimb two64m48m8 = (((widelimb) 1) << 64) -
- (((widelimb) 1) << 48) - (((widelimb) 1) << 8);
+ static const widelimb two64p8 = (((widelimb)1) << 64) + (((widelimb)1) << 8);
+ static const widelimb two64m8 = (((widelimb)1) << 64) - (((widelimb)1) << 8);
+ static const widelimb two64m48m8 = (((widelimb)1) << 64) - (((widelimb)1) << 48) - (((widelimb)1) << 8);
/* Add 0 mod 2^224-2^96+1 to ensure out > in */
out[0] += two64p8;
@@ -495,28 +489,25 @@ static void felem_square(widefelem out, const felem in)
tmp0 = 2 * in[0];
tmp1 = 2 * in[1];
tmp2 = 2 * in[2];
- out[0] = ((widelimb) in[0]) * in[0];
- out[1] = ((widelimb) in[0]) * tmp1;
- out[2] = ((widelimb) in[0]) * tmp2 + ((widelimb) in[1]) * in[1];
- out[3] = ((widelimb) in[3]) * tmp0 + ((widelimb) in[1]) * tmp2;
- out[4] = ((widelimb) in[3]) * tmp1 + ((widelimb) in[2]) * in[2];
- out[5] = ((widelimb) in[3]) * tmp2;
- out[6] = ((widelimb) in[3]) * in[3];
+ out[0] = ((widelimb)in[0]) * in[0];
+ out[1] = ((widelimb)in[0]) * tmp1;
+ out[2] = ((widelimb)in[0]) * tmp2 + ((widelimb)in[1]) * in[1];
+ out[3] = ((widelimb)in[3]) * tmp0 + ((widelimb)in[1]) * tmp2;
+ out[4] = ((widelimb)in[3]) * tmp1 + ((widelimb)in[2]) * in[2];
+ out[5] = ((widelimb)in[3]) * tmp2;
+ out[6] = ((widelimb)in[3]) * in[3];
}
/* Multiply two field elements: out = in1 * in2 */
static void felem_mul(widefelem out, const felem in1, const felem in2)
{
- out[0] = ((widelimb) in1[0]) * in2[0];
- out[1] = ((widelimb) in1[0]) * in2[1] + ((widelimb) in1[1]) * in2[0];
- out[2] = ((widelimb) in1[0]) * in2[2] + ((widelimb) in1[1]) * in2[1] +
- ((widelimb) in1[2]) * in2[0];
- out[3] = ((widelimb) in1[0]) * in2[3] + ((widelimb) in1[1]) * in2[2] +
- ((widelimb) in1[2]) * in2[1] + ((widelimb) in1[3]) * in2[0];
- out[4] = ((widelimb) in1[1]) * in2[3] + ((widelimb) in1[2]) * in2[2] +
- ((widelimb) in1[3]) * in2[1];
- out[5] = ((widelimb) in1[2]) * in2[3] + ((widelimb) in1[3]) * in2[2];
- out[6] = ((widelimb) in1[3]) * in2[3];
+ out[0] = ((widelimb)in1[0]) * in2[0];
+ out[1] = ((widelimb)in1[0]) * in2[1] + ((widelimb)in1[1]) * in2[0];
+ out[2] = ((widelimb)in1[0]) * in2[2] + ((widelimb)in1[1]) * in2[1] + ((widelimb)in1[2]) * in2[0];
+ out[3] = ((widelimb)in1[0]) * in2[3] + ((widelimb)in1[1]) * in2[2] + ((widelimb)in1[2]) * in2[1] + ((widelimb)in1[3]) * in2[0];
+ out[4] = ((widelimb)in1[1]) * in2[3] + ((widelimb)in1[2]) * in2[2] + ((widelimb)in1[3]) * in2[1];
+ out[5] = ((widelimb)in1[2]) * in2[3] + ((widelimb)in1[3]) * in2[2];
+ out[6] = ((widelimb)in1[3]) * in2[3];
}
/*-
@@ -525,12 +516,9 @@ static void felem_mul(widefelem out, const felem in1, const felem in2)
* ensures out[0] < 2^56, out[1] < 2^56, out[2] < 2^56, out[3] <= 2^56 + 2^16 */
static void felem_reduce(felem out, const widefelem in)
{
- static const widelimb two127p15 = (((widelimb) 1) << 127) +
- (((widelimb) 1) << 15);
- static const widelimb two127m71 = (((widelimb) 1) << 127) -
- (((widelimb) 1) << 71);
- static const widelimb two127m71m55 = (((widelimb) 1) << 127) -
- (((widelimb) 1) << 71) - (((widelimb) 1) << 55);
+ static const widelimb two127p15 = (((widelimb)1) << 127) + (((widelimb)1) << 15);
+ static const widelimb two127m71 = (((widelimb)1) << 127) - (((widelimb)1) << 71);
+ static const widelimb two127m71m55 = (((widelimb)1) << 127) - (((widelimb)1) << 71) - (((widelimb)1) << 55);
widelimb output[5];
/* Add 0 mod 2^224-2^96+1 to ensure all differences are positive */
@@ -607,7 +595,7 @@ static void felem_mul_reduce(felem out, const felem in1, const felem in2)
*/
static void felem_contract(felem out, const felem in)
{
- static const int64_t two56 = ((limb) 1) << 56;
+ static const int64_t two56 = ((limb)1) << 56;
/* 0 <= in < 2*p, p = 2^224 - 2^96 + 1 */
/* if in > p , reduce in = in - 2^224 + 2^96 - 1 */
int64_t tmp[4], a;
@@ -624,8 +612,7 @@ static void felem_contract(felem out, const felem in)
* Case 2: a = 0 iff p <= in < 2^224, i.e., the high 128 bits are all 1
* and the lower part is non-zero
*/
- a = ((in[3] & in[2] & (in[1] | 0x000000ffffffffff)) + 1) |
- (((int64_t) (in[0] + (in[1] & 0x000000ffffffffff)) - 1) >> 63);
+ a = ((in[3] & in[2] & (in[1] | 0x000000ffffffffff)) + 1) | (((int64_t)(in[0] + (in[1] & 0x000000ffffffffff)) - 1) >> 63);
a &= 0x00ffffffffffffff;
/* turn a into an all-one mask (if a = 0) or an all-zero mask */
a = (a - 1) >> 63;
@@ -681,19 +668,19 @@ static limb felem_is_zero(const felem in)
limb zero, two224m96p1, two225m97p2;
zero = in[0] | in[1] | in[2] | in[3];
- zero = (((int64_t) (zero) - 1) >> 63) & 1;
+ zero = (((int64_t)(zero)-1) >> 63) & 1;
two224m96p1 = (in[0] ^ 1) | (in[1] ^ 0x00ffff0000000000)
| (in[2] ^ 0x00ffffffffffffff) | (in[3] ^ 0x00ffffffffffffff);
- two224m96p1 = (((int64_t) (two224m96p1) - 1) >> 63) & 1;
+ two224m96p1 = (((int64_t)(two224m96p1)-1) >> 63) & 1;
two225m97p2 = (in[0] ^ 2) | (in[1] ^ 0x00fffe0000000000)
| (in[2] ^ 0x00ffffffffffffff) | (in[3] ^ 0x01ffffffffffffff);
- two225m97p2 = (((int64_t) (two225m97p2) - 1) >> 63) & 1;
+ two225m97p2 = (((int64_t)(two225m97p2)-1) >> 63) & 1;
return (zero | two224m96p1 | two225m97p2);
}
static int felem_is_zero_int(const void *in)
{
- return (int)(felem_is_zero(in) & ((limb) 1));
+ return (int)(felem_is_zero(in) & ((limb)1));
}
/* Invert a field element */
@@ -705,77 +692,77 @@ static void felem_inv(felem out, const felem in)
unsigned i;
felem_square(tmp, in);
- felem_reduce(ftmp, tmp); /* 2 */
+ felem_reduce(ftmp, tmp); /* 2 */
felem_mul(tmp, in, ftmp);
- felem_reduce(ftmp, tmp); /* 2^2 - 1 */
+ felem_reduce(ftmp, tmp); /* 2^2 - 1 */
felem_square(tmp, ftmp);
- felem_reduce(ftmp, tmp); /* 2^3 - 2 */
+ felem_reduce(ftmp, tmp); /* 2^3 - 2 */
felem_mul(tmp, in, ftmp);
- felem_reduce(ftmp, tmp); /* 2^3 - 1 */
+ felem_reduce(ftmp, tmp); /* 2^3 - 1 */
felem_square(tmp, ftmp);
- felem_reduce(ftmp2, tmp); /* 2^4 - 2 */
+ felem_reduce(ftmp2, tmp); /* 2^4 - 2 */
felem_square(tmp, ftmp2);
- felem_reduce(ftmp2, tmp); /* 2^5 - 4 */
+ felem_reduce(ftmp2, tmp); /* 2^5 - 4 */
felem_square(tmp, ftmp2);
- felem_reduce(ftmp2, tmp); /* 2^6 - 8 */
+ felem_reduce(ftmp2, tmp); /* 2^6 - 8 */
felem_mul(tmp, ftmp2, ftmp);
- felem_reduce(ftmp, tmp); /* 2^6 - 1 */
+ felem_reduce(ftmp, tmp); /* 2^6 - 1 */
felem_square(tmp, ftmp);
- felem_reduce(ftmp2, tmp); /* 2^7 - 2 */
- for (i = 0; i < 5; ++i) { /* 2^12 - 2^6 */
+ felem_reduce(ftmp2, tmp); /* 2^7 - 2 */
+ for (i = 0; i < 5; ++i) { /* 2^12 - 2^6 */
felem_square(tmp, ftmp2);
felem_reduce(ftmp2, tmp);
}
felem_mul(tmp, ftmp2, ftmp);
- felem_reduce(ftmp2, tmp); /* 2^12 - 1 */
+ felem_reduce(ftmp2, tmp); /* 2^12 - 1 */
felem_square(tmp, ftmp2);
- felem_reduce(ftmp3, tmp); /* 2^13 - 2 */
- for (i = 0; i < 11; ++i) { /* 2^24 - 2^12 */
+ felem_reduce(ftmp3, tmp); /* 2^13 - 2 */
+ for (i = 0; i < 11; ++i) { /* 2^24 - 2^12 */
felem_square(tmp, ftmp3);
felem_reduce(ftmp3, tmp);
}
felem_mul(tmp, ftmp3, ftmp2);
- felem_reduce(ftmp2, tmp); /* 2^24 - 1 */
+ felem_reduce(ftmp2, tmp); /* 2^24 - 1 */
felem_square(tmp, ftmp2);
- felem_reduce(ftmp3, tmp); /* 2^25 - 2 */
- for (i = 0; i < 23; ++i) { /* 2^48 - 2^24 */
+ felem_reduce(ftmp3, tmp); /* 2^25 - 2 */
+ for (i = 0; i < 23; ++i) { /* 2^48 - 2^24 */
felem_square(tmp, ftmp3);
felem_reduce(ftmp3, tmp);
}
felem_mul(tmp, ftmp3, ftmp2);
- felem_reduce(ftmp3, tmp); /* 2^48 - 1 */
+ felem_reduce(ftmp3, tmp); /* 2^48 - 1 */
felem_square(tmp, ftmp3);
- felem_reduce(ftmp4, tmp); /* 2^49 - 2 */
- for (i = 0; i < 47; ++i) { /* 2^96 - 2^48 */
+ felem_reduce(ftmp4, tmp); /* 2^49 - 2 */
+ for (i = 0; i < 47; ++i) { /* 2^96 - 2^48 */
felem_square(tmp, ftmp4);
felem_reduce(ftmp4, tmp);
}
felem_mul(tmp, ftmp3, ftmp4);
- felem_reduce(ftmp3, tmp); /* 2^96 - 1 */
+ felem_reduce(ftmp3, tmp); /* 2^96 - 1 */
felem_square(tmp, ftmp3);
- felem_reduce(ftmp4, tmp); /* 2^97 - 2 */
- for (i = 0; i < 23; ++i) { /* 2^120 - 2^24 */
+ felem_reduce(ftmp4, tmp); /* 2^97 - 2 */
+ for (i = 0; i < 23; ++i) { /* 2^120 - 2^24 */
felem_square(tmp, ftmp4);
felem_reduce(ftmp4, tmp);
}
felem_mul(tmp, ftmp2, ftmp4);
- felem_reduce(ftmp2, tmp); /* 2^120 - 1 */
- for (i = 0; i < 6; ++i) { /* 2^126 - 2^6 */
+ felem_reduce(ftmp2, tmp); /* 2^120 - 1 */
+ for (i = 0; i < 6; ++i) { /* 2^126 - 2^6 */
felem_square(tmp, ftmp2);
felem_reduce(ftmp2, tmp);
}
felem_mul(tmp, ftmp2, ftmp);
- felem_reduce(ftmp, tmp); /* 2^126 - 1 */
+ felem_reduce(ftmp, tmp); /* 2^126 - 1 */
felem_square(tmp, ftmp);
- felem_reduce(ftmp, tmp); /* 2^127 - 2 */
+ felem_reduce(ftmp, tmp); /* 2^127 - 2 */
felem_mul(tmp, ftmp, in);
- felem_reduce(ftmp, tmp); /* 2^127 - 1 */
- for (i = 0; i < 97; ++i) { /* 2^224 - 2^97 */
+ felem_reduce(ftmp, tmp); /* 2^127 - 1 */
+ for (i = 0; i < 97; ++i) { /* 2^224 - 2^97 */
felem_square(tmp, ftmp);
felem_reduce(ftmp, tmp);
}
felem_mul(tmp, ftmp, ftmp3);
- felem_reduce(out, tmp); /* 2^224 - 2^96 - 1 */
+ felem_reduce(out, tmp); /* 2^224 - 2^96 - 1 */
}
/*
@@ -816,7 +803,7 @@ static void copy_conditional(felem out, const felem in, limb icopy)
*/
static void
point_double(felem x_out, felem y_out, felem z_out,
- const felem x_in, const felem y_in, const felem z_in)
+ const felem x_in, const felem y_in, const felem z_in)
{
widefelem tmp, tmp2;
felem delta, gamma, beta, alpha, ftmp, ftmp2;
@@ -904,9 +891,9 @@ point_double(felem x_out, felem y_out, felem z_out,
* multiplication, so there is no timing leak for ECDH or ECDSA signing.
*/
static void point_add(felem x3, felem y3, felem z3,
- const felem x1, const felem y1, const felem z1,
- const int mixed, const felem x2, const felem y2,
- const felem z2)
+ const felem x1, const felem y1, const felem z1,
+ const int mixed, const felem x2, const felem y2,
+ const felem z2)
{
felem ftmp, ftmp2, ftmp3, ftmp4, ftmp5, x_out, y_out, z_out;
widefelem tmp, tmp2;
@@ -1101,7 +1088,7 @@ static void point_add(felem x3, felem y3, felem z3,
* The pre_comp array argument should be size of |size| argument
*/
static void select_point(const u64 idx, unsigned int size,
- const felem pre_comp[][3], felem out[3])
+ const felem pre_comp[][3], felem out[3])
{
unsigned i, j;
limb *outlimbs = &out[0][0];
@@ -1136,10 +1123,10 @@ static char get_bit(const felem_bytearray in, unsigned i)
* Output point (X, Y, Z) is stored in x_out, y_out, z_out
*/
static void batch_mul(felem x_out, felem y_out, felem z_out,
- const felem_bytearray scalars[],
- const unsigned num_points, const u8 *g_scalar,
- const int mixed, const felem pre_comp[][17][3],
- const felem g_pre_comp[2][16][3])
+ const felem_bytearray scalars[],
+ const unsigned num_points, const u8 *g_scalar,
+ const int mixed, const felem pre_comp[][17][3],
+ const felem g_pre_comp[2][16][3])
{
int i, skip;
unsigned num;
@@ -1156,8 +1143,8 @@ static void batch_mul(felem x_out, felem y_out, felem z_out,
* of the generator (two in each of the last 28 rounds) and additions of
* other points multiples (every 5th round).
*/
- skip = 1; /* save two point operations in the first
- * round */
+ skip = 1; /* save two point operations in the first
+ * round */
for (i = (num_points ? 220 : 27); i >= 0; --i) {
/* double */
if (!skip)
@@ -1176,7 +1163,7 @@ static void batch_mul(felem x_out, felem y_out, felem z_out,
if (!skip) {
/* value 1 below is argument for "mixed" */
point_add(nq[0], nq[1], nq[2],
- nq[0], nq[1], nq[2], 1, tmp[0], tmp[1], tmp[2]);
+ nq[0], nq[1], nq[2], 1, tmp[0], tmp[1], tmp[2]);
} else {
memcpy(nq, tmp, 3 * sizeof(felem));
skip = 0;
@@ -1190,8 +1177,8 @@ static void batch_mul(felem x_out, felem y_out, felem z_out,
/* select the point to add, in constant time */
select_point(bits, 16, g_pre_comp[0], tmp);
point_add(nq[0], nq[1], nq[2],
- nq[0], nq[1], nq[2],
- 1 /* mixed */ , tmp[0], tmp[1], tmp[2]);
+ nq[0], nq[1], nq[2],
+ 1 /* mixed */, tmp[0], tmp[1], tmp[2]);
}
/* do other additions every 5 doublings */
@@ -1214,8 +1201,8 @@ static void batch_mul(felem x_out, felem y_out, felem z_out,
if (!skip) {
point_add(nq[0], nq[1], nq[2],
- nq[0], nq[1], nq[2],
- mixed, tmp[0], tmp[1], tmp[2]);
+ nq[0], nq[1], nq[2],
+ mixed, tmp[0], tmp[1], tmp[2]);
} else {
memcpy(nq, tmp, 3 * sizeof(felem));
skip = 0;
@@ -1240,7 +1227,6 @@ static NISTP224_PRE_COMP *nistp224_pre_comp_new(void)
if (ret == NULL)
return ret;
-
if (!CRYPTO_NEW_REF(&ret->references, 1)) {
OPENSSL_free(ret);
return NULL;
@@ -1287,8 +1273,8 @@ int ossl_ec_GFp_nistp224_group_init(EC_GROUP *group)
}
int ossl_ec_GFp_nistp224_group_set_curve(EC_GROUP *group, const BIGNUM *p,
- const BIGNUM *a, const BIGNUM *b,
- BN_CTX *ctx)
+ const BIGNUM *a, const BIGNUM *b,
+ BN_CTX *ctx)
{
int ret = 0;
BIGNUM *curve_p, *curve_a, *curve_b;
@@ -1316,7 +1302,7 @@ int ossl_ec_GFp_nistp224_group_set_curve(EC_GROUP *group, const BIGNUM *p,
}
group->field_mod_func = BN_nist_mod_224;
ret = ossl_ec_GFp_simple_group_set_curve(group, p, a, b, ctx);
- err:
+err:
BN_CTX_end(ctx);
#ifndef FIPS_MODULE
BN_CTX_free(new_ctx);
@@ -1329,9 +1315,9 @@ int ossl_ec_GFp_nistp224_group_set_curve(EC_GROUP *group, const BIGNUM *p,
* (X/Z^2, Y/Z^3)
*/
int ossl_ec_GFp_nistp224_point_get_affine_coordinates(const EC_GROUP *group,
- const EC_POINT *point,
- BIGNUM *x, BIGNUM *y,
- BN_CTX *ctx)
+ const EC_POINT *point,
+ BIGNUM *x, BIGNUM *y,
+ BN_CTX *ctx)
{
felem z1, z2, x_in, y_in, x_out, y_out;
widefelem tmp;
@@ -1340,8 +1326,7 @@ int ossl_ec_GFp_nistp224_point_get_affine_coordinates(const EC_GROUP *group,
ERR_raise(ERR_LIB_EC, EC_R_POINT_AT_INFINITY);
return 0;
}
- if ((!BN_to_felem(x_in, point->X)) || (!BN_to_felem(y_in, point->Y)) ||
- (!BN_to_felem(z1, point->Z)))
+ if ((!BN_to_felem(x_in, point->X)) || (!BN_to_felem(y_in, point->Y)) || (!BN_to_felem(z1, point->Z)))
return 0;
felem_inv(z2, z1);
felem_square(tmp, z2);
@@ -1369,33 +1354,33 @@ int ossl_ec_GFp_nistp224_point_get_affine_coordinates(const EC_GROUP *group,
return 1;
}
-static void make_points_affine(size_t num, felem points[ /* num */ ][3],
- felem tmp_felems[ /* num+1 */ ])
+static void make_points_affine(size_t num, felem points[/* num */][3],
+ felem tmp_felems[/* num+1 */])
{
/*
* Runs in constant time, unless an input is the point at infinity (which
* normally shouldn't happen).
*/
ossl_ec_GFp_nistp_points_make_affine_internal(num,
- points,
- sizeof(felem),
- tmp_felems,
- (void (*)(void *))felem_one,
- felem_is_zero_int,
- (void (*)(void *, const void *))
- felem_assign,
- (void (*)(void *, const void *))
- felem_square_reduce, (void (*)
- (void *,
- const void
- *,
- const void
- *))
- felem_mul_reduce,
- (void (*)(void *, const void *))
- felem_inv,
- (void (*)(void *, const void *))
- felem_contract);
+ points,
+ sizeof(felem),
+ tmp_felems,
+ (void (*)(void *))felem_one,
+ felem_is_zero_int,
+ (void (*)(void *, const void *))
+ felem_assign,
+ (void (*)(void *, const void *))
+ felem_square_reduce,
+ (void (*)(void *,
+ const void
+ *,
+ const void
+ *))
+ felem_mul_reduce,
+ (void (*)(void *, const void *))
+ felem_inv,
+ (void (*)(void *, const void *))
+ felem_contract);
}
/*
@@ -1403,9 +1388,9 @@ static void make_points_affine(size_t num, felem points[ /* num */ ][3],
* values Result is stored in r (r can equal one of the inputs).
*/
int ossl_ec_GFp_nistp224_points_mul(const EC_GROUP *group, EC_POINT *r,
- const BIGNUM *scalar, size_t num,
- const EC_POINT *points[],
- const BIGNUM *scalars[], BN_CTX *ctx)
+ const BIGNUM *scalar, size_t num,
+ const EC_POINT *points[],
+ const BIGNUM *scalars[], BN_CTX *ctx)
{
int ret = 0;
int j;
@@ -1414,7 +1399,7 @@ int ossl_ec_GFp_nistp224_points_mul(const EC_GROUP *group, EC_POINT *r,
BIGNUM *x, *y, *z, *tmp_scalar;
felem_bytearray g_secret;
felem_bytearray *secrets = NULL;
- felem (*pre_comp)[17][3] = NULL;
+ felem(*pre_comp)[17][3] = NULL;
felem *tmp_felems = NULL;
int num_bytes;
int have_pre_comp = 0;
@@ -1446,15 +1431,13 @@ int ossl_ec_GFp_nistp224_points_mul(const EC_GROUP *group, EC_POINT *r,
if (generator == NULL)
goto err;
/* get the generator from precomputation */
- if (!felem_to_BN(x, g_pre_comp[0][1][0]) ||
- !felem_to_BN(y, g_pre_comp[0][1][1]) ||
- !felem_to_BN(z, g_pre_comp[0][1][2])) {
+ if (!felem_to_BN(x, g_pre_comp[0][1][0]) || !felem_to_BN(y, g_pre_comp[0][1][1]) || !felem_to_BN(z, g_pre_comp[0][1][2])) {
ERR_raise(ERR_LIB_EC, ERR_R_BN_LIB);
goto err;
}
if (!ossl_ec_GFp_simple_set_Jprojective_coordinates_GFp(group,
- generator,
- x, y, z, ctx))
+ generator,
+ x, y, z, ctx))
goto err;
if (0 == EC_POINT_cmp(group, generator, group->generator, ctx))
/* precomputation matches generator */
@@ -1478,8 +1461,7 @@ int ossl_ec_GFp_nistp224_points_mul(const EC_GROUP *group, EC_POINT *r,
secrets = OPENSSL_calloc(num_points, sizeof(*secrets));
pre_comp = OPENSSL_calloc(num_points, sizeof(*pre_comp));
if (mixed)
- tmp_felems =
- OPENSSL_malloc_array(num_points * 17 + 1, sizeof(felem));
+ tmp_felems = OPENSSL_malloc_array(num_points * 17 + 1, sizeof(felem));
if ((secrets == NULL) || (pre_comp == NULL)
|| (mixed && (tmp_felems == NULL)))
goto err;
@@ -1511,19 +1493,17 @@ int ossl_ec_GFp_nistp224_points_mul(const EC_GROUP *group, EC_POINT *r,
goto err;
}
num_bytes = BN_bn2lebinpad(tmp_scalar,
- secrets[i], sizeof(secrets[i]));
+ secrets[i], sizeof(secrets[i]));
} else {
num_bytes = BN_bn2lebinpad(p_scalar,
- secrets[i], sizeof(secrets[i]));
+ secrets[i], sizeof(secrets[i]));
}
if (num_bytes < 0) {
ERR_raise(ERR_LIB_EC, ERR_R_BN_LIB);
goto err;
}
/* precompute multiples */
- if ((!BN_to_felem(x_out, p->X)) ||
- (!BN_to_felem(y_out, p->Y)) ||
- (!BN_to_felem(z_out, p->Z)))
+ if ((!BN_to_felem(x_out, p->X)) || (!BN_to_felem(y_out, p->Y)) || (!BN_to_felem(z_out, p->Z)))
goto err;
felem_assign(pre_comp[i][1][0], x_out);
felem_assign(pre_comp[i][1][1], y_out);
@@ -1531,16 +1511,16 @@ int ossl_ec_GFp_nistp224_points_mul(const EC_GROUP *group, EC_POINT *r,
for (j = 2; j <= 16; ++j) {
if (j & 1) {
point_add(pre_comp[i][j][0], pre_comp[i][j][1],
- pre_comp[i][j][2], pre_comp[i][1][0],
- pre_comp[i][1][1], pre_comp[i][1][2], 0,
- pre_comp[i][j - 1][0],
- pre_comp[i][j - 1][1],
- pre_comp[i][j - 1][2]);
+ pre_comp[i][j][2], pre_comp[i][1][0],
+ pre_comp[i][1][1], pre_comp[i][1][2], 0,
+ pre_comp[i][j - 1][0],
+ pre_comp[i][j - 1][1],
+ pre_comp[i][j - 1][2]);
} else {
point_double(pre_comp[i][j][0], pre_comp[i][j][1],
- pre_comp[i][j][2], pre_comp[i][j / 2][0],
- pre_comp[i][j / 2][1],
- pre_comp[i][j / 2][2]);
+ pre_comp[i][j][2], pre_comp[i][j / 2][0],
+ pre_comp[i][j / 2][1],
+ pre_comp[i][j / 2][2]);
}
}
}
@@ -1568,28 +1548,27 @@ int ossl_ec_GFp_nistp224_points_mul(const EC_GROUP *group, EC_POINT *r,
}
/* do the multiplication with generator precomputation */
batch_mul(x_out, y_out, z_out,
- (const felem_bytearray(*))secrets, num_points,
- g_secret,
- mixed, (const felem(*)[17][3])pre_comp, g_pre_comp);
+ (const felem_bytearray(*))secrets, num_points,
+ g_secret,
+ mixed, (const felem(*)[17][3])pre_comp, g_pre_comp);
} else {
/* do the multiplication without generator precomputation */
batch_mul(x_out, y_out, z_out,
- (const felem_bytearray(*))secrets, num_points,
- NULL, mixed, (const felem(*)[17][3])pre_comp, NULL);
+ (const felem_bytearray(*))secrets, num_points,
+ NULL, mixed, (const felem(*)[17][3])pre_comp, NULL);
}
/* reduce the output to its unique minimal representation */
felem_contract(x_in, x_out);
felem_contract(y_in, y_out);
felem_contract(z_in, z_out);
- if ((!felem_to_BN(x, x_in)) || (!felem_to_BN(y, y_in)) ||
- (!felem_to_BN(z, z_in))) {
+ if ((!felem_to_BN(x, x_in)) || (!felem_to_BN(y, y_in)) || (!felem_to_BN(z, z_in))) {
ERR_raise(ERR_LIB_EC, ERR_R_BN_LIB);
goto err;
}
ret = ossl_ec_GFp_simple_set_Jprojective_coordinates_GFp(group, r, x, y, z,
- ctx);
+ ctx);
- err:
+err:
BN_CTX_end(ctx);
EC_POINT_free(generator);
OPENSSL_free(secrets);
@@ -1644,9 +1623,7 @@ int ossl_ec_GFp_nistp224_precompute_mult(EC_GROUP *group, BN_CTX *ctx)
memcpy(pre->g_pre_comp, gmul, sizeof(pre->g_pre_comp));
goto done;
}
- if ((!BN_to_felem(pre->g_pre_comp[0][1][0], group->generator->X)) ||
- (!BN_to_felem(pre->g_pre_comp[0][1][1], group->generator->Y)) ||
- (!BN_to_felem(pre->g_pre_comp[0][1][2], group->generator->Z)))
+ if ((!BN_to_felem(pre->g_pre_comp[0][1][0], group->generator->X)) || (!BN_to_felem(pre->g_pre_comp[0][1][1], group->generator->Y)) || (!BN_to_felem(pre->g_pre_comp[0][1][2], group->generator->Z)))
goto err;
/*
* compute 2^56*G, 2^112*G, 2^168*G for the first table, 2^28*G, 2^84*G,
@@ -1654,26 +1631,26 @@ int ossl_ec_GFp_nistp224_precompute_mult(EC_GROUP *group, BN_CTX *ctx)
*/
for (i = 1; i <= 8; i <<= 1) {
point_double(pre->g_pre_comp[1][i][0], pre->g_pre_comp[1][i][1],
- pre->g_pre_comp[1][i][2], pre->g_pre_comp[0][i][0],
- pre->g_pre_comp[0][i][1], pre->g_pre_comp[0][i][2]);
+ pre->g_pre_comp[1][i][2], pre->g_pre_comp[0][i][0],
+ pre->g_pre_comp[0][i][1], pre->g_pre_comp[0][i][2]);
for (j = 0; j < 27; ++j) {
point_double(pre->g_pre_comp[1][i][0], pre->g_pre_comp[1][i][1],
- pre->g_pre_comp[1][i][2], pre->g_pre_comp[1][i][0],
- pre->g_pre_comp[1][i][1], pre->g_pre_comp[1][i][2]);
+ pre->g_pre_comp[1][i][2], pre->g_pre_comp[1][i][0],
+ pre->g_pre_comp[1][i][1], pre->g_pre_comp[1][i][2]);
}
if (i == 8)
break;
point_double(pre->g_pre_comp[0][2 * i][0],
- pre->g_pre_comp[0][2 * i][1],
- pre->g_pre_comp[0][2 * i][2], pre->g_pre_comp[1][i][0],
- pre->g_pre_comp[1][i][1], pre->g_pre_comp[1][i][2]);
+ pre->g_pre_comp[0][2 * i][1],
+ pre->g_pre_comp[0][2 * i][2], pre->g_pre_comp[1][i][0],
+ pre->g_pre_comp[1][i][1], pre->g_pre_comp[1][i][2]);
for (j = 0; j < 27; ++j) {
point_double(pre->g_pre_comp[0][2 * i][0],
- pre->g_pre_comp[0][2 * i][1],
- pre->g_pre_comp[0][2 * i][2],
- pre->g_pre_comp[0][2 * i][0],
- pre->g_pre_comp[0][2 * i][1],
- pre->g_pre_comp[0][2 * i][2]);
+ pre->g_pre_comp[0][2 * i][1],
+ pre->g_pre_comp[0][2 * i][2],
+ pre->g_pre_comp[0][2 * i][0],
+ pre->g_pre_comp[0][2 * i][1],
+ pre->g_pre_comp[0][2 * i][2]);
}
}
for (i = 0; i < 2; i++) {
@@ -1682,49 +1659,49 @@ int ossl_ec_GFp_nistp224_precompute_mult(EC_GROUP *group, BN_CTX *ctx)
/* the remaining multiples */
/* 2^56*G + 2^112*G resp. 2^84*G + 2^140*G */
point_add(pre->g_pre_comp[i][6][0], pre->g_pre_comp[i][6][1],
- pre->g_pre_comp[i][6][2], pre->g_pre_comp[i][4][0],
- pre->g_pre_comp[i][4][1], pre->g_pre_comp[i][4][2],
- 0, pre->g_pre_comp[i][2][0], pre->g_pre_comp[i][2][1],
- pre->g_pre_comp[i][2][2]);
+ pre->g_pre_comp[i][6][2], pre->g_pre_comp[i][4][0],
+ pre->g_pre_comp[i][4][1], pre->g_pre_comp[i][4][2],
+ 0, pre->g_pre_comp[i][2][0], pre->g_pre_comp[i][2][1],
+ pre->g_pre_comp[i][2][2]);
/* 2^56*G + 2^168*G resp. 2^84*G + 2^196*G */
point_add(pre->g_pre_comp[i][10][0], pre->g_pre_comp[i][10][1],
- pre->g_pre_comp[i][10][2], pre->g_pre_comp[i][8][0],
- pre->g_pre_comp[i][8][1], pre->g_pre_comp[i][8][2],
- 0, pre->g_pre_comp[i][2][0], pre->g_pre_comp[i][2][1],
- pre->g_pre_comp[i][2][2]);
+ pre->g_pre_comp[i][10][2], pre->g_pre_comp[i][8][0],
+ pre->g_pre_comp[i][8][1], pre->g_pre_comp[i][8][2],
+ 0, pre->g_pre_comp[i][2][0], pre->g_pre_comp[i][2][1],
+ pre->g_pre_comp[i][2][2]);
/* 2^112*G + 2^168*G resp. 2^140*G + 2^196*G */
point_add(pre->g_pre_comp[i][12][0], pre->g_pre_comp[i][12][1],
- pre->g_pre_comp[i][12][2], pre->g_pre_comp[i][8][0],
- pre->g_pre_comp[i][8][1], pre->g_pre_comp[i][8][2],
- 0, pre->g_pre_comp[i][4][0], pre->g_pre_comp[i][4][1],
- pre->g_pre_comp[i][4][2]);
+ pre->g_pre_comp[i][12][2], pre->g_pre_comp[i][8][0],
+ pre->g_pre_comp[i][8][1], pre->g_pre_comp[i][8][2],
+ 0, pre->g_pre_comp[i][4][0], pre->g_pre_comp[i][4][1],
+ pre->g_pre_comp[i][4][2]);
/*
* 2^56*G + 2^112*G + 2^168*G resp. 2^84*G + 2^140*G + 2^196*G
*/
point_add(pre->g_pre_comp[i][14][0], pre->g_pre_comp[i][14][1],
- pre->g_pre_comp[i][14][2], pre->g_pre_comp[i][12][0],
- pre->g_pre_comp[i][12][1], pre->g_pre_comp[i][12][2],
- 0, pre->g_pre_comp[i][2][0], pre->g_pre_comp[i][2][1],
- pre->g_pre_comp[i][2][2]);
+ pre->g_pre_comp[i][14][2], pre->g_pre_comp[i][12][0],
+ pre->g_pre_comp[i][12][1], pre->g_pre_comp[i][12][2],
+ 0, pre->g_pre_comp[i][2][0], pre->g_pre_comp[i][2][1],
+ pre->g_pre_comp[i][2][2]);
for (j = 1; j < 8; ++j) {
/* odd multiples: add G resp. 2^28*G */
point_add(pre->g_pre_comp[i][2 * j + 1][0],
- pre->g_pre_comp[i][2 * j + 1][1],
- pre->g_pre_comp[i][2 * j + 1][2],
- pre->g_pre_comp[i][2 * j][0],
- pre->g_pre_comp[i][2 * j][1],
- pre->g_pre_comp[i][2 * j][2], 0,
- pre->g_pre_comp[i][1][0], pre->g_pre_comp[i][1][1],
- pre->g_pre_comp[i][1][2]);
+ pre->g_pre_comp[i][2 * j + 1][1],
+ pre->g_pre_comp[i][2 * j + 1][2],
+ pre->g_pre_comp[i][2 * j][0],
+ pre->g_pre_comp[i][2 * j][1],
+ pre->g_pre_comp[i][2 * j][2], 0,
+ pre->g_pre_comp[i][1][0], pre->g_pre_comp[i][1][1],
+ pre->g_pre_comp[i][1][2]);
}
}
make_points_affine(31, &(pre->g_pre_comp[0][1]), tmp_felems);
- done:
+done:
SETPRECOMP(group, nistp224, pre);
pre = NULL;
ret = 1;
- err:
+err:
BN_CTX_end(ctx);
EC_POINT_free(generator);
#ifndef FIPS_MODULE
diff --git a/crypto/ec/ecp_nistp256.c b/crypto/ec/ecp_nistp256.c
index 0ef7965e87..136406bbc7 100644
--- a/crypto/ec/ecp_nistp256.c
+++ b/crypto/ec/ecp_nistp256.c
@@ -47,7 +47,7 @@
#include "internal/numbers.h"
#ifndef INT128_MAX
-# error "Your compiler doesn't appear to support 128-bit integer types"
+#error "Your compiler doesn't appear to support 128-bit integer types"
#endif
typedef uint8_t u8;
@@ -67,26 +67,26 @@ typedef u8 felem_bytearray[32];
* values are big-endian.
*/
static const felem_bytearray nistp256_curve_params[5] = {
- {0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x01, /* p */
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
- 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
- {0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x01, /* a = -3 */
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
- 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc},
- {0x5a, 0xc6, 0x35, 0xd8, 0xaa, 0x3a, 0x93, 0xe7, /* b */
- 0xb3, 0xeb, 0xbd, 0x55, 0x76, 0x98, 0x86, 0xbc,
- 0x65, 0x1d, 0x06, 0xb0, 0xcc, 0x53, 0xb0, 0xf6,
- 0x3b, 0xce, 0x3c, 0x3e, 0x27, 0xd2, 0x60, 0x4b},
- {0x6b, 0x17, 0xd1, 0xf2, 0xe1, 0x2c, 0x42, 0x47, /* x */
- 0xf8, 0xbc, 0xe6, 0xe5, 0x63, 0xa4, 0x40, 0xf2,
- 0x77, 0x03, 0x7d, 0x81, 0x2d, 0xeb, 0x33, 0xa0,
- 0xf4, 0xa1, 0x39, 0x45, 0xd8, 0x98, 0xc2, 0x96},
- {0x4f, 0xe3, 0x42, 0xe2, 0xfe, 0x1a, 0x7f, 0x9b, /* y */
- 0x8e, 0xe7, 0xeb, 0x4a, 0x7c, 0x0f, 0x9e, 0x16,
- 0x2b, 0xce, 0x33, 0x57, 0x6b, 0x31, 0x5e, 0xce,
- 0xcb, 0xb6, 0x40, 0x68, 0x37, 0xbf, 0x51, 0xf5}
+ { 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x01, /* p */
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+ { 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x01, /* a = -3 */
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc },
+ { 0x5a, 0xc6, 0x35, 0xd8, 0xaa, 0x3a, 0x93, 0xe7, /* b */
+ 0xb3, 0xeb, 0xbd, 0x55, 0x76, 0x98, 0x86, 0xbc,
+ 0x65, 0x1d, 0x06, 0xb0, 0xcc, 0x53, 0xb0, 0xf6,
+ 0x3b, 0xce, 0x3c, 0x3e, 0x27, 0xd2, 0x60, 0x4b },
+ { 0x6b, 0x17, 0xd1, 0xf2, 0xe1, 0x2c, 0x42, 0x47, /* x */
+ 0xf8, 0xbc, 0xe6, 0xe5, 0x63, 0xa4, 0x40, 0xf2,
+ 0x77, 0x03, 0x7d, 0x81, 0x2d, 0xeb, 0x33, 0xa0,
+ 0xf4, 0xa1, 0x39, 0x45, 0xd8, 0x98, 0xc2, 0x96 },
+ { 0x4f, 0xe3, 0x42, 0xe2, 0xfe, 0x1a, 0x7f, 0x9b, /* y */
+ 0x8e, 0xe7, 0xeb, 0x4a, 0x7c, 0x0f, 0x9e, 0x16,
+ 0x2b, 0xce, 0x33, 0x57, 0x6b, 0x31, 0x5e, 0xce,
+ 0xcb, 0xb6, 0x40, 0x68, 0x37, 0xbf, 0x51, 0xf5 }
};
/*-
@@ -248,8 +248,7 @@ static void longfelem_scalar(longfelem out, const u64 scalar)
#define two105m41p9 (((limb)1) << 105) - (((limb)1) << 41) + (((limb)1) << 9)
/* zero105 is 0 mod p */
-static const felem zero105 =
- { two105m41m9, two105, two105m41p9, two105m41p9 };
+static const felem zero105 = { two105m41m9, two105, two105m41p9, two105m41p9 };
/*-
* smallfelem_neg sets |out| to |-small|
@@ -330,14 +329,11 @@ static void felem_diff_zero107(felem out, const felem in)
*/
static void longfelem_diff(longfelem out, const longfelem in)
{
- static const limb two70m8p6 =
- (((limb) 1) << 70) - (((limb) 1) << 8) + (((limb) 1) << 6);
- static const limb two70p40 = (((limb) 1) << 70) + (((limb) 1) << 40);
- static const limb two70 = (((limb) 1) << 70);
- static const limb two70m40m38p6 =
- (((limb) 1) << 70) - (((limb) 1) << 40) - (((limb) 1) << 38) +
- (((limb) 1) << 6);
- static const limb two70m6 = (((limb) 1) << 70) - (((limb) 1) << 6);
+ static const limb two70m8p6 = (((limb)1) << 70) - (((limb)1) << 8) + (((limb)1) << 6);
+ static const limb two70p40 = (((limb)1) << 70) + (((limb)1) << 40);
+ static const limb two70 = (((limb)1) << 70);
+ static const limb two70m40m38p6 = (((limb)1) << 70) - (((limb)1) << 40) - (((limb)1) << 38) + (((limb)1) << 6);
+ static const limb two70m6 = (((limb)1) << 70) - (((limb)1) << 6);
/* add 0 mod p to avoid underflow */
out[0] += two70m8p6;
@@ -397,18 +393,18 @@ static void felem_shrink(smallfelem out, const felem in)
* We perform two partial reductions where we eliminate the high-word of
* tmp[3]. We don't update the other words till the end.
*/
- a = tmp[3] >> 64; /* a < 2^46 */
+ a = tmp[3] >> 64; /* a < 2^46 */
tmp[3] = (u64)tmp[3];
tmp[3] -= a;
- tmp[3] += ((limb) a) << 32;
+ tmp[3] += ((limb)a) << 32;
/* tmp[3] < 2^79 */
b = a;
- a = tmp[3] >> 64; /* a < 2^15 */
- b += a; /* b < 2^46 + 2^15 < 2^47 */
+ a = tmp[3] >> 64; /* a < 2^15 */
+ b += a; /* b < 2^46 + 2^15 < 2^47 */
tmp[3] = (u64)tmp[3];
tmp[3] -= a;
- tmp[3] += ((limb) a) << 32;
+ tmp[3] += ((limb)a) << 32;
/* tmp[3] < 2^64 + 2^47 */
/*
@@ -416,7 +412,7 @@ static void felem_shrink(smallfelem out, const felem in)
* reductions.
*/
tmp[0] += b;
- tmp[1] -= (((limb) b) << 32);
+ tmp[1] -= (((limb)b) << 32);
/*
* In order to make space in tmp[3] for the carry from 2 -> 3, we
@@ -489,53 +485,53 @@ static void smallfelem_square(longfelem out, const smallfelem small)
limb a;
u64 high, low;
- a = ((uint128_t) small[0]) * small[0];
+ a = ((uint128_t)small[0]) * small[0];
low = a;
high = a >> 64;
out[0] = low;
out[1] = high;
- a = ((uint128_t) small[0]) * small[1];
+ a = ((uint128_t)small[0]) * small[1];
low = a;
high = a >> 64;
out[1] += low;
out[1] += low;
out[2] = high;
- a = ((uint128_t) small[0]) * small[2];
+ a = ((uint128_t)small[0]) * small[2];
low = a;
high = a >> 64;
out[2] += low;
out[2] *= 2;
out[3] = high;
- a = ((uint128_t) small[0]) * small[3];
+ a = ((uint128_t)small[0]) * small[3];
low = a;
high = a >> 64;
out[3] += low;
out[4] = high;
- a = ((uint128_t) small[1]) * small[2];
+ a = ((uint128_t)small[1]) * small[2];
low = a;
high = a >> 64;
out[3] += low;
out[3] *= 2;
out[4] += high;
- a = ((uint128_t) small[1]) * small[1];
+ a = ((uint128_t)small[1]) * small[1];
low = a;
high = a >> 64;
out[2] += low;
out[3] += high;
- a = ((uint128_t) small[1]) * small[3];
+ a = ((uint128_t)small[1]) * small[3];
low = a;
high = a >> 64;
out[4] += low;
out[4] *= 2;
out[5] = high;
- a = ((uint128_t) small[2]) * small[3];
+ a = ((uint128_t)small[2]) * small[3];
low = a;
high = a >> 64;
out[5] += low;
@@ -543,13 +539,13 @@ static void smallfelem_square(longfelem out, const smallfelem small)
out[6] = high;
out[6] += high;
- a = ((uint128_t) small[2]) * small[2];
+ a = ((uint128_t)small[2]) * small[2];
low = a;
high = a >> 64;
out[4] += low;
out[5] += high;
- a = ((uint128_t) small[3]) * small[3];
+ a = ((uint128_t)small[3]) * small[3];
low = a;
high = a >> 64;
out[6] += low;
@@ -579,102 +575,102 @@ static void felem_square(longfelem out, const felem in)
* out[i] < 7 * 2^64 < 2^67
*/
static void smallfelem_mul(longfelem out, const smallfelem small1,
- const smallfelem small2)
+ const smallfelem small2)
{
limb a;
u64 high, low;
- a = ((uint128_t) small1[0]) * small2[0];
+ a = ((uint128_t)small1[0]) * small2[0];
low = a;
high = a >> 64;
out[0] = low;
out[1] = high;
- a = ((uint128_t) small1[0]) * small2[1];
+ a = ((uint128_t)small1[0]) * small2[1];
low = a;
high = a >> 64;
out[1] += low;
out[2] = high;
- a = ((uint128_t) small1[1]) * small2[0];
+ a = ((uint128_t)small1[1]) * small2[0];
low = a;
high = a >> 64;
out[1] += low;
out[2] += high;
- a = ((uint128_t) small1[0]) * small2[2];
+ a = ((uint128_t)small1[0]) * small2[2];
low = a;
high = a >> 64;
out[2] += low;
out[3] = high;
- a = ((uint128_t) small1[1]) * small2[1];
+ a = ((uint128_t)small1[1]) * small2[1];
low = a;
high = a >> 64;
out[2] += low;
out[3] += high;
- a = ((uint128_t) small1[2]) * small2[0];
+ a = ((uint128_t)small1[2]) * small2[0];
low = a;
high = a >> 64;
out[2] += low;
out[3] += high;
- a = ((uint128_t) small1[0]) * small2[3];
+ a = ((uint128_t)small1[0]) * small2[3];
low = a;
high = a >> 64;
out[3] += low;
out[4] = high;
- a = ((uint128_t) small1[1]) * small2[2];
+ a = ((uint128_t)small1[1]) * small2[2];
low = a;
high = a >> 64;
out[3] += low;
out[4] += high;
- a = ((uint128_t) small1[2]) * small2[1];
+ a = ((uint128_t)small1[2]) * small2[1];
low = a;
high = a >> 64;
out[3] += low;
out[4] += high;
- a = ((uint128_t) small1[3]) * small2[0];
+ a = ((uint128_t)small1[3]) * small2[0];
low = a;
high = a >> 64;
out[3] += low;
out[4] += high;
- a = ((uint128_t) small1[1]) * small2[3];
+ a = ((uint128_t)small1[1]) * small2[3];
low = a;
high = a >> 64;
out[4] += low;
out[5] = high;
- a = ((uint128_t) small1[2]) * small2[2];
+ a = ((uint128_t)small1[2]) * small2[2];
low = a;
high = a >> 64;
out[4] += low;
out[5] += high;
- a = ((uint128_t) small1[3]) * small2[1];
+ a = ((uint128_t)small1[3]) * small2[1];
low = a;
high = a >> 64;
out[4] += low;
out[5] += high;
- a = ((uint128_t) small1[2]) * small2[3];
+ a = ((uint128_t)small1[2]) * small2[3];
low = a;
high = a >> 64;
out[5] += low;
out[6] = high;
- a = ((uint128_t) small1[3]) * small2[2];
+ a = ((uint128_t)small1[3]) * small2[2];
low = a;
high = a >> 64;
out[5] += low;
out[6] += high;
- a = ((uint128_t) small1[3]) * small2[3];
+ a = ((uint128_t)small1[3]) * small2[3];
low = a;
high = a >> 64;
out[6] += low;
@@ -706,7 +702,7 @@ static void felem_mul(longfelem out, const felem in1, const felem in2)
* out[i] < 7 * 2^64 < 2^67
*/
static void felem_small_mul(longfelem out, const smallfelem small1,
- const felem in2)
+ const felem in2)
{
smallfelem small2;
felem_shrink(small2, in2);
@@ -717,8 +713,7 @@ static void felem_small_mul(longfelem out, const smallfelem small1,
#define two100 (((limb)1) << 100)
#define two100m36p4 (((limb)1) << 100) - (((limb)1) << 36) + (((limb)1) << 4)
/* zero100 is 0 mod p */
-static const felem zero100 =
- { two100m36m4, two100, two100m36p4, two100m36p4 };
+static const felem zero100 = { two100m36m4, two100, two100m36p4, two100m36p4 };
/*-
* Internal function for the different flavours of felem_reduce.
@@ -861,7 +856,7 @@ static void felem_contract(smallfelem out, const felem in)
*/
for (i = 3; i < 4; i--) {
u64 equal;
- uint128_t a = ((uint128_t) kPrime[i]) - out[i];
+ uint128_t a = ((uint128_t)kPrime[i]) - out[i];
/*
* if out[i] > kPrime[i] then a will underflow and the high 64-bits
* will all be set.
@@ -918,7 +913,7 @@ static void smallfelem_square_contract(smallfelem out, const smallfelem in)
}
static void smallfelem_mul_contract(smallfelem out, const smallfelem in1,
- const smallfelem in2)
+ const smallfelem in2)
{
longfelem longtmp;
felem tmp;
@@ -949,9 +944,7 @@ static limb smallfelem_is_zero(const smallfelem small)
is_zero &= is_zero << 1;
is_zero = 0 - (is_zero >> 63);
- is_p = (small[0] ^ kPrime[0]) |
- (small[1] ^ kPrime[1]) |
- (small[2] ^ kPrime[2]) | (small[3] ^ kPrime[3]);
+ is_p = (small[0] ^ kPrime[0]) | (small[1] ^ kPrime[1]) | (small[2] ^ kPrime[2]) | (small[3] ^ kPrime[3]);
is_p--;
is_p &= is_p << 32;
is_p &= is_p << 16;
@@ -964,13 +957,13 @@ static limb smallfelem_is_zero(const smallfelem small)
is_zero |= is_p;
result = is_zero;
- result |= ((limb) is_zero) << 64;
+ result |= ((limb)is_zero) << 64;
return result;
}
static int smallfelem_is_zero_int(const void *small)
{
- return (int)(smallfelem_is_zero(small) & ((limb) 1));
+ return (int)(smallfelem_is_zero(small) & ((limb)1));
}
/*-
@@ -990,89 +983,89 @@ static void felem_inv(felem out, const felem in)
unsigned i;
felem_square(tmp, in);
- felem_reduce(ftmp, tmp); /* 2^1 */
+ felem_reduce(ftmp, tmp); /* 2^1 */
felem_mul(tmp, in, ftmp);
- felem_reduce(ftmp, tmp); /* 2^2 - 2^0 */
+ felem_reduce(ftmp, tmp); /* 2^2 - 2^0 */
felem_assign(e2, ftmp);
felem_square(tmp, ftmp);
- felem_reduce(ftmp, tmp); /* 2^3 - 2^1 */
+ felem_reduce(ftmp, tmp); /* 2^3 - 2^1 */
felem_square(tmp, ftmp);
- felem_reduce(ftmp, tmp); /* 2^4 - 2^2 */
+ felem_reduce(ftmp, tmp); /* 2^4 - 2^2 */
felem_mul(tmp, ftmp, e2);
- felem_reduce(ftmp, tmp); /* 2^4 - 2^0 */
+ felem_reduce(ftmp, tmp); /* 2^4 - 2^0 */
felem_assign(e4, ftmp);
felem_square(tmp, ftmp);
- felem_reduce(ftmp, tmp); /* 2^5 - 2^1 */
+ felem_reduce(ftmp, tmp); /* 2^5 - 2^1 */
felem_square(tmp, ftmp);
- felem_reduce(ftmp, tmp); /* 2^6 - 2^2 */
+ felem_reduce(ftmp, tmp); /* 2^6 - 2^2 */
felem_square(tmp, ftmp);
- felem_reduce(ftmp, tmp); /* 2^7 - 2^3 */
+ felem_reduce(ftmp, tmp); /* 2^7 - 2^3 */
felem_square(tmp, ftmp);
- felem_reduce(ftmp, tmp); /* 2^8 - 2^4 */
+ felem_reduce(ftmp, tmp); /* 2^8 - 2^4 */
felem_mul(tmp, ftmp, e4);
- felem_reduce(ftmp, tmp); /* 2^8 - 2^0 */
+ felem_reduce(ftmp, tmp); /* 2^8 - 2^0 */
felem_assign(e8, ftmp);
for (i = 0; i < 8; i++) {
felem_square(tmp, ftmp);
felem_reduce(ftmp, tmp);
- } /* 2^16 - 2^8 */
+ } /* 2^16 - 2^8 */
felem_mul(tmp, ftmp, e8);
- felem_reduce(ftmp, tmp); /* 2^16 - 2^0 */
+ felem_reduce(ftmp, tmp); /* 2^16 - 2^0 */
felem_assign(e16, ftmp);
for (i = 0; i < 16; i++) {
felem_square(tmp, ftmp);
felem_reduce(ftmp, tmp);
- } /* 2^32 - 2^16 */
+ } /* 2^32 - 2^16 */
felem_mul(tmp, ftmp, e16);
- felem_reduce(ftmp, tmp); /* 2^32 - 2^0 */
+ felem_reduce(ftmp, tmp); /* 2^32 - 2^0 */
felem_assign(e32, ftmp);
for (i = 0; i < 32; i++) {
felem_square(tmp, ftmp);
felem_reduce(ftmp, tmp);
- } /* 2^64 - 2^32 */
+ } /* 2^64 - 2^32 */
felem_assign(e64, ftmp);
felem_mul(tmp, ftmp, in);
- felem_reduce(ftmp, tmp); /* 2^64 - 2^32 + 2^0 */
+ felem_reduce(ftmp, tmp); /* 2^64 - 2^32 + 2^0 */
for (i = 0; i < 192; i++) {
felem_square(tmp, ftmp);
felem_reduce(ftmp, tmp);
- } /* 2^256 - 2^224 + 2^192 */
+ } /* 2^256 - 2^224 + 2^192 */
felem_mul(tmp, e64, e32);
- felem_reduce(ftmp2, tmp); /* 2^64 - 2^0 */
+ felem_reduce(ftmp2, tmp); /* 2^64 - 2^0 */
for (i = 0; i < 16; i++) {
felem_square(tmp, ftmp2);
felem_reduce(ftmp2, tmp);
- } /* 2^80 - 2^16 */
+ } /* 2^80 - 2^16 */
felem_mul(tmp, ftmp2, e16);
- felem_reduce(ftmp2, tmp); /* 2^80 - 2^0 */
+ felem_reduce(ftmp2, tmp); /* 2^80 - 2^0 */
for (i = 0; i < 8; i++) {
felem_square(tmp, ftmp2);
felem_reduce(ftmp2, tmp);
- } /* 2^88 - 2^8 */
+ } /* 2^88 - 2^8 */
felem_mul(tmp, ftmp2, e8);
- felem_reduce(ftmp2, tmp); /* 2^88 - 2^0 */
+ felem_reduce(ftmp2, tmp); /* 2^88 - 2^0 */
for (i = 0; i < 4; i++) {
felem_square(tmp, ftmp2);
felem_reduce(ftmp2, tmp);
- } /* 2^92 - 2^4 */
+ } /* 2^92 - 2^4 */
felem_mul(tmp, ftmp2, e4);
- felem_reduce(ftmp2, tmp); /* 2^92 - 2^0 */
+ felem_reduce(ftmp2, tmp); /* 2^92 - 2^0 */
felem_square(tmp, ftmp2);
- felem_reduce(ftmp2, tmp); /* 2^93 - 2^1 */
+ felem_reduce(ftmp2, tmp); /* 2^93 - 2^1 */
felem_square(tmp, ftmp2);
- felem_reduce(ftmp2, tmp); /* 2^94 - 2^2 */
+ felem_reduce(ftmp2, tmp); /* 2^94 - 2^2 */
felem_mul(tmp, ftmp2, e2);
- felem_reduce(ftmp2, tmp); /* 2^94 - 2^0 */
+ felem_reduce(ftmp2, tmp); /* 2^94 - 2^0 */
felem_square(tmp, ftmp2);
- felem_reduce(ftmp2, tmp); /* 2^95 - 2^1 */
+ felem_reduce(ftmp2, tmp); /* 2^95 - 2^1 */
felem_square(tmp, ftmp2);
- felem_reduce(ftmp2, tmp); /* 2^96 - 2^2 */
+ felem_reduce(ftmp2, tmp); /* 2^96 - 2^2 */
felem_mul(tmp, ftmp2, in);
- felem_reduce(ftmp2, tmp); /* 2^96 - 3 */
+ felem_reduce(ftmp2, tmp); /* 2^96 - 3 */
felem_mul(tmp, ftmp2, ftmp);
- felem_reduce(out, tmp); /* 2^256 - 2^224 + 2^192 + 2^96 - 3 */
+ felem_reduce(out, tmp); /* 2^256 - 2^224 + 2^192 + 2^96 - 3 */
}
static void smallfelem_inv_contract(smallfelem out, const smallfelem in)
@@ -1104,7 +1097,7 @@ static void smallfelem_inv_contract(smallfelem out, const smallfelem in)
*/
static void
point_double(felem x_out, felem y_out, felem z_out,
- const felem x_in, const felem y_in, const felem z_in)
+ const felem x_in, const felem y_in, const felem z_in)
{
longfelem tmp, tmp2;
felem delta, gamma, beta, alpha, ftmp, ftmp2;
@@ -1186,8 +1179,8 @@ point_double(felem x_out, felem y_out, felem z_out,
*/
static void
point_double_small(smallfelem x_out, smallfelem y_out, smallfelem z_out,
- const smallfelem x_in, const smallfelem y_in,
- const smallfelem z_in)
+ const smallfelem x_in, const smallfelem y_in,
+ const smallfelem z_in)
{
felem felem_x_out, felem_y_out, felem_z_out;
felem felem_x_in, felem_y_in, felem_z_in;
@@ -1196,7 +1189,7 @@ point_double_small(smallfelem x_out, smallfelem y_out, smallfelem z_out,
smallfelem_expand(felem_y_in, y_in);
smallfelem_expand(felem_z_in, z_in);
point_double(felem_x_out, felem_y_out, felem_z_out,
- felem_x_in, felem_y_in, felem_z_in);
+ felem_x_in, felem_y_in, felem_z_in);
felem_shrink(x_out, felem_x_out);
felem_shrink(y_out, felem_y_out);
felem_shrink(z_out, felem_z_out);
@@ -1218,7 +1211,7 @@ static void copy_small_conditional(felem out, const smallfelem in, limb mask)
unsigned i;
const u64 mask64 = mask;
for (i = 0; i < NLIMBS; ++i) {
- out[i] = ((limb) (in[i] & mask64)) | (out[i] & ~mask);
+ out[i] = ((limb)(in[i] & mask64)) | (out[i] & ~mask);
}
}
@@ -1235,9 +1228,9 @@ static void copy_small_conditional(felem out, const smallfelem in, limb mask)
* ECDH or ECDSA signing.
*/
static void point_add(felem x3, felem y3, felem z3,
- const felem x1, const felem y1, const felem z1,
- const int mixed, const smallfelem x2,
- const smallfelem y2, const smallfelem z2)
+ const felem x1, const felem y1, const felem z1,
+ const int mixed, const smallfelem x2,
+ const smallfelem y2, const smallfelem z2)
{
felem ftmp, ftmp2, ftmp3, ftmp4, ftmp5, ftmp6, x_out, y_out, z_out;
longfelem tmp, tmp2;
@@ -1420,8 +1413,8 @@ static void point_add(felem x3, felem y3, felem z3,
* smallfelems
*/
static void point_add_small(smallfelem x3, smallfelem y3, smallfelem z3,
- smallfelem x1, smallfelem y1, smallfelem z1,
- smallfelem x2, smallfelem y2, smallfelem z2)
+ smallfelem x1, smallfelem y1, smallfelem z1,
+ smallfelem x2, smallfelem y2, smallfelem z2)
{
felem felem_x3, felem_y3, felem_z3;
felem felem_x1, felem_y1, felem_z1;
@@ -1429,7 +1422,7 @@ static void point_add_small(smallfelem x3, smallfelem y3, smallfelem z3,
smallfelem_expand(felem_y1, y1);
smallfelem_expand(felem_z1, z1);
point_add(felem_x3, felem_y3, felem_z3, felem_x1, felem_y1, felem_z1, 0,
- x2, y2, z2);
+ x2, y2, z2);
felem_shrink(x3, felem_x3);
felem_shrink(y3, felem_y3);
felem_shrink(z3, felem_z3);
@@ -1473,162 +1466,162 @@ static void point_add_small(smallfelem x3, smallfelem y3, smallfelem z3,
/* gmul is the table of precomputed base points */
static const smallfelem gmul[2][16][3] = {
- {{{0, 0, 0, 0},
- {0, 0, 0, 0},
- {0, 0, 0, 0}},
- {{0xf4a13945d898c296, 0x77037d812deb33a0, 0xf8bce6e563a440f2,
- 0x6b17d1f2e12c4247},
- {0xcbb6406837bf51f5, 0x2bce33576b315ece, 0x8ee7eb4a7c0f9e16,
- 0x4fe342e2fe1a7f9b},
- {1, 0, 0, 0}},
- {{0x90e75cb48e14db63, 0x29493baaad651f7e, 0x8492592e326e25de,
- 0x0fa822bc2811aaa5},
- {0xe41124545f462ee7, 0x34b1a65050fe82f5, 0x6f4ad4bcb3df188b,
- 0xbff44ae8f5dba80d},
- {1, 0, 0, 0}},
- {{0x93391ce2097992af, 0xe96c98fd0d35f1fa, 0xb257c0de95e02789,
- 0x300a4bbc89d6726f},
- {0xaa54a291c08127a0, 0x5bb1eeada9d806a5, 0x7f1ddb25ff1e3c6f,
- 0x72aac7e0d09b4644},
- {1, 0, 0, 0}},
- {{0x57c84fc9d789bd85, 0xfc35ff7dc297eac3, 0xfb982fd588c6766e,
- 0x447d739beedb5e67},
- {0x0c7e33c972e25b32, 0x3d349b95a7fae500, 0xe12e9d953a4aaff7,
- 0x2d4825ab834131ee},
- {1, 0, 0, 0}},
- {{0x13949c932a1d367f, 0xef7fbd2b1a0a11b7, 0xddc6068bb91dfc60,
- 0xef9519328a9c72ff},
- {0x196035a77376d8a8, 0x23183b0895ca1740, 0xc1ee9807022c219c,
- 0x611e9fc37dbb2c9b},
- {1, 0, 0, 0}},
- {{0xcae2b1920b57f4bc, 0x2936df5ec6c9bc36, 0x7dea6482e11238bf,
- 0x550663797b51f5d8},
- {0x44ffe216348a964c, 0x9fb3d576dbdefbe1, 0x0afa40018d9d50e5,
- 0x157164848aecb851},
- {1, 0, 0, 0}},
- {{0xe48ecafffc5cde01, 0x7ccd84e70d715f26, 0xa2e8f483f43e4391,
- 0xeb5d7745b21141ea},
- {0xcac917e2731a3479, 0x85f22cfe2844b645, 0x0990e6a158006cee,
- 0xeafd72ebdbecc17b},
- {1, 0, 0, 0}},
- {{0x6cf20ffb313728be, 0x96439591a3c6b94a, 0x2736ff8344315fc5,
- 0xa6d39677a7849276},
- {0xf2bab833c357f5f4, 0x824a920c2284059b, 0x66b8babd2d27ecdf,
- 0x674f84749b0b8816},
- {1, 0, 0, 0}},
- {{0x2df48c04677c8a3e, 0x74e02f080203a56b, 0x31855f7db8c7fedb,
- 0x4e769e7672c9ddad},
- {0xa4c36165b824bbb0, 0xfb9ae16f3b9122a5, 0x1ec0057206947281,
- 0x42b99082de830663},
- {1, 0, 0, 0}},
- {{0x6ef95150dda868b9, 0xd1f89e799c0ce131, 0x7fdc1ca008a1c478,
- 0x78878ef61c6ce04d},
- {0x9c62b9121fe0d976, 0x6ace570ebde08d4f, 0xde53142c12309def,
- 0xb6cb3f5d7b72c321},
- {1, 0, 0, 0}},
- {{0x7f991ed2c31a3573, 0x5b82dd5bd54fb496, 0x595c5220812ffcae,
- 0x0c88bc4d716b1287},
- {0x3a57bf635f48aca8, 0x7c8181f4df2564f3, 0x18d1b5b39c04e6aa,
- 0xdd5ddea3f3901dc6},
- {1, 0, 0, 0}},
- {{0xe96a79fb3e72ad0c, 0x43a0a28c42ba792f, 0xefe0a423083e49f3,
- 0x68f344af6b317466},
- {0xcdfe17db3fb24d4a, 0x668bfc2271f5c626, 0x604ed93c24d67ff3,
- 0x31b9c405f8540a20},
- {1, 0, 0, 0}},
- {{0xd36b4789a2582e7f, 0x0d1a10144ec39c28, 0x663c62c3edbad7a0,
- 0x4052bf4b6f461db9},
- {0x235a27c3188d25eb, 0xe724f33999bfcc5b, 0x862be6bd71d70cc8,
- 0xfecf4d5190b0fc61},
- {1, 0, 0, 0}},
- {{0x74346c10a1d4cfac, 0xafdf5cc08526a7a4, 0x123202a8f62bff7a,
- 0x1eddbae2c802e41a},
- {0x8fa0af2dd603f844, 0x36e06b7e4c701917, 0x0c45f45273db33a0,
- 0x43104d86560ebcfc},
- {1, 0, 0, 0}},
- {{0x9615b5110d1d78e5, 0x66b0de3225c4744b, 0x0a4a46fb6aaf363a,
- 0xb48e26b484f7a21c},
- {0x06ebb0f621a01b2d, 0xc004e4048b7b0f98, 0x64131bcdfed6f668,
- 0xfac015404d4d3dab},
- {1, 0, 0, 0}}},
- {{{0, 0, 0, 0},
- {0, 0, 0, 0},
- {0, 0, 0, 0}},
- {{0x3a5a9e22185a5943, 0x1ab919365c65dfb6, 0x21656b32262c71da,
- 0x7fe36b40af22af89},
- {0xd50d152c699ca101, 0x74b3d5867b8af212, 0x9f09f40407dca6f1,
- 0xe697d45825b63624},
- {1, 0, 0, 0}},
- {{0xa84aa9397512218e, 0xe9a521b074ca0141, 0x57880b3a18a2e902,
- 0x4a5b506612a677a6},
- {0x0beada7a4c4f3840, 0x626db15419e26d9d, 0xc42604fbe1627d40,
- 0xeb13461ceac089f1},
- {1, 0, 0, 0}},
- {{0xf9faed0927a43281, 0x5e52c4144103ecbc, 0xc342967aa815c857,
- 0x0781b8291c6a220a},
- {0x5a8343ceeac55f80, 0x88f80eeee54a05e3, 0x97b2a14f12916434,
- 0x690cde8df0151593},
- {1, 0, 0, 0}},
- {{0xaee9c75df7f82f2a, 0x9e4c35874afdf43a, 0xf5622df437371326,
- 0x8a535f566ec73617},
- {0xc5f9a0ac223094b7, 0xcde533864c8c7669, 0x37e02819085a92bf,
- 0x0455c08468b08bd7},
- {1, 0, 0, 0}},
- {{0x0c0a6e2c9477b5d9, 0xf9a4bf62876dc444, 0x5050a949b6cdc279,
- 0x06bada7ab77f8276},
- {0xc8b4aed1ea48dac9, 0xdebd8a4b7ea1070f, 0x427d49101366eb70,
- 0x5b476dfd0e6cb18a},
- {1, 0, 0, 0}},
- {{0x7c5c3e44278c340a, 0x4d54606812d66f3b, 0x29a751b1ae23c5d8,
- 0x3e29864e8a2ec908},
- {0x142d2a6626dbb850, 0xad1744c4765bd780, 0x1f150e68e322d1ed,
- 0x239b90ea3dc31e7e},
- {1, 0, 0, 0}},
- {{0x78c416527a53322a, 0x305dde6709776f8e, 0xdbcab759f8862ed4,
- 0x820f4dd949f72ff7},
- {0x6cc544a62b5debd4, 0x75be5d937b4e8cc4, 0x1b481b1b215c14d3,
- 0x140406ec783a05ec},
- {1, 0, 0, 0}},
- {{0x6a703f10e895df07, 0xfd75f3fa01876bd8, 0xeb5b06e70ce08ffe,
- 0x68f6b8542783dfee},
- {0x90c76f8a78712655, 0xcf5293d2f310bf7f, 0xfbc8044dfda45028,
- 0xcbe1feba92e40ce6},
- {1, 0, 0, 0}},
- {{0xe998ceea4396e4c1, 0xfc82ef0b6acea274, 0x230f729f2250e927,
- 0xd0b2f94d2f420109},
- {0x4305adddb38d4966, 0x10b838f8624c3b45, 0x7db2636658954e7a,
- 0x971459828b0719e5},
- {1, 0, 0, 0}},
- {{0x4bd6b72623369fc9, 0x57f2929e53d0b876, 0xc2d5cba4f2340687,
- 0x961610004a866aba},
- {0x49997bcd2e407a5e, 0x69ab197d92ddcb24, 0x2cf1f2438fe5131c,
- 0x7acb9fadcee75e44},
- {1, 0, 0, 0}},
- {{0x254e839423d2d4c0, 0xf57f0c917aea685b, 0xa60d880f6f75aaea,
- 0x24eb9acca333bf5b},
- {0xe3de4ccb1cda5dea, 0xfeef9341c51a6b4f, 0x743125f88bac4c4d,
- 0x69f891c5acd079cc},
- {1, 0, 0, 0}},
- {{0xeee44b35702476b5, 0x7ed031a0e45c2258, 0xb422d1e7bd6f8514,
- 0xe51f547c5972a107},
- {0xa25bcd6fc9cf343d, 0x8ca922ee097c184e, 0xa62f98b3a9fe9a06,
- 0x1c309a2b25bb1387},
- {1, 0, 0, 0}},
- {{0x9295dbeb1967c459, 0xb00148833472c98e, 0xc504977708011828,
- 0x20b87b8aa2c4e503},
- {0x3063175de057c277, 0x1bd539338fe582dd, 0x0d11adef5f69a044,
- 0xf5c6fa49919776be},
- {1, 0, 0, 0}},
- {{0x8c944e760fd59e11, 0x3876cba1102fad5f, 0xa454c3fad83faa56,
- 0x1ed7d1b9332010b9},
- {0xa1011a270024b889, 0x05e4d0dcac0cd344, 0x52b520f0eb6a2a24,
- 0x3a2b03f03217257a},
- {1, 0, 0, 0}},
- {{0xf20fc2afdf1d043d, 0xf330240db58d5a62, 0xfc7d229ca0058c3b,
- 0x15fee545c78dd9f6},
- {0x501e82885bc98cda, 0x41ef80e5d046ac04, 0x557d9f49461210fb,
- 0x4ab5b6b2b8753f81},
- {1, 0, 0, 0}}}
+ { { { 0, 0, 0, 0 },
+ { 0, 0, 0, 0 },
+ { 0, 0, 0, 0 } },
+ { { 0xf4a13945d898c296, 0x77037d812deb33a0, 0xf8bce6e563a440f2,
+ 0x6b17d1f2e12c4247 },
+ { 0xcbb6406837bf51f5, 0x2bce33576b315ece, 0x8ee7eb4a7c0f9e16,
+ 0x4fe342e2fe1a7f9b },
+ { 1, 0, 0, 0 } },
+ { { 0x90e75cb48e14db63, 0x29493baaad651f7e, 0x8492592e326e25de,
+ 0x0fa822bc2811aaa5 },
+ { 0xe41124545f462ee7, 0x34b1a65050fe82f5, 0x6f4ad4bcb3df188b,
+ 0xbff44ae8f5dba80d },
+ { 1, 0, 0, 0 } },
+ { { 0x93391ce2097992af, 0xe96c98fd0d35f1fa, 0xb257c0de95e02789,
+ 0x300a4bbc89d6726f },
+ { 0xaa54a291c08127a0, 0x5bb1eeada9d806a5, 0x7f1ddb25ff1e3c6f,
+ 0x72aac7e0d09b4644 },
+ { 1, 0, 0, 0 } },
+ { { 0x57c84fc9d789bd85, 0xfc35ff7dc297eac3, 0xfb982fd588c6766e,
+ 0x447d739beedb5e67 },
+ { 0x0c7e33c972e25b32, 0x3d349b95a7fae500, 0xe12e9d953a4aaff7,
+ 0x2d4825ab834131ee },
+ { 1, 0, 0, 0 } },
+ { { 0x13949c932a1d367f, 0xef7fbd2b1a0a11b7, 0xddc6068bb91dfc60,
+ 0xef9519328a9c72ff },
+ { 0x196035a77376d8a8, 0x23183b0895ca1740, 0xc1ee9807022c219c,
+ 0x611e9fc37dbb2c9b },
+ { 1, 0, 0, 0 } },
+ { { 0xcae2b1920b57f4bc, 0x2936df5ec6c9bc36, 0x7dea6482e11238bf,
+ 0x550663797b51f5d8 },
+ { 0x44ffe216348a964c, 0x9fb3d576dbdefbe1, 0x0afa40018d9d50e5,
+ 0x157164848aecb851 },
+ { 1, 0, 0, 0 } },
+ { { 0xe48ecafffc5cde01, 0x7ccd84e70d715f26, 0xa2e8f483f43e4391,
+ 0xeb5d7745b21141ea },
+ { 0xcac917e2731a3479, 0x85f22cfe2844b645, 0x0990e6a158006cee,
+ 0xeafd72ebdbecc17b },
+ { 1, 0, 0, 0 } },
+ { { 0x6cf20ffb313728be, 0x96439591a3c6b94a, 0x2736ff8344315fc5,
+ 0xa6d39677a7849276 },
+ { 0xf2bab833c357f5f4, 0x824a920c2284059b, 0x66b8babd2d27ecdf,
+ 0x674f84749b0b8816 },
+ { 1, 0, 0, 0 } },
+ { { 0x2df48c04677c8a3e, 0x74e02f080203a56b, 0x31855f7db8c7fedb,
+ 0x4e769e7672c9ddad },
+ { 0xa4c36165b824bbb0, 0xfb9ae16f3b9122a5, 0x1ec0057206947281,
+ 0x42b99082de830663 },
+ { 1, 0, 0, 0 } },
+ { { 0x6ef95150dda868b9, 0xd1f89e799c0ce131, 0x7fdc1ca008a1c478,
+ 0x78878ef61c6ce04d },
+ { 0x9c62b9121fe0d976, 0x6ace570ebde08d4f, 0xde53142c12309def,
+ 0xb6cb3f5d7b72c321 },
+ { 1, 0, 0, 0 } },
+ { { 0x7f991ed2c31a3573, 0x5b82dd5bd54fb496, 0x595c5220812ffcae,
+ 0x0c88bc4d716b1287 },
+ { 0x3a57bf635f48aca8, 0x7c8181f4df2564f3, 0x18d1b5b39c04e6aa,
+ 0xdd5ddea3f3901dc6 },
+ { 1, 0, 0, 0 } },
+ { { 0xe96a79fb3e72ad0c, 0x43a0a28c42ba792f, 0xefe0a423083e49f3,
+ 0x68f344af6b317466 },
+ { 0xcdfe17db3fb24d4a, 0x668bfc2271f5c626, 0x604ed93c24d67ff3,
+ 0x31b9c405f8540a20 },
+ { 1, 0, 0, 0 } },
+ { { 0xd36b4789a2582e7f, 0x0d1a10144ec39c28, 0x663c62c3edbad7a0,
+ 0x4052bf4b6f461db9 },
+ { 0x235a27c3188d25eb, 0xe724f33999bfcc5b, 0x862be6bd71d70cc8,
+ 0xfecf4d5190b0fc61 },
+ { 1, 0, 0, 0 } },
+ { { 0x74346c10a1d4cfac, 0xafdf5cc08526a7a4, 0x123202a8f62bff7a,
+ 0x1eddbae2c802e41a },
+ { 0x8fa0af2dd603f844, 0x36e06b7e4c701917, 0x0c45f45273db33a0,
+ 0x43104d86560ebcfc },
+ { 1, 0, 0, 0 } },
+ { { 0x9615b5110d1d78e5, 0x66b0de3225c4744b, 0x0a4a46fb6aaf363a,
+ 0xb48e26b484f7a21c },
+ { 0x06ebb0f621a01b2d, 0xc004e4048b7b0f98, 0x64131bcdfed6f668,
+ 0xfac015404d4d3dab },
+ { 1, 0, 0, 0 } } },
+ { { { 0, 0, 0, 0 },
+ { 0, 0, 0, 0 },
+ { 0, 0, 0, 0 } },
+ { { 0x3a5a9e22185a5943, 0x1ab919365c65dfb6, 0x21656b32262c71da,
+ 0x7fe36b40af22af89 },
+ { 0xd50d152c699ca101, 0x74b3d5867b8af212, 0x9f09f40407dca6f1,
+ 0xe697d45825b63624 },
+ { 1, 0, 0, 0 } },
+ { { 0xa84aa9397512218e, 0xe9a521b074ca0141, 0x57880b3a18a2e902,
+ 0x4a5b506612a677a6 },
+ { 0x0beada7a4c4f3840, 0x626db15419e26d9d, 0xc42604fbe1627d40,
+ 0xeb13461ceac089f1 },
+ { 1, 0, 0, 0 } },
+ { { 0xf9faed0927a43281, 0x5e52c4144103ecbc, 0xc342967aa815c857,
+ 0x0781b8291c6a220a },
+ { 0x5a8343ceeac55f80, 0x88f80eeee54a05e3, 0x97b2a14f12916434,
+ 0x690cde8df0151593 },
+ { 1, 0, 0, 0 } },
+ { { 0xaee9c75df7f82f2a, 0x9e4c35874afdf43a, 0xf5622df437371326,
+ 0x8a535f566ec73617 },
+ { 0xc5f9a0ac223094b7, 0xcde533864c8c7669, 0x37e02819085a92bf,
+ 0x0455c08468b08bd7 },
+ { 1, 0, 0, 0 } },
+ { { 0x0c0a6e2c9477b5d9, 0xf9a4bf62876dc444, 0x5050a949b6cdc279,
+ 0x06bada7ab77f8276 },
+ { 0xc8b4aed1ea48dac9, 0xdebd8a4b7ea1070f, 0x427d49101366eb70,
+ 0x5b476dfd0e6cb18a },
+ { 1, 0, 0, 0 } },
+ { { 0x7c5c3e44278c340a, 0x4d54606812d66f3b, 0x29a751b1ae23c5d8,
+ 0x3e29864e8a2ec908 },
+ { 0x142d2a6626dbb850, 0xad1744c4765bd780, 0x1f150e68e322d1ed,
+ 0x239b90ea3dc31e7e },
+ { 1, 0, 0, 0 } },
+ { { 0x78c416527a53322a, 0x305dde6709776f8e, 0xdbcab759f8862ed4,
+ 0x820f4dd949f72ff7 },
+ { 0x6cc544a62b5debd4, 0x75be5d937b4e8cc4, 0x1b481b1b215c14d3,
+ 0x140406ec783a05ec },
+ { 1, 0, 0, 0 } },
+ { { 0x6a703f10e895df07, 0xfd75f3fa01876bd8, 0xeb5b06e70ce08ffe,
+ 0x68f6b8542783dfee },
+ { 0x90c76f8a78712655, 0xcf5293d2f310bf7f, 0xfbc8044dfda45028,
+ 0xcbe1feba92e40ce6 },
+ { 1, 0, 0, 0 } },
+ { { 0xe998ceea4396e4c1, 0xfc82ef0b6acea274, 0x230f729f2250e927,
+ 0xd0b2f94d2f420109 },
+ { 0x4305adddb38d4966, 0x10b838f8624c3b45, 0x7db2636658954e7a,
+ 0x971459828b0719e5 },
+ { 1, 0, 0, 0 } },
+ { { 0x4bd6b72623369fc9, 0x57f2929e53d0b876, 0xc2d5cba4f2340687,
+ 0x961610004a866aba },
+ { 0x49997bcd2e407a5e, 0x69ab197d92ddcb24, 0x2cf1f2438fe5131c,
+ 0x7acb9fadcee75e44 },
+ { 1, 0, 0, 0 } },
+ { { 0x254e839423d2d4c0, 0xf57f0c917aea685b, 0xa60d880f6f75aaea,
+ 0x24eb9acca333bf5b },
+ { 0xe3de4ccb1cda5dea, 0xfeef9341c51a6b4f, 0x743125f88bac4c4d,
+ 0x69f891c5acd079cc },
+ { 1, 0, 0, 0 } },
+ { { 0xeee44b35702476b5, 0x7ed031a0e45c2258, 0xb422d1e7bd6f8514,
+ 0xe51f547c5972a107 },
+ { 0xa25bcd6fc9cf343d, 0x8ca922ee097c184e, 0xa62f98b3a9fe9a06,
+ 0x1c309a2b25bb1387 },
+ { 1, 0, 0, 0 } },
+ { { 0x9295dbeb1967c459, 0xb00148833472c98e, 0xc504977708011828,
+ 0x20b87b8aa2c4e503 },
+ { 0x3063175de057c277, 0x1bd539338fe582dd, 0x0d11adef5f69a044,
+ 0xf5c6fa49919776be },
+ { 1, 0, 0, 0 } },
+ { { 0x8c944e760fd59e11, 0x3876cba1102fad5f, 0xa454c3fad83faa56,
+ 0x1ed7d1b9332010b9 },
+ { 0xa1011a270024b889, 0x05e4d0dcac0cd344, 0x52b520f0eb6a2a24,
+ 0x3a2b03f03217257a },
+ { 1, 0, 0, 0 } },
+ { { 0xf20fc2afdf1d043d, 0xf330240db58d5a62, 0xfc7d229ca0058c3b,
+ 0x15fee545c78dd9f6 },
+ { 0x501e82885bc98cda, 0x41ef80e5d046ac04, 0x557d9f49461210fb,
+ 0x4ab5b6b2b8753f81 },
+ { 1, 0, 0, 0 } } }
};
/*
@@ -1636,7 +1629,7 @@ static const smallfelem gmul[2][16][3] = {
* copies it to out.
*/
static void select_point(const u64 idx, unsigned int size,
- const smallfelem pre_comp[16][3], smallfelem out[3])
+ const smallfelem pre_comp[16][3], smallfelem out[3])
{
unsigned i, j;
u64 *outlimbs = &out[0][0];
@@ -1672,10 +1665,10 @@ static char get_bit(const felem_bytearray in, int i)
* Output point (X, Y, Z) is stored in x_out, y_out, z_out
*/
static void batch_mul(felem x_out, felem y_out, felem z_out,
- const felem_bytearray scalars[],
- const unsigned num_points, const u8 *g_scalar,
- const int mixed, const smallfelem pre_comp[][17][3],
- const smallfelem g_pre_comp[2][16][3])
+ const felem_bytearray scalars[],
+ const unsigned num_points, const u8 *g_scalar,
+ const int mixed, const smallfelem pre_comp[][17][3],
+ const smallfelem g_pre_comp[2][16][3])
{
int i, skip;
unsigned num, gen_mul = (g_scalar != NULL);
@@ -1692,8 +1685,8 @@ static void batch_mul(felem x_out, felem y_out, felem z_out,
* of the generator (two in each of the last 32 rounds) and additions of
* other points multiples (every 5th round).
*/
- skip = 1; /* save two point operations in the first
- * round */
+ skip = 1; /* save two point operations in the first
+ * round */
for (i = (num_points ? 255 : 31); i >= 0; --i) {
/* double */
if (!skip)
@@ -1712,7 +1705,7 @@ static void batch_mul(felem x_out, felem y_out, felem z_out,
if (!skip) {
/* Arg 1 below is for "mixed" */
point_add(nq[0], nq[1], nq[2],
- nq[0], nq[1], nq[2], 1, tmp[0], tmp[1], tmp[2]);
+ nq[0], nq[1], nq[2], 1, tmp[0], tmp[1], tmp[2]);
} else {
smallfelem_expand(nq[0], tmp[0]);
smallfelem_expand(nq[1], tmp[1]);
@@ -1729,7 +1722,7 @@ static void batch_mul(felem x_out, felem y_out, felem z_out,
select_point(bits, 16, g_pre_comp[0], tmp);
/* Arg 1 below is for "mixed" */
point_add(nq[0], nq[1], nq[2],
- nq[0], nq[1], nq[2], 1, tmp[0], tmp[1], tmp[2]);
+ nq[0], nq[1], nq[2], 1, tmp[0], tmp[1], tmp[2]);
}
/* do other additions every 5 doublings */
@@ -1750,13 +1743,13 @@ static void batch_mul(felem x_out, felem y_out, felem z_out,
select_point(digit, 17, pre_comp[num], tmp);
smallfelem_neg(ftmp, tmp[1]); /* (X, -Y, Z) is the negative
* point */
- copy_small_conditional(ftmp, tmp[1], (((limb) sign) - 1));
+ copy_small_conditional(ftmp, tmp[1], (((limb)sign) - 1));
felem_contract(tmp[1], ftmp);
if (!skip) {
point_add(nq[0], nq[1], nq[2],
- nq[0], nq[1], nq[2],
- mixed, tmp[0], tmp[1], tmp[2]);
+ nq[0], nq[1], nq[2],
+ mixed, tmp[0], tmp[1], tmp[2]);
} else {
smallfelem_expand(nq[0], tmp[0]);
smallfelem_expand(nq[1], tmp[1]);
@@ -1798,9 +1791,9 @@ const EC_METHOD *EC_GFp_nistp256_method(void)
ossl_ec_GFp_simple_point_set_to_infinity,
ossl_ec_GFp_simple_point_set_affine_coordinates,
ossl_ec_GFp_nistp256_point_get_affine_coordinates,
- 0 /* point_set_compressed_coordinates */ ,
- 0 /* point2oct */ ,
- 0 /* oct2point */ ,
+ 0 /* point_set_compressed_coordinates */,
+ 0 /* point2oct */,
+ 0 /* oct2point */,
ossl_ec_GFp_simple_add,
ossl_ec_GFp_simple_dbl,
ossl_ec_GFp_simple_invert,
@@ -1814,11 +1807,11 @@ const EC_METHOD *EC_GFp_nistp256_method(void)
ossl_ec_GFp_nistp256_have_precompute_mult,
ossl_ec_GFp_nist_field_mul,
ossl_ec_GFp_nist_field_sqr,
- 0 /* field_div */ ,
+ 0 /* field_div */,
ossl_ec_GFp_simple_field_inv,
- 0 /* field_encode */ ,
- 0 /* field_decode */ ,
- 0, /* field_set_to_one */
+ 0 /* field_encode */,
+ 0 /* field_decode */,
+ 0, /* field_set_to_one */
ossl_ec_key_simple_priv2oct,
ossl_ec_key_simple_oct2priv,
0, /* set private */
@@ -1835,7 +1828,7 @@ const EC_METHOD *EC_GFp_nistp256_method(void)
0, /* blind_coordinates */
0, /* ladder_pre */
0, /* ladder_step */
- 0 /* ladder_post */
+ 0 /* ladder_post */
};
return &ret;
@@ -1899,8 +1892,8 @@ int ossl_ec_GFp_nistp256_group_init(EC_GROUP *group)
}
int ossl_ec_GFp_nistp256_group_set_curve(EC_GROUP *group, const BIGNUM *p,
- const BIGNUM *a, const BIGNUM *b,
- BN_CTX *ctx)
+ const BIGNUM *a, const BIGNUM *b,
+ BN_CTX *ctx)
{
int ret = 0;
BIGNUM *curve_p, *curve_a, *curve_b;
@@ -1928,7 +1921,7 @@ int ossl_ec_GFp_nistp256_group_set_curve(EC_GROUP *group, const BIGNUM *p,
}
group->field_mod_func = BN_nist_mod_256;
ret = ossl_ec_GFp_simple_group_set_curve(group, p, a, b, ctx);
- err:
+err:
BN_CTX_end(ctx);
#ifndef FIPS_MODULE
BN_CTX_free(new_ctx);
@@ -1941,9 +1934,9 @@ int ossl_ec_GFp_nistp256_group_set_curve(EC_GROUP *group, const BIGNUM *p,
* (X/Z^2, Y/Z^3)
*/
int ossl_ec_GFp_nistp256_point_get_affine_coordinates(const EC_GROUP *group,
- const EC_POINT *point,
- BIGNUM *x, BIGNUM *y,
- BN_CTX *ctx)
+ const EC_POINT *point,
+ BIGNUM *x, BIGNUM *y,
+ BN_CTX *ctx)
{
felem z1, z2, x_in, y_in;
smallfelem x_out, y_out;
@@ -1953,8 +1946,7 @@ int ossl_ec_GFp_nistp256_point_get_affine_coordinates(const EC_GROUP *group,
ERR_raise(ERR_LIB_EC, EC_R_POINT_AT_INFINITY);
return 0;
}
- if ((!BN_to_felem(x_in, point->X)) || (!BN_to_felem(y_in, point->Y)) ||
- (!BN_to_felem(z1, point->Z)))
+ if ((!BN_to_felem(x_in, point->X)) || (!BN_to_felem(y_in, point->Y)) || (!BN_to_felem(z1, point->Z)))
return 0;
felem_inv(z2, z1);
felem_square(tmp, z2);
@@ -1984,31 +1976,30 @@ int ossl_ec_GFp_nistp256_point_get_affine_coordinates(const EC_GROUP *group,
/* points below is of size |num|, and tmp_smallfelems is of size |num+1| */
static void make_points_affine(size_t num, smallfelem points[][3],
- smallfelem tmp_smallfelems[])
+ smallfelem tmp_smallfelems[])
{
/*
* Runs in constant time, unless an input is the point at infinity (which
* normally shouldn't happen).
*/
ossl_ec_GFp_nistp_points_make_affine_internal(num,
- points,
- sizeof(smallfelem),
- tmp_smallfelems,
- (void (*)(void *))smallfelem_one,
- smallfelem_is_zero_int,
- (void (*)(void *, const void *))
- smallfelem_assign,
- (void (*)(void *, const void *))
- smallfelem_square_contract,
- (void (*)
- (void *, const void *,
- const void *))
- smallfelem_mul_contract,
- (void (*)(void *, const void *))
- smallfelem_inv_contract,
- /* nothing to contract */
- (void (*)(void *, const void *))
- smallfelem_assign);
+ points,
+ sizeof(smallfelem),
+ tmp_smallfelems,
+ (void (*)(void *))smallfelem_one,
+ smallfelem_is_zero_int,
+ (void (*)(void *, const void *))
+ smallfelem_assign,
+ (void (*)(void *, const void *))
+ smallfelem_square_contract,
+ (void (*)(void *, const void *,
+ const void *))
+ smallfelem_mul_contract,
+ (void (*)(void *, const void *))
+ smallfelem_inv_contract,
+ /* nothing to contract */
+ (void (*)(void *, const void *))
+ smallfelem_assign);
}
/*
@@ -2016,9 +2007,9 @@ static void make_points_affine(size_t num, smallfelem points[][3],
* values Result is stored in r (r can equal one of the inputs).
*/
int ossl_ec_GFp_nistp256_points_mul(const EC_GROUP *group, EC_POINT *r,
- const BIGNUM *scalar, size_t num,
- const EC_POINT *points[],
- const BIGNUM *scalars[], BN_CTX *ctx)
+ const BIGNUM *scalar, size_t num,
+ const EC_POINT *points[],
+ const BIGNUM *scalars[], BN_CTX *ctx)
{
int ret = 0;
int j;
@@ -2026,7 +2017,7 @@ int ossl_ec_GFp_nistp256_points_mul(const EC_GROUP *group, EC_POINT *r,
BIGNUM *x, *y, *z, *tmp_scalar;
felem_bytearray g_secret;
felem_bytearray *secrets = NULL;
- smallfelem (*pre_comp)[17][3] = NULL;
+ smallfelem(*pre_comp)[17][3] = NULL;
smallfelem *tmp_smallfelems = NULL;
unsigned i;
int num_bytes;
@@ -2060,15 +2051,13 @@ int ossl_ec_GFp_nistp256_points_mul(const EC_GROUP *group, EC_POINT *r,
if (generator == NULL)
goto err;
/* get the generator from precomputation */
- if (!smallfelem_to_BN(x, g_pre_comp[0][1][0]) ||
- !smallfelem_to_BN(y, g_pre_comp[0][1][1]) ||
- !smallfelem_to_BN(z, g_pre_comp[0][1][2])) {
+ if (!smallfelem_to_BN(x, g_pre_comp[0][1][0]) || !smallfelem_to_BN(y, g_pre_comp[0][1][1]) || !smallfelem_to_BN(z, g_pre_comp[0][1][2])) {
ERR_raise(ERR_LIB_EC, ERR_R_BN_LIB);
goto err;
}
if (!ossl_ec_GFp_simple_set_Jprojective_coordinates_GFp(group,
- generator,
- x, y, z, ctx))
+ generator,
+ x, y, z, ctx))
goto err;
if (0 == EC_POINT_cmp(group, generator, group->generator, ctx))
/* precomputation matches generator */
@@ -2092,7 +2081,7 @@ int ossl_ec_GFp_nistp256_points_mul(const EC_GROUP *group, EC_POINT *r,
pre_comp = OPENSSL_calloc(num_points, sizeof(*pre_comp));
if (mixed)
tmp_smallfelems = OPENSSL_malloc_array(num_points * 17 + 1,
- sizeof(*tmp_smallfelems));
+ sizeof(*tmp_smallfelems));
if ((secrets == NULL) || (pre_comp == NULL)
|| (mixed && (tmp_smallfelems == NULL)))
goto err;
@@ -2127,19 +2116,17 @@ int ossl_ec_GFp_nistp256_points_mul(const EC_GROUP *group, EC_POINT *r,
goto err;
}
num_bytes = BN_bn2lebinpad(tmp_scalar,
- secrets[i], sizeof(secrets[i]));
+ secrets[i], sizeof(secrets[i]));
} else {
num_bytes = BN_bn2lebinpad(p_scalar,
- secrets[i], sizeof(secrets[i]));
+ secrets[i], sizeof(secrets[i]));
}
if (num_bytes < 0) {
ERR_raise(ERR_LIB_EC, ERR_R_BN_LIB);
goto err;
}
/* precompute multiples */
- if ((!BN_to_felem(x_out, p->X)) ||
- (!BN_to_felem(y_out, p->Y)) ||
- (!BN_to_felem(z_out, p->Z)))
+ if ((!BN_to_felem(x_out, p->X)) || (!BN_to_felem(y_out, p->Y)) || (!BN_to_felem(z_out, p->Z)))
goto err;
felem_shrink(pre_comp[i][1][0], x_out);
felem_shrink(pre_comp[i][1][1], y_out);
@@ -2147,18 +2134,18 @@ int ossl_ec_GFp_nistp256_points_mul(const EC_GROUP *group, EC_POINT *r,
for (j = 2; j <= 16; ++j) {
if (j & 1) {
point_add_small(pre_comp[i][j][0], pre_comp[i][j][1],
- pre_comp[i][j][2], pre_comp[i][1][0],
- pre_comp[i][1][1], pre_comp[i][1][2],
- pre_comp[i][j - 1][0],
- pre_comp[i][j - 1][1],
- pre_comp[i][j - 1][2]);
+ pre_comp[i][j][2], pre_comp[i][1][0],
+ pre_comp[i][1][1], pre_comp[i][1][2],
+ pre_comp[i][j - 1][0],
+ pre_comp[i][j - 1][1],
+ pre_comp[i][j - 1][2]);
} else {
point_double_small(pre_comp[i][j][0],
- pre_comp[i][j][1],
- pre_comp[i][j][2],
- pre_comp[i][j / 2][0],
- pre_comp[i][j / 2][1],
- pre_comp[i][j / 2][2]);
+ pre_comp[i][j][1],
+ pre_comp[i][j][2],
+ pre_comp[i][j / 2][0],
+ pre_comp[i][j / 2][1],
+ pre_comp[i][j / 2][2]);
}
}
}
@@ -2186,28 +2173,27 @@ int ossl_ec_GFp_nistp256_points_mul(const EC_GROUP *group, EC_POINT *r,
}
/* do the multiplication with generator precomputation */
batch_mul(x_out, y_out, z_out,
- (const felem_bytearray(*))secrets, num_points,
- g_secret,
- mixed, (const smallfelem(*)[17][3])pre_comp, g_pre_comp);
+ (const felem_bytearray(*))secrets, num_points,
+ g_secret,
+ mixed, (const smallfelem(*)[17][3])pre_comp, g_pre_comp);
} else {
/* do the multiplication without generator precomputation */
batch_mul(x_out, y_out, z_out,
- (const felem_bytearray(*))secrets, num_points,
- NULL, mixed, (const smallfelem(*)[17][3])pre_comp, NULL);
+ (const felem_bytearray(*))secrets, num_points,
+ NULL, mixed, (const smallfelem(*)[17][3])pre_comp, NULL);
}
/* reduce the output to its unique minimal representation */
felem_contract(x_in, x_out);
felem_contract(y_in, y_out);
felem_contract(z_in, z_out);
- if ((!smallfelem_to_BN(x, x_in)) || (!smallfelem_to_BN(y, y_in)) ||
- (!smallfelem_to_BN(z, z_in))) {
+ if ((!smallfelem_to_BN(x, x_in)) || (!smallfelem_to_BN(y, y_in)) || (!smallfelem_to_BN(z, z_in))) {
ERR_raise(ERR_LIB_EC, ERR_R_BN_LIB);
goto err;
}
ret = ossl_ec_GFp_simple_set_Jprojective_coordinates_GFp(group, r, x, y, z,
- ctx);
+ ctx);
- err:
+err:
BN_CTX_end(ctx);
EC_POINT_free(generator);
OPENSSL_free(secrets);
@@ -2263,9 +2249,7 @@ int ossl_ec_GFp_nistp256_precompute_mult(EC_GROUP *group, BN_CTX *ctx)
memcpy(pre->g_pre_comp, gmul, sizeof(pre->g_pre_comp));
goto done;
}
- if ((!BN_to_felem(x_tmp, group->generator->X)) ||
- (!BN_to_felem(y_tmp, group->generator->Y)) ||
- (!BN_to_felem(z_tmp, group->generator->Z)))
+ if ((!BN_to_felem(x_tmp, group->generator->X)) || (!BN_to_felem(y_tmp, group->generator->Y)) || (!BN_to_felem(z_tmp, group->generator->Z)))
goto err;
felem_shrink(pre->g_pre_comp[0][1][0], x_tmp);
felem_shrink(pre->g_pre_comp[0][1][1], y_tmp);
@@ -2276,31 +2260,31 @@ int ossl_ec_GFp_nistp256_precompute_mult(EC_GROUP *group, BN_CTX *ctx)
*/
for (i = 1; i <= 8; i <<= 1) {
point_double_small(pre->g_pre_comp[1][i][0], pre->g_pre_comp[1][i][1],
- pre->g_pre_comp[1][i][2], pre->g_pre_comp[0][i][0],
- pre->g_pre_comp[0][i][1],
- pre->g_pre_comp[0][i][2]);
+ pre->g_pre_comp[1][i][2], pre->g_pre_comp[0][i][0],
+ pre->g_pre_comp[0][i][1],
+ pre->g_pre_comp[0][i][2]);
for (j = 0; j < 31; ++j) {
point_double_small(pre->g_pre_comp[1][i][0],
- pre->g_pre_comp[1][i][1],
- pre->g_pre_comp[1][i][2],
- pre->g_pre_comp[1][i][0],
- pre->g_pre_comp[1][i][1],
- pre->g_pre_comp[1][i][2]);
+ pre->g_pre_comp[1][i][1],
+ pre->g_pre_comp[1][i][2],
+ pre->g_pre_comp[1][i][0],
+ pre->g_pre_comp[1][i][1],
+ pre->g_pre_comp[1][i][2]);
}
if (i == 8)
break;
point_double_small(pre->g_pre_comp[0][2 * i][0],
- pre->g_pre_comp[0][2 * i][1],
- pre->g_pre_comp[0][2 * i][2],
- pre->g_pre_comp[1][i][0], pre->g_pre_comp[1][i][1],
- pre->g_pre_comp[1][i][2]);
+ pre->g_pre_comp[0][2 * i][1],
+ pre->g_pre_comp[0][2 * i][2],
+ pre->g_pre_comp[1][i][0], pre->g_pre_comp[1][i][1],
+ pre->g_pre_comp[1][i][2]);
for (j = 0; j < 31; ++j) {
point_double_small(pre->g_pre_comp[0][2 * i][0],
- pre->g_pre_comp[0][2 * i][1],
- pre->g_pre_comp[0][2 * i][2],
- pre->g_pre_comp[0][2 * i][0],
- pre->g_pre_comp[0][2 * i][1],
- pre->g_pre_comp[0][2 * i][2]);
+ pre->g_pre_comp[0][2 * i][1],
+ pre->g_pre_comp[0][2 * i][2],
+ pre->g_pre_comp[0][2 * i][0],
+ pre->g_pre_comp[0][2 * i][1],
+ pre->g_pre_comp[0][2 * i][2]);
}
}
for (i = 0; i < 2; i++) {
@@ -2309,51 +2293,51 @@ int ossl_ec_GFp_nistp256_precompute_mult(EC_GROUP *group, BN_CTX *ctx)
/* the remaining multiples */
/* 2^64*G + 2^128*G resp. 2^96*G + 2^160*G */
point_add_small(pre->g_pre_comp[i][6][0], pre->g_pre_comp[i][6][1],
- pre->g_pre_comp[i][6][2], pre->g_pre_comp[i][4][0],
- pre->g_pre_comp[i][4][1], pre->g_pre_comp[i][4][2],
- pre->g_pre_comp[i][2][0], pre->g_pre_comp[i][2][1],
- pre->g_pre_comp[i][2][2]);
+ pre->g_pre_comp[i][6][2], pre->g_pre_comp[i][4][0],
+ pre->g_pre_comp[i][4][1], pre->g_pre_comp[i][4][2],
+ pre->g_pre_comp[i][2][0], pre->g_pre_comp[i][2][1],
+ pre->g_pre_comp[i][2][2]);
/* 2^64*G + 2^192*G resp. 2^96*G + 2^224*G */
point_add_small(pre->g_pre_comp[i][10][0], pre->g_pre_comp[i][10][1],
- pre->g_pre_comp[i][10][2], pre->g_pre_comp[i][8][0],
- pre->g_pre_comp[i][8][1], pre->g_pre_comp[i][8][2],
- pre->g_pre_comp[i][2][0], pre->g_pre_comp[i][2][1],
- pre->g_pre_comp[i][2][2]);
+ pre->g_pre_comp[i][10][2], pre->g_pre_comp[i][8][0],
+ pre->g_pre_comp[i][8][1], pre->g_pre_comp[i][8][2],
+ pre->g_pre_comp[i][2][0], pre->g_pre_comp[i][2][1],
+ pre->g_pre_comp[i][2][2]);
/* 2^128*G + 2^192*G resp. 2^160*G + 2^224*G */
point_add_small(pre->g_pre_comp[i][12][0], pre->g_pre_comp[i][12][1],
- pre->g_pre_comp[i][12][2], pre->g_pre_comp[i][8][0],
- pre->g_pre_comp[i][8][1], pre->g_pre_comp[i][8][2],
- pre->g_pre_comp[i][4][0], pre->g_pre_comp[i][4][1],
- pre->g_pre_comp[i][4][2]);
+ pre->g_pre_comp[i][12][2], pre->g_pre_comp[i][8][0],
+ pre->g_pre_comp[i][8][1], pre->g_pre_comp[i][8][2],
+ pre->g_pre_comp[i][4][0], pre->g_pre_comp[i][4][1],
+ pre->g_pre_comp[i][4][2]);
/*
* 2^64*G + 2^128*G + 2^192*G resp. 2^96*G + 2^160*G + 2^224*G
*/
point_add_small(pre->g_pre_comp[i][14][0], pre->g_pre_comp[i][14][1],
- pre->g_pre_comp[i][14][2], pre->g_pre_comp[i][12][0],
- pre->g_pre_comp[i][12][1], pre->g_pre_comp[i][12][2],
- pre->g_pre_comp[i][2][0], pre->g_pre_comp[i][2][1],
- pre->g_pre_comp[i][2][2]);
+ pre->g_pre_comp[i][14][2], pre->g_pre_comp[i][12][0],
+ pre->g_pre_comp[i][12][1], pre->g_pre_comp[i][12][2],
+ pre->g_pre_comp[i][2][0], pre->g_pre_comp[i][2][1],
+ pre->g_pre_comp[i][2][2]);
for (j = 1; j < 8; ++j) {
/* odd multiples: add G resp. 2^32*G */
point_add_small(pre->g_pre_comp[i][2 * j + 1][0],
- pre->g_pre_comp[i][2 * j + 1][1],
- pre->g_pre_comp[i][2 * j + 1][2],
- pre->g_pre_comp[i][2 * j][0],
- pre->g_pre_comp[i][2 * j][1],
- pre->g_pre_comp[i][2 * j][2],
- pre->g_pre_comp[i][1][0],
- pre->g_pre_comp[i][1][1],
- pre->g_pre_comp[i][1][2]);
+ pre->g_pre_comp[i][2 * j + 1][1],
+ pre->g_pre_comp[i][2 * j + 1][2],
+ pre->g_pre_comp[i][2 * j][0],
+ pre->g_pre_comp[i][2 * j][1],
+ pre->g_pre_comp[i][2 * j][2],
+ pre->g_pre_comp[i][1][0],
+ pre->g_pre_comp[i][1][1],
+ pre->g_pre_comp[i][1][2]);
}
}
make_points_affine(31, &(pre->g_pre_comp[0][1]), tmp_smallfelems);
- done:
+done:
SETPRECOMP(group, nistp256, pre);
pre = NULL;
ret = 1;
- err:
+err:
BN_CTX_end(ctx);
EC_POINT_free(generator);
#ifndef FIPS_MODULE
diff --git a/crypto/ec/ecp_nistp384.c b/crypto/ec/ecp_nistp384.c
index a049d7d68e..ce42edad05 100644
--- a/crypto/ec/ecp_nistp384.c
+++ b/crypto/ec/ecp_nistp384.c
@@ -38,7 +38,7 @@
#include "internal/numbers.h"
#ifndef INT128_MAX
-# error "Your compiler doesn't appear to support 128-bit integer types"
+#error "Your compiler doesn't appear to support 128-bit integer types"
#endif
typedef uint8_t u8;
@@ -57,26 +57,26 @@ typedef u8 felem_bytearray[48];
* These values are big-endian.
*/
static const felem_bytearray nistp384_curve_params[5] = {
- {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, /* p */
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF},
- {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, /* a = -3 */
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFC},
- {0xB3, 0x31, 0x2F, 0xA7, 0xE2, 0x3E, 0xE7, 0xE4, 0x98, 0x8E, 0x05, 0x6B, /* b */
- 0xE3, 0xF8, 0x2D, 0x19, 0x18, 0x1D, 0x9C, 0x6E, 0xFE, 0x81, 0x41, 0x12,
- 0x03, 0x14, 0x08, 0x8F, 0x50, 0x13, 0x87, 0x5A, 0xC6, 0x56, 0x39, 0x8D,
- 0x8A, 0x2E, 0xD1, 0x9D, 0x2A, 0x85, 0xC8, 0xED, 0xD3, 0xEC, 0x2A, 0xEF},
- {0xAA, 0x87, 0xCA, 0x22, 0xBE, 0x8B, 0x05, 0x37, 0x8E, 0xB1, 0xC7, 0x1E, /* x */
- 0xF3, 0x20, 0xAD, 0x74, 0x6E, 0x1D, 0x3B, 0x62, 0x8B, 0xA7, 0x9B, 0x98,
- 0x59, 0xF7, 0x41, 0xE0, 0x82, 0x54, 0x2A, 0x38, 0x55, 0x02, 0xF2, 0x5D,
- 0xBF, 0x55, 0x29, 0x6C, 0x3A, 0x54, 0x5E, 0x38, 0x72, 0x76, 0x0A, 0xB7},
- {0x36, 0x17, 0xDE, 0x4A, 0x96, 0x26, 0x2C, 0x6F, 0x5D, 0x9E, 0x98, 0xBF, /* y */
- 0x92, 0x92, 0xDC, 0x29, 0xF8, 0xF4, 0x1D, 0xBD, 0x28, 0x9A, 0x14, 0x7C,
- 0xE9, 0xDA, 0x31, 0x13, 0xB5, 0xF0, 0xB8, 0xC0, 0x0A, 0x60, 0xB1, 0xCE,
- 0x1D, 0x7E, 0x81, 0x9D, 0x7A, 0x43, 0x1D, 0x7C, 0x90, 0xEA, 0x0E, 0x5F},
+ { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, /* p */
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF },
+ { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, /* a = -3 */
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFC },
+ { 0xB3, 0x31, 0x2F, 0xA7, 0xE2, 0x3E, 0xE7, 0xE4, 0x98, 0x8E, 0x05, 0x6B, /* b */
+ 0xE3, 0xF8, 0x2D, 0x19, 0x18, 0x1D, 0x9C, 0x6E, 0xFE, 0x81, 0x41, 0x12,
+ 0x03, 0x14, 0x08, 0x8F, 0x50, 0x13, 0x87, 0x5A, 0xC6, 0x56, 0x39, 0x8D,
+ 0x8A, 0x2E, 0xD1, 0x9D, 0x2A, 0x85, 0xC8, 0xED, 0xD3, 0xEC, 0x2A, 0xEF },
+ { 0xAA, 0x87, 0xCA, 0x22, 0xBE, 0x8B, 0x05, 0x37, 0x8E, 0xB1, 0xC7, 0x1E, /* x */
+ 0xF3, 0x20, 0xAD, 0x74, 0x6E, 0x1D, 0x3B, 0x62, 0x8B, 0xA7, 0x9B, 0x98,
+ 0x59, 0xF7, 0x41, 0xE0, 0x82, 0x54, 0x2A, 0x38, 0x55, 0x02, 0xF2, 0x5D,
+ 0xBF, 0x55, 0x29, 0x6C, 0x3A, 0x54, 0x5E, 0x38, 0x72, 0x76, 0x0A, 0xB7 },
+ { 0x36, 0x17, 0xDE, 0x4A, 0x96, 0x26, 0x2C, 0x6F, 0x5D, 0x9E, 0x98, 0xBF, /* y */
+ 0x92, 0x92, 0xDC, 0x29, 0xF8, 0xF4, 0x1D, 0xBD, 0x28, 0x9A, 0x14, 0x7C,
+ 0xE9, 0xDA, 0x31, 0x13, 0xB5, 0xF0, 0xB8, 0xC0, 0x0A, 0x60, 0xB1, 0xCE,
+ 0x1D, 0x7E, 0x81, 0x9D, 0x7A, 0x43, 0x1D, 0x7C, 0x90, 0xEA, 0x0E, 0x5F },
};
/*-
@@ -108,7 +108,7 @@ typedef uint64_t limb;
typedef uint128_t widelimb;
typedef limb limb_aX __attribute((__aligned__(1)));
typedef limb felem[NLIMBS];
-typedef widelimb widefelem[2*NLIMBS-1];
+typedef widelimb widefelem[2 * NLIMBS - 1];
static const limb bottom56bits = 0xffffffffffffff;
@@ -116,24 +116,24 @@ static const limb bottom56bits = 0xffffffffffffff;
static void bin48_to_felem(felem out, const u8 in[48])
{
memset(out, 0, 56);
- out[0] = (*((limb *) & in[0])) & bottom56bits;
- out[1] = (*((limb_aX *) & in[7])) & bottom56bits;
- out[2] = (*((limb_aX *) & in[14])) & bottom56bits;
- out[3] = (*((limb_aX *) & in[21])) & bottom56bits;
- out[4] = (*((limb_aX *) & in[28])) & bottom56bits;
- out[5] = (*((limb_aX *) & in[35])) & bottom56bits;
+ out[0] = (*((limb *)&in[0])) & bottom56bits;
+ out[1] = (*((limb_aX *)&in[7])) & bottom56bits;
+ out[2] = (*((limb_aX *)&in[14])) & bottom56bits;
+ out[3] = (*((limb_aX *)&in[21])) & bottom56bits;
+ out[4] = (*((limb_aX *)&in[28])) & bottom56bits;
+ out[5] = (*((limb_aX *)&in[35])) & bottom56bits;
memmove(&out[6], &in[42], 6);
}
static void felem_to_bin48(u8 out[48], const felem in)
{
memset(out, 0, 48);
- (*((limb *) & out[0])) |= (in[0] & bottom56bits);
- (*((limb_aX *) & out[7])) |= (in[1] & bottom56bits);
- (*((limb_aX *) & out[14])) |= (in[2] & bottom56bits);
- (*((limb_aX *) & out[21])) |= (in[3] & bottom56bits);
- (*((limb_aX *) & out[28])) |= (in[4] & bottom56bits);
- (*((limb_aX *) & out[35])) |= (in[5] & bottom56bits);
+ (*((limb *)&out[0])) |= (in[0] & bottom56bits);
+ (*((limb_aX *)&out[7])) |= (in[1] & bottom56bits);
+ (*((limb_aX *)&out[14])) |= (in[2] & bottom56bits);
+ (*((limb_aX *)&out[21])) |= (in[3] & bottom56bits);
+ (*((limb_aX *)&out[28])) |= (in[4] & bottom56bits);
+ (*((limb_aX *)&out[35])) |= (in[5] & bottom56bits);
memmove(&out[42], &in[6], 6);
}
@@ -173,7 +173,7 @@ static BIGNUM *felem_to_BN(BIGNUM *out, const felem in)
static void felem_one(felem out)
{
out[0] = 1;
- memset(&out[1], 0, sizeof(limb) * (NLIMBS-1));
+ memset(&out[1], 0, sizeof(limb) * (NLIMBS - 1));
}
static void felem_assign(felem out, const felem in)
@@ -213,7 +213,7 @@ static void felem_scalar128(widefelem out, limb scalar)
{
unsigned int i;
- for (i = 0; i < 2*NLIMBS-1; i++)
+ for (i = 0; i < 2 * NLIMBS - 1; i++)
out[i] *= scalar;
}
@@ -231,17 +231,17 @@ static void felem_neg(felem out, const felem in)
* Use telescopic sums to represent 2^12 * p redundantly with each limb
* of the form 2^60 + ...
*/
- static const limb two60m52m4 = (((limb) 1) << 60)
- - (((limb) 1) << 52)
- - (((limb) 1) << 4);
- static const limb two60p44m12 = (((limb) 1) << 60)
- + (((limb) 1) << 44)
- - (((limb) 1) << 12);
- static const limb two60m28m4 = (((limb) 1) << 60)
- - (((limb) 1) << 28)
- - (((limb) 1) << 4);
- static const limb two60m4 = (((limb) 1) << 60)
- - (((limb) 1) << 4);
+ static const limb two60m52m4 = (((limb)1) << 60)
+ - (((limb)1) << 52)
+ - (((limb)1) << 4);
+ static const limb two60p44m12 = (((limb)1) << 60)
+ + (((limb)1) << 44)
+ - (((limb)1) << 12);
+ static const limb two60m28m4 = (((limb)1) << 60)
+ - (((limb)1) << 28)
+ - (((limb)1) << 4);
+ static const limb two60m4 = (((limb)1) << 60)
+ - (((limb)1) << 4);
out[0] = two60p44m12 - in[0];
out[1] = two60m52m4 - in[1];
@@ -257,9 +257,9 @@ void p384_felem_diff64(felem out, const felem in);
void p384_felem_diff128(widefelem out, const widefelem in);
void p384_felem_diff_128_64(widefelem out, const felem in);
-# define felem_diff64 p384_felem_diff64
-# define felem_diff128 p384_felem_diff128
-# define felem_diff_128_64 p384_felem_diff_128_64
+#define felem_diff64 p384_felem_diff64
+#define felem_diff128 p384_felem_diff128
+#define felem_diff_128_64 p384_felem_diff_128_64
#else
/*-
@@ -277,17 +277,17 @@ static void felem_diff64(felem out, const felem in)
* of the form 2^60 + ...
*/
- static const limb two60m52m4 = (((limb) 1) << 60)
- - (((limb) 1) << 52)
- - (((limb) 1) << 4);
- static const limb two60p44m12 = (((limb) 1) << 60)
- + (((limb) 1) << 44)
- - (((limb) 1) << 12);
- static const limb two60m28m4 = (((limb) 1) << 60)
- - (((limb) 1) << 28)
- - (((limb) 1) << 4);
- static const limb two60m4 = (((limb) 1) << 60)
- - (((limb) 1) << 4);
+ static const limb two60m52m4 = (((limb)1) << 60)
+ - (((limb)1) << 52)
+ - (((limb)1) << 4);
+ static const limb two60p44m12 = (((limb)1) << 60)
+ + (((limb)1) << 44)
+ - (((limb)1) << 12);
+ static const limb two60m28m4 = (((limb)1) << 60)
+ - (((limb)1) << 28)
+ - (((limb)1) << 4);
+ static const limb two60m4 = (((limb)1) << 60)
+ - (((limb)1) << 4);
out[0] += two60p44m12 - in[0];
out[1] += two60m52m4 - in[1];
@@ -310,17 +310,17 @@ static void felem_diff_128_64(widefelem out, const felem in)
* of the form 2^64 + ...
*/
- static const widelimb two64m56m8 = (((widelimb) 1) << 64)
- - (((widelimb) 1) << 56)
- - (((widelimb) 1) << 8);
- static const widelimb two64m32m8 = (((widelimb) 1) << 64)
- - (((widelimb) 1) << 32)
- - (((widelimb) 1) << 8);
- static const widelimb two64m8 = (((widelimb) 1) << 64)
- - (((widelimb) 1) << 8);
- static const widelimb two64p48m16 = (((widelimb) 1) << 64)
- + (((widelimb) 1) << 48)
- - (((widelimb) 1) << 16);
+ static const widelimb two64m56m8 = (((widelimb)1) << 64)
+ - (((widelimb)1) << 56)
+ - (((widelimb)1) << 8);
+ static const widelimb two64m32m8 = (((widelimb)1) << 64)
+ - (((widelimb)1) << 32)
+ - (((widelimb)1) << 8);
+ static const widelimb two64m8 = (((widelimb)1) << 64)
+ - (((widelimb)1) << 8);
+ static const widelimb two64p48m16 = (((widelimb)1) << 64)
+ + (((widelimb)1) << 48)
+ - (((widelimb)1) << 16);
unsigned int i;
out[0] += two64p48m16;
@@ -347,36 +347,36 @@ static void felem_diff128(widefelem out, const widefelem in)
* of the form 2^127 + ...
*/
- static const widelimb two127 = ((widelimb) 1) << 127;
- static const widelimb two127m71 = (((widelimb) 1) << 127)
- - (((widelimb) 1) << 71);
- static const widelimb two127p111m79m71 = (((widelimb) 1) << 127)
- + (((widelimb) 1) << 111)
- - (((widelimb) 1) << 79)
- - (((widelimb) 1) << 71);
- static const widelimb two127m119m71 = (((widelimb) 1) << 127)
- - (((widelimb) 1) << 119)
- - (((widelimb) 1) << 71);
- static const widelimb two127m95m71 = (((widelimb) 1) << 127)
- - (((widelimb) 1) << 95)
- - (((widelimb) 1) << 71);
+ static const widelimb two127 = ((widelimb)1) << 127;
+ static const widelimb two127m71 = (((widelimb)1) << 127)
+ - (((widelimb)1) << 71);
+ static const widelimb two127p111m79m71 = (((widelimb)1) << 127)
+ + (((widelimb)1) << 111)
+ - (((widelimb)1) << 79)
+ - (((widelimb)1) << 71);
+ static const widelimb two127m119m71 = (((widelimb)1) << 127)
+ - (((widelimb)1) << 119)
+ - (((widelimb)1) << 71);
+ static const widelimb two127m95m71 = (((widelimb)1) << 127)
+ - (((widelimb)1) << 95)
+ - (((widelimb)1) << 71);
unsigned int i;
- out[0] += two127;
- out[1] += two127m71;
- out[2] += two127m71;
- out[3] += two127m71;
- out[4] += two127m71;
- out[5] += two127m71;
- out[6] += two127p111m79m71;
- out[7] += two127m119m71;
- out[8] += two127m95m71;
- out[9] += two127m71;
+ out[0] += two127;
+ out[1] += two127m71;
+ out[2] += two127m71;
+ out[3] += two127m71;
+ out[4] += two127m71;
+ out[5] += two127m71;
+ out[6] += two127p111m79m71;
+ out[7] += two127m119m71;
+ out[8] += two127m95m71;
+ out[9] += two127m71;
out[10] += two127m71;
out[11] += two127m71;
out[12] += two127m71;
- for (i = 0; i < 2*NLIMBS-1; i++)
+ for (i = 0; i < 2 * NLIMBS - 1; i++)
out[i] -= in[i];
}
#endif /* ECP_NISTP384_ASM */
@@ -386,111 +386,111 @@ static void felem_square_ref(widefelem out, const felem in)
felem inx2;
felem_scalar(inx2, in, 2);
- out[0] = ((uint128_t) in[0]) * in[0];
+ out[0] = ((uint128_t)in[0]) * in[0];
- out[1] = ((uint128_t) in[0]) * inx2[1];
+ out[1] = ((uint128_t)in[0]) * inx2[1];
- out[2] = ((uint128_t) in[0]) * inx2[2]
- + ((uint128_t) in[1]) * in[1];
+ out[2] = ((uint128_t)in[0]) * inx2[2]
+ + ((uint128_t)in[1]) * in[1];
- out[3] = ((uint128_t) in[0]) * inx2[3]
- + ((uint128_t) in[1]) * inx2[2];
+ out[3] = ((uint128_t)in[0]) * inx2[3]
+ + ((uint128_t)in[1]) * inx2[2];
- out[4] = ((uint128_t) in[0]) * inx2[4]
- + ((uint128_t) in[1]) * inx2[3]
- + ((uint128_t) in[2]) * in[2];
+ out[4] = ((uint128_t)in[0]) * inx2[4]
+ + ((uint128_t)in[1]) * inx2[3]
+ + ((uint128_t)in[2]) * in[2];
- out[5] = ((uint128_t) in[0]) * inx2[5]
- + ((uint128_t) in[1]) * inx2[4]
- + ((uint128_t) in[2]) * inx2[3];
+ out[5] = ((uint128_t)in[0]) * inx2[5]
+ + ((uint128_t)in[1]) * inx2[4]
+ + ((uint128_t)in[2]) * inx2[3];
- out[6] = ((uint128_t) in[0]) * inx2[6]
- + ((uint128_t) in[1]) * inx2[5]
- + ((uint128_t) in[2]) * inx2[4]
- + ((uint128_t) in[3]) * in[3];
+ out[6] = ((uint128_t)in[0]) * inx2[6]
+ + ((uint128_t)in[1]) * inx2[5]
+ + ((uint128_t)in[2]) * inx2[4]
+ + ((uint128_t)in[3]) * in[3];
- out[7] = ((uint128_t) in[1]) * inx2[6]
- + ((uint128_t) in[2]) * inx2[5]
- + ((uint128_t) in[3]) * inx2[4];
+ out[7] = ((uint128_t)in[1]) * inx2[6]
+ + ((uint128_t)in[2]) * inx2[5]
+ + ((uint128_t)in[3]) * inx2[4];
- out[8] = ((uint128_t) in[2]) * inx2[6]
- + ((uint128_t) in[3]) * inx2[5]
- + ((uint128_t) in[4]) * in[4];
+ out[8] = ((uint128_t)in[2]) * inx2[6]
+ + ((uint128_t)in[3]) * inx2[5]
+ + ((uint128_t)in[4]) * in[4];
- out[9] = ((uint128_t) in[3]) * inx2[6]
- + ((uint128_t) in[4]) * inx2[5];
+ out[9] = ((uint128_t)in[3]) * inx2[6]
+ + ((uint128_t)in[4]) * inx2[5];
- out[10] = ((uint128_t) in[4]) * inx2[6]
- + ((uint128_t) in[5]) * in[5];
+ out[10] = ((uint128_t)in[4]) * inx2[6]
+ + ((uint128_t)in[5]) * in[5];
- out[11] = ((uint128_t) in[5]) * inx2[6];
+ out[11] = ((uint128_t)in[5]) * inx2[6];
- out[12] = ((uint128_t) in[6]) * in[6];
+ out[12] = ((uint128_t)in[6]) * in[6];
}
static void felem_mul_ref(widefelem out, const felem in1, const felem in2)
{
- out[0] = ((uint128_t) in1[0]) * in2[0];
-
- out[1] = ((uint128_t) in1[0]) * in2[1]
- + ((uint128_t) in1[1]) * in2[0];
-
- out[2] = ((uint128_t) in1[0]) * in2[2]
- + ((uint128_t) in1[1]) * in2[1]
- + ((uint128_t) in1[2]) * in2[0];
-
- out[3] = ((uint128_t) in1[0]) * in2[3]
- + ((uint128_t) in1[1]) * in2[2]
- + ((uint128_t) in1[2]) * in2[1]
- + ((uint128_t) in1[3]) * in2[0];
-
- out[4] = ((uint128_t) in1[0]) * in2[4]
- + ((uint128_t) in1[1]) * in2[3]
- + ((uint128_t) in1[2]) * in2[2]
- + ((uint128_t) in1[3]) * in2[1]
- + ((uint128_t) in1[4]) * in2[0];
-
- out[5] = ((uint128_t) in1[0]) * in2[5]
- + ((uint128_t) in1[1]) * in2[4]
- + ((uint128_t) in1[2]) * in2[3]
- + ((uint128_t) in1[3]) * in2[2]
- + ((uint128_t) in1[4]) * in2[1]
- + ((uint128_t) in1[5]) * in2[0];
-
- out[6] = ((uint128_t) in1[0]) * in2[6]
- + ((uint128_t) in1[1]) * in2[5]
- + ((uint128_t) in1[2]) * in2[4]
- + ((uint128_t) in1[3]) * in2[3]
- + ((uint128_t) in1[4]) * in2[2]
- + ((uint128_t) in1[5]) * in2[1]
- + ((uint128_t) in1[6]) * in2[0];
-
- out[7] = ((uint128_t) in1[1]) * in2[6]
- + ((uint128_t) in1[2]) * in2[5]
- + ((uint128_t) in1[3]) * in2[4]
- + ((uint128_t) in1[4]) * in2[3]
- + ((uint128_t) in1[5]) * in2[2]
- + ((uint128_t) in1[6]) * in2[1];
-
- out[8] = ((uint128_t) in1[2]) * in2[6]
- + ((uint128_t) in1[3]) * in2[5]
- + ((uint128_t) in1[4]) * in2[4]
- + ((uint128_t) in1[5]) * in2[3]
- + ((uint128_t) in1[6]) * in2[2];
-
- out[9] = ((uint128_t) in1[3]) * in2[6]
- + ((uint128_t) in1[4]) * in2[5]
- + ((uint128_t) in1[5]) * in2[4]
- + ((uint128_t) in1[6]) * in2[3];
-
- out[10] = ((uint128_t) in1[4]) * in2[6]
- + ((uint128_t) in1[5]) * in2[5]
- + ((uint128_t) in1[6]) * in2[4];
-
- out[11] = ((uint128_t) in1[5]) * in2[6]
- + ((uint128_t) in1[6]) * in2[5];
-
- out[12] = ((uint128_t) in1[6]) * in2[6];
+ out[0] = ((uint128_t)in1[0]) * in2[0];
+
+ out[1] = ((uint128_t)in1[0]) * in2[1]
+ + ((uint128_t)in1[1]) * in2[0];
+
+ out[2] = ((uint128_t)in1[0]) * in2[2]
+ + ((uint128_t)in1[1]) * in2[1]
+ + ((uint128_t)in1[2]) * in2[0];
+
+ out[3] = ((uint128_t)in1[0]) * in2[3]
+ + ((uint128_t)in1[1]) * in2[2]
+ + ((uint128_t)in1[2]) * in2[1]
+ + ((uint128_t)in1[3]) * in2[0];
+
+ out[4] = ((uint128_t)in1[0]) * in2[4]
+ + ((uint128_t)in1[1]) * in2[3]
+ + ((uint128_t)in1[2]) * in2[2]
+ + ((uint128_t)in1[3]) * in2[1]
+ + ((uint128_t)in1[4]) * in2[0];
+
+ out[5] = ((uint128_t)in1[0]) * in2[5]
+ + ((uint128_t)in1[1]) * in2[4]
+ + ((uint128_t)in1[2]) * in2[3]
+ + ((uint128_t)in1[3]) * in2[2]
+ + ((uint128_t)in1[4]) * in2[1]
+ + ((uint128_t)in1[5]) * in2[0];
+
+ out[6] = ((uint128_t)in1[0]) * in2[6]
+ + ((uint128_t)in1[1]) * in2[5]
+ + ((uint128_t)in1[2]) * in2[4]
+ + ((uint128_t)in1[3]) * in2[3]
+ + ((uint128_t)in1[4]) * in2[2]
+ + ((uint128_t)in1[5]) * in2[1]
+ + ((uint128_t)in1[6]) * in2[0];
+
+ out[7] = ((uint128_t)in1[1]) * in2[6]
+ + ((uint128_t)in1[2]) * in2[5]
+ + ((uint128_t)in1[3]) * in2[4]
+ + ((uint128_t)in1[4]) * in2[3]
+ + ((uint128_t)in1[5]) * in2[2]
+ + ((uint128_t)in1[6]) * in2[1];
+
+ out[8] = ((uint128_t)in1[2]) * in2[6]
+ + ((uint128_t)in1[3]) * in2[5]
+ + ((uint128_t)in1[4]) * in2[4]
+ + ((uint128_t)in1[5]) * in2[3]
+ + ((uint128_t)in1[6]) * in2[2];
+
+ out[9] = ((uint128_t)in1[3]) * in2[6]
+ + ((uint128_t)in1[4]) * in2[5]
+ + ((uint128_t)in1[5]) * in2[4]
+ + ((uint128_t)in1[6]) * in2[3];
+
+ out[10] = ((uint128_t)in1[4]) * in2[6]
+ + ((uint128_t)in1[5]) * in2[5]
+ + ((uint128_t)in1[6]) * in2[4];
+
+ out[11] = ((uint128_t)in1[5]) * in2[6]
+ + ((uint128_t)in1[6]) * in2[5];
+
+ out[12] = ((uint128_t)in1[6]) * in2[6];
}
/*-
@@ -521,17 +521,17 @@ static void felem_reduce_ref(felem out, const widefelem in)
* Use telescopic sums to represent 2^76 * p redundantly with each limb
* of the form 2^124 + ...
*/
- static const widelimb two124m68 = (((widelimb) 1) << 124)
- - (((widelimb) 1) << 68);
- static const widelimb two124m116m68 = (((widelimb) 1) << 124)
- - (((widelimb) 1) << 116)
- - (((widelimb) 1) << 68);
- static const widelimb two124p108m76 = (((widelimb) 1) << 124)
- + (((widelimb) 1) << 108)
- - (((widelimb) 1) << 76);
- static const widelimb two124m92m68 = (((widelimb) 1) << 124)
- - (((widelimb) 1) << 92)
- - (((widelimb) 1) << 68);
+ static const widelimb two124m68 = (((widelimb)1) << 124)
+ - (((widelimb)1) << 68);
+ static const widelimb two124m116m68 = (((widelimb)1) << 124)
+ - (((widelimb)1) << 116)
+ - (((widelimb)1) << 68);
+ static const widelimb two124p108m76 = (((widelimb)1) << 124)
+ + (((widelimb)1) << 108)
+ - (((widelimb)1) << 76);
+ static const widelimb two124m92m68 = (((widelimb)1) << 124)
+ - (((widelimb)1) << 92)
+ - (((widelimb)1) << 68);
widelimb temp, acc[9];
unsigned int i;
@@ -649,13 +649,13 @@ static void felem_reduce_ref(felem out, const widefelem in)
*/
/* Carry 0 -> 1 -> 2 -> 3 -> 4 -> 5 -> 6 */
- acc[1] += acc[0] >> 56; /* acc[1] < acc_old[1] + 2^72 */
+ acc[1] += acc[0] >> 56; /* acc[1] < acc_old[1] + 2^72 */
acc[0] &= 0x00ffffffffffffff;
- acc[2] += acc[1] >> 56; /* acc[2] < acc_old[2] + 2^72 + 2^16 */
+ acc[2] += acc[1] >> 56; /* acc[2] < acc_old[2] + 2^72 + 2^16 */
acc[1] &= 0x00ffffffffffffff;
- acc[3] += acc[2] >> 56; /* acc[3] < acc_old[3] + 2^72 + 2^16 */
+ acc[3] += acc[2] >> 56; /* acc[3] < acc_old[3] + 2^72 + 2^16 */
acc[2] &= 0x00ffffffffffffff;
/*-
@@ -665,19 +665,19 @@ static void felem_reduce_ref(felem out, const widefelem in)
* < 2^128 , k < 4
*/
- acc[4] += acc[3] >> 56; /*-
- * acc[4] < acc_old[4] + 2^72 + 2^16
- * < 2^72 + 2^56 + 2^16
- */
+ acc[4] += acc[3] >> 56; /*-
+ * acc[4] < acc_old[4] + 2^72 + 2^16
+ * < 2^72 + 2^56 + 2^16
+ */
acc[3] &= 0x00ffffffffffffff;
- acc[5] += acc[4] >> 56; /*-
- * acc[5] < acc_old[5] + 2^16 + 1
- * < 2^56 + 2^16 + 1
- */
+ acc[5] += acc[4] >> 56; /*-
+ * acc[5] < acc_old[5] + 2^16 + 1
+ * < 2^56 + 2^16 + 1
+ */
acc[4] &= 0x00ffffffffffffff;
- acc[6] += acc[5] >> 56; /* acc[6] < 2^48 + 1 <= 2^48 */
+ acc[6] += acc[5] >> 56; /* acc[6] < 2^48 + 1 <= 2^48 */
acc[5] &= 0x00ffffffffffffff;
for (i = 0; i < NLIMBS; i++)
@@ -704,17 +704,13 @@ static ossl_inline void felem_mul_reduce_ref(felem out, const felem in1, const f
static void felem_square_wrapper(widefelem out, const felem in);
static void felem_mul_wrapper(widefelem out, const felem in1, const felem in2);
-static void (*felem_square_p)(widefelem out, const felem in) =
- felem_square_wrapper;
-static void (*felem_mul_p)(widefelem out, const felem in1, const felem in2) =
- felem_mul_wrapper;
+static void (*felem_square_p)(widefelem out, const felem in) = felem_square_wrapper;
+static void (*felem_mul_p)(widefelem out, const felem in1, const felem in2) = felem_mul_wrapper;
static void (*felem_reduce_p)(felem out, const widefelem in) = felem_reduce_ref;
-static void (*felem_square_reduce_p)(felem out, const felem in) =
- felem_square_reduce_ref;
-static void (*felem_mul_reduce_p)(felem out, const felem in1, const felem in2) =
- felem_mul_reduce_ref;
+static void (*felem_square_reduce_p)(felem out, const felem in) = felem_square_reduce_ref;
+static void (*felem_mul_reduce_p)(felem out, const felem in1, const felem in2) = felem_mul_reduce_ref;
void p384_felem_square(widefelem out, const felem in);
void p384_felem_mul(widefelem out, const felem in1, const felem in2);
@@ -723,13 +719,13 @@ void p384_felem_reduce(felem out, const widefelem in);
void p384_felem_square_reduce(felem out, const felem in);
void p384_felem_mul_reduce(felem out, const felem in1, const felem in2);
-# if defined(_ARCH_PPC64)
-# include "crypto/ppc_arch.h"
-# endif
+#if defined(_ARCH_PPC64)
+#include "crypto/ppc_arch.h"
+#endif
static void felem_select(void)
{
-# if defined(_ARCH_PPC64)
+#if defined(_ARCH_PPC64)
if ((OPENSSL_ppccap_P & PPC_MADD300) && (OPENSSL_ppccap_P & PPC_ALTIVEC)) {
felem_square_p = p384_felem_square;
felem_mul_p = p384_felem_mul;
@@ -739,7 +735,7 @@ static void felem_select(void)
return;
}
-# endif
+#endif
/* Default */
felem_square_p = felem_square_ref;
@@ -761,19 +757,19 @@ static void felem_mul_wrapper(widefelem out, const felem in1, const felem in2)
felem_mul_p(out, in1, in2);
}
-# define felem_square felem_square_p
-# define felem_mul felem_mul_p
-# define felem_reduce felem_reduce_p
+#define felem_square felem_square_p
+#define felem_mul felem_mul_p
+#define felem_reduce felem_reduce_p
-# define felem_square_reduce felem_square_reduce_p
-# define felem_mul_reduce felem_mul_reduce_p
+#define felem_square_reduce felem_square_reduce_p
+#define felem_mul_reduce felem_mul_reduce_p
#else
-# define felem_square felem_square_ref
-# define felem_mul felem_mul_ref
-# define felem_reduce felem_reduce_ref
+#define felem_square felem_square_ref
+#define felem_mul felem_mul_ref
+#define felem_reduce felem_reduce_ref
-# define felem_square_reduce felem_square_reduce_ref
-# define felem_mul_reduce felem_mul_reduce_ref
+#define felem_square_reduce felem_square_reduce_ref
+#define felem_mul_reduce felem_mul_reduce_ref
#endif
/*-
@@ -789,12 +785,12 @@ static void felem_inv(felem out, const felem in)
felem ftmp, ftmp2, ftmp3, ftmp4, ftmp5, ftmp6;
unsigned int i = 0;
- felem_square_reduce(ftmp, in); /* 2^1 */
- felem_mul_reduce(ftmp, ftmp, in); /* 2^1 + 2^0 */
+ felem_square_reduce(ftmp, in); /* 2^1 */
+ felem_mul_reduce(ftmp, ftmp, in); /* 2^1 + 2^0 */
felem_assign(ftmp2, ftmp);
- felem_square_reduce(ftmp, ftmp); /* 2^2 + 2^1 */
- felem_mul_reduce(ftmp, ftmp, in); /* 2^2 + 2^1 * 2^0 */
+ felem_square_reduce(ftmp, ftmp); /* 2^2 + 2^1 */
+ felem_mul_reduce(ftmp, ftmp, in); /* 2^2 + 2^1 * 2^0 */
felem_assign(ftmp3, ftmp);
for (i = 0; i < 3; i++)
@@ -827,7 +823,7 @@ static void felem_inv(felem out, const felem in)
felem_assign(ftmp4, ftmp);
for (i = 0; i < 120; i++)
- felem_square_reduce(ftmp, ftmp); /* 2^239 + ... + 2^120 */
+ felem_square_reduce(ftmp, ftmp); /* 2^239 + ... + 2^120 */
felem_mul_reduce(ftmp, ftmp4, ftmp); /* 2^239 + ... + 2^0 */
for (i = 0; i < 15; i++)
@@ -848,7 +844,7 @@ static void felem_inv(felem out, const felem in)
for (i = 0; i < 2; i++)
felem_square_reduce(ftmp, ftmp); /* 2^383 + ... + 2^129 + 2^127 + ... + 2^96 + 2^31 + ... + 2^2 */
- felem_mul_reduce(ftmp, in, ftmp); /* 2^383 + ... + 2^129 + 2^127 + ... + 2^96 + 2^31 + ... + 2^2 + 2^0 */
+ felem_mul_reduce(ftmp, in, ftmp); /* 2^383 + ... + 2^129 + 2^127 + ... + 2^96 + 2^31 + ... + 2^2 + 2^0 */
memcpy(out, ftmp, sizeof(felem));
}
@@ -866,19 +862,19 @@ static limb felem_is_zero(const felem in)
limb zero, p384;
zero = in[0] | in[1] | in[2] | in[3] | in[4] | in[5] | in[6];
- zero = ((int64_t) (zero) - 1) >> 63;
+ zero = ((int64_t)(zero)-1) >> 63;
p384 = (in[0] ^ 0x000000ffffffff) | (in[1] ^ 0xffff0000000000)
- | (in[2] ^ 0xfffffffffeffff) | (in[3] ^ 0xffffffffffffff)
- | (in[4] ^ 0xffffffffffffff) | (in[5] ^ 0xffffffffffffff)
- | (in[6] ^ 0xffffffffffff);
- p384 = ((int64_t) (p384) - 1) >> 63;
+ | (in[2] ^ 0xfffffffffeffff) | (in[3] ^ 0xffffffffffffff)
+ | (in[4] ^ 0xffffffffffffff) | (in[5] ^ 0xffffffffffffff)
+ | (in[6] ^ 0xffffffffffff);
+ p384 = ((int64_t)(p384)-1) >> 63;
return (zero | p384);
}
static int felem_is_zero_int(const void *in)
{
- return (int)(felem_is_zero(in) & ((limb) 1));
+ return (int)(felem_is_zero(in) & ((limb)1));
}
/*-
@@ -890,7 +886,7 @@ static int felem_is_zero_int(const void *in)
*/
static void felem_contract(felem out, const felem in)
{
- static const int64_t two56 = ((limb) 1) << 56;
+ static const int64_t two56 = ((limb)1) << 56;
/*
* We know for a fact that 0 <= |in| < 2*p, for p = 2^384 - 2^128 - 2^96 + 2^32 - 1
@@ -946,7 +942,7 @@ static void felem_contract(felem out, const felem in)
/* 0 iff (2^96..2^127) bits are all one */
cond[2] = ((tmp[2] | 0xffffffffff0000) & (tmp[1] | 0x0000ffffffffff)) + 1;
/* 0 iff (2^32..2^95) bits are all zero */
- cond[3] = (tmp[1] & ~0xffff0000000000) | (tmp[0] & ~((int64_t) 0x000000ffffffff));
+ cond[3] = (tmp[1] & ~0xffff0000000000) | (tmp[0] & ~((int64_t)0x000000ffffffff));
/* 0 iff (2^0..2^31) bits are all one */
cond[4] = (tmp[0] | 0xffffff00000000) + 1;
@@ -955,7 +951,7 @@ static void felem_contract(felem out, const felem in)
* any non-zero value in the low-order 56 bits becomes all 0's
*/
for (i = 0; i < 5; i++)
- cond[i] = ((cond[i] & 0x00ffffffffffffff) - 1) >> 63;
+ cond[i] = ((cond[i] & 0x00ffffffffffffff) - 1) >> 63;
/*
* The condition for determining whether in is greater than our
@@ -978,7 +974,7 @@ static void felem_contract(felem out, const felem in)
/* subtract 2^128 if that bit is present, and add 2^96 */
a = cond[0] & cond[1];
tmp[2] &= ~a | 0xfffffffffeffff;
- tmp[1] += a & ((int64_t) 1 << 40);
+ tmp[1] += a & ((int64_t)1 << 40);
/* otherwise, clear bits 2^127 .. 2^96 */
a = cond[0] & ~cond[1] & (cond[2] & (~cond[3] | cond[4]));
@@ -987,7 +983,7 @@ static void felem_contract(felem out, const felem in)
/* finally, subtract the last 2^32 - 1 */
a = cond[0] & (cond[1] | (cond[2] & (~cond[3] | cond[4])));
- tmp[0] += a & (-((int64_t) 1 << 32) + 1);
+ tmp[0] += a & (-((int64_t)1 << 32) + 1);
/*
* eliminate negative coefficients: if tmp[0] is negative, tmp[1] must be
@@ -1036,7 +1032,7 @@ static void felem_contract(felem out, const felem in)
*/
static void
point_double(felem x_out, felem y_out, felem z_out,
- const felem x_in, const felem y_in, const felem z_in)
+ const felem x_in, const felem y_in, const felem z_in)
{
widefelem tmp, tmp2;
felem delta, gamma, beta, alpha, ftmp, ftmp2;
@@ -1045,43 +1041,43 @@ point_double(felem x_out, felem y_out, felem z_out,
felem_assign(ftmp2, x_in);
/* delta = z^2 */
- felem_square_reduce(delta, z_in); /* delta[i] < 2^56 */
+ felem_square_reduce(delta, z_in); /* delta[i] < 2^56 */
/* gamma = y^2 */
- felem_square_reduce(gamma, y_in); /* gamma[i] < 2^56 */
+ felem_square_reduce(gamma, y_in); /* gamma[i] < 2^56 */
/* beta = x*gamma */
- felem_mul_reduce(beta, x_in, gamma); /* beta[i] < 2^56 */
+ felem_mul_reduce(beta, x_in, gamma); /* beta[i] < 2^56 */
/* alpha = 3*(x-delta)*(x+delta) */
- felem_diff64(ftmp, delta); /* ftmp[i] < 2^60 + 2^58 + 2^44 */
- felem_sum64(ftmp2, delta); /* ftmp2[i] < 2^59 */
- felem_scalar64(ftmp2, 3); /* ftmp2[i] < 2^61 */
+ felem_diff64(ftmp, delta); /* ftmp[i] < 2^60 + 2^58 + 2^44 */
+ felem_sum64(ftmp2, delta); /* ftmp2[i] < 2^59 */
+ felem_scalar64(ftmp2, 3); /* ftmp2[i] < 2^61 */
felem_mul_reduce(alpha, ftmp, ftmp2); /* alpha[i] < 2^56 */
/* x' = alpha^2 - 8*beta */
- felem_square(tmp, alpha); /* tmp[i] < 2^115 */
- felem_assign(ftmp, beta); /* ftmp[i] < 2^56 */
- felem_scalar64(ftmp, 8); /* ftmp[i] < 2^59 */
- felem_diff_128_64(tmp, ftmp); /* tmp[i] < 2^115 + 2^64 + 2^48 */
- felem_reduce(x_out, tmp); /* x_out[i] < 2^56 */
+ felem_square(tmp, alpha); /* tmp[i] < 2^115 */
+ felem_assign(ftmp, beta); /* ftmp[i] < 2^56 */
+ felem_scalar64(ftmp, 8); /* ftmp[i] < 2^59 */
+ felem_diff_128_64(tmp, ftmp); /* tmp[i] < 2^115 + 2^64 + 2^48 */
+ felem_reduce(x_out, tmp); /* x_out[i] < 2^56 */
/* z' = (y + z)^2 - gamma - delta */
- felem_sum64(delta, gamma); /* delta[i] < 2^57 */
- felem_assign(ftmp, y_in); /* ftmp[i] < 2^56 */
- felem_sum64(ftmp, z_in); /* ftmp[i] < 2^56 */
- felem_square(tmp, ftmp); /* tmp[i] < 2^115 */
+ felem_sum64(delta, gamma); /* delta[i] < 2^57 */
+ felem_assign(ftmp, y_in); /* ftmp[i] < 2^56 */
+ felem_sum64(ftmp, z_in); /* ftmp[i] < 2^56 */
+ felem_square(tmp, ftmp); /* tmp[i] < 2^115 */
felem_diff_128_64(tmp, delta); /* tmp[i] < 2^115 + 2^64 + 2^48 */
- felem_reduce(z_out, tmp); /* z_out[i] < 2^56 */
+ felem_reduce(z_out, tmp); /* z_out[i] < 2^56 */
/* y' = alpha*(4*beta - x') - 8*gamma^2 */
- felem_scalar64(beta, 4); /* beta[i] < 2^58 */
- felem_diff64(beta, x_out); /* beta[i] < 2^60 + 2^58 + 2^44 */
- felem_mul(tmp, alpha, beta); /* tmp[i] < 2^119 */
- felem_square(tmp2, gamma); /* tmp2[i] < 2^115 */
- felem_scalar128(tmp2, 8); /* tmp2[i] < 2^118 */
- felem_diff128(tmp, tmp2); /* tmp[i] < 2^127 + 2^119 + 2^111 */
- felem_reduce(y_out, tmp); /* tmp[i] < 2^56 */
+ felem_scalar64(beta, 4); /* beta[i] < 2^58 */
+ felem_diff64(beta, x_out); /* beta[i] < 2^60 + 2^58 + 2^44 */
+ felem_mul(tmp, alpha, beta); /* tmp[i] < 2^119 */
+ felem_square(tmp2, gamma); /* tmp2[i] < 2^115 */
+ felem_scalar128(tmp2, 8); /* tmp2[i] < 2^118 */
+ felem_diff128(tmp, tmp2); /* tmp[i] < 2^127 + 2^119 + 2^111 */
+ felem_reduce(y_out, tmp); /* tmp[i] < 2^56 */
}
/* copy_conditional copies in to out iff mask is all ones. */
@@ -1105,9 +1101,9 @@ static void copy_conditional(felem out, const felem in, limb mask)
* on constant-time.
*/
static void point_add(felem x3, felem y3, felem z3,
- const felem x1, const felem y1, const felem z1,
- const int mixed, const felem x2, const felem y2,
- const felem z2)
+ const felem x1, const felem y1, const felem z1,
+ const int mixed, const felem x2, const felem y2,
+ const felem z2)
{
felem ftmp, ftmp2, ftmp3, ftmp4, ftmp5, ftmp6, x_out, y_out, z_out;
widefelem tmp, tmp2;
@@ -1118,7 +1114,7 @@ static void point_add(felem x3, felem y3, felem z3,
z2_is_zero = felem_is_zero(z2);
/* ftmp = z1z1 = z1**2 */
- felem_square_reduce(ftmp, z1); /* ftmp[i] < 2^56 */
+ felem_square_reduce(ftmp, z1); /* ftmp[i] < 2^56 */
if (!mixed) {
/* ftmp2 = z2z2 = z2**2 */
@@ -1128,14 +1124,14 @@ static void point_add(felem x3, felem y3, felem z3,
felem_mul_reduce(ftmp3, x1, ftmp2); /* ftmp3[i] < 2^56 */
/* ftmp5 = z1 + z2 */
- felem_assign(ftmp5, z1); /* ftmp5[i] < 2^56 */
- felem_sum64(ftmp5, z2); /* ftmp5[i] < 2^57 */
+ felem_assign(ftmp5, z1); /* ftmp5[i] < 2^56 */
+ felem_sum64(ftmp5, z2); /* ftmp5[i] < 2^57 */
/* ftmp5 = (z1 + z2)**2 - z1z1 - z2z2 = 2*z1z2 */
- felem_square(tmp, ftmp5); /* tmp[i] < 2^117 */
- felem_diff_128_64(tmp, ftmp); /* tmp[i] < 2^117 + 2^64 + 2^48 */
+ felem_square(tmp, ftmp5); /* tmp[i] < 2^117 */
+ felem_diff_128_64(tmp, ftmp); /* tmp[i] < 2^117 + 2^64 + 2^48 */
felem_diff_128_64(tmp, ftmp2); /* tmp[i] < 2^117 + 2^65 + 2^49 */
- felem_reduce(ftmp5, tmp); /* ftmp5[i] < 2^56 */
+ felem_reduce(ftmp5, tmp); /* ftmp5[i] < 2^56 */
/* ftmp2 = z2 * z2z2 */
felem_mul_reduce(ftmp2, ftmp2, z2); /* ftmp2[i] < 2^56 */
@@ -1148,39 +1144,39 @@ static void point_add(felem x3, felem y3, felem z3,
*/
/* u1 = ftmp3 = x1*z2z2 */
- felem_assign(ftmp3, x1); /* ftmp3[i] < 2^56 */
+ felem_assign(ftmp3, x1); /* ftmp3[i] < 2^56 */
/* ftmp5 = 2*z1z2 */
- felem_scalar(ftmp5, z1, 2); /* ftmp5[i] < 2^57 */
+ felem_scalar(ftmp5, z1, 2); /* ftmp5[i] < 2^57 */
/* s1 = ftmp6 = y1 * z2**3 */
- felem_assign(ftmp6, y1); /* ftmp6[i] < 2^56 */
+ felem_assign(ftmp6, y1); /* ftmp6[i] < 2^56 */
}
/* ftmp3[i] < 2^56, ftmp5[i] < 2^57, ftmp6[i] < 2^56 */
/* u2 = x2*z1z1 */
- felem_mul(tmp, x2, ftmp); /* tmp[i] < 2^115 */
+ felem_mul(tmp, x2, ftmp); /* tmp[i] < 2^115 */
/* h = ftmp4 = u2 - u1 */
- felem_diff_128_64(tmp, ftmp3); /* tmp[i] < 2^115 + 2^64 + 2^48 */
- felem_reduce(ftmp4, tmp); /* ftmp[4] < 2^56 */
+ felem_diff_128_64(tmp, ftmp3); /* tmp[i] < 2^115 + 2^64 + 2^48 */
+ felem_reduce(ftmp4, tmp); /* ftmp[4] < 2^56 */
x_equal = felem_is_zero(ftmp4);
/* z_out = ftmp5 * h */
- felem_mul_reduce(z_out, ftmp5, ftmp4); /* z_out[i] < 2^56 */
+ felem_mul_reduce(z_out, ftmp5, ftmp4); /* z_out[i] < 2^56 */
/* ftmp = z1 * z1z1 */
- felem_mul_reduce(ftmp, ftmp, z1); /* ftmp[i] < 2^56 */
+ felem_mul_reduce(ftmp, ftmp, z1); /* ftmp[i] < 2^56 */
/* s2 = tmp = y2 * z1**3 */
- felem_mul(tmp, y2, ftmp); /* tmp[i] < 2^115 */
+ felem_mul(tmp, y2, ftmp); /* tmp[i] < 2^115 */
/* r = ftmp5 = (s2 - s1)*2 */
felem_diff_128_64(tmp, ftmp6); /* tmp[i] < 2^115 + 2^64 + 2^48 */
- felem_reduce(ftmp5, tmp); /* ftmp5[i] < 2^56 */
+ felem_reduce(ftmp5, tmp); /* ftmp5[i] < 2^56 */
y_equal = felem_is_zero(ftmp5);
- felem_scalar64(ftmp5, 2); /* ftmp5[i] < 2^57 */
+ felem_scalar64(ftmp5, 2); /* ftmp5[i] < 2^57 */
/*
* The formulae are incorrect if the points are equal, in affine coordinates
@@ -1209,9 +1205,9 @@ static void point_add(felem x3, felem y3, felem z3,
}
/* I = ftmp = (2h)**2 */
- felem_assign(ftmp, ftmp4); /* ftmp[i] < 2^56 */
- felem_scalar64(ftmp, 2); /* ftmp[i] < 2^57 */
- felem_square_reduce(ftmp, ftmp); /* ftmp[i] < 2^56 */
+ felem_assign(ftmp, ftmp4); /* ftmp[i] < 2^56 */
+ felem_scalar64(ftmp, 2); /* ftmp[i] < 2^57 */
+ felem_square_reduce(ftmp, ftmp); /* ftmp[i] < 2^56 */
/* J = ftmp2 = h * I */
felem_mul_reduce(ftmp2, ftmp4, ftmp); /* ftmp2[i] < 2^56 */
@@ -1220,20 +1216,20 @@ static void point_add(felem x3, felem y3, felem z3,
felem_mul_reduce(ftmp4, ftmp3, ftmp); /* ftmp4[i] < 2^56 */
/* x_out = r**2 - J - 2V */
- felem_square(tmp, ftmp5); /* tmp[i] < 2^117 */
+ felem_square(tmp, ftmp5); /* tmp[i] < 2^117 */
felem_diff_128_64(tmp, ftmp2); /* tmp[i] < 2^117 + 2^64 + 2^48 */
- felem_assign(ftmp3, ftmp4); /* ftmp3[i] < 2^56 */
- felem_scalar64(ftmp4, 2); /* ftmp4[i] < 2^57 */
+ felem_assign(ftmp3, ftmp4); /* ftmp3[i] < 2^56 */
+ felem_scalar64(ftmp4, 2); /* ftmp4[i] < 2^57 */
felem_diff_128_64(tmp, ftmp4); /* tmp[i] < 2^117 + 2^65 + 2^49 */
- felem_reduce(x_out, tmp); /* x_out[i] < 2^56 */
+ felem_reduce(x_out, tmp); /* x_out[i] < 2^56 */
/* y_out = r(V-x_out) - 2 * s1 * J */
- felem_diff64(ftmp3, x_out); /* ftmp3[i] < 2^60 + 2^56 + 2^44 */
- felem_mul(tmp, ftmp5, ftmp3); /* tmp[i] < 2^116 */
+ felem_diff64(ftmp3, x_out); /* ftmp3[i] < 2^60 + 2^56 + 2^44 */
+ felem_mul(tmp, ftmp5, ftmp3); /* tmp[i] < 2^116 */
felem_mul(tmp2, ftmp6, ftmp2); /* tmp2[i] < 2^115 */
- felem_scalar128(tmp2, 2); /* tmp2[i] < 2^116 */
- felem_diff128(tmp, tmp2); /* tmp[i] < 2^127 + 2^116 + 2^111 */
- felem_reduce(y_out, tmp); /* y_out[i] < 2^56 */
+ felem_scalar128(tmp2, 2); /* tmp2[i] < 2^116 */
+ felem_diff128(tmp, tmp2); /* tmp[i] < 2^127 + 2^116 + 2^111 */
+ felem_reduce(y_out, tmp); /* y_out[i] < 2^56 */
copy_conditional(x_out, x2, z1_is_zero);
copy_conditional(x_out, x1, z2_is_zero);
@@ -1283,84 +1279,84 @@ static void point_add(felem x3, felem y3, felem z3,
/* gmul is the table of precomputed base points */
static const felem gmul[16][3] = {
-{{0, 0, 0, 0, 0, 0, 0},
- {0, 0, 0, 0, 0, 0, 0},
- {0, 0, 0, 0, 0, 0, 0}},
-{{0x00545e3872760ab7, 0x00f25dbf55296c3a, 0x00e082542a385502, 0x008ba79b9859f741,
- 0x0020ad746e1d3b62, 0x0005378eb1c71ef3, 0x0000aa87ca22be8b},
- {0x00431d7c90ea0e5f, 0x00b1ce1d7e819d7a, 0x0013b5f0b8c00a60, 0x00289a147ce9da31,
- 0x0092dc29f8f41dbd, 0x002c6f5d9e98bf92, 0x00003617de4a9626},
- {1, 0, 0, 0, 0, 0, 0}},
-{{0x00024711cc902a90, 0x00acb2e579ab4fe1, 0x00af818a4b4d57b1, 0x00a17c7bec49c3de,
- 0x004280482d726a8b, 0x00128dd0f0a90f3b, 0x00004387c1c3fa3c},
- {0x002ce76543cf5c3a, 0x00de6cee5ef58f0a, 0x00403e42fa561ca6, 0x00bc54d6f9cb9731,
- 0x007155f925fb4ff1, 0x004a9ce731b7b9bc, 0x00002609076bd7b2},
- {1, 0, 0, 0, 0, 0, 0}},
-{{0x00e74c9182f0251d, 0x0039bf54bb111974, 0x00b9d2f2eec511d2, 0x0036b1594eb3a6a4,
- 0x00ac3bb82d9d564b, 0x00f9313f4615a100, 0x00006716a9a91b10},
- {0x0046698116e2f15c, 0x00f34347067d3d33, 0x008de4ccfdebd002, 0x00e838c6b8e8c97b,
- 0x006faf0798def346, 0x007349794a57563c, 0x00002629e7e6ad84},
- {1, 0, 0, 0, 0, 0, 0}},
-{{0x0075300e34fd163b, 0x0092e9db4e8d0ad3, 0x00254be9f625f760, 0x00512c518c72ae68,
- 0x009bfcf162bede5a, 0x00bf9341566ce311, 0x0000cd6175bd41cf},
- {0x007dfe52af4ac70f, 0x0002159d2d5c4880, 0x00b504d16f0af8d0, 0x0014585e11f5e64c,
- 0x0089c6388e030967, 0x00ffb270cbfa5f71, 0x00009a15d92c3947},
- {1, 0, 0, 0, 0, 0, 0}},
-{{0x0033fc1278dc4fe5, 0x00d53088c2caa043, 0x0085558827e2db66, 0x00c192bef387b736,
- 0x00df6405a2225f2c, 0x0075205aa90fd91a, 0x0000137e3f12349d},
- {0x00ce5b115efcb07e, 0x00abc3308410deeb, 0x005dc6fc1de39904, 0x00907c1c496f36b4,
- 0x0008e6ad3926cbe1, 0x00110747b787928c, 0x0000021b9162eb7e},
- {1, 0, 0, 0, 0, 0, 0}},
-{{0x008180042cfa26e1, 0x007b826a96254967, 0x0082473694d6b194, 0x007bd6880a45b589,
- 0x00c0a5097072d1a3, 0x0019186555e18b4e, 0x000020278190e5ca},
- {0x00b4bef17de61ac0, 0x009535e3c38ed348, 0x002d4aa8e468ceab, 0x00ef40b431036ad3,
- 0x00defd52f4542857, 0x0086edbf98234266, 0x00002025b3a7814d},
- {1, 0, 0, 0, 0, 0, 0}},
-{{0x00b238aa97b886be, 0x00ef3192d6dd3a32, 0x0079f9e01fd62df8, 0x00742e890daba6c5,
- 0x008e5289144408ce, 0x0073bbcc8e0171a5, 0x0000c4fd329d3b52},
- {0x00c6f64a15ee23e7, 0x00dcfb7b171cad8b, 0x00039f6cbd805867, 0x00de024e428d4562,
- 0x00be6a594d7c64c5, 0x0078467b70dbcd64, 0x0000251f2ed7079b},
- {1, 0, 0, 0, 0, 0, 0}},
-{{0x000e5cc25fc4b872, 0x005ebf10d31ef4e1, 0x0061e0ebd11e8256, 0x0076e026096f5a27,
- 0x0013e6fc44662e9a, 0x0042b00289d3597e, 0x000024f089170d88},
- {0x001604d7e0effbe6, 0x0048d77cba64ec2c, 0x008166b16da19e36, 0x006b0d1a0f28c088,
- 0x000259fcd47754fd, 0x00cc643e4d725f9a, 0x00007b10f3c79c14},
- {1, 0, 0, 0, 0, 0, 0}},
-{{0x00430155e3b908af, 0x00b801e4fec25226, 0x00b0d4bcfe806d26, 0x009fc4014eb13d37,
- 0x0066c94e44ec07e8, 0x00d16adc03874ba2, 0x000030c917a0d2a7},
- {0x00edac9e21eb891c, 0x00ef0fb768102eff, 0x00c088cef272a5f3, 0x00cbf782134e2964,
- 0x0001044a7ba9a0e3, 0x00e363f5b194cf3c, 0x00009ce85249e372},
- {1, 0, 0, 0, 0, 0, 0}},
-{{0x001dd492dda5a7eb, 0x008fd577be539fd1, 0x002ff4b25a5fc3f1, 0x0074a8a1b64df72f,
- 0x002ba3d8c204a76c, 0x009d5cff95c8235a, 0x0000e014b9406e0f},
- {0x008c2e4dbfc98aba, 0x00f30bb89f1a1436, 0x00b46f7aea3e259c, 0x009224454ac02f54,
- 0x00906401f5645fa2, 0x003a1d1940eabc77, 0x00007c9351d680e6},
- {1, 0, 0, 0, 0, 0, 0}},
-{{0x005a35d872ef967c, 0x0049f1b7884e1987, 0x0059d46d7e31f552, 0x00ceb4869d2d0fb6,
- 0x00e8e89eee56802a, 0x0049d806a774aaf2, 0x0000147e2af0ae24},
- {0x005fd1bd852c6e5e, 0x00b674b7b3de6885, 0x003b9ea5eb9b6c08, 0x005c9f03babf3ef7,
- 0x00605337fecab3c7, 0x009a3f85b11bbcc8, 0x0000455470f330ec},
- {1, 0, 0, 0, 0, 0, 0}},
-{{0x002197ff4d55498d, 0x00383e8916c2d8af, 0x00eb203f34d1c6d2, 0x0080367cbd11b542,
- 0x00769b3be864e4f5, 0x0081a8458521c7bb, 0x0000c531b34d3539},
- {0x00e2a3d775fa2e13, 0x00534fc379573844, 0x00ff237d2a8db54a, 0x00d301b2335a8882,
- 0x000f75ea96103a80, 0x0018fecb3cdd96fa, 0x0000304bf61e94eb},
- {1, 0, 0, 0, 0, 0, 0}},
-{{0x00b2afc332a73dbd, 0x0029a0d5bb007bc5, 0x002d628eb210f577, 0x009f59a36dd05f50,
- 0x006d339de4eca613, 0x00c75a71addc86bc, 0x000060384c5ea93c},
- {0x00aa9641c32a30b4, 0x00cc73ae8cce565d, 0x00ec911a4df07f61, 0x00aa4b762ea4b264,
- 0x0096d395bb393629, 0x004efacfb7632fe0, 0x00006f252f46fa3f},
- {1, 0, 0, 0, 0, 0, 0}},
-{{0x00567eec597c7af6, 0x0059ba6795204413, 0x00816d4e6f01196f, 0x004ae6b3eb57951d,
- 0x00420f5abdda2108, 0x003401d1f57ca9d9, 0x0000cf5837b0b67a},
- {0x00eaa64b8aeeabf9, 0x00246ddf16bcb4de, 0x000e7e3c3aecd751, 0x0008449f04fed72e,
- 0x00307b67ccf09183, 0x0017108c3556b7b1, 0x0000229b2483b3bf},
- {1, 0, 0, 0, 0, 0, 0}},
-{{0x00e7c491a7bb78a1, 0x00eafddd1d3049ab, 0x00352c05e2bc7c98, 0x003d6880c165fa5c,
- 0x00b6ac61cc11c97d, 0x00beeb54fcf90ce5, 0x0000dc1f0b455edc},
- {0x002db2e7aee34d60, 0x0073b5f415a2d8c0, 0x00dd84e4193e9a0c, 0x00d02d873467c572,
- 0x0018baaeda60aee5, 0x0013fb11d697c61e, 0x000083aafcc3a973},
- {1, 0, 0, 0, 0, 0, 0}}
+ { { 0, 0, 0, 0, 0, 0, 0 },
+ { 0, 0, 0, 0, 0, 0, 0 },
+ { 0, 0, 0, 0, 0, 0, 0 } },
+ { { 0x00545e3872760ab7, 0x00f25dbf55296c3a, 0x00e082542a385502, 0x008ba79b9859f741,
+ 0x0020ad746e1d3b62, 0x0005378eb1c71ef3, 0x0000aa87ca22be8b },
+ { 0x00431d7c90ea0e5f, 0x00b1ce1d7e819d7a, 0x0013b5f0b8c00a60, 0x00289a147ce9da31,
+ 0x0092dc29f8f41dbd, 0x002c6f5d9e98bf92, 0x00003617de4a9626 },
+ { 1, 0, 0, 0, 0, 0, 0 } },
+ { { 0x00024711cc902a90, 0x00acb2e579ab4fe1, 0x00af818a4b4d57b1, 0x00a17c7bec49c3de,
+ 0x004280482d726a8b, 0x00128dd0f0a90f3b, 0x00004387c1c3fa3c },
+ { 0x002ce76543cf5c3a, 0x00de6cee5ef58f0a, 0x00403e42fa561ca6, 0x00bc54d6f9cb9731,
+ 0x007155f925fb4ff1, 0x004a9ce731b7b9bc, 0x00002609076bd7b2 },
+ { 1, 0, 0, 0, 0, 0, 0 } },
+ { { 0x00e74c9182f0251d, 0x0039bf54bb111974, 0x00b9d2f2eec511d2, 0x0036b1594eb3a6a4,
+ 0x00ac3bb82d9d564b, 0x00f9313f4615a100, 0x00006716a9a91b10 },
+ { 0x0046698116e2f15c, 0x00f34347067d3d33, 0x008de4ccfdebd002, 0x00e838c6b8e8c97b,
+ 0x006faf0798def346, 0x007349794a57563c, 0x00002629e7e6ad84 },
+ { 1, 0, 0, 0, 0, 0, 0 } },
+ { { 0x0075300e34fd163b, 0x0092e9db4e8d0ad3, 0x00254be9f625f760, 0x00512c518c72ae68,
+ 0x009bfcf162bede5a, 0x00bf9341566ce311, 0x0000cd6175bd41cf },
+ { 0x007dfe52af4ac70f, 0x0002159d2d5c4880, 0x00b504d16f0af8d0, 0x0014585e11f5e64c,
+ 0x0089c6388e030967, 0x00ffb270cbfa5f71, 0x00009a15d92c3947 },
+ { 1, 0, 0, 0, 0, 0, 0 } },
+ { { 0x0033fc1278dc4fe5, 0x00d53088c2caa043, 0x0085558827e2db66, 0x00c192bef387b736,
+ 0x00df6405a2225f2c, 0x0075205aa90fd91a, 0x0000137e3f12349d },
+ { 0x00ce5b115efcb07e, 0x00abc3308410deeb, 0x005dc6fc1de39904, 0x00907c1c496f36b4,
+ 0x0008e6ad3926cbe1, 0x00110747b787928c, 0x0000021b9162eb7e },
+ { 1, 0, 0, 0, 0, 0, 0 } },
+ { { 0x008180042cfa26e1, 0x007b826a96254967, 0x0082473694d6b194, 0x007bd6880a45b589,
+ 0x00c0a5097072d1a3, 0x0019186555e18b4e, 0x000020278190e5ca },
+ { 0x00b4bef17de61ac0, 0x009535e3c38ed348, 0x002d4aa8e468ceab, 0x00ef40b431036ad3,
+ 0x00defd52f4542857, 0x0086edbf98234266, 0x00002025b3a7814d },
+ { 1, 0, 0, 0, 0, 0, 0 } },
+ { { 0x00b238aa97b886be, 0x00ef3192d6dd3a32, 0x0079f9e01fd62df8, 0x00742e890daba6c5,
+ 0x008e5289144408ce, 0x0073bbcc8e0171a5, 0x0000c4fd329d3b52 },
+ { 0x00c6f64a15ee23e7, 0x00dcfb7b171cad8b, 0x00039f6cbd805867, 0x00de024e428d4562,
+ 0x00be6a594d7c64c5, 0x0078467b70dbcd64, 0x0000251f2ed7079b },
+ { 1, 0, 0, 0, 0, 0, 0 } },
+ { { 0x000e5cc25fc4b872, 0x005ebf10d31ef4e1, 0x0061e0ebd11e8256, 0x0076e026096f5a27,
+ 0x0013e6fc44662e9a, 0x0042b00289d3597e, 0x000024f089170d88 },
+ { 0x001604d7e0effbe6, 0x0048d77cba64ec2c, 0x008166b16da19e36, 0x006b0d1a0f28c088,
+ 0x000259fcd47754fd, 0x00cc643e4d725f9a, 0x00007b10f3c79c14 },
+ { 1, 0, 0, 0, 0, 0, 0 } },
+ { { 0x00430155e3b908af, 0x00b801e4fec25226, 0x00b0d4bcfe806d26, 0x009fc4014eb13d37,
+ 0x0066c94e44ec07e8, 0x00d16adc03874ba2, 0x000030c917a0d2a7 },
+ { 0x00edac9e21eb891c, 0x00ef0fb768102eff, 0x00c088cef272a5f3, 0x00cbf782134e2964,
+ 0x0001044a7ba9a0e3, 0x00e363f5b194cf3c, 0x00009ce85249e372 },
+ { 1, 0, 0, 0, 0, 0, 0 } },
+ { { 0x001dd492dda5a7eb, 0x008fd577be539fd1, 0x002ff4b25a5fc3f1, 0x0074a8a1b64df72f,
+ 0x002ba3d8c204a76c, 0x009d5cff95c8235a, 0x0000e014b9406e0f },
+ { 0x008c2e4dbfc98aba, 0x00f30bb89f1a1436, 0x00b46f7aea3e259c, 0x009224454ac02f54,
+ 0x00906401f5645fa2, 0x003a1d1940eabc77, 0x00007c9351d680e6 },
+ { 1, 0, 0, 0, 0, 0, 0 } },
+ { { 0x005a35d872ef967c, 0x0049f1b7884e1987, 0x0059d46d7e31f552, 0x00ceb4869d2d0fb6,
+ 0x00e8e89eee56802a, 0x0049d806a774aaf2, 0x0000147e2af0ae24 },
+ { 0x005fd1bd852c6e5e, 0x00b674b7b3de6885, 0x003b9ea5eb9b6c08, 0x005c9f03babf3ef7,
+ 0x00605337fecab3c7, 0x009a3f85b11bbcc8, 0x0000455470f330ec },
+ { 1, 0, 0, 0, 0, 0, 0 } },
+ { { 0x002197ff4d55498d, 0x00383e8916c2d8af, 0x00eb203f34d1c6d2, 0x0080367cbd11b542,
+ 0x00769b3be864e4f5, 0x0081a8458521c7bb, 0x0000c531b34d3539 },
+ { 0x00e2a3d775fa2e13, 0x00534fc379573844, 0x00ff237d2a8db54a, 0x00d301b2335a8882,
+ 0x000f75ea96103a80, 0x0018fecb3cdd96fa, 0x0000304bf61e94eb },
+ { 1, 0, 0, 0, 0, 0, 0 } },
+ { { 0x00b2afc332a73dbd, 0x0029a0d5bb007bc5, 0x002d628eb210f577, 0x009f59a36dd05f50,
+ 0x006d339de4eca613, 0x00c75a71addc86bc, 0x000060384c5ea93c },
+ { 0x00aa9641c32a30b4, 0x00cc73ae8cce565d, 0x00ec911a4df07f61, 0x00aa4b762ea4b264,
+ 0x0096d395bb393629, 0x004efacfb7632fe0, 0x00006f252f46fa3f },
+ { 1, 0, 0, 0, 0, 0, 0 } },
+ { { 0x00567eec597c7af6, 0x0059ba6795204413, 0x00816d4e6f01196f, 0x004ae6b3eb57951d,
+ 0x00420f5abdda2108, 0x003401d1f57ca9d9, 0x0000cf5837b0b67a },
+ { 0x00eaa64b8aeeabf9, 0x00246ddf16bcb4de, 0x000e7e3c3aecd751, 0x0008449f04fed72e,
+ 0x00307b67ccf09183, 0x0017108c3556b7b1, 0x0000229b2483b3bf },
+ { 1, 0, 0, 0, 0, 0, 0 } },
+ { { 0x00e7c491a7bb78a1, 0x00eafddd1d3049ab, 0x00352c05e2bc7c98, 0x003d6880c165fa5c,
+ 0x00b6ac61cc11c97d, 0x00beeb54fcf90ce5, 0x0000dc1f0b455edc },
+ { 0x002db2e7aee34d60, 0x0073b5f415a2d8c0, 0x00dd84e4193e9a0c, 0x00d02d873467c572,
+ 0x0018baaeda60aee5, 0x0013fb11d697c61e, 0x000083aafcc3a973 },
+ { 1, 0, 0, 0, 0, 0, 0 } }
};
/*
@@ -1370,7 +1366,7 @@ static const felem gmul[16][3] = {
* pre_comp below is of the size provided in |size|.
*/
static void select_point(const limb idx, unsigned int size,
- const felem pre_comp[][3], felem out[3])
+ const felem pre_comp[][3], felem out[3])
{
unsigned int i, j;
limb *outlimbs = &out[0][0];
@@ -1407,10 +1403,10 @@ static char get_bit(const felem_bytearray in, int i)
* Output point (X, Y, Z) is stored in x_out, y_out, z_out
*/
static void batch_mul(felem x_out, felem y_out, felem z_out,
- const felem_bytearray scalars[],
- const unsigned int num_points, const u8 *g_scalar,
- const int mixed, const felem pre_comp[][17][3],
- const felem g_pre_comp[16][3])
+ const felem_bytearray scalars[],
+ const unsigned int num_points, const u8 *g_scalar,
+ const int mixed, const felem pre_comp[][17][3],
+ const felem g_pre_comp[16][3])
{
int i, skip;
unsigned int num, gen_mul = (g_scalar != NULL);
@@ -1426,8 +1422,8 @@ static void batch_mul(felem x_out, felem y_out, felem z_out,
* of the generator (last quarter of rounds) and additions of other
* points multiples (every 5th round).
*/
- skip = 1; /* save two point operations in the first
- * round */
+ skip = 1; /* save two point operations in the first
+ * round */
for (i = (num_points ? 380 : 98); i >= 0; --i) {
/* double */
if (!skip)
@@ -1445,9 +1441,9 @@ static void batch_mul(felem x_out, felem y_out, felem z_out,
select_point(bits, 16, g_pre_comp, tmp);
if (!skip) {
/* The 1 argument below is for "mixed" */
- point_add(nq[0], nq[1], nq[2],
- nq[0], nq[1], nq[2], 1,
- tmp[0], tmp[1], tmp[2]);
+ point_add(nq[0], nq[1], nq[2],
+ nq[0], nq[1], nq[2], 1,
+ tmp[0], tmp[1], tmp[2]);
} else {
memcpy(nq, tmp, 3 * sizeof(felem));
skip = 0;
@@ -1472,12 +1468,12 @@ static void batch_mul(felem x_out, felem y_out, felem z_out,
select_point(digit, 17, pre_comp[num], tmp);
felem_neg(tmp[3], tmp[1]); /* (X, -Y, Z) is the negative
* point */
- copy_conditional(tmp[1], tmp[3], (-(limb) sign));
+ copy_conditional(tmp[1], tmp[3], (-(limb)sign));
if (!skip) {
- point_add(nq[0], nq[1], nq[2],
- nq[0], nq[1], nq[2], mixed,
- tmp[0], tmp[1], tmp[2]);
+ point_add(nq[0], nq[1], nq[2],
+ nq[0], nq[1], nq[2], mixed,
+ tmp[0], tmp[1], tmp[2]);
} else {
memcpy(nq, tmp, 3 * sizeof(felem));
skip = 0;
@@ -1554,7 +1550,7 @@ const EC_METHOD *ossl_ec_GFp_nistp384_method(void)
0, /* blind_coordinates */
0, /* ladder_pre */
0, /* ladder_step */
- 0 /* ladder_post */
+ 0 /* ladder_post */
};
return &ret;
@@ -1620,8 +1616,8 @@ int ossl_ec_GFp_nistp384_group_init(EC_GROUP *group)
}
int ossl_ec_GFp_nistp384_group_set_curve(EC_GROUP *group, const BIGNUM *p,
- const BIGNUM *a, const BIGNUM *b,
- BN_CTX *ctx)
+ const BIGNUM *a, const BIGNUM *b,
+ BN_CTX *ctx)
{
int ret = 0;
BIGNUM *curve_p, *curve_a, *curve_b;
@@ -1649,7 +1645,7 @@ int ossl_ec_GFp_nistp384_group_set_curve(EC_GROUP *group, const BIGNUM *p,
}
group->field_mod_func = BN_nist_mod_384;
ret = ossl_ec_GFp_simple_group_set_curve(group, p, a, b, ctx);
- err:
+err:
BN_CTX_end(ctx);
#ifndef FIPS_MODULE
BN_CTX_free(new_ctx);
@@ -1662,9 +1658,9 @@ int ossl_ec_GFp_nistp384_group_set_curve(EC_GROUP *group, const BIGNUM *p,
* (X/Z^2, Y/Z^3)
*/
int ossl_ec_GFp_nistp384_point_get_affine_coordinates(const EC_GROUP *group,
- const EC_POINT *point,
- BIGNUM *x, BIGNUM *y,
- BN_CTX *ctx)
+ const EC_POINT *point,
+ BIGNUM *x, BIGNUM *y,
+ BN_CTX *ctx)
{
felem z1, z2, x_in, y_in, x_out, y_out;
widefelem tmp;
@@ -1673,8 +1669,7 @@ int ossl_ec_GFp_nistp384_point_get_affine_coordinates(const EC_GROUP *group,
ERR_raise(ERR_LIB_EC, EC_R_POINT_AT_INFINITY);
return 0;
}
- if ((!BN_to_felem(x_in, point->X)) || (!BN_to_felem(y_in, point->Y)) ||
- (!BN_to_felem(z1, point->Z)))
+ if ((!BN_to_felem(x_in, point->X)) || (!BN_to_felem(y_in, point->Y)) || (!BN_to_felem(z1, point->Z)))
return 0;
felem_inv(z2, z1);
felem_square(tmp, z2);
@@ -1704,28 +1699,28 @@ int ossl_ec_GFp_nistp384_point_get_affine_coordinates(const EC_GROUP *group,
/* points below is of size |num|, and tmp_felems is of size |num+1/ */
static void make_points_affine(size_t num, felem points[][3],
- felem tmp_felems[])
+ felem tmp_felems[])
{
/*
* Runs in constant time, unless an input is the point at infinity (which
* normally shouldn't happen).
*/
ossl_ec_GFp_nistp_points_make_affine_internal(num,
- points,
- sizeof(felem),
- tmp_felems,
- (void (*)(void *))felem_one,
- felem_is_zero_int,
- (void (*)(void *, const void *))
- felem_assign,
- (void (*)(void *, const void *))
- felem_square_reduce,
- (void (*)(void *, const void *, const void*))
- felem_mul_reduce,
- (void (*)(void *, const void *))
- felem_inv,
- (void (*)(void *, const void *))
- felem_contract);
+ points,
+ sizeof(felem),
+ tmp_felems,
+ (void (*)(void *))felem_one,
+ felem_is_zero_int,
+ (void (*)(void *, const void *))
+ felem_assign,
+ (void (*)(void *, const void *))
+ felem_square_reduce,
+ (void (*)(void *, const void *, const void *))
+ felem_mul_reduce,
+ (void (*)(void *, const void *))
+ felem_inv,
+ (void (*)(void *, const void *))
+ felem_contract);
}
/*
@@ -1733,9 +1728,9 @@ static void make_points_affine(size_t num, felem points[][3],
* values Result is stored in r (r can equal one of the inputs).
*/
int ossl_ec_GFp_nistp384_points_mul(const EC_GROUP *group, EC_POINT *r,
- const BIGNUM *scalar, size_t num,
- const EC_POINT *points[],
- const BIGNUM *scalars[], BN_CTX *ctx)
+ const BIGNUM *scalar, size_t num,
+ const EC_POINT *points[],
+ const BIGNUM *scalars[], BN_CTX *ctx)
{
int ret = 0;
int j;
@@ -1743,7 +1738,7 @@ int ossl_ec_GFp_nistp384_points_mul(const EC_GROUP *group, EC_POINT *r,
BIGNUM *x, *y, *z, *tmp_scalar;
felem_bytearray g_secret;
felem_bytearray *secrets = NULL;
- felem (*pre_comp)[17][3] = NULL;
+ felem(*pre_comp)[17][3] = NULL;
felem *tmp_felems = NULL;
unsigned int i;
int num_bytes;
@@ -1771,20 +1766,18 @@ int ossl_ec_GFp_nistp384_points_mul(const EC_GROUP *group, EC_POINT *r,
g_pre_comp = &pre->g_pre_comp[0];
else
/* try to use the standard precomputation */
- g_pre_comp = (felem(*)[3]) gmul;
+ g_pre_comp = (felem(*)[3])gmul;
generator = EC_POINT_new(group);
if (generator == NULL)
goto err;
/* get the generator from precomputation */
- if (!felem_to_BN(x, g_pre_comp[1][0]) ||
- !felem_to_BN(y, g_pre_comp[1][1]) ||
- !felem_to_BN(z, g_pre_comp[1][2])) {
+ if (!felem_to_BN(x, g_pre_comp[1][0]) || !felem_to_BN(y, g_pre_comp[1][1]) || !felem_to_BN(z, g_pre_comp[1][2])) {
ERR_raise(ERR_LIB_EC, ERR_R_BN_LIB);
goto err;
}
if (!ossl_ec_GFp_simple_set_Jprojective_coordinates_GFp(group,
- generator,
- x, y, z, ctx))
+ generator,
+ x, y, z, ctx))
goto err;
if (0 == EC_POINT_cmp(group, generator, group->generator, ctx))
/* precomputation matches generator */
@@ -1808,8 +1801,7 @@ int ossl_ec_GFp_nistp384_points_mul(const EC_GROUP *group, EC_POINT *r,
secrets = OPENSSL_calloc(num_points, sizeof(*secrets));
pre_comp = OPENSSL_calloc(num_points, sizeof(*pre_comp));
if (mixed)
- tmp_felems =
- OPENSSL_malloc_array(num_points * 17 + 1, sizeof(*tmp_felems));
+ tmp_felems = OPENSSL_malloc_array(num_points * 17 + 1, sizeof(*tmp_felems));
if ((secrets == NULL) || (pre_comp == NULL)
|| (mixed && (tmp_felems == NULL)))
goto err;
@@ -1844,31 +1836,29 @@ int ossl_ec_GFp_nistp384_points_mul(const EC_GROUP *group, EC_POINT *r,
goto err;
}
num_bytes = BN_bn2lebinpad(tmp_scalar,
- secrets[i], sizeof(secrets[i]));
+ secrets[i], sizeof(secrets[i]));
} else {
num_bytes = BN_bn2lebinpad(p_scalar,
- secrets[i], sizeof(secrets[i]));
+ secrets[i], sizeof(secrets[i]));
}
if (num_bytes < 0) {
ERR_raise(ERR_LIB_EC, ERR_R_BN_LIB);
goto err;
}
/* precompute multiples */
- if ((!BN_to_felem(x_out, p->X)) ||
- (!BN_to_felem(y_out, p->Y)) ||
- (!BN_to_felem(z_out, p->Z)))
+ if ((!BN_to_felem(x_out, p->X)) || (!BN_to_felem(y_out, p->Y)) || (!BN_to_felem(z_out, p->Z)))
goto err;
memcpy(pre_comp[i][1][0], x_out, sizeof(felem));
memcpy(pre_comp[i][1][1], y_out, sizeof(felem));
memcpy(pre_comp[i][1][2], z_out, sizeof(felem));
for (j = 2; j <= 16; ++j) {
if (j & 1) {
- point_add(pre_comp[i][j][0], pre_comp[i][j][1], pre_comp[i][j][2],
- pre_comp[i][1][0], pre_comp[i][1][1], pre_comp[i][1][2], 0,
- pre_comp[i][j - 1][0], pre_comp[i][j - 1][1], pre_comp[i][j - 1][2]);
+ point_add(pre_comp[i][j][0], pre_comp[i][j][1], pre_comp[i][j][2],
+ pre_comp[i][1][0], pre_comp[i][1][1], pre_comp[i][1][2], 0,
+ pre_comp[i][j - 1][0], pre_comp[i][j - 1][1], pre_comp[i][j - 1][2]);
} else {
- point_double(pre_comp[i][j][0], pre_comp[i][j][1], pre_comp[i][j][2],
- pre_comp[i][j / 2][0], pre_comp[i][j / 2][1], pre_comp[i][j / 2][2]);
+ point_double(pre_comp[i][j][0], pre_comp[i][j][1], pre_comp[i][j][2],
+ pre_comp[i][j / 2][0], pre_comp[i][j / 2][1], pre_comp[i][j / 2][2]);
}
}
}
@@ -1896,29 +1886,28 @@ int ossl_ec_GFp_nistp384_points_mul(const EC_GROUP *group, EC_POINT *r,
}
/* do the multiplication with generator precomputation */
batch_mul(x_out, y_out, z_out,
- (const felem_bytearray(*))secrets, num_points,
- g_secret,
- mixed, (const felem(*)[17][3])pre_comp,
- (const felem(*)[3])g_pre_comp);
+ (const felem_bytearray(*))secrets, num_points,
+ g_secret,
+ mixed, (const felem(*)[17][3])pre_comp,
+ (const felem(*)[3])g_pre_comp);
} else {
/* do the multiplication without generator precomputation */
batch_mul(x_out, y_out, z_out,
- (const felem_bytearray(*))secrets, num_points,
- NULL, mixed, (const felem(*)[17][3])pre_comp, NULL);
+ (const felem_bytearray(*))secrets, num_points,
+ NULL, mixed, (const felem(*)[17][3])pre_comp, NULL);
}
/* reduce the output to its unique minimal representation */
felem_contract(x_in, x_out);
felem_contract(y_in, y_out);
felem_contract(z_in, z_out);
- if ((!felem_to_BN(x, x_in)) || (!felem_to_BN(y, y_in)) ||
- (!felem_to_BN(z, z_in))) {
+ if ((!felem_to_BN(x, x_in)) || (!felem_to_BN(y, y_in)) || (!felem_to_BN(z, z_in))) {
ERR_raise(ERR_LIB_EC, ERR_R_BN_LIB);
goto err;
}
ret = ossl_ec_GFp_simple_set_Jprojective_coordinates_GFp(group, r, x, y, z,
- ctx);
+ ctx);
- err:
+err:
BN_CTX_end(ctx);
EC_POINT_free(generator);
OPENSSL_free(secrets);
@@ -1973,51 +1962,49 @@ int ossl_ec_GFp_nistp384_precompute_mult(EC_GROUP *group, BN_CTX *ctx)
memcpy(pre->g_pre_comp, gmul, sizeof(pre->g_pre_comp));
goto done;
}
- if ((!BN_to_felem(pre->g_pre_comp[1][0], group->generator->X)) ||
- (!BN_to_felem(pre->g_pre_comp[1][1], group->generator->Y)) ||
- (!BN_to_felem(pre->g_pre_comp[1][2], group->generator->Z)))
+ if ((!BN_to_felem(pre->g_pre_comp[1][0], group->generator->X)) || (!BN_to_felem(pre->g_pre_comp[1][1], group->generator->Y)) || (!BN_to_felem(pre->g_pre_comp[1][2], group->generator->Z)))
goto err;
/* compute 2^95*G, 2^190*G, 2^285*G */
for (i = 1; i <= 4; i <<= 1) {
point_double(pre->g_pre_comp[2 * i][0], pre->g_pre_comp[2 * i][1], pre->g_pre_comp[2 * i][2],
- pre->g_pre_comp[i][0], pre->g_pre_comp[i][1], pre->g_pre_comp[i][2]);
+ pre->g_pre_comp[i][0], pre->g_pre_comp[i][1], pre->g_pre_comp[i][2]);
for (j = 0; j < 94; ++j) {
point_double(pre->g_pre_comp[2 * i][0], pre->g_pre_comp[2 * i][1], pre->g_pre_comp[2 * i][2],
- pre->g_pre_comp[2 * i][0], pre->g_pre_comp[2 * i][1], pre->g_pre_comp[2 * i][2]);
+ pre->g_pre_comp[2 * i][0], pre->g_pre_comp[2 * i][1], pre->g_pre_comp[2 * i][2]);
}
}
/* g_pre_comp[0] is the point at infinity */
memset(pre->g_pre_comp[0], 0, sizeof(pre->g_pre_comp[0]));
/* the remaining multiples */
/* 2^95*G + 2^190*G */
- point_add(pre->g_pre_comp[6][0], pre->g_pre_comp[6][1], pre->g_pre_comp[6][2],
- pre->g_pre_comp[4][0], pre->g_pre_comp[4][1], pre->g_pre_comp[4][2], 0,
- pre->g_pre_comp[2][0], pre->g_pre_comp[2][1], pre->g_pre_comp[2][2]);
+ point_add(pre->g_pre_comp[6][0], pre->g_pre_comp[6][1], pre->g_pre_comp[6][2],
+ pre->g_pre_comp[4][0], pre->g_pre_comp[4][1], pre->g_pre_comp[4][2], 0,
+ pre->g_pre_comp[2][0], pre->g_pre_comp[2][1], pre->g_pre_comp[2][2]);
/* 2^95*G + 2^285*G */
point_add(pre->g_pre_comp[10][0], pre->g_pre_comp[10][1], pre->g_pre_comp[10][2],
- pre->g_pre_comp[8][0], pre->g_pre_comp[8][1], pre->g_pre_comp[8][2], 0,
- pre->g_pre_comp[2][0], pre->g_pre_comp[2][1], pre->g_pre_comp[2][2]);
+ pre->g_pre_comp[8][0], pre->g_pre_comp[8][1], pre->g_pre_comp[8][2], 0,
+ pre->g_pre_comp[2][0], pre->g_pre_comp[2][1], pre->g_pre_comp[2][2]);
/* 2^190*G + 2^285*G */
point_add(pre->g_pre_comp[12][0], pre->g_pre_comp[12][1], pre->g_pre_comp[12][2],
- pre->g_pre_comp[8][0], pre->g_pre_comp[8][1], pre->g_pre_comp[8][2], 0,
- pre->g_pre_comp[4][0], pre->g_pre_comp[4][1], pre->g_pre_comp[4][2]);
+ pre->g_pre_comp[8][0], pre->g_pre_comp[8][1], pre->g_pre_comp[8][2], 0,
+ pre->g_pre_comp[4][0], pre->g_pre_comp[4][1], pre->g_pre_comp[4][2]);
/* 2^95*G + 2^190*G + 2^285*G */
point_add(pre->g_pre_comp[14][0], pre->g_pre_comp[14][1], pre->g_pre_comp[14][2],
- pre->g_pre_comp[12][0], pre->g_pre_comp[12][1], pre->g_pre_comp[12][2], 0,
- pre->g_pre_comp[2][0], pre->g_pre_comp[2][1], pre->g_pre_comp[2][2]);
+ pre->g_pre_comp[12][0], pre->g_pre_comp[12][1], pre->g_pre_comp[12][2], 0,
+ pre->g_pre_comp[2][0], pre->g_pre_comp[2][1], pre->g_pre_comp[2][2]);
for (i = 1; i < 8; ++i) {
/* odd multiples: add G */
point_add(pre->g_pre_comp[2 * i + 1][0], pre->g_pre_comp[2 * i + 1][1], pre->g_pre_comp[2 * i + 1][2],
- pre->g_pre_comp[2 * i][0], pre->g_pre_comp[2 * i][1], pre->g_pre_comp[2 * i][2], 0,
- pre->g_pre_comp[1][0], pre->g_pre_comp[1][1], pre->g_pre_comp[1][2]);
+ pre->g_pre_comp[2 * i][0], pre->g_pre_comp[2 * i][1], pre->g_pre_comp[2 * i][2], 0,
+ pre->g_pre_comp[1][0], pre->g_pre_comp[1][1], pre->g_pre_comp[1][2]);
}
make_points_affine(15, &(pre->g_pre_comp[1]), tmp_felems);
- done:
+done:
SETPRECOMP(group, nistp384, pre);
ret = 1;
pre = NULL;
- err:
+err:
BN_CTX_end(ctx);
EC_POINT_free(generator);
#ifndef FIPS_MODULE
diff --git a/crypto/ec/ecp_nistp521.c b/crypto/ec/ecp_nistp521.c
index 178185f812..3c088d9a5f 100644
--- a/crypto/ec/ecp_nistp521.c
+++ b/crypto/ec/ecp_nistp521.c
@@ -46,7 +46,7 @@
#include "internal/numbers.h"
#ifndef INT128_MAX
-# error "Your compiler doesn't appear to support 128-bit integer types"
+#error "Your compiler doesn't appear to support 128-bit integer types"
#endif
typedef uint8_t u8;
@@ -65,51 +65,51 @@ typedef u8 felem_bytearray[66];
* These values are big-endian.
*/
static const felem_bytearray nistp521_curve_params[5] = {
- {0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* p */
- 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
- 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
- 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
- 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
- 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
- 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
- 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
- 0xff, 0xff},
- {0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* a = -3 */
- 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
- 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
- 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
- 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
- 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
- 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
- 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
- 0xff, 0xfc},
- {0x00, 0x51, 0x95, 0x3e, 0xb9, 0x61, 0x8e, 0x1c, /* b */
- 0x9a, 0x1f, 0x92, 0x9a, 0x21, 0xa0, 0xb6, 0x85,
- 0x40, 0xee, 0xa2, 0xda, 0x72, 0x5b, 0x99, 0xb3,
- 0x15, 0xf3, 0xb8, 0xb4, 0x89, 0x91, 0x8e, 0xf1,
- 0x09, 0xe1, 0x56, 0x19, 0x39, 0x51, 0xec, 0x7e,
- 0x93, 0x7b, 0x16, 0x52, 0xc0, 0xbd, 0x3b, 0xb1,
- 0xbf, 0x07, 0x35, 0x73, 0xdf, 0x88, 0x3d, 0x2c,
- 0x34, 0xf1, 0xef, 0x45, 0x1f, 0xd4, 0x6b, 0x50,
- 0x3f, 0x00},
- {0x00, 0xc6, 0x85, 0x8e, 0x06, 0xb7, 0x04, 0x04, /* x */
- 0xe9, 0xcd, 0x9e, 0x3e, 0xcb, 0x66, 0x23, 0x95,
- 0xb4, 0x42, 0x9c, 0x64, 0x81, 0x39, 0x05, 0x3f,
- 0xb5, 0x21, 0xf8, 0x28, 0xaf, 0x60, 0x6b, 0x4d,
- 0x3d, 0xba, 0xa1, 0x4b, 0x5e, 0x77, 0xef, 0xe7,
- 0x59, 0x28, 0xfe, 0x1d, 0xc1, 0x27, 0xa2, 0xff,
- 0xa8, 0xde, 0x33, 0x48, 0xb3, 0xc1, 0x85, 0x6a,
- 0x42, 0x9b, 0xf9, 0x7e, 0x7e, 0x31, 0xc2, 0xe5,
- 0xbd, 0x66},
- {0x01, 0x18, 0x39, 0x29, 0x6a, 0x78, 0x9a, 0x3b, /* y */
- 0xc0, 0x04, 0x5c, 0x8a, 0x5f, 0xb4, 0x2c, 0x7d,
- 0x1b, 0xd9, 0x98, 0xf5, 0x44, 0x49, 0x57, 0x9b,
- 0x44, 0x68, 0x17, 0xaf, 0xbd, 0x17, 0x27, 0x3e,
- 0x66, 0x2c, 0x97, 0xee, 0x72, 0x99, 0x5e, 0xf4,
- 0x26, 0x40, 0xc5, 0x50, 0xb9, 0x01, 0x3f, 0xad,
- 0x07, 0x61, 0x35, 0x3c, 0x70, 0x86, 0xa2, 0x72,
- 0xc2, 0x40, 0x88, 0xbe, 0x94, 0x76, 0x9f, 0xd1,
- 0x66, 0x50}
+ { 0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* p */
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff },
+ { 0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* a = -3 */
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xfc },
+ { 0x00, 0x51, 0x95, 0x3e, 0xb9, 0x61, 0x8e, 0x1c, /* b */
+ 0x9a, 0x1f, 0x92, 0x9a, 0x21, 0xa0, 0xb6, 0x85,
+ 0x40, 0xee, 0xa2, 0xda, 0x72, 0x5b, 0x99, 0xb3,
+ 0x15, 0xf3, 0xb8, 0xb4, 0x89, 0x91, 0x8e, 0xf1,
+ 0x09, 0xe1, 0x56, 0x19, 0x39, 0x51, 0xec, 0x7e,
+ 0x93, 0x7b, 0x16, 0x52, 0xc0, 0xbd, 0x3b, 0xb1,
+ 0xbf, 0x07, 0x35, 0x73, 0xdf, 0x88, 0x3d, 0x2c,
+ 0x34, 0xf1, 0xef, 0x45, 0x1f, 0xd4, 0x6b, 0x50,
+ 0x3f, 0x00 },
+ { 0x00, 0xc6, 0x85, 0x8e, 0x06, 0xb7, 0x04, 0x04, /* x */
+ 0xe9, 0xcd, 0x9e, 0x3e, 0xcb, 0x66, 0x23, 0x95,
+ 0xb4, 0x42, 0x9c, 0x64, 0x81, 0x39, 0x05, 0x3f,
+ 0xb5, 0x21, 0xf8, 0x28, 0xaf, 0x60, 0x6b, 0x4d,
+ 0x3d, 0xba, 0xa1, 0x4b, 0x5e, 0x77, 0xef, 0xe7,
+ 0x59, 0x28, 0xfe, 0x1d, 0xc1, 0x27, 0xa2, 0xff,
+ 0xa8, 0xde, 0x33, 0x48, 0xb3, 0xc1, 0x85, 0x6a,
+ 0x42, 0x9b, 0xf9, 0x7e, 0x7e, 0x31, 0xc2, 0xe5,
+ 0xbd, 0x66 },
+ { 0x01, 0x18, 0x39, 0x29, 0x6a, 0x78, 0x9a, 0x3b, /* y */
+ 0xc0, 0x04, 0x5c, 0x8a, 0x5f, 0xb4, 0x2c, 0x7d,
+ 0x1b, 0xd9, 0x98, 0xf5, 0x44, 0x49, 0x57, 0x9b,
+ 0x44, 0x68, 0x17, 0xaf, 0xbd, 0x17, 0x27, 0x3e,
+ 0x66, 0x2c, 0x97, 0xee, 0x72, 0x99, 0x5e, 0xf4,
+ 0x26, 0x40, 0xc5, 0x50, 0xb9, 0x01, 0x3f, 0xad,
+ 0x07, 0x61, 0x35, 0x3c, 0x70, 0x86, 0xa2, 0x72,
+ 0xc2, 0x40, 0x88, 0xbe, 0x94, 0x76, 0x9f, 0xd1,
+ 0x66, 0x50 }
};
/*-
@@ -142,15 +142,15 @@ static const limb bottom58bits = 0x3ffffffffffffff;
*/
static void bin66_to_felem(felem out, const u8 in[66])
{
- out[0] = (*((limb *) & in[0])) & bottom58bits;
- out[1] = (*((limb_aX *) & in[7]) >> 2) & bottom58bits;
- out[2] = (*((limb_aX *) & in[14]) >> 4) & bottom58bits;
- out[3] = (*((limb_aX *) & in[21]) >> 6) & bottom58bits;
- out[4] = (*((limb_aX *) & in[29])) & bottom58bits;
- out[5] = (*((limb_aX *) & in[36]) >> 2) & bottom58bits;
- out[6] = (*((limb_aX *) & in[43]) >> 4) & bottom58bits;
- out[7] = (*((limb_aX *) & in[50]) >> 6) & bottom58bits;
- out[8] = (*((limb_aX *) & in[58])) & bottom57bits;
+ out[0] = (*((limb *)&in[0])) & bottom58bits;
+ out[1] = (*((limb_aX *)&in[7]) >> 2) & bottom58bits;
+ out[2] = (*((limb_aX *)&in[14]) >> 4) & bottom58bits;
+ out[3] = (*((limb_aX *)&in[21]) >> 6) & bottom58bits;
+ out[4] = (*((limb_aX *)&in[29])) & bottom58bits;
+ out[5] = (*((limb_aX *)&in[36]) >> 2) & bottom58bits;
+ out[6] = (*((limb_aX *)&in[43]) >> 4) & bottom58bits;
+ out[7] = (*((limb_aX *)&in[50]) >> 6) & bottom58bits;
+ out[8] = (*((limb_aX *)&in[58])) & bottom57bits;
}
/*
@@ -160,15 +160,15 @@ static void bin66_to_felem(felem out, const u8 in[66])
static void felem_to_bin66(u8 out[66], const felem in)
{
memset(out, 0, 66);
- (*((limb *) & out[0])) = in[0];
- (*((limb_aX *) & out[7])) |= in[1] << 2;
- (*((limb_aX *) & out[14])) |= in[2] << 4;
- (*((limb_aX *) & out[21])) |= in[3] << 6;
- (*((limb_aX *) & out[29])) = in[4];
- (*((limb_aX *) & out[36])) |= in[5] << 2;
- (*((limb_aX *) & out[43])) |= in[6] << 4;
- (*((limb_aX *) & out[50])) |= in[7] << 6;
- (*((limb_aX *) & out[58])) = in[8];
+ (*((limb *)&out[0])) = in[0];
+ (*((limb_aX *)&out[7])) |= in[1] << 2;
+ (*((limb_aX *)&out[14])) |= in[2] << 4;
+ (*((limb_aX *)&out[21])) |= in[3] << 6;
+ (*((limb_aX *)&out[29])) = in[4];
+ (*((limb_aX *)&out[36])) |= in[5] << 2;
+ (*((limb_aX *)&out[43])) |= in[6] << 4;
+ (*((limb_aX *)&out[50])) |= in[7] << 6;
+ (*((limb_aX *)&out[58])) = in[8];
}
/* BN_to_felem converts an OpenSSL BIGNUM into an felem */
@@ -295,8 +295,8 @@ static void felem_scalar128(largefelem out, limb scalar)
static void felem_neg(felem out, const felem in)
{
/* In order to prevent underflow, we subtract from 0 mod p. */
- static const limb two62m3 = (((limb) 1) << 62) - (((limb) 1) << 5);
- static const limb two62m2 = (((limb) 1) << 62) - (((limb) 1) << 4);
+ static const limb two62m3 = (((limb)1) << 62) - (((limb)1) << 5);
+ static const limb two62m2 = (((limb)1) << 62) - (((limb)1) << 4);
out[0] = two62m3 - in[0];
out[1] = two62m2 - in[1];
@@ -321,8 +321,8 @@ static void felem_diff64(felem out, const felem in)
/*
* In order to prevent underflow, we add 0 mod p before subtracting.
*/
- static const limb two62m3 = (((limb) 1) << 62) - (((limb) 1) << 5);
- static const limb two62m2 = (((limb) 1) << 62) - (((limb) 1) << 4);
+ static const limb two62m3 = (((limb)1) << 62) - (((limb)1) << 5);
+ static const limb two62m2 = (((limb)1) << 62) - (((limb)1) << 4);
out[0] += two62m3 - in[0];
out[1] += two62m2 - in[1];
@@ -352,8 +352,8 @@ static void felem_diff_128_64(largefelem out, const felem in)
* represent a number. 64p is represented with 8 limbs containing a number
* with 58 bits set and one limb with a number with 57 bits set.
*/
- static const limb two63m6 = (((limb) 1) << 63) - (((limb) 1) << 6);
- static const limb two63m5 = (((limb) 1) << 63) - (((limb) 1) << 5);
+ static const limb two63m6 = (((limb)1) << 63) - (((limb)1) << 6);
+ static const limb two63m5 = (((limb)1) << 63) - (((limb)1) << 5);
out[0] += two63m6 - in[0];
out[1] += two63m5 - in[1];
@@ -378,10 +378,8 @@ static void felem_diff128(largefelem out, const largefelem in)
/*
* In order to prevent underflow, we add 0 mod p before subtracting.
*/
- static const uint128_t two127m70 =
- (((uint128_t) 1) << 127) - (((uint128_t) 1) << 70);
- static const uint128_t two127m69 =
- (((uint128_t) 1) << 127) - (((uint128_t) 1) << 69);
+ static const uint128_t two127m70 = (((uint128_t)1) << 127) - (((uint128_t)1) << 70);
+ static const uint128_t two127m69 = (((uint128_t)1) << 127) - (((uint128_t)1) << 69);
out[0] += (two127m70 - in[0]);
out[1] += (two127m69 - in[1]);
@@ -418,24 +416,15 @@ static void felem_square_ref(largefelem out, const felem in)
* |inx2|
*/
- out[0] = ((uint128_t) in[0]) * in[0];
- out[1] = ((uint128_t) in[0]) * inx2[1];
- out[2] = ((uint128_t) in[0]) * inx2[2] + ((uint128_t) in[1]) * in[1];
- out[3] = ((uint128_t) in[0]) * inx2[3] + ((uint128_t) in[1]) * inx2[2];
- out[4] = ((uint128_t) in[0]) * inx2[4] +
- ((uint128_t) in[1]) * inx2[3] + ((uint128_t) in[2]) * in[2];
- out[5] = ((uint128_t) in[0]) * inx2[5] +
- ((uint128_t) in[1]) * inx2[4] + ((uint128_t) in[2]) * inx2[3];
- out[6] = ((uint128_t) in[0]) * inx2[6] +
- ((uint128_t) in[1]) * inx2[5] +
- ((uint128_t) in[2]) * inx2[4] + ((uint128_t) in[3]) * in[3];
- out[7] = ((uint128_t) in[0]) * inx2[7] +
- ((uint128_t) in[1]) * inx2[6] +
- ((uint128_t) in[2]) * inx2[5] + ((uint128_t) in[3]) * inx2[4];
- out[8] = ((uint128_t) in[0]) * inx2[8] +
- ((uint128_t) in[1]) * inx2[7] +
- ((uint128_t) in[2]) * inx2[6] +
- ((uint128_t) in[3]) * inx2[5] + ((uint128_t) in[4]) * in[4];
+ out[0] = ((uint128_t)in[0]) * in[0];
+ out[1] = ((uint128_t)in[0]) * inx2[1];
+ out[2] = ((uint128_t)in[0]) * inx2[2] + ((uint128_t)in[1]) * in[1];
+ out[3] = ((uint128_t)in[0]) * inx2[3] + ((uint128_t)in[1]) * inx2[2];
+ out[4] = ((uint128_t)in[0]) * inx2[4] + ((uint128_t)in[1]) * inx2[3] + ((uint128_t)in[2]) * in[2];
+ out[5] = ((uint128_t)in[0]) * inx2[5] + ((uint128_t)in[1]) * inx2[4] + ((uint128_t)in[2]) * inx2[3];
+ out[6] = ((uint128_t)in[0]) * inx2[6] + ((uint128_t)in[1]) * inx2[5] + ((uint128_t)in[2]) * inx2[4] + ((uint128_t)in[3]) * in[3];
+ out[7] = ((uint128_t)in[0]) * inx2[7] + ((uint128_t)in[1]) * inx2[6] + ((uint128_t)in[2]) * inx2[5] + ((uint128_t)in[3]) * inx2[4];
+ out[8] = ((uint128_t)in[0]) * inx2[8] + ((uint128_t)in[1]) * inx2[7] + ((uint128_t)in[2]) * inx2[6] + ((uint128_t)in[3]) * inx2[5] + ((uint128_t)in[4]) * in[4];
/*
* The remaining limbs fall above 2^521, with the first falling at 2^522.
@@ -447,34 +436,28 @@ static void felem_square_ref(largefelem out, const felem in)
*/
/* 9 */
- out[0] += ((uint128_t) in[1]) * inx4[8] +
- ((uint128_t) in[2]) * inx4[7] +
- ((uint128_t) in[3]) * inx4[6] + ((uint128_t) in[4]) * inx4[5];
+ out[0] += ((uint128_t)in[1]) * inx4[8] + ((uint128_t)in[2]) * inx4[7] + ((uint128_t)in[3]) * inx4[6] + ((uint128_t)in[4]) * inx4[5];
/* 10 */
- out[1] += ((uint128_t) in[2]) * inx4[8] +
- ((uint128_t) in[3]) * inx4[7] +
- ((uint128_t) in[4]) * inx4[6] + ((uint128_t) in[5]) * inx2[5];
+ out[1] += ((uint128_t)in[2]) * inx4[8] + ((uint128_t)in[3]) * inx4[7] + ((uint128_t)in[4]) * inx4[6] + ((uint128_t)in[5]) * inx2[5];
/* 11 */
- out[2] += ((uint128_t) in[3]) * inx4[8] +
- ((uint128_t) in[4]) * inx4[7] + ((uint128_t) in[5]) * inx4[6];
+ out[2] += ((uint128_t)in[3]) * inx4[8] + ((uint128_t)in[4]) * inx4[7] + ((uint128_t)in[5]) * inx4[6];
/* 12 */
- out[3] += ((uint128_t) in[4]) * inx4[8] +
- ((uint128_t) in[5]) * inx4[7] + ((uint128_t) in[6]) * inx2[6];
+ out[3] += ((uint128_t)in[4]) * inx4[8] + ((uint128_t)in[5]) * inx4[7] + ((uint128_t)in[6]) * inx2[6];
/* 13 */
- out[4] += ((uint128_t) in[5]) * inx4[8] + ((uint128_t) in[6]) * inx4[7];
+ out[4] += ((uint128_t)in[5]) * inx4[8] + ((uint128_t)in[6]) * inx4[7];
/* 14 */
- out[5] += ((uint128_t) in[6]) * inx4[8] + ((uint128_t) in[7]) * inx2[7];
+ out[5] += ((uint128_t)in[6]) * inx4[8] + ((uint128_t)in[7]) * inx2[7];
/* 15 */
- out[6] += ((uint128_t) in[7]) * inx4[8];
+ out[6] += ((uint128_t)in[7]) * inx4[8];
/* 16 */
- out[7] += ((uint128_t) in[8]) * inx2[8];
+ out[7] += ((uint128_t)in[8]) * inx2[8];
}
/*-
@@ -490,105 +473,41 @@ static void felem_mul_ref(largefelem out, const felem in1, const felem in2)
felem in2x2;
felem_scalar(in2x2, in2, 2);
- out[0] = ((uint128_t) in1[0]) * in2[0];
-
- out[1] = ((uint128_t) in1[0]) * in2[1] +
- ((uint128_t) in1[1]) * in2[0];
-
- out[2] = ((uint128_t) in1[0]) * in2[2] +
- ((uint128_t) in1[1]) * in2[1] +
- ((uint128_t) in1[2]) * in2[0];
-
- out[3] = ((uint128_t) in1[0]) * in2[3] +
- ((uint128_t) in1[1]) * in2[2] +
- ((uint128_t) in1[2]) * in2[1] +
- ((uint128_t) in1[3]) * in2[0];
-
- out[4] = ((uint128_t) in1[0]) * in2[4] +
- ((uint128_t) in1[1]) * in2[3] +
- ((uint128_t) in1[2]) * in2[2] +
- ((uint128_t) in1[3]) * in2[1] +
- ((uint128_t) in1[4]) * in2[0];
-
- out[5] = ((uint128_t) in1[0]) * in2[5] +
- ((uint128_t) in1[1]) * in2[4] +
- ((uint128_t) in1[2]) * in2[3] +
- ((uint128_t) in1[3]) * in2[2] +
- ((uint128_t) in1[4]) * in2[1] +
- ((uint128_t) in1[5]) * in2[0];
-
- out[6] = ((uint128_t) in1[0]) * in2[6] +
- ((uint128_t) in1[1]) * in2[5] +
- ((uint128_t) in1[2]) * in2[4] +
- ((uint128_t) in1[3]) * in2[3] +
- ((uint128_t) in1[4]) * in2[2] +
- ((uint128_t) in1[5]) * in2[1] +
- ((uint128_t) in1[6]) * in2[0];
-
- out[7] = ((uint128_t) in1[0]) * in2[7] +
- ((uint128_t) in1[1]) * in2[6] +
- ((uint128_t) in1[2]) * in2[5] +
- ((uint128_t) in1[3]) * in2[4] +
- ((uint128_t) in1[4]) * in2[3] +
- ((uint128_t) in1[5]) * in2[2] +
- ((uint128_t) in1[6]) * in2[1] +
- ((uint128_t) in1[7]) * in2[0];
-
- out[8] = ((uint128_t) in1[0]) * in2[8] +
- ((uint128_t) in1[1]) * in2[7] +
- ((uint128_t) in1[2]) * in2[6] +
- ((uint128_t) in1[3]) * in2[5] +
- ((uint128_t) in1[4]) * in2[4] +
- ((uint128_t) in1[5]) * in2[3] +
- ((uint128_t) in1[6]) * in2[2] +
- ((uint128_t) in1[7]) * in2[1] +
- ((uint128_t) in1[8]) * in2[0];
+ out[0] = ((uint128_t)in1[0]) * in2[0];
+
+ out[1] = ((uint128_t)in1[0]) * in2[1] + ((uint128_t)in1[1]) * in2[0];
+
+ out[2] = ((uint128_t)in1[0]) * in2[2] + ((uint128_t)in1[1]) * in2[1] + ((uint128_t)in1[2]) * in2[0];
+
+ out[3] = ((uint128_t)in1[0]) * in2[3] + ((uint128_t)in1[1]) * in2[2] + ((uint128_t)in1[2]) * in2[1] + ((uint128_t)in1[3]) * in2[0];
+
+ out[4] = ((uint128_t)in1[0]) * in2[4] + ((uint128_t)in1[1]) * in2[3] + ((uint128_t)in1[2]) * in2[2] + ((uint128_t)in1[3]) * in2[1] + ((uint128_t)in1[4]) * in2[0];
+
+ out[5] = ((uint128_t)in1[0]) * in2[5] + ((uint128_t)in1[1]) * in2[4] + ((uint128_t)in1[2]) * in2[3] + ((uint128_t)in1[3]) * in2[2] + ((uint128_t)in1[4]) * in2[1] + ((uint128_t)in1[5]) * in2[0];
+
+ out[6] = ((uint128_t)in1[0]) * in2[6] + ((uint128_t)in1[1]) * in2[5] + ((uint128_t)in1[2]) * in2[4] + ((uint128_t)in1[3]) * in2[3] + ((uint128_t)in1[4]) * in2[2] + ((uint128_t)in1[5]) * in2[1] + ((uint128_t)in1[6]) * in2[0];
+
+ out[7] = ((uint128_t)in1[0]) * in2[7] + ((uint128_t)in1[1]) * in2[6] + ((uint128_t)in1[2]) * in2[5] + ((uint128_t)in1[3]) * in2[4] + ((uint128_t)in1[4]) * in2[3] + ((uint128_t)in1[5]) * in2[2] + ((uint128_t)in1[6]) * in2[1] + ((uint128_t)in1[7]) * in2[0];
+
+ out[8] = ((uint128_t)in1[0]) * in2[8] + ((uint128_t)in1[1]) * in2[7] + ((uint128_t)in1[2]) * in2[6] + ((uint128_t)in1[3]) * in2[5] + ((uint128_t)in1[4]) * in2[4] + ((uint128_t)in1[5]) * in2[3] + ((uint128_t)in1[6]) * in2[2] + ((uint128_t)in1[7]) * in2[1] + ((uint128_t)in1[8]) * in2[0];
/* See comment in felem_square about the use of in2x2 here */
- out[0] += ((uint128_t) in1[1]) * in2x2[8] +
- ((uint128_t) in1[2]) * in2x2[7] +
- ((uint128_t) in1[3]) * in2x2[6] +
- ((uint128_t) in1[4]) * in2x2[5] +
- ((uint128_t) in1[5]) * in2x2[4] +
- ((uint128_t) in1[6]) * in2x2[3] +
- ((uint128_t) in1[7]) * in2x2[2] +
- ((uint128_t) in1[8]) * in2x2[1];
-
- out[1] += ((uint128_t) in1[2]) * in2x2[8] +
- ((uint128_t) in1[3]) * in2x2[7] +
- ((uint128_t) in1[4]) * in2x2[6] +
- ((uint128_t) in1[5]) * in2x2[5] +
- ((uint128_t) in1[6]) * in2x2[4] +
- ((uint128_t) in1[7]) * in2x2[3] +
- ((uint128_t) in1[8]) * in2x2[2];
-
- out[2] += ((uint128_t) in1[3]) * in2x2[8] +
- ((uint128_t) in1[4]) * in2x2[7] +
- ((uint128_t) in1[5]) * in2x2[6] +
- ((uint128_t) in1[6]) * in2x2[5] +
- ((uint128_t) in1[7]) * in2x2[4] +
- ((uint128_t) in1[8]) * in2x2[3];
-
- out[3] += ((uint128_t) in1[4]) * in2x2[8] +
- ((uint128_t) in1[5]) * in2x2[7] +
- ((uint128_t) in1[6]) * in2x2[6] +
- ((uint128_t) in1[7]) * in2x2[5] +
- ((uint128_t) in1[8]) * in2x2[4];
-
- out[4] += ((uint128_t) in1[5]) * in2x2[8] +
- ((uint128_t) in1[6]) * in2x2[7] +
- ((uint128_t) in1[7]) * in2x2[6] +
- ((uint128_t) in1[8]) * in2x2[5];
-
- out[5] += ((uint128_t) in1[6]) * in2x2[8] +
- ((uint128_t) in1[7]) * in2x2[7] +
- ((uint128_t) in1[8]) * in2x2[6];
-
- out[6] += ((uint128_t) in1[7]) * in2x2[8] +
- ((uint128_t) in1[8]) * in2x2[7];
-
- out[7] += ((uint128_t) in1[8]) * in2x2[8];
+ out[0] += ((uint128_t)in1[1]) * in2x2[8] + ((uint128_t)in1[2]) * in2x2[7] + ((uint128_t)in1[3]) * in2x2[6] + ((uint128_t)in1[4]) * in2x2[5] + ((uint128_t)in1[5]) * in2x2[4] + ((uint128_t)in1[6]) * in2x2[3] + ((uint128_t)in1[7]) * in2x2[2] + ((uint128_t)in1[8]) * in2x2[1];
+
+ out[1] += ((uint128_t)in1[2]) * in2x2[8] + ((uint128_t)in1[3]) * in2x2[7] + ((uint128_t)in1[4]) * in2x2[6] + ((uint128_t)in1[5]) * in2x2[5] + ((uint128_t)in1[6]) * in2x2[4] + ((uint128_t)in1[7]) * in2x2[3] + ((uint128_t)in1[8]) * in2x2[2];
+
+ out[2] += ((uint128_t)in1[3]) * in2x2[8] + ((uint128_t)in1[4]) * in2x2[7] + ((uint128_t)in1[5]) * in2x2[6] + ((uint128_t)in1[6]) * in2x2[5] + ((uint128_t)in1[7]) * in2x2[4] + ((uint128_t)in1[8]) * in2x2[3];
+
+ out[3] += ((uint128_t)in1[4]) * in2x2[8] + ((uint128_t)in1[5]) * in2x2[7] + ((uint128_t)in1[6]) * in2x2[6] + ((uint128_t)in1[7]) * in2x2[5] + ((uint128_t)in1[8]) * in2x2[4];
+
+ out[4] += ((uint128_t)in1[5]) * in2x2[8] + ((uint128_t)in1[6]) * in2x2[7] + ((uint128_t)in1[7]) * in2x2[6] + ((uint128_t)in1[8]) * in2x2[5];
+
+ out[5] += ((uint128_t)in1[6]) * in2x2[8] + ((uint128_t)in1[7]) * in2x2[7] + ((uint128_t)in1[8]) * in2x2[6];
+
+ out[6] += ((uint128_t)in1[7]) * in2x2[8] + ((uint128_t)in1[8]) * in2x2[7];
+
+ out[7] += ((uint128_t)in1[8]) * in2x2[8];
}
static const limb bottom52bits = 0xfffffffffffff;
@@ -604,67 +523,67 @@ static void felem_reduce(felem out, const largefelem in)
{
u64 overflow1, overflow2;
- out[0] = ((limb) in[0]) & bottom58bits;
- out[1] = ((limb) in[1]) & bottom58bits;
- out[2] = ((limb) in[2]) & bottom58bits;
- out[3] = ((limb) in[3]) & bottom58bits;
- out[4] = ((limb) in[4]) & bottom58bits;
- out[5] = ((limb) in[5]) & bottom58bits;
- out[6] = ((limb) in[6]) & bottom58bits;
- out[7] = ((limb) in[7]) & bottom58bits;
- out[8] = ((limb) in[8]) & bottom58bits;
+ out[0] = ((limb)in[0]) & bottom58bits;
+ out[1] = ((limb)in[1]) & bottom58bits;
+ out[2] = ((limb)in[2]) & bottom58bits;
+ out[3] = ((limb)in[3]) & bottom58bits;
+ out[4] = ((limb)in[4]) & bottom58bits;
+ out[5] = ((limb)in[5]) & bottom58bits;
+ out[6] = ((limb)in[6]) & bottom58bits;
+ out[7] = ((limb)in[7]) & bottom58bits;
+ out[8] = ((limb)in[8]) & bottom58bits;
/* out[i] < 2^58 */
- out[1] += ((limb) in[0]) >> 58;
- out[1] += (((limb) (in[0] >> 64)) & bottom52bits) << 6;
+ out[1] += ((limb)in[0]) >> 58;
+ out[1] += (((limb)(in[0] >> 64)) & bottom52bits) << 6;
/*-
* out[1] < 2^58 + 2^6 + 2^58
* = 2^59 + 2^6
*/
- out[2] += ((limb) (in[0] >> 64)) >> 52;
+ out[2] += ((limb)(in[0] >> 64)) >> 52;
- out[2] += ((limb) in[1]) >> 58;
- out[2] += (((limb) (in[1] >> 64)) & bottom52bits) << 6;
- out[3] += ((limb) (in[1] >> 64)) >> 52;
+ out[2] += ((limb)in[1]) >> 58;
+ out[2] += (((limb)(in[1] >> 64)) & bottom52bits) << 6;
+ out[3] += ((limb)(in[1] >> 64)) >> 52;
- out[3] += ((limb) in[2]) >> 58;
- out[3] += (((limb) (in[2] >> 64)) & bottom52bits) << 6;
- out[4] += ((limb) (in[2] >> 64)) >> 52;
+ out[3] += ((limb)in[2]) >> 58;
+ out[3] += (((limb)(in[2] >> 64)) & bottom52bits) << 6;
+ out[4] += ((limb)(in[2] >> 64)) >> 52;
- out[4] += ((limb) in[3]) >> 58;
- out[4] += (((limb) (in[3] >> 64)) & bottom52bits) << 6;
- out[5] += ((limb) (in[3] >> 64)) >> 52;
+ out[4] += ((limb)in[3]) >> 58;
+ out[4] += (((limb)(in[3] >> 64)) & bottom52bits) << 6;
+ out[5] += ((limb)(in[3] >> 64)) >> 52;
- out[5] += ((limb) in[4]) >> 58;
- out[5] += (((limb) (in[4] >> 64)) & bottom52bits) << 6;
- out[6] += ((limb) (in[4] >> 64)) >> 52;
+ out[5] += ((limb)in[4]) >> 58;
+ out[5] += (((limb)(in[4] >> 64)) & bottom52bits) << 6;
+ out[6] += ((limb)(in[4] >> 64)) >> 52;
- out[6] += ((limb) in[5]) >> 58;
- out[6] += (((limb) (in[5] >> 64)) & bottom52bits) << 6;
- out[7] += ((limb) (in[5] >> 64)) >> 52;
+ out[6] += ((limb)in[5]) >> 58;
+ out[6] += (((limb)(in[5] >> 64)) & bottom52bits) << 6;
+ out[7] += ((limb)(in[5] >> 64)) >> 52;
- out[7] += ((limb) in[6]) >> 58;
- out[7] += (((limb) (in[6] >> 64)) & bottom52bits) << 6;
- out[8] += ((limb) (in[6] >> 64)) >> 52;
+ out[7] += ((limb)in[6]) >> 58;
+ out[7] += (((limb)(in[6] >> 64)) & bottom52bits) << 6;
+ out[8] += ((limb)(in[6] >> 64)) >> 52;
- out[8] += ((limb) in[7]) >> 58;
- out[8] += (((limb) (in[7] >> 64)) & bottom52bits) << 6;
+ out[8] += ((limb)in[7]) >> 58;
+ out[8] += (((limb)(in[7] >> 64)) & bottom52bits) << 6;
/*-
* out[x > 1] < 2^58 + 2^6 + 2^58 + 2^12
* < 2^59 + 2^13
*/
- overflow1 = ((limb) (in[7] >> 64)) >> 52;
+ overflow1 = ((limb)(in[7] >> 64)) >> 52;
- overflow1 += ((limb) in[8]) >> 58;
- overflow1 += (((limb) (in[8] >> 64)) & bottom52bits) << 6;
- overflow2 = ((limb) (in[8] >> 64)) >> 52;
+ overflow1 += ((limb)in[8]) >> 58;
+ overflow1 += (((limb)(in[8] >> 64)) & bottom52bits) << 6;
+ overflow2 = ((limb)(in[8] >> 64)) >> 52;
- overflow1 <<= 1; /* overflow1 < 2^13 + 2^7 + 2^59 */
- overflow2 <<= 1; /* overflow2 < 2^13 */
+ overflow1 <<= 1; /* overflow1 < 2^13 + 2^7 + 2^59 */
+ overflow2 <<= 1; /* overflow2 < 2^13 */
- out[0] += overflow1; /* out[0] < 2^60 */
- out[1] += overflow2; /* out[1] < 2^59 + 2^6 + 2^13 */
+ out[0] += overflow1; /* out[0] < 2^60 */
+ out[1] += overflow2; /* out[1] < 2^59 + 2^6 + 2^13 */
out[1] += out[0] >> 58;
out[0] &= bottom58bits;
@@ -679,28 +598,26 @@ static void felem_reduce(felem out, const largefelem in)
static void felem_square_wrapper(largefelem out, const felem in);
static void felem_mul_wrapper(largefelem out, const felem in1, const felem in2);
-static void (*felem_square_p)(largefelem out, const felem in) =
- felem_square_wrapper;
-static void (*felem_mul_p)(largefelem out, const felem in1, const felem in2) =
- felem_mul_wrapper;
+static void (*felem_square_p)(largefelem out, const felem in) = felem_square_wrapper;
+static void (*felem_mul_p)(largefelem out, const felem in1, const felem in2) = felem_mul_wrapper;
void p521_felem_square(largefelem out, const felem in);
void p521_felem_mul(largefelem out, const felem in1, const felem in2);
-# if defined(_ARCH_PPC64)
-# include "crypto/ppc_arch.h"
-# endif
+#if defined(_ARCH_PPC64)
+#include "crypto/ppc_arch.h"
+#endif
static void felem_select(void)
{
-# if defined(_ARCH_PPC64)
+#if defined(_ARCH_PPC64)
if ((OPENSSL_ppccap_P & PPC_MADD300) && (OPENSSL_ppccap_P & PPC_ALTIVEC)) {
felem_square_p = p521_felem_square;
felem_mul_p = p521_felem_mul;
return;
}
-# endif
+#endif
/* Default */
felem_square_p = felem_square_ref;
@@ -719,11 +636,11 @@ static void felem_mul_wrapper(largefelem out, const felem in1, const felem in2)
felem_mul_p(out, in1, in2);
}
-# define felem_square felem_square_p
-# define felem_mul felem_mul_p
+#define felem_square felem_square_p
+#define felem_mul felem_mul_p
#else
-# define felem_square felem_square_ref
-# define felem_mul felem_mul_ref
+#define felem_square felem_square_ref
+#define felem_mul felem_mul_ref
#endif
static void felem_square_reduce(felem out, const felem in)
@@ -755,39 +672,39 @@ static void felem_inv(felem out, const felem in)
unsigned i;
felem_square(tmp, in);
- felem_reduce(ftmp, tmp); /* 2^1 */
+ felem_reduce(ftmp, tmp); /* 2^1 */
felem_mul(tmp, in, ftmp);
- felem_reduce(ftmp, tmp); /* 2^2 - 2^0 */
+ felem_reduce(ftmp, tmp); /* 2^2 - 2^0 */
felem_assign(ftmp2, ftmp);
felem_square(tmp, ftmp);
- felem_reduce(ftmp, tmp); /* 2^3 - 2^1 */
+ felem_reduce(ftmp, tmp); /* 2^3 - 2^1 */
felem_mul(tmp, in, ftmp);
- felem_reduce(ftmp, tmp); /* 2^3 - 2^0 */
+ felem_reduce(ftmp, tmp); /* 2^3 - 2^0 */
felem_square(tmp, ftmp);
- felem_reduce(ftmp, tmp); /* 2^4 - 2^1 */
+ felem_reduce(ftmp, tmp); /* 2^4 - 2^1 */
felem_square(tmp, ftmp2);
- felem_reduce(ftmp3, tmp); /* 2^3 - 2^1 */
+ felem_reduce(ftmp3, tmp); /* 2^3 - 2^1 */
felem_square(tmp, ftmp3);
- felem_reduce(ftmp3, tmp); /* 2^4 - 2^2 */
+ felem_reduce(ftmp3, tmp); /* 2^4 - 2^2 */
felem_mul(tmp, ftmp3, ftmp2);
- felem_reduce(ftmp3, tmp); /* 2^4 - 2^0 */
+ felem_reduce(ftmp3, tmp); /* 2^4 - 2^0 */
felem_assign(ftmp2, ftmp3);
felem_square(tmp, ftmp3);
- felem_reduce(ftmp3, tmp); /* 2^5 - 2^1 */
+ felem_reduce(ftmp3, tmp); /* 2^5 - 2^1 */
felem_square(tmp, ftmp3);
- felem_reduce(ftmp3, tmp); /* 2^6 - 2^2 */
+ felem_reduce(ftmp3, tmp); /* 2^6 - 2^2 */
felem_square(tmp, ftmp3);
- felem_reduce(ftmp3, tmp); /* 2^7 - 2^3 */
+ felem_reduce(ftmp3, tmp); /* 2^7 - 2^3 */
felem_square(tmp, ftmp3);
- felem_reduce(ftmp3, tmp); /* 2^8 - 2^4 */
+ felem_reduce(ftmp3, tmp); /* 2^8 - 2^4 */
felem_mul(tmp, ftmp3, ftmp);
- felem_reduce(ftmp4, tmp); /* 2^8 - 2^1 */
+ felem_reduce(ftmp4, tmp); /* 2^8 - 2^1 */
felem_square(tmp, ftmp4);
- felem_reduce(ftmp4, tmp); /* 2^9 - 2^2 */
+ felem_reduce(ftmp4, tmp); /* 2^9 - 2^2 */
felem_mul(tmp, ftmp3, ftmp2);
- felem_reduce(ftmp3, tmp); /* 2^8 - 2^0 */
+ felem_reduce(ftmp3, tmp); /* 2^8 - 2^0 */
felem_assign(ftmp2, ftmp3);
for (i = 0; i < 8; i++) {
@@ -795,7 +712,7 @@ static void felem_inv(felem out, const felem in)
felem_reduce(ftmp3, tmp); /* 2^16 - 2^8 */
}
felem_mul(tmp, ftmp3, ftmp2);
- felem_reduce(ftmp3, tmp); /* 2^16 - 2^0 */
+ felem_reduce(ftmp3, tmp); /* 2^16 - 2^0 */
felem_assign(ftmp2, ftmp3);
for (i = 0; i < 16; i++) {
@@ -803,7 +720,7 @@ static void felem_inv(felem out, const felem in)
felem_reduce(ftmp3, tmp); /* 2^32 - 2^16 */
}
felem_mul(tmp, ftmp3, ftmp2);
- felem_reduce(ftmp3, tmp); /* 2^32 - 2^0 */
+ felem_reduce(ftmp3, tmp); /* 2^32 - 2^0 */
felem_assign(ftmp2, ftmp3);
for (i = 0; i < 32; i++) {
@@ -811,7 +728,7 @@ static void felem_inv(felem out, const felem in)
felem_reduce(ftmp3, tmp); /* 2^64 - 2^32 */
}
felem_mul(tmp, ftmp3, ftmp2);
- felem_reduce(ftmp3, tmp); /* 2^64 - 2^0 */
+ felem_reduce(ftmp3, tmp); /* 2^64 - 2^0 */
felem_assign(ftmp2, ftmp3);
for (i = 0; i < 64; i++) {
@@ -819,7 +736,7 @@ static void felem_inv(felem out, const felem in)
felem_reduce(ftmp3, tmp); /* 2^128 - 2^64 */
}
felem_mul(tmp, ftmp3, ftmp2);
- felem_reduce(ftmp3, tmp); /* 2^128 - 2^0 */
+ felem_reduce(ftmp3, tmp); /* 2^128 - 2^0 */
felem_assign(ftmp2, ftmp3);
for (i = 0; i < 128; i++) {
@@ -827,7 +744,7 @@ static void felem_inv(felem out, const felem in)
felem_reduce(ftmp3, tmp); /* 2^256 - 2^128 */
}
felem_mul(tmp, ftmp3, ftmp2);
- felem_reduce(ftmp3, tmp); /* 2^256 - 2^0 */
+ felem_reduce(ftmp3, tmp); /* 2^256 - 2^0 */
felem_assign(ftmp2, ftmp3);
for (i = 0; i < 256; i++) {
@@ -835,16 +752,16 @@ static void felem_inv(felem out, const felem in)
felem_reduce(ftmp3, tmp); /* 2^512 - 2^256 */
}
felem_mul(tmp, ftmp3, ftmp2);
- felem_reduce(ftmp3, tmp); /* 2^512 - 2^0 */
+ felem_reduce(ftmp3, tmp); /* 2^512 - 2^0 */
for (i = 0; i < 9; i++) {
felem_square(tmp, ftmp3);
felem_reduce(ftmp3, tmp); /* 2^521 - 2^9 */
}
felem_mul(tmp, ftmp3, ftmp4);
- felem_reduce(ftmp3, tmp); /* 2^521 - 2^2 */
+ felem_reduce(ftmp3, tmp); /* 2^521 - 2^2 */
felem_mul(tmp, ftmp3, in);
- felem_reduce(out, tmp); /* 2^521 - 3 */
+ felem_reduce(out, tmp); /* 2^521 - 3 */
}
/* This is 2^521-1, expressed as an felem */
@@ -930,7 +847,7 @@ static limb felem_is_zero(const felem in)
static int felem_is_zero_int(const void *in)
{
- return (int)(felem_is_zero(in) & ((limb) 1));
+ return (int)(felem_is_zero(in) & ((limb)1));
}
/*-
@@ -941,7 +858,7 @@ static int felem_is_zero_int(const void *in)
static void felem_contract(felem out, const felem in)
{
limb is_p, is_greater, sign;
- static const limb two58 = ((limb) 1) << 58;
+ static const limb two58 = ((limb)1) << 58;
felem_assign(out, in);
@@ -1085,7 +1002,7 @@ static void felem_contract(felem out, const felem in)
* while x_out == y_in is not (maybe this works, but it's not tested). */
static void
point_double(felem x_out, felem y_out, felem z_out,
- const felem x_in, const felem y_in, const felem z_in)
+ const felem x_in, const felem y_in, const felem z_in)
{
largefelem tmp, tmp2;
felem delta, gamma, beta, alpha, ftmp, ftmp2;
@@ -1095,15 +1012,15 @@ point_double(felem x_out, felem y_out, felem z_out,
/* delta = z^2 */
felem_square(tmp, z_in);
- felem_reduce(delta, tmp); /* delta[i] < 2^59 + 2^14 */
+ felem_reduce(delta, tmp); /* delta[i] < 2^59 + 2^14 */
/* gamma = y^2 */
felem_square(tmp, y_in);
- felem_reduce(gamma, tmp); /* gamma[i] < 2^59 + 2^14 */
+ felem_reduce(gamma, tmp); /* gamma[i] < 2^59 + 2^14 */
/* beta = x*gamma */
felem_mul(tmp, x_in, gamma);
- felem_reduce(beta, tmp); /* beta[i] < 2^59 + 2^14 */
+ felem_reduce(beta, tmp); /* beta[i] < 2^59 + 2^14 */
/* alpha = 3*(x-delta)*(x+delta) */
felem_diff64(ftmp, delta);
@@ -1203,9 +1120,9 @@ static void copy_conditional(felem out, const felem in, limb mask)
* on constant-time.
*/
static void point_add(felem x3, felem y3, felem z3,
- const felem x1, const felem y1, const felem z1,
- const int mixed, const felem x2, const felem y2,
- const felem z2)
+ const felem x1, const felem y1, const felem z1,
+ const int mixed, const felem x2, const felem y2,
+ const felem z2)
{
felem ftmp, ftmp2, ftmp3, ftmp4, ftmp5, ftmp6, x_out, y_out, z_out;
largefelem tmp, tmp2;
@@ -1373,11 +1290,11 @@ static void point_add(felem x3, felem y3, felem z3,
felem_scalar128(tmp2, 2);
/* tmp2[i] < 17*2^121 */
felem_diff128(tmp, tmp2);
- /*-
- * tmp[i] < 2^127 - 2^69 + 17*2^122
- * = 2^126 - 2^122 - 2^6 - 2^2 - 1
- * < 2^127
- */
+ /*-
+ * tmp[i] < 2^127 - 2^69 + 17*2^122
+ * = 2^126 - 2^122 - 2^6 - 2^2 - 1
+ * < 2^127
+ */
felem_reduce(y_out, tmp);
copy_conditional(x_out, x2, z1_is_zero);
@@ -1427,123 +1344,123 @@ static void point_add(felem x3, felem y3, felem z3,
/* gmul is the table of precomputed base points */
static const felem gmul[16][3] = {
-{{0, 0, 0, 0, 0, 0, 0, 0, 0},
- {0, 0, 0, 0, 0, 0, 0, 0, 0},
- {0, 0, 0, 0, 0, 0, 0, 0, 0}},
-{{0x017e7e31c2e5bd66, 0x022cf0615a90a6fe, 0x00127a2ffa8de334,
- 0x01dfbf9d64a3f877, 0x006b4d3dbaa14b5e, 0x014fed487e0a2bd8,
- 0x015b4429c6481390, 0x03a73678fb2d988e, 0x00c6858e06b70404},
- {0x00be94769fd16650, 0x031c21a89cb09022, 0x039013fad0761353,
- 0x02657bd099031542, 0x03273e662c97ee72, 0x01e6d11a05ebef45,
- 0x03d1bd998f544495, 0x03001172297ed0b1, 0x011839296a789a3b},
- {1, 0, 0, 0, 0, 0, 0, 0, 0}},
-{{0x0373faacbc875bae, 0x00f325023721c671, 0x00f666fd3dbde5ad,
- 0x01a6932363f88ea7, 0x01fc6d9e13f9c47b, 0x03bcbffc2bbf734e,
- 0x013ee3c3647f3a92, 0x029409fefe75d07d, 0x00ef9199963d85e5},
- {0x011173743ad5b178, 0x02499c7c21bf7d46, 0x035beaeabb8b1a58,
- 0x00f989c4752ea0a3, 0x0101e1de48a9c1a3, 0x01a20076be28ba6c,
- 0x02f8052e5eb2de95, 0x01bfe8f82dea117c, 0x0160074d3c36ddb7},
- {1, 0, 0, 0, 0, 0, 0, 0, 0}},
-{{0x012f3fc373393b3b, 0x03d3d6172f1419fa, 0x02adc943c0b86873,
- 0x00d475584177952b, 0x012a4d1673750ee2, 0x00512517a0f13b0c,
- 0x02b184671a7b1734, 0x0315b84236f1a50a, 0x00a4afc472edbdb9},
- {0x00152a7077f385c4, 0x03044007d8d1c2ee, 0x0065829d61d52b52,
- 0x00494ff6b6631d0d, 0x00a11d94d5f06bcf, 0x02d2f89474d9282e,
- 0x0241c5727c06eeb9, 0x0386928710fbdb9d, 0x01f883f727b0dfbe},
- {1, 0, 0, 0, 0, 0, 0, 0, 0}},
-{{0x019b0c3c9185544d, 0x006243a37c9d97db, 0x02ee3cbe030a2ad2,
- 0x00cfdd946bb51e0d, 0x0271c00932606b91, 0x03f817d1ec68c561,
- 0x03f37009806a369c, 0x03c1f30baf184fd5, 0x01091022d6d2f065},
- {0x0292c583514c45ed, 0x0316fca51f9a286c, 0x00300af507c1489a,
- 0x0295f69008298cf1, 0x02c0ed8274943d7b, 0x016509b9b47a431e,
- 0x02bc9de9634868ce, 0x005b34929bffcb09, 0x000c1a0121681524},
- {1, 0, 0, 0, 0, 0, 0, 0, 0}},
-{{0x0286abc0292fb9f2, 0x02665eee9805b3f7, 0x01ed7455f17f26d6,
- 0x0346355b83175d13, 0x006284944cd0a097, 0x0191895bcdec5e51,
- 0x02e288370afda7d9, 0x03b22312bfefa67a, 0x01d104d3fc0613fe},
- {0x0092421a12f7e47f, 0x0077a83fa373c501, 0x03bd25c5f696bd0d,
- 0x035c41e4d5459761, 0x01ca0d1742b24f53, 0x00aaab27863a509c,
- 0x018b6de47df73917, 0x025c0b771705cd01, 0x01fd51d566d760a7},
- {1, 0, 0, 0, 0, 0, 0, 0, 0}},
-{{0x01dd92ff6b0d1dbd, 0x039c5e2e8f8afa69, 0x0261ed13242c3b27,
- 0x0382c6e67026e6a0, 0x01d60b10be2089f9, 0x03c15f3dce86723f,
- 0x03c764a32d2a062d, 0x017307eac0fad056, 0x018207c0b96c5256},
- {0x0196a16d60e13154, 0x03e6ce74c0267030, 0x00ddbf2b4e52a5aa,
- 0x012738241bbf31c8, 0x00ebe8dc04685a28, 0x024c2ad6d380d4a2,
- 0x035ee062a6e62d0e, 0x0029ed74af7d3a0f, 0x00eef32aec142ebd},
- {1, 0, 0, 0, 0, 0, 0, 0, 0}},
-{{0x00c31ec398993b39, 0x03a9f45bcda68253, 0x00ac733c24c70890,
- 0x00872b111401ff01, 0x01d178c23195eafb, 0x03bca2c816b87f74,
- 0x0261a9af46fbad7a, 0x0324b2a8dd3d28f9, 0x00918121d8f24e23},
- {0x032bc8c1ca983cd7, 0x00d869dfb08fc8c6, 0x01693cb61fce1516,
- 0x012a5ea68f4e88a8, 0x010869cab88d7ae3, 0x009081ad277ceee1,
- 0x033a77166d064cdc, 0x03955235a1fb3a95, 0x01251a4a9b25b65e},
- {1, 0, 0, 0, 0, 0, 0, 0, 0}},
-{{0x00148a3a1b27f40b, 0x0123186df1b31fdc, 0x00026e7beaad34ce,
- 0x01db446ac1d3dbba, 0x0299c1a33437eaec, 0x024540610183cbb7,
- 0x0173bb0e9ce92e46, 0x02b937e43921214b, 0x01ab0436a9bf01b5},
- {0x0383381640d46948, 0x008dacbf0e7f330f, 0x03602122bcc3f318,
- 0x01ee596b200620d6, 0x03bd0585fda430b3, 0x014aed77fd123a83,
- 0x005ace749e52f742, 0x0390fe041da2b842, 0x0189a8ceb3299242},
- {1, 0, 0, 0, 0, 0, 0, 0, 0}},
-{{0x012a19d6b3282473, 0x00c0915918b423ce, 0x023a954eb94405ae,
- 0x00529f692be26158, 0x0289fa1b6fa4b2aa, 0x0198ae4ceea346ef,
- 0x0047d8cdfbdedd49, 0x00cc8c8953f0f6b8, 0x001424abbff49203},
- {0x0256732a1115a03a, 0x0351bc38665c6733, 0x03f7b950fb4a6447,
- 0x000afffa94c22155, 0x025763d0a4dab540, 0x000511e92d4fc283,
- 0x030a7e9eda0ee96c, 0x004c3cd93a28bf0a, 0x017edb3a8719217f},
- {1, 0, 0, 0, 0, 0, 0, 0, 0}},
-{{0x011de5675a88e673, 0x031d7d0f5e567fbe, 0x0016b2062c970ae5,
- 0x03f4a2be49d90aa7, 0x03cef0bd13822866, 0x03f0923dcf774a6c,
- 0x0284bebc4f322f72, 0x016ab2645302bb2c, 0x01793f95dace0e2a},
- {0x010646e13527a28f, 0x01ca1babd59dc5e7, 0x01afedfd9a5595df,
- 0x01f15785212ea6b1, 0x0324e5d64f6ae3f4, 0x02d680f526d00645,
- 0x0127920fadf627a7, 0x03b383f75df4f684, 0x0089e0057e783b0a},
- {1, 0, 0, 0, 0, 0, 0, 0, 0}},
-{{0x00f334b9eb3c26c6, 0x0298fdaa98568dce, 0x01c2d24843a82292,
- 0x020bcb24fa1b0711, 0x02cbdb3d2b1875e6, 0x0014907598f89422,
- 0x03abe3aa43b26664, 0x02cbf47f720bc168, 0x0133b5e73014b79b},
- {0x034aab5dab05779d, 0x00cdc5d71fee9abb, 0x0399f16bd4bd9d30,
- 0x03582fa592d82647, 0x02be1cdfb775b0e9, 0x0034f7cea32e94cb,
- 0x0335a7f08f56f286, 0x03b707e9565d1c8b, 0x0015c946ea5b614f},
- {1, 0, 0, 0, 0, 0, 0, 0, 0}},
-{{0x024676f6cff72255, 0x00d14625cac96378, 0x00532b6008bc3767,
- 0x01fc16721b985322, 0x023355ea1b091668, 0x029de7afdc0317c3,
- 0x02fc8a7ca2da037c, 0x02de1217d74a6f30, 0x013f7173175b73bf},
- {0x0344913f441490b5, 0x0200f9e272b61eca, 0x0258a246b1dd55d2,
- 0x03753db9ea496f36, 0x025e02937a09c5ef, 0x030cbd3d14012692,
- 0x01793a67e70dc72a, 0x03ec1d37048a662e, 0x006550f700c32a8d},
- {1, 0, 0, 0, 0, 0, 0, 0, 0}},
-{{0x00d3f48a347eba27, 0x008e636649b61bd8, 0x00d3b93716778fb3,
- 0x004d1915757bd209, 0x019d5311a3da44e0, 0x016d1afcbbe6aade,
- 0x0241bf5f73265616, 0x0384672e5d50d39b, 0x005009fee522b684},
- {0x029b4fab064435fe, 0x018868ee095bbb07, 0x01ea3d6936cc92b8,
- 0x000608b00f78a2f3, 0x02db911073d1c20f, 0x018205938470100a,
- 0x01f1e4964cbe6ff2, 0x021a19a29eed4663, 0x01414485f42afa81},
- {1, 0, 0, 0, 0, 0, 0, 0, 0}},
-{{0x01612b3a17f63e34, 0x03813992885428e6, 0x022b3c215b5a9608,
- 0x029b4057e19f2fcb, 0x0384059a587af7e6, 0x02d6400ace6fe610,
- 0x029354d896e8e331, 0x00c047ee6dfba65e, 0x0037720542e9d49d},
- {0x02ce9eed7c5e9278, 0x0374ed703e79643b, 0x01316c54c4072006,
- 0x005aaa09054b2ee8, 0x002824000c840d57, 0x03d4eba24771ed86,
- 0x0189c50aabc3bdae, 0x0338c01541e15510, 0x00466d56e38eed42},
- {1, 0, 0, 0, 0, 0, 0, 0, 0}},
-{{0x007efd8330ad8bd6, 0x02465ed48047710b, 0x0034c6606b215e0c,
- 0x016ae30c53cbf839, 0x01fa17bd37161216, 0x018ead4e61ce8ab9,
- 0x005482ed5f5dee46, 0x037543755bba1d7f, 0x005e5ac7e70a9d0f},
- {0x0117e1bb2fdcb2a2, 0x03deea36249f40c4, 0x028d09b4a6246cb7,
- 0x03524b8855bcf756, 0x023d7d109d5ceb58, 0x0178e43e3223ef9c,
- 0x0154536a0c6e966a, 0x037964d1286ee9fe, 0x0199bcd90e125055},
- {1, 0, 0, 0, 0, 0, 0, 0, 0}}
+ { { 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+ { 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+ { 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+ { { 0x017e7e31c2e5bd66, 0x022cf0615a90a6fe, 0x00127a2ffa8de334,
+ 0x01dfbf9d64a3f877, 0x006b4d3dbaa14b5e, 0x014fed487e0a2bd8,
+ 0x015b4429c6481390, 0x03a73678fb2d988e, 0x00c6858e06b70404 },
+ { 0x00be94769fd16650, 0x031c21a89cb09022, 0x039013fad0761353,
+ 0x02657bd099031542, 0x03273e662c97ee72, 0x01e6d11a05ebef45,
+ 0x03d1bd998f544495, 0x03001172297ed0b1, 0x011839296a789a3b },
+ { 1, 0, 0, 0, 0, 0, 0, 0, 0 } },
+ { { 0x0373faacbc875bae, 0x00f325023721c671, 0x00f666fd3dbde5ad,
+ 0x01a6932363f88ea7, 0x01fc6d9e13f9c47b, 0x03bcbffc2bbf734e,
+ 0x013ee3c3647f3a92, 0x029409fefe75d07d, 0x00ef9199963d85e5 },
+ { 0x011173743ad5b178, 0x02499c7c21bf7d46, 0x035beaeabb8b1a58,
+ 0x00f989c4752ea0a3, 0x0101e1de48a9c1a3, 0x01a20076be28ba6c,
+ 0x02f8052e5eb2de95, 0x01bfe8f82dea117c, 0x0160074d3c36ddb7 },
+ { 1, 0, 0, 0, 0, 0, 0, 0, 0 } },
+ { { 0x012f3fc373393b3b, 0x03d3d6172f1419fa, 0x02adc943c0b86873,
+ 0x00d475584177952b, 0x012a4d1673750ee2, 0x00512517a0f13b0c,
+ 0x02b184671a7b1734, 0x0315b84236f1a50a, 0x00a4afc472edbdb9 },
+ { 0x00152a7077f385c4, 0x03044007d8d1c2ee, 0x0065829d61d52b52,
+ 0x00494ff6b6631d0d, 0x00a11d94d5f06bcf, 0x02d2f89474d9282e,
+ 0x0241c5727c06eeb9, 0x0386928710fbdb9d, 0x01f883f727b0dfbe },
+ { 1, 0, 0, 0, 0, 0, 0, 0, 0 } },
+ { { 0x019b0c3c9185544d, 0x006243a37c9d97db, 0x02ee3cbe030a2ad2,
+ 0x00cfdd946bb51e0d, 0x0271c00932606b91, 0x03f817d1ec68c561,
+ 0x03f37009806a369c, 0x03c1f30baf184fd5, 0x01091022d6d2f065 },
+ { 0x0292c583514c45ed, 0x0316fca51f9a286c, 0x00300af507c1489a,
+ 0x0295f69008298cf1, 0x02c0ed8274943d7b, 0x016509b9b47a431e,
+ 0x02bc9de9634868ce, 0x005b34929bffcb09, 0x000c1a0121681524 },
+ { 1, 0, 0, 0, 0, 0, 0, 0, 0 } },
+ { { 0x0286abc0292fb9f2, 0x02665eee9805b3f7, 0x01ed7455f17f26d6,
+ 0x0346355b83175d13, 0x006284944cd0a097, 0x0191895bcdec5e51,
+ 0x02e288370afda7d9, 0x03b22312bfefa67a, 0x01d104d3fc0613fe },
+ { 0x0092421a12f7e47f, 0x0077a83fa373c501, 0x03bd25c5f696bd0d,
+ 0x035c41e4d5459761, 0x01ca0d1742b24f53, 0x00aaab27863a509c,
+ 0x018b6de47df73917, 0x025c0b771705cd01, 0x01fd51d566d760a7 },
+ { 1, 0, 0, 0, 0, 0, 0, 0, 0 } },
+ { { 0x01dd92ff6b0d1dbd, 0x039c5e2e8f8afa69, 0x0261ed13242c3b27,
+ 0x0382c6e67026e6a0, 0x01d60b10be2089f9, 0x03c15f3dce86723f,
+ 0x03c764a32d2a062d, 0x017307eac0fad056, 0x018207c0b96c5256 },
+ { 0x0196a16d60e13154, 0x03e6ce74c0267030, 0x00ddbf2b4e52a5aa,
+ 0x012738241bbf31c8, 0x00ebe8dc04685a28, 0x024c2ad6d380d4a2,
+ 0x035ee062a6e62d0e, 0x0029ed74af7d3a0f, 0x00eef32aec142ebd },
+ { 1, 0, 0, 0, 0, 0, 0, 0, 0 } },
+ { { 0x00c31ec398993b39, 0x03a9f45bcda68253, 0x00ac733c24c70890,
+ 0x00872b111401ff01, 0x01d178c23195eafb, 0x03bca2c816b87f74,
+ 0x0261a9af46fbad7a, 0x0324b2a8dd3d28f9, 0x00918121d8f24e23 },
+ { 0x032bc8c1ca983cd7, 0x00d869dfb08fc8c6, 0x01693cb61fce1516,
+ 0x012a5ea68f4e88a8, 0x010869cab88d7ae3, 0x009081ad277ceee1,
+ 0x033a77166d064cdc, 0x03955235a1fb3a95, 0x01251a4a9b25b65e },
+ { 1, 0, 0, 0, 0, 0, 0, 0, 0 } },
+ { { 0x00148a3a1b27f40b, 0x0123186df1b31fdc, 0x00026e7beaad34ce,
+ 0x01db446ac1d3dbba, 0x0299c1a33437eaec, 0x024540610183cbb7,
+ 0x0173bb0e9ce92e46, 0x02b937e43921214b, 0x01ab0436a9bf01b5 },
+ { 0x0383381640d46948, 0x008dacbf0e7f330f, 0x03602122bcc3f318,
+ 0x01ee596b200620d6, 0x03bd0585fda430b3, 0x014aed77fd123a83,
+ 0x005ace749e52f742, 0x0390fe041da2b842, 0x0189a8ceb3299242 },
+ { 1, 0, 0, 0, 0, 0, 0, 0, 0 } },
+ { { 0x012a19d6b3282473, 0x00c0915918b423ce, 0x023a954eb94405ae,
+ 0x00529f692be26158, 0x0289fa1b6fa4b2aa, 0x0198ae4ceea346ef,
+ 0x0047d8cdfbdedd49, 0x00cc8c8953f0f6b8, 0x001424abbff49203 },
+ { 0x0256732a1115a03a, 0x0351bc38665c6733, 0x03f7b950fb4a6447,
+ 0x000afffa94c22155, 0x025763d0a4dab540, 0x000511e92d4fc283,
+ 0x030a7e9eda0ee96c, 0x004c3cd93a28bf0a, 0x017edb3a8719217f },
+ { 1, 0, 0, 0, 0, 0, 0, 0, 0 } },
+ { { 0x011de5675a88e673, 0x031d7d0f5e567fbe, 0x0016b2062c970ae5,
+ 0x03f4a2be49d90aa7, 0x03cef0bd13822866, 0x03f0923dcf774a6c,
+ 0x0284bebc4f322f72, 0x016ab2645302bb2c, 0x01793f95dace0e2a },
+ { 0x010646e13527a28f, 0x01ca1babd59dc5e7, 0x01afedfd9a5595df,
+ 0x01f15785212ea6b1, 0x0324e5d64f6ae3f4, 0x02d680f526d00645,
+ 0x0127920fadf627a7, 0x03b383f75df4f684, 0x0089e0057e783b0a },
+ { 1, 0, 0, 0, 0, 0, 0, 0, 0 } },
+ { { 0x00f334b9eb3c26c6, 0x0298fdaa98568dce, 0x01c2d24843a82292,
+ 0x020bcb24fa1b0711, 0x02cbdb3d2b1875e6, 0x0014907598f89422,
+ 0x03abe3aa43b26664, 0x02cbf47f720bc168, 0x0133b5e73014b79b },
+ { 0x034aab5dab05779d, 0x00cdc5d71fee9abb, 0x0399f16bd4bd9d30,
+ 0x03582fa592d82647, 0x02be1cdfb775b0e9, 0x0034f7cea32e94cb,
+ 0x0335a7f08f56f286, 0x03b707e9565d1c8b, 0x0015c946ea5b614f },
+ { 1, 0, 0, 0, 0, 0, 0, 0, 0 } },
+ { { 0x024676f6cff72255, 0x00d14625cac96378, 0x00532b6008bc3767,
+ 0x01fc16721b985322, 0x023355ea1b091668, 0x029de7afdc0317c3,
+ 0x02fc8a7ca2da037c, 0x02de1217d74a6f30, 0x013f7173175b73bf },
+ { 0x0344913f441490b5, 0x0200f9e272b61eca, 0x0258a246b1dd55d2,
+ 0x03753db9ea496f36, 0x025e02937a09c5ef, 0x030cbd3d14012692,
+ 0x01793a67e70dc72a, 0x03ec1d37048a662e, 0x006550f700c32a8d },
+ { 1, 0, 0, 0, 0, 0, 0, 0, 0 } },
+ { { 0x00d3f48a347eba27, 0x008e636649b61bd8, 0x00d3b93716778fb3,
+ 0x004d1915757bd209, 0x019d5311a3da44e0, 0x016d1afcbbe6aade,
+ 0x0241bf5f73265616, 0x0384672e5d50d39b, 0x005009fee522b684 },
+ { 0x029b4fab064435fe, 0x018868ee095bbb07, 0x01ea3d6936cc92b8,
+ 0x000608b00f78a2f3, 0x02db911073d1c20f, 0x018205938470100a,
+ 0x01f1e4964cbe6ff2, 0x021a19a29eed4663, 0x01414485f42afa81 },
+ { 1, 0, 0, 0, 0, 0, 0, 0, 0 } },
+ { { 0x01612b3a17f63e34, 0x03813992885428e6, 0x022b3c215b5a9608,
+ 0x029b4057e19f2fcb, 0x0384059a587af7e6, 0x02d6400ace6fe610,
+ 0x029354d896e8e331, 0x00c047ee6dfba65e, 0x0037720542e9d49d },
+ { 0x02ce9eed7c5e9278, 0x0374ed703e79643b, 0x01316c54c4072006,
+ 0x005aaa09054b2ee8, 0x002824000c840d57, 0x03d4eba24771ed86,
+ 0x0189c50aabc3bdae, 0x0338c01541e15510, 0x00466d56e38eed42 },
+ { 1, 0, 0, 0, 0, 0, 0, 0, 0 } },
+ { { 0x007efd8330ad8bd6, 0x02465ed48047710b, 0x0034c6606b215e0c,
+ 0x016ae30c53cbf839, 0x01fa17bd37161216, 0x018ead4e61ce8ab9,
+ 0x005482ed5f5dee46, 0x037543755bba1d7f, 0x005e5ac7e70a9d0f },
+ { 0x0117e1bb2fdcb2a2, 0x03deea36249f40c4, 0x028d09b4a6246cb7,
+ 0x03524b8855bcf756, 0x023d7d109d5ceb58, 0x0178e43e3223ef9c,
+ 0x0154536a0c6e966a, 0x037964d1286ee9fe, 0x0199bcd90e125055 },
+ { 1, 0, 0, 0, 0, 0, 0, 0, 0 } }
};
/*
* select_point selects the |idx|th point from a precomputation table and
* copies it to out.
*/
- /* pre_comp below is of the size provided in |size| */
+/* pre_comp below is of the size provided in |size| */
static void select_point(const limb idx, unsigned int size,
- const felem pre_comp[][3], felem out[3])
+ const felem pre_comp[][3], felem out[3])
{
unsigned i, j;
limb *outlimbs = &out[0][0];
@@ -1579,10 +1496,10 @@ static char get_bit(const felem_bytearray in, int i)
* Output point (X, Y, Z) is stored in x_out, y_out, z_out
*/
static void batch_mul(felem x_out, felem y_out, felem z_out,
- const felem_bytearray scalars[],
- const unsigned num_points, const u8 *g_scalar,
- const int mixed, const felem pre_comp[][17][3],
- const felem g_pre_comp[16][3])
+ const felem_bytearray scalars[],
+ const unsigned num_points, const u8 *g_scalar,
+ const int mixed, const felem pre_comp[][17][3],
+ const felem g_pre_comp[16][3])
{
int i, skip;
unsigned num, gen_mul = (g_scalar != NULL);
@@ -1598,8 +1515,8 @@ static void batch_mul(felem x_out, felem y_out, felem z_out,
* of the generator (last quarter of rounds) and additions of other
* points multiples (every 5th round).
*/
- skip = 1; /* save two point operations in the first
- * round */
+ skip = 1; /* save two point operations in the first
+ * round */
for (i = (num_points ? 520 : 130); i >= 0; --i) {
/* double */
if (!skip)
@@ -1618,7 +1535,7 @@ static void batch_mul(felem x_out, felem y_out, felem z_out,
if (!skip) {
/* The 1 argument below is for "mixed" */
point_add(nq[0], nq[1], nq[2],
- nq[0], nq[1], nq[2], 1, tmp[0], tmp[1], tmp[2]);
+ nq[0], nq[1], nq[2], 1, tmp[0], tmp[1], tmp[2]);
} else {
memcpy(nq, tmp, 3 * sizeof(felem));
skip = 0;
@@ -1643,12 +1560,12 @@ static void batch_mul(felem x_out, felem y_out, felem z_out,
select_point(digit, 17, pre_comp[num], tmp);
felem_neg(tmp[3], tmp[1]); /* (X, -Y, Z) is the negative
* point */
- copy_conditional(tmp[1], tmp[3], (-(limb) sign));
+ copy_conditional(tmp[1], tmp[3], (-(limb)sign));
if (!skip) {
point_add(nq[0], nq[1], nq[2],
- nq[0], nq[1], nq[2],
- mixed, tmp[0], tmp[1], tmp[2]);
+ nq[0], nq[1], nq[2],
+ mixed, tmp[0], tmp[1], tmp[2]);
} else {
memcpy(nq, tmp, 3 * sizeof(felem));
skip = 0;
@@ -1688,9 +1605,9 @@ const EC_METHOD *EC_GFp_nistp521_method(void)
ossl_ec_GFp_simple_point_set_to_infinity,
ossl_ec_GFp_simple_point_set_affine_coordinates,
ossl_ec_GFp_nistp521_point_get_affine_coordinates,
- 0 /* point_set_compressed_coordinates */ ,
- 0 /* point2oct */ ,
- 0 /* oct2point */ ,
+ 0 /* point_set_compressed_coordinates */,
+ 0 /* point2oct */,
+ 0 /* oct2point */,
ossl_ec_GFp_simple_add,
ossl_ec_GFp_simple_dbl,
ossl_ec_GFp_simple_invert,
@@ -1704,11 +1621,11 @@ const EC_METHOD *EC_GFp_nistp521_method(void)
ossl_ec_GFp_nistp521_have_precompute_mult,
ossl_ec_GFp_nist_field_mul,
ossl_ec_GFp_nist_field_sqr,
- 0 /* field_div */ ,
+ 0 /* field_div */,
ossl_ec_GFp_simple_field_inv,
- 0 /* field_encode */ ,
- 0 /* field_decode */ ,
- 0, /* field_set_to_one */
+ 0 /* field_encode */,
+ 0 /* field_decode */,
+ 0, /* field_set_to_one */
ossl_ec_key_simple_priv2oct,
ossl_ec_key_simple_oct2priv,
0, /* set private */
@@ -1725,7 +1642,7 @@ const EC_METHOD *EC_GFp_nistp521_method(void)
0, /* blind_coordinates */
0, /* ladder_pre */
0, /* ladder_step */
- 0 /* ladder_post */
+ 0 /* ladder_post */
};
return &ret;
@@ -1789,8 +1706,8 @@ int ossl_ec_GFp_nistp521_group_init(EC_GROUP *group)
}
int ossl_ec_GFp_nistp521_group_set_curve(EC_GROUP *group, const BIGNUM *p,
- const BIGNUM *a, const BIGNUM *b,
- BN_CTX *ctx)
+ const BIGNUM *a, const BIGNUM *b,
+ BN_CTX *ctx)
{
int ret = 0;
BIGNUM *curve_p, *curve_a, *curve_b;
@@ -1818,7 +1735,7 @@ int ossl_ec_GFp_nistp521_group_set_curve(EC_GROUP *group, const BIGNUM *p,
}
group->field_mod_func = BN_nist_mod_521;
ret = ossl_ec_GFp_simple_group_set_curve(group, p, a, b, ctx);
- err:
+err:
BN_CTX_end(ctx);
#ifndef FIPS_MODULE
BN_CTX_free(new_ctx);
@@ -1831,9 +1748,9 @@ int ossl_ec_GFp_nistp521_group_set_curve(EC_GROUP *group, const BIGNUM *p,
* (X/Z^2, Y/Z^3)
*/
int ossl_ec_GFp_nistp521_point_get_affine_coordinates(const EC_GROUP *group,
- const EC_POINT *point,
- BIGNUM *x, BIGNUM *y,
- BN_CTX *ctx)
+ const EC_POINT *point,
+ BIGNUM *x, BIGNUM *y,
+ BN_CTX *ctx)
{
felem z1, z2, x_in, y_in, x_out, y_out;
largefelem tmp;
@@ -1842,8 +1759,7 @@ int ossl_ec_GFp_nistp521_point_get_affine_coordinates(const EC_GROUP *group,
ERR_raise(ERR_LIB_EC, EC_R_POINT_AT_INFINITY);
return 0;
}
- if ((!BN_to_felem(x_in, point->X)) || (!BN_to_felem(y_in, point->Y)) ||
- (!BN_to_felem(z1, point->Z)))
+ if ((!BN_to_felem(x_in, point->X)) || (!BN_to_felem(y_in, point->Y)) || (!BN_to_felem(z1, point->Z)))
return 0;
felem_inv(z2, z1);
felem_square(tmp, z2);
@@ -1873,32 +1789,32 @@ int ossl_ec_GFp_nistp521_point_get_affine_coordinates(const EC_GROUP *group,
/* points below is of size |num|, and tmp_felems is of size |num+1/ */
static void make_points_affine(size_t num, felem points[][3],
- felem tmp_felems[])
+ felem tmp_felems[])
{
/*
* Runs in constant time, unless an input is the point at infinity (which
* normally shouldn't happen).
*/
ossl_ec_GFp_nistp_points_make_affine_internal(num,
- points,
- sizeof(felem),
- tmp_felems,
- (void (*)(void *))felem_one,
- felem_is_zero_int,
- (void (*)(void *, const void *))
- felem_assign,
- (void (*)(void *, const void *))
- felem_square_reduce, (void (*)
- (void *,
- const void
- *,
- const void
- *))
- felem_mul_reduce,
- (void (*)(void *, const void *))
- felem_inv,
- (void (*)(void *, const void *))
- felem_contract);
+ points,
+ sizeof(felem),
+ tmp_felems,
+ (void (*)(void *))felem_one,
+ felem_is_zero_int,
+ (void (*)(void *, const void *))
+ felem_assign,
+ (void (*)(void *, const void *))
+ felem_square_reduce,
+ (void (*)(void *,
+ const void
+ *,
+ const void
+ *))
+ felem_mul_reduce,
+ (void (*)(void *, const void *))
+ felem_inv,
+ (void (*)(void *, const void *))
+ felem_contract);
}
/*
@@ -1906,9 +1822,9 @@ static void make_points_affine(size_t num, felem points[][3],
* values Result is stored in r (r can equal one of the inputs).
*/
int ossl_ec_GFp_nistp521_points_mul(const EC_GROUP *group, EC_POINT *r,
- const BIGNUM *scalar, size_t num,
- const EC_POINT *points[],
- const BIGNUM *scalars[], BN_CTX *ctx)
+ const BIGNUM *scalar, size_t num,
+ const EC_POINT *points[],
+ const BIGNUM *scalars[], BN_CTX *ctx)
{
int ret = 0;
int j;
@@ -1916,7 +1832,7 @@ int ossl_ec_GFp_nistp521_points_mul(const EC_GROUP *group, EC_POINT *r,
BIGNUM *x, *y, *z, *tmp_scalar;
felem_bytearray g_secret;
felem_bytearray *secrets = NULL;
- felem (*pre_comp)[17][3] = NULL;
+ felem(*pre_comp)[17][3] = NULL;
felem *tmp_felems = NULL;
unsigned i;
int num_bytes;
@@ -1944,20 +1860,18 @@ int ossl_ec_GFp_nistp521_points_mul(const EC_GROUP *group, EC_POINT *r,
g_pre_comp = &pre->g_pre_comp[0];
else
/* try to use the standard precomputation */
- g_pre_comp = (felem(*)[3]) gmul;
+ g_pre_comp = (felem(*)[3])gmul;
generator = EC_POINT_new(group);
if (generator == NULL)
goto err;
/* get the generator from precomputation */
- if (!felem_to_BN(x, g_pre_comp[1][0]) ||
- !felem_to_BN(y, g_pre_comp[1][1]) ||
- !felem_to_BN(z, g_pre_comp[1][2])) {
+ if (!felem_to_BN(x, g_pre_comp[1][0]) || !felem_to_BN(y, g_pre_comp[1][1]) || !felem_to_BN(z, g_pre_comp[1][2])) {
ERR_raise(ERR_LIB_EC, ERR_R_BN_LIB);
goto err;
}
if (!ossl_ec_GFp_simple_set_Jprojective_coordinates_GFp(group,
- generator,
- x, y, z, ctx))
+ generator,
+ x, y, z, ctx))
goto err;
if (0 == EC_POINT_cmp(group, generator, group->generator, ctx))
/* precomputation matches generator */
@@ -1981,8 +1895,7 @@ int ossl_ec_GFp_nistp521_points_mul(const EC_GROUP *group, EC_POINT *r,
secrets = OPENSSL_calloc(num_points, sizeof(*secrets));
pre_comp = OPENSSL_calloc(num_points, sizeof(*pre_comp));
if (mixed)
- tmp_felems =
- OPENSSL_malloc_array(num_points * 17 + 1, sizeof(*tmp_felems));
+ tmp_felems = OPENSSL_malloc_array(num_points * 17 + 1, sizeof(*tmp_felems));
if ((secrets == NULL) || (pre_comp == NULL)
|| (mixed && (tmp_felems == NULL)))
goto err;
@@ -2017,19 +1930,17 @@ int ossl_ec_GFp_nistp521_points_mul(const EC_GROUP *group, EC_POINT *r,
goto err;
}
num_bytes = BN_bn2lebinpad(tmp_scalar,
- secrets[i], sizeof(secrets[i]));
+ secrets[i], sizeof(secrets[i]));
} else {
num_bytes = BN_bn2lebinpad(p_scalar,
- secrets[i], sizeof(secrets[i]));
+ secrets[i], sizeof(secrets[i]));
}
if (num_bytes < 0) {
ERR_raise(ERR_LIB_EC, ERR_R_BN_LIB);
goto err;
}
/* precompute multiples */
- if ((!BN_to_felem(x_out, p->X)) ||
- (!BN_to_felem(y_out, p->Y)) ||
- (!BN_to_felem(z_out, p->Z)))
+ if ((!BN_to_felem(x_out, p->X)) || (!BN_to_felem(y_out, p->Y)) || (!BN_to_felem(z_out, p->Z)))
goto err;
memcpy(pre_comp[i][1][0], x_out, sizeof(felem));
memcpy(pre_comp[i][1][1], y_out, sizeof(felem));
@@ -2037,16 +1948,16 @@ int ossl_ec_GFp_nistp521_points_mul(const EC_GROUP *group, EC_POINT *r,
for (j = 2; j <= 16; ++j) {
if (j & 1) {
point_add(pre_comp[i][j][0], pre_comp[i][j][1],
- pre_comp[i][j][2], pre_comp[i][1][0],
- pre_comp[i][1][1], pre_comp[i][1][2], 0,
- pre_comp[i][j - 1][0],
- pre_comp[i][j - 1][1],
- pre_comp[i][j - 1][2]);
+ pre_comp[i][j][2], pre_comp[i][1][0],
+ pre_comp[i][1][1], pre_comp[i][1][2], 0,
+ pre_comp[i][j - 1][0],
+ pre_comp[i][j - 1][1],
+ pre_comp[i][j - 1][2]);
} else {
point_double(pre_comp[i][j][0], pre_comp[i][j][1],
- pre_comp[i][j][2], pre_comp[i][j / 2][0],
- pre_comp[i][j / 2][1],
- pre_comp[i][j / 2][2]);
+ pre_comp[i][j][2], pre_comp[i][j / 2][0],
+ pre_comp[i][j / 2][1],
+ pre_comp[i][j / 2][2]);
}
}
}
@@ -2074,29 +1985,28 @@ int ossl_ec_GFp_nistp521_points_mul(const EC_GROUP *group, EC_POINT *r,
}
/* do the multiplication with generator precomputation */
batch_mul(x_out, y_out, z_out,
- (const felem_bytearray(*))secrets, num_points,
- g_secret,
- mixed, (const felem(*)[17][3])pre_comp,
- (const felem(*)[3])g_pre_comp);
+ (const felem_bytearray(*))secrets, num_points,
+ g_secret,
+ mixed, (const felem(*)[17][3])pre_comp,
+ (const felem(*)[3])g_pre_comp);
} else {
/* do the multiplication without generator precomputation */
batch_mul(x_out, y_out, z_out,
- (const felem_bytearray(*))secrets, num_points,
- NULL, mixed, (const felem(*)[17][3])pre_comp, NULL);
+ (const felem_bytearray(*))secrets, num_points,
+ NULL, mixed, (const felem(*)[17][3])pre_comp, NULL);
}
/* reduce the output to its unique minimal representation */
felem_contract(x_in, x_out);
felem_contract(y_in, y_out);
felem_contract(z_in, z_out);
- if ((!felem_to_BN(x, x_in)) || (!felem_to_BN(y, y_in)) ||
- (!felem_to_BN(z, z_in))) {
+ if ((!felem_to_BN(x, x_in)) || (!felem_to_BN(y, y_in)) || (!felem_to_BN(z, z_in))) {
ERR_raise(ERR_LIB_EC, ERR_R_BN_LIB);
goto err;
}
ret = ossl_ec_GFp_simple_set_Jprojective_coordinates_GFp(group, r, x, y, z,
- ctx);
+ ctx);
- err:
+err:
BN_CTX_end(ctx);
EC_POINT_free(generator);
OPENSSL_free(secrets);
@@ -2151,22 +2061,20 @@ int ossl_ec_GFp_nistp521_precompute_mult(EC_GROUP *group, BN_CTX *ctx)
memcpy(pre->g_pre_comp, gmul, sizeof(pre->g_pre_comp));
goto done;
}
- if ((!BN_to_felem(pre->g_pre_comp[1][0], group->generator->X)) ||
- (!BN_to_felem(pre->g_pre_comp[1][1], group->generator->Y)) ||
- (!BN_to_felem(pre->g_pre_comp[1][2], group->generator->Z)))
+ if ((!BN_to_felem(pre->g_pre_comp[1][0], group->generator->X)) || (!BN_to_felem(pre->g_pre_comp[1][1], group->generator->Y)) || (!BN_to_felem(pre->g_pre_comp[1][2], group->generator->Z)))
goto err;
/* compute 2^130*G, 2^260*G, 2^390*G */
for (i = 1; i <= 4; i <<= 1) {
point_double(pre->g_pre_comp[2 * i][0], pre->g_pre_comp[2 * i][1],
- pre->g_pre_comp[2 * i][2], pre->g_pre_comp[i][0],
- pre->g_pre_comp[i][1], pre->g_pre_comp[i][2]);
+ pre->g_pre_comp[2 * i][2], pre->g_pre_comp[i][0],
+ pre->g_pre_comp[i][1], pre->g_pre_comp[i][2]);
for (j = 0; j < 129; ++j) {
point_double(pre->g_pre_comp[2 * i][0],
- pre->g_pre_comp[2 * i][1],
- pre->g_pre_comp[2 * i][2],
- pre->g_pre_comp[2 * i][0],
- pre->g_pre_comp[2 * i][1],
- pre->g_pre_comp[2 * i][2]);
+ pre->g_pre_comp[2 * i][1],
+ pre->g_pre_comp[2 * i][2],
+ pre->g_pre_comp[2 * i][0],
+ pre->g_pre_comp[2 * i][1],
+ pre->g_pre_comp[2 * i][2]);
}
}
/* g_pre_comp[0] is the point at infinity */
@@ -2174,44 +2082,44 @@ int ossl_ec_GFp_nistp521_precompute_mult(EC_GROUP *group, BN_CTX *ctx)
/* the remaining multiples */
/* 2^130*G + 2^260*G */
point_add(pre->g_pre_comp[6][0], pre->g_pre_comp[6][1],
- pre->g_pre_comp[6][2], pre->g_pre_comp[4][0],
- pre->g_pre_comp[4][1], pre->g_pre_comp[4][2],
- 0, pre->g_pre_comp[2][0], pre->g_pre_comp[2][1],
- pre->g_pre_comp[2][2]);
+ pre->g_pre_comp[6][2], pre->g_pre_comp[4][0],
+ pre->g_pre_comp[4][1], pre->g_pre_comp[4][2],
+ 0, pre->g_pre_comp[2][0], pre->g_pre_comp[2][1],
+ pre->g_pre_comp[2][2]);
/* 2^130*G + 2^390*G */
point_add(pre->g_pre_comp[10][0], pre->g_pre_comp[10][1],
- pre->g_pre_comp[10][2], pre->g_pre_comp[8][0],
- pre->g_pre_comp[8][1], pre->g_pre_comp[8][2],
- 0, pre->g_pre_comp[2][0], pre->g_pre_comp[2][1],
- pre->g_pre_comp[2][2]);
+ pre->g_pre_comp[10][2], pre->g_pre_comp[8][0],
+ pre->g_pre_comp[8][1], pre->g_pre_comp[8][2],
+ 0, pre->g_pre_comp[2][0], pre->g_pre_comp[2][1],
+ pre->g_pre_comp[2][2]);
/* 2^260*G + 2^390*G */
point_add(pre->g_pre_comp[12][0], pre->g_pre_comp[12][1],
- pre->g_pre_comp[12][2], pre->g_pre_comp[8][0],
- pre->g_pre_comp[8][1], pre->g_pre_comp[8][2],
- 0, pre->g_pre_comp[4][0], pre->g_pre_comp[4][1],
- pre->g_pre_comp[4][2]);
+ pre->g_pre_comp[12][2], pre->g_pre_comp[8][0],
+ pre->g_pre_comp[8][1], pre->g_pre_comp[8][2],
+ 0, pre->g_pre_comp[4][0], pre->g_pre_comp[4][1],
+ pre->g_pre_comp[4][2]);
/* 2^130*G + 2^260*G + 2^390*G */
point_add(pre->g_pre_comp[14][0], pre->g_pre_comp[14][1],
- pre->g_pre_comp[14][2], pre->g_pre_comp[12][0],
- pre->g_pre_comp[12][1], pre->g_pre_comp[12][2],
- 0, pre->g_pre_comp[2][0], pre->g_pre_comp[2][1],
- pre->g_pre_comp[2][2]);
+ pre->g_pre_comp[14][2], pre->g_pre_comp[12][0],
+ pre->g_pre_comp[12][1], pre->g_pre_comp[12][2],
+ 0, pre->g_pre_comp[2][0], pre->g_pre_comp[2][1],
+ pre->g_pre_comp[2][2]);
for (i = 1; i < 8; ++i) {
/* odd multiples: add G */
point_add(pre->g_pre_comp[2 * i + 1][0],
- pre->g_pre_comp[2 * i + 1][1],
- pre->g_pre_comp[2 * i + 1][2], pre->g_pre_comp[2 * i][0],
- pre->g_pre_comp[2 * i][1], pre->g_pre_comp[2 * i][2], 0,
- pre->g_pre_comp[1][0], pre->g_pre_comp[1][1],
- pre->g_pre_comp[1][2]);
+ pre->g_pre_comp[2 * i + 1][1],
+ pre->g_pre_comp[2 * i + 1][2], pre->g_pre_comp[2 * i][0],
+ pre->g_pre_comp[2 * i][1], pre->g_pre_comp[2 * i][2], 0,
+ pre->g_pre_comp[1][0], pre->g_pre_comp[1][1],
+ pre->g_pre_comp[1][2]);
}
make_points_affine(15, &(pre->g_pre_comp[1]), tmp_felems);
- done:
+done:
SETPRECOMP(group, nistp521, pre);
ret = 1;
pre = NULL;
- err:
+err:
BN_CTX_end(ctx);
EC_POINT_free(generator);
#ifndef FIPS_MODULE
diff --git a/crypto/ec/ecp_nistputil.c b/crypto/ec/ecp_nistputil.c
index 4e8c0e2767..1d7ab55aba 100644
--- a/crypto/ec/ecp_nistputil.c
+++ b/crypto/ec/ecp_nistputil.c
@@ -49,39 +49,37 @@
* of size 'felem_size'. tmp_felems needs to point to a temporary array of
* 'num'+1 field elements for storage of intermediate values.
*/
-void
-ossl_ec_GFp_nistp_points_make_affine_internal(size_t num, void *point_array,
- size_t felem_size,
- void *tmp_felems,
- void (*felem_one) (void *out),
- int (*felem_is_zero) (const void
- *in),
- void (*felem_assign) (void *out,
- const void
- *in),
- void (*felem_square) (void *out,
- const void
- *in),
- void (*felem_mul) (void *out,
- const void
- *in1,
- const void
- *in2),
- void (*felem_inv) (void *out,
- const void
- *in),
- void (*felem_contract) (void
- *out,
- const
- void
- *in))
+void ossl_ec_GFp_nistp_points_make_affine_internal(size_t num, void *point_array,
+ size_t felem_size,
+ void *tmp_felems,
+ void (*felem_one)(void *out),
+ int (*felem_is_zero)(const void
+ *in),
+ void (*felem_assign)(void *out,
+ const void
+ *in),
+ void (*felem_square)(void *out,
+ const void
+ *in),
+ void (*felem_mul)(void *out,
+ const void
+ *in1,
+ const void
+ *in2),
+ void (*felem_inv)(void *out,
+ const void
+ *in),
+ void (*felem_contract)(void
+ *out,
+ const void
+ *in))
{
int i = 0;
#define tmp_felem(I) (&((char *)tmp_felems)[(I) * felem_size])
-#define X(I) (&((char *)point_array)[3*(I) * felem_size])
-#define Y(I) (&((char *)point_array)[(3*(I) + 1) * felem_size])
-#define Z(I) (&((char *)point_array)[(3*(I) + 2) * felem_size])
+#define X(I) (&((char *)point_array)[3 * (I) * felem_size])
+#define Y(I) (&((char *)point_array)[(3 * (I) + 1) * felem_size])
+#define Z(I) (&((char *)point_array)[(3 * (I) + 2) * felem_size])
if (!felem_is_zero(Z(0)))
felem_assign(tmp_felem(0), Z(0));
@@ -211,12 +209,12 @@ ossl_ec_GFp_nistp_points_make_affine_internal(size_t num, void *point_array,
*
*/
void ossl_ec_GFp_nistp_recode_scalar_bits(unsigned char *sign,
- unsigned char *digit, unsigned char in)
+ unsigned char *digit, unsigned char in)
{
unsigned char s, d;
- s = ~((in >> 5) - 1); /* sets all bits to MSB(in), 'in' seen as
- * 6-bit value */
+ s = ~((in >> 5) - 1); /* sets all bits to MSB(in), 'in' seen as
+ * 6-bit value */
d = (1 << 6) - in - 1;
d = (d & s) | (in & ~s);
d = (d >> 1) + (d & 1);
diff --git a/crypto/ec/ecp_nistz256.c b/crypto/ec/ecp_nistz256.c
index f90c012277..9a2e864d22 100644
--- a/crypto/ec/ecp_nistz256.c
+++ b/crypto/ec/ecp_nistz256.c
@@ -32,12 +32,12 @@
#include "internal/refcount.h"
#if BN_BITS2 != 64
-# define TOBN(hi,lo) lo,hi
+#define TOBN(hi, lo) lo, hi
#else
-# define TOBN(hi,lo) ((BN_ULONG)hi<<32|lo)
+#define TOBN(hi, lo) ((BN_ULONG)hi << 32 | lo)
#endif
-#define P256_LIMBS (256/BN_BITS2)
+#define P256_LIMBS (256 / BN_BITS2)
typedef unsigned short u16;
@@ -56,8 +56,8 @@ typedef P256_POINT_AFFINE PRECOMP256_ROW[64];
/* structure for precomputed multiples of the generator */
struct nistz256_pre_comp_st {
- const EC_GROUP *group; /* Parent EC_GROUP object */
- size_t w; /* Window size */
+ const EC_GROUP *group; /* Parent EC_GROUP object */
+ size_t w; /* Window size */
/*
* Constant time access to the X and Y coordinates of the pre-computed,
* generator multiplies, in the Montgomery domain. Pre-calculated
@@ -87,46 +87,46 @@ struct nistz256_pre_comp_st {
*/
/* Modular add: res = a+b mod P */
void ecp_nistz256_add(BN_ULONG res[P256_LIMBS],
- const BN_ULONG a[P256_LIMBS],
- const BN_ULONG b[P256_LIMBS]);
+ const BN_ULONG a[P256_LIMBS],
+ const BN_ULONG b[P256_LIMBS]);
/* Modular mul by 2: res = 2*a mod P */
void ecp_nistz256_mul_by_2(BN_ULONG res[P256_LIMBS],
- const BN_ULONG a[P256_LIMBS]);
+ const BN_ULONG a[P256_LIMBS]);
/* Modular mul by 3: res = 3*a mod P */
void ecp_nistz256_mul_by_3(BN_ULONG res[P256_LIMBS],
- const BN_ULONG a[P256_LIMBS]);
+ const BN_ULONG a[P256_LIMBS]);
/* Modular div by 2: res = a/2 mod P */
void ecp_nistz256_div_by_2(BN_ULONG res[P256_LIMBS],
- const BN_ULONG a[P256_LIMBS]);
+ const BN_ULONG a[P256_LIMBS]);
/* Modular sub: res = a-b mod P */
void ecp_nistz256_sub(BN_ULONG res[P256_LIMBS],
- const BN_ULONG a[P256_LIMBS],
- const BN_ULONG b[P256_LIMBS]);
+ const BN_ULONG a[P256_LIMBS],
+ const BN_ULONG b[P256_LIMBS]);
/* Modular neg: res = -a mod P */
void ecp_nistz256_neg(BN_ULONG res[P256_LIMBS], const BN_ULONG a[P256_LIMBS]);
/* Montgomery mul: res = a*b*2^-256 mod P */
void ecp_nistz256_mul_mont(BN_ULONG res[P256_LIMBS],
- const BN_ULONG a[P256_LIMBS],
- const BN_ULONG b[P256_LIMBS]);
+ const BN_ULONG a[P256_LIMBS],
+ const BN_ULONG b[P256_LIMBS]);
/* Montgomery sqr: res = a*a*2^-256 mod P */
void ecp_nistz256_sqr_mont(BN_ULONG res[P256_LIMBS],
- const BN_ULONG a[P256_LIMBS]);
+ const BN_ULONG a[P256_LIMBS]);
/* Convert a number from Montgomery domain, by multiplying with 1 */
void ecp_nistz256_from_mont(BN_ULONG res[P256_LIMBS],
- const BN_ULONG in[P256_LIMBS]);
+ const BN_ULONG in[P256_LIMBS]);
/* Convert a number to Montgomery domain, by multiplying with 2^512 mod P*/
void ecp_nistz256_to_mont(BN_ULONG res[P256_LIMBS],
- const BN_ULONG in[P256_LIMBS]);
+ const BN_ULONG in[P256_LIMBS]);
/* Functions that perform constant time access to the precomputed tables */
void ecp_nistz256_scatter_w5(P256_POINT *val,
- const P256_POINT *in_t, int idx);
+ const P256_POINT *in_t, int idx);
void ecp_nistz256_gather_w5(P256_POINT *val,
- const P256_POINT *in_t, int idx);
+ const P256_POINT *in_t, int idx);
void ecp_nistz256_scatter_w7(P256_POINT_AFFINE *val,
- const P256_POINT_AFFINE *in_t, int idx);
+ const P256_POINT_AFFINE *in_t, int idx);
void ecp_nistz256_gather_w7(P256_POINT_AFFINE *val,
- const P256_POINT_AFFINE *in_t, int idx);
+ const P256_POINT_AFFINE *in_t, int idx);
/* One converted into the Montgomery domain */
static const BN_ULONG ONE[P256_LIMBS] = {
@@ -165,9 +165,9 @@ static unsigned int _booth_recode_w7(unsigned int in)
}
static void copy_conditional(BN_ULONG dst[P256_LIMBS],
- const BN_ULONG src[P256_LIMBS], BN_ULONG move)
+ const BN_ULONG src[P256_LIMBS], BN_ULONG move)
{
- BN_ULONG mask1 = 0-move;
+ BN_ULONG mask1 = 0 - move;
BN_ULONG mask2 = ~mask1;
dst[0] = (src[0] & mask1) ^ (dst[0] & mask2);
@@ -191,7 +191,7 @@ static BN_ULONG is_zero(BN_ULONG in)
}
static BN_ULONG is_equal(const BN_ULONG a[P256_LIMBS],
- const BN_ULONG b[P256_LIMBS])
+ const BN_ULONG b[P256_LIMBS])
{
BN_ULONG res;
@@ -247,10 +247,10 @@ static BN_ULONG is_one(const BIGNUM *z)
#ifndef ECP_NISTZ256_REFERENCE_IMPLEMENTATION
void ecp_nistz256_point_double(P256_POINT *r, const P256_POINT *a);
void ecp_nistz256_point_add(P256_POINT *r,
- const P256_POINT *a, const P256_POINT *b);
+ const P256_POINT *a, const P256_POINT *b);
void ecp_nistz256_point_add_affine(P256_POINT *r,
- const P256_POINT *a,
- const P256_POINT_AFFINE *b);
+ const P256_POINT *a,
+ const P256_POINT_AFFINE *b);
#else
/* Point double: r = 2*a */
static void ecp_nistz256_point_double(P256_POINT *r, const P256_POINT *a)
@@ -300,7 +300,7 @@ static void ecp_nistz256_point_double(P256_POINT *r, const P256_POINT *a)
/* Point addition: r = a+b */
static void ecp_nistz256_point_add(P256_POINT *r,
- const P256_POINT *a, const P256_POINT *b)
+ const P256_POINT *a, const P256_POINT *b)
{
BN_ULONG U2[P256_LIMBS], S2[P256_LIMBS];
BN_ULONG U1[P256_LIMBS], S1[P256_LIMBS];
@@ -339,19 +339,19 @@ static void ecp_nistz256_point_add(P256_POINT *r,
in1infty = is_zero(in1infty);
in2infty = is_zero(in2infty);
- ecp_nistz256_sqr_mont(Z2sqr, in2_z); /* Z2^2 */
- ecp_nistz256_sqr_mont(Z1sqr, in1_z); /* Z1^2 */
+ ecp_nistz256_sqr_mont(Z2sqr, in2_z); /* Z2^2 */
+ ecp_nistz256_sqr_mont(Z1sqr, in1_z); /* Z1^2 */
- ecp_nistz256_mul_mont(S1, Z2sqr, in2_z); /* S1 = Z2^3 */
- ecp_nistz256_mul_mont(S2, Z1sqr, in1_z); /* S2 = Z1^3 */
+ ecp_nistz256_mul_mont(S1, Z2sqr, in2_z); /* S1 = Z2^3 */
+ ecp_nistz256_mul_mont(S2, Z1sqr, in1_z); /* S2 = Z1^3 */
- ecp_nistz256_mul_mont(S1, S1, in1_y); /* S1 = Y1*Z2^3 */
- ecp_nistz256_mul_mont(S2, S2, in2_y); /* S2 = Y2*Z1^3 */
- ecp_nistz256_sub(R, S2, S1); /* R = S2 - S1 */
+ ecp_nistz256_mul_mont(S1, S1, in1_y); /* S1 = Y1*Z2^3 */
+ ecp_nistz256_mul_mont(S2, S2, in2_y); /* S2 = Y2*Z1^3 */
+ ecp_nistz256_sub(R, S2, S1); /* R = S2 - S1 */
- ecp_nistz256_mul_mont(U1, in1_x, Z2sqr); /* U1 = X1*Z2^2 */
- ecp_nistz256_mul_mont(U2, in2_x, Z1sqr); /* U2 = X2*Z1^2 */
- ecp_nistz256_sub(H, U2, U1); /* H = U2 - U1 */
+ ecp_nistz256_mul_mont(U1, in1_x, Z2sqr); /* U1 = X1*Z2^2 */
+ ecp_nistz256_mul_mont(U2, in2_x, Z1sqr); /* U2 = X2*Z1^2 */
+ ecp_nistz256_sub(H, U2, U1); /* H = U2 - U1 */
/*
* The formulae are incorrect if the points are equal so we check for
@@ -397,14 +397,14 @@ static void ecp_nistz256_point_add(P256_POINT *r,
return;
}
- ecp_nistz256_sqr_mont(Rsqr, R); /* R^2 */
- ecp_nistz256_mul_mont(res_z, H, in1_z); /* Z3 = H*Z1*Z2 */
- ecp_nistz256_sqr_mont(Hsqr, H); /* H^2 */
+ ecp_nistz256_sqr_mont(Rsqr, R); /* R^2 */
+ ecp_nistz256_mul_mont(res_z, H, in1_z); /* Z3 = H*Z1*Z2 */
+ ecp_nistz256_sqr_mont(Hsqr, H); /* H^2 */
ecp_nistz256_mul_mont(res_z, res_z, in2_z); /* Z3 = H*Z1*Z2 */
- ecp_nistz256_mul_mont(Hcub, Hsqr, H); /* H^3 */
+ ecp_nistz256_mul_mont(Hcub, Hsqr, H); /* H^3 */
- ecp_nistz256_mul_mont(U2, U1, Hsqr); /* U1*H^2 */
- ecp_nistz256_mul_by_2(Hsqr, U2); /* 2*U1*H^2 */
+ ecp_nistz256_mul_mont(U2, U1, Hsqr); /* U1*H^2 */
+ ecp_nistz256_mul_by_2(Hsqr, U2); /* 2*U1*H^2 */
ecp_nistz256_sub(res_x, Rsqr, Hsqr);
ecp_nistz256_sub(res_x, res_x, Hcub);
@@ -430,8 +430,8 @@ static void ecp_nistz256_point_add(P256_POINT *r,
/* Point addition when b is known to be affine: r = a+b */
static void ecp_nistz256_point_add_affine(P256_POINT *r,
- const P256_POINT *a,
- const P256_POINT_AFFINE *b)
+ const P256_POINT *a,
+ const P256_POINT_AFFINE *b)
{
BN_ULONG U2[P256_LIMBS], S2[P256_LIMBS];
BN_ULONG Z1sqr[P256_LIMBS];
@@ -464,33 +464,31 @@ static void ecp_nistz256_point_add_affine(P256_POINT *r,
* In affine representation we encode infinity as (0,0), which is
* not on the curve, so it is OK
*/
- in2infty = (in2_x[0] | in2_x[1] | in2_x[2] | in2_x[3] |
- in2_y[0] | in2_y[1] | in2_y[2] | in2_y[3]);
+ in2infty = (in2_x[0] | in2_x[1] | in2_x[2] | in2_x[3] | in2_y[0] | in2_y[1] | in2_y[2] | in2_y[3]);
if (P256_LIMBS == 8)
- in2infty |= (in2_x[4] | in2_x[5] | in2_x[6] | in2_x[7] |
- in2_y[4] | in2_y[5] | in2_y[6] | in2_y[7]);
+ in2infty |= (in2_x[4] | in2_x[5] | in2_x[6] | in2_x[7] | in2_y[4] | in2_y[5] | in2_y[6] | in2_y[7]);
in1infty = is_zero(in1infty);
in2infty = is_zero(in2infty);
- ecp_nistz256_sqr_mont(Z1sqr, in1_z); /* Z1^2 */
+ ecp_nistz256_sqr_mont(Z1sqr, in1_z); /* Z1^2 */
- ecp_nistz256_mul_mont(U2, in2_x, Z1sqr); /* U2 = X2*Z1^2 */
- ecp_nistz256_sub(H, U2, in1_x); /* H = U2 - U1 */
+ ecp_nistz256_mul_mont(U2, in2_x, Z1sqr); /* U2 = X2*Z1^2 */
+ ecp_nistz256_sub(H, U2, in1_x); /* H = U2 - U1 */
- ecp_nistz256_mul_mont(S2, Z1sqr, in1_z); /* S2 = Z1^3 */
+ ecp_nistz256_mul_mont(S2, Z1sqr, in1_z); /* S2 = Z1^3 */
- ecp_nistz256_mul_mont(res_z, H, in1_z); /* Z3 = H*Z1*Z2 */
+ ecp_nistz256_mul_mont(res_z, H, in1_z); /* Z3 = H*Z1*Z2 */
- ecp_nistz256_mul_mont(S2, S2, in2_y); /* S2 = Y2*Z1^3 */
- ecp_nistz256_sub(R, S2, in1_y); /* R = S2 - S1 */
+ ecp_nistz256_mul_mont(S2, S2, in2_y); /* S2 = Y2*Z1^3 */
+ ecp_nistz256_sub(R, S2, in1_y); /* R = S2 - S1 */
- ecp_nistz256_sqr_mont(Hsqr, H); /* H^2 */
- ecp_nistz256_sqr_mont(Rsqr, R); /* R^2 */
- ecp_nistz256_mul_mont(Hcub, Hsqr, H); /* H^3 */
+ ecp_nistz256_sqr_mont(Hsqr, H); /* H^2 */
+ ecp_nistz256_sqr_mont(Rsqr, R); /* R^2 */
+ ecp_nistz256_mul_mont(Hcub, Hsqr, H); /* H^3 */
- ecp_nistz256_mul_mont(U2, in1_x, Hsqr); /* U1*H^2 */
- ecp_nistz256_mul_by_2(Hsqr, U2); /* 2*U1*H^2 */
+ ecp_nistz256_mul_mont(U2, in1_x, Hsqr); /* U1*H^2 */
+ ecp_nistz256_mul_by_2(Hsqr, U2); /* 2*U1*H^2 */
ecp_nistz256_sub(res_x, Rsqr, Hsqr);
ecp_nistz256_sub(res_x, res_x, Hcub);
@@ -517,7 +515,7 @@ static void ecp_nistz256_point_add_affine(P256_POINT *r,
/* r = in^-1 mod p */
static void ecp_nistz256_mod_inverse(BN_ULONG r[P256_LIMBS],
- const BN_ULONG in[P256_LIMBS])
+ const BN_ULONG in[P256_LIMBS])
{
/*
* The poly is ffffffff 00000001 00000000 00000000 00000000 ffffffff
@@ -532,27 +530,27 @@ static void ecp_nistz256_mod_inverse(BN_ULONG r[P256_LIMBS],
int i;
ecp_nistz256_sqr_mont(res, in);
- ecp_nistz256_mul_mont(p2, res, in); /* 3*p */
+ ecp_nistz256_mul_mont(p2, res, in); /* 3*p */
ecp_nistz256_sqr_mont(res, p2);
ecp_nistz256_sqr_mont(res, res);
- ecp_nistz256_mul_mont(p4, res, p2); /* f*p */
+ ecp_nistz256_mul_mont(p4, res, p2); /* f*p */
ecp_nistz256_sqr_mont(res, p4);
ecp_nistz256_sqr_mont(res, res);
ecp_nistz256_sqr_mont(res, res);
ecp_nistz256_sqr_mont(res, res);
- ecp_nistz256_mul_mont(p8, res, p4); /* ff*p */
+ ecp_nistz256_mul_mont(p8, res, p4); /* ff*p */
ecp_nistz256_sqr_mont(res, p8);
for (i = 0; i < 7; i++)
ecp_nistz256_sqr_mont(res, res);
- ecp_nistz256_mul_mont(p16, res, p8); /* ffff*p */
+ ecp_nistz256_mul_mont(p16, res, p8); /* ffff*p */
ecp_nistz256_sqr_mont(res, p16);
for (i = 0; i < 15; i++)
ecp_nistz256_sqr_mont(res, res);
- ecp_nistz256_mul_mont(p32, res, p16); /* ffffffff*p */
+ ecp_nistz256_mul_mont(p32, res, p16); /* ffffffff*p */
ecp_nistz256_sqr_mont(res, p32);
for (i = 0; i < 31; i++)
@@ -597,17 +595,17 @@ static void ecp_nistz256_mod_inverse(BN_ULONG r[P256_LIMBS],
* returns one if it fits. Otherwise it returns zero.
*/
__owur static int ecp_nistz256_bignum_to_field_elem(BN_ULONG out[P256_LIMBS],
- const BIGNUM *in)
+ const BIGNUM *in)
{
return bn_copy_words(out, in, P256_LIMBS);
}
/* r = sum(scalar[i]*point[i]) */
__owur static int ecp_nistz256_windowed_mul(const EC_GROUP *group,
- P256_POINT *r,
- const BIGNUM **scalar,
- const EC_POINT **point,
- size_t num, BN_CTX *ctx)
+ P256_POINT *r,
+ const BIGNUM **scalar,
+ const EC_POINT **point,
+ size_t num, BN_CTX *ctx)
{
size_t i;
int j, ret = 0;
@@ -616,15 +614,16 @@ __owur static int ecp_nistz256_windowed_mul(const EC_GROUP *group,
const unsigned int window_size = 5;
const unsigned int mask = (1 << (window_size + 1)) - 1;
unsigned int wvalue;
- P256_POINT *temp; /* place for 5 temporary points */
+ P256_POINT *temp; /* place for 5 temporary points */
const BIGNUM **scalars = NULL;
- P256_POINT (*table)[16] = NULL;
+ P256_POINT(*table)
+ [16] = NULL;
void *table_storage = NULL;
if ((num * 16 + 6) > OPENSSL_MALLOC_MAX_NELEMS(P256_POINT)
- || (table =
- OPENSSL_aligned_alloc_array(num * 16 + 5, sizeof(P256_POINT), 64,
- &table_storage)) == NULL
+ || (table = OPENSSL_aligned_alloc_array(num * 16 + 5, sizeof(P256_POINT), 64,
+ &table_storage))
+ == NULL
|| (p_str = OPENSSL_malloc_array(num, 33)) == NULL
|| (scalars = OPENSSL_malloc_array(num, sizeof(BIGNUM *))) == NULL)
goto err;
@@ -679,37 +678,37 @@ __owur static int ecp_nistz256_windowed_mul(const EC_GROUP *group,
* of -1 in table.
*/
- ecp_nistz256_scatter_w5 (row, &temp[0], 1);
- ecp_nistz256_point_double(&temp[1], &temp[0]); /*1+1=2 */
- ecp_nistz256_scatter_w5 (row, &temp[1], 2);
- ecp_nistz256_point_add (&temp[2], &temp[1], &temp[0]); /*2+1=3 */
- ecp_nistz256_scatter_w5 (row, &temp[2], 3);
- ecp_nistz256_point_double(&temp[1], &temp[1]); /*2*2=4 */
- ecp_nistz256_scatter_w5 (row, &temp[1], 4);
- ecp_nistz256_point_double(&temp[2], &temp[2]); /*2*3=6 */
- ecp_nistz256_scatter_w5 (row, &temp[2], 6);
- ecp_nistz256_point_add (&temp[3], &temp[1], &temp[0]); /*4+1=5 */
- ecp_nistz256_scatter_w5 (row, &temp[3], 5);
- ecp_nistz256_point_add (&temp[4], &temp[2], &temp[0]); /*6+1=7 */
- ecp_nistz256_scatter_w5 (row, &temp[4], 7);
- ecp_nistz256_point_double(&temp[1], &temp[1]); /*2*4=8 */
- ecp_nistz256_scatter_w5 (row, &temp[1], 8);
- ecp_nistz256_point_double(&temp[2], &temp[2]); /*2*6=12 */
- ecp_nistz256_scatter_w5 (row, &temp[2], 12);
- ecp_nistz256_point_double(&temp[3], &temp[3]); /*2*5=10 */
- ecp_nistz256_scatter_w5 (row, &temp[3], 10);
- ecp_nistz256_point_double(&temp[4], &temp[4]); /*2*7=14 */
- ecp_nistz256_scatter_w5 (row, &temp[4], 14);
- ecp_nistz256_point_add (&temp[2], &temp[2], &temp[0]); /*12+1=13*/
- ecp_nistz256_scatter_w5 (row, &temp[2], 13);
- ecp_nistz256_point_add (&temp[3], &temp[3], &temp[0]); /*10+1=11*/
- ecp_nistz256_scatter_w5 (row, &temp[3], 11);
- ecp_nistz256_point_add (&temp[4], &temp[4], &temp[0]); /*14+1=15*/
- ecp_nistz256_scatter_w5 (row, &temp[4], 15);
- ecp_nistz256_point_add (&temp[2], &temp[1], &temp[0]); /*8+1=9 */
- ecp_nistz256_scatter_w5 (row, &temp[2], 9);
- ecp_nistz256_point_double(&temp[1], &temp[1]); /*2*8=16 */
- ecp_nistz256_scatter_w5 (row, &temp[1], 16);
+ ecp_nistz256_scatter_w5(row, &temp[0], 1);
+ ecp_nistz256_point_double(&temp[1], &temp[0]); /*1+1=2 */
+ ecp_nistz256_scatter_w5(row, &temp[1], 2);
+ ecp_nistz256_point_add(&temp[2], &temp[1], &temp[0]); /*2+1=3 */
+ ecp_nistz256_scatter_w5(row, &temp[2], 3);
+ ecp_nistz256_point_double(&temp[1], &temp[1]); /*2*2=4 */
+ ecp_nistz256_scatter_w5(row, &temp[1], 4);
+ ecp_nistz256_point_double(&temp[2], &temp[2]); /*2*3=6 */
+ ecp_nistz256_scatter_w5(row, &temp[2], 6);
+ ecp_nistz256_point_add(&temp[3], &temp[1], &temp[0]); /*4+1=5 */
+ ecp_nistz256_scatter_w5(row, &temp[3], 5);
+ ecp_nistz256_point_add(&temp[4], &temp[2], &temp[0]); /*6+1=7 */
+ ecp_nistz256_scatter_w5(row, &temp[4], 7);
+ ecp_nistz256_point_double(&temp[1], &temp[1]); /*2*4=8 */
+ ecp_nistz256_scatter_w5(row, &temp[1], 8);
+ ecp_nistz256_point_double(&temp[2], &temp[2]); /*2*6=12 */
+ ecp_nistz256_scatter_w5(row, &temp[2], 12);
+ ecp_nistz256_point_double(&temp[3], &temp[3]); /*2*5=10 */
+ ecp_nistz256_scatter_w5(row, &temp[3], 10);
+ ecp_nistz256_point_double(&temp[4], &temp[4]); /*2*7=14 */
+ ecp_nistz256_scatter_w5(row, &temp[4], 14);
+ ecp_nistz256_point_add(&temp[2], &temp[2], &temp[0]); /*12+1=13*/
+ ecp_nistz256_scatter_w5(row, &temp[2], 13);
+ ecp_nistz256_point_add(&temp[3], &temp[3], &temp[0]); /*10+1=11*/
+ ecp_nistz256_scatter_w5(row, &temp[3], 11);
+ ecp_nistz256_point_add(&temp[4], &temp[4], &temp[0]); /*14+1=15*/
+ ecp_nistz256_scatter_w5(row, &temp[4], 15);
+ ecp_nistz256_point_add(&temp[2], &temp[1], &temp[0]); /*8+1=9 */
+ ecp_nistz256_scatter_w5(row, &temp[2], 9);
+ ecp_nistz256_point_double(&temp[1], &temp[1]); /*2*8=16 */
+ ecp_nistz256_scatter_w5(row, &temp[1], 16);
}
idx = 255;
@@ -766,7 +765,7 @@ __owur static int ecp_nistz256_windowed_mul(const EC_GROUP *group,
}
ret = 1;
- err:
+err:
OPENSSL_free(table_storage);
OPENSSL_free(p_str);
OPENSSL_free(scalars);
@@ -790,11 +789,7 @@ static const BN_ULONG def_yG[P256_LIMBS] = {
*/
static int ecp_nistz256_is_affine_G(const EC_POINT *generator)
{
- return (bn_get_top(generator->X) == P256_LIMBS) &&
- (bn_get_top(generator->Y) == P256_LIMBS) &&
- is_equal(bn_get_words(generator->X), def_xG) &&
- is_equal(bn_get_words(generator->Y), def_yG) &&
- is_one(generator->Z);
+ return (bn_get_top(generator->X) == P256_LIMBS) && (bn_get_top(generator->Y) == P256_LIMBS) && is_equal(bn_get_words(generator->X), def_xG) && is_equal(bn_get_words(generator->Y), def_yG) && is_one(generator->Z);
}
__owur static int ecp_nistz256_mult_precompute(EC_GROUP *group, BN_CTX *ctx)
@@ -854,9 +849,9 @@ __owur static int ecp_nistz256_mult_precompute(EC_GROUP *group, BN_CTX *ctx)
w = 7;
- if ((preComputedTable =
- OPENSSL_aligned_alloc_array(37 * 64, sizeof(P256_POINT_AFFINE), 64,
- &precomp_storage)) == NULL)
+ if ((preComputedTable = OPENSSL_aligned_alloc_array(37 * 64, sizeof(P256_POINT_AFFINE), 64,
+ &precomp_storage))
+ == NULL)
goto err;
P = EC_POINT_new(group);
@@ -883,8 +878,7 @@ __owur static int ecp_nistz256_mult_precompute(EC_GROUP *group, BN_CTX *ctx)
if (group->meth->make_affine == NULL
|| !group->meth->make_affine(group, P, ctx))
goto err;
- if (!ecp_nistz256_bignum_to_field_elem(temp.X, P->X) ||
- !ecp_nistz256_bignum_to_field_elem(temp.Y, P->Y)) {
+ if (!ecp_nistz256_bignum_to_field_elem(temp.X, P->X) || !ecp_nistz256_bignum_to_field_elem(temp.Y, P->Y)) {
ERR_raise(ERR_LIB_EC, EC_R_COORDINATES_OUT_OF_RANGE);
goto err;
}
@@ -907,7 +901,7 @@ __owur static int ecp_nistz256_mult_precompute(EC_GROUP *group, BN_CTX *ctx)
pre_comp = NULL;
ret = 1;
- err:
+err:
BN_CTX_end(ctx);
BN_CTX_free(new_ctx);
@@ -919,8 +913,8 @@ __owur static int ecp_nistz256_mult_precompute(EC_GROUP *group, BN_CTX *ctx)
}
__owur static int ecp_nistz256_set_from_affine(EC_POINT *out, const EC_GROUP *group,
- const P256_POINT_AFFINE *in,
- BN_CTX *ctx)
+ const P256_POINT_AFFINE *in,
+ BN_CTX *ctx)
{
int ret = 0;
@@ -934,11 +928,11 @@ __owur static int ecp_nistz256_set_from_affine(EC_POINT *out, const EC_GROUP *gr
/* r = scalar*G + sum(scalars[i]*points[i]) */
__owur static int ecp_nistz256_points_mul(const EC_GROUP *group,
- EC_POINT *r,
- const BIGNUM *scalar,
- size_t num,
- const EC_POINT *points[],
- const BIGNUM *scalars[], BN_CTX *ctx)
+ EC_POINT *r,
+ const BIGNUM *scalar,
+ size_t num,
+ const EC_POINT *points[],
+ const BIGNUM *scalars[], BN_CTX *ctx)
{
int i = 0, ret = 0, no_precomp_for_generator = 0, p_is_infinity = 0;
unsigned char p_str[33] = { 0 };
@@ -986,7 +980,7 @@ __owur static int ecp_nistz256_points_mul(const EC_GROUP *group,
ecp_nistz256_gather_w7(&p.a, pre_comp->precomp[0], 1);
if (!ecp_nistz256_set_from_affine(pre_comp_generator,
- group, &p.a, ctx)) {
+ group, &p.a, ctx)) {
EC_POINT_free(pre_comp_generator);
goto err;
}
@@ -1048,7 +1042,7 @@ __owur static int ecp_nistz256_points_mul(const EC_GROUP *group,
wvalue = _booth_recode_w7(wvalue);
ecp_nistz256_gather_w7(&p.a, preComputedTable[0],
- wvalue >> 1);
+ wvalue >> 1);
ecp_nistz256_neg(p.p.Z, p.p.Y);
copy_conditional(p.p.Y, p.p.Z, wvalue & 1);
@@ -1058,11 +1052,9 @@ __owur static int ecp_nistz256_points_mul(const EC_GROUP *group,
* Jacobian is (,,0), we need to harmonize them
* by assigning "one" or zero to Z.
*/
- infty = (p.p.X[0] | p.p.X[1] | p.p.X[2] | p.p.X[3] |
- p.p.Y[0] | p.p.Y[1] | p.p.Y[2] | p.p.Y[3]);
+ infty = (p.p.X[0] | p.p.X[1] | p.p.X[2] | p.p.X[3] | p.p.Y[0] | p.p.Y[1] | p.p.Y[2] | p.p.Y[3]);
if (P256_LIMBS == 8)
- infty |= (p.p.X[4] | p.p.X[5] | p.p.X[6] | p.p.X[7] |
- p.p.Y[4] | p.p.Y[5] | p.p.Y[6] | p.p.Y[7]);
+ infty |= (p.p.X[4] | p.p.X[5] | p.p.X[6] | p.p.X[7] | p.p.Y[4] | p.p.Y[5] | p.p.Y[6] | p.p.Y[7]);
infty = 0 - is_zero(infty);
infty = ~infty;
@@ -1087,7 +1079,7 @@ __owur static int ecp_nistz256_points_mul(const EC_GROUP *group,
wvalue = _booth_recode_w7(wvalue);
ecp_nistz256_gather_w7(&t.a,
- preComputedTable[i], wvalue >> 1);
+ preComputedTable[i], wvalue >> 1);
ecp_nistz256_neg(t.p.Z, t.a.Y);
copy_conditional(t.a.Y, t.p.Z, wvalue & 1);
@@ -1137,9 +1129,7 @@ __owur static int ecp_nistz256_points_mul(const EC_GROUP *group,
}
/* Not constant-time, but we're only operating on the public output. */
- if (!bn_set_words(r->X, p.p.X, P256_LIMBS) ||
- !bn_set_words(r->Y, p.p.Y, P256_LIMBS) ||
- !bn_set_words(r->Z, p.p.Z, P256_LIMBS)) {
+ if (!bn_set_words(r->X, p.p.X, P256_LIMBS) || !bn_set_words(r->Y, p.p.Y, P256_LIMBS) || !bn_set_words(r->Z, p.p.Z, P256_LIMBS)) {
goto err;
}
r->Z_is_one = is_one(r->Z) & 1;
@@ -1154,8 +1144,8 @@ err:
}
__owur static int ecp_nistz256_get_affine(const EC_GROUP *group,
- const EC_POINT *point,
- BIGNUM *x, BIGNUM *y, BN_CTX *ctx)
+ const EC_POINT *point,
+ BIGNUM *x, BIGNUM *y, BN_CTX *ctx)
{
BN_ULONG z_inv2[P256_LIMBS];
BN_ULONG z_inv3[P256_LIMBS];
@@ -1169,9 +1159,7 @@ __owur static int ecp_nistz256_get_affine(const EC_GROUP *group,
return 0;
}
- if (!ecp_nistz256_bignum_to_field_elem(point_x, point->X) ||
- !ecp_nistz256_bignum_to_field_elem(point_y, point->Y) ||
- !ecp_nistz256_bignum_to_field_elem(point_z, point->Z)) {
+ if (!ecp_nistz256_bignum_to_field_elem(point_x, point->X) || !ecp_nistz256_bignum_to_field_elem(point_y, point->Y) || !ecp_nistz256_bignum_to_field_elem(point_z, point->Z)) {
ERR_raise(ERR_LIB_EC, EC_R_COORDINATES_OUT_OF_RANGE);
return 0;
}
@@ -1210,7 +1198,7 @@ static NISTZ256_PRE_COMP *ecp_nistz256_pre_comp_new(const EC_GROUP *group)
return ret;
ret->group = group;
- ret->w = 6; /* default */
+ ret->w = 6; /* default */
if (!CRYPTO_NEW_REF(&ret->references, 1)) {
OPENSSL_free(ret);
@@ -1245,7 +1233,6 @@ void EC_nistz256_pre_comp_free(NISTZ256_PRE_COMP *pre)
OPENSSL_free(pre);
}
-
static int ecp_nistz256_window_have_precompute_mult(const EC_GROUP *group)
{
/* There is a hard-coded table for the default generator. */
@@ -1259,31 +1246,28 @@ static int ecp_nistz256_window_have_precompute_mult(const EC_GROUP *group)
return HAVEPRECOMP(group, nistz256);
}
-#if defined(__x86_64) || defined(__x86_64__) || \
- defined(_M_AMD64) || defined(_M_X64) || \
- defined(__powerpc64__) || defined(_ARCH_PP64) || \
- defined(__aarch64__)
+#if defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64) || defined(__powerpc64__) || defined(_ARCH_PP64) || defined(__aarch64__)
/*
* Montgomery mul modulo Order(P): res = a*b*2^-256 mod Order(P)
*/
void ecp_nistz256_ord_mul_mont(BN_ULONG res[P256_LIMBS],
- const BN_ULONG a[P256_LIMBS],
- const BN_ULONG b[P256_LIMBS]);
+ const BN_ULONG a[P256_LIMBS],
+ const BN_ULONG b[P256_LIMBS]);
void ecp_nistz256_ord_sqr_mont(BN_ULONG res[P256_LIMBS],
- const BN_ULONG a[P256_LIMBS],
- BN_ULONG rep);
+ const BN_ULONG a[P256_LIMBS],
+ BN_ULONG rep);
static int ecp_nistz256_inv_mod_ord(const EC_GROUP *group, BIGNUM *r,
- const BIGNUM *x, BN_CTX *ctx)
+ const BIGNUM *x, BN_CTX *ctx)
{
/* RR = 2^512 mod ord(p256) */
- static const BN_ULONG RR[P256_LIMBS] = {
- TOBN(0x83244c95,0xbe79eea2), TOBN(0x4699799c,0x49bd6fa6),
- TOBN(0x2845b239,0x2b6bec59), TOBN(0x66e12d94,0xf3d95620)
+ static const BN_ULONG RR[P256_LIMBS] = {
+ TOBN(0x83244c95, 0xbe79eea2), TOBN(0x4699799c, 0x49bd6fa6),
+ TOBN(0x2845b239, 0x2b6bec59), TOBN(0x66e12d94, 0xf3d95620)
};
/* The constant 1 (unlike ONE that is one in Montgomery representation) */
static const BN_ULONG one[P256_LIMBS] = {
- TOBN(0,1), TOBN(0,0), TOBN(0,0), TOBN(0,0)
+ TOBN(0, 1), TOBN(0, 0), TOBN(0, 0), TOBN(0, 0)
};
/*
* We don't use entry 0 in the table, so we omit it and address
@@ -1293,8 +1277,20 @@ static int ecp_nistz256_inv_mod_ord(const EC_GROUP *group, BIGNUM *r,
BN_ULONG out[P256_LIMBS], t[P256_LIMBS];
int i, ret = 0;
enum {
- i_1 = 0, i_10, i_11, i_101, i_111, i_1010, i_1111,
- i_10101, i_101010, i_101111, i_x6, i_x8, i_x16, i_x32
+ i_1 = 0,
+ i_10,
+ i_11,
+ i_101,
+ i_111,
+ i_1010,
+ i_1111,
+ i_10101,
+ i_101010,
+ i_101111,
+ i_x6,
+ i_x8,
+ i_x16,
+ i_x32
};
/*
@@ -1410,16 +1406,18 @@ static int ecp_nistz256_inv_mod_ord(const EC_GROUP *group, BIGNUM *r,
ecp_nistz256_ord_mul_mont(out, out, table[i_x32]);
for (i = 0; i < 27; i++) {
- static const struct { unsigned char p, i; } chain[27] = {
- { 32, i_x32 }, { 6, i_101111 }, { 5, i_111 },
- { 4, i_11 }, { 5, i_1111 }, { 5, i_10101 },
- { 4, i_101 }, { 3, i_101 }, { 3, i_101 },
- { 5, i_111 }, { 9, i_101111 }, { 6, i_1111 },
- { 2, i_1 }, { 5, i_1 }, { 6, i_1111 },
- { 5, i_111 }, { 4, i_111 }, { 5, i_111 },
- { 5, i_101 }, { 3, i_11 }, { 10, i_101111 },
- { 2, i_11 }, { 5, i_11 }, { 5, i_11 },
- { 3, i_1 }, { 7, i_10101 }, { 6, i_1111 }
+ static const struct {
+ unsigned char p, i;
+ } chain[27] = {
+ { 32, i_x32 }, { 6, i_101111 }, { 5, i_111 },
+ { 4, i_11 }, { 5, i_1111 }, { 5, i_10101 },
+ { 4, i_101 }, { 3, i_101 }, { 3, i_101 },
+ { 5, i_111 }, { 9, i_101111 }, { 6, i_1111 },
+ { 2, i_1 }, { 5, i_1 }, { 6, i_1111 },
+ { 5, i_111 }, { 4, i_111 }, { 5, i_111 },
+ { 5, i_101 }, { 3, i_11 }, { 10, i_101111 },
+ { 2, i_11 }, { 5, i_11 }, { 5, i_11 },
+ { 3, i_1 }, { 7, i_10101 }, { 6, i_1111 }
};
ecp_nistz256_ord_sqr_mont(out, out, chain[i].p);
@@ -1439,11 +1437,12 @@ err:
return ret;
}
#else
-# define ecp_nistz256_inv_mod_ord NULL
+#define ecp_nistz256_inv_mod_ord NULL
#endif
static int ecp_nistz256group_full_init(EC_GROUP *group,
- const unsigned char *params) {
+ const unsigned char *params)
+{
BN_CTX *ctx = NULL;
BN_MONT_CTX *mont = NULL, *ordmont = NULL;
const int param_len = 32;
@@ -1452,7 +1451,7 @@ static int ecp_nistz256group_full_init(EC_GROUP *group,
uint32_t hi_order_n = 0xccd1c8aa;
uint32_t lo_order_n = 0xee00bc4f;
BIGNUM *p = NULL, *a = NULL, *b = NULL, *x = NULL, *y = NULL, *one = NULL,
- *order = NULL;
+ *order = NULL;
EC_POINT *P = NULL;
if ((ctx = BN_CTX_new_ex(group->libctx)) == NULL) {
@@ -1482,7 +1481,7 @@ static int ecp_nistz256group_full_init(EC_GROUP *group,
goto err;
if (!ossl_bn_mont_ctx_set(mont, p, 256, params + 6 * param_len, param_len,
- 1, 0))
+ 1, 0))
goto err;
one = BN_new();
@@ -1490,7 +1489,7 @@ static int ecp_nistz256group_full_init(EC_GROUP *group,
ERR_raise(ERR_LIB_EC, ERR_R_BN_LIB);
goto err;
}
- if (!BN_to_montgomery(one, BN_value_one(), mont, ctx)){
+ if (!BN_to_montgomery(one, BN_value_one(), mont, ctx)) {
ERR_raise(ERR_LIB_EC, ERR_R_BN_LIB);
goto err;
}
@@ -1500,7 +1499,7 @@ static int ecp_nistz256group_full_init(EC_GROUP *group,
one = NULL;
if (!ossl_ec_GFp_simple_group_set_curve(group, p, a, b, ctx)) {
- ERR_raise(ERR_LIB_EC, ERR_R_EC_LIB);
+ ERR_raise(ERR_LIB_EC, ERR_R_EC_LIB);
goto err;
}
@@ -1528,7 +1527,7 @@ static int ecp_nistz256group_full_init(EC_GROUP *group,
* Set up generator and order and montgomery data
*/
group->generator = EC_POINT_new(group);
- if (group->generator == NULL){
+ if (group->generator == NULL) {
ERR_raise(ERR_LIB_EC, ERR_R_EC_LIB);
goto err;
}
@@ -1540,10 +1539,10 @@ static int ecp_nistz256group_full_init(EC_GROUP *group,
goto err;
ordmont = BN_MONT_CTX_new();
- if (ordmont == NULL)
+ if (ordmont == NULL)
goto err;
if (!ossl_bn_mont_ctx_set(ordmont, order, 256, params + 7 * param_len,
- param_len, lo_order_n, hi_order_n))
+ param_len, lo_order_n, hi_order_n))
goto err;
group->mont_data = ordmont;
@@ -1551,7 +1550,7 @@ static int ecp_nistz256group_full_init(EC_GROUP *group,
ok = 1;
- err:
+err:
EC_POINT_free(P);
BN_CTX_free(ctx);
BN_MONT_CTX_free(mont);
@@ -1597,12 +1596,12 @@ const EC_METHOD *EC_GFp_nistz256_method(void)
ossl_ec_GFp_simple_cmp,
ossl_ec_GFp_simple_make_affine,
ossl_ec_GFp_simple_points_make_affine,
- ecp_nistz256_points_mul, /* mul */
- ecp_nistz256_mult_precompute, /* precompute_mult */
- ecp_nistz256_window_have_precompute_mult, /* have_precompute_mult */
+ ecp_nistz256_points_mul, /* mul */
+ ecp_nistz256_mult_precompute, /* precompute_mult */
+ ecp_nistz256_window_have_precompute_mult, /* have_precompute_mult */
ossl_ec_GFp_mont_field_mul,
ossl_ec_GFp_mont_field_sqr,
- 0, /* field_div */
+ 0, /* field_div */
ossl_ec_GFp_mont_field_inv,
ossl_ec_GFp_mont_field_encode,
ossl_ec_GFp_mont_field_decode,
@@ -1619,11 +1618,11 @@ const EC_METHOD *EC_GFp_nistz256_method(void)
ossl_ecdsa_simple_sign_setup,
ossl_ecdsa_simple_sign_sig,
ossl_ecdsa_simple_verify_sig,
- ecp_nistz256_inv_mod_ord, /* can be #define-d NULL */
- 0, /* blind_coordinates */
- 0, /* ladder_pre */
- 0, /* ladder_step */
- 0, /* ladder_post */
+ ecp_nistz256_inv_mod_ord, /* can be #define-d NULL */
+ 0, /* blind_coordinates */
+ 0, /* ladder_pre */
+ 0, /* ladder_step */
+ 0, /* ladder_post */
ecp_nistz256group_full_init
};
diff --git a/crypto/ec/ecp_nistz256_table.c b/crypto/ec/ecp_nistz256_table.c
index 71430d4b81..2c2ee3aca5 100644
--- a/crypto/ec/ecp_nistz256_table.c
+++ b/crypto/ec/ecp_nistz256_table.c
@@ -26,9517 +26,14898 @@ __attribute((aligned(4096)))
#elif defined(_MSC_VER)
__declspec(align(4096))
#elif defined(__SUNPRO_C)
-# pragma align 4096(ecp_nistz256_precomputed)
+#pragma align 4096(ecp_nistz256_precomputed)
#endif
-static const BN_ULONG ecp_nistz256_precomputed[37][64 *
- sizeof(P256_POINT_AFFINE) /
- sizeof(BN_ULONG)] = {
- {TOBN(0x79e730d4, 0x18a9143c), TOBN(0x75ba95fc, 0x5fedb601),
- TOBN(0x79fb732b, 0x77622510), TOBN(0x18905f76, 0xa53755c6),
- TOBN(0xddf25357, 0xce95560a), TOBN(0x8b4ab8e4, 0xba19e45c),
- TOBN(0xd2e88688, 0xdd21f325), TOBN(0x8571ff18, 0x25885d85),
- TOBN(0x850046d4, 0x10ddd64d), TOBN(0xaa6ae3c1, 0xa433827d),
- TOBN(0x73220503, 0x8d1490d9), TOBN(0xf6bb32e4, 0x3dcf3a3b),
- TOBN(0x2f3648d3, 0x61bee1a5), TOBN(0x152cd7cb, 0xeb236ff8),
- TOBN(0x19a8fb0e, 0x92042dbe), TOBN(0x78c57751, 0x0a5b8a3b),
- TOBN(0xffac3f90, 0x4eebc127), TOBN(0xb027f84a, 0x087d81fb),
- TOBN(0x66ad77dd, 0x87cbbc98), TOBN(0x26936a3f, 0xb6ff747e),
- TOBN(0xb04c5c1f, 0xc983a7eb), TOBN(0x583e47ad, 0x0861fe1a),
- TOBN(0x78820831, 0x1a2ee98e), TOBN(0xd5f06a29, 0xe587cc07),
- TOBN(0x74b0b50d, 0x46918dcc), TOBN(0x4650a6ed, 0xc623c173),
- TOBN(0x0cdaacac, 0xe8100af2), TOBN(0x577362f5, 0x41b0176b),
- TOBN(0x2d96f24c, 0xe4cbaba6), TOBN(0x17628471, 0xfad6f447),
- TOBN(0x6b6c36de, 0xe5ddd22e), TOBN(0x84b14c39, 0x4c5ab863),
- TOBN(0xbe1b8aae, 0xc45c61f5), TOBN(0x90ec649a, 0x94b9537d),
- TOBN(0x941cb5aa, 0xd076c20c), TOBN(0xc9079605, 0x890523c8),
- TOBN(0xeb309b4a, 0xe7ba4f10), TOBN(0x73c568ef, 0xe5eb882b),
- TOBN(0x3540a987, 0x7e7a1f68), TOBN(0x73a076bb, 0x2dd1e916),
- TOBN(0x40394737, 0x3e77664a), TOBN(0x55ae744f, 0x346cee3e),
- TOBN(0xd50a961a, 0x5b17a3ad), TOBN(0x13074b59, 0x54213673),
- TOBN(0x93d36220, 0xd377e44b), TOBN(0x299c2b53, 0xadff14b5),
- TOBN(0xf424d44c, 0xef639f11), TOBN(0xa4c9916d, 0x4a07f75f),
- TOBN(0x0746354e, 0xa0173b4f), TOBN(0x2bd20213, 0xd23c00f7),
- TOBN(0xf43eaab5, 0x0c23bb08), TOBN(0x13ba5119, 0xc3123e03),
- TOBN(0x2847d030, 0x3f5b9d4d), TOBN(0x6742f2f2, 0x5da67bdd),
- TOBN(0xef933bdc, 0x77c94195), TOBN(0xeaedd915, 0x6e240867),
- TOBN(0x27f14cd1, 0x9499a78f), TOBN(0x462ab5c5, 0x6f9b3455),
- TOBN(0x8f90f02a, 0xf02cfc6b), TOBN(0xb763891e, 0xb265230d),
- TOBN(0xf59da3a9, 0x532d4977), TOBN(0x21e3327d, 0xcf9eba15),
- TOBN(0x123c7b84, 0xbe60bbf0), TOBN(0x56ec12f2, 0x7706df76),
- TOBN(0x75c96e8f, 0x264e20e8), TOBN(0xabe6bfed, 0x59a7a841),
- TOBN(0x2cc09c04, 0x44c8eb00), TOBN(0xe05b3080, 0xf0c4e16b),
- TOBN(0x1eb7777a, 0xa45f3314), TOBN(0x56af7bed, 0xce5d45e3),
- TOBN(0x2b6e019a, 0x88b12f1a), TOBN(0x086659cd, 0xfd835f9b),
- TOBN(0x2c18dbd1, 0x9dc21ec8), TOBN(0x98f9868a, 0x0fcf8139),
- TOBN(0x737d2cd6, 0x48250b49), TOBN(0xcc61c947, 0x24b3428f),
- TOBN(0x0c2b4078, 0x80dd9e76), TOBN(0xc43a8991, 0x383fbe08),
- TOBN(0x5f7d2d65, 0x779be5d2), TOBN(0x78719a54, 0xeb3b4ab5),
- TOBN(0xea7d260a, 0x6245e404), TOBN(0x9de40795, 0x6e7fdfe0),
- TOBN(0x1ff3a415, 0x8dac1ab5), TOBN(0x3e7090f1, 0x649c9073),
- TOBN(0x1a768561, 0x2b944e88), TOBN(0x250f939e, 0xe57f61c8),
- TOBN(0x0c0daa89, 0x1ead643d), TOBN(0x68930023, 0xe125b88e),
- TOBN(0x04b71aa7, 0xd2697768), TOBN(0xabdedef5, 0xca345a33),
- TOBN(0x2409d29d, 0xee37385e), TOBN(0x4ee1df77, 0xcb83e156),
- TOBN(0x0cac12d9, 0x1cbb5b43), TOBN(0x170ed2f6, 0xca895637),
- TOBN(0x28228cfa, 0x8ade6d66), TOBN(0x7ff57c95, 0x53238aca),
- TOBN(0xccc42563, 0x4b2ed709), TOBN(0x0e356769, 0x856fd30d),
- TOBN(0xbcbcd43f, 0x559e9811), TOBN(0x738477ac, 0x5395b759),
- TOBN(0x35752b90, 0xc00ee17f), TOBN(0x68748390, 0x742ed2e3),
- TOBN(0x7cd06422, 0xbd1f5bc1), TOBN(0xfbc08769, 0xc9e7b797),
- TOBN(0xa242a35b, 0xb0cf664a), TOBN(0x126e48f7, 0x7f9707e3),
- TOBN(0x1717bf54, 0xc6832660), TOBN(0xfaae7332, 0xfd12c72e),
- TOBN(0x27b52db7, 0x995d586b), TOBN(0xbe29569e, 0x832237c2),
- TOBN(0xe8e4193e, 0x2a65e7db), TOBN(0x152706dc, 0x2eaa1bbb),
- TOBN(0x72bcd8b7, 0xbc60055b), TOBN(0x03cc23ee, 0x56e27e4b),
- TOBN(0xee337424, 0xe4819370), TOBN(0xe2aa0e43, 0x0ad3da09),
- TOBN(0x40b8524f, 0x6383c45d), TOBN(0xd7663554, 0x42a41b25),
- TOBN(0x64efa6de, 0x778a4797), TOBN(0x2042170a, 0x7079adf4),
- TOBN(0x808b0b65, 0x0bc6fb80), TOBN(0x5882e075, 0x3ffe2e6b),
- TOBN(0xd5ef2f7c, 0x2c83f549), TOBN(0x54d63c80, 0x9103b723),
- TOBN(0xf2f11bd6, 0x52a23f9b), TOBN(0x3670c319, 0x4b0b6587),
- TOBN(0x55c4623b, 0xb1580e9e), TOBN(0x64edf7b2, 0x01efe220),
- TOBN(0x97091dcb, 0xd53c5c9d), TOBN(0xf17624b6, 0xac0a177b),
- TOBN(0xb0f13975, 0x2cfe2dff), TOBN(0xc1a35c0a, 0x6c7a574e),
- TOBN(0x227d3146, 0x93e79987), TOBN(0x0575bf30, 0xe89cb80e),
- TOBN(0x2f4e247f, 0x0d1883bb), TOBN(0xebd51226, 0x3274c3d0),
- TOBN(0x5f3e51c8, 0x56ada97a), TOBN(0x4afc964d, 0x8f8b403e),
- TOBN(0xa6f247ab, 0x412e2979), TOBN(0x675abd1b, 0x6f80ebda),
- TOBN(0x66a2bd72, 0x5e485a1d), TOBN(0x4b2a5caf, 0x8f4f0b3c),
- TOBN(0x2626927f, 0x1b847bba), TOBN(0x6c6fc7d9, 0x0502394d),
- TOBN(0xfea912ba, 0xa5659ae8), TOBN(0x68363aba, 0x25e1a16e),
- TOBN(0xb8842277, 0x752c41ac), TOBN(0xfe545c28, 0x2897c3fc),
- TOBN(0x2d36e9e7, 0xdc4c696b), TOBN(0x5806244a, 0xfba977c5),
- TOBN(0x85665e9b, 0xe39508c1), TOBN(0xf720ee25, 0x6d12597b),
- TOBN(0x8a979129, 0xd2337a31), TOBN(0x5916868f, 0x0f862bdc),
- TOBN(0x048099d9, 0x5dd283ba), TOBN(0xe2d1eeb6, 0xfe5bfb4e),
- TOBN(0x82ef1c41, 0x7884005d), TOBN(0xa2d4ec17, 0xffffcbae),
- TOBN(0x9161c53f, 0x8aa95e66), TOBN(0x5ee104e1, 0xc5fee0d0),
- TOBN(0x562e4cec, 0xc135b208), TOBN(0x74e1b265, 0x4783f47d),
- TOBN(0x6d2a506c, 0x5a3f3b30), TOBN(0xecead9f4, 0xc16762fc),
- TOBN(0xf29dd4b2, 0xe286e5b9), TOBN(0x1b0fadc0, 0x83bb3c61),
- TOBN(0x7a75023e, 0x7fac29a4), TOBN(0xc086d5f1, 0xc9477fa3),
- TOBN(0x0fc61135, 0x2f6f3076), TOBN(0xc99ffa23, 0xe3912a9a),
- TOBN(0x6a0b0685, 0xd2f8ba3d), TOBN(0xfdc777e8, 0xe93358a4),
- TOBN(0x94a787bb, 0x35415f04), TOBN(0x640c2d6a, 0x4d23fea4),
- TOBN(0x9de917da, 0x153a35b5), TOBN(0x793e8d07, 0x5d5cd074),
- TOBN(0xf4f87653, 0x2de45068), TOBN(0x37c7a7e8, 0x9e2e1f6e),
- TOBN(0xd0825fa2, 0xa3584069), TOBN(0xaf2cea7c, 0x1727bf42),
- TOBN(0x0360a4fb, 0x9e4785a9), TOBN(0xe5fda49c, 0x27299f4a),
- TOBN(0x48068e13, 0x71ac2f71), TOBN(0x83d0687b, 0x9077666f),
- TOBN(0x6d3883b2, 0x15d02819), TOBN(0x6d0d7550, 0x40dd9a35),
- TOBN(0x61d7cbf9, 0x1d2b469f), TOBN(0xf97b232f, 0x2efc3115),
- TOBN(0xa551d750, 0xb24bcbc7), TOBN(0x11ea4949, 0x88a1e356),
- TOBN(0x7669f031, 0x93cb7501), TOBN(0x595dc55e, 0xca737b8a),
- TOBN(0xa4a319ac, 0xd837879f), TOBN(0x6fc1b49e, 0xed6b67b0),
- TOBN(0xe3959933, 0x32f1f3af), TOBN(0x966742eb, 0x65432a2e),
- TOBN(0x4b8dc9fe, 0xb4966228), TOBN(0x96cc6312, 0x43f43950),
- TOBN(0x12068859, 0xc9b731ee), TOBN(0x7b948dc3, 0x56f79968),
- TOBN(0x61e4ad32, 0xed1f8008), TOBN(0xe6c9267a, 0xd8b17538),
- TOBN(0x1ac7c5eb, 0x857ff6fb), TOBN(0x994baaa8, 0x55f2fb10),
- TOBN(0x84cf14e1, 0x1d248018), TOBN(0x5a39898b, 0x628ac508),
- TOBN(0x14fde97b, 0x5fa944f5), TOBN(0xed178030, 0xd12e5ac7),
- TOBN(0x042c2af4, 0x97e2feb4), TOBN(0xd36a42d7, 0xaebf7313),
- TOBN(0x49d2c9eb, 0x084ffdd7), TOBN(0x9f8aa54b, 0x2ef7c76a),
- TOBN(0x9200b7ba, 0x09895e70), TOBN(0x3bd0c66f, 0xddb7fb58),
- TOBN(0x2d97d108, 0x78eb4cbb), TOBN(0x2d431068, 0xd84bde31),
- TOBN(0x4b523eb7, 0x172ccd1f), TOBN(0x7323cb28, 0x30a6a892),
- TOBN(0x97082ec0, 0xcfe153eb), TOBN(0xe97f6b6a, 0xf2aadb97),
- TOBN(0x1d3d393e, 0xd1a83da1), TOBN(0xa6a7f9c7, 0x804b2a68),
- TOBN(0x4a688b48, 0x2d0cb71e), TOBN(0xa9b4cc5f, 0x40585278),
- TOBN(0x5e5db46a, 0xcb66e132), TOBN(0xf1be963a, 0x0d925880),
- TOBN(0x944a7027, 0x0317b9e2), TOBN(0xe266f959, 0x48603d48),
- TOBN(0x98db6673, 0x5c208899), TOBN(0x90472447, 0xa2fb18a3),
- TOBN(0x8a966939, 0x777c619f), TOBN(0x3798142a, 0x2a3be21b),
- TOBN(0xb4241cb1, 0x3298b343), TOBN(0xa3a14e49, 0xb44f65a1),
- TOBN(0xc5f4d6cd, 0x3ac77acd), TOBN(0xd0288cb5, 0x52b6fc3c),
- TOBN(0xd5cc8c2f, 0x1c040abc), TOBN(0xb675511e, 0x06bf9b4a),
- TOBN(0xd667da37, 0x9b3aa441), TOBN(0x460d45ce, 0x51601f72),
- TOBN(0xe2f73c69, 0x6755ff89), TOBN(0xdd3cf7e7, 0x473017e6),
- TOBN(0x8ef5689d, 0x3cf7600d), TOBN(0x948dc4f8, 0xb1fc87b4),
- TOBN(0xd9e9fe81, 0x4ea53299), TOBN(0x2d921ca2, 0x98eb6028),
- TOBN(0xfaecedfd, 0x0c9803fc), TOBN(0xf38ae891, 0x4d7b4745),
- TOBN(0xd8c5fccf, 0xc5e3a3d8), TOBN(0xbefd904c, 0x4079dfbf),
- TOBN(0xbc6d6a58, 0xfead0197), TOBN(0x39227077, 0x695532a4),
- TOBN(0x09e23e6d, 0xdbef42f5), TOBN(0x7e449b64, 0x480a9908),
- TOBN(0x7b969c1a, 0xad9a2e40), TOBN(0x6231d792, 0x9591c2a4),
- TOBN(0x87151456, 0x0f664534), TOBN(0x85ceae7c, 0x4b68f103),
- TOBN(0xac09c4ae, 0x65578ab9), TOBN(0x33ec6868, 0xf044b10c),
- TOBN(0x6ac4832b, 0x3a8ec1f1), TOBN(0x5509d128, 0x5847d5ef),
- TOBN(0xf909604f, 0x763f1574), TOBN(0xb16c4303, 0xc32f63c4),
- TOBN(0xb6ab2014, 0x7ca23cd3), TOBN(0xcaa7a5c6, 0xa391849d),
- TOBN(0x5b0673a3, 0x75678d94), TOBN(0xc982ddd4, 0xdd303e64),
- TOBN(0xfd7b000b, 0x5db6f971), TOBN(0xbba2cb1f, 0x6f876f92),
- TOBN(0xc77332a3, 0x3c569426), TOBN(0xa159100c, 0x570d74f8),
- TOBN(0xfd16847f, 0xdec67ef5), TOBN(0x742ee464, 0x233e76b7),
- TOBN(0x0b8e4134, 0xefc2b4c8), TOBN(0xca640b86, 0x42a3e521),
- TOBN(0x653a0190, 0x8ceb6aa9), TOBN(0x313c300c, 0x547852d5),
- TOBN(0x24e4ab12, 0x6b237af7), TOBN(0x2ba90162, 0x8bb47af8),
- TOBN(0x3d5e58d6, 0xa8219bb7), TOBN(0xc691d0bd, 0x1b06c57f),
- TOBN(0x0ae4cb10, 0xd257576e), TOBN(0x3569656c, 0xd54a3dc3),
- TOBN(0xe5ebaebd, 0x94cda03a), TOBN(0x934e82d3, 0x162bfe13),
- TOBN(0x450ac0ba, 0xe251a0c6), TOBN(0x480b9e11, 0xdd6da526),
- TOBN(0x00467bc5, 0x8cce08b5), TOBN(0xb636458c, 0x7f178d55),
- TOBN(0xc5748bae, 0xa677d806), TOBN(0x2763a387, 0xdfa394eb),
- TOBN(0xa12b448a, 0x7d3cebb6), TOBN(0xe7adda3e, 0x6f20d850),
- TOBN(0xf63ebce5, 0x1558462c), TOBN(0x58b36143, 0x620088a8),
- TOBN(0x8a2cc3ca, 0x4d63c0ee), TOBN(0x51233117, 0x0fe948ce),
- TOBN(0x7463fd85, 0x222ef33b), TOBN(0xadf0c7dc, 0x7c603d6c),
- TOBN(0x0ec32d3b, 0xfe7765e5), TOBN(0xccaab359, 0xbf380409),
- TOBN(0xbdaa84d6, 0x8e59319c), TOBN(0xd9a4c280, 0x9c80c34d),
- TOBN(0xa9d89488, 0xa059c142), TOBN(0x6f5ae714, 0xff0b9346),
- TOBN(0x068f237d, 0x16fb3664), TOBN(0x5853e4c4, 0x363186ac),
- TOBN(0xe2d87d23, 0x63c52f98), TOBN(0x2ec4a766, 0x81828876),
- TOBN(0x47b864fa, 0xe14e7b1c), TOBN(0x0c0bc0e5, 0x69192408),
- TOBN(0xe4d7681d, 0xb82e9f3e), TOBN(0x83200f0b, 0xdf25e13c),
- TOBN(0x8909984c, 0x66f27280), TOBN(0x462d7b00, 0x75f73227),
- TOBN(0xd90ba188, 0xf2651798), TOBN(0x74c6e18c, 0x36ab1c34),
- TOBN(0xab256ea3, 0x5ef54359), TOBN(0x03466612, 0xd1aa702f),
- TOBN(0x624d6049, 0x2ed22e91), TOBN(0x6fdfe0b5, 0x6f072822),
- TOBN(0xeeca1115, 0x39ce2271), TOBN(0x98100a4f, 0xdb01614f),
- TOBN(0xb6b0daa2, 0xa35c628f), TOBN(0xb6f94d2e, 0xc87e9a47),
- TOBN(0xc6773259, 0x1d57d9ce), TOBN(0xf70bfeec, 0x03884a7b),
- TOBN(0x5fb35ccf, 0xed2bad01), TOBN(0xa155cbe3, 0x1da6a5c7),
- TOBN(0xc2e2594c, 0x30a92f8f), TOBN(0x649c89ce, 0x5bfafe43),
- TOBN(0xd158667d, 0xe9ff257a), TOBN(0x9b359611, 0xf32c50ae),
- TOBN(0x4b00b20b, 0x906014cf), TOBN(0xf3a8cfe3, 0x89bc7d3d),
- TOBN(0x4ff23ffd, 0x248a7d06), TOBN(0x80c5bfb4, 0x878873fa),
- TOBN(0xb7d9ad90, 0x05745981), TOBN(0x179c85db, 0x3db01994),
- TOBN(0xba41b062, 0x61a6966c), TOBN(0x4d82d052, 0xeadce5a8),
- TOBN(0x9e91cd3b, 0xa5e6a318), TOBN(0x47795f4f, 0x95b2dda0),
- TOBN(0xecfd7c1f, 0xd55a897c), TOBN(0x009194ab, 0xb29110fb),
- TOBN(0x5f0e2046, 0xe381d3b0), TOBN(0x5f3425f6, 0xa98dd291),
- TOBN(0xbfa06687, 0x730d50da), TOBN(0x0423446c, 0x4b083b7f),
- TOBN(0x397a247d, 0xd69d3417), TOBN(0xeb629f90, 0x387ba42a),
- TOBN(0x1ee426cc, 0xd5cd79bf), TOBN(0x0032940b, 0x946c6e18),
- TOBN(0x1b1e8ae0, 0x57477f58), TOBN(0xe94f7d34, 0x6d823278),
- TOBN(0xc747cb96, 0x782ba21a), TOBN(0xc5254469, 0xf72b33a5),
- TOBN(0x772ef6de, 0xc7f80c81), TOBN(0xd73acbfe, 0x2cd9e6b5),
- TOBN(0x4075b5b1, 0x49ee90d9), TOBN(0x785c339a, 0xa06e9eba),
- TOBN(0xa1030d5b, 0xabf825e0), TOBN(0xcec684c3, 0xa42931dc),
- TOBN(0x42ab62c9, 0xc1586e63), TOBN(0x45431d66, 0x5ab43f2b),
- TOBN(0x57c8b2c0, 0x55f7835d), TOBN(0x033da338, 0xc1b7f865),
- TOBN(0x283c7513, 0xcaa76097), TOBN(0x0a624fa9, 0x36c83906),
- TOBN(0x6b20afec, 0x715af2c7), TOBN(0x4b969974, 0xeba78bfd),
- TOBN(0x220755cc, 0xd921d60e), TOBN(0x9b944e10, 0x7baeca13),
- TOBN(0x04819d51, 0x5ded93d4), TOBN(0x9bbff86e, 0x6dddfd27),
- TOBN(0x6b344130, 0x77adc612), TOBN(0xa7496529, 0xbbd803a0),
- TOBN(0x1a1baaa7, 0x6d8805bd), TOBN(0xc8403902, 0x470343ad),
- TOBN(0x39f59f66, 0x175adff1), TOBN(0x0b26d7fb, 0xb7d8c5b7),
- TOBN(0xa875f5ce, 0x529d75e3), TOBN(0x85efc7e9, 0x41325cc2),
- TOBN(0x21950b42, 0x1ff6acd3), TOBN(0xffe70484, 0x53dc6909),
- TOBN(0xff4cd0b2, 0x28766127), TOBN(0xabdbe608, 0x4fb7db2b),
- TOBN(0x837c9228, 0x5e1109e8), TOBN(0x26147d27, 0xf4645b5a),
- TOBN(0x4d78f592, 0xf7818ed8), TOBN(0xd394077e, 0xf247fa36),
- TOBN(0x0fb9c2d0, 0x488c171a), TOBN(0xa78bfbaa, 0x13685278),
- TOBN(0xedfbe268, 0xd5b1fa6a), TOBN(0x0dceb8db, 0x2b7eaba7),
- TOBN(0xbf9e8089, 0x9ae2b710), TOBN(0xefde7ae6, 0xa4449c96),
- TOBN(0x43b7716b, 0xcc143a46), TOBN(0xd7d34194, 0xc3628c13),
- TOBN(0x508cec1c, 0x3b3f64c9), TOBN(0xe20bc0ba, 0x1e5edf3f),
- TOBN(0xda1deb85, 0x2f4318d4), TOBN(0xd20ebe0d, 0x5c3fa443),
- TOBN(0x370b4ea7, 0x73241ea3), TOBN(0x61f1511c, 0x5e1a5f65),
- TOBN(0x99a5e23d, 0x82681c62), TOBN(0xd731e383, 0xa2f54c2d),
- TOBN(0x2692f36e, 0x83445904), TOBN(0x2e0ec469, 0xaf45f9c0),
- TOBN(0x905a3201, 0xc67528b7), TOBN(0x88f77f34, 0xd0e5e542),
- TOBN(0xf67a8d29, 0x5864687c), TOBN(0x23b92eae, 0x22df3562),
- TOBN(0x5c27014b, 0x9bbec39e), TOBN(0x7ef2f226, 0x9c0f0f8d),
- TOBN(0x97359638, 0x546c4d8d), TOBN(0x5f9c3fc4, 0x92f24679),
- TOBN(0x912e8bed, 0xa8c8acd9), TOBN(0xec3a318d, 0x306634b0),
- TOBN(0x80167f41, 0xc31cb264), TOBN(0x3db82f6f, 0x522113f2),
- TOBN(0xb155bcd2, 0xdcafe197), TOBN(0xfba1da59, 0x43465283),
- TOBN(0xa0425b8e, 0xb212cf53), TOBN(0x4f2e512e, 0xf8557c5f),
- TOBN(0xc1286ff9, 0x25c4d56c), TOBN(0xbb8a0fea, 0xee26c851),
- TOBN(0xc28f70d2, 0xe7d6107e), TOBN(0x7ee0c444, 0xe76265aa),
- TOBN(0x3df277a4, 0x1d1936b1), TOBN(0x1a556e3f, 0xea9595eb),
- TOBN(0x258bbbf9, 0xe7305683), TOBN(0x31eea5bf, 0x07ef5be6),
- TOBN(0x0deb0e4a, 0x46c814c1), TOBN(0x5cee8449, 0xa7b730dd),
- TOBN(0xeab495c5, 0xa0182bde), TOBN(0xee759f87, 0x9e27a6b4),
- TOBN(0xc2cf6a68, 0x80e518ca), TOBN(0x25e8013f, 0xf14cf3f4),
- TOBN(0x8fc44140, 0x7e8d7a14), TOBN(0xbb1ff3ca, 0x9556f36a),
- TOBN(0x6a844385, 0x14600044), TOBN(0xba3f0c4a, 0x7451ae63),
- TOBN(0xdfcac25b, 0x1f9af32a), TOBN(0x01e0db86, 0xb1f2214b),
- TOBN(0x4e9a5bc2, 0xa4b596ac), TOBN(0x83927681, 0x026c2c08),
- TOBN(0x3ec832e7, 0x7acaca28), TOBN(0x1bfeea57, 0xc7385b29),
- TOBN(0x068212e3, 0xfd1eaf38), TOBN(0xc1329830, 0x6acf8ccc),
- TOBN(0xb909f2db, 0x2aac9e59), TOBN(0x5748060d, 0xb661782a),
- TOBN(0xc5ab2632, 0xc79b7a01), TOBN(0xda44c6c6, 0x00017626),
- TOBN(0xf26c00e8, 0xa7ea82f0), TOBN(0x99cac80d, 0xe4299aaf),
- TOBN(0xd66fe3b6, 0x7ed78be1), TOBN(0x305f725f, 0x648d02cd),
- TOBN(0x33ed1bc4, 0x623fb21b), TOBN(0xfa70533e, 0x7a6319ad),
- TOBN(0x17ab562d, 0xbe5ffb3e), TOBN(0x06374994, 0x56674741),
- TOBN(0x69d44ed6, 0x5c46aa8e), TOBN(0x2100d5d3, 0xa8d063d1),
- TOBN(0xcb9727ea, 0xa2d17c36), TOBN(0x4c2bab1b, 0x8add53b7),
- TOBN(0xa084e90c, 0x15426704), TOBN(0x778afcd3, 0xa837ebea),
- TOBN(0x6651f701, 0x7ce477f8), TOBN(0xa0624998, 0x46fb7a8b),
- TOBN(0xdc1e6828, 0xed8a6e19), TOBN(0x33fc2336, 0x4189d9c7),
- TOBN(0x026f8fe2, 0x671c39bc), TOBN(0xd40c4ccd, 0xbc6f9915),
- TOBN(0xafa135bb, 0xf80e75ca), TOBN(0x12c651a0, 0x22adff2c),
- TOBN(0xc40a04bd, 0x4f51ad96), TOBN(0x04820109, 0xbbe4e832),
- TOBN(0x3667eb1a, 0x7f4c04cc), TOBN(0x59556621, 0xa9404f84),
- TOBN(0x71cdf653, 0x7eceb50a), TOBN(0x994a44a6, 0x9b8335fa),
- TOBN(0xd7faf819, 0xdbeb9b69), TOBN(0x473c5680, 0xeed4350d),
- TOBN(0xb6658466, 0xda44bba2), TOBN(0x0d1bc780, 0x872bdbf3),
- TOBN(0xe535f175, 0xa1962f91), TOBN(0x6ed7e061, 0xed58f5a7),
- TOBN(0x177aa4c0, 0x2089a233), TOBN(0x0dbcb03a, 0xe539b413),
- TOBN(0xe3dc424e, 0xbb32e38e), TOBN(0x6472e5ef, 0x6806701e),
- TOBN(0xdd47ff98, 0x814be9ee), TOBN(0x6b60cfff, 0x35ace009),
- TOBN(0xb8d3d931, 0x9ff91fe5), TOBN(0x039c4800, 0xf0518eed),
- TOBN(0x95c37632, 0x9182cb26), TOBN(0x0763a434, 0x82fc568d),
- TOBN(0x707c04d5, 0x383e76ba), TOBN(0xac98b930, 0x824e8197),
- TOBN(0x92bf7c8f, 0x91230de0), TOBN(0x90876a01, 0x40959b70),
- TOBN(0xdb6d96f3, 0x05968b80), TOBN(0x380a0913, 0x089f73b9),
- TOBN(0x7da70b83, 0xc2c61e01), TOBN(0x95fb8394, 0x569b38c7),
- TOBN(0x9a3c6512, 0x80edfe2f), TOBN(0x8f726bb9, 0x8faeaf82),
- TOBN(0x8010a4a0, 0x78424bf8), TOBN(0x29672044, 0x0e844970)}
- ,
- {TOBN(0x63c5cb81, 0x7a2ad62a), TOBN(0x7ef2b6b9, 0xac62ff54),
- TOBN(0x3749bba4, 0xb3ad9db5), TOBN(0xad311f2c, 0x46d5a617),
- TOBN(0xb77a8087, 0xc2ff3b6d), TOBN(0xb46feaf3, 0x367834ff),
- TOBN(0xf8aa266d, 0x75d6b138), TOBN(0xfa38d320, 0xec008188),
- TOBN(0x486d8ffa, 0x696946fc), TOBN(0x50fbc6d8, 0xb9cba56d),
- TOBN(0x7e3d423e, 0x90f35a15), TOBN(0x7c3da195, 0xc0dd962c),
- TOBN(0xe673fdb0, 0x3cfd5d8b), TOBN(0x0704b7c2, 0x889dfca5),
- TOBN(0xf6ce581f, 0xf52305aa), TOBN(0x399d49eb, 0x914d5e53),
- TOBN(0x380a496d, 0x6ec293cd), TOBN(0x733dbda7, 0x8e7051f5),
- TOBN(0x037e388d, 0xb849140a), TOBN(0xee4b32b0, 0x5946dbf6),
- TOBN(0xb1c4fda9, 0xcae368d1), TOBN(0x5001a7b0, 0xfdb0b2f3),
- TOBN(0x6df59374, 0x2e3ac46e), TOBN(0x4af675f2, 0x39b3e656),
- TOBN(0x44e38110, 0x39949296), TOBN(0x5b63827b, 0x361db1b5),
- TOBN(0x3e5323ed, 0x206eaff5), TOBN(0x942370d2, 0xc21f4290),
- TOBN(0xf2caaf2e, 0xe0d985a1), TOBN(0x192cc64b, 0x7239846d),
- TOBN(0x7c0b8f47, 0xae6312f8), TOBN(0x7dc61f91, 0x96620108),
- TOBN(0xb830fb5b, 0xc2da7de9), TOBN(0xd0e643df, 0x0ff8d3be),
- TOBN(0x31ee77ba, 0x188a9641), TOBN(0x4e8aa3aa, 0xbcf6d502),
- TOBN(0xf9fb6532, 0x9a49110f), TOBN(0xd18317f6, 0x2dd6b220),
- TOBN(0x7e3ced41, 0x52c3ea5a), TOBN(0x0d296a14, 0x7d579c4a),
- TOBN(0x35d6a53e, 0xed4c3717), TOBN(0x9f8240cf, 0x3d0ed2a3),
- TOBN(0x8c0d4d05, 0xe5543aa5), TOBN(0x45d5bbfb, 0xdd33b4b4),
- TOBN(0xfa04cc73, 0x137fd28e), TOBN(0x862ac6ef, 0xc73b3ffd),
- TOBN(0x403ff9f5, 0x31f51ef2), TOBN(0x34d5e0fc, 0xbc73f5a2),
- TOBN(0xf2526820, 0x08913f4f), TOBN(0xea20ed61, 0xeac93d95),
- TOBN(0x51ed38b4, 0x6ca6b26c), TOBN(0x8662dcbc, 0xea4327b0),
- TOBN(0x6daf295c, 0x725d2aaa), TOBN(0xbad2752f, 0x8e52dcda),
- TOBN(0x2210e721, 0x0b17dacc), TOBN(0xa37f7912, 0xd51e8232),
- TOBN(0x4f7081e1, 0x44cc3add), TOBN(0xd5ffa1d6, 0x87be82cf),
- TOBN(0x89890b6c, 0x0edd6472), TOBN(0xada26e1a, 0x3ed17863),
- TOBN(0x276f2715, 0x63483caa), TOBN(0xe6924cd9, 0x2f6077fd),
- TOBN(0x05a7fe98, 0x0a466e3c), TOBN(0xf1c794b0, 0xb1902d1f),
- TOBN(0xe5213688, 0x82a8042c), TOBN(0xd931cfaf, 0xcd278298),
- TOBN(0x069a0ae0, 0xf597a740), TOBN(0x0adbb3f3, 0xeb59107c),
- TOBN(0x983e951e, 0x5eaa8eb8), TOBN(0xe663a8b5, 0x11b48e78),
- TOBN(0x1631cc0d, 0x8a03f2c5), TOBN(0x7577c11e, 0x11e271e2),
- TOBN(0x33b2385c, 0x08369a90), TOBN(0x2990c59b, 0x190eb4f8),
- TOBN(0x819a6145, 0xc68eac80), TOBN(0x7a786d62, 0x2ec4a014),
- TOBN(0x33faadbe, 0x20ac3a8d), TOBN(0x31a21781, 0x5aba2d30),
- TOBN(0x209d2742, 0xdba4f565), TOBN(0xdb2ce9e3, 0x55aa0fbb),
- TOBN(0x8cef334b, 0x168984df), TOBN(0xe81dce17, 0x33879638),
- TOBN(0xf6e6949c, 0x263720f0), TOBN(0x5c56feaf, 0xf593cbec),
- TOBN(0x8bff5601, 0xfde58c84), TOBN(0x74e24117, 0x2eccb314),
- TOBN(0xbcf01b61, 0x4c9a8a78), TOBN(0xa233e35e, 0x544c9868),
- TOBN(0xb3156bf3, 0x8bd7aff1), TOBN(0x1b5ee4cb, 0x1d81b146),
- TOBN(0x7ba1ac41, 0xd628a915), TOBN(0x8f3a8f9c, 0xfd89699e),
- TOBN(0x7329b9c9, 0xa0748be7), TOBN(0x1d391c95, 0xa92e621f),
- TOBN(0xe51e6b21, 0x4d10a837), TOBN(0xd255f53a, 0x4947b435),
- TOBN(0x07669e04, 0xf1788ee3), TOBN(0xc14f27af, 0xa86938a2),
- TOBN(0x8b47a334, 0xe93a01c0), TOBN(0xff627438, 0xd9366808),
- TOBN(0x7a0985d8, 0xca2a5965), TOBN(0x3d9a5542, 0xd6e9b9b3),
- TOBN(0xc23eb80b, 0x4cf972e8), TOBN(0x5c1c33bb, 0x4fdf72fd),
- TOBN(0x0c4a58d4, 0x74a86108), TOBN(0xf8048a8f, 0xee4c5d90),
- TOBN(0xe3c7c924, 0xe86d4c80), TOBN(0x28c889de, 0x056a1e60),
- TOBN(0x57e2662e, 0xb214a040), TOBN(0xe8c48e98, 0x37e10347),
- TOBN(0x87742862, 0x80ac748a), TOBN(0xf1c24022, 0x186b06f2),
- TOBN(0xac2dd4c3, 0x5f74040a), TOBN(0x409aeb71, 0xfceac957),
- TOBN(0x4fbad782, 0x55c4ec23), TOBN(0xb359ed61, 0x8a7b76ec),
- TOBN(0x12744926, 0xed6f4a60), TOBN(0xe21e8d7f, 0x4b912de3),
- TOBN(0xe2575a59, 0xfc705a59), TOBN(0x72f1d4de, 0xed2dbc0e),
- TOBN(0x3d2b24b9, 0xeb7926b8), TOBN(0xbff88cb3, 0xcdbe5509),
- TOBN(0xd0f399af, 0xe4dd640b), TOBN(0x3c5fe130, 0x2f76ed45),
- TOBN(0x6f3562f4, 0x3764fb3d), TOBN(0x7b5af318, 0x3151b62d),
- TOBN(0xd5bd0bc7, 0xd79ce5f3), TOBN(0xfdaf6b20, 0xec66890f),
- TOBN(0x735c67ec, 0x6063540c), TOBN(0x50b259c2, 0xe5f9cb8f),
- TOBN(0xb8734f9a, 0x3f99c6ab), TOBN(0xf8cc13d5, 0xa3a7bc85),
- TOBN(0x80c1b305, 0xc5217659), TOBN(0xfe5364d4, 0x4ec12a54),
- TOBN(0xbd87045e, 0x681345fe), TOBN(0x7f8efeb1, 0x582f897f),
- TOBN(0xe8cbf1e5, 0xd5923359), TOBN(0xdb0cea9d, 0x539b9fb0),
- TOBN(0x0c5b34cf, 0x49859b98), TOBN(0x5e583c56, 0xa4403cc6),
- TOBN(0x11fc1a2d, 0xd48185b7), TOBN(0xc93fbc7e, 0x6e521787),
- TOBN(0x47e7a058, 0x05105b8b), TOBN(0x7b4d4d58, 0xdb8260c8),
- TOBN(0xe33930b0, 0x46eb842a), TOBN(0x8e844a9a, 0x7bdae56d),
- TOBN(0x34ef3a9e, 0x13f7fdfc), TOBN(0xb3768f82, 0x636ca176),
- TOBN(0x2821f4e0, 0x4e09e61c), TOBN(0x414dc3a1, 0xa0c7cddc),
- TOBN(0xd5379437, 0x54945fcd), TOBN(0x151b6eef, 0xb3555ff1),
- TOBN(0xb31bd613, 0x6339c083), TOBN(0x39ff8155, 0xdfb64701),
- TOBN(0x7c3388d2, 0xe29604ab), TOBN(0x1e19084b, 0xa6b10442),
- TOBN(0x17cf54c0, 0xeccd47ef), TOBN(0x89693385, 0x4a5dfb30),
- TOBN(0x69d023fb, 0x47daf9f6), TOBN(0x9222840b, 0x7d91d959),
- TOBN(0x439108f5, 0x803bac62), TOBN(0x0b7dd91d, 0x379bd45f),
- TOBN(0xd651e827, 0xca63c581), TOBN(0x5c5d75f6, 0x509c104f),
- TOBN(0x7d5fc738, 0x1f2dc308), TOBN(0x20faa7bf, 0xd98454be),
- TOBN(0x95374bee, 0xa517b031), TOBN(0xf036b9b1, 0x642692ac),
- TOBN(0xc5106109, 0x39842194), TOBN(0xb7e2353e, 0x49d05295),
- TOBN(0xfc8c1d5c, 0xefb42ee0), TOBN(0xe04884eb, 0x08ce811c),
- TOBN(0xf1f75d81, 0x7419f40e), TOBN(0x5b0ac162, 0xa995c241),
- TOBN(0x120921bb, 0xc4c55646), TOBN(0x713520c2, 0x8d33cf97),
- TOBN(0xb4a65a5c, 0xe98c5100), TOBN(0x6cec871d, 0x2ddd0f5a),
- TOBN(0x251f0b7f, 0x9ba2e78b), TOBN(0x224a8434, 0xce3a2a5f),
- TOBN(0x26827f61, 0x25f5c46f), TOBN(0x6a22bedc, 0x48545ec0),
- TOBN(0x25ae5fa0, 0xb1bb5cdc), TOBN(0xd693682f, 0xfcb9b98f),
- TOBN(0x32027fe8, 0x91e5d7d3), TOBN(0xf14b7d17, 0x73a07678),
- TOBN(0xf88497b3, 0xc0dfdd61), TOBN(0xf7c2eec0, 0x2a8c4f48),
- TOBN(0xaa5573f4, 0x3756e621), TOBN(0xc013a240, 0x1825b948),
- TOBN(0x1c03b345, 0x63878572), TOBN(0xa0472bea, 0x653a4184),
- TOBN(0xf4222e27, 0x0ac69a80), TOBN(0x34096d25, 0xf51e54f6),
- TOBN(0x00a648cb, 0x8fffa591), TOBN(0x4e87acdc, 0x69b6527f),
- TOBN(0x0575e037, 0xe285ccb4), TOBN(0x188089e4, 0x50ddcf52),
- TOBN(0xaa96c9a8, 0x870ff719), TOBN(0x74a56cd8, 0x1fc7e369),
- TOBN(0x41d04ee2, 0x1726931a), TOBN(0x0bbbb2c8, 0x3660ecfd),
- TOBN(0xa6ef6de5, 0x24818e18), TOBN(0xe421cc51, 0xe7d57887),
- TOBN(0xf127d208, 0xbea87be6), TOBN(0x16a475d3, 0xb1cdd682),
- TOBN(0x9db1b684, 0x439b63f7), TOBN(0x5359b3db, 0xf0f113b6),
- TOBN(0xdfccf1de, 0x8bf06e31), TOBN(0x1fdf8f44, 0xdd383901),
- TOBN(0x10775cad, 0x5017e7d2), TOBN(0xdfc3a597, 0x58d11eef),
- TOBN(0x6ec9c8a0, 0xb1ecff10), TOBN(0xee6ed6cc, 0x28400549),
- TOBN(0xb5ad7bae, 0x1b4f8d73), TOBN(0x61b4f11d, 0xe00aaab9),
- TOBN(0x7b32d69b, 0xd4eff2d7), TOBN(0x88ae6771, 0x4288b60f),
- TOBN(0x159461b4, 0x37a1e723), TOBN(0x1f3d4789, 0x570aae8c),
- TOBN(0x869118c0, 0x7f9871da), TOBN(0x35fbda78, 0xf635e278),
- TOBN(0x738f3641, 0xe1541dac), TOBN(0x6794b13a, 0xc0dae45f),
- TOBN(0x065064ac, 0x09cc0917), TOBN(0x27c53729, 0xc68540fd),
- TOBN(0x0d2d4c8e, 0xef227671), TOBN(0xd23a9f80, 0xa1785a04),
- TOBN(0x98c59528, 0x52650359), TOBN(0xfa09ad01, 0x74a1acad),
- TOBN(0x082d5a29, 0x0b55bf5c), TOBN(0xa40f1c67, 0x419b8084),
- TOBN(0x3a5c752e, 0xdcc18770), TOBN(0x4baf1f2f, 0x8825c3a5),
- TOBN(0xebd63f74, 0x21b153ed), TOBN(0xa2383e47, 0xb2f64723),
- TOBN(0xe7bf620a, 0x2646d19a), TOBN(0x56cb44ec, 0x03c83ffd),
- TOBN(0xaf7267c9, 0x4f6be9f1), TOBN(0x8b2dfd7b, 0xc06bb5e9),
- TOBN(0xb87072f2, 0xa672c5c7), TOBN(0xeacb11c8, 0x0d53c5e2),
- TOBN(0x22dac29d, 0xff435932), TOBN(0x37bdb99d, 0x4408693c),
- TOBN(0xf6e62fb6, 0x2899c20f), TOBN(0x3535d512, 0x447ece24),
- TOBN(0xfbdc6b88, 0xff577ce3), TOBN(0x726693bd, 0x190575f2),
- TOBN(0x6772b0e5, 0xab4b35a2), TOBN(0x1d8b6001, 0xf5eeaacf),
- TOBN(0x728f7ce4, 0x795b9580), TOBN(0x4a20ed2a, 0x41fb81da),
- TOBN(0x9f685cd4, 0x4fec01e6), TOBN(0x3ed7ddcc, 0xa7ff50ad),
- TOBN(0x460fd264, 0x0c2d97fd), TOBN(0x3a241426, 0xeb82f4f9),
- TOBN(0x17d1df2c, 0x6a8ea820), TOBN(0xb2b50d3b, 0xf22cc254),
- TOBN(0x03856cba, 0xb7291426), TOBN(0x87fd26ae, 0x04f5ee39),
- TOBN(0x9cb696cc, 0x02bee4ba), TOBN(0x53121804, 0x06820fd6),
- TOBN(0xa5dfc269, 0x0212e985), TOBN(0x666f7ffa, 0x160f9a09),
- TOBN(0xc503cd33, 0xbccd9617), TOBN(0x365dede4, 0xba7730a3),
- TOBN(0x798c6355, 0x5ddb0786), TOBN(0xa6c3200e, 0xfc9cd3bc),
- TOBN(0x060ffb2c, 0xe5e35efd), TOBN(0x99a4e25b, 0x5555a1c1),
- TOBN(0x11d95375, 0xf70b3751), TOBN(0x0a57354a, 0x160e1bf6),
- TOBN(0xecb3ae4b, 0xf8e4b065), TOBN(0x07a834c4, 0x2e53022b),
- TOBN(0x1cd300b3, 0x8692ed96), TOBN(0x16a6f792, 0x61ee14ec),
- TOBN(0x8f1063c6, 0x6a8649ed), TOBN(0xfbcdfcfe, 0x869f3e14),
- TOBN(0x2cfb97c1, 0x00a7b3ec), TOBN(0xcea49b3c, 0x7130c2f1),
- TOBN(0x462d044f, 0xe9d96488), TOBN(0x4b53d52e, 0x8182a0c1),
- TOBN(0x84b6ddd3, 0x0391e9e9), TOBN(0x80ab7b48, 0xb1741a09),
- TOBN(0xec0e15d4, 0x27d3317f), TOBN(0x8dfc1ddb, 0x1a64671e),
- TOBN(0x93cc5d5f, 0xd49c5b92), TOBN(0xc995d53d, 0x3674a331),
- TOBN(0x302e41ec, 0x090090ae), TOBN(0x2278a0cc, 0xedb06830),
- TOBN(0x1d025932, 0xfbc99690), TOBN(0x0c32fbd2, 0xb80d68da),
- TOBN(0xd79146da, 0xf341a6c1), TOBN(0xae0ba139, 0x1bef68a0),
- TOBN(0xc6b8a563, 0x8d774b3a), TOBN(0x1cf307bd, 0x880ba4d7),
- TOBN(0xc033bdc7, 0x19803511), TOBN(0xa9f97b3b, 0x8888c3be),
- TOBN(0x3d68aebc, 0x85c6d05e), TOBN(0xc3b88a9d, 0x193919eb),
- TOBN(0x2d300748, 0xc48b0ee3), TOBN(0x7506bc7c, 0x07a746c1),
- TOBN(0xfc48437c, 0x6e6d57f3), TOBN(0x5bd71587, 0xcfeaa91a),
- TOBN(0xa4ed0408, 0xc1bc5225), TOBN(0xd0b946db, 0x2719226d),
- TOBN(0x109ecd62, 0x758d2d43), TOBN(0x75c8485a, 0x2751759b),
- TOBN(0xb0b75f49, 0x9ce4177a), TOBN(0x4fa61a1e, 0x79c10c3d),
- TOBN(0xc062d300, 0xa167fcd7), TOBN(0x4df3874c, 0x750f0fa8),
- TOBN(0x29ae2cf9, 0x83dfedc9), TOBN(0xf8437134, 0x8d87631a),
- TOBN(0xaf571711, 0x7429c8d2), TOBN(0x18d15867, 0x146d9272),
- TOBN(0x83053ecf, 0x69769bb7), TOBN(0xc55eb856, 0xc479ab82),
- TOBN(0x5ef7791c, 0x21b0f4b2), TOBN(0xaa5956ba, 0x3d491525),
- TOBN(0x407a96c2, 0x9fe20eba), TOBN(0xf27168bb, 0xe52a5ad3),
- TOBN(0x43b60ab3, 0xbf1d9d89), TOBN(0xe45c51ef, 0x710e727a),
- TOBN(0xdfca5276, 0x099b4221), TOBN(0x8dc6407c, 0x2557a159),
- TOBN(0x0ead8335, 0x91035895), TOBN(0x0a9db957, 0x9c55dc32),
- TOBN(0xe40736d3, 0xdf61bc76), TOBN(0x13a619c0, 0x3f778cdb),
- TOBN(0x6dd921a4, 0xc56ea28f), TOBN(0x76a52433, 0x2fa647b4),
- TOBN(0x23591891, 0xac5bdc5d), TOBN(0xff4a1a72, 0xbac7dc01),
- TOBN(0x9905e261, 0x62df8453), TOBN(0x3ac045df, 0xe63b265f),
- TOBN(0x8a3f341b, 0xad53dba7), TOBN(0x8ec269cc, 0x837b625a),
- TOBN(0xd71a2782, 0x3ae31189), TOBN(0x8fb4f9a3, 0x55e96120),
- TOBN(0x804af823, 0xff9875cf), TOBN(0x23224f57, 0x5d442a9b),
- TOBN(0x1c4d3b9e, 0xecc62679), TOBN(0x91da22fb, 0xa0e7ddb1),
- TOBN(0xa370324d, 0x6c04a661), TOBN(0x9710d3b6, 0x5e376d17),
- TOBN(0xed8c98f0, 0x3044e357), TOBN(0xc364ebbe, 0x6422701c),
- TOBN(0x347f5d51, 0x7733d61c), TOBN(0xd55644b9, 0xcea826c3),
- TOBN(0x80c6e0ad, 0x55a25548), TOBN(0x0aa7641d, 0x844220a7),
- TOBN(0x1438ec81, 0x31810660), TOBN(0x9dfa6507, 0xde4b4043),
- TOBN(0x10b515d8, 0xcc3e0273), TOBN(0x1b6066dd, 0x28d8cfb2),
- TOBN(0xd3b04591, 0x9c9efebd), TOBN(0x425d4bdf, 0xa21c1ff4),
- TOBN(0x5fe5af19, 0xd57607d3), TOBN(0xbbf773f7, 0x54481084),
- TOBN(0x8435bd69, 0x94b03ed1), TOBN(0xd9ad1de3, 0x634cc546),
- TOBN(0x2cf423fc, 0x00e420ca), TOBN(0xeed26d80, 0xa03096dd),
- TOBN(0xd7f60be7, 0xa4db09d2), TOBN(0xf47f569d, 0x960622f7),
- TOBN(0xe5925fd7, 0x7296c729), TOBN(0xeff2db26, 0x26ca2715),
- TOBN(0xa6fcd014, 0xb913e759), TOBN(0x53da4786, 0x8ff4de93),
- TOBN(0x14616d79, 0xc32068e1), TOBN(0xb187d664, 0xccdf352e),
- TOBN(0xf7afb650, 0x1dc90b59), TOBN(0x8170e943, 0x7daa1b26),
- TOBN(0xc8e3bdd8, 0x700c0a84), TOBN(0x6e8d345f, 0x6482bdfa),
- TOBN(0x84cfbfa1, 0xc5c5ea50), TOBN(0xd3baf14c, 0x67960681),
- TOBN(0x26398403, 0x0dd50942), TOBN(0xe4b7839c, 0x4716a663),
- TOBN(0xd5f1f794, 0xe7de6dc0), TOBN(0x5cd0f4d4, 0x622aa7ce),
- TOBN(0x5295f3f1, 0x59acfeec), TOBN(0x8d933552, 0x953e0607),
- TOBN(0xc7db8ec5, 0x776c5722), TOBN(0xdc467e62, 0x2b5f290c),
- TOBN(0xd4297e70, 0x4ff425a9), TOBN(0x4be924c1, 0x0cf7bb72),
- TOBN(0x0d5dc5ae, 0xa1892131), TOBN(0x8bf8a8e3, 0xa705c992),
- TOBN(0x73a0b064, 0x7a305ac5), TOBN(0x00c9ca4e, 0x9a8c77a8),
- TOBN(0x5dfee80f, 0x83774bdd), TOBN(0x63131602, 0x85734485),
- TOBN(0xa1b524ae, 0x914a69a9), TOBN(0xebc2ffaf, 0xd4e300d7),
- TOBN(0x52c93db7, 0x7cfa46a5), TOBN(0x71e6161f, 0x21653b50),
- TOBN(0x3574fc57, 0xa4bc580a), TOBN(0xc09015dd, 0xe1bc1253),
- TOBN(0x4b7b47b2, 0xd174d7aa), TOBN(0x4072d8e8, 0xf3a15d04),
- TOBN(0xeeb7d47f, 0xd6fa07ed), TOBN(0x6f2b9ff9, 0xedbdafb1),
- TOBN(0x18c51615, 0x3760fe8a), TOBN(0x7a96e6bf, 0xf06c6c13),
- TOBN(0x4d7a0410, 0x0ea2d071), TOBN(0xa1914e9b, 0x0be2a5ce),
- TOBN(0x5726e357, 0xd8a3c5cf), TOBN(0x1197ecc3, 0x2abb2b13),
- TOBN(0x6c0d7f7f, 0x31ae88dd), TOBN(0x15b20d1a, 0xfdbb3efe),
- TOBN(0xcd06aa26, 0x70584039), TOBN(0x2277c969, 0xa7dc9747),
- TOBN(0xbca69587, 0x7855d815), TOBN(0x899ea238, 0x5188b32a),
- TOBN(0x37d9228b, 0x760c1c9d), TOBN(0xc7efbb11, 0x9b5c18da),
- TOBN(0x7f0d1bc8, 0x19f6dbc5), TOBN(0x4875384b, 0x07e6905b),
- TOBN(0xc7c50baa, 0x3ba8cd86), TOBN(0xb0ce40fb, 0xc2905de0),
- TOBN(0x70840673, 0x7a231952), TOBN(0xa912a262, 0xcf43de26),
- TOBN(0x9c38ddcc, 0xeb5b76c1), TOBN(0x746f5285, 0x26fc0ab4),
- TOBN(0x52a63a50, 0xd62c269f), TOBN(0x60049c55, 0x99458621),
- TOBN(0xe7f48f82, 0x3c2f7c9e), TOBN(0x6bd99043, 0x917d5cf3),
- TOBN(0xeb1317a8, 0x8701f469), TOBN(0xbd3fe2ed, 0x9a449fe0),
- TOBN(0x421e79ca, 0x12ef3d36), TOBN(0x9ee3c36c, 0x3e7ea5de),
- TOBN(0xe48198b5, 0xcdff36f7), TOBN(0xaff4f967, 0xc6b82228),
- TOBN(0x15e19dd0, 0xc47adb7e), TOBN(0x45699b23, 0x032e7dfa),
- TOBN(0x40680c8b, 0x1fae026a), TOBN(0x5a347a48, 0x550dbf4d),
- TOBN(0xe652533b, 0x3cef0d7d), TOBN(0xd94f7b18, 0x2bbb4381),
- TOBN(0x838752be, 0x0e80f500), TOBN(0x8e6e2488, 0x9e9c9bfb),
- TOBN(0xc9751697, 0x16caca6a), TOBN(0x866c49d8, 0x38531ad9),
- TOBN(0xc917e239, 0x7151ade1), TOBN(0x2d016ec1, 0x6037c407),
- TOBN(0xa407ccc9, 0x00eac3f9), TOBN(0x835f6280, 0xe2ed4748),
- TOBN(0xcc54c347, 0x1cc98e0d), TOBN(0x0e969937, 0xdcb572eb),
- TOBN(0x1b16c8e8, 0x8f30c9cb), TOBN(0xa606ae75, 0x373c4661),
- TOBN(0x47aa689b, 0x35502cab), TOBN(0xf89014ae, 0x4d9bb64f),
- TOBN(0x202f6a9c, 0x31c71f7b), TOBN(0x01f95aa3, 0x296ffe5c),
- TOBN(0x5fc06014, 0x53cec3a3), TOBN(0xeb991237, 0x5f498a45),
- TOBN(0xae9a935e, 0x5d91ba87), TOBN(0xc6ac6281, 0x0b564a19),
- TOBN(0x8a8fe81c, 0x3bd44e69), TOBN(0x7c8b467f, 0x9dd11d45),
- TOBN(0xf772251f, 0xea5b8e69), TOBN(0xaeecb3bd, 0xc5b75fbc),
- TOBN(0x1aca3331, 0x887ff0e5), TOBN(0xbe5d49ff, 0x19f0a131),
- TOBN(0x582c13aa, 0xe5c8646f), TOBN(0xdbaa12e8, 0x20e19980),
- TOBN(0x8f40f31a, 0xf7abbd94), TOBN(0x1f13f5a8, 0x1dfc7663),
- TOBN(0x5d81f1ee, 0xaceb4fc0), TOBN(0x36256002, 0x5e6f0f42),
- TOBN(0x4b67d6d7, 0x751370c8), TOBN(0x2608b698, 0x03e80589),
- TOBN(0xcfc0d2fc, 0x05268301), TOBN(0xa6943d39, 0x40309212),
- TOBN(0x192a90c2, 0x1fd0e1c2), TOBN(0xb209f113, 0x37f1dc76),
- TOBN(0xefcc5e06, 0x97bf1298), TOBN(0xcbdb6730, 0x219d639e),
- TOBN(0xd009c116, 0xb81e8c6f), TOBN(0xa3ffdde3, 0x1a7ce2e5),
- TOBN(0xc53fbaaa, 0xa914d3ba), TOBN(0x836d500f, 0x88df85ee),
- TOBN(0xd98dc71b, 0x66ee0751), TOBN(0x5a3d7005, 0x714516fd),
- TOBN(0x21d3634d, 0x39eedbba), TOBN(0x35cd2e68, 0x0455a46d),
- TOBN(0xc8cafe65, 0xf9d7eb0c), TOBN(0xbda3ce9e, 0x00cefb3e),
- TOBN(0xddc17a60, 0x2c9cf7a4), TOBN(0x01572ee4, 0x7bcb8773),
- TOBN(0xa92b2b01, 0x8c7548df), TOBN(0x732fd309, 0xa84600e3),
- TOBN(0xe22109c7, 0x16543a40), TOBN(0x9acafd36, 0xfede3c6c),
- TOBN(0xfb206852, 0x6824e614), TOBN(0x2a4544a9, 0xda25dca0),
- TOBN(0x25985262, 0x91d60b06), TOBN(0x281b7be9, 0x28753545),
- TOBN(0xec667b1a, 0x90f13b27), TOBN(0x33a83aff, 0x940e2eb4),
- TOBN(0x80009862, 0xd5d721d5), TOBN(0x0c3357a3, 0x5bd3a182),
- TOBN(0x27f3a83b, 0x7aa2cda4), TOBN(0xb58ae74e, 0xf6f83085),
- TOBN(0x2a911a81, 0x2e6dad6b), TOBN(0xde286051, 0xf43d6c5b),
- TOBN(0x4bdccc41, 0xf996c4d8), TOBN(0xe7312ec0, 0x0ae1e24e)}
- ,
- {TOBN(0xf8d112e7, 0x6e6485b3), TOBN(0x4d3e24db, 0x771c52f8),
- TOBN(0x48e3ee41, 0x684a2f6d), TOBN(0x7161957d, 0x21d95551),
- TOBN(0x19631283, 0xcdb12a6c), TOBN(0xbf3fa882, 0x2e50e164),
- TOBN(0xf6254b63, 0x3166cc73), TOBN(0x3aefa7ae, 0xaee8cc38),
- TOBN(0x79b0fe62, 0x3b36f9fd), TOBN(0x26543b23, 0xfde19fc0),
- TOBN(0x136e64a0, 0x958482ef), TOBN(0x23f63771, 0x9b095825),
- TOBN(0x14cfd596, 0xb6a1142e), TOBN(0x5ea6aac6, 0x335aac0b),
- TOBN(0x86a0e8bd, 0xf3081dd5), TOBN(0x5fb89d79, 0x003dc12a),
- TOBN(0xf615c33a, 0xf72e34d4), TOBN(0x0bd9ea40, 0x110eec35),
- TOBN(0x1c12bc5b, 0xc1dea34e), TOBN(0x686584c9, 0x49ae4699),
- TOBN(0x13ad95d3, 0x8c97b942), TOBN(0x4609561a, 0x4e5c7562),
- TOBN(0x9e94a4ae, 0xf2737f89), TOBN(0xf57594c6, 0x371c78b6),
- TOBN(0x0f0165fc, 0xe3779ee3), TOBN(0xe00e7f9d, 0xbd495d9e),
- TOBN(0x1fa4efa2, 0x20284e7a), TOBN(0x4564bade, 0x47ac6219),
- TOBN(0x90e6312a, 0xc4708e8e), TOBN(0x4f5725fb, 0xa71e9adf),
- TOBN(0xe95f55ae, 0x3d684b9f), TOBN(0x47f7ccb1, 0x1e94b415),
- TOBN(0x7322851b, 0x8d946581), TOBN(0xf0d13133, 0xbdf4a012),
- TOBN(0xa3510f69, 0x6584dae0), TOBN(0x03a7c171, 0x3c9f6c6d),
- TOBN(0x5be97f38, 0xe475381a), TOBN(0xca1ba422, 0x85823334),
- TOBN(0xf83cc5c7, 0x0be17dda), TOBN(0x158b1494, 0x0b918c0f),
- TOBN(0xda3a77e5, 0x522e6b69), TOBN(0x69c908c3, 0xbbcd6c18),
- TOBN(0x1f1b9e48, 0xd924fd56), TOBN(0x37c64e36, 0xaa4bb3f7),
- TOBN(0x5a4fdbdf, 0xee478d7d), TOBN(0xba75c8bc, 0x0193f7a0),
- TOBN(0x84bc1e84, 0x56cd16df), TOBN(0x1fb08f08, 0x46fad151),
- TOBN(0x8a7cabf9, 0x842e9f30), TOBN(0xa331d4bf, 0x5eab83af),
- TOBN(0xd272cfba, 0x017f2a6a), TOBN(0x27560abc, 0x83aba0e3),
- TOBN(0x94b83387, 0x0e3a6b75), TOBN(0x25c6aea2, 0x6b9f50f5),
- TOBN(0x803d691d, 0xb5fdf6d0), TOBN(0x03b77509, 0xe6333514),
- TOBN(0x36178903, 0x61a341c1), TOBN(0x3604dc60, 0x0cfd6142),
- TOBN(0x022295eb, 0x8533316c), TOBN(0x3dbde4ac, 0x44af2922),
- TOBN(0x898afc5d, 0x1c7eef69), TOBN(0x58896805, 0xd14f4fa1),
- TOBN(0x05002160, 0x203c21ca), TOBN(0x6f0d1f30, 0x40ef730b),
- TOBN(0x8e8c44d4, 0x196224f8), TOBN(0x75a4ab95, 0x374d079d),
- TOBN(0x79085ecc, 0x7d48f123), TOBN(0x56f04d31, 0x1bf65ad8),
- TOBN(0xe220bf1c, 0xbda602b2), TOBN(0x73ee1742, 0xf9612c69),
- TOBN(0x76008fc8, 0x084fd06b), TOBN(0x4000ef9f, 0xf11380d1),
- TOBN(0x48201b4b, 0x12cfe297), TOBN(0x3eee129c, 0x292f74e5),
- TOBN(0xe1fe114e, 0xc9e874e8), TOBN(0x899b055c, 0x92c5fc41),
- TOBN(0x4e477a64, 0x3a39c8cf), TOBN(0x82f09efe, 0x78963cc9),
- TOBN(0x6fd3fd8f, 0xd333f863), TOBN(0x85132b2a, 0xdc949c63),
- TOBN(0x7e06a3ab, 0x516eb17b), TOBN(0x73bec06f, 0xd2c7372b),
- TOBN(0xe4f74f55, 0xba896da6), TOBN(0xbb4afef8, 0x8e9eb40f),
- TOBN(0x2d75bec8, 0xe61d66b0), TOBN(0x02bda4b4, 0xef29300b),
- TOBN(0x8bbaa8de, 0x026baa5a), TOBN(0xff54befd, 0xa07f4440),
- TOBN(0xbd9b8b1d, 0xbe7a2af3), TOBN(0xec51caa9, 0x4fb74a72),
- TOBN(0xb9937a4b, 0x63879697), TOBN(0x7c9a9d20, 0xec2687d5),
- TOBN(0x1773e44f, 0x6ef5f014), TOBN(0x8abcf412, 0xe90c6900),
- TOBN(0x387bd022, 0x8142161e), TOBN(0x50393755, 0xfcb6ff2a),
- TOBN(0x9813fd56, 0xed6def63), TOBN(0x53cf6482, 0x7d53106c),
- TOBN(0x991a35bd, 0x431f7ac1), TOBN(0xf1e274dd, 0x63e65faf),
- TOBN(0xf63ffa3c, 0x44cc7880), TOBN(0x411a426b, 0x7c256981),
- TOBN(0xb698b9fd, 0x93a420e0), TOBN(0x89fdddc0, 0xae53f8fe),
- TOBN(0x766e0722, 0x32398baa), TOBN(0x205fee42, 0x5cfca031),
- TOBN(0xa49f5341, 0x7a029cf2), TOBN(0xa88c68b8, 0x4023890d),
- TOBN(0xbc275041, 0x7337aaa8), TOBN(0x9ed364ad, 0x0eb384f4),
- TOBN(0xe0816f85, 0x29aba92f), TOBN(0x2e9e1941, 0x04e38a88),
- TOBN(0x57eef44a, 0x3dafd2d5), TOBN(0x35d1fae5, 0x97ed98d8),
- TOBN(0x50628c09, 0x2307f9b1), TOBN(0x09d84aae, 0xd6cba5c6),
- TOBN(0x67071bc7, 0x88aaa691), TOBN(0x2dea57a9, 0xafe6cb03),
- TOBN(0xdfe11bb4, 0x3d78ac01), TOBN(0x7286418c, 0x7fd7aa51),
- TOBN(0xfabf7709, 0x77f7195a), TOBN(0x8ec86167, 0xadeb838f),
- TOBN(0xea1285a8, 0xbb4f012d), TOBN(0xd6883503, 0x9a3eab3f),
- TOBN(0xee5d24f8, 0x309004c2), TOBN(0xa96e4b76, 0x13ffe95e),
- TOBN(0x0cdffe12, 0xbd223ea4), TOBN(0x8f5c2ee5, 0xb6739a53),
- TOBN(0x5cb4aaa5, 0xdd968198), TOBN(0xfa131c52, 0x72413a6c),
- TOBN(0x53d46a90, 0x9536d903), TOBN(0xb270f0d3, 0x48606d8e),
- TOBN(0x518c7564, 0xa053a3bc), TOBN(0x088254b7, 0x1a86caef),
- TOBN(0xb3ba8cb4, 0x0ab5efd0), TOBN(0x5c59900e, 0x4605945d),
- TOBN(0xecace1dd, 0xa1887395), TOBN(0x40960f36, 0x932a65de),
- TOBN(0x9611ff5c, 0x3aa95529), TOBN(0xc58215b0, 0x7c1e5a36),
- TOBN(0xd48c9b58, 0xf0e1a524), TOBN(0xb406856b, 0xf590dfb8),
- TOBN(0xc7605e04, 0x9cd95662), TOBN(0x0dd036ee, 0xa33ecf82),
- TOBN(0xa50171ac, 0xc33156b3), TOBN(0xf09d24ea, 0x4a80172e),
- TOBN(0x4e1f72c6, 0x76dc8eef), TOBN(0xe60caadc, 0x5e3d44ee),
- TOBN(0x006ef8a6, 0x979b1d8f), TOBN(0x60908a1c, 0x97788d26),
- TOBN(0x6e08f95b, 0x266feec0), TOBN(0x618427c2, 0x22e8c94e),
- TOBN(0x3d613339, 0x59145a65), TOBN(0xcd9bc368, 0xfa406337),
- TOBN(0x82d11be3, 0x2d8a52a0), TOBN(0xf6877b27, 0x97a1c590),
- TOBN(0x837a819b, 0xf5cbdb25), TOBN(0x2a4fd1d8, 0xde090249),
- TOBN(0x622a7de7, 0x74990e5f), TOBN(0x840fa5a0, 0x7945511b),
- TOBN(0x30b974be, 0x6558842d), TOBN(0x70df8c64, 0x17f3d0a6),
- TOBN(0x7c803520, 0x7542e46d), TOBN(0x7251fe7f, 0xe4ecc823),
- TOBN(0xe59134cb, 0x5e9aac9a), TOBN(0x11bb0934, 0xf0045d71),
- TOBN(0x53e5d9b5, 0xdbcb1d4e), TOBN(0x8d97a905, 0x92defc91),
- TOBN(0xfe289327, 0x7946d3f9), TOBN(0xe132bd24, 0x07472273),
- TOBN(0xeeeb510c, 0x1eb6ae86), TOBN(0x777708c5, 0xf0595067),
- TOBN(0x18e2c8cd, 0x1297029e), TOBN(0x2c61095c, 0xbbf9305e),
- TOBN(0xe466c258, 0x6b85d6d9), TOBN(0x8ac06c36, 0xda1ea530),
- TOBN(0xa365dc39, 0xa1304668), TOBN(0xe4a9c885, 0x07f89606),
- TOBN(0x65a4898f, 0xacc7228d), TOBN(0x3e2347ff, 0x84ca8303),
- TOBN(0xa5f6fb77, 0xea7d23a3), TOBN(0x2fac257d, 0x672a71cd),
- TOBN(0x6908bef8, 0x7e6a44d3), TOBN(0x8ff87566, 0x891d3d7a),
- TOBN(0xe58e90b3, 0x6b0cf82e), TOBN(0x6438d246, 0x2615b5e7),
- TOBN(0x07b1f8fc, 0x669c145a), TOBN(0xb0d8b2da, 0x36f1e1cb),
- TOBN(0x54d5dadb, 0xd9184c4d), TOBN(0x3dbb18d5, 0xf93d9976),
- TOBN(0x0a3e0f56, 0xd1147d47), TOBN(0x2afa8c8d, 0xa0a48609),
- TOBN(0x275353e8, 0xbc36742c), TOBN(0x898f427e, 0xeea0ed90),
- TOBN(0x26f4947e, 0x3e477b00), TOBN(0x8ad8848a, 0x308741e3),
- TOBN(0x6c703c38, 0xd74a2a46), TOBN(0x5e3e05a9, 0x9ba17ba2),
- TOBN(0xc1fa6f66, 0x4ab9a9e4), TOBN(0x474a2d9a, 0x3841d6ec),
- TOBN(0x871239ad, 0x653ae326), TOBN(0x14bcf72a, 0xa74cbb43),
- TOBN(0x8737650e, 0x20d4c083), TOBN(0x3df86536, 0x110ed4af),
- TOBN(0xd2d86fe7, 0xb53ca555), TOBN(0x688cb00d, 0xabd5d538),
- TOBN(0xcf81bda3, 0x1ad38468), TOBN(0x7ccfe3cc, 0xf01167b6),
- TOBN(0xcf4f47e0, 0x6c4c1fe6), TOBN(0x557e1f1a, 0x298bbb79),
- TOBN(0xf93b974f, 0x30d45a14), TOBN(0x174a1d2d, 0x0baf97c4),
- TOBN(0x7a003b30, 0xc51fbf53), TOBN(0xd8940991, 0xee68b225),
- TOBN(0x5b0aa7b7, 0x1c0f4173), TOBN(0x975797c9, 0xa20a7153),
- TOBN(0x26e08c07, 0xe3533d77), TOBN(0xd7222e6a, 0x2e341c99),
- TOBN(0x9d60ec3d, 0x8d2dc4ed), TOBN(0xbdfe0d8f, 0x7c476cf8),
- TOBN(0x1fe59ab6, 0x1d056605), TOBN(0xa9ea9df6, 0x86a8551f),
- TOBN(0x8489941e, 0x47fb8d8c), TOBN(0xfeb874eb, 0x4a7f1b10),
- TOBN(0xfe5fea86, 0x7ee0d98f), TOBN(0x201ad34b, 0xdbf61864),
- TOBN(0x45d8fe47, 0x37c031d4), TOBN(0xd5f49fae, 0x795f0822),
- TOBN(0xdb0fb291, 0xc7f4a40c), TOBN(0x2e69d9c1, 0x730ddd92),
- TOBN(0x754e1054, 0x49d76987), TOBN(0x8a24911d, 0x7662db87),
- TOBN(0x61fc1810, 0x60a71676), TOBN(0xe852d1a8, 0xf66a8ad1),
- TOBN(0x172bbd65, 0x6417231e), TOBN(0x0d6de7bd, 0x3babb11f),
- TOBN(0x6fde6f88, 0xc8e347f8), TOBN(0x1c587547, 0x9bd99cc3),
- TOBN(0x78e54ed0, 0x34076950), TOBN(0x97f0f334, 0x796e83ba),
- TOBN(0xe4dbe1ce, 0x4924867a), TOBN(0xbd5f51b0, 0x60b84917),
- TOBN(0x37530040, 0x3cb09a79), TOBN(0xdb3fe0f8, 0xff1743d8),
- TOBN(0xed7894d8, 0x556fa9db), TOBN(0xfa262169, 0x23412fbf),
- TOBN(0x563be0db, 0xba7b9291), TOBN(0x6ca8b8c0, 0x0c9fb234),
- TOBN(0xed406aa9, 0xbd763802), TOBN(0xc21486a0, 0x65303da1),
- TOBN(0x61ae291e, 0xc7e62ec4), TOBN(0x622a0492, 0xdf99333e),
- TOBN(0x7fd80c9d, 0xbb7a8ee0), TOBN(0xdc2ed3bc, 0x6c01aedb),
- TOBN(0x35c35a12, 0x08be74ec), TOBN(0xd540cb1a, 0x469f671f),
- TOBN(0xd16ced4e, 0xcf84f6c7), TOBN(0x8561fb9c, 0x2d090f43),
- TOBN(0x7e693d79, 0x6f239db4), TOBN(0xa736f928, 0x77bd0d94),
- TOBN(0x07b4d929, 0x2c1950ee), TOBN(0xda177543, 0x56dc11b3),
- TOBN(0xa5dfbbaa, 0x7a6a878e), TOBN(0x1c70cb29, 0x4decb08a),
- TOBN(0xfba28c8b, 0x6f0f7c50), TOBN(0xa8eba2b8, 0x854dcc6d),
- TOBN(0x5ff8e89a, 0x36b78642), TOBN(0x070c1c8e, 0xf6873adf),
- TOBN(0xbbd3c371, 0x6484d2e4), TOBN(0xfb78318f, 0x0d414129),
- TOBN(0x2621a39c, 0x6ad93b0b), TOBN(0x979d74c2, 0xa9e917f7),
- TOBN(0xfc195647, 0x61fb0428), TOBN(0x4d78954a, 0xbee624d4),
- TOBN(0xb94896e0, 0xb8ae86fd), TOBN(0x6667ac0c, 0xc91c8b13),
- TOBN(0x9f180512, 0x43bcf832), TOBN(0xfbadf8b7, 0xa0010137),
- TOBN(0xc69b4089, 0xb3ba8aa7), TOBN(0xfac4bacd, 0xe687ce85),
- TOBN(0x9164088d, 0x977eab40), TOBN(0x51f4c5b6, 0x2760b390),
- TOBN(0xd238238f, 0x340dd553), TOBN(0x358566c3, 0xdb1d31c9),
- TOBN(0x3a5ad69e, 0x5068f5ff), TOBN(0xf31435fc, 0xdaff6b06),
- TOBN(0xae549a5b, 0xd6debff0), TOBN(0x59e5f0b7, 0x75e01331),
- TOBN(0x5d492fb8, 0x98559acf), TOBN(0x96018c2e, 0x4db79b50),
- TOBN(0x55f4a48f, 0x609f66aa), TOBN(0x1943b3af, 0x4900a14f),
- TOBN(0xc22496df, 0x15a40d39), TOBN(0xb2a44684, 0x4c20f7c5),
- TOBN(0x76a35afa, 0x3b98404c), TOBN(0xbec75725, 0xff5d1b77),
- TOBN(0xb67aa163, 0xbea06444), TOBN(0x27e95bb2, 0xf724b6f2),
- TOBN(0x3c20e3e9, 0xd238c8ab), TOBN(0x1213754e, 0xddd6ae17),
- TOBN(0x8c431020, 0x716e0f74), TOBN(0x6679c82e, 0xffc095c2),
- TOBN(0x2eb3adf4, 0xd0ac2932), TOBN(0x2cc970d3, 0x01bb7a76),
- TOBN(0x70c71f2f, 0x740f0e66), TOBN(0x545c616b, 0x2b6b23cc),
- TOBN(0x4528cfcb, 0xb40a8bd7), TOBN(0xff839633, 0x2ab27722),
- TOBN(0x049127d9, 0x025ac99a), TOBN(0xd314d4a0, 0x2b63e33b),
- TOBN(0xc8c310e7, 0x28d84519), TOBN(0x0fcb8983, 0xb3bc84ba),
- TOBN(0x2cc52261, 0x38634818), TOBN(0x501814f4, 0xb44c2e0b),
- TOBN(0xf7e181aa, 0x54dfdba3), TOBN(0xcfd58ff0, 0xe759718c),
- TOBN(0xf90cdb14, 0xd3b507a8), TOBN(0x57bd478e, 0xc50bdad8),
- TOBN(0x29c197e2, 0x50e5f9aa), TOBN(0x4db6eef8, 0xe40bc855),
- TOBN(0x2cc8f21a, 0xd1fc0654), TOBN(0xc71cc963, 0x81269d73),
- TOBN(0xecfbb204, 0x077f49f9), TOBN(0xdde92571, 0xca56b793),
- TOBN(0x9abed6a3, 0xf97ad8f7), TOBN(0xe6c19d3f, 0x924de3bd),
- TOBN(0x8dce92f4, 0xa140a800), TOBN(0x85f44d1e, 0x1337af07),
- TOBN(0x5953c08b, 0x09d64c52), TOBN(0xa1b5e49f, 0xf5df9749),
- TOBN(0x336a8fb8, 0x52735f7d), TOBN(0xb332b6db, 0x9add676b),
- TOBN(0x558b88a0, 0xb4511aa4), TOBN(0x09788752, 0xdbd5cc55),
- TOBN(0x16b43b9c, 0xd8cd52bd), TOBN(0x7f0bc5a0, 0xc2a2696b),
- TOBN(0x146e12d4, 0xc11f61ef), TOBN(0x9ce10754, 0x3a83e79e),
- TOBN(0x08ec73d9, 0x6cbfca15), TOBN(0x09ff29ad, 0x5b49653f),
- TOBN(0xe31b72bd, 0xe7da946e), TOBN(0xebf9eb3b, 0xee80a4f2),
- TOBN(0xd1aabd08, 0x17598ce4), TOBN(0x18b5fef4, 0x53f37e80),
- TOBN(0xd5d5cdd3, 0x5958cd79), TOBN(0x3580a1b5, 0x1d373114),
- TOBN(0xa36e4c91, 0xfa935726), TOBN(0xa38c534d, 0xef20d760),
- TOBN(0x7088e40a, 0x2ff5845b), TOBN(0xe5bb40bd, 0xbd78177f),
- TOBN(0x4f06a7a8, 0x857f9920), TOBN(0xe3cc3e50, 0xe968f05d),
- TOBN(0x1d68b7fe, 0xe5682d26), TOBN(0x5206f76f, 0xaec7f87c),
- TOBN(0x41110530, 0x041951ab), TOBN(0x58ec52c1, 0xd4b5a71a),
- TOBN(0xf3488f99, 0x0f75cf9a), TOBN(0xf411951f, 0xba82d0d5),
- TOBN(0x27ee75be, 0x618895ab), TOBN(0xeae060d4, 0x6d8aab14),
- TOBN(0x9ae1df73, 0x7fb54dc2), TOBN(0x1f3e391b, 0x25963649),
- TOBN(0x242ec32a, 0xfe055081), TOBN(0x5bd450ef, 0x8491c9bd),
- TOBN(0x367efc67, 0x981eb389), TOBN(0xed7e1928, 0x3a0550d5),
- TOBN(0x362e776b, 0xab3ce75c), TOBN(0xe890e308, 0x1f24c523),
- TOBN(0xb961b682, 0xfeccef76), TOBN(0x8b8e11f5, 0x8bba6d92),
- TOBN(0x8f2ccc4c, 0x2b2375c4), TOBN(0x0d7f7a52, 0xe2f86cfa),
- TOBN(0xfd94d30a, 0x9efe5633), TOBN(0x2d8d246b, 0x5451f934),
- TOBN(0x2234c6e3, 0x244e6a00), TOBN(0xde2b5b0d, 0xddec8c50),
- TOBN(0x2ce53c5a, 0xbf776f5b), TOBN(0x6f724071, 0x60357b05),
- TOBN(0xb2593717, 0x71bf3f7a), TOBN(0x87d2501c, 0x440c4a9f),
- TOBN(0x440552e1, 0x87b05340), TOBN(0xb7bf7cc8, 0x21624c32),
- TOBN(0x4155a6ce, 0x22facddb), TOBN(0x5a4228cb, 0x889837ef),
- TOBN(0xef87d6d6, 0xfd4fd671), TOBN(0xa233687e, 0xc2daa10e),
- TOBN(0x75622244, 0x03c0eb96), TOBN(0x7632d184, 0x8bf19be6),
- TOBN(0x05d0f8e9, 0x40735ff4), TOBN(0x3a3e6e13, 0xc00931f1),
- TOBN(0x31ccde6a, 0xdafe3f18), TOBN(0xf381366a, 0xcfe51207),
- TOBN(0x24c222a9, 0x60167d92), TOBN(0x62f9d6f8, 0x7529f18c),
- TOBN(0x412397c0, 0x0353b114), TOBN(0x334d89dc, 0xef808043),
- TOBN(0xd9ec63ba, 0x2a4383ce), TOBN(0xcec8e937, 0x5cf92ba0),
- TOBN(0xfb8b4288, 0xc8be74c0), TOBN(0x67d6912f, 0x105d4391),
- TOBN(0x7b996c46, 0x1b913149), TOBN(0x36aae2ef, 0x3a4e02da),
- TOBN(0xb68aa003, 0x972de594), TOBN(0x284ec70d, 0x4ec6d545),
- TOBN(0xf3d2b2d0, 0x61391d54), TOBN(0x69c5d5d6, 0xfe114e92),
- TOBN(0xbe0f00b5, 0xb4482dff), TOBN(0xe1596fa5, 0xf5bf33c5),
- TOBN(0x10595b56, 0x96a71cba), TOBN(0x944938b2, 0xfdcadeb7),
- TOBN(0xa282da4c, 0xfccd8471), TOBN(0x98ec05f3, 0x0d37bfe1),
- TOBN(0xe171ce1b, 0x0698304a), TOBN(0x2d691444, 0x21bdf79b),
- TOBN(0xd0cd3b74, 0x1b21dec1), TOBN(0x712ecd8b, 0x16a15f71),
- TOBN(0x8d4c00a7, 0x00fd56e1), TOBN(0x02ec9692, 0xf9527c18),
- TOBN(0x21c44937, 0x4a3e42e1), TOBN(0x9176fbab, 0x1392ae0a),
- TOBN(0x8726f1ba, 0x44b7b618), TOBN(0xb4d7aae9, 0xf1de491c),
- TOBN(0xf91df7b9, 0x07b582c0), TOBN(0x7e116c30, 0xef60aa3a),
- TOBN(0x99270f81, 0x466265d7), TOBN(0xb15b6fe2, 0x4df7adf0),
- TOBN(0xfe33b2d3, 0xf9738f7f), TOBN(0x48553ab9, 0xd6d70f95),
- TOBN(0x2cc72ac8, 0xc21e94db), TOBN(0x795ac38d, 0xbdc0bbee),
- TOBN(0x0a1be449, 0x2e40478f), TOBN(0x81bd3394, 0x052bde55),
- TOBN(0x63c8dbe9, 0x56b3c4f2), TOBN(0x017a99cf, 0x904177cc),
- TOBN(0x947bbddb, 0x4d010fc1), TOBN(0xacf9b00b, 0xbb2c9b21),
- TOBN(0x2970bc8d, 0x47173611), TOBN(0x1a4cbe08, 0xac7d756f),
- TOBN(0x06d9f4aa, 0x67d541a2), TOBN(0xa3e8b689, 0x59c2cf44),
- TOBN(0xaad066da, 0x4d88f1dd), TOBN(0xc604f165, 0x7ad35dea),
- TOBN(0x7edc0720, 0x4478ca67), TOBN(0xa10dfae0, 0xba02ce06),
- TOBN(0xeceb1c76, 0xaf36f4e4), TOBN(0x994b2292, 0xaf3f8f48),
- TOBN(0xbf9ed77b, 0x77c8a68c), TOBN(0x74f544ea, 0x51744c9d),
- TOBN(0x82d05bb9, 0x8113a757), TOBN(0x4ef2d2b4, 0x8a9885e4),
- TOBN(0x1e332be5, 0x1aa7865f), TOBN(0x22b76b18, 0x290d1a52),
- TOBN(0x308a2310, 0x44351683), TOBN(0x9d861896, 0xa3f22840),
- TOBN(0x5959ddcd, 0x841ed947), TOBN(0x0def0c94, 0x154b73bf),
- TOBN(0xf0105417, 0x4c7c15e0), TOBN(0x539bfb02, 0x3a277c32),
- TOBN(0xe699268e, 0xf9dccf5f), TOBN(0x9f5796a5, 0x0247a3bd),
- TOBN(0x8b839de8, 0x4f157269), TOBN(0xc825c1e5, 0x7a30196b),
- TOBN(0x6ef0aabc, 0xdc8a5a91), TOBN(0xf4a8ce6c, 0x498b7fe6),
- TOBN(0x1cce35a7, 0x70cbac78), TOBN(0x83488e9b, 0xf6b23958),
- TOBN(0x0341a070, 0xd76cb011), TOBN(0xda6c9d06, 0xae1b2658),
- TOBN(0xb701fb30, 0xdd648c52), TOBN(0x994ca02c, 0x52fb9fd1),
- TOBN(0x06933117, 0x6f563086), TOBN(0x3d2b8100, 0x17856bab),
- TOBN(0xe89f48c8, 0x5963a46e), TOBN(0x658ab875, 0xa99e61c7),
- TOBN(0x6e296f87, 0x4b8517b4), TOBN(0x36c4fcdc, 0xfc1bc656),
- TOBN(0xde5227a1, 0xa3906def), TOBN(0x9fe95f57, 0x62418945),
- TOBN(0x20c91e81, 0xfdd96cde), TOBN(0x5adbe47e, 0xda4480de),
- TOBN(0xa009370f, 0x396de2b6), TOBN(0x98583d4b, 0xf0ecc7bd),
- TOBN(0xf44f6b57, 0xe51d0672), TOBN(0x03d6b078, 0x556b1984),
- TOBN(0x27dbdd93, 0xb0b64912), TOBN(0x9b3a3434, 0x15687b09),
- TOBN(0x0dba6461, 0x51ec20a9), TOBN(0xec93db7f, 0xff28187c),
- TOBN(0x00ff8c24, 0x66e48bdd), TOBN(0x2514f2f9, 0x11ccd78e),
- TOBN(0xeba11f4f, 0xe1250603), TOBN(0x8a22cd41, 0x243fa156),
- TOBN(0xa4e58df4, 0xb283e4c6), TOBN(0x78c29859, 0x8b39783f),
- TOBN(0x5235aee2, 0xa5259809), TOBN(0xc16284b5, 0x0e0227dd),
- TOBN(0xa5f57916, 0x1338830d), TOBN(0x6d4b8a6b, 0xd2123fca),
- TOBN(0x236ea68a, 0xf9c546f8), TOBN(0xc1d36873, 0xfa608d36),
- TOBN(0xcd76e495, 0x8d436d13), TOBN(0xd4d9c221, 0x8fb080af),
- TOBN(0x665c1728, 0xe8ad3fb5), TOBN(0xcf1ebe4d, 0xb3d572e0),
- TOBN(0xa7a8746a, 0x584c5e20), TOBN(0x267e4ea1, 0xb9dc7035),
- TOBN(0x593a15cf, 0xb9548c9b), TOBN(0x5e6e2135, 0x4bd012f3),
- TOBN(0xdf31cc6a, 0x8c8f936e), TOBN(0x8af84d04, 0xb5c241dc),
- TOBN(0x63990a6f, 0x345efb86), TOBN(0x6fef4e61, 0xb9b962cb)}
- ,
- {TOBN(0xf6368f09, 0x25722608), TOBN(0x131260db, 0x131cf5c6),
- TOBN(0x40eb353b, 0xfab4f7ac), TOBN(0x85c78880, 0x37eee829),
- TOBN(0x4c1581ff, 0xc3bdf24e), TOBN(0x5bff75cb, 0xf5c3c5a8),
- TOBN(0x35e8c83f, 0xa14e6f40), TOBN(0xb81d1c0f, 0x0295e0ca),
- TOBN(0xfcde7cc8, 0xf43a730f), TOBN(0xe89b6f3c, 0x33ab590e),
- TOBN(0xc823f529, 0xad03240b), TOBN(0x82b79afe, 0x98bea5db),
- TOBN(0x568f2856, 0x962fe5de), TOBN(0x0c590adb, 0x60c591f3),
- TOBN(0x1fc74a14, 0x4a28a858), TOBN(0x3b662498, 0xb3203f4c),
- TOBN(0x91e3cf0d, 0x6c39765a), TOBN(0xa2db3acd, 0xac3cca0b),
- TOBN(0x288f2f08, 0xcb953b50), TOBN(0x2414582c, 0xcf43cf1a),
- TOBN(0x8dec8bbc, 0x60eee9a8), TOBN(0x54c79f02, 0x729aa042),
- TOBN(0xd81cd5ec, 0x6532f5d5), TOBN(0xa672303a, 0xcf82e15f),
- TOBN(0x376aafa8, 0x719c0563), TOBN(0xcd8ad2dc, 0xbc5fc79f),
- TOBN(0x303fdb9f, 0xcb750cd3), TOBN(0x14ff052f, 0x4418b08e),
- TOBN(0xf75084cf, 0x3e2d6520), TOBN(0x7ebdf0f8, 0x144ed509),
- TOBN(0xf43bf0f2, 0xd3f25b98), TOBN(0x86ad71cf, 0xa354d837),
- TOBN(0xb827fe92, 0x26f43572), TOBN(0xdfd3ab5b, 0x5d824758),
- TOBN(0x315dd23a, 0x539094c1), TOBN(0x85c0e37a, 0x66623d68),
- TOBN(0x575c7972, 0x7be19ae0), TOBN(0x616a3396, 0xdf0d36b5),
- TOBN(0xa1ebb3c8, 0x26b1ff7e), TOBN(0x635b9485, 0x140ad453),
- TOBN(0x92bf3cda, 0xda430c0b), TOBN(0x4702850e, 0x3a96dac6),
- TOBN(0xc91cf0a5, 0x15ac326a), TOBN(0x95de4f49, 0xab8c25e4),
- TOBN(0xb01bad09, 0xe265c17c), TOBN(0x24e45464, 0x087b3881),
- TOBN(0xd43e583c, 0xe1fac5ca), TOBN(0xe17cb318, 0x6ead97a6),
- TOBN(0x6cc39243, 0x74dcec46), TOBN(0x33cfc02d, 0x54c2b73f),
- TOBN(0x82917844, 0xf26cd99c), TOBN(0x8819dd95, 0xd1773f89),
- TOBN(0x09572aa6, 0x0871f427), TOBN(0x8e0cf365, 0xf6f01c34),
- TOBN(0x7fa52988, 0xbff1f5af), TOBN(0x4eb357ea, 0xe75e8e50),
- TOBN(0xd9d0c8c4, 0x868af75d), TOBN(0xd7325cff, 0x45c8c7ea),
- TOBN(0xab471996, 0xcc81ecb0), TOBN(0xff5d55f3, 0x611824ed),
- TOBN(0xbe314541, 0x1977a0ee), TOBN(0x5085c4c5, 0x722038c6),
- TOBN(0x2d5335bf, 0xf94bb495), TOBN(0x894ad8a6, 0xc8e2a082),
- TOBN(0x5c3e2341, 0xada35438), TOBN(0xf4a9fc89, 0x049b8c4e),
- TOBN(0xbeeb355a, 0x9f17cf34), TOBN(0x3f311e0e, 0x6c91fe10),
- TOBN(0xc2d20038, 0x92ab9891), TOBN(0x257bdcc1, 0x3e8ce9a9),
- TOBN(0x1b2d9789, 0x88c53bee), TOBN(0x927ce89a, 0xcdba143a),
- TOBN(0xb0a32cca, 0x523db280), TOBN(0x5c889f8a, 0x50d43783),
- TOBN(0x503e04b3, 0x4897d16f), TOBN(0x8cdb6e78, 0x08f5f2e8),
- TOBN(0x6ab91cf0, 0x179c8e74), TOBN(0xd8874e52, 0x48211d60),
- TOBN(0xf948d4d5, 0xea851200), TOBN(0x4076d41e, 0xe6f9840a),
- TOBN(0xc20e263c, 0x47b517ea), TOBN(0x79a448fd, 0x30685e5e),
- TOBN(0xe55f6f78, 0xf90631a0), TOBN(0x88a790b1, 0xa79e6346),
- TOBN(0x62160c7d, 0x80969fe8), TOBN(0x54f92fd4, 0x41491bb9),
- TOBN(0xa6645c23, 0x5c957526), TOBN(0xf44cc5ae, 0xbea3ce7b),
- TOBN(0xf7628327, 0x8b1e68b7), TOBN(0xc731ad7a, 0x303f29d3),
- TOBN(0xfe5a9ca9, 0x57d03ecb), TOBN(0x96c0d50c, 0x41bc97a7),
- TOBN(0xc4669fe7, 0x9b4f7f24), TOBN(0xfdd781d8, 0x3d9967ef),
- TOBN(0x7892c7c3, 0x5d2c208d), TOBN(0x8bf64f7c, 0xae545cb3),
- TOBN(0xc01f862c, 0x467be912), TOBN(0xf4c85ee9, 0xc73d30cc),
- TOBN(0x1fa6f4be, 0x6ab83ec7), TOBN(0xa07a3c1c, 0x4e3e3cf9),
- TOBN(0x87f8ef45, 0x0c00beb3), TOBN(0x30e2c2b3, 0x000d4c3e),
- TOBN(0x1aa00b94, 0xfe08bf5b), TOBN(0x32c133aa, 0x9224ef52),
- TOBN(0x38df16bb, 0x32e5685d), TOBN(0x68a9e069, 0x58e6f544),
- TOBN(0x495aaff7, 0xcdc5ebc6), TOBN(0xf894a645, 0x378b135f),
- TOBN(0xf316350a, 0x09e27ecf), TOBN(0xeced201e, 0x58f7179d),
- TOBN(0x2eec273c, 0xe97861ba), TOBN(0x47ec2cae, 0xd693be2e),
- TOBN(0xfa4c97c4, 0xf68367ce), TOBN(0xe4f47d0b, 0xbe5a5755),
- TOBN(0x17de815d, 0xb298a979), TOBN(0xd7eca659, 0xc177dc7d),
- TOBN(0x20fdbb71, 0x49ded0a3), TOBN(0x4cb2aad4, 0xfb34d3c5),
- TOBN(0x2cf31d28, 0x60858a33), TOBN(0x3b6873ef, 0xa24aa40f),
- TOBN(0x540234b2, 0x2c11bb37), TOBN(0x2d0366dd, 0xed4c74a3),
- TOBN(0xf9a968da, 0xeec5f25d), TOBN(0x36601068, 0x67b63142),
- TOBN(0x07cd6d2c, 0x68d7b6d4), TOBN(0xa8f74f09, 0x0c842942),
- TOBN(0xe2751404, 0x7768b1ee), TOBN(0x4b5f7e89, 0xfe62aee4),
- TOBN(0xc6a77177, 0x89070d26), TOBN(0xa1f28e4e, 0xdd1c8bc7),
- TOBN(0xea5f4f06, 0x469e1f17), TOBN(0x78fc242a, 0xfbdb78e0),
- TOBN(0xc9c7c592, 0x8b0588f1), TOBN(0xb6b7a0fd, 0x1535921e),
- TOBN(0xcc5bdb91, 0xbde5ae35), TOBN(0xb42c485e, 0x12ff1864),
- TOBN(0xa1113e13, 0xdbab98aa), TOBN(0xde9d469b, 0xa17b1024),
- TOBN(0x23f48b37, 0xc0462d3a), TOBN(0x3752e537, 0x7c5c078d),
- TOBN(0xe3a86add, 0x15544eb9), TOBN(0xf013aea7, 0x80fba279),
- TOBN(0x8b5bb76c, 0xf22001b5), TOBN(0xe617ba14, 0xf02891ab),
- TOBN(0xd39182a6, 0x936219d3), TOBN(0x5ce1f194, 0xae51cb19),
- TOBN(0xc78f8598, 0xbf07a74c), TOBN(0x6d7158f2, 0x22cbf1bc),
- TOBN(0x3b846b21, 0xe300ce18), TOBN(0x35fba630, 0x2d11275d),
- TOBN(0x5fe25c36, 0xa0239b9b), TOBN(0xd8beb35d, 0xdf05d940),
- TOBN(0x4db02bb0, 0x1f7e320d), TOBN(0x0641c364, 0x6da320ea),
- TOBN(0x6d95fa5d, 0x821389a3), TOBN(0x92699748, 0x8fcd8e3d),
- TOBN(0x316fef17, 0xceb6c143), TOBN(0x67fcb841, 0xd933762b),
- TOBN(0xbb837e35, 0x118b17f8), TOBN(0x4b92552f, 0x9fd24821),
- TOBN(0xae6bc70e, 0x46aca793), TOBN(0x1cf0b0e4, 0xe579311b),
- TOBN(0x8dc631be, 0x5802f716), TOBN(0x099bdc6f, 0xbddbee4d),
- TOBN(0xcc352bb2, 0x0caf8b05), TOBN(0xf74d505a, 0x72d63df2),
- TOBN(0xb9876d4b, 0x91c4f408), TOBN(0x1ce18473, 0x9e229b2d),
- TOBN(0x49507597, 0x83abdb4a), TOBN(0x850fbcb6, 0xdee84b18),
- TOBN(0x6325236e, 0x609e67dc), TOBN(0x04d831d9, 0x9336c6d8),
- TOBN(0x8deaae3b, 0xfa12d45d), TOBN(0xe425f8ce, 0x4746e246),
- TOBN(0x8004c175, 0x24f5f31e), TOBN(0xaca16d8f, 0xad62c3b7),
- TOBN(0x0dc15a6a, 0x9152f934), TOBN(0xf1235e5d, 0xed0e12c1),
- TOBN(0xc33c06ec, 0xda477dac), TOBN(0x76be8732, 0xb2ea0006),
- TOBN(0xcf3f7831, 0x0c0cd313), TOBN(0x3c524553, 0xa614260d),
- TOBN(0x31a756f8, 0xcab22d15), TOBN(0x03ee10d1, 0x77827a20),
- TOBN(0xd1e059b2, 0x1994ef20), TOBN(0x2a653b69, 0x638ae318),
- TOBN(0x70d5eb58, 0x2f699010), TOBN(0x279739f7, 0x09f5f84a),
- TOBN(0x5da4663c, 0x8b799336), TOBN(0xfdfdf14d, 0x203c37eb),
- TOBN(0x32d8a9dc, 0xa1dbfb2d), TOBN(0xab40cff0, 0x77d48f9b),
- TOBN(0xc018b383, 0xd20b42d5), TOBN(0xf9a810ef, 0x9f78845f),
- TOBN(0x40af3753, 0xbdba9df0), TOBN(0xb90bdcfc, 0x131dfdf9),
- TOBN(0x18720591, 0xf01ab782), TOBN(0xc823f211, 0x6af12a88),
- TOBN(0xa51b80f3, 0x0dc14401), TOBN(0xde248f77, 0xfb2dfbe3),
- TOBN(0xef5a44e5, 0x0cafe751), TOBN(0x73997c9c, 0xd4dcd221),
- TOBN(0x32fd86d1, 0xde854024), TOBN(0xd5b53adc, 0xa09b84bb),
- TOBN(0x008d7a11, 0xdcedd8d1), TOBN(0x406bd1c8, 0x74b32c84),
- TOBN(0x5d4472ff, 0x05dde8b1), TOBN(0x2e25f2cd, 0xfce2b32f),
- TOBN(0xbec0dd5e, 0x29dfc254), TOBN(0x4455fcf6, 0x2b98b267),
- TOBN(0x0b4d43a5, 0xc72df2ad), TOBN(0xea70e6be, 0x48a75397),
- TOBN(0x2aad6169, 0x5820f3bf), TOBN(0xf410d2dd, 0x9e37f68f),
- TOBN(0x70fb7dba, 0x7be5ac83), TOBN(0x636bb645, 0x36ec3eec),
- TOBN(0x27104ea3, 0x9754e21c), TOBN(0xbc87a3e6, 0x8d63c373),
- TOBN(0x483351d7, 0x4109db9a), TOBN(0x0fa724e3, 0x60134da7),
- TOBN(0x9ff44c29, 0xb0720b16), TOBN(0x2dd0cf13, 0x06aceead),
- TOBN(0x5942758c, 0xe26929a6), TOBN(0x96c5db92, 0xb766a92b),
- TOBN(0xcec7d4c0, 0x5f18395e), TOBN(0xd3f22744, 0x1f80d032),
- TOBN(0x7a68b37a, 0xcb86075b), TOBN(0x074764dd, 0xafef92db),
- TOBN(0xded1e950, 0x7bc7f389), TOBN(0xc580c850, 0xb9756460),
- TOBN(0xaeeec2a4, 0x7da48157), TOBN(0x3f0b4e7f, 0x82c587b3),
- TOBN(0x231c6de8, 0xa9f19c53), TOBN(0x5717bd73, 0x6974e34e),
- TOBN(0xd9e1d216, 0xf1508fa9), TOBN(0x9f112361, 0xdadaa124),
- TOBN(0x80145e31, 0x823b7348), TOBN(0x4dd8f0d5, 0xac634069),
- TOBN(0xe3d82fc7, 0x2297c258), TOBN(0x276fcfee, 0x9cee7431),
- TOBN(0x8eb61b5e, 0x2bc0aea9), TOBN(0x4f668fd5, 0xde329431),
- TOBN(0x03a32ab1, 0x38e4b87e), TOBN(0xe1374517, 0x73d0ef0b),
- TOBN(0x1a46f7e6, 0x853ac983), TOBN(0xc3bdf42e, 0x68e78a57),
- TOBN(0xacf20785, 0x2ea96dd1), TOBN(0xa10649b9, 0xf1638460),
- TOBN(0xf2369f0b, 0x879fbbed), TOBN(0x0ff0ae86, 0xda9d1869),
- TOBN(0x5251d759, 0x56766f45), TOBN(0x4984d8c0, 0x2be8d0fc),
- TOBN(0x7ecc95a6, 0xd21008f0), TOBN(0x29bd54a0, 0x3a1a1c49),
- TOBN(0xab9828c5, 0xd26c50f3), TOBN(0x32c0087c, 0x51d0d251),
- TOBN(0x9bac3ce6, 0x0c1cdb26), TOBN(0xcd94d947, 0x557ca205),
- TOBN(0x1b1bd598, 0x9db1fdcd), TOBN(0x0eda0108, 0xa3d8b149),
- TOBN(0x95066610, 0x56152fcc), TOBN(0xc2f037e6, 0xe7192b33),
- TOBN(0xdeffb41a, 0xc92e05a4), TOBN(0x1105f6c2, 0xc2f6c62e),
- TOBN(0x68e73500, 0x8733913c), TOBN(0xcce86163, 0x3f3adc40),
- TOBN(0xf407a942, 0x38a278e9), TOBN(0xd13c1b9d, 0x2ab21292),
- TOBN(0x93ed7ec7, 0x1c74cf5c), TOBN(0x8887dc48, 0xf1a4c1b4),
- TOBN(0x3830ff30, 0x4b3a11f1), TOBN(0x358c5a3c, 0x58937cb6),
- TOBN(0x027dc404, 0x89022829), TOBN(0x40e93977, 0x3b798f79),
- TOBN(0x90ad3337, 0x38be6ead), TOBN(0x9c23f6bc, 0xf34c0a5d),
- TOBN(0xd1711a35, 0xfbffd8bb), TOBN(0x60fcfb49, 0x1949d3dd),
- TOBN(0x09c8ef4b, 0x7825d93a), TOBN(0x24233cff, 0xa0a8c968),
- TOBN(0x67ade46c, 0xe6d982af), TOBN(0xebb6bf3e, 0xe7544d7c),
- TOBN(0xd6b9ba76, 0x3d8bd087), TOBN(0x46fe382d, 0x4dc61280),
- TOBN(0xbd39a7e8, 0xb5bdbd75), TOBN(0xab381331, 0xb8f228fe),
- TOBN(0x0709a77c, 0xce1c4300), TOBN(0x6a247e56, 0xf337ceac),
- TOBN(0x8f34f21b, 0x636288be), TOBN(0x9dfdca74, 0xc8a7c305),
- TOBN(0x6decfd1b, 0xea919e04), TOBN(0xcdf2688d, 0x8e1991f8),
- TOBN(0xe607df44, 0xd0f8a67e), TOBN(0xd985df4b, 0x0b58d010),
- TOBN(0x57f834c5, 0x0c24f8f4), TOBN(0xe976ef56, 0xa0bf01ae),
- TOBN(0x536395ac, 0xa1c32373), TOBN(0x351027aa, 0x734c0a13),
- TOBN(0xd2f1b5d6, 0x5e6bd5bc), TOBN(0x2b539e24, 0x223debed),
- TOBN(0xd4994cec, 0x0eaa1d71), TOBN(0x2a83381d, 0x661dcf65),
- TOBN(0x5f1aed2f, 0x7b54c740), TOBN(0x0bea3fa5, 0xd6dda5ee),
- TOBN(0x9d4fb684, 0x36cc6134), TOBN(0x8eb9bbf3, 0xc0a443dd),
- TOBN(0xfc500e2e, 0x383b7d2a), TOBN(0x7aad621c, 0x5b775257),
- TOBN(0x69284d74, 0x0a8f7cc0), TOBN(0xe820c2ce, 0x07562d65),
- TOBN(0xbf9531b9, 0x499758ee), TOBN(0x73e95ca5, 0x6ee0cc2d),
- TOBN(0xf61790ab, 0xfbaf50a5), TOBN(0xdf55e76b, 0x684e0750),
- TOBN(0xec516da7, 0xf176b005), TOBN(0x575553bb, 0x7a2dddc7),
- TOBN(0x37c87ca3, 0x553afa73), TOBN(0x315f3ffc, 0x4d55c251),
- TOBN(0xe846442a, 0xaf3e5d35), TOBN(0x61b91149, 0x6495ff28),
- TOBN(0x23cc95d3, 0xfa326dc3), TOBN(0x1df4da1f, 0x18fc2cea),
- TOBN(0x24bf9adc, 0xd0a37d59), TOBN(0xb6710053, 0x320d6e1e),
- TOBN(0x96f9667e, 0x618344d1), TOBN(0xcc7ce042, 0xa06445af),
- TOBN(0xa02d8514, 0xd68dbc3a), TOBN(0x4ea109e4, 0x280b5a5b),
- TOBN(0x5741a7ac, 0xb40961bf), TOBN(0x4ada5937, 0x6aa56bfa),
- TOBN(0x7feb9145, 0x02b765d1), TOBN(0x561e97be, 0xe6ad1582),
- TOBN(0xbbc4a5b6, 0xda3982f5), TOBN(0x0c2659ed, 0xb546f468),
- TOBN(0xb8e7e6aa, 0x59612d20), TOBN(0xd83dfe20, 0xac19e8e0),
- TOBN(0x8530c45f, 0xb835398c), TOBN(0x6106a8bf, 0xb38a41c2),
- TOBN(0x21e8f9a6, 0x35f5dcdb), TOBN(0x39707137, 0xcae498ed),
- TOBN(0x70c23834, 0xd8249f00), TOBN(0x9f14b58f, 0xab2537a0),
- TOBN(0xd043c365, 0x5f61c0c2), TOBN(0xdc5926d6, 0x09a194a7),
- TOBN(0xddec0339, 0x8e77738a), TOBN(0xd07a63ef, 0xfba46426),
- TOBN(0x2e58e79c, 0xee7f6e86), TOBN(0xe59b0459, 0xff32d241),
- TOBN(0xc5ec84e5, 0x20fa0338), TOBN(0x97939ac8, 0xeaff5ace),
- TOBN(0x0310a4e3, 0xb4a38313), TOBN(0x9115fba2, 0x8f9d9885),
- TOBN(0x8dd710c2, 0x5fadf8c3), TOBN(0x66be38a2, 0xce19c0e2),
- TOBN(0xd42a279c, 0x4cfe5022), TOBN(0x597bb530, 0x0e24e1b8),
- TOBN(0x3cde86b7, 0xc153ca7f), TOBN(0xa8d30fb3, 0x707d63bd),
- TOBN(0xac905f92, 0xbd60d21e), TOBN(0x98e7ffb6, 0x7b9a54ab),
- TOBN(0xd7147df8, 0xe9726a30), TOBN(0xb5e216ff, 0xafce3533),
- TOBN(0xb550b799, 0x2ff1ec40), TOBN(0x6b613b87, 0xa1e953fd),
- TOBN(0x87b88dba, 0x792d5610), TOBN(0x2ee1270a, 0xa190fbe1),
- TOBN(0x02f4e2dc, 0x2ef581da), TOBN(0x016530e4, 0xeff82a95),
- TOBN(0xcbb93dfd, 0x8fd6ee89), TOBN(0x16d3d986, 0x46848fff),
- TOBN(0x600eff24, 0x1da47adf), TOBN(0x1b9754a0, 0x0ad47a71),
- TOBN(0x8f9266df, 0x70c33b98), TOBN(0xaadc87ae, 0xdf34186e),
- TOBN(0x0d2ce8e1, 0x4ad24132), TOBN(0x8a47cbfc, 0x19946eba),
- TOBN(0x47feeb66, 0x62b5f3af), TOBN(0xcefab561, 0x0abb3734),
- TOBN(0x449de60e, 0x19f35cb1), TOBN(0x39f8db14, 0x157f0eb9),
- TOBN(0xffaecc5b, 0x3c61bfd6), TOBN(0xa5a4d41d, 0x41216703),
- TOBN(0x7f8fabed, 0x224e1cc2), TOBN(0x0d5a8186, 0x871ad953),
- TOBN(0xf10774f7, 0xd22da9a9), TOBN(0x45b8a678, 0xcc8a9b0d),
- TOBN(0xd9c2e722, 0xbdc32cff), TOBN(0xbf71b5f5, 0x337202a5),
- TOBN(0x95c57f2f, 0x69fc4db9), TOBN(0xb6dad34c, 0x765d01e1),
- TOBN(0x7e0bd13f, 0xcb904635), TOBN(0x61751253, 0x763a588c),
- TOBN(0xd85c2997, 0x81af2c2d), TOBN(0xc0f7d9c4, 0x81b9d7da),
- TOBN(0x838a34ae, 0x08533e8d), TOBN(0x15c4cb08, 0x311d8311),
- TOBN(0x97f83285, 0x8e121e14), TOBN(0xeea7dc1e, 0x85000a5f),
- TOBN(0x0c6059b6, 0x5d256274), TOBN(0xec9beace, 0xb95075c0),
- TOBN(0x173daad7, 0x1df97828), TOBN(0xbf851cb5, 0xa8937877),
- TOBN(0xb083c594, 0x01646f3c), TOBN(0x3bad30cf, 0x50c6d352),
- TOBN(0xfeb2b202, 0x496bbcea), TOBN(0x3cf9fd4f, 0x18a1e8ba),
- TOBN(0xd26de7ff, 0x1c066029), TOBN(0x39c81e9e, 0x4e9ed4f8),
- TOBN(0xd8be0cb9, 0x7b390d35), TOBN(0x01df2bbd, 0x964aab27),
- TOBN(0x3e8c1a65, 0xc3ef64f8), TOBN(0x567291d1, 0x716ed1dd),
- TOBN(0x95499c6c, 0x5f5406d3), TOBN(0x71fdda39, 0x5ba8e23f),
- TOBN(0xcfeb320e, 0xd5096ece), TOBN(0xbe7ba92b, 0xca66dd16),
- TOBN(0x4608d36b, 0xc6fb5a7d), TOBN(0xe3eea15a, 0x6d2dd0e0),
- TOBN(0x75b0a3eb, 0x8f97a36a), TOBN(0xf59814cc, 0x1c83de1e),
- TOBN(0x56c9c5b0, 0x1c33c23f), TOBN(0xa96c1da4, 0x6faa4136),
- TOBN(0x46bf2074, 0xde316551), TOBN(0x3b866e7b, 0x1f756c8f),
- TOBN(0x727727d8, 0x1495ed6b), TOBN(0xb2394243, 0xb682dce7),
- TOBN(0x8ab8454e, 0x758610f3), TOBN(0xc243ce84, 0x857d72a4),
- TOBN(0x7b320d71, 0xdbbf370f), TOBN(0xff9afa37, 0x78e0f7ca),
- TOBN(0x0119d1e0, 0xea7b523f), TOBN(0xb997f8cb, 0x058c7d42),
- TOBN(0x285bcd2a, 0x37bbb184), TOBN(0x51dcec49, 0xa45d1fa6),
- TOBN(0x6ade3b64, 0xe29634cb), TOBN(0x080c94a7, 0x26b86ef1),
- TOBN(0xba583db1, 0x2283fbe3), TOBN(0x902bddc8, 0x5a9315ed),
- TOBN(0x07c1ccb3, 0x86964bec), TOBN(0x78f4eacf, 0xb6258301),
- TOBN(0x4bdf3a49, 0x56f90823), TOBN(0xba0f5080, 0x741d777b),
- TOBN(0x091d71c3, 0xf38bf760), TOBN(0x9633d50f, 0x9b625b02),
- TOBN(0x03ecb743, 0xb8c9de61), TOBN(0xb4751254, 0x5de74720),
- TOBN(0x9f9defc9, 0x74ce1cb2), TOBN(0x774a4f6a, 0x00bd32ef),
- TOBN(0xaca385f7, 0x73848f22), TOBN(0x53dad716, 0xf3f8558e),
- TOBN(0xab7b34b0, 0x93c471f9), TOBN(0xf530e069, 0x19644bc7),
- TOBN(0x3d9fb1ff, 0xdd59d31a), TOBN(0x4382e0df, 0x08daa795),
- TOBN(0x165c6f4b, 0xd5cc88d7), TOBN(0xeaa392d5, 0x4a18c900),
- TOBN(0x94203c67, 0x648024ee), TOBN(0x188763f2, 0x8c2fabcd),
- TOBN(0xa80f87ac, 0xbbaec835), TOBN(0x632c96e0, 0xf29d8d54),
- TOBN(0x29b0a60e, 0x4c00a95e), TOBN(0x2ef17f40, 0xe011e9fa),
- TOBN(0xf6c0e1d1, 0x15b77223), TOBN(0xaaec2c62, 0x14b04e32),
- TOBN(0xd35688d8, 0x3d84e58c), TOBN(0x2af5094c, 0x958571db),
- TOBN(0x4fff7e19, 0x760682a6), TOBN(0x4cb27077, 0xe39a407c),
- TOBN(0x0f59c547, 0x4ff0e321), TOBN(0x169f34a6, 0x1b34c8ff),
- TOBN(0x2bff1096, 0x52bc1ba7), TOBN(0xa25423b7, 0x83583544),
- TOBN(0x5d55d5d5, 0x0ac8b782), TOBN(0xff6622ec, 0x2db3c892),
- TOBN(0x48fce741, 0x6b8bb642), TOBN(0x31d6998c, 0x69d7e3dc),
- TOBN(0xdbaf8004, 0xcadcaed0), TOBN(0x801b0142, 0xd81d053c),
- TOBN(0x94b189fc, 0x59630ec6), TOBN(0x120e9934, 0xaf762c8e),
- TOBN(0x53a29aa4, 0xfdc6a404), TOBN(0x19d8e01e, 0xa1909948),
- TOBN(0x3cfcabf1, 0xd7e89681), TOBN(0x3321a50d, 0x4e132d37),
- TOBN(0xd0496863, 0xe9a86111), TOBN(0x8c0cde61, 0x06a3bc65),
- TOBN(0xaf866c49, 0xfc9f8eef), TOBN(0x2066350e, 0xff7f5141),
- TOBN(0x4f8a4689, 0xe56ddfbd), TOBN(0xea1b0c07, 0xfe32983a),
- TOBN(0x2b317462, 0x873cb8cb), TOBN(0x658deddc, 0x2d93229f),
- TOBN(0x65efaf4d, 0x0f64ef58), TOBN(0xfe43287d, 0x730cc7a8),
- TOBN(0xaebc0c72, 0x3d047d70), TOBN(0x92efa539, 0xd92d26c9),
- TOBN(0x06e78457, 0x94b56526), TOBN(0x415cb80f, 0x0961002d),
- TOBN(0x89e5c565, 0x76dcb10f), TOBN(0x8bbb6982, 0xff9259fe),
- TOBN(0x4fe8795b, 0x9abc2668), TOBN(0xb5d4f534, 0x1e678fb1),
- TOBN(0x6601f3be, 0x7b7da2b9), TOBN(0x98da59e2, 0xa13d6805),
- TOBN(0x190d8ea6, 0x01799a52), TOBN(0xa20cec41, 0xb86d2952),
- TOBN(0x3062ffb2, 0x7fff2a7c), TOBN(0x741b32e5, 0x79f19d37),
- TOBN(0xf80d8181, 0x4eb57d47), TOBN(0x7a2d0ed4, 0x16aef06b),
- TOBN(0x09735fb0, 0x1cecb588), TOBN(0x1641caaa, 0xc6061f5b)}
- ,
- {TOBN(0x7f99824f, 0x20151427), TOBN(0x206828b6, 0x92430206),
- TOBN(0xaa9097d7, 0xe1112357), TOBN(0xacf9a2f2, 0x09e414ec),
- TOBN(0xdbdac9da, 0x27915356), TOBN(0x7e0734b7, 0x001efee3),
- TOBN(0x54fab5bb, 0xd2b288e2), TOBN(0x4c630fc4, 0xf62dd09c),
- TOBN(0x8537107a, 0x1ac2703b), TOBN(0xb49258d8, 0x6bc857b5),
- TOBN(0x57df14de, 0xbcdaccd1), TOBN(0x24ab68d7, 0xc4ae8529),
- TOBN(0x7ed8b5d4, 0x734e59d0), TOBN(0x5f8740c8, 0xc495cc80),
- TOBN(0x84aedd5a, 0x291db9b3), TOBN(0x80b360f8, 0x4fb995be),
- TOBN(0xae915f5d, 0x5fa067d1), TOBN(0x4134b57f, 0x9668960c),
- TOBN(0xbd3656d6, 0xa48edaac), TOBN(0xdac1e3e4, 0xfc1d7436),
- TOBN(0x674ff869, 0xd81fbb26), TOBN(0x449ed3ec, 0xb26c33d4),
- TOBN(0x85138705, 0xd94203e8), TOBN(0xccde538b, 0xbeeb6f4a),
- TOBN(0x55d5c68d, 0xa61a76fa), TOBN(0x598b441d, 0xca1554dc),
- TOBN(0xd39923b9, 0x773b279c), TOBN(0x33331d3c, 0x36bf9efc),
- TOBN(0x2d4c848e, 0x298de399), TOBN(0xcfdb8e77, 0xa1a27f56),
- TOBN(0x94c855ea, 0x57b8ab70), TOBN(0xdcdb9dae, 0x6f7879ba),
- TOBN(0x7bdff8c2, 0x019f2a59), TOBN(0xb3ce5bb3, 0xcb4fbc74),
- TOBN(0xea907f68, 0x8a9173dd), TOBN(0x6cd3d0d3, 0x95a75439),
- TOBN(0x92ecc4d6, 0xefed021c), TOBN(0x09a9f9b0, 0x6a77339a),
- TOBN(0x87ca6b15, 0x7188c64a), TOBN(0x10c29968, 0x44899158),
- TOBN(0x5859a229, 0xed6e82ef), TOBN(0x16f338e3, 0x65ebaf4e),
- TOBN(0x0cd31387, 0x5ead67ae), TOBN(0x1c73d228, 0x54ef0bb4),
- TOBN(0x4cb55131, 0x74a5c8c7), TOBN(0x01cd2970, 0x7f69ad6a),
- TOBN(0xa04d00dd, 0xe966f87e), TOBN(0xd96fe447, 0x0b7b0321),
- TOBN(0x342ac06e, 0x88fbd381), TOBN(0x02cd4a84, 0x5c35a493),
- TOBN(0xe8fa89de, 0x54f1bbcd), TOBN(0x341d6367, 0x2575ed4c),
- TOBN(0xebe357fb, 0xd238202b), TOBN(0x600b4d1a, 0xa984ead9),
- TOBN(0xc35c9f44, 0x52436ea0), TOBN(0x96fe0a39, 0xa370751b),
- TOBN(0x4c4f0736, 0x7f636a38), TOBN(0x9f943fb7, 0x0e76d5cb),
- TOBN(0xb03510ba, 0xa8b68b8b), TOBN(0xc246780a, 0x9ed07a1f),
- TOBN(0x3c051415, 0x6d549fc2), TOBN(0xc2953f31, 0x607781ca),
- TOBN(0x955e2c69, 0xd8d95413), TOBN(0xb300fadc, 0x7bd282e3),
- TOBN(0x81fe7b50, 0x87e9189f), TOBN(0xdb17375c, 0xf42dda27),
- TOBN(0x22f7d896, 0xcf0a5904), TOBN(0xa0e57c5a, 0xebe348e6),
- TOBN(0xa61011d3, 0xf40e3c80), TOBN(0xb1189321, 0x8db705c5),
- TOBN(0x4ed9309e, 0x50fedec3), TOBN(0xdcf14a10, 0x4d6d5c1d),
- TOBN(0x056c265b, 0x55691342), TOBN(0xe8e08504, 0x91049dc7),
- TOBN(0x131329f5, 0xc9bae20a), TOBN(0x96c8b3e8, 0xd9dccdb4),
- TOBN(0x8c5ff838, 0xfb4ee6b4), TOBN(0xfc5a9aeb, 0x41e8ccf0),
- TOBN(0x7417b764, 0xfae050c6), TOBN(0x0953c3d7, 0x00452080),
- TOBN(0x21372682, 0x38dfe7e8), TOBN(0xea417e15, 0x2bb79d4b),
- TOBN(0x59641f1c, 0x76e7cf2d), TOBN(0x271e3059, 0xea0bcfcc),
- TOBN(0x624c7dfd, 0x7253ecbd), TOBN(0x2f552e25, 0x4fca6186),
- TOBN(0xcbf84ecd, 0x4d866e9c), TOBN(0x73967709, 0xf68d4610),
- TOBN(0xa14b1163, 0xc27901b4), TOBN(0xfd9236e0, 0x899b8bf3),
- TOBN(0x42b091ec, 0xcbc6da0a), TOBN(0xbb1dac6f, 0x5ad1d297),
- TOBN(0x80e61d53, 0xa91cf76e), TOBN(0x4110a412, 0xd31f1ee7),
- TOBN(0x2d87c3ba, 0x13efcf77), TOBN(0x1f374bb4, 0xdf450d76),
- TOBN(0x5e78e2f2, 0x0d188dab), TOBN(0xe3968ed0, 0xf4b885ef),
- TOBN(0x46c0568e, 0x7314570f), TOBN(0x31616338, 0x01170521),
- TOBN(0x18e1e7e2, 0x4f0c8afe), TOBN(0x4caa75ff, 0xdeea78da),
- TOBN(0x82db67f2, 0x7c5d8a51), TOBN(0x36a44d86, 0x6f505370),
- TOBN(0xd72c5bda, 0x0333974f), TOBN(0x5db516ae, 0x27a70146),
- TOBN(0x34705281, 0x210ef921), TOBN(0xbff17a8f, 0x0c9c38e5),
- TOBN(0x78f4814e, 0x12476da1), TOBN(0xc1e16613, 0x33c16980),
- TOBN(0x9e5b386f, 0x424d4bca), TOBN(0x4c274e87, 0xc85740de),
- TOBN(0xb6a9b88d, 0x6c2f5226), TOBN(0x14d1b944, 0x550d7ca8),
- TOBN(0x580c85fc, 0x1fc41709), TOBN(0xc1da368b, 0x54c6d519),
- TOBN(0x2b0785ce, 0xd5113cf7), TOBN(0x0670f633, 0x5a34708f),
- TOBN(0x46e23767, 0x15cc3f88), TOBN(0x1b480cfa, 0x50c72c8f),
- TOBN(0x20288602, 0x4147519a), TOBN(0xd0981eac, 0x26b372f0),
- TOBN(0xa9d4a7ca, 0xa785ebc8), TOBN(0xd953c50d, 0xdbdf58e9),
- TOBN(0x9d6361cc, 0xfd590f8f), TOBN(0x72e9626b, 0x44e6c917),
- TOBN(0x7fd96110, 0x22eb64cf), TOBN(0x863ebb7e, 0x9eb288f3),
- TOBN(0x6e6ab761, 0x6aca8ee7), TOBN(0x97d10b39, 0xd7b40358),
- TOBN(0x1687d377, 0x1e5feb0d), TOBN(0xc83e50e4, 0x8265a27a),
- TOBN(0x8f75a9fe, 0xc954b313), TOBN(0xcc2e8f47, 0x310d1f61),
- TOBN(0xf5ba81c5, 0x6557d0e0), TOBN(0x25f9680c, 0x3eaf6207),
- TOBN(0xf95c6609, 0x4354080b), TOBN(0x5225bfa5, 0x7bf2fe1c),
- TOBN(0xc5c004e2, 0x5c7d98fa), TOBN(0x3561bf1c, 0x019aaf60),
- TOBN(0x5e6f9f17, 0xba151474), TOBN(0xdec2f934, 0xb04f6eca),
- TOBN(0x64e368a1, 0x269acb1e), TOBN(0x1332d9e4, 0x0cdda493),
- TOBN(0x60d6cf69, 0xdf23de05), TOBN(0x66d17da2, 0x009339a0),
- TOBN(0x9fcac985, 0x0a693923), TOBN(0xbcf057fc, 0xed7c6a6d),
- TOBN(0xc3c5c8c5, 0xf0b5662c), TOBN(0x25318dd8, 0xdcba4f24),
- TOBN(0x60e8cb75, 0x082b69ff), TOBN(0x7c23b3ee, 0x1e728c01),
- TOBN(0x15e10a0a, 0x097e4403), TOBN(0xcb3d0a86, 0x19854665),
- TOBN(0x88d8e211, 0xd67d4826), TOBN(0xb39af66e, 0x0b9d2839),
- TOBN(0xa5f94588, 0xbd475ca8), TOBN(0xe06b7966, 0xc077b80b),
- TOBN(0xfedb1485, 0xda27c26c), TOBN(0xd290d33a, 0xfe0fd5e0),
- TOBN(0xa40bcc47, 0xf34fb0fa), TOBN(0xb4760cc8, 0x1fb1ab09),
- TOBN(0x8fca0993, 0xa273bfe3), TOBN(0x13e4fe07, 0xf70b213c),
- TOBN(0x3bcdb992, 0xfdb05163), TOBN(0x8c484b11, 0x0c2b19b6),
- TOBN(0x1acb815f, 0xaaf2e3e2), TOBN(0xc6905935, 0xb89ff1b4),
- TOBN(0xb2ad6f9d, 0x586e74e1), TOBN(0x488883ad, 0x67b80484),
- TOBN(0x758aa2c7, 0x369c3ddb), TOBN(0x8ab74e69, 0x9f9afd31),
- TOBN(0x10fc2d28, 0x5e21beb1), TOBN(0x3484518a, 0x318c42f9),
- TOBN(0x377427dc, 0x53cf40c3), TOBN(0x9de0781a, 0x391bc1d9),
- TOBN(0x8faee858, 0x693807e1), TOBN(0xa3865327, 0x4e81ccc7),
- TOBN(0x02c30ff2, 0x6f835b84), TOBN(0xb604437b, 0x0d3d38d4),
- TOBN(0xb3fc8a98, 0x5ca1823d), TOBN(0xb82f7ec9, 0x03be0324),
- TOBN(0xee36d761, 0xcf684a33), TOBN(0x5a01df0e, 0x9f29bf7d),
- TOBN(0x686202f3, 0x1306583d), TOBN(0x05b10da0, 0x437c622e),
- TOBN(0xbf9aaa0f, 0x076a7bc8), TOBN(0x25e94efb, 0x8f8f4e43),
- TOBN(0x8a35c9b7, 0xfa3dc26d), TOBN(0xe0e5fb93, 0x96ff03c5),
- TOBN(0xa77e3843, 0xebc394ce), TOBN(0xcede6595, 0x8361de60),
- TOBN(0xd27c22f6, 0xa1993545), TOBN(0xab01cc36, 0x24d671ba),
- TOBN(0x63fa2877, 0xa169c28e), TOBN(0x925ef904, 0x2eb08376),
- TOBN(0x3b2fa3cf, 0x53aa0b32), TOBN(0xb27beb5b, 0x71c49d7a),
- TOBN(0xb60e1834, 0xd105e27f), TOBN(0xd6089788, 0x4f68570d),
- TOBN(0x23094ce0, 0xd6fbc2ac), TOBN(0x738037a1, 0x815ff551),
- TOBN(0xda73b1bb, 0x6bef119c), TOBN(0xdcf6c430, 0xeef506ba),
- TOBN(0x00e4fe7b, 0xe3ef104a), TOBN(0xebdd9a2c, 0x0a065628),
- TOBN(0x853a81c3, 0x8792043e), TOBN(0x22ad6ece, 0xb3b59108),
- TOBN(0x9fb813c0, 0x39cd297d), TOBN(0x8ec7e16e, 0x05bda5d9),
- TOBN(0x2834797c, 0x0d104b96), TOBN(0xcc11a2e7, 0x7c511510),
- TOBN(0x96ca5a53, 0x96ee6380), TOBN(0x054c8655, 0xcea38742),
- TOBN(0xb5946852, 0xd54dfa7d), TOBN(0x97c422e7, 0x1f4ab207),
- TOBN(0xbf907509, 0x0c22b540), TOBN(0x2cde42aa, 0xb7c267d4),
- TOBN(0xba18f9ed, 0x5ab0d693), TOBN(0x3ba62aa6, 0x6e4660d9),
- TOBN(0xb24bf97b, 0xab9ea96a), TOBN(0x5d039642, 0xe3b60e32),
- TOBN(0x4e6a4506, 0x7c4d9bd5), TOBN(0x666c5b9e, 0x7ed4a6a4),
- TOBN(0xfa3fdcd9, 0x8edbd7cc), TOBN(0x4660bb87, 0xc6ccd753),
- TOBN(0x9ae90820, 0x21e6b64f), TOBN(0x8a56a713, 0xb36bfb3f),
- TOBN(0xabfce096, 0x5726d47f), TOBN(0x9eed01b2, 0x0b1a9a7f),
- TOBN(0x30e9cad4, 0x4eb74a37), TOBN(0x7b2524cc, 0x53e9666d),
- TOBN(0x6a29683b, 0x8f4b002f), TOBN(0xc2200d7a, 0x41f4fc20),
- TOBN(0xcf3af47a, 0x3a338acc), TOBN(0x6539a4fb, 0xe7128975),
- TOBN(0xcec31c14, 0xc33c7fcf), TOBN(0x7eb6799b, 0xc7be322b),
- TOBN(0x119ef4e9, 0x6646f623), TOBN(0x7b7a26a5, 0x54d7299b),
- TOBN(0xcb37f08d, 0x403f46f2), TOBN(0x94b8fc43, 0x1a0ec0c7),
- TOBN(0xbb8514e3, 0xc332142f), TOBN(0xf3ed2c33, 0xe80d2a7a),
- TOBN(0x8d2080af, 0xb639126c), TOBN(0xf7b6be60, 0xe3553ade),
- TOBN(0x3950aa9f, 0x1c7e2b09), TOBN(0x847ff958, 0x6410f02b),
- TOBN(0x877b7cf5, 0x678a31b0), TOBN(0xd50301ae, 0x3998b620),
- TOBN(0x734257c5, 0xc00fb396), TOBN(0xf9fb18a0, 0x04e672a6),
- TOBN(0xff8bd8eb, 0xe8758851), TOBN(0x1e64e4c6, 0x5d99ba44),
- TOBN(0x4b8eaedf, 0x7dfd93b7), TOBN(0xba2f2a98, 0x04e76b8c),
- TOBN(0x7d790cba, 0xe8053433), TOBN(0xc8e725a0, 0x3d2c9585),
- TOBN(0x58c5c476, 0xcdd8f5ed), TOBN(0xd106b952, 0xefa9fe1d),
- TOBN(0x3c5c775b, 0x0eff13a9), TOBN(0x242442ba, 0xe057b930),
- TOBN(0xe9f458d4, 0xc9b70cbd), TOBN(0x69b71448, 0xa3cdb89a),
- TOBN(0x41ee46f6, 0x0e2ed742), TOBN(0x573f1045, 0x40067493),
- TOBN(0xb1e154ff, 0x9d54c304), TOBN(0x2ad0436a, 0x8d3a7502),
- TOBN(0xee4aaa2d, 0x431a8121), TOBN(0xcd38b3ab, 0x886f11ed),
- TOBN(0x57d49ea6, 0x034a0eb7), TOBN(0xd2b773bd, 0xf7e85e58),
- TOBN(0x4a559ac4, 0x9b5c1f14), TOBN(0xc444be1a, 0x3e54df2b),
- TOBN(0x13aad704, 0xeda41891), TOBN(0xcd927bec, 0x5eb5c788),
- TOBN(0xeb3c8516, 0xe48c8a34), TOBN(0x1b7ac812, 0x4b546669),
- TOBN(0x1815f896, 0x594df8ec), TOBN(0x87c6a79c, 0x79227865),
- TOBN(0xae02a2f0, 0x9b56ddbd), TOBN(0x1339b5ac, 0x8a2f1cf3),
- TOBN(0xf2b569c7, 0x839dff0d), TOBN(0xb0b9e864, 0xfee9a43d),
- TOBN(0x4ff8ca41, 0x77bb064e), TOBN(0x145a2812, 0xfd249f63),
- TOBN(0x3ab7beac, 0xf86f689a), TOBN(0x9bafec27, 0x01d35f5e),
- TOBN(0x28054c65, 0x4265aa91), TOBN(0xa4b18304, 0x035efe42),
- TOBN(0x6887b0e6, 0x9639dec7), TOBN(0xf4b8f6ad, 0x3d52aea5),
- TOBN(0xfb9293cc, 0x971a8a13), TOBN(0x3f159e5d, 0x4c934d07),
- TOBN(0x2c50e9b1, 0x09acbc29), TOBN(0x08eb65e6, 0x7154d129),
- TOBN(0x4feff589, 0x30b75c3e), TOBN(0x0bb82fe2, 0x94491c93),
- TOBN(0xd8ac377a, 0x89af62bb), TOBN(0xd7b51490, 0x9685e49f),
- TOBN(0xabca9a7b, 0x04497f19), TOBN(0x1b35ed0a, 0x1a7ad13f),
- TOBN(0x6b601e21, 0x3ec86ed6), TOBN(0xda91fcb9, 0xce0c76f1),
- TOBN(0x9e28507b, 0xd7ab27e1), TOBN(0x7c19a555, 0x63945b7b),
- TOBN(0x6b43f0a1, 0xaafc9827), TOBN(0x443b4fbd, 0x3aa55b91),
- TOBN(0x962b2e65, 0x6962c88f), TOBN(0x139da8d4, 0xce0db0ca),
- TOBN(0xb93f05dd, 0x1b8d6c4f), TOBN(0x779cdff7, 0x180b9824),
- TOBN(0xbba23fdd, 0xae57c7b7), TOBN(0x345342f2, 0x1b932522),
- TOBN(0xfd9c80fe, 0x556d4aa3), TOBN(0xa03907ba, 0x6525bb61),
- TOBN(0x38b010e1, 0xff218933), TOBN(0xc066b654, 0xaa52117b),
- TOBN(0x8e141920, 0x94f2e6ea), TOBN(0x66a27dca, 0x0d32f2b2),
- TOBN(0x69c7f993, 0x048b3717), TOBN(0xbf5a989a, 0xb178ae1c),
- TOBN(0x49fa9058, 0x564f1d6b), TOBN(0x27ec6e15, 0xd31fde4e),
- TOBN(0x4cce0373, 0x7276e7fc), TOBN(0x64086d79, 0x89d6bf02),
- TOBN(0x5a72f046, 0x4ccdd979), TOBN(0x909c3566, 0x47775631),
- TOBN(0x1c07bc6b, 0x75dd7125), TOBN(0xb4c6bc97, 0x87a0428d),
- TOBN(0x507ece52, 0xfdeb6b9d), TOBN(0xfca56512, 0xb2c95432),
- TOBN(0x15d97181, 0xd0e8bd06), TOBN(0x384dd317, 0xc6bb46ea),
- TOBN(0x5441ea20, 0x3952b624), TOBN(0xbcf70dee, 0x4e7dc2fb),
- TOBN(0x372b016e, 0x6628e8c3), TOBN(0x07a0d667, 0xb60a7522),
- TOBN(0xcf05751b, 0x0a344ee2), TOBN(0x0ec09a48, 0x118bdeec),
- TOBN(0x6e4b3d4e, 0xd83dce46), TOBN(0x43a6316d, 0x99d2fc6e),
- TOBN(0xa99d8989, 0x56cf044c), TOBN(0x7c7f4454, 0xae3e5fb7),
- TOBN(0xb2e6b121, 0xfbabbe92), TOBN(0x281850fb, 0xe1330076),
- TOBN(0x093581ec, 0x97890015), TOBN(0x69b1dded, 0x75ff77f5),
- TOBN(0x7cf0b18f, 0xab105105), TOBN(0x953ced31, 0xa89ccfef),
- TOBN(0x3151f85f, 0xeb914009), TOBN(0x3c9f1b87, 0x88ed48ad),
- TOBN(0xc9aba1a1, 0x4a7eadcb), TOBN(0x928e7501, 0x522e71cf),
- TOBN(0xeaede727, 0x3a2e4f83), TOBN(0x467e10d1, 0x1ce3bbd3),
- TOBN(0xf3442ac3, 0xb955dcf0), TOBN(0xba96307d, 0xd3d5e527),
- TOBN(0xf763a10e, 0xfd77f474), TOBN(0x5d744bd0, 0x6a6e1ff0),
- TOBN(0xd287282a, 0xa777899e), TOBN(0xe20eda8f, 0xd03f3cde),
- TOBN(0x6a7e75bb, 0x50b07d31), TOBN(0x0b7e2a94, 0x6f379de4),
- TOBN(0x31cb64ad, 0x19f593cf), TOBN(0x7b1a9e4f, 0x1e76ef1d),
- TOBN(0xe18c9c9d, 0xb62d609c), TOBN(0x439bad6d, 0xe779a650),
- TOBN(0x219d9066, 0xe032f144), TOBN(0x1db632b8, 0xe8b2ec6a),
- TOBN(0xff0d0fd4, 0xfda12f78), TOBN(0x56fb4c2d, 0x2a25d265),
- TOBN(0x5f4e2ee1, 0x255a03f1), TOBN(0x61cd6af2, 0xe96af176),
- TOBN(0xe0317ba8, 0xd068bc97), TOBN(0x927d6bab, 0x264b988e),
- TOBN(0xa18f07e0, 0xe90fb21e), TOBN(0x00fd2b80, 0xbba7fca1),
- TOBN(0x20387f27, 0x95cd67b5), TOBN(0x5b89a4e7, 0xd39707f7),
- TOBN(0x8f83ad3f, 0x894407ce), TOBN(0xa0025b94, 0x6c226132),
- TOBN(0xc79563c7, 0xf906c13b), TOBN(0x5f548f31, 0x4e7bb025),
- TOBN(0x2b4c6b8f, 0xeac6d113), TOBN(0xa67e3f9c, 0x0e813c76),
- TOBN(0x3982717c, 0x3fe1f4b9), TOBN(0x58865819, 0x26d8050e),
- TOBN(0x99f3640c, 0xf7f06f20), TOBN(0xdc610216, 0x2a66ebc2),
- TOBN(0x52f2c175, 0x767a1e08), TOBN(0x05660e1a, 0x5999871b),
- TOBN(0x6b0f1762, 0x6d3c4693), TOBN(0xf0e7d627, 0x37ed7bea),
- TOBN(0xc51758c7, 0xb75b226d), TOBN(0x40a88628, 0x1f91613b),
- TOBN(0x889dbaa7, 0xbbb38ce0), TOBN(0xe0404b65, 0xbddcad81),
- TOBN(0xfebccd3a, 0x8bc9671f), TOBN(0xfbf9a357, 0xee1f5375),
- TOBN(0x5dc169b0, 0x28f33398), TOBN(0xb07ec11d, 0x72e90f65),
- TOBN(0xae7f3b4a, 0xfaab1eb1), TOBN(0xd970195e, 0x5f17538a),
- TOBN(0x52b05cbe, 0x0181e640), TOBN(0xf5debd62, 0x2643313d),
- TOBN(0x76148154, 0x5df31f82), TOBN(0x23e03b33, 0x3a9e13c5),
- TOBN(0xff758949, 0x4fde0c1f), TOBN(0xbf8a1abe, 0xe5b6ec20),
- TOBN(0x702278fb, 0x87e1db6c), TOBN(0xc447ad7a, 0x35ed658f),
- TOBN(0x48d4aa38, 0x03d0ccf2), TOBN(0x80acb338, 0x819a7c03),
- TOBN(0x9bc7c89e, 0x6e17cecc), TOBN(0x46736b8b, 0x03be1d82),
- TOBN(0xd65d7b60, 0xc0432f96), TOBN(0xddebe7a3, 0xdeb5442f),
- TOBN(0x79a25307, 0x7dff69a2), TOBN(0x37a56d94, 0x02cf3122),
- TOBN(0x8bab8aed, 0xf2350d0a), TOBN(0x13c3f276, 0x037b0d9a),
- TOBN(0xc664957c, 0x44c65cae), TOBN(0x88b44089, 0xc2e71a88),
- TOBN(0xdb88e5a3, 0x5cb02664), TOBN(0x5d4c0bf1, 0x8686c72e),
- TOBN(0xea3d9b62, 0xa682d53e), TOBN(0x9b605ef4, 0x0b2ad431),
- TOBN(0x71bac202, 0xc69645d0), TOBN(0xa115f03a, 0x6a1b66e7),
- TOBN(0xfe2c563a, 0x158f4dc4), TOBN(0xf715b3a0, 0x4d12a78c),
- TOBN(0x8f7f0a48, 0xd413213a), TOBN(0x2035806d, 0xc04becdb),
- TOBN(0xecd34a99, 0x5d8587f5), TOBN(0x4d8c3079, 0x9f6d3a71),
- TOBN(0x1b2a2a67, 0x8d95a8f6), TOBN(0xc58c9d7d, 0xf2110d0d),
- TOBN(0xdeee81d5, 0xcf8fba3f), TOBN(0xa42be3c0, 0x0c7cdf68),
- TOBN(0x2126f742, 0xd43b5eaa), TOBN(0x054a0766, 0xdfa59b85),
- TOBN(0x9d0d5e36, 0x126bfd45), TOBN(0xa1f8fbd7, 0x384f8a8f),
- TOBN(0x317680f5, 0xd563fccc), TOBN(0x48ca5055, 0xf280a928),
- TOBN(0xe00b81b2, 0x27b578cf), TOBN(0x10aad918, 0x2994a514),
- TOBN(0xd9e07b62, 0xb7bdc953), TOBN(0x9f0f6ff2, 0x5bc086dd),
- TOBN(0x09d1ccff, 0x655eee77), TOBN(0x45475f79, 0x5bef7df1),
- TOBN(0x3faa28fa, 0x86f702cc), TOBN(0x92e60905, 0x0f021f07),
- TOBN(0xe9e62968, 0x7f8fa8c6), TOBN(0xbd71419a, 0xf036ea2c),
- TOBN(0x171ee1cc, 0x6028da9a), TOBN(0x5352fe1a, 0xc251f573),
- TOBN(0xf8ff236e, 0x3fa997f4), TOBN(0xd831b6c9, 0xa5749d5f),
- TOBN(0x7c872e1d, 0xe350e2c2), TOBN(0xc56240d9, 0x1e0ce403),
- TOBN(0xf9deb077, 0x6974f5cb), TOBN(0x7d50ba87, 0x961c3728),
- TOBN(0xd6f89426, 0x5a3a2518), TOBN(0xcf817799, 0xc6303d43),
- TOBN(0x510a0471, 0x619e5696), TOBN(0xab049ff6, 0x3a5e307b),
- TOBN(0xe4cdf9b0, 0xfeb13ec7), TOBN(0xd5e97117, 0x9d8ff90c),
- TOBN(0xf6f64d06, 0x9afa96af), TOBN(0x00d0bf5e, 0x9d2012a2),
- TOBN(0xe63f301f, 0x358bcdc0), TOBN(0x07689e99, 0x0a9d47f8),
- TOBN(0x1f689e2f, 0x4f43d43a), TOBN(0x4d542a16, 0x90920904),
- TOBN(0xaea293d5, 0x9ca0a707), TOBN(0xd061fe45, 0x8ac68065),
- TOBN(0x1033bf1b, 0x0090008c), TOBN(0x29749558, 0xc08a6db6),
- TOBN(0x74b5fc59, 0xc1d5d034), TOBN(0xf712e9f6, 0x67e215e0),
- TOBN(0xfd520cbd, 0x860200e6), TOBN(0x0229acb4, 0x3ea22588),
- TOBN(0x9cd1e14c, 0xfff0c82e), TOBN(0x87684b62, 0x59c69e73),
- TOBN(0xda85e61c, 0x96ccb989), TOBN(0x2d5dbb02, 0xa3d06493),
- TOBN(0xf22ad33a, 0xe86b173c), TOBN(0xe8e41ea5, 0xa79ff0e3),
- TOBN(0x01d2d725, 0xdd0d0c10), TOBN(0x31f39088, 0x032d28f9),
- TOBN(0x7b3f71e1, 0x7829839e), TOBN(0x0cf691b4, 0x4502ae58),
- TOBN(0xef658dbd, 0xbefc6115), TOBN(0xa5cd6ee5, 0xb3ab5314),
- TOBN(0x206c8d7b, 0x5f1d2347), TOBN(0x794645ba, 0x4cc2253a),
- TOBN(0xd517d8ff, 0x58389e08), TOBN(0x4fa20dee, 0x9f847288),
- TOBN(0xeba072d8, 0xd797770a), TOBN(0x7360c91d, 0xbf429e26),
- TOBN(0x7200a3b3, 0x80af8279), TOBN(0x6a1c9150, 0x82dadce3),
- TOBN(0x0ee6d3a7, 0xc35d8794), TOBN(0x042e6558, 0x0356bae5),
- TOBN(0x9f59698d, 0x643322fd), TOBN(0x9379ae15, 0x50a61967),
- TOBN(0x64b9ae62, 0xfcc9981e), TOBN(0xaed3d631, 0x6d2934c6),
- TOBN(0x2454b302, 0x5e4e65eb), TOBN(0xab09f647, 0xf9950428)}
- ,
- {TOBN(0xb2083a12, 0x22248acc), TOBN(0x1f6ec0ef, 0x3264e366),
- TOBN(0x5659b704, 0x5afdee28), TOBN(0x7a823a40, 0xe6430bb5),
- TOBN(0x24592a04, 0xe1900a79), TOBN(0xcde09d4a, 0xc9ee6576),
- TOBN(0x52b6463f, 0x4b5ea54a), TOBN(0x1efe9ed3, 0xd3ca65a7),
- TOBN(0xe27a6dbe, 0x305406dd), TOBN(0x8eb7dc7f, 0xdd5d1957),
- TOBN(0xf54a6876, 0x387d4d8f), TOBN(0x9c479409, 0xc7762de4),
- TOBN(0xbe4d5b5d, 0x99b30778), TOBN(0x25380c56, 0x6e793682),
- TOBN(0x602d37f3, 0xdac740e3), TOBN(0x140deabe, 0x1566e4ae),
- TOBN(0x4481d067, 0xafd32acf), TOBN(0xd8f0fcca, 0xe1f71ccf),
- TOBN(0xd208dd0c, 0xb596f2da), TOBN(0xd049d730, 0x9aad93f9),
- TOBN(0xc79f263d, 0x42ab580e), TOBN(0x09411bb1, 0x23f707b4),
- TOBN(0x8cfde1ff, 0x835e0eda), TOBN(0x72707490, 0x90f03402),
- TOBN(0xeaee6126, 0xc49a861e), TOBN(0x024f3b65, 0xe14f0d06),
- TOBN(0x51a3f1e8, 0xc69bfc17), TOBN(0xc3c3a8e9, 0xa7686381),
- TOBN(0x3400752c, 0xb103d4c8), TOBN(0x02bc4613, 0x9218b36b),
- TOBN(0xc67f75eb, 0x7651504a), TOBN(0xd6848b56, 0xd02aebfa),
- TOBN(0xbd9802e6, 0xc30fa92b), TOBN(0x5a70d96d, 0x9a552784),
- TOBN(0x9085c4ea, 0x3f83169b), TOBN(0xfa9423bb, 0x06908228),
- TOBN(0x2ffebe12, 0xfe97a5b9), TOBN(0x85da6049, 0x71b99118),
- TOBN(0x9cbc2f7f, 0x63178846), TOBN(0xfd96bc70, 0x9153218e),
- TOBN(0x958381db, 0x1782269b), TOBN(0xae34bf79, 0x2597e550),
- TOBN(0xbb5c6064, 0x5f385153), TOBN(0x6f0e96af, 0xe3088048),
- TOBN(0xbf6a0215, 0x77884456), TOBN(0xb3b5688c, 0x69310ea7),
- TOBN(0x17c94295, 0x04fad2de), TOBN(0xe020f0e5, 0x17896d4d),
- TOBN(0x730ba0ab, 0x0976505f), TOBN(0x567f6813, 0x095e2ec5),
- TOBN(0x47062010, 0x6331ab71), TOBN(0x72cfa977, 0x41d22b9f),
- TOBN(0x33e55ead, 0x8a2373da), TOBN(0xa8d0d5f4, 0x7ba45a68),
- TOBN(0xba1d8f9c, 0x03029d15), TOBN(0x8f34f1cc, 0xfc55b9f3),
- TOBN(0xcca4428d, 0xbbe5a1a9), TOBN(0x8187fd5f, 0x3126bd67),
- TOBN(0x0036973a, 0x48105826), TOBN(0xa39b6663, 0xb8bd61a0),
- TOBN(0x6d42deef, 0x2d65a808), TOBN(0x4969044f, 0x94636b19),
- TOBN(0xf611ee47, 0xdd5d564c), TOBN(0x7b2f3a49, 0xd2873077),
- TOBN(0x94157d45, 0x300eb294), TOBN(0x2b2a656e, 0x169c1494),
- TOBN(0xc000dd76, 0xd3a47aa9), TOBN(0xa2864e4f, 0xa6243ea4),
- TOBN(0x82716c47, 0xdb89842e), TOBN(0x12dfd7d7, 0x61479fb7),
- TOBN(0x3b9a2c56, 0xe0b2f6dc), TOBN(0x46be862a, 0xd7f85d67),
- TOBN(0x03b0d8dd, 0x0f82b214), TOBN(0x460c34f9, 0xf103cbc6),
- TOBN(0xf32e5c03, 0x18d79e19), TOBN(0x8b8888ba, 0xa84117f8),
- TOBN(0x8f3c37dc, 0xc0722677), TOBN(0x10d21be9, 0x1c1c0f27),
- TOBN(0xd47c8468, 0xe0f7a0c6), TOBN(0x9bf02213, 0xadecc0e0),
- TOBN(0x0baa7d12, 0x42b48b99), TOBN(0x1bcb665d, 0x48424096),
- TOBN(0x8b847cd6, 0xebfb5cfb), TOBN(0x87c2ae56, 0x9ad4d10d),
- TOBN(0xf1cbb122, 0x0de36726), TOBN(0xe7043c68, 0x3fdfbd21),
- TOBN(0x4bd0826a, 0x4e79d460), TOBN(0x11f5e598, 0x4bd1a2cb),
- TOBN(0x97554160, 0xb7fe7b6e), TOBN(0x7d16189a, 0x400a3fb2),
- TOBN(0xd73e9bea, 0xe328ca1e), TOBN(0x0dd04b97, 0xe793d8cc),
- TOBN(0xa9c83c9b, 0x506db8cc), TOBN(0x5cd47aae, 0xcf38814c),
- TOBN(0x26fc430d, 0xb64b45e6), TOBN(0x079b5499, 0xd818ea84),
- TOBN(0xebb01102, 0xc1c24a3b), TOBN(0xca24e568, 0x1c161c1a),
- TOBN(0x103eea69, 0x36f00a4a), TOBN(0x9ad76ee8, 0x76176c7b),
- TOBN(0x97451fc2, 0x538e0ff7), TOBN(0x94f89809, 0x6604b3b0),
- TOBN(0x6311436e, 0x3249cfd7), TOBN(0x27b4a7bd, 0x41224f69),
- TOBN(0x03b5d21a, 0xe0ac2941), TOBN(0x279b0254, 0xc2d31937),
- TOBN(0x3307c052, 0xcac992d0), TOBN(0x6aa7cb92, 0xefa8b1f3),
- TOBN(0x5a182580, 0x0d37c7a5), TOBN(0x13380c37, 0x342d5422),
- TOBN(0x92ac2d66, 0xd5d2ef92), TOBN(0x035a70c9, 0x030c63c6),
- TOBN(0xc16025dd, 0x4ce4f152), TOBN(0x1f419a71, 0xf9df7c06),
- TOBN(0x6d5b2214, 0x91e4bb14), TOBN(0xfc43c6cc, 0x839fb4ce),
- TOBN(0x49f06591, 0x925d6b2d), TOBN(0x4b37d9d3, 0x62186598),
- TOBN(0x8c54a971, 0xd01b1629), TOBN(0xe1a9c29f, 0x51d50e05),
- TOBN(0x5109b785, 0x71ba1861), TOBN(0x48b22d5c, 0xd0c8f93d),
- TOBN(0xe8fa84a7, 0x8633bb93), TOBN(0x53fba6ba, 0x5aebbd08),
- TOBN(0x7ff27df3, 0xe5eea7d8), TOBN(0x521c8796, 0x68ca7158),
- TOBN(0xb9d5133b, 0xce6f1a05), TOBN(0x2d50cd53, 0xfd0ebee4),
- TOBN(0xc82115d6, 0xc5a3ef16), TOBN(0x993eff9d, 0xba079221),
- TOBN(0xe4da2c5e, 0x4b5da81c), TOBN(0x9a89dbdb, 0x8033fd85),
- TOBN(0x60819ebf, 0x2b892891), TOBN(0x53902b21, 0x5d14a4d5),
- TOBN(0x6ac35051, 0xd7fda421), TOBN(0xcc6ab885, 0x61c83284),
- TOBN(0x14eba133, 0xf74cff17), TOBN(0x240aaa03, 0xecb813f2),
- TOBN(0xcfbb6540, 0x6f665bee), TOBN(0x084b1fe4, 0xa425ad73),
- TOBN(0x009d5d16, 0xd081f6a6), TOBN(0x35304fe8, 0xeef82c90),
- TOBN(0xf20346d5, 0xaa9eaa22), TOBN(0x0ada9f07, 0xac1c91e3),
- TOBN(0xa6e21678, 0x968a6144), TOBN(0x54c1f77c, 0x07b31a1e),
- TOBN(0xd6bb787e, 0x5781fbe1), TOBN(0x61bd2ee0, 0xe31f1c4a),
- TOBN(0xf25aa1e9, 0x781105fc), TOBN(0x9cf2971f, 0x7b2f8e80),
- TOBN(0x26d15412, 0xcdff919b), TOBN(0x01db4ebe, 0x34bc896e),
- TOBN(0x7d9b3e23, 0xb40df1cf), TOBN(0x59337373, 0x94e971b4),
- TOBN(0xbf57bd14, 0x669cf921), TOBN(0x865daedf, 0x0c1a1064),
- TOBN(0x3eb70bd3, 0x83279125), TOBN(0xbc3d5b9f, 0x34ecdaab),
- TOBN(0x91e3ed7e, 0x5f755caf), TOBN(0x49699f54, 0xd41e6f02),
- TOBN(0x185770e1, 0xd4a7a15b), TOBN(0x08f3587a, 0xeaac87e7),
- TOBN(0x352018db, 0x473133ea), TOBN(0x674ce719, 0x04fd30fc),
- TOBN(0x7b8d9835, 0x088b3e0e), TOBN(0x7a0356a9, 0x5d0d47a1),
- TOBN(0x9d9e7659, 0x6474a3c4), TOBN(0x61ea48a7, 0xff66966c),
- TOBN(0x30417758, 0x0f3e4834), TOBN(0xfdbb21c2, 0x17a9afcb),
- TOBN(0x756fa17f, 0x2f9a67b3), TOBN(0x2a6b2421, 0xa245c1a8),
- TOBN(0x64be2794, 0x4af02291), TOBN(0xade465c6, 0x2a5804fe),
- TOBN(0x8dffbd39, 0xa6f08fd7), TOBN(0xc4efa84c, 0xaa14403b),
- TOBN(0xa1b91b2a, 0x442b0f5c), TOBN(0xb748e317, 0xcf997736),
- TOBN(0x8d1b62bf, 0xcee90e16), TOBN(0x907ae271, 0x0b2078c0),
- TOBN(0xdf31534b, 0x0c9bcddd), TOBN(0x043fb054, 0x39adce83),
- TOBN(0x99031043, 0xd826846a), TOBN(0x61a9c0d6, 0xb144f393),
- TOBN(0xdab48046, 0x47718427), TOBN(0xdf17ff9b, 0x6e830f8b),
- TOBN(0x408d7ee8, 0xe49a1347), TOBN(0x6ac71e23, 0x91c1d4ae),
- TOBN(0xc8cbb9fd, 0x1defd73c), TOBN(0x19840657, 0xbbbbfec5),
- TOBN(0x39db1cb5, 0x9e7ef8ea), TOBN(0x78aa8296, 0x64105f30),
- TOBN(0xa3d9b7f0, 0xa3738c29), TOBN(0x0a2f235a, 0xbc3250a3),
- TOBN(0x55e506f6, 0x445e4caf), TOBN(0x0974f73d, 0x33475f7a),
- TOBN(0xd37dbba3, 0x5ba2f5a8), TOBN(0x542c6e63, 0x6af40066),
- TOBN(0x26d99b53, 0xc5d73e2c), TOBN(0x06060d7d, 0x6c3ca33e),
- TOBN(0xcdbef1c2, 0x065fef4a), TOBN(0x77e60f7d, 0xfd5b92e3),
- TOBN(0xd7c549f0, 0x26708350), TOBN(0x201b3ad0, 0x34f121bf),
- TOBN(0x5fcac2a1, 0x0334fc14), TOBN(0x8a9a9e09, 0x344552f6),
- TOBN(0x7dd8a1d3, 0x97653082), TOBN(0x5fc0738f, 0x79d4f289),
- TOBN(0x787d244d, 0x17d2d8c3), TOBN(0xeffc6345, 0x70830684),
- TOBN(0x5ddb96dd, 0xe4f73ae5), TOBN(0x8efb14b1, 0x172549a5),
- TOBN(0x6eb73eee, 0x2245ae7a), TOBN(0xbca4061e, 0xea11f13e),
- TOBN(0xb577421d, 0x30b01f5d), TOBN(0xaa688b24, 0x782e152c),
- TOBN(0x67608e71, 0xbd3502ba), TOBN(0x4ef41f24, 0xb4de75a0),
- TOBN(0xb08dde5e, 0xfd6125e5), TOBN(0xde484825, 0xa409543f),
- TOBN(0x1f198d98, 0x65cc2295), TOBN(0x428a3771, 0x6e0edfa2),
- TOBN(0x4f9697a2, 0xadf35fc7), TOBN(0x01a43c79, 0xf7cac3c7),
- TOBN(0xb05d7059, 0x0fd3659a), TOBN(0x8927f30c, 0xbb7f2d9a),
- TOBN(0x4023d1ac, 0x8cf984d3), TOBN(0x32125ed3, 0x02897a45),
- TOBN(0xfb572dad, 0x3d414205), TOBN(0x73000ef2, 0xe3fa82a9),
- TOBN(0x4c0868e9, 0xf10a5581), TOBN(0x5b61fc67, 0x6b0b3ca5),
- TOBN(0xc1258d5b, 0x7cae440c), TOBN(0x21c08b41, 0x402b7531),
- TOBN(0xf61a8955, 0xde932321), TOBN(0x3568faf8, 0x2d1408af),
- TOBN(0x71b15e99, 0x9ecf965b), TOBN(0xf14ed248, 0xe917276f),
- TOBN(0xc6f4caa1, 0x820cf9e2), TOBN(0x681b20b2, 0x18d83c7e),
- TOBN(0x6cde738d, 0xc6c01120), TOBN(0x71db0813, 0xae70e0db),
- TOBN(0x95fc0644, 0x74afe18c), TOBN(0x34619053, 0x129e2be7),
- TOBN(0x80615cea, 0xdb2a3b15), TOBN(0x0a49a19e, 0xdb4c7073),
- TOBN(0x0e1b84c8, 0x8fd2d367), TOBN(0xd74bf462, 0x033fb8aa),
- TOBN(0x889f6d65, 0x533ef217), TOBN(0x7158c7e4, 0xc3ca2e87),
- TOBN(0xfb670dfb, 0xdc2b4167), TOBN(0x75910a01, 0x844c257f),
- TOBN(0xf336bf07, 0xcf88577d), TOBN(0x22245250, 0xe45e2ace),
- TOBN(0x2ed92e8d, 0x7ca23d85), TOBN(0x29f8be4c, 0x2b812f58),
- TOBN(0xdd9ebaa7, 0x076fe12b), TOBN(0x3f2400cb, 0xae1537f9),
- TOBN(0x1aa93528, 0x17bdfb46), TOBN(0xc0f98430, 0x67883b41),
- TOBN(0x5590ede1, 0x0170911d), TOBN(0x7562f5bb, 0x34d4b17f),
- TOBN(0xe1fa1df2, 0x1826b8d2), TOBN(0xb40b796a, 0x6bd80d59),
- TOBN(0xd65bf197, 0x3467ba92), TOBN(0x8c9b46db, 0xf70954b0),
- TOBN(0x97c8a0f3, 0x0e78f15d), TOBN(0xa8f3a69a, 0x85a4c961),
- TOBN(0x4242660f, 0x61e4ce9b), TOBN(0xbf06aab3, 0x6ea6790c),
- TOBN(0xc6706f8e, 0xec986416), TOBN(0x9e56dec1, 0x9a9fc225),
- TOBN(0x527c46f4, 0x9a9898d9), TOBN(0xd799e77b, 0x5633cdef),
- TOBN(0x24eacc16, 0x7d9e4297), TOBN(0xabb61cea, 0x6b1cb734),
- TOBN(0xbee2e8a7, 0xf778443c), TOBN(0x3bb42bf1, 0x29de2fe6),
- TOBN(0xcbed86a1, 0x3003bb6f), TOBN(0xd3918e6c, 0xd781cdf6),
- TOBN(0x4bee3271, 0x9a5103f1), TOBN(0x5243efc6, 0xf50eac06),
- TOBN(0xb8e122cb, 0x6adcc119), TOBN(0x1b7faa84, 0xc0b80a08),
- TOBN(0x32c3d1bd, 0x6dfcd08c), TOBN(0x129dec4e, 0x0be427de),
- TOBN(0x98ab679c, 0x1d263c83), TOBN(0xafc83cb7, 0xcef64eff),
- TOBN(0x85eb6088, 0x2fa6be76), TOBN(0x892585fb, 0x1328cbfe),
- TOBN(0xc154d3ed, 0xcf618dda), TOBN(0xc44f601b, 0x3abaf26e),
- TOBN(0x7bf57d0b, 0x2be1fdfd), TOBN(0xa833bd2d, 0x21137fee),
- TOBN(0x9353af36, 0x2db591a8), TOBN(0xc76f26dc, 0x5562a056),
- TOBN(0x1d87e47d, 0x3fdf5a51), TOBN(0x7afb5f93, 0x55c9cab0),
- TOBN(0x91bbf58f, 0x89e0586e), TOBN(0x7c72c018, 0x0d843709),
- TOBN(0xa9a5aafb, 0x99b5c3dc), TOBN(0xa48a0f1d, 0x3844aeb0),
- TOBN(0x7178b7dd, 0xb667e482), TOBN(0x453985e9, 0x6e23a59a),
- TOBN(0x4a54c860, 0x01b25dd8), TOBN(0x0dd37f48, 0xfb897c8a),
- TOBN(0x5f8aa610, 0x0ea90cd9), TOBN(0xc8892c68, 0x16d5830d),
- TOBN(0xeb4befc0, 0xef514ca5), TOBN(0x478eb679, 0xe72c9ee6),
- TOBN(0x9bca20da, 0xdbc40d5f), TOBN(0xf015de21, 0xdde4f64a),
- TOBN(0xaa6a4de0, 0xeaf4b8a5), TOBN(0x68cfd9ca, 0x4bc60e32),
- TOBN(0x668a4b01, 0x7fd15e70), TOBN(0xd9f0694a, 0xf27dc09d),
- TOBN(0xf6c3cad5, 0xba708bcd), TOBN(0x5cd2ba69, 0x5bb95c2a),
- TOBN(0xaa28c1d3, 0x33c0a58f), TOBN(0x23e274e3, 0xabc77870),
- TOBN(0x44c3692d, 0xdfd20a4a), TOBN(0x091c5fd3, 0x81a66653),
- TOBN(0x6c0bb691, 0x09a0757d), TOBN(0x9072e8b9, 0x667343ea),
- TOBN(0x31d40eb0, 0x80848bec), TOBN(0x95bd480a, 0x79fd36cc),
- TOBN(0x01a77c61, 0x65ed43f5), TOBN(0xafccd127, 0x2e0d40bf),
- TOBN(0xeccfc82d, 0x1cc1884b), TOBN(0xc85ac201, 0x5d4753b4),
- TOBN(0xc7a6caac, 0x658e099f), TOBN(0xcf46369e, 0x04b27390),
- TOBN(0xe2e7d049, 0x506467ea), TOBN(0x481b63a2, 0x37cdeccc),
- TOBN(0x4029abd8, 0xed80143a), TOBN(0x28bfe3c7, 0xbcb00b88),
- TOBN(0x3bec1009, 0x0643d84a), TOBN(0x885f3668, 0xabd11041),
- TOBN(0xdb02432c, 0xf83a34d6), TOBN(0x32f7b360, 0x719ceebe),
- TOBN(0xf06c7837, 0xdad1fe7a), TOBN(0x60a157a9, 0x5441a0b0),
- TOBN(0x704970e9, 0xe2d47550), TOBN(0xcd2bd553, 0x271b9020),
- TOBN(0xff57f82f, 0x33e24a0b), TOBN(0x9cbee23f, 0xf2565079),
- TOBN(0x16353427, 0xeb5f5825), TOBN(0x276feec4, 0xe948d662),
- TOBN(0xd1b62bc6, 0xda10032b), TOBN(0x718351dd, 0xf0e72a53),
- TOBN(0x93452076, 0x2420e7ba), TOBN(0x96368fff, 0x3a00118d),
- TOBN(0x00ce2d26, 0x150a49e4), TOBN(0x0c28b636, 0x3f04706b),
- TOBN(0xbad65a46, 0x58b196d0), TOBN(0x6c8455fc, 0xec9f8b7c),
- TOBN(0xe90c895f, 0x2d71867e), TOBN(0x5c0be31b, 0xedf9f38c),
- TOBN(0x2a37a15e, 0xd8f6ec04), TOBN(0x239639e7, 0x8cd85251),
- TOBN(0xd8975315, 0x9c7c4c6b), TOBN(0x603aa3c0, 0xd7409af7),
- TOBN(0xb8d53d0c, 0x007132fb), TOBN(0x68d12af7, 0xa6849238),
- TOBN(0xbe0607e7, 0xbf5d9279), TOBN(0x9aa50055, 0xaada74ce),
- TOBN(0xe81079cb, 0xba7e8ccb), TOBN(0x610c71d1, 0xa5f4ff5e),
- TOBN(0x9e2ee1a7, 0x5aa07093), TOBN(0xca84004b, 0xa75da47c),
- TOBN(0x074d3951, 0x3de75401), TOBN(0xf938f756, 0xbb311592),
- TOBN(0x96197618, 0x00a43421), TOBN(0x39a25362, 0x07bc78c8),
- TOBN(0x278f710a, 0x0a171276), TOBN(0xb28446ea, 0x8d1a8f08),
- TOBN(0x184781bf, 0xe3b6a661), TOBN(0x7751cb1d, 0xe6d279f7),
- TOBN(0xf8ff95d6, 0xc59eb662), TOBN(0x186d90b7, 0x58d3dea7),
- TOBN(0x0e4bb6c1, 0xdfb4f754), TOBN(0x5c5cf56b, 0x2b2801dc),
- TOBN(0xc561e452, 0x1f54564d), TOBN(0xb4fb8c60, 0xf0dd7f13),
- TOBN(0xf8849630, 0x33ff98c7), TOBN(0x9619fffa, 0xcf17769c),
- TOBN(0xf8090bf6, 0x1bfdd80a), TOBN(0x14d9a149, 0x422cfe63),
- TOBN(0xb354c360, 0x6f6df9ea), TOBN(0xdbcf770d, 0x218f17ea),
- TOBN(0x207db7c8, 0x79eb3480), TOBN(0x213dbda8, 0x559b6a26),
- TOBN(0xac4c200b, 0x29fc81b3), TOBN(0xebc3e09f, 0x171d87c1),
- TOBN(0x91799530, 0x1481aa9e), TOBN(0x051b92e1, 0x92e114fa),
- TOBN(0xdf8f92e9, 0xecb5537f), TOBN(0x44b1b2cc, 0x290c7483),
- TOBN(0xa711455a, 0x2adeb016), TOBN(0x964b6856, 0x81a10c2c),
- TOBN(0x4f159d99, 0xcec03623), TOBN(0x05532225, 0xef3271ea),
- TOBN(0xb231bea3, 0xc5ee4849), TOBN(0x57a54f50, 0x7094f103),
- TOBN(0x3e2d421d, 0x9598b352), TOBN(0xe865a49c, 0x67412ab4),
- TOBN(0xd2998a25, 0x1cc3a912), TOBN(0x5d092808, 0x0c74d65d),
- TOBN(0x73f45908, 0x4088567a), TOBN(0xeb6b280e, 0x1f214a61),
- TOBN(0x8c9adc34, 0xcaf0c13d), TOBN(0x39d12938, 0xf561fb80),
- TOBN(0xb2dc3a5e, 0xbc6edfb4), TOBN(0x7485b1b1, 0xfe4d210e),
- TOBN(0x062e0400, 0xe186ae72), TOBN(0x91e32d5c, 0x6eeb3b88),
- TOBN(0x6df574d7, 0x4be59224), TOBN(0xebc88ccc, 0x716d55f3),
- TOBN(0x26c2e6d0, 0xcad6ed33), TOBN(0xc6e21e7d, 0x0d3e8b10),
- TOBN(0x2cc5840e, 0x5bcc36bb), TOBN(0x9292445e, 0x7da74f69),
- TOBN(0x8be8d321, 0x4e5193a8), TOBN(0x3ec23629, 0x8df06413),
- TOBN(0xc7e9ae85, 0xb134defa), TOBN(0x6073b1d0, 0x1bb2d475),
- TOBN(0xb9ad615e, 0x2863c00d), TOBN(0x9e29493d, 0x525f4ac4),
- TOBN(0xc32b1dea, 0x4e9acf4f), TOBN(0x3e1f01c8, 0xa50db88d),
- TOBN(0xb05d70ea, 0x04da916c), TOBN(0x714b0d0a, 0xd865803e),
- TOBN(0x4bd493fc, 0x9920cb5e), TOBN(0x5b44b1f7, 0x92c7a3ac),
- TOBN(0xa2a77293, 0xbcec9235), TOBN(0x5ee06e87, 0xcd378553),
- TOBN(0xceff8173, 0xda621607), TOBN(0x2bb03e4c, 0x99f5d290),
- TOBN(0x2945106a, 0xa6f734ac), TOBN(0xb5056604, 0xd25c4732),
- TOBN(0x5945920c, 0xe079afee), TOBN(0x686e17a0, 0x6789831f),
- TOBN(0x5966bee8, 0xb74a5ae5), TOBN(0x38a673a2, 0x1e258d46),
- TOBN(0xbd1cc1f2, 0x83141c95), TOBN(0x3b2ecf4f, 0x0e96e486),
- TOBN(0xcd3aa896, 0x74e5fc78), TOBN(0x415ec10c, 0x2482fa7a),
- TOBN(0x15234419, 0x80503380), TOBN(0x513d917a, 0xd314b392),
- TOBN(0xb0b52f4e, 0x63caecae), TOBN(0x07bf22ad, 0x2dc7780b),
- TOBN(0xe761e8a1, 0xe4306839), TOBN(0x1b3be962, 0x5dd7feaa),
- TOBN(0x4fe728de, 0x74c778f1), TOBN(0xf1fa0bda, 0x5e0070f6),
- TOBN(0x85205a31, 0x6ec3f510), TOBN(0x2c7e4a14, 0xd2980475),
- TOBN(0xde3c19c0, 0x6f30ebfd), TOBN(0xdb1c1f38, 0xd4b7e644),
- TOBN(0xfe291a75, 0x5dce364a), TOBN(0xb7b22a3c, 0x058f5be3),
- TOBN(0x2cd2c302, 0x37fea38c), TOBN(0x2930967a, 0x2e17be17),
- TOBN(0x87f009de, 0x0c061c65), TOBN(0xcb014aac, 0xedc6ed44),
- TOBN(0x49bd1cb4, 0x3bafb1eb), TOBN(0x81bd8b5c, 0x282d3688),
- TOBN(0x1cdab87e, 0xf01a17af), TOBN(0x21f37ac4, 0xe710063b),
- TOBN(0x5a6c5676, 0x42fc8193), TOBN(0xf4753e70, 0x56a6015c),
- TOBN(0x020f795e, 0xa15b0a44), TOBN(0x8f37c8d7, 0x8958a958),
- TOBN(0x63b7e89b, 0xa4b675b5), TOBN(0xb4fb0c0c, 0x0fc31aea),
- TOBN(0xed95e639, 0xa7ff1f2e), TOBN(0x9880f5a3, 0x619614fb),
- TOBN(0xdeb6ff02, 0x947151ab), TOBN(0x5bc5118c, 0xa868dcdb),
- TOBN(0xd8da2055, 0x4c20cea5), TOBN(0xcac2776e, 0x14c4d69a),
- TOBN(0xcccb22c1, 0x622d599b), TOBN(0xa4ddb653, 0x68a9bb50),
- TOBN(0x2c4ff151, 0x1b4941b4), TOBN(0xe1ff19b4, 0x6efba588),
- TOBN(0x35034363, 0xc48345e0), TOBN(0x45542e3d, 0x1e29dfc4),
- TOBN(0xf197cb91, 0x349f7aed), TOBN(0x3b2b5a00, 0x8fca8420),
- TOBN(0x7c175ee8, 0x23aaf6d8), TOBN(0x54dcf421, 0x35af32b6),
- TOBN(0x0ba14307, 0x27d6561e), TOBN(0x879d5ee4, 0xd175b1e2),
- TOBN(0xc7c43673, 0x99807db5), TOBN(0x77a54455, 0x9cd55bcd),
- TOBN(0xe6c2ff13, 0x0105c072), TOBN(0x18f7a99f, 0x8dda7da4),
- TOBN(0x4c301820, 0x0e2d35c1), TOBN(0x06a53ca0, 0xd9cc6c82),
- TOBN(0xaa21cc1e, 0xf1aa1d9e), TOBN(0x32414334, 0x4a75b1e8),
- TOBN(0x2a6d1328, 0x0ebe9fdc), TOBN(0x16bd173f, 0x98a4755a),
- TOBN(0xfbb9b245, 0x2133ffd9), TOBN(0x39a8b2f1, 0x830f1a20),
- TOBN(0x484bc97d, 0xd5a1f52a), TOBN(0xd6aebf56, 0xa40eddf8),
- TOBN(0x32257acb, 0x76ccdac6), TOBN(0xaf4d36ec, 0x1586ff27),
- TOBN(0x8eaa8863, 0xf8de7dd1), TOBN(0x0045d5cf, 0x88647c16)}
- ,
- {TOBN(0xa6f3d574, 0xc005979d), TOBN(0xc2072b42, 0x6a40e350),
- TOBN(0xfca5c156, 0x8de2ecf9), TOBN(0xa8c8bf5b, 0xa515344e),
- TOBN(0x97aee555, 0x114df14a), TOBN(0xd4374a4d, 0xfdc5ec6b),
- TOBN(0x754cc28f, 0x2ca85418), TOBN(0x71cb9e27, 0xd3c41f78),
- TOBN(0x89105079, 0x03605c39), TOBN(0xf0843d9e, 0xa142c96c),
- TOBN(0xf3744934, 0x16923684), TOBN(0x732caa2f, 0xfa0a2893),
- TOBN(0xb2e8c270, 0x61160170), TOBN(0xc32788cc, 0x437fbaa3),
- TOBN(0x39cd818e, 0xa6eda3ac), TOBN(0xe2e94239, 0x9e2b2e07),
- TOBN(0x6967d39b, 0x0260e52a), TOBN(0xd42585cc, 0x90653325),
- TOBN(0x0d9bd605, 0x21ca7954), TOBN(0x4fa20877, 0x81ed57b3),
- TOBN(0x60c1eff8, 0xe34a0bbe), TOBN(0x56b0040c, 0x84f6ef64),
- TOBN(0x28be2b24, 0xb1af8483), TOBN(0xb2278163, 0xf5531614),
- TOBN(0x8df27545, 0x5922ac1c), TOBN(0xa7b3ef5c, 0xa52b3f63),
- TOBN(0x8e77b214, 0x71de57c4), TOBN(0x31682c10, 0x834c008b),
- TOBN(0xc76824f0, 0x4bd55d31), TOBN(0xb6d1c086, 0x17b61c71),
- TOBN(0x31db0903, 0xc2a5089d), TOBN(0x9c092172, 0x184e5d3f),
- TOBN(0xdd7ced5b, 0xc00cc638), TOBN(0x1a2015eb, 0x61278fc2),
- TOBN(0x2e8e5288, 0x6a37f8d6), TOBN(0xc457786f, 0xe79933ad),
- TOBN(0xb3fe4cce, 0x2c51211a), TOBN(0xad9b10b2, 0x24c20498),
- TOBN(0x90d87a4f, 0xd28db5e5), TOBN(0x698cd105, 0x3aca2fc3),
- TOBN(0x4f112d07, 0xe91b536d), TOBN(0xceb982f2, 0x9eba09d6),
- TOBN(0x3c157b2c, 0x197c396f), TOBN(0xe23c2d41, 0x7b66eb24),
- TOBN(0x480c57d9, 0x3f330d37), TOBN(0xb3a4c8a1, 0x79108deb),
- TOBN(0x702388de, 0xcb199ce5), TOBN(0x0b019211, 0xb944a8d4),
- TOBN(0x24f2a692, 0x840bb336), TOBN(0x7c353bdc, 0xa669fa7b),
- TOBN(0xda20d6fc, 0xdec9c300), TOBN(0x625fbe2f, 0xa13a4f17),
- TOBN(0xa2b1b61a, 0xdbc17328), TOBN(0x008965bf, 0xa9515621),
- TOBN(0x49690939, 0xc620ff46), TOBN(0x182dd27d, 0x8717e91c),
- TOBN(0x5ace5035, 0xea6c3997), TOBN(0x54259aaa, 0xc2610bef),
- TOBN(0xef18bb3f, 0x3c80dd39), TOBN(0x6910b95b, 0x5fc3fa39),
- TOBN(0xfce2f510, 0x43e09aee), TOBN(0xced56c9f, 0xa7675665),
- TOBN(0x10e265ac, 0xd872db61), TOBN(0x6982812e, 0xae9fce69),
- TOBN(0x29be11c6, 0xce800998), TOBN(0x72bb1752, 0xb90360d9),
- TOBN(0x2c193197, 0x5a4ad590), TOBN(0x2ba2f548, 0x9fc1dbc0),
- TOBN(0x7fe4eebb, 0xe490ebe0), TOBN(0x12a0a4cd, 0x7fae11c0),
- TOBN(0x7197cf81, 0xe903ba37), TOBN(0xcf7d4aa8, 0xde1c6dd8),
- TOBN(0x92af6bf4, 0x3fd5684c), TOBN(0x2b26eecf, 0x80360aa1),
- TOBN(0xbd960f30, 0x00546a82), TOBN(0x407b3c43, 0xf59ad8fe),
- TOBN(0x86cae5fe, 0x249c82ba), TOBN(0x9e0faec7, 0x2463744c),
- TOBN(0x87f551e8, 0x94916272), TOBN(0x033f9344, 0x6ceb0615),
- TOBN(0x1e5eb0d1, 0x8be82e84), TOBN(0x89967f0e, 0x7a582fef),
- TOBN(0xbcf687d5, 0xa6e921fa), TOBN(0xdfee4cf3, 0xd37a09ba),
- TOBN(0x94f06965, 0xb493c465), TOBN(0x638b9a1c, 0x7635c030),
- TOBN(0x76667864, 0x66f05e9f), TOBN(0xccaf6808, 0xc04da725),
- TOBN(0xca2eb690, 0x768fccfc), TOBN(0xf402d37d, 0xb835b362),
- TOBN(0x0efac0d0, 0xe2fdfcce), TOBN(0xefc9cdef, 0xb638d990),
- TOBN(0x2af12b72, 0xd1669a8b), TOBN(0x33c536bc, 0x5774ccbd),
- TOBN(0x30b21909, 0xfb34870e), TOBN(0xc38fa2f7, 0x7df25aca),
- TOBN(0x74c5f02b, 0xbf81f3f5), TOBN(0x0525a5ae, 0xaf7e4581),
- TOBN(0x88d2aaba, 0x433c54ae), TOBN(0xed9775db, 0x806a56c5),
- TOBN(0xd320738a, 0xc0edb37d), TOBN(0x25fdb6ee, 0x66cc1f51),
- TOBN(0xac661d17, 0x10600d76), TOBN(0x931ec1f3, 0xbdd1ed76),
- TOBN(0x65c11d62, 0x19ee43f1), TOBN(0x5cd57c3e, 0x60829d97),
- TOBN(0xd26c91a3, 0x984be6e8), TOBN(0xf08d9309, 0x8b0c53bd),
- TOBN(0x94bc9e5b, 0xc016e4ea), TOBN(0xd3916839, 0x11d43d2b),
- TOBN(0x886c5ad7, 0x73701155), TOBN(0xe0377626, 0x20b00715),
- TOBN(0x7f01c9ec, 0xaa80ba59), TOBN(0x3083411a, 0x68538e51),
- TOBN(0x970370f1, 0xe88128af), TOBN(0x625cc3db, 0x91dec14b),
- TOBN(0xfef9666c, 0x01ac3107), TOBN(0xb2a8d577, 0xd5057ac3),
- TOBN(0xb0f26299, 0x92be5df7), TOBN(0xf579c8e5, 0x00353924),
- TOBN(0xb8fa3d93, 0x1341ed7a), TOBN(0x4223272c, 0xa7b59d49),
- TOBN(0x3dcb1947, 0x83b8c4a4), TOBN(0x4e413c01, 0xed1302e4),
- TOBN(0x6d999127, 0xe17e44ce), TOBN(0xee86bf75, 0x33b3adfb),
- TOBN(0xf6902fe6, 0x25aa96ca), TOBN(0xb73540e4, 0xe5aae47d),
- TOBN(0x32801d7b, 0x1b4a158c), TOBN(0xe571c99e, 0x27e2a369),
- TOBN(0x40cb76c0, 0x10d9f197), TOBN(0xc308c289, 0x3167c0ae),
- TOBN(0xa6ef9dd3, 0xeb7958f2), TOBN(0xa7226dfc, 0x300879b1),
- TOBN(0x6cd0b362, 0x7edf0636), TOBN(0x4efbce6c, 0x7bc37eed),
- TOBN(0x75f92a05, 0x8d699021), TOBN(0x586d4c79, 0x772566e3),
- TOBN(0x378ca5f1, 0x761ad23a), TOBN(0x650d86fc, 0x1465a8ac),
- TOBN(0x7a4ed457, 0x842ba251), TOBN(0x6b65e3e6, 0x42234933),
- TOBN(0xaf1543b7, 0x31aad657), TOBN(0xa4cefe98, 0xcbfec369),
- TOBN(0xb587da90, 0x9f47befb), TOBN(0x6562e9fb, 0x41312d13),
- TOBN(0xa691ea59, 0xeff1cefe), TOBN(0xcc30477a, 0x05fc4cf6),
- TOBN(0xa1632461, 0x0b0ffd3d), TOBN(0xa1f16f3b, 0x5b355956),
- TOBN(0x5b148d53, 0x4224ec24), TOBN(0xdc834e7b, 0xf977012a),
- TOBN(0x7bfc5e75, 0xb2c69dbc), TOBN(0x3aa77a29, 0x03c3da6c),
- TOBN(0xde0df03c, 0xca910271), TOBN(0xcbd5ca4a, 0x7806dc55),
- TOBN(0xe1ca5807, 0x6db476cb), TOBN(0xfde15d62, 0x5f37a31e),
- TOBN(0xf49af520, 0xf41af416), TOBN(0x96c5c5b1, 0x7d342db5),
- TOBN(0x155c43b7, 0xeb4ceb9b), TOBN(0x2e993010, 0x4e77371a),
- TOBN(0x1d2987da, 0x675d43af), TOBN(0xef2bc1c0, 0x8599fd72),
- TOBN(0x96894b7b, 0x9342f6b2), TOBN(0x201eadf2, 0x7c8e71f0),
- TOBN(0xf3479d9f, 0x4a1f3efc), TOBN(0xe0f8a742, 0x702a9704),
- TOBN(0xeafd44b6, 0xb3eba40c), TOBN(0xf9739f29, 0xc1c1e0d0),
- TOBN(0x0091471a, 0x619d505e), TOBN(0xc15f9c96, 0x9d7c263e),
- TOBN(0x5be47285, 0x83afbe33), TOBN(0xa3b6d6af, 0x04f1e092),
- TOBN(0xe76526b9, 0x751a9d11), TOBN(0x2ec5b26d, 0x9a4ae4d2),
- TOBN(0xeb66f4d9, 0x02f6fb8d), TOBN(0x4063c561, 0x96912164),
- TOBN(0xeb7050c1, 0x80ef3000), TOBN(0x288d1c33, 0xeaa5b3f0),
- TOBN(0xe87c68d6, 0x07806fd8), TOBN(0xb2f7f9d5, 0x4bbbf50f),
- TOBN(0x25972f3a, 0xac8d6627), TOBN(0xf8547774, 0x10e8c13b),
- TOBN(0xcc50ef6c, 0x872b4a60), TOBN(0xab2a34a4, 0x4613521b),
- TOBN(0x39c5c190, 0x983e15d1), TOBN(0x61dde5df, 0x59905512),
- TOBN(0xe417f621, 0x9f2275f3), TOBN(0x0750c8b6, 0x451d894b),
- TOBN(0x75b04ab9, 0x78b0bdaa), TOBN(0x3bfd9fd4, 0x458589bd),
- TOBN(0xf1013e30, 0xee9120b6), TOBN(0x2b51af93, 0x23a4743e),
- TOBN(0xea96ffae, 0x48d14d9e), TOBN(0x71dc0dbe, 0x698a1d32),
- TOBN(0x914962d2, 0x0180cca4), TOBN(0x1ae60677, 0xc3568963),
- TOBN(0x8cf227b1, 0x437bc444), TOBN(0xc650c83b, 0xc9962c7a),
- TOBN(0x23c2c7dd, 0xfe7ccfc4), TOBN(0xf925c89d, 0x1b929d48),
- TOBN(0x4460f74b, 0x06783c33), TOBN(0xac2c8d49, 0xa590475a),
- TOBN(0xfb40b407, 0xb807bba0), TOBN(0x9d1e362d, 0x69ff8f3a),
- TOBN(0xa33e9681, 0xcbef64a4), TOBN(0x67ece5fa, 0x332fb4b2),
- TOBN(0x6900a99b, 0x739f10e3), TOBN(0xc3341ca9, 0xff525925),
- TOBN(0xee18a626, 0xa9e2d041), TOBN(0xa5a83685, 0x29580ddd),
- TOBN(0xf3470c81, 0x9d7de3cd), TOBN(0xedf02586, 0x2062cf9c),
- TOBN(0xf43522fa, 0xc010edb0), TOBN(0x30314135, 0x13a4b1ae),
- TOBN(0xc792e02a, 0xdb22b94b), TOBN(0x993d8ae9, 0xa1eaa45b),
- TOBN(0x8aad6cd3, 0xcd1e1c63), TOBN(0x89529ca7, 0xc5ce688a),
- TOBN(0x2ccee3aa, 0xe572a253), TOBN(0xe02b6438, 0x02a21efb),
- TOBN(0xa7091b6e, 0xc9430358), TOBN(0x06d1b1fa, 0x9d7db504),
- TOBN(0x58846d32, 0xc4744733), TOBN(0x40517c71, 0x379f9e34),
- TOBN(0x2f65655f, 0x130ef6ca), TOBN(0x526e4488, 0xf1f3503f),
- TOBN(0x8467bd17, 0x7ee4a976), TOBN(0x1d9dc913, 0x921363d1),
- TOBN(0xd8d24c33, 0xb069e041), TOBN(0x5eb5da0a, 0x2cdf7f51),
- TOBN(0x1c0f3cb1, 0x197b994f), TOBN(0x3c95a6c5, 0x2843eae9),
- TOBN(0x7766ffc9, 0xa6097ea5), TOBN(0x7bea4093, 0xd723b867),
- TOBN(0xb48e1f73, 0x4db378f9), TOBN(0x70025b00, 0xe37b77ac),
- TOBN(0x943dc8e7, 0xaf24ad46), TOBN(0xb98a15ac, 0x16d00a85),
- TOBN(0x3adc38ba, 0x2743b004), TOBN(0xb1c7f4f7, 0x334415ee),
- TOBN(0xea43df8f, 0x1e62d05a), TOBN(0x32618905, 0x9d76a3b6),
- TOBN(0x2fbd0bb5, 0xa23a0f46), TOBN(0x5bc971db, 0x6a01918c),
- TOBN(0x7801d94a, 0xb4743f94), TOBN(0xb94df65e, 0x676ae22b),
- TOBN(0xaafcbfab, 0xaf95894c), TOBN(0x7b9bdc07, 0x276b2241),
- TOBN(0xeaf98362, 0x5bdda48b), TOBN(0x5977faf2, 0xa3fcb4df),
- TOBN(0xbed042ef, 0x052c4b5b), TOBN(0x9fe87f71, 0x067591f0),
- TOBN(0xc89c73ca, 0x22f24ec7), TOBN(0x7d37fa9e, 0xe64a9f1b),
- TOBN(0x2710841a, 0x15562627), TOBN(0x2c01a613, 0xc243b034),
- TOBN(0x1d135c56, 0x2bc68609), TOBN(0xc2ca1715, 0x8b03f1f6),
- TOBN(0xc9966c2d, 0x3eb81d82), TOBN(0xc02abf4a, 0x8f6df13e),
- TOBN(0x77b34bd7, 0x8f72b43b), TOBN(0xaff6218f, 0x360c82b0),
- TOBN(0x0aa5726c, 0x8d55b9d2), TOBN(0xdc0adbe9, 0x99e9bffb),
- TOBN(0x9097549c, 0xefb9e72a), TOBN(0x16755712, 0x9dfb3111),
- TOBN(0xdd8bf984, 0xf26847f9), TOBN(0xbcb8e387, 0xdfb30cb7),
- TOBN(0xc1fd32a7, 0x5171ef9c), TOBN(0x977f3fc7, 0x389b363f),
- TOBN(0x116eaf2b, 0xf4babda0), TOBN(0xfeab68bd, 0xf7113c8e),
- TOBN(0xd1e3f064, 0xb7def526), TOBN(0x1ac30885, 0xe0b3fa02),
- TOBN(0x1c5a6e7b, 0x40142d9d), TOBN(0x839b5603, 0x30921c0b),
- TOBN(0x48f301fa, 0x36a116a3), TOBN(0x380e1107, 0xcfd9ee6d),
- TOBN(0x7945ead8, 0x58854be1), TOBN(0x4111c12e, 0xcbd4d49d),
- TOBN(0xece3b1ec, 0x3a29c2ef), TOBN(0x6356d404, 0x8d3616f5),
- TOBN(0x9f0d6a8f, 0x594d320e), TOBN(0x0989316d, 0xf651ccd2),
- TOBN(0x6c32117a, 0x0f8fdde4), TOBN(0x9abe5cc5, 0xa26a9bbc),
- TOBN(0xcff560fb, 0x9723f671), TOBN(0x21b2a12d, 0x7f3d593c),
- TOBN(0xe4cb18da, 0x24ba0696), TOBN(0x186e2220, 0xc3543384),
- TOBN(0x722f64e0, 0x88312c29), TOBN(0x94282a99, 0x17dc7752),
- TOBN(0x62467bbf, 0x5a85ee89), TOBN(0xf435c650, 0xf10076a0),
- TOBN(0xc9ff1539, 0x43b3a50b), TOBN(0x7132130c, 0x1a53efbc),
- TOBN(0x31bfe063, 0xf7b0c5b7), TOBN(0xb0179a7d, 0x4ea994cc),
- TOBN(0x12d064b3, 0xc85f455b), TOBN(0x47259328, 0x8f6e0062),
- TOBN(0xf64e590b, 0xb875d6d9), TOBN(0x22dd6225, 0xad92bcc7),
- TOBN(0xb658038e, 0xb9c3bd6d), TOBN(0x00cdb0d6, 0xfbba27c8),
- TOBN(0x0c681337, 0x1062c45d), TOBN(0xd8515b8c, 0x2d33407d),
- TOBN(0xcb8f699e, 0x8cbb5ecf), TOBN(0x8c4347f8, 0xc608d7d8),
- TOBN(0x2c11850a, 0xbb3e00db), TOBN(0x20a8dafd, 0xecb49d19),
- TOBN(0xbd781480, 0x45ee2f40), TOBN(0x75e354af, 0x416b60cf),
- TOBN(0xde0b58a1, 0x8d49a8c4), TOBN(0xe40e94e2, 0xfa359536),
- TOBN(0xbd4fa59f, 0x62accd76), TOBN(0x05cf466a, 0x8c762837),
- TOBN(0xb5abda99, 0x448c277b), TOBN(0x5a9e01bf, 0x48b13740),
- TOBN(0x9d457798, 0x326aad8d), TOBN(0xbdef4954, 0xc396f7e7),
- TOBN(0x6fb274a2, 0xc253e292), TOBN(0x2800bf0a, 0x1cfe53e7),
- TOBN(0x22426d31, 0x44438fd4), TOBN(0xef233923, 0x5e259f9a),
- TOBN(0x4188503c, 0x03f66264), TOBN(0x9e5e7f13, 0x7f9fdfab),
- TOBN(0x565eb76c, 0x5fcc1aba), TOBN(0xea632548, 0x59b5bff8),
- TOBN(0x5587c087, 0xaab6d3fa), TOBN(0x92b639ea, 0x6ce39c1b),
- TOBN(0x0706e782, 0x953b135c), TOBN(0x7308912e, 0x425268ef),
- TOBN(0x599e92c7, 0x090e7469), TOBN(0x83b90f52, 0x9bc35e75),
- TOBN(0x4750b3d0, 0x244975b3), TOBN(0xf3a44358, 0x11965d72),
- TOBN(0x179c6774, 0x9c8dc751), TOBN(0xff18cdfe, 0xd23d9ff0),
- TOBN(0xc4013833, 0x2028e247), TOBN(0x96e280e2, 0xf3bfbc79),
- TOBN(0xf60417bd, 0xd0880a84), TOBN(0x263c9f3d, 0x2a568151),
- TOBN(0x36be15b3, 0x2d2ce811), TOBN(0x846dc0c2, 0xf8291d21),
- TOBN(0x5cfa0ecb, 0x789fcfdb), TOBN(0x45a0beed, 0xd7535b9a),
- TOBN(0xec8e9f07, 0x96d69af1), TOBN(0x31a7c5b8, 0x599ab6dc),
- TOBN(0xd36d45ef, 0xf9e2e09f), TOBN(0x3cf49ef1, 0xdcee954b),
- TOBN(0x6be34cf3, 0x086cff9b), TOBN(0x88dbd491, 0x39a3360f),
- TOBN(0x1e96b8cc, 0x0dbfbd1d), TOBN(0xc1e5f7bf, 0xcb7e2552),
- TOBN(0x0547b214, 0x28819d98), TOBN(0xc770dd9c, 0x7aea9dcb),
- TOBN(0xaef0d4c7, 0x041d68c8), TOBN(0xcc2b9818, 0x13cb9ba8),
- TOBN(0x7fc7bc76, 0xfe86c607), TOBN(0x6b7b9337, 0x502a9a95),
- TOBN(0x1948dc27, 0xd14dab63), TOBN(0x249dd198, 0xdae047be),
- TOBN(0xe8356584, 0xa981a202), TOBN(0x3531dd18, 0x3a893387),
- TOBN(0x1be11f90, 0xc85c7209), TOBN(0x93d2fe1e, 0xe2a52b5a),
- TOBN(0x8225bfe2, 0xec6d6b97), TOBN(0x9cf6d6f4, 0xbd0aa5de),
- TOBN(0x911459cb, 0x54779f5f), TOBN(0x5649cddb, 0x86aeb1f3),
- TOBN(0x32133579, 0x3f26ce5a), TOBN(0xc289a102, 0x550f431e),
- TOBN(0x559dcfda, 0x73b84c6f), TOBN(0x84973819, 0xee3ac4d7),
- TOBN(0xb51e55e6, 0xf2606a82), TOBN(0xe25f7061, 0x90f2fb57),
- TOBN(0xacef6c2a, 0xb1a4e37c), TOBN(0x864e359d, 0x5dcf2706),
- TOBN(0x479e6b18, 0x7ce57316), TOBN(0x2cab2500, 0x3a96b23d),
- TOBN(0xed489862, 0x8ef16df7), TOBN(0x2056538c, 0xef3758b5),
- TOBN(0xa7df865e, 0xf15d3101), TOBN(0x80c5533a, 0x61b553d7),
- TOBN(0x366e1997, 0x4ed14294), TOBN(0x6620741f, 0xb3c0bcd6),
- TOBN(0x21d1d9c4, 0xedc45418), TOBN(0x005b859e, 0xc1cc4a9d),
- TOBN(0xdf01f630, 0xa1c462f0), TOBN(0x15d06cf3, 0xf26820c7),
- TOBN(0x9f7f24ee, 0x3484be47), TOBN(0x2ff33e96, 0x4a0c902f),
- TOBN(0x00bdf457, 0x5a0bc453), TOBN(0x2378dfaf, 0x1aa238db),
- TOBN(0x272420ec, 0x856720f2), TOBN(0x2ad9d95b, 0x96797291),
- TOBN(0xd1242cc6, 0x768a1558), TOBN(0x2e287f8b, 0x5cc86aa8),
- TOBN(0x796873d0, 0x990cecaa), TOBN(0xade55f81, 0x675d4080),
- TOBN(0x2645eea3, 0x21f0cd84), TOBN(0x7a1efa0f, 0xb4e17d02),
- TOBN(0xf6858420, 0x037cc061), TOBN(0x682e05f0, 0xd5d43e12),
- TOBN(0x59c36994, 0x27218710), TOBN(0x85cbba4d, 0x3f7cd2fc),
- TOBN(0x726f9729, 0x7a3cd22a), TOBN(0x9f8cd5dc, 0x4a628397),
- TOBN(0x17b93ab9, 0xc23165ed), TOBN(0xff5f5dbf, 0x122823d4),
- TOBN(0xc1e4e4b5, 0x654a446d), TOBN(0xd1a9496f, 0x677257ba),
- TOBN(0x6387ba94, 0xde766a56), TOBN(0x23608bc8, 0x521ec74a),
- TOBN(0x16a522d7, 0x6688c4d4), TOBN(0x9d6b4282, 0x07373abd),
- TOBN(0xa62f07ac, 0xb42efaa3), TOBN(0xf73e00f7, 0xe3b90180),
- TOBN(0x36175fec, 0x49421c3e), TOBN(0xc4e44f9b, 0x3dcf2678),
- TOBN(0x76df436b, 0x7220f09f), TOBN(0x172755fb, 0x3aa8b6cf),
- TOBN(0xbab89d57, 0x446139cc), TOBN(0x0a0a6e02, 0x5fe0208f),
- TOBN(0xcdbb63e2, 0x11e5d399), TOBN(0x33ecaa12, 0xa8977f0b),
- TOBN(0x59598b21, 0xf7c42664), TOBN(0xb3e91b32, 0xab65d08a),
- TOBN(0x035822ee, 0xf4502526), TOBN(0x1dcf0176, 0x720a82a9),
- TOBN(0x50f8598f, 0x3d589e02), TOBN(0xdf0478ff, 0xb1d63d2c),
- TOBN(0x8b8068bd, 0x1571cd07), TOBN(0x30c3aa4f, 0xd79670cd),
- TOBN(0x25e8fd4b, 0x941ade7f), TOBN(0x3d1debdc, 0x32790011),
- TOBN(0x65b6dcbd, 0x3a3f9ff0), TOBN(0x282736a4, 0x793de69c),
- TOBN(0xef69a0c3, 0xd41d3bd3), TOBN(0xb533b8c9, 0x07a26bde),
- TOBN(0xe2801d97, 0xdb2edf9f), TOBN(0xdc4a8269, 0xe1877af0),
- TOBN(0x6c1c5851, 0x3d590dbe), TOBN(0x84632f6b, 0xee4e9357),
- TOBN(0xd36d36b7, 0x79b33374), TOBN(0xb46833e3, 0x9bbca2e6),
- TOBN(0x37893913, 0xf7fc0586), TOBN(0x385315f7, 0x66bf4719),
- TOBN(0x72c56293, 0xb31855dc), TOBN(0xd1416d4e, 0x849061fe),
- TOBN(0xbeb3ab78, 0x51047213), TOBN(0x447f6e61, 0xf040c996),
- TOBN(0xd06d310d, 0x638b1d0c), TOBN(0xe28a413f, 0xbad1522e),
- TOBN(0x685a76cb, 0x82003f86), TOBN(0x610d07f7, 0x0bcdbca3),
- TOBN(0x6ff66021, 0x9ca4c455), TOBN(0x7df39b87, 0xcea10eec),
- TOBN(0xb9255f96, 0xe22db218), TOBN(0x8cc6d9eb, 0x08a34c44),
- TOBN(0xcd4ffb86, 0x859f9276), TOBN(0x8fa15eb2, 0x50d07335),
- TOBN(0xdf553845, 0xcf2c24b5), TOBN(0x89f66a9f, 0x52f9c3ba),
- TOBN(0x8f22b5b9, 0xe4a7ceb3), TOBN(0xaffef809, 0x0e134686),
- TOBN(0x3e53e1c6, 0x8eb8fac2), TOBN(0x93c1e4eb, 0x28aec98e),
- TOBN(0xb6b91ec5, 0x32a43bcb), TOBN(0x2dbfa947, 0xb2d74a51),
- TOBN(0xe065d190, 0xca84bad7), TOBN(0xfb13919f, 0xad58e65c),
- TOBN(0x3c41718b, 0xf1cb6e31), TOBN(0x688969f0, 0x06d05c3f),
- TOBN(0xd4f94ce7, 0x21264d45), TOBN(0xfdfb65e9, 0x7367532b),
- TOBN(0x5b1be8b1, 0x0945a39d), TOBN(0x229f789c, 0x2b8baf3b),
- TOBN(0xd8f41f3e, 0x6f49f15d), TOBN(0x678ce828, 0x907f0792),
- TOBN(0xc69ace82, 0xfca6e867), TOBN(0x106451ae, 0xd01dcc89),
- TOBN(0x1bb4f7f0, 0x19fc32d2), TOBN(0x64633dfc, 0xb00c52d2),
- TOBN(0x8f13549a, 0xad9ea445), TOBN(0x99a3bf50, 0xfb323705),
- TOBN(0x0c9625a2, 0x534d4dbc), TOBN(0x45b8f1d1, 0xc2a2fea3),
- TOBN(0x76ec21a1, 0xa530fc1a), TOBN(0x4bac9c2a, 0x9e5bd734),
- TOBN(0x5996d76a, 0x7b4e3587), TOBN(0x0045cdee, 0x1182d9e3),
- TOBN(0x1aee24b9, 0x1207f13d), TOBN(0x66452e97, 0x97345a41),
- TOBN(0x16e5b054, 0x9f950cd0), TOBN(0x9cc72fb1, 0xd7fdd075),
- TOBN(0x6edd61e7, 0x66249663), TOBN(0xde4caa4d, 0xf043cccb),
- TOBN(0x11b1f57a, 0x55c7ac17), TOBN(0x779cbd44, 0x1a85e24d),
- TOBN(0x78030f86, 0xe46081e7), TOBN(0xfd4a6032, 0x8e20f643),
- TOBN(0xcc7a6488, 0x0a750c0f), TOBN(0x39bacfe3, 0x4e548e83),
- TOBN(0x3d418c76, 0x0c110f05), TOBN(0x3e4daa4c, 0xb1f11588),
- TOBN(0x2733e7b5, 0x5ffc69ff), TOBN(0x46f147bc, 0x92053127),
- TOBN(0x885b2434, 0xd722df94), TOBN(0x6a444f65, 0xe6fc6b7c)}
- ,
- {TOBN(0x7a1a465a, 0xc3f16ea8), TOBN(0x115a461d, 0xb2f1d11c),
- TOBN(0x4767dd95, 0x6c68a172), TOBN(0x3392f2eb, 0xd13a4698),
- TOBN(0xc7a99ccd, 0xe526cdc7), TOBN(0x8e537fdc, 0x22292b81),
- TOBN(0x76d8cf69, 0xa6d39198), TOBN(0xffc5ff43, 0x2446852d),
- TOBN(0x97b14f7e, 0xa90567e6), TOBN(0x513257b7, 0xb6ae5cb7),
- TOBN(0x85454a3c, 0x9f10903d), TOBN(0xd8d2c9ad, 0x69bc3724),
- TOBN(0x38da9324, 0x6b29cb44), TOBN(0xb540a21d, 0x77c8cbac),
- TOBN(0x9bbfe435, 0x01918e42), TOBN(0xfffa707a, 0x56c3614e),
- TOBN(0x0ce4e3f1, 0xd4e353b7), TOBN(0x062d8a14, 0xef46b0a0),
- TOBN(0x6408d5ab, 0x574b73fd), TOBN(0xbc41d1c9, 0xd3273ffd),
- TOBN(0x3538e1e7, 0x6be77800), TOBN(0x71fe8b37, 0xc5655031),
- TOBN(0x1cd91621, 0x6b9b331a), TOBN(0xad825d0b, 0xbb388f73),
- TOBN(0x56c2e05b, 0x1cb76219), TOBN(0x0ec0bf91, 0x71567e7e),
- TOBN(0xe7076f86, 0x61c4c910), TOBN(0xd67b085b, 0xbabc04d9),
- TOBN(0x9fb90459, 0x5e93a96a), TOBN(0x7526c1ea, 0xfbdc249a),
- TOBN(0x0d44d367, 0xecdd0bb7), TOBN(0x95399917, 0x9dc0d695),
- TOBN(0x61360ee9, 0x9e240d18), TOBN(0x057cdcac, 0xb4b94466),
- TOBN(0xe7667cd1, 0x2fe5325c), TOBN(0x1fa297b5, 0x21974e3b),
- TOBN(0xfa4081e7, 0xdb083d76), TOBN(0x31993be6, 0xf206bd15),
- TOBN(0x8949269b, 0x14c19f8c), TOBN(0x21468d72, 0xa9d92357),
- TOBN(0x2ccbc583, 0xa4c506ec), TOBN(0x957ed188, 0xd1acfe97),
- TOBN(0x8baed833, 0x12f1aea2), TOBN(0xef2a6cb4, 0x8325362d),
- TOBN(0x130dde42, 0x8e195c43), TOBN(0xc842025a, 0x0e6050c6),
- TOBN(0x2da972a7, 0x08686a5d), TOBN(0xb52999a1, 0xe508b4a8),
- TOBN(0xd9f090b9, 0x10a5a8bd), TOBN(0xca91d249, 0x096864da),
- TOBN(0x8e6a93be, 0x3f67dbc1), TOBN(0xacae6fba, 0xf5f4764c),
- TOBN(0x1563c6e0, 0xd21411a0), TOBN(0x28fa787f, 0xda0a4ad8),
- TOBN(0xd524491c, 0x908c8030), TOBN(0x1257ba0e, 0x4c795f07),
- TOBN(0x83f49167, 0xceca9754), TOBN(0x426d2cf6, 0x4b7939a0),
- TOBN(0x2555e355, 0x723fd0bf), TOBN(0xa96e6d06, 0xc4f144e2),
- TOBN(0x4768a8dd, 0x87880e61), TOBN(0x15543815, 0xe508e4d5),
- TOBN(0x09d7e772, 0xb1b65e15), TOBN(0x63439dd6, 0xac302fa0),
- TOBN(0xb93f802f, 0xc14e35c2), TOBN(0x71735b7c, 0x4341333c),
- TOBN(0x03a25104, 0x16d4f362), TOBN(0x3f4d069b, 0xbf433c8e),
- TOBN(0x0d83ae01, 0xf78f5a7c), TOBN(0x50a8ffbe, 0x7c4eed07),
- TOBN(0xc74f8906, 0x76e10f83), TOBN(0x7d080966, 0x9ddaf8e1),
- TOBN(0xb11df8e1, 0x698e04cc), TOBN(0x877be203, 0x169005c8),
- TOBN(0x32749e8c, 0x4f3c6179), TOBN(0x2dbc9d0a, 0x7853fc05),
- TOBN(0x187d4f93, 0x9454d937), TOBN(0xe682ce9d, 0xb4800e1b),
- TOBN(0xa9129ad8, 0x165e68e8), TOBN(0x0fe29735, 0xbe7f785b),
- TOBN(0x5303f40c, 0x5b9e02b7), TOBN(0xa37c9692, 0x35ee04e8),
- TOBN(0x5f46cc20, 0x34d6632b), TOBN(0x55ef72b2, 0x96ac545b),
- TOBN(0xabec5c1f, 0x7b91b062), TOBN(0x0a79e1c7, 0xbb33e821),
- TOBN(0xbb04b428, 0x3a9f4117), TOBN(0x0de1f28f, 0xfd2a475a),
- TOBN(0x31019ccf, 0x3a4434b4), TOBN(0xa3458111, 0x1a7954dc),
- TOBN(0xa9dac80d, 0xe34972a7), TOBN(0xb043d054, 0x74f6b8dd),
- TOBN(0x021c319e, 0x11137b1a), TOBN(0x00a754ce, 0xed5cc03f),
- TOBN(0x0aa2c794, 0xcbea5ad4), TOBN(0x093e67f4, 0x70c015b6),
- TOBN(0x72cdfee9, 0xc97e3f6b), TOBN(0xc10bcab4, 0xb6da7461),
- TOBN(0x3b02d2fc, 0xb59806b9), TOBN(0x85185e89, 0xa1de6f47),
- TOBN(0x39e6931f, 0x0eb6c4d4), TOBN(0x4d4440bd, 0xd4fa5b04),
- TOBN(0x5418786e, 0x34be7eb8), TOBN(0x6380e521, 0x9d7259bc),
- TOBN(0x20ac0351, 0xd598d710), TOBN(0x272c4166, 0xcb3a4da4),
- TOBN(0xdb82fe1a, 0xca71de1f), TOBN(0x746e79f2, 0xd8f54b0f),
- TOBN(0x6e7fc736, 0x4b573e9b), TOBN(0x75d03f46, 0xfd4b5040),
- TOBN(0x5c1cc36d, 0x0b98d87b), TOBN(0x513ba3f1, 0x1f472da1),
- TOBN(0x79d0af26, 0xabb177dd), TOBN(0xf82ab568, 0x7891d564),
- TOBN(0x2b6768a9, 0x72232173), TOBN(0xefbb3bb0, 0x8c1f6619),
- TOBN(0xb29c11db, 0xa6d18358), TOBN(0x519e2797, 0xb0916d3a),
- TOBN(0xd4dc18f0, 0x9188e290), TOBN(0x648e86e3, 0x98b0ca7f),
- TOBN(0x859d3145, 0x983c38b5), TOBN(0xb14f176c, 0x637abc8b),
- TOBN(0x2793fb9d, 0xcaff7be6), TOBN(0xebe5a55f, 0x35a66a5a),
- TOBN(0x7cec1dcd, 0x9f87dc59), TOBN(0x7c595cd3, 0xfbdbf560),
- TOBN(0x5b543b22, 0x26eb3257), TOBN(0x69080646, 0xc4c935fd),
- TOBN(0x7f2e4403, 0x81e9ede3), TOBN(0x243c3894, 0xcaf6df0a),
- TOBN(0x7c605bb1, 0x1c073b11), TOBN(0xcd06a541, 0xba6a4a62),
- TOBN(0x29168949, 0x49d4e2e5), TOBN(0x33649d07, 0x4af66880),
- TOBN(0xbfc0c885, 0xe9a85035), TOBN(0xb4e52113, 0xfc410f4b),
- TOBN(0xdca3b706, 0x78a6513b), TOBN(0x92ea4a2a, 0x9edb1943),
- TOBN(0x02642216, 0xdb6e2dd8), TOBN(0x9b45d0b4, 0x9fd57894),
- TOBN(0x114e70db, 0xc69d11ae), TOBN(0x1477dd19, 0x4c57595f),
- TOBN(0xbc2208b4, 0xec77c272), TOBN(0x95c5b4d7, 0xdb68f59c),
- TOBN(0xb8c4fc63, 0x42e532b7), TOBN(0x386ba422, 0x9ae35290),
- TOBN(0xfb5dda42, 0xd201ecbc), TOBN(0x2353dc8b, 0xa0e38fd6),
- TOBN(0x9a0b85ea, 0x68f7e978), TOBN(0x96ec5682, 0x2ad6d11f),
- TOBN(0x5e279d6c, 0xe5f6886d), TOBN(0xd3fe03cd, 0x3cb1914d),
- TOBN(0xfe541fa4, 0x7ea67c77), TOBN(0x952bd2af, 0xe3ea810c),
- TOBN(0x791fef56, 0x8d01d374), TOBN(0xa3a1c621, 0x0f11336e),
- TOBN(0x5ad0d5a9, 0xc7ec6d79), TOBN(0xff7038af, 0x3225c342),
- TOBN(0x003c6689, 0xbc69601b), TOBN(0x25059bc7, 0x45e8747d),
- TOBN(0xfa4965b2, 0xf2086fbf), TOBN(0xf6840ea6, 0x86916078),
- TOBN(0xd7ac7620, 0x70081d6c), TOBN(0xe600da31, 0xb5328645),
- TOBN(0x01916f63, 0x529b8a80), TOBN(0xe80e4858, 0x2d7d6f3e),
- TOBN(0x29eb0fe8, 0xd664ca7c), TOBN(0xf017637b, 0xe7b43b0c),
- TOBN(0x9a75c806, 0x76cb2566), TOBN(0x8f76acb1, 0xb24892d9),
- TOBN(0x7ae7b9cc, 0x1f08fe45), TOBN(0x19ef7329, 0x6a4907d8),
- TOBN(0x2db4ab71, 0x5f228bf0), TOBN(0xf3cdea39, 0x817032d7),
- TOBN(0x0b1f482e, 0xdcabe3c0), TOBN(0x3baf76b4, 0xbb86325c),
- TOBN(0xd49065e0, 0x10089465), TOBN(0x3bab5d29, 0x8e77c596),
- TOBN(0x7636c3a6, 0x193dbd95), TOBN(0xdef5d294, 0xb246e499),
- TOBN(0xb22c58b9, 0x286b2475), TOBN(0xa0b93939, 0xcd80862b),
- TOBN(0x3002c83a, 0xf0992388), TOBN(0x6de01f9b, 0xeacbe14c),
- TOBN(0x6aac688e, 0xadd70482), TOBN(0x708de92a, 0x7b4a4e8a),
- TOBN(0x75b6dd73, 0x758a6eef), TOBN(0xea4bf352, 0x725b3c43),
- TOBN(0x10041f2c, 0x87912868), TOBN(0xb1b1be95, 0xef09297a),
- TOBN(0x19ae23c5, 0xa9f3860a), TOBN(0xc4f0f839, 0x515dcf4b),
- TOBN(0x3c7ecca3, 0x97f6306a), TOBN(0x744c44ae, 0x68a3a4b0),
- TOBN(0x69cd13a0, 0xb3a1d8a2), TOBN(0x7cad0a1e, 0x5256b578),
- TOBN(0xea653fcd, 0x33791d9e), TOBN(0x9cc2a05d, 0x74b2e05f),
- TOBN(0x73b391dc, 0xfd7affa2), TOBN(0xddb7091e, 0xb6b05442),
- TOBN(0xc71e27bf, 0x8538a5c6), TOBN(0x195c63dd, 0x89abff17),
- TOBN(0xfd315285, 0x1b71e3da), TOBN(0x9cbdfda7, 0xfa680fa0),
- TOBN(0x9db876ca, 0x849d7eab), TOBN(0xebe2764b, 0x3c273271),
- TOBN(0x663357e3, 0xf208dcea), TOBN(0x8c5bd833, 0x565b1b70),
- TOBN(0xccc3b4f5, 0x9837fc0d), TOBN(0x9b641ba8, 0xa79cf00f),
- TOBN(0x7428243d, 0xdfdf3990), TOBN(0x83a594c4, 0x020786b1),
- TOBN(0xb712451a, 0x526c4502), TOBN(0x9d39438e, 0x6adb3f93),
- TOBN(0xfdb261e3, 0xe9ff0ccd), TOBN(0x80344e3c, 0xe07af4c3),
- TOBN(0x75900d7c, 0x2fa4f126), TOBN(0x08a3b865, 0x5c99a232),
- TOBN(0x2478b6bf, 0xdb25e0c3), TOBN(0x482cc2c2, 0x71db2edf),
- TOBN(0x37df7e64, 0x5f321bb8), TOBN(0x8a93821b, 0x9a8005b4),
- TOBN(0x3fa2f10c, 0xcc8c1958), TOBN(0x0d332218, 0x2c269d0a),
- TOBN(0x20ab8119, 0xe246b0e6), TOBN(0xb39781e4, 0xd349fd17),
- TOBN(0xd293231e, 0xb31aa100), TOBN(0x4b779c97, 0xbb032168),
- TOBN(0x4b3f19e1, 0xc8470500), TOBN(0x45b7efe9, 0x0c4c869d),
- TOBN(0xdb84f38a, 0xa1a6bbcc), TOBN(0x3b59cb15, 0xb2fddbc1),
- TOBN(0xba5514df, 0x3fd165e8), TOBN(0x499fd6a9, 0x061f8811),
- TOBN(0x72cd1fe0, 0xbfef9f00), TOBN(0x120a4bb9, 0x79ad7e8a),
- TOBN(0xf2ffd095, 0x5f4a5ac5), TOBN(0xcfd174f1, 0x95a7a2f0),
- TOBN(0xd42301ba, 0x9d17baf1), TOBN(0xd2fa487a, 0x77f22089),
- TOBN(0x9cb09efe, 0xb1dc77e1), TOBN(0xe9566939, 0x21c99682),
- TOBN(0x8c546901, 0x6c6067bb), TOBN(0xfd378574, 0x61c24456),
- TOBN(0x2b6a6cbe, 0x81796b33), TOBN(0x62d550f6, 0x58e87f8b),
- TOBN(0x1b763e1c, 0x7f1b01b4), TOBN(0x4b93cfea, 0x1b1b5e12),
- TOBN(0xb9345238, 0x1d531696), TOBN(0x57201c00, 0x88cdde69),
- TOBN(0xdde92251, 0x9a86afc7), TOBN(0xe3043895, 0xbd35cea8),
- TOBN(0x7608c1e1, 0x8555970d), TOBN(0x8267dfa9, 0x2535935e),
- TOBN(0xd4c60a57, 0x322ea38b), TOBN(0xe0bf7977, 0x804ef8b5),
- TOBN(0x1a0dab28, 0xc06fece4), TOBN(0xd405991e, 0x94e7b49d),
- TOBN(0xc542b6d2, 0x706dab28), TOBN(0xcb228da3, 0xa91618fb),
- TOBN(0x224e4164, 0x107d1cea), TOBN(0xeb9fdab3, 0xd0f5d8f1),
- TOBN(0xc02ba386, 0x0d6e41cd), TOBN(0x676a72c5, 0x9b1f7146),
- TOBN(0xffd6dd98, 0x4d6cb00b), TOBN(0xcef9c5ca, 0xde2e8d7c),
- TOBN(0xa1bbf5d7, 0x641c7936), TOBN(0x1b95b230, 0xee8f772e),
- TOBN(0xf765a92e, 0xe8ac25b1), TOBN(0xceb04cfc, 0x3a18b7c6),
- TOBN(0x27944cef, 0x0acc8966), TOBN(0xcbb3c957, 0x434c1004),
- TOBN(0x9c9971a1, 0xa43ff93c), TOBN(0x5bc2db17, 0xa1e358a9),
- TOBN(0x45b4862e, 0xa8d9bc82), TOBN(0x70ebfbfb, 0x2201e052),
- TOBN(0xafdf64c7, 0x92871591), TOBN(0xea5bcae6, 0xb42d0219),
- TOBN(0xde536c55, 0x2ad8f03c), TOBN(0xcd6c3f4d, 0xa76aa33c),
- TOBN(0xbeb5f623, 0x0bca6de3), TOBN(0xdd20dd99, 0xb1e706fd),
- TOBN(0x90b3ff9d, 0xac9059d4), TOBN(0x2d7b2902, 0x7ccccc4e),
- TOBN(0x8a090a59, 0xce98840f), TOBN(0xa5d947e0, 0x8410680a),
- TOBN(0x49ae346a, 0x923379a5), TOBN(0x7dbc84f9, 0xb28a3156),
- TOBN(0xfd40d916, 0x54a1aff2), TOBN(0xabf318ba, 0x3a78fb9b),
- TOBN(0x50152ed8, 0x3029f95e), TOBN(0x9fc1dd77, 0xc58ad7fa),
- TOBN(0x5fa57915, 0x13595c17), TOBN(0xb9504668, 0x8f62b3a9),
- TOBN(0x907b5b24, 0xff3055b0), TOBN(0x2e995e35, 0x9a84f125),
- TOBN(0x87dacf69, 0x7e9bbcfb), TOBN(0x95d0c1d6, 0xe86d96e3),
- TOBN(0x65726e3c, 0x2d95a75c), TOBN(0x2c3c9001, 0xacd27f21),
- TOBN(0x1deab561, 0x6c973f57), TOBN(0x108b7e2c, 0xa5221643),
- TOBN(0x5fee9859, 0xc4ef79d4), TOBN(0xbd62b88a, 0x40d4b8c6),
- TOBN(0xb4dd29c4, 0x197c75d6), TOBN(0x266a6df2, 0xb7076feb),
- TOBN(0x9512d0ea, 0x4bf2df11), TOBN(0x1320c24f, 0x6b0cc9ec),
- TOBN(0x6bb1e0e1, 0x01a59596), TOBN(0x8317c5bb, 0xeff9aaac),
- TOBN(0x65bb405e, 0x385aa6c9), TOBN(0x613439c1, 0x8f07988f),
- TOBN(0xd730049f, 0x16a66e91), TOBN(0xe97f2820, 0xfa1b0e0d),
- TOBN(0x4131e003, 0x304c28ea), TOBN(0x820ab732, 0x526bac62),
- TOBN(0xb2ac9ef9, 0x28714423), TOBN(0x54ecfffa, 0xadb10cb2),
- TOBN(0x8781476e, 0xf886a4cc), TOBN(0x4b2c87b5, 0xdb2f8d49),
- TOBN(0xe857cd20, 0x0a44295d), TOBN(0x707d7d21, 0x58c6b044),
- TOBN(0xae8521f9, 0xf596757c), TOBN(0x87448f03, 0x67b2b714),
- TOBN(0x13a9bc45, 0x5ebcd58d), TOBN(0x79bcced9, 0x9122d3c1),
- TOBN(0x3c644247, 0x9e076642), TOBN(0x0cf22778, 0x2df4767d),
- TOBN(0x5e61aee4, 0x71d444b6), TOBN(0x211236bf, 0xc5084a1d),
- TOBN(0x7e15bc9a, 0x4fd3eaf6), TOBN(0x68df2c34, 0xab622bf5),
- TOBN(0x9e674f0f, 0x59bf4f36), TOBN(0xf883669b, 0xd7f34d73),
- TOBN(0xc48ac1b8, 0x31497b1d), TOBN(0x323b925d, 0x5106703b),
- TOBN(0x22156f42, 0x74082008), TOBN(0xeffc521a, 0xc8482bcb),
- TOBN(0x5c6831bf, 0x12173479), TOBN(0xcaa2528f, 0xc4739490),
- TOBN(0x84d2102a, 0x8f1b3c4d), TOBN(0xcf64dfc1, 0x2d9bec0d),
- TOBN(0x433febad, 0x78a546ef), TOBN(0x1f621ec3, 0x7b73cef1),
- TOBN(0x6aecd627, 0x37338615), TOBN(0x162082ab, 0x01d8edf6),
- TOBN(0x833a8119, 0x19e86b66), TOBN(0x6023a251, 0xd299b5db),
- TOBN(0xf5bb0c3a, 0xbbf04b89), TOBN(0x6735eb69, 0xae749a44),
- TOBN(0xd0e058c5, 0x4713de3b), TOBN(0xfdf2593e, 0x2c3d4ccd),
- TOBN(0x1b8f414e, 0xfdd23667), TOBN(0xdd52aaca, 0xfa2015ee),
- TOBN(0x3e31b517, 0xbd9625ff), TOBN(0x5ec9322d, 0x8db5918c),
- TOBN(0xbc73ac85, 0xa96f5294), TOBN(0x82aa5bf3, 0x61a0666a),
- TOBN(0x49755810, 0xbf08ac42), TOBN(0xd21cdfd5, 0x891cedfc),
- TOBN(0x918cb57b, 0x67f8be10), TOBN(0x365d1a7c, 0x56ffa726),
- TOBN(0x2435c504, 0x6532de93), TOBN(0xc0fc5e10, 0x2674cd02),
- TOBN(0x6e51fcf8, 0x9cbbb142), TOBN(0x1d436e5a, 0xafc50692),
- TOBN(0x766bffff, 0x3fbcae22), TOBN(0x3148c2fd, 0xfd55d3b8),
- TOBN(0x52c7fdc9, 0x233222fa), TOBN(0x89ff1092, 0xe419fb6b),
- TOBN(0x3cd6db99, 0x25254977), TOBN(0x2e85a161, 0x1cf12ca7),
- TOBN(0xadd2547c, 0xdc810bc9), TOBN(0xea3f458f, 0x9d257c22),
- TOBN(0x642c1fbe, 0x27d6b19b), TOBN(0xed07e6b5, 0x140481a6),
- TOBN(0x6ada1d42, 0x86d2e0f8), TOBN(0xe5920122, 0x0e8a9fd5),
- TOBN(0x02c936af, 0x708c1b49), TOBN(0x60f30fee, 0x2b4bfaff),
- TOBN(0x6637ad06, 0x858e6a61), TOBN(0xce4c7767, 0x3fd374d0),
- TOBN(0x39d54b2d, 0x7188defb), TOBN(0xa8c9d250, 0xf56a6b66),
- TOBN(0x58fc0f5e, 0xb24fe1dc), TOBN(0x9eaf9dee, 0x6b73f24c),
- TOBN(0xa90d588b, 0x33650705), TOBN(0xde5b62c5, 0xaf2ec729),
- TOBN(0x5c72cfae, 0xd3c2b36e), TOBN(0x868c19d5, 0x034435da),
- TOBN(0x88605f93, 0xe17ee145), TOBN(0xaa60c4ee, 0x77a5d5b1),
- TOBN(0xbcf5bfd2, 0x3b60c472), TOBN(0xaf4ef13c, 0xeb1d3049),
- TOBN(0x373f44fc, 0xe13895c9), TOBN(0xf29b382f, 0x0cbc9822),
- TOBN(0x1bfcb853, 0x73efaef6), TOBN(0xcf56ac9c, 0xa8c96f40),
- TOBN(0xd7adf109, 0x7a191e24), TOBN(0x98035f44, 0xbf8a8dc2),
- TOBN(0xf40a71b9, 0x1e750c84), TOBN(0xc57f7b0c, 0x5dc6c469),
- TOBN(0x49a0e79c, 0x6fbc19c1), TOBN(0x6b0f5889, 0xa48ebdb8),
- TOBN(0x5d3fd084, 0xa07c4e9f), TOBN(0xc3830111, 0xab27de14),
- TOBN(0x0e4929fe, 0x33e08dcc), TOBN(0xf4a5ad24, 0x40bb73a3),
- TOBN(0xde86c2bf, 0x490f97ca), TOBN(0x288f09c6, 0x67a1ce18),
- TOBN(0x364bb886, 0x1844478d), TOBN(0x7840fa42, 0xceedb040),
- TOBN(0x1269fdd2, 0x5a631b37), TOBN(0x94761f1e, 0xa47c8b7d),
- TOBN(0xfc0c2e17, 0x481c6266), TOBN(0x85e16ea2, 0x3daa5fa7),
- TOBN(0xccd86033, 0x92491048), TOBN(0x0c2f6963, 0xf4d402d7),
- TOBN(0x6336f7df, 0xdf6a865c), TOBN(0x0a2a463c, 0xb5c02a87),
- TOBN(0xb0e29be7, 0xbf2f12ee), TOBN(0xf0a22002, 0x66bad988),
- TOBN(0x27f87e03, 0x9123c1d7), TOBN(0x21669c55, 0x328a8c98),
- TOBN(0x186b9803, 0x92f14529), TOBN(0xd3d056cc, 0x63954df3),
- TOBN(0x2f03fd58, 0x175a46f6), TOBN(0x63e34ebe, 0x11558558),
- TOBN(0xe13fedee, 0x5b80cfa5), TOBN(0xe872a120, 0xd401dbd1),
- TOBN(0x52657616, 0xe8a9d667), TOBN(0xbc8da4b6, 0xe08d6693),
- TOBN(0x370fb9bb, 0x1b703e75), TOBN(0x6773b186, 0xd4338363),
- TOBN(0x18dad378, 0xecef7bff), TOBN(0xaac787ed, 0x995677da),
- TOBN(0x4801ea8b, 0x0437164b), TOBN(0xf430ad20, 0x73fe795e),
- TOBN(0xb164154d, 0x8ee5eb73), TOBN(0x0884ecd8, 0x108f7c0e),
- TOBN(0x0e6ec096, 0x5f520698), TOBN(0x640631fe, 0x44f7b8d9),
- TOBN(0x92fd34fc, 0xa35a68b9), TOBN(0x9c5a4b66, 0x4d40cf4e),
- TOBN(0x949454bf, 0x80b6783d), TOBN(0x80e701fe, 0x3a320a10),
- TOBN(0x8d1a564a, 0x1a0a39b2), TOBN(0x1436d53d, 0x320587db),
- TOBN(0xf5096e6d, 0x6556c362), TOBN(0xbc23a3c0, 0xe2455d7e),
- TOBN(0x3a7aee54, 0x807230f9), TOBN(0x9ba1cfa6, 0x22ae82fd),
- TOBN(0x833a057a, 0x99c5d706), TOBN(0x8be85f4b, 0x842315c9),
- TOBN(0xd083179a, 0x66a72f12), TOBN(0x2fc77d5d, 0xcdcc73cd),
- TOBN(0x22b88a80, 0x5616ee30), TOBN(0xfb09548f, 0xe7ab1083),
- TOBN(0x8ad6ab0d, 0x511270cd), TOBN(0x61f6c57a, 0x6924d9ab),
- TOBN(0xa0f7bf72, 0x90aecb08), TOBN(0x849f87c9, 0x0df784a4),
- TOBN(0x27c79c15, 0xcfaf1d03), TOBN(0xbbf9f675, 0xc463face),
- TOBN(0x91502c65, 0x765ba543), TOBN(0x18ce3cac, 0x42ea60dd),
- TOBN(0xe5cee6ac, 0x6e43ecb3), TOBN(0x63e4e910, 0x68f2aeeb),
- TOBN(0x26234fa3, 0xc85932ee), TOBN(0x96883e8b, 0x4c90c44d),
- TOBN(0x29b9e738, 0xa18a50f6), TOBN(0xbfc62b2a, 0x3f0420df),
- TOBN(0xd22a7d90, 0x6d3e1fa9), TOBN(0x17115618, 0xfe05b8a3),
- TOBN(0x2a0c9926, 0xbb2b9c01), TOBN(0xc739fcc6, 0xe07e76a2),
- TOBN(0x540e9157, 0x165e439a), TOBN(0x06353a62, 0x6a9063d8),
- TOBN(0x84d95594, 0x61e927a3), TOBN(0x013b9b26, 0xe2e0be7f),
- TOBN(0x4feaec3b, 0x973497f1), TOBN(0x15c0f94e, 0x093ebc2d),
- TOBN(0x6af5f227, 0x33af0583), TOBN(0x0c2af206, 0xc61f3340),
- TOBN(0xd25dbdf1, 0x4457397c), TOBN(0x2e8ed017, 0xcabcbae0),
- TOBN(0xe3010938, 0xc2815306), TOBN(0xbaa99337, 0xe8c6cd68),
- TOBN(0x08513182, 0x3b0ec7de), TOBN(0x1e1b822b, 0x58df05df),
- TOBN(0x5c14842f, 0xa5c3b683), TOBN(0x98fe977e, 0x3eba34ce),
- TOBN(0xfd2316c2, 0x0d5e8873), TOBN(0xe48d839a, 0xbd0d427d),
- TOBN(0x495b2218, 0x623fc961), TOBN(0x24ee56e7, 0xb46fba5e),
- TOBN(0x9184a55b, 0x91e4de58), TOBN(0xa7488ca5, 0xdfdea288),
- TOBN(0xa723862e, 0xa8dcc943), TOBN(0x92d762b2, 0x849dc0fc),
- TOBN(0x3c444a12, 0x091ff4a9), TOBN(0x581113fa, 0x0cada274),
- TOBN(0xb9de0a45, 0x30d8eae2), TOBN(0x5e0fcd85, 0xdf6b41ea),
- TOBN(0x6233ea68, 0xc094dbb5), TOBN(0xb77d062e, 0xd968d410),
- TOBN(0x3e719bbc, 0x58b3002d), TOBN(0x68e7dd3d, 0x3dc49d58),
- TOBN(0x8d825740, 0x013a5e58), TOBN(0x21311747, 0x3c9e3c1b),
- TOBN(0x0cb0a2a7, 0x7c99b6ab), TOBN(0x5c48a3b3, 0xc2f888f2)}
- ,
- {TOBN(0xc7913e91, 0x991724f3), TOBN(0x5eda799c, 0x39cbd686),
- TOBN(0xddb595c7, 0x63d4fc1e), TOBN(0x6b63b80b, 0xac4fed54),
- TOBN(0x6ea0fc69, 0x7e5fb516), TOBN(0x737708ba, 0xd0f1c964),
- TOBN(0x9628745f, 0x11a92ca5), TOBN(0x61f37958, 0x9a86967a),
- TOBN(0x9af39b2c, 0xaa665072), TOBN(0x78322fa4, 0xefd324ef),
- TOBN(0x3d153394, 0xc327bd31), TOBN(0x81d5f271, 0x3129dab0),
- TOBN(0xc72e0c42, 0xf48027f5), TOBN(0xaa40cdbc, 0x8536e717),
- TOBN(0xf45a657a, 0x2d369d0f), TOBN(0xb03bbfc4, 0xea7f74e6),
- TOBN(0x46a8c418, 0x0d738ded), TOBN(0x6f1a5bb0, 0xe0de5729),
- TOBN(0xf10230b9, 0x8ba81675), TOBN(0x32c6f30c, 0x112b33d4),
- TOBN(0x7559129d, 0xd8fffb62), TOBN(0x6a281b47, 0xb459bf05),
- TOBN(0x77c1bd3a, 0xfa3b6776), TOBN(0x0709b380, 0x7829973a),
- TOBN(0x8c26b232, 0xa3326505), TOBN(0x38d69272, 0xee1d41bf),
- TOBN(0x0459453e, 0xffe32afa), TOBN(0xce8143ad, 0x7cb3ea87),
- TOBN(0x932ec1fa, 0x7e6ab666), TOBN(0x6cd2d230, 0x22286264),
- TOBN(0x459a46fe, 0x6736f8ed), TOBN(0x50bf0d00, 0x9eca85bb),
- TOBN(0x0b825852, 0x877a21ec), TOBN(0x300414a7, 0x0f537a94),
- TOBN(0x3f1cba40, 0x21a9a6a2), TOBN(0x50824eee, 0x76943c00),
- TOBN(0xa0dbfcec, 0xf83cba5d), TOBN(0xf9538148, 0x93b4f3c0),
- TOBN(0x61744162, 0x48f24dd7), TOBN(0x5322d64d, 0xe4fb09dd),
- TOBN(0x57447384, 0x3d9325f3), TOBN(0xa9bef2d0, 0xf371cb84),
- TOBN(0x77d2188b, 0xa61e36c5), TOBN(0xbbd6a7d7, 0xc602df72),
- TOBN(0xba3aa902, 0x8f61bc0b), TOBN(0xf49085ed, 0x6ed0b6a1),
- TOBN(0x8bc625d6, 0xae6e8298), TOBN(0x832b0b1d, 0xa2e9c01d),
- TOBN(0xa337c447, 0xf1f0ced1), TOBN(0x800cc793, 0x9492dd2b),
- TOBN(0x4b93151d, 0xbea08efa), TOBN(0x820cf3f8, 0xde0a741e),
- TOBN(0xff1982dc, 0x1c0f7d13), TOBN(0xef921960, 0x84dde6ca),
- TOBN(0x1ad7d972, 0x45f96ee3), TOBN(0x319c8dbe, 0x29dea0c7),
- TOBN(0xd3ea3871, 0x7b82b99b), TOBN(0x75922d4d, 0x470eb624),
- TOBN(0x8f66ec54, 0x3b95d466), TOBN(0x66e673cc, 0xbee1e346),
- TOBN(0x6afe67c4, 0xb5f2b89a), TOBN(0x3de9c1e6, 0x290e5cd3),
- TOBN(0x8c278bb6, 0x310a2ada), TOBN(0x420fa384, 0x0bdb323b),
- TOBN(0x0ae1d63b, 0x0eb919b0), TOBN(0xd74ee51d, 0xa74b9620),
- TOBN(0x395458d0, 0xa674290c), TOBN(0x324c930f, 0x4620a510),
- TOBN(0x2d1f4d19, 0xfbac27d4), TOBN(0x4086e8ca, 0x9bedeeac),
- TOBN(0x0cdd211b, 0x9b679ab8), TOBN(0x5970167d, 0x7090fec4),
- TOBN(0x3420f2c9, 0xfaf1fc63), TOBN(0x616d333a, 0x328c8bb4),
- TOBN(0x7d65364c, 0x57f1fe4a), TOBN(0x9343e877, 0x55e5c73a),
- TOBN(0x5795176b, 0xe970e78c), TOBN(0xa36ccebf, 0x60533627),
- TOBN(0xfc7c7380, 0x09cdfc1b), TOBN(0xb39a2afe, 0xb3fec326),
- TOBN(0xb7ff1ba1, 0x6224408a), TOBN(0xcc856e92, 0x247cfc5e),
- TOBN(0x01f102e7, 0xc18bc493), TOBN(0x4613ab74, 0x2091c727),
- TOBN(0xaa25e89c, 0xc420bf2b), TOBN(0x00a53176, 0x90337ec2),
- TOBN(0xd2be9f43, 0x7d025fc7), TOBN(0x3316fb85, 0x6e6fe3dc),
- TOBN(0x27520af5, 0x9ac50814), TOBN(0xfdf95e78, 0x9a8e4223),
- TOBN(0xb7e7df2a, 0x56bec5a0), TOBN(0xf7022f7d, 0xdf159e5d),
- TOBN(0x93eeeab1, 0xcac1fe8f), TOBN(0x8040188c, 0x37451168),
- TOBN(0x7ee8aa8a, 0xd967dce6), TOBN(0xfa0e79e7, 0x3abc9299),
- TOBN(0x67332cfc, 0x2064cfd1), TOBN(0x339c31de, 0xb0651934),
- TOBN(0x719b28d5, 0x2a3bcbea), TOBN(0xee74c82b, 0x9d6ae5c6),
- TOBN(0x0927d05e, 0xbaf28ee6), TOBN(0x82cecf2c, 0x9d719028),
- TOBN(0x0b0d353e, 0xddb30289), TOBN(0xfe4bb977, 0xfddb2e29),
- TOBN(0xbb5bb990, 0x640bfd9e), TOBN(0xd226e277, 0x82f62108),
- TOBN(0x4bf00985, 0x02ffdd56), TOBN(0x7756758a, 0x2ca1b1b5),
- TOBN(0xc32b62a3, 0x5285fe91), TOBN(0xedbc546a, 0x8c9cd140),
- TOBN(0x1e47a013, 0xaf5cb008), TOBN(0xbca7e720, 0x073ce8f2),
- TOBN(0xe10b2ab8, 0x17a91cae), TOBN(0xb89aab65, 0x08e27f63),
- TOBN(0x7b3074a7, 0xdba3ddf9), TOBN(0x1c20ce09, 0x330c2972),
- TOBN(0x6b9917b4, 0x5fcf7e33), TOBN(0xe6793743, 0x945ceb42),
- TOBN(0x18fc2215, 0x5c633d19), TOBN(0xad1adb3c, 0xc7485474),
- TOBN(0x646f9679, 0x6424c49b), TOBN(0xf888dfe8, 0x67c241c9),
- TOBN(0xe12d4b93, 0x24f68b49), TOBN(0x9a6b62d8, 0xa571df20),
- TOBN(0x81b4b26d, 0x179483cb), TOBN(0x666f9632, 0x9511fae2),
- TOBN(0xd281b3e4, 0xd53aa51f), TOBN(0x7f96a765, 0x7f3dbd16),
- TOBN(0xa7f8b5bf, 0x074a30ce), TOBN(0xd7f52107, 0x005a32e6),
- TOBN(0x6f9e0907, 0x50237ed4), TOBN(0x2f21da47, 0x8096fa2b),
- TOBN(0xf3e19cb4, 0xeec863a0), TOBN(0xd18f77fd, 0x9527620a),
- TOBN(0x9505c81c, 0x407c1cf8), TOBN(0x9998db4e, 0x1b6ec284),
- TOBN(0x7e3389e5, 0xc247d44d), TOBN(0x12507141, 0x3f4f3d80),
- TOBN(0xd4ba0110, 0x4a78a6c7), TOBN(0x312874a0, 0x767720be),
- TOBN(0xded059a6, 0x75944370), TOBN(0xd6123d90, 0x3b2c0bdd),
- TOBN(0xa56b717b, 0x51c108e3), TOBN(0x9bb7940e, 0x070623e9),
- TOBN(0x794e2d59, 0x84ac066c), TOBN(0xf5954a92, 0xe68c69a0),
- TOBN(0x28c52458, 0x4fd99dcc), TOBN(0x60e639fc, 0xb1012517),
- TOBN(0xc2e60125, 0x7de79248), TOBN(0xe9ef6404, 0xf12fc6d7),
- TOBN(0x4c4f2808, 0x2a3b5d32), TOBN(0x865ad32e, 0xc768eb8a),
- TOBN(0xac02331b, 0x13fb70b6), TOBN(0x037b44c1, 0x95599b27),
- TOBN(0x1a860fc4, 0x60bd082c), TOBN(0xa2e25745, 0xc980cd01),
- TOBN(0xee3387a8, 0x1da0263e), TOBN(0x931bfb95, 0x2d10f3d6),
- TOBN(0x5b687270, 0xa1f24a32), TOBN(0xf140e65d, 0xca494b86),
- TOBN(0x4f4ddf91, 0xb2f1ac7a), TOBN(0xf99eaabb, 0x760fee27),
- TOBN(0x57f4008a, 0x49c228e5), TOBN(0x090be440, 0x1cf713bb),
- TOBN(0xac91fbe4, 0x5004f022), TOBN(0xd838c2c2, 0x569e1af6),
- TOBN(0xd6c7d20b, 0x0f1daaa5), TOBN(0xaa063ac1, 0x1bbb02c0),
- TOBN(0x0938a422, 0x59558a78), TOBN(0x5343c669, 0x8435da2f),
- TOBN(0x96f67b18, 0x034410dc), TOBN(0x7cc1e424, 0x84510804),
- TOBN(0x86a1543f, 0x16dfbb7d), TOBN(0x921fa942, 0x5b5bd592),
- TOBN(0x9dcccb6e, 0xb33dd03c), TOBN(0x8581ddd9, 0xb843f51e),
- TOBN(0x54935fcb, 0x81d73c9e), TOBN(0x6d07e979, 0x0a5e97ab),
- TOBN(0x4dc7b30a, 0xcf3a6bab), TOBN(0x147ab1f3, 0x170bee11),
- TOBN(0x0aaf8e3d, 0x9fafdee4), TOBN(0xfab3dbcb, 0x538a8b95),
- TOBN(0x405df4b3, 0x6ef13871), TOBN(0xf1f4e9cb, 0x088d5a49),
- TOBN(0x9bcd24d3, 0x66b33f1d), TOBN(0x3b97b820, 0x5ce445c0),
- TOBN(0xe2926549, 0xba93ff61), TOBN(0xd9c341ce, 0x4dafe616),
- TOBN(0xfb30a76e, 0x16efb6f3), TOBN(0xdf24b8ca, 0x605b953c),
- TOBN(0x8bd52afe, 0xc2fffb9f), TOBN(0xbbac5ff7, 0xe19d0b96),
- TOBN(0x43c01b87, 0x459afccd), TOBN(0x6bd45143, 0xb7432652),
- TOBN(0x84734530, 0x55b5d78e), TOBN(0x81088fdb, 0x1554ba7d),
- TOBN(0xada0a52c, 0x1e269375), TOBN(0xf9f037c4, 0x2dc5ec10),
- TOBN(0xc0660607, 0x94bfbc11), TOBN(0xc0a630bb, 0xc9c40d2f),
- TOBN(0x5efc797e, 0xab64c31e), TOBN(0xffdb1dab, 0x74507144),
- TOBN(0xf6124287, 0x1ca6790c), TOBN(0xe9609d81, 0xe69bf1bf),
- TOBN(0xdb898595, 0x00d24fc9), TOBN(0x9c750333, 0xe51fb417),
- TOBN(0x51830a91, 0xfef7bbde), TOBN(0x0ce67dc8, 0x945f585c),
- TOBN(0x9a730ed4, 0x4763eb50), TOBN(0x24a0e221, 0xc1ab0d66),
- TOBN(0x643b6393, 0x648748f3), TOBN(0x1982daa1, 0x6d3c6291),
- TOBN(0x6f00a9f7, 0x8bbc5549), TOBN(0x7a1783e1, 0x7f36384e),
- TOBN(0xe8346323, 0xde977f50), TOBN(0x91ab688d, 0xb245502a),
- TOBN(0x331ab6b5, 0x6d0bdd66), TOBN(0x0a6ef32e, 0x64b71229),
- TOBN(0x1028150e, 0xfe7c352f), TOBN(0x27e04350, 0xce7b39d3),
- TOBN(0x2a3c8acd, 0xc1070c82), TOBN(0xfb2034d3, 0x80c9feef),
- TOBN(0x2d729621, 0x709f3729), TOBN(0x8df290bf, 0x62cb4549),
- TOBN(0x02f99f33, 0xfc2e4326), TOBN(0x3b30076d, 0x5eddf032),
- TOBN(0xbb21f8cf, 0x0c652fb5), TOBN(0x314fb49e, 0xed91cf7b),
- TOBN(0xa013eca5, 0x2f700750), TOBN(0x2b9e3c23, 0x712a4575),
- TOBN(0xe5355557, 0xaf30fbb0), TOBN(0x1ada3516, 0x7c77e771),
- TOBN(0x45f6ecb2, 0x7b135670), TOBN(0xe85d19df, 0x7cfc202e),
- TOBN(0x0f1b50c7, 0x58d1be9f), TOBN(0x5ebf2c0a, 0xead2e344),
- TOBN(0x1531fe4e, 0xabc199c9), TOBN(0xc7032592, 0x56bab0ae),
- TOBN(0x16ab2e48, 0x6c1fec54), TOBN(0x0f87fda8, 0x04280188),
- TOBN(0xdc9f46fc, 0x609e4a74), TOBN(0x2a44a143, 0xba667f91),
- TOBN(0xbc3d8b95, 0xb4d83436), TOBN(0xa01e4bd0, 0xc7bd2958),
- TOBN(0x7b182932, 0x73483c90), TOBN(0xa79c6aa1, 0xa7c7b598),
- TOBN(0xbf3983c6, 0xeaaac07e), TOBN(0x8f18181e, 0x96e0d4e6),
- TOBN(0x8553d37c, 0x051af62b), TOBN(0xe9a998eb, 0x0bf94496),
- TOBN(0xe0844f9f, 0xb0d59aa1), TOBN(0x983fd558, 0xe6afb813),
- TOBN(0x9670c0ca, 0x65d69804), TOBN(0x732b22de, 0x6ea5ff2d),
- TOBN(0xd7640ba9, 0x5fd8623b), TOBN(0x9f619163, 0xa6351782),
- TOBN(0x0bfc27ee, 0xacee5043), TOBN(0xae419e73, 0x2eb10f02),
- TOBN(0x19c028d1, 0x8943fb05), TOBN(0x71f01cf7, 0xff13aa2a),
- TOBN(0x7790737e, 0x8887a132), TOBN(0x67513309, 0x66318410),
- TOBN(0x9819e8a3, 0x7ddb795e), TOBN(0xfecb8ef5, 0xdad100b2),
- TOBN(0x59f74a22, 0x3021926a), TOBN(0xb7c28a49, 0x6f9b4c1c),
- TOBN(0xed1a733f, 0x912ad0ab), TOBN(0x42a910af, 0x01a5659c),
- TOBN(0x3842c6e0, 0x7bd68cab), TOBN(0x2b57fa38, 0x76d70ac8),
- TOBN(0x8a6707a8, 0x3c53aaeb), TOBN(0x62c1c510, 0x65b4db18),
- TOBN(0x8de2c1fb, 0xb2d09dc7), TOBN(0xc3dfed12, 0x266bd23b),
- TOBN(0x927d039b, 0xd5b27db6), TOBN(0x2fb2f0f1, 0x103243da),
- TOBN(0xf855a07b, 0x80be7399), TOBN(0xed9327ce, 0x1f9f27a8),
- TOBN(0xa0bd99c7, 0x729bdef7), TOBN(0x2b67125e, 0x28250d88),
- TOBN(0x784b26e8, 0x8670ced7), TOBN(0xe3dfe41f, 0xc31bd3b4),
- TOBN(0x9e353a06, 0xbcc85cbc), TOBN(0x302e2909, 0x60178a9d),
- TOBN(0x860abf11, 0xa6eac16e), TOBN(0x76447000, 0xaa2b3aac),
- TOBN(0x46ff9d19, 0x850afdab), TOBN(0x35bdd6a5, 0xfdb2d4c1),
- TOBN(0xe82594b0, 0x7e5c9ce9), TOBN(0x0f379e53, 0x20af346e),
- TOBN(0x608b31e3, 0xbc65ad4a), TOBN(0x710c6b12, 0x267c4826),
- TOBN(0x51c966f9, 0x71954cf1), TOBN(0xb1cec793, 0x0d0aa215),
- TOBN(0x1f155989, 0x86bd23a8), TOBN(0xae2ff99c, 0xf9452e86),
- TOBN(0xd8dd953c, 0x340ceaa2), TOBN(0x26355275, 0x2e2e9333),
- TOBN(0x15d4e5f9, 0x8586f06d), TOBN(0xd6bf94a8, 0xf7cab546),
- TOBN(0x33c59a0a, 0xb76a9af0), TOBN(0x52740ab3, 0xba095af7),
- TOBN(0xc444de8a, 0x24389ca0), TOBN(0xcc6f9863, 0x706da0cb),
- TOBN(0xb5a741a7, 0x6b2515cf), TOBN(0x71c41601, 0x9585c749),
- TOBN(0x78350d4f, 0xe683de97), TOBN(0x31d61524, 0x63d0b5f5),
- TOBN(0x7a0cc5e1, 0xfbce090b), TOBN(0xaac927ed, 0xfbcb2a5b),
- TOBN(0xe920de49, 0x20d84c35), TOBN(0x8c06a0b6, 0x22b4de26),
- TOBN(0xd34dd58b, 0xafe7ddf3), TOBN(0x55851fed, 0xc1e6e55b),
- TOBN(0xd1395616, 0x960696e7), TOBN(0x940304b2, 0x5f22705f),
- TOBN(0x6f43f861, 0xb0a2a860), TOBN(0xcf121282, 0x0e7cc981),
- TOBN(0x12186212, 0x0ab64a96), TOBN(0x09215b9a, 0xb789383c),
- TOBN(0x311eb305, 0x37387c09), TOBN(0xc5832fce, 0xf03ee760),
- TOBN(0x30358f58, 0x32f7ea19), TOBN(0xe01d3c34, 0x91d53551),
- TOBN(0x1ca5ee41, 0xda48ea80), TOBN(0x34e71e8e, 0xcf4fa4c1),
- TOBN(0x312abd25, 0x7af1e1c7), TOBN(0xe3afcdeb, 0x2153f4a5),
- TOBN(0x9d5c84d7, 0x00235e9a), TOBN(0x0308d3f4, 0x8c4c836f),
- TOBN(0xc0a66b04, 0x89332de5), TOBN(0x610dd399, 0x89e566ef),
- TOBN(0xf8eea460, 0xd1ac1635), TOBN(0x84cbb3fb, 0x20a2c0df),
- TOBN(0x40afb488, 0xe74a48c5), TOBN(0x29738198, 0xd326b150),
- TOBN(0x2a17747f, 0xa6d74081), TOBN(0x60ea4c05, 0x55a26214),
- TOBN(0x53514bb4, 0x1f88c5fe), TOBN(0xedd64567, 0x7e83426c),
- TOBN(0xd5d6cbec, 0x96460b25), TOBN(0xa12fd0ce, 0x68dc115e),
- TOBN(0xc5bc3ed2, 0x697840ea), TOBN(0x969876a8, 0xa6331e31),
- TOBN(0x60c36217, 0x472ff580), TOBN(0xf4229705, 0x4ad41393),
- TOBN(0x4bd99ef0, 0xa03b8b92), TOBN(0x501c7317, 0xc144f4f6),
- TOBN(0x159009b3, 0x18464945), TOBN(0x6d5e594c, 0x74c5c6be),
- TOBN(0x2d587011, 0x321a3660), TOBN(0xd1e184b1, 0x3898d022),
- TOBN(0x5ba04752, 0x4c6a7e04), TOBN(0x47fa1e2b, 0x45550b65),
- TOBN(0x9419daf0, 0x48c0a9a5), TOBN(0x66362953, 0x7c243236),
- TOBN(0xcd0744b1, 0x5cb12a88), TOBN(0x561b6f9a, 0x2b646188),
- TOBN(0x599415a5, 0x66c2c0c0), TOBN(0xbe3f0859, 0x0f83f09a),
- TOBN(0x9141c5be, 0xb92041b8), TOBN(0x01ae38c7, 0x26477d0d),
- TOBN(0xca8b71f3, 0xd12c7a94), TOBN(0xfab5b31f, 0x765c70db),
- TOBN(0x76ae7492, 0x487443e9), TOBN(0x8595a310, 0x990d1349),
- TOBN(0xf8dbeda8, 0x7d460a37), TOBN(0x7f7ad082, 0x1e45a38f),
- TOBN(0xed1d4db6, 0x1059705a), TOBN(0xa3dd492a, 0xe6b9c697),
- TOBN(0x4b92ee3a, 0x6eb38bd5), TOBN(0xbab2609d, 0x67cc0bb7),
- TOBN(0x7fc4fe89, 0x6e70ee82), TOBN(0xeff2c56e, 0x13e6b7e3),
- TOBN(0x9b18959e, 0x34d26fca), TOBN(0x2517ab66, 0x889d6b45),
- TOBN(0xf167b4e0, 0xbdefdd4f), TOBN(0x69958465, 0xf366e401),
- TOBN(0x5aa368ab, 0xa73bbec0), TOBN(0x12148709, 0x7b240c21),
- TOBN(0x378c3233, 0x18969006), TOBN(0xcb4d73ce, 0xe1fe53d1),
- TOBN(0x5f50a80e, 0x130c4361), TOBN(0xd67f5951, 0x7ef5212b),
- TOBN(0xf145e21e, 0x9e70c72e), TOBN(0xb2e52e29, 0x5566d2fb),
- TOBN(0x44eaba4a, 0x032397f5), TOBN(0x5e56937b, 0x7e31a7de),
- TOBN(0x68dcf517, 0x456c61e1), TOBN(0xbc2e954a, 0xa8b0a388),
- TOBN(0xe3552fa7, 0x60a8b755), TOBN(0x03442dae, 0x73ad0cde),
- TOBN(0x37ffe747, 0xceb26210), TOBN(0x983545e8, 0x787baef9),
- TOBN(0x8b8c8535, 0x86a3de31), TOBN(0xc621dbcb, 0xfacd46db),
- TOBN(0x82e442e9, 0x59266fbb), TOBN(0xa3514c37, 0x339d471c),
- TOBN(0x3a11b771, 0x62cdad96), TOBN(0xf0cb3b3c, 0xecf9bdf0),
- TOBN(0x3fcbdbce, 0x478e2135), TOBN(0x7547b5cf, 0xbda35342),
- TOBN(0xa97e81f1, 0x8a677af6), TOBN(0xc8c2bf83, 0x28817987),
- TOBN(0xdf07eaaf, 0x45580985), TOBN(0xc68d1f05, 0xc93b45cb),
- TOBN(0x106aa2fe, 0xc77b4cac), TOBN(0x4c1d8afc, 0x04a7ae86),
- TOBN(0xdb41c3fd, 0x9eb45ab2), TOBN(0x5b234b5b, 0xd4b22e74),
- TOBN(0xda253dec, 0xf215958a), TOBN(0x67e0606e, 0xa04edfa0),
- TOBN(0xabbbf070, 0xef751b11), TOBN(0xf352f175, 0xf6f06dce),
- TOBN(0xdfc4b6af, 0x6839f6b4), TOBN(0x53ddf9a8, 0x9959848e),
- TOBN(0xda49c379, 0xc21520b0), TOBN(0x90864ff0, 0xdbd5d1b6),
- TOBN(0x2f055d23, 0x5f49c7f7), TOBN(0xe51e4e6a, 0xa796b2d8),
- TOBN(0xc361a67f, 0x5c9dc340), TOBN(0x5ad53c37, 0xbca7c620),
- TOBN(0xda1d6588, 0x32c756d0), TOBN(0xad60d911, 0x8bb67e13),
- TOBN(0xd6c47bdf, 0x0eeec8c6), TOBN(0x4a27fec1, 0x078a1821),
- TOBN(0x081f7415, 0xc3099524), TOBN(0x8effdf0b, 0x82cd8060),
- TOBN(0xdb70ec1c, 0x65842df8), TOBN(0x8821b358, 0xd319a901),
- TOBN(0x72ee56ee, 0xde42b529), TOBN(0x5bb39592, 0x236e4286),
- TOBN(0xd1183316, 0xfd6f7140), TOBN(0xf9fadb5b, 0xbd8e81f7),
- TOBN(0x701d5e0c, 0x5a02d962), TOBN(0xfdee4dbf, 0x1b601324),
- TOBN(0xbed17407, 0x35d7620e), TOBN(0x04e3c2c3, 0xf48c0012),
- TOBN(0x9ee29da7, 0x3455449a), TOBN(0x562cdef4, 0x91a836c4),
- TOBN(0x8f682a5f, 0x47701097), TOBN(0x617125d8, 0xff88d0c2),
- TOBN(0x948fda24, 0x57bb86dd), TOBN(0x348abb8f, 0x289f7286),
- TOBN(0xeb10eab5, 0x99d94bbd), TOBN(0xd51ba28e, 0x4684d160),
- TOBN(0xabe0e51c, 0x30c8f41a), TOBN(0x66588b45, 0x13254f4a),
- TOBN(0x147ebf01, 0xfad097a5), TOBN(0x49883ea8, 0x610e815d),
- TOBN(0xe44d60ba, 0x8a11de56), TOBN(0xa970de6e, 0x827a7a6d),
- TOBN(0x2be41424, 0x5e17fc19), TOBN(0xd833c657, 0x01214057),
- TOBN(0x1375813b, 0x363e723f), TOBN(0x6820bb88, 0xe6a52e9b),
- TOBN(0x7e7f6970, 0xd875d56a), TOBN(0xd6a0a9ac, 0x51fbf6bf),
- TOBN(0x54ba8790, 0xa3083c12), TOBN(0xebaeb23d, 0x6ae7eb64),
- TOBN(0xa8685c3a, 0xb99a907a), TOBN(0xf1e74550, 0x026bf40b),
- TOBN(0x7b73a027, 0xc802cd9e), TOBN(0x9a8a927c, 0x4fef4635),
- TOBN(0xe1b6f60c, 0x08191224), TOBN(0xc4126ebb, 0xde4ec091),
- TOBN(0xe1dff4dc, 0x4ae38d84), TOBN(0xde3f57db, 0x4f2ef985),
- TOBN(0x34964337, 0xd446a1dd), TOBN(0x7bf217a0, 0x859e77f6),
- TOBN(0x8ff10527, 0x8e1d13f5), TOBN(0xa304ef03, 0x74eeae27),
- TOBN(0xfc6f5e47, 0xd19dfa5a), TOBN(0xdb007de3, 0x7fad982b),
- TOBN(0x28205ad1, 0x613715f5), TOBN(0x251e6729, 0x7889529e),
- TOBN(0x72705184, 0x1ae98e78), TOBN(0xf818537d, 0x271cac32),
- TOBN(0xc8a15b7e, 0xb7f410f5), TOBN(0xc474356f, 0x81f62393),
- TOBN(0x92dbdc5a, 0xc242316b), TOBN(0xabe060ac, 0xdbf4aff5),
- TOBN(0x6e8c38fe, 0x909a8ec6), TOBN(0x43e514e5, 0x6116cb94),
- TOBN(0x2078fa38, 0x07d784f9), TOBN(0x1161a880, 0xf4b5b357),
- TOBN(0x5283ce79, 0x13adea3d), TOBN(0x0756c3e6, 0xcc6a910b),
- TOBN(0x60bcfe01, 0xaaa79697), TOBN(0x04a73b29, 0x56391db1),
- TOBN(0xdd8dad47, 0x189b45a0), TOBN(0xbfac0dd0, 0x48d5b8d9),
- TOBN(0x34ab3af5, 0x7d3d2ec2), TOBN(0x6fa2fc2d, 0x207bd3af),
- TOBN(0x9ff40092, 0x66550ded), TOBN(0x719b3e87, 0x1fd5b913),
- TOBN(0xa573a496, 0x6d17fbc7), TOBN(0x0cd1a70a, 0x73d2b24e),
- TOBN(0x34e2c5ca, 0xb2676937), TOBN(0xe7050b06, 0xbf669f21),
- TOBN(0xfbe948b6, 0x1ede9046), TOBN(0xa0530051, 0x97662659),
- TOBN(0x58cbd4ed, 0xf10124c5), TOBN(0xde2646e4, 0xdd6c06c8),
- TOBN(0x332f8108, 0x8cad38c0), TOBN(0x471b7e90, 0x6bd68ae2),
- TOBN(0x56ac3fb2, 0x0d8e27a3), TOBN(0xb54660db, 0x136b4b0d),
- TOBN(0x123a1e11, 0xa6fd8de4), TOBN(0x44dbffea, 0xa37799ef),
- TOBN(0x4540b977, 0xce6ac17c), TOBN(0x495173a8, 0xaf60acef)}
- ,
- {TOBN(0x9ebb284d, 0x391c2a82), TOBN(0xbcdd4863, 0x158308e8),
- TOBN(0x006f16ec, 0x83f1edca), TOBN(0xa13e2c37, 0x695dc6c8),
- TOBN(0x2ab756f0, 0x4a057a87), TOBN(0xa8765500, 0xa6b48f98),
- TOBN(0x4252face, 0x68651c44), TOBN(0xa52b540b, 0xe1765e02),
- TOBN(0x4f922fc5, 0x16a0d2bb), TOBN(0x0d5cc16c, 0x1a623499),
- TOBN(0x9241cf3a, 0x57c62c8b), TOBN(0x2f5e6961, 0xfd1b667f),
- TOBN(0x5c15c70b, 0xf5a01797), TOBN(0x3d20b44d, 0x60956192),
- TOBN(0x04911b37, 0x071fdb52), TOBN(0xf648f916, 0x8d6f0f7b),
- TOBN(0x6dc1acaf, 0xe60b7cf7), TOBN(0x25860a50, 0x84a9d869),
- TOBN(0x56fc6f09, 0xe7ba8ac4), TOBN(0x828c5bd0, 0x6148d29e),
- TOBN(0xac6b435e, 0xdc55ae5f), TOBN(0xa527f56c, 0xc0117411),
- TOBN(0x94d5045e, 0xfd24342c), TOBN(0x2c4c0a35, 0x70b67c0d),
- TOBN(0x027cc8b8, 0xfac61d9a), TOBN(0x7d25e062, 0xe3c6fe8a),
- TOBN(0xe08805bf, 0xe5bff503), TOBN(0x13271e6c, 0x6ff632f7),
- TOBN(0x55dca6c0, 0x232f76a5), TOBN(0x8957c32d, 0x701ef426),
- TOBN(0xee728bcb, 0xa10a5178), TOBN(0x5ea60411, 0xb62c5173),
- TOBN(0xfc4e964e, 0xd0b8892b), TOBN(0x9ea17683, 0x9301bb74),
- TOBN(0x6265c5ae, 0xfcc48626), TOBN(0xe60cf82e, 0xbb3e9102),
- TOBN(0x57adf797, 0xd4df5531), TOBN(0x235b59a1, 0x8deeefe2),
- TOBN(0x60adcf58, 0x3f306eb1), TOBN(0x105c2753, 0x3d09492d),
- TOBN(0x4090914b, 0xb5def996), TOBN(0x1cb69c83, 0x233dd1e7),
- TOBN(0xc1e9c1d3, 0x9b3d5e76), TOBN(0x1f3338ed, 0xfccf6012),
- TOBN(0xb1e95d0d, 0x2f5378a8), TOBN(0xacf4c2c7, 0x2f00cd21),
- TOBN(0x6e984240, 0xeb5fe290), TOBN(0xd66c038d, 0x248088ae),
- TOBN(0x804d264a, 0xf94d70cf), TOBN(0xbdb802ef, 0x7314bf7e),
- TOBN(0x8fb54de2, 0x4333ed02), TOBN(0x740461e0, 0x285635d9),
- TOBN(0x4113b2c8, 0x365e9383), TOBN(0xea762c83, 0x3fdef652),
- TOBN(0x4eec6e2e, 0x47b956c1), TOBN(0xa3d814be, 0x65620fa4),
- TOBN(0x9ad5462b, 0xb4d8bc50), TOBN(0x181c0b16, 0xa9195770),
- TOBN(0xebd4fe1c, 0x78412a68), TOBN(0xae0341bc, 0xc0dff48c),
- TOBN(0xb6bc45cf, 0x7003e866), TOBN(0xf11a6dea, 0x8a24a41b),
- TOBN(0x5407151a, 0xd04c24c2), TOBN(0x62c9d27d, 0xda5b7b68),
- TOBN(0x2e964235, 0x88cceff6), TOBN(0x8594c54f, 0x8b07ed69),
- TOBN(0x1578e73c, 0xc84d0d0d), TOBN(0x7b4e1055, 0xff532868),
- TOBN(0xa348c0d5, 0xb5ec995a), TOBN(0xbf4b9d55, 0x14289a54),
- TOBN(0x9ba155a6, 0x58fbd777), TOBN(0x186ed7a8, 0x1a84491d),
- TOBN(0xd4992b30, 0x614c0900), TOBN(0xda98d121, 0xbd00c24b),
- TOBN(0x7f534dc8, 0x7ec4bfa1), TOBN(0x4a5ff674, 0x37dc34bc),
- TOBN(0x68c196b8, 0x1d7ea1d7), TOBN(0x38cf2893, 0x80a6d208),
- TOBN(0xfd56cd09, 0xe3cbbd6e), TOBN(0xec72e27e, 0x4205a5b6),
- TOBN(0x15ea68f5, 0xa44f77f7), TOBN(0x7aa5f9fd, 0xb43c52bc),
- TOBN(0x86ff676f, 0x94f0e609), TOBN(0xa4cde963, 0x2e2d432b),
- TOBN(0x8cafa0c0, 0xeee470af), TOBN(0x84137d0e, 0x8a3f5ec8),
- TOBN(0xebb40411, 0xfaa31231), TOBN(0xa239c13f, 0x6f7f7ccf),
- TOBN(0x32865719, 0xa8afd30b), TOBN(0x86798328, 0x8a826dce),
- TOBN(0xdf04e891, 0xc4a8fbe0), TOBN(0xbb6b6e1b, 0xebf56ad3),
- TOBN(0x0a695b11, 0x471f1ff0), TOBN(0xd76c3389, 0xbe15baf0),
- TOBN(0x018edb95, 0xbe96c43e), TOBN(0xf2beaaf4, 0x90794158),
- TOBN(0x152db09e, 0xc3076a27), TOBN(0x5e82908e, 0xe416545d),
- TOBN(0xa2c41272, 0x356d6f2e), TOBN(0xdc9c9642, 0x31fd74e1),
- TOBN(0x66ceb88d, 0x519bf615), TOBN(0xe29ecd76, 0x05a2274e),
- TOBN(0x3a0473c4, 0xbf5e2fa0), TOBN(0x6b6eb671, 0x64284e67),
- TOBN(0xe8b97932, 0xb88756dd), TOBN(0xed4e8652, 0xf17e3e61),
- TOBN(0xc2dd1499, 0x3ee1c4a4), TOBN(0xc0aaee17, 0x597f8c0e),
- TOBN(0x15c4edb9, 0x6c168af3), TOBN(0x6563c7bf, 0xb39ae875),
- TOBN(0xadfadb6f, 0x20adb436), TOBN(0xad55e8c9, 0x9a042ac0),
- TOBN(0x975a1ed8, 0xb76da1f5), TOBN(0x10dfa466, 0xa58acb94),
- TOBN(0x8dd7f7e3, 0xac060282), TOBN(0x6813e66a, 0x572a051e),
- TOBN(0xb4ccae1e, 0x350cb901), TOBN(0xb653d656, 0x50cb7822),
- TOBN(0x42484710, 0xdfab3b87), TOBN(0xcd7ee537, 0x9b670fd0),
- TOBN(0x0a50b12e, 0x523b8bf6), TOBN(0x8009eb5b, 0x8f910c1b),
- TOBN(0xf535af82, 0x4a167588), TOBN(0x0f835f9c, 0xfb2a2abd),
- TOBN(0xf59b2931, 0x2afceb62), TOBN(0xc797df2a, 0x169d383f),
- TOBN(0xeb3f5fb0, 0x66ac02b0), TOBN(0x029d4c6f, 0xdaa2d0ca),
- TOBN(0xd4059bc1, 0xafab4bc5), TOBN(0x833f5c6f, 0x56783247),
- TOBN(0xb5346630, 0x8d2d3605), TOBN(0x83387891, 0xd34d8433),
- TOBN(0xd973b30f, 0xadd9419a), TOBN(0xbcca1099, 0xafe3fce8),
- TOBN(0x08178315, 0x0809aac6), TOBN(0x01b7f21a, 0x540f0f11),
- TOBN(0x65c29219, 0x909523c8), TOBN(0xa62f648f, 0xa3a1c741),
- TOBN(0x88598d4f, 0x60c9e55a), TOBN(0xbce9141b, 0x0e4f347a),
- TOBN(0x9af97d84, 0x35f9b988), TOBN(0x0210da62, 0x320475b6),
- TOBN(0x3c076e22, 0x9191476c), TOBN(0x7520dbd9, 0x44fc7834),
- TOBN(0x6a6b2cfe, 0xc1ab1bbd), TOBN(0xef8a65be, 0xdc650938),
- TOBN(0x72855540, 0x805d7bc4), TOBN(0xda389396, 0xed11fdfd),
- TOBN(0xa9d5bd36, 0x74660876), TOBN(0x11d67c54, 0xb45dff35),
- TOBN(0x6af7d148, 0xa4f5da94), TOBN(0xbb8d4c3f, 0xc0bbeb31),
- TOBN(0x87a7ebd1, 0xe0a1b12a), TOBN(0x1e4ef88d, 0x770ba95f),
- TOBN(0x8c33345c, 0xdc2ae9cb), TOBN(0xcecf1276, 0x01cc8403),
- TOBN(0x687c012e, 0x1b39b80f), TOBN(0xfd90d0ad, 0x35c33ba4),
- TOBN(0xa3ef5a67, 0x5c9661c2), TOBN(0x368fc88e, 0xe017429e),
- TOBN(0xd30c6761, 0x196a2fa2), TOBN(0x931b9817, 0xbd5b312e),
- TOBN(0xba01000c, 0x72f54a31), TOBN(0xa203d2c8, 0x66eaa541),
- TOBN(0xf2abdee0, 0x98939db3), TOBN(0xe37d6c2c, 0x3e606c02),
- TOBN(0xf2921574, 0x521ff643), TOBN(0x2781b3c4, 0xd7e2fca3),
- TOBN(0x664300b0, 0x7850ec06), TOBN(0xac5a38b9, 0x7d3a10cf),
- TOBN(0x9233188d, 0xe34ab39d), TOBN(0xe77057e4, 0x5072cbb9),
- TOBN(0xbcf0c042, 0xb59e78df), TOBN(0x4cfc91e8, 0x1d97de52),
- TOBN(0x4661a26c, 0x3ee0ca4a), TOBN(0x5620a4c1, 0xfb8507bc),
- TOBN(0x4b44d4aa, 0x049f842c), TOBN(0xceabc5d5, 0x1540e82b),
- TOBN(0x306710fd, 0x15c6f156), TOBN(0xbe5ae52b, 0x63db1d72),
- TOBN(0x06f1e7e6, 0x334957f1), TOBN(0x57e388f0, 0x31144a70),
- TOBN(0xfb69bb2f, 0xdf96447b), TOBN(0x0f78ebd3, 0x73e38a12),
- TOBN(0xb8222605, 0x2b7ce542), TOBN(0xe6d4ce99, 0x7472bde1),
- TOBN(0x53e16ebe, 0x09d2f4da), TOBN(0x180ff42e, 0x53b92b2e),
- TOBN(0xc59bcc02, 0x2c34a1c6), TOBN(0x3803d6f9, 0x422c46c2),
- TOBN(0x18aff74f, 0x5c14a8a2), TOBN(0x55aebf80, 0x10a08b28),
- TOBN(0x66097d58, 0x7135593f), TOBN(0x32e6eff7, 0x2be570cd),
- TOBN(0x584e6a10, 0x2a8c860d), TOBN(0xcd185890, 0xa2eb4163),
- TOBN(0x7ceae99d, 0x6d97e134), TOBN(0xd42c6b70, 0xdd8447ce),
- TOBN(0x59ddbb4a, 0xb8c50273), TOBN(0x03c612df, 0x3cf34e1e),
- TOBN(0x84b9ca15, 0x04b6c5a0), TOBN(0x35216f39, 0x18f0e3a3),
- TOBN(0x3ec2d2bc, 0xbd986c00), TOBN(0x8bf546d9, 0xd19228fe),
- TOBN(0xd1c655a4, 0x4cd623c3), TOBN(0x366ce718, 0x502b8e5a),
- TOBN(0x2cfc84b4, 0xeea0bfe7), TOBN(0xe01d5cee, 0xcf443e8e),
- TOBN(0x8ec045d9, 0x036520f8), TOBN(0xdfb3c3d1, 0x92d40e98),
- TOBN(0x0bac4cce, 0xcc559a04), TOBN(0x35eccae5, 0x240ea6b1),
- TOBN(0x180b32db, 0xf8a5a0ac), TOBN(0x547972a5, 0xeb699700),
- TOBN(0xa3765801, 0xca26bca0), TOBN(0x57e09d0e, 0xa647f25a),
- TOBN(0xb956970e, 0x2fdd23cc), TOBN(0xb80288bc, 0x5682e971),
- TOBN(0xe6e6d91e, 0x9ae86ebc), TOBN(0x0564c83f, 0x8c9f1939),
- TOBN(0x551932a2, 0x39560368), TOBN(0xe893752b, 0x049c28e2),
- TOBN(0x0b03cee5, 0xa6a158c3), TOBN(0xe12d656b, 0x04964263),
- TOBN(0x4b47554e, 0x63e3bc1d), TOBN(0xc719b6a2, 0x45044ff7),
- TOBN(0x4f24d30a, 0xe48daa07), TOBN(0xa3f37556, 0xc8c1edc3),
- TOBN(0x9a47bf76, 0x0700d360), TOBN(0xbb1a1824, 0x822ae4e2),
- TOBN(0x22e275a3, 0x89f1fb4c), TOBN(0x72b1aa23, 0x9968c5f5),
- TOBN(0xa75feaca, 0xbe063f64), TOBN(0x9b392f43, 0xbce47a09),
- TOBN(0xd4241509, 0x1ad07aca), TOBN(0x4b0c591b, 0x8d26cd0f),
- TOBN(0x2d42ddfd, 0x92f1169a), TOBN(0x63aeb1ac, 0x4cbf2392),
- TOBN(0x1de9e877, 0x0691a2af), TOBN(0xebe79af7, 0xd98021da),
- TOBN(0xcfdf2a4e, 0x40e50acf), TOBN(0xf0a98ad7, 0xaf01d665),
- TOBN(0xefb640bf, 0x1831be1f), TOBN(0x6fe8bd2f, 0x80e9ada0),
- TOBN(0x94c103a1, 0x6cafbc91), TOBN(0x170f8759, 0x8308e08c),
- TOBN(0x5de2d2ab, 0x9780ff4f), TOBN(0x666466bc, 0x45b201f2),
- TOBN(0x58af2010, 0xf5b343bc), TOBN(0x0f2e400a, 0xf2f142fe),
- TOBN(0x3483bfde, 0xa85f4bdf), TOBN(0xf0b1d093, 0x03bfeaa9),
- TOBN(0x2ea01b95, 0xc7081603), TOBN(0xe943e4c9, 0x3dba1097),
- TOBN(0x47be92ad, 0xb438f3a6), TOBN(0x00bb7742, 0xe5bf6636),
- TOBN(0x136b7083, 0x824297b4), TOBN(0x9d0e5580, 0x5584455f),
- TOBN(0xab48cedc, 0xf1c7d69e), TOBN(0x53a9e481, 0x2a256e76),
- TOBN(0x0402b0e0, 0x65eb2413), TOBN(0xdadbbb84, 0x8fc407a7),
- TOBN(0xa65cd5a4, 0x8d7f5492), TOBN(0x21d44293, 0x74bae294),
- TOBN(0x66917ce6, 0x3b5f1cc4), TOBN(0x37ae52ea, 0xce872e62),
- TOBN(0xbb087b72, 0x2905f244), TOBN(0x12077086, 0x1e6af74f),
- TOBN(0x4b644e49, 0x1058edea), TOBN(0x827510e3, 0xb638ca1d),
- TOBN(0x8cf2b704, 0x6038591c), TOBN(0xffc8b47a, 0xfe635063),
- TOBN(0x3ae220e6, 0x1b4d5e63), TOBN(0xbd864742, 0x9d961b4b),
- TOBN(0x610c107e, 0x9bd16bed), TOBN(0x4270352a, 0x1127147b),
- TOBN(0x7d17ffe6, 0x64cfc50e), TOBN(0x50dee01a, 0x1e36cb42),
- TOBN(0x068a7622, 0x35dc5f9a), TOBN(0x9a08d536, 0xdf53f62c),
- TOBN(0x4ed71457, 0x6be5f7de), TOBN(0xd93006f8, 0xc2263c9e),
- TOBN(0xe073694c, 0xcacacb36), TOBN(0x2ff7a5b4, 0x3ae118ab),
- TOBN(0x3cce53f1, 0xcd871236), TOBN(0xf156a39d, 0xc2aa6d52),
- TOBN(0x9cc5f271, 0xb198d76d), TOBN(0xbc615b6f, 0x81383d39),
- TOBN(0xa54538e8, 0xde3eee6b), TOBN(0x58c77538, 0xab910d91),
- TOBN(0x31e5bdbc, 0x58d278bd), TOBN(0x3cde4adf, 0xb963acae),
- TOBN(0xb1881fd2, 0x5302169c), TOBN(0x8ca60fa0, 0xa989ed8b),
- TOBN(0xa1999458, 0xff96a0ee), TOBN(0xc1141f03, 0xac6c283d),
- TOBN(0x7677408d, 0x6dfafed3), TOBN(0x33a01653, 0x39661588),
- TOBN(0x3c9c15ec, 0x0b726fa0), TOBN(0x090cfd93, 0x6c9b56da),
- TOBN(0xe34f4bae, 0xa3c40af5), TOBN(0x3469eadb, 0xd21129f1),
- TOBN(0xcc51674a, 0x1e207ce8), TOBN(0x1e293b24, 0xc83b1ef9),
- TOBN(0x17173d13, 0x1e6c0bb4), TOBN(0x19004695, 0x90776d35),
- TOBN(0xe7980e34, 0x6de6f922), TOBN(0x873554cb, 0xf4dd9a22),
- TOBN(0x0316c627, 0xcbf18a51), TOBN(0x4d93651b, 0x3032c081),
- TOBN(0x207f2771, 0x3946834d), TOBN(0x2c08d7b4, 0x30cdbf80),
- TOBN(0x137a4fb4, 0x86df2a61), TOBN(0xa1ed9c07, 0xecf7b4a2),
- TOBN(0xb2e460e2, 0x7bd042ff), TOBN(0xb7f5e2fa, 0x5f62f5ec),
- TOBN(0x7aa6ec6b, 0xcc2423b7), TOBN(0x75ce0a7f, 0xba63eea7),
- TOBN(0x67a45fb1, 0xf250a6e1), TOBN(0x93bc919c, 0xe53cdc9f),
- TOBN(0x9271f56f, 0x871942df), TOBN(0x2372ff6f, 0x7859ad66),
- TOBN(0x5f4c2b96, 0x33cb1a78), TOBN(0xe3e29101, 0x5838aa83),
- TOBN(0xa7ed1611, 0xe4e8110c), TOBN(0x2a2d70d5, 0x330198ce),
- TOBN(0xbdf132e8, 0x6720efe0), TOBN(0xe61a8962, 0x66a471bf),
- TOBN(0x796d3a85, 0x825808bd), TOBN(0x51dc3cb7, 0x3fd6e902),
- TOBN(0x643c768a, 0x916219d1), TOBN(0x36cd7685, 0xa2ad7d32),
- TOBN(0xe3db9d05, 0xb22922a4), TOBN(0x6494c87e, 0xdba29660),
- TOBN(0xf0ac91df, 0xbcd2ebc7), TOBN(0x4deb57a0, 0x45107f8d),
- TOBN(0x42271f59, 0xc3d12a73), TOBN(0x5f71687c, 0xa5c2c51d),
- TOBN(0xcb1f50c6, 0x05797bcb), TOBN(0x29ed0ed9, 0xd6d34eb0),
- TOBN(0xe5fe5b47, 0x4683c2eb), TOBN(0x4956eeb5, 0x97447c46),
- TOBN(0x5b163a43, 0x71207167), TOBN(0x93fa2fed, 0x0248c5ef),
- TOBN(0x67930af2, 0x31f63950), TOBN(0xa77797c1, 0x14caa2c9),
- TOBN(0x526e80ee, 0x27ac7e62), TOBN(0xe1e6e626, 0x58b28aec),
- TOBN(0x636178b0, 0xb3c9fef0), TOBN(0xaf7752e0, 0x6d5f90be),
- TOBN(0x94ecaf18, 0xeece51cf), TOBN(0x2864d0ed, 0xca806e1f),
- TOBN(0x6de2e383, 0x97c69134), TOBN(0x5a42c316, 0xeb291293),
- TOBN(0xc7779219, 0x6a60bae0), TOBN(0xa24de346, 0x6b7599d1),
- TOBN(0x49d374aa, 0xb75d4941), TOBN(0x98900586, 0x2d501ff0),
- TOBN(0x9f16d40e, 0xeb7974cf), TOBN(0x1033860b, 0xcdd8c115),
- TOBN(0xb6c69ac8, 0x2094cec3), TOBN(0x9976fb88, 0x403b770c),
- TOBN(0x1dea026c, 0x4859590d), TOBN(0xb6acbb46, 0x8562d1fd),
- TOBN(0x7cd6c461, 0x44569d85), TOBN(0xc3190a36, 0x97f0891d),
- TOBN(0xc6f53195, 0x48d5a17d), TOBN(0x7d919966, 0xd749abc8),
- TOBN(0x65104837, 0xdd1c8a20), TOBN(0x7e5410c8, 0x2f683419),
- TOBN(0x958c3ca8, 0xbe94022e), TOBN(0x605c3197, 0x6145dac2),
- TOBN(0x3fc07501, 0x01683d54), TOBN(0x1d7127c5, 0x595b1234),
- TOBN(0x10b8f87c, 0x9481277f), TOBN(0x677db2a8, 0xe65a1adb),
- TOBN(0xec2fccaa, 0xddce3345), TOBN(0x2a6811b7, 0x012a4350),
- TOBN(0x96760ff1, 0xac598bdc), TOBN(0x054d652a, 0xd1bf4128),
- TOBN(0x0a1151d4, 0x92a21005), TOBN(0xad7f3971, 0x33110fdf),
- TOBN(0x8c95928c, 0x1960100f), TOBN(0x6c91c825, 0x7bf03362),
- TOBN(0xc8c8b2a2, 0xce309f06), TOBN(0xfdb27b59, 0xca27204b),
- TOBN(0xd223eaa5, 0x0848e32e), TOBN(0xb93e4b2e, 0xe7bfaf1e),
- TOBN(0xc5308ae6, 0x44aa3ded), TOBN(0x317a666a, 0xc015d573),
- TOBN(0xc888ce23, 0x1a979707), TOBN(0xf141c1e6, 0x0d5c4958),
- TOBN(0xb53b7de5, 0x61906373), TOBN(0x858dbade, 0xeb999595),
- TOBN(0x8cbb47b2, 0xa59e5c36), TOBN(0x660318b3, 0xdcf4e842),
- TOBN(0xbd161ccd, 0x12ba4b7a), TOBN(0xf399daab, 0xf8c8282a),
- TOBN(0x1587633a, 0xeeb2130d), TOBN(0xa465311a, 0xda38dd7d),
- TOBN(0x5f75eec8, 0x64d3779b), TOBN(0x3c5d0476, 0xad64c171),
- TOBN(0x87410371, 0x2a914428), TOBN(0x8096a891, 0x90e2fc29),
- TOBN(0xd3d2ae9d, 0x23b3ebc2), TOBN(0x90bdd6db, 0xa580cfd6),
- TOBN(0x52dbb7f3, 0xc5b01f6c), TOBN(0xe68eded4, 0xe102a2dc),
- TOBN(0x17785b77, 0x99eb6df0), TOBN(0x26c3cc51, 0x7386b779),
- TOBN(0x345ed988, 0x6417a48e), TOBN(0xe990b4e4, 0x07d6ef31),
- TOBN(0x0f456b7e, 0x2586abba), TOBN(0x239ca6a5, 0x59c96e9a),
- TOBN(0xe327459c, 0xe2eb4206), TOBN(0x3a4c3313, 0xa002b90a),
- TOBN(0x2a114806, 0xf6a3f6fb), TOBN(0xad5cad2f, 0x85c251dd),
- TOBN(0x92c1f613, 0xf5a784d3), TOBN(0xec7bfacf, 0x349766d5),
- TOBN(0x04b3cd33, 0x3e23cb3b), TOBN(0x3979fe84, 0xc5a64b2d),
- TOBN(0x192e2720, 0x7e589106), TOBN(0xa60c43d1, 0xa15b527f),
- TOBN(0x2dae9082, 0xbe7cf3a6), TOBN(0xcc86ba92, 0xbc967274),
- TOBN(0xf28a2ce8, 0xaea0a8a9), TOBN(0x404ca6d9, 0x6ee988b3),
- TOBN(0xfd7e9c5d, 0x005921b8), TOBN(0xf56297f1, 0x44e79bf9),
- TOBN(0xa163b460, 0x0d75ddc2), TOBN(0x30b23616, 0xa1f2be87),
- TOBN(0x4b070d21, 0xbfe50e2b), TOBN(0x7ef8cfd0, 0xe1bfede1),
- TOBN(0xadba0011, 0x2aac4ae0), TOBN(0x2a3e7d01, 0xb9ebd033),
- TOBN(0x995277ec, 0xe38d9d1c), TOBN(0xb500249e, 0x9c5d2de3),
- TOBN(0x8912b820, 0xf13ca8c9), TOBN(0xc8798114, 0x877793af),
- TOBN(0x19e6125d, 0xec3f1dec), TOBN(0x07b1f040, 0x911178da),
- TOBN(0xd93ededa, 0x904a6738), TOBN(0x55187a5a, 0x0bebedcd),
- TOBN(0xf7d04722, 0xeb329d41), TOBN(0xf449099e, 0xf170b391),
- TOBN(0xfd317a69, 0xca99f828), TOBN(0x50c3db2b, 0x34a4976d),
- TOBN(0xe9ba7784, 0x3757b392), TOBN(0x326caefd, 0xaa3ca05a),
- TOBN(0x78e5293b, 0xf1e593d4), TOBN(0x7842a937, 0x0d98fd13),
- TOBN(0xe694bf96, 0x5f96b10d), TOBN(0x373a9df6, 0x06a8cd05),
- TOBN(0x997d1e51, 0xe8f0c7fc), TOBN(0x1d019790, 0x63fd972e),
- TOBN(0x0064d858, 0x5499fb32), TOBN(0x7b67bad9, 0x77a8aeb7),
- TOBN(0x1d3eb977, 0x2d08eec5), TOBN(0x5fc047a6, 0xcbabae1d),
- TOBN(0x0577d159, 0xe54a64bb), TOBN(0x8862201b, 0xc43497e4),
- TOBN(0xad6b4e28, 0x2ce0608d), TOBN(0x8b687b7d, 0x0b167aac),
- TOBN(0x6ed4d367, 0x8b2ecfa9), TOBN(0x24dfe62d, 0xa90c3c38),
- TOBN(0xa1862e10, 0x3fe5c42b), TOBN(0x1ca73dca, 0xd5732a9f),
- TOBN(0x35f038b7, 0x76bb87ad), TOBN(0x674976ab, 0xf242b81f),
- TOBN(0x4f2bde7e, 0xb0fd90cd), TOBN(0x6efc172e, 0xa7fdf092),
- TOBN(0x3806b69b, 0x92222f1f), TOBN(0x5a2459ca, 0x6cf7ae70),
- TOBN(0x6789f69c, 0xa85217ee), TOBN(0x5f232b5e, 0xe3dc85ac),
- TOBN(0x660e3ec5, 0x48e9e516), TOBN(0x124b4e47, 0x3197eb31),
- TOBN(0x10a0cb13, 0xaafcca23), TOBN(0x7bd63ba4, 0x8213224f),
- TOBN(0xaffad7cc, 0x290a7f4f), TOBN(0x6b409c9e, 0x0286b461),
- TOBN(0x58ab809f, 0xffa407af), TOBN(0xc3122eed, 0xc68ac073),
- TOBN(0x17bf9e50, 0x4ef24d7e), TOBN(0x5d929794, 0x3e2a5811),
- TOBN(0x519bc867, 0x02902e01), TOBN(0x76bba5da, 0x39c8a851),
- TOBN(0xe9f9669c, 0xda94951e), TOBN(0x4b6af58d, 0x66b8d418),
- TOBN(0xfa321074, 0x17d426a4), TOBN(0xc78e66a9, 0x9dde6027),
- TOBN(0x0516c083, 0x4a53b964), TOBN(0xfc659d38, 0xff602330),
- TOBN(0x0ab55e5c, 0x58c5c897), TOBN(0x985099b2, 0x838bc5df),
- TOBN(0x061d9efc, 0xc52fc238), TOBN(0x712b2728, 0x6ac1da3f),
- TOBN(0xfb658149, 0x9283fe08), TOBN(0x4954ac94, 0xb8aaa2f7),
- TOBN(0x85c0ada4, 0x7fb2e74f), TOBN(0xee8ba98e, 0xb89926b0),
- TOBN(0xe4f9d37d, 0x23d1af5b), TOBN(0x14ccdbf9, 0xba9b015e),
- TOBN(0xb674481b, 0x7bfe7178), TOBN(0x4e1debae, 0x65405868),
- TOBN(0x061b2821, 0xc48c867d), TOBN(0x69c15b35, 0x513b30ea),
- TOBN(0x3b4a1666, 0x36871088), TOBN(0xe5e29f5d, 0x1220b1ff),
- TOBN(0x4b82bb35, 0x233d9f4d), TOBN(0x4e076333, 0x18cdc675)}
- ,
- {TOBN(0x0d53f5c7, 0xa3e6fced), TOBN(0xe8cbbdd5, 0xf45fbdeb),
- TOBN(0xf85c01df, 0x13339a70), TOBN(0x0ff71880, 0x142ceb81),
- TOBN(0x4c4e8774, 0xbd70437a), TOBN(0x5fb32891, 0xba0bda6a),
- TOBN(0x1cdbebd2, 0xf18bd26e), TOBN(0x2f9526f1, 0x03a9d522),
- TOBN(0x40ce3051, 0x92c4d684), TOBN(0x8b04d725, 0x7612efcd),
- TOBN(0xb9dcda36, 0x6f9cae20), TOBN(0x0edc4d24, 0xf058856c),
- TOBN(0x64f2e6bf, 0x85427900), TOBN(0x3de81295, 0xdc09dfea),
- TOBN(0xd41b4487, 0x379bf26c), TOBN(0x50b62c6d, 0x6df135a9),
- TOBN(0xd4f8e3b4, 0xc72dfe67), TOBN(0xc416b0f6, 0x90e19fdf),
- TOBN(0x18b9098d, 0x4c13bd35), TOBN(0xac11118a, 0x15b8cb9e),
- TOBN(0xf598a318, 0xf0062841), TOBN(0xbfe0602f, 0x89f356f4),
- TOBN(0x7ae3637e, 0x30177a0c), TOBN(0x34097747, 0x61136537),
- TOBN(0x0db2fb5e, 0xd005832a), TOBN(0x5f5efd3b, 0x91042e4f),
- TOBN(0x8c4ffdc6, 0xed70f8ca), TOBN(0xe4645d0b, 0xb52da9cc),
- TOBN(0x9596f58b, 0xc9001d1f), TOBN(0x52c8f0bc, 0x4e117205),
- TOBN(0xfd4aa0d2, 0xe398a084), TOBN(0x815bfe3a, 0x104f49de),
- TOBN(0x97e5443f, 0x23885e5f), TOBN(0xf72f8f99, 0xe8433aab),
- TOBN(0xbd00b154, 0xe4d4e604), TOBN(0xd0b35e6a, 0xe5e173ff),
- TOBN(0x57b2a048, 0x9164722d), TOBN(0x3e3c665b, 0x88761ec8),
- TOBN(0x6bdd1397, 0x3da83832), TOBN(0x3c8b1a1e, 0x73dafe3b),
- TOBN(0x4497ace6, 0x54317cac), TOBN(0xbe600ab9, 0x521771b3),
- TOBN(0xb42e409e, 0xb0dfe8b8), TOBN(0x386a67d7, 0x3942310f),
- TOBN(0x25548d8d, 0x4431cc28), TOBN(0xa7cff142, 0x985dc524),
- TOBN(0x4d60f5a1, 0x93c4be32), TOBN(0x83ebd5c8, 0xd071c6e1),
- TOBN(0xba3a80a7, 0xb1fd2b0b), TOBN(0x9b3ad396, 0x5bec33e8),
- TOBN(0xb3868d61, 0x79743fb3), TOBN(0xcfd169fc, 0xfdb462fa),
- TOBN(0xd3b499d7, 0x9ce0a6af), TOBN(0x55dc1cf1, 0xe42d3ff8),
- TOBN(0x04fb9e6c, 0xc6c3e1b2), TOBN(0x47e6961d, 0x6f69a474),
- TOBN(0x54eb3acc, 0xe548b37b), TOBN(0xb38e7542, 0x84d40549),
- TOBN(0x8c3daa51, 0x7b341b4f), TOBN(0x2f6928ec, 0x690bf7fa),
- TOBN(0x0496b323, 0x86ce6c41), TOBN(0x01be1c55, 0x10adadcd),
- TOBN(0xc04e67e7, 0x4bb5faf9), TOBN(0x3cbaf678, 0xe15c9985),
- TOBN(0x8cd12145, 0x50ca4247), TOBN(0xba1aa47a, 0xe7dd30aa),
- TOBN(0x2f81ddf1, 0xe58fee24), TOBN(0x03452936, 0xeec9b0e8),
- TOBN(0x8bdc3b81, 0x243aea96), TOBN(0x9a2919af, 0x15c3d0e5),
- TOBN(0x9ea640ec, 0x10948361), TOBN(0x5ac86d5b, 0x6e0bcccf),
- TOBN(0xf892d918, 0xc36cf440), TOBN(0xaed3e837, 0xc939719c),
- TOBN(0xb07b08d2, 0xc0218b64), TOBN(0x6f1bcbba, 0xce9790dd),
- TOBN(0x4a84d6ed, 0x60919b8e), TOBN(0xd8900791, 0x8ac1f9eb),
- TOBN(0xf84941aa, 0x0dd5daef), TOBN(0xb22fe40a, 0x67fd62c5),
- TOBN(0x97e15ba2, 0x157f2db3), TOBN(0xbda2fc8f, 0x8e28ca9c),
- TOBN(0x5d050da4, 0x37b9f454), TOBN(0x3d57eb57, 0x2379d72e),
- TOBN(0xe9b5eba2, 0xfb5ee997), TOBN(0x01648ca2, 0xe11538ca),
- TOBN(0x32bb76f6, 0xf6327974), TOBN(0x338f14b8, 0xff3f4bb7),
- TOBN(0x524d226a, 0xd7ab9a2d), TOBN(0x9c00090d, 0x7dfae958),
- TOBN(0x0ba5f539, 0x8751d8c2), TOBN(0x8afcbcdd, 0x3ab8262d),
- TOBN(0x57392729, 0xe99d043b), TOBN(0xef51263b, 0xaebc943a),
- TOBN(0x9feace93, 0x20862935), TOBN(0x639efc03, 0xb06c817b),
- TOBN(0x1fe054b3, 0x66b4be7a), TOBN(0x3f25a9de, 0x84a37a1e),
- TOBN(0xf39ef1ad, 0x78d75cd9), TOBN(0xd7b58f49, 0x5062c1b5),
- TOBN(0x6f74f9a9, 0xff563436), TOBN(0xf718ff29, 0xe8af51e7),
- TOBN(0x5234d313, 0x15e97fec), TOBN(0xb6a8e2b1, 0x292f1c0a),
- TOBN(0xa7f53aa8, 0x327720c1), TOBN(0x956ca322, 0xba092cc8),
- TOBN(0x8f03d64a, 0x28746c4d), TOBN(0x51fe1782, 0x66d0d392),
- TOBN(0xd19b34db, 0x3c832c80), TOBN(0x60dccc5c, 0x6da2e3b4),
- TOBN(0x245dd62e, 0x0a104ccc), TOBN(0xa7ab1de1, 0x620b21fd),
- TOBN(0xb293ae0b, 0x3893d123), TOBN(0xf7b75783, 0xb15ee71c),
- TOBN(0x5aa3c614, 0x42a9468b), TOBN(0xd686123c, 0xdb15d744),
- TOBN(0x8c616891, 0xa7ab4116), TOBN(0x6fcd72c8, 0xa4e6a459),
- TOBN(0xac219110, 0x77e5fad7), TOBN(0xfb6a20e7, 0x704fa46b),
- TOBN(0xe839be7d, 0x341d81dc), TOBN(0xcddb6889, 0x32148379),
- TOBN(0xda6211a1, 0xf7026ead), TOBN(0xf3b2575f, 0xf4d1cc5e),
- TOBN(0x40cfc8f6, 0xa7a73ae6), TOBN(0x83879a5e, 0x61d5b483),
- TOBN(0xc5acb1ed, 0x41a50ebc), TOBN(0x59a60cc8, 0x3c07d8fa),
- TOBN(0x1b73bdce, 0xb1876262), TOBN(0x2b0d79f0, 0x12af4ee9),
- TOBN(0x8bcf3b0b, 0xd46e1d07), TOBN(0x17d6af9d, 0xe45d152f),
- TOBN(0x73520461, 0x6d736451), TOBN(0x43cbbd97, 0x56b0bf5a),
- TOBN(0xb0833a5b, 0xd5999b9d), TOBN(0x702614f0, 0xeb72e398),
- TOBN(0x0aadf01a, 0x59c3e9f8), TOBN(0x40200e77, 0xce6b3d16),
- TOBN(0xda22bdd3, 0xdeddafad), TOBN(0x76dedaf4, 0x310d72e1),
- TOBN(0x49ef807c, 0x4bc2e88f), TOBN(0x6ba81291, 0x146dd5a5),
- TOBN(0xa1a4077a, 0x7d8d59e9), TOBN(0x87b6a2e7, 0x802db349),
- TOBN(0xd5679997, 0x1b4e598e), TOBN(0xf499ef1f, 0x06fe4b1d),
- TOBN(0x3978d3ae, 0xfcb267c5), TOBN(0xb582b557, 0x235786d0),
- TOBN(0x32b3b2ca, 0x1715cb07), TOBN(0x4c3de6a2, 0x8480241d),
- TOBN(0x63b5ffed, 0xcb571ecd), TOBN(0xeaf53900, 0xed2fe9a9),
- TOBN(0xdec98d4a, 0xc3b81990), TOBN(0x1cb83722, 0x9e0cc8fe),
- TOBN(0xfe0b0491, 0xd2b427b9), TOBN(0x0f2386ac, 0xe983a66c),
- TOBN(0x930c4d1e, 0xb3291213), TOBN(0xa2f82b2e, 0x59a62ae4),
- TOBN(0x77233853, 0xf93e89e3), TOBN(0x7f8063ac, 0x11777c7f),
- TOBN(0xff0eb567, 0x59ad2877), TOBN(0x6f454642, 0x9865c754),
- TOBN(0xe6fe701a, 0x236e9a84), TOBN(0xc586ef16, 0x06e40fc3),
- TOBN(0x3f62b6e0, 0x24bafad9), TOBN(0xc8b42bd2, 0x64da906a),
- TOBN(0xc98e1eb4, 0xda3276a0), TOBN(0x30d0e5fc, 0x06cbf852),
- TOBN(0x1b6b2ae1, 0xe8b4dfd4), TOBN(0xd754d5c7, 0x8301cbac),
- TOBN(0x66097629, 0x112a39ac), TOBN(0xf86b5999, 0x93ba4ab9),
- TOBN(0x26c9dea7, 0x99f9d581), TOBN(0x0473b1a8, 0xc2fafeaa),
- TOBN(0x1469af55, 0x3b2505a5), TOBN(0x227d16d7, 0xd6a43323),
- TOBN(0x3316f73c, 0xad3d97f9), TOBN(0x52bf3bb5, 0x1f137455),
- TOBN(0x953eafeb, 0x09954e7c), TOBN(0xa721dfed, 0xdd732411),
- TOBN(0xb4929821, 0x141d4579), TOBN(0x3411321c, 0xaa3bd435),
- TOBN(0xafb355aa, 0x17fa6015), TOBN(0xb4e7ef4a, 0x18e42f0e),
- TOBN(0x604ac97c, 0x59371000), TOBN(0xe1c48c70, 0x7f759c18),
- TOBN(0x3f62ecc5, 0xa5db6b65), TOBN(0x0a78b173, 0x38a21495),
- TOBN(0x6be1819d, 0xbcc8ad94), TOBN(0x70dc04f6, 0xd89c3400),
- TOBN(0x462557b4, 0xa6b4840a), TOBN(0x544c6ade, 0x60bd21c0),
- TOBN(0x6a00f24e, 0x907a544b), TOBN(0xa7520dcb, 0x313da210),
- TOBN(0xfe939b75, 0x11e4994b), TOBN(0x918b6ba6, 0xbc275d70),
- TOBN(0xd3e5e0fc, 0x644be892), TOBN(0x707a9816, 0xfdaf6c42),
- TOBN(0x60145567, 0xf15c13fe), TOBN(0x4818ebaa, 0xe130a54a),
- TOBN(0x28aad3ad, 0x58d2f767), TOBN(0xdc5267fd, 0xd7e7c773),
- TOBN(0x4919cc88, 0xc3afcc98), TOBN(0xaa2e6ab0, 0x2db8cd4b),
- TOBN(0xd46fec04, 0xd0c63eaa), TOBN(0xa1cb92c5, 0x19ffa832),
- TOBN(0x678dd178, 0xe43a631f), TOBN(0xfb5ae1cd, 0x3dc788b3),
- TOBN(0x68b4fb90, 0x6e77de04), TOBN(0x7992bcf0, 0xf06dbb97),
- TOBN(0x896e6a13, 0xc417c01d), TOBN(0x8d96332c, 0xb956be01),
- TOBN(0x902fc93a, 0x413aa2b9), TOBN(0x99a4d915, 0xfc98c8a5),
- TOBN(0x52c29407, 0x565f1137), TOBN(0x4072690f, 0x21e4f281),
- TOBN(0x36e607cf, 0x02ff6072), TOBN(0xa47d2ca9, 0x8ad98cdc),
- TOBN(0xbf471d1e, 0xf5f56609), TOBN(0xbcf86623, 0xf264ada0),
- TOBN(0xb70c0687, 0xaa9e5cb6), TOBN(0xc98124f2, 0x17401c6c),
- TOBN(0x8189635f, 0xd4a61435), TOBN(0xd28fb8af, 0xa9d98ea6),
- TOBN(0xb9a67c2a, 0x40c251f8), TOBN(0x88cd5d87, 0xa2da44be),
- TOBN(0x437deb96, 0xe09b5423), TOBN(0x150467db, 0x64287dc1),
- TOBN(0xe161debb, 0xcdabb839), TOBN(0xa79e9742, 0xf1839a3e),
- TOBN(0xbb8dd3c2, 0x652d202b), TOBN(0x7b3e67f7, 0xe9f97d96),
- TOBN(0x5aa5d78f, 0xb1cb6ac9), TOBN(0xffa13e8e, 0xca1d0d45),
- TOBN(0x369295dd, 0x2ba5bf95), TOBN(0xd68bd1f8, 0x39aff05e),
- TOBN(0xaf0d86f9, 0x26d783f2), TOBN(0x543a59b3, 0xfc3aafc1),
- TOBN(0x3fcf81d2, 0x7b7da97c), TOBN(0xc990a056, 0xd25dee46),
- TOBN(0x3e6775b8, 0x519cce2c), TOBN(0xfc9af71f, 0xae13d863),
- TOBN(0x774a4a6f, 0x47c1605c), TOBN(0x46ba4245, 0x2fd205e8),
- TOBN(0xa06feea4, 0xd3fd524d), TOBN(0x1e724641, 0x6de1acc2),
- TOBN(0xf53816f1, 0x334e2b42), TOBN(0x49e5918e, 0x922f0024),
- TOBN(0x439530b6, 0x65c7322d), TOBN(0xcf12cc01, 0xb3c1b3fb),
- TOBN(0xc70b0186, 0x0172f685), TOBN(0xb915ee22, 0x1b58391d),
- TOBN(0x9afdf03b, 0xa317db24), TOBN(0x87dec659, 0x17b8ffc4),
- TOBN(0x7f46597b, 0xe4d3d050), TOBN(0x80a1c1ed, 0x006500e7),
- TOBN(0x84902a96, 0x78bf030e), TOBN(0xfb5e9c9a, 0x50560148),
- TOBN(0x6dae0a92, 0x63362426), TOBN(0xdcaeecf4, 0xa9e30c40),
- TOBN(0xc0d887bb, 0x518d0c6b), TOBN(0x99181152, 0xcb985b9d),
- TOBN(0xad186898, 0xef7bc381), TOBN(0x18168ffb, 0x9ee46201),
- TOBN(0x9a04cdaa, 0x2502753c), TOBN(0xbb279e26, 0x51407c41),
- TOBN(0xeacb03aa, 0xf23564e5), TOBN(0x18336582, 0x71e61016),
- TOBN(0x8684b8c4, 0xeb809877), TOBN(0xb336e18d, 0xea0e672e),
- TOBN(0xefb601f0, 0x34ee5867), TOBN(0x2733edbe, 0x1341cfd1),
- TOBN(0xb15e809a, 0x26025c3c), TOBN(0xe6e981a6, 0x9350df88),
- TOBN(0x92376237, 0x8502fd8e), TOBN(0x4791f216, 0x0c12be9b),
- TOBN(0xb7256789, 0x25f02425), TOBN(0xec863194, 0x7a974443),
- TOBN(0x7c0ce882, 0xfb41cc52), TOBN(0xc266ff7e, 0xf25c07f2),
- TOBN(0x3d4da8c3, 0x017025f3), TOBN(0xefcf628c, 0xfb9579b4),
- TOBN(0x5c4d0016, 0x1f3716ec), TOBN(0x9c27ebc4, 0x6801116e),
- TOBN(0x5eba0ea1, 0x1da1767e), TOBN(0xfe151452, 0x47004c57),
- TOBN(0x3ace6df6, 0x8c2373b7), TOBN(0x75c3dffe, 0x5dbc37ac),
- TOBN(0x3dc32a73, 0xddc925fc), TOBN(0xb679c841, 0x2f65ee0b),
- TOBN(0x715a3295, 0x451cbfeb), TOBN(0xd9889768, 0xf76e9a29),
- TOBN(0xec20ce7f, 0xb28ad247), TOBN(0xe99146c4, 0x00894d79),
- TOBN(0x71457d7c, 0x9f5e3ea7), TOBN(0x097b2662, 0x38030031),
- TOBN(0xdb7f6ae6, 0xcf9f82a8), TOBN(0x319decb9, 0x438f473a),
- TOBN(0xa63ab386, 0x283856c3), TOBN(0x13e3172f, 0xb06a361b),
- TOBN(0x2959f8dc, 0x7d5a006c), TOBN(0x2dbc27c6, 0x75fba752),
- TOBN(0xc1227ab2, 0x87c22c9e), TOBN(0x06f61f75, 0x71a268b2),
- TOBN(0x1b6bb971, 0x04779ce2), TOBN(0xaca83812, 0x0aadcb1d),
- TOBN(0x297ae0bc, 0xaeaab2d5), TOBN(0xa5c14ee7, 0x5bfb9f13),
- TOBN(0xaa00c583, 0xf17a62c7), TOBN(0x39eb962c, 0x173759f6),
- TOBN(0x1eeba1d4, 0x86c9a88f), TOBN(0x0ab6c37a, 0xdf016c5e),
- TOBN(0xa2a147db, 0xa28a0749), TOBN(0x246c20d6, 0xee519165),
- TOBN(0x5068d1b1, 0xd3810715), TOBN(0xb1e7018c, 0x748160b9),
- TOBN(0x03f5b1fa, 0xf380ff62), TOBN(0xef7fb1dd, 0xf3cb2c1e),
- TOBN(0xeab539a8, 0xfc91a7da), TOBN(0x83ddb707, 0xf3f9b561),
- TOBN(0xc550e211, 0xfe7df7a4), TOBN(0xa7cd07f2, 0x063f6f40),
- TOBN(0xb0de3635, 0x2976879c), TOBN(0xb5f83f85, 0xe55741da),
- TOBN(0x4ea9d25e, 0xf3d8ac3d), TOBN(0x6fe2066f, 0x62819f02),
- TOBN(0x4ab2b9c2, 0xcef4a564), TOBN(0x1e155d96, 0x5ffa2de3),
- TOBN(0x0eb0a19b, 0xc3a72d00), TOBN(0x4037665b, 0x8513c31b),
- TOBN(0x2fb2b6bf, 0x04c64637), TOBN(0x45c34d6e, 0x08cdc639),
- TOBN(0x56f1e10f, 0xf01fd796), TOBN(0x4dfb8101, 0xfe3667b8),
- TOBN(0xe0eda253, 0x9021d0c0), TOBN(0x7a94e9ff, 0x8a06c6ab),
- TOBN(0x2d3bb0d9, 0xbb9aa882), TOBN(0xea20e4e5, 0xec05fd10),
- TOBN(0xed7eeb5f, 0x1a1ca64e), TOBN(0x2fa6b43c, 0xc6327cbd),
- TOBN(0xb577e3cf, 0x3aa91121), TOBN(0x8c6bd5ea, 0x3a34079b),
- TOBN(0xd7e5ba39, 0x60e02fc0), TOBN(0xf16dd2c3, 0x90141bf8),
- TOBN(0xb57276d9, 0x80101b98), TOBN(0x760883fd, 0xb82f0f66),
- TOBN(0x89d7de75, 0x4bc3eff3), TOBN(0x03b60643, 0x5dc2ab40),
- TOBN(0xcd6e53df, 0xe05beeac), TOBN(0xf2f1e862, 0xbc3325cd),
- TOBN(0xdd0f7921, 0x774f03c3), TOBN(0x97ca7221, 0x4552cc1b),
- TOBN(0x5a0d6afe, 0x1cd19f72), TOBN(0xa20915dc, 0xf183fbeb),
- TOBN(0x9fda4b40, 0x832c403c), TOBN(0x32738edd, 0xbe425442),
- TOBN(0x469a1df6, 0xb5eccf1a), TOBN(0x4b5aff42, 0x28bbe1f0),
- TOBN(0x31359d7f, 0x570dfc93), TOBN(0xa18be235, 0xf0088628),
- TOBN(0xa5b30fba, 0xb00ed3a9), TOBN(0x34c61374, 0x73cdf8be),
- TOBN(0x2c5c5f46, 0xabc56797), TOBN(0x5cecf93d, 0xb82a8ae2),
- TOBN(0x7d3dbe41, 0xa968fbf0), TOBN(0xd23d4583, 0x1a5c7f3d),
- TOBN(0xf28f69a0, 0xc087a9c7), TOBN(0xc2d75471, 0x474471ca),
- TOBN(0x36ec9f4a, 0x4eb732ec), TOBN(0x6c943bbd, 0xb1ca6bed),
- TOBN(0xd64535e1, 0xf2457892), TOBN(0x8b84a8ea, 0xf7e2ac06),
- TOBN(0xe0936cd3, 0x2499dd5f), TOBN(0x12053d7e, 0x0ed04e57),
- TOBN(0x4bdd0076, 0xe4305d9d), TOBN(0x34a527b9, 0x1f67f0a2),
- TOBN(0xe79a4af0, 0x9cec46ea), TOBN(0xb15347a1, 0x658b9bc7),
- TOBN(0x6bd2796f, 0x35af2f75), TOBN(0xac957990, 0x4051c435),
- TOBN(0x2669dda3, 0xc33a655d), TOBN(0x5d503c2e, 0x88514aa3),
- TOBN(0xdfa11337, 0x3753dd41), TOBN(0x3f054673, 0x0b754f78),
- TOBN(0xbf185677, 0x496125bd), TOBN(0xfb0023c8, 0x3775006c),
- TOBN(0xfa0f072f, 0x3a037899), TOBN(0x4222b6eb, 0x0e4aea57),
- TOBN(0x3dde5e76, 0x7866d25a), TOBN(0xb6eb04f8, 0x4837aa6f),
- TOBN(0x5315591a, 0x2cf1cdb8), TOBN(0x6dfb4f41, 0x2d4e683c),
- TOBN(0x7e923ea4, 0x48ee1f3a), TOBN(0x9604d9f7, 0x05a2afd5),
- TOBN(0xbe1d4a33, 0x40ea4948), TOBN(0x5b45f1f4, 0xb44cbd2f),
- TOBN(0x5faf8376, 0x4acc757e), TOBN(0xa7cf9ab8, 0x63d68ff7),
- TOBN(0x8ad62f69, 0xdf0e404b), TOBN(0xd65f33c2, 0x12bdafdf),
- TOBN(0xc365de15, 0xa377b14e), TOBN(0x6bf5463b, 0x8e39f60c),
- TOBN(0x62030d2d, 0x2ce68148), TOBN(0xd95867ef, 0xe6f843a8),
- TOBN(0xd39a0244, 0xef5ab017), TOBN(0x0bd2d8c1, 0x4ab55d12),
- TOBN(0xc9503db3, 0x41639169), TOBN(0x2d4e25b0, 0xf7660c8a),
- TOBN(0x760cb3b5, 0xe224c5d7), TOBN(0xfa3baf8c, 0x68616919),
- TOBN(0x9fbca113, 0x8d142552), TOBN(0x1ab18bf1, 0x7669ebf5),
- TOBN(0x55e6f53e, 0x9bdf25dd), TOBN(0x04cc0bf3, 0xcb6cd154),
- TOBN(0x595bef49, 0x95e89080), TOBN(0xfe9459a8, 0x104a9ac1),
- TOBN(0xad2d89ca, 0xcce9bb32), TOBN(0xddea65e1, 0xf7de8285),
- TOBN(0x62ed8c35, 0xb351bd4b), TOBN(0x4150ff36, 0x0c0e19a7),
- TOBN(0x86e3c801, 0x345f4e47), TOBN(0x3bf21f71, 0x203a266c),
- TOBN(0x7ae110d4, 0x855b1f13), TOBN(0x5d6aaf6a, 0x07262517),
- TOBN(0x1e0f12e1, 0x813d28f1), TOBN(0x6000e11d, 0x7ad7a523),
- TOBN(0xc7d8deef, 0xc744a17b), TOBN(0x1e990b48, 0x14c05a00),
- TOBN(0x68fddaee, 0x93e976d5), TOBN(0x696241d1, 0x46610d63),
- TOBN(0xb204e7c3, 0x893dda88), TOBN(0x8bccfa65, 0x6a3a6946),
- TOBN(0xb59425b4, 0xc5cd1411), TOBN(0x701b4042, 0xff3658b1),
- TOBN(0xe3e56bca, 0x4784cf93), TOBN(0x27de5f15, 0x8fe68d60),
- TOBN(0x4ab9cfce, 0xf8d53f19), TOBN(0xddb10311, 0xa40a730d),
- TOBN(0x6fa73cd1, 0x4eee0a8a), TOBN(0xfd548748, 0x5249719d),
- TOBN(0x49d66316, 0xa8123ef0), TOBN(0x73c32db4, 0xe7f95438),
- TOBN(0x2e2ed209, 0x0d9e7854), TOBN(0xf98a9329, 0x9d9f0507),
- TOBN(0xc5d33cf6, 0x0c6aa20a), TOBN(0x9a32ba14, 0x75279bb2),
- TOBN(0x7e3202cb, 0x774a7307), TOBN(0x64ed4bc4, 0xe8c42dbd),
- TOBN(0xc20f1a06, 0xd4caed0d), TOBN(0xb8021407, 0x171d22b3),
- TOBN(0xd426ca04, 0xd13268d7), TOBN(0x92377007, 0x25f4d126),
- TOBN(0x4204cbc3, 0x71f21a85), TOBN(0x18461b7a, 0xf82369ba),
- TOBN(0xc0c07d31, 0x3fc858f9), TOBN(0x5deb5a50, 0xe2bab569),
- TOBN(0xd5959d46, 0xd5eea89e), TOBN(0xfdff8424, 0x08437f4b),
- TOBN(0xf21071e4, 0x3cfe254f), TOBN(0x72417696, 0x95468321),
- TOBN(0x5d8288b9, 0x102cae3e), TOBN(0x2d143e3d, 0xf1965dff),
- TOBN(0x00c9a376, 0xa078d847), TOBN(0x6fc0da31, 0x26028731),
- TOBN(0xa2baeadf, 0xe45083a2), TOBN(0x66bc7218, 0x5e5b4bcd),
- TOBN(0x2c826442, 0xd04b8e7f), TOBN(0xc19f5451, 0x6c4b586b),
- TOBN(0x60182c49, 0x5b7eeed5), TOBN(0xd9954ecd, 0x7aa9dfa1),
- TOBN(0xa403a8ec, 0xc73884ad), TOBN(0x7fb17de2, 0x9bb39041),
- TOBN(0x694b64c5, 0xabb020e8), TOBN(0x3d18c184, 0x19c4eec7),
- TOBN(0x9c4673ef, 0x1c4793e5), TOBN(0xc7b8aeb5, 0x056092e6),
- TOBN(0x3aa1ca43, 0xf0f8c16b), TOBN(0x224ed5ec, 0xd679b2f6),
- TOBN(0x0d56eeaf, 0x55a205c9), TOBN(0xbfe115ba, 0x4b8e028b),
- TOBN(0x97e60849, 0x3927f4fe), TOBN(0xf91fbf94, 0x759aa7c5),
- TOBN(0x985af769, 0x6be90a51), TOBN(0xc1277b78, 0x78ccb823),
- TOBN(0x395b656e, 0xe7a75952), TOBN(0x00df7de0, 0x928da5f5),
- TOBN(0x09c23175, 0x4ca4454f), TOBN(0x4ec971f4, 0x7aa2d3c1),
- TOBN(0x45c3c507, 0xe75d9ccc), TOBN(0x63b7be8a, 0x3dc90306),
- TOBN(0x37e09c66, 0x5db44bdc), TOBN(0x50d60da1, 0x6841c6a2),
- TOBN(0x6f9b65ee, 0x08df1b12), TOBN(0x38734879, 0x7ff089df),
- TOBN(0x9c331a66, 0x3fe8013d), TOBN(0x017f5de9, 0x5f42fcc8),
- TOBN(0x43077866, 0xe8e57567), TOBN(0xc9f781ce, 0xf9fcdb18),
- TOBN(0x38131dda, 0x9b12e174), TOBN(0x25d84aa3, 0x8a03752a),
- TOBN(0x45e09e09, 0x4d0c0ce2), TOBN(0x1564008b, 0x92bebba5),
- TOBN(0xf7e8ad31, 0xa87284c7), TOBN(0xb7c4b46c, 0x97e7bbaa),
- TOBN(0x3e22a7b3, 0x97acf4ec), TOBN(0x0426c400, 0x5ea8b640),
- TOBN(0x5e3295a6, 0x4e969285), TOBN(0x22aabc59, 0xa6a45670),
- TOBN(0xb929714c, 0x5f5942bc), TOBN(0x9a6168bd, 0xfa3182ed),
- TOBN(0x2216a665, 0x104152ba), TOBN(0x46908d03, 0xb6926368)}
- ,
- {TOBN(0xa9f5d874, 0x5a1251fb), TOBN(0x967747a8, 0xc72725c7),
- TOBN(0x195c33e5, 0x31ffe89e), TOBN(0x609d210f, 0xe964935e),
- TOBN(0xcafd6ca8, 0x2fe12227), TOBN(0xaf9b5b96, 0x0426469d),
- TOBN(0x2e9ee04c, 0x5693183c), TOBN(0x1084a333, 0xc8146fef),
- TOBN(0x96649933, 0xaed1d1f7), TOBN(0x566eaff3, 0x50563090),
- TOBN(0x345057f0, 0xad2e39cf), TOBN(0x148ff65b, 0x1f832124),
- TOBN(0x042e89d4, 0xcf94cf0d), TOBN(0x319bec84, 0x520c58b3),
- TOBN(0x2a267626, 0x5361aa0d), TOBN(0xc86fa302, 0x8fbc87ad),
- TOBN(0xfc83d2ab, 0x5c8b06d5), TOBN(0xb1a785a2, 0xfe4eac46),
- TOBN(0xb99315bc, 0x846f7779), TOBN(0xcf31d816, 0xef9ea505),
- TOBN(0x2391fe6a, 0x15d7dc85), TOBN(0x2f132b04, 0xb4016b33),
- TOBN(0x29547fe3, 0x181cb4c7), TOBN(0xdb66d8a6, 0x650155a1),
- TOBN(0x6b66d7e1, 0xadc1696f), TOBN(0x98ebe593, 0x0acd72d0),
- TOBN(0x65f24550, 0xcc1b7435), TOBN(0xce231393, 0xb4b9a5ec),
- TOBN(0x234a22d4, 0xdb067df9), TOBN(0x98dda095, 0xcaff9b00),
- TOBN(0x1bbc75a0, 0x6100c9c1), TOBN(0x1560a9c8, 0x939cf695),
- TOBN(0xcf006d3e, 0x99e0925f), TOBN(0x2dd74a96, 0x6322375a),
- TOBN(0xc58b446a, 0xb56af5ba), TOBN(0x50292683, 0xe0b9b4f1),
- TOBN(0xe2c34cb4, 0x1aeaffa3), TOBN(0x8b17203f, 0x9b9587c1),
- TOBN(0x6d559207, 0xead1350c), TOBN(0x2b66a215, 0xfb7f9604),
- TOBN(0x0850325e, 0xfe51bf74), TOBN(0x9c4f579e, 0x5e460094),
- TOBN(0x5c87b92a, 0x76da2f25), TOBN(0x889de4e0, 0x6febef33),
- TOBN(0x6900ec06, 0x646083ce), TOBN(0xbe2a0335, 0xbfe12773),
- TOBN(0xadd1da35, 0xc5344110), TOBN(0x757568b7, 0xb802cd20),
- TOBN(0x75559779, 0x00f7e6c8), TOBN(0x38e8b94f, 0x0facd2f0),
- TOBN(0xfea1f3af, 0x03fde375), TOBN(0x5e11a1d8, 0x75881dfc),
- TOBN(0xb3a6b02e, 0xc1e2f2ef), TOBN(0x193d2bbb, 0xc605a6c5),
- TOBN(0x325ffeee, 0x339a0b2d), TOBN(0x27b6a724, 0x9e0c8846),
- TOBN(0xe4050f1c, 0xf1c367ca), TOBN(0x9bc85a9b, 0xc90fbc7d),
- TOBN(0xa373c4a2, 0xe1a11032), TOBN(0xb64232b7, 0xad0393a9),
- TOBN(0xf5577eb0, 0x167dad29), TOBN(0x1604f301, 0x94b78ab2),
- TOBN(0x0baa94af, 0xe829348b), TOBN(0x77fbd8dd, 0x41654342),
- TOBN(0xdab50ea5, 0xb964e39a), TOBN(0xd4c29e3c, 0xd0d3c76e),
- TOBN(0x80dae67c, 0x56d11964), TOBN(0x7307a8bf, 0xe5ffcc2f),
- TOBN(0x65bbc1aa, 0x91708c3b), TOBN(0xa151e62c, 0x28bf0eeb),
- TOBN(0x6cb53381, 0x6fa34db7), TOBN(0x5139e05c, 0xa29403a8),
- TOBN(0x6ff651b4, 0x94a7cd2e), TOBN(0x5671ffd1, 0x0699336c),
- TOBN(0x6f5fd2cc, 0x979a896a), TOBN(0x11e893a8, 0xd8148cef),
- TOBN(0x988906a1, 0x65cf7b10), TOBN(0x81b67178, 0xc50d8485),
- TOBN(0x7c0deb35, 0x8a35b3de), TOBN(0x423ac855, 0xc1d29799),
- TOBN(0xaf580d87, 0xdac50b74), TOBN(0x28b2b89f, 0x5869734c),
- TOBN(0x99a3b936, 0x874e28fb), TOBN(0xbb2c9190, 0x25f3f73a),
- TOBN(0x199f6918, 0x84a9d5b7), TOBN(0x7ebe2325, 0x7e770374),
- TOBN(0xf442e107, 0x0738efe2), TOBN(0xcf9f3f56, 0xcf9082d2),
- TOBN(0x719f69e1, 0x09618708), TOBN(0xcc9e8364, 0xc183f9b1),
- TOBN(0xec203a95, 0x366a21af), TOBN(0x6aec5d6d, 0x068b141f),
- TOBN(0xee2df78a, 0x994f04e9), TOBN(0xb39ccae8, 0x271245b0),
- TOBN(0xb875a4a9, 0x97e43f4f), TOBN(0x507dfe11, 0xdb2cea98),
- TOBN(0x4fbf81cb, 0x489b03e9), TOBN(0xdb86ec5b, 0x6ec414fa),
- TOBN(0xfad444f9, 0xf51b3ae5), TOBN(0xca7d33d6, 0x1914e3fe),
- TOBN(0xa9c32f5c, 0x0ae6c4d0), TOBN(0xa9ca1d1e, 0x73969568),
- TOBN(0x98043c31, 0x1aa7467e), TOBN(0xe832e75c, 0xe21b5ac6),
- TOBN(0x314b7aea, 0x5232123d), TOBN(0x08307c8c, 0x65ae86db),
- TOBN(0x06e7165c, 0xaa4668ed), TOBN(0xb170458b, 0xb4d3ec39),
- TOBN(0x4d2e3ec6, 0xc19bb986), TOBN(0xc5f34846, 0xae0304ed),
- TOBN(0x917695a0, 0x6c9f9722), TOBN(0x6c7f7317, 0x4cab1c0a),
- TOBN(0x6295940e, 0x9d6d2e8b), TOBN(0xd318b8c1, 0x549f7c97),
- TOBN(0x22453204, 0x97713885), TOBN(0x468d834b, 0xa8a440fe),
- TOBN(0xd81fe5b2, 0xbfba796e), TOBN(0x152364db, 0x6d71f116),
- TOBN(0xbb8c7c59, 0xb5b66e53), TOBN(0x0b12c61b, 0x2641a192),
- TOBN(0x31f14802, 0xfcf0a7fd), TOBN(0x42fd0789, 0x5488b01e),
- TOBN(0x71d78d6d, 0x9952b498), TOBN(0x8eb572d9, 0x07ac5201),
- TOBN(0xe0a2a44c, 0x4d194a88), TOBN(0xd2b63fd9, 0xba017e66),
- TOBN(0x78efc6c8, 0xf888aefc), TOBN(0xb76f6bda, 0x4a881a11),
- TOBN(0x187f314b, 0xb46c2397), TOBN(0x004cf566, 0x5ded2819),
- TOBN(0xa9ea5704, 0x38764d34), TOBN(0xbba45217, 0x78084709),
- TOBN(0x06474571, 0x1171121e), TOBN(0xad7b7eb1, 0xe7c9b671),
- TOBN(0xdacfbc40, 0x730f7507), TOBN(0x178cd8c6, 0xc7ad7bd1),
- TOBN(0xbf0be101, 0xb2a67238), TOBN(0x3556d367, 0xaf9c14f2),
- TOBN(0x104b7831, 0xa5662075), TOBN(0x58ca59bb, 0x79d9e60a),
- TOBN(0x4bc45392, 0xa569a73b), TOBN(0x517a52e8, 0x5698f6c9),
- TOBN(0x85643da5, 0xaeadd755), TOBN(0x1aed0cd5, 0x2a581b84),
- TOBN(0xb9b4ff84, 0x80af1372), TOBN(0x244c3113, 0xf1ba5d1f),
- TOBN(0x2a5dacbe, 0xf5f98d31), TOBN(0x2c3323e8, 0x4375bc2a),
- TOBN(0x17a3ab4a, 0x5594b1dd), TOBN(0xa1928bfb, 0xceb4797e),
- TOBN(0xe83af245, 0xe4886a19), TOBN(0x8979d546, 0x72b5a74a),
- TOBN(0xa0f726bc, 0x19f9e967), TOBN(0xd9d03152, 0xe8fbbf4e),
- TOBN(0xcfd6f51d, 0xb7707d40), TOBN(0x633084d9, 0x63f6e6e0),
- TOBN(0xedcd9cdc, 0x55667eaf), TOBN(0x73b7f92b, 0x2e44d56f),
- TOBN(0xfb2e39b6, 0x4e962b14), TOBN(0x7d408f6e, 0xf671fcbf),
- TOBN(0xcc634ddc, 0x164a89bb), TOBN(0x74a42bb2, 0x3ef3bd05),
- TOBN(0x1280dbb2, 0x428decbb), TOBN(0x6103f6bb, 0x402c8596),
- TOBN(0xfa2bf581, 0x355a5752), TOBN(0x562f96a8, 0x00946674),
- TOBN(0x4e4ca16d, 0x6da0223b), TOBN(0xfe47819f, 0x28d3aa25),
- TOBN(0x9eea3075, 0xf8dfcf8a), TOBN(0xa284f0aa, 0x95669825),
- TOBN(0xb3fca250, 0x867d3fd8), TOBN(0x20757b5f, 0x269d691e),
- TOBN(0xf2c24020, 0x93b8a5de), TOBN(0xd3f93359, 0xebc06da6),
- TOBN(0x1178293e, 0xb2739c33), TOBN(0xd2a3e770, 0xbcd686e5),
- TOBN(0xa76f49f4, 0xcd941534), TOBN(0x0d37406b, 0xe3c71c0e),
- TOBN(0x172d9397, 0x3b97f7e3), TOBN(0xec17e239, 0xbd7fd0de),
- TOBN(0xe3290551, 0x6f496ba2), TOBN(0x6a693172, 0x36ad50e7),
- TOBN(0xc4e539a2, 0x83e7eff5), TOBN(0x752737e7, 0x18e1b4cf),
- TOBN(0xa2f7932c, 0x68af43ee), TOBN(0x5502468e, 0x703d00bd),
- TOBN(0xe5dc978f, 0x2fb061f5), TOBN(0xc9a1904a, 0x28c815ad),
- TOBN(0xd3af538d, 0x470c56a4), TOBN(0x159abc5f, 0x193d8ced),
- TOBN(0x2a37245f, 0x20108ef3), TOBN(0xfa17081e, 0x223f7178),
- TOBN(0x27b0fb2b, 0x10c8c0f5), TOBN(0x2102c3ea, 0x40650547),
- TOBN(0x594564df, 0x8ac3bfa7), TOBN(0x98102033, 0x509dad96),
- TOBN(0x6989643f, 0xf1d18a13), TOBN(0x35eebd91, 0xd7fc5af0),
- TOBN(0x078d096a, 0xfaeaafd8), TOBN(0xb7a89341, 0xdef3de98),
- TOBN(0x2a206e8d, 0xecf2a73a), TOBN(0x066a6397, 0x8e551994),
- TOBN(0x3a6a088a, 0xb98d53a2), TOBN(0x0ce7c67c, 0x2d1124aa),
- TOBN(0x48cec671, 0x759a113c), TOBN(0xe3b373d3, 0x4f6f67fa),
- TOBN(0x5455d479, 0xfd36727b), TOBN(0xe5a428ee, 0xa13c0d81),
- TOBN(0xb853dbc8, 0x1c86682b), TOBN(0xb78d2727, 0xb8d02b2a),
- TOBN(0xaaf69bed, 0x8ebc329a), TOBN(0xdb6b40b3, 0x293b2148),
- TOBN(0xe42ea77d, 0xb8c4961f), TOBN(0xb1a12f7c, 0x20e5e0ab),
- TOBN(0xa0ec5274, 0x79e8b05e), TOBN(0x68027391, 0xfab60a80),
- TOBN(0x6bfeea5f, 0x16b1bd5e), TOBN(0xf957e420, 0x4de30ad3),
- TOBN(0xcbaf664e, 0x6a353b9e), TOBN(0x5c873312, 0x26d14feb),
- TOBN(0x4e87f98c, 0xb65f57cb), TOBN(0xdb60a621, 0x5e0cdd41),
- TOBN(0x67c16865, 0xa6881440), TOBN(0x1093ef1a, 0x46ab52aa),
- TOBN(0xc095afb5, 0x3f4ece64), TOBN(0x6a6bb02e, 0x7604551a),
- TOBN(0x55d44b4e, 0x0b26b8cd), TOBN(0xe5f9a999, 0xf971268a),
- TOBN(0xc08ec425, 0x11a7de84), TOBN(0x83568095, 0xfda469dd),
- TOBN(0x737bfba1, 0x6c6c90a2), TOBN(0x1cb9c4a0, 0xbe229831),
- TOBN(0x93bccbba, 0xbb2eec64), TOBN(0xa0c23b64, 0xda03adbe),
- TOBN(0x5f7aa00a, 0xe0e86ac4), TOBN(0x470b941e, 0xfc1401e6),
- TOBN(0x5ad8d679, 0x9df43574), TOBN(0x4ccfb8a9, 0x0f65d810),
- TOBN(0x1bce80e3, 0xaa7fbd81), TOBN(0x273291ad, 0x9508d20a),
- TOBN(0xf5c4b46b, 0x42a92806), TOBN(0x810684ec, 0xa86ab44a),
- TOBN(0x4591640b, 0xca0bc9f8), TOBN(0xb5efcdfc, 0x5c4b6054),
- TOBN(0x16fc8907, 0x6e9edd12), TOBN(0xe29d0b50, 0xd4d792f9),
- TOBN(0xa45fd01c, 0x9b03116d), TOBN(0x85035235, 0xc81765a4),
- TOBN(0x1fe2a9b2, 0xb4b4b67c), TOBN(0xc1d10df0, 0xe8020604),
- TOBN(0x9d64abfc, 0xbc8058d8), TOBN(0x8943b9b2, 0x712a0fbb),
- TOBN(0x90eed914, 0x3b3def04), TOBN(0x85ab3aa2, 0x4ce775ff),
- TOBN(0x605fd4ca, 0x7bbc9040), TOBN(0x8b34a564, 0xe2c75dfb),
- TOBN(0x41ffc94a, 0x10358560), TOBN(0x2d8a5072, 0x9e5c28aa),
- TOBN(0xe915a0fc, 0x4cc7eb15), TOBN(0xe9efab05, 0x8f6d0f5d),
- TOBN(0xdbab47a9, 0xd19e9b91), TOBN(0x8cfed745, 0x0276154c),
- TOBN(0x154357ae, 0x2cfede0d), TOBN(0x520630df, 0x19f5a4ef),
- TOBN(0x25759f7c, 0xe382360f), TOBN(0xb6db05c9, 0x88bf5857),
- TOBN(0x2917d61d, 0x6c58d46c), TOBN(0x14f8e491, 0xfd20cb7a),
- TOBN(0xb68a727a, 0x11c20340), TOBN(0x0386f86f, 0xaf7ccbb6),
- TOBN(0x5c8bc6cc, 0xfee09a20), TOBN(0x7d76ff4a, 0xbb7eea35),
- TOBN(0xa7bdebe7, 0xdb15be7a), TOBN(0x67a08054, 0xd89f0302),
- TOBN(0x56bf0ea9, 0xc1193364), TOBN(0xc8244467, 0x62837ebe),
- TOBN(0x32bd8e8b, 0x20d841b8), TOBN(0x127a0548, 0xdbb8a54f),
- TOBN(0x83dd4ca6, 0x63b20236), TOBN(0x87714718, 0x203491fa),
- TOBN(0x4dabcaaa, 0xaa8a5288), TOBN(0x91cc0c8a, 0xaf23a1c9),
- TOBN(0x34c72c6a, 0x3f220e0c), TOBN(0xbcc20bdf, 0x1232144a),
- TOBN(0x6e2f42da, 0xa20ede1b), TOBN(0xc441f00c, 0x74a00515),
- TOBN(0xbf46a5b6, 0x734b8c4b), TOBN(0x57409503, 0x7b56c9a4),
- TOBN(0x9f735261, 0xe4585d45), TOBN(0x9231faed, 0x6734e642),
- TOBN(0x1158a176, 0xbe70ee6c), TOBN(0x35f1068d, 0x7c3501bf),
- TOBN(0x6beef900, 0xa2d26115), TOBN(0x649406f2, 0xef0afee3),
- TOBN(0x3f43a60a, 0xbc2420a1), TOBN(0x509002a7, 0xd5aee4ac),
- TOBN(0xb46836a5, 0x3ff3571b), TOBN(0x24f98b78, 0x837927c1),
- TOBN(0x6254256a, 0x4533c716), TOBN(0xf27abb0b, 0xd07ee196),
- TOBN(0xd7cf64fc, 0x5c6d5bfd), TOBN(0x6915c751, 0xf0cd7a77),
- TOBN(0xd9f59012, 0x8798f534), TOBN(0x772b0da8, 0xf81d8b5f),
- TOBN(0x1244260c, 0x2e03fa69), TOBN(0x36cf0e3a, 0x3be1a374),
- TOBN(0x6e7c1633, 0xef06b960), TOBN(0xa71a4c55, 0x671f90f6),
- TOBN(0x7a941251, 0x33c673db), TOBN(0xc0bea510, 0x73e8c131),
- TOBN(0x61a8a699, 0xd4f6c734), TOBN(0x25e78c88, 0x341ed001),
- TOBN(0x5c18acf8, 0x8e2f7d90), TOBN(0xfdbf33d7, 0x77be32cd),
- TOBN(0x0a085cd7, 0xd2eb5ee9), TOBN(0x2d702cfb, 0xb3201115),
- TOBN(0xb6e0ebdb, 0x85c88ce8), TOBN(0x23a3ce3c, 0x1e01d617),
- TOBN(0x3041618e, 0x567333ac), TOBN(0x9dd0fd8f, 0x157edb6b),
- TOBN(0x27f74702, 0xb57872b8), TOBN(0x2ef26b4f, 0x657d5fe1),
- TOBN(0x95426f0a, 0x57cf3d40), TOBN(0x847e2ad1, 0x65a6067a),
- TOBN(0xd474d9a0, 0x09996a74), TOBN(0x16a56acd, 0x2a26115c),
- TOBN(0x02a615c3, 0xd16f4d43), TOBN(0xcc3fc965, 0xaadb85b7),
- TOBN(0x386bda73, 0xce07d1b0), TOBN(0xd82910c2, 0x58ad4178),
- TOBN(0x124f82cf, 0xcd2617f4), TOBN(0xcc2f5e8d, 0xef691770),
- TOBN(0x82702550, 0xb8c30ccc), TOBN(0x7b856aea, 0x1a8e575a),
- TOBN(0xbb822fef, 0xb1ab9459), TOBN(0x085928bc, 0xec24e38e),
- TOBN(0x5d0402ec, 0xba8f4b4d), TOBN(0xc07cd4ba, 0x00b4d58b),
- TOBN(0x5d8dffd5, 0x29227e7a), TOBN(0x61d44d0c, 0x31bf386f),
- TOBN(0xe486dc2b, 0x135e6f4d), TOBN(0x680962eb, 0xe79410ef),
- TOBN(0xa61bd343, 0xf10088b5), TOBN(0x6aa76076, 0xe2e28686),
- TOBN(0x80463d11, 0x8fb98871), TOBN(0xcb26f5c3, 0xbbc76aff),
- TOBN(0xd4ab8edd, 0xfbe03614), TOBN(0xc8eb579b, 0xc0cf2dee),
- TOBN(0xcc004c15, 0xc93bae41), TOBN(0x46fbae5d, 0x3aeca3b2),
- TOBN(0x671235cf, 0x0f1e9ab1), TOBN(0xadfba934, 0x9ec285c1),
- TOBN(0x88ded013, 0xf216c980), TOBN(0xc8ac4fb8, 0xf79e0bc1),
- TOBN(0xa29b89c6, 0xfb97a237), TOBN(0xb697b780, 0x9922d8e7),
- TOBN(0x3142c639, 0xddb945b5), TOBN(0x447b06c7, 0xe094c3a9),
- TOBN(0xcdcb3642, 0x72266c90), TOBN(0x633aad08, 0xa9385046),
- TOBN(0xa36c936b, 0xb57c6477), TOBN(0x871f8b64, 0xe94dbcc6),
- TOBN(0x28d0fb62, 0xa591a67b), TOBN(0x9d40e081, 0xc1d926f5),
- TOBN(0x3111eaf6, 0xf2d84b5a), TOBN(0x228993f9, 0xa565b644),
- TOBN(0x0ccbf592, 0x2c83188b), TOBN(0xf87b30ab, 0x3df3e197),
- TOBN(0xb8658b31, 0x7642bca8), TOBN(0x1a032d7f, 0x52800f17),
- TOBN(0x051dcae5, 0x79bf9445), TOBN(0xeba6b8ee, 0x54a2e253),
- TOBN(0x5c8b9cad, 0xd4485692), TOBN(0x84bda40e, 0x8986e9be),
- TOBN(0xd16d16a4, 0x2f0db448), TOBN(0x8ec80050, 0xa14d4188),
- TOBN(0xb2b26107, 0x98fa7aaa), TOBN(0x41209ee4, 0xf073aa4e),
- TOBN(0xf1570359, 0xf2d6b19b), TOBN(0xcbe6868c, 0xfc577caf),
- TOBN(0x186c4bdc, 0x32c04dd3), TOBN(0xa6c35fae, 0xcfeee397),
- TOBN(0xb4a1b312, 0xf086c0cf), TOBN(0xe0a5ccc6, 0xd9461fe2),
- TOBN(0xc32278aa, 0x1536189f), TOBN(0x1126c55f, 0xba6df571),
- TOBN(0x0f71a602, 0xb194560e), TOBN(0x8b2d7405, 0x324bd6e1),
- TOBN(0x8481939e, 0x3738be71), TOBN(0xb5090b1a, 0x1a4d97a9),
- TOBN(0x116c65a3, 0xf05ba915), TOBN(0x21863ad3, 0xaae448aa),
- TOBN(0xd24e2679, 0xa7aae5d3), TOBN(0x7076013d, 0x0de5c1c4),
- TOBN(0x2d50f8ba, 0xbb05b629), TOBN(0x73c1abe2, 0x6e66efbb),
- TOBN(0xefd4b422, 0xf2488af7), TOBN(0xe4105d02, 0x663ba575),
- TOBN(0x7eb60a8b, 0x53a69457), TOBN(0x62210008, 0xc945973b),
- TOBN(0xfb255478, 0x77a50ec6), TOBN(0xbf0392f7, 0x0a37a72c),
- TOBN(0xa0a7a19c, 0x4be18e7a), TOBN(0x90d8ea16, 0x25b1e0af),
- TOBN(0x7582a293, 0xef953f57), TOBN(0x90a64d05, 0xbdc5465a),
- TOBN(0xca79c497, 0xe2510717), TOBN(0x560dbb7c, 0x18cb641f),
- TOBN(0x1d8e3286, 0x4b66abfb), TOBN(0xd26f52e5, 0x59030900),
- TOBN(0x1ee3f643, 0x5584941a), TOBN(0x6d3b3730, 0x569f5958),
- TOBN(0x9ff2a62f, 0x4789dba5), TOBN(0x91fcb815, 0x72b5c9b7),
- TOBN(0xf446cb7d, 0x6c8f9a0e), TOBN(0x48f625c1, 0x39b7ecb5),
- TOBN(0xbabae801, 0x1c6219b8), TOBN(0xe7a562d9, 0x28ac2f23),
- TOBN(0xe1b48732, 0x26e20588), TOBN(0x06ee1cad, 0x775af051),
- TOBN(0xda29ae43, 0xfaff79f7), TOBN(0xc141a412, 0x652ee9e0),
- TOBN(0x1e127f6f, 0x195f4bd0), TOBN(0x29c6ab4f, 0x072f34f8),
- TOBN(0x7b7c1477, 0x30448112), TOBN(0x82b51af1, 0xe4a38656),
- TOBN(0x2bf2028a, 0x2f315010), TOBN(0xc9a4a01f, 0x6ea88cd4),
- TOBN(0xf63e95d8, 0x257e5818), TOBN(0xdd8efa10, 0xb4519b16),
- TOBN(0xed8973e0, 0x0da910bf), TOBN(0xed49d077, 0x5c0fe4a9),
- TOBN(0xac3aac5e, 0xb7caee1e), TOBN(0x1033898d, 0xa7f4da57),
- TOBN(0x42145c0e, 0x5c6669b9), TOBN(0x42daa688, 0xc1aa2aa0),
- TOBN(0x629cc15c, 0x1a1d885a), TOBN(0x25572ec0, 0xf4b76817),
- TOBN(0x8312e435, 0x9c8f8f28), TOBN(0x8107f8cd, 0x81965490),
- TOBN(0x516ff3a3, 0x6fa6110c), TOBN(0x74fb1eb1, 0xfb93561f),
- TOBN(0x6c0c9047, 0x8457522b), TOBN(0xcfd32104, 0x6bb8bdc6),
- TOBN(0x2d6884a2, 0xcc80ad57), TOBN(0x7c27fc35, 0x86a9b637),
- TOBN(0x3461baed, 0xadf4e8cd), TOBN(0x1d56251a, 0x617242f0),
- TOBN(0x0b80d209, 0xc955bef4), TOBN(0xdf02cad2, 0x06adb047),
- TOBN(0xf0d7cb91, 0x5ec74fee), TOBN(0xd2503375, 0x1111ba44),
- TOBN(0x9671755e, 0xdf53cb36), TOBN(0x54dcb612, 0x3368551b),
- TOBN(0x66d69aac, 0xc8a025a4), TOBN(0x6be946c6, 0xe77ef445),
- TOBN(0x719946d1, 0xa995e094), TOBN(0x65e848f6, 0xe51e04d8),
- TOBN(0xe62f3300, 0x6a1e3113), TOBN(0x1541c7c1, 0x501de503),
- TOBN(0x4daac9fa, 0xf4acfade), TOBN(0x0e585897, 0x44cd0b71),
- TOBN(0x544fd869, 0x0a51cd77), TOBN(0x60fc20ed, 0x0031016d),
- TOBN(0x58b404ec, 0xa4276867), TOBN(0x46f6c3cc, 0x34f34993),
- TOBN(0x477ca007, 0xc636e5bd), TOBN(0x8018f5e5, 0x7c458b47),
- TOBN(0xa1202270, 0xe47b668f), TOBN(0xcef48ccd, 0xee14f203),
- TOBN(0x23f98bae, 0x62ff9b4d), TOBN(0x55acc035, 0xc589eddd),
- TOBN(0x3fe712af, 0x64db4444), TOBN(0x19e9d634, 0xbecdd480),
- TOBN(0xe08bc047, 0xa930978a), TOBN(0x2dbf24ec, 0xa1280733),
- TOBN(0x3c0ae38c, 0x2cd706b2), TOBN(0x5b012a5b, 0x359017b9),
- TOBN(0x3943c38c, 0x72e0f5ae), TOBN(0x786167ea, 0x57176fa3),
- TOBN(0xe5f9897d, 0x594881dc), TOBN(0x6b5efad8, 0xcfb820c1),
- TOBN(0xb2179093, 0xd55018de), TOBN(0x39ad7d32, 0x0bac56ce),
- TOBN(0xb55122e0, 0x2cfc0e81), TOBN(0x117c4661, 0xf6d89daa),
- TOBN(0x362d01e1, 0xcb64fa09), TOBN(0x6a309b4e, 0x3e9c4ddd),
- TOBN(0xfa979fb7, 0xabea49b1), TOBN(0xb4b1d27d, 0x10e2c6c5),
- TOBN(0xbd61c2c4, 0x23afde7a), TOBN(0xeb6614f8, 0x9786d358),
- TOBN(0x4a5d816b, 0x7f6f7459), TOBN(0xe431a44f, 0x09360e7b),
- TOBN(0x8c27a032, 0xc309914c), TOBN(0xcea5d68a, 0xcaede3d8),
- TOBN(0x3668f665, 0x3a0a3f95), TOBN(0x89369416, 0x7ceba27b),
- TOBN(0x89981fad, 0xe4728fe9), TOBN(0x7102c8a0, 0x8a093562),
- TOBN(0xbb80310e, 0x235d21c8), TOBN(0x505e55d1, 0xbefb7f7b),
- TOBN(0xa0a90811, 0x12958a67), TOBN(0xd67e106a, 0x4d851fef),
- TOBN(0xb84011a9, 0x431dd80e), TOBN(0xeb7c7cca, 0x73306cd9),
- TOBN(0x20fadd29, 0xd1b3b730), TOBN(0x83858b5b, 0xfe37b3d3),
- TOBN(0xbf4cd193, 0xb6251d5c), TOBN(0x1cca1fd3, 0x1352d952),
- TOBN(0xc66157a4, 0x90fbc051), TOBN(0x7990a638, 0x89b98636),}
- ,
- {TOBN(0xe5aa692a, 0x87dec0e1), TOBN(0x010ded8d, 0xf7b39d00),
- TOBN(0x7b1b80c8, 0x54cfa0b5), TOBN(0x66beb876, 0xa0f8ea28),
- TOBN(0x50d7f531, 0x3476cd0e), TOBN(0xa63d0e65, 0xb08d3949),
- TOBN(0x1a09eea9, 0x53479fc6), TOBN(0x82ae9891, 0xf499e742),
- TOBN(0xab58b910, 0x5ca7d866), TOBN(0x582967e2, 0x3adb3b34),
- TOBN(0x89ae4447, 0xcceac0bc), TOBN(0x919c667c, 0x7bf56af5),
- TOBN(0x9aec17b1, 0x60f5dcd7), TOBN(0xec697b9f, 0xddcaadbc),
- TOBN(0x0b98f341, 0x463467f5), TOBN(0xb187f1f7, 0xa967132f),
- TOBN(0x90fe7a1d, 0x214aeb18), TOBN(0x1506af3c, 0x741432f7),
- TOBN(0xbb5565f9, 0xe591a0c4), TOBN(0x10d41a77, 0xb44f1bc3),
- TOBN(0xa09d65e4, 0xa84bde96), TOBN(0x42f060d8, 0xf20a6a1c),
- TOBN(0x652a3bfd, 0xf27f9ce7), TOBN(0xb6bdb65c, 0x3b3d739f),
- TOBN(0xeb5ddcb6, 0xec7fae9f), TOBN(0x995f2714, 0xefb66e5a),
- TOBN(0xdee95d8e, 0x69445d52), TOBN(0x1b6c2d46, 0x09e27620),
- TOBN(0x32621c31, 0x8129d716), TOBN(0xb03909f1, 0x0958c1aa),
- TOBN(0x8c468ef9, 0x1af4af63), TOBN(0x162c429f, 0xfba5cdf6),
- TOBN(0x2f682343, 0x753b9371), TOBN(0x29cab45a, 0x5f1f9cd7),
- TOBN(0x571623ab, 0xb245db96), TOBN(0xc507db09, 0x3fd79999),
- TOBN(0x4e2ef652, 0xaf036c32), TOBN(0x86f0cc78, 0x05018e5c),
- TOBN(0xc10a73d4, 0xab8be350), TOBN(0x6519b397, 0x7e826327),
- TOBN(0xe8cb5eef, 0x9c053df7), TOBN(0x8de25b37, 0xb300ea6f),
- TOBN(0xdb03fa92, 0xc849cffb), TOBN(0x242e43a7, 0xe84169bb),
- TOBN(0xe4fa51f4, 0xdd6f958e), TOBN(0x6925a77f, 0xf4445a8d),
- TOBN(0xe6e72a50, 0xe90d8949), TOBN(0xc66648e3, 0x2b1f6390),
- TOBN(0xb2ab1957, 0x173e460c), TOBN(0x1bbbce75, 0x30704590),
- TOBN(0xc0a90dbd, 0xdb1c7162), TOBN(0x505e399e, 0x15cdd65d),
- TOBN(0x68434dcb, 0x57797ab7), TOBN(0x60ad35ba, 0x6a2ca8e8),
- TOBN(0x4bfdb1e0, 0xde3336c1), TOBN(0xbbef99eb, 0xd8b39015),
- TOBN(0x6c3b96f3, 0x1711ebec), TOBN(0x2da40f1f, 0xce98fdc4),
- TOBN(0xb99774d3, 0x57b4411f), TOBN(0x87c8bdf4, 0x15b65bb6),
- TOBN(0xda3a89e3, 0xc2eef12d), TOBN(0xde95bb9b, 0x3c7471f3),
- TOBN(0x600f225b, 0xd812c594), TOBN(0x54907c5d, 0x2b75a56b),
- TOBN(0xa93cc5f0, 0x8db60e35), TOBN(0x743e3cd6, 0xfa833319),
- TOBN(0x7dad5c41, 0xf81683c9), TOBN(0x70c1e7d9, 0x9c34107e),
- TOBN(0x0edc4a39, 0xa6be0907), TOBN(0x36d47035, 0x86d0b7d3),
- TOBN(0x8c76da03, 0x272bfa60), TOBN(0x0b4a07ea, 0x0f08a414),
- TOBN(0x699e4d29, 0x45c1dd53), TOBN(0xcadc5898, 0x231debb5),
- TOBN(0xdf49fcc7, 0xa77f00e0), TOBN(0x93057bbf, 0xa73e5a0e),
- TOBN(0x2f8b7ecd, 0x027a4cd1), TOBN(0x114734b3, 0xc614011a),
- TOBN(0xe7a01db7, 0x67677c68), TOBN(0x89d9be5e, 0x7e273f4f),
- TOBN(0xd225cb2e, 0x089808ef), TOBN(0xf1f7a27d, 0xd59e4107),
- TOBN(0x53afc761, 0x8211b9c9), TOBN(0x0361bc67, 0xe6819159),
- TOBN(0x2a865d0b, 0x7f071426), TOBN(0x6a3c1810, 0xe7072567),
- TOBN(0x3e3bca1e, 0x0d6bcabd), TOBN(0xa1b02bc1, 0x408591bc),
- TOBN(0xe0deee59, 0x31fba239), TOBN(0xf47424d3, 0x98bd91d1),
- TOBN(0x0f8886f4, 0x071a3c1d), TOBN(0x3f7d41e8, 0xa819233b),
- TOBN(0x708623c2, 0xcf6eb998), TOBN(0x86bb49af, 0x609a287f),
- TOBN(0x942bb249, 0x63c90762), TOBN(0x0ef6eea5, 0x55a9654b),
- TOBN(0x5f6d2d72, 0x36f5defe), TOBN(0xfa9922dc, 0x56f99176),
- TOBN(0x6c8c5ece, 0xf78ce0c7), TOBN(0x7b44589d, 0xbe09b55e),
- TOBN(0xe11b3bca, 0x9ea83770), TOBN(0xd7fa2c7f, 0x2ab71547),
- TOBN(0x2a3dd6fa, 0x2a1ddcc0), TOBN(0x09acb430, 0x5a7b7707),
- TOBN(0x4add4a2e, 0x649d4e57), TOBN(0xcd53a2b0, 0x1917526e),
- TOBN(0xc5262330, 0x20b44ac4), TOBN(0x4028746a, 0xbaa2c31d),
- TOBN(0x51318390, 0x64291d4c), TOBN(0xbf48f151, 0xee5ad909),
- TOBN(0xcce57f59, 0x7b185681), TOBN(0x7c3ac1b0, 0x4854d442),
- TOBN(0x65587dc3, 0xc093c171), TOBN(0xae7acb24, 0x24f42b65),
- TOBN(0x5a338adb, 0x955996cb), TOBN(0xc8e65675, 0x6051f91b),
- TOBN(0x66711fba, 0x28b8d0b1), TOBN(0x15d74137, 0xb6c10a90),
- TOBN(0x70cdd7eb, 0x3a232a80), TOBN(0xc9e2f07f, 0x6191ed24),
- TOBN(0xa80d1db6, 0xf79588c0), TOBN(0xfa52fc69, 0xb55768cc),
- TOBN(0x0b4df1ae, 0x7f54438a), TOBN(0x0cadd1a7, 0xf9b46a4f),
- TOBN(0xb40ea6b3, 0x1803dd6f), TOBN(0x488e4fa5, 0x55eaae35),
- TOBN(0x9f047d55, 0x382e4e16), TOBN(0xc9b5b7e0, 0x2f6e0c98),
- TOBN(0x6b1bd2d3, 0x95762649), TOBN(0xa9604ee7, 0xc7aea3f6),
- TOBN(0x3646ff27, 0x6dc6f896), TOBN(0x9bf0e7f5, 0x2860bad1),
- TOBN(0x2d92c821, 0x7cb44b92), TOBN(0xa2f5ce63, 0xaea9c182),
- TOBN(0xd0a2afb1, 0x9154a5fd), TOBN(0x482e474c, 0x95801da6),
- TOBN(0xc19972d0, 0xb611c24b), TOBN(0x1d468e65, 0x60a8f351),
- TOBN(0xeb758069, 0x7bcf6421), TOBN(0xec9dd0ee, 0x88fbc491),
- TOBN(0x5b59d2bf, 0x956c2e32), TOBN(0x73dc6864, 0xdcddf94e),
- TOBN(0xfd5e2321, 0xbcee7665), TOBN(0xa7b4f8ef, 0x5e9a06c4),
- TOBN(0xfba918dd, 0x7280f855), TOBN(0xbbaac260, 0x8baec688),
- TOBN(0xa3b3f00f, 0x33400f42), TOBN(0x3d2dba29, 0x66f2e6e4),
- TOBN(0xb6f71a94, 0x98509375), TOBN(0x8f33031f, 0xcea423cc),
- TOBN(0x009b8dd0, 0x4807e6fb), TOBN(0x5163cfe5, 0x5cdb954c),
- TOBN(0x03cc8f17, 0xcf41c6e8), TOBN(0xf1f03c2a, 0x037b925c),
- TOBN(0xc39c19cc, 0x66d2427c), TOBN(0x823d24ba, 0x7b6c18e4),
- TOBN(0x32ef9013, 0x901f0b4f), TOBN(0x684360f1, 0xf8941c2e),
- TOBN(0x0ebaff52, 0x2c28092e), TOBN(0x7891e4e3, 0x256c932f),
- TOBN(0x51264319, 0xac445e3d), TOBN(0x553432e7, 0x8ea74381),
- TOBN(0xe6eeaa69, 0x67e9c50a), TOBN(0x27ced284, 0x62e628c7),
- TOBN(0x3f96d375, 0x7a4afa57), TOBN(0xde0a14c3, 0xe484c150),
- TOBN(0x364a24eb, 0x38bd9923), TOBN(0x1df18da0, 0xe5177422),
- TOBN(0x174e8f82, 0xd8d38a9b), TOBN(0x2e97c600, 0xe7de1391),
- TOBN(0xc5709850, 0xa1c175dd), TOBN(0x969041a0, 0x32ae5035),
- TOBN(0xcbfd533b, 0x76a2086b), TOBN(0xd6bba71b, 0xd7c2e8fe),
- TOBN(0xb2d58ee6, 0x099dfb67), TOBN(0x3a8b342d, 0x064a85d9),
- TOBN(0x3bc07649, 0x522f9be3), TOBN(0x690c075b, 0xdf1f49a8),
- TOBN(0x80e1aee8, 0x3854ec42), TOBN(0x2a7dbf44, 0x17689dc7),
- TOBN(0xc004fc0e, 0x3faf4078), TOBN(0xb2f02e9e, 0xdf11862c),
- TOBN(0xf10a5e0f, 0xa0a1b7b3), TOBN(0x30aca623, 0x8936ec80),
- TOBN(0xf83cbf05, 0x02f40d9a), TOBN(0x4681c468, 0x2c318a4d),
- TOBN(0x98575618, 0x0e9c2674), TOBN(0xbe79d046, 0x1847092e),
- TOBN(0xaf1e480a, 0x78bd01e0), TOBN(0x6dd359e4, 0x72a51db9),
- TOBN(0x62ce3821, 0xe3afbab6), TOBN(0xc5cee5b6, 0x17733199),
- TOBN(0xe08b30d4, 0x6ffd9fbb), TOBN(0x6e5bc699, 0x36c610b7),
- TOBN(0xf343cff2, 0x9ce262cf), TOBN(0xca2e4e35, 0x68b914c1),
- TOBN(0x011d64c0, 0x16de36c5), TOBN(0xe0b10fdd, 0x42e2b829),
- TOBN(0x78942981, 0x6685aaf8), TOBN(0xe7511708, 0x230ede97),
- TOBN(0x671ed8fc, 0x3b922bf8), TOBN(0xe4d8c0a0, 0x4c29b133),
- TOBN(0x87eb1239, 0x3b6e99c4), TOBN(0xaff3974c, 0x8793beba),
- TOBN(0x03749405, 0x2c18df9b), TOBN(0xc5c3a293, 0x91007139),
- TOBN(0x6a77234f, 0xe37a0b95), TOBN(0x02c29a21, 0xb661c96b),
- TOBN(0xc3aaf1d6, 0x141ecf61), TOBN(0x9195509e, 0x3bb22f53),
- TOBN(0x29597404, 0x22d51357), TOBN(0x1b083822, 0x537bed60),
- TOBN(0xcd7d6e35, 0xe07289f0), TOBN(0x1f94c48c, 0x6dd86eff),
- TOBN(0xc8bb1f82, 0xeb0f9cfa), TOBN(0x9ee0b7e6, 0x1b2eb97d),
- TOBN(0x5a52fe2e, 0x34d74e31), TOBN(0xa352c310, 0x3bf79ab6),
- TOBN(0x97ff6c5a, 0xabfeeb8f), TOBN(0xbfbe8fef, 0xf5c97305),
- TOBN(0xd6081ce6, 0xa7904608), TOBN(0x1f812f3a, 0xc4fca249),
- TOBN(0x9b24bc9a, 0xb9e5e200), TOBN(0x91022c67, 0x38012ee8),
- TOBN(0xe83d9c5d, 0x30a713a1), TOBN(0x4876e3f0, 0x84ef0f93),
- TOBN(0xc9777029, 0xc1fbf928), TOBN(0xef7a6bb3, 0xbce7d2a4),
- TOBN(0xb8067228, 0xdfa2a659), TOBN(0xd5cd3398, 0xd877a48f),
- TOBN(0xbea4fd8f, 0x025d0f3f), TOBN(0xd67d2e35, 0x2eae7c2b),
- TOBN(0x184de7d7, 0xcc5f4394), TOBN(0xb5551b5c, 0x4536e142),
- TOBN(0x2e89b212, 0xd34aa60a), TOBN(0x14a96fea, 0xf50051d5),
- TOBN(0x4e21ef74, 0x0d12bb0b), TOBN(0xc522f020, 0x60b9677e),
- TOBN(0x8b12e467, 0x2df7731d), TOBN(0x39f80382, 0x7b326d31),
- TOBN(0xdfb8630c, 0x39024a94), TOBN(0xaacb96a8, 0x97319452),
- TOBN(0xd68a3961, 0xeda3867c), TOBN(0x0c58e2b0, 0x77c4ffca),
- TOBN(0x3d545d63, 0x4da919fa), TOBN(0xef79b69a, 0xf15e2289),
- TOBN(0x54bc3d3d, 0x808bab10), TOBN(0xc8ab3007, 0x45f82c37),
- TOBN(0xc12738b6, 0x7c4a658a), TOBN(0xb3c47639, 0x40e72182),
- TOBN(0x3b77be46, 0x8798e44f), TOBN(0xdc047df2, 0x17a7f85f),
- TOBN(0x2439d4c5, 0x5e59d92d), TOBN(0xcedca475, 0xe8e64d8d),
- TOBN(0xa724cd0d, 0x87ca9b16), TOBN(0x35e4fd59, 0xa5540dfe),
- TOBN(0xf8c1ff18, 0xe4bcf6b1), TOBN(0x856d6285, 0x295018fa),
- TOBN(0x433f665c, 0x3263c949), TOBN(0xa6a76dd6, 0xa1f21409),
- TOBN(0x17d32334, 0xcc7b4f79), TOBN(0xa1d03122, 0x06720e4a),
- TOBN(0xadb6661d, 0x81d9bed5), TOBN(0xf0d6fb02, 0x11db15d1),
- TOBN(0x7fd11ad5, 0x1fb747d2), TOBN(0xab50f959, 0x3033762b),
- TOBN(0x2a7e711b, 0xfbefaf5a), TOBN(0xc7393278, 0x3fef2bbf),
- TOBN(0xe29fa244, 0x0df6f9be), TOBN(0x9092757b, 0x71efd215),
- TOBN(0xee60e311, 0x4f3d6fd9), TOBN(0x338542d4, 0x0acfb78b),
- TOBN(0x44a23f08, 0x38961a0f), TOBN(0x1426eade, 0x986987ca),
- TOBN(0x36e6ee2e, 0x4a863cc6), TOBN(0x48059420, 0x628b8b79),
- TOBN(0x30303ad8, 0x7396e1de), TOBN(0x5c8bdc48, 0x38c5aad1),
- TOBN(0x3e40e11f, 0x5c8f5066), TOBN(0xabd6e768, 0x8d246bbd),
- TOBN(0x68aa40bb, 0x23330a01), TOBN(0xd23f5ee4, 0xc34eafa0),
- TOBN(0x3bbee315, 0x5de02c21), TOBN(0x18dd4397, 0xd1d8dd06),
- TOBN(0x3ba1939a, 0x122d7b44), TOBN(0xe6d3b40a, 0xa33870d6),
- TOBN(0x8e620f70, 0x1c4fe3f8), TOBN(0xf6bba1a5, 0xd3a50cbf),
- TOBN(0x4a78bde5, 0xcfc0aee0), TOBN(0x847edc46, 0xc08c50bd),
- TOBN(0xbaa2439c, 0xad63c9b2), TOBN(0xceb4a728, 0x10fc2acb),
- TOBN(0xa419e40e, 0x26da033d), TOBN(0x6cc3889d, 0x03e02683),
- TOBN(0x1cd28559, 0xfdccf725), TOBN(0x0fd7e0f1, 0x8d13d208),
- TOBN(0x01b9733b, 0x1f0df9d4), TOBN(0x8cc2c5f3, 0xa2b5e4f3),
- TOBN(0x43053bfa, 0x3a304fd4), TOBN(0x8e87665c, 0x0a9f1aa7),
- TOBN(0x087f29ec, 0xd73dc965), TOBN(0x15ace455, 0x3e9023db),
- TOBN(0x2370e309, 0x2bce28b4), TOBN(0xf9723442, 0xb6b1e84a),
- TOBN(0xbeee662e, 0xb72d9f26), TOBN(0xb19396de, 0xf0e47109),
- TOBN(0x85b1fa73, 0xe13289d0), TOBN(0x436cf77e, 0x54e58e32),
- TOBN(0x0ec833b3, 0xe990ef77), TOBN(0x7373e3ed, 0x1b11fc25),
- TOBN(0xbe0eda87, 0x0fc332ce), TOBN(0xced04970, 0x8d7ea856),
- TOBN(0xf85ff785, 0x7e977ca0), TOBN(0xb66ee8da, 0xdfdd5d2b),
- TOBN(0xf5e37950, 0x905af461), TOBN(0x587b9090, 0x966d487c),
- TOBN(0x6a198a1b, 0x32ba0127), TOBN(0xa7720e07, 0x141615ac),
- TOBN(0xa23f3499, 0x996ef2f2), TOBN(0xef5f64b4, 0x470bcb3d),
- TOBN(0xa526a962, 0x92b8c559), TOBN(0x0c14aac0, 0x69740a0f),
- TOBN(0x0d41a9e3, 0xa6bdc0a5), TOBN(0x97d52106, 0x9c48aef4),
- TOBN(0xcf16bd30, 0x3e7c253b), TOBN(0xcc834b1a, 0x47fdedc1),
- TOBN(0x7362c6e5, 0x373aab2e), TOBN(0x264ed85e, 0xc5f590ff),
- TOBN(0x7a46d9c0, 0x66d41870), TOBN(0xa50c20b1, 0x4787ba09),
- TOBN(0x185e7e51, 0xe3d44635), TOBN(0xb3b3e080, 0x31e2d8dc),
- TOBN(0xbed1e558, 0xa179e9d9), TOBN(0x2daa3f79, 0x74a76781),
- TOBN(0x4372baf2, 0x3a40864f), TOBN(0x46900c54, 0x4fe75cb5),
- TOBN(0xb95f171e, 0xf76765d0), TOBN(0x4ad726d2, 0x95c87502),
- TOBN(0x2ec769da, 0x4d7c99bd), TOBN(0x5e2ddd19, 0xc36cdfa8),
- TOBN(0xc22117fc, 0xa93e6dea), TOBN(0xe8a2583b, 0x93771123),
- TOBN(0xbe2f6089, 0xfa08a3a2), TOBN(0x4809d5ed, 0x8f0e1112),
- TOBN(0x3b414aa3, 0xda7a095e), TOBN(0x9049acf1, 0x26f5aadd),
- TOBN(0x78d46a4d, 0x6be8b84a), TOBN(0xd66b1963, 0xb732b9b3),
- TOBN(0x5c2ac2a0, 0xde6e9555), TOBN(0xcf52d098, 0xb5bd8770),
- TOBN(0x15a15fa6, 0x0fd28921), TOBN(0x56ccb81e, 0x8b27536d),
- TOBN(0x0f0d8ab8, 0x9f4ccbb8), TOBN(0xed5f44d2, 0xdb221729),
- TOBN(0x43141988, 0x00bed10c), TOBN(0xc94348a4, 0x1d735b8b),
- TOBN(0x79f3e9c4, 0x29ef8479), TOBN(0x4c13a4e3, 0x614c693f),
- TOBN(0x32c9af56, 0x8e143a14), TOBN(0xbc517799, 0xe29ac5c4),
- TOBN(0x05e17992, 0x2774856f), TOBN(0x6e52fb05, 0x6c1bf55f),
- TOBN(0xaeda4225, 0xe4f19e16), TOBN(0x70f4728a, 0xaf5ccb26),
- TOBN(0x5d2118d1, 0xb2947f22), TOBN(0xc827ea16, 0x281d6fb9),
- TOBN(0x8412328d, 0x8cf0eabd), TOBN(0x45ee9fb2, 0x03ef9dcf),
- TOBN(0x8e700421, 0xbb937d63), TOBN(0xdf8ff2d5, 0xcc4b37a6),
- TOBN(0xa4c0d5b2, 0x5ced7b68), TOBN(0x6537c1ef, 0xc7308f59),
- TOBN(0x25ce6a26, 0x3b37f8e8), TOBN(0x170e9a9b, 0xdeebc6ce),
- TOBN(0xdd037952, 0x8728d72c), TOBN(0x445b0e55, 0x850154bc),
- TOBN(0x4b7d0e06, 0x83a7337b), TOBN(0x1e3416d4, 0xffecf249),
- TOBN(0x24840eff, 0x66a2b71f), TOBN(0xd0d9a50a, 0xb37cc26d),
- TOBN(0xe2198150, 0x6fe28ef7), TOBN(0x3cc5ef16, 0x23324c7f),
- TOBN(0x220f3455, 0x769b5263), TOBN(0xe2ade2f1, 0xa10bf475),
- TOBN(0x28cd20fa, 0x458d3671), TOBN(0x1549722c, 0x2dc4847b),
- TOBN(0x6dd01e55, 0x591941e3), TOBN(0x0e6fbcea, 0x27128ccb),
- TOBN(0xae1a1e6b, 0x3bef0262), TOBN(0xfa8c472c, 0x8f54e103),
- TOBN(0x7539c0a8, 0x72c052ec), TOBN(0xd7b27369, 0x5a3490e9),
- TOBN(0x143fe1f1, 0x71684349), TOBN(0x36b4722e, 0x32e19b97),
- TOBN(0xdc059227, 0x90980aff), TOBN(0x175c9c88, 0x9e13d674),
- TOBN(0xa7de5b22, 0x6e6bfdb1), TOBN(0x5ea5b7b2, 0xbedb4b46),
- TOBN(0xd5570191, 0xd34a6e44), TOBN(0xfcf60d2e, 0xa24ff7e6),
- TOBN(0x614a392d, 0x677819e1), TOBN(0x7be74c7e, 0xaa5a29e8),
- TOBN(0xab50fece, 0x63c85f3f), TOBN(0xaca2e2a9, 0x46cab337),
- TOBN(0x7f700388, 0x122a6fe3), TOBN(0xdb69f703, 0x882a04a8),
- TOBN(0x9a77935d, 0xcf7aed57), TOBN(0xdf16207c, 0x8d91c86f),
- TOBN(0x2fca49ab, 0x63ed9998), TOBN(0xa3125c44, 0xa77ddf96),
- TOBN(0x05dd8a86, 0x24344072), TOBN(0xa023dda2, 0xfec3fb56),
- TOBN(0x421b41fc, 0x0c743032), TOBN(0x4f2120c1, 0x5e438639),
- TOBN(0xfb7cae51, 0xc83c1b07), TOBN(0xb2370caa, 0xcac2171a),
- TOBN(0x2eb2d962, 0x6cc820fb), TOBN(0x59feee5c, 0xb85a44bf),
- TOBN(0x94620fca, 0x5b6598f0), TOBN(0x6b922cae, 0x7e314051),
- TOBN(0xff8745ad, 0x106bed4e), TOBN(0x546e71f5, 0xdfa1e9ab),
- TOBN(0x935c1e48, 0x1ec29487), TOBN(0x9509216c, 0x4d936530),
- TOBN(0xc7ca3067, 0x85c9a2db), TOBN(0xd6ae5152, 0x6be8606f),
- TOBN(0x09dbcae6, 0xe14c651d), TOBN(0xc9536e23, 0x9bc32f96),
- TOBN(0xa90535a9, 0x34521b03), TOBN(0xf39c526c, 0x878756ff),
- TOBN(0x383172ec, 0x8aedf03c), TOBN(0x20a8075e, 0xefe0c034),
- TOBN(0xf22f9c62, 0x64026422), TOBN(0x8dd10780, 0x24b9d076),
- TOBN(0x944c742a, 0x3bef2950), TOBN(0x55b9502e, 0x88a2b00b),
- TOBN(0xa59e14b4, 0x86a09817), TOBN(0xa39dd3ac, 0x47bb4071),
- TOBN(0x55137f66, 0x3be0592f), TOBN(0x07fcafd4, 0xc9e63f5b),
- TOBN(0x963652ee, 0x346eb226), TOBN(0x7dfab085, 0xec2facb7),
- TOBN(0x273bf2b8, 0x691add26), TOBN(0x30d74540, 0xf2b46c44),
- TOBN(0x05e8e73e, 0xf2c2d065), TOBN(0xff9b8a00, 0xd42eeac9),
- TOBN(0x2fcbd205, 0x97209d22), TOBN(0xeb740ffa, 0xde14ea2c),
- TOBN(0xc71ff913, 0xa8aef518), TOBN(0x7bfc74bb, 0xfff4cfa2),
- TOBN(0x1716680c, 0xb6b36048), TOBN(0x121b2cce, 0x9ef79af1),
- TOBN(0xbff3c836, 0xa01eb3d3), TOBN(0x50eb1c6a, 0x5f79077b),
- TOBN(0xa48c32d6, 0xa004bbcf), TOBN(0x47a59316, 0x7d64f61d),
- TOBN(0x6068147f, 0x93102016), TOBN(0x12c5f654, 0x94d12576),
- TOBN(0xefb071a7, 0xc9bc6b91), TOBN(0x7c2da0c5, 0x6e23ea95),
- TOBN(0xf4fd45b6, 0xd4a1dd5d), TOBN(0x3e7ad9b6, 0x9122b13c),
- TOBN(0x342ca118, 0xe6f57a48), TOBN(0x1c2e94a7, 0x06f8288f),
- TOBN(0x99e68f07, 0x5a97d231), TOBN(0x7c80de97, 0x4d838758),
- TOBN(0xbce0f5d0, 0x05872727), TOBN(0xbe5d95c2, 0x19c4d016),
- TOBN(0x921d5cb1, 0x9c2492ee), TOBN(0x42192dc1, 0x404d6fb3),
- TOBN(0x4c84dcd1, 0x32f988d3), TOBN(0xde26d61f, 0xa17b8e85),
- TOBN(0xc466dcb6, 0x137c7408), TOBN(0x9a38d7b6, 0x36a266da),
- TOBN(0x7ef5cb06, 0x83bebf1b), TOBN(0xe5cdcbbf, 0x0fd014e3),
- TOBN(0x30aa376d, 0xf65965a0), TOBN(0x60fe88c2, 0xebb3e95e),
- TOBN(0x33fd0b61, 0x66ee6f20), TOBN(0x8827dcdb, 0x3f41f0a0),
- TOBN(0xbf8a9d24, 0x0c56c690), TOBN(0x40265dad, 0xddb7641d),
- TOBN(0x522b05bf, 0x3a6b662b), TOBN(0x466d1dfe, 0xb1478c9b),
- TOBN(0xaa616962, 0x1484469b), TOBN(0x0db60549, 0x02df8f9f),
- TOBN(0xc37bca02, 0x3cb8bf51), TOBN(0x5effe346, 0x21371ce8),
- TOBN(0xe8f65264, 0xff112c32), TOBN(0x8a9c736d, 0x7b971fb2),
- TOBN(0xa4f19470, 0x7b75080d), TOBN(0xfc3f2c5a, 0x8839c59b),
- TOBN(0x1d6c777e, 0x5aeb49c2), TOBN(0xf3db034d, 0xda1addfe),
- TOBN(0xd76fee5a, 0x5535affc), TOBN(0x0853ac70, 0xb92251fd),
- TOBN(0x37e3d594, 0x8b2a29d5), TOBN(0x28f1f457, 0x4de00ddb),
- TOBN(0x8083c1b5, 0xf42c328b), TOBN(0xd8ef1d8f, 0xe493c73b),
- TOBN(0x96fb6260, 0x41dc61bd), TOBN(0xf74e8a9d, 0x27ee2f8a),
- TOBN(0x7c605a80, 0x2c946a5d), TOBN(0xeed48d65, 0x3839ccfd),
- TOBN(0x9894344f, 0x3a29467a), TOBN(0xde81e949, 0xc51eba6d),
- TOBN(0xdaea066b, 0xa5e5c2f2), TOBN(0x3fc8a614, 0x08c8c7b3),
- TOBN(0x7adff88f, 0x06d0de9f), TOBN(0xbbc11cf5, 0x3b75ce0a),
- TOBN(0x9fbb7acc, 0xfbbc87d5), TOBN(0xa1458e26, 0x7badfde2)}
- ,
- {TOBN(0x1cb43668, 0xe039c256), TOBN(0x5f26fb8b, 0x7c17fd5d),
- TOBN(0xeee426af, 0x79aa062b), TOBN(0x072002d0, 0xd78fbf04),
- TOBN(0x4c9ca237, 0xe84fb7e3), TOBN(0xb401d8a1, 0x0c82133d),
- TOBN(0xaaa52592, 0x6d7e4181), TOBN(0xe9430833, 0x73dbb152),
- TOBN(0xf92dda31, 0xbe24319a), TOBN(0x03f7d28b, 0xe095a8e7),
- TOBN(0xa52fe840, 0x98782185), TOBN(0x276ddafe, 0x29c24dbc),
- TOBN(0x80cd5496, 0x1d7a64eb), TOBN(0xe4360889, 0x7f1dbe42),
- TOBN(0x2f81a877, 0x8438d2d5), TOBN(0x7e4d52a8, 0x85169036),
- TOBN(0x19e3d5b1, 0x1d59715d), TOBN(0xc7eaa762, 0xd788983e),
- TOBN(0xe5a730b0, 0xabf1f248), TOBN(0xfbab8084, 0xfae3fd83),
- TOBN(0x65e50d21, 0x53765b2f), TOBN(0xbdd4e083, 0xfa127f3d),
- TOBN(0x9cf3c074, 0x397b1b10), TOBN(0x59f8090c, 0xb1b59fd3),
- TOBN(0x7b15fd9d, 0x615faa8f), TOBN(0x8fa1eb40, 0x968554ed),
- TOBN(0x7bb4447e, 0x7aa44882), TOBN(0x2bb2d0d1, 0x029fff32),
- TOBN(0x075e2a64, 0x6caa6d2f), TOBN(0x8eb879de, 0x22e7351b),
- TOBN(0xbcd5624e, 0x9a506c62), TOBN(0x218eaef0, 0xa87e24dc),
- TOBN(0x37e56847, 0x44ddfa35), TOBN(0x9ccfc5c5, 0xdab3f747),
- TOBN(0x9ac1df3f, 0x1ee96cf4), TOBN(0x0c0571a1, 0x3b480b8f),
- TOBN(0x2fbeb3d5, 0x4b3a7b3c), TOBN(0x35c03669, 0x5dcdbb99),
- TOBN(0x52a0f5dc, 0xb2415b3a), TOBN(0xd57759b4, 0x4413ed9a),
- TOBN(0x1fe647d8, 0x3d30a2c5), TOBN(0x0857f77e, 0xf78a81dc),
- TOBN(0x11d5a334, 0x131a4a9b), TOBN(0xc0a94af9, 0x29d393f5),
- TOBN(0xbc3a5c0b, 0xdaa6ec1a), TOBN(0xba9fe493, 0x88d2d7ed),
- TOBN(0xbb4335b4, 0xbb614797), TOBN(0x991c4d68, 0x72f83533),
- TOBN(0x53258c28, 0xd2f01cb3), TOBN(0x93d6eaa3, 0xd75db0b1),
- TOBN(0x419a2b0d, 0xe87d0db4), TOBN(0xa1e48f03, 0xd8fe8493),
- TOBN(0xf747faf6, 0xc508b23a), TOBN(0xf137571a, 0x35d53549),
- TOBN(0x9f5e58e2, 0xfcf9b838), TOBN(0xc7186cee, 0xa7fd3cf5),
- TOBN(0x77b868ce, 0xe978a1d3), TOBN(0xe3a68b33, 0x7ab92d04),
- TOBN(0x51029794, 0x87a5b862), TOBN(0x5f0606c3, 0x3a61d41d),
- TOBN(0x2814be27, 0x6f9326f1), TOBN(0x2f521c14, 0xc6fe3c2e),
- TOBN(0x17464d7d, 0xacdf7351), TOBN(0x10f5f9d3, 0x777f7e44),
- TOBN(0xce8e616b, 0x269fb37d), TOBN(0xaaf73804, 0x7de62de5),
- TOBN(0xaba11175, 0x4fdd4153), TOBN(0x515759ba, 0x3770b49b),
- TOBN(0x8b09ebf8, 0xaa423a61), TOBN(0x592245a1, 0xcd41fb92),
- TOBN(0x1cba8ec1, 0x9b4c8936), TOBN(0xa87e91e3, 0xaf36710e),
- TOBN(0x1fd84ce4, 0x3d34a2e3), TOBN(0xee3759ce, 0xb43b5d61),
- TOBN(0x895bc78c, 0x619186c7), TOBN(0xf19c3809, 0xcbb9725a),
- TOBN(0xc0be21aa, 0xde744b1f), TOBN(0xa7d222b0, 0x60f8056b),
- TOBN(0x74be6157, 0xb23efe11), TOBN(0x6fab2b4f, 0x0cd68253),
- TOBN(0xad33ea5f, 0x4bf1d725), TOBN(0x9c1d8ee2, 0x4f6c950f),
- TOBN(0x544ee78a, 0xa377af06), TOBN(0x54f489bb, 0x94a113e1),
- TOBN(0x8f11d634, 0x992fb7e8), TOBN(0x0169a7aa, 0xa2a44347),
- TOBN(0x1d49d4af, 0x95020e00), TOBN(0x95945722, 0xe08e120b),
- TOBN(0xb6e33878, 0xa4d32282), TOBN(0xe36e029d, 0x48020ae7),
- TOBN(0xe05847fb, 0x37a9b750), TOBN(0xf876812c, 0xb29e3819),
- TOBN(0x84ad138e, 0xd23a17f0), TOBN(0x6d7b4480, 0xf0b3950e),
- TOBN(0xdfa8aef4, 0x2fd67ae0), TOBN(0x8d3eea24, 0x52333af6),
- TOBN(0x0d052075, 0xb15d5acc), TOBN(0xc6d9c79f, 0xbd815bc4),
- TOBN(0x8dcafd88, 0xdfa36cf2), TOBN(0x908ccbe2, 0x38aa9070),
- TOBN(0x638722c4, 0xba35afce), TOBN(0x5a3da8b0, 0xfd6abf0b),
- TOBN(0x2dce252c, 0xc9c335c1), TOBN(0x84e7f0de, 0x65aa799b),
- TOBN(0x2101a522, 0xb99a72cb), TOBN(0x06de6e67, 0x87618016),
- TOBN(0x5ff8c7cd, 0xe6f3653e), TOBN(0x0a821ab5, 0xc7a6754a),
- TOBN(0x7e3fa52b, 0x7cb0b5a2), TOBN(0xa7fb121c, 0xc9048790),
- TOBN(0x1a725020, 0x06ce053a), TOBN(0xb490a31f, 0x04e929b0),
- TOBN(0xe17be47d, 0x62dd61ad), TOBN(0x781a961c, 0x6be01371),
- TOBN(0x1063bfd3, 0xdae3cbba), TOBN(0x35647406, 0x7f73c9ba),
- TOBN(0xf50e957b, 0x2736a129), TOBN(0xa6313702, 0xed13f256),
- TOBN(0x9436ee65, 0x3a19fcc5), TOBN(0xcf2bdb29, 0xe7a4c8b6),
- TOBN(0xb06b1244, 0xc5f95cd8), TOBN(0xda8c8af0, 0xf4ab95f4),
- TOBN(0x1bae59c2, 0xb9e5836d), TOBN(0x07d51e7e, 0x3acffffc),
- TOBN(0x01e15e6a, 0xc2ccbcda), TOBN(0x3bc1923f, 0x8528c3e0),
- TOBN(0x43324577, 0xa49fead4), TOBN(0x61a1b884, 0x2aa7a711),
- TOBN(0xf9a86e08, 0x700230ef), TOBN(0x0af585a1, 0xbd19adf8),
- TOBN(0x7645f361, 0xf55ad8f2), TOBN(0x6e676223, 0x46c3614c),
- TOBN(0x23cb257c, 0x4e774d3f), TOBN(0x82a38513, 0xac102d1b),
- TOBN(0x9bcddd88, 0x7b126aa5), TOBN(0xe716998b, 0xeefd3ee4),
- TOBN(0x4239d571, 0xfb167583), TOBN(0xdd011c78, 0xd16c8f8a),
- TOBN(0x271c2895, 0x69a27519), TOBN(0x9ce0a3b7, 0xd2d64b6a),
- TOBN(0x8c977289, 0xd5ec6738), TOBN(0xa3b49f9a, 0x8840ef6b),
- TOBN(0x808c14c9, 0x9a453419), TOBN(0x5c00295b, 0x0cf0a2d5),
- TOBN(0x524414fb, 0x1d4bcc76), TOBN(0xb07691d2, 0x459a88f1),
- TOBN(0x77f43263, 0xf70d110f), TOBN(0x64ada5e0, 0xb7abf9f3),
- TOBN(0xafd0f94e, 0x5b544cf5), TOBN(0xb4a13a15, 0xfd2713fe),
- TOBN(0xb99b7d6e, 0x250c74f4), TOBN(0x097f2f73, 0x20324e45),
- TOBN(0x994b37d8, 0xaffa8208), TOBN(0xc3c31b0b, 0xdc29aafc),
- TOBN(0x3da74651, 0x7a3a607f), TOBN(0xd8e1b8c1, 0xfe6955d6),
- TOBN(0x716e1815, 0xc8418682), TOBN(0x541d487f, 0x7dc91d97),
- TOBN(0x48a04669, 0xc6996982), TOBN(0xf39cab15, 0x83a6502e),
- TOBN(0x025801a0, 0xe68db055), TOBN(0xf3569758, 0xba3338d5),
- TOBN(0xb0c8c0aa, 0xee2afa84), TOBN(0x4f6985d3, 0xfb6562d1),
- TOBN(0x351f1f15, 0x132ed17a), TOBN(0x510ed0b4, 0xc04365fe),
- TOBN(0xa3f98138, 0xe5b1f066), TOBN(0xbc9d95d6, 0x32df03dc),
- TOBN(0xa83ccf6e, 0x19abd09e), TOBN(0x0b4097c1, 0x4ff17edb),
- TOBN(0x58a5c478, 0xd64a06ce), TOBN(0x2ddcc3fd, 0x544a58fd),
- TOBN(0xd449503d, 0x9e8153b8), TOBN(0x3324fd02, 0x7774179b),
- TOBN(0xaf5d47c8, 0xdbd9120c), TOBN(0xeb860162, 0x34fa94db),
- TOBN(0x5817bdd1, 0x972f07f4), TOBN(0xe5579e2e, 0xd27bbceb),
- TOBN(0x86847a1f, 0x5f11e5a6), TOBN(0xb39ed255, 0x7c3cf048),
- TOBN(0xe1076417, 0xa2f62e55), TOBN(0x6b9ab38f, 0x1bcf82a2),
- TOBN(0x4bb7c319, 0x7aeb29f9), TOBN(0xf6d17da3, 0x17227a46),
- TOBN(0xab53ddbd, 0x0f968c00), TOBN(0xa03da7ec, 0x000c880b),
- TOBN(0x7b239624, 0x6a9ad24d), TOBN(0x612c0401, 0x01ec60d0),
- TOBN(0x70d10493, 0x109f5df1), TOBN(0xfbda4030, 0x80af7550),
- TOBN(0x30b93f95, 0xc6b9a9b3), TOBN(0x0c74ec71, 0x007d9418),
- TOBN(0x94175564, 0x6edb951f), TOBN(0x5f4a9d78, 0x7f22c282),
- TOBN(0xb7870895, 0xb38d1196), TOBN(0xbc593df3, 0xa228ce7c),
- TOBN(0xc78c5bd4, 0x6af3641a), TOBN(0x7802200b, 0x3d9b3dcc),
- TOBN(0x0dc73f32, 0x8be33304), TOBN(0x847ed87d, 0x61ffb79a),
- TOBN(0xf85c974e, 0x6d671192), TOBN(0x1e14100a, 0xde16f60f),
- TOBN(0x45cb0d5a, 0x95c38797), TOBN(0x18923bba, 0x9b022da4),
- TOBN(0xef2be899, 0xbbe7e86e), TOBN(0x4a1510ee, 0x216067bf),
- TOBN(0xd98c8154, 0x84d5ce3e), TOBN(0x1af777f0, 0xf92a2b90),
- TOBN(0x9fbcb400, 0x4ef65724), TOBN(0x3e04a4c9, 0x3c0ca6fe),
- TOBN(0xfb3e2cb5, 0x55002994), TOBN(0x1f3a93c5, 0x5363ecab),
- TOBN(0x1fe00efe, 0x3923555b), TOBN(0x744bedd9, 0x1e1751ea),
- TOBN(0x3fb2db59, 0x6ab69357), TOBN(0x8dbd7365, 0xf5e6618b),
- TOBN(0x99d53099, 0xdf1ea40e), TOBN(0xb3f24a0b, 0x57d61e64),
- TOBN(0xd088a198, 0x596eb812), TOBN(0x22c8361b, 0x5762940b),
- TOBN(0x66f01f97, 0xf9c0d95c), TOBN(0x88461172, 0x8e43cdae),
- TOBN(0x11599a7f, 0xb72b15c3), TOBN(0x135a7536, 0x420d95cc),
- TOBN(0x2dcdf0f7, 0x5f7ae2f6), TOBN(0x15fc6e1d, 0xd7fa6da2),
- TOBN(0x81ca829a, 0xd1d441b6), TOBN(0x84c10cf8, 0x04a106b6),
- TOBN(0xa9b26c95, 0xa73fbbd0), TOBN(0x7f24e0cb, 0x4d8f6ee8),
- TOBN(0x48b45937, 0x1e25a043), TOBN(0xf8a74fca, 0x036f3dfe),
- TOBN(0x1ed46585, 0xc9f84296), TOBN(0x7fbaa8fb, 0x3bc278b0),
- TOBN(0xa8e96cd4, 0x6c4fcbd0), TOBN(0x940a1202, 0x73b60a5f),
- TOBN(0x34aae120, 0x55a4aec8), TOBN(0x550e9a74, 0xdbd742f0),
- TOBN(0x794456d7, 0x228c68ab), TOBN(0x492f8868, 0xa4e25ec6),
- TOBN(0x682915ad, 0xb2d8f398), TOBN(0xf13b51cc, 0x5b84c953),
- TOBN(0xcda90ab8, 0x5bb917d6), TOBN(0x4b615560, 0x4ea3dee1),
- TOBN(0x578b4e85, 0x0a52c1c8), TOBN(0xeab1a695, 0x20b75fc4),
- TOBN(0x60c14f3c, 0xaa0bb3c6), TOBN(0x220f448a, 0xb8216094),
- TOBN(0x4fe7ee31, 0xb0e63d34), TOBN(0xf4600572, 0xa9e54fab),
- TOBN(0xc0493334, 0xd5e7b5a4), TOBN(0x8589fb92, 0x06d54831),
- TOBN(0xaa70f5cc, 0x6583553a), TOBN(0x0879094a, 0xe25649e5),
- TOBN(0xcc904507, 0x10044652), TOBN(0xebb0696d, 0x02541c4f),
- TOBN(0x5a171fde, 0xb9718710), TOBN(0x38f1bed8, 0xf374a9f5),
- TOBN(0xc8c582e1, 0xba39bdc1), TOBN(0xfc457b0a, 0x908cc0ce),
- TOBN(0x9a187fd4, 0x883841e2), TOBN(0x8ec25b39, 0x38725381),
- TOBN(0x2553ed05, 0x96f84395), TOBN(0x095c7661, 0x6f6c6897),
- TOBN(0x917ac85c, 0x4bdc5610), TOBN(0xb2885fe4, 0x179eb301),
- TOBN(0x5fc65547, 0x8b78bdcc), TOBN(0x4a9fc893, 0xe59e4699),
- TOBN(0xbb7ff0cd, 0x3ce299af), TOBN(0x195be9b3, 0xadf38b20),
- TOBN(0x6a929c87, 0xd38ddb8f), TOBN(0x55fcc99c, 0xb21a51b9),
- TOBN(0x2b695b4c, 0x721a4593), TOBN(0xed1e9a15, 0x768eaac2),
- TOBN(0xfb63d71c, 0x7489f914), TOBN(0xf98ba31c, 0x78118910),
- TOBN(0x80291373, 0x9b128eb4), TOBN(0x7801214e, 0xd448af4a),
- TOBN(0xdbd2e22b, 0x55418dd3), TOBN(0xeffb3c0d, 0xd3998242),
- TOBN(0xdfa6077c, 0xc7bf3827), TOBN(0xf2165bcb, 0x47f8238f),
- TOBN(0xfe37cf68, 0x8564d554), TOBN(0xe5f825c4, 0x0a81fb98),
- TOBN(0x43cc4f67, 0xffed4d6f), TOBN(0xbc609578, 0xb50a34b0),
- TOBN(0x8aa8fcf9, 0x5041faf1), TOBN(0x5659f053, 0x651773b6),
- TOBN(0xe87582c3, 0x6044d63b), TOBN(0xa6089409, 0x0cdb0ca0),
- TOBN(0x8c993e0f, 0xbfb2bcf6), TOBN(0xfc64a719, 0x45985cfc),
- TOBN(0x15c4da80, 0x83dbedba), TOBN(0x804ae112, 0x2be67df7),
- TOBN(0xda4c9658, 0xa23defde), TOBN(0x12002ddd, 0x5156e0d3),
- TOBN(0xe68eae89, 0x5dd21b96), TOBN(0x8b99f28b, 0xcf44624d),
- TOBN(0x0ae00808, 0x1ec8897a), TOBN(0xdd0a9303, 0x6712f76e),
- TOBN(0x96237522, 0x4e233de4), TOBN(0x192445b1, 0x2b36a8a5),
- TOBN(0xabf9ff74, 0x023993d9), TOBN(0x21f37bf4, 0x2aad4a8f),
- TOBN(0x340a4349, 0xf8bd2bbd), TOBN(0x1d902cd9, 0x4868195d),
- TOBN(0x3d27bbf1, 0xe5fdb6f1), TOBN(0x7a5ab088, 0x124f9f1c),
- TOBN(0xc466ab06, 0xf7a09e03), TOBN(0x2f8a1977, 0x31f2c123),
- TOBN(0xda355dc7, 0x041b6657), TOBN(0xcb840d12, 0x8ece2a7c),
- TOBN(0xb600ad9f, 0x7db32675), TOBN(0x78fea133, 0x07a06f1b),
- TOBN(0x5d032269, 0xb31f6094), TOBN(0x07753ef5, 0x83ec37aa),
- TOBN(0x03485aed, 0x9c0bea78), TOBN(0x41bb3989, 0xbc3f4524),
- TOBN(0x09403761, 0x697f726d), TOBN(0x6109beb3, 0xdf394820),
- TOBN(0x804111ea, 0x3b6d1145), TOBN(0xb6271ea9, 0xa8582654),
- TOBN(0x619615e6, 0x24e66562), TOBN(0xa2554945, 0xd7b6ad9c),
- TOBN(0xd9c4985e, 0x99bfe35f), TOBN(0x9770ccc0, 0x7b51cdf6),
- TOBN(0x7c327013, 0x92881832), TOBN(0x8777d45f, 0x286b26d1),
- TOBN(0x9bbeda22, 0xd847999d), TOBN(0x03aa33b6, 0xc3525d32),
- TOBN(0x4b7b96d4, 0x28a959a1), TOBN(0xbb3786e5, 0x31e5d234),
- TOBN(0xaeb5d3ce, 0x6961f247), TOBN(0x20aa85af, 0x02f93d3f),
- TOBN(0x9cd1ad3d, 0xd7a7ae4f), TOBN(0xbf6688f0, 0x781adaa8),
- TOBN(0xb1b40e86, 0x7469cead), TOBN(0x1904c524, 0x309fca48),
- TOBN(0x9b7312af, 0x4b54bbc7), TOBN(0xbe24bf8f, 0x593affa2),
- TOBN(0xbe5e0790, 0xbd98764b), TOBN(0xa0f45f17, 0xa26e299e),
- TOBN(0x4af0d2c2, 0x6b8fe4c7), TOBN(0xef170db1, 0x8ae8a3e6),
- TOBN(0x0e8d61a0, 0x29e0ccc1), TOBN(0xcd53e87e, 0x60ad36ca),
- TOBN(0x328c6623, 0xc8173822), TOBN(0x7ee1767d, 0xa496be55),
- TOBN(0x89f13259, 0x648945af), TOBN(0x9e45a5fd, 0x25c8009c),
- TOBN(0xaf2febd9, 0x1f61ab8c), TOBN(0x43f6bc86, 0x8a275385),
- TOBN(0x87792348, 0xf2142e79), TOBN(0x17d89259, 0xc6e6238a),
- TOBN(0x7536d2f6, 0x4a839d9b), TOBN(0x1f428fce, 0x76a1fbdc),
- TOBN(0x1c109601, 0x0db06dfe), TOBN(0xbfc16bc1, 0x50a3a3cc),
- TOBN(0xf9cbd9ec, 0x9b30f41b), TOBN(0x5b5da0d6, 0x00138cce),
- TOBN(0xec1d0a48, 0x56ef96a7), TOBN(0xb47eb848, 0x982bf842),
- TOBN(0x66deae32, 0xec3f700d), TOBN(0x4e43c42c, 0xaa1181e0),
- TOBN(0xa1d72a31, 0xd1a4aa2a), TOBN(0x440d4668, 0xc004f3ce),
- TOBN(0x0d6a2d3b, 0x45fe8a7a), TOBN(0x820e52e2, 0xfb128365),
- TOBN(0x29ac5fcf, 0x25e51b09), TOBN(0x180cd2bf, 0x2023d159),
- TOBN(0xa9892171, 0xa1ebf90e), TOBN(0xf97c4c87, 0x7c132181),
- TOBN(0x9f1dc724, 0xc03dbb7e), TOBN(0xae043765, 0x018cbbe4),
- TOBN(0xfb0b2a36, 0x0767d153), TOBN(0xa8e2f4d6, 0x249cbaeb),
- TOBN(0x172a5247, 0xd95ea168), TOBN(0x1758fada, 0x2970764a),
- TOBN(0xac803a51, 0x1d978169), TOBN(0x299cfe2e, 0xde77e01b),
- TOBN(0x652a1e17, 0xb0a98927), TOBN(0x2e26e1d1, 0x20014495),
- TOBN(0x7ae0af9f, 0x7175b56a), TOBN(0xc2e22a80, 0xd64b9f95),
- TOBN(0x4d0ff9fb, 0xd90a060a), TOBN(0x496a27db, 0xbaf38085),
- TOBN(0x32305401, 0xda776bcf), TOBN(0xb8cdcef6, 0x725f209e),
- TOBN(0x61ba0f37, 0x436a0bba), TOBN(0x263fa108, 0x76860049),
- TOBN(0x92beb98e, 0xda3542cf), TOBN(0xa2d4d14a, 0xd5849538),
- TOBN(0x989b9d68, 0x12e9a1bc), TOBN(0x61d9075c, 0x5f6e3268),
- TOBN(0x352c6aa9, 0x99ace638), TOBN(0xde4e4a55, 0x920f43ff),
- TOBN(0xe5e4144a, 0xd673c017), TOBN(0x667417ae, 0x6f6e05ea),
- TOBN(0x613416ae, 0xdcd1bd56), TOBN(0x5eb36201, 0x86693711),
- TOBN(0x2d7bc504, 0x3a1aa914), TOBN(0x175a1299, 0x76dc5975),
- TOBN(0xe900e0f2, 0x3fc8125c), TOBN(0x569ef68c, 0x11198875),
- TOBN(0x9012db63, 0x63a113b4), TOBN(0xe3bd3f56, 0x98835766),
- TOBN(0xa5c94a52, 0x76412dea), TOBN(0xad9e2a09, 0xaa735e5c),
- TOBN(0x405a984c, 0x508b65e9), TOBN(0xbde4a1d1, 0x6df1a0d1),
- TOBN(0x1a9433a1, 0xdfba80da), TOBN(0xe9192ff9, 0x9440ad2e),
- TOBN(0x9f649696, 0x5099fe92), TOBN(0x25ddb65c, 0x0b27a54a),
- TOBN(0x178279dd, 0xc590da61), TOBN(0x5479a999, 0xfbde681a),
- TOBN(0xd0e84e05, 0x013fe162), TOBN(0xbe11dc92, 0x632d471b),
- TOBN(0xdf0b0c45, 0xfc0e089f), TOBN(0x04fb15b0, 0x4c144025),
- TOBN(0xa61d5fc2, 0x13c99927), TOBN(0xa033e9e0, 0x3de2eb35),
- TOBN(0xf8185d5c, 0xb8dacbb4), TOBN(0x9a88e265, 0x8644549d),
- TOBN(0xf717af62, 0x54671ff6), TOBN(0x4bd4241b, 0x5fa58603),
- TOBN(0x06fba40b, 0xe67773c0), TOBN(0xc1d933d2, 0x6a2847e9),
- TOBN(0xf4f5acf3, 0x689e2c70), TOBN(0x92aab0e7, 0x46bafd31),
- TOBN(0x798d76aa, 0x3473f6e5), TOBN(0xcc6641db, 0x93141934),
- TOBN(0xcae27757, 0xd31e535e), TOBN(0x04cc43b6, 0x87c2ee11),
- TOBN(0x8d1f9675, 0x2e029ffa), TOBN(0xc2150672, 0xe4cc7a2c),
- TOBN(0x3b03c1e0, 0x8d68b013), TOBN(0xa9d6816f, 0xedf298f3),
- TOBN(0x1bfbb529, 0xa2804464), TOBN(0x95a52fae, 0x5db22125),
- TOBN(0x55b32160, 0x0e1cb64e), TOBN(0x004828f6, 0x7e7fc9fe),
- TOBN(0x13394b82, 0x1bb0fb93), TOBN(0xb6293a2d, 0x35f1a920),
- TOBN(0xde35ef21, 0xd145d2d9), TOBN(0xbe6225b3, 0xbb8fa603),
- TOBN(0x00fc8f6b, 0x32cf252d), TOBN(0xa28e52e6, 0x117cf8c2),
- TOBN(0x9d1dc89b, 0x4c371e6d), TOBN(0xcebe0675, 0x36ef0f28),
- TOBN(0x5de05d09, 0xa4292f81), TOBN(0xa8303593, 0x353e3083),
- TOBN(0xa1715b0a, 0x7e37a9bb), TOBN(0x8c56f61e, 0x2b8faec3),
- TOBN(0x52507431, 0x33c9b102), TOBN(0x0130cefc, 0xa44431f0),
- TOBN(0x56039fa0, 0xbd865cfb), TOBN(0x4b03e578, 0xbc5f1dd7),
- TOBN(0x40edf2e4, 0xbabe7224), TOBN(0xc752496d, 0x3a1988f6),
- TOBN(0xd1572d3b, 0x564beb6b), TOBN(0x0db1d110, 0x39a1c608),
- TOBN(0x568d1934, 0x16f60126), TOBN(0x05ae9668, 0xf354af33),
- TOBN(0x19de6d37, 0xc92544f2), TOBN(0xcc084353, 0xa35837d5),
- TOBN(0xcbb6869c, 0x1a514ece), TOBN(0xb633e728, 0x2e1d1066),
- TOBN(0xf15dd69f, 0x936c581c), TOBN(0x96e7b8ce, 0x7439c4f9),
- TOBN(0x5e676f48, 0x2e448a5b), TOBN(0xb2ca7d5b, 0xfd916bbb),
- TOBN(0xd55a2541, 0xf5024025), TOBN(0x47bc5769, 0xe4c2d937),
- TOBN(0x7d31b92a, 0x0362189f), TOBN(0x83f3086e, 0xef7816f9),
- TOBN(0xf9f46d94, 0xb587579a), TOBN(0xec2d22d8, 0x30e76c5f),
- TOBN(0x27d57461, 0xb000ffcf), TOBN(0xbb7e65f9, 0x364ffc2c),
- TOBN(0x7c7c9477, 0x6652a220), TOBN(0x61618f89, 0xd696c981),
- TOBN(0x5021701d, 0x89effff3), TOBN(0xf2c8ff8e, 0x7c314163),
- TOBN(0x2da413ad, 0x8efb4d3e), TOBN(0x937b5adf, 0xce176d95),
- TOBN(0x22867d34, 0x2a67d51c), TOBN(0x262b9b10, 0x18eb3ac9),
- TOBN(0x4e314fe4, 0xc43ff28b), TOBN(0x76476627, 0x6a664e7a),
- TOBN(0x3e90e40b, 0xb7a565c2), TOBN(0x8588993a, 0xc1acf831),
- TOBN(0xd7b501d6, 0x8f938829), TOBN(0x996627ee, 0x3edd7d4c),
- TOBN(0x37d44a62, 0x90cd34c7), TOBN(0xa8327499, 0xf3833e8d),
- TOBN(0x2e18917d, 0x4bf50353), TOBN(0x85dd726b, 0x556765fb),
- TOBN(0x54fe65d6, 0x93d5ab66), TOBN(0x3ddbaced, 0x915c25fe),
- TOBN(0xa799d9a4, 0x12f22e85), TOBN(0xe2a24867, 0x6d06f6bc),
- TOBN(0xf4f1ee56, 0x43ca1637), TOBN(0xfda2828b, 0x61ece30a),
- TOBN(0x758c1a3e, 0xa2dee7a6), TOBN(0xdcde2f3c, 0x734b2284),
- TOBN(0xaba445d2, 0x4eaba6ad), TOBN(0x35aaf668, 0x76cee0a7),
- TOBN(0x7e0b04a9, 0xe5aa049a), TOBN(0xe74083ad, 0x91103e84),
- TOBN(0xbeb183ce, 0x40afecc3), TOBN(0x6b89de9f, 0xea043f7a),}
- ,
- {TOBN(0x0e299d23, 0xfe67ba66), TOBN(0x91450760, 0x93cf2f34),
- TOBN(0xf45b5ea9, 0x97fcf913), TOBN(0x5be00843, 0x8bd7ddda),
- TOBN(0x358c3e05, 0xd53ff04d), TOBN(0xbf7ccdc3, 0x5de91ef7),
- TOBN(0xad684dbf, 0xb69ec1a0), TOBN(0x367e7cf2, 0x801fd997),
- TOBN(0x0ca1f3b7, 0xb0dc8595), TOBN(0x27de4608, 0x9f1d9f2e),
- TOBN(0x1af3bf39, 0xbadd82a7), TOBN(0x79356a79, 0x65862448),
- TOBN(0xc0602345, 0xf5f9a052), TOBN(0x1a8b0f89, 0x139a42f9),
- TOBN(0xb53eee42, 0x844d40fc), TOBN(0x93b0bfe5, 0x4e5b6368),
- TOBN(0x5434dd02, 0xc024789c), TOBN(0x90dca9ea, 0x41b57bfc),
- TOBN(0x8aa898e2, 0x243398df), TOBN(0xf607c834, 0x894a94bb),
- TOBN(0xbb07be97, 0xc2c99b76), TOBN(0x6576ba67, 0x18c29302),
- TOBN(0x3d79efcc, 0xe703a88c), TOBN(0xf259ced7, 0xb6a0d106),
- TOBN(0x0f893a5d, 0xc8de610b), TOBN(0xe8c515fb, 0x67e223ce),
- TOBN(0x7774bfa6, 0x4ead6dc5), TOBN(0x89d20f95, 0x925c728f),
- TOBN(0x7a1e0966, 0x098583ce), TOBN(0xa2eedb94, 0x93f2a7d7),
- TOBN(0x1b282097, 0x4c304d4a), TOBN(0x0842e3da, 0xc077282d),
- TOBN(0xe4d972a3, 0x3b9e2d7b), TOBN(0x7cc60b27, 0xc48218ff),
- TOBN(0x8fc70838, 0x84149d91), TOBN(0x5c04346f, 0x2f461ecc),
- TOBN(0xebe9fdf2, 0x614650a9), TOBN(0x5e35b537, 0xc1f666ac),
- TOBN(0x645613d1, 0x88babc83), TOBN(0x88cace3a, 0xc5e1c93e),
- TOBN(0x209ca375, 0x3de92e23), TOBN(0xccb03cc8, 0x5fbbb6e3),
- TOBN(0xccb90f03, 0xd7b1487e), TOBN(0xfa9c2a38, 0xc710941f),
- TOBN(0x756c3823, 0x6724ceed), TOBN(0x3a902258, 0x192d0323),
- TOBN(0xb150e519, 0xea5e038e), TOBN(0xdcba2865, 0xc7427591),
- TOBN(0xe549237f, 0x78890732), TOBN(0xc443bef9, 0x53fcb4d9),
- TOBN(0x9884d8a6, 0xeb3480d6), TOBN(0x8a35b6a1, 0x3048b186),
- TOBN(0xb4e44716, 0x65e9a90a), TOBN(0x45bf380d, 0x653006c0),
- TOBN(0x8f3f820d, 0x4fe9ae3b), TOBN(0x244a35a0, 0x979a3b71),
- TOBN(0xa1010e9d, 0x74cd06ff), TOBN(0x9c17c7df, 0xaca3eeac),
- TOBN(0x74c86cd3, 0x8063aa2b), TOBN(0x8595c4b3, 0x734614ff),
- TOBN(0xa3de00ca, 0x990f62cc), TOBN(0xd9bed213, 0xca0c3be5),
- TOBN(0x7886078a, 0xdf8ce9f5), TOBN(0xddb27ce3, 0x5cd44444),
- TOBN(0xed374a66, 0x58926ddd), TOBN(0x138b2d49, 0x908015b8),
- TOBN(0x886c6579, 0xde1f7ab8), TOBN(0x888b9aa0, 0xc3020b7a),
- TOBN(0xd3ec034e, 0x3a96e355), TOBN(0xba65b0b8, 0xf30fbe9a),
- TOBN(0x064c8e50, 0xff21367a), TOBN(0x1f508ea4, 0x0b04b46e),
- TOBN(0x98561a49, 0x747c866c), TOBN(0xbbb1e5fe, 0x0518a062),
- TOBN(0x20ff4e8b, 0xecdc3608), TOBN(0x7f55cded, 0x20184027),
- TOBN(0x8d73ec95, 0xf38c85f0), TOBN(0x5b589fdf, 0x8bc3b8c3),
- TOBN(0xbe95dd98, 0x0f12b66f), TOBN(0xf5bd1a09, 0x0e338e01),
- TOBN(0x65163ae5, 0x5e915918), TOBN(0x6158d6d9, 0x86f8a46b),
- TOBN(0x8466b538, 0xeeebf99c), TOBN(0xca8761f6, 0xbca477ef),
- TOBN(0xaf3449c2, 0x9ebbc601), TOBN(0xef3b0f41, 0xe0c3ae2f),
- TOBN(0xaa6c577d, 0x5de63752), TOBN(0xe9166601, 0x64682a51),
- TOBN(0x5a3097be, 0xfc15aa1e), TOBN(0x40d12548, 0xb54b0745),
- TOBN(0x5bad4706, 0x519a5f12), TOBN(0xed03f717, 0xa439dee6),
- TOBN(0x0794bb6c, 0x4a02c499), TOBN(0xf725083d, 0xcffe71d2),
- TOBN(0x2cad7519, 0x0f3adcaf), TOBN(0x7f68ea1c, 0x43729310),
- TOBN(0xe747c8c7, 0xb7ffd977), TOBN(0xec104c35, 0x80761a22),
- TOBN(0x8395ebaf, 0x5a3ffb83), TOBN(0xfb3261f4, 0xe4b63db7),
- TOBN(0x53544960, 0xd883e544), TOBN(0x13520d70, 0x8cc2eeb8),
- TOBN(0x08f6337b, 0xd3d65f99), TOBN(0x83997db2, 0x781cf95b),
- TOBN(0xce6ff106, 0x0dbd2c01), TOBN(0x4f8eea6b, 0x1f9ce934),
- TOBN(0x546f7c4b, 0x0e993921), TOBN(0x6236a324, 0x5e753fc7),
- TOBN(0x65a41f84, 0xa16022e9), TOBN(0x0c18d878, 0x43d1dbb2),
- TOBN(0x73c55640, 0x2d4cef9c), TOBN(0xa0428108, 0x70444c74),
- TOBN(0x68e4f15e, 0x9afdfb3c), TOBN(0x49a56143, 0x5bdfb6df),
- TOBN(0xa9bc1bd4, 0x5f823d97), TOBN(0xbceb5970, 0xea111c2a),
- TOBN(0x366b455f, 0xb269bbc4), TOBN(0x7cd85e1e, 0xe9bc5d62),
- TOBN(0xc743c41c, 0x4f18b086), TOBN(0xa4b40990, 0x95294fb9),
- TOBN(0x9c7c581d, 0x26ee8382), TOBN(0xcf17dcc5, 0x359d638e),
- TOBN(0xee8273ab, 0xb728ae3d), TOBN(0x1d112926, 0xf821f047),
- TOBN(0x11498477, 0x50491a74), TOBN(0x687fa761, 0xfde0dfb9),
- TOBN(0x2c258022, 0x7ea435ab), TOBN(0x6b8bdb94, 0x91ce7e3f),
- TOBN(0x4c5b5dc9, 0x3bf834aa), TOBN(0x04371819, 0x4f6c7e4b),
- TOBN(0xc284e00a, 0x3736bcad), TOBN(0x0d881118, 0x21ae8f8d),
- TOBN(0xf9cf0f82, 0xf48c8e33), TOBN(0xa11fd075, 0xa1bf40db),
- TOBN(0xdceab0de, 0xdc2733e5), TOBN(0xc560a8b5, 0x8e986bd7),
- TOBN(0x48dd1fe2, 0x3929d097), TOBN(0x3885b290, 0x92f188f1),
- TOBN(0x0f2ae613, 0xda6fcdac), TOBN(0x9054303e, 0xb662a46c),
- TOBN(0xb6871e44, 0x0738042a), TOBN(0x98e6a977, 0xbdaf6449),
- TOBN(0xd8bc0650, 0xd1c9df1b), TOBN(0xef3d6451, 0x36e098f9),
- TOBN(0x03fbae82, 0xb6d72d28), TOBN(0x77ca9db1, 0xf5d84080),
- TOBN(0x8a112cff, 0xa58efc1c), TOBN(0x518d761c, 0xc564cb4a),
- TOBN(0x69b5740e, 0xf0d1b5ce), TOBN(0x717039cc, 0xe9eb1785),
- TOBN(0x3fe29f90, 0x22f53382), TOBN(0x8e54ba56, 0x6bc7c95c),
- TOBN(0x9c806d8a, 0xf7f91d0f), TOBN(0x3b61b0f1, 0xa82a5728),
- TOBN(0x4640032d, 0x94d76754), TOBN(0x273eb5de, 0x47d834c6),
- TOBN(0x2988abf7, 0x7b4e4d53), TOBN(0xb7ce66bf, 0xde401777),
- TOBN(0x9fba6b32, 0x715071b3), TOBN(0x82413c24, 0xad3a1a98),
- TOBN(0x5b7fc8c4, 0xe0e8ad93), TOBN(0xb5679aee, 0x5fab868d),
- TOBN(0xb1f9d2fa, 0x2b3946f3), TOBN(0x458897dc, 0x5685b50a),
- TOBN(0x1e98c930, 0x89d0caf3), TOBN(0x39564c5f, 0x78642e92),
- TOBN(0x1b77729a, 0x0dbdaf18), TOBN(0xf9170722, 0x579e82e6),
- TOBN(0x680c0317, 0xe4515fa5), TOBN(0xf85cff84, 0xfb0c790f),
- TOBN(0xc7a82aab, 0x6d2e0765), TOBN(0x7446bca9, 0x35c82b32),
- TOBN(0x5de607aa, 0x6d63184f), TOBN(0x7c1a46a8, 0x262803a6),
- TOBN(0xd218313d, 0xaebe8035), TOBN(0x92113ffd, 0xc73c51f8),
- TOBN(0x4b38e083, 0x12e7e46c), TOBN(0x69d0a37a, 0x56126bd5),
- TOBN(0xfb3f324b, 0x73c07e04), TOBN(0xa0c22f67, 0x8fda7267),
- TOBN(0x8f2c0051, 0x4d2c7d8f), TOBN(0xbc45ced3, 0xcbe2cae5),
- TOBN(0xe1c6cf07, 0xa8f0f277), TOBN(0xbc392312, 0x1eb99a98),
- TOBN(0x75537b7e, 0x3cc8ac85), TOBN(0x8d725f57, 0xdd02753b),
- TOBN(0xfd05ff64, 0xb737df2f), TOBN(0x55fe8712, 0xf6d2531d),
- TOBN(0x57ce04a9, 0x6ab6b01c), TOBN(0x69a02a89, 0x7cd93724),
- TOBN(0x4f82ac35, 0xcf86699b), TOBN(0x8242d3ad, 0x9cb4b232),
- TOBN(0x713d0f65, 0xd62105e5), TOBN(0xbb222bfa, 0x2d29be61),
- TOBN(0xf2f9a79e, 0x6cfbef09), TOBN(0xfc24d8d3, 0xd5d6782f),
- TOBN(0x5db77085, 0xd4129967), TOBN(0xdb81c3cc, 0xdc3c2a43),
- TOBN(0x9d655fc0, 0x05d8d9a3), TOBN(0x3f5d057a, 0x54298026),
- TOBN(0x1157f56d, 0x88c54694), TOBN(0xb26baba5, 0x9b09573e),
- TOBN(0x2cab03b0, 0x22adffd1), TOBN(0x60a412c8, 0xdd69f383),
- TOBN(0xed76e98b, 0x54b25039), TOBN(0xd4ee67d3, 0x687e714d),
- TOBN(0x87739648, 0x7b00b594), TOBN(0xce419775, 0xc9ef709b),
- TOBN(0x40f76f85, 0x1c203a40), TOBN(0x30d352d6, 0xeafd8f91),
- TOBN(0xaf196d3d, 0x95578dd2), TOBN(0xea4bb3d7, 0x77cc3f3d),
- TOBN(0x42a5bd03, 0xb98e782b), TOBN(0xac958c40, 0x0624920d),
- TOBN(0xb838134c, 0xfc56fcc8), TOBN(0x86ec4ccf, 0x89572e5e),
- TOBN(0x69c43526, 0x9be47be0), TOBN(0x323b7dd8, 0xcb28fea1),
- TOBN(0xfa5538ba, 0x3a6c67e5), TOBN(0xef921d70, 0x1d378e46),
- TOBN(0xf92961fc, 0x3c4b880e), TOBN(0x3f6f914e, 0x98940a67),
- TOBN(0xa990eb0a, 0xfef0ff39), TOBN(0xa6c2920f, 0xf0eeff9c),
- TOBN(0xca804166, 0x51b8d9a3), TOBN(0x42531bc9, 0x0ffb0db1),
- TOBN(0x72ce4718, 0xaa82e7ce), TOBN(0x6e199913, 0xdf574741),
- TOBN(0xd5f1b13d, 0xd5d36946), TOBN(0x8255dc65, 0xf68f0194),
- TOBN(0xdc9df4cd, 0x8710d230), TOBN(0x3453c20f, 0x138c1988),
- TOBN(0x9af98dc0, 0x89a6ef01), TOBN(0x4dbcc3f0, 0x9857df85),
- TOBN(0x34805601, 0x5c1ad924), TOBN(0x40448da5, 0xd0493046),
- TOBN(0xf629926d, 0x4ee343e2), TOBN(0x6343f1bd, 0x90e8a301),
- TOBN(0xefc93491, 0x40815b3f), TOBN(0xf882a423, 0xde8f66fb),
- TOBN(0x3a12d5f4, 0xe7db9f57), TOBN(0x7dfba38a, 0x3c384c27),
- TOBN(0x7a904bfd, 0x6fc660b1), TOBN(0xeb6c5db3, 0x2773b21c),
- TOBN(0xc350ee66, 0x1cdfe049), TOBN(0x9baac0ce, 0x44540f29),
- TOBN(0xbc57b6ab, 0xa5ec6aad), TOBN(0x167ce8c3, 0x0a7c1baa),
- TOBN(0xb23a03a5, 0x53fb2b56), TOBN(0x6ce141e7, 0x4e057f78),
- TOBN(0x796525c3, 0x89e490d9), TOBN(0x0bc95725, 0xa31a7e75),
- TOBN(0x1ec56791, 0x1220fd06), TOBN(0x716e3a3c, 0x408b0bd6),
- TOBN(0x31cd6bf7, 0xe8ebeba9), TOBN(0xa7326ca6, 0xbee6b670),
- TOBN(0x3d9f851c, 0xcd090c43), TOBN(0x561e8f13, 0xf12c3988),
- TOBN(0x50490b6a, 0x904b7be4), TOBN(0x61690ce1, 0x0410737b),
- TOBN(0x299e9a37, 0x0f009052), TOBN(0x258758f0, 0xf026092e),
- TOBN(0x9fa255f3, 0xfdfcdc0f), TOBN(0xdbc9fb1f, 0xc0e1bcd2),
- TOBN(0x35f9dd6e, 0x24651840), TOBN(0xdca45a84, 0xa5c59abc),
- TOBN(0x103d396f, 0xecca4938), TOBN(0x4532da0a, 0xb97b3f29),
- TOBN(0xc4135ea5, 0x1999a6bf), TOBN(0x3aa9505a, 0x5e6bf2ee),
- TOBN(0xf77cef06, 0x3f5be093), TOBN(0x97d1a0f8, 0xa943152e),
- TOBN(0x2cb0ebba, 0x2e1c21dd), TOBN(0xf41b29fc, 0x2c6797c4),
- TOBN(0xc6e17321, 0xb300101f), TOBN(0x4422b0e9, 0xd0d79a89),
- TOBN(0x49e4901c, 0x92f1bfc4), TOBN(0x06ab1f8f, 0xe1e10ed9),
- TOBN(0x84d35577, 0xdb2926b8), TOBN(0xca349d39, 0x356e8ec2),
- TOBN(0x70b63d32, 0x343bf1a9), TOBN(0x8fd3bd28, 0x37d1a6b1),
- TOBN(0x0454879c, 0x316865b4), TOBN(0xee959ff6, 0xc458efa2),
- TOBN(0x0461dcf8, 0x9706dc3f), TOBN(0x737db0e2, 0x164e4b2e),
- TOBN(0x09262680, 0x2f8843c8), TOBN(0x54498bbc, 0x7745e6f6),
- TOBN(0x359473fa, 0xa29e24af), TOBN(0xfcc3c454, 0x70aa87a1),
- TOBN(0xfd2c4bf5, 0x00573ace), TOBN(0xb65b514e, 0x28dd1965),
- TOBN(0xe46ae7cf, 0x2193e393), TOBN(0x60e9a4e1, 0xf5444d97),
- TOBN(0xe7594e96, 0x00ff38ed), TOBN(0x43d84d2f, 0x0a0e0f02),
- TOBN(0x8b6db141, 0xee398a21), TOBN(0xb88a56ae, 0xe3bcc5be),
- TOBN(0x0a1aa52f, 0x373460ea), TOBN(0x20da1a56, 0x160bb19b),
- TOBN(0xfb54999d, 0x65bf0384), TOBN(0x71a14d24, 0x5d5a180e),
- TOBN(0xbc44db7b, 0x21737b04), TOBN(0xd84fcb18, 0x01dd8e92),
- TOBN(0x80de937b, 0xfa44b479), TOBN(0x53505499, 0x5c98fd4f),
- TOBN(0x1edb12ab, 0x28f08727), TOBN(0x4c58b582, 0xa5f3ef53),
- TOBN(0xbfb236d8, 0x8327f246), TOBN(0xc3a3bfaa, 0x4d7df320),
- TOBN(0xecd96c59, 0xb96024f2), TOBN(0xfc293a53, 0x7f4e0433),
- TOBN(0x5341352b, 0x5acf6e10), TOBN(0xc50343fd, 0xafe652c3),
- TOBN(0x4af3792d, 0x18577a7f), TOBN(0xe1a4c617, 0xaf16823d),
- TOBN(0x9b26d0cd, 0x33425d0a), TOBN(0x306399ed, 0x9b7bc47f),
- TOBN(0x2a792f33, 0x706bb20b), TOBN(0x31219614, 0x98111055),
- TOBN(0x864ec064, 0x87f5d28b), TOBN(0x11392d91, 0x962277fd),
- TOBN(0xb5aa7942, 0xbb6aed5f), TOBN(0x080094dc, 0x47e799d9),
- TOBN(0x4afa588c, 0x208ba19b), TOBN(0xd3e7570f, 0x8512f284),
- TOBN(0xcbae64e6, 0x02f5799a), TOBN(0xdeebe7ef, 0x514b9492),
- TOBN(0x30300f98, 0xe5c298ff), TOBN(0x17f561be, 0x3678361f),
- TOBN(0xf52ff312, 0x98cb9a16), TOBN(0x6233c3bc, 0x5562d490),
- TOBN(0x7bfa15a1, 0x92e3a2cb), TOBN(0x961bcfd1, 0xe6365119),
- TOBN(0x3bdd29bf, 0x2c8c53b1), TOBN(0x739704df, 0x822844ba),
- TOBN(0x7dacfb58, 0x7e7b754b), TOBN(0x23360791, 0xa806c9b9),
- TOBN(0xe7eb88c9, 0x23504452), TOBN(0x2983e996, 0x852c1783),
- TOBN(0xdd4ae529, 0x958d881d), TOBN(0x026bae03, 0x262c7b3c),
- TOBN(0x3a6f9193, 0x960b52d1), TOBN(0xd0980f90, 0x92696cfb),
- TOBN(0x4c1f428c, 0xd5f30851), TOBN(0x94dfed27, 0x2a4f6630),
- TOBN(0x4df53772, 0xfc5d48a4), TOBN(0xdd2d5a2f, 0x933260ce),
- TOBN(0x574115bd, 0xd44cc7a5), TOBN(0x4ba6b20d, 0xbd12533a),
- TOBN(0x30e93cb8, 0x243057c9), TOBN(0x794c486a, 0x14de320e),
- TOBN(0xe925d4ce, 0xf21496e4), TOBN(0xf951d198, 0xec696331),
- TOBN(0x9810e2de, 0x3e8d812f), TOBN(0xd0a47259, 0x389294ab),
- TOBN(0x513ba2b5, 0x0e3bab66), TOBN(0x462caff5, 0xabad306f),
- TOBN(0xe2dc6d59, 0xaf04c49e), TOBN(0x1aeb8750, 0xe0b84b0b),
- TOBN(0xc034f12f, 0x2f7d0ca2), TOBN(0x6d2e8128, 0xe06acf2f),
- TOBN(0x801f4f83, 0x21facc2f), TOBN(0xa1170c03, 0xf40ef607),
- TOBN(0xfe0a1d4f, 0x7805a99c), TOBN(0xbde56a36, 0xcc26aba5),
- TOBN(0x5b1629d0, 0x35531f40), TOBN(0xac212c2b, 0x9afa6108),
- TOBN(0x30a06bf3, 0x15697be5), TOBN(0x6f0545dc, 0x2c63c7c1),
- TOBN(0x5d8cb842, 0x7ccdadaf), TOBN(0xd52e379b, 0xac7015bb),
- TOBN(0xc4f56147, 0xf462c23e), TOBN(0xd44a4298, 0x46bc24b0),
- TOBN(0xbc73d23a, 0xe2856d4f), TOBN(0x61cedd8c, 0x0832bcdf),
- TOBN(0x60953556, 0x99f241d7), TOBN(0xee4adbd7, 0x001a349d),
- TOBN(0x0b35bf6a, 0xaa89e491), TOBN(0x7f0076f4, 0x136f7546),
- TOBN(0xd19a18ba, 0x9264da3d), TOBN(0x6eb2d2cd, 0x62a7a28b),
- TOBN(0xcdba941f, 0x8761c971), TOBN(0x1550518b, 0xa3be4a5d),
- TOBN(0xd0e8e2f0, 0x57d0b70c), TOBN(0xeea8612e, 0xcd133ba3),
- TOBN(0x814670f0, 0x44416aec), TOBN(0x424db6c3, 0x30775061),
- TOBN(0xd96039d1, 0x16213fd1), TOBN(0xc61e7fa5, 0x18a3478f),
- TOBN(0xa805bdcc, 0xcb0c5021), TOBN(0xbdd6f3a8, 0x0cc616dd),
- TOBN(0x06009667, 0x5d97f7e2), TOBN(0x31db0fc1, 0xaf0bf4b6),
- TOBN(0x23680ed4, 0x5491627a), TOBN(0xb99a3c66, 0x7d741fb1),
- TOBN(0xe9bb5f55, 0x36b1ff92), TOBN(0x29738577, 0x512b388d),
- TOBN(0xdb8a2ce7, 0x50fcf263), TOBN(0x385346d4, 0x6c4f7b47),
- TOBN(0xbe86c5ef, 0x31631f9e), TOBN(0xbf91da21, 0x03a57a29),
- TOBN(0xc3b1f796, 0x7b23f821), TOBN(0x0f7d00d2, 0x770db354),
- TOBN(0x8ffc6c3b, 0xd8fe79da), TOBN(0xcc5e8c40, 0xd525c996),
- TOBN(0x4640991d, 0xcfff632a), TOBN(0x64d97e8c, 0x67112528),
- TOBN(0xc232d973, 0x02f1cd1e), TOBN(0xce87eacb, 0x1dd212a4),
- TOBN(0x6e4c8c73, 0xe69802f7), TOBN(0x12ef0290, 0x1fffddbd),
- TOBN(0x941ec74e, 0x1bcea6e2), TOBN(0xd0b54024, 0x3cb92cbb),
- TOBN(0x809fb9d4, 0x7e8f9d05), TOBN(0x3bf16159, 0xf2992aae),
- TOBN(0xad40f279, 0xf8a7a838), TOBN(0x11aea631, 0x05615660),
- TOBN(0xbf52e6f1, 0xa01f6fa1), TOBN(0xef046995, 0x3dc2aec9),
- TOBN(0x785dbec9, 0xd8080711), TOBN(0xe1aec60a, 0x9fdedf76),
- TOBN(0xece797b5, 0xfa21c126), TOBN(0xc66e898f, 0x05e52732),
- TOBN(0x39bb69c4, 0x08811fdb), TOBN(0x8bfe1ef8, 0x2fc7f082),
- TOBN(0xc8e7a393, 0x174f4138), TOBN(0xfba8ad1d, 0xd58d1f98),
- TOBN(0xbc21d0ce, 0xbfd2fd5b), TOBN(0x0b839a82, 0x6ee60d61),
- TOBN(0xaacf7658, 0xafd22253), TOBN(0xb526bed8, 0xaae396b3),
- TOBN(0xccc1bbc2, 0x38564464), TOBN(0x9e3ff947, 0x8c45bc73),
- TOBN(0xcde9bca3, 0x58188a78), TOBN(0x138b8ee0, 0xd73bf8f7),
- TOBN(0x5c7e234c, 0x4123c489), TOBN(0x66e69368, 0xfa643297),
- TOBN(0x0629eeee, 0x39a15fa3), TOBN(0x95fab881, 0xa9e2a927),
- TOBN(0xb2497007, 0xeafbb1e1), TOBN(0xd75c9ce6, 0xe75b7a93),
- TOBN(0x3558352d, 0xefb68d78), TOBN(0xa2f26699, 0x223f6396),
- TOBN(0xeb911ecf, 0xe469b17a), TOBN(0x62545779, 0xe72d3ec2),
- TOBN(0x8ea47de7, 0x82cb113f), TOBN(0xebe4b086, 0x4e1fa98d),
- TOBN(0xec2d5ed7, 0x8cdfedb1), TOBN(0xa535c077, 0xfe211a74),
- TOBN(0x9678109b, 0x11d244c5), TOBN(0xf17c8bfb, 0xbe299a76),
- TOBN(0xb651412e, 0xfb11fbc4), TOBN(0xea0b5482, 0x94ab3f65),
- TOBN(0xd8dffd95, 0x0cf78243), TOBN(0x2e719e57, 0xce0361d4),
- TOBN(0x9007f085, 0x304ddc5b), TOBN(0x095e8c6d, 0x4daba2ea),
- TOBN(0x5a33cdb4, 0x3f9d28a9), TOBN(0x85b95cd8, 0xe2283003),
- TOBN(0xbcd6c819, 0xb9744733), TOBN(0x29c5f538, 0xfc7f5783),
- TOBN(0x6c49b2fa, 0xd59038e4), TOBN(0x68349cc1, 0x3bbe1018),
- TOBN(0xcc490c1d, 0x21830ee5), TOBN(0x36f9c4ee, 0xe9bfa297),
- TOBN(0x58fd7294, 0x48de1a94), TOBN(0xaadb13a8, 0x4e8f2cdc),
- TOBN(0x515eaaa0, 0x81313dba), TOBN(0xc76bb468, 0xc2152dd8),
- TOBN(0x357f8d75, 0xa653dbf8), TOBN(0xe4d8c4d1, 0xb14ac143),
- TOBN(0xbdb8e675, 0xb055cb40), TOBN(0x898f8e7b, 0x977b5167),
- TOBN(0xecc65651, 0xb82fb863), TOBN(0x56544814, 0x6d88f01f),
- TOBN(0xb0928e95, 0x263a75a9), TOBN(0xcfb6836f, 0x1a22fcda),
- TOBN(0x651d14db, 0x3f3bd37c), TOBN(0x1d3837fb, 0xb6ad4664),
- TOBN(0x7c5fb538, 0xff4f94ab), TOBN(0x7243c712, 0x6d7fb8f2),
- TOBN(0xef13d60c, 0xa85c5287), TOBN(0x18cfb7c7, 0x4bb8dd1b),
- TOBN(0x82f9bfe6, 0x72908219), TOBN(0x35c4592b, 0x9d5144ab),
- TOBN(0x52734f37, 0x9cf4b42f), TOBN(0x6bac55e7, 0x8c60ddc4),
- TOBN(0xb5cd811e, 0x94dea0f6), TOBN(0x259ecae4, 0xe18cc1a3),
- TOBN(0x6a0e836e, 0x15e660f8), TOBN(0x6c639ea6, 0x0e02bff2),
- TOBN(0x8721b8cb, 0x7e1026fd), TOBN(0x9e73b50b, 0x63261942),
- TOBN(0xb8c70974, 0x77f01da3), TOBN(0x1839e6a6, 0x8268f57f),
- TOBN(0x571b9415, 0x5150b805), TOBN(0x1892389e, 0xf92c7097),
- TOBN(0x8d69c18e, 0x4a084b95), TOBN(0x7014c512, 0xbe5b495c),
- TOBN(0x4780db36, 0x1b07523c), TOBN(0x2f6219ce, 0x2c1c64fa),
- TOBN(0xc38b81b0, 0x602c105a), TOBN(0xab4f4f20, 0x5dc8e360),
- TOBN(0x20d3c982, 0xcf7d62d2), TOBN(0x1f36e29d, 0x23ba8150),
- TOBN(0x48ae0bf0, 0x92763f9e), TOBN(0x7a527e6b, 0x1d3a7007),
- TOBN(0xb4a89097, 0x581a85e3), TOBN(0x1f1a520f, 0xdc158be5),
- TOBN(0xf98db37d, 0x167d726e), TOBN(0x8802786e, 0x1113e862)}
- ,
- {TOBN(0xefb2149e, 0x36f09ab0), TOBN(0x03f163ca, 0x4a10bb5b),
- TOBN(0xd0297045, 0x06e20998), TOBN(0x56f0af00, 0x1b5a3bab),
- TOBN(0x7af4cfec, 0x70880e0d), TOBN(0x7332a66f, 0xbe3d913f),
- TOBN(0x32e6c84a, 0x7eceb4bd), TOBN(0xedc4a79a, 0x9c228f55),
- TOBN(0xc37c7dd0, 0xc55c4496), TOBN(0xa6a96357, 0x25bbabd2),
- TOBN(0x5b7e63f2, 0xadd7f363), TOBN(0x9dce3782, 0x2e73f1df),
- TOBN(0xe1e5a16a, 0xb2b91f71), TOBN(0xe4489823, 0x5ba0163c),
- TOBN(0xf2759c32, 0xf6e515ad), TOBN(0xa5e2f1f8, 0x8615eecf),
- TOBN(0x74519be7, 0xabded551), TOBN(0x03d358b8, 0xc8b74410),
- TOBN(0x4d00b10b, 0x0e10d9a9), TOBN(0x6392b0b1, 0x28da52b7),
- TOBN(0x6744a298, 0x0b75c904), TOBN(0xc305b0ae, 0xa8f7f96c),
- TOBN(0x042e421d, 0x182cf932), TOBN(0xf6fc5d50, 0x9e4636ca),
- TOBN(0x795847c9, 0xd64cc78c), TOBN(0x6c50621b, 0x9b6cb27b),
- TOBN(0x07099bf8, 0xdf8022ab), TOBN(0x48f862eb, 0xc04eda1d),
- TOBN(0xd12732ed, 0xe1603c16), TOBN(0x19a80e0f, 0x5c9a9450),
- TOBN(0xe2257f54, 0xb429b4fc), TOBN(0x66d3b2c6, 0x45460515),
- TOBN(0x6ca4f87e, 0x822e37be), TOBN(0x73f237b4, 0x253bda4e),
- TOBN(0xf747f3a2, 0x41190aeb), TOBN(0xf06fa36f, 0x804cf284),
- TOBN(0x0a6bbb6e, 0xfc621c12), TOBN(0x5d624b64, 0x40b80ec6),
- TOBN(0x4b072425, 0x7ba556f3), TOBN(0x7fa0c354, 0x3e2d20a8),
- TOBN(0xe921fa31, 0xe3229d41), TOBN(0xa929c652, 0x94531bd4),
- TOBN(0x84156027, 0xa6d38209), TOBN(0xf3d69f73, 0x6bdb97bd),
- TOBN(0x8906d19a, 0x16833631), TOBN(0x68a34c2e, 0x03d51be3),
- TOBN(0xcb59583b, 0x0e511cd8), TOBN(0x99ce6bfd, 0xfdc132a8),
- TOBN(0x3facdaaa, 0xffcdb463), TOBN(0x658bbc1a, 0x34a38b08),
- TOBN(0x12a801f8, 0xf1a9078d), TOBN(0x1567bcf9, 0x6ab855de),
- TOBN(0xe08498e0, 0x3572359b), TOBN(0xcf0353e5, 0x8659e68b),
- TOBN(0xbb86e9c8, 0x7d23807c), TOBN(0xbc08728d, 0x2198e8a2),
- TOBN(0x8de2b7bc, 0x453cadd6), TOBN(0x203900a7, 0xbc0bc1f8),
- TOBN(0xbcd86e47, 0xa6abd3af), TOBN(0x911cac12, 0x8502effb),
- TOBN(0x2d550242, 0xec965469), TOBN(0x0e9f7692, 0x29e0017e),
- TOBN(0x633f078f, 0x65979885), TOBN(0xfb87d449, 0x4cf751ef),
- TOBN(0xe1790e4b, 0xfc25419a), TOBN(0x36467203, 0x4bff3cfd),
- TOBN(0xc8db6386, 0x25b6e83f), TOBN(0x6cc69f23, 0x6cad6fd2),
- TOBN(0x0219e45a, 0x6bc68bb9), TOBN(0xe43d79b6, 0x297f7334),
- TOBN(0x7d445368, 0x465dc97c), TOBN(0x4b9eea32, 0x2a0b949a),
- TOBN(0x1b96c6ba, 0x6102d021), TOBN(0xeaafac78, 0x2f4461ea),
- TOBN(0xd4b85c41, 0xc49f19a8), TOBN(0x275c28e4, 0xcf538875),
- TOBN(0x35451a9d, 0xdd2e54e0), TOBN(0x6991adb5, 0x0605618b),
- TOBN(0x5b8b4bcd, 0x7b36cd24), TOBN(0x372a4f8c, 0x56f37216),
- TOBN(0xc890bd73, 0xa6a5da60), TOBN(0x6f083da0, 0xdc4c9ff0),
- TOBN(0xf4e14d94, 0xf0536e57), TOBN(0xf9ee1eda, 0xaaec8243),
- TOBN(0x571241ec, 0x8bdcf8e7), TOBN(0xa5db8271, 0x0b041e26),
- TOBN(0x9a0b9a99, 0xe3fff040), TOBN(0xcaaf21dd, 0x7c271202),
- TOBN(0xb4e2b2e1, 0x4f0dd2e8), TOBN(0xe77e7c4f, 0x0a377ac7),
- TOBN(0x69202c3f, 0x0d7a2198), TOBN(0xf759b7ff, 0x28200eb8),
- TOBN(0xc87526ed, 0xdcfe314e), TOBN(0xeb84c524, 0x53d5cf99),
- TOBN(0xb1b52ace, 0x515138b6), TOBN(0x5aa7ff8c, 0x23fca3f4),
- TOBN(0xff0b13c3, 0xb9791a26), TOBN(0x960022da, 0xcdd58b16),
- TOBN(0xdbd55c92, 0x57aad2de), TOBN(0x3baaaaa3, 0xf30fe619),
- TOBN(0x9a4b2346, 0x0d881efd), TOBN(0x506416c0, 0x46325e2a),
- TOBN(0x91381e76, 0x035c18d4), TOBN(0xb3bb68be, 0xf27817b0),
- TOBN(0x15bfb8bf, 0x5116f937), TOBN(0x7c64a586, 0xc1268943),
- TOBN(0x71e25cc3, 0x8419a2c8), TOBN(0x9fd6b0c4, 0x8335f463),
- TOBN(0x4bf0ba3c, 0xe8ee0e0e), TOBN(0x6f6fba60, 0x298c21fa),
- TOBN(0x57d57b39, 0xae66bee0), TOBN(0x292d5130, 0x22672544),
- TOBN(0xf451105d, 0xbab093b3), TOBN(0x012f59b9, 0x02839986),
- TOBN(0x8a915802, 0x3474a89c), TOBN(0x048c919c, 0x2de03e97),
- TOBN(0xc476a2b5, 0x91071cd5), TOBN(0x791ed89a, 0x034970a5),
- TOBN(0x89bd9042, 0xe1b7994b), TOBN(0x8eaf5179, 0xa1057ffd),
- TOBN(0x6066e2a2, 0xd551ee10), TOBN(0x87a8f1d8, 0x727e09a6),
- TOBN(0x00d08bab, 0x2c01148d), TOBN(0x6da8e4f1, 0x424f33fe),
- TOBN(0x466d17f0, 0xcf9a4e71), TOBN(0xff502010, 0x3bf5cb19),
- TOBN(0xdccf97d8, 0xd062ecc0), TOBN(0x80c0d9af, 0x81d80ac4),
- TOBN(0xe87771d8, 0x033f2876), TOBN(0xb0186ec6, 0x7d5cc3db),
- TOBN(0x58e8bb80, 0x3bc9bc1d), TOBN(0x4d1395cc, 0x6f6ef60e),
- TOBN(0xa73c62d6, 0x186244a0), TOBN(0x918e5f23, 0x110a5b53),
- TOBN(0xed4878ca, 0x741b7eab), TOBN(0x3038d71a, 0xdbe03e51),
- TOBN(0x840204b7, 0xa93c3246), TOBN(0x21ab6069, 0xa0b9b4cd),
- TOBN(0xf5fa6e2b, 0xb1d64218), TOBN(0x1de6ad0e, 0xf3d56191),
- TOBN(0x570aaa88, 0xff1929c7), TOBN(0xc6df4c6b, 0x640e87b5),
- TOBN(0xde8a74f2, 0xc65f0ccc), TOBN(0x8b972fd5, 0xe6f6cc01),
- TOBN(0x3fff36b6, 0x0b846531), TOBN(0xba7e45e6, 0x10a5e475),
- TOBN(0x84a1d10e, 0x4145b6c5), TOBN(0xf1f7f91a, 0x5e046d9d),
- TOBN(0x0317a692, 0x44de90d7), TOBN(0x951a1d4a, 0xf199c15e),
- TOBN(0x91f78046, 0xc9d73deb), TOBN(0x74c82828, 0xfab8224f),
- TOBN(0xaa6778fc, 0xe7560b90), TOBN(0xb4073e61, 0xa7e824ce),
- TOBN(0xff0d693c, 0xd642eba8), TOBN(0x7ce2e57a, 0x5dccef38),
- TOBN(0x89c2c789, 0x1df1ad46), TOBN(0x83a06922, 0x098346fd),
- TOBN(0x2d715d72, 0xda2fc177), TOBN(0x7b6dd71d, 0x85b6cf1d),
- TOBN(0xc60a6d0a, 0x73fa9cb0), TOBN(0xedd3992e, 0x328bf5a9),
- TOBN(0xc380ddd0, 0x832c8c82), TOBN(0xd182d410, 0xa2a0bf50),
- TOBN(0x7d9d7438, 0xd9a528db), TOBN(0xe8b1a0e9, 0xcaf53994),
- TOBN(0xddd6e5fe, 0x0e19987c), TOBN(0xacb8df03, 0x190b059d),
- TOBN(0x53703a32, 0x8300129f), TOBN(0x1f637662, 0x68c43bfd),
- TOBN(0xbcbd1913, 0x00e54051), TOBN(0x812fcc62, 0x7bf5a8c5),
- TOBN(0x3f969d5f, 0x29fb85da), TOBN(0x72f4e00a, 0x694759e8),
- TOBN(0x426b6e52, 0x790726b7), TOBN(0x617bbc87, 0x3bdbb209),
- TOBN(0x511f8bb9, 0x97aee317), TOBN(0x812a4096, 0xe81536a8),
- TOBN(0x137dfe59, 0x3ac09b9b), TOBN(0x0682238f, 0xba8c9a7a),
- TOBN(0x7072ead6, 0xaeccb4bd), TOBN(0x6a34e9aa, 0x692ba633),
- TOBN(0xc82eaec2, 0x6fff9d33), TOBN(0xfb753512, 0x1d4d2b62),
- TOBN(0x1a0445ff, 0x1d7aadab), TOBN(0x65d38260, 0xd5f6a67c),
- TOBN(0x6e62fb08, 0x91cfb26f), TOBN(0xef1e0fa5, 0x5c7d91d6),
- TOBN(0x47e7c7ba, 0x33db72cd), TOBN(0x017cbc09, 0xfa7c74b2),
- TOBN(0x3c931590, 0xf50a503c), TOBN(0xcac54f60, 0x616baa42),
- TOBN(0x9b6cd380, 0xb2369f0f), TOBN(0x97d3a70d, 0x23c76151),
- TOBN(0x5f9dd6fc, 0x9862a9c6), TOBN(0x044c4ab2, 0x12312f51),
- TOBN(0x035ea0fd, 0x834a2ddc), TOBN(0x49e6b862, 0xcc7b826d),
- TOBN(0xb03d6883, 0x62fce490), TOBN(0x62f2497a, 0xb37e36e9),
- TOBN(0x04b005b6, 0xc6458293), TOBN(0x36bb5276, 0xe8d10af7),
- TOBN(0xacf2dc13, 0x8ee617b8), TOBN(0x470d2d35, 0xb004b3d4),
- TOBN(0x06790832, 0xfeeb1b77), TOBN(0x2bb75c39, 0x85657f9c),
- TOBN(0xd70bd4ed, 0xc0f60004), TOBN(0xfe797ecc, 0x219b018b),
- TOBN(0x9b5bec2a, 0x753aebcc), TOBN(0xdaf9f3dc, 0xc939eca5),
- TOBN(0xd6bc6833, 0xd095ad09), TOBN(0x98abdd51, 0xdaa4d2fc),
- TOBN(0xd9840a31, 0x8d168be5), TOBN(0xcf7c10e0, 0x2325a23c),
- TOBN(0xa5c02aa0, 0x7e6ecfaf), TOBN(0x2462e7e6, 0xb5bfdf18),
- TOBN(0xab2d8a8b, 0xa0cc3f12), TOBN(0x68dd485d, 0xbc672a29),
- TOBN(0x72039752, 0x596f2cd3), TOBN(0x5d3eea67, 0xa0cf3d8d),
- TOBN(0x810a1a81, 0xe6602671), TOBN(0x8f144a40, 0x14026c0c),
- TOBN(0xbc753a6d, 0x76b50f85), TOBN(0xc4dc21e8, 0x645cd4a4),
- TOBN(0xc5262dea, 0x521d0378), TOBN(0x802b8e0e, 0x05011c6f),
- TOBN(0x1ba19cbb, 0x0b4c19ea), TOBN(0x21db64b5, 0xebf0aaec),
- TOBN(0x1f394ee9, 0x70342f9d), TOBN(0x93a10aee, 0x1bc44a14),
- TOBN(0xa7eed31b, 0x3efd0baa), TOBN(0x6e7c824e, 0x1d154e65),
- TOBN(0xee23fa81, 0x9966e7ee), TOBN(0x64ec4aa8, 0x05b7920d),
- TOBN(0x2d44462d, 0x2d90aad4), TOBN(0xf44dd195, 0xdf277ad5),
- TOBN(0x8d6471f1, 0xbb46b6a1), TOBN(0x1e65d313, 0xfd885090),
- TOBN(0x33a800f5, 0x13a977b4), TOBN(0xaca9d721, 0x0797e1ef),
- TOBN(0x9a5a85a0, 0xfcff6a17), TOBN(0x9970a3f3, 0x1eca7cee),
- TOBN(0xbb9f0d6b, 0xc9504be3), TOBN(0xe0c504be, 0xadd24ee2),
- TOBN(0x7e09d956, 0x77fcc2f4), TOBN(0xef1a5227, 0x65bb5fc4),
- TOBN(0x145d4fb1, 0x8b9286aa), TOBN(0x66fd0c5d, 0x6649028b),
- TOBN(0x98857ceb, 0x1bf4581c), TOBN(0xe635e186, 0xaca7b166),
- TOBN(0x278ddd22, 0x659722ac), TOBN(0xa0903c4c, 0x1db68007),
- TOBN(0x366e4589, 0x48f21402), TOBN(0x31b49c14, 0xb96abda2),
- TOBN(0x329c4b09, 0xe0403190), TOBN(0x97197ca3, 0xd29f43fe),
- TOBN(0x8073dd1e, 0x274983d8), TOBN(0xda1a3bde, 0x55717c8f),
- TOBN(0xfd3d4da2, 0x0361f9d1), TOBN(0x1332d081, 0x4c7de1ce),
- TOBN(0x9b7ef7a3, 0xaa6d0e10), TOBN(0x17db2e73, 0xf54f1c4a),
- TOBN(0xaf3dffae, 0x4cd35567), TOBN(0xaaa2f406, 0xe56f4e71),
- TOBN(0x8966759e, 0x7ace3fc7), TOBN(0x9594eacf, 0x45a8d8c6),
- TOBN(0x8de3bd8b, 0x91834e0e), TOBN(0xafe4ca53, 0x548c0421),
- TOBN(0xfdd7e856, 0xe6ee81c6), TOBN(0x8f671beb, 0x6b891a3a),
- TOBN(0xf7a58f2b, 0xfae63829), TOBN(0x9ab186fb, 0x9c11ac9f),
- TOBN(0x8d6eb369, 0x10b5be76), TOBN(0x046b7739, 0xfb040bcd),
- TOBN(0xccb4529f, 0xcb73de88), TOBN(0x1df0fefc, 0xcf26be03),
- TOBN(0xad7757a6, 0xbcfcd027), TOBN(0xa8786c75, 0xbb3165ca),
- TOBN(0xe9db1e34, 0x7e99a4d9), TOBN(0x99ee86df, 0xb06c504b),
- TOBN(0x5b7c2ddd, 0xc15c9f0a), TOBN(0xdf87a734, 0x4295989e),
- TOBN(0x59ece47c, 0x03d08fda), TOBN(0xb074d3dd, 0xad5fc702),
- TOBN(0x20407903, 0x51a03776), TOBN(0x2bb1f77b, 0x2a608007),
- TOBN(0x25c58f4f, 0xe1153185), TOBN(0xe6df62f6, 0x766e6447),
- TOBN(0xefb3d1be, 0xed51275a), TOBN(0x5de47dc7, 0x2f0f483f),
- TOBN(0x7932d98e, 0x97c2bedf), TOBN(0xd5c11927, 0x0219f8a1),
- TOBN(0x9d751200, 0xa73a294e), TOBN(0x5f88434a, 0x9dc20172),
- TOBN(0xd28d9fd3, 0xa26f506a), TOBN(0xa890cd31, 0x9d1dcd48),
- TOBN(0x0aebaec1, 0x70f4d3b4), TOBN(0xfd1a1369, 0x0ffc8d00),
- TOBN(0xb9d9c240, 0x57d57838), TOBN(0x45929d26, 0x68bac361),
- TOBN(0x5a2cd060, 0x25b15ca6), TOBN(0x4b3c83e1, 0x6e474446),
- TOBN(0x1aac7578, 0xee1e5134), TOBN(0xa418f5d6, 0xc91e2f41),
- TOBN(0x6936fc8a, 0x213ed68b), TOBN(0x860ae7ed, 0x510a5224),
- TOBN(0x63660335, 0xdef09b53), TOBN(0x641b2897, 0xcd79c98d),
- TOBN(0x29bd38e1, 0x01110f35), TOBN(0x79c26f42, 0x648b1937),
- TOBN(0x64dae519, 0x9d9164f4), TOBN(0xd85a2310, 0x0265c273),
- TOBN(0x7173dd5d, 0x4b07e2b1), TOBN(0xd144c4cb, 0x8d9ea221),
- TOBN(0xe8b04ea4, 0x1105ab14), TOBN(0x92dda542, 0xfe80d8f1),
- TOBN(0xe9982fa8, 0xcf03dce6), TOBN(0x8b5ea965, 0x1a22cffc),
- TOBN(0xf7f4ea7f, 0x3fad88c4), TOBN(0x62db773e, 0x6a5ba95c),
- TOBN(0xd20f02fb, 0x93f24567), TOBN(0xfd46c69a, 0x315257ca),
- TOBN(0x0ac74cc7, 0x8bcab987), TOBN(0x46f31c01, 0x5ceca2f5),
- TOBN(0x40aedb59, 0x888b219e), TOBN(0xe50ecc37, 0xe1fccd02),
- TOBN(0x1bcd9dad, 0x911f816c), TOBN(0x583cc1ec, 0x8db9b00c),
- TOBN(0xf3cd2e66, 0xa483bf11), TOBN(0xfa08a6f5, 0xb1b2c169),
- TOBN(0xf375e245, 0x4be9fa28), TOBN(0x99a7ffec, 0x5b6d011f),
- TOBN(0x6a3ebddb, 0xc4ae62da), TOBN(0x6cea00ae, 0x374aef5d),
- TOBN(0xab5fb98d, 0x9d4d05bc), TOBN(0x7cba1423, 0xd560f252),
- TOBN(0x49b2cc21, 0x208490de), TOBN(0x1ca66ec3, 0xbcfb2879),
- TOBN(0x7f1166b7, 0x1b6fb16f), TOBN(0xfff63e08, 0x65fe5db3),
- TOBN(0xb8345abe, 0x8b2610be), TOBN(0xb732ed80, 0x39de3df4),
- TOBN(0x0e24ed50, 0x211c32b4), TOBN(0xd10d8a69, 0x848ff27d),
- TOBN(0xc1074398, 0xed4de248), TOBN(0xd7cedace, 0x10488927),
- TOBN(0xa4aa6bf8, 0x85673e13), TOBN(0xb46bae91, 0x6daf30af),
- TOBN(0x07088472, 0xfcef7ad8), TOBN(0x61151608, 0xd4b35e97),
- TOBN(0xbcfe8f26, 0xdde29986), TOBN(0xeb84c4c7, 0xd5a34c79),
- TOBN(0xc1eec55c, 0x164e1214), TOBN(0x891be86d, 0xa147bb03),
- TOBN(0x9fab4d10, 0x0ba96835), TOBN(0xbf01e9b8, 0xa5c1ae9f),
- TOBN(0x6b4de139, 0xb186ebc0), TOBN(0xd5c74c26, 0x85b91bca),
- TOBN(0x5086a99c, 0xc2d93854), TOBN(0xeed62a7b, 0xa7a9dfbc),
- TOBN(0x8778ed6f, 0x76b7618a), TOBN(0xbff750a5, 0x03b66062),
- TOBN(0x4cb7be22, 0xb65186db), TOBN(0x369dfbf0, 0xcc3a6d13),
- TOBN(0xc7dab26c, 0x7191a321), TOBN(0x9edac3f9, 0x40ed718e),
- TOBN(0xbc142b36, 0xd0cfd183), TOBN(0xc8af82f6, 0x7c991693),
- TOBN(0xb3d1e4d8, 0x97ce0b2a), TOBN(0xe6d7c87f, 0xc3a55cdf),
- TOBN(0x35846b95, 0x68b81afe), TOBN(0x018d12af, 0xd3c239d8),
- TOBN(0x2b2c6208, 0x01206e15), TOBN(0xe0e42453, 0xa3b882c6),
- TOBN(0x854470a3, 0xa50162d5), TOBN(0x08157478, 0x7017a62a),
- TOBN(0x18bd3fb4, 0x820357c7), TOBN(0x992039ae, 0x6f1458ad),
- TOBN(0x9a1df3c5, 0x25b44aa1), TOBN(0x2d780357, 0xed3d5281),
- TOBN(0x58cf7e4d, 0xc77ad4d4), TOBN(0xd49a7998, 0xf9df4fc4),
- TOBN(0x4465a8b5, 0x1d71205e), TOBN(0xa0ee0ea6, 0x649254aa),
- TOBN(0x4b5eeecf, 0xab7bd771), TOBN(0x6c873073, 0x35c262b9),
- TOBN(0xdc5bd648, 0x3c9d61e7), TOBN(0x233d6d54, 0x321460d2),
- TOBN(0xd20c5626, 0xfc195bcc), TOBN(0x25445958, 0x04d78b63),
- TOBN(0xe03fcb3d, 0x17ec8ef3), TOBN(0x54b690d1, 0x46b8f781),
- TOBN(0x82fa2c8a, 0x21230646), TOBN(0xf51aabb9, 0x084f418c),
- TOBN(0xff4fbec1, 0x1a30ba43), TOBN(0x6a5acf73, 0x743c9df7),
- TOBN(0x1da2b357, 0xd635b4d5), TOBN(0xc3de68dd, 0xecd5c1da),
- TOBN(0xa689080b, 0xd61af0dd), TOBN(0xdea5938a, 0xd665bf99),
- TOBN(0x0231d71a, 0xfe637294), TOBN(0x01968aa6, 0xa5a81cd8),
- TOBN(0x11252d50, 0x048e63b5), TOBN(0xc446bc52, 0x6ca007e9),
- TOBN(0xef8c50a6, 0x96d6134b), TOBN(0x9361fbf5, 0x9e09a05c),
- TOBN(0xf17f85a6, 0xdca3291a), TOBN(0xb178d548, 0xff251a21),
- TOBN(0x87f6374b, 0xa4df3915), TOBN(0x566ce1bf, 0x2fd5d608),
- TOBN(0x425cba4d, 0x7de35102), TOBN(0x6b745f8f, 0x58c5d5e2),
- TOBN(0x88402af6, 0x63122edf), TOBN(0x3190f9ed, 0x3b989a89),
- TOBN(0x4ad3d387, 0xebba3156), TOBN(0xef385ad9, 0xc7c469a5),
- TOBN(0xb08281de, 0x3f642c29), TOBN(0x20be0888, 0x910ffb88),
- TOBN(0xf353dd4a, 0xd5292546), TOBN(0x3f1627de, 0x8377a262),
- TOBN(0xa5faa013, 0xeefcd638), TOBN(0x8f3bf626, 0x74cc77c3),
- TOBN(0x32618f65, 0xa348f55e), TOBN(0x5787c0dc, 0x9fefeb9e),
- TOBN(0xf1673aa2, 0xd9a23e44), TOBN(0x88dfa993, 0x4e10690d),
- TOBN(0x1ced1b36, 0x2bf91108), TOBN(0x9193ceca, 0x3af48649),
- TOBN(0xfb34327d, 0x2d738fc5), TOBN(0x6697b037, 0x975fee6c),
- TOBN(0x2f485da0, 0xc04079a5), TOBN(0x2cdf5735, 0x2feaa1ac),
- TOBN(0x76944420, 0xbd55659e), TOBN(0x7973e32b, 0x4376090c),
- TOBN(0x86bb4fe1, 0x163b591a), TOBN(0x10441aed, 0xc196f0ca),
- TOBN(0x3b431f4a, 0x045ad915), TOBN(0x6c11b437, 0xa4afacb1),
- TOBN(0x30b0c7db, 0x71fdbbd8), TOBN(0xb642931f, 0xeda65acd),
- TOBN(0x4baae6e8, 0x9c92b235), TOBN(0xa73bbd0e, 0x6b3993a1),
- TOBN(0xd06d60ec, 0x693dd031), TOBN(0x03cab91b, 0x7156881c),
- TOBN(0xd615862f, 0x1db3574b), TOBN(0x485b0185, 0x64bb061a),
- TOBN(0x27434988, 0xa0181e06), TOBN(0x2cd61ad4, 0xc1c0c757),
- TOBN(0x3effed5a, 0x2ff9f403), TOBN(0x8dc98d8b, 0x62239029),
- TOBN(0x2206021e, 0x1f17b70d), TOBN(0xafbec0ca, 0xbf510015),
- TOBN(0x9fed7164, 0x80130dfa), TOBN(0x306dc2b5, 0x8a02dcf5),
- TOBN(0x48f06620, 0xfeb10fc0), TOBN(0x78d1e1d5, 0x5a57cf51),
- TOBN(0xadef8c5a, 0x192ef710), TOBN(0x88afbd4b, 0x3b7431f9),
- TOBN(0x7e1f7407, 0x64250c9e), TOBN(0x6e31318d, 0xb58bec07),
- TOBN(0xfd4fc4b8, 0x24f89b4e), TOBN(0x65a5dd88, 0x48c36a2a),
- TOBN(0x4f1eccff, 0xf024baa7), TOBN(0x22a21cf2, 0xcba94650),
- TOBN(0x95d29dee, 0x42a554f7), TOBN(0x828983a5, 0x002ec4ba),
- TOBN(0x8112a1f7, 0x8badb73d), TOBN(0x79ea8897, 0xa27c1839),
- TOBN(0x8969a5a7, 0xd065fd83), TOBN(0xf49af791, 0xb262a0bc),
- TOBN(0xfcdea8b6, 0xaf2b5127), TOBN(0x10e913e1, 0x564c2dbc),
- TOBN(0x51239d14, 0xbc21ef51), TOBN(0xe51c3ceb, 0x4ce57292),
- TOBN(0x795ff068, 0x47bbcc3b), TOBN(0x86b46e1e, 0xbd7e11e6),
- TOBN(0x0ea6ba23, 0x80041ef4), TOBN(0xd72fe505, 0x6262342e),
- TOBN(0x8abc6dfd, 0x31d294d4), TOBN(0xbbe017a2, 0x1278c2c9),
- TOBN(0xb1fcfa09, 0xb389328a), TOBN(0x322fbc62, 0xd01771b5),
- TOBN(0x04c0d063, 0x60b045bf), TOBN(0xdb652edc, 0x10e52d01),
- TOBN(0x50ef932c, 0x03ec6627), TOBN(0xde1b3b2d, 0xc1ee50e3),
- TOBN(0x5ab7bdc5, 0xdc37a90d), TOBN(0xfea67213, 0x31e33a96),
- TOBN(0x6482b5cb, 0x4f2999aa), TOBN(0x38476cc6, 0xb8cbf0dd),
- TOBN(0x93ebfacb, 0x173405bb), TOBN(0x15cdafe7, 0xe52369ec),
- TOBN(0xd42d5ba4, 0xd935b7db), TOBN(0x648b6004, 0x1c99a4cd),
- TOBN(0x785101bd, 0xa3b5545b), TOBN(0x4bf2c38a, 0x9dd67faf),
- TOBN(0xb1aadc63, 0x4442449c), TOBN(0xe0e9921a, 0x33ad4fb8),
- TOBN(0x5c552313, 0xaa686d82), TOBN(0xdee635fa, 0x465d866c),
- TOBN(0xbc3c224a, 0x18ee6e8a), TOBN(0xeed748a6, 0xed42e02f),
- TOBN(0xe70f930a, 0xd474cd08), TOBN(0x774ea6ec, 0xfff24adf),
- TOBN(0x03e2de1c, 0xf3480d4a), TOBN(0xf0d8edc7, 0xbc8acf1a),
- TOBN(0xf23e3303, 0x68295a9c), TOBN(0xfadd5f68, 0xc546a97d),
- TOBN(0x895597ad, 0x96f8acb1), TOBN(0xbddd49d5, 0x671bdae2),
- TOBN(0x16fcd528, 0x21dd43f4), TOBN(0xa5a45412, 0x6619141a)}
- ,
- {TOBN(0x8ce9b6bf, 0xc360e25a), TOBN(0xe6425195, 0x075a1a78),
- TOBN(0x9dc756a8, 0x481732f4), TOBN(0x83c0440f, 0x5432b57a),
- TOBN(0xc670b3f1, 0xd720281f), TOBN(0x2205910e, 0xd135e051),
- TOBN(0xded14b0e, 0xdb052be7), TOBN(0x697b3d27, 0xc568ea39),
- TOBN(0x2e599b9a, 0xfb3ff9ed), TOBN(0x28c2e0ab, 0x17f6515c),
- TOBN(0x1cbee4fd, 0x474da449), TOBN(0x071279a4, 0x4f364452),
- TOBN(0x97abff66, 0x01fbe855), TOBN(0x3ee394e8, 0x5fda51c4),
- TOBN(0x190385f6, 0x67597c0b), TOBN(0x6e9fccc6, 0xa27ee34b),
- TOBN(0x0b89de93, 0x14092ebb), TOBN(0xf17256bd, 0x428e240c),
- TOBN(0xcf89a7f3, 0x93d2f064), TOBN(0x4f57841e, 0xe1ed3b14),
- TOBN(0x4ee14405, 0xe708d855), TOBN(0x856aae72, 0x03f1c3d0),
- TOBN(0xc8e5424f, 0xbdd7eed5), TOBN(0x3333e4ef, 0x73ab4270),
- TOBN(0x3bc77ade, 0xdda492f8), TOBN(0xc11a3aea, 0x78297205),
- TOBN(0x5e89a3e7, 0x34931b4c), TOBN(0x17512e2e, 0x9f5694bb),
- TOBN(0x5dc349f3, 0x177bf8b6), TOBN(0x232ea4ba, 0x08c7ff3e),
- TOBN(0x9c4f9d16, 0xf511145d), TOBN(0xccf109a3, 0x33b379c3),
- TOBN(0xe75e7a88, 0xa1f25897), TOBN(0x7ac6961f, 0xa1b5d4d8),
- TOBN(0xe3e10773, 0x08f3ed5c), TOBN(0x208a54ec, 0x0a892dfb),
- TOBN(0xbe826e19, 0x78660710), TOBN(0x0cf70a97, 0x237df2c8),
- TOBN(0x418a7340, 0xed704da5), TOBN(0xa3eeb9a9, 0x08ca33fd),
- TOBN(0x49d96233, 0x169bca96), TOBN(0x04d286d4, 0x2da6aafb),
- TOBN(0xc09606ec, 0xa0c2fa94), TOBN(0x8869d0d5, 0x23ff0fb3),
- TOBN(0xa99937e5, 0xd0150d65), TOBN(0xa92e2503, 0x240c14c9),
- TOBN(0x656bf945, 0x108e2d49), TOBN(0x152a733a, 0xa2f59e2b),
- TOBN(0xb4323d58, 0x8434a920), TOBN(0xc0af8e93, 0x622103c5),
- TOBN(0x667518ef, 0x938dbf9a), TOBN(0xa1843073, 0x83a9cdf2),
- TOBN(0x350a94aa, 0x5447ab80), TOBN(0xe5e5a325, 0xc75a3d61),
- TOBN(0x74ba507f, 0x68411a9e), TOBN(0x10581fc1, 0x594f70c5),
- TOBN(0x60e28570, 0x80eb24a9), TOBN(0x7bedfb4d, 0x488e0cfd),
- TOBN(0x721ebbd7, 0xc259cdb8), TOBN(0x0b0da855, 0xbc6390a9),
- TOBN(0x2b4d04db, 0xde314c70), TOBN(0xcdbf1fbc, 0x6c32e846),
- TOBN(0x33833eab, 0xb162fc9e), TOBN(0x9939b48b, 0xb0dd3ab7),
- TOBN(0x5aaa98a7, 0xcb0c9c8c), TOBN(0x75105f30, 0x81c4375c),
- TOBN(0xceee5057, 0x5ef1c90f), TOBN(0xb31e065f, 0xc23a17bf),
- TOBN(0x5364d275, 0xd4b6d45a), TOBN(0xd363f3ad, 0x62ec8996),
- TOBN(0xb5d21239, 0x4391c65b), TOBN(0x84564765, 0xebb41b47),
- TOBN(0x20d18ecc, 0x37107c78), TOBN(0xacff3b6b, 0x570c2a66),
- TOBN(0x22f975d9, 0x9bd0d845), TOBN(0xef0a0c46, 0xba178fa0),
- TOBN(0x1a419651, 0x76b6028e), TOBN(0xc49ec674, 0x248612d4),
- TOBN(0x5b6ac4f2, 0x7338af55), TOBN(0x06145e62, 0x7bee5a36),
- TOBN(0x33e95d07, 0xe75746b5), TOBN(0x1c1e1f6d, 0xc40c78be),
- TOBN(0x967833ef, 0x222ff8e2), TOBN(0x4bedcf6a, 0xb49180ad),
- TOBN(0x6b37e9c1, 0x3d7a4c8a), TOBN(0x2748887c, 0x6ddfe760),
- TOBN(0xf7055123, 0xaa3a5bbc), TOBN(0x954ff225, 0x7bbb8e74),
- TOBN(0xc42b8ab1, 0x97c3dfb9), TOBN(0x55a549b0, 0xcf168154),
- TOBN(0xad6748e7, 0xc1b50692), TOBN(0x2775780f, 0x6fc5cbcb),
- TOBN(0x4eab80b8, 0xe1c9d7c8), TOBN(0x8c69dae1, 0x3fdbcd56),
- TOBN(0x47e6b4fb, 0x9969eace), TOBN(0x002f1085, 0xa705cb5a),
- TOBN(0x4e23ca44, 0x6d3fea55), TOBN(0xb4ae9c86, 0xf4810568),
- TOBN(0x47bfb91b, 0x2a62f27d), TOBN(0x60deb4c9, 0xd9bac28c),
- TOBN(0xa892d894, 0x7de6c34c), TOBN(0x4ee68259, 0x4494587d),
- TOBN(0x914ee14e, 0x1a3f8a5b), TOBN(0xbb113eaa, 0x28700385),
- TOBN(0x81ca03b9, 0x2115b4c9), TOBN(0x7c163d38, 0x8908cad1),
- TOBN(0xc912a118, 0xaa18179a), TOBN(0xe09ed750, 0x886e3081),
- TOBN(0xa676e3fa, 0x26f516ca), TOBN(0x753cacf7, 0x8e732f91),
- TOBN(0x51592aea, 0x833da8b4), TOBN(0xc626f42f, 0x4cbea8aa),
- TOBN(0xef9dc899, 0xa7b56eaf), TOBN(0x00c0e52c, 0x34ef7316),
- TOBN(0x5b1e4e24, 0xfe818a86), TOBN(0x9d31e20d, 0xc538be47),
- TOBN(0x22eb932d, 0x3ed68974), TOBN(0xe44bbc08, 0x7c4e87c4),
- TOBN(0x4121086e, 0x0dde9aef), TOBN(0x8e6b9cff, 0x134f4345),
- TOBN(0x96892c1f, 0x711b0eb9), TOBN(0xb905f2c8, 0x780ab954),
- TOBN(0xace26309, 0xa20792db), TOBN(0xec8ac9b3, 0x0684e126),
- TOBN(0x486ad8b6, 0xb40a2447), TOBN(0x60121fc1, 0x9fe3fb24),
- TOBN(0x5626fccf, 0x1a8e3b3f), TOBN(0x4e568622, 0x6ad1f394),
- TOBN(0xda7aae0d, 0x196aa5a1), TOBN(0xe0df8c77, 0x1041b5fb),
- TOBN(0x451465d9, 0x26b318b7), TOBN(0xc29b6e55, 0x7ab136e9),
- TOBN(0x2c2ab48b, 0x71148463), TOBN(0xb5738de3, 0x64454a76),
- TOBN(0x54ccf9a0, 0x5a03abe4), TOBN(0x377c0296, 0x0427d58e),
- TOBN(0x73f5f0b9, 0x2bb39c1f), TOBN(0x14373f2c, 0xe608d8c5),
- TOBN(0xdcbfd314, 0x00fbb805), TOBN(0xdf18fb20, 0x83afdcfb),
- TOBN(0x81a57f42, 0x42b3523f), TOBN(0xe958532d, 0x87f650fb),
- TOBN(0xaa8dc8b6, 0x8b0a7d7c), TOBN(0x1b75dfb7, 0x150166be),
- TOBN(0x90e4f7c9, 0x2d7d1413), TOBN(0x67e2d6b5, 0x9834f597),
- TOBN(0x4fd4f4f9, 0xa808c3e8), TOBN(0xaf8237e0, 0xd5281ec1),
- TOBN(0x25ab5fdc, 0x84687cee), TOBN(0xc5ded6b1, 0xa5b26c09),
- TOBN(0x8e4a5aec, 0xc8ea7650), TOBN(0x23b73e5c, 0x14cc417f),
- TOBN(0x2bfb4318, 0x3037bf52), TOBN(0xb61e6db5, 0x78c725d7),
- TOBN(0x8efd4060, 0xbbb3e5d7), TOBN(0x2e014701, 0xdbac488e),
- TOBN(0xac75cf9a, 0x360aa449), TOBN(0xb70cfd05, 0x79634d08),
- TOBN(0xa591536d, 0xfffb15ef), TOBN(0xb2c37582, 0xd07c106c),
- TOBN(0xb4293fdc, 0xf50225f9), TOBN(0xc52e175c, 0xb0e12b03),
- TOBN(0xf649c3ba, 0xd0a8bf64), TOBN(0x745a8fef, 0xeb8ae3c6),
- TOBN(0x30d7e5a3, 0x58321bc3), TOBN(0xb1732be7, 0x0bc4df48),
- TOBN(0x1f217993, 0xe9ea5058), TOBN(0xf7a71cde, 0x3e4fd745),
- TOBN(0x86cc533e, 0x894c5bbb), TOBN(0x6915c7d9, 0x69d83082),
- TOBN(0xa6aa2d05, 0x5815c244), TOBN(0xaeeee592, 0x49b22ce5),
- TOBN(0x89e39d13, 0x78135486), TOBN(0x3a275c1f, 0x16b76f2f),
- TOBN(0xdb6bcc1b, 0xe036e8f5), TOBN(0x4df69b21, 0x5e4709f5),
- TOBN(0xa188b250, 0x2d0f39aa), TOBN(0x622118bb, 0x15a85947),
- TOBN(0x2ebf520f, 0xfde0f4fa), TOBN(0xa40e9f29, 0x4860e539),
- TOBN(0x7b6a51eb, 0x22b57f0f), TOBN(0x849a33b9, 0x7e80644a),
- TOBN(0x50e5d16f, 0x1cf095fe), TOBN(0xd754b54e, 0xec55f002),
- TOBN(0x5cfbbb22, 0x236f4a98), TOBN(0x0b0c59e9, 0x066800bb),
- TOBN(0x4ac69a8f, 0x5a9a7774), TOBN(0x2b33f804, 0xd6bec948),
- TOBN(0xb3729295, 0x32e6c466), TOBN(0x68956d0f, 0x4e599c73),
- TOBN(0xa47a249f, 0x155c31cc), TOBN(0x24d80f0d, 0xe1ce284e),
- TOBN(0xcd821dfb, 0x988baf01), TOBN(0xe6331a7d, 0xdbb16647),
- TOBN(0x1eb8ad33, 0x094cb960), TOBN(0x593cca38, 0xc91bbca5),
- TOBN(0x384aac8d, 0x26567456), TOBN(0x40fa0309, 0xc04b6490),
- TOBN(0x97834cd6, 0xdab6c8f6), TOBN(0x68a7318d, 0x3f91e55f),
- TOBN(0xa00fd04e, 0xfc4d3157), TOBN(0xb56f8ab2, 0x2bf3bdea),
- TOBN(0x014f5648, 0x4fa57172), TOBN(0x948c5860, 0x450abdb3),
- TOBN(0x342b5df0, 0x0ebd4f08), TOBN(0x3e5168cd, 0x0e82938e),
- TOBN(0x7aedc1ce, 0xb0df5dd0), TOBN(0x6bbbc6d9, 0xe5732516),
- TOBN(0xc7bfd486, 0x605daaa6), TOBN(0x46fd72b7, 0xbb9a6c9e),
- TOBN(0xe4847fb1, 0xa124fb89), TOBN(0x75959cbd, 0xa2d8ffbc),
- TOBN(0x42579f65, 0xc8a588ee), TOBN(0x368c92e6, 0xb80b499d),
- TOBN(0xea4ef6cd, 0x999a5df1), TOBN(0xaa73bb7f, 0x936fe604),
- TOBN(0xf347a70d, 0x6457d188), TOBN(0x86eda86b, 0x8b7a388b),
- TOBN(0xb7cdff06, 0x0ccd6013), TOBN(0xbeb1b6c7, 0xd0053fb2),
- TOBN(0x0b022387, 0x99240a9f), TOBN(0x1bbb384f, 0x776189b2),
- TOBN(0x8695e71e, 0x9066193a), TOBN(0x2eb50097, 0x06ffac7e),
- TOBN(0x0654a9c0, 0x4a7d2caa), TOBN(0x6f3fb3d1, 0xa5aaa290),
- TOBN(0x835db041, 0xff476e8f), TOBN(0x540b8b0b, 0xc42295e4),
- TOBN(0xa5c73ac9, 0x05e214f5), TOBN(0x9a74075a, 0x56a0b638),
- TOBN(0x2e4b1090, 0xce9e680b), TOBN(0x57a5b479, 0x6b8d9afa),
- TOBN(0x0dca48e7, 0x26bfe65c), TOBN(0x097e391c, 0x7290c307),
- TOBN(0x683c462e, 0x6669e72e), TOBN(0xf505be1e, 0x062559ac),
- TOBN(0x5fbe3ea1, 0xe3a3035a), TOBN(0x6431ebf6, 0x9cd50da8),
- TOBN(0xfd169d5c, 0x1f6407f2), TOBN(0x8d838a95, 0x60fce6b8),
- TOBN(0x2a2bfa7f, 0x650006f0), TOBN(0xdfd7dad3, 0x50c0fbb2),
- TOBN(0x92452495, 0xccf9ad96), TOBN(0x183bf494, 0xd95635f9),
- TOBN(0x02d5df43, 0x4a7bd989), TOBN(0x505385cc, 0xa5431095),
- TOBN(0xdd98e67d, 0xfd43f53e), TOBN(0xd61e1a6c, 0x500c34a9),
- TOBN(0x5a4b46c6, 0x4a8a3d62), TOBN(0x8469c4d0, 0x247743d2),
- TOBN(0x2bb3a13d, 0x88f7e433), TOBN(0x62b23a10, 0x01be5849),
- TOBN(0xe83596b4, 0xa63d1a4c), TOBN(0x454e7fea, 0x7d183f3e),
- TOBN(0x643fce61, 0x17afb01c), TOBN(0x4e65e5e6, 0x1c4c3638),
- TOBN(0x41d85ea1, 0xef74c45b), TOBN(0x2cfbfa66, 0xae328506),
- TOBN(0x98b078f5, 0x3ada7da9), TOBN(0xd985fe37, 0xec752fbb),
- TOBN(0xeece68fe, 0x5a0148b4), TOBN(0x6f9a55c7, 0x2d78136d),
- TOBN(0x232dccc4, 0xd2b729ce), TOBN(0xa27e0dfd, 0x90aafbc4),
- TOBN(0x96474452, 0x12b4603e), TOBN(0xa876c551, 0x6b706d14),
- TOBN(0xdf145fcf, 0x69a9d412), TOBN(0xe2ab75b7, 0x2d479c34),
- TOBN(0x12df9a76, 0x1a23ff97), TOBN(0xc6138992, 0x5d359d10),
- TOBN(0x6e51c7ae, 0xfa835f22), TOBN(0x69a79cb1, 0xc0fcc4d9),
- TOBN(0xf57f350d, 0x594cc7e1), TOBN(0x3079ca63, 0x3350ab79),
- TOBN(0x226fb614, 0x9aff594a), TOBN(0x35afec02, 0x6d59a62b),
- TOBN(0x9bee46f4, 0x06ed2c6e), TOBN(0x58da1735, 0x7d939a57),
- TOBN(0x44c50402, 0x8fd1797e), TOBN(0xd8853e7c, 0x5ccea6ca),
- TOBN(0x4065508d, 0xa35fcd5f), TOBN(0x8965df8c, 0x495ccaeb),
- TOBN(0x0f2da850, 0x12e1a962), TOBN(0xee471b94, 0xc1cf1cc4),
- TOBN(0xcef19bc8, 0x0a08fb75), TOBN(0x704958f5, 0x81de3591),
- TOBN(0x2867f8b2, 0x3aef4f88), TOBN(0x8d749384, 0xea9f9a5f),
- TOBN(0x1b385537, 0x8c9049f4), TOBN(0x5be948f3, 0x7b92d8b6),
- TOBN(0xd96f725d, 0xb6e2bd6b), TOBN(0x37a222bc, 0x958c454d),
- TOBN(0xe7c61abb, 0x8809bf61), TOBN(0x46f07fbc, 0x1346f18d),
- TOBN(0xfb567a7a, 0xe87c0d1c), TOBN(0x84a461c8, 0x7ef3d07a),
- TOBN(0x0a5adce6, 0xd9278d98), TOBN(0x24d94813, 0x9dfc73e1),
- TOBN(0x4f3528b6, 0x054321c3), TOBN(0x2e03fdde, 0x692ea706),
- TOBN(0x10e60619, 0x47b533c0), TOBN(0x1a8bc73f, 0x2ca3c055),
- TOBN(0xae58d4b2, 0x1bb62b8f), TOBN(0xb2045a73, 0x584a24e3),
- TOBN(0x3ab3d5af, 0xbd76e195), TOBN(0x478dd1ad, 0x6938a810),
- TOBN(0x6ffab393, 0x6ee3d5cb), TOBN(0xdfb693db, 0x22b361e4),
- TOBN(0xf9694496, 0x51dbf1a7), TOBN(0xcab4b4ef, 0x08a2e762),
- TOBN(0xe8c92f25, 0xd39bba9a), TOBN(0x850e61bc, 0xf1464d96),
- TOBN(0xb7e830e3, 0xdc09508b), TOBN(0xfaf6d2cf, 0x74317655),
- TOBN(0x72606ceb, 0xdf690355), TOBN(0x48bb92b3, 0xd0c3ded6),
- TOBN(0x65b75484, 0x5c7cf892), TOBN(0xf6cd7ac9, 0xd5d5f01f),
- TOBN(0xc2c30a59, 0x96401d69), TOBN(0x91268650, 0xed921878),
- TOBN(0x380bf913, 0xb78c558f), TOBN(0x43c0baeb, 0xc8afdaa9),
- TOBN(0x377f61d5, 0x54f169d3), TOBN(0xf8da07e3, 0xae5ff20b),
- TOBN(0xb676c49d, 0xa8a90ea8), TOBN(0x81c1ff2b, 0x83a29b21),
- TOBN(0x383297ac, 0x2ad8d276), TOBN(0x3001122f, 0xba89f982),
- TOBN(0xe1d794be, 0x6718e448), TOBN(0x246c1482, 0x7c3e6e13),
- TOBN(0x56646ef8, 0x5d26b5ef), TOBN(0x80f5091e, 0x88069cdd),
- TOBN(0xc5992e2f, 0x724bdd38), TOBN(0x02e915b4, 0x8471e8c7),
- TOBN(0x96ff320a, 0x0d0ff2a9), TOBN(0xbf886487, 0x4384d1a0),
- TOBN(0xbbe1e6a6, 0xc93f72d6), TOBN(0xd5f75d12, 0xcad800ea),
- TOBN(0xfa40a09f, 0xe7acf117), TOBN(0x32c8cdd5, 0x7581a355),
- TOBN(0x74221992, 0x7023c499), TOBN(0xa8afe5d7, 0x38ec3901),
- TOBN(0x5691afcb, 0xa90e83f0), TOBN(0x41bcaa03, 0x0b8f8eac),
- TOBN(0xe38b5ff9, 0x8d2668d5), TOBN(0x0715281a, 0x7ad81965),
- TOBN(0x1bc8fc7c, 0x03c6ce11), TOBN(0xcbbee6e2, 0x8b650436),
- TOBN(0x06b00fe8, 0x0cdb9808), TOBN(0x17d6e066, 0xfe3ed315),
- TOBN(0x2e9d38c6, 0x4d0b5018), TOBN(0xab8bfd56, 0x844dcaef),
- TOBN(0x42894a59, 0x513aed8b), TOBN(0xf77f3b6d, 0x314bd07a),
- TOBN(0xbbdecb8f, 0x8e42b582), TOBN(0xf10e2fa8, 0xd2390fe6),
- TOBN(0xefb95022, 0x62a2f201), TOBN(0x4d59ea50, 0x50ee32b0),
- TOBN(0xd87f7728, 0x6da789a8), TOBN(0xcf98a2cf, 0xf79492c4),
- TOBN(0xf9577239, 0x720943c2), TOBN(0xba044cf5, 0x3990b9d0),
- TOBN(0x5aa8e823, 0x95f2884a), TOBN(0x834de6ed, 0x0278a0af),
- TOBN(0xc8e1ee9a, 0x5f25bd12), TOBN(0x9259ceaa, 0x6f7ab271),
- TOBN(0x7e6d97a2, 0x77d00b76), TOBN(0x5c0c6eea, 0xa437832a),
- TOBN(0x5232c20f, 0x5606b81d), TOBN(0xabd7b375, 0x0d991ee5),
- TOBN(0x4d2bfe35, 0x8632d951), TOBN(0x78f85146, 0x98ed9364),
- TOBN(0x951873f0, 0xf30c3282), TOBN(0x0da8ac80, 0xa789230b),
- TOBN(0x3ac7789c, 0x5398967f), TOBN(0xa69b8f7f, 0xbdda0fb5),
- TOBN(0xe5db7717, 0x6add8545), TOBN(0x1b71cb66, 0x72c49b66),
- TOBN(0xd8560739, 0x68421d77), TOBN(0x03840fe8, 0x83e3afea),
- TOBN(0xb391dad5, 0x1ec69977), TOBN(0xae243fb9, 0x307f6726),
- TOBN(0xc88ac87b, 0xe8ca160c), TOBN(0x5174cced, 0x4ce355f4),
- TOBN(0x98a35966, 0xe58ba37d), TOBN(0xfdcc8da2, 0x7817335d),
- TOBN(0x5b752830, 0x83fbc7bf), TOBN(0x68e419d4, 0xd9c96984),
- TOBN(0x409a39f4, 0x02a40380), TOBN(0x88940faf, 0x1fe977bc),
- TOBN(0xc640a94b, 0x8f8edea6), TOBN(0x1e22cd17, 0xed11547d),
- TOBN(0xe28568ce, 0x59ffc3e2), TOBN(0x60aa1b55, 0xc1dee4e7),
- TOBN(0xc67497c8, 0x837cb363), TOBN(0x06fb438a, 0x105a2bf2),
- TOBN(0x30357ec4, 0x500d8e20), TOBN(0x1ad9095d, 0x0670db10),
- TOBN(0x7f589a05, 0xc73b7cfd), TOBN(0xf544607d, 0x880d6d28),
- TOBN(0x17ba93b1, 0xa20ef103), TOBN(0xad859130, 0x6ba6577b),
- TOBN(0x65c91cf6, 0x6fa214a0), TOBN(0xd7d49c6c, 0x27990da5),
- TOBN(0xecd9ec8d, 0x20bb569d), TOBN(0xbd4b2502, 0xeeffbc33),
- TOBN(0x2056ca5a, 0x6bed0467), TOBN(0x7916a1f7, 0x5b63728c),
- TOBN(0xd4f9497d, 0x53a4f566), TOBN(0x89734664, 0x97b56810),
- TOBN(0xf8e1da74, 0x0494a621), TOBN(0x82546a93, 0x8d011c68),
- TOBN(0x1f3acb19, 0xc61ac162), TOBN(0x52f8fa9c, 0xabad0d3e),
- TOBN(0x15356523, 0xb4b7ea43), TOBN(0x5a16ad61, 0xae608125),
- TOBN(0xb0bcb87f, 0x4faed184), TOBN(0x5f236b1d, 0x5029f45f),
- TOBN(0xd42c7607, 0x0bc6b1fc), TOBN(0xc644324e, 0x68aefce3),
- TOBN(0x8e191d59, 0x5c5d8446), TOBN(0xc0208077, 0x13ae1979),
- TOBN(0xadcaee55, 0x3ba59cc7), TOBN(0x20ed6d6b, 0xa2cb81ba),
- TOBN(0x0952ba19, 0xb6efcffc), TOBN(0x60f12d68, 0x97c0b87c),
- TOBN(0x4ee2c7c4, 0x9caa30bc), TOBN(0x767238b7, 0x97fbff4e),
- TOBN(0xebc73921, 0x501b5d92), TOBN(0x3279e3df, 0xc2a37737),
- TOBN(0x9fc12bc8, 0x6d197543), TOBN(0xfa94dc6f, 0x0a40db4e),
- TOBN(0x7392b41a, 0x530ccbbd), TOBN(0x87c82146, 0xea823525),
- TOBN(0xa52f984c, 0x05d98d0c), TOBN(0x2ae57d73, 0x5ef6974c),
- TOBN(0x9377f7bf, 0x3042a6dd), TOBN(0xb1a007c0, 0x19647a64),
- TOBN(0xfaa9079a, 0x0cca9767), TOBN(0x3d81a25b, 0xf68f72d5),
- TOBN(0x752067f8, 0xff81578e), TOBN(0x78622150, 0x9045447d),
- TOBN(0xc0c22fcf, 0x0505aa6f), TOBN(0x1030f0a6, 0x6bed1c77),
- TOBN(0x31f29f15, 0x1f0bd739), TOBN(0x2d7989c7, 0xe6debe85),
- TOBN(0x5c070e72, 0x8e677e98), TOBN(0x0a817bd3, 0x06e81fd5),
- TOBN(0xc110d830, 0xb0f2ac95), TOBN(0x48d0995a, 0xab20e64e),
- TOBN(0x0f3e00e1, 0x7729cd9a), TOBN(0x2a570c20, 0xdd556946),
- TOBN(0x912dbcfd, 0x4e86214d), TOBN(0x2d014ee2, 0xcf615498),
- TOBN(0x55e2b1e6, 0x3530d76e), TOBN(0xc5135ae4, 0xfd0fd6d1),
- TOBN(0x0066273a, 0xd4f3049f), TOBN(0xbb8e9893, 0xe7087477),
- TOBN(0x2dba1ddb, 0x14c6e5fd), TOBN(0xdba37886, 0x51f57e6c),
- TOBN(0x5aaee0a6, 0x5a72f2cf), TOBN(0x1208bfbf, 0x7bea5642),
- TOBN(0xf5c6aa3b, 0x67872c37), TOBN(0xd726e083, 0x43f93224),
- TOBN(0x1854daa5, 0x061f1658), TOBN(0xc0016df1, 0xdf0cd2b3),
- TOBN(0xc2a3f23e, 0x833d50de), TOBN(0x73b681d2, 0xbbbd3017),
- TOBN(0x2f046dc4, 0x3ac343c0), TOBN(0x9c847e7d, 0x85716421),
- TOBN(0xe1e13c91, 0x0917eed4), TOBN(0x3fc9eebd, 0x63a1b9c6),
- TOBN(0x0f816a72, 0x7fe02299), TOBN(0x6335ccc2, 0x294f3319),
- TOBN(0x3820179f, 0x4745c5be), TOBN(0xe647b782, 0x922f066e),
- TOBN(0xc22e49de, 0x02cafb8a), TOBN(0x299bc2ff, 0xfcc2eccc),
- TOBN(0x9a8feea2, 0x6e0e8282), TOBN(0xa627278b, 0xfe893205),
- TOBN(0xa7e19733, 0x7933e47b), TOBN(0xf4ff6b13, 0x2e766402),
- TOBN(0xa4d8be0a, 0x98440d9f), TOBN(0x658f5c2f, 0x38938808),
- TOBN(0x90b75677, 0xc95b3b3e), TOBN(0xfa044269, 0x3137b6ff),
- TOBN(0x077b039b, 0x43c47c29), TOBN(0xcca95dd3, 0x8a6445b2),
- TOBN(0x0b498ba4, 0x2333fc4c), TOBN(0x274f8e68, 0xf736a1b1),
- TOBN(0x6ca348fd, 0x5f1d4b2e), TOBN(0x24d3be78, 0xa8f10199),
- TOBN(0x8535f858, 0xca14f530), TOBN(0xa6e7f163, 0x5b982e51),
- TOBN(0x847c8512, 0x36e1bf62), TOBN(0xf6a7c58e, 0x03448418),
- TOBN(0x583f3703, 0xf9374ab6), TOBN(0x864f9195, 0x6e564145),
- TOBN(0x33bc3f48, 0x22526d50), TOBN(0x9f323c80, 0x1262a496),
- TOBN(0xaa97a7ae, 0x3f046a9a), TOBN(0x70da183e, 0xdf8a039a),
- TOBN(0x5b68f71c, 0x52aa0ba6), TOBN(0x9be0fe51, 0x21459c2d),
- TOBN(0xc1e17eb6, 0xcbc613e5), TOBN(0x33131d55, 0x497ea61c),
- TOBN(0x2f69d39e, 0xaf7eded5), TOBN(0x73c2f434, 0xde6af11b),
- TOBN(0x4ca52493, 0xa4a375fa), TOBN(0x5f06787c, 0xb833c5c2),
- TOBN(0x814e091f, 0x3e6e71cf), TOBN(0x76451f57, 0x8b746666)}
- ,
- {TOBN(0x80f9bdef, 0x694db7e0), TOBN(0xedca8787, 0xb9fcddc6),
- TOBN(0x51981c34, 0x03b8dce1), TOBN(0x4274dcf1, 0x70e10ba1),
- TOBN(0xf72743b8, 0x6def6d1a), TOBN(0xd25b1670, 0xebdb1866),
- TOBN(0xc4491e8c, 0x050c6f58), TOBN(0x2be2b2ab, 0x87fbd7f5),
- TOBN(0x3e0e5c9d, 0xd111f8ec), TOBN(0xbcc33f8d, 0xb7c4e760),
- TOBN(0x702f9a91, 0xbd392a51), TOBN(0x7da4a795, 0xc132e92d),
- TOBN(0x1a0b0ae3, 0x0bb1151b), TOBN(0x54febac8, 0x02e32251),
- TOBN(0xea3a5082, 0x694e9e78), TOBN(0xe58ffec1, 0xe4fe40b8),
- TOBN(0xf85592fc, 0xd1e0cf9e), TOBN(0xdea75f0d, 0xc0e7b2e8),
- TOBN(0xc04215cf, 0xc135584e), TOBN(0x174fc727, 0x2f57092a),
- TOBN(0xe7277877, 0xeb930bea), TOBN(0x504caccb, 0x5eb02a5a),
- TOBN(0xf9fe08f7, 0xf5241b9b), TOBN(0xe7fb62f4, 0x8d5ca954),
- TOBN(0xfbb8349d, 0x29c4120b), TOBN(0x9f94391f, 0xc0d0d915),
- TOBN(0xc4074fa7, 0x5410ba51), TOBN(0xa66adbf6, 0x150a5911),
- TOBN(0xc164543c, 0x34bfca38), TOBN(0xe0f27560, 0xb9e1ccfc),
- TOBN(0x99da0f53, 0xe820219c), TOBN(0xe8234498, 0xc6b4997a),
- TOBN(0xcfb88b76, 0x9d4c5423), TOBN(0x9e56eb10, 0xb0521c49),
- TOBN(0x418e0b5e, 0xbe8700a1), TOBN(0x00cbaad6, 0xf93cb58a),
- TOBN(0xe923fbde, 0xd92a5e67), TOBN(0xca4979ac, 0x1f347f11),
- TOBN(0x89162d85, 0x6bc0585b), TOBN(0xdd6254af, 0xac3c70e3),
- TOBN(0x7b23c513, 0x516e19e4), TOBN(0x56e2e847, 0xc5c4d593),
- TOBN(0x9f727d73, 0x5ce71ef6), TOBN(0x5b6304a6, 0xf79a44c5),
- TOBN(0x6638a736, 0x3ab7e433), TOBN(0x1adea470, 0xfe742f83),
- TOBN(0xe054b854, 0x5b7fc19f), TOBN(0xf935381a, 0xba1d0698),
- TOBN(0x546eab2d, 0x799e9a74), TOBN(0x96239e0e, 0xa949f729),
- TOBN(0xca274c6b, 0x7090055a), TOBN(0x835142c3, 0x9020c9b0),
- TOBN(0xa405667a, 0xa2e8807f), TOBN(0x29f2c085, 0x1aa3d39e),
- TOBN(0xcc555d64, 0x42fc72f5), TOBN(0xe856e0e7, 0xfbeacb3c),
- TOBN(0xb5504f9d, 0x918e4936), TOBN(0x65035ef6, 0xb2513982),
- TOBN(0x0553a0c2, 0x6f4d9cb9), TOBN(0x6cb10d56, 0xbea85509),
- TOBN(0x48d957b7, 0xa242da11), TOBN(0x16a4d3dd, 0x672b7268),
- TOBN(0x3d7e637c, 0x8502a96b), TOBN(0x27c7032b, 0x730d463b),
- TOBN(0xbdc02b18, 0xe4136a14), TOBN(0xbacf969d, 0x678e32bf),
- TOBN(0xc98d89a3, 0xdd9c3c03), TOBN(0x7b92420a, 0x23becc4f),
- TOBN(0xd4b41f78, 0xc64d565c), TOBN(0x9f969d00, 0x10f28295),
- TOBN(0xec7f7f76, 0xb13d051a), TOBN(0x08945e1e, 0xa92da585),
- TOBN(0x55366b7d, 0x5846426f), TOBN(0xe7d09e89, 0x247d441d),
- TOBN(0x510b404d, 0x736fbf48), TOBN(0x7fa003d0, 0xe784bd7d),
- TOBN(0x25f7614f, 0x17fd9596), TOBN(0x49e0e0a1, 0x35cb98db),
- TOBN(0x2c65957b, 0x2e83a76a), TOBN(0x5d40da8d, 0xcddbe0f8),
- TOBN(0xf2b8c405, 0x050bad24), TOBN(0x8918426d, 0xc2aa4823),
- TOBN(0x2aeab3dd, 0xa38365a7), TOBN(0x72031717, 0x7c91b690),
- TOBN(0x8b00d699, 0x60a94120), TOBN(0x478a255d, 0xe99eaeec),
- TOBN(0xbf656a5f, 0x6f60aafd), TOBN(0xdfd7cb75, 0x5dee77b3),
- TOBN(0x37f68bb4, 0xa595939d), TOBN(0x03556479, 0x28740217),
- TOBN(0x8e740e7c, 0x84ad7612), TOBN(0xd89bc843, 0x9044695f),
- TOBN(0xf7f3da5d, 0x85a9184d), TOBN(0x562563bb, 0x9fc0b074),
- TOBN(0x06d2e6aa, 0xf88a888e), TOBN(0x612d8643, 0x161fbe7c),
- TOBN(0x465edba7, 0xf64085e7), TOBN(0xb230f304, 0x29aa8511),
- TOBN(0x53388426, 0xcda2d188), TOBN(0x90885735, 0x4b666649),
- TOBN(0x6f02ff9a, 0x652f54f6), TOBN(0x65c82294, 0x5fae2bf0),
- TOBN(0x7816ade0, 0x62f5eee3), TOBN(0xdcdbdf43, 0xfcc56d70),
- TOBN(0x9fb3bba3, 0x54530bb2), TOBN(0xbde3ef77, 0xcb0869ea),
- TOBN(0x89bc9046, 0x0b431163), TOBN(0x4d03d7d2, 0xe4819a35),
- TOBN(0x33ae4f9e, 0x43b6a782), TOBN(0x216db307, 0x9c88a686),
- TOBN(0x91dd88e0, 0x00ffedd9), TOBN(0xb280da9f, 0x12bd4840),
- TOBN(0x32a7cb8a, 0x1635e741), TOBN(0xfe14008a, 0x78be02a7),
- TOBN(0x3fafb334, 0x1b7ae030), TOBN(0x7fd508e7, 0x5add0ce9),
- TOBN(0x72c83219, 0xd607ad51), TOBN(0x0f229c0a, 0x8d40964a),
- TOBN(0x1be2c336, 0x1c878da2), TOBN(0xe0c96742, 0xeab2ab86),
- TOBN(0x458f8691, 0x3e538cd7), TOBN(0xa7001f6c, 0x8e08ad53),
- TOBN(0x52b8c6e6, 0xbf5d15ff), TOBN(0x548234a4, 0x011215dd),
- TOBN(0xff5a9d2d, 0x3d5b4045), TOBN(0xb0ffeeb6, 0x4a904190),
- TOBN(0x55a3aca4, 0x48607f8b), TOBN(0x8cbd665c, 0x30a0672a),
- TOBN(0x87f834e0, 0x42583068), TOBN(0x02da2aeb, 0xf3f6e683),
- TOBN(0x6b763e5d, 0x05c12248), TOBN(0x7230378f, 0x65a8aefc),
- TOBN(0x93bd80b5, 0x71e8e5ca), TOBN(0x53ab041c, 0xb3b62524),
- TOBN(0x1b860513, 0x6c9c552e), TOBN(0xe84d402c, 0xd5524e66),
- TOBN(0xa37f3573, 0xf37f5937), TOBN(0xeb0f6c7d, 0xd1e4fca5),
- TOBN(0x2965a554, 0xac8ab0fc), TOBN(0x17fbf56c, 0x274676ac),
- TOBN(0x2e2f6bd9, 0xacf7d720), TOBN(0x41fc8f88, 0x10224766),
- TOBN(0x517a14b3, 0x85d53bef), TOBN(0xdae327a5, 0x7d76a7d1),
- TOBN(0x6ad0a065, 0xc4818267), TOBN(0x33aa189b, 0x37c1bbc1),
- TOBN(0x64970b52, 0x27392a92), TOBN(0x21699a1c, 0x2d1535ea),
- TOBN(0xcd20779c, 0xc2d7a7fd), TOBN(0xe3186059, 0x99c83cf2),
- TOBN(0x9b69440b, 0x72c0b8c7), TOBN(0xa81497d7, 0x7b9e0e4d),
- TOBN(0x515d5c89, 0x1f5f82dc), TOBN(0x9a7f67d7, 0x6361079e),
- TOBN(0xa8da81e3, 0x11a35330), TOBN(0xe44990c4, 0x4b18be1b),
- TOBN(0xc7d5ed95, 0xaf103e59), TOBN(0xece8aba7, 0x8dac9261),
- TOBN(0xbe82b099, 0x9394b8d3), TOBN(0x6830f09a, 0x16adfe83),
- TOBN(0x250a29b4, 0x88172d01), TOBN(0x8b20bd65, 0xcaff9e02),
- TOBN(0xb8a7661e, 0xe8a6329a), TOBN(0x4520304d, 0xd3fce920),
- TOBN(0xae45da1f, 0x2b47f7ef), TOBN(0xe07f5288, 0x5bffc540),
- TOBN(0xf7997009, 0x3464f874), TOBN(0x2244c2cd, 0xa6fa1f38),
- TOBN(0x43c41ac1, 0x94d7d9b1), TOBN(0x5bafdd82, 0xc82e7f17),
- TOBN(0xdf0614c1, 0x5fda0fca), TOBN(0x74b043a7, 0xa8ae37ad),
- TOBN(0x3ba6afa1, 0x9e71734c), TOBN(0x15d5437e, 0x9c450f2e),
- TOBN(0x4a5883fe, 0x67e242b1), TOBN(0x5143bdc2, 0x2c1953c2),
- TOBN(0x542b8b53, 0xfc5e8920), TOBN(0x363bf9a8, 0x9a9cee08),
- TOBN(0x02375f10, 0xc3486e08), TOBN(0x2037543b, 0x8c5e70d2),
- TOBN(0x7109bccc, 0x625640b4), TOBN(0xcbc1051e, 0x8bc62c3b),
- TOBN(0xf8455fed, 0x803f26ea), TOBN(0x6badceab, 0xeb372424),
- TOBN(0xa2a9ce7c, 0x6b53f5f9), TOBN(0x64246595, 0x1b176d99),
- TOBN(0xb1298d36, 0xb95c081b), TOBN(0x53505bb8, 0x1d9a9ee6),
- TOBN(0x3f6f9e61, 0xf2ba70b0), TOBN(0xd07e16c9, 0x8afad453),
- TOBN(0x9f1694bb, 0xe7eb4a6a), TOBN(0xdfebced9, 0x3cb0bc8e),
- TOBN(0x92d3dcdc, 0x53868c8b), TOBN(0x174311a2, 0x386107a6),
- TOBN(0x4109e07c, 0x689b4e64), TOBN(0x30e4587f, 0x2df3dcb6),
- TOBN(0x841aea31, 0x0811b3b2), TOBN(0x6144d41d, 0x0cce43ea),
- TOBN(0x464c4581, 0x2a9a7803), TOBN(0xd03d371f, 0x3e158930),
- TOBN(0xc676d7f2, 0xb1f3390b), TOBN(0x9f7a1b8c, 0xa5b61272),
- TOBN(0x4ebebfc9, 0xc2e127a9), TOBN(0x4602500c, 0x5dd997bf),
- TOBN(0x7f09771c, 0x4711230f), TOBN(0x058eb37c, 0x020f09c1),
- TOBN(0xab693d4b, 0xfee5e38b), TOBN(0x9289eb1f, 0x4653cbc0),
- TOBN(0xbecf46ab, 0xd51b9cf5), TOBN(0xd2aa9c02, 0x9f0121af),
- TOBN(0x36aaf7d2, 0xe90dc274), TOBN(0x909e4ea0, 0x48b95a3c),
- TOBN(0xe6b70496, 0x6f32dbdb), TOBN(0x672188a0, 0x8b030b3e),
- TOBN(0xeeffe5b3, 0xcfb617e2), TOBN(0x87e947de, 0x7c82709e),
- TOBN(0xa44d2b39, 0x1770f5a7), TOBN(0xe4d4d791, 0x0e44eb82),
- TOBN(0x42e69d1e, 0x3f69712a), TOBN(0xbf11c4d6, 0xac6a820e),
- TOBN(0xb5e7f3e5, 0x42c4224c), TOBN(0xd6b4e81c, 0x449d941c),
- TOBN(0x5d72bd16, 0x5450e878), TOBN(0x6a61e28a, 0xee25ac54),
- TOBN(0x33272094, 0xe6f1cd95), TOBN(0x7512f30d, 0x0d18673f),
- TOBN(0x32f7a4ca, 0x5afc1464), TOBN(0x2f095656, 0x6bbb977b),
- TOBN(0x586f47ca, 0xa8226200), TOBN(0x02c868ad, 0x1ac07369),
- TOBN(0x4ef2b845, 0xc613acbe), TOBN(0x43d7563e, 0x0386054c),
- TOBN(0x54da9dc7, 0xab952578), TOBN(0xb5423df2, 0x26e84d0b),
- TOBN(0xa8b64eeb, 0x9b872042), TOBN(0xac205782, 0x5990f6df),
- TOBN(0x4ff696eb, 0x21f4c77a), TOBN(0x1a79c3e4, 0xaab273af),
- TOBN(0x29bc922e, 0x9436b3f1), TOBN(0xff807ef8, 0xd6d9a27a),
- TOBN(0x82acea3d, 0x778f22a0), TOBN(0xfb10b2e8, 0x5b5e7469),
- TOBN(0xc0b16980, 0x2818ee7d), TOBN(0x011afff4, 0xc91c1a2f),
- TOBN(0x95a6d126, 0xad124418), TOBN(0x31c081a5, 0xe72e295f),
- TOBN(0x36bb283a, 0xf2f4db75), TOBN(0xd115540f, 0x7acef462),
- TOBN(0xc7f3a8f8, 0x33f6746c), TOBN(0x21e46f65, 0xfea990ca),
- TOBN(0x915fd5c5, 0xcaddb0a9), TOBN(0xbd41f016, 0x78614555),
- TOBN(0x346f4434, 0x426ffb58), TOBN(0x80559436, 0x14dbc204),
- TOBN(0xf3dd20fe, 0x5a969b7f), TOBN(0x9d59e956, 0xe899a39a),
- TOBN(0xf1b0971c, 0x8ad4cf4b), TOBN(0x03448860, 0x2ffb8fb8),
- TOBN(0xf071ac3c, 0x65340ba4), TOBN(0x408d0596, 0xb27fd758),
- TOBN(0xe7c78ea4, 0x98c364b0), TOBN(0xa4aac4a5, 0x051e8ab5),
- TOBN(0xb9e1d560, 0x485d9002), TOBN(0x9acd518a, 0x88844455),
- TOBN(0xe4ca688f, 0xd06f56c0), TOBN(0xa48af70d, 0xdf027972),
- TOBN(0x691f0f04, 0x5e9a609d), TOBN(0xa9dd82cd, 0xee61270e),
- TOBN(0x8903ca63, 0xa0ef18d3), TOBN(0x9fb7ee35, 0x3d6ca3bd),
- TOBN(0xa7b4a09c, 0xabf47d03), TOBN(0x4cdada01, 0x1c67de8e),
- TOBN(0x52003749, 0x9355a244), TOBN(0xe77fd2b6, 0x4f2151a9),
- TOBN(0x695d6cf6, 0x66b4efcb), TOBN(0xc5a0cacf, 0xda2cfe25),
- TOBN(0x104efe5c, 0xef811865), TOBN(0xf52813e8, 0x9ea5cc3d),
- TOBN(0x855683dc, 0x40b58dbc), TOBN(0x0338ecde, 0x175fcb11),
- TOBN(0xf9a05637, 0x74921592), TOBN(0xb4f1261d, 0xb9bb9d31),
- TOBN(0x551429b7, 0x4e9c5459), TOBN(0xbe182e6f, 0x6ea71f53),
- TOBN(0xd3a3b07c, 0xdfc50573), TOBN(0x9ba1afda, 0x62be8d44),
- TOBN(0x9bcfd2cb, 0x52ab65d3), TOBN(0xdf11d547, 0xa9571802),
- TOBN(0x099403ee, 0x02a2404a), TOBN(0x497406f4, 0x21088a71),
- TOBN(0x99479409, 0x5004ae71), TOBN(0xbdb42078, 0xa812c362),
- TOBN(0x2b72a30f, 0xd8828442), TOBN(0x283add27, 0xfcb5ed1c),
- TOBN(0xf7c0e200, 0x66a40015), TOBN(0x3e3be641, 0x08b295ef),
- TOBN(0xac127dc1, 0xe038a675), TOBN(0x729deff3, 0x8c5c6320),
- TOBN(0xb7df8fd4, 0xa90d2c53), TOBN(0x9b74b0ec, 0x681e7cd3),
- TOBN(0x5cb5a623, 0xdab407e5), TOBN(0xcdbd3615, 0x76b340c6),
- TOBN(0xa184415a, 0x7d28392c), TOBN(0xc184c1d8, 0xe96f7830),
- TOBN(0xc3204f19, 0x81d3a80f), TOBN(0xfde0c841, 0xc8e02432),
- TOBN(0x78203b3e, 0x8149e0c1), TOBN(0x5904bdbb, 0x08053a73),
- TOBN(0x30fc1dd1, 0x101b6805), TOBN(0x43c223bc, 0x49aa6d49),
- TOBN(0x9ed67141, 0x7a174087), TOBN(0x311469a0, 0xd5997008),
- TOBN(0xb189b684, 0x5e43fc61), TOBN(0xf3282375, 0xe0d3ab57),
- TOBN(0x4fa34b67, 0xb1181da8), TOBN(0x621ed0b2, 0x99ee52b8),
- TOBN(0x9b178de1, 0xad990676), TOBN(0xd51de67b, 0x56d54065),
- TOBN(0x2a2c27c4, 0x7538c201), TOBN(0x33856ec8, 0x38a40f5c),
- TOBN(0x2522fc15, 0xbe6cdcde), TOBN(0x1e603f33, 0x9f0c6f89),
- TOBN(0x7994edc3, 0x103e30a6), TOBN(0x033a00db, 0x220c853e),
- TOBN(0xd3cfa409, 0xf7bb7fd7), TOBN(0x70f8781e, 0x462d18f6),
- TOBN(0xbbd82980, 0x687fe295), TOBN(0x6eef4c32, 0x595669f3),
- TOBN(0x86a9303b, 0x2f7e85c3), TOBN(0x5fce4621, 0x71988f9b),
- TOBN(0x5b935bf6, 0xc138acb5), TOBN(0x30ea7d67, 0x25661212),
- TOBN(0xef1eb5f4, 0xe51ab9a2), TOBN(0x0587c98a, 0xae067c78),
- TOBN(0xb3ce1b3c, 0x77ca9ca6), TOBN(0x2a553d4d, 0x54b5f057),
- TOBN(0xc7898236, 0x4da29ec2), TOBN(0xdbdd5d13, 0xb9c57316),
- TOBN(0xc57d6e6b, 0x2cd80d47), TOBN(0x80b460cf, 0xfe9e7391),
- TOBN(0x98648cab, 0xf963c31e), TOBN(0x67f9f633, 0xcc4d32fd),
- TOBN(0x0af42a9d, 0xfdf7c687), TOBN(0x55f292a3, 0x0b015ea7),
- TOBN(0x89e468b2, 0xcd21ab3d), TOBN(0xe504f022, 0xc393d392),
- TOBN(0xab21e1d4, 0xa5013af9), TOBN(0xe3283f78, 0xc2c28acb),
- TOBN(0xf38b35f6, 0x226bf99f), TOBN(0xe8354274, 0x0e291e69),
- TOBN(0x61673a15, 0xb20c162d), TOBN(0xc101dc75, 0xb04fbdbe),
- TOBN(0x8323b4c2, 0x255bd617), TOBN(0x6c969693, 0x6c2a9154),
- TOBN(0xc6e65860, 0x62679387), TOBN(0x8e01db0c, 0xb8c88e23),
- TOBN(0x33c42873, 0x893a5559), TOBN(0x7630f04b, 0x47a3e149),
- TOBN(0xb5d80805, 0xddcf35f8), TOBN(0x582ca080, 0x77dfe732),
- TOBN(0x2c7156e1, 0x0b1894a0), TOBN(0x92034001, 0xd81c68c0),
- TOBN(0xed225d00, 0xc8b115b5), TOBN(0x237f9c22, 0x83b907f2),
- TOBN(0x0ea2f32f, 0x4470e2c0), TOBN(0xb725f7c1, 0x58be4e95),
- TOBN(0x0f1dcafa, 0xb1ae5463), TOBN(0x59ed5187, 0x1ba2fc04),
- TOBN(0xf6e0f316, 0xd0115d4d), TOBN(0x5180b12f, 0xd3691599),
- TOBN(0x157e32c9, 0x527f0a41), TOBN(0x7b0b081d, 0xa8e0ecc0),
- TOBN(0x6dbaaa8a, 0xbf4f0dd0), TOBN(0x99b289c7, 0x4d252696),
- TOBN(0x79b7755e, 0xdbf864fe), TOBN(0x6974e2b1, 0x76cad3ab),
- TOBN(0x35dbbee2, 0x06ddd657), TOBN(0xe7cbdd11, 0x2ff3a96d),
- TOBN(0x88381968, 0x076be758), TOBN(0x2d737e72, 0x08c91f5d),
- TOBN(0x5f83ab62, 0x86ec3776), TOBN(0x98aa649d, 0x945fa7a1),
- TOBN(0xf477ec37, 0x72ef0933), TOBN(0x66f52b1e, 0x098c17b1),
- TOBN(0x9eec58fb, 0xd803738b), TOBN(0x91aaade7, 0xe4e86aa4),
- TOBN(0x6b1ae617, 0xa5b51492), TOBN(0x63272121, 0xbbc45974),
- TOBN(0x7e0e28f0, 0x862c5129), TOBN(0x0a8f79a9, 0x3321a4a0),
- TOBN(0xe26d1664, 0x5041c88f), TOBN(0x0571b805, 0x53233e3a),
- TOBN(0xd1b0ccde, 0xc9520711), TOBN(0x55a9e4ed, 0x3c8b84bf),
- TOBN(0x9426bd39, 0xa1fef314), TOBN(0x4f5f638e, 0x6eb93f2b),
- TOBN(0xba2a1ed3, 0x2bf9341b), TOBN(0xd63c1321, 0x4d42d5a9),
- TOBN(0xd2964a89, 0x316dc7c5), TOBN(0xd1759606, 0xca511851),
- TOBN(0xd8a9201f, 0xf9e6ed35), TOBN(0xb7b5ee45, 0x6736925a),
- TOBN(0x0a83fbbc, 0x99581af7), TOBN(0x3076bc40, 0x64eeb051),
- TOBN(0x5511c98c, 0x02dec312), TOBN(0x270de898, 0x238dcb78),
- TOBN(0x2cf4cf9c, 0x539c08c9), TOBN(0xa70cb65e, 0x38d3b06e),
- TOBN(0xb12ec10e, 0xcfe57bbd), TOBN(0x82c7b656, 0x35a0c2b5),
- TOBN(0xddc7d5cd, 0x161c67bd), TOBN(0xe32e8985, 0xae3a32cc),
- TOBN(0x7aba9444, 0xd11a5529), TOBN(0xe964ed02, 0x2427fa1a),
- TOBN(0x1528392d, 0x24a1770a), TOBN(0xa152ce2c, 0x12c72fcd),
- TOBN(0x714553a4, 0x8ec07649), TOBN(0x18b4c290, 0x459dd453),
- TOBN(0xea32b714, 0x7b64b110), TOBN(0xb871bfa5, 0x2e6f07a2),
- TOBN(0xb67112e5, 0x9e2e3c9b), TOBN(0xfbf250e5, 0x44aa90f6),
- TOBN(0xf77aedb8, 0xbd539006), TOBN(0x3b0cdf9a, 0xd172a66f),
- TOBN(0xedf69fea, 0xf8c51187), TOBN(0x05bb67ec, 0x741e4da7),
- TOBN(0x47df0f32, 0x08114345), TOBN(0x56facb07, 0xbb9792b1),
- TOBN(0xf3e007e9, 0x8f6229e4), TOBN(0x62d103f4, 0x526fba0f),
- TOBN(0x4f33bef7, 0xb0339d79), TOBN(0x9841357b, 0xb59bfec1),
- TOBN(0xfa8dbb59, 0xc34e6705), TOBN(0xc3c7180b, 0x7fdaa84c),
- TOBN(0xf95872fc, 0xa4108537), TOBN(0x8750cc3b, 0x932a3e5a),
- TOBN(0xb61cc69d, 0xb7275d7d), TOBN(0xffa0168b, 0x2e59b2e9),
- TOBN(0xca032abc, 0x6ecbb493), TOBN(0x1d86dbd3, 0x2c9082d8),
- TOBN(0xae1e0b67, 0xe28ef5ba), TOBN(0x2c9a4699, 0xcb18e169),
- TOBN(0x0ecd0e33, 0x1e6bbd20), TOBN(0x571b360e, 0xaf5e81d2),
- TOBN(0xcd9fea58, 0x101c1d45), TOBN(0x6651788e, 0x18880452),
- TOBN(0xa9972635, 0x1f8dd446), TOBN(0x44bed022, 0xe37281d0),
- TOBN(0x094b2b2d, 0x33da525d), TOBN(0xf193678e, 0x13144fd8),
- TOBN(0xb8ab5ba4, 0xf4c1061d), TOBN(0x4343b5fa, 0xdccbe0f4),
- TOBN(0xa8702371, 0x63812713), TOBN(0x47bf6d2d, 0xf7611d93),
- TOBN(0x46729b8c, 0xbd21e1d7), TOBN(0x7484d4e0, 0xd629e77d),
- TOBN(0x830e6eea, 0x60dbac1f), TOBN(0x23d8c484, 0xda06a2f7),
- TOBN(0x896714b0, 0x50ca535b), TOBN(0xdc8d3644, 0xebd97a9b),
- TOBN(0x106ef9fa, 0xb12177b4), TOBN(0xf79bf464, 0x534d5d9c),
- TOBN(0x2537a349, 0xa6ab360b), TOBN(0xc7c54253, 0xa00c744f),
- TOBN(0xb3c7a047, 0xe5911a76), TOBN(0x61ffa5c8, 0x647f1ee7),
- TOBN(0x15aed36f, 0x8f56ab42), TOBN(0x6a0d41b0, 0xa3ff9ac9),
- TOBN(0x68f469f5, 0xcc30d357), TOBN(0xbe9adf81, 0x6b72be96),
- TOBN(0x1cd926fe, 0x903ad461), TOBN(0x7e89e38f, 0xcaca441b),
- TOBN(0xf0f82de5, 0xfacf69d4), TOBN(0x363b7e76, 0x4775344c),
- TOBN(0x6894f312, 0xb2e36d04), TOBN(0x3c6cb4fe, 0x11d1c9a5),
- TOBN(0x85d9c339, 0x4008e1f2), TOBN(0x5e9a85ea, 0x249f326c),
- TOBN(0xdc35c60a, 0x678c5e06), TOBN(0xc08b944f, 0x9f86fba9),
- TOBN(0xde40c02c, 0x89f71f0f), TOBN(0xad8f3e31, 0xff3da3c0),
- TOBN(0x3ea5096b, 0x42125ded), TOBN(0x13879cbf, 0xa7379183),
- TOBN(0x6f4714a5, 0x6b306a0b), TOBN(0x359c2ea6, 0x67646c5e),
- TOBN(0xfacf8943, 0x07726368), TOBN(0x07a58935, 0x65ff431e),
- TOBN(0x24d661d1, 0x68754ab0), TOBN(0x801fce1d, 0x6f429a76),
- TOBN(0xc068a85f, 0xa58ce769), TOBN(0xedc35c54, 0x5d5eca2b),
- TOBN(0xea31276f, 0xa3f660d1), TOBN(0xa0184ebe, 0xb8fc7167),
- TOBN(0x0f20f21a, 0x1d8db0ae), TOBN(0xd96d095f, 0x56c35e12),
- TOBN(0xedf402b5, 0xf8c2a25b), TOBN(0x1bb772b9, 0x059204b6),
- TOBN(0x50cbeae2, 0x19b4e34c), TOBN(0x93109d80, 0x3fa0845a),
- TOBN(0x54f7ccf7, 0x8ef59fb5), TOBN(0x3b438fe2, 0x88070963),
- TOBN(0x9e28c659, 0x31f3ba9b), TOBN(0x9cc31b46, 0xead9da92),
- TOBN(0x3c2f0ba9, 0xb733aa5f), TOBN(0xdece47cb, 0xf05af235),
- TOBN(0xf8e3f715, 0xa2ac82a5), TOBN(0xc97ba641, 0x2203f18a),
- TOBN(0xc3af5504, 0x09c11060), TOBN(0x56ea2c05, 0x46af512d),
- TOBN(0xfac28daf, 0xf3f28146), TOBN(0x87fab43a, 0x959ef494),}
- ,
- {TOBN(0x09891641, 0xd4c5105f), TOBN(0x1ae80f8e, 0x6d7fbd65),
- TOBN(0x9d67225f, 0xbee6bdb0), TOBN(0x3b433b59, 0x7fc4d860),
- TOBN(0x44e66db6, 0x93e85638), TOBN(0xf7b59252, 0xe3e9862f),
- TOBN(0xdb785157, 0x665c32ec), TOBN(0x702fefd7, 0xae362f50),
- TOBN(0x3754475d, 0x0fefb0c3), TOBN(0xd48fb56b, 0x46d7c35d),
- TOBN(0xa070b633, 0x363798a4), TOBN(0xae89f3d2, 0x8fdb98e6),
- TOBN(0x970b89c8, 0x6363d14c), TOBN(0x89817521, 0x67abd27d),
- TOBN(0x9bf7d474, 0x44d5a021), TOBN(0xb3083baf, 0xcac72aee),
- TOBN(0x389741de, 0xbe949a44), TOBN(0x638e9388, 0x546a4fa5),
- TOBN(0x3fe6419c, 0xa0047bdc), TOBN(0x7047f648, 0xaaea57ca),
- TOBN(0x54e48a90, 0x41fbab17), TOBN(0xda8e0b28, 0x576bdba2),
- TOBN(0xe807eebc, 0xc72afddc), TOBN(0x07d3336d, 0xf42577bf),
- TOBN(0x62a8c244, 0xbfe20925), TOBN(0x91c19ac3, 0x8fdce867),
- TOBN(0x5a96a5d5, 0xdd387063), TOBN(0x61d587d4, 0x21d324f6),
- TOBN(0xe87673a2, 0xa37173ea), TOBN(0x23848008, 0x53778b65),
- TOBN(0x10f8441e, 0x05bab43e), TOBN(0xfa11fe12, 0x4621efbe),
- TOBN(0x047b772e, 0x81685d7b), TOBN(0x23f27d81, 0xbf34a976),
- TOBN(0xc27608e2, 0x915f48ef), TOBN(0x3b0b43fa, 0xa521d5c3),
- TOBN(0x7613fb26, 0x63ca7284), TOBN(0x7f5729b4, 0x1d4db837),
- TOBN(0x87b14898, 0x583b526b), TOBN(0x00b732a6, 0xbbadd3d1),
- TOBN(0x8e02f426, 0x2048e396), TOBN(0x436b50b6, 0x383d9de4),
- TOBN(0xf78d3481, 0x471e85ad), TOBN(0x8b01ea6a, 0xd005c8d6),
- TOBN(0xd3c7afee, 0x97015c07), TOBN(0x46cdf1a9, 0x4e3ba2ae),
- TOBN(0x7a42e501, 0x83d3a1d2), TOBN(0xd54b5268, 0xb541dff4),
- TOBN(0x3f24cf30, 0x4e23e9bc), TOBN(0x4387f816, 0x126e3624),
- TOBN(0x26a46a03, 0x3b0b6d61), TOBN(0xaf1bc845, 0x8b2d777c),
- TOBN(0x25c401ba, 0x527de79c), TOBN(0x0e1346d4, 0x4261bbb6),
- TOBN(0x4b96c44b, 0x287b4bc7), TOBN(0x658493c7, 0x5254562f),
- TOBN(0x23f949fe, 0xb8a24a20), TOBN(0x17ebfed1, 0xf52ca53f),
- TOBN(0x9b691bbe, 0xbcfb4853), TOBN(0x5617ff6b, 0x6278a05d),
- TOBN(0x241b34c5, 0xe3c99ebd), TOBN(0xfc64242e, 0x1784156a),
- TOBN(0x4206482f, 0x695d67df), TOBN(0xb967ce0e, 0xee27c011),
- TOBN(0x65db3751, 0x21c80b5d), TOBN(0x2e7a563c, 0xa31ecca0),
- TOBN(0xe56ffc4e, 0x5238a07e), TOBN(0x3d6c2966, 0x32ced854),
- TOBN(0xe99d7d1a, 0xaf70b885), TOBN(0xafc3bad9, 0x2d686459),
- TOBN(0x9c78bf46, 0x0cc8ba5b), TOBN(0x5a439519, 0x18955aa3),
- TOBN(0xf8b517a8, 0x5fe4e314), TOBN(0xe60234d0, 0xfcb8906f),
- TOBN(0xffe542ac, 0xf2061b23), TOBN(0x287e191f, 0x6b4cb59c),
- TOBN(0x21857ddc, 0x09d877d8), TOBN(0x1c23478c, 0x14678941),
- TOBN(0xbbf0c056, 0xb6e05ea4), TOBN(0x82da4b53, 0xb01594fe),
- TOBN(0xf7526791, 0xfadb8608), TOBN(0x049e832d, 0x7b74cdf6),
- TOBN(0xa43581cc, 0xc2b90a34), TOBN(0x73639eb8, 0x9360b10c),
- TOBN(0x4fba331f, 0xe1e4a71b), TOBN(0x6ffd6b93, 0x8072f919),
- TOBN(0x6e53271c, 0x65679032), TOBN(0x67206444, 0xf14272ce),
- TOBN(0xc0f734a3, 0xb2335834), TOBN(0x9526205a, 0x90ef6860),
- TOBN(0xcb8be717, 0x04e2bb0d), TOBN(0x2418871e, 0x02f383fa),
- TOBN(0xd7177681, 0x4082c157), TOBN(0xcc914ad0, 0x29c20073),
- TOBN(0xf186c1eb, 0xe587e728), TOBN(0x6fdb3c22, 0x61bcd5fd),
- TOBN(0x30d014a6, 0xf2f9f8e9), TOBN(0x963ece23, 0x4fec49d2),
- TOBN(0x862025c5, 0x9605a8d9), TOBN(0x39874445, 0x19f8929a),
- TOBN(0x01b6ff65, 0x12bf476a), TOBN(0x598a64d8, 0x09cf7d91),
- TOBN(0xd7ec7749, 0x93be56ca), TOBN(0x10899785, 0xcbb33615),
- TOBN(0xb8a092fd, 0x02eee3ad), TOBN(0xa86b3d35, 0x30145270),
- TOBN(0x323d98c6, 0x8512b675), TOBN(0x4b8bc785, 0x62ebb40f),
- TOBN(0x7d301f54, 0x413f9cde), TOBN(0xa5e4fb4f, 0x2bab5664),
- TOBN(0x1d2b252d, 0x1cbfec23), TOBN(0xfcd576bb, 0xe177120d),
- TOBN(0x04427d3e, 0x83731a34), TOBN(0x2bb9028e, 0xed836e8e),
- TOBN(0xb36acff8, 0xb612ca7c), TOBN(0xb88fe5ef, 0xd3d9c73a),
- TOBN(0xbe2a6bc6, 0xedea4eb3), TOBN(0x43b93133, 0x488eec77),
- TOBN(0xf41ff566, 0xb17106e1), TOBN(0x469e9172, 0x654efa32),
- TOBN(0xb4480f04, 0x41c23fa3), TOBN(0xb4712eb0, 0xc1989a2e),
- TOBN(0x3ccbba0f, 0x93a29ca7), TOBN(0x6e205c14, 0xd619428c),
- TOBN(0x90db7957, 0xb3641686), TOBN(0x0432691d, 0x45ac8b4e),
- TOBN(0x07a759ac, 0xf64e0350), TOBN(0x0514d89c, 0x9c972517),
- TOBN(0x1701147f, 0xa8e67fc3), TOBN(0x9e2e0b8b, 0xab2085be),
- TOBN(0xd5651824, 0xac284e57), TOBN(0x890d4325, 0x74893664),
- TOBN(0x8a7c5e6e, 0xc55e68a3), TOBN(0xbf12e90b, 0x4339c85a),
- TOBN(0x31846b85, 0xf922b655), TOBN(0x9a54ce4d, 0x0bf4d700),
- TOBN(0xd7f4e83a, 0xf1a14295), TOBN(0x916f955c, 0xb285d4f9),
- TOBN(0xe57bb0e0, 0x99ffdaba), TOBN(0x28a43034, 0xeab0d152),
- TOBN(0x0a36ffa2, 0xb8a9cef8), TOBN(0x5517407e, 0xb9ec051a),
- TOBN(0x9c796096, 0xea68e672), TOBN(0x853db5fb, 0xfb3c77fb),
- TOBN(0x21474ba9, 0xe864a51a), TOBN(0x6c267699, 0x6e8a1b8b),
- TOBN(0x7c823626, 0x94120a28), TOBN(0xe61e9a48, 0x8383a5db),
- TOBN(0x7dd75003, 0x9f84216d), TOBN(0xab020d07, 0xad43cd85),
- TOBN(0x9437ae48, 0xda12c659), TOBN(0x6449c2eb, 0xe65452ad),
- TOBN(0xcc7c4c1c, 0x2cf9d7c1), TOBN(0x1320886a, 0xee95e5ab),
- TOBN(0xbb7b9056, 0xbeae170c), TOBN(0xc8a5b250, 0xdbc0d662),
- TOBN(0x4ed81432, 0xc11d2303), TOBN(0x7da66912, 0x1f03769f),
- TOBN(0x3ac7a5fd, 0x84539828), TOBN(0x14dada94, 0x3bccdd02),
- TOBN(0x8b84c321, 0x7ef6b0d1), TOBN(0x52a9477a, 0x7c933f22),
- TOBN(0x5ef6728a, 0xfd440b82), TOBN(0x5c3bd859, 0x6ce4bd5e),
- TOBN(0x918b80f5, 0xf22c2d3e), TOBN(0x368d5040, 0xb7bb6cc5),
- TOBN(0xb66142a1, 0x2695a11c), TOBN(0x60ac583a, 0xeb19ea70),
- TOBN(0x317cbb98, 0x0eab2437), TOBN(0x8cc08c55, 0x5e2654c8),
- TOBN(0xfe2d6520, 0xe6d8307f), TOBN(0xe9f147f3, 0x57428993),
- TOBN(0x5f9c7d14, 0xd2fd6cf1), TOBN(0xa3ecd064, 0x2d4fcbb0),
- TOBN(0xad83fef0, 0x8e7341f7), TOBN(0x643f23a0, 0x3a63115c),
- TOBN(0xd38a78ab, 0xe65ab743), TOBN(0xbf7c75b1, 0x35edc89c),
- TOBN(0x3dd8752e, 0x530df568), TOBN(0xf85c4a76, 0xe308c682),
- TOBN(0x4c9955b2, 0xe68acf37), TOBN(0xa544df3d, 0xab32af85),
- TOBN(0x4b8ec3f5, 0xa25cf493), TOBN(0x4d8f2764, 0x1a622feb),
- TOBN(0x7bb4f7aa, 0xf0dcbc49), TOBN(0x7de551f9, 0x70bbb45b),
- TOBN(0xcfd0f3e4, 0x9f2ca2e5), TOBN(0xece58709, 0x1f5c76ef),
- TOBN(0x32920edd, 0x167d79ae), TOBN(0x039df8a2, 0xfa7d7ec1),
- TOBN(0xf46206c0, 0xbb30af91), TOBN(0x1ff5e2f5, 0x22676b59),
- TOBN(0x11f4a039, 0x6ea51d66), TOBN(0x506c1445, 0x807d7a26),
- TOBN(0x60da5705, 0x755a9b24), TOBN(0x8fc8cc32, 0x1f1a319e),
- TOBN(0x83642d4d, 0x9433d67d), TOBN(0x7fa5cb8f, 0x6a7dd296),
- TOBN(0x576591db, 0x9b7bde07), TOBN(0x13173d25, 0x419716fb),
- TOBN(0xea30599d, 0xd5b340ff), TOBN(0xfc6b5297, 0xb0fe76c5),
- TOBN(0x1c6968c8, 0xab8f5adc), TOBN(0xf723c7f5, 0x901c928d),
- TOBN(0x4203c321, 0x9773d402), TOBN(0xdf7c6aa3, 0x1b51dd47),
- TOBN(0x3d49e37a, 0x552be23c), TOBN(0x57febee8, 0x0b5a6e87),
- TOBN(0xc5ecbee4, 0x7bd8e739), TOBN(0x79d44994, 0xae63bf75),
- TOBN(0x168bd00f, 0x38fb8923), TOBN(0x75d48ee4, 0xd0533130),
- TOBN(0x554f77aa, 0xdb5cdf33), TOBN(0x3396e896, 0x3c696769),
- TOBN(0x2fdddbf2, 0xd3fd674e), TOBN(0xbbb8f6ee, 0x99d0e3e5),
- TOBN(0x51b90651, 0xcbae2f70), TOBN(0xefc4bc05, 0x93aaa8eb),
- TOBN(0x8ecd8689, 0xdd1df499), TOBN(0x1aee99a8, 0x22f367a5),
- TOBN(0x95d485b9, 0xae8274c5), TOBN(0x6c14d445, 0x7d30b39c),
- TOBN(0xbafea90b, 0xbcc1ef81), TOBN(0x7c5f317a, 0xa459a2ed),
- TOBN(0x01211075, 0x4ef44227), TOBN(0xa17bed6e, 0xdc20f496),
- TOBN(0x0cdfe424, 0x819853cd), TOBN(0x13793298, 0xf71e2ce7),
- TOBN(0x3c1f3078, 0xdbbe307b), TOBN(0x6dd1c20e, 0x76ee9936),
- TOBN(0x23ee4b57, 0x423caa20), TOBN(0x4ac3793b, 0x8efb840e),
- TOBN(0x934438eb, 0xed1f8ca0), TOBN(0x3e546658, 0x4ebb25a2),
- TOBN(0xc415af0e, 0xc069896f), TOBN(0xc13eddb0, 0x9a5aa43d),
- TOBN(0x7a04204f, 0xd49eb8f6), TOBN(0xd0d5bdfc, 0xd74f1670),
- TOBN(0x3697e286, 0x56fc0558), TOBN(0x10207371, 0x01cebade),
- TOBN(0x5f87e690, 0x0647a82b), TOBN(0x908e0ed4, 0x8f40054f),
- TOBN(0xa9f633d4, 0x79853803), TOBN(0x8ed13c9a, 0x4a28b252),
- TOBN(0x3e2ef676, 0x1f460f64), TOBN(0x53930b9b, 0x36d06336),
- TOBN(0x347073ac, 0x8fc4979b), TOBN(0x84380e0e, 0x5ecd5597),
- TOBN(0xe3b22c6b, 0xc4fe3c39), TOBN(0xba4a8153, 0x6c7bebdf),
- TOBN(0xf23ab6b7, 0x25693459), TOBN(0x53bc3770, 0x14922b11),
- TOBN(0x4645c8ab, 0x5afc60db), TOBN(0xaa022355, 0x20b9f2a3),
- TOBN(0x52a2954c, 0xce0fc507), TOBN(0x8c2731bb, 0x7ce1c2e7),
- TOBN(0xf39608ab, 0x18a0339d), TOBN(0xac7a658d, 0x3735436c),
- TOBN(0xb22c2b07, 0xcd992b4f), TOBN(0x4e83daec, 0xf40dcfd4),
- TOBN(0x8a34c7be, 0x2f39ea3e), TOBN(0xef0c005f, 0xb0a56d2e),
- TOBN(0x62731f6a, 0x6edd8038), TOBN(0x5721d740, 0x4e3cb075),
- TOBN(0x1ea41511, 0xfbeeee1b), TOBN(0xd1ef5e73, 0xef1d0c05),
- TOBN(0x42feefd1, 0x73c07d35), TOBN(0xe530a00a, 0x8a329493),
- TOBN(0x5d55b7fe, 0xf15ebfb0), TOBN(0x549de03c, 0xd322491a),
- TOBN(0xf7b5f602, 0x745b3237), TOBN(0x3632a3a2, 0x1ab6e2b6),
- TOBN(0x0d3bba89, 0x0ef59f78), TOBN(0x0dfc6443, 0xc9e52b9a),
- TOBN(0x1dc79699, 0x72631447), TOBN(0xef033917, 0xb3be20b1),
- TOBN(0x0c92735d, 0xb1383948), TOBN(0xc1fc29a2, 0xc0dd7d7d),
- TOBN(0x6485b697, 0x403ed068), TOBN(0x13bfaab3, 0xaac93bdc),
- TOBN(0x410dc6a9, 0x0deeaf52), TOBN(0xb003fb02, 0x4c641c15),
- TOBN(0x1384978c, 0x5bc504c4), TOBN(0x37640487, 0x864a6a77),
- TOBN(0x05991bc6, 0x222a77da), TOBN(0x62260a57, 0x5e47eb11),
- TOBN(0xc7af6613, 0xf21b432c), TOBN(0x22f3acc9, 0xab4953e9),
- TOBN(0x52934922, 0x8e41d155), TOBN(0x4d024568, 0x3ac059ef),
- TOBN(0xb0201755, 0x4d884411), TOBN(0xce8055cf, 0xa59a178f),
- TOBN(0xcd77d1af, 0xf6204549), TOBN(0xa0a00a3e, 0xc7066759),
- TOBN(0x471071ef, 0x0272c229), TOBN(0x009bcf6b, 0xd3c4b6b0),
- TOBN(0x2a2638a8, 0x22305177), TOBN(0xd51d59df, 0x41645bbf),
- TOBN(0xa81142fd, 0xc0a7a3c0), TOBN(0xa17eca6d, 0x4c7063ee),
- TOBN(0x0bb887ed, 0x60d9dcec), TOBN(0xd6d28e51, 0x20ad2455),
- TOBN(0xebed6308, 0xa67102ba), TOBN(0x042c3114, 0x8bffa408),
- TOBN(0xfd099ac5, 0x8aa68e30), TOBN(0x7a6a3d7c, 0x1483513e),
- TOBN(0xffcc6b75, 0xba2d8f0c), TOBN(0x54dacf96, 0x1e78b954),
- TOBN(0xf645696f, 0xa4a9af89), TOBN(0x3a411940, 0x06ac98ec),
- TOBN(0x41b8b3f6, 0x22a67a20), TOBN(0x2d0b1e0f, 0x99dec626),
- TOBN(0x27c89192, 0x40be34e8), TOBN(0xc7162b37, 0x91907f35),
- TOBN(0x90188ec1, 0xa956702b), TOBN(0xca132f7d, 0xdf93769c),
- TOBN(0x3ece44f9, 0x0e2025b4), TOBN(0x67aaec69, 0x0c62f14c),
- TOBN(0xad741418, 0x22e3cc11), TOBN(0xcf9b75c3, 0x7ff9a50e),
- TOBN(0x02fa2b16, 0x4d348272), TOBN(0xbd99d61a, 0x9959d56d),
- TOBN(0xbc4f19db, 0x18762916), TOBN(0xcc7cce50, 0x49c1ac80),
- TOBN(0x4d59ebaa, 0xd846bd83), TOBN(0x8775a9dc, 0xa9202849),
- TOBN(0x07ec4ae1, 0x6e1f4ca9), TOBN(0x27eb5875, 0xba893f11),
- TOBN(0x00284d51, 0x662cc565), TOBN(0x82353a6b, 0x0db4138d),
- TOBN(0xd9c7aaaa, 0xaa32a594), TOBN(0xf5528b5e, 0xa5669c47),
- TOBN(0xf3220231, 0x2f23c5ff), TOBN(0xe3e8147a, 0x6affa3a1),
- TOBN(0xfb423d5c, 0x202ddda0), TOBN(0x3d6414ac, 0x6b871bd4),
- TOBN(0x586f82e1, 0xa51a168a), TOBN(0xb712c671, 0x48ae5448),
- TOBN(0x9a2e4bd1, 0x76233eb8), TOBN(0x0188223a, 0x78811ca9),
- TOBN(0x553c5e21, 0xf7c18de1), TOBN(0x7682e451, 0xb27bb286),
- TOBN(0x3ed036b3, 0x0e51e929), TOBN(0xf487211b, 0xec9cb34f),
- TOBN(0x0d094277, 0x0c24efc8), TOBN(0x0349fd04, 0xbef737a4),
- TOBN(0x6d1c9dd2, 0x514cdd28), TOBN(0x29c135ff, 0x30da9521),
- TOBN(0xea6e4508, 0xf78b0b6f), TOBN(0x176f5dd2, 0x678c143c),
- TOBN(0x08148418, 0x4be21e65), TOBN(0x27f7525c, 0xe7df38c4),
- TOBN(0x1fb70e09, 0x748ab1a4), TOBN(0x9cba50a0, 0x5efe4433),
- TOBN(0x7846c7a6, 0x15f75af2), TOBN(0x2a7c2c57, 0x5ee73ea8),
- TOBN(0x42e566a4, 0x3f0a449a), TOBN(0x45474c3b, 0xad90fc3d),
- TOBN(0x7447be3d, 0x8b61d057), TOBN(0x3e9d1cf1, 0x3a4ec092),
- TOBN(0x1603e453, 0xf380a6e6), TOBN(0x0b86e431, 0x9b1437c2),
- TOBN(0x7a4173f2, 0xef29610a), TOBN(0x8fa729a7, 0xf03d57f7),
- TOBN(0x3e186f6e, 0x6c9c217e), TOBN(0xbe1d3079, 0x91919524),
- TOBN(0x92a62a70, 0x153d4fb1), TOBN(0x32ed3e34, 0xd68c2f71),
- TOBN(0xd785027f, 0x9eb1a8b7), TOBN(0xbc37eb77, 0xc5b22fe8),
- TOBN(0x466b34f0, 0xb9d6a191), TOBN(0x008a89af, 0x9a05f816),
- TOBN(0x19b028fb, 0x7d42c10a), TOBN(0x7fe8c92f, 0x49b3f6b8),
- TOBN(0x58907cc0, 0xa5a0ade3), TOBN(0xb3154f51, 0x559d1a7c),
- TOBN(0x5066efb6, 0xd9790ed6), TOBN(0xa77a0cbc, 0xa6aa793b),
- TOBN(0x1a915f3c, 0x223e042e), TOBN(0x1c5def04, 0x69c5874b),
- TOBN(0x0e830078, 0x73b6c1da), TOBN(0x55cf85d2, 0xfcd8557a),
- TOBN(0x0f7c7c76, 0x0460f3b1), TOBN(0x87052acb, 0x46e58063),
- TOBN(0x09212b80, 0x907eae66), TOBN(0x3cb068e0, 0x4d721c89),
- TOBN(0xa87941ae, 0xdd45ac1c), TOBN(0xde8d5c0d, 0x0daa0dbb),
- TOBN(0xda421fdc, 0xe3502e6e), TOBN(0xc8944201, 0x4d89a084),
- TOBN(0x7307ba5e, 0xf0c24bfb), TOBN(0xda212beb, 0x20bde0ef),
- TOBN(0xea2da24b, 0xf82ce682), TOBN(0x058d3816, 0x07f71fe4),
- TOBN(0x35a02462, 0x5ffad8de), TOBN(0xcd7b05dc, 0xaadcefab),
- TOBN(0xd442f8ed, 0x1d9f54ec), TOBN(0x8be3d618, 0xb2d3b5ca),
- TOBN(0xe2220ed0, 0xe06b2ce2), TOBN(0x82699a5f, 0x1b0da4c0),
- TOBN(0x3ff106f5, 0x71c0c3a7), TOBN(0x8f580f5a, 0x0d34180c),
- TOBN(0x4ebb120e, 0x22d7d375), TOBN(0x5e5782cc, 0xe9513675),
- TOBN(0x2275580c, 0x99c82a70), TOBN(0xe8359fbf, 0x15ea8c4c),
- TOBN(0x53b48db8, 0x7b415e70), TOBN(0xaacf2240, 0x100c6014),
- TOBN(0x9faaccf5, 0xe4652f1d), TOBN(0xbd6fdd2a, 0xd56157b2),
- TOBN(0xa4f4fb1f, 0x6261ec50), TOBN(0x244e55ad, 0x476bcd52),
- TOBN(0x881c9305, 0x047d320b), TOBN(0x1ca983d5, 0x6181263f),
- TOBN(0x354e9a44, 0x278fb8ee), TOBN(0xad2dbc0f, 0x396e4964),
- TOBN(0x723f3aa2, 0x9268b3de), TOBN(0x0d1ca29a, 0xe6e0609a),
- TOBN(0x794866aa, 0x6cf44252), TOBN(0x0b59f3e3, 0x01af87ed),
- TOBN(0xe234e5ff, 0x7f4a6c51), TOBN(0xa8768fd2, 0x61dc2f7e),
- TOBN(0xdafc7332, 0x0a94d81f), TOBN(0xd7f84282, 0x06938ce1),
- TOBN(0xae0b3c0e, 0x0546063e), TOBN(0x7fbadcb2, 0x5d61abc6),
- TOBN(0xd5d7a2c9, 0x369ac400), TOBN(0xa5978d09, 0xae67d10c),
- TOBN(0x290f211e, 0x4f85eaac), TOBN(0xe61e2ad1, 0xfacac681),
- TOBN(0xae125225, 0x388384cd), TOBN(0xa7fb68e9, 0xccfde30f),
- TOBN(0x7a59b936, 0x3daed4c2), TOBN(0x80a9aa40, 0x2606f789),
- TOBN(0xb40c1ea5, 0xf6a6d90a), TOBN(0x948364d3, 0x514d5885),
- TOBN(0x062ebc60, 0x70985182), TOBN(0xa6db5b0e, 0x33310895),
- TOBN(0x64a12175, 0xe329c2f5), TOBN(0xc5f25bd2, 0x90ea237e),
- TOBN(0x7915c524, 0x2d0a4c23), TOBN(0xeb5d26e4, 0x6bb3cc52),
- TOBN(0x369a9116, 0xc09e2c92), TOBN(0x0c527f92, 0xcf182cf8),
- TOBN(0x9e591938, 0x2aede0ac), TOBN(0xb2922208, 0x6cc34939),
- TOBN(0x3c9d8962, 0x99a34361), TOBN(0x3c81836d, 0xc1905fe6),
- TOBN(0x4bfeb57f, 0xa001ec5a), TOBN(0xe993f5bb, 0xa0dc5dba),
- TOBN(0x47884109, 0x724a1380), TOBN(0x8a0369ab, 0x32fe9a04),
- TOBN(0xea068d60, 0x8c927db8), TOBN(0xbf5f37cf, 0x94655741),
- TOBN(0x47d402a2, 0x04b6c7ea), TOBN(0x4551c295, 0x6af259cb),
- TOBN(0x698b71e7, 0xed77ee8b), TOBN(0xbddf7bd0, 0xf309d5c7),
- TOBN(0x6201c22c, 0x34e780ca), TOBN(0xab04f7d8, 0x4c295ef4),
- TOBN(0x1c947294, 0x4313a8ce), TOBN(0xe532e4ac, 0x92ca4cfe),
- TOBN(0x89738f80, 0xd0a7a97a), TOBN(0xec088c88, 0xa580fd5b),
- TOBN(0x612b1ecc, 0x42ce9e51), TOBN(0x8f9840fd, 0xb25fdd2a),
- TOBN(0x3cda78c0, 0x01e7f839), TOBN(0x546b3d3a, 0xece05480),
- TOBN(0x271719a9, 0x80d30916), TOBN(0x45497107, 0x584c20c4),
- TOBN(0xaf8f9478, 0x5bc78608), TOBN(0x28c7d484, 0x277e2a4c),
- TOBN(0xfce01767, 0x88a2ffe4), TOBN(0xdc506a35, 0x28e169a5),
- TOBN(0x0ea10861, 0x7af9c93a), TOBN(0x1ed24361, 0x03fa0e08),
- TOBN(0x96eaaa92, 0xa3d694e7), TOBN(0xc0f43b4d, 0xef50bc74),
- TOBN(0xce6aa58c, 0x64114db4), TOBN(0x8218e8ea, 0x7c000fd4),
- TOBN(0xac815dfb, 0x185f8844), TOBN(0xcd7e90cb, 0x1557abfb),
- TOBN(0x23d16655, 0xafbfecdf), TOBN(0x80f3271f, 0x085cac4a),
- TOBN(0x7fc39aa7, 0xd0e62f47), TOBN(0x88d519d1, 0x460a48e5),
- TOBN(0x59559ac4, 0xd28f101e), TOBN(0x7981d9e9, 0xca9ae816),
- TOBN(0x5c38652c, 0x9ac38203), TOBN(0x86eaf87f, 0x57657fe5),
- TOBN(0x568fc472, 0xe21f5416), TOBN(0x2afff39c, 0xe7e597b5),
- TOBN(0x3adbbb07, 0x256d4eab), TOBN(0x22598692, 0x8285ab89),
- TOBN(0x35f8112a, 0x041caefe), TOBN(0x95df02e3, 0xa5064c8b),
- TOBN(0x4d63356e, 0xc7004bf3), TOBN(0x230a08f4, 0xdb83c7de),
- TOBN(0xca27b270, 0x8709a7b7), TOBN(0x0d1c4cc4, 0xcb9abd2d),
- TOBN(0x8a0bc66e, 0x7550fee8), TOBN(0x369cd4c7, 0x9cf7247e),
- TOBN(0x75562e84, 0x92b5b7e7), TOBN(0x8fed0da0, 0x5802af7b),
- TOBN(0x6a7091c2, 0xe48fb889), TOBN(0x26882c13, 0x7b8a9d06),
- TOBN(0xa2498663, 0x1b82a0e2), TOBN(0x844ed736, 0x3518152d),
- TOBN(0x282f476f, 0xd86e27c7), TOBN(0xa04edaca, 0x04afefdc),
- TOBN(0x8b256ebc, 0x6119e34d), TOBN(0x56a413e9, 0x0787d78b),}
- ,
- {TOBN(0x82ee061d, 0x5a74be50), TOBN(0xe41781c4, 0xdea16ff5),
- TOBN(0xe0b0c81e, 0x99bfc8a2), TOBN(0x624f4d69, 0x0b547e2d),
- TOBN(0x3a83545d, 0xbdcc9ae4), TOBN(0x2573dbb6, 0x409b1e8e),
- TOBN(0x482960c4, 0xa6c93539), TOBN(0xf01059ad, 0x5ae18798),
- TOBN(0x715c9f97, 0x3112795f), TOBN(0xe8244437, 0x984e6ee1),
- TOBN(0x55cb4858, 0xecb66bcd), TOBN(0x7c136735, 0xabaffbee),
- TOBN(0x54661595, 0x5dbec38e), TOBN(0x51c0782c, 0x388ad153),
- TOBN(0x9ba4c53a, 0xc6e0952f), TOBN(0x27e6782a, 0x1b21dfa8),
- TOBN(0x682f903d, 0x4ed2dbc2), TOBN(0x0eba59c8, 0x7c3b2d83),
- TOBN(0x8e9dc84d, 0x9c7e9335), TOBN(0x5f9b21b0, 0x0eb226d7),
- TOBN(0xe33bd394, 0xaf267bae), TOBN(0xaa86cc25, 0xbe2e15ae),
- TOBN(0x4f0bf67d, 0x6a8ec500), TOBN(0x5846aa44, 0xf9630658),
- TOBN(0xfeb09740, 0xe2c2bf15), TOBN(0x627a2205, 0xa9e99704),
- TOBN(0xec8d73d0, 0xc2fbc565), TOBN(0x223eed8f, 0xc20c8de8),
- TOBN(0x1ee32583, 0xa8363b49), TOBN(0x1a0b6cb9, 0xc9c2b0a6),
- TOBN(0x49f7c3d2, 0x90dbc85c), TOBN(0xa8dfbb97, 0x1ef4c1ac),
- TOBN(0xafb34d4c, 0x65c7c2ab), TOBN(0x1d4610e7, 0xe2c5ea84),
- TOBN(0x893f6d1b, 0x973c4ab5), TOBN(0xa3cdd7e9, 0x945ba5c4),
- TOBN(0x60514983, 0x064417ee), TOBN(0x1459b23c, 0xad6bdf2b),
- TOBN(0x23b2c341, 0x5cf726c3), TOBN(0x3a829635, 0x32d6354a),
- TOBN(0x294f901f, 0xab192c18), TOBN(0xec5fcbfe, 0x7030164f),
- TOBN(0xe2e2fcb7, 0xe2246ba6), TOBN(0x1e7c88b3, 0x221a1a0c),
- TOBN(0x72c7dd93, 0xc92d88c5), TOBN(0x41c2148e, 0x1106fb59),
- TOBN(0x547dd4f5, 0xa0f60f14), TOBN(0xed9b52b2, 0x63960f31),
- TOBN(0x6c8349eb, 0xb0a5b358), TOBN(0xb154c5c2, 0x9e7e2ed6),
- TOBN(0xcad5eccf, 0xeda462db), TOBN(0xf2d6dbe4, 0x2de66b69),
- TOBN(0x426aedf3, 0x8665e5b2), TOBN(0x488a8513, 0x7b7f5723),
- TOBN(0x15cc43b3, 0x8bcbb386), TOBN(0x27ad0af3, 0xd791d879),
- TOBN(0xc16c236e, 0x846e364f), TOBN(0x7f33527c, 0xdea50ca0),
- TOBN(0xc4810775, 0x0926b86d), TOBN(0x6c2a3609, 0x0598e70c),
- TOBN(0xa6755e52, 0xf024e924), TOBN(0xe0fa07a4, 0x9db4afca),
- TOBN(0x15c3ce7d, 0x66831790), TOBN(0x5b4ef350, 0xa6cbb0d6),
- TOBN(0x2c4aafc4, 0xb6205969), TOBN(0x42563f02, 0xf6c7854f),
- TOBN(0x016aced5, 0x1d983b48), TOBN(0xfeb356d8, 0x99949755),
- TOBN(0x8c2a2c81, 0xd1a39bd7), TOBN(0x8f44340f, 0xe6934ae9),
- TOBN(0x148cf91c, 0x447904da), TOBN(0x7340185f, 0x0f51a926),
- TOBN(0x2f8f00fb, 0x7409ab46), TOBN(0x057e78e6, 0x80e289b2),
- TOBN(0x03e5022c, 0xa888e5d1), TOBN(0x3c87111a, 0x9dede4e2),
- TOBN(0x5b9b0e1c, 0x7809460b), TOBN(0xe751c852, 0x71c9abc7),
- TOBN(0x8b944e28, 0xc7cc1dc9), TOBN(0x4f201ffa, 0x1d3cfa08),
- TOBN(0x02fc905c, 0x3e6721ce), TOBN(0xd52d70da, 0xd0b3674c),
- TOBN(0x5dc2e5ca, 0x18810da4), TOBN(0xa984b273, 0x5c69dd99),
- TOBN(0x63b92527, 0x84de5ca4), TOBN(0x2f1c9872, 0xc852dec4),
- TOBN(0x18b03593, 0xc2e3de09), TOBN(0x19d70b01, 0x9813dc2f),
- TOBN(0x42806b2d, 0xa6dc1d29), TOBN(0xd3030009, 0xf871e144),
- TOBN(0xa1feb333, 0xaaf49276), TOBN(0xb5583b9e, 0xc70bc04b),
- TOBN(0x1db0be78, 0x95695f20), TOBN(0xfc841811, 0x89d012b5),
- TOBN(0x6409f272, 0x05f61643), TOBN(0x40d34174, 0xd5883128),
- TOBN(0xd79196f5, 0x67419833), TOBN(0x6059e252, 0x863b7b08),
- TOBN(0x84da1817, 0x1c56700c), TOBN(0x5758ee56, 0xb28d3ec4),
- TOBN(0x7da2771d, 0x013b0ea6), TOBN(0xfddf524b, 0x54c5e9b9),
- TOBN(0x7df4faf8, 0x24305d80), TOBN(0x58f5c1bf, 0x3a97763f),
- TOBN(0xa5af37f1, 0x7c696042), TOBN(0xd4cba22c, 0x4a2538de),
- TOBN(0x211cb995, 0x9ea42600), TOBN(0xcd105f41, 0x7b069889),
- TOBN(0xb1e1cf19, 0xddb81e74), TOBN(0x472f2d89, 0x5157b8ca),
- TOBN(0x086fb008, 0xee9db885), TOBN(0x365cd570, 0x0f26d131),
- TOBN(0x284b02bb, 0xa2be7053), TOBN(0xdcbbf7c6, 0x7ab9a6d6),
- TOBN(0x4425559c, 0x20f7a530), TOBN(0x961f2dfa, 0x188767c8),
- TOBN(0xe2fd9435, 0x70dc80c4), TOBN(0x104d6b63, 0xf0784120),
- TOBN(0x7f592bc1, 0x53567122), TOBN(0xf6bc1246, 0xf688ad77),
- TOBN(0x05214c05, 0x0f15dde9), TOBN(0xa47a76a8, 0x0d5f2b82),
- TOBN(0xbb254d30, 0x62e82b62), TOBN(0x11a05fe0, 0x3ec955ee),
- TOBN(0x7eaff46e, 0x9d529b36), TOBN(0x55ab1301, 0x8f9e3df6),
- TOBN(0xc463e371, 0x99317698), TOBN(0xfd251438, 0xccda47ad),
- TOBN(0xca9c3547, 0x23d695ea), TOBN(0x48ce626e, 0x16e589b5),
- TOBN(0x6b5b64c7, 0xb187d086), TOBN(0xd02e1794, 0xb2207948),
- TOBN(0x8b58e98f, 0x7198111d), TOBN(0x90ca6305, 0xdcf9c3cc),
- TOBN(0x5691fe72, 0xf34089b0), TOBN(0x60941af1, 0xfc7c80ff),
- TOBN(0xa09bc0a2, 0x22eb51e5), TOBN(0xc0bb7244, 0xaa9cf09a),
- TOBN(0x36a8077f, 0x80159f06), TOBN(0x8b5c989e, 0xdddc560e),
- TOBN(0x19d2f316, 0x512e1f43), TOBN(0x02eac554, 0xad08ff62),
- TOBN(0x012ab84c, 0x07d20b4e), TOBN(0x37d1e115, 0xd6d4e4e1),
- TOBN(0xb6443e1a, 0xab7b19a8), TOBN(0xf08d067e, 0xdef8cd45),
- TOBN(0x63adf3e9, 0x685e03da), TOBN(0xcf15a10e, 0x4792b916),
- TOBN(0xf44bcce5, 0xb738a425), TOBN(0xebe131d5, 0x9636b2fd),
- TOBN(0x94068841, 0x7850d605), TOBN(0x09684eaa, 0xb40d749d),
- TOBN(0x8c3c669c, 0x72ba075b), TOBN(0x89f78b55, 0xba469015),
- TOBN(0x5706aade, 0x3e9f8ba8), TOBN(0x6d8bd565, 0xb32d7ed7),
- TOBN(0x25f4e63b, 0x805f08d6), TOBN(0x7f48200d, 0xc3bcc1b5),
- TOBN(0x4e801968, 0xb025d847), TOBN(0x74afac04, 0x87cbe0a8),
- TOBN(0x43ed2c2b, 0x7e63d690), TOBN(0xefb6bbf0, 0x0223cdb8),
- TOBN(0x4fec3cae, 0x2884d3fe), TOBN(0x065ecce6, 0xd75e25a4),
- TOBN(0x6c2294ce, 0x69f79071), TOBN(0x0d9a8e5f, 0x044b8666),
- TOBN(0x5009f238, 0x17b69d8f), TOBN(0x3c29f8fe, 0xc5dfdaf7),
- TOBN(0x9067528f, 0xebae68c4), TOBN(0x5b385632, 0x30c5ba21),
- TOBN(0x540df119, 0x1fdd1aec), TOBN(0xcf37825b, 0xcfba4c78),
- TOBN(0x77eff980, 0xbeb11454), TOBN(0x40a1a991, 0x60c1b066),
- TOBN(0xe8018980, 0xf889a1c7), TOBN(0xb9c52ae9, 0x76c24be0),
- TOBN(0x05fbbcce, 0x45650ef4), TOBN(0xae000f10, 0x8aa29ac7),
- TOBN(0x884b7172, 0x4f04c470), TOBN(0x7cd4fde2, 0x19bb5c25),
- TOBN(0x6477b22a, 0xe8840869), TOBN(0xa8868859, 0x5fbd0686),
- TOBN(0xf23cc02e, 0x1116dfba), TOBN(0x76cd563f, 0xd87d7776),
- TOBN(0xe2a37598, 0xa9d82abf), TOBN(0x5f188ccb, 0xe6c170f5),
- TOBN(0x81682200, 0x5066b087), TOBN(0xda22c212, 0xc7155ada),
- TOBN(0x151e5d3a, 0xfbddb479), TOBN(0x4b606b84, 0x6d715b99),
- TOBN(0x4a73b54b, 0xf997cb2e), TOBN(0x9a1bfe43, 0x3ecd8b66),
- TOBN(0x1c312809, 0x2a67d48a), TOBN(0xcd6a671e, 0x031fa9e2),
- TOBN(0xbec3312a, 0x0e43a34a), TOBN(0x1d935639, 0x55ef47d3),
- TOBN(0x5ea02489, 0x8fea73ea), TOBN(0x8247b364, 0xa035afb2),
- TOBN(0xb58300a6, 0x5265b54c), TOBN(0x3286662f, 0x722c7148),
- TOBN(0xb77fd76b, 0xb4ec4c20), TOBN(0xf0a12fa7, 0x0f3fe3fd),
- TOBN(0xf845bbf5, 0x41d8c7e8), TOBN(0xe4d969ca, 0x5ec10aa8),
- TOBN(0x4c0053b7, 0x43e232a3), TOBN(0xdc7a3fac, 0x37f8a45a),
- TOBN(0x3c4261c5, 0x20d81c8f), TOBN(0xfd4b3453, 0xb00eab00),
- TOBN(0x76d48f86, 0xd36e3062), TOBN(0x626c5277, 0xa143ff02),
- TOBN(0x538174de, 0xaf76f42e), TOBN(0x2267aa86, 0x6407ceac),
- TOBN(0xfad76351, 0x72e572d5), TOBN(0xab861af7, 0xba7330eb),
- TOBN(0xa0a1c8c7, 0x418d8657), TOBN(0x988821cb, 0x20289a52),
- TOBN(0x79732522, 0xcccc18ad), TOBN(0xaadf3f8d, 0xf1a6e027),
- TOBN(0xf7382c93, 0x17c2354d), TOBN(0x5ce1680c, 0xd818b689),
- TOBN(0x359ebbfc, 0xd9ecbee9), TOBN(0x4330689c, 0x1cae62ac),
- TOBN(0xb55ce5b4, 0xc51ac38a), TOBN(0x7921dfea, 0xfe238ee8),
- TOBN(0x3972bef8, 0x271d1ca5), TOBN(0x3e423bc7, 0xe8aabd18),
- TOBN(0x57b09f3f, 0x44a3e5e3), TOBN(0x5da886ae, 0x7b444d66),
- TOBN(0x68206634, 0xa9964375), TOBN(0x356a2fa3, 0x699cd0ff),
- TOBN(0xaf0faa24, 0xdba515e9), TOBN(0x536e1f5c, 0xb321d79a),
- TOBN(0xd3b9913a, 0x5c04e4ea), TOBN(0xd549dcfe, 0xd6f11513),
- TOBN(0xee227bf5, 0x79fd1d94), TOBN(0x9f35afee, 0xb43f2c67),
- TOBN(0xd2638d24, 0xf1314f53), TOBN(0x62baf948, 0xcabcd822),
- TOBN(0x5542de29, 0x4ef48db0), TOBN(0xb3eb6a04, 0xfc5f6bb2),
- TOBN(0x23c110ae, 0x1208e16a), TOBN(0x1a4d15b5, 0xf8363e24),
- TOBN(0x30716844, 0x164be00b), TOBN(0xa8e24824, 0xf6f4690d),
- TOBN(0x548773a2, 0x90b170cf), TOBN(0xa1bef331, 0x42f191f4),
- TOBN(0x70f418d0, 0x9247aa97), TOBN(0xea06028e, 0x48be9147),
- TOBN(0xe13122f3, 0xdbfb894e), TOBN(0xbe9b79f6, 0xce274b18),
- TOBN(0x85a49de5, 0xca58aadf), TOBN(0x24957758, 0x11487351),
- TOBN(0x111def61, 0xbb939099), TOBN(0x1d6a974a, 0x26d13694),
- TOBN(0x4474b4ce, 0xd3fc253b), TOBN(0x3a1485e6, 0x4c5db15e),
- TOBN(0xe79667b4, 0x147c15b4), TOBN(0xe34f553b, 0x7bc61301),
- TOBN(0x032b80f8, 0x17094381), TOBN(0x55d8bafd, 0x723eaa21),
- TOBN(0x5a987995, 0xf1c0e74e), TOBN(0x5a9b292e, 0xebba289c),
- TOBN(0x413cd4b2, 0xeb4c8251), TOBN(0x98b5d243, 0xd162db0a),
- TOBN(0xbb47bf66, 0x68342520), TOBN(0x08d68949, 0xbaa862d1),
- TOBN(0x11f349c7, 0xe906abcd), TOBN(0x454ce985, 0xed7bf00e),
- TOBN(0xacab5c9e, 0xb55b803b), TOBN(0xb03468ea, 0x31e3c16d),
- TOBN(0x5c24213d, 0xd273bf12), TOBN(0x211538eb, 0x71587887),
- TOBN(0x198e4a2f, 0x731dea2d), TOBN(0xd5856cf2, 0x74ed7b2a),
- TOBN(0x86a632eb, 0x13a664fe), TOBN(0x932cd909, 0xbda41291),
- TOBN(0x850e95d4, 0xc0c4ddc0), TOBN(0xc0f422f8, 0x347fc2c9),
- TOBN(0xe68cbec4, 0x86076bcb), TOBN(0xf9e7c0c0, 0xcd6cd286),
- TOBN(0x65994ddb, 0x0f5f27ca), TOBN(0xe85461fb, 0xa80d59ff),
- TOBN(0xff05481a, 0x66601023), TOBN(0xc665427a, 0xfc9ebbfb),
- TOBN(0xb0571a69, 0x7587fd52), TOBN(0x935289f8, 0x8d49efce),
- TOBN(0x61becc60, 0xea420688), TOBN(0xb22639d9, 0x13a786af),
- TOBN(0x1a8e6220, 0x361ecf90), TOBN(0x001f23e0, 0x25506463),
- TOBN(0xe4ae9b5d, 0x0a5c2b79), TOBN(0xebc9cdad, 0xd8149db5),
- TOBN(0xb33164a1, 0x934aa728), TOBN(0x750eb00e, 0xae9b60f3),
- TOBN(0x5a91615b, 0x9b9cfbfd), TOBN(0x97015cbf, 0xef45f7f6),
- TOBN(0xb462c4a5, 0xbf5151df), TOBN(0x21adcc41, 0xb07118f2),
- TOBN(0xd60c545b, 0x043fa42c), TOBN(0xfc21aa54, 0xe96be1ab),
- TOBN(0xe84bc32f, 0x4e51ea80), TOBN(0x3dae45f0, 0x259b5d8d),
- TOBN(0xbb73c7eb, 0xc38f1b5e), TOBN(0xe405a74a, 0xe8ae617d),
- TOBN(0xbb1ae9c6, 0x9f1c56bd), TOBN(0x8c176b98, 0x49f196a4),
- TOBN(0xc448f311, 0x6875092b), TOBN(0xb5afe3de, 0x9f976033),
- TOBN(0xa8dafd49, 0x145813e5), TOBN(0x687fc4d9, 0xe2b34226),
- TOBN(0xf2dfc92d, 0x4c7ff57f), TOBN(0x004e3fc1, 0x401f1b46),
- TOBN(0x5afddab6, 0x1430c9ab), TOBN(0x0bdd41d3, 0x2238e997),
- TOBN(0xf0947430, 0x418042ae), TOBN(0x71f9adda, 0xcdddc4cb),
- TOBN(0x7090c016, 0xc52dd907), TOBN(0xd9bdf44d, 0x29e2047f),
- TOBN(0xe6f1fe80, 0x1b1011a6), TOBN(0xb63accbc, 0xd9acdc78),
- TOBN(0xcfc7e235, 0x1272a95b), TOBN(0x0c667717, 0xa6276ac8),
- TOBN(0x3c0d3709, 0xe2d7eef7), TOBN(0x5add2b06, 0x9a685b3e),
- TOBN(0x363ad32d, 0x14ea5d65), TOBN(0xf8e01f06, 0x8d7dd506),
- TOBN(0xc9ea2213, 0x75b4aac6), TOBN(0xed2a2bf9, 0x0d353466),
- TOBN(0x439d79b5, 0xe9d3a7c3), TOBN(0x8e0ee5a6, 0x81b7f34b),
- TOBN(0xcf3dacf5, 0x1dc4ba75), TOBN(0x1d3d1773, 0xeb3310c7),
- TOBN(0xa8e67112, 0x7747ae83), TOBN(0x31f43160, 0x197d6b40),
- TOBN(0x0521ccee, 0xcd961400), TOBN(0x67246f11, 0xf6535768),
- TOBN(0x702fcc5a, 0xef0c3133), TOBN(0x247cc45d, 0x7e16693b),
- TOBN(0xfd484e49, 0xc729b749), TOBN(0x522cef7d, 0xb218320f),
- TOBN(0xe56ef405, 0x59ab93b3), TOBN(0x225fba11, 0x9f181071),
- TOBN(0x33bd6595, 0x15330ed0), TOBN(0xc4be69d5, 0x1ddb32f7),
- TOBN(0x264c7668, 0x0448087c), TOBN(0xac30903f, 0x71432dae),
- TOBN(0x3851b266, 0x00f9bf47), TOBN(0x400ed311, 0x6cdd6d03),
- TOBN(0x045e79fe, 0xf8fd2424), TOBN(0xfdfd974a, 0xfa6da98b),
- TOBN(0x45c9f641, 0x0c1e673a), TOBN(0x76f2e733, 0x5b2c5168),
- TOBN(0x1adaebb5, 0x2a601753), TOBN(0xb286514c, 0xc57c2d49),
- TOBN(0xd8769670, 0x1e0bfd24), TOBN(0x950c547e, 0x04478922),
- TOBN(0xd1d41969, 0xe5d32bfe), TOBN(0x30bc1472, 0x750d6c3e),
- TOBN(0x8f3679fe, 0xe0e27f3a), TOBN(0x8f64a7dc, 0xa4a6ee0c),
- TOBN(0x2fe59937, 0x633dfb1f), TOBN(0xea82c395, 0x977f2547),
- TOBN(0xcbdfdf1a, 0x661ea646), TOBN(0xc7ccc591, 0xb9085451),
- TOBN(0x82177962, 0x81761e13), TOBN(0xda57596f, 0x9196885c),
- TOBN(0xbc17e849, 0x28ffbd70), TOBN(0x1e6e0a41, 0x2671d36f),
- TOBN(0x61ae872c, 0x4152fcf5), TOBN(0x441c87b0, 0x9e77e754),
- TOBN(0xd0799dd5, 0xa34dff09), TOBN(0x766b4e44, 0x88a6b171),
- TOBN(0xdc06a512, 0x11f1c792), TOBN(0xea02ae93, 0x4be35c3e),
- TOBN(0xe5ca4d6d, 0xe90c469e), TOBN(0x4df4368e, 0x56e4ff5c),
- TOBN(0x7817acab, 0x4baef62e), TOBN(0x9f5a2202, 0xa85b91e8),
- TOBN(0x9666ebe6, 0x6ce57610), TOBN(0x32ad31f3, 0xf73bfe03),
- TOBN(0x628330a4, 0x25bcf4d6), TOBN(0xea950593, 0x515056e6),
- TOBN(0x59811c89, 0xe1332156), TOBN(0xc89cf1fe, 0x8c11b2d7),
- TOBN(0x75b63913, 0x04e60cc0), TOBN(0xce811e8d, 0x4625d375),
- TOBN(0x030e43fc, 0x2d26e562), TOBN(0xfbb30b4b, 0x608d36a0),
- TOBN(0x634ff82c, 0x48528118), TOBN(0x7c6fe085, 0xcd285911),
- TOBN(0x7f2830c0, 0x99358f28), TOBN(0x2e60a95e, 0x665e6c09),
- TOBN(0x08407d3d, 0x9b785dbf), TOBN(0x530889ab, 0xa759bce7),
- TOBN(0xf228e0e6, 0x52f61239), TOBN(0x2b6d1461, 0x6879be3c),
- TOBN(0xe6902c04, 0x51a7bbf7), TOBN(0x30ad99f0, 0x76f24a64),
- TOBN(0x66d9317a, 0x98bc6da0), TOBN(0xf4f877f3, 0xcb596ac0),
- TOBN(0xb05ff62d, 0x4c44f119), TOBN(0x4555f536, 0xe9b77416),
- TOBN(0xc7c0d059, 0x8caed63b), TOBN(0x0cd2b7ce, 0xc358b2a9),
- TOBN(0x3f33287b, 0x46945fa3), TOBN(0xf8785b20, 0xd67c8791),
- TOBN(0xc54a7a61, 0x9637bd08), TOBN(0x54d4598c, 0x18be79d7),
- TOBN(0x889e5acb, 0xc46d7ce1), TOBN(0x9a515bb7, 0x8b085877),
- TOBN(0xfac1a03d, 0x0b7a5050), TOBN(0x7d3e738a, 0xf2926035),
- TOBN(0x861cc2ce, 0x2a6cb0eb), TOBN(0x6f2e2955, 0x8f7adc79),
- TOBN(0x61c4d451, 0x33016376), TOBN(0xd9fd2c80, 0x5ad59090),
- TOBN(0xe5a83738, 0xb2b836a1), TOBN(0x855b41a0, 0x7c0d6622),
- TOBN(0x186fe317, 0x7cc19af1), TOBN(0x6465c1ff, 0xfdd99acb),
- TOBN(0x46e5c23f, 0x6974b99e), TOBN(0x75a7cf8b, 0xa2717cbe),
- TOBN(0x4d2ebc3f, 0x062be658), TOBN(0x094b4447, 0x5f209c98),
- TOBN(0x4af285ed, 0xb940cb5a), TOBN(0x6706d792, 0x7cc82f10),
- TOBN(0xc8c8776c, 0x030526fa), TOBN(0xfa8e6f76, 0xa0da9140),
- TOBN(0x77ea9d34, 0x591ee4f0), TOBN(0x5f46e337, 0x40274166),
- TOBN(0x1bdf98bb, 0xea671457), TOBN(0xd7c08b46, 0x862a1fe2),
- TOBN(0x46cc303c, 0x1c08ad63), TOBN(0x99543440, 0x4c845e7b),
- TOBN(0x1b8fbdb5, 0x48f36bf7), TOBN(0x5b82c392, 0x8c8273a7),
- TOBN(0x08f712c4, 0x928435d5), TOBN(0x071cf0f1, 0x79330380),
- TOBN(0xc74c2d24, 0xa8da054a), TOBN(0xcb0e7201, 0x43c46b5c),
- TOBN(0x0ad7337a, 0xc0b7eff3), TOBN(0x8552225e, 0xc5e48b3c),
- TOBN(0xe6f78b0c, 0x73f13a5f), TOBN(0x5e70062e, 0x82349cbe),
- TOBN(0x6b8d5048, 0xe7073969), TOBN(0x392d2a29, 0xc33cb3d2),
- TOBN(0xee4f727c, 0x4ecaa20f), TOBN(0xa068c99e, 0x2ccde707),
- TOBN(0xfcd5651f, 0xb87a2913), TOBN(0xea3e3c15, 0x3cc252f0),
- TOBN(0x777d92df, 0x3b6cd3e4), TOBN(0x7a414143, 0xc5a732e7),
- TOBN(0xa895951a, 0xa71ff493), TOBN(0xfe980c92, 0xbbd37cf6),
- TOBN(0x45bd5e64, 0xdecfeeff), TOBN(0x910dc2a9, 0xa44c43e9),
- TOBN(0xcb403f26, 0xcca9f54d), TOBN(0x928bbdfb, 0x9303f6db),
- TOBN(0x3c37951e, 0xa9eee67c), TOBN(0x3bd61a52, 0xf79961c3),
- TOBN(0x09a238e6, 0x395c9a79), TOBN(0x6940ca2d, 0x61eb352d),
- TOBN(0x7d1e5c5e, 0xc1875631), TOBN(0x1e19742c, 0x1e1b20d1),
- TOBN(0x4633d908, 0x23fc2e6e), TOBN(0xa76e29a9, 0x08959149),
- TOBN(0x61069d9c, 0x84ed7da5), TOBN(0x0baa11cf, 0x5dbcad51),
- TOBN(0xd01eec64, 0x961849da), TOBN(0x93b75f1f, 0xaf3d8c28),
- TOBN(0x57bc4f9f, 0x1ca2ee44), TOBN(0x5a26322d, 0x00e00558),
- TOBN(0x1888d658, 0x61a023ef), TOBN(0x1d72aab4, 0xb9e5246e),
- TOBN(0xa9a26348, 0xe5563ec0), TOBN(0xa0971963, 0xc3439a43),
- TOBN(0x567dd54b, 0xadb9b5b7), TOBN(0x73fac1a1, 0xc45a524b),
- TOBN(0x8fe97ef7, 0xfe38e608), TOBN(0x608748d2, 0x3f384f48),
- TOBN(0xb0571794, 0xc486094f), TOBN(0x869254a3, 0x8bf3a8d6),
- TOBN(0x148a8dd1, 0x310b0e25), TOBN(0x99ab9f3f, 0x9aa3f7d8),
- TOBN(0x0927c68a, 0x6706c02e), TOBN(0x22b5e76c, 0x69790e6c),
- TOBN(0x6c325260, 0x6c71376c), TOBN(0x53a57690, 0x09ef6657),
- TOBN(0x8d63f852, 0xedffcf3a), TOBN(0xb4d2ed04, 0x3c0a6f55),
- TOBN(0xdb3aa8de, 0x12519b9e), TOBN(0x5d38e9c4, 0x1e0a569a),
- TOBN(0x871528bf, 0x303747e2), TOBN(0xa208e77c, 0xf5b5c18d),
- TOBN(0x9d129c88, 0xca6bf923), TOBN(0xbcbf197f, 0xbf02839f),
- TOBN(0x9b9bf030, 0x27323194), TOBN(0x3b055a8b, 0x339ca59d),
- TOBN(0xb46b2312, 0x0f669520), TOBN(0x19789f1f, 0x497e5f24),
- TOBN(0x9c499468, 0xaaf01801), TOBN(0x72ee1190, 0x8b69d59c),
- TOBN(0x8bd39595, 0xacf4c079), TOBN(0x3ee11ece, 0x8e0cd048),
- TOBN(0xebde86ec, 0x1ed66f18), TOBN(0x225d906b, 0xd61fce43),
- TOBN(0x5cab07d6, 0xe8bed74d), TOBN(0x16e4617f, 0x27855ab7),
- TOBN(0x6568aadd, 0xb2fbc3dd), TOBN(0xedb5484f, 0x8aeddf5b),
- TOBN(0x878f20e8, 0x6dcf2fad), TOBN(0x3516497c, 0x615f5699),}
- ,
- {TOBN(0xef0a3fec, 0xfa181e69), TOBN(0x9ea02f81, 0x30d69a98),
- TOBN(0xb2e9cf8e, 0x66eab95d), TOBN(0x520f2beb, 0x24720021),
- TOBN(0x621c540a, 0x1df84361), TOBN(0x12037721, 0x71fa6d5d),
- TOBN(0x6e3c7b51, 0x0ff5f6ff), TOBN(0x817a069b, 0xabb2bef3),
- TOBN(0x83572fb6, 0xb294cda6), TOBN(0x6ce9bf75, 0xb9039f34),
- TOBN(0x20e012f0, 0x095cbb21), TOBN(0xa0aecc1b, 0xd063f0da),
- TOBN(0x57c21c3a, 0xf02909e5), TOBN(0xc7d59ecf, 0x48ce9cdc),
- TOBN(0x2732b844, 0x8ae336f8), TOBN(0x056e3723, 0x3f4f85f4),
- TOBN(0x8a10b531, 0x89e800ca), TOBN(0x50fe0c17, 0x145208fd),
- TOBN(0x9e43c0d3, 0xb714ba37), TOBN(0x427d200e, 0x34189acc),
- TOBN(0x05dee24f, 0xe616e2c0), TOBN(0x9c25f4c8, 0xee1854c1),
- TOBN(0x4d3222a5, 0x8f342a73), TOBN(0x0807804f, 0xa027c952),
- TOBN(0xc222653a, 0x4f0d56f3), TOBN(0x961e4047, 0xca28b805),
- TOBN(0x2c03f8b0, 0x4a73434b), TOBN(0x4c966787, 0xab712a19),
- TOBN(0xcc196c42, 0x864fee42), TOBN(0xc1be93da, 0x5b0ece5c),
- TOBN(0xa87d9f22, 0xc131c159), TOBN(0x2bb6d593, 0xdce45655),
- TOBN(0x22c49ec9, 0xb809b7ce), TOBN(0x8a41486b, 0xe2c72c2c),
- TOBN(0x813b9420, 0xfea0bf36), TOBN(0xb3d36ee9, 0xa66dac69),
- TOBN(0x6fddc08a, 0x328cc987), TOBN(0x0a3bcd2c, 0x3a326461),
- TOBN(0x7103c49d, 0xd810dbba), TOBN(0xf9d81a28, 0x4b78a4c4),
- TOBN(0x3de865ad, 0xe4d55941), TOBN(0xdedafa5e, 0x30384087),
- TOBN(0x6f414abb, 0x4ef18b9b), TOBN(0x9ee9ea42, 0xfaee5268),
- TOBN(0x260faa16, 0x37a55a4a), TOBN(0xeb19a514, 0x015f93b9),
- TOBN(0x51d7ebd2, 0x9e9c3598), TOBN(0x523fc56d, 0x1932178e),
- TOBN(0x501d070c, 0xb98fe684), TOBN(0xd60fbe9a, 0x124a1458),
- TOBN(0xa45761c8, 0x92bc6b3f), TOBN(0xf5384858, 0xfe6f27cb),
- TOBN(0x4b0271f7, 0xb59e763b), TOBN(0x3d4606a9, 0x5b5a8e5e),
- TOBN(0x1eda5d9b, 0x05a48292), TOBN(0xda7731d0, 0xe6fec446),
- TOBN(0xa3e33693, 0x90d45871), TOBN(0xe9764040, 0x06166d8d),
- TOBN(0xb5c33682, 0x89a90403), TOBN(0x4bd17983, 0x72f1d637),
- TOBN(0xa616679e, 0xd5d2c53a), TOBN(0x5ec4bcd8, 0xfdcf3b87),
- TOBN(0xae6d7613, 0xb66a694e), TOBN(0x7460fc76, 0xe3fc27e5),
- TOBN(0x70469b82, 0x95caabee), TOBN(0xde024ca5, 0x889501e3),
- TOBN(0x6bdadc06, 0x076ed265), TOBN(0x0cb1236b, 0x5a0ef8b2),
- TOBN(0x4065ddbf, 0x0972ebf9), TOBN(0xf1dd3875, 0x22aca432),
- TOBN(0xa88b97cf, 0x744aff76), TOBN(0xd1359afd, 0xfe8e3d24),
- TOBN(0x52a3ba2b, 0x91502cf3), TOBN(0x2c3832a8, 0x084db75d),
- TOBN(0x04a12ddd, 0xde30b1c9), TOBN(0x7802eabc, 0xe31fd60c),
- TOBN(0x33707327, 0xa37fddab), TOBN(0x65d6f2ab, 0xfaafa973),
- TOBN(0x3525c5b8, 0x11e6f91a), TOBN(0x76aeb0c9, 0x5f46530b),
- TOBN(0xe8815ff6, 0x2f93a675), TOBN(0xa6ec9684, 0x05f48679),
- TOBN(0x6dcbb556, 0x358ae884), TOBN(0x0af61472, 0xe19e3873),
- TOBN(0x72334372, 0xa5f696be), TOBN(0xc65e57ea, 0x6f22fb70),
- TOBN(0x268da30c, 0x946cea90), TOBN(0x136a8a87, 0x65681b2a),
- TOBN(0xad5e81dc, 0x0f9f44d4), TOBN(0xf09a6960, 0x2c46585a),
- TOBN(0xd1649164, 0xc447d1b1), TOBN(0x3b4b36c8, 0x879dc8b1),
- TOBN(0x20d4177b, 0x3b6b234c), TOBN(0x096a2505, 0x1730d9d0),
- TOBN(0x0611b9b8, 0xef80531d), TOBN(0xba904b3b, 0x64bb495d),
- TOBN(0x1192d9d4, 0x93a3147a), TOBN(0x9f30a5dc, 0x9a565545),
- TOBN(0x90b1f9cb, 0x6ef07212), TOBN(0x29958546, 0x0d87fc13),
- TOBN(0xd3323eff, 0xc17db9ba), TOBN(0xcb18548c, 0xcb1644a8),
- TOBN(0x18a306d4, 0x4f49ffbc), TOBN(0x28d658f1, 0x4c2e8684),
- TOBN(0x44ba60cd, 0xa99f8c71), TOBN(0x67b7abdb, 0x4bf742ff),
- TOBN(0x66310f9c, 0x914b3f99), TOBN(0xae430a32, 0xf412c161),
- TOBN(0x1e6776d3, 0x88ace52f), TOBN(0x4bc0fa24, 0x52d7067d),
- TOBN(0x03c286aa, 0x8f07cd1b), TOBN(0x4cb8f38c, 0xa985b2c1),
- TOBN(0x83ccbe80, 0x8c3bff36), TOBN(0x005a0bd2, 0x5263e575),
- TOBN(0x460d7dda, 0x259bdcd1), TOBN(0x4a1c5642, 0xfa5cab6b),
- TOBN(0x2b7bdbb9, 0x9fe4fc88), TOBN(0x09418e28, 0xcc97bbb5),
- TOBN(0xd8274fb4, 0xa12321ae), TOBN(0xb137007d, 0x5c87b64e),
- TOBN(0x80531fe1, 0xc63c4962), TOBN(0x50541e89, 0x981fdb25),
- TOBN(0xdc1291a1, 0xfd4c2b6b), TOBN(0xc0693a17, 0xa6df4fca),
- TOBN(0xb2c4604e, 0x0117f203), TOBN(0x245f1963, 0x0a99b8d0),
- TOBN(0xaedc20aa, 0xc6212c44), TOBN(0xb1ed4e56, 0x520f52a8),
- TOBN(0xfe48f575, 0xf8547be3), TOBN(0x0a7033cd, 0xa9e45f98),
- TOBN(0x4b45d3a9, 0x18c50100), TOBN(0xb2a6cd6a, 0xa61d41da),
- TOBN(0x60bbb4f5, 0x57933c6b), TOBN(0xa7538ebd, 0x2b0d7ffc),
- TOBN(0x9ea3ab8d, 0x8cd626b6), TOBN(0x8273a484, 0x3601625a),
- TOBN(0x88859845, 0x0168e508), TOBN(0x8cbc9bb2, 0x99a94abd),
- TOBN(0x713ac792, 0xfab0a671), TOBN(0xa3995b19, 0x6c9ebffc),
- TOBN(0xe711668e, 0x1239e152), TOBN(0x56892558, 0xbbb8dff4),
- TOBN(0x8bfc7dab, 0xdbf17963), TOBN(0x5b59fe5a, 0xb3de1253),
- TOBN(0x7e3320eb, 0x34a9f7ae), TOBN(0xe5e8cf72, 0xd751efe4),
- TOBN(0x7ea003bc, 0xd9be2f37), TOBN(0xc0f551a0, 0xb6c08ef7),
- TOBN(0x56606268, 0x038f6725), TOBN(0x1dd38e35, 0x6d92d3b6),
- TOBN(0x07dfce7c, 0xc3cbd686), TOBN(0x4e549e04, 0x651c5da8),
- TOBN(0x4058f93b, 0x08b19340), TOBN(0xc2fae6f4, 0xcac6d89d),
- TOBN(0x4bad8a8c, 0x8f159cc7), TOBN(0x0ddba4b3, 0xcb0b601c),
- TOBN(0xda4fc7b5, 0x1dd95f8c), TOBN(0x1d163cd7, 0xcea5c255),
- TOBN(0x30707d06, 0x274a8c4c), TOBN(0x79d9e008, 0x2802e9ce),
- TOBN(0x02a29ebf, 0xe6ddd505), TOBN(0x37064e74, 0xb50bed1a),
- TOBN(0x3f6bae65, 0xa7327d57), TOBN(0x3846f5f1, 0xf83920bc),
- TOBN(0x87c37491, 0x60df1b9b), TOBN(0x4cfb2895, 0x2d1da29f),
- TOBN(0x10a478ca, 0x4ed1743c), TOBN(0x390c6030, 0x3edd47c6),
- TOBN(0x8f3e5312, 0x8c0a78de), TOBN(0xccd02bda, 0x1e85df70),
- TOBN(0xd6c75c03, 0xa61b6582), TOBN(0x0762921c, 0xfc0eebd1),
- TOBN(0xd34d0823, 0xd85010c0), TOBN(0xd73aaacb, 0x0044cf1f),
- TOBN(0xfb4159bb, 0xa3b5e78a), TOBN(0x2287c7f7, 0xe5826f3f),
- TOBN(0x4aeaf742, 0x580b1a01), TOBN(0xf080415d, 0x60423b79),
- TOBN(0xe12622cd, 0xa7dea144), TOBN(0x49ea4996, 0x59d62472),
- TOBN(0xb42991ef, 0x571f3913), TOBN(0x0610f214, 0xf5b25a8a),
- TOBN(0x47adc585, 0x30b79e8f), TOBN(0xf90e3df6, 0x07a065a2),
- TOBN(0x5d0a5deb, 0x43e2e034), TOBN(0x53fb5a34, 0x444024aa),
- TOBN(0xa8628c68, 0x6b0c9f7f), TOBN(0x9c69c29c, 0xac563656),
- TOBN(0x5a231feb, 0xbace47b6), TOBN(0xbdce0289, 0x9ea5a2ec),
- TOBN(0x05da1fac, 0x9463853e), TOBN(0x96812c52, 0x509e78aa),
- TOBN(0xd3fb5771, 0x57151692), TOBN(0xeb2721f8, 0xd98e1c44),
- TOBN(0xc0506087, 0x32399be1), TOBN(0xda5a5511, 0xd979d8b8),
- TOBN(0x737ed55d, 0xc6f56780), TOBN(0xe20d3004, 0x0dc7a7f4),
- TOBN(0x02ce7301, 0xf5941a03), TOBN(0x91ef5215, 0xed30f83a),
- TOBN(0x28727fc1, 0x4092d85f), TOBN(0x72d223c6, 0x5c49e41a),
- TOBN(0xa7cf30a2, 0xba6a4d81), TOBN(0x7c086209, 0xb030d87d),
- TOBN(0x04844c7d, 0xfc588b09), TOBN(0x728cd499, 0x5874bbb0),
- TOBN(0xcc1281ee, 0xe84c0495), TOBN(0x0769b5ba, 0xec31958f),
- TOBN(0x665c228b, 0xf99c2471), TOBN(0xf2d8a11b, 0x191eb110),
- TOBN(0x4594f494, 0xd36d7024), TOBN(0x482ded8b, 0xcdcb25a1),
- TOBN(0xc958a9d8, 0xdadd4885), TOBN(0x7004477e, 0xf1d2b547),
- TOBN(0x0a45f6ef, 0x2a0af550), TOBN(0x4fc739d6, 0x2f8d6351),
- TOBN(0x75cdaf27, 0x786f08a9), TOBN(0x8700bb26, 0x42c2737f),
- TOBN(0x855a7141, 0x1c4e2670), TOBN(0x810188c1, 0x15076fef),
- TOBN(0xc251d0c9, 0xabcd3297), TOBN(0xae4c8967, 0xf48108eb),
- TOBN(0xbd146de7, 0x18ceed30), TOBN(0xf9d4f07a, 0xc986bced),
- TOBN(0x5ad98ed5, 0x83fa1e08), TOBN(0x7780d33e, 0xbeabd1fb),
- TOBN(0xe330513c, 0x903b1196), TOBN(0xba11de9e, 0xa47bc8c4),
- TOBN(0x684334da, 0x02c2d064), TOBN(0x7ecf360d, 0xa48de23b),
- TOBN(0x57a1b474, 0x0a9089d8), TOBN(0xf28fa439, 0xff36734c),
- TOBN(0xf2a482cb, 0xea4570b3), TOBN(0xee65d68b, 0xa5ebcee9),
- TOBN(0x988d0036, 0xb9694cd5), TOBN(0x53edd0e9, 0x37885d32),
- TOBN(0xe37e3307, 0xbeb9bc6d), TOBN(0xe9abb907, 0x9f5c6768),
- TOBN(0x4396ccd5, 0x51f2160f), TOBN(0x2500888c, 0x47336da6),
- TOBN(0x383f9ed9, 0x926fce43), TOBN(0x809dd1c7, 0x04da2930),
- TOBN(0x30f6f596, 0x8a4cb227), TOBN(0x0d700c7f, 0x73a56b38),
- TOBN(0x1825ea33, 0xab64a065), TOBN(0xaab9b735, 0x1338df80),
- TOBN(0x1516100d, 0x9b63f57f), TOBN(0x2574395a, 0x27a6a634),
- TOBN(0xb5560fb6, 0x700a1acd), TOBN(0xe823fd73, 0xfd999681),
- TOBN(0xda915d1f, 0x6cb4e1ba), TOBN(0x0d030118, 0x6ebe00a3),
- TOBN(0x744fb0c9, 0x89fca8cd), TOBN(0x970d01db, 0xf9da0e0b),
- TOBN(0x0ad8c564, 0x7931d76f), TOBN(0xb15737bf, 0xf659b96a),
- TOBN(0xdc9933e8, 0xa8b484e7), TOBN(0xb2fdbdf9, 0x7a26dec7),
- TOBN(0x2349e9a4, 0x9f1f0136), TOBN(0x7860368e, 0x70fddddb),
- TOBN(0xd93d2c1c, 0xf9ad3e18), TOBN(0x6d6c5f17, 0x689f4e79),
- TOBN(0x7a544d91, 0xb24ff1b6), TOBN(0x3e12a5eb, 0xfe16cd8c),
- TOBN(0x543574e9, 0xa56b872f), TOBN(0xa1ad550c, 0xfcf68ea2),
- TOBN(0x689e37d2, 0x3f560ef7), TOBN(0x8c54b9ca, 0xc9d47a8b),
- TOBN(0x46d40a4a, 0x088ac342), TOBN(0xec450c7c, 0x1576c6d0),
- TOBN(0xb589e31c, 0x1f9689e9), TOBN(0xdacf2602, 0xb8781718),
- TOBN(0xa89237c6, 0xc8cb6b42), TOBN(0x1326fc93, 0xb96ef381),
- TOBN(0x55d56c6d, 0xb5f07825), TOBN(0xacba2eea, 0x7449e22d),
- TOBN(0x74e0887a, 0x633c3000), TOBN(0xcb6cd172, 0xd7cbcf71),
- TOBN(0x309e81de, 0xc36cf1be), TOBN(0x07a18a6d, 0x60ae399b),
- TOBN(0xb36c2679, 0x9edce57e), TOBN(0x52b892f4, 0xdf001d41),
- TOBN(0xd884ae5d, 0x16a1f2c6), TOBN(0x9b329424, 0xefcc370a),
- TOBN(0x3120daf2, 0xbd2e21df), TOBN(0x55298d2d, 0x02470a99),
- TOBN(0x0b78af6c, 0xa05db32e), TOBN(0x5c76a331, 0x601f5636),
- TOBN(0xaae861ff, 0xf8a4f29c), TOBN(0x70dc9240, 0xd68f8d49),
- TOBN(0x960e649f, 0x81b1321c), TOBN(0x3d2c801b, 0x8792e4ce),
- TOBN(0xf479f772, 0x42521876), TOBN(0x0bed93bc, 0x416c79b1),
- TOBN(0xa67fbc05, 0x263e5bc9), TOBN(0x01e8e630, 0x521db049),
- TOBN(0x76f26738, 0xc6f3431e), TOBN(0xe609cb02, 0xe3267541),
- TOBN(0xb10cff2d, 0x818c877c), TOBN(0x1f0e75ce, 0x786a13cb),
- TOBN(0xf4fdca64, 0x1158544d), TOBN(0x5d777e89, 0x6cb71ed0),
- TOBN(0x3c233737, 0xa9aa4755), TOBN(0x7b453192, 0xe527ab40),
- TOBN(0xdb59f688, 0x39f05ffe), TOBN(0x8f4f4be0, 0x6d82574e),
- TOBN(0xcce3450c, 0xee292d1b), TOBN(0xaa448a12, 0x61ccd086),
- TOBN(0xabce91b3, 0xf7914967), TOBN(0x4537f09b, 0x1908a5ed),
- TOBN(0xa812421e, 0xf51042e7), TOBN(0xfaf5cebc, 0xec0b3a34),
- TOBN(0x730ffd87, 0x4ca6b39a), TOBN(0x70fb72ed, 0x02efd342),
- TOBN(0xeb4735f9, 0xd75c8edb), TOBN(0xc11f2157, 0xc278aa51),
- TOBN(0xc459f635, 0xbf3bfebf), TOBN(0x3a1ff0b4, 0x6bd9601f),
- TOBN(0xc9d12823, 0xc420cb73), TOBN(0x3e9af3e2, 0x3c2915a3),
- TOBN(0xe0c82c72, 0xb41c3440), TOBN(0x175239e5, 0xe3039a5f),
- TOBN(0xe1084b8a, 0x558795a3), TOBN(0x328d0a1d, 0xd01e5c60),
- TOBN(0x0a495f2e, 0xd3788a04), TOBN(0x25d8ff16, 0x66c11a9f),
- TOBN(0xf5155f05, 0x9ed692d6), TOBN(0x954fa107, 0x4f425fe4),
- TOBN(0xd16aabf2, 0xe98aaa99), TOBN(0x90cd8ba0, 0x96b0f88a),
- TOBN(0x957f4782, 0xc154026a), TOBN(0x54ee0734, 0x52af56d2),
- TOBN(0xbcf89e54, 0x45b4147a), TOBN(0x3d102f21, 0x9a52816c),
- TOBN(0x6808517e, 0x39b62e77), TOBN(0x92e25421, 0x69169ad8),
- TOBN(0xd721d871, 0xbb608558), TOBN(0x60e4ebae, 0xf6d4ff9b),
- TOBN(0x0ba10819, 0x41f2763e), TOBN(0xca2e45be, 0x51ee3247),
- TOBN(0x66d172ec, 0x2bfd7a5f), TOBN(0x528a8f2f, 0x74d0b12d),
- TOBN(0xe17f1e38, 0xdabe70dc), TOBN(0x1d5d7316, 0x9f93983c),
- TOBN(0x51b2184a, 0xdf423e31), TOBN(0xcb417291, 0xaedb1a10),
- TOBN(0x2054ca93, 0x625bcab9), TOBN(0x54396860, 0xa98998f0),
- TOBN(0x4e53f6c4, 0xa54ae57e), TOBN(0x0ffeb590, 0xee648e9d),
- TOBN(0xfbbdaadc, 0x6afaf6bc), TOBN(0xf88ae796, 0xaa3bfb8a),
- TOBN(0x209f1d44, 0xd2359ed9), TOBN(0xac68dd03, 0xf3544ce2),
- TOBN(0xf378da47, 0xfd51e569), TOBN(0xe1abd860, 0x2cc80097),
- TOBN(0x23ca18d9, 0x343b6e3a), TOBN(0x480797e8, 0xb40a1bae),
- TOBN(0xd1f0c717, 0x533f3e67), TOBN(0x44896970, 0x06e6cdfc),
- TOBN(0x8ca21055, 0x52a82e8d), TOBN(0xb2caf785, 0x78460cdc),
- TOBN(0x4c1b7b62, 0xe9037178), TOBN(0xefc09d2c, 0xdb514b58),
- TOBN(0x5f2df9ee, 0x9113be5c), TOBN(0x2fbda78f, 0xb3f9271c),
- TOBN(0xe09a81af, 0x8f83fc54), TOBN(0x06b13866, 0x8afb5141),
- TOBN(0x38f6480f, 0x43e3865d), TOBN(0x72dd77a8, 0x1ddf47d9),
- TOBN(0xf2a8e971, 0x4c205ff7), TOBN(0x46d449d8, 0x9d088ad8),
- TOBN(0x926619ea, 0x185d706f), TOBN(0xe47e02eb, 0xc7dd7f62),
- TOBN(0xe7f120a7, 0x8cbc2031), TOBN(0xc18bef00, 0x998d4ac9),
- TOBN(0x18f37a9c, 0x6bdf22da), TOBN(0xefbc432f, 0x90dc82df),
- TOBN(0xc52cef8e, 0x5d703651), TOBN(0x82887ba0, 0xd99881a5),
- TOBN(0x7cec9dda, 0xb920ec1d), TOBN(0xd0d7e8c3, 0xec3e8d3b),
- TOBN(0x445bc395, 0x4ca88747), TOBN(0xedeaa2e0, 0x9fd53535),
- TOBN(0x461b1d93, 0x6cc87475), TOBN(0xd92a52e2, 0x6d2383bd),
- TOBN(0xfabccb59, 0xd7903546), TOBN(0x6111a761, 0x3d14b112),
- TOBN(0x0ae584fe, 0xb3d5f612), TOBN(0x5ea69b8d, 0x60e828ec),
- TOBN(0x6c078985, 0x54087030), TOBN(0x649cab04, 0xac4821fe),
- TOBN(0x25ecedcf, 0x8bdce214), TOBN(0xb5622f72, 0x86af7361),
- TOBN(0x0e1227aa, 0x7038b9e2), TOBN(0xd0efb273, 0xac20fa77),
- TOBN(0x817ff88b, 0x79df975b), TOBN(0x856bf286, 0x1999503e),
- TOBN(0xb4d5351f, 0x5038ec46), TOBN(0x740a52c5, 0xfc42af6e),
- TOBN(0x2e38bb15, 0x2cbb1a3f), TOBN(0xc3eb99fe, 0x17a83429),
- TOBN(0xca4fcbf1, 0xdd66bb74), TOBN(0x880784d6, 0xcde5e8fc),
- TOBN(0xddc84c1c, 0xb4e7a0be), TOBN(0x8780510d, 0xbd15a72f),
- TOBN(0x44bcf1af, 0x81ec30e1), TOBN(0x141e50a8, 0x0a61073e),
- TOBN(0x0d955718, 0x47be87ae), TOBN(0x68a61417, 0xf76a4372),
- TOBN(0xf57e7e87, 0xc607c3d3), TOBN(0x043afaf8, 0x5252f332),
- TOBN(0xcc14e121, 0x1552a4d2), TOBN(0xb6dee692, 0xbb4d4ab4),
- TOBN(0xb6ab74c8, 0xa03816a4), TOBN(0x84001ae4, 0x6f394a29),
- TOBN(0x5bed8344, 0xd795fb45), TOBN(0x57326e7d, 0xb79f55a5),
- TOBN(0xc9533ce0, 0x4accdffc), TOBN(0x53473caf, 0x3993fa04),
- TOBN(0x7906eb93, 0xa13df4c8), TOBN(0xa73e51f6, 0x97cbe46f),
- TOBN(0xd1ab3ae1, 0x0ae4ccf8), TOBN(0x25614508, 0x8a5b3dbc),
- TOBN(0x61eff962, 0x11a71b27), TOBN(0xdf71412b, 0x6bb7fa39),
- TOBN(0xb31ba6b8, 0x2bd7f3ef), TOBN(0xb0b9c415, 0x69180d29),
- TOBN(0xeec14552, 0x014cdde5), TOBN(0x702c624b, 0x227b4bbb),
- TOBN(0x2b15e8c2, 0xd3e988f3), TOBN(0xee3bcc6d, 0xa4f7fd04),
- TOBN(0x9d00822a, 0x42ac6c85), TOBN(0x2db0cea6, 0x1df9f2b7),
- TOBN(0xd7cad2ab, 0x42de1e58), TOBN(0x346ed526, 0x2d6fbb61),
- TOBN(0xb3962995, 0x1a2faf09), TOBN(0x2fa8a580, 0x7c25612e),
- TOBN(0x30ae04da, 0x7cf56490), TOBN(0x75662908, 0x0eea3961),
- TOBN(0x3609f5c5, 0x3d080847), TOBN(0xcb081d39, 0x5241d4f6),
- TOBN(0xb4fb3810, 0x77961a63), TOBN(0xc20c5984, 0x2abb66fc),
- TOBN(0x3d40aa7c, 0xf902f245), TOBN(0x9cb12736, 0x4e536b1e),
- TOBN(0x5eda24da, 0x99b3134f), TOBN(0xafbd9c69, 0x5cd011af),
- TOBN(0x9a16e30a, 0xc7088c7d), TOBN(0x5ab65710, 0x3207389f),
- TOBN(0x1b09547f, 0xe7407a53), TOBN(0x2322f9d7, 0x4fdc6eab),
- TOBN(0xc0f2f22d, 0x7430de4d), TOBN(0x19382696, 0xe68ca9a9),
- TOBN(0x17f1eff1, 0x918e5868), TOBN(0xe3b5b635, 0x586f4204),
- TOBN(0x146ef980, 0x3fbc4341), TOBN(0x359f2c80, 0x5b5eed4e),
- TOBN(0x9f35744e, 0x7482e41d), TOBN(0x9a9ac3ec, 0xf3b224c2),
- TOBN(0x9161a6fe, 0x91fc50ae), TOBN(0x89ccc66b, 0xc613fa7c),
- TOBN(0x89268b14, 0xc732f15a), TOBN(0x7cd6f4e2, 0xb467ed03),
- TOBN(0xfbf79869, 0xce56b40e), TOBN(0xf93e094c, 0xc02dde98),
- TOBN(0xefe0c3a8, 0xedee2cd7), TOBN(0x90f3ffc0, 0xb268fd42),
- TOBN(0x81a7fd56, 0x08241aed), TOBN(0x95ab7ad8, 0x00b1afe8),
- TOBN(0x40127056, 0x3e310d52), TOBN(0xd3ffdeb1, 0x09d9fc43),
- TOBN(0xc8f85c91, 0xd11a8594), TOBN(0x2e74d258, 0x31cf6db8),
- TOBN(0x829c7ca3, 0x02b5dfd0), TOBN(0xe389cfbe, 0x69143c86),
- TOBN(0xd01b6405, 0x941768d8), TOBN(0x45103995, 0x03bf825d),
- TOBN(0xcc4ee166, 0x56cd17e2), TOBN(0xbea3c283, 0xba037e79),
- TOBN(0x4e1ac06e, 0xd9a47520), TOBN(0xfbfe18aa, 0xaf852404),
- TOBN(0x5615f8e2, 0x8087648a), TOBN(0x7301e47e, 0xb9d150d9),
- TOBN(0x79f9f9dd, 0xb299b977), TOBN(0x76697a7b, 0xa5b78314),
- TOBN(0x10d67468, 0x7d7c90e7), TOBN(0x7afffe03, 0x937210b5),
- TOBN(0x5aef3e4b, 0x28c22cee), TOBN(0xefb0ecd8, 0x09fd55ae),
- TOBN(0x4cea7132, 0x0d2a5d6a), TOBN(0x9cfb5fa1, 0x01db6357),
- TOBN(0x395e0b57, 0xf36e1ac5), TOBN(0x008fa9ad, 0x36cafb7d),
- TOBN(0x8f6cdf70, 0x5308c4db), TOBN(0x51527a37, 0x95ed2477),
- TOBN(0xba0dee30, 0x5bd21311), TOBN(0x6ed41b22, 0x909c90d7),
- TOBN(0xc5f6b758, 0x7c8696d3), TOBN(0x0db8eaa8, 0x3ce83a80),
- TOBN(0xd297fe37, 0xb24b4b6f), TOBN(0xfe58afe8, 0x522d1f0d),
- TOBN(0x97358736, 0x8c98dbd9), TOBN(0x6bc226ca, 0x9454a527),
- TOBN(0xa12b384e, 0xce53c2d0), TOBN(0x779d897d, 0x5e4606da),
- TOBN(0xa53e47b0, 0x73ec12b0), TOBN(0x462dbbba, 0x5756f1ad),
- TOBN(0x69fe09f2, 0xcafe37b6), TOBN(0x273d1ebf, 0xecce2e17),
- TOBN(0x8ac1d538, 0x3cf607fd), TOBN(0x8035f7ff, 0x12e10c25),}
- ,
- {TOBN(0x854d34c7, 0x7e6c5520), TOBN(0xc27df9ef, 0xdcb9ea58),
- TOBN(0x405f2369, 0xd686666d), TOBN(0x29d1febf, 0x0417aa85),
- TOBN(0x9846819e, 0x93470afe), TOBN(0x3e6a9669, 0xe2a27f9e),
- TOBN(0x24d008a2, 0xe31e6504), TOBN(0xdba7cecf, 0x9cb7680a),
- TOBN(0xecaff541, 0x338d6e43), TOBN(0x56f7dd73, 0x4541d5cc),
- TOBN(0xb5d426de, 0x96bc88ca), TOBN(0x48d94f6b, 0x9ed3a2c3),
- TOBN(0x6354a3bb, 0x2ef8279c), TOBN(0xd575465b, 0x0b1867f2),
- TOBN(0xef99b0ff, 0x95225151), TOBN(0xf3e19d88, 0xf94500d8),
- TOBN(0x92a83268, 0xe32dd620), TOBN(0x913ec99f, 0x627849a2),
- TOBN(0xedd8fdfa, 0x2c378882), TOBN(0xaf96f33e, 0xee6f8cfe),
- TOBN(0xc06737e5, 0xdc3fa8a5), TOBN(0x236bb531, 0xb0b03a1d),
- TOBN(0x33e59f29, 0x89f037b0), TOBN(0x13f9b5a7, 0xd9a12a53),
- TOBN(0x0d0df6ce, 0x51efb310), TOBN(0xcb5b2eb4, 0x958df5be),
- TOBN(0xd6459e29, 0x36158e59), TOBN(0x82aae2b9, 0x1466e336),
- TOBN(0xfb658a39, 0x411aa636), TOBN(0x7152ecc5, 0xd4c0a933),
- TOBN(0xf10c758a, 0x49f026b7), TOBN(0xf4837f97, 0xcb09311f),
- TOBN(0xddfb02c4, 0xc753c45f), TOBN(0x18ca81b6, 0xf9c840fe),
- TOBN(0x846fd09a, 0xb0f8a3e6), TOBN(0xb1162add, 0xe7733dbc),
- TOBN(0x7070ad20, 0x236e3ab6), TOBN(0xf88cdaf5, 0xb2a56326),
- TOBN(0x05fc8719, 0x997cbc7a), TOBN(0x442cd452, 0x4b665272),
- TOBN(0x7807f364, 0xb71698f5), TOBN(0x6ba418d2, 0x9f7b605e),
- TOBN(0xfd20b00f, 0xa03b2cbb), TOBN(0x883eca37, 0xda54386f),
- TOBN(0xff0be43f, 0xf3437f24), TOBN(0xe910b432, 0xa48bb33c),
- TOBN(0x4963a128, 0x329df765), TOBN(0xac1dd556, 0xbe2fe6f7),
- TOBN(0x557610f9, 0x24a0a3fc), TOBN(0x38e17bf4, 0xe881c3f9),
- TOBN(0x6ba84faf, 0xed0dac99), TOBN(0xd4a222c3, 0x59eeb918),
- TOBN(0xc79c1dbe, 0x13f542b6), TOBN(0x1fc65e0d, 0xe425d457),
- TOBN(0xeffb754f, 0x1debb779), TOBN(0x638d8fd0, 0x9e08af60),
- TOBN(0x994f523a, 0x626332d5), TOBN(0x7bc38833, 0x5561bb44),
- TOBN(0x005ed4b0, 0x3d845ea2), TOBN(0xd39d3ee1, 0xc2a1f08a),
- TOBN(0x6561fdd3, 0xe7676b0d), TOBN(0x620e35ff, 0xfb706017),
- TOBN(0x36ce424f, 0xf264f9a8), TOBN(0xc4c3419f, 0xda2681f7),
- TOBN(0xfb6afd2f, 0x69beb6e8), TOBN(0x3a50b993, 0x6d700d03),
- TOBN(0xc840b2ad, 0x0c83a14f), TOBN(0x573207be, 0x54085bef),
- TOBN(0x5af882e3, 0x09fe7e5b), TOBN(0x957678a4, 0x3b40a7e1),
- TOBN(0x172d4bdd, 0x543056e2), TOBN(0x9c1b26b4, 0x0df13c0a),
- TOBN(0x1c30861c, 0xf405ff06), TOBN(0xebac86bd, 0x486e828b),
- TOBN(0xe791a971, 0x636933fc), TOBN(0x50e7c2be, 0x7aeee947),
- TOBN(0xc3d4a095, 0xfa90d767), TOBN(0xae60eb7b, 0xe670ab7b),
- TOBN(0x17633a64, 0x397b056d), TOBN(0x93a21f33, 0x105012aa),
- TOBN(0x663c370b, 0xabb88643), TOBN(0x91df36d7, 0x22e21599),
- TOBN(0x183ba835, 0x8b761671), TOBN(0x381eea1d, 0x728f3bf1),
- TOBN(0xb9b2f1ba, 0x39966e6c), TOBN(0x7c464a28, 0xe7295492),
- TOBN(0x0fd5f70a, 0x09b26b7f), TOBN(0xa9aba1f9, 0xfbe009df),
- TOBN(0x857c1f22, 0x369b87ad), TOBN(0x3c00e5d9, 0x32fca556),
- TOBN(0x1ad74cab, 0x90b06466), TOBN(0xa7112386, 0x550faaf2),
- TOBN(0x7435e198, 0x6d9bd5f5), TOBN(0x2dcc7e38, 0x59c3463f),
- TOBN(0xdc7df748, 0xca7bd4b2), TOBN(0x13cd4c08, 0x9dec2f31),
- TOBN(0x0d3b5df8, 0xe3237710), TOBN(0x0dadb26e, 0xcbd2f7b0),
- TOBN(0x9f5966ab, 0xe4aa082b), TOBN(0x666ec8de, 0x350e966e),
- TOBN(0x1bfd1ed5, 0xee524216), TOBN(0xcd93c59b, 0x41dab0b6),
- TOBN(0x658a8435, 0xd186d6ba), TOBN(0x1b7d34d2, 0x159d1195),
- TOBN(0x5936e460, 0x22caf46b), TOBN(0x6a45dd8f, 0x9a96fe4f),
- TOBN(0xf7925434, 0xb98f474e), TOBN(0x41410412, 0x0053ef15),
- TOBN(0x71cf8d12, 0x41de97bf), TOBN(0xb8547b61, 0xbd80bef4),
- TOBN(0xb47d3970, 0xc4db0037), TOBN(0xf1bcd328, 0xfef20dff),
- TOBN(0x31a92e09, 0x10caad67), TOBN(0x1f591960, 0x5531a1e1),
- TOBN(0x3bb852e0, 0x5f4fc840), TOBN(0x63e297ca, 0x93a72c6c),
- TOBN(0x3c2b0b2e, 0x49abad67), TOBN(0x6ec405fc, 0xed3db0d9),
- TOBN(0xdc14a530, 0x7fef1d40), TOBN(0xccd19846, 0x280896fc),
- TOBN(0x00f83176, 0x9bb81648), TOBN(0xd69eb485, 0x653120d0),
- TOBN(0xd17d75f4, 0x4ccabc62), TOBN(0x34a07f82, 0xb749fcb1),
- TOBN(0x2c3af787, 0xbbfb5554), TOBN(0xb06ed4d0, 0x62e283f8),
- TOBN(0x5722889f, 0xa19213a0), TOBN(0x162b085e, 0xdcf3c7b4),
- TOBN(0xbcaecb31, 0xe0dd3eca), TOBN(0xc6237fbc, 0xe52f13a5),
- TOBN(0xcc2b6b03, 0x27bac297), TOBN(0x2ae1cac5, 0xb917f54a),
- TOBN(0x474807d4, 0x7845ae4f), TOBN(0xfec7dd92, 0xce5972e0),
- TOBN(0xc3bd2541, 0x1d7915bb), TOBN(0x66f85dc4, 0xd94907ca),
- TOBN(0xd981b888, 0xbdbcf0ca), TOBN(0xd75f5da6, 0xdf279e9f),
- TOBN(0x128bbf24, 0x7054e934), TOBN(0x3c6ff6e5, 0x81db134b),
- TOBN(0x795b7cf4, 0x047d26e4), TOBN(0xf370f7b8, 0x5049ec37),
- TOBN(0xc6712d4d, 0xced945af), TOBN(0xdf30b5ec, 0x095642bc),
- TOBN(0x9b034c62, 0x4896246e), TOBN(0x5652c016, 0xee90bbd1),
- TOBN(0xeb38636f, 0x87fedb73), TOBN(0x5e32f847, 0x0135a613),
- TOBN(0x0703b312, 0xcf933c83), TOBN(0xd05bb76e, 0x1a7f47e6),
- TOBN(0x825e4f0c, 0x949c2415), TOBN(0x569e5622, 0x7250d6f8),
- TOBN(0xbbe9eb3a, 0x6568013e), TOBN(0x8dbd203f, 0x22f243fc),
- TOBN(0x9dbd7694, 0xb342734a), TOBN(0x8f6d12f8, 0x46afa984),
- TOBN(0xb98610a2, 0xc9eade29), TOBN(0xbab4f323, 0x47dd0f18),
- TOBN(0x5779737b, 0x671c0d46), TOBN(0x10b6a7c6, 0xd3e0a42a),
- TOBN(0xfb19ddf3, 0x3035b41c), TOBN(0xd336343f, 0x99c45895),
- TOBN(0x61fe4938, 0x54c857e5), TOBN(0xc4d506be, 0xae4e57d5),
- TOBN(0x3cd8c8cb, 0xbbc33f75), TOBN(0x7281f08a, 0x9262c77d),
- TOBN(0x083f4ea6, 0xf11a2823), TOBN(0x8895041e, 0x9fba2e33),
- TOBN(0xfcdfea49, 0x9c438edf), TOBN(0x7678dcc3, 0x91edba44),
- TOBN(0xf07b3b87, 0xe2ba50f0), TOBN(0xc13888ef, 0x43948c1b),
- TOBN(0xc2135ad4, 0x1140af42), TOBN(0x8e5104f3, 0x926ed1a7),
- TOBN(0xf24430cb, 0x88f6695f), TOBN(0x0ce0637b, 0x6d73c120),
- TOBN(0xb2db01e6, 0xfe631e8f), TOBN(0x1c5563d7, 0xd7bdd24b),
- TOBN(0x8daea3ba, 0x369ad44f), TOBN(0x000c81b6, 0x8187a9f9),
- TOBN(0x5f48a951, 0xaae1fd9a), TOBN(0xe35626c7, 0x8d5aed8a),
- TOBN(0x20952763, 0x0498c622), TOBN(0x76d17634, 0x773aa504),
- TOBN(0x36d90dda, 0xeb300f7a), TOBN(0x9dcf7dfc, 0xedb5e801),
- TOBN(0x645cb268, 0x74d5244c), TOBN(0xa127ee79, 0x348e3aa2),
- TOBN(0x488acc53, 0x575f1dbb), TOBN(0x95037e85, 0x80e6161e),
- TOBN(0x57e59283, 0x292650d0), TOBN(0xabe67d99, 0x14938216),
- TOBN(0x3c7f944b, 0x3f8e1065), TOBN(0xed908cb6, 0x330e8924),
- TOBN(0x08ee8fd5, 0x6f530136), TOBN(0x2227b7d5, 0xd7ffc169),
- TOBN(0x4f55c893, 0xb5cd6dd5), TOBN(0x82225e11, 0xa62796e8),
- TOBN(0x5c6cead1, 0xcb18e12c), TOBN(0x4381ae0c, 0x84f5a51a),
- TOBN(0x345913d3, 0x7fafa4c8), TOBN(0x3d918082, 0x0491aac0),
- TOBN(0x9347871f, 0x3e69264c), TOBN(0xbea9dd3c, 0xb4f4f0cd),
- TOBN(0xbda5d067, 0x3eadd3e7), TOBN(0x0033c1b8, 0x0573bcd8),
- TOBN(0x25589379, 0x5da2486c), TOBN(0xcb89ee5b, 0x86abbee7),
- TOBN(0x8fe0a8f3, 0x22532e5d), TOBN(0xb6410ff0, 0x727dfc4c),
- TOBN(0x619b9d58, 0x226726db), TOBN(0x5ec25669, 0x7a2b2dc7),
- TOBN(0xaf4d2e06, 0x4c3beb01), TOBN(0x852123d0, 0x7acea556),
- TOBN(0x0e9470fa, 0xf783487a), TOBN(0x75a7ea04, 0x5664b3eb),
- TOBN(0x4ad78f35, 0x6798e4ba), TOBN(0x9214e6e5, 0xc7d0e091),
- TOBN(0xc420b488, 0xb1290403), TOBN(0x64049e0a, 0xfc295749),
- TOBN(0x03ef5af1, 0x3ae9841f), TOBN(0xdbe4ca19, 0xb0b662a6),
- TOBN(0x46845c5f, 0xfa453458), TOBN(0xf8dabf19, 0x10b66722),
- TOBN(0xb650f0aa, 0xcce2793b), TOBN(0x71db851e, 0xc5ec47c1),
- TOBN(0x3eb78f3e, 0x3b234fa9), TOBN(0xb0c60f35, 0xfc0106ce),
- TOBN(0x05427121, 0x774eadbd), TOBN(0x25367faf, 0xce323863),
- TOBN(0x7541b5c9, 0xcd086976), TOBN(0x4ff069e2, 0xdc507ad1),
- TOBN(0x74145256, 0x8776e667), TOBN(0x6e76142c, 0xb23c6bb5),
- TOBN(0xdbf30712, 0x1b3a8a87), TOBN(0x60e7363e, 0x98450836),
- TOBN(0x5741450e, 0xb7366d80), TOBN(0xe4ee14ca, 0x4837dbdf),
- TOBN(0xa765eb9b, 0x69d4316f), TOBN(0x04548dca, 0x8ef43825),
- TOBN(0x9c9f4e4c, 0x5ae888eb), TOBN(0x733abb51, 0x56e9ac99),
- TOBN(0xdaad3c20, 0xba6ac029), TOBN(0x9b8dd3d3, 0x2ba3e38e),
- TOBN(0xa9bb4c92, 0x0bc5d11a), TOBN(0xf20127a7, 0x9c5f88a3),
- TOBN(0x4f52b06e, 0x161d3cb8), TOBN(0x26c1ff09, 0x6afaf0a6),
- TOBN(0x32670d2f, 0x7189e71f), TOBN(0xc6438748, 0x5ecf91e7),
- TOBN(0x15758e57, 0xdb757a21), TOBN(0x427d09f8, 0x290a9ce5),
- TOBN(0x846a308f, 0x38384a7a), TOBN(0xaac3acb4, 0xb0732b99),
- TOBN(0x9e941009, 0x17845819), TOBN(0x95cba111, 0xa7ce5e03),
- TOBN(0x6f3d4f7f, 0xb00009c4), TOBN(0xb8396c27, 0x8ff28b5f),
- TOBN(0xb1a9ae43, 0x1c97975d), TOBN(0x9d7ba8af, 0xe5d9fed5),
- TOBN(0x338cf09f, 0x34f485b6), TOBN(0xbc0ddacc, 0x64122516),
- TOBN(0xa450da12, 0x05d471fe), TOBN(0x4c3a6250, 0x628dd8c9),
- TOBN(0x69c7d103, 0xd1295837), TOBN(0xa2893e50, 0x3807eb2f),
- TOBN(0xd6e1e1de, 0xbdb41491), TOBN(0xc630745b, 0x5e138235),
- TOBN(0xc892109e, 0x48661ae1), TOBN(0x8d17e7eb, 0xea2b2674),
- TOBN(0x00ec0f87, 0xc328d6b5), TOBN(0x6d858645, 0xf079ff9e),
- TOBN(0x6cdf243e, 0x19115ead), TOBN(0x1ce1393e, 0x4bac4fcf),
- TOBN(0x2c960ed0, 0x9c29f25b), TOBN(0x59be4d8e, 0x9d388a05),
- TOBN(0x0d46e06c, 0xd0def72b), TOBN(0xb923db5d, 0xe0342748),
- TOBN(0xf7d3aacd, 0x936d4a3d), TOBN(0x558519cc, 0x0b0b099e),
- TOBN(0x3ea8ebf8, 0x827097ef), TOBN(0x259353db, 0xd054f55d),
- TOBN(0x84c89abc, 0x6d2ed089), TOBN(0x5c548b69, 0x8e096a7c),
- TOBN(0xd587f616, 0x994b995d), TOBN(0x4d1531f6, 0xa5845601),
- TOBN(0x792ab31e, 0x451fd9f0), TOBN(0xc8b57bb2, 0x65adf6ca),
- TOBN(0x68440fcb, 0x1cd5ad73), TOBN(0xb9c860e6, 0x6144da4f),
- TOBN(0x2ab286aa, 0x8462beb8), TOBN(0xcc6b8fff, 0xef46797f),
- TOBN(0xac820da4, 0x20c8a471), TOBN(0x69ae05a1, 0x77ff7faf),
- TOBN(0xb9163f39, 0xbfb5da77), TOBN(0xbd03e590, 0x2c73ab7a),
- TOBN(0x7e862b5e, 0xb2940d9e), TOBN(0x3c663d86, 0x4b9af564),
- TOBN(0xd8309031, 0xbde3033d), TOBN(0x298231b2, 0xd42c5bc6),
- TOBN(0x42090d2c, 0x552ad093), TOBN(0xa4799d1c, 0xff854695),
- TOBN(0x0a88b5d6, 0xd31f0d00), TOBN(0xf8b40825, 0xa2f26b46),
- TOBN(0xec29b1ed, 0xf1bd7218), TOBN(0xd491c53b, 0x4b24c86e),
- TOBN(0xd2fe588f, 0x3395ea65), TOBN(0x6f3764f7, 0x4456ef15),
- TOBN(0xdb43116d, 0xcdc34800), TOBN(0xcdbcd456, 0xc1e33955),
- TOBN(0xefdb5540, 0x74ab286b), TOBN(0x948c7a51, 0xd18c5d7c),
- TOBN(0xeb81aa37, 0x7378058e), TOBN(0x41c746a1, 0x04411154),
- TOBN(0xa10c73bc, 0xfb828ac7), TOBN(0x6439be91, 0x9d972b29),
- TOBN(0x4bf3b4b0, 0x43a2fbad), TOBN(0x39e6dadf, 0x82b5e840),
- TOBN(0x4f716408, 0x6397bd4c), TOBN(0x0f7de568, 0x7f1eeccb),
- TOBN(0x5865c5a1, 0xd2ffbfc1), TOBN(0xf74211fa, 0x4ccb6451),
- TOBN(0x66368a88, 0xc0b32558), TOBN(0x5b539dc2, 0x9ad7812e),
- TOBN(0x579483d0, 0x2f3af6f6), TOBN(0x52132078, 0x99934ece),
- TOBN(0x50b9650f, 0xdcc9e983), TOBN(0xca989ec9, 0xaee42b8a),
- TOBN(0x6a44c829, 0xd6f62f99), TOBN(0x8f06a309, 0x4c2a7c0c),
- TOBN(0x4ea2b3a0, 0x98a0cb0a), TOBN(0x5c547b70, 0xbeee8364),
- TOBN(0x461d40e1, 0x682afe11), TOBN(0x9e0fc77a, 0x7b41c0a8),
- TOBN(0x79e4aefd, 0xe20d5d36), TOBN(0x2916e520, 0x32dd9f63),
- TOBN(0xf59e52e8, 0x3f883faf), TOBN(0x396f9639, 0x2b868d35),
- TOBN(0xc902a9df, 0x4ca19881), TOBN(0x0fc96822, 0xdb2401a6),
- TOBN(0x41237587, 0x66f1c68d), TOBN(0x10fc6de3, 0xfb476c0d),
- TOBN(0xf8b6b579, 0x841f5d90), TOBN(0x2ba8446c, 0xfa24f44a),
- TOBN(0xa237b920, 0xef4a9975), TOBN(0x60bb6004, 0x2330435f),
- TOBN(0xd6f4ab5a, 0xcfb7e7b5), TOBN(0xb2ac5097, 0x83435391),
- TOBN(0xf036ee2f, 0xb0d1ea67), TOBN(0xae779a6a, 0x74c56230),
- TOBN(0x59bff8c8, 0xab838ae6), TOBN(0xcd83ca99, 0x9b38e6f0),
- TOBN(0xbb27bef5, 0xe33deed3), TOBN(0xe6356f6f, 0x001892a8),
- TOBN(0xbf3be6cc, 0x7adfbd3e), TOBN(0xaecbc81c, 0x33d1ac9d),
- TOBN(0xe4feb909, 0xe6e861dc), TOBN(0x90a247a4, 0x53f5f801),
- TOBN(0x01c50acb, 0x27346e57), TOBN(0xce29242e, 0x461acc1b),
- TOBN(0x04dd214a, 0x2f998a91), TOBN(0x271ee9b1, 0xd4baf27b),
- TOBN(0x7e3027d1, 0xe8c26722), TOBN(0x21d1645c, 0x1820dce5),
- TOBN(0x086f242c, 0x7501779c), TOBN(0xf0061407, 0xfa0e8009),
- TOBN(0xf23ce477, 0x60187129), TOBN(0x05bbdedb, 0x0fde9bd0),
- TOBN(0x682f4832, 0x25d98473), TOBN(0xf207fe85, 0x5c658427),
- TOBN(0xb6fdd7ba, 0x4166ffa1), TOBN(0x0c314056, 0x9eed799d),
- TOBN(0x0db8048f, 0x4107e28f), TOBN(0x74ed3871, 0x41216840),
- TOBN(0x74489f8f, 0x56a3c06e), TOBN(0x1e1c005b, 0x12777134),
- TOBN(0xdb332a73, 0xf37ec3c3), TOBN(0xc65259bd, 0xdd59eba0),
- TOBN(0x2291709c, 0xdb4d3257), TOBN(0x9a793b25, 0xbd389390),
- TOBN(0xf39fe34b, 0xe43756f0), TOBN(0x2f76bdce, 0x9afb56c9),
- TOBN(0x9f37867a, 0x61208b27), TOBN(0xea1d4307, 0x089972c3),
- TOBN(0x8c595330, 0x8bdf623a), TOBN(0x5f5accda, 0x8441fb7d),
- TOBN(0xfafa9418, 0x32ddfd95), TOBN(0x6ad40c5a, 0x0fde9be7),
- TOBN(0x43faba89, 0xaeca8709), TOBN(0xc64a7cf1, 0x2c248a9d),
- TOBN(0x16620252, 0x72637a76), TOBN(0xaee1c791, 0x22b8d1bb),
- TOBN(0xf0f798fd, 0x21a843b2), TOBN(0x56e4ed4d, 0x8d005cb1),
- TOBN(0x355f7780, 0x1f0d8abe), TOBN(0x197b04cf, 0x34522326),
- TOBN(0x41f9b31f, 0xfd42c13f), TOBN(0x5ef7feb2, 0xb40f933d),
- TOBN(0x27326f42, 0x5d60bad4), TOBN(0x027ecdb2, 0x8c92cf89),
- TOBN(0x04aae4d1, 0x4e3352fe), TOBN(0x08414d2f, 0x73591b90),
- TOBN(0x5ed6124e, 0xb7da7d60), TOBN(0xb985b931, 0x4d13d4ec),
- TOBN(0xa592d3ab, 0x96bf36f9), TOBN(0x012dbed5, 0xbbdf51df),
- TOBN(0xa57963c0, 0xdf6c177d), TOBN(0x010ec869, 0x87ca29cf),
- TOBN(0xba1700f6, 0xbf926dff), TOBN(0x7c9fdbd1, 0xf4bf6bc2),
- TOBN(0xdc18dc8f, 0x64da11f5), TOBN(0xa6074b7a, 0xd938ae75),
- TOBN(0x14270066, 0xe84f44a4), TOBN(0x99998d38, 0xd27b954e),
- TOBN(0xc1be8ab2, 0xb4f38e9a), TOBN(0x8bb55bbf, 0x15c01016),
- TOBN(0xf73472b4, 0x0ea2ab30), TOBN(0xd365a340, 0xf73d68dd),
- TOBN(0xc01a7168, 0x19c2e1eb), TOBN(0x32f49e37, 0x34061719),
- TOBN(0xb73c57f1, 0x01d8b4d6), TOBN(0x03c8423c, 0x26b47700),
- TOBN(0x321d0bc8, 0xa4d8826a), TOBN(0x6004213c, 0x4bc0e638),
- TOBN(0xf78c64a1, 0xc1c06681), TOBN(0x16e0a16f, 0xef018e50),
- TOBN(0x31cbdf91, 0xdb42b2b3), TOBN(0xf8f4ffce, 0xe0d36f58),
- TOBN(0xcdcc71cd, 0x4cc5e3e0), TOBN(0xd55c7cfa, 0xa129e3e0),
- TOBN(0xccdb6ba0, 0x0fb2cbf1), TOBN(0x6aba0005, 0xc4bce3cb),
- TOBN(0x501cdb30, 0xd232cfc4), TOBN(0x9ddcf12e, 0xd58a3cef),
- TOBN(0x02d2cf9c, 0x87e09149), TOBN(0xdc5d7ec7, 0x2c976257),
- TOBN(0x6447986e, 0x0b50d7dd), TOBN(0x88fdbaf7, 0x807f112a),
- TOBN(0x58c9822a, 0xb00ae9f6), TOBN(0x6abfb950, 0x6d3d27e0),
- TOBN(0xd0a74487, 0x8a429f4f), TOBN(0x0649712b, 0xdb516609),
- TOBN(0xb826ba57, 0xe769b5df), TOBN(0x82335df2, 0x1fc7aaf2),
- TOBN(0x2389f067, 0x5c93d995), TOBN(0x59ac367a, 0x68677be6),
- TOBN(0xa77985ff, 0x21d9951b), TOBN(0x038956fb, 0x85011cce),
- TOBN(0x608e48cb, 0xbb734e37), TOBN(0xc08c0bf2, 0x2be5b26f),
- TOBN(0x17bbdd3b, 0xf9b1a0d9), TOBN(0xeac7d898, 0x10483319),
- TOBN(0xc95c4baf, 0xbc1a6dea), TOBN(0xfdd0e2bf, 0x172aafdb),
- TOBN(0x40373cbc, 0x8235c41a), TOBN(0x14303f21, 0xfb6f41d5),
- TOBN(0xba063621, 0x0408f237), TOBN(0xcad3b09a, 0xecd2d1ed),
- TOBN(0x4667855a, 0x52abb6a2), TOBN(0xba9157dc, 0xaa8b417b),
- TOBN(0xfe7f3507, 0x4f013efb), TOBN(0x1b112c4b, 0xaa38c4a2),
- TOBN(0xa1406a60, 0x9ba64345), TOBN(0xe53cba33, 0x6993c80b),
- TOBN(0x45466063, 0xded40d23), TOBN(0x3d5f1f4d, 0x54908e25),
- TOBN(0x9ebefe62, 0x403c3c31), TOBN(0x274ea0b5, 0x0672a624),
- TOBN(0xff818d99, 0x451d1b71), TOBN(0x80e82643, 0x8f79cf79),
- TOBN(0xa165df13, 0x73ce37f5), TOBN(0xa744ef4f, 0xfe3a21fd),
- TOBN(0x73f1e7f5, 0xcf551396), TOBN(0xc616898e, 0x868c676b),
- TOBN(0x671c28c7, 0x8c442c36), TOBN(0xcfe5e558, 0x5e0a317d),
- TOBN(0x1242d818, 0x7051f476), TOBN(0x56fad2a6, 0x14f03442),
- TOBN(0x262068bc, 0x0a44d0f6), TOBN(0xdfa2cd6e, 0xce6edf4e),
- TOBN(0x0f43813a, 0xd15d1517), TOBN(0x61214cb2, 0x377d44f5),
- TOBN(0xd399aa29, 0xc639b35f), TOBN(0x42136d71, 0x54c51c19),
- TOBN(0x9774711b, 0x08417221), TOBN(0x0a5546b3, 0x52545a57),
- TOBN(0x80624c41, 0x1150582d), TOBN(0x9ec5c418, 0xfbc555bc),
- TOBN(0x2c87dcad, 0x771849f1), TOBN(0xb0c932c5, 0x01d7bf6f),
- TOBN(0x6aa5cd3e, 0x89116eb2), TOBN(0xd378c25a, 0x51ca7bd3),
- TOBN(0xc612a0da, 0x9e6e3e31), TOBN(0x0417a54d, 0xb68ad5d0),
- TOBN(0x00451e4a, 0x22c6edb8), TOBN(0x9fbfe019, 0xb42827ce),
- TOBN(0x2fa92505, 0xba9384a2), TOBN(0x21b8596e, 0x64ad69c1),
- TOBN(0x8f4fcc49, 0x983b35a6), TOBN(0xde093760, 0x72754672),
- TOBN(0x2f14ccc8, 0xf7bffe6d), TOBN(0x27566bff, 0x5d94263d),
- TOBN(0xb5b4e9c6, 0x2df3ec30), TOBN(0x94f1d7d5, 0x3e6ea6ba),
- TOBN(0x97b7851a, 0xaaca5e9b), TOBN(0x518aa521, 0x56713b97),
- TOBN(0x3357e8c7, 0x150a61f6), TOBN(0x7842e7e2, 0xec2c2b69),
- TOBN(0x8dffaf65, 0x6868a548), TOBN(0xd963bd82, 0xe068fc81),
- TOBN(0x64da5c8b, 0x65917733), TOBN(0x927090ff, 0x7b247328),}
- ,
- {TOBN(0x214bc9a7, 0xd298c241), TOBN(0xe3b697ba, 0x56807cfd),
- TOBN(0xef1c7802, 0x4564eadb), TOBN(0xdde8cdcf, 0xb48149c5),
- TOBN(0x946bf0a7, 0x5a4d2604), TOBN(0x27154d7f, 0x6c1538af),
- TOBN(0x95cc9230, 0xde5b1fcc), TOBN(0xd88519e9, 0x66864f82),
- TOBN(0xb828dd1a, 0x7cb1282c), TOBN(0xa08d7626, 0xbe46973a),
- TOBN(0x6baf8d40, 0xe708d6b2), TOBN(0x72571fa1, 0x4daeb3f3),
- TOBN(0x85b1732f, 0xf22dfd98), TOBN(0x87ab01a7, 0x0087108d),
- TOBN(0xaaaafea8, 0x5988207a), TOBN(0xccc832f8, 0x69f00755),
- TOBN(0x964d950e, 0x36ff3bf0), TOBN(0x8ad20f6f, 0xf0b34638),
- TOBN(0x4d9177b3, 0xb5d7585f), TOBN(0xcf839760, 0xef3f019f),
- TOBN(0x582fc5b3, 0x8288c545), TOBN(0x2f8e4e9b, 0x13116bd1),
- TOBN(0xf91e1b2f, 0x332120ef), TOBN(0xcf568724, 0x2a17dd23),
- TOBN(0x488f1185, 0xca8d9d1a), TOBN(0xadf2c77d, 0xd987ded2),
- TOBN(0x5f3039f0, 0x60c46124), TOBN(0xe5d70b75, 0x71e095f4),
- TOBN(0x82d58650, 0x6260e70f), TOBN(0x39d75ea7, 0xf750d105),
- TOBN(0x8cf3d0b1, 0x75bac364), TOBN(0xf3a7564d, 0x21d01329),
- TOBN(0x182f04cd, 0x2f52d2a7), TOBN(0x4fde149a, 0xe2df565a),
- TOBN(0xb80c5eec, 0xa79fb2f7), TOBN(0xab491d7b, 0x22ddc897),
- TOBN(0x99d76c18, 0xc6312c7f), TOBN(0xca0d5f3d, 0x6aa41a57),
- TOBN(0x71207325, 0xd15363a0), TOBN(0xe82aa265, 0xbeb252c2),
- TOBN(0x94ab4700, 0xec3128c2), TOBN(0x6c76d862, 0x8e383f49),
- TOBN(0xdc36b150, 0xc03024eb), TOBN(0xfb439477, 0x53daac69),
- TOBN(0xfc68764a, 0x8dc79623), TOBN(0x5b86995d, 0xb440fbb2),
- TOBN(0xd66879bf, 0xccc5ee0d), TOBN(0x05228942, 0x95aa8bd3),
- TOBN(0xb51a40a5, 0x1e6a75c1), TOBN(0x24327c76, 0x0ea7d817),
- TOBN(0x06630182, 0x07774597), TOBN(0xd6fdbec3, 0x97fa7164),
- TOBN(0x20c99dfb, 0x13c90f48), TOBN(0xd6ac5273, 0x686ef263),
- TOBN(0xc6a50bdc, 0xfef64eeb), TOBN(0xcd87b281, 0x86fdfc32),
- TOBN(0xb24aa43e, 0x3fcd3efc), TOBN(0xdd26c034, 0xb8088e9a),
- TOBN(0xa5ef4dc9, 0xbd3d46ea), TOBN(0xa2f99d58, 0x8a4c6a6f),
- TOBN(0xddabd355, 0x2f1da46c), TOBN(0x72c3f8ce, 0x1afacdd1),
- TOBN(0xd90c4eee, 0x92d40578), TOBN(0xd28bb41f, 0xca623b94),
- TOBN(0x50fc0711, 0x745edc11), TOBN(0x9dd9ad7d, 0x3dc87558),
- TOBN(0xce6931fb, 0xb49d1e64), TOBN(0x6c77a0a2, 0xc98bd0f9),
- TOBN(0x62b9a629, 0x6baf7cb1), TOBN(0xcf065f91, 0xccf72d22),
- TOBN(0x7203cce9, 0x79639071), TOBN(0x09ae4885, 0xf9cb732f),
- TOBN(0x5e7c3bec, 0xee8314f3), TOBN(0x1c068aed, 0xdbea298f),
- TOBN(0x08d381f1, 0x7c80acec), TOBN(0x03b56be8, 0xe330495b),
- TOBN(0xaeffb8f2, 0x9222882d), TOBN(0x95ff38f6, 0xc4af8bf7),
- TOBN(0x50e32d35, 0x1fc57d8c), TOBN(0x6635be52, 0x17b444f0),
- TOBN(0x04d15276, 0xa5177900), TOBN(0x4e1dbb47, 0xf6858752),
- TOBN(0x5b475622, 0xc615796c), TOBN(0xa6fa0387, 0x691867bf),
- TOBN(0xed7f5d56, 0x2844c6d0), TOBN(0xc633cf9b, 0x03a2477d),
- TOBN(0xf6be5c40, 0x2d3721d6), TOBN(0xaf312eb7, 0xe9fd68e6),
- TOBN(0x242792d2, 0xe7417ce1), TOBN(0xff42bc71, 0x970ee7f5),
- TOBN(0x1ff4dc6d, 0x5c67a41e), TOBN(0x77709b7b, 0x20882a58),
- TOBN(0x3554731d, 0xbe217f2c), TOBN(0x2af2a8cd, 0x5bb72177),
- TOBN(0x58eee769, 0x591dd059), TOBN(0xbb2930c9, 0x4bba6477),
- TOBN(0x863ee047, 0x7d930cfc), TOBN(0x4c262ad1, 0x396fd1f4),
- TOBN(0xf4765bc8, 0x039af7e1), TOBN(0x2519834b, 0x5ba104f6),
- TOBN(0x7cd61b4c, 0xd105f961), TOBN(0xa5415da5, 0xd63bca54),
- TOBN(0x778280a0, 0x88a1f17c), TOBN(0xc4968949, 0x2329512c),
- TOBN(0x174a9126, 0xcecdaa7a), TOBN(0xfc8c7e0e, 0x0b13247b),
- TOBN(0x29c110d2, 0x3484c1c4), TOBN(0xf8eb8757, 0x831dfc3b),
- TOBN(0x022f0212, 0xc0067452), TOBN(0x3f6f69ee, 0x7b9b926c),
- TOBN(0x09032da0, 0xef42daf4), TOBN(0x79f00ade, 0x83f80de4),
- TOBN(0x6210db71, 0x81236c97), TOBN(0x74f7685b, 0x3ee0781f),
- TOBN(0x4df7da7b, 0xa3e41372), TOBN(0x2aae38b1, 0xb1a1553e),
- TOBN(0x1688e222, 0xf6dd9d1b), TOBN(0x57695448, 0x5b8b6487),
- TOBN(0x478d2127, 0x4b2edeaa), TOBN(0xb2818fa5, 0x1e85956a),
- TOBN(0x1e6addda, 0xf176f2c0), TOBN(0x01ca4604, 0xe2572658),
- TOBN(0x0a404ded, 0x85342ffb), TOBN(0x8cf60f96, 0x441838d6),
- TOBN(0x9bbc691c, 0xc9071c4a), TOBN(0xfd588744, 0x34442803),
- TOBN(0x97101c85, 0x809c0d81), TOBN(0xa7fb754c, 0x8c456f7f),
- TOBN(0xc95f3c5c, 0xd51805e1), TOBN(0xab4ccd39, 0xb299dca8),
- TOBN(0x3e03d20b, 0x47eaf500), TOBN(0xfa3165c1, 0xd7b80893),
- TOBN(0x005e8b54, 0xe160e552), TOBN(0xdc4972ba, 0x9019d11f),
- TOBN(0x21a6972e, 0x0c9a4a7a), TOBN(0xa52c258f, 0x37840fd7),
- TOBN(0xf8559ff4, 0xc1e99d81), TOBN(0x08e1a7d6, 0xa3c617c0),
- TOBN(0xb398fd43, 0x248c6ba7), TOBN(0x6ffedd91, 0xd1283794),
- TOBN(0x8a6a59d2, 0xd629d208), TOBN(0xa9d141d5, 0x3490530e),
- TOBN(0x42f6fc18, 0x38505989), TOBN(0x09bf250d, 0x479d94ee),
- TOBN(0x223ad3b1, 0xb3822790), TOBN(0x6c5926c0, 0x93b8971c),
- TOBN(0x609efc7e, 0x75f7fa62), TOBN(0x45d66a6d, 0x1ec2d989),
- TOBN(0x4422d663, 0x987d2792), TOBN(0x4a73caad, 0x3eb31d2b),
- TOBN(0xf06c2ac1, 0xa32cb9e6), TOBN(0xd9445c5f, 0x91aeba84),
- TOBN(0x6af7a1d5, 0xaf71013f), TOBN(0xe68216e5, 0x0bedc946),
- TOBN(0xf4cba30b, 0xd27370a0), TOBN(0x7981afbf, 0x870421cc),
- TOBN(0x02496a67, 0x9449f0e1), TOBN(0x86cfc4be, 0x0a47edae),
- TOBN(0x3073c936, 0xb1feca22), TOBN(0xf5694612, 0x03f8f8fb),
- TOBN(0xd063b723, 0x901515ea), TOBN(0x4c6c77a5, 0x749cf038),
- TOBN(0x6361e360, 0xab9e5059), TOBN(0x596cf171, 0xa76a37c0),
- TOBN(0x800f53fa, 0x6530ae7a), TOBN(0x0f5e631e, 0x0792a7a6),
- TOBN(0x5cc29c24, 0xefdb81c9), TOBN(0xa269e868, 0x3f9c40ba),
- TOBN(0xec14f9e1, 0x2cb7191e), TOBN(0x78ea1bd8, 0xe5b08ea6),
- TOBN(0x3c65aa9b, 0x46332bb9), TOBN(0x84cc22b3, 0xbf80ce25),
- TOBN(0x0098e9e9, 0xd49d5bf1), TOBN(0xcd4ec1c6, 0x19087da4),
- TOBN(0x3c9d07c5, 0xaef6e357), TOBN(0x839a0268, 0x9f8f64b8),
- TOBN(0xc5e9eb62, 0xc6d8607f), TOBN(0x759689f5, 0x6aa995e4),
- TOBN(0x70464669, 0xbbb48317), TOBN(0x921474bf, 0xe402417d),
- TOBN(0xcabe135b, 0x2a354c8c), TOBN(0xd51e52d2, 0x812fa4b5),
- TOBN(0xec741096, 0x53311fe8), TOBN(0x4f774535, 0xb864514b),
- TOBN(0xbcadd671, 0x5bde48f8), TOBN(0xc9703873, 0x2189bc7d),
- TOBN(0x5d45299e, 0xc709ee8a), TOBN(0xd1287ee2, 0x845aaff8),
- TOBN(0x7d1f8874, 0xdb1dbf1f), TOBN(0xea46588b, 0x990c88d6),
- TOBN(0x60ba649a, 0x84368313), TOBN(0xd5fdcbce, 0x60d543ae),
- TOBN(0x90b46d43, 0x810d5ab0), TOBN(0x6739d8f9, 0x04d7e5cc),
- TOBN(0x021c1a58, 0x0d337c33), TOBN(0x00a61162, 0x68e67c40),
- TOBN(0x95ef413b, 0x379f0a1f), TOBN(0xfe126605, 0xe9e2ab95),
- TOBN(0x67578b85, 0x2f5f199c), TOBN(0xf5c00329, 0x2cb84913),
- TOBN(0xf7956430, 0x37577dd8), TOBN(0x83b82af4, 0x29c5fe88),
- TOBN(0x9c1bea26, 0xcdbdc132), TOBN(0x589fa086, 0x9c04339e),
- TOBN(0x033e9538, 0xb13799df), TOBN(0x85fa8b21, 0xd295d034),
- TOBN(0xdf17f73f, 0xbd9ddcca), TOBN(0xf32bd122, 0xddb66334),
- TOBN(0x55ef88a7, 0x858b044c), TOBN(0x1f0d69c2, 0x5aa9e397),
- TOBN(0x55fd9cc3, 0x40d85559), TOBN(0xc774df72, 0x7785ddb2),
- TOBN(0x5dcce9f6, 0xd3bd2e1c), TOBN(0xeb30da20, 0xa85dfed0),
- TOBN(0x5ed7f5bb, 0xd3ed09c4), TOBN(0x7d42a35c, 0x82a9c1bd),
- TOBN(0xcf3de995, 0x9890272d), TOBN(0x75f3432a, 0x3e713a10),
- TOBN(0x5e13479f, 0xe28227b8), TOBN(0xb8561ea9, 0xfefacdc8),
- TOBN(0xa6a297a0, 0x8332aafd), TOBN(0x9b0d8bb5, 0x73809b62),
- TOBN(0xd2fa1cfd, 0x0c63036f), TOBN(0x7a16eb55, 0xbd64bda8),
- TOBN(0x3f5cf5f6, 0x78e62ddc), TOBN(0x2267c454, 0x07fd752b),
- TOBN(0x5e361b6b, 0x5e437bbe), TOBN(0x95c59501, 0x8354e075),
- TOBN(0xec725f85, 0xf2b254d9), TOBN(0x844b617d, 0x2cb52b4e),
- TOBN(0xed8554f5, 0xcf425fb5), TOBN(0xab67703e, 0x2af9f312),
- TOBN(0x4cc34ec1, 0x3cf48283), TOBN(0xb09daa25, 0x9c8a705e),
- TOBN(0xd1e9d0d0, 0x5b7d4f84), TOBN(0x4df6ef64, 0xdb38929d),
- TOBN(0xe16b0763, 0xaa21ba46), TOBN(0xc6b1d178, 0xa293f8fb),
- TOBN(0x0ff5b602, 0xd520aabf), TOBN(0x94d671bd, 0xc339397a),
- TOBN(0x7c7d98cf, 0x4f5792fa), TOBN(0x7c5e0d67, 0x11215261),
- TOBN(0x9b19a631, 0xa7c5a6d4), TOBN(0xc8511a62, 0x7a45274d),
- TOBN(0x0c16621c, 0xa5a60d99), TOBN(0xf7fbab88, 0xcf5e48cb),
- TOBN(0xab1e6ca2, 0xf7ddee08), TOBN(0x83bd08ce, 0xe7867f3c),
- TOBN(0xf7e48e8a, 0x2ac13e27), TOBN(0x4494f6df, 0x4eb1a9f5),
- TOBN(0xedbf84eb, 0x981f0a62), TOBN(0x49badc32, 0x536438f0),
- TOBN(0x50bea541, 0x004f7571), TOBN(0xbac67d10, 0xdf1c94ee),
- TOBN(0x253d73a1, 0xb727bc31), TOBN(0xb3d01cf2, 0x30686e28),
- TOBN(0x51b77b1b, 0x55fd0b8b), TOBN(0xa099d183, 0xfeec3173),
- TOBN(0x202b1fb7, 0x670e72b7), TOBN(0xadc88b33, 0xa8e1635f),
- TOBN(0x34e8216a, 0xf989d905), TOBN(0xc2e68d20, 0x29b58d01),
- TOBN(0x11f81c92, 0x6fe55a93), TOBN(0x15f1462a, 0x8f296f40),
- TOBN(0x1915d375, 0xea3d62f2), TOBN(0xa17765a3, 0x01c8977d),
- TOBN(0x7559710a, 0xe47b26f6), TOBN(0xe0bd29c8, 0x535077a5),
- TOBN(0x615f976d, 0x08d84858), TOBN(0x370dfe85, 0x69ced5c1),
- TOBN(0xbbc7503c, 0xa734fa56), TOBN(0xfbb9f1ec, 0x91ac4574),
- TOBN(0x95d7ec53, 0x060dd7ef), TOBN(0xeef2dacd, 0x6e657979),
- TOBN(0x54511af3, 0xe2a08235), TOBN(0x1e324aa4, 0x1f4aea3d),
- TOBN(0x550e7e71, 0xe6e67671), TOBN(0xbccd5190, 0xbf52faf7),
- TOBN(0xf880d316, 0x223cc62a), TOBN(0x0d402c7e, 0x2b32eb5d),
- TOBN(0xa40bc039, 0x306a5a3b), TOBN(0x4e0a41fd, 0x96783a1b),
- TOBN(0xa1e8d39a, 0x0253cdd4), TOBN(0x6480be26, 0xc7388638),
- TOBN(0xee365e1d, 0x2285f382), TOBN(0x188d8d8f, 0xec0b5c36),
- TOBN(0x34ef1a48, 0x1f0f4d82), TOBN(0x1a8f43e1, 0xa487d29a),
- TOBN(0x8168226d, 0x77aefb3a), TOBN(0xf69a751e, 0x1e72c253),
- TOBN(0x8e04359a, 0xe9594df1), TOBN(0x475ffd7d, 0xd14c0467),
- TOBN(0xb5a2c2b1, 0x3844e95c), TOBN(0x85caf647, 0xdd12ef94),
- TOBN(0x1ecd2a9f, 0xf1063d00), TOBN(0x1dd2e229, 0x23843311),
- TOBN(0x38f0e09d, 0x73d17244), TOBN(0x3ede7746, 0x8fc653f1),
- TOBN(0xae4459f5, 0xdc20e21c), TOBN(0x00db2ffa, 0x6a8599ea),
- TOBN(0x11682c39, 0x30cfd905), TOBN(0x4934d074, 0xa5c112a6),
- TOBN(0xbdf063c5, 0x568bfe95), TOBN(0x779a440a, 0x016c441a),
- TOBN(0x0c23f218, 0x97d6fbdc), TOBN(0xd3a5cd87, 0xe0776aac),
- TOBN(0xcee37f72, 0xd712e8db), TOBN(0xfb28c70d, 0x26f74e8d),
- TOBN(0xffe0c728, 0xb61301a0), TOBN(0xa6282168, 0xd3724354),
- TOBN(0x7ff4cb00, 0x768ffedc), TOBN(0xc51b3088, 0x03b02de9),
- TOBN(0xa5a8147c, 0x3902dda5), TOBN(0x35d2f706, 0xfe6973b4),
- TOBN(0x5ac2efcf, 0xc257457e), TOBN(0x933f48d4, 0x8700611b),
- TOBN(0xc365af88, 0x4912beb2), TOBN(0x7f5a4de6, 0x162edf94),
- TOBN(0xc646ba7c, 0x0c32f34b), TOBN(0x632c6af3, 0xb2091074),
- TOBN(0x58d4f2e3, 0x753e43a9), TOBN(0x70e1d217, 0x24d4e23f),
- TOBN(0xb24bf729, 0xafede6a6), TOBN(0x7f4a94d8, 0x710c8b60),
- TOBN(0xaad90a96, 0x8d4faa6a), TOBN(0xd9ed0b32, 0xb066b690),
- TOBN(0x52fcd37b, 0x78b6dbfd), TOBN(0x0b64615e, 0x8bd2b431),
- TOBN(0x228e2048, 0xcfb9fad5), TOBN(0xbeaa386d, 0x240b76bd),
- TOBN(0x2d6681c8, 0x90dad7bc), TOBN(0x3e553fc3, 0x06d38f5e),
- TOBN(0xf27cdb9b, 0x9d5f9750), TOBN(0x3e85c52a, 0xd28c5b0e),
- TOBN(0x190795af, 0x5247c39b), TOBN(0x547831eb, 0xbddd6828),
- TOBN(0xf327a227, 0x4a82f424), TOBN(0x36919c78, 0x7e47f89d),
- TOBN(0xe4783919, 0x43c7392c), TOBN(0xf101b9aa, 0x2316fefe),
- TOBN(0xbcdc9e9c, 0x1c5009d2), TOBN(0xfb55ea13, 0x9cd18345),
- TOBN(0xf5b5e231, 0xa3ce77c7), TOBN(0xde6b4527, 0xd2f2cb3d),
- TOBN(0x10f6a333, 0x9bb26f5f), TOBN(0x1e85db8e, 0x044d85b6),
- TOBN(0xc3697a08, 0x94197e54), TOBN(0x65e18cc0, 0xa7cb4ea8),
- TOBN(0xa38c4f50, 0xa471fe6e), TOBN(0xf031747a, 0x2f13439c),
- TOBN(0x53c4a6ba, 0xc007318b), TOBN(0xa8da3ee5, 0x1deccb3d),
- TOBN(0x0555b31c, 0x558216b1), TOBN(0x90c7810c, 0x2f79e6c2),
- TOBN(0x9b669f4d, 0xfe8eed3c), TOBN(0x70398ec8, 0xe0fac126),
- TOBN(0xa96a449e, 0xf701b235), TOBN(0x0ceecdb3, 0xeb94f395),
- TOBN(0x285fc368, 0xd0cb7431), TOBN(0x0d37bb52, 0x16a18c64),
- TOBN(0x05110d38, 0xb880d2dd), TOBN(0xa60f177b, 0x65930d57),
- TOBN(0x7da34a67, 0xf36235f5), TOBN(0x47f5e17c, 0x183816b9),
- TOBN(0xc7664b57, 0xdb394af4), TOBN(0x39ba215d, 0x7036f789),
- TOBN(0x46d2ca0e, 0x2f27b472), TOBN(0xc42647ee, 0xf73a84b7),
- TOBN(0x44bc7545, 0x64488f1d), TOBN(0xaa922708, 0xf4cf85d5),
- TOBN(0x721a01d5, 0x53e4df63), TOBN(0x649c0c51, 0x5db46ced),
- TOBN(0x6bf0d64e, 0x3cffcb6c), TOBN(0xe3bf93fe, 0x50f71d96),
- TOBN(0x75044558, 0xbcc194a0), TOBN(0x16ae3372, 0x6afdc554),
- TOBN(0xbfc01adf, 0x5ca48f3f), TOBN(0x64352f06, 0xe22a9b84),
- TOBN(0xcee54da1, 0xc1099e4a), TOBN(0xbbda54e8, 0xfa1b89c0),
- TOBN(0x166a3df5, 0x6f6e55fb), TOBN(0x1ca44a24, 0x20176f88),
- TOBN(0x936afd88, 0xdfb7b5ff), TOBN(0xe34c2437, 0x8611d4a0),
- TOBN(0x7effbb75, 0x86142103), TOBN(0x6704ba1b, 0x1f34fc4d),
- TOBN(0x7c2a468f, 0x10c1b122), TOBN(0x36b3a610, 0x8c6aace9),
- TOBN(0xabfcc0a7, 0x75a0d050), TOBN(0x066f9197, 0x3ce33e32),
- TOBN(0xce905ef4, 0x29fe09be), TOBN(0x89ee25ba, 0xa8376351),
- TOBN(0x2a3ede22, 0xfd29dc76), TOBN(0x7fd32ed9, 0x36f17260),
- TOBN(0x0cadcf68, 0x284b4126), TOBN(0x63422f08, 0xa7951fc8),
- TOBN(0x562b24f4, 0x0807e199), TOBN(0xfe9ce5d1, 0x22ad4490),
- TOBN(0xc2f51b10, 0x0db2b1b4), TOBN(0xeb3613ff, 0xe4541d0d),
- TOBN(0xbd2c4a05, 0x2680813b), TOBN(0x527aa55d, 0x561b08d6),
- TOBN(0xa9f8a40e, 0xa7205558), TOBN(0xe3eea56f, 0x243d0bec),
- TOBN(0x7b853817, 0xa0ff58b3), TOBN(0xb67d3f65, 0x1a69e627),
- TOBN(0x0b76bbb9, 0xa869b5d6), TOBN(0xa3afeb82, 0x546723ed),
- TOBN(0x5f24416d, 0x3e554892), TOBN(0x8413b53d, 0x430e2a45),
- TOBN(0x99c56aee, 0x9032a2a0), TOBN(0x09432bf6, 0xeec367b1),
- TOBN(0x552850c6, 0xdaf0ecc1), TOBN(0x49ebce55, 0x5bc92048),
- TOBN(0xdfb66ba6, 0x54811307), TOBN(0x1b84f797, 0x6f298597),
- TOBN(0x79590481, 0x8d1d7a0d), TOBN(0xd9fabe03, 0x3a6fa556),
- TOBN(0xa40f9c59, 0xba9e5d35), TOBN(0xcb1771c1, 0xf6247577),
- TOBN(0x542a47ca, 0xe9a6312b), TOBN(0xa34b3560, 0x552dd8c5),
- TOBN(0xfdf94de0, 0x0d794716), TOBN(0xd46124a9, 0x9c623094),
- TOBN(0x56b7435d, 0x68afe8b4), TOBN(0x27f20540, 0x6c0d8ea1),
- TOBN(0x12b77e14, 0x73186898), TOBN(0xdbc3dd46, 0x7479490f),
- TOBN(0x951a9842, 0xc03b0c05), TOBN(0x8b1b3bb3, 0x7921bc96),
- TOBN(0xa573b346, 0x2b202e0a), TOBN(0x77e4665d, 0x47254d56),
- TOBN(0x08b70dfc, 0xd23e3984), TOBN(0xab86e8bc, 0xebd14236),
- TOBN(0xaa3e07f8, 0x57114ba7), TOBN(0x5ac71689, 0xab0ef4f2),
- TOBN(0x88fca384, 0x0139d9af), TOBN(0x72733f88, 0x76644af0),
- TOBN(0xf122f72a, 0x65d74f4a), TOBN(0x13931577, 0xa5626c7a),
- TOBN(0xd5b5d9eb, 0x70f8d5a4), TOBN(0x375adde7, 0xd7bbb228),
- TOBN(0x31e88b86, 0x0c1c0b32), TOBN(0xd1f568c4, 0x173edbaa),
- TOBN(0x1592fc83, 0x5459df02), TOBN(0x2beac0fb, 0x0fcd9a7e),
- TOBN(0xb0a6fdb8, 0x1b473b0a), TOBN(0xe3224c6f, 0x0fe8fc48),
- TOBN(0x680bd00e, 0xe87edf5b), TOBN(0x30385f02, 0x20e77cf5),
- TOBN(0xe9ab98c0, 0x4d42d1b2), TOBN(0x72d191d2, 0xd3816d77),
- TOBN(0x1564daca, 0x0917d9e5), TOBN(0x394eab59, 0x1f8fed7f),
- TOBN(0xa209aa8d, 0x7fbb3896), TOBN(0x5564f3b9, 0xbe6ac98e),
- TOBN(0xead21d05, 0xd73654ef), TOBN(0x68d1a9c4, 0x13d78d74),
- TOBN(0x61e01708, 0x6d4973a0), TOBN(0x83da3500, 0x46e6d32a),
- TOBN(0x6a3dfca4, 0x68ae0118), TOBN(0xa1b9a4c9, 0xd02da069),
- TOBN(0x0b2ff9c7, 0xebab8302), TOBN(0x98af07c3, 0x944ba436),
- TOBN(0x85997326, 0x995f0f9f), TOBN(0x467fade0, 0x71b58bc6),
- TOBN(0x47e4495a, 0xbd625a2b), TOBN(0xfdd2d01d, 0x33c3b8cd),
- TOBN(0x2c38ae28, 0xc693f9fa), TOBN(0x48622329, 0x348f7999),
- TOBN(0x97bf738e, 0x2161f583), TOBN(0x15ee2fa7, 0x565e8cc9),
- TOBN(0xa1a5c845, 0x5777e189), TOBN(0xcc10bee0, 0x456f2829),
- TOBN(0x8ad95c56, 0xda762bd5), TOBN(0x152e2214, 0xe9d91da8),
- TOBN(0x975b0e72, 0x7cb23c74), TOBN(0xfd5d7670, 0xa90c66df),
- TOBN(0xb5b5b8ad, 0x225ffc53), TOBN(0xab6dff73, 0xfaded2ae),
- TOBN(0xebd56781, 0x6f4cbe9d), TOBN(0x0ed8b249, 0x6a574bd7),
- TOBN(0x41c246fe, 0x81a881fa), TOBN(0x91564805, 0xc3db9c70),
- TOBN(0xd7c12b08, 0x5b862809), TOBN(0x1facd1f1, 0x55858d7b),
- TOBN(0x7693747c, 0xaf09e92a), TOBN(0x3b69dcba, 0x189a425f),
- TOBN(0x0be28e9f, 0x967365ef), TOBN(0x57300eb2, 0xe801f5c9),
- TOBN(0x93b8ac6a, 0xd583352f), TOBN(0xa2cf1f89, 0xcd05b2b7),
- TOBN(0x7c0c9b74, 0x4dcc40cc), TOBN(0xfee38c45, 0xada523fb),
- TOBN(0xb49a4dec, 0x1099cc4d), TOBN(0x325c377f, 0x69f069c6),
- TOBN(0xe12458ce, 0x476cc9ff), TOBN(0x580e0b6c, 0xc6d4cb63),
- TOBN(0xd561c8b7, 0x9072289b), TOBN(0x0377f264, 0xa619e6da),
- TOBN(0x26685362, 0x88e591a5), TOBN(0xa453a7bd, 0x7523ca2b),
- TOBN(0x8a9536d2, 0xc1df4533), TOBN(0xc8e50f2f, 0xbe972f79),
- TOBN(0xd433e50f, 0x6d3549cf), TOBN(0x6f33696f, 0xfacd665e),
- TOBN(0x695bfdac, 0xce11fcb4), TOBN(0x810ee252, 0xaf7c9860),
- TOBN(0x65450fe1, 0x7159bb2c), TOBN(0xf7dfbebe, 0x758b357b),
- TOBN(0x2b057e74, 0xd69fea72), TOBN(0xd485717a, 0x92731745),}
- ,
- {TOBN(0x896c42e8, 0xee36860c), TOBN(0xdaf04dfd, 0x4113c22d),
- TOBN(0x1adbb7b7, 0x44104213), TOBN(0xe5fd5fa1, 0x1fd394ea),
- TOBN(0x68235d94, 0x1a4e0551), TOBN(0x6772cfbe, 0x18d10151),
- TOBN(0x276071e3, 0x09984523), TOBN(0xe4e879de, 0x5a56ba98),
- TOBN(0xaaafafb0, 0x285b9491), TOBN(0x01a0be88, 0x1e4c705e),
- TOBN(0xff1d4f5d, 0x2ad9caab), TOBN(0x6e349a4a, 0xc37a233f),
- TOBN(0xcf1c1246, 0x4a1c6a16), TOBN(0xd99e6b66, 0x29383260),
- TOBN(0xea3d4366, 0x5f6d5471), TOBN(0x36974d04, 0xff8cc89b),
- TOBN(0xc26c49a1, 0xcfe89d80), TOBN(0xb42c026d, 0xda9c8371),
- TOBN(0xca6c013a, 0xdad066d2), TOBN(0xfb8f7228, 0x56a4f3ee),
- TOBN(0x08b579ec, 0xd850935b), TOBN(0x34c1a74c, 0xd631e1b3),
- TOBN(0xcb5fe596, 0xac198534), TOBN(0x39ff21f6, 0xe1f24f25),
- TOBN(0x27f29e14, 0x8f929057), TOBN(0x7a64ae06, 0xc0c853df),
- TOBN(0x256cd183, 0x58e9c5ce), TOBN(0x9d9cce82, 0xded092a5),
- TOBN(0xcc6e5979, 0x6e93b7c7), TOBN(0xe1e47092, 0x31bb9e27),
- TOBN(0xb70b3083, 0xaa9e29a0), TOBN(0xbf181a75, 0x3785e644),
- TOBN(0xf53f2c65, 0x8ead09f7), TOBN(0x1335e1d5, 0x9780d14d),
- TOBN(0x69cc20e0, 0xcd1b66bc), TOBN(0x9b670a37, 0xbbe0bfc8),
- TOBN(0xce53dc81, 0x28efbeed), TOBN(0x0c74e77c, 0x8326a6e5),
- TOBN(0x3604e0d2, 0xb88e9a63), TOBN(0xbab38fca, 0x13dc2248),
- TOBN(0x8ed6e8c8, 0x5c0a3f1e), TOBN(0xbcad2492, 0x7c87c37f),
- TOBN(0xfdfb62bb, 0x9ee3b78d), TOBN(0xeba8e477, 0xcbceba46),
- TOBN(0x37d38cb0, 0xeeaede4b), TOBN(0x0bc498e8, 0x7976deb6),
- TOBN(0xb2944c04, 0x6b6147fb), TOBN(0x8b123f35, 0xf71f9609),
- TOBN(0xa155dcc7, 0xde79dc24), TOBN(0xf1168a32, 0x558f69cd),
- TOBN(0xbac21595, 0x0d1850df), TOBN(0x15c8295b, 0xb204c848),
- TOBN(0xf661aa36, 0x7d8184ff), TOBN(0xc396228e, 0x30447bdb),
- TOBN(0x11cd5143, 0xbde4a59e), TOBN(0xe3a26e3b, 0x6beab5e6),
- TOBN(0xd3b3a13f, 0x1402b9d0), TOBN(0x573441c3, 0x2c7bc863),
- TOBN(0x4b301ec4, 0x578c3e6e), TOBN(0xc26fc9c4, 0x0adaf57e),
- TOBN(0x96e71bfd, 0x7493cea3), TOBN(0xd05d4b3f, 0x1af81456),
- TOBN(0xdaca2a8a, 0x6a8c608f), TOBN(0x53ef07f6, 0x0725b276),
- TOBN(0x07a5fbd2, 0x7824fc56), TOBN(0x34675218, 0x13289077),
- TOBN(0x5bf69fd5, 0xe0c48349), TOBN(0xa613ddd3, 0xb6aa7875),
- TOBN(0x7f78c19c, 0x5450d866), TOBN(0x46f4409c, 0x8f84a481),
- TOBN(0x9f1d1928, 0x90fce239), TOBN(0x016c4168, 0xb2ce44b9),
- TOBN(0xbae023f0, 0xc7435978), TOBN(0xb152c888, 0x20e30e19),
- TOBN(0x9c241645, 0xe3fa6faf), TOBN(0x735d95c1, 0x84823e60),
- TOBN(0x03197573, 0x03955317), TOBN(0x0b4b02a9, 0xf03b4995),
- TOBN(0x076bf559, 0x70274600), TOBN(0x32c5cc53, 0xaaf57508),
- TOBN(0xe8af6d1f, 0x60624129), TOBN(0xb7bc5d64, 0x9a5e2b5e),
- TOBN(0x3814b048, 0x5f082d72), TOBN(0x76f267f2, 0xce19677a),
- TOBN(0x626c630f, 0xb36eed93), TOBN(0x55230cd7, 0x3bf56803),
- TOBN(0x78837949, 0xce2736a0), TOBN(0x0d792d60, 0xaa6c55f1),
- TOBN(0x0318dbfd, 0xd5c7c5d2), TOBN(0xb38f8da7, 0x072b342d),
- TOBN(0x3569bddc, 0x7b8de38a), TOBN(0xf25b5887, 0xa1c94842),
- TOBN(0xb2d5b284, 0x2946ad60), TOBN(0x854f29ad, 0xe9d1707e),
- TOBN(0xaa5159dc, 0x2c6a4509), TOBN(0x899f94c0, 0x57189837),
- TOBN(0xcf6adc51, 0xf4a55b03), TOBN(0x261762de, 0x35e3b2d5),
- TOBN(0x4cc43012, 0x04827b51), TOBN(0xcd22a113, 0xc6021442),
- TOBN(0xce2fd61a, 0x247c9569), TOBN(0x59a50973, 0xd152beca),
- TOBN(0x6c835a11, 0x63a716d4), TOBN(0xc26455ed, 0x187dedcf),
- TOBN(0x27f536e0, 0x49ce89e7), TOBN(0x18908539, 0xcc890cb5),
- TOBN(0x308909ab, 0xd83c2aa1), TOBN(0xecd3142b, 0x1ab73bd3),
- TOBN(0x6a85bf59, 0xb3f5ab84), TOBN(0x3c320a68, 0xf2bea4c6),
- TOBN(0xad8dc538, 0x6da4541f), TOBN(0xeaf34eb0, 0xb7c41186),
- TOBN(0x1c780129, 0x977c97c4), TOBN(0x5ff9beeb, 0xc57eb9fa),
- TOBN(0xa24d0524, 0xc822c478), TOBN(0xfd8eec2a, 0x461cd415),
- TOBN(0xfbde194e, 0xf027458c), TOBN(0xb4ff5319, 0x1d1be115),
- TOBN(0x63f874d9, 0x4866d6f4), TOBN(0x35c75015, 0xb21ad0c9),
- TOBN(0xa6b5c9d6, 0x46ac49d2), TOBN(0x42c77c0b, 0x83137aa9),
- TOBN(0x24d000fc, 0x68225a38), TOBN(0x0f63cfc8, 0x2fe1e907),
- TOBN(0x22d1b01b, 0xc6441f95), TOBN(0x7d38f719, 0xec8e448f),
- TOBN(0x9b33fa5f, 0x787fb1ba), TOBN(0x94dcfda1, 0x190158df),
- TOBN(0xc47cb339, 0x5f6d4a09), TOBN(0x6b4f355c, 0xee52b826),
- TOBN(0x3d100f5d, 0xf51b930a), TOBN(0xf4512fac, 0x9f668f69),
- TOBN(0x546781d5, 0x206c4c74), TOBN(0xd021d4d4, 0xcb4d2e48),
- TOBN(0x494a54c2, 0xca085c2d), TOBN(0xf1dbaca4, 0x520850a8),
- TOBN(0x63c79326, 0x490a1aca), TOBN(0xcb64dd9c, 0x41526b02),
- TOBN(0xbb772591, 0xa2979258), TOBN(0x3f582970, 0x48d97846),
- TOBN(0xd66b70d1, 0x7c213ba7), TOBN(0xc28febb5, 0xe8a0ced4),
- TOBN(0x6b911831, 0xc10338c1), TOBN(0x0d54e389, 0xbf0126f3),
- TOBN(0x7048d460, 0x4af206ee), TOBN(0x786c88f6, 0x77e97cb9),
- TOBN(0xd4375ae1, 0xac64802e), TOBN(0x469bcfe1, 0xd53ec11c),
- TOBN(0xfc9b340d, 0x47062230), TOBN(0xe743bb57, 0xc5b4a3ac),
- TOBN(0xfe00b4aa, 0x59ef45ac), TOBN(0x29a4ef23, 0x59edf188),
- TOBN(0x40242efe, 0xb483689b), TOBN(0x2575d3f6, 0x513ac262),
- TOBN(0xf30037c8, 0x0ca6db72), TOBN(0xc9fcce82, 0x98864be2),
- TOBN(0x84a112ff, 0x0149362d), TOBN(0x95e57582, 0x1c4ae971),
- TOBN(0x1fa4b1a8, 0x945cf86c), TOBN(0x4525a734, 0x0b024a2f),
- TOBN(0xe76c8b62, 0x8f338360), TOBN(0x483ff593, 0x28edf32b),
- TOBN(0x67e8e90a, 0x298b1aec), TOBN(0x9caab338, 0x736d9a21),
- TOBN(0x5c09d2fd, 0x66892709), TOBN(0x2496b4dc, 0xb55a1d41),
- TOBN(0x93f5fb1a, 0xe24a4394), TOBN(0x08c75049, 0x6fa8f6c1),
- TOBN(0xcaead1c2, 0xc905d85f), TOBN(0xe9d7f790, 0x0733ae57),
- TOBN(0x24c9a65c, 0xf07cdd94), TOBN(0x7389359c, 0xa4b55931),
- TOBN(0xf58709b7, 0x367e45f7), TOBN(0x1f203067, 0xcb7e7adc),
- TOBN(0x82444bff, 0xc7b72818), TOBN(0x07303b35, 0xbaac8033),
- TOBN(0x1e1ee4e4, 0xd13b7ea1), TOBN(0xe6489b24, 0xe0e74180),
- TOBN(0xa5f2c610, 0x7e70ef70), TOBN(0xa1655412, 0xbdd10894),
- TOBN(0x555ebefb, 0x7af4194e), TOBN(0x533c1c3c, 0x8e89bd9c),
- TOBN(0x735b9b57, 0x89895856), TOBN(0x15fb3cd2, 0x567f5c15),
- TOBN(0x057fed45, 0x526f09fd), TOBN(0xe8a4f10c, 0x8128240a),
- TOBN(0x9332efc4, 0xff2bfd8d), TOBN(0x214e77a0, 0xbd35aa31),
- TOBN(0x32896d73, 0x14faa40e), TOBN(0x767867ec, 0x01e5f186),
- TOBN(0xc9adf8f1, 0x17a1813e), TOBN(0xcb6cda78, 0x54741795),
- TOBN(0xb7521b6d, 0x349d51aa), TOBN(0xf56b5a9e, 0xe3c7b8e9),
- TOBN(0xc6f1e5c9, 0x32a096df), TOBN(0x083667c4, 0xa3635024),
- TOBN(0x365ea135, 0x18087f2f), TOBN(0xf1b8eaac, 0xd136e45d),
- TOBN(0xc8a0e484, 0x73aec989), TOBN(0xd75a324b, 0x142c9259),
- TOBN(0xb7b4d001, 0x01dae185), TOBN(0x45434e0b, 0x9b7a94bc),
- TOBN(0xf54339af, 0xfbd8cb0b), TOBN(0xdcc4569e, 0xe98ef49e),
- TOBN(0x7789318a, 0x09a51299), TOBN(0x81b4d206, 0xb2b025d8),
- TOBN(0xf64aa418, 0xfae85792), TOBN(0x3e50258f, 0xacd7baf7),
- TOBN(0xdce84cdb, 0x2996864b), TOBN(0xa2e67089, 0x1f485fa4),
- TOBN(0xb28b2bb6, 0x534c6a5a), TOBN(0x31a7ec6b, 0xc94b9d39),
- TOBN(0x1d217766, 0xd6bc20da), TOBN(0x4acdb5ec, 0x86761190),
- TOBN(0x68726328, 0x73701063), TOBN(0x4d24ee7c, 0x2128c29b),
- TOBN(0xc072ebd3, 0xa19fd868), TOBN(0x612e481c, 0xdb8ddd3b),
- TOBN(0xb4e1d754, 0x1a64d852), TOBN(0x00ef95ac, 0xc4c6c4ab),
- TOBN(0x1536d2ed, 0xaa0a6c46), TOBN(0x61294086, 0x43774790),
- TOBN(0x54af25e8, 0x343fda10), TOBN(0x9ff9d98d, 0xfd25d6f2),
- TOBN(0x0746af7c, 0x468b8835), TOBN(0x977a31cb, 0x730ecea7),
- TOBN(0xa5096b80, 0xc2cf4a81), TOBN(0xaa986833, 0x6458c37a),
- TOBN(0x6af29bf3, 0xa6bd9d34), TOBN(0x6a62fe9b, 0x33c5d854),
- TOBN(0x50e6c304, 0xb7133b5e), TOBN(0x04b60159, 0x7d6e6848),
- TOBN(0x4cd296df, 0x5579bea4), TOBN(0x10e35ac8, 0x5ceedaf1),
- TOBN(0x04c4c5fd, 0xe3bcc5b1), TOBN(0x95f9ee8a, 0x89412cf9),
- TOBN(0x2c9459ee, 0x82b6eb0f), TOBN(0x2e845765, 0x95c2aadd),
- TOBN(0x774a84ae, 0xd327fcfe), TOBN(0xd8c93722, 0x0368d476),
- TOBN(0x0dbd5748, 0xf83e8a3b), TOBN(0xa579aa96, 0x8d2495f3),
- TOBN(0x535996a0, 0xae496e9b), TOBN(0x07afbfe9, 0xb7f9bcc2),
- TOBN(0x3ac1dc6d, 0x5b7bd293), TOBN(0x3b592cff, 0x7022323d),
- TOBN(0xba0deb98, 0x9c0a3e76), TOBN(0x18e78e9f, 0x4b197acb),
- TOBN(0x211cde10, 0x296c36ef), TOBN(0x7ee89672, 0x82c4da77),
- TOBN(0xb617d270, 0xa57836da), TOBN(0xf0cd9c31, 0x9cb7560b),
- TOBN(0x01fdcbf7, 0xe455fe90), TOBN(0x3fb53cbb, 0x7e7334f3),
- TOBN(0x781e2ea4, 0x4e7de4ec), TOBN(0x8adab3ad, 0x0b384fd0),
- TOBN(0x129eee2f, 0x53d64829), TOBN(0x7a471e17, 0xa261492b),
- TOBN(0xe4f9adb9, 0xe4cb4a2c), TOBN(0x3d359f6f, 0x97ba2c2d),
- TOBN(0x346c6786, 0x0aacd697), TOBN(0x92b444c3, 0x75c2f8a8),
- TOBN(0xc79fa117, 0xd85df44e), TOBN(0x56782372, 0x398ddf31),
- TOBN(0x60e690f2, 0xbbbab3b8), TOBN(0x4851f8ae, 0x8b04816b),
- TOBN(0xc72046ab, 0x9c92e4d2), TOBN(0x518c74a1, 0x7cf3136b),
- TOBN(0xff4eb50a, 0xf9877d4c), TOBN(0x14578d90, 0xa919cabb),
- TOBN(0x8218f8c4, 0xac5eb2b6), TOBN(0xa3ccc547, 0x542016e4),
- TOBN(0x025bf48e, 0x327f8349), TOBN(0xf3e97346, 0xf43cb641),
- TOBN(0xdc2bafdf, 0x500f1085), TOBN(0x57167876, 0x2f063055),
- TOBN(0x5bd914b9, 0x411925a6), TOBN(0x7c078d48, 0xa1123de5),
- TOBN(0xee6bf835, 0x182b165d), TOBN(0xb11b5e5b, 0xba519727),
- TOBN(0xe33ea76c, 0x1eea7b85), TOBN(0x2352b461, 0x92d4f85e),
- TOBN(0xf101d334, 0xafe115bb), TOBN(0xfabc1294, 0x889175a3),
- TOBN(0x7f6bcdc0, 0x5233f925), TOBN(0xe0a802db, 0xe77fec55),
- TOBN(0xbdb47b75, 0x8069b659), TOBN(0x1c5e12de, 0xf98fbd74),
- TOBN(0x869c58c6, 0x4b8457ee), TOBN(0xa5360f69, 0x4f7ea9f7),
- TOBN(0xe576c09f, 0xf460b38f), TOBN(0x6b70d548, 0x22b7fb36),
- TOBN(0x3fd237f1, 0x3bfae315), TOBN(0x33797852, 0xcbdff369),
- TOBN(0x97df25f5, 0x25b516f9), TOBN(0x46f388f2, 0xba38ad2d),
- TOBN(0x656c4658, 0x89d8ddbb), TOBN(0x8830b26e, 0x70f38ee8),
- TOBN(0x4320fd5c, 0xde1212b0), TOBN(0xc34f30cf, 0xe4a2edb2),
- TOBN(0xabb131a3, 0x56ab64b8), TOBN(0x7f77f0cc, 0xd99c5d26),
- TOBN(0x66856a37, 0xbf981d94), TOBN(0x19e76d09, 0x738bd76e),
- TOBN(0xe76c8ac3, 0x96238f39), TOBN(0xc0a482be, 0xa830b366),
- TOBN(0xb7b8eaff, 0x0b4eb499), TOBN(0x8ecd83bc, 0x4bfb4865),
- TOBN(0x971b2cb7, 0xa2f3776f), TOBN(0xb42176a4, 0xf4b88adf),
- TOBN(0xb9617df5, 0xbe1fa446), TOBN(0x8b32d508, 0xcd031bd2),
- TOBN(0x1c6bd47d, 0x53b618c0), TOBN(0xc424f46c, 0x6a227923),
- TOBN(0x7303ffde, 0xdd92d964), TOBN(0xe9712878, 0x71b5abf2),
- TOBN(0x8f48a632, 0xf815561d), TOBN(0x85f48ff5, 0xd3c055d1),
- TOBN(0x222a1427, 0x7525684f), TOBN(0xd0d841a0, 0x67360cc3),
- TOBN(0x4245a926, 0x0b9267c6), TOBN(0xc78913f1, 0xcf07f863),
- TOBN(0xaa844c8e, 0x4d0d9e24), TOBN(0xa42ad522, 0x3d5f9017),
- TOBN(0xbd371749, 0xa2c989d5), TOBN(0x928292df, 0xe1f5e78e),
- TOBN(0x493b383e, 0x0a1ea6da), TOBN(0x5136fd8d, 0x13aee529),
- TOBN(0x860c44b1, 0xf2c34a99), TOBN(0x3b00aca4, 0xbf5855ac),
- TOBN(0xabf6aaa0, 0xfaaf37be), TOBN(0x65f43682, 0x2a53ec08),
- TOBN(0x1d9a5801, 0xa11b12e1), TOBN(0x78a7ab2c, 0xe20ed475),
- TOBN(0x0de1067e, 0x9a41e0d5), TOBN(0x30473f5f, 0x305023ea),
- TOBN(0xdd3ae09d, 0x169c7d97), TOBN(0x5cd5baa4, 0xcfaef9cd),
- TOBN(0x5cd7440b, 0x65a44803), TOBN(0xdc13966a, 0x47f364de),
- TOBN(0x077b2be8, 0x2b8357c1), TOBN(0x0cb1b4c5, 0xe9d57c2a),
- TOBN(0x7a4ceb32, 0x05ff363e), TOBN(0xf310fa4d, 0xca35a9ef),
- TOBN(0xdbb7b352, 0xf97f68c6), TOBN(0x0c773b50, 0x0b02cf58),
- TOBN(0xea2e4821, 0x3c1f96d9), TOBN(0xffb357b0, 0xeee01815),
- TOBN(0xb9c924cd, 0xe0f28039), TOBN(0x0b36c95a, 0x46a3fbe4),
- TOBN(0x1faaaea4, 0x5e46db6c), TOBN(0xcae575c3, 0x1928aaff),
- TOBN(0x7f671302, 0xa70dab86), TOBN(0xfcbd12a9, 0x71c58cfc),
- TOBN(0xcbef9acf, 0xbee0cb92), TOBN(0x573da0b9, 0xf8c1b583),
- TOBN(0x4752fcfe, 0x0d41d550), TOBN(0xe7eec0e3, 0x2155cffe),
- TOBN(0x0fc39fcb, 0x545ae248), TOBN(0x522cb8d1, 0x8065f44e),
- TOBN(0x263c962a, 0x70cbb96c), TOBN(0xe034362a, 0xbcd124a9),
- TOBN(0xf120db28, 0x3c2ae58d), TOBN(0xb9a38d49, 0xfef6d507),
- TOBN(0xb1fd2a82, 0x1ff140fd), TOBN(0xbd162f30, 0x20aee7e0),
- TOBN(0x4e17a5d4, 0xcb251949), TOBN(0x2aebcb83, 0x4f7e1c3d),
- TOBN(0x608eb25f, 0x937b0527), TOBN(0xf42e1e47, 0xeb7d9997),
- TOBN(0xeba699c4, 0xb8a53a29), TOBN(0x1f921c71, 0xe091b536),
- TOBN(0xcce29e7b, 0x5b26bbd5), TOBN(0x7a8ef5ed, 0x3b61a680),
- TOBN(0xe5ef8043, 0xba1f1c7e), TOBN(0x16ea8217, 0x18158dda),
- TOBN(0x01778a2b, 0x599ff0f9), TOBN(0x68a923d7, 0x8104fc6b),
- TOBN(0x5bfa44df, 0xda694ff3), TOBN(0x4f7199db, 0xf7667f12),
- TOBN(0xc06d8ff6, 0xe46f2a79), TOBN(0x08b5dead, 0xe9f8131d),
- TOBN(0x02519a59, 0xabb4ce7c), TOBN(0xc4f710bc, 0xb42aec3e),
- TOBN(0x3d77b057, 0x78bde41a), TOBN(0x6474bf80, 0xb4186b5a),
- TOBN(0x048b3f67, 0x88c65741), TOBN(0xc64519de, 0x03c7c154),
- TOBN(0xdf073846, 0x0edfcc4f), TOBN(0x319aa737, 0x48f1aa6b),
- TOBN(0x8b9f8a02, 0xca909f77), TOBN(0x90258139, 0x7580bfef),
- TOBN(0xd8bfd3ca, 0xc0c22719), TOBN(0xc60209e4, 0xc9ca151e),
- TOBN(0x7a744ab5, 0xd9a1a69c), TOBN(0x6de5048b, 0x14937f8f),
- TOBN(0x171938d8, 0xe115ac04), TOBN(0x7df70940, 0x1c6b16d2),
- TOBN(0xa6aeb663, 0x7f8e94e7), TOBN(0xc130388e, 0x2a2cf094),
- TOBN(0x1850be84, 0x77f54e6e), TOBN(0x9f258a72, 0x65d60fe5),
- TOBN(0xff7ff0c0, 0x6c9146d6), TOBN(0x039aaf90, 0xe63a830b),
- TOBN(0x38f27a73, 0x9460342f), TOBN(0x4703148c, 0x3f795f8a),
- TOBN(0x1bb5467b, 0x9681a97e), TOBN(0x00931ba5, 0xecaeb594),
- TOBN(0xcdb6719d, 0x786f337c), TOBN(0xd9c01cd2, 0xe704397d),
- TOBN(0x0f4a3f20, 0x555c2fef), TOBN(0x00452509, 0x7c0af223),
- TOBN(0x54a58047, 0x84db8e76), TOBN(0x3bacf1aa, 0x93c8aa06),
- TOBN(0x11ca957c, 0xf7919422), TOBN(0x50641053, 0x78cdaa40),
- TOBN(0x7a303874, 0x9f7144ae), TOBN(0x170c963f, 0x43d4acfd),
- TOBN(0x5e148149, 0x58ddd3ef), TOBN(0xa7bde582, 0x9e72dba8),
- TOBN(0x0769da8b, 0x6fa68750), TOBN(0xfa64e532, 0x572e0249),
- TOBN(0xfcaadf9d, 0x2619ad31), TOBN(0x87882daa, 0xa7b349cd),
- TOBN(0x9f6eb731, 0x6c67a775), TOBN(0xcb10471a, 0xefc5d0b1),
- TOBN(0xb433750c, 0xe1b806b2), TOBN(0x19c5714d, 0x57b1ae7e),
- TOBN(0xc0dc8b7b, 0xed03fd3f), TOBN(0xdd03344f, 0x31bc194e),
- TOBN(0xa66c52a7, 0x8c6320b5), TOBN(0x8bc82ce3, 0xd0b6fd93),
- TOBN(0xf8e13501, 0xb35f1341), TOBN(0xe53156dd, 0x25a43e42),
- TOBN(0xd3adf27e, 0x4daeb85c), TOBN(0xb81d8379, 0xbbeddeb5),
- TOBN(0x1b0b546e, 0x2e435867), TOBN(0x9020eb94, 0xeba5dd60),
- TOBN(0x37d91161, 0x8210cb9d), TOBN(0x4c596b31, 0x5c91f1cf),
- TOBN(0xb228a90f, 0x0e0b040d), TOBN(0xbaf02d82, 0x45ff897f),
- TOBN(0x2aac79e6, 0x00fa6122), TOBN(0x24828817, 0x8e36f557),
- TOBN(0xb9521d31, 0x113ec356), TOBN(0x9e48861e, 0x15eff1f8),
- TOBN(0x2aa1d412, 0xe0d41715), TOBN(0x71f86203, 0x53f131b8),
- TOBN(0xf60da8da, 0x3fd19408), TOBN(0x4aa716dc, 0x278d9d99),
- TOBN(0x394531f7, 0xa8c51c90), TOBN(0xb560b0e8, 0xf59db51c),
- TOBN(0xa28fc992, 0xfa34bdad), TOBN(0xf024fa14, 0x9cd4f8bd),
- TOBN(0x5cf530f7, 0x23a9d0d3), TOBN(0x615ca193, 0xe28c9b56),
- TOBN(0x6d2a483d, 0x6f73c51e), TOBN(0xa4cb2412, 0xea0dc2dd),
- TOBN(0x50663c41, 0x1eb917ff), TOBN(0x3d3a74cf, 0xeade299e),
- TOBN(0x29b3990f, 0x4a7a9202), TOBN(0xa9bccf59, 0xa7b15c3d),
- TOBN(0x66a3ccdc, 0xa5df9208), TOBN(0x48027c14, 0x43f2f929),
- TOBN(0xd385377c, 0x40b557f0), TOBN(0xe001c366, 0xcd684660),
- TOBN(0x1b18ed6b, 0xe2183a27), TOBN(0x879738d8, 0x63210329),
- TOBN(0xa687c74b, 0xbda94882), TOBN(0xd1bbcc48, 0xa684b299),
- TOBN(0xaf6f1112, 0x863b3724), TOBN(0x6943d1b4, 0x2c8ce9f8),
- TOBN(0xe044a3bb, 0x098cafb4), TOBN(0x27ed2310, 0x60d48caf),
- TOBN(0x542b5675, 0x3a31b84d), TOBN(0xcbf3dd50, 0xfcddbed7),
- TOBN(0x25031f16, 0x41b1d830), TOBN(0xa7ec851d, 0xcb0c1e27),
- TOBN(0xac1c8fe0, 0xb5ae75db), TOBN(0xb24c7557, 0x08c52120),
- TOBN(0x57f811dc, 0x1d4636c3), TOBN(0xf8436526, 0x681a9939),
- TOBN(0x1f6bc6d9, 0x9c81adb3), TOBN(0x840f8ac3, 0x5b7d80d4),
- TOBN(0x731a9811, 0xf4387f1a), TOBN(0x7c501cd3, 0xb5156880),
- TOBN(0xa5ca4a07, 0xdfe68867), TOBN(0xf123d8f0, 0x5fcea120),
- TOBN(0x1fbb0e71, 0xd607039e), TOBN(0x2b70e215, 0xcd3a4546),
- TOBN(0x32d2f01d, 0x53324091), TOBN(0xb796ff08, 0x180ab19b),
- TOBN(0x32d87a86, 0x3c57c4aa), TOBN(0x2aed9caf, 0xb7c49a27),
- TOBN(0x9fb35eac, 0x31630d98), TOBN(0x338e8cdf, 0x5c3e20a3),
- TOBN(0x80f16182, 0x66cde8db), TOBN(0x4e159980, 0x2d72fd36),
- TOBN(0xd7b8f13b, 0x9b6e5072), TOBN(0xf5213907, 0x3b7b5dc1),
- TOBN(0x4d431f1d, 0x8ce4396e), TOBN(0x37a1a680, 0xa7ed2142),
- TOBN(0xbf375696, 0xd01aaf6b), TOBN(0xaa1c0c54, 0xe63aab66),
- TOBN(0x3014368b, 0x4ed80940), TOBN(0x67e6d056, 0x7a6fcedd),
- TOBN(0x7c208c49, 0xca97579f), TOBN(0xfe3d7a81, 0xa23597f6),
- TOBN(0x5e203202, 0x7e096ae2), TOBN(0xb1f3e1e7, 0x24b39366),
- TOBN(0x26da26f3, 0x2fdcdffc), TOBN(0x79422f1d, 0x6097be83),}
- ,
- {TOBN(0x263a2cfb, 0x9db3b381), TOBN(0x9c3a2dee, 0xd4df0a4b),
- TOBN(0x728d06e9, 0x7d04e61f), TOBN(0x8b1adfbc, 0x42449325),
- TOBN(0x6ec1d939, 0x7e053a1b), TOBN(0xee2be5c7, 0x66daf707),
- TOBN(0x80ba1e14, 0x810ac7ab), TOBN(0xdd2ae778, 0xf530f174),
- TOBN(0x0435d97a, 0x205b9d8b), TOBN(0x6eb8f064, 0x056756d4),
- TOBN(0xd5e88a8b, 0xb6f8210e), TOBN(0x070ef12d, 0xec9fd9ea),
- TOBN(0x4d849505, 0x3bcc876a), TOBN(0x12a75338, 0xa7404ce3),
- TOBN(0xd22b49e1, 0xb8a1db5e), TOBN(0xec1f2051, 0x14bfa5ad),
- TOBN(0xadbaeb79, 0xb6828f36), TOBN(0x9d7a0258, 0x01bd5b9e),
- TOBN(0xeda01e0d, 0x1e844b0c), TOBN(0x4b625175, 0x887edfc9),
- TOBN(0x14109fdd, 0x9669b621), TOBN(0x88a2ca56, 0xf6f87b98),
- TOBN(0xfe2eb788, 0x170df6bc), TOBN(0x0cea06f4, 0xffa473f9),
- TOBN(0x43ed81b5, 0xc4e83d33), TOBN(0xd9f35879, 0x5efd488b),
- TOBN(0x164a620f, 0x9deb4d0f), TOBN(0xc6927bdb, 0xac6a7394),
- TOBN(0x45c28df7, 0x9f9e0f03), TOBN(0x2868661e, 0xfcd7e1a9),
- TOBN(0x7cf4e8d0, 0xffa348f1), TOBN(0x6bd4c284, 0x398538e0),
- TOBN(0x2618a091, 0x289a8619), TOBN(0xef796e60, 0x6671b173),
- TOBN(0x664e46e5, 0x9090c632), TOBN(0xa38062d4, 0x1e66f8fb),
- TOBN(0x6c744a20, 0x0573274e), TOBN(0xd07b67e4, 0xa9271394),
- TOBN(0x391223b2, 0x6bdc0e20), TOBN(0xbe2d93f1, 0xeb0a05a7),
- TOBN(0xf23e2e53, 0x3f36d141), TOBN(0xe84bb3d4, 0x4dfca442),
- TOBN(0xb804a48d, 0x6b7c023a), TOBN(0x1e16a8fa, 0x76431c3b),
- TOBN(0x1b5452ad, 0xddd472e0), TOBN(0x7d405ee7, 0x0d1ee127),
- TOBN(0x50fc6f1d, 0xffa27599), TOBN(0x351ac53c, 0xbf391b35),
- TOBN(0x7efa14b8, 0x4444896b), TOBN(0x64974d2f, 0xf94027fb),
- TOBN(0xefdcd0e8, 0xde84487d), TOBN(0x8c45b260, 0x2b48989b),
- TOBN(0xa8fcbbc2, 0xd8463487), TOBN(0xd1b2b3f7, 0x3fbc476c),
- TOBN(0x21d005b7, 0xc8f443c0), TOBN(0x518f2e67, 0x40c0139c),
- TOBN(0x56036e8c, 0x06d75fc1), TOBN(0x2dcf7bb7, 0x3249a89f),
- TOBN(0x81dd1d3d, 0xe245e7dd), TOBN(0xf578dc4b, 0xebd6e2a7),
- TOBN(0x4c028903, 0xdf2ce7a0), TOBN(0xaee36288, 0x9c39afac),
- TOBN(0xdc847c31, 0x146404ab), TOBN(0x6304c0d8, 0xa4e97818),
- TOBN(0xae51dca2, 0xa91f6791), TOBN(0x2abe4190, 0x9baa9efc),
- TOBN(0xd9d2e2f4, 0x559c7ac1), TOBN(0xe82f4b51, 0xfc9f773a),
- TOBN(0xa7713027, 0x4073e81c), TOBN(0xc0276fac, 0xfbb596fc),
- TOBN(0x1d819fc9, 0xa684f70c), TOBN(0x29b47fdd, 0xc9f7b1e0),
- TOBN(0x358de103, 0x459b1940), TOBN(0xec881c59, 0x5b013e93),
- TOBN(0x51574c93, 0x49532ad3), TOBN(0x2db1d445, 0xb37b46de),
- TOBN(0xc6445b87, 0xdf239fd8), TOBN(0xc718af75, 0x151d24ee),
- TOBN(0xaea1c4a4, 0xf43c6259), TOBN(0x40c0e5d7, 0x70be02f7),
- TOBN(0x6a4590f4, 0x721b33f2), TOBN(0x2124f1fb, 0xfedf04ea),
- TOBN(0xf8e53cde, 0x9745efe7), TOBN(0xe7e10432, 0x65f046d9),
- TOBN(0xc3fca28e, 0xe4d0c7e6), TOBN(0x847e339a, 0x87253b1b),
- TOBN(0x9b595348, 0x3743e643), TOBN(0xcb6a0a0b, 0x4fd12fc5),
- TOBN(0xfb6836c3, 0x27d02dcc), TOBN(0x5ad00982, 0x7a68bcc2),
- TOBN(0x1b24b44c, 0x005e912d), TOBN(0xcc83d20f, 0x811fdcfe),
- TOBN(0x36527ec1, 0x666fba0c), TOBN(0x69948197, 0x14754635),
- TOBN(0xfcdcb1a8, 0x556da9c2), TOBN(0xa5934267, 0x81a732b2),
- TOBN(0xec1214ed, 0xa714181d), TOBN(0x609ac13b, 0x6067b341),
- TOBN(0xff4b4c97, 0xa545df1f), TOBN(0xa1240501, 0x34d2076b),
- TOBN(0x6efa0c23, 0x1409ca97), TOBN(0x254cc1a8, 0x20638c43),
- TOBN(0xd4e363af, 0xdcfb46cd), TOBN(0x62c2adc3, 0x03942a27),
- TOBN(0xc67b9df0, 0x56e46483), TOBN(0xa55abb20, 0x63736356),
- TOBN(0xab93c098, 0xc551bc52), TOBN(0x382b49f9, 0xb15fe64b),
- TOBN(0x9ec221ad, 0x4dff8d47), TOBN(0x79caf615, 0x437df4d6),
- TOBN(0x5f13dc64, 0xbb456509), TOBN(0xe4c589d9, 0x191f0714),
- TOBN(0x27b6a8ab, 0x3fd40e09), TOBN(0xe455842e, 0x77313ea9),
- TOBN(0x8b51d1e2, 0x1f55988b), TOBN(0x5716dd73, 0x062bbbfc),
- TOBN(0x633c11e5, 0x4e8bf3de), TOBN(0x9a0e77b6, 0x1b85be3b),
- TOBN(0x56510729, 0x0911cca6), TOBN(0x27e76495, 0xefa6590f),
- TOBN(0xe4ac8b33, 0x070d3aab), TOBN(0x2643672b, 0x9a2cd5e5),
- TOBN(0x52eff79b, 0x1cfc9173), TOBN(0x665ca49b, 0x90a7c13f),
- TOBN(0x5a8dda59, 0xb3efb998), TOBN(0x8a5b922d, 0x052f1341),
- TOBN(0xae9ebbab, 0x3cf9a530), TOBN(0x35986e7b, 0xf56da4d7),
- TOBN(0x3a636b5c, 0xff3513cc), TOBN(0xbb0cf8ba, 0x3198f7dd),
- TOBN(0xb8d40522, 0x41f16f86), TOBN(0x760575d8, 0xde13a7bf),
- TOBN(0x36f74e16, 0x9f7aa181), TOBN(0x163a3ecf, 0xf509ed1c),
- TOBN(0x6aead61f, 0x3c40a491), TOBN(0x158c95fc, 0xdfe8fcaa),
- TOBN(0xa3991b6e, 0x13cda46f), TOBN(0x79482415, 0x342faed0),
- TOBN(0xf3ba5bde, 0x666b5970), TOBN(0x1d52e6bc, 0xb26ab6dd),
- TOBN(0x768ba1e7, 0x8608dd3d), TOBN(0x4930db2a, 0xea076586),
- TOBN(0xd9575714, 0xe7dc1afa), TOBN(0x1fc7bf7d, 0xf7c58817),
- TOBN(0x6b47accd, 0xd9eee96c), TOBN(0x0ca277fb, 0xe58cec37),
- TOBN(0x113fe413, 0xe702c42a), TOBN(0xdd1764ee, 0xc47cbe51),
- TOBN(0x041e7cde, 0x7b3ed739), TOBN(0x50cb7459, 0x5ce9e1c0),
- TOBN(0x35568513, 0x2925b212), TOBN(0x7cff95c4, 0x001b081c),
- TOBN(0x63ee4cbd, 0x8088b454), TOBN(0xdb7f32f7, 0x9a9e0c8a),
- TOBN(0xb377d418, 0x6b2447cb), TOBN(0xe3e982aa, 0xd370219b),
- TOBN(0x06ccc1e4, 0xc2a2a593), TOBN(0x72c36865, 0x0773f24f),
- TOBN(0xa13b4da7, 0x95859423), TOBN(0x8bbf1d33, 0x75040c8f),
- TOBN(0x726f0973, 0xda50c991), TOBN(0x48afcd5b, 0x822d6ee2),
- TOBN(0xe5fc718b, 0x20fd7771), TOBN(0xb9e8e77d, 0xfd0807a1),
- TOBN(0x7f5e0f44, 0x99a7703d), TOBN(0x6972930e, 0x618e36f3),
- TOBN(0x2b7c77b8, 0x23807bbe), TOBN(0xe5b82405, 0xcb27ff50),
- TOBN(0xba8b8be3, 0xbd379062), TOBN(0xd64b7a1d, 0x2dce4a92),
- TOBN(0x040a73c5, 0xb2952e37), TOBN(0x0a9e252e, 0xd438aeca),
- TOBN(0xdd43956b, 0xc39d3bcb), TOBN(0x1a31ca00, 0xb32b2d63),
- TOBN(0xd67133b8, 0x5c417a18), TOBN(0xd08e4790, 0x2ef442c8),
- TOBN(0x98cb1ae9, 0x255c0980), TOBN(0x4bd86381, 0x2b4a739f),
- TOBN(0x5a5c31e1, 0x1e4a45a1), TOBN(0x1e5d55fe, 0x9cb0db2f),
- TOBN(0x74661b06, 0x8ff5cc29), TOBN(0x026b389f, 0x0eb8a4f4),
- TOBN(0x536b21a4, 0x58848c24), TOBN(0x2e5bf8ec, 0x81dc72b0),
- TOBN(0x03c187d0, 0xad886aac), TOBN(0x5c16878a, 0xb771b645),
- TOBN(0xb07dfc6f, 0xc74045ab), TOBN(0x2c6360bf, 0x7800caed),
- TOBN(0x24295bb5, 0xb9c972a3), TOBN(0xc9e6f88e, 0x7c9a6dba),
- TOBN(0x90ffbf24, 0x92a79aa6), TOBN(0xde29d50a, 0x41c26ac2),
- TOBN(0x9f0af483, 0xd309cbe6), TOBN(0x5b020d8a, 0xe0bced4f),
- TOBN(0x606e986d, 0xb38023e3), TOBN(0xad8f2c9d, 0x1abc6933),
- TOBN(0x19292e1d, 0xe7400e93), TOBN(0xfe3e18a9, 0x52be5e4d),
- TOBN(0xe8e9771d, 0x2e0680bf), TOBN(0x8c5bec98, 0xc54db063),
- TOBN(0x2af9662a, 0x74a55d1f), TOBN(0xe3fbf28f, 0x046f66d8),
- TOBN(0xa3a72ab4, 0xd4dc4794), TOBN(0x09779f45, 0x5c7c2dd8),
- TOBN(0xd893bdaf, 0xc3d19d8d), TOBN(0xd5a75094, 0x57d6a6df),
- TOBN(0x8cf8fef9, 0x952e6255), TOBN(0x3da67cfb, 0xda9a8aff),
- TOBN(0x4c23f62a, 0x2c160dcd), TOBN(0x34e6c5e3, 0x8f90eaef),
- TOBN(0x35865519, 0xa9a65d5a), TOBN(0x07c48aae, 0x8fd38a3d),
- TOBN(0xb7e7aeda, 0x50068527), TOBN(0x2c09ef23, 0x1c90936a),
- TOBN(0x31ecfeb6, 0xe879324c), TOBN(0xa0871f6b, 0xfb0ec938),
- TOBN(0xb1f0fb68, 0xd84d835d), TOBN(0xc90caf39, 0x861dc1e6),
- TOBN(0x12e5b046, 0x7594f8d7), TOBN(0x26897ae2, 0x65012b92),
- TOBN(0xbcf68a08, 0xa4d6755d), TOBN(0x403ee41c, 0x0991fbda),
- TOBN(0x733e343e, 0x3bbf17e8), TOBN(0xd2c7980d, 0x679b3d65),
- TOBN(0x33056232, 0xd2e11305), TOBN(0x966be492, 0xf3c07a6f),
- TOBN(0x6a8878ff, 0xbb15509d), TOBN(0xff221101, 0x0a9b59a4),
- TOBN(0x6c9f564a, 0xabe30129), TOBN(0xc6f2c940, 0x336e64cf),
- TOBN(0x0fe75262, 0x8b0c8022), TOBN(0xbe0267e9, 0x6ae8db87),
- TOBN(0x22e192f1, 0x93bc042b), TOBN(0xf085b534, 0xb237c458),
- TOBN(0xa0d192bd, 0x832c4168), TOBN(0x7a76e9e3, 0xbdf6271d),
- TOBN(0x52a882fa, 0xb88911b5), TOBN(0xc85345e4, 0xb4db0eb5),
- TOBN(0xa3be02a6, 0x81a7c3ff), TOBN(0x51889c8c, 0xf0ec0469),
- TOBN(0x9d031369, 0xa5e829e5), TOBN(0xcbb4c6fc, 0x1607aa41),
- TOBN(0x75ac59a6, 0x241d84c1), TOBN(0xc043f2bf, 0x8829e0ee),
- TOBN(0x82a38f75, 0x8ea5e185), TOBN(0x8bda40b9, 0xd87cbd9f),
- TOBN(0x9e65e75e, 0x2d8fc601), TOBN(0x3d515f74, 0xa35690b3),
- TOBN(0x534acf4f, 0xda79e5ac), TOBN(0x68b83b3a, 0x8630215f),
- TOBN(0x5c748b2e, 0xd085756e), TOBN(0xb0317258, 0xe5d37cb2),
- TOBN(0x6735841a, 0xc5ccc2c4), TOBN(0x7d7dc96b, 0x3d9d5069),
- TOBN(0xa147e410, 0xfd1754bd), TOBN(0x65296e94, 0xd399ddd5),
- TOBN(0xf6b5b2d0, 0xbc8fa5bc), TOBN(0x8a5ead67, 0x500c277b),
- TOBN(0x214625e6, 0xdfa08a5d), TOBN(0x51fdfedc, 0x959cf047),
- TOBN(0x6bc9430b, 0x289fca32), TOBN(0xe36ff0cf, 0x9d9bdc3f),
- TOBN(0x2fe187cb, 0x58ea0ede), TOBN(0xed66af20, 0x5a900b3f),
- TOBN(0x00e0968b, 0x5fa9f4d6), TOBN(0x2d4066ce, 0x37a362e7),
- TOBN(0xa99a9748, 0xbd07e772), TOBN(0x710989c0, 0x06a4f1d0),
- TOBN(0xd5dedf35, 0xce40cbd8), TOBN(0xab55c5f0, 0x1743293d),
- TOBN(0x766f1144, 0x8aa24e2c), TOBN(0x94d874f8, 0x605fbcb4),
- TOBN(0xa365f0e8, 0xa518001b), TOBN(0xee605eb6, 0x9d04ef0f),
- TOBN(0x5a3915cd, 0xba8d4d25), TOBN(0x44c0e1b8, 0xb5113472),
- TOBN(0xcbb024e8, 0x8b6740dc), TOBN(0x89087a53, 0xee1d4f0c),
- TOBN(0xa88fa05c, 0x1fc4e372), TOBN(0x8bf395cb, 0xaf8b3af2),
- TOBN(0x1e71c9a1, 0xdeb8568b), TOBN(0xa35daea0, 0x80fb3d32),
- TOBN(0xe8b6f266, 0x2cf8fb81), TOBN(0x6d51afe8, 0x9490696a),
- TOBN(0x81beac6e, 0x51803a19), TOBN(0xe3d24b7f, 0x86219080),
- TOBN(0x727cfd9d, 0xdf6f463c), TOBN(0x8c6865ca, 0x72284ee8),
- TOBN(0x32c88b7d, 0xb743f4ef), TOBN(0x3793909b, 0xe7d11dce),
- TOBN(0xd398f922, 0x2ff2ebe8), TOBN(0x2c70ca44, 0xe5e49796),
- TOBN(0xdf4d9929, 0xcb1131b1), TOBN(0x7826f298, 0x25888e79),
- TOBN(0x4d3a112c, 0xf1d8740a), TOBN(0x00384cb6, 0x270afa8b),
- TOBN(0xcb64125b, 0x3ab48095), TOBN(0x3451c256, 0x62d05106),
- TOBN(0xd73d577d, 0xa4955845), TOBN(0x39570c16, 0xbf9f4433),
- TOBN(0xd7dfaad3, 0xadecf263), TOBN(0xf1c3d8d1, 0xdc76e102),
- TOBN(0x5e774a58, 0x54c6a836), TOBN(0xdad4b672, 0x3e92d47b),
- TOBN(0xbe7e990f, 0xf0d796a0), TOBN(0x5fc62478, 0xdf0e8b02),
- TOBN(0x8aae8bf4, 0x030c00ad), TOBN(0x3d2db93b, 0x9004ba0f),
- TOBN(0xe48c8a79, 0xd85d5ddc), TOBN(0xe907caa7, 0x6bb07f34),
- TOBN(0x58db343a, 0xa39eaed5), TOBN(0x0ea6e007, 0xadaf5724),
- TOBN(0xe00df169, 0xd23233f3), TOBN(0x3e322796, 0x77cb637f),
- TOBN(0x1f897c0e, 0x1da0cf6c), TOBN(0xa651f5d8, 0x31d6bbdd),
- TOBN(0xdd61af19, 0x1a230c76), TOBN(0xbd527272, 0xcdaa5e4a),
- TOBN(0xca753636, 0xd0abcd7e), TOBN(0x78bdd37c, 0x370bd8dc),
- TOBN(0xc23916c2, 0x17cd93fe), TOBN(0x65b97a4d, 0xdadce6e2),
- TOBN(0xe04ed4eb, 0x174e42f8), TOBN(0x1491ccaa, 0xbb21480a),
- TOBN(0x145a8280, 0x23196332), TOBN(0x3c3862d7, 0x587b479a),
- TOBN(0x9f4a88a3, 0x01dcd0ed), TOBN(0x4da2b7ef, 0x3ea12f1f),
- TOBN(0xf8e7ae33, 0xb126e48e), TOBN(0x404a0b32, 0xf494e237),
- TOBN(0x9beac474, 0xc55acadb), TOBN(0x4ee5cf3b, 0xcbec9fd9),
- TOBN(0x336b33b9, 0x7df3c8c3), TOBN(0xbd905fe3, 0xb76808fd),
- TOBN(0x8f436981, 0xaa45c16a), TOBN(0x255c5bfa, 0x3dd27b62),
- TOBN(0x71965cbf, 0xc3dd9b4d), TOBN(0xce23edbf, 0xfc068a87),
- TOBN(0xb78d4725, 0x745b029b), TOBN(0x74610713, 0xcefdd9bd),
- TOBN(0x7116f75f, 0x1266bf52), TOBN(0x02046722, 0x18e49bb6),
- TOBN(0xdf43df9f, 0x3d6f19e3), TOBN(0xef1bc7d0, 0xe685cb2f),
- TOBN(0xcddb27c1, 0x7078c432), TOBN(0xe1961b9c, 0xb77fedb7),
- TOBN(0x1edc2f5c, 0xc2290570), TOBN(0x2c3fefca, 0x19cbd886),
- TOBN(0xcf880a36, 0xc2af389a), TOBN(0x96c610fd, 0xbda71cea),
- TOBN(0xf03977a9, 0x32aa8463), TOBN(0x8eb7763f, 0x8586d90a),
- TOBN(0x3f342454, 0x2a296e77), TOBN(0xc8718683, 0x42837a35),
- TOBN(0x7dc71090, 0x6a09c731), TOBN(0x54778ffb, 0x51b816db),
- TOBN(0x6b33bfec, 0xaf06defd), TOBN(0xfe3c105f, 0x8592b70b),
- TOBN(0xf937fda4, 0x61da6114), TOBN(0x3c13e651, 0x4c266ad7),
- TOBN(0xe363a829, 0x855938e8), TOBN(0x2eeb5d9e, 0x9de54b72),
- TOBN(0xbeb93b0e, 0x20ccfab9), TOBN(0x3dffbb5f, 0x25e61a25),
- TOBN(0x7f655e43, 0x1acc093d), TOBN(0x0cb6cc3d, 0x3964ce61),
- TOBN(0x6ab283a1, 0xe5e9b460), TOBN(0x55d787c5, 0xa1c7e72d),
- TOBN(0x4d2efd47, 0xdeadbf02), TOBN(0x11e80219, 0xac459068),
- TOBN(0x810c7626, 0x71f311f0), TOBN(0xfa17ef8d, 0x4ab6ef53),
- TOBN(0xaf47fd25, 0x93e43bff), TOBN(0x5cb5ff3f, 0x0be40632),
- TOBN(0x54687106, 0x8ee61da3), TOBN(0x7764196e, 0xb08afd0f),
- TOBN(0x831ab3ed, 0xf0290a8f), TOBN(0xcae81966, 0xcb47c387),
- TOBN(0xaad7dece, 0x184efb4f), TOBN(0xdcfc53b3, 0x4749110e),
- TOBN(0x6698f23c, 0x4cb632f9), TOBN(0xc42a1ad6, 0xb91f8067),
- TOBN(0xb116a81d, 0x6284180a), TOBN(0xebedf5f8, 0xe901326f),
- TOBN(0xf2274c9f, 0x97e3e044), TOBN(0x42018520, 0x11d09fc9),
- TOBN(0x56a65f17, 0xd18e6e23), TOBN(0x2ea61e2a, 0x352b683c),
- TOBN(0x27d291bc, 0x575eaa94), TOBN(0x9e7bc721, 0xb8ff522d),
- TOBN(0x5f7268bf, 0xa7f04d6f), TOBN(0x5868c73f, 0xaba41748),
- TOBN(0x9f85c2db, 0x7be0eead), TOBN(0x511e7842, 0xff719135),
- TOBN(0x5a06b1e9, 0xc5ea90d7), TOBN(0x0c19e283, 0x26fab631),
- TOBN(0x8af8f0cf, 0xe9206c55), TOBN(0x89389cb4, 0x3553c06a),
- TOBN(0x39dbed97, 0xf65f8004), TOBN(0x0621b037, 0xc508991d),
- TOBN(0x1c52e635, 0x96e78cc4), TOBN(0x5385c8b2, 0x0c06b4a8),
- TOBN(0xd84ddfdb, 0xb0e87d03), TOBN(0xc49dfb66, 0x934bafad),
- TOBN(0x7071e170, 0x59f70772), TOBN(0x3a073a84, 0x3a1db56b),
- TOBN(0x03494903, 0x3b8af190), TOBN(0x7d882de3, 0xd32920f0),
- TOBN(0x91633f0a, 0xb2cf8940), TOBN(0x72b0b178, 0x6f948f51),
- TOBN(0x2d28dc30, 0x782653c8), TOBN(0x88829849, 0xdb903a05),
- TOBN(0xb8095d0c, 0x6a19d2bb), TOBN(0x4b9e7f0c, 0x86f782cb),
- TOBN(0x7af73988, 0x2d907064), TOBN(0xd12be0fe, 0x8b32643c),
- TOBN(0x358ed23d, 0x0e165dc3), TOBN(0x3d47ce62, 0x4e2378ce),
- TOBN(0x7e2bb0b9, 0xfeb8a087), TOBN(0x3246e8ae, 0xe29e10b9),
- TOBN(0x459f4ec7, 0x03ce2b4d), TOBN(0xe9b4ca1b, 0xbbc077cf),
- TOBN(0x2613b4f2, 0x0e9940c1), TOBN(0xfc598bb9, 0x047d1eb1),
- TOBN(0x9744c62b, 0x45036099), TOBN(0xa9dee742, 0x167c65d8),
- TOBN(0x0c511525, 0xdabe1943), TOBN(0xda110554, 0x93c6c624),
- TOBN(0xae00a52c, 0x651a3be2), TOBN(0xcda5111d, 0x884449a6),
- TOBN(0x063c06f4, 0xff33bed1), TOBN(0x73baaf9a, 0x0d3d76b4),
- TOBN(0x52fb0c9d, 0x7fc63668), TOBN(0x6886c9dd, 0x0c039cde),
- TOBN(0x602bd599, 0x55b22351), TOBN(0xb00cab02, 0x360c7c13),
- TOBN(0x8cb616bc, 0x81b69442), TOBN(0x41486700, 0xb55c3cee),
- TOBN(0x71093281, 0xf49ba278), TOBN(0xad956d9c, 0x64a50710),
- TOBN(0x9561f28b, 0x638a7e81), TOBN(0x54155cdf, 0x5980ddc3),
- TOBN(0xb2db4a96, 0xd26f247a), TOBN(0x9d774e4e, 0x4787d100),
- TOBN(0x1a9e6e2e, 0x078637d2), TOBN(0x1c363e2d, 0x5e0ae06a),
- TOBN(0x7493483e, 0xe9cfa354), TOBN(0x76843cb3, 0x7f74b98d),
- TOBN(0xbaca6591, 0xd4b66947), TOBN(0xb452ce98, 0x04460a8c),
- TOBN(0x6830d246, 0x43768f55), TOBN(0xf4197ed8, 0x7dff12df),
- TOBN(0x6521b472, 0x400dd0f7), TOBN(0x59f5ca8f, 0x4b1e7093),
- TOBN(0x6feff11b, 0x080338ae), TOBN(0x0ada31f6, 0xa29ca3c6),
- TOBN(0x24794eb6, 0x94a2c215), TOBN(0xd83a43ab, 0x05a57ab4),
- TOBN(0x264a543a, 0x2a6f89fe), TOBN(0x2c2a3868, 0xdd5ec7c2),
- TOBN(0xd3373940, 0x8439d9b2), TOBN(0x715ea672, 0x0acd1f11),
- TOBN(0x42c1d235, 0xe7e6cc19), TOBN(0x81ce6e96, 0xb990585c),
- TOBN(0x04e5dfe0, 0xd809c7bd), TOBN(0xd7b2580c, 0x8f1050ab),
- TOBN(0x6d91ad78, 0xd8a4176f), TOBN(0x0af556ee, 0x4e2e897c),
- TOBN(0x162a8b73, 0x921de0ac), TOBN(0x52ac9c22, 0x7ea78400),
- TOBN(0xee2a4eea, 0xefce2174), TOBN(0xbe61844e, 0x6d637f79),
- TOBN(0x0491f1bc, 0x789a283b), TOBN(0x72d3ac3d, 0x880836f4),
- TOBN(0xaa1c5ea3, 0x88e5402d), TOBN(0x1b192421, 0xd5cc473d),
- TOBN(0x5c0b9998, 0x9dc84cac), TOBN(0xb0a8482d, 0x9c6e75b8),
- TOBN(0x639961d0, 0x3a191ce2), TOBN(0xda3bc865, 0x6d837930),
- TOBN(0xca990653, 0x056e6f8f), TOBN(0x84861c41, 0x64d133a7),
- TOBN(0x8b403276, 0x746abe40), TOBN(0xb7b4d51a, 0xebf8e303),
- TOBN(0x05b43211, 0x220a255d), TOBN(0xc997152c, 0x02419e6e),
- TOBN(0x76ff47b6, 0x630c2fea), TOBN(0x50518677, 0x281fdade),
- TOBN(0x3283b8ba, 0xcf902b0b), TOBN(0x8d4b4eb5, 0x37db303b),
- TOBN(0xcc89f42d, 0x755011bc), TOBN(0xb43d74bb, 0xdd09d19b),
- TOBN(0x65746bc9, 0x8adba350), TOBN(0x364eaf8c, 0xb51c1927),
- TOBN(0x13c76596, 0x10ad72ec), TOBN(0x30045121, 0xf8d40c20),
- TOBN(0x6d2d99b7, 0xea7b979b), TOBN(0xcd78cd74, 0xe6fb3bcd),
- TOBN(0x11e45a9e, 0x86cffbfe), TOBN(0x78a61cf4, 0x637024f6),
- TOBN(0xd06bc872, 0x3d502295), TOBN(0xf1376854, 0x458cb288),
- TOBN(0xb9db26a1, 0x342f8586), TOBN(0xf33effcf, 0x4beee09e),
- TOBN(0xd7e0c4cd, 0xb30cfb3a), TOBN(0x6d09b8c1, 0x6c9db4c8),
- TOBN(0x40ba1a42, 0x07c8d9df), TOBN(0x6fd495f7, 0x1c52c66d),
- TOBN(0xfb0e169f, 0x275264da), TOBN(0x80c2b746, 0xe57d8362),
- TOBN(0xedd987f7, 0x49ad7222), TOBN(0xfdc229af, 0x4398ec7b),}
- ,
- {TOBN(0xb0d1ed84, 0x52666a58), TOBN(0x4bcb6e00, 0xe6a9c3c2),
- TOBN(0x3c57411c, 0x26906408), TOBN(0xcfc20755, 0x13556400),
- TOBN(0xa08b1c50, 0x5294dba3), TOBN(0xa30ba286, 0x8b7dd31e),
- TOBN(0xd70ba90e, 0x991eca74), TOBN(0x094e142c, 0xe762c2b9),
- TOBN(0xb81d783e, 0x979f3925), TOBN(0x1efd130a, 0xaf4c89a7),
- TOBN(0x525c2144, 0xfd1bf7fa), TOBN(0x4b296904, 0x1b265a9e),
- TOBN(0xed8e9634, 0xb9db65b6), TOBN(0x35c82e32, 0x03599d8a),
- TOBN(0xdaa7a54f, 0x403563f3), TOBN(0x9df088ad, 0x022c38ab),
- TOBN(0xe5cfb066, 0xbb3fd30a), TOBN(0x429169da, 0xeff0354e),
- TOBN(0x809cf852, 0x3524e36c), TOBN(0x136f4fb3, 0x0155be1d),
- TOBN(0x4826af01, 0x1fbba712), TOBN(0x6ef0f0b4, 0x506ba1a1),
- TOBN(0xd9928b31, 0x77aea73e), TOBN(0xe2bf6af2, 0x5eaa244e),
- TOBN(0x8d084f12, 0x4237b64b), TOBN(0x688ebe99, 0xe3ecfd07),
- TOBN(0x57b8a70c, 0xf6845dd8), TOBN(0x808fc59c, 0x5da4a325),
- TOBN(0xa9032b2b, 0xa3585862), TOBN(0xb66825d5, 0xedf29386),
- TOBN(0xb5a5a8db, 0x431ec29b), TOBN(0xbb143a98, 0x3a1e8dc8),
- TOBN(0x35ee94ce, 0x12ae381b), TOBN(0x3a7f176c, 0x86ccda90),
- TOBN(0xc63a657e, 0x4606eaca), TOBN(0x9ae5a380, 0x43cd04df),
- TOBN(0x9bec8d15, 0xed251b46), TOBN(0x1f5d6d30, 0xcaca5e64),
- TOBN(0x347b3b35, 0x9ff20f07), TOBN(0x4d65f034, 0xf7e4b286),
- TOBN(0x9e93ba24, 0xf111661e), TOBN(0xedced484, 0xb105eb04),
- TOBN(0x96dc9ba1, 0xf424b578), TOBN(0xbf8f66b7, 0xe83e9069),
- TOBN(0x872d4df4, 0xd7ed8216), TOBN(0xbf07f377, 0x8e2cbecf),
- TOBN(0x4281d899, 0x98e73754), TOBN(0xfec85fbb, 0x8aab8708),
- TOBN(0x9a3c0dee, 0xa5ba5b0b), TOBN(0xe6a116ce, 0x42d05299),
- TOBN(0xae9775fe, 0xe9b02d42), TOBN(0x72b05200, 0xa1545cb6),
- TOBN(0xbc506f7d, 0x31a3b4ea), TOBN(0xe5893078, 0x8bbd9b32),
- TOBN(0xc8bc5f37, 0xe4b12a97), TOBN(0x6b000c06, 0x4a73b671),
- TOBN(0x13b5bf22, 0x765fa7d0), TOBN(0x59805bf0, 0x1d6a5370),
- TOBN(0x67a5e29d, 0x4280db98), TOBN(0x4f53916f, 0x776b1ce3),
- TOBN(0x714ff61f, 0x33ddf626), TOBN(0x4206238e, 0xa085d103),
- TOBN(0x1c50d4b7, 0xe5809ee3), TOBN(0x999f450d, 0x85f8eb1d),
- TOBN(0x658a6051, 0xe4c79e9b), TOBN(0x1394cb73, 0xc66a9fea),
- TOBN(0x27f31ed5, 0xc6be7b23), TOBN(0xf4c88f36, 0x5aa6f8fe),
- TOBN(0x0fb0721f, 0x4aaa499e), TOBN(0x68b3a7d5, 0xe3fb2a6b),
- TOBN(0xa788097d, 0x3a92851d), TOBN(0x060e7f8a, 0xe96f4913),
- TOBN(0x82eebe73, 0x1a3a93bc), TOBN(0x42bbf465, 0xa21adc1a),
- TOBN(0xc10b6fa4, 0xef030efd), TOBN(0x247aa4c7, 0x87b097bb),
- TOBN(0x8b8dc632, 0xf60c77da), TOBN(0x6ffbc26a, 0xc223523e),
- TOBN(0xa4f6ff11, 0x344579cf), TOBN(0x5825653c, 0x980250f6),
- TOBN(0xb2dd097e, 0xbc1aa2b9), TOBN(0x07889393, 0x37a0333a),
- TOBN(0x1cf55e71, 0x37a0db38), TOBN(0x2648487f, 0x792c1613),
- TOBN(0xdad01336, 0x3fcef261), TOBN(0x6239c81d, 0x0eabf129),
- TOBN(0x8ee761de, 0x9d276be2), TOBN(0x406a7a34, 0x1eda6ad3),
- TOBN(0x4bf367ba, 0x4a493b31), TOBN(0x54f20a52, 0x9bf7f026),
- TOBN(0xb696e062, 0x9795914b), TOBN(0xcddab96d, 0x8bf236ac),
- TOBN(0x4ff2c70a, 0xed25ea13), TOBN(0xfa1d09eb, 0x81cbbbe7),
- TOBN(0x88fc8c87, 0x468544c5), TOBN(0x847a670d, 0x696b3317),
- TOBN(0xf133421e, 0x64bcb626), TOBN(0xaea638c8, 0x26dee0b5),
- TOBN(0xd6e7680b, 0xb310346c), TOBN(0xe06f4097, 0xd5d4ced3),
- TOBN(0x09961452, 0x7512a30b), TOBN(0xf3d867fd, 0xe589a59a),
- TOBN(0x2e73254f, 0x52d0c180), TOBN(0x9063d8a3, 0x333c74ac),
- TOBN(0xeda6c595, 0xd314e7bc), TOBN(0x2ee7464b, 0x467899ed),
- TOBN(0x1cef423c, 0x0a1ed5d3), TOBN(0x217e76ea, 0x69cc7613),
- TOBN(0x27ccce1f, 0xe7cda917), TOBN(0x12d8016b, 0x8a893f16),
- TOBN(0xbcd6de84, 0x9fc74f6b), TOBN(0xfa5817e2, 0xf3144e61),
- TOBN(0x1f354164, 0x0821ee4c), TOBN(0x1583eab4, 0x0bc61992),
- TOBN(0x7490caf6, 0x1d72879f), TOBN(0x998ad9f3, 0xf76ae7b2),
- TOBN(0x1e181950, 0xa41157f7), TOBN(0xa9d7e1e6, 0xe8da3a7e),
- TOBN(0x963784eb, 0x8426b95f), TOBN(0x0ee4ed6e, 0x542e2a10),
- TOBN(0xb79d4cc5, 0xac751e7b), TOBN(0x93f96472, 0xfd4211bd),
- TOBN(0x8c72d3d2, 0xc8de4fc6), TOBN(0x7b69cbf5, 0xdf44f064),
- TOBN(0x3da90ca2, 0xf4bf94e1), TOBN(0x1a5325f8, 0xf12894e2),
- TOBN(0x0a437f6c, 0x7917d60b), TOBN(0x9be70486, 0x96c9cb5d),
- TOBN(0xb4d880bf, 0xe1dc5c05), TOBN(0xd738adda, 0xeebeeb57),
- TOBN(0x6f0119d3, 0xdf0fe6a3), TOBN(0x5c686e55, 0x66eaaf5a),
- TOBN(0x9cb10b50, 0xdfd0b7ec), TOBN(0xbdd0264b, 0x6a497c21),
- TOBN(0xfc093514, 0x8c546c96), TOBN(0x58a947fa, 0x79dbf42a),
- TOBN(0xc0b48d4e, 0x49ccd6d7), TOBN(0xff8fb02c, 0x88bd5580),
- TOBN(0xc75235e9, 0x07d473b2), TOBN(0x4fab1ac5, 0xa2188af3),
- TOBN(0x030fa3bc, 0x97576ec0), TOBN(0xe8c946e8, 0x0b7e7d2f),
- TOBN(0x40a5c9cc, 0x70305600), TOBN(0x6d8260a9, 0xc8b013b4),
- TOBN(0x0368304f, 0x70bba85c), TOBN(0xad090da1, 0xa4a0d311),
- TOBN(0x7170e870, 0x2415eec1), TOBN(0xbfba35fe, 0x8461ea47),
- TOBN(0x6279019a, 0xc1e91938), TOBN(0xa47638f3, 0x1afc415f),
- TOBN(0x36c65cbb, 0xbcba0e0f), TOBN(0x02160efb, 0x034e2c48),
- TOBN(0xe6c51073, 0x615cd9e4), TOBN(0x498ec047, 0xf1243c06),
- TOBN(0x3e5a8809, 0xb17b3d8c), TOBN(0x5cd99e61, 0x0cc565f1),
- TOBN(0x81e312df, 0x7851dafe), TOBN(0xf156f5ba, 0xa79061e2),
- TOBN(0x80d62b71, 0x880c590e), TOBN(0xbec9746f, 0x0a39faa1),
- TOBN(0x1d98a9c1, 0xc8ed1f7a), TOBN(0x09e43bb5, 0xa81d5ff2),
- TOBN(0xd5f00f68, 0x0da0794a), TOBN(0x412050d9, 0x661aa836),
- TOBN(0xa89f7c4e, 0x90747e40), TOBN(0x6dc05ebb, 0xb62a3686),
- TOBN(0xdf4de847, 0x308e3353), TOBN(0x53868fbb, 0x9fb53bb9),
- TOBN(0x2b09d2c3, 0xcfdcf7dd), TOBN(0x41a9fce3, 0x723fcab4),
- TOBN(0x73d905f7, 0x07f57ca3), TOBN(0x080f9fb1, 0xac8e1555),
- TOBN(0x7c088e84, 0x9ba7a531), TOBN(0x07d35586, 0xed9a147f),
- TOBN(0x602846ab, 0xaf48c336), TOBN(0x7320fd32, 0x0ccf0e79),
- TOBN(0xaa780798, 0xb18bd1ff), TOBN(0x52c2e300, 0xafdd2905),
- TOBN(0xf27ea3d6, 0x434267cd), TOBN(0x8b96d16d, 0x15605b5f),
- TOBN(0x7bb31049, 0x4b45706b), TOBN(0xe7f58b8e, 0x743d25f8),
- TOBN(0xe9b5e45b, 0x87f30076), TOBN(0xd19448d6, 0x5d053d5a),
- TOBN(0x1ecc8cb9, 0xd3210a04), TOBN(0x6bc7d463, 0xdafb5269),
- TOBN(0x3e59b10a, 0x67c3489f), TOBN(0x1769788c, 0x65641e1b),
- TOBN(0x8a53b82d, 0xbd6cb838), TOBN(0x7066d6e6, 0x236d5f22),
- TOBN(0x03aa1c61, 0x6908536e), TOBN(0xc971da0d, 0x66ae9809),
- TOBN(0x01b3a86b, 0xc49a2fac), TOBN(0x3b8420c0, 0x3092e77a),
- TOBN(0x02057300, 0x7d6fb556), TOBN(0x6941b2a1, 0xbff40a87),
- TOBN(0x140b6308, 0x0658ff2a), TOBN(0x87804363, 0x3424ab36),
- TOBN(0x0253bd51, 0x5751e299), TOBN(0xc75bcd76, 0x449c3e3a),
- TOBN(0x92eb4090, 0x7f8f875d), TOBN(0x9c9d754e, 0x56c26bbf),
- TOBN(0x158cea61, 0x8110bbe7), TOBN(0x62a6b802, 0x745f91ea),
- TOBN(0xa79c41aa, 0xc6e7394b), TOBN(0x445b6a83, 0xad57ef10),
- TOBN(0x0c5277eb, 0x6ea6f40c), TOBN(0x319fe96b, 0x88633365),
- TOBN(0x0b0fc61f, 0x385f63cb), TOBN(0x41250c84, 0x22bdd127),
- TOBN(0x67d153f1, 0x09e942c2), TOBN(0x60920d08, 0xc021ad5d),
- TOBN(0x229f5746, 0x724d81a5), TOBN(0xb7ffb892, 0x5bba3299),
- TOBN(0x518c51a1, 0xde413032), TOBN(0x2a9bfe77, 0x3c2fd94c),
- TOBN(0xcbcde239, 0x3191f4fd), TOBN(0x43093e16, 0xd3d6ada1),
- TOBN(0x184579f3, 0x58769606), TOBN(0x2c94a8b3, 0xd236625c),
- TOBN(0x6922b9c0, 0x5c437d8e), TOBN(0x3d4ae423, 0xd8d9f3c8),
- TOBN(0xf72c31c1, 0x2e7090a2), TOBN(0x4ac3f5f3, 0xd76a55bd),
- TOBN(0x342508fc, 0x6b6af991), TOBN(0x0d527100, 0x1b5cebbd),
- TOBN(0xb84740d0, 0xdd440dd7), TOBN(0x748ef841, 0x780162fd),
- TOBN(0xa8dbfe0e, 0xdfc6fafb), TOBN(0xeadfdf05, 0xf7300f27),
- TOBN(0x7d06555f, 0xfeba4ec9), TOBN(0x12c56f83, 0x9e25fa97),
- TOBN(0x77f84203, 0xd39b8c34), TOBN(0xed8b1be6, 0x3125eddb),
- TOBN(0x5bbf2441, 0xf6e39dc5), TOBN(0xb00f6ee6, 0x6a5d678a),
- TOBN(0xba456ecf, 0x57d0ea99), TOBN(0xdcae0f58, 0x17e06c43),
- TOBN(0x01643de4, 0x0f5b4baa), TOBN(0x2c324341, 0xd161b9be),
- TOBN(0x80177f55, 0xe126d468), TOBN(0xed325f1f, 0x76748e09),
- TOBN(0x6116004a, 0xcfa9bdc2), TOBN(0x2d8607e6, 0x3a9fb468),
- TOBN(0x0e573e27, 0x6009d660), TOBN(0x3a525d2e, 0x8d10c5a1),
- TOBN(0xd26cb45c, 0x3b9009a0), TOBN(0xb6b0cdc0, 0xde9d7448),
- TOBN(0x949c9976, 0xe1337c26), TOBN(0x6faadebd, 0xd73d68e5),
- TOBN(0x9e158614, 0xf1b768d9), TOBN(0x22dfa557, 0x9cc4f069),
- TOBN(0xccd6da17, 0xbe93c6d6), TOBN(0x24866c61, 0xa504f5b9),
- TOBN(0x2121353c, 0x8d694da1), TOBN(0x1c6ca580, 0x0140b8c6),
- TOBN(0xc245ad8c, 0xe964021e), TOBN(0xb83bffba, 0x032b82b3),
- TOBN(0xfaa220c6, 0x47ef9898), TOBN(0x7e8d3ac6, 0x982c948a),
- TOBN(0x1faa2091, 0xbc2d124a), TOBN(0xbd54c3dd, 0x05b15ff4),
- TOBN(0x386bf3ab, 0xc87c6fb7), TOBN(0xfb2b0563, 0xfdeb6f66),
- TOBN(0x4e77c557, 0x5b45afb4), TOBN(0xe9ded649, 0xefb8912d),
- TOBN(0x7ec9bbf5, 0x42f6e557), TOBN(0x2570dfff, 0x62671f00),
- TOBN(0x2b3bfb78, 0x88e084bd), TOBN(0xa024b238, 0xf37fe5b4),
- TOBN(0x44e7dc04, 0x95649aee), TOBN(0x498ca255, 0x5e7ec1d8),
- TOBN(0x3bc766ea, 0xaaa07e86), TOBN(0x0db6facb, 0xf3608586),
- TOBN(0xbadd2549, 0xbdc259c8), TOBN(0x95af3c6e, 0x041c649f),
- TOBN(0xb36a928c, 0x02e30afb), TOBN(0x9b5356ad, 0x008a88b8),
- TOBN(0x4b67a5f1, 0xcf1d9e9d), TOBN(0xc6542e47, 0xa5d8d8ce),
- TOBN(0x73061fe8, 0x7adfb6cc), TOBN(0xcc826fd3, 0x98678141),
- TOBN(0x00e758b1, 0x3c80515a), TOBN(0x6afe3247, 0x41485083),
- TOBN(0x0fcb08b9, 0xb6ae8a75), TOBN(0xb8cf388d, 0x4acf51e1),
- TOBN(0x344a5560, 0x6961b9d6), TOBN(0x1a6778b8, 0x6a97fd0c),
- TOBN(0xd840fdc1, 0xecc4c7e3), TOBN(0xde9fe47d, 0x16db68cc),
- TOBN(0xe95f89de, 0xa3e216aa), TOBN(0x84f1a6a4, 0x9594a8be),
- TOBN(0x7ddc7d72, 0x5a7b162b), TOBN(0xc5cfda19, 0xadc817a3),
- TOBN(0x80a5d350, 0x78b58d46), TOBN(0x93365b13, 0x82978f19),
- TOBN(0x2e44d225, 0x26a1fc90), TOBN(0x0d6d10d2, 0x4d70705d),
- TOBN(0xd94b6b10, 0xd70c45f4), TOBN(0x0f201022, 0xb216c079),
- TOBN(0xcec966c5, 0x658fde41), TOBN(0xa8d2bc7d, 0x7e27601d),
- TOBN(0xbfcce3e1, 0xff230be7), TOBN(0x3394ff6b, 0x0033ffb5),
- TOBN(0xd890c509, 0x8132c9af), TOBN(0xaac4b0eb, 0x361e7868),
- TOBN(0x5194ded3, 0xe82d15aa), TOBN(0x4550bd2e, 0x23ae6b7d),
- TOBN(0x3fda318e, 0xea5399d4), TOBN(0xd989bffa, 0x91638b80),
- TOBN(0x5ea124d0, 0xa14aa12d), TOBN(0x1fb1b899, 0x3667b944),
- TOBN(0x95ec7969, 0x44c44d6a), TOBN(0x91df144a, 0x57e86137),
- TOBN(0x915fd620, 0x73adac44), TOBN(0x8f01732d, 0x59a83801),
- TOBN(0xec579d25, 0x3aa0a633), TOBN(0x06de5e7c, 0xc9d6d59c),
- TOBN(0xc132f958, 0xb1ef8010), TOBN(0x29476f96, 0xe65c1a02),
- TOBN(0x336a77c0, 0xd34c3565), TOBN(0xef1105b2, 0x1b9f1e9e),
- TOBN(0x63e6d08b, 0xf9e08002), TOBN(0x9aff2f21, 0xc613809e),
- TOBN(0xb5754f85, 0x3a80e75d), TOBN(0xde71853e, 0x6bbda681),
- TOBN(0x86f041df, 0x8197fd7a), TOBN(0x8b332e08, 0x127817fa),
- TOBN(0x05d99be8, 0xb9c20cda), TOBN(0x89f7aad5, 0xd5cd0c98),
- TOBN(0x7ef936fe, 0x5bb94183), TOBN(0x92ca0753, 0xb05cd7f2),
- TOBN(0x9d65db11, 0x74a1e035), TOBN(0x02628cc8, 0x13eaea92),
- TOBN(0xf2d9e242, 0x49e4fbf2), TOBN(0x94fdfd9b, 0xe384f8b7),
- TOBN(0x65f56054, 0x63428c6b), TOBN(0x2f7205b2, 0x90b409a5),
- TOBN(0xf778bb78, 0xff45ae11), TOBN(0xa13045be, 0xc5ee53b2),
- TOBN(0xe00a14ff, 0x03ef77fe), TOBN(0x689cd59f, 0xffef8bef),
- TOBN(0x3578f0ed, 0x1e9ade22), TOBN(0xe99f3ec0, 0x6268b6a8),
- TOBN(0xa2057d91, 0xea1b3c3e), TOBN(0x2d1a7053, 0xb8823a4a),
- TOBN(0xabbb336a, 0x2cca451e), TOBN(0xcd2466e3, 0x2218bb5d),
- TOBN(0x3ac1f42f, 0xc8cb762d), TOBN(0x7e312aae, 0x7690211f),
- TOBN(0xebb9bd73, 0x45d07450), TOBN(0x207c4b82, 0x46c2213f),
- TOBN(0x99d425c1, 0x375913ec), TOBN(0x94e45e96, 0x67908220),
- TOBN(0xc08f3087, 0xcd67dbf6), TOBN(0xa5670fbe, 0xc0887056),
- TOBN(0x6717b64a, 0x66f5b8fc), TOBN(0xd5a56aea, 0x786fec28),
- TOBN(0xa8c3f55f, 0xc0ff4952), TOBN(0xa77fefae, 0x457ac49b),
- TOBN(0x29882d7c, 0x98379d44), TOBN(0xd000bdfb, 0x509edc8a),
- TOBN(0xc6f95979, 0xe66fe464), TOBN(0x504a6115, 0xfa61bde0),
- TOBN(0x56b3b871, 0xeffea31a), TOBN(0x2d3de26d, 0xf0c21a54),
- TOBN(0x21dbff31, 0x834753bf), TOBN(0xe67ecf49, 0x69269d86),
- TOBN(0x7a176952, 0x151fe690), TOBN(0x03515804, 0x7f2adb5f),
- TOBN(0xee794b15, 0xd1b62a8d), TOBN(0xf004ceec, 0xaae454e6),
- TOBN(0x0897ea7c, 0xf0386fac), TOBN(0x3b62ff12, 0xd1fca751),
- TOBN(0x154181df, 0x1b7a04ec), TOBN(0x2008e04a, 0xfb5847ec),
- TOBN(0xd147148e, 0x41dbd772), TOBN(0x2b419f73, 0x22942654),
- TOBN(0x669f30d3, 0xe9c544f7), TOBN(0x52a2c223, 0xc8540149),
- TOBN(0x5da9ee14, 0x634dfb02), TOBN(0x5f074ff0, 0xf47869f3),
- TOBN(0x74ee878d, 0xa3933acc), TOBN(0xe6510651, 0x4fe35ed1),
- TOBN(0xb3eb9482, 0xf1012e7a), TOBN(0x51013cc0, 0xa8a566ae),
- TOBN(0xdd5e9243, 0x47c00d3b), TOBN(0x7fde089d, 0x946bb0e5),
- TOBN(0x030754fe, 0xc731b4b3), TOBN(0x12a136a4, 0x99fda062),
- TOBN(0x7c1064b8, 0x5a1a35bc), TOBN(0xbf1f5763, 0x446c84ef),
- TOBN(0xed29a56d, 0xa16d4b34), TOBN(0x7fba9d09, 0xdca21c4f),
- TOBN(0x66d7ac00, 0x6d8de486), TOBN(0x60061987, 0x73a2a5e1),
- TOBN(0x8b400f86, 0x9da28ff0), TOBN(0x3133f708, 0x43c4599c),
- TOBN(0x9911c9b8, 0xee28cb0d), TOBN(0xcd7e2874, 0x8e0af61d),
- TOBN(0x5a85f0f2, 0x72ed91fc), TOBN(0x85214f31, 0x9cd4a373),
- TOBN(0x881fe5be, 0x1925253c), TOBN(0xd8dc98e0, 0x91e8bc76),
- TOBN(0x7120affe, 0x585cc3a2), TOBN(0x724952ed, 0x735bf97a),
- TOBN(0x5581e7dc, 0x3eb34581), TOBN(0x5cbff4f2, 0xe52ee57d),
- TOBN(0x8d320a0e, 0x87d8cc7b), TOBN(0x9beaa7f3, 0xf1d280d0),
- TOBN(0x7a0b9571, 0x9beec704), TOBN(0x9126332e, 0x5b7f0057),
- TOBN(0x01fbc1b4, 0x8ed3bd6d), TOBN(0x35bb2c12, 0xd945eb24),
- TOBN(0x6404694e, 0x9a8ae255), TOBN(0xb6092eec, 0x8d6abfb3),
- TOBN(0x4d76143f, 0xcc058865), TOBN(0x7b0a5af2, 0x6e249922),
- TOBN(0x8aef9440, 0x6a50d353), TOBN(0xe11e4bcc, 0x64f0e07a),
- TOBN(0x4472993a, 0xa14a90fa), TOBN(0x7706e20c, 0xba0c51d4),
- TOBN(0xf403292f, 0x1532672d), TOBN(0x52573bfa, 0x21829382),
- TOBN(0x6a7bb6a9, 0x3b5bdb83), TOBN(0x08da65c0, 0xa4a72318),
- TOBN(0xc58d22aa, 0x63eb065f), TOBN(0x1717596c, 0x1b15d685),
- TOBN(0x112df0d0, 0xb266d88b), TOBN(0xf688ae97, 0x5941945a),
- TOBN(0x487386e3, 0x7c292cac), TOBN(0x42f3b50d, 0x57d6985c),
- TOBN(0x6da4f998, 0x6a90fc34), TOBN(0xc8f257d3, 0x65ca8a8d),
- TOBN(0xc2feabca, 0x6951f762), TOBN(0xe1bc81d0, 0x74c323ac),
- TOBN(0x1bc68f67, 0x251a2a12), TOBN(0x10d86587, 0xbe8a70dc),
- TOBN(0xd648af7f, 0xf0f84d2e), TOBN(0xf0aa9ebc, 0x6a43ac92),
- TOBN(0x69e3be04, 0x27596893), TOBN(0xb6bb02a6, 0x45bf452b),
- TOBN(0x0875c11a, 0xf4c698c8), TOBN(0x6652b5c7, 0xbece3794),
- TOBN(0x7b3755fd, 0x4f5c0499), TOBN(0x6ea16558, 0xb5532b38),
- TOBN(0xd1c69889, 0xa2e96ef7), TOBN(0x9c773c3a, 0x61ed8f48),
- TOBN(0x2b653a40, 0x9b323abc), TOBN(0xe26605e1, 0xf0e1d791),
- TOBN(0x45d41064, 0x4a87157a), TOBN(0x8f9a78b7, 0xcbbce616),
- TOBN(0xcf1e44aa, 0xc407eddd), TOBN(0x81ddd1d8, 0xa35b964f),
- TOBN(0x473e339e, 0xfd083999), TOBN(0x6c94bdde, 0x8e796802),
- TOBN(0x5a304ada, 0x8545d185), TOBN(0x82ae44ea, 0x738bb8cb),
- TOBN(0x628a35e3, 0xdf87e10e), TOBN(0xd3624f3d, 0xa15b9fe3),
- TOBN(0xcc44209b, 0x14be4254), TOBN(0x7d0efcbc, 0xbdbc2ea5),
- TOBN(0x1f603362, 0x04c37bbe), TOBN(0x21f363f5, 0x56a5852c),
- TOBN(0xa1503d1c, 0xa8501550), TOBN(0x2251e0e1, 0xd8ab10bb),
- TOBN(0xde129c96, 0x6961c51c), TOBN(0x1f7246a4, 0x81910f68),
- TOBN(0x2eb744ee, 0x5f2591f2), TOBN(0x3c47d33f, 0x5e627157),
- TOBN(0x4d6d62c9, 0x22f3bd68), TOBN(0x6120a64b, 0xcb8df856),
- TOBN(0x3a9ac6c0, 0x7b5d07df), TOBN(0xa92b9558, 0x7ef39783),
- TOBN(0xe128a134, 0xab3a9b4f), TOBN(0x41c18807, 0xb1252f05),
- TOBN(0xfc7ed089, 0x80ba9b1c), TOBN(0xac8dc6de, 0xc532a9dd),
- TOBN(0xbf829cef, 0x55246809), TOBN(0x101b784f, 0x5b4ee80f),
- TOBN(0xc09945bb, 0xb6f11603), TOBN(0x57b09dbe, 0x41d2801e),
- TOBN(0xfba5202f, 0xa97534a8), TOBN(0x7fd8ae5f, 0xc17b9614),
- TOBN(0xa50ba666, 0x78308435), TOBN(0x9572f77c, 0xd3868c4d),
- TOBN(0x0cef7bfd, 0x2dd7aab0), TOBN(0xe7958e08, 0x2c7c79ff),
- TOBN(0x81262e42, 0x25346689), TOBN(0x716da290, 0xb07c7004),
- TOBN(0x35f911ea, 0xb7950ee3), TOBN(0x6fd72969, 0x261d21b5),
- TOBN(0x52389803, 0x08b640d3), TOBN(0x5b0026ee, 0x887f12a1),
- TOBN(0x20e21660, 0x742e9311), TOBN(0x0ef6d541, 0x5ff77ff7),
- TOBN(0x969127f0, 0xf9c41135), TOBN(0xf21d60c9, 0x68a64993),
- TOBN(0x656e5d0c, 0xe541875c), TOBN(0xf1e0f84e, 0xa1d3c233),
- TOBN(0x9bcca359, 0x06002d60), TOBN(0xbe2da60c, 0x06191552),
- TOBN(0x5da8bbae, 0x61181ec3), TOBN(0x9f04b823, 0x65806f19),
- TOBN(0xf1604a7d, 0xd4b79bb8), TOBN(0xaee806fb, 0x52c878c8),
- TOBN(0x34144f11, 0x8d47b8e8), TOBN(0x72edf52b, 0x949f9054),
- TOBN(0xebfca84e, 0x2127015a), TOBN(0x9051d0c0, 0x9cb7cef3),
- TOBN(0x86e8fe58, 0x296deec8), TOBN(0x33b28188, 0x41010d74),}
- ,
- {TOBN(0x01079383, 0x171b445f), TOBN(0x9bcf21e3, 0x8131ad4c),
- TOBN(0x8cdfe205, 0xc93987e8), TOBN(0xe63f4152, 0xc92e8c8f),
- TOBN(0x729462a9, 0x30add43d), TOBN(0x62ebb143, 0xc980f05a),
- TOBN(0x4f3954e5, 0x3b06e968), TOBN(0xfe1d75ad, 0x242cf6b1),
- TOBN(0x5f95c6c7, 0xaf8685c8), TOBN(0xd4c1c8ce, 0x2f8f01aa),
- TOBN(0xc44bbe32, 0x2574692a), TOBN(0xb8003478, 0xd4a4a068),
- TOBN(0x7c8fc6e5, 0x2eca3cdb), TOBN(0xea1db16b, 0xec04d399),
- TOBN(0xb05bc82e, 0x8f2bc5cf), TOBN(0x763d517f, 0xf44793d2),
- TOBN(0x4451c1b8, 0x08bd98d0), TOBN(0x644b1cd4, 0x6575f240),
- TOBN(0x6907eb33, 0x7375d270), TOBN(0x56c8bebd, 0xfa2286bd),
- TOBN(0xc713d2ac, 0xc4632b46), TOBN(0x17da427a, 0xafd60242),
- TOBN(0x313065b7, 0xc95c7546), TOBN(0xf8239898, 0xbf17a3de),
- TOBN(0xf3b7963f, 0x4c830320), TOBN(0x842c7aa0, 0x903203e3),
- TOBN(0xaf22ca0a, 0xe7327afb), TOBN(0x38e13092, 0x967609b6),
- TOBN(0x73b8fb62, 0x757558f1), TOBN(0x3cc3e831, 0xf7eca8c1),
- TOBN(0xe4174474, 0xf6331627), TOBN(0xa77989ca, 0xc3c40234),
- TOBN(0xe5fd17a1, 0x44a081e0), TOBN(0xd797fb7d, 0xb70e296a),
- TOBN(0x2b472b30, 0x481f719c), TOBN(0x0e632a98, 0xfe6f8c52),
- TOBN(0x89ccd116, 0xc5f0c284), TOBN(0xf51088af, 0x2d987c62),
- TOBN(0x2a2bccda, 0x4c2de6cf), TOBN(0x810f9efe, 0xf679f0f9),
- TOBN(0xb0f394b9, 0x7ffe4b3e), TOBN(0x0b691d21, 0xe5fa5d21),
- TOBN(0xb0bd7747, 0x9dfbbc75), TOBN(0xd2830fda, 0xfaf78b00),
- TOBN(0xf78c249c, 0x52434f57), TOBN(0x4b1f7545, 0x98096dab),
- TOBN(0x73bf6f94, 0x8ff8c0b3), TOBN(0x34aef03d, 0x454e134c),
- TOBN(0xf8d151f4, 0xb7ac7ec5), TOBN(0xd6ceb95a, 0xe50da7d5),
- TOBN(0xa1b492b0, 0xdc3a0eb8), TOBN(0x75157b69, 0xb3dd2863),
- TOBN(0xe2c4c74e, 0xc5413d62), TOBN(0xbe329ff7, 0xbc5fc4c7),
- TOBN(0x835a2aea, 0x60fa9dda), TOBN(0xf117f5ad, 0x7445cb87),
- TOBN(0xae8317f4, 0xb0166f7a), TOBN(0xfbd3e3f7, 0xceec74e6),
- TOBN(0xfdb516ac, 0xe0874bfd), TOBN(0x3d846019, 0xc681f3a3),
- TOBN(0x0b12ee5c, 0x7c1620b0), TOBN(0xba68b4dd, 0x2b63c501),
- TOBN(0xac03cd32, 0x6668c51e), TOBN(0x2a6279f7, 0x4e0bcb5b),
- TOBN(0x17bd69b0, 0x6ae85c10), TOBN(0x72946979, 0x1dfdd3a6),
- TOBN(0xd9a03268, 0x2c078bec), TOBN(0x41c6a658, 0xbfd68a52),
- TOBN(0xcdea1024, 0x0e023900), TOBN(0xbaeec121, 0xb10d144d),
- TOBN(0x5a600e74, 0x058ab8dc), TOBN(0x1333af21, 0xbb89ccdd),
- TOBN(0xdf25eae0, 0x3aaba1f1), TOBN(0x2cada16e, 0x3b7144cf),
- TOBN(0x657ee27d, 0x71ab98bc), TOBN(0x99088b4c, 0x7a6fc96e),
- TOBN(0x05d5c0a0, 0x3549dbd4), TOBN(0x42cbdf8f, 0xf158c3ac),
- TOBN(0x3fb6b3b0, 0x87edd685), TOBN(0x22071cf6, 0x86f064d0),
- TOBN(0xd2d6721f, 0xff2811e5), TOBN(0xdb81b703, 0xfe7fae8c),
- TOBN(0x3cfb74ef, 0xd3f1f7bb), TOBN(0x0cdbcd76, 0x16cdeb5d),
- TOBN(0x4f39642a, 0x566a808c), TOBN(0x02b74454, 0x340064d6),
- TOBN(0xfabbadca, 0x0528fa6f), TOBN(0xe4c3074c, 0xd3fc0bb6),
- TOBN(0xb32cb8b0, 0xb796d219), TOBN(0xc3e95f4f, 0x34741dd9),
- TOBN(0x87212125, 0x68edf6f5), TOBN(0x7a03aee4, 0xa2b9cb8e),
- TOBN(0x0cd3c376, 0xf53a89aa), TOBN(0x0d8af9b1, 0x948a28dc),
- TOBN(0xcf86a3f4, 0x902ab04f), TOBN(0x8aacb62a, 0x7f42002d),
- TOBN(0x106985eb, 0xf62ffd52), TOBN(0xe670b54e, 0x5797bf10),
- TOBN(0x4b405209, 0xc5e30aef), TOBN(0x12c97a20, 0x4365b5e9),
- TOBN(0x104646ce, 0x1fe32093), TOBN(0x13cb4ff6, 0x3907a8c9),
- TOBN(0x8b9f30d1, 0xd46e726b), TOBN(0xe1985e21, 0xaba0f499),
- TOBN(0xc573dea9, 0x10a230cd), TOBN(0x24f46a93, 0xcd30f947),
- TOBN(0xf2623fcf, 0xabe2010a), TOBN(0x3f278cb2, 0x73f00e4f),
- TOBN(0xed55c67d, 0x50b920eb), TOBN(0xf1cb9a2d, 0x8e760571),
- TOBN(0x7c50d109, 0x0895b709), TOBN(0x4207cf07, 0x190d4369),
- TOBN(0x3b027e81, 0xc4127fe1), TOBN(0xa9f8b9ad, 0x3ae9c566),
- TOBN(0x5ab10851, 0xacbfbba5), TOBN(0xa747d648, 0x569556f5),
- TOBN(0xcc172b5c, 0x2ba97bf7), TOBN(0x15e0f77d, 0xbcfa3324),
- TOBN(0xa345b797, 0x7686279d), TOBN(0x5a723480, 0xe38003d3),
- TOBN(0xfd8e139f, 0x8f5fcda8), TOBN(0xf3e558c4, 0xbdee5bfd),
- TOBN(0xd76cbaf4, 0xe33f9f77), TOBN(0x3a4c97a4, 0x71771969),
- TOBN(0xda27e84b, 0xf6dce6a7), TOBN(0xff373d96, 0x13e6c2d1),
- TOBN(0xf115193c, 0xd759a6e9), TOBN(0x3f9b7025, 0x63d2262c),
- TOBN(0xd9764a31, 0x317cd062), TOBN(0x30779d8e, 0x199f8332),
- TOBN(0xd8074106, 0x16b11b0b), TOBN(0x7917ab9f, 0x78aeaed8),
- TOBN(0xb67a9cbe, 0x28fb1d8e), TOBN(0x2e313563, 0x136eda33),
- TOBN(0x010b7069, 0xa371a86c), TOBN(0x44d90fa2, 0x6744e6b7),
- TOBN(0x68190867, 0xd6b3e243), TOBN(0x9fe6cd9d, 0x59048c48),
- TOBN(0xb900b028, 0x95731538), TOBN(0xa012062f, 0x32cae04f),
- TOBN(0x8107c8bc, 0x9399d082), TOBN(0x47e8c54a, 0x41df12e2),
- TOBN(0x14ba5117, 0xb6ef3f73), TOBN(0x22260bea, 0x81362f0b),
- TOBN(0x90ea261e, 0x1a18cc20), TOBN(0x2192999f, 0x2321d636),
- TOBN(0xef64d314, 0xe311b6a0), TOBN(0xd7401e4c, 0x3b54a1f5),
- TOBN(0x19019983, 0x6fbca2ba), TOBN(0x46ad3293, 0x8fbffc4b),
- TOBN(0xa142d3f6, 0x3786bf40), TOBN(0xeb5cbc26, 0xb67039fc),
- TOBN(0x9cb0ae6c, 0x252bd479), TOBN(0x05e0f88a, 0x12b5848f),
- TOBN(0x78f6d2b2, 0xa5c97663), TOBN(0x6f6e149b, 0xc162225c),
- TOBN(0xe602235c, 0xde601a89), TOBN(0xd17bbe98, 0xf373be1f),
- TOBN(0xcaf49a5b, 0xa8471827), TOBN(0x7e1a0a85, 0x18aaa116),
- TOBN(0x6c833196, 0x270580c3), TOBN(0x1e233839, 0xf1c98a14),
- TOBN(0x67b2f7b4, 0xae34e0a5), TOBN(0x47ac8745, 0xd8ce7289),
- TOBN(0x2b74779a, 0x100dd467), TOBN(0x274a4337, 0x4ee50d09),
- TOBN(0x603dcf13, 0x83608bc9), TOBN(0xcd9da6c3, 0xc89e8388),
- TOBN(0x2660199f, 0x355116ac), TOBN(0xcc38bb59, 0xb6d18eed),
- TOBN(0x3075f31f, 0x2f4bc071), TOBN(0x9774457f, 0x265dc57e),
- TOBN(0x06a6a9c8, 0xc6db88bb), TOBN(0x6429d07f, 0x4ec98e04),
- TOBN(0x8d05e57b, 0x05ecaa8b), TOBN(0x20f140b1, 0x7872ea7b),
- TOBN(0xdf8c0f09, 0xca494693), TOBN(0x48d3a020, 0xf252e909),
- TOBN(0x4c5c29af, 0x57b14b12), TOBN(0x7e6fa37d, 0xbf47ad1c),
- TOBN(0x66e7b506, 0x49a0c938), TOBN(0xb72c0d48, 0x6be5f41f),
- TOBN(0x6a6242b8, 0xb2359412), TOBN(0xcd35c774, 0x8e859480),
- TOBN(0x12536fea, 0x87baa627), TOBN(0x58c1fec1, 0xf72aa680),
- TOBN(0x6c29b637, 0x601e5dc9), TOBN(0x9e3c3c1c, 0xde9e01b9),
- TOBN(0xefc8127b, 0x2bcfe0b0), TOBN(0x35107102, 0x2a12f50d),
- TOBN(0x6ccd6cb1, 0x4879b397), TOBN(0xf792f804, 0xf8a82f21),
- TOBN(0x509d4804, 0xa9b46402), TOBN(0xedddf85d, 0xc10f0850),
- TOBN(0x928410dc, 0x4b6208aa), TOBN(0xf6229c46, 0x391012dc),
- TOBN(0xc5a7c41e, 0x7727b9b6), TOBN(0x289e4e4b, 0xaa444842),
- TOBN(0x049ba1d9, 0xe9a947ea), TOBN(0x44f9e47f, 0x83c8debc),
- TOBN(0xfa77a1fe, 0x611f8b8e), TOBN(0xfd2e416a, 0xf518f427),
- TOBN(0xc5fffa70, 0x114ebac3), TOBN(0xfe57c4e9, 0x5d89697b),
- TOBN(0xfdd053ac, 0xb1aaf613), TOBN(0x31df210f, 0xea585a45),
- TOBN(0x318cc10e, 0x24985034), TOBN(0x1a38efd1, 0x5f1d6130),
- TOBN(0xbf86f237, 0x0b1e9e21), TOBN(0xb258514d, 0x1dbe88aa),
- TOBN(0x1e38a588, 0x90c1baf9), TOBN(0x2936a01e, 0xbdb9b692),
- TOBN(0xd576de98, 0x6dd5b20c), TOBN(0xb586bf71, 0x70f98ecf),
- TOBN(0xcccf0f12, 0xc42d2fd7), TOBN(0x8717e61c, 0xfb35bd7b),
- TOBN(0x8b1e5722, 0x35e6fc06), TOBN(0x3477728f, 0x0b3e13d5),
- TOBN(0x150c294d, 0xaa8a7372), TOBN(0xc0291d43, 0x3bfa528a),
- TOBN(0xc6c8bc67, 0xcec5a196), TOBN(0xdeeb31e4, 0x5c2e8a7c),
- TOBN(0xba93e244, 0xfb6e1c51), TOBN(0xb9f8b71b, 0x2e28e156),
- TOBN(0xce65a287, 0x968a2ab9), TOBN(0xe3c5ce69, 0x46bbcb1f),
- TOBN(0xf8c835b9, 0xe7ae3f30), TOBN(0x16bbee26, 0xff72b82b),
- TOBN(0x665e2017, 0xfd42cd22), TOBN(0x1e139970, 0xf8b1d2a0),
- TOBN(0x125cda29, 0x79204932), TOBN(0x7aee94a5, 0x49c3bee5),
- TOBN(0x68c70160, 0x89821a66), TOBN(0xf7c37678, 0x8f981669),
- TOBN(0xd90829fc, 0x48cc3645), TOBN(0x346af049, 0xd70addfc),
- TOBN(0x2057b232, 0x370bf29c), TOBN(0xf90c73ce, 0x42e650ee),
- TOBN(0xe03386ea, 0xa126ab90), TOBN(0x0e266e7e, 0x975a087b),
- TOBN(0x80578eb9, 0x0fca65d9), TOBN(0x7e2989ea, 0x16af45b8),
- TOBN(0x7438212d, 0xcac75a4e), TOBN(0x38c7ca39, 0x4fef36b8),
- TOBN(0x8650c494, 0xd402676a), TOBN(0x26ab5a66, 0xf72c7c48),
- TOBN(0x4e6cb426, 0xce3a464e), TOBN(0xf8f99896, 0x2b72f841),
- TOBN(0x8c318491, 0x1a335cc8), TOBN(0x563459ba, 0x6a5913e4),
- TOBN(0x1b920d61, 0xc7b32919), TOBN(0x805ab8b6, 0xa02425ad),
- TOBN(0x2ac512da, 0x8d006086), TOBN(0x6ca4846a, 0xbcf5c0fd),
- TOBN(0xafea51d8, 0xac2138d7), TOBN(0xcb647545, 0x344cd443),
- TOBN(0x0429ee8f, 0xbd7d9040), TOBN(0xee66a2de, 0x819b9c96),
- TOBN(0x54f9ec25, 0xdea7d744), TOBN(0x2ffea642, 0x671721bb),
- TOBN(0x4f19dbd1, 0x114344ea), TOBN(0x04304536, 0xfd0dbc8b),
- TOBN(0x014b50aa, 0x29ec7f91), TOBN(0xb5fc22fe, 0xbb06014d),
- TOBN(0x60d963a9, 0x1ee682e0), TOBN(0xdf48abc0, 0xfe85c727),
- TOBN(0x0cadba13, 0x2e707c2d), TOBN(0xde608d3a, 0xa645aeff),
- TOBN(0x05f1c28b, 0xedafd883), TOBN(0x3c362ede, 0xbd94de1f),
- TOBN(0x8dd0629d, 0x13593e41), TOBN(0x0a5e736f, 0x766d6eaf),
- TOBN(0xbfa92311, 0xf68cf9d1), TOBN(0xa4f9ef87, 0xc1797556),
- TOBN(0x10d75a1f, 0x5601c209), TOBN(0x651c374c, 0x09b07361),
- TOBN(0x49950b58, 0x88b5cead), TOBN(0x0ef00058, 0x6fa9dbaa),
- TOBN(0xf51ddc26, 0x4e15f33a), TOBN(0x1f8b5ca6, 0x2ef46140),
- TOBN(0x343ac0a3, 0xee9523f0), TOBN(0xbb75eab2, 0x975ea978),
- TOBN(0x1bccf332, 0x107387f4), TOBN(0x790f9259, 0x9ab0062e),
- TOBN(0xf1a363ad, 0x1e4f6a5f), TOBN(0x06e08b84, 0x62519a50),
- TOBN(0x60915187, 0x7265f1ee), TOBN(0x6a80ca34, 0x93ae985e),
- TOBN(0x81b29768, 0xaaba4864), TOBN(0xb13cabf2, 0x8d52a7d6),
- TOBN(0xb5c36348, 0x8ead03f1), TOBN(0xc932ad95, 0x81c7c1c0),
- TOBN(0x5452708e, 0xcae1e27b), TOBN(0x9dac4269, 0x1b0df648),
- TOBN(0x233e3f0c, 0xdfcdb8bc), TOBN(0xe6ceccdf, 0xec540174),
- TOBN(0xbd0d845e, 0x95081181), TOBN(0xcc8a7920, 0x699355d5),
- TOBN(0x111c0f6d, 0xc3b375a8), TOBN(0xfd95bc6b, 0xfd51e0dc),
- TOBN(0x4a106a26, 0x6888523a), TOBN(0x4d142bd6, 0xcb01a06d),
- TOBN(0x79bfd289, 0xadb9b397), TOBN(0x0bdbfb94, 0xe9863914),
- TOBN(0x29d8a229, 0x1660f6a6), TOBN(0x7f6abcd6, 0x551c042d),
- TOBN(0x13039deb, 0x0ac3ffe8), TOBN(0xa01be628, 0xec8523fb),
- TOBN(0x6ea34103, 0x0ca1c328), TOBN(0xc74114bd, 0xb903928e),
- TOBN(0x8aa4ff4e, 0x9e9144b0), TOBN(0x7064091f, 0x7f9a4b17),
- TOBN(0xa3f4f521, 0xe447f2c4), TOBN(0x81b8da7a, 0x604291f0),
- TOBN(0xd680bc46, 0x7d5926de), TOBN(0x84f21fd5, 0x34a1202f),
- TOBN(0x1d1e3181, 0x4e9df3d8), TOBN(0x1ca4861a, 0x39ab8d34),
- TOBN(0x809ddeec, 0x5b19aa4a), TOBN(0x59f72f7e, 0x4d329366),
- TOBN(0xa2f93f41, 0x386d5087), TOBN(0x40bf739c, 0xdd67d64f),
- TOBN(0xb4494205, 0x66702158), TOBN(0xc33c65be, 0x73b1e178),
- TOBN(0xcdcd657c, 0x38ca6153), TOBN(0x97f4519a, 0xdc791976),
- TOBN(0xcc7c7f29, 0xcd6e1f39), TOBN(0x38de9cfb, 0x7e3c3932),
- TOBN(0xe448eba3, 0x7b793f85), TOBN(0xe9f8dbf9, 0xf067e914),
- TOBN(0xc0390266, 0xf114ae87), TOBN(0x39ed75a7, 0xcd6a8e2a),
- TOBN(0xadb14848, 0x7ffba390), TOBN(0x67f8cb8b, 0x6af9bc09),
- TOBN(0x322c3848, 0x9c7476db), TOBN(0xa320fecf, 0x52a538d6),
- TOBN(0xe0493002, 0xb2aced2b), TOBN(0xdfba1809, 0x616bd430),
- TOBN(0x531c4644, 0xc331be70), TOBN(0xbc04d32e, 0x90d2e450),
- TOBN(0x1805a0d1, 0x0f9f142d), TOBN(0x2c44a0c5, 0x47ee5a23),
- TOBN(0x31875a43, 0x3989b4e3), TOBN(0x6b1949fd, 0x0c063481),
- TOBN(0x2dfb9e08, 0xbe0f4492), TOBN(0x3ff0da03, 0xe9d5e517),
- TOBN(0x03dbe9a1, 0xf79466a8), TOBN(0x0b87bcd0, 0x15ea9932),
- TOBN(0xeb64fc83, 0xab1f58ab), TOBN(0x6d9598da, 0x817edc8a),
- TOBN(0x699cff66, 0x1d3b67e5), TOBN(0x645c0f29, 0x92635853),
- TOBN(0x253cdd82, 0xeabaf21c), TOBN(0x82b9602a, 0x2241659e),
- TOBN(0x2cae07ec, 0x2d9f7091), TOBN(0xbe4c720c, 0x8b48cd9b),
- TOBN(0x6ce5bc03, 0x6f08d6c9), TOBN(0x36e8a997, 0xaf10bf40),
- TOBN(0x83422d21, 0x3e10ff12), TOBN(0x7b26d3eb, 0xbcc12494),
- TOBN(0xb240d2d0, 0xc9469ad6), TOBN(0xc4a11b4d, 0x30afa05b),
- TOBN(0x4b604ace, 0xdd6ba286), TOBN(0x18486600, 0x3ee2864c),
- TOBN(0x5869d6ba, 0x8d9ce5be), TOBN(0x0d8f68c5, 0xff4bfb0d),
- TOBN(0xb69f210b, 0x5700cf73), TOBN(0x61f6653a, 0x6d37c135),
- TOBN(0xff3d432b, 0x5aff5a48), TOBN(0x0d81c4b9, 0x72ba3a69),
- TOBN(0xee879ae9, 0xfa1899ef), TOBN(0xbac7e2a0, 0x2d6acafd),
- TOBN(0xd6d93f6c, 0x1c664399), TOBN(0x4c288de1, 0x5bcb135d),
- TOBN(0x83031dab, 0x9dab7cbf), TOBN(0xfe23feb0, 0x3abbf5f0),
- TOBN(0x9f1b2466, 0xcdedca85), TOBN(0x140bb710, 0x1a09538c),
- TOBN(0xac8ae851, 0x5e11115d), TOBN(0x0d63ff67, 0x6f03f59e),
- TOBN(0x755e5551, 0x7d234afb), TOBN(0x61c2db4e, 0x7e208fc1),
- TOBN(0xaa9859ce, 0xf28a4b5d), TOBN(0xbdd6d4fc, 0x34af030f),
- TOBN(0xd1c4a26d, 0x3be01cb1), TOBN(0x9ba14ffc, 0x243aa07c),
- TOBN(0xf95cd3a9, 0xb2503502), TOBN(0xe379bc06, 0x7d2a93ab),
- TOBN(0x3efc18e9, 0xd4ca8d68), TOBN(0x083558ec, 0x80bb412a),
- TOBN(0xd903b940, 0x9645a968), TOBN(0xa499f0b6, 0x9ba6054f),
- TOBN(0x208b573c, 0xb8349abe), TOBN(0x3baab3e5, 0x30b4fc1c),
- TOBN(0x87e978ba, 0xcb524990), TOBN(0x3524194e, 0xccdf0e80),
- TOBN(0x62711725, 0x7d4bcc42), TOBN(0xe90a3d9b, 0xb90109ba),
- TOBN(0x3b1bdd57, 0x1323e1e0), TOBN(0xb78e9bd5, 0x5eae1599),
- TOBN(0x0794b746, 0x9e03d278), TOBN(0x80178605, 0xd70e6297),
- TOBN(0x171792f8, 0x99c97855), TOBN(0x11b393ee, 0xf5a86b5c),
- TOBN(0x48ef6582, 0xd8884f27), TOBN(0xbd44737a, 0xbf19ba5f),
- TOBN(0x8698de4c, 0xa42062c6), TOBN(0x8975eb80, 0x61ce9c54),
- TOBN(0xd50e57c7, 0xd7fe71f3), TOBN(0x15342190, 0xbc97ce38),
- TOBN(0x51bda2de, 0x4df07b63), TOBN(0xba12aeae, 0x200eb87d),
- TOBN(0xabe135d2, 0xa9b4f8f6), TOBN(0x04619d65, 0xfad6d99c),
- TOBN(0x4a6683a7, 0x7994937c), TOBN(0x7a778c8b, 0x6f94f09a),
- TOBN(0x8c508623, 0x20a71b89), TOBN(0x241a2aed, 0x1c229165),
- TOBN(0x352be595, 0xaaf83a99), TOBN(0x9fbfee7f, 0x1562bac8),
- TOBN(0xeaf658b9, 0x5c4017e3), TOBN(0x1dc7f9e0, 0x15120b86),
- TOBN(0xd84f13dd, 0x4c034d6f), TOBN(0x283dd737, 0xeaea3038),
- TOBN(0x197f2609, 0xcd85d6a2), TOBN(0x6ebbc345, 0xfae60177),
- TOBN(0xb80f031b, 0x4e12fede), TOBN(0xde55d0c2, 0x07a2186b),
- TOBN(0x1fb3e37f, 0x24dcdd5a), TOBN(0x8d602da5, 0x7ed191fb),
- TOBN(0x108fb056, 0x76023e0d), TOBN(0x70178c71, 0x459c20c0),
- TOBN(0xfad5a386, 0x3fe54cf0), TOBN(0xa4a3ec4f, 0x02bbb475),
- TOBN(0x1aa5ec20, 0x919d94d7), TOBN(0x5d3b63b5, 0xa81e4ab3),
- TOBN(0x7fa733d8, 0x5ad3d2af), TOBN(0xfbc586dd, 0xd1ac7a37),
- TOBN(0x282925de, 0x40779614), TOBN(0xfe0ffffb, 0xe74a242a),
- TOBN(0x3f39e67f, 0x906151e5), TOBN(0xcea27f5f, 0x55e10649),
- TOBN(0xdca1d4e1, 0xc17cf7b7), TOBN(0x0c326d12, 0x2fe2362d),
- TOBN(0x05f7ac33, 0x7dd35df3), TOBN(0x0c3b7639, 0xc396dbdf),
- TOBN(0x0912f5ac, 0x03b7db1c), TOBN(0x9dea4b70, 0x5c9ed4a9),
- TOBN(0x475e6e53, 0xaae3f639), TOBN(0xfaba0e7c, 0xfc278bac),
- TOBN(0x16f9e221, 0x9490375f), TOBN(0xaebf9746, 0xa5a7ed0a),
- TOBN(0x45f9af3f, 0xf41ad5d6), TOBN(0x03c4623c, 0xb2e99224),
- TOBN(0x82c5bb5c, 0xb3cf56aa), TOBN(0x64311819, 0x34567ed3),
- TOBN(0xec57f211, 0x8be489ac), TOBN(0x2821895d, 0xb9a1104b),
- TOBN(0x610dc875, 0x6064e007), TOBN(0x8e526f3f, 0x5b20d0fe),
- TOBN(0x6e71ca77, 0x5b645aee), TOBN(0x3d1dcb9f, 0x800e10ff),
- TOBN(0x36b51162, 0x189cf6de), TOBN(0x2c5a3e30, 0x6bb17353),
- TOBN(0xc186cd3e, 0x2a6c6fbf), TOBN(0xa74516fa, 0x4bf97906),
- TOBN(0x5b4b8f4b, 0x279d6901), TOBN(0x0c4e57b4, 0x2b573743),
- TOBN(0x75fdb229, 0xb6e386b6), TOBN(0xb46793fd, 0x99deac27),
- TOBN(0xeeec47ea, 0xcf712629), TOBN(0xe965f3c4, 0xcbc3b2dd),
- TOBN(0x8dd1fb83, 0x425c6559), TOBN(0x7fc00ee6, 0x0af06fda),
- TOBN(0xe98c9225, 0x33d956df), TOBN(0x0f1ef335, 0x4fbdc8a2),
- TOBN(0x2abb5145, 0xb79b8ea2), TOBN(0x40fd2945, 0xbdbff288),
- TOBN(0x6a814ac4, 0xd7185db7), TOBN(0xc4329d6f, 0xc084609a),
- TOBN(0xc9ba7b52, 0xed1be45d), TOBN(0x891dd20d, 0xe4cd2c74),
- TOBN(0x5a4d4a7f, 0x824139b1), TOBN(0x66c17716, 0xb873c710),
- TOBN(0x5e5bc141, 0x2843c4e0), TOBN(0xd5ac4817, 0xb97eb5bf),
- TOBN(0xc0f8af54, 0x450c95c7), TOBN(0xc91b3fa0, 0x318406c5),
- TOBN(0x360c340a, 0xab9d97f8), TOBN(0xfb57bd07, 0x90a2d611),
- TOBN(0x4339ae3c, 0xa6a6f7e5), TOBN(0x9c1fcd2a, 0x2feb8a10),
- TOBN(0x972bcca9, 0xc7ea7432), TOBN(0x1b0b924c, 0x308076f6),
- TOBN(0x80b2814a, 0x2a5b4ca5), TOBN(0x2f78f55b, 0x61ef3b29),
- TOBN(0xf838744a, 0xc18a414f), TOBN(0xc611eaae, 0x903d0a86),
- TOBN(0x94dabc16, 0x2a453f55), TOBN(0xe6f2e3da, 0x14efb279),
- TOBN(0x5b7a6017, 0x9320dc3c), TOBN(0x692e382f, 0x8df6b5a4),
- TOBN(0x3f5e15e0, 0x2d40fa90), TOBN(0xc87883ae, 0x643dd318),
- TOBN(0x511053e4, 0x53544774), TOBN(0x834d0ecc, 0x3adba2bc),
- TOBN(0x4215d7f7, 0xbae371f5), TOBN(0xfcfd57bf, 0x6c8663bc),
- TOBN(0xded2383d, 0xd6901b1d), TOBN(0x3b49fbb4, 0xb5587dc3),
- TOBN(0xfd44a08d, 0x07625f62), TOBN(0x3ee4d65b, 0x9de9b762),}
- ,
- {TOBN(0x64e5137d, 0x0d63d1fa), TOBN(0x658fc052, 0x02a9d89f),
- TOBN(0x48894874, 0x50436309), TOBN(0xe9ae30f8, 0xd598da61),
- TOBN(0x2ed710d1, 0x818baf91), TOBN(0xe27e9e06, 0x8b6a0c20),
- TOBN(0x1e28dcfb, 0x1c1a6b44), TOBN(0x883acb64, 0xd6ac57dc),
- TOBN(0x8735728d, 0xc2c6ff70), TOBN(0x79d6122f, 0xc5dc2235),
- TOBN(0x23f5d003, 0x19e277f9), TOBN(0x7ee84e25, 0xdded8cc7),
- TOBN(0x91a8afb0, 0x63cd880a), TOBN(0x3f3ea7c6, 0x3574af60),
- TOBN(0x0cfcdc84, 0x02de7f42), TOBN(0x62d0792f, 0xb31aa152),
- TOBN(0x8e1b4e43, 0x8a5807ce), TOBN(0xad283893, 0xe4109a7e),
- TOBN(0xc30cc9cb, 0xafd59dda), TOBN(0xf65f36c6, 0x3d8d8093),
- TOBN(0xdf31469e, 0xa60d32b2), TOBN(0xee93df4b, 0x3e8191c8),
- TOBN(0x9c1017c5, 0x355bdeb5), TOBN(0xd2623185, 0x8616aa28),
- TOBN(0xb02c83f9, 0xdec31a21), TOBN(0x988c8b23, 0x6ad9d573),
- TOBN(0x53e983ae, 0xa57be365), TOBN(0xe968734d, 0x646f834e),
- TOBN(0x9137ea8f, 0x5da6309b), TOBN(0x10f3a624, 0xc1f1ce16),
- TOBN(0x782a9ea2, 0xca440921), TOBN(0xdf94739e, 0x5b46f1b5),
- TOBN(0x9f9be006, 0xcce85c9b), TOBN(0x360e70d6, 0xa4c7c2d3),
- TOBN(0x2cd5beea, 0xaefa1e60), TOBN(0x64cf63c0, 0x8c3d2b6d),
- TOBN(0xfb107fa3, 0xe1cf6f90), TOBN(0xb7e937c6, 0xd5e044e6),
- TOBN(0x74e8ca78, 0xce34db9f), TOBN(0x4f8b36c1, 0x3e210bd0),
- TOBN(0x1df165a4, 0x34a35ea8), TOBN(0x3418e0f7, 0x4d4412f6),
- TOBN(0x5af1f8af, 0x518836c3), TOBN(0x42ceef4d, 0x130e1965),
- TOBN(0x5560ca0b, 0x543a1957), TOBN(0xc33761e5, 0x886cb123),
- TOBN(0x66624b1f, 0xfe98ed30), TOBN(0xf772f4bf, 0x1090997d),
- TOBN(0xf4e540bb, 0x4885d410), TOBN(0x7287f810, 0x9ba5f8d7),
- TOBN(0x22d0d865, 0xde98dfb1), TOBN(0x49ff51a1, 0xbcfbb8a3),
- TOBN(0xb6b6fa53, 0x6bc3012e), TOBN(0x3d31fd72, 0x170d541d),
- TOBN(0x8018724f, 0x4b0f4966), TOBN(0x79e7399f, 0x87dbde07),
- TOBN(0x56f8410e, 0xf4f8b16a), TOBN(0x97241afe, 0xc47b266a),
- TOBN(0x0a406b8e, 0x6d9c87c1), TOBN(0x803f3e02, 0xcd42ab1b),
- TOBN(0x7f0309a8, 0x04dbec69), TOBN(0xa83b85f7, 0x3bbad05f),
- TOBN(0xc6097273, 0xad8e197f), TOBN(0xc097440e, 0x5067adc1),
- TOBN(0x730eafb6, 0x3524ff16), TOBN(0xd7f9b51e, 0x823fc6ce),
- TOBN(0x27bd0d32, 0x443e4ac0), TOBN(0x40c59ad9, 0x4d66f217),
- TOBN(0x6c33136f, 0x17c387a4), TOBN(0x5043b8d5, 0xeb86804d),
- TOBN(0x74970312, 0x675a73c9), TOBN(0x838fdb31, 0xf16669b6),
- TOBN(0xc507b6dd, 0x418e7ddd), TOBN(0x39888d93, 0x472f19d6),
- TOBN(0x7eae26be, 0x0c27eb4d), TOBN(0x17b53ed3, 0xfbabb884),
- TOBN(0xfc27021b, 0x2b01ae4f), TOBN(0x88462e87, 0xcf488682),
- TOBN(0xbee096ec, 0x215e2d87), TOBN(0xeb2fea9a, 0xd242e29b),
- TOBN(0x5d985b5f, 0xb821fc28), TOBN(0x89d2e197, 0xdc1e2ad2),
- TOBN(0x55b566b8, 0x9030ba62), TOBN(0xe3fd41b5, 0x4f41b1c6),
- TOBN(0xb738ac2e, 0xb9a96d61), TOBN(0x7f8567ca, 0x369443f4),
- TOBN(0x8698622d, 0xf803a440), TOBN(0x2b586236, 0x8fe2f4dc),
- TOBN(0xbbcc00c7, 0x56b95bce), TOBN(0x5ec03906, 0x616da680),
- TOBN(0x79162ee6, 0x72214252), TOBN(0x43132b63, 0x86a892d2),
- TOBN(0x4bdd3ff2, 0x2f3263bf), TOBN(0xd5b3733c, 0x9cd0a142),
- TOBN(0x592eaa82, 0x44415ccb), TOBN(0x663e8924, 0x8d5474ea),
- TOBN(0x8058a25e, 0x5236344e), TOBN(0x82e8df9d, 0xbda76ee6),
- TOBN(0xdcf6efd8, 0x11cc3d22), TOBN(0x00089cda, 0x3b4ab529),
- TOBN(0x91d3a071, 0xbd38a3db), TOBN(0x4ea97fc0, 0xef72b925),
- TOBN(0x0c9fc15b, 0xea3edf75), TOBN(0x5a6297cd, 0xa4348ed3),
- TOBN(0x0d38ab35, 0xce7c42d4), TOBN(0x9fd493ef, 0x82feab10),
- TOBN(0x46056b6d, 0x82111b45), TOBN(0xda11dae1, 0x73efc5c3),
- TOBN(0xdc740278, 0x5545a7fb), TOBN(0xbdb2601c, 0x40d507e6),
- TOBN(0x121dfeeb, 0x7066fa58), TOBN(0x214369a8, 0x39ae8c2a),
- TOBN(0x195709cb, 0x06e0956c), TOBN(0x4c9d254f, 0x010cd34b),
- TOBN(0xf51e13f7, 0x0471a532), TOBN(0xe19d6791, 0x1e73054d),
- TOBN(0xf702a628, 0xdb5c7be3), TOBN(0xc7141218, 0xb24dde05),
- TOBN(0xdc18233c, 0xf29b2e2e), TOBN(0x3a6bd1e8, 0x85342dba),
- TOBN(0x3f747fa0, 0xb311898c), TOBN(0xe2a272e4, 0xcd0eac65),
- TOBN(0x4bba5851, 0xf914d0bc), TOBN(0x7a1a9660, 0xc4a43ee3),
- TOBN(0xe5a367ce, 0xa1c8cde9), TOBN(0x9d958ba9, 0x7271abe3),
- TOBN(0xf3ff7eb6, 0x3d1615cd), TOBN(0xa2280dce, 0xf5ae20b0),
- TOBN(0x56dba5c1, 0xcf640147), TOBN(0xea5a2e3d, 0x5e83d118),
- TOBN(0x04cd6b6d, 0xda24c511), TOBN(0x1c0f4671, 0xe854d214),
- TOBN(0x91a6b7a9, 0x69565381), TOBN(0xdc966240, 0xdecf1f5b),
- TOBN(0x1b22d21c, 0xfcf5d009), TOBN(0x2a05f641, 0x9021dbd5),
- TOBN(0x8c0ed566, 0xd4312483), TOBN(0x5179a95d, 0x643e216f),
- TOBN(0xcc185fec, 0x17044493), TOBN(0xb3063339, 0x54991a21),
- TOBN(0xd801ecdb, 0x0081a726), TOBN(0x0149b0c6, 0x4fa89bbb),
- TOBN(0xafe9065a, 0x4391b6b9), TOBN(0xedc92786, 0xd633f3a3),
- TOBN(0xe408c24a, 0xae6a8e13), TOBN(0x85833fde, 0x9f3897ab),
- TOBN(0x43800e7e, 0xd81a0715), TOBN(0xde08e346, 0xb44ffc5f),
- TOBN(0x7094184c, 0xcdeff2e0), TOBN(0x49f9387b, 0x165eaed1),
- TOBN(0x635d6129, 0x777c468a), TOBN(0x8c0dcfd1, 0x538c2dd8),
- TOBN(0xd6d9d9e3, 0x7a6a308b), TOBN(0x62375830, 0x4c2767d3),
- TOBN(0x874a8bc6, 0xf38cbeb6), TOBN(0xd94d3f1a, 0xccb6fd9e),
- TOBN(0x92a9735b, 0xba21f248), TOBN(0x272ad0e5, 0x6cd1efb0),
- TOBN(0x7437b69c, 0x05b03284), TOBN(0xe7f04702, 0x6948c225),
- TOBN(0x8a56c04a, 0xcba2ecec), TOBN(0x0c181270, 0xe3a73e41),
- TOBN(0x6cb34e9d, 0x03e93725), TOBN(0xf77c8713, 0x496521a9),
- TOBN(0x94569183, 0xfa7f9f90), TOBN(0xf2e7aa4c, 0x8c9707ad),
- TOBN(0xced2c9ba, 0x26c1c9a3), TOBN(0x9109fe96, 0x40197507),
- TOBN(0x9ae868a9, 0xe9adfe1c), TOBN(0x3984403d, 0x314e39bb),
- TOBN(0xb5875720, 0xf2fe378f), TOBN(0x33f901e0, 0xba44a628),
- TOBN(0xea1125fe, 0x3652438c), TOBN(0xae9ec4e6, 0x9dd1f20b),
- TOBN(0x1e740d9e, 0xbebf7fbd), TOBN(0x6dbd3ddc, 0x42dbe79c),
- TOBN(0x62082aec, 0xedd36776), TOBN(0xf612c478, 0xe9859039),
- TOBN(0xa493b201, 0x032f7065), TOBN(0xebd4d8f2, 0x4ff9b211),
- TOBN(0x3f23a0aa, 0xaac4cb32), TOBN(0xea3aadb7, 0x15ed4005),
- TOBN(0xacf17ea4, 0xafa27e63), TOBN(0x56125c1a, 0xc11fd66c),
- TOBN(0x266344a4, 0x3794f8dc), TOBN(0xdcca923a, 0x483c5c36),
- TOBN(0x2d6b6bbf, 0x3f9d10a0), TOBN(0xb320c5ca, 0x81d9bdf3),
- TOBN(0x620e28ff, 0x47b50a95), TOBN(0x933e3b01, 0xcef03371),
- TOBN(0xf081bf85, 0x99100153), TOBN(0x183be9a0, 0xc3a8c8d6),
- TOBN(0x4e3ddc5a, 0xd6bbe24d), TOBN(0xc6c74630, 0x53843795),
- TOBN(0x78193dd7, 0x65ec2d4c), TOBN(0xb8df26cc, 0xcd3c89b2),
- TOBN(0x98dbe399, 0x5a483f8d), TOBN(0x72d8a957, 0x7dd3313a),
- TOBN(0x65087294, 0xab0bd375), TOBN(0xfcd89248, 0x7c259d16),
- TOBN(0x8a9443d7, 0x7613aa81), TOBN(0x80100800, 0x85fe6584),
- TOBN(0x70fc4dbc, 0x7fb10288), TOBN(0xf58280d3, 0xe86beee8),
- TOBN(0x14fdd82f, 0x7c978c38), TOBN(0xdf1204c1, 0x0de44d7b),
- TOBN(0xa08a1c84, 0x4160252f), TOBN(0x591554ca, 0xc17646a5),
- TOBN(0x214a37d6, 0xa05bd525), TOBN(0x48d5f09b, 0x07957b3c),
- TOBN(0x0247cdcb, 0xd7109bc9), TOBN(0x40f9e4bb, 0x30599ce7),
- TOBN(0xc325fa03, 0xf46ad2ec), TOBN(0x00f766cf, 0xc3e3f9ee),
- TOBN(0xab556668, 0xd43a4577), TOBN(0x68d30a61, 0x3ee03b93),
- TOBN(0x7ddc81ea, 0x77b46a08), TOBN(0xcf5a6477, 0xc7480699),
- TOBN(0x43a8cb34, 0x6633f683), TOBN(0x1b867e6b, 0x92363c60),
- TOBN(0x43921114, 0x1f60558e), TOBN(0xcdbcdd63, 0x2f41450e),
- TOBN(0x7fc04601, 0xcc630e8b), TOBN(0xea7c66d5, 0x97038b43),
- TOBN(0x7259b8a5, 0x04e99fd8), TOBN(0x98a8dd12, 0x4785549a),
- TOBN(0x0e459a7c, 0x840552e1), TOBN(0xcdfcf4d0, 0x4bb0909e),
- TOBN(0x34a86db2, 0x53758da7), TOBN(0xe643bb83, 0xeac997e1),
- TOBN(0x96400bd7, 0x530c5b7e), TOBN(0x9f97af87, 0xb41c8b52),
- TOBN(0x34fc8820, 0xfbeee3f9), TOBN(0x93e53490, 0x49091afd),
- TOBN(0x764b9be5, 0x9a31f35c), TOBN(0x71f37864, 0x57e3d924),
- TOBN(0x02fb34e0, 0x943aa75e), TOBN(0xa18c9c58, 0xab8ff6e4),
- TOBN(0x080f31b1, 0x33cf0d19), TOBN(0x5c9682db, 0x083518a7),
- TOBN(0x873d4ca6, 0xb709c3de), TOBN(0x64a84262, 0x3575b8f0),
- TOBN(0x6275da1f, 0x020154bb), TOBN(0x97678caa, 0xd17cf1ab),
- TOBN(0x8779795f, 0x951a95c3), TOBN(0xdd35b163, 0x50fccc08),
- TOBN(0x32709627, 0x33d8f031), TOBN(0x3c5ab10a, 0x498dd85c),
- TOBN(0xb6c185c3, 0x41dca566), TOBN(0x7de7feda, 0xd8622aa3),
- TOBN(0x99e84d92, 0x901b6dfb), TOBN(0x30a02b0e, 0x7c4ad288),
- TOBN(0xc7c81daa, 0x2fd3cf36), TOBN(0xd1319547, 0xdf89e59f),
- TOBN(0xb2be8184, 0xcd496733), TOBN(0xd5f449eb, 0x93d3412b),
- TOBN(0x7ea41b1b, 0x25fe531d), TOBN(0xf9797432, 0x6a1d5646),
- TOBN(0x86067f72, 0x2bde501a), TOBN(0xf91481c0, 0x0c85e89c),
- TOBN(0xca8ee465, 0xf8b05bc6), TOBN(0x1844e1cf, 0x02e83cda),
- TOBN(0xca82114a, 0xb4dbe33b), TOBN(0x0f9f8769, 0x4eabfde2),
- TOBN(0x4936b1c0, 0x38b27fe2), TOBN(0x63b6359b, 0xaba402df),
- TOBN(0x40c0ea2f, 0x656bdbab), TOBN(0x9c992a89, 0x6580c39c),
- TOBN(0x600e8f15, 0x2a60aed1), TOBN(0xeb089ca4, 0xe0bf49df),
- TOBN(0x9c233d7d, 0x2d42d99a), TOBN(0x648d3f95, 0x4c6bc2fa),
- TOBN(0xdcc383a8, 0xe1add3f3), TOBN(0xf42c0c6a, 0x4f64a348),
- TOBN(0x2abd176f, 0x0030dbdb), TOBN(0x4de501a3, 0x7d6c215e),
- TOBN(0x4a107c1f, 0x4b9a64bc), TOBN(0xa77f0ad3, 0x2496cd59),
- TOBN(0xfb78ac62, 0x7688dffb), TOBN(0x7025a2ca, 0x67937d8e),
- TOBN(0xfde8b2d1, 0xd1a8f4e7), TOBN(0xf5b3da47, 0x7354927c),
- TOBN(0xe48606a3, 0xd9205735), TOBN(0xac477cc6, 0xe177b917),
- TOBN(0xfb1f73d2, 0xa883239a), TOBN(0xe12572f6, 0xcc8b8357),
- TOBN(0x9d355e9c, 0xfb1f4f86), TOBN(0x89b795f8, 0xd9f3ec6e),
- TOBN(0x27be56f1, 0xb54398dc), TOBN(0x1890efd7, 0x3fedeed5),
- TOBN(0x62f77f1f, 0x9c6d0140), TOBN(0x7ef0e314, 0x596f0ee4),
- TOBN(0x50ca6631, 0xcc61dab3), TOBN(0x4a39801d, 0xf4866e4f),
- TOBN(0x66c8d032, 0xae363b39), TOBN(0x22c591e5, 0x2ead66aa),
- TOBN(0x954ba308, 0xde02a53e), TOBN(0x2a6c060f, 0xd389f357),
- TOBN(0xe6cfcde8, 0xfbf40b66), TOBN(0x8e02fc56, 0xc6340ce1),
- TOBN(0xe4957795, 0x73adb4ba), TOBN(0x7b86122c, 0xa7b03805),
- TOBN(0x63f83512, 0x0c8e6fa6), TOBN(0x83660ea0, 0x057d7804),
- TOBN(0xbad79105, 0x21ba473c), TOBN(0xb6c50bee, 0xded5389d),
- TOBN(0xee2caf4d, 0xaa7c9bc0), TOBN(0xd97b8de4, 0x8c4e98a7),
- TOBN(0xa9f63e70, 0xab3bbddb), TOBN(0x3898aabf, 0x2597815a),
- TOBN(0x7659af89, 0xac15b3d9), TOBN(0xedf7725b, 0x703ce784),
- TOBN(0x25470fab, 0xe085116b), TOBN(0x04a43375, 0x87285310),
- TOBN(0x4e39187e, 0xe2bfd52f), TOBN(0x36166b44, 0x7d9ebc74),
- TOBN(0x92ad433c, 0xfd4b322c), TOBN(0x726aa817, 0xba79ab51),
- TOBN(0xf96eacd8, 0xc1db15eb), TOBN(0xfaf71e91, 0x0476be63),
- TOBN(0xdd69a640, 0x641fad98), TOBN(0xb7995918, 0x29622559),
- TOBN(0x03c6daa5, 0xde4199dc), TOBN(0x92cadc97, 0xad545eb4),
- TOBN(0x1028238b, 0x256534e4), TOBN(0x73e80ce6, 0x8595409a),
- TOBN(0x690d4c66, 0xd05dc59b), TOBN(0xc95f7b8f, 0x981dee80),
- TOBN(0xf4337014, 0xd856ac25), TOBN(0x441bd9dd, 0xac524dca),
- TOBN(0x640b3d85, 0x5f0499f5), TOBN(0x39cf84a9, 0xd5fda182),
- TOBN(0x04e7b055, 0xb2aa95a0), TOBN(0x29e33f0a, 0x0ddf1860),
- TOBN(0x082e74b5, 0x423f6b43), TOBN(0x217edeb9, 0x0aaa2b0f),
- TOBN(0x58b83f35, 0x83cbea55), TOBN(0xc485ee4d, 0xbc185d70),
- TOBN(0x833ff03b, 0x1e5f6992), TOBN(0xb5b9b9cc, 0xcf0c0dd5),
- TOBN(0x7caaee8e, 0x4e9e8a50), TOBN(0x462e907b, 0x6269dafd),
- TOBN(0x6ed5cee9, 0xfbe791c6), TOBN(0x68ca3259, 0xed430790),
- TOBN(0x2b72bdf2, 0x13b5ba88), TOBN(0x60294c8a, 0x35ef0ac4),
- TOBN(0x9c3230ed, 0x19b99b08), TOBN(0x560fff17, 0x6c2589aa),
- TOBN(0x552b8487, 0xd6770374), TOBN(0xa373202d, 0x9a56f685),
- TOBN(0xd3e7f907, 0x45f175d9), TOBN(0x3c2f315f, 0xd080d810),
- TOBN(0x1130e9dd, 0x7b9520e8), TOBN(0xc078f9e2, 0x0af037b5),
- TOBN(0x38cd2ec7, 0x1e9c104c), TOBN(0x0f684368, 0xc472fe92),
- TOBN(0xd3f1b5ed, 0x6247e7ef), TOBN(0xb32d33a9, 0x396dfe21),
- TOBN(0x46f59cf4, 0x4a9aa2c2), TOBN(0x69cd5168, 0xff0f7e41),
- TOBN(0x3f59da0f, 0x4b3234da), TOBN(0xcf0b0235, 0xb4579ebe),
- TOBN(0x6d1cbb25, 0x6d2476c7), TOBN(0x4f0837e6, 0x9dc30f08),
- TOBN(0x9a4075bb, 0x906f6e98), TOBN(0x253bb434, 0xc761e7d1),
- TOBN(0xde2e645f, 0x6e73af10), TOBN(0xb89a4060, 0x0c5f131c),
- TOBN(0xd12840c5, 0xb8cc037f), TOBN(0x3d093a5b, 0x7405bb47),
- TOBN(0x6202c253, 0x206348b8), TOBN(0xbf5d57fc, 0xc55a3ca7),
- TOBN(0x89f6c90c, 0x8c3bef48), TOBN(0x23ac7623, 0x5a0a960a),
- TOBN(0xdfbd3d6b, 0x552b42ab), TOBN(0x3ef22458, 0x132061f6),
- TOBN(0xd74e9bda, 0xc97e6516), TOBN(0x88779360, 0xc230f49e),
- TOBN(0xa6ec1de3, 0x1e74ea49), TOBN(0x581dcee5, 0x3fb645a2),
- TOBN(0xbaef2391, 0x8f483f14), TOBN(0x6d2dddfc, 0xd137d13b),
- TOBN(0x54cde50e, 0xd2743a42), TOBN(0x89a34fc5, 0xe4d97e67),
- TOBN(0x13f1f5b3, 0x12e08ce5), TOBN(0xa80540b8, 0xa7f0b2ca),
- TOBN(0x854bcf77, 0x01982805), TOBN(0xb8653ffd, 0x233bea04),
- TOBN(0x8e7b8787, 0x02b0b4c9), TOBN(0x2675261f, 0x9acb170a),
- TOBN(0x061a9d90, 0x930c14e5), TOBN(0xb59b30e0, 0xdef0abea),
- TOBN(0x1dc19ea6, 0x0200ec7d), TOBN(0xb6f4a3f9, 0x0bce132b),
- TOBN(0xb8d5de90, 0xf13e27e0), TOBN(0xbaee5ef0, 0x1fade16f),
- TOBN(0x6f406aaa, 0xe4c6cf38), TOBN(0xab4cfe06, 0xd1369815),
- TOBN(0x0dcffe87, 0xefd550c6), TOBN(0x9d4f59c7, 0x75ff7d39),
- TOBN(0xb02553b1, 0x51deb6ad), TOBN(0x812399a4, 0xb1877749),
- TOBN(0xce90f71f, 0xca6006e1), TOBN(0xc32363a6, 0xb02b6e77),
- TOBN(0x02284fbe, 0xdc36c64d), TOBN(0x86c81e31, 0xa7e1ae61),
- TOBN(0x2576c7e5, 0xb909d94a), TOBN(0x8b6f7d02, 0x818b2bb0),
- TOBN(0xeca3ed07, 0x56faa38a), TOBN(0xa3790e6c, 0x9305bb54),
- TOBN(0xd784eeda, 0x7bc73061), TOBN(0xbd56d369, 0x6dd50614),
- TOBN(0xd6575949, 0x229a8aa9), TOBN(0xdcca8f47, 0x4595ec28),
- TOBN(0x814305c1, 0x06ab4fe6), TOBN(0xc8c39768, 0x24f43f16),
- TOBN(0xe2a45f36, 0x523f2b36), TOBN(0x995c6493, 0x920d93bb),
- TOBN(0xf8afdab7, 0x90f1632b), TOBN(0x79ebbecd, 0x1c295954),
- TOBN(0xc7bb3ddb, 0x79592f48), TOBN(0x67216a7b, 0x5f88e998),
- TOBN(0xd91f098b, 0xbc01193e), TOBN(0xf7d928a5, 0xb1db83fc),
- TOBN(0x55e38417, 0xe991f600), TOBN(0x2a91113e, 0x2981a934),
- TOBN(0xcbc9d648, 0x06b13bde), TOBN(0xb011b6ac, 0x0755ff44),
- TOBN(0x6f4cb518, 0x045ec613), TOBN(0x522d2d31, 0xc2f5930a),
- TOBN(0x5acae1af, 0x382e65de), TOBN(0x57643067, 0x27bc966f),
- TOBN(0x5e12705d, 0x1c7193f0), TOBN(0xf0f32f47, 0x3be8858e),
- TOBN(0x785c3d7d, 0x96c6dfc7), TOBN(0xd75b4a20, 0xbf31795d),
- TOBN(0x91acf17b, 0x342659d4), TOBN(0xe596ea34, 0x44f0378f),
- TOBN(0x4515708f, 0xce52129d), TOBN(0x17387e1e, 0x79f2f585),
- TOBN(0x72cfd2e9, 0x49dee168), TOBN(0x1ae05223, 0x3e2af239),
- TOBN(0x009e75be, 0x1d94066a), TOBN(0x6cca31c7, 0x38abf413),
- TOBN(0xb50bd61d, 0x9bc49908), TOBN(0x4a9b4a8c, 0xf5e2bc1e),
- TOBN(0xeb6cc5f7, 0x946f83ac), TOBN(0x27da93fc, 0xebffab28),
- TOBN(0xea314c96, 0x4821c8c5), TOBN(0x8de49ded, 0xa83c15f4),
- TOBN(0x7a64cf20, 0x7af33004), TOBN(0x45f1bfeb, 0xc9627e10),
- TOBN(0x878b0626, 0x54b9df60), TOBN(0x5e4fdc3c, 0xa95c0b33),
- TOBN(0xe54a37ca, 0xc2035d8e), TOBN(0x9087cda9, 0x80f20b8c),
- TOBN(0x36f61c23, 0x8319ade4), TOBN(0x766f287a, 0xde8cfdf8),
- TOBN(0x48821948, 0x346f3705), TOBN(0x49a7b853, 0x16e4f4a2),
- TOBN(0xb9b3f8a7, 0x5cedadfd), TOBN(0x8f562815, 0x8db2a815),
- TOBN(0xc0b7d554, 0x01f68f95), TOBN(0x12971e27, 0x688a208e),
- TOBN(0xc9f8b696, 0xd0ff34fc), TOBN(0x20824de2, 0x1222718c),
- TOBN(0x7213cf9f, 0x0c95284d), TOBN(0xe2ad741b, 0xdc158240),
- TOBN(0x0ee3a6df, 0x54043ccf), TOBN(0x16ff479b, 0xd84412b3),
- TOBN(0xf6c74ee0, 0xdfc98af0), TOBN(0xa78a169f, 0x52fcd2fb),
- TOBN(0xd8ae8746, 0x99c930e9), TOBN(0x1d33e858, 0x49e117a5),
- TOBN(0x7581fcb4, 0x6624759f), TOBN(0xde50644f, 0x5bedc01d),
- TOBN(0xbeec5d00, 0xcaf3155e), TOBN(0x672d66ac, 0xbc73e75f),
- TOBN(0x86b9d8c6, 0x270b01db), TOBN(0xd249ef83, 0x50f55b79),
- TOBN(0x6131d6d4, 0x73978fe3), TOBN(0xcc4e4542, 0x754b00a1),
- TOBN(0x4e05df05, 0x57dfcfe9), TOBN(0x94b29cdd, 0x51ef6bf0),
- TOBN(0xe4530cff, 0x9bc7edf2), TOBN(0x8ac236fd, 0xd3da65f3),
- TOBN(0x0faf7d5f, 0xc8eb0b48), TOBN(0x4d2de14c, 0x660eb039),
- TOBN(0xc006bba7, 0x60430e54), TOBN(0x10a2d0d6, 0xda3289ab),
- TOBN(0x9c037a5d, 0xd7979c59), TOBN(0x04d1f3d3, 0xa116d944),
- TOBN(0x9ff22473, 0x8a0983cd), TOBN(0x28e25b38, 0xc883cabb),
- TOBN(0xe968dba5, 0x47a58995), TOBN(0x2c80b505, 0x774eebdf),
- TOBN(0xee763b71, 0x4a953beb), TOBN(0x502e223f, 0x1642e7f6),
- TOBN(0x6fe4b641, 0x61d5e722), TOBN(0x9d37c5b0, 0xdbef5316),
- TOBN(0x0115ed70, 0xf8330bc7), TOBN(0x139850e6, 0x75a72789),
- TOBN(0x27d7faec, 0xffceccc2), TOBN(0x3016a860, 0x4fd9f7f6),
- TOBN(0xc492ec64, 0x4cd8f64c), TOBN(0x58a2d790, 0x279d7b51),
- TOBN(0x0ced1fc5, 0x1fc75256), TOBN(0x3e658aed, 0x8f433017),
- TOBN(0x0b61942e, 0x05da59eb), TOBN(0xba3d60a3, 0x0ddc3722),
- TOBN(0x7c311cd1, 0x742e7f87), TOBN(0x6473ffee, 0xf6b01b6e),}
- ,
- {TOBN(0x8303604f, 0x692ac542), TOBN(0xf079ffe1, 0x227b91d3),
- TOBN(0x19f63e63, 0x15aaf9bd), TOBN(0xf99ee565, 0xf1f344fb),
- TOBN(0x8a1d661f, 0xd6219199), TOBN(0x8c883bc6, 0xd48ce41c),
- TOBN(0x1065118f, 0x3c74d904), TOBN(0x713889ee, 0x0faf8b1b),
- TOBN(0x972b3f8f, 0x81a1b3be), TOBN(0x4f3ce145, 0xce2764a0),
- TOBN(0xe2d0f1cc, 0x28c4f5f7), TOBN(0xdeee0c0d, 0xc7f3985b),
- TOBN(0x7df4adc0, 0xd39e25c3), TOBN(0x40619820, 0xc467a080),
- TOBN(0x440ebc93, 0x61cf5a58), TOBN(0x527729a6, 0x422ad600),
- TOBN(0xca6c0937, 0xb1b76ba6), TOBN(0x1a2eab85, 0x4d2026dc),
- TOBN(0xb1715e15, 0x19d9ae0a), TOBN(0xf1ad9199, 0xbac4a026),
- TOBN(0x35b3dfb8, 0x07ea7b0e), TOBN(0xedf5496f, 0x3ed9eb89),
- TOBN(0x8932e5ff, 0x2d6d08ab), TOBN(0xf314874e, 0x25bd2731),
- TOBN(0xefb26a75, 0x3f73f449), TOBN(0x1d1c94f8, 0x8d44fc79),
- TOBN(0x49f0fbc5, 0x3bc0dc4d), TOBN(0xb747ea0b, 0x3698a0d0),
- TOBN(0x5218c3fe, 0x228d291e), TOBN(0x35b804b5, 0x43c129d6),
- TOBN(0xfac859b8, 0xd1acc516), TOBN(0x6c10697d, 0x95d6e668),
- TOBN(0xc38e438f, 0x0876fd4e), TOBN(0x45f0c307, 0x83d2f383),
- TOBN(0x203cc2ec, 0xb10934cb), TOBN(0x6a8f2439, 0x2c9d46ee),
- TOBN(0xf16b431b, 0x65ccde7b), TOBN(0x41e2cd18, 0x27e76a6f),
- TOBN(0xb9c8cf8f, 0x4e3484d7), TOBN(0x64426efd, 0x8315244a),
- TOBN(0x1c0a8e44, 0xfc94dea3), TOBN(0x34c8cdbf, 0xdad6a0b0),
- TOBN(0x919c3840, 0x04113cef), TOBN(0xfd32fba4, 0x15490ffa),
- TOBN(0x58d190f6, 0x795dcfb7), TOBN(0xfef01b03, 0x83588baf),
- TOBN(0x9e6d1d63, 0xca1fc1c0), TOBN(0x53173f96, 0xf0a41ac9),
- TOBN(0x2b1d402a, 0xba16f73b), TOBN(0x2fb31014, 0x8cf9b9fc),
- TOBN(0x2d51e60e, 0x446ef7bf), TOBN(0xc731021b, 0xb91e1745),
- TOBN(0x9d3b4724, 0x4fee99d4), TOBN(0x4bca48b6, 0xfac5c1ea),
- TOBN(0x70f5f514, 0xbbea9af7), TOBN(0x751f55a5, 0x974c283a),
- TOBN(0x6e30251a, 0xcb452fdb), TOBN(0x31ee6965, 0x50f30650),
- TOBN(0xb0b3e508, 0x933548d9), TOBN(0xb8949a4f, 0xf4b0ef5b),
- TOBN(0x208b8326, 0x3c88f3bd), TOBN(0xab147c30, 0xdb1d9989),
- TOBN(0xed6515fd, 0x44d4df03), TOBN(0x17a12f75, 0xe72eb0c5),
- TOBN(0x3b59796d, 0x36cf69db), TOBN(0x1219eee9, 0x56670c18),
- TOBN(0xfe3341f7, 0x7a070d8e), TOBN(0x9b70130b, 0xa327f90c),
- TOBN(0x36a32462, 0x0ae18e0e), TOBN(0x2021a623, 0x46c0a638),
- TOBN(0x251b5817, 0xc62eb0d4), TOBN(0x87bfbcdf, 0x4c762293),
- TOBN(0xf78ab505, 0xcdd61d64), TOBN(0x8c7a53fc, 0xc8c18857),
- TOBN(0xa653ce6f, 0x16147515), TOBN(0x9c923aa5, 0xea7d52d5),
- TOBN(0xc24709cb, 0x5c18871f), TOBN(0x7d53bec8, 0x73b3cc74),
- TOBN(0x59264aff, 0xfdd1d4c4), TOBN(0x5555917e, 0x240da582),
- TOBN(0xcae8bbda, 0x548f5a0e), TOBN(0x1910eaba, 0x3bbfbbe1),
- TOBN(0xae579685, 0x7677afc3), TOBN(0x49ea61f1, 0x73ff0b5c),
- TOBN(0x78655478, 0x4f7c3922), TOBN(0x95d337cd, 0x20c68eef),
- TOBN(0x68f1e1e5, 0xdf779ab9), TOBN(0x14b491b0, 0xb5cf69a8),
- TOBN(0x7a6cbbe0, 0x28e3fe89), TOBN(0xe7e1fee4, 0xc5aac0eb),
- TOBN(0x7f47eda5, 0x697e5140), TOBN(0x4f450137, 0xb454921f),
- TOBN(0xdb625f84, 0x95cd8185), TOBN(0x74be0ba1, 0xcdb2e583),
- TOBN(0xaee4fd7c, 0xdd5e6de4), TOBN(0x4251437d, 0xe8101739),
- TOBN(0x686d72a0, 0xac620366), TOBN(0x4be3fb9c, 0xb6d59344),
- TOBN(0x6e8b44e7, 0xa1eb75b9), TOBN(0x84e39da3, 0x91a5c10c),
- TOBN(0x37cc1490, 0xb38f0409), TOBN(0x02951943, 0x2c2ade82),
- TOBN(0x9b688783, 0x1190a2d8), TOBN(0x25627d14, 0x231182ba),
- TOBN(0x6eb550aa, 0x658a6d87), TOBN(0x1405aaa7, 0xcf9c7325),
- TOBN(0xd147142e, 0x5c8748c9), TOBN(0x7f637e4f, 0x53ede0e0),
- TOBN(0xf8ca2776, 0x14ffad2c), TOBN(0xe58fb1bd, 0xbafb6791),
- TOBN(0x17158c23, 0xbf8f93fc), TOBN(0x7f15b373, 0x0a4a4655),
- TOBN(0x39d4add2, 0xd842ca72), TOBN(0xa71e4391, 0x3ed96305),
- TOBN(0x5bb09cbe, 0x6700be14), TOBN(0x68d69d54, 0xd8befcf6),
- TOBN(0xa45f5367, 0x37183bcf), TOBN(0x7152b7bb, 0x3370dff7),
- TOBN(0xcf887baa, 0xbf12525b), TOBN(0xe7ac7bdd, 0xd6d1e3cd),
- TOBN(0x25914f78, 0x81fdad90), TOBN(0xcf638f56, 0x0d2cf6ab),
- TOBN(0xb90bc03f, 0xcc054de5), TOBN(0x932811a7, 0x18b06350),
- TOBN(0x2f00b330, 0x9bbd11ff), TOBN(0x76108a6f, 0xb4044974),
- TOBN(0x801bb9e0, 0xa851d266), TOBN(0x0dd099be, 0xbf8990c1),
- TOBN(0x58c5aaaa, 0xabe32986), TOBN(0x0fe9dd2a, 0x50d59c27),
- TOBN(0x84951ff4, 0x8d307305), TOBN(0x6c23f829, 0x86529b78),
- TOBN(0x50bb2218, 0x0b136a79), TOBN(0x7e2174de, 0x77a20996),
- TOBN(0x6f00a4b9, 0xc0bb4da6), TOBN(0x89a25a17, 0xefdde8da),
- TOBN(0xf728a27e, 0xc11ee01d), TOBN(0xf900553a, 0xe5f10dfb),
- TOBN(0x189a83c8, 0x02ec893c), TOBN(0x3ca5bdc1, 0x23f66d77),
- TOBN(0x98781537, 0x97eada9f), TOBN(0x59c50ab3, 0x10256230),
- TOBN(0x346042d9, 0x323c69b3), TOBN(0x1b715a6d, 0x2c460449),
- TOBN(0xa41dd476, 0x6ae06e0b), TOBN(0xcdd7888e, 0x9d42e25f),
- TOBN(0x0f395f74, 0x56b25a20), TOBN(0xeadfe0ae, 0x8700e27e),
- TOBN(0xb09d52a9, 0x69950093), TOBN(0x3525d9cb, 0x327f8d40),
- TOBN(0xb8235a94, 0x67df886a), TOBN(0x77e4b0dd, 0x035faec2),
- TOBN(0x115eb20a, 0x517d7061), TOBN(0x77fe3433, 0x6c2df683),
- TOBN(0x6870ddc7, 0xcdc6fc67), TOBN(0xb1610588, 0x0b87de83),
- TOBN(0x343584ca, 0xd9c4ddbe), TOBN(0xb3164f1c, 0x3d754be2),
- TOBN(0x0731ed3a, 0xc1e6c894), TOBN(0x26327dec, 0x4f6b904c),
- TOBN(0x9d49c6de, 0x97b5cd32), TOBN(0x40835dae, 0xb5eceecd),
- TOBN(0xc66350ed, 0xd9ded7fe), TOBN(0x8aeebb5c, 0x7a678804),
- TOBN(0x51d42fb7, 0x5b8ee9ec), TOBN(0xd7a17bdd, 0x8e3ca118),
- TOBN(0x40d7511a, 0x2ef4400e), TOBN(0xc48990ac, 0x875a66f4),
- TOBN(0x8de07d2a, 0x2199e347), TOBN(0xbee75556, 0x2a39e051),
- TOBN(0x56918786, 0x916e51dc), TOBN(0xeb191313, 0x4a2d89ec),
- TOBN(0x6679610d, 0x37d341ed), TOBN(0x434fbb41, 0x56d51c2b),
- TOBN(0xe54b7ee7, 0xd7492dba), TOBN(0xaa33a79a, 0x59021493),
- TOBN(0x49fc5054, 0xe4bd6d3d), TOBN(0x09540f04, 0x5ab551d0),
- TOBN(0x8acc9085, 0x4942d3a6), TOBN(0x231af02f, 0x2d28323b),
- TOBN(0x93458cac, 0x0992c163), TOBN(0x1fef8e71, 0x888e3bb4),
- TOBN(0x27578da5, 0xbe8c268c), TOBN(0xcc8be792, 0xe805ec00),
- TOBN(0x29267bae, 0xc61c3855), TOBN(0xebff429d, 0x58c1fd3b),
- TOBN(0x22d886c0, 0x8c0b93b8), TOBN(0xca5e00b2, 0x2ddb8953),
- TOBN(0xcf330117, 0xc3fed8b7), TOBN(0xd49ac6fa, 0x819c01f6),
- TOBN(0x6ddaa6bd, 0x3c0fbd54), TOBN(0x91743068, 0x8049a2cf),
- TOBN(0xd67f981e, 0xaff2ef81), TOBN(0xc3654d35, 0x2818ae80),
- TOBN(0x81d05044, 0x1b2aa892), TOBN(0x2db067bf, 0x3d099328),
- TOBN(0xe7c79e86, 0x703dcc97), TOBN(0xe66f9b37, 0xe133e215),
- TOBN(0xcdf119a6, 0xe39a7a5c), TOBN(0x47c60de3, 0x876f1b61),
- TOBN(0x6e405939, 0xd860f1b2), TOBN(0x3e9a1dbc, 0xf5ed4d4a),
- TOBN(0x3f23619e, 0xc9b6bcbd), TOBN(0x5ee790cf, 0x734e4497),
- TOBN(0xf0a834b1, 0x5bdaf9bb), TOBN(0x02cedda7, 0x4ca295f0),
- TOBN(0x4619aa2b, 0xcb8e378c), TOBN(0xe5613244, 0xcc987ea4),
- TOBN(0x0bc022cc, 0x76b23a50), TOBN(0x4a2793ad, 0x0a6c21ce),
- TOBN(0x38328780, 0x89cac3f5), TOBN(0x29176f1b, 0xcba26d56),
- TOBN(0x06296187, 0x4f6f59eb), TOBN(0x86e9bca9, 0x8bdc658e),
- TOBN(0x2ca9c4d3, 0x57e30402), TOBN(0x5438b216, 0x516a09bb),
- TOBN(0x0a6a063c, 0x7672765a), TOBN(0x37a3ce64, 0x0547b9bf),
- TOBN(0x42c099c8, 0x98b1a633), TOBN(0xb5ab800d, 0x05ee6961),
- TOBN(0xf1963f59, 0x11a5acd6), TOBN(0xbaee6157, 0x46201063),
- TOBN(0x36d9a649, 0xa596210a), TOBN(0xaed04363, 0x1ba7138c),
- TOBN(0xcf817d1c, 0xa4a82b76), TOBN(0x5586960e, 0xf3806be9),
- TOBN(0x7ab67c89, 0x09dc6bb5), TOBN(0x52ace7a0, 0x114fe7eb),
- TOBN(0xcd987618, 0xcbbc9b70), TOBN(0x4f06fd5a, 0x604ca5e1),
- TOBN(0x90af14ca, 0x6dbde133), TOBN(0x1afe4322, 0x948a3264),
- TOBN(0xa70d2ca6, 0xc44b2c6c), TOBN(0xab726799, 0x0ef87dfe),
- TOBN(0x310f64dc, 0x2e696377), TOBN(0x49b42e68, 0x4c8126a0),
- TOBN(0x0ea444c3, 0xcea0b176), TOBN(0x53a8ddf7, 0xcb269182),
- TOBN(0xf3e674eb, 0xbbba9dcb), TOBN(0x0d2878a8, 0xd8669d33),
- TOBN(0x04b935d5, 0xd019b6a3), TOBN(0xbb5cf88e, 0x406f1e46),
- TOBN(0xa1912d16, 0x5b57c111), TOBN(0x9803fc21, 0x19ebfd78),
- TOBN(0x4f231c9e, 0xc07764a9), TOBN(0xd93286ee, 0xb75bd055),
- TOBN(0x83a9457d, 0x8ee6c9de), TOBN(0x04695915, 0x6087ec90),
- TOBN(0x14c6dd8a, 0x58d6cd46), TOBN(0x9cb633b5, 0x8e6634d2),
- TOBN(0xc1305047, 0xf81bc328), TOBN(0x12ede0e2, 0x26a177e5),
- TOBN(0x332cca62, 0x065a6f4f), TOBN(0xc3a47ecd, 0x67be487b),
- TOBN(0x741eb187, 0x0f47ed1c), TOBN(0x99e66e58, 0xe7598b14),
- TOBN(0x6f0544ca, 0x63d0ff12), TOBN(0xe5efc784, 0xb610a05f),
- TOBN(0xf72917b1, 0x7cad7b47), TOBN(0x3ff6ea20, 0xf2cac0c0),
- TOBN(0xcc23791b, 0xf21db8b7), TOBN(0x7dac70b1, 0xd7d93565),
- TOBN(0x682cda1d, 0x694bdaad), TOBN(0xeb88bb8c, 0x1023516d),
- TOBN(0xc4c634b4, 0xdfdbeb1b), TOBN(0x22f5ca72, 0xb4ee4dea),
- TOBN(0x1045a368, 0xe6524821), TOBN(0xed9e8a3f, 0x052b18b2),
- TOBN(0x9b7f2cb1, 0xb961f49a), TOBN(0x7fee2ec1, 0x7b009670),
- TOBN(0x350d8754, 0x22507a6d), TOBN(0x561bd711, 0x4db55f1d),
- TOBN(0x4c189ccc, 0x320bbcaf), TOBN(0x568434cf, 0xdf1de48c),
- TOBN(0x6af1b00e, 0x0fa8f128), TOBN(0xf0ba9d02, 0x8907583c),
- TOBN(0x735a4004, 0x32ff9f60), TOBN(0x3dd8e4b6, 0xc25dcf33),
- TOBN(0xf2230f16, 0x42c74cef), TOBN(0xd8117623, 0x013fa8ad),
- TOBN(0x36822876, 0xf51fe76e), TOBN(0x8a6811cc, 0x11d62589),
- TOBN(0xc3fc7e65, 0x46225718), TOBN(0xb7df2c9f, 0xc82fdbcd),
- TOBN(0x3b1d4e52, 0xdd7b205b), TOBN(0xb6959478, 0x47a2e414),
- TOBN(0x05e4d793, 0xefa91148), TOBN(0xb47ed446, 0xfd2e9675),
- TOBN(0x1a7098b9, 0x04c9d9bf), TOBN(0x661e2881, 0x1b793048),
- TOBN(0xb1a16966, 0xb01ee461), TOBN(0xbc521308, 0x2954746f),
- TOBN(0xc909a0fc, 0x2477de50), TOBN(0xd80bb41c, 0x7dbd51ef),
- TOBN(0xa85be7ec, 0x53294905), TOBN(0x6d465b18, 0x83958f97),
- TOBN(0x16f6f330, 0xfb6840fd), TOBN(0xfaaeb214, 0x3401e6c8),
- TOBN(0xaf83d30f, 0xccb5b4f8), TOBN(0x22885739, 0x266dec4b),
- TOBN(0x51b4367c, 0x7bc467df), TOBN(0x926562e3, 0xd842d27a),
- TOBN(0xdfcb6614, 0x0fea14a6), TOBN(0xeb394dae, 0xf2734cd9),
- TOBN(0x3eeae5d2, 0x11c0be98), TOBN(0xb1e6ed11, 0x814e8165),
- TOBN(0x191086bc, 0xe52bce1c), TOBN(0x14b74cc6, 0xa75a04da),
- TOBN(0x63cf1186, 0x8c060985), TOBN(0x071047de, 0x2dbd7f7c),
- TOBN(0x4e433b8b, 0xce0942ca), TOBN(0xecbac447, 0xd8fec61d),
- TOBN(0x8f0ed0e2, 0xebf3232f), TOBN(0xfff80f9e, 0xc52a2edd),
- TOBN(0xad9ab433, 0x75b55fdb), TOBN(0x73ca7820, 0xe42e0c11),
- TOBN(0x6dace0a0, 0xe6251b46), TOBN(0x89bc6b5c, 0x4c0d932d),
- TOBN(0x3438cd77, 0x095da19a), TOBN(0x2f24a939, 0x8d48bdfb),
- TOBN(0x99b47e46, 0x766561b7), TOBN(0x736600e6, 0x0ed0322a),
- TOBN(0x06a47cb1, 0x638e1865), TOBN(0x927c1c2d, 0xcb136000),
- TOBN(0x29542337, 0x0cc5df69), TOBN(0x99b37c02, 0x09d649a9),
- TOBN(0xc5f0043c, 0x6aefdb27), TOBN(0x6cdd9987, 0x1be95c27),
- TOBN(0x69850931, 0x390420d2), TOBN(0x299c40ac, 0x0983efa4),
- TOBN(0x3a05e778, 0xaf39aead), TOBN(0x84274408, 0x43a45193),
- TOBN(0x6bcd0fb9, 0x91a711a0), TOBN(0x461592c8, 0x9f52ab17),
- TOBN(0xb49302b4, 0xda3c6ed6), TOBN(0xc51fddc7, 0x330d7067),
- TOBN(0x94babeb6, 0xda50d531), TOBN(0x521b840d, 0xa6a7b9da),
- TOBN(0x5305151e, 0x404bdc89), TOBN(0x1bcde201, 0xd0d07449),
- TOBN(0xf427a78b, 0x3b76a59a), TOBN(0xf84841ce, 0x07791a1b),
- TOBN(0xebd314be, 0xbf91ed1c), TOBN(0x8e61d34c, 0xbf172943),
- TOBN(0x1d5dc451, 0x5541b892), TOBN(0xb186ee41, 0xfc9d9e54),
- TOBN(0x9d9f345e, 0xd5bf610d), TOBN(0x3e7ba65d, 0xf6acca9f),
- TOBN(0x9dda787a, 0xa8369486), TOBN(0x09f9dab7, 0x8eb5ba53),
- TOBN(0x5afb2033, 0xd6481bc3), TOBN(0x76f4ce30, 0xafa62104),
- TOBN(0xa8fa00cf, 0xf4f066b5), TOBN(0x89ab5143, 0x461dafc2),
- TOBN(0x44339ed7, 0xa3389998), TOBN(0x2ff862f1, 0xbc214903),
- TOBN(0x2c88f985, 0xb05556e3), TOBN(0xcd96058e, 0x3467081e),
- TOBN(0x7d6a4176, 0xedc637ea), TOBN(0xe1743d09, 0x36a5acdc),
- TOBN(0x66fd72e2, 0x7eb37726), TOBN(0xf7fa264e, 0x1481a037),
- TOBN(0x9fbd3bde, 0x45f4aa79), TOBN(0xed1e0147, 0x767c3e22),
- TOBN(0x7621f979, 0x82e7abe2), TOBN(0x19eedc72, 0x45f633f8),
- TOBN(0xe69b155e, 0x6137bf3a), TOBN(0xa0ad13ce, 0x414ee94e),
- TOBN(0x93e3d524, 0x1c0e651a), TOBN(0xab1a6e2a, 0x02ce227e),
- TOBN(0xe7af1797, 0x4ab27eca), TOBN(0x245446de, 0xbd444f39),
- TOBN(0x59e22a21, 0x56c07613), TOBN(0x43deafce, 0xf4275498),
- TOBN(0x10834ccb, 0x67fd0946), TOBN(0xa75841e5, 0x47406edf),
- TOBN(0xebd6a677, 0x7b0ac93d), TOBN(0xa6e37b0d, 0x78f5e0d7),
- TOBN(0x2516c096, 0x76f5492b), TOBN(0x1e4bf888, 0x9ac05f3a),
- TOBN(0xcdb42ce0, 0x4df0ba2b), TOBN(0x935d5cfd, 0x5062341b),
- TOBN(0x8a303333, 0x82acac20), TOBN(0x429438c4, 0x5198b00e),
- TOBN(0x1d083bc9, 0x049d33fa), TOBN(0x58b82dda, 0x946f67ff),
- TOBN(0xac3e2db8, 0x67a1d6a3), TOBN(0x62e6bead, 0x1798aac8),
- TOBN(0xfc85980f, 0xde46c58c), TOBN(0xa7f69379, 0x69c8d7be),
- TOBN(0x23557927, 0x837b35ec), TOBN(0x06a933d8, 0xe0790c0c),
- TOBN(0x827c0e9b, 0x077ff55d), TOBN(0x53977798, 0xbb26e680),
- TOBN(0x59530874, 0x1d9cb54f), TOBN(0xcca3f449, 0x4aac53ef),
- TOBN(0x11dc5c87, 0xa07eda0f), TOBN(0xc138bccf, 0xfd6400c8),
- TOBN(0x549680d3, 0x13e5da72), TOBN(0xc93eed82, 0x4540617e),
- TOBN(0xfd3db157, 0x4d0b75c0), TOBN(0x9716eb42, 0x6386075b),
- TOBN(0x0639605c, 0x817b2c16), TOBN(0x09915109, 0xf1e4f201),
- TOBN(0x35c9a928, 0x5cca6c3b), TOBN(0xb25f7d1a, 0x3505c900),
- TOBN(0xeb9f7d20, 0x630480c4), TOBN(0xc3c7b8c6, 0x2a1a501c),
- TOBN(0x3f99183c, 0x5a1f8e24), TOBN(0xfdb118fa, 0x9dd255f0),
- TOBN(0xb9b18b90, 0xc27f62a6), TOBN(0xe8f732f7, 0x396ec191),
- TOBN(0x524a2d91, 0x0be786ab), TOBN(0x5d32adef, 0x0ac5a0f5),
- TOBN(0x9b53d4d6, 0x9725f694), TOBN(0x032a76c6, 0x0510ba89),
- TOBN(0x840391a3, 0xebeb1544), TOBN(0x44b7b88c, 0x3ed73ac3),
- TOBN(0xd24bae7a, 0x256cb8b3), TOBN(0x7ceb151a, 0xe394cb12),
- TOBN(0xbd6b66d0, 0x5bc1e6a8), TOBN(0xec70cecb, 0x090f07bf),
- TOBN(0x270644ed, 0x7d937589), TOBN(0xee9e1a3d, 0x5f1dccfe),
- TOBN(0xb0d40a84, 0x745b98d2), TOBN(0xda429a21, 0x2556ed40),
- TOBN(0xf676eced, 0x85148cb9), TOBN(0x5a22d40c, 0xded18936),
- TOBN(0x3bc4b9e5, 0x70e8a4ce), TOBN(0xbfd1445b, 0x9eae0379),
- TOBN(0xf23f2c0c, 0x1a0bd47e), TOBN(0xa9c0bb31, 0xe1845531),
- TOBN(0x9ddc4d60, 0x0a4c3f6b), TOBN(0xbdfaad79, 0x2c15ef44),
- TOBN(0xce55a236, 0x7f484acc), TOBN(0x08653ca7, 0x055b1f15),
- TOBN(0x2efa8724, 0x538873a3), TOBN(0x09299e5d, 0xace1c7e7),
- TOBN(0x07afab66, 0xade332ba), TOBN(0x9be1fdf6, 0x92dd71b7),
- TOBN(0xa49b5d59, 0x5758b11c), TOBN(0x0b852893, 0xc8654f40),
- TOBN(0xb63ef6f4, 0x52379447), TOBN(0xd4957d29, 0x105e690c),
- TOBN(0x7d484363, 0x646559b0), TOBN(0xf4a8273c, 0x49788a8e),
- TOBN(0xee406cb8, 0x34ce54a9), TOBN(0x1e1c260f, 0xf86fda9b),
- TOBN(0xe150e228, 0xcf6a4a81), TOBN(0x1fa3b6a3, 0x1b488772),
- TOBN(0x1e6ff110, 0xc5a9c15b), TOBN(0xc6133b91, 0x8ad6aa47),
- TOBN(0x8ac5d55c, 0x9dffa978), TOBN(0xba1d1c1d, 0x5f3965f2),
- TOBN(0xf969f4e0, 0x7732b52f), TOBN(0xfceecdb5, 0xa5172a07),
- TOBN(0xb0120a5f, 0x10f2b8f5), TOBN(0xc83a6cdf, 0x5c4c2f63),
- TOBN(0x4d47a491, 0xf8f9c213), TOBN(0xd9e1cce5, 0xd3f1bbd5),
- TOBN(0x0d91bc7c, 0xaba7e372), TOBN(0xfcdc74c8, 0xdfd1a2db),
- TOBN(0x05efa800, 0x374618e5), TOBN(0x11216969, 0x15a7925e),
- TOBN(0xd4c89823, 0xf6021c5d), TOBN(0x880d5e84, 0xeff14423),
- TOBN(0x6523bc5a, 0x6dcd1396), TOBN(0xd1acfdfc, 0x113c978b),
- TOBN(0xb0c164e8, 0xbbb66840), TOBN(0xf7f4301e, 0x72b58459),
- TOBN(0xc29ad4a6, 0xa638e8ec), TOBN(0xf5ab8961, 0x46b78699),
- TOBN(0x9dbd7974, 0x0e954750), TOBN(0x0121de88, 0x64f9d2c6),
- TOBN(0x2e597b42, 0xd985232e), TOBN(0x55b6c3c5, 0x53451777),
- TOBN(0xbb53e547, 0x519cb9fb), TOBN(0xf134019f, 0x8428600d),
- TOBN(0x5a473176, 0xe081791a), TOBN(0x2f3e2263, 0x35fb0c08),
- TOBN(0xb28c3017, 0x73d273b0), TOBN(0xccd21076, 0x7721ef9a),
- TOBN(0x054cc292, 0xb650dc39), TOBN(0x662246de, 0x6188045e),
- TOBN(0x904b52fa, 0x6b83c0d1), TOBN(0xa72df267, 0x97e9cd46),
- TOBN(0x886b43cd, 0x899725e4), TOBN(0x2b651688, 0xd849ff22),
- TOBN(0x60479b79, 0x02f34533), TOBN(0x5e354c14, 0x0c77c148),
- TOBN(0xb4bb7581, 0xa8537c78), TOBN(0x188043d7, 0xefe1495f),
- TOBN(0x9ba12f42, 0x8c1d5026), TOBN(0x2e0c8a26, 0x93d4aaab),
- TOBN(0xbdba7b8b, 0xaa57c450), TOBN(0x140c9ad6, 0x9bbdafef),
- TOBN(0x2067aa42, 0x25ac0f18), TOBN(0xf7b1295b, 0x04d1fbf3),
- TOBN(0x14829111, 0xa4b04824), TOBN(0x2ce3f192, 0x33bd5e91),
- TOBN(0x9c7a1d55, 0x8f2e1b72), TOBN(0xfe932286, 0x302aa243),
- TOBN(0x497ca7b4, 0xd4be9554), TOBN(0xb8e821b8, 0xe0547a6e),
- TOBN(0xfb2838be, 0x67e573e0), TOBN(0x05891db9, 0x4084c44b),
- TOBN(0x91311373, 0x96c1c2c5), TOBN(0x6aebfa3f, 0xd958444b),
- TOBN(0xac9cdce9, 0xe56e55c1), TOBN(0x7148ced3, 0x2caa46d0),
- TOBN(0x2e10c7ef, 0xb61fe8eb), TOBN(0x9fd835da, 0xff97cf4d),}
- ,
- {TOBN(0xa36da109, 0x081e9387), TOBN(0xfb9780d7, 0x8c935828),
- TOBN(0xd5940332, 0xe540b015), TOBN(0xc9d7b51b, 0xe0f466fa),
- TOBN(0xfaadcd41, 0xd6d9f671), TOBN(0xba6c1e28, 0xb1a2ac17),
- TOBN(0x066a7833, 0xed201e5f), TOBN(0x19d99719, 0xf90f462b),
- TOBN(0xf431f462, 0x060b5f61), TOBN(0xa56f46b4, 0x7bd057c2),
- TOBN(0x348dca6c, 0x47e1bf65), TOBN(0x9a38783e, 0x41bcf1ff),
- TOBN(0x7a5d33a9, 0xda710718), TOBN(0x5a779987, 0x2e0aeaf6),
- TOBN(0xca87314d, 0x2d29d187), TOBN(0xfa0edc3e, 0xc687d733),
- TOBN(0x9df33621, 0x6a31e09b), TOBN(0xde89e44d, 0xc1350e35),
- TOBN(0x29214871, 0x4ca0cf52), TOBN(0xdf379672, 0x0b88a538),
- TOBN(0xc92a510a, 0x2591d61b), TOBN(0x79aa87d7, 0x585b447b),
- TOBN(0xf67db604, 0xe5287f77), TOBN(0x1697c8bf, 0x5efe7a80),
- TOBN(0x1c894849, 0xcb198ac7), TOBN(0xa884a93d, 0x0f264665),
- TOBN(0x2da964ef, 0x9b200678), TOBN(0x3c351b87, 0x009834e6),
- TOBN(0xafb2ef9f, 0xe2c4b44b), TOBN(0x580f6c47, 0x3326790c),
- TOBN(0xb8480521, 0x0b02264a), TOBN(0x8ba6f9e2, 0x42a194e2),
- TOBN(0xfc87975f, 0x8fb54738), TOBN(0x35160788, 0x27c3ead3),
- TOBN(0x834116d2, 0xb74a085a), TOBN(0x53c99a73, 0xa62fe996),
- TOBN(0x87585be0, 0x5b81c51b), TOBN(0x925bafa8, 0xbe0852b7),
- TOBN(0x76a4fafd, 0xa84d19a7), TOBN(0x39a45982, 0x585206d4),
- TOBN(0x499b6ab6, 0x5eb03c0e), TOBN(0xf19b7954, 0x72bc3fde),
- TOBN(0xa86b5b9c, 0x6e3a80d2), TOBN(0xe4377508, 0x6d42819f),
- TOBN(0xc1663650, 0xbb3ee8a3), TOBN(0x75eb14fc, 0xb132075f),
- TOBN(0xa8ccc906, 0x7ad834f6), TOBN(0xea6a2474, 0xe6e92ffd),
- TOBN(0x9d72fd95, 0x0f8d6758), TOBN(0xcb84e101, 0x408c07dd),
- TOBN(0xb9114bfd, 0xa5e23221), TOBN(0x358b5fe2, 0xe94e742c),
- TOBN(0x1c0577ec, 0x95f40e75), TOBN(0xf0155451, 0x3d73f3d6),
- TOBN(0x9d55cd67, 0xbd1b9b66), TOBN(0x63e86e78, 0xaf8d63c7),
- TOBN(0x39d934ab, 0xd3c095f1), TOBN(0x04b261be, 0xe4b76d71),
- TOBN(0x1d2e6970, 0xe73e6984), TOBN(0x879fb23b, 0x5e5fcb11),
- TOBN(0x11506c72, 0xdfd75490), TOBN(0x3a97d085, 0x61bcf1c1),
- TOBN(0x43201d82, 0xbf5e7007), TOBN(0x7f0ac52f, 0x798232a7),
- TOBN(0x2715cbc4, 0x6eb564d4), TOBN(0x8d6c752c, 0x9e570e29),
- TOBN(0xf80247c8, 0x9ef5fd5d), TOBN(0xc3c66b46, 0xd53eb514),
- TOBN(0x9666b401, 0x0f87de56), TOBN(0xce62c06f, 0xc6c603b5),
- TOBN(0xae7b4c60, 0x7e4fc942), TOBN(0x38ac0b77, 0x663a9c19),
- TOBN(0xcb4d20ee, 0x4b049136), TOBN(0x8b63bf12, 0x356a4613),
- TOBN(0x1221aef6, 0x70e08128), TOBN(0xe62d8c51, 0x4acb6b16),
- TOBN(0x71f64a67, 0x379e7896), TOBN(0xb25237a2, 0xcafd7fa5),
- TOBN(0xf077bd98, 0x3841ba6a), TOBN(0xc4ac0244, 0x3cd16e7e),
- TOBN(0x548ba869, 0x21fea4ca), TOBN(0xd36d0817, 0xf3dfdac1),
- TOBN(0x09d8d71f, 0xf4685faf), TOBN(0x8eff66be, 0xc52c459a),
- TOBN(0x182faee7, 0x0b57235e), TOBN(0xee3c39b1, 0x0106712b),
- TOBN(0x5107331f, 0xc0fcdcb0), TOBN(0x669fb9dc, 0xa51054ba),
- TOBN(0xb25101fb, 0x319d7682), TOBN(0xb0293129, 0x0a982fee),
- TOBN(0x51c1c9b9, 0x0261b344), TOBN(0x0e008c5b, 0xbfd371fa),
- TOBN(0xd866dd1c, 0x0278ca33), TOBN(0x666f76a6, 0xe5aa53b1),
- TOBN(0xe5cfb779, 0x6013a2cf), TOBN(0x1d3a1aad, 0xa3521836),
- TOBN(0xcedd2531, 0x73faa485), TOBN(0xc8ee6c4f, 0xc0a76878),
- TOBN(0xddbccfc9, 0x2a11667d), TOBN(0x1a418ea9, 0x1c2f695a),
- TOBN(0xdb11bd92, 0x51f73971), TOBN(0x3e4b3c82, 0xda2ed89f),
- TOBN(0x9a44f3f4, 0xe73e0319), TOBN(0xd1e3de0f, 0x303431af),
- TOBN(0x3c5604ff, 0x50f75f9c), TOBN(0x1d8eddf3, 0x7e752b22),
- TOBN(0x0ef074dd, 0x3c9a1118), TOBN(0xd0ffc172, 0xccb86d7b),
- TOBN(0xabd1ece3, 0x037d90f2), TOBN(0xe3f307d6, 0x6055856c),
- TOBN(0x422f9328, 0x7e4c6daf), TOBN(0x902aac66, 0x334879a0),
- TOBN(0xb6a1e7bf, 0x94cdfade), TOBN(0x6c97e1ed, 0x7fc6d634),
- TOBN(0x662ad24d, 0xa2fb63f8), TOBN(0xf81be1b9, 0xa5928405),
- TOBN(0x86d765e4, 0xd14b4206), TOBN(0xbecc2e0e, 0x8fa0db65),
- TOBN(0xa28838e0, 0xb17fc76c), TOBN(0xe49a602a, 0xe37cf24e),
- TOBN(0x76b4131a, 0x567193ec), TOBN(0xaf3c305a, 0xe5f6e70b),
- TOBN(0x9587bd39, 0x031eebdd), TOBN(0x5709def8, 0x71bbe831),
- TOBN(0x57059983, 0x0eb2b669), TOBN(0x4d80ce1b, 0x875b7029),
- TOBN(0x838a7da8, 0x0364ac16), TOBN(0x2f431d23, 0xbe1c83ab),
- TOBN(0xe56812a6, 0xf9294dd3), TOBN(0xb448d01f, 0x9b4b0d77),
- TOBN(0xf3ae6061, 0x04e8305c), TOBN(0x2bead645, 0x94d8c63e),
- TOBN(0x0a85434d, 0x84fd8b07), TOBN(0x537b983f, 0xf7a9dee5),
- TOBN(0xedcc5f18, 0xef55bd85), TOBN(0x2041af62, 0x21c6cf8b),
- TOBN(0x8e52874c, 0xb940c71e), TOBN(0x211935a9, 0xdb5f4b3a),
- TOBN(0x94350492, 0x301b1dc3), TOBN(0x33d2646d, 0x29958620),
- TOBN(0x16b0d64b, 0xef911404), TOBN(0x9d1f25ea, 0x9a3c5ef4),
- TOBN(0x20f200eb, 0x4a352c78), TOBN(0x43929f2c, 0x4bd0b428),
- TOBN(0xa5656667, 0xc7196e29), TOBN(0x7992c2f0, 0x9391be48),
- TOBN(0xaaa97cbd, 0x9ee0cd6e), TOBN(0x51b0310c, 0x3dc8c9bf),
- TOBN(0x237f8acf, 0xdd9f22cb), TOBN(0xbb1d81a1, 0xb585d584),
- TOBN(0x8d5d85f5, 0x8c416388), TOBN(0x0d6e5a5a, 0x42fe474f),
- TOBN(0xe7812766, 0x38235d4e), TOBN(0x1c62bd67, 0x496e3298),
- TOBN(0x8378660c, 0x3f175bc8), TOBN(0x4d04e189, 0x17afdd4d),
- TOBN(0x32a81601, 0x85a8068c), TOBN(0xdb58e4e1, 0x92b29a85),
- TOBN(0xe8a65b86, 0xc70d8a3b), TOBN(0x5f0e6f4e, 0x98a0403b),
- TOBN(0x08129684, 0x69ed2370), TOBN(0x34dc30bd, 0x0871ee26),
- TOBN(0x3a5ce948, 0x7c9c5b05), TOBN(0x7d487b80, 0x43a90c87),
- TOBN(0x4089ba37, 0xdd0e7179), TOBN(0x45f80191, 0xb4041811),
- TOBN(0x1c3e1058, 0x98747ba5), TOBN(0x98c4e13a, 0x6e1ae592),
- TOBN(0xd44636e6, 0xe82c9f9e), TOBN(0x711db87c, 0xc33a1043),
- TOBN(0x6f431263, 0xaa8aec05), TOBN(0x43ff120d, 0x2744a4aa),
- TOBN(0xd3bd892f, 0xae77779b), TOBN(0xf0fe0cc9, 0x8cdc9f82),
- TOBN(0xca5f7fe6, 0xf1c5b1bc), TOBN(0xcc63a682, 0x44929a72),
- TOBN(0xc7eaba0c, 0x09dbe19a), TOBN(0x2f3585ad, 0x6b5c73c2),
- TOBN(0x8ab8924b, 0x0ae50c30), TOBN(0x17fcd27a, 0x638b30ba),
- TOBN(0xaf414d34, 0x10b3d5a5), TOBN(0x09c107d2, 0x2a9accf1),
- TOBN(0x15dac49f, 0x946a6242), TOBN(0xaec3df2a, 0xd707d642),
- TOBN(0x2c2492b7, 0x3f894ae0), TOBN(0xf59df3e5, 0xb75f18ce),
- TOBN(0x7cb740d2, 0x8f53cad0), TOBN(0x3eb585fb, 0xc4f01294),
- TOBN(0x17da0c86, 0x32c7f717), TOBN(0xeb8c795b, 0xaf943f4c),
- TOBN(0x4ee23fb5, 0xf67c51d2), TOBN(0xef187575, 0x68889949),
- TOBN(0xa6b4bdb2, 0x0389168b), TOBN(0xc4ecd258, 0xea577d03),
- TOBN(0x3a63782b, 0x55743082), TOBN(0x6f678f4c, 0xc72f08cd),
- TOBN(0x553511cf, 0x65e58dd8), TOBN(0xd53b4e3e, 0xd402c0cd),
- TOBN(0x37de3e29, 0xa037c14c), TOBN(0x86b6c516, 0xc05712aa),
- TOBN(0x2834da3e, 0xb38dff6f), TOBN(0xbe012c52, 0xea636be8),
- TOBN(0x292d238c, 0x61dd37f8), TOBN(0x0e54523f, 0x8f8142db),
- TOBN(0xe31eb436, 0x036a05d8), TOBN(0x83e3cdff, 0x1e93c0ff),
- TOBN(0x3fd2fe0f, 0x50821ddf), TOBN(0xc8e19b0d, 0xff9eb33b),
- TOBN(0xc8cc943f, 0xb569a5fe), TOBN(0xad0090d4, 0xd4342d75),
- TOBN(0x82090b4b, 0xcaeca000), TOBN(0xca39687f, 0x1bd410eb),
- TOBN(0xe7bb0df7, 0x65959d77), TOBN(0x39d78218, 0x9c964999),
- TOBN(0xd87f62e8, 0xb2415451), TOBN(0xe5efb774, 0xbed76108),
- TOBN(0x3ea011a4, 0xe822f0d0), TOBN(0xbc647ad1, 0x5a8704f8),
- TOBN(0xbb315b35, 0x50c6820f), TOBN(0x863dec3d, 0xb7e76bec),
- TOBN(0x01ff5d3a, 0xf017bfc7), TOBN(0x20054439, 0x976b8229),
- TOBN(0x067fca37, 0x0bbd0d3b), TOBN(0xf63dde64, 0x7f5e3d0f),
- TOBN(0x22dbefb3, 0x2a4c94e9), TOBN(0xafbff0fe, 0x96f8278a),
- TOBN(0x80aea0b1, 0x3503793d), TOBN(0xb2238029, 0x5f06cd29),
- TOBN(0x65703e57, 0x8ec3feca), TOBN(0x06c38314, 0x393e7053),
- TOBN(0xa0b751eb, 0x7c6734c4), TOBN(0xd2e8a435, 0xc59f0f1e),
- TOBN(0x147d9052, 0x5e9ca895), TOBN(0x2f4dd31e, 0x972072df),
- TOBN(0xa16fda8e, 0xe6c6755c), TOBN(0xc66826ff, 0xcf196558),
- TOBN(0x1f1a76a3, 0x0cf43895), TOBN(0xa9d604e0, 0x83c3097b),
- TOBN(0xe1908309, 0x66390e0e), TOBN(0xa50bf753, 0xb3c85eff),
- TOBN(0x0696bdde, 0xf6a70251), TOBN(0x548b801b, 0x3c6ab16a),
- TOBN(0x37fcf704, 0xa4d08762), TOBN(0x090b3def, 0xdff76c4e),
- TOBN(0x87e8cb89, 0x69cb9158), TOBN(0x44a90744, 0x995ece43),
- TOBN(0xf85395f4, 0x0ad9fbf5), TOBN(0x49b0f6c5, 0x4fb0c82d),
- TOBN(0x75d9bc15, 0xadf7cccf), TOBN(0x81a3e5d6, 0xdfa1e1b0),
- TOBN(0x8c39e444, 0x249bc17e), TOBN(0xf37dccb2, 0x8ea7fd43),
- TOBN(0xda654873, 0x907fba12), TOBN(0x35daa6da, 0x4a372904),
- TOBN(0x0564cfc6, 0x6283a6c5), TOBN(0xd09fa4f6, 0x4a9395bf),
- TOBN(0x688e9ec9, 0xaeb19a36), TOBN(0xd913f1ce, 0xc7bfbfb4),
- TOBN(0x797b9a3c, 0x61c2faa6), TOBN(0x2f979bec, 0x6a0a9c12),
- TOBN(0xb5969d0f, 0x359679ec), TOBN(0xebcf523d, 0x079b0460),
- TOBN(0xfd6b0008, 0x10fab870), TOBN(0x3f2edcda, 0x9373a39c),
- TOBN(0x0d64f9a7, 0x6f568431), TOBN(0xf848c27c, 0x02f8898c),
- TOBN(0xf418ade1, 0x260b5bd5), TOBN(0xc1f3e323, 0x6973dee8),
- TOBN(0x46e9319c, 0x26c185dd), TOBN(0x6d85b7d8, 0x546f0ac4),
- TOBN(0x427965f2, 0x247f9d57), TOBN(0xb519b636, 0xb0035f48),
- TOBN(0x6b6163a9, 0xab87d59c), TOBN(0xff9f58c3, 0x39caaa11),
- TOBN(0x4ac39cde, 0x3177387b), TOBN(0x5f6557c2, 0x873e77f9),
- TOBN(0x67504006, 0x36a83041), TOBN(0x9b1c96ca, 0x75ef196c),
- TOBN(0xf34283de, 0xb08c7940), TOBN(0x7ea09644, 0x1128c316),
- TOBN(0xb510b3b5, 0x6aa39dff), TOBN(0x59b43da2, 0x9f8e4d8c),
- TOBN(0xa8ce31fd, 0x9e4c4b9f), TOBN(0x0e20be26, 0xc1303c01),
- TOBN(0x18187182, 0xe8ee47c9), TOBN(0xd9687cdb, 0x7db98101),
- TOBN(0x7a520e4d, 0xa1e14ff6), TOBN(0x429808ba, 0x8836d572),
- TOBN(0xa37ca60d, 0x4944b663), TOBN(0xf901f7a9, 0xa3f91ae5),
- TOBN(0xe4e3e76e, 0x9e36e3b1), TOBN(0x9aa219cf, 0x29d93250),
- TOBN(0x347fe275, 0x056a2512), TOBN(0xa4d643d9, 0xde65d95c),
- TOBN(0x9669d396, 0x699fc3ed), TOBN(0xb598dee2, 0xcf8c6bbe),
- TOBN(0x682ac1e5, 0xdda9e5c6), TOBN(0x4e0d3c72, 0xcaa9fc95),
- TOBN(0x17faaade, 0x772bea44), TOBN(0x5ef8428c, 0xab0009c8),
- TOBN(0xcc4ce47a, 0x460ff016), TOBN(0xda6d12bf, 0x725281cb),
- TOBN(0x44c67848, 0x0223aad2), TOBN(0x6e342afa, 0x36256e28),
- TOBN(0x1400bb0b, 0x93a37c04), TOBN(0x62b1bc9b, 0xdd10bd96),
- TOBN(0x7251adeb, 0x0dac46b7), TOBN(0x7d33b92e, 0x7be4ef51),
- TOBN(0x28b2a94b, 0xe61fa29a), TOBN(0x4b2be13f, 0x06422233),
- TOBN(0x36d6d062, 0x330d8d37), TOBN(0x5ef80e1e, 0xb28ca005),
- TOBN(0x174d4699, 0x6d16768e), TOBN(0x9fc4ff6a, 0x628bf217),
- TOBN(0x77705a94, 0x154e490d), TOBN(0x9d96dd28, 0x8d2d997a),
- TOBN(0x77e2d9d8, 0xce5d72c4), TOBN(0x9d06c5a4, 0xc11c714f),
- TOBN(0x02aa5136, 0x79e4a03e), TOBN(0x1386b3c2, 0x030ff28b),
- TOBN(0xfe82e8a6, 0xfb283f61), TOBN(0x7df203e5, 0xf3abc3fb),
- TOBN(0xeec7c351, 0x3a4d3622), TOBN(0xf7d17dbf, 0xdf762761),
- TOBN(0xc3956e44, 0x522055f0), TOBN(0xde3012db, 0x8fa748db),
- TOBN(0xca9fcb63, 0xbf1dcc14), TOBN(0xa56d9dcf, 0xbe4e2f3a),
- TOBN(0xb86186b6, 0x8bcec9c2), TOBN(0x7cf24df9, 0x680b9f06),
- TOBN(0xc46b45ea, 0xc0d29281), TOBN(0xfff42bc5, 0x07b10e12),
- TOBN(0x12263c40, 0x4d289427), TOBN(0x3d5f1899, 0xb4848ec4),
- TOBN(0x11f97010, 0xd040800c), TOBN(0xb4c5f529, 0x300feb20),
- TOBN(0xcc543f8f, 0xde94fdcb), TOBN(0xe96af739, 0xc7c2f05e),
- TOBN(0xaa5e0036, 0x882692e1), TOBN(0x09c75b68, 0x950d4ae9),
- TOBN(0x62f63df2, 0xb5932a7a), TOBN(0x2658252e, 0xde0979ad),
- TOBN(0x2a19343f, 0xb5e69631), TOBN(0x718c7501, 0x525b666b),
- TOBN(0x26a42d69, 0xea40dc3a), TOBN(0xdc84ad22, 0xaecc018f),
- TOBN(0x25c36c7b, 0x3270f04a), TOBN(0x46ba6d47, 0x50fa72ed),
- TOBN(0x6c37d1c5, 0x93e58a8e), TOBN(0xa2394731, 0x120c088c),
- TOBN(0xc3be4263, 0xcb6e86da), TOBN(0x2c417d36, 0x7126d038),
- TOBN(0x5b70f9c5, 0x8b6f8efa), TOBN(0x671a2faa, 0x37718536),
- TOBN(0xd3ced3c6, 0xb539c92b), TOBN(0xe56f1bd9, 0xa31203c2),
- TOBN(0x8b096ec4, 0x9ff3c8eb), TOBN(0x2deae432, 0x43491cea),
- TOBN(0x2465c6eb, 0x17943794), TOBN(0x5d267e66, 0x20586843),
- TOBN(0x9d3d116d, 0xb07159d0), TOBN(0xae07a67f, 0xc1896210),
- TOBN(0x8fc84d87, 0xbb961579), TOBN(0x30009e49, 0x1c1f8dd6),
- TOBN(0x8a8caf22, 0xe3132819), TOBN(0xcffa197c, 0xf23ab4ff),
- TOBN(0x58103a44, 0x205dd687), TOBN(0x57b796c3, 0x0ded67a2),
- TOBN(0x0b9c3a6c, 0xa1779ad7), TOBN(0xa33cfe2e, 0x357c09c5),
- TOBN(0x2ea29315, 0x3db4a57e), TOBN(0x91959695, 0x8ebeb52e),
- TOBN(0x118db9a6, 0xe546c879), TOBN(0x8e996df4, 0x6295c8d6),
- TOBN(0xdd990484, 0x55ec806b), TOBN(0x24f291ca, 0x165c1035),
- TOBN(0xcca523bb, 0x440e2229), TOBN(0x324673a2, 0x73ef4d04),
- TOBN(0xaf3adf34, 0x3e11ec39), TOBN(0x6136d7f1, 0xdc5968d3),
- TOBN(0x7a7b2899, 0xb053a927), TOBN(0x3eaa2661, 0xae067ecd),
- TOBN(0x8549b9c8, 0x02779cd9), TOBN(0x061d7940, 0xc53385ea),
- TOBN(0x3e0ba883, 0xf06d18bd), TOBN(0x4ba6de53, 0xb2700843),
- TOBN(0xb966b668, 0x591a9e4d), TOBN(0x93f67567, 0x7f4fa0ed),
- TOBN(0x5a02711b, 0x4347237b), TOBN(0xbc041e2f, 0xe794608e),
- TOBN(0x55af10f5, 0x70f73d8c), TOBN(0xd2d4d4f7, 0xbb7564f7),
- TOBN(0xd7d27a89, 0xb3e93ce7), TOBN(0xf7b5a875, 0x5d3a2c1b),
- TOBN(0xb29e68a0, 0x255b218a), TOBN(0xb533837e, 0x8af76754),
- TOBN(0xd1b05a73, 0x579fab2e), TOBN(0xb41055a1, 0xecd74385),
- TOBN(0xb2369274, 0x445e9115), TOBN(0x2972a7c4, 0xf520274e),
- TOBN(0x6c08334e, 0xf678e68a), TOBN(0x4e4160f0, 0x99b057ed),
- TOBN(0x3cfe11b8, 0x52ccb69a), TOBN(0x2fd1823a, 0x21c8f772),
- TOBN(0xdf7f072f, 0x3298f055), TOBN(0x8c0566f9, 0xfec74a6e),
- TOBN(0xe549e019, 0x5bb4d041), TOBN(0x7c3930ba, 0x9208d850),
- TOBN(0xe07141fc, 0xaaa2902b), TOBN(0x539ad799, 0xe4f69ad3),
- TOBN(0xa6453f94, 0x813f9ffd), TOBN(0xc58d3c48, 0x375bc2f7),
- TOBN(0xb3326fad, 0x5dc64e96), TOBN(0x3aafcaa9, 0xb240e354),
- TOBN(0x1d1b0903, 0xaca1e7a9), TOBN(0x4ceb9767, 0x1211b8a0),
- TOBN(0xeca83e49, 0xe32a858e), TOBN(0x4c32892e, 0xae907bad),
- TOBN(0xd5b42ab6, 0x2eb9b494), TOBN(0x7fde3ee2, 0x1eabae1b),
- TOBN(0x13b5ab09, 0xcaf54957), TOBN(0xbfb028be, 0xe5f5d5d5),
- TOBN(0x928a0650, 0x2003e2c0), TOBN(0x90793aac, 0x67476843),
- TOBN(0x5e942e79, 0xc81710a0), TOBN(0x557e4a36, 0x27ccadd4),
- TOBN(0x72a2bc56, 0x4bcf6d0c), TOBN(0x09ee5f43, 0x26d7b80c),
- TOBN(0x6b70dbe9, 0xd4292f19), TOBN(0x56f74c26, 0x63f16b18),
- TOBN(0xc23db0f7, 0x35fbb42a), TOBN(0xb606bdf6, 0x6ae10040),
- TOBN(0x1eb15d4d, 0x044573ac), TOBN(0x7dc3cf86, 0x556b0ba4),
- TOBN(0x97af9a33, 0xc60df6f7), TOBN(0x0b1ef85c, 0xa716ce8c),
- TOBN(0x2922f884, 0xc96958be), TOBN(0x7c32fa94, 0x35690963),
- TOBN(0x2d7f667c, 0xeaa00061), TOBN(0xeaaf7c17, 0x3547365c),
- TOBN(0x1eb4de46, 0x87032d58), TOBN(0xc54f3d83, 0x5e2c79e0),
- TOBN(0x07818df4, 0x5d04ef23), TOBN(0x55faa9c8, 0x673d41b4),
- TOBN(0xced64f6f, 0x89b95355), TOBN(0x4860d2ea, 0xb7415c84),
- TOBN(0x5fdb9bd2, 0x050ebad3), TOBN(0xdb53e0cc, 0x6685a5bf),
- TOBN(0xb830c031, 0x9feb6593), TOBN(0xdd87f310, 0x6accff17),
- TOBN(0x2303ebab, 0x9f555c10), TOBN(0x94603695, 0x287e7065),
- TOBN(0xf88311c3, 0x2e83358c), TOBN(0x508dd9b4, 0xeefb0178),
- TOBN(0x7ca23706, 0x2dba8652), TOBN(0x62aac5a3, 0x0047abe5),
- TOBN(0x9a61d2a0, 0x8b1ea7b3), TOBN(0xd495ab63, 0xae8b1485),
- TOBN(0x38740f84, 0x87052f99), TOBN(0x178ebe5b, 0xb2974eea),
- TOBN(0x030bbcca, 0x5b36d17f), TOBN(0xb5e4cce3, 0xaaf86eea),
- TOBN(0xb51a0220, 0x68f8e9e0), TOBN(0xa4348796, 0x09eb3e75),
- TOBN(0xbe592309, 0xeef1a752), TOBN(0x5d7162d7, 0x6f2aa1ed),
- TOBN(0xaebfb5ed, 0x0f007dd2), TOBN(0x255e14b2, 0xc89edd22),
- TOBN(0xba85e072, 0x0303b697), TOBN(0xc5d17e25, 0xf05720ff),
- TOBN(0x02b58d6e, 0x5128ebb6), TOBN(0x2c80242d, 0xd754e113),
- TOBN(0x919fca5f, 0xabfae1ca), TOBN(0x937afaac, 0x1a21459b),
- TOBN(0x9e0ca91c, 0x1f66a4d2), TOBN(0x194cc7f3, 0x23ec1331),
- TOBN(0xad25143a, 0x8aa11690), TOBN(0xbe40ad8d, 0x09b59e08),
- TOBN(0x37d60d9b, 0xe750860a), TOBN(0x6c53b008, 0xc6bf434c),
- TOBN(0xb572415d, 0x1356eb80), TOBN(0xb8bf9da3, 0x9578ded8),
- TOBN(0x22658e36, 0x5e8fb38b), TOBN(0x9b70ce22, 0x5af8cb22),
- TOBN(0x7c00018a, 0x829a8180), TOBN(0x84329f93, 0xb81ed295),
- TOBN(0x7c343ea2, 0x5f3cea83), TOBN(0x38f8655f, 0x67586536),
- TOBN(0xa661a0d0, 0x1d3ec517), TOBN(0x98744652, 0x512321ae),
- TOBN(0x084ca591, 0xeca92598), TOBN(0xa9bb9dc9, 0x1dcb3feb),
- TOBN(0x14c54355, 0x78b4c240), TOBN(0x5ed62a3b, 0x610cafdc),
- TOBN(0x07512f37, 0x1b38846b), TOBN(0x571bb70a, 0xb0e38161),
- TOBN(0xb556b95b, 0x2da705d2), TOBN(0x3ef8ada6, 0xb1a08f98),
- TOBN(0x85302ca7, 0xddecfbe5), TOBN(0x0e530573, 0x943105cd),
- TOBN(0x60554d55, 0x21a9255d), TOBN(0x63a32fa1, 0xf2f3802a),
- TOBN(0x35c8c5b0, 0xcd477875), TOBN(0x97f458ea, 0x6ad42da1),
- TOBN(0x832d7080, 0xeb6b242d), TOBN(0xd30bd023, 0x3b71e246),
- TOBN(0x7027991b, 0xbe31139d), TOBN(0x68797e91, 0x462e4e53),
- TOBN(0x423fe20a, 0x6b4e185a), TOBN(0x82f2c67e, 0x42d9b707),
- TOBN(0x25c81768, 0x4cf7811b), TOBN(0xbd53005e, 0x045bb95d),}
- ,
- {TOBN(0xe5f649be, 0x9d8e68fd), TOBN(0xdb0f0533, 0x1b044320),
- TOBN(0xf6fde9b3, 0xe0c33398), TOBN(0x92f4209b, 0x66c8cfae),
- TOBN(0xe9d1afcc, 0x1a739d4b), TOBN(0x09aea75f, 0xa28ab8de),
- TOBN(0x14375fb5, 0xeac6f1d0), TOBN(0x6420b560, 0x708f7aa5),
- TOBN(0x9eae499c, 0x6254dc41), TOBN(0x7e293924, 0x7a837e7e),
- TOBN(0x74aec08c, 0x090524a7), TOBN(0xf82b9219, 0x8d6f55f2),
- TOBN(0x493c962e, 0x1402cec5), TOBN(0x9f17ca17, 0xfa2f30e7),
- TOBN(0xbcd783e8, 0xe9b879cb), TOBN(0xea3d8c14, 0x5a6f145f),
- TOBN(0xdede15e7, 0x5e0dee6e), TOBN(0x74f24872, 0xdc628aa2),
- TOBN(0xd3e9c4fe, 0x7861bb93), TOBN(0x56d4822a, 0x6187b2e0),
- TOBN(0xb66417cf, 0xc59826f9), TOBN(0xca260969, 0x2408169e),
- TOBN(0xedf69d06, 0xc79ef885), TOBN(0x00031f8a, 0xdc7d138f),
- TOBN(0x103c46e6, 0x0ebcf726), TOBN(0x4482b831, 0x6231470e),
- TOBN(0x6f6dfaca, 0x487c2109), TOBN(0x2e0ace97, 0x62e666ef),
- TOBN(0x3246a9d3, 0x1f8d1f42), TOBN(0x1b1e83f1, 0x574944d2),
- TOBN(0x13dfa63a, 0xa57f334b), TOBN(0x0cf8daed, 0x9f025d81),
- TOBN(0x30d78ea8, 0x00ee11c1), TOBN(0xeb053cd4, 0xb5e3dd75),
- TOBN(0x9b65b13e, 0xd58c43c5), TOBN(0xc3ad49bd, 0xbd151663),
- TOBN(0x99fd8e41, 0xb6427990), TOBN(0x12cf15bd, 0x707eae1e),
- TOBN(0x29ad4f1b, 0x1aabb71e), TOBN(0x5143e74d, 0x07545d0e),
- TOBN(0x30266336, 0xc88bdee1), TOBN(0x25f29306, 0x5876767c),
- TOBN(0x9c078571, 0xc6731996), TOBN(0xc88690b2, 0xed552951),
- TOBN(0x274f2c2d, 0x852705b4), TOBN(0xb0bf8d44, 0x4e09552d),
- TOBN(0x7628beeb, 0x986575d1), TOBN(0x407be238, 0x7f864651),
- TOBN(0x0e5e3049, 0xa639fc6b), TOBN(0xe75c35d9, 0x86003625),
- TOBN(0x0cf35bd8, 0x5dcc1646), TOBN(0x8bcaced2, 0x6c26273a),
- TOBN(0xe22ecf1d, 0xb5536742), TOBN(0x013dd897, 0x1a9e068b),
- TOBN(0x17f411cb, 0x8a7909c5), TOBN(0x5757ac98, 0x861dd506),
- TOBN(0x85de1f0d, 0x1e935abb), TOBN(0xdefd10b4, 0x154de37a),
- TOBN(0xb8d9e392, 0x369cebb5), TOBN(0x54d5ef9b, 0x761324be),
- TOBN(0x4d6341ba, 0x74f17e26), TOBN(0xc0a0e3c8, 0x78c1dde4),
- TOBN(0xa6d77581, 0x87d918fd), TOBN(0x66876015, 0x02ca3a13),
- TOBN(0xc7313e9c, 0xf36658f0), TOBN(0xc433ef1c, 0x71f8057e),
- TOBN(0x85326246, 0x1b6a835a), TOBN(0xc8f05398, 0x7c86394c),
- TOBN(0xff398cdf, 0xe983c4a1), TOBN(0xbf5e8162, 0x03b7b931),
- TOBN(0x93193c46, 0xb7b9045b), TOBN(0x1e4ebf5d, 0xa4a6e46b),
- TOBN(0xf9942a60, 0x43a24fe7), TOBN(0x29c1191e, 0xffb3492b),
- TOBN(0x9f662449, 0x902fde05), TOBN(0xc792a7ac, 0x6713c32d),
- TOBN(0x2fd88ad8, 0xb737982c), TOBN(0x7e3a0319, 0xa21e60e3),
- TOBN(0x09b0de44, 0x7383591a), TOBN(0x6df141ee, 0x8310a456),
- TOBN(0xaec1a039, 0xe6d6f471), TOBN(0x14b2ba0f, 0x1198d12e),
- TOBN(0xebc1a160, 0x3aeee5ac), TOBN(0x401f4836, 0xe0b964ce),
- TOBN(0x2ee43796, 0x4fd03f66), TOBN(0x3fdb4e49, 0xdd8f3f12),
- TOBN(0x6ef267f6, 0x29380f18), TOBN(0x3e8e9670, 0x8da64d16),
- TOBN(0xbc19180c, 0x207674f1), TOBN(0x112e09a7, 0x33ae8fdb),
- TOBN(0x99667554, 0x6aaeb71e), TOBN(0x79432af1, 0xe101b1c7),
- TOBN(0xd5eb558f, 0xde2ddec6), TOBN(0x81392d1f, 0x5357753f),
- TOBN(0xa7a76b97, 0x3ae1158a), TOBN(0x416fbbff, 0x4a899991),
- TOBN(0x9e65fdfd, 0x0d4a9dcf), TOBN(0x7bc29e48, 0x944ddf12),
- TOBN(0xbc1a92d9, 0x3c856866), TOBN(0x273c6905, 0x6e98dfe2),
- TOBN(0x69fce418, 0xcdfaa6b8), TOBN(0x606bd823, 0x5061c69f),
- TOBN(0x42d495a0, 0x6af75e27), TOBN(0x8ed3d505, 0x6d873a1f),
- TOBN(0xaf552841, 0x6ab25b6a), TOBN(0xc6c0ffc7, 0x2b1a4523),
- TOBN(0xab18827b, 0x21c99e03), TOBN(0x060e8648, 0x9034691b),
- TOBN(0x5207f90f, 0x93c7f398), TOBN(0x9f4a96cb, 0x82f8d10b),
- TOBN(0xdd71cd79, 0x3ad0f9e3), TOBN(0x84f435d2, 0xfc3a54f5),
- TOBN(0x4b03c55b, 0x8e33787f), TOBN(0xef42f975, 0xa6384673),
- TOBN(0xff7304f7, 0x5051b9f0), TOBN(0x18aca1dc, 0x741c87c2),
- TOBN(0x56f120a7, 0x2d4bfe80), TOBN(0xfd823b3d, 0x053e732c),
- TOBN(0x11bccfe4, 0x7537ca16), TOBN(0xdf6c9c74, 0x1b5a996b),
- TOBN(0xee7332c7, 0x904fc3fa), TOBN(0x14a23f45, 0xc7e3636a),
- TOBN(0xc38659c3, 0xf091d9aa), TOBN(0x4a995e5d, 0xb12d8540),
- TOBN(0x20a53bec, 0xf3a5598a), TOBN(0x56534b17, 0xb1eaa995),
- TOBN(0x9ed3dca4, 0xbf04e03c), TOBN(0x716c563a, 0xd8d56268),
- TOBN(0x27ba77a4, 0x1d6178e7), TOBN(0xe4c80c40, 0x68a1ff8e),
- TOBN(0x75011099, 0x0a13f63d), TOBN(0x7bf33521, 0xa61d46f3),
- TOBN(0x0aff218e, 0x10b365bb), TOBN(0x81021804, 0x0fd7ea75),
- TOBN(0x05a3fd8a, 0xa4b3a925), TOBN(0xb829e75f, 0x9b3db4e6),
- TOBN(0x6bdc75a5, 0x4d53e5fb), TOBN(0x04a5dc02, 0xd52717e3),
- TOBN(0x86af502f, 0xe9a42ec2), TOBN(0x8867e8fb, 0x2630e382),
- TOBN(0xbf845c6e, 0xbec9889b), TOBN(0x54f491f2, 0xcb47c98d),
- TOBN(0xa3091fba, 0x790c2a12), TOBN(0xd7f6fd78, 0xc20f708b),
- TOBN(0xa569ac30, 0xacde5e17), TOBN(0xd0f996d0, 0x6852b4d7),
- TOBN(0xe51d4bb5, 0x4609ae54), TOBN(0x3fa37d17, 0x0daed061),
- TOBN(0x62a88684, 0x34b8fb41), TOBN(0x99a2acbd, 0x9efb64f1),
- TOBN(0xb75c1a5e, 0x6448e1f2), TOBN(0xfa99951a, 0x42b5a069),
- TOBN(0x6d956e89, 0x2f3b26e7), TOBN(0xf4709860, 0xda875247),
- TOBN(0x3ad15179, 0x2482dda3), TOBN(0xd64110e3, 0x017d82f0),
- TOBN(0x14928d2c, 0xfad414e4), TOBN(0x2b155f58, 0x2ed02b24),
- TOBN(0x481a141b, 0xcb821bf1), TOBN(0x12e3c770, 0x4f81f5da),
- TOBN(0xe49c5de5, 0x9fff8381), TOBN(0x11053232, 0x5bbec894),
- TOBN(0xa0d051cc, 0x454d88c4), TOBN(0x4f6db89c, 0x1f8e531b),
- TOBN(0x34fe3fd6, 0xca563a44), TOBN(0x7f5c2215, 0x58da8ab9),
- TOBN(0x8445016d, 0x9474f0a1), TOBN(0x17d34d61, 0xcb7d8a0a),
- TOBN(0x8e9d3910, 0x1c474019), TOBN(0xcaff2629, 0xd52ceefb),
- TOBN(0xf9cf3e32, 0xc1622c2b), TOBN(0xd4b95e3c, 0xe9071a05),
- TOBN(0xfbbca61f, 0x1594438c), TOBN(0x1eb6e6a6, 0x04aadedf),
- TOBN(0x853027f4, 0x68e14940), TOBN(0x221d322a, 0xdfabda9c),
- TOBN(0xed8ea9f6, 0xb7cb179a), TOBN(0xdc7b764d, 0xb7934dcc),
- TOBN(0xfcb13940, 0x5e09180d), TOBN(0x6629a6bf, 0xb47dc2dd),
- TOBN(0xbfc55e4e, 0x9f5a915e), TOBN(0xb1db9d37, 0x6204441e),
- TOBN(0xf82d68cf, 0x930c5f53), TOBN(0x17d3a142, 0xcbb605b1),
- TOBN(0xdd5944ea, 0x308780f2), TOBN(0xdc8de761, 0x3845f5e4),
- TOBN(0x6beaba7d, 0x7624d7a3), TOBN(0x1e709afd, 0x304df11e),
- TOBN(0x95364376, 0x02170456), TOBN(0xbf204b3a, 0xc8f94b64),
- TOBN(0x4e53af7c, 0x5680ca68), TOBN(0x0526074a, 0xe0c67574),
- TOBN(0x95d8cef8, 0xecd92af6), TOBN(0xe6b9fa7a, 0x6cd1745a),
- TOBN(0x3d546d3d, 0xa325c3e4), TOBN(0x1f57691d, 0x9ae93aae),
- TOBN(0xe891f3fe, 0x9d2e1a33), TOBN(0xd430093f, 0xac063d35),
- TOBN(0xeda59b12, 0x5513a327), TOBN(0xdc2134f3, 0x5536f18f),
- TOBN(0xaa51fe2c, 0x5c210286), TOBN(0x3f68aaee, 0x1cab658c),
- TOBN(0x5a23a00b, 0xf9357292), TOBN(0x9a626f39, 0x7efdabed),
- TOBN(0xfe2b3bf3, 0x199d78e3), TOBN(0xb7a2af77, 0x71bbc345),
- TOBN(0x3d19827a, 0x1e59802c), TOBN(0x823bbc15, 0xb487a51c),
- TOBN(0x856139f2, 0x99d0a422), TOBN(0x9ac3df65, 0xf456c6fb),
- TOBN(0xaddf65c6, 0x701f8bd6), TOBN(0x149f321e, 0x3758df87),
- TOBN(0xb1ecf714, 0x721b7eba), TOBN(0xe17df098, 0x31a3312a),
- TOBN(0xdb2fd6ec, 0xd5c4d581), TOBN(0xfd02996f, 0x8fcea1b3),
- TOBN(0xe29fa63e, 0x7882f14f), TOBN(0xc9f6dc35, 0x07c6cadc),
- TOBN(0x46f22d6f, 0xb882bed0), TOBN(0x1a45755b, 0xd118e52c),
- TOBN(0x9f2c7c27, 0x7c4608cf), TOBN(0x7ccbdf32, 0x568012c2),
- TOBN(0xfcb0aedd, 0x61729b0e), TOBN(0x7ca2ca9e, 0xf7d75dbf),
- TOBN(0xf58fecb1, 0x6f640f62), TOBN(0xe274b92b, 0x39f51946),
- TOBN(0x7f4dfc04, 0x6288af44), TOBN(0x0a91f32a, 0xeac329e5),
- TOBN(0x43ad274b, 0xd6aaba31), TOBN(0x719a1640, 0x0f6884f9),
- TOBN(0x685d29f6, 0xdaf91e20), TOBN(0x5ec1cc33, 0x27e49d52),
- TOBN(0x38f4de96, 0x3b54a059), TOBN(0x0e0015e5, 0xefbcfdb3),
- TOBN(0x177d23d9, 0x4dbb8da6), TOBN(0x98724aa2, 0x97a617ad),
- TOBN(0x30f0885b, 0xfdb6558e), TOBN(0xf9f7a28a, 0xc7899a96),
- TOBN(0xd2ae8ac8, 0x872dc112), TOBN(0xfa0642ca, 0x73c3c459),
- TOBN(0x15296981, 0xe7dfc8d6), TOBN(0x67cd4450, 0x1fb5b94a),
- TOBN(0x0ec71cf1, 0x0eddfd37), TOBN(0xc7e5eeb3, 0x9a8eddc7),
- TOBN(0x02ac8e3d, 0x81d95028), TOBN(0x0088f172, 0x70b0e35d),
- TOBN(0xec041fab, 0xe1881fe3), TOBN(0x62cf71b8, 0xd99e7faa),
- TOBN(0x5043dea7, 0xe0f222c2), TOBN(0x309d42ac, 0x72e65142),
- TOBN(0x94fe9ddd, 0x9216cd30), TOBN(0xd6539c7d, 0x0f87feec),
- TOBN(0x03c5a57c, 0x432ac7d7), TOBN(0x72692cf0, 0x327fda10),
- TOBN(0xec28c85f, 0x280698de), TOBN(0x2331fb46, 0x7ec283b1),
- TOBN(0xd34bfa32, 0x2867e633), TOBN(0x78709a82, 0x0a9cc815),
- TOBN(0xb7fe6964, 0x875e2fa5), TOBN(0x25cc064f, 0x9e98bfb5),
- TOBN(0x9eb0151c, 0x493a65c5), TOBN(0x5fb5d941, 0x53182464),
- TOBN(0x69e6f130, 0xf04618e2), TOBN(0xa8ecec22, 0xf89c8ab6),
- TOBN(0xcd6ac88b, 0xb96209bd), TOBN(0x65fa8cdb, 0xb3e1c9e0),
- TOBN(0xa47d22f5, 0x4a8d8eac), TOBN(0x83895cdf, 0x8d33f963),
- TOBN(0xa8adca59, 0xb56cd3d1), TOBN(0x10c8350b, 0xdaf38232),
- TOBN(0x2b161fb3, 0xa5080a9f), TOBN(0xbe7f5c64, 0x3af65b3a),
- TOBN(0x2c754039, 0x97403a11), TOBN(0x94626cf7, 0x121b96af),
- TOBN(0x431de7c4, 0x6a983ec2), TOBN(0x3780dd3a, 0x52cc3df7),
- TOBN(0xe28a0e46, 0x2baf8e3b), TOBN(0xabe68aad, 0x51d299ae),
- TOBN(0x603eb8f9, 0x647a2408), TOBN(0x14c61ed6, 0x5c750981),
- TOBN(0x88b34414, 0xc53352e7), TOBN(0x5a34889c, 0x1337d46e),
- TOBN(0x612c1560, 0xf95f2bc8), TOBN(0x8a3f8441, 0xd4807a3a),
- TOBN(0x680d9e97, 0x5224da68), TOBN(0x60cd6e88, 0xc3eb00e9),
- TOBN(0x3875a98e, 0x9a6bc375), TOBN(0xdc80f924, 0x4fd554c2),
- TOBN(0x6c4b3415, 0x6ac77407), TOBN(0xa1e5ea8f, 0x25420681),
- TOBN(0x541bfa14, 0x4607a458), TOBN(0x5dbc7e7a, 0x96d7fbf9),
- TOBN(0x646a851b, 0x31590a47), TOBN(0x039e85ba, 0x15ee6df8),
- TOBN(0xd19fa231, 0xd7b43fc0), TOBN(0x84bc8be8, 0x299a0e04),
- TOBN(0x2b9d2936, 0xf20df03a), TOBN(0x24054382, 0x8608d472),
- TOBN(0x76b6ba04, 0x9149202a), TOBN(0xb21c3831, 0x3670e7b7),
- TOBN(0xddd93059, 0xd6fdee10), TOBN(0x9da47ad3, 0x78488e71),
- TOBN(0x99cc1dfd, 0xa0fcfb25), TOBN(0x42abde10, 0x64696954),
- TOBN(0x14cc15fc, 0x17eab9fe), TOBN(0xd6e863e4, 0xd3e70972),
- TOBN(0x29a7765c, 0x6432112c), TOBN(0x88660001, 0x5b0774d8),
- TOBN(0x3729175a, 0x2c088eae), TOBN(0x13afbcae, 0x8230b8d4),
- TOBN(0x44768151, 0x915f4379), TOBN(0xf086431a, 0xd8d22812),
- TOBN(0x37461955, 0xc298b974), TOBN(0x905fb5f0, 0xf8711e04),
- TOBN(0x787abf3a, 0xfe969d18), TOBN(0x392167c2, 0x6f6a494e),
- TOBN(0xfc7a0d2d, 0x28c511da), TOBN(0xf127c7dc, 0xb66a262d),
- TOBN(0xf9c4bb95, 0xfd63fdf0), TOBN(0x90016589, 0x3913ef46),
- TOBN(0x74d2a73c, 0x11aa600d), TOBN(0x2f5379bd, 0x9fb5ab52),
- TOBN(0xe49e53a4, 0x7fb70068), TOBN(0x68dd39e5, 0x404aa9a7),
- TOBN(0xb9b0cf57, 0x2ecaa9c3), TOBN(0xba0e103b, 0xe824826b),
- TOBN(0x60c2198b, 0x4631a3c4), TOBN(0xc5ff84ab, 0xfa8966a2),
- TOBN(0x2d6ebe22, 0xac95aff8), TOBN(0x1c9bb6db, 0xb5a46d09),
- TOBN(0x419062da, 0x53ee4f8d), TOBN(0x7b9042d0, 0xbb97efef),
- TOBN(0x0f87f080, 0x830cf6bd), TOBN(0x4861d19a, 0x6ec8a6c6),
- TOBN(0xd3a0daa1, 0x202f01aa), TOBN(0xb0111674, 0xf25afbd5),
- TOBN(0x6d00d6cf, 0x1afb20d9), TOBN(0x13695000, 0x40671bc5),
- TOBN(0x913ab0dc, 0x2485ea9b), TOBN(0x1f2bed06, 0x9eef61ac),
- TOBN(0x850c8217, 0x6d799e20), TOBN(0x93415f37, 0x3271c2de),
- TOBN(0x5afb06e9, 0x6c4f5910), TOBN(0x688a52df, 0xc4e9e421),
- TOBN(0x30495ba3, 0xe2a9a6db), TOBN(0x4601303d, 0x58f9268b),
- TOBN(0xbe3b0dad, 0x7eb0f04f), TOBN(0x4ea47250, 0x4456936d),
- TOBN(0x8caf8798, 0xd33fd3e7), TOBN(0x1ccd8a89, 0xeb433708),
- TOBN(0x9effe3e8, 0x87fd50ad), TOBN(0xbe240a56, 0x6b29c4df),
- TOBN(0xec4ffd98, 0xca0e7ebd), TOBN(0xf586783a, 0xe748616e),
- TOBN(0xa5b00d8f, 0xc77baa99), TOBN(0x0acada29, 0xb4f34c9c),
- TOBN(0x36dad67d, 0x0fe723ac), TOBN(0x1d8e53a5, 0x39c36c1e),
- TOBN(0xe4dd342d, 0x1f4bea41), TOBN(0x64fd5e35, 0xebc9e4e0),
- TOBN(0x96f01f90, 0x57908805), TOBN(0xb5b9ea3d, 0x5ed480dd),
- TOBN(0x366c5dc2, 0x3efd2dd0), TOBN(0xed2fe305, 0x6e9dfa27),
- TOBN(0x4575e892, 0x6e9197e2), TOBN(0x11719c09, 0xab502a5d),
- TOBN(0x264c7bec, 0xe81f213f), TOBN(0x741b9241, 0x55f5c457),
- TOBN(0x78ac7b68, 0x49a5f4f4), TOBN(0xf91d70a2, 0x9fc45b7d),
- TOBN(0x39b05544, 0xb0f5f355), TOBN(0x11f06bce, 0xeef930d9),
- TOBN(0xdb84d25d, 0x038d05e1), TOBN(0x04838ee5, 0xbacc1d51),
- TOBN(0x9da3ce86, 0x9e8ee00b), TOBN(0xc3412057, 0xc36eda1f),
- TOBN(0xae80b913, 0x64d9c2f4), TOBN(0x7468bac3, 0xa010a8ff),
- TOBN(0xdfd20037, 0x37359d41), TOBN(0x1a0f5ab8, 0x15efeacc),
- TOBN(0x7c25ad2f, 0x659d0ce0), TOBN(0x4011bcbb, 0x6785cff1),
- TOBN(0x128b9912, 0x7e2192c7), TOBN(0xa549d8e1, 0x13ccb0e8),
- TOBN(0x805588d8, 0xc85438b1), TOBN(0x5680332d, 0xbc25cb27),
- TOBN(0xdcd1bc96, 0x1a4bfdf4), TOBN(0x779ff428, 0x706f6566),
- TOBN(0x8bbee998, 0xf059987a), TOBN(0xf6ce8cf2, 0xcc686de7),
- TOBN(0xf8ad3c4a, 0x953cfdb2), TOBN(0xd1d426d9, 0x2205da36),
- TOBN(0xb3c0f13f, 0xc781a241), TOBN(0x3e89360e, 0xd75362a8),
- TOBN(0xccd05863, 0xc8a91184), TOBN(0x9bd0c9b7, 0xefa8a7f4),
- TOBN(0x97ee4d53, 0x8a912a4b), TOBN(0xde5e15f8, 0xbcf518fd),
- TOBN(0x6a055bf8, 0xc467e1e0), TOBN(0x10be4b4b, 0x1587e256),
- TOBN(0xd90c14f2, 0x668621c9), TOBN(0xd5518f51, 0xab9c92c1),
- TOBN(0x8e6a0100, 0xd6d47b3c), TOBN(0xcbe980dd, 0x66716175),
- TOBN(0x500d3f10, 0xddd83683), TOBN(0x3b6cb35d, 0x99cac73c),
- TOBN(0x53730c8b, 0x6083d550), TOBN(0xcf159767, 0xdf0a1987),
- TOBN(0x84bfcf53, 0x43ad73b3), TOBN(0x1b528c20, 0x4f035a94),
- TOBN(0x4294edf7, 0x33eeac69), TOBN(0xb6283e83, 0x817f3240),
- TOBN(0xc3fdc959, 0x0a5f25b1), TOBN(0xefaf8aa5, 0x5844ee22),
- TOBN(0xde269ba5, 0xdbdde4de), TOBN(0xe3347160, 0xc56133bf),
- TOBN(0xc1184219, 0x8d9ea9f8), TOBN(0x090de5db, 0xf3fc1ab5),
- TOBN(0x404c37b1, 0x0bf22cda), TOBN(0x7de20ec8, 0xf5618894),
- TOBN(0x754c588e, 0xecdaecab), TOBN(0x6ca4b0ed, 0x88342743),
- TOBN(0x76f08bdd, 0xf4a938ec), TOBN(0xd182de89, 0x91493ccb),
- TOBN(0xd652c53e, 0xc8a4186a), TOBN(0xb3e878db, 0x946d8e33),
- TOBN(0x088453c0, 0x5f37663c), TOBN(0x5cd9daaa, 0xb407748b),
- TOBN(0xa1f5197f, 0x586d5e72), TOBN(0x47500be8, 0xc443ca59),
- TOBN(0x78ef35b2, 0xe2652424), TOBN(0x09c5d26f, 0x6dd7767d),
- TOBN(0x7175a79a, 0xa74d3f7b), TOBN(0x0428fd8d, 0xcf5ea459),
- TOBN(0x511cb97c, 0xa5d1746d), TOBN(0x36363939, 0xe71d1278),
- TOBN(0xcf2df955, 0x10350bf4), TOBN(0xb3817439, 0x60aae782),
- TOBN(0xa748c0e4, 0x3e688809), TOBN(0x98021fbf, 0xd7a5a006),
- TOBN(0x9076a70c, 0x0e367a98), TOBN(0xbea1bc15, 0x0f62b7c2),
- TOBN(0x2645a68c, 0x30fe0343), TOBN(0xacaffa78, 0x699dc14f),
- TOBN(0xf4469964, 0x457bf9c4), TOBN(0x0db6407b, 0x0d2ead83),
- TOBN(0x68d56cad, 0xb2c6f3eb), TOBN(0x3b512e73, 0xf376356c),
- TOBN(0xe43b0e1f, 0xfce10408), TOBN(0x89ddc003, 0x5a5e257d),
- TOBN(0xb0ae0d12, 0x0362e5b3), TOBN(0x07f983c7, 0xb0519161),
- TOBN(0xc2e94d15, 0x5d5231e7), TOBN(0xcff22aed, 0x0b4f9513),
- TOBN(0xb02588dd, 0x6ad0b0b5), TOBN(0xb967d1ac, 0x11d0dcd5),
- TOBN(0x8dac6bc6, 0xcf777b6c), TOBN(0x0062bdbd, 0x4c6d1959),
- TOBN(0x53da71b5, 0x0ef5cc85), TOBN(0x07012c7d, 0x4006f14f),
- TOBN(0x4617f962, 0xac47800d), TOBN(0x53365f2b, 0xc102ed75),
- TOBN(0xb422efcb, 0x4ab8c9d3), TOBN(0x195cb26b, 0x34af31c9),
- TOBN(0x3a926e29, 0x05f2c4ce), TOBN(0xbd2bdecb, 0x9856966c),
- TOBN(0x5d16ab3a, 0x85527015), TOBN(0x9f81609e, 0x4486c231),
- TOBN(0xd8b96b2c, 0xda350002), TOBN(0xbd054690, 0xfa1b7d36),
- TOBN(0xdc90ebf5, 0xe71d79bc), TOBN(0xf241b6f9, 0x08964e4e),
- TOBN(0x7c838643, 0x2fe3cd4c), TOBN(0xe0f33acb, 0xb4bc633c),
- TOBN(0xb4a9ecec, 0x3d139f1f), TOBN(0x05ce69cd, 0xdc4a1f49),
- TOBN(0xa19d1b16, 0xf5f98aaf), TOBN(0x45bb71d6, 0x6f23e0ef),
- TOBN(0x33789fcd, 0x46cdfdd3), TOBN(0x9b8e2978, 0xcee040ca),
- TOBN(0x9c69b246, 0xae0a6828), TOBN(0xba533d24, 0x7078d5aa),
- TOBN(0x7a2e42c0, 0x7bb4fbdb), TOBN(0xcfb4879a, 0x7035385c),
- TOBN(0x8c3dd30b, 0x3281705b), TOBN(0x7e361c6c, 0x404fe081),
- TOBN(0x7b21649c, 0x3f604edf), TOBN(0x5dbf6a3f, 0xe52ffe47),
- TOBN(0xc41b7c23, 0x4b54d9bf), TOBN(0x1374e681, 0x3511c3d9),
- TOBN(0x1863bf16, 0xc1b2b758), TOBN(0x90e78507, 0x1e9e6a96),
- TOBN(0xab4bf98d, 0x5d86f174), TOBN(0xd74e0bd3, 0x85e96fe4),
- TOBN(0x8afde39f, 0xcac5d344), TOBN(0x90946dbc, 0xbd91b847),
- TOBN(0xf5b42358, 0xfe1a838c), TOBN(0x05aae6c5, 0x620ac9d8),
- TOBN(0x8e193bd8, 0xa1ce5a0b), TOBN(0x8f710571, 0x4dabfd72),
- TOBN(0x8d8fdd48, 0x182caaac), TOBN(0x8c4aeefa, 0x040745cf),
- TOBN(0x73c6c30a, 0xf3b93e6d), TOBN(0x991241f3, 0x16f42011),
- TOBN(0xa0158eea, 0xe457a477), TOBN(0xd19857db, 0xee6ddc05),
- TOBN(0xb3265224, 0x18c41671), TOBN(0x3ffdfc7e, 0x3c2c0d58),
- TOBN(0x3a3a5254, 0x26ee7cda), TOBN(0x341b0869, 0xdf02c3a8),
- TOBN(0xa023bf42, 0x723bbfc8), TOBN(0x3d15002a, 0x14452691),}
- ,
- {TOBN(0x5ef7324c, 0x85edfa30), TOBN(0x25976554, 0x87d4f3da),
- TOBN(0x352f5bc0, 0xdcb50c86), TOBN(0x8f6927b0, 0x4832a96c),
- TOBN(0xd08ee1ba, 0x55f2f94c), TOBN(0x6a996f99, 0x344b45fa),
- TOBN(0xe133cb8d, 0xa8aa455d), TOBN(0x5d0721ec, 0x758dc1f7),
- TOBN(0x6ba7a920, 0x79e5fb67), TOBN(0xe1331feb, 0x70aa725e),
- TOBN(0x5080ccf5, 0x7df5d837), TOBN(0xe4cae01d, 0x7ff72e21),
- TOBN(0xd9243ee6, 0x0412a77d), TOBN(0x06ff7cac, 0xdf449025),
- TOBN(0xbe75f7cd, 0x23ef5a31), TOBN(0xbc957822, 0x0ddef7a8),
- TOBN(0x8cf7230c, 0xb0ce1c55), TOBN(0x5b534d05, 0x0bbfb607),
- TOBN(0xee1ef113, 0x0e16363b), TOBN(0x27e0aa7a, 0xb4999e82),
- TOBN(0xce1dac2d, 0x79362c41), TOBN(0x67920c90, 0x91bb6cb0),
- TOBN(0x1e648d63, 0x2223df24), TOBN(0x0f7d9eef, 0xe32e8f28),
- TOBN(0x6943f39a, 0xfa833834), TOBN(0x22951722, 0xa6328562),
- TOBN(0x81d63dd5, 0x4170fc10), TOBN(0x9f5fa58f, 0xaecc2e6d),
- TOBN(0xb66c8725, 0xe77d9a3b), TOBN(0x11235cea, 0x6384ebe0),
- TOBN(0x06a8c118, 0x5845e24a), TOBN(0x0137b286, 0xebd093b1),
- TOBN(0xc589e1ce, 0x44ace150), TOBN(0xe0f8d3d9, 0x4381e97c),
- TOBN(0x59e99b11, 0x62c5a4b8), TOBN(0x90d262f7, 0xfd0ec9f9),
- TOBN(0xfbc854c9, 0x283e13c9), TOBN(0x2d04fde7, 0xaedc7085),
- TOBN(0x057d7765, 0x47dcbecb), TOBN(0x8dbdf591, 0x9a76fa5f),
- TOBN(0xd0150695, 0x0de1e578), TOBN(0x2e1463e7, 0xe9f72bc6),
- TOBN(0xffa68441, 0x1b39eca5), TOBN(0x673c8530, 0x7c037f2f),
- TOBN(0xd0d6a600, 0x747f91da), TOBN(0xb08d43e1, 0xc9cb78e9),
- TOBN(0x0fc0c644, 0x27b5cef5), TOBN(0x5c1d160a, 0xa60a2fd6),
- TOBN(0xf98cae53, 0x28c8e13b), TOBN(0x375f10c4, 0xb2eddcd1),
- TOBN(0xd4eb8b7f, 0x5cce06ad), TOBN(0xb4669f45, 0x80a2e1ef),
- TOBN(0xd593f9d0, 0x5bbd8699), TOBN(0x5528a4c9, 0xe7976d13),
- TOBN(0x3923e095, 0x1c7e28d3), TOBN(0xb9293790, 0x3f6bb577),
- TOBN(0xdb567d6a, 0xc42bd6d2), TOBN(0x6df86468, 0xbb1f96ae),
- TOBN(0x0efe5b1a, 0x4843b28e), TOBN(0x961bbb05, 0x6379b240),
- TOBN(0xb6caf5f0, 0x70a6a26b), TOBN(0x70686c0d, 0x328e6e39),
- TOBN(0x80da06cf, 0x895fc8d3), TOBN(0x804d8810, 0xb363fdc9),
- TOBN(0xbe22877b, 0x207f1670), TOBN(0x9b0dd188, 0x4e615291),
- TOBN(0x625ae8dc, 0x97a3c2bf), TOBN(0x08584ef7, 0x439b86e8),
- TOBN(0xde7190a5, 0xdcd898ff), TOBN(0x26286c40, 0x2058ee3d),
- TOBN(0x3db0b217, 0x5f87b1c1), TOBN(0xcc334771, 0x102a6db5),
- TOBN(0xd99de954, 0x2f770fb1), TOBN(0x97c1c620, 0x4cd7535e),
- TOBN(0xd3b6c448, 0x3f09cefc), TOBN(0xd725af15, 0x5a63b4f8),
- TOBN(0x0c95d24f, 0xc01e20ec), TOBN(0xdfd37494, 0x9ae7121f),
- TOBN(0x7d6ddb72, 0xec77b7ec), TOBN(0xfe079d3b, 0x0353a4ae),
- TOBN(0x3066e70a, 0x2e6ac8d2), TOBN(0x9c6b5a43, 0x106e5c05),
- TOBN(0x52d3c6f5, 0xede59b8c), TOBN(0x30d6a5c3, 0xfccec9ae),
- TOBN(0xedec7c22, 0x4fc0a9ef), TOBN(0x190ff083, 0x95c16ced),
- TOBN(0xbe12ec8f, 0x94de0fde), TOBN(0x0d131ab8, 0x852d3433),
- TOBN(0x42ace07e, 0x85701291), TOBN(0x94793ed9, 0x194061a8),
- TOBN(0x30e83ed6, 0xd7f4a485), TOBN(0x9eec7269, 0xf9eeff4d),
- TOBN(0x90acba59, 0x0c9d8005), TOBN(0x5feca458, 0x1e79b9d1),
- TOBN(0x8fbe5427, 0x1d506a1e), TOBN(0xa32b2c8e, 0x2439cfa7),
- TOBN(0x1671c173, 0x73dd0b4e), TOBN(0x37a28214, 0x44a054c6),
- TOBN(0x81760a1b, 0x4e8b53f1), TOBN(0xa6c04224, 0xf9f93b9e),
- TOBN(0x18784b34, 0xcf671e3c), TOBN(0x81bbecd2, 0xcda9b994),
- TOBN(0x38831979, 0xb2ab3848), TOBN(0xef54feb7, 0xf2e03c2d),
- TOBN(0xcf197ca7, 0xfb8088fa), TOBN(0x01427247, 0x4ddc96c5),
- TOBN(0xa2d2550a, 0x30777176), TOBN(0x53469898, 0x4d0cf71d),
- TOBN(0x6ce937b8, 0x3a2aaac6), TOBN(0xe9f91dc3, 0x5af38d9b),
- TOBN(0x2598ad83, 0xc8bf2899), TOBN(0x8e706ac9, 0xb5536c16),
- TOBN(0x40dc7495, 0xf688dc98), TOBN(0x26490cd7, 0x124c4afc),
- TOBN(0xe651ec84, 0x1f18775c), TOBN(0x393ea6c3, 0xb4fdaf4a),
- TOBN(0x1e1f3343, 0x7f338e0d), TOBN(0x39fb832b, 0x6053e7b5),
- TOBN(0x46e702da, 0x619e14d5), TOBN(0x859cacd1, 0xcdeef6e0),
- TOBN(0x63b99ce7, 0x4462007d), TOBN(0xb8ab48a5, 0x4cb5f5b7),
- TOBN(0x9ec673d2, 0xf55edde7), TOBN(0xd1567f74, 0x8cfaefda),
- TOBN(0x46381b6b, 0x0887bcec), TOBN(0x694497ce, 0xe178f3c2),
- TOBN(0x5e6525e3, 0x1e6266cb), TOBN(0x5931de26, 0x697d6413),
- TOBN(0x87f8df7c, 0x0e58d493), TOBN(0xb1ae5ed0, 0x58b73f12),
- TOBN(0xc368f784, 0xdea0c34d), TOBN(0x9bd0a120, 0x859a91a0),
- TOBN(0xb00d88b7, 0xcc863c68), TOBN(0x3a1cc11e, 0x3d1f4d65),
- TOBN(0xea38e0e7, 0x0aa85593), TOBN(0x37f13e98, 0x7dc4aee8),
- TOBN(0x10d38667, 0xbc947bad), TOBN(0x738e07ce, 0x2a36ee2e),
- TOBN(0xc93470cd, 0xc577fcac), TOBN(0xdee1b616, 0x2782470d),
- TOBN(0x36a25e67, 0x2e793d12), TOBN(0xd6aa6cae, 0xe0f186da),
- TOBN(0x474d0fd9, 0x80e07af7), TOBN(0xf7cdc47d, 0xba8a5cd4),
- TOBN(0x28af6d9d, 0xab15247f), TOBN(0x7c789c10, 0x493a537f),
- TOBN(0x7ac9b110, 0x23a334e7), TOBN(0x0236ac09, 0x12c9c277),
- TOBN(0xa7e5bd25, 0x1d7a5144), TOBN(0x098b9c2a, 0xf13ec4ec),
- TOBN(0x3639daca, 0xd3f0abca), TOBN(0x642da81a, 0xa23960f9),
- TOBN(0x7d2e5c05, 0x4f7269b1), TOBN(0xfcf30777, 0xe287c385),
- TOBN(0x10edc84f, 0xf2a46f21), TOBN(0x35441757, 0x4f43fa36),
- TOBN(0xf1327899, 0xfd703431), TOBN(0xa438d7a6, 0x16dd587a),
- TOBN(0x65c34c57, 0xe9c8352d), TOBN(0xa728edab, 0x5cc5a24e),
- TOBN(0xaed78abc, 0x42531689), TOBN(0x0a51a0e8, 0x010963ef),
- TOBN(0x5776fa0a, 0xd717d9b3), TOBN(0xf356c239, 0x7dd3428b),
- TOBN(0x29903fff, 0x8d3a3dac), TOBN(0x409597fa, 0x3d94491f),
- TOBN(0x4cd7a5ff, 0xbf4a56a4), TOBN(0xe5096474, 0x8adab462),
- TOBN(0xa97b5126, 0x5c3427b0), TOBN(0x6401405c, 0xd282c9bd),
- TOBN(0x3629f8d7, 0x222c5c45), TOBN(0xb1c02c16, 0xe8d50aed),
- TOBN(0xbea2ed75, 0xd9635bc9), TOBN(0x226790c7, 0x6e24552f),
- TOBN(0x3c33f2a3, 0x65f1d066), TOBN(0x2a43463e, 0x6dfccc2e),
- TOBN(0x8cc3453a, 0xdb483761), TOBN(0xe7cc6085, 0x65d5672b),
- TOBN(0x277ed6cb, 0xde3efc87), TOBN(0x19f2f368, 0x69234eaf),
- TOBN(0x9aaf4317, 0x5c0b800b), TOBN(0x1f1e7c89, 0x8b6da6e2),
- TOBN(0x6cfb4715, 0xb94ec75e), TOBN(0xd590dd5f, 0x453118c2),
- TOBN(0x14e49da1, 0x1f17a34c), TOBN(0x5420ab39, 0x235a1456),
- TOBN(0xb7637241, 0x2f50363b), TOBN(0x7b15d623, 0xc3fabb6e),
- TOBN(0xa0ef40b1, 0xe274e49c), TOBN(0x5cf50744, 0x96b1860a),
- TOBN(0xd6583fbf, 0x66afe5a4), TOBN(0x44240510, 0xf47e3e9a),
- TOBN(0x99254343, 0x11b2d595), TOBN(0xf1367499, 0xeec8df57),
- TOBN(0x3cb12c61, 0x3e73dd05), TOBN(0xd248c033, 0x7dac102a),
- TOBN(0xcf154f13, 0xa77739f5), TOBN(0xbf4288cb, 0x23d2af42),
- TOBN(0xaa64c9b6, 0x32e4a1cf), TOBN(0xee8c07a8, 0xc8a208f3),
- TOBN(0xe10d4999, 0x6fe8393f), TOBN(0x0f809a3f, 0xe91f3a32),
- TOBN(0x61096d1c, 0x802f63c8), TOBN(0x289e1462, 0x57750d3d),
- TOBN(0xed06167e, 0x9889feea), TOBN(0xd5c9c0e2, 0xe0993909),
- TOBN(0x46fca0d8, 0x56508ac6), TOBN(0x91826047, 0x4f1b8e83),
- TOBN(0x4f2c877a, 0x9a4a2751), TOBN(0x71bd0072, 0xcae6fead),
- TOBN(0x38df8dcc, 0x06aa1941), TOBN(0x5a074b4c, 0x63beeaa8),
- TOBN(0xd6d65934, 0xc1cec8ed), TOBN(0xa6ecb49e, 0xaabc03bd),
- TOBN(0xaade91c2, 0xde8a8415), TOBN(0xcfb0efdf, 0x691136e0),
- TOBN(0x11af45ee, 0x23ab3495), TOBN(0xa132df88, 0x0b77463d),
- TOBN(0x8923c15c, 0x815d06f4), TOBN(0xc3ceb3f5, 0x0d61a436),
- TOBN(0xaf52291d, 0xe88fb1da), TOBN(0xea057974, 0x1da12179),
- TOBN(0xb0d7218c, 0xd2fef720), TOBN(0x6c0899c9, 0x8e1d8845),
- TOBN(0x98157504, 0x752ddad7), TOBN(0xd60bd74f, 0xa1a68a97),
- TOBN(0x7047a3a9, 0xf658fb99), TOBN(0x1f5d86d6, 0x5f8511e4),
- TOBN(0xb8a4bc42, 0x4b5a6d88), TOBN(0x69eb2c33, 0x1abefa7d),
- TOBN(0x95bf39e8, 0x13c9c510), TOBN(0xf571960a, 0xd48aab43),
- TOBN(0x7e8cfbcf, 0x704e23c6), TOBN(0xc71b7d22, 0x28aaa65b),
- TOBN(0xa041b2bd, 0x245e3c83), TOBN(0x69b98834, 0xd21854ff),
- TOBN(0x89d227a3, 0x963bfeec), TOBN(0x99947aaa, 0xde7da7cb),
- TOBN(0x1d9ee9db, 0xee68a9b1), TOBN(0x0a08f003, 0x698ec368),
- TOBN(0xe9ea4094, 0x78ef2487), TOBN(0xc8d2d415, 0x02cfec26),
- TOBN(0xc52f9a6e, 0xb7dcf328), TOBN(0x0ed489e3, 0x85b6a937),
- TOBN(0x9b94986b, 0xbef3366e), TOBN(0x0de59c70, 0xedddddb8),
- TOBN(0xffdb748c, 0xeadddbe2), TOBN(0x9b9784bb, 0x8266ea40),
- TOBN(0x142b5502, 0x1a93507a), TOBN(0xb4cd1187, 0x8d3c06cf),
- TOBN(0xdf70e76a, 0x91ec3f40), TOBN(0x484e81ad, 0x4e7553c2),
- TOBN(0x830f87b5, 0x272e9d6e), TOBN(0xea1c93e5, 0xc6ff514a),
- TOBN(0x67cc2adc, 0xc4192a8e), TOBN(0xc77e27e2, 0x42f4535a),
- TOBN(0x9cdbab36, 0xd2b713c5), TOBN(0x86274ea0, 0xcf7b0cd3),
- TOBN(0x784680f3, 0x09af826b), TOBN(0xbfcc837a, 0x0c72dea3),
- TOBN(0xa8bdfe9d, 0xd6529b73), TOBN(0x708aa228, 0x63a88002),
- TOBN(0x6c7a9a54, 0xc91d45b9), TOBN(0xdf1a38bb, 0xfd004f56),
- TOBN(0x2e8c9a26, 0xb8bad853), TOBN(0x2d52cea3, 0x3723eae7),
- TOBN(0x054d6d81, 0x56ca2830), TOBN(0xa3317d14, 0x9a8dc411),
- TOBN(0xa08662fe, 0xfd4ddeda), TOBN(0xed2a153a, 0xb55d792b),
- TOBN(0x7035c16a, 0xbfc6e944), TOBN(0xb6bc5834, 0x00171cf3),
- TOBN(0xe27152b3, 0x83d102b6), TOBN(0xfe695a47, 0x0646b848),
- TOBN(0xa5bb09d8, 0x916e6d37), TOBN(0xb4269d64, 0x0d17015e),
- TOBN(0x8d8156a1, 0x0a1d2285), TOBN(0xfeef6c51, 0x46d26d72),
- TOBN(0x9dac57c8, 0x4c5434a7), TOBN(0x0282e5be, 0x59d39e31),
- TOBN(0xedfff181, 0x721c486d), TOBN(0x301baf10, 0xbc58824e),
- TOBN(0x8136a6aa, 0x00570031), TOBN(0x55aaf78c, 0x1cddde68),
- TOBN(0x26829371, 0x59c63952), TOBN(0x3a3bd274, 0x8bc25baf),
- TOBN(0xecdf8657, 0xb7e52dc3), TOBN(0x2dd8c087, 0xfd78e6c8),
- TOBN(0x20553274, 0xf5531461), TOBN(0x8b4a1281, 0x5d95499b),
- TOBN(0xe2c8763a, 0x1a80f9d2), TOBN(0xd1dbe32b, 0x4ddec758),
- TOBN(0xaf12210d, 0x30c34169), TOBN(0xba74a953, 0x78baa533),
- TOBN(0x3d133c6e, 0xa438f254), TOBN(0xa431531a, 0x201bef5b),
- TOBN(0x15295e22, 0xf669d7ec), TOBN(0xca374f64, 0x357fb515),
- TOBN(0x8a8406ff, 0xeaa3fdb3), TOBN(0x106ae448, 0xdf3f2da8),
- TOBN(0x8f9b0a90, 0x33c8e9a1), TOBN(0x234645e2, 0x71ad5885),
- TOBN(0x3d083224, 0x1c0aed14), TOBN(0xf10a7d3e, 0x7a942d46),
- TOBN(0x7c11deee, 0x40d5c9be), TOBN(0xb2bae7ff, 0xba84ed98),
- TOBN(0x93e97139, 0xaad58ddd), TOBN(0x3d872796, 0x3f6d1fa3),
- TOBN(0x483aca81, 0x8569ff13), TOBN(0x8b89a5fb, 0x9a600f72),
- TOBN(0x4cbc27c3, 0xc06f2b86), TOBN(0x22130713, 0x63ad9c0b),
- TOBN(0xb5358b1e, 0x48ac2840), TOBN(0x18311294, 0xecba9477),
- TOBN(0xda58f990, 0xa6946b43), TOBN(0x3098baf9, 0x9ab41819),
- TOBN(0x66c4c158, 0x4198da52), TOBN(0xab4fc17c, 0x146bfd1b),
- TOBN(0x2f0a4c3c, 0xbf36a908), TOBN(0x2ae9e34b, 0x58cf7838),
- TOBN(0xf411529e, 0x3fa11b1f), TOBN(0x21e43677, 0x974af2b4),
- TOBN(0x7c20958e, 0xc230793b), TOBN(0x710ea885, 0x16e840f3),
- TOBN(0xfc0b21fc, 0xc5dc67cf), TOBN(0x08d51647, 0x88405718),
- TOBN(0xd955c21f, 0xcfe49eb7), TOBN(0x9722a5d5, 0x56dd4a1f),
- TOBN(0xc9ef50e2, 0xc861baa5), TOBN(0xc0c21a5d, 0x9505ac3e),
- TOBN(0xaf6b9a33, 0x8b7c063f), TOBN(0xc6370339, 0x2f4779c1),
- TOBN(0x22df99c7, 0x638167c3), TOBN(0xfe6ffe76, 0x795db30c),
- TOBN(0x2b822d33, 0xa4854989), TOBN(0xfef031dd, 0x30563aa5),
- TOBN(0x16b09f82, 0xd57c667f), TOBN(0xc70312ce, 0xcc0b76f1),
- TOBN(0xbf04a9e6, 0xc9118aec), TOBN(0x82fcb419, 0x3409d133),
- TOBN(0x1a8ab385, 0xab45d44d), TOBN(0xfba07222, 0x617b83a3),
- TOBN(0xb05f50dd, 0x58e81b52), TOBN(0x1d8db553, 0x21ce5aff),
- TOBN(0x3097b8d4, 0xe344a873), TOBN(0x7d8d116d, 0xfe36d53e),
- TOBN(0x6db22f58, 0x7875e750), TOBN(0x2dc5e373, 0x43e144ea),
- TOBN(0xc05f32e6, 0xe799eb95), TOBN(0xe9e5f4df, 0x6899e6ec),
- TOBN(0xbdc3bd68, 0x1fab23d5), TOBN(0xb72b8ab7, 0x73af60e6),
- TOBN(0x8db27ae0, 0x2cecc84a), TOBN(0x600016d8, 0x7bdb871c),
- TOBN(0x42a44b13, 0xd7c46f58), TOBN(0xb8919727, 0xc3a77d39),
- TOBN(0xcfc6bbbd, 0xdafd6088), TOBN(0x1a740146, 0x6bd20d39),
- TOBN(0x8c747abd, 0x98c41072), TOBN(0x4c91e765, 0xbdf68ea1),
- TOBN(0x7c95e5ca, 0x08819a78), TOBN(0xcf48b729, 0xc9587921),
- TOBN(0x091c7c5f, 0xdebbcc7d), TOBN(0x6f287404, 0xf0e05149),
- TOBN(0xf83b5ac2, 0x26cd44ec), TOBN(0x88ae32a6, 0xcfea250e),
- TOBN(0x6ac5047a, 0x1d06ebc5), TOBN(0xc7e550b4, 0xd434f781),
- TOBN(0x61ab1cf2, 0x5c727bd2), TOBN(0x2e4badb1, 0x1cf915b0),
- TOBN(0x1b4dadec, 0xf69d3920), TOBN(0xe61b1ca6, 0xf14c1dfe),
- TOBN(0x90b479cc, 0xbd6bd51f), TOBN(0x8024e401, 0x8045ec30),
- TOBN(0xcab29ca3, 0x25ef0e62), TOBN(0x4f2e9416, 0x49e4ebc0),
- TOBN(0x45eb40ec, 0x0ccced58), TOBN(0x25cd4b9c, 0x0da44f98),
- TOBN(0x43e06458, 0x871812c6), TOBN(0x99f80d55, 0x16cef651),
- TOBN(0x571340c9, 0xce6dc153), TOBN(0x138d5117, 0xd8665521),
- TOBN(0xacdb45bc, 0x4e07014d), TOBN(0x2f34bb38, 0x84b60b91),
- TOBN(0xf44a4fd2, 0x2ae8921e), TOBN(0xb039288e, 0x892ba1e2),
- TOBN(0x9da50174, 0xb1c180b2), TOBN(0x6b70ab66, 0x1693dc87),
- TOBN(0x7e9babc9, 0xe7057481), TOBN(0x4581ddef, 0x9c80dc41),
- TOBN(0x0c890da9, 0x51294682), TOBN(0x0b5629d3, 0x3f4736e5),
- TOBN(0x2340c79e, 0xb06f5b41), TOBN(0xa42e84ce, 0x4e243469),
- TOBN(0xf9a20135, 0x045a71a9), TOBN(0xefbfb415, 0xd27b6fb6),
- TOBN(0x25ebea23, 0x9d33cd6f), TOBN(0x9caedb88, 0xaa6c0af8),
- TOBN(0x53dc7e9a, 0xd9ce6f96), TOBN(0x3897f9fd, 0x51e0b15a),
- TOBN(0xf51cb1f8, 0x8e5d788e), TOBN(0x1aec7ba8, 0xe1d490ee),
- TOBN(0x265991e0, 0xcc58cb3c), TOBN(0x9f306e8c, 0x9fc3ad31),
- TOBN(0x5fed006e, 0x5040a0ac), TOBN(0xca9d5043, 0xfb476f2e),
- TOBN(0xa19c06e8, 0xbeea7a23), TOBN(0xd2865801, 0x0edabb63),
- TOBN(0xdb92293f, 0x6967469a), TOBN(0x2894d839, 0x8d8a8ed8),
- TOBN(0x87c9e406, 0xbbc77122), TOBN(0x8671c6f1, 0x2ea3a26a),
- TOBN(0xe42df8d6, 0xd7de9853), TOBN(0x2e3ce346, 0xb1f2bcc7),
- TOBN(0xda601dfc, 0x899d50cf), TOBN(0xbfc913de, 0xfb1b598f),
- TOBN(0x81c4909f, 0xe61f7908), TOBN(0x192e304f, 0x9bbc7b29),
- TOBN(0xc3ed8738, 0xc104b338), TOBN(0xedbe9e47, 0x783f5d61),
- TOBN(0x0c06e9be, 0x2db30660), TOBN(0xda3e613f, 0xc0eb7d8e),
- TOBN(0xd8fa3e97, 0x322e096e), TOBN(0xfebd91e8, 0xd336e247),
- TOBN(0x8f13ccc4, 0xdf655a49), TOBN(0xa9e00dfc, 0x5eb20210),
- TOBN(0x84631d0f, 0xc656b6ea), TOBN(0x93a058cd, 0xd8c0d947),
- TOBN(0x6846904a, 0x67bd3448), TOBN(0x4a3d4e1a, 0xf394fd5c),
- TOBN(0xc102c1a5, 0xdb225f52), TOBN(0xe3455bba, 0xfc4f5e9a),
- TOBN(0x6b36985b, 0x4b9ad1ce), TOBN(0xa9818536, 0x5bb7f793),
- TOBN(0x6c25e1d0, 0x48b1a416), TOBN(0x1381dd53, 0x3c81bee7),
- TOBN(0xd2a30d61, 0x7a4a7620), TOBN(0xc8412926, 0x39b8944c),
- TOBN(0x3c1c6fbe, 0x7a97c33a), TOBN(0x941e541d, 0x938664e7),
- TOBN(0x417499e8, 0x4a34f239), TOBN(0x15fdb83c, 0xb90402d5),
- TOBN(0xb75f46bf, 0x433aa832), TOBN(0xb61e15af, 0x63215db1),
- TOBN(0xaabe59d4, 0xa127f89a), TOBN(0x5d541e0c, 0x07e816da),
- TOBN(0xaaba0659, 0xa618b692), TOBN(0x55327733, 0x17266026),
- TOBN(0xaf53a0fc, 0x95f57552), TOBN(0x32947650, 0x6cacb0c9),
- TOBN(0x253ff58d, 0xc821be01), TOBN(0xb0309531, 0xa06f1146),
- TOBN(0x59bbbdf5, 0x05c2e54d), TOBN(0x158f27ad, 0x26e8dd22),
- TOBN(0xcc5b7ffb, 0x397e1e53), TOBN(0xae03f65b, 0x7fc1e50d),
- TOBN(0xa9784ebd, 0x9c95f0f9), TOBN(0x5ed9deb2, 0x24640771),
- TOBN(0x31244af7, 0x035561c4), TOBN(0x87332f3a, 0x7ee857de),
- TOBN(0x09e16e9e, 0x2b9e0d88), TOBN(0x52d910f4, 0x56a06049),
- TOBN(0x507ed477, 0xa9592f48), TOBN(0x85cb917b, 0x2365d678),
- TOBN(0xf8511c93, 0x4c8998d1), TOBN(0x2186a3f1, 0x730ea58f),
- TOBN(0x50189626, 0xb2029db0), TOBN(0x9137a6d9, 0x02ceb75a),
- TOBN(0x2fe17f37, 0x748bc82c), TOBN(0x87c2e931, 0x80469f8c),
- TOBN(0x850f71cd, 0xbf891aa2), TOBN(0x0ca1b89b, 0x75ec3d8d),
- TOBN(0x516c43aa, 0x5e1cd3cd), TOBN(0x89397808, 0x9a887c28),
- TOBN(0x0059c699, 0xddea1f9f), TOBN(0x7737d6fa, 0x8e6868f7),
- TOBN(0x6d93746a, 0x60f1524b), TOBN(0x36985e55, 0xba052aa7),
- TOBN(0x41b1d322, 0xed923ea5), TOBN(0x3429759f, 0x25852a11),
- TOBN(0xbeca6ec3, 0x092e9f41), TOBN(0x3a238c66, 0x62256bbd),
- TOBN(0xd82958ea, 0x70ad487d), TOBN(0x4ac8aaf9, 0x65610d93),
- TOBN(0x3fa101b1, 0x5e4ccab0), TOBN(0x9bf430f2, 0x9de14bfb),
- TOBN(0xa10f5cc6, 0x6531899d), TOBN(0x590005fb, 0xea8ce17d),
- TOBN(0xc437912f, 0x24544cb6), TOBN(0x9987b71a, 0xd79ac2e3),
- TOBN(0x13e3d9dd, 0xc058a212), TOBN(0x00075aac, 0xd2de9606),
- TOBN(0x80ab508b, 0x6cac8369), TOBN(0x87842be7, 0xf54f6c89),
- TOBN(0xa7ad663d, 0x6bc532a4), TOBN(0x67813de7, 0x78a91bc8),
- TOBN(0x5dcb61ce, 0xc3427239), TOBN(0x5f3c7cf0, 0xc56934d9),
- TOBN(0xc079e0fb, 0xe3191591), TOBN(0xe40896bd, 0xb01aada7),
- TOBN(0x8d466791, 0x0492d25f), TOBN(0x8aeb30c9, 0xe7408276),
- TOBN(0xe9437495, 0x9287aacc), TOBN(0x23d4708d, 0x79fe03d4),
- TOBN(0x8cda9cf2, 0xd0c05199), TOBN(0x502fbc22, 0xfae78454),
- TOBN(0xc0bda9df, 0xf572a182), TOBN(0x5f9b71b8, 0x6158b372),
- TOBN(0xe0f33a59, 0x2b82dd07), TOBN(0x76302735, 0x9523032e),
- TOBN(0x7fe1a721, 0xc4505a32), TOBN(0x7b6e3e82, 0xf796409f),}
- ,
- {TOBN(0xe3417bc0, 0x35d0b34a), TOBN(0x440b386b, 0x8327c0a7),
- TOBN(0x8fb7262d, 0xac0362d1), TOBN(0x2c41114c, 0xe0cdf943),
- TOBN(0x2ba5cef1, 0xad95a0b1), TOBN(0xc09b37a8, 0x67d54362),
- TOBN(0x26d6cdd2, 0x01e486c9), TOBN(0x20477abf, 0x42ff9297),
- TOBN(0xa004dcb3, 0x292a9287), TOBN(0xddc15cf6, 0x77b092c7),
- TOBN(0x083a8464, 0x806c0605), TOBN(0x4a68df70, 0x3db997b0),
- TOBN(0x9c134e45, 0x05bf7dd0), TOBN(0xa4e63d39, 0x8ccf7f8c),
- TOBN(0xa6e6517f, 0x41b5f8af), TOBN(0xaa8b9342, 0xad7bc1cc),
- TOBN(0x126f35b5, 0x1e706ad9), TOBN(0xb99cebb4, 0xc3a9ebdf),
- TOBN(0xa75389af, 0xbf608d90), TOBN(0x76113c4f, 0xc6c89858),
- TOBN(0x80de8eb0, 0x97e2b5aa), TOBN(0x7e1022cc, 0x63b91304),
- TOBN(0x3bdab605, 0x6ccc066c), TOBN(0x33cbb144, 0xb2edf900),
- TOBN(0xc4176471, 0x7af715d2), TOBN(0xe2f7f594, 0xd0134a96),
- TOBN(0x2c1873ef, 0xa41ec956), TOBN(0xe4e7b4f6, 0x77821304),
- TOBN(0xe5c8ff97, 0x88d5374a), TOBN(0x2b915e63, 0x80823d5b),
- TOBN(0xea6bc755, 0xb2ee8fe2), TOBN(0x6657624c, 0xe7112651),
- TOBN(0x157af101, 0xdace5aca), TOBN(0xc4fdbcf2, 0x11a6a267),
- TOBN(0xdaddf340, 0xc49c8609), TOBN(0x97e49f52, 0xe9604a65),
- TOBN(0x9be8e790, 0x937e2ad5), TOBN(0x846e2508, 0x326e17f1),
- TOBN(0x3f38007a, 0x0bbbc0dc), TOBN(0xcf03603f, 0xb11e16d6),
- TOBN(0xd6f800e0, 0x7442f1d5), TOBN(0x475607d1, 0x66e0e3ab),
- TOBN(0x82807f16, 0xb7c64047), TOBN(0x8858e1e3, 0xa749883d),
- TOBN(0x5859120b, 0x8231ee10), TOBN(0x1b80e7eb, 0x638a1ece),
- TOBN(0xcb72525a, 0xc6aa73a4), TOBN(0xa7cdea3d, 0x844423ac),
- TOBN(0x5ed0c007, 0xf8ae7c38), TOBN(0x6db07a5c, 0x3d740192),
- TOBN(0xbe5e9c2a, 0x5fe36db3), TOBN(0xd5b9d57a, 0x76e95046),
- TOBN(0x54ac32e7, 0x8eba20f2), TOBN(0xef11ca8f, 0x71b9a352),
- TOBN(0x305e373e, 0xff98a658), TOBN(0xffe5a100, 0x823eb667),
- TOBN(0x57477b11, 0xe51732d2), TOBN(0xdfd6eb28, 0x2538fc0e),
- TOBN(0x5c43b0cc, 0x3b39eec5), TOBN(0x6af12778, 0xcb36cc57),
- TOBN(0x70b0852d, 0x06c425ae), TOBN(0x6df92f8c, 0x5c221b9b),
- TOBN(0x6c8d4f9e, 0xce826d9c), TOBN(0xf59aba7b, 0xb49359c3),
- TOBN(0x5c8ed8d5, 0xda64309d), TOBN(0x61a6de56, 0x91b30704),
- TOBN(0xd6b52f6a, 0x2f9b5808), TOBN(0x0eee4194, 0x98c958a7),
- TOBN(0xcddd9aab, 0x771e4caa), TOBN(0x83965dfd, 0x78bc21be),
- TOBN(0x02affce3, 0xb3b504f5), TOBN(0x30847a21, 0x561c8291),
- TOBN(0xd2eb2cf1, 0x52bfda05), TOBN(0xe0e4c4e9, 0x6197b98c),
- TOBN(0x1d35076c, 0xf8a1726f), TOBN(0x6c06085b, 0x2db11e3d),
- TOBN(0x15c0c4d7, 0x4463ba14), TOBN(0x9d292f83, 0x0030238c),
- TOBN(0x1311ee8b, 0x3727536d), TOBN(0xfeea86ef, 0xbeaedc1e),
- TOBN(0xb9d18cd3, 0x66131e2e), TOBN(0xf31d974f, 0x80fe2682),
- TOBN(0xb6e49e0f, 0xe4160289), TOBN(0x7c48ec0b, 0x08e92799),
- TOBN(0x818111d8, 0xd1989aa7), TOBN(0xb34fa0aa, 0xebf926f9),
- TOBN(0xdb5fe2f5, 0xa245474a), TOBN(0xf80a6ebb, 0x3c7ca756),
- TOBN(0xa7f96054, 0xafa05dd8), TOBN(0x26dfcf21, 0xfcaf119e),
- TOBN(0xe20ef2e3, 0x0564bb59), TOBN(0xef4dca50, 0x61cb02b8),
- TOBN(0xcda7838a, 0x65d30672), TOBN(0x8b08d534, 0xfd657e86),
- TOBN(0x4c5b4395, 0x46d595c8), TOBN(0x39b58725, 0x425cb836),
- TOBN(0x8ea61059, 0x3de9abe3), TOBN(0x40434881, 0x9cdc03be),
- TOBN(0x9b261245, 0xcfedce8c), TOBN(0x78c318b4, 0xcf5234a1),
- TOBN(0x510bcf16, 0xfde24c99), TOBN(0x2a77cb75, 0xa2c2ff5d),
- TOBN(0x9c895c2b, 0x27960fb4), TOBN(0xd30ce975, 0xb0eda42b),
- TOBN(0xfda85393, 0x1a62cc26), TOBN(0x23c69b96, 0x50c0e052),
- TOBN(0xa227df15, 0xbfc633f3), TOBN(0x2ac78848, 0x1bae7d48),
- TOBN(0x487878f9, 0x187d073d), TOBN(0x6c2be919, 0x967f807d),
- TOBN(0x765861d8, 0x336e6d8f), TOBN(0x88b8974c, 0xce528a43),
- TOBN(0x09521177, 0xff57d051), TOBN(0x2ff38037, 0xfb6a1961),
- TOBN(0xfc0aba74, 0xa3d76ad4), TOBN(0x7c764803, 0x25a7ec17),
- TOBN(0x7532d75f, 0x48879bc8), TOBN(0xea7eacc0, 0x58ce6bc1),
- TOBN(0xc82176b4, 0x8e896c16), TOBN(0x9a30e0b2, 0x2c750fed),
- TOBN(0xc37e2c2e, 0x421d3aa4), TOBN(0xf926407c, 0xe84fa840),
- TOBN(0x18abc03d, 0x1454e41c), TOBN(0x26605ecd, 0x3f7af644),
- TOBN(0x242341a6, 0xd6a5eabf), TOBN(0x1edb84f4, 0x216b668e),
- TOBN(0xd836edb8, 0x04010102), TOBN(0x5b337ce7, 0x945e1d8c),
- TOBN(0xd2075c77, 0xc055dc14), TOBN(0x2a0ffa25, 0x81d89cdf),
- TOBN(0x8ce815ea, 0x6ffdcbaf), TOBN(0xa3428878, 0xfb648867),
- TOBN(0x277699cf, 0x884655fb), TOBN(0xfa5b5bd6, 0x364d3e41),
- TOBN(0x01f680c6, 0x441e1cb7), TOBN(0x3fd61e66, 0xb70a7d67),
- TOBN(0x666ba2dc, 0xcc78cf66), TOBN(0xb3018174, 0x6fdbff77),
- TOBN(0x8d4dd0db, 0x168d4668), TOBN(0x259455d0, 0x1dab3a2a),
- TOBN(0xf58564c5, 0xcde3acec), TOBN(0x77141925, 0x13adb276),
- TOBN(0x527d725d, 0x8a303f65), TOBN(0x55deb6c9, 0xe6f38f7b),
- TOBN(0xfd5bb657, 0xb1fa70fb), TOBN(0xfa07f50f, 0xd8073a00),
- TOBN(0xf72e3aa7, 0xbca02500), TOBN(0xf68f895d, 0x9975740d),
- TOBN(0x30112060, 0x5cae2a6a), TOBN(0x01bd7218, 0x02874842),
- TOBN(0x3d423891, 0x7ce47bd3), TOBN(0xa66663c1, 0x789544f6),
- TOBN(0x864d05d7, 0x3272d838), TOBN(0xe22924f9, 0xfa6295c5),
- TOBN(0x8189593f, 0x6c2fda32), TOBN(0x330d7189, 0xb184b544),
- TOBN(0x79efa62c, 0xbde1f714), TOBN(0x35771c94, 0xe5cb1a63),
- TOBN(0x2f4826b8, 0x641c8332), TOBN(0x00a894fb, 0xc8cee854),
- TOBN(0xb4b9a39b, 0x36194d40), TOBN(0xe857a7c5, 0x77612601),
- TOBN(0xf4209dd2, 0x4ecf2f58), TOBN(0x82b9e66d, 0x5a033487),
- TOBN(0xc1e36934, 0xe4e8b9dd), TOBN(0xd2372c9d, 0xa42377d7),
- TOBN(0x51dc94c7, 0x0e3ae43b), TOBN(0x4c57761e, 0x04474f6f),
- TOBN(0xdcdacd0a, 0x1058a318), TOBN(0x369cf3f5, 0x78053a9a),
- TOBN(0xc6c3de50, 0x31c68de2), TOBN(0x4653a576, 0x3c4b6d9f),
- TOBN(0x1688dd5a, 0xaa4e5c97), TOBN(0x5be80aa1, 0xb7ab3c74),
- TOBN(0x70cefe7c, 0xbc65c283), TOBN(0x57f95f13, 0x06867091),
- TOBN(0xa39114e2, 0x4415503b), TOBN(0xc08ff7c6, 0x4cbb17e9),
- TOBN(0x1eff674d, 0xd7dec966), TOBN(0x6d4690af, 0x53376f63),
- TOBN(0xff6fe32e, 0xea74237b), TOBN(0xc436d17e, 0xcd57508e),
- TOBN(0x15aa28e1, 0xedcc40fe), TOBN(0x0d769c04, 0x581bbb44),
- TOBN(0xc240b6de, 0x34eaacda), TOBN(0xd9e116e8, 0x2ba0f1de),
- TOBN(0xcbe45ec7, 0x79438e55), TOBN(0x91787c9d, 0x96f752d7),
- TOBN(0x897f532b, 0xf129ac2f), TOBN(0xd307b7c8, 0x5a36e22c),
- TOBN(0x91940675, 0x749fb8f3), TOBN(0xd14f95d0, 0x157fdb28),
- TOBN(0xfe51d029, 0x6ae55043), TOBN(0x8931e98f, 0x44a87de1),
- TOBN(0xe57f1cc6, 0x09e4fee2), TOBN(0x0d063b67, 0x4e072d92),
- TOBN(0x70a998b9, 0xed0e4316), TOBN(0xe74a736b, 0x306aca46),
- TOBN(0xecf0fbf2, 0x4fda97c7), TOBN(0xa40f65cb, 0x3e178d93),
- TOBN(0x16253604, 0x16df4285), TOBN(0xb0c9babb, 0xd0c56ae2),
- TOBN(0x73032b19, 0xcfc5cfc3), TOBN(0xe497e5c3, 0x09752056),
- TOBN(0x12096bb4, 0x164bda96), TOBN(0x1ee42419, 0xa0b74da1),
- TOBN(0x8fc36243, 0x403826ba), TOBN(0x0c8f0069, 0xdc09e660),
- TOBN(0x8667e981, 0xc27253c9), TOBN(0x05a6aefb, 0x92b36a45),
- TOBN(0xa62c4b36, 0x9cb7bb46), TOBN(0x8394f375, 0x11f7027b),
- TOBN(0x747bc79c, 0x5f109d0f), TOBN(0xcad88a76, 0x5b8cc60a),
- TOBN(0x80c5a66b, 0x58f09e68), TOBN(0xe753d451, 0xf6127eac),
- TOBN(0xc44b74a1, 0x5b0ec6f5), TOBN(0x47989fe4, 0x5289b2b8),
- TOBN(0x745f8484, 0x58d6fc73), TOBN(0xec362a6f, 0xf61c70ab),
- TOBN(0x070c98a7, 0xb3a8ad41), TOBN(0x73a20fc0, 0x7b63db51),
- TOBN(0xed2c2173, 0xf44c35f4), TOBN(0x8a56149d, 0x9acc9dca),
- TOBN(0x98f17881, 0x9ac6e0f4), TOBN(0x360fdeaf, 0xa413b5ed),
- TOBN(0x0625b8f4, 0xa300b0fd), TOBN(0xf1f4d76a, 0x5b3222d3),
- TOBN(0x9d6f5109, 0x587f76b8), TOBN(0x8b4ee08d, 0x2317fdb5),
- TOBN(0x88089bb7, 0x8c68b095), TOBN(0x95570e9a, 0x5808d9b9),
- TOBN(0xa395c36f, 0x35d33ae7), TOBN(0x200ea123, 0x50bb5a94),
- TOBN(0x20c789bd, 0x0bafe84b), TOBN(0x243ef52d, 0x0919276a),
- TOBN(0x3934c577, 0xe23ae233), TOBN(0xb93807af, 0xa460d1ec),
- TOBN(0xb72a53b1, 0xf8fa76a4), TOBN(0xd8914cb0, 0xc3ca4491),
- TOBN(0x2e128494, 0x3fb42622), TOBN(0x3b2700ac, 0x500907d5),
- TOBN(0xf370fb09, 0x1a95ec63), TOBN(0xf8f30be2, 0x31b6dfbd),
- TOBN(0xf2b2f8d2, 0x69e55f15), TOBN(0x1fead851, 0xcc1323e9),
- TOBN(0xfa366010, 0xd9e5eef6), TOBN(0x64d487b0, 0xe316107e),
- TOBN(0x4c076b86, 0xd23ddc82), TOBN(0x03fd344c, 0x7e0143f0),
- TOBN(0xa95362ff, 0x317af2c5), TOBN(0x0add3db7, 0xe18b7a4f),
- TOBN(0x9c673e3f, 0x8260e01b), TOBN(0xfbeb49e5, 0x54a1cc91),
- TOBN(0x91351bf2, 0x92f2e433), TOBN(0xc755e7ec, 0x851141eb),
- TOBN(0xc9a95139, 0x29607745), TOBN(0x0ca07420, 0xa26f2b28),
- TOBN(0xcb2790e7, 0x4bc6f9dd), TOBN(0x345bbb58, 0xadcaffc0),
- TOBN(0xc65ea38c, 0xbe0f27a2), TOBN(0x67c24d7c, 0x641fcb56),
- TOBN(0x2c25f0a7, 0xa9e2c757), TOBN(0x93f5cdb0, 0x16f16c49),
- TOBN(0x2ca5a9d7, 0xc5ee30a1), TOBN(0xd1593635, 0xb909b729),
- TOBN(0x804ce9f3, 0xdadeff48), TOBN(0xec464751, 0xb07c30c3),
- TOBN(0x89d65ff3, 0x9e49af6a), TOBN(0xf2d6238a, 0x6f3d01bc),
- TOBN(0x1095561e, 0x0bced843), TOBN(0x51789e12, 0xc8a13fd8),
- TOBN(0xd633f929, 0x763231df), TOBN(0x46df9f7d, 0xe7cbddef),
- TOBN(0x01c889c0, 0xcb265da8), TOBN(0xfce1ad10, 0xaf4336d2),
- TOBN(0x8d110df6, 0xfc6a0a7e), TOBN(0xdd431b98, 0x6da425dc),
- TOBN(0xcdc4aeab, 0x1834aabe), TOBN(0x84deb124, 0x8439b7fc),
- TOBN(0x8796f169, 0x3c2a5998), TOBN(0x9b9247b4, 0x7947190d),
- TOBN(0x55b9d9a5, 0x11597014), TOBN(0x7e9dd70d, 0x7b1566ee),
- TOBN(0x94ad78f7, 0xcbcd5e64), TOBN(0x0359ac17, 0x9bd4c032),
- TOBN(0x3b11baaf, 0x7cc222ae), TOBN(0xa6a6e284, 0xba78e812),
- TOBN(0x8392053f, 0x24cea1a0), TOBN(0xc97bce4a, 0x33621491),
- TOBN(0x7eb1db34, 0x35399ee9), TOBN(0x473f78ef, 0xece81ad1),
- TOBN(0x41d72fe0, 0xf63d3d0d), TOBN(0xe620b880, 0xafab62fc),
- TOBN(0x92096bc9, 0x93158383), TOBN(0x41a21357, 0x8f896f6c),
- TOBN(0x1b5ee2fa, 0xc7dcfcab), TOBN(0x650acfde, 0x9546e007),
- TOBN(0xc081b749, 0xb1b02e07), TOBN(0xda9e41a0, 0xf9eca03d),
- TOBN(0x013ba727, 0x175a54ab), TOBN(0xca0cd190, 0xea5d8d10),
- TOBN(0x85ea52c0, 0x95fd96a9), TOBN(0x2c591b9f, 0xbc5c3940),
- TOBN(0x6fb4d4e4, 0x2bad4d5f), TOBN(0xfa4c3590, 0xfef0059b),
- TOBN(0x6a10218a, 0xf5122294), TOBN(0x9a78a81a, 0xa85751d1),
- TOBN(0x04f20579, 0xa98e84e7), TOBN(0xfe1242c0, 0x4997e5b5),
- TOBN(0xe77a273b, 0xca21e1e4), TOBN(0xfcc8b1ef, 0x9411939d),
- TOBN(0xe20ea302, 0x92d0487a), TOBN(0x1442dbec, 0x294b91fe),
- TOBN(0x1f7a4afe, 0xbb6b0e8f), TOBN(0x1700ef74, 0x6889c318),
- TOBN(0xf5bbffc3, 0x70f1fc62), TOBN(0x3b31d4b6, 0x69c79cca),
- TOBN(0xe8bc2aab, 0xa7f6340d), TOBN(0xb0b08ab4, 0xa725e10a),
- TOBN(0x44f05701, 0xae340050), TOBN(0xba4b3016, 0x1cf0c569),
- TOBN(0x5aa29f83, 0xfbe19a51), TOBN(0x1b9ed428, 0xb71d752e),
- TOBN(0x1666e54e, 0xeb4819f5), TOBN(0x616cdfed, 0x9e18b75b),
- TOBN(0x112ed5be, 0x3ee27b0b), TOBN(0xfbf28319, 0x44c7de4d),
- TOBN(0xd685ec85, 0xe0e60d84), TOBN(0x68037e30, 0x1db7ee78),
- TOBN(0x5b65bdcd, 0x003c4d6e), TOBN(0x33e7363a, 0x93e29a6a),
- TOBN(0x995b3a61, 0x08d0756c), TOBN(0xd727f85c, 0x2faf134b),
- TOBN(0xfac6edf7, 0x1d337823), TOBN(0x99b9aa50, 0x0439b8b4),
- TOBN(0x722eb104, 0xe2b4e075), TOBN(0x49987295, 0x437c4926),
- TOBN(0xb1e4c0e4, 0x46a9b82d), TOBN(0xd0cb3197, 0x57a006f5),
- TOBN(0xf3de0f7d, 0xd7808c56), TOBN(0xb5c54d8f, 0x51f89772),
- TOBN(0x500a114a, 0xadbd31aa), TOBN(0x9afaaaa6, 0x295f6cab),
- TOBN(0x94705e21, 0x04cf667a), TOBN(0xfc2a811b, 0x9d3935d7),
- TOBN(0x560b0280, 0x6d09267c), TOBN(0xf19ed119, 0xf780e53b),
- TOBN(0xf0227c09, 0x067b6269), TOBN(0x967b8533, 0x5caef599),
- TOBN(0x155b9243, 0x68efeebc), TOBN(0xcd6d34f5, 0xc497bae6),
- TOBN(0x1dd8d5d3, 0x6cceb370), TOBN(0x2aeac579, 0xa78d7bf9),
- TOBN(0x5d65017d, 0x70b67a62), TOBN(0x70c8e44f, 0x17c53f67),
- TOBN(0xd1fc0950, 0x86a34d09), TOBN(0xe0fca256, 0xe7134907),
- TOBN(0xe24fa29c, 0x80fdd315), TOBN(0x2c4acd03, 0xd87499ad),
- TOBN(0xbaaf7517, 0x3b5a9ba6), TOBN(0xb9cbe1f6, 0x12e51a51),
- TOBN(0xd88edae3, 0x5e154897), TOBN(0xe4309c3c, 0x77b66ca0),
- TOBN(0xf5555805, 0xf67f3746), TOBN(0x85fc37ba, 0xa36401ff),
- TOBN(0xdf86e2ca, 0xd9499a53), TOBN(0x6270b2a3, 0xecbc955b),
- TOBN(0xafae64f5, 0x974ad33b), TOBN(0x04d85977, 0xfe7b2df1),
- TOBN(0x2a3db3ff, 0x4ab03f73), TOBN(0x0b87878a, 0x8702740a),
- TOBN(0x6d263f01, 0x5a061732), TOBN(0xc25430ce, 0xa32a1901),
- TOBN(0xf7ebab3d, 0xdb155018), TOBN(0x3a86f693, 0x63a9b78e),
- TOBN(0x349ae368, 0xda9f3804), TOBN(0x470f07fe, 0xa164349c),
- TOBN(0xd52f4cc9, 0x8562baa5), TOBN(0xc74a9e86, 0x2b290df3),
- TOBN(0xd3a1aa35, 0x43471a24), TOBN(0x239446be, 0xb8194511),
- TOBN(0xbec2dd00, 0x81dcd44d), TOBN(0xca3d7f0f, 0xc42ac82d),
- TOBN(0x1f3db085, 0xfdaf4520), TOBN(0xbb6d3e80, 0x4549daf2),
- TOBN(0xf5969d8a, 0x19ad5c42), TOBN(0x7052b13d, 0xdbfd1511),
- TOBN(0x11890d1b, 0x682b9060), TOBN(0xa71d3883, 0xac34452c),
- TOBN(0xa438055b, 0x783805b4), TOBN(0x43241277, 0x4725b23e),
- TOBN(0xf20cf96e, 0x4901bbed), TOBN(0x6419c710, 0xf432a2bb),
- TOBN(0x57a0fbb9, 0xdfa9cd7d), TOBN(0x589111e4, 0x00daa249),
- TOBN(0x19809a33, 0x7b60554e), TOBN(0xea5f8887, 0xede283a4),
- TOBN(0x2d713802, 0x503bfd35), TOBN(0x151bb0af, 0x585d2a53),
- TOBN(0x40b08f74, 0x43b30ca8), TOBN(0xe10b5bba, 0xd9934583),
- TOBN(0xe8a546d6, 0xb51110ad), TOBN(0x1dd50e66, 0x28e0b6c5),
- TOBN(0x292e9d54, 0xcff2b821), TOBN(0x3882555d, 0x47281760),
- TOBN(0x134838f8, 0x3724d6e3), TOBN(0xf2c679e0, 0x22ddcda1),
- TOBN(0x40ee8815, 0x6d2a5768), TOBN(0x7f227bd2, 0x1c1e7e2d),
- TOBN(0x487ba134, 0xd04ff443), TOBN(0x76e2ff3d, 0xc614e54b),
- TOBN(0x36b88d6f, 0xa3177ec7), TOBN(0xbf731d51, 0x2328fff5),
- TOBN(0x758caea2, 0x49ba158e), TOBN(0x5ab8ff4c, 0x02938188),
- TOBN(0x33e16056, 0x35edc56d), TOBN(0x5a69d349, 0x7e940d79),
- TOBN(0x6c4fd001, 0x03866dcb), TOBN(0x20a38f57, 0x4893cdef),
- TOBN(0xfbf3e790, 0xfac3a15b), TOBN(0x6ed7ea2e, 0x7a4f8e6b),
- TOBN(0xa663eb4f, 0xbc3aca86), TOBN(0x22061ea5, 0x080d53f7),
- TOBN(0x2480dfe6, 0xf546783f), TOBN(0xd38bc6da, 0x5a0a641e),
- TOBN(0xfb093cd1, 0x2ede8965), TOBN(0x89654db4, 0xacb455cf),
- TOBN(0x413cbf9a, 0x26e1adee), TOBN(0x291f3764, 0x373294d4),
- TOBN(0x00797257, 0x648083fe), TOBN(0x25f504d3, 0x208cc341),
- TOBN(0x635a8e5e, 0xc3a0ee43), TOBN(0x70aaebca, 0x679898ff),
- TOBN(0x9ee9f547, 0x5dc63d56), TOBN(0xce987966, 0xffb34d00),
- TOBN(0xf9f86b19, 0x5e26310a), TOBN(0x9e435484, 0x382a8ca8),
- TOBN(0x253bcb81, 0xc2352fe4), TOBN(0xa4eac8b0, 0x4474b571),
- TOBN(0xc1b97512, 0xc1ad8cf8), TOBN(0x193b4e9e, 0x99e0b697),
- TOBN(0x939d2716, 0x01e85df0), TOBN(0x4fb265b3, 0xcd44eafd),
- TOBN(0x321e7dcd, 0xe51e1ae2), TOBN(0x8e3a8ca6, 0xe3d8b096),
- TOBN(0x8de46cb0, 0x52604998), TOBN(0x91099ad8, 0x39072aa7),
- TOBN(0x2617f91c, 0x93aa96b8), TOBN(0x0fc8716b, 0x7fca2e13),
- TOBN(0xa7106f5e, 0x95328723), TOBN(0xd1c9c40b, 0x262e6522),
- TOBN(0xb9bafe86, 0x42b7c094), TOBN(0x1873439d, 0x1543c021),
- TOBN(0xe1baa5de, 0x5cbefd5d), TOBN(0xa363fc5e, 0x521e8aff),
- TOBN(0xefe6320d, 0xf862eaac), TOBN(0x14419c63, 0x22c647dc),
- TOBN(0x0e06707c, 0x4e46d428), TOBN(0xcb6c834f, 0x4a178f8f),
- TOBN(0x0f993a45, 0xd30f917c), TOBN(0xd4c4b049, 0x9879afee),
- TOBN(0xb6142a1e, 0x70500063), TOBN(0x7c9b41c3, 0xa5d9d605),
- TOBN(0xbc00fc2f, 0x2f8ba2c7), TOBN(0x0966eb2f, 0x7c67aa28),
- TOBN(0x13f7b516, 0x5a786972), TOBN(0x3bfb7557, 0x8a2fbba0),
- TOBN(0x131c4f23, 0x5a2b9620), TOBN(0xbff3ed27, 0x6faf46be),
- TOBN(0x9b4473d1, 0x7e172323), TOBN(0x421e8878, 0x339f6246),
- TOBN(0x0fa8587a, 0x25a41632), TOBN(0xc0814124, 0xa35b6c93),
- TOBN(0x2b18a9f5, 0x59ebb8db), TOBN(0x264e3357, 0x76edb29c),
- TOBN(0xaf245ccd, 0xc87c51e2), TOBN(0x16b3015b, 0x501e6214),
- TOBN(0xbb31c560, 0x0a3882ce), TOBN(0x6961bb94, 0xfec11e04),
- TOBN(0x3b825b8d, 0xeff7a3a0), TOBN(0xbec33738, 0xb1df7326),
- TOBN(0x68ad747c, 0x99604a1f), TOBN(0xd154c934, 0x9a3bd499),
- TOBN(0xac33506f, 0x1cc7a906), TOBN(0x73bb5392, 0x6c560e8f),
- TOBN(0x6428fcbe, 0x263e3944), TOBN(0xc11828d5, 0x1c387434),
- TOBN(0x3cd04be1, 0x3e4b12ff), TOBN(0xc3aad9f9, 0x2d88667c),
- TOBN(0xc52ddcf8, 0x248120cf), TOBN(0x985a892e, 0x2a389532),
- TOBN(0xfbb4b21b, 0x3bb85fa0), TOBN(0xf95375e0, 0x8dfc6269),
- TOBN(0xfb4fb06c, 0x7ee2acea), TOBN(0x6785426e, 0x309c4d1f),
- TOBN(0x659b17c8, 0xd8ceb147), TOBN(0x9b649eee, 0xb70a5554),
- TOBN(0x6b7fa0b5, 0xac6bc634), TOBN(0xd99fe2c7, 0x1d6e732f),
- TOBN(0x30e6e762, 0x8d3abba2), TOBN(0x18fee6e7, 0xa797b799),
- TOBN(0x5c9d360d, 0xc696464d), TOBN(0xe3baeb48, 0x27bfde12),
- TOBN(0x2bf5db47, 0xf23206d5), TOBN(0x2f6d3420, 0x1d260152),
- TOBN(0x17b87653, 0x3f8ff89a), TOBN(0x5157c30c, 0x378fa458),
- TOBN(0x7517c5c5, 0x2d4fb936), TOBN(0xef22f7ac, 0xe6518cdc),
- TOBN(0xdeb483e6, 0xbf847a64), TOBN(0xf5084558, 0x92e0fa89),}
- ,
- {TOBN(0xab9659d8, 0xdf7304d4), TOBN(0xb71bcf1b, 0xff210e8e),
- TOBN(0xa9a2438b, 0xd73fbd60), TOBN(0x4595cd1f, 0x5d11b4de),
- TOBN(0x9c0d329a, 0x4835859d), TOBN(0x4a0f0d2d, 0x7dbb6e56),
- TOBN(0xc6038e5e, 0xdf928a4e), TOBN(0xc9429621, 0x8f5ad154),
- TOBN(0x91213462, 0xf23f2d92), TOBN(0x6cab71bd, 0x60b94078),
- TOBN(0x6bdd0a63, 0x176cde20), TOBN(0x54c9b20c, 0xee4d54bc),
- TOBN(0x3cd2d8aa, 0x9f2ac02f), TOBN(0x03f8e617, 0x206eedb0),
- TOBN(0xc7f68e16, 0x93086434), TOBN(0x831469c5, 0x92dd3db9),
- TOBN(0x8521df24, 0x8f981354), TOBN(0x587e23ec, 0x3588a259),
- TOBN(0xcbedf281, 0xd7a0992c), TOBN(0x06930a55, 0x38961407),
- TOBN(0x09320deb, 0xbe5bbe21), TOBN(0xa7ffa5b5, 0x2491817f),
- TOBN(0xe6c8b4d9, 0x09065160), TOBN(0xac4f3992, 0xfff6d2a9),
- TOBN(0x7aa7a158, 0x3ae9c1bd), TOBN(0xe0af6d98, 0xe37ce240),
- TOBN(0xe54342d9, 0x28ab38b4), TOBN(0xe8b75007, 0x0a1c98ca),
- TOBN(0xefce86af, 0xe02358f2), TOBN(0x31b8b856, 0xea921228),
- TOBN(0x052a1912, 0x0a1c67fc), TOBN(0xb4069ea4, 0xe3aead59),
- TOBN(0x3232d6e2, 0x7fa03cb3), TOBN(0xdb938e5b, 0x0fdd7d88),
- TOBN(0x04c1d2cd, 0x2ccbfc5d), TOBN(0xd2f45c12, 0xaf3a580f),
- TOBN(0x592620b5, 0x7883e614), TOBN(0x5fd27e68, 0xbe7c5f26),
- TOBN(0x139e45a9, 0x1567e1e3), TOBN(0x2cc71d2d, 0x44d8aaaf),
- TOBN(0x4a9090cd, 0xe36d0757), TOBN(0xf722d7b1, 0xd9a29382),
- TOBN(0xfb7fb04c, 0x04b48ddf), TOBN(0x628ad2a7, 0xebe16f43),
- TOBN(0xcd3fbfb5, 0x20226040), TOBN(0x6c34ecb1, 0x5104b6c4),
- TOBN(0x30c0754e, 0xc903c188), TOBN(0xec336b08, 0x2d23cab0),
- TOBN(0x473d62a2, 0x1e206ee5), TOBN(0xf1e27480, 0x8c49a633),
- TOBN(0x87ab956c, 0xe9f6b2c3), TOBN(0x61830b48, 0x62b606ea),
- TOBN(0x67cd6846, 0xe78e815f), TOBN(0xfe40139f, 0x4c02082a),
- TOBN(0x52bbbfcb, 0x952ec365), TOBN(0x74c11642, 0x6b9836ab),
- TOBN(0x9f51439e, 0x558df019), TOBN(0x230da4ba, 0xac712b27),
- TOBN(0x518919e3, 0x55185a24), TOBN(0x4dcefcdd, 0x84b78f50),
- TOBN(0xa7d90fb2, 0xa47d4c5a), TOBN(0x55ac9abf, 0xb30e009e),
- TOBN(0xfd2fc359, 0x74eed273), TOBN(0xb72d824c, 0xdbea8faf),
- TOBN(0xce721a74, 0x4513e2ca), TOBN(0x0b418612, 0x38240b2c),
- TOBN(0x05199968, 0xd5baa450), TOBN(0xeb1757ed, 0x2b0e8c25),
- TOBN(0x6ebc3e28, 0x3dfac6d5), TOBN(0xb2431e2e, 0x48a237f5),
- TOBN(0x2acb5e23, 0x52f61499), TOBN(0x5558a2a7, 0xe06c936b),
- TOBN(0xd213f923, 0xcbb13d1b), TOBN(0x98799f42, 0x5bfb9bfe),
- TOBN(0x1ae8ddc9, 0x701144a9), TOBN(0x0b8b3bb6, 0x4c5595ee),
- TOBN(0x0ea9ef2e, 0x3ecebb21), TOBN(0x17cb6c4b, 0x3671f9a7),
- TOBN(0x47ef464f, 0x726f1d1f), TOBN(0x171b9484, 0x6943a276),
- TOBN(0x51a4ae2d, 0x7ef0329c), TOBN(0x08509222, 0x91c4402a),
- TOBN(0x64a61d35, 0xafd45bbc), TOBN(0x38f096fe, 0x3035a851),
- TOBN(0xc7468b74, 0xa1dec027), TOBN(0xe8cf10e7, 0x4fc7dcba),
- TOBN(0xea35ff40, 0xf4a06353), TOBN(0x0b4c0dfa, 0x8b77dd66),
- TOBN(0x779b8552, 0xde7e5c19), TOBN(0xfab28609, 0xc1c0256c),
- TOBN(0x64f58eee, 0xabd4743d), TOBN(0x4e8ef838, 0x7b6cc93b),
- TOBN(0xee650d26, 0x4cb1bf3d), TOBN(0x4c1f9d09, 0x73dedf61),
- TOBN(0xaef7c9d7, 0xbfb70ced), TOBN(0x1ec0507e, 0x1641de1e),
- TOBN(0xcd7e5cc7, 0xcde45079), TOBN(0xde173c9a, 0x516ac9e4),
- TOBN(0x517a8494, 0xc170315c), TOBN(0x438fd905, 0x91d8e8fb),
- TOBN(0x5145c506, 0xc7d9630b), TOBN(0x6457a87b, 0xf47d4d75),
- TOBN(0xd31646bf, 0x0d9a80e8), TOBN(0x453add2b, 0xcef3aabe),
- TOBN(0xc9941109, 0xa607419d), TOBN(0xfaa71e62, 0xbb6bca80),
- TOBN(0x34158c13, 0x07c431f3), TOBN(0x594abebc, 0x992bc47a),
- TOBN(0x6dfea691, 0xeb78399f), TOBN(0x48aafb35, 0x3f42cba4),
- TOBN(0xedcd65af, 0x077c04f0), TOBN(0x1a29a366, 0xe884491a),
- TOBN(0x023a40e5, 0x1c21f2bf), TOBN(0xf99a513c, 0xa5057aee),
- TOBN(0xa3fe7e25, 0xbcab072e), TOBN(0x8568d2e1, 0x40e32bcf),
- TOBN(0x904594eb, 0xd3f69d9f), TOBN(0x181a9733, 0x07affab1),
- TOBN(0xe4d68d76, 0xb6e330f4), TOBN(0x87a6dafb, 0xc75a7fc1),
- TOBN(0x549db2b5, 0xef7d9289), TOBN(0x2480d4a8, 0x197f015a),
- TOBN(0x61d5590b, 0xc40493b6), TOBN(0x3a55b52e, 0x6f780331),
- TOBN(0x40eb8115, 0x309eadb0), TOBN(0xdea7de5a, 0x92e5c625),
- TOBN(0x64d631f0, 0xcc6a3d5a), TOBN(0x9d5e9d7c, 0x93e8dd61),
- TOBN(0xf297bef5, 0x206d3ffc), TOBN(0x23d5e033, 0x7d808bd4),
- TOBN(0x4a4f6912, 0xd24cf5ba), TOBN(0xe4d8163b, 0x09cdaa8a),
- TOBN(0x0e0de9ef, 0xd3082e8e), TOBN(0x4fe1246c, 0x0192f360),
- TOBN(0x1f900150, 0x4b8eee0a), TOBN(0x5219da81, 0xf1da391b),
- TOBN(0x7bf6a5c1, 0xf7ea25aa), TOBN(0xd165e6bf, 0xfbb07d5f),
- TOBN(0xe3539361, 0x89e78671), TOBN(0xa3fcac89, 0x2bac4219),
- TOBN(0xdfab6fd4, 0xf0baa8ab), TOBN(0x5a4adac1, 0xe2c1c2e5),
- TOBN(0x6cd75e31, 0x40d85849), TOBN(0xce263fea, 0x19b39181),
- TOBN(0xcb6803d3, 0x07032c72), TOBN(0x7f40d5ce, 0x790968c8),
- TOBN(0xa6de86bd, 0xdce978f0), TOBN(0x25547c4f, 0x368f751c),
- TOBN(0xb1e685fd, 0x65fb2a9e), TOBN(0xce69336f, 0x1eb9179c),
- TOBN(0xb15d1c27, 0x12504442), TOBN(0xb7df465c, 0xb911a06b),
- TOBN(0xb8d804a3, 0x315980cd), TOBN(0x693bc492, 0xfa3bebf7),
- TOBN(0x3578aeee, 0x2253c504), TOBN(0x158de498, 0xcd2474a2),
- TOBN(0x1331f5c7, 0xcfda8368), TOBN(0xd2d7bbb3, 0x78d7177e),
- TOBN(0xdf61133a, 0xf3c1e46e), TOBN(0x5836ce7d, 0xd30e7be8),
- TOBN(0x83084f19, 0x94f834cb), TOBN(0xd35653d4, 0x429ed782),
- TOBN(0xa542f16f, 0x59e58243), TOBN(0xc2b52f65, 0x0470a22d),
- TOBN(0xe3b6221b, 0x18f23d96), TOBN(0xcb05abac, 0x3f5252b4),
- TOBN(0xca00938b, 0x87d61402), TOBN(0x2f186cdd, 0x411933e4),
- TOBN(0xe042ece5, 0x9a29a5c5), TOBN(0xb19b3c07, 0x3b6c8402),
- TOBN(0xc97667c7, 0x19d92684), TOBN(0xb5624622, 0xebc66372),
- TOBN(0x0cb96e65, 0x3c04fa02), TOBN(0x83a7176c, 0x8eaa39aa),
- TOBN(0x2033561d, 0xeaa1633f), TOBN(0x45a9d086, 0x4533df73),
- TOBN(0xe0542c1d, 0x3dc090bc), TOBN(0x82c996ef, 0xaa59c167),
- TOBN(0xe3f735e8, 0x0ee7fc4d), TOBN(0x7b179393, 0x7c35db79),
- TOBN(0xb6419e25, 0xf8c5dbfd), TOBN(0x4d9d7a1e, 0x1f327b04),
- TOBN(0x979f6f9b, 0x298dfca8), TOBN(0xc7c5dff1, 0x8de9366a),
- TOBN(0x1b7a588d, 0x04c82bdd), TOBN(0x68005534, 0xf8319dfd),
- TOBN(0xde8a55b5, 0xd8eb9580), TOBN(0x5ea886da, 0x8d5bca81),
- TOBN(0xe8530a01, 0x252a0b4d), TOBN(0x1bffb4fe, 0x35eaa0a1),
- TOBN(0x2ad828b1, 0xd8e99563), TOBN(0x7de96ef5, 0x95f9cd87),
- TOBN(0x4abb2d0c, 0xd77d970c), TOBN(0x03cfb933, 0xd33ef9cb),
- TOBN(0xb0547c01, 0x8b211fe9), TOBN(0x2fe64809, 0xa56ed1c6),
- TOBN(0xcb7d5624, 0xc2ac98cc), TOBN(0x2a1372c0, 0x1a393e33),
- TOBN(0xc8d1ec1c, 0x29660521), TOBN(0xf3d31b04, 0xb37ac3e9),
- TOBN(0xa29ae9df, 0x5ece6e7c), TOBN(0x0603ac8f, 0x0facfb55),
- TOBN(0xcfe85b7a, 0xdda233a5), TOBN(0xe618919f, 0xbd75f0b8),
- TOBN(0xf555a3d2, 0x99bf1603), TOBN(0x1f43afc9, 0xf184255a),
- TOBN(0xdcdaf341, 0x319a3e02), TOBN(0xd3b117ef, 0x03903a39),
- TOBN(0xe095da13, 0x65d1d131), TOBN(0x86f16367, 0xc37ad03e),
- TOBN(0x5f37389e, 0x462cd8dd), TOBN(0xc103fa04, 0xd67a60e6),
- TOBN(0x57c34344, 0xf4b478f0), TOBN(0xce91edd8, 0xe117c98d),
- TOBN(0x001777b0, 0x231fc12e), TOBN(0x11ae47f2, 0xb207bccb),
- TOBN(0xd983cf8d, 0x20f8a242), TOBN(0x7aff5b1d, 0xf22e1ad8),
- TOBN(0x68fd11d0, 0x7fc4feb3), TOBN(0x5d53ae90, 0xb0f1c3e1),
- TOBN(0x50fb7905, 0xec041803), TOBN(0x85e3c977, 0x14404888),
- TOBN(0x0e67faed, 0xac628d8f), TOBN(0x2e865150, 0x6668532c),
- TOBN(0x15acaaa4, 0x6a67a6b0), TOBN(0xf4cdee25, 0xb25cec41),
- TOBN(0x49ee565a, 0xe4c6701e), TOBN(0x2a04ca66, 0xfc7d63d8),
- TOBN(0xeb105018, 0xef0543fb), TOBN(0xf709a4f5, 0xd1b0d81d),
- TOBN(0x5b906ee6, 0x2915d333), TOBN(0xf4a87412, 0x96f1f0ab),
- TOBN(0xb6b82fa7, 0x4d82f4c2), TOBN(0x90725a60, 0x6804efb3),
- TOBN(0xbc82ec46, 0xadc3425e), TOBN(0xb7b80581, 0x2787843e),
- TOBN(0xdf46d91c, 0xdd1fc74c), TOBN(0xdc1c62cb, 0xe783a6c4),
- TOBN(0x59d1b9f3, 0x1a04cbba), TOBN(0xd87f6f72, 0x95e40764),
- TOBN(0x02b4cfc1, 0x317f4a76), TOBN(0x8d2703eb, 0x91036bce),
- TOBN(0x98206cc6, 0xa5e72a56), TOBN(0x57be9ed1, 0xcf53fb0f),
- TOBN(0x09374571, 0xef0b17ac), TOBN(0x74b2655e, 0xd9181b38),
- TOBN(0xc8f80ea8, 0x89935d0e), TOBN(0xc0d9e942, 0x91529936),
- TOBN(0x19686041, 0x1e84e0e5), TOBN(0xa5db84d3, 0xaea34c93),
- TOBN(0xf9d5bb19, 0x7073a732), TOBN(0xb8d2fe56, 0x6bcfd7c0),
- TOBN(0x45775f36, 0xf3eb82fa), TOBN(0x8cb20ccc, 0xfdff8b58),
- TOBN(0x1659b65f, 0x8374c110), TOBN(0xb8b4a422, 0x330c789a),
- TOBN(0x75e3c3ea, 0x6fe8208b), TOBN(0xbd74b9e4, 0x286e78fe),
- TOBN(0x0be2e81b, 0xd7d93a1a), TOBN(0x7ed06e27, 0xdd0a5aae),
- TOBN(0x721f5a58, 0x6be8b800), TOBN(0x428299d1, 0xd846db28),
- TOBN(0x95cb8e6b, 0x5be88ed3), TOBN(0xc3186b23, 0x1c034e11),
- TOBN(0xa6312c9e, 0x8977d99b), TOBN(0xbe944331, 0x83f531e7),
- TOBN(0x8232c0c2, 0x18d3b1d4), TOBN(0x617aae8b, 0xe1247b73),
- TOBN(0x40153fc4, 0x282aec3b), TOBN(0xc6063d2f, 0xf7b8f823),
- TOBN(0x68f10e58, 0x3304f94c), TOBN(0x31efae74, 0xee676346),
- TOBN(0xbadb6c6d, 0x40a9b97c), TOBN(0x14702c63, 0x4f666256),
- TOBN(0xdeb954f1, 0x5184b2e3), TOBN(0x5184a526, 0x94b6ca40),
- TOBN(0xfff05337, 0x003c32ea), TOBN(0x5aa374dd, 0x205974c7),
- TOBN(0x9a763854, 0x4b0dd71a), TOBN(0x459cd27f, 0xdeb947ec),
- TOBN(0xa6e28161, 0x459c2b92), TOBN(0x2f020fa8, 0x75ee8ef5),
- TOBN(0xb132ec2d, 0x30b06310), TOBN(0xc3e15899, 0xbc6a4530),
- TOBN(0xdc5f53fe, 0xaa3f451a), TOBN(0x3a3c7f23, 0xc2d9acac),
- TOBN(0x2ec2f892, 0x6b27e58b), TOBN(0x68466ee7, 0xd742799f),
- TOBN(0x98324dd4, 0x1fa26613), TOBN(0xa2dc6dab, 0xbdc29d63),
- TOBN(0xf9675faa, 0xd712d657), TOBN(0x813994be, 0x21fd8d15),
- TOBN(0x5ccbb722, 0xfd4f7553), TOBN(0x5135ff8b, 0xf3a36b20),
- TOBN(0x44be28af, 0x69559df5), TOBN(0x40b65bed, 0x9d41bf30),
- TOBN(0xd98bf2a4, 0x3734e520), TOBN(0x5e3abbe3, 0x209bdcba),
- TOBN(0x77c76553, 0xbc945b35), TOBN(0x5331c093, 0xc6ef14aa),
- TOBN(0x518ffe29, 0x76b60c80), TOBN(0x2285593b, 0x7ace16f8),
- TOBN(0xab1f64cc, 0xbe2b9784), TOBN(0xe8f2c0d9, 0xab2421b6),
- TOBN(0x617d7174, 0xc1df065c), TOBN(0xafeeb5ab, 0x5f6578fa),
- TOBN(0x16ff1329, 0x263b54a8), TOBN(0x45c55808, 0xc990dce3),
- TOBN(0x42eab6c0, 0xecc8c177), TOBN(0x799ea9b5, 0x5982ecaa),
- TOBN(0xf65da244, 0xb607ef8e), TOBN(0x8ab226ce, 0x32a3fc2c),
- TOBN(0x745741e5, 0x7ea973dc), TOBN(0x5c00ca70, 0x20888f2e),
- TOBN(0x7cdce3cf, 0x45fd9cf1), TOBN(0x8a741ef1, 0x5507f872),
- TOBN(0x47c51c2f, 0x196b4cec), TOBN(0x70d08e43, 0xc97ea618),
- TOBN(0x930da15c, 0x15b18a2b), TOBN(0x33b6c678, 0x2f610514),
- TOBN(0xc662e4f8, 0x07ac9794), TOBN(0x1eccf050, 0xba06cb79),
- TOBN(0x1ff08623, 0xe7d954e5), TOBN(0x6ef2c5fb, 0x24cf71c3),
- TOBN(0xb2c063d2, 0x67978453), TOBN(0xa0cf3796, 0x1d654af8),
- TOBN(0x7cb242ea, 0x7ebdaa37), TOBN(0x206e0b10, 0xb86747e0),
- TOBN(0x481dae5f, 0xd5ecfefc), TOBN(0x07084fd8, 0xc2bff8fc),
- TOBN(0x8040a01a, 0xea324596), TOBN(0x4c646980, 0xd4de4036),
- TOBN(0x9eb8ab4e, 0xd65abfc3), TOBN(0xe01cb91f, 0x13541ec7),
- TOBN(0x8f029adb, 0xfd695012), TOBN(0x9ae28483, 0x3c7569ec),
- TOBN(0xa5614c9e, 0xa66d80a1), TOBN(0x680a3e44, 0x75f5f911),
- TOBN(0x0c07b14d, 0xceba4fc1), TOBN(0x891c285b, 0xa13071c1),
- TOBN(0xcac67ceb, 0x799ece3c), TOBN(0x29b910a9, 0x41e07e27),
- TOBN(0x66bdb409, 0xf2e43123), TOBN(0x06f8b137, 0x7ac9ecbe),
- TOBN(0x5981fafd, 0x38547090), TOBN(0x19ab8b9f, 0x85e3415d),
- TOBN(0xfc28c194, 0xc7e31b27), TOBN(0x843be0aa, 0x6fbcbb42),
- TOBN(0xf3b1ed43, 0xa6db836c), TOBN(0x2a1330e4, 0x01a45c05),
- TOBN(0x4f19f3c5, 0x95c1a377), TOBN(0xa85f39d0, 0x44b5ee33),
- TOBN(0x3da18e6d, 0x4ae52834), TOBN(0x5a403b39, 0x7423dcb0),
- TOBN(0xbb555e0a, 0xf2374aef), TOBN(0x2ad599c4, 0x1e8ca111),
- TOBN(0x1b3a2fb9, 0x014b3bf8), TOBN(0x73092684, 0xf66d5007),
- TOBN(0x079f1426, 0xc4340102), TOBN(0x1827cf81, 0x8fddf4de),
- TOBN(0xc83605f6, 0xf10ff927), TOBN(0xd3871451, 0x23739fc6),
- TOBN(0x6d163450, 0xcac1c2cc), TOBN(0x6b521296, 0xa2ec1ac5),
- TOBN(0x0606c4f9, 0x6e3cb4a5), TOBN(0xe47d3f41, 0x778abff7),
- TOBN(0x425a8d5e, 0xbe8e3a45), TOBN(0x53ea9e97, 0xa6102160),
- TOBN(0x477a106e, 0x39cbb688), TOBN(0x532401d2, 0xf3386d32),
- TOBN(0x8e564f64, 0xb1b9b421), TOBN(0xca9b8388, 0x81dad33f),
- TOBN(0xb1422b4e, 0x2093913e), TOBN(0x533d2f92, 0x69bc8112),
- TOBN(0x3fa017be, 0xebe7b2c7), TOBN(0xb2767c4a, 0xcaf197c6),
- TOBN(0xc925ff87, 0xaedbae9f), TOBN(0x7daf0eb9, 0x36880a54),
- TOBN(0x9284ddf5, 0x9c4d0e71), TOBN(0x1581cf93, 0x316f8cf5),
- TOBN(0x3eeca887, 0x3ac1f452), TOBN(0xb417fce9, 0xfb6aeffe),
- TOBN(0xa5918046, 0xeefb8dc3), TOBN(0x73d318ac, 0x02209400),
- TOBN(0xe800400f, 0x728693e5), TOBN(0xe87d814b, 0x339927ed),
- TOBN(0x93e94d3b, 0x57ea9910), TOBN(0xff8a35b6, 0x2245fb69),
- TOBN(0x043853d7, 0x7f200d34), TOBN(0x470f1e68, 0x0f653ce1),
- TOBN(0x81ac05bd, 0x59a06379), TOBN(0xa14052c2, 0x03930c29),
- TOBN(0x6b72fab5, 0x26bc2797), TOBN(0x13670d16, 0x99f16771),
- TOBN(0x00170052, 0x1e3e48d1), TOBN(0x978fe401, 0xb7adf678),
- TOBN(0x55ecfb92, 0xd41c5dd4), TOBN(0x5ff8e247, 0xc7b27da5),
- TOBN(0xe7518272, 0x013fb606), TOBN(0x5768d7e5, 0x2f547a3c),
- TOBN(0xbb24eaa3, 0x60017a5f), TOBN(0x6b18e6e4, 0x9c64ce9b),
- TOBN(0xc225c655, 0x103dde07), TOBN(0xfc3672ae, 0x7592f7ea),
- TOBN(0x9606ad77, 0xd06283a1), TOBN(0x542fc650, 0xe4d59d99),
- TOBN(0xabb57c49, 0x2a40e7c2), TOBN(0xac948f13, 0xa8db9f55),
- TOBN(0x6d4c9682, 0xb04465c3), TOBN(0xe3d062fa, 0x6468bd15),
- TOBN(0xa51729ac, 0x5f318d7e), TOBN(0x1fc87df6, 0x9eb6fc95),
- TOBN(0x63d146a8, 0x0591f652), TOBN(0xa861b8f7, 0x589621aa),
- TOBN(0x59f5f15a, 0xce31348c), TOBN(0x8f663391, 0x440da6da),
- TOBN(0xcfa778ac, 0xb591ffa3), TOBN(0x027ca9c5, 0x4cdfebce),
- TOBN(0xbe8e05a5, 0x444ea6b3), TOBN(0x8aab4e69, 0xa78d8254),
- TOBN(0x2437f04f, 0xb474d6b8), TOBN(0x6597ffd4, 0x045b3855),
- TOBN(0xbb0aea4e, 0xca47ecaa), TOBN(0x568aae83, 0x85c7ebfc),
- TOBN(0x0e966e64, 0xc73b2383), TOBN(0x49eb3447, 0xd17d8762),
- TOBN(0xde107821, 0x8da05dab), TOBN(0x443d8baa, 0x016b7236),
- TOBN(0x163b63a5, 0xea7610d6), TOBN(0xe47e4185, 0xce1ca979),
- TOBN(0xae648b65, 0x80baa132), TOBN(0xebf53de2, 0x0e0d5b64),
- TOBN(0x8d3bfcb4, 0xd3c8c1ca), TOBN(0x0d914ef3, 0x5d04b309),
- TOBN(0x55ef6415, 0x3de7d395), TOBN(0xbde1666f, 0x26b850e8),
- TOBN(0xdbe1ca6e, 0xd449ab19), TOBN(0x8902b322, 0xe89a2672),
- TOBN(0xb1674b7e, 0xdacb7a53), TOBN(0x8e9faf6e, 0xf52523ff),
- TOBN(0x6ba535da, 0x9a85788b), TOBN(0xd21f03ae, 0xbd0626d4),
- TOBN(0x099f8c47, 0xe873dc64), TOBN(0xcda8564d, 0x018ec97e),
- TOBN(0x3e8d7a5c, 0xde92c68c), TOBN(0x78e035a1, 0x73323cc4),
- TOBN(0x3ef26275, 0xf880ff7c), TOBN(0xa4ee3dff, 0x273eedaa),
- TOBN(0x58823507, 0xaf4e18f8), TOBN(0x967ec9b5, 0x0672f328),
- TOBN(0x9ded19d9, 0x559d3186), TOBN(0x5e2ab3de, 0x6cdce39c),
- TOBN(0xabad6e4d, 0x11c226df), TOBN(0xf9783f43, 0x87723014),
- TOBN(0x9a49a0cf, 0x1a885719), TOBN(0xfc0c1a5a, 0x90da9dbf),
- TOBN(0x8bbaec49, 0x571d92ac), TOBN(0x569e85fe, 0x4692517f),
- TOBN(0x8333b014, 0xa14ea4af), TOBN(0x32f2a62f, 0x12e5c5ad),
- TOBN(0x98c2ce3a, 0x06d89b85), TOBN(0xb90741aa, 0x2ff77a08),
- TOBN(0x2530defc, 0x01f795a2), TOBN(0xd6e5ba0b, 0x84b3c199),
- TOBN(0x7d8e8451, 0x12e4c936), TOBN(0xae419f7d, 0xbd0be17b),
- TOBN(0xa583fc8c, 0x22262bc9), TOBN(0x6b842ac7, 0x91bfe2bd),
- TOBN(0x33cef4e9, 0x440d6827), TOBN(0x5f69f4de, 0xef81fb14),
- TOBN(0xf16cf6f6, 0x234fbb92), TOBN(0x76ae3fc3, 0xd9e7e158),
- TOBN(0x4e89f6c2, 0xe9740b33), TOBN(0x677bc85d, 0x4962d6a1),
- TOBN(0x6c6d8a7f, 0x68d10d15), TOBN(0x5f9a7224, 0x0257b1cd),
- TOBN(0x7096b916, 0x4ad85961), TOBN(0x5f8c47f7, 0xe657ab4a),
- TOBN(0xde57d7d0, 0xf7461d7e), TOBN(0x7eb6094d, 0x80ce5ee2),
- TOBN(0x0b1e1dfd, 0x34190547), TOBN(0x8a394f43, 0xf05dd150),
- TOBN(0x0a9eb24d, 0x97df44e6), TOBN(0x78ca06bf, 0x87675719),
- TOBN(0x6f0b3462, 0x6ffeec22), TOBN(0x9d91bcea, 0x36cdd8fb),
- TOBN(0xac83363c, 0xa105be47), TOBN(0x81ba76c1, 0x069710e3),
- TOBN(0x3d1b24cb, 0x28c682c6), TOBN(0x27f25228, 0x8612575b),
- TOBN(0xb587c779, 0xe8e66e98), TOBN(0x7b0c03e9, 0x405eb1fe),
- TOBN(0xfdf0d030, 0x15b548e7), TOBN(0xa8be76e0, 0x38b36af7),
- TOBN(0x4cdab04a, 0x4f310c40), TOBN(0x6287223e, 0xf47ecaec),
- TOBN(0x678e6055, 0x8b399320), TOBN(0x61fe3fa6, 0xc01e4646),
- TOBN(0xc482866b, 0x03261a5e), TOBN(0xdfcf45b8, 0x5c2f244a),
- TOBN(0x8fab9a51, 0x2f684b43), TOBN(0xf796c654, 0xc7220a66),
- TOBN(0x1d90707e, 0xf5afa58f), TOBN(0x2c421d97, 0x4fdbe0de),
- TOBN(0xc4f4cda3, 0xaf2ebc2f), TOBN(0xa0af843d, 0xcb4efe24),
- TOBN(0x53b857c1, 0x9ccd10b1), TOBN(0xddc9d1eb, 0x914d3e04),
- TOBN(0x7bdec8bb, 0x62771deb), TOBN(0x829277aa, 0x91c5aa81),
- TOBN(0x7af18dd6, 0x832391ae), TOBN(0x1740f316, 0xc71a84ca),}
- ,
- {TOBN(0x8928e99a, 0xeeaf8c49), TOBN(0xee7aa73d, 0x6e24d728),
- TOBN(0x4c5007c2, 0xe72b156c), TOBN(0x5fcf57c5, 0xed408a1d),
- TOBN(0x9f719e39, 0xb6057604), TOBN(0x7d343c01, 0xc2868bbf),
- TOBN(0x2cca254b, 0x7e103e2d), TOBN(0xe6eb38a9, 0xf131bea2),
- TOBN(0xb33e624f, 0x8be762b4), TOBN(0x2a9ee4d1, 0x058e3413),
- TOBN(0x968e6369, 0x67d805fa), TOBN(0x9848949b, 0x7db8bfd7),
- TOBN(0x5308d7e5, 0xd23a8417), TOBN(0x892f3b1d, 0xf3e29da5),
- TOBN(0xc95c139e, 0x3dee471f), TOBN(0x8631594d, 0xd757e089),
- TOBN(0xe0c82a3c, 0xde918dcc), TOBN(0x2e7b5994, 0x26fdcf4b),
- TOBN(0x82c50249, 0x32cb1b2d), TOBN(0xea613a9d, 0x7657ae07),
- TOBN(0xc2eb5f6c, 0xf1fdc9f7), TOBN(0xb6eae8b8, 0x879fe682),
- TOBN(0x253dfee0, 0x591cbc7f), TOBN(0x000da713, 0x3e1290e6),
- TOBN(0x1083e2ea, 0x1f095615), TOBN(0x0a28ad77, 0x14e68c33),
- TOBN(0x6bfc0252, 0x3d8818be), TOBN(0xb585113a, 0xf35850cd),
- TOBN(0x7d935f0b, 0x30df8aa1), TOBN(0xaddda07c, 0x4ab7e3ac),
- TOBN(0x92c34299, 0x552f00cb), TOBN(0xc33ed1de, 0x2909df6c),
- TOBN(0x22c2195d, 0x80e87766), TOBN(0x9e99e6d8, 0x9ddf4ac0),
- TOBN(0x09642e4e, 0x65e74934), TOBN(0x2610ffa2, 0xff1ff241),
- TOBN(0x4d1d47d4, 0x751c8159), TOBN(0x697b4985, 0xaf3a9363),
- TOBN(0x0318ca46, 0x87477c33), TOBN(0xa90cb565, 0x9441eff3),
- TOBN(0x58bb3848, 0x36f024cb), TOBN(0x85be1f77, 0x36016168),
- TOBN(0x6c59587c, 0xdc7e07f1), TOBN(0x191be071, 0xaf1d8f02),
- TOBN(0xbf169fa5, 0xcca5e55c), TOBN(0x3864ba3c, 0xf7d04eac),
- TOBN(0x915e367f, 0x8d7d05db), TOBN(0xb48a876d, 0xa6549e5d),
- TOBN(0xef89c656, 0x580e40a2), TOBN(0xf194ed8c, 0x728068bc),
- TOBN(0x74528045, 0xa47990c9), TOBN(0xf53fc7d7, 0x5e1a4649),
- TOBN(0xbec5ae9b, 0x78593e7d), TOBN(0x2cac4ee3, 0x41db65d7),
- TOBN(0xa8c1eb24, 0x04a3d39b), TOBN(0x53b7d634, 0x03f8f3ef),
- TOBN(0x2dc40d48, 0x3e07113c), TOBN(0x6e4a5d39, 0x7d8b63ae),
- TOBN(0x5582a94b, 0x79684c2b), TOBN(0x932b33d4, 0x622da26c),
- TOBN(0xf534f651, 0x0dbbf08d), TOBN(0x211d07c9, 0x64c23a52),
- TOBN(0x0eeece0f, 0xee5bdc9b), TOBN(0xdf178168, 0xf7015558),
- TOBN(0xd4294635, 0x0a712229), TOBN(0x93cbe448, 0x09273f8c),
- TOBN(0x00b095ef, 0x8f13bc83), TOBN(0xbb741972, 0x8798978c),
- TOBN(0x9d7309a2, 0x56dbe6e7), TOBN(0xe578ec56, 0x5a5d39ec),
- TOBN(0x3961151b, 0x851f9a31), TOBN(0x2da7715d, 0xe5709eb4),
- TOBN(0x867f3017, 0x53dfabf0), TOBN(0x728d2078, 0xb8e39259),
- TOBN(0x5c75a0cd, 0x815d9958), TOBN(0xf84867a6, 0x16603be1),
- TOBN(0xc865b13d, 0x70e35b1c), TOBN(0x02414468, 0x19b03e2c),
- TOBN(0xe46041da, 0xac1f3121), TOBN(0x7c9017ad, 0x6f028a7c),
- TOBN(0xabc96de9, 0x0a482873), TOBN(0x4265d6b1, 0xb77e54d4),
- TOBN(0x68c38e79, 0xa57d88e7), TOBN(0xd461d766, 0x9ce82de3),
- TOBN(0x817a9ec5, 0x64a7e489), TOBN(0xcc5675cd, 0xa0def5f2),
- TOBN(0x9a00e785, 0x985d494e), TOBN(0xc626833f, 0x1b03514a),
- TOBN(0xabe7905a, 0x83cdd60e), TOBN(0x50602fb5, 0xa1170184),
- TOBN(0x689886cd, 0xb023642a), TOBN(0xd568d090, 0xa6e1fb00),
- TOBN(0x5b1922c7, 0x0259217f), TOBN(0x93831cd9, 0xc43141e4),
- TOBN(0xdfca3587, 0x0c95f86e), TOBN(0xdec2057a, 0x568ae828),
- TOBN(0xc44ea599, 0xf98a759a), TOBN(0x55a0a7a2, 0xf7c23c1d),
- TOBN(0xd5ffb6e6, 0x94c4f687), TOBN(0x3563cce2, 0x12848478),
- TOBN(0x812b3517, 0xe7b1fbe1), TOBN(0x8a7dc979, 0x4f7338e0),
- TOBN(0x211ecee9, 0x52d048db), TOBN(0x2eea4056, 0xc86ea3b8),
- TOBN(0xd8cb68a7, 0xba772b34), TOBN(0xe16ed341, 0x5f4e2541),
- TOBN(0x9b32f6a6, 0x0fec14db), TOBN(0xeee376f7, 0x391698be),
- TOBN(0xe9a7aa17, 0x83674c02), TOBN(0x65832f97, 0x5843022a),
- TOBN(0x29f3a8da, 0x5ba4990f), TOBN(0x79a59c3a, 0xfb8e3216),
- TOBN(0x9cdc4d2e, 0xbd19bb16), TOBN(0xc6c7cfd0, 0xb3262d86),
- TOBN(0xd4ce14d0, 0x969c0b47), TOBN(0x1fa352b7, 0x13e56128),
- TOBN(0x383d55b8, 0x973db6d3), TOBN(0x71836850, 0xe8e5b7bf),
- TOBN(0xc7714596, 0xe6bb571f), TOBN(0x259df31f, 0x2d5b2dd2),
- TOBN(0x568f8925, 0x913cc16d), TOBN(0x18bc5b6d, 0xe1a26f5a),
- TOBN(0xdfa413be, 0xf5f499ae), TOBN(0xf8835dec, 0xc3f0ae84),
- TOBN(0xb6e60bd8, 0x65a40ab0), TOBN(0x65596439, 0x194b377e),
- TOBN(0xbcd85625, 0x92084a69), TOBN(0x5ce433b9, 0x4f23ede0),
- TOBN(0xe8e8f04f, 0x6ad65143), TOBN(0x11511827, 0xd6e14af6),
- TOBN(0x3d390a10, 0x8295c0c7), TOBN(0x71e29ee4, 0x621eba16),
- TOBN(0xa588fc09, 0x63717b46), TOBN(0x02be02fe, 0xe06ad4a2),
- TOBN(0x931558c6, 0x04c22b22), TOBN(0xbb4d4bd6, 0x12f3c849),
- TOBN(0x54a4f496, 0x20efd662), TOBN(0x92ba6d20, 0xc5952d14),
- TOBN(0x2db8ea1e, 0xcc9784c2), TOBN(0x81cc10ca, 0x4b353644),
- TOBN(0x40b570ad, 0x4b4d7f6c), TOBN(0x5c9f1d96, 0x84a1dcd2),
- TOBN(0x01379f81, 0x3147e797), TOBN(0xe5c6097b, 0x2bd499f5),
- TOBN(0x40dcafa6, 0x328e5e20), TOBN(0xf7b5244a, 0x54815550),
- TOBN(0xb9a4f118, 0x47bfc978), TOBN(0x0ea0e79f, 0xd25825b1),
- TOBN(0xa50f96eb, 0x646c7ecf), TOBN(0xeb811493, 0x446dea9d),
- TOBN(0x2af04677, 0xdfabcf69), TOBN(0xbe3a068f, 0xc713f6e8),
- TOBN(0x860d523d, 0x42e06189), TOBN(0xbf077941, 0x4e3aff13),
- TOBN(0x0b616dca, 0xc1b20650), TOBN(0xe66dd6d1, 0x2131300d),
- TOBN(0xd4a0fd67, 0xff99abde), TOBN(0xc9903550, 0xc7aac50d),
- TOBN(0x022ecf8b, 0x7c46b2d7), TOBN(0x3333b1e8, 0x3abf92af),
- TOBN(0x11cc113c, 0x6c491c14), TOBN(0x05976688, 0x80dd3f88),
- TOBN(0xf5b4d9e7, 0x29d932ed), TOBN(0xe982aad8, 0xa2c38b6d),
- TOBN(0x6f925347, 0x8be0dcf0), TOBN(0x700080ae, 0x65ca53f2),
- TOBN(0xd8131156, 0x443ca77f), TOBN(0xe92d6942, 0xec51f984),
- TOBN(0xd2a08af8, 0x85dfe9ae), TOBN(0xd825d9a5, 0x4d2a86ca),
- TOBN(0x2c53988d, 0x39dff020), TOBN(0xf38b135a, 0x430cdc40),
- TOBN(0x0c918ae0, 0x62a7150b), TOBN(0xf31fd8de, 0x0c340e9b),
- TOBN(0xafa0e7ae, 0x4dbbf02e), TOBN(0x5847fb2a, 0x5eba6239),
- TOBN(0x6b1647dc, 0xdccbac8b), TOBN(0xb642aa78, 0x06f485c8),
- TOBN(0x873f3765, 0x7038ecdf), TOBN(0x2ce5e865, 0xfa49d3fe),
- TOBN(0xea223788, 0xc98c4400), TOBN(0x8104a8cd, 0xf1fa5279),
- TOBN(0xbcf7cc7a, 0x06becfd7), TOBN(0x49424316, 0xc8f974ae),
- TOBN(0xc0da65e7, 0x84d6365d), TOBN(0xbcb7443f, 0x8f759fb8),
- TOBN(0x35c712b1, 0x7ae81930), TOBN(0x80428dff, 0x4c6e08ab),
- TOBN(0xf19dafef, 0xa4faf843), TOBN(0xced8538d, 0xffa9855f),
- TOBN(0x20ac409c, 0xbe3ac7ce), TOBN(0x358c1fb6, 0x882da71e),
- TOBN(0xafa9c0e5, 0xfd349961), TOBN(0x2b2cfa51, 0x8421c2fc),
- TOBN(0x2a80db17, 0xf3a28d38), TOBN(0xa8aba539, 0x5d138e7e),
- TOBN(0x52012d1d, 0x6e96eb8d), TOBN(0x65d8dea0, 0xcbaf9622),
- TOBN(0x57735447, 0xb264f56c), TOBN(0xbeebef3f, 0x1b6c8da2),
- TOBN(0xfc346d98, 0xce785254), TOBN(0xd50e8d72, 0xbb64a161),
- TOBN(0xc03567c7, 0x49794add), TOBN(0x15a76065, 0x752c7ef6),
- TOBN(0x59f3a222, 0x961f23d6), TOBN(0x378e4438, 0x73ecc0b0),
- TOBN(0xc74be434, 0x5a82fde4), TOBN(0xae509af2, 0xd8b9cf34),
- TOBN(0x4a61ee46, 0x577f44a1), TOBN(0xe09b748c, 0xb611deeb),
- TOBN(0xc0481b2c, 0xf5f7b884), TOBN(0x35626678, 0x61acfa6b),
- TOBN(0x37f4c518, 0xbf8d21e6), TOBN(0x22d96531, 0xb205a76d),
- TOBN(0x37fb85e1, 0x954073c0), TOBN(0xbceafe4f, 0x65b3a567),
- TOBN(0xefecdef7, 0xbe42a582), TOBN(0xd3fc6080, 0x65046be6),
- TOBN(0xc9af13c8, 0x09e8dba9), TOBN(0x1e6c9847, 0x641491ff),
- TOBN(0x3b574925, 0xd30c31f7), TOBN(0xb7eb72ba, 0xac2a2122),
- TOBN(0x776a0dac, 0xef0859e7), TOBN(0x06fec314, 0x21900942),
- TOBN(0x2464bc10, 0xf8c22049), TOBN(0x9bfbcce7, 0x875ebf69),
- TOBN(0xd7a88e2a, 0x4336326b), TOBN(0xda05261c, 0x5bc2acfa),
- TOBN(0xc29f5bdc, 0xeba7efc8), TOBN(0x471237ca, 0x25dbbf2e),
- TOBN(0xa72773f2, 0x2975f127), TOBN(0xdc744e8e, 0x04d0b326),
- TOBN(0x38a7ed16, 0xa56edb73), TOBN(0x64357e37, 0x2c007e70),
- TOBN(0xa167d15b, 0x5080b400), TOBN(0x07b41164, 0x23de4be1),
- TOBN(0xb2d91e32, 0x74c89883), TOBN(0x3c162821, 0x2882e7ed),
- TOBN(0xad6b36ba, 0x7503e482), TOBN(0x48434e8e, 0x0ea34331),
- TOBN(0x79f4f24f, 0x2c7ae0b9), TOBN(0xc46fbf81, 0x1939b44a),
- TOBN(0x76fefae8, 0x56595eb1), TOBN(0x417b66ab, 0xcd5f29c7),
- TOBN(0x5f2332b2, 0xc5ceec20), TOBN(0xd69661ff, 0xe1a1cae2),
- TOBN(0x5ede7e52, 0x9b0286e6), TOBN(0x9d062529, 0xe276b993),
- TOBN(0x324794b0, 0x7e50122b), TOBN(0xdd744f8b, 0x4af07ca5),
- TOBN(0x30a12f08, 0xd63fc97b), TOBN(0x39650f1a, 0x76626d9d),
- TOBN(0x101b47f7, 0x1fa38477), TOBN(0x3d815f19, 0xd4dc124f),
- TOBN(0x1569ae95, 0xb26eb58a), TOBN(0xc3cde188, 0x95fb1887),
- TOBN(0x54e9f37b, 0xf9539a48), TOBN(0xb0100e06, 0x7408c1a5),
- TOBN(0x821d9811, 0xea580cbb), TOBN(0x8af52d35, 0x86e50c56),
- TOBN(0xdfbd9d47, 0xdbbf698b), TOBN(0x2961a1ea, 0x03dc1c73),
- TOBN(0x203d38f8, 0xe76a5df8), TOBN(0x08a53a68, 0x6def707a),
- TOBN(0x26eefb48, 0x1bee45d4), TOBN(0xb3cee346, 0x3c688036),
- TOBN(0x463c5315, 0xc42f2469), TOBN(0x19d84d2e, 0x81378162),
- TOBN(0x22d7c3c5, 0x1c4d349f), TOBN(0x65965844, 0x163d59c5),
- TOBN(0xcf198c56, 0xb8abceae), TOBN(0x6fb1fb1b, 0x628559d5),
- TOBN(0x8bbffd06, 0x07bf8fe3), TOBN(0x46259c58, 0x3467734b),
- TOBN(0xd8953cea, 0x35f7f0d3), TOBN(0x1f0bece2, 0xd65b0ff1),
- TOBN(0xf7d5b4b3, 0xf3c72914), TOBN(0x29e8ea95, 0x3cb53389),
- TOBN(0x4a365626, 0x836b6d46), TOBN(0xe849f910, 0xea174fde),
- TOBN(0x7ec62fbb, 0xf4737f21), TOBN(0xd8dba5ab, 0x6209f5ac),
- TOBN(0x24b5d7a9, 0xa5f9adbe), TOBN(0x707d28f7, 0xa61dc768),
- TOBN(0x7711460b, 0xcaa999ea), TOBN(0xba7b174d, 0x1c92e4cc),
- TOBN(0x3c4bab66, 0x18d4bf2d), TOBN(0xb8f0c980, 0xeb8bd279),
- TOBN(0x024bea9a, 0x324b4737), TOBN(0xfba9e423, 0x32a83bca),
- TOBN(0x6e635643, 0xa232dced), TOBN(0x99619367, 0x2571c8ba),
- TOBN(0xe8c9f357, 0x54b7032b), TOBN(0xf936b3ba, 0x2442d54a),
- TOBN(0x2263f0f0, 0x8290c65a), TOBN(0x48989780, 0xee2c7fdb),
- TOBN(0xadc5d55a, 0x13d4f95e), TOBN(0x737cff85, 0xad9b8500),
- TOBN(0x271c557b, 0x8a73f43d), TOBN(0xbed617a4, 0xe18bc476),
- TOBN(0x66245401, 0x7dfd8ab2), TOBN(0xae7b89ae, 0x3a2870aa),
- TOBN(0x1b555f53, 0x23a7e545), TOBN(0x6791e247, 0xbe057e4c),
- TOBN(0x860136ad, 0x324fa34d), TOBN(0xea111447, 0x4cbeae28),
- TOBN(0x023a4270, 0xbedd3299), TOBN(0x3d5c3a7f, 0xc1c35c34),
- TOBN(0xb0f6db67, 0x8d0412d2), TOBN(0xd92625e2, 0xfcdc6b9a),
- TOBN(0x92ae5ccc, 0x4e28a982), TOBN(0xea251c36, 0x47a3ce7e),
- TOBN(0x9d658932, 0x790691bf), TOBN(0xed610589, 0x06b736ae),
- TOBN(0x712c2f04, 0xc0d63b6e), TOBN(0x5cf06fd5, 0xc63d488f),
- TOBN(0x97363fac, 0xd9588e41), TOBN(0x1f9bf762, 0x2b93257e),
- TOBN(0xa9d1ffc4, 0x667acace), TOBN(0x1cf4a1aa, 0x0a061ecf),
- TOBN(0x40e48a49, 0xdc1818d0), TOBN(0x0643ff39, 0xa3621ab0),
- TOBN(0x5768640c, 0xe39ef639), TOBN(0x1fc099ea, 0x04d86854),
- TOBN(0x9130b9c3, 0xeccd28fd), TOBN(0xd743cbd2, 0x7eec54ab),
- TOBN(0x052b146f, 0xe5b475b6), TOBN(0x058d9a82, 0x900a7d1f),
- TOBN(0x65e02292, 0x91262b72), TOBN(0x96f924f9, 0xbb0edf03),
- TOBN(0x5cfa59c8, 0xfe206842), TOBN(0xf6037004, 0x5eafa720),
- TOBN(0x5f30699e, 0x18d7dd96), TOBN(0x381e8782, 0xcbab2495),
- TOBN(0x91669b46, 0xdd8be949), TOBN(0xb40606f5, 0x26aae8ef),
- TOBN(0x2812b839, 0xfc6751a4), TOBN(0x16196214, 0xfba800ef),
- TOBN(0x4398d5ca, 0x4c1a2875), TOBN(0x720c00ee, 0x653d8349),
- TOBN(0xc2699eb0, 0xd820007c), TOBN(0x880ee660, 0xa39b5825),
- TOBN(0x70694694, 0x471f6984), TOBN(0xf7d16ea8, 0xe3dda99a),
- TOBN(0x28d675b2, 0xc0519a23), TOBN(0x9ebf94fe, 0x4f6952e3),
- TOBN(0xf28bb767, 0xa2294a8a), TOBN(0x85512b4d, 0xfe0af3f5),
- TOBN(0x18958ba8, 0x99b16a0d), TOBN(0x95c2430c, 0xba7548a7),
- TOBN(0xb30d1b10, 0xa16be615), TOBN(0xe3ebbb97, 0x85bfb74c),
- TOBN(0xa3273cfe, 0x18549fdb), TOBN(0xf6e200bf, 0x4fcdb792),
- TOBN(0x54a76e18, 0x83aba56c), TOBN(0x73ec66f6, 0x89ef6aa2),
- TOBN(0x8d17add7, 0xd1b9a305), TOBN(0xa959c5b9, 0xb7ae1b9d),
- TOBN(0x88643522, 0x6bcc094a), TOBN(0xcc5616c4, 0xd7d429b9),
- TOBN(0xa6dada01, 0xe6a33f7c), TOBN(0xc6217a07, 0x9d4e70ad),
- TOBN(0xd619a818, 0x09c15b7c), TOBN(0xea06b329, 0x0e80c854),
- TOBN(0x174811ce, 0xa5f5e7b9), TOBN(0x66dfc310, 0x787c65f4),
- TOBN(0x4ea7bd69, 0x3316ab54), TOBN(0xc12c4acb, 0x1dcc0f70),
- TOBN(0xe4308d1a, 0x1e407dd9), TOBN(0xe8a3587c, 0x91afa997),
- TOBN(0xea296c12, 0xab77b7a5), TOBN(0xb5ad49e4, 0x673c0d52),
- TOBN(0x40f9b2b2, 0x7006085a), TOBN(0xa88ff340, 0x87bf6ec2),
- TOBN(0x978603b1, 0x4e3066a6), TOBN(0xb3f99fc2, 0xb5e486e2),
- TOBN(0x07b53f5e, 0xb2e63645), TOBN(0xbe57e547, 0x84c84232),
- TOBN(0xd779c216, 0x7214d5cf), TOBN(0x617969cd, 0x029a3aca),
- TOBN(0xd17668cd, 0x8a7017a0), TOBN(0x77b4d19a, 0xbe9b7ee8),
- TOBN(0x58fd0e93, 0x9c161776), TOBN(0xa8c4f4ef, 0xd5968a72),
- TOBN(0x296071cc, 0x67b3de77), TOBN(0xae3c0b8e, 0x634f7905),
- TOBN(0x67e440c2, 0x8a7100c9), TOBN(0xbb8c3c1b, 0xeb4b9b42),
- TOBN(0x6d71e8ea, 0xc51b3583), TOBN(0x7591f5af, 0x9525e642),
- TOBN(0xf73a2f7b, 0x13f509f3), TOBN(0x618487aa, 0x5619ac9b),
- TOBN(0x3a72e5f7, 0x9d61718a), TOBN(0x00413bcc, 0x7592d28c),
- TOBN(0x7d9b11d3, 0x963c35cf), TOBN(0x77623bcf, 0xb90a46ed),
- TOBN(0xdeef273b, 0xdcdd2a50), TOBN(0x4a741f9b, 0x0601846e),
- TOBN(0x33b89e51, 0x0ec6e929), TOBN(0xcb02319f, 0x8b7f22cd),
- TOBN(0xbbe1500d, 0x084bae24), TOBN(0x2f0ae8d7, 0x343d2693),
- TOBN(0xacffb5f2, 0x7cdef811), TOBN(0xaa0c030a, 0x263fb94f),
- TOBN(0x6eef0d61, 0xa0f442de), TOBN(0xf92e1817, 0x27b139d3),
- TOBN(0x1ae6deb7, 0x0ad8bc28), TOBN(0xa89e38dc, 0xc0514130),
- TOBN(0x81eeb865, 0xd2fdca23), TOBN(0x5a15ee08, 0xcc8ef895),
- TOBN(0x768fa10a, 0x01905614), TOBN(0xeff5b8ef, 0x880ee19b),
- TOBN(0xf0c0cabb, 0xcb1c8a0e), TOBN(0x2e1ee9cd, 0xb8c838f9),
- TOBN(0x0587d8b8, 0x8a4a14c0), TOBN(0xf6f27896, 0x2ff698e5),
- TOBN(0xed38ef1c, 0x89ee6256), TOBN(0xf44ee1fe, 0x6b353b45),
- TOBN(0x9115c0c7, 0x70e903b3), TOBN(0xc78ec0a1, 0x818f31df),
- TOBN(0x6c003324, 0xb7dccbc6), TOBN(0xd96dd1f3, 0x163bbc25),
- TOBN(0x33aa82dd, 0x5cedd805), TOBN(0x123aae4f, 0x7f7eb2f1),
- TOBN(0x1723fcf5, 0xa26262cd), TOBN(0x1f7f4d5d, 0x0060ebd5),
- TOBN(0xf19c5c01, 0xb2eaa3af), TOBN(0x2ccb9b14, 0x9790accf),
- TOBN(0x1f9c1cad, 0x52324aa6), TOBN(0x63200526, 0x7247df54),
- TOBN(0x5732fe42, 0xbac96f82), TOBN(0x52fe771f, 0x01a1c384),
- TOBN(0x546ca13d, 0xb1001684), TOBN(0xb56b4eee, 0xa1709f75),
- TOBN(0x266545a9, 0xd5db8672), TOBN(0xed971c90, 0x1e8f3cfb),
- TOBN(0x4e7d8691, 0xe3a07b29), TOBN(0x7570d9ec, 0xe4b696b9),
- TOBN(0xdc5fa067, 0x7bc7e9ae), TOBN(0x68b44caf, 0xc82c4844),
- TOBN(0x519d34b3, 0xbf44da80), TOBN(0x283834f9, 0x5ab32e66),
- TOBN(0x6e608797, 0x6278a000), TOBN(0x1e62960e, 0x627312f6),
- TOBN(0x9b87b27b, 0xe6901c55), TOBN(0x80e78538, 0x24fdbc1f),
- TOBN(0xbbbc0951, 0x2facc27d), TOBN(0x06394239, 0xac143b5a),
- TOBN(0x35bb4a40, 0x376c1944), TOBN(0x7cb62694, 0x63da1511),
- TOBN(0xafd29161, 0xb7148a3b), TOBN(0xa6f9d9ed, 0x4e2ea2ee),
- TOBN(0x15dc2ca2, 0x880dd212), TOBN(0x903c3813, 0xa61139a9),
- TOBN(0x2aa7b46d, 0x6c0f8785), TOBN(0x36ce2871, 0x901c60ff),
- TOBN(0xc683b028, 0xe10d9c12), TOBN(0x7573baa2, 0x032f33d3),
- TOBN(0x87a9b1f6, 0x67a31b58), TOBN(0xfd3ed11a, 0xf4ffae12),
- TOBN(0x83dcaa9a, 0x0cb2748e), TOBN(0x8239f018, 0x5d6fdf16),
- TOBN(0xba67b49c, 0x72753941), TOBN(0x2beec455, 0xc321cb36),
- TOBN(0x88015606, 0x3f8b84ce), TOBN(0x76417083, 0x8d38c86f),
- TOBN(0x054f1ca7, 0x598953dd), TOBN(0xc939e110, 0x4e8e7429),
- TOBN(0x9b1ac2b3, 0x5a914f2f), TOBN(0x39e35ed3, 0xe74b8f9c),
- TOBN(0xd0debdb2, 0x781b2fb0), TOBN(0x1585638f, 0x2d997ba2),
- TOBN(0x9c4b646e, 0x9e2fce99), TOBN(0x68a21081, 0x1e80857f),
- TOBN(0x06d54e44, 0x3643b52a), TOBN(0xde8d6d63, 0x0d8eb843),
- TOBN(0x70321563, 0x42146a0a), TOBN(0x8ba826f2, 0x5eaa3622),
- TOBN(0x227a58bd, 0x86138787), TOBN(0x43b6c03c, 0x10281d37),
- TOBN(0x6326afbb, 0xb54dde39), TOBN(0x744e5e8a, 0xdb6f2d5f),
- TOBN(0x48b2a99a, 0xcff158e1), TOBN(0xa93c8fa0, 0xef87918f),
- TOBN(0x2182f956, 0xde058c5c), TOBN(0x216235d2, 0x936f9e7a),
- TOBN(0xace0c0db, 0xd2e31e67), TOBN(0xc96449bf, 0xf23ac3e7),
- TOBN(0x7e9a2874, 0x170693bd), TOBN(0xa28e14fd, 0xa45e6335),
- TOBN(0x5757f6b3, 0x56427344), TOBN(0x822e4556, 0xacf8edf9),
- TOBN(0x2b7a6ee2, 0xe6a285cd), TOBN(0x5866f211, 0xa9df3af0),
- TOBN(0x40dde2dd, 0xf845b844), TOBN(0x986c3726, 0x110e5e49),
- TOBN(0x73680c2a, 0xf7172277), TOBN(0x57b94f0f, 0x0cccb244),
- TOBN(0xbdff7267, 0x2d438ca7), TOBN(0xbad1ce11, 0xcf4663fd),
- TOBN(0x9813ed9d, 0xd8f71cae), TOBN(0xf43272a6, 0x961fdaa6),
- TOBN(0xbeff0119, 0xbd6d1637), TOBN(0xfebc4f91, 0x30361978),
- TOBN(0x02b37a95, 0x2f41deff), TOBN(0x0e44a59a, 0xe63b89b7),
- TOBN(0x673257dc, 0x143ff951), TOBN(0x19c02205, 0xd752baf4),
- TOBN(0x46c23069, 0xc4b7d692), TOBN(0x2e6392c3, 0xfd1502ac),
- TOBN(0x6057b1a2, 0x1b220846), TOBN(0xe51ff946, 0x0c1b5b63),}
- ,
- {TOBN(0x6e85cb51, 0x566c5c43), TOBN(0xcff9c919, 0x3597f046),
- TOBN(0x9354e90c, 0x4994d94a), TOBN(0xe0a39332, 0x2147927d),
- TOBN(0x8427fac1, 0x0dc1eb2b), TOBN(0x88cfd8c2, 0x2ff319fa),
- TOBN(0xe2d4e684, 0x01965274), TOBN(0xfa2e067d, 0x67aaa746),
- TOBN(0xb6d92a7f, 0x3e5f9f11), TOBN(0x9afe153a, 0xd6cb3b8e),
- TOBN(0x4d1a6dd7, 0xddf800bd), TOBN(0xf6c13cc0, 0xcaf17e19),
- TOBN(0x15f6c58e, 0x325fc3ee), TOBN(0x71095400, 0xa31dc3b2),
- TOBN(0x168e7c07, 0xafa3d3e7), TOBN(0x3f8417a1, 0x94c7ae2d),
- TOBN(0xec234772, 0x813b230d), TOBN(0x634d0f5f, 0x17344427),
- TOBN(0x11548ab1, 0xd77fc56a), TOBN(0x7fab1750, 0xce06af77),
- TOBN(0xb62c10a7, 0x4f7c4f83), TOBN(0xa7d2edc4, 0x220a67d9),
- TOBN(0x1c404170, 0x921209a0), TOBN(0x0b9815a0, 0xface59f0),
- TOBN(0x2842589b, 0x319540c3), TOBN(0x18490f59, 0xa283d6f8),
- TOBN(0xa2731f84, 0xdaae9fcb), TOBN(0x3db6d960, 0xc3683ba0),
- TOBN(0xc85c63bb, 0x14611069), TOBN(0xb19436af, 0x0788bf05),
- TOBN(0x905459df, 0x347460d2), TOBN(0x73f6e094, 0xe11a7db1),
- TOBN(0xdc7f938e, 0xb6357f37), TOBN(0xc5d00f79, 0x2bd8aa62),
- TOBN(0xc878dcb9, 0x2ca979fc), TOBN(0x37e83ed9, 0xeb023a99),
- TOBN(0x6b23e273, 0x1560bf3d), TOBN(0x1086e459, 0x1d0fae61),
- TOBN(0x78248316, 0x9a9414bd), TOBN(0x1b956bc0, 0xf0ea9ea1),
- TOBN(0x7b85bb91, 0xc31b9c38), TOBN(0x0c5aa90b, 0x48ef57b5),
- TOBN(0xdedeb169, 0xaf3bab6f), TOBN(0xe610ad73, 0x2d373685),
- TOBN(0xf13870df, 0x02ba8e15), TOBN(0x0337edb6, 0x8ca7f771),
- TOBN(0xe4acf747, 0xb62c036c), TOBN(0xd921d576, 0xb6b94e81),
- TOBN(0xdbc86439, 0x2c422f7a), TOBN(0xfb635362, 0xed348898),
- TOBN(0x83084668, 0xc45bfcd1), TOBN(0xc357c9e3, 0x2b315e11),
- TOBN(0xb173b540, 0x5b2e5b8c), TOBN(0x7e946931, 0xe102b9a4),
- TOBN(0x17c890eb, 0x7b0fb199), TOBN(0xec225a83, 0xd61b662b),
- TOBN(0xf306a3c8, 0xee3c76cb), TOBN(0x3cf11623, 0xd32a1f6e),
- TOBN(0xe6d5ab64, 0x6863e956), TOBN(0x3b8a4cbe, 0x5c005c26),
- TOBN(0xdcd529a5, 0x9ce6bb27), TOBN(0xc4afaa52, 0x04d4b16f),
- TOBN(0xb0624a26, 0x7923798d), TOBN(0x85e56df6, 0x6b307fab),
- TOBN(0x0281893c, 0x2bf29698), TOBN(0x91fc19a4, 0xd7ce7603),
- TOBN(0x75a5dca3, 0xad9a558f), TOBN(0x40ceb3fa, 0x4d50bf77),
- TOBN(0x1baf6060, 0xbc9ba369), TOBN(0x927e1037, 0x597888c2),
- TOBN(0xd936bf19, 0x86a34c07), TOBN(0xd4cf10c1, 0xc34ae980),
- TOBN(0x3a3e5334, 0x859dd614), TOBN(0x9c475b5b, 0x18d0c8ee),
- TOBN(0x63080d1f, 0x07cd51d5), TOBN(0xc9c0d0a6, 0xb88b4326),
- TOBN(0x1ac98691, 0xc234296f), TOBN(0x2a0a83a4, 0x94887fb6),
- TOBN(0x56511427, 0x0cea9cf2), TOBN(0x5230a6e8, 0xa24802f5),
- TOBN(0xf7a2bf0f, 0x72e3d5c1), TOBN(0x37717446, 0x4f21439e),
- TOBN(0xfedcbf25, 0x9ce30334), TOBN(0xe0030a78, 0x7ce202f9),
- TOBN(0x6f2d9ebf, 0x1202e9ca), TOBN(0xe79dde6c, 0x75e6e591),
- TOBN(0xf52072af, 0xf1dac4f8), TOBN(0x6c8d087e, 0xbb9b404d),
- TOBN(0xad0fc73d, 0xbce913af), TOBN(0x909e587b, 0x458a07cb),
- TOBN(0x1300da84, 0xd4f00c8a), TOBN(0x425cd048, 0xb54466ac),
- TOBN(0xb59cb9be, 0x90e9d8bf), TOBN(0x991616db, 0x3e431b0e),
- TOBN(0xd3aa117a, 0x531aecff), TOBN(0x91af92d3, 0x59f4dc3b),
- TOBN(0x9b1ec292, 0xe93fda29), TOBN(0x76bb6c17, 0xe97d91bc),
- TOBN(0x7509d95f, 0xaface1e6), TOBN(0x3653fe47, 0xbe855ae3),
- TOBN(0x73180b28, 0x0f680e75), TOBN(0x75eefd1b, 0xeeb6c26c),
- TOBN(0xa4cdf29f, 0xb66d4236), TOBN(0x2d70a997, 0x6b5821d8),
- TOBN(0x7a3ee207, 0x20445c36), TOBN(0x71d1ac82, 0x59877174),
- TOBN(0x0fc539f7, 0x949f73e9), TOBN(0xd05cf3d7, 0x982e3081),
- TOBN(0x8758e20b, 0x7b1c7129), TOBN(0xffadcc20, 0x569e61f2),
- TOBN(0xb05d3a2f, 0x59544c2d), TOBN(0xbe16f5c1, 0x9fff5e53),
- TOBN(0x73cf65b8, 0xaad58135), TOBN(0x622c2119, 0x037aa5be),
- TOBN(0x79373b3f, 0x646fd6a0), TOBN(0x0e029db5, 0x0d3978cf),
- TOBN(0x8bdfc437, 0x94fba037), TOBN(0xaefbd687, 0x620797a6),
- TOBN(0x3fa5382b, 0xbd30d38e), TOBN(0x7627cfbf, 0x585d7464),
- TOBN(0xb2330fef, 0x4e4ca463), TOBN(0xbcef7287, 0x3566cc63),
- TOBN(0xd161d2ca, 0xcf780900), TOBN(0x135dc539, 0x5b54827d),
- TOBN(0x638f052e, 0x27bf1bc6), TOBN(0x10a224f0, 0x07dfa06c),
- TOBN(0xe973586d, 0x6d3321da), TOBN(0x8b0c5738, 0x26152c8f),
- TOBN(0x07ef4f2a, 0x34606074), TOBN(0x80fe7fe8, 0xa0f7047a),
- TOBN(0x3d1a8152, 0xe1a0e306), TOBN(0x32cf43d8, 0x88da5222),
- TOBN(0xbf89a95f, 0x5f02ffe6), TOBN(0x3d9eb9a4, 0x806ad3ea),
- TOBN(0x012c17bb, 0x79c8e55e), TOBN(0xfdcd1a74, 0x99c81dac),
- TOBN(0x7043178b, 0xb9556098), TOBN(0x4090a1df, 0x801c3886),
- TOBN(0x759800ff, 0x9b67b912), TOBN(0x3e5c0304, 0x232620c8),
- TOBN(0x4b9d3c4b, 0x70dceeca), TOBN(0xbb2d3c15, 0x181f648e),
- TOBN(0xf981d837, 0x6e33345c), TOBN(0xb626289b, 0x0cf2297a),
- TOBN(0x766ac659, 0x8baebdcf), TOBN(0x1a28ae09, 0x75df01e5),
- TOBN(0xb71283da, 0x375876d8), TOBN(0x4865a96d, 0x607b9800),
- TOBN(0x25dd1bcd, 0x237936b2), TOBN(0x332f4f4b, 0x60417494),
- TOBN(0xd0923d68, 0x370a2147), TOBN(0x497f5dfb, 0xdc842203),
- TOBN(0x9dc74cbd, 0x32be5e0f), TOBN(0x7475bcb7, 0x17a01375),
- TOBN(0x438477c9, 0x50d872b1), TOBN(0xcec67879, 0xffe1d63d),
- TOBN(0x9b006014, 0xd8578c70), TOBN(0xc9ad99a8, 0x78bb6b8b),
- TOBN(0x6799008e, 0x11fb3806), TOBN(0xcfe81435, 0xcd44cab3),
- TOBN(0xa2ee1582, 0x2f4fb344), TOBN(0xb8823450, 0x483fa6eb),
- TOBN(0x622d323d, 0x652c7749), TOBN(0xd8474a98, 0xbeb0a15b),
- TOBN(0xe43c154d, 0x5d1c00d0), TOBN(0x7fd581d9, 0x0e3e7aac),
- TOBN(0x2b44c619, 0x2525ddf8), TOBN(0x67a033eb, 0xb8ae9739),
- TOBN(0x113ffec1, 0x9ef2d2e4), TOBN(0x1bf6767e, 0xd5a0ea7f),
- TOBN(0x57fff75e, 0x03714c0a), TOBN(0xa23c422e, 0x0a23e9ee),
- TOBN(0xdd5f6b2d, 0x540f83af), TOBN(0xc2c2c27e, 0x55ea46a7),
- TOBN(0xeb6b4246, 0x672a1208), TOBN(0xd13599f7, 0xae634f7a),
- TOBN(0xcf914b5c, 0xd7b32c6e), TOBN(0x61a5a640, 0xeaf61814),
- TOBN(0x8dc3df8b, 0x208a1bbb), TOBN(0xef627fd6, 0xb6d79aa5),
- TOBN(0x44232ffc, 0xc4c86bc8), TOBN(0xe6f9231b, 0x061539fe),
- TOBN(0x1d04f25a, 0x958b9533), TOBN(0x180cf934, 0x49e8c885),
- TOBN(0x89689595, 0x9884aaf7), TOBN(0xb1959be3, 0x07b348a6),
- TOBN(0x96250e57, 0x3c147c87), TOBN(0xae0efb3a, 0xdd0c61f8),
- TOBN(0xed00745e, 0xca8c325e), TOBN(0x3c911696, 0xecff3f70),
- TOBN(0x73acbc65, 0x319ad41d), TOBN(0x7b01a020, 0xf0b1c7ef),
- TOBN(0xea32b293, 0x63a1483f), TOBN(0x89eabe71, 0x7a248f96),
- TOBN(0x9c6231d3, 0x343157e5), TOBN(0x93a375e5, 0xdf3c546d),
- TOBN(0xe76e9343, 0x6a2afe69), TOBN(0xc4f89100, 0xe166c88e),
- TOBN(0x248efd0d, 0x4f872093), TOBN(0xae0eb3ea, 0x8fe0ea61),
- TOBN(0xaf89790d, 0x9d79046e), TOBN(0x4d650f2d, 0x6cee0976),
- TOBN(0xa3935d9a, 0x43071eca), TOBN(0x66fcd2c9, 0x283b0bfe),
- TOBN(0x0e665eb5, 0x696605f1), TOBN(0xe77e5d07, 0xa54cd38d),
- TOBN(0x90ee050a, 0x43d950cf), TOBN(0x86ddebda, 0xd32e69b5),
- TOBN(0x6ad94a3d, 0xfddf7415), TOBN(0xf7fa1309, 0x3f6e8d5a),
- TOBN(0xc4831d1d, 0xe9957f75), TOBN(0x7de28501, 0xd5817447),
- TOBN(0x6f1d7078, 0x9e2aeb6b), TOBN(0xba2b9ff4, 0xf67a53c2),
- TOBN(0x36963767, 0xdf9defc3), TOBN(0x479deed3, 0x0d38022c),
- TOBN(0xd2edb89b, 0x3a8631e8), TOBN(0x8de855de, 0x7a213746),
- TOBN(0xb2056cb7, 0xb00c5f11), TOBN(0xdeaefbd0, 0x2c9b85e4),
- TOBN(0x03f39a8d, 0xd150892d), TOBN(0x37b84686, 0x218b7985),
- TOBN(0x36296dd8, 0xb7375f1a), TOBN(0x472cd4b1, 0xb78e898e),
- TOBN(0x15dff651, 0xe9f05de9), TOBN(0xd4045069, 0x2ce98ba9),
- TOBN(0x8466a7ae, 0x9b38024c), TOBN(0xb910e700, 0xe5a6b5ef),
- TOBN(0xae1c56ea, 0xb3aa8f0d), TOBN(0xbab2a507, 0x7eee74a6),
- TOBN(0x0dca11e2, 0x4b4c4620), TOBN(0xfd896e2e, 0x4c47d1f4),
- TOBN(0xeb45ae53, 0x308fbd93), TOBN(0x46cd5a2e, 0x02c36fda),
- TOBN(0x6a3d4e90, 0xbaa48385), TOBN(0xdd55e62e, 0x9dbe9960),
- TOBN(0xa1406aa0, 0x2a81ede7), TOBN(0x6860dd14, 0xf9274ea7),
- TOBN(0xcfdcb0c2, 0x80414f86), TOBN(0xff410b10, 0x22f94327),
- TOBN(0x5a33cc38, 0x49ad467b), TOBN(0xefb48b6c, 0x0a7335f1),
- TOBN(0x14fb54a4, 0xb153a360), TOBN(0x604aa9d2, 0xb52469cc),
- TOBN(0x5e9dc486, 0x754e48e9), TOBN(0x693cb455, 0x37471e8e),
- TOBN(0xfb2fd7cd, 0x8d3b37b6), TOBN(0x63345e16, 0xcf09ff07),
- TOBN(0x9910ba6b, 0x23a5d896), TOBN(0x1fe19e35, 0x7fe4364e),
- TOBN(0x6e1da8c3, 0x9a33c677), TOBN(0x15b4488b, 0x29fd9fd0),
- TOBN(0x1f439254, 0x1a1f22bf), TOBN(0x920a8a70, 0xab8163e8),
- TOBN(0x3fd1b249, 0x07e5658e), TOBN(0xf2c4f79c, 0xb6ec839b),
- TOBN(0x1abbc3d0, 0x4aa38d1b), TOBN(0x3b0db35c, 0xb5d9510e),
- TOBN(0x1754ac78, 0x3e60dec0), TOBN(0x53272fd7, 0xea099b33),
- TOBN(0x5fb0494f, 0x07a8e107), TOBN(0x4a89e137, 0x6a8191fa),
- TOBN(0xa113b7f6, 0x3c4ad544), TOBN(0x88a2e909, 0x6cb9897b),
- TOBN(0x17d55de3, 0xb44a3f84), TOBN(0xacb2f344, 0x17c6c690),
- TOBN(0x32088168, 0x10232390), TOBN(0xf2e8a61f, 0x6c733bf7),
- TOBN(0xa774aab6, 0x9c2d7652), TOBN(0xfb5307e3, 0xed95c5bc),
- TOBN(0xa05c73c2, 0x4981f110), TOBN(0x1baae31c, 0xa39458c9),
- TOBN(0x1def185b, 0xcbea62e7), TOBN(0xe8ac9eae, 0xeaf63059),
- TOBN(0x098a8cfd, 0x9921851c), TOBN(0xd959c3f1, 0x3abe2f5b),
- TOBN(0xa4f19525, 0x20e40ae5), TOBN(0x320789e3, 0x07a24aa1),
- TOBN(0x259e6927, 0x7392b2bc), TOBN(0x58f6c667, 0x1918668b),
- TOBN(0xce1db2bb, 0xc55d2d8b), TOBN(0x41d58bb7, 0xf4f6ca56),
- TOBN(0x7650b680, 0x8f877614), TOBN(0x905e16ba, 0xf4c349ed),
- TOBN(0xed415140, 0xf661acac), TOBN(0x3b8784f0, 0xcb2270af),
- TOBN(0x3bc280ac, 0x8a402cba), TOBN(0xd53f7146, 0x0937921a),
- TOBN(0xc03c8ee5, 0xe5681e83), TOBN(0x62126105, 0xf6ac9e4a),
- TOBN(0x9503a53f, 0x936b1a38), TOBN(0x3d45e2d4, 0x782fecbd),
- TOBN(0x69a5c439, 0x76e8ae98), TOBN(0xb53b2eeb, 0xbfb4b00e),
- TOBN(0xf1674712, 0x72386c89), TOBN(0x30ca34a2, 0x4268bce4),
- TOBN(0x7f1ed86c, 0x78341730), TOBN(0x8ef5beb8, 0xb525e248),
- TOBN(0xbbc489fd, 0xb74fbf38), TOBN(0x38a92a0e, 0x91a0b382),
- TOBN(0x7a77ba3f, 0x22433ccf), TOBN(0xde8362d6, 0xa29f05a9),
- TOBN(0x7f6a30ea, 0x61189afc), TOBN(0x693b5505, 0x59ef114f),
- TOBN(0x50266bc0, 0xcd1797a1), TOBN(0xea17b47e, 0xf4b7af2d),
- TOBN(0xd6c4025c, 0x3df9483e), TOBN(0x8cbb9d9f, 0xa37b18c9),
- TOBN(0x91cbfd9c, 0x4d8424cf), TOBN(0xdb7048f1, 0xab1c3506),
- TOBN(0x9eaf641f, 0x028206a3), TOBN(0xf986f3f9, 0x25bdf6ce),
- TOBN(0x262143b5, 0x224c08dc), TOBN(0x2bbb09b4, 0x81b50c91),
- TOBN(0xc16ed709, 0xaca8c84f), TOBN(0xa6210d9d, 0xb2850ca8),
- TOBN(0x6d8df67a, 0x09cb54d6), TOBN(0x91eef6e0, 0x500919a4),
- TOBN(0x90f61381, 0x0f132857), TOBN(0x9acede47, 0xf8d5028b),
- TOBN(0x844d1b71, 0x90b771c3), TOBN(0x563b71e4, 0xba6426be),
- TOBN(0x2efa2e83, 0xbdb802ff), TOBN(0x3410cbab, 0xab5b4a41),
- TOBN(0x555b2d26, 0x30da84dd), TOBN(0xd0711ae9, 0xee1cc29a),
- TOBN(0xcf3e8c60, 0x2f547792), TOBN(0x03d7d5de, 0xdc678b35),
- TOBN(0x071a2fa8, 0xced806b8), TOBN(0x222e6134, 0x697f1478),
- TOBN(0xdc16fd5d, 0xabfcdbbf), TOBN(0x44912ebf, 0x121b53b8),
- TOBN(0xac943674, 0x2496c27c), TOBN(0x8ea3176c, 0x1ffc26b0),
- TOBN(0xb6e224ac, 0x13debf2c), TOBN(0x524cc235, 0xf372a832),
- TOBN(0xd706e1d8, 0x9f6f1b18), TOBN(0x2552f005, 0x44cce35b),
- TOBN(0x8c8326c2, 0xa88e31fc), TOBN(0xb5468b2c, 0xf9552047),
- TOBN(0xce683e88, 0x3ff90f2b), TOBN(0x77947bdf, 0x2f0a5423),
- TOBN(0xd0a1b28b, 0xed56e328), TOBN(0xaee35253, 0xc20134ac),
- TOBN(0x7e98367d, 0x3567962f), TOBN(0x379ed61f, 0x8188bffb),
- TOBN(0x73bba348, 0xfaf130a1), TOBN(0x6c1f75e1, 0x904ed734),
- TOBN(0x18956642, 0x3b4a79fc), TOBN(0xf20bc83d, 0x54ef4493),
- TOBN(0x836d425d, 0x9111eca1), TOBN(0xe5b5c318, 0x009a8dcf),
- TOBN(0x3360b25d, 0x13221bc5), TOBN(0x707baad2, 0x6b3eeaf7),
- TOBN(0xd7279ed8, 0x743a95a1), TOBN(0x7450a875, 0x969e809f),
- TOBN(0x32b6bd53, 0xe5d0338f), TOBN(0x1e77f7af, 0x2b883bbc),
- TOBN(0x90da12cc, 0x1063ecd0), TOBN(0xe2697b58, 0xc315be47),
- TOBN(0x2771a5bd, 0xda85d534), TOBN(0x53e78c1f, 0xff980eea),
- TOBN(0xadf1cf84, 0x900385e7), TOBN(0x7d3b14f6, 0xc9387b62),
- TOBN(0x170e74b0, 0xcb8f2bd2), TOBN(0x2d50b486, 0x827fa993),
- TOBN(0xcdbe8c9a, 0xf6f32bab), TOBN(0x55e906b0, 0xc3b93ab8),
- TOBN(0x747f22fc, 0x8fe280d1), TOBN(0xcd8e0de5, 0xb2e114ab),
- TOBN(0x5ab7dbeb, 0xe10b68b0), TOBN(0x9dc63a9c, 0xa480d4b2),
- TOBN(0x78d4bc3b, 0x4be1495f), TOBN(0x25eb3db8, 0x9359122d),
- TOBN(0x3f8ac05b, 0x0809cbdc), TOBN(0xbf4187bb, 0xd37c702f),
- TOBN(0x84cea069, 0x1416a6a5), TOBN(0x8f860c79, 0x43ef881c),
- TOBN(0x41311f8a, 0x38038a5d), TOBN(0xe78c2ec0, 0xfc612067),
- TOBN(0x494d2e81, 0x5ad73581), TOBN(0xb4cc9e00, 0x59604097),
- TOBN(0xff558aec, 0xf3612cba), TOBN(0x35beef7a, 0x9e36c39e),
- TOBN(0x1845c7cf, 0xdbcf41b9), TOBN(0x5703662a, 0xaea997c0),
- TOBN(0x8b925afe, 0xe402f6d8), TOBN(0xd0a1b1ae, 0x4dd72162),
- TOBN(0x9f47b375, 0x03c41c4b), TOBN(0xa023829b, 0x0391d042),
- TOBN(0x5f5045c3, 0x503b8b0a), TOBN(0x123c2688, 0x98c010e5),
- TOBN(0x324ec0cc, 0x36ba06ee), TOBN(0xface3115, 0x3dd2cc0c),
- TOBN(0xb364f3be, 0xf333e91f), TOBN(0xef8aff73, 0x28e832b0),
- TOBN(0x1e9bad04, 0x2d05841b), TOBN(0x42f0e3df, 0x356a21e2),
- TOBN(0xa3270bcb, 0x4add627e), TOBN(0xb09a8158, 0xd322e711),
- TOBN(0x86e326a1, 0x0fee104a), TOBN(0xad7788f8, 0x3703f65d),
- TOBN(0x7e765430, 0x47bc4833), TOBN(0x6cee582b, 0x2b9b893a),
- TOBN(0x9cd2a167, 0xe8f55a7b), TOBN(0xefbee3c6, 0xd9e4190d),
- TOBN(0x33ee7185, 0xd40c2e9d), TOBN(0x844cc9c5, 0xa380b548),
- TOBN(0x323f8ecd, 0x66926e04), TOBN(0x0001e38f, 0x8110c1ba),
- TOBN(0x8dbcac12, 0xfc6a7f07), TOBN(0xd65e1d58, 0x0cec0827),
- TOBN(0xd2cd4141, 0xbe76ca2d), TOBN(0x7895cf5c, 0xe892f33a),
- TOBN(0x956d230d, 0x367139d2), TOBN(0xa91abd3e, 0xd012c4c1),
- TOBN(0x34fa4883, 0x87eb36bf), TOBN(0xc5f07102, 0x914b8fb4),
- TOBN(0x90f0e579, 0xadb9c95f), TOBN(0xfe6ea8cb, 0x28888195),
- TOBN(0x7b9b5065, 0xedfa9284), TOBN(0x6c510bd2, 0x2b8c8d65),
- TOBN(0xd7b8ebef, 0xcbe8aafd), TOBN(0xedb3af98, 0x96b1da07),
- TOBN(0x28ff779d, 0x6295d426), TOBN(0x0c4f6ac7, 0x3fa3ad7b),
- TOBN(0xec44d054, 0x8b8e2604), TOBN(0x9b32a66d, 0x8b0050e1),
- TOBN(0x1f943366, 0xf0476ce2), TOBN(0x7554d953, 0xa602c7b4),
- TOBN(0xbe35aca6, 0x524f2809), TOBN(0xb6881229, 0xfd4edbea),
- TOBN(0xe8cd0c8f, 0x508efb63), TOBN(0x9eb5b5c8, 0x6abcefc7),
- TOBN(0xf5621f5f, 0xb441ab4f), TOBN(0x79e6c046, 0xb76a2b22),
- TOBN(0x74a4792c, 0xe37a1f69), TOBN(0xcbd252cb, 0x03542b60),
- TOBN(0x785f65d5, 0xb3c20bd3), TOBN(0x8dea6143, 0x4fabc60c),
- TOBN(0x45e21446, 0xde673629), TOBN(0x57f7aa1e, 0x703c2d21),
- TOBN(0xa0e99b7f, 0x98c868c7), TOBN(0x4e42f66d, 0x8b641676),
- TOBN(0x602884dc, 0x91077896), TOBN(0xa0d690cf, 0xc2c9885b),
- TOBN(0xfeb4da33, 0x3b9a5187), TOBN(0x5f789598, 0x153c87ee),
- TOBN(0x2192dd47, 0x52b16dba), TOBN(0xdeefc0e6, 0x3524c1b1),
- TOBN(0x465ea76e, 0xe4383693), TOBN(0x79401711, 0x361b8d98),
- TOBN(0xa5f9ace9, 0xf21a15cb), TOBN(0x73d26163, 0xefee9aeb),
- TOBN(0xcca844b3, 0xe677016c), TOBN(0x6c122b07, 0x57eaee06),
- TOBN(0xb782dce7, 0x15f09690), TOBN(0x508b9b12, 0x2dfc0fc9),
- TOBN(0x9015ab4b, 0x65d89fc6), TOBN(0x5e79dab7, 0xd6d5bb0f),
- TOBN(0x64f021f0, 0x6c775aa2), TOBN(0xdf09d8cc, 0x37c7eca1),
- TOBN(0x9a761367, 0xef2fa506), TOBN(0xed4ca476, 0x5b81eec6),
- TOBN(0x262ede36, 0x10bbb8b5), TOBN(0x0737ce83, 0x0641ada3),
- TOBN(0x4c94288a, 0xe9831ccc), TOBN(0x487fc1ce, 0x8065e635),
- TOBN(0xb13d7ab3, 0xb8bb3659), TOBN(0xdea5df3e, 0x855e4120),
- TOBN(0xb9a18573, 0x85eb0244), TOBN(0x1a1b8ea3, 0xa7cfe0a3),
- TOBN(0x3b837119, 0x67b0867c), TOBN(0x8d5e0d08, 0x9d364520),
- TOBN(0x52dccc1e, 0xd930f0e3), TOBN(0xefbbcec7, 0xbf20bbaf),
- TOBN(0x99cffcab, 0x0263ad10), TOBN(0xd8199e6d, 0xfcd18f8a),
- TOBN(0x64e2773f, 0xe9f10617), TOBN(0x0079e8e1, 0x08704848),
- TOBN(0x1169989f, 0x8a342283), TOBN(0x8097799c, 0xa83012e6),
- TOBN(0xece966cb, 0x8a6a9001), TOBN(0x93b3afef, 0x072ac7fc),
- TOBN(0xe6893a2a, 0x2db3d5ba), TOBN(0x263dc462, 0x89bf4fdc),
- TOBN(0x8852dfc9, 0xe0396673), TOBN(0x7ac70895, 0x3af362b6),
- TOBN(0xbb9cce4d, 0x5c2f342b), TOBN(0xbf80907a, 0xb52d7aae),
- TOBN(0x97f3d3cd, 0x2161bcd0), TOBN(0xb25b0834, 0x0962744d),
- TOBN(0xc5b18ea5, 0x6c3a1dda), TOBN(0xfe4ec7eb, 0x06c92317),
- TOBN(0xb787b890, 0xad1c4afe), TOBN(0xdccd9a92, 0x0ede801a),
- TOBN(0x9ac6ddda, 0xdb58da1f), TOBN(0x22bbc12f, 0xb8cae6ee),
- TOBN(0xc6f8bced, 0x815c4a43), TOBN(0x8105a92c, 0xf96480c7),
- TOBN(0x0dc3dbf3, 0x7a859d51), TOBN(0xe3ec7ce6, 0x3041196b),
- TOBN(0xd9f64b25, 0x0d1067c9), TOBN(0xf2321321, 0x3d1f8dd8),
- TOBN(0x8b5c619c, 0x76497ee8), TOBN(0x5d2b0ac6, 0xc717370e),
- TOBN(0x98204cb6, 0x4fcf68e1), TOBN(0x0bdec211, 0x62bc6792),
- TOBN(0x6973ccef, 0xa63b1011), TOBN(0xf9e3fa97, 0xe0de1ac5),
- TOBN(0x5efb693e, 0x3d0e0c8b), TOBN(0x037248e9, 0xd2d4fcb4),}
- ,
- {TOBN(0x80802dc9, 0x1ec34f9e), TOBN(0xd8772d35, 0x33810603),
- TOBN(0x3f06d66c, 0x530cb4f3), TOBN(0x7be5ed0d, 0xc475c129),
- TOBN(0xcb9e3c19, 0x31e82b10), TOBN(0xc63d2857, 0xc9ff6b4c),
- TOBN(0xb92118c6, 0x92a1b45e), TOBN(0x0aec4414, 0x7285bbca),
- TOBN(0xfc189ae7, 0x1e29a3ef), TOBN(0xcbe906f0, 0x4c93302e),
- TOBN(0xd0107914, 0xceaae10e), TOBN(0xb7a23f34, 0xb68e19f8),
- TOBN(0xe9d875c2, 0xefd2119d), TOBN(0x03198c6e, 0xfcadc9c8),
- TOBN(0x65591bf6, 0x4da17113), TOBN(0x3cf0bbf8, 0x3d443038),
- TOBN(0xae485bb7, 0x2b724759), TOBN(0x945353e1, 0xb2d4c63a),
- TOBN(0x82159d07, 0xde7d6f2c), TOBN(0x389caef3, 0x4ec5b109),
- TOBN(0x4a8ebb53, 0xdb65ef14), TOBN(0x2dc2cb7e, 0xdd99de43),
- TOBN(0x816fa3ed, 0x83f2405f), TOBN(0x73429bb9, 0xc14208a3),
- TOBN(0xb618d590, 0xb01e6e27), TOBN(0x047e2ccd, 0xe180b2dc),
- TOBN(0xd1b299b5, 0x04aea4a9), TOBN(0x412c9e1e, 0x9fa403a4),
- TOBN(0x88d28a36, 0x79407552), TOBN(0x49c50136, 0xf332b8e3),
- TOBN(0x3a1b6fcc, 0xe668de19), TOBN(0x178851bc, 0x75122b97),
- TOBN(0xb1e13752, 0xfb85fa4c), TOBN(0xd61257ce, 0x383c8ce9),
- TOBN(0xd43da670, 0xd2f74dae), TOBN(0xa35aa23f, 0xbf846bbb),
- TOBN(0x5e74235d, 0x4421fc83), TOBN(0xf6df8ee0, 0xc363473b),
- TOBN(0x34d7f52a, 0x3c4aa158), TOBN(0x50d05aab, 0x9bc6d22e),
- TOBN(0x8c56e735, 0xa64785f4), TOBN(0xbc56637b, 0x5f29cd07),
- TOBN(0x53b2bb80, 0x3ee35067), TOBN(0x50235a0f, 0xdc919270),
- TOBN(0x191ab6d8, 0xf2c4aa65), TOBN(0xc3475831, 0x8396023b),
- TOBN(0x80400ba5, 0xf0f805ba), TOBN(0x8881065b, 0x5ec0f80f),
- TOBN(0xc370e522, 0xcc1b5e83), TOBN(0xde2d4ad1, 0x860b8bfb),
- TOBN(0xad364df0, 0x67b256df), TOBN(0x8f12502e, 0xe0138997),
- TOBN(0x503fa0dc, 0x7783920a), TOBN(0xe80014ad, 0xc0bc866a),
- TOBN(0x3f89b744, 0xd3064ba6), TOBN(0x03511dcd, 0xcba5dba5),
- TOBN(0x197dd46d, 0x95a7b1a2), TOBN(0x9c4e7ad6, 0x3c6341fb),
- TOBN(0x426eca29, 0x484c2ece), TOBN(0x9211e489, 0xde7f4f8a),
- TOBN(0x14997f6e, 0xc78ef1f4), TOBN(0x2b2c0910, 0x06574586),
- TOBN(0x17286a6e, 0x1c3eede8), TOBN(0x25f92e47, 0x0f60e018),
- TOBN(0x805c5646, 0x31890a36), TOBN(0x703ef600, 0x57feea5b),
- TOBN(0x389f747c, 0xaf3c3030), TOBN(0xe0e5daeb, 0x54dd3739),
- TOBN(0xfe24a4c3, 0xc9c9f155), TOBN(0x7e4bf176, 0xb5393962),
- TOBN(0x37183de2, 0xaf20bf29), TOBN(0x4a1bd7b5, 0xf95a8c3b),
- TOBN(0xa83b9699, 0x46191d3d), TOBN(0x281fc8dd, 0x7b87f257),
- TOBN(0xb18e2c13, 0x54107588), TOBN(0x6372def7, 0x9b2bafe8),
- TOBN(0xdaf4bb48, 0x0d8972ca), TOBN(0x3f2dd4b7, 0x56167a3f),
- TOBN(0x1eace32d, 0x84310cf4), TOBN(0xe3bcefaf, 0xe42700aa),
- TOBN(0x5fe5691e, 0xd785e73d), TOBN(0xa5db5ab6, 0x2ea60467),
- TOBN(0x02e23d41, 0xdfc6514a), TOBN(0x35e8048e, 0xe03c3665),
- TOBN(0x3f8b118f, 0x1adaa0f8), TOBN(0x28ec3b45, 0x84ce1a5a),
- TOBN(0xe8cacc6e, 0x2c6646b8), TOBN(0x1343d185, 0xdbd0e40f),
- TOBN(0xe5d7f844, 0xcaaa358c), TOBN(0x1a1db7e4, 0x9924182a),
- TOBN(0xd64cd42d, 0x9c875d9a), TOBN(0xb37b515f, 0x042eeec8),
- TOBN(0x4d4dd409, 0x7b165fbe), TOBN(0xfc322ed9, 0xe206eff3),
- TOBN(0x7dee4102, 0x59b7e17e), TOBN(0x55a481c0, 0x8236ca00),
- TOBN(0x8c885312, 0xc23fc975), TOBN(0x15715806, 0x05d6297b),
- TOBN(0xa078868e, 0xf78edd39), TOBN(0x956b31e0, 0x03c45e52),
- TOBN(0x470275d5, 0xff7b33a6), TOBN(0xc8d5dc3a, 0x0c7e673f),
- TOBN(0x419227b4, 0x7e2f2598), TOBN(0x8b37b634, 0x4c14a975),
- TOBN(0xd0667ed6, 0x8b11888c), TOBN(0x5e0e8c3e, 0x803e25dc),
- TOBN(0x34e5d0dc, 0xb987a24a), TOBN(0x9f40ac3b, 0xae920323),
- TOBN(0x5463de95, 0x34e0f63a), TOBN(0xa128bf92, 0x6b6328f9),
- TOBN(0x491ccd7c, 0xda64f1b7), TOBN(0x7ef1ec27, 0xc47bde35),
- TOBN(0xa857240f, 0xa36a2737), TOBN(0x35dc1366, 0x63621bc1),
- TOBN(0x7a3a6453, 0xd4fb6897), TOBN(0x80f1a439, 0xc929319d),
- TOBN(0xfc18274b, 0xf8cb0ba0), TOBN(0xb0b53766, 0x8078c5eb),
- TOBN(0xfb0d4924, 0x1e01d0ef), TOBN(0x50d7c67d, 0x372ab09c),
- TOBN(0xb4e370af, 0x3aeac968), TOBN(0xe4f7fee9, 0xc4b63266),
- TOBN(0xb4acd4c2, 0xe3ac5664), TOBN(0xf8910bd2, 0xceb38cbf),
- TOBN(0x1c3ae50c, 0xc9c0726e), TOBN(0x15309569, 0xd97b40bf),
- TOBN(0x70884b7f, 0xfd5a5a1b), TOBN(0x3890896a, 0xef8314cd),
- TOBN(0x58e1515c, 0xa5618c93), TOBN(0xe665432b, 0x77d942d1),
- TOBN(0xb32181bf, 0xb6f767a8), TOBN(0x753794e8, 0x3a604110),
- TOBN(0x09afeb7c, 0xe8c0dbcc), TOBN(0x31e02613, 0x598673a3),
- TOBN(0x5d98e557, 0x7d46db00), TOBN(0xfc21fb8c, 0x9d985b28),
- TOBN(0xc9040116, 0xb0843e0b), TOBN(0x53b1b3a8, 0x69b04531),
- TOBN(0xdd1649f0, 0x85d7d830), TOBN(0xbb3bcc87, 0xcb7427e8),
- TOBN(0x77261100, 0xc93dce83), TOBN(0x7e79da61, 0xa1922a2a),
- TOBN(0x587a2b02, 0xf3149ce8), TOBN(0x147e1384, 0xde92ec83),
- TOBN(0x484c83d3, 0xaf077f30), TOBN(0xea78f844, 0x0658b53a),
- TOBN(0x912076c2, 0x027aec53), TOBN(0xf34714e3, 0x93c8177d),
- TOBN(0x37ef5d15, 0xc2376c84), TOBN(0x8315b659, 0x3d1aa783),
- TOBN(0x3a75c484, 0xef852a90), TOBN(0x0ba0c58a, 0x16086bd4),
- TOBN(0x29688d7a, 0x529a6d48), TOBN(0x9c7f250d, 0xc2f19203),
- TOBN(0x123042fb, 0x682e2df9), TOBN(0x2b7587e7, 0xad8121bc),
- TOBN(0x30fc0233, 0xe0182a65), TOBN(0xb82ecf87, 0xe3e1128a),
- TOBN(0x71682861, 0x93fb098f), TOBN(0x043e21ae, 0x85e9e6a7),
- TOBN(0xab5b49d6, 0x66c834ea), TOBN(0x3be43e18, 0x47414287),
- TOBN(0xf40fb859, 0x219a2a47), TOBN(0x0e6559e9, 0xcc58df3c),
- TOBN(0xfe1dfe8e, 0x0c6615b4), TOBN(0x14abc8fd, 0x56459d70),
- TOBN(0x7be0fa8e, 0x05de0386), TOBN(0x8e63ef68, 0xe9035c7c),
- TOBN(0x116401b4, 0x53b31e91), TOBN(0x0cba7ad4, 0x4436b4d8),
- TOBN(0x9151f9a0, 0x107afd66), TOBN(0xafaca8d0, 0x1f0ee4c4),
- TOBN(0x75fe5c1d, 0x9ee9761c), TOBN(0x3497a16b, 0xf0c0588f),
- TOBN(0x3ee2bebd, 0x0304804c), TOBN(0xa8fb9a60, 0xc2c990b9),
- TOBN(0xd14d32fe, 0x39251114), TOBN(0x36bf25bc, 0xcac73366),
- TOBN(0xc9562c66, 0xdba7495c), TOBN(0x324d301b, 0x46ad348b),
- TOBN(0x9f46620c, 0xd670407e), TOBN(0x0ea8d4f1, 0xe3733a01),
- TOBN(0xd396d532, 0xb0c324e0), TOBN(0x5b211a0e, 0x03c317cd),
- TOBN(0x090d7d20, 0x5ffe7b37), TOBN(0x3b7f3efb, 0x1747d2da),
- TOBN(0xa2cb525f, 0xb54fc519), TOBN(0x6e220932, 0xf66a971e),
- TOBN(0xddc160df, 0xb486d440), TOBN(0x7fcfec46, 0x3fe13465),
- TOBN(0x83da7e4e, 0x76e4c151), TOBN(0xd6fa48a1, 0xd8d302b5),
- TOBN(0xc6304f26, 0x5872cd88), TOBN(0x806c1d3c, 0x278b90a1),
- TOBN(0x3553e725, 0xcaf0bc1c), TOBN(0xff59e603, 0xbb9d8d5c),
- TOBN(0xa4550f32, 0x7a0b85dd), TOBN(0xdec5720a, 0x93ecc217),
- TOBN(0x0b88b741, 0x69d62213), TOBN(0x7212f245, 0x5b365955),
- TOBN(0x20764111, 0xb5cae787), TOBN(0x13cb7f58, 0x1dfd3124),
- TOBN(0x2dca77da, 0x1175aefb), TOBN(0xeb75466b, 0xffaae775),
- TOBN(0x74d76f3b, 0xdb6cff32), TOBN(0x7440f37a, 0x61fcda9a),
- TOBN(0x1bb3ac92, 0xb525028b), TOBN(0x20fbf8f7, 0xa1975f29),
- TOBN(0x982692e1, 0xdf83097f), TOBN(0x28738f6c, 0x554b0800),
- TOBN(0xdc703717, 0xa2ce2f2f), TOBN(0x7913b93c, 0x40814194),
- TOBN(0x04924593, 0x1fe89636), TOBN(0x7b98443f, 0xf78834a6),
- TOBN(0x11c6ab01, 0x5114a5a1), TOBN(0x60deb383, 0xffba5f4c),
- TOBN(0x4caa54c6, 0x01a982e6), TOBN(0x1dd35e11, 0x3491cd26),
- TOBN(0x973c315f, 0x7cbd6b05), TOBN(0xcab00775, 0x52494724),
- TOBN(0x04659b1f, 0x6565e15a), TOBN(0xbf30f529, 0x8c8fb026),
- TOBN(0xfc21641b, 0xa8a0de37), TOBN(0xe9c7a366, 0xfa5e5114),
- TOBN(0xdb849ca5, 0x52f03ad8), TOBN(0xc7e8dbe9, 0x024e35c0),
- TOBN(0xa1a2bbac, 0xcfc3c789), TOBN(0xbf733e7d, 0x9c26f262),
- TOBN(0x882ffbf5, 0xb8444823), TOBN(0xb7224e88, 0x6bf8483b),
- TOBN(0x53023b8b, 0x65bef640), TOBN(0xaabfec91, 0xd4d5f8cd),
- TOBN(0xa40e1510, 0x079ea1bd), TOBN(0x1ad9addc, 0xd05d5d26),
- TOBN(0xdb3f2eab, 0x13e68d4f), TOBN(0x1cff1ae2, 0x640f803f),
- TOBN(0xe0e7b749, 0xd4cee117), TOBN(0x8e9f275b, 0x4036d909),
- TOBN(0xce34e31d, 0x8f4d4c38), TOBN(0x22b37f69, 0xd75130fc),
- TOBN(0x83e0f1fd, 0xb4014604), TOBN(0xa8ce9919, 0x89415078),
- TOBN(0x82375b75, 0x41792efe), TOBN(0x4f59bf5c, 0x97d4515b),
- TOBN(0xac4f324f, 0x923a277d), TOBN(0xd9bc9b7d, 0x650f3406),
- TOBN(0xc6fa87d1, 0x8a39bc51), TOBN(0x82588530, 0x5ccc108f),
- TOBN(0x5ced3c9f, 0x82e4c634), TOBN(0x8efb8314, 0x3a4464f8),
- TOBN(0xe706381b, 0x7a1dca25), TOBN(0x6cd15a3c, 0x5a2a412b),
- TOBN(0x9347a8fd, 0xbfcd8fb5), TOBN(0x31db2eef, 0x6e54cd22),
- TOBN(0xc4aeb11e, 0xf8d8932f), TOBN(0x11e7c1ed, 0x344411af),
- TOBN(0x2653050c, 0xdc9a151e), TOBN(0x9edbfc08, 0x3bb0a859),
- TOBN(0x926c81c7, 0xfd5691e7), TOBN(0x9c1b2342, 0x6f39019a),
- TOBN(0x64a81c8b, 0x7f8474b9), TOBN(0x90657c07, 0x01761819),
- TOBN(0x390b3331, 0x55e0375a), TOBN(0xc676c626, 0xb6ebc47d),
- TOBN(0x51623247, 0xb7d6dee8), TOBN(0x0948d927, 0x79659313),
- TOBN(0x99700161, 0xe9ab35ed), TOBN(0x06cc32b4, 0x8ddde408),
- TOBN(0x6f2fd664, 0x061ef338), TOBN(0x1606fa02, 0xc202e9ed),
- TOBN(0x55388bc1, 0x929ba99b), TOBN(0xc4428c5e, 0x1e81df69),
- TOBN(0xce2028ae, 0xf91b0b2a), TOBN(0xce870a23, 0xf03dfd3f),
- TOBN(0x66ec2c87, 0x0affe8ed), TOBN(0xb205fb46, 0x284d0c00),
- TOBN(0xbf5dffe7, 0x44cefa48), TOBN(0xb6fc37a8, 0xa19876d7),
- TOBN(0xbecfa84c, 0x08b72863), TOBN(0xd7205ff5, 0x2576374f),
- TOBN(0x80330d32, 0x8887de41), TOBN(0x5de0df0c, 0x869ea534),
- TOBN(0x13f42753, 0x3c56ea17), TOBN(0xeb1f6069, 0x452b1a78),
- TOBN(0x50474396, 0xe30ea15c), TOBN(0x575816a1, 0xc1494125),
- TOBN(0xbe1ce55b, 0xfe6bb38f), TOBN(0xb901a948, 0x96ae30f7),
- TOBN(0xe5af0f08, 0xd8fc3548), TOBN(0x5010b5d0, 0xd73bfd08),
- TOBN(0x993d2880, 0x53fe655a), TOBN(0x99f2630b, 0x1c1309fd),
- TOBN(0xd8677baf, 0xb4e3b76f), TOBN(0x14e51ddc, 0xb840784b),
- TOBN(0x326c750c, 0xbf0092ce), TOBN(0xc83d306b, 0xf528320f),
- TOBN(0xc4456715, 0x77d4715c), TOBN(0xd30019f9, 0x6b703235),
- TOBN(0x207ccb2e, 0xd669e986), TOBN(0x57c824af, 0xf6dbfc28),
- TOBN(0xf0eb532f, 0xd8f92a23), TOBN(0x4a557fd4, 0x9bb98fd2),
- TOBN(0xa57acea7, 0xc1e6199a), TOBN(0x0c663820, 0x8b94b1ed),
- TOBN(0x9b42be8f, 0xf83a9266), TOBN(0xc7741c97, 0x0101bd45),
- TOBN(0x95770c11, 0x07bd9ceb), TOBN(0x1f50250a, 0x8b2e0744),
- TOBN(0xf762eec8, 0x1477b654), TOBN(0xc65b900e, 0x15efe59a),
- TOBN(0x88c96148, 0x9546a897), TOBN(0x7e8025b3, 0xc30b4d7c),
- TOBN(0xae4065ef, 0x12045cf9), TOBN(0x6fcb2caf, 0x9ccce8bd),
- TOBN(0x1fa0ba4e, 0xf2cf6525), TOBN(0xf683125d, 0xcb72c312),
- TOBN(0xa01da4ea, 0xe312410e), TOBN(0x67e28677, 0x6cd8e830),
- TOBN(0xabd95752, 0x98fb3f07), TOBN(0x05f11e11, 0xeef649a5),
- TOBN(0xba47faef, 0x9d3472c2), TOBN(0x3adff697, 0xc77d1345),
- TOBN(0x4761fa04, 0xdd15afee), TOBN(0x64f1f61a, 0xb9e69462),
- TOBN(0xfa691fab, 0x9bfb9093), TOBN(0x3df8ae8f, 0xa1133dfe),
- TOBN(0xcd5f8967, 0x58cc710d), TOBN(0xfbb88d50, 0x16c7fe79),
- TOBN(0x8e011b4c, 0xe88c50d1), TOBN(0x7532e807, 0xa8771c4f),
- TOBN(0x64c78a48, 0xe2278ee4), TOBN(0x0b283e83, 0x3845072a),
- TOBN(0x98a6f291, 0x49e69274), TOBN(0xb96e9668, 0x1868b21c),
- TOBN(0x38f0adc2, 0xb1a8908e), TOBN(0x90afcff7, 0x1feb829d),
- TOBN(0x9915a383, 0x210b0856), TOBN(0xa5a80602, 0xdef04889),
- TOBN(0x800e9af9, 0x7c64d509), TOBN(0x81382d0b, 0xb8996f6f),
- TOBN(0x490eba53, 0x81927e27), TOBN(0x46c63b32, 0x4af50182),
- TOBN(0x784c5fd9, 0xd3ad62ce), TOBN(0xe4fa1870, 0xf8ae8736),
- TOBN(0x4ec9d0bc, 0xd7466b25), TOBN(0x84ddbe1a, 0xdb235c65),
- TOBN(0x5e2645ee, 0x163c1688), TOBN(0x570bd00e, 0x00eba747),
- TOBN(0xfa51b629, 0x128bfa0f), TOBN(0x92fce1bd, 0x6c1d3b68),
- TOBN(0x3e7361dc, 0xb66778b1), TOBN(0x9c7d249d, 0x5561d2bb),
- TOBN(0xa40b28bf, 0x0bbc6229), TOBN(0x1c83c05e, 0xdfd91497),
- TOBN(0x5f9f5154, 0xf083df05), TOBN(0xbac38b3c, 0xeee66c9d),
- TOBN(0xf71db7e3, 0xec0dfcfd), TOBN(0xf2ecda8e, 0x8b0a8416),
- TOBN(0x52fddd86, 0x7812aa66), TOBN(0x2896ef10, 0x4e6f4272),
- TOBN(0xff27186a, 0x0fe9a745), TOBN(0x08249fcd, 0x49ca70db),
- TOBN(0x7425a2e6, 0x441cac49), TOBN(0xf4a0885a, 0xece5ff57),
- TOBN(0x6e2cb731, 0x7d7ead58), TOBN(0xf96cf7d6, 0x1898d104),
- TOBN(0xafe67c9d, 0x4f2c9a89), TOBN(0x89895a50, 0x1c7bf5bc),
- TOBN(0xdc7cb8e5, 0x573cecfa), TOBN(0x66497eae, 0xd15f03e6),
- TOBN(0x6bc0de69, 0x3f084420), TOBN(0x323b9b36, 0xacd532b0),
- TOBN(0xcfed390a, 0x0115a3c1), TOBN(0x9414c40b, 0x2d65ca0e),
- TOBN(0x641406bd, 0x2f530c78), TOBN(0x29369a44, 0x833438f2),
- TOBN(0x996884f5, 0x903fa271), TOBN(0xe6da0fd2, 0xb9da921e),
- TOBN(0xa6f2f269, 0x5db01e54), TOBN(0x1ee3e9bd, 0x6876214e),
- TOBN(0xa26e181c, 0xe27a9497), TOBN(0x36d254e4, 0x8e215e04),
- TOBN(0x42f32a6c, 0x252cabca), TOBN(0x99481487, 0x80b57614),
- TOBN(0x4c4dfe69, 0x40d9cae1), TOBN(0x05869580, 0x11a10f09),
- TOBN(0xca287b57, 0x3491b64b), TOBN(0x77862d5d, 0x3fd4a53b),
- TOBN(0xbf94856e, 0x50349126), TOBN(0x2be30bd1, 0x71c5268f),
- TOBN(0x10393f19, 0xcbb650a6), TOBN(0x639531fe, 0x778cf9fd),
- TOBN(0x02556a11, 0xb2935359), TOBN(0xda38aa96, 0xaf8c126e),
- TOBN(0x47dbe6c2, 0x0960167f), TOBN(0x37bbabb6, 0x501901cd),
- TOBN(0xb6e979e0, 0x2c947778), TOBN(0xd69a5175, 0x7a1a1dc6),
- TOBN(0xc3ed5095, 0x9d9faf0c), TOBN(0x4dd9c096, 0x1d5fa5f0),
- TOBN(0xa0c4304d, 0x64f16ea8), TOBN(0x8b1cac16, 0x7e718623),
- TOBN(0x0b576546, 0x7c67f03e), TOBN(0x559cf5ad, 0xcbd88c01),
- TOBN(0x074877bb, 0x0e2af19a), TOBN(0x1f717ec1, 0xa1228c92),
- TOBN(0x70bcb800, 0x326e8920), TOBN(0xec6e2c5c, 0x4f312804),
- TOBN(0x426aea7d, 0x3fca4752), TOBN(0xf12c0949, 0x2211f62a),
- TOBN(0x24beecd8, 0x7be7b6b5), TOBN(0xb77eaf4c, 0x36d7a27d),
- TOBN(0x154c2781, 0xfda78fd3), TOBN(0x848a83b0, 0x264eeabe),
- TOBN(0x81287ef0, 0x4ffe2bc4), TOBN(0x7b6d88c6, 0xb6b6fc2a),
- TOBN(0x805fb947, 0xce417d99), TOBN(0x4b93dcc3, 0x8b916cc4),
- TOBN(0x72e65bb3, 0x21273323), TOBN(0xbcc1badd, 0x6ea9886e),
- TOBN(0x0e223011, 0x4bc5ee85), TOBN(0xa561be74, 0xc18ee1e4),
- TOBN(0x762fd2d4, 0xa6bcf1f1), TOBN(0x50e6a5a4, 0x95231489),
- TOBN(0xca96001f, 0xa00b500b), TOBN(0x5c098cfc, 0x5d7dcdf5),
- TOBN(0xa64e2d2e, 0x8c446a85), TOBN(0xbae9bcf1, 0x971f3c62),
- TOBN(0x4ec22683, 0x8435a2c5), TOBN(0x8ceaed6c, 0x4bad4643),
- TOBN(0xe9f8fb47, 0xccccf4e3), TOBN(0xbd4f3fa4, 0x1ce3b21e),
- TOBN(0xd79fb110, 0xa3db3292), TOBN(0xe28a37da, 0xb536c66a),
- TOBN(0x279ce87b, 0x8e49e6a9), TOBN(0x70ccfe8d, 0xfdcec8e3),
- TOBN(0x2193e4e0, 0x3ba464b2), TOBN(0x0f39d60e, 0xaca9a398),
- TOBN(0x7d7932af, 0xf82c12ab), TOBN(0xd8ff50ed, 0x91e7e0f7),
- TOBN(0xea961058, 0xfa28a7e0), TOBN(0xc726cf25, 0x0bf5ec74),
- TOBN(0xe74d55c8, 0xdb229666), TOBN(0x0bd9abbf, 0xa57f5799),
- TOBN(0x7479ef07, 0x4dfc47b3), TOBN(0xd9c65fc3, 0x0c52f91d),
- TOBN(0x8e0283fe, 0x36a8bde2), TOBN(0xa32a8b5e, 0x7d4b7280),
- TOBN(0x6a677c61, 0x12e83233), TOBN(0x0fbb3512, 0xdcc9bf28),
- TOBN(0x562e8ea5, 0x0d780f61), TOBN(0x0db8b22b, 0x1dc4e89c),
- TOBN(0x0a6fd1fb, 0x89be0144), TOBN(0x8c77d246, 0xca57113b),
- TOBN(0x4639075d, 0xff09c91c), TOBN(0x5b47b17f, 0x5060824c),
- TOBN(0x58aea2b0, 0x16287b52), TOBN(0xa1343520, 0xd0cd8eb0),
- TOBN(0x6148b4d0, 0xc5d58573), TOBN(0xdd2b6170, 0x291c68ae),
- TOBN(0xa61b3929, 0x1da3b3b7), TOBN(0x5f946d79, 0x08c4ac10),
- TOBN(0x4105d4a5, 0x7217d583), TOBN(0x5061da3d, 0x25e6de5e),
- TOBN(0x3113940d, 0xec1b4991), TOBN(0xf12195e1, 0x36f485ae),
- TOBN(0xa7507fb2, 0x731a2ee0), TOBN(0x95057a8e, 0x6e9e196e),
- TOBN(0xa3c2c911, 0x2e130136), TOBN(0x97dfbb36, 0x33c60d15),
- TOBN(0xcaf3c581, 0xb300ee2b), TOBN(0x77f25d90, 0xf4bac8b8),
- TOBN(0xdb1c4f98, 0x6d840cd6), TOBN(0x471d62c0, 0xe634288c),
- TOBN(0x8ec2f85e, 0xcec8a161), TOBN(0x41f37cbc, 0xfa6f4ae2),
- TOBN(0x6793a20f, 0x4b709985), TOBN(0x7a7bd33b, 0xefa8985b),
- TOBN(0x2c6a3fbd, 0x938e6446), TOBN(0x19042619, 0x2a8d47c1),
- TOBN(0x16848667, 0xcc36975f), TOBN(0x02acf168, 0x9d5f1dfb),
- TOBN(0x62d41ad4, 0x613baa94), TOBN(0xb56fbb92, 0x9f684670),
- TOBN(0xce610d0d, 0xe9e40569), TOBN(0x7b99c65f, 0x35489fef),
- TOBN(0x0c88ad1b, 0x3df18b97), TOBN(0x81b7d9be, 0x5d0e9edb),
- TOBN(0xd85218c0, 0xc716cc0a), TOBN(0xf4b5ff90, 0x85691c49),
- TOBN(0xa4fd666b, 0xce356ac6), TOBN(0x17c72895, 0x4b327a7a),
- TOBN(0xf93d5085, 0xda6be7de), TOBN(0xff71530e, 0x3301d34e),
- TOBN(0x4cd96442, 0xd8f448e8), TOBN(0x9283d331, 0x2ed18ffa),
- TOBN(0x4d33dd99, 0x2a849870), TOBN(0xa716964b, 0x41576335),
- TOBN(0xff5e3a9b, 0x179be0e5), TOBN(0x5b9d6b1b, 0x83b13632),
- TOBN(0x3b8bd7d4, 0xa52f313b), TOBN(0xc9dd95a0, 0x637a4660),
- TOBN(0x30035962, 0x0b3e218f), TOBN(0xce1481a3, 0xc7b28a3c),
- TOBN(0xab41b43a, 0x43228d83), TOBN(0x24ae1c30, 0x4ad63f99),
- TOBN(0x8e525f1a, 0x46a51229), TOBN(0x14af860f, 0xcd26d2b4),
- TOBN(0xd6baef61, 0x3f714aa1), TOBN(0xf51865ad, 0xeb78795e),
- TOBN(0xd3e21fce, 0xe6a9d694), TOBN(0x82ceb1dd, 0x8a37b527)}
-};
+static const BN_ULONG ecp_nistz256_precomputed[37][64 * sizeof(P256_POINT_AFFINE) / sizeof(BN_ULONG)]
+ = {
+ { TOBN(0x79e730d4, 0x18a9143c), TOBN(0x75ba95fc, 0x5fedb601),
+ TOBN(0x79fb732b, 0x77622510), TOBN(0x18905f76, 0xa53755c6),
+ TOBN(0xddf25357, 0xce95560a), TOBN(0x8b4ab8e4, 0xba19e45c),
+ TOBN(0xd2e88688, 0xdd21f325), TOBN(0x8571ff18, 0x25885d85),
+ TOBN(0x850046d4, 0x10ddd64d), TOBN(0xaa6ae3c1, 0xa433827d),
+ TOBN(0x73220503, 0x8d1490d9), TOBN(0xf6bb32e4, 0x3dcf3a3b),
+ TOBN(0x2f3648d3, 0x61bee1a5), TOBN(0x152cd7cb, 0xeb236ff8),
+ TOBN(0x19a8fb0e, 0x92042dbe), TOBN(0x78c57751, 0x0a5b8a3b),
+ TOBN(0xffac3f90, 0x4eebc127), TOBN(0xb027f84a, 0x087d81fb),
+ TOBN(0x66ad77dd, 0x87cbbc98), TOBN(0x26936a3f, 0xb6ff747e),
+ TOBN(0xb04c5c1f, 0xc983a7eb), TOBN(0x583e47ad, 0x0861fe1a),
+ TOBN(0x78820831, 0x1a2ee98e), TOBN(0xd5f06a29, 0xe587cc07),
+ TOBN(0x74b0b50d, 0x46918dcc), TOBN(0x4650a6ed, 0xc623c173),
+ TOBN(0x0cdaacac, 0xe8100af2), TOBN(0x577362f5, 0x41b0176b),
+ TOBN(0x2d96f24c, 0xe4cbaba6), TOBN(0x17628471, 0xfad6f447),
+ TOBN(0x6b6c36de, 0xe5ddd22e), TOBN(0x84b14c39, 0x4c5ab863),
+ TOBN(0xbe1b8aae, 0xc45c61f5), TOBN(0x90ec649a, 0x94b9537d),
+ TOBN(0x941cb5aa, 0xd076c20c), TOBN(0xc9079605, 0x890523c8),
+ TOBN(0xeb309b4a, 0xe7ba4f10), TOBN(0x73c568ef, 0xe5eb882b),
+ TOBN(0x3540a987, 0x7e7a1f68), TOBN(0x73a076bb, 0x2dd1e916),
+ TOBN(0x40394737, 0x3e77664a), TOBN(0x55ae744f, 0x346cee3e),
+ TOBN(0xd50a961a, 0x5b17a3ad), TOBN(0x13074b59, 0x54213673),
+ TOBN(0x93d36220, 0xd377e44b), TOBN(0x299c2b53, 0xadff14b5),
+ TOBN(0xf424d44c, 0xef639f11), TOBN(0xa4c9916d, 0x4a07f75f),
+ TOBN(0x0746354e, 0xa0173b4f), TOBN(0x2bd20213, 0xd23c00f7),
+ TOBN(0xf43eaab5, 0x0c23bb08), TOBN(0x13ba5119, 0xc3123e03),
+ TOBN(0x2847d030, 0x3f5b9d4d), TOBN(0x6742f2f2, 0x5da67bdd),
+ TOBN(0xef933bdc, 0x77c94195), TOBN(0xeaedd915, 0x6e240867),
+ TOBN(0x27f14cd1, 0x9499a78f), TOBN(0x462ab5c5, 0x6f9b3455),
+ TOBN(0x8f90f02a, 0xf02cfc6b), TOBN(0xb763891e, 0xb265230d),
+ TOBN(0xf59da3a9, 0x532d4977), TOBN(0x21e3327d, 0xcf9eba15),
+ TOBN(0x123c7b84, 0xbe60bbf0), TOBN(0x56ec12f2, 0x7706df76),
+ TOBN(0x75c96e8f, 0x264e20e8), TOBN(0xabe6bfed, 0x59a7a841),
+ TOBN(0x2cc09c04, 0x44c8eb00), TOBN(0xe05b3080, 0xf0c4e16b),
+ TOBN(0x1eb7777a, 0xa45f3314), TOBN(0x56af7bed, 0xce5d45e3),
+ TOBN(0x2b6e019a, 0x88b12f1a), TOBN(0x086659cd, 0xfd835f9b),
+ TOBN(0x2c18dbd1, 0x9dc21ec8), TOBN(0x98f9868a, 0x0fcf8139),
+ TOBN(0x737d2cd6, 0x48250b49), TOBN(0xcc61c947, 0x24b3428f),
+ TOBN(0x0c2b4078, 0x80dd9e76), TOBN(0xc43a8991, 0x383fbe08),
+ TOBN(0x5f7d2d65, 0x779be5d2), TOBN(0x78719a54, 0xeb3b4ab5),
+ TOBN(0xea7d260a, 0x6245e404), TOBN(0x9de40795, 0x6e7fdfe0),
+ TOBN(0x1ff3a415, 0x8dac1ab5), TOBN(0x3e7090f1, 0x649c9073),
+ TOBN(0x1a768561, 0x2b944e88), TOBN(0x250f939e, 0xe57f61c8),
+ TOBN(0x0c0daa89, 0x1ead643d), TOBN(0x68930023, 0xe125b88e),
+ TOBN(0x04b71aa7, 0xd2697768), TOBN(0xabdedef5, 0xca345a33),
+ TOBN(0x2409d29d, 0xee37385e), TOBN(0x4ee1df77, 0xcb83e156),
+ TOBN(0x0cac12d9, 0x1cbb5b43), TOBN(0x170ed2f6, 0xca895637),
+ TOBN(0x28228cfa, 0x8ade6d66), TOBN(0x7ff57c95, 0x53238aca),
+ TOBN(0xccc42563, 0x4b2ed709), TOBN(0x0e356769, 0x856fd30d),
+ TOBN(0xbcbcd43f, 0x559e9811), TOBN(0x738477ac, 0x5395b759),
+ TOBN(0x35752b90, 0xc00ee17f), TOBN(0x68748390, 0x742ed2e3),
+ TOBN(0x7cd06422, 0xbd1f5bc1), TOBN(0xfbc08769, 0xc9e7b797),
+ TOBN(0xa242a35b, 0xb0cf664a), TOBN(0x126e48f7, 0x7f9707e3),
+ TOBN(0x1717bf54, 0xc6832660), TOBN(0xfaae7332, 0xfd12c72e),
+ TOBN(0x27b52db7, 0x995d586b), TOBN(0xbe29569e, 0x832237c2),
+ TOBN(0xe8e4193e, 0x2a65e7db), TOBN(0x152706dc, 0x2eaa1bbb),
+ TOBN(0x72bcd8b7, 0xbc60055b), TOBN(0x03cc23ee, 0x56e27e4b),
+ TOBN(0xee337424, 0xe4819370), TOBN(0xe2aa0e43, 0x0ad3da09),
+ TOBN(0x40b8524f, 0x6383c45d), TOBN(0xd7663554, 0x42a41b25),
+ TOBN(0x64efa6de, 0x778a4797), TOBN(0x2042170a, 0x7079adf4),
+ TOBN(0x808b0b65, 0x0bc6fb80), TOBN(0x5882e075, 0x3ffe2e6b),
+ TOBN(0xd5ef2f7c, 0x2c83f549), TOBN(0x54d63c80, 0x9103b723),
+ TOBN(0xf2f11bd6, 0x52a23f9b), TOBN(0x3670c319, 0x4b0b6587),
+ TOBN(0x55c4623b, 0xb1580e9e), TOBN(0x64edf7b2, 0x01efe220),
+ TOBN(0x97091dcb, 0xd53c5c9d), TOBN(0xf17624b6, 0xac0a177b),
+ TOBN(0xb0f13975, 0x2cfe2dff), TOBN(0xc1a35c0a, 0x6c7a574e),
+ TOBN(0x227d3146, 0x93e79987), TOBN(0x0575bf30, 0xe89cb80e),
+ TOBN(0x2f4e247f, 0x0d1883bb), TOBN(0xebd51226, 0x3274c3d0),
+ TOBN(0x5f3e51c8, 0x56ada97a), TOBN(0x4afc964d, 0x8f8b403e),
+ TOBN(0xa6f247ab, 0x412e2979), TOBN(0x675abd1b, 0x6f80ebda),
+ TOBN(0x66a2bd72, 0x5e485a1d), TOBN(0x4b2a5caf, 0x8f4f0b3c),
+ TOBN(0x2626927f, 0x1b847bba), TOBN(0x6c6fc7d9, 0x0502394d),
+ TOBN(0xfea912ba, 0xa5659ae8), TOBN(0x68363aba, 0x25e1a16e),
+ TOBN(0xb8842277, 0x752c41ac), TOBN(0xfe545c28, 0x2897c3fc),
+ TOBN(0x2d36e9e7, 0xdc4c696b), TOBN(0x5806244a, 0xfba977c5),
+ TOBN(0x85665e9b, 0xe39508c1), TOBN(0xf720ee25, 0x6d12597b),
+ TOBN(0x8a979129, 0xd2337a31), TOBN(0x5916868f, 0x0f862bdc),
+ TOBN(0x048099d9, 0x5dd283ba), TOBN(0xe2d1eeb6, 0xfe5bfb4e),
+ TOBN(0x82ef1c41, 0x7884005d), TOBN(0xa2d4ec17, 0xffffcbae),
+ TOBN(0x9161c53f, 0x8aa95e66), TOBN(0x5ee104e1, 0xc5fee0d0),
+ TOBN(0x562e4cec, 0xc135b208), TOBN(0x74e1b265, 0x4783f47d),
+ TOBN(0x6d2a506c, 0x5a3f3b30), TOBN(0xecead9f4, 0xc16762fc),
+ TOBN(0xf29dd4b2, 0xe286e5b9), TOBN(0x1b0fadc0, 0x83bb3c61),
+ TOBN(0x7a75023e, 0x7fac29a4), TOBN(0xc086d5f1, 0xc9477fa3),
+ TOBN(0x0fc61135, 0x2f6f3076), TOBN(0xc99ffa23, 0xe3912a9a),
+ TOBN(0x6a0b0685, 0xd2f8ba3d), TOBN(0xfdc777e8, 0xe93358a4),
+ TOBN(0x94a787bb, 0x35415f04), TOBN(0x640c2d6a, 0x4d23fea4),
+ TOBN(0x9de917da, 0x153a35b5), TOBN(0x793e8d07, 0x5d5cd074),
+ TOBN(0xf4f87653, 0x2de45068), TOBN(0x37c7a7e8, 0x9e2e1f6e),
+ TOBN(0xd0825fa2, 0xa3584069), TOBN(0xaf2cea7c, 0x1727bf42),
+ TOBN(0x0360a4fb, 0x9e4785a9), TOBN(0xe5fda49c, 0x27299f4a),
+ TOBN(0x48068e13, 0x71ac2f71), TOBN(0x83d0687b, 0x9077666f),
+ TOBN(0x6d3883b2, 0x15d02819), TOBN(0x6d0d7550, 0x40dd9a35),
+ TOBN(0x61d7cbf9, 0x1d2b469f), TOBN(0xf97b232f, 0x2efc3115),
+ TOBN(0xa551d750, 0xb24bcbc7), TOBN(0x11ea4949, 0x88a1e356),
+ TOBN(0x7669f031, 0x93cb7501), TOBN(0x595dc55e, 0xca737b8a),
+ TOBN(0xa4a319ac, 0xd837879f), TOBN(0x6fc1b49e, 0xed6b67b0),
+ TOBN(0xe3959933, 0x32f1f3af), TOBN(0x966742eb, 0x65432a2e),
+ TOBN(0x4b8dc9fe, 0xb4966228), TOBN(0x96cc6312, 0x43f43950),
+ TOBN(0x12068859, 0xc9b731ee), TOBN(0x7b948dc3, 0x56f79968),
+ TOBN(0x61e4ad32, 0xed1f8008), TOBN(0xe6c9267a, 0xd8b17538),
+ TOBN(0x1ac7c5eb, 0x857ff6fb), TOBN(0x994baaa8, 0x55f2fb10),
+ TOBN(0x84cf14e1, 0x1d248018), TOBN(0x5a39898b, 0x628ac508),
+ TOBN(0x14fde97b, 0x5fa944f5), TOBN(0xed178030, 0xd12e5ac7),
+ TOBN(0x042c2af4, 0x97e2feb4), TOBN(0xd36a42d7, 0xaebf7313),
+ TOBN(0x49d2c9eb, 0x084ffdd7), TOBN(0x9f8aa54b, 0x2ef7c76a),
+ TOBN(0x9200b7ba, 0x09895e70), TOBN(0x3bd0c66f, 0xddb7fb58),
+ TOBN(0x2d97d108, 0x78eb4cbb), TOBN(0x2d431068, 0xd84bde31),
+ TOBN(0x4b523eb7, 0x172ccd1f), TOBN(0x7323cb28, 0x30a6a892),
+ TOBN(0x97082ec0, 0xcfe153eb), TOBN(0xe97f6b6a, 0xf2aadb97),
+ TOBN(0x1d3d393e, 0xd1a83da1), TOBN(0xa6a7f9c7, 0x804b2a68),
+ TOBN(0x4a688b48, 0x2d0cb71e), TOBN(0xa9b4cc5f, 0x40585278),
+ TOBN(0x5e5db46a, 0xcb66e132), TOBN(0xf1be963a, 0x0d925880),
+ TOBN(0x944a7027, 0x0317b9e2), TOBN(0xe266f959, 0x48603d48),
+ TOBN(0x98db6673, 0x5c208899), TOBN(0x90472447, 0xa2fb18a3),
+ TOBN(0x8a966939, 0x777c619f), TOBN(0x3798142a, 0x2a3be21b),
+ TOBN(0xb4241cb1, 0x3298b343), TOBN(0xa3a14e49, 0xb44f65a1),
+ TOBN(0xc5f4d6cd, 0x3ac77acd), TOBN(0xd0288cb5, 0x52b6fc3c),
+ TOBN(0xd5cc8c2f, 0x1c040abc), TOBN(0xb675511e, 0x06bf9b4a),
+ TOBN(0xd667da37, 0x9b3aa441), TOBN(0x460d45ce, 0x51601f72),
+ TOBN(0xe2f73c69, 0x6755ff89), TOBN(0xdd3cf7e7, 0x473017e6),
+ TOBN(0x8ef5689d, 0x3cf7600d), TOBN(0x948dc4f8, 0xb1fc87b4),
+ TOBN(0xd9e9fe81, 0x4ea53299), TOBN(0x2d921ca2, 0x98eb6028),
+ TOBN(0xfaecedfd, 0x0c9803fc), TOBN(0xf38ae891, 0x4d7b4745),
+ TOBN(0xd8c5fccf, 0xc5e3a3d8), TOBN(0xbefd904c, 0x4079dfbf),
+ TOBN(0xbc6d6a58, 0xfead0197), TOBN(0x39227077, 0x695532a4),
+ TOBN(0x09e23e6d, 0xdbef42f5), TOBN(0x7e449b64, 0x480a9908),
+ TOBN(0x7b969c1a, 0xad9a2e40), TOBN(0x6231d792, 0x9591c2a4),
+ TOBN(0x87151456, 0x0f664534), TOBN(0x85ceae7c, 0x4b68f103),
+ TOBN(0xac09c4ae, 0x65578ab9), TOBN(0x33ec6868, 0xf044b10c),
+ TOBN(0x6ac4832b, 0x3a8ec1f1), TOBN(0x5509d128, 0x5847d5ef),
+ TOBN(0xf909604f, 0x763f1574), TOBN(0xb16c4303, 0xc32f63c4),
+ TOBN(0xb6ab2014, 0x7ca23cd3), TOBN(0xcaa7a5c6, 0xa391849d),
+ TOBN(0x5b0673a3, 0x75678d94), TOBN(0xc982ddd4, 0xdd303e64),
+ TOBN(0xfd7b000b, 0x5db6f971), TOBN(0xbba2cb1f, 0x6f876f92),
+ TOBN(0xc77332a3, 0x3c569426), TOBN(0xa159100c, 0x570d74f8),
+ TOBN(0xfd16847f, 0xdec67ef5), TOBN(0x742ee464, 0x233e76b7),
+ TOBN(0x0b8e4134, 0xefc2b4c8), TOBN(0xca640b86, 0x42a3e521),
+ TOBN(0x653a0190, 0x8ceb6aa9), TOBN(0x313c300c, 0x547852d5),
+ TOBN(0x24e4ab12, 0x6b237af7), TOBN(0x2ba90162, 0x8bb47af8),
+ TOBN(0x3d5e58d6, 0xa8219bb7), TOBN(0xc691d0bd, 0x1b06c57f),
+ TOBN(0x0ae4cb10, 0xd257576e), TOBN(0x3569656c, 0xd54a3dc3),
+ TOBN(0xe5ebaebd, 0x94cda03a), TOBN(0x934e82d3, 0x162bfe13),
+ TOBN(0x450ac0ba, 0xe251a0c6), TOBN(0x480b9e11, 0xdd6da526),
+ TOBN(0x00467bc5, 0x8cce08b5), TOBN(0xb636458c, 0x7f178d55),
+ TOBN(0xc5748bae, 0xa677d806), TOBN(0x2763a387, 0xdfa394eb),
+ TOBN(0xa12b448a, 0x7d3cebb6), TOBN(0xe7adda3e, 0x6f20d850),
+ TOBN(0xf63ebce5, 0x1558462c), TOBN(0x58b36143, 0x620088a8),
+ TOBN(0x8a2cc3ca, 0x4d63c0ee), TOBN(0x51233117, 0x0fe948ce),
+ TOBN(0x7463fd85, 0x222ef33b), TOBN(0xadf0c7dc, 0x7c603d6c),
+ TOBN(0x0ec32d3b, 0xfe7765e5), TOBN(0xccaab359, 0xbf380409),
+ TOBN(0xbdaa84d6, 0x8e59319c), TOBN(0xd9a4c280, 0x9c80c34d),
+ TOBN(0xa9d89488, 0xa059c142), TOBN(0x6f5ae714, 0xff0b9346),
+ TOBN(0x068f237d, 0x16fb3664), TOBN(0x5853e4c4, 0x363186ac),
+ TOBN(0xe2d87d23, 0x63c52f98), TOBN(0x2ec4a766, 0x81828876),
+ TOBN(0x47b864fa, 0xe14e7b1c), TOBN(0x0c0bc0e5, 0x69192408),
+ TOBN(0xe4d7681d, 0xb82e9f3e), TOBN(0x83200f0b, 0xdf25e13c),
+ TOBN(0x8909984c, 0x66f27280), TOBN(0x462d7b00, 0x75f73227),
+ TOBN(0xd90ba188, 0xf2651798), TOBN(0x74c6e18c, 0x36ab1c34),
+ TOBN(0xab256ea3, 0x5ef54359), TOBN(0x03466612, 0xd1aa702f),
+ TOBN(0x624d6049, 0x2ed22e91), TOBN(0x6fdfe0b5, 0x6f072822),
+ TOBN(0xeeca1115, 0x39ce2271), TOBN(0x98100a4f, 0xdb01614f),
+ TOBN(0xb6b0daa2, 0xa35c628f), TOBN(0xb6f94d2e, 0xc87e9a47),
+ TOBN(0xc6773259, 0x1d57d9ce), TOBN(0xf70bfeec, 0x03884a7b),
+ TOBN(0x5fb35ccf, 0xed2bad01), TOBN(0xa155cbe3, 0x1da6a5c7),
+ TOBN(0xc2e2594c, 0x30a92f8f), TOBN(0x649c89ce, 0x5bfafe43),
+ TOBN(0xd158667d, 0xe9ff257a), TOBN(0x9b359611, 0xf32c50ae),
+ TOBN(0x4b00b20b, 0x906014cf), TOBN(0xf3a8cfe3, 0x89bc7d3d),
+ TOBN(0x4ff23ffd, 0x248a7d06), TOBN(0x80c5bfb4, 0x878873fa),
+ TOBN(0xb7d9ad90, 0x05745981), TOBN(0x179c85db, 0x3db01994),
+ TOBN(0xba41b062, 0x61a6966c), TOBN(0x4d82d052, 0xeadce5a8),
+ TOBN(0x9e91cd3b, 0xa5e6a318), TOBN(0x47795f4f, 0x95b2dda0),
+ TOBN(0xecfd7c1f, 0xd55a897c), TOBN(0x009194ab, 0xb29110fb),
+ TOBN(0x5f0e2046, 0xe381d3b0), TOBN(0x5f3425f6, 0xa98dd291),
+ TOBN(0xbfa06687, 0x730d50da), TOBN(0x0423446c, 0x4b083b7f),
+ TOBN(0x397a247d, 0xd69d3417), TOBN(0xeb629f90, 0x387ba42a),
+ TOBN(0x1ee426cc, 0xd5cd79bf), TOBN(0x0032940b, 0x946c6e18),
+ TOBN(0x1b1e8ae0, 0x57477f58), TOBN(0xe94f7d34, 0x6d823278),
+ TOBN(0xc747cb96, 0x782ba21a), TOBN(0xc5254469, 0xf72b33a5),
+ TOBN(0x772ef6de, 0xc7f80c81), TOBN(0xd73acbfe, 0x2cd9e6b5),
+ TOBN(0x4075b5b1, 0x49ee90d9), TOBN(0x785c339a, 0xa06e9eba),
+ TOBN(0xa1030d5b, 0xabf825e0), TOBN(0xcec684c3, 0xa42931dc),
+ TOBN(0x42ab62c9, 0xc1586e63), TOBN(0x45431d66, 0x5ab43f2b),
+ TOBN(0x57c8b2c0, 0x55f7835d), TOBN(0x033da338, 0xc1b7f865),
+ TOBN(0x283c7513, 0xcaa76097), TOBN(0x0a624fa9, 0x36c83906),
+ TOBN(0x6b20afec, 0x715af2c7), TOBN(0x4b969974, 0xeba78bfd),
+ TOBN(0x220755cc, 0xd921d60e), TOBN(0x9b944e10, 0x7baeca13),
+ TOBN(0x04819d51, 0x5ded93d4), TOBN(0x9bbff86e, 0x6dddfd27),
+ TOBN(0x6b344130, 0x77adc612), TOBN(0xa7496529, 0xbbd803a0),
+ TOBN(0x1a1baaa7, 0x6d8805bd), TOBN(0xc8403902, 0x470343ad),
+ TOBN(0x39f59f66, 0x175adff1), TOBN(0x0b26d7fb, 0xb7d8c5b7),
+ TOBN(0xa875f5ce, 0x529d75e3), TOBN(0x85efc7e9, 0x41325cc2),
+ TOBN(0x21950b42, 0x1ff6acd3), TOBN(0xffe70484, 0x53dc6909),
+ TOBN(0xff4cd0b2, 0x28766127), TOBN(0xabdbe608, 0x4fb7db2b),
+ TOBN(0x837c9228, 0x5e1109e8), TOBN(0x26147d27, 0xf4645b5a),
+ TOBN(0x4d78f592, 0xf7818ed8), TOBN(0xd394077e, 0xf247fa36),
+ TOBN(0x0fb9c2d0, 0x488c171a), TOBN(0xa78bfbaa, 0x13685278),
+ TOBN(0xedfbe268, 0xd5b1fa6a), TOBN(0x0dceb8db, 0x2b7eaba7),
+ TOBN(0xbf9e8089, 0x9ae2b710), TOBN(0xefde7ae6, 0xa4449c96),
+ TOBN(0x43b7716b, 0xcc143a46), TOBN(0xd7d34194, 0xc3628c13),
+ TOBN(0x508cec1c, 0x3b3f64c9), TOBN(0xe20bc0ba, 0x1e5edf3f),
+ TOBN(0xda1deb85, 0x2f4318d4), TOBN(0xd20ebe0d, 0x5c3fa443),
+ TOBN(0x370b4ea7, 0x73241ea3), TOBN(0x61f1511c, 0x5e1a5f65),
+ TOBN(0x99a5e23d, 0x82681c62), TOBN(0xd731e383, 0xa2f54c2d),
+ TOBN(0x2692f36e, 0x83445904), TOBN(0x2e0ec469, 0xaf45f9c0),
+ TOBN(0x905a3201, 0xc67528b7), TOBN(0x88f77f34, 0xd0e5e542),
+ TOBN(0xf67a8d29, 0x5864687c), TOBN(0x23b92eae, 0x22df3562),
+ TOBN(0x5c27014b, 0x9bbec39e), TOBN(0x7ef2f226, 0x9c0f0f8d),
+ TOBN(0x97359638, 0x546c4d8d), TOBN(0x5f9c3fc4, 0x92f24679),
+ TOBN(0x912e8bed, 0xa8c8acd9), TOBN(0xec3a318d, 0x306634b0),
+ TOBN(0x80167f41, 0xc31cb264), TOBN(0x3db82f6f, 0x522113f2),
+ TOBN(0xb155bcd2, 0xdcafe197), TOBN(0xfba1da59, 0x43465283),
+ TOBN(0xa0425b8e, 0xb212cf53), TOBN(0x4f2e512e, 0xf8557c5f),
+ TOBN(0xc1286ff9, 0x25c4d56c), TOBN(0xbb8a0fea, 0xee26c851),
+ TOBN(0xc28f70d2, 0xe7d6107e), TOBN(0x7ee0c444, 0xe76265aa),
+ TOBN(0x3df277a4, 0x1d1936b1), TOBN(0x1a556e3f, 0xea9595eb),
+ TOBN(0x258bbbf9, 0xe7305683), TOBN(0x31eea5bf, 0x07ef5be6),
+ TOBN(0x0deb0e4a, 0x46c814c1), TOBN(0x5cee8449, 0xa7b730dd),
+ TOBN(0xeab495c5, 0xa0182bde), TOBN(0xee759f87, 0x9e27a6b4),
+ TOBN(0xc2cf6a68, 0x80e518ca), TOBN(0x25e8013f, 0xf14cf3f4),
+ TOBN(0x8fc44140, 0x7e8d7a14), TOBN(0xbb1ff3ca, 0x9556f36a),
+ TOBN(0x6a844385, 0x14600044), TOBN(0xba3f0c4a, 0x7451ae63),
+ TOBN(0xdfcac25b, 0x1f9af32a), TOBN(0x01e0db86, 0xb1f2214b),
+ TOBN(0x4e9a5bc2, 0xa4b596ac), TOBN(0x83927681, 0x026c2c08),
+ TOBN(0x3ec832e7, 0x7acaca28), TOBN(0x1bfeea57, 0xc7385b29),
+ TOBN(0x068212e3, 0xfd1eaf38), TOBN(0xc1329830, 0x6acf8ccc),
+ TOBN(0xb909f2db, 0x2aac9e59), TOBN(0x5748060d, 0xb661782a),
+ TOBN(0xc5ab2632, 0xc79b7a01), TOBN(0xda44c6c6, 0x00017626),
+ TOBN(0xf26c00e8, 0xa7ea82f0), TOBN(0x99cac80d, 0xe4299aaf),
+ TOBN(0xd66fe3b6, 0x7ed78be1), TOBN(0x305f725f, 0x648d02cd),
+ TOBN(0x33ed1bc4, 0x623fb21b), TOBN(0xfa70533e, 0x7a6319ad),
+ TOBN(0x17ab562d, 0xbe5ffb3e), TOBN(0x06374994, 0x56674741),
+ TOBN(0x69d44ed6, 0x5c46aa8e), TOBN(0x2100d5d3, 0xa8d063d1),
+ TOBN(0xcb9727ea, 0xa2d17c36), TOBN(0x4c2bab1b, 0x8add53b7),
+ TOBN(0xa084e90c, 0x15426704), TOBN(0x778afcd3, 0xa837ebea),
+ TOBN(0x6651f701, 0x7ce477f8), TOBN(0xa0624998, 0x46fb7a8b),
+ TOBN(0xdc1e6828, 0xed8a6e19), TOBN(0x33fc2336, 0x4189d9c7),
+ TOBN(0x026f8fe2, 0x671c39bc), TOBN(0xd40c4ccd, 0xbc6f9915),
+ TOBN(0xafa135bb, 0xf80e75ca), TOBN(0x12c651a0, 0x22adff2c),
+ TOBN(0xc40a04bd, 0x4f51ad96), TOBN(0x04820109, 0xbbe4e832),
+ TOBN(0x3667eb1a, 0x7f4c04cc), TOBN(0x59556621, 0xa9404f84),
+ TOBN(0x71cdf653, 0x7eceb50a), TOBN(0x994a44a6, 0x9b8335fa),
+ TOBN(0xd7faf819, 0xdbeb9b69), TOBN(0x473c5680, 0xeed4350d),
+ TOBN(0xb6658466, 0xda44bba2), TOBN(0x0d1bc780, 0x872bdbf3),
+ TOBN(0xe535f175, 0xa1962f91), TOBN(0x6ed7e061, 0xed58f5a7),
+ TOBN(0x177aa4c0, 0x2089a233), TOBN(0x0dbcb03a, 0xe539b413),
+ TOBN(0xe3dc424e, 0xbb32e38e), TOBN(0x6472e5ef, 0x6806701e),
+ TOBN(0xdd47ff98, 0x814be9ee), TOBN(0x6b60cfff, 0x35ace009),
+ TOBN(0xb8d3d931, 0x9ff91fe5), TOBN(0x039c4800, 0xf0518eed),
+ TOBN(0x95c37632, 0x9182cb26), TOBN(0x0763a434, 0x82fc568d),
+ TOBN(0x707c04d5, 0x383e76ba), TOBN(0xac98b930, 0x824e8197),
+ TOBN(0x92bf7c8f, 0x91230de0), TOBN(0x90876a01, 0x40959b70),
+ TOBN(0xdb6d96f3, 0x05968b80), TOBN(0x380a0913, 0x089f73b9),
+ TOBN(0x7da70b83, 0xc2c61e01), TOBN(0x95fb8394, 0x569b38c7),
+ TOBN(0x9a3c6512, 0x80edfe2f), TOBN(0x8f726bb9, 0x8faeaf82),
+ TOBN(0x8010a4a0, 0x78424bf8), TOBN(0x29672044, 0x0e844970) },
+ { TOBN(0x63c5cb81, 0x7a2ad62a), TOBN(0x7ef2b6b9, 0xac62ff54),
+ TOBN(0x3749bba4, 0xb3ad9db5), TOBN(0xad311f2c, 0x46d5a617),
+ TOBN(0xb77a8087, 0xc2ff3b6d), TOBN(0xb46feaf3, 0x367834ff),
+ TOBN(0xf8aa266d, 0x75d6b138), TOBN(0xfa38d320, 0xec008188),
+ TOBN(0x486d8ffa, 0x696946fc), TOBN(0x50fbc6d8, 0xb9cba56d),
+ TOBN(0x7e3d423e, 0x90f35a15), TOBN(0x7c3da195, 0xc0dd962c),
+ TOBN(0xe673fdb0, 0x3cfd5d8b), TOBN(0x0704b7c2, 0x889dfca5),
+ TOBN(0xf6ce581f, 0xf52305aa), TOBN(0x399d49eb, 0x914d5e53),
+ TOBN(0x380a496d, 0x6ec293cd), TOBN(0x733dbda7, 0x8e7051f5),
+ TOBN(0x037e388d, 0xb849140a), TOBN(0xee4b32b0, 0x5946dbf6),
+ TOBN(0xb1c4fda9, 0xcae368d1), TOBN(0x5001a7b0, 0xfdb0b2f3),
+ TOBN(0x6df59374, 0x2e3ac46e), TOBN(0x4af675f2, 0x39b3e656),
+ TOBN(0x44e38110, 0x39949296), TOBN(0x5b63827b, 0x361db1b5),
+ TOBN(0x3e5323ed, 0x206eaff5), TOBN(0x942370d2, 0xc21f4290),
+ TOBN(0xf2caaf2e, 0xe0d985a1), TOBN(0x192cc64b, 0x7239846d),
+ TOBN(0x7c0b8f47, 0xae6312f8), TOBN(0x7dc61f91, 0x96620108),
+ TOBN(0xb830fb5b, 0xc2da7de9), TOBN(0xd0e643df, 0x0ff8d3be),
+ TOBN(0x31ee77ba, 0x188a9641), TOBN(0x4e8aa3aa, 0xbcf6d502),
+ TOBN(0xf9fb6532, 0x9a49110f), TOBN(0xd18317f6, 0x2dd6b220),
+ TOBN(0x7e3ced41, 0x52c3ea5a), TOBN(0x0d296a14, 0x7d579c4a),
+ TOBN(0x35d6a53e, 0xed4c3717), TOBN(0x9f8240cf, 0x3d0ed2a3),
+ TOBN(0x8c0d4d05, 0xe5543aa5), TOBN(0x45d5bbfb, 0xdd33b4b4),
+ TOBN(0xfa04cc73, 0x137fd28e), TOBN(0x862ac6ef, 0xc73b3ffd),
+ TOBN(0x403ff9f5, 0x31f51ef2), TOBN(0x34d5e0fc, 0xbc73f5a2),
+ TOBN(0xf2526820, 0x08913f4f), TOBN(0xea20ed61, 0xeac93d95),
+ TOBN(0x51ed38b4, 0x6ca6b26c), TOBN(0x8662dcbc, 0xea4327b0),
+ TOBN(0x6daf295c, 0x725d2aaa), TOBN(0xbad2752f, 0x8e52dcda),
+ TOBN(0x2210e721, 0x0b17dacc), TOBN(0xa37f7912, 0xd51e8232),
+ TOBN(0x4f7081e1, 0x44cc3add), TOBN(0xd5ffa1d6, 0x87be82cf),
+ TOBN(0x89890b6c, 0x0edd6472), TOBN(0xada26e1a, 0x3ed17863),
+ TOBN(0x276f2715, 0x63483caa), TOBN(0xe6924cd9, 0x2f6077fd),
+ TOBN(0x05a7fe98, 0x0a466e3c), TOBN(0xf1c794b0, 0xb1902d1f),
+ TOBN(0xe5213688, 0x82a8042c), TOBN(0xd931cfaf, 0xcd278298),
+ TOBN(0x069a0ae0, 0xf597a740), TOBN(0x0adbb3f3, 0xeb59107c),
+ TOBN(0x983e951e, 0x5eaa8eb8), TOBN(0xe663a8b5, 0x11b48e78),
+ TOBN(0x1631cc0d, 0x8a03f2c5), TOBN(0x7577c11e, 0x11e271e2),
+ TOBN(0x33b2385c, 0x08369a90), TOBN(0x2990c59b, 0x190eb4f8),
+ TOBN(0x819a6145, 0xc68eac80), TOBN(0x7a786d62, 0x2ec4a014),
+ TOBN(0x33faadbe, 0x20ac3a8d), TOBN(0x31a21781, 0x5aba2d30),
+ TOBN(0x209d2742, 0xdba4f565), TOBN(0xdb2ce9e3, 0x55aa0fbb),
+ TOBN(0x8cef334b, 0x168984df), TOBN(0xe81dce17, 0x33879638),
+ TOBN(0xf6e6949c, 0x263720f0), TOBN(0x5c56feaf, 0xf593cbec),
+ TOBN(0x8bff5601, 0xfde58c84), TOBN(0x74e24117, 0x2eccb314),
+ TOBN(0xbcf01b61, 0x4c9a8a78), TOBN(0xa233e35e, 0x544c9868),
+ TOBN(0xb3156bf3, 0x8bd7aff1), TOBN(0x1b5ee4cb, 0x1d81b146),
+ TOBN(0x7ba1ac41, 0xd628a915), TOBN(0x8f3a8f9c, 0xfd89699e),
+ TOBN(0x7329b9c9, 0xa0748be7), TOBN(0x1d391c95, 0xa92e621f),
+ TOBN(0xe51e6b21, 0x4d10a837), TOBN(0xd255f53a, 0x4947b435),
+ TOBN(0x07669e04, 0xf1788ee3), TOBN(0xc14f27af, 0xa86938a2),
+ TOBN(0x8b47a334, 0xe93a01c0), TOBN(0xff627438, 0xd9366808),
+ TOBN(0x7a0985d8, 0xca2a5965), TOBN(0x3d9a5542, 0xd6e9b9b3),
+ TOBN(0xc23eb80b, 0x4cf972e8), TOBN(0x5c1c33bb, 0x4fdf72fd),
+ TOBN(0x0c4a58d4, 0x74a86108), TOBN(0xf8048a8f, 0xee4c5d90),
+ TOBN(0xe3c7c924, 0xe86d4c80), TOBN(0x28c889de, 0x056a1e60),
+ TOBN(0x57e2662e, 0xb214a040), TOBN(0xe8c48e98, 0x37e10347),
+ TOBN(0x87742862, 0x80ac748a), TOBN(0xf1c24022, 0x186b06f2),
+ TOBN(0xac2dd4c3, 0x5f74040a), TOBN(0x409aeb71, 0xfceac957),
+ TOBN(0x4fbad782, 0x55c4ec23), TOBN(0xb359ed61, 0x8a7b76ec),
+ TOBN(0x12744926, 0xed6f4a60), TOBN(0xe21e8d7f, 0x4b912de3),
+ TOBN(0xe2575a59, 0xfc705a59), TOBN(0x72f1d4de, 0xed2dbc0e),
+ TOBN(0x3d2b24b9, 0xeb7926b8), TOBN(0xbff88cb3, 0xcdbe5509),
+ TOBN(0xd0f399af, 0xe4dd640b), TOBN(0x3c5fe130, 0x2f76ed45),
+ TOBN(0x6f3562f4, 0x3764fb3d), TOBN(0x7b5af318, 0x3151b62d),
+ TOBN(0xd5bd0bc7, 0xd79ce5f3), TOBN(0xfdaf6b20, 0xec66890f),
+ TOBN(0x735c67ec, 0x6063540c), TOBN(0x50b259c2, 0xe5f9cb8f),
+ TOBN(0xb8734f9a, 0x3f99c6ab), TOBN(0xf8cc13d5, 0xa3a7bc85),
+ TOBN(0x80c1b305, 0xc5217659), TOBN(0xfe5364d4, 0x4ec12a54),
+ TOBN(0xbd87045e, 0x681345fe), TOBN(0x7f8efeb1, 0x582f897f),
+ TOBN(0xe8cbf1e5, 0xd5923359), TOBN(0xdb0cea9d, 0x539b9fb0),
+ TOBN(0x0c5b34cf, 0x49859b98), TOBN(0x5e583c56, 0xa4403cc6),
+ TOBN(0x11fc1a2d, 0xd48185b7), TOBN(0xc93fbc7e, 0x6e521787),
+ TOBN(0x47e7a058, 0x05105b8b), TOBN(0x7b4d4d58, 0xdb8260c8),
+ TOBN(0xe33930b0, 0x46eb842a), TOBN(0x8e844a9a, 0x7bdae56d),
+ TOBN(0x34ef3a9e, 0x13f7fdfc), TOBN(0xb3768f82, 0x636ca176),
+ TOBN(0x2821f4e0, 0x4e09e61c), TOBN(0x414dc3a1, 0xa0c7cddc),
+ TOBN(0xd5379437, 0x54945fcd), TOBN(0x151b6eef, 0xb3555ff1),
+ TOBN(0xb31bd613, 0x6339c083), TOBN(0x39ff8155, 0xdfb64701),
+ TOBN(0x7c3388d2, 0xe29604ab), TOBN(0x1e19084b, 0xa6b10442),
+ TOBN(0x17cf54c0, 0xeccd47ef), TOBN(0x89693385, 0x4a5dfb30),
+ TOBN(0x69d023fb, 0x47daf9f6), TOBN(0x9222840b, 0x7d91d959),
+ TOBN(0x439108f5, 0x803bac62), TOBN(0x0b7dd91d, 0x379bd45f),
+ TOBN(0xd651e827, 0xca63c581), TOBN(0x5c5d75f6, 0x509c104f),
+ TOBN(0x7d5fc738, 0x1f2dc308), TOBN(0x20faa7bf, 0xd98454be),
+ TOBN(0x95374bee, 0xa517b031), TOBN(0xf036b9b1, 0x642692ac),
+ TOBN(0xc5106109, 0x39842194), TOBN(0xb7e2353e, 0x49d05295),
+ TOBN(0xfc8c1d5c, 0xefb42ee0), TOBN(0xe04884eb, 0x08ce811c),
+ TOBN(0xf1f75d81, 0x7419f40e), TOBN(0x5b0ac162, 0xa995c241),
+ TOBN(0x120921bb, 0xc4c55646), TOBN(0x713520c2, 0x8d33cf97),
+ TOBN(0xb4a65a5c, 0xe98c5100), TOBN(0x6cec871d, 0x2ddd0f5a),
+ TOBN(0x251f0b7f, 0x9ba2e78b), TOBN(0x224a8434, 0xce3a2a5f),
+ TOBN(0x26827f61, 0x25f5c46f), TOBN(0x6a22bedc, 0x48545ec0),
+ TOBN(0x25ae5fa0, 0xb1bb5cdc), TOBN(0xd693682f, 0xfcb9b98f),
+ TOBN(0x32027fe8, 0x91e5d7d3), TOBN(0xf14b7d17, 0x73a07678),
+ TOBN(0xf88497b3, 0xc0dfdd61), TOBN(0xf7c2eec0, 0x2a8c4f48),
+ TOBN(0xaa5573f4, 0x3756e621), TOBN(0xc013a240, 0x1825b948),
+ TOBN(0x1c03b345, 0x63878572), TOBN(0xa0472bea, 0x653a4184),
+ TOBN(0xf4222e27, 0x0ac69a80), TOBN(0x34096d25, 0xf51e54f6),
+ TOBN(0x00a648cb, 0x8fffa591), TOBN(0x4e87acdc, 0x69b6527f),
+ TOBN(0x0575e037, 0xe285ccb4), TOBN(0x188089e4, 0x50ddcf52),
+ TOBN(0xaa96c9a8, 0x870ff719), TOBN(0x74a56cd8, 0x1fc7e369),
+ TOBN(0x41d04ee2, 0x1726931a), TOBN(0x0bbbb2c8, 0x3660ecfd),
+ TOBN(0xa6ef6de5, 0x24818e18), TOBN(0xe421cc51, 0xe7d57887),
+ TOBN(0xf127d208, 0xbea87be6), TOBN(0x16a475d3, 0xb1cdd682),
+ TOBN(0x9db1b684, 0x439b63f7), TOBN(0x5359b3db, 0xf0f113b6),
+ TOBN(0xdfccf1de, 0x8bf06e31), TOBN(0x1fdf8f44, 0xdd383901),
+ TOBN(0x10775cad, 0x5017e7d2), TOBN(0xdfc3a597, 0x58d11eef),
+ TOBN(0x6ec9c8a0, 0xb1ecff10), TOBN(0xee6ed6cc, 0x28400549),
+ TOBN(0xb5ad7bae, 0x1b4f8d73), TOBN(0x61b4f11d, 0xe00aaab9),
+ TOBN(0x7b32d69b, 0xd4eff2d7), TOBN(0x88ae6771, 0x4288b60f),
+ TOBN(0x159461b4, 0x37a1e723), TOBN(0x1f3d4789, 0x570aae8c),
+ TOBN(0x869118c0, 0x7f9871da), TOBN(0x35fbda78, 0xf635e278),
+ TOBN(0x738f3641, 0xe1541dac), TOBN(0x6794b13a, 0xc0dae45f),
+ TOBN(0x065064ac, 0x09cc0917), TOBN(0x27c53729, 0xc68540fd),
+ TOBN(0x0d2d4c8e, 0xef227671), TOBN(0xd23a9f80, 0xa1785a04),
+ TOBN(0x98c59528, 0x52650359), TOBN(0xfa09ad01, 0x74a1acad),
+ TOBN(0x082d5a29, 0x0b55bf5c), TOBN(0xa40f1c67, 0x419b8084),
+ TOBN(0x3a5c752e, 0xdcc18770), TOBN(0x4baf1f2f, 0x8825c3a5),
+ TOBN(0xebd63f74, 0x21b153ed), TOBN(0xa2383e47, 0xb2f64723),
+ TOBN(0xe7bf620a, 0x2646d19a), TOBN(0x56cb44ec, 0x03c83ffd),
+ TOBN(0xaf7267c9, 0x4f6be9f1), TOBN(0x8b2dfd7b, 0xc06bb5e9),
+ TOBN(0xb87072f2, 0xa672c5c7), TOBN(0xeacb11c8, 0x0d53c5e2),
+ TOBN(0x22dac29d, 0xff435932), TOBN(0x37bdb99d, 0x4408693c),
+ TOBN(0xf6e62fb6, 0x2899c20f), TOBN(0x3535d512, 0x447ece24),
+ TOBN(0xfbdc6b88, 0xff577ce3), TOBN(0x726693bd, 0x190575f2),
+ TOBN(0x6772b0e5, 0xab4b35a2), TOBN(0x1d8b6001, 0xf5eeaacf),
+ TOBN(0x728f7ce4, 0x795b9580), TOBN(0x4a20ed2a, 0x41fb81da),
+ TOBN(0x9f685cd4, 0x4fec01e6), TOBN(0x3ed7ddcc, 0xa7ff50ad),
+ TOBN(0x460fd264, 0x0c2d97fd), TOBN(0x3a241426, 0xeb82f4f9),
+ TOBN(0x17d1df2c, 0x6a8ea820), TOBN(0xb2b50d3b, 0xf22cc254),
+ TOBN(0x03856cba, 0xb7291426), TOBN(0x87fd26ae, 0x04f5ee39),
+ TOBN(0x9cb696cc, 0x02bee4ba), TOBN(0x53121804, 0x06820fd6),
+ TOBN(0xa5dfc269, 0x0212e985), TOBN(0x666f7ffa, 0x160f9a09),
+ TOBN(0xc503cd33, 0xbccd9617), TOBN(0x365dede4, 0xba7730a3),
+ TOBN(0x798c6355, 0x5ddb0786), TOBN(0xa6c3200e, 0xfc9cd3bc),
+ TOBN(0x060ffb2c, 0xe5e35efd), TOBN(0x99a4e25b, 0x5555a1c1),
+ TOBN(0x11d95375, 0xf70b3751), TOBN(0x0a57354a, 0x160e1bf6),
+ TOBN(0xecb3ae4b, 0xf8e4b065), TOBN(0x07a834c4, 0x2e53022b),
+ TOBN(0x1cd300b3, 0x8692ed96), TOBN(0x16a6f792, 0x61ee14ec),
+ TOBN(0x8f1063c6, 0x6a8649ed), TOBN(0xfbcdfcfe, 0x869f3e14),
+ TOBN(0x2cfb97c1, 0x00a7b3ec), TOBN(0xcea49b3c, 0x7130c2f1),
+ TOBN(0x462d044f, 0xe9d96488), TOBN(0x4b53d52e, 0x8182a0c1),
+ TOBN(0x84b6ddd3, 0x0391e9e9), TOBN(0x80ab7b48, 0xb1741a09),
+ TOBN(0xec0e15d4, 0x27d3317f), TOBN(0x8dfc1ddb, 0x1a64671e),
+ TOBN(0x93cc5d5f, 0xd49c5b92), TOBN(0xc995d53d, 0x3674a331),
+ TOBN(0x302e41ec, 0x090090ae), TOBN(0x2278a0cc, 0xedb06830),
+ TOBN(0x1d025932, 0xfbc99690), TOBN(0x0c32fbd2, 0xb80d68da),
+ TOBN(0xd79146da, 0xf341a6c1), TOBN(0xae0ba139, 0x1bef68a0),
+ TOBN(0xc6b8a563, 0x8d774b3a), TOBN(0x1cf307bd, 0x880ba4d7),
+ TOBN(0xc033bdc7, 0x19803511), TOBN(0xa9f97b3b, 0x8888c3be),
+ TOBN(0x3d68aebc, 0x85c6d05e), TOBN(0xc3b88a9d, 0x193919eb),
+ TOBN(0x2d300748, 0xc48b0ee3), TOBN(0x7506bc7c, 0x07a746c1),
+ TOBN(0xfc48437c, 0x6e6d57f3), TOBN(0x5bd71587, 0xcfeaa91a),
+ TOBN(0xa4ed0408, 0xc1bc5225), TOBN(0xd0b946db, 0x2719226d),
+ TOBN(0x109ecd62, 0x758d2d43), TOBN(0x75c8485a, 0x2751759b),
+ TOBN(0xb0b75f49, 0x9ce4177a), TOBN(0x4fa61a1e, 0x79c10c3d),
+ TOBN(0xc062d300, 0xa167fcd7), TOBN(0x4df3874c, 0x750f0fa8),
+ TOBN(0x29ae2cf9, 0x83dfedc9), TOBN(0xf8437134, 0x8d87631a),
+ TOBN(0xaf571711, 0x7429c8d2), TOBN(0x18d15867, 0x146d9272),
+ TOBN(0x83053ecf, 0x69769bb7), TOBN(0xc55eb856, 0xc479ab82),
+ TOBN(0x5ef7791c, 0x21b0f4b2), TOBN(0xaa5956ba, 0x3d491525),
+ TOBN(0x407a96c2, 0x9fe20eba), TOBN(0xf27168bb, 0xe52a5ad3),
+ TOBN(0x43b60ab3, 0xbf1d9d89), TOBN(0xe45c51ef, 0x710e727a),
+ TOBN(0xdfca5276, 0x099b4221), TOBN(0x8dc6407c, 0x2557a159),
+ TOBN(0x0ead8335, 0x91035895), TOBN(0x0a9db957, 0x9c55dc32),
+ TOBN(0xe40736d3, 0xdf61bc76), TOBN(0x13a619c0, 0x3f778cdb),
+ TOBN(0x6dd921a4, 0xc56ea28f), TOBN(0x76a52433, 0x2fa647b4),
+ TOBN(0x23591891, 0xac5bdc5d), TOBN(0xff4a1a72, 0xbac7dc01),
+ TOBN(0x9905e261, 0x62df8453), TOBN(0x3ac045df, 0xe63b265f),
+ TOBN(0x8a3f341b, 0xad53dba7), TOBN(0x8ec269cc, 0x837b625a),
+ TOBN(0xd71a2782, 0x3ae31189), TOBN(0x8fb4f9a3, 0x55e96120),
+ TOBN(0x804af823, 0xff9875cf), TOBN(0x23224f57, 0x5d442a9b),
+ TOBN(0x1c4d3b9e, 0xecc62679), TOBN(0x91da22fb, 0xa0e7ddb1),
+ TOBN(0xa370324d, 0x6c04a661), TOBN(0x9710d3b6, 0x5e376d17),
+ TOBN(0xed8c98f0, 0x3044e357), TOBN(0xc364ebbe, 0x6422701c),
+ TOBN(0x347f5d51, 0x7733d61c), TOBN(0xd55644b9, 0xcea826c3),
+ TOBN(0x80c6e0ad, 0x55a25548), TOBN(0x0aa7641d, 0x844220a7),
+ TOBN(0x1438ec81, 0x31810660), TOBN(0x9dfa6507, 0xde4b4043),
+ TOBN(0x10b515d8, 0xcc3e0273), TOBN(0x1b6066dd, 0x28d8cfb2),
+ TOBN(0xd3b04591, 0x9c9efebd), TOBN(0x425d4bdf, 0xa21c1ff4),
+ TOBN(0x5fe5af19, 0xd57607d3), TOBN(0xbbf773f7, 0x54481084),
+ TOBN(0x8435bd69, 0x94b03ed1), TOBN(0xd9ad1de3, 0x634cc546),
+ TOBN(0x2cf423fc, 0x00e420ca), TOBN(0xeed26d80, 0xa03096dd),
+ TOBN(0xd7f60be7, 0xa4db09d2), TOBN(0xf47f569d, 0x960622f7),
+ TOBN(0xe5925fd7, 0x7296c729), TOBN(0xeff2db26, 0x26ca2715),
+ TOBN(0xa6fcd014, 0xb913e759), TOBN(0x53da4786, 0x8ff4de93),
+ TOBN(0x14616d79, 0xc32068e1), TOBN(0xb187d664, 0xccdf352e),
+ TOBN(0xf7afb650, 0x1dc90b59), TOBN(0x8170e943, 0x7daa1b26),
+ TOBN(0xc8e3bdd8, 0x700c0a84), TOBN(0x6e8d345f, 0x6482bdfa),
+ TOBN(0x84cfbfa1, 0xc5c5ea50), TOBN(0xd3baf14c, 0x67960681),
+ TOBN(0x26398403, 0x0dd50942), TOBN(0xe4b7839c, 0x4716a663),
+ TOBN(0xd5f1f794, 0xe7de6dc0), TOBN(0x5cd0f4d4, 0x622aa7ce),
+ TOBN(0x5295f3f1, 0x59acfeec), TOBN(0x8d933552, 0x953e0607),
+ TOBN(0xc7db8ec5, 0x776c5722), TOBN(0xdc467e62, 0x2b5f290c),
+ TOBN(0xd4297e70, 0x4ff425a9), TOBN(0x4be924c1, 0x0cf7bb72),
+ TOBN(0x0d5dc5ae, 0xa1892131), TOBN(0x8bf8a8e3, 0xa705c992),
+ TOBN(0x73a0b064, 0x7a305ac5), TOBN(0x00c9ca4e, 0x9a8c77a8),
+ TOBN(0x5dfee80f, 0x83774bdd), TOBN(0x63131602, 0x85734485),
+ TOBN(0xa1b524ae, 0x914a69a9), TOBN(0xebc2ffaf, 0xd4e300d7),
+ TOBN(0x52c93db7, 0x7cfa46a5), TOBN(0x71e6161f, 0x21653b50),
+ TOBN(0x3574fc57, 0xa4bc580a), TOBN(0xc09015dd, 0xe1bc1253),
+ TOBN(0x4b7b47b2, 0xd174d7aa), TOBN(0x4072d8e8, 0xf3a15d04),
+ TOBN(0xeeb7d47f, 0xd6fa07ed), TOBN(0x6f2b9ff9, 0xedbdafb1),
+ TOBN(0x18c51615, 0x3760fe8a), TOBN(0x7a96e6bf, 0xf06c6c13),
+ TOBN(0x4d7a0410, 0x0ea2d071), TOBN(0xa1914e9b, 0x0be2a5ce),
+ TOBN(0x5726e357, 0xd8a3c5cf), TOBN(0x1197ecc3, 0x2abb2b13),
+ TOBN(0x6c0d7f7f, 0x31ae88dd), TOBN(0x15b20d1a, 0xfdbb3efe),
+ TOBN(0xcd06aa26, 0x70584039), TOBN(0x2277c969, 0xa7dc9747),
+ TOBN(0xbca69587, 0x7855d815), TOBN(0x899ea238, 0x5188b32a),
+ TOBN(0x37d9228b, 0x760c1c9d), TOBN(0xc7efbb11, 0x9b5c18da),
+ TOBN(0x7f0d1bc8, 0x19f6dbc5), TOBN(0x4875384b, 0x07e6905b),
+ TOBN(0xc7c50baa, 0x3ba8cd86), TOBN(0xb0ce40fb, 0xc2905de0),
+ TOBN(0x70840673, 0x7a231952), TOBN(0xa912a262, 0xcf43de26),
+ TOBN(0x9c38ddcc, 0xeb5b76c1), TOBN(0x746f5285, 0x26fc0ab4),
+ TOBN(0x52a63a50, 0xd62c269f), TOBN(0x60049c55, 0x99458621),
+ TOBN(0xe7f48f82, 0x3c2f7c9e), TOBN(0x6bd99043, 0x917d5cf3),
+ TOBN(0xeb1317a8, 0x8701f469), TOBN(0xbd3fe2ed, 0x9a449fe0),
+ TOBN(0x421e79ca, 0x12ef3d36), TOBN(0x9ee3c36c, 0x3e7ea5de),
+ TOBN(0xe48198b5, 0xcdff36f7), TOBN(0xaff4f967, 0xc6b82228),
+ TOBN(0x15e19dd0, 0xc47adb7e), TOBN(0x45699b23, 0x032e7dfa),
+ TOBN(0x40680c8b, 0x1fae026a), TOBN(0x5a347a48, 0x550dbf4d),
+ TOBN(0xe652533b, 0x3cef0d7d), TOBN(0xd94f7b18, 0x2bbb4381),
+ TOBN(0x838752be, 0x0e80f500), TOBN(0x8e6e2488, 0x9e9c9bfb),
+ TOBN(0xc9751697, 0x16caca6a), TOBN(0x866c49d8, 0x38531ad9),
+ TOBN(0xc917e239, 0x7151ade1), TOBN(0x2d016ec1, 0x6037c407),
+ TOBN(0xa407ccc9, 0x00eac3f9), TOBN(0x835f6280, 0xe2ed4748),
+ TOBN(0xcc54c347, 0x1cc98e0d), TOBN(0x0e969937, 0xdcb572eb),
+ TOBN(0x1b16c8e8, 0x8f30c9cb), TOBN(0xa606ae75, 0x373c4661),
+ TOBN(0x47aa689b, 0x35502cab), TOBN(0xf89014ae, 0x4d9bb64f),
+ TOBN(0x202f6a9c, 0x31c71f7b), TOBN(0x01f95aa3, 0x296ffe5c),
+ TOBN(0x5fc06014, 0x53cec3a3), TOBN(0xeb991237, 0x5f498a45),
+ TOBN(0xae9a935e, 0x5d91ba87), TOBN(0xc6ac6281, 0x0b564a19),
+ TOBN(0x8a8fe81c, 0x3bd44e69), TOBN(0x7c8b467f, 0x9dd11d45),
+ TOBN(0xf772251f, 0xea5b8e69), TOBN(0xaeecb3bd, 0xc5b75fbc),
+ TOBN(0x1aca3331, 0x887ff0e5), TOBN(0xbe5d49ff, 0x19f0a131),
+ TOBN(0x582c13aa, 0xe5c8646f), TOBN(0xdbaa12e8, 0x20e19980),
+ TOBN(0x8f40f31a, 0xf7abbd94), TOBN(0x1f13f5a8, 0x1dfc7663),
+ TOBN(0x5d81f1ee, 0xaceb4fc0), TOBN(0x36256002, 0x5e6f0f42),
+ TOBN(0x4b67d6d7, 0x751370c8), TOBN(0x2608b698, 0x03e80589),
+ TOBN(0xcfc0d2fc, 0x05268301), TOBN(0xa6943d39, 0x40309212),
+ TOBN(0x192a90c2, 0x1fd0e1c2), TOBN(0xb209f113, 0x37f1dc76),
+ TOBN(0xefcc5e06, 0x97bf1298), TOBN(0xcbdb6730, 0x219d639e),
+ TOBN(0xd009c116, 0xb81e8c6f), TOBN(0xa3ffdde3, 0x1a7ce2e5),
+ TOBN(0xc53fbaaa, 0xa914d3ba), TOBN(0x836d500f, 0x88df85ee),
+ TOBN(0xd98dc71b, 0x66ee0751), TOBN(0x5a3d7005, 0x714516fd),
+ TOBN(0x21d3634d, 0x39eedbba), TOBN(0x35cd2e68, 0x0455a46d),
+ TOBN(0xc8cafe65, 0xf9d7eb0c), TOBN(0xbda3ce9e, 0x00cefb3e),
+ TOBN(0xddc17a60, 0x2c9cf7a4), TOBN(0x01572ee4, 0x7bcb8773),
+ TOBN(0xa92b2b01, 0x8c7548df), TOBN(0x732fd309, 0xa84600e3),
+ TOBN(0xe22109c7, 0x16543a40), TOBN(0x9acafd36, 0xfede3c6c),
+ TOBN(0xfb206852, 0x6824e614), TOBN(0x2a4544a9, 0xda25dca0),
+ TOBN(0x25985262, 0x91d60b06), TOBN(0x281b7be9, 0x28753545),
+ TOBN(0xec667b1a, 0x90f13b27), TOBN(0x33a83aff, 0x940e2eb4),
+ TOBN(0x80009862, 0xd5d721d5), TOBN(0x0c3357a3, 0x5bd3a182),
+ TOBN(0x27f3a83b, 0x7aa2cda4), TOBN(0xb58ae74e, 0xf6f83085),
+ TOBN(0x2a911a81, 0x2e6dad6b), TOBN(0xde286051, 0xf43d6c5b),
+ TOBN(0x4bdccc41, 0xf996c4d8), TOBN(0xe7312ec0, 0x0ae1e24e) },
+ { TOBN(0xf8d112e7, 0x6e6485b3), TOBN(0x4d3e24db, 0x771c52f8),
+ TOBN(0x48e3ee41, 0x684a2f6d), TOBN(0x7161957d, 0x21d95551),
+ TOBN(0x19631283, 0xcdb12a6c), TOBN(0xbf3fa882, 0x2e50e164),
+ TOBN(0xf6254b63, 0x3166cc73), TOBN(0x3aefa7ae, 0xaee8cc38),
+ TOBN(0x79b0fe62, 0x3b36f9fd), TOBN(0x26543b23, 0xfde19fc0),
+ TOBN(0x136e64a0, 0x958482ef), TOBN(0x23f63771, 0x9b095825),
+ TOBN(0x14cfd596, 0xb6a1142e), TOBN(0x5ea6aac6, 0x335aac0b),
+ TOBN(0x86a0e8bd, 0xf3081dd5), TOBN(0x5fb89d79, 0x003dc12a),
+ TOBN(0xf615c33a, 0xf72e34d4), TOBN(0x0bd9ea40, 0x110eec35),
+ TOBN(0x1c12bc5b, 0xc1dea34e), TOBN(0x686584c9, 0x49ae4699),
+ TOBN(0x13ad95d3, 0x8c97b942), TOBN(0x4609561a, 0x4e5c7562),
+ TOBN(0x9e94a4ae, 0xf2737f89), TOBN(0xf57594c6, 0x371c78b6),
+ TOBN(0x0f0165fc, 0xe3779ee3), TOBN(0xe00e7f9d, 0xbd495d9e),
+ TOBN(0x1fa4efa2, 0x20284e7a), TOBN(0x4564bade, 0x47ac6219),
+ TOBN(0x90e6312a, 0xc4708e8e), TOBN(0x4f5725fb, 0xa71e9adf),
+ TOBN(0xe95f55ae, 0x3d684b9f), TOBN(0x47f7ccb1, 0x1e94b415),
+ TOBN(0x7322851b, 0x8d946581), TOBN(0xf0d13133, 0xbdf4a012),
+ TOBN(0xa3510f69, 0x6584dae0), TOBN(0x03a7c171, 0x3c9f6c6d),
+ TOBN(0x5be97f38, 0xe475381a), TOBN(0xca1ba422, 0x85823334),
+ TOBN(0xf83cc5c7, 0x0be17dda), TOBN(0x158b1494, 0x0b918c0f),
+ TOBN(0xda3a77e5, 0x522e6b69), TOBN(0x69c908c3, 0xbbcd6c18),
+ TOBN(0x1f1b9e48, 0xd924fd56), TOBN(0x37c64e36, 0xaa4bb3f7),
+ TOBN(0x5a4fdbdf, 0xee478d7d), TOBN(0xba75c8bc, 0x0193f7a0),
+ TOBN(0x84bc1e84, 0x56cd16df), TOBN(0x1fb08f08, 0x46fad151),
+ TOBN(0x8a7cabf9, 0x842e9f30), TOBN(0xa331d4bf, 0x5eab83af),
+ TOBN(0xd272cfba, 0x017f2a6a), TOBN(0x27560abc, 0x83aba0e3),
+ TOBN(0x94b83387, 0x0e3a6b75), TOBN(0x25c6aea2, 0x6b9f50f5),
+ TOBN(0x803d691d, 0xb5fdf6d0), TOBN(0x03b77509, 0xe6333514),
+ TOBN(0x36178903, 0x61a341c1), TOBN(0x3604dc60, 0x0cfd6142),
+ TOBN(0x022295eb, 0x8533316c), TOBN(0x3dbde4ac, 0x44af2922),
+ TOBN(0x898afc5d, 0x1c7eef69), TOBN(0x58896805, 0xd14f4fa1),
+ TOBN(0x05002160, 0x203c21ca), TOBN(0x6f0d1f30, 0x40ef730b),
+ TOBN(0x8e8c44d4, 0x196224f8), TOBN(0x75a4ab95, 0x374d079d),
+ TOBN(0x79085ecc, 0x7d48f123), TOBN(0x56f04d31, 0x1bf65ad8),
+ TOBN(0xe220bf1c, 0xbda602b2), TOBN(0x73ee1742, 0xf9612c69),
+ TOBN(0x76008fc8, 0x084fd06b), TOBN(0x4000ef9f, 0xf11380d1),
+ TOBN(0x48201b4b, 0x12cfe297), TOBN(0x3eee129c, 0x292f74e5),
+ TOBN(0xe1fe114e, 0xc9e874e8), TOBN(0x899b055c, 0x92c5fc41),
+ TOBN(0x4e477a64, 0x3a39c8cf), TOBN(0x82f09efe, 0x78963cc9),
+ TOBN(0x6fd3fd8f, 0xd333f863), TOBN(0x85132b2a, 0xdc949c63),
+ TOBN(0x7e06a3ab, 0x516eb17b), TOBN(0x73bec06f, 0xd2c7372b),
+ TOBN(0xe4f74f55, 0xba896da6), TOBN(0xbb4afef8, 0x8e9eb40f),
+ TOBN(0x2d75bec8, 0xe61d66b0), TOBN(0x02bda4b4, 0xef29300b),
+ TOBN(0x8bbaa8de, 0x026baa5a), TOBN(0xff54befd, 0xa07f4440),
+ TOBN(0xbd9b8b1d, 0xbe7a2af3), TOBN(0xec51caa9, 0x4fb74a72),
+ TOBN(0xb9937a4b, 0x63879697), TOBN(0x7c9a9d20, 0xec2687d5),
+ TOBN(0x1773e44f, 0x6ef5f014), TOBN(0x8abcf412, 0xe90c6900),
+ TOBN(0x387bd022, 0x8142161e), TOBN(0x50393755, 0xfcb6ff2a),
+ TOBN(0x9813fd56, 0xed6def63), TOBN(0x53cf6482, 0x7d53106c),
+ TOBN(0x991a35bd, 0x431f7ac1), TOBN(0xf1e274dd, 0x63e65faf),
+ TOBN(0xf63ffa3c, 0x44cc7880), TOBN(0x411a426b, 0x7c256981),
+ TOBN(0xb698b9fd, 0x93a420e0), TOBN(0x89fdddc0, 0xae53f8fe),
+ TOBN(0x766e0722, 0x32398baa), TOBN(0x205fee42, 0x5cfca031),
+ TOBN(0xa49f5341, 0x7a029cf2), TOBN(0xa88c68b8, 0x4023890d),
+ TOBN(0xbc275041, 0x7337aaa8), TOBN(0x9ed364ad, 0x0eb384f4),
+ TOBN(0xe0816f85, 0x29aba92f), TOBN(0x2e9e1941, 0x04e38a88),
+ TOBN(0x57eef44a, 0x3dafd2d5), TOBN(0x35d1fae5, 0x97ed98d8),
+ TOBN(0x50628c09, 0x2307f9b1), TOBN(0x09d84aae, 0xd6cba5c6),
+ TOBN(0x67071bc7, 0x88aaa691), TOBN(0x2dea57a9, 0xafe6cb03),
+ TOBN(0xdfe11bb4, 0x3d78ac01), TOBN(0x7286418c, 0x7fd7aa51),
+ TOBN(0xfabf7709, 0x77f7195a), TOBN(0x8ec86167, 0xadeb838f),
+ TOBN(0xea1285a8, 0xbb4f012d), TOBN(0xd6883503, 0x9a3eab3f),
+ TOBN(0xee5d24f8, 0x309004c2), TOBN(0xa96e4b76, 0x13ffe95e),
+ TOBN(0x0cdffe12, 0xbd223ea4), TOBN(0x8f5c2ee5, 0xb6739a53),
+ TOBN(0x5cb4aaa5, 0xdd968198), TOBN(0xfa131c52, 0x72413a6c),
+ TOBN(0x53d46a90, 0x9536d903), TOBN(0xb270f0d3, 0x48606d8e),
+ TOBN(0x518c7564, 0xa053a3bc), TOBN(0x088254b7, 0x1a86caef),
+ TOBN(0xb3ba8cb4, 0x0ab5efd0), TOBN(0x5c59900e, 0x4605945d),
+ TOBN(0xecace1dd, 0xa1887395), TOBN(0x40960f36, 0x932a65de),
+ TOBN(0x9611ff5c, 0x3aa95529), TOBN(0xc58215b0, 0x7c1e5a36),
+ TOBN(0xd48c9b58, 0xf0e1a524), TOBN(0xb406856b, 0xf590dfb8),
+ TOBN(0xc7605e04, 0x9cd95662), TOBN(0x0dd036ee, 0xa33ecf82),
+ TOBN(0xa50171ac, 0xc33156b3), TOBN(0xf09d24ea, 0x4a80172e),
+ TOBN(0x4e1f72c6, 0x76dc8eef), TOBN(0xe60caadc, 0x5e3d44ee),
+ TOBN(0x006ef8a6, 0x979b1d8f), TOBN(0x60908a1c, 0x97788d26),
+ TOBN(0x6e08f95b, 0x266feec0), TOBN(0x618427c2, 0x22e8c94e),
+ TOBN(0x3d613339, 0x59145a65), TOBN(0xcd9bc368, 0xfa406337),
+ TOBN(0x82d11be3, 0x2d8a52a0), TOBN(0xf6877b27, 0x97a1c590),
+ TOBN(0x837a819b, 0xf5cbdb25), TOBN(0x2a4fd1d8, 0xde090249),
+ TOBN(0x622a7de7, 0x74990e5f), TOBN(0x840fa5a0, 0x7945511b),
+ TOBN(0x30b974be, 0x6558842d), TOBN(0x70df8c64, 0x17f3d0a6),
+ TOBN(0x7c803520, 0x7542e46d), TOBN(0x7251fe7f, 0xe4ecc823),
+ TOBN(0xe59134cb, 0x5e9aac9a), TOBN(0x11bb0934, 0xf0045d71),
+ TOBN(0x53e5d9b5, 0xdbcb1d4e), TOBN(0x8d97a905, 0x92defc91),
+ TOBN(0xfe289327, 0x7946d3f9), TOBN(0xe132bd24, 0x07472273),
+ TOBN(0xeeeb510c, 0x1eb6ae86), TOBN(0x777708c5, 0xf0595067),
+ TOBN(0x18e2c8cd, 0x1297029e), TOBN(0x2c61095c, 0xbbf9305e),
+ TOBN(0xe466c258, 0x6b85d6d9), TOBN(0x8ac06c36, 0xda1ea530),
+ TOBN(0xa365dc39, 0xa1304668), TOBN(0xe4a9c885, 0x07f89606),
+ TOBN(0x65a4898f, 0xacc7228d), TOBN(0x3e2347ff, 0x84ca8303),
+ TOBN(0xa5f6fb77, 0xea7d23a3), TOBN(0x2fac257d, 0x672a71cd),
+ TOBN(0x6908bef8, 0x7e6a44d3), TOBN(0x8ff87566, 0x891d3d7a),
+ TOBN(0xe58e90b3, 0x6b0cf82e), TOBN(0x6438d246, 0x2615b5e7),
+ TOBN(0x07b1f8fc, 0x669c145a), TOBN(0xb0d8b2da, 0x36f1e1cb),
+ TOBN(0x54d5dadb, 0xd9184c4d), TOBN(0x3dbb18d5, 0xf93d9976),
+ TOBN(0x0a3e0f56, 0xd1147d47), TOBN(0x2afa8c8d, 0xa0a48609),
+ TOBN(0x275353e8, 0xbc36742c), TOBN(0x898f427e, 0xeea0ed90),
+ TOBN(0x26f4947e, 0x3e477b00), TOBN(0x8ad8848a, 0x308741e3),
+ TOBN(0x6c703c38, 0xd74a2a46), TOBN(0x5e3e05a9, 0x9ba17ba2),
+ TOBN(0xc1fa6f66, 0x4ab9a9e4), TOBN(0x474a2d9a, 0x3841d6ec),
+ TOBN(0x871239ad, 0x653ae326), TOBN(0x14bcf72a, 0xa74cbb43),
+ TOBN(0x8737650e, 0x20d4c083), TOBN(0x3df86536, 0x110ed4af),
+ TOBN(0xd2d86fe7, 0xb53ca555), TOBN(0x688cb00d, 0xabd5d538),
+ TOBN(0xcf81bda3, 0x1ad38468), TOBN(0x7ccfe3cc, 0xf01167b6),
+ TOBN(0xcf4f47e0, 0x6c4c1fe6), TOBN(0x557e1f1a, 0x298bbb79),
+ TOBN(0xf93b974f, 0x30d45a14), TOBN(0x174a1d2d, 0x0baf97c4),
+ TOBN(0x7a003b30, 0xc51fbf53), TOBN(0xd8940991, 0xee68b225),
+ TOBN(0x5b0aa7b7, 0x1c0f4173), TOBN(0x975797c9, 0xa20a7153),
+ TOBN(0x26e08c07, 0xe3533d77), TOBN(0xd7222e6a, 0x2e341c99),
+ TOBN(0x9d60ec3d, 0x8d2dc4ed), TOBN(0xbdfe0d8f, 0x7c476cf8),
+ TOBN(0x1fe59ab6, 0x1d056605), TOBN(0xa9ea9df6, 0x86a8551f),
+ TOBN(0x8489941e, 0x47fb8d8c), TOBN(0xfeb874eb, 0x4a7f1b10),
+ TOBN(0xfe5fea86, 0x7ee0d98f), TOBN(0x201ad34b, 0xdbf61864),
+ TOBN(0x45d8fe47, 0x37c031d4), TOBN(0xd5f49fae, 0x795f0822),
+ TOBN(0xdb0fb291, 0xc7f4a40c), TOBN(0x2e69d9c1, 0x730ddd92),
+ TOBN(0x754e1054, 0x49d76987), TOBN(0x8a24911d, 0x7662db87),
+ TOBN(0x61fc1810, 0x60a71676), TOBN(0xe852d1a8, 0xf66a8ad1),
+ TOBN(0x172bbd65, 0x6417231e), TOBN(0x0d6de7bd, 0x3babb11f),
+ TOBN(0x6fde6f88, 0xc8e347f8), TOBN(0x1c587547, 0x9bd99cc3),
+ TOBN(0x78e54ed0, 0x34076950), TOBN(0x97f0f334, 0x796e83ba),
+ TOBN(0xe4dbe1ce, 0x4924867a), TOBN(0xbd5f51b0, 0x60b84917),
+ TOBN(0x37530040, 0x3cb09a79), TOBN(0xdb3fe0f8, 0xff1743d8),
+ TOBN(0xed7894d8, 0x556fa9db), TOBN(0xfa262169, 0x23412fbf),
+ TOBN(0x563be0db, 0xba7b9291), TOBN(0x6ca8b8c0, 0x0c9fb234),
+ TOBN(0xed406aa9, 0xbd763802), TOBN(0xc21486a0, 0x65303da1),
+ TOBN(0x61ae291e, 0xc7e62ec4), TOBN(0x622a0492, 0xdf99333e),
+ TOBN(0x7fd80c9d, 0xbb7a8ee0), TOBN(0xdc2ed3bc, 0x6c01aedb),
+ TOBN(0x35c35a12, 0x08be74ec), TOBN(0xd540cb1a, 0x469f671f),
+ TOBN(0xd16ced4e, 0xcf84f6c7), TOBN(0x8561fb9c, 0x2d090f43),
+ TOBN(0x7e693d79, 0x6f239db4), TOBN(0xa736f928, 0x77bd0d94),
+ TOBN(0x07b4d929, 0x2c1950ee), TOBN(0xda177543, 0x56dc11b3),
+ TOBN(0xa5dfbbaa, 0x7a6a878e), TOBN(0x1c70cb29, 0x4decb08a),
+ TOBN(0xfba28c8b, 0x6f0f7c50), TOBN(0xa8eba2b8, 0x854dcc6d),
+ TOBN(0x5ff8e89a, 0x36b78642), TOBN(0x070c1c8e, 0xf6873adf),
+ TOBN(0xbbd3c371, 0x6484d2e4), TOBN(0xfb78318f, 0x0d414129),
+ TOBN(0x2621a39c, 0x6ad93b0b), TOBN(0x979d74c2, 0xa9e917f7),
+ TOBN(0xfc195647, 0x61fb0428), TOBN(0x4d78954a, 0xbee624d4),
+ TOBN(0xb94896e0, 0xb8ae86fd), TOBN(0x6667ac0c, 0xc91c8b13),
+ TOBN(0x9f180512, 0x43bcf832), TOBN(0xfbadf8b7, 0xa0010137),
+ TOBN(0xc69b4089, 0xb3ba8aa7), TOBN(0xfac4bacd, 0xe687ce85),
+ TOBN(0x9164088d, 0x977eab40), TOBN(0x51f4c5b6, 0x2760b390),
+ TOBN(0xd238238f, 0x340dd553), TOBN(0x358566c3, 0xdb1d31c9),
+ TOBN(0x3a5ad69e, 0x5068f5ff), TOBN(0xf31435fc, 0xdaff6b06),
+ TOBN(0xae549a5b, 0xd6debff0), TOBN(0x59e5f0b7, 0x75e01331),
+ TOBN(0x5d492fb8, 0x98559acf), TOBN(0x96018c2e, 0x4db79b50),
+ TOBN(0x55f4a48f, 0x609f66aa), TOBN(0x1943b3af, 0x4900a14f),
+ TOBN(0xc22496df, 0x15a40d39), TOBN(0xb2a44684, 0x4c20f7c5),
+ TOBN(0x76a35afa, 0x3b98404c), TOBN(0xbec75725, 0xff5d1b77),
+ TOBN(0xb67aa163, 0xbea06444), TOBN(0x27e95bb2, 0xf724b6f2),
+ TOBN(0x3c20e3e9, 0xd238c8ab), TOBN(0x1213754e, 0xddd6ae17),
+ TOBN(0x8c431020, 0x716e0f74), TOBN(0x6679c82e, 0xffc095c2),
+ TOBN(0x2eb3adf4, 0xd0ac2932), TOBN(0x2cc970d3, 0x01bb7a76),
+ TOBN(0x70c71f2f, 0x740f0e66), TOBN(0x545c616b, 0x2b6b23cc),
+ TOBN(0x4528cfcb, 0xb40a8bd7), TOBN(0xff839633, 0x2ab27722),
+ TOBN(0x049127d9, 0x025ac99a), TOBN(0xd314d4a0, 0x2b63e33b),
+ TOBN(0xc8c310e7, 0x28d84519), TOBN(0x0fcb8983, 0xb3bc84ba),
+ TOBN(0x2cc52261, 0x38634818), TOBN(0x501814f4, 0xb44c2e0b),
+ TOBN(0xf7e181aa, 0x54dfdba3), TOBN(0xcfd58ff0, 0xe759718c),
+ TOBN(0xf90cdb14, 0xd3b507a8), TOBN(0x57bd478e, 0xc50bdad8),
+ TOBN(0x29c197e2, 0x50e5f9aa), TOBN(0x4db6eef8, 0xe40bc855),
+ TOBN(0x2cc8f21a, 0xd1fc0654), TOBN(0xc71cc963, 0x81269d73),
+ TOBN(0xecfbb204, 0x077f49f9), TOBN(0xdde92571, 0xca56b793),
+ TOBN(0x9abed6a3, 0xf97ad8f7), TOBN(0xe6c19d3f, 0x924de3bd),
+ TOBN(0x8dce92f4, 0xa140a800), TOBN(0x85f44d1e, 0x1337af07),
+ TOBN(0x5953c08b, 0x09d64c52), TOBN(0xa1b5e49f, 0xf5df9749),
+ TOBN(0x336a8fb8, 0x52735f7d), TOBN(0xb332b6db, 0x9add676b),
+ TOBN(0x558b88a0, 0xb4511aa4), TOBN(0x09788752, 0xdbd5cc55),
+ TOBN(0x16b43b9c, 0xd8cd52bd), TOBN(0x7f0bc5a0, 0xc2a2696b),
+ TOBN(0x146e12d4, 0xc11f61ef), TOBN(0x9ce10754, 0x3a83e79e),
+ TOBN(0x08ec73d9, 0x6cbfca15), TOBN(0x09ff29ad, 0x5b49653f),
+ TOBN(0xe31b72bd, 0xe7da946e), TOBN(0xebf9eb3b, 0xee80a4f2),
+ TOBN(0xd1aabd08, 0x17598ce4), TOBN(0x18b5fef4, 0x53f37e80),
+ TOBN(0xd5d5cdd3, 0x5958cd79), TOBN(0x3580a1b5, 0x1d373114),
+ TOBN(0xa36e4c91, 0xfa935726), TOBN(0xa38c534d, 0xef20d760),
+ TOBN(0x7088e40a, 0x2ff5845b), TOBN(0xe5bb40bd, 0xbd78177f),
+ TOBN(0x4f06a7a8, 0x857f9920), TOBN(0xe3cc3e50, 0xe968f05d),
+ TOBN(0x1d68b7fe, 0xe5682d26), TOBN(0x5206f76f, 0xaec7f87c),
+ TOBN(0x41110530, 0x041951ab), TOBN(0x58ec52c1, 0xd4b5a71a),
+ TOBN(0xf3488f99, 0x0f75cf9a), TOBN(0xf411951f, 0xba82d0d5),
+ TOBN(0x27ee75be, 0x618895ab), TOBN(0xeae060d4, 0x6d8aab14),
+ TOBN(0x9ae1df73, 0x7fb54dc2), TOBN(0x1f3e391b, 0x25963649),
+ TOBN(0x242ec32a, 0xfe055081), TOBN(0x5bd450ef, 0x8491c9bd),
+ TOBN(0x367efc67, 0x981eb389), TOBN(0xed7e1928, 0x3a0550d5),
+ TOBN(0x362e776b, 0xab3ce75c), TOBN(0xe890e308, 0x1f24c523),
+ TOBN(0xb961b682, 0xfeccef76), TOBN(0x8b8e11f5, 0x8bba6d92),
+ TOBN(0x8f2ccc4c, 0x2b2375c4), TOBN(0x0d7f7a52, 0xe2f86cfa),
+ TOBN(0xfd94d30a, 0x9efe5633), TOBN(0x2d8d246b, 0x5451f934),
+ TOBN(0x2234c6e3, 0x244e6a00), TOBN(0xde2b5b0d, 0xddec8c50),
+ TOBN(0x2ce53c5a, 0xbf776f5b), TOBN(0x6f724071, 0x60357b05),
+ TOBN(0xb2593717, 0x71bf3f7a), TOBN(0x87d2501c, 0x440c4a9f),
+ TOBN(0x440552e1, 0x87b05340), TOBN(0xb7bf7cc8, 0x21624c32),
+ TOBN(0x4155a6ce, 0x22facddb), TOBN(0x5a4228cb, 0x889837ef),
+ TOBN(0xef87d6d6, 0xfd4fd671), TOBN(0xa233687e, 0xc2daa10e),
+ TOBN(0x75622244, 0x03c0eb96), TOBN(0x7632d184, 0x8bf19be6),
+ TOBN(0x05d0f8e9, 0x40735ff4), TOBN(0x3a3e6e13, 0xc00931f1),
+ TOBN(0x31ccde6a, 0xdafe3f18), TOBN(0xf381366a, 0xcfe51207),
+ TOBN(0x24c222a9, 0x60167d92), TOBN(0x62f9d6f8, 0x7529f18c),
+ TOBN(0x412397c0, 0x0353b114), TOBN(0x334d89dc, 0xef808043),
+ TOBN(0xd9ec63ba, 0x2a4383ce), TOBN(0xcec8e937, 0x5cf92ba0),
+ TOBN(0xfb8b4288, 0xc8be74c0), TOBN(0x67d6912f, 0x105d4391),
+ TOBN(0x7b996c46, 0x1b913149), TOBN(0x36aae2ef, 0x3a4e02da),
+ TOBN(0xb68aa003, 0x972de594), TOBN(0x284ec70d, 0x4ec6d545),
+ TOBN(0xf3d2b2d0, 0x61391d54), TOBN(0x69c5d5d6, 0xfe114e92),
+ TOBN(0xbe0f00b5, 0xb4482dff), TOBN(0xe1596fa5, 0xf5bf33c5),
+ TOBN(0x10595b56, 0x96a71cba), TOBN(0x944938b2, 0xfdcadeb7),
+ TOBN(0xa282da4c, 0xfccd8471), TOBN(0x98ec05f3, 0x0d37bfe1),
+ TOBN(0xe171ce1b, 0x0698304a), TOBN(0x2d691444, 0x21bdf79b),
+ TOBN(0xd0cd3b74, 0x1b21dec1), TOBN(0x712ecd8b, 0x16a15f71),
+ TOBN(0x8d4c00a7, 0x00fd56e1), TOBN(0x02ec9692, 0xf9527c18),
+ TOBN(0x21c44937, 0x4a3e42e1), TOBN(0x9176fbab, 0x1392ae0a),
+ TOBN(0x8726f1ba, 0x44b7b618), TOBN(0xb4d7aae9, 0xf1de491c),
+ TOBN(0xf91df7b9, 0x07b582c0), TOBN(0x7e116c30, 0xef60aa3a),
+ TOBN(0x99270f81, 0x466265d7), TOBN(0xb15b6fe2, 0x4df7adf0),
+ TOBN(0xfe33b2d3, 0xf9738f7f), TOBN(0x48553ab9, 0xd6d70f95),
+ TOBN(0x2cc72ac8, 0xc21e94db), TOBN(0x795ac38d, 0xbdc0bbee),
+ TOBN(0x0a1be449, 0x2e40478f), TOBN(0x81bd3394, 0x052bde55),
+ TOBN(0x63c8dbe9, 0x56b3c4f2), TOBN(0x017a99cf, 0x904177cc),
+ TOBN(0x947bbddb, 0x4d010fc1), TOBN(0xacf9b00b, 0xbb2c9b21),
+ TOBN(0x2970bc8d, 0x47173611), TOBN(0x1a4cbe08, 0xac7d756f),
+ TOBN(0x06d9f4aa, 0x67d541a2), TOBN(0xa3e8b689, 0x59c2cf44),
+ TOBN(0xaad066da, 0x4d88f1dd), TOBN(0xc604f165, 0x7ad35dea),
+ TOBN(0x7edc0720, 0x4478ca67), TOBN(0xa10dfae0, 0xba02ce06),
+ TOBN(0xeceb1c76, 0xaf36f4e4), TOBN(0x994b2292, 0xaf3f8f48),
+ TOBN(0xbf9ed77b, 0x77c8a68c), TOBN(0x74f544ea, 0x51744c9d),
+ TOBN(0x82d05bb9, 0x8113a757), TOBN(0x4ef2d2b4, 0x8a9885e4),
+ TOBN(0x1e332be5, 0x1aa7865f), TOBN(0x22b76b18, 0x290d1a52),
+ TOBN(0x308a2310, 0x44351683), TOBN(0x9d861896, 0xa3f22840),
+ TOBN(0x5959ddcd, 0x841ed947), TOBN(0x0def0c94, 0x154b73bf),
+ TOBN(0xf0105417, 0x4c7c15e0), TOBN(0x539bfb02, 0x3a277c32),
+ TOBN(0xe699268e, 0xf9dccf5f), TOBN(0x9f5796a5, 0x0247a3bd),
+ TOBN(0x8b839de8, 0x4f157269), TOBN(0xc825c1e5, 0x7a30196b),
+ TOBN(0x6ef0aabc, 0xdc8a5a91), TOBN(0xf4a8ce6c, 0x498b7fe6),
+ TOBN(0x1cce35a7, 0x70cbac78), TOBN(0x83488e9b, 0xf6b23958),
+ TOBN(0x0341a070, 0xd76cb011), TOBN(0xda6c9d06, 0xae1b2658),
+ TOBN(0xb701fb30, 0xdd648c52), TOBN(0x994ca02c, 0x52fb9fd1),
+ TOBN(0x06933117, 0x6f563086), TOBN(0x3d2b8100, 0x17856bab),
+ TOBN(0xe89f48c8, 0x5963a46e), TOBN(0x658ab875, 0xa99e61c7),
+ TOBN(0x6e296f87, 0x4b8517b4), TOBN(0x36c4fcdc, 0xfc1bc656),
+ TOBN(0xde5227a1, 0xa3906def), TOBN(0x9fe95f57, 0x62418945),
+ TOBN(0x20c91e81, 0xfdd96cde), TOBN(0x5adbe47e, 0xda4480de),
+ TOBN(0xa009370f, 0x396de2b6), TOBN(0x98583d4b, 0xf0ecc7bd),
+ TOBN(0xf44f6b57, 0xe51d0672), TOBN(0x03d6b078, 0x556b1984),
+ TOBN(0x27dbdd93, 0xb0b64912), TOBN(0x9b3a3434, 0x15687b09),
+ TOBN(0x0dba6461, 0x51ec20a9), TOBN(0xec93db7f, 0xff28187c),
+ TOBN(0x00ff8c24, 0x66e48bdd), TOBN(0x2514f2f9, 0x11ccd78e),
+ TOBN(0xeba11f4f, 0xe1250603), TOBN(0x8a22cd41, 0x243fa156),
+ TOBN(0xa4e58df4, 0xb283e4c6), TOBN(0x78c29859, 0x8b39783f),
+ TOBN(0x5235aee2, 0xa5259809), TOBN(0xc16284b5, 0x0e0227dd),
+ TOBN(0xa5f57916, 0x1338830d), TOBN(0x6d4b8a6b, 0xd2123fca),
+ TOBN(0x236ea68a, 0xf9c546f8), TOBN(0xc1d36873, 0xfa608d36),
+ TOBN(0xcd76e495, 0x8d436d13), TOBN(0xd4d9c221, 0x8fb080af),
+ TOBN(0x665c1728, 0xe8ad3fb5), TOBN(0xcf1ebe4d, 0xb3d572e0),
+ TOBN(0xa7a8746a, 0x584c5e20), TOBN(0x267e4ea1, 0xb9dc7035),
+ TOBN(0x593a15cf, 0xb9548c9b), TOBN(0x5e6e2135, 0x4bd012f3),
+ TOBN(0xdf31cc6a, 0x8c8f936e), TOBN(0x8af84d04, 0xb5c241dc),
+ TOBN(0x63990a6f, 0x345efb86), TOBN(0x6fef4e61, 0xb9b962cb) },
+ { TOBN(0xf6368f09, 0x25722608), TOBN(0x131260db, 0x131cf5c6),
+ TOBN(0x40eb353b, 0xfab4f7ac), TOBN(0x85c78880, 0x37eee829),
+ TOBN(0x4c1581ff, 0xc3bdf24e), TOBN(0x5bff75cb, 0xf5c3c5a8),
+ TOBN(0x35e8c83f, 0xa14e6f40), TOBN(0xb81d1c0f, 0x0295e0ca),
+ TOBN(0xfcde7cc8, 0xf43a730f), TOBN(0xe89b6f3c, 0x33ab590e),
+ TOBN(0xc823f529, 0xad03240b), TOBN(0x82b79afe, 0x98bea5db),
+ TOBN(0x568f2856, 0x962fe5de), TOBN(0x0c590adb, 0x60c591f3),
+ TOBN(0x1fc74a14, 0x4a28a858), TOBN(0x3b662498, 0xb3203f4c),
+ TOBN(0x91e3cf0d, 0x6c39765a), TOBN(0xa2db3acd, 0xac3cca0b),
+ TOBN(0x288f2f08, 0xcb953b50), TOBN(0x2414582c, 0xcf43cf1a),
+ TOBN(0x8dec8bbc, 0x60eee9a8), TOBN(0x54c79f02, 0x729aa042),
+ TOBN(0xd81cd5ec, 0x6532f5d5), TOBN(0xa672303a, 0xcf82e15f),
+ TOBN(0x376aafa8, 0x719c0563), TOBN(0xcd8ad2dc, 0xbc5fc79f),
+ TOBN(0x303fdb9f, 0xcb750cd3), TOBN(0x14ff052f, 0x4418b08e),
+ TOBN(0xf75084cf, 0x3e2d6520), TOBN(0x7ebdf0f8, 0x144ed509),
+ TOBN(0xf43bf0f2, 0xd3f25b98), TOBN(0x86ad71cf, 0xa354d837),
+ TOBN(0xb827fe92, 0x26f43572), TOBN(0xdfd3ab5b, 0x5d824758),
+ TOBN(0x315dd23a, 0x539094c1), TOBN(0x85c0e37a, 0x66623d68),
+ TOBN(0x575c7972, 0x7be19ae0), TOBN(0x616a3396, 0xdf0d36b5),
+ TOBN(0xa1ebb3c8, 0x26b1ff7e), TOBN(0x635b9485, 0x140ad453),
+ TOBN(0x92bf3cda, 0xda430c0b), TOBN(0x4702850e, 0x3a96dac6),
+ TOBN(0xc91cf0a5, 0x15ac326a), TOBN(0x95de4f49, 0xab8c25e4),
+ TOBN(0xb01bad09, 0xe265c17c), TOBN(0x24e45464, 0x087b3881),
+ TOBN(0xd43e583c, 0xe1fac5ca), TOBN(0xe17cb318, 0x6ead97a6),
+ TOBN(0x6cc39243, 0x74dcec46), TOBN(0x33cfc02d, 0x54c2b73f),
+ TOBN(0x82917844, 0xf26cd99c), TOBN(0x8819dd95, 0xd1773f89),
+ TOBN(0x09572aa6, 0x0871f427), TOBN(0x8e0cf365, 0xf6f01c34),
+ TOBN(0x7fa52988, 0xbff1f5af), TOBN(0x4eb357ea, 0xe75e8e50),
+ TOBN(0xd9d0c8c4, 0x868af75d), TOBN(0xd7325cff, 0x45c8c7ea),
+ TOBN(0xab471996, 0xcc81ecb0), TOBN(0xff5d55f3, 0x611824ed),
+ TOBN(0xbe314541, 0x1977a0ee), TOBN(0x5085c4c5, 0x722038c6),
+ TOBN(0x2d5335bf, 0xf94bb495), TOBN(0x894ad8a6, 0xc8e2a082),
+ TOBN(0x5c3e2341, 0xada35438), TOBN(0xf4a9fc89, 0x049b8c4e),
+ TOBN(0xbeeb355a, 0x9f17cf34), TOBN(0x3f311e0e, 0x6c91fe10),
+ TOBN(0xc2d20038, 0x92ab9891), TOBN(0x257bdcc1, 0x3e8ce9a9),
+ TOBN(0x1b2d9789, 0x88c53bee), TOBN(0x927ce89a, 0xcdba143a),
+ TOBN(0xb0a32cca, 0x523db280), TOBN(0x5c889f8a, 0x50d43783),
+ TOBN(0x503e04b3, 0x4897d16f), TOBN(0x8cdb6e78, 0x08f5f2e8),
+ TOBN(0x6ab91cf0, 0x179c8e74), TOBN(0xd8874e52, 0x48211d60),
+ TOBN(0xf948d4d5, 0xea851200), TOBN(0x4076d41e, 0xe6f9840a),
+ TOBN(0xc20e263c, 0x47b517ea), TOBN(0x79a448fd, 0x30685e5e),
+ TOBN(0xe55f6f78, 0xf90631a0), TOBN(0x88a790b1, 0xa79e6346),
+ TOBN(0x62160c7d, 0x80969fe8), TOBN(0x54f92fd4, 0x41491bb9),
+ TOBN(0xa6645c23, 0x5c957526), TOBN(0xf44cc5ae, 0xbea3ce7b),
+ TOBN(0xf7628327, 0x8b1e68b7), TOBN(0xc731ad7a, 0x303f29d3),
+ TOBN(0xfe5a9ca9, 0x57d03ecb), TOBN(0x96c0d50c, 0x41bc97a7),
+ TOBN(0xc4669fe7, 0x9b4f7f24), TOBN(0xfdd781d8, 0x3d9967ef),
+ TOBN(0x7892c7c3, 0x5d2c208d), TOBN(0x8bf64f7c, 0xae545cb3),
+ TOBN(0xc01f862c, 0x467be912), TOBN(0xf4c85ee9, 0xc73d30cc),
+ TOBN(0x1fa6f4be, 0x6ab83ec7), TOBN(0xa07a3c1c, 0x4e3e3cf9),
+ TOBN(0x87f8ef45, 0x0c00beb3), TOBN(0x30e2c2b3, 0x000d4c3e),
+ TOBN(0x1aa00b94, 0xfe08bf5b), TOBN(0x32c133aa, 0x9224ef52),
+ TOBN(0x38df16bb, 0x32e5685d), TOBN(0x68a9e069, 0x58e6f544),
+ TOBN(0x495aaff7, 0xcdc5ebc6), TOBN(0xf894a645, 0x378b135f),
+ TOBN(0xf316350a, 0x09e27ecf), TOBN(0xeced201e, 0x58f7179d),
+ TOBN(0x2eec273c, 0xe97861ba), TOBN(0x47ec2cae, 0xd693be2e),
+ TOBN(0xfa4c97c4, 0xf68367ce), TOBN(0xe4f47d0b, 0xbe5a5755),
+ TOBN(0x17de815d, 0xb298a979), TOBN(0xd7eca659, 0xc177dc7d),
+ TOBN(0x20fdbb71, 0x49ded0a3), TOBN(0x4cb2aad4, 0xfb34d3c5),
+ TOBN(0x2cf31d28, 0x60858a33), TOBN(0x3b6873ef, 0xa24aa40f),
+ TOBN(0x540234b2, 0x2c11bb37), TOBN(0x2d0366dd, 0xed4c74a3),
+ TOBN(0xf9a968da, 0xeec5f25d), TOBN(0x36601068, 0x67b63142),
+ TOBN(0x07cd6d2c, 0x68d7b6d4), TOBN(0xa8f74f09, 0x0c842942),
+ TOBN(0xe2751404, 0x7768b1ee), TOBN(0x4b5f7e89, 0xfe62aee4),
+ TOBN(0xc6a77177, 0x89070d26), TOBN(0xa1f28e4e, 0xdd1c8bc7),
+ TOBN(0xea5f4f06, 0x469e1f17), TOBN(0x78fc242a, 0xfbdb78e0),
+ TOBN(0xc9c7c592, 0x8b0588f1), TOBN(0xb6b7a0fd, 0x1535921e),
+ TOBN(0xcc5bdb91, 0xbde5ae35), TOBN(0xb42c485e, 0x12ff1864),
+ TOBN(0xa1113e13, 0xdbab98aa), TOBN(0xde9d469b, 0xa17b1024),
+ TOBN(0x23f48b37, 0xc0462d3a), TOBN(0x3752e537, 0x7c5c078d),
+ TOBN(0xe3a86add, 0x15544eb9), TOBN(0xf013aea7, 0x80fba279),
+ TOBN(0x8b5bb76c, 0xf22001b5), TOBN(0xe617ba14, 0xf02891ab),
+ TOBN(0xd39182a6, 0x936219d3), TOBN(0x5ce1f194, 0xae51cb19),
+ TOBN(0xc78f8598, 0xbf07a74c), TOBN(0x6d7158f2, 0x22cbf1bc),
+ TOBN(0x3b846b21, 0xe300ce18), TOBN(0x35fba630, 0x2d11275d),
+ TOBN(0x5fe25c36, 0xa0239b9b), TOBN(0xd8beb35d, 0xdf05d940),
+ TOBN(0x4db02bb0, 0x1f7e320d), TOBN(0x0641c364, 0x6da320ea),
+ TOBN(0x6d95fa5d, 0x821389a3), TOBN(0x92699748, 0x8fcd8e3d),
+ TOBN(0x316fef17, 0xceb6c143), TOBN(0x67fcb841, 0xd933762b),
+ TOBN(0xbb837e35, 0x118b17f8), TOBN(0x4b92552f, 0x9fd24821),
+ TOBN(0xae6bc70e, 0x46aca793), TOBN(0x1cf0b0e4, 0xe579311b),
+ TOBN(0x8dc631be, 0x5802f716), TOBN(0x099bdc6f, 0xbddbee4d),
+ TOBN(0xcc352bb2, 0x0caf8b05), TOBN(0xf74d505a, 0x72d63df2),
+ TOBN(0xb9876d4b, 0x91c4f408), TOBN(0x1ce18473, 0x9e229b2d),
+ TOBN(0x49507597, 0x83abdb4a), TOBN(0x850fbcb6, 0xdee84b18),
+ TOBN(0x6325236e, 0x609e67dc), TOBN(0x04d831d9, 0x9336c6d8),
+ TOBN(0x8deaae3b, 0xfa12d45d), TOBN(0xe425f8ce, 0x4746e246),
+ TOBN(0x8004c175, 0x24f5f31e), TOBN(0xaca16d8f, 0xad62c3b7),
+ TOBN(0x0dc15a6a, 0x9152f934), TOBN(0xf1235e5d, 0xed0e12c1),
+ TOBN(0xc33c06ec, 0xda477dac), TOBN(0x76be8732, 0xb2ea0006),
+ TOBN(0xcf3f7831, 0x0c0cd313), TOBN(0x3c524553, 0xa614260d),
+ TOBN(0x31a756f8, 0xcab22d15), TOBN(0x03ee10d1, 0x77827a20),
+ TOBN(0xd1e059b2, 0x1994ef20), TOBN(0x2a653b69, 0x638ae318),
+ TOBN(0x70d5eb58, 0x2f699010), TOBN(0x279739f7, 0x09f5f84a),
+ TOBN(0x5da4663c, 0x8b799336), TOBN(0xfdfdf14d, 0x203c37eb),
+ TOBN(0x32d8a9dc, 0xa1dbfb2d), TOBN(0xab40cff0, 0x77d48f9b),
+ TOBN(0xc018b383, 0xd20b42d5), TOBN(0xf9a810ef, 0x9f78845f),
+ TOBN(0x40af3753, 0xbdba9df0), TOBN(0xb90bdcfc, 0x131dfdf9),
+ TOBN(0x18720591, 0xf01ab782), TOBN(0xc823f211, 0x6af12a88),
+ TOBN(0xa51b80f3, 0x0dc14401), TOBN(0xde248f77, 0xfb2dfbe3),
+ TOBN(0xef5a44e5, 0x0cafe751), TOBN(0x73997c9c, 0xd4dcd221),
+ TOBN(0x32fd86d1, 0xde854024), TOBN(0xd5b53adc, 0xa09b84bb),
+ TOBN(0x008d7a11, 0xdcedd8d1), TOBN(0x406bd1c8, 0x74b32c84),
+ TOBN(0x5d4472ff, 0x05dde8b1), TOBN(0x2e25f2cd, 0xfce2b32f),
+ TOBN(0xbec0dd5e, 0x29dfc254), TOBN(0x4455fcf6, 0x2b98b267),
+ TOBN(0x0b4d43a5, 0xc72df2ad), TOBN(0xea70e6be, 0x48a75397),
+ TOBN(0x2aad6169, 0x5820f3bf), TOBN(0xf410d2dd, 0x9e37f68f),
+ TOBN(0x70fb7dba, 0x7be5ac83), TOBN(0x636bb645, 0x36ec3eec),
+ TOBN(0x27104ea3, 0x9754e21c), TOBN(0xbc87a3e6, 0x8d63c373),
+ TOBN(0x483351d7, 0x4109db9a), TOBN(0x0fa724e3, 0x60134da7),
+ TOBN(0x9ff44c29, 0xb0720b16), TOBN(0x2dd0cf13, 0x06aceead),
+ TOBN(0x5942758c, 0xe26929a6), TOBN(0x96c5db92, 0xb766a92b),
+ TOBN(0xcec7d4c0, 0x5f18395e), TOBN(0xd3f22744, 0x1f80d032),
+ TOBN(0x7a68b37a, 0xcb86075b), TOBN(0x074764dd, 0xafef92db),
+ TOBN(0xded1e950, 0x7bc7f389), TOBN(0xc580c850, 0xb9756460),
+ TOBN(0xaeeec2a4, 0x7da48157), TOBN(0x3f0b4e7f, 0x82c587b3),
+ TOBN(0x231c6de8, 0xa9f19c53), TOBN(0x5717bd73, 0x6974e34e),
+ TOBN(0xd9e1d216, 0xf1508fa9), TOBN(0x9f112361, 0xdadaa124),
+ TOBN(0x80145e31, 0x823b7348), TOBN(0x4dd8f0d5, 0xac634069),
+ TOBN(0xe3d82fc7, 0x2297c258), TOBN(0x276fcfee, 0x9cee7431),
+ TOBN(0x8eb61b5e, 0x2bc0aea9), TOBN(0x4f668fd5, 0xde329431),
+ TOBN(0x03a32ab1, 0x38e4b87e), TOBN(0xe1374517, 0x73d0ef0b),
+ TOBN(0x1a46f7e6, 0x853ac983), TOBN(0xc3bdf42e, 0x68e78a57),
+ TOBN(0xacf20785, 0x2ea96dd1), TOBN(0xa10649b9, 0xf1638460),
+ TOBN(0xf2369f0b, 0x879fbbed), TOBN(0x0ff0ae86, 0xda9d1869),
+ TOBN(0x5251d759, 0x56766f45), TOBN(0x4984d8c0, 0x2be8d0fc),
+ TOBN(0x7ecc95a6, 0xd21008f0), TOBN(0x29bd54a0, 0x3a1a1c49),
+ TOBN(0xab9828c5, 0xd26c50f3), TOBN(0x32c0087c, 0x51d0d251),
+ TOBN(0x9bac3ce6, 0x0c1cdb26), TOBN(0xcd94d947, 0x557ca205),
+ TOBN(0x1b1bd598, 0x9db1fdcd), TOBN(0x0eda0108, 0xa3d8b149),
+ TOBN(0x95066610, 0x56152fcc), TOBN(0xc2f037e6, 0xe7192b33),
+ TOBN(0xdeffb41a, 0xc92e05a4), TOBN(0x1105f6c2, 0xc2f6c62e),
+ TOBN(0x68e73500, 0x8733913c), TOBN(0xcce86163, 0x3f3adc40),
+ TOBN(0xf407a942, 0x38a278e9), TOBN(0xd13c1b9d, 0x2ab21292),
+ TOBN(0x93ed7ec7, 0x1c74cf5c), TOBN(0x8887dc48, 0xf1a4c1b4),
+ TOBN(0x3830ff30, 0x4b3a11f1), TOBN(0x358c5a3c, 0x58937cb6),
+ TOBN(0x027dc404, 0x89022829), TOBN(0x40e93977, 0x3b798f79),
+ TOBN(0x90ad3337, 0x38be6ead), TOBN(0x9c23f6bc, 0xf34c0a5d),
+ TOBN(0xd1711a35, 0xfbffd8bb), TOBN(0x60fcfb49, 0x1949d3dd),
+ TOBN(0x09c8ef4b, 0x7825d93a), TOBN(0x24233cff, 0xa0a8c968),
+ TOBN(0x67ade46c, 0xe6d982af), TOBN(0xebb6bf3e, 0xe7544d7c),
+ TOBN(0xd6b9ba76, 0x3d8bd087), TOBN(0x46fe382d, 0x4dc61280),
+ TOBN(0xbd39a7e8, 0xb5bdbd75), TOBN(0xab381331, 0xb8f228fe),
+ TOBN(0x0709a77c, 0xce1c4300), TOBN(0x6a247e56, 0xf337ceac),
+ TOBN(0x8f34f21b, 0x636288be), TOBN(0x9dfdca74, 0xc8a7c305),
+ TOBN(0x6decfd1b, 0xea919e04), TOBN(0xcdf2688d, 0x8e1991f8),
+ TOBN(0xe607df44, 0xd0f8a67e), TOBN(0xd985df4b, 0x0b58d010),
+ TOBN(0x57f834c5, 0x0c24f8f4), TOBN(0xe976ef56, 0xa0bf01ae),
+ TOBN(0x536395ac, 0xa1c32373), TOBN(0x351027aa, 0x734c0a13),
+ TOBN(0xd2f1b5d6, 0x5e6bd5bc), TOBN(0x2b539e24, 0x223debed),
+ TOBN(0xd4994cec, 0x0eaa1d71), TOBN(0x2a83381d, 0x661dcf65),
+ TOBN(0x5f1aed2f, 0x7b54c740), TOBN(0x0bea3fa5, 0xd6dda5ee),
+ TOBN(0x9d4fb684, 0x36cc6134), TOBN(0x8eb9bbf3, 0xc0a443dd),
+ TOBN(0xfc500e2e, 0x383b7d2a), TOBN(0x7aad621c, 0x5b775257),
+ TOBN(0x69284d74, 0x0a8f7cc0), TOBN(0xe820c2ce, 0x07562d65),
+ TOBN(0xbf9531b9, 0x499758ee), TOBN(0x73e95ca5, 0x6ee0cc2d),
+ TOBN(0xf61790ab, 0xfbaf50a5), TOBN(0xdf55e76b, 0x684e0750),
+ TOBN(0xec516da7, 0xf176b005), TOBN(0x575553bb, 0x7a2dddc7),
+ TOBN(0x37c87ca3, 0x553afa73), TOBN(0x315f3ffc, 0x4d55c251),
+ TOBN(0xe846442a, 0xaf3e5d35), TOBN(0x61b91149, 0x6495ff28),
+ TOBN(0x23cc95d3, 0xfa326dc3), TOBN(0x1df4da1f, 0x18fc2cea),
+ TOBN(0x24bf9adc, 0xd0a37d59), TOBN(0xb6710053, 0x320d6e1e),
+ TOBN(0x96f9667e, 0x618344d1), TOBN(0xcc7ce042, 0xa06445af),
+ TOBN(0xa02d8514, 0xd68dbc3a), TOBN(0x4ea109e4, 0x280b5a5b),
+ TOBN(0x5741a7ac, 0xb40961bf), TOBN(0x4ada5937, 0x6aa56bfa),
+ TOBN(0x7feb9145, 0x02b765d1), TOBN(0x561e97be, 0xe6ad1582),
+ TOBN(0xbbc4a5b6, 0xda3982f5), TOBN(0x0c2659ed, 0xb546f468),
+ TOBN(0xb8e7e6aa, 0x59612d20), TOBN(0xd83dfe20, 0xac19e8e0),
+ TOBN(0x8530c45f, 0xb835398c), TOBN(0x6106a8bf, 0xb38a41c2),
+ TOBN(0x21e8f9a6, 0x35f5dcdb), TOBN(0x39707137, 0xcae498ed),
+ TOBN(0x70c23834, 0xd8249f00), TOBN(0x9f14b58f, 0xab2537a0),
+ TOBN(0xd043c365, 0x5f61c0c2), TOBN(0xdc5926d6, 0x09a194a7),
+ TOBN(0xddec0339, 0x8e77738a), TOBN(0xd07a63ef, 0xfba46426),
+ TOBN(0x2e58e79c, 0xee7f6e86), TOBN(0xe59b0459, 0xff32d241),
+ TOBN(0xc5ec84e5, 0x20fa0338), TOBN(0x97939ac8, 0xeaff5ace),
+ TOBN(0x0310a4e3, 0xb4a38313), TOBN(0x9115fba2, 0x8f9d9885),
+ TOBN(0x8dd710c2, 0x5fadf8c3), TOBN(0x66be38a2, 0xce19c0e2),
+ TOBN(0xd42a279c, 0x4cfe5022), TOBN(0x597bb530, 0x0e24e1b8),
+ TOBN(0x3cde86b7, 0xc153ca7f), TOBN(0xa8d30fb3, 0x707d63bd),
+ TOBN(0xac905f92, 0xbd60d21e), TOBN(0x98e7ffb6, 0x7b9a54ab),
+ TOBN(0xd7147df8, 0xe9726a30), TOBN(0xb5e216ff, 0xafce3533),
+ TOBN(0xb550b799, 0x2ff1ec40), TOBN(0x6b613b87, 0xa1e953fd),
+ TOBN(0x87b88dba, 0x792d5610), TOBN(0x2ee1270a, 0xa190fbe1),
+ TOBN(0x02f4e2dc, 0x2ef581da), TOBN(0x016530e4, 0xeff82a95),
+ TOBN(0xcbb93dfd, 0x8fd6ee89), TOBN(0x16d3d986, 0x46848fff),
+ TOBN(0x600eff24, 0x1da47adf), TOBN(0x1b9754a0, 0x0ad47a71),
+ TOBN(0x8f9266df, 0x70c33b98), TOBN(0xaadc87ae, 0xdf34186e),
+ TOBN(0x0d2ce8e1, 0x4ad24132), TOBN(0x8a47cbfc, 0x19946eba),
+ TOBN(0x47feeb66, 0x62b5f3af), TOBN(0xcefab561, 0x0abb3734),
+ TOBN(0x449de60e, 0x19f35cb1), TOBN(0x39f8db14, 0x157f0eb9),
+ TOBN(0xffaecc5b, 0x3c61bfd6), TOBN(0xa5a4d41d, 0x41216703),
+ TOBN(0x7f8fabed, 0x224e1cc2), TOBN(0x0d5a8186, 0x871ad953),
+ TOBN(0xf10774f7, 0xd22da9a9), TOBN(0x45b8a678, 0xcc8a9b0d),
+ TOBN(0xd9c2e722, 0xbdc32cff), TOBN(0xbf71b5f5, 0x337202a5),
+ TOBN(0x95c57f2f, 0x69fc4db9), TOBN(0xb6dad34c, 0x765d01e1),
+ TOBN(0x7e0bd13f, 0xcb904635), TOBN(0x61751253, 0x763a588c),
+ TOBN(0xd85c2997, 0x81af2c2d), TOBN(0xc0f7d9c4, 0x81b9d7da),
+ TOBN(0x838a34ae, 0x08533e8d), TOBN(0x15c4cb08, 0x311d8311),
+ TOBN(0x97f83285, 0x8e121e14), TOBN(0xeea7dc1e, 0x85000a5f),
+ TOBN(0x0c6059b6, 0x5d256274), TOBN(0xec9beace, 0xb95075c0),
+ TOBN(0x173daad7, 0x1df97828), TOBN(0xbf851cb5, 0xa8937877),
+ TOBN(0xb083c594, 0x01646f3c), TOBN(0x3bad30cf, 0x50c6d352),
+ TOBN(0xfeb2b202, 0x496bbcea), TOBN(0x3cf9fd4f, 0x18a1e8ba),
+ TOBN(0xd26de7ff, 0x1c066029), TOBN(0x39c81e9e, 0x4e9ed4f8),
+ TOBN(0xd8be0cb9, 0x7b390d35), TOBN(0x01df2bbd, 0x964aab27),
+ TOBN(0x3e8c1a65, 0xc3ef64f8), TOBN(0x567291d1, 0x716ed1dd),
+ TOBN(0x95499c6c, 0x5f5406d3), TOBN(0x71fdda39, 0x5ba8e23f),
+ TOBN(0xcfeb320e, 0xd5096ece), TOBN(0xbe7ba92b, 0xca66dd16),
+ TOBN(0x4608d36b, 0xc6fb5a7d), TOBN(0xe3eea15a, 0x6d2dd0e0),
+ TOBN(0x75b0a3eb, 0x8f97a36a), TOBN(0xf59814cc, 0x1c83de1e),
+ TOBN(0x56c9c5b0, 0x1c33c23f), TOBN(0xa96c1da4, 0x6faa4136),
+ TOBN(0x46bf2074, 0xde316551), TOBN(0x3b866e7b, 0x1f756c8f),
+ TOBN(0x727727d8, 0x1495ed6b), TOBN(0xb2394243, 0xb682dce7),
+ TOBN(0x8ab8454e, 0x758610f3), TOBN(0xc243ce84, 0x857d72a4),
+ TOBN(0x7b320d71, 0xdbbf370f), TOBN(0xff9afa37, 0x78e0f7ca),
+ TOBN(0x0119d1e0, 0xea7b523f), TOBN(0xb997f8cb, 0x058c7d42),
+ TOBN(0x285bcd2a, 0x37bbb184), TOBN(0x51dcec49, 0xa45d1fa6),
+ TOBN(0x6ade3b64, 0xe29634cb), TOBN(0x080c94a7, 0x26b86ef1),
+ TOBN(0xba583db1, 0x2283fbe3), TOBN(0x902bddc8, 0x5a9315ed),
+ TOBN(0x07c1ccb3, 0x86964bec), TOBN(0x78f4eacf, 0xb6258301),
+ TOBN(0x4bdf3a49, 0x56f90823), TOBN(0xba0f5080, 0x741d777b),
+ TOBN(0x091d71c3, 0xf38bf760), TOBN(0x9633d50f, 0x9b625b02),
+ TOBN(0x03ecb743, 0xb8c9de61), TOBN(0xb4751254, 0x5de74720),
+ TOBN(0x9f9defc9, 0x74ce1cb2), TOBN(0x774a4f6a, 0x00bd32ef),
+ TOBN(0xaca385f7, 0x73848f22), TOBN(0x53dad716, 0xf3f8558e),
+ TOBN(0xab7b34b0, 0x93c471f9), TOBN(0xf530e069, 0x19644bc7),
+ TOBN(0x3d9fb1ff, 0xdd59d31a), TOBN(0x4382e0df, 0x08daa795),
+ TOBN(0x165c6f4b, 0xd5cc88d7), TOBN(0xeaa392d5, 0x4a18c900),
+ TOBN(0x94203c67, 0x648024ee), TOBN(0x188763f2, 0x8c2fabcd),
+ TOBN(0xa80f87ac, 0xbbaec835), TOBN(0x632c96e0, 0xf29d8d54),
+ TOBN(0x29b0a60e, 0x4c00a95e), TOBN(0x2ef17f40, 0xe011e9fa),
+ TOBN(0xf6c0e1d1, 0x15b77223), TOBN(0xaaec2c62, 0x14b04e32),
+ TOBN(0xd35688d8, 0x3d84e58c), TOBN(0x2af5094c, 0x958571db),
+ TOBN(0x4fff7e19, 0x760682a6), TOBN(0x4cb27077, 0xe39a407c),
+ TOBN(0x0f59c547, 0x4ff0e321), TOBN(0x169f34a6, 0x1b34c8ff),
+ TOBN(0x2bff1096, 0x52bc1ba7), TOBN(0xa25423b7, 0x83583544),
+ TOBN(0x5d55d5d5, 0x0ac8b782), TOBN(0xff6622ec, 0x2db3c892),
+ TOBN(0x48fce741, 0x6b8bb642), TOBN(0x31d6998c, 0x69d7e3dc),
+ TOBN(0xdbaf8004, 0xcadcaed0), TOBN(0x801b0142, 0xd81d053c),
+ TOBN(0x94b189fc, 0x59630ec6), TOBN(0x120e9934, 0xaf762c8e),
+ TOBN(0x53a29aa4, 0xfdc6a404), TOBN(0x19d8e01e, 0xa1909948),
+ TOBN(0x3cfcabf1, 0xd7e89681), TOBN(0x3321a50d, 0x4e132d37),
+ TOBN(0xd0496863, 0xe9a86111), TOBN(0x8c0cde61, 0x06a3bc65),
+ TOBN(0xaf866c49, 0xfc9f8eef), TOBN(0x2066350e, 0xff7f5141),
+ TOBN(0x4f8a4689, 0xe56ddfbd), TOBN(0xea1b0c07, 0xfe32983a),
+ TOBN(0x2b317462, 0x873cb8cb), TOBN(0x658deddc, 0x2d93229f),
+ TOBN(0x65efaf4d, 0x0f64ef58), TOBN(0xfe43287d, 0x730cc7a8),
+ TOBN(0xaebc0c72, 0x3d047d70), TOBN(0x92efa539, 0xd92d26c9),
+ TOBN(0x06e78457, 0x94b56526), TOBN(0x415cb80f, 0x0961002d),
+ TOBN(0x89e5c565, 0x76dcb10f), TOBN(0x8bbb6982, 0xff9259fe),
+ TOBN(0x4fe8795b, 0x9abc2668), TOBN(0xb5d4f534, 0x1e678fb1),
+ TOBN(0x6601f3be, 0x7b7da2b9), TOBN(0x98da59e2, 0xa13d6805),
+ TOBN(0x190d8ea6, 0x01799a52), TOBN(0xa20cec41, 0xb86d2952),
+ TOBN(0x3062ffb2, 0x7fff2a7c), TOBN(0x741b32e5, 0x79f19d37),
+ TOBN(0xf80d8181, 0x4eb57d47), TOBN(0x7a2d0ed4, 0x16aef06b),
+ TOBN(0x09735fb0, 0x1cecb588), TOBN(0x1641caaa, 0xc6061f5b) },
+ { TOBN(0x7f99824f, 0x20151427), TOBN(0x206828b6, 0x92430206),
+ TOBN(0xaa9097d7, 0xe1112357), TOBN(0xacf9a2f2, 0x09e414ec),
+ TOBN(0xdbdac9da, 0x27915356), TOBN(0x7e0734b7, 0x001efee3),
+ TOBN(0x54fab5bb, 0xd2b288e2), TOBN(0x4c630fc4, 0xf62dd09c),
+ TOBN(0x8537107a, 0x1ac2703b), TOBN(0xb49258d8, 0x6bc857b5),
+ TOBN(0x57df14de, 0xbcdaccd1), TOBN(0x24ab68d7, 0xc4ae8529),
+ TOBN(0x7ed8b5d4, 0x734e59d0), TOBN(0x5f8740c8, 0xc495cc80),
+ TOBN(0x84aedd5a, 0x291db9b3), TOBN(0x80b360f8, 0x4fb995be),
+ TOBN(0xae915f5d, 0x5fa067d1), TOBN(0x4134b57f, 0x9668960c),
+ TOBN(0xbd3656d6, 0xa48edaac), TOBN(0xdac1e3e4, 0xfc1d7436),
+ TOBN(0x674ff869, 0xd81fbb26), TOBN(0x449ed3ec, 0xb26c33d4),
+ TOBN(0x85138705, 0xd94203e8), TOBN(0xccde538b, 0xbeeb6f4a),
+ TOBN(0x55d5c68d, 0xa61a76fa), TOBN(0x598b441d, 0xca1554dc),
+ TOBN(0xd39923b9, 0x773b279c), TOBN(0x33331d3c, 0x36bf9efc),
+ TOBN(0x2d4c848e, 0x298de399), TOBN(0xcfdb8e77, 0xa1a27f56),
+ TOBN(0x94c855ea, 0x57b8ab70), TOBN(0xdcdb9dae, 0x6f7879ba),
+ TOBN(0x7bdff8c2, 0x019f2a59), TOBN(0xb3ce5bb3, 0xcb4fbc74),
+ TOBN(0xea907f68, 0x8a9173dd), TOBN(0x6cd3d0d3, 0x95a75439),
+ TOBN(0x92ecc4d6, 0xefed021c), TOBN(0x09a9f9b0, 0x6a77339a),
+ TOBN(0x87ca6b15, 0x7188c64a), TOBN(0x10c29968, 0x44899158),
+ TOBN(0x5859a229, 0xed6e82ef), TOBN(0x16f338e3, 0x65ebaf4e),
+ TOBN(0x0cd31387, 0x5ead67ae), TOBN(0x1c73d228, 0x54ef0bb4),
+ TOBN(0x4cb55131, 0x74a5c8c7), TOBN(0x01cd2970, 0x7f69ad6a),
+ TOBN(0xa04d00dd, 0xe966f87e), TOBN(0xd96fe447, 0x0b7b0321),
+ TOBN(0x342ac06e, 0x88fbd381), TOBN(0x02cd4a84, 0x5c35a493),
+ TOBN(0xe8fa89de, 0x54f1bbcd), TOBN(0x341d6367, 0x2575ed4c),
+ TOBN(0xebe357fb, 0xd238202b), TOBN(0x600b4d1a, 0xa984ead9),
+ TOBN(0xc35c9f44, 0x52436ea0), TOBN(0x96fe0a39, 0xa370751b),
+ TOBN(0x4c4f0736, 0x7f636a38), TOBN(0x9f943fb7, 0x0e76d5cb),
+ TOBN(0xb03510ba, 0xa8b68b8b), TOBN(0xc246780a, 0x9ed07a1f),
+ TOBN(0x3c051415, 0x6d549fc2), TOBN(0xc2953f31, 0x607781ca),
+ TOBN(0x955e2c69, 0xd8d95413), TOBN(0xb300fadc, 0x7bd282e3),
+ TOBN(0x81fe7b50, 0x87e9189f), TOBN(0xdb17375c, 0xf42dda27),
+ TOBN(0x22f7d896, 0xcf0a5904), TOBN(0xa0e57c5a, 0xebe348e6),
+ TOBN(0xa61011d3, 0xf40e3c80), TOBN(0xb1189321, 0x8db705c5),
+ TOBN(0x4ed9309e, 0x50fedec3), TOBN(0xdcf14a10, 0x4d6d5c1d),
+ TOBN(0x056c265b, 0x55691342), TOBN(0xe8e08504, 0x91049dc7),
+ TOBN(0x131329f5, 0xc9bae20a), TOBN(0x96c8b3e8, 0xd9dccdb4),
+ TOBN(0x8c5ff838, 0xfb4ee6b4), TOBN(0xfc5a9aeb, 0x41e8ccf0),
+ TOBN(0x7417b764, 0xfae050c6), TOBN(0x0953c3d7, 0x00452080),
+ TOBN(0x21372682, 0x38dfe7e8), TOBN(0xea417e15, 0x2bb79d4b),
+ TOBN(0x59641f1c, 0x76e7cf2d), TOBN(0x271e3059, 0xea0bcfcc),
+ TOBN(0x624c7dfd, 0x7253ecbd), TOBN(0x2f552e25, 0x4fca6186),
+ TOBN(0xcbf84ecd, 0x4d866e9c), TOBN(0x73967709, 0xf68d4610),
+ TOBN(0xa14b1163, 0xc27901b4), TOBN(0xfd9236e0, 0x899b8bf3),
+ TOBN(0x42b091ec, 0xcbc6da0a), TOBN(0xbb1dac6f, 0x5ad1d297),
+ TOBN(0x80e61d53, 0xa91cf76e), TOBN(0x4110a412, 0xd31f1ee7),
+ TOBN(0x2d87c3ba, 0x13efcf77), TOBN(0x1f374bb4, 0xdf450d76),
+ TOBN(0x5e78e2f2, 0x0d188dab), TOBN(0xe3968ed0, 0xf4b885ef),
+ TOBN(0x46c0568e, 0x7314570f), TOBN(0x31616338, 0x01170521),
+ TOBN(0x18e1e7e2, 0x4f0c8afe), TOBN(0x4caa75ff, 0xdeea78da),
+ TOBN(0x82db67f2, 0x7c5d8a51), TOBN(0x36a44d86, 0x6f505370),
+ TOBN(0xd72c5bda, 0x0333974f), TOBN(0x5db516ae, 0x27a70146),
+ TOBN(0x34705281, 0x210ef921), TOBN(0xbff17a8f, 0x0c9c38e5),
+ TOBN(0x78f4814e, 0x12476da1), TOBN(0xc1e16613, 0x33c16980),
+ TOBN(0x9e5b386f, 0x424d4bca), TOBN(0x4c274e87, 0xc85740de),
+ TOBN(0xb6a9b88d, 0x6c2f5226), TOBN(0x14d1b944, 0x550d7ca8),
+ TOBN(0x580c85fc, 0x1fc41709), TOBN(0xc1da368b, 0x54c6d519),
+ TOBN(0x2b0785ce, 0xd5113cf7), TOBN(0x0670f633, 0x5a34708f),
+ TOBN(0x46e23767, 0x15cc3f88), TOBN(0x1b480cfa, 0x50c72c8f),
+ TOBN(0x20288602, 0x4147519a), TOBN(0xd0981eac, 0x26b372f0),
+ TOBN(0xa9d4a7ca, 0xa785ebc8), TOBN(0xd953c50d, 0xdbdf58e9),
+ TOBN(0x9d6361cc, 0xfd590f8f), TOBN(0x72e9626b, 0x44e6c917),
+ TOBN(0x7fd96110, 0x22eb64cf), TOBN(0x863ebb7e, 0x9eb288f3),
+ TOBN(0x6e6ab761, 0x6aca8ee7), TOBN(0x97d10b39, 0xd7b40358),
+ TOBN(0x1687d377, 0x1e5feb0d), TOBN(0xc83e50e4, 0x8265a27a),
+ TOBN(0x8f75a9fe, 0xc954b313), TOBN(0xcc2e8f47, 0x310d1f61),
+ TOBN(0xf5ba81c5, 0x6557d0e0), TOBN(0x25f9680c, 0x3eaf6207),
+ TOBN(0xf95c6609, 0x4354080b), TOBN(0x5225bfa5, 0x7bf2fe1c),
+ TOBN(0xc5c004e2, 0x5c7d98fa), TOBN(0x3561bf1c, 0x019aaf60),
+ TOBN(0x5e6f9f17, 0xba151474), TOBN(0xdec2f934, 0xb04f6eca),
+ TOBN(0x64e368a1, 0x269acb1e), TOBN(0x1332d9e4, 0x0cdda493),
+ TOBN(0x60d6cf69, 0xdf23de05), TOBN(0x66d17da2, 0x009339a0),
+ TOBN(0x9fcac985, 0x0a693923), TOBN(0xbcf057fc, 0xed7c6a6d),
+ TOBN(0xc3c5c8c5, 0xf0b5662c), TOBN(0x25318dd8, 0xdcba4f24),
+ TOBN(0x60e8cb75, 0x082b69ff), TOBN(0x7c23b3ee, 0x1e728c01),
+ TOBN(0x15e10a0a, 0x097e4403), TOBN(0xcb3d0a86, 0x19854665),
+ TOBN(0x88d8e211, 0xd67d4826), TOBN(0xb39af66e, 0x0b9d2839),
+ TOBN(0xa5f94588, 0xbd475ca8), TOBN(0xe06b7966, 0xc077b80b),
+ TOBN(0xfedb1485, 0xda27c26c), TOBN(0xd290d33a, 0xfe0fd5e0),
+ TOBN(0xa40bcc47, 0xf34fb0fa), TOBN(0xb4760cc8, 0x1fb1ab09),
+ TOBN(0x8fca0993, 0xa273bfe3), TOBN(0x13e4fe07, 0xf70b213c),
+ TOBN(0x3bcdb992, 0xfdb05163), TOBN(0x8c484b11, 0x0c2b19b6),
+ TOBN(0x1acb815f, 0xaaf2e3e2), TOBN(0xc6905935, 0xb89ff1b4),
+ TOBN(0xb2ad6f9d, 0x586e74e1), TOBN(0x488883ad, 0x67b80484),
+ TOBN(0x758aa2c7, 0x369c3ddb), TOBN(0x8ab74e69, 0x9f9afd31),
+ TOBN(0x10fc2d28, 0x5e21beb1), TOBN(0x3484518a, 0x318c42f9),
+ TOBN(0x377427dc, 0x53cf40c3), TOBN(0x9de0781a, 0x391bc1d9),
+ TOBN(0x8faee858, 0x693807e1), TOBN(0xa3865327, 0x4e81ccc7),
+ TOBN(0x02c30ff2, 0x6f835b84), TOBN(0xb604437b, 0x0d3d38d4),
+ TOBN(0xb3fc8a98, 0x5ca1823d), TOBN(0xb82f7ec9, 0x03be0324),
+ TOBN(0xee36d761, 0xcf684a33), TOBN(0x5a01df0e, 0x9f29bf7d),
+ TOBN(0x686202f3, 0x1306583d), TOBN(0x05b10da0, 0x437c622e),
+ TOBN(0xbf9aaa0f, 0x076a7bc8), TOBN(0x25e94efb, 0x8f8f4e43),
+ TOBN(0x8a35c9b7, 0xfa3dc26d), TOBN(0xe0e5fb93, 0x96ff03c5),
+ TOBN(0xa77e3843, 0xebc394ce), TOBN(0xcede6595, 0x8361de60),
+ TOBN(0xd27c22f6, 0xa1993545), TOBN(0xab01cc36, 0x24d671ba),
+ TOBN(0x63fa2877, 0xa169c28e), TOBN(0x925ef904, 0x2eb08376),
+ TOBN(0x3b2fa3cf, 0x53aa0b32), TOBN(0xb27beb5b, 0x71c49d7a),
+ TOBN(0xb60e1834, 0xd105e27f), TOBN(0xd6089788, 0x4f68570d),
+ TOBN(0x23094ce0, 0xd6fbc2ac), TOBN(0x738037a1, 0x815ff551),
+ TOBN(0xda73b1bb, 0x6bef119c), TOBN(0xdcf6c430, 0xeef506ba),
+ TOBN(0x00e4fe7b, 0xe3ef104a), TOBN(0xebdd9a2c, 0x0a065628),
+ TOBN(0x853a81c3, 0x8792043e), TOBN(0x22ad6ece, 0xb3b59108),
+ TOBN(0x9fb813c0, 0x39cd297d), TOBN(0x8ec7e16e, 0x05bda5d9),
+ TOBN(0x2834797c, 0x0d104b96), TOBN(0xcc11a2e7, 0x7c511510),
+ TOBN(0x96ca5a53, 0x96ee6380), TOBN(0x054c8655, 0xcea38742),
+ TOBN(0xb5946852, 0xd54dfa7d), TOBN(0x97c422e7, 0x1f4ab207),
+ TOBN(0xbf907509, 0x0c22b540), TOBN(0x2cde42aa, 0xb7c267d4),
+ TOBN(0xba18f9ed, 0x5ab0d693), TOBN(0x3ba62aa6, 0x6e4660d9),
+ TOBN(0xb24bf97b, 0xab9ea96a), TOBN(0x5d039642, 0xe3b60e32),
+ TOBN(0x4e6a4506, 0x7c4d9bd5), TOBN(0x666c5b9e, 0x7ed4a6a4),
+ TOBN(0xfa3fdcd9, 0x8edbd7cc), TOBN(0x4660bb87, 0xc6ccd753),
+ TOBN(0x9ae90820, 0x21e6b64f), TOBN(0x8a56a713, 0xb36bfb3f),
+ TOBN(0xabfce096, 0x5726d47f), TOBN(0x9eed01b2, 0x0b1a9a7f),
+ TOBN(0x30e9cad4, 0x4eb74a37), TOBN(0x7b2524cc, 0x53e9666d),
+ TOBN(0x6a29683b, 0x8f4b002f), TOBN(0xc2200d7a, 0x41f4fc20),
+ TOBN(0xcf3af47a, 0x3a338acc), TOBN(0x6539a4fb, 0xe7128975),
+ TOBN(0xcec31c14, 0xc33c7fcf), TOBN(0x7eb6799b, 0xc7be322b),
+ TOBN(0x119ef4e9, 0x6646f623), TOBN(0x7b7a26a5, 0x54d7299b),
+ TOBN(0xcb37f08d, 0x403f46f2), TOBN(0x94b8fc43, 0x1a0ec0c7),
+ TOBN(0xbb8514e3, 0xc332142f), TOBN(0xf3ed2c33, 0xe80d2a7a),
+ TOBN(0x8d2080af, 0xb639126c), TOBN(0xf7b6be60, 0xe3553ade),
+ TOBN(0x3950aa9f, 0x1c7e2b09), TOBN(0x847ff958, 0x6410f02b),
+ TOBN(0x877b7cf5, 0x678a31b0), TOBN(0xd50301ae, 0x3998b620),
+ TOBN(0x734257c5, 0xc00fb396), TOBN(0xf9fb18a0, 0x04e672a6),
+ TOBN(0xff8bd8eb, 0xe8758851), TOBN(0x1e64e4c6, 0x5d99ba44),
+ TOBN(0x4b8eaedf, 0x7dfd93b7), TOBN(0xba2f2a98, 0x04e76b8c),
+ TOBN(0x7d790cba, 0xe8053433), TOBN(0xc8e725a0, 0x3d2c9585),
+ TOBN(0x58c5c476, 0xcdd8f5ed), TOBN(0xd106b952, 0xefa9fe1d),
+ TOBN(0x3c5c775b, 0x0eff13a9), TOBN(0x242442ba, 0xe057b930),
+ TOBN(0xe9f458d4, 0xc9b70cbd), TOBN(0x69b71448, 0xa3cdb89a),
+ TOBN(0x41ee46f6, 0x0e2ed742), TOBN(0x573f1045, 0x40067493),
+ TOBN(0xb1e154ff, 0x9d54c304), TOBN(0x2ad0436a, 0x8d3a7502),
+ TOBN(0xee4aaa2d, 0x431a8121), TOBN(0xcd38b3ab, 0x886f11ed),
+ TOBN(0x57d49ea6, 0x034a0eb7), TOBN(0xd2b773bd, 0xf7e85e58),
+ TOBN(0x4a559ac4, 0x9b5c1f14), TOBN(0xc444be1a, 0x3e54df2b),
+ TOBN(0x13aad704, 0xeda41891), TOBN(0xcd927bec, 0x5eb5c788),
+ TOBN(0xeb3c8516, 0xe48c8a34), TOBN(0x1b7ac812, 0x4b546669),
+ TOBN(0x1815f896, 0x594df8ec), TOBN(0x87c6a79c, 0x79227865),
+ TOBN(0xae02a2f0, 0x9b56ddbd), TOBN(0x1339b5ac, 0x8a2f1cf3),
+ TOBN(0xf2b569c7, 0x839dff0d), TOBN(0xb0b9e864, 0xfee9a43d),
+ TOBN(0x4ff8ca41, 0x77bb064e), TOBN(0x145a2812, 0xfd249f63),
+ TOBN(0x3ab7beac, 0xf86f689a), TOBN(0x9bafec27, 0x01d35f5e),
+ TOBN(0x28054c65, 0x4265aa91), TOBN(0xa4b18304, 0x035efe42),
+ TOBN(0x6887b0e6, 0x9639dec7), TOBN(0xf4b8f6ad, 0x3d52aea5),
+ TOBN(0xfb9293cc, 0x971a8a13), TOBN(0x3f159e5d, 0x4c934d07),
+ TOBN(0x2c50e9b1, 0x09acbc29), TOBN(0x08eb65e6, 0x7154d129),
+ TOBN(0x4feff589, 0x30b75c3e), TOBN(0x0bb82fe2, 0x94491c93),
+ TOBN(0xd8ac377a, 0x89af62bb), TOBN(0xd7b51490, 0x9685e49f),
+ TOBN(0xabca9a7b, 0x04497f19), TOBN(0x1b35ed0a, 0x1a7ad13f),
+ TOBN(0x6b601e21, 0x3ec86ed6), TOBN(0xda91fcb9, 0xce0c76f1),
+ TOBN(0x9e28507b, 0xd7ab27e1), TOBN(0x7c19a555, 0x63945b7b),
+ TOBN(0x6b43f0a1, 0xaafc9827), TOBN(0x443b4fbd, 0x3aa55b91),
+ TOBN(0x962b2e65, 0x6962c88f), TOBN(0x139da8d4, 0xce0db0ca),
+ TOBN(0xb93f05dd, 0x1b8d6c4f), TOBN(0x779cdff7, 0x180b9824),
+ TOBN(0xbba23fdd, 0xae57c7b7), TOBN(0x345342f2, 0x1b932522),
+ TOBN(0xfd9c80fe, 0x556d4aa3), TOBN(0xa03907ba, 0x6525bb61),
+ TOBN(0x38b010e1, 0xff218933), TOBN(0xc066b654, 0xaa52117b),
+ TOBN(0x8e141920, 0x94f2e6ea), TOBN(0x66a27dca, 0x0d32f2b2),
+ TOBN(0x69c7f993, 0x048b3717), TOBN(0xbf5a989a, 0xb178ae1c),
+ TOBN(0x49fa9058, 0x564f1d6b), TOBN(0x27ec6e15, 0xd31fde4e),
+ TOBN(0x4cce0373, 0x7276e7fc), TOBN(0x64086d79, 0x89d6bf02),
+ TOBN(0x5a72f046, 0x4ccdd979), TOBN(0x909c3566, 0x47775631),
+ TOBN(0x1c07bc6b, 0x75dd7125), TOBN(0xb4c6bc97, 0x87a0428d),
+ TOBN(0x507ece52, 0xfdeb6b9d), TOBN(0xfca56512, 0xb2c95432),
+ TOBN(0x15d97181, 0xd0e8bd06), TOBN(0x384dd317, 0xc6bb46ea),
+ TOBN(0x5441ea20, 0x3952b624), TOBN(0xbcf70dee, 0x4e7dc2fb),
+ TOBN(0x372b016e, 0x6628e8c3), TOBN(0x07a0d667, 0xb60a7522),
+ TOBN(0xcf05751b, 0x0a344ee2), TOBN(0x0ec09a48, 0x118bdeec),
+ TOBN(0x6e4b3d4e, 0xd83dce46), TOBN(0x43a6316d, 0x99d2fc6e),
+ TOBN(0xa99d8989, 0x56cf044c), TOBN(0x7c7f4454, 0xae3e5fb7),
+ TOBN(0xb2e6b121, 0xfbabbe92), TOBN(0x281850fb, 0xe1330076),
+ TOBN(0x093581ec, 0x97890015), TOBN(0x69b1dded, 0x75ff77f5),
+ TOBN(0x7cf0b18f, 0xab105105), TOBN(0x953ced31, 0xa89ccfef),
+ TOBN(0x3151f85f, 0xeb914009), TOBN(0x3c9f1b87, 0x88ed48ad),
+ TOBN(0xc9aba1a1, 0x4a7eadcb), TOBN(0x928e7501, 0x522e71cf),
+ TOBN(0xeaede727, 0x3a2e4f83), TOBN(0x467e10d1, 0x1ce3bbd3),
+ TOBN(0xf3442ac3, 0xb955dcf0), TOBN(0xba96307d, 0xd3d5e527),
+ TOBN(0xf763a10e, 0xfd77f474), TOBN(0x5d744bd0, 0x6a6e1ff0),
+ TOBN(0xd287282a, 0xa777899e), TOBN(0xe20eda8f, 0xd03f3cde),
+ TOBN(0x6a7e75bb, 0x50b07d31), TOBN(0x0b7e2a94, 0x6f379de4),
+ TOBN(0x31cb64ad, 0x19f593cf), TOBN(0x7b1a9e4f, 0x1e76ef1d),
+ TOBN(0xe18c9c9d, 0xb62d609c), TOBN(0x439bad6d, 0xe779a650),
+ TOBN(0x219d9066, 0xe032f144), TOBN(0x1db632b8, 0xe8b2ec6a),
+ TOBN(0xff0d0fd4, 0xfda12f78), TOBN(0x56fb4c2d, 0x2a25d265),
+ TOBN(0x5f4e2ee1, 0x255a03f1), TOBN(0x61cd6af2, 0xe96af176),
+ TOBN(0xe0317ba8, 0xd068bc97), TOBN(0x927d6bab, 0x264b988e),
+ TOBN(0xa18f07e0, 0xe90fb21e), TOBN(0x00fd2b80, 0xbba7fca1),
+ TOBN(0x20387f27, 0x95cd67b5), TOBN(0x5b89a4e7, 0xd39707f7),
+ TOBN(0x8f83ad3f, 0x894407ce), TOBN(0xa0025b94, 0x6c226132),
+ TOBN(0xc79563c7, 0xf906c13b), TOBN(0x5f548f31, 0x4e7bb025),
+ TOBN(0x2b4c6b8f, 0xeac6d113), TOBN(0xa67e3f9c, 0x0e813c76),
+ TOBN(0x3982717c, 0x3fe1f4b9), TOBN(0x58865819, 0x26d8050e),
+ TOBN(0x99f3640c, 0xf7f06f20), TOBN(0xdc610216, 0x2a66ebc2),
+ TOBN(0x52f2c175, 0x767a1e08), TOBN(0x05660e1a, 0x5999871b),
+ TOBN(0x6b0f1762, 0x6d3c4693), TOBN(0xf0e7d627, 0x37ed7bea),
+ TOBN(0xc51758c7, 0xb75b226d), TOBN(0x40a88628, 0x1f91613b),
+ TOBN(0x889dbaa7, 0xbbb38ce0), TOBN(0xe0404b65, 0xbddcad81),
+ TOBN(0xfebccd3a, 0x8bc9671f), TOBN(0xfbf9a357, 0xee1f5375),
+ TOBN(0x5dc169b0, 0x28f33398), TOBN(0xb07ec11d, 0x72e90f65),
+ TOBN(0xae7f3b4a, 0xfaab1eb1), TOBN(0xd970195e, 0x5f17538a),
+ TOBN(0x52b05cbe, 0x0181e640), TOBN(0xf5debd62, 0x2643313d),
+ TOBN(0x76148154, 0x5df31f82), TOBN(0x23e03b33, 0x3a9e13c5),
+ TOBN(0xff758949, 0x4fde0c1f), TOBN(0xbf8a1abe, 0xe5b6ec20),
+ TOBN(0x702278fb, 0x87e1db6c), TOBN(0xc447ad7a, 0x35ed658f),
+ TOBN(0x48d4aa38, 0x03d0ccf2), TOBN(0x80acb338, 0x819a7c03),
+ TOBN(0x9bc7c89e, 0x6e17cecc), TOBN(0x46736b8b, 0x03be1d82),
+ TOBN(0xd65d7b60, 0xc0432f96), TOBN(0xddebe7a3, 0xdeb5442f),
+ TOBN(0x79a25307, 0x7dff69a2), TOBN(0x37a56d94, 0x02cf3122),
+ TOBN(0x8bab8aed, 0xf2350d0a), TOBN(0x13c3f276, 0x037b0d9a),
+ TOBN(0xc664957c, 0x44c65cae), TOBN(0x88b44089, 0xc2e71a88),
+ TOBN(0xdb88e5a3, 0x5cb02664), TOBN(0x5d4c0bf1, 0x8686c72e),
+ TOBN(0xea3d9b62, 0xa682d53e), TOBN(0x9b605ef4, 0x0b2ad431),
+ TOBN(0x71bac202, 0xc69645d0), TOBN(0xa115f03a, 0x6a1b66e7),
+ TOBN(0xfe2c563a, 0x158f4dc4), TOBN(0xf715b3a0, 0x4d12a78c),
+ TOBN(0x8f7f0a48, 0xd413213a), TOBN(0x2035806d, 0xc04becdb),
+ TOBN(0xecd34a99, 0x5d8587f5), TOBN(0x4d8c3079, 0x9f6d3a71),
+ TOBN(0x1b2a2a67, 0x8d95a8f6), TOBN(0xc58c9d7d, 0xf2110d0d),
+ TOBN(0xdeee81d5, 0xcf8fba3f), TOBN(0xa42be3c0, 0x0c7cdf68),
+ TOBN(0x2126f742, 0xd43b5eaa), TOBN(0x054a0766, 0xdfa59b85),
+ TOBN(0x9d0d5e36, 0x126bfd45), TOBN(0xa1f8fbd7, 0x384f8a8f),
+ TOBN(0x317680f5, 0xd563fccc), TOBN(0x48ca5055, 0xf280a928),
+ TOBN(0xe00b81b2, 0x27b578cf), TOBN(0x10aad918, 0x2994a514),
+ TOBN(0xd9e07b62, 0xb7bdc953), TOBN(0x9f0f6ff2, 0x5bc086dd),
+ TOBN(0x09d1ccff, 0x655eee77), TOBN(0x45475f79, 0x5bef7df1),
+ TOBN(0x3faa28fa, 0x86f702cc), TOBN(0x92e60905, 0x0f021f07),
+ TOBN(0xe9e62968, 0x7f8fa8c6), TOBN(0xbd71419a, 0xf036ea2c),
+ TOBN(0x171ee1cc, 0x6028da9a), TOBN(0x5352fe1a, 0xc251f573),
+ TOBN(0xf8ff236e, 0x3fa997f4), TOBN(0xd831b6c9, 0xa5749d5f),
+ TOBN(0x7c872e1d, 0xe350e2c2), TOBN(0xc56240d9, 0x1e0ce403),
+ TOBN(0xf9deb077, 0x6974f5cb), TOBN(0x7d50ba87, 0x961c3728),
+ TOBN(0xd6f89426, 0x5a3a2518), TOBN(0xcf817799, 0xc6303d43),
+ TOBN(0x510a0471, 0x619e5696), TOBN(0xab049ff6, 0x3a5e307b),
+ TOBN(0xe4cdf9b0, 0xfeb13ec7), TOBN(0xd5e97117, 0x9d8ff90c),
+ TOBN(0xf6f64d06, 0x9afa96af), TOBN(0x00d0bf5e, 0x9d2012a2),
+ TOBN(0xe63f301f, 0x358bcdc0), TOBN(0x07689e99, 0x0a9d47f8),
+ TOBN(0x1f689e2f, 0x4f43d43a), TOBN(0x4d542a16, 0x90920904),
+ TOBN(0xaea293d5, 0x9ca0a707), TOBN(0xd061fe45, 0x8ac68065),
+ TOBN(0x1033bf1b, 0x0090008c), TOBN(0x29749558, 0xc08a6db6),
+ TOBN(0x74b5fc59, 0xc1d5d034), TOBN(0xf712e9f6, 0x67e215e0),
+ TOBN(0xfd520cbd, 0x860200e6), TOBN(0x0229acb4, 0x3ea22588),
+ TOBN(0x9cd1e14c, 0xfff0c82e), TOBN(0x87684b62, 0x59c69e73),
+ TOBN(0xda85e61c, 0x96ccb989), TOBN(0x2d5dbb02, 0xa3d06493),
+ TOBN(0xf22ad33a, 0xe86b173c), TOBN(0xe8e41ea5, 0xa79ff0e3),
+ TOBN(0x01d2d725, 0xdd0d0c10), TOBN(0x31f39088, 0x032d28f9),
+ TOBN(0x7b3f71e1, 0x7829839e), TOBN(0x0cf691b4, 0x4502ae58),
+ TOBN(0xef658dbd, 0xbefc6115), TOBN(0xa5cd6ee5, 0xb3ab5314),
+ TOBN(0x206c8d7b, 0x5f1d2347), TOBN(0x794645ba, 0x4cc2253a),
+ TOBN(0xd517d8ff, 0x58389e08), TOBN(0x4fa20dee, 0x9f847288),
+ TOBN(0xeba072d8, 0xd797770a), TOBN(0x7360c91d, 0xbf429e26),
+ TOBN(0x7200a3b3, 0x80af8279), TOBN(0x6a1c9150, 0x82dadce3),
+ TOBN(0x0ee6d3a7, 0xc35d8794), TOBN(0x042e6558, 0x0356bae5),
+ TOBN(0x9f59698d, 0x643322fd), TOBN(0x9379ae15, 0x50a61967),
+ TOBN(0x64b9ae62, 0xfcc9981e), TOBN(0xaed3d631, 0x6d2934c6),
+ TOBN(0x2454b302, 0x5e4e65eb), TOBN(0xab09f647, 0xf9950428) },
+ { TOBN(0xb2083a12, 0x22248acc), TOBN(0x1f6ec0ef, 0x3264e366),
+ TOBN(0x5659b704, 0x5afdee28), TOBN(0x7a823a40, 0xe6430bb5),
+ TOBN(0x24592a04, 0xe1900a79), TOBN(0xcde09d4a, 0xc9ee6576),
+ TOBN(0x52b6463f, 0x4b5ea54a), TOBN(0x1efe9ed3, 0xd3ca65a7),
+ TOBN(0xe27a6dbe, 0x305406dd), TOBN(0x8eb7dc7f, 0xdd5d1957),
+ TOBN(0xf54a6876, 0x387d4d8f), TOBN(0x9c479409, 0xc7762de4),
+ TOBN(0xbe4d5b5d, 0x99b30778), TOBN(0x25380c56, 0x6e793682),
+ TOBN(0x602d37f3, 0xdac740e3), TOBN(0x140deabe, 0x1566e4ae),
+ TOBN(0x4481d067, 0xafd32acf), TOBN(0xd8f0fcca, 0xe1f71ccf),
+ TOBN(0xd208dd0c, 0xb596f2da), TOBN(0xd049d730, 0x9aad93f9),
+ TOBN(0xc79f263d, 0x42ab580e), TOBN(0x09411bb1, 0x23f707b4),
+ TOBN(0x8cfde1ff, 0x835e0eda), TOBN(0x72707490, 0x90f03402),
+ TOBN(0xeaee6126, 0xc49a861e), TOBN(0x024f3b65, 0xe14f0d06),
+ TOBN(0x51a3f1e8, 0xc69bfc17), TOBN(0xc3c3a8e9, 0xa7686381),
+ TOBN(0x3400752c, 0xb103d4c8), TOBN(0x02bc4613, 0x9218b36b),
+ TOBN(0xc67f75eb, 0x7651504a), TOBN(0xd6848b56, 0xd02aebfa),
+ TOBN(0xbd9802e6, 0xc30fa92b), TOBN(0x5a70d96d, 0x9a552784),
+ TOBN(0x9085c4ea, 0x3f83169b), TOBN(0xfa9423bb, 0x06908228),
+ TOBN(0x2ffebe12, 0xfe97a5b9), TOBN(0x85da6049, 0x71b99118),
+ TOBN(0x9cbc2f7f, 0x63178846), TOBN(0xfd96bc70, 0x9153218e),
+ TOBN(0x958381db, 0x1782269b), TOBN(0xae34bf79, 0x2597e550),
+ TOBN(0xbb5c6064, 0x5f385153), TOBN(0x6f0e96af, 0xe3088048),
+ TOBN(0xbf6a0215, 0x77884456), TOBN(0xb3b5688c, 0x69310ea7),
+ TOBN(0x17c94295, 0x04fad2de), TOBN(0xe020f0e5, 0x17896d4d),
+ TOBN(0x730ba0ab, 0x0976505f), TOBN(0x567f6813, 0x095e2ec5),
+ TOBN(0x47062010, 0x6331ab71), TOBN(0x72cfa977, 0x41d22b9f),
+ TOBN(0x33e55ead, 0x8a2373da), TOBN(0xa8d0d5f4, 0x7ba45a68),
+ TOBN(0xba1d8f9c, 0x03029d15), TOBN(0x8f34f1cc, 0xfc55b9f3),
+ TOBN(0xcca4428d, 0xbbe5a1a9), TOBN(0x8187fd5f, 0x3126bd67),
+ TOBN(0x0036973a, 0x48105826), TOBN(0xa39b6663, 0xb8bd61a0),
+ TOBN(0x6d42deef, 0x2d65a808), TOBN(0x4969044f, 0x94636b19),
+ TOBN(0xf611ee47, 0xdd5d564c), TOBN(0x7b2f3a49, 0xd2873077),
+ TOBN(0x94157d45, 0x300eb294), TOBN(0x2b2a656e, 0x169c1494),
+ TOBN(0xc000dd76, 0xd3a47aa9), TOBN(0xa2864e4f, 0xa6243ea4),
+ TOBN(0x82716c47, 0xdb89842e), TOBN(0x12dfd7d7, 0x61479fb7),
+ TOBN(0x3b9a2c56, 0xe0b2f6dc), TOBN(0x46be862a, 0xd7f85d67),
+ TOBN(0x03b0d8dd, 0x0f82b214), TOBN(0x460c34f9, 0xf103cbc6),
+ TOBN(0xf32e5c03, 0x18d79e19), TOBN(0x8b8888ba, 0xa84117f8),
+ TOBN(0x8f3c37dc, 0xc0722677), TOBN(0x10d21be9, 0x1c1c0f27),
+ TOBN(0xd47c8468, 0xe0f7a0c6), TOBN(0x9bf02213, 0xadecc0e0),
+ TOBN(0x0baa7d12, 0x42b48b99), TOBN(0x1bcb665d, 0x48424096),
+ TOBN(0x8b847cd6, 0xebfb5cfb), TOBN(0x87c2ae56, 0x9ad4d10d),
+ TOBN(0xf1cbb122, 0x0de36726), TOBN(0xe7043c68, 0x3fdfbd21),
+ TOBN(0x4bd0826a, 0x4e79d460), TOBN(0x11f5e598, 0x4bd1a2cb),
+ TOBN(0x97554160, 0xb7fe7b6e), TOBN(0x7d16189a, 0x400a3fb2),
+ TOBN(0xd73e9bea, 0xe328ca1e), TOBN(0x0dd04b97, 0xe793d8cc),
+ TOBN(0xa9c83c9b, 0x506db8cc), TOBN(0x5cd47aae, 0xcf38814c),
+ TOBN(0x26fc430d, 0xb64b45e6), TOBN(0x079b5499, 0xd818ea84),
+ TOBN(0xebb01102, 0xc1c24a3b), TOBN(0xca24e568, 0x1c161c1a),
+ TOBN(0x103eea69, 0x36f00a4a), TOBN(0x9ad76ee8, 0x76176c7b),
+ TOBN(0x97451fc2, 0x538e0ff7), TOBN(0x94f89809, 0x6604b3b0),
+ TOBN(0x6311436e, 0x3249cfd7), TOBN(0x27b4a7bd, 0x41224f69),
+ TOBN(0x03b5d21a, 0xe0ac2941), TOBN(0x279b0254, 0xc2d31937),
+ TOBN(0x3307c052, 0xcac992d0), TOBN(0x6aa7cb92, 0xefa8b1f3),
+ TOBN(0x5a182580, 0x0d37c7a5), TOBN(0x13380c37, 0x342d5422),
+ TOBN(0x92ac2d66, 0xd5d2ef92), TOBN(0x035a70c9, 0x030c63c6),
+ TOBN(0xc16025dd, 0x4ce4f152), TOBN(0x1f419a71, 0xf9df7c06),
+ TOBN(0x6d5b2214, 0x91e4bb14), TOBN(0xfc43c6cc, 0x839fb4ce),
+ TOBN(0x49f06591, 0x925d6b2d), TOBN(0x4b37d9d3, 0x62186598),
+ TOBN(0x8c54a971, 0xd01b1629), TOBN(0xe1a9c29f, 0x51d50e05),
+ TOBN(0x5109b785, 0x71ba1861), TOBN(0x48b22d5c, 0xd0c8f93d),
+ TOBN(0xe8fa84a7, 0x8633bb93), TOBN(0x53fba6ba, 0x5aebbd08),
+ TOBN(0x7ff27df3, 0xe5eea7d8), TOBN(0x521c8796, 0x68ca7158),
+ TOBN(0xb9d5133b, 0xce6f1a05), TOBN(0x2d50cd53, 0xfd0ebee4),
+ TOBN(0xc82115d6, 0xc5a3ef16), TOBN(0x993eff9d, 0xba079221),
+ TOBN(0xe4da2c5e, 0x4b5da81c), TOBN(0x9a89dbdb, 0x8033fd85),
+ TOBN(0x60819ebf, 0x2b892891), TOBN(0x53902b21, 0x5d14a4d5),
+ TOBN(0x6ac35051, 0xd7fda421), TOBN(0xcc6ab885, 0x61c83284),
+ TOBN(0x14eba133, 0xf74cff17), TOBN(0x240aaa03, 0xecb813f2),
+ TOBN(0xcfbb6540, 0x6f665bee), TOBN(0x084b1fe4, 0xa425ad73),
+ TOBN(0x009d5d16, 0xd081f6a6), TOBN(0x35304fe8, 0xeef82c90),
+ TOBN(0xf20346d5, 0xaa9eaa22), TOBN(0x0ada9f07, 0xac1c91e3),
+ TOBN(0xa6e21678, 0x968a6144), TOBN(0x54c1f77c, 0x07b31a1e),
+ TOBN(0xd6bb787e, 0x5781fbe1), TOBN(0x61bd2ee0, 0xe31f1c4a),
+ TOBN(0xf25aa1e9, 0x781105fc), TOBN(0x9cf2971f, 0x7b2f8e80),
+ TOBN(0x26d15412, 0xcdff919b), TOBN(0x01db4ebe, 0x34bc896e),
+ TOBN(0x7d9b3e23, 0xb40df1cf), TOBN(0x59337373, 0x94e971b4),
+ TOBN(0xbf57bd14, 0x669cf921), TOBN(0x865daedf, 0x0c1a1064),
+ TOBN(0x3eb70bd3, 0x83279125), TOBN(0xbc3d5b9f, 0x34ecdaab),
+ TOBN(0x91e3ed7e, 0x5f755caf), TOBN(0x49699f54, 0xd41e6f02),
+ TOBN(0x185770e1, 0xd4a7a15b), TOBN(0x08f3587a, 0xeaac87e7),
+ TOBN(0x352018db, 0x473133ea), TOBN(0x674ce719, 0x04fd30fc),
+ TOBN(0x7b8d9835, 0x088b3e0e), TOBN(0x7a0356a9, 0x5d0d47a1),
+ TOBN(0x9d9e7659, 0x6474a3c4), TOBN(0x61ea48a7, 0xff66966c),
+ TOBN(0x30417758, 0x0f3e4834), TOBN(0xfdbb21c2, 0x17a9afcb),
+ TOBN(0x756fa17f, 0x2f9a67b3), TOBN(0x2a6b2421, 0xa245c1a8),
+ TOBN(0x64be2794, 0x4af02291), TOBN(0xade465c6, 0x2a5804fe),
+ TOBN(0x8dffbd39, 0xa6f08fd7), TOBN(0xc4efa84c, 0xaa14403b),
+ TOBN(0xa1b91b2a, 0x442b0f5c), TOBN(0xb748e317, 0xcf997736),
+ TOBN(0x8d1b62bf, 0xcee90e16), TOBN(0x907ae271, 0x0b2078c0),
+ TOBN(0xdf31534b, 0x0c9bcddd), TOBN(0x043fb054, 0x39adce83),
+ TOBN(0x99031043, 0xd826846a), TOBN(0x61a9c0d6, 0xb144f393),
+ TOBN(0xdab48046, 0x47718427), TOBN(0xdf17ff9b, 0x6e830f8b),
+ TOBN(0x408d7ee8, 0xe49a1347), TOBN(0x6ac71e23, 0x91c1d4ae),
+ TOBN(0xc8cbb9fd, 0x1defd73c), TOBN(0x19840657, 0xbbbbfec5),
+ TOBN(0x39db1cb5, 0x9e7ef8ea), TOBN(0x78aa8296, 0x64105f30),
+ TOBN(0xa3d9b7f0, 0xa3738c29), TOBN(0x0a2f235a, 0xbc3250a3),
+ TOBN(0x55e506f6, 0x445e4caf), TOBN(0x0974f73d, 0x33475f7a),
+ TOBN(0xd37dbba3, 0x5ba2f5a8), TOBN(0x542c6e63, 0x6af40066),
+ TOBN(0x26d99b53, 0xc5d73e2c), TOBN(0x06060d7d, 0x6c3ca33e),
+ TOBN(0xcdbef1c2, 0x065fef4a), TOBN(0x77e60f7d, 0xfd5b92e3),
+ TOBN(0xd7c549f0, 0x26708350), TOBN(0x201b3ad0, 0x34f121bf),
+ TOBN(0x5fcac2a1, 0x0334fc14), TOBN(0x8a9a9e09, 0x344552f6),
+ TOBN(0x7dd8a1d3, 0x97653082), TOBN(0x5fc0738f, 0x79d4f289),
+ TOBN(0x787d244d, 0x17d2d8c3), TOBN(0xeffc6345, 0x70830684),
+ TOBN(0x5ddb96dd, 0xe4f73ae5), TOBN(0x8efb14b1, 0x172549a5),
+ TOBN(0x6eb73eee, 0x2245ae7a), TOBN(0xbca4061e, 0xea11f13e),
+ TOBN(0xb577421d, 0x30b01f5d), TOBN(0xaa688b24, 0x782e152c),
+ TOBN(0x67608e71, 0xbd3502ba), TOBN(0x4ef41f24, 0xb4de75a0),
+ TOBN(0xb08dde5e, 0xfd6125e5), TOBN(0xde484825, 0xa409543f),
+ TOBN(0x1f198d98, 0x65cc2295), TOBN(0x428a3771, 0x6e0edfa2),
+ TOBN(0x4f9697a2, 0xadf35fc7), TOBN(0x01a43c79, 0xf7cac3c7),
+ TOBN(0xb05d7059, 0x0fd3659a), TOBN(0x8927f30c, 0xbb7f2d9a),
+ TOBN(0x4023d1ac, 0x8cf984d3), TOBN(0x32125ed3, 0x02897a45),
+ TOBN(0xfb572dad, 0x3d414205), TOBN(0x73000ef2, 0xe3fa82a9),
+ TOBN(0x4c0868e9, 0xf10a5581), TOBN(0x5b61fc67, 0x6b0b3ca5),
+ TOBN(0xc1258d5b, 0x7cae440c), TOBN(0x21c08b41, 0x402b7531),
+ TOBN(0xf61a8955, 0xde932321), TOBN(0x3568faf8, 0x2d1408af),
+ TOBN(0x71b15e99, 0x9ecf965b), TOBN(0xf14ed248, 0xe917276f),
+ TOBN(0xc6f4caa1, 0x820cf9e2), TOBN(0x681b20b2, 0x18d83c7e),
+ TOBN(0x6cde738d, 0xc6c01120), TOBN(0x71db0813, 0xae70e0db),
+ TOBN(0x95fc0644, 0x74afe18c), TOBN(0x34619053, 0x129e2be7),
+ TOBN(0x80615cea, 0xdb2a3b15), TOBN(0x0a49a19e, 0xdb4c7073),
+ TOBN(0x0e1b84c8, 0x8fd2d367), TOBN(0xd74bf462, 0x033fb8aa),
+ TOBN(0x889f6d65, 0x533ef217), TOBN(0x7158c7e4, 0xc3ca2e87),
+ TOBN(0xfb670dfb, 0xdc2b4167), TOBN(0x75910a01, 0x844c257f),
+ TOBN(0xf336bf07, 0xcf88577d), TOBN(0x22245250, 0xe45e2ace),
+ TOBN(0x2ed92e8d, 0x7ca23d85), TOBN(0x29f8be4c, 0x2b812f58),
+ TOBN(0xdd9ebaa7, 0x076fe12b), TOBN(0x3f2400cb, 0xae1537f9),
+ TOBN(0x1aa93528, 0x17bdfb46), TOBN(0xc0f98430, 0x67883b41),
+ TOBN(0x5590ede1, 0x0170911d), TOBN(0x7562f5bb, 0x34d4b17f),
+ TOBN(0xe1fa1df2, 0x1826b8d2), TOBN(0xb40b796a, 0x6bd80d59),
+ TOBN(0xd65bf197, 0x3467ba92), TOBN(0x8c9b46db, 0xf70954b0),
+ TOBN(0x97c8a0f3, 0x0e78f15d), TOBN(0xa8f3a69a, 0x85a4c961),
+ TOBN(0x4242660f, 0x61e4ce9b), TOBN(0xbf06aab3, 0x6ea6790c),
+ TOBN(0xc6706f8e, 0xec986416), TOBN(0x9e56dec1, 0x9a9fc225),
+ TOBN(0x527c46f4, 0x9a9898d9), TOBN(0xd799e77b, 0x5633cdef),
+ TOBN(0x24eacc16, 0x7d9e4297), TOBN(0xabb61cea, 0x6b1cb734),
+ TOBN(0xbee2e8a7, 0xf778443c), TOBN(0x3bb42bf1, 0x29de2fe6),
+ TOBN(0xcbed86a1, 0x3003bb6f), TOBN(0xd3918e6c, 0xd781cdf6),
+ TOBN(0x4bee3271, 0x9a5103f1), TOBN(0x5243efc6, 0xf50eac06),
+ TOBN(0xb8e122cb, 0x6adcc119), TOBN(0x1b7faa84, 0xc0b80a08),
+ TOBN(0x32c3d1bd, 0x6dfcd08c), TOBN(0x129dec4e, 0x0be427de),
+ TOBN(0x98ab679c, 0x1d263c83), TOBN(0xafc83cb7, 0xcef64eff),
+ TOBN(0x85eb6088, 0x2fa6be76), TOBN(0x892585fb, 0x1328cbfe),
+ TOBN(0xc154d3ed, 0xcf618dda), TOBN(0xc44f601b, 0x3abaf26e),
+ TOBN(0x7bf57d0b, 0x2be1fdfd), TOBN(0xa833bd2d, 0x21137fee),
+ TOBN(0x9353af36, 0x2db591a8), TOBN(0xc76f26dc, 0x5562a056),
+ TOBN(0x1d87e47d, 0x3fdf5a51), TOBN(0x7afb5f93, 0x55c9cab0),
+ TOBN(0x91bbf58f, 0x89e0586e), TOBN(0x7c72c018, 0x0d843709),
+ TOBN(0xa9a5aafb, 0x99b5c3dc), TOBN(0xa48a0f1d, 0x3844aeb0),
+ TOBN(0x7178b7dd, 0xb667e482), TOBN(0x453985e9, 0x6e23a59a),
+ TOBN(0x4a54c860, 0x01b25dd8), TOBN(0x0dd37f48, 0xfb897c8a),
+ TOBN(0x5f8aa610, 0x0ea90cd9), TOBN(0xc8892c68, 0x16d5830d),
+ TOBN(0xeb4befc0, 0xef514ca5), TOBN(0x478eb679, 0xe72c9ee6),
+ TOBN(0x9bca20da, 0xdbc40d5f), TOBN(0xf015de21, 0xdde4f64a),
+ TOBN(0xaa6a4de0, 0xeaf4b8a5), TOBN(0x68cfd9ca, 0x4bc60e32),
+ TOBN(0x668a4b01, 0x7fd15e70), TOBN(0xd9f0694a, 0xf27dc09d),
+ TOBN(0xf6c3cad5, 0xba708bcd), TOBN(0x5cd2ba69, 0x5bb95c2a),
+ TOBN(0xaa28c1d3, 0x33c0a58f), TOBN(0x23e274e3, 0xabc77870),
+ TOBN(0x44c3692d, 0xdfd20a4a), TOBN(0x091c5fd3, 0x81a66653),
+ TOBN(0x6c0bb691, 0x09a0757d), TOBN(0x9072e8b9, 0x667343ea),
+ TOBN(0x31d40eb0, 0x80848bec), TOBN(0x95bd480a, 0x79fd36cc),
+ TOBN(0x01a77c61, 0x65ed43f5), TOBN(0xafccd127, 0x2e0d40bf),
+ TOBN(0xeccfc82d, 0x1cc1884b), TOBN(0xc85ac201, 0x5d4753b4),
+ TOBN(0xc7a6caac, 0x658e099f), TOBN(0xcf46369e, 0x04b27390),
+ TOBN(0xe2e7d049, 0x506467ea), TOBN(0x481b63a2, 0x37cdeccc),
+ TOBN(0x4029abd8, 0xed80143a), TOBN(0x28bfe3c7, 0xbcb00b88),
+ TOBN(0x3bec1009, 0x0643d84a), TOBN(0x885f3668, 0xabd11041),
+ TOBN(0xdb02432c, 0xf83a34d6), TOBN(0x32f7b360, 0x719ceebe),
+ TOBN(0xf06c7837, 0xdad1fe7a), TOBN(0x60a157a9, 0x5441a0b0),
+ TOBN(0x704970e9, 0xe2d47550), TOBN(0xcd2bd553, 0x271b9020),
+ TOBN(0xff57f82f, 0x33e24a0b), TOBN(0x9cbee23f, 0xf2565079),
+ TOBN(0x16353427, 0xeb5f5825), TOBN(0x276feec4, 0xe948d662),
+ TOBN(0xd1b62bc6, 0xda10032b), TOBN(0x718351dd, 0xf0e72a53),
+ TOBN(0x93452076, 0x2420e7ba), TOBN(0x96368fff, 0x3a00118d),
+ TOBN(0x00ce2d26, 0x150a49e4), TOBN(0x0c28b636, 0x3f04706b),
+ TOBN(0xbad65a46, 0x58b196d0), TOBN(0x6c8455fc, 0xec9f8b7c),
+ TOBN(0xe90c895f, 0x2d71867e), TOBN(0x5c0be31b, 0xedf9f38c),
+ TOBN(0x2a37a15e, 0xd8f6ec04), TOBN(0x239639e7, 0x8cd85251),
+ TOBN(0xd8975315, 0x9c7c4c6b), TOBN(0x603aa3c0, 0xd7409af7),
+ TOBN(0xb8d53d0c, 0x007132fb), TOBN(0x68d12af7, 0xa6849238),
+ TOBN(0xbe0607e7, 0xbf5d9279), TOBN(0x9aa50055, 0xaada74ce),
+ TOBN(0xe81079cb, 0xba7e8ccb), TOBN(0x610c71d1, 0xa5f4ff5e),
+ TOBN(0x9e2ee1a7, 0x5aa07093), TOBN(0xca84004b, 0xa75da47c),
+ TOBN(0x074d3951, 0x3de75401), TOBN(0xf938f756, 0xbb311592),
+ TOBN(0x96197618, 0x00a43421), TOBN(0x39a25362, 0x07bc78c8),
+ TOBN(0x278f710a, 0x0a171276), TOBN(0xb28446ea, 0x8d1a8f08),
+ TOBN(0x184781bf, 0xe3b6a661), TOBN(0x7751cb1d, 0xe6d279f7),
+ TOBN(0xf8ff95d6, 0xc59eb662), TOBN(0x186d90b7, 0x58d3dea7),
+ TOBN(0x0e4bb6c1, 0xdfb4f754), TOBN(0x5c5cf56b, 0x2b2801dc),
+ TOBN(0xc561e452, 0x1f54564d), TOBN(0xb4fb8c60, 0xf0dd7f13),
+ TOBN(0xf8849630, 0x33ff98c7), TOBN(0x9619fffa, 0xcf17769c),
+ TOBN(0xf8090bf6, 0x1bfdd80a), TOBN(0x14d9a149, 0x422cfe63),
+ TOBN(0xb354c360, 0x6f6df9ea), TOBN(0xdbcf770d, 0x218f17ea),
+ TOBN(0x207db7c8, 0x79eb3480), TOBN(0x213dbda8, 0x559b6a26),
+ TOBN(0xac4c200b, 0x29fc81b3), TOBN(0xebc3e09f, 0x171d87c1),
+ TOBN(0x91799530, 0x1481aa9e), TOBN(0x051b92e1, 0x92e114fa),
+ TOBN(0xdf8f92e9, 0xecb5537f), TOBN(0x44b1b2cc, 0x290c7483),
+ TOBN(0xa711455a, 0x2adeb016), TOBN(0x964b6856, 0x81a10c2c),
+ TOBN(0x4f159d99, 0xcec03623), TOBN(0x05532225, 0xef3271ea),
+ TOBN(0xb231bea3, 0xc5ee4849), TOBN(0x57a54f50, 0x7094f103),
+ TOBN(0x3e2d421d, 0x9598b352), TOBN(0xe865a49c, 0x67412ab4),
+ TOBN(0xd2998a25, 0x1cc3a912), TOBN(0x5d092808, 0x0c74d65d),
+ TOBN(0x73f45908, 0x4088567a), TOBN(0xeb6b280e, 0x1f214a61),
+ TOBN(0x8c9adc34, 0xcaf0c13d), TOBN(0x39d12938, 0xf561fb80),
+ TOBN(0xb2dc3a5e, 0xbc6edfb4), TOBN(0x7485b1b1, 0xfe4d210e),
+ TOBN(0x062e0400, 0xe186ae72), TOBN(0x91e32d5c, 0x6eeb3b88),
+ TOBN(0x6df574d7, 0x4be59224), TOBN(0xebc88ccc, 0x716d55f3),
+ TOBN(0x26c2e6d0, 0xcad6ed33), TOBN(0xc6e21e7d, 0x0d3e8b10),
+ TOBN(0x2cc5840e, 0x5bcc36bb), TOBN(0x9292445e, 0x7da74f69),
+ TOBN(0x8be8d321, 0x4e5193a8), TOBN(0x3ec23629, 0x8df06413),
+ TOBN(0xc7e9ae85, 0xb134defa), TOBN(0x6073b1d0, 0x1bb2d475),
+ TOBN(0xb9ad615e, 0x2863c00d), TOBN(0x9e29493d, 0x525f4ac4),
+ TOBN(0xc32b1dea, 0x4e9acf4f), TOBN(0x3e1f01c8, 0xa50db88d),
+ TOBN(0xb05d70ea, 0x04da916c), TOBN(0x714b0d0a, 0xd865803e),
+ TOBN(0x4bd493fc, 0x9920cb5e), TOBN(0x5b44b1f7, 0x92c7a3ac),
+ TOBN(0xa2a77293, 0xbcec9235), TOBN(0x5ee06e87, 0xcd378553),
+ TOBN(0xceff8173, 0xda621607), TOBN(0x2bb03e4c, 0x99f5d290),
+ TOBN(0x2945106a, 0xa6f734ac), TOBN(0xb5056604, 0xd25c4732),
+ TOBN(0x5945920c, 0xe079afee), TOBN(0x686e17a0, 0x6789831f),
+ TOBN(0x5966bee8, 0xb74a5ae5), TOBN(0x38a673a2, 0x1e258d46),
+ TOBN(0xbd1cc1f2, 0x83141c95), TOBN(0x3b2ecf4f, 0x0e96e486),
+ TOBN(0xcd3aa896, 0x74e5fc78), TOBN(0x415ec10c, 0x2482fa7a),
+ TOBN(0x15234419, 0x80503380), TOBN(0x513d917a, 0xd314b392),
+ TOBN(0xb0b52f4e, 0x63caecae), TOBN(0x07bf22ad, 0x2dc7780b),
+ TOBN(0xe761e8a1, 0xe4306839), TOBN(0x1b3be962, 0x5dd7feaa),
+ TOBN(0x4fe728de, 0x74c778f1), TOBN(0xf1fa0bda, 0x5e0070f6),
+ TOBN(0x85205a31, 0x6ec3f510), TOBN(0x2c7e4a14, 0xd2980475),
+ TOBN(0xde3c19c0, 0x6f30ebfd), TOBN(0xdb1c1f38, 0xd4b7e644),
+ TOBN(0xfe291a75, 0x5dce364a), TOBN(0xb7b22a3c, 0x058f5be3),
+ TOBN(0x2cd2c302, 0x37fea38c), TOBN(0x2930967a, 0x2e17be17),
+ TOBN(0x87f009de, 0x0c061c65), TOBN(0xcb014aac, 0xedc6ed44),
+ TOBN(0x49bd1cb4, 0x3bafb1eb), TOBN(0x81bd8b5c, 0x282d3688),
+ TOBN(0x1cdab87e, 0xf01a17af), TOBN(0x21f37ac4, 0xe710063b),
+ TOBN(0x5a6c5676, 0x42fc8193), TOBN(0xf4753e70, 0x56a6015c),
+ TOBN(0x020f795e, 0xa15b0a44), TOBN(0x8f37c8d7, 0x8958a958),
+ TOBN(0x63b7e89b, 0xa4b675b5), TOBN(0xb4fb0c0c, 0x0fc31aea),
+ TOBN(0xed95e639, 0xa7ff1f2e), TOBN(0x9880f5a3, 0x619614fb),
+ TOBN(0xdeb6ff02, 0x947151ab), TOBN(0x5bc5118c, 0xa868dcdb),
+ TOBN(0xd8da2055, 0x4c20cea5), TOBN(0xcac2776e, 0x14c4d69a),
+ TOBN(0xcccb22c1, 0x622d599b), TOBN(0xa4ddb653, 0x68a9bb50),
+ TOBN(0x2c4ff151, 0x1b4941b4), TOBN(0xe1ff19b4, 0x6efba588),
+ TOBN(0x35034363, 0xc48345e0), TOBN(0x45542e3d, 0x1e29dfc4),
+ TOBN(0xf197cb91, 0x349f7aed), TOBN(0x3b2b5a00, 0x8fca8420),
+ TOBN(0x7c175ee8, 0x23aaf6d8), TOBN(0x54dcf421, 0x35af32b6),
+ TOBN(0x0ba14307, 0x27d6561e), TOBN(0x879d5ee4, 0xd175b1e2),
+ TOBN(0xc7c43673, 0x99807db5), TOBN(0x77a54455, 0x9cd55bcd),
+ TOBN(0xe6c2ff13, 0x0105c072), TOBN(0x18f7a99f, 0x8dda7da4),
+ TOBN(0x4c301820, 0x0e2d35c1), TOBN(0x06a53ca0, 0xd9cc6c82),
+ TOBN(0xaa21cc1e, 0xf1aa1d9e), TOBN(0x32414334, 0x4a75b1e8),
+ TOBN(0x2a6d1328, 0x0ebe9fdc), TOBN(0x16bd173f, 0x98a4755a),
+ TOBN(0xfbb9b245, 0x2133ffd9), TOBN(0x39a8b2f1, 0x830f1a20),
+ TOBN(0x484bc97d, 0xd5a1f52a), TOBN(0xd6aebf56, 0xa40eddf8),
+ TOBN(0x32257acb, 0x76ccdac6), TOBN(0xaf4d36ec, 0x1586ff27),
+ TOBN(0x8eaa8863, 0xf8de7dd1), TOBN(0x0045d5cf, 0x88647c16) },
+ { TOBN(0xa6f3d574, 0xc005979d), TOBN(0xc2072b42, 0x6a40e350),
+ TOBN(0xfca5c156, 0x8de2ecf9), TOBN(0xa8c8bf5b, 0xa515344e),
+ TOBN(0x97aee555, 0x114df14a), TOBN(0xd4374a4d, 0xfdc5ec6b),
+ TOBN(0x754cc28f, 0x2ca85418), TOBN(0x71cb9e27, 0xd3c41f78),
+ TOBN(0x89105079, 0x03605c39), TOBN(0xf0843d9e, 0xa142c96c),
+ TOBN(0xf3744934, 0x16923684), TOBN(0x732caa2f, 0xfa0a2893),
+ TOBN(0xb2e8c270, 0x61160170), TOBN(0xc32788cc, 0x437fbaa3),
+ TOBN(0x39cd818e, 0xa6eda3ac), TOBN(0xe2e94239, 0x9e2b2e07),
+ TOBN(0x6967d39b, 0x0260e52a), TOBN(0xd42585cc, 0x90653325),
+ TOBN(0x0d9bd605, 0x21ca7954), TOBN(0x4fa20877, 0x81ed57b3),
+ TOBN(0x60c1eff8, 0xe34a0bbe), TOBN(0x56b0040c, 0x84f6ef64),
+ TOBN(0x28be2b24, 0xb1af8483), TOBN(0xb2278163, 0xf5531614),
+ TOBN(0x8df27545, 0x5922ac1c), TOBN(0xa7b3ef5c, 0xa52b3f63),
+ TOBN(0x8e77b214, 0x71de57c4), TOBN(0x31682c10, 0x834c008b),
+ TOBN(0xc76824f0, 0x4bd55d31), TOBN(0xb6d1c086, 0x17b61c71),
+ TOBN(0x31db0903, 0xc2a5089d), TOBN(0x9c092172, 0x184e5d3f),
+ TOBN(0xdd7ced5b, 0xc00cc638), TOBN(0x1a2015eb, 0x61278fc2),
+ TOBN(0x2e8e5288, 0x6a37f8d6), TOBN(0xc457786f, 0xe79933ad),
+ TOBN(0xb3fe4cce, 0x2c51211a), TOBN(0xad9b10b2, 0x24c20498),
+ TOBN(0x90d87a4f, 0xd28db5e5), TOBN(0x698cd105, 0x3aca2fc3),
+ TOBN(0x4f112d07, 0xe91b536d), TOBN(0xceb982f2, 0x9eba09d6),
+ TOBN(0x3c157b2c, 0x197c396f), TOBN(0xe23c2d41, 0x7b66eb24),
+ TOBN(0x480c57d9, 0x3f330d37), TOBN(0xb3a4c8a1, 0x79108deb),
+ TOBN(0x702388de, 0xcb199ce5), TOBN(0x0b019211, 0xb944a8d4),
+ TOBN(0x24f2a692, 0x840bb336), TOBN(0x7c353bdc, 0xa669fa7b),
+ TOBN(0xda20d6fc, 0xdec9c300), TOBN(0x625fbe2f, 0xa13a4f17),
+ TOBN(0xa2b1b61a, 0xdbc17328), TOBN(0x008965bf, 0xa9515621),
+ TOBN(0x49690939, 0xc620ff46), TOBN(0x182dd27d, 0x8717e91c),
+ TOBN(0x5ace5035, 0xea6c3997), TOBN(0x54259aaa, 0xc2610bef),
+ TOBN(0xef18bb3f, 0x3c80dd39), TOBN(0x6910b95b, 0x5fc3fa39),
+ TOBN(0xfce2f510, 0x43e09aee), TOBN(0xced56c9f, 0xa7675665),
+ TOBN(0x10e265ac, 0xd872db61), TOBN(0x6982812e, 0xae9fce69),
+ TOBN(0x29be11c6, 0xce800998), TOBN(0x72bb1752, 0xb90360d9),
+ TOBN(0x2c193197, 0x5a4ad590), TOBN(0x2ba2f548, 0x9fc1dbc0),
+ TOBN(0x7fe4eebb, 0xe490ebe0), TOBN(0x12a0a4cd, 0x7fae11c0),
+ TOBN(0x7197cf81, 0xe903ba37), TOBN(0xcf7d4aa8, 0xde1c6dd8),
+ TOBN(0x92af6bf4, 0x3fd5684c), TOBN(0x2b26eecf, 0x80360aa1),
+ TOBN(0xbd960f30, 0x00546a82), TOBN(0x407b3c43, 0xf59ad8fe),
+ TOBN(0x86cae5fe, 0x249c82ba), TOBN(0x9e0faec7, 0x2463744c),
+ TOBN(0x87f551e8, 0x94916272), TOBN(0x033f9344, 0x6ceb0615),
+ TOBN(0x1e5eb0d1, 0x8be82e84), TOBN(0x89967f0e, 0x7a582fef),
+ TOBN(0xbcf687d5, 0xa6e921fa), TOBN(0xdfee4cf3, 0xd37a09ba),
+ TOBN(0x94f06965, 0xb493c465), TOBN(0x638b9a1c, 0x7635c030),
+ TOBN(0x76667864, 0x66f05e9f), TOBN(0xccaf6808, 0xc04da725),
+ TOBN(0xca2eb690, 0x768fccfc), TOBN(0xf402d37d, 0xb835b362),
+ TOBN(0x0efac0d0, 0xe2fdfcce), TOBN(0xefc9cdef, 0xb638d990),
+ TOBN(0x2af12b72, 0xd1669a8b), TOBN(0x33c536bc, 0x5774ccbd),
+ TOBN(0x30b21909, 0xfb34870e), TOBN(0xc38fa2f7, 0x7df25aca),
+ TOBN(0x74c5f02b, 0xbf81f3f5), TOBN(0x0525a5ae, 0xaf7e4581),
+ TOBN(0x88d2aaba, 0x433c54ae), TOBN(0xed9775db, 0x806a56c5),
+ TOBN(0xd320738a, 0xc0edb37d), TOBN(0x25fdb6ee, 0x66cc1f51),
+ TOBN(0xac661d17, 0x10600d76), TOBN(0x931ec1f3, 0xbdd1ed76),
+ TOBN(0x65c11d62, 0x19ee43f1), TOBN(0x5cd57c3e, 0x60829d97),
+ TOBN(0xd26c91a3, 0x984be6e8), TOBN(0xf08d9309, 0x8b0c53bd),
+ TOBN(0x94bc9e5b, 0xc016e4ea), TOBN(0xd3916839, 0x11d43d2b),
+ TOBN(0x886c5ad7, 0x73701155), TOBN(0xe0377626, 0x20b00715),
+ TOBN(0x7f01c9ec, 0xaa80ba59), TOBN(0x3083411a, 0x68538e51),
+ TOBN(0x970370f1, 0xe88128af), TOBN(0x625cc3db, 0x91dec14b),
+ TOBN(0xfef9666c, 0x01ac3107), TOBN(0xb2a8d577, 0xd5057ac3),
+ TOBN(0xb0f26299, 0x92be5df7), TOBN(0xf579c8e5, 0x00353924),
+ TOBN(0xb8fa3d93, 0x1341ed7a), TOBN(0x4223272c, 0xa7b59d49),
+ TOBN(0x3dcb1947, 0x83b8c4a4), TOBN(0x4e413c01, 0xed1302e4),
+ TOBN(0x6d999127, 0xe17e44ce), TOBN(0xee86bf75, 0x33b3adfb),
+ TOBN(0xf6902fe6, 0x25aa96ca), TOBN(0xb73540e4, 0xe5aae47d),
+ TOBN(0x32801d7b, 0x1b4a158c), TOBN(0xe571c99e, 0x27e2a369),
+ TOBN(0x40cb76c0, 0x10d9f197), TOBN(0xc308c289, 0x3167c0ae),
+ TOBN(0xa6ef9dd3, 0xeb7958f2), TOBN(0xa7226dfc, 0x300879b1),
+ TOBN(0x6cd0b362, 0x7edf0636), TOBN(0x4efbce6c, 0x7bc37eed),
+ TOBN(0x75f92a05, 0x8d699021), TOBN(0x586d4c79, 0x772566e3),
+ TOBN(0x378ca5f1, 0x761ad23a), TOBN(0x650d86fc, 0x1465a8ac),
+ TOBN(0x7a4ed457, 0x842ba251), TOBN(0x6b65e3e6, 0x42234933),
+ TOBN(0xaf1543b7, 0x31aad657), TOBN(0xa4cefe98, 0xcbfec369),
+ TOBN(0xb587da90, 0x9f47befb), TOBN(0x6562e9fb, 0x41312d13),
+ TOBN(0xa691ea59, 0xeff1cefe), TOBN(0xcc30477a, 0x05fc4cf6),
+ TOBN(0xa1632461, 0x0b0ffd3d), TOBN(0xa1f16f3b, 0x5b355956),
+ TOBN(0x5b148d53, 0x4224ec24), TOBN(0xdc834e7b, 0xf977012a),
+ TOBN(0x7bfc5e75, 0xb2c69dbc), TOBN(0x3aa77a29, 0x03c3da6c),
+ TOBN(0xde0df03c, 0xca910271), TOBN(0xcbd5ca4a, 0x7806dc55),
+ TOBN(0xe1ca5807, 0x6db476cb), TOBN(0xfde15d62, 0x5f37a31e),
+ TOBN(0xf49af520, 0xf41af416), TOBN(0x96c5c5b1, 0x7d342db5),
+ TOBN(0x155c43b7, 0xeb4ceb9b), TOBN(0x2e993010, 0x4e77371a),
+ TOBN(0x1d2987da, 0x675d43af), TOBN(0xef2bc1c0, 0x8599fd72),
+ TOBN(0x96894b7b, 0x9342f6b2), TOBN(0x201eadf2, 0x7c8e71f0),
+ TOBN(0xf3479d9f, 0x4a1f3efc), TOBN(0xe0f8a742, 0x702a9704),
+ TOBN(0xeafd44b6, 0xb3eba40c), TOBN(0xf9739f29, 0xc1c1e0d0),
+ TOBN(0x0091471a, 0x619d505e), TOBN(0xc15f9c96, 0x9d7c263e),
+ TOBN(0x5be47285, 0x83afbe33), TOBN(0xa3b6d6af, 0x04f1e092),
+ TOBN(0xe76526b9, 0x751a9d11), TOBN(0x2ec5b26d, 0x9a4ae4d2),
+ TOBN(0xeb66f4d9, 0x02f6fb8d), TOBN(0x4063c561, 0x96912164),
+ TOBN(0xeb7050c1, 0x80ef3000), TOBN(0x288d1c33, 0xeaa5b3f0),
+ TOBN(0xe87c68d6, 0x07806fd8), TOBN(0xb2f7f9d5, 0x4bbbf50f),
+ TOBN(0x25972f3a, 0xac8d6627), TOBN(0xf8547774, 0x10e8c13b),
+ TOBN(0xcc50ef6c, 0x872b4a60), TOBN(0xab2a34a4, 0x4613521b),
+ TOBN(0x39c5c190, 0x983e15d1), TOBN(0x61dde5df, 0x59905512),
+ TOBN(0xe417f621, 0x9f2275f3), TOBN(0x0750c8b6, 0x451d894b),
+ TOBN(0x75b04ab9, 0x78b0bdaa), TOBN(0x3bfd9fd4, 0x458589bd),
+ TOBN(0xf1013e30, 0xee9120b6), TOBN(0x2b51af93, 0x23a4743e),
+ TOBN(0xea96ffae, 0x48d14d9e), TOBN(0x71dc0dbe, 0x698a1d32),
+ TOBN(0x914962d2, 0x0180cca4), TOBN(0x1ae60677, 0xc3568963),
+ TOBN(0x8cf227b1, 0x437bc444), TOBN(0xc650c83b, 0xc9962c7a),
+ TOBN(0x23c2c7dd, 0xfe7ccfc4), TOBN(0xf925c89d, 0x1b929d48),
+ TOBN(0x4460f74b, 0x06783c33), TOBN(0xac2c8d49, 0xa590475a),
+ TOBN(0xfb40b407, 0xb807bba0), TOBN(0x9d1e362d, 0x69ff8f3a),
+ TOBN(0xa33e9681, 0xcbef64a4), TOBN(0x67ece5fa, 0x332fb4b2),
+ TOBN(0x6900a99b, 0x739f10e3), TOBN(0xc3341ca9, 0xff525925),
+ TOBN(0xee18a626, 0xa9e2d041), TOBN(0xa5a83685, 0x29580ddd),
+ TOBN(0xf3470c81, 0x9d7de3cd), TOBN(0xedf02586, 0x2062cf9c),
+ TOBN(0xf43522fa, 0xc010edb0), TOBN(0x30314135, 0x13a4b1ae),
+ TOBN(0xc792e02a, 0xdb22b94b), TOBN(0x993d8ae9, 0xa1eaa45b),
+ TOBN(0x8aad6cd3, 0xcd1e1c63), TOBN(0x89529ca7, 0xc5ce688a),
+ TOBN(0x2ccee3aa, 0xe572a253), TOBN(0xe02b6438, 0x02a21efb),
+ TOBN(0xa7091b6e, 0xc9430358), TOBN(0x06d1b1fa, 0x9d7db504),
+ TOBN(0x58846d32, 0xc4744733), TOBN(0x40517c71, 0x379f9e34),
+ TOBN(0x2f65655f, 0x130ef6ca), TOBN(0x526e4488, 0xf1f3503f),
+ TOBN(0x8467bd17, 0x7ee4a976), TOBN(0x1d9dc913, 0x921363d1),
+ TOBN(0xd8d24c33, 0xb069e041), TOBN(0x5eb5da0a, 0x2cdf7f51),
+ TOBN(0x1c0f3cb1, 0x197b994f), TOBN(0x3c95a6c5, 0x2843eae9),
+ TOBN(0x7766ffc9, 0xa6097ea5), TOBN(0x7bea4093, 0xd723b867),
+ TOBN(0xb48e1f73, 0x4db378f9), TOBN(0x70025b00, 0xe37b77ac),
+ TOBN(0x943dc8e7, 0xaf24ad46), TOBN(0xb98a15ac, 0x16d00a85),
+ TOBN(0x3adc38ba, 0x2743b004), TOBN(0xb1c7f4f7, 0x334415ee),
+ TOBN(0xea43df8f, 0x1e62d05a), TOBN(0x32618905, 0x9d76a3b6),
+ TOBN(0x2fbd0bb5, 0xa23a0f46), TOBN(0x5bc971db, 0x6a01918c),
+ TOBN(0x7801d94a, 0xb4743f94), TOBN(0xb94df65e, 0x676ae22b),
+ TOBN(0xaafcbfab, 0xaf95894c), TOBN(0x7b9bdc07, 0x276b2241),
+ TOBN(0xeaf98362, 0x5bdda48b), TOBN(0x5977faf2, 0xa3fcb4df),
+ TOBN(0xbed042ef, 0x052c4b5b), TOBN(0x9fe87f71, 0x067591f0),
+ TOBN(0xc89c73ca, 0x22f24ec7), TOBN(0x7d37fa9e, 0xe64a9f1b),
+ TOBN(0x2710841a, 0x15562627), TOBN(0x2c01a613, 0xc243b034),
+ TOBN(0x1d135c56, 0x2bc68609), TOBN(0xc2ca1715, 0x8b03f1f6),
+ TOBN(0xc9966c2d, 0x3eb81d82), TOBN(0xc02abf4a, 0x8f6df13e),
+ TOBN(0x77b34bd7, 0x8f72b43b), TOBN(0xaff6218f, 0x360c82b0),
+ TOBN(0x0aa5726c, 0x8d55b9d2), TOBN(0xdc0adbe9, 0x99e9bffb),
+ TOBN(0x9097549c, 0xefb9e72a), TOBN(0x16755712, 0x9dfb3111),
+ TOBN(0xdd8bf984, 0xf26847f9), TOBN(0xbcb8e387, 0xdfb30cb7),
+ TOBN(0xc1fd32a7, 0x5171ef9c), TOBN(0x977f3fc7, 0x389b363f),
+ TOBN(0x116eaf2b, 0xf4babda0), TOBN(0xfeab68bd, 0xf7113c8e),
+ TOBN(0xd1e3f064, 0xb7def526), TOBN(0x1ac30885, 0xe0b3fa02),
+ TOBN(0x1c5a6e7b, 0x40142d9d), TOBN(0x839b5603, 0x30921c0b),
+ TOBN(0x48f301fa, 0x36a116a3), TOBN(0x380e1107, 0xcfd9ee6d),
+ TOBN(0x7945ead8, 0x58854be1), TOBN(0x4111c12e, 0xcbd4d49d),
+ TOBN(0xece3b1ec, 0x3a29c2ef), TOBN(0x6356d404, 0x8d3616f5),
+ TOBN(0x9f0d6a8f, 0x594d320e), TOBN(0x0989316d, 0xf651ccd2),
+ TOBN(0x6c32117a, 0x0f8fdde4), TOBN(0x9abe5cc5, 0xa26a9bbc),
+ TOBN(0xcff560fb, 0x9723f671), TOBN(0x21b2a12d, 0x7f3d593c),
+ TOBN(0xe4cb18da, 0x24ba0696), TOBN(0x186e2220, 0xc3543384),
+ TOBN(0x722f64e0, 0x88312c29), TOBN(0x94282a99, 0x17dc7752),
+ TOBN(0x62467bbf, 0x5a85ee89), TOBN(0xf435c650, 0xf10076a0),
+ TOBN(0xc9ff1539, 0x43b3a50b), TOBN(0x7132130c, 0x1a53efbc),
+ TOBN(0x31bfe063, 0xf7b0c5b7), TOBN(0xb0179a7d, 0x4ea994cc),
+ TOBN(0x12d064b3, 0xc85f455b), TOBN(0x47259328, 0x8f6e0062),
+ TOBN(0xf64e590b, 0xb875d6d9), TOBN(0x22dd6225, 0xad92bcc7),
+ TOBN(0xb658038e, 0xb9c3bd6d), TOBN(0x00cdb0d6, 0xfbba27c8),
+ TOBN(0x0c681337, 0x1062c45d), TOBN(0xd8515b8c, 0x2d33407d),
+ TOBN(0xcb8f699e, 0x8cbb5ecf), TOBN(0x8c4347f8, 0xc608d7d8),
+ TOBN(0x2c11850a, 0xbb3e00db), TOBN(0x20a8dafd, 0xecb49d19),
+ TOBN(0xbd781480, 0x45ee2f40), TOBN(0x75e354af, 0x416b60cf),
+ TOBN(0xde0b58a1, 0x8d49a8c4), TOBN(0xe40e94e2, 0xfa359536),
+ TOBN(0xbd4fa59f, 0x62accd76), TOBN(0x05cf466a, 0x8c762837),
+ TOBN(0xb5abda99, 0x448c277b), TOBN(0x5a9e01bf, 0x48b13740),
+ TOBN(0x9d457798, 0x326aad8d), TOBN(0xbdef4954, 0xc396f7e7),
+ TOBN(0x6fb274a2, 0xc253e292), TOBN(0x2800bf0a, 0x1cfe53e7),
+ TOBN(0x22426d31, 0x44438fd4), TOBN(0xef233923, 0x5e259f9a),
+ TOBN(0x4188503c, 0x03f66264), TOBN(0x9e5e7f13, 0x7f9fdfab),
+ TOBN(0x565eb76c, 0x5fcc1aba), TOBN(0xea632548, 0x59b5bff8),
+ TOBN(0x5587c087, 0xaab6d3fa), TOBN(0x92b639ea, 0x6ce39c1b),
+ TOBN(0x0706e782, 0x953b135c), TOBN(0x7308912e, 0x425268ef),
+ TOBN(0x599e92c7, 0x090e7469), TOBN(0x83b90f52, 0x9bc35e75),
+ TOBN(0x4750b3d0, 0x244975b3), TOBN(0xf3a44358, 0x11965d72),
+ TOBN(0x179c6774, 0x9c8dc751), TOBN(0xff18cdfe, 0xd23d9ff0),
+ TOBN(0xc4013833, 0x2028e247), TOBN(0x96e280e2, 0xf3bfbc79),
+ TOBN(0xf60417bd, 0xd0880a84), TOBN(0x263c9f3d, 0x2a568151),
+ TOBN(0x36be15b3, 0x2d2ce811), TOBN(0x846dc0c2, 0xf8291d21),
+ TOBN(0x5cfa0ecb, 0x789fcfdb), TOBN(0x45a0beed, 0xd7535b9a),
+ TOBN(0xec8e9f07, 0x96d69af1), TOBN(0x31a7c5b8, 0x599ab6dc),
+ TOBN(0xd36d45ef, 0xf9e2e09f), TOBN(0x3cf49ef1, 0xdcee954b),
+ TOBN(0x6be34cf3, 0x086cff9b), TOBN(0x88dbd491, 0x39a3360f),
+ TOBN(0x1e96b8cc, 0x0dbfbd1d), TOBN(0xc1e5f7bf, 0xcb7e2552),
+ TOBN(0x0547b214, 0x28819d98), TOBN(0xc770dd9c, 0x7aea9dcb),
+ TOBN(0xaef0d4c7, 0x041d68c8), TOBN(0xcc2b9818, 0x13cb9ba8),
+ TOBN(0x7fc7bc76, 0xfe86c607), TOBN(0x6b7b9337, 0x502a9a95),
+ TOBN(0x1948dc27, 0xd14dab63), TOBN(0x249dd198, 0xdae047be),
+ TOBN(0xe8356584, 0xa981a202), TOBN(0x3531dd18, 0x3a893387),
+ TOBN(0x1be11f90, 0xc85c7209), TOBN(0x93d2fe1e, 0xe2a52b5a),
+ TOBN(0x8225bfe2, 0xec6d6b97), TOBN(0x9cf6d6f4, 0xbd0aa5de),
+ TOBN(0x911459cb, 0x54779f5f), TOBN(0x5649cddb, 0x86aeb1f3),
+ TOBN(0x32133579, 0x3f26ce5a), TOBN(0xc289a102, 0x550f431e),
+ TOBN(0x559dcfda, 0x73b84c6f), TOBN(0x84973819, 0xee3ac4d7),
+ TOBN(0xb51e55e6, 0xf2606a82), TOBN(0xe25f7061, 0x90f2fb57),
+ TOBN(0xacef6c2a, 0xb1a4e37c), TOBN(0x864e359d, 0x5dcf2706),
+ TOBN(0x479e6b18, 0x7ce57316), TOBN(0x2cab2500, 0x3a96b23d),
+ TOBN(0xed489862, 0x8ef16df7), TOBN(0x2056538c, 0xef3758b5),
+ TOBN(0xa7df865e, 0xf15d3101), TOBN(0x80c5533a, 0x61b553d7),
+ TOBN(0x366e1997, 0x4ed14294), TOBN(0x6620741f, 0xb3c0bcd6),
+ TOBN(0x21d1d9c4, 0xedc45418), TOBN(0x005b859e, 0xc1cc4a9d),
+ TOBN(0xdf01f630, 0xa1c462f0), TOBN(0x15d06cf3, 0xf26820c7),
+ TOBN(0x9f7f24ee, 0x3484be47), TOBN(0x2ff33e96, 0x4a0c902f),
+ TOBN(0x00bdf457, 0x5a0bc453), TOBN(0x2378dfaf, 0x1aa238db),
+ TOBN(0x272420ec, 0x856720f2), TOBN(0x2ad9d95b, 0x96797291),
+ TOBN(0xd1242cc6, 0x768a1558), TOBN(0x2e287f8b, 0x5cc86aa8),
+ TOBN(0x796873d0, 0x990cecaa), TOBN(0xade55f81, 0x675d4080),
+ TOBN(0x2645eea3, 0x21f0cd84), TOBN(0x7a1efa0f, 0xb4e17d02),
+ TOBN(0xf6858420, 0x037cc061), TOBN(0x682e05f0, 0xd5d43e12),
+ TOBN(0x59c36994, 0x27218710), TOBN(0x85cbba4d, 0x3f7cd2fc),
+ TOBN(0x726f9729, 0x7a3cd22a), TOBN(0x9f8cd5dc, 0x4a628397),
+ TOBN(0x17b93ab9, 0xc23165ed), TOBN(0xff5f5dbf, 0x122823d4),
+ TOBN(0xc1e4e4b5, 0x654a446d), TOBN(0xd1a9496f, 0x677257ba),
+ TOBN(0x6387ba94, 0xde766a56), TOBN(0x23608bc8, 0x521ec74a),
+ TOBN(0x16a522d7, 0x6688c4d4), TOBN(0x9d6b4282, 0x07373abd),
+ TOBN(0xa62f07ac, 0xb42efaa3), TOBN(0xf73e00f7, 0xe3b90180),
+ TOBN(0x36175fec, 0x49421c3e), TOBN(0xc4e44f9b, 0x3dcf2678),
+ TOBN(0x76df436b, 0x7220f09f), TOBN(0x172755fb, 0x3aa8b6cf),
+ TOBN(0xbab89d57, 0x446139cc), TOBN(0x0a0a6e02, 0x5fe0208f),
+ TOBN(0xcdbb63e2, 0x11e5d399), TOBN(0x33ecaa12, 0xa8977f0b),
+ TOBN(0x59598b21, 0xf7c42664), TOBN(0xb3e91b32, 0xab65d08a),
+ TOBN(0x035822ee, 0xf4502526), TOBN(0x1dcf0176, 0x720a82a9),
+ TOBN(0x50f8598f, 0x3d589e02), TOBN(0xdf0478ff, 0xb1d63d2c),
+ TOBN(0x8b8068bd, 0x1571cd07), TOBN(0x30c3aa4f, 0xd79670cd),
+ TOBN(0x25e8fd4b, 0x941ade7f), TOBN(0x3d1debdc, 0x32790011),
+ TOBN(0x65b6dcbd, 0x3a3f9ff0), TOBN(0x282736a4, 0x793de69c),
+ TOBN(0xef69a0c3, 0xd41d3bd3), TOBN(0xb533b8c9, 0x07a26bde),
+ TOBN(0xe2801d97, 0xdb2edf9f), TOBN(0xdc4a8269, 0xe1877af0),
+ TOBN(0x6c1c5851, 0x3d590dbe), TOBN(0x84632f6b, 0xee4e9357),
+ TOBN(0xd36d36b7, 0x79b33374), TOBN(0xb46833e3, 0x9bbca2e6),
+ TOBN(0x37893913, 0xf7fc0586), TOBN(0x385315f7, 0x66bf4719),
+ TOBN(0x72c56293, 0xb31855dc), TOBN(0xd1416d4e, 0x849061fe),
+ TOBN(0xbeb3ab78, 0x51047213), TOBN(0x447f6e61, 0xf040c996),
+ TOBN(0xd06d310d, 0x638b1d0c), TOBN(0xe28a413f, 0xbad1522e),
+ TOBN(0x685a76cb, 0x82003f86), TOBN(0x610d07f7, 0x0bcdbca3),
+ TOBN(0x6ff66021, 0x9ca4c455), TOBN(0x7df39b87, 0xcea10eec),
+ TOBN(0xb9255f96, 0xe22db218), TOBN(0x8cc6d9eb, 0x08a34c44),
+ TOBN(0xcd4ffb86, 0x859f9276), TOBN(0x8fa15eb2, 0x50d07335),
+ TOBN(0xdf553845, 0xcf2c24b5), TOBN(0x89f66a9f, 0x52f9c3ba),
+ TOBN(0x8f22b5b9, 0xe4a7ceb3), TOBN(0xaffef809, 0x0e134686),
+ TOBN(0x3e53e1c6, 0x8eb8fac2), TOBN(0x93c1e4eb, 0x28aec98e),
+ TOBN(0xb6b91ec5, 0x32a43bcb), TOBN(0x2dbfa947, 0xb2d74a51),
+ TOBN(0xe065d190, 0xca84bad7), TOBN(0xfb13919f, 0xad58e65c),
+ TOBN(0x3c41718b, 0xf1cb6e31), TOBN(0x688969f0, 0x06d05c3f),
+ TOBN(0xd4f94ce7, 0x21264d45), TOBN(0xfdfb65e9, 0x7367532b),
+ TOBN(0x5b1be8b1, 0x0945a39d), TOBN(0x229f789c, 0x2b8baf3b),
+ TOBN(0xd8f41f3e, 0x6f49f15d), TOBN(0x678ce828, 0x907f0792),
+ TOBN(0xc69ace82, 0xfca6e867), TOBN(0x106451ae, 0xd01dcc89),
+ TOBN(0x1bb4f7f0, 0x19fc32d2), TOBN(0x64633dfc, 0xb00c52d2),
+ TOBN(0x8f13549a, 0xad9ea445), TOBN(0x99a3bf50, 0xfb323705),
+ TOBN(0x0c9625a2, 0x534d4dbc), TOBN(0x45b8f1d1, 0xc2a2fea3),
+ TOBN(0x76ec21a1, 0xa530fc1a), TOBN(0x4bac9c2a, 0x9e5bd734),
+ TOBN(0x5996d76a, 0x7b4e3587), TOBN(0x0045cdee, 0x1182d9e3),
+ TOBN(0x1aee24b9, 0x1207f13d), TOBN(0x66452e97, 0x97345a41),
+ TOBN(0x16e5b054, 0x9f950cd0), TOBN(0x9cc72fb1, 0xd7fdd075),
+ TOBN(0x6edd61e7, 0x66249663), TOBN(0xde4caa4d, 0xf043cccb),
+ TOBN(0x11b1f57a, 0x55c7ac17), TOBN(0x779cbd44, 0x1a85e24d),
+ TOBN(0x78030f86, 0xe46081e7), TOBN(0xfd4a6032, 0x8e20f643),
+ TOBN(0xcc7a6488, 0x0a750c0f), TOBN(0x39bacfe3, 0x4e548e83),
+ TOBN(0x3d418c76, 0x0c110f05), TOBN(0x3e4daa4c, 0xb1f11588),
+ TOBN(0x2733e7b5, 0x5ffc69ff), TOBN(0x46f147bc, 0x92053127),
+ TOBN(0x885b2434, 0xd722df94), TOBN(0x6a444f65, 0xe6fc6b7c) },
+ { TOBN(0x7a1a465a, 0xc3f16ea8), TOBN(0x115a461d, 0xb2f1d11c),
+ TOBN(0x4767dd95, 0x6c68a172), TOBN(0x3392f2eb, 0xd13a4698),
+ TOBN(0xc7a99ccd, 0xe526cdc7), TOBN(0x8e537fdc, 0x22292b81),
+ TOBN(0x76d8cf69, 0xa6d39198), TOBN(0xffc5ff43, 0x2446852d),
+ TOBN(0x97b14f7e, 0xa90567e6), TOBN(0x513257b7, 0xb6ae5cb7),
+ TOBN(0x85454a3c, 0x9f10903d), TOBN(0xd8d2c9ad, 0x69bc3724),
+ TOBN(0x38da9324, 0x6b29cb44), TOBN(0xb540a21d, 0x77c8cbac),
+ TOBN(0x9bbfe435, 0x01918e42), TOBN(0xfffa707a, 0x56c3614e),
+ TOBN(0x0ce4e3f1, 0xd4e353b7), TOBN(0x062d8a14, 0xef46b0a0),
+ TOBN(0x6408d5ab, 0x574b73fd), TOBN(0xbc41d1c9, 0xd3273ffd),
+ TOBN(0x3538e1e7, 0x6be77800), TOBN(0x71fe8b37, 0xc5655031),
+ TOBN(0x1cd91621, 0x6b9b331a), TOBN(0xad825d0b, 0xbb388f73),
+ TOBN(0x56c2e05b, 0x1cb76219), TOBN(0x0ec0bf91, 0x71567e7e),
+ TOBN(0xe7076f86, 0x61c4c910), TOBN(0xd67b085b, 0xbabc04d9),
+ TOBN(0x9fb90459, 0x5e93a96a), TOBN(0x7526c1ea, 0xfbdc249a),
+ TOBN(0x0d44d367, 0xecdd0bb7), TOBN(0x95399917, 0x9dc0d695),
+ TOBN(0x61360ee9, 0x9e240d18), TOBN(0x057cdcac, 0xb4b94466),
+ TOBN(0xe7667cd1, 0x2fe5325c), TOBN(0x1fa297b5, 0x21974e3b),
+ TOBN(0xfa4081e7, 0xdb083d76), TOBN(0x31993be6, 0xf206bd15),
+ TOBN(0x8949269b, 0x14c19f8c), TOBN(0x21468d72, 0xa9d92357),
+ TOBN(0x2ccbc583, 0xa4c506ec), TOBN(0x957ed188, 0xd1acfe97),
+ TOBN(0x8baed833, 0x12f1aea2), TOBN(0xef2a6cb4, 0x8325362d),
+ TOBN(0x130dde42, 0x8e195c43), TOBN(0xc842025a, 0x0e6050c6),
+ TOBN(0x2da972a7, 0x08686a5d), TOBN(0xb52999a1, 0xe508b4a8),
+ TOBN(0xd9f090b9, 0x10a5a8bd), TOBN(0xca91d249, 0x096864da),
+ TOBN(0x8e6a93be, 0x3f67dbc1), TOBN(0xacae6fba, 0xf5f4764c),
+ TOBN(0x1563c6e0, 0xd21411a0), TOBN(0x28fa787f, 0xda0a4ad8),
+ TOBN(0xd524491c, 0x908c8030), TOBN(0x1257ba0e, 0x4c795f07),
+ TOBN(0x83f49167, 0xceca9754), TOBN(0x426d2cf6, 0x4b7939a0),
+ TOBN(0x2555e355, 0x723fd0bf), TOBN(0xa96e6d06, 0xc4f144e2),
+ TOBN(0x4768a8dd, 0x87880e61), TOBN(0x15543815, 0xe508e4d5),
+ TOBN(0x09d7e772, 0xb1b65e15), TOBN(0x63439dd6, 0xac302fa0),
+ TOBN(0xb93f802f, 0xc14e35c2), TOBN(0x71735b7c, 0x4341333c),
+ TOBN(0x03a25104, 0x16d4f362), TOBN(0x3f4d069b, 0xbf433c8e),
+ TOBN(0x0d83ae01, 0xf78f5a7c), TOBN(0x50a8ffbe, 0x7c4eed07),
+ TOBN(0xc74f8906, 0x76e10f83), TOBN(0x7d080966, 0x9ddaf8e1),
+ TOBN(0xb11df8e1, 0x698e04cc), TOBN(0x877be203, 0x169005c8),
+ TOBN(0x32749e8c, 0x4f3c6179), TOBN(0x2dbc9d0a, 0x7853fc05),
+ TOBN(0x187d4f93, 0x9454d937), TOBN(0xe682ce9d, 0xb4800e1b),
+ TOBN(0xa9129ad8, 0x165e68e8), TOBN(0x0fe29735, 0xbe7f785b),
+ TOBN(0x5303f40c, 0x5b9e02b7), TOBN(0xa37c9692, 0x35ee04e8),
+ TOBN(0x5f46cc20, 0x34d6632b), TOBN(0x55ef72b2, 0x96ac545b),
+ TOBN(0xabec5c1f, 0x7b91b062), TOBN(0x0a79e1c7, 0xbb33e821),
+ TOBN(0xbb04b428, 0x3a9f4117), TOBN(0x0de1f28f, 0xfd2a475a),
+ TOBN(0x31019ccf, 0x3a4434b4), TOBN(0xa3458111, 0x1a7954dc),
+ TOBN(0xa9dac80d, 0xe34972a7), TOBN(0xb043d054, 0x74f6b8dd),
+ TOBN(0x021c319e, 0x11137b1a), TOBN(0x00a754ce, 0xed5cc03f),
+ TOBN(0x0aa2c794, 0xcbea5ad4), TOBN(0x093e67f4, 0x70c015b6),
+ TOBN(0x72cdfee9, 0xc97e3f6b), TOBN(0xc10bcab4, 0xb6da7461),
+ TOBN(0x3b02d2fc, 0xb59806b9), TOBN(0x85185e89, 0xa1de6f47),
+ TOBN(0x39e6931f, 0x0eb6c4d4), TOBN(0x4d4440bd, 0xd4fa5b04),
+ TOBN(0x5418786e, 0x34be7eb8), TOBN(0x6380e521, 0x9d7259bc),
+ TOBN(0x20ac0351, 0xd598d710), TOBN(0x272c4166, 0xcb3a4da4),
+ TOBN(0xdb82fe1a, 0xca71de1f), TOBN(0x746e79f2, 0xd8f54b0f),
+ TOBN(0x6e7fc736, 0x4b573e9b), TOBN(0x75d03f46, 0xfd4b5040),
+ TOBN(0x5c1cc36d, 0x0b98d87b), TOBN(0x513ba3f1, 0x1f472da1),
+ TOBN(0x79d0af26, 0xabb177dd), TOBN(0xf82ab568, 0x7891d564),
+ TOBN(0x2b6768a9, 0x72232173), TOBN(0xefbb3bb0, 0x8c1f6619),
+ TOBN(0xb29c11db, 0xa6d18358), TOBN(0x519e2797, 0xb0916d3a),
+ TOBN(0xd4dc18f0, 0x9188e290), TOBN(0x648e86e3, 0x98b0ca7f),
+ TOBN(0x859d3145, 0x983c38b5), TOBN(0xb14f176c, 0x637abc8b),
+ TOBN(0x2793fb9d, 0xcaff7be6), TOBN(0xebe5a55f, 0x35a66a5a),
+ TOBN(0x7cec1dcd, 0x9f87dc59), TOBN(0x7c595cd3, 0xfbdbf560),
+ TOBN(0x5b543b22, 0x26eb3257), TOBN(0x69080646, 0xc4c935fd),
+ TOBN(0x7f2e4403, 0x81e9ede3), TOBN(0x243c3894, 0xcaf6df0a),
+ TOBN(0x7c605bb1, 0x1c073b11), TOBN(0xcd06a541, 0xba6a4a62),
+ TOBN(0x29168949, 0x49d4e2e5), TOBN(0x33649d07, 0x4af66880),
+ TOBN(0xbfc0c885, 0xe9a85035), TOBN(0xb4e52113, 0xfc410f4b),
+ TOBN(0xdca3b706, 0x78a6513b), TOBN(0x92ea4a2a, 0x9edb1943),
+ TOBN(0x02642216, 0xdb6e2dd8), TOBN(0x9b45d0b4, 0x9fd57894),
+ TOBN(0x114e70db, 0xc69d11ae), TOBN(0x1477dd19, 0x4c57595f),
+ TOBN(0xbc2208b4, 0xec77c272), TOBN(0x95c5b4d7, 0xdb68f59c),
+ TOBN(0xb8c4fc63, 0x42e532b7), TOBN(0x386ba422, 0x9ae35290),
+ TOBN(0xfb5dda42, 0xd201ecbc), TOBN(0x2353dc8b, 0xa0e38fd6),
+ TOBN(0x9a0b85ea, 0x68f7e978), TOBN(0x96ec5682, 0x2ad6d11f),
+ TOBN(0x5e279d6c, 0xe5f6886d), TOBN(0xd3fe03cd, 0x3cb1914d),
+ TOBN(0xfe541fa4, 0x7ea67c77), TOBN(0x952bd2af, 0xe3ea810c),
+ TOBN(0x791fef56, 0x8d01d374), TOBN(0xa3a1c621, 0x0f11336e),
+ TOBN(0x5ad0d5a9, 0xc7ec6d79), TOBN(0xff7038af, 0x3225c342),
+ TOBN(0x003c6689, 0xbc69601b), TOBN(0x25059bc7, 0x45e8747d),
+ TOBN(0xfa4965b2, 0xf2086fbf), TOBN(0xf6840ea6, 0x86916078),
+ TOBN(0xd7ac7620, 0x70081d6c), TOBN(0xe600da31, 0xb5328645),
+ TOBN(0x01916f63, 0x529b8a80), TOBN(0xe80e4858, 0x2d7d6f3e),
+ TOBN(0x29eb0fe8, 0xd664ca7c), TOBN(0xf017637b, 0xe7b43b0c),
+ TOBN(0x9a75c806, 0x76cb2566), TOBN(0x8f76acb1, 0xb24892d9),
+ TOBN(0x7ae7b9cc, 0x1f08fe45), TOBN(0x19ef7329, 0x6a4907d8),
+ TOBN(0x2db4ab71, 0x5f228bf0), TOBN(0xf3cdea39, 0x817032d7),
+ TOBN(0x0b1f482e, 0xdcabe3c0), TOBN(0x3baf76b4, 0xbb86325c),
+ TOBN(0xd49065e0, 0x10089465), TOBN(0x3bab5d29, 0x8e77c596),
+ TOBN(0x7636c3a6, 0x193dbd95), TOBN(0xdef5d294, 0xb246e499),
+ TOBN(0xb22c58b9, 0x286b2475), TOBN(0xa0b93939, 0xcd80862b),
+ TOBN(0x3002c83a, 0xf0992388), TOBN(0x6de01f9b, 0xeacbe14c),
+ TOBN(0x6aac688e, 0xadd70482), TOBN(0x708de92a, 0x7b4a4e8a),
+ TOBN(0x75b6dd73, 0x758a6eef), TOBN(0xea4bf352, 0x725b3c43),
+ TOBN(0x10041f2c, 0x87912868), TOBN(0xb1b1be95, 0xef09297a),
+ TOBN(0x19ae23c5, 0xa9f3860a), TOBN(0xc4f0f839, 0x515dcf4b),
+ TOBN(0x3c7ecca3, 0x97f6306a), TOBN(0x744c44ae, 0x68a3a4b0),
+ TOBN(0x69cd13a0, 0xb3a1d8a2), TOBN(0x7cad0a1e, 0x5256b578),
+ TOBN(0xea653fcd, 0x33791d9e), TOBN(0x9cc2a05d, 0x74b2e05f),
+ TOBN(0x73b391dc, 0xfd7affa2), TOBN(0xddb7091e, 0xb6b05442),
+ TOBN(0xc71e27bf, 0x8538a5c6), TOBN(0x195c63dd, 0x89abff17),
+ TOBN(0xfd315285, 0x1b71e3da), TOBN(0x9cbdfda7, 0xfa680fa0),
+ TOBN(0x9db876ca, 0x849d7eab), TOBN(0xebe2764b, 0x3c273271),
+ TOBN(0x663357e3, 0xf208dcea), TOBN(0x8c5bd833, 0x565b1b70),
+ TOBN(0xccc3b4f5, 0x9837fc0d), TOBN(0x9b641ba8, 0xa79cf00f),
+ TOBN(0x7428243d, 0xdfdf3990), TOBN(0x83a594c4, 0x020786b1),
+ TOBN(0xb712451a, 0x526c4502), TOBN(0x9d39438e, 0x6adb3f93),
+ TOBN(0xfdb261e3, 0xe9ff0ccd), TOBN(0x80344e3c, 0xe07af4c3),
+ TOBN(0x75900d7c, 0x2fa4f126), TOBN(0x08a3b865, 0x5c99a232),
+ TOBN(0x2478b6bf, 0xdb25e0c3), TOBN(0x482cc2c2, 0x71db2edf),
+ TOBN(0x37df7e64, 0x5f321bb8), TOBN(0x8a93821b, 0x9a8005b4),
+ TOBN(0x3fa2f10c, 0xcc8c1958), TOBN(0x0d332218, 0x2c269d0a),
+ TOBN(0x20ab8119, 0xe246b0e6), TOBN(0xb39781e4, 0xd349fd17),
+ TOBN(0xd293231e, 0xb31aa100), TOBN(0x4b779c97, 0xbb032168),
+ TOBN(0x4b3f19e1, 0xc8470500), TOBN(0x45b7efe9, 0x0c4c869d),
+ TOBN(0xdb84f38a, 0xa1a6bbcc), TOBN(0x3b59cb15, 0xb2fddbc1),
+ TOBN(0xba5514df, 0x3fd165e8), TOBN(0x499fd6a9, 0x061f8811),
+ TOBN(0x72cd1fe0, 0xbfef9f00), TOBN(0x120a4bb9, 0x79ad7e8a),
+ TOBN(0xf2ffd095, 0x5f4a5ac5), TOBN(0xcfd174f1, 0x95a7a2f0),
+ TOBN(0xd42301ba, 0x9d17baf1), TOBN(0xd2fa487a, 0x77f22089),
+ TOBN(0x9cb09efe, 0xb1dc77e1), TOBN(0xe9566939, 0x21c99682),
+ TOBN(0x8c546901, 0x6c6067bb), TOBN(0xfd378574, 0x61c24456),
+ TOBN(0x2b6a6cbe, 0x81796b33), TOBN(0x62d550f6, 0x58e87f8b),
+ TOBN(0x1b763e1c, 0x7f1b01b4), TOBN(0x4b93cfea, 0x1b1b5e12),
+ TOBN(0xb9345238, 0x1d531696), TOBN(0x57201c00, 0x88cdde69),
+ TOBN(0xdde92251, 0x9a86afc7), TOBN(0xe3043895, 0xbd35cea8),
+ TOBN(0x7608c1e1, 0x8555970d), TOBN(0x8267dfa9, 0x2535935e),
+ TOBN(0xd4c60a57, 0x322ea38b), TOBN(0xe0bf7977, 0x804ef8b5),
+ TOBN(0x1a0dab28, 0xc06fece4), TOBN(0xd405991e, 0x94e7b49d),
+ TOBN(0xc542b6d2, 0x706dab28), TOBN(0xcb228da3, 0xa91618fb),
+ TOBN(0x224e4164, 0x107d1cea), TOBN(0xeb9fdab3, 0xd0f5d8f1),
+ TOBN(0xc02ba386, 0x0d6e41cd), TOBN(0x676a72c5, 0x9b1f7146),
+ TOBN(0xffd6dd98, 0x4d6cb00b), TOBN(0xcef9c5ca, 0xde2e8d7c),
+ TOBN(0xa1bbf5d7, 0x641c7936), TOBN(0x1b95b230, 0xee8f772e),
+ TOBN(0xf765a92e, 0xe8ac25b1), TOBN(0xceb04cfc, 0x3a18b7c6),
+ TOBN(0x27944cef, 0x0acc8966), TOBN(0xcbb3c957, 0x434c1004),
+ TOBN(0x9c9971a1, 0xa43ff93c), TOBN(0x5bc2db17, 0xa1e358a9),
+ TOBN(0x45b4862e, 0xa8d9bc82), TOBN(0x70ebfbfb, 0x2201e052),
+ TOBN(0xafdf64c7, 0x92871591), TOBN(0xea5bcae6, 0xb42d0219),
+ TOBN(0xde536c55, 0x2ad8f03c), TOBN(0xcd6c3f4d, 0xa76aa33c),
+ TOBN(0xbeb5f623, 0x0bca6de3), TOBN(0xdd20dd99, 0xb1e706fd),
+ TOBN(0x90b3ff9d, 0xac9059d4), TOBN(0x2d7b2902, 0x7ccccc4e),
+ TOBN(0x8a090a59, 0xce98840f), TOBN(0xa5d947e0, 0x8410680a),
+ TOBN(0x49ae346a, 0x923379a5), TOBN(0x7dbc84f9, 0xb28a3156),
+ TOBN(0xfd40d916, 0x54a1aff2), TOBN(0xabf318ba, 0x3a78fb9b),
+ TOBN(0x50152ed8, 0x3029f95e), TOBN(0x9fc1dd77, 0xc58ad7fa),
+ TOBN(0x5fa57915, 0x13595c17), TOBN(0xb9504668, 0x8f62b3a9),
+ TOBN(0x907b5b24, 0xff3055b0), TOBN(0x2e995e35, 0x9a84f125),
+ TOBN(0x87dacf69, 0x7e9bbcfb), TOBN(0x95d0c1d6, 0xe86d96e3),
+ TOBN(0x65726e3c, 0x2d95a75c), TOBN(0x2c3c9001, 0xacd27f21),
+ TOBN(0x1deab561, 0x6c973f57), TOBN(0x108b7e2c, 0xa5221643),
+ TOBN(0x5fee9859, 0xc4ef79d4), TOBN(0xbd62b88a, 0x40d4b8c6),
+ TOBN(0xb4dd29c4, 0x197c75d6), TOBN(0x266a6df2, 0xb7076feb),
+ TOBN(0x9512d0ea, 0x4bf2df11), TOBN(0x1320c24f, 0x6b0cc9ec),
+ TOBN(0x6bb1e0e1, 0x01a59596), TOBN(0x8317c5bb, 0xeff9aaac),
+ TOBN(0x65bb405e, 0x385aa6c9), TOBN(0x613439c1, 0x8f07988f),
+ TOBN(0xd730049f, 0x16a66e91), TOBN(0xe97f2820, 0xfa1b0e0d),
+ TOBN(0x4131e003, 0x304c28ea), TOBN(0x820ab732, 0x526bac62),
+ TOBN(0xb2ac9ef9, 0x28714423), TOBN(0x54ecfffa, 0xadb10cb2),
+ TOBN(0x8781476e, 0xf886a4cc), TOBN(0x4b2c87b5, 0xdb2f8d49),
+ TOBN(0xe857cd20, 0x0a44295d), TOBN(0x707d7d21, 0x58c6b044),
+ TOBN(0xae8521f9, 0xf596757c), TOBN(0x87448f03, 0x67b2b714),
+ TOBN(0x13a9bc45, 0x5ebcd58d), TOBN(0x79bcced9, 0x9122d3c1),
+ TOBN(0x3c644247, 0x9e076642), TOBN(0x0cf22778, 0x2df4767d),
+ TOBN(0x5e61aee4, 0x71d444b6), TOBN(0x211236bf, 0xc5084a1d),
+ TOBN(0x7e15bc9a, 0x4fd3eaf6), TOBN(0x68df2c34, 0xab622bf5),
+ TOBN(0x9e674f0f, 0x59bf4f36), TOBN(0xf883669b, 0xd7f34d73),
+ TOBN(0xc48ac1b8, 0x31497b1d), TOBN(0x323b925d, 0x5106703b),
+ TOBN(0x22156f42, 0x74082008), TOBN(0xeffc521a, 0xc8482bcb),
+ TOBN(0x5c6831bf, 0x12173479), TOBN(0xcaa2528f, 0xc4739490),
+ TOBN(0x84d2102a, 0x8f1b3c4d), TOBN(0xcf64dfc1, 0x2d9bec0d),
+ TOBN(0x433febad, 0x78a546ef), TOBN(0x1f621ec3, 0x7b73cef1),
+ TOBN(0x6aecd627, 0x37338615), TOBN(0x162082ab, 0x01d8edf6),
+ TOBN(0x833a8119, 0x19e86b66), TOBN(0x6023a251, 0xd299b5db),
+ TOBN(0xf5bb0c3a, 0xbbf04b89), TOBN(0x6735eb69, 0xae749a44),
+ TOBN(0xd0e058c5, 0x4713de3b), TOBN(0xfdf2593e, 0x2c3d4ccd),
+ TOBN(0x1b8f414e, 0xfdd23667), TOBN(0xdd52aaca, 0xfa2015ee),
+ TOBN(0x3e31b517, 0xbd9625ff), TOBN(0x5ec9322d, 0x8db5918c),
+ TOBN(0xbc73ac85, 0xa96f5294), TOBN(0x82aa5bf3, 0x61a0666a),
+ TOBN(0x49755810, 0xbf08ac42), TOBN(0xd21cdfd5, 0x891cedfc),
+ TOBN(0x918cb57b, 0x67f8be10), TOBN(0x365d1a7c, 0x56ffa726),
+ TOBN(0x2435c504, 0x6532de93), TOBN(0xc0fc5e10, 0x2674cd02),
+ TOBN(0x6e51fcf8, 0x9cbbb142), TOBN(0x1d436e5a, 0xafc50692),
+ TOBN(0x766bffff, 0x3fbcae22), TOBN(0x3148c2fd, 0xfd55d3b8),
+ TOBN(0x52c7fdc9, 0x233222fa), TOBN(0x89ff1092, 0xe419fb6b),
+ TOBN(0x3cd6db99, 0x25254977), TOBN(0x2e85a161, 0x1cf12ca7),
+ TOBN(0xadd2547c, 0xdc810bc9), TOBN(0xea3f458f, 0x9d257c22),
+ TOBN(0x642c1fbe, 0x27d6b19b), TOBN(0xed07e6b5, 0x140481a6),
+ TOBN(0x6ada1d42, 0x86d2e0f8), TOBN(0xe5920122, 0x0e8a9fd5),
+ TOBN(0x02c936af, 0x708c1b49), TOBN(0x60f30fee, 0x2b4bfaff),
+ TOBN(0x6637ad06, 0x858e6a61), TOBN(0xce4c7767, 0x3fd374d0),
+ TOBN(0x39d54b2d, 0x7188defb), TOBN(0xa8c9d250, 0xf56a6b66),
+ TOBN(0x58fc0f5e, 0xb24fe1dc), TOBN(0x9eaf9dee, 0x6b73f24c),
+ TOBN(0xa90d588b, 0x33650705), TOBN(0xde5b62c5, 0xaf2ec729),
+ TOBN(0x5c72cfae, 0xd3c2b36e), TOBN(0x868c19d5, 0x034435da),
+ TOBN(0x88605f93, 0xe17ee145), TOBN(0xaa60c4ee, 0x77a5d5b1),
+ TOBN(0xbcf5bfd2, 0x3b60c472), TOBN(0xaf4ef13c, 0xeb1d3049),
+ TOBN(0x373f44fc, 0xe13895c9), TOBN(0xf29b382f, 0x0cbc9822),
+ TOBN(0x1bfcb853, 0x73efaef6), TOBN(0xcf56ac9c, 0xa8c96f40),
+ TOBN(0xd7adf109, 0x7a191e24), TOBN(0x98035f44, 0xbf8a8dc2),
+ TOBN(0xf40a71b9, 0x1e750c84), TOBN(0xc57f7b0c, 0x5dc6c469),
+ TOBN(0x49a0e79c, 0x6fbc19c1), TOBN(0x6b0f5889, 0xa48ebdb8),
+ TOBN(0x5d3fd084, 0xa07c4e9f), TOBN(0xc3830111, 0xab27de14),
+ TOBN(0x0e4929fe, 0x33e08dcc), TOBN(0xf4a5ad24, 0x40bb73a3),
+ TOBN(0xde86c2bf, 0x490f97ca), TOBN(0x288f09c6, 0x67a1ce18),
+ TOBN(0x364bb886, 0x1844478d), TOBN(0x7840fa42, 0xceedb040),
+ TOBN(0x1269fdd2, 0x5a631b37), TOBN(0x94761f1e, 0xa47c8b7d),
+ TOBN(0xfc0c2e17, 0x481c6266), TOBN(0x85e16ea2, 0x3daa5fa7),
+ TOBN(0xccd86033, 0x92491048), TOBN(0x0c2f6963, 0xf4d402d7),
+ TOBN(0x6336f7df, 0xdf6a865c), TOBN(0x0a2a463c, 0xb5c02a87),
+ TOBN(0xb0e29be7, 0xbf2f12ee), TOBN(0xf0a22002, 0x66bad988),
+ TOBN(0x27f87e03, 0x9123c1d7), TOBN(0x21669c55, 0x328a8c98),
+ TOBN(0x186b9803, 0x92f14529), TOBN(0xd3d056cc, 0x63954df3),
+ TOBN(0x2f03fd58, 0x175a46f6), TOBN(0x63e34ebe, 0x11558558),
+ TOBN(0xe13fedee, 0x5b80cfa5), TOBN(0xe872a120, 0xd401dbd1),
+ TOBN(0x52657616, 0xe8a9d667), TOBN(0xbc8da4b6, 0xe08d6693),
+ TOBN(0x370fb9bb, 0x1b703e75), TOBN(0x6773b186, 0xd4338363),
+ TOBN(0x18dad378, 0xecef7bff), TOBN(0xaac787ed, 0x995677da),
+ TOBN(0x4801ea8b, 0x0437164b), TOBN(0xf430ad20, 0x73fe795e),
+ TOBN(0xb164154d, 0x8ee5eb73), TOBN(0x0884ecd8, 0x108f7c0e),
+ TOBN(0x0e6ec096, 0x5f520698), TOBN(0x640631fe, 0x44f7b8d9),
+ TOBN(0x92fd34fc, 0xa35a68b9), TOBN(0x9c5a4b66, 0x4d40cf4e),
+ TOBN(0x949454bf, 0x80b6783d), TOBN(0x80e701fe, 0x3a320a10),
+ TOBN(0x8d1a564a, 0x1a0a39b2), TOBN(0x1436d53d, 0x320587db),
+ TOBN(0xf5096e6d, 0x6556c362), TOBN(0xbc23a3c0, 0xe2455d7e),
+ TOBN(0x3a7aee54, 0x807230f9), TOBN(0x9ba1cfa6, 0x22ae82fd),
+ TOBN(0x833a057a, 0x99c5d706), TOBN(0x8be85f4b, 0x842315c9),
+ TOBN(0xd083179a, 0x66a72f12), TOBN(0x2fc77d5d, 0xcdcc73cd),
+ TOBN(0x22b88a80, 0x5616ee30), TOBN(0xfb09548f, 0xe7ab1083),
+ TOBN(0x8ad6ab0d, 0x511270cd), TOBN(0x61f6c57a, 0x6924d9ab),
+ TOBN(0xa0f7bf72, 0x90aecb08), TOBN(0x849f87c9, 0x0df784a4),
+ TOBN(0x27c79c15, 0xcfaf1d03), TOBN(0xbbf9f675, 0xc463face),
+ TOBN(0x91502c65, 0x765ba543), TOBN(0x18ce3cac, 0x42ea60dd),
+ TOBN(0xe5cee6ac, 0x6e43ecb3), TOBN(0x63e4e910, 0x68f2aeeb),
+ TOBN(0x26234fa3, 0xc85932ee), TOBN(0x96883e8b, 0x4c90c44d),
+ TOBN(0x29b9e738, 0xa18a50f6), TOBN(0xbfc62b2a, 0x3f0420df),
+ TOBN(0xd22a7d90, 0x6d3e1fa9), TOBN(0x17115618, 0xfe05b8a3),
+ TOBN(0x2a0c9926, 0xbb2b9c01), TOBN(0xc739fcc6, 0xe07e76a2),
+ TOBN(0x540e9157, 0x165e439a), TOBN(0x06353a62, 0x6a9063d8),
+ TOBN(0x84d95594, 0x61e927a3), TOBN(0x013b9b26, 0xe2e0be7f),
+ TOBN(0x4feaec3b, 0x973497f1), TOBN(0x15c0f94e, 0x093ebc2d),
+ TOBN(0x6af5f227, 0x33af0583), TOBN(0x0c2af206, 0xc61f3340),
+ TOBN(0xd25dbdf1, 0x4457397c), TOBN(0x2e8ed017, 0xcabcbae0),
+ TOBN(0xe3010938, 0xc2815306), TOBN(0xbaa99337, 0xe8c6cd68),
+ TOBN(0x08513182, 0x3b0ec7de), TOBN(0x1e1b822b, 0x58df05df),
+ TOBN(0x5c14842f, 0xa5c3b683), TOBN(0x98fe977e, 0x3eba34ce),
+ TOBN(0xfd2316c2, 0x0d5e8873), TOBN(0xe48d839a, 0xbd0d427d),
+ TOBN(0x495b2218, 0x623fc961), TOBN(0x24ee56e7, 0xb46fba5e),
+ TOBN(0x9184a55b, 0x91e4de58), TOBN(0xa7488ca5, 0xdfdea288),
+ TOBN(0xa723862e, 0xa8dcc943), TOBN(0x92d762b2, 0x849dc0fc),
+ TOBN(0x3c444a12, 0x091ff4a9), TOBN(0x581113fa, 0x0cada274),
+ TOBN(0xb9de0a45, 0x30d8eae2), TOBN(0x5e0fcd85, 0xdf6b41ea),
+ TOBN(0x6233ea68, 0xc094dbb5), TOBN(0xb77d062e, 0xd968d410),
+ TOBN(0x3e719bbc, 0x58b3002d), TOBN(0x68e7dd3d, 0x3dc49d58),
+ TOBN(0x8d825740, 0x013a5e58), TOBN(0x21311747, 0x3c9e3c1b),
+ TOBN(0x0cb0a2a7, 0x7c99b6ab), TOBN(0x5c48a3b3, 0xc2f888f2) },
+ { TOBN(0xc7913e91, 0x991724f3), TOBN(0x5eda799c, 0x39cbd686),
+ TOBN(0xddb595c7, 0x63d4fc1e), TOBN(0x6b63b80b, 0xac4fed54),
+ TOBN(0x6ea0fc69, 0x7e5fb516), TOBN(0x737708ba, 0xd0f1c964),
+ TOBN(0x9628745f, 0x11a92ca5), TOBN(0x61f37958, 0x9a86967a),
+ TOBN(0x9af39b2c, 0xaa665072), TOBN(0x78322fa4, 0xefd324ef),
+ TOBN(0x3d153394, 0xc327bd31), TOBN(0x81d5f271, 0x3129dab0),
+ TOBN(0xc72e0c42, 0xf48027f5), TOBN(0xaa40cdbc, 0x8536e717),
+ TOBN(0xf45a657a, 0x2d369d0f), TOBN(0xb03bbfc4, 0xea7f74e6),
+ TOBN(0x46a8c418, 0x0d738ded), TOBN(0x6f1a5bb0, 0xe0de5729),
+ TOBN(0xf10230b9, 0x8ba81675), TOBN(0x32c6f30c, 0x112b33d4),
+ TOBN(0x7559129d, 0xd8fffb62), TOBN(0x6a281b47, 0xb459bf05),
+ TOBN(0x77c1bd3a, 0xfa3b6776), TOBN(0x0709b380, 0x7829973a),
+ TOBN(0x8c26b232, 0xa3326505), TOBN(0x38d69272, 0xee1d41bf),
+ TOBN(0x0459453e, 0xffe32afa), TOBN(0xce8143ad, 0x7cb3ea87),
+ TOBN(0x932ec1fa, 0x7e6ab666), TOBN(0x6cd2d230, 0x22286264),
+ TOBN(0x459a46fe, 0x6736f8ed), TOBN(0x50bf0d00, 0x9eca85bb),
+ TOBN(0x0b825852, 0x877a21ec), TOBN(0x300414a7, 0x0f537a94),
+ TOBN(0x3f1cba40, 0x21a9a6a2), TOBN(0x50824eee, 0x76943c00),
+ TOBN(0xa0dbfcec, 0xf83cba5d), TOBN(0xf9538148, 0x93b4f3c0),
+ TOBN(0x61744162, 0x48f24dd7), TOBN(0x5322d64d, 0xe4fb09dd),
+ TOBN(0x57447384, 0x3d9325f3), TOBN(0xa9bef2d0, 0xf371cb84),
+ TOBN(0x77d2188b, 0xa61e36c5), TOBN(0xbbd6a7d7, 0xc602df72),
+ TOBN(0xba3aa902, 0x8f61bc0b), TOBN(0xf49085ed, 0x6ed0b6a1),
+ TOBN(0x8bc625d6, 0xae6e8298), TOBN(0x832b0b1d, 0xa2e9c01d),
+ TOBN(0xa337c447, 0xf1f0ced1), TOBN(0x800cc793, 0x9492dd2b),
+ TOBN(0x4b93151d, 0xbea08efa), TOBN(0x820cf3f8, 0xde0a741e),
+ TOBN(0xff1982dc, 0x1c0f7d13), TOBN(0xef921960, 0x84dde6ca),
+ TOBN(0x1ad7d972, 0x45f96ee3), TOBN(0x319c8dbe, 0x29dea0c7),
+ TOBN(0xd3ea3871, 0x7b82b99b), TOBN(0x75922d4d, 0x470eb624),
+ TOBN(0x8f66ec54, 0x3b95d466), TOBN(0x66e673cc, 0xbee1e346),
+ TOBN(0x6afe67c4, 0xb5f2b89a), TOBN(0x3de9c1e6, 0x290e5cd3),
+ TOBN(0x8c278bb6, 0x310a2ada), TOBN(0x420fa384, 0x0bdb323b),
+ TOBN(0x0ae1d63b, 0x0eb919b0), TOBN(0xd74ee51d, 0xa74b9620),
+ TOBN(0x395458d0, 0xa674290c), TOBN(0x324c930f, 0x4620a510),
+ TOBN(0x2d1f4d19, 0xfbac27d4), TOBN(0x4086e8ca, 0x9bedeeac),
+ TOBN(0x0cdd211b, 0x9b679ab8), TOBN(0x5970167d, 0x7090fec4),
+ TOBN(0x3420f2c9, 0xfaf1fc63), TOBN(0x616d333a, 0x328c8bb4),
+ TOBN(0x7d65364c, 0x57f1fe4a), TOBN(0x9343e877, 0x55e5c73a),
+ TOBN(0x5795176b, 0xe970e78c), TOBN(0xa36ccebf, 0x60533627),
+ TOBN(0xfc7c7380, 0x09cdfc1b), TOBN(0xb39a2afe, 0xb3fec326),
+ TOBN(0xb7ff1ba1, 0x6224408a), TOBN(0xcc856e92, 0x247cfc5e),
+ TOBN(0x01f102e7, 0xc18bc493), TOBN(0x4613ab74, 0x2091c727),
+ TOBN(0xaa25e89c, 0xc420bf2b), TOBN(0x00a53176, 0x90337ec2),
+ TOBN(0xd2be9f43, 0x7d025fc7), TOBN(0x3316fb85, 0x6e6fe3dc),
+ TOBN(0x27520af5, 0x9ac50814), TOBN(0xfdf95e78, 0x9a8e4223),
+ TOBN(0xb7e7df2a, 0x56bec5a0), TOBN(0xf7022f7d, 0xdf159e5d),
+ TOBN(0x93eeeab1, 0xcac1fe8f), TOBN(0x8040188c, 0x37451168),
+ TOBN(0x7ee8aa8a, 0xd967dce6), TOBN(0xfa0e79e7, 0x3abc9299),
+ TOBN(0x67332cfc, 0x2064cfd1), TOBN(0x339c31de, 0xb0651934),
+ TOBN(0x719b28d5, 0x2a3bcbea), TOBN(0xee74c82b, 0x9d6ae5c6),
+ TOBN(0x0927d05e, 0xbaf28ee6), TOBN(0x82cecf2c, 0x9d719028),
+ TOBN(0x0b0d353e, 0xddb30289), TOBN(0xfe4bb977, 0xfddb2e29),
+ TOBN(0xbb5bb990, 0x640bfd9e), TOBN(0xd226e277, 0x82f62108),
+ TOBN(0x4bf00985, 0x02ffdd56), TOBN(0x7756758a, 0x2ca1b1b5),
+ TOBN(0xc32b62a3, 0x5285fe91), TOBN(0xedbc546a, 0x8c9cd140),
+ TOBN(0x1e47a013, 0xaf5cb008), TOBN(0xbca7e720, 0x073ce8f2),
+ TOBN(0xe10b2ab8, 0x17a91cae), TOBN(0xb89aab65, 0x08e27f63),
+ TOBN(0x7b3074a7, 0xdba3ddf9), TOBN(0x1c20ce09, 0x330c2972),
+ TOBN(0x6b9917b4, 0x5fcf7e33), TOBN(0xe6793743, 0x945ceb42),
+ TOBN(0x18fc2215, 0x5c633d19), TOBN(0xad1adb3c, 0xc7485474),
+ TOBN(0x646f9679, 0x6424c49b), TOBN(0xf888dfe8, 0x67c241c9),
+ TOBN(0xe12d4b93, 0x24f68b49), TOBN(0x9a6b62d8, 0xa571df20),
+ TOBN(0x81b4b26d, 0x179483cb), TOBN(0x666f9632, 0x9511fae2),
+ TOBN(0xd281b3e4, 0xd53aa51f), TOBN(0x7f96a765, 0x7f3dbd16),
+ TOBN(0xa7f8b5bf, 0x074a30ce), TOBN(0xd7f52107, 0x005a32e6),
+ TOBN(0x6f9e0907, 0x50237ed4), TOBN(0x2f21da47, 0x8096fa2b),
+ TOBN(0xf3e19cb4, 0xeec863a0), TOBN(0xd18f77fd, 0x9527620a),
+ TOBN(0x9505c81c, 0x407c1cf8), TOBN(0x9998db4e, 0x1b6ec284),
+ TOBN(0x7e3389e5, 0xc247d44d), TOBN(0x12507141, 0x3f4f3d80),
+ TOBN(0xd4ba0110, 0x4a78a6c7), TOBN(0x312874a0, 0x767720be),
+ TOBN(0xded059a6, 0x75944370), TOBN(0xd6123d90, 0x3b2c0bdd),
+ TOBN(0xa56b717b, 0x51c108e3), TOBN(0x9bb7940e, 0x070623e9),
+ TOBN(0x794e2d59, 0x84ac066c), TOBN(0xf5954a92, 0xe68c69a0),
+ TOBN(0x28c52458, 0x4fd99dcc), TOBN(0x60e639fc, 0xb1012517),
+ TOBN(0xc2e60125, 0x7de79248), TOBN(0xe9ef6404, 0xf12fc6d7),
+ TOBN(0x4c4f2808, 0x2a3b5d32), TOBN(0x865ad32e, 0xc768eb8a),
+ TOBN(0xac02331b, 0x13fb70b6), TOBN(0x037b44c1, 0x95599b27),
+ TOBN(0x1a860fc4, 0x60bd082c), TOBN(0xa2e25745, 0xc980cd01),
+ TOBN(0xee3387a8, 0x1da0263e), TOBN(0x931bfb95, 0x2d10f3d6),
+ TOBN(0x5b687270, 0xa1f24a32), TOBN(0xf140e65d, 0xca494b86),
+ TOBN(0x4f4ddf91, 0xb2f1ac7a), TOBN(0xf99eaabb, 0x760fee27),
+ TOBN(0x57f4008a, 0x49c228e5), TOBN(0x090be440, 0x1cf713bb),
+ TOBN(0xac91fbe4, 0x5004f022), TOBN(0xd838c2c2, 0x569e1af6),
+ TOBN(0xd6c7d20b, 0x0f1daaa5), TOBN(0xaa063ac1, 0x1bbb02c0),
+ TOBN(0x0938a422, 0x59558a78), TOBN(0x5343c669, 0x8435da2f),
+ TOBN(0x96f67b18, 0x034410dc), TOBN(0x7cc1e424, 0x84510804),
+ TOBN(0x86a1543f, 0x16dfbb7d), TOBN(0x921fa942, 0x5b5bd592),
+ TOBN(0x9dcccb6e, 0xb33dd03c), TOBN(0x8581ddd9, 0xb843f51e),
+ TOBN(0x54935fcb, 0x81d73c9e), TOBN(0x6d07e979, 0x0a5e97ab),
+ TOBN(0x4dc7b30a, 0xcf3a6bab), TOBN(0x147ab1f3, 0x170bee11),
+ TOBN(0x0aaf8e3d, 0x9fafdee4), TOBN(0xfab3dbcb, 0x538a8b95),
+ TOBN(0x405df4b3, 0x6ef13871), TOBN(0xf1f4e9cb, 0x088d5a49),
+ TOBN(0x9bcd24d3, 0x66b33f1d), TOBN(0x3b97b820, 0x5ce445c0),
+ TOBN(0xe2926549, 0xba93ff61), TOBN(0xd9c341ce, 0x4dafe616),
+ TOBN(0xfb30a76e, 0x16efb6f3), TOBN(0xdf24b8ca, 0x605b953c),
+ TOBN(0x8bd52afe, 0xc2fffb9f), TOBN(0xbbac5ff7, 0xe19d0b96),
+ TOBN(0x43c01b87, 0x459afccd), TOBN(0x6bd45143, 0xb7432652),
+ TOBN(0x84734530, 0x55b5d78e), TOBN(0x81088fdb, 0x1554ba7d),
+ TOBN(0xada0a52c, 0x1e269375), TOBN(0xf9f037c4, 0x2dc5ec10),
+ TOBN(0xc0660607, 0x94bfbc11), TOBN(0xc0a630bb, 0xc9c40d2f),
+ TOBN(0x5efc797e, 0xab64c31e), TOBN(0xffdb1dab, 0x74507144),
+ TOBN(0xf6124287, 0x1ca6790c), TOBN(0xe9609d81, 0xe69bf1bf),
+ TOBN(0xdb898595, 0x00d24fc9), TOBN(0x9c750333, 0xe51fb417),
+ TOBN(0x51830a91, 0xfef7bbde), TOBN(0x0ce67dc8, 0x945f585c),
+ TOBN(0x9a730ed4, 0x4763eb50), TOBN(0x24a0e221, 0xc1ab0d66),
+ TOBN(0x643b6393, 0x648748f3), TOBN(0x1982daa1, 0x6d3c6291),
+ TOBN(0x6f00a9f7, 0x8bbc5549), TOBN(0x7a1783e1, 0x7f36384e),
+ TOBN(0xe8346323, 0xde977f50), TOBN(0x91ab688d, 0xb245502a),
+ TOBN(0x331ab6b5, 0x6d0bdd66), TOBN(0x0a6ef32e, 0x64b71229),
+ TOBN(0x1028150e, 0xfe7c352f), TOBN(0x27e04350, 0xce7b39d3),
+ TOBN(0x2a3c8acd, 0xc1070c82), TOBN(0xfb2034d3, 0x80c9feef),
+ TOBN(0x2d729621, 0x709f3729), TOBN(0x8df290bf, 0x62cb4549),
+ TOBN(0x02f99f33, 0xfc2e4326), TOBN(0x3b30076d, 0x5eddf032),
+ TOBN(0xbb21f8cf, 0x0c652fb5), TOBN(0x314fb49e, 0xed91cf7b),
+ TOBN(0xa013eca5, 0x2f700750), TOBN(0x2b9e3c23, 0x712a4575),
+ TOBN(0xe5355557, 0xaf30fbb0), TOBN(0x1ada3516, 0x7c77e771),
+ TOBN(0x45f6ecb2, 0x7b135670), TOBN(0xe85d19df, 0x7cfc202e),
+ TOBN(0x0f1b50c7, 0x58d1be9f), TOBN(0x5ebf2c0a, 0xead2e344),
+ TOBN(0x1531fe4e, 0xabc199c9), TOBN(0xc7032592, 0x56bab0ae),
+ TOBN(0x16ab2e48, 0x6c1fec54), TOBN(0x0f87fda8, 0x04280188),
+ TOBN(0xdc9f46fc, 0x609e4a74), TOBN(0x2a44a143, 0xba667f91),
+ TOBN(0xbc3d8b95, 0xb4d83436), TOBN(0xa01e4bd0, 0xc7bd2958),
+ TOBN(0x7b182932, 0x73483c90), TOBN(0xa79c6aa1, 0xa7c7b598),
+ TOBN(0xbf3983c6, 0xeaaac07e), TOBN(0x8f18181e, 0x96e0d4e6),
+ TOBN(0x8553d37c, 0x051af62b), TOBN(0xe9a998eb, 0x0bf94496),
+ TOBN(0xe0844f9f, 0xb0d59aa1), TOBN(0x983fd558, 0xe6afb813),
+ TOBN(0x9670c0ca, 0x65d69804), TOBN(0x732b22de, 0x6ea5ff2d),
+ TOBN(0xd7640ba9, 0x5fd8623b), TOBN(0x9f619163, 0xa6351782),
+ TOBN(0x0bfc27ee, 0xacee5043), TOBN(0xae419e73, 0x2eb10f02),
+ TOBN(0x19c028d1, 0x8943fb05), TOBN(0x71f01cf7, 0xff13aa2a),
+ TOBN(0x7790737e, 0x8887a132), TOBN(0x67513309, 0x66318410),
+ TOBN(0x9819e8a3, 0x7ddb795e), TOBN(0xfecb8ef5, 0xdad100b2),
+ TOBN(0x59f74a22, 0x3021926a), TOBN(0xb7c28a49, 0x6f9b4c1c),
+ TOBN(0xed1a733f, 0x912ad0ab), TOBN(0x42a910af, 0x01a5659c),
+ TOBN(0x3842c6e0, 0x7bd68cab), TOBN(0x2b57fa38, 0x76d70ac8),
+ TOBN(0x8a6707a8, 0x3c53aaeb), TOBN(0x62c1c510, 0x65b4db18),
+ TOBN(0x8de2c1fb, 0xb2d09dc7), TOBN(0xc3dfed12, 0x266bd23b),
+ TOBN(0x927d039b, 0xd5b27db6), TOBN(0x2fb2f0f1, 0x103243da),
+ TOBN(0xf855a07b, 0x80be7399), TOBN(0xed9327ce, 0x1f9f27a8),
+ TOBN(0xa0bd99c7, 0x729bdef7), TOBN(0x2b67125e, 0x28250d88),
+ TOBN(0x784b26e8, 0x8670ced7), TOBN(0xe3dfe41f, 0xc31bd3b4),
+ TOBN(0x9e353a06, 0xbcc85cbc), TOBN(0x302e2909, 0x60178a9d),
+ TOBN(0x860abf11, 0xa6eac16e), TOBN(0x76447000, 0xaa2b3aac),
+ TOBN(0x46ff9d19, 0x850afdab), TOBN(0x35bdd6a5, 0xfdb2d4c1),
+ TOBN(0xe82594b0, 0x7e5c9ce9), TOBN(0x0f379e53, 0x20af346e),
+ TOBN(0x608b31e3, 0xbc65ad4a), TOBN(0x710c6b12, 0x267c4826),
+ TOBN(0x51c966f9, 0x71954cf1), TOBN(0xb1cec793, 0x0d0aa215),
+ TOBN(0x1f155989, 0x86bd23a8), TOBN(0xae2ff99c, 0xf9452e86),
+ TOBN(0xd8dd953c, 0x340ceaa2), TOBN(0x26355275, 0x2e2e9333),
+ TOBN(0x15d4e5f9, 0x8586f06d), TOBN(0xd6bf94a8, 0xf7cab546),
+ TOBN(0x33c59a0a, 0xb76a9af0), TOBN(0x52740ab3, 0xba095af7),
+ TOBN(0xc444de8a, 0x24389ca0), TOBN(0xcc6f9863, 0x706da0cb),
+ TOBN(0xb5a741a7, 0x6b2515cf), TOBN(0x71c41601, 0x9585c749),
+ TOBN(0x78350d4f, 0xe683de97), TOBN(0x31d61524, 0x63d0b5f5),
+ TOBN(0x7a0cc5e1, 0xfbce090b), TOBN(0xaac927ed, 0xfbcb2a5b),
+ TOBN(0xe920de49, 0x20d84c35), TOBN(0x8c06a0b6, 0x22b4de26),
+ TOBN(0xd34dd58b, 0xafe7ddf3), TOBN(0x55851fed, 0xc1e6e55b),
+ TOBN(0xd1395616, 0x960696e7), TOBN(0x940304b2, 0x5f22705f),
+ TOBN(0x6f43f861, 0xb0a2a860), TOBN(0xcf121282, 0x0e7cc981),
+ TOBN(0x12186212, 0x0ab64a96), TOBN(0x09215b9a, 0xb789383c),
+ TOBN(0x311eb305, 0x37387c09), TOBN(0xc5832fce, 0xf03ee760),
+ TOBN(0x30358f58, 0x32f7ea19), TOBN(0xe01d3c34, 0x91d53551),
+ TOBN(0x1ca5ee41, 0xda48ea80), TOBN(0x34e71e8e, 0xcf4fa4c1),
+ TOBN(0x312abd25, 0x7af1e1c7), TOBN(0xe3afcdeb, 0x2153f4a5),
+ TOBN(0x9d5c84d7, 0x00235e9a), TOBN(0x0308d3f4, 0x8c4c836f),
+ TOBN(0xc0a66b04, 0x89332de5), TOBN(0x610dd399, 0x89e566ef),
+ TOBN(0xf8eea460, 0xd1ac1635), TOBN(0x84cbb3fb, 0x20a2c0df),
+ TOBN(0x40afb488, 0xe74a48c5), TOBN(0x29738198, 0xd326b150),
+ TOBN(0x2a17747f, 0xa6d74081), TOBN(0x60ea4c05, 0x55a26214),
+ TOBN(0x53514bb4, 0x1f88c5fe), TOBN(0xedd64567, 0x7e83426c),
+ TOBN(0xd5d6cbec, 0x96460b25), TOBN(0xa12fd0ce, 0x68dc115e),
+ TOBN(0xc5bc3ed2, 0x697840ea), TOBN(0x969876a8, 0xa6331e31),
+ TOBN(0x60c36217, 0x472ff580), TOBN(0xf4229705, 0x4ad41393),
+ TOBN(0x4bd99ef0, 0xa03b8b92), TOBN(0x501c7317, 0xc144f4f6),
+ TOBN(0x159009b3, 0x18464945), TOBN(0x6d5e594c, 0x74c5c6be),
+ TOBN(0x2d587011, 0x321a3660), TOBN(0xd1e184b1, 0x3898d022),
+ TOBN(0x5ba04752, 0x4c6a7e04), TOBN(0x47fa1e2b, 0x45550b65),
+ TOBN(0x9419daf0, 0x48c0a9a5), TOBN(0x66362953, 0x7c243236),
+ TOBN(0xcd0744b1, 0x5cb12a88), TOBN(0x561b6f9a, 0x2b646188),
+ TOBN(0x599415a5, 0x66c2c0c0), TOBN(0xbe3f0859, 0x0f83f09a),
+ TOBN(0x9141c5be, 0xb92041b8), TOBN(0x01ae38c7, 0x26477d0d),
+ TOBN(0xca8b71f3, 0xd12c7a94), TOBN(0xfab5b31f, 0x765c70db),
+ TOBN(0x76ae7492, 0x487443e9), TOBN(0x8595a310, 0x990d1349),
+ TOBN(0xf8dbeda8, 0x7d460a37), TOBN(0x7f7ad082, 0x1e45a38f),
+ TOBN(0xed1d4db6, 0x1059705a), TOBN(0xa3dd492a, 0xe6b9c697),
+ TOBN(0x4b92ee3a, 0x6eb38bd5), TOBN(0xbab2609d, 0x67cc0bb7),
+ TOBN(0x7fc4fe89, 0x6e70ee82), TOBN(0xeff2c56e, 0x13e6b7e3),
+ TOBN(0x9b18959e, 0x34d26fca), TOBN(0x2517ab66, 0x889d6b45),
+ TOBN(0xf167b4e0, 0xbdefdd4f), TOBN(0x69958465, 0xf366e401),
+ TOBN(0x5aa368ab, 0xa73bbec0), TOBN(0x12148709, 0x7b240c21),
+ TOBN(0x378c3233, 0x18969006), TOBN(0xcb4d73ce, 0xe1fe53d1),
+ TOBN(0x5f50a80e, 0x130c4361), TOBN(0xd67f5951, 0x7ef5212b),
+ TOBN(0xf145e21e, 0x9e70c72e), TOBN(0xb2e52e29, 0x5566d2fb),
+ TOBN(0x44eaba4a, 0x032397f5), TOBN(0x5e56937b, 0x7e31a7de),
+ TOBN(0x68dcf517, 0x456c61e1), TOBN(0xbc2e954a, 0xa8b0a388),
+ TOBN(0xe3552fa7, 0x60a8b755), TOBN(0x03442dae, 0x73ad0cde),
+ TOBN(0x37ffe747, 0xceb26210), TOBN(0x983545e8, 0x787baef9),
+ TOBN(0x8b8c8535, 0x86a3de31), TOBN(0xc621dbcb, 0xfacd46db),
+ TOBN(0x82e442e9, 0x59266fbb), TOBN(0xa3514c37, 0x339d471c),
+ TOBN(0x3a11b771, 0x62cdad96), TOBN(0xf0cb3b3c, 0xecf9bdf0),
+ TOBN(0x3fcbdbce, 0x478e2135), TOBN(0x7547b5cf, 0xbda35342),
+ TOBN(0xa97e81f1, 0x8a677af6), TOBN(0xc8c2bf83, 0x28817987),
+ TOBN(0xdf07eaaf, 0x45580985), TOBN(0xc68d1f05, 0xc93b45cb),
+ TOBN(0x106aa2fe, 0xc77b4cac), TOBN(0x4c1d8afc, 0x04a7ae86),
+ TOBN(0xdb41c3fd, 0x9eb45ab2), TOBN(0x5b234b5b, 0xd4b22e74),
+ TOBN(0xda253dec, 0xf215958a), TOBN(0x67e0606e, 0xa04edfa0),
+ TOBN(0xabbbf070, 0xef751b11), TOBN(0xf352f175, 0xf6f06dce),
+ TOBN(0xdfc4b6af, 0x6839f6b4), TOBN(0x53ddf9a8, 0x9959848e),
+ TOBN(0xda49c379, 0xc21520b0), TOBN(0x90864ff0, 0xdbd5d1b6),
+ TOBN(0x2f055d23, 0x5f49c7f7), TOBN(0xe51e4e6a, 0xa796b2d8),
+ TOBN(0xc361a67f, 0x5c9dc340), TOBN(0x5ad53c37, 0xbca7c620),
+ TOBN(0xda1d6588, 0x32c756d0), TOBN(0xad60d911, 0x8bb67e13),
+ TOBN(0xd6c47bdf, 0x0eeec8c6), TOBN(0x4a27fec1, 0x078a1821),
+ TOBN(0x081f7415, 0xc3099524), TOBN(0x8effdf0b, 0x82cd8060),
+ TOBN(0xdb70ec1c, 0x65842df8), TOBN(0x8821b358, 0xd319a901),
+ TOBN(0x72ee56ee, 0xde42b529), TOBN(0x5bb39592, 0x236e4286),
+ TOBN(0xd1183316, 0xfd6f7140), TOBN(0xf9fadb5b, 0xbd8e81f7),
+ TOBN(0x701d5e0c, 0x5a02d962), TOBN(0xfdee4dbf, 0x1b601324),
+ TOBN(0xbed17407, 0x35d7620e), TOBN(0x04e3c2c3, 0xf48c0012),
+ TOBN(0x9ee29da7, 0x3455449a), TOBN(0x562cdef4, 0x91a836c4),
+ TOBN(0x8f682a5f, 0x47701097), TOBN(0x617125d8, 0xff88d0c2),
+ TOBN(0x948fda24, 0x57bb86dd), TOBN(0x348abb8f, 0x289f7286),
+ TOBN(0xeb10eab5, 0x99d94bbd), TOBN(0xd51ba28e, 0x4684d160),
+ TOBN(0xabe0e51c, 0x30c8f41a), TOBN(0x66588b45, 0x13254f4a),
+ TOBN(0x147ebf01, 0xfad097a5), TOBN(0x49883ea8, 0x610e815d),
+ TOBN(0xe44d60ba, 0x8a11de56), TOBN(0xa970de6e, 0x827a7a6d),
+ TOBN(0x2be41424, 0x5e17fc19), TOBN(0xd833c657, 0x01214057),
+ TOBN(0x1375813b, 0x363e723f), TOBN(0x6820bb88, 0xe6a52e9b),
+ TOBN(0x7e7f6970, 0xd875d56a), TOBN(0xd6a0a9ac, 0x51fbf6bf),
+ TOBN(0x54ba8790, 0xa3083c12), TOBN(0xebaeb23d, 0x6ae7eb64),
+ TOBN(0xa8685c3a, 0xb99a907a), TOBN(0xf1e74550, 0x026bf40b),
+ TOBN(0x7b73a027, 0xc802cd9e), TOBN(0x9a8a927c, 0x4fef4635),
+ TOBN(0xe1b6f60c, 0x08191224), TOBN(0xc4126ebb, 0xde4ec091),
+ TOBN(0xe1dff4dc, 0x4ae38d84), TOBN(0xde3f57db, 0x4f2ef985),
+ TOBN(0x34964337, 0xd446a1dd), TOBN(0x7bf217a0, 0x859e77f6),
+ TOBN(0x8ff10527, 0x8e1d13f5), TOBN(0xa304ef03, 0x74eeae27),
+ TOBN(0xfc6f5e47, 0xd19dfa5a), TOBN(0xdb007de3, 0x7fad982b),
+ TOBN(0x28205ad1, 0x613715f5), TOBN(0x251e6729, 0x7889529e),
+ TOBN(0x72705184, 0x1ae98e78), TOBN(0xf818537d, 0x271cac32),
+ TOBN(0xc8a15b7e, 0xb7f410f5), TOBN(0xc474356f, 0x81f62393),
+ TOBN(0x92dbdc5a, 0xc242316b), TOBN(0xabe060ac, 0xdbf4aff5),
+ TOBN(0x6e8c38fe, 0x909a8ec6), TOBN(0x43e514e5, 0x6116cb94),
+ TOBN(0x2078fa38, 0x07d784f9), TOBN(0x1161a880, 0xf4b5b357),
+ TOBN(0x5283ce79, 0x13adea3d), TOBN(0x0756c3e6, 0xcc6a910b),
+ TOBN(0x60bcfe01, 0xaaa79697), TOBN(0x04a73b29, 0x56391db1),
+ TOBN(0xdd8dad47, 0x189b45a0), TOBN(0xbfac0dd0, 0x48d5b8d9),
+ TOBN(0x34ab3af5, 0x7d3d2ec2), TOBN(0x6fa2fc2d, 0x207bd3af),
+ TOBN(0x9ff40092, 0x66550ded), TOBN(0x719b3e87, 0x1fd5b913),
+ TOBN(0xa573a496, 0x6d17fbc7), TOBN(0x0cd1a70a, 0x73d2b24e),
+ TOBN(0x34e2c5ca, 0xb2676937), TOBN(0xe7050b06, 0xbf669f21),
+ TOBN(0xfbe948b6, 0x1ede9046), TOBN(0xa0530051, 0x97662659),
+ TOBN(0x58cbd4ed, 0xf10124c5), TOBN(0xde2646e4, 0xdd6c06c8),
+ TOBN(0x332f8108, 0x8cad38c0), TOBN(0x471b7e90, 0x6bd68ae2),
+ TOBN(0x56ac3fb2, 0x0d8e27a3), TOBN(0xb54660db, 0x136b4b0d),
+ TOBN(0x123a1e11, 0xa6fd8de4), TOBN(0x44dbffea, 0xa37799ef),
+ TOBN(0x4540b977, 0xce6ac17c), TOBN(0x495173a8, 0xaf60acef) },
+ { TOBN(0x9ebb284d, 0x391c2a82), TOBN(0xbcdd4863, 0x158308e8),
+ TOBN(0x006f16ec, 0x83f1edca), TOBN(0xa13e2c37, 0x695dc6c8),
+ TOBN(0x2ab756f0, 0x4a057a87), TOBN(0xa8765500, 0xa6b48f98),
+ TOBN(0x4252face, 0x68651c44), TOBN(0xa52b540b, 0xe1765e02),
+ TOBN(0x4f922fc5, 0x16a0d2bb), TOBN(0x0d5cc16c, 0x1a623499),
+ TOBN(0x9241cf3a, 0x57c62c8b), TOBN(0x2f5e6961, 0xfd1b667f),
+ TOBN(0x5c15c70b, 0xf5a01797), TOBN(0x3d20b44d, 0x60956192),
+ TOBN(0x04911b37, 0x071fdb52), TOBN(0xf648f916, 0x8d6f0f7b),
+ TOBN(0x6dc1acaf, 0xe60b7cf7), TOBN(0x25860a50, 0x84a9d869),
+ TOBN(0x56fc6f09, 0xe7ba8ac4), TOBN(0x828c5bd0, 0x6148d29e),
+ TOBN(0xac6b435e, 0xdc55ae5f), TOBN(0xa527f56c, 0xc0117411),
+ TOBN(0x94d5045e, 0xfd24342c), TOBN(0x2c4c0a35, 0x70b67c0d),
+ TOBN(0x027cc8b8, 0xfac61d9a), TOBN(0x7d25e062, 0xe3c6fe8a),
+ TOBN(0xe08805bf, 0xe5bff503), TOBN(0x13271e6c, 0x6ff632f7),
+ TOBN(0x55dca6c0, 0x232f76a5), TOBN(0x8957c32d, 0x701ef426),
+ TOBN(0xee728bcb, 0xa10a5178), TOBN(0x5ea60411, 0xb62c5173),
+ TOBN(0xfc4e964e, 0xd0b8892b), TOBN(0x9ea17683, 0x9301bb74),
+ TOBN(0x6265c5ae, 0xfcc48626), TOBN(0xe60cf82e, 0xbb3e9102),
+ TOBN(0x57adf797, 0xd4df5531), TOBN(0x235b59a1, 0x8deeefe2),
+ TOBN(0x60adcf58, 0x3f306eb1), TOBN(0x105c2753, 0x3d09492d),
+ TOBN(0x4090914b, 0xb5def996), TOBN(0x1cb69c83, 0x233dd1e7),
+ TOBN(0xc1e9c1d3, 0x9b3d5e76), TOBN(0x1f3338ed, 0xfccf6012),
+ TOBN(0xb1e95d0d, 0x2f5378a8), TOBN(0xacf4c2c7, 0x2f00cd21),
+ TOBN(0x6e984240, 0xeb5fe290), TOBN(0xd66c038d, 0x248088ae),
+ TOBN(0x804d264a, 0xf94d70cf), TOBN(0xbdb802ef, 0x7314bf7e),
+ TOBN(0x8fb54de2, 0x4333ed02), TOBN(0x740461e0, 0x285635d9),
+ TOBN(0x4113b2c8, 0x365e9383), TOBN(0xea762c83, 0x3fdef652),
+ TOBN(0x4eec6e2e, 0x47b956c1), TOBN(0xa3d814be, 0x65620fa4),
+ TOBN(0x9ad5462b, 0xb4d8bc50), TOBN(0x181c0b16, 0xa9195770),
+ TOBN(0xebd4fe1c, 0x78412a68), TOBN(0xae0341bc, 0xc0dff48c),
+ TOBN(0xb6bc45cf, 0x7003e866), TOBN(0xf11a6dea, 0x8a24a41b),
+ TOBN(0x5407151a, 0xd04c24c2), TOBN(0x62c9d27d, 0xda5b7b68),
+ TOBN(0x2e964235, 0x88cceff6), TOBN(0x8594c54f, 0x8b07ed69),
+ TOBN(0x1578e73c, 0xc84d0d0d), TOBN(0x7b4e1055, 0xff532868),
+ TOBN(0xa348c0d5, 0xb5ec995a), TOBN(0xbf4b9d55, 0x14289a54),
+ TOBN(0x9ba155a6, 0x58fbd777), TOBN(0x186ed7a8, 0x1a84491d),
+ TOBN(0xd4992b30, 0x614c0900), TOBN(0xda98d121, 0xbd00c24b),
+ TOBN(0x7f534dc8, 0x7ec4bfa1), TOBN(0x4a5ff674, 0x37dc34bc),
+ TOBN(0x68c196b8, 0x1d7ea1d7), TOBN(0x38cf2893, 0x80a6d208),
+ TOBN(0xfd56cd09, 0xe3cbbd6e), TOBN(0xec72e27e, 0x4205a5b6),
+ TOBN(0x15ea68f5, 0xa44f77f7), TOBN(0x7aa5f9fd, 0xb43c52bc),
+ TOBN(0x86ff676f, 0x94f0e609), TOBN(0xa4cde963, 0x2e2d432b),
+ TOBN(0x8cafa0c0, 0xeee470af), TOBN(0x84137d0e, 0x8a3f5ec8),
+ TOBN(0xebb40411, 0xfaa31231), TOBN(0xa239c13f, 0x6f7f7ccf),
+ TOBN(0x32865719, 0xa8afd30b), TOBN(0x86798328, 0x8a826dce),
+ TOBN(0xdf04e891, 0xc4a8fbe0), TOBN(0xbb6b6e1b, 0xebf56ad3),
+ TOBN(0x0a695b11, 0x471f1ff0), TOBN(0xd76c3389, 0xbe15baf0),
+ TOBN(0x018edb95, 0xbe96c43e), TOBN(0xf2beaaf4, 0x90794158),
+ TOBN(0x152db09e, 0xc3076a27), TOBN(0x5e82908e, 0xe416545d),
+ TOBN(0xa2c41272, 0x356d6f2e), TOBN(0xdc9c9642, 0x31fd74e1),
+ TOBN(0x66ceb88d, 0x519bf615), TOBN(0xe29ecd76, 0x05a2274e),
+ TOBN(0x3a0473c4, 0xbf5e2fa0), TOBN(0x6b6eb671, 0x64284e67),
+ TOBN(0xe8b97932, 0xb88756dd), TOBN(0xed4e8652, 0xf17e3e61),
+ TOBN(0xc2dd1499, 0x3ee1c4a4), TOBN(0xc0aaee17, 0x597f8c0e),
+ TOBN(0x15c4edb9, 0x6c168af3), TOBN(0x6563c7bf, 0xb39ae875),
+ TOBN(0xadfadb6f, 0x20adb436), TOBN(0xad55e8c9, 0x9a042ac0),
+ TOBN(0x975a1ed8, 0xb76da1f5), TOBN(0x10dfa466, 0xa58acb94),
+ TOBN(0x8dd7f7e3, 0xac060282), TOBN(0x6813e66a, 0x572a051e),
+ TOBN(0xb4ccae1e, 0x350cb901), TOBN(0xb653d656, 0x50cb7822),
+ TOBN(0x42484710, 0xdfab3b87), TOBN(0xcd7ee537, 0x9b670fd0),
+ TOBN(0x0a50b12e, 0x523b8bf6), TOBN(0x8009eb5b, 0x8f910c1b),
+ TOBN(0xf535af82, 0x4a167588), TOBN(0x0f835f9c, 0xfb2a2abd),
+ TOBN(0xf59b2931, 0x2afceb62), TOBN(0xc797df2a, 0x169d383f),
+ TOBN(0xeb3f5fb0, 0x66ac02b0), TOBN(0x029d4c6f, 0xdaa2d0ca),
+ TOBN(0xd4059bc1, 0xafab4bc5), TOBN(0x833f5c6f, 0x56783247),
+ TOBN(0xb5346630, 0x8d2d3605), TOBN(0x83387891, 0xd34d8433),
+ TOBN(0xd973b30f, 0xadd9419a), TOBN(0xbcca1099, 0xafe3fce8),
+ TOBN(0x08178315, 0x0809aac6), TOBN(0x01b7f21a, 0x540f0f11),
+ TOBN(0x65c29219, 0x909523c8), TOBN(0xa62f648f, 0xa3a1c741),
+ TOBN(0x88598d4f, 0x60c9e55a), TOBN(0xbce9141b, 0x0e4f347a),
+ TOBN(0x9af97d84, 0x35f9b988), TOBN(0x0210da62, 0x320475b6),
+ TOBN(0x3c076e22, 0x9191476c), TOBN(0x7520dbd9, 0x44fc7834),
+ TOBN(0x6a6b2cfe, 0xc1ab1bbd), TOBN(0xef8a65be, 0xdc650938),
+ TOBN(0x72855540, 0x805d7bc4), TOBN(0xda389396, 0xed11fdfd),
+ TOBN(0xa9d5bd36, 0x74660876), TOBN(0x11d67c54, 0xb45dff35),
+ TOBN(0x6af7d148, 0xa4f5da94), TOBN(0xbb8d4c3f, 0xc0bbeb31),
+ TOBN(0x87a7ebd1, 0xe0a1b12a), TOBN(0x1e4ef88d, 0x770ba95f),
+ TOBN(0x8c33345c, 0xdc2ae9cb), TOBN(0xcecf1276, 0x01cc8403),
+ TOBN(0x687c012e, 0x1b39b80f), TOBN(0xfd90d0ad, 0x35c33ba4),
+ TOBN(0xa3ef5a67, 0x5c9661c2), TOBN(0x368fc88e, 0xe017429e),
+ TOBN(0xd30c6761, 0x196a2fa2), TOBN(0x931b9817, 0xbd5b312e),
+ TOBN(0xba01000c, 0x72f54a31), TOBN(0xa203d2c8, 0x66eaa541),
+ TOBN(0xf2abdee0, 0x98939db3), TOBN(0xe37d6c2c, 0x3e606c02),
+ TOBN(0xf2921574, 0x521ff643), TOBN(0x2781b3c4, 0xd7e2fca3),
+ TOBN(0x664300b0, 0x7850ec06), TOBN(0xac5a38b9, 0x7d3a10cf),
+ TOBN(0x9233188d, 0xe34ab39d), TOBN(0xe77057e4, 0x5072cbb9),
+ TOBN(0xbcf0c042, 0xb59e78df), TOBN(0x4cfc91e8, 0x1d97de52),
+ TOBN(0x4661a26c, 0x3ee0ca4a), TOBN(0x5620a4c1, 0xfb8507bc),
+ TOBN(0x4b44d4aa, 0x049f842c), TOBN(0xceabc5d5, 0x1540e82b),
+ TOBN(0x306710fd, 0x15c6f156), TOBN(0xbe5ae52b, 0x63db1d72),
+ TOBN(0x06f1e7e6, 0x334957f1), TOBN(0x57e388f0, 0x31144a70),
+ TOBN(0xfb69bb2f, 0xdf96447b), TOBN(0x0f78ebd3, 0x73e38a12),
+ TOBN(0xb8222605, 0x2b7ce542), TOBN(0xe6d4ce99, 0x7472bde1),
+ TOBN(0x53e16ebe, 0x09d2f4da), TOBN(0x180ff42e, 0x53b92b2e),
+ TOBN(0xc59bcc02, 0x2c34a1c6), TOBN(0x3803d6f9, 0x422c46c2),
+ TOBN(0x18aff74f, 0x5c14a8a2), TOBN(0x55aebf80, 0x10a08b28),
+ TOBN(0x66097d58, 0x7135593f), TOBN(0x32e6eff7, 0x2be570cd),
+ TOBN(0x584e6a10, 0x2a8c860d), TOBN(0xcd185890, 0xa2eb4163),
+ TOBN(0x7ceae99d, 0x6d97e134), TOBN(0xd42c6b70, 0xdd8447ce),
+ TOBN(0x59ddbb4a, 0xb8c50273), TOBN(0x03c612df, 0x3cf34e1e),
+ TOBN(0x84b9ca15, 0x04b6c5a0), TOBN(0x35216f39, 0x18f0e3a3),
+ TOBN(0x3ec2d2bc, 0xbd986c00), TOBN(0x8bf546d9, 0xd19228fe),
+ TOBN(0xd1c655a4, 0x4cd623c3), TOBN(0x366ce718, 0x502b8e5a),
+ TOBN(0x2cfc84b4, 0xeea0bfe7), TOBN(0xe01d5cee, 0xcf443e8e),
+ TOBN(0x8ec045d9, 0x036520f8), TOBN(0xdfb3c3d1, 0x92d40e98),
+ TOBN(0x0bac4cce, 0xcc559a04), TOBN(0x35eccae5, 0x240ea6b1),
+ TOBN(0x180b32db, 0xf8a5a0ac), TOBN(0x547972a5, 0xeb699700),
+ TOBN(0xa3765801, 0xca26bca0), TOBN(0x57e09d0e, 0xa647f25a),
+ TOBN(0xb956970e, 0x2fdd23cc), TOBN(0xb80288bc, 0x5682e971),
+ TOBN(0xe6e6d91e, 0x9ae86ebc), TOBN(0x0564c83f, 0x8c9f1939),
+ TOBN(0x551932a2, 0x39560368), TOBN(0xe893752b, 0x049c28e2),
+ TOBN(0x0b03cee5, 0xa6a158c3), TOBN(0xe12d656b, 0x04964263),
+ TOBN(0x4b47554e, 0x63e3bc1d), TOBN(0xc719b6a2, 0x45044ff7),
+ TOBN(0x4f24d30a, 0xe48daa07), TOBN(0xa3f37556, 0xc8c1edc3),
+ TOBN(0x9a47bf76, 0x0700d360), TOBN(0xbb1a1824, 0x822ae4e2),
+ TOBN(0x22e275a3, 0x89f1fb4c), TOBN(0x72b1aa23, 0x9968c5f5),
+ TOBN(0xa75feaca, 0xbe063f64), TOBN(0x9b392f43, 0xbce47a09),
+ TOBN(0xd4241509, 0x1ad07aca), TOBN(0x4b0c591b, 0x8d26cd0f),
+ TOBN(0x2d42ddfd, 0x92f1169a), TOBN(0x63aeb1ac, 0x4cbf2392),
+ TOBN(0x1de9e877, 0x0691a2af), TOBN(0xebe79af7, 0xd98021da),
+ TOBN(0xcfdf2a4e, 0x40e50acf), TOBN(0xf0a98ad7, 0xaf01d665),
+ TOBN(0xefb640bf, 0x1831be1f), TOBN(0x6fe8bd2f, 0x80e9ada0),
+ TOBN(0x94c103a1, 0x6cafbc91), TOBN(0x170f8759, 0x8308e08c),
+ TOBN(0x5de2d2ab, 0x9780ff4f), TOBN(0x666466bc, 0x45b201f2),
+ TOBN(0x58af2010, 0xf5b343bc), TOBN(0x0f2e400a, 0xf2f142fe),
+ TOBN(0x3483bfde, 0xa85f4bdf), TOBN(0xf0b1d093, 0x03bfeaa9),
+ TOBN(0x2ea01b95, 0xc7081603), TOBN(0xe943e4c9, 0x3dba1097),
+ TOBN(0x47be92ad, 0xb438f3a6), TOBN(0x00bb7742, 0xe5bf6636),
+ TOBN(0x136b7083, 0x824297b4), TOBN(0x9d0e5580, 0x5584455f),
+ TOBN(0xab48cedc, 0xf1c7d69e), TOBN(0x53a9e481, 0x2a256e76),
+ TOBN(0x0402b0e0, 0x65eb2413), TOBN(0xdadbbb84, 0x8fc407a7),
+ TOBN(0xa65cd5a4, 0x8d7f5492), TOBN(0x21d44293, 0x74bae294),
+ TOBN(0x66917ce6, 0x3b5f1cc4), TOBN(0x37ae52ea, 0xce872e62),
+ TOBN(0xbb087b72, 0x2905f244), TOBN(0x12077086, 0x1e6af74f),
+ TOBN(0x4b644e49, 0x1058edea), TOBN(0x827510e3, 0xb638ca1d),
+ TOBN(0x8cf2b704, 0x6038591c), TOBN(0xffc8b47a, 0xfe635063),
+ TOBN(0x3ae220e6, 0x1b4d5e63), TOBN(0xbd864742, 0x9d961b4b),
+ TOBN(0x610c107e, 0x9bd16bed), TOBN(0x4270352a, 0x1127147b),
+ TOBN(0x7d17ffe6, 0x64cfc50e), TOBN(0x50dee01a, 0x1e36cb42),
+ TOBN(0x068a7622, 0x35dc5f9a), TOBN(0x9a08d536, 0xdf53f62c),
+ TOBN(0x4ed71457, 0x6be5f7de), TOBN(0xd93006f8, 0xc2263c9e),
+ TOBN(0xe073694c, 0xcacacb36), TOBN(0x2ff7a5b4, 0x3ae118ab),
+ TOBN(0x3cce53f1, 0xcd871236), TOBN(0xf156a39d, 0xc2aa6d52),
+ TOBN(0x9cc5f271, 0xb198d76d), TOBN(0xbc615b6f, 0x81383d39),
+ TOBN(0xa54538e8, 0xde3eee6b), TOBN(0x58c77538, 0xab910d91),
+ TOBN(0x31e5bdbc, 0x58d278bd), TOBN(0x3cde4adf, 0xb963acae),
+ TOBN(0xb1881fd2, 0x5302169c), TOBN(0x8ca60fa0, 0xa989ed8b),
+ TOBN(0xa1999458, 0xff96a0ee), TOBN(0xc1141f03, 0xac6c283d),
+ TOBN(0x7677408d, 0x6dfafed3), TOBN(0x33a01653, 0x39661588),
+ TOBN(0x3c9c15ec, 0x0b726fa0), TOBN(0x090cfd93, 0x6c9b56da),
+ TOBN(0xe34f4bae, 0xa3c40af5), TOBN(0x3469eadb, 0xd21129f1),
+ TOBN(0xcc51674a, 0x1e207ce8), TOBN(0x1e293b24, 0xc83b1ef9),
+ TOBN(0x17173d13, 0x1e6c0bb4), TOBN(0x19004695, 0x90776d35),
+ TOBN(0xe7980e34, 0x6de6f922), TOBN(0x873554cb, 0xf4dd9a22),
+ TOBN(0x0316c627, 0xcbf18a51), TOBN(0x4d93651b, 0x3032c081),
+ TOBN(0x207f2771, 0x3946834d), TOBN(0x2c08d7b4, 0x30cdbf80),
+ TOBN(0x137a4fb4, 0x86df2a61), TOBN(0xa1ed9c07, 0xecf7b4a2),
+ TOBN(0xb2e460e2, 0x7bd042ff), TOBN(0xb7f5e2fa, 0x5f62f5ec),
+ TOBN(0x7aa6ec6b, 0xcc2423b7), TOBN(0x75ce0a7f, 0xba63eea7),
+ TOBN(0x67a45fb1, 0xf250a6e1), TOBN(0x93bc919c, 0xe53cdc9f),
+ TOBN(0x9271f56f, 0x871942df), TOBN(0x2372ff6f, 0x7859ad66),
+ TOBN(0x5f4c2b96, 0x33cb1a78), TOBN(0xe3e29101, 0x5838aa83),
+ TOBN(0xa7ed1611, 0xe4e8110c), TOBN(0x2a2d70d5, 0x330198ce),
+ TOBN(0xbdf132e8, 0x6720efe0), TOBN(0xe61a8962, 0x66a471bf),
+ TOBN(0x796d3a85, 0x825808bd), TOBN(0x51dc3cb7, 0x3fd6e902),
+ TOBN(0x643c768a, 0x916219d1), TOBN(0x36cd7685, 0xa2ad7d32),
+ TOBN(0xe3db9d05, 0xb22922a4), TOBN(0x6494c87e, 0xdba29660),
+ TOBN(0xf0ac91df, 0xbcd2ebc7), TOBN(0x4deb57a0, 0x45107f8d),
+ TOBN(0x42271f59, 0xc3d12a73), TOBN(0x5f71687c, 0xa5c2c51d),
+ TOBN(0xcb1f50c6, 0x05797bcb), TOBN(0x29ed0ed9, 0xd6d34eb0),
+ TOBN(0xe5fe5b47, 0x4683c2eb), TOBN(0x4956eeb5, 0x97447c46),
+ TOBN(0x5b163a43, 0x71207167), TOBN(0x93fa2fed, 0x0248c5ef),
+ TOBN(0x67930af2, 0x31f63950), TOBN(0xa77797c1, 0x14caa2c9),
+ TOBN(0x526e80ee, 0x27ac7e62), TOBN(0xe1e6e626, 0x58b28aec),
+ TOBN(0x636178b0, 0xb3c9fef0), TOBN(0xaf7752e0, 0x6d5f90be),
+ TOBN(0x94ecaf18, 0xeece51cf), TOBN(0x2864d0ed, 0xca806e1f),
+ TOBN(0x6de2e383, 0x97c69134), TOBN(0x5a42c316, 0xeb291293),
+ TOBN(0xc7779219, 0x6a60bae0), TOBN(0xa24de346, 0x6b7599d1),
+ TOBN(0x49d374aa, 0xb75d4941), TOBN(0x98900586, 0x2d501ff0),
+ TOBN(0x9f16d40e, 0xeb7974cf), TOBN(0x1033860b, 0xcdd8c115),
+ TOBN(0xb6c69ac8, 0x2094cec3), TOBN(0x9976fb88, 0x403b770c),
+ TOBN(0x1dea026c, 0x4859590d), TOBN(0xb6acbb46, 0x8562d1fd),
+ TOBN(0x7cd6c461, 0x44569d85), TOBN(0xc3190a36, 0x97f0891d),
+ TOBN(0xc6f53195, 0x48d5a17d), TOBN(0x7d919966, 0xd749abc8),
+ TOBN(0x65104837, 0xdd1c8a20), TOBN(0x7e5410c8, 0x2f683419),
+ TOBN(0x958c3ca8, 0xbe94022e), TOBN(0x605c3197, 0x6145dac2),
+ TOBN(0x3fc07501, 0x01683d54), TOBN(0x1d7127c5, 0x595b1234),
+ TOBN(0x10b8f87c, 0x9481277f), TOBN(0x677db2a8, 0xe65a1adb),
+ TOBN(0xec2fccaa, 0xddce3345), TOBN(0x2a6811b7, 0x012a4350),
+ TOBN(0x96760ff1, 0xac598bdc), TOBN(0x054d652a, 0xd1bf4128),
+ TOBN(0x0a1151d4, 0x92a21005), TOBN(0xad7f3971, 0x33110fdf),
+ TOBN(0x8c95928c, 0x1960100f), TOBN(0x6c91c825, 0x7bf03362),
+ TOBN(0xc8c8b2a2, 0xce309f06), TOBN(0xfdb27b59, 0xca27204b),
+ TOBN(0xd223eaa5, 0x0848e32e), TOBN(0xb93e4b2e, 0xe7bfaf1e),
+ TOBN(0xc5308ae6, 0x44aa3ded), TOBN(0x317a666a, 0xc015d573),
+ TOBN(0xc888ce23, 0x1a979707), TOBN(0xf141c1e6, 0x0d5c4958),
+ TOBN(0xb53b7de5, 0x61906373), TOBN(0x858dbade, 0xeb999595),
+ TOBN(0x8cbb47b2, 0xa59e5c36), TOBN(0x660318b3, 0xdcf4e842),
+ TOBN(0xbd161ccd, 0x12ba4b7a), TOBN(0xf399daab, 0xf8c8282a),
+ TOBN(0x1587633a, 0xeeb2130d), TOBN(0xa465311a, 0xda38dd7d),
+ TOBN(0x5f75eec8, 0x64d3779b), TOBN(0x3c5d0476, 0xad64c171),
+ TOBN(0x87410371, 0x2a914428), TOBN(0x8096a891, 0x90e2fc29),
+ TOBN(0xd3d2ae9d, 0x23b3ebc2), TOBN(0x90bdd6db, 0xa580cfd6),
+ TOBN(0x52dbb7f3, 0xc5b01f6c), TOBN(0xe68eded4, 0xe102a2dc),
+ TOBN(0x17785b77, 0x99eb6df0), TOBN(0x26c3cc51, 0x7386b779),
+ TOBN(0x345ed988, 0x6417a48e), TOBN(0xe990b4e4, 0x07d6ef31),
+ TOBN(0x0f456b7e, 0x2586abba), TOBN(0x239ca6a5, 0x59c96e9a),
+ TOBN(0xe327459c, 0xe2eb4206), TOBN(0x3a4c3313, 0xa002b90a),
+ TOBN(0x2a114806, 0xf6a3f6fb), TOBN(0xad5cad2f, 0x85c251dd),
+ TOBN(0x92c1f613, 0xf5a784d3), TOBN(0xec7bfacf, 0x349766d5),
+ TOBN(0x04b3cd33, 0x3e23cb3b), TOBN(0x3979fe84, 0xc5a64b2d),
+ TOBN(0x192e2720, 0x7e589106), TOBN(0xa60c43d1, 0xa15b527f),
+ TOBN(0x2dae9082, 0xbe7cf3a6), TOBN(0xcc86ba92, 0xbc967274),
+ TOBN(0xf28a2ce8, 0xaea0a8a9), TOBN(0x404ca6d9, 0x6ee988b3),
+ TOBN(0xfd7e9c5d, 0x005921b8), TOBN(0xf56297f1, 0x44e79bf9),
+ TOBN(0xa163b460, 0x0d75ddc2), TOBN(0x30b23616, 0xa1f2be87),
+ TOBN(0x4b070d21, 0xbfe50e2b), TOBN(0x7ef8cfd0, 0xe1bfede1),
+ TOBN(0xadba0011, 0x2aac4ae0), TOBN(0x2a3e7d01, 0xb9ebd033),
+ TOBN(0x995277ec, 0xe38d9d1c), TOBN(0xb500249e, 0x9c5d2de3),
+ TOBN(0x8912b820, 0xf13ca8c9), TOBN(0xc8798114, 0x877793af),
+ TOBN(0x19e6125d, 0xec3f1dec), TOBN(0x07b1f040, 0x911178da),
+ TOBN(0xd93ededa, 0x904a6738), TOBN(0x55187a5a, 0x0bebedcd),
+ TOBN(0xf7d04722, 0xeb329d41), TOBN(0xf449099e, 0xf170b391),
+ TOBN(0xfd317a69, 0xca99f828), TOBN(0x50c3db2b, 0x34a4976d),
+ TOBN(0xe9ba7784, 0x3757b392), TOBN(0x326caefd, 0xaa3ca05a),
+ TOBN(0x78e5293b, 0xf1e593d4), TOBN(0x7842a937, 0x0d98fd13),
+ TOBN(0xe694bf96, 0x5f96b10d), TOBN(0x373a9df6, 0x06a8cd05),
+ TOBN(0x997d1e51, 0xe8f0c7fc), TOBN(0x1d019790, 0x63fd972e),
+ TOBN(0x0064d858, 0x5499fb32), TOBN(0x7b67bad9, 0x77a8aeb7),
+ TOBN(0x1d3eb977, 0x2d08eec5), TOBN(0x5fc047a6, 0xcbabae1d),
+ TOBN(0x0577d159, 0xe54a64bb), TOBN(0x8862201b, 0xc43497e4),
+ TOBN(0xad6b4e28, 0x2ce0608d), TOBN(0x8b687b7d, 0x0b167aac),
+ TOBN(0x6ed4d367, 0x8b2ecfa9), TOBN(0x24dfe62d, 0xa90c3c38),
+ TOBN(0xa1862e10, 0x3fe5c42b), TOBN(0x1ca73dca, 0xd5732a9f),
+ TOBN(0x35f038b7, 0x76bb87ad), TOBN(0x674976ab, 0xf242b81f),
+ TOBN(0x4f2bde7e, 0xb0fd90cd), TOBN(0x6efc172e, 0xa7fdf092),
+ TOBN(0x3806b69b, 0x92222f1f), TOBN(0x5a2459ca, 0x6cf7ae70),
+ TOBN(0x6789f69c, 0xa85217ee), TOBN(0x5f232b5e, 0xe3dc85ac),
+ TOBN(0x660e3ec5, 0x48e9e516), TOBN(0x124b4e47, 0x3197eb31),
+ TOBN(0x10a0cb13, 0xaafcca23), TOBN(0x7bd63ba4, 0x8213224f),
+ TOBN(0xaffad7cc, 0x290a7f4f), TOBN(0x6b409c9e, 0x0286b461),
+ TOBN(0x58ab809f, 0xffa407af), TOBN(0xc3122eed, 0xc68ac073),
+ TOBN(0x17bf9e50, 0x4ef24d7e), TOBN(0x5d929794, 0x3e2a5811),
+ TOBN(0x519bc867, 0x02902e01), TOBN(0x76bba5da, 0x39c8a851),
+ TOBN(0xe9f9669c, 0xda94951e), TOBN(0x4b6af58d, 0x66b8d418),
+ TOBN(0xfa321074, 0x17d426a4), TOBN(0xc78e66a9, 0x9dde6027),
+ TOBN(0x0516c083, 0x4a53b964), TOBN(0xfc659d38, 0xff602330),
+ TOBN(0x0ab55e5c, 0x58c5c897), TOBN(0x985099b2, 0x838bc5df),
+ TOBN(0x061d9efc, 0xc52fc238), TOBN(0x712b2728, 0x6ac1da3f),
+ TOBN(0xfb658149, 0x9283fe08), TOBN(0x4954ac94, 0xb8aaa2f7),
+ TOBN(0x85c0ada4, 0x7fb2e74f), TOBN(0xee8ba98e, 0xb89926b0),
+ TOBN(0xe4f9d37d, 0x23d1af5b), TOBN(0x14ccdbf9, 0xba9b015e),
+ TOBN(0xb674481b, 0x7bfe7178), TOBN(0x4e1debae, 0x65405868),
+ TOBN(0x061b2821, 0xc48c867d), TOBN(0x69c15b35, 0x513b30ea),
+ TOBN(0x3b4a1666, 0x36871088), TOBN(0xe5e29f5d, 0x1220b1ff),
+ TOBN(0x4b82bb35, 0x233d9f4d), TOBN(0x4e076333, 0x18cdc675) },
+ { TOBN(0x0d53f5c7, 0xa3e6fced), TOBN(0xe8cbbdd5, 0xf45fbdeb),
+ TOBN(0xf85c01df, 0x13339a70), TOBN(0x0ff71880, 0x142ceb81),
+ TOBN(0x4c4e8774, 0xbd70437a), TOBN(0x5fb32891, 0xba0bda6a),
+ TOBN(0x1cdbebd2, 0xf18bd26e), TOBN(0x2f9526f1, 0x03a9d522),
+ TOBN(0x40ce3051, 0x92c4d684), TOBN(0x8b04d725, 0x7612efcd),
+ TOBN(0xb9dcda36, 0x6f9cae20), TOBN(0x0edc4d24, 0xf058856c),
+ TOBN(0x64f2e6bf, 0x85427900), TOBN(0x3de81295, 0xdc09dfea),
+ TOBN(0xd41b4487, 0x379bf26c), TOBN(0x50b62c6d, 0x6df135a9),
+ TOBN(0xd4f8e3b4, 0xc72dfe67), TOBN(0xc416b0f6, 0x90e19fdf),
+ TOBN(0x18b9098d, 0x4c13bd35), TOBN(0xac11118a, 0x15b8cb9e),
+ TOBN(0xf598a318, 0xf0062841), TOBN(0xbfe0602f, 0x89f356f4),
+ TOBN(0x7ae3637e, 0x30177a0c), TOBN(0x34097747, 0x61136537),
+ TOBN(0x0db2fb5e, 0xd005832a), TOBN(0x5f5efd3b, 0x91042e4f),
+ TOBN(0x8c4ffdc6, 0xed70f8ca), TOBN(0xe4645d0b, 0xb52da9cc),
+ TOBN(0x9596f58b, 0xc9001d1f), TOBN(0x52c8f0bc, 0x4e117205),
+ TOBN(0xfd4aa0d2, 0xe398a084), TOBN(0x815bfe3a, 0x104f49de),
+ TOBN(0x97e5443f, 0x23885e5f), TOBN(0xf72f8f99, 0xe8433aab),
+ TOBN(0xbd00b154, 0xe4d4e604), TOBN(0xd0b35e6a, 0xe5e173ff),
+ TOBN(0x57b2a048, 0x9164722d), TOBN(0x3e3c665b, 0x88761ec8),
+ TOBN(0x6bdd1397, 0x3da83832), TOBN(0x3c8b1a1e, 0x73dafe3b),
+ TOBN(0x4497ace6, 0x54317cac), TOBN(0xbe600ab9, 0x521771b3),
+ TOBN(0xb42e409e, 0xb0dfe8b8), TOBN(0x386a67d7, 0x3942310f),
+ TOBN(0x25548d8d, 0x4431cc28), TOBN(0xa7cff142, 0x985dc524),
+ TOBN(0x4d60f5a1, 0x93c4be32), TOBN(0x83ebd5c8, 0xd071c6e1),
+ TOBN(0xba3a80a7, 0xb1fd2b0b), TOBN(0x9b3ad396, 0x5bec33e8),
+ TOBN(0xb3868d61, 0x79743fb3), TOBN(0xcfd169fc, 0xfdb462fa),
+ TOBN(0xd3b499d7, 0x9ce0a6af), TOBN(0x55dc1cf1, 0xe42d3ff8),
+ TOBN(0x04fb9e6c, 0xc6c3e1b2), TOBN(0x47e6961d, 0x6f69a474),
+ TOBN(0x54eb3acc, 0xe548b37b), TOBN(0xb38e7542, 0x84d40549),
+ TOBN(0x8c3daa51, 0x7b341b4f), TOBN(0x2f6928ec, 0x690bf7fa),
+ TOBN(0x0496b323, 0x86ce6c41), TOBN(0x01be1c55, 0x10adadcd),
+ TOBN(0xc04e67e7, 0x4bb5faf9), TOBN(0x3cbaf678, 0xe15c9985),
+ TOBN(0x8cd12145, 0x50ca4247), TOBN(0xba1aa47a, 0xe7dd30aa),
+ TOBN(0x2f81ddf1, 0xe58fee24), TOBN(0x03452936, 0xeec9b0e8),
+ TOBN(0x8bdc3b81, 0x243aea96), TOBN(0x9a2919af, 0x15c3d0e5),
+ TOBN(0x9ea640ec, 0x10948361), TOBN(0x5ac86d5b, 0x6e0bcccf),
+ TOBN(0xf892d918, 0xc36cf440), TOBN(0xaed3e837, 0xc939719c),
+ TOBN(0xb07b08d2, 0xc0218b64), TOBN(0x6f1bcbba, 0xce9790dd),
+ TOBN(0x4a84d6ed, 0x60919b8e), TOBN(0xd8900791, 0x8ac1f9eb),
+ TOBN(0xf84941aa, 0x0dd5daef), TOBN(0xb22fe40a, 0x67fd62c5),
+ TOBN(0x97e15ba2, 0x157f2db3), TOBN(0xbda2fc8f, 0x8e28ca9c),
+ TOBN(0x5d050da4, 0x37b9f454), TOBN(0x3d57eb57, 0x2379d72e),
+ TOBN(0xe9b5eba2, 0xfb5ee997), TOBN(0x01648ca2, 0xe11538ca),
+ TOBN(0x32bb76f6, 0xf6327974), TOBN(0x338f14b8, 0xff3f4bb7),
+ TOBN(0x524d226a, 0xd7ab9a2d), TOBN(0x9c00090d, 0x7dfae958),
+ TOBN(0x0ba5f539, 0x8751d8c2), TOBN(0x8afcbcdd, 0x3ab8262d),
+ TOBN(0x57392729, 0xe99d043b), TOBN(0xef51263b, 0xaebc943a),
+ TOBN(0x9feace93, 0x20862935), TOBN(0x639efc03, 0xb06c817b),
+ TOBN(0x1fe054b3, 0x66b4be7a), TOBN(0x3f25a9de, 0x84a37a1e),
+ TOBN(0xf39ef1ad, 0x78d75cd9), TOBN(0xd7b58f49, 0x5062c1b5),
+ TOBN(0x6f74f9a9, 0xff563436), TOBN(0xf718ff29, 0xe8af51e7),
+ TOBN(0x5234d313, 0x15e97fec), TOBN(0xb6a8e2b1, 0x292f1c0a),
+ TOBN(0xa7f53aa8, 0x327720c1), TOBN(0x956ca322, 0xba092cc8),
+ TOBN(0x8f03d64a, 0x28746c4d), TOBN(0x51fe1782, 0x66d0d392),
+ TOBN(0xd19b34db, 0x3c832c80), TOBN(0x60dccc5c, 0x6da2e3b4),
+ TOBN(0x245dd62e, 0x0a104ccc), TOBN(0xa7ab1de1, 0x620b21fd),
+ TOBN(0xb293ae0b, 0x3893d123), TOBN(0xf7b75783, 0xb15ee71c),
+ TOBN(0x5aa3c614, 0x42a9468b), TOBN(0xd686123c, 0xdb15d744),
+ TOBN(0x8c616891, 0xa7ab4116), TOBN(0x6fcd72c8, 0xa4e6a459),
+ TOBN(0xac219110, 0x77e5fad7), TOBN(0xfb6a20e7, 0x704fa46b),
+ TOBN(0xe839be7d, 0x341d81dc), TOBN(0xcddb6889, 0x32148379),
+ TOBN(0xda6211a1, 0xf7026ead), TOBN(0xf3b2575f, 0xf4d1cc5e),
+ TOBN(0x40cfc8f6, 0xa7a73ae6), TOBN(0x83879a5e, 0x61d5b483),
+ TOBN(0xc5acb1ed, 0x41a50ebc), TOBN(0x59a60cc8, 0x3c07d8fa),
+ TOBN(0x1b73bdce, 0xb1876262), TOBN(0x2b0d79f0, 0x12af4ee9),
+ TOBN(0x8bcf3b0b, 0xd46e1d07), TOBN(0x17d6af9d, 0xe45d152f),
+ TOBN(0x73520461, 0x6d736451), TOBN(0x43cbbd97, 0x56b0bf5a),
+ TOBN(0xb0833a5b, 0xd5999b9d), TOBN(0x702614f0, 0xeb72e398),
+ TOBN(0x0aadf01a, 0x59c3e9f8), TOBN(0x40200e77, 0xce6b3d16),
+ TOBN(0xda22bdd3, 0xdeddafad), TOBN(0x76dedaf4, 0x310d72e1),
+ TOBN(0x49ef807c, 0x4bc2e88f), TOBN(0x6ba81291, 0x146dd5a5),
+ TOBN(0xa1a4077a, 0x7d8d59e9), TOBN(0x87b6a2e7, 0x802db349),
+ TOBN(0xd5679997, 0x1b4e598e), TOBN(0xf499ef1f, 0x06fe4b1d),
+ TOBN(0x3978d3ae, 0xfcb267c5), TOBN(0xb582b557, 0x235786d0),
+ TOBN(0x32b3b2ca, 0x1715cb07), TOBN(0x4c3de6a2, 0x8480241d),
+ TOBN(0x63b5ffed, 0xcb571ecd), TOBN(0xeaf53900, 0xed2fe9a9),
+ TOBN(0xdec98d4a, 0xc3b81990), TOBN(0x1cb83722, 0x9e0cc8fe),
+ TOBN(0xfe0b0491, 0xd2b427b9), TOBN(0x0f2386ac, 0xe983a66c),
+ TOBN(0x930c4d1e, 0xb3291213), TOBN(0xa2f82b2e, 0x59a62ae4),
+ TOBN(0x77233853, 0xf93e89e3), TOBN(0x7f8063ac, 0x11777c7f),
+ TOBN(0xff0eb567, 0x59ad2877), TOBN(0x6f454642, 0x9865c754),
+ TOBN(0xe6fe701a, 0x236e9a84), TOBN(0xc586ef16, 0x06e40fc3),
+ TOBN(0x3f62b6e0, 0x24bafad9), TOBN(0xc8b42bd2, 0x64da906a),
+ TOBN(0xc98e1eb4, 0xda3276a0), TOBN(0x30d0e5fc, 0x06cbf852),
+ TOBN(0x1b6b2ae1, 0xe8b4dfd4), TOBN(0xd754d5c7, 0x8301cbac),
+ TOBN(0x66097629, 0x112a39ac), TOBN(0xf86b5999, 0x93ba4ab9),
+ TOBN(0x26c9dea7, 0x99f9d581), TOBN(0x0473b1a8, 0xc2fafeaa),
+ TOBN(0x1469af55, 0x3b2505a5), TOBN(0x227d16d7, 0xd6a43323),
+ TOBN(0x3316f73c, 0xad3d97f9), TOBN(0x52bf3bb5, 0x1f137455),
+ TOBN(0x953eafeb, 0x09954e7c), TOBN(0xa721dfed, 0xdd732411),
+ TOBN(0xb4929821, 0x141d4579), TOBN(0x3411321c, 0xaa3bd435),
+ TOBN(0xafb355aa, 0x17fa6015), TOBN(0xb4e7ef4a, 0x18e42f0e),
+ TOBN(0x604ac97c, 0x59371000), TOBN(0xe1c48c70, 0x7f759c18),
+ TOBN(0x3f62ecc5, 0xa5db6b65), TOBN(0x0a78b173, 0x38a21495),
+ TOBN(0x6be1819d, 0xbcc8ad94), TOBN(0x70dc04f6, 0xd89c3400),
+ TOBN(0x462557b4, 0xa6b4840a), TOBN(0x544c6ade, 0x60bd21c0),
+ TOBN(0x6a00f24e, 0x907a544b), TOBN(0xa7520dcb, 0x313da210),
+ TOBN(0xfe939b75, 0x11e4994b), TOBN(0x918b6ba6, 0xbc275d70),
+ TOBN(0xd3e5e0fc, 0x644be892), TOBN(0x707a9816, 0xfdaf6c42),
+ TOBN(0x60145567, 0xf15c13fe), TOBN(0x4818ebaa, 0xe130a54a),
+ TOBN(0x28aad3ad, 0x58d2f767), TOBN(0xdc5267fd, 0xd7e7c773),
+ TOBN(0x4919cc88, 0xc3afcc98), TOBN(0xaa2e6ab0, 0x2db8cd4b),
+ TOBN(0xd46fec04, 0xd0c63eaa), TOBN(0xa1cb92c5, 0x19ffa832),
+ TOBN(0x678dd178, 0xe43a631f), TOBN(0xfb5ae1cd, 0x3dc788b3),
+ TOBN(0x68b4fb90, 0x6e77de04), TOBN(0x7992bcf0, 0xf06dbb97),
+ TOBN(0x896e6a13, 0xc417c01d), TOBN(0x8d96332c, 0xb956be01),
+ TOBN(0x902fc93a, 0x413aa2b9), TOBN(0x99a4d915, 0xfc98c8a5),
+ TOBN(0x52c29407, 0x565f1137), TOBN(0x4072690f, 0x21e4f281),
+ TOBN(0x36e607cf, 0x02ff6072), TOBN(0xa47d2ca9, 0x8ad98cdc),
+ TOBN(0xbf471d1e, 0xf5f56609), TOBN(0xbcf86623, 0xf264ada0),
+ TOBN(0xb70c0687, 0xaa9e5cb6), TOBN(0xc98124f2, 0x17401c6c),
+ TOBN(0x8189635f, 0xd4a61435), TOBN(0xd28fb8af, 0xa9d98ea6),
+ TOBN(0xb9a67c2a, 0x40c251f8), TOBN(0x88cd5d87, 0xa2da44be),
+ TOBN(0x437deb96, 0xe09b5423), TOBN(0x150467db, 0x64287dc1),
+ TOBN(0xe161debb, 0xcdabb839), TOBN(0xa79e9742, 0xf1839a3e),
+ TOBN(0xbb8dd3c2, 0x652d202b), TOBN(0x7b3e67f7, 0xe9f97d96),
+ TOBN(0x5aa5d78f, 0xb1cb6ac9), TOBN(0xffa13e8e, 0xca1d0d45),
+ TOBN(0x369295dd, 0x2ba5bf95), TOBN(0xd68bd1f8, 0x39aff05e),
+ TOBN(0xaf0d86f9, 0x26d783f2), TOBN(0x543a59b3, 0xfc3aafc1),
+ TOBN(0x3fcf81d2, 0x7b7da97c), TOBN(0xc990a056, 0xd25dee46),
+ TOBN(0x3e6775b8, 0x519cce2c), TOBN(0xfc9af71f, 0xae13d863),
+ TOBN(0x774a4a6f, 0x47c1605c), TOBN(0x46ba4245, 0x2fd205e8),
+ TOBN(0xa06feea4, 0xd3fd524d), TOBN(0x1e724641, 0x6de1acc2),
+ TOBN(0xf53816f1, 0x334e2b42), TOBN(0x49e5918e, 0x922f0024),
+ TOBN(0x439530b6, 0x65c7322d), TOBN(0xcf12cc01, 0xb3c1b3fb),
+ TOBN(0xc70b0186, 0x0172f685), TOBN(0xb915ee22, 0x1b58391d),
+ TOBN(0x9afdf03b, 0xa317db24), TOBN(0x87dec659, 0x17b8ffc4),
+ TOBN(0x7f46597b, 0xe4d3d050), TOBN(0x80a1c1ed, 0x006500e7),
+ TOBN(0x84902a96, 0x78bf030e), TOBN(0xfb5e9c9a, 0x50560148),
+ TOBN(0x6dae0a92, 0x63362426), TOBN(0xdcaeecf4, 0xa9e30c40),
+ TOBN(0xc0d887bb, 0x518d0c6b), TOBN(0x99181152, 0xcb985b9d),
+ TOBN(0xad186898, 0xef7bc381), TOBN(0x18168ffb, 0x9ee46201),
+ TOBN(0x9a04cdaa, 0x2502753c), TOBN(0xbb279e26, 0x51407c41),
+ TOBN(0xeacb03aa, 0xf23564e5), TOBN(0x18336582, 0x71e61016),
+ TOBN(0x8684b8c4, 0xeb809877), TOBN(0xb336e18d, 0xea0e672e),
+ TOBN(0xefb601f0, 0x34ee5867), TOBN(0x2733edbe, 0x1341cfd1),
+ TOBN(0xb15e809a, 0x26025c3c), TOBN(0xe6e981a6, 0x9350df88),
+ TOBN(0x92376237, 0x8502fd8e), TOBN(0x4791f216, 0x0c12be9b),
+ TOBN(0xb7256789, 0x25f02425), TOBN(0xec863194, 0x7a974443),
+ TOBN(0x7c0ce882, 0xfb41cc52), TOBN(0xc266ff7e, 0xf25c07f2),
+ TOBN(0x3d4da8c3, 0x017025f3), TOBN(0xefcf628c, 0xfb9579b4),
+ TOBN(0x5c4d0016, 0x1f3716ec), TOBN(0x9c27ebc4, 0x6801116e),
+ TOBN(0x5eba0ea1, 0x1da1767e), TOBN(0xfe151452, 0x47004c57),
+ TOBN(0x3ace6df6, 0x8c2373b7), TOBN(0x75c3dffe, 0x5dbc37ac),
+ TOBN(0x3dc32a73, 0xddc925fc), TOBN(0xb679c841, 0x2f65ee0b),
+ TOBN(0x715a3295, 0x451cbfeb), TOBN(0xd9889768, 0xf76e9a29),
+ TOBN(0xec20ce7f, 0xb28ad247), TOBN(0xe99146c4, 0x00894d79),
+ TOBN(0x71457d7c, 0x9f5e3ea7), TOBN(0x097b2662, 0x38030031),
+ TOBN(0xdb7f6ae6, 0xcf9f82a8), TOBN(0x319decb9, 0x438f473a),
+ TOBN(0xa63ab386, 0x283856c3), TOBN(0x13e3172f, 0xb06a361b),
+ TOBN(0x2959f8dc, 0x7d5a006c), TOBN(0x2dbc27c6, 0x75fba752),
+ TOBN(0xc1227ab2, 0x87c22c9e), TOBN(0x06f61f75, 0x71a268b2),
+ TOBN(0x1b6bb971, 0x04779ce2), TOBN(0xaca83812, 0x0aadcb1d),
+ TOBN(0x297ae0bc, 0xaeaab2d5), TOBN(0xa5c14ee7, 0x5bfb9f13),
+ TOBN(0xaa00c583, 0xf17a62c7), TOBN(0x39eb962c, 0x173759f6),
+ TOBN(0x1eeba1d4, 0x86c9a88f), TOBN(0x0ab6c37a, 0xdf016c5e),
+ TOBN(0xa2a147db, 0xa28a0749), TOBN(0x246c20d6, 0xee519165),
+ TOBN(0x5068d1b1, 0xd3810715), TOBN(0xb1e7018c, 0x748160b9),
+ TOBN(0x03f5b1fa, 0xf380ff62), TOBN(0xef7fb1dd, 0xf3cb2c1e),
+ TOBN(0xeab539a8, 0xfc91a7da), TOBN(0x83ddb707, 0xf3f9b561),
+ TOBN(0xc550e211, 0xfe7df7a4), TOBN(0xa7cd07f2, 0x063f6f40),
+ TOBN(0xb0de3635, 0x2976879c), TOBN(0xb5f83f85, 0xe55741da),
+ TOBN(0x4ea9d25e, 0xf3d8ac3d), TOBN(0x6fe2066f, 0x62819f02),
+ TOBN(0x4ab2b9c2, 0xcef4a564), TOBN(0x1e155d96, 0x5ffa2de3),
+ TOBN(0x0eb0a19b, 0xc3a72d00), TOBN(0x4037665b, 0x8513c31b),
+ TOBN(0x2fb2b6bf, 0x04c64637), TOBN(0x45c34d6e, 0x08cdc639),
+ TOBN(0x56f1e10f, 0xf01fd796), TOBN(0x4dfb8101, 0xfe3667b8),
+ TOBN(0xe0eda253, 0x9021d0c0), TOBN(0x7a94e9ff, 0x8a06c6ab),
+ TOBN(0x2d3bb0d9, 0xbb9aa882), TOBN(0xea20e4e5, 0xec05fd10),
+ TOBN(0xed7eeb5f, 0x1a1ca64e), TOBN(0x2fa6b43c, 0xc6327cbd),
+ TOBN(0xb577e3cf, 0x3aa91121), TOBN(0x8c6bd5ea, 0x3a34079b),
+ TOBN(0xd7e5ba39, 0x60e02fc0), TOBN(0xf16dd2c3, 0x90141bf8),
+ TOBN(0xb57276d9, 0x80101b98), TOBN(0x760883fd, 0xb82f0f66),
+ TOBN(0x89d7de75, 0x4bc3eff3), TOBN(0x03b60643, 0x5dc2ab40),
+ TOBN(0xcd6e53df, 0xe05beeac), TOBN(0xf2f1e862, 0xbc3325cd),
+ TOBN(0xdd0f7921, 0x774f03c3), TOBN(0x97ca7221, 0x4552cc1b),
+ TOBN(0x5a0d6afe, 0x1cd19f72), TOBN(0xa20915dc, 0xf183fbeb),
+ TOBN(0x9fda4b40, 0x832c403c), TOBN(0x32738edd, 0xbe425442),
+ TOBN(0x469a1df6, 0xb5eccf1a), TOBN(0x4b5aff42, 0x28bbe1f0),
+ TOBN(0x31359d7f, 0x570dfc93), TOBN(0xa18be235, 0xf0088628),
+ TOBN(0xa5b30fba, 0xb00ed3a9), TOBN(0x34c61374, 0x73cdf8be),
+ TOBN(0x2c5c5f46, 0xabc56797), TOBN(0x5cecf93d, 0xb82a8ae2),
+ TOBN(0x7d3dbe41, 0xa968fbf0), TOBN(0xd23d4583, 0x1a5c7f3d),
+ TOBN(0xf28f69a0, 0xc087a9c7), TOBN(0xc2d75471, 0x474471ca),
+ TOBN(0x36ec9f4a, 0x4eb732ec), TOBN(0x6c943bbd, 0xb1ca6bed),
+ TOBN(0xd64535e1, 0xf2457892), TOBN(0x8b84a8ea, 0xf7e2ac06),
+ TOBN(0xe0936cd3, 0x2499dd5f), TOBN(0x12053d7e, 0x0ed04e57),
+ TOBN(0x4bdd0076, 0xe4305d9d), TOBN(0x34a527b9, 0x1f67f0a2),
+ TOBN(0xe79a4af0, 0x9cec46ea), TOBN(0xb15347a1, 0x658b9bc7),
+ TOBN(0x6bd2796f, 0x35af2f75), TOBN(0xac957990, 0x4051c435),
+ TOBN(0x2669dda3, 0xc33a655d), TOBN(0x5d503c2e, 0x88514aa3),
+ TOBN(0xdfa11337, 0x3753dd41), TOBN(0x3f054673, 0x0b754f78),
+ TOBN(0xbf185677, 0x496125bd), TOBN(0xfb0023c8, 0x3775006c),
+ TOBN(0xfa0f072f, 0x3a037899), TOBN(0x4222b6eb, 0x0e4aea57),
+ TOBN(0x3dde5e76, 0x7866d25a), TOBN(0xb6eb04f8, 0x4837aa6f),
+ TOBN(0x5315591a, 0x2cf1cdb8), TOBN(0x6dfb4f41, 0x2d4e683c),
+ TOBN(0x7e923ea4, 0x48ee1f3a), TOBN(0x9604d9f7, 0x05a2afd5),
+ TOBN(0xbe1d4a33, 0x40ea4948), TOBN(0x5b45f1f4, 0xb44cbd2f),
+ TOBN(0x5faf8376, 0x4acc757e), TOBN(0xa7cf9ab8, 0x63d68ff7),
+ TOBN(0x8ad62f69, 0xdf0e404b), TOBN(0xd65f33c2, 0x12bdafdf),
+ TOBN(0xc365de15, 0xa377b14e), TOBN(0x6bf5463b, 0x8e39f60c),
+ TOBN(0x62030d2d, 0x2ce68148), TOBN(0xd95867ef, 0xe6f843a8),
+ TOBN(0xd39a0244, 0xef5ab017), TOBN(0x0bd2d8c1, 0x4ab55d12),
+ TOBN(0xc9503db3, 0x41639169), TOBN(0x2d4e25b0, 0xf7660c8a),
+ TOBN(0x760cb3b5, 0xe224c5d7), TOBN(0xfa3baf8c, 0x68616919),
+ TOBN(0x9fbca113, 0x8d142552), TOBN(0x1ab18bf1, 0x7669ebf5),
+ TOBN(0x55e6f53e, 0x9bdf25dd), TOBN(0x04cc0bf3, 0xcb6cd154),
+ TOBN(0x595bef49, 0x95e89080), TOBN(0xfe9459a8, 0x104a9ac1),
+ TOBN(0xad2d89ca, 0xcce9bb32), TOBN(0xddea65e1, 0xf7de8285),
+ TOBN(0x62ed8c35, 0xb351bd4b), TOBN(0x4150ff36, 0x0c0e19a7),
+ TOBN(0x86e3c801, 0x345f4e47), TOBN(0x3bf21f71, 0x203a266c),
+ TOBN(0x7ae110d4, 0x855b1f13), TOBN(0x5d6aaf6a, 0x07262517),
+ TOBN(0x1e0f12e1, 0x813d28f1), TOBN(0x6000e11d, 0x7ad7a523),
+ TOBN(0xc7d8deef, 0xc744a17b), TOBN(0x1e990b48, 0x14c05a00),
+ TOBN(0x68fddaee, 0x93e976d5), TOBN(0x696241d1, 0x46610d63),
+ TOBN(0xb204e7c3, 0x893dda88), TOBN(0x8bccfa65, 0x6a3a6946),
+ TOBN(0xb59425b4, 0xc5cd1411), TOBN(0x701b4042, 0xff3658b1),
+ TOBN(0xe3e56bca, 0x4784cf93), TOBN(0x27de5f15, 0x8fe68d60),
+ TOBN(0x4ab9cfce, 0xf8d53f19), TOBN(0xddb10311, 0xa40a730d),
+ TOBN(0x6fa73cd1, 0x4eee0a8a), TOBN(0xfd548748, 0x5249719d),
+ TOBN(0x49d66316, 0xa8123ef0), TOBN(0x73c32db4, 0xe7f95438),
+ TOBN(0x2e2ed209, 0x0d9e7854), TOBN(0xf98a9329, 0x9d9f0507),
+ TOBN(0xc5d33cf6, 0x0c6aa20a), TOBN(0x9a32ba14, 0x75279bb2),
+ TOBN(0x7e3202cb, 0x774a7307), TOBN(0x64ed4bc4, 0xe8c42dbd),
+ TOBN(0xc20f1a06, 0xd4caed0d), TOBN(0xb8021407, 0x171d22b3),
+ TOBN(0xd426ca04, 0xd13268d7), TOBN(0x92377007, 0x25f4d126),
+ TOBN(0x4204cbc3, 0x71f21a85), TOBN(0x18461b7a, 0xf82369ba),
+ TOBN(0xc0c07d31, 0x3fc858f9), TOBN(0x5deb5a50, 0xe2bab569),
+ TOBN(0xd5959d46, 0xd5eea89e), TOBN(0xfdff8424, 0x08437f4b),
+ TOBN(0xf21071e4, 0x3cfe254f), TOBN(0x72417696, 0x95468321),
+ TOBN(0x5d8288b9, 0x102cae3e), TOBN(0x2d143e3d, 0xf1965dff),
+ TOBN(0x00c9a376, 0xa078d847), TOBN(0x6fc0da31, 0x26028731),
+ TOBN(0xa2baeadf, 0xe45083a2), TOBN(0x66bc7218, 0x5e5b4bcd),
+ TOBN(0x2c826442, 0xd04b8e7f), TOBN(0xc19f5451, 0x6c4b586b),
+ TOBN(0x60182c49, 0x5b7eeed5), TOBN(0xd9954ecd, 0x7aa9dfa1),
+ TOBN(0xa403a8ec, 0xc73884ad), TOBN(0x7fb17de2, 0x9bb39041),
+ TOBN(0x694b64c5, 0xabb020e8), TOBN(0x3d18c184, 0x19c4eec7),
+ TOBN(0x9c4673ef, 0x1c4793e5), TOBN(0xc7b8aeb5, 0x056092e6),
+ TOBN(0x3aa1ca43, 0xf0f8c16b), TOBN(0x224ed5ec, 0xd679b2f6),
+ TOBN(0x0d56eeaf, 0x55a205c9), TOBN(0xbfe115ba, 0x4b8e028b),
+ TOBN(0x97e60849, 0x3927f4fe), TOBN(0xf91fbf94, 0x759aa7c5),
+ TOBN(0x985af769, 0x6be90a51), TOBN(0xc1277b78, 0x78ccb823),
+ TOBN(0x395b656e, 0xe7a75952), TOBN(0x00df7de0, 0x928da5f5),
+ TOBN(0x09c23175, 0x4ca4454f), TOBN(0x4ec971f4, 0x7aa2d3c1),
+ TOBN(0x45c3c507, 0xe75d9ccc), TOBN(0x63b7be8a, 0x3dc90306),
+ TOBN(0x37e09c66, 0x5db44bdc), TOBN(0x50d60da1, 0x6841c6a2),
+ TOBN(0x6f9b65ee, 0x08df1b12), TOBN(0x38734879, 0x7ff089df),
+ TOBN(0x9c331a66, 0x3fe8013d), TOBN(0x017f5de9, 0x5f42fcc8),
+ TOBN(0x43077866, 0xe8e57567), TOBN(0xc9f781ce, 0xf9fcdb18),
+ TOBN(0x38131dda, 0x9b12e174), TOBN(0x25d84aa3, 0x8a03752a),
+ TOBN(0x45e09e09, 0x4d0c0ce2), TOBN(0x1564008b, 0x92bebba5),
+ TOBN(0xf7e8ad31, 0xa87284c7), TOBN(0xb7c4b46c, 0x97e7bbaa),
+ TOBN(0x3e22a7b3, 0x97acf4ec), TOBN(0x0426c400, 0x5ea8b640),
+ TOBN(0x5e3295a6, 0x4e969285), TOBN(0x22aabc59, 0xa6a45670),
+ TOBN(0xb929714c, 0x5f5942bc), TOBN(0x9a6168bd, 0xfa3182ed),
+ TOBN(0x2216a665, 0x104152ba), TOBN(0x46908d03, 0xb6926368) },
+ {
+ TOBN(0xa9f5d874, 0x5a1251fb),
+ TOBN(0x967747a8, 0xc72725c7),
+ TOBN(0x195c33e5, 0x31ffe89e),
+ TOBN(0x609d210f, 0xe964935e),
+ TOBN(0xcafd6ca8, 0x2fe12227),
+ TOBN(0xaf9b5b96, 0x0426469d),
+ TOBN(0x2e9ee04c, 0x5693183c),
+ TOBN(0x1084a333, 0xc8146fef),
+ TOBN(0x96649933, 0xaed1d1f7),
+ TOBN(0x566eaff3, 0x50563090),
+ TOBN(0x345057f0, 0xad2e39cf),
+ TOBN(0x148ff65b, 0x1f832124),
+ TOBN(0x042e89d4, 0xcf94cf0d),
+ TOBN(0x319bec84, 0x520c58b3),
+ TOBN(0x2a267626, 0x5361aa0d),
+ TOBN(0xc86fa302, 0x8fbc87ad),
+ TOBN(0xfc83d2ab, 0x5c8b06d5),
+ TOBN(0xb1a785a2, 0xfe4eac46),
+ TOBN(0xb99315bc, 0x846f7779),
+ TOBN(0xcf31d816, 0xef9ea505),
+ TOBN(0x2391fe6a, 0x15d7dc85),
+ TOBN(0x2f132b04, 0xb4016b33),
+ TOBN(0x29547fe3, 0x181cb4c7),
+ TOBN(0xdb66d8a6, 0x650155a1),
+ TOBN(0x6b66d7e1, 0xadc1696f),
+ TOBN(0x98ebe593, 0x0acd72d0),
+ TOBN(0x65f24550, 0xcc1b7435),
+ TOBN(0xce231393, 0xb4b9a5ec),
+ TOBN(0x234a22d4, 0xdb067df9),
+ TOBN(0x98dda095, 0xcaff9b00),
+ TOBN(0x1bbc75a0, 0x6100c9c1),
+ TOBN(0x1560a9c8, 0x939cf695),
+ TOBN(0xcf006d3e, 0x99e0925f),
+ TOBN(0x2dd74a96, 0x6322375a),
+ TOBN(0xc58b446a, 0xb56af5ba),
+ TOBN(0x50292683, 0xe0b9b4f1),
+ TOBN(0xe2c34cb4, 0x1aeaffa3),
+ TOBN(0x8b17203f, 0x9b9587c1),
+ TOBN(0x6d559207, 0xead1350c),
+ TOBN(0x2b66a215, 0xfb7f9604),
+ TOBN(0x0850325e, 0xfe51bf74),
+ TOBN(0x9c4f579e, 0x5e460094),
+ TOBN(0x5c87b92a, 0x76da2f25),
+ TOBN(0x889de4e0, 0x6febef33),
+ TOBN(0x6900ec06, 0x646083ce),
+ TOBN(0xbe2a0335, 0xbfe12773),
+ TOBN(0xadd1da35, 0xc5344110),
+ TOBN(0x757568b7, 0xb802cd20),
+ TOBN(0x75559779, 0x00f7e6c8),
+ TOBN(0x38e8b94f, 0x0facd2f0),
+ TOBN(0xfea1f3af, 0x03fde375),
+ TOBN(0x5e11a1d8, 0x75881dfc),
+ TOBN(0xb3a6b02e, 0xc1e2f2ef),
+ TOBN(0x193d2bbb, 0xc605a6c5),
+ TOBN(0x325ffeee, 0x339a0b2d),
+ TOBN(0x27b6a724, 0x9e0c8846),
+ TOBN(0xe4050f1c, 0xf1c367ca),
+ TOBN(0x9bc85a9b, 0xc90fbc7d),
+ TOBN(0xa373c4a2, 0xe1a11032),
+ TOBN(0xb64232b7, 0xad0393a9),
+ TOBN(0xf5577eb0, 0x167dad29),
+ TOBN(0x1604f301, 0x94b78ab2),
+ TOBN(0x0baa94af, 0xe829348b),
+ TOBN(0x77fbd8dd, 0x41654342),
+ TOBN(0xdab50ea5, 0xb964e39a),
+ TOBN(0xd4c29e3c, 0xd0d3c76e),
+ TOBN(0x80dae67c, 0x56d11964),
+ TOBN(0x7307a8bf, 0xe5ffcc2f),
+ TOBN(0x65bbc1aa, 0x91708c3b),
+ TOBN(0xa151e62c, 0x28bf0eeb),
+ TOBN(0x6cb53381, 0x6fa34db7),
+ TOBN(0x5139e05c, 0xa29403a8),
+ TOBN(0x6ff651b4, 0x94a7cd2e),
+ TOBN(0x5671ffd1, 0x0699336c),
+ TOBN(0x6f5fd2cc, 0x979a896a),
+ TOBN(0x11e893a8, 0xd8148cef),
+ TOBN(0x988906a1, 0x65cf7b10),
+ TOBN(0x81b67178, 0xc50d8485),
+ TOBN(0x7c0deb35, 0x8a35b3de),
+ TOBN(0x423ac855, 0xc1d29799),
+ TOBN(0xaf580d87, 0xdac50b74),
+ TOBN(0x28b2b89f, 0x5869734c),
+ TOBN(0x99a3b936, 0x874e28fb),
+ TOBN(0xbb2c9190, 0x25f3f73a),
+ TOBN(0x199f6918, 0x84a9d5b7),
+ TOBN(0x7ebe2325, 0x7e770374),
+ TOBN(0xf442e107, 0x0738efe2),
+ TOBN(0xcf9f3f56, 0xcf9082d2),
+ TOBN(0x719f69e1, 0x09618708),
+ TOBN(0xcc9e8364, 0xc183f9b1),
+ TOBN(0xec203a95, 0x366a21af),
+ TOBN(0x6aec5d6d, 0x068b141f),
+ TOBN(0xee2df78a, 0x994f04e9),
+ TOBN(0xb39ccae8, 0x271245b0),
+ TOBN(0xb875a4a9, 0x97e43f4f),
+ TOBN(0x507dfe11, 0xdb2cea98),
+ TOBN(0x4fbf81cb, 0x489b03e9),
+ TOBN(0xdb86ec5b, 0x6ec414fa),
+ TOBN(0xfad444f9, 0xf51b3ae5),
+ TOBN(0xca7d33d6, 0x1914e3fe),
+ TOBN(0xa9c32f5c, 0x0ae6c4d0),
+ TOBN(0xa9ca1d1e, 0x73969568),
+ TOBN(0x98043c31, 0x1aa7467e),
+ TOBN(0xe832e75c, 0xe21b5ac6),
+ TOBN(0x314b7aea, 0x5232123d),
+ TOBN(0x08307c8c, 0x65ae86db),
+ TOBN(0x06e7165c, 0xaa4668ed),
+ TOBN(0xb170458b, 0xb4d3ec39),
+ TOBN(0x4d2e3ec6, 0xc19bb986),
+ TOBN(0xc5f34846, 0xae0304ed),
+ TOBN(0x917695a0, 0x6c9f9722),
+ TOBN(0x6c7f7317, 0x4cab1c0a),
+ TOBN(0x6295940e, 0x9d6d2e8b),
+ TOBN(0xd318b8c1, 0x549f7c97),
+ TOBN(0x22453204, 0x97713885),
+ TOBN(0x468d834b, 0xa8a440fe),
+ TOBN(0xd81fe5b2, 0xbfba796e),
+ TOBN(0x152364db, 0x6d71f116),
+ TOBN(0xbb8c7c59, 0xb5b66e53),
+ TOBN(0x0b12c61b, 0x2641a192),
+ TOBN(0x31f14802, 0xfcf0a7fd),
+ TOBN(0x42fd0789, 0x5488b01e),
+ TOBN(0x71d78d6d, 0x9952b498),
+ TOBN(0x8eb572d9, 0x07ac5201),
+ TOBN(0xe0a2a44c, 0x4d194a88),
+ TOBN(0xd2b63fd9, 0xba017e66),
+ TOBN(0x78efc6c8, 0xf888aefc),
+ TOBN(0xb76f6bda, 0x4a881a11),
+ TOBN(0x187f314b, 0xb46c2397),
+ TOBN(0x004cf566, 0x5ded2819),
+ TOBN(0xa9ea5704, 0x38764d34),
+ TOBN(0xbba45217, 0x78084709),
+ TOBN(0x06474571, 0x1171121e),
+ TOBN(0xad7b7eb1, 0xe7c9b671),
+ TOBN(0xdacfbc40, 0x730f7507),
+ TOBN(0x178cd8c6, 0xc7ad7bd1),
+ TOBN(0xbf0be101, 0xb2a67238),
+ TOBN(0x3556d367, 0xaf9c14f2),
+ TOBN(0x104b7831, 0xa5662075),
+ TOBN(0x58ca59bb, 0x79d9e60a),
+ TOBN(0x4bc45392, 0xa569a73b),
+ TOBN(0x517a52e8, 0x5698f6c9),
+ TOBN(0x85643da5, 0xaeadd755),
+ TOBN(0x1aed0cd5, 0x2a581b84),
+ TOBN(0xb9b4ff84, 0x80af1372),
+ TOBN(0x244c3113, 0xf1ba5d1f),
+ TOBN(0x2a5dacbe, 0xf5f98d31),
+ TOBN(0x2c3323e8, 0x4375bc2a),
+ TOBN(0x17a3ab4a, 0x5594b1dd),
+ TOBN(0xa1928bfb, 0xceb4797e),
+ TOBN(0xe83af245, 0xe4886a19),
+ TOBN(0x8979d546, 0x72b5a74a),
+ TOBN(0xa0f726bc, 0x19f9e967),
+ TOBN(0xd9d03152, 0xe8fbbf4e),
+ TOBN(0xcfd6f51d, 0xb7707d40),
+ TOBN(0x633084d9, 0x63f6e6e0),
+ TOBN(0xedcd9cdc, 0x55667eaf),
+ TOBN(0x73b7f92b, 0x2e44d56f),
+ TOBN(0xfb2e39b6, 0x4e962b14),
+ TOBN(0x7d408f6e, 0xf671fcbf),
+ TOBN(0xcc634ddc, 0x164a89bb),
+ TOBN(0x74a42bb2, 0x3ef3bd05),
+ TOBN(0x1280dbb2, 0x428decbb),
+ TOBN(0x6103f6bb, 0x402c8596),
+ TOBN(0xfa2bf581, 0x355a5752),
+ TOBN(0x562f96a8, 0x00946674),
+ TOBN(0x4e4ca16d, 0x6da0223b),
+ TOBN(0xfe47819f, 0x28d3aa25),
+ TOBN(0x9eea3075, 0xf8dfcf8a),
+ TOBN(0xa284f0aa, 0x95669825),
+ TOBN(0xb3fca250, 0x867d3fd8),
+ TOBN(0x20757b5f, 0x269d691e),
+ TOBN(0xf2c24020, 0x93b8a5de),
+ TOBN(0xd3f93359, 0xebc06da6),
+ TOBN(0x1178293e, 0xb2739c33),
+ TOBN(0xd2a3e770, 0xbcd686e5),
+ TOBN(0xa76f49f4, 0xcd941534),
+ TOBN(0x0d37406b, 0xe3c71c0e),
+ TOBN(0x172d9397, 0x3b97f7e3),
+ TOBN(0xec17e239, 0xbd7fd0de),
+ TOBN(0xe3290551, 0x6f496ba2),
+ TOBN(0x6a693172, 0x36ad50e7),
+ TOBN(0xc4e539a2, 0x83e7eff5),
+ TOBN(0x752737e7, 0x18e1b4cf),
+ TOBN(0xa2f7932c, 0x68af43ee),
+ TOBN(0x5502468e, 0x703d00bd),
+ TOBN(0xe5dc978f, 0x2fb061f5),
+ TOBN(0xc9a1904a, 0x28c815ad),
+ TOBN(0xd3af538d, 0x470c56a4),
+ TOBN(0x159abc5f, 0x193d8ced),
+ TOBN(0x2a37245f, 0x20108ef3),
+ TOBN(0xfa17081e, 0x223f7178),
+ TOBN(0x27b0fb2b, 0x10c8c0f5),
+ TOBN(0x2102c3ea, 0x40650547),
+ TOBN(0x594564df, 0x8ac3bfa7),
+ TOBN(0x98102033, 0x509dad96),
+ TOBN(0x6989643f, 0xf1d18a13),
+ TOBN(0x35eebd91, 0xd7fc5af0),
+ TOBN(0x078d096a, 0xfaeaafd8),
+ TOBN(0xb7a89341, 0xdef3de98),
+ TOBN(0x2a206e8d, 0xecf2a73a),
+ TOBN(0x066a6397, 0x8e551994),
+ TOBN(0x3a6a088a, 0xb98d53a2),
+ TOBN(0x0ce7c67c, 0x2d1124aa),
+ TOBN(0x48cec671, 0x759a113c),
+ TOBN(0xe3b373d3, 0x4f6f67fa),
+ TOBN(0x5455d479, 0xfd36727b),
+ TOBN(0xe5a428ee, 0xa13c0d81),
+ TOBN(0xb853dbc8, 0x1c86682b),
+ TOBN(0xb78d2727, 0xb8d02b2a),
+ TOBN(0xaaf69bed, 0x8ebc329a),
+ TOBN(0xdb6b40b3, 0x293b2148),
+ TOBN(0xe42ea77d, 0xb8c4961f),
+ TOBN(0xb1a12f7c, 0x20e5e0ab),
+ TOBN(0xa0ec5274, 0x79e8b05e),
+ TOBN(0x68027391, 0xfab60a80),
+ TOBN(0x6bfeea5f, 0x16b1bd5e),
+ TOBN(0xf957e420, 0x4de30ad3),
+ TOBN(0xcbaf664e, 0x6a353b9e),
+ TOBN(0x5c873312, 0x26d14feb),
+ TOBN(0x4e87f98c, 0xb65f57cb),
+ TOBN(0xdb60a621, 0x5e0cdd41),
+ TOBN(0x67c16865, 0xa6881440),
+ TOBN(0x1093ef1a, 0x46ab52aa),
+ TOBN(0xc095afb5, 0x3f4ece64),
+ TOBN(0x6a6bb02e, 0x7604551a),
+ TOBN(0x55d44b4e, 0x0b26b8cd),
+ TOBN(0xe5f9a999, 0xf971268a),
+ TOBN(0xc08ec425, 0x11a7de84),
+ TOBN(0x83568095, 0xfda469dd),
+ TOBN(0x737bfba1, 0x6c6c90a2),
+ TOBN(0x1cb9c4a0, 0xbe229831),
+ TOBN(0x93bccbba, 0xbb2eec64),
+ TOBN(0xa0c23b64, 0xda03adbe),
+ TOBN(0x5f7aa00a, 0xe0e86ac4),
+ TOBN(0x470b941e, 0xfc1401e6),
+ TOBN(0x5ad8d679, 0x9df43574),
+ TOBN(0x4ccfb8a9, 0x0f65d810),
+ TOBN(0x1bce80e3, 0xaa7fbd81),
+ TOBN(0x273291ad, 0x9508d20a),
+ TOBN(0xf5c4b46b, 0x42a92806),
+ TOBN(0x810684ec, 0xa86ab44a),
+ TOBN(0x4591640b, 0xca0bc9f8),
+ TOBN(0xb5efcdfc, 0x5c4b6054),
+ TOBN(0x16fc8907, 0x6e9edd12),
+ TOBN(0xe29d0b50, 0xd4d792f9),
+ TOBN(0xa45fd01c, 0x9b03116d),
+ TOBN(0x85035235, 0xc81765a4),
+ TOBN(0x1fe2a9b2, 0xb4b4b67c),
+ TOBN(0xc1d10df0, 0xe8020604),
+ TOBN(0x9d64abfc, 0xbc8058d8),
+ TOBN(0x8943b9b2, 0x712a0fbb),
+ TOBN(0x90eed914, 0x3b3def04),
+ TOBN(0x85ab3aa2, 0x4ce775ff),
+ TOBN(0x605fd4ca, 0x7bbc9040),
+ TOBN(0x8b34a564, 0xe2c75dfb),
+ TOBN(0x41ffc94a, 0x10358560),
+ TOBN(0x2d8a5072, 0x9e5c28aa),
+ TOBN(0xe915a0fc, 0x4cc7eb15),
+ TOBN(0xe9efab05, 0x8f6d0f5d),
+ TOBN(0xdbab47a9, 0xd19e9b91),
+ TOBN(0x8cfed745, 0x0276154c),
+ TOBN(0x154357ae, 0x2cfede0d),
+ TOBN(0x520630df, 0x19f5a4ef),
+ TOBN(0x25759f7c, 0xe382360f),
+ TOBN(0xb6db05c9, 0x88bf5857),
+ TOBN(0x2917d61d, 0x6c58d46c),
+ TOBN(0x14f8e491, 0xfd20cb7a),
+ TOBN(0xb68a727a, 0x11c20340),
+ TOBN(0x0386f86f, 0xaf7ccbb6),
+ TOBN(0x5c8bc6cc, 0xfee09a20),
+ TOBN(0x7d76ff4a, 0xbb7eea35),
+ TOBN(0xa7bdebe7, 0xdb15be7a),
+ TOBN(0x67a08054, 0xd89f0302),
+ TOBN(0x56bf0ea9, 0xc1193364),
+ TOBN(0xc8244467, 0x62837ebe),
+ TOBN(0x32bd8e8b, 0x20d841b8),
+ TOBN(0x127a0548, 0xdbb8a54f),
+ TOBN(0x83dd4ca6, 0x63b20236),
+ TOBN(0x87714718, 0x203491fa),
+ TOBN(0x4dabcaaa, 0xaa8a5288),
+ TOBN(0x91cc0c8a, 0xaf23a1c9),
+ TOBN(0x34c72c6a, 0x3f220e0c),
+ TOBN(0xbcc20bdf, 0x1232144a),
+ TOBN(0x6e2f42da, 0xa20ede1b),
+ TOBN(0xc441f00c, 0x74a00515),
+ TOBN(0xbf46a5b6, 0x734b8c4b),
+ TOBN(0x57409503, 0x7b56c9a4),
+ TOBN(0x9f735261, 0xe4585d45),
+ TOBN(0x9231faed, 0x6734e642),
+ TOBN(0x1158a176, 0xbe70ee6c),
+ TOBN(0x35f1068d, 0x7c3501bf),
+ TOBN(0x6beef900, 0xa2d26115),
+ TOBN(0x649406f2, 0xef0afee3),
+ TOBN(0x3f43a60a, 0xbc2420a1),
+ TOBN(0x509002a7, 0xd5aee4ac),
+ TOBN(0xb46836a5, 0x3ff3571b),
+ TOBN(0x24f98b78, 0x837927c1),
+ TOBN(0x6254256a, 0x4533c716),
+ TOBN(0xf27abb0b, 0xd07ee196),
+ TOBN(0xd7cf64fc, 0x5c6d5bfd),
+ TOBN(0x6915c751, 0xf0cd7a77),
+ TOBN(0xd9f59012, 0x8798f534),
+ TOBN(0x772b0da8, 0xf81d8b5f),
+ TOBN(0x1244260c, 0x2e03fa69),
+ TOBN(0x36cf0e3a, 0x3be1a374),
+ TOBN(0x6e7c1633, 0xef06b960),
+ TOBN(0xa71a4c55, 0x671f90f6),
+ TOBN(0x7a941251, 0x33c673db),
+ TOBN(0xc0bea510, 0x73e8c131),
+ TOBN(0x61a8a699, 0xd4f6c734),
+ TOBN(0x25e78c88, 0x341ed001),
+ TOBN(0x5c18acf8, 0x8e2f7d90),
+ TOBN(0xfdbf33d7, 0x77be32cd),
+ TOBN(0x0a085cd7, 0xd2eb5ee9),
+ TOBN(0x2d702cfb, 0xb3201115),
+ TOBN(0xb6e0ebdb, 0x85c88ce8),
+ TOBN(0x23a3ce3c, 0x1e01d617),
+ TOBN(0x3041618e, 0x567333ac),
+ TOBN(0x9dd0fd8f, 0x157edb6b),
+ TOBN(0x27f74702, 0xb57872b8),
+ TOBN(0x2ef26b4f, 0x657d5fe1),
+ TOBN(0x95426f0a, 0x57cf3d40),
+ TOBN(0x847e2ad1, 0x65a6067a),
+ TOBN(0xd474d9a0, 0x09996a74),
+ TOBN(0x16a56acd, 0x2a26115c),
+ TOBN(0x02a615c3, 0xd16f4d43),
+ TOBN(0xcc3fc965, 0xaadb85b7),
+ TOBN(0x386bda73, 0xce07d1b0),
+ TOBN(0xd82910c2, 0x58ad4178),
+ TOBN(0x124f82cf, 0xcd2617f4),
+ TOBN(0xcc2f5e8d, 0xef691770),
+ TOBN(0x82702550, 0xb8c30ccc),
+ TOBN(0x7b856aea, 0x1a8e575a),
+ TOBN(0xbb822fef, 0xb1ab9459),
+ TOBN(0x085928bc, 0xec24e38e),
+ TOBN(0x5d0402ec, 0xba8f4b4d),
+ TOBN(0xc07cd4ba, 0x00b4d58b),
+ TOBN(0x5d8dffd5, 0x29227e7a),
+ TOBN(0x61d44d0c, 0x31bf386f),
+ TOBN(0xe486dc2b, 0x135e6f4d),
+ TOBN(0x680962eb, 0xe79410ef),
+ TOBN(0xa61bd343, 0xf10088b5),
+ TOBN(0x6aa76076, 0xe2e28686),
+ TOBN(0x80463d11, 0x8fb98871),
+ TOBN(0xcb26f5c3, 0xbbc76aff),
+ TOBN(0xd4ab8edd, 0xfbe03614),
+ TOBN(0xc8eb579b, 0xc0cf2dee),
+ TOBN(0xcc004c15, 0xc93bae41),
+ TOBN(0x46fbae5d, 0x3aeca3b2),
+ TOBN(0x671235cf, 0x0f1e9ab1),
+ TOBN(0xadfba934, 0x9ec285c1),
+ TOBN(0x88ded013, 0xf216c980),
+ TOBN(0xc8ac4fb8, 0xf79e0bc1),
+ TOBN(0xa29b89c6, 0xfb97a237),
+ TOBN(0xb697b780, 0x9922d8e7),
+ TOBN(0x3142c639, 0xddb945b5),
+ TOBN(0x447b06c7, 0xe094c3a9),
+ TOBN(0xcdcb3642, 0x72266c90),
+ TOBN(0x633aad08, 0xa9385046),
+ TOBN(0xa36c936b, 0xb57c6477),
+ TOBN(0x871f8b64, 0xe94dbcc6),
+ TOBN(0x28d0fb62, 0xa591a67b),
+ TOBN(0x9d40e081, 0xc1d926f5),
+ TOBN(0x3111eaf6, 0xf2d84b5a),
+ TOBN(0x228993f9, 0xa565b644),
+ TOBN(0x0ccbf592, 0x2c83188b),
+ TOBN(0xf87b30ab, 0x3df3e197),
+ TOBN(0xb8658b31, 0x7642bca8),
+ TOBN(0x1a032d7f, 0x52800f17),
+ TOBN(0x051dcae5, 0x79bf9445),
+ TOBN(0xeba6b8ee, 0x54a2e253),
+ TOBN(0x5c8b9cad, 0xd4485692),
+ TOBN(0x84bda40e, 0x8986e9be),
+ TOBN(0xd16d16a4, 0x2f0db448),
+ TOBN(0x8ec80050, 0xa14d4188),
+ TOBN(0xb2b26107, 0x98fa7aaa),
+ TOBN(0x41209ee4, 0xf073aa4e),
+ TOBN(0xf1570359, 0xf2d6b19b),
+ TOBN(0xcbe6868c, 0xfc577caf),
+ TOBN(0x186c4bdc, 0x32c04dd3),
+ TOBN(0xa6c35fae, 0xcfeee397),
+ TOBN(0xb4a1b312, 0xf086c0cf),
+ TOBN(0xe0a5ccc6, 0xd9461fe2),
+ TOBN(0xc32278aa, 0x1536189f),
+ TOBN(0x1126c55f, 0xba6df571),
+ TOBN(0x0f71a602, 0xb194560e),
+ TOBN(0x8b2d7405, 0x324bd6e1),
+ TOBN(0x8481939e, 0x3738be71),
+ TOBN(0xb5090b1a, 0x1a4d97a9),
+ TOBN(0x116c65a3, 0xf05ba915),
+ TOBN(0x21863ad3, 0xaae448aa),
+ TOBN(0xd24e2679, 0xa7aae5d3),
+ TOBN(0x7076013d, 0x0de5c1c4),
+ TOBN(0x2d50f8ba, 0xbb05b629),
+ TOBN(0x73c1abe2, 0x6e66efbb),
+ TOBN(0xefd4b422, 0xf2488af7),
+ TOBN(0xe4105d02, 0x663ba575),
+ TOBN(0x7eb60a8b, 0x53a69457),
+ TOBN(0x62210008, 0xc945973b),
+ TOBN(0xfb255478, 0x77a50ec6),
+ TOBN(0xbf0392f7, 0x0a37a72c),
+ TOBN(0xa0a7a19c, 0x4be18e7a),
+ TOBN(0x90d8ea16, 0x25b1e0af),
+ TOBN(0x7582a293, 0xef953f57),
+ TOBN(0x90a64d05, 0xbdc5465a),
+ TOBN(0xca79c497, 0xe2510717),
+ TOBN(0x560dbb7c, 0x18cb641f),
+ TOBN(0x1d8e3286, 0x4b66abfb),
+ TOBN(0xd26f52e5, 0x59030900),
+ TOBN(0x1ee3f643, 0x5584941a),
+ TOBN(0x6d3b3730, 0x569f5958),
+ TOBN(0x9ff2a62f, 0x4789dba5),
+ TOBN(0x91fcb815, 0x72b5c9b7),
+ TOBN(0xf446cb7d, 0x6c8f9a0e),
+ TOBN(0x48f625c1, 0x39b7ecb5),
+ TOBN(0xbabae801, 0x1c6219b8),
+ TOBN(0xe7a562d9, 0x28ac2f23),
+ TOBN(0xe1b48732, 0x26e20588),
+ TOBN(0x06ee1cad, 0x775af051),
+ TOBN(0xda29ae43, 0xfaff79f7),
+ TOBN(0xc141a412, 0x652ee9e0),
+ TOBN(0x1e127f6f, 0x195f4bd0),
+ TOBN(0x29c6ab4f, 0x072f34f8),
+ TOBN(0x7b7c1477, 0x30448112),
+ TOBN(0x82b51af1, 0xe4a38656),
+ TOBN(0x2bf2028a, 0x2f315010),
+ TOBN(0xc9a4a01f, 0x6ea88cd4),
+ TOBN(0xf63e95d8, 0x257e5818),
+ TOBN(0xdd8efa10, 0xb4519b16),
+ TOBN(0xed8973e0, 0x0da910bf),
+ TOBN(0xed49d077, 0x5c0fe4a9),
+ TOBN(0xac3aac5e, 0xb7caee1e),
+ TOBN(0x1033898d, 0xa7f4da57),
+ TOBN(0x42145c0e, 0x5c6669b9),
+ TOBN(0x42daa688, 0xc1aa2aa0),
+ TOBN(0x629cc15c, 0x1a1d885a),
+ TOBN(0x25572ec0, 0xf4b76817),
+ TOBN(0x8312e435, 0x9c8f8f28),
+ TOBN(0x8107f8cd, 0x81965490),
+ TOBN(0x516ff3a3, 0x6fa6110c),
+ TOBN(0x74fb1eb1, 0xfb93561f),
+ TOBN(0x6c0c9047, 0x8457522b),
+ TOBN(0xcfd32104, 0x6bb8bdc6),
+ TOBN(0x2d6884a2, 0xcc80ad57),
+ TOBN(0x7c27fc35, 0x86a9b637),
+ TOBN(0x3461baed, 0xadf4e8cd),
+ TOBN(0x1d56251a, 0x617242f0),
+ TOBN(0x0b80d209, 0xc955bef4),
+ TOBN(0xdf02cad2, 0x06adb047),
+ TOBN(0xf0d7cb91, 0x5ec74fee),
+ TOBN(0xd2503375, 0x1111ba44),
+ TOBN(0x9671755e, 0xdf53cb36),
+ TOBN(0x54dcb612, 0x3368551b),
+ TOBN(0x66d69aac, 0xc8a025a4),
+ TOBN(0x6be946c6, 0xe77ef445),
+ TOBN(0x719946d1, 0xa995e094),
+ TOBN(0x65e848f6, 0xe51e04d8),
+ TOBN(0xe62f3300, 0x6a1e3113),
+ TOBN(0x1541c7c1, 0x501de503),
+ TOBN(0x4daac9fa, 0xf4acfade),
+ TOBN(0x0e585897, 0x44cd0b71),
+ TOBN(0x544fd869, 0x0a51cd77),
+ TOBN(0x60fc20ed, 0x0031016d),
+ TOBN(0x58b404ec, 0xa4276867),
+ TOBN(0x46f6c3cc, 0x34f34993),
+ TOBN(0x477ca007, 0xc636e5bd),
+ TOBN(0x8018f5e5, 0x7c458b47),
+ TOBN(0xa1202270, 0xe47b668f),
+ TOBN(0xcef48ccd, 0xee14f203),
+ TOBN(0x23f98bae, 0x62ff9b4d),
+ TOBN(0x55acc035, 0xc589eddd),
+ TOBN(0x3fe712af, 0x64db4444),
+ TOBN(0x19e9d634, 0xbecdd480),
+ TOBN(0xe08bc047, 0xa930978a),
+ TOBN(0x2dbf24ec, 0xa1280733),
+ TOBN(0x3c0ae38c, 0x2cd706b2),
+ TOBN(0x5b012a5b, 0x359017b9),
+ TOBN(0x3943c38c, 0x72e0f5ae),
+ TOBN(0x786167ea, 0x57176fa3),
+ TOBN(0xe5f9897d, 0x594881dc),
+ TOBN(0x6b5efad8, 0xcfb820c1),
+ TOBN(0xb2179093, 0xd55018de),
+ TOBN(0x39ad7d32, 0x0bac56ce),
+ TOBN(0xb55122e0, 0x2cfc0e81),
+ TOBN(0x117c4661, 0xf6d89daa),
+ TOBN(0x362d01e1, 0xcb64fa09),
+ TOBN(0x6a309b4e, 0x3e9c4ddd),
+ TOBN(0xfa979fb7, 0xabea49b1),
+ TOBN(0xb4b1d27d, 0x10e2c6c5),
+ TOBN(0xbd61c2c4, 0x23afde7a),
+ TOBN(0xeb6614f8, 0x9786d358),
+ TOBN(0x4a5d816b, 0x7f6f7459),
+ TOBN(0xe431a44f, 0x09360e7b),
+ TOBN(0x8c27a032, 0xc309914c),
+ TOBN(0xcea5d68a, 0xcaede3d8),
+ TOBN(0x3668f665, 0x3a0a3f95),
+ TOBN(0x89369416, 0x7ceba27b),
+ TOBN(0x89981fad, 0xe4728fe9),
+ TOBN(0x7102c8a0, 0x8a093562),
+ TOBN(0xbb80310e, 0x235d21c8),
+ TOBN(0x505e55d1, 0xbefb7f7b),
+ TOBN(0xa0a90811, 0x12958a67),
+ TOBN(0xd67e106a, 0x4d851fef),
+ TOBN(0xb84011a9, 0x431dd80e),
+ TOBN(0xeb7c7cca, 0x73306cd9),
+ TOBN(0x20fadd29, 0xd1b3b730),
+ TOBN(0x83858b5b, 0xfe37b3d3),
+ TOBN(0xbf4cd193, 0xb6251d5c),
+ TOBN(0x1cca1fd3, 0x1352d952),
+ TOBN(0xc66157a4, 0x90fbc051),
+ TOBN(0x7990a638, 0x89b98636),
+ },
+ { TOBN(0xe5aa692a, 0x87dec0e1), TOBN(0x010ded8d, 0xf7b39d00),
+ TOBN(0x7b1b80c8, 0x54cfa0b5), TOBN(0x66beb876, 0xa0f8ea28),
+ TOBN(0x50d7f531, 0x3476cd0e), TOBN(0xa63d0e65, 0xb08d3949),
+ TOBN(0x1a09eea9, 0x53479fc6), TOBN(0x82ae9891, 0xf499e742),
+ TOBN(0xab58b910, 0x5ca7d866), TOBN(0x582967e2, 0x3adb3b34),
+ TOBN(0x89ae4447, 0xcceac0bc), TOBN(0x919c667c, 0x7bf56af5),
+ TOBN(0x9aec17b1, 0x60f5dcd7), TOBN(0xec697b9f, 0xddcaadbc),
+ TOBN(0x0b98f341, 0x463467f5), TOBN(0xb187f1f7, 0xa967132f),
+ TOBN(0x90fe7a1d, 0x214aeb18), TOBN(0x1506af3c, 0x741432f7),
+ TOBN(0xbb5565f9, 0xe591a0c4), TOBN(0x10d41a77, 0xb44f1bc3),
+ TOBN(0xa09d65e4, 0xa84bde96), TOBN(0x42f060d8, 0xf20a6a1c),
+ TOBN(0x652a3bfd, 0xf27f9ce7), TOBN(0xb6bdb65c, 0x3b3d739f),
+ TOBN(0xeb5ddcb6, 0xec7fae9f), TOBN(0x995f2714, 0xefb66e5a),
+ TOBN(0xdee95d8e, 0x69445d52), TOBN(0x1b6c2d46, 0x09e27620),
+ TOBN(0x32621c31, 0x8129d716), TOBN(0xb03909f1, 0x0958c1aa),
+ TOBN(0x8c468ef9, 0x1af4af63), TOBN(0x162c429f, 0xfba5cdf6),
+ TOBN(0x2f682343, 0x753b9371), TOBN(0x29cab45a, 0x5f1f9cd7),
+ TOBN(0x571623ab, 0xb245db96), TOBN(0xc507db09, 0x3fd79999),
+ TOBN(0x4e2ef652, 0xaf036c32), TOBN(0x86f0cc78, 0x05018e5c),
+ TOBN(0xc10a73d4, 0xab8be350), TOBN(0x6519b397, 0x7e826327),
+ TOBN(0xe8cb5eef, 0x9c053df7), TOBN(0x8de25b37, 0xb300ea6f),
+ TOBN(0xdb03fa92, 0xc849cffb), TOBN(0x242e43a7, 0xe84169bb),
+ TOBN(0xe4fa51f4, 0xdd6f958e), TOBN(0x6925a77f, 0xf4445a8d),
+ TOBN(0xe6e72a50, 0xe90d8949), TOBN(0xc66648e3, 0x2b1f6390),
+ TOBN(0xb2ab1957, 0x173e460c), TOBN(0x1bbbce75, 0x30704590),
+ TOBN(0xc0a90dbd, 0xdb1c7162), TOBN(0x505e399e, 0x15cdd65d),
+ TOBN(0x68434dcb, 0x57797ab7), TOBN(0x60ad35ba, 0x6a2ca8e8),
+ TOBN(0x4bfdb1e0, 0xde3336c1), TOBN(0xbbef99eb, 0xd8b39015),
+ TOBN(0x6c3b96f3, 0x1711ebec), TOBN(0x2da40f1f, 0xce98fdc4),
+ TOBN(0xb99774d3, 0x57b4411f), TOBN(0x87c8bdf4, 0x15b65bb6),
+ TOBN(0xda3a89e3, 0xc2eef12d), TOBN(0xde95bb9b, 0x3c7471f3),
+ TOBN(0x600f225b, 0xd812c594), TOBN(0x54907c5d, 0x2b75a56b),
+ TOBN(0xa93cc5f0, 0x8db60e35), TOBN(0x743e3cd6, 0xfa833319),
+ TOBN(0x7dad5c41, 0xf81683c9), TOBN(0x70c1e7d9, 0x9c34107e),
+ TOBN(0x0edc4a39, 0xa6be0907), TOBN(0x36d47035, 0x86d0b7d3),
+ TOBN(0x8c76da03, 0x272bfa60), TOBN(0x0b4a07ea, 0x0f08a414),
+ TOBN(0x699e4d29, 0x45c1dd53), TOBN(0xcadc5898, 0x231debb5),
+ TOBN(0xdf49fcc7, 0xa77f00e0), TOBN(0x93057bbf, 0xa73e5a0e),
+ TOBN(0x2f8b7ecd, 0x027a4cd1), TOBN(0x114734b3, 0xc614011a),
+ TOBN(0xe7a01db7, 0x67677c68), TOBN(0x89d9be5e, 0x7e273f4f),
+ TOBN(0xd225cb2e, 0x089808ef), TOBN(0xf1f7a27d, 0xd59e4107),
+ TOBN(0x53afc761, 0x8211b9c9), TOBN(0x0361bc67, 0xe6819159),
+ TOBN(0x2a865d0b, 0x7f071426), TOBN(0x6a3c1810, 0xe7072567),
+ TOBN(0x3e3bca1e, 0x0d6bcabd), TOBN(0xa1b02bc1, 0x408591bc),
+ TOBN(0xe0deee59, 0x31fba239), TOBN(0xf47424d3, 0x98bd91d1),
+ TOBN(0x0f8886f4, 0x071a3c1d), TOBN(0x3f7d41e8, 0xa819233b),
+ TOBN(0x708623c2, 0xcf6eb998), TOBN(0x86bb49af, 0x609a287f),
+ TOBN(0x942bb249, 0x63c90762), TOBN(0x0ef6eea5, 0x55a9654b),
+ TOBN(0x5f6d2d72, 0x36f5defe), TOBN(0xfa9922dc, 0x56f99176),
+ TOBN(0x6c8c5ece, 0xf78ce0c7), TOBN(0x7b44589d, 0xbe09b55e),
+ TOBN(0xe11b3bca, 0x9ea83770), TOBN(0xd7fa2c7f, 0x2ab71547),
+ TOBN(0x2a3dd6fa, 0x2a1ddcc0), TOBN(0x09acb430, 0x5a7b7707),
+ TOBN(0x4add4a2e, 0x649d4e57), TOBN(0xcd53a2b0, 0x1917526e),
+ TOBN(0xc5262330, 0x20b44ac4), TOBN(0x4028746a, 0xbaa2c31d),
+ TOBN(0x51318390, 0x64291d4c), TOBN(0xbf48f151, 0xee5ad909),
+ TOBN(0xcce57f59, 0x7b185681), TOBN(0x7c3ac1b0, 0x4854d442),
+ TOBN(0x65587dc3, 0xc093c171), TOBN(0xae7acb24, 0x24f42b65),
+ TOBN(0x5a338adb, 0x955996cb), TOBN(0xc8e65675, 0x6051f91b),
+ TOBN(0x66711fba, 0x28b8d0b1), TOBN(0x15d74137, 0xb6c10a90),
+ TOBN(0x70cdd7eb, 0x3a232a80), TOBN(0xc9e2f07f, 0x6191ed24),
+ TOBN(0xa80d1db6, 0xf79588c0), TOBN(0xfa52fc69, 0xb55768cc),
+ TOBN(0x0b4df1ae, 0x7f54438a), TOBN(0x0cadd1a7, 0xf9b46a4f),
+ TOBN(0xb40ea6b3, 0x1803dd6f), TOBN(0x488e4fa5, 0x55eaae35),
+ TOBN(0x9f047d55, 0x382e4e16), TOBN(0xc9b5b7e0, 0x2f6e0c98),
+ TOBN(0x6b1bd2d3, 0x95762649), TOBN(0xa9604ee7, 0xc7aea3f6),
+ TOBN(0x3646ff27, 0x6dc6f896), TOBN(0x9bf0e7f5, 0x2860bad1),
+ TOBN(0x2d92c821, 0x7cb44b92), TOBN(0xa2f5ce63, 0xaea9c182),
+ TOBN(0xd0a2afb1, 0x9154a5fd), TOBN(0x482e474c, 0x95801da6),
+ TOBN(0xc19972d0, 0xb611c24b), TOBN(0x1d468e65, 0x60a8f351),
+ TOBN(0xeb758069, 0x7bcf6421), TOBN(0xec9dd0ee, 0x88fbc491),
+ TOBN(0x5b59d2bf, 0x956c2e32), TOBN(0x73dc6864, 0xdcddf94e),
+ TOBN(0xfd5e2321, 0xbcee7665), TOBN(0xa7b4f8ef, 0x5e9a06c4),
+ TOBN(0xfba918dd, 0x7280f855), TOBN(0xbbaac260, 0x8baec688),
+ TOBN(0xa3b3f00f, 0x33400f42), TOBN(0x3d2dba29, 0x66f2e6e4),
+ TOBN(0xb6f71a94, 0x98509375), TOBN(0x8f33031f, 0xcea423cc),
+ TOBN(0x009b8dd0, 0x4807e6fb), TOBN(0x5163cfe5, 0x5cdb954c),
+ TOBN(0x03cc8f17, 0xcf41c6e8), TOBN(0xf1f03c2a, 0x037b925c),
+ TOBN(0xc39c19cc, 0x66d2427c), TOBN(0x823d24ba, 0x7b6c18e4),
+ TOBN(0x32ef9013, 0x901f0b4f), TOBN(0x684360f1, 0xf8941c2e),
+ TOBN(0x0ebaff52, 0x2c28092e), TOBN(0x7891e4e3, 0x256c932f),
+ TOBN(0x51264319, 0xac445e3d), TOBN(0x553432e7, 0x8ea74381),
+ TOBN(0xe6eeaa69, 0x67e9c50a), TOBN(0x27ced284, 0x62e628c7),
+ TOBN(0x3f96d375, 0x7a4afa57), TOBN(0xde0a14c3, 0xe484c150),
+ TOBN(0x364a24eb, 0x38bd9923), TOBN(0x1df18da0, 0xe5177422),
+ TOBN(0x174e8f82, 0xd8d38a9b), TOBN(0x2e97c600, 0xe7de1391),
+ TOBN(0xc5709850, 0xa1c175dd), TOBN(0x969041a0, 0x32ae5035),
+ TOBN(0xcbfd533b, 0x76a2086b), TOBN(0xd6bba71b, 0xd7c2e8fe),
+ TOBN(0xb2d58ee6, 0x099dfb67), TOBN(0x3a8b342d, 0x064a85d9),
+ TOBN(0x3bc07649, 0x522f9be3), TOBN(0x690c075b, 0xdf1f49a8),
+ TOBN(0x80e1aee8, 0x3854ec42), TOBN(0x2a7dbf44, 0x17689dc7),
+ TOBN(0xc004fc0e, 0x3faf4078), TOBN(0xb2f02e9e, 0xdf11862c),
+ TOBN(0xf10a5e0f, 0xa0a1b7b3), TOBN(0x30aca623, 0x8936ec80),
+ TOBN(0xf83cbf05, 0x02f40d9a), TOBN(0x4681c468, 0x2c318a4d),
+ TOBN(0x98575618, 0x0e9c2674), TOBN(0xbe79d046, 0x1847092e),
+ TOBN(0xaf1e480a, 0x78bd01e0), TOBN(0x6dd359e4, 0x72a51db9),
+ TOBN(0x62ce3821, 0xe3afbab6), TOBN(0xc5cee5b6, 0x17733199),
+ TOBN(0xe08b30d4, 0x6ffd9fbb), TOBN(0x6e5bc699, 0x36c610b7),
+ TOBN(0xf343cff2, 0x9ce262cf), TOBN(0xca2e4e35, 0x68b914c1),
+ TOBN(0x011d64c0, 0x16de36c5), TOBN(0xe0b10fdd, 0x42e2b829),
+ TOBN(0x78942981, 0x6685aaf8), TOBN(0xe7511708, 0x230ede97),
+ TOBN(0x671ed8fc, 0x3b922bf8), TOBN(0xe4d8c0a0, 0x4c29b133),
+ TOBN(0x87eb1239, 0x3b6e99c4), TOBN(0xaff3974c, 0x8793beba),
+ TOBN(0x03749405, 0x2c18df9b), TOBN(0xc5c3a293, 0x91007139),
+ TOBN(0x6a77234f, 0xe37a0b95), TOBN(0x02c29a21, 0xb661c96b),
+ TOBN(0xc3aaf1d6, 0x141ecf61), TOBN(0x9195509e, 0x3bb22f53),
+ TOBN(0x29597404, 0x22d51357), TOBN(0x1b083822, 0x537bed60),
+ TOBN(0xcd7d6e35, 0xe07289f0), TOBN(0x1f94c48c, 0x6dd86eff),
+ TOBN(0xc8bb1f82, 0xeb0f9cfa), TOBN(0x9ee0b7e6, 0x1b2eb97d),
+ TOBN(0x5a52fe2e, 0x34d74e31), TOBN(0xa352c310, 0x3bf79ab6),
+ TOBN(0x97ff6c5a, 0xabfeeb8f), TOBN(0xbfbe8fef, 0xf5c97305),
+ TOBN(0xd6081ce6, 0xa7904608), TOBN(0x1f812f3a, 0xc4fca249),
+ TOBN(0x9b24bc9a, 0xb9e5e200), TOBN(0x91022c67, 0x38012ee8),
+ TOBN(0xe83d9c5d, 0x30a713a1), TOBN(0x4876e3f0, 0x84ef0f93),
+ TOBN(0xc9777029, 0xc1fbf928), TOBN(0xef7a6bb3, 0xbce7d2a4),
+ TOBN(0xb8067228, 0xdfa2a659), TOBN(0xd5cd3398, 0xd877a48f),
+ TOBN(0xbea4fd8f, 0x025d0f3f), TOBN(0xd67d2e35, 0x2eae7c2b),
+ TOBN(0x184de7d7, 0xcc5f4394), TOBN(0xb5551b5c, 0x4536e142),
+ TOBN(0x2e89b212, 0xd34aa60a), TOBN(0x14a96fea, 0xf50051d5),
+ TOBN(0x4e21ef74, 0x0d12bb0b), TOBN(0xc522f020, 0x60b9677e),
+ TOBN(0x8b12e467, 0x2df7731d), TOBN(0x39f80382, 0x7b326d31),
+ TOBN(0xdfb8630c, 0x39024a94), TOBN(0xaacb96a8, 0x97319452),
+ TOBN(0xd68a3961, 0xeda3867c), TOBN(0x0c58e2b0, 0x77c4ffca),
+ TOBN(0x3d545d63, 0x4da919fa), TOBN(0xef79b69a, 0xf15e2289),
+ TOBN(0x54bc3d3d, 0x808bab10), TOBN(0xc8ab3007, 0x45f82c37),
+ TOBN(0xc12738b6, 0x7c4a658a), TOBN(0xb3c47639, 0x40e72182),
+ TOBN(0x3b77be46, 0x8798e44f), TOBN(0xdc047df2, 0x17a7f85f),
+ TOBN(0x2439d4c5, 0x5e59d92d), TOBN(0xcedca475, 0xe8e64d8d),
+ TOBN(0xa724cd0d, 0x87ca9b16), TOBN(0x35e4fd59, 0xa5540dfe),
+ TOBN(0xf8c1ff18, 0xe4bcf6b1), TOBN(0x856d6285, 0x295018fa),
+ TOBN(0x433f665c, 0x3263c949), TOBN(0xa6a76dd6, 0xa1f21409),
+ TOBN(0x17d32334, 0xcc7b4f79), TOBN(0xa1d03122, 0x06720e4a),
+ TOBN(0xadb6661d, 0x81d9bed5), TOBN(0xf0d6fb02, 0x11db15d1),
+ TOBN(0x7fd11ad5, 0x1fb747d2), TOBN(0xab50f959, 0x3033762b),
+ TOBN(0x2a7e711b, 0xfbefaf5a), TOBN(0xc7393278, 0x3fef2bbf),
+ TOBN(0xe29fa244, 0x0df6f9be), TOBN(0x9092757b, 0x71efd215),
+ TOBN(0xee60e311, 0x4f3d6fd9), TOBN(0x338542d4, 0x0acfb78b),
+ TOBN(0x44a23f08, 0x38961a0f), TOBN(0x1426eade, 0x986987ca),
+ TOBN(0x36e6ee2e, 0x4a863cc6), TOBN(0x48059420, 0x628b8b79),
+ TOBN(0x30303ad8, 0x7396e1de), TOBN(0x5c8bdc48, 0x38c5aad1),
+ TOBN(0x3e40e11f, 0x5c8f5066), TOBN(0xabd6e768, 0x8d246bbd),
+ TOBN(0x68aa40bb, 0x23330a01), TOBN(0xd23f5ee4, 0xc34eafa0),
+ TOBN(0x3bbee315, 0x5de02c21), TOBN(0x18dd4397, 0xd1d8dd06),
+ TOBN(0x3ba1939a, 0x122d7b44), TOBN(0xe6d3b40a, 0xa33870d6),
+ TOBN(0x8e620f70, 0x1c4fe3f8), TOBN(0xf6bba1a5, 0xd3a50cbf),
+ TOBN(0x4a78bde5, 0xcfc0aee0), TOBN(0x847edc46, 0xc08c50bd),
+ TOBN(0xbaa2439c, 0xad63c9b2), TOBN(0xceb4a728, 0x10fc2acb),
+ TOBN(0xa419e40e, 0x26da033d), TOBN(0x6cc3889d, 0x03e02683),
+ TOBN(0x1cd28559, 0xfdccf725), TOBN(0x0fd7e0f1, 0x8d13d208),
+ TOBN(0x01b9733b, 0x1f0df9d4), TOBN(0x8cc2c5f3, 0xa2b5e4f3),
+ TOBN(0x43053bfa, 0x3a304fd4), TOBN(0x8e87665c, 0x0a9f1aa7),
+ TOBN(0x087f29ec, 0xd73dc965), TOBN(0x15ace455, 0x3e9023db),
+ TOBN(0x2370e309, 0x2bce28b4), TOBN(0xf9723442, 0xb6b1e84a),
+ TOBN(0xbeee662e, 0xb72d9f26), TOBN(0xb19396de, 0xf0e47109),
+ TOBN(0x85b1fa73, 0xe13289d0), TOBN(0x436cf77e, 0x54e58e32),
+ TOBN(0x0ec833b3, 0xe990ef77), TOBN(0x7373e3ed, 0x1b11fc25),
+ TOBN(0xbe0eda87, 0x0fc332ce), TOBN(0xced04970, 0x8d7ea856),
+ TOBN(0xf85ff785, 0x7e977ca0), TOBN(0xb66ee8da, 0xdfdd5d2b),
+ TOBN(0xf5e37950, 0x905af461), TOBN(0x587b9090, 0x966d487c),
+ TOBN(0x6a198a1b, 0x32ba0127), TOBN(0xa7720e07, 0x141615ac),
+ TOBN(0xa23f3499, 0x996ef2f2), TOBN(0xef5f64b4, 0x470bcb3d),
+ TOBN(0xa526a962, 0x92b8c559), TOBN(0x0c14aac0, 0x69740a0f),
+ TOBN(0x0d41a9e3, 0xa6bdc0a5), TOBN(0x97d52106, 0x9c48aef4),
+ TOBN(0xcf16bd30, 0x3e7c253b), TOBN(0xcc834b1a, 0x47fdedc1),
+ TOBN(0x7362c6e5, 0x373aab2e), TOBN(0x264ed85e, 0xc5f590ff),
+ TOBN(0x7a46d9c0, 0x66d41870), TOBN(0xa50c20b1, 0x4787ba09),
+ TOBN(0x185e7e51, 0xe3d44635), TOBN(0xb3b3e080, 0x31e2d8dc),
+ TOBN(0xbed1e558, 0xa179e9d9), TOBN(0x2daa3f79, 0x74a76781),
+ TOBN(0x4372baf2, 0x3a40864f), TOBN(0x46900c54, 0x4fe75cb5),
+ TOBN(0xb95f171e, 0xf76765d0), TOBN(0x4ad726d2, 0x95c87502),
+ TOBN(0x2ec769da, 0x4d7c99bd), TOBN(0x5e2ddd19, 0xc36cdfa8),
+ TOBN(0xc22117fc, 0xa93e6dea), TOBN(0xe8a2583b, 0x93771123),
+ TOBN(0xbe2f6089, 0xfa08a3a2), TOBN(0x4809d5ed, 0x8f0e1112),
+ TOBN(0x3b414aa3, 0xda7a095e), TOBN(0x9049acf1, 0x26f5aadd),
+ TOBN(0x78d46a4d, 0x6be8b84a), TOBN(0xd66b1963, 0xb732b9b3),
+ TOBN(0x5c2ac2a0, 0xde6e9555), TOBN(0xcf52d098, 0xb5bd8770),
+ TOBN(0x15a15fa6, 0x0fd28921), TOBN(0x56ccb81e, 0x8b27536d),
+ TOBN(0x0f0d8ab8, 0x9f4ccbb8), TOBN(0xed5f44d2, 0xdb221729),
+ TOBN(0x43141988, 0x00bed10c), TOBN(0xc94348a4, 0x1d735b8b),
+ TOBN(0x79f3e9c4, 0x29ef8479), TOBN(0x4c13a4e3, 0x614c693f),
+ TOBN(0x32c9af56, 0x8e143a14), TOBN(0xbc517799, 0xe29ac5c4),
+ TOBN(0x05e17992, 0x2774856f), TOBN(0x6e52fb05, 0x6c1bf55f),
+ TOBN(0xaeda4225, 0xe4f19e16), TOBN(0x70f4728a, 0xaf5ccb26),
+ TOBN(0x5d2118d1, 0xb2947f22), TOBN(0xc827ea16, 0x281d6fb9),
+ TOBN(0x8412328d, 0x8cf0eabd), TOBN(0x45ee9fb2, 0x03ef9dcf),
+ TOBN(0x8e700421, 0xbb937d63), TOBN(0xdf8ff2d5, 0xcc4b37a6),
+ TOBN(0xa4c0d5b2, 0x5ced7b68), TOBN(0x6537c1ef, 0xc7308f59),
+ TOBN(0x25ce6a26, 0x3b37f8e8), TOBN(0x170e9a9b, 0xdeebc6ce),
+ TOBN(0xdd037952, 0x8728d72c), TOBN(0x445b0e55, 0x850154bc),
+ TOBN(0x4b7d0e06, 0x83a7337b), TOBN(0x1e3416d4, 0xffecf249),
+ TOBN(0x24840eff, 0x66a2b71f), TOBN(0xd0d9a50a, 0xb37cc26d),
+ TOBN(0xe2198150, 0x6fe28ef7), TOBN(0x3cc5ef16, 0x23324c7f),
+ TOBN(0x220f3455, 0x769b5263), TOBN(0xe2ade2f1, 0xa10bf475),
+ TOBN(0x28cd20fa, 0x458d3671), TOBN(0x1549722c, 0x2dc4847b),
+ TOBN(0x6dd01e55, 0x591941e3), TOBN(0x0e6fbcea, 0x27128ccb),
+ TOBN(0xae1a1e6b, 0x3bef0262), TOBN(0xfa8c472c, 0x8f54e103),
+ TOBN(0x7539c0a8, 0x72c052ec), TOBN(0xd7b27369, 0x5a3490e9),
+ TOBN(0x143fe1f1, 0x71684349), TOBN(0x36b4722e, 0x32e19b97),
+ TOBN(0xdc059227, 0x90980aff), TOBN(0x175c9c88, 0x9e13d674),
+ TOBN(0xa7de5b22, 0x6e6bfdb1), TOBN(0x5ea5b7b2, 0xbedb4b46),
+ TOBN(0xd5570191, 0xd34a6e44), TOBN(0xfcf60d2e, 0xa24ff7e6),
+ TOBN(0x614a392d, 0x677819e1), TOBN(0x7be74c7e, 0xaa5a29e8),
+ TOBN(0xab50fece, 0x63c85f3f), TOBN(0xaca2e2a9, 0x46cab337),
+ TOBN(0x7f700388, 0x122a6fe3), TOBN(0xdb69f703, 0x882a04a8),
+ TOBN(0x9a77935d, 0xcf7aed57), TOBN(0xdf16207c, 0x8d91c86f),
+ TOBN(0x2fca49ab, 0x63ed9998), TOBN(0xa3125c44, 0xa77ddf96),
+ TOBN(0x05dd8a86, 0x24344072), TOBN(0xa023dda2, 0xfec3fb56),
+ TOBN(0x421b41fc, 0x0c743032), TOBN(0x4f2120c1, 0x5e438639),
+ TOBN(0xfb7cae51, 0xc83c1b07), TOBN(0xb2370caa, 0xcac2171a),
+ TOBN(0x2eb2d962, 0x6cc820fb), TOBN(0x59feee5c, 0xb85a44bf),
+ TOBN(0x94620fca, 0x5b6598f0), TOBN(0x6b922cae, 0x7e314051),
+ TOBN(0xff8745ad, 0x106bed4e), TOBN(0x546e71f5, 0xdfa1e9ab),
+ TOBN(0x935c1e48, 0x1ec29487), TOBN(0x9509216c, 0x4d936530),
+ TOBN(0xc7ca3067, 0x85c9a2db), TOBN(0xd6ae5152, 0x6be8606f),
+ TOBN(0x09dbcae6, 0xe14c651d), TOBN(0xc9536e23, 0x9bc32f96),
+ TOBN(0xa90535a9, 0x34521b03), TOBN(0xf39c526c, 0x878756ff),
+ TOBN(0x383172ec, 0x8aedf03c), TOBN(0x20a8075e, 0xefe0c034),
+ TOBN(0xf22f9c62, 0x64026422), TOBN(0x8dd10780, 0x24b9d076),
+ TOBN(0x944c742a, 0x3bef2950), TOBN(0x55b9502e, 0x88a2b00b),
+ TOBN(0xa59e14b4, 0x86a09817), TOBN(0xa39dd3ac, 0x47bb4071),
+ TOBN(0x55137f66, 0x3be0592f), TOBN(0x07fcafd4, 0xc9e63f5b),
+ TOBN(0x963652ee, 0x346eb226), TOBN(0x7dfab085, 0xec2facb7),
+ TOBN(0x273bf2b8, 0x691add26), TOBN(0x30d74540, 0xf2b46c44),
+ TOBN(0x05e8e73e, 0xf2c2d065), TOBN(0xff9b8a00, 0xd42eeac9),
+ TOBN(0x2fcbd205, 0x97209d22), TOBN(0xeb740ffa, 0xde14ea2c),
+ TOBN(0xc71ff913, 0xa8aef518), TOBN(0x7bfc74bb, 0xfff4cfa2),
+ TOBN(0x1716680c, 0xb6b36048), TOBN(0x121b2cce, 0x9ef79af1),
+ TOBN(0xbff3c836, 0xa01eb3d3), TOBN(0x50eb1c6a, 0x5f79077b),
+ TOBN(0xa48c32d6, 0xa004bbcf), TOBN(0x47a59316, 0x7d64f61d),
+ TOBN(0x6068147f, 0x93102016), TOBN(0x12c5f654, 0x94d12576),
+ TOBN(0xefb071a7, 0xc9bc6b91), TOBN(0x7c2da0c5, 0x6e23ea95),
+ TOBN(0xf4fd45b6, 0xd4a1dd5d), TOBN(0x3e7ad9b6, 0x9122b13c),
+ TOBN(0x342ca118, 0xe6f57a48), TOBN(0x1c2e94a7, 0x06f8288f),
+ TOBN(0x99e68f07, 0x5a97d231), TOBN(0x7c80de97, 0x4d838758),
+ TOBN(0xbce0f5d0, 0x05872727), TOBN(0xbe5d95c2, 0x19c4d016),
+ TOBN(0x921d5cb1, 0x9c2492ee), TOBN(0x42192dc1, 0x404d6fb3),
+ TOBN(0x4c84dcd1, 0x32f988d3), TOBN(0xde26d61f, 0xa17b8e85),
+ TOBN(0xc466dcb6, 0x137c7408), TOBN(0x9a38d7b6, 0x36a266da),
+ TOBN(0x7ef5cb06, 0x83bebf1b), TOBN(0xe5cdcbbf, 0x0fd014e3),
+ TOBN(0x30aa376d, 0xf65965a0), TOBN(0x60fe88c2, 0xebb3e95e),
+ TOBN(0x33fd0b61, 0x66ee6f20), TOBN(0x8827dcdb, 0x3f41f0a0),
+ TOBN(0xbf8a9d24, 0x0c56c690), TOBN(0x40265dad, 0xddb7641d),
+ TOBN(0x522b05bf, 0x3a6b662b), TOBN(0x466d1dfe, 0xb1478c9b),
+ TOBN(0xaa616962, 0x1484469b), TOBN(0x0db60549, 0x02df8f9f),
+ TOBN(0xc37bca02, 0x3cb8bf51), TOBN(0x5effe346, 0x21371ce8),
+ TOBN(0xe8f65264, 0xff112c32), TOBN(0x8a9c736d, 0x7b971fb2),
+ TOBN(0xa4f19470, 0x7b75080d), TOBN(0xfc3f2c5a, 0x8839c59b),
+ TOBN(0x1d6c777e, 0x5aeb49c2), TOBN(0xf3db034d, 0xda1addfe),
+ TOBN(0xd76fee5a, 0x5535affc), TOBN(0x0853ac70, 0xb92251fd),
+ TOBN(0x37e3d594, 0x8b2a29d5), TOBN(0x28f1f457, 0x4de00ddb),
+ TOBN(0x8083c1b5, 0xf42c328b), TOBN(0xd8ef1d8f, 0xe493c73b),
+ TOBN(0x96fb6260, 0x41dc61bd), TOBN(0xf74e8a9d, 0x27ee2f8a),
+ TOBN(0x7c605a80, 0x2c946a5d), TOBN(0xeed48d65, 0x3839ccfd),
+ TOBN(0x9894344f, 0x3a29467a), TOBN(0xde81e949, 0xc51eba6d),
+ TOBN(0xdaea066b, 0xa5e5c2f2), TOBN(0x3fc8a614, 0x08c8c7b3),
+ TOBN(0x7adff88f, 0x06d0de9f), TOBN(0xbbc11cf5, 0x3b75ce0a),
+ TOBN(0x9fbb7acc, 0xfbbc87d5), TOBN(0xa1458e26, 0x7badfde2) },
+ {
+ TOBN(0x1cb43668, 0xe039c256),
+ TOBN(0x5f26fb8b, 0x7c17fd5d),
+ TOBN(0xeee426af, 0x79aa062b),
+ TOBN(0x072002d0, 0xd78fbf04),
+ TOBN(0x4c9ca237, 0xe84fb7e3),
+ TOBN(0xb401d8a1, 0x0c82133d),
+ TOBN(0xaaa52592, 0x6d7e4181),
+ TOBN(0xe9430833, 0x73dbb152),
+ TOBN(0xf92dda31, 0xbe24319a),
+ TOBN(0x03f7d28b, 0xe095a8e7),
+ TOBN(0xa52fe840, 0x98782185),
+ TOBN(0x276ddafe, 0x29c24dbc),
+ TOBN(0x80cd5496, 0x1d7a64eb),
+ TOBN(0xe4360889, 0x7f1dbe42),
+ TOBN(0x2f81a877, 0x8438d2d5),
+ TOBN(0x7e4d52a8, 0x85169036),
+ TOBN(0x19e3d5b1, 0x1d59715d),
+ TOBN(0xc7eaa762, 0xd788983e),
+ TOBN(0xe5a730b0, 0xabf1f248),
+ TOBN(0xfbab8084, 0xfae3fd83),
+ TOBN(0x65e50d21, 0x53765b2f),
+ TOBN(0xbdd4e083, 0xfa127f3d),
+ TOBN(0x9cf3c074, 0x397b1b10),
+ TOBN(0x59f8090c, 0xb1b59fd3),
+ TOBN(0x7b15fd9d, 0x615faa8f),
+ TOBN(0x8fa1eb40, 0x968554ed),
+ TOBN(0x7bb4447e, 0x7aa44882),
+ TOBN(0x2bb2d0d1, 0x029fff32),
+ TOBN(0x075e2a64, 0x6caa6d2f),
+ TOBN(0x8eb879de, 0x22e7351b),
+ TOBN(0xbcd5624e, 0x9a506c62),
+ TOBN(0x218eaef0, 0xa87e24dc),
+ TOBN(0x37e56847, 0x44ddfa35),
+ TOBN(0x9ccfc5c5, 0xdab3f747),
+ TOBN(0x9ac1df3f, 0x1ee96cf4),
+ TOBN(0x0c0571a1, 0x3b480b8f),
+ TOBN(0x2fbeb3d5, 0x4b3a7b3c),
+ TOBN(0x35c03669, 0x5dcdbb99),
+ TOBN(0x52a0f5dc, 0xb2415b3a),
+ TOBN(0xd57759b4, 0x4413ed9a),
+ TOBN(0x1fe647d8, 0x3d30a2c5),
+ TOBN(0x0857f77e, 0xf78a81dc),
+ TOBN(0x11d5a334, 0x131a4a9b),
+ TOBN(0xc0a94af9, 0x29d393f5),
+ TOBN(0xbc3a5c0b, 0xdaa6ec1a),
+ TOBN(0xba9fe493, 0x88d2d7ed),
+ TOBN(0xbb4335b4, 0xbb614797),
+ TOBN(0x991c4d68, 0x72f83533),
+ TOBN(0x53258c28, 0xd2f01cb3),
+ TOBN(0x93d6eaa3, 0xd75db0b1),
+ TOBN(0x419a2b0d, 0xe87d0db4),
+ TOBN(0xa1e48f03, 0xd8fe8493),
+ TOBN(0xf747faf6, 0xc508b23a),
+ TOBN(0xf137571a, 0x35d53549),
+ TOBN(0x9f5e58e2, 0xfcf9b838),
+ TOBN(0xc7186cee, 0xa7fd3cf5),
+ TOBN(0x77b868ce, 0xe978a1d3),
+ TOBN(0xe3a68b33, 0x7ab92d04),
+ TOBN(0x51029794, 0x87a5b862),
+ TOBN(0x5f0606c3, 0x3a61d41d),
+ TOBN(0x2814be27, 0x6f9326f1),
+ TOBN(0x2f521c14, 0xc6fe3c2e),
+ TOBN(0x17464d7d, 0xacdf7351),
+ TOBN(0x10f5f9d3, 0x777f7e44),
+ TOBN(0xce8e616b, 0x269fb37d),
+ TOBN(0xaaf73804, 0x7de62de5),
+ TOBN(0xaba11175, 0x4fdd4153),
+ TOBN(0x515759ba, 0x3770b49b),
+ TOBN(0x8b09ebf8, 0xaa423a61),
+ TOBN(0x592245a1, 0xcd41fb92),
+ TOBN(0x1cba8ec1, 0x9b4c8936),
+ TOBN(0xa87e91e3, 0xaf36710e),
+ TOBN(0x1fd84ce4, 0x3d34a2e3),
+ TOBN(0xee3759ce, 0xb43b5d61),
+ TOBN(0x895bc78c, 0x619186c7),
+ TOBN(0xf19c3809, 0xcbb9725a),
+ TOBN(0xc0be21aa, 0xde744b1f),
+ TOBN(0xa7d222b0, 0x60f8056b),
+ TOBN(0x74be6157, 0xb23efe11),
+ TOBN(0x6fab2b4f, 0x0cd68253),
+ TOBN(0xad33ea5f, 0x4bf1d725),
+ TOBN(0x9c1d8ee2, 0x4f6c950f),
+ TOBN(0x544ee78a, 0xa377af06),
+ TOBN(0x54f489bb, 0x94a113e1),
+ TOBN(0x8f11d634, 0x992fb7e8),
+ TOBN(0x0169a7aa, 0xa2a44347),
+ TOBN(0x1d49d4af, 0x95020e00),
+ TOBN(0x95945722, 0xe08e120b),
+ TOBN(0xb6e33878, 0xa4d32282),
+ TOBN(0xe36e029d, 0x48020ae7),
+ TOBN(0xe05847fb, 0x37a9b750),
+ TOBN(0xf876812c, 0xb29e3819),
+ TOBN(0x84ad138e, 0xd23a17f0),
+ TOBN(0x6d7b4480, 0xf0b3950e),
+ TOBN(0xdfa8aef4, 0x2fd67ae0),
+ TOBN(0x8d3eea24, 0x52333af6),
+ TOBN(0x0d052075, 0xb15d5acc),
+ TOBN(0xc6d9c79f, 0xbd815bc4),
+ TOBN(0x8dcafd88, 0xdfa36cf2),
+ TOBN(0x908ccbe2, 0x38aa9070),
+ TOBN(0x638722c4, 0xba35afce),
+ TOBN(0x5a3da8b0, 0xfd6abf0b),
+ TOBN(0x2dce252c, 0xc9c335c1),
+ TOBN(0x84e7f0de, 0x65aa799b),
+ TOBN(0x2101a522, 0xb99a72cb),
+ TOBN(0x06de6e67, 0x87618016),
+ TOBN(0x5ff8c7cd, 0xe6f3653e),
+ TOBN(0x0a821ab5, 0xc7a6754a),
+ TOBN(0x7e3fa52b, 0x7cb0b5a2),
+ TOBN(0xa7fb121c, 0xc9048790),
+ TOBN(0x1a725020, 0x06ce053a),
+ TOBN(0xb490a31f, 0x04e929b0),
+ TOBN(0xe17be47d, 0x62dd61ad),
+ TOBN(0x781a961c, 0x6be01371),
+ TOBN(0x1063bfd3, 0xdae3cbba),
+ TOBN(0x35647406, 0x7f73c9ba),
+ TOBN(0xf50e957b, 0x2736a129),
+ TOBN(0xa6313702, 0xed13f256),
+ TOBN(0x9436ee65, 0x3a19fcc5),
+ TOBN(0xcf2bdb29, 0xe7a4c8b6),
+ TOBN(0xb06b1244, 0xc5f95cd8),
+ TOBN(0xda8c8af0, 0xf4ab95f4),
+ TOBN(0x1bae59c2, 0xb9e5836d),
+ TOBN(0x07d51e7e, 0x3acffffc),
+ TOBN(0x01e15e6a, 0xc2ccbcda),
+ TOBN(0x3bc1923f, 0x8528c3e0),
+ TOBN(0x43324577, 0xa49fead4),
+ TOBN(0x61a1b884, 0x2aa7a711),
+ TOBN(0xf9a86e08, 0x700230ef),
+ TOBN(0x0af585a1, 0xbd19adf8),
+ TOBN(0x7645f361, 0xf55ad8f2),
+ TOBN(0x6e676223, 0x46c3614c),
+ TOBN(0x23cb257c, 0x4e774d3f),
+ TOBN(0x82a38513, 0xac102d1b),
+ TOBN(0x9bcddd88, 0x7b126aa5),
+ TOBN(0xe716998b, 0xeefd3ee4),
+ TOBN(0x4239d571, 0xfb167583),
+ TOBN(0xdd011c78, 0xd16c8f8a),
+ TOBN(0x271c2895, 0x69a27519),
+ TOBN(0x9ce0a3b7, 0xd2d64b6a),
+ TOBN(0x8c977289, 0xd5ec6738),
+ TOBN(0xa3b49f9a, 0x8840ef6b),
+ TOBN(0x808c14c9, 0x9a453419),
+ TOBN(0x5c00295b, 0x0cf0a2d5),
+ TOBN(0x524414fb, 0x1d4bcc76),
+ TOBN(0xb07691d2, 0x459a88f1),
+ TOBN(0x77f43263, 0xf70d110f),
+ TOBN(0x64ada5e0, 0xb7abf9f3),
+ TOBN(0xafd0f94e, 0x5b544cf5),
+ TOBN(0xb4a13a15, 0xfd2713fe),
+ TOBN(0xb99b7d6e, 0x250c74f4),
+ TOBN(0x097f2f73, 0x20324e45),
+ TOBN(0x994b37d8, 0xaffa8208),
+ TOBN(0xc3c31b0b, 0xdc29aafc),
+ TOBN(0x3da74651, 0x7a3a607f),
+ TOBN(0xd8e1b8c1, 0xfe6955d6),
+ TOBN(0x716e1815, 0xc8418682),
+ TOBN(0x541d487f, 0x7dc91d97),
+ TOBN(0x48a04669, 0xc6996982),
+ TOBN(0xf39cab15, 0x83a6502e),
+ TOBN(0x025801a0, 0xe68db055),
+ TOBN(0xf3569758, 0xba3338d5),
+ TOBN(0xb0c8c0aa, 0xee2afa84),
+ TOBN(0x4f6985d3, 0xfb6562d1),
+ TOBN(0x351f1f15, 0x132ed17a),
+ TOBN(0x510ed0b4, 0xc04365fe),
+ TOBN(0xa3f98138, 0xe5b1f066),
+ TOBN(0xbc9d95d6, 0x32df03dc),
+ TOBN(0xa83ccf6e, 0x19abd09e),
+ TOBN(0x0b4097c1, 0x4ff17edb),
+ TOBN(0x58a5c478, 0xd64a06ce),
+ TOBN(0x2ddcc3fd, 0x544a58fd),
+ TOBN(0xd449503d, 0x9e8153b8),
+ TOBN(0x3324fd02, 0x7774179b),
+ TOBN(0xaf5d47c8, 0xdbd9120c),
+ TOBN(0xeb860162, 0x34fa94db),
+ TOBN(0x5817bdd1, 0x972f07f4),
+ TOBN(0xe5579e2e, 0xd27bbceb),
+ TOBN(0x86847a1f, 0x5f11e5a6),
+ TOBN(0xb39ed255, 0x7c3cf048),
+ TOBN(0xe1076417, 0xa2f62e55),
+ TOBN(0x6b9ab38f, 0x1bcf82a2),
+ TOBN(0x4bb7c319, 0x7aeb29f9),
+ TOBN(0xf6d17da3, 0x17227a46),
+ TOBN(0xab53ddbd, 0x0f968c00),
+ TOBN(0xa03da7ec, 0x000c880b),
+ TOBN(0x7b239624, 0x6a9ad24d),
+ TOBN(0x612c0401, 0x01ec60d0),
+ TOBN(0x70d10493, 0x109f5df1),
+ TOBN(0xfbda4030, 0x80af7550),
+ TOBN(0x30b93f95, 0xc6b9a9b3),
+ TOBN(0x0c74ec71, 0x007d9418),
+ TOBN(0x94175564, 0x6edb951f),
+ TOBN(0x5f4a9d78, 0x7f22c282),
+ TOBN(0xb7870895, 0xb38d1196),
+ TOBN(0xbc593df3, 0xa228ce7c),
+ TOBN(0xc78c5bd4, 0x6af3641a),
+ TOBN(0x7802200b, 0x3d9b3dcc),
+ TOBN(0x0dc73f32, 0x8be33304),
+ TOBN(0x847ed87d, 0x61ffb79a),
+ TOBN(0xf85c974e, 0x6d671192),
+ TOBN(0x1e14100a, 0xde16f60f),
+ TOBN(0x45cb0d5a, 0x95c38797),
+ TOBN(0x18923bba, 0x9b022da4),
+ TOBN(0xef2be899, 0xbbe7e86e),
+ TOBN(0x4a1510ee, 0x216067bf),
+ TOBN(0xd98c8154, 0x84d5ce3e),
+ TOBN(0x1af777f0, 0xf92a2b90),
+ TOBN(0x9fbcb400, 0x4ef65724),
+ TOBN(0x3e04a4c9, 0x3c0ca6fe),
+ TOBN(0xfb3e2cb5, 0x55002994),
+ TOBN(0x1f3a93c5, 0x5363ecab),
+ TOBN(0x1fe00efe, 0x3923555b),
+ TOBN(0x744bedd9, 0x1e1751ea),
+ TOBN(0x3fb2db59, 0x6ab69357),
+ TOBN(0x8dbd7365, 0xf5e6618b),
+ TOBN(0x99d53099, 0xdf1ea40e),
+ TOBN(0xb3f24a0b, 0x57d61e64),
+ TOBN(0xd088a198, 0x596eb812),
+ TOBN(0x22c8361b, 0x5762940b),
+ TOBN(0x66f01f97, 0xf9c0d95c),
+ TOBN(0x88461172, 0x8e43cdae),
+ TOBN(0x11599a7f, 0xb72b15c3),
+ TOBN(0x135a7536, 0x420d95cc),
+ TOBN(0x2dcdf0f7, 0x5f7ae2f6),
+ TOBN(0x15fc6e1d, 0xd7fa6da2),
+ TOBN(0x81ca829a, 0xd1d441b6),
+ TOBN(0x84c10cf8, 0x04a106b6),
+ TOBN(0xa9b26c95, 0xa73fbbd0),
+ TOBN(0x7f24e0cb, 0x4d8f6ee8),
+ TOBN(0x48b45937, 0x1e25a043),
+ TOBN(0xf8a74fca, 0x036f3dfe),
+ TOBN(0x1ed46585, 0xc9f84296),
+ TOBN(0x7fbaa8fb, 0x3bc278b0),
+ TOBN(0xa8e96cd4, 0x6c4fcbd0),
+ TOBN(0x940a1202, 0x73b60a5f),
+ TOBN(0x34aae120, 0x55a4aec8),
+ TOBN(0x550e9a74, 0xdbd742f0),
+ TOBN(0x794456d7, 0x228c68ab),
+ TOBN(0x492f8868, 0xa4e25ec6),
+ TOBN(0x682915ad, 0xb2d8f398),
+ TOBN(0xf13b51cc, 0x5b84c953),
+ TOBN(0xcda90ab8, 0x5bb917d6),
+ TOBN(0x4b615560, 0x4ea3dee1),
+ TOBN(0x578b4e85, 0x0a52c1c8),
+ TOBN(0xeab1a695, 0x20b75fc4),
+ TOBN(0x60c14f3c, 0xaa0bb3c6),
+ TOBN(0x220f448a, 0xb8216094),
+ TOBN(0x4fe7ee31, 0xb0e63d34),
+ TOBN(0xf4600572, 0xa9e54fab),
+ TOBN(0xc0493334, 0xd5e7b5a4),
+ TOBN(0x8589fb92, 0x06d54831),
+ TOBN(0xaa70f5cc, 0x6583553a),
+ TOBN(0x0879094a, 0xe25649e5),
+ TOBN(0xcc904507, 0x10044652),
+ TOBN(0xebb0696d, 0x02541c4f),
+ TOBN(0x5a171fde, 0xb9718710),
+ TOBN(0x38f1bed8, 0xf374a9f5),
+ TOBN(0xc8c582e1, 0xba39bdc1),
+ TOBN(0xfc457b0a, 0x908cc0ce),
+ TOBN(0x9a187fd4, 0x883841e2),
+ TOBN(0x8ec25b39, 0x38725381),
+ TOBN(0x2553ed05, 0x96f84395),
+ TOBN(0x095c7661, 0x6f6c6897),
+ TOBN(0x917ac85c, 0x4bdc5610),
+ TOBN(0xb2885fe4, 0x179eb301),
+ TOBN(0x5fc65547, 0x8b78bdcc),
+ TOBN(0x4a9fc893, 0xe59e4699),
+ TOBN(0xbb7ff0cd, 0x3ce299af),
+ TOBN(0x195be9b3, 0xadf38b20),
+ TOBN(0x6a929c87, 0xd38ddb8f),
+ TOBN(0x55fcc99c, 0xb21a51b9),
+ TOBN(0x2b695b4c, 0x721a4593),
+ TOBN(0xed1e9a15, 0x768eaac2),
+ TOBN(0xfb63d71c, 0x7489f914),
+ TOBN(0xf98ba31c, 0x78118910),
+ TOBN(0x80291373, 0x9b128eb4),
+ TOBN(0x7801214e, 0xd448af4a),
+ TOBN(0xdbd2e22b, 0x55418dd3),
+ TOBN(0xeffb3c0d, 0xd3998242),
+ TOBN(0xdfa6077c, 0xc7bf3827),
+ TOBN(0xf2165bcb, 0x47f8238f),
+ TOBN(0xfe37cf68, 0x8564d554),
+ TOBN(0xe5f825c4, 0x0a81fb98),
+ TOBN(0x43cc4f67, 0xffed4d6f),
+ TOBN(0xbc609578, 0xb50a34b0),
+ TOBN(0x8aa8fcf9, 0x5041faf1),
+ TOBN(0x5659f053, 0x651773b6),
+ TOBN(0xe87582c3, 0x6044d63b),
+ TOBN(0xa6089409, 0x0cdb0ca0),
+ TOBN(0x8c993e0f, 0xbfb2bcf6),
+ TOBN(0xfc64a719, 0x45985cfc),
+ TOBN(0x15c4da80, 0x83dbedba),
+ TOBN(0x804ae112, 0x2be67df7),
+ TOBN(0xda4c9658, 0xa23defde),
+ TOBN(0x12002ddd, 0x5156e0d3),
+ TOBN(0xe68eae89, 0x5dd21b96),
+ TOBN(0x8b99f28b, 0xcf44624d),
+ TOBN(0x0ae00808, 0x1ec8897a),
+ TOBN(0xdd0a9303, 0x6712f76e),
+ TOBN(0x96237522, 0x4e233de4),
+ TOBN(0x192445b1, 0x2b36a8a5),
+ TOBN(0xabf9ff74, 0x023993d9),
+ TOBN(0x21f37bf4, 0x2aad4a8f),
+ TOBN(0x340a4349, 0xf8bd2bbd),
+ TOBN(0x1d902cd9, 0x4868195d),
+ TOBN(0x3d27bbf1, 0xe5fdb6f1),
+ TOBN(0x7a5ab088, 0x124f9f1c),
+ TOBN(0xc466ab06, 0xf7a09e03),
+ TOBN(0x2f8a1977, 0x31f2c123),
+ TOBN(0xda355dc7, 0x041b6657),
+ TOBN(0xcb840d12, 0x8ece2a7c),
+ TOBN(0xb600ad9f, 0x7db32675),
+ TOBN(0x78fea133, 0x07a06f1b),
+ TOBN(0x5d032269, 0xb31f6094),
+ TOBN(0x07753ef5, 0x83ec37aa),
+ TOBN(0x03485aed, 0x9c0bea78),
+ TOBN(0x41bb3989, 0xbc3f4524),
+ TOBN(0x09403761, 0x697f726d),
+ TOBN(0x6109beb3, 0xdf394820),
+ TOBN(0x804111ea, 0x3b6d1145),
+ TOBN(0xb6271ea9, 0xa8582654),
+ TOBN(0x619615e6, 0x24e66562),
+ TOBN(0xa2554945, 0xd7b6ad9c),
+ TOBN(0xd9c4985e, 0x99bfe35f),
+ TOBN(0x9770ccc0, 0x7b51cdf6),
+ TOBN(0x7c327013, 0x92881832),
+ TOBN(0x8777d45f, 0x286b26d1),
+ TOBN(0x9bbeda22, 0xd847999d),
+ TOBN(0x03aa33b6, 0xc3525d32),
+ TOBN(0x4b7b96d4, 0x28a959a1),
+ TOBN(0xbb3786e5, 0x31e5d234),
+ TOBN(0xaeb5d3ce, 0x6961f247),
+ TOBN(0x20aa85af, 0x02f93d3f),
+ TOBN(0x9cd1ad3d, 0xd7a7ae4f),
+ TOBN(0xbf6688f0, 0x781adaa8),
+ TOBN(0xb1b40e86, 0x7469cead),
+ TOBN(0x1904c524, 0x309fca48),
+ TOBN(0x9b7312af, 0x4b54bbc7),
+ TOBN(0xbe24bf8f, 0x593affa2),
+ TOBN(0xbe5e0790, 0xbd98764b),
+ TOBN(0xa0f45f17, 0xa26e299e),
+ TOBN(0x4af0d2c2, 0x6b8fe4c7),
+ TOBN(0xef170db1, 0x8ae8a3e6),
+ TOBN(0x0e8d61a0, 0x29e0ccc1),
+ TOBN(0xcd53e87e, 0x60ad36ca),
+ TOBN(0x328c6623, 0xc8173822),
+ TOBN(0x7ee1767d, 0xa496be55),
+ TOBN(0x89f13259, 0x648945af),
+ TOBN(0x9e45a5fd, 0x25c8009c),
+ TOBN(0xaf2febd9, 0x1f61ab8c),
+ TOBN(0x43f6bc86, 0x8a275385),
+ TOBN(0x87792348, 0xf2142e79),
+ TOBN(0x17d89259, 0xc6e6238a),
+ TOBN(0x7536d2f6, 0x4a839d9b),
+ TOBN(0x1f428fce, 0x76a1fbdc),
+ TOBN(0x1c109601, 0x0db06dfe),
+ TOBN(0xbfc16bc1, 0x50a3a3cc),
+ TOBN(0xf9cbd9ec, 0x9b30f41b),
+ TOBN(0x5b5da0d6, 0x00138cce),
+ TOBN(0xec1d0a48, 0x56ef96a7),
+ TOBN(0xb47eb848, 0x982bf842),
+ TOBN(0x66deae32, 0xec3f700d),
+ TOBN(0x4e43c42c, 0xaa1181e0),
+ TOBN(0xa1d72a31, 0xd1a4aa2a),
+ TOBN(0x440d4668, 0xc004f3ce),
+ TOBN(0x0d6a2d3b, 0x45fe8a7a),
+ TOBN(0x820e52e2, 0xfb128365),
+ TOBN(0x29ac5fcf, 0x25e51b09),
+ TOBN(0x180cd2bf, 0x2023d159),
+ TOBN(0xa9892171, 0xa1ebf90e),
+ TOBN(0xf97c4c87, 0x7c132181),
+ TOBN(0x9f1dc724, 0xc03dbb7e),
+ TOBN(0xae043765, 0x018cbbe4),
+ TOBN(0xfb0b2a36, 0x0767d153),
+ TOBN(0xa8e2f4d6, 0x249cbaeb),
+ TOBN(0x172a5247, 0xd95ea168),
+ TOBN(0x1758fada, 0x2970764a),
+ TOBN(0xac803a51, 0x1d978169),
+ TOBN(0x299cfe2e, 0xde77e01b),
+ TOBN(0x652a1e17, 0xb0a98927),
+ TOBN(0x2e26e1d1, 0x20014495),
+ TOBN(0x7ae0af9f, 0x7175b56a),
+ TOBN(0xc2e22a80, 0xd64b9f95),
+ TOBN(0x4d0ff9fb, 0xd90a060a),
+ TOBN(0x496a27db, 0xbaf38085),
+ TOBN(0x32305401, 0xda776bcf),
+ TOBN(0xb8cdcef6, 0x725f209e),
+ TOBN(0x61ba0f37, 0x436a0bba),
+ TOBN(0x263fa108, 0x76860049),
+ TOBN(0x92beb98e, 0xda3542cf),
+ TOBN(0xa2d4d14a, 0xd5849538),
+ TOBN(0x989b9d68, 0x12e9a1bc),
+ TOBN(0x61d9075c, 0x5f6e3268),
+ TOBN(0x352c6aa9, 0x99ace638),
+ TOBN(0xde4e4a55, 0x920f43ff),
+ TOBN(0xe5e4144a, 0xd673c017),
+ TOBN(0x667417ae, 0x6f6e05ea),
+ TOBN(0x613416ae, 0xdcd1bd56),
+ TOBN(0x5eb36201, 0x86693711),
+ TOBN(0x2d7bc504, 0x3a1aa914),
+ TOBN(0x175a1299, 0x76dc5975),
+ TOBN(0xe900e0f2, 0x3fc8125c),
+ TOBN(0x569ef68c, 0x11198875),
+ TOBN(0x9012db63, 0x63a113b4),
+ TOBN(0xe3bd3f56, 0x98835766),
+ TOBN(0xa5c94a52, 0x76412dea),
+ TOBN(0xad9e2a09, 0xaa735e5c),
+ TOBN(0x405a984c, 0x508b65e9),
+ TOBN(0xbde4a1d1, 0x6df1a0d1),
+ TOBN(0x1a9433a1, 0xdfba80da),
+ TOBN(0xe9192ff9, 0x9440ad2e),
+ TOBN(0x9f649696, 0x5099fe92),
+ TOBN(0x25ddb65c, 0x0b27a54a),
+ TOBN(0x178279dd, 0xc590da61),
+ TOBN(0x5479a999, 0xfbde681a),
+ TOBN(0xd0e84e05, 0x013fe162),
+ TOBN(0xbe11dc92, 0x632d471b),
+ TOBN(0xdf0b0c45, 0xfc0e089f),
+ TOBN(0x04fb15b0, 0x4c144025),
+ TOBN(0xa61d5fc2, 0x13c99927),
+ TOBN(0xa033e9e0, 0x3de2eb35),
+ TOBN(0xf8185d5c, 0xb8dacbb4),
+ TOBN(0x9a88e265, 0x8644549d),
+ TOBN(0xf717af62, 0x54671ff6),
+ TOBN(0x4bd4241b, 0x5fa58603),
+ TOBN(0x06fba40b, 0xe67773c0),
+ TOBN(0xc1d933d2, 0x6a2847e9),
+ TOBN(0xf4f5acf3, 0x689e2c70),
+ TOBN(0x92aab0e7, 0x46bafd31),
+ TOBN(0x798d76aa, 0x3473f6e5),
+ TOBN(0xcc6641db, 0x93141934),
+ TOBN(0xcae27757, 0xd31e535e),
+ TOBN(0x04cc43b6, 0x87c2ee11),
+ TOBN(0x8d1f9675, 0x2e029ffa),
+ TOBN(0xc2150672, 0xe4cc7a2c),
+ TOBN(0x3b03c1e0, 0x8d68b013),
+ TOBN(0xa9d6816f, 0xedf298f3),
+ TOBN(0x1bfbb529, 0xa2804464),
+ TOBN(0x95a52fae, 0x5db22125),
+ TOBN(0x55b32160, 0x0e1cb64e),
+ TOBN(0x004828f6, 0x7e7fc9fe),
+ TOBN(0x13394b82, 0x1bb0fb93),
+ TOBN(0xb6293a2d, 0x35f1a920),
+ TOBN(0xde35ef21, 0xd145d2d9),
+ TOBN(0xbe6225b3, 0xbb8fa603),
+ TOBN(0x00fc8f6b, 0x32cf252d),
+ TOBN(0xa28e52e6, 0x117cf8c2),
+ TOBN(0x9d1dc89b, 0x4c371e6d),
+ TOBN(0xcebe0675, 0x36ef0f28),
+ TOBN(0x5de05d09, 0xa4292f81),
+ TOBN(0xa8303593, 0x353e3083),
+ TOBN(0xa1715b0a, 0x7e37a9bb),
+ TOBN(0x8c56f61e, 0x2b8faec3),
+ TOBN(0x52507431, 0x33c9b102),
+ TOBN(0x0130cefc, 0xa44431f0),
+ TOBN(0x56039fa0, 0xbd865cfb),
+ TOBN(0x4b03e578, 0xbc5f1dd7),
+ TOBN(0x40edf2e4, 0xbabe7224),
+ TOBN(0xc752496d, 0x3a1988f6),
+ TOBN(0xd1572d3b, 0x564beb6b),
+ TOBN(0x0db1d110, 0x39a1c608),
+ TOBN(0x568d1934, 0x16f60126),
+ TOBN(0x05ae9668, 0xf354af33),
+ TOBN(0x19de6d37, 0xc92544f2),
+ TOBN(0xcc084353, 0xa35837d5),
+ TOBN(0xcbb6869c, 0x1a514ece),
+ TOBN(0xb633e728, 0x2e1d1066),
+ TOBN(0xf15dd69f, 0x936c581c),
+ TOBN(0x96e7b8ce, 0x7439c4f9),
+ TOBN(0x5e676f48, 0x2e448a5b),
+ TOBN(0xb2ca7d5b, 0xfd916bbb),
+ TOBN(0xd55a2541, 0xf5024025),
+ TOBN(0x47bc5769, 0xe4c2d937),
+ TOBN(0x7d31b92a, 0x0362189f),
+ TOBN(0x83f3086e, 0xef7816f9),
+ TOBN(0xf9f46d94, 0xb587579a),
+ TOBN(0xec2d22d8, 0x30e76c5f),
+ TOBN(0x27d57461, 0xb000ffcf),
+ TOBN(0xbb7e65f9, 0x364ffc2c),
+ TOBN(0x7c7c9477, 0x6652a220),
+ TOBN(0x61618f89, 0xd696c981),
+ TOBN(0x5021701d, 0x89effff3),
+ TOBN(0xf2c8ff8e, 0x7c314163),
+ TOBN(0x2da413ad, 0x8efb4d3e),
+ TOBN(0x937b5adf, 0xce176d95),
+ TOBN(0x22867d34, 0x2a67d51c),
+ TOBN(0x262b9b10, 0x18eb3ac9),
+ TOBN(0x4e314fe4, 0xc43ff28b),
+ TOBN(0x76476627, 0x6a664e7a),
+ TOBN(0x3e90e40b, 0xb7a565c2),
+ TOBN(0x8588993a, 0xc1acf831),
+ TOBN(0xd7b501d6, 0x8f938829),
+ TOBN(0x996627ee, 0x3edd7d4c),
+ TOBN(0x37d44a62, 0x90cd34c7),
+ TOBN(0xa8327499, 0xf3833e8d),
+ TOBN(0x2e18917d, 0x4bf50353),
+ TOBN(0x85dd726b, 0x556765fb),
+ TOBN(0x54fe65d6, 0x93d5ab66),
+ TOBN(0x3ddbaced, 0x915c25fe),
+ TOBN(0xa799d9a4, 0x12f22e85),
+ TOBN(0xe2a24867, 0x6d06f6bc),
+ TOBN(0xf4f1ee56, 0x43ca1637),
+ TOBN(0xfda2828b, 0x61ece30a),
+ TOBN(0x758c1a3e, 0xa2dee7a6),
+ TOBN(0xdcde2f3c, 0x734b2284),
+ TOBN(0xaba445d2, 0x4eaba6ad),
+ TOBN(0x35aaf668, 0x76cee0a7),
+ TOBN(0x7e0b04a9, 0xe5aa049a),
+ TOBN(0xe74083ad, 0x91103e84),
+ TOBN(0xbeb183ce, 0x40afecc3),
+ TOBN(0x6b89de9f, 0xea043f7a),
+ },
+ { TOBN(0x0e299d23, 0xfe67ba66), TOBN(0x91450760, 0x93cf2f34),
+ TOBN(0xf45b5ea9, 0x97fcf913), TOBN(0x5be00843, 0x8bd7ddda),
+ TOBN(0x358c3e05, 0xd53ff04d), TOBN(0xbf7ccdc3, 0x5de91ef7),
+ TOBN(0xad684dbf, 0xb69ec1a0), TOBN(0x367e7cf2, 0x801fd997),
+ TOBN(0x0ca1f3b7, 0xb0dc8595), TOBN(0x27de4608, 0x9f1d9f2e),
+ TOBN(0x1af3bf39, 0xbadd82a7), TOBN(0x79356a79, 0x65862448),
+ TOBN(0xc0602345, 0xf5f9a052), TOBN(0x1a8b0f89, 0x139a42f9),
+ TOBN(0xb53eee42, 0x844d40fc), TOBN(0x93b0bfe5, 0x4e5b6368),
+ TOBN(0x5434dd02, 0xc024789c), TOBN(0x90dca9ea, 0x41b57bfc),
+ TOBN(0x8aa898e2, 0x243398df), TOBN(0xf607c834, 0x894a94bb),
+ TOBN(0xbb07be97, 0xc2c99b76), TOBN(0x6576ba67, 0x18c29302),
+ TOBN(0x3d79efcc, 0xe703a88c), TOBN(0xf259ced7, 0xb6a0d106),
+ TOBN(0x0f893a5d, 0xc8de610b), TOBN(0xe8c515fb, 0x67e223ce),
+ TOBN(0x7774bfa6, 0x4ead6dc5), TOBN(0x89d20f95, 0x925c728f),
+ TOBN(0x7a1e0966, 0x098583ce), TOBN(0xa2eedb94, 0x93f2a7d7),
+ TOBN(0x1b282097, 0x4c304d4a), TOBN(0x0842e3da, 0xc077282d),
+ TOBN(0xe4d972a3, 0x3b9e2d7b), TOBN(0x7cc60b27, 0xc48218ff),
+ TOBN(0x8fc70838, 0x84149d91), TOBN(0x5c04346f, 0x2f461ecc),
+ TOBN(0xebe9fdf2, 0x614650a9), TOBN(0x5e35b537, 0xc1f666ac),
+ TOBN(0x645613d1, 0x88babc83), TOBN(0x88cace3a, 0xc5e1c93e),
+ TOBN(0x209ca375, 0x3de92e23), TOBN(0xccb03cc8, 0x5fbbb6e3),
+ TOBN(0xccb90f03, 0xd7b1487e), TOBN(0xfa9c2a38, 0xc710941f),
+ TOBN(0x756c3823, 0x6724ceed), TOBN(0x3a902258, 0x192d0323),
+ TOBN(0xb150e519, 0xea5e038e), TOBN(0xdcba2865, 0xc7427591),
+ TOBN(0xe549237f, 0x78890732), TOBN(0xc443bef9, 0x53fcb4d9),
+ TOBN(0x9884d8a6, 0xeb3480d6), TOBN(0x8a35b6a1, 0x3048b186),
+ TOBN(0xb4e44716, 0x65e9a90a), TOBN(0x45bf380d, 0x653006c0),
+ TOBN(0x8f3f820d, 0x4fe9ae3b), TOBN(0x244a35a0, 0x979a3b71),
+ TOBN(0xa1010e9d, 0x74cd06ff), TOBN(0x9c17c7df, 0xaca3eeac),
+ TOBN(0x74c86cd3, 0x8063aa2b), TOBN(0x8595c4b3, 0x734614ff),
+ TOBN(0xa3de00ca, 0x990f62cc), TOBN(0xd9bed213, 0xca0c3be5),
+ TOBN(0x7886078a, 0xdf8ce9f5), TOBN(0xddb27ce3, 0x5cd44444),
+ TOBN(0xed374a66, 0x58926ddd), TOBN(0x138b2d49, 0x908015b8),
+ TOBN(0x886c6579, 0xde1f7ab8), TOBN(0x888b9aa0, 0xc3020b7a),
+ TOBN(0xd3ec034e, 0x3a96e355), TOBN(0xba65b0b8, 0xf30fbe9a),
+ TOBN(0x064c8e50, 0xff21367a), TOBN(0x1f508ea4, 0x0b04b46e),
+ TOBN(0x98561a49, 0x747c866c), TOBN(0xbbb1e5fe, 0x0518a062),
+ TOBN(0x20ff4e8b, 0xecdc3608), TOBN(0x7f55cded, 0x20184027),
+ TOBN(0x8d73ec95, 0xf38c85f0), TOBN(0x5b589fdf, 0x8bc3b8c3),
+ TOBN(0xbe95dd98, 0x0f12b66f), TOBN(0xf5bd1a09, 0x0e338e01),
+ TOBN(0x65163ae5, 0x5e915918), TOBN(0x6158d6d9, 0x86f8a46b),
+ TOBN(0x8466b538, 0xeeebf99c), TOBN(0xca8761f6, 0xbca477ef),
+ TOBN(0xaf3449c2, 0x9ebbc601), TOBN(0xef3b0f41, 0xe0c3ae2f),
+ TOBN(0xaa6c577d, 0x5de63752), TOBN(0xe9166601, 0x64682a51),
+ TOBN(0x5a3097be, 0xfc15aa1e), TOBN(0x40d12548, 0xb54b0745),
+ TOBN(0x5bad4706, 0x519a5f12), TOBN(0xed03f717, 0xa439dee6),
+ TOBN(0x0794bb6c, 0x4a02c499), TOBN(0xf725083d, 0xcffe71d2),
+ TOBN(0x2cad7519, 0x0f3adcaf), TOBN(0x7f68ea1c, 0x43729310),
+ TOBN(0xe747c8c7, 0xb7ffd977), TOBN(0xec104c35, 0x80761a22),
+ TOBN(0x8395ebaf, 0x5a3ffb83), TOBN(0xfb3261f4, 0xe4b63db7),
+ TOBN(0x53544960, 0xd883e544), TOBN(0x13520d70, 0x8cc2eeb8),
+ TOBN(0x08f6337b, 0xd3d65f99), TOBN(0x83997db2, 0x781cf95b),
+ TOBN(0xce6ff106, 0x0dbd2c01), TOBN(0x4f8eea6b, 0x1f9ce934),
+ TOBN(0x546f7c4b, 0x0e993921), TOBN(0x6236a324, 0x5e753fc7),
+ TOBN(0x65a41f84, 0xa16022e9), TOBN(0x0c18d878, 0x43d1dbb2),
+ TOBN(0x73c55640, 0x2d4cef9c), TOBN(0xa0428108, 0x70444c74),
+ TOBN(0x68e4f15e, 0x9afdfb3c), TOBN(0x49a56143, 0x5bdfb6df),
+ TOBN(0xa9bc1bd4, 0x5f823d97), TOBN(0xbceb5970, 0xea111c2a),
+ TOBN(0x366b455f, 0xb269bbc4), TOBN(0x7cd85e1e, 0xe9bc5d62),
+ TOBN(0xc743c41c, 0x4f18b086), TOBN(0xa4b40990, 0x95294fb9),
+ TOBN(0x9c7c581d, 0x26ee8382), TOBN(0xcf17dcc5, 0x359d638e),
+ TOBN(0xee8273ab, 0xb728ae3d), TOBN(0x1d112926, 0xf821f047),
+ TOBN(0x11498477, 0x50491a74), TOBN(0x687fa761, 0xfde0dfb9),
+ TOBN(0x2c258022, 0x7ea435ab), TOBN(0x6b8bdb94, 0x91ce7e3f),
+ TOBN(0x4c5b5dc9, 0x3bf834aa), TOBN(0x04371819, 0x4f6c7e4b),
+ TOBN(0xc284e00a, 0x3736bcad), TOBN(0x0d881118, 0x21ae8f8d),
+ TOBN(0xf9cf0f82, 0xf48c8e33), TOBN(0xa11fd075, 0xa1bf40db),
+ TOBN(0xdceab0de, 0xdc2733e5), TOBN(0xc560a8b5, 0x8e986bd7),
+ TOBN(0x48dd1fe2, 0x3929d097), TOBN(0x3885b290, 0x92f188f1),
+ TOBN(0x0f2ae613, 0xda6fcdac), TOBN(0x9054303e, 0xb662a46c),
+ TOBN(0xb6871e44, 0x0738042a), TOBN(0x98e6a977, 0xbdaf6449),
+ TOBN(0xd8bc0650, 0xd1c9df1b), TOBN(0xef3d6451, 0x36e098f9),
+ TOBN(0x03fbae82, 0xb6d72d28), TOBN(0x77ca9db1, 0xf5d84080),
+ TOBN(0x8a112cff, 0xa58efc1c), TOBN(0x518d761c, 0xc564cb4a),
+ TOBN(0x69b5740e, 0xf0d1b5ce), TOBN(0x717039cc, 0xe9eb1785),
+ TOBN(0x3fe29f90, 0x22f53382), TOBN(0x8e54ba56, 0x6bc7c95c),
+ TOBN(0x9c806d8a, 0xf7f91d0f), TOBN(0x3b61b0f1, 0xa82a5728),
+ TOBN(0x4640032d, 0x94d76754), TOBN(0x273eb5de, 0x47d834c6),
+ TOBN(0x2988abf7, 0x7b4e4d53), TOBN(0xb7ce66bf, 0xde401777),
+ TOBN(0x9fba6b32, 0x715071b3), TOBN(0x82413c24, 0xad3a1a98),
+ TOBN(0x5b7fc8c4, 0xe0e8ad93), TOBN(0xb5679aee, 0x5fab868d),
+ TOBN(0xb1f9d2fa, 0x2b3946f3), TOBN(0x458897dc, 0x5685b50a),
+ TOBN(0x1e98c930, 0x89d0caf3), TOBN(0x39564c5f, 0x78642e92),
+ TOBN(0x1b77729a, 0x0dbdaf18), TOBN(0xf9170722, 0x579e82e6),
+ TOBN(0x680c0317, 0xe4515fa5), TOBN(0xf85cff84, 0xfb0c790f),
+ TOBN(0xc7a82aab, 0x6d2e0765), TOBN(0x7446bca9, 0x35c82b32),
+ TOBN(0x5de607aa, 0x6d63184f), TOBN(0x7c1a46a8, 0x262803a6),
+ TOBN(0xd218313d, 0xaebe8035), TOBN(0x92113ffd, 0xc73c51f8),
+ TOBN(0x4b38e083, 0x12e7e46c), TOBN(0x69d0a37a, 0x56126bd5),
+ TOBN(0xfb3f324b, 0x73c07e04), TOBN(0xa0c22f67, 0x8fda7267),
+ TOBN(0x8f2c0051, 0x4d2c7d8f), TOBN(0xbc45ced3, 0xcbe2cae5),
+ TOBN(0xe1c6cf07, 0xa8f0f277), TOBN(0xbc392312, 0x1eb99a98),
+ TOBN(0x75537b7e, 0x3cc8ac85), TOBN(0x8d725f57, 0xdd02753b),
+ TOBN(0xfd05ff64, 0xb737df2f), TOBN(0x55fe8712, 0xf6d2531d),
+ TOBN(0x57ce04a9, 0x6ab6b01c), TOBN(0x69a02a89, 0x7cd93724),
+ TOBN(0x4f82ac35, 0xcf86699b), TOBN(0x8242d3ad, 0x9cb4b232),
+ TOBN(0x713d0f65, 0xd62105e5), TOBN(0xbb222bfa, 0x2d29be61),
+ TOBN(0xf2f9a79e, 0x6cfbef09), TOBN(0xfc24d8d3, 0xd5d6782f),
+ TOBN(0x5db77085, 0xd4129967), TOBN(0xdb81c3cc, 0xdc3c2a43),
+ TOBN(0x9d655fc0, 0x05d8d9a3), TOBN(0x3f5d057a, 0x54298026),
+ TOBN(0x1157f56d, 0x88c54694), TOBN(0xb26baba5, 0x9b09573e),
+ TOBN(0x2cab03b0, 0x22adffd1), TOBN(0x60a412c8, 0xdd69f383),
+ TOBN(0xed76e98b, 0x54b25039), TOBN(0xd4ee67d3, 0x687e714d),
+ TOBN(0x87739648, 0x7b00b594), TOBN(0xce419775, 0xc9ef709b),
+ TOBN(0x40f76f85, 0x1c203a40), TOBN(0x30d352d6, 0xeafd8f91),
+ TOBN(0xaf196d3d, 0x95578dd2), TOBN(0xea4bb3d7, 0x77cc3f3d),
+ TOBN(0x42a5bd03, 0xb98e782b), TOBN(0xac958c40, 0x0624920d),
+ TOBN(0xb838134c, 0xfc56fcc8), TOBN(0x86ec4ccf, 0x89572e5e),
+ TOBN(0x69c43526, 0x9be47be0), TOBN(0x323b7dd8, 0xcb28fea1),
+ TOBN(0xfa5538ba, 0x3a6c67e5), TOBN(0xef921d70, 0x1d378e46),
+ TOBN(0xf92961fc, 0x3c4b880e), TOBN(0x3f6f914e, 0x98940a67),
+ TOBN(0xa990eb0a, 0xfef0ff39), TOBN(0xa6c2920f, 0xf0eeff9c),
+ TOBN(0xca804166, 0x51b8d9a3), TOBN(0x42531bc9, 0x0ffb0db1),
+ TOBN(0x72ce4718, 0xaa82e7ce), TOBN(0x6e199913, 0xdf574741),
+ TOBN(0xd5f1b13d, 0xd5d36946), TOBN(0x8255dc65, 0xf68f0194),
+ TOBN(0xdc9df4cd, 0x8710d230), TOBN(0x3453c20f, 0x138c1988),
+ TOBN(0x9af98dc0, 0x89a6ef01), TOBN(0x4dbcc3f0, 0x9857df85),
+ TOBN(0x34805601, 0x5c1ad924), TOBN(0x40448da5, 0xd0493046),
+ TOBN(0xf629926d, 0x4ee343e2), TOBN(0x6343f1bd, 0x90e8a301),
+ TOBN(0xefc93491, 0x40815b3f), TOBN(0xf882a423, 0xde8f66fb),
+ TOBN(0x3a12d5f4, 0xe7db9f57), TOBN(0x7dfba38a, 0x3c384c27),
+ TOBN(0x7a904bfd, 0x6fc660b1), TOBN(0xeb6c5db3, 0x2773b21c),
+ TOBN(0xc350ee66, 0x1cdfe049), TOBN(0x9baac0ce, 0x44540f29),
+ TOBN(0xbc57b6ab, 0xa5ec6aad), TOBN(0x167ce8c3, 0x0a7c1baa),
+ TOBN(0xb23a03a5, 0x53fb2b56), TOBN(0x6ce141e7, 0x4e057f78),
+ TOBN(0x796525c3, 0x89e490d9), TOBN(0x0bc95725, 0xa31a7e75),
+ TOBN(0x1ec56791, 0x1220fd06), TOBN(0x716e3a3c, 0x408b0bd6),
+ TOBN(0x31cd6bf7, 0xe8ebeba9), TOBN(0xa7326ca6, 0xbee6b670),
+ TOBN(0x3d9f851c, 0xcd090c43), TOBN(0x561e8f13, 0xf12c3988),
+ TOBN(0x50490b6a, 0x904b7be4), TOBN(0x61690ce1, 0x0410737b),
+ TOBN(0x299e9a37, 0x0f009052), TOBN(0x258758f0, 0xf026092e),
+ TOBN(0x9fa255f3, 0xfdfcdc0f), TOBN(0xdbc9fb1f, 0xc0e1bcd2),
+ TOBN(0x35f9dd6e, 0x24651840), TOBN(0xdca45a84, 0xa5c59abc),
+ TOBN(0x103d396f, 0xecca4938), TOBN(0x4532da0a, 0xb97b3f29),
+ TOBN(0xc4135ea5, 0x1999a6bf), TOBN(0x3aa9505a, 0x5e6bf2ee),
+ TOBN(0xf77cef06, 0x3f5be093), TOBN(0x97d1a0f8, 0xa943152e),
+ TOBN(0x2cb0ebba, 0x2e1c21dd), TOBN(0xf41b29fc, 0x2c6797c4),
+ TOBN(0xc6e17321, 0xb300101f), TOBN(0x4422b0e9, 0xd0d79a89),
+ TOBN(0x49e4901c, 0x92f1bfc4), TOBN(0x06ab1f8f, 0xe1e10ed9),
+ TOBN(0x84d35577, 0xdb2926b8), TOBN(0xca349d39, 0x356e8ec2),
+ TOBN(0x70b63d32, 0x343bf1a9), TOBN(0x8fd3bd28, 0x37d1a6b1),
+ TOBN(0x0454879c, 0x316865b4), TOBN(0xee959ff6, 0xc458efa2),
+ TOBN(0x0461dcf8, 0x9706dc3f), TOBN(0x737db0e2, 0x164e4b2e),
+ TOBN(0x09262680, 0x2f8843c8), TOBN(0x54498bbc, 0x7745e6f6),
+ TOBN(0x359473fa, 0xa29e24af), TOBN(0xfcc3c454, 0x70aa87a1),
+ TOBN(0xfd2c4bf5, 0x00573ace), TOBN(0xb65b514e, 0x28dd1965),
+ TOBN(0xe46ae7cf, 0x2193e393), TOBN(0x60e9a4e1, 0xf5444d97),
+ TOBN(0xe7594e96, 0x00ff38ed), TOBN(0x43d84d2f, 0x0a0e0f02),
+ TOBN(0x8b6db141, 0xee398a21), TOBN(0xb88a56ae, 0xe3bcc5be),
+ TOBN(0x0a1aa52f, 0x373460ea), TOBN(0x20da1a56, 0x160bb19b),
+ TOBN(0xfb54999d, 0x65bf0384), TOBN(0x71a14d24, 0x5d5a180e),
+ TOBN(0xbc44db7b, 0x21737b04), TOBN(0xd84fcb18, 0x01dd8e92),
+ TOBN(0x80de937b, 0xfa44b479), TOBN(0x53505499, 0x5c98fd4f),
+ TOBN(0x1edb12ab, 0x28f08727), TOBN(0x4c58b582, 0xa5f3ef53),
+ TOBN(0xbfb236d8, 0x8327f246), TOBN(0xc3a3bfaa, 0x4d7df320),
+ TOBN(0xecd96c59, 0xb96024f2), TOBN(0xfc293a53, 0x7f4e0433),
+ TOBN(0x5341352b, 0x5acf6e10), TOBN(0xc50343fd, 0xafe652c3),
+ TOBN(0x4af3792d, 0x18577a7f), TOBN(0xe1a4c617, 0xaf16823d),
+ TOBN(0x9b26d0cd, 0x33425d0a), TOBN(0x306399ed, 0x9b7bc47f),
+ TOBN(0x2a792f33, 0x706bb20b), TOBN(0x31219614, 0x98111055),
+ TOBN(0x864ec064, 0x87f5d28b), TOBN(0x11392d91, 0x962277fd),
+ TOBN(0xb5aa7942, 0xbb6aed5f), TOBN(0x080094dc, 0x47e799d9),
+ TOBN(0x4afa588c, 0x208ba19b), TOBN(0xd3e7570f, 0x8512f284),
+ TOBN(0xcbae64e6, 0x02f5799a), TOBN(0xdeebe7ef, 0x514b9492),
+ TOBN(0x30300f98, 0xe5c298ff), TOBN(0x17f561be, 0x3678361f),
+ TOBN(0xf52ff312, 0x98cb9a16), TOBN(0x6233c3bc, 0x5562d490),
+ TOBN(0x7bfa15a1, 0x92e3a2cb), TOBN(0x961bcfd1, 0xe6365119),
+ TOBN(0x3bdd29bf, 0x2c8c53b1), TOBN(0x739704df, 0x822844ba),
+ TOBN(0x7dacfb58, 0x7e7b754b), TOBN(0x23360791, 0xa806c9b9),
+ TOBN(0xe7eb88c9, 0x23504452), TOBN(0x2983e996, 0x852c1783),
+ TOBN(0xdd4ae529, 0x958d881d), TOBN(0x026bae03, 0x262c7b3c),
+ TOBN(0x3a6f9193, 0x960b52d1), TOBN(0xd0980f90, 0x92696cfb),
+ TOBN(0x4c1f428c, 0xd5f30851), TOBN(0x94dfed27, 0x2a4f6630),
+ TOBN(0x4df53772, 0xfc5d48a4), TOBN(0xdd2d5a2f, 0x933260ce),
+ TOBN(0x574115bd, 0xd44cc7a5), TOBN(0x4ba6b20d, 0xbd12533a),
+ TOBN(0x30e93cb8, 0x243057c9), TOBN(0x794c486a, 0x14de320e),
+ TOBN(0xe925d4ce, 0xf21496e4), TOBN(0xf951d198, 0xec696331),
+ TOBN(0x9810e2de, 0x3e8d812f), TOBN(0xd0a47259, 0x389294ab),
+ TOBN(0x513ba2b5, 0x0e3bab66), TOBN(0x462caff5, 0xabad306f),
+ TOBN(0xe2dc6d59, 0xaf04c49e), TOBN(0x1aeb8750, 0xe0b84b0b),
+ TOBN(0xc034f12f, 0x2f7d0ca2), TOBN(0x6d2e8128, 0xe06acf2f),
+ TOBN(0x801f4f83, 0x21facc2f), TOBN(0xa1170c03, 0xf40ef607),
+ TOBN(0xfe0a1d4f, 0x7805a99c), TOBN(0xbde56a36, 0xcc26aba5),
+ TOBN(0x5b1629d0, 0x35531f40), TOBN(0xac212c2b, 0x9afa6108),
+ TOBN(0x30a06bf3, 0x15697be5), TOBN(0x6f0545dc, 0x2c63c7c1),
+ TOBN(0x5d8cb842, 0x7ccdadaf), TOBN(0xd52e379b, 0xac7015bb),
+ TOBN(0xc4f56147, 0xf462c23e), TOBN(0xd44a4298, 0x46bc24b0),
+ TOBN(0xbc73d23a, 0xe2856d4f), TOBN(0x61cedd8c, 0x0832bcdf),
+ TOBN(0x60953556, 0x99f241d7), TOBN(0xee4adbd7, 0x001a349d),
+ TOBN(0x0b35bf6a, 0xaa89e491), TOBN(0x7f0076f4, 0x136f7546),
+ TOBN(0xd19a18ba, 0x9264da3d), TOBN(0x6eb2d2cd, 0x62a7a28b),
+ TOBN(0xcdba941f, 0x8761c971), TOBN(0x1550518b, 0xa3be4a5d),
+ TOBN(0xd0e8e2f0, 0x57d0b70c), TOBN(0xeea8612e, 0xcd133ba3),
+ TOBN(0x814670f0, 0x44416aec), TOBN(0x424db6c3, 0x30775061),
+ TOBN(0xd96039d1, 0x16213fd1), TOBN(0xc61e7fa5, 0x18a3478f),
+ TOBN(0xa805bdcc, 0xcb0c5021), TOBN(0xbdd6f3a8, 0x0cc616dd),
+ TOBN(0x06009667, 0x5d97f7e2), TOBN(0x31db0fc1, 0xaf0bf4b6),
+ TOBN(0x23680ed4, 0x5491627a), TOBN(0xb99a3c66, 0x7d741fb1),
+ TOBN(0xe9bb5f55, 0x36b1ff92), TOBN(0x29738577, 0x512b388d),
+ TOBN(0xdb8a2ce7, 0x50fcf263), TOBN(0x385346d4, 0x6c4f7b47),
+ TOBN(0xbe86c5ef, 0x31631f9e), TOBN(0xbf91da21, 0x03a57a29),
+ TOBN(0xc3b1f796, 0x7b23f821), TOBN(0x0f7d00d2, 0x770db354),
+ TOBN(0x8ffc6c3b, 0xd8fe79da), TOBN(0xcc5e8c40, 0xd525c996),
+ TOBN(0x4640991d, 0xcfff632a), TOBN(0x64d97e8c, 0x67112528),
+ TOBN(0xc232d973, 0x02f1cd1e), TOBN(0xce87eacb, 0x1dd212a4),
+ TOBN(0x6e4c8c73, 0xe69802f7), TOBN(0x12ef0290, 0x1fffddbd),
+ TOBN(0x941ec74e, 0x1bcea6e2), TOBN(0xd0b54024, 0x3cb92cbb),
+ TOBN(0x809fb9d4, 0x7e8f9d05), TOBN(0x3bf16159, 0xf2992aae),
+ TOBN(0xad40f279, 0xf8a7a838), TOBN(0x11aea631, 0x05615660),
+ TOBN(0xbf52e6f1, 0xa01f6fa1), TOBN(0xef046995, 0x3dc2aec9),
+ TOBN(0x785dbec9, 0xd8080711), TOBN(0xe1aec60a, 0x9fdedf76),
+ TOBN(0xece797b5, 0xfa21c126), TOBN(0xc66e898f, 0x05e52732),
+ TOBN(0x39bb69c4, 0x08811fdb), TOBN(0x8bfe1ef8, 0x2fc7f082),
+ TOBN(0xc8e7a393, 0x174f4138), TOBN(0xfba8ad1d, 0xd58d1f98),
+ TOBN(0xbc21d0ce, 0xbfd2fd5b), TOBN(0x0b839a82, 0x6ee60d61),
+ TOBN(0xaacf7658, 0xafd22253), TOBN(0xb526bed8, 0xaae396b3),
+ TOBN(0xccc1bbc2, 0x38564464), TOBN(0x9e3ff947, 0x8c45bc73),
+ TOBN(0xcde9bca3, 0x58188a78), TOBN(0x138b8ee0, 0xd73bf8f7),
+ TOBN(0x5c7e234c, 0x4123c489), TOBN(0x66e69368, 0xfa643297),
+ TOBN(0x0629eeee, 0x39a15fa3), TOBN(0x95fab881, 0xa9e2a927),
+ TOBN(0xb2497007, 0xeafbb1e1), TOBN(0xd75c9ce6, 0xe75b7a93),
+ TOBN(0x3558352d, 0xefb68d78), TOBN(0xa2f26699, 0x223f6396),
+ TOBN(0xeb911ecf, 0xe469b17a), TOBN(0x62545779, 0xe72d3ec2),
+ TOBN(0x8ea47de7, 0x82cb113f), TOBN(0xebe4b086, 0x4e1fa98d),
+ TOBN(0xec2d5ed7, 0x8cdfedb1), TOBN(0xa535c077, 0xfe211a74),
+ TOBN(0x9678109b, 0x11d244c5), TOBN(0xf17c8bfb, 0xbe299a76),
+ TOBN(0xb651412e, 0xfb11fbc4), TOBN(0xea0b5482, 0x94ab3f65),
+ TOBN(0xd8dffd95, 0x0cf78243), TOBN(0x2e719e57, 0xce0361d4),
+ TOBN(0x9007f085, 0x304ddc5b), TOBN(0x095e8c6d, 0x4daba2ea),
+ TOBN(0x5a33cdb4, 0x3f9d28a9), TOBN(0x85b95cd8, 0xe2283003),
+ TOBN(0xbcd6c819, 0xb9744733), TOBN(0x29c5f538, 0xfc7f5783),
+ TOBN(0x6c49b2fa, 0xd59038e4), TOBN(0x68349cc1, 0x3bbe1018),
+ TOBN(0xcc490c1d, 0x21830ee5), TOBN(0x36f9c4ee, 0xe9bfa297),
+ TOBN(0x58fd7294, 0x48de1a94), TOBN(0xaadb13a8, 0x4e8f2cdc),
+ TOBN(0x515eaaa0, 0x81313dba), TOBN(0xc76bb468, 0xc2152dd8),
+ TOBN(0x357f8d75, 0xa653dbf8), TOBN(0xe4d8c4d1, 0xb14ac143),
+ TOBN(0xbdb8e675, 0xb055cb40), TOBN(0x898f8e7b, 0x977b5167),
+ TOBN(0xecc65651, 0xb82fb863), TOBN(0x56544814, 0x6d88f01f),
+ TOBN(0xb0928e95, 0x263a75a9), TOBN(0xcfb6836f, 0x1a22fcda),
+ TOBN(0x651d14db, 0x3f3bd37c), TOBN(0x1d3837fb, 0xb6ad4664),
+ TOBN(0x7c5fb538, 0xff4f94ab), TOBN(0x7243c712, 0x6d7fb8f2),
+ TOBN(0xef13d60c, 0xa85c5287), TOBN(0x18cfb7c7, 0x4bb8dd1b),
+ TOBN(0x82f9bfe6, 0x72908219), TOBN(0x35c4592b, 0x9d5144ab),
+ TOBN(0x52734f37, 0x9cf4b42f), TOBN(0x6bac55e7, 0x8c60ddc4),
+ TOBN(0xb5cd811e, 0x94dea0f6), TOBN(0x259ecae4, 0xe18cc1a3),
+ TOBN(0x6a0e836e, 0x15e660f8), TOBN(0x6c639ea6, 0x0e02bff2),
+ TOBN(0x8721b8cb, 0x7e1026fd), TOBN(0x9e73b50b, 0x63261942),
+ TOBN(0xb8c70974, 0x77f01da3), TOBN(0x1839e6a6, 0x8268f57f),
+ TOBN(0x571b9415, 0x5150b805), TOBN(0x1892389e, 0xf92c7097),
+ TOBN(0x8d69c18e, 0x4a084b95), TOBN(0x7014c512, 0xbe5b495c),
+ TOBN(0x4780db36, 0x1b07523c), TOBN(0x2f6219ce, 0x2c1c64fa),
+ TOBN(0xc38b81b0, 0x602c105a), TOBN(0xab4f4f20, 0x5dc8e360),
+ TOBN(0x20d3c982, 0xcf7d62d2), TOBN(0x1f36e29d, 0x23ba8150),
+ TOBN(0x48ae0bf0, 0x92763f9e), TOBN(0x7a527e6b, 0x1d3a7007),
+ TOBN(0xb4a89097, 0x581a85e3), TOBN(0x1f1a520f, 0xdc158be5),
+ TOBN(0xf98db37d, 0x167d726e), TOBN(0x8802786e, 0x1113e862) },
+ { TOBN(0xefb2149e, 0x36f09ab0), TOBN(0x03f163ca, 0x4a10bb5b),
+ TOBN(0xd0297045, 0x06e20998), TOBN(0x56f0af00, 0x1b5a3bab),
+ TOBN(0x7af4cfec, 0x70880e0d), TOBN(0x7332a66f, 0xbe3d913f),
+ TOBN(0x32e6c84a, 0x7eceb4bd), TOBN(0xedc4a79a, 0x9c228f55),
+ TOBN(0xc37c7dd0, 0xc55c4496), TOBN(0xa6a96357, 0x25bbabd2),
+ TOBN(0x5b7e63f2, 0xadd7f363), TOBN(0x9dce3782, 0x2e73f1df),
+ TOBN(0xe1e5a16a, 0xb2b91f71), TOBN(0xe4489823, 0x5ba0163c),
+ TOBN(0xf2759c32, 0xf6e515ad), TOBN(0xa5e2f1f8, 0x8615eecf),
+ TOBN(0x74519be7, 0xabded551), TOBN(0x03d358b8, 0xc8b74410),
+ TOBN(0x4d00b10b, 0x0e10d9a9), TOBN(0x6392b0b1, 0x28da52b7),
+ TOBN(0x6744a298, 0x0b75c904), TOBN(0xc305b0ae, 0xa8f7f96c),
+ TOBN(0x042e421d, 0x182cf932), TOBN(0xf6fc5d50, 0x9e4636ca),
+ TOBN(0x795847c9, 0xd64cc78c), TOBN(0x6c50621b, 0x9b6cb27b),
+ TOBN(0x07099bf8, 0xdf8022ab), TOBN(0x48f862eb, 0xc04eda1d),
+ TOBN(0xd12732ed, 0xe1603c16), TOBN(0x19a80e0f, 0x5c9a9450),
+ TOBN(0xe2257f54, 0xb429b4fc), TOBN(0x66d3b2c6, 0x45460515),
+ TOBN(0x6ca4f87e, 0x822e37be), TOBN(0x73f237b4, 0x253bda4e),
+ TOBN(0xf747f3a2, 0x41190aeb), TOBN(0xf06fa36f, 0x804cf284),
+ TOBN(0x0a6bbb6e, 0xfc621c12), TOBN(0x5d624b64, 0x40b80ec6),
+ TOBN(0x4b072425, 0x7ba556f3), TOBN(0x7fa0c354, 0x3e2d20a8),
+ TOBN(0xe921fa31, 0xe3229d41), TOBN(0xa929c652, 0x94531bd4),
+ TOBN(0x84156027, 0xa6d38209), TOBN(0xf3d69f73, 0x6bdb97bd),
+ TOBN(0x8906d19a, 0x16833631), TOBN(0x68a34c2e, 0x03d51be3),
+ TOBN(0xcb59583b, 0x0e511cd8), TOBN(0x99ce6bfd, 0xfdc132a8),
+ TOBN(0x3facdaaa, 0xffcdb463), TOBN(0x658bbc1a, 0x34a38b08),
+ TOBN(0x12a801f8, 0xf1a9078d), TOBN(0x1567bcf9, 0x6ab855de),
+ TOBN(0xe08498e0, 0x3572359b), TOBN(0xcf0353e5, 0x8659e68b),
+ TOBN(0xbb86e9c8, 0x7d23807c), TOBN(0xbc08728d, 0x2198e8a2),
+ TOBN(0x8de2b7bc, 0x453cadd6), TOBN(0x203900a7, 0xbc0bc1f8),
+ TOBN(0xbcd86e47, 0xa6abd3af), TOBN(0x911cac12, 0x8502effb),
+ TOBN(0x2d550242, 0xec965469), TOBN(0x0e9f7692, 0x29e0017e),
+ TOBN(0x633f078f, 0x65979885), TOBN(0xfb87d449, 0x4cf751ef),
+ TOBN(0xe1790e4b, 0xfc25419a), TOBN(0x36467203, 0x4bff3cfd),
+ TOBN(0xc8db6386, 0x25b6e83f), TOBN(0x6cc69f23, 0x6cad6fd2),
+ TOBN(0x0219e45a, 0x6bc68bb9), TOBN(0xe43d79b6, 0x297f7334),
+ TOBN(0x7d445368, 0x465dc97c), TOBN(0x4b9eea32, 0x2a0b949a),
+ TOBN(0x1b96c6ba, 0x6102d021), TOBN(0xeaafac78, 0x2f4461ea),
+ TOBN(0xd4b85c41, 0xc49f19a8), TOBN(0x275c28e4, 0xcf538875),
+ TOBN(0x35451a9d, 0xdd2e54e0), TOBN(0x6991adb5, 0x0605618b),
+ TOBN(0x5b8b4bcd, 0x7b36cd24), TOBN(0x372a4f8c, 0x56f37216),
+ TOBN(0xc890bd73, 0xa6a5da60), TOBN(0x6f083da0, 0xdc4c9ff0),
+ TOBN(0xf4e14d94, 0xf0536e57), TOBN(0xf9ee1eda, 0xaaec8243),
+ TOBN(0x571241ec, 0x8bdcf8e7), TOBN(0xa5db8271, 0x0b041e26),
+ TOBN(0x9a0b9a99, 0xe3fff040), TOBN(0xcaaf21dd, 0x7c271202),
+ TOBN(0xb4e2b2e1, 0x4f0dd2e8), TOBN(0xe77e7c4f, 0x0a377ac7),
+ TOBN(0x69202c3f, 0x0d7a2198), TOBN(0xf759b7ff, 0x28200eb8),
+ TOBN(0xc87526ed, 0xdcfe314e), TOBN(0xeb84c524, 0x53d5cf99),
+ TOBN(0xb1b52ace, 0x515138b6), TOBN(0x5aa7ff8c, 0x23fca3f4),
+ TOBN(0xff0b13c3, 0xb9791a26), TOBN(0x960022da, 0xcdd58b16),
+ TOBN(0xdbd55c92, 0x57aad2de), TOBN(0x3baaaaa3, 0xf30fe619),
+ TOBN(0x9a4b2346, 0x0d881efd), TOBN(0x506416c0, 0x46325e2a),
+ TOBN(0x91381e76, 0x035c18d4), TOBN(0xb3bb68be, 0xf27817b0),
+ TOBN(0x15bfb8bf, 0x5116f937), TOBN(0x7c64a586, 0xc1268943),
+ TOBN(0x71e25cc3, 0x8419a2c8), TOBN(0x9fd6b0c4, 0x8335f463),
+ TOBN(0x4bf0ba3c, 0xe8ee0e0e), TOBN(0x6f6fba60, 0x298c21fa),
+ TOBN(0x57d57b39, 0xae66bee0), TOBN(0x292d5130, 0x22672544),
+ TOBN(0xf451105d, 0xbab093b3), TOBN(0x012f59b9, 0x02839986),
+ TOBN(0x8a915802, 0x3474a89c), TOBN(0x048c919c, 0x2de03e97),
+ TOBN(0xc476a2b5, 0x91071cd5), TOBN(0x791ed89a, 0x034970a5),
+ TOBN(0x89bd9042, 0xe1b7994b), TOBN(0x8eaf5179, 0xa1057ffd),
+ TOBN(0x6066e2a2, 0xd551ee10), TOBN(0x87a8f1d8, 0x727e09a6),
+ TOBN(0x00d08bab, 0x2c01148d), TOBN(0x6da8e4f1, 0x424f33fe),
+ TOBN(0x466d17f0, 0xcf9a4e71), TOBN(0xff502010, 0x3bf5cb19),
+ TOBN(0xdccf97d8, 0xd062ecc0), TOBN(0x80c0d9af, 0x81d80ac4),
+ TOBN(0xe87771d8, 0x033f2876), TOBN(0xb0186ec6, 0x7d5cc3db),
+ TOBN(0x58e8bb80, 0x3bc9bc1d), TOBN(0x4d1395cc, 0x6f6ef60e),
+ TOBN(0xa73c62d6, 0x186244a0), TOBN(0x918e5f23, 0x110a5b53),
+ TOBN(0xed4878ca, 0x741b7eab), TOBN(0x3038d71a, 0xdbe03e51),
+ TOBN(0x840204b7, 0xa93c3246), TOBN(0x21ab6069, 0xa0b9b4cd),
+ TOBN(0xf5fa6e2b, 0xb1d64218), TOBN(0x1de6ad0e, 0xf3d56191),
+ TOBN(0x570aaa88, 0xff1929c7), TOBN(0xc6df4c6b, 0x640e87b5),
+ TOBN(0xde8a74f2, 0xc65f0ccc), TOBN(0x8b972fd5, 0xe6f6cc01),
+ TOBN(0x3fff36b6, 0x0b846531), TOBN(0xba7e45e6, 0x10a5e475),
+ TOBN(0x84a1d10e, 0x4145b6c5), TOBN(0xf1f7f91a, 0x5e046d9d),
+ TOBN(0x0317a692, 0x44de90d7), TOBN(0x951a1d4a, 0xf199c15e),
+ TOBN(0x91f78046, 0xc9d73deb), TOBN(0x74c82828, 0xfab8224f),
+ TOBN(0xaa6778fc, 0xe7560b90), TOBN(0xb4073e61, 0xa7e824ce),
+ TOBN(0xff0d693c, 0xd642eba8), TOBN(0x7ce2e57a, 0x5dccef38),
+ TOBN(0x89c2c789, 0x1df1ad46), TOBN(0x83a06922, 0x098346fd),
+ TOBN(0x2d715d72, 0xda2fc177), TOBN(0x7b6dd71d, 0x85b6cf1d),
+ TOBN(0xc60a6d0a, 0x73fa9cb0), TOBN(0xedd3992e, 0x328bf5a9),
+ TOBN(0xc380ddd0, 0x832c8c82), TOBN(0xd182d410, 0xa2a0bf50),
+ TOBN(0x7d9d7438, 0xd9a528db), TOBN(0xe8b1a0e9, 0xcaf53994),
+ TOBN(0xddd6e5fe, 0x0e19987c), TOBN(0xacb8df03, 0x190b059d),
+ TOBN(0x53703a32, 0x8300129f), TOBN(0x1f637662, 0x68c43bfd),
+ TOBN(0xbcbd1913, 0x00e54051), TOBN(0x812fcc62, 0x7bf5a8c5),
+ TOBN(0x3f969d5f, 0x29fb85da), TOBN(0x72f4e00a, 0x694759e8),
+ TOBN(0x426b6e52, 0x790726b7), TOBN(0x617bbc87, 0x3bdbb209),
+ TOBN(0x511f8bb9, 0x97aee317), TOBN(0x812a4096, 0xe81536a8),
+ TOBN(0x137dfe59, 0x3ac09b9b), TOBN(0x0682238f, 0xba8c9a7a),
+ TOBN(0x7072ead6, 0xaeccb4bd), TOBN(0x6a34e9aa, 0x692ba633),
+ TOBN(0xc82eaec2, 0x6fff9d33), TOBN(0xfb753512, 0x1d4d2b62),
+ TOBN(0x1a0445ff, 0x1d7aadab), TOBN(0x65d38260, 0xd5f6a67c),
+ TOBN(0x6e62fb08, 0x91cfb26f), TOBN(0xef1e0fa5, 0x5c7d91d6),
+ TOBN(0x47e7c7ba, 0x33db72cd), TOBN(0x017cbc09, 0xfa7c74b2),
+ TOBN(0x3c931590, 0xf50a503c), TOBN(0xcac54f60, 0x616baa42),
+ TOBN(0x9b6cd380, 0xb2369f0f), TOBN(0x97d3a70d, 0x23c76151),
+ TOBN(0x5f9dd6fc, 0x9862a9c6), TOBN(0x044c4ab2, 0x12312f51),
+ TOBN(0x035ea0fd, 0x834a2ddc), TOBN(0x49e6b862, 0xcc7b826d),
+ TOBN(0xb03d6883, 0x62fce490), TOBN(0x62f2497a, 0xb37e36e9),
+ TOBN(0x04b005b6, 0xc6458293), TOBN(0x36bb5276, 0xe8d10af7),
+ TOBN(0xacf2dc13, 0x8ee617b8), TOBN(0x470d2d35, 0xb004b3d4),
+ TOBN(0x06790832, 0xfeeb1b77), TOBN(0x2bb75c39, 0x85657f9c),
+ TOBN(0xd70bd4ed, 0xc0f60004), TOBN(0xfe797ecc, 0x219b018b),
+ TOBN(0x9b5bec2a, 0x753aebcc), TOBN(0xdaf9f3dc, 0xc939eca5),
+ TOBN(0xd6bc6833, 0xd095ad09), TOBN(0x98abdd51, 0xdaa4d2fc),
+ TOBN(0xd9840a31, 0x8d168be5), TOBN(0xcf7c10e0, 0x2325a23c),
+ TOBN(0xa5c02aa0, 0x7e6ecfaf), TOBN(0x2462e7e6, 0xb5bfdf18),
+ TOBN(0xab2d8a8b, 0xa0cc3f12), TOBN(0x68dd485d, 0xbc672a29),
+ TOBN(0x72039752, 0x596f2cd3), TOBN(0x5d3eea67, 0xa0cf3d8d),
+ TOBN(0x810a1a81, 0xe6602671), TOBN(0x8f144a40, 0x14026c0c),
+ TOBN(0xbc753a6d, 0x76b50f85), TOBN(0xc4dc21e8, 0x645cd4a4),
+ TOBN(0xc5262dea, 0x521d0378), TOBN(0x802b8e0e, 0x05011c6f),
+ TOBN(0x1ba19cbb, 0x0b4c19ea), TOBN(0x21db64b5, 0xebf0aaec),
+ TOBN(0x1f394ee9, 0x70342f9d), TOBN(0x93a10aee, 0x1bc44a14),
+ TOBN(0xa7eed31b, 0x3efd0baa), TOBN(0x6e7c824e, 0x1d154e65),
+ TOBN(0xee23fa81, 0x9966e7ee), TOBN(0x64ec4aa8, 0x05b7920d),
+ TOBN(0x2d44462d, 0x2d90aad4), TOBN(0xf44dd195, 0xdf277ad5),
+ TOBN(0x8d6471f1, 0xbb46b6a1), TOBN(0x1e65d313, 0xfd885090),
+ TOBN(0x33a800f5, 0x13a977b4), TOBN(0xaca9d721, 0x0797e1ef),
+ TOBN(0x9a5a85a0, 0xfcff6a17), TOBN(0x9970a3f3, 0x1eca7cee),
+ TOBN(0xbb9f0d6b, 0xc9504be3), TOBN(0xe0c504be, 0xadd24ee2),
+ TOBN(0x7e09d956, 0x77fcc2f4), TOBN(0xef1a5227, 0x65bb5fc4),
+ TOBN(0x145d4fb1, 0x8b9286aa), TOBN(0x66fd0c5d, 0x6649028b),
+ TOBN(0x98857ceb, 0x1bf4581c), TOBN(0xe635e186, 0xaca7b166),
+ TOBN(0x278ddd22, 0x659722ac), TOBN(0xa0903c4c, 0x1db68007),
+ TOBN(0x366e4589, 0x48f21402), TOBN(0x31b49c14, 0xb96abda2),
+ TOBN(0x329c4b09, 0xe0403190), TOBN(0x97197ca3, 0xd29f43fe),
+ TOBN(0x8073dd1e, 0x274983d8), TOBN(0xda1a3bde, 0x55717c8f),
+ TOBN(0xfd3d4da2, 0x0361f9d1), TOBN(0x1332d081, 0x4c7de1ce),
+ TOBN(0x9b7ef7a3, 0xaa6d0e10), TOBN(0x17db2e73, 0xf54f1c4a),
+ TOBN(0xaf3dffae, 0x4cd35567), TOBN(0xaaa2f406, 0xe56f4e71),
+ TOBN(0x8966759e, 0x7ace3fc7), TOBN(0x9594eacf, 0x45a8d8c6),
+ TOBN(0x8de3bd8b, 0x91834e0e), TOBN(0xafe4ca53, 0x548c0421),
+ TOBN(0xfdd7e856, 0xe6ee81c6), TOBN(0x8f671beb, 0x6b891a3a),
+ TOBN(0xf7a58f2b, 0xfae63829), TOBN(0x9ab186fb, 0x9c11ac9f),
+ TOBN(0x8d6eb369, 0x10b5be76), TOBN(0x046b7739, 0xfb040bcd),
+ TOBN(0xccb4529f, 0xcb73de88), TOBN(0x1df0fefc, 0xcf26be03),
+ TOBN(0xad7757a6, 0xbcfcd027), TOBN(0xa8786c75, 0xbb3165ca),
+ TOBN(0xe9db1e34, 0x7e99a4d9), TOBN(0x99ee86df, 0xb06c504b),
+ TOBN(0x5b7c2ddd, 0xc15c9f0a), TOBN(0xdf87a734, 0x4295989e),
+ TOBN(0x59ece47c, 0x03d08fda), TOBN(0xb074d3dd, 0xad5fc702),
+ TOBN(0x20407903, 0x51a03776), TOBN(0x2bb1f77b, 0x2a608007),
+ TOBN(0x25c58f4f, 0xe1153185), TOBN(0xe6df62f6, 0x766e6447),
+ TOBN(0xefb3d1be, 0xed51275a), TOBN(0x5de47dc7, 0x2f0f483f),
+ TOBN(0x7932d98e, 0x97c2bedf), TOBN(0xd5c11927, 0x0219f8a1),
+ TOBN(0x9d751200, 0xa73a294e), TOBN(0x5f88434a, 0x9dc20172),
+ TOBN(0xd28d9fd3, 0xa26f506a), TOBN(0xa890cd31, 0x9d1dcd48),
+ TOBN(0x0aebaec1, 0x70f4d3b4), TOBN(0xfd1a1369, 0x0ffc8d00),
+ TOBN(0xb9d9c240, 0x57d57838), TOBN(0x45929d26, 0x68bac361),
+ TOBN(0x5a2cd060, 0x25b15ca6), TOBN(0x4b3c83e1, 0x6e474446),
+ TOBN(0x1aac7578, 0xee1e5134), TOBN(0xa418f5d6, 0xc91e2f41),
+ TOBN(0x6936fc8a, 0x213ed68b), TOBN(0x860ae7ed, 0x510a5224),
+ TOBN(0x63660335, 0xdef09b53), TOBN(0x641b2897, 0xcd79c98d),
+ TOBN(0x29bd38e1, 0x01110f35), TOBN(0x79c26f42, 0x648b1937),
+ TOBN(0x64dae519, 0x9d9164f4), TOBN(0xd85a2310, 0x0265c273),
+ TOBN(0x7173dd5d, 0x4b07e2b1), TOBN(0xd144c4cb, 0x8d9ea221),
+ TOBN(0xe8b04ea4, 0x1105ab14), TOBN(0x92dda542, 0xfe80d8f1),
+ TOBN(0xe9982fa8, 0xcf03dce6), TOBN(0x8b5ea965, 0x1a22cffc),
+ TOBN(0xf7f4ea7f, 0x3fad88c4), TOBN(0x62db773e, 0x6a5ba95c),
+ TOBN(0xd20f02fb, 0x93f24567), TOBN(0xfd46c69a, 0x315257ca),
+ TOBN(0x0ac74cc7, 0x8bcab987), TOBN(0x46f31c01, 0x5ceca2f5),
+ TOBN(0x40aedb59, 0x888b219e), TOBN(0xe50ecc37, 0xe1fccd02),
+ TOBN(0x1bcd9dad, 0x911f816c), TOBN(0x583cc1ec, 0x8db9b00c),
+ TOBN(0xf3cd2e66, 0xa483bf11), TOBN(0xfa08a6f5, 0xb1b2c169),
+ TOBN(0xf375e245, 0x4be9fa28), TOBN(0x99a7ffec, 0x5b6d011f),
+ TOBN(0x6a3ebddb, 0xc4ae62da), TOBN(0x6cea00ae, 0x374aef5d),
+ TOBN(0xab5fb98d, 0x9d4d05bc), TOBN(0x7cba1423, 0xd560f252),
+ TOBN(0x49b2cc21, 0x208490de), TOBN(0x1ca66ec3, 0xbcfb2879),
+ TOBN(0x7f1166b7, 0x1b6fb16f), TOBN(0xfff63e08, 0x65fe5db3),
+ TOBN(0xb8345abe, 0x8b2610be), TOBN(0xb732ed80, 0x39de3df4),
+ TOBN(0x0e24ed50, 0x211c32b4), TOBN(0xd10d8a69, 0x848ff27d),
+ TOBN(0xc1074398, 0xed4de248), TOBN(0xd7cedace, 0x10488927),
+ TOBN(0xa4aa6bf8, 0x85673e13), TOBN(0xb46bae91, 0x6daf30af),
+ TOBN(0x07088472, 0xfcef7ad8), TOBN(0x61151608, 0xd4b35e97),
+ TOBN(0xbcfe8f26, 0xdde29986), TOBN(0xeb84c4c7, 0xd5a34c79),
+ TOBN(0xc1eec55c, 0x164e1214), TOBN(0x891be86d, 0xa147bb03),
+ TOBN(0x9fab4d10, 0x0ba96835), TOBN(0xbf01e9b8, 0xa5c1ae9f),
+ TOBN(0x6b4de139, 0xb186ebc0), TOBN(0xd5c74c26, 0x85b91bca),
+ TOBN(0x5086a99c, 0xc2d93854), TOBN(0xeed62a7b, 0xa7a9dfbc),
+ TOBN(0x8778ed6f, 0x76b7618a), TOBN(0xbff750a5, 0x03b66062),
+ TOBN(0x4cb7be22, 0xb65186db), TOBN(0x369dfbf0, 0xcc3a6d13),
+ TOBN(0xc7dab26c, 0x7191a321), TOBN(0x9edac3f9, 0x40ed718e),
+ TOBN(0xbc142b36, 0xd0cfd183), TOBN(0xc8af82f6, 0x7c991693),
+ TOBN(0xb3d1e4d8, 0x97ce0b2a), TOBN(0xe6d7c87f, 0xc3a55cdf),
+ TOBN(0x35846b95, 0x68b81afe), TOBN(0x018d12af, 0xd3c239d8),
+ TOBN(0x2b2c6208, 0x01206e15), TOBN(0xe0e42453, 0xa3b882c6),
+ TOBN(0x854470a3, 0xa50162d5), TOBN(0x08157478, 0x7017a62a),
+ TOBN(0x18bd3fb4, 0x820357c7), TOBN(0x992039ae, 0x6f1458ad),
+ TOBN(0x9a1df3c5, 0x25b44aa1), TOBN(0x2d780357, 0xed3d5281),
+ TOBN(0x58cf7e4d, 0xc77ad4d4), TOBN(0xd49a7998, 0xf9df4fc4),
+ TOBN(0x4465a8b5, 0x1d71205e), TOBN(0xa0ee0ea6, 0x649254aa),
+ TOBN(0x4b5eeecf, 0xab7bd771), TOBN(0x6c873073, 0x35c262b9),
+ TOBN(0xdc5bd648, 0x3c9d61e7), TOBN(0x233d6d54, 0x321460d2),
+ TOBN(0xd20c5626, 0xfc195bcc), TOBN(0x25445958, 0x04d78b63),
+ TOBN(0xe03fcb3d, 0x17ec8ef3), TOBN(0x54b690d1, 0x46b8f781),
+ TOBN(0x82fa2c8a, 0x21230646), TOBN(0xf51aabb9, 0x084f418c),
+ TOBN(0xff4fbec1, 0x1a30ba43), TOBN(0x6a5acf73, 0x743c9df7),
+ TOBN(0x1da2b357, 0xd635b4d5), TOBN(0xc3de68dd, 0xecd5c1da),
+ TOBN(0xa689080b, 0xd61af0dd), TOBN(0xdea5938a, 0xd665bf99),
+ TOBN(0x0231d71a, 0xfe637294), TOBN(0x01968aa6, 0xa5a81cd8),
+ TOBN(0x11252d50, 0x048e63b5), TOBN(0xc446bc52, 0x6ca007e9),
+ TOBN(0xef8c50a6, 0x96d6134b), TOBN(0x9361fbf5, 0x9e09a05c),
+ TOBN(0xf17f85a6, 0xdca3291a), TOBN(0xb178d548, 0xff251a21),
+ TOBN(0x87f6374b, 0xa4df3915), TOBN(0x566ce1bf, 0x2fd5d608),
+ TOBN(0x425cba4d, 0x7de35102), TOBN(0x6b745f8f, 0x58c5d5e2),
+ TOBN(0x88402af6, 0x63122edf), TOBN(0x3190f9ed, 0x3b989a89),
+ TOBN(0x4ad3d387, 0xebba3156), TOBN(0xef385ad9, 0xc7c469a5),
+ TOBN(0xb08281de, 0x3f642c29), TOBN(0x20be0888, 0x910ffb88),
+ TOBN(0xf353dd4a, 0xd5292546), TOBN(0x3f1627de, 0x8377a262),
+ TOBN(0xa5faa013, 0xeefcd638), TOBN(0x8f3bf626, 0x74cc77c3),
+ TOBN(0x32618f65, 0xa348f55e), TOBN(0x5787c0dc, 0x9fefeb9e),
+ TOBN(0xf1673aa2, 0xd9a23e44), TOBN(0x88dfa993, 0x4e10690d),
+ TOBN(0x1ced1b36, 0x2bf91108), TOBN(0x9193ceca, 0x3af48649),
+ TOBN(0xfb34327d, 0x2d738fc5), TOBN(0x6697b037, 0x975fee6c),
+ TOBN(0x2f485da0, 0xc04079a5), TOBN(0x2cdf5735, 0x2feaa1ac),
+ TOBN(0x76944420, 0xbd55659e), TOBN(0x7973e32b, 0x4376090c),
+ TOBN(0x86bb4fe1, 0x163b591a), TOBN(0x10441aed, 0xc196f0ca),
+ TOBN(0x3b431f4a, 0x045ad915), TOBN(0x6c11b437, 0xa4afacb1),
+ TOBN(0x30b0c7db, 0x71fdbbd8), TOBN(0xb642931f, 0xeda65acd),
+ TOBN(0x4baae6e8, 0x9c92b235), TOBN(0xa73bbd0e, 0x6b3993a1),
+ TOBN(0xd06d60ec, 0x693dd031), TOBN(0x03cab91b, 0x7156881c),
+ TOBN(0xd615862f, 0x1db3574b), TOBN(0x485b0185, 0x64bb061a),
+ TOBN(0x27434988, 0xa0181e06), TOBN(0x2cd61ad4, 0xc1c0c757),
+ TOBN(0x3effed5a, 0x2ff9f403), TOBN(0x8dc98d8b, 0x62239029),
+ TOBN(0x2206021e, 0x1f17b70d), TOBN(0xafbec0ca, 0xbf510015),
+ TOBN(0x9fed7164, 0x80130dfa), TOBN(0x306dc2b5, 0x8a02dcf5),
+ TOBN(0x48f06620, 0xfeb10fc0), TOBN(0x78d1e1d5, 0x5a57cf51),
+ TOBN(0xadef8c5a, 0x192ef710), TOBN(0x88afbd4b, 0x3b7431f9),
+ TOBN(0x7e1f7407, 0x64250c9e), TOBN(0x6e31318d, 0xb58bec07),
+ TOBN(0xfd4fc4b8, 0x24f89b4e), TOBN(0x65a5dd88, 0x48c36a2a),
+ TOBN(0x4f1eccff, 0xf024baa7), TOBN(0x22a21cf2, 0xcba94650),
+ TOBN(0x95d29dee, 0x42a554f7), TOBN(0x828983a5, 0x002ec4ba),
+ TOBN(0x8112a1f7, 0x8badb73d), TOBN(0x79ea8897, 0xa27c1839),
+ TOBN(0x8969a5a7, 0xd065fd83), TOBN(0xf49af791, 0xb262a0bc),
+ TOBN(0xfcdea8b6, 0xaf2b5127), TOBN(0x10e913e1, 0x564c2dbc),
+ TOBN(0x51239d14, 0xbc21ef51), TOBN(0xe51c3ceb, 0x4ce57292),
+ TOBN(0x795ff068, 0x47bbcc3b), TOBN(0x86b46e1e, 0xbd7e11e6),
+ TOBN(0x0ea6ba23, 0x80041ef4), TOBN(0xd72fe505, 0x6262342e),
+ TOBN(0x8abc6dfd, 0x31d294d4), TOBN(0xbbe017a2, 0x1278c2c9),
+ TOBN(0xb1fcfa09, 0xb389328a), TOBN(0x322fbc62, 0xd01771b5),
+ TOBN(0x04c0d063, 0x60b045bf), TOBN(0xdb652edc, 0x10e52d01),
+ TOBN(0x50ef932c, 0x03ec6627), TOBN(0xde1b3b2d, 0xc1ee50e3),
+ TOBN(0x5ab7bdc5, 0xdc37a90d), TOBN(0xfea67213, 0x31e33a96),
+ TOBN(0x6482b5cb, 0x4f2999aa), TOBN(0x38476cc6, 0xb8cbf0dd),
+ TOBN(0x93ebfacb, 0x173405bb), TOBN(0x15cdafe7, 0xe52369ec),
+ TOBN(0xd42d5ba4, 0xd935b7db), TOBN(0x648b6004, 0x1c99a4cd),
+ TOBN(0x785101bd, 0xa3b5545b), TOBN(0x4bf2c38a, 0x9dd67faf),
+ TOBN(0xb1aadc63, 0x4442449c), TOBN(0xe0e9921a, 0x33ad4fb8),
+ TOBN(0x5c552313, 0xaa686d82), TOBN(0xdee635fa, 0x465d866c),
+ TOBN(0xbc3c224a, 0x18ee6e8a), TOBN(0xeed748a6, 0xed42e02f),
+ TOBN(0xe70f930a, 0xd474cd08), TOBN(0x774ea6ec, 0xfff24adf),
+ TOBN(0x03e2de1c, 0xf3480d4a), TOBN(0xf0d8edc7, 0xbc8acf1a),
+ TOBN(0xf23e3303, 0x68295a9c), TOBN(0xfadd5f68, 0xc546a97d),
+ TOBN(0x895597ad, 0x96f8acb1), TOBN(0xbddd49d5, 0x671bdae2),
+ TOBN(0x16fcd528, 0x21dd43f4), TOBN(0xa5a45412, 0x6619141a) },
+ { TOBN(0x8ce9b6bf, 0xc360e25a), TOBN(0xe6425195, 0x075a1a78),
+ TOBN(0x9dc756a8, 0x481732f4), TOBN(0x83c0440f, 0x5432b57a),
+ TOBN(0xc670b3f1, 0xd720281f), TOBN(0x2205910e, 0xd135e051),
+ TOBN(0xded14b0e, 0xdb052be7), TOBN(0x697b3d27, 0xc568ea39),
+ TOBN(0x2e599b9a, 0xfb3ff9ed), TOBN(0x28c2e0ab, 0x17f6515c),
+ TOBN(0x1cbee4fd, 0x474da449), TOBN(0x071279a4, 0x4f364452),
+ TOBN(0x97abff66, 0x01fbe855), TOBN(0x3ee394e8, 0x5fda51c4),
+ TOBN(0x190385f6, 0x67597c0b), TOBN(0x6e9fccc6, 0xa27ee34b),
+ TOBN(0x0b89de93, 0x14092ebb), TOBN(0xf17256bd, 0x428e240c),
+ TOBN(0xcf89a7f3, 0x93d2f064), TOBN(0x4f57841e, 0xe1ed3b14),
+ TOBN(0x4ee14405, 0xe708d855), TOBN(0x856aae72, 0x03f1c3d0),
+ TOBN(0xc8e5424f, 0xbdd7eed5), TOBN(0x3333e4ef, 0x73ab4270),
+ TOBN(0x3bc77ade, 0xdda492f8), TOBN(0xc11a3aea, 0x78297205),
+ TOBN(0x5e89a3e7, 0x34931b4c), TOBN(0x17512e2e, 0x9f5694bb),
+ TOBN(0x5dc349f3, 0x177bf8b6), TOBN(0x232ea4ba, 0x08c7ff3e),
+ TOBN(0x9c4f9d16, 0xf511145d), TOBN(0xccf109a3, 0x33b379c3),
+ TOBN(0xe75e7a88, 0xa1f25897), TOBN(0x7ac6961f, 0xa1b5d4d8),
+ TOBN(0xe3e10773, 0x08f3ed5c), TOBN(0x208a54ec, 0x0a892dfb),
+ TOBN(0xbe826e19, 0x78660710), TOBN(0x0cf70a97, 0x237df2c8),
+ TOBN(0x418a7340, 0xed704da5), TOBN(0xa3eeb9a9, 0x08ca33fd),
+ TOBN(0x49d96233, 0x169bca96), TOBN(0x04d286d4, 0x2da6aafb),
+ TOBN(0xc09606ec, 0xa0c2fa94), TOBN(0x8869d0d5, 0x23ff0fb3),
+ TOBN(0xa99937e5, 0xd0150d65), TOBN(0xa92e2503, 0x240c14c9),
+ TOBN(0x656bf945, 0x108e2d49), TOBN(0x152a733a, 0xa2f59e2b),
+ TOBN(0xb4323d58, 0x8434a920), TOBN(0xc0af8e93, 0x622103c5),
+ TOBN(0x667518ef, 0x938dbf9a), TOBN(0xa1843073, 0x83a9cdf2),
+ TOBN(0x350a94aa, 0x5447ab80), TOBN(0xe5e5a325, 0xc75a3d61),
+ TOBN(0x74ba507f, 0x68411a9e), TOBN(0x10581fc1, 0x594f70c5),
+ TOBN(0x60e28570, 0x80eb24a9), TOBN(0x7bedfb4d, 0x488e0cfd),
+ TOBN(0x721ebbd7, 0xc259cdb8), TOBN(0x0b0da855, 0xbc6390a9),
+ TOBN(0x2b4d04db, 0xde314c70), TOBN(0xcdbf1fbc, 0x6c32e846),
+ TOBN(0x33833eab, 0xb162fc9e), TOBN(0x9939b48b, 0xb0dd3ab7),
+ TOBN(0x5aaa98a7, 0xcb0c9c8c), TOBN(0x75105f30, 0x81c4375c),
+ TOBN(0xceee5057, 0x5ef1c90f), TOBN(0xb31e065f, 0xc23a17bf),
+ TOBN(0x5364d275, 0xd4b6d45a), TOBN(0xd363f3ad, 0x62ec8996),
+ TOBN(0xb5d21239, 0x4391c65b), TOBN(0x84564765, 0xebb41b47),
+ TOBN(0x20d18ecc, 0x37107c78), TOBN(0xacff3b6b, 0x570c2a66),
+ TOBN(0x22f975d9, 0x9bd0d845), TOBN(0xef0a0c46, 0xba178fa0),
+ TOBN(0x1a419651, 0x76b6028e), TOBN(0xc49ec674, 0x248612d4),
+ TOBN(0x5b6ac4f2, 0x7338af55), TOBN(0x06145e62, 0x7bee5a36),
+ TOBN(0x33e95d07, 0xe75746b5), TOBN(0x1c1e1f6d, 0xc40c78be),
+ TOBN(0x967833ef, 0x222ff8e2), TOBN(0x4bedcf6a, 0xb49180ad),
+ TOBN(0x6b37e9c1, 0x3d7a4c8a), TOBN(0x2748887c, 0x6ddfe760),
+ TOBN(0xf7055123, 0xaa3a5bbc), TOBN(0x954ff225, 0x7bbb8e74),
+ TOBN(0xc42b8ab1, 0x97c3dfb9), TOBN(0x55a549b0, 0xcf168154),
+ TOBN(0xad6748e7, 0xc1b50692), TOBN(0x2775780f, 0x6fc5cbcb),
+ TOBN(0x4eab80b8, 0xe1c9d7c8), TOBN(0x8c69dae1, 0x3fdbcd56),
+ TOBN(0x47e6b4fb, 0x9969eace), TOBN(0x002f1085, 0xa705cb5a),
+ TOBN(0x4e23ca44, 0x6d3fea55), TOBN(0xb4ae9c86, 0xf4810568),
+ TOBN(0x47bfb91b, 0x2a62f27d), TOBN(0x60deb4c9, 0xd9bac28c),
+ TOBN(0xa892d894, 0x7de6c34c), TOBN(0x4ee68259, 0x4494587d),
+ TOBN(0x914ee14e, 0x1a3f8a5b), TOBN(0xbb113eaa, 0x28700385),
+ TOBN(0x81ca03b9, 0x2115b4c9), TOBN(0x7c163d38, 0x8908cad1),
+ TOBN(0xc912a118, 0xaa18179a), TOBN(0xe09ed750, 0x886e3081),
+ TOBN(0xa676e3fa, 0x26f516ca), TOBN(0x753cacf7, 0x8e732f91),
+ TOBN(0x51592aea, 0x833da8b4), TOBN(0xc626f42f, 0x4cbea8aa),
+ TOBN(0xef9dc899, 0xa7b56eaf), TOBN(0x00c0e52c, 0x34ef7316),
+ TOBN(0x5b1e4e24, 0xfe818a86), TOBN(0x9d31e20d, 0xc538be47),
+ TOBN(0x22eb932d, 0x3ed68974), TOBN(0xe44bbc08, 0x7c4e87c4),
+ TOBN(0x4121086e, 0x0dde9aef), TOBN(0x8e6b9cff, 0x134f4345),
+ TOBN(0x96892c1f, 0x711b0eb9), TOBN(0xb905f2c8, 0x780ab954),
+ TOBN(0xace26309, 0xa20792db), TOBN(0xec8ac9b3, 0x0684e126),
+ TOBN(0x486ad8b6, 0xb40a2447), TOBN(0x60121fc1, 0x9fe3fb24),
+ TOBN(0x5626fccf, 0x1a8e3b3f), TOBN(0x4e568622, 0x6ad1f394),
+ TOBN(0xda7aae0d, 0x196aa5a1), TOBN(0xe0df8c77, 0x1041b5fb),
+ TOBN(0x451465d9, 0x26b318b7), TOBN(0xc29b6e55, 0x7ab136e9),
+ TOBN(0x2c2ab48b, 0x71148463), TOBN(0xb5738de3, 0x64454a76),
+ TOBN(0x54ccf9a0, 0x5a03abe4), TOBN(0x377c0296, 0x0427d58e),
+ TOBN(0x73f5f0b9, 0x2bb39c1f), TOBN(0x14373f2c, 0xe608d8c5),
+ TOBN(0xdcbfd314, 0x00fbb805), TOBN(0xdf18fb20, 0x83afdcfb),
+ TOBN(0x81a57f42, 0x42b3523f), TOBN(0xe958532d, 0x87f650fb),
+ TOBN(0xaa8dc8b6, 0x8b0a7d7c), TOBN(0x1b75dfb7, 0x150166be),
+ TOBN(0x90e4f7c9, 0x2d7d1413), TOBN(0x67e2d6b5, 0x9834f597),
+ TOBN(0x4fd4f4f9, 0xa808c3e8), TOBN(0xaf8237e0, 0xd5281ec1),
+ TOBN(0x25ab5fdc, 0x84687cee), TOBN(0xc5ded6b1, 0xa5b26c09),
+ TOBN(0x8e4a5aec, 0xc8ea7650), TOBN(0x23b73e5c, 0x14cc417f),
+ TOBN(0x2bfb4318, 0x3037bf52), TOBN(0xb61e6db5, 0x78c725d7),
+ TOBN(0x8efd4060, 0xbbb3e5d7), TOBN(0x2e014701, 0xdbac488e),
+ TOBN(0xac75cf9a, 0x360aa449), TOBN(0xb70cfd05, 0x79634d08),
+ TOBN(0xa591536d, 0xfffb15ef), TOBN(0xb2c37582, 0xd07c106c),
+ TOBN(0xb4293fdc, 0xf50225f9), TOBN(0xc52e175c, 0xb0e12b03),
+ TOBN(0xf649c3ba, 0xd0a8bf64), TOBN(0x745a8fef, 0xeb8ae3c6),
+ TOBN(0x30d7e5a3, 0x58321bc3), TOBN(0xb1732be7, 0x0bc4df48),
+ TOBN(0x1f217993, 0xe9ea5058), TOBN(0xf7a71cde, 0x3e4fd745),
+ TOBN(0x86cc533e, 0x894c5bbb), TOBN(0x6915c7d9, 0x69d83082),
+ TOBN(0xa6aa2d05, 0x5815c244), TOBN(0xaeeee592, 0x49b22ce5),
+ TOBN(0x89e39d13, 0x78135486), TOBN(0x3a275c1f, 0x16b76f2f),
+ TOBN(0xdb6bcc1b, 0xe036e8f5), TOBN(0x4df69b21, 0x5e4709f5),
+ TOBN(0xa188b250, 0x2d0f39aa), TOBN(0x622118bb, 0x15a85947),
+ TOBN(0x2ebf520f, 0xfde0f4fa), TOBN(0xa40e9f29, 0x4860e539),
+ TOBN(0x7b6a51eb, 0x22b57f0f), TOBN(0x849a33b9, 0x7e80644a),
+ TOBN(0x50e5d16f, 0x1cf095fe), TOBN(0xd754b54e, 0xec55f002),
+ TOBN(0x5cfbbb22, 0x236f4a98), TOBN(0x0b0c59e9, 0x066800bb),
+ TOBN(0x4ac69a8f, 0x5a9a7774), TOBN(0x2b33f804, 0xd6bec948),
+ TOBN(0xb3729295, 0x32e6c466), TOBN(0x68956d0f, 0x4e599c73),
+ TOBN(0xa47a249f, 0x155c31cc), TOBN(0x24d80f0d, 0xe1ce284e),
+ TOBN(0xcd821dfb, 0x988baf01), TOBN(0xe6331a7d, 0xdbb16647),
+ TOBN(0x1eb8ad33, 0x094cb960), TOBN(0x593cca38, 0xc91bbca5),
+ TOBN(0x384aac8d, 0x26567456), TOBN(0x40fa0309, 0xc04b6490),
+ TOBN(0x97834cd6, 0xdab6c8f6), TOBN(0x68a7318d, 0x3f91e55f),
+ TOBN(0xa00fd04e, 0xfc4d3157), TOBN(0xb56f8ab2, 0x2bf3bdea),
+ TOBN(0x014f5648, 0x4fa57172), TOBN(0x948c5860, 0x450abdb3),
+ TOBN(0x342b5df0, 0x0ebd4f08), TOBN(0x3e5168cd, 0x0e82938e),
+ TOBN(0x7aedc1ce, 0xb0df5dd0), TOBN(0x6bbbc6d9, 0xe5732516),
+ TOBN(0xc7bfd486, 0x605daaa6), TOBN(0x46fd72b7, 0xbb9a6c9e),
+ TOBN(0xe4847fb1, 0xa124fb89), TOBN(0x75959cbd, 0xa2d8ffbc),
+ TOBN(0x42579f65, 0xc8a588ee), TOBN(0x368c92e6, 0xb80b499d),
+ TOBN(0xea4ef6cd, 0x999a5df1), TOBN(0xaa73bb7f, 0x936fe604),
+ TOBN(0xf347a70d, 0x6457d188), TOBN(0x86eda86b, 0x8b7a388b),
+ TOBN(0xb7cdff06, 0x0ccd6013), TOBN(0xbeb1b6c7, 0xd0053fb2),
+ TOBN(0x0b022387, 0x99240a9f), TOBN(0x1bbb384f, 0x776189b2),
+ TOBN(0x8695e71e, 0x9066193a), TOBN(0x2eb50097, 0x06ffac7e),
+ TOBN(0x0654a9c0, 0x4a7d2caa), TOBN(0x6f3fb3d1, 0xa5aaa290),
+ TOBN(0x835db041, 0xff476e8f), TOBN(0x540b8b0b, 0xc42295e4),
+ TOBN(0xa5c73ac9, 0x05e214f5), TOBN(0x9a74075a, 0x56a0b638),
+ TOBN(0x2e4b1090, 0xce9e680b), TOBN(0x57a5b479, 0x6b8d9afa),
+ TOBN(0x0dca48e7, 0x26bfe65c), TOBN(0x097e391c, 0x7290c307),
+ TOBN(0x683c462e, 0x6669e72e), TOBN(0xf505be1e, 0x062559ac),
+ TOBN(0x5fbe3ea1, 0xe3a3035a), TOBN(0x6431ebf6, 0x9cd50da8),
+ TOBN(0xfd169d5c, 0x1f6407f2), TOBN(0x8d838a95, 0x60fce6b8),
+ TOBN(0x2a2bfa7f, 0x650006f0), TOBN(0xdfd7dad3, 0x50c0fbb2),
+ TOBN(0x92452495, 0xccf9ad96), TOBN(0x183bf494, 0xd95635f9),
+ TOBN(0x02d5df43, 0x4a7bd989), TOBN(0x505385cc, 0xa5431095),
+ TOBN(0xdd98e67d, 0xfd43f53e), TOBN(0xd61e1a6c, 0x500c34a9),
+ TOBN(0x5a4b46c6, 0x4a8a3d62), TOBN(0x8469c4d0, 0x247743d2),
+ TOBN(0x2bb3a13d, 0x88f7e433), TOBN(0x62b23a10, 0x01be5849),
+ TOBN(0xe83596b4, 0xa63d1a4c), TOBN(0x454e7fea, 0x7d183f3e),
+ TOBN(0x643fce61, 0x17afb01c), TOBN(0x4e65e5e6, 0x1c4c3638),
+ TOBN(0x41d85ea1, 0xef74c45b), TOBN(0x2cfbfa66, 0xae328506),
+ TOBN(0x98b078f5, 0x3ada7da9), TOBN(0xd985fe37, 0xec752fbb),
+ TOBN(0xeece68fe, 0x5a0148b4), TOBN(0x6f9a55c7, 0x2d78136d),
+ TOBN(0x232dccc4, 0xd2b729ce), TOBN(0xa27e0dfd, 0x90aafbc4),
+ TOBN(0x96474452, 0x12b4603e), TOBN(0xa876c551, 0x6b706d14),
+ TOBN(0xdf145fcf, 0x69a9d412), TOBN(0xe2ab75b7, 0x2d479c34),
+ TOBN(0x12df9a76, 0x1a23ff97), TOBN(0xc6138992, 0x5d359d10),
+ TOBN(0x6e51c7ae, 0xfa835f22), TOBN(0x69a79cb1, 0xc0fcc4d9),
+ TOBN(0xf57f350d, 0x594cc7e1), TOBN(0x3079ca63, 0x3350ab79),
+ TOBN(0x226fb614, 0x9aff594a), TOBN(0x35afec02, 0x6d59a62b),
+ TOBN(0x9bee46f4, 0x06ed2c6e), TOBN(0x58da1735, 0x7d939a57),
+ TOBN(0x44c50402, 0x8fd1797e), TOBN(0xd8853e7c, 0x5ccea6ca),
+ TOBN(0x4065508d, 0xa35fcd5f), TOBN(0x8965df8c, 0x495ccaeb),
+ TOBN(0x0f2da850, 0x12e1a962), TOBN(0xee471b94, 0xc1cf1cc4),
+ TOBN(0xcef19bc8, 0x0a08fb75), TOBN(0x704958f5, 0x81de3591),
+ TOBN(0x2867f8b2, 0x3aef4f88), TOBN(0x8d749384, 0xea9f9a5f),
+ TOBN(0x1b385537, 0x8c9049f4), TOBN(0x5be948f3, 0x7b92d8b6),
+ TOBN(0xd96f725d, 0xb6e2bd6b), TOBN(0x37a222bc, 0x958c454d),
+ TOBN(0xe7c61abb, 0x8809bf61), TOBN(0x46f07fbc, 0x1346f18d),
+ TOBN(0xfb567a7a, 0xe87c0d1c), TOBN(0x84a461c8, 0x7ef3d07a),
+ TOBN(0x0a5adce6, 0xd9278d98), TOBN(0x24d94813, 0x9dfc73e1),
+ TOBN(0x4f3528b6, 0x054321c3), TOBN(0x2e03fdde, 0x692ea706),
+ TOBN(0x10e60619, 0x47b533c0), TOBN(0x1a8bc73f, 0x2ca3c055),
+ TOBN(0xae58d4b2, 0x1bb62b8f), TOBN(0xb2045a73, 0x584a24e3),
+ TOBN(0x3ab3d5af, 0xbd76e195), TOBN(0x478dd1ad, 0x6938a810),
+ TOBN(0x6ffab393, 0x6ee3d5cb), TOBN(0xdfb693db, 0x22b361e4),
+ TOBN(0xf9694496, 0x51dbf1a7), TOBN(0xcab4b4ef, 0x08a2e762),
+ TOBN(0xe8c92f25, 0xd39bba9a), TOBN(0x850e61bc, 0xf1464d96),
+ TOBN(0xb7e830e3, 0xdc09508b), TOBN(0xfaf6d2cf, 0x74317655),
+ TOBN(0x72606ceb, 0xdf690355), TOBN(0x48bb92b3, 0xd0c3ded6),
+ TOBN(0x65b75484, 0x5c7cf892), TOBN(0xf6cd7ac9, 0xd5d5f01f),
+ TOBN(0xc2c30a59, 0x96401d69), TOBN(0x91268650, 0xed921878),
+ TOBN(0x380bf913, 0xb78c558f), TOBN(0x43c0baeb, 0xc8afdaa9),
+ TOBN(0x377f61d5, 0x54f169d3), TOBN(0xf8da07e3, 0xae5ff20b),
+ TOBN(0xb676c49d, 0xa8a90ea8), TOBN(0x81c1ff2b, 0x83a29b21),
+ TOBN(0x383297ac, 0x2ad8d276), TOBN(0x3001122f, 0xba89f982),
+ TOBN(0xe1d794be, 0x6718e448), TOBN(0x246c1482, 0x7c3e6e13),
+ TOBN(0x56646ef8, 0x5d26b5ef), TOBN(0x80f5091e, 0x88069cdd),
+ TOBN(0xc5992e2f, 0x724bdd38), TOBN(0x02e915b4, 0x8471e8c7),
+ TOBN(0x96ff320a, 0x0d0ff2a9), TOBN(0xbf886487, 0x4384d1a0),
+ TOBN(0xbbe1e6a6, 0xc93f72d6), TOBN(0xd5f75d12, 0xcad800ea),
+ TOBN(0xfa40a09f, 0xe7acf117), TOBN(0x32c8cdd5, 0x7581a355),
+ TOBN(0x74221992, 0x7023c499), TOBN(0xa8afe5d7, 0x38ec3901),
+ TOBN(0x5691afcb, 0xa90e83f0), TOBN(0x41bcaa03, 0x0b8f8eac),
+ TOBN(0xe38b5ff9, 0x8d2668d5), TOBN(0x0715281a, 0x7ad81965),
+ TOBN(0x1bc8fc7c, 0x03c6ce11), TOBN(0xcbbee6e2, 0x8b650436),
+ TOBN(0x06b00fe8, 0x0cdb9808), TOBN(0x17d6e066, 0xfe3ed315),
+ TOBN(0x2e9d38c6, 0x4d0b5018), TOBN(0xab8bfd56, 0x844dcaef),
+ TOBN(0x42894a59, 0x513aed8b), TOBN(0xf77f3b6d, 0x314bd07a),
+ TOBN(0xbbdecb8f, 0x8e42b582), TOBN(0xf10e2fa8, 0xd2390fe6),
+ TOBN(0xefb95022, 0x62a2f201), TOBN(0x4d59ea50, 0x50ee32b0),
+ TOBN(0xd87f7728, 0x6da789a8), TOBN(0xcf98a2cf, 0xf79492c4),
+ TOBN(0xf9577239, 0x720943c2), TOBN(0xba044cf5, 0x3990b9d0),
+ TOBN(0x5aa8e823, 0x95f2884a), TOBN(0x834de6ed, 0x0278a0af),
+ TOBN(0xc8e1ee9a, 0x5f25bd12), TOBN(0x9259ceaa, 0x6f7ab271),
+ TOBN(0x7e6d97a2, 0x77d00b76), TOBN(0x5c0c6eea, 0xa437832a),
+ TOBN(0x5232c20f, 0x5606b81d), TOBN(0xabd7b375, 0x0d991ee5),
+ TOBN(0x4d2bfe35, 0x8632d951), TOBN(0x78f85146, 0x98ed9364),
+ TOBN(0x951873f0, 0xf30c3282), TOBN(0x0da8ac80, 0xa789230b),
+ TOBN(0x3ac7789c, 0x5398967f), TOBN(0xa69b8f7f, 0xbdda0fb5),
+ TOBN(0xe5db7717, 0x6add8545), TOBN(0x1b71cb66, 0x72c49b66),
+ TOBN(0xd8560739, 0x68421d77), TOBN(0x03840fe8, 0x83e3afea),
+ TOBN(0xb391dad5, 0x1ec69977), TOBN(0xae243fb9, 0x307f6726),
+ TOBN(0xc88ac87b, 0xe8ca160c), TOBN(0x5174cced, 0x4ce355f4),
+ TOBN(0x98a35966, 0xe58ba37d), TOBN(0xfdcc8da2, 0x7817335d),
+ TOBN(0x5b752830, 0x83fbc7bf), TOBN(0x68e419d4, 0xd9c96984),
+ TOBN(0x409a39f4, 0x02a40380), TOBN(0x88940faf, 0x1fe977bc),
+ TOBN(0xc640a94b, 0x8f8edea6), TOBN(0x1e22cd17, 0xed11547d),
+ TOBN(0xe28568ce, 0x59ffc3e2), TOBN(0x60aa1b55, 0xc1dee4e7),
+ TOBN(0xc67497c8, 0x837cb363), TOBN(0x06fb438a, 0x105a2bf2),
+ TOBN(0x30357ec4, 0x500d8e20), TOBN(0x1ad9095d, 0x0670db10),
+ TOBN(0x7f589a05, 0xc73b7cfd), TOBN(0xf544607d, 0x880d6d28),
+ TOBN(0x17ba93b1, 0xa20ef103), TOBN(0xad859130, 0x6ba6577b),
+ TOBN(0x65c91cf6, 0x6fa214a0), TOBN(0xd7d49c6c, 0x27990da5),
+ TOBN(0xecd9ec8d, 0x20bb569d), TOBN(0xbd4b2502, 0xeeffbc33),
+ TOBN(0x2056ca5a, 0x6bed0467), TOBN(0x7916a1f7, 0x5b63728c),
+ TOBN(0xd4f9497d, 0x53a4f566), TOBN(0x89734664, 0x97b56810),
+ TOBN(0xf8e1da74, 0x0494a621), TOBN(0x82546a93, 0x8d011c68),
+ TOBN(0x1f3acb19, 0xc61ac162), TOBN(0x52f8fa9c, 0xabad0d3e),
+ TOBN(0x15356523, 0xb4b7ea43), TOBN(0x5a16ad61, 0xae608125),
+ TOBN(0xb0bcb87f, 0x4faed184), TOBN(0x5f236b1d, 0x5029f45f),
+ TOBN(0xd42c7607, 0x0bc6b1fc), TOBN(0xc644324e, 0x68aefce3),
+ TOBN(0x8e191d59, 0x5c5d8446), TOBN(0xc0208077, 0x13ae1979),
+ TOBN(0xadcaee55, 0x3ba59cc7), TOBN(0x20ed6d6b, 0xa2cb81ba),
+ TOBN(0x0952ba19, 0xb6efcffc), TOBN(0x60f12d68, 0x97c0b87c),
+ TOBN(0x4ee2c7c4, 0x9caa30bc), TOBN(0x767238b7, 0x97fbff4e),
+ TOBN(0xebc73921, 0x501b5d92), TOBN(0x3279e3df, 0xc2a37737),
+ TOBN(0x9fc12bc8, 0x6d197543), TOBN(0xfa94dc6f, 0x0a40db4e),
+ TOBN(0x7392b41a, 0x530ccbbd), TOBN(0x87c82146, 0xea823525),
+ TOBN(0xa52f984c, 0x05d98d0c), TOBN(0x2ae57d73, 0x5ef6974c),
+ TOBN(0x9377f7bf, 0x3042a6dd), TOBN(0xb1a007c0, 0x19647a64),
+ TOBN(0xfaa9079a, 0x0cca9767), TOBN(0x3d81a25b, 0xf68f72d5),
+ TOBN(0x752067f8, 0xff81578e), TOBN(0x78622150, 0x9045447d),
+ TOBN(0xc0c22fcf, 0x0505aa6f), TOBN(0x1030f0a6, 0x6bed1c77),
+ TOBN(0x31f29f15, 0x1f0bd739), TOBN(0x2d7989c7, 0xe6debe85),
+ TOBN(0x5c070e72, 0x8e677e98), TOBN(0x0a817bd3, 0x06e81fd5),
+ TOBN(0xc110d830, 0xb0f2ac95), TOBN(0x48d0995a, 0xab20e64e),
+ TOBN(0x0f3e00e1, 0x7729cd9a), TOBN(0x2a570c20, 0xdd556946),
+ TOBN(0x912dbcfd, 0x4e86214d), TOBN(0x2d014ee2, 0xcf615498),
+ TOBN(0x55e2b1e6, 0x3530d76e), TOBN(0xc5135ae4, 0xfd0fd6d1),
+ TOBN(0x0066273a, 0xd4f3049f), TOBN(0xbb8e9893, 0xe7087477),
+ TOBN(0x2dba1ddb, 0x14c6e5fd), TOBN(0xdba37886, 0x51f57e6c),
+ TOBN(0x5aaee0a6, 0x5a72f2cf), TOBN(0x1208bfbf, 0x7bea5642),
+ TOBN(0xf5c6aa3b, 0x67872c37), TOBN(0xd726e083, 0x43f93224),
+ TOBN(0x1854daa5, 0x061f1658), TOBN(0xc0016df1, 0xdf0cd2b3),
+ TOBN(0xc2a3f23e, 0x833d50de), TOBN(0x73b681d2, 0xbbbd3017),
+ TOBN(0x2f046dc4, 0x3ac343c0), TOBN(0x9c847e7d, 0x85716421),
+ TOBN(0xe1e13c91, 0x0917eed4), TOBN(0x3fc9eebd, 0x63a1b9c6),
+ TOBN(0x0f816a72, 0x7fe02299), TOBN(0x6335ccc2, 0x294f3319),
+ TOBN(0x3820179f, 0x4745c5be), TOBN(0xe647b782, 0x922f066e),
+ TOBN(0xc22e49de, 0x02cafb8a), TOBN(0x299bc2ff, 0xfcc2eccc),
+ TOBN(0x9a8feea2, 0x6e0e8282), TOBN(0xa627278b, 0xfe893205),
+ TOBN(0xa7e19733, 0x7933e47b), TOBN(0xf4ff6b13, 0x2e766402),
+ TOBN(0xa4d8be0a, 0x98440d9f), TOBN(0x658f5c2f, 0x38938808),
+ TOBN(0x90b75677, 0xc95b3b3e), TOBN(0xfa044269, 0x3137b6ff),
+ TOBN(0x077b039b, 0x43c47c29), TOBN(0xcca95dd3, 0x8a6445b2),
+ TOBN(0x0b498ba4, 0x2333fc4c), TOBN(0x274f8e68, 0xf736a1b1),
+ TOBN(0x6ca348fd, 0x5f1d4b2e), TOBN(0x24d3be78, 0xa8f10199),
+ TOBN(0x8535f858, 0xca14f530), TOBN(0xa6e7f163, 0x5b982e51),
+ TOBN(0x847c8512, 0x36e1bf62), TOBN(0xf6a7c58e, 0x03448418),
+ TOBN(0x583f3703, 0xf9374ab6), TOBN(0x864f9195, 0x6e564145),
+ TOBN(0x33bc3f48, 0x22526d50), TOBN(0x9f323c80, 0x1262a496),
+ TOBN(0xaa97a7ae, 0x3f046a9a), TOBN(0x70da183e, 0xdf8a039a),
+ TOBN(0x5b68f71c, 0x52aa0ba6), TOBN(0x9be0fe51, 0x21459c2d),
+ TOBN(0xc1e17eb6, 0xcbc613e5), TOBN(0x33131d55, 0x497ea61c),
+ TOBN(0x2f69d39e, 0xaf7eded5), TOBN(0x73c2f434, 0xde6af11b),
+ TOBN(0x4ca52493, 0xa4a375fa), TOBN(0x5f06787c, 0xb833c5c2),
+ TOBN(0x814e091f, 0x3e6e71cf), TOBN(0x76451f57, 0x8b746666) },
+ {
+ TOBN(0x80f9bdef, 0x694db7e0),
+ TOBN(0xedca8787, 0xb9fcddc6),
+ TOBN(0x51981c34, 0x03b8dce1),
+ TOBN(0x4274dcf1, 0x70e10ba1),
+ TOBN(0xf72743b8, 0x6def6d1a),
+ TOBN(0xd25b1670, 0xebdb1866),
+ TOBN(0xc4491e8c, 0x050c6f58),
+ TOBN(0x2be2b2ab, 0x87fbd7f5),
+ TOBN(0x3e0e5c9d, 0xd111f8ec),
+ TOBN(0xbcc33f8d, 0xb7c4e760),
+ TOBN(0x702f9a91, 0xbd392a51),
+ TOBN(0x7da4a795, 0xc132e92d),
+ TOBN(0x1a0b0ae3, 0x0bb1151b),
+ TOBN(0x54febac8, 0x02e32251),
+ TOBN(0xea3a5082, 0x694e9e78),
+ TOBN(0xe58ffec1, 0xe4fe40b8),
+ TOBN(0xf85592fc, 0xd1e0cf9e),
+ TOBN(0xdea75f0d, 0xc0e7b2e8),
+ TOBN(0xc04215cf, 0xc135584e),
+ TOBN(0x174fc727, 0x2f57092a),
+ TOBN(0xe7277877, 0xeb930bea),
+ TOBN(0x504caccb, 0x5eb02a5a),
+ TOBN(0xf9fe08f7, 0xf5241b9b),
+ TOBN(0xe7fb62f4, 0x8d5ca954),
+ TOBN(0xfbb8349d, 0x29c4120b),
+ TOBN(0x9f94391f, 0xc0d0d915),
+ TOBN(0xc4074fa7, 0x5410ba51),
+ TOBN(0xa66adbf6, 0x150a5911),
+ TOBN(0xc164543c, 0x34bfca38),
+ TOBN(0xe0f27560, 0xb9e1ccfc),
+ TOBN(0x99da0f53, 0xe820219c),
+ TOBN(0xe8234498, 0xc6b4997a),
+ TOBN(0xcfb88b76, 0x9d4c5423),
+ TOBN(0x9e56eb10, 0xb0521c49),
+ TOBN(0x418e0b5e, 0xbe8700a1),
+ TOBN(0x00cbaad6, 0xf93cb58a),
+ TOBN(0xe923fbde, 0xd92a5e67),
+ TOBN(0xca4979ac, 0x1f347f11),
+ TOBN(0x89162d85, 0x6bc0585b),
+ TOBN(0xdd6254af, 0xac3c70e3),
+ TOBN(0x7b23c513, 0x516e19e4),
+ TOBN(0x56e2e847, 0xc5c4d593),
+ TOBN(0x9f727d73, 0x5ce71ef6),
+ TOBN(0x5b6304a6, 0xf79a44c5),
+ TOBN(0x6638a736, 0x3ab7e433),
+ TOBN(0x1adea470, 0xfe742f83),
+ TOBN(0xe054b854, 0x5b7fc19f),
+ TOBN(0xf935381a, 0xba1d0698),
+ TOBN(0x546eab2d, 0x799e9a74),
+ TOBN(0x96239e0e, 0xa949f729),
+ TOBN(0xca274c6b, 0x7090055a),
+ TOBN(0x835142c3, 0x9020c9b0),
+ TOBN(0xa405667a, 0xa2e8807f),
+ TOBN(0x29f2c085, 0x1aa3d39e),
+ TOBN(0xcc555d64, 0x42fc72f5),
+ TOBN(0xe856e0e7, 0xfbeacb3c),
+ TOBN(0xb5504f9d, 0x918e4936),
+ TOBN(0x65035ef6, 0xb2513982),
+ TOBN(0x0553a0c2, 0x6f4d9cb9),
+ TOBN(0x6cb10d56, 0xbea85509),
+ TOBN(0x48d957b7, 0xa242da11),
+ TOBN(0x16a4d3dd, 0x672b7268),
+ TOBN(0x3d7e637c, 0x8502a96b),
+ TOBN(0x27c7032b, 0x730d463b),
+ TOBN(0xbdc02b18, 0xe4136a14),
+ TOBN(0xbacf969d, 0x678e32bf),
+ TOBN(0xc98d89a3, 0xdd9c3c03),
+ TOBN(0x7b92420a, 0x23becc4f),
+ TOBN(0xd4b41f78, 0xc64d565c),
+ TOBN(0x9f969d00, 0x10f28295),
+ TOBN(0xec7f7f76, 0xb13d051a),
+ TOBN(0x08945e1e, 0xa92da585),
+ TOBN(0x55366b7d, 0x5846426f),
+ TOBN(0xe7d09e89, 0x247d441d),
+ TOBN(0x510b404d, 0x736fbf48),
+ TOBN(0x7fa003d0, 0xe784bd7d),
+ TOBN(0x25f7614f, 0x17fd9596),
+ TOBN(0x49e0e0a1, 0x35cb98db),
+ TOBN(0x2c65957b, 0x2e83a76a),
+ TOBN(0x5d40da8d, 0xcddbe0f8),
+ TOBN(0xf2b8c405, 0x050bad24),
+ TOBN(0x8918426d, 0xc2aa4823),
+ TOBN(0x2aeab3dd, 0xa38365a7),
+ TOBN(0x72031717, 0x7c91b690),
+ TOBN(0x8b00d699, 0x60a94120),
+ TOBN(0x478a255d, 0xe99eaeec),
+ TOBN(0xbf656a5f, 0x6f60aafd),
+ TOBN(0xdfd7cb75, 0x5dee77b3),
+ TOBN(0x37f68bb4, 0xa595939d),
+ TOBN(0x03556479, 0x28740217),
+ TOBN(0x8e740e7c, 0x84ad7612),
+ TOBN(0xd89bc843, 0x9044695f),
+ TOBN(0xf7f3da5d, 0x85a9184d),
+ TOBN(0x562563bb, 0x9fc0b074),
+ TOBN(0x06d2e6aa, 0xf88a888e),
+ TOBN(0x612d8643, 0x161fbe7c),
+ TOBN(0x465edba7, 0xf64085e7),
+ TOBN(0xb230f304, 0x29aa8511),
+ TOBN(0x53388426, 0xcda2d188),
+ TOBN(0x90885735, 0x4b666649),
+ TOBN(0x6f02ff9a, 0x652f54f6),
+ TOBN(0x65c82294, 0x5fae2bf0),
+ TOBN(0x7816ade0, 0x62f5eee3),
+ TOBN(0xdcdbdf43, 0xfcc56d70),
+ TOBN(0x9fb3bba3, 0x54530bb2),
+ TOBN(0xbde3ef77, 0xcb0869ea),
+ TOBN(0x89bc9046, 0x0b431163),
+ TOBN(0x4d03d7d2, 0xe4819a35),
+ TOBN(0x33ae4f9e, 0x43b6a782),
+ TOBN(0x216db307, 0x9c88a686),
+ TOBN(0x91dd88e0, 0x00ffedd9),
+ TOBN(0xb280da9f, 0x12bd4840),
+ TOBN(0x32a7cb8a, 0x1635e741),
+ TOBN(0xfe14008a, 0x78be02a7),
+ TOBN(0x3fafb334, 0x1b7ae030),
+ TOBN(0x7fd508e7, 0x5add0ce9),
+ TOBN(0x72c83219, 0xd607ad51),
+ TOBN(0x0f229c0a, 0x8d40964a),
+ TOBN(0x1be2c336, 0x1c878da2),
+ TOBN(0xe0c96742, 0xeab2ab86),
+ TOBN(0x458f8691, 0x3e538cd7),
+ TOBN(0xa7001f6c, 0x8e08ad53),
+ TOBN(0x52b8c6e6, 0xbf5d15ff),
+ TOBN(0x548234a4, 0x011215dd),
+ TOBN(0xff5a9d2d, 0x3d5b4045),
+ TOBN(0xb0ffeeb6, 0x4a904190),
+ TOBN(0x55a3aca4, 0x48607f8b),
+ TOBN(0x8cbd665c, 0x30a0672a),
+ TOBN(0x87f834e0, 0x42583068),
+ TOBN(0x02da2aeb, 0xf3f6e683),
+ TOBN(0x6b763e5d, 0x05c12248),
+ TOBN(0x7230378f, 0x65a8aefc),
+ TOBN(0x93bd80b5, 0x71e8e5ca),
+ TOBN(0x53ab041c, 0xb3b62524),
+ TOBN(0x1b860513, 0x6c9c552e),
+ TOBN(0xe84d402c, 0xd5524e66),
+ TOBN(0xa37f3573, 0xf37f5937),
+ TOBN(0xeb0f6c7d, 0xd1e4fca5),
+ TOBN(0x2965a554, 0xac8ab0fc),
+ TOBN(0x17fbf56c, 0x274676ac),
+ TOBN(0x2e2f6bd9, 0xacf7d720),
+ TOBN(0x41fc8f88, 0x10224766),
+ TOBN(0x517a14b3, 0x85d53bef),
+ TOBN(0xdae327a5, 0x7d76a7d1),
+ TOBN(0x6ad0a065, 0xc4818267),
+ TOBN(0x33aa189b, 0x37c1bbc1),
+ TOBN(0x64970b52, 0x27392a92),
+ TOBN(0x21699a1c, 0x2d1535ea),
+ TOBN(0xcd20779c, 0xc2d7a7fd),
+ TOBN(0xe3186059, 0x99c83cf2),
+ TOBN(0x9b69440b, 0x72c0b8c7),
+ TOBN(0xa81497d7, 0x7b9e0e4d),
+ TOBN(0x515d5c89, 0x1f5f82dc),
+ TOBN(0x9a7f67d7, 0x6361079e),
+ TOBN(0xa8da81e3, 0x11a35330),
+ TOBN(0xe44990c4, 0x4b18be1b),
+ TOBN(0xc7d5ed95, 0xaf103e59),
+ TOBN(0xece8aba7, 0x8dac9261),
+ TOBN(0xbe82b099, 0x9394b8d3),
+ TOBN(0x6830f09a, 0x16adfe83),
+ TOBN(0x250a29b4, 0x88172d01),
+ TOBN(0x8b20bd65, 0xcaff9e02),
+ TOBN(0xb8a7661e, 0xe8a6329a),
+ TOBN(0x4520304d, 0xd3fce920),
+ TOBN(0xae45da1f, 0x2b47f7ef),
+ TOBN(0xe07f5288, 0x5bffc540),
+ TOBN(0xf7997009, 0x3464f874),
+ TOBN(0x2244c2cd, 0xa6fa1f38),
+ TOBN(0x43c41ac1, 0x94d7d9b1),
+ TOBN(0x5bafdd82, 0xc82e7f17),
+ TOBN(0xdf0614c1, 0x5fda0fca),
+ TOBN(0x74b043a7, 0xa8ae37ad),
+ TOBN(0x3ba6afa1, 0x9e71734c),
+ TOBN(0x15d5437e, 0x9c450f2e),
+ TOBN(0x4a5883fe, 0x67e242b1),
+ TOBN(0x5143bdc2, 0x2c1953c2),
+ TOBN(0x542b8b53, 0xfc5e8920),
+ TOBN(0x363bf9a8, 0x9a9cee08),
+ TOBN(0x02375f10, 0xc3486e08),
+ TOBN(0x2037543b, 0x8c5e70d2),
+ TOBN(0x7109bccc, 0x625640b4),
+ TOBN(0xcbc1051e, 0x8bc62c3b),
+ TOBN(0xf8455fed, 0x803f26ea),
+ TOBN(0x6badceab, 0xeb372424),
+ TOBN(0xa2a9ce7c, 0x6b53f5f9),
+ TOBN(0x64246595, 0x1b176d99),
+ TOBN(0xb1298d36, 0xb95c081b),
+ TOBN(0x53505bb8, 0x1d9a9ee6),
+ TOBN(0x3f6f9e61, 0xf2ba70b0),
+ TOBN(0xd07e16c9, 0x8afad453),
+ TOBN(0x9f1694bb, 0xe7eb4a6a),
+ TOBN(0xdfebced9, 0x3cb0bc8e),
+ TOBN(0x92d3dcdc, 0x53868c8b),
+ TOBN(0x174311a2, 0x386107a6),
+ TOBN(0x4109e07c, 0x689b4e64),
+ TOBN(0x30e4587f, 0x2df3dcb6),
+ TOBN(0x841aea31, 0x0811b3b2),
+ TOBN(0x6144d41d, 0x0cce43ea),
+ TOBN(0x464c4581, 0x2a9a7803),
+ TOBN(0xd03d371f, 0x3e158930),
+ TOBN(0xc676d7f2, 0xb1f3390b),
+ TOBN(0x9f7a1b8c, 0xa5b61272),
+ TOBN(0x4ebebfc9, 0xc2e127a9),
+ TOBN(0x4602500c, 0x5dd997bf),
+ TOBN(0x7f09771c, 0x4711230f),
+ TOBN(0x058eb37c, 0x020f09c1),
+ TOBN(0xab693d4b, 0xfee5e38b),
+ TOBN(0x9289eb1f, 0x4653cbc0),
+ TOBN(0xbecf46ab, 0xd51b9cf5),
+ TOBN(0xd2aa9c02, 0x9f0121af),
+ TOBN(0x36aaf7d2, 0xe90dc274),
+ TOBN(0x909e4ea0, 0x48b95a3c),
+ TOBN(0xe6b70496, 0x6f32dbdb),
+ TOBN(0x672188a0, 0x8b030b3e),
+ TOBN(0xeeffe5b3, 0xcfb617e2),
+ TOBN(0x87e947de, 0x7c82709e),
+ TOBN(0xa44d2b39, 0x1770f5a7),
+ TOBN(0xe4d4d791, 0x0e44eb82),
+ TOBN(0x42e69d1e, 0x3f69712a),
+ TOBN(0xbf11c4d6, 0xac6a820e),
+ TOBN(0xb5e7f3e5, 0x42c4224c),
+ TOBN(0xd6b4e81c, 0x449d941c),
+ TOBN(0x5d72bd16, 0x5450e878),
+ TOBN(0x6a61e28a, 0xee25ac54),
+ TOBN(0x33272094, 0xe6f1cd95),
+ TOBN(0x7512f30d, 0x0d18673f),
+ TOBN(0x32f7a4ca, 0x5afc1464),
+ TOBN(0x2f095656, 0x6bbb977b),
+ TOBN(0x586f47ca, 0xa8226200),
+ TOBN(0x02c868ad, 0x1ac07369),
+ TOBN(0x4ef2b845, 0xc613acbe),
+ TOBN(0x43d7563e, 0x0386054c),
+ TOBN(0x54da9dc7, 0xab952578),
+ TOBN(0xb5423df2, 0x26e84d0b),
+ TOBN(0xa8b64eeb, 0x9b872042),
+ TOBN(0xac205782, 0x5990f6df),
+ TOBN(0x4ff696eb, 0x21f4c77a),
+ TOBN(0x1a79c3e4, 0xaab273af),
+ TOBN(0x29bc922e, 0x9436b3f1),
+ TOBN(0xff807ef8, 0xd6d9a27a),
+ TOBN(0x82acea3d, 0x778f22a0),
+ TOBN(0xfb10b2e8, 0x5b5e7469),
+ TOBN(0xc0b16980, 0x2818ee7d),
+ TOBN(0x011afff4, 0xc91c1a2f),
+ TOBN(0x95a6d126, 0xad124418),
+ TOBN(0x31c081a5, 0xe72e295f),
+ TOBN(0x36bb283a, 0xf2f4db75),
+ TOBN(0xd115540f, 0x7acef462),
+ TOBN(0xc7f3a8f8, 0x33f6746c),
+ TOBN(0x21e46f65, 0xfea990ca),
+ TOBN(0x915fd5c5, 0xcaddb0a9),
+ TOBN(0xbd41f016, 0x78614555),
+ TOBN(0x346f4434, 0x426ffb58),
+ TOBN(0x80559436, 0x14dbc204),
+ TOBN(0xf3dd20fe, 0x5a969b7f),
+ TOBN(0x9d59e956, 0xe899a39a),
+ TOBN(0xf1b0971c, 0x8ad4cf4b),
+ TOBN(0x03448860, 0x2ffb8fb8),
+ TOBN(0xf071ac3c, 0x65340ba4),
+ TOBN(0x408d0596, 0xb27fd758),
+ TOBN(0xe7c78ea4, 0x98c364b0),
+ TOBN(0xa4aac4a5, 0x051e8ab5),
+ TOBN(0xb9e1d560, 0x485d9002),
+ TOBN(0x9acd518a, 0x88844455),
+ TOBN(0xe4ca688f, 0xd06f56c0),
+ TOBN(0xa48af70d, 0xdf027972),
+ TOBN(0x691f0f04, 0x5e9a609d),
+ TOBN(0xa9dd82cd, 0xee61270e),
+ TOBN(0x8903ca63, 0xa0ef18d3),
+ TOBN(0x9fb7ee35, 0x3d6ca3bd),
+ TOBN(0xa7b4a09c, 0xabf47d03),
+ TOBN(0x4cdada01, 0x1c67de8e),
+ TOBN(0x52003749, 0x9355a244),
+ TOBN(0xe77fd2b6, 0x4f2151a9),
+ TOBN(0x695d6cf6, 0x66b4efcb),
+ TOBN(0xc5a0cacf, 0xda2cfe25),
+ TOBN(0x104efe5c, 0xef811865),
+ TOBN(0xf52813e8, 0x9ea5cc3d),
+ TOBN(0x855683dc, 0x40b58dbc),
+ TOBN(0x0338ecde, 0x175fcb11),
+ TOBN(0xf9a05637, 0x74921592),
+ TOBN(0xb4f1261d, 0xb9bb9d31),
+ TOBN(0x551429b7, 0x4e9c5459),
+ TOBN(0xbe182e6f, 0x6ea71f53),
+ TOBN(0xd3a3b07c, 0xdfc50573),
+ TOBN(0x9ba1afda, 0x62be8d44),
+ TOBN(0x9bcfd2cb, 0x52ab65d3),
+ TOBN(0xdf11d547, 0xa9571802),
+ TOBN(0x099403ee, 0x02a2404a),
+ TOBN(0x497406f4, 0x21088a71),
+ TOBN(0x99479409, 0x5004ae71),
+ TOBN(0xbdb42078, 0xa812c362),
+ TOBN(0x2b72a30f, 0xd8828442),
+ TOBN(0x283add27, 0xfcb5ed1c),
+ TOBN(0xf7c0e200, 0x66a40015),
+ TOBN(0x3e3be641, 0x08b295ef),
+ TOBN(0xac127dc1, 0xe038a675),
+ TOBN(0x729deff3, 0x8c5c6320),
+ TOBN(0xb7df8fd4, 0xa90d2c53),
+ TOBN(0x9b74b0ec, 0x681e7cd3),
+ TOBN(0x5cb5a623, 0xdab407e5),
+ TOBN(0xcdbd3615, 0x76b340c6),
+ TOBN(0xa184415a, 0x7d28392c),
+ TOBN(0xc184c1d8, 0xe96f7830),
+ TOBN(0xc3204f19, 0x81d3a80f),
+ TOBN(0xfde0c841, 0xc8e02432),
+ TOBN(0x78203b3e, 0x8149e0c1),
+ TOBN(0x5904bdbb, 0x08053a73),
+ TOBN(0x30fc1dd1, 0x101b6805),
+ TOBN(0x43c223bc, 0x49aa6d49),
+ TOBN(0x9ed67141, 0x7a174087),
+ TOBN(0x311469a0, 0xd5997008),
+ TOBN(0xb189b684, 0x5e43fc61),
+ TOBN(0xf3282375, 0xe0d3ab57),
+ TOBN(0x4fa34b67, 0xb1181da8),
+ TOBN(0x621ed0b2, 0x99ee52b8),
+ TOBN(0x9b178de1, 0xad990676),
+ TOBN(0xd51de67b, 0x56d54065),
+ TOBN(0x2a2c27c4, 0x7538c201),
+ TOBN(0x33856ec8, 0x38a40f5c),
+ TOBN(0x2522fc15, 0xbe6cdcde),
+ TOBN(0x1e603f33, 0x9f0c6f89),
+ TOBN(0x7994edc3, 0x103e30a6),
+ TOBN(0x033a00db, 0x220c853e),
+ TOBN(0xd3cfa409, 0xf7bb7fd7),
+ TOBN(0x70f8781e, 0x462d18f6),
+ TOBN(0xbbd82980, 0x687fe295),
+ TOBN(0x6eef4c32, 0x595669f3),
+ TOBN(0x86a9303b, 0x2f7e85c3),
+ TOBN(0x5fce4621, 0x71988f9b),
+ TOBN(0x5b935bf6, 0xc138acb5),
+ TOBN(0x30ea7d67, 0x25661212),
+ TOBN(0xef1eb5f4, 0xe51ab9a2),
+ TOBN(0x0587c98a, 0xae067c78),
+ TOBN(0xb3ce1b3c, 0x77ca9ca6),
+ TOBN(0x2a553d4d, 0x54b5f057),
+ TOBN(0xc7898236, 0x4da29ec2),
+ TOBN(0xdbdd5d13, 0xb9c57316),
+ TOBN(0xc57d6e6b, 0x2cd80d47),
+ TOBN(0x80b460cf, 0xfe9e7391),
+ TOBN(0x98648cab, 0xf963c31e),
+ TOBN(0x67f9f633, 0xcc4d32fd),
+ TOBN(0x0af42a9d, 0xfdf7c687),
+ TOBN(0x55f292a3, 0x0b015ea7),
+ TOBN(0x89e468b2, 0xcd21ab3d),
+ TOBN(0xe504f022, 0xc393d392),
+ TOBN(0xab21e1d4, 0xa5013af9),
+ TOBN(0xe3283f78, 0xc2c28acb),
+ TOBN(0xf38b35f6, 0x226bf99f),
+ TOBN(0xe8354274, 0x0e291e69),
+ TOBN(0x61673a15, 0xb20c162d),
+ TOBN(0xc101dc75, 0xb04fbdbe),
+ TOBN(0x8323b4c2, 0x255bd617),
+ TOBN(0x6c969693, 0x6c2a9154),
+ TOBN(0xc6e65860, 0x62679387),
+ TOBN(0x8e01db0c, 0xb8c88e23),
+ TOBN(0x33c42873, 0x893a5559),
+ TOBN(0x7630f04b, 0x47a3e149),
+ TOBN(0xb5d80805, 0xddcf35f8),
+ TOBN(0x582ca080, 0x77dfe732),
+ TOBN(0x2c7156e1, 0x0b1894a0),
+ TOBN(0x92034001, 0xd81c68c0),
+ TOBN(0xed225d00, 0xc8b115b5),
+ TOBN(0x237f9c22, 0x83b907f2),
+ TOBN(0x0ea2f32f, 0x4470e2c0),
+ TOBN(0xb725f7c1, 0x58be4e95),
+ TOBN(0x0f1dcafa, 0xb1ae5463),
+ TOBN(0x59ed5187, 0x1ba2fc04),
+ TOBN(0xf6e0f316, 0xd0115d4d),
+ TOBN(0x5180b12f, 0xd3691599),
+ TOBN(0x157e32c9, 0x527f0a41),
+ TOBN(0x7b0b081d, 0xa8e0ecc0),
+ TOBN(0x6dbaaa8a, 0xbf4f0dd0),
+ TOBN(0x99b289c7, 0x4d252696),
+ TOBN(0x79b7755e, 0xdbf864fe),
+ TOBN(0x6974e2b1, 0x76cad3ab),
+ TOBN(0x35dbbee2, 0x06ddd657),
+ TOBN(0xe7cbdd11, 0x2ff3a96d),
+ TOBN(0x88381968, 0x076be758),
+ TOBN(0x2d737e72, 0x08c91f5d),
+ TOBN(0x5f83ab62, 0x86ec3776),
+ TOBN(0x98aa649d, 0x945fa7a1),
+ TOBN(0xf477ec37, 0x72ef0933),
+ TOBN(0x66f52b1e, 0x098c17b1),
+ TOBN(0x9eec58fb, 0xd803738b),
+ TOBN(0x91aaade7, 0xe4e86aa4),
+ TOBN(0x6b1ae617, 0xa5b51492),
+ TOBN(0x63272121, 0xbbc45974),
+ TOBN(0x7e0e28f0, 0x862c5129),
+ TOBN(0x0a8f79a9, 0x3321a4a0),
+ TOBN(0xe26d1664, 0x5041c88f),
+ TOBN(0x0571b805, 0x53233e3a),
+ TOBN(0xd1b0ccde, 0xc9520711),
+ TOBN(0x55a9e4ed, 0x3c8b84bf),
+ TOBN(0x9426bd39, 0xa1fef314),
+ TOBN(0x4f5f638e, 0x6eb93f2b),
+ TOBN(0xba2a1ed3, 0x2bf9341b),
+ TOBN(0xd63c1321, 0x4d42d5a9),
+ TOBN(0xd2964a89, 0x316dc7c5),
+ TOBN(0xd1759606, 0xca511851),
+ TOBN(0xd8a9201f, 0xf9e6ed35),
+ TOBN(0xb7b5ee45, 0x6736925a),
+ TOBN(0x0a83fbbc, 0x99581af7),
+ TOBN(0x3076bc40, 0x64eeb051),
+ TOBN(0x5511c98c, 0x02dec312),
+ TOBN(0x270de898, 0x238dcb78),
+ TOBN(0x2cf4cf9c, 0x539c08c9),
+ TOBN(0xa70cb65e, 0x38d3b06e),
+ TOBN(0xb12ec10e, 0xcfe57bbd),
+ TOBN(0x82c7b656, 0x35a0c2b5),
+ TOBN(0xddc7d5cd, 0x161c67bd),
+ TOBN(0xe32e8985, 0xae3a32cc),
+ TOBN(0x7aba9444, 0xd11a5529),
+ TOBN(0xe964ed02, 0x2427fa1a),
+ TOBN(0x1528392d, 0x24a1770a),
+ TOBN(0xa152ce2c, 0x12c72fcd),
+ TOBN(0x714553a4, 0x8ec07649),
+ TOBN(0x18b4c290, 0x459dd453),
+ TOBN(0xea32b714, 0x7b64b110),
+ TOBN(0xb871bfa5, 0x2e6f07a2),
+ TOBN(0xb67112e5, 0x9e2e3c9b),
+ TOBN(0xfbf250e5, 0x44aa90f6),
+ TOBN(0xf77aedb8, 0xbd539006),
+ TOBN(0x3b0cdf9a, 0xd172a66f),
+ TOBN(0xedf69fea, 0xf8c51187),
+ TOBN(0x05bb67ec, 0x741e4da7),
+ TOBN(0x47df0f32, 0x08114345),
+ TOBN(0x56facb07, 0xbb9792b1),
+ TOBN(0xf3e007e9, 0x8f6229e4),
+ TOBN(0x62d103f4, 0x526fba0f),
+ TOBN(0x4f33bef7, 0xb0339d79),
+ TOBN(0x9841357b, 0xb59bfec1),
+ TOBN(0xfa8dbb59, 0xc34e6705),
+ TOBN(0xc3c7180b, 0x7fdaa84c),
+ TOBN(0xf95872fc, 0xa4108537),
+ TOBN(0x8750cc3b, 0x932a3e5a),
+ TOBN(0xb61cc69d, 0xb7275d7d),
+ TOBN(0xffa0168b, 0x2e59b2e9),
+ TOBN(0xca032abc, 0x6ecbb493),
+ TOBN(0x1d86dbd3, 0x2c9082d8),
+ TOBN(0xae1e0b67, 0xe28ef5ba),
+ TOBN(0x2c9a4699, 0xcb18e169),
+ TOBN(0x0ecd0e33, 0x1e6bbd20),
+ TOBN(0x571b360e, 0xaf5e81d2),
+ TOBN(0xcd9fea58, 0x101c1d45),
+ TOBN(0x6651788e, 0x18880452),
+ TOBN(0xa9972635, 0x1f8dd446),
+ TOBN(0x44bed022, 0xe37281d0),
+ TOBN(0x094b2b2d, 0x33da525d),
+ TOBN(0xf193678e, 0x13144fd8),
+ TOBN(0xb8ab5ba4, 0xf4c1061d),
+ TOBN(0x4343b5fa, 0xdccbe0f4),
+ TOBN(0xa8702371, 0x63812713),
+ TOBN(0x47bf6d2d, 0xf7611d93),
+ TOBN(0x46729b8c, 0xbd21e1d7),
+ TOBN(0x7484d4e0, 0xd629e77d),
+ TOBN(0x830e6eea, 0x60dbac1f),
+ TOBN(0x23d8c484, 0xda06a2f7),
+ TOBN(0x896714b0, 0x50ca535b),
+ TOBN(0xdc8d3644, 0xebd97a9b),
+ TOBN(0x106ef9fa, 0xb12177b4),
+ TOBN(0xf79bf464, 0x534d5d9c),
+ TOBN(0x2537a349, 0xa6ab360b),
+ TOBN(0xc7c54253, 0xa00c744f),
+ TOBN(0xb3c7a047, 0xe5911a76),
+ TOBN(0x61ffa5c8, 0x647f1ee7),
+ TOBN(0x15aed36f, 0x8f56ab42),
+ TOBN(0x6a0d41b0, 0xa3ff9ac9),
+ TOBN(0x68f469f5, 0xcc30d357),
+ TOBN(0xbe9adf81, 0x6b72be96),
+ TOBN(0x1cd926fe, 0x903ad461),
+ TOBN(0x7e89e38f, 0xcaca441b),
+ TOBN(0xf0f82de5, 0xfacf69d4),
+ TOBN(0x363b7e76, 0x4775344c),
+ TOBN(0x6894f312, 0xb2e36d04),
+ TOBN(0x3c6cb4fe, 0x11d1c9a5),
+ TOBN(0x85d9c339, 0x4008e1f2),
+ TOBN(0x5e9a85ea, 0x249f326c),
+ TOBN(0xdc35c60a, 0x678c5e06),
+ TOBN(0xc08b944f, 0x9f86fba9),
+ TOBN(0xde40c02c, 0x89f71f0f),
+ TOBN(0xad8f3e31, 0xff3da3c0),
+ TOBN(0x3ea5096b, 0x42125ded),
+ TOBN(0x13879cbf, 0xa7379183),
+ TOBN(0x6f4714a5, 0x6b306a0b),
+ TOBN(0x359c2ea6, 0x67646c5e),
+ TOBN(0xfacf8943, 0x07726368),
+ TOBN(0x07a58935, 0x65ff431e),
+ TOBN(0x24d661d1, 0x68754ab0),
+ TOBN(0x801fce1d, 0x6f429a76),
+ TOBN(0xc068a85f, 0xa58ce769),
+ TOBN(0xedc35c54, 0x5d5eca2b),
+ TOBN(0xea31276f, 0xa3f660d1),
+ TOBN(0xa0184ebe, 0xb8fc7167),
+ TOBN(0x0f20f21a, 0x1d8db0ae),
+ TOBN(0xd96d095f, 0x56c35e12),
+ TOBN(0xedf402b5, 0xf8c2a25b),
+ TOBN(0x1bb772b9, 0x059204b6),
+ TOBN(0x50cbeae2, 0x19b4e34c),
+ TOBN(0x93109d80, 0x3fa0845a),
+ TOBN(0x54f7ccf7, 0x8ef59fb5),
+ TOBN(0x3b438fe2, 0x88070963),
+ TOBN(0x9e28c659, 0x31f3ba9b),
+ TOBN(0x9cc31b46, 0xead9da92),
+ TOBN(0x3c2f0ba9, 0xb733aa5f),
+ TOBN(0xdece47cb, 0xf05af235),
+ TOBN(0xf8e3f715, 0xa2ac82a5),
+ TOBN(0xc97ba641, 0x2203f18a),
+ TOBN(0xc3af5504, 0x09c11060),
+ TOBN(0x56ea2c05, 0x46af512d),
+ TOBN(0xfac28daf, 0xf3f28146),
+ TOBN(0x87fab43a, 0x959ef494),
+ },
+ {
+ TOBN(0x09891641, 0xd4c5105f),
+ TOBN(0x1ae80f8e, 0x6d7fbd65),
+ TOBN(0x9d67225f, 0xbee6bdb0),
+ TOBN(0x3b433b59, 0x7fc4d860),
+ TOBN(0x44e66db6, 0x93e85638),
+ TOBN(0xf7b59252, 0xe3e9862f),
+ TOBN(0xdb785157, 0x665c32ec),
+ TOBN(0x702fefd7, 0xae362f50),
+ TOBN(0x3754475d, 0x0fefb0c3),
+ TOBN(0xd48fb56b, 0x46d7c35d),
+ TOBN(0xa070b633, 0x363798a4),
+ TOBN(0xae89f3d2, 0x8fdb98e6),
+ TOBN(0x970b89c8, 0x6363d14c),
+ TOBN(0x89817521, 0x67abd27d),
+ TOBN(0x9bf7d474, 0x44d5a021),
+ TOBN(0xb3083baf, 0xcac72aee),
+ TOBN(0x389741de, 0xbe949a44),
+ TOBN(0x638e9388, 0x546a4fa5),
+ TOBN(0x3fe6419c, 0xa0047bdc),
+ TOBN(0x7047f648, 0xaaea57ca),
+ TOBN(0x54e48a90, 0x41fbab17),
+ TOBN(0xda8e0b28, 0x576bdba2),
+ TOBN(0xe807eebc, 0xc72afddc),
+ TOBN(0x07d3336d, 0xf42577bf),
+ TOBN(0x62a8c244, 0xbfe20925),
+ TOBN(0x91c19ac3, 0x8fdce867),
+ TOBN(0x5a96a5d5, 0xdd387063),
+ TOBN(0x61d587d4, 0x21d324f6),
+ TOBN(0xe87673a2, 0xa37173ea),
+ TOBN(0x23848008, 0x53778b65),
+ TOBN(0x10f8441e, 0x05bab43e),
+ TOBN(0xfa11fe12, 0x4621efbe),
+ TOBN(0x047b772e, 0x81685d7b),
+ TOBN(0x23f27d81, 0xbf34a976),
+ TOBN(0xc27608e2, 0x915f48ef),
+ TOBN(0x3b0b43fa, 0xa521d5c3),
+ TOBN(0x7613fb26, 0x63ca7284),
+ TOBN(0x7f5729b4, 0x1d4db837),
+ TOBN(0x87b14898, 0x583b526b),
+ TOBN(0x00b732a6, 0xbbadd3d1),
+ TOBN(0x8e02f426, 0x2048e396),
+ TOBN(0x436b50b6, 0x383d9de4),
+ TOBN(0xf78d3481, 0x471e85ad),
+ TOBN(0x8b01ea6a, 0xd005c8d6),
+ TOBN(0xd3c7afee, 0x97015c07),
+ TOBN(0x46cdf1a9, 0x4e3ba2ae),
+ TOBN(0x7a42e501, 0x83d3a1d2),
+ TOBN(0xd54b5268, 0xb541dff4),
+ TOBN(0x3f24cf30, 0x4e23e9bc),
+ TOBN(0x4387f816, 0x126e3624),
+ TOBN(0x26a46a03, 0x3b0b6d61),
+ TOBN(0xaf1bc845, 0x8b2d777c),
+ TOBN(0x25c401ba, 0x527de79c),
+ TOBN(0x0e1346d4, 0x4261bbb6),
+ TOBN(0x4b96c44b, 0x287b4bc7),
+ TOBN(0x658493c7, 0x5254562f),
+ TOBN(0x23f949fe, 0xb8a24a20),
+ TOBN(0x17ebfed1, 0xf52ca53f),
+ TOBN(0x9b691bbe, 0xbcfb4853),
+ TOBN(0x5617ff6b, 0x6278a05d),
+ TOBN(0x241b34c5, 0xe3c99ebd),
+ TOBN(0xfc64242e, 0x1784156a),
+ TOBN(0x4206482f, 0x695d67df),
+ TOBN(0xb967ce0e, 0xee27c011),
+ TOBN(0x65db3751, 0x21c80b5d),
+ TOBN(0x2e7a563c, 0xa31ecca0),
+ TOBN(0xe56ffc4e, 0x5238a07e),
+ TOBN(0x3d6c2966, 0x32ced854),
+ TOBN(0xe99d7d1a, 0xaf70b885),
+ TOBN(0xafc3bad9, 0x2d686459),
+ TOBN(0x9c78bf46, 0x0cc8ba5b),
+ TOBN(0x5a439519, 0x18955aa3),
+ TOBN(0xf8b517a8, 0x5fe4e314),
+ TOBN(0xe60234d0, 0xfcb8906f),
+ TOBN(0xffe542ac, 0xf2061b23),
+ TOBN(0x287e191f, 0x6b4cb59c),
+ TOBN(0x21857ddc, 0x09d877d8),
+ TOBN(0x1c23478c, 0x14678941),
+ TOBN(0xbbf0c056, 0xb6e05ea4),
+ TOBN(0x82da4b53, 0xb01594fe),
+ TOBN(0xf7526791, 0xfadb8608),
+ TOBN(0x049e832d, 0x7b74cdf6),
+ TOBN(0xa43581cc, 0xc2b90a34),
+ TOBN(0x73639eb8, 0x9360b10c),
+ TOBN(0x4fba331f, 0xe1e4a71b),
+ TOBN(0x6ffd6b93, 0x8072f919),
+ TOBN(0x6e53271c, 0x65679032),
+ TOBN(0x67206444, 0xf14272ce),
+ TOBN(0xc0f734a3, 0xb2335834),
+ TOBN(0x9526205a, 0x90ef6860),
+ TOBN(0xcb8be717, 0x04e2bb0d),
+ TOBN(0x2418871e, 0x02f383fa),
+ TOBN(0xd7177681, 0x4082c157),
+ TOBN(0xcc914ad0, 0x29c20073),
+ TOBN(0xf186c1eb, 0xe587e728),
+ TOBN(0x6fdb3c22, 0x61bcd5fd),
+ TOBN(0x30d014a6, 0xf2f9f8e9),
+ TOBN(0x963ece23, 0x4fec49d2),
+ TOBN(0x862025c5, 0x9605a8d9),
+ TOBN(0x39874445, 0x19f8929a),
+ TOBN(0x01b6ff65, 0x12bf476a),
+ TOBN(0x598a64d8, 0x09cf7d91),
+ TOBN(0xd7ec7749, 0x93be56ca),
+ TOBN(0x10899785, 0xcbb33615),
+ TOBN(0xb8a092fd, 0x02eee3ad),
+ TOBN(0xa86b3d35, 0x30145270),
+ TOBN(0x323d98c6, 0x8512b675),
+ TOBN(0x4b8bc785, 0x62ebb40f),
+ TOBN(0x7d301f54, 0x413f9cde),
+ TOBN(0xa5e4fb4f, 0x2bab5664),
+ TOBN(0x1d2b252d, 0x1cbfec23),
+ TOBN(0xfcd576bb, 0xe177120d),
+ TOBN(0x04427d3e, 0x83731a34),
+ TOBN(0x2bb9028e, 0xed836e8e),
+ TOBN(0xb36acff8, 0xb612ca7c),
+ TOBN(0xb88fe5ef, 0xd3d9c73a),
+ TOBN(0xbe2a6bc6, 0xedea4eb3),
+ TOBN(0x43b93133, 0x488eec77),
+ TOBN(0xf41ff566, 0xb17106e1),
+ TOBN(0x469e9172, 0x654efa32),
+ TOBN(0xb4480f04, 0x41c23fa3),
+ TOBN(0xb4712eb0, 0xc1989a2e),
+ TOBN(0x3ccbba0f, 0x93a29ca7),
+ TOBN(0x6e205c14, 0xd619428c),
+ TOBN(0x90db7957, 0xb3641686),
+ TOBN(0x0432691d, 0x45ac8b4e),
+ TOBN(0x07a759ac, 0xf64e0350),
+ TOBN(0x0514d89c, 0x9c972517),
+ TOBN(0x1701147f, 0xa8e67fc3),
+ TOBN(0x9e2e0b8b, 0xab2085be),
+ TOBN(0xd5651824, 0xac284e57),
+ TOBN(0x890d4325, 0x74893664),
+ TOBN(0x8a7c5e6e, 0xc55e68a3),
+ TOBN(0xbf12e90b, 0x4339c85a),
+ TOBN(0x31846b85, 0xf922b655),
+ TOBN(0x9a54ce4d, 0x0bf4d700),
+ TOBN(0xd7f4e83a, 0xf1a14295),
+ TOBN(0x916f955c, 0xb285d4f9),
+ TOBN(0xe57bb0e0, 0x99ffdaba),
+ TOBN(0x28a43034, 0xeab0d152),
+ TOBN(0x0a36ffa2, 0xb8a9cef8),
+ TOBN(0x5517407e, 0xb9ec051a),
+ TOBN(0x9c796096, 0xea68e672),
+ TOBN(0x853db5fb, 0xfb3c77fb),
+ TOBN(0x21474ba9, 0xe864a51a),
+ TOBN(0x6c267699, 0x6e8a1b8b),
+ TOBN(0x7c823626, 0x94120a28),
+ TOBN(0xe61e9a48, 0x8383a5db),
+ TOBN(0x7dd75003, 0x9f84216d),
+ TOBN(0xab020d07, 0xad43cd85),
+ TOBN(0x9437ae48, 0xda12c659),
+ TOBN(0x6449c2eb, 0xe65452ad),
+ TOBN(0xcc7c4c1c, 0x2cf9d7c1),
+ TOBN(0x1320886a, 0xee95e5ab),
+ TOBN(0xbb7b9056, 0xbeae170c),
+ TOBN(0xc8a5b250, 0xdbc0d662),
+ TOBN(0x4ed81432, 0xc11d2303),
+ TOBN(0x7da66912, 0x1f03769f),
+ TOBN(0x3ac7a5fd, 0x84539828),
+ TOBN(0x14dada94, 0x3bccdd02),
+ TOBN(0x8b84c321, 0x7ef6b0d1),
+ TOBN(0x52a9477a, 0x7c933f22),
+ TOBN(0x5ef6728a, 0xfd440b82),
+ TOBN(0x5c3bd859, 0x6ce4bd5e),
+ TOBN(0x918b80f5, 0xf22c2d3e),
+ TOBN(0x368d5040, 0xb7bb6cc5),
+ TOBN(0xb66142a1, 0x2695a11c),
+ TOBN(0x60ac583a, 0xeb19ea70),
+ TOBN(0x317cbb98, 0x0eab2437),
+ TOBN(0x8cc08c55, 0x5e2654c8),
+ TOBN(0xfe2d6520, 0xe6d8307f),
+ TOBN(0xe9f147f3, 0x57428993),
+ TOBN(0x5f9c7d14, 0xd2fd6cf1),
+ TOBN(0xa3ecd064, 0x2d4fcbb0),
+ TOBN(0xad83fef0, 0x8e7341f7),
+ TOBN(0x643f23a0, 0x3a63115c),
+ TOBN(0xd38a78ab, 0xe65ab743),
+ TOBN(0xbf7c75b1, 0x35edc89c),
+ TOBN(0x3dd8752e, 0x530df568),
+ TOBN(0xf85c4a76, 0xe308c682),
+ TOBN(0x4c9955b2, 0xe68acf37),
+ TOBN(0xa544df3d, 0xab32af85),
+ TOBN(0x4b8ec3f5, 0xa25cf493),
+ TOBN(0x4d8f2764, 0x1a622feb),
+ TOBN(0x7bb4f7aa, 0xf0dcbc49),
+ TOBN(0x7de551f9, 0x70bbb45b),
+ TOBN(0xcfd0f3e4, 0x9f2ca2e5),
+ TOBN(0xece58709, 0x1f5c76ef),
+ TOBN(0x32920edd, 0x167d79ae),
+ TOBN(0x039df8a2, 0xfa7d7ec1),
+ TOBN(0xf46206c0, 0xbb30af91),
+ TOBN(0x1ff5e2f5, 0x22676b59),
+ TOBN(0x11f4a039, 0x6ea51d66),
+ TOBN(0x506c1445, 0x807d7a26),
+ TOBN(0x60da5705, 0x755a9b24),
+ TOBN(0x8fc8cc32, 0x1f1a319e),
+ TOBN(0x83642d4d, 0x9433d67d),
+ TOBN(0x7fa5cb8f, 0x6a7dd296),
+ TOBN(0x576591db, 0x9b7bde07),
+ TOBN(0x13173d25, 0x419716fb),
+ TOBN(0xea30599d, 0xd5b340ff),
+ TOBN(0xfc6b5297, 0xb0fe76c5),
+ TOBN(0x1c6968c8, 0xab8f5adc),
+ TOBN(0xf723c7f5, 0x901c928d),
+ TOBN(0x4203c321, 0x9773d402),
+ TOBN(0xdf7c6aa3, 0x1b51dd47),
+ TOBN(0x3d49e37a, 0x552be23c),
+ TOBN(0x57febee8, 0x0b5a6e87),
+ TOBN(0xc5ecbee4, 0x7bd8e739),
+ TOBN(0x79d44994, 0xae63bf75),
+ TOBN(0x168bd00f, 0x38fb8923),
+ TOBN(0x75d48ee4, 0xd0533130),
+ TOBN(0x554f77aa, 0xdb5cdf33),
+ TOBN(0x3396e896, 0x3c696769),
+ TOBN(0x2fdddbf2, 0xd3fd674e),
+ TOBN(0xbbb8f6ee, 0x99d0e3e5),
+ TOBN(0x51b90651, 0xcbae2f70),
+ TOBN(0xefc4bc05, 0x93aaa8eb),
+ TOBN(0x8ecd8689, 0xdd1df499),
+ TOBN(0x1aee99a8, 0x22f367a5),
+ TOBN(0x95d485b9, 0xae8274c5),
+ TOBN(0x6c14d445, 0x7d30b39c),
+ TOBN(0xbafea90b, 0xbcc1ef81),
+ TOBN(0x7c5f317a, 0xa459a2ed),
+ TOBN(0x01211075, 0x4ef44227),
+ TOBN(0xa17bed6e, 0xdc20f496),
+ TOBN(0x0cdfe424, 0x819853cd),
+ TOBN(0x13793298, 0xf71e2ce7),
+ TOBN(0x3c1f3078, 0xdbbe307b),
+ TOBN(0x6dd1c20e, 0x76ee9936),
+ TOBN(0x23ee4b57, 0x423caa20),
+ TOBN(0x4ac3793b, 0x8efb840e),
+ TOBN(0x934438eb, 0xed1f8ca0),
+ TOBN(0x3e546658, 0x4ebb25a2),
+ TOBN(0xc415af0e, 0xc069896f),
+ TOBN(0xc13eddb0, 0x9a5aa43d),
+ TOBN(0x7a04204f, 0xd49eb8f6),
+ TOBN(0xd0d5bdfc, 0xd74f1670),
+ TOBN(0x3697e286, 0x56fc0558),
+ TOBN(0x10207371, 0x01cebade),
+ TOBN(0x5f87e690, 0x0647a82b),
+ TOBN(0x908e0ed4, 0x8f40054f),
+ TOBN(0xa9f633d4, 0x79853803),
+ TOBN(0x8ed13c9a, 0x4a28b252),
+ TOBN(0x3e2ef676, 0x1f460f64),
+ TOBN(0x53930b9b, 0x36d06336),
+ TOBN(0x347073ac, 0x8fc4979b),
+ TOBN(0x84380e0e, 0x5ecd5597),
+ TOBN(0xe3b22c6b, 0xc4fe3c39),
+ TOBN(0xba4a8153, 0x6c7bebdf),
+ TOBN(0xf23ab6b7, 0x25693459),
+ TOBN(0x53bc3770, 0x14922b11),
+ TOBN(0x4645c8ab, 0x5afc60db),
+ TOBN(0xaa022355, 0x20b9f2a3),
+ TOBN(0x52a2954c, 0xce0fc507),
+ TOBN(0x8c2731bb, 0x7ce1c2e7),
+ TOBN(0xf39608ab, 0x18a0339d),
+ TOBN(0xac7a658d, 0x3735436c),
+ TOBN(0xb22c2b07, 0xcd992b4f),
+ TOBN(0x4e83daec, 0xf40dcfd4),
+ TOBN(0x8a34c7be, 0x2f39ea3e),
+ TOBN(0xef0c005f, 0xb0a56d2e),
+ TOBN(0x62731f6a, 0x6edd8038),
+ TOBN(0x5721d740, 0x4e3cb075),
+ TOBN(0x1ea41511, 0xfbeeee1b),
+ TOBN(0xd1ef5e73, 0xef1d0c05),
+ TOBN(0x42feefd1, 0x73c07d35),
+ TOBN(0xe530a00a, 0x8a329493),
+ TOBN(0x5d55b7fe, 0xf15ebfb0),
+ TOBN(0x549de03c, 0xd322491a),
+ TOBN(0xf7b5f602, 0x745b3237),
+ TOBN(0x3632a3a2, 0x1ab6e2b6),
+ TOBN(0x0d3bba89, 0x0ef59f78),
+ TOBN(0x0dfc6443, 0xc9e52b9a),
+ TOBN(0x1dc79699, 0x72631447),
+ TOBN(0xef033917, 0xb3be20b1),
+ TOBN(0x0c92735d, 0xb1383948),
+ TOBN(0xc1fc29a2, 0xc0dd7d7d),
+ TOBN(0x6485b697, 0x403ed068),
+ TOBN(0x13bfaab3, 0xaac93bdc),
+ TOBN(0x410dc6a9, 0x0deeaf52),
+ TOBN(0xb003fb02, 0x4c641c15),
+ TOBN(0x1384978c, 0x5bc504c4),
+ TOBN(0x37640487, 0x864a6a77),
+ TOBN(0x05991bc6, 0x222a77da),
+ TOBN(0x62260a57, 0x5e47eb11),
+ TOBN(0xc7af6613, 0xf21b432c),
+ TOBN(0x22f3acc9, 0xab4953e9),
+ TOBN(0x52934922, 0x8e41d155),
+ TOBN(0x4d024568, 0x3ac059ef),
+ TOBN(0xb0201755, 0x4d884411),
+ TOBN(0xce8055cf, 0xa59a178f),
+ TOBN(0xcd77d1af, 0xf6204549),
+ TOBN(0xa0a00a3e, 0xc7066759),
+ TOBN(0x471071ef, 0x0272c229),
+ TOBN(0x009bcf6b, 0xd3c4b6b0),
+ TOBN(0x2a2638a8, 0x22305177),
+ TOBN(0xd51d59df, 0x41645bbf),
+ TOBN(0xa81142fd, 0xc0a7a3c0),
+ TOBN(0xa17eca6d, 0x4c7063ee),
+ TOBN(0x0bb887ed, 0x60d9dcec),
+ TOBN(0xd6d28e51, 0x20ad2455),
+ TOBN(0xebed6308, 0xa67102ba),
+ TOBN(0x042c3114, 0x8bffa408),
+ TOBN(0xfd099ac5, 0x8aa68e30),
+ TOBN(0x7a6a3d7c, 0x1483513e),
+ TOBN(0xffcc6b75, 0xba2d8f0c),
+ TOBN(0x54dacf96, 0x1e78b954),
+ TOBN(0xf645696f, 0xa4a9af89),
+ TOBN(0x3a411940, 0x06ac98ec),
+ TOBN(0x41b8b3f6, 0x22a67a20),
+ TOBN(0x2d0b1e0f, 0x99dec626),
+ TOBN(0x27c89192, 0x40be34e8),
+ TOBN(0xc7162b37, 0x91907f35),
+ TOBN(0x90188ec1, 0xa956702b),
+ TOBN(0xca132f7d, 0xdf93769c),
+ TOBN(0x3ece44f9, 0x0e2025b4),
+ TOBN(0x67aaec69, 0x0c62f14c),
+ TOBN(0xad741418, 0x22e3cc11),
+ TOBN(0xcf9b75c3, 0x7ff9a50e),
+ TOBN(0x02fa2b16, 0x4d348272),
+ TOBN(0xbd99d61a, 0x9959d56d),
+ TOBN(0xbc4f19db, 0x18762916),
+ TOBN(0xcc7cce50, 0x49c1ac80),
+ TOBN(0x4d59ebaa, 0xd846bd83),
+ TOBN(0x8775a9dc, 0xa9202849),
+ TOBN(0x07ec4ae1, 0x6e1f4ca9),
+ TOBN(0x27eb5875, 0xba893f11),
+ TOBN(0x00284d51, 0x662cc565),
+ TOBN(0x82353a6b, 0x0db4138d),
+ TOBN(0xd9c7aaaa, 0xaa32a594),
+ TOBN(0xf5528b5e, 0xa5669c47),
+ TOBN(0xf3220231, 0x2f23c5ff),
+ TOBN(0xe3e8147a, 0x6affa3a1),
+ TOBN(0xfb423d5c, 0x202ddda0),
+ TOBN(0x3d6414ac, 0x6b871bd4),
+ TOBN(0x586f82e1, 0xa51a168a),
+ TOBN(0xb712c671, 0x48ae5448),
+ TOBN(0x9a2e4bd1, 0x76233eb8),
+ TOBN(0x0188223a, 0x78811ca9),
+ TOBN(0x553c5e21, 0xf7c18de1),
+ TOBN(0x7682e451, 0xb27bb286),
+ TOBN(0x3ed036b3, 0x0e51e929),
+ TOBN(0xf487211b, 0xec9cb34f),
+ TOBN(0x0d094277, 0x0c24efc8),
+ TOBN(0x0349fd04, 0xbef737a4),
+ TOBN(0x6d1c9dd2, 0x514cdd28),
+ TOBN(0x29c135ff, 0x30da9521),
+ TOBN(0xea6e4508, 0xf78b0b6f),
+ TOBN(0x176f5dd2, 0x678c143c),
+ TOBN(0x08148418, 0x4be21e65),
+ TOBN(0x27f7525c, 0xe7df38c4),
+ TOBN(0x1fb70e09, 0x748ab1a4),
+ TOBN(0x9cba50a0, 0x5efe4433),
+ TOBN(0x7846c7a6, 0x15f75af2),
+ TOBN(0x2a7c2c57, 0x5ee73ea8),
+ TOBN(0x42e566a4, 0x3f0a449a),
+ TOBN(0x45474c3b, 0xad90fc3d),
+ TOBN(0x7447be3d, 0x8b61d057),
+ TOBN(0x3e9d1cf1, 0x3a4ec092),
+ TOBN(0x1603e453, 0xf380a6e6),
+ TOBN(0x0b86e431, 0x9b1437c2),
+ TOBN(0x7a4173f2, 0xef29610a),
+ TOBN(0x8fa729a7, 0xf03d57f7),
+ TOBN(0x3e186f6e, 0x6c9c217e),
+ TOBN(0xbe1d3079, 0x91919524),
+ TOBN(0x92a62a70, 0x153d4fb1),
+ TOBN(0x32ed3e34, 0xd68c2f71),
+ TOBN(0xd785027f, 0x9eb1a8b7),
+ TOBN(0xbc37eb77, 0xc5b22fe8),
+ TOBN(0x466b34f0, 0xb9d6a191),
+ TOBN(0x008a89af, 0x9a05f816),
+ TOBN(0x19b028fb, 0x7d42c10a),
+ TOBN(0x7fe8c92f, 0x49b3f6b8),
+ TOBN(0x58907cc0, 0xa5a0ade3),
+ TOBN(0xb3154f51, 0x559d1a7c),
+ TOBN(0x5066efb6, 0xd9790ed6),
+ TOBN(0xa77a0cbc, 0xa6aa793b),
+ TOBN(0x1a915f3c, 0x223e042e),
+ TOBN(0x1c5def04, 0x69c5874b),
+ TOBN(0x0e830078, 0x73b6c1da),
+ TOBN(0x55cf85d2, 0xfcd8557a),
+ TOBN(0x0f7c7c76, 0x0460f3b1),
+ TOBN(0x87052acb, 0x46e58063),
+ TOBN(0x09212b80, 0x907eae66),
+ TOBN(0x3cb068e0, 0x4d721c89),
+ TOBN(0xa87941ae, 0xdd45ac1c),
+ TOBN(0xde8d5c0d, 0x0daa0dbb),
+ TOBN(0xda421fdc, 0xe3502e6e),
+ TOBN(0xc8944201, 0x4d89a084),
+ TOBN(0x7307ba5e, 0xf0c24bfb),
+ TOBN(0xda212beb, 0x20bde0ef),
+ TOBN(0xea2da24b, 0xf82ce682),
+ TOBN(0x058d3816, 0x07f71fe4),
+ TOBN(0x35a02462, 0x5ffad8de),
+ TOBN(0xcd7b05dc, 0xaadcefab),
+ TOBN(0xd442f8ed, 0x1d9f54ec),
+ TOBN(0x8be3d618, 0xb2d3b5ca),
+ TOBN(0xe2220ed0, 0xe06b2ce2),
+ TOBN(0x82699a5f, 0x1b0da4c0),
+ TOBN(0x3ff106f5, 0x71c0c3a7),
+ TOBN(0x8f580f5a, 0x0d34180c),
+ TOBN(0x4ebb120e, 0x22d7d375),
+ TOBN(0x5e5782cc, 0xe9513675),
+ TOBN(0x2275580c, 0x99c82a70),
+ TOBN(0xe8359fbf, 0x15ea8c4c),
+ TOBN(0x53b48db8, 0x7b415e70),
+ TOBN(0xaacf2240, 0x100c6014),
+ TOBN(0x9faaccf5, 0xe4652f1d),
+ TOBN(0xbd6fdd2a, 0xd56157b2),
+ TOBN(0xa4f4fb1f, 0x6261ec50),
+ TOBN(0x244e55ad, 0x476bcd52),
+ TOBN(0x881c9305, 0x047d320b),
+ TOBN(0x1ca983d5, 0x6181263f),
+ TOBN(0x354e9a44, 0x278fb8ee),
+ TOBN(0xad2dbc0f, 0x396e4964),
+ TOBN(0x723f3aa2, 0x9268b3de),
+ TOBN(0x0d1ca29a, 0xe6e0609a),
+ TOBN(0x794866aa, 0x6cf44252),
+ TOBN(0x0b59f3e3, 0x01af87ed),
+ TOBN(0xe234e5ff, 0x7f4a6c51),
+ TOBN(0xa8768fd2, 0x61dc2f7e),
+ TOBN(0xdafc7332, 0x0a94d81f),
+ TOBN(0xd7f84282, 0x06938ce1),
+ TOBN(0xae0b3c0e, 0x0546063e),
+ TOBN(0x7fbadcb2, 0x5d61abc6),
+ TOBN(0xd5d7a2c9, 0x369ac400),
+ TOBN(0xa5978d09, 0xae67d10c),
+ TOBN(0x290f211e, 0x4f85eaac),
+ TOBN(0xe61e2ad1, 0xfacac681),
+ TOBN(0xae125225, 0x388384cd),
+ TOBN(0xa7fb68e9, 0xccfde30f),
+ TOBN(0x7a59b936, 0x3daed4c2),
+ TOBN(0x80a9aa40, 0x2606f789),
+ TOBN(0xb40c1ea5, 0xf6a6d90a),
+ TOBN(0x948364d3, 0x514d5885),
+ TOBN(0x062ebc60, 0x70985182),
+ TOBN(0xa6db5b0e, 0x33310895),
+ TOBN(0x64a12175, 0xe329c2f5),
+ TOBN(0xc5f25bd2, 0x90ea237e),
+ TOBN(0x7915c524, 0x2d0a4c23),
+ TOBN(0xeb5d26e4, 0x6bb3cc52),
+ TOBN(0x369a9116, 0xc09e2c92),
+ TOBN(0x0c527f92, 0xcf182cf8),
+ TOBN(0x9e591938, 0x2aede0ac),
+ TOBN(0xb2922208, 0x6cc34939),
+ TOBN(0x3c9d8962, 0x99a34361),
+ TOBN(0x3c81836d, 0xc1905fe6),
+ TOBN(0x4bfeb57f, 0xa001ec5a),
+ TOBN(0xe993f5bb, 0xa0dc5dba),
+ TOBN(0x47884109, 0x724a1380),
+ TOBN(0x8a0369ab, 0x32fe9a04),
+ TOBN(0xea068d60, 0x8c927db8),
+ TOBN(0xbf5f37cf, 0x94655741),
+ TOBN(0x47d402a2, 0x04b6c7ea),
+ TOBN(0x4551c295, 0x6af259cb),
+ TOBN(0x698b71e7, 0xed77ee8b),
+ TOBN(0xbddf7bd0, 0xf309d5c7),
+ TOBN(0x6201c22c, 0x34e780ca),
+ TOBN(0xab04f7d8, 0x4c295ef4),
+ TOBN(0x1c947294, 0x4313a8ce),
+ TOBN(0xe532e4ac, 0x92ca4cfe),
+ TOBN(0x89738f80, 0xd0a7a97a),
+ TOBN(0xec088c88, 0xa580fd5b),
+ TOBN(0x612b1ecc, 0x42ce9e51),
+ TOBN(0x8f9840fd, 0xb25fdd2a),
+ TOBN(0x3cda78c0, 0x01e7f839),
+ TOBN(0x546b3d3a, 0xece05480),
+ TOBN(0x271719a9, 0x80d30916),
+ TOBN(0x45497107, 0x584c20c4),
+ TOBN(0xaf8f9478, 0x5bc78608),
+ TOBN(0x28c7d484, 0x277e2a4c),
+ TOBN(0xfce01767, 0x88a2ffe4),
+ TOBN(0xdc506a35, 0x28e169a5),
+ TOBN(0x0ea10861, 0x7af9c93a),
+ TOBN(0x1ed24361, 0x03fa0e08),
+ TOBN(0x96eaaa92, 0xa3d694e7),
+ TOBN(0xc0f43b4d, 0xef50bc74),
+ TOBN(0xce6aa58c, 0x64114db4),
+ TOBN(0x8218e8ea, 0x7c000fd4),
+ TOBN(0xac815dfb, 0x185f8844),
+ TOBN(0xcd7e90cb, 0x1557abfb),
+ TOBN(0x23d16655, 0xafbfecdf),
+ TOBN(0x80f3271f, 0x085cac4a),
+ TOBN(0x7fc39aa7, 0xd0e62f47),
+ TOBN(0x88d519d1, 0x460a48e5),
+ TOBN(0x59559ac4, 0xd28f101e),
+ TOBN(0x7981d9e9, 0xca9ae816),
+ TOBN(0x5c38652c, 0x9ac38203),
+ TOBN(0x86eaf87f, 0x57657fe5),
+ TOBN(0x568fc472, 0xe21f5416),
+ TOBN(0x2afff39c, 0xe7e597b5),
+ TOBN(0x3adbbb07, 0x256d4eab),
+ TOBN(0x22598692, 0x8285ab89),
+ TOBN(0x35f8112a, 0x041caefe),
+ TOBN(0x95df02e3, 0xa5064c8b),
+ TOBN(0x4d63356e, 0xc7004bf3),
+ TOBN(0x230a08f4, 0xdb83c7de),
+ TOBN(0xca27b270, 0x8709a7b7),
+ TOBN(0x0d1c4cc4, 0xcb9abd2d),
+ TOBN(0x8a0bc66e, 0x7550fee8),
+ TOBN(0x369cd4c7, 0x9cf7247e),
+ TOBN(0x75562e84, 0x92b5b7e7),
+ TOBN(0x8fed0da0, 0x5802af7b),
+ TOBN(0x6a7091c2, 0xe48fb889),
+ TOBN(0x26882c13, 0x7b8a9d06),
+ TOBN(0xa2498663, 0x1b82a0e2),
+ TOBN(0x844ed736, 0x3518152d),
+ TOBN(0x282f476f, 0xd86e27c7),
+ TOBN(0xa04edaca, 0x04afefdc),
+ TOBN(0x8b256ebc, 0x6119e34d),
+ TOBN(0x56a413e9, 0x0787d78b),
+ },
+ {
+ TOBN(0x82ee061d, 0x5a74be50),
+ TOBN(0xe41781c4, 0xdea16ff5),
+ TOBN(0xe0b0c81e, 0x99bfc8a2),
+ TOBN(0x624f4d69, 0x0b547e2d),
+ TOBN(0x3a83545d, 0xbdcc9ae4),
+ TOBN(0x2573dbb6, 0x409b1e8e),
+ TOBN(0x482960c4, 0xa6c93539),
+ TOBN(0xf01059ad, 0x5ae18798),
+ TOBN(0x715c9f97, 0x3112795f),
+ TOBN(0xe8244437, 0x984e6ee1),
+ TOBN(0x55cb4858, 0xecb66bcd),
+ TOBN(0x7c136735, 0xabaffbee),
+ TOBN(0x54661595, 0x5dbec38e),
+ TOBN(0x51c0782c, 0x388ad153),
+ TOBN(0x9ba4c53a, 0xc6e0952f),
+ TOBN(0x27e6782a, 0x1b21dfa8),
+ TOBN(0x682f903d, 0x4ed2dbc2),
+ TOBN(0x0eba59c8, 0x7c3b2d83),
+ TOBN(0x8e9dc84d, 0x9c7e9335),
+ TOBN(0x5f9b21b0, 0x0eb226d7),
+ TOBN(0xe33bd394, 0xaf267bae),
+ TOBN(0xaa86cc25, 0xbe2e15ae),
+ TOBN(0x4f0bf67d, 0x6a8ec500),
+ TOBN(0x5846aa44, 0xf9630658),
+ TOBN(0xfeb09740, 0xe2c2bf15),
+ TOBN(0x627a2205, 0xa9e99704),
+ TOBN(0xec8d73d0, 0xc2fbc565),
+ TOBN(0x223eed8f, 0xc20c8de8),
+ TOBN(0x1ee32583, 0xa8363b49),
+ TOBN(0x1a0b6cb9, 0xc9c2b0a6),
+ TOBN(0x49f7c3d2, 0x90dbc85c),
+ TOBN(0xa8dfbb97, 0x1ef4c1ac),
+ TOBN(0xafb34d4c, 0x65c7c2ab),
+ TOBN(0x1d4610e7, 0xe2c5ea84),
+ TOBN(0x893f6d1b, 0x973c4ab5),
+ TOBN(0xa3cdd7e9, 0x945ba5c4),
+ TOBN(0x60514983, 0x064417ee),
+ TOBN(0x1459b23c, 0xad6bdf2b),
+ TOBN(0x23b2c341, 0x5cf726c3),
+ TOBN(0x3a829635, 0x32d6354a),
+ TOBN(0x294f901f, 0xab192c18),
+ TOBN(0xec5fcbfe, 0x7030164f),
+ TOBN(0xe2e2fcb7, 0xe2246ba6),
+ TOBN(0x1e7c88b3, 0x221a1a0c),
+ TOBN(0x72c7dd93, 0xc92d88c5),
+ TOBN(0x41c2148e, 0x1106fb59),
+ TOBN(0x547dd4f5, 0xa0f60f14),
+ TOBN(0xed9b52b2, 0x63960f31),
+ TOBN(0x6c8349eb, 0xb0a5b358),
+ TOBN(0xb154c5c2, 0x9e7e2ed6),
+ TOBN(0xcad5eccf, 0xeda462db),
+ TOBN(0xf2d6dbe4, 0x2de66b69),
+ TOBN(0x426aedf3, 0x8665e5b2),
+ TOBN(0x488a8513, 0x7b7f5723),
+ TOBN(0x15cc43b3, 0x8bcbb386),
+ TOBN(0x27ad0af3, 0xd791d879),
+ TOBN(0xc16c236e, 0x846e364f),
+ TOBN(0x7f33527c, 0xdea50ca0),
+ TOBN(0xc4810775, 0x0926b86d),
+ TOBN(0x6c2a3609, 0x0598e70c),
+ TOBN(0xa6755e52, 0xf024e924),
+ TOBN(0xe0fa07a4, 0x9db4afca),
+ TOBN(0x15c3ce7d, 0x66831790),
+ TOBN(0x5b4ef350, 0xa6cbb0d6),
+ TOBN(0x2c4aafc4, 0xb6205969),
+ TOBN(0x42563f02, 0xf6c7854f),
+ TOBN(0x016aced5, 0x1d983b48),
+ TOBN(0xfeb356d8, 0x99949755),
+ TOBN(0x8c2a2c81, 0xd1a39bd7),
+ TOBN(0x8f44340f, 0xe6934ae9),
+ TOBN(0x148cf91c, 0x447904da),
+ TOBN(0x7340185f, 0x0f51a926),
+ TOBN(0x2f8f00fb, 0x7409ab46),
+ TOBN(0x057e78e6, 0x80e289b2),
+ TOBN(0x03e5022c, 0xa888e5d1),
+ TOBN(0x3c87111a, 0x9dede4e2),
+ TOBN(0x5b9b0e1c, 0x7809460b),
+ TOBN(0xe751c852, 0x71c9abc7),
+ TOBN(0x8b944e28, 0xc7cc1dc9),
+ TOBN(0x4f201ffa, 0x1d3cfa08),
+ TOBN(0x02fc905c, 0x3e6721ce),
+ TOBN(0xd52d70da, 0xd0b3674c),
+ TOBN(0x5dc2e5ca, 0x18810da4),
+ TOBN(0xa984b273, 0x5c69dd99),
+ TOBN(0x63b92527, 0x84de5ca4),
+ TOBN(0x2f1c9872, 0xc852dec4),
+ TOBN(0x18b03593, 0xc2e3de09),
+ TOBN(0x19d70b01, 0x9813dc2f),
+ TOBN(0x42806b2d, 0xa6dc1d29),
+ TOBN(0xd3030009, 0xf871e144),
+ TOBN(0xa1feb333, 0xaaf49276),
+ TOBN(0xb5583b9e, 0xc70bc04b),
+ TOBN(0x1db0be78, 0x95695f20),
+ TOBN(0xfc841811, 0x89d012b5),
+ TOBN(0x6409f272, 0x05f61643),
+ TOBN(0x40d34174, 0xd5883128),
+ TOBN(0xd79196f5, 0x67419833),
+ TOBN(0x6059e252, 0x863b7b08),
+ TOBN(0x84da1817, 0x1c56700c),
+ TOBN(0x5758ee56, 0xb28d3ec4),
+ TOBN(0x7da2771d, 0x013b0ea6),
+ TOBN(0xfddf524b, 0x54c5e9b9),
+ TOBN(0x7df4faf8, 0x24305d80),
+ TOBN(0x58f5c1bf, 0x3a97763f),
+ TOBN(0xa5af37f1, 0x7c696042),
+ TOBN(0xd4cba22c, 0x4a2538de),
+ TOBN(0x211cb995, 0x9ea42600),
+ TOBN(0xcd105f41, 0x7b069889),
+ TOBN(0xb1e1cf19, 0xddb81e74),
+ TOBN(0x472f2d89, 0x5157b8ca),
+ TOBN(0x086fb008, 0xee9db885),
+ TOBN(0x365cd570, 0x0f26d131),
+ TOBN(0x284b02bb, 0xa2be7053),
+ TOBN(0xdcbbf7c6, 0x7ab9a6d6),
+ TOBN(0x4425559c, 0x20f7a530),
+ TOBN(0x961f2dfa, 0x188767c8),
+ TOBN(0xe2fd9435, 0x70dc80c4),
+ TOBN(0x104d6b63, 0xf0784120),
+ TOBN(0x7f592bc1, 0x53567122),
+ TOBN(0xf6bc1246, 0xf688ad77),
+ TOBN(0x05214c05, 0x0f15dde9),
+ TOBN(0xa47a76a8, 0x0d5f2b82),
+ TOBN(0xbb254d30, 0x62e82b62),
+ TOBN(0x11a05fe0, 0x3ec955ee),
+ TOBN(0x7eaff46e, 0x9d529b36),
+ TOBN(0x55ab1301, 0x8f9e3df6),
+ TOBN(0xc463e371, 0x99317698),
+ TOBN(0xfd251438, 0xccda47ad),
+ TOBN(0xca9c3547, 0x23d695ea),
+ TOBN(0x48ce626e, 0x16e589b5),
+ TOBN(0x6b5b64c7, 0xb187d086),
+ TOBN(0xd02e1794, 0xb2207948),
+ TOBN(0x8b58e98f, 0x7198111d),
+ TOBN(0x90ca6305, 0xdcf9c3cc),
+ TOBN(0x5691fe72, 0xf34089b0),
+ TOBN(0x60941af1, 0xfc7c80ff),
+ TOBN(0xa09bc0a2, 0x22eb51e5),
+ TOBN(0xc0bb7244, 0xaa9cf09a),
+ TOBN(0x36a8077f, 0x80159f06),
+ TOBN(0x8b5c989e, 0xdddc560e),
+ TOBN(0x19d2f316, 0x512e1f43),
+ TOBN(0x02eac554, 0xad08ff62),
+ TOBN(0x012ab84c, 0x07d20b4e),
+ TOBN(0x37d1e115, 0xd6d4e4e1),
+ TOBN(0xb6443e1a, 0xab7b19a8),
+ TOBN(0xf08d067e, 0xdef8cd45),
+ TOBN(0x63adf3e9, 0x685e03da),
+ TOBN(0xcf15a10e, 0x4792b916),
+ TOBN(0xf44bcce5, 0xb738a425),
+ TOBN(0xebe131d5, 0x9636b2fd),
+ TOBN(0x94068841, 0x7850d605),
+ TOBN(0x09684eaa, 0xb40d749d),
+ TOBN(0x8c3c669c, 0x72ba075b),
+ TOBN(0x89f78b55, 0xba469015),
+ TOBN(0x5706aade, 0x3e9f8ba8),
+ TOBN(0x6d8bd565, 0xb32d7ed7),
+ TOBN(0x25f4e63b, 0x805f08d6),
+ TOBN(0x7f48200d, 0xc3bcc1b5),
+ TOBN(0x4e801968, 0xb025d847),
+ TOBN(0x74afac04, 0x87cbe0a8),
+ TOBN(0x43ed2c2b, 0x7e63d690),
+ TOBN(0xefb6bbf0, 0x0223cdb8),
+ TOBN(0x4fec3cae, 0x2884d3fe),
+ TOBN(0x065ecce6, 0xd75e25a4),
+ TOBN(0x6c2294ce, 0x69f79071),
+ TOBN(0x0d9a8e5f, 0x044b8666),
+ TOBN(0x5009f238, 0x17b69d8f),
+ TOBN(0x3c29f8fe, 0xc5dfdaf7),
+ TOBN(0x9067528f, 0xebae68c4),
+ TOBN(0x5b385632, 0x30c5ba21),
+ TOBN(0x540df119, 0x1fdd1aec),
+ TOBN(0xcf37825b, 0xcfba4c78),
+ TOBN(0x77eff980, 0xbeb11454),
+ TOBN(0x40a1a991, 0x60c1b066),
+ TOBN(0xe8018980, 0xf889a1c7),
+ TOBN(0xb9c52ae9, 0x76c24be0),
+ TOBN(0x05fbbcce, 0x45650ef4),
+ TOBN(0xae000f10, 0x8aa29ac7),
+ TOBN(0x884b7172, 0x4f04c470),
+ TOBN(0x7cd4fde2, 0x19bb5c25),
+ TOBN(0x6477b22a, 0xe8840869),
+ TOBN(0xa8868859, 0x5fbd0686),
+ TOBN(0xf23cc02e, 0x1116dfba),
+ TOBN(0x76cd563f, 0xd87d7776),
+ TOBN(0xe2a37598, 0xa9d82abf),
+ TOBN(0x5f188ccb, 0xe6c170f5),
+ TOBN(0x81682200, 0x5066b087),
+ TOBN(0xda22c212, 0xc7155ada),
+ TOBN(0x151e5d3a, 0xfbddb479),
+ TOBN(0x4b606b84, 0x6d715b99),
+ TOBN(0x4a73b54b, 0xf997cb2e),
+ TOBN(0x9a1bfe43, 0x3ecd8b66),
+ TOBN(0x1c312809, 0x2a67d48a),
+ TOBN(0xcd6a671e, 0x031fa9e2),
+ TOBN(0xbec3312a, 0x0e43a34a),
+ TOBN(0x1d935639, 0x55ef47d3),
+ TOBN(0x5ea02489, 0x8fea73ea),
+ TOBN(0x8247b364, 0xa035afb2),
+ TOBN(0xb58300a6, 0x5265b54c),
+ TOBN(0x3286662f, 0x722c7148),
+ TOBN(0xb77fd76b, 0xb4ec4c20),
+ TOBN(0xf0a12fa7, 0x0f3fe3fd),
+ TOBN(0xf845bbf5, 0x41d8c7e8),
+ TOBN(0xe4d969ca, 0x5ec10aa8),
+ TOBN(0x4c0053b7, 0x43e232a3),
+ TOBN(0xdc7a3fac, 0x37f8a45a),
+ TOBN(0x3c4261c5, 0x20d81c8f),
+ TOBN(0xfd4b3453, 0xb00eab00),
+ TOBN(0x76d48f86, 0xd36e3062),
+ TOBN(0x626c5277, 0xa143ff02),
+ TOBN(0x538174de, 0xaf76f42e),
+ TOBN(0x2267aa86, 0x6407ceac),
+ TOBN(0xfad76351, 0x72e572d5),
+ TOBN(0xab861af7, 0xba7330eb),
+ TOBN(0xa0a1c8c7, 0x418d8657),
+ TOBN(0x988821cb, 0x20289a52),
+ TOBN(0x79732522, 0xcccc18ad),
+ TOBN(0xaadf3f8d, 0xf1a6e027),
+ TOBN(0xf7382c93, 0x17c2354d),
+ TOBN(0x5ce1680c, 0xd818b689),
+ TOBN(0x359ebbfc, 0xd9ecbee9),
+ TOBN(0x4330689c, 0x1cae62ac),
+ TOBN(0xb55ce5b4, 0xc51ac38a),
+ TOBN(0x7921dfea, 0xfe238ee8),
+ TOBN(0x3972bef8, 0x271d1ca5),
+ TOBN(0x3e423bc7, 0xe8aabd18),
+ TOBN(0x57b09f3f, 0x44a3e5e3),
+ TOBN(0x5da886ae, 0x7b444d66),
+ TOBN(0x68206634, 0xa9964375),
+ TOBN(0x356a2fa3, 0x699cd0ff),
+ TOBN(0xaf0faa24, 0xdba515e9),
+ TOBN(0x536e1f5c, 0xb321d79a),
+ TOBN(0xd3b9913a, 0x5c04e4ea),
+ TOBN(0xd549dcfe, 0xd6f11513),
+ TOBN(0xee227bf5, 0x79fd1d94),
+ TOBN(0x9f35afee, 0xb43f2c67),
+ TOBN(0xd2638d24, 0xf1314f53),
+ TOBN(0x62baf948, 0xcabcd822),
+ TOBN(0x5542de29, 0x4ef48db0),
+ TOBN(0xb3eb6a04, 0xfc5f6bb2),
+ TOBN(0x23c110ae, 0x1208e16a),
+ TOBN(0x1a4d15b5, 0xf8363e24),
+ TOBN(0x30716844, 0x164be00b),
+ TOBN(0xa8e24824, 0xf6f4690d),
+ TOBN(0x548773a2, 0x90b170cf),
+ TOBN(0xa1bef331, 0x42f191f4),
+ TOBN(0x70f418d0, 0x9247aa97),
+ TOBN(0xea06028e, 0x48be9147),
+ TOBN(0xe13122f3, 0xdbfb894e),
+ TOBN(0xbe9b79f6, 0xce274b18),
+ TOBN(0x85a49de5, 0xca58aadf),
+ TOBN(0x24957758, 0x11487351),
+ TOBN(0x111def61, 0xbb939099),
+ TOBN(0x1d6a974a, 0x26d13694),
+ TOBN(0x4474b4ce, 0xd3fc253b),
+ TOBN(0x3a1485e6, 0x4c5db15e),
+ TOBN(0xe79667b4, 0x147c15b4),
+ TOBN(0xe34f553b, 0x7bc61301),
+ TOBN(0x032b80f8, 0x17094381),
+ TOBN(0x55d8bafd, 0x723eaa21),
+ TOBN(0x5a987995, 0xf1c0e74e),
+ TOBN(0x5a9b292e, 0xebba289c),
+ TOBN(0x413cd4b2, 0xeb4c8251),
+ TOBN(0x98b5d243, 0xd162db0a),
+ TOBN(0xbb47bf66, 0x68342520),
+ TOBN(0x08d68949, 0xbaa862d1),
+ TOBN(0x11f349c7, 0xe906abcd),
+ TOBN(0x454ce985, 0xed7bf00e),
+ TOBN(0xacab5c9e, 0xb55b803b),
+ TOBN(0xb03468ea, 0x31e3c16d),
+ TOBN(0x5c24213d, 0xd273bf12),
+ TOBN(0x211538eb, 0x71587887),
+ TOBN(0x198e4a2f, 0x731dea2d),
+ TOBN(0xd5856cf2, 0x74ed7b2a),
+ TOBN(0x86a632eb, 0x13a664fe),
+ TOBN(0x932cd909, 0xbda41291),
+ TOBN(0x850e95d4, 0xc0c4ddc0),
+ TOBN(0xc0f422f8, 0x347fc2c9),
+ TOBN(0xe68cbec4, 0x86076bcb),
+ TOBN(0xf9e7c0c0, 0xcd6cd286),
+ TOBN(0x65994ddb, 0x0f5f27ca),
+ TOBN(0xe85461fb, 0xa80d59ff),
+ TOBN(0xff05481a, 0x66601023),
+ TOBN(0xc665427a, 0xfc9ebbfb),
+ TOBN(0xb0571a69, 0x7587fd52),
+ TOBN(0x935289f8, 0x8d49efce),
+ TOBN(0x61becc60, 0xea420688),
+ TOBN(0xb22639d9, 0x13a786af),
+ TOBN(0x1a8e6220, 0x361ecf90),
+ TOBN(0x001f23e0, 0x25506463),
+ TOBN(0xe4ae9b5d, 0x0a5c2b79),
+ TOBN(0xebc9cdad, 0xd8149db5),
+ TOBN(0xb33164a1, 0x934aa728),
+ TOBN(0x750eb00e, 0xae9b60f3),
+ TOBN(0x5a91615b, 0x9b9cfbfd),
+ TOBN(0x97015cbf, 0xef45f7f6),
+ TOBN(0xb462c4a5, 0xbf5151df),
+ TOBN(0x21adcc41, 0xb07118f2),
+ TOBN(0xd60c545b, 0x043fa42c),
+ TOBN(0xfc21aa54, 0xe96be1ab),
+ TOBN(0xe84bc32f, 0x4e51ea80),
+ TOBN(0x3dae45f0, 0x259b5d8d),
+ TOBN(0xbb73c7eb, 0xc38f1b5e),
+ TOBN(0xe405a74a, 0xe8ae617d),
+ TOBN(0xbb1ae9c6, 0x9f1c56bd),
+ TOBN(0x8c176b98, 0x49f196a4),
+ TOBN(0xc448f311, 0x6875092b),
+ TOBN(0xb5afe3de, 0x9f976033),
+ TOBN(0xa8dafd49, 0x145813e5),
+ TOBN(0x687fc4d9, 0xe2b34226),
+ TOBN(0xf2dfc92d, 0x4c7ff57f),
+ TOBN(0x004e3fc1, 0x401f1b46),
+ TOBN(0x5afddab6, 0x1430c9ab),
+ TOBN(0x0bdd41d3, 0x2238e997),
+ TOBN(0xf0947430, 0x418042ae),
+ TOBN(0x71f9adda, 0xcdddc4cb),
+ TOBN(0x7090c016, 0xc52dd907),
+ TOBN(0xd9bdf44d, 0x29e2047f),
+ TOBN(0xe6f1fe80, 0x1b1011a6),
+ TOBN(0xb63accbc, 0xd9acdc78),
+ TOBN(0xcfc7e235, 0x1272a95b),
+ TOBN(0x0c667717, 0xa6276ac8),
+ TOBN(0x3c0d3709, 0xe2d7eef7),
+ TOBN(0x5add2b06, 0x9a685b3e),
+ TOBN(0x363ad32d, 0x14ea5d65),
+ TOBN(0xf8e01f06, 0x8d7dd506),
+ TOBN(0xc9ea2213, 0x75b4aac6),
+ TOBN(0xed2a2bf9, 0x0d353466),
+ TOBN(0x439d79b5, 0xe9d3a7c3),
+ TOBN(0x8e0ee5a6, 0x81b7f34b),
+ TOBN(0xcf3dacf5, 0x1dc4ba75),
+ TOBN(0x1d3d1773, 0xeb3310c7),
+ TOBN(0xa8e67112, 0x7747ae83),
+ TOBN(0x31f43160, 0x197d6b40),
+ TOBN(0x0521ccee, 0xcd961400),
+ TOBN(0x67246f11, 0xf6535768),
+ TOBN(0x702fcc5a, 0xef0c3133),
+ TOBN(0x247cc45d, 0x7e16693b),
+ TOBN(0xfd484e49, 0xc729b749),
+ TOBN(0x522cef7d, 0xb218320f),
+ TOBN(0xe56ef405, 0x59ab93b3),
+ TOBN(0x225fba11, 0x9f181071),
+ TOBN(0x33bd6595, 0x15330ed0),
+ TOBN(0xc4be69d5, 0x1ddb32f7),
+ TOBN(0x264c7668, 0x0448087c),
+ TOBN(0xac30903f, 0x71432dae),
+ TOBN(0x3851b266, 0x00f9bf47),
+ TOBN(0x400ed311, 0x6cdd6d03),
+ TOBN(0x045e79fe, 0xf8fd2424),
+ TOBN(0xfdfd974a, 0xfa6da98b),
+ TOBN(0x45c9f641, 0x0c1e673a),
+ TOBN(0x76f2e733, 0x5b2c5168),
+ TOBN(0x1adaebb5, 0x2a601753),
+ TOBN(0xb286514c, 0xc57c2d49),
+ TOBN(0xd8769670, 0x1e0bfd24),
+ TOBN(0x950c547e, 0x04478922),
+ TOBN(0xd1d41969, 0xe5d32bfe),
+ TOBN(0x30bc1472, 0x750d6c3e),
+ TOBN(0x8f3679fe, 0xe0e27f3a),
+ TOBN(0x8f64a7dc, 0xa4a6ee0c),
+ TOBN(0x2fe59937, 0x633dfb1f),
+ TOBN(0xea82c395, 0x977f2547),
+ TOBN(0xcbdfdf1a, 0x661ea646),
+ TOBN(0xc7ccc591, 0xb9085451),
+ TOBN(0x82177962, 0x81761e13),
+ TOBN(0xda57596f, 0x9196885c),
+ TOBN(0xbc17e849, 0x28ffbd70),
+ TOBN(0x1e6e0a41, 0x2671d36f),
+ TOBN(0x61ae872c, 0x4152fcf5),
+ TOBN(0x441c87b0, 0x9e77e754),
+ TOBN(0xd0799dd5, 0xa34dff09),
+ TOBN(0x766b4e44, 0x88a6b171),
+ TOBN(0xdc06a512, 0x11f1c792),
+ TOBN(0xea02ae93, 0x4be35c3e),
+ TOBN(0xe5ca4d6d, 0xe90c469e),
+ TOBN(0x4df4368e, 0x56e4ff5c),
+ TOBN(0x7817acab, 0x4baef62e),
+ TOBN(0x9f5a2202, 0xa85b91e8),
+ TOBN(0x9666ebe6, 0x6ce57610),
+ TOBN(0x32ad31f3, 0xf73bfe03),
+ TOBN(0x628330a4, 0x25bcf4d6),
+ TOBN(0xea950593, 0x515056e6),
+ TOBN(0x59811c89, 0xe1332156),
+ TOBN(0xc89cf1fe, 0x8c11b2d7),
+ TOBN(0x75b63913, 0x04e60cc0),
+ TOBN(0xce811e8d, 0x4625d375),
+ TOBN(0x030e43fc, 0x2d26e562),
+ TOBN(0xfbb30b4b, 0x608d36a0),
+ TOBN(0x634ff82c, 0x48528118),
+ TOBN(0x7c6fe085, 0xcd285911),
+ TOBN(0x7f2830c0, 0x99358f28),
+ TOBN(0x2e60a95e, 0x665e6c09),
+ TOBN(0x08407d3d, 0x9b785dbf),
+ TOBN(0x530889ab, 0xa759bce7),
+ TOBN(0xf228e0e6, 0x52f61239),
+ TOBN(0x2b6d1461, 0x6879be3c),
+ TOBN(0xe6902c04, 0x51a7bbf7),
+ TOBN(0x30ad99f0, 0x76f24a64),
+ TOBN(0x66d9317a, 0x98bc6da0),
+ TOBN(0xf4f877f3, 0xcb596ac0),
+ TOBN(0xb05ff62d, 0x4c44f119),
+ TOBN(0x4555f536, 0xe9b77416),
+ TOBN(0xc7c0d059, 0x8caed63b),
+ TOBN(0x0cd2b7ce, 0xc358b2a9),
+ TOBN(0x3f33287b, 0x46945fa3),
+ TOBN(0xf8785b20, 0xd67c8791),
+ TOBN(0xc54a7a61, 0x9637bd08),
+ TOBN(0x54d4598c, 0x18be79d7),
+ TOBN(0x889e5acb, 0xc46d7ce1),
+ TOBN(0x9a515bb7, 0x8b085877),
+ TOBN(0xfac1a03d, 0x0b7a5050),
+ TOBN(0x7d3e738a, 0xf2926035),
+ TOBN(0x861cc2ce, 0x2a6cb0eb),
+ TOBN(0x6f2e2955, 0x8f7adc79),
+ TOBN(0x61c4d451, 0x33016376),
+ TOBN(0xd9fd2c80, 0x5ad59090),
+ TOBN(0xe5a83738, 0xb2b836a1),
+ TOBN(0x855b41a0, 0x7c0d6622),
+ TOBN(0x186fe317, 0x7cc19af1),
+ TOBN(0x6465c1ff, 0xfdd99acb),
+ TOBN(0x46e5c23f, 0x6974b99e),
+ TOBN(0x75a7cf8b, 0xa2717cbe),
+ TOBN(0x4d2ebc3f, 0x062be658),
+ TOBN(0x094b4447, 0x5f209c98),
+ TOBN(0x4af285ed, 0xb940cb5a),
+ TOBN(0x6706d792, 0x7cc82f10),
+ TOBN(0xc8c8776c, 0x030526fa),
+ TOBN(0xfa8e6f76, 0xa0da9140),
+ TOBN(0x77ea9d34, 0x591ee4f0),
+ TOBN(0x5f46e337, 0x40274166),
+ TOBN(0x1bdf98bb, 0xea671457),
+ TOBN(0xd7c08b46, 0x862a1fe2),
+ TOBN(0x46cc303c, 0x1c08ad63),
+ TOBN(0x99543440, 0x4c845e7b),
+ TOBN(0x1b8fbdb5, 0x48f36bf7),
+ TOBN(0x5b82c392, 0x8c8273a7),
+ TOBN(0x08f712c4, 0x928435d5),
+ TOBN(0x071cf0f1, 0x79330380),
+ TOBN(0xc74c2d24, 0xa8da054a),
+ TOBN(0xcb0e7201, 0x43c46b5c),
+ TOBN(0x0ad7337a, 0xc0b7eff3),
+ TOBN(0x8552225e, 0xc5e48b3c),
+ TOBN(0xe6f78b0c, 0x73f13a5f),
+ TOBN(0x5e70062e, 0x82349cbe),
+ TOBN(0x6b8d5048, 0xe7073969),
+ TOBN(0x392d2a29, 0xc33cb3d2),
+ TOBN(0xee4f727c, 0x4ecaa20f),
+ TOBN(0xa068c99e, 0x2ccde707),
+ TOBN(0xfcd5651f, 0xb87a2913),
+ TOBN(0xea3e3c15, 0x3cc252f0),
+ TOBN(0x777d92df, 0x3b6cd3e4),
+ TOBN(0x7a414143, 0xc5a732e7),
+ TOBN(0xa895951a, 0xa71ff493),
+ TOBN(0xfe980c92, 0xbbd37cf6),
+ TOBN(0x45bd5e64, 0xdecfeeff),
+ TOBN(0x910dc2a9, 0xa44c43e9),
+ TOBN(0xcb403f26, 0xcca9f54d),
+ TOBN(0x928bbdfb, 0x9303f6db),
+ TOBN(0x3c37951e, 0xa9eee67c),
+ TOBN(0x3bd61a52, 0xf79961c3),
+ TOBN(0x09a238e6, 0x395c9a79),
+ TOBN(0x6940ca2d, 0x61eb352d),
+ TOBN(0x7d1e5c5e, 0xc1875631),
+ TOBN(0x1e19742c, 0x1e1b20d1),
+ TOBN(0x4633d908, 0x23fc2e6e),
+ TOBN(0xa76e29a9, 0x08959149),
+ TOBN(0x61069d9c, 0x84ed7da5),
+ TOBN(0x0baa11cf, 0x5dbcad51),
+ TOBN(0xd01eec64, 0x961849da),
+ TOBN(0x93b75f1f, 0xaf3d8c28),
+ TOBN(0x57bc4f9f, 0x1ca2ee44),
+ TOBN(0x5a26322d, 0x00e00558),
+ TOBN(0x1888d658, 0x61a023ef),
+ TOBN(0x1d72aab4, 0xb9e5246e),
+ TOBN(0xa9a26348, 0xe5563ec0),
+ TOBN(0xa0971963, 0xc3439a43),
+ TOBN(0x567dd54b, 0xadb9b5b7),
+ TOBN(0x73fac1a1, 0xc45a524b),
+ TOBN(0x8fe97ef7, 0xfe38e608),
+ TOBN(0x608748d2, 0x3f384f48),
+ TOBN(0xb0571794, 0xc486094f),
+ TOBN(0x869254a3, 0x8bf3a8d6),
+ TOBN(0x148a8dd1, 0x310b0e25),
+ TOBN(0x99ab9f3f, 0x9aa3f7d8),
+ TOBN(0x0927c68a, 0x6706c02e),
+ TOBN(0x22b5e76c, 0x69790e6c),
+ TOBN(0x6c325260, 0x6c71376c),
+ TOBN(0x53a57690, 0x09ef6657),
+ TOBN(0x8d63f852, 0xedffcf3a),
+ TOBN(0xb4d2ed04, 0x3c0a6f55),
+ TOBN(0xdb3aa8de, 0x12519b9e),
+ TOBN(0x5d38e9c4, 0x1e0a569a),
+ TOBN(0x871528bf, 0x303747e2),
+ TOBN(0xa208e77c, 0xf5b5c18d),
+ TOBN(0x9d129c88, 0xca6bf923),
+ TOBN(0xbcbf197f, 0xbf02839f),
+ TOBN(0x9b9bf030, 0x27323194),
+ TOBN(0x3b055a8b, 0x339ca59d),
+ TOBN(0xb46b2312, 0x0f669520),
+ TOBN(0x19789f1f, 0x497e5f24),
+ TOBN(0x9c499468, 0xaaf01801),
+ TOBN(0x72ee1190, 0x8b69d59c),
+ TOBN(0x8bd39595, 0xacf4c079),
+ TOBN(0x3ee11ece, 0x8e0cd048),
+ TOBN(0xebde86ec, 0x1ed66f18),
+ TOBN(0x225d906b, 0xd61fce43),
+ TOBN(0x5cab07d6, 0xe8bed74d),
+ TOBN(0x16e4617f, 0x27855ab7),
+ TOBN(0x6568aadd, 0xb2fbc3dd),
+ TOBN(0xedb5484f, 0x8aeddf5b),
+ TOBN(0x878f20e8, 0x6dcf2fad),
+ TOBN(0x3516497c, 0x615f5699),
+ },
+ {
+ TOBN(0xef0a3fec, 0xfa181e69),
+ TOBN(0x9ea02f81, 0x30d69a98),
+ TOBN(0xb2e9cf8e, 0x66eab95d),
+ TOBN(0x520f2beb, 0x24720021),
+ TOBN(0x621c540a, 0x1df84361),
+ TOBN(0x12037721, 0x71fa6d5d),
+ TOBN(0x6e3c7b51, 0x0ff5f6ff),
+ TOBN(0x817a069b, 0xabb2bef3),
+ TOBN(0x83572fb6, 0xb294cda6),
+ TOBN(0x6ce9bf75, 0xb9039f34),
+ TOBN(0x20e012f0, 0x095cbb21),
+ TOBN(0xa0aecc1b, 0xd063f0da),
+ TOBN(0x57c21c3a, 0xf02909e5),
+ TOBN(0xc7d59ecf, 0x48ce9cdc),
+ TOBN(0x2732b844, 0x8ae336f8),
+ TOBN(0x056e3723, 0x3f4f85f4),
+ TOBN(0x8a10b531, 0x89e800ca),
+ TOBN(0x50fe0c17, 0x145208fd),
+ TOBN(0x9e43c0d3, 0xb714ba37),
+ TOBN(0x427d200e, 0x34189acc),
+ TOBN(0x05dee24f, 0xe616e2c0),
+ TOBN(0x9c25f4c8, 0xee1854c1),
+ TOBN(0x4d3222a5, 0x8f342a73),
+ TOBN(0x0807804f, 0xa027c952),
+ TOBN(0xc222653a, 0x4f0d56f3),
+ TOBN(0x961e4047, 0xca28b805),
+ TOBN(0x2c03f8b0, 0x4a73434b),
+ TOBN(0x4c966787, 0xab712a19),
+ TOBN(0xcc196c42, 0x864fee42),
+ TOBN(0xc1be93da, 0x5b0ece5c),
+ TOBN(0xa87d9f22, 0xc131c159),
+ TOBN(0x2bb6d593, 0xdce45655),
+ TOBN(0x22c49ec9, 0xb809b7ce),
+ TOBN(0x8a41486b, 0xe2c72c2c),
+ TOBN(0x813b9420, 0xfea0bf36),
+ TOBN(0xb3d36ee9, 0xa66dac69),
+ TOBN(0x6fddc08a, 0x328cc987),
+ TOBN(0x0a3bcd2c, 0x3a326461),
+ TOBN(0x7103c49d, 0xd810dbba),
+ TOBN(0xf9d81a28, 0x4b78a4c4),
+ TOBN(0x3de865ad, 0xe4d55941),
+ TOBN(0xdedafa5e, 0x30384087),
+ TOBN(0x6f414abb, 0x4ef18b9b),
+ TOBN(0x9ee9ea42, 0xfaee5268),
+ TOBN(0x260faa16, 0x37a55a4a),
+ TOBN(0xeb19a514, 0x015f93b9),
+ TOBN(0x51d7ebd2, 0x9e9c3598),
+ TOBN(0x523fc56d, 0x1932178e),
+ TOBN(0x501d070c, 0xb98fe684),
+ TOBN(0xd60fbe9a, 0x124a1458),
+ TOBN(0xa45761c8, 0x92bc6b3f),
+ TOBN(0xf5384858, 0xfe6f27cb),
+ TOBN(0x4b0271f7, 0xb59e763b),
+ TOBN(0x3d4606a9, 0x5b5a8e5e),
+ TOBN(0x1eda5d9b, 0x05a48292),
+ TOBN(0xda7731d0, 0xe6fec446),
+ TOBN(0xa3e33693, 0x90d45871),
+ TOBN(0xe9764040, 0x06166d8d),
+ TOBN(0xb5c33682, 0x89a90403),
+ TOBN(0x4bd17983, 0x72f1d637),
+ TOBN(0xa616679e, 0xd5d2c53a),
+ TOBN(0x5ec4bcd8, 0xfdcf3b87),
+ TOBN(0xae6d7613, 0xb66a694e),
+ TOBN(0x7460fc76, 0xe3fc27e5),
+ TOBN(0x70469b82, 0x95caabee),
+ TOBN(0xde024ca5, 0x889501e3),
+ TOBN(0x6bdadc06, 0x076ed265),
+ TOBN(0x0cb1236b, 0x5a0ef8b2),
+ TOBN(0x4065ddbf, 0x0972ebf9),
+ TOBN(0xf1dd3875, 0x22aca432),
+ TOBN(0xa88b97cf, 0x744aff76),
+ TOBN(0xd1359afd, 0xfe8e3d24),
+ TOBN(0x52a3ba2b, 0x91502cf3),
+ TOBN(0x2c3832a8, 0x084db75d),
+ TOBN(0x04a12ddd, 0xde30b1c9),
+ TOBN(0x7802eabc, 0xe31fd60c),
+ TOBN(0x33707327, 0xa37fddab),
+ TOBN(0x65d6f2ab, 0xfaafa973),
+ TOBN(0x3525c5b8, 0x11e6f91a),
+ TOBN(0x76aeb0c9, 0x5f46530b),
+ TOBN(0xe8815ff6, 0x2f93a675),
+ TOBN(0xa6ec9684, 0x05f48679),
+ TOBN(0x6dcbb556, 0x358ae884),
+ TOBN(0x0af61472, 0xe19e3873),
+ TOBN(0x72334372, 0xa5f696be),
+ TOBN(0xc65e57ea, 0x6f22fb70),
+ TOBN(0x268da30c, 0x946cea90),
+ TOBN(0x136a8a87, 0x65681b2a),
+ TOBN(0xad5e81dc, 0x0f9f44d4),
+ TOBN(0xf09a6960, 0x2c46585a),
+ TOBN(0xd1649164, 0xc447d1b1),
+ TOBN(0x3b4b36c8, 0x879dc8b1),
+ TOBN(0x20d4177b, 0x3b6b234c),
+ TOBN(0x096a2505, 0x1730d9d0),
+ TOBN(0x0611b9b8, 0xef80531d),
+ TOBN(0xba904b3b, 0x64bb495d),
+ TOBN(0x1192d9d4, 0x93a3147a),
+ TOBN(0x9f30a5dc, 0x9a565545),
+ TOBN(0x90b1f9cb, 0x6ef07212),
+ TOBN(0x29958546, 0x0d87fc13),
+ TOBN(0xd3323eff, 0xc17db9ba),
+ TOBN(0xcb18548c, 0xcb1644a8),
+ TOBN(0x18a306d4, 0x4f49ffbc),
+ TOBN(0x28d658f1, 0x4c2e8684),
+ TOBN(0x44ba60cd, 0xa99f8c71),
+ TOBN(0x67b7abdb, 0x4bf742ff),
+ TOBN(0x66310f9c, 0x914b3f99),
+ TOBN(0xae430a32, 0xf412c161),
+ TOBN(0x1e6776d3, 0x88ace52f),
+ TOBN(0x4bc0fa24, 0x52d7067d),
+ TOBN(0x03c286aa, 0x8f07cd1b),
+ TOBN(0x4cb8f38c, 0xa985b2c1),
+ TOBN(0x83ccbe80, 0x8c3bff36),
+ TOBN(0x005a0bd2, 0x5263e575),
+ TOBN(0x460d7dda, 0x259bdcd1),
+ TOBN(0x4a1c5642, 0xfa5cab6b),
+ TOBN(0x2b7bdbb9, 0x9fe4fc88),
+ TOBN(0x09418e28, 0xcc97bbb5),
+ TOBN(0xd8274fb4, 0xa12321ae),
+ TOBN(0xb137007d, 0x5c87b64e),
+ TOBN(0x80531fe1, 0xc63c4962),
+ TOBN(0x50541e89, 0x981fdb25),
+ TOBN(0xdc1291a1, 0xfd4c2b6b),
+ TOBN(0xc0693a17, 0xa6df4fca),
+ TOBN(0xb2c4604e, 0x0117f203),
+ TOBN(0x245f1963, 0x0a99b8d0),
+ TOBN(0xaedc20aa, 0xc6212c44),
+ TOBN(0xb1ed4e56, 0x520f52a8),
+ TOBN(0xfe48f575, 0xf8547be3),
+ TOBN(0x0a7033cd, 0xa9e45f98),
+ TOBN(0x4b45d3a9, 0x18c50100),
+ TOBN(0xb2a6cd6a, 0xa61d41da),
+ TOBN(0x60bbb4f5, 0x57933c6b),
+ TOBN(0xa7538ebd, 0x2b0d7ffc),
+ TOBN(0x9ea3ab8d, 0x8cd626b6),
+ TOBN(0x8273a484, 0x3601625a),
+ TOBN(0x88859845, 0x0168e508),
+ TOBN(0x8cbc9bb2, 0x99a94abd),
+ TOBN(0x713ac792, 0xfab0a671),
+ TOBN(0xa3995b19, 0x6c9ebffc),
+ TOBN(0xe711668e, 0x1239e152),
+ TOBN(0x56892558, 0xbbb8dff4),
+ TOBN(0x8bfc7dab, 0xdbf17963),
+ TOBN(0x5b59fe5a, 0xb3de1253),
+ TOBN(0x7e3320eb, 0x34a9f7ae),
+ TOBN(0xe5e8cf72, 0xd751efe4),
+ TOBN(0x7ea003bc, 0xd9be2f37),
+ TOBN(0xc0f551a0, 0xb6c08ef7),
+ TOBN(0x56606268, 0x038f6725),
+ TOBN(0x1dd38e35, 0x6d92d3b6),
+ TOBN(0x07dfce7c, 0xc3cbd686),
+ TOBN(0x4e549e04, 0x651c5da8),
+ TOBN(0x4058f93b, 0x08b19340),
+ TOBN(0xc2fae6f4, 0xcac6d89d),
+ TOBN(0x4bad8a8c, 0x8f159cc7),
+ TOBN(0x0ddba4b3, 0xcb0b601c),
+ TOBN(0xda4fc7b5, 0x1dd95f8c),
+ TOBN(0x1d163cd7, 0xcea5c255),
+ TOBN(0x30707d06, 0x274a8c4c),
+ TOBN(0x79d9e008, 0x2802e9ce),
+ TOBN(0x02a29ebf, 0xe6ddd505),
+ TOBN(0x37064e74, 0xb50bed1a),
+ TOBN(0x3f6bae65, 0xa7327d57),
+ TOBN(0x3846f5f1, 0xf83920bc),
+ TOBN(0x87c37491, 0x60df1b9b),
+ TOBN(0x4cfb2895, 0x2d1da29f),
+ TOBN(0x10a478ca, 0x4ed1743c),
+ TOBN(0x390c6030, 0x3edd47c6),
+ TOBN(0x8f3e5312, 0x8c0a78de),
+ TOBN(0xccd02bda, 0x1e85df70),
+ TOBN(0xd6c75c03, 0xa61b6582),
+ TOBN(0x0762921c, 0xfc0eebd1),
+ TOBN(0xd34d0823, 0xd85010c0),
+ TOBN(0xd73aaacb, 0x0044cf1f),
+ TOBN(0xfb4159bb, 0xa3b5e78a),
+ TOBN(0x2287c7f7, 0xe5826f3f),
+ TOBN(0x4aeaf742, 0x580b1a01),
+ TOBN(0xf080415d, 0x60423b79),
+ TOBN(0xe12622cd, 0xa7dea144),
+ TOBN(0x49ea4996, 0x59d62472),
+ TOBN(0xb42991ef, 0x571f3913),
+ TOBN(0x0610f214, 0xf5b25a8a),
+ TOBN(0x47adc585, 0x30b79e8f),
+ TOBN(0xf90e3df6, 0x07a065a2),
+ TOBN(0x5d0a5deb, 0x43e2e034),
+ TOBN(0x53fb5a34, 0x444024aa),
+ TOBN(0xa8628c68, 0x6b0c9f7f),
+ TOBN(0x9c69c29c, 0xac563656),
+ TOBN(0x5a231feb, 0xbace47b6),
+ TOBN(0xbdce0289, 0x9ea5a2ec),
+ TOBN(0x05da1fac, 0x9463853e),
+ TOBN(0x96812c52, 0x509e78aa),
+ TOBN(0xd3fb5771, 0x57151692),
+ TOBN(0xeb2721f8, 0xd98e1c44),
+ TOBN(0xc0506087, 0x32399be1),
+ TOBN(0xda5a5511, 0xd979d8b8),
+ TOBN(0x737ed55d, 0xc6f56780),
+ TOBN(0xe20d3004, 0x0dc7a7f4),
+ TOBN(0x02ce7301, 0xf5941a03),
+ TOBN(0x91ef5215, 0xed30f83a),
+ TOBN(0x28727fc1, 0x4092d85f),
+ TOBN(0x72d223c6, 0x5c49e41a),
+ TOBN(0xa7cf30a2, 0xba6a4d81),
+ TOBN(0x7c086209, 0xb030d87d),
+ TOBN(0x04844c7d, 0xfc588b09),
+ TOBN(0x728cd499, 0x5874bbb0),
+ TOBN(0xcc1281ee, 0xe84c0495),
+ TOBN(0x0769b5ba, 0xec31958f),
+ TOBN(0x665c228b, 0xf99c2471),
+ TOBN(0xf2d8a11b, 0x191eb110),
+ TOBN(0x4594f494, 0xd36d7024),
+ TOBN(0x482ded8b, 0xcdcb25a1),
+ TOBN(0xc958a9d8, 0xdadd4885),
+ TOBN(0x7004477e, 0xf1d2b547),
+ TOBN(0x0a45f6ef, 0x2a0af550),
+ TOBN(0x4fc739d6, 0x2f8d6351),
+ TOBN(0x75cdaf27, 0x786f08a9),
+ TOBN(0x8700bb26, 0x42c2737f),
+ TOBN(0x855a7141, 0x1c4e2670),
+ TOBN(0x810188c1, 0x15076fef),
+ TOBN(0xc251d0c9, 0xabcd3297),
+ TOBN(0xae4c8967, 0xf48108eb),
+ TOBN(0xbd146de7, 0x18ceed30),
+ TOBN(0xf9d4f07a, 0xc986bced),
+ TOBN(0x5ad98ed5, 0x83fa1e08),
+ TOBN(0x7780d33e, 0xbeabd1fb),
+ TOBN(0xe330513c, 0x903b1196),
+ TOBN(0xba11de9e, 0xa47bc8c4),
+ TOBN(0x684334da, 0x02c2d064),
+ TOBN(0x7ecf360d, 0xa48de23b),
+ TOBN(0x57a1b474, 0x0a9089d8),
+ TOBN(0xf28fa439, 0xff36734c),
+ TOBN(0xf2a482cb, 0xea4570b3),
+ TOBN(0xee65d68b, 0xa5ebcee9),
+ TOBN(0x988d0036, 0xb9694cd5),
+ TOBN(0x53edd0e9, 0x37885d32),
+ TOBN(0xe37e3307, 0xbeb9bc6d),
+ TOBN(0xe9abb907, 0x9f5c6768),
+ TOBN(0x4396ccd5, 0x51f2160f),
+ TOBN(0x2500888c, 0x47336da6),
+ TOBN(0x383f9ed9, 0x926fce43),
+ TOBN(0x809dd1c7, 0x04da2930),
+ TOBN(0x30f6f596, 0x8a4cb227),
+ TOBN(0x0d700c7f, 0x73a56b38),
+ TOBN(0x1825ea33, 0xab64a065),
+ TOBN(0xaab9b735, 0x1338df80),
+ TOBN(0x1516100d, 0x9b63f57f),
+ TOBN(0x2574395a, 0x27a6a634),
+ TOBN(0xb5560fb6, 0x700a1acd),
+ TOBN(0xe823fd73, 0xfd999681),
+ TOBN(0xda915d1f, 0x6cb4e1ba),
+ TOBN(0x0d030118, 0x6ebe00a3),
+ TOBN(0x744fb0c9, 0x89fca8cd),
+ TOBN(0x970d01db, 0xf9da0e0b),
+ TOBN(0x0ad8c564, 0x7931d76f),
+ TOBN(0xb15737bf, 0xf659b96a),
+ TOBN(0xdc9933e8, 0xa8b484e7),
+ TOBN(0xb2fdbdf9, 0x7a26dec7),
+ TOBN(0x2349e9a4, 0x9f1f0136),
+ TOBN(0x7860368e, 0x70fddddb),
+ TOBN(0xd93d2c1c, 0xf9ad3e18),
+ TOBN(0x6d6c5f17, 0x689f4e79),
+ TOBN(0x7a544d91, 0xb24ff1b6),
+ TOBN(0x3e12a5eb, 0xfe16cd8c),
+ TOBN(0x543574e9, 0xa56b872f),
+ TOBN(0xa1ad550c, 0xfcf68ea2),
+ TOBN(0x689e37d2, 0x3f560ef7),
+ TOBN(0x8c54b9ca, 0xc9d47a8b),
+ TOBN(0x46d40a4a, 0x088ac342),
+ TOBN(0xec450c7c, 0x1576c6d0),
+ TOBN(0xb589e31c, 0x1f9689e9),
+ TOBN(0xdacf2602, 0xb8781718),
+ TOBN(0xa89237c6, 0xc8cb6b42),
+ TOBN(0x1326fc93, 0xb96ef381),
+ TOBN(0x55d56c6d, 0xb5f07825),
+ TOBN(0xacba2eea, 0x7449e22d),
+ TOBN(0x74e0887a, 0x633c3000),
+ TOBN(0xcb6cd172, 0xd7cbcf71),
+ TOBN(0x309e81de, 0xc36cf1be),
+ TOBN(0x07a18a6d, 0x60ae399b),
+ TOBN(0xb36c2679, 0x9edce57e),
+ TOBN(0x52b892f4, 0xdf001d41),
+ TOBN(0xd884ae5d, 0x16a1f2c6),
+ TOBN(0x9b329424, 0xefcc370a),
+ TOBN(0x3120daf2, 0xbd2e21df),
+ TOBN(0x55298d2d, 0x02470a99),
+ TOBN(0x0b78af6c, 0xa05db32e),
+ TOBN(0x5c76a331, 0x601f5636),
+ TOBN(0xaae861ff, 0xf8a4f29c),
+ TOBN(0x70dc9240, 0xd68f8d49),
+ TOBN(0x960e649f, 0x81b1321c),
+ TOBN(0x3d2c801b, 0x8792e4ce),
+ TOBN(0xf479f772, 0x42521876),
+ TOBN(0x0bed93bc, 0x416c79b1),
+ TOBN(0xa67fbc05, 0x263e5bc9),
+ TOBN(0x01e8e630, 0x521db049),
+ TOBN(0x76f26738, 0xc6f3431e),
+ TOBN(0xe609cb02, 0xe3267541),
+ TOBN(0xb10cff2d, 0x818c877c),
+ TOBN(0x1f0e75ce, 0x786a13cb),
+ TOBN(0xf4fdca64, 0x1158544d),
+ TOBN(0x5d777e89, 0x6cb71ed0),
+ TOBN(0x3c233737, 0xa9aa4755),
+ TOBN(0x7b453192, 0xe527ab40),
+ TOBN(0xdb59f688, 0x39f05ffe),
+ TOBN(0x8f4f4be0, 0x6d82574e),
+ TOBN(0xcce3450c, 0xee292d1b),
+ TOBN(0xaa448a12, 0x61ccd086),
+ TOBN(0xabce91b3, 0xf7914967),
+ TOBN(0x4537f09b, 0x1908a5ed),
+ TOBN(0xa812421e, 0xf51042e7),
+ TOBN(0xfaf5cebc, 0xec0b3a34),
+ TOBN(0x730ffd87, 0x4ca6b39a),
+ TOBN(0x70fb72ed, 0x02efd342),
+ TOBN(0xeb4735f9, 0xd75c8edb),
+ TOBN(0xc11f2157, 0xc278aa51),
+ TOBN(0xc459f635, 0xbf3bfebf),
+ TOBN(0x3a1ff0b4, 0x6bd9601f),
+ TOBN(0xc9d12823, 0xc420cb73),
+ TOBN(0x3e9af3e2, 0x3c2915a3),
+ TOBN(0xe0c82c72, 0xb41c3440),
+ TOBN(0x175239e5, 0xe3039a5f),
+ TOBN(0xe1084b8a, 0x558795a3),
+ TOBN(0x328d0a1d, 0xd01e5c60),
+ TOBN(0x0a495f2e, 0xd3788a04),
+ TOBN(0x25d8ff16, 0x66c11a9f),
+ TOBN(0xf5155f05, 0x9ed692d6),
+ TOBN(0x954fa107, 0x4f425fe4),
+ TOBN(0xd16aabf2, 0xe98aaa99),
+ TOBN(0x90cd8ba0, 0x96b0f88a),
+ TOBN(0x957f4782, 0xc154026a),
+ TOBN(0x54ee0734, 0x52af56d2),
+ TOBN(0xbcf89e54, 0x45b4147a),
+ TOBN(0x3d102f21, 0x9a52816c),
+ TOBN(0x6808517e, 0x39b62e77),
+ TOBN(0x92e25421, 0x69169ad8),
+ TOBN(0xd721d871, 0xbb608558),
+ TOBN(0x60e4ebae, 0xf6d4ff9b),
+ TOBN(0x0ba10819, 0x41f2763e),
+ TOBN(0xca2e45be, 0x51ee3247),
+ TOBN(0x66d172ec, 0x2bfd7a5f),
+ TOBN(0x528a8f2f, 0x74d0b12d),
+ TOBN(0xe17f1e38, 0xdabe70dc),
+ TOBN(0x1d5d7316, 0x9f93983c),
+ TOBN(0x51b2184a, 0xdf423e31),
+ TOBN(0xcb417291, 0xaedb1a10),
+ TOBN(0x2054ca93, 0x625bcab9),
+ TOBN(0x54396860, 0xa98998f0),
+ TOBN(0x4e53f6c4, 0xa54ae57e),
+ TOBN(0x0ffeb590, 0xee648e9d),
+ TOBN(0xfbbdaadc, 0x6afaf6bc),
+ TOBN(0xf88ae796, 0xaa3bfb8a),
+ TOBN(0x209f1d44, 0xd2359ed9),
+ TOBN(0xac68dd03, 0xf3544ce2),
+ TOBN(0xf378da47, 0xfd51e569),
+ TOBN(0xe1abd860, 0x2cc80097),
+ TOBN(0x23ca18d9, 0x343b6e3a),
+ TOBN(0x480797e8, 0xb40a1bae),
+ TOBN(0xd1f0c717, 0x533f3e67),
+ TOBN(0x44896970, 0x06e6cdfc),
+ TOBN(0x8ca21055, 0x52a82e8d),
+ TOBN(0xb2caf785, 0x78460cdc),
+ TOBN(0x4c1b7b62, 0xe9037178),
+ TOBN(0xefc09d2c, 0xdb514b58),
+ TOBN(0x5f2df9ee, 0x9113be5c),
+ TOBN(0x2fbda78f, 0xb3f9271c),
+ TOBN(0xe09a81af, 0x8f83fc54),
+ TOBN(0x06b13866, 0x8afb5141),
+ TOBN(0x38f6480f, 0x43e3865d),
+ TOBN(0x72dd77a8, 0x1ddf47d9),
+ TOBN(0xf2a8e971, 0x4c205ff7),
+ TOBN(0x46d449d8, 0x9d088ad8),
+ TOBN(0x926619ea, 0x185d706f),
+ TOBN(0xe47e02eb, 0xc7dd7f62),
+ TOBN(0xe7f120a7, 0x8cbc2031),
+ TOBN(0xc18bef00, 0x998d4ac9),
+ TOBN(0x18f37a9c, 0x6bdf22da),
+ TOBN(0xefbc432f, 0x90dc82df),
+ TOBN(0xc52cef8e, 0x5d703651),
+ TOBN(0x82887ba0, 0xd99881a5),
+ TOBN(0x7cec9dda, 0xb920ec1d),
+ TOBN(0xd0d7e8c3, 0xec3e8d3b),
+ TOBN(0x445bc395, 0x4ca88747),
+ TOBN(0xedeaa2e0, 0x9fd53535),
+ TOBN(0x461b1d93, 0x6cc87475),
+ TOBN(0xd92a52e2, 0x6d2383bd),
+ TOBN(0xfabccb59, 0xd7903546),
+ TOBN(0x6111a761, 0x3d14b112),
+ TOBN(0x0ae584fe, 0xb3d5f612),
+ TOBN(0x5ea69b8d, 0x60e828ec),
+ TOBN(0x6c078985, 0x54087030),
+ TOBN(0x649cab04, 0xac4821fe),
+ TOBN(0x25ecedcf, 0x8bdce214),
+ TOBN(0xb5622f72, 0x86af7361),
+ TOBN(0x0e1227aa, 0x7038b9e2),
+ TOBN(0xd0efb273, 0xac20fa77),
+ TOBN(0x817ff88b, 0x79df975b),
+ TOBN(0x856bf286, 0x1999503e),
+ TOBN(0xb4d5351f, 0x5038ec46),
+ TOBN(0x740a52c5, 0xfc42af6e),
+ TOBN(0x2e38bb15, 0x2cbb1a3f),
+ TOBN(0xc3eb99fe, 0x17a83429),
+ TOBN(0xca4fcbf1, 0xdd66bb74),
+ TOBN(0x880784d6, 0xcde5e8fc),
+ TOBN(0xddc84c1c, 0xb4e7a0be),
+ TOBN(0x8780510d, 0xbd15a72f),
+ TOBN(0x44bcf1af, 0x81ec30e1),
+ TOBN(0x141e50a8, 0x0a61073e),
+ TOBN(0x0d955718, 0x47be87ae),
+ TOBN(0x68a61417, 0xf76a4372),
+ TOBN(0xf57e7e87, 0xc607c3d3),
+ TOBN(0x043afaf8, 0x5252f332),
+ TOBN(0xcc14e121, 0x1552a4d2),
+ TOBN(0xb6dee692, 0xbb4d4ab4),
+ TOBN(0xb6ab74c8, 0xa03816a4),
+ TOBN(0x84001ae4, 0x6f394a29),
+ TOBN(0x5bed8344, 0xd795fb45),
+ TOBN(0x57326e7d, 0xb79f55a5),
+ TOBN(0xc9533ce0, 0x4accdffc),
+ TOBN(0x53473caf, 0x3993fa04),
+ TOBN(0x7906eb93, 0xa13df4c8),
+ TOBN(0xa73e51f6, 0x97cbe46f),
+ TOBN(0xd1ab3ae1, 0x0ae4ccf8),
+ TOBN(0x25614508, 0x8a5b3dbc),
+ TOBN(0x61eff962, 0x11a71b27),
+ TOBN(0xdf71412b, 0x6bb7fa39),
+ TOBN(0xb31ba6b8, 0x2bd7f3ef),
+ TOBN(0xb0b9c415, 0x69180d29),
+ TOBN(0xeec14552, 0x014cdde5),
+ TOBN(0x702c624b, 0x227b4bbb),
+ TOBN(0x2b15e8c2, 0xd3e988f3),
+ TOBN(0xee3bcc6d, 0xa4f7fd04),
+ TOBN(0x9d00822a, 0x42ac6c85),
+ TOBN(0x2db0cea6, 0x1df9f2b7),
+ TOBN(0xd7cad2ab, 0x42de1e58),
+ TOBN(0x346ed526, 0x2d6fbb61),
+ TOBN(0xb3962995, 0x1a2faf09),
+ TOBN(0x2fa8a580, 0x7c25612e),
+ TOBN(0x30ae04da, 0x7cf56490),
+ TOBN(0x75662908, 0x0eea3961),
+ TOBN(0x3609f5c5, 0x3d080847),
+ TOBN(0xcb081d39, 0x5241d4f6),
+ TOBN(0xb4fb3810, 0x77961a63),
+ TOBN(0xc20c5984, 0x2abb66fc),
+ TOBN(0x3d40aa7c, 0xf902f245),
+ TOBN(0x9cb12736, 0x4e536b1e),
+ TOBN(0x5eda24da, 0x99b3134f),
+ TOBN(0xafbd9c69, 0x5cd011af),
+ TOBN(0x9a16e30a, 0xc7088c7d),
+ TOBN(0x5ab65710, 0x3207389f),
+ TOBN(0x1b09547f, 0xe7407a53),
+ TOBN(0x2322f9d7, 0x4fdc6eab),
+ TOBN(0xc0f2f22d, 0x7430de4d),
+ TOBN(0x19382696, 0xe68ca9a9),
+ TOBN(0x17f1eff1, 0x918e5868),
+ TOBN(0xe3b5b635, 0x586f4204),
+ TOBN(0x146ef980, 0x3fbc4341),
+ TOBN(0x359f2c80, 0x5b5eed4e),
+ TOBN(0x9f35744e, 0x7482e41d),
+ TOBN(0x9a9ac3ec, 0xf3b224c2),
+ TOBN(0x9161a6fe, 0x91fc50ae),
+ TOBN(0x89ccc66b, 0xc613fa7c),
+ TOBN(0x89268b14, 0xc732f15a),
+ TOBN(0x7cd6f4e2, 0xb467ed03),
+ TOBN(0xfbf79869, 0xce56b40e),
+ TOBN(0xf93e094c, 0xc02dde98),
+ TOBN(0xefe0c3a8, 0xedee2cd7),
+ TOBN(0x90f3ffc0, 0xb268fd42),
+ TOBN(0x81a7fd56, 0x08241aed),
+ TOBN(0x95ab7ad8, 0x00b1afe8),
+ TOBN(0x40127056, 0x3e310d52),
+ TOBN(0xd3ffdeb1, 0x09d9fc43),
+ TOBN(0xc8f85c91, 0xd11a8594),
+ TOBN(0x2e74d258, 0x31cf6db8),
+ TOBN(0x829c7ca3, 0x02b5dfd0),
+ TOBN(0xe389cfbe, 0x69143c86),
+ TOBN(0xd01b6405, 0x941768d8),
+ TOBN(0x45103995, 0x03bf825d),
+ TOBN(0xcc4ee166, 0x56cd17e2),
+ TOBN(0xbea3c283, 0xba037e79),
+ TOBN(0x4e1ac06e, 0xd9a47520),
+ TOBN(0xfbfe18aa, 0xaf852404),
+ TOBN(0x5615f8e2, 0x8087648a),
+ TOBN(0x7301e47e, 0xb9d150d9),
+ TOBN(0x79f9f9dd, 0xb299b977),
+ TOBN(0x76697a7b, 0xa5b78314),
+ TOBN(0x10d67468, 0x7d7c90e7),
+ TOBN(0x7afffe03, 0x937210b5),
+ TOBN(0x5aef3e4b, 0x28c22cee),
+ TOBN(0xefb0ecd8, 0x09fd55ae),
+ TOBN(0x4cea7132, 0x0d2a5d6a),
+ TOBN(0x9cfb5fa1, 0x01db6357),
+ TOBN(0x395e0b57, 0xf36e1ac5),
+ TOBN(0x008fa9ad, 0x36cafb7d),
+ TOBN(0x8f6cdf70, 0x5308c4db),
+ TOBN(0x51527a37, 0x95ed2477),
+ TOBN(0xba0dee30, 0x5bd21311),
+ TOBN(0x6ed41b22, 0x909c90d7),
+ TOBN(0xc5f6b758, 0x7c8696d3),
+ TOBN(0x0db8eaa8, 0x3ce83a80),
+ TOBN(0xd297fe37, 0xb24b4b6f),
+ TOBN(0xfe58afe8, 0x522d1f0d),
+ TOBN(0x97358736, 0x8c98dbd9),
+ TOBN(0x6bc226ca, 0x9454a527),
+ TOBN(0xa12b384e, 0xce53c2d0),
+ TOBN(0x779d897d, 0x5e4606da),
+ TOBN(0xa53e47b0, 0x73ec12b0),
+ TOBN(0x462dbbba, 0x5756f1ad),
+ TOBN(0x69fe09f2, 0xcafe37b6),
+ TOBN(0x273d1ebf, 0xecce2e17),
+ TOBN(0x8ac1d538, 0x3cf607fd),
+ TOBN(0x8035f7ff, 0x12e10c25),
+ },
+ {
+ TOBN(0x854d34c7, 0x7e6c5520),
+ TOBN(0xc27df9ef, 0xdcb9ea58),
+ TOBN(0x405f2369, 0xd686666d),
+ TOBN(0x29d1febf, 0x0417aa85),
+ TOBN(0x9846819e, 0x93470afe),
+ TOBN(0x3e6a9669, 0xe2a27f9e),
+ TOBN(0x24d008a2, 0xe31e6504),
+ TOBN(0xdba7cecf, 0x9cb7680a),
+ TOBN(0xecaff541, 0x338d6e43),
+ TOBN(0x56f7dd73, 0x4541d5cc),
+ TOBN(0xb5d426de, 0x96bc88ca),
+ TOBN(0x48d94f6b, 0x9ed3a2c3),
+ TOBN(0x6354a3bb, 0x2ef8279c),
+ TOBN(0xd575465b, 0x0b1867f2),
+ TOBN(0xef99b0ff, 0x95225151),
+ TOBN(0xf3e19d88, 0xf94500d8),
+ TOBN(0x92a83268, 0xe32dd620),
+ TOBN(0x913ec99f, 0x627849a2),
+ TOBN(0xedd8fdfa, 0x2c378882),
+ TOBN(0xaf96f33e, 0xee6f8cfe),
+ TOBN(0xc06737e5, 0xdc3fa8a5),
+ TOBN(0x236bb531, 0xb0b03a1d),
+ TOBN(0x33e59f29, 0x89f037b0),
+ TOBN(0x13f9b5a7, 0xd9a12a53),
+ TOBN(0x0d0df6ce, 0x51efb310),
+ TOBN(0xcb5b2eb4, 0x958df5be),
+ TOBN(0xd6459e29, 0x36158e59),
+ TOBN(0x82aae2b9, 0x1466e336),
+ TOBN(0xfb658a39, 0x411aa636),
+ TOBN(0x7152ecc5, 0xd4c0a933),
+ TOBN(0xf10c758a, 0x49f026b7),
+ TOBN(0xf4837f97, 0xcb09311f),
+ TOBN(0xddfb02c4, 0xc753c45f),
+ TOBN(0x18ca81b6, 0xf9c840fe),
+ TOBN(0x846fd09a, 0xb0f8a3e6),
+ TOBN(0xb1162add, 0xe7733dbc),
+ TOBN(0x7070ad20, 0x236e3ab6),
+ TOBN(0xf88cdaf5, 0xb2a56326),
+ TOBN(0x05fc8719, 0x997cbc7a),
+ TOBN(0x442cd452, 0x4b665272),
+ TOBN(0x7807f364, 0xb71698f5),
+ TOBN(0x6ba418d2, 0x9f7b605e),
+ TOBN(0xfd20b00f, 0xa03b2cbb),
+ TOBN(0x883eca37, 0xda54386f),
+ TOBN(0xff0be43f, 0xf3437f24),
+ TOBN(0xe910b432, 0xa48bb33c),
+ TOBN(0x4963a128, 0x329df765),
+ TOBN(0xac1dd556, 0xbe2fe6f7),
+ TOBN(0x557610f9, 0x24a0a3fc),
+ TOBN(0x38e17bf4, 0xe881c3f9),
+ TOBN(0x6ba84faf, 0xed0dac99),
+ TOBN(0xd4a222c3, 0x59eeb918),
+ TOBN(0xc79c1dbe, 0x13f542b6),
+ TOBN(0x1fc65e0d, 0xe425d457),
+ TOBN(0xeffb754f, 0x1debb779),
+ TOBN(0x638d8fd0, 0x9e08af60),
+ TOBN(0x994f523a, 0x626332d5),
+ TOBN(0x7bc38833, 0x5561bb44),
+ TOBN(0x005ed4b0, 0x3d845ea2),
+ TOBN(0xd39d3ee1, 0xc2a1f08a),
+ TOBN(0x6561fdd3, 0xe7676b0d),
+ TOBN(0x620e35ff, 0xfb706017),
+ TOBN(0x36ce424f, 0xf264f9a8),
+ TOBN(0xc4c3419f, 0xda2681f7),
+ TOBN(0xfb6afd2f, 0x69beb6e8),
+ TOBN(0x3a50b993, 0x6d700d03),
+ TOBN(0xc840b2ad, 0x0c83a14f),
+ TOBN(0x573207be, 0x54085bef),
+ TOBN(0x5af882e3, 0x09fe7e5b),
+ TOBN(0x957678a4, 0x3b40a7e1),
+ TOBN(0x172d4bdd, 0x543056e2),
+ TOBN(0x9c1b26b4, 0x0df13c0a),
+ TOBN(0x1c30861c, 0xf405ff06),
+ TOBN(0xebac86bd, 0x486e828b),
+ TOBN(0xe791a971, 0x636933fc),
+ TOBN(0x50e7c2be, 0x7aeee947),
+ TOBN(0xc3d4a095, 0xfa90d767),
+ TOBN(0xae60eb7b, 0xe670ab7b),
+ TOBN(0x17633a64, 0x397b056d),
+ TOBN(0x93a21f33, 0x105012aa),
+ TOBN(0x663c370b, 0xabb88643),
+ TOBN(0x91df36d7, 0x22e21599),
+ TOBN(0x183ba835, 0x8b761671),
+ TOBN(0x381eea1d, 0x728f3bf1),
+ TOBN(0xb9b2f1ba, 0x39966e6c),
+ TOBN(0x7c464a28, 0xe7295492),
+ TOBN(0x0fd5f70a, 0x09b26b7f),
+ TOBN(0xa9aba1f9, 0xfbe009df),
+ TOBN(0x857c1f22, 0x369b87ad),
+ TOBN(0x3c00e5d9, 0x32fca556),
+ TOBN(0x1ad74cab, 0x90b06466),
+ TOBN(0xa7112386, 0x550faaf2),
+ TOBN(0x7435e198, 0x6d9bd5f5),
+ TOBN(0x2dcc7e38, 0x59c3463f),
+ TOBN(0xdc7df748, 0xca7bd4b2),
+ TOBN(0x13cd4c08, 0x9dec2f31),
+ TOBN(0x0d3b5df8, 0xe3237710),
+ TOBN(0x0dadb26e, 0xcbd2f7b0),
+ TOBN(0x9f5966ab, 0xe4aa082b),
+ TOBN(0x666ec8de, 0x350e966e),
+ TOBN(0x1bfd1ed5, 0xee524216),
+ TOBN(0xcd93c59b, 0x41dab0b6),
+ TOBN(0x658a8435, 0xd186d6ba),
+ TOBN(0x1b7d34d2, 0x159d1195),
+ TOBN(0x5936e460, 0x22caf46b),
+ TOBN(0x6a45dd8f, 0x9a96fe4f),
+ TOBN(0xf7925434, 0xb98f474e),
+ TOBN(0x41410412, 0x0053ef15),
+ TOBN(0x71cf8d12, 0x41de97bf),
+ TOBN(0xb8547b61, 0xbd80bef4),
+ TOBN(0xb47d3970, 0xc4db0037),
+ TOBN(0xf1bcd328, 0xfef20dff),
+ TOBN(0x31a92e09, 0x10caad67),
+ TOBN(0x1f591960, 0x5531a1e1),
+ TOBN(0x3bb852e0, 0x5f4fc840),
+ TOBN(0x63e297ca, 0x93a72c6c),
+ TOBN(0x3c2b0b2e, 0x49abad67),
+ TOBN(0x6ec405fc, 0xed3db0d9),
+ TOBN(0xdc14a530, 0x7fef1d40),
+ TOBN(0xccd19846, 0x280896fc),
+ TOBN(0x00f83176, 0x9bb81648),
+ TOBN(0xd69eb485, 0x653120d0),
+ TOBN(0xd17d75f4, 0x4ccabc62),
+ TOBN(0x34a07f82, 0xb749fcb1),
+ TOBN(0x2c3af787, 0xbbfb5554),
+ TOBN(0xb06ed4d0, 0x62e283f8),
+ TOBN(0x5722889f, 0xa19213a0),
+ TOBN(0x162b085e, 0xdcf3c7b4),
+ TOBN(0xbcaecb31, 0xe0dd3eca),
+ TOBN(0xc6237fbc, 0xe52f13a5),
+ TOBN(0xcc2b6b03, 0x27bac297),
+ TOBN(0x2ae1cac5, 0xb917f54a),
+ TOBN(0x474807d4, 0x7845ae4f),
+ TOBN(0xfec7dd92, 0xce5972e0),
+ TOBN(0xc3bd2541, 0x1d7915bb),
+ TOBN(0x66f85dc4, 0xd94907ca),
+ TOBN(0xd981b888, 0xbdbcf0ca),
+ TOBN(0xd75f5da6, 0xdf279e9f),
+ TOBN(0x128bbf24, 0x7054e934),
+ TOBN(0x3c6ff6e5, 0x81db134b),
+ TOBN(0x795b7cf4, 0x047d26e4),
+ TOBN(0xf370f7b8, 0x5049ec37),
+ TOBN(0xc6712d4d, 0xced945af),
+ TOBN(0xdf30b5ec, 0x095642bc),
+ TOBN(0x9b034c62, 0x4896246e),
+ TOBN(0x5652c016, 0xee90bbd1),
+ TOBN(0xeb38636f, 0x87fedb73),
+ TOBN(0x5e32f847, 0x0135a613),
+ TOBN(0x0703b312, 0xcf933c83),
+ TOBN(0xd05bb76e, 0x1a7f47e6),
+ TOBN(0x825e4f0c, 0x949c2415),
+ TOBN(0x569e5622, 0x7250d6f8),
+ TOBN(0xbbe9eb3a, 0x6568013e),
+ TOBN(0x8dbd203f, 0x22f243fc),
+ TOBN(0x9dbd7694, 0xb342734a),
+ TOBN(0x8f6d12f8, 0x46afa984),
+ TOBN(0xb98610a2, 0xc9eade29),
+ TOBN(0xbab4f323, 0x47dd0f18),
+ TOBN(0x5779737b, 0x671c0d46),
+ TOBN(0x10b6a7c6, 0xd3e0a42a),
+ TOBN(0xfb19ddf3, 0x3035b41c),
+ TOBN(0xd336343f, 0x99c45895),
+ TOBN(0x61fe4938, 0x54c857e5),
+ TOBN(0xc4d506be, 0xae4e57d5),
+ TOBN(0x3cd8c8cb, 0xbbc33f75),
+ TOBN(0x7281f08a, 0x9262c77d),
+ TOBN(0x083f4ea6, 0xf11a2823),
+ TOBN(0x8895041e, 0x9fba2e33),
+ TOBN(0xfcdfea49, 0x9c438edf),
+ TOBN(0x7678dcc3, 0x91edba44),
+ TOBN(0xf07b3b87, 0xe2ba50f0),
+ TOBN(0xc13888ef, 0x43948c1b),
+ TOBN(0xc2135ad4, 0x1140af42),
+ TOBN(0x8e5104f3, 0x926ed1a7),
+ TOBN(0xf24430cb, 0x88f6695f),
+ TOBN(0x0ce0637b, 0x6d73c120),
+ TOBN(0xb2db01e6, 0xfe631e8f),
+ TOBN(0x1c5563d7, 0xd7bdd24b),
+ TOBN(0x8daea3ba, 0x369ad44f),
+ TOBN(0x000c81b6, 0x8187a9f9),
+ TOBN(0x5f48a951, 0xaae1fd9a),
+ TOBN(0xe35626c7, 0x8d5aed8a),
+ TOBN(0x20952763, 0x0498c622),
+ TOBN(0x76d17634, 0x773aa504),
+ TOBN(0x36d90dda, 0xeb300f7a),
+ TOBN(0x9dcf7dfc, 0xedb5e801),
+ TOBN(0x645cb268, 0x74d5244c),
+ TOBN(0xa127ee79, 0x348e3aa2),
+ TOBN(0x488acc53, 0x575f1dbb),
+ TOBN(0x95037e85, 0x80e6161e),
+ TOBN(0x57e59283, 0x292650d0),
+ TOBN(0xabe67d99, 0x14938216),
+ TOBN(0x3c7f944b, 0x3f8e1065),
+ TOBN(0xed908cb6, 0x330e8924),
+ TOBN(0x08ee8fd5, 0x6f530136),
+ TOBN(0x2227b7d5, 0xd7ffc169),
+ TOBN(0x4f55c893, 0xb5cd6dd5),
+ TOBN(0x82225e11, 0xa62796e8),
+ TOBN(0x5c6cead1, 0xcb18e12c),
+ TOBN(0x4381ae0c, 0x84f5a51a),
+ TOBN(0x345913d3, 0x7fafa4c8),
+ TOBN(0x3d918082, 0x0491aac0),
+ TOBN(0x9347871f, 0x3e69264c),
+ TOBN(0xbea9dd3c, 0xb4f4f0cd),
+ TOBN(0xbda5d067, 0x3eadd3e7),
+ TOBN(0x0033c1b8, 0x0573bcd8),
+ TOBN(0x25589379, 0x5da2486c),
+ TOBN(0xcb89ee5b, 0x86abbee7),
+ TOBN(0x8fe0a8f3, 0x22532e5d),
+ TOBN(0xb6410ff0, 0x727dfc4c),
+ TOBN(0x619b9d58, 0x226726db),
+ TOBN(0x5ec25669, 0x7a2b2dc7),
+ TOBN(0xaf4d2e06, 0x4c3beb01),
+ TOBN(0x852123d0, 0x7acea556),
+ TOBN(0x0e9470fa, 0xf783487a),
+ TOBN(0x75a7ea04, 0x5664b3eb),
+ TOBN(0x4ad78f35, 0x6798e4ba),
+ TOBN(0x9214e6e5, 0xc7d0e091),
+ TOBN(0xc420b488, 0xb1290403),
+ TOBN(0x64049e0a, 0xfc295749),
+ TOBN(0x03ef5af1, 0x3ae9841f),
+ TOBN(0xdbe4ca19, 0xb0b662a6),
+ TOBN(0x46845c5f, 0xfa453458),
+ TOBN(0xf8dabf19, 0x10b66722),
+ TOBN(0xb650f0aa, 0xcce2793b),
+ TOBN(0x71db851e, 0xc5ec47c1),
+ TOBN(0x3eb78f3e, 0x3b234fa9),
+ TOBN(0xb0c60f35, 0xfc0106ce),
+ TOBN(0x05427121, 0x774eadbd),
+ TOBN(0x25367faf, 0xce323863),
+ TOBN(0x7541b5c9, 0xcd086976),
+ TOBN(0x4ff069e2, 0xdc507ad1),
+ TOBN(0x74145256, 0x8776e667),
+ TOBN(0x6e76142c, 0xb23c6bb5),
+ TOBN(0xdbf30712, 0x1b3a8a87),
+ TOBN(0x60e7363e, 0x98450836),
+ TOBN(0x5741450e, 0xb7366d80),
+ TOBN(0xe4ee14ca, 0x4837dbdf),
+ TOBN(0xa765eb9b, 0x69d4316f),
+ TOBN(0x04548dca, 0x8ef43825),
+ TOBN(0x9c9f4e4c, 0x5ae888eb),
+ TOBN(0x733abb51, 0x56e9ac99),
+ TOBN(0xdaad3c20, 0xba6ac029),
+ TOBN(0x9b8dd3d3, 0x2ba3e38e),
+ TOBN(0xa9bb4c92, 0x0bc5d11a),
+ TOBN(0xf20127a7, 0x9c5f88a3),
+ TOBN(0x4f52b06e, 0x161d3cb8),
+ TOBN(0x26c1ff09, 0x6afaf0a6),
+ TOBN(0x32670d2f, 0x7189e71f),
+ TOBN(0xc6438748, 0x5ecf91e7),
+ TOBN(0x15758e57, 0xdb757a21),
+ TOBN(0x427d09f8, 0x290a9ce5),
+ TOBN(0x846a308f, 0x38384a7a),
+ TOBN(0xaac3acb4, 0xb0732b99),
+ TOBN(0x9e941009, 0x17845819),
+ TOBN(0x95cba111, 0xa7ce5e03),
+ TOBN(0x6f3d4f7f, 0xb00009c4),
+ TOBN(0xb8396c27, 0x8ff28b5f),
+ TOBN(0xb1a9ae43, 0x1c97975d),
+ TOBN(0x9d7ba8af, 0xe5d9fed5),
+ TOBN(0x338cf09f, 0x34f485b6),
+ TOBN(0xbc0ddacc, 0x64122516),
+ TOBN(0xa450da12, 0x05d471fe),
+ TOBN(0x4c3a6250, 0x628dd8c9),
+ TOBN(0x69c7d103, 0xd1295837),
+ TOBN(0xa2893e50, 0x3807eb2f),
+ TOBN(0xd6e1e1de, 0xbdb41491),
+ TOBN(0xc630745b, 0x5e138235),
+ TOBN(0xc892109e, 0x48661ae1),
+ TOBN(0x8d17e7eb, 0xea2b2674),
+ TOBN(0x00ec0f87, 0xc328d6b5),
+ TOBN(0x6d858645, 0xf079ff9e),
+ TOBN(0x6cdf243e, 0x19115ead),
+ TOBN(0x1ce1393e, 0x4bac4fcf),
+ TOBN(0x2c960ed0, 0x9c29f25b),
+ TOBN(0x59be4d8e, 0x9d388a05),
+ TOBN(0x0d46e06c, 0xd0def72b),
+ TOBN(0xb923db5d, 0xe0342748),
+ TOBN(0xf7d3aacd, 0x936d4a3d),
+ TOBN(0x558519cc, 0x0b0b099e),
+ TOBN(0x3ea8ebf8, 0x827097ef),
+ TOBN(0x259353db, 0xd054f55d),
+ TOBN(0x84c89abc, 0x6d2ed089),
+ TOBN(0x5c548b69, 0x8e096a7c),
+ TOBN(0xd587f616, 0x994b995d),
+ TOBN(0x4d1531f6, 0xa5845601),
+ TOBN(0x792ab31e, 0x451fd9f0),
+ TOBN(0xc8b57bb2, 0x65adf6ca),
+ TOBN(0x68440fcb, 0x1cd5ad73),
+ TOBN(0xb9c860e6, 0x6144da4f),
+ TOBN(0x2ab286aa, 0x8462beb8),
+ TOBN(0xcc6b8fff, 0xef46797f),
+ TOBN(0xac820da4, 0x20c8a471),
+ TOBN(0x69ae05a1, 0x77ff7faf),
+ TOBN(0xb9163f39, 0xbfb5da77),
+ TOBN(0xbd03e590, 0x2c73ab7a),
+ TOBN(0x7e862b5e, 0xb2940d9e),
+ TOBN(0x3c663d86, 0x4b9af564),
+ TOBN(0xd8309031, 0xbde3033d),
+ TOBN(0x298231b2, 0xd42c5bc6),
+ TOBN(0x42090d2c, 0x552ad093),
+ TOBN(0xa4799d1c, 0xff854695),
+ TOBN(0x0a88b5d6, 0xd31f0d00),
+ TOBN(0xf8b40825, 0xa2f26b46),
+ TOBN(0xec29b1ed, 0xf1bd7218),
+ TOBN(0xd491c53b, 0x4b24c86e),
+ TOBN(0xd2fe588f, 0x3395ea65),
+ TOBN(0x6f3764f7, 0x4456ef15),
+ TOBN(0xdb43116d, 0xcdc34800),
+ TOBN(0xcdbcd456, 0xc1e33955),
+ TOBN(0xefdb5540, 0x74ab286b),
+ TOBN(0x948c7a51, 0xd18c5d7c),
+ TOBN(0xeb81aa37, 0x7378058e),
+ TOBN(0x41c746a1, 0x04411154),
+ TOBN(0xa10c73bc, 0xfb828ac7),
+ TOBN(0x6439be91, 0x9d972b29),
+ TOBN(0x4bf3b4b0, 0x43a2fbad),
+ TOBN(0x39e6dadf, 0x82b5e840),
+ TOBN(0x4f716408, 0x6397bd4c),
+ TOBN(0x0f7de568, 0x7f1eeccb),
+ TOBN(0x5865c5a1, 0xd2ffbfc1),
+ TOBN(0xf74211fa, 0x4ccb6451),
+ TOBN(0x66368a88, 0xc0b32558),
+ TOBN(0x5b539dc2, 0x9ad7812e),
+ TOBN(0x579483d0, 0x2f3af6f6),
+ TOBN(0x52132078, 0x99934ece),
+ TOBN(0x50b9650f, 0xdcc9e983),
+ TOBN(0xca989ec9, 0xaee42b8a),
+ TOBN(0x6a44c829, 0xd6f62f99),
+ TOBN(0x8f06a309, 0x4c2a7c0c),
+ TOBN(0x4ea2b3a0, 0x98a0cb0a),
+ TOBN(0x5c547b70, 0xbeee8364),
+ TOBN(0x461d40e1, 0x682afe11),
+ TOBN(0x9e0fc77a, 0x7b41c0a8),
+ TOBN(0x79e4aefd, 0xe20d5d36),
+ TOBN(0x2916e520, 0x32dd9f63),
+ TOBN(0xf59e52e8, 0x3f883faf),
+ TOBN(0x396f9639, 0x2b868d35),
+ TOBN(0xc902a9df, 0x4ca19881),
+ TOBN(0x0fc96822, 0xdb2401a6),
+ TOBN(0x41237587, 0x66f1c68d),
+ TOBN(0x10fc6de3, 0xfb476c0d),
+ TOBN(0xf8b6b579, 0x841f5d90),
+ TOBN(0x2ba8446c, 0xfa24f44a),
+ TOBN(0xa237b920, 0xef4a9975),
+ TOBN(0x60bb6004, 0x2330435f),
+ TOBN(0xd6f4ab5a, 0xcfb7e7b5),
+ TOBN(0xb2ac5097, 0x83435391),
+ TOBN(0xf036ee2f, 0xb0d1ea67),
+ TOBN(0xae779a6a, 0x74c56230),
+ TOBN(0x59bff8c8, 0xab838ae6),
+ TOBN(0xcd83ca99, 0x9b38e6f0),
+ TOBN(0xbb27bef5, 0xe33deed3),
+ TOBN(0xe6356f6f, 0x001892a8),
+ TOBN(0xbf3be6cc, 0x7adfbd3e),
+ TOBN(0xaecbc81c, 0x33d1ac9d),
+ TOBN(0xe4feb909, 0xe6e861dc),
+ TOBN(0x90a247a4, 0x53f5f801),
+ TOBN(0x01c50acb, 0x27346e57),
+ TOBN(0xce29242e, 0x461acc1b),
+ TOBN(0x04dd214a, 0x2f998a91),
+ TOBN(0x271ee9b1, 0xd4baf27b),
+ TOBN(0x7e3027d1, 0xe8c26722),
+ TOBN(0x21d1645c, 0x1820dce5),
+ TOBN(0x086f242c, 0x7501779c),
+ TOBN(0xf0061407, 0xfa0e8009),
+ TOBN(0xf23ce477, 0x60187129),
+ TOBN(0x05bbdedb, 0x0fde9bd0),
+ TOBN(0x682f4832, 0x25d98473),
+ TOBN(0xf207fe85, 0x5c658427),
+ TOBN(0xb6fdd7ba, 0x4166ffa1),
+ TOBN(0x0c314056, 0x9eed799d),
+ TOBN(0x0db8048f, 0x4107e28f),
+ TOBN(0x74ed3871, 0x41216840),
+ TOBN(0x74489f8f, 0x56a3c06e),
+ TOBN(0x1e1c005b, 0x12777134),
+ TOBN(0xdb332a73, 0xf37ec3c3),
+ TOBN(0xc65259bd, 0xdd59eba0),
+ TOBN(0x2291709c, 0xdb4d3257),
+ TOBN(0x9a793b25, 0xbd389390),
+ TOBN(0xf39fe34b, 0xe43756f0),
+ TOBN(0x2f76bdce, 0x9afb56c9),
+ TOBN(0x9f37867a, 0x61208b27),
+ TOBN(0xea1d4307, 0x089972c3),
+ TOBN(0x8c595330, 0x8bdf623a),
+ TOBN(0x5f5accda, 0x8441fb7d),
+ TOBN(0xfafa9418, 0x32ddfd95),
+ TOBN(0x6ad40c5a, 0x0fde9be7),
+ TOBN(0x43faba89, 0xaeca8709),
+ TOBN(0xc64a7cf1, 0x2c248a9d),
+ TOBN(0x16620252, 0x72637a76),
+ TOBN(0xaee1c791, 0x22b8d1bb),
+ TOBN(0xf0f798fd, 0x21a843b2),
+ TOBN(0x56e4ed4d, 0x8d005cb1),
+ TOBN(0x355f7780, 0x1f0d8abe),
+ TOBN(0x197b04cf, 0x34522326),
+ TOBN(0x41f9b31f, 0xfd42c13f),
+ TOBN(0x5ef7feb2, 0xb40f933d),
+ TOBN(0x27326f42, 0x5d60bad4),
+ TOBN(0x027ecdb2, 0x8c92cf89),
+ TOBN(0x04aae4d1, 0x4e3352fe),
+ TOBN(0x08414d2f, 0x73591b90),
+ TOBN(0x5ed6124e, 0xb7da7d60),
+ TOBN(0xb985b931, 0x4d13d4ec),
+ TOBN(0xa592d3ab, 0x96bf36f9),
+ TOBN(0x012dbed5, 0xbbdf51df),
+ TOBN(0xa57963c0, 0xdf6c177d),
+ TOBN(0x010ec869, 0x87ca29cf),
+ TOBN(0xba1700f6, 0xbf926dff),
+ TOBN(0x7c9fdbd1, 0xf4bf6bc2),
+ TOBN(0xdc18dc8f, 0x64da11f5),
+ TOBN(0xa6074b7a, 0xd938ae75),
+ TOBN(0x14270066, 0xe84f44a4),
+ TOBN(0x99998d38, 0xd27b954e),
+ TOBN(0xc1be8ab2, 0xb4f38e9a),
+ TOBN(0x8bb55bbf, 0x15c01016),
+ TOBN(0xf73472b4, 0x0ea2ab30),
+ TOBN(0xd365a340, 0xf73d68dd),
+ TOBN(0xc01a7168, 0x19c2e1eb),
+ TOBN(0x32f49e37, 0x34061719),
+ TOBN(0xb73c57f1, 0x01d8b4d6),
+ TOBN(0x03c8423c, 0x26b47700),
+ TOBN(0x321d0bc8, 0xa4d8826a),
+ TOBN(0x6004213c, 0x4bc0e638),
+ TOBN(0xf78c64a1, 0xc1c06681),
+ TOBN(0x16e0a16f, 0xef018e50),
+ TOBN(0x31cbdf91, 0xdb42b2b3),
+ TOBN(0xf8f4ffce, 0xe0d36f58),
+ TOBN(0xcdcc71cd, 0x4cc5e3e0),
+ TOBN(0xd55c7cfa, 0xa129e3e0),
+ TOBN(0xccdb6ba0, 0x0fb2cbf1),
+ TOBN(0x6aba0005, 0xc4bce3cb),
+ TOBN(0x501cdb30, 0xd232cfc4),
+ TOBN(0x9ddcf12e, 0xd58a3cef),
+ TOBN(0x02d2cf9c, 0x87e09149),
+ TOBN(0xdc5d7ec7, 0x2c976257),
+ TOBN(0x6447986e, 0x0b50d7dd),
+ TOBN(0x88fdbaf7, 0x807f112a),
+ TOBN(0x58c9822a, 0xb00ae9f6),
+ TOBN(0x6abfb950, 0x6d3d27e0),
+ TOBN(0xd0a74487, 0x8a429f4f),
+ TOBN(0x0649712b, 0xdb516609),
+ TOBN(0xb826ba57, 0xe769b5df),
+ TOBN(0x82335df2, 0x1fc7aaf2),
+ TOBN(0x2389f067, 0x5c93d995),
+ TOBN(0x59ac367a, 0x68677be6),
+ TOBN(0xa77985ff, 0x21d9951b),
+ TOBN(0x038956fb, 0x85011cce),
+ TOBN(0x608e48cb, 0xbb734e37),
+ TOBN(0xc08c0bf2, 0x2be5b26f),
+ TOBN(0x17bbdd3b, 0xf9b1a0d9),
+ TOBN(0xeac7d898, 0x10483319),
+ TOBN(0xc95c4baf, 0xbc1a6dea),
+ TOBN(0xfdd0e2bf, 0x172aafdb),
+ TOBN(0x40373cbc, 0x8235c41a),
+ TOBN(0x14303f21, 0xfb6f41d5),
+ TOBN(0xba063621, 0x0408f237),
+ TOBN(0xcad3b09a, 0xecd2d1ed),
+ TOBN(0x4667855a, 0x52abb6a2),
+ TOBN(0xba9157dc, 0xaa8b417b),
+ TOBN(0xfe7f3507, 0x4f013efb),
+ TOBN(0x1b112c4b, 0xaa38c4a2),
+ TOBN(0xa1406a60, 0x9ba64345),
+ TOBN(0xe53cba33, 0x6993c80b),
+ TOBN(0x45466063, 0xded40d23),
+ TOBN(0x3d5f1f4d, 0x54908e25),
+ TOBN(0x9ebefe62, 0x403c3c31),
+ TOBN(0x274ea0b5, 0x0672a624),
+ TOBN(0xff818d99, 0x451d1b71),
+ TOBN(0x80e82643, 0x8f79cf79),
+ TOBN(0xa165df13, 0x73ce37f5),
+ TOBN(0xa744ef4f, 0xfe3a21fd),
+ TOBN(0x73f1e7f5, 0xcf551396),
+ TOBN(0xc616898e, 0x868c676b),
+ TOBN(0x671c28c7, 0x8c442c36),
+ TOBN(0xcfe5e558, 0x5e0a317d),
+ TOBN(0x1242d818, 0x7051f476),
+ TOBN(0x56fad2a6, 0x14f03442),
+ TOBN(0x262068bc, 0x0a44d0f6),
+ TOBN(0xdfa2cd6e, 0xce6edf4e),
+ TOBN(0x0f43813a, 0xd15d1517),
+ TOBN(0x61214cb2, 0x377d44f5),
+ TOBN(0xd399aa29, 0xc639b35f),
+ TOBN(0x42136d71, 0x54c51c19),
+ TOBN(0x9774711b, 0x08417221),
+ TOBN(0x0a5546b3, 0x52545a57),
+ TOBN(0x80624c41, 0x1150582d),
+ TOBN(0x9ec5c418, 0xfbc555bc),
+ TOBN(0x2c87dcad, 0x771849f1),
+ TOBN(0xb0c932c5, 0x01d7bf6f),
+ TOBN(0x6aa5cd3e, 0x89116eb2),
+ TOBN(0xd378c25a, 0x51ca7bd3),
+ TOBN(0xc612a0da, 0x9e6e3e31),
+ TOBN(0x0417a54d, 0xb68ad5d0),
+ TOBN(0x00451e4a, 0x22c6edb8),
+ TOBN(0x9fbfe019, 0xb42827ce),
+ TOBN(0x2fa92505, 0xba9384a2),
+ TOBN(0x21b8596e, 0x64ad69c1),
+ TOBN(0x8f4fcc49, 0x983b35a6),
+ TOBN(0xde093760, 0x72754672),
+ TOBN(0x2f14ccc8, 0xf7bffe6d),
+ TOBN(0x27566bff, 0x5d94263d),
+ TOBN(0xb5b4e9c6, 0x2df3ec30),
+ TOBN(0x94f1d7d5, 0x3e6ea6ba),
+ TOBN(0x97b7851a, 0xaaca5e9b),
+ TOBN(0x518aa521, 0x56713b97),
+ TOBN(0x3357e8c7, 0x150a61f6),
+ TOBN(0x7842e7e2, 0xec2c2b69),
+ TOBN(0x8dffaf65, 0x6868a548),
+ TOBN(0xd963bd82, 0xe068fc81),
+ TOBN(0x64da5c8b, 0x65917733),
+ TOBN(0x927090ff, 0x7b247328),
+ },
+ {
+ TOBN(0x214bc9a7, 0xd298c241),
+ TOBN(0xe3b697ba, 0x56807cfd),
+ TOBN(0xef1c7802, 0x4564eadb),
+ TOBN(0xdde8cdcf, 0xb48149c5),
+ TOBN(0x946bf0a7, 0x5a4d2604),
+ TOBN(0x27154d7f, 0x6c1538af),
+ TOBN(0x95cc9230, 0xde5b1fcc),
+ TOBN(0xd88519e9, 0x66864f82),
+ TOBN(0xb828dd1a, 0x7cb1282c),
+ TOBN(0xa08d7626, 0xbe46973a),
+ TOBN(0x6baf8d40, 0xe708d6b2),
+ TOBN(0x72571fa1, 0x4daeb3f3),
+ TOBN(0x85b1732f, 0xf22dfd98),
+ TOBN(0x87ab01a7, 0x0087108d),
+ TOBN(0xaaaafea8, 0x5988207a),
+ TOBN(0xccc832f8, 0x69f00755),
+ TOBN(0x964d950e, 0x36ff3bf0),
+ TOBN(0x8ad20f6f, 0xf0b34638),
+ TOBN(0x4d9177b3, 0xb5d7585f),
+ TOBN(0xcf839760, 0xef3f019f),
+ TOBN(0x582fc5b3, 0x8288c545),
+ TOBN(0x2f8e4e9b, 0x13116bd1),
+ TOBN(0xf91e1b2f, 0x332120ef),
+ TOBN(0xcf568724, 0x2a17dd23),
+ TOBN(0x488f1185, 0xca8d9d1a),
+ TOBN(0xadf2c77d, 0xd987ded2),
+ TOBN(0x5f3039f0, 0x60c46124),
+ TOBN(0xe5d70b75, 0x71e095f4),
+ TOBN(0x82d58650, 0x6260e70f),
+ TOBN(0x39d75ea7, 0xf750d105),
+ TOBN(0x8cf3d0b1, 0x75bac364),
+ TOBN(0xf3a7564d, 0x21d01329),
+ TOBN(0x182f04cd, 0x2f52d2a7),
+ TOBN(0x4fde149a, 0xe2df565a),
+ TOBN(0xb80c5eec, 0xa79fb2f7),
+ TOBN(0xab491d7b, 0x22ddc897),
+ TOBN(0x99d76c18, 0xc6312c7f),
+ TOBN(0xca0d5f3d, 0x6aa41a57),
+ TOBN(0x71207325, 0xd15363a0),
+ TOBN(0xe82aa265, 0xbeb252c2),
+ TOBN(0x94ab4700, 0xec3128c2),
+ TOBN(0x6c76d862, 0x8e383f49),
+ TOBN(0xdc36b150, 0xc03024eb),
+ TOBN(0xfb439477, 0x53daac69),
+ TOBN(0xfc68764a, 0x8dc79623),
+ TOBN(0x5b86995d, 0xb440fbb2),
+ TOBN(0xd66879bf, 0xccc5ee0d),
+ TOBN(0x05228942, 0x95aa8bd3),
+ TOBN(0xb51a40a5, 0x1e6a75c1),
+ TOBN(0x24327c76, 0x0ea7d817),
+ TOBN(0x06630182, 0x07774597),
+ TOBN(0xd6fdbec3, 0x97fa7164),
+ TOBN(0x20c99dfb, 0x13c90f48),
+ TOBN(0xd6ac5273, 0x686ef263),
+ TOBN(0xc6a50bdc, 0xfef64eeb),
+ TOBN(0xcd87b281, 0x86fdfc32),
+ TOBN(0xb24aa43e, 0x3fcd3efc),
+ TOBN(0xdd26c034, 0xb8088e9a),
+ TOBN(0xa5ef4dc9, 0xbd3d46ea),
+ TOBN(0xa2f99d58, 0x8a4c6a6f),
+ TOBN(0xddabd355, 0x2f1da46c),
+ TOBN(0x72c3f8ce, 0x1afacdd1),
+ TOBN(0xd90c4eee, 0x92d40578),
+ TOBN(0xd28bb41f, 0xca623b94),
+ TOBN(0x50fc0711, 0x745edc11),
+ TOBN(0x9dd9ad7d, 0x3dc87558),
+ TOBN(0xce6931fb, 0xb49d1e64),
+ TOBN(0x6c77a0a2, 0xc98bd0f9),
+ TOBN(0x62b9a629, 0x6baf7cb1),
+ TOBN(0xcf065f91, 0xccf72d22),
+ TOBN(0x7203cce9, 0x79639071),
+ TOBN(0x09ae4885, 0xf9cb732f),
+ TOBN(0x5e7c3bec, 0xee8314f3),
+ TOBN(0x1c068aed, 0xdbea298f),
+ TOBN(0x08d381f1, 0x7c80acec),
+ TOBN(0x03b56be8, 0xe330495b),
+ TOBN(0xaeffb8f2, 0x9222882d),
+ TOBN(0x95ff38f6, 0xc4af8bf7),
+ TOBN(0x50e32d35, 0x1fc57d8c),
+ TOBN(0x6635be52, 0x17b444f0),
+ TOBN(0x04d15276, 0xa5177900),
+ TOBN(0x4e1dbb47, 0xf6858752),
+ TOBN(0x5b475622, 0xc615796c),
+ TOBN(0xa6fa0387, 0x691867bf),
+ TOBN(0xed7f5d56, 0x2844c6d0),
+ TOBN(0xc633cf9b, 0x03a2477d),
+ TOBN(0xf6be5c40, 0x2d3721d6),
+ TOBN(0xaf312eb7, 0xe9fd68e6),
+ TOBN(0x242792d2, 0xe7417ce1),
+ TOBN(0xff42bc71, 0x970ee7f5),
+ TOBN(0x1ff4dc6d, 0x5c67a41e),
+ TOBN(0x77709b7b, 0x20882a58),
+ TOBN(0x3554731d, 0xbe217f2c),
+ TOBN(0x2af2a8cd, 0x5bb72177),
+ TOBN(0x58eee769, 0x591dd059),
+ TOBN(0xbb2930c9, 0x4bba6477),
+ TOBN(0x863ee047, 0x7d930cfc),
+ TOBN(0x4c262ad1, 0x396fd1f4),
+ TOBN(0xf4765bc8, 0x039af7e1),
+ TOBN(0x2519834b, 0x5ba104f6),
+ TOBN(0x7cd61b4c, 0xd105f961),
+ TOBN(0xa5415da5, 0xd63bca54),
+ TOBN(0x778280a0, 0x88a1f17c),
+ TOBN(0xc4968949, 0x2329512c),
+ TOBN(0x174a9126, 0xcecdaa7a),
+ TOBN(0xfc8c7e0e, 0x0b13247b),
+ TOBN(0x29c110d2, 0x3484c1c4),
+ TOBN(0xf8eb8757, 0x831dfc3b),
+ TOBN(0x022f0212, 0xc0067452),
+ TOBN(0x3f6f69ee, 0x7b9b926c),
+ TOBN(0x09032da0, 0xef42daf4),
+ TOBN(0x79f00ade, 0x83f80de4),
+ TOBN(0x6210db71, 0x81236c97),
+ TOBN(0x74f7685b, 0x3ee0781f),
+ TOBN(0x4df7da7b, 0xa3e41372),
+ TOBN(0x2aae38b1, 0xb1a1553e),
+ TOBN(0x1688e222, 0xf6dd9d1b),
+ TOBN(0x57695448, 0x5b8b6487),
+ TOBN(0x478d2127, 0x4b2edeaa),
+ TOBN(0xb2818fa5, 0x1e85956a),
+ TOBN(0x1e6addda, 0xf176f2c0),
+ TOBN(0x01ca4604, 0xe2572658),
+ TOBN(0x0a404ded, 0x85342ffb),
+ TOBN(0x8cf60f96, 0x441838d6),
+ TOBN(0x9bbc691c, 0xc9071c4a),
+ TOBN(0xfd588744, 0x34442803),
+ TOBN(0x97101c85, 0x809c0d81),
+ TOBN(0xa7fb754c, 0x8c456f7f),
+ TOBN(0xc95f3c5c, 0xd51805e1),
+ TOBN(0xab4ccd39, 0xb299dca8),
+ TOBN(0x3e03d20b, 0x47eaf500),
+ TOBN(0xfa3165c1, 0xd7b80893),
+ TOBN(0x005e8b54, 0xe160e552),
+ TOBN(0xdc4972ba, 0x9019d11f),
+ TOBN(0x21a6972e, 0x0c9a4a7a),
+ TOBN(0xa52c258f, 0x37840fd7),
+ TOBN(0xf8559ff4, 0xc1e99d81),
+ TOBN(0x08e1a7d6, 0xa3c617c0),
+ TOBN(0xb398fd43, 0x248c6ba7),
+ TOBN(0x6ffedd91, 0xd1283794),
+ TOBN(0x8a6a59d2, 0xd629d208),
+ TOBN(0xa9d141d5, 0x3490530e),
+ TOBN(0x42f6fc18, 0x38505989),
+ TOBN(0x09bf250d, 0x479d94ee),
+ TOBN(0x223ad3b1, 0xb3822790),
+ TOBN(0x6c5926c0, 0x93b8971c),
+ TOBN(0x609efc7e, 0x75f7fa62),
+ TOBN(0x45d66a6d, 0x1ec2d989),
+ TOBN(0x4422d663, 0x987d2792),
+ TOBN(0x4a73caad, 0x3eb31d2b),
+ TOBN(0xf06c2ac1, 0xa32cb9e6),
+ TOBN(0xd9445c5f, 0x91aeba84),
+ TOBN(0x6af7a1d5, 0xaf71013f),
+ TOBN(0xe68216e5, 0x0bedc946),
+ TOBN(0xf4cba30b, 0xd27370a0),
+ TOBN(0x7981afbf, 0x870421cc),
+ TOBN(0x02496a67, 0x9449f0e1),
+ TOBN(0x86cfc4be, 0x0a47edae),
+ TOBN(0x3073c936, 0xb1feca22),
+ TOBN(0xf5694612, 0x03f8f8fb),
+ TOBN(0xd063b723, 0x901515ea),
+ TOBN(0x4c6c77a5, 0x749cf038),
+ TOBN(0x6361e360, 0xab9e5059),
+ TOBN(0x596cf171, 0xa76a37c0),
+ TOBN(0x800f53fa, 0x6530ae7a),
+ TOBN(0x0f5e631e, 0x0792a7a6),
+ TOBN(0x5cc29c24, 0xefdb81c9),
+ TOBN(0xa269e868, 0x3f9c40ba),
+ TOBN(0xec14f9e1, 0x2cb7191e),
+ TOBN(0x78ea1bd8, 0xe5b08ea6),
+ TOBN(0x3c65aa9b, 0x46332bb9),
+ TOBN(0x84cc22b3, 0xbf80ce25),
+ TOBN(0x0098e9e9, 0xd49d5bf1),
+ TOBN(0xcd4ec1c6, 0x19087da4),
+ TOBN(0x3c9d07c5, 0xaef6e357),
+ TOBN(0x839a0268, 0x9f8f64b8),
+ TOBN(0xc5e9eb62, 0xc6d8607f),
+ TOBN(0x759689f5, 0x6aa995e4),
+ TOBN(0x70464669, 0xbbb48317),
+ TOBN(0x921474bf, 0xe402417d),
+ TOBN(0xcabe135b, 0x2a354c8c),
+ TOBN(0xd51e52d2, 0x812fa4b5),
+ TOBN(0xec741096, 0x53311fe8),
+ TOBN(0x4f774535, 0xb864514b),
+ TOBN(0xbcadd671, 0x5bde48f8),
+ TOBN(0xc9703873, 0x2189bc7d),
+ TOBN(0x5d45299e, 0xc709ee8a),
+ TOBN(0xd1287ee2, 0x845aaff8),
+ TOBN(0x7d1f8874, 0xdb1dbf1f),
+ TOBN(0xea46588b, 0x990c88d6),
+ TOBN(0x60ba649a, 0x84368313),
+ TOBN(0xd5fdcbce, 0x60d543ae),
+ TOBN(0x90b46d43, 0x810d5ab0),
+ TOBN(0x6739d8f9, 0x04d7e5cc),
+ TOBN(0x021c1a58, 0x0d337c33),
+ TOBN(0x00a61162, 0x68e67c40),
+ TOBN(0x95ef413b, 0x379f0a1f),
+ TOBN(0xfe126605, 0xe9e2ab95),
+ TOBN(0x67578b85, 0x2f5f199c),
+ TOBN(0xf5c00329, 0x2cb84913),
+ TOBN(0xf7956430, 0x37577dd8),
+ TOBN(0x83b82af4, 0x29c5fe88),
+ TOBN(0x9c1bea26, 0xcdbdc132),
+ TOBN(0x589fa086, 0x9c04339e),
+ TOBN(0x033e9538, 0xb13799df),
+ TOBN(0x85fa8b21, 0xd295d034),
+ TOBN(0xdf17f73f, 0xbd9ddcca),
+ TOBN(0xf32bd122, 0xddb66334),
+ TOBN(0x55ef88a7, 0x858b044c),
+ TOBN(0x1f0d69c2, 0x5aa9e397),
+ TOBN(0x55fd9cc3, 0x40d85559),
+ TOBN(0xc774df72, 0x7785ddb2),
+ TOBN(0x5dcce9f6, 0xd3bd2e1c),
+ TOBN(0xeb30da20, 0xa85dfed0),
+ TOBN(0x5ed7f5bb, 0xd3ed09c4),
+ TOBN(0x7d42a35c, 0x82a9c1bd),
+ TOBN(0xcf3de995, 0x9890272d),
+ TOBN(0x75f3432a, 0x3e713a10),
+ TOBN(0x5e13479f, 0xe28227b8),
+ TOBN(0xb8561ea9, 0xfefacdc8),
+ TOBN(0xa6a297a0, 0x8332aafd),
+ TOBN(0x9b0d8bb5, 0x73809b62),
+ TOBN(0xd2fa1cfd, 0x0c63036f),
+ TOBN(0x7a16eb55, 0xbd64bda8),
+ TOBN(0x3f5cf5f6, 0x78e62ddc),
+ TOBN(0x2267c454, 0x07fd752b),
+ TOBN(0x5e361b6b, 0x5e437bbe),
+ TOBN(0x95c59501, 0x8354e075),
+ TOBN(0xec725f85, 0xf2b254d9),
+ TOBN(0x844b617d, 0x2cb52b4e),
+ TOBN(0xed8554f5, 0xcf425fb5),
+ TOBN(0xab67703e, 0x2af9f312),
+ TOBN(0x4cc34ec1, 0x3cf48283),
+ TOBN(0xb09daa25, 0x9c8a705e),
+ TOBN(0xd1e9d0d0, 0x5b7d4f84),
+ TOBN(0x4df6ef64, 0xdb38929d),
+ TOBN(0xe16b0763, 0xaa21ba46),
+ TOBN(0xc6b1d178, 0xa293f8fb),
+ TOBN(0x0ff5b602, 0xd520aabf),
+ TOBN(0x94d671bd, 0xc339397a),
+ TOBN(0x7c7d98cf, 0x4f5792fa),
+ TOBN(0x7c5e0d67, 0x11215261),
+ TOBN(0x9b19a631, 0xa7c5a6d4),
+ TOBN(0xc8511a62, 0x7a45274d),
+ TOBN(0x0c16621c, 0xa5a60d99),
+ TOBN(0xf7fbab88, 0xcf5e48cb),
+ TOBN(0xab1e6ca2, 0xf7ddee08),
+ TOBN(0x83bd08ce, 0xe7867f3c),
+ TOBN(0xf7e48e8a, 0x2ac13e27),
+ TOBN(0x4494f6df, 0x4eb1a9f5),
+ TOBN(0xedbf84eb, 0x981f0a62),
+ TOBN(0x49badc32, 0x536438f0),
+ TOBN(0x50bea541, 0x004f7571),
+ TOBN(0xbac67d10, 0xdf1c94ee),
+ TOBN(0x253d73a1, 0xb727bc31),
+ TOBN(0xb3d01cf2, 0x30686e28),
+ TOBN(0x51b77b1b, 0x55fd0b8b),
+ TOBN(0xa099d183, 0xfeec3173),
+ TOBN(0x202b1fb7, 0x670e72b7),
+ TOBN(0xadc88b33, 0xa8e1635f),
+ TOBN(0x34e8216a, 0xf989d905),
+ TOBN(0xc2e68d20, 0x29b58d01),
+ TOBN(0x11f81c92, 0x6fe55a93),
+ TOBN(0x15f1462a, 0x8f296f40),
+ TOBN(0x1915d375, 0xea3d62f2),
+ TOBN(0xa17765a3, 0x01c8977d),
+ TOBN(0x7559710a, 0xe47b26f6),
+ TOBN(0xe0bd29c8, 0x535077a5),
+ TOBN(0x615f976d, 0x08d84858),
+ TOBN(0x370dfe85, 0x69ced5c1),
+ TOBN(0xbbc7503c, 0xa734fa56),
+ TOBN(0xfbb9f1ec, 0x91ac4574),
+ TOBN(0x95d7ec53, 0x060dd7ef),
+ TOBN(0xeef2dacd, 0x6e657979),
+ TOBN(0x54511af3, 0xe2a08235),
+ TOBN(0x1e324aa4, 0x1f4aea3d),
+ TOBN(0x550e7e71, 0xe6e67671),
+ TOBN(0xbccd5190, 0xbf52faf7),
+ TOBN(0xf880d316, 0x223cc62a),
+ TOBN(0x0d402c7e, 0x2b32eb5d),
+ TOBN(0xa40bc039, 0x306a5a3b),
+ TOBN(0x4e0a41fd, 0x96783a1b),
+ TOBN(0xa1e8d39a, 0x0253cdd4),
+ TOBN(0x6480be26, 0xc7388638),
+ TOBN(0xee365e1d, 0x2285f382),
+ TOBN(0x188d8d8f, 0xec0b5c36),
+ TOBN(0x34ef1a48, 0x1f0f4d82),
+ TOBN(0x1a8f43e1, 0xa487d29a),
+ TOBN(0x8168226d, 0x77aefb3a),
+ TOBN(0xf69a751e, 0x1e72c253),
+ TOBN(0x8e04359a, 0xe9594df1),
+ TOBN(0x475ffd7d, 0xd14c0467),
+ TOBN(0xb5a2c2b1, 0x3844e95c),
+ TOBN(0x85caf647, 0xdd12ef94),
+ TOBN(0x1ecd2a9f, 0xf1063d00),
+ TOBN(0x1dd2e229, 0x23843311),
+ TOBN(0x38f0e09d, 0x73d17244),
+ TOBN(0x3ede7746, 0x8fc653f1),
+ TOBN(0xae4459f5, 0xdc20e21c),
+ TOBN(0x00db2ffa, 0x6a8599ea),
+ TOBN(0x11682c39, 0x30cfd905),
+ TOBN(0x4934d074, 0xa5c112a6),
+ TOBN(0xbdf063c5, 0x568bfe95),
+ TOBN(0x779a440a, 0x016c441a),
+ TOBN(0x0c23f218, 0x97d6fbdc),
+ TOBN(0xd3a5cd87, 0xe0776aac),
+ TOBN(0xcee37f72, 0xd712e8db),
+ TOBN(0xfb28c70d, 0x26f74e8d),
+ TOBN(0xffe0c728, 0xb61301a0),
+ TOBN(0xa6282168, 0xd3724354),
+ TOBN(0x7ff4cb00, 0x768ffedc),
+ TOBN(0xc51b3088, 0x03b02de9),
+ TOBN(0xa5a8147c, 0x3902dda5),
+ TOBN(0x35d2f706, 0xfe6973b4),
+ TOBN(0x5ac2efcf, 0xc257457e),
+ TOBN(0x933f48d4, 0x8700611b),
+ TOBN(0xc365af88, 0x4912beb2),
+ TOBN(0x7f5a4de6, 0x162edf94),
+ TOBN(0xc646ba7c, 0x0c32f34b),
+ TOBN(0x632c6af3, 0xb2091074),
+ TOBN(0x58d4f2e3, 0x753e43a9),
+ TOBN(0x70e1d217, 0x24d4e23f),
+ TOBN(0xb24bf729, 0xafede6a6),
+ TOBN(0x7f4a94d8, 0x710c8b60),
+ TOBN(0xaad90a96, 0x8d4faa6a),
+ TOBN(0xd9ed0b32, 0xb066b690),
+ TOBN(0x52fcd37b, 0x78b6dbfd),
+ TOBN(0x0b64615e, 0x8bd2b431),
+ TOBN(0x228e2048, 0xcfb9fad5),
+ TOBN(0xbeaa386d, 0x240b76bd),
+ TOBN(0x2d6681c8, 0x90dad7bc),
+ TOBN(0x3e553fc3, 0x06d38f5e),
+ TOBN(0xf27cdb9b, 0x9d5f9750),
+ TOBN(0x3e85c52a, 0xd28c5b0e),
+ TOBN(0x190795af, 0x5247c39b),
+ TOBN(0x547831eb, 0xbddd6828),
+ TOBN(0xf327a227, 0x4a82f424),
+ TOBN(0x36919c78, 0x7e47f89d),
+ TOBN(0xe4783919, 0x43c7392c),
+ TOBN(0xf101b9aa, 0x2316fefe),
+ TOBN(0xbcdc9e9c, 0x1c5009d2),
+ TOBN(0xfb55ea13, 0x9cd18345),
+ TOBN(0xf5b5e231, 0xa3ce77c7),
+ TOBN(0xde6b4527, 0xd2f2cb3d),
+ TOBN(0x10f6a333, 0x9bb26f5f),
+ TOBN(0x1e85db8e, 0x044d85b6),
+ TOBN(0xc3697a08, 0x94197e54),
+ TOBN(0x65e18cc0, 0xa7cb4ea8),
+ TOBN(0xa38c4f50, 0xa471fe6e),
+ TOBN(0xf031747a, 0x2f13439c),
+ TOBN(0x53c4a6ba, 0xc007318b),
+ TOBN(0xa8da3ee5, 0x1deccb3d),
+ TOBN(0x0555b31c, 0x558216b1),
+ TOBN(0x90c7810c, 0x2f79e6c2),
+ TOBN(0x9b669f4d, 0xfe8eed3c),
+ TOBN(0x70398ec8, 0xe0fac126),
+ TOBN(0xa96a449e, 0xf701b235),
+ TOBN(0x0ceecdb3, 0xeb94f395),
+ TOBN(0x285fc368, 0xd0cb7431),
+ TOBN(0x0d37bb52, 0x16a18c64),
+ TOBN(0x05110d38, 0xb880d2dd),
+ TOBN(0xa60f177b, 0x65930d57),
+ TOBN(0x7da34a67, 0xf36235f5),
+ TOBN(0x47f5e17c, 0x183816b9),
+ TOBN(0xc7664b57, 0xdb394af4),
+ TOBN(0x39ba215d, 0x7036f789),
+ TOBN(0x46d2ca0e, 0x2f27b472),
+ TOBN(0xc42647ee, 0xf73a84b7),
+ TOBN(0x44bc7545, 0x64488f1d),
+ TOBN(0xaa922708, 0xf4cf85d5),
+ TOBN(0x721a01d5, 0x53e4df63),
+ TOBN(0x649c0c51, 0x5db46ced),
+ TOBN(0x6bf0d64e, 0x3cffcb6c),
+ TOBN(0xe3bf93fe, 0x50f71d96),
+ TOBN(0x75044558, 0xbcc194a0),
+ TOBN(0x16ae3372, 0x6afdc554),
+ TOBN(0xbfc01adf, 0x5ca48f3f),
+ TOBN(0x64352f06, 0xe22a9b84),
+ TOBN(0xcee54da1, 0xc1099e4a),
+ TOBN(0xbbda54e8, 0xfa1b89c0),
+ TOBN(0x166a3df5, 0x6f6e55fb),
+ TOBN(0x1ca44a24, 0x20176f88),
+ TOBN(0x936afd88, 0xdfb7b5ff),
+ TOBN(0xe34c2437, 0x8611d4a0),
+ TOBN(0x7effbb75, 0x86142103),
+ TOBN(0x6704ba1b, 0x1f34fc4d),
+ TOBN(0x7c2a468f, 0x10c1b122),
+ TOBN(0x36b3a610, 0x8c6aace9),
+ TOBN(0xabfcc0a7, 0x75a0d050),
+ TOBN(0x066f9197, 0x3ce33e32),
+ TOBN(0xce905ef4, 0x29fe09be),
+ TOBN(0x89ee25ba, 0xa8376351),
+ TOBN(0x2a3ede22, 0xfd29dc76),
+ TOBN(0x7fd32ed9, 0x36f17260),
+ TOBN(0x0cadcf68, 0x284b4126),
+ TOBN(0x63422f08, 0xa7951fc8),
+ TOBN(0x562b24f4, 0x0807e199),
+ TOBN(0xfe9ce5d1, 0x22ad4490),
+ TOBN(0xc2f51b10, 0x0db2b1b4),
+ TOBN(0xeb3613ff, 0xe4541d0d),
+ TOBN(0xbd2c4a05, 0x2680813b),
+ TOBN(0x527aa55d, 0x561b08d6),
+ TOBN(0xa9f8a40e, 0xa7205558),
+ TOBN(0xe3eea56f, 0x243d0bec),
+ TOBN(0x7b853817, 0xa0ff58b3),
+ TOBN(0xb67d3f65, 0x1a69e627),
+ TOBN(0x0b76bbb9, 0xa869b5d6),
+ TOBN(0xa3afeb82, 0x546723ed),
+ TOBN(0x5f24416d, 0x3e554892),
+ TOBN(0x8413b53d, 0x430e2a45),
+ TOBN(0x99c56aee, 0x9032a2a0),
+ TOBN(0x09432bf6, 0xeec367b1),
+ TOBN(0x552850c6, 0xdaf0ecc1),
+ TOBN(0x49ebce55, 0x5bc92048),
+ TOBN(0xdfb66ba6, 0x54811307),
+ TOBN(0x1b84f797, 0x6f298597),
+ TOBN(0x79590481, 0x8d1d7a0d),
+ TOBN(0xd9fabe03, 0x3a6fa556),
+ TOBN(0xa40f9c59, 0xba9e5d35),
+ TOBN(0xcb1771c1, 0xf6247577),
+ TOBN(0x542a47ca, 0xe9a6312b),
+ TOBN(0xa34b3560, 0x552dd8c5),
+ TOBN(0xfdf94de0, 0x0d794716),
+ TOBN(0xd46124a9, 0x9c623094),
+ TOBN(0x56b7435d, 0x68afe8b4),
+ TOBN(0x27f20540, 0x6c0d8ea1),
+ TOBN(0x12b77e14, 0x73186898),
+ TOBN(0xdbc3dd46, 0x7479490f),
+ TOBN(0x951a9842, 0xc03b0c05),
+ TOBN(0x8b1b3bb3, 0x7921bc96),
+ TOBN(0xa573b346, 0x2b202e0a),
+ TOBN(0x77e4665d, 0x47254d56),
+ TOBN(0x08b70dfc, 0xd23e3984),
+ TOBN(0xab86e8bc, 0xebd14236),
+ TOBN(0xaa3e07f8, 0x57114ba7),
+ TOBN(0x5ac71689, 0xab0ef4f2),
+ TOBN(0x88fca384, 0x0139d9af),
+ TOBN(0x72733f88, 0x76644af0),
+ TOBN(0xf122f72a, 0x65d74f4a),
+ TOBN(0x13931577, 0xa5626c7a),
+ TOBN(0xd5b5d9eb, 0x70f8d5a4),
+ TOBN(0x375adde7, 0xd7bbb228),
+ TOBN(0x31e88b86, 0x0c1c0b32),
+ TOBN(0xd1f568c4, 0x173edbaa),
+ TOBN(0x1592fc83, 0x5459df02),
+ TOBN(0x2beac0fb, 0x0fcd9a7e),
+ TOBN(0xb0a6fdb8, 0x1b473b0a),
+ TOBN(0xe3224c6f, 0x0fe8fc48),
+ TOBN(0x680bd00e, 0xe87edf5b),
+ TOBN(0x30385f02, 0x20e77cf5),
+ TOBN(0xe9ab98c0, 0x4d42d1b2),
+ TOBN(0x72d191d2, 0xd3816d77),
+ TOBN(0x1564daca, 0x0917d9e5),
+ TOBN(0x394eab59, 0x1f8fed7f),
+ TOBN(0xa209aa8d, 0x7fbb3896),
+ TOBN(0x5564f3b9, 0xbe6ac98e),
+ TOBN(0xead21d05, 0xd73654ef),
+ TOBN(0x68d1a9c4, 0x13d78d74),
+ TOBN(0x61e01708, 0x6d4973a0),
+ TOBN(0x83da3500, 0x46e6d32a),
+ TOBN(0x6a3dfca4, 0x68ae0118),
+ TOBN(0xa1b9a4c9, 0xd02da069),
+ TOBN(0x0b2ff9c7, 0xebab8302),
+ TOBN(0x98af07c3, 0x944ba436),
+ TOBN(0x85997326, 0x995f0f9f),
+ TOBN(0x467fade0, 0x71b58bc6),
+ TOBN(0x47e4495a, 0xbd625a2b),
+ TOBN(0xfdd2d01d, 0x33c3b8cd),
+ TOBN(0x2c38ae28, 0xc693f9fa),
+ TOBN(0x48622329, 0x348f7999),
+ TOBN(0x97bf738e, 0x2161f583),
+ TOBN(0x15ee2fa7, 0x565e8cc9),
+ TOBN(0xa1a5c845, 0x5777e189),
+ TOBN(0xcc10bee0, 0x456f2829),
+ TOBN(0x8ad95c56, 0xda762bd5),
+ TOBN(0x152e2214, 0xe9d91da8),
+ TOBN(0x975b0e72, 0x7cb23c74),
+ TOBN(0xfd5d7670, 0xa90c66df),
+ TOBN(0xb5b5b8ad, 0x225ffc53),
+ TOBN(0xab6dff73, 0xfaded2ae),
+ TOBN(0xebd56781, 0x6f4cbe9d),
+ TOBN(0x0ed8b249, 0x6a574bd7),
+ TOBN(0x41c246fe, 0x81a881fa),
+ TOBN(0x91564805, 0xc3db9c70),
+ TOBN(0xd7c12b08, 0x5b862809),
+ TOBN(0x1facd1f1, 0x55858d7b),
+ TOBN(0x7693747c, 0xaf09e92a),
+ TOBN(0x3b69dcba, 0x189a425f),
+ TOBN(0x0be28e9f, 0x967365ef),
+ TOBN(0x57300eb2, 0xe801f5c9),
+ TOBN(0x93b8ac6a, 0xd583352f),
+ TOBN(0xa2cf1f89, 0xcd05b2b7),
+ TOBN(0x7c0c9b74, 0x4dcc40cc),
+ TOBN(0xfee38c45, 0xada523fb),
+ TOBN(0xb49a4dec, 0x1099cc4d),
+ TOBN(0x325c377f, 0x69f069c6),
+ TOBN(0xe12458ce, 0x476cc9ff),
+ TOBN(0x580e0b6c, 0xc6d4cb63),
+ TOBN(0xd561c8b7, 0x9072289b),
+ TOBN(0x0377f264, 0xa619e6da),
+ TOBN(0x26685362, 0x88e591a5),
+ TOBN(0xa453a7bd, 0x7523ca2b),
+ TOBN(0x8a9536d2, 0xc1df4533),
+ TOBN(0xc8e50f2f, 0xbe972f79),
+ TOBN(0xd433e50f, 0x6d3549cf),
+ TOBN(0x6f33696f, 0xfacd665e),
+ TOBN(0x695bfdac, 0xce11fcb4),
+ TOBN(0x810ee252, 0xaf7c9860),
+ TOBN(0x65450fe1, 0x7159bb2c),
+ TOBN(0xf7dfbebe, 0x758b357b),
+ TOBN(0x2b057e74, 0xd69fea72),
+ TOBN(0xd485717a, 0x92731745),
+ },
+ {
+ TOBN(0x896c42e8, 0xee36860c),
+ TOBN(0xdaf04dfd, 0x4113c22d),
+ TOBN(0x1adbb7b7, 0x44104213),
+ TOBN(0xe5fd5fa1, 0x1fd394ea),
+ TOBN(0x68235d94, 0x1a4e0551),
+ TOBN(0x6772cfbe, 0x18d10151),
+ TOBN(0x276071e3, 0x09984523),
+ TOBN(0xe4e879de, 0x5a56ba98),
+ TOBN(0xaaafafb0, 0x285b9491),
+ TOBN(0x01a0be88, 0x1e4c705e),
+ TOBN(0xff1d4f5d, 0x2ad9caab),
+ TOBN(0x6e349a4a, 0xc37a233f),
+ TOBN(0xcf1c1246, 0x4a1c6a16),
+ TOBN(0xd99e6b66, 0x29383260),
+ TOBN(0xea3d4366, 0x5f6d5471),
+ TOBN(0x36974d04, 0xff8cc89b),
+ TOBN(0xc26c49a1, 0xcfe89d80),
+ TOBN(0xb42c026d, 0xda9c8371),
+ TOBN(0xca6c013a, 0xdad066d2),
+ TOBN(0xfb8f7228, 0x56a4f3ee),
+ TOBN(0x08b579ec, 0xd850935b),
+ TOBN(0x34c1a74c, 0xd631e1b3),
+ TOBN(0xcb5fe596, 0xac198534),
+ TOBN(0x39ff21f6, 0xe1f24f25),
+ TOBN(0x27f29e14, 0x8f929057),
+ TOBN(0x7a64ae06, 0xc0c853df),
+ TOBN(0x256cd183, 0x58e9c5ce),
+ TOBN(0x9d9cce82, 0xded092a5),
+ TOBN(0xcc6e5979, 0x6e93b7c7),
+ TOBN(0xe1e47092, 0x31bb9e27),
+ TOBN(0xb70b3083, 0xaa9e29a0),
+ TOBN(0xbf181a75, 0x3785e644),
+ TOBN(0xf53f2c65, 0x8ead09f7),
+ TOBN(0x1335e1d5, 0x9780d14d),
+ TOBN(0x69cc20e0, 0xcd1b66bc),
+ TOBN(0x9b670a37, 0xbbe0bfc8),
+ TOBN(0xce53dc81, 0x28efbeed),
+ TOBN(0x0c74e77c, 0x8326a6e5),
+ TOBN(0x3604e0d2, 0xb88e9a63),
+ TOBN(0xbab38fca, 0x13dc2248),
+ TOBN(0x8ed6e8c8, 0x5c0a3f1e),
+ TOBN(0xbcad2492, 0x7c87c37f),
+ TOBN(0xfdfb62bb, 0x9ee3b78d),
+ TOBN(0xeba8e477, 0xcbceba46),
+ TOBN(0x37d38cb0, 0xeeaede4b),
+ TOBN(0x0bc498e8, 0x7976deb6),
+ TOBN(0xb2944c04, 0x6b6147fb),
+ TOBN(0x8b123f35, 0xf71f9609),
+ TOBN(0xa155dcc7, 0xde79dc24),
+ TOBN(0xf1168a32, 0x558f69cd),
+ TOBN(0xbac21595, 0x0d1850df),
+ TOBN(0x15c8295b, 0xb204c848),
+ TOBN(0xf661aa36, 0x7d8184ff),
+ TOBN(0xc396228e, 0x30447bdb),
+ TOBN(0x11cd5143, 0xbde4a59e),
+ TOBN(0xe3a26e3b, 0x6beab5e6),
+ TOBN(0xd3b3a13f, 0x1402b9d0),
+ TOBN(0x573441c3, 0x2c7bc863),
+ TOBN(0x4b301ec4, 0x578c3e6e),
+ TOBN(0xc26fc9c4, 0x0adaf57e),
+ TOBN(0x96e71bfd, 0x7493cea3),
+ TOBN(0xd05d4b3f, 0x1af81456),
+ TOBN(0xdaca2a8a, 0x6a8c608f),
+ TOBN(0x53ef07f6, 0x0725b276),
+ TOBN(0x07a5fbd2, 0x7824fc56),
+ TOBN(0x34675218, 0x13289077),
+ TOBN(0x5bf69fd5, 0xe0c48349),
+ TOBN(0xa613ddd3, 0xb6aa7875),
+ TOBN(0x7f78c19c, 0x5450d866),
+ TOBN(0x46f4409c, 0x8f84a481),
+ TOBN(0x9f1d1928, 0x90fce239),
+ TOBN(0x016c4168, 0xb2ce44b9),
+ TOBN(0xbae023f0, 0xc7435978),
+ TOBN(0xb152c888, 0x20e30e19),
+ TOBN(0x9c241645, 0xe3fa6faf),
+ TOBN(0x735d95c1, 0x84823e60),
+ TOBN(0x03197573, 0x03955317),
+ TOBN(0x0b4b02a9, 0xf03b4995),
+ TOBN(0x076bf559, 0x70274600),
+ TOBN(0x32c5cc53, 0xaaf57508),
+ TOBN(0xe8af6d1f, 0x60624129),
+ TOBN(0xb7bc5d64, 0x9a5e2b5e),
+ TOBN(0x3814b048, 0x5f082d72),
+ TOBN(0x76f267f2, 0xce19677a),
+ TOBN(0x626c630f, 0xb36eed93),
+ TOBN(0x55230cd7, 0x3bf56803),
+ TOBN(0x78837949, 0xce2736a0),
+ TOBN(0x0d792d60, 0xaa6c55f1),
+ TOBN(0x0318dbfd, 0xd5c7c5d2),
+ TOBN(0xb38f8da7, 0x072b342d),
+ TOBN(0x3569bddc, 0x7b8de38a),
+ TOBN(0xf25b5887, 0xa1c94842),
+ TOBN(0xb2d5b284, 0x2946ad60),
+ TOBN(0x854f29ad, 0xe9d1707e),
+ TOBN(0xaa5159dc, 0x2c6a4509),
+ TOBN(0x899f94c0, 0x57189837),
+ TOBN(0xcf6adc51, 0xf4a55b03),
+ TOBN(0x261762de, 0x35e3b2d5),
+ TOBN(0x4cc43012, 0x04827b51),
+ TOBN(0xcd22a113, 0xc6021442),
+ TOBN(0xce2fd61a, 0x247c9569),
+ TOBN(0x59a50973, 0xd152beca),
+ TOBN(0x6c835a11, 0x63a716d4),
+ TOBN(0xc26455ed, 0x187dedcf),
+ TOBN(0x27f536e0, 0x49ce89e7),
+ TOBN(0x18908539, 0xcc890cb5),
+ TOBN(0x308909ab, 0xd83c2aa1),
+ TOBN(0xecd3142b, 0x1ab73bd3),
+ TOBN(0x6a85bf59, 0xb3f5ab84),
+ TOBN(0x3c320a68, 0xf2bea4c6),
+ TOBN(0xad8dc538, 0x6da4541f),
+ TOBN(0xeaf34eb0, 0xb7c41186),
+ TOBN(0x1c780129, 0x977c97c4),
+ TOBN(0x5ff9beeb, 0xc57eb9fa),
+ TOBN(0xa24d0524, 0xc822c478),
+ TOBN(0xfd8eec2a, 0x461cd415),
+ TOBN(0xfbde194e, 0xf027458c),
+ TOBN(0xb4ff5319, 0x1d1be115),
+ TOBN(0x63f874d9, 0x4866d6f4),
+ TOBN(0x35c75015, 0xb21ad0c9),
+ TOBN(0xa6b5c9d6, 0x46ac49d2),
+ TOBN(0x42c77c0b, 0x83137aa9),
+ TOBN(0x24d000fc, 0x68225a38),
+ TOBN(0x0f63cfc8, 0x2fe1e907),
+ TOBN(0x22d1b01b, 0xc6441f95),
+ TOBN(0x7d38f719, 0xec8e448f),
+ TOBN(0x9b33fa5f, 0x787fb1ba),
+ TOBN(0x94dcfda1, 0x190158df),
+ TOBN(0xc47cb339, 0x5f6d4a09),
+ TOBN(0x6b4f355c, 0xee52b826),
+ TOBN(0x3d100f5d, 0xf51b930a),
+ TOBN(0xf4512fac, 0x9f668f69),
+ TOBN(0x546781d5, 0x206c4c74),
+ TOBN(0xd021d4d4, 0xcb4d2e48),
+ TOBN(0x494a54c2, 0xca085c2d),
+ TOBN(0xf1dbaca4, 0x520850a8),
+ TOBN(0x63c79326, 0x490a1aca),
+ TOBN(0xcb64dd9c, 0x41526b02),
+ TOBN(0xbb772591, 0xa2979258),
+ TOBN(0x3f582970, 0x48d97846),
+ TOBN(0xd66b70d1, 0x7c213ba7),
+ TOBN(0xc28febb5, 0xe8a0ced4),
+ TOBN(0x6b911831, 0xc10338c1),
+ TOBN(0x0d54e389, 0xbf0126f3),
+ TOBN(0x7048d460, 0x4af206ee),
+ TOBN(0x786c88f6, 0x77e97cb9),
+ TOBN(0xd4375ae1, 0xac64802e),
+ TOBN(0x469bcfe1, 0xd53ec11c),
+ TOBN(0xfc9b340d, 0x47062230),
+ TOBN(0xe743bb57, 0xc5b4a3ac),
+ TOBN(0xfe00b4aa, 0x59ef45ac),
+ TOBN(0x29a4ef23, 0x59edf188),
+ TOBN(0x40242efe, 0xb483689b),
+ TOBN(0x2575d3f6, 0x513ac262),
+ TOBN(0xf30037c8, 0x0ca6db72),
+ TOBN(0xc9fcce82, 0x98864be2),
+ TOBN(0x84a112ff, 0x0149362d),
+ TOBN(0x95e57582, 0x1c4ae971),
+ TOBN(0x1fa4b1a8, 0x945cf86c),
+ TOBN(0x4525a734, 0x0b024a2f),
+ TOBN(0xe76c8b62, 0x8f338360),
+ TOBN(0x483ff593, 0x28edf32b),
+ TOBN(0x67e8e90a, 0x298b1aec),
+ TOBN(0x9caab338, 0x736d9a21),
+ TOBN(0x5c09d2fd, 0x66892709),
+ TOBN(0x2496b4dc, 0xb55a1d41),
+ TOBN(0x93f5fb1a, 0xe24a4394),
+ TOBN(0x08c75049, 0x6fa8f6c1),
+ TOBN(0xcaead1c2, 0xc905d85f),
+ TOBN(0xe9d7f790, 0x0733ae57),
+ TOBN(0x24c9a65c, 0xf07cdd94),
+ TOBN(0x7389359c, 0xa4b55931),
+ TOBN(0xf58709b7, 0x367e45f7),
+ TOBN(0x1f203067, 0xcb7e7adc),
+ TOBN(0x82444bff, 0xc7b72818),
+ TOBN(0x07303b35, 0xbaac8033),
+ TOBN(0x1e1ee4e4, 0xd13b7ea1),
+ TOBN(0xe6489b24, 0xe0e74180),
+ TOBN(0xa5f2c610, 0x7e70ef70),
+ TOBN(0xa1655412, 0xbdd10894),
+ TOBN(0x555ebefb, 0x7af4194e),
+ TOBN(0x533c1c3c, 0x8e89bd9c),
+ TOBN(0x735b9b57, 0x89895856),
+ TOBN(0x15fb3cd2, 0x567f5c15),
+ TOBN(0x057fed45, 0x526f09fd),
+ TOBN(0xe8a4f10c, 0x8128240a),
+ TOBN(0x9332efc4, 0xff2bfd8d),
+ TOBN(0x214e77a0, 0xbd35aa31),
+ TOBN(0x32896d73, 0x14faa40e),
+ TOBN(0x767867ec, 0x01e5f186),
+ TOBN(0xc9adf8f1, 0x17a1813e),
+ TOBN(0xcb6cda78, 0x54741795),
+ TOBN(0xb7521b6d, 0x349d51aa),
+ TOBN(0xf56b5a9e, 0xe3c7b8e9),
+ TOBN(0xc6f1e5c9, 0x32a096df),
+ TOBN(0x083667c4, 0xa3635024),
+ TOBN(0x365ea135, 0x18087f2f),
+ TOBN(0xf1b8eaac, 0xd136e45d),
+ TOBN(0xc8a0e484, 0x73aec989),
+ TOBN(0xd75a324b, 0x142c9259),
+ TOBN(0xb7b4d001, 0x01dae185),
+ TOBN(0x45434e0b, 0x9b7a94bc),
+ TOBN(0xf54339af, 0xfbd8cb0b),
+ TOBN(0xdcc4569e, 0xe98ef49e),
+ TOBN(0x7789318a, 0x09a51299),
+ TOBN(0x81b4d206, 0xb2b025d8),
+ TOBN(0xf64aa418, 0xfae85792),
+ TOBN(0x3e50258f, 0xacd7baf7),
+ TOBN(0xdce84cdb, 0x2996864b),
+ TOBN(0xa2e67089, 0x1f485fa4),
+ TOBN(0xb28b2bb6, 0x534c6a5a),
+ TOBN(0x31a7ec6b, 0xc94b9d39),
+ TOBN(0x1d217766, 0xd6bc20da),
+ TOBN(0x4acdb5ec, 0x86761190),
+ TOBN(0x68726328, 0x73701063),
+ TOBN(0x4d24ee7c, 0x2128c29b),
+ TOBN(0xc072ebd3, 0xa19fd868),
+ TOBN(0x612e481c, 0xdb8ddd3b),
+ TOBN(0xb4e1d754, 0x1a64d852),
+ TOBN(0x00ef95ac, 0xc4c6c4ab),
+ TOBN(0x1536d2ed, 0xaa0a6c46),
+ TOBN(0x61294086, 0x43774790),
+ TOBN(0x54af25e8, 0x343fda10),
+ TOBN(0x9ff9d98d, 0xfd25d6f2),
+ TOBN(0x0746af7c, 0x468b8835),
+ TOBN(0x977a31cb, 0x730ecea7),
+ TOBN(0xa5096b80, 0xc2cf4a81),
+ TOBN(0xaa986833, 0x6458c37a),
+ TOBN(0x6af29bf3, 0xa6bd9d34),
+ TOBN(0x6a62fe9b, 0x33c5d854),
+ TOBN(0x50e6c304, 0xb7133b5e),
+ TOBN(0x04b60159, 0x7d6e6848),
+ TOBN(0x4cd296df, 0x5579bea4),
+ TOBN(0x10e35ac8, 0x5ceedaf1),
+ TOBN(0x04c4c5fd, 0xe3bcc5b1),
+ TOBN(0x95f9ee8a, 0x89412cf9),
+ TOBN(0x2c9459ee, 0x82b6eb0f),
+ TOBN(0x2e845765, 0x95c2aadd),
+ TOBN(0x774a84ae, 0xd327fcfe),
+ TOBN(0xd8c93722, 0x0368d476),
+ TOBN(0x0dbd5748, 0xf83e8a3b),
+ TOBN(0xa579aa96, 0x8d2495f3),
+ TOBN(0x535996a0, 0xae496e9b),
+ TOBN(0x07afbfe9, 0xb7f9bcc2),
+ TOBN(0x3ac1dc6d, 0x5b7bd293),
+ TOBN(0x3b592cff, 0x7022323d),
+ TOBN(0xba0deb98, 0x9c0a3e76),
+ TOBN(0x18e78e9f, 0x4b197acb),
+ TOBN(0x211cde10, 0x296c36ef),
+ TOBN(0x7ee89672, 0x82c4da77),
+ TOBN(0xb617d270, 0xa57836da),
+ TOBN(0xf0cd9c31, 0x9cb7560b),
+ TOBN(0x01fdcbf7, 0xe455fe90),
+ TOBN(0x3fb53cbb, 0x7e7334f3),
+ TOBN(0x781e2ea4, 0x4e7de4ec),
+ TOBN(0x8adab3ad, 0x0b384fd0),
+ TOBN(0x129eee2f, 0x53d64829),
+ TOBN(0x7a471e17, 0xa261492b),
+ TOBN(0xe4f9adb9, 0xe4cb4a2c),
+ TOBN(0x3d359f6f, 0x97ba2c2d),
+ TOBN(0x346c6786, 0x0aacd697),
+ TOBN(0x92b444c3, 0x75c2f8a8),
+ TOBN(0xc79fa117, 0xd85df44e),
+ TOBN(0x56782372, 0x398ddf31),
+ TOBN(0x60e690f2, 0xbbbab3b8),
+ TOBN(0x4851f8ae, 0x8b04816b),
+ TOBN(0xc72046ab, 0x9c92e4d2),
+ TOBN(0x518c74a1, 0x7cf3136b),
+ TOBN(0xff4eb50a, 0xf9877d4c),
+ TOBN(0x14578d90, 0xa919cabb),
+ TOBN(0x8218f8c4, 0xac5eb2b6),
+ TOBN(0xa3ccc547, 0x542016e4),
+ TOBN(0x025bf48e, 0x327f8349),
+ TOBN(0xf3e97346, 0xf43cb641),
+ TOBN(0xdc2bafdf, 0x500f1085),
+ TOBN(0x57167876, 0x2f063055),
+ TOBN(0x5bd914b9, 0x411925a6),
+ TOBN(0x7c078d48, 0xa1123de5),
+ TOBN(0xee6bf835, 0x182b165d),
+ TOBN(0xb11b5e5b, 0xba519727),
+ TOBN(0xe33ea76c, 0x1eea7b85),
+ TOBN(0x2352b461, 0x92d4f85e),
+ TOBN(0xf101d334, 0xafe115bb),
+ TOBN(0xfabc1294, 0x889175a3),
+ TOBN(0x7f6bcdc0, 0x5233f925),
+ TOBN(0xe0a802db, 0xe77fec55),
+ TOBN(0xbdb47b75, 0x8069b659),
+ TOBN(0x1c5e12de, 0xf98fbd74),
+ TOBN(0x869c58c6, 0x4b8457ee),
+ TOBN(0xa5360f69, 0x4f7ea9f7),
+ TOBN(0xe576c09f, 0xf460b38f),
+ TOBN(0x6b70d548, 0x22b7fb36),
+ TOBN(0x3fd237f1, 0x3bfae315),
+ TOBN(0x33797852, 0xcbdff369),
+ TOBN(0x97df25f5, 0x25b516f9),
+ TOBN(0x46f388f2, 0xba38ad2d),
+ TOBN(0x656c4658, 0x89d8ddbb),
+ TOBN(0x8830b26e, 0x70f38ee8),
+ TOBN(0x4320fd5c, 0xde1212b0),
+ TOBN(0xc34f30cf, 0xe4a2edb2),
+ TOBN(0xabb131a3, 0x56ab64b8),
+ TOBN(0x7f77f0cc, 0xd99c5d26),
+ TOBN(0x66856a37, 0xbf981d94),
+ TOBN(0x19e76d09, 0x738bd76e),
+ TOBN(0xe76c8ac3, 0x96238f39),
+ TOBN(0xc0a482be, 0xa830b366),
+ TOBN(0xb7b8eaff, 0x0b4eb499),
+ TOBN(0x8ecd83bc, 0x4bfb4865),
+ TOBN(0x971b2cb7, 0xa2f3776f),
+ TOBN(0xb42176a4, 0xf4b88adf),
+ TOBN(0xb9617df5, 0xbe1fa446),
+ TOBN(0x8b32d508, 0xcd031bd2),
+ TOBN(0x1c6bd47d, 0x53b618c0),
+ TOBN(0xc424f46c, 0x6a227923),
+ TOBN(0x7303ffde, 0xdd92d964),
+ TOBN(0xe9712878, 0x71b5abf2),
+ TOBN(0x8f48a632, 0xf815561d),
+ TOBN(0x85f48ff5, 0xd3c055d1),
+ TOBN(0x222a1427, 0x7525684f),
+ TOBN(0xd0d841a0, 0x67360cc3),
+ TOBN(0x4245a926, 0x0b9267c6),
+ TOBN(0xc78913f1, 0xcf07f863),
+ TOBN(0xaa844c8e, 0x4d0d9e24),
+ TOBN(0xa42ad522, 0x3d5f9017),
+ TOBN(0xbd371749, 0xa2c989d5),
+ TOBN(0x928292df, 0xe1f5e78e),
+ TOBN(0x493b383e, 0x0a1ea6da),
+ TOBN(0x5136fd8d, 0x13aee529),
+ TOBN(0x860c44b1, 0xf2c34a99),
+ TOBN(0x3b00aca4, 0xbf5855ac),
+ TOBN(0xabf6aaa0, 0xfaaf37be),
+ TOBN(0x65f43682, 0x2a53ec08),
+ TOBN(0x1d9a5801, 0xa11b12e1),
+ TOBN(0x78a7ab2c, 0xe20ed475),
+ TOBN(0x0de1067e, 0x9a41e0d5),
+ TOBN(0x30473f5f, 0x305023ea),
+ TOBN(0xdd3ae09d, 0x169c7d97),
+ TOBN(0x5cd5baa4, 0xcfaef9cd),
+ TOBN(0x5cd7440b, 0x65a44803),
+ TOBN(0xdc13966a, 0x47f364de),
+ TOBN(0x077b2be8, 0x2b8357c1),
+ TOBN(0x0cb1b4c5, 0xe9d57c2a),
+ TOBN(0x7a4ceb32, 0x05ff363e),
+ TOBN(0xf310fa4d, 0xca35a9ef),
+ TOBN(0xdbb7b352, 0xf97f68c6),
+ TOBN(0x0c773b50, 0x0b02cf58),
+ TOBN(0xea2e4821, 0x3c1f96d9),
+ TOBN(0xffb357b0, 0xeee01815),
+ TOBN(0xb9c924cd, 0xe0f28039),
+ TOBN(0x0b36c95a, 0x46a3fbe4),
+ TOBN(0x1faaaea4, 0x5e46db6c),
+ TOBN(0xcae575c3, 0x1928aaff),
+ TOBN(0x7f671302, 0xa70dab86),
+ TOBN(0xfcbd12a9, 0x71c58cfc),
+ TOBN(0xcbef9acf, 0xbee0cb92),
+ TOBN(0x573da0b9, 0xf8c1b583),
+ TOBN(0x4752fcfe, 0x0d41d550),
+ TOBN(0xe7eec0e3, 0x2155cffe),
+ TOBN(0x0fc39fcb, 0x545ae248),
+ TOBN(0x522cb8d1, 0x8065f44e),
+ TOBN(0x263c962a, 0x70cbb96c),
+ TOBN(0xe034362a, 0xbcd124a9),
+ TOBN(0xf120db28, 0x3c2ae58d),
+ TOBN(0xb9a38d49, 0xfef6d507),
+ TOBN(0xb1fd2a82, 0x1ff140fd),
+ TOBN(0xbd162f30, 0x20aee7e0),
+ TOBN(0x4e17a5d4, 0xcb251949),
+ TOBN(0x2aebcb83, 0x4f7e1c3d),
+ TOBN(0x608eb25f, 0x937b0527),
+ TOBN(0xf42e1e47, 0xeb7d9997),
+ TOBN(0xeba699c4, 0xb8a53a29),
+ TOBN(0x1f921c71, 0xe091b536),
+ TOBN(0xcce29e7b, 0x5b26bbd5),
+ TOBN(0x7a8ef5ed, 0x3b61a680),
+ TOBN(0xe5ef8043, 0xba1f1c7e),
+ TOBN(0x16ea8217, 0x18158dda),
+ TOBN(0x01778a2b, 0x599ff0f9),
+ TOBN(0x68a923d7, 0x8104fc6b),
+ TOBN(0x5bfa44df, 0xda694ff3),
+ TOBN(0x4f7199db, 0xf7667f12),
+ TOBN(0xc06d8ff6, 0xe46f2a79),
+ TOBN(0x08b5dead, 0xe9f8131d),
+ TOBN(0x02519a59, 0xabb4ce7c),
+ TOBN(0xc4f710bc, 0xb42aec3e),
+ TOBN(0x3d77b057, 0x78bde41a),
+ TOBN(0x6474bf80, 0xb4186b5a),
+ TOBN(0x048b3f67, 0x88c65741),
+ TOBN(0xc64519de, 0x03c7c154),
+ TOBN(0xdf073846, 0x0edfcc4f),
+ TOBN(0x319aa737, 0x48f1aa6b),
+ TOBN(0x8b9f8a02, 0xca909f77),
+ TOBN(0x90258139, 0x7580bfef),
+ TOBN(0xd8bfd3ca, 0xc0c22719),
+ TOBN(0xc60209e4, 0xc9ca151e),
+ TOBN(0x7a744ab5, 0xd9a1a69c),
+ TOBN(0x6de5048b, 0x14937f8f),
+ TOBN(0x171938d8, 0xe115ac04),
+ TOBN(0x7df70940, 0x1c6b16d2),
+ TOBN(0xa6aeb663, 0x7f8e94e7),
+ TOBN(0xc130388e, 0x2a2cf094),
+ TOBN(0x1850be84, 0x77f54e6e),
+ TOBN(0x9f258a72, 0x65d60fe5),
+ TOBN(0xff7ff0c0, 0x6c9146d6),
+ TOBN(0x039aaf90, 0xe63a830b),
+ TOBN(0x38f27a73, 0x9460342f),
+ TOBN(0x4703148c, 0x3f795f8a),
+ TOBN(0x1bb5467b, 0x9681a97e),
+ TOBN(0x00931ba5, 0xecaeb594),
+ TOBN(0xcdb6719d, 0x786f337c),
+ TOBN(0xd9c01cd2, 0xe704397d),
+ TOBN(0x0f4a3f20, 0x555c2fef),
+ TOBN(0x00452509, 0x7c0af223),
+ TOBN(0x54a58047, 0x84db8e76),
+ TOBN(0x3bacf1aa, 0x93c8aa06),
+ TOBN(0x11ca957c, 0xf7919422),
+ TOBN(0x50641053, 0x78cdaa40),
+ TOBN(0x7a303874, 0x9f7144ae),
+ TOBN(0x170c963f, 0x43d4acfd),
+ TOBN(0x5e148149, 0x58ddd3ef),
+ TOBN(0xa7bde582, 0x9e72dba8),
+ TOBN(0x0769da8b, 0x6fa68750),
+ TOBN(0xfa64e532, 0x572e0249),
+ TOBN(0xfcaadf9d, 0x2619ad31),
+ TOBN(0x87882daa, 0xa7b349cd),
+ TOBN(0x9f6eb731, 0x6c67a775),
+ TOBN(0xcb10471a, 0xefc5d0b1),
+ TOBN(0xb433750c, 0xe1b806b2),
+ TOBN(0x19c5714d, 0x57b1ae7e),
+ TOBN(0xc0dc8b7b, 0xed03fd3f),
+ TOBN(0xdd03344f, 0x31bc194e),
+ TOBN(0xa66c52a7, 0x8c6320b5),
+ TOBN(0x8bc82ce3, 0xd0b6fd93),
+ TOBN(0xf8e13501, 0xb35f1341),
+ TOBN(0xe53156dd, 0x25a43e42),
+ TOBN(0xd3adf27e, 0x4daeb85c),
+ TOBN(0xb81d8379, 0xbbeddeb5),
+ TOBN(0x1b0b546e, 0x2e435867),
+ TOBN(0x9020eb94, 0xeba5dd60),
+ TOBN(0x37d91161, 0x8210cb9d),
+ TOBN(0x4c596b31, 0x5c91f1cf),
+ TOBN(0xb228a90f, 0x0e0b040d),
+ TOBN(0xbaf02d82, 0x45ff897f),
+ TOBN(0x2aac79e6, 0x00fa6122),
+ TOBN(0x24828817, 0x8e36f557),
+ TOBN(0xb9521d31, 0x113ec356),
+ TOBN(0x9e48861e, 0x15eff1f8),
+ TOBN(0x2aa1d412, 0xe0d41715),
+ TOBN(0x71f86203, 0x53f131b8),
+ TOBN(0xf60da8da, 0x3fd19408),
+ TOBN(0x4aa716dc, 0x278d9d99),
+ TOBN(0x394531f7, 0xa8c51c90),
+ TOBN(0xb560b0e8, 0xf59db51c),
+ TOBN(0xa28fc992, 0xfa34bdad),
+ TOBN(0xf024fa14, 0x9cd4f8bd),
+ TOBN(0x5cf530f7, 0x23a9d0d3),
+ TOBN(0x615ca193, 0xe28c9b56),
+ TOBN(0x6d2a483d, 0x6f73c51e),
+ TOBN(0xa4cb2412, 0xea0dc2dd),
+ TOBN(0x50663c41, 0x1eb917ff),
+ TOBN(0x3d3a74cf, 0xeade299e),
+ TOBN(0x29b3990f, 0x4a7a9202),
+ TOBN(0xa9bccf59, 0xa7b15c3d),
+ TOBN(0x66a3ccdc, 0xa5df9208),
+ TOBN(0x48027c14, 0x43f2f929),
+ TOBN(0xd385377c, 0x40b557f0),
+ TOBN(0xe001c366, 0xcd684660),
+ TOBN(0x1b18ed6b, 0xe2183a27),
+ TOBN(0x879738d8, 0x63210329),
+ TOBN(0xa687c74b, 0xbda94882),
+ TOBN(0xd1bbcc48, 0xa684b299),
+ TOBN(0xaf6f1112, 0x863b3724),
+ TOBN(0x6943d1b4, 0x2c8ce9f8),
+ TOBN(0xe044a3bb, 0x098cafb4),
+ TOBN(0x27ed2310, 0x60d48caf),
+ TOBN(0x542b5675, 0x3a31b84d),
+ TOBN(0xcbf3dd50, 0xfcddbed7),
+ TOBN(0x25031f16, 0x41b1d830),
+ TOBN(0xa7ec851d, 0xcb0c1e27),
+ TOBN(0xac1c8fe0, 0xb5ae75db),
+ TOBN(0xb24c7557, 0x08c52120),
+ TOBN(0x57f811dc, 0x1d4636c3),
+ TOBN(0xf8436526, 0x681a9939),
+ TOBN(0x1f6bc6d9, 0x9c81adb3),
+ TOBN(0x840f8ac3, 0x5b7d80d4),
+ TOBN(0x731a9811, 0xf4387f1a),
+ TOBN(0x7c501cd3, 0xb5156880),
+ TOBN(0xa5ca4a07, 0xdfe68867),
+ TOBN(0xf123d8f0, 0x5fcea120),
+ TOBN(0x1fbb0e71, 0xd607039e),
+ TOBN(0x2b70e215, 0xcd3a4546),
+ TOBN(0x32d2f01d, 0x53324091),
+ TOBN(0xb796ff08, 0x180ab19b),
+ TOBN(0x32d87a86, 0x3c57c4aa),
+ TOBN(0x2aed9caf, 0xb7c49a27),
+ TOBN(0x9fb35eac, 0x31630d98),
+ TOBN(0x338e8cdf, 0x5c3e20a3),
+ TOBN(0x80f16182, 0x66cde8db),
+ TOBN(0x4e159980, 0x2d72fd36),
+ TOBN(0xd7b8f13b, 0x9b6e5072),
+ TOBN(0xf5213907, 0x3b7b5dc1),
+ TOBN(0x4d431f1d, 0x8ce4396e),
+ TOBN(0x37a1a680, 0xa7ed2142),
+ TOBN(0xbf375696, 0xd01aaf6b),
+ TOBN(0xaa1c0c54, 0xe63aab66),
+ TOBN(0x3014368b, 0x4ed80940),
+ TOBN(0x67e6d056, 0x7a6fcedd),
+ TOBN(0x7c208c49, 0xca97579f),
+ TOBN(0xfe3d7a81, 0xa23597f6),
+ TOBN(0x5e203202, 0x7e096ae2),
+ TOBN(0xb1f3e1e7, 0x24b39366),
+ TOBN(0x26da26f3, 0x2fdcdffc),
+ TOBN(0x79422f1d, 0x6097be83),
+ },
+ {
+ TOBN(0x263a2cfb, 0x9db3b381),
+ TOBN(0x9c3a2dee, 0xd4df0a4b),
+ TOBN(0x728d06e9, 0x7d04e61f),
+ TOBN(0x8b1adfbc, 0x42449325),
+ TOBN(0x6ec1d939, 0x7e053a1b),
+ TOBN(0xee2be5c7, 0x66daf707),
+ TOBN(0x80ba1e14, 0x810ac7ab),
+ TOBN(0xdd2ae778, 0xf530f174),
+ TOBN(0x0435d97a, 0x205b9d8b),
+ TOBN(0x6eb8f064, 0x056756d4),
+ TOBN(0xd5e88a8b, 0xb6f8210e),
+ TOBN(0x070ef12d, 0xec9fd9ea),
+ TOBN(0x4d849505, 0x3bcc876a),
+ TOBN(0x12a75338, 0xa7404ce3),
+ TOBN(0xd22b49e1, 0xb8a1db5e),
+ TOBN(0xec1f2051, 0x14bfa5ad),
+ TOBN(0xadbaeb79, 0xb6828f36),
+ TOBN(0x9d7a0258, 0x01bd5b9e),
+ TOBN(0xeda01e0d, 0x1e844b0c),
+ TOBN(0x4b625175, 0x887edfc9),
+ TOBN(0x14109fdd, 0x9669b621),
+ TOBN(0x88a2ca56, 0xf6f87b98),
+ TOBN(0xfe2eb788, 0x170df6bc),
+ TOBN(0x0cea06f4, 0xffa473f9),
+ TOBN(0x43ed81b5, 0xc4e83d33),
+ TOBN(0xd9f35879, 0x5efd488b),
+ TOBN(0x164a620f, 0x9deb4d0f),
+ TOBN(0xc6927bdb, 0xac6a7394),
+ TOBN(0x45c28df7, 0x9f9e0f03),
+ TOBN(0x2868661e, 0xfcd7e1a9),
+ TOBN(0x7cf4e8d0, 0xffa348f1),
+ TOBN(0x6bd4c284, 0x398538e0),
+ TOBN(0x2618a091, 0x289a8619),
+ TOBN(0xef796e60, 0x6671b173),
+ TOBN(0x664e46e5, 0x9090c632),
+ TOBN(0xa38062d4, 0x1e66f8fb),
+ TOBN(0x6c744a20, 0x0573274e),
+ TOBN(0xd07b67e4, 0xa9271394),
+ TOBN(0x391223b2, 0x6bdc0e20),
+ TOBN(0xbe2d93f1, 0xeb0a05a7),
+ TOBN(0xf23e2e53, 0x3f36d141),
+ TOBN(0xe84bb3d4, 0x4dfca442),
+ TOBN(0xb804a48d, 0x6b7c023a),
+ TOBN(0x1e16a8fa, 0x76431c3b),
+ TOBN(0x1b5452ad, 0xddd472e0),
+ TOBN(0x7d405ee7, 0x0d1ee127),
+ TOBN(0x50fc6f1d, 0xffa27599),
+ TOBN(0x351ac53c, 0xbf391b35),
+ TOBN(0x7efa14b8, 0x4444896b),
+ TOBN(0x64974d2f, 0xf94027fb),
+ TOBN(0xefdcd0e8, 0xde84487d),
+ TOBN(0x8c45b260, 0x2b48989b),
+ TOBN(0xa8fcbbc2, 0xd8463487),
+ TOBN(0xd1b2b3f7, 0x3fbc476c),
+ TOBN(0x21d005b7, 0xc8f443c0),
+ TOBN(0x518f2e67, 0x40c0139c),
+ TOBN(0x56036e8c, 0x06d75fc1),
+ TOBN(0x2dcf7bb7, 0x3249a89f),
+ TOBN(0x81dd1d3d, 0xe245e7dd),
+ TOBN(0xf578dc4b, 0xebd6e2a7),
+ TOBN(0x4c028903, 0xdf2ce7a0),
+ TOBN(0xaee36288, 0x9c39afac),
+ TOBN(0xdc847c31, 0x146404ab),
+ TOBN(0x6304c0d8, 0xa4e97818),
+ TOBN(0xae51dca2, 0xa91f6791),
+ TOBN(0x2abe4190, 0x9baa9efc),
+ TOBN(0xd9d2e2f4, 0x559c7ac1),
+ TOBN(0xe82f4b51, 0xfc9f773a),
+ TOBN(0xa7713027, 0x4073e81c),
+ TOBN(0xc0276fac, 0xfbb596fc),
+ TOBN(0x1d819fc9, 0xa684f70c),
+ TOBN(0x29b47fdd, 0xc9f7b1e0),
+ TOBN(0x358de103, 0x459b1940),
+ TOBN(0xec881c59, 0x5b013e93),
+ TOBN(0x51574c93, 0x49532ad3),
+ TOBN(0x2db1d445, 0xb37b46de),
+ TOBN(0xc6445b87, 0xdf239fd8),
+ TOBN(0xc718af75, 0x151d24ee),
+ TOBN(0xaea1c4a4, 0xf43c6259),
+ TOBN(0x40c0e5d7, 0x70be02f7),
+ TOBN(0x6a4590f4, 0x721b33f2),
+ TOBN(0x2124f1fb, 0xfedf04ea),
+ TOBN(0xf8e53cde, 0x9745efe7),
+ TOBN(0xe7e10432, 0x65f046d9),
+ TOBN(0xc3fca28e, 0xe4d0c7e6),
+ TOBN(0x847e339a, 0x87253b1b),
+ TOBN(0x9b595348, 0x3743e643),
+ TOBN(0xcb6a0a0b, 0x4fd12fc5),
+ TOBN(0xfb6836c3, 0x27d02dcc),
+ TOBN(0x5ad00982, 0x7a68bcc2),
+ TOBN(0x1b24b44c, 0x005e912d),
+ TOBN(0xcc83d20f, 0x811fdcfe),
+ TOBN(0x36527ec1, 0x666fba0c),
+ TOBN(0x69948197, 0x14754635),
+ TOBN(0xfcdcb1a8, 0x556da9c2),
+ TOBN(0xa5934267, 0x81a732b2),
+ TOBN(0xec1214ed, 0xa714181d),
+ TOBN(0x609ac13b, 0x6067b341),
+ TOBN(0xff4b4c97, 0xa545df1f),
+ TOBN(0xa1240501, 0x34d2076b),
+ TOBN(0x6efa0c23, 0x1409ca97),
+ TOBN(0x254cc1a8, 0x20638c43),
+ TOBN(0xd4e363af, 0xdcfb46cd),
+ TOBN(0x62c2adc3, 0x03942a27),
+ TOBN(0xc67b9df0, 0x56e46483),
+ TOBN(0xa55abb20, 0x63736356),
+ TOBN(0xab93c098, 0xc551bc52),
+ TOBN(0x382b49f9, 0xb15fe64b),
+ TOBN(0x9ec221ad, 0x4dff8d47),
+ TOBN(0x79caf615, 0x437df4d6),
+ TOBN(0x5f13dc64, 0xbb456509),
+ TOBN(0xe4c589d9, 0x191f0714),
+ TOBN(0x27b6a8ab, 0x3fd40e09),
+ TOBN(0xe455842e, 0x77313ea9),
+ TOBN(0x8b51d1e2, 0x1f55988b),
+ TOBN(0x5716dd73, 0x062bbbfc),
+ TOBN(0x633c11e5, 0x4e8bf3de),
+ TOBN(0x9a0e77b6, 0x1b85be3b),
+ TOBN(0x56510729, 0x0911cca6),
+ TOBN(0x27e76495, 0xefa6590f),
+ TOBN(0xe4ac8b33, 0x070d3aab),
+ TOBN(0x2643672b, 0x9a2cd5e5),
+ TOBN(0x52eff79b, 0x1cfc9173),
+ TOBN(0x665ca49b, 0x90a7c13f),
+ TOBN(0x5a8dda59, 0xb3efb998),
+ TOBN(0x8a5b922d, 0x052f1341),
+ TOBN(0xae9ebbab, 0x3cf9a530),
+ TOBN(0x35986e7b, 0xf56da4d7),
+ TOBN(0x3a636b5c, 0xff3513cc),
+ TOBN(0xbb0cf8ba, 0x3198f7dd),
+ TOBN(0xb8d40522, 0x41f16f86),
+ TOBN(0x760575d8, 0xde13a7bf),
+ TOBN(0x36f74e16, 0x9f7aa181),
+ TOBN(0x163a3ecf, 0xf509ed1c),
+ TOBN(0x6aead61f, 0x3c40a491),
+ TOBN(0x158c95fc, 0xdfe8fcaa),
+ TOBN(0xa3991b6e, 0x13cda46f),
+ TOBN(0x79482415, 0x342faed0),
+ TOBN(0xf3ba5bde, 0x666b5970),
+ TOBN(0x1d52e6bc, 0xb26ab6dd),
+ TOBN(0x768ba1e7, 0x8608dd3d),
+ TOBN(0x4930db2a, 0xea076586),
+ TOBN(0xd9575714, 0xe7dc1afa),
+ TOBN(0x1fc7bf7d, 0xf7c58817),
+ TOBN(0x6b47accd, 0xd9eee96c),
+ TOBN(0x0ca277fb, 0xe58cec37),
+ TOBN(0x113fe413, 0xe702c42a),
+ TOBN(0xdd1764ee, 0xc47cbe51),
+ TOBN(0x041e7cde, 0x7b3ed739),
+ TOBN(0x50cb7459, 0x5ce9e1c0),
+ TOBN(0x35568513, 0x2925b212),
+ TOBN(0x7cff95c4, 0x001b081c),
+ TOBN(0x63ee4cbd, 0x8088b454),
+ TOBN(0xdb7f32f7, 0x9a9e0c8a),
+ TOBN(0xb377d418, 0x6b2447cb),
+ TOBN(0xe3e982aa, 0xd370219b),
+ TOBN(0x06ccc1e4, 0xc2a2a593),
+ TOBN(0x72c36865, 0x0773f24f),
+ TOBN(0xa13b4da7, 0x95859423),
+ TOBN(0x8bbf1d33, 0x75040c8f),
+ TOBN(0x726f0973, 0xda50c991),
+ TOBN(0x48afcd5b, 0x822d6ee2),
+ TOBN(0xe5fc718b, 0x20fd7771),
+ TOBN(0xb9e8e77d, 0xfd0807a1),
+ TOBN(0x7f5e0f44, 0x99a7703d),
+ TOBN(0x6972930e, 0x618e36f3),
+ TOBN(0x2b7c77b8, 0x23807bbe),
+ TOBN(0xe5b82405, 0xcb27ff50),
+ TOBN(0xba8b8be3, 0xbd379062),
+ TOBN(0xd64b7a1d, 0x2dce4a92),
+ TOBN(0x040a73c5, 0xb2952e37),
+ TOBN(0x0a9e252e, 0xd438aeca),
+ TOBN(0xdd43956b, 0xc39d3bcb),
+ TOBN(0x1a31ca00, 0xb32b2d63),
+ TOBN(0xd67133b8, 0x5c417a18),
+ TOBN(0xd08e4790, 0x2ef442c8),
+ TOBN(0x98cb1ae9, 0x255c0980),
+ TOBN(0x4bd86381, 0x2b4a739f),
+ TOBN(0x5a5c31e1, 0x1e4a45a1),
+ TOBN(0x1e5d55fe, 0x9cb0db2f),
+ TOBN(0x74661b06, 0x8ff5cc29),
+ TOBN(0x026b389f, 0x0eb8a4f4),
+ TOBN(0x536b21a4, 0x58848c24),
+ TOBN(0x2e5bf8ec, 0x81dc72b0),
+ TOBN(0x03c187d0, 0xad886aac),
+ TOBN(0x5c16878a, 0xb771b645),
+ TOBN(0xb07dfc6f, 0xc74045ab),
+ TOBN(0x2c6360bf, 0x7800caed),
+ TOBN(0x24295bb5, 0xb9c972a3),
+ TOBN(0xc9e6f88e, 0x7c9a6dba),
+ TOBN(0x90ffbf24, 0x92a79aa6),
+ TOBN(0xde29d50a, 0x41c26ac2),
+ TOBN(0x9f0af483, 0xd309cbe6),
+ TOBN(0x5b020d8a, 0xe0bced4f),
+ TOBN(0x606e986d, 0xb38023e3),
+ TOBN(0xad8f2c9d, 0x1abc6933),
+ TOBN(0x19292e1d, 0xe7400e93),
+ TOBN(0xfe3e18a9, 0x52be5e4d),
+ TOBN(0xe8e9771d, 0x2e0680bf),
+ TOBN(0x8c5bec98, 0xc54db063),
+ TOBN(0x2af9662a, 0x74a55d1f),
+ TOBN(0xe3fbf28f, 0x046f66d8),
+ TOBN(0xa3a72ab4, 0xd4dc4794),
+ TOBN(0x09779f45, 0x5c7c2dd8),
+ TOBN(0xd893bdaf, 0xc3d19d8d),
+ TOBN(0xd5a75094, 0x57d6a6df),
+ TOBN(0x8cf8fef9, 0x952e6255),
+ TOBN(0x3da67cfb, 0xda9a8aff),
+ TOBN(0x4c23f62a, 0x2c160dcd),
+ TOBN(0x34e6c5e3, 0x8f90eaef),
+ TOBN(0x35865519, 0xa9a65d5a),
+ TOBN(0x07c48aae, 0x8fd38a3d),
+ TOBN(0xb7e7aeda, 0x50068527),
+ TOBN(0x2c09ef23, 0x1c90936a),
+ TOBN(0x31ecfeb6, 0xe879324c),
+ TOBN(0xa0871f6b, 0xfb0ec938),
+ TOBN(0xb1f0fb68, 0xd84d835d),
+ TOBN(0xc90caf39, 0x861dc1e6),
+ TOBN(0x12e5b046, 0x7594f8d7),
+ TOBN(0x26897ae2, 0x65012b92),
+ TOBN(0xbcf68a08, 0xa4d6755d),
+ TOBN(0x403ee41c, 0x0991fbda),
+ TOBN(0x733e343e, 0x3bbf17e8),
+ TOBN(0xd2c7980d, 0x679b3d65),
+ TOBN(0x33056232, 0xd2e11305),
+ TOBN(0x966be492, 0xf3c07a6f),
+ TOBN(0x6a8878ff, 0xbb15509d),
+ TOBN(0xff221101, 0x0a9b59a4),
+ TOBN(0x6c9f564a, 0xabe30129),
+ TOBN(0xc6f2c940, 0x336e64cf),
+ TOBN(0x0fe75262, 0x8b0c8022),
+ TOBN(0xbe0267e9, 0x6ae8db87),
+ TOBN(0x22e192f1, 0x93bc042b),
+ TOBN(0xf085b534, 0xb237c458),
+ TOBN(0xa0d192bd, 0x832c4168),
+ TOBN(0x7a76e9e3, 0xbdf6271d),
+ TOBN(0x52a882fa, 0xb88911b5),
+ TOBN(0xc85345e4, 0xb4db0eb5),
+ TOBN(0xa3be02a6, 0x81a7c3ff),
+ TOBN(0x51889c8c, 0xf0ec0469),
+ TOBN(0x9d031369, 0xa5e829e5),
+ TOBN(0xcbb4c6fc, 0x1607aa41),
+ TOBN(0x75ac59a6, 0x241d84c1),
+ TOBN(0xc043f2bf, 0x8829e0ee),
+ TOBN(0x82a38f75, 0x8ea5e185),
+ TOBN(0x8bda40b9, 0xd87cbd9f),
+ TOBN(0x9e65e75e, 0x2d8fc601),
+ TOBN(0x3d515f74, 0xa35690b3),
+ TOBN(0x534acf4f, 0xda79e5ac),
+ TOBN(0x68b83b3a, 0x8630215f),
+ TOBN(0x5c748b2e, 0xd085756e),
+ TOBN(0xb0317258, 0xe5d37cb2),
+ TOBN(0x6735841a, 0xc5ccc2c4),
+ TOBN(0x7d7dc96b, 0x3d9d5069),
+ TOBN(0xa147e410, 0xfd1754bd),
+ TOBN(0x65296e94, 0xd399ddd5),
+ TOBN(0xf6b5b2d0, 0xbc8fa5bc),
+ TOBN(0x8a5ead67, 0x500c277b),
+ TOBN(0x214625e6, 0xdfa08a5d),
+ TOBN(0x51fdfedc, 0x959cf047),
+ TOBN(0x6bc9430b, 0x289fca32),
+ TOBN(0xe36ff0cf, 0x9d9bdc3f),
+ TOBN(0x2fe187cb, 0x58ea0ede),
+ TOBN(0xed66af20, 0x5a900b3f),
+ TOBN(0x00e0968b, 0x5fa9f4d6),
+ TOBN(0x2d4066ce, 0x37a362e7),
+ TOBN(0xa99a9748, 0xbd07e772),
+ TOBN(0x710989c0, 0x06a4f1d0),
+ TOBN(0xd5dedf35, 0xce40cbd8),
+ TOBN(0xab55c5f0, 0x1743293d),
+ TOBN(0x766f1144, 0x8aa24e2c),
+ TOBN(0x94d874f8, 0x605fbcb4),
+ TOBN(0xa365f0e8, 0xa518001b),
+ TOBN(0xee605eb6, 0x9d04ef0f),
+ TOBN(0x5a3915cd, 0xba8d4d25),
+ TOBN(0x44c0e1b8, 0xb5113472),
+ TOBN(0xcbb024e8, 0x8b6740dc),
+ TOBN(0x89087a53, 0xee1d4f0c),
+ TOBN(0xa88fa05c, 0x1fc4e372),
+ TOBN(0x8bf395cb, 0xaf8b3af2),
+ TOBN(0x1e71c9a1, 0xdeb8568b),
+ TOBN(0xa35daea0, 0x80fb3d32),
+ TOBN(0xe8b6f266, 0x2cf8fb81),
+ TOBN(0x6d51afe8, 0x9490696a),
+ TOBN(0x81beac6e, 0x51803a19),
+ TOBN(0xe3d24b7f, 0x86219080),
+ TOBN(0x727cfd9d, 0xdf6f463c),
+ TOBN(0x8c6865ca, 0x72284ee8),
+ TOBN(0x32c88b7d, 0xb743f4ef),
+ TOBN(0x3793909b, 0xe7d11dce),
+ TOBN(0xd398f922, 0x2ff2ebe8),
+ TOBN(0x2c70ca44, 0xe5e49796),
+ TOBN(0xdf4d9929, 0xcb1131b1),
+ TOBN(0x7826f298, 0x25888e79),
+ TOBN(0x4d3a112c, 0xf1d8740a),
+ TOBN(0x00384cb6, 0x270afa8b),
+ TOBN(0xcb64125b, 0x3ab48095),
+ TOBN(0x3451c256, 0x62d05106),
+ TOBN(0xd73d577d, 0xa4955845),
+ TOBN(0x39570c16, 0xbf9f4433),
+ TOBN(0xd7dfaad3, 0xadecf263),
+ TOBN(0xf1c3d8d1, 0xdc76e102),
+ TOBN(0x5e774a58, 0x54c6a836),
+ TOBN(0xdad4b672, 0x3e92d47b),
+ TOBN(0xbe7e990f, 0xf0d796a0),
+ TOBN(0x5fc62478, 0xdf0e8b02),
+ TOBN(0x8aae8bf4, 0x030c00ad),
+ TOBN(0x3d2db93b, 0x9004ba0f),
+ TOBN(0xe48c8a79, 0xd85d5ddc),
+ TOBN(0xe907caa7, 0x6bb07f34),
+ TOBN(0x58db343a, 0xa39eaed5),
+ TOBN(0x0ea6e007, 0xadaf5724),
+ TOBN(0xe00df169, 0xd23233f3),
+ TOBN(0x3e322796, 0x77cb637f),
+ TOBN(0x1f897c0e, 0x1da0cf6c),
+ TOBN(0xa651f5d8, 0x31d6bbdd),
+ TOBN(0xdd61af19, 0x1a230c76),
+ TOBN(0xbd527272, 0xcdaa5e4a),
+ TOBN(0xca753636, 0xd0abcd7e),
+ TOBN(0x78bdd37c, 0x370bd8dc),
+ TOBN(0xc23916c2, 0x17cd93fe),
+ TOBN(0x65b97a4d, 0xdadce6e2),
+ TOBN(0xe04ed4eb, 0x174e42f8),
+ TOBN(0x1491ccaa, 0xbb21480a),
+ TOBN(0x145a8280, 0x23196332),
+ TOBN(0x3c3862d7, 0x587b479a),
+ TOBN(0x9f4a88a3, 0x01dcd0ed),
+ TOBN(0x4da2b7ef, 0x3ea12f1f),
+ TOBN(0xf8e7ae33, 0xb126e48e),
+ TOBN(0x404a0b32, 0xf494e237),
+ TOBN(0x9beac474, 0xc55acadb),
+ TOBN(0x4ee5cf3b, 0xcbec9fd9),
+ TOBN(0x336b33b9, 0x7df3c8c3),
+ TOBN(0xbd905fe3, 0xb76808fd),
+ TOBN(0x8f436981, 0xaa45c16a),
+ TOBN(0x255c5bfa, 0x3dd27b62),
+ TOBN(0x71965cbf, 0xc3dd9b4d),
+ TOBN(0xce23edbf, 0xfc068a87),
+ TOBN(0xb78d4725, 0x745b029b),
+ TOBN(0x74610713, 0xcefdd9bd),
+ TOBN(0x7116f75f, 0x1266bf52),
+ TOBN(0x02046722, 0x18e49bb6),
+ TOBN(0xdf43df9f, 0x3d6f19e3),
+ TOBN(0xef1bc7d0, 0xe685cb2f),
+ TOBN(0xcddb27c1, 0x7078c432),
+ TOBN(0xe1961b9c, 0xb77fedb7),
+ TOBN(0x1edc2f5c, 0xc2290570),
+ TOBN(0x2c3fefca, 0x19cbd886),
+ TOBN(0xcf880a36, 0xc2af389a),
+ TOBN(0x96c610fd, 0xbda71cea),
+ TOBN(0xf03977a9, 0x32aa8463),
+ TOBN(0x8eb7763f, 0x8586d90a),
+ TOBN(0x3f342454, 0x2a296e77),
+ TOBN(0xc8718683, 0x42837a35),
+ TOBN(0x7dc71090, 0x6a09c731),
+ TOBN(0x54778ffb, 0x51b816db),
+ TOBN(0x6b33bfec, 0xaf06defd),
+ TOBN(0xfe3c105f, 0x8592b70b),
+ TOBN(0xf937fda4, 0x61da6114),
+ TOBN(0x3c13e651, 0x4c266ad7),
+ TOBN(0xe363a829, 0x855938e8),
+ TOBN(0x2eeb5d9e, 0x9de54b72),
+ TOBN(0xbeb93b0e, 0x20ccfab9),
+ TOBN(0x3dffbb5f, 0x25e61a25),
+ TOBN(0x7f655e43, 0x1acc093d),
+ TOBN(0x0cb6cc3d, 0x3964ce61),
+ TOBN(0x6ab283a1, 0xe5e9b460),
+ TOBN(0x55d787c5, 0xa1c7e72d),
+ TOBN(0x4d2efd47, 0xdeadbf02),
+ TOBN(0x11e80219, 0xac459068),
+ TOBN(0x810c7626, 0x71f311f0),
+ TOBN(0xfa17ef8d, 0x4ab6ef53),
+ TOBN(0xaf47fd25, 0x93e43bff),
+ TOBN(0x5cb5ff3f, 0x0be40632),
+ TOBN(0x54687106, 0x8ee61da3),
+ TOBN(0x7764196e, 0xb08afd0f),
+ TOBN(0x831ab3ed, 0xf0290a8f),
+ TOBN(0xcae81966, 0xcb47c387),
+ TOBN(0xaad7dece, 0x184efb4f),
+ TOBN(0xdcfc53b3, 0x4749110e),
+ TOBN(0x6698f23c, 0x4cb632f9),
+ TOBN(0xc42a1ad6, 0xb91f8067),
+ TOBN(0xb116a81d, 0x6284180a),
+ TOBN(0xebedf5f8, 0xe901326f),
+ TOBN(0xf2274c9f, 0x97e3e044),
+ TOBN(0x42018520, 0x11d09fc9),
+ TOBN(0x56a65f17, 0xd18e6e23),
+ TOBN(0x2ea61e2a, 0x352b683c),
+ TOBN(0x27d291bc, 0x575eaa94),
+ TOBN(0x9e7bc721, 0xb8ff522d),
+ TOBN(0x5f7268bf, 0xa7f04d6f),
+ TOBN(0x5868c73f, 0xaba41748),
+ TOBN(0x9f85c2db, 0x7be0eead),
+ TOBN(0x511e7842, 0xff719135),
+ TOBN(0x5a06b1e9, 0xc5ea90d7),
+ TOBN(0x0c19e283, 0x26fab631),
+ TOBN(0x8af8f0cf, 0xe9206c55),
+ TOBN(0x89389cb4, 0x3553c06a),
+ TOBN(0x39dbed97, 0xf65f8004),
+ TOBN(0x0621b037, 0xc508991d),
+ TOBN(0x1c52e635, 0x96e78cc4),
+ TOBN(0x5385c8b2, 0x0c06b4a8),
+ TOBN(0xd84ddfdb, 0xb0e87d03),
+ TOBN(0xc49dfb66, 0x934bafad),
+ TOBN(0x7071e170, 0x59f70772),
+ TOBN(0x3a073a84, 0x3a1db56b),
+ TOBN(0x03494903, 0x3b8af190),
+ TOBN(0x7d882de3, 0xd32920f0),
+ TOBN(0x91633f0a, 0xb2cf8940),
+ TOBN(0x72b0b178, 0x6f948f51),
+ TOBN(0x2d28dc30, 0x782653c8),
+ TOBN(0x88829849, 0xdb903a05),
+ TOBN(0xb8095d0c, 0x6a19d2bb),
+ TOBN(0x4b9e7f0c, 0x86f782cb),
+ TOBN(0x7af73988, 0x2d907064),
+ TOBN(0xd12be0fe, 0x8b32643c),
+ TOBN(0x358ed23d, 0x0e165dc3),
+ TOBN(0x3d47ce62, 0x4e2378ce),
+ TOBN(0x7e2bb0b9, 0xfeb8a087),
+ TOBN(0x3246e8ae, 0xe29e10b9),
+ TOBN(0x459f4ec7, 0x03ce2b4d),
+ TOBN(0xe9b4ca1b, 0xbbc077cf),
+ TOBN(0x2613b4f2, 0x0e9940c1),
+ TOBN(0xfc598bb9, 0x047d1eb1),
+ TOBN(0x9744c62b, 0x45036099),
+ TOBN(0xa9dee742, 0x167c65d8),
+ TOBN(0x0c511525, 0xdabe1943),
+ TOBN(0xda110554, 0x93c6c624),
+ TOBN(0xae00a52c, 0x651a3be2),
+ TOBN(0xcda5111d, 0x884449a6),
+ TOBN(0x063c06f4, 0xff33bed1),
+ TOBN(0x73baaf9a, 0x0d3d76b4),
+ TOBN(0x52fb0c9d, 0x7fc63668),
+ TOBN(0x6886c9dd, 0x0c039cde),
+ TOBN(0x602bd599, 0x55b22351),
+ TOBN(0xb00cab02, 0x360c7c13),
+ TOBN(0x8cb616bc, 0x81b69442),
+ TOBN(0x41486700, 0xb55c3cee),
+ TOBN(0x71093281, 0xf49ba278),
+ TOBN(0xad956d9c, 0x64a50710),
+ TOBN(0x9561f28b, 0x638a7e81),
+ TOBN(0x54155cdf, 0x5980ddc3),
+ TOBN(0xb2db4a96, 0xd26f247a),
+ TOBN(0x9d774e4e, 0x4787d100),
+ TOBN(0x1a9e6e2e, 0x078637d2),
+ TOBN(0x1c363e2d, 0x5e0ae06a),
+ TOBN(0x7493483e, 0xe9cfa354),
+ TOBN(0x76843cb3, 0x7f74b98d),
+ TOBN(0xbaca6591, 0xd4b66947),
+ TOBN(0xb452ce98, 0x04460a8c),
+ TOBN(0x6830d246, 0x43768f55),
+ TOBN(0xf4197ed8, 0x7dff12df),
+ TOBN(0x6521b472, 0x400dd0f7),
+ TOBN(0x59f5ca8f, 0x4b1e7093),
+ TOBN(0x6feff11b, 0x080338ae),
+ TOBN(0x0ada31f6, 0xa29ca3c6),
+ TOBN(0x24794eb6, 0x94a2c215),
+ TOBN(0xd83a43ab, 0x05a57ab4),
+ TOBN(0x264a543a, 0x2a6f89fe),
+ TOBN(0x2c2a3868, 0xdd5ec7c2),
+ TOBN(0xd3373940, 0x8439d9b2),
+ TOBN(0x715ea672, 0x0acd1f11),
+ TOBN(0x42c1d235, 0xe7e6cc19),
+ TOBN(0x81ce6e96, 0xb990585c),
+ TOBN(0x04e5dfe0, 0xd809c7bd),
+ TOBN(0xd7b2580c, 0x8f1050ab),
+ TOBN(0x6d91ad78, 0xd8a4176f),
+ TOBN(0x0af556ee, 0x4e2e897c),
+ TOBN(0x162a8b73, 0x921de0ac),
+ TOBN(0x52ac9c22, 0x7ea78400),
+ TOBN(0xee2a4eea, 0xefce2174),
+ TOBN(0xbe61844e, 0x6d637f79),
+ TOBN(0x0491f1bc, 0x789a283b),
+ TOBN(0x72d3ac3d, 0x880836f4),
+ TOBN(0xaa1c5ea3, 0x88e5402d),
+ TOBN(0x1b192421, 0xd5cc473d),
+ TOBN(0x5c0b9998, 0x9dc84cac),
+ TOBN(0xb0a8482d, 0x9c6e75b8),
+ TOBN(0x639961d0, 0x3a191ce2),
+ TOBN(0xda3bc865, 0x6d837930),
+ TOBN(0xca990653, 0x056e6f8f),
+ TOBN(0x84861c41, 0x64d133a7),
+ TOBN(0x8b403276, 0x746abe40),
+ TOBN(0xb7b4d51a, 0xebf8e303),
+ TOBN(0x05b43211, 0x220a255d),
+ TOBN(0xc997152c, 0x02419e6e),
+ TOBN(0x76ff47b6, 0x630c2fea),
+ TOBN(0x50518677, 0x281fdade),
+ TOBN(0x3283b8ba, 0xcf902b0b),
+ TOBN(0x8d4b4eb5, 0x37db303b),
+ TOBN(0xcc89f42d, 0x755011bc),
+ TOBN(0xb43d74bb, 0xdd09d19b),
+ TOBN(0x65746bc9, 0x8adba350),
+ TOBN(0x364eaf8c, 0xb51c1927),
+ TOBN(0x13c76596, 0x10ad72ec),
+ TOBN(0x30045121, 0xf8d40c20),
+ TOBN(0x6d2d99b7, 0xea7b979b),
+ TOBN(0xcd78cd74, 0xe6fb3bcd),
+ TOBN(0x11e45a9e, 0x86cffbfe),
+ TOBN(0x78a61cf4, 0x637024f6),
+ TOBN(0xd06bc872, 0x3d502295),
+ TOBN(0xf1376854, 0x458cb288),
+ TOBN(0xb9db26a1, 0x342f8586),
+ TOBN(0xf33effcf, 0x4beee09e),
+ TOBN(0xd7e0c4cd, 0xb30cfb3a),
+ TOBN(0x6d09b8c1, 0x6c9db4c8),
+ TOBN(0x40ba1a42, 0x07c8d9df),
+ TOBN(0x6fd495f7, 0x1c52c66d),
+ TOBN(0xfb0e169f, 0x275264da),
+ TOBN(0x80c2b746, 0xe57d8362),
+ TOBN(0xedd987f7, 0x49ad7222),
+ TOBN(0xfdc229af, 0x4398ec7b),
+ },
+ {
+ TOBN(0xb0d1ed84, 0x52666a58),
+ TOBN(0x4bcb6e00, 0xe6a9c3c2),
+ TOBN(0x3c57411c, 0x26906408),
+ TOBN(0xcfc20755, 0x13556400),
+ TOBN(0xa08b1c50, 0x5294dba3),
+ TOBN(0xa30ba286, 0x8b7dd31e),
+ TOBN(0xd70ba90e, 0x991eca74),
+ TOBN(0x094e142c, 0xe762c2b9),
+ TOBN(0xb81d783e, 0x979f3925),
+ TOBN(0x1efd130a, 0xaf4c89a7),
+ TOBN(0x525c2144, 0xfd1bf7fa),
+ TOBN(0x4b296904, 0x1b265a9e),
+ TOBN(0xed8e9634, 0xb9db65b6),
+ TOBN(0x35c82e32, 0x03599d8a),
+ TOBN(0xdaa7a54f, 0x403563f3),
+ TOBN(0x9df088ad, 0x022c38ab),
+ TOBN(0xe5cfb066, 0xbb3fd30a),
+ TOBN(0x429169da, 0xeff0354e),
+ TOBN(0x809cf852, 0x3524e36c),
+ TOBN(0x136f4fb3, 0x0155be1d),
+ TOBN(0x4826af01, 0x1fbba712),
+ TOBN(0x6ef0f0b4, 0x506ba1a1),
+ TOBN(0xd9928b31, 0x77aea73e),
+ TOBN(0xe2bf6af2, 0x5eaa244e),
+ TOBN(0x8d084f12, 0x4237b64b),
+ TOBN(0x688ebe99, 0xe3ecfd07),
+ TOBN(0x57b8a70c, 0xf6845dd8),
+ TOBN(0x808fc59c, 0x5da4a325),
+ TOBN(0xa9032b2b, 0xa3585862),
+ TOBN(0xb66825d5, 0xedf29386),
+ TOBN(0xb5a5a8db, 0x431ec29b),
+ TOBN(0xbb143a98, 0x3a1e8dc8),
+ TOBN(0x35ee94ce, 0x12ae381b),
+ TOBN(0x3a7f176c, 0x86ccda90),
+ TOBN(0xc63a657e, 0x4606eaca),
+ TOBN(0x9ae5a380, 0x43cd04df),
+ TOBN(0x9bec8d15, 0xed251b46),
+ TOBN(0x1f5d6d30, 0xcaca5e64),
+ TOBN(0x347b3b35, 0x9ff20f07),
+ TOBN(0x4d65f034, 0xf7e4b286),
+ TOBN(0x9e93ba24, 0xf111661e),
+ TOBN(0xedced484, 0xb105eb04),
+ TOBN(0x96dc9ba1, 0xf424b578),
+ TOBN(0xbf8f66b7, 0xe83e9069),
+ TOBN(0x872d4df4, 0xd7ed8216),
+ TOBN(0xbf07f377, 0x8e2cbecf),
+ TOBN(0x4281d899, 0x98e73754),
+ TOBN(0xfec85fbb, 0x8aab8708),
+ TOBN(0x9a3c0dee, 0xa5ba5b0b),
+ TOBN(0xe6a116ce, 0x42d05299),
+ TOBN(0xae9775fe, 0xe9b02d42),
+ TOBN(0x72b05200, 0xa1545cb6),
+ TOBN(0xbc506f7d, 0x31a3b4ea),
+ TOBN(0xe5893078, 0x8bbd9b32),
+ TOBN(0xc8bc5f37, 0xe4b12a97),
+ TOBN(0x6b000c06, 0x4a73b671),
+ TOBN(0x13b5bf22, 0x765fa7d0),
+ TOBN(0x59805bf0, 0x1d6a5370),
+ TOBN(0x67a5e29d, 0x4280db98),
+ TOBN(0x4f53916f, 0x776b1ce3),
+ TOBN(0x714ff61f, 0x33ddf626),
+ TOBN(0x4206238e, 0xa085d103),
+ TOBN(0x1c50d4b7, 0xe5809ee3),
+ TOBN(0x999f450d, 0x85f8eb1d),
+ TOBN(0x658a6051, 0xe4c79e9b),
+ TOBN(0x1394cb73, 0xc66a9fea),
+ TOBN(0x27f31ed5, 0xc6be7b23),
+ TOBN(0xf4c88f36, 0x5aa6f8fe),
+ TOBN(0x0fb0721f, 0x4aaa499e),
+ TOBN(0x68b3a7d5, 0xe3fb2a6b),
+ TOBN(0xa788097d, 0x3a92851d),
+ TOBN(0x060e7f8a, 0xe96f4913),
+ TOBN(0x82eebe73, 0x1a3a93bc),
+ TOBN(0x42bbf465, 0xa21adc1a),
+ TOBN(0xc10b6fa4, 0xef030efd),
+ TOBN(0x247aa4c7, 0x87b097bb),
+ TOBN(0x8b8dc632, 0xf60c77da),
+ TOBN(0x6ffbc26a, 0xc223523e),
+ TOBN(0xa4f6ff11, 0x344579cf),
+ TOBN(0x5825653c, 0x980250f6),
+ TOBN(0xb2dd097e, 0xbc1aa2b9),
+ TOBN(0x07889393, 0x37a0333a),
+ TOBN(0x1cf55e71, 0x37a0db38),
+ TOBN(0x2648487f, 0x792c1613),
+ TOBN(0xdad01336, 0x3fcef261),
+ TOBN(0x6239c81d, 0x0eabf129),
+ TOBN(0x8ee761de, 0x9d276be2),
+ TOBN(0x406a7a34, 0x1eda6ad3),
+ TOBN(0x4bf367ba, 0x4a493b31),
+ TOBN(0x54f20a52, 0x9bf7f026),
+ TOBN(0xb696e062, 0x9795914b),
+ TOBN(0xcddab96d, 0x8bf236ac),
+ TOBN(0x4ff2c70a, 0xed25ea13),
+ TOBN(0xfa1d09eb, 0x81cbbbe7),
+ TOBN(0x88fc8c87, 0x468544c5),
+ TOBN(0x847a670d, 0x696b3317),
+ TOBN(0xf133421e, 0x64bcb626),
+ TOBN(0xaea638c8, 0x26dee0b5),
+ TOBN(0xd6e7680b, 0xb310346c),
+ TOBN(0xe06f4097, 0xd5d4ced3),
+ TOBN(0x09961452, 0x7512a30b),
+ TOBN(0xf3d867fd, 0xe589a59a),
+ TOBN(0x2e73254f, 0x52d0c180),
+ TOBN(0x9063d8a3, 0x333c74ac),
+ TOBN(0xeda6c595, 0xd314e7bc),
+ TOBN(0x2ee7464b, 0x467899ed),
+ TOBN(0x1cef423c, 0x0a1ed5d3),
+ TOBN(0x217e76ea, 0x69cc7613),
+ TOBN(0x27ccce1f, 0xe7cda917),
+ TOBN(0x12d8016b, 0x8a893f16),
+ TOBN(0xbcd6de84, 0x9fc74f6b),
+ TOBN(0xfa5817e2, 0xf3144e61),
+ TOBN(0x1f354164, 0x0821ee4c),
+ TOBN(0x1583eab4, 0x0bc61992),
+ TOBN(0x7490caf6, 0x1d72879f),
+ TOBN(0x998ad9f3, 0xf76ae7b2),
+ TOBN(0x1e181950, 0xa41157f7),
+ TOBN(0xa9d7e1e6, 0xe8da3a7e),
+ TOBN(0x963784eb, 0x8426b95f),
+ TOBN(0x0ee4ed6e, 0x542e2a10),
+ TOBN(0xb79d4cc5, 0xac751e7b),
+ TOBN(0x93f96472, 0xfd4211bd),
+ TOBN(0x8c72d3d2, 0xc8de4fc6),
+ TOBN(0x7b69cbf5, 0xdf44f064),
+ TOBN(0x3da90ca2, 0xf4bf94e1),
+ TOBN(0x1a5325f8, 0xf12894e2),
+ TOBN(0x0a437f6c, 0x7917d60b),
+ TOBN(0x9be70486, 0x96c9cb5d),
+ TOBN(0xb4d880bf, 0xe1dc5c05),
+ TOBN(0xd738adda, 0xeebeeb57),
+ TOBN(0x6f0119d3, 0xdf0fe6a3),
+ TOBN(0x5c686e55, 0x66eaaf5a),
+ TOBN(0x9cb10b50, 0xdfd0b7ec),
+ TOBN(0xbdd0264b, 0x6a497c21),
+ TOBN(0xfc093514, 0x8c546c96),
+ TOBN(0x58a947fa, 0x79dbf42a),
+ TOBN(0xc0b48d4e, 0x49ccd6d7),
+ TOBN(0xff8fb02c, 0x88bd5580),
+ TOBN(0xc75235e9, 0x07d473b2),
+ TOBN(0x4fab1ac5, 0xa2188af3),
+ TOBN(0x030fa3bc, 0x97576ec0),
+ TOBN(0xe8c946e8, 0x0b7e7d2f),
+ TOBN(0x40a5c9cc, 0x70305600),
+ TOBN(0x6d8260a9, 0xc8b013b4),
+ TOBN(0x0368304f, 0x70bba85c),
+ TOBN(0xad090da1, 0xa4a0d311),
+ TOBN(0x7170e870, 0x2415eec1),
+ TOBN(0xbfba35fe, 0x8461ea47),
+ TOBN(0x6279019a, 0xc1e91938),
+ TOBN(0xa47638f3, 0x1afc415f),
+ TOBN(0x36c65cbb, 0xbcba0e0f),
+ TOBN(0x02160efb, 0x034e2c48),
+ TOBN(0xe6c51073, 0x615cd9e4),
+ TOBN(0x498ec047, 0xf1243c06),
+ TOBN(0x3e5a8809, 0xb17b3d8c),
+ TOBN(0x5cd99e61, 0x0cc565f1),
+ TOBN(0x81e312df, 0x7851dafe),
+ TOBN(0xf156f5ba, 0xa79061e2),
+ TOBN(0x80d62b71, 0x880c590e),
+ TOBN(0xbec9746f, 0x0a39faa1),
+ TOBN(0x1d98a9c1, 0xc8ed1f7a),
+ TOBN(0x09e43bb5, 0xa81d5ff2),
+ TOBN(0xd5f00f68, 0x0da0794a),
+ TOBN(0x412050d9, 0x661aa836),
+ TOBN(0xa89f7c4e, 0x90747e40),
+ TOBN(0x6dc05ebb, 0xb62a3686),
+ TOBN(0xdf4de847, 0x308e3353),
+ TOBN(0x53868fbb, 0x9fb53bb9),
+ TOBN(0x2b09d2c3, 0xcfdcf7dd),
+ TOBN(0x41a9fce3, 0x723fcab4),
+ TOBN(0x73d905f7, 0x07f57ca3),
+ TOBN(0x080f9fb1, 0xac8e1555),
+ TOBN(0x7c088e84, 0x9ba7a531),
+ TOBN(0x07d35586, 0xed9a147f),
+ TOBN(0x602846ab, 0xaf48c336),
+ TOBN(0x7320fd32, 0x0ccf0e79),
+ TOBN(0xaa780798, 0xb18bd1ff),
+ TOBN(0x52c2e300, 0xafdd2905),
+ TOBN(0xf27ea3d6, 0x434267cd),
+ TOBN(0x8b96d16d, 0x15605b5f),
+ TOBN(0x7bb31049, 0x4b45706b),
+ TOBN(0xe7f58b8e, 0x743d25f8),
+ TOBN(0xe9b5e45b, 0x87f30076),
+ TOBN(0xd19448d6, 0x5d053d5a),
+ TOBN(0x1ecc8cb9, 0xd3210a04),
+ TOBN(0x6bc7d463, 0xdafb5269),
+ TOBN(0x3e59b10a, 0x67c3489f),
+ TOBN(0x1769788c, 0x65641e1b),
+ TOBN(0x8a53b82d, 0xbd6cb838),
+ TOBN(0x7066d6e6, 0x236d5f22),
+ TOBN(0x03aa1c61, 0x6908536e),
+ TOBN(0xc971da0d, 0x66ae9809),
+ TOBN(0x01b3a86b, 0xc49a2fac),
+ TOBN(0x3b8420c0, 0x3092e77a),
+ TOBN(0x02057300, 0x7d6fb556),
+ TOBN(0x6941b2a1, 0xbff40a87),
+ TOBN(0x140b6308, 0x0658ff2a),
+ TOBN(0x87804363, 0x3424ab36),
+ TOBN(0x0253bd51, 0x5751e299),
+ TOBN(0xc75bcd76, 0x449c3e3a),
+ TOBN(0x92eb4090, 0x7f8f875d),
+ TOBN(0x9c9d754e, 0x56c26bbf),
+ TOBN(0x158cea61, 0x8110bbe7),
+ TOBN(0x62a6b802, 0x745f91ea),
+ TOBN(0xa79c41aa, 0xc6e7394b),
+ TOBN(0x445b6a83, 0xad57ef10),
+ TOBN(0x0c5277eb, 0x6ea6f40c),
+ TOBN(0x319fe96b, 0x88633365),
+ TOBN(0x0b0fc61f, 0x385f63cb),
+ TOBN(0x41250c84, 0x22bdd127),
+ TOBN(0x67d153f1, 0x09e942c2),
+ TOBN(0x60920d08, 0xc021ad5d),
+ TOBN(0x229f5746, 0x724d81a5),
+ TOBN(0xb7ffb892, 0x5bba3299),
+ TOBN(0x518c51a1, 0xde413032),
+ TOBN(0x2a9bfe77, 0x3c2fd94c),
+ TOBN(0xcbcde239, 0x3191f4fd),
+ TOBN(0x43093e16, 0xd3d6ada1),
+ TOBN(0x184579f3, 0x58769606),
+ TOBN(0x2c94a8b3, 0xd236625c),
+ TOBN(0x6922b9c0, 0x5c437d8e),
+ TOBN(0x3d4ae423, 0xd8d9f3c8),
+ TOBN(0xf72c31c1, 0x2e7090a2),
+ TOBN(0x4ac3f5f3, 0xd76a55bd),
+ TOBN(0x342508fc, 0x6b6af991),
+ TOBN(0x0d527100, 0x1b5cebbd),
+ TOBN(0xb84740d0, 0xdd440dd7),
+ TOBN(0x748ef841, 0x780162fd),
+ TOBN(0xa8dbfe0e, 0xdfc6fafb),
+ TOBN(0xeadfdf05, 0xf7300f27),
+ TOBN(0x7d06555f, 0xfeba4ec9),
+ TOBN(0x12c56f83, 0x9e25fa97),
+ TOBN(0x77f84203, 0xd39b8c34),
+ TOBN(0xed8b1be6, 0x3125eddb),
+ TOBN(0x5bbf2441, 0xf6e39dc5),
+ TOBN(0xb00f6ee6, 0x6a5d678a),
+ TOBN(0xba456ecf, 0x57d0ea99),
+ TOBN(0xdcae0f58, 0x17e06c43),
+ TOBN(0x01643de4, 0x0f5b4baa),
+ TOBN(0x2c324341, 0xd161b9be),
+ TOBN(0x80177f55, 0xe126d468),
+ TOBN(0xed325f1f, 0x76748e09),
+ TOBN(0x6116004a, 0xcfa9bdc2),
+ TOBN(0x2d8607e6, 0x3a9fb468),
+ TOBN(0x0e573e27, 0x6009d660),
+ TOBN(0x3a525d2e, 0x8d10c5a1),
+ TOBN(0xd26cb45c, 0x3b9009a0),
+ TOBN(0xb6b0cdc0, 0xde9d7448),
+ TOBN(0x949c9976, 0xe1337c26),
+ TOBN(0x6faadebd, 0xd73d68e5),
+ TOBN(0x9e158614, 0xf1b768d9),
+ TOBN(0x22dfa557, 0x9cc4f069),
+ TOBN(0xccd6da17, 0xbe93c6d6),
+ TOBN(0x24866c61, 0xa504f5b9),
+ TOBN(0x2121353c, 0x8d694da1),
+ TOBN(0x1c6ca580, 0x0140b8c6),
+ TOBN(0xc245ad8c, 0xe964021e),
+ TOBN(0xb83bffba, 0x032b82b3),
+ TOBN(0xfaa220c6, 0x47ef9898),
+ TOBN(0x7e8d3ac6, 0x982c948a),
+ TOBN(0x1faa2091, 0xbc2d124a),
+ TOBN(0xbd54c3dd, 0x05b15ff4),
+ TOBN(0x386bf3ab, 0xc87c6fb7),
+ TOBN(0xfb2b0563, 0xfdeb6f66),
+ TOBN(0x4e77c557, 0x5b45afb4),
+ TOBN(0xe9ded649, 0xefb8912d),
+ TOBN(0x7ec9bbf5, 0x42f6e557),
+ TOBN(0x2570dfff, 0x62671f00),
+ TOBN(0x2b3bfb78, 0x88e084bd),
+ TOBN(0xa024b238, 0xf37fe5b4),
+ TOBN(0x44e7dc04, 0x95649aee),
+ TOBN(0x498ca255, 0x5e7ec1d8),
+ TOBN(0x3bc766ea, 0xaaa07e86),
+ TOBN(0x0db6facb, 0xf3608586),
+ TOBN(0xbadd2549, 0xbdc259c8),
+ TOBN(0x95af3c6e, 0x041c649f),
+ TOBN(0xb36a928c, 0x02e30afb),
+ TOBN(0x9b5356ad, 0x008a88b8),
+ TOBN(0x4b67a5f1, 0xcf1d9e9d),
+ TOBN(0xc6542e47, 0xa5d8d8ce),
+ TOBN(0x73061fe8, 0x7adfb6cc),
+ TOBN(0xcc826fd3, 0x98678141),
+ TOBN(0x00e758b1, 0x3c80515a),
+ TOBN(0x6afe3247, 0x41485083),
+ TOBN(0x0fcb08b9, 0xb6ae8a75),
+ TOBN(0xb8cf388d, 0x4acf51e1),
+ TOBN(0x344a5560, 0x6961b9d6),
+ TOBN(0x1a6778b8, 0x6a97fd0c),
+ TOBN(0xd840fdc1, 0xecc4c7e3),
+ TOBN(0xde9fe47d, 0x16db68cc),
+ TOBN(0xe95f89de, 0xa3e216aa),
+ TOBN(0x84f1a6a4, 0x9594a8be),
+ TOBN(0x7ddc7d72, 0x5a7b162b),
+ TOBN(0xc5cfda19, 0xadc817a3),
+ TOBN(0x80a5d350, 0x78b58d46),
+ TOBN(0x93365b13, 0x82978f19),
+ TOBN(0x2e44d225, 0x26a1fc90),
+ TOBN(0x0d6d10d2, 0x4d70705d),
+ TOBN(0xd94b6b10, 0xd70c45f4),
+ TOBN(0x0f201022, 0xb216c079),
+ TOBN(0xcec966c5, 0x658fde41),
+ TOBN(0xa8d2bc7d, 0x7e27601d),
+ TOBN(0xbfcce3e1, 0xff230be7),
+ TOBN(0x3394ff6b, 0x0033ffb5),
+ TOBN(0xd890c509, 0x8132c9af),
+ TOBN(0xaac4b0eb, 0x361e7868),
+ TOBN(0x5194ded3, 0xe82d15aa),
+ TOBN(0x4550bd2e, 0x23ae6b7d),
+ TOBN(0x3fda318e, 0xea5399d4),
+ TOBN(0xd989bffa, 0x91638b80),
+ TOBN(0x5ea124d0, 0xa14aa12d),
+ TOBN(0x1fb1b899, 0x3667b944),
+ TOBN(0x95ec7969, 0x44c44d6a),
+ TOBN(0x91df144a, 0x57e86137),
+ TOBN(0x915fd620, 0x73adac44),
+ TOBN(0x8f01732d, 0x59a83801),
+ TOBN(0xec579d25, 0x3aa0a633),
+ TOBN(0x06de5e7c, 0xc9d6d59c),
+ TOBN(0xc132f958, 0xb1ef8010),
+ TOBN(0x29476f96, 0xe65c1a02),
+ TOBN(0x336a77c0, 0xd34c3565),
+ TOBN(0xef1105b2, 0x1b9f1e9e),
+ TOBN(0x63e6d08b, 0xf9e08002),
+ TOBN(0x9aff2f21, 0xc613809e),
+ TOBN(0xb5754f85, 0x3a80e75d),
+ TOBN(0xde71853e, 0x6bbda681),
+ TOBN(0x86f041df, 0x8197fd7a),
+ TOBN(0x8b332e08, 0x127817fa),
+ TOBN(0x05d99be8, 0xb9c20cda),
+ TOBN(0x89f7aad5, 0xd5cd0c98),
+ TOBN(0x7ef936fe, 0x5bb94183),
+ TOBN(0x92ca0753, 0xb05cd7f2),
+ TOBN(0x9d65db11, 0x74a1e035),
+ TOBN(0x02628cc8, 0x13eaea92),
+ TOBN(0xf2d9e242, 0x49e4fbf2),
+ TOBN(0x94fdfd9b, 0xe384f8b7),
+ TOBN(0x65f56054, 0x63428c6b),
+ TOBN(0x2f7205b2, 0x90b409a5),
+ TOBN(0xf778bb78, 0xff45ae11),
+ TOBN(0xa13045be, 0xc5ee53b2),
+ TOBN(0xe00a14ff, 0x03ef77fe),
+ TOBN(0x689cd59f, 0xffef8bef),
+ TOBN(0x3578f0ed, 0x1e9ade22),
+ TOBN(0xe99f3ec0, 0x6268b6a8),
+ TOBN(0xa2057d91, 0xea1b3c3e),
+ TOBN(0x2d1a7053, 0xb8823a4a),
+ TOBN(0xabbb336a, 0x2cca451e),
+ TOBN(0xcd2466e3, 0x2218bb5d),
+ TOBN(0x3ac1f42f, 0xc8cb762d),
+ TOBN(0x7e312aae, 0x7690211f),
+ TOBN(0xebb9bd73, 0x45d07450),
+ TOBN(0x207c4b82, 0x46c2213f),
+ TOBN(0x99d425c1, 0x375913ec),
+ TOBN(0x94e45e96, 0x67908220),
+ TOBN(0xc08f3087, 0xcd67dbf6),
+ TOBN(0xa5670fbe, 0xc0887056),
+ TOBN(0x6717b64a, 0x66f5b8fc),
+ TOBN(0xd5a56aea, 0x786fec28),
+ TOBN(0xa8c3f55f, 0xc0ff4952),
+ TOBN(0xa77fefae, 0x457ac49b),
+ TOBN(0x29882d7c, 0x98379d44),
+ TOBN(0xd000bdfb, 0x509edc8a),
+ TOBN(0xc6f95979, 0xe66fe464),
+ TOBN(0x504a6115, 0xfa61bde0),
+ TOBN(0x56b3b871, 0xeffea31a),
+ TOBN(0x2d3de26d, 0xf0c21a54),
+ TOBN(0x21dbff31, 0x834753bf),
+ TOBN(0xe67ecf49, 0x69269d86),
+ TOBN(0x7a176952, 0x151fe690),
+ TOBN(0x03515804, 0x7f2adb5f),
+ TOBN(0xee794b15, 0xd1b62a8d),
+ TOBN(0xf004ceec, 0xaae454e6),
+ TOBN(0x0897ea7c, 0xf0386fac),
+ TOBN(0x3b62ff12, 0xd1fca751),
+ TOBN(0x154181df, 0x1b7a04ec),
+ TOBN(0x2008e04a, 0xfb5847ec),
+ TOBN(0xd147148e, 0x41dbd772),
+ TOBN(0x2b419f73, 0x22942654),
+ TOBN(0x669f30d3, 0xe9c544f7),
+ TOBN(0x52a2c223, 0xc8540149),
+ TOBN(0x5da9ee14, 0x634dfb02),
+ TOBN(0x5f074ff0, 0xf47869f3),
+ TOBN(0x74ee878d, 0xa3933acc),
+ TOBN(0xe6510651, 0x4fe35ed1),
+ TOBN(0xb3eb9482, 0xf1012e7a),
+ TOBN(0x51013cc0, 0xa8a566ae),
+ TOBN(0xdd5e9243, 0x47c00d3b),
+ TOBN(0x7fde089d, 0x946bb0e5),
+ TOBN(0x030754fe, 0xc731b4b3),
+ TOBN(0x12a136a4, 0x99fda062),
+ TOBN(0x7c1064b8, 0x5a1a35bc),
+ TOBN(0xbf1f5763, 0x446c84ef),
+ TOBN(0xed29a56d, 0xa16d4b34),
+ TOBN(0x7fba9d09, 0xdca21c4f),
+ TOBN(0x66d7ac00, 0x6d8de486),
+ TOBN(0x60061987, 0x73a2a5e1),
+ TOBN(0x8b400f86, 0x9da28ff0),
+ TOBN(0x3133f708, 0x43c4599c),
+ TOBN(0x9911c9b8, 0xee28cb0d),
+ TOBN(0xcd7e2874, 0x8e0af61d),
+ TOBN(0x5a85f0f2, 0x72ed91fc),
+ TOBN(0x85214f31, 0x9cd4a373),
+ TOBN(0x881fe5be, 0x1925253c),
+ TOBN(0xd8dc98e0, 0x91e8bc76),
+ TOBN(0x7120affe, 0x585cc3a2),
+ TOBN(0x724952ed, 0x735bf97a),
+ TOBN(0x5581e7dc, 0x3eb34581),
+ TOBN(0x5cbff4f2, 0xe52ee57d),
+ TOBN(0x8d320a0e, 0x87d8cc7b),
+ TOBN(0x9beaa7f3, 0xf1d280d0),
+ TOBN(0x7a0b9571, 0x9beec704),
+ TOBN(0x9126332e, 0x5b7f0057),
+ TOBN(0x01fbc1b4, 0x8ed3bd6d),
+ TOBN(0x35bb2c12, 0xd945eb24),
+ TOBN(0x6404694e, 0x9a8ae255),
+ TOBN(0xb6092eec, 0x8d6abfb3),
+ TOBN(0x4d76143f, 0xcc058865),
+ TOBN(0x7b0a5af2, 0x6e249922),
+ TOBN(0x8aef9440, 0x6a50d353),
+ TOBN(0xe11e4bcc, 0x64f0e07a),
+ TOBN(0x4472993a, 0xa14a90fa),
+ TOBN(0x7706e20c, 0xba0c51d4),
+ TOBN(0xf403292f, 0x1532672d),
+ TOBN(0x52573bfa, 0x21829382),
+ TOBN(0x6a7bb6a9, 0x3b5bdb83),
+ TOBN(0x08da65c0, 0xa4a72318),
+ TOBN(0xc58d22aa, 0x63eb065f),
+ TOBN(0x1717596c, 0x1b15d685),
+ TOBN(0x112df0d0, 0xb266d88b),
+ TOBN(0xf688ae97, 0x5941945a),
+ TOBN(0x487386e3, 0x7c292cac),
+ TOBN(0x42f3b50d, 0x57d6985c),
+ TOBN(0x6da4f998, 0x6a90fc34),
+ TOBN(0xc8f257d3, 0x65ca8a8d),
+ TOBN(0xc2feabca, 0x6951f762),
+ TOBN(0xe1bc81d0, 0x74c323ac),
+ TOBN(0x1bc68f67, 0x251a2a12),
+ TOBN(0x10d86587, 0xbe8a70dc),
+ TOBN(0xd648af7f, 0xf0f84d2e),
+ TOBN(0xf0aa9ebc, 0x6a43ac92),
+ TOBN(0x69e3be04, 0x27596893),
+ TOBN(0xb6bb02a6, 0x45bf452b),
+ TOBN(0x0875c11a, 0xf4c698c8),
+ TOBN(0x6652b5c7, 0xbece3794),
+ TOBN(0x7b3755fd, 0x4f5c0499),
+ TOBN(0x6ea16558, 0xb5532b38),
+ TOBN(0xd1c69889, 0xa2e96ef7),
+ TOBN(0x9c773c3a, 0x61ed8f48),
+ TOBN(0x2b653a40, 0x9b323abc),
+ TOBN(0xe26605e1, 0xf0e1d791),
+ TOBN(0x45d41064, 0x4a87157a),
+ TOBN(0x8f9a78b7, 0xcbbce616),
+ TOBN(0xcf1e44aa, 0xc407eddd),
+ TOBN(0x81ddd1d8, 0xa35b964f),
+ TOBN(0x473e339e, 0xfd083999),
+ TOBN(0x6c94bdde, 0x8e796802),
+ TOBN(0x5a304ada, 0x8545d185),
+ TOBN(0x82ae44ea, 0x738bb8cb),
+ TOBN(0x628a35e3, 0xdf87e10e),
+ TOBN(0xd3624f3d, 0xa15b9fe3),
+ TOBN(0xcc44209b, 0x14be4254),
+ TOBN(0x7d0efcbc, 0xbdbc2ea5),
+ TOBN(0x1f603362, 0x04c37bbe),
+ TOBN(0x21f363f5, 0x56a5852c),
+ TOBN(0xa1503d1c, 0xa8501550),
+ TOBN(0x2251e0e1, 0xd8ab10bb),
+ TOBN(0xde129c96, 0x6961c51c),
+ TOBN(0x1f7246a4, 0x81910f68),
+ TOBN(0x2eb744ee, 0x5f2591f2),
+ TOBN(0x3c47d33f, 0x5e627157),
+ TOBN(0x4d6d62c9, 0x22f3bd68),
+ TOBN(0x6120a64b, 0xcb8df856),
+ TOBN(0x3a9ac6c0, 0x7b5d07df),
+ TOBN(0xa92b9558, 0x7ef39783),
+ TOBN(0xe128a134, 0xab3a9b4f),
+ TOBN(0x41c18807, 0xb1252f05),
+ TOBN(0xfc7ed089, 0x80ba9b1c),
+ TOBN(0xac8dc6de, 0xc532a9dd),
+ TOBN(0xbf829cef, 0x55246809),
+ TOBN(0x101b784f, 0x5b4ee80f),
+ TOBN(0xc09945bb, 0xb6f11603),
+ TOBN(0x57b09dbe, 0x41d2801e),
+ TOBN(0xfba5202f, 0xa97534a8),
+ TOBN(0x7fd8ae5f, 0xc17b9614),
+ TOBN(0xa50ba666, 0x78308435),
+ TOBN(0x9572f77c, 0xd3868c4d),
+ TOBN(0x0cef7bfd, 0x2dd7aab0),
+ TOBN(0xe7958e08, 0x2c7c79ff),
+ TOBN(0x81262e42, 0x25346689),
+ TOBN(0x716da290, 0xb07c7004),
+ TOBN(0x35f911ea, 0xb7950ee3),
+ TOBN(0x6fd72969, 0x261d21b5),
+ TOBN(0x52389803, 0x08b640d3),
+ TOBN(0x5b0026ee, 0x887f12a1),
+ TOBN(0x20e21660, 0x742e9311),
+ TOBN(0x0ef6d541, 0x5ff77ff7),
+ TOBN(0x969127f0, 0xf9c41135),
+ TOBN(0xf21d60c9, 0x68a64993),
+ TOBN(0x656e5d0c, 0xe541875c),
+ TOBN(0xf1e0f84e, 0xa1d3c233),
+ TOBN(0x9bcca359, 0x06002d60),
+ TOBN(0xbe2da60c, 0x06191552),
+ TOBN(0x5da8bbae, 0x61181ec3),
+ TOBN(0x9f04b823, 0x65806f19),
+ TOBN(0xf1604a7d, 0xd4b79bb8),
+ TOBN(0xaee806fb, 0x52c878c8),
+ TOBN(0x34144f11, 0x8d47b8e8),
+ TOBN(0x72edf52b, 0x949f9054),
+ TOBN(0xebfca84e, 0x2127015a),
+ TOBN(0x9051d0c0, 0x9cb7cef3),
+ TOBN(0x86e8fe58, 0x296deec8),
+ TOBN(0x33b28188, 0x41010d74),
+ },
+ {
+ TOBN(0x01079383, 0x171b445f),
+ TOBN(0x9bcf21e3, 0x8131ad4c),
+ TOBN(0x8cdfe205, 0xc93987e8),
+ TOBN(0xe63f4152, 0xc92e8c8f),
+ TOBN(0x729462a9, 0x30add43d),
+ TOBN(0x62ebb143, 0xc980f05a),
+ TOBN(0x4f3954e5, 0x3b06e968),
+ TOBN(0xfe1d75ad, 0x242cf6b1),
+ TOBN(0x5f95c6c7, 0xaf8685c8),
+ TOBN(0xd4c1c8ce, 0x2f8f01aa),
+ TOBN(0xc44bbe32, 0x2574692a),
+ TOBN(0xb8003478, 0xd4a4a068),
+ TOBN(0x7c8fc6e5, 0x2eca3cdb),
+ TOBN(0xea1db16b, 0xec04d399),
+ TOBN(0xb05bc82e, 0x8f2bc5cf),
+ TOBN(0x763d517f, 0xf44793d2),
+ TOBN(0x4451c1b8, 0x08bd98d0),
+ TOBN(0x644b1cd4, 0x6575f240),
+ TOBN(0x6907eb33, 0x7375d270),
+ TOBN(0x56c8bebd, 0xfa2286bd),
+ TOBN(0xc713d2ac, 0xc4632b46),
+ TOBN(0x17da427a, 0xafd60242),
+ TOBN(0x313065b7, 0xc95c7546),
+ TOBN(0xf8239898, 0xbf17a3de),
+ TOBN(0xf3b7963f, 0x4c830320),
+ TOBN(0x842c7aa0, 0x903203e3),
+ TOBN(0xaf22ca0a, 0xe7327afb),
+ TOBN(0x38e13092, 0x967609b6),
+ TOBN(0x73b8fb62, 0x757558f1),
+ TOBN(0x3cc3e831, 0xf7eca8c1),
+ TOBN(0xe4174474, 0xf6331627),
+ TOBN(0xa77989ca, 0xc3c40234),
+ TOBN(0xe5fd17a1, 0x44a081e0),
+ TOBN(0xd797fb7d, 0xb70e296a),
+ TOBN(0x2b472b30, 0x481f719c),
+ TOBN(0x0e632a98, 0xfe6f8c52),
+ TOBN(0x89ccd116, 0xc5f0c284),
+ TOBN(0xf51088af, 0x2d987c62),
+ TOBN(0x2a2bccda, 0x4c2de6cf),
+ TOBN(0x810f9efe, 0xf679f0f9),
+ TOBN(0xb0f394b9, 0x7ffe4b3e),
+ TOBN(0x0b691d21, 0xe5fa5d21),
+ TOBN(0xb0bd7747, 0x9dfbbc75),
+ TOBN(0xd2830fda, 0xfaf78b00),
+ TOBN(0xf78c249c, 0x52434f57),
+ TOBN(0x4b1f7545, 0x98096dab),
+ TOBN(0x73bf6f94, 0x8ff8c0b3),
+ TOBN(0x34aef03d, 0x454e134c),
+ TOBN(0xf8d151f4, 0xb7ac7ec5),
+ TOBN(0xd6ceb95a, 0xe50da7d5),
+ TOBN(0xa1b492b0, 0xdc3a0eb8),
+ TOBN(0x75157b69, 0xb3dd2863),
+ TOBN(0xe2c4c74e, 0xc5413d62),
+ TOBN(0xbe329ff7, 0xbc5fc4c7),
+ TOBN(0x835a2aea, 0x60fa9dda),
+ TOBN(0xf117f5ad, 0x7445cb87),
+ TOBN(0xae8317f4, 0xb0166f7a),
+ TOBN(0xfbd3e3f7, 0xceec74e6),
+ TOBN(0xfdb516ac, 0xe0874bfd),
+ TOBN(0x3d846019, 0xc681f3a3),
+ TOBN(0x0b12ee5c, 0x7c1620b0),
+ TOBN(0xba68b4dd, 0x2b63c501),
+ TOBN(0xac03cd32, 0x6668c51e),
+ TOBN(0x2a6279f7, 0x4e0bcb5b),
+ TOBN(0x17bd69b0, 0x6ae85c10),
+ TOBN(0x72946979, 0x1dfdd3a6),
+ TOBN(0xd9a03268, 0x2c078bec),
+ TOBN(0x41c6a658, 0xbfd68a52),
+ TOBN(0xcdea1024, 0x0e023900),
+ TOBN(0xbaeec121, 0xb10d144d),
+ TOBN(0x5a600e74, 0x058ab8dc),
+ TOBN(0x1333af21, 0xbb89ccdd),
+ TOBN(0xdf25eae0, 0x3aaba1f1),
+ TOBN(0x2cada16e, 0x3b7144cf),
+ TOBN(0x657ee27d, 0x71ab98bc),
+ TOBN(0x99088b4c, 0x7a6fc96e),
+ TOBN(0x05d5c0a0, 0x3549dbd4),
+ TOBN(0x42cbdf8f, 0xf158c3ac),
+ TOBN(0x3fb6b3b0, 0x87edd685),
+ TOBN(0x22071cf6, 0x86f064d0),
+ TOBN(0xd2d6721f, 0xff2811e5),
+ TOBN(0xdb81b703, 0xfe7fae8c),
+ TOBN(0x3cfb74ef, 0xd3f1f7bb),
+ TOBN(0x0cdbcd76, 0x16cdeb5d),
+ TOBN(0x4f39642a, 0x566a808c),
+ TOBN(0x02b74454, 0x340064d6),
+ TOBN(0xfabbadca, 0x0528fa6f),
+ TOBN(0xe4c3074c, 0xd3fc0bb6),
+ TOBN(0xb32cb8b0, 0xb796d219),
+ TOBN(0xc3e95f4f, 0x34741dd9),
+ TOBN(0x87212125, 0x68edf6f5),
+ TOBN(0x7a03aee4, 0xa2b9cb8e),
+ TOBN(0x0cd3c376, 0xf53a89aa),
+ TOBN(0x0d8af9b1, 0x948a28dc),
+ TOBN(0xcf86a3f4, 0x902ab04f),
+ TOBN(0x8aacb62a, 0x7f42002d),
+ TOBN(0x106985eb, 0xf62ffd52),
+ TOBN(0xe670b54e, 0x5797bf10),
+ TOBN(0x4b405209, 0xc5e30aef),
+ TOBN(0x12c97a20, 0x4365b5e9),
+ TOBN(0x104646ce, 0x1fe32093),
+ TOBN(0x13cb4ff6, 0x3907a8c9),
+ TOBN(0x8b9f30d1, 0xd46e726b),
+ TOBN(0xe1985e21, 0xaba0f499),
+ TOBN(0xc573dea9, 0x10a230cd),
+ TOBN(0x24f46a93, 0xcd30f947),
+ TOBN(0xf2623fcf, 0xabe2010a),
+ TOBN(0x3f278cb2, 0x73f00e4f),
+ TOBN(0xed55c67d, 0x50b920eb),
+ TOBN(0xf1cb9a2d, 0x8e760571),
+ TOBN(0x7c50d109, 0x0895b709),
+ TOBN(0x4207cf07, 0x190d4369),
+ TOBN(0x3b027e81, 0xc4127fe1),
+ TOBN(0xa9f8b9ad, 0x3ae9c566),
+ TOBN(0x5ab10851, 0xacbfbba5),
+ TOBN(0xa747d648, 0x569556f5),
+ TOBN(0xcc172b5c, 0x2ba97bf7),
+ TOBN(0x15e0f77d, 0xbcfa3324),
+ TOBN(0xa345b797, 0x7686279d),
+ TOBN(0x5a723480, 0xe38003d3),
+ TOBN(0xfd8e139f, 0x8f5fcda8),
+ TOBN(0xf3e558c4, 0xbdee5bfd),
+ TOBN(0xd76cbaf4, 0xe33f9f77),
+ TOBN(0x3a4c97a4, 0x71771969),
+ TOBN(0xda27e84b, 0xf6dce6a7),
+ TOBN(0xff373d96, 0x13e6c2d1),
+ TOBN(0xf115193c, 0xd759a6e9),
+ TOBN(0x3f9b7025, 0x63d2262c),
+ TOBN(0xd9764a31, 0x317cd062),
+ TOBN(0x30779d8e, 0x199f8332),
+ TOBN(0xd8074106, 0x16b11b0b),
+ TOBN(0x7917ab9f, 0x78aeaed8),
+ TOBN(0xb67a9cbe, 0x28fb1d8e),
+ TOBN(0x2e313563, 0x136eda33),
+ TOBN(0x010b7069, 0xa371a86c),
+ TOBN(0x44d90fa2, 0x6744e6b7),
+ TOBN(0x68190867, 0xd6b3e243),
+ TOBN(0x9fe6cd9d, 0x59048c48),
+ TOBN(0xb900b028, 0x95731538),
+ TOBN(0xa012062f, 0x32cae04f),
+ TOBN(0x8107c8bc, 0x9399d082),
+ TOBN(0x47e8c54a, 0x41df12e2),
+ TOBN(0x14ba5117, 0xb6ef3f73),
+ TOBN(0x22260bea, 0x81362f0b),
+ TOBN(0x90ea261e, 0x1a18cc20),
+ TOBN(0x2192999f, 0x2321d636),
+ TOBN(0xef64d314, 0xe311b6a0),
+ TOBN(0xd7401e4c, 0x3b54a1f5),
+ TOBN(0x19019983, 0x6fbca2ba),
+ TOBN(0x46ad3293, 0x8fbffc4b),
+ TOBN(0xa142d3f6, 0x3786bf40),
+ TOBN(0xeb5cbc26, 0xb67039fc),
+ TOBN(0x9cb0ae6c, 0x252bd479),
+ TOBN(0x05e0f88a, 0x12b5848f),
+ TOBN(0x78f6d2b2, 0xa5c97663),
+ TOBN(0x6f6e149b, 0xc162225c),
+ TOBN(0xe602235c, 0xde601a89),
+ TOBN(0xd17bbe98, 0xf373be1f),
+ TOBN(0xcaf49a5b, 0xa8471827),
+ TOBN(0x7e1a0a85, 0x18aaa116),
+ TOBN(0x6c833196, 0x270580c3),
+ TOBN(0x1e233839, 0xf1c98a14),
+ TOBN(0x67b2f7b4, 0xae34e0a5),
+ TOBN(0x47ac8745, 0xd8ce7289),
+ TOBN(0x2b74779a, 0x100dd467),
+ TOBN(0x274a4337, 0x4ee50d09),
+ TOBN(0x603dcf13, 0x83608bc9),
+ TOBN(0xcd9da6c3, 0xc89e8388),
+ TOBN(0x2660199f, 0x355116ac),
+ TOBN(0xcc38bb59, 0xb6d18eed),
+ TOBN(0x3075f31f, 0x2f4bc071),
+ TOBN(0x9774457f, 0x265dc57e),
+ TOBN(0x06a6a9c8, 0xc6db88bb),
+ TOBN(0x6429d07f, 0x4ec98e04),
+ TOBN(0x8d05e57b, 0x05ecaa8b),
+ TOBN(0x20f140b1, 0x7872ea7b),
+ TOBN(0xdf8c0f09, 0xca494693),
+ TOBN(0x48d3a020, 0xf252e909),
+ TOBN(0x4c5c29af, 0x57b14b12),
+ TOBN(0x7e6fa37d, 0xbf47ad1c),
+ TOBN(0x66e7b506, 0x49a0c938),
+ TOBN(0xb72c0d48, 0x6be5f41f),
+ TOBN(0x6a6242b8, 0xb2359412),
+ TOBN(0xcd35c774, 0x8e859480),
+ TOBN(0x12536fea, 0x87baa627),
+ TOBN(0x58c1fec1, 0xf72aa680),
+ TOBN(0x6c29b637, 0x601e5dc9),
+ TOBN(0x9e3c3c1c, 0xde9e01b9),
+ TOBN(0xefc8127b, 0x2bcfe0b0),
+ TOBN(0x35107102, 0x2a12f50d),
+ TOBN(0x6ccd6cb1, 0x4879b397),
+ TOBN(0xf792f804, 0xf8a82f21),
+ TOBN(0x509d4804, 0xa9b46402),
+ TOBN(0xedddf85d, 0xc10f0850),
+ TOBN(0x928410dc, 0x4b6208aa),
+ TOBN(0xf6229c46, 0x391012dc),
+ TOBN(0xc5a7c41e, 0x7727b9b6),
+ TOBN(0x289e4e4b, 0xaa444842),
+ TOBN(0x049ba1d9, 0xe9a947ea),
+ TOBN(0x44f9e47f, 0x83c8debc),
+ TOBN(0xfa77a1fe, 0x611f8b8e),
+ TOBN(0xfd2e416a, 0xf518f427),
+ TOBN(0xc5fffa70, 0x114ebac3),
+ TOBN(0xfe57c4e9, 0x5d89697b),
+ TOBN(0xfdd053ac, 0xb1aaf613),
+ TOBN(0x31df210f, 0xea585a45),
+ TOBN(0x318cc10e, 0x24985034),
+ TOBN(0x1a38efd1, 0x5f1d6130),
+ TOBN(0xbf86f237, 0x0b1e9e21),
+ TOBN(0xb258514d, 0x1dbe88aa),
+ TOBN(0x1e38a588, 0x90c1baf9),
+ TOBN(0x2936a01e, 0xbdb9b692),
+ TOBN(0xd576de98, 0x6dd5b20c),
+ TOBN(0xb586bf71, 0x70f98ecf),
+ TOBN(0xcccf0f12, 0xc42d2fd7),
+ TOBN(0x8717e61c, 0xfb35bd7b),
+ TOBN(0x8b1e5722, 0x35e6fc06),
+ TOBN(0x3477728f, 0x0b3e13d5),
+ TOBN(0x150c294d, 0xaa8a7372),
+ TOBN(0xc0291d43, 0x3bfa528a),
+ TOBN(0xc6c8bc67, 0xcec5a196),
+ TOBN(0xdeeb31e4, 0x5c2e8a7c),
+ TOBN(0xba93e244, 0xfb6e1c51),
+ TOBN(0xb9f8b71b, 0x2e28e156),
+ TOBN(0xce65a287, 0x968a2ab9),
+ TOBN(0xe3c5ce69, 0x46bbcb1f),
+ TOBN(0xf8c835b9, 0xe7ae3f30),
+ TOBN(0x16bbee26, 0xff72b82b),
+ TOBN(0x665e2017, 0xfd42cd22),
+ TOBN(0x1e139970, 0xf8b1d2a0),
+ TOBN(0x125cda29, 0x79204932),
+ TOBN(0x7aee94a5, 0x49c3bee5),
+ TOBN(0x68c70160, 0x89821a66),
+ TOBN(0xf7c37678, 0x8f981669),
+ TOBN(0xd90829fc, 0x48cc3645),
+ TOBN(0x346af049, 0xd70addfc),
+ TOBN(0x2057b232, 0x370bf29c),
+ TOBN(0xf90c73ce, 0x42e650ee),
+ TOBN(0xe03386ea, 0xa126ab90),
+ TOBN(0x0e266e7e, 0x975a087b),
+ TOBN(0x80578eb9, 0x0fca65d9),
+ TOBN(0x7e2989ea, 0x16af45b8),
+ TOBN(0x7438212d, 0xcac75a4e),
+ TOBN(0x38c7ca39, 0x4fef36b8),
+ TOBN(0x8650c494, 0xd402676a),
+ TOBN(0x26ab5a66, 0xf72c7c48),
+ TOBN(0x4e6cb426, 0xce3a464e),
+ TOBN(0xf8f99896, 0x2b72f841),
+ TOBN(0x8c318491, 0x1a335cc8),
+ TOBN(0x563459ba, 0x6a5913e4),
+ TOBN(0x1b920d61, 0xc7b32919),
+ TOBN(0x805ab8b6, 0xa02425ad),
+ TOBN(0x2ac512da, 0x8d006086),
+ TOBN(0x6ca4846a, 0xbcf5c0fd),
+ TOBN(0xafea51d8, 0xac2138d7),
+ TOBN(0xcb647545, 0x344cd443),
+ TOBN(0x0429ee8f, 0xbd7d9040),
+ TOBN(0xee66a2de, 0x819b9c96),
+ TOBN(0x54f9ec25, 0xdea7d744),
+ TOBN(0x2ffea642, 0x671721bb),
+ TOBN(0x4f19dbd1, 0x114344ea),
+ TOBN(0x04304536, 0xfd0dbc8b),
+ TOBN(0x014b50aa, 0x29ec7f91),
+ TOBN(0xb5fc22fe, 0xbb06014d),
+ TOBN(0x60d963a9, 0x1ee682e0),
+ TOBN(0xdf48abc0, 0xfe85c727),
+ TOBN(0x0cadba13, 0x2e707c2d),
+ TOBN(0xde608d3a, 0xa645aeff),
+ TOBN(0x05f1c28b, 0xedafd883),
+ TOBN(0x3c362ede, 0xbd94de1f),
+ TOBN(0x8dd0629d, 0x13593e41),
+ TOBN(0x0a5e736f, 0x766d6eaf),
+ TOBN(0xbfa92311, 0xf68cf9d1),
+ TOBN(0xa4f9ef87, 0xc1797556),
+ TOBN(0x10d75a1f, 0x5601c209),
+ TOBN(0x651c374c, 0x09b07361),
+ TOBN(0x49950b58, 0x88b5cead),
+ TOBN(0x0ef00058, 0x6fa9dbaa),
+ TOBN(0xf51ddc26, 0x4e15f33a),
+ TOBN(0x1f8b5ca6, 0x2ef46140),
+ TOBN(0x343ac0a3, 0xee9523f0),
+ TOBN(0xbb75eab2, 0x975ea978),
+ TOBN(0x1bccf332, 0x107387f4),
+ TOBN(0x790f9259, 0x9ab0062e),
+ TOBN(0xf1a363ad, 0x1e4f6a5f),
+ TOBN(0x06e08b84, 0x62519a50),
+ TOBN(0x60915187, 0x7265f1ee),
+ TOBN(0x6a80ca34, 0x93ae985e),
+ TOBN(0x81b29768, 0xaaba4864),
+ TOBN(0xb13cabf2, 0x8d52a7d6),
+ TOBN(0xb5c36348, 0x8ead03f1),
+ TOBN(0xc932ad95, 0x81c7c1c0),
+ TOBN(0x5452708e, 0xcae1e27b),
+ TOBN(0x9dac4269, 0x1b0df648),
+ TOBN(0x233e3f0c, 0xdfcdb8bc),
+ TOBN(0xe6ceccdf, 0xec540174),
+ TOBN(0xbd0d845e, 0x95081181),
+ TOBN(0xcc8a7920, 0x699355d5),
+ TOBN(0x111c0f6d, 0xc3b375a8),
+ TOBN(0xfd95bc6b, 0xfd51e0dc),
+ TOBN(0x4a106a26, 0x6888523a),
+ TOBN(0x4d142bd6, 0xcb01a06d),
+ TOBN(0x79bfd289, 0xadb9b397),
+ TOBN(0x0bdbfb94, 0xe9863914),
+ TOBN(0x29d8a229, 0x1660f6a6),
+ TOBN(0x7f6abcd6, 0x551c042d),
+ TOBN(0x13039deb, 0x0ac3ffe8),
+ TOBN(0xa01be628, 0xec8523fb),
+ TOBN(0x6ea34103, 0x0ca1c328),
+ TOBN(0xc74114bd, 0xb903928e),
+ TOBN(0x8aa4ff4e, 0x9e9144b0),
+ TOBN(0x7064091f, 0x7f9a4b17),
+ TOBN(0xa3f4f521, 0xe447f2c4),
+ TOBN(0x81b8da7a, 0x604291f0),
+ TOBN(0xd680bc46, 0x7d5926de),
+ TOBN(0x84f21fd5, 0x34a1202f),
+ TOBN(0x1d1e3181, 0x4e9df3d8),
+ TOBN(0x1ca4861a, 0x39ab8d34),
+ TOBN(0x809ddeec, 0x5b19aa4a),
+ TOBN(0x59f72f7e, 0x4d329366),
+ TOBN(0xa2f93f41, 0x386d5087),
+ TOBN(0x40bf739c, 0xdd67d64f),
+ TOBN(0xb4494205, 0x66702158),
+ TOBN(0xc33c65be, 0x73b1e178),
+ TOBN(0xcdcd657c, 0x38ca6153),
+ TOBN(0x97f4519a, 0xdc791976),
+ TOBN(0xcc7c7f29, 0xcd6e1f39),
+ TOBN(0x38de9cfb, 0x7e3c3932),
+ TOBN(0xe448eba3, 0x7b793f85),
+ TOBN(0xe9f8dbf9, 0xf067e914),
+ TOBN(0xc0390266, 0xf114ae87),
+ TOBN(0x39ed75a7, 0xcd6a8e2a),
+ TOBN(0xadb14848, 0x7ffba390),
+ TOBN(0x67f8cb8b, 0x6af9bc09),
+ TOBN(0x322c3848, 0x9c7476db),
+ TOBN(0xa320fecf, 0x52a538d6),
+ TOBN(0xe0493002, 0xb2aced2b),
+ TOBN(0xdfba1809, 0x616bd430),
+ TOBN(0x531c4644, 0xc331be70),
+ TOBN(0xbc04d32e, 0x90d2e450),
+ TOBN(0x1805a0d1, 0x0f9f142d),
+ TOBN(0x2c44a0c5, 0x47ee5a23),
+ TOBN(0x31875a43, 0x3989b4e3),
+ TOBN(0x6b1949fd, 0x0c063481),
+ TOBN(0x2dfb9e08, 0xbe0f4492),
+ TOBN(0x3ff0da03, 0xe9d5e517),
+ TOBN(0x03dbe9a1, 0xf79466a8),
+ TOBN(0x0b87bcd0, 0x15ea9932),
+ TOBN(0xeb64fc83, 0xab1f58ab),
+ TOBN(0x6d9598da, 0x817edc8a),
+ TOBN(0x699cff66, 0x1d3b67e5),
+ TOBN(0x645c0f29, 0x92635853),
+ TOBN(0x253cdd82, 0xeabaf21c),
+ TOBN(0x82b9602a, 0x2241659e),
+ TOBN(0x2cae07ec, 0x2d9f7091),
+ TOBN(0xbe4c720c, 0x8b48cd9b),
+ TOBN(0x6ce5bc03, 0x6f08d6c9),
+ TOBN(0x36e8a997, 0xaf10bf40),
+ TOBN(0x83422d21, 0x3e10ff12),
+ TOBN(0x7b26d3eb, 0xbcc12494),
+ TOBN(0xb240d2d0, 0xc9469ad6),
+ TOBN(0xc4a11b4d, 0x30afa05b),
+ TOBN(0x4b604ace, 0xdd6ba286),
+ TOBN(0x18486600, 0x3ee2864c),
+ TOBN(0x5869d6ba, 0x8d9ce5be),
+ TOBN(0x0d8f68c5, 0xff4bfb0d),
+ TOBN(0xb69f210b, 0x5700cf73),
+ TOBN(0x61f6653a, 0x6d37c135),
+ TOBN(0xff3d432b, 0x5aff5a48),
+ TOBN(0x0d81c4b9, 0x72ba3a69),
+ TOBN(0xee879ae9, 0xfa1899ef),
+ TOBN(0xbac7e2a0, 0x2d6acafd),
+ TOBN(0xd6d93f6c, 0x1c664399),
+ TOBN(0x4c288de1, 0x5bcb135d),
+ TOBN(0x83031dab, 0x9dab7cbf),
+ TOBN(0xfe23feb0, 0x3abbf5f0),
+ TOBN(0x9f1b2466, 0xcdedca85),
+ TOBN(0x140bb710, 0x1a09538c),
+ TOBN(0xac8ae851, 0x5e11115d),
+ TOBN(0x0d63ff67, 0x6f03f59e),
+ TOBN(0x755e5551, 0x7d234afb),
+ TOBN(0x61c2db4e, 0x7e208fc1),
+ TOBN(0xaa9859ce, 0xf28a4b5d),
+ TOBN(0xbdd6d4fc, 0x34af030f),
+ TOBN(0xd1c4a26d, 0x3be01cb1),
+ TOBN(0x9ba14ffc, 0x243aa07c),
+ TOBN(0xf95cd3a9, 0xb2503502),
+ TOBN(0xe379bc06, 0x7d2a93ab),
+ TOBN(0x3efc18e9, 0xd4ca8d68),
+ TOBN(0x083558ec, 0x80bb412a),
+ TOBN(0xd903b940, 0x9645a968),
+ TOBN(0xa499f0b6, 0x9ba6054f),
+ TOBN(0x208b573c, 0xb8349abe),
+ TOBN(0x3baab3e5, 0x30b4fc1c),
+ TOBN(0x87e978ba, 0xcb524990),
+ TOBN(0x3524194e, 0xccdf0e80),
+ TOBN(0x62711725, 0x7d4bcc42),
+ TOBN(0xe90a3d9b, 0xb90109ba),
+ TOBN(0x3b1bdd57, 0x1323e1e0),
+ TOBN(0xb78e9bd5, 0x5eae1599),
+ TOBN(0x0794b746, 0x9e03d278),
+ TOBN(0x80178605, 0xd70e6297),
+ TOBN(0x171792f8, 0x99c97855),
+ TOBN(0x11b393ee, 0xf5a86b5c),
+ TOBN(0x48ef6582, 0xd8884f27),
+ TOBN(0xbd44737a, 0xbf19ba5f),
+ TOBN(0x8698de4c, 0xa42062c6),
+ TOBN(0x8975eb80, 0x61ce9c54),
+ TOBN(0xd50e57c7, 0xd7fe71f3),
+ TOBN(0x15342190, 0xbc97ce38),
+ TOBN(0x51bda2de, 0x4df07b63),
+ TOBN(0xba12aeae, 0x200eb87d),
+ TOBN(0xabe135d2, 0xa9b4f8f6),
+ TOBN(0x04619d65, 0xfad6d99c),
+ TOBN(0x4a6683a7, 0x7994937c),
+ TOBN(0x7a778c8b, 0x6f94f09a),
+ TOBN(0x8c508623, 0x20a71b89),
+ TOBN(0x241a2aed, 0x1c229165),
+ TOBN(0x352be595, 0xaaf83a99),
+ TOBN(0x9fbfee7f, 0x1562bac8),
+ TOBN(0xeaf658b9, 0x5c4017e3),
+ TOBN(0x1dc7f9e0, 0x15120b86),
+ TOBN(0xd84f13dd, 0x4c034d6f),
+ TOBN(0x283dd737, 0xeaea3038),
+ TOBN(0x197f2609, 0xcd85d6a2),
+ TOBN(0x6ebbc345, 0xfae60177),
+ TOBN(0xb80f031b, 0x4e12fede),
+ TOBN(0xde55d0c2, 0x07a2186b),
+ TOBN(0x1fb3e37f, 0x24dcdd5a),
+ TOBN(0x8d602da5, 0x7ed191fb),
+ TOBN(0x108fb056, 0x76023e0d),
+ TOBN(0x70178c71, 0x459c20c0),
+ TOBN(0xfad5a386, 0x3fe54cf0),
+ TOBN(0xa4a3ec4f, 0x02bbb475),
+ TOBN(0x1aa5ec20, 0x919d94d7),
+ TOBN(0x5d3b63b5, 0xa81e4ab3),
+ TOBN(0x7fa733d8, 0x5ad3d2af),
+ TOBN(0xfbc586dd, 0xd1ac7a37),
+ TOBN(0x282925de, 0x40779614),
+ TOBN(0xfe0ffffb, 0xe74a242a),
+ TOBN(0x3f39e67f, 0x906151e5),
+ TOBN(0xcea27f5f, 0x55e10649),
+ TOBN(0xdca1d4e1, 0xc17cf7b7),
+ TOBN(0x0c326d12, 0x2fe2362d),
+ TOBN(0x05f7ac33, 0x7dd35df3),
+ TOBN(0x0c3b7639, 0xc396dbdf),
+ TOBN(0x0912f5ac, 0x03b7db1c),
+ TOBN(0x9dea4b70, 0x5c9ed4a9),
+ TOBN(0x475e6e53, 0xaae3f639),
+ TOBN(0xfaba0e7c, 0xfc278bac),
+ TOBN(0x16f9e221, 0x9490375f),
+ TOBN(0xaebf9746, 0xa5a7ed0a),
+ TOBN(0x45f9af3f, 0xf41ad5d6),
+ TOBN(0x03c4623c, 0xb2e99224),
+ TOBN(0x82c5bb5c, 0xb3cf56aa),
+ TOBN(0x64311819, 0x34567ed3),
+ TOBN(0xec57f211, 0x8be489ac),
+ TOBN(0x2821895d, 0xb9a1104b),
+ TOBN(0x610dc875, 0x6064e007),
+ TOBN(0x8e526f3f, 0x5b20d0fe),
+ TOBN(0x6e71ca77, 0x5b645aee),
+ TOBN(0x3d1dcb9f, 0x800e10ff),
+ TOBN(0x36b51162, 0x189cf6de),
+ TOBN(0x2c5a3e30, 0x6bb17353),
+ TOBN(0xc186cd3e, 0x2a6c6fbf),
+ TOBN(0xa74516fa, 0x4bf97906),
+ TOBN(0x5b4b8f4b, 0x279d6901),
+ TOBN(0x0c4e57b4, 0x2b573743),
+ TOBN(0x75fdb229, 0xb6e386b6),
+ TOBN(0xb46793fd, 0x99deac27),
+ TOBN(0xeeec47ea, 0xcf712629),
+ TOBN(0xe965f3c4, 0xcbc3b2dd),
+ TOBN(0x8dd1fb83, 0x425c6559),
+ TOBN(0x7fc00ee6, 0x0af06fda),
+ TOBN(0xe98c9225, 0x33d956df),
+ TOBN(0x0f1ef335, 0x4fbdc8a2),
+ TOBN(0x2abb5145, 0xb79b8ea2),
+ TOBN(0x40fd2945, 0xbdbff288),
+ TOBN(0x6a814ac4, 0xd7185db7),
+ TOBN(0xc4329d6f, 0xc084609a),
+ TOBN(0xc9ba7b52, 0xed1be45d),
+ TOBN(0x891dd20d, 0xe4cd2c74),
+ TOBN(0x5a4d4a7f, 0x824139b1),
+ TOBN(0x66c17716, 0xb873c710),
+ TOBN(0x5e5bc141, 0x2843c4e0),
+ TOBN(0xd5ac4817, 0xb97eb5bf),
+ TOBN(0xc0f8af54, 0x450c95c7),
+ TOBN(0xc91b3fa0, 0x318406c5),
+ TOBN(0x360c340a, 0xab9d97f8),
+ TOBN(0xfb57bd07, 0x90a2d611),
+ TOBN(0x4339ae3c, 0xa6a6f7e5),
+ TOBN(0x9c1fcd2a, 0x2feb8a10),
+ TOBN(0x972bcca9, 0xc7ea7432),
+ TOBN(0x1b0b924c, 0x308076f6),
+ TOBN(0x80b2814a, 0x2a5b4ca5),
+ TOBN(0x2f78f55b, 0x61ef3b29),
+ TOBN(0xf838744a, 0xc18a414f),
+ TOBN(0xc611eaae, 0x903d0a86),
+ TOBN(0x94dabc16, 0x2a453f55),
+ TOBN(0xe6f2e3da, 0x14efb279),
+ TOBN(0x5b7a6017, 0x9320dc3c),
+ TOBN(0x692e382f, 0x8df6b5a4),
+ TOBN(0x3f5e15e0, 0x2d40fa90),
+ TOBN(0xc87883ae, 0x643dd318),
+ TOBN(0x511053e4, 0x53544774),
+ TOBN(0x834d0ecc, 0x3adba2bc),
+ TOBN(0x4215d7f7, 0xbae371f5),
+ TOBN(0xfcfd57bf, 0x6c8663bc),
+ TOBN(0xded2383d, 0xd6901b1d),
+ TOBN(0x3b49fbb4, 0xb5587dc3),
+ TOBN(0xfd44a08d, 0x07625f62),
+ TOBN(0x3ee4d65b, 0x9de9b762),
+ },
+ {
+ TOBN(0x64e5137d, 0x0d63d1fa),
+ TOBN(0x658fc052, 0x02a9d89f),
+ TOBN(0x48894874, 0x50436309),
+ TOBN(0xe9ae30f8, 0xd598da61),
+ TOBN(0x2ed710d1, 0x818baf91),
+ TOBN(0xe27e9e06, 0x8b6a0c20),
+ TOBN(0x1e28dcfb, 0x1c1a6b44),
+ TOBN(0x883acb64, 0xd6ac57dc),
+ TOBN(0x8735728d, 0xc2c6ff70),
+ TOBN(0x79d6122f, 0xc5dc2235),
+ TOBN(0x23f5d003, 0x19e277f9),
+ TOBN(0x7ee84e25, 0xdded8cc7),
+ TOBN(0x91a8afb0, 0x63cd880a),
+ TOBN(0x3f3ea7c6, 0x3574af60),
+ TOBN(0x0cfcdc84, 0x02de7f42),
+ TOBN(0x62d0792f, 0xb31aa152),
+ TOBN(0x8e1b4e43, 0x8a5807ce),
+ TOBN(0xad283893, 0xe4109a7e),
+ TOBN(0xc30cc9cb, 0xafd59dda),
+ TOBN(0xf65f36c6, 0x3d8d8093),
+ TOBN(0xdf31469e, 0xa60d32b2),
+ TOBN(0xee93df4b, 0x3e8191c8),
+ TOBN(0x9c1017c5, 0x355bdeb5),
+ TOBN(0xd2623185, 0x8616aa28),
+ TOBN(0xb02c83f9, 0xdec31a21),
+ TOBN(0x988c8b23, 0x6ad9d573),
+ TOBN(0x53e983ae, 0xa57be365),
+ TOBN(0xe968734d, 0x646f834e),
+ TOBN(0x9137ea8f, 0x5da6309b),
+ TOBN(0x10f3a624, 0xc1f1ce16),
+ TOBN(0x782a9ea2, 0xca440921),
+ TOBN(0xdf94739e, 0x5b46f1b5),
+ TOBN(0x9f9be006, 0xcce85c9b),
+ TOBN(0x360e70d6, 0xa4c7c2d3),
+ TOBN(0x2cd5beea, 0xaefa1e60),
+ TOBN(0x64cf63c0, 0x8c3d2b6d),
+ TOBN(0xfb107fa3, 0xe1cf6f90),
+ TOBN(0xb7e937c6, 0xd5e044e6),
+ TOBN(0x74e8ca78, 0xce34db9f),
+ TOBN(0x4f8b36c1, 0x3e210bd0),
+ TOBN(0x1df165a4, 0x34a35ea8),
+ TOBN(0x3418e0f7, 0x4d4412f6),
+ TOBN(0x5af1f8af, 0x518836c3),
+ TOBN(0x42ceef4d, 0x130e1965),
+ TOBN(0x5560ca0b, 0x543a1957),
+ TOBN(0xc33761e5, 0x886cb123),
+ TOBN(0x66624b1f, 0xfe98ed30),
+ TOBN(0xf772f4bf, 0x1090997d),
+ TOBN(0xf4e540bb, 0x4885d410),
+ TOBN(0x7287f810, 0x9ba5f8d7),
+ TOBN(0x22d0d865, 0xde98dfb1),
+ TOBN(0x49ff51a1, 0xbcfbb8a3),
+ TOBN(0xb6b6fa53, 0x6bc3012e),
+ TOBN(0x3d31fd72, 0x170d541d),
+ TOBN(0x8018724f, 0x4b0f4966),
+ TOBN(0x79e7399f, 0x87dbde07),
+ TOBN(0x56f8410e, 0xf4f8b16a),
+ TOBN(0x97241afe, 0xc47b266a),
+ TOBN(0x0a406b8e, 0x6d9c87c1),
+ TOBN(0x803f3e02, 0xcd42ab1b),
+ TOBN(0x7f0309a8, 0x04dbec69),
+ TOBN(0xa83b85f7, 0x3bbad05f),
+ TOBN(0xc6097273, 0xad8e197f),
+ TOBN(0xc097440e, 0x5067adc1),
+ TOBN(0x730eafb6, 0x3524ff16),
+ TOBN(0xd7f9b51e, 0x823fc6ce),
+ TOBN(0x27bd0d32, 0x443e4ac0),
+ TOBN(0x40c59ad9, 0x4d66f217),
+ TOBN(0x6c33136f, 0x17c387a4),
+ TOBN(0x5043b8d5, 0xeb86804d),
+ TOBN(0x74970312, 0x675a73c9),
+ TOBN(0x838fdb31, 0xf16669b6),
+ TOBN(0xc507b6dd, 0x418e7ddd),
+ TOBN(0x39888d93, 0x472f19d6),
+ TOBN(0x7eae26be, 0x0c27eb4d),
+ TOBN(0x17b53ed3, 0xfbabb884),
+ TOBN(0xfc27021b, 0x2b01ae4f),
+ TOBN(0x88462e87, 0xcf488682),
+ TOBN(0xbee096ec, 0x215e2d87),
+ TOBN(0xeb2fea9a, 0xd242e29b),
+ TOBN(0x5d985b5f, 0xb821fc28),
+ TOBN(0x89d2e197, 0xdc1e2ad2),
+ TOBN(0x55b566b8, 0x9030ba62),
+ TOBN(0xe3fd41b5, 0x4f41b1c6),
+ TOBN(0xb738ac2e, 0xb9a96d61),
+ TOBN(0x7f8567ca, 0x369443f4),
+ TOBN(0x8698622d, 0xf803a440),
+ TOBN(0x2b586236, 0x8fe2f4dc),
+ TOBN(0xbbcc00c7, 0x56b95bce),
+ TOBN(0x5ec03906, 0x616da680),
+ TOBN(0x79162ee6, 0x72214252),
+ TOBN(0x43132b63, 0x86a892d2),
+ TOBN(0x4bdd3ff2, 0x2f3263bf),
+ TOBN(0xd5b3733c, 0x9cd0a142),
+ TOBN(0x592eaa82, 0x44415ccb),
+ TOBN(0x663e8924, 0x8d5474ea),
+ TOBN(0x8058a25e, 0x5236344e),
+ TOBN(0x82e8df9d, 0xbda76ee6),
+ TOBN(0xdcf6efd8, 0x11cc3d22),
+ TOBN(0x00089cda, 0x3b4ab529),
+ TOBN(0x91d3a071, 0xbd38a3db),
+ TOBN(0x4ea97fc0, 0xef72b925),
+ TOBN(0x0c9fc15b, 0xea3edf75),
+ TOBN(0x5a6297cd, 0xa4348ed3),
+ TOBN(0x0d38ab35, 0xce7c42d4),
+ TOBN(0x9fd493ef, 0x82feab10),
+ TOBN(0x46056b6d, 0x82111b45),
+ TOBN(0xda11dae1, 0x73efc5c3),
+ TOBN(0xdc740278, 0x5545a7fb),
+ TOBN(0xbdb2601c, 0x40d507e6),
+ TOBN(0x121dfeeb, 0x7066fa58),
+ TOBN(0x214369a8, 0x39ae8c2a),
+ TOBN(0x195709cb, 0x06e0956c),
+ TOBN(0x4c9d254f, 0x010cd34b),
+ TOBN(0xf51e13f7, 0x0471a532),
+ TOBN(0xe19d6791, 0x1e73054d),
+ TOBN(0xf702a628, 0xdb5c7be3),
+ TOBN(0xc7141218, 0xb24dde05),
+ TOBN(0xdc18233c, 0xf29b2e2e),
+ TOBN(0x3a6bd1e8, 0x85342dba),
+ TOBN(0x3f747fa0, 0xb311898c),
+ TOBN(0xe2a272e4, 0xcd0eac65),
+ TOBN(0x4bba5851, 0xf914d0bc),
+ TOBN(0x7a1a9660, 0xc4a43ee3),
+ TOBN(0xe5a367ce, 0xa1c8cde9),
+ TOBN(0x9d958ba9, 0x7271abe3),
+ TOBN(0xf3ff7eb6, 0x3d1615cd),
+ TOBN(0xa2280dce, 0xf5ae20b0),
+ TOBN(0x56dba5c1, 0xcf640147),
+ TOBN(0xea5a2e3d, 0x5e83d118),
+ TOBN(0x04cd6b6d, 0xda24c511),
+ TOBN(0x1c0f4671, 0xe854d214),
+ TOBN(0x91a6b7a9, 0x69565381),
+ TOBN(0xdc966240, 0xdecf1f5b),
+ TOBN(0x1b22d21c, 0xfcf5d009),
+ TOBN(0x2a05f641, 0x9021dbd5),
+ TOBN(0x8c0ed566, 0xd4312483),
+ TOBN(0x5179a95d, 0x643e216f),
+ TOBN(0xcc185fec, 0x17044493),
+ TOBN(0xb3063339, 0x54991a21),
+ TOBN(0xd801ecdb, 0x0081a726),
+ TOBN(0x0149b0c6, 0x4fa89bbb),
+ TOBN(0xafe9065a, 0x4391b6b9),
+ TOBN(0xedc92786, 0xd633f3a3),
+ TOBN(0xe408c24a, 0xae6a8e13),
+ TOBN(0x85833fde, 0x9f3897ab),
+ TOBN(0x43800e7e, 0xd81a0715),
+ TOBN(0xde08e346, 0xb44ffc5f),
+ TOBN(0x7094184c, 0xcdeff2e0),
+ TOBN(0x49f9387b, 0x165eaed1),
+ TOBN(0x635d6129, 0x777c468a),
+ TOBN(0x8c0dcfd1, 0x538c2dd8),
+ TOBN(0xd6d9d9e3, 0x7a6a308b),
+ TOBN(0x62375830, 0x4c2767d3),
+ TOBN(0x874a8bc6, 0xf38cbeb6),
+ TOBN(0xd94d3f1a, 0xccb6fd9e),
+ TOBN(0x92a9735b, 0xba21f248),
+ TOBN(0x272ad0e5, 0x6cd1efb0),
+ TOBN(0x7437b69c, 0x05b03284),
+ TOBN(0xe7f04702, 0x6948c225),
+ TOBN(0x8a56c04a, 0xcba2ecec),
+ TOBN(0x0c181270, 0xe3a73e41),
+ TOBN(0x6cb34e9d, 0x03e93725),
+ TOBN(0xf77c8713, 0x496521a9),
+ TOBN(0x94569183, 0xfa7f9f90),
+ TOBN(0xf2e7aa4c, 0x8c9707ad),
+ TOBN(0xced2c9ba, 0x26c1c9a3),
+ TOBN(0x9109fe96, 0x40197507),
+ TOBN(0x9ae868a9, 0xe9adfe1c),
+ TOBN(0x3984403d, 0x314e39bb),
+ TOBN(0xb5875720, 0xf2fe378f),
+ TOBN(0x33f901e0, 0xba44a628),
+ TOBN(0xea1125fe, 0x3652438c),
+ TOBN(0xae9ec4e6, 0x9dd1f20b),
+ TOBN(0x1e740d9e, 0xbebf7fbd),
+ TOBN(0x6dbd3ddc, 0x42dbe79c),
+ TOBN(0x62082aec, 0xedd36776),
+ TOBN(0xf612c478, 0xe9859039),
+ TOBN(0xa493b201, 0x032f7065),
+ TOBN(0xebd4d8f2, 0x4ff9b211),
+ TOBN(0x3f23a0aa, 0xaac4cb32),
+ TOBN(0xea3aadb7, 0x15ed4005),
+ TOBN(0xacf17ea4, 0xafa27e63),
+ TOBN(0x56125c1a, 0xc11fd66c),
+ TOBN(0x266344a4, 0x3794f8dc),
+ TOBN(0xdcca923a, 0x483c5c36),
+ TOBN(0x2d6b6bbf, 0x3f9d10a0),
+ TOBN(0xb320c5ca, 0x81d9bdf3),
+ TOBN(0x620e28ff, 0x47b50a95),
+ TOBN(0x933e3b01, 0xcef03371),
+ TOBN(0xf081bf85, 0x99100153),
+ TOBN(0x183be9a0, 0xc3a8c8d6),
+ TOBN(0x4e3ddc5a, 0xd6bbe24d),
+ TOBN(0xc6c74630, 0x53843795),
+ TOBN(0x78193dd7, 0x65ec2d4c),
+ TOBN(0xb8df26cc, 0xcd3c89b2),
+ TOBN(0x98dbe399, 0x5a483f8d),
+ TOBN(0x72d8a957, 0x7dd3313a),
+ TOBN(0x65087294, 0xab0bd375),
+ TOBN(0xfcd89248, 0x7c259d16),
+ TOBN(0x8a9443d7, 0x7613aa81),
+ TOBN(0x80100800, 0x85fe6584),
+ TOBN(0x70fc4dbc, 0x7fb10288),
+ TOBN(0xf58280d3, 0xe86beee8),
+ TOBN(0x14fdd82f, 0x7c978c38),
+ TOBN(0xdf1204c1, 0x0de44d7b),
+ TOBN(0xa08a1c84, 0x4160252f),
+ TOBN(0x591554ca, 0xc17646a5),
+ TOBN(0x214a37d6, 0xa05bd525),
+ TOBN(0x48d5f09b, 0x07957b3c),
+ TOBN(0x0247cdcb, 0xd7109bc9),
+ TOBN(0x40f9e4bb, 0x30599ce7),
+ TOBN(0xc325fa03, 0xf46ad2ec),
+ TOBN(0x00f766cf, 0xc3e3f9ee),
+ TOBN(0xab556668, 0xd43a4577),
+ TOBN(0x68d30a61, 0x3ee03b93),
+ TOBN(0x7ddc81ea, 0x77b46a08),
+ TOBN(0xcf5a6477, 0xc7480699),
+ TOBN(0x43a8cb34, 0x6633f683),
+ TOBN(0x1b867e6b, 0x92363c60),
+ TOBN(0x43921114, 0x1f60558e),
+ TOBN(0xcdbcdd63, 0x2f41450e),
+ TOBN(0x7fc04601, 0xcc630e8b),
+ TOBN(0xea7c66d5, 0x97038b43),
+ TOBN(0x7259b8a5, 0x04e99fd8),
+ TOBN(0x98a8dd12, 0x4785549a),
+ TOBN(0x0e459a7c, 0x840552e1),
+ TOBN(0xcdfcf4d0, 0x4bb0909e),
+ TOBN(0x34a86db2, 0x53758da7),
+ TOBN(0xe643bb83, 0xeac997e1),
+ TOBN(0x96400bd7, 0x530c5b7e),
+ TOBN(0x9f97af87, 0xb41c8b52),
+ TOBN(0x34fc8820, 0xfbeee3f9),
+ TOBN(0x93e53490, 0x49091afd),
+ TOBN(0x764b9be5, 0x9a31f35c),
+ TOBN(0x71f37864, 0x57e3d924),
+ TOBN(0x02fb34e0, 0x943aa75e),
+ TOBN(0xa18c9c58, 0xab8ff6e4),
+ TOBN(0x080f31b1, 0x33cf0d19),
+ TOBN(0x5c9682db, 0x083518a7),
+ TOBN(0x873d4ca6, 0xb709c3de),
+ TOBN(0x64a84262, 0x3575b8f0),
+ TOBN(0x6275da1f, 0x020154bb),
+ TOBN(0x97678caa, 0xd17cf1ab),
+ TOBN(0x8779795f, 0x951a95c3),
+ TOBN(0xdd35b163, 0x50fccc08),
+ TOBN(0x32709627, 0x33d8f031),
+ TOBN(0x3c5ab10a, 0x498dd85c),
+ TOBN(0xb6c185c3, 0x41dca566),
+ TOBN(0x7de7feda, 0xd8622aa3),
+ TOBN(0x99e84d92, 0x901b6dfb),
+ TOBN(0x30a02b0e, 0x7c4ad288),
+ TOBN(0xc7c81daa, 0x2fd3cf36),
+ TOBN(0xd1319547, 0xdf89e59f),
+ TOBN(0xb2be8184, 0xcd496733),
+ TOBN(0xd5f449eb, 0x93d3412b),
+ TOBN(0x7ea41b1b, 0x25fe531d),
+ TOBN(0xf9797432, 0x6a1d5646),
+ TOBN(0x86067f72, 0x2bde501a),
+ TOBN(0xf91481c0, 0x0c85e89c),
+ TOBN(0xca8ee465, 0xf8b05bc6),
+ TOBN(0x1844e1cf, 0x02e83cda),
+ TOBN(0xca82114a, 0xb4dbe33b),
+ TOBN(0x0f9f8769, 0x4eabfde2),
+ TOBN(0x4936b1c0, 0x38b27fe2),
+ TOBN(0x63b6359b, 0xaba402df),
+ TOBN(0x40c0ea2f, 0x656bdbab),
+ TOBN(0x9c992a89, 0x6580c39c),
+ TOBN(0x600e8f15, 0x2a60aed1),
+ TOBN(0xeb089ca4, 0xe0bf49df),
+ TOBN(0x9c233d7d, 0x2d42d99a),
+ TOBN(0x648d3f95, 0x4c6bc2fa),
+ TOBN(0xdcc383a8, 0xe1add3f3),
+ TOBN(0xf42c0c6a, 0x4f64a348),
+ TOBN(0x2abd176f, 0x0030dbdb),
+ TOBN(0x4de501a3, 0x7d6c215e),
+ TOBN(0x4a107c1f, 0x4b9a64bc),
+ TOBN(0xa77f0ad3, 0x2496cd59),
+ TOBN(0xfb78ac62, 0x7688dffb),
+ TOBN(0x7025a2ca, 0x67937d8e),
+ TOBN(0xfde8b2d1, 0xd1a8f4e7),
+ TOBN(0xf5b3da47, 0x7354927c),
+ TOBN(0xe48606a3, 0xd9205735),
+ TOBN(0xac477cc6, 0xe177b917),
+ TOBN(0xfb1f73d2, 0xa883239a),
+ TOBN(0xe12572f6, 0xcc8b8357),
+ TOBN(0x9d355e9c, 0xfb1f4f86),
+ TOBN(0x89b795f8, 0xd9f3ec6e),
+ TOBN(0x27be56f1, 0xb54398dc),
+ TOBN(0x1890efd7, 0x3fedeed5),
+ TOBN(0x62f77f1f, 0x9c6d0140),
+ TOBN(0x7ef0e314, 0x596f0ee4),
+ TOBN(0x50ca6631, 0xcc61dab3),
+ TOBN(0x4a39801d, 0xf4866e4f),
+ TOBN(0x66c8d032, 0xae363b39),
+ TOBN(0x22c591e5, 0x2ead66aa),
+ TOBN(0x954ba308, 0xde02a53e),
+ TOBN(0x2a6c060f, 0xd389f357),
+ TOBN(0xe6cfcde8, 0xfbf40b66),
+ TOBN(0x8e02fc56, 0xc6340ce1),
+ TOBN(0xe4957795, 0x73adb4ba),
+ TOBN(0x7b86122c, 0xa7b03805),
+ TOBN(0x63f83512, 0x0c8e6fa6),
+ TOBN(0x83660ea0, 0x057d7804),
+ TOBN(0xbad79105, 0x21ba473c),
+ TOBN(0xb6c50bee, 0xded5389d),
+ TOBN(0xee2caf4d, 0xaa7c9bc0),
+ TOBN(0xd97b8de4, 0x8c4e98a7),
+ TOBN(0xa9f63e70, 0xab3bbddb),
+ TOBN(0x3898aabf, 0x2597815a),
+ TOBN(0x7659af89, 0xac15b3d9),
+ TOBN(0xedf7725b, 0x703ce784),
+ TOBN(0x25470fab, 0xe085116b),
+ TOBN(0x04a43375, 0x87285310),
+ TOBN(0x4e39187e, 0xe2bfd52f),
+ TOBN(0x36166b44, 0x7d9ebc74),
+ TOBN(0x92ad433c, 0xfd4b322c),
+ TOBN(0x726aa817, 0xba79ab51),
+ TOBN(0xf96eacd8, 0xc1db15eb),
+ TOBN(0xfaf71e91, 0x0476be63),
+ TOBN(0xdd69a640, 0x641fad98),
+ TOBN(0xb7995918, 0x29622559),
+ TOBN(0x03c6daa5, 0xde4199dc),
+ TOBN(0x92cadc97, 0xad545eb4),
+ TOBN(0x1028238b, 0x256534e4),
+ TOBN(0x73e80ce6, 0x8595409a),
+ TOBN(0x690d4c66, 0xd05dc59b),
+ TOBN(0xc95f7b8f, 0x981dee80),
+ TOBN(0xf4337014, 0xd856ac25),
+ TOBN(0x441bd9dd, 0xac524dca),
+ TOBN(0x640b3d85, 0x5f0499f5),
+ TOBN(0x39cf84a9, 0xd5fda182),
+ TOBN(0x04e7b055, 0xb2aa95a0),
+ TOBN(0x29e33f0a, 0x0ddf1860),
+ TOBN(0x082e74b5, 0x423f6b43),
+ TOBN(0x217edeb9, 0x0aaa2b0f),
+ TOBN(0x58b83f35, 0x83cbea55),
+ TOBN(0xc485ee4d, 0xbc185d70),
+ TOBN(0x833ff03b, 0x1e5f6992),
+ TOBN(0xb5b9b9cc, 0xcf0c0dd5),
+ TOBN(0x7caaee8e, 0x4e9e8a50),
+ TOBN(0x462e907b, 0x6269dafd),
+ TOBN(0x6ed5cee9, 0xfbe791c6),
+ TOBN(0x68ca3259, 0xed430790),
+ TOBN(0x2b72bdf2, 0x13b5ba88),
+ TOBN(0x60294c8a, 0x35ef0ac4),
+ TOBN(0x9c3230ed, 0x19b99b08),
+ TOBN(0x560fff17, 0x6c2589aa),
+ TOBN(0x552b8487, 0xd6770374),
+ TOBN(0xa373202d, 0x9a56f685),
+ TOBN(0xd3e7f907, 0x45f175d9),
+ TOBN(0x3c2f315f, 0xd080d810),
+ TOBN(0x1130e9dd, 0x7b9520e8),
+ TOBN(0xc078f9e2, 0x0af037b5),
+ TOBN(0x38cd2ec7, 0x1e9c104c),
+ TOBN(0x0f684368, 0xc472fe92),
+ TOBN(0xd3f1b5ed, 0x6247e7ef),
+ TOBN(0xb32d33a9, 0x396dfe21),
+ TOBN(0x46f59cf4, 0x4a9aa2c2),
+ TOBN(0x69cd5168, 0xff0f7e41),
+ TOBN(0x3f59da0f, 0x4b3234da),
+ TOBN(0xcf0b0235, 0xb4579ebe),
+ TOBN(0x6d1cbb25, 0x6d2476c7),
+ TOBN(0x4f0837e6, 0x9dc30f08),
+ TOBN(0x9a4075bb, 0x906f6e98),
+ TOBN(0x253bb434, 0xc761e7d1),
+ TOBN(0xde2e645f, 0x6e73af10),
+ TOBN(0xb89a4060, 0x0c5f131c),
+ TOBN(0xd12840c5, 0xb8cc037f),
+ TOBN(0x3d093a5b, 0x7405bb47),
+ TOBN(0x6202c253, 0x206348b8),
+ TOBN(0xbf5d57fc, 0xc55a3ca7),
+ TOBN(0x89f6c90c, 0x8c3bef48),
+ TOBN(0x23ac7623, 0x5a0a960a),
+ TOBN(0xdfbd3d6b, 0x552b42ab),
+ TOBN(0x3ef22458, 0x132061f6),
+ TOBN(0xd74e9bda, 0xc97e6516),
+ TOBN(0x88779360, 0xc230f49e),
+ TOBN(0xa6ec1de3, 0x1e74ea49),
+ TOBN(0x581dcee5, 0x3fb645a2),
+ TOBN(0xbaef2391, 0x8f483f14),
+ TOBN(0x6d2dddfc, 0xd137d13b),
+ TOBN(0x54cde50e, 0xd2743a42),
+ TOBN(0x89a34fc5, 0xe4d97e67),
+ TOBN(0x13f1f5b3, 0x12e08ce5),
+ TOBN(0xa80540b8, 0xa7f0b2ca),
+ TOBN(0x854bcf77, 0x01982805),
+ TOBN(0xb8653ffd, 0x233bea04),
+ TOBN(0x8e7b8787, 0x02b0b4c9),
+ TOBN(0x2675261f, 0x9acb170a),
+ TOBN(0x061a9d90, 0x930c14e5),
+ TOBN(0xb59b30e0, 0xdef0abea),
+ TOBN(0x1dc19ea6, 0x0200ec7d),
+ TOBN(0xb6f4a3f9, 0x0bce132b),
+ TOBN(0xb8d5de90, 0xf13e27e0),
+ TOBN(0xbaee5ef0, 0x1fade16f),
+ TOBN(0x6f406aaa, 0xe4c6cf38),
+ TOBN(0xab4cfe06, 0xd1369815),
+ TOBN(0x0dcffe87, 0xefd550c6),
+ TOBN(0x9d4f59c7, 0x75ff7d39),
+ TOBN(0xb02553b1, 0x51deb6ad),
+ TOBN(0x812399a4, 0xb1877749),
+ TOBN(0xce90f71f, 0xca6006e1),
+ TOBN(0xc32363a6, 0xb02b6e77),
+ TOBN(0x02284fbe, 0xdc36c64d),
+ TOBN(0x86c81e31, 0xa7e1ae61),
+ TOBN(0x2576c7e5, 0xb909d94a),
+ TOBN(0x8b6f7d02, 0x818b2bb0),
+ TOBN(0xeca3ed07, 0x56faa38a),
+ TOBN(0xa3790e6c, 0x9305bb54),
+ TOBN(0xd784eeda, 0x7bc73061),
+ TOBN(0xbd56d369, 0x6dd50614),
+ TOBN(0xd6575949, 0x229a8aa9),
+ TOBN(0xdcca8f47, 0x4595ec28),
+ TOBN(0x814305c1, 0x06ab4fe6),
+ TOBN(0xc8c39768, 0x24f43f16),
+ TOBN(0xe2a45f36, 0x523f2b36),
+ TOBN(0x995c6493, 0x920d93bb),
+ TOBN(0xf8afdab7, 0x90f1632b),
+ TOBN(0x79ebbecd, 0x1c295954),
+ TOBN(0xc7bb3ddb, 0x79592f48),
+ TOBN(0x67216a7b, 0x5f88e998),
+ TOBN(0xd91f098b, 0xbc01193e),
+ TOBN(0xf7d928a5, 0xb1db83fc),
+ TOBN(0x55e38417, 0xe991f600),
+ TOBN(0x2a91113e, 0x2981a934),
+ TOBN(0xcbc9d648, 0x06b13bde),
+ TOBN(0xb011b6ac, 0x0755ff44),
+ TOBN(0x6f4cb518, 0x045ec613),
+ TOBN(0x522d2d31, 0xc2f5930a),
+ TOBN(0x5acae1af, 0x382e65de),
+ TOBN(0x57643067, 0x27bc966f),
+ TOBN(0x5e12705d, 0x1c7193f0),
+ TOBN(0xf0f32f47, 0x3be8858e),
+ TOBN(0x785c3d7d, 0x96c6dfc7),
+ TOBN(0xd75b4a20, 0xbf31795d),
+ TOBN(0x91acf17b, 0x342659d4),
+ TOBN(0xe596ea34, 0x44f0378f),
+ TOBN(0x4515708f, 0xce52129d),
+ TOBN(0x17387e1e, 0x79f2f585),
+ TOBN(0x72cfd2e9, 0x49dee168),
+ TOBN(0x1ae05223, 0x3e2af239),
+ TOBN(0x009e75be, 0x1d94066a),
+ TOBN(0x6cca31c7, 0x38abf413),
+ TOBN(0xb50bd61d, 0x9bc49908),
+ TOBN(0x4a9b4a8c, 0xf5e2bc1e),
+ TOBN(0xeb6cc5f7, 0x946f83ac),
+ TOBN(0x27da93fc, 0xebffab28),
+ TOBN(0xea314c96, 0x4821c8c5),
+ TOBN(0x8de49ded, 0xa83c15f4),
+ TOBN(0x7a64cf20, 0x7af33004),
+ TOBN(0x45f1bfeb, 0xc9627e10),
+ TOBN(0x878b0626, 0x54b9df60),
+ TOBN(0x5e4fdc3c, 0xa95c0b33),
+ TOBN(0xe54a37ca, 0xc2035d8e),
+ TOBN(0x9087cda9, 0x80f20b8c),
+ TOBN(0x36f61c23, 0x8319ade4),
+ TOBN(0x766f287a, 0xde8cfdf8),
+ TOBN(0x48821948, 0x346f3705),
+ TOBN(0x49a7b853, 0x16e4f4a2),
+ TOBN(0xb9b3f8a7, 0x5cedadfd),
+ TOBN(0x8f562815, 0x8db2a815),
+ TOBN(0xc0b7d554, 0x01f68f95),
+ TOBN(0x12971e27, 0x688a208e),
+ TOBN(0xc9f8b696, 0xd0ff34fc),
+ TOBN(0x20824de2, 0x1222718c),
+ TOBN(0x7213cf9f, 0x0c95284d),
+ TOBN(0xe2ad741b, 0xdc158240),
+ TOBN(0x0ee3a6df, 0x54043ccf),
+ TOBN(0x16ff479b, 0xd84412b3),
+ TOBN(0xf6c74ee0, 0xdfc98af0),
+ TOBN(0xa78a169f, 0x52fcd2fb),
+ TOBN(0xd8ae8746, 0x99c930e9),
+ TOBN(0x1d33e858, 0x49e117a5),
+ TOBN(0x7581fcb4, 0x6624759f),
+ TOBN(0xde50644f, 0x5bedc01d),
+ TOBN(0xbeec5d00, 0xcaf3155e),
+ TOBN(0x672d66ac, 0xbc73e75f),
+ TOBN(0x86b9d8c6, 0x270b01db),
+ TOBN(0xd249ef83, 0x50f55b79),
+ TOBN(0x6131d6d4, 0x73978fe3),
+ TOBN(0xcc4e4542, 0x754b00a1),
+ TOBN(0x4e05df05, 0x57dfcfe9),
+ TOBN(0x94b29cdd, 0x51ef6bf0),
+ TOBN(0xe4530cff, 0x9bc7edf2),
+ TOBN(0x8ac236fd, 0xd3da65f3),
+ TOBN(0x0faf7d5f, 0xc8eb0b48),
+ TOBN(0x4d2de14c, 0x660eb039),
+ TOBN(0xc006bba7, 0x60430e54),
+ TOBN(0x10a2d0d6, 0xda3289ab),
+ TOBN(0x9c037a5d, 0xd7979c59),
+ TOBN(0x04d1f3d3, 0xa116d944),
+ TOBN(0x9ff22473, 0x8a0983cd),
+ TOBN(0x28e25b38, 0xc883cabb),
+ TOBN(0xe968dba5, 0x47a58995),
+ TOBN(0x2c80b505, 0x774eebdf),
+ TOBN(0xee763b71, 0x4a953beb),
+ TOBN(0x502e223f, 0x1642e7f6),
+ TOBN(0x6fe4b641, 0x61d5e722),
+ TOBN(0x9d37c5b0, 0xdbef5316),
+ TOBN(0x0115ed70, 0xf8330bc7),
+ TOBN(0x139850e6, 0x75a72789),
+ TOBN(0x27d7faec, 0xffceccc2),
+ TOBN(0x3016a860, 0x4fd9f7f6),
+ TOBN(0xc492ec64, 0x4cd8f64c),
+ TOBN(0x58a2d790, 0x279d7b51),
+ TOBN(0x0ced1fc5, 0x1fc75256),
+ TOBN(0x3e658aed, 0x8f433017),
+ TOBN(0x0b61942e, 0x05da59eb),
+ TOBN(0xba3d60a3, 0x0ddc3722),
+ TOBN(0x7c311cd1, 0x742e7f87),
+ TOBN(0x6473ffee, 0xf6b01b6e),
+ },
+ {
+ TOBN(0x8303604f, 0x692ac542),
+ TOBN(0xf079ffe1, 0x227b91d3),
+ TOBN(0x19f63e63, 0x15aaf9bd),
+ TOBN(0xf99ee565, 0xf1f344fb),
+ TOBN(0x8a1d661f, 0xd6219199),
+ TOBN(0x8c883bc6, 0xd48ce41c),
+ TOBN(0x1065118f, 0x3c74d904),
+ TOBN(0x713889ee, 0x0faf8b1b),
+ TOBN(0x972b3f8f, 0x81a1b3be),
+ TOBN(0x4f3ce145, 0xce2764a0),
+ TOBN(0xe2d0f1cc, 0x28c4f5f7),
+ TOBN(0xdeee0c0d, 0xc7f3985b),
+ TOBN(0x7df4adc0, 0xd39e25c3),
+ TOBN(0x40619820, 0xc467a080),
+ TOBN(0x440ebc93, 0x61cf5a58),
+ TOBN(0x527729a6, 0x422ad600),
+ TOBN(0xca6c0937, 0xb1b76ba6),
+ TOBN(0x1a2eab85, 0x4d2026dc),
+ TOBN(0xb1715e15, 0x19d9ae0a),
+ TOBN(0xf1ad9199, 0xbac4a026),
+ TOBN(0x35b3dfb8, 0x07ea7b0e),
+ TOBN(0xedf5496f, 0x3ed9eb89),
+ TOBN(0x8932e5ff, 0x2d6d08ab),
+ TOBN(0xf314874e, 0x25bd2731),
+ TOBN(0xefb26a75, 0x3f73f449),
+ TOBN(0x1d1c94f8, 0x8d44fc79),
+ TOBN(0x49f0fbc5, 0x3bc0dc4d),
+ TOBN(0xb747ea0b, 0x3698a0d0),
+ TOBN(0x5218c3fe, 0x228d291e),
+ TOBN(0x35b804b5, 0x43c129d6),
+ TOBN(0xfac859b8, 0xd1acc516),
+ TOBN(0x6c10697d, 0x95d6e668),
+ TOBN(0xc38e438f, 0x0876fd4e),
+ TOBN(0x45f0c307, 0x83d2f383),
+ TOBN(0x203cc2ec, 0xb10934cb),
+ TOBN(0x6a8f2439, 0x2c9d46ee),
+ TOBN(0xf16b431b, 0x65ccde7b),
+ TOBN(0x41e2cd18, 0x27e76a6f),
+ TOBN(0xb9c8cf8f, 0x4e3484d7),
+ TOBN(0x64426efd, 0x8315244a),
+ TOBN(0x1c0a8e44, 0xfc94dea3),
+ TOBN(0x34c8cdbf, 0xdad6a0b0),
+ TOBN(0x919c3840, 0x04113cef),
+ TOBN(0xfd32fba4, 0x15490ffa),
+ TOBN(0x58d190f6, 0x795dcfb7),
+ TOBN(0xfef01b03, 0x83588baf),
+ TOBN(0x9e6d1d63, 0xca1fc1c0),
+ TOBN(0x53173f96, 0xf0a41ac9),
+ TOBN(0x2b1d402a, 0xba16f73b),
+ TOBN(0x2fb31014, 0x8cf9b9fc),
+ TOBN(0x2d51e60e, 0x446ef7bf),
+ TOBN(0xc731021b, 0xb91e1745),
+ TOBN(0x9d3b4724, 0x4fee99d4),
+ TOBN(0x4bca48b6, 0xfac5c1ea),
+ TOBN(0x70f5f514, 0xbbea9af7),
+ TOBN(0x751f55a5, 0x974c283a),
+ TOBN(0x6e30251a, 0xcb452fdb),
+ TOBN(0x31ee6965, 0x50f30650),
+ TOBN(0xb0b3e508, 0x933548d9),
+ TOBN(0xb8949a4f, 0xf4b0ef5b),
+ TOBN(0x208b8326, 0x3c88f3bd),
+ TOBN(0xab147c30, 0xdb1d9989),
+ TOBN(0xed6515fd, 0x44d4df03),
+ TOBN(0x17a12f75, 0xe72eb0c5),
+ TOBN(0x3b59796d, 0x36cf69db),
+ TOBN(0x1219eee9, 0x56670c18),
+ TOBN(0xfe3341f7, 0x7a070d8e),
+ TOBN(0x9b70130b, 0xa327f90c),
+ TOBN(0x36a32462, 0x0ae18e0e),
+ TOBN(0x2021a623, 0x46c0a638),
+ TOBN(0x251b5817, 0xc62eb0d4),
+ TOBN(0x87bfbcdf, 0x4c762293),
+ TOBN(0xf78ab505, 0xcdd61d64),
+ TOBN(0x8c7a53fc, 0xc8c18857),
+ TOBN(0xa653ce6f, 0x16147515),
+ TOBN(0x9c923aa5, 0xea7d52d5),
+ TOBN(0xc24709cb, 0x5c18871f),
+ TOBN(0x7d53bec8, 0x73b3cc74),
+ TOBN(0x59264aff, 0xfdd1d4c4),
+ TOBN(0x5555917e, 0x240da582),
+ TOBN(0xcae8bbda, 0x548f5a0e),
+ TOBN(0x1910eaba, 0x3bbfbbe1),
+ TOBN(0xae579685, 0x7677afc3),
+ TOBN(0x49ea61f1, 0x73ff0b5c),
+ TOBN(0x78655478, 0x4f7c3922),
+ TOBN(0x95d337cd, 0x20c68eef),
+ TOBN(0x68f1e1e5, 0xdf779ab9),
+ TOBN(0x14b491b0, 0xb5cf69a8),
+ TOBN(0x7a6cbbe0, 0x28e3fe89),
+ TOBN(0xe7e1fee4, 0xc5aac0eb),
+ TOBN(0x7f47eda5, 0x697e5140),
+ TOBN(0x4f450137, 0xb454921f),
+ TOBN(0xdb625f84, 0x95cd8185),
+ TOBN(0x74be0ba1, 0xcdb2e583),
+ TOBN(0xaee4fd7c, 0xdd5e6de4),
+ TOBN(0x4251437d, 0xe8101739),
+ TOBN(0x686d72a0, 0xac620366),
+ TOBN(0x4be3fb9c, 0xb6d59344),
+ TOBN(0x6e8b44e7, 0xa1eb75b9),
+ TOBN(0x84e39da3, 0x91a5c10c),
+ TOBN(0x37cc1490, 0xb38f0409),
+ TOBN(0x02951943, 0x2c2ade82),
+ TOBN(0x9b688783, 0x1190a2d8),
+ TOBN(0x25627d14, 0x231182ba),
+ TOBN(0x6eb550aa, 0x658a6d87),
+ TOBN(0x1405aaa7, 0xcf9c7325),
+ TOBN(0xd147142e, 0x5c8748c9),
+ TOBN(0x7f637e4f, 0x53ede0e0),
+ TOBN(0xf8ca2776, 0x14ffad2c),
+ TOBN(0xe58fb1bd, 0xbafb6791),
+ TOBN(0x17158c23, 0xbf8f93fc),
+ TOBN(0x7f15b373, 0x0a4a4655),
+ TOBN(0x39d4add2, 0xd842ca72),
+ TOBN(0xa71e4391, 0x3ed96305),
+ TOBN(0x5bb09cbe, 0x6700be14),
+ TOBN(0x68d69d54, 0xd8befcf6),
+ TOBN(0xa45f5367, 0x37183bcf),
+ TOBN(0x7152b7bb, 0x3370dff7),
+ TOBN(0xcf887baa, 0xbf12525b),
+ TOBN(0xe7ac7bdd, 0xd6d1e3cd),
+ TOBN(0x25914f78, 0x81fdad90),
+ TOBN(0xcf638f56, 0x0d2cf6ab),
+ TOBN(0xb90bc03f, 0xcc054de5),
+ TOBN(0x932811a7, 0x18b06350),
+ TOBN(0x2f00b330, 0x9bbd11ff),
+ TOBN(0x76108a6f, 0xb4044974),
+ TOBN(0x801bb9e0, 0xa851d266),
+ TOBN(0x0dd099be, 0xbf8990c1),
+ TOBN(0x58c5aaaa, 0xabe32986),
+ TOBN(0x0fe9dd2a, 0x50d59c27),
+ TOBN(0x84951ff4, 0x8d307305),
+ TOBN(0x6c23f829, 0x86529b78),
+ TOBN(0x50bb2218, 0x0b136a79),
+ TOBN(0x7e2174de, 0x77a20996),
+ TOBN(0x6f00a4b9, 0xc0bb4da6),
+ TOBN(0x89a25a17, 0xefdde8da),
+ TOBN(0xf728a27e, 0xc11ee01d),
+ TOBN(0xf900553a, 0xe5f10dfb),
+ TOBN(0x189a83c8, 0x02ec893c),
+ TOBN(0x3ca5bdc1, 0x23f66d77),
+ TOBN(0x98781537, 0x97eada9f),
+ TOBN(0x59c50ab3, 0x10256230),
+ TOBN(0x346042d9, 0x323c69b3),
+ TOBN(0x1b715a6d, 0x2c460449),
+ TOBN(0xa41dd476, 0x6ae06e0b),
+ TOBN(0xcdd7888e, 0x9d42e25f),
+ TOBN(0x0f395f74, 0x56b25a20),
+ TOBN(0xeadfe0ae, 0x8700e27e),
+ TOBN(0xb09d52a9, 0x69950093),
+ TOBN(0x3525d9cb, 0x327f8d40),
+ TOBN(0xb8235a94, 0x67df886a),
+ TOBN(0x77e4b0dd, 0x035faec2),
+ TOBN(0x115eb20a, 0x517d7061),
+ TOBN(0x77fe3433, 0x6c2df683),
+ TOBN(0x6870ddc7, 0xcdc6fc67),
+ TOBN(0xb1610588, 0x0b87de83),
+ TOBN(0x343584ca, 0xd9c4ddbe),
+ TOBN(0xb3164f1c, 0x3d754be2),
+ TOBN(0x0731ed3a, 0xc1e6c894),
+ TOBN(0x26327dec, 0x4f6b904c),
+ TOBN(0x9d49c6de, 0x97b5cd32),
+ TOBN(0x40835dae, 0xb5eceecd),
+ TOBN(0xc66350ed, 0xd9ded7fe),
+ TOBN(0x8aeebb5c, 0x7a678804),
+ TOBN(0x51d42fb7, 0x5b8ee9ec),
+ TOBN(0xd7a17bdd, 0x8e3ca118),
+ TOBN(0x40d7511a, 0x2ef4400e),
+ TOBN(0xc48990ac, 0x875a66f4),
+ TOBN(0x8de07d2a, 0x2199e347),
+ TOBN(0xbee75556, 0x2a39e051),
+ TOBN(0x56918786, 0x916e51dc),
+ TOBN(0xeb191313, 0x4a2d89ec),
+ TOBN(0x6679610d, 0x37d341ed),
+ TOBN(0x434fbb41, 0x56d51c2b),
+ TOBN(0xe54b7ee7, 0xd7492dba),
+ TOBN(0xaa33a79a, 0x59021493),
+ TOBN(0x49fc5054, 0xe4bd6d3d),
+ TOBN(0x09540f04, 0x5ab551d0),
+ TOBN(0x8acc9085, 0x4942d3a6),
+ TOBN(0x231af02f, 0x2d28323b),
+ TOBN(0x93458cac, 0x0992c163),
+ TOBN(0x1fef8e71, 0x888e3bb4),
+ TOBN(0x27578da5, 0xbe8c268c),
+ TOBN(0xcc8be792, 0xe805ec00),
+ TOBN(0x29267bae, 0xc61c3855),
+ TOBN(0xebff429d, 0x58c1fd3b),
+ TOBN(0x22d886c0, 0x8c0b93b8),
+ TOBN(0xca5e00b2, 0x2ddb8953),
+ TOBN(0xcf330117, 0xc3fed8b7),
+ TOBN(0xd49ac6fa, 0x819c01f6),
+ TOBN(0x6ddaa6bd, 0x3c0fbd54),
+ TOBN(0x91743068, 0x8049a2cf),
+ TOBN(0xd67f981e, 0xaff2ef81),
+ TOBN(0xc3654d35, 0x2818ae80),
+ TOBN(0x81d05044, 0x1b2aa892),
+ TOBN(0x2db067bf, 0x3d099328),
+ TOBN(0xe7c79e86, 0x703dcc97),
+ TOBN(0xe66f9b37, 0xe133e215),
+ TOBN(0xcdf119a6, 0xe39a7a5c),
+ TOBN(0x47c60de3, 0x876f1b61),
+ TOBN(0x6e405939, 0xd860f1b2),
+ TOBN(0x3e9a1dbc, 0xf5ed4d4a),
+ TOBN(0x3f23619e, 0xc9b6bcbd),
+ TOBN(0x5ee790cf, 0x734e4497),
+ TOBN(0xf0a834b1, 0x5bdaf9bb),
+ TOBN(0x02cedda7, 0x4ca295f0),
+ TOBN(0x4619aa2b, 0xcb8e378c),
+ TOBN(0xe5613244, 0xcc987ea4),
+ TOBN(0x0bc022cc, 0x76b23a50),
+ TOBN(0x4a2793ad, 0x0a6c21ce),
+ TOBN(0x38328780, 0x89cac3f5),
+ TOBN(0x29176f1b, 0xcba26d56),
+ TOBN(0x06296187, 0x4f6f59eb),
+ TOBN(0x86e9bca9, 0x8bdc658e),
+ TOBN(0x2ca9c4d3, 0x57e30402),
+ TOBN(0x5438b216, 0x516a09bb),
+ TOBN(0x0a6a063c, 0x7672765a),
+ TOBN(0x37a3ce64, 0x0547b9bf),
+ TOBN(0x42c099c8, 0x98b1a633),
+ TOBN(0xb5ab800d, 0x05ee6961),
+ TOBN(0xf1963f59, 0x11a5acd6),
+ TOBN(0xbaee6157, 0x46201063),
+ TOBN(0x36d9a649, 0xa596210a),
+ TOBN(0xaed04363, 0x1ba7138c),
+ TOBN(0xcf817d1c, 0xa4a82b76),
+ TOBN(0x5586960e, 0xf3806be9),
+ TOBN(0x7ab67c89, 0x09dc6bb5),
+ TOBN(0x52ace7a0, 0x114fe7eb),
+ TOBN(0xcd987618, 0xcbbc9b70),
+ TOBN(0x4f06fd5a, 0x604ca5e1),
+ TOBN(0x90af14ca, 0x6dbde133),
+ TOBN(0x1afe4322, 0x948a3264),
+ TOBN(0xa70d2ca6, 0xc44b2c6c),
+ TOBN(0xab726799, 0x0ef87dfe),
+ TOBN(0x310f64dc, 0x2e696377),
+ TOBN(0x49b42e68, 0x4c8126a0),
+ TOBN(0x0ea444c3, 0xcea0b176),
+ TOBN(0x53a8ddf7, 0xcb269182),
+ TOBN(0xf3e674eb, 0xbbba9dcb),
+ TOBN(0x0d2878a8, 0xd8669d33),
+ TOBN(0x04b935d5, 0xd019b6a3),
+ TOBN(0xbb5cf88e, 0x406f1e46),
+ TOBN(0xa1912d16, 0x5b57c111),
+ TOBN(0x9803fc21, 0x19ebfd78),
+ TOBN(0x4f231c9e, 0xc07764a9),
+ TOBN(0xd93286ee, 0xb75bd055),
+ TOBN(0x83a9457d, 0x8ee6c9de),
+ TOBN(0x04695915, 0x6087ec90),
+ TOBN(0x14c6dd8a, 0x58d6cd46),
+ TOBN(0x9cb633b5, 0x8e6634d2),
+ TOBN(0xc1305047, 0xf81bc328),
+ TOBN(0x12ede0e2, 0x26a177e5),
+ TOBN(0x332cca62, 0x065a6f4f),
+ TOBN(0xc3a47ecd, 0x67be487b),
+ TOBN(0x741eb187, 0x0f47ed1c),
+ TOBN(0x99e66e58, 0xe7598b14),
+ TOBN(0x6f0544ca, 0x63d0ff12),
+ TOBN(0xe5efc784, 0xb610a05f),
+ TOBN(0xf72917b1, 0x7cad7b47),
+ TOBN(0x3ff6ea20, 0xf2cac0c0),
+ TOBN(0xcc23791b, 0xf21db8b7),
+ TOBN(0x7dac70b1, 0xd7d93565),
+ TOBN(0x682cda1d, 0x694bdaad),
+ TOBN(0xeb88bb8c, 0x1023516d),
+ TOBN(0xc4c634b4, 0xdfdbeb1b),
+ TOBN(0x22f5ca72, 0xb4ee4dea),
+ TOBN(0x1045a368, 0xe6524821),
+ TOBN(0xed9e8a3f, 0x052b18b2),
+ TOBN(0x9b7f2cb1, 0xb961f49a),
+ TOBN(0x7fee2ec1, 0x7b009670),
+ TOBN(0x350d8754, 0x22507a6d),
+ TOBN(0x561bd711, 0x4db55f1d),
+ TOBN(0x4c189ccc, 0x320bbcaf),
+ TOBN(0x568434cf, 0xdf1de48c),
+ TOBN(0x6af1b00e, 0x0fa8f128),
+ TOBN(0xf0ba9d02, 0x8907583c),
+ TOBN(0x735a4004, 0x32ff9f60),
+ TOBN(0x3dd8e4b6, 0xc25dcf33),
+ TOBN(0xf2230f16, 0x42c74cef),
+ TOBN(0xd8117623, 0x013fa8ad),
+ TOBN(0x36822876, 0xf51fe76e),
+ TOBN(0x8a6811cc, 0x11d62589),
+ TOBN(0xc3fc7e65, 0x46225718),
+ TOBN(0xb7df2c9f, 0xc82fdbcd),
+ TOBN(0x3b1d4e52, 0xdd7b205b),
+ TOBN(0xb6959478, 0x47a2e414),
+ TOBN(0x05e4d793, 0xefa91148),
+ TOBN(0xb47ed446, 0xfd2e9675),
+ TOBN(0x1a7098b9, 0x04c9d9bf),
+ TOBN(0x661e2881, 0x1b793048),
+ TOBN(0xb1a16966, 0xb01ee461),
+ TOBN(0xbc521308, 0x2954746f),
+ TOBN(0xc909a0fc, 0x2477de50),
+ TOBN(0xd80bb41c, 0x7dbd51ef),
+ TOBN(0xa85be7ec, 0x53294905),
+ TOBN(0x6d465b18, 0x83958f97),
+ TOBN(0x16f6f330, 0xfb6840fd),
+ TOBN(0xfaaeb214, 0x3401e6c8),
+ TOBN(0xaf83d30f, 0xccb5b4f8),
+ TOBN(0x22885739, 0x266dec4b),
+ TOBN(0x51b4367c, 0x7bc467df),
+ TOBN(0x926562e3, 0xd842d27a),
+ TOBN(0xdfcb6614, 0x0fea14a6),
+ TOBN(0xeb394dae, 0xf2734cd9),
+ TOBN(0x3eeae5d2, 0x11c0be98),
+ TOBN(0xb1e6ed11, 0x814e8165),
+ TOBN(0x191086bc, 0xe52bce1c),
+ TOBN(0x14b74cc6, 0xa75a04da),
+ TOBN(0x63cf1186, 0x8c060985),
+ TOBN(0x071047de, 0x2dbd7f7c),
+ TOBN(0x4e433b8b, 0xce0942ca),
+ TOBN(0xecbac447, 0xd8fec61d),
+ TOBN(0x8f0ed0e2, 0xebf3232f),
+ TOBN(0xfff80f9e, 0xc52a2edd),
+ TOBN(0xad9ab433, 0x75b55fdb),
+ TOBN(0x73ca7820, 0xe42e0c11),
+ TOBN(0x6dace0a0, 0xe6251b46),
+ TOBN(0x89bc6b5c, 0x4c0d932d),
+ TOBN(0x3438cd77, 0x095da19a),
+ TOBN(0x2f24a939, 0x8d48bdfb),
+ TOBN(0x99b47e46, 0x766561b7),
+ TOBN(0x736600e6, 0x0ed0322a),
+ TOBN(0x06a47cb1, 0x638e1865),
+ TOBN(0x927c1c2d, 0xcb136000),
+ TOBN(0x29542337, 0x0cc5df69),
+ TOBN(0x99b37c02, 0x09d649a9),
+ TOBN(0xc5f0043c, 0x6aefdb27),
+ TOBN(0x6cdd9987, 0x1be95c27),
+ TOBN(0x69850931, 0x390420d2),
+ TOBN(0x299c40ac, 0x0983efa4),
+ TOBN(0x3a05e778, 0xaf39aead),
+ TOBN(0x84274408, 0x43a45193),
+ TOBN(0x6bcd0fb9, 0x91a711a0),
+ TOBN(0x461592c8, 0x9f52ab17),
+ TOBN(0xb49302b4, 0xda3c6ed6),
+ TOBN(0xc51fddc7, 0x330d7067),
+ TOBN(0x94babeb6, 0xda50d531),
+ TOBN(0x521b840d, 0xa6a7b9da),
+ TOBN(0x5305151e, 0x404bdc89),
+ TOBN(0x1bcde201, 0xd0d07449),
+ TOBN(0xf427a78b, 0x3b76a59a),
+ TOBN(0xf84841ce, 0x07791a1b),
+ TOBN(0xebd314be, 0xbf91ed1c),
+ TOBN(0x8e61d34c, 0xbf172943),
+ TOBN(0x1d5dc451, 0x5541b892),
+ TOBN(0xb186ee41, 0xfc9d9e54),
+ TOBN(0x9d9f345e, 0xd5bf610d),
+ TOBN(0x3e7ba65d, 0xf6acca9f),
+ TOBN(0x9dda787a, 0xa8369486),
+ TOBN(0x09f9dab7, 0x8eb5ba53),
+ TOBN(0x5afb2033, 0xd6481bc3),
+ TOBN(0x76f4ce30, 0xafa62104),
+ TOBN(0xa8fa00cf, 0xf4f066b5),
+ TOBN(0x89ab5143, 0x461dafc2),
+ TOBN(0x44339ed7, 0xa3389998),
+ TOBN(0x2ff862f1, 0xbc214903),
+ TOBN(0x2c88f985, 0xb05556e3),
+ TOBN(0xcd96058e, 0x3467081e),
+ TOBN(0x7d6a4176, 0xedc637ea),
+ TOBN(0xe1743d09, 0x36a5acdc),
+ TOBN(0x66fd72e2, 0x7eb37726),
+ TOBN(0xf7fa264e, 0x1481a037),
+ TOBN(0x9fbd3bde, 0x45f4aa79),
+ TOBN(0xed1e0147, 0x767c3e22),
+ TOBN(0x7621f979, 0x82e7abe2),
+ TOBN(0x19eedc72, 0x45f633f8),
+ TOBN(0xe69b155e, 0x6137bf3a),
+ TOBN(0xa0ad13ce, 0x414ee94e),
+ TOBN(0x93e3d524, 0x1c0e651a),
+ TOBN(0xab1a6e2a, 0x02ce227e),
+ TOBN(0xe7af1797, 0x4ab27eca),
+ TOBN(0x245446de, 0xbd444f39),
+ TOBN(0x59e22a21, 0x56c07613),
+ TOBN(0x43deafce, 0xf4275498),
+ TOBN(0x10834ccb, 0x67fd0946),
+ TOBN(0xa75841e5, 0x47406edf),
+ TOBN(0xebd6a677, 0x7b0ac93d),
+ TOBN(0xa6e37b0d, 0x78f5e0d7),
+ TOBN(0x2516c096, 0x76f5492b),
+ TOBN(0x1e4bf888, 0x9ac05f3a),
+ TOBN(0xcdb42ce0, 0x4df0ba2b),
+ TOBN(0x935d5cfd, 0x5062341b),
+ TOBN(0x8a303333, 0x82acac20),
+ TOBN(0x429438c4, 0x5198b00e),
+ TOBN(0x1d083bc9, 0x049d33fa),
+ TOBN(0x58b82dda, 0x946f67ff),
+ TOBN(0xac3e2db8, 0x67a1d6a3),
+ TOBN(0x62e6bead, 0x1798aac8),
+ TOBN(0xfc85980f, 0xde46c58c),
+ TOBN(0xa7f69379, 0x69c8d7be),
+ TOBN(0x23557927, 0x837b35ec),
+ TOBN(0x06a933d8, 0xe0790c0c),
+ TOBN(0x827c0e9b, 0x077ff55d),
+ TOBN(0x53977798, 0xbb26e680),
+ TOBN(0x59530874, 0x1d9cb54f),
+ TOBN(0xcca3f449, 0x4aac53ef),
+ TOBN(0x11dc5c87, 0xa07eda0f),
+ TOBN(0xc138bccf, 0xfd6400c8),
+ TOBN(0x549680d3, 0x13e5da72),
+ TOBN(0xc93eed82, 0x4540617e),
+ TOBN(0xfd3db157, 0x4d0b75c0),
+ TOBN(0x9716eb42, 0x6386075b),
+ TOBN(0x0639605c, 0x817b2c16),
+ TOBN(0x09915109, 0xf1e4f201),
+ TOBN(0x35c9a928, 0x5cca6c3b),
+ TOBN(0xb25f7d1a, 0x3505c900),
+ TOBN(0xeb9f7d20, 0x630480c4),
+ TOBN(0xc3c7b8c6, 0x2a1a501c),
+ TOBN(0x3f99183c, 0x5a1f8e24),
+ TOBN(0xfdb118fa, 0x9dd255f0),
+ TOBN(0xb9b18b90, 0xc27f62a6),
+ TOBN(0xe8f732f7, 0x396ec191),
+ TOBN(0x524a2d91, 0x0be786ab),
+ TOBN(0x5d32adef, 0x0ac5a0f5),
+ TOBN(0x9b53d4d6, 0x9725f694),
+ TOBN(0x032a76c6, 0x0510ba89),
+ TOBN(0x840391a3, 0xebeb1544),
+ TOBN(0x44b7b88c, 0x3ed73ac3),
+ TOBN(0xd24bae7a, 0x256cb8b3),
+ TOBN(0x7ceb151a, 0xe394cb12),
+ TOBN(0xbd6b66d0, 0x5bc1e6a8),
+ TOBN(0xec70cecb, 0x090f07bf),
+ TOBN(0x270644ed, 0x7d937589),
+ TOBN(0xee9e1a3d, 0x5f1dccfe),
+ TOBN(0xb0d40a84, 0x745b98d2),
+ TOBN(0xda429a21, 0x2556ed40),
+ TOBN(0xf676eced, 0x85148cb9),
+ TOBN(0x5a22d40c, 0xded18936),
+ TOBN(0x3bc4b9e5, 0x70e8a4ce),
+ TOBN(0xbfd1445b, 0x9eae0379),
+ TOBN(0xf23f2c0c, 0x1a0bd47e),
+ TOBN(0xa9c0bb31, 0xe1845531),
+ TOBN(0x9ddc4d60, 0x0a4c3f6b),
+ TOBN(0xbdfaad79, 0x2c15ef44),
+ TOBN(0xce55a236, 0x7f484acc),
+ TOBN(0x08653ca7, 0x055b1f15),
+ TOBN(0x2efa8724, 0x538873a3),
+ TOBN(0x09299e5d, 0xace1c7e7),
+ TOBN(0x07afab66, 0xade332ba),
+ TOBN(0x9be1fdf6, 0x92dd71b7),
+ TOBN(0xa49b5d59, 0x5758b11c),
+ TOBN(0x0b852893, 0xc8654f40),
+ TOBN(0xb63ef6f4, 0x52379447),
+ TOBN(0xd4957d29, 0x105e690c),
+ TOBN(0x7d484363, 0x646559b0),
+ TOBN(0xf4a8273c, 0x49788a8e),
+ TOBN(0xee406cb8, 0x34ce54a9),
+ TOBN(0x1e1c260f, 0xf86fda9b),
+ TOBN(0xe150e228, 0xcf6a4a81),
+ TOBN(0x1fa3b6a3, 0x1b488772),
+ TOBN(0x1e6ff110, 0xc5a9c15b),
+ TOBN(0xc6133b91, 0x8ad6aa47),
+ TOBN(0x8ac5d55c, 0x9dffa978),
+ TOBN(0xba1d1c1d, 0x5f3965f2),
+ TOBN(0xf969f4e0, 0x7732b52f),
+ TOBN(0xfceecdb5, 0xa5172a07),
+ TOBN(0xb0120a5f, 0x10f2b8f5),
+ TOBN(0xc83a6cdf, 0x5c4c2f63),
+ TOBN(0x4d47a491, 0xf8f9c213),
+ TOBN(0xd9e1cce5, 0xd3f1bbd5),
+ TOBN(0x0d91bc7c, 0xaba7e372),
+ TOBN(0xfcdc74c8, 0xdfd1a2db),
+ TOBN(0x05efa800, 0x374618e5),
+ TOBN(0x11216969, 0x15a7925e),
+ TOBN(0xd4c89823, 0xf6021c5d),
+ TOBN(0x880d5e84, 0xeff14423),
+ TOBN(0x6523bc5a, 0x6dcd1396),
+ TOBN(0xd1acfdfc, 0x113c978b),
+ TOBN(0xb0c164e8, 0xbbb66840),
+ TOBN(0xf7f4301e, 0x72b58459),
+ TOBN(0xc29ad4a6, 0xa638e8ec),
+ TOBN(0xf5ab8961, 0x46b78699),
+ TOBN(0x9dbd7974, 0x0e954750),
+ TOBN(0x0121de88, 0x64f9d2c6),
+ TOBN(0x2e597b42, 0xd985232e),
+ TOBN(0x55b6c3c5, 0x53451777),
+ TOBN(0xbb53e547, 0x519cb9fb),
+ TOBN(0xf134019f, 0x8428600d),
+ TOBN(0x5a473176, 0xe081791a),
+ TOBN(0x2f3e2263, 0x35fb0c08),
+ TOBN(0xb28c3017, 0x73d273b0),
+ TOBN(0xccd21076, 0x7721ef9a),
+ TOBN(0x054cc292, 0xb650dc39),
+ TOBN(0x662246de, 0x6188045e),
+ TOBN(0x904b52fa, 0x6b83c0d1),
+ TOBN(0xa72df267, 0x97e9cd46),
+ TOBN(0x886b43cd, 0x899725e4),
+ TOBN(0x2b651688, 0xd849ff22),
+ TOBN(0x60479b79, 0x02f34533),
+ TOBN(0x5e354c14, 0x0c77c148),
+ TOBN(0xb4bb7581, 0xa8537c78),
+ TOBN(0x188043d7, 0xefe1495f),
+ TOBN(0x9ba12f42, 0x8c1d5026),
+ TOBN(0x2e0c8a26, 0x93d4aaab),
+ TOBN(0xbdba7b8b, 0xaa57c450),
+ TOBN(0x140c9ad6, 0x9bbdafef),
+ TOBN(0x2067aa42, 0x25ac0f18),
+ TOBN(0xf7b1295b, 0x04d1fbf3),
+ TOBN(0x14829111, 0xa4b04824),
+ TOBN(0x2ce3f192, 0x33bd5e91),
+ TOBN(0x9c7a1d55, 0x8f2e1b72),
+ TOBN(0xfe932286, 0x302aa243),
+ TOBN(0x497ca7b4, 0xd4be9554),
+ TOBN(0xb8e821b8, 0xe0547a6e),
+ TOBN(0xfb2838be, 0x67e573e0),
+ TOBN(0x05891db9, 0x4084c44b),
+ TOBN(0x91311373, 0x96c1c2c5),
+ TOBN(0x6aebfa3f, 0xd958444b),
+ TOBN(0xac9cdce9, 0xe56e55c1),
+ TOBN(0x7148ced3, 0x2caa46d0),
+ TOBN(0x2e10c7ef, 0xb61fe8eb),
+ TOBN(0x9fd835da, 0xff97cf4d),
+ },
+ {
+ TOBN(0xa36da109, 0x081e9387),
+ TOBN(0xfb9780d7, 0x8c935828),
+ TOBN(0xd5940332, 0xe540b015),
+ TOBN(0xc9d7b51b, 0xe0f466fa),
+ TOBN(0xfaadcd41, 0xd6d9f671),
+ TOBN(0xba6c1e28, 0xb1a2ac17),
+ TOBN(0x066a7833, 0xed201e5f),
+ TOBN(0x19d99719, 0xf90f462b),
+ TOBN(0xf431f462, 0x060b5f61),
+ TOBN(0xa56f46b4, 0x7bd057c2),
+ TOBN(0x348dca6c, 0x47e1bf65),
+ TOBN(0x9a38783e, 0x41bcf1ff),
+ TOBN(0x7a5d33a9, 0xda710718),
+ TOBN(0x5a779987, 0x2e0aeaf6),
+ TOBN(0xca87314d, 0x2d29d187),
+ TOBN(0xfa0edc3e, 0xc687d733),
+ TOBN(0x9df33621, 0x6a31e09b),
+ TOBN(0xde89e44d, 0xc1350e35),
+ TOBN(0x29214871, 0x4ca0cf52),
+ TOBN(0xdf379672, 0x0b88a538),
+ TOBN(0xc92a510a, 0x2591d61b),
+ TOBN(0x79aa87d7, 0x585b447b),
+ TOBN(0xf67db604, 0xe5287f77),
+ TOBN(0x1697c8bf, 0x5efe7a80),
+ TOBN(0x1c894849, 0xcb198ac7),
+ TOBN(0xa884a93d, 0x0f264665),
+ TOBN(0x2da964ef, 0x9b200678),
+ TOBN(0x3c351b87, 0x009834e6),
+ TOBN(0xafb2ef9f, 0xe2c4b44b),
+ TOBN(0x580f6c47, 0x3326790c),
+ TOBN(0xb8480521, 0x0b02264a),
+ TOBN(0x8ba6f9e2, 0x42a194e2),
+ TOBN(0xfc87975f, 0x8fb54738),
+ TOBN(0x35160788, 0x27c3ead3),
+ TOBN(0x834116d2, 0xb74a085a),
+ TOBN(0x53c99a73, 0xa62fe996),
+ TOBN(0x87585be0, 0x5b81c51b),
+ TOBN(0x925bafa8, 0xbe0852b7),
+ TOBN(0x76a4fafd, 0xa84d19a7),
+ TOBN(0x39a45982, 0x585206d4),
+ TOBN(0x499b6ab6, 0x5eb03c0e),
+ TOBN(0xf19b7954, 0x72bc3fde),
+ TOBN(0xa86b5b9c, 0x6e3a80d2),
+ TOBN(0xe4377508, 0x6d42819f),
+ TOBN(0xc1663650, 0xbb3ee8a3),
+ TOBN(0x75eb14fc, 0xb132075f),
+ TOBN(0xa8ccc906, 0x7ad834f6),
+ TOBN(0xea6a2474, 0xe6e92ffd),
+ TOBN(0x9d72fd95, 0x0f8d6758),
+ TOBN(0xcb84e101, 0x408c07dd),
+ TOBN(0xb9114bfd, 0xa5e23221),
+ TOBN(0x358b5fe2, 0xe94e742c),
+ TOBN(0x1c0577ec, 0x95f40e75),
+ TOBN(0xf0155451, 0x3d73f3d6),
+ TOBN(0x9d55cd67, 0xbd1b9b66),
+ TOBN(0x63e86e78, 0xaf8d63c7),
+ TOBN(0x39d934ab, 0xd3c095f1),
+ TOBN(0x04b261be, 0xe4b76d71),
+ TOBN(0x1d2e6970, 0xe73e6984),
+ TOBN(0x879fb23b, 0x5e5fcb11),
+ TOBN(0x11506c72, 0xdfd75490),
+ TOBN(0x3a97d085, 0x61bcf1c1),
+ TOBN(0x43201d82, 0xbf5e7007),
+ TOBN(0x7f0ac52f, 0x798232a7),
+ TOBN(0x2715cbc4, 0x6eb564d4),
+ TOBN(0x8d6c752c, 0x9e570e29),
+ TOBN(0xf80247c8, 0x9ef5fd5d),
+ TOBN(0xc3c66b46, 0xd53eb514),
+ TOBN(0x9666b401, 0x0f87de56),
+ TOBN(0xce62c06f, 0xc6c603b5),
+ TOBN(0xae7b4c60, 0x7e4fc942),
+ TOBN(0x38ac0b77, 0x663a9c19),
+ TOBN(0xcb4d20ee, 0x4b049136),
+ TOBN(0x8b63bf12, 0x356a4613),
+ TOBN(0x1221aef6, 0x70e08128),
+ TOBN(0xe62d8c51, 0x4acb6b16),
+ TOBN(0x71f64a67, 0x379e7896),
+ TOBN(0xb25237a2, 0xcafd7fa5),
+ TOBN(0xf077bd98, 0x3841ba6a),
+ TOBN(0xc4ac0244, 0x3cd16e7e),
+ TOBN(0x548ba869, 0x21fea4ca),
+ TOBN(0xd36d0817, 0xf3dfdac1),
+ TOBN(0x09d8d71f, 0xf4685faf),
+ TOBN(0x8eff66be, 0xc52c459a),
+ TOBN(0x182faee7, 0x0b57235e),
+ TOBN(0xee3c39b1, 0x0106712b),
+ TOBN(0x5107331f, 0xc0fcdcb0),
+ TOBN(0x669fb9dc, 0xa51054ba),
+ TOBN(0xb25101fb, 0x319d7682),
+ TOBN(0xb0293129, 0x0a982fee),
+ TOBN(0x51c1c9b9, 0x0261b344),
+ TOBN(0x0e008c5b, 0xbfd371fa),
+ TOBN(0xd866dd1c, 0x0278ca33),
+ TOBN(0x666f76a6, 0xe5aa53b1),
+ TOBN(0xe5cfb779, 0x6013a2cf),
+ TOBN(0x1d3a1aad, 0xa3521836),
+ TOBN(0xcedd2531, 0x73faa485),
+ TOBN(0xc8ee6c4f, 0xc0a76878),
+ TOBN(0xddbccfc9, 0x2a11667d),
+ TOBN(0x1a418ea9, 0x1c2f695a),
+ TOBN(0xdb11bd92, 0x51f73971),
+ TOBN(0x3e4b3c82, 0xda2ed89f),
+ TOBN(0x9a44f3f4, 0xe73e0319),
+ TOBN(0xd1e3de0f, 0x303431af),
+ TOBN(0x3c5604ff, 0x50f75f9c),
+ TOBN(0x1d8eddf3, 0x7e752b22),
+ TOBN(0x0ef074dd, 0x3c9a1118),
+ TOBN(0xd0ffc172, 0xccb86d7b),
+ TOBN(0xabd1ece3, 0x037d90f2),
+ TOBN(0xe3f307d6, 0x6055856c),
+ TOBN(0x422f9328, 0x7e4c6daf),
+ TOBN(0x902aac66, 0x334879a0),
+ TOBN(0xb6a1e7bf, 0x94cdfade),
+ TOBN(0x6c97e1ed, 0x7fc6d634),
+ TOBN(0x662ad24d, 0xa2fb63f8),
+ TOBN(0xf81be1b9, 0xa5928405),
+ TOBN(0x86d765e4, 0xd14b4206),
+ TOBN(0xbecc2e0e, 0x8fa0db65),
+ TOBN(0xa28838e0, 0xb17fc76c),
+ TOBN(0xe49a602a, 0xe37cf24e),
+ TOBN(0x76b4131a, 0x567193ec),
+ TOBN(0xaf3c305a, 0xe5f6e70b),
+ TOBN(0x9587bd39, 0x031eebdd),
+ TOBN(0x5709def8, 0x71bbe831),
+ TOBN(0x57059983, 0x0eb2b669),
+ TOBN(0x4d80ce1b, 0x875b7029),
+ TOBN(0x838a7da8, 0x0364ac16),
+ TOBN(0x2f431d23, 0xbe1c83ab),
+ TOBN(0xe56812a6, 0xf9294dd3),
+ TOBN(0xb448d01f, 0x9b4b0d77),
+ TOBN(0xf3ae6061, 0x04e8305c),
+ TOBN(0x2bead645, 0x94d8c63e),
+ TOBN(0x0a85434d, 0x84fd8b07),
+ TOBN(0x537b983f, 0xf7a9dee5),
+ TOBN(0xedcc5f18, 0xef55bd85),
+ TOBN(0x2041af62, 0x21c6cf8b),
+ TOBN(0x8e52874c, 0xb940c71e),
+ TOBN(0x211935a9, 0xdb5f4b3a),
+ TOBN(0x94350492, 0x301b1dc3),
+ TOBN(0x33d2646d, 0x29958620),
+ TOBN(0x16b0d64b, 0xef911404),
+ TOBN(0x9d1f25ea, 0x9a3c5ef4),
+ TOBN(0x20f200eb, 0x4a352c78),
+ TOBN(0x43929f2c, 0x4bd0b428),
+ TOBN(0xa5656667, 0xc7196e29),
+ TOBN(0x7992c2f0, 0x9391be48),
+ TOBN(0xaaa97cbd, 0x9ee0cd6e),
+ TOBN(0x51b0310c, 0x3dc8c9bf),
+ TOBN(0x237f8acf, 0xdd9f22cb),
+ TOBN(0xbb1d81a1, 0xb585d584),
+ TOBN(0x8d5d85f5, 0x8c416388),
+ TOBN(0x0d6e5a5a, 0x42fe474f),
+ TOBN(0xe7812766, 0x38235d4e),
+ TOBN(0x1c62bd67, 0x496e3298),
+ TOBN(0x8378660c, 0x3f175bc8),
+ TOBN(0x4d04e189, 0x17afdd4d),
+ TOBN(0x32a81601, 0x85a8068c),
+ TOBN(0xdb58e4e1, 0x92b29a85),
+ TOBN(0xe8a65b86, 0xc70d8a3b),
+ TOBN(0x5f0e6f4e, 0x98a0403b),
+ TOBN(0x08129684, 0x69ed2370),
+ TOBN(0x34dc30bd, 0x0871ee26),
+ TOBN(0x3a5ce948, 0x7c9c5b05),
+ TOBN(0x7d487b80, 0x43a90c87),
+ TOBN(0x4089ba37, 0xdd0e7179),
+ TOBN(0x45f80191, 0xb4041811),
+ TOBN(0x1c3e1058, 0x98747ba5),
+ TOBN(0x98c4e13a, 0x6e1ae592),
+ TOBN(0xd44636e6, 0xe82c9f9e),
+ TOBN(0x711db87c, 0xc33a1043),
+ TOBN(0x6f431263, 0xaa8aec05),
+ TOBN(0x43ff120d, 0x2744a4aa),
+ TOBN(0xd3bd892f, 0xae77779b),
+ TOBN(0xf0fe0cc9, 0x8cdc9f82),
+ TOBN(0xca5f7fe6, 0xf1c5b1bc),
+ TOBN(0xcc63a682, 0x44929a72),
+ TOBN(0xc7eaba0c, 0x09dbe19a),
+ TOBN(0x2f3585ad, 0x6b5c73c2),
+ TOBN(0x8ab8924b, 0x0ae50c30),
+ TOBN(0x17fcd27a, 0x638b30ba),
+ TOBN(0xaf414d34, 0x10b3d5a5),
+ TOBN(0x09c107d2, 0x2a9accf1),
+ TOBN(0x15dac49f, 0x946a6242),
+ TOBN(0xaec3df2a, 0xd707d642),
+ TOBN(0x2c2492b7, 0x3f894ae0),
+ TOBN(0xf59df3e5, 0xb75f18ce),
+ TOBN(0x7cb740d2, 0x8f53cad0),
+ TOBN(0x3eb585fb, 0xc4f01294),
+ TOBN(0x17da0c86, 0x32c7f717),
+ TOBN(0xeb8c795b, 0xaf943f4c),
+ TOBN(0x4ee23fb5, 0xf67c51d2),
+ TOBN(0xef187575, 0x68889949),
+ TOBN(0xa6b4bdb2, 0x0389168b),
+ TOBN(0xc4ecd258, 0xea577d03),
+ TOBN(0x3a63782b, 0x55743082),
+ TOBN(0x6f678f4c, 0xc72f08cd),
+ TOBN(0x553511cf, 0x65e58dd8),
+ TOBN(0xd53b4e3e, 0xd402c0cd),
+ TOBN(0x37de3e29, 0xa037c14c),
+ TOBN(0x86b6c516, 0xc05712aa),
+ TOBN(0x2834da3e, 0xb38dff6f),
+ TOBN(0xbe012c52, 0xea636be8),
+ TOBN(0x292d238c, 0x61dd37f8),
+ TOBN(0x0e54523f, 0x8f8142db),
+ TOBN(0xe31eb436, 0x036a05d8),
+ TOBN(0x83e3cdff, 0x1e93c0ff),
+ TOBN(0x3fd2fe0f, 0x50821ddf),
+ TOBN(0xc8e19b0d, 0xff9eb33b),
+ TOBN(0xc8cc943f, 0xb569a5fe),
+ TOBN(0xad0090d4, 0xd4342d75),
+ TOBN(0x82090b4b, 0xcaeca000),
+ TOBN(0xca39687f, 0x1bd410eb),
+ TOBN(0xe7bb0df7, 0x65959d77),
+ TOBN(0x39d78218, 0x9c964999),
+ TOBN(0xd87f62e8, 0xb2415451),
+ TOBN(0xe5efb774, 0xbed76108),
+ TOBN(0x3ea011a4, 0xe822f0d0),
+ TOBN(0xbc647ad1, 0x5a8704f8),
+ TOBN(0xbb315b35, 0x50c6820f),
+ TOBN(0x863dec3d, 0xb7e76bec),
+ TOBN(0x01ff5d3a, 0xf017bfc7),
+ TOBN(0x20054439, 0x976b8229),
+ TOBN(0x067fca37, 0x0bbd0d3b),
+ TOBN(0xf63dde64, 0x7f5e3d0f),
+ TOBN(0x22dbefb3, 0x2a4c94e9),
+ TOBN(0xafbff0fe, 0x96f8278a),
+ TOBN(0x80aea0b1, 0x3503793d),
+ TOBN(0xb2238029, 0x5f06cd29),
+ TOBN(0x65703e57, 0x8ec3feca),
+ TOBN(0x06c38314, 0x393e7053),
+ TOBN(0xa0b751eb, 0x7c6734c4),
+ TOBN(0xd2e8a435, 0xc59f0f1e),
+ TOBN(0x147d9052, 0x5e9ca895),
+ TOBN(0x2f4dd31e, 0x972072df),
+ TOBN(0xa16fda8e, 0xe6c6755c),
+ TOBN(0xc66826ff, 0xcf196558),
+ TOBN(0x1f1a76a3, 0x0cf43895),
+ TOBN(0xa9d604e0, 0x83c3097b),
+ TOBN(0xe1908309, 0x66390e0e),
+ TOBN(0xa50bf753, 0xb3c85eff),
+ TOBN(0x0696bdde, 0xf6a70251),
+ TOBN(0x548b801b, 0x3c6ab16a),
+ TOBN(0x37fcf704, 0xa4d08762),
+ TOBN(0x090b3def, 0xdff76c4e),
+ TOBN(0x87e8cb89, 0x69cb9158),
+ TOBN(0x44a90744, 0x995ece43),
+ TOBN(0xf85395f4, 0x0ad9fbf5),
+ TOBN(0x49b0f6c5, 0x4fb0c82d),
+ TOBN(0x75d9bc15, 0xadf7cccf),
+ TOBN(0x81a3e5d6, 0xdfa1e1b0),
+ TOBN(0x8c39e444, 0x249bc17e),
+ TOBN(0xf37dccb2, 0x8ea7fd43),
+ TOBN(0xda654873, 0x907fba12),
+ TOBN(0x35daa6da, 0x4a372904),
+ TOBN(0x0564cfc6, 0x6283a6c5),
+ TOBN(0xd09fa4f6, 0x4a9395bf),
+ TOBN(0x688e9ec9, 0xaeb19a36),
+ TOBN(0xd913f1ce, 0xc7bfbfb4),
+ TOBN(0x797b9a3c, 0x61c2faa6),
+ TOBN(0x2f979bec, 0x6a0a9c12),
+ TOBN(0xb5969d0f, 0x359679ec),
+ TOBN(0xebcf523d, 0x079b0460),
+ TOBN(0xfd6b0008, 0x10fab870),
+ TOBN(0x3f2edcda, 0x9373a39c),
+ TOBN(0x0d64f9a7, 0x6f568431),
+ TOBN(0xf848c27c, 0x02f8898c),
+ TOBN(0xf418ade1, 0x260b5bd5),
+ TOBN(0xc1f3e323, 0x6973dee8),
+ TOBN(0x46e9319c, 0x26c185dd),
+ TOBN(0x6d85b7d8, 0x546f0ac4),
+ TOBN(0x427965f2, 0x247f9d57),
+ TOBN(0xb519b636, 0xb0035f48),
+ TOBN(0x6b6163a9, 0xab87d59c),
+ TOBN(0xff9f58c3, 0x39caaa11),
+ TOBN(0x4ac39cde, 0x3177387b),
+ TOBN(0x5f6557c2, 0x873e77f9),
+ TOBN(0x67504006, 0x36a83041),
+ TOBN(0x9b1c96ca, 0x75ef196c),
+ TOBN(0xf34283de, 0xb08c7940),
+ TOBN(0x7ea09644, 0x1128c316),
+ TOBN(0xb510b3b5, 0x6aa39dff),
+ TOBN(0x59b43da2, 0x9f8e4d8c),
+ TOBN(0xa8ce31fd, 0x9e4c4b9f),
+ TOBN(0x0e20be26, 0xc1303c01),
+ TOBN(0x18187182, 0xe8ee47c9),
+ TOBN(0xd9687cdb, 0x7db98101),
+ TOBN(0x7a520e4d, 0xa1e14ff6),
+ TOBN(0x429808ba, 0x8836d572),
+ TOBN(0xa37ca60d, 0x4944b663),
+ TOBN(0xf901f7a9, 0xa3f91ae5),
+ TOBN(0xe4e3e76e, 0x9e36e3b1),
+ TOBN(0x9aa219cf, 0x29d93250),
+ TOBN(0x347fe275, 0x056a2512),
+ TOBN(0xa4d643d9, 0xde65d95c),
+ TOBN(0x9669d396, 0x699fc3ed),
+ TOBN(0xb598dee2, 0xcf8c6bbe),
+ TOBN(0x682ac1e5, 0xdda9e5c6),
+ TOBN(0x4e0d3c72, 0xcaa9fc95),
+ TOBN(0x17faaade, 0x772bea44),
+ TOBN(0x5ef8428c, 0xab0009c8),
+ TOBN(0xcc4ce47a, 0x460ff016),
+ TOBN(0xda6d12bf, 0x725281cb),
+ TOBN(0x44c67848, 0x0223aad2),
+ TOBN(0x6e342afa, 0x36256e28),
+ TOBN(0x1400bb0b, 0x93a37c04),
+ TOBN(0x62b1bc9b, 0xdd10bd96),
+ TOBN(0x7251adeb, 0x0dac46b7),
+ TOBN(0x7d33b92e, 0x7be4ef51),
+ TOBN(0x28b2a94b, 0xe61fa29a),
+ TOBN(0x4b2be13f, 0x06422233),
+ TOBN(0x36d6d062, 0x330d8d37),
+ TOBN(0x5ef80e1e, 0xb28ca005),
+ TOBN(0x174d4699, 0x6d16768e),
+ TOBN(0x9fc4ff6a, 0x628bf217),
+ TOBN(0x77705a94, 0x154e490d),
+ TOBN(0x9d96dd28, 0x8d2d997a),
+ TOBN(0x77e2d9d8, 0xce5d72c4),
+ TOBN(0x9d06c5a4, 0xc11c714f),
+ TOBN(0x02aa5136, 0x79e4a03e),
+ TOBN(0x1386b3c2, 0x030ff28b),
+ TOBN(0xfe82e8a6, 0xfb283f61),
+ TOBN(0x7df203e5, 0xf3abc3fb),
+ TOBN(0xeec7c351, 0x3a4d3622),
+ TOBN(0xf7d17dbf, 0xdf762761),
+ TOBN(0xc3956e44, 0x522055f0),
+ TOBN(0xde3012db, 0x8fa748db),
+ TOBN(0xca9fcb63, 0xbf1dcc14),
+ TOBN(0xa56d9dcf, 0xbe4e2f3a),
+ TOBN(0xb86186b6, 0x8bcec9c2),
+ TOBN(0x7cf24df9, 0x680b9f06),
+ TOBN(0xc46b45ea, 0xc0d29281),
+ TOBN(0xfff42bc5, 0x07b10e12),
+ TOBN(0x12263c40, 0x4d289427),
+ TOBN(0x3d5f1899, 0xb4848ec4),
+ TOBN(0x11f97010, 0xd040800c),
+ TOBN(0xb4c5f529, 0x300feb20),
+ TOBN(0xcc543f8f, 0xde94fdcb),
+ TOBN(0xe96af739, 0xc7c2f05e),
+ TOBN(0xaa5e0036, 0x882692e1),
+ TOBN(0x09c75b68, 0x950d4ae9),
+ TOBN(0x62f63df2, 0xb5932a7a),
+ TOBN(0x2658252e, 0xde0979ad),
+ TOBN(0x2a19343f, 0xb5e69631),
+ TOBN(0x718c7501, 0x525b666b),
+ TOBN(0x26a42d69, 0xea40dc3a),
+ TOBN(0xdc84ad22, 0xaecc018f),
+ TOBN(0x25c36c7b, 0x3270f04a),
+ TOBN(0x46ba6d47, 0x50fa72ed),
+ TOBN(0x6c37d1c5, 0x93e58a8e),
+ TOBN(0xa2394731, 0x120c088c),
+ TOBN(0xc3be4263, 0xcb6e86da),
+ TOBN(0x2c417d36, 0x7126d038),
+ TOBN(0x5b70f9c5, 0x8b6f8efa),
+ TOBN(0x671a2faa, 0x37718536),
+ TOBN(0xd3ced3c6, 0xb539c92b),
+ TOBN(0xe56f1bd9, 0xa31203c2),
+ TOBN(0x8b096ec4, 0x9ff3c8eb),
+ TOBN(0x2deae432, 0x43491cea),
+ TOBN(0x2465c6eb, 0x17943794),
+ TOBN(0x5d267e66, 0x20586843),
+ TOBN(0x9d3d116d, 0xb07159d0),
+ TOBN(0xae07a67f, 0xc1896210),
+ TOBN(0x8fc84d87, 0xbb961579),
+ TOBN(0x30009e49, 0x1c1f8dd6),
+ TOBN(0x8a8caf22, 0xe3132819),
+ TOBN(0xcffa197c, 0xf23ab4ff),
+ TOBN(0x58103a44, 0x205dd687),
+ TOBN(0x57b796c3, 0x0ded67a2),
+ TOBN(0x0b9c3a6c, 0xa1779ad7),
+ TOBN(0xa33cfe2e, 0x357c09c5),
+ TOBN(0x2ea29315, 0x3db4a57e),
+ TOBN(0x91959695, 0x8ebeb52e),
+ TOBN(0x118db9a6, 0xe546c879),
+ TOBN(0x8e996df4, 0x6295c8d6),
+ TOBN(0xdd990484, 0x55ec806b),
+ TOBN(0x24f291ca, 0x165c1035),
+ TOBN(0xcca523bb, 0x440e2229),
+ TOBN(0x324673a2, 0x73ef4d04),
+ TOBN(0xaf3adf34, 0x3e11ec39),
+ TOBN(0x6136d7f1, 0xdc5968d3),
+ TOBN(0x7a7b2899, 0xb053a927),
+ TOBN(0x3eaa2661, 0xae067ecd),
+ TOBN(0x8549b9c8, 0x02779cd9),
+ TOBN(0x061d7940, 0xc53385ea),
+ TOBN(0x3e0ba883, 0xf06d18bd),
+ TOBN(0x4ba6de53, 0xb2700843),
+ TOBN(0xb966b668, 0x591a9e4d),
+ TOBN(0x93f67567, 0x7f4fa0ed),
+ TOBN(0x5a02711b, 0x4347237b),
+ TOBN(0xbc041e2f, 0xe794608e),
+ TOBN(0x55af10f5, 0x70f73d8c),
+ TOBN(0xd2d4d4f7, 0xbb7564f7),
+ TOBN(0xd7d27a89, 0xb3e93ce7),
+ TOBN(0xf7b5a875, 0x5d3a2c1b),
+ TOBN(0xb29e68a0, 0x255b218a),
+ TOBN(0xb533837e, 0x8af76754),
+ TOBN(0xd1b05a73, 0x579fab2e),
+ TOBN(0xb41055a1, 0xecd74385),
+ TOBN(0xb2369274, 0x445e9115),
+ TOBN(0x2972a7c4, 0xf520274e),
+ TOBN(0x6c08334e, 0xf678e68a),
+ TOBN(0x4e4160f0, 0x99b057ed),
+ TOBN(0x3cfe11b8, 0x52ccb69a),
+ TOBN(0x2fd1823a, 0x21c8f772),
+ TOBN(0xdf7f072f, 0x3298f055),
+ TOBN(0x8c0566f9, 0xfec74a6e),
+ TOBN(0xe549e019, 0x5bb4d041),
+ TOBN(0x7c3930ba, 0x9208d850),
+ TOBN(0xe07141fc, 0xaaa2902b),
+ TOBN(0x539ad799, 0xe4f69ad3),
+ TOBN(0xa6453f94, 0x813f9ffd),
+ TOBN(0xc58d3c48, 0x375bc2f7),
+ TOBN(0xb3326fad, 0x5dc64e96),
+ TOBN(0x3aafcaa9, 0xb240e354),
+ TOBN(0x1d1b0903, 0xaca1e7a9),
+ TOBN(0x4ceb9767, 0x1211b8a0),
+ TOBN(0xeca83e49, 0xe32a858e),
+ TOBN(0x4c32892e, 0xae907bad),
+ TOBN(0xd5b42ab6, 0x2eb9b494),
+ TOBN(0x7fde3ee2, 0x1eabae1b),
+ TOBN(0x13b5ab09, 0xcaf54957),
+ TOBN(0xbfb028be, 0xe5f5d5d5),
+ TOBN(0x928a0650, 0x2003e2c0),
+ TOBN(0x90793aac, 0x67476843),
+ TOBN(0x5e942e79, 0xc81710a0),
+ TOBN(0x557e4a36, 0x27ccadd4),
+ TOBN(0x72a2bc56, 0x4bcf6d0c),
+ TOBN(0x09ee5f43, 0x26d7b80c),
+ TOBN(0x6b70dbe9, 0xd4292f19),
+ TOBN(0x56f74c26, 0x63f16b18),
+ TOBN(0xc23db0f7, 0x35fbb42a),
+ TOBN(0xb606bdf6, 0x6ae10040),
+ TOBN(0x1eb15d4d, 0x044573ac),
+ TOBN(0x7dc3cf86, 0x556b0ba4),
+ TOBN(0x97af9a33, 0xc60df6f7),
+ TOBN(0x0b1ef85c, 0xa716ce8c),
+ TOBN(0x2922f884, 0xc96958be),
+ TOBN(0x7c32fa94, 0x35690963),
+ TOBN(0x2d7f667c, 0xeaa00061),
+ TOBN(0xeaaf7c17, 0x3547365c),
+ TOBN(0x1eb4de46, 0x87032d58),
+ TOBN(0xc54f3d83, 0x5e2c79e0),
+ TOBN(0x07818df4, 0x5d04ef23),
+ TOBN(0x55faa9c8, 0x673d41b4),
+ TOBN(0xced64f6f, 0x89b95355),
+ TOBN(0x4860d2ea, 0xb7415c84),
+ TOBN(0x5fdb9bd2, 0x050ebad3),
+ TOBN(0xdb53e0cc, 0x6685a5bf),
+ TOBN(0xb830c031, 0x9feb6593),
+ TOBN(0xdd87f310, 0x6accff17),
+ TOBN(0x2303ebab, 0x9f555c10),
+ TOBN(0x94603695, 0x287e7065),
+ TOBN(0xf88311c3, 0x2e83358c),
+ TOBN(0x508dd9b4, 0xeefb0178),
+ TOBN(0x7ca23706, 0x2dba8652),
+ TOBN(0x62aac5a3, 0x0047abe5),
+ TOBN(0x9a61d2a0, 0x8b1ea7b3),
+ TOBN(0xd495ab63, 0xae8b1485),
+ TOBN(0x38740f84, 0x87052f99),
+ TOBN(0x178ebe5b, 0xb2974eea),
+ TOBN(0x030bbcca, 0x5b36d17f),
+ TOBN(0xb5e4cce3, 0xaaf86eea),
+ TOBN(0xb51a0220, 0x68f8e9e0),
+ TOBN(0xa4348796, 0x09eb3e75),
+ TOBN(0xbe592309, 0xeef1a752),
+ TOBN(0x5d7162d7, 0x6f2aa1ed),
+ TOBN(0xaebfb5ed, 0x0f007dd2),
+ TOBN(0x255e14b2, 0xc89edd22),
+ TOBN(0xba85e072, 0x0303b697),
+ TOBN(0xc5d17e25, 0xf05720ff),
+ TOBN(0x02b58d6e, 0x5128ebb6),
+ TOBN(0x2c80242d, 0xd754e113),
+ TOBN(0x919fca5f, 0xabfae1ca),
+ TOBN(0x937afaac, 0x1a21459b),
+ TOBN(0x9e0ca91c, 0x1f66a4d2),
+ TOBN(0x194cc7f3, 0x23ec1331),
+ TOBN(0xad25143a, 0x8aa11690),
+ TOBN(0xbe40ad8d, 0x09b59e08),
+ TOBN(0x37d60d9b, 0xe750860a),
+ TOBN(0x6c53b008, 0xc6bf434c),
+ TOBN(0xb572415d, 0x1356eb80),
+ TOBN(0xb8bf9da3, 0x9578ded8),
+ TOBN(0x22658e36, 0x5e8fb38b),
+ TOBN(0x9b70ce22, 0x5af8cb22),
+ TOBN(0x7c00018a, 0x829a8180),
+ TOBN(0x84329f93, 0xb81ed295),
+ TOBN(0x7c343ea2, 0x5f3cea83),
+ TOBN(0x38f8655f, 0x67586536),
+ TOBN(0xa661a0d0, 0x1d3ec517),
+ TOBN(0x98744652, 0x512321ae),
+ TOBN(0x084ca591, 0xeca92598),
+ TOBN(0xa9bb9dc9, 0x1dcb3feb),
+ TOBN(0x14c54355, 0x78b4c240),
+ TOBN(0x5ed62a3b, 0x610cafdc),
+ TOBN(0x07512f37, 0x1b38846b),
+ TOBN(0x571bb70a, 0xb0e38161),
+ TOBN(0xb556b95b, 0x2da705d2),
+ TOBN(0x3ef8ada6, 0xb1a08f98),
+ TOBN(0x85302ca7, 0xddecfbe5),
+ TOBN(0x0e530573, 0x943105cd),
+ TOBN(0x60554d55, 0x21a9255d),
+ TOBN(0x63a32fa1, 0xf2f3802a),
+ TOBN(0x35c8c5b0, 0xcd477875),
+ TOBN(0x97f458ea, 0x6ad42da1),
+ TOBN(0x832d7080, 0xeb6b242d),
+ TOBN(0xd30bd023, 0x3b71e246),
+ TOBN(0x7027991b, 0xbe31139d),
+ TOBN(0x68797e91, 0x462e4e53),
+ TOBN(0x423fe20a, 0x6b4e185a),
+ TOBN(0x82f2c67e, 0x42d9b707),
+ TOBN(0x25c81768, 0x4cf7811b),
+ TOBN(0xbd53005e, 0x045bb95d),
+ },
+ {
+ TOBN(0xe5f649be, 0x9d8e68fd),
+ TOBN(0xdb0f0533, 0x1b044320),
+ TOBN(0xf6fde9b3, 0xe0c33398),
+ TOBN(0x92f4209b, 0x66c8cfae),
+ TOBN(0xe9d1afcc, 0x1a739d4b),
+ TOBN(0x09aea75f, 0xa28ab8de),
+ TOBN(0x14375fb5, 0xeac6f1d0),
+ TOBN(0x6420b560, 0x708f7aa5),
+ TOBN(0x9eae499c, 0x6254dc41),
+ TOBN(0x7e293924, 0x7a837e7e),
+ TOBN(0x74aec08c, 0x090524a7),
+ TOBN(0xf82b9219, 0x8d6f55f2),
+ TOBN(0x493c962e, 0x1402cec5),
+ TOBN(0x9f17ca17, 0xfa2f30e7),
+ TOBN(0xbcd783e8, 0xe9b879cb),
+ TOBN(0xea3d8c14, 0x5a6f145f),
+ TOBN(0xdede15e7, 0x5e0dee6e),
+ TOBN(0x74f24872, 0xdc628aa2),
+ TOBN(0xd3e9c4fe, 0x7861bb93),
+ TOBN(0x56d4822a, 0x6187b2e0),
+ TOBN(0xb66417cf, 0xc59826f9),
+ TOBN(0xca260969, 0x2408169e),
+ TOBN(0xedf69d06, 0xc79ef885),
+ TOBN(0x00031f8a, 0xdc7d138f),
+ TOBN(0x103c46e6, 0x0ebcf726),
+ TOBN(0x4482b831, 0x6231470e),
+ TOBN(0x6f6dfaca, 0x487c2109),
+ TOBN(0x2e0ace97, 0x62e666ef),
+ TOBN(0x3246a9d3, 0x1f8d1f42),
+ TOBN(0x1b1e83f1, 0x574944d2),
+ TOBN(0x13dfa63a, 0xa57f334b),
+ TOBN(0x0cf8daed, 0x9f025d81),
+ TOBN(0x30d78ea8, 0x00ee11c1),
+ TOBN(0xeb053cd4, 0xb5e3dd75),
+ TOBN(0x9b65b13e, 0xd58c43c5),
+ TOBN(0xc3ad49bd, 0xbd151663),
+ TOBN(0x99fd8e41, 0xb6427990),
+ TOBN(0x12cf15bd, 0x707eae1e),
+ TOBN(0x29ad4f1b, 0x1aabb71e),
+ TOBN(0x5143e74d, 0x07545d0e),
+ TOBN(0x30266336, 0xc88bdee1),
+ TOBN(0x25f29306, 0x5876767c),
+ TOBN(0x9c078571, 0xc6731996),
+ TOBN(0xc88690b2, 0xed552951),
+ TOBN(0x274f2c2d, 0x852705b4),
+ TOBN(0xb0bf8d44, 0x4e09552d),
+ TOBN(0x7628beeb, 0x986575d1),
+ TOBN(0x407be238, 0x7f864651),
+ TOBN(0x0e5e3049, 0xa639fc6b),
+ TOBN(0xe75c35d9, 0x86003625),
+ TOBN(0x0cf35bd8, 0x5dcc1646),
+ TOBN(0x8bcaced2, 0x6c26273a),
+ TOBN(0xe22ecf1d, 0xb5536742),
+ TOBN(0x013dd897, 0x1a9e068b),
+ TOBN(0x17f411cb, 0x8a7909c5),
+ TOBN(0x5757ac98, 0x861dd506),
+ TOBN(0x85de1f0d, 0x1e935abb),
+ TOBN(0xdefd10b4, 0x154de37a),
+ TOBN(0xb8d9e392, 0x369cebb5),
+ TOBN(0x54d5ef9b, 0x761324be),
+ TOBN(0x4d6341ba, 0x74f17e26),
+ TOBN(0xc0a0e3c8, 0x78c1dde4),
+ TOBN(0xa6d77581, 0x87d918fd),
+ TOBN(0x66876015, 0x02ca3a13),
+ TOBN(0xc7313e9c, 0xf36658f0),
+ TOBN(0xc433ef1c, 0x71f8057e),
+ TOBN(0x85326246, 0x1b6a835a),
+ TOBN(0xc8f05398, 0x7c86394c),
+ TOBN(0xff398cdf, 0xe983c4a1),
+ TOBN(0xbf5e8162, 0x03b7b931),
+ TOBN(0x93193c46, 0xb7b9045b),
+ TOBN(0x1e4ebf5d, 0xa4a6e46b),
+ TOBN(0xf9942a60, 0x43a24fe7),
+ TOBN(0x29c1191e, 0xffb3492b),
+ TOBN(0x9f662449, 0x902fde05),
+ TOBN(0xc792a7ac, 0x6713c32d),
+ TOBN(0x2fd88ad8, 0xb737982c),
+ TOBN(0x7e3a0319, 0xa21e60e3),
+ TOBN(0x09b0de44, 0x7383591a),
+ TOBN(0x6df141ee, 0x8310a456),
+ TOBN(0xaec1a039, 0xe6d6f471),
+ TOBN(0x14b2ba0f, 0x1198d12e),
+ TOBN(0xebc1a160, 0x3aeee5ac),
+ TOBN(0x401f4836, 0xe0b964ce),
+ TOBN(0x2ee43796, 0x4fd03f66),
+ TOBN(0x3fdb4e49, 0xdd8f3f12),
+ TOBN(0x6ef267f6, 0x29380f18),
+ TOBN(0x3e8e9670, 0x8da64d16),
+ TOBN(0xbc19180c, 0x207674f1),
+ TOBN(0x112e09a7, 0x33ae8fdb),
+ TOBN(0x99667554, 0x6aaeb71e),
+ TOBN(0x79432af1, 0xe101b1c7),
+ TOBN(0xd5eb558f, 0xde2ddec6),
+ TOBN(0x81392d1f, 0x5357753f),
+ TOBN(0xa7a76b97, 0x3ae1158a),
+ TOBN(0x416fbbff, 0x4a899991),
+ TOBN(0x9e65fdfd, 0x0d4a9dcf),
+ TOBN(0x7bc29e48, 0x944ddf12),
+ TOBN(0xbc1a92d9, 0x3c856866),
+ TOBN(0x273c6905, 0x6e98dfe2),
+ TOBN(0x69fce418, 0xcdfaa6b8),
+ TOBN(0x606bd823, 0x5061c69f),
+ TOBN(0x42d495a0, 0x6af75e27),
+ TOBN(0x8ed3d505, 0x6d873a1f),
+ TOBN(0xaf552841, 0x6ab25b6a),
+ TOBN(0xc6c0ffc7, 0x2b1a4523),
+ TOBN(0xab18827b, 0x21c99e03),
+ TOBN(0x060e8648, 0x9034691b),
+ TOBN(0x5207f90f, 0x93c7f398),
+ TOBN(0x9f4a96cb, 0x82f8d10b),
+ TOBN(0xdd71cd79, 0x3ad0f9e3),
+ TOBN(0x84f435d2, 0xfc3a54f5),
+ TOBN(0x4b03c55b, 0x8e33787f),
+ TOBN(0xef42f975, 0xa6384673),
+ TOBN(0xff7304f7, 0x5051b9f0),
+ TOBN(0x18aca1dc, 0x741c87c2),
+ TOBN(0x56f120a7, 0x2d4bfe80),
+ TOBN(0xfd823b3d, 0x053e732c),
+ TOBN(0x11bccfe4, 0x7537ca16),
+ TOBN(0xdf6c9c74, 0x1b5a996b),
+ TOBN(0xee7332c7, 0x904fc3fa),
+ TOBN(0x14a23f45, 0xc7e3636a),
+ TOBN(0xc38659c3, 0xf091d9aa),
+ TOBN(0x4a995e5d, 0xb12d8540),
+ TOBN(0x20a53bec, 0xf3a5598a),
+ TOBN(0x56534b17, 0xb1eaa995),
+ TOBN(0x9ed3dca4, 0xbf04e03c),
+ TOBN(0x716c563a, 0xd8d56268),
+ TOBN(0x27ba77a4, 0x1d6178e7),
+ TOBN(0xe4c80c40, 0x68a1ff8e),
+ TOBN(0x75011099, 0x0a13f63d),
+ TOBN(0x7bf33521, 0xa61d46f3),
+ TOBN(0x0aff218e, 0x10b365bb),
+ TOBN(0x81021804, 0x0fd7ea75),
+ TOBN(0x05a3fd8a, 0xa4b3a925),
+ TOBN(0xb829e75f, 0x9b3db4e6),
+ TOBN(0x6bdc75a5, 0x4d53e5fb),
+ TOBN(0x04a5dc02, 0xd52717e3),
+ TOBN(0x86af502f, 0xe9a42ec2),
+ TOBN(0x8867e8fb, 0x2630e382),
+ TOBN(0xbf845c6e, 0xbec9889b),
+ TOBN(0x54f491f2, 0xcb47c98d),
+ TOBN(0xa3091fba, 0x790c2a12),
+ TOBN(0xd7f6fd78, 0xc20f708b),
+ TOBN(0xa569ac30, 0xacde5e17),
+ TOBN(0xd0f996d0, 0x6852b4d7),
+ TOBN(0xe51d4bb5, 0x4609ae54),
+ TOBN(0x3fa37d17, 0x0daed061),
+ TOBN(0x62a88684, 0x34b8fb41),
+ TOBN(0x99a2acbd, 0x9efb64f1),
+ TOBN(0xb75c1a5e, 0x6448e1f2),
+ TOBN(0xfa99951a, 0x42b5a069),
+ TOBN(0x6d956e89, 0x2f3b26e7),
+ TOBN(0xf4709860, 0xda875247),
+ TOBN(0x3ad15179, 0x2482dda3),
+ TOBN(0xd64110e3, 0x017d82f0),
+ TOBN(0x14928d2c, 0xfad414e4),
+ TOBN(0x2b155f58, 0x2ed02b24),
+ TOBN(0x481a141b, 0xcb821bf1),
+ TOBN(0x12e3c770, 0x4f81f5da),
+ TOBN(0xe49c5de5, 0x9fff8381),
+ TOBN(0x11053232, 0x5bbec894),
+ TOBN(0xa0d051cc, 0x454d88c4),
+ TOBN(0x4f6db89c, 0x1f8e531b),
+ TOBN(0x34fe3fd6, 0xca563a44),
+ TOBN(0x7f5c2215, 0x58da8ab9),
+ TOBN(0x8445016d, 0x9474f0a1),
+ TOBN(0x17d34d61, 0xcb7d8a0a),
+ TOBN(0x8e9d3910, 0x1c474019),
+ TOBN(0xcaff2629, 0xd52ceefb),
+ TOBN(0xf9cf3e32, 0xc1622c2b),
+ TOBN(0xd4b95e3c, 0xe9071a05),
+ TOBN(0xfbbca61f, 0x1594438c),
+ TOBN(0x1eb6e6a6, 0x04aadedf),
+ TOBN(0x853027f4, 0x68e14940),
+ TOBN(0x221d322a, 0xdfabda9c),
+ TOBN(0xed8ea9f6, 0xb7cb179a),
+ TOBN(0xdc7b764d, 0xb7934dcc),
+ TOBN(0xfcb13940, 0x5e09180d),
+ TOBN(0x6629a6bf, 0xb47dc2dd),
+ TOBN(0xbfc55e4e, 0x9f5a915e),
+ TOBN(0xb1db9d37, 0x6204441e),
+ TOBN(0xf82d68cf, 0x930c5f53),
+ TOBN(0x17d3a142, 0xcbb605b1),
+ TOBN(0xdd5944ea, 0x308780f2),
+ TOBN(0xdc8de761, 0x3845f5e4),
+ TOBN(0x6beaba7d, 0x7624d7a3),
+ TOBN(0x1e709afd, 0x304df11e),
+ TOBN(0x95364376, 0x02170456),
+ TOBN(0xbf204b3a, 0xc8f94b64),
+ TOBN(0x4e53af7c, 0x5680ca68),
+ TOBN(0x0526074a, 0xe0c67574),
+ TOBN(0x95d8cef8, 0xecd92af6),
+ TOBN(0xe6b9fa7a, 0x6cd1745a),
+ TOBN(0x3d546d3d, 0xa325c3e4),
+ TOBN(0x1f57691d, 0x9ae93aae),
+ TOBN(0xe891f3fe, 0x9d2e1a33),
+ TOBN(0xd430093f, 0xac063d35),
+ TOBN(0xeda59b12, 0x5513a327),
+ TOBN(0xdc2134f3, 0x5536f18f),
+ TOBN(0xaa51fe2c, 0x5c210286),
+ TOBN(0x3f68aaee, 0x1cab658c),
+ TOBN(0x5a23a00b, 0xf9357292),
+ TOBN(0x9a626f39, 0x7efdabed),
+ TOBN(0xfe2b3bf3, 0x199d78e3),
+ TOBN(0xb7a2af77, 0x71bbc345),
+ TOBN(0x3d19827a, 0x1e59802c),
+ TOBN(0x823bbc15, 0xb487a51c),
+ TOBN(0x856139f2, 0x99d0a422),
+ TOBN(0x9ac3df65, 0xf456c6fb),
+ TOBN(0xaddf65c6, 0x701f8bd6),
+ TOBN(0x149f321e, 0x3758df87),
+ TOBN(0xb1ecf714, 0x721b7eba),
+ TOBN(0xe17df098, 0x31a3312a),
+ TOBN(0xdb2fd6ec, 0xd5c4d581),
+ TOBN(0xfd02996f, 0x8fcea1b3),
+ TOBN(0xe29fa63e, 0x7882f14f),
+ TOBN(0xc9f6dc35, 0x07c6cadc),
+ TOBN(0x46f22d6f, 0xb882bed0),
+ TOBN(0x1a45755b, 0xd118e52c),
+ TOBN(0x9f2c7c27, 0x7c4608cf),
+ TOBN(0x7ccbdf32, 0x568012c2),
+ TOBN(0xfcb0aedd, 0x61729b0e),
+ TOBN(0x7ca2ca9e, 0xf7d75dbf),
+ TOBN(0xf58fecb1, 0x6f640f62),
+ TOBN(0xe274b92b, 0x39f51946),
+ TOBN(0x7f4dfc04, 0x6288af44),
+ TOBN(0x0a91f32a, 0xeac329e5),
+ TOBN(0x43ad274b, 0xd6aaba31),
+ TOBN(0x719a1640, 0x0f6884f9),
+ TOBN(0x685d29f6, 0xdaf91e20),
+ TOBN(0x5ec1cc33, 0x27e49d52),
+ TOBN(0x38f4de96, 0x3b54a059),
+ TOBN(0x0e0015e5, 0xefbcfdb3),
+ TOBN(0x177d23d9, 0x4dbb8da6),
+ TOBN(0x98724aa2, 0x97a617ad),
+ TOBN(0x30f0885b, 0xfdb6558e),
+ TOBN(0xf9f7a28a, 0xc7899a96),
+ TOBN(0xd2ae8ac8, 0x872dc112),
+ TOBN(0xfa0642ca, 0x73c3c459),
+ TOBN(0x15296981, 0xe7dfc8d6),
+ TOBN(0x67cd4450, 0x1fb5b94a),
+ TOBN(0x0ec71cf1, 0x0eddfd37),
+ TOBN(0xc7e5eeb3, 0x9a8eddc7),
+ TOBN(0x02ac8e3d, 0x81d95028),
+ TOBN(0x0088f172, 0x70b0e35d),
+ TOBN(0xec041fab, 0xe1881fe3),
+ TOBN(0x62cf71b8, 0xd99e7faa),
+ TOBN(0x5043dea7, 0xe0f222c2),
+ TOBN(0x309d42ac, 0x72e65142),
+ TOBN(0x94fe9ddd, 0x9216cd30),
+ TOBN(0xd6539c7d, 0x0f87feec),
+ TOBN(0x03c5a57c, 0x432ac7d7),
+ TOBN(0x72692cf0, 0x327fda10),
+ TOBN(0xec28c85f, 0x280698de),
+ TOBN(0x2331fb46, 0x7ec283b1),
+ TOBN(0xd34bfa32, 0x2867e633),
+ TOBN(0x78709a82, 0x0a9cc815),
+ TOBN(0xb7fe6964, 0x875e2fa5),
+ TOBN(0x25cc064f, 0x9e98bfb5),
+ TOBN(0x9eb0151c, 0x493a65c5),
+ TOBN(0x5fb5d941, 0x53182464),
+ TOBN(0x69e6f130, 0xf04618e2),
+ TOBN(0xa8ecec22, 0xf89c8ab6),
+ TOBN(0xcd6ac88b, 0xb96209bd),
+ TOBN(0x65fa8cdb, 0xb3e1c9e0),
+ TOBN(0xa47d22f5, 0x4a8d8eac),
+ TOBN(0x83895cdf, 0x8d33f963),
+ TOBN(0xa8adca59, 0xb56cd3d1),
+ TOBN(0x10c8350b, 0xdaf38232),
+ TOBN(0x2b161fb3, 0xa5080a9f),
+ TOBN(0xbe7f5c64, 0x3af65b3a),
+ TOBN(0x2c754039, 0x97403a11),
+ TOBN(0x94626cf7, 0x121b96af),
+ TOBN(0x431de7c4, 0x6a983ec2),
+ TOBN(0x3780dd3a, 0x52cc3df7),
+ TOBN(0xe28a0e46, 0x2baf8e3b),
+ TOBN(0xabe68aad, 0x51d299ae),
+ TOBN(0x603eb8f9, 0x647a2408),
+ TOBN(0x14c61ed6, 0x5c750981),
+ TOBN(0x88b34414, 0xc53352e7),
+ TOBN(0x5a34889c, 0x1337d46e),
+ TOBN(0x612c1560, 0xf95f2bc8),
+ TOBN(0x8a3f8441, 0xd4807a3a),
+ TOBN(0x680d9e97, 0x5224da68),
+ TOBN(0x60cd6e88, 0xc3eb00e9),
+ TOBN(0x3875a98e, 0x9a6bc375),
+ TOBN(0xdc80f924, 0x4fd554c2),
+ TOBN(0x6c4b3415, 0x6ac77407),
+ TOBN(0xa1e5ea8f, 0x25420681),
+ TOBN(0x541bfa14, 0x4607a458),
+ TOBN(0x5dbc7e7a, 0x96d7fbf9),
+ TOBN(0x646a851b, 0x31590a47),
+ TOBN(0x039e85ba, 0x15ee6df8),
+ TOBN(0xd19fa231, 0xd7b43fc0),
+ TOBN(0x84bc8be8, 0x299a0e04),
+ TOBN(0x2b9d2936, 0xf20df03a),
+ TOBN(0x24054382, 0x8608d472),
+ TOBN(0x76b6ba04, 0x9149202a),
+ TOBN(0xb21c3831, 0x3670e7b7),
+ TOBN(0xddd93059, 0xd6fdee10),
+ TOBN(0x9da47ad3, 0x78488e71),
+ TOBN(0x99cc1dfd, 0xa0fcfb25),
+ TOBN(0x42abde10, 0x64696954),
+ TOBN(0x14cc15fc, 0x17eab9fe),
+ TOBN(0xd6e863e4, 0xd3e70972),
+ TOBN(0x29a7765c, 0x6432112c),
+ TOBN(0x88660001, 0x5b0774d8),
+ TOBN(0x3729175a, 0x2c088eae),
+ TOBN(0x13afbcae, 0x8230b8d4),
+ TOBN(0x44768151, 0x915f4379),
+ TOBN(0xf086431a, 0xd8d22812),
+ TOBN(0x37461955, 0xc298b974),
+ TOBN(0x905fb5f0, 0xf8711e04),
+ TOBN(0x787abf3a, 0xfe969d18),
+ TOBN(0x392167c2, 0x6f6a494e),
+ TOBN(0xfc7a0d2d, 0x28c511da),
+ TOBN(0xf127c7dc, 0xb66a262d),
+ TOBN(0xf9c4bb95, 0xfd63fdf0),
+ TOBN(0x90016589, 0x3913ef46),
+ TOBN(0x74d2a73c, 0x11aa600d),
+ TOBN(0x2f5379bd, 0x9fb5ab52),
+ TOBN(0xe49e53a4, 0x7fb70068),
+ TOBN(0x68dd39e5, 0x404aa9a7),
+ TOBN(0xb9b0cf57, 0x2ecaa9c3),
+ TOBN(0xba0e103b, 0xe824826b),
+ TOBN(0x60c2198b, 0x4631a3c4),
+ TOBN(0xc5ff84ab, 0xfa8966a2),
+ TOBN(0x2d6ebe22, 0xac95aff8),
+ TOBN(0x1c9bb6db, 0xb5a46d09),
+ TOBN(0x419062da, 0x53ee4f8d),
+ TOBN(0x7b9042d0, 0xbb97efef),
+ TOBN(0x0f87f080, 0x830cf6bd),
+ TOBN(0x4861d19a, 0x6ec8a6c6),
+ TOBN(0xd3a0daa1, 0x202f01aa),
+ TOBN(0xb0111674, 0xf25afbd5),
+ TOBN(0x6d00d6cf, 0x1afb20d9),
+ TOBN(0x13695000, 0x40671bc5),
+ TOBN(0x913ab0dc, 0x2485ea9b),
+ TOBN(0x1f2bed06, 0x9eef61ac),
+ TOBN(0x850c8217, 0x6d799e20),
+ TOBN(0x93415f37, 0x3271c2de),
+ TOBN(0x5afb06e9, 0x6c4f5910),
+ TOBN(0x688a52df, 0xc4e9e421),
+ TOBN(0x30495ba3, 0xe2a9a6db),
+ TOBN(0x4601303d, 0x58f9268b),
+ TOBN(0xbe3b0dad, 0x7eb0f04f),
+ TOBN(0x4ea47250, 0x4456936d),
+ TOBN(0x8caf8798, 0xd33fd3e7),
+ TOBN(0x1ccd8a89, 0xeb433708),
+ TOBN(0x9effe3e8, 0x87fd50ad),
+ TOBN(0xbe240a56, 0x6b29c4df),
+ TOBN(0xec4ffd98, 0xca0e7ebd),
+ TOBN(0xf586783a, 0xe748616e),
+ TOBN(0xa5b00d8f, 0xc77baa99),
+ TOBN(0x0acada29, 0xb4f34c9c),
+ TOBN(0x36dad67d, 0x0fe723ac),
+ TOBN(0x1d8e53a5, 0x39c36c1e),
+ TOBN(0xe4dd342d, 0x1f4bea41),
+ TOBN(0x64fd5e35, 0xebc9e4e0),
+ TOBN(0x96f01f90, 0x57908805),
+ TOBN(0xb5b9ea3d, 0x5ed480dd),
+ TOBN(0x366c5dc2, 0x3efd2dd0),
+ TOBN(0xed2fe305, 0x6e9dfa27),
+ TOBN(0x4575e892, 0x6e9197e2),
+ TOBN(0x11719c09, 0xab502a5d),
+ TOBN(0x264c7bec, 0xe81f213f),
+ TOBN(0x741b9241, 0x55f5c457),
+ TOBN(0x78ac7b68, 0x49a5f4f4),
+ TOBN(0xf91d70a2, 0x9fc45b7d),
+ TOBN(0x39b05544, 0xb0f5f355),
+ TOBN(0x11f06bce, 0xeef930d9),
+ TOBN(0xdb84d25d, 0x038d05e1),
+ TOBN(0x04838ee5, 0xbacc1d51),
+ TOBN(0x9da3ce86, 0x9e8ee00b),
+ TOBN(0xc3412057, 0xc36eda1f),
+ TOBN(0xae80b913, 0x64d9c2f4),
+ TOBN(0x7468bac3, 0xa010a8ff),
+ TOBN(0xdfd20037, 0x37359d41),
+ TOBN(0x1a0f5ab8, 0x15efeacc),
+ TOBN(0x7c25ad2f, 0x659d0ce0),
+ TOBN(0x4011bcbb, 0x6785cff1),
+ TOBN(0x128b9912, 0x7e2192c7),
+ TOBN(0xa549d8e1, 0x13ccb0e8),
+ TOBN(0x805588d8, 0xc85438b1),
+ TOBN(0x5680332d, 0xbc25cb27),
+ TOBN(0xdcd1bc96, 0x1a4bfdf4),
+ TOBN(0x779ff428, 0x706f6566),
+ TOBN(0x8bbee998, 0xf059987a),
+ TOBN(0xf6ce8cf2, 0xcc686de7),
+ TOBN(0xf8ad3c4a, 0x953cfdb2),
+ TOBN(0xd1d426d9, 0x2205da36),
+ TOBN(0xb3c0f13f, 0xc781a241),
+ TOBN(0x3e89360e, 0xd75362a8),
+ TOBN(0xccd05863, 0xc8a91184),
+ TOBN(0x9bd0c9b7, 0xefa8a7f4),
+ TOBN(0x97ee4d53, 0x8a912a4b),
+ TOBN(0xde5e15f8, 0xbcf518fd),
+ TOBN(0x6a055bf8, 0xc467e1e0),
+ TOBN(0x10be4b4b, 0x1587e256),
+ TOBN(0xd90c14f2, 0x668621c9),
+ TOBN(0xd5518f51, 0xab9c92c1),
+ TOBN(0x8e6a0100, 0xd6d47b3c),
+ TOBN(0xcbe980dd, 0x66716175),
+ TOBN(0x500d3f10, 0xddd83683),
+ TOBN(0x3b6cb35d, 0x99cac73c),
+ TOBN(0x53730c8b, 0x6083d550),
+ TOBN(0xcf159767, 0xdf0a1987),
+ TOBN(0x84bfcf53, 0x43ad73b3),
+ TOBN(0x1b528c20, 0x4f035a94),
+ TOBN(0x4294edf7, 0x33eeac69),
+ TOBN(0xb6283e83, 0x817f3240),
+ TOBN(0xc3fdc959, 0x0a5f25b1),
+ TOBN(0xefaf8aa5, 0x5844ee22),
+ TOBN(0xde269ba5, 0xdbdde4de),
+ TOBN(0xe3347160, 0xc56133bf),
+ TOBN(0xc1184219, 0x8d9ea9f8),
+ TOBN(0x090de5db, 0xf3fc1ab5),
+ TOBN(0x404c37b1, 0x0bf22cda),
+ TOBN(0x7de20ec8, 0xf5618894),
+ TOBN(0x754c588e, 0xecdaecab),
+ TOBN(0x6ca4b0ed, 0x88342743),
+ TOBN(0x76f08bdd, 0xf4a938ec),
+ TOBN(0xd182de89, 0x91493ccb),
+ TOBN(0xd652c53e, 0xc8a4186a),
+ TOBN(0xb3e878db, 0x946d8e33),
+ TOBN(0x088453c0, 0x5f37663c),
+ TOBN(0x5cd9daaa, 0xb407748b),
+ TOBN(0xa1f5197f, 0x586d5e72),
+ TOBN(0x47500be8, 0xc443ca59),
+ TOBN(0x78ef35b2, 0xe2652424),
+ TOBN(0x09c5d26f, 0x6dd7767d),
+ TOBN(0x7175a79a, 0xa74d3f7b),
+ TOBN(0x0428fd8d, 0xcf5ea459),
+ TOBN(0x511cb97c, 0xa5d1746d),
+ TOBN(0x36363939, 0xe71d1278),
+ TOBN(0xcf2df955, 0x10350bf4),
+ TOBN(0xb3817439, 0x60aae782),
+ TOBN(0xa748c0e4, 0x3e688809),
+ TOBN(0x98021fbf, 0xd7a5a006),
+ TOBN(0x9076a70c, 0x0e367a98),
+ TOBN(0xbea1bc15, 0x0f62b7c2),
+ TOBN(0x2645a68c, 0x30fe0343),
+ TOBN(0xacaffa78, 0x699dc14f),
+ TOBN(0xf4469964, 0x457bf9c4),
+ TOBN(0x0db6407b, 0x0d2ead83),
+ TOBN(0x68d56cad, 0xb2c6f3eb),
+ TOBN(0x3b512e73, 0xf376356c),
+ TOBN(0xe43b0e1f, 0xfce10408),
+ TOBN(0x89ddc003, 0x5a5e257d),
+ TOBN(0xb0ae0d12, 0x0362e5b3),
+ TOBN(0x07f983c7, 0xb0519161),
+ TOBN(0xc2e94d15, 0x5d5231e7),
+ TOBN(0xcff22aed, 0x0b4f9513),
+ TOBN(0xb02588dd, 0x6ad0b0b5),
+ TOBN(0xb967d1ac, 0x11d0dcd5),
+ TOBN(0x8dac6bc6, 0xcf777b6c),
+ TOBN(0x0062bdbd, 0x4c6d1959),
+ TOBN(0x53da71b5, 0x0ef5cc85),
+ TOBN(0x07012c7d, 0x4006f14f),
+ TOBN(0x4617f962, 0xac47800d),
+ TOBN(0x53365f2b, 0xc102ed75),
+ TOBN(0xb422efcb, 0x4ab8c9d3),
+ TOBN(0x195cb26b, 0x34af31c9),
+ TOBN(0x3a926e29, 0x05f2c4ce),
+ TOBN(0xbd2bdecb, 0x9856966c),
+ TOBN(0x5d16ab3a, 0x85527015),
+ TOBN(0x9f81609e, 0x4486c231),
+ TOBN(0xd8b96b2c, 0xda350002),
+ TOBN(0xbd054690, 0xfa1b7d36),
+ TOBN(0xdc90ebf5, 0xe71d79bc),
+ TOBN(0xf241b6f9, 0x08964e4e),
+ TOBN(0x7c838643, 0x2fe3cd4c),
+ TOBN(0xe0f33acb, 0xb4bc633c),
+ TOBN(0xb4a9ecec, 0x3d139f1f),
+ TOBN(0x05ce69cd, 0xdc4a1f49),
+ TOBN(0xa19d1b16, 0xf5f98aaf),
+ TOBN(0x45bb71d6, 0x6f23e0ef),
+ TOBN(0x33789fcd, 0x46cdfdd3),
+ TOBN(0x9b8e2978, 0xcee040ca),
+ TOBN(0x9c69b246, 0xae0a6828),
+ TOBN(0xba533d24, 0x7078d5aa),
+ TOBN(0x7a2e42c0, 0x7bb4fbdb),
+ TOBN(0xcfb4879a, 0x7035385c),
+ TOBN(0x8c3dd30b, 0x3281705b),
+ TOBN(0x7e361c6c, 0x404fe081),
+ TOBN(0x7b21649c, 0x3f604edf),
+ TOBN(0x5dbf6a3f, 0xe52ffe47),
+ TOBN(0xc41b7c23, 0x4b54d9bf),
+ TOBN(0x1374e681, 0x3511c3d9),
+ TOBN(0x1863bf16, 0xc1b2b758),
+ TOBN(0x90e78507, 0x1e9e6a96),
+ TOBN(0xab4bf98d, 0x5d86f174),
+ TOBN(0xd74e0bd3, 0x85e96fe4),
+ TOBN(0x8afde39f, 0xcac5d344),
+ TOBN(0x90946dbc, 0xbd91b847),
+ TOBN(0xf5b42358, 0xfe1a838c),
+ TOBN(0x05aae6c5, 0x620ac9d8),
+ TOBN(0x8e193bd8, 0xa1ce5a0b),
+ TOBN(0x8f710571, 0x4dabfd72),
+ TOBN(0x8d8fdd48, 0x182caaac),
+ TOBN(0x8c4aeefa, 0x040745cf),
+ TOBN(0x73c6c30a, 0xf3b93e6d),
+ TOBN(0x991241f3, 0x16f42011),
+ TOBN(0xa0158eea, 0xe457a477),
+ TOBN(0xd19857db, 0xee6ddc05),
+ TOBN(0xb3265224, 0x18c41671),
+ TOBN(0x3ffdfc7e, 0x3c2c0d58),
+ TOBN(0x3a3a5254, 0x26ee7cda),
+ TOBN(0x341b0869, 0xdf02c3a8),
+ TOBN(0xa023bf42, 0x723bbfc8),
+ TOBN(0x3d15002a, 0x14452691),
+ },
+ {
+ TOBN(0x5ef7324c, 0x85edfa30),
+ TOBN(0x25976554, 0x87d4f3da),
+ TOBN(0x352f5bc0, 0xdcb50c86),
+ TOBN(0x8f6927b0, 0x4832a96c),
+ TOBN(0xd08ee1ba, 0x55f2f94c),
+ TOBN(0x6a996f99, 0x344b45fa),
+ TOBN(0xe133cb8d, 0xa8aa455d),
+ TOBN(0x5d0721ec, 0x758dc1f7),
+ TOBN(0x6ba7a920, 0x79e5fb67),
+ TOBN(0xe1331feb, 0x70aa725e),
+ TOBN(0x5080ccf5, 0x7df5d837),
+ TOBN(0xe4cae01d, 0x7ff72e21),
+ TOBN(0xd9243ee6, 0x0412a77d),
+ TOBN(0x06ff7cac, 0xdf449025),
+ TOBN(0xbe75f7cd, 0x23ef5a31),
+ TOBN(0xbc957822, 0x0ddef7a8),
+ TOBN(0x8cf7230c, 0xb0ce1c55),
+ TOBN(0x5b534d05, 0x0bbfb607),
+ TOBN(0xee1ef113, 0x0e16363b),
+ TOBN(0x27e0aa7a, 0xb4999e82),
+ TOBN(0xce1dac2d, 0x79362c41),
+ TOBN(0x67920c90, 0x91bb6cb0),
+ TOBN(0x1e648d63, 0x2223df24),
+ TOBN(0x0f7d9eef, 0xe32e8f28),
+ TOBN(0x6943f39a, 0xfa833834),
+ TOBN(0x22951722, 0xa6328562),
+ TOBN(0x81d63dd5, 0x4170fc10),
+ TOBN(0x9f5fa58f, 0xaecc2e6d),
+ TOBN(0xb66c8725, 0xe77d9a3b),
+ TOBN(0x11235cea, 0x6384ebe0),
+ TOBN(0x06a8c118, 0x5845e24a),
+ TOBN(0x0137b286, 0xebd093b1),
+ TOBN(0xc589e1ce, 0x44ace150),
+ TOBN(0xe0f8d3d9, 0x4381e97c),
+ TOBN(0x59e99b11, 0x62c5a4b8),
+ TOBN(0x90d262f7, 0xfd0ec9f9),
+ TOBN(0xfbc854c9, 0x283e13c9),
+ TOBN(0x2d04fde7, 0xaedc7085),
+ TOBN(0x057d7765, 0x47dcbecb),
+ TOBN(0x8dbdf591, 0x9a76fa5f),
+ TOBN(0xd0150695, 0x0de1e578),
+ TOBN(0x2e1463e7, 0xe9f72bc6),
+ TOBN(0xffa68441, 0x1b39eca5),
+ TOBN(0x673c8530, 0x7c037f2f),
+ TOBN(0xd0d6a600, 0x747f91da),
+ TOBN(0xb08d43e1, 0xc9cb78e9),
+ TOBN(0x0fc0c644, 0x27b5cef5),
+ TOBN(0x5c1d160a, 0xa60a2fd6),
+ TOBN(0xf98cae53, 0x28c8e13b),
+ TOBN(0x375f10c4, 0xb2eddcd1),
+ TOBN(0xd4eb8b7f, 0x5cce06ad),
+ TOBN(0xb4669f45, 0x80a2e1ef),
+ TOBN(0xd593f9d0, 0x5bbd8699),
+ TOBN(0x5528a4c9, 0xe7976d13),
+ TOBN(0x3923e095, 0x1c7e28d3),
+ TOBN(0xb9293790, 0x3f6bb577),
+ TOBN(0xdb567d6a, 0xc42bd6d2),
+ TOBN(0x6df86468, 0xbb1f96ae),
+ TOBN(0x0efe5b1a, 0x4843b28e),
+ TOBN(0x961bbb05, 0x6379b240),
+ TOBN(0xb6caf5f0, 0x70a6a26b),
+ TOBN(0x70686c0d, 0x328e6e39),
+ TOBN(0x80da06cf, 0x895fc8d3),
+ TOBN(0x804d8810, 0xb363fdc9),
+ TOBN(0xbe22877b, 0x207f1670),
+ TOBN(0x9b0dd188, 0x4e615291),
+ TOBN(0x625ae8dc, 0x97a3c2bf),
+ TOBN(0x08584ef7, 0x439b86e8),
+ TOBN(0xde7190a5, 0xdcd898ff),
+ TOBN(0x26286c40, 0x2058ee3d),
+ TOBN(0x3db0b217, 0x5f87b1c1),
+ TOBN(0xcc334771, 0x102a6db5),
+ TOBN(0xd99de954, 0x2f770fb1),
+ TOBN(0x97c1c620, 0x4cd7535e),
+ TOBN(0xd3b6c448, 0x3f09cefc),
+ TOBN(0xd725af15, 0x5a63b4f8),
+ TOBN(0x0c95d24f, 0xc01e20ec),
+ TOBN(0xdfd37494, 0x9ae7121f),
+ TOBN(0x7d6ddb72, 0xec77b7ec),
+ TOBN(0xfe079d3b, 0x0353a4ae),
+ TOBN(0x3066e70a, 0x2e6ac8d2),
+ TOBN(0x9c6b5a43, 0x106e5c05),
+ TOBN(0x52d3c6f5, 0xede59b8c),
+ TOBN(0x30d6a5c3, 0xfccec9ae),
+ TOBN(0xedec7c22, 0x4fc0a9ef),
+ TOBN(0x190ff083, 0x95c16ced),
+ TOBN(0xbe12ec8f, 0x94de0fde),
+ TOBN(0x0d131ab8, 0x852d3433),
+ TOBN(0x42ace07e, 0x85701291),
+ TOBN(0x94793ed9, 0x194061a8),
+ TOBN(0x30e83ed6, 0xd7f4a485),
+ TOBN(0x9eec7269, 0xf9eeff4d),
+ TOBN(0x90acba59, 0x0c9d8005),
+ TOBN(0x5feca458, 0x1e79b9d1),
+ TOBN(0x8fbe5427, 0x1d506a1e),
+ TOBN(0xa32b2c8e, 0x2439cfa7),
+ TOBN(0x1671c173, 0x73dd0b4e),
+ TOBN(0x37a28214, 0x44a054c6),
+ TOBN(0x81760a1b, 0x4e8b53f1),
+ TOBN(0xa6c04224, 0xf9f93b9e),
+ TOBN(0x18784b34, 0xcf671e3c),
+ TOBN(0x81bbecd2, 0xcda9b994),
+ TOBN(0x38831979, 0xb2ab3848),
+ TOBN(0xef54feb7, 0xf2e03c2d),
+ TOBN(0xcf197ca7, 0xfb8088fa),
+ TOBN(0x01427247, 0x4ddc96c5),
+ TOBN(0xa2d2550a, 0x30777176),
+ TOBN(0x53469898, 0x4d0cf71d),
+ TOBN(0x6ce937b8, 0x3a2aaac6),
+ TOBN(0xe9f91dc3, 0x5af38d9b),
+ TOBN(0x2598ad83, 0xc8bf2899),
+ TOBN(0x8e706ac9, 0xb5536c16),
+ TOBN(0x40dc7495, 0xf688dc98),
+ TOBN(0x26490cd7, 0x124c4afc),
+ TOBN(0xe651ec84, 0x1f18775c),
+ TOBN(0x393ea6c3, 0xb4fdaf4a),
+ TOBN(0x1e1f3343, 0x7f338e0d),
+ TOBN(0x39fb832b, 0x6053e7b5),
+ TOBN(0x46e702da, 0x619e14d5),
+ TOBN(0x859cacd1, 0xcdeef6e0),
+ TOBN(0x63b99ce7, 0x4462007d),
+ TOBN(0xb8ab48a5, 0x4cb5f5b7),
+ TOBN(0x9ec673d2, 0xf55edde7),
+ TOBN(0xd1567f74, 0x8cfaefda),
+ TOBN(0x46381b6b, 0x0887bcec),
+ TOBN(0x694497ce, 0xe178f3c2),
+ TOBN(0x5e6525e3, 0x1e6266cb),
+ TOBN(0x5931de26, 0x697d6413),
+ TOBN(0x87f8df7c, 0x0e58d493),
+ TOBN(0xb1ae5ed0, 0x58b73f12),
+ TOBN(0xc368f784, 0xdea0c34d),
+ TOBN(0x9bd0a120, 0x859a91a0),
+ TOBN(0xb00d88b7, 0xcc863c68),
+ TOBN(0x3a1cc11e, 0x3d1f4d65),
+ TOBN(0xea38e0e7, 0x0aa85593),
+ TOBN(0x37f13e98, 0x7dc4aee8),
+ TOBN(0x10d38667, 0xbc947bad),
+ TOBN(0x738e07ce, 0x2a36ee2e),
+ TOBN(0xc93470cd, 0xc577fcac),
+ TOBN(0xdee1b616, 0x2782470d),
+ TOBN(0x36a25e67, 0x2e793d12),
+ TOBN(0xd6aa6cae, 0xe0f186da),
+ TOBN(0x474d0fd9, 0x80e07af7),
+ TOBN(0xf7cdc47d, 0xba8a5cd4),
+ TOBN(0x28af6d9d, 0xab15247f),
+ TOBN(0x7c789c10, 0x493a537f),
+ TOBN(0x7ac9b110, 0x23a334e7),
+ TOBN(0x0236ac09, 0x12c9c277),
+ TOBN(0xa7e5bd25, 0x1d7a5144),
+ TOBN(0x098b9c2a, 0xf13ec4ec),
+ TOBN(0x3639daca, 0xd3f0abca),
+ TOBN(0x642da81a, 0xa23960f9),
+ TOBN(0x7d2e5c05, 0x4f7269b1),
+ TOBN(0xfcf30777, 0xe287c385),
+ TOBN(0x10edc84f, 0xf2a46f21),
+ TOBN(0x35441757, 0x4f43fa36),
+ TOBN(0xf1327899, 0xfd703431),
+ TOBN(0xa438d7a6, 0x16dd587a),
+ TOBN(0x65c34c57, 0xe9c8352d),
+ TOBN(0xa728edab, 0x5cc5a24e),
+ TOBN(0xaed78abc, 0x42531689),
+ TOBN(0x0a51a0e8, 0x010963ef),
+ TOBN(0x5776fa0a, 0xd717d9b3),
+ TOBN(0xf356c239, 0x7dd3428b),
+ TOBN(0x29903fff, 0x8d3a3dac),
+ TOBN(0x409597fa, 0x3d94491f),
+ TOBN(0x4cd7a5ff, 0xbf4a56a4),
+ TOBN(0xe5096474, 0x8adab462),
+ TOBN(0xa97b5126, 0x5c3427b0),
+ TOBN(0x6401405c, 0xd282c9bd),
+ TOBN(0x3629f8d7, 0x222c5c45),
+ TOBN(0xb1c02c16, 0xe8d50aed),
+ TOBN(0xbea2ed75, 0xd9635bc9),
+ TOBN(0x226790c7, 0x6e24552f),
+ TOBN(0x3c33f2a3, 0x65f1d066),
+ TOBN(0x2a43463e, 0x6dfccc2e),
+ TOBN(0x8cc3453a, 0xdb483761),
+ TOBN(0xe7cc6085, 0x65d5672b),
+ TOBN(0x277ed6cb, 0xde3efc87),
+ TOBN(0x19f2f368, 0x69234eaf),
+ TOBN(0x9aaf4317, 0x5c0b800b),
+ TOBN(0x1f1e7c89, 0x8b6da6e2),
+ TOBN(0x6cfb4715, 0xb94ec75e),
+ TOBN(0xd590dd5f, 0x453118c2),
+ TOBN(0x14e49da1, 0x1f17a34c),
+ TOBN(0x5420ab39, 0x235a1456),
+ TOBN(0xb7637241, 0x2f50363b),
+ TOBN(0x7b15d623, 0xc3fabb6e),
+ TOBN(0xa0ef40b1, 0xe274e49c),
+ TOBN(0x5cf50744, 0x96b1860a),
+ TOBN(0xd6583fbf, 0x66afe5a4),
+ TOBN(0x44240510, 0xf47e3e9a),
+ TOBN(0x99254343, 0x11b2d595),
+ TOBN(0xf1367499, 0xeec8df57),
+ TOBN(0x3cb12c61, 0x3e73dd05),
+ TOBN(0xd248c033, 0x7dac102a),
+ TOBN(0xcf154f13, 0xa77739f5),
+ TOBN(0xbf4288cb, 0x23d2af42),
+ TOBN(0xaa64c9b6, 0x32e4a1cf),
+ TOBN(0xee8c07a8, 0xc8a208f3),
+ TOBN(0xe10d4999, 0x6fe8393f),
+ TOBN(0x0f809a3f, 0xe91f3a32),
+ TOBN(0x61096d1c, 0x802f63c8),
+ TOBN(0x289e1462, 0x57750d3d),
+ TOBN(0xed06167e, 0x9889feea),
+ TOBN(0xd5c9c0e2, 0xe0993909),
+ TOBN(0x46fca0d8, 0x56508ac6),
+ TOBN(0x91826047, 0x4f1b8e83),
+ TOBN(0x4f2c877a, 0x9a4a2751),
+ TOBN(0x71bd0072, 0xcae6fead),
+ TOBN(0x38df8dcc, 0x06aa1941),
+ TOBN(0x5a074b4c, 0x63beeaa8),
+ TOBN(0xd6d65934, 0xc1cec8ed),
+ TOBN(0xa6ecb49e, 0xaabc03bd),
+ TOBN(0xaade91c2, 0xde8a8415),
+ TOBN(0xcfb0efdf, 0x691136e0),
+ TOBN(0x11af45ee, 0x23ab3495),
+ TOBN(0xa132df88, 0x0b77463d),
+ TOBN(0x8923c15c, 0x815d06f4),
+ TOBN(0xc3ceb3f5, 0x0d61a436),
+ TOBN(0xaf52291d, 0xe88fb1da),
+ TOBN(0xea057974, 0x1da12179),
+ TOBN(0xb0d7218c, 0xd2fef720),
+ TOBN(0x6c0899c9, 0x8e1d8845),
+ TOBN(0x98157504, 0x752ddad7),
+ TOBN(0xd60bd74f, 0xa1a68a97),
+ TOBN(0x7047a3a9, 0xf658fb99),
+ TOBN(0x1f5d86d6, 0x5f8511e4),
+ TOBN(0xb8a4bc42, 0x4b5a6d88),
+ TOBN(0x69eb2c33, 0x1abefa7d),
+ TOBN(0x95bf39e8, 0x13c9c510),
+ TOBN(0xf571960a, 0xd48aab43),
+ TOBN(0x7e8cfbcf, 0x704e23c6),
+ TOBN(0xc71b7d22, 0x28aaa65b),
+ TOBN(0xa041b2bd, 0x245e3c83),
+ TOBN(0x69b98834, 0xd21854ff),
+ TOBN(0x89d227a3, 0x963bfeec),
+ TOBN(0x99947aaa, 0xde7da7cb),
+ TOBN(0x1d9ee9db, 0xee68a9b1),
+ TOBN(0x0a08f003, 0x698ec368),
+ TOBN(0xe9ea4094, 0x78ef2487),
+ TOBN(0xc8d2d415, 0x02cfec26),
+ TOBN(0xc52f9a6e, 0xb7dcf328),
+ TOBN(0x0ed489e3, 0x85b6a937),
+ TOBN(0x9b94986b, 0xbef3366e),
+ TOBN(0x0de59c70, 0xedddddb8),
+ TOBN(0xffdb748c, 0xeadddbe2),
+ TOBN(0x9b9784bb, 0x8266ea40),
+ TOBN(0x142b5502, 0x1a93507a),
+ TOBN(0xb4cd1187, 0x8d3c06cf),
+ TOBN(0xdf70e76a, 0x91ec3f40),
+ TOBN(0x484e81ad, 0x4e7553c2),
+ TOBN(0x830f87b5, 0x272e9d6e),
+ TOBN(0xea1c93e5, 0xc6ff514a),
+ TOBN(0x67cc2adc, 0xc4192a8e),
+ TOBN(0xc77e27e2, 0x42f4535a),
+ TOBN(0x9cdbab36, 0xd2b713c5),
+ TOBN(0x86274ea0, 0xcf7b0cd3),
+ TOBN(0x784680f3, 0x09af826b),
+ TOBN(0xbfcc837a, 0x0c72dea3),
+ TOBN(0xa8bdfe9d, 0xd6529b73),
+ TOBN(0x708aa228, 0x63a88002),
+ TOBN(0x6c7a9a54, 0xc91d45b9),
+ TOBN(0xdf1a38bb, 0xfd004f56),
+ TOBN(0x2e8c9a26, 0xb8bad853),
+ TOBN(0x2d52cea3, 0x3723eae7),
+ TOBN(0x054d6d81, 0x56ca2830),
+ TOBN(0xa3317d14, 0x9a8dc411),
+ TOBN(0xa08662fe, 0xfd4ddeda),
+ TOBN(0xed2a153a, 0xb55d792b),
+ TOBN(0x7035c16a, 0xbfc6e944),
+ TOBN(0xb6bc5834, 0x00171cf3),
+ TOBN(0xe27152b3, 0x83d102b6),
+ TOBN(0xfe695a47, 0x0646b848),
+ TOBN(0xa5bb09d8, 0x916e6d37),
+ TOBN(0xb4269d64, 0x0d17015e),
+ TOBN(0x8d8156a1, 0x0a1d2285),
+ TOBN(0xfeef6c51, 0x46d26d72),
+ TOBN(0x9dac57c8, 0x4c5434a7),
+ TOBN(0x0282e5be, 0x59d39e31),
+ TOBN(0xedfff181, 0x721c486d),
+ TOBN(0x301baf10, 0xbc58824e),
+ TOBN(0x8136a6aa, 0x00570031),
+ TOBN(0x55aaf78c, 0x1cddde68),
+ TOBN(0x26829371, 0x59c63952),
+ TOBN(0x3a3bd274, 0x8bc25baf),
+ TOBN(0xecdf8657, 0xb7e52dc3),
+ TOBN(0x2dd8c087, 0xfd78e6c8),
+ TOBN(0x20553274, 0xf5531461),
+ TOBN(0x8b4a1281, 0x5d95499b),
+ TOBN(0xe2c8763a, 0x1a80f9d2),
+ TOBN(0xd1dbe32b, 0x4ddec758),
+ TOBN(0xaf12210d, 0x30c34169),
+ TOBN(0xba74a953, 0x78baa533),
+ TOBN(0x3d133c6e, 0xa438f254),
+ TOBN(0xa431531a, 0x201bef5b),
+ TOBN(0x15295e22, 0xf669d7ec),
+ TOBN(0xca374f64, 0x357fb515),
+ TOBN(0x8a8406ff, 0xeaa3fdb3),
+ TOBN(0x106ae448, 0xdf3f2da8),
+ TOBN(0x8f9b0a90, 0x33c8e9a1),
+ TOBN(0x234645e2, 0x71ad5885),
+ TOBN(0x3d083224, 0x1c0aed14),
+ TOBN(0xf10a7d3e, 0x7a942d46),
+ TOBN(0x7c11deee, 0x40d5c9be),
+ TOBN(0xb2bae7ff, 0xba84ed98),
+ TOBN(0x93e97139, 0xaad58ddd),
+ TOBN(0x3d872796, 0x3f6d1fa3),
+ TOBN(0x483aca81, 0x8569ff13),
+ TOBN(0x8b89a5fb, 0x9a600f72),
+ TOBN(0x4cbc27c3, 0xc06f2b86),
+ TOBN(0x22130713, 0x63ad9c0b),
+ TOBN(0xb5358b1e, 0x48ac2840),
+ TOBN(0x18311294, 0xecba9477),
+ TOBN(0xda58f990, 0xa6946b43),
+ TOBN(0x3098baf9, 0x9ab41819),
+ TOBN(0x66c4c158, 0x4198da52),
+ TOBN(0xab4fc17c, 0x146bfd1b),
+ TOBN(0x2f0a4c3c, 0xbf36a908),
+ TOBN(0x2ae9e34b, 0x58cf7838),
+ TOBN(0xf411529e, 0x3fa11b1f),
+ TOBN(0x21e43677, 0x974af2b4),
+ TOBN(0x7c20958e, 0xc230793b),
+ TOBN(0x710ea885, 0x16e840f3),
+ TOBN(0xfc0b21fc, 0xc5dc67cf),
+ TOBN(0x08d51647, 0x88405718),
+ TOBN(0xd955c21f, 0xcfe49eb7),
+ TOBN(0x9722a5d5, 0x56dd4a1f),
+ TOBN(0xc9ef50e2, 0xc861baa5),
+ TOBN(0xc0c21a5d, 0x9505ac3e),
+ TOBN(0xaf6b9a33, 0x8b7c063f),
+ TOBN(0xc6370339, 0x2f4779c1),
+ TOBN(0x22df99c7, 0x638167c3),
+ TOBN(0xfe6ffe76, 0x795db30c),
+ TOBN(0x2b822d33, 0xa4854989),
+ TOBN(0xfef031dd, 0x30563aa5),
+ TOBN(0x16b09f82, 0xd57c667f),
+ TOBN(0xc70312ce, 0xcc0b76f1),
+ TOBN(0xbf04a9e6, 0xc9118aec),
+ TOBN(0x82fcb419, 0x3409d133),
+ TOBN(0x1a8ab385, 0xab45d44d),
+ TOBN(0xfba07222, 0x617b83a3),
+ TOBN(0xb05f50dd, 0x58e81b52),
+ TOBN(0x1d8db553, 0x21ce5aff),
+ TOBN(0x3097b8d4, 0xe344a873),
+ TOBN(0x7d8d116d, 0xfe36d53e),
+ TOBN(0x6db22f58, 0x7875e750),
+ TOBN(0x2dc5e373, 0x43e144ea),
+ TOBN(0xc05f32e6, 0xe799eb95),
+ TOBN(0xe9e5f4df, 0x6899e6ec),
+ TOBN(0xbdc3bd68, 0x1fab23d5),
+ TOBN(0xb72b8ab7, 0x73af60e6),
+ TOBN(0x8db27ae0, 0x2cecc84a),
+ TOBN(0x600016d8, 0x7bdb871c),
+ TOBN(0x42a44b13, 0xd7c46f58),
+ TOBN(0xb8919727, 0xc3a77d39),
+ TOBN(0xcfc6bbbd, 0xdafd6088),
+ TOBN(0x1a740146, 0x6bd20d39),
+ TOBN(0x8c747abd, 0x98c41072),
+ TOBN(0x4c91e765, 0xbdf68ea1),
+ TOBN(0x7c95e5ca, 0x08819a78),
+ TOBN(0xcf48b729, 0xc9587921),
+ TOBN(0x091c7c5f, 0xdebbcc7d),
+ TOBN(0x6f287404, 0xf0e05149),
+ TOBN(0xf83b5ac2, 0x26cd44ec),
+ TOBN(0x88ae32a6, 0xcfea250e),
+ TOBN(0x6ac5047a, 0x1d06ebc5),
+ TOBN(0xc7e550b4, 0xd434f781),
+ TOBN(0x61ab1cf2, 0x5c727bd2),
+ TOBN(0x2e4badb1, 0x1cf915b0),
+ TOBN(0x1b4dadec, 0xf69d3920),
+ TOBN(0xe61b1ca6, 0xf14c1dfe),
+ TOBN(0x90b479cc, 0xbd6bd51f),
+ TOBN(0x8024e401, 0x8045ec30),
+ TOBN(0xcab29ca3, 0x25ef0e62),
+ TOBN(0x4f2e9416, 0x49e4ebc0),
+ TOBN(0x45eb40ec, 0x0ccced58),
+ TOBN(0x25cd4b9c, 0x0da44f98),
+ TOBN(0x43e06458, 0x871812c6),
+ TOBN(0x99f80d55, 0x16cef651),
+ TOBN(0x571340c9, 0xce6dc153),
+ TOBN(0x138d5117, 0xd8665521),
+ TOBN(0xacdb45bc, 0x4e07014d),
+ TOBN(0x2f34bb38, 0x84b60b91),
+ TOBN(0xf44a4fd2, 0x2ae8921e),
+ TOBN(0xb039288e, 0x892ba1e2),
+ TOBN(0x9da50174, 0xb1c180b2),
+ TOBN(0x6b70ab66, 0x1693dc87),
+ TOBN(0x7e9babc9, 0xe7057481),
+ TOBN(0x4581ddef, 0x9c80dc41),
+ TOBN(0x0c890da9, 0x51294682),
+ TOBN(0x0b5629d3, 0x3f4736e5),
+ TOBN(0x2340c79e, 0xb06f5b41),
+ TOBN(0xa42e84ce, 0x4e243469),
+ TOBN(0xf9a20135, 0x045a71a9),
+ TOBN(0xefbfb415, 0xd27b6fb6),
+ TOBN(0x25ebea23, 0x9d33cd6f),
+ TOBN(0x9caedb88, 0xaa6c0af8),
+ TOBN(0x53dc7e9a, 0xd9ce6f96),
+ TOBN(0x3897f9fd, 0x51e0b15a),
+ TOBN(0xf51cb1f8, 0x8e5d788e),
+ TOBN(0x1aec7ba8, 0xe1d490ee),
+ TOBN(0x265991e0, 0xcc58cb3c),
+ TOBN(0x9f306e8c, 0x9fc3ad31),
+ TOBN(0x5fed006e, 0x5040a0ac),
+ TOBN(0xca9d5043, 0xfb476f2e),
+ TOBN(0xa19c06e8, 0xbeea7a23),
+ TOBN(0xd2865801, 0x0edabb63),
+ TOBN(0xdb92293f, 0x6967469a),
+ TOBN(0x2894d839, 0x8d8a8ed8),
+ TOBN(0x87c9e406, 0xbbc77122),
+ TOBN(0x8671c6f1, 0x2ea3a26a),
+ TOBN(0xe42df8d6, 0xd7de9853),
+ TOBN(0x2e3ce346, 0xb1f2bcc7),
+ TOBN(0xda601dfc, 0x899d50cf),
+ TOBN(0xbfc913de, 0xfb1b598f),
+ TOBN(0x81c4909f, 0xe61f7908),
+ TOBN(0x192e304f, 0x9bbc7b29),
+ TOBN(0xc3ed8738, 0xc104b338),
+ TOBN(0xedbe9e47, 0x783f5d61),
+ TOBN(0x0c06e9be, 0x2db30660),
+ TOBN(0xda3e613f, 0xc0eb7d8e),
+ TOBN(0xd8fa3e97, 0x322e096e),
+ TOBN(0xfebd91e8, 0xd336e247),
+ TOBN(0x8f13ccc4, 0xdf655a49),
+ TOBN(0xa9e00dfc, 0x5eb20210),
+ TOBN(0x84631d0f, 0xc656b6ea),
+ TOBN(0x93a058cd, 0xd8c0d947),
+ TOBN(0x6846904a, 0x67bd3448),
+ TOBN(0x4a3d4e1a, 0xf394fd5c),
+ TOBN(0xc102c1a5, 0xdb225f52),
+ TOBN(0xe3455bba, 0xfc4f5e9a),
+ TOBN(0x6b36985b, 0x4b9ad1ce),
+ TOBN(0xa9818536, 0x5bb7f793),
+ TOBN(0x6c25e1d0, 0x48b1a416),
+ TOBN(0x1381dd53, 0x3c81bee7),
+ TOBN(0xd2a30d61, 0x7a4a7620),
+ TOBN(0xc8412926, 0x39b8944c),
+ TOBN(0x3c1c6fbe, 0x7a97c33a),
+ TOBN(0x941e541d, 0x938664e7),
+ TOBN(0x417499e8, 0x4a34f239),
+ TOBN(0x15fdb83c, 0xb90402d5),
+ TOBN(0xb75f46bf, 0x433aa832),
+ TOBN(0xb61e15af, 0x63215db1),
+ TOBN(0xaabe59d4, 0xa127f89a),
+ TOBN(0x5d541e0c, 0x07e816da),
+ TOBN(0xaaba0659, 0xa618b692),
+ TOBN(0x55327733, 0x17266026),
+ TOBN(0xaf53a0fc, 0x95f57552),
+ TOBN(0x32947650, 0x6cacb0c9),
+ TOBN(0x253ff58d, 0xc821be01),
+ TOBN(0xb0309531, 0xa06f1146),
+ TOBN(0x59bbbdf5, 0x05c2e54d),
+ TOBN(0x158f27ad, 0x26e8dd22),
+ TOBN(0xcc5b7ffb, 0x397e1e53),
+ TOBN(0xae03f65b, 0x7fc1e50d),
+ TOBN(0xa9784ebd, 0x9c95f0f9),
+ TOBN(0x5ed9deb2, 0x24640771),
+ TOBN(0x31244af7, 0x035561c4),
+ TOBN(0x87332f3a, 0x7ee857de),
+ TOBN(0x09e16e9e, 0x2b9e0d88),
+ TOBN(0x52d910f4, 0x56a06049),
+ TOBN(0x507ed477, 0xa9592f48),
+ TOBN(0x85cb917b, 0x2365d678),
+ TOBN(0xf8511c93, 0x4c8998d1),
+ TOBN(0x2186a3f1, 0x730ea58f),
+ TOBN(0x50189626, 0xb2029db0),
+ TOBN(0x9137a6d9, 0x02ceb75a),
+ TOBN(0x2fe17f37, 0x748bc82c),
+ TOBN(0x87c2e931, 0x80469f8c),
+ TOBN(0x850f71cd, 0xbf891aa2),
+ TOBN(0x0ca1b89b, 0x75ec3d8d),
+ TOBN(0x516c43aa, 0x5e1cd3cd),
+ TOBN(0x89397808, 0x9a887c28),
+ TOBN(0x0059c699, 0xddea1f9f),
+ TOBN(0x7737d6fa, 0x8e6868f7),
+ TOBN(0x6d93746a, 0x60f1524b),
+ TOBN(0x36985e55, 0xba052aa7),
+ TOBN(0x41b1d322, 0xed923ea5),
+ TOBN(0x3429759f, 0x25852a11),
+ TOBN(0xbeca6ec3, 0x092e9f41),
+ TOBN(0x3a238c66, 0x62256bbd),
+ TOBN(0xd82958ea, 0x70ad487d),
+ TOBN(0x4ac8aaf9, 0x65610d93),
+ TOBN(0x3fa101b1, 0x5e4ccab0),
+ TOBN(0x9bf430f2, 0x9de14bfb),
+ TOBN(0xa10f5cc6, 0x6531899d),
+ TOBN(0x590005fb, 0xea8ce17d),
+ TOBN(0xc437912f, 0x24544cb6),
+ TOBN(0x9987b71a, 0xd79ac2e3),
+ TOBN(0x13e3d9dd, 0xc058a212),
+ TOBN(0x00075aac, 0xd2de9606),
+ TOBN(0x80ab508b, 0x6cac8369),
+ TOBN(0x87842be7, 0xf54f6c89),
+ TOBN(0xa7ad663d, 0x6bc532a4),
+ TOBN(0x67813de7, 0x78a91bc8),
+ TOBN(0x5dcb61ce, 0xc3427239),
+ TOBN(0x5f3c7cf0, 0xc56934d9),
+ TOBN(0xc079e0fb, 0xe3191591),
+ TOBN(0xe40896bd, 0xb01aada7),
+ TOBN(0x8d466791, 0x0492d25f),
+ TOBN(0x8aeb30c9, 0xe7408276),
+ TOBN(0xe9437495, 0x9287aacc),
+ TOBN(0x23d4708d, 0x79fe03d4),
+ TOBN(0x8cda9cf2, 0xd0c05199),
+ TOBN(0x502fbc22, 0xfae78454),
+ TOBN(0xc0bda9df, 0xf572a182),
+ TOBN(0x5f9b71b8, 0x6158b372),
+ TOBN(0xe0f33a59, 0x2b82dd07),
+ TOBN(0x76302735, 0x9523032e),
+ TOBN(0x7fe1a721, 0xc4505a32),
+ TOBN(0x7b6e3e82, 0xf796409f),
+ },
+ {
+ TOBN(0xe3417bc0, 0x35d0b34a),
+ TOBN(0x440b386b, 0x8327c0a7),
+ TOBN(0x8fb7262d, 0xac0362d1),
+ TOBN(0x2c41114c, 0xe0cdf943),
+ TOBN(0x2ba5cef1, 0xad95a0b1),
+ TOBN(0xc09b37a8, 0x67d54362),
+ TOBN(0x26d6cdd2, 0x01e486c9),
+ TOBN(0x20477abf, 0x42ff9297),
+ TOBN(0xa004dcb3, 0x292a9287),
+ TOBN(0xddc15cf6, 0x77b092c7),
+ TOBN(0x083a8464, 0x806c0605),
+ TOBN(0x4a68df70, 0x3db997b0),
+ TOBN(0x9c134e45, 0x05bf7dd0),
+ TOBN(0xa4e63d39, 0x8ccf7f8c),
+ TOBN(0xa6e6517f, 0x41b5f8af),
+ TOBN(0xaa8b9342, 0xad7bc1cc),
+ TOBN(0x126f35b5, 0x1e706ad9),
+ TOBN(0xb99cebb4, 0xc3a9ebdf),
+ TOBN(0xa75389af, 0xbf608d90),
+ TOBN(0x76113c4f, 0xc6c89858),
+ TOBN(0x80de8eb0, 0x97e2b5aa),
+ TOBN(0x7e1022cc, 0x63b91304),
+ TOBN(0x3bdab605, 0x6ccc066c),
+ TOBN(0x33cbb144, 0xb2edf900),
+ TOBN(0xc4176471, 0x7af715d2),
+ TOBN(0xe2f7f594, 0xd0134a96),
+ TOBN(0x2c1873ef, 0xa41ec956),
+ TOBN(0xe4e7b4f6, 0x77821304),
+ TOBN(0xe5c8ff97, 0x88d5374a),
+ TOBN(0x2b915e63, 0x80823d5b),
+ TOBN(0xea6bc755, 0xb2ee8fe2),
+ TOBN(0x6657624c, 0xe7112651),
+ TOBN(0x157af101, 0xdace5aca),
+ TOBN(0xc4fdbcf2, 0x11a6a267),
+ TOBN(0xdaddf340, 0xc49c8609),
+ TOBN(0x97e49f52, 0xe9604a65),
+ TOBN(0x9be8e790, 0x937e2ad5),
+ TOBN(0x846e2508, 0x326e17f1),
+ TOBN(0x3f38007a, 0x0bbbc0dc),
+ TOBN(0xcf03603f, 0xb11e16d6),
+ TOBN(0xd6f800e0, 0x7442f1d5),
+ TOBN(0x475607d1, 0x66e0e3ab),
+ TOBN(0x82807f16, 0xb7c64047),
+ TOBN(0x8858e1e3, 0xa749883d),
+ TOBN(0x5859120b, 0x8231ee10),
+ TOBN(0x1b80e7eb, 0x638a1ece),
+ TOBN(0xcb72525a, 0xc6aa73a4),
+ TOBN(0xa7cdea3d, 0x844423ac),
+ TOBN(0x5ed0c007, 0xf8ae7c38),
+ TOBN(0x6db07a5c, 0x3d740192),
+ TOBN(0xbe5e9c2a, 0x5fe36db3),
+ TOBN(0xd5b9d57a, 0x76e95046),
+ TOBN(0x54ac32e7, 0x8eba20f2),
+ TOBN(0xef11ca8f, 0x71b9a352),
+ TOBN(0x305e373e, 0xff98a658),
+ TOBN(0xffe5a100, 0x823eb667),
+ TOBN(0x57477b11, 0xe51732d2),
+ TOBN(0xdfd6eb28, 0x2538fc0e),
+ TOBN(0x5c43b0cc, 0x3b39eec5),
+ TOBN(0x6af12778, 0xcb36cc57),
+ TOBN(0x70b0852d, 0x06c425ae),
+ TOBN(0x6df92f8c, 0x5c221b9b),
+ TOBN(0x6c8d4f9e, 0xce826d9c),
+ TOBN(0xf59aba7b, 0xb49359c3),
+ TOBN(0x5c8ed8d5, 0xda64309d),
+ TOBN(0x61a6de56, 0x91b30704),
+ TOBN(0xd6b52f6a, 0x2f9b5808),
+ TOBN(0x0eee4194, 0x98c958a7),
+ TOBN(0xcddd9aab, 0x771e4caa),
+ TOBN(0x83965dfd, 0x78bc21be),
+ TOBN(0x02affce3, 0xb3b504f5),
+ TOBN(0x30847a21, 0x561c8291),
+ TOBN(0xd2eb2cf1, 0x52bfda05),
+ TOBN(0xe0e4c4e9, 0x6197b98c),
+ TOBN(0x1d35076c, 0xf8a1726f),
+ TOBN(0x6c06085b, 0x2db11e3d),
+ TOBN(0x15c0c4d7, 0x4463ba14),
+ TOBN(0x9d292f83, 0x0030238c),
+ TOBN(0x1311ee8b, 0x3727536d),
+ TOBN(0xfeea86ef, 0xbeaedc1e),
+ TOBN(0xb9d18cd3, 0x66131e2e),
+ TOBN(0xf31d974f, 0x80fe2682),
+ TOBN(0xb6e49e0f, 0xe4160289),
+ TOBN(0x7c48ec0b, 0x08e92799),
+ TOBN(0x818111d8, 0xd1989aa7),
+ TOBN(0xb34fa0aa, 0xebf926f9),
+ TOBN(0xdb5fe2f5, 0xa245474a),
+ TOBN(0xf80a6ebb, 0x3c7ca756),
+ TOBN(0xa7f96054, 0xafa05dd8),
+ TOBN(0x26dfcf21, 0xfcaf119e),
+ TOBN(0xe20ef2e3, 0x0564bb59),
+ TOBN(0xef4dca50, 0x61cb02b8),
+ TOBN(0xcda7838a, 0x65d30672),
+ TOBN(0x8b08d534, 0xfd657e86),
+ TOBN(0x4c5b4395, 0x46d595c8),
+ TOBN(0x39b58725, 0x425cb836),
+ TOBN(0x8ea61059, 0x3de9abe3),
+ TOBN(0x40434881, 0x9cdc03be),
+ TOBN(0x9b261245, 0xcfedce8c),
+ TOBN(0x78c318b4, 0xcf5234a1),
+ TOBN(0x510bcf16, 0xfde24c99),
+ TOBN(0x2a77cb75, 0xa2c2ff5d),
+ TOBN(0x9c895c2b, 0x27960fb4),
+ TOBN(0xd30ce975, 0xb0eda42b),
+ TOBN(0xfda85393, 0x1a62cc26),
+ TOBN(0x23c69b96, 0x50c0e052),
+ TOBN(0xa227df15, 0xbfc633f3),
+ TOBN(0x2ac78848, 0x1bae7d48),
+ TOBN(0x487878f9, 0x187d073d),
+ TOBN(0x6c2be919, 0x967f807d),
+ TOBN(0x765861d8, 0x336e6d8f),
+ TOBN(0x88b8974c, 0xce528a43),
+ TOBN(0x09521177, 0xff57d051),
+ TOBN(0x2ff38037, 0xfb6a1961),
+ TOBN(0xfc0aba74, 0xa3d76ad4),
+ TOBN(0x7c764803, 0x25a7ec17),
+ TOBN(0x7532d75f, 0x48879bc8),
+ TOBN(0xea7eacc0, 0x58ce6bc1),
+ TOBN(0xc82176b4, 0x8e896c16),
+ TOBN(0x9a30e0b2, 0x2c750fed),
+ TOBN(0xc37e2c2e, 0x421d3aa4),
+ TOBN(0xf926407c, 0xe84fa840),
+ TOBN(0x18abc03d, 0x1454e41c),
+ TOBN(0x26605ecd, 0x3f7af644),
+ TOBN(0x242341a6, 0xd6a5eabf),
+ TOBN(0x1edb84f4, 0x216b668e),
+ TOBN(0xd836edb8, 0x04010102),
+ TOBN(0x5b337ce7, 0x945e1d8c),
+ TOBN(0xd2075c77, 0xc055dc14),
+ TOBN(0x2a0ffa25, 0x81d89cdf),
+ TOBN(0x8ce815ea, 0x6ffdcbaf),
+ TOBN(0xa3428878, 0xfb648867),
+ TOBN(0x277699cf, 0x884655fb),
+ TOBN(0xfa5b5bd6, 0x364d3e41),
+ TOBN(0x01f680c6, 0x441e1cb7),
+ TOBN(0x3fd61e66, 0xb70a7d67),
+ TOBN(0x666ba2dc, 0xcc78cf66),
+ TOBN(0xb3018174, 0x6fdbff77),
+ TOBN(0x8d4dd0db, 0x168d4668),
+ TOBN(0x259455d0, 0x1dab3a2a),
+ TOBN(0xf58564c5, 0xcde3acec),
+ TOBN(0x77141925, 0x13adb276),
+ TOBN(0x527d725d, 0x8a303f65),
+ TOBN(0x55deb6c9, 0xe6f38f7b),
+ TOBN(0xfd5bb657, 0xb1fa70fb),
+ TOBN(0xfa07f50f, 0xd8073a00),
+ TOBN(0xf72e3aa7, 0xbca02500),
+ TOBN(0xf68f895d, 0x9975740d),
+ TOBN(0x30112060, 0x5cae2a6a),
+ TOBN(0x01bd7218, 0x02874842),
+ TOBN(0x3d423891, 0x7ce47bd3),
+ TOBN(0xa66663c1, 0x789544f6),
+ TOBN(0x864d05d7, 0x3272d838),
+ TOBN(0xe22924f9, 0xfa6295c5),
+ TOBN(0x8189593f, 0x6c2fda32),
+ TOBN(0x330d7189, 0xb184b544),
+ TOBN(0x79efa62c, 0xbde1f714),
+ TOBN(0x35771c94, 0xe5cb1a63),
+ TOBN(0x2f4826b8, 0x641c8332),
+ TOBN(0x00a894fb, 0xc8cee854),
+ TOBN(0xb4b9a39b, 0x36194d40),
+ TOBN(0xe857a7c5, 0x77612601),
+ TOBN(0xf4209dd2, 0x4ecf2f58),
+ TOBN(0x82b9e66d, 0x5a033487),
+ TOBN(0xc1e36934, 0xe4e8b9dd),
+ TOBN(0xd2372c9d, 0xa42377d7),
+ TOBN(0x51dc94c7, 0x0e3ae43b),
+ TOBN(0x4c57761e, 0x04474f6f),
+ TOBN(0xdcdacd0a, 0x1058a318),
+ TOBN(0x369cf3f5, 0x78053a9a),
+ TOBN(0xc6c3de50, 0x31c68de2),
+ TOBN(0x4653a576, 0x3c4b6d9f),
+ TOBN(0x1688dd5a, 0xaa4e5c97),
+ TOBN(0x5be80aa1, 0xb7ab3c74),
+ TOBN(0x70cefe7c, 0xbc65c283),
+ TOBN(0x57f95f13, 0x06867091),
+ TOBN(0xa39114e2, 0x4415503b),
+ TOBN(0xc08ff7c6, 0x4cbb17e9),
+ TOBN(0x1eff674d, 0xd7dec966),
+ TOBN(0x6d4690af, 0x53376f63),
+ TOBN(0xff6fe32e, 0xea74237b),
+ TOBN(0xc436d17e, 0xcd57508e),
+ TOBN(0x15aa28e1, 0xedcc40fe),
+ TOBN(0x0d769c04, 0x581bbb44),
+ TOBN(0xc240b6de, 0x34eaacda),
+ TOBN(0xd9e116e8, 0x2ba0f1de),
+ TOBN(0xcbe45ec7, 0x79438e55),
+ TOBN(0x91787c9d, 0x96f752d7),
+ TOBN(0x897f532b, 0xf129ac2f),
+ TOBN(0xd307b7c8, 0x5a36e22c),
+ TOBN(0x91940675, 0x749fb8f3),
+ TOBN(0xd14f95d0, 0x157fdb28),
+ TOBN(0xfe51d029, 0x6ae55043),
+ TOBN(0x8931e98f, 0x44a87de1),
+ TOBN(0xe57f1cc6, 0x09e4fee2),
+ TOBN(0x0d063b67, 0x4e072d92),
+ TOBN(0x70a998b9, 0xed0e4316),
+ TOBN(0xe74a736b, 0x306aca46),
+ TOBN(0xecf0fbf2, 0x4fda97c7),
+ TOBN(0xa40f65cb, 0x3e178d93),
+ TOBN(0x16253604, 0x16df4285),
+ TOBN(0xb0c9babb, 0xd0c56ae2),
+ TOBN(0x73032b19, 0xcfc5cfc3),
+ TOBN(0xe497e5c3, 0x09752056),
+ TOBN(0x12096bb4, 0x164bda96),
+ TOBN(0x1ee42419, 0xa0b74da1),
+ TOBN(0x8fc36243, 0x403826ba),
+ TOBN(0x0c8f0069, 0xdc09e660),
+ TOBN(0x8667e981, 0xc27253c9),
+ TOBN(0x05a6aefb, 0x92b36a45),
+ TOBN(0xa62c4b36, 0x9cb7bb46),
+ TOBN(0x8394f375, 0x11f7027b),
+ TOBN(0x747bc79c, 0x5f109d0f),
+ TOBN(0xcad88a76, 0x5b8cc60a),
+ TOBN(0x80c5a66b, 0x58f09e68),
+ TOBN(0xe753d451, 0xf6127eac),
+ TOBN(0xc44b74a1, 0x5b0ec6f5),
+ TOBN(0x47989fe4, 0x5289b2b8),
+ TOBN(0x745f8484, 0x58d6fc73),
+ TOBN(0xec362a6f, 0xf61c70ab),
+ TOBN(0x070c98a7, 0xb3a8ad41),
+ TOBN(0x73a20fc0, 0x7b63db51),
+ TOBN(0xed2c2173, 0xf44c35f4),
+ TOBN(0x8a56149d, 0x9acc9dca),
+ TOBN(0x98f17881, 0x9ac6e0f4),
+ TOBN(0x360fdeaf, 0xa413b5ed),
+ TOBN(0x0625b8f4, 0xa300b0fd),
+ TOBN(0xf1f4d76a, 0x5b3222d3),
+ TOBN(0x9d6f5109, 0x587f76b8),
+ TOBN(0x8b4ee08d, 0x2317fdb5),
+ TOBN(0x88089bb7, 0x8c68b095),
+ TOBN(0x95570e9a, 0x5808d9b9),
+ TOBN(0xa395c36f, 0x35d33ae7),
+ TOBN(0x200ea123, 0x50bb5a94),
+ TOBN(0x20c789bd, 0x0bafe84b),
+ TOBN(0x243ef52d, 0x0919276a),
+ TOBN(0x3934c577, 0xe23ae233),
+ TOBN(0xb93807af, 0xa460d1ec),
+ TOBN(0xb72a53b1, 0xf8fa76a4),
+ TOBN(0xd8914cb0, 0xc3ca4491),
+ TOBN(0x2e128494, 0x3fb42622),
+ TOBN(0x3b2700ac, 0x500907d5),
+ TOBN(0xf370fb09, 0x1a95ec63),
+ TOBN(0xf8f30be2, 0x31b6dfbd),
+ TOBN(0xf2b2f8d2, 0x69e55f15),
+ TOBN(0x1fead851, 0xcc1323e9),
+ TOBN(0xfa366010, 0xd9e5eef6),
+ TOBN(0x64d487b0, 0xe316107e),
+ TOBN(0x4c076b86, 0xd23ddc82),
+ TOBN(0x03fd344c, 0x7e0143f0),
+ TOBN(0xa95362ff, 0x317af2c5),
+ TOBN(0x0add3db7, 0xe18b7a4f),
+ TOBN(0x9c673e3f, 0x8260e01b),
+ TOBN(0xfbeb49e5, 0x54a1cc91),
+ TOBN(0x91351bf2, 0x92f2e433),
+ TOBN(0xc755e7ec, 0x851141eb),
+ TOBN(0xc9a95139, 0x29607745),
+ TOBN(0x0ca07420, 0xa26f2b28),
+ TOBN(0xcb2790e7, 0x4bc6f9dd),
+ TOBN(0x345bbb58, 0xadcaffc0),
+ TOBN(0xc65ea38c, 0xbe0f27a2),
+ TOBN(0x67c24d7c, 0x641fcb56),
+ TOBN(0x2c25f0a7, 0xa9e2c757),
+ TOBN(0x93f5cdb0, 0x16f16c49),
+ TOBN(0x2ca5a9d7, 0xc5ee30a1),
+ TOBN(0xd1593635, 0xb909b729),
+ TOBN(0x804ce9f3, 0xdadeff48),
+ TOBN(0xec464751, 0xb07c30c3),
+ TOBN(0x89d65ff3, 0x9e49af6a),
+ TOBN(0xf2d6238a, 0x6f3d01bc),
+ TOBN(0x1095561e, 0x0bced843),
+ TOBN(0x51789e12, 0xc8a13fd8),
+ TOBN(0xd633f929, 0x763231df),
+ TOBN(0x46df9f7d, 0xe7cbddef),
+ TOBN(0x01c889c0, 0xcb265da8),
+ TOBN(0xfce1ad10, 0xaf4336d2),
+ TOBN(0x8d110df6, 0xfc6a0a7e),
+ TOBN(0xdd431b98, 0x6da425dc),
+ TOBN(0xcdc4aeab, 0x1834aabe),
+ TOBN(0x84deb124, 0x8439b7fc),
+ TOBN(0x8796f169, 0x3c2a5998),
+ TOBN(0x9b9247b4, 0x7947190d),
+ TOBN(0x55b9d9a5, 0x11597014),
+ TOBN(0x7e9dd70d, 0x7b1566ee),
+ TOBN(0x94ad78f7, 0xcbcd5e64),
+ TOBN(0x0359ac17, 0x9bd4c032),
+ TOBN(0x3b11baaf, 0x7cc222ae),
+ TOBN(0xa6a6e284, 0xba78e812),
+ TOBN(0x8392053f, 0x24cea1a0),
+ TOBN(0xc97bce4a, 0x33621491),
+ TOBN(0x7eb1db34, 0x35399ee9),
+ TOBN(0x473f78ef, 0xece81ad1),
+ TOBN(0x41d72fe0, 0xf63d3d0d),
+ TOBN(0xe620b880, 0xafab62fc),
+ TOBN(0x92096bc9, 0x93158383),
+ TOBN(0x41a21357, 0x8f896f6c),
+ TOBN(0x1b5ee2fa, 0xc7dcfcab),
+ TOBN(0x650acfde, 0x9546e007),
+ TOBN(0xc081b749, 0xb1b02e07),
+ TOBN(0xda9e41a0, 0xf9eca03d),
+ TOBN(0x013ba727, 0x175a54ab),
+ TOBN(0xca0cd190, 0xea5d8d10),
+ TOBN(0x85ea52c0, 0x95fd96a9),
+ TOBN(0x2c591b9f, 0xbc5c3940),
+ TOBN(0x6fb4d4e4, 0x2bad4d5f),
+ TOBN(0xfa4c3590, 0xfef0059b),
+ TOBN(0x6a10218a, 0xf5122294),
+ TOBN(0x9a78a81a, 0xa85751d1),
+ TOBN(0x04f20579, 0xa98e84e7),
+ TOBN(0xfe1242c0, 0x4997e5b5),
+ TOBN(0xe77a273b, 0xca21e1e4),
+ TOBN(0xfcc8b1ef, 0x9411939d),
+ TOBN(0xe20ea302, 0x92d0487a),
+ TOBN(0x1442dbec, 0x294b91fe),
+ TOBN(0x1f7a4afe, 0xbb6b0e8f),
+ TOBN(0x1700ef74, 0x6889c318),
+ TOBN(0xf5bbffc3, 0x70f1fc62),
+ TOBN(0x3b31d4b6, 0x69c79cca),
+ TOBN(0xe8bc2aab, 0xa7f6340d),
+ TOBN(0xb0b08ab4, 0xa725e10a),
+ TOBN(0x44f05701, 0xae340050),
+ TOBN(0xba4b3016, 0x1cf0c569),
+ TOBN(0x5aa29f83, 0xfbe19a51),
+ TOBN(0x1b9ed428, 0xb71d752e),
+ TOBN(0x1666e54e, 0xeb4819f5),
+ TOBN(0x616cdfed, 0x9e18b75b),
+ TOBN(0x112ed5be, 0x3ee27b0b),
+ TOBN(0xfbf28319, 0x44c7de4d),
+ TOBN(0xd685ec85, 0xe0e60d84),
+ TOBN(0x68037e30, 0x1db7ee78),
+ TOBN(0x5b65bdcd, 0x003c4d6e),
+ TOBN(0x33e7363a, 0x93e29a6a),
+ TOBN(0x995b3a61, 0x08d0756c),
+ TOBN(0xd727f85c, 0x2faf134b),
+ TOBN(0xfac6edf7, 0x1d337823),
+ TOBN(0x99b9aa50, 0x0439b8b4),
+ TOBN(0x722eb104, 0xe2b4e075),
+ TOBN(0x49987295, 0x437c4926),
+ TOBN(0xb1e4c0e4, 0x46a9b82d),
+ TOBN(0xd0cb3197, 0x57a006f5),
+ TOBN(0xf3de0f7d, 0xd7808c56),
+ TOBN(0xb5c54d8f, 0x51f89772),
+ TOBN(0x500a114a, 0xadbd31aa),
+ TOBN(0x9afaaaa6, 0x295f6cab),
+ TOBN(0x94705e21, 0x04cf667a),
+ TOBN(0xfc2a811b, 0x9d3935d7),
+ TOBN(0x560b0280, 0x6d09267c),
+ TOBN(0xf19ed119, 0xf780e53b),
+ TOBN(0xf0227c09, 0x067b6269),
+ TOBN(0x967b8533, 0x5caef599),
+ TOBN(0x155b9243, 0x68efeebc),
+ TOBN(0xcd6d34f5, 0xc497bae6),
+ TOBN(0x1dd8d5d3, 0x6cceb370),
+ TOBN(0x2aeac579, 0xa78d7bf9),
+ TOBN(0x5d65017d, 0x70b67a62),
+ TOBN(0x70c8e44f, 0x17c53f67),
+ TOBN(0xd1fc0950, 0x86a34d09),
+ TOBN(0xe0fca256, 0xe7134907),
+ TOBN(0xe24fa29c, 0x80fdd315),
+ TOBN(0x2c4acd03, 0xd87499ad),
+ TOBN(0xbaaf7517, 0x3b5a9ba6),
+ TOBN(0xb9cbe1f6, 0x12e51a51),
+ TOBN(0xd88edae3, 0x5e154897),
+ TOBN(0xe4309c3c, 0x77b66ca0),
+ TOBN(0xf5555805, 0xf67f3746),
+ TOBN(0x85fc37ba, 0xa36401ff),
+ TOBN(0xdf86e2ca, 0xd9499a53),
+ TOBN(0x6270b2a3, 0xecbc955b),
+ TOBN(0xafae64f5, 0x974ad33b),
+ TOBN(0x04d85977, 0xfe7b2df1),
+ TOBN(0x2a3db3ff, 0x4ab03f73),
+ TOBN(0x0b87878a, 0x8702740a),
+ TOBN(0x6d263f01, 0x5a061732),
+ TOBN(0xc25430ce, 0xa32a1901),
+ TOBN(0xf7ebab3d, 0xdb155018),
+ TOBN(0x3a86f693, 0x63a9b78e),
+ TOBN(0x349ae368, 0xda9f3804),
+ TOBN(0x470f07fe, 0xa164349c),
+ TOBN(0xd52f4cc9, 0x8562baa5),
+ TOBN(0xc74a9e86, 0x2b290df3),
+ TOBN(0xd3a1aa35, 0x43471a24),
+ TOBN(0x239446be, 0xb8194511),
+ TOBN(0xbec2dd00, 0x81dcd44d),
+ TOBN(0xca3d7f0f, 0xc42ac82d),
+ TOBN(0x1f3db085, 0xfdaf4520),
+ TOBN(0xbb6d3e80, 0x4549daf2),
+ TOBN(0xf5969d8a, 0x19ad5c42),
+ TOBN(0x7052b13d, 0xdbfd1511),
+ TOBN(0x11890d1b, 0x682b9060),
+ TOBN(0xa71d3883, 0xac34452c),
+ TOBN(0xa438055b, 0x783805b4),
+ TOBN(0x43241277, 0x4725b23e),
+ TOBN(0xf20cf96e, 0x4901bbed),
+ TOBN(0x6419c710, 0xf432a2bb),
+ TOBN(0x57a0fbb9, 0xdfa9cd7d),
+ TOBN(0x589111e4, 0x00daa249),
+ TOBN(0x19809a33, 0x7b60554e),
+ TOBN(0xea5f8887, 0xede283a4),
+ TOBN(0x2d713802, 0x503bfd35),
+ TOBN(0x151bb0af, 0x585d2a53),
+ TOBN(0x40b08f74, 0x43b30ca8),
+ TOBN(0xe10b5bba, 0xd9934583),
+ TOBN(0xe8a546d6, 0xb51110ad),
+ TOBN(0x1dd50e66, 0x28e0b6c5),
+ TOBN(0x292e9d54, 0xcff2b821),
+ TOBN(0x3882555d, 0x47281760),
+ TOBN(0x134838f8, 0x3724d6e3),
+ TOBN(0xf2c679e0, 0x22ddcda1),
+ TOBN(0x40ee8815, 0x6d2a5768),
+ TOBN(0x7f227bd2, 0x1c1e7e2d),
+ TOBN(0x487ba134, 0xd04ff443),
+ TOBN(0x76e2ff3d, 0xc614e54b),
+ TOBN(0x36b88d6f, 0xa3177ec7),
+ TOBN(0xbf731d51, 0x2328fff5),
+ TOBN(0x758caea2, 0x49ba158e),
+ TOBN(0x5ab8ff4c, 0x02938188),
+ TOBN(0x33e16056, 0x35edc56d),
+ TOBN(0x5a69d349, 0x7e940d79),
+ TOBN(0x6c4fd001, 0x03866dcb),
+ TOBN(0x20a38f57, 0x4893cdef),
+ TOBN(0xfbf3e790, 0xfac3a15b),
+ TOBN(0x6ed7ea2e, 0x7a4f8e6b),
+ TOBN(0xa663eb4f, 0xbc3aca86),
+ TOBN(0x22061ea5, 0x080d53f7),
+ TOBN(0x2480dfe6, 0xf546783f),
+ TOBN(0xd38bc6da, 0x5a0a641e),
+ TOBN(0xfb093cd1, 0x2ede8965),
+ TOBN(0x89654db4, 0xacb455cf),
+ TOBN(0x413cbf9a, 0x26e1adee),
+ TOBN(0x291f3764, 0x373294d4),
+ TOBN(0x00797257, 0x648083fe),
+ TOBN(0x25f504d3, 0x208cc341),
+ TOBN(0x635a8e5e, 0xc3a0ee43),
+ TOBN(0x70aaebca, 0x679898ff),
+ TOBN(0x9ee9f547, 0x5dc63d56),
+ TOBN(0xce987966, 0xffb34d00),
+ TOBN(0xf9f86b19, 0x5e26310a),
+ TOBN(0x9e435484, 0x382a8ca8),
+ TOBN(0x253bcb81, 0xc2352fe4),
+ TOBN(0xa4eac8b0, 0x4474b571),
+ TOBN(0xc1b97512, 0xc1ad8cf8),
+ TOBN(0x193b4e9e, 0x99e0b697),
+ TOBN(0x939d2716, 0x01e85df0),
+ TOBN(0x4fb265b3, 0xcd44eafd),
+ TOBN(0x321e7dcd, 0xe51e1ae2),
+ TOBN(0x8e3a8ca6, 0xe3d8b096),
+ TOBN(0x8de46cb0, 0x52604998),
+ TOBN(0x91099ad8, 0x39072aa7),
+ TOBN(0x2617f91c, 0x93aa96b8),
+ TOBN(0x0fc8716b, 0x7fca2e13),
+ TOBN(0xa7106f5e, 0x95328723),
+ TOBN(0xd1c9c40b, 0x262e6522),
+ TOBN(0xb9bafe86, 0x42b7c094),
+ TOBN(0x1873439d, 0x1543c021),
+ TOBN(0xe1baa5de, 0x5cbefd5d),
+ TOBN(0xa363fc5e, 0x521e8aff),
+ TOBN(0xefe6320d, 0xf862eaac),
+ TOBN(0x14419c63, 0x22c647dc),
+ TOBN(0x0e06707c, 0x4e46d428),
+ TOBN(0xcb6c834f, 0x4a178f8f),
+ TOBN(0x0f993a45, 0xd30f917c),
+ TOBN(0xd4c4b049, 0x9879afee),
+ TOBN(0xb6142a1e, 0x70500063),
+ TOBN(0x7c9b41c3, 0xa5d9d605),
+ TOBN(0xbc00fc2f, 0x2f8ba2c7),
+ TOBN(0x0966eb2f, 0x7c67aa28),
+ TOBN(0x13f7b516, 0x5a786972),
+ TOBN(0x3bfb7557, 0x8a2fbba0),
+ TOBN(0x131c4f23, 0x5a2b9620),
+ TOBN(0xbff3ed27, 0x6faf46be),
+ TOBN(0x9b4473d1, 0x7e172323),
+ TOBN(0x421e8878, 0x339f6246),
+ TOBN(0x0fa8587a, 0x25a41632),
+ TOBN(0xc0814124, 0xa35b6c93),
+ TOBN(0x2b18a9f5, 0x59ebb8db),
+ TOBN(0x264e3357, 0x76edb29c),
+ TOBN(0xaf245ccd, 0xc87c51e2),
+ TOBN(0x16b3015b, 0x501e6214),
+ TOBN(0xbb31c560, 0x0a3882ce),
+ TOBN(0x6961bb94, 0xfec11e04),
+ TOBN(0x3b825b8d, 0xeff7a3a0),
+ TOBN(0xbec33738, 0xb1df7326),
+ TOBN(0x68ad747c, 0x99604a1f),
+ TOBN(0xd154c934, 0x9a3bd499),
+ TOBN(0xac33506f, 0x1cc7a906),
+ TOBN(0x73bb5392, 0x6c560e8f),
+ TOBN(0x6428fcbe, 0x263e3944),
+ TOBN(0xc11828d5, 0x1c387434),
+ TOBN(0x3cd04be1, 0x3e4b12ff),
+ TOBN(0xc3aad9f9, 0x2d88667c),
+ TOBN(0xc52ddcf8, 0x248120cf),
+ TOBN(0x985a892e, 0x2a389532),
+ TOBN(0xfbb4b21b, 0x3bb85fa0),
+ TOBN(0xf95375e0, 0x8dfc6269),
+ TOBN(0xfb4fb06c, 0x7ee2acea),
+ TOBN(0x6785426e, 0x309c4d1f),
+ TOBN(0x659b17c8, 0xd8ceb147),
+ TOBN(0x9b649eee, 0xb70a5554),
+ TOBN(0x6b7fa0b5, 0xac6bc634),
+ TOBN(0xd99fe2c7, 0x1d6e732f),
+ TOBN(0x30e6e762, 0x8d3abba2),
+ TOBN(0x18fee6e7, 0xa797b799),
+ TOBN(0x5c9d360d, 0xc696464d),
+ TOBN(0xe3baeb48, 0x27bfde12),
+ TOBN(0x2bf5db47, 0xf23206d5),
+ TOBN(0x2f6d3420, 0x1d260152),
+ TOBN(0x17b87653, 0x3f8ff89a),
+ TOBN(0x5157c30c, 0x378fa458),
+ TOBN(0x7517c5c5, 0x2d4fb936),
+ TOBN(0xef22f7ac, 0xe6518cdc),
+ TOBN(0xdeb483e6, 0xbf847a64),
+ TOBN(0xf5084558, 0x92e0fa89),
+ },
+ {
+ TOBN(0xab9659d8, 0xdf7304d4),
+ TOBN(0xb71bcf1b, 0xff210e8e),
+ TOBN(0xa9a2438b, 0xd73fbd60),
+ TOBN(0x4595cd1f, 0x5d11b4de),
+ TOBN(0x9c0d329a, 0x4835859d),
+ TOBN(0x4a0f0d2d, 0x7dbb6e56),
+ TOBN(0xc6038e5e, 0xdf928a4e),
+ TOBN(0xc9429621, 0x8f5ad154),
+ TOBN(0x91213462, 0xf23f2d92),
+ TOBN(0x6cab71bd, 0x60b94078),
+ TOBN(0x6bdd0a63, 0x176cde20),
+ TOBN(0x54c9b20c, 0xee4d54bc),
+ TOBN(0x3cd2d8aa, 0x9f2ac02f),
+ TOBN(0x03f8e617, 0x206eedb0),
+ TOBN(0xc7f68e16, 0x93086434),
+ TOBN(0x831469c5, 0x92dd3db9),
+ TOBN(0x8521df24, 0x8f981354),
+ TOBN(0x587e23ec, 0x3588a259),
+ TOBN(0xcbedf281, 0xd7a0992c),
+ TOBN(0x06930a55, 0x38961407),
+ TOBN(0x09320deb, 0xbe5bbe21),
+ TOBN(0xa7ffa5b5, 0x2491817f),
+ TOBN(0xe6c8b4d9, 0x09065160),
+ TOBN(0xac4f3992, 0xfff6d2a9),
+ TOBN(0x7aa7a158, 0x3ae9c1bd),
+ TOBN(0xe0af6d98, 0xe37ce240),
+ TOBN(0xe54342d9, 0x28ab38b4),
+ TOBN(0xe8b75007, 0x0a1c98ca),
+ TOBN(0xefce86af, 0xe02358f2),
+ TOBN(0x31b8b856, 0xea921228),
+ TOBN(0x052a1912, 0x0a1c67fc),
+ TOBN(0xb4069ea4, 0xe3aead59),
+ TOBN(0x3232d6e2, 0x7fa03cb3),
+ TOBN(0xdb938e5b, 0x0fdd7d88),
+ TOBN(0x04c1d2cd, 0x2ccbfc5d),
+ TOBN(0xd2f45c12, 0xaf3a580f),
+ TOBN(0x592620b5, 0x7883e614),
+ TOBN(0x5fd27e68, 0xbe7c5f26),
+ TOBN(0x139e45a9, 0x1567e1e3),
+ TOBN(0x2cc71d2d, 0x44d8aaaf),
+ TOBN(0x4a9090cd, 0xe36d0757),
+ TOBN(0xf722d7b1, 0xd9a29382),
+ TOBN(0xfb7fb04c, 0x04b48ddf),
+ TOBN(0x628ad2a7, 0xebe16f43),
+ TOBN(0xcd3fbfb5, 0x20226040),
+ TOBN(0x6c34ecb1, 0x5104b6c4),
+ TOBN(0x30c0754e, 0xc903c188),
+ TOBN(0xec336b08, 0x2d23cab0),
+ TOBN(0x473d62a2, 0x1e206ee5),
+ TOBN(0xf1e27480, 0x8c49a633),
+ TOBN(0x87ab956c, 0xe9f6b2c3),
+ TOBN(0x61830b48, 0x62b606ea),
+ TOBN(0x67cd6846, 0xe78e815f),
+ TOBN(0xfe40139f, 0x4c02082a),
+ TOBN(0x52bbbfcb, 0x952ec365),
+ TOBN(0x74c11642, 0x6b9836ab),
+ TOBN(0x9f51439e, 0x558df019),
+ TOBN(0x230da4ba, 0xac712b27),
+ TOBN(0x518919e3, 0x55185a24),
+ TOBN(0x4dcefcdd, 0x84b78f50),
+ TOBN(0xa7d90fb2, 0xa47d4c5a),
+ TOBN(0x55ac9abf, 0xb30e009e),
+ TOBN(0xfd2fc359, 0x74eed273),
+ TOBN(0xb72d824c, 0xdbea8faf),
+ TOBN(0xce721a74, 0x4513e2ca),
+ TOBN(0x0b418612, 0x38240b2c),
+ TOBN(0x05199968, 0xd5baa450),
+ TOBN(0xeb1757ed, 0x2b0e8c25),
+ TOBN(0x6ebc3e28, 0x3dfac6d5),
+ TOBN(0xb2431e2e, 0x48a237f5),
+ TOBN(0x2acb5e23, 0x52f61499),
+ TOBN(0x5558a2a7, 0xe06c936b),
+ TOBN(0xd213f923, 0xcbb13d1b),
+ TOBN(0x98799f42, 0x5bfb9bfe),
+ TOBN(0x1ae8ddc9, 0x701144a9),
+ TOBN(0x0b8b3bb6, 0x4c5595ee),
+ TOBN(0x0ea9ef2e, 0x3ecebb21),
+ TOBN(0x17cb6c4b, 0x3671f9a7),
+ TOBN(0x47ef464f, 0x726f1d1f),
+ TOBN(0x171b9484, 0x6943a276),
+ TOBN(0x51a4ae2d, 0x7ef0329c),
+ TOBN(0x08509222, 0x91c4402a),
+ TOBN(0x64a61d35, 0xafd45bbc),
+ TOBN(0x38f096fe, 0x3035a851),
+ TOBN(0xc7468b74, 0xa1dec027),
+ TOBN(0xe8cf10e7, 0x4fc7dcba),
+ TOBN(0xea35ff40, 0xf4a06353),
+ TOBN(0x0b4c0dfa, 0x8b77dd66),
+ TOBN(0x779b8552, 0xde7e5c19),
+ TOBN(0xfab28609, 0xc1c0256c),
+ TOBN(0x64f58eee, 0xabd4743d),
+ TOBN(0x4e8ef838, 0x7b6cc93b),
+ TOBN(0xee650d26, 0x4cb1bf3d),
+ TOBN(0x4c1f9d09, 0x73dedf61),
+ TOBN(0xaef7c9d7, 0xbfb70ced),
+ TOBN(0x1ec0507e, 0x1641de1e),
+ TOBN(0xcd7e5cc7, 0xcde45079),
+ TOBN(0xde173c9a, 0x516ac9e4),
+ TOBN(0x517a8494, 0xc170315c),
+ TOBN(0x438fd905, 0x91d8e8fb),
+ TOBN(0x5145c506, 0xc7d9630b),
+ TOBN(0x6457a87b, 0xf47d4d75),
+ TOBN(0xd31646bf, 0x0d9a80e8),
+ TOBN(0x453add2b, 0xcef3aabe),
+ TOBN(0xc9941109, 0xa607419d),
+ TOBN(0xfaa71e62, 0xbb6bca80),
+ TOBN(0x34158c13, 0x07c431f3),
+ TOBN(0x594abebc, 0x992bc47a),
+ TOBN(0x6dfea691, 0xeb78399f),
+ TOBN(0x48aafb35, 0x3f42cba4),
+ TOBN(0xedcd65af, 0x077c04f0),
+ TOBN(0x1a29a366, 0xe884491a),
+ TOBN(0x023a40e5, 0x1c21f2bf),
+ TOBN(0xf99a513c, 0xa5057aee),
+ TOBN(0xa3fe7e25, 0xbcab072e),
+ TOBN(0x8568d2e1, 0x40e32bcf),
+ TOBN(0x904594eb, 0xd3f69d9f),
+ TOBN(0x181a9733, 0x07affab1),
+ TOBN(0xe4d68d76, 0xb6e330f4),
+ TOBN(0x87a6dafb, 0xc75a7fc1),
+ TOBN(0x549db2b5, 0xef7d9289),
+ TOBN(0x2480d4a8, 0x197f015a),
+ TOBN(0x61d5590b, 0xc40493b6),
+ TOBN(0x3a55b52e, 0x6f780331),
+ TOBN(0x40eb8115, 0x309eadb0),
+ TOBN(0xdea7de5a, 0x92e5c625),
+ TOBN(0x64d631f0, 0xcc6a3d5a),
+ TOBN(0x9d5e9d7c, 0x93e8dd61),
+ TOBN(0xf297bef5, 0x206d3ffc),
+ TOBN(0x23d5e033, 0x7d808bd4),
+ TOBN(0x4a4f6912, 0xd24cf5ba),
+ TOBN(0xe4d8163b, 0x09cdaa8a),
+ TOBN(0x0e0de9ef, 0xd3082e8e),
+ TOBN(0x4fe1246c, 0x0192f360),
+ TOBN(0x1f900150, 0x4b8eee0a),
+ TOBN(0x5219da81, 0xf1da391b),
+ TOBN(0x7bf6a5c1, 0xf7ea25aa),
+ TOBN(0xd165e6bf, 0xfbb07d5f),
+ TOBN(0xe3539361, 0x89e78671),
+ TOBN(0xa3fcac89, 0x2bac4219),
+ TOBN(0xdfab6fd4, 0xf0baa8ab),
+ TOBN(0x5a4adac1, 0xe2c1c2e5),
+ TOBN(0x6cd75e31, 0x40d85849),
+ TOBN(0xce263fea, 0x19b39181),
+ TOBN(0xcb6803d3, 0x07032c72),
+ TOBN(0x7f40d5ce, 0x790968c8),
+ TOBN(0xa6de86bd, 0xdce978f0),
+ TOBN(0x25547c4f, 0x368f751c),
+ TOBN(0xb1e685fd, 0x65fb2a9e),
+ TOBN(0xce69336f, 0x1eb9179c),
+ TOBN(0xb15d1c27, 0x12504442),
+ TOBN(0xb7df465c, 0xb911a06b),
+ TOBN(0xb8d804a3, 0x315980cd),
+ TOBN(0x693bc492, 0xfa3bebf7),
+ TOBN(0x3578aeee, 0x2253c504),
+ TOBN(0x158de498, 0xcd2474a2),
+ TOBN(0x1331f5c7, 0xcfda8368),
+ TOBN(0xd2d7bbb3, 0x78d7177e),
+ TOBN(0xdf61133a, 0xf3c1e46e),
+ TOBN(0x5836ce7d, 0xd30e7be8),
+ TOBN(0x83084f19, 0x94f834cb),
+ TOBN(0xd35653d4, 0x429ed782),
+ TOBN(0xa542f16f, 0x59e58243),
+ TOBN(0xc2b52f65, 0x0470a22d),
+ TOBN(0xe3b6221b, 0x18f23d96),
+ TOBN(0xcb05abac, 0x3f5252b4),
+ TOBN(0xca00938b, 0x87d61402),
+ TOBN(0x2f186cdd, 0x411933e4),
+ TOBN(0xe042ece5, 0x9a29a5c5),
+ TOBN(0xb19b3c07, 0x3b6c8402),
+ TOBN(0xc97667c7, 0x19d92684),
+ TOBN(0xb5624622, 0xebc66372),
+ TOBN(0x0cb96e65, 0x3c04fa02),
+ TOBN(0x83a7176c, 0x8eaa39aa),
+ TOBN(0x2033561d, 0xeaa1633f),
+ TOBN(0x45a9d086, 0x4533df73),
+ TOBN(0xe0542c1d, 0x3dc090bc),
+ TOBN(0x82c996ef, 0xaa59c167),
+ TOBN(0xe3f735e8, 0x0ee7fc4d),
+ TOBN(0x7b179393, 0x7c35db79),
+ TOBN(0xb6419e25, 0xf8c5dbfd),
+ TOBN(0x4d9d7a1e, 0x1f327b04),
+ TOBN(0x979f6f9b, 0x298dfca8),
+ TOBN(0xc7c5dff1, 0x8de9366a),
+ TOBN(0x1b7a588d, 0x04c82bdd),
+ TOBN(0x68005534, 0xf8319dfd),
+ TOBN(0xde8a55b5, 0xd8eb9580),
+ TOBN(0x5ea886da, 0x8d5bca81),
+ TOBN(0xe8530a01, 0x252a0b4d),
+ TOBN(0x1bffb4fe, 0x35eaa0a1),
+ TOBN(0x2ad828b1, 0xd8e99563),
+ TOBN(0x7de96ef5, 0x95f9cd87),
+ TOBN(0x4abb2d0c, 0xd77d970c),
+ TOBN(0x03cfb933, 0xd33ef9cb),
+ TOBN(0xb0547c01, 0x8b211fe9),
+ TOBN(0x2fe64809, 0xa56ed1c6),
+ TOBN(0xcb7d5624, 0xc2ac98cc),
+ TOBN(0x2a1372c0, 0x1a393e33),
+ TOBN(0xc8d1ec1c, 0x29660521),
+ TOBN(0xf3d31b04, 0xb37ac3e9),
+ TOBN(0xa29ae9df, 0x5ece6e7c),
+ TOBN(0x0603ac8f, 0x0facfb55),
+ TOBN(0xcfe85b7a, 0xdda233a5),
+ TOBN(0xe618919f, 0xbd75f0b8),
+ TOBN(0xf555a3d2, 0x99bf1603),
+ TOBN(0x1f43afc9, 0xf184255a),
+ TOBN(0xdcdaf341, 0x319a3e02),
+ TOBN(0xd3b117ef, 0x03903a39),
+ TOBN(0xe095da13, 0x65d1d131),
+ TOBN(0x86f16367, 0xc37ad03e),
+ TOBN(0x5f37389e, 0x462cd8dd),
+ TOBN(0xc103fa04, 0xd67a60e6),
+ TOBN(0x57c34344, 0xf4b478f0),
+ TOBN(0xce91edd8, 0xe117c98d),
+ TOBN(0x001777b0, 0x231fc12e),
+ TOBN(0x11ae47f2, 0xb207bccb),
+ TOBN(0xd983cf8d, 0x20f8a242),
+ TOBN(0x7aff5b1d, 0xf22e1ad8),
+ TOBN(0x68fd11d0, 0x7fc4feb3),
+ TOBN(0x5d53ae90, 0xb0f1c3e1),
+ TOBN(0x50fb7905, 0xec041803),
+ TOBN(0x85e3c977, 0x14404888),
+ TOBN(0x0e67faed, 0xac628d8f),
+ TOBN(0x2e865150, 0x6668532c),
+ TOBN(0x15acaaa4, 0x6a67a6b0),
+ TOBN(0xf4cdee25, 0xb25cec41),
+ TOBN(0x49ee565a, 0xe4c6701e),
+ TOBN(0x2a04ca66, 0xfc7d63d8),
+ TOBN(0xeb105018, 0xef0543fb),
+ TOBN(0xf709a4f5, 0xd1b0d81d),
+ TOBN(0x5b906ee6, 0x2915d333),
+ TOBN(0xf4a87412, 0x96f1f0ab),
+ TOBN(0xb6b82fa7, 0x4d82f4c2),
+ TOBN(0x90725a60, 0x6804efb3),
+ TOBN(0xbc82ec46, 0xadc3425e),
+ TOBN(0xb7b80581, 0x2787843e),
+ TOBN(0xdf46d91c, 0xdd1fc74c),
+ TOBN(0xdc1c62cb, 0xe783a6c4),
+ TOBN(0x59d1b9f3, 0x1a04cbba),
+ TOBN(0xd87f6f72, 0x95e40764),
+ TOBN(0x02b4cfc1, 0x317f4a76),
+ TOBN(0x8d2703eb, 0x91036bce),
+ TOBN(0x98206cc6, 0xa5e72a56),
+ TOBN(0x57be9ed1, 0xcf53fb0f),
+ TOBN(0x09374571, 0xef0b17ac),
+ TOBN(0x74b2655e, 0xd9181b38),
+ TOBN(0xc8f80ea8, 0x89935d0e),
+ TOBN(0xc0d9e942, 0x91529936),
+ TOBN(0x19686041, 0x1e84e0e5),
+ TOBN(0xa5db84d3, 0xaea34c93),
+ TOBN(0xf9d5bb19, 0x7073a732),
+ TOBN(0xb8d2fe56, 0x6bcfd7c0),
+ TOBN(0x45775f36, 0xf3eb82fa),
+ TOBN(0x8cb20ccc, 0xfdff8b58),
+ TOBN(0x1659b65f, 0x8374c110),
+ TOBN(0xb8b4a422, 0x330c789a),
+ TOBN(0x75e3c3ea, 0x6fe8208b),
+ TOBN(0xbd74b9e4, 0x286e78fe),
+ TOBN(0x0be2e81b, 0xd7d93a1a),
+ TOBN(0x7ed06e27, 0xdd0a5aae),
+ TOBN(0x721f5a58, 0x6be8b800),
+ TOBN(0x428299d1, 0xd846db28),
+ TOBN(0x95cb8e6b, 0x5be88ed3),
+ TOBN(0xc3186b23, 0x1c034e11),
+ TOBN(0xa6312c9e, 0x8977d99b),
+ TOBN(0xbe944331, 0x83f531e7),
+ TOBN(0x8232c0c2, 0x18d3b1d4),
+ TOBN(0x617aae8b, 0xe1247b73),
+ TOBN(0x40153fc4, 0x282aec3b),
+ TOBN(0xc6063d2f, 0xf7b8f823),
+ TOBN(0x68f10e58, 0x3304f94c),
+ TOBN(0x31efae74, 0xee676346),
+ TOBN(0xbadb6c6d, 0x40a9b97c),
+ TOBN(0x14702c63, 0x4f666256),
+ TOBN(0xdeb954f1, 0x5184b2e3),
+ TOBN(0x5184a526, 0x94b6ca40),
+ TOBN(0xfff05337, 0x003c32ea),
+ TOBN(0x5aa374dd, 0x205974c7),
+ TOBN(0x9a763854, 0x4b0dd71a),
+ TOBN(0x459cd27f, 0xdeb947ec),
+ TOBN(0xa6e28161, 0x459c2b92),
+ TOBN(0x2f020fa8, 0x75ee8ef5),
+ TOBN(0xb132ec2d, 0x30b06310),
+ TOBN(0xc3e15899, 0xbc6a4530),
+ TOBN(0xdc5f53fe, 0xaa3f451a),
+ TOBN(0x3a3c7f23, 0xc2d9acac),
+ TOBN(0x2ec2f892, 0x6b27e58b),
+ TOBN(0x68466ee7, 0xd742799f),
+ TOBN(0x98324dd4, 0x1fa26613),
+ TOBN(0xa2dc6dab, 0xbdc29d63),
+ TOBN(0xf9675faa, 0xd712d657),
+ TOBN(0x813994be, 0x21fd8d15),
+ TOBN(0x5ccbb722, 0xfd4f7553),
+ TOBN(0x5135ff8b, 0xf3a36b20),
+ TOBN(0x44be28af, 0x69559df5),
+ TOBN(0x40b65bed, 0x9d41bf30),
+ TOBN(0xd98bf2a4, 0x3734e520),
+ TOBN(0x5e3abbe3, 0x209bdcba),
+ TOBN(0x77c76553, 0xbc945b35),
+ TOBN(0x5331c093, 0xc6ef14aa),
+ TOBN(0x518ffe29, 0x76b60c80),
+ TOBN(0x2285593b, 0x7ace16f8),
+ TOBN(0xab1f64cc, 0xbe2b9784),
+ TOBN(0xe8f2c0d9, 0xab2421b6),
+ TOBN(0x617d7174, 0xc1df065c),
+ TOBN(0xafeeb5ab, 0x5f6578fa),
+ TOBN(0x16ff1329, 0x263b54a8),
+ TOBN(0x45c55808, 0xc990dce3),
+ TOBN(0x42eab6c0, 0xecc8c177),
+ TOBN(0x799ea9b5, 0x5982ecaa),
+ TOBN(0xf65da244, 0xb607ef8e),
+ TOBN(0x8ab226ce, 0x32a3fc2c),
+ TOBN(0x745741e5, 0x7ea973dc),
+ TOBN(0x5c00ca70, 0x20888f2e),
+ TOBN(0x7cdce3cf, 0x45fd9cf1),
+ TOBN(0x8a741ef1, 0x5507f872),
+ TOBN(0x47c51c2f, 0x196b4cec),
+ TOBN(0x70d08e43, 0xc97ea618),
+ TOBN(0x930da15c, 0x15b18a2b),
+ TOBN(0x33b6c678, 0x2f610514),
+ TOBN(0xc662e4f8, 0x07ac9794),
+ TOBN(0x1eccf050, 0xba06cb79),
+ TOBN(0x1ff08623, 0xe7d954e5),
+ TOBN(0x6ef2c5fb, 0x24cf71c3),
+ TOBN(0xb2c063d2, 0x67978453),
+ TOBN(0xa0cf3796, 0x1d654af8),
+ TOBN(0x7cb242ea, 0x7ebdaa37),
+ TOBN(0x206e0b10, 0xb86747e0),
+ TOBN(0x481dae5f, 0xd5ecfefc),
+ TOBN(0x07084fd8, 0xc2bff8fc),
+ TOBN(0x8040a01a, 0xea324596),
+ TOBN(0x4c646980, 0xd4de4036),
+ TOBN(0x9eb8ab4e, 0xd65abfc3),
+ TOBN(0xe01cb91f, 0x13541ec7),
+ TOBN(0x8f029adb, 0xfd695012),
+ TOBN(0x9ae28483, 0x3c7569ec),
+ TOBN(0xa5614c9e, 0xa66d80a1),
+ TOBN(0x680a3e44, 0x75f5f911),
+ TOBN(0x0c07b14d, 0xceba4fc1),
+ TOBN(0x891c285b, 0xa13071c1),
+ TOBN(0xcac67ceb, 0x799ece3c),
+ TOBN(0x29b910a9, 0x41e07e27),
+ TOBN(0x66bdb409, 0xf2e43123),
+ TOBN(0x06f8b137, 0x7ac9ecbe),
+ TOBN(0x5981fafd, 0x38547090),
+ TOBN(0x19ab8b9f, 0x85e3415d),
+ TOBN(0xfc28c194, 0xc7e31b27),
+ TOBN(0x843be0aa, 0x6fbcbb42),
+ TOBN(0xf3b1ed43, 0xa6db836c),
+ TOBN(0x2a1330e4, 0x01a45c05),
+ TOBN(0x4f19f3c5, 0x95c1a377),
+ TOBN(0xa85f39d0, 0x44b5ee33),
+ TOBN(0x3da18e6d, 0x4ae52834),
+ TOBN(0x5a403b39, 0x7423dcb0),
+ TOBN(0xbb555e0a, 0xf2374aef),
+ TOBN(0x2ad599c4, 0x1e8ca111),
+ TOBN(0x1b3a2fb9, 0x014b3bf8),
+ TOBN(0x73092684, 0xf66d5007),
+ TOBN(0x079f1426, 0xc4340102),
+ TOBN(0x1827cf81, 0x8fddf4de),
+ TOBN(0xc83605f6, 0xf10ff927),
+ TOBN(0xd3871451, 0x23739fc6),
+ TOBN(0x6d163450, 0xcac1c2cc),
+ TOBN(0x6b521296, 0xa2ec1ac5),
+ TOBN(0x0606c4f9, 0x6e3cb4a5),
+ TOBN(0xe47d3f41, 0x778abff7),
+ TOBN(0x425a8d5e, 0xbe8e3a45),
+ TOBN(0x53ea9e97, 0xa6102160),
+ TOBN(0x477a106e, 0x39cbb688),
+ TOBN(0x532401d2, 0xf3386d32),
+ TOBN(0x8e564f64, 0xb1b9b421),
+ TOBN(0xca9b8388, 0x81dad33f),
+ TOBN(0xb1422b4e, 0x2093913e),
+ TOBN(0x533d2f92, 0x69bc8112),
+ TOBN(0x3fa017be, 0xebe7b2c7),
+ TOBN(0xb2767c4a, 0xcaf197c6),
+ TOBN(0xc925ff87, 0xaedbae9f),
+ TOBN(0x7daf0eb9, 0x36880a54),
+ TOBN(0x9284ddf5, 0x9c4d0e71),
+ TOBN(0x1581cf93, 0x316f8cf5),
+ TOBN(0x3eeca887, 0x3ac1f452),
+ TOBN(0xb417fce9, 0xfb6aeffe),
+ TOBN(0xa5918046, 0xeefb8dc3),
+ TOBN(0x73d318ac, 0x02209400),
+ TOBN(0xe800400f, 0x728693e5),
+ TOBN(0xe87d814b, 0x339927ed),
+ TOBN(0x93e94d3b, 0x57ea9910),
+ TOBN(0xff8a35b6, 0x2245fb69),
+ TOBN(0x043853d7, 0x7f200d34),
+ TOBN(0x470f1e68, 0x0f653ce1),
+ TOBN(0x81ac05bd, 0x59a06379),
+ TOBN(0xa14052c2, 0x03930c29),
+ TOBN(0x6b72fab5, 0x26bc2797),
+ TOBN(0x13670d16, 0x99f16771),
+ TOBN(0x00170052, 0x1e3e48d1),
+ TOBN(0x978fe401, 0xb7adf678),
+ TOBN(0x55ecfb92, 0xd41c5dd4),
+ TOBN(0x5ff8e247, 0xc7b27da5),
+ TOBN(0xe7518272, 0x013fb606),
+ TOBN(0x5768d7e5, 0x2f547a3c),
+ TOBN(0xbb24eaa3, 0x60017a5f),
+ TOBN(0x6b18e6e4, 0x9c64ce9b),
+ TOBN(0xc225c655, 0x103dde07),
+ TOBN(0xfc3672ae, 0x7592f7ea),
+ TOBN(0x9606ad77, 0xd06283a1),
+ TOBN(0x542fc650, 0xe4d59d99),
+ TOBN(0xabb57c49, 0x2a40e7c2),
+ TOBN(0xac948f13, 0xa8db9f55),
+ TOBN(0x6d4c9682, 0xb04465c3),
+ TOBN(0xe3d062fa, 0x6468bd15),
+ TOBN(0xa51729ac, 0x5f318d7e),
+ TOBN(0x1fc87df6, 0x9eb6fc95),
+ TOBN(0x63d146a8, 0x0591f652),
+ TOBN(0xa861b8f7, 0x589621aa),
+ TOBN(0x59f5f15a, 0xce31348c),
+ TOBN(0x8f663391, 0x440da6da),
+ TOBN(0xcfa778ac, 0xb591ffa3),
+ TOBN(0x027ca9c5, 0x4cdfebce),
+ TOBN(0xbe8e05a5, 0x444ea6b3),
+ TOBN(0x8aab4e69, 0xa78d8254),
+ TOBN(0x2437f04f, 0xb474d6b8),
+ TOBN(0x6597ffd4, 0x045b3855),
+ TOBN(0xbb0aea4e, 0xca47ecaa),
+ TOBN(0x568aae83, 0x85c7ebfc),
+ TOBN(0x0e966e64, 0xc73b2383),
+ TOBN(0x49eb3447, 0xd17d8762),
+ TOBN(0xde107821, 0x8da05dab),
+ TOBN(0x443d8baa, 0x016b7236),
+ TOBN(0x163b63a5, 0xea7610d6),
+ TOBN(0xe47e4185, 0xce1ca979),
+ TOBN(0xae648b65, 0x80baa132),
+ TOBN(0xebf53de2, 0x0e0d5b64),
+ TOBN(0x8d3bfcb4, 0xd3c8c1ca),
+ TOBN(0x0d914ef3, 0x5d04b309),
+ TOBN(0x55ef6415, 0x3de7d395),
+ TOBN(0xbde1666f, 0x26b850e8),
+ TOBN(0xdbe1ca6e, 0xd449ab19),
+ TOBN(0x8902b322, 0xe89a2672),
+ TOBN(0xb1674b7e, 0xdacb7a53),
+ TOBN(0x8e9faf6e, 0xf52523ff),
+ TOBN(0x6ba535da, 0x9a85788b),
+ TOBN(0xd21f03ae, 0xbd0626d4),
+ TOBN(0x099f8c47, 0xe873dc64),
+ TOBN(0xcda8564d, 0x018ec97e),
+ TOBN(0x3e8d7a5c, 0xde92c68c),
+ TOBN(0x78e035a1, 0x73323cc4),
+ TOBN(0x3ef26275, 0xf880ff7c),
+ TOBN(0xa4ee3dff, 0x273eedaa),
+ TOBN(0x58823507, 0xaf4e18f8),
+ TOBN(0x967ec9b5, 0x0672f328),
+ TOBN(0x9ded19d9, 0x559d3186),
+ TOBN(0x5e2ab3de, 0x6cdce39c),
+ TOBN(0xabad6e4d, 0x11c226df),
+ TOBN(0xf9783f43, 0x87723014),
+ TOBN(0x9a49a0cf, 0x1a885719),
+ TOBN(0xfc0c1a5a, 0x90da9dbf),
+ TOBN(0x8bbaec49, 0x571d92ac),
+ TOBN(0x569e85fe, 0x4692517f),
+ TOBN(0x8333b014, 0xa14ea4af),
+ TOBN(0x32f2a62f, 0x12e5c5ad),
+ TOBN(0x98c2ce3a, 0x06d89b85),
+ TOBN(0xb90741aa, 0x2ff77a08),
+ TOBN(0x2530defc, 0x01f795a2),
+ TOBN(0xd6e5ba0b, 0x84b3c199),
+ TOBN(0x7d8e8451, 0x12e4c936),
+ TOBN(0xae419f7d, 0xbd0be17b),
+ TOBN(0xa583fc8c, 0x22262bc9),
+ TOBN(0x6b842ac7, 0x91bfe2bd),
+ TOBN(0x33cef4e9, 0x440d6827),
+ TOBN(0x5f69f4de, 0xef81fb14),
+ TOBN(0xf16cf6f6, 0x234fbb92),
+ TOBN(0x76ae3fc3, 0xd9e7e158),
+ TOBN(0x4e89f6c2, 0xe9740b33),
+ TOBN(0x677bc85d, 0x4962d6a1),
+ TOBN(0x6c6d8a7f, 0x68d10d15),
+ TOBN(0x5f9a7224, 0x0257b1cd),
+ TOBN(0x7096b916, 0x4ad85961),
+ TOBN(0x5f8c47f7, 0xe657ab4a),
+ TOBN(0xde57d7d0, 0xf7461d7e),
+ TOBN(0x7eb6094d, 0x80ce5ee2),
+ TOBN(0x0b1e1dfd, 0x34190547),
+ TOBN(0x8a394f43, 0xf05dd150),
+ TOBN(0x0a9eb24d, 0x97df44e6),
+ TOBN(0x78ca06bf, 0x87675719),
+ TOBN(0x6f0b3462, 0x6ffeec22),
+ TOBN(0x9d91bcea, 0x36cdd8fb),
+ TOBN(0xac83363c, 0xa105be47),
+ TOBN(0x81ba76c1, 0x069710e3),
+ TOBN(0x3d1b24cb, 0x28c682c6),
+ TOBN(0x27f25228, 0x8612575b),
+ TOBN(0xb587c779, 0xe8e66e98),
+ TOBN(0x7b0c03e9, 0x405eb1fe),
+ TOBN(0xfdf0d030, 0x15b548e7),
+ TOBN(0xa8be76e0, 0x38b36af7),
+ TOBN(0x4cdab04a, 0x4f310c40),
+ TOBN(0x6287223e, 0xf47ecaec),
+ TOBN(0x678e6055, 0x8b399320),
+ TOBN(0x61fe3fa6, 0xc01e4646),
+ TOBN(0xc482866b, 0x03261a5e),
+ TOBN(0xdfcf45b8, 0x5c2f244a),
+ TOBN(0x8fab9a51, 0x2f684b43),
+ TOBN(0xf796c654, 0xc7220a66),
+ TOBN(0x1d90707e, 0xf5afa58f),
+ TOBN(0x2c421d97, 0x4fdbe0de),
+ TOBN(0xc4f4cda3, 0xaf2ebc2f),
+ TOBN(0xa0af843d, 0xcb4efe24),
+ TOBN(0x53b857c1, 0x9ccd10b1),
+ TOBN(0xddc9d1eb, 0x914d3e04),
+ TOBN(0x7bdec8bb, 0x62771deb),
+ TOBN(0x829277aa, 0x91c5aa81),
+ TOBN(0x7af18dd6, 0x832391ae),
+ TOBN(0x1740f316, 0xc71a84ca),
+ },
+ {
+ TOBN(0x8928e99a, 0xeeaf8c49),
+ TOBN(0xee7aa73d, 0x6e24d728),
+ TOBN(0x4c5007c2, 0xe72b156c),
+ TOBN(0x5fcf57c5, 0xed408a1d),
+ TOBN(0x9f719e39, 0xb6057604),
+ TOBN(0x7d343c01, 0xc2868bbf),
+ TOBN(0x2cca254b, 0x7e103e2d),
+ TOBN(0xe6eb38a9, 0xf131bea2),
+ TOBN(0xb33e624f, 0x8be762b4),
+ TOBN(0x2a9ee4d1, 0x058e3413),
+ TOBN(0x968e6369, 0x67d805fa),
+ TOBN(0x9848949b, 0x7db8bfd7),
+ TOBN(0x5308d7e5, 0xd23a8417),
+ TOBN(0x892f3b1d, 0xf3e29da5),
+ TOBN(0xc95c139e, 0x3dee471f),
+ TOBN(0x8631594d, 0xd757e089),
+ TOBN(0xe0c82a3c, 0xde918dcc),
+ TOBN(0x2e7b5994, 0x26fdcf4b),
+ TOBN(0x82c50249, 0x32cb1b2d),
+ TOBN(0xea613a9d, 0x7657ae07),
+ TOBN(0xc2eb5f6c, 0xf1fdc9f7),
+ TOBN(0xb6eae8b8, 0x879fe682),
+ TOBN(0x253dfee0, 0x591cbc7f),
+ TOBN(0x000da713, 0x3e1290e6),
+ TOBN(0x1083e2ea, 0x1f095615),
+ TOBN(0x0a28ad77, 0x14e68c33),
+ TOBN(0x6bfc0252, 0x3d8818be),
+ TOBN(0xb585113a, 0xf35850cd),
+ TOBN(0x7d935f0b, 0x30df8aa1),
+ TOBN(0xaddda07c, 0x4ab7e3ac),
+ TOBN(0x92c34299, 0x552f00cb),
+ TOBN(0xc33ed1de, 0x2909df6c),
+ TOBN(0x22c2195d, 0x80e87766),
+ TOBN(0x9e99e6d8, 0x9ddf4ac0),
+ TOBN(0x09642e4e, 0x65e74934),
+ TOBN(0x2610ffa2, 0xff1ff241),
+ TOBN(0x4d1d47d4, 0x751c8159),
+ TOBN(0x697b4985, 0xaf3a9363),
+ TOBN(0x0318ca46, 0x87477c33),
+ TOBN(0xa90cb565, 0x9441eff3),
+ TOBN(0x58bb3848, 0x36f024cb),
+ TOBN(0x85be1f77, 0x36016168),
+ TOBN(0x6c59587c, 0xdc7e07f1),
+ TOBN(0x191be071, 0xaf1d8f02),
+ TOBN(0xbf169fa5, 0xcca5e55c),
+ TOBN(0x3864ba3c, 0xf7d04eac),
+ TOBN(0x915e367f, 0x8d7d05db),
+ TOBN(0xb48a876d, 0xa6549e5d),
+ TOBN(0xef89c656, 0x580e40a2),
+ TOBN(0xf194ed8c, 0x728068bc),
+ TOBN(0x74528045, 0xa47990c9),
+ TOBN(0xf53fc7d7, 0x5e1a4649),
+ TOBN(0xbec5ae9b, 0x78593e7d),
+ TOBN(0x2cac4ee3, 0x41db65d7),
+ TOBN(0xa8c1eb24, 0x04a3d39b),
+ TOBN(0x53b7d634, 0x03f8f3ef),
+ TOBN(0x2dc40d48, 0x3e07113c),
+ TOBN(0x6e4a5d39, 0x7d8b63ae),
+ TOBN(0x5582a94b, 0x79684c2b),
+ TOBN(0x932b33d4, 0x622da26c),
+ TOBN(0xf534f651, 0x0dbbf08d),
+ TOBN(0x211d07c9, 0x64c23a52),
+ TOBN(0x0eeece0f, 0xee5bdc9b),
+ TOBN(0xdf178168, 0xf7015558),
+ TOBN(0xd4294635, 0x0a712229),
+ TOBN(0x93cbe448, 0x09273f8c),
+ TOBN(0x00b095ef, 0x8f13bc83),
+ TOBN(0xbb741972, 0x8798978c),
+ TOBN(0x9d7309a2, 0x56dbe6e7),
+ TOBN(0xe578ec56, 0x5a5d39ec),
+ TOBN(0x3961151b, 0x851f9a31),
+ TOBN(0x2da7715d, 0xe5709eb4),
+ TOBN(0x867f3017, 0x53dfabf0),
+ TOBN(0x728d2078, 0xb8e39259),
+ TOBN(0x5c75a0cd, 0x815d9958),
+ TOBN(0xf84867a6, 0x16603be1),
+ TOBN(0xc865b13d, 0x70e35b1c),
+ TOBN(0x02414468, 0x19b03e2c),
+ TOBN(0xe46041da, 0xac1f3121),
+ TOBN(0x7c9017ad, 0x6f028a7c),
+ TOBN(0xabc96de9, 0x0a482873),
+ TOBN(0x4265d6b1, 0xb77e54d4),
+ TOBN(0x68c38e79, 0xa57d88e7),
+ TOBN(0xd461d766, 0x9ce82de3),
+ TOBN(0x817a9ec5, 0x64a7e489),
+ TOBN(0xcc5675cd, 0xa0def5f2),
+ TOBN(0x9a00e785, 0x985d494e),
+ TOBN(0xc626833f, 0x1b03514a),
+ TOBN(0xabe7905a, 0x83cdd60e),
+ TOBN(0x50602fb5, 0xa1170184),
+ TOBN(0x689886cd, 0xb023642a),
+ TOBN(0xd568d090, 0xa6e1fb00),
+ TOBN(0x5b1922c7, 0x0259217f),
+ TOBN(0x93831cd9, 0xc43141e4),
+ TOBN(0xdfca3587, 0x0c95f86e),
+ TOBN(0xdec2057a, 0x568ae828),
+ TOBN(0xc44ea599, 0xf98a759a),
+ TOBN(0x55a0a7a2, 0xf7c23c1d),
+ TOBN(0xd5ffb6e6, 0x94c4f687),
+ TOBN(0x3563cce2, 0x12848478),
+ TOBN(0x812b3517, 0xe7b1fbe1),
+ TOBN(0x8a7dc979, 0x4f7338e0),
+ TOBN(0x211ecee9, 0x52d048db),
+ TOBN(0x2eea4056, 0xc86ea3b8),
+ TOBN(0xd8cb68a7, 0xba772b34),
+ TOBN(0xe16ed341, 0x5f4e2541),
+ TOBN(0x9b32f6a6, 0x0fec14db),
+ TOBN(0xeee376f7, 0x391698be),
+ TOBN(0xe9a7aa17, 0x83674c02),
+ TOBN(0x65832f97, 0x5843022a),
+ TOBN(0x29f3a8da, 0x5ba4990f),
+ TOBN(0x79a59c3a, 0xfb8e3216),
+ TOBN(0x9cdc4d2e, 0xbd19bb16),
+ TOBN(0xc6c7cfd0, 0xb3262d86),
+ TOBN(0xd4ce14d0, 0x969c0b47),
+ TOBN(0x1fa352b7, 0x13e56128),
+ TOBN(0x383d55b8, 0x973db6d3),
+ TOBN(0x71836850, 0xe8e5b7bf),
+ TOBN(0xc7714596, 0xe6bb571f),
+ TOBN(0x259df31f, 0x2d5b2dd2),
+ TOBN(0x568f8925, 0x913cc16d),
+ TOBN(0x18bc5b6d, 0xe1a26f5a),
+ TOBN(0xdfa413be, 0xf5f499ae),
+ TOBN(0xf8835dec, 0xc3f0ae84),
+ TOBN(0xb6e60bd8, 0x65a40ab0),
+ TOBN(0x65596439, 0x194b377e),
+ TOBN(0xbcd85625, 0x92084a69),
+ TOBN(0x5ce433b9, 0x4f23ede0),
+ TOBN(0xe8e8f04f, 0x6ad65143),
+ TOBN(0x11511827, 0xd6e14af6),
+ TOBN(0x3d390a10, 0x8295c0c7),
+ TOBN(0x71e29ee4, 0x621eba16),
+ TOBN(0xa588fc09, 0x63717b46),
+ TOBN(0x02be02fe, 0xe06ad4a2),
+ TOBN(0x931558c6, 0x04c22b22),
+ TOBN(0xbb4d4bd6, 0x12f3c849),
+ TOBN(0x54a4f496, 0x20efd662),
+ TOBN(0x92ba6d20, 0xc5952d14),
+ TOBN(0x2db8ea1e, 0xcc9784c2),
+ TOBN(0x81cc10ca, 0x4b353644),
+ TOBN(0x40b570ad, 0x4b4d7f6c),
+ TOBN(0x5c9f1d96, 0x84a1dcd2),
+ TOBN(0x01379f81, 0x3147e797),
+ TOBN(0xe5c6097b, 0x2bd499f5),
+ TOBN(0x40dcafa6, 0x328e5e20),
+ TOBN(0xf7b5244a, 0x54815550),
+ TOBN(0xb9a4f118, 0x47bfc978),
+ TOBN(0x0ea0e79f, 0xd25825b1),
+ TOBN(0xa50f96eb, 0x646c7ecf),
+ TOBN(0xeb811493, 0x446dea9d),
+ TOBN(0x2af04677, 0xdfabcf69),
+ TOBN(0xbe3a068f, 0xc713f6e8),
+ TOBN(0x860d523d, 0x42e06189),
+ TOBN(0xbf077941, 0x4e3aff13),
+ TOBN(0x0b616dca, 0xc1b20650),
+ TOBN(0xe66dd6d1, 0x2131300d),
+ TOBN(0xd4a0fd67, 0xff99abde),
+ TOBN(0xc9903550, 0xc7aac50d),
+ TOBN(0x022ecf8b, 0x7c46b2d7),
+ TOBN(0x3333b1e8, 0x3abf92af),
+ TOBN(0x11cc113c, 0x6c491c14),
+ TOBN(0x05976688, 0x80dd3f88),
+ TOBN(0xf5b4d9e7, 0x29d932ed),
+ TOBN(0xe982aad8, 0xa2c38b6d),
+ TOBN(0x6f925347, 0x8be0dcf0),
+ TOBN(0x700080ae, 0x65ca53f2),
+ TOBN(0xd8131156, 0x443ca77f),
+ TOBN(0xe92d6942, 0xec51f984),
+ TOBN(0xd2a08af8, 0x85dfe9ae),
+ TOBN(0xd825d9a5, 0x4d2a86ca),
+ TOBN(0x2c53988d, 0x39dff020),
+ TOBN(0xf38b135a, 0x430cdc40),
+ TOBN(0x0c918ae0, 0x62a7150b),
+ TOBN(0xf31fd8de, 0x0c340e9b),
+ TOBN(0xafa0e7ae, 0x4dbbf02e),
+ TOBN(0x5847fb2a, 0x5eba6239),
+ TOBN(0x6b1647dc, 0xdccbac8b),
+ TOBN(0xb642aa78, 0x06f485c8),
+ TOBN(0x873f3765, 0x7038ecdf),
+ TOBN(0x2ce5e865, 0xfa49d3fe),
+ TOBN(0xea223788, 0xc98c4400),
+ TOBN(0x8104a8cd, 0xf1fa5279),
+ TOBN(0xbcf7cc7a, 0x06becfd7),
+ TOBN(0x49424316, 0xc8f974ae),
+ TOBN(0xc0da65e7, 0x84d6365d),
+ TOBN(0xbcb7443f, 0x8f759fb8),
+ TOBN(0x35c712b1, 0x7ae81930),
+ TOBN(0x80428dff, 0x4c6e08ab),
+ TOBN(0xf19dafef, 0xa4faf843),
+ TOBN(0xced8538d, 0xffa9855f),
+ TOBN(0x20ac409c, 0xbe3ac7ce),
+ TOBN(0x358c1fb6, 0x882da71e),
+ TOBN(0xafa9c0e5, 0xfd349961),
+ TOBN(0x2b2cfa51, 0x8421c2fc),
+ TOBN(0x2a80db17, 0xf3a28d38),
+ TOBN(0xa8aba539, 0x5d138e7e),
+ TOBN(0x52012d1d, 0x6e96eb8d),
+ TOBN(0x65d8dea0, 0xcbaf9622),
+ TOBN(0x57735447, 0xb264f56c),
+ TOBN(0xbeebef3f, 0x1b6c8da2),
+ TOBN(0xfc346d98, 0xce785254),
+ TOBN(0xd50e8d72, 0xbb64a161),
+ TOBN(0xc03567c7, 0x49794add),
+ TOBN(0x15a76065, 0x752c7ef6),
+ TOBN(0x59f3a222, 0x961f23d6),
+ TOBN(0x378e4438, 0x73ecc0b0),
+ TOBN(0xc74be434, 0x5a82fde4),
+ TOBN(0xae509af2, 0xd8b9cf34),
+ TOBN(0x4a61ee46, 0x577f44a1),
+ TOBN(0xe09b748c, 0xb611deeb),
+ TOBN(0xc0481b2c, 0xf5f7b884),
+ TOBN(0x35626678, 0x61acfa6b),
+ TOBN(0x37f4c518, 0xbf8d21e6),
+ TOBN(0x22d96531, 0xb205a76d),
+ TOBN(0x37fb85e1, 0x954073c0),
+ TOBN(0xbceafe4f, 0x65b3a567),
+ TOBN(0xefecdef7, 0xbe42a582),
+ TOBN(0xd3fc6080, 0x65046be6),
+ TOBN(0xc9af13c8, 0x09e8dba9),
+ TOBN(0x1e6c9847, 0x641491ff),
+ TOBN(0x3b574925, 0xd30c31f7),
+ TOBN(0xb7eb72ba, 0xac2a2122),
+ TOBN(0x776a0dac, 0xef0859e7),
+ TOBN(0x06fec314, 0x21900942),
+ TOBN(0x2464bc10, 0xf8c22049),
+ TOBN(0x9bfbcce7, 0x875ebf69),
+ TOBN(0xd7a88e2a, 0x4336326b),
+ TOBN(0xda05261c, 0x5bc2acfa),
+ TOBN(0xc29f5bdc, 0xeba7efc8),
+ TOBN(0x471237ca, 0x25dbbf2e),
+ TOBN(0xa72773f2, 0x2975f127),
+ TOBN(0xdc744e8e, 0x04d0b326),
+ TOBN(0x38a7ed16, 0xa56edb73),
+ TOBN(0x64357e37, 0x2c007e70),
+ TOBN(0xa167d15b, 0x5080b400),
+ TOBN(0x07b41164, 0x23de4be1),
+ TOBN(0xb2d91e32, 0x74c89883),
+ TOBN(0x3c162821, 0x2882e7ed),
+ TOBN(0xad6b36ba, 0x7503e482),
+ TOBN(0x48434e8e, 0x0ea34331),
+ TOBN(0x79f4f24f, 0x2c7ae0b9),
+ TOBN(0xc46fbf81, 0x1939b44a),
+ TOBN(0x76fefae8, 0x56595eb1),
+ TOBN(0x417b66ab, 0xcd5f29c7),
+ TOBN(0x5f2332b2, 0xc5ceec20),
+ TOBN(0xd69661ff, 0xe1a1cae2),
+ TOBN(0x5ede7e52, 0x9b0286e6),
+ TOBN(0x9d062529, 0xe276b993),
+ TOBN(0x324794b0, 0x7e50122b),
+ TOBN(0xdd744f8b, 0x4af07ca5),
+ TOBN(0x30a12f08, 0xd63fc97b),
+ TOBN(0x39650f1a, 0x76626d9d),
+ TOBN(0x101b47f7, 0x1fa38477),
+ TOBN(0x3d815f19, 0xd4dc124f),
+ TOBN(0x1569ae95, 0xb26eb58a),
+ TOBN(0xc3cde188, 0x95fb1887),
+ TOBN(0x54e9f37b, 0xf9539a48),
+ TOBN(0xb0100e06, 0x7408c1a5),
+ TOBN(0x821d9811, 0xea580cbb),
+ TOBN(0x8af52d35, 0x86e50c56),
+ TOBN(0xdfbd9d47, 0xdbbf698b),
+ TOBN(0x2961a1ea, 0x03dc1c73),
+ TOBN(0x203d38f8, 0xe76a5df8),
+ TOBN(0x08a53a68, 0x6def707a),
+ TOBN(0x26eefb48, 0x1bee45d4),
+ TOBN(0xb3cee346, 0x3c688036),
+ TOBN(0x463c5315, 0xc42f2469),
+ TOBN(0x19d84d2e, 0x81378162),
+ TOBN(0x22d7c3c5, 0x1c4d349f),
+ TOBN(0x65965844, 0x163d59c5),
+ TOBN(0xcf198c56, 0xb8abceae),
+ TOBN(0x6fb1fb1b, 0x628559d5),
+ TOBN(0x8bbffd06, 0x07bf8fe3),
+ TOBN(0x46259c58, 0x3467734b),
+ TOBN(0xd8953cea, 0x35f7f0d3),
+ TOBN(0x1f0bece2, 0xd65b0ff1),
+ TOBN(0xf7d5b4b3, 0xf3c72914),
+ TOBN(0x29e8ea95, 0x3cb53389),
+ TOBN(0x4a365626, 0x836b6d46),
+ TOBN(0xe849f910, 0xea174fde),
+ TOBN(0x7ec62fbb, 0xf4737f21),
+ TOBN(0xd8dba5ab, 0x6209f5ac),
+ TOBN(0x24b5d7a9, 0xa5f9adbe),
+ TOBN(0x707d28f7, 0xa61dc768),
+ TOBN(0x7711460b, 0xcaa999ea),
+ TOBN(0xba7b174d, 0x1c92e4cc),
+ TOBN(0x3c4bab66, 0x18d4bf2d),
+ TOBN(0xb8f0c980, 0xeb8bd279),
+ TOBN(0x024bea9a, 0x324b4737),
+ TOBN(0xfba9e423, 0x32a83bca),
+ TOBN(0x6e635643, 0xa232dced),
+ TOBN(0x99619367, 0x2571c8ba),
+ TOBN(0xe8c9f357, 0x54b7032b),
+ TOBN(0xf936b3ba, 0x2442d54a),
+ TOBN(0x2263f0f0, 0x8290c65a),
+ TOBN(0x48989780, 0xee2c7fdb),
+ TOBN(0xadc5d55a, 0x13d4f95e),
+ TOBN(0x737cff85, 0xad9b8500),
+ TOBN(0x271c557b, 0x8a73f43d),
+ TOBN(0xbed617a4, 0xe18bc476),
+ TOBN(0x66245401, 0x7dfd8ab2),
+ TOBN(0xae7b89ae, 0x3a2870aa),
+ TOBN(0x1b555f53, 0x23a7e545),
+ TOBN(0x6791e247, 0xbe057e4c),
+ TOBN(0x860136ad, 0x324fa34d),
+ TOBN(0xea111447, 0x4cbeae28),
+ TOBN(0x023a4270, 0xbedd3299),
+ TOBN(0x3d5c3a7f, 0xc1c35c34),
+ TOBN(0xb0f6db67, 0x8d0412d2),
+ TOBN(0xd92625e2, 0xfcdc6b9a),
+ TOBN(0x92ae5ccc, 0x4e28a982),
+ TOBN(0xea251c36, 0x47a3ce7e),
+ TOBN(0x9d658932, 0x790691bf),
+ TOBN(0xed610589, 0x06b736ae),
+ TOBN(0x712c2f04, 0xc0d63b6e),
+ TOBN(0x5cf06fd5, 0xc63d488f),
+ TOBN(0x97363fac, 0xd9588e41),
+ TOBN(0x1f9bf762, 0x2b93257e),
+ TOBN(0xa9d1ffc4, 0x667acace),
+ TOBN(0x1cf4a1aa, 0x0a061ecf),
+ TOBN(0x40e48a49, 0xdc1818d0),
+ TOBN(0x0643ff39, 0xa3621ab0),
+ TOBN(0x5768640c, 0xe39ef639),
+ TOBN(0x1fc099ea, 0x04d86854),
+ TOBN(0x9130b9c3, 0xeccd28fd),
+ TOBN(0xd743cbd2, 0x7eec54ab),
+ TOBN(0x052b146f, 0xe5b475b6),
+ TOBN(0x058d9a82, 0x900a7d1f),
+ TOBN(0x65e02292, 0x91262b72),
+ TOBN(0x96f924f9, 0xbb0edf03),
+ TOBN(0x5cfa59c8, 0xfe206842),
+ TOBN(0xf6037004, 0x5eafa720),
+ TOBN(0x5f30699e, 0x18d7dd96),
+ TOBN(0x381e8782, 0xcbab2495),
+ TOBN(0x91669b46, 0xdd8be949),
+ TOBN(0xb40606f5, 0x26aae8ef),
+ TOBN(0x2812b839, 0xfc6751a4),
+ TOBN(0x16196214, 0xfba800ef),
+ TOBN(0x4398d5ca, 0x4c1a2875),
+ TOBN(0x720c00ee, 0x653d8349),
+ TOBN(0xc2699eb0, 0xd820007c),
+ TOBN(0x880ee660, 0xa39b5825),
+ TOBN(0x70694694, 0x471f6984),
+ TOBN(0xf7d16ea8, 0xe3dda99a),
+ TOBN(0x28d675b2, 0xc0519a23),
+ TOBN(0x9ebf94fe, 0x4f6952e3),
+ TOBN(0xf28bb767, 0xa2294a8a),
+ TOBN(0x85512b4d, 0xfe0af3f5),
+ TOBN(0x18958ba8, 0x99b16a0d),
+ TOBN(0x95c2430c, 0xba7548a7),
+ TOBN(0xb30d1b10, 0xa16be615),
+ TOBN(0xe3ebbb97, 0x85bfb74c),
+ TOBN(0xa3273cfe, 0x18549fdb),
+ TOBN(0xf6e200bf, 0x4fcdb792),
+ TOBN(0x54a76e18, 0x83aba56c),
+ TOBN(0x73ec66f6, 0x89ef6aa2),
+ TOBN(0x8d17add7, 0xd1b9a305),
+ TOBN(0xa959c5b9, 0xb7ae1b9d),
+ TOBN(0x88643522, 0x6bcc094a),
+ TOBN(0xcc5616c4, 0xd7d429b9),
+ TOBN(0xa6dada01, 0xe6a33f7c),
+ TOBN(0xc6217a07, 0x9d4e70ad),
+ TOBN(0xd619a818, 0x09c15b7c),
+ TOBN(0xea06b329, 0x0e80c854),
+ TOBN(0x174811ce, 0xa5f5e7b9),
+ TOBN(0x66dfc310, 0x787c65f4),
+ TOBN(0x4ea7bd69, 0x3316ab54),
+ TOBN(0xc12c4acb, 0x1dcc0f70),
+ TOBN(0xe4308d1a, 0x1e407dd9),
+ TOBN(0xe8a3587c, 0x91afa997),
+ TOBN(0xea296c12, 0xab77b7a5),
+ TOBN(0xb5ad49e4, 0x673c0d52),
+ TOBN(0x40f9b2b2, 0x7006085a),
+ TOBN(0xa88ff340, 0x87bf6ec2),
+ TOBN(0x978603b1, 0x4e3066a6),
+ TOBN(0xb3f99fc2, 0xb5e486e2),
+ TOBN(0x07b53f5e, 0xb2e63645),
+ TOBN(0xbe57e547, 0x84c84232),
+ TOBN(0xd779c216, 0x7214d5cf),
+ TOBN(0x617969cd, 0x029a3aca),
+ TOBN(0xd17668cd, 0x8a7017a0),
+ TOBN(0x77b4d19a, 0xbe9b7ee8),
+ TOBN(0x58fd0e93, 0x9c161776),
+ TOBN(0xa8c4f4ef, 0xd5968a72),
+ TOBN(0x296071cc, 0x67b3de77),
+ TOBN(0xae3c0b8e, 0x634f7905),
+ TOBN(0x67e440c2, 0x8a7100c9),
+ TOBN(0xbb8c3c1b, 0xeb4b9b42),
+ TOBN(0x6d71e8ea, 0xc51b3583),
+ TOBN(0x7591f5af, 0x9525e642),
+ TOBN(0xf73a2f7b, 0x13f509f3),
+ TOBN(0x618487aa, 0x5619ac9b),
+ TOBN(0x3a72e5f7, 0x9d61718a),
+ TOBN(0x00413bcc, 0x7592d28c),
+ TOBN(0x7d9b11d3, 0x963c35cf),
+ TOBN(0x77623bcf, 0xb90a46ed),
+ TOBN(0xdeef273b, 0xdcdd2a50),
+ TOBN(0x4a741f9b, 0x0601846e),
+ TOBN(0x33b89e51, 0x0ec6e929),
+ TOBN(0xcb02319f, 0x8b7f22cd),
+ TOBN(0xbbe1500d, 0x084bae24),
+ TOBN(0x2f0ae8d7, 0x343d2693),
+ TOBN(0xacffb5f2, 0x7cdef811),
+ TOBN(0xaa0c030a, 0x263fb94f),
+ TOBN(0x6eef0d61, 0xa0f442de),
+ TOBN(0xf92e1817, 0x27b139d3),
+ TOBN(0x1ae6deb7, 0x0ad8bc28),
+ TOBN(0xa89e38dc, 0xc0514130),
+ TOBN(0x81eeb865, 0xd2fdca23),
+ TOBN(0x5a15ee08, 0xcc8ef895),
+ TOBN(0x768fa10a, 0x01905614),
+ TOBN(0xeff5b8ef, 0x880ee19b),
+ TOBN(0xf0c0cabb, 0xcb1c8a0e),
+ TOBN(0x2e1ee9cd, 0xb8c838f9),
+ TOBN(0x0587d8b8, 0x8a4a14c0),
+ TOBN(0xf6f27896, 0x2ff698e5),
+ TOBN(0xed38ef1c, 0x89ee6256),
+ TOBN(0xf44ee1fe, 0x6b353b45),
+ TOBN(0x9115c0c7, 0x70e903b3),
+ TOBN(0xc78ec0a1, 0x818f31df),
+ TOBN(0x6c003324, 0xb7dccbc6),
+ TOBN(0xd96dd1f3, 0x163bbc25),
+ TOBN(0x33aa82dd, 0x5cedd805),
+ TOBN(0x123aae4f, 0x7f7eb2f1),
+ TOBN(0x1723fcf5, 0xa26262cd),
+ TOBN(0x1f7f4d5d, 0x0060ebd5),
+ TOBN(0xf19c5c01, 0xb2eaa3af),
+ TOBN(0x2ccb9b14, 0x9790accf),
+ TOBN(0x1f9c1cad, 0x52324aa6),
+ TOBN(0x63200526, 0x7247df54),
+ TOBN(0x5732fe42, 0xbac96f82),
+ TOBN(0x52fe771f, 0x01a1c384),
+ TOBN(0x546ca13d, 0xb1001684),
+ TOBN(0xb56b4eee, 0xa1709f75),
+ TOBN(0x266545a9, 0xd5db8672),
+ TOBN(0xed971c90, 0x1e8f3cfb),
+ TOBN(0x4e7d8691, 0xe3a07b29),
+ TOBN(0x7570d9ec, 0xe4b696b9),
+ TOBN(0xdc5fa067, 0x7bc7e9ae),
+ TOBN(0x68b44caf, 0xc82c4844),
+ TOBN(0x519d34b3, 0xbf44da80),
+ TOBN(0x283834f9, 0x5ab32e66),
+ TOBN(0x6e608797, 0x6278a000),
+ TOBN(0x1e62960e, 0x627312f6),
+ TOBN(0x9b87b27b, 0xe6901c55),
+ TOBN(0x80e78538, 0x24fdbc1f),
+ TOBN(0xbbbc0951, 0x2facc27d),
+ TOBN(0x06394239, 0xac143b5a),
+ TOBN(0x35bb4a40, 0x376c1944),
+ TOBN(0x7cb62694, 0x63da1511),
+ TOBN(0xafd29161, 0xb7148a3b),
+ TOBN(0xa6f9d9ed, 0x4e2ea2ee),
+ TOBN(0x15dc2ca2, 0x880dd212),
+ TOBN(0x903c3813, 0xa61139a9),
+ TOBN(0x2aa7b46d, 0x6c0f8785),
+ TOBN(0x36ce2871, 0x901c60ff),
+ TOBN(0xc683b028, 0xe10d9c12),
+ TOBN(0x7573baa2, 0x032f33d3),
+ TOBN(0x87a9b1f6, 0x67a31b58),
+ TOBN(0xfd3ed11a, 0xf4ffae12),
+ TOBN(0x83dcaa9a, 0x0cb2748e),
+ TOBN(0x8239f018, 0x5d6fdf16),
+ TOBN(0xba67b49c, 0x72753941),
+ TOBN(0x2beec455, 0xc321cb36),
+ TOBN(0x88015606, 0x3f8b84ce),
+ TOBN(0x76417083, 0x8d38c86f),
+ TOBN(0x054f1ca7, 0x598953dd),
+ TOBN(0xc939e110, 0x4e8e7429),
+ TOBN(0x9b1ac2b3, 0x5a914f2f),
+ TOBN(0x39e35ed3, 0xe74b8f9c),
+ TOBN(0xd0debdb2, 0x781b2fb0),
+ TOBN(0x1585638f, 0x2d997ba2),
+ TOBN(0x9c4b646e, 0x9e2fce99),
+ TOBN(0x68a21081, 0x1e80857f),
+ TOBN(0x06d54e44, 0x3643b52a),
+ TOBN(0xde8d6d63, 0x0d8eb843),
+ TOBN(0x70321563, 0x42146a0a),
+ TOBN(0x8ba826f2, 0x5eaa3622),
+ TOBN(0x227a58bd, 0x86138787),
+ TOBN(0x43b6c03c, 0x10281d37),
+ TOBN(0x6326afbb, 0xb54dde39),
+ TOBN(0x744e5e8a, 0xdb6f2d5f),
+ TOBN(0x48b2a99a, 0xcff158e1),
+ TOBN(0xa93c8fa0, 0xef87918f),
+ TOBN(0x2182f956, 0xde058c5c),
+ TOBN(0x216235d2, 0x936f9e7a),
+ TOBN(0xace0c0db, 0xd2e31e67),
+ TOBN(0xc96449bf, 0xf23ac3e7),
+ TOBN(0x7e9a2874, 0x170693bd),
+ TOBN(0xa28e14fd, 0xa45e6335),
+ TOBN(0x5757f6b3, 0x56427344),
+ TOBN(0x822e4556, 0xacf8edf9),
+ TOBN(0x2b7a6ee2, 0xe6a285cd),
+ TOBN(0x5866f211, 0xa9df3af0),
+ TOBN(0x40dde2dd, 0xf845b844),
+ TOBN(0x986c3726, 0x110e5e49),
+ TOBN(0x73680c2a, 0xf7172277),
+ TOBN(0x57b94f0f, 0x0cccb244),
+ TOBN(0xbdff7267, 0x2d438ca7),
+ TOBN(0xbad1ce11, 0xcf4663fd),
+ TOBN(0x9813ed9d, 0xd8f71cae),
+ TOBN(0xf43272a6, 0x961fdaa6),
+ TOBN(0xbeff0119, 0xbd6d1637),
+ TOBN(0xfebc4f91, 0x30361978),
+ TOBN(0x02b37a95, 0x2f41deff),
+ TOBN(0x0e44a59a, 0xe63b89b7),
+ TOBN(0x673257dc, 0x143ff951),
+ TOBN(0x19c02205, 0xd752baf4),
+ TOBN(0x46c23069, 0xc4b7d692),
+ TOBN(0x2e6392c3, 0xfd1502ac),
+ TOBN(0x6057b1a2, 0x1b220846),
+ TOBN(0xe51ff946, 0x0c1b5b63),
+ },
+ {
+ TOBN(0x6e85cb51, 0x566c5c43),
+ TOBN(0xcff9c919, 0x3597f046),
+ TOBN(0x9354e90c, 0x4994d94a),
+ TOBN(0xe0a39332, 0x2147927d),
+ TOBN(0x8427fac1, 0x0dc1eb2b),
+ TOBN(0x88cfd8c2, 0x2ff319fa),
+ TOBN(0xe2d4e684, 0x01965274),
+ TOBN(0xfa2e067d, 0x67aaa746),
+ TOBN(0xb6d92a7f, 0x3e5f9f11),
+ TOBN(0x9afe153a, 0xd6cb3b8e),
+ TOBN(0x4d1a6dd7, 0xddf800bd),
+ TOBN(0xf6c13cc0, 0xcaf17e19),
+ TOBN(0x15f6c58e, 0x325fc3ee),
+ TOBN(0x71095400, 0xa31dc3b2),
+ TOBN(0x168e7c07, 0xafa3d3e7),
+ TOBN(0x3f8417a1, 0x94c7ae2d),
+ TOBN(0xec234772, 0x813b230d),
+ TOBN(0x634d0f5f, 0x17344427),
+ TOBN(0x11548ab1, 0xd77fc56a),
+ TOBN(0x7fab1750, 0xce06af77),
+ TOBN(0xb62c10a7, 0x4f7c4f83),
+ TOBN(0xa7d2edc4, 0x220a67d9),
+ TOBN(0x1c404170, 0x921209a0),
+ TOBN(0x0b9815a0, 0xface59f0),
+ TOBN(0x2842589b, 0x319540c3),
+ TOBN(0x18490f59, 0xa283d6f8),
+ TOBN(0xa2731f84, 0xdaae9fcb),
+ TOBN(0x3db6d960, 0xc3683ba0),
+ TOBN(0xc85c63bb, 0x14611069),
+ TOBN(0xb19436af, 0x0788bf05),
+ TOBN(0x905459df, 0x347460d2),
+ TOBN(0x73f6e094, 0xe11a7db1),
+ TOBN(0xdc7f938e, 0xb6357f37),
+ TOBN(0xc5d00f79, 0x2bd8aa62),
+ TOBN(0xc878dcb9, 0x2ca979fc),
+ TOBN(0x37e83ed9, 0xeb023a99),
+ TOBN(0x6b23e273, 0x1560bf3d),
+ TOBN(0x1086e459, 0x1d0fae61),
+ TOBN(0x78248316, 0x9a9414bd),
+ TOBN(0x1b956bc0, 0xf0ea9ea1),
+ TOBN(0x7b85bb91, 0xc31b9c38),
+ TOBN(0x0c5aa90b, 0x48ef57b5),
+ TOBN(0xdedeb169, 0xaf3bab6f),
+ TOBN(0xe610ad73, 0x2d373685),
+ TOBN(0xf13870df, 0x02ba8e15),
+ TOBN(0x0337edb6, 0x8ca7f771),
+ TOBN(0xe4acf747, 0xb62c036c),
+ TOBN(0xd921d576, 0xb6b94e81),
+ TOBN(0xdbc86439, 0x2c422f7a),
+ TOBN(0xfb635362, 0xed348898),
+ TOBN(0x83084668, 0xc45bfcd1),
+ TOBN(0xc357c9e3, 0x2b315e11),
+ TOBN(0xb173b540, 0x5b2e5b8c),
+ TOBN(0x7e946931, 0xe102b9a4),
+ TOBN(0x17c890eb, 0x7b0fb199),
+ TOBN(0xec225a83, 0xd61b662b),
+ TOBN(0xf306a3c8, 0xee3c76cb),
+ TOBN(0x3cf11623, 0xd32a1f6e),
+ TOBN(0xe6d5ab64, 0x6863e956),
+ TOBN(0x3b8a4cbe, 0x5c005c26),
+ TOBN(0xdcd529a5, 0x9ce6bb27),
+ TOBN(0xc4afaa52, 0x04d4b16f),
+ TOBN(0xb0624a26, 0x7923798d),
+ TOBN(0x85e56df6, 0x6b307fab),
+ TOBN(0x0281893c, 0x2bf29698),
+ TOBN(0x91fc19a4, 0xd7ce7603),
+ TOBN(0x75a5dca3, 0xad9a558f),
+ TOBN(0x40ceb3fa, 0x4d50bf77),
+ TOBN(0x1baf6060, 0xbc9ba369),
+ TOBN(0x927e1037, 0x597888c2),
+ TOBN(0xd936bf19, 0x86a34c07),
+ TOBN(0xd4cf10c1, 0xc34ae980),
+ TOBN(0x3a3e5334, 0x859dd614),
+ TOBN(0x9c475b5b, 0x18d0c8ee),
+ TOBN(0x63080d1f, 0x07cd51d5),
+ TOBN(0xc9c0d0a6, 0xb88b4326),
+ TOBN(0x1ac98691, 0xc234296f),
+ TOBN(0x2a0a83a4, 0x94887fb6),
+ TOBN(0x56511427, 0x0cea9cf2),
+ TOBN(0x5230a6e8, 0xa24802f5),
+ TOBN(0xf7a2bf0f, 0x72e3d5c1),
+ TOBN(0x37717446, 0x4f21439e),
+ TOBN(0xfedcbf25, 0x9ce30334),
+ TOBN(0xe0030a78, 0x7ce202f9),
+ TOBN(0x6f2d9ebf, 0x1202e9ca),
+ TOBN(0xe79dde6c, 0x75e6e591),
+ TOBN(0xf52072af, 0xf1dac4f8),
+ TOBN(0x6c8d087e, 0xbb9b404d),
+ TOBN(0xad0fc73d, 0xbce913af),
+ TOBN(0x909e587b, 0x458a07cb),
+ TOBN(0x1300da84, 0xd4f00c8a),
+ TOBN(0x425cd048, 0xb54466ac),
+ TOBN(0xb59cb9be, 0x90e9d8bf),
+ TOBN(0x991616db, 0x3e431b0e),
+ TOBN(0xd3aa117a, 0x531aecff),
+ TOBN(0x91af92d3, 0x59f4dc3b),
+ TOBN(0x9b1ec292, 0xe93fda29),
+ TOBN(0x76bb6c17, 0xe97d91bc),
+ TOBN(0x7509d95f, 0xaface1e6),
+ TOBN(0x3653fe47, 0xbe855ae3),
+ TOBN(0x73180b28, 0x0f680e75),
+ TOBN(0x75eefd1b, 0xeeb6c26c),
+ TOBN(0xa4cdf29f, 0xb66d4236),
+ TOBN(0x2d70a997, 0x6b5821d8),
+ TOBN(0x7a3ee207, 0x20445c36),
+ TOBN(0x71d1ac82, 0x59877174),
+ TOBN(0x0fc539f7, 0x949f73e9),
+ TOBN(0xd05cf3d7, 0x982e3081),
+ TOBN(0x8758e20b, 0x7b1c7129),
+ TOBN(0xffadcc20, 0x569e61f2),
+ TOBN(0xb05d3a2f, 0x59544c2d),
+ TOBN(0xbe16f5c1, 0x9fff5e53),
+ TOBN(0x73cf65b8, 0xaad58135),
+ TOBN(0x622c2119, 0x037aa5be),
+ TOBN(0x79373b3f, 0x646fd6a0),
+ TOBN(0x0e029db5, 0x0d3978cf),
+ TOBN(0x8bdfc437, 0x94fba037),
+ TOBN(0xaefbd687, 0x620797a6),
+ TOBN(0x3fa5382b, 0xbd30d38e),
+ TOBN(0x7627cfbf, 0x585d7464),
+ TOBN(0xb2330fef, 0x4e4ca463),
+ TOBN(0xbcef7287, 0x3566cc63),
+ TOBN(0xd161d2ca, 0xcf780900),
+ TOBN(0x135dc539, 0x5b54827d),
+ TOBN(0x638f052e, 0x27bf1bc6),
+ TOBN(0x10a224f0, 0x07dfa06c),
+ TOBN(0xe973586d, 0x6d3321da),
+ TOBN(0x8b0c5738, 0x26152c8f),
+ TOBN(0x07ef4f2a, 0x34606074),
+ TOBN(0x80fe7fe8, 0xa0f7047a),
+ TOBN(0x3d1a8152, 0xe1a0e306),
+ TOBN(0x32cf43d8, 0x88da5222),
+ TOBN(0xbf89a95f, 0x5f02ffe6),
+ TOBN(0x3d9eb9a4, 0x806ad3ea),
+ TOBN(0x012c17bb, 0x79c8e55e),
+ TOBN(0xfdcd1a74, 0x99c81dac),
+ TOBN(0x7043178b, 0xb9556098),
+ TOBN(0x4090a1df, 0x801c3886),
+ TOBN(0x759800ff, 0x9b67b912),
+ TOBN(0x3e5c0304, 0x232620c8),
+ TOBN(0x4b9d3c4b, 0x70dceeca),
+ TOBN(0xbb2d3c15, 0x181f648e),
+ TOBN(0xf981d837, 0x6e33345c),
+ TOBN(0xb626289b, 0x0cf2297a),
+ TOBN(0x766ac659, 0x8baebdcf),
+ TOBN(0x1a28ae09, 0x75df01e5),
+ TOBN(0xb71283da, 0x375876d8),
+ TOBN(0x4865a96d, 0x607b9800),
+ TOBN(0x25dd1bcd, 0x237936b2),
+ TOBN(0x332f4f4b, 0x60417494),
+ TOBN(0xd0923d68, 0x370a2147),
+ TOBN(0x497f5dfb, 0xdc842203),
+ TOBN(0x9dc74cbd, 0x32be5e0f),
+ TOBN(0x7475bcb7, 0x17a01375),
+ TOBN(0x438477c9, 0x50d872b1),
+ TOBN(0xcec67879, 0xffe1d63d),
+ TOBN(0x9b006014, 0xd8578c70),
+ TOBN(0xc9ad99a8, 0x78bb6b8b),
+ TOBN(0x6799008e, 0x11fb3806),
+ TOBN(0xcfe81435, 0xcd44cab3),
+ TOBN(0xa2ee1582, 0x2f4fb344),
+ TOBN(0xb8823450, 0x483fa6eb),
+ TOBN(0x622d323d, 0x652c7749),
+ TOBN(0xd8474a98, 0xbeb0a15b),
+ TOBN(0xe43c154d, 0x5d1c00d0),
+ TOBN(0x7fd581d9, 0x0e3e7aac),
+ TOBN(0x2b44c619, 0x2525ddf8),
+ TOBN(0x67a033eb, 0xb8ae9739),
+ TOBN(0x113ffec1, 0x9ef2d2e4),
+ TOBN(0x1bf6767e, 0xd5a0ea7f),
+ TOBN(0x57fff75e, 0x03714c0a),
+ TOBN(0xa23c422e, 0x0a23e9ee),
+ TOBN(0xdd5f6b2d, 0x540f83af),
+ TOBN(0xc2c2c27e, 0x55ea46a7),
+ TOBN(0xeb6b4246, 0x672a1208),
+ TOBN(0xd13599f7, 0xae634f7a),
+ TOBN(0xcf914b5c, 0xd7b32c6e),
+ TOBN(0x61a5a640, 0xeaf61814),
+ TOBN(0x8dc3df8b, 0x208a1bbb),
+ TOBN(0xef627fd6, 0xb6d79aa5),
+ TOBN(0x44232ffc, 0xc4c86bc8),
+ TOBN(0xe6f9231b, 0x061539fe),
+ TOBN(0x1d04f25a, 0x958b9533),
+ TOBN(0x180cf934, 0x49e8c885),
+ TOBN(0x89689595, 0x9884aaf7),
+ TOBN(0xb1959be3, 0x07b348a6),
+ TOBN(0x96250e57, 0x3c147c87),
+ TOBN(0xae0efb3a, 0xdd0c61f8),
+ TOBN(0xed00745e, 0xca8c325e),
+ TOBN(0x3c911696, 0xecff3f70),
+ TOBN(0x73acbc65, 0x319ad41d),
+ TOBN(0x7b01a020, 0xf0b1c7ef),
+ TOBN(0xea32b293, 0x63a1483f),
+ TOBN(0x89eabe71, 0x7a248f96),
+ TOBN(0x9c6231d3, 0x343157e5),
+ TOBN(0x93a375e5, 0xdf3c546d),
+ TOBN(0xe76e9343, 0x6a2afe69),
+ TOBN(0xc4f89100, 0xe166c88e),
+ TOBN(0x248efd0d, 0x4f872093),
+ TOBN(0xae0eb3ea, 0x8fe0ea61),
+ TOBN(0xaf89790d, 0x9d79046e),
+ TOBN(0x4d650f2d, 0x6cee0976),
+ TOBN(0xa3935d9a, 0x43071eca),
+ TOBN(0x66fcd2c9, 0x283b0bfe),
+ TOBN(0x0e665eb5, 0x696605f1),
+ TOBN(0xe77e5d07, 0xa54cd38d),
+ TOBN(0x90ee050a, 0x43d950cf),
+ TOBN(0x86ddebda, 0xd32e69b5),
+ TOBN(0x6ad94a3d, 0xfddf7415),
+ TOBN(0xf7fa1309, 0x3f6e8d5a),
+ TOBN(0xc4831d1d, 0xe9957f75),
+ TOBN(0x7de28501, 0xd5817447),
+ TOBN(0x6f1d7078, 0x9e2aeb6b),
+ TOBN(0xba2b9ff4, 0xf67a53c2),
+ TOBN(0x36963767, 0xdf9defc3),
+ TOBN(0x479deed3, 0x0d38022c),
+ TOBN(0xd2edb89b, 0x3a8631e8),
+ TOBN(0x8de855de, 0x7a213746),
+ TOBN(0xb2056cb7, 0xb00c5f11),
+ TOBN(0xdeaefbd0, 0x2c9b85e4),
+ TOBN(0x03f39a8d, 0xd150892d),
+ TOBN(0x37b84686, 0x218b7985),
+ TOBN(0x36296dd8, 0xb7375f1a),
+ TOBN(0x472cd4b1, 0xb78e898e),
+ TOBN(0x15dff651, 0xe9f05de9),
+ TOBN(0xd4045069, 0x2ce98ba9),
+ TOBN(0x8466a7ae, 0x9b38024c),
+ TOBN(0xb910e700, 0xe5a6b5ef),
+ TOBN(0xae1c56ea, 0xb3aa8f0d),
+ TOBN(0xbab2a507, 0x7eee74a6),
+ TOBN(0x0dca11e2, 0x4b4c4620),
+ TOBN(0xfd896e2e, 0x4c47d1f4),
+ TOBN(0xeb45ae53, 0x308fbd93),
+ TOBN(0x46cd5a2e, 0x02c36fda),
+ TOBN(0x6a3d4e90, 0xbaa48385),
+ TOBN(0xdd55e62e, 0x9dbe9960),
+ TOBN(0xa1406aa0, 0x2a81ede7),
+ TOBN(0x6860dd14, 0xf9274ea7),
+ TOBN(0xcfdcb0c2, 0x80414f86),
+ TOBN(0xff410b10, 0x22f94327),
+ TOBN(0x5a33cc38, 0x49ad467b),
+ TOBN(0xefb48b6c, 0x0a7335f1),
+ TOBN(0x14fb54a4, 0xb153a360),
+ TOBN(0x604aa9d2, 0xb52469cc),
+ TOBN(0x5e9dc486, 0x754e48e9),
+ TOBN(0x693cb455, 0x37471e8e),
+ TOBN(0xfb2fd7cd, 0x8d3b37b6),
+ TOBN(0x63345e16, 0xcf09ff07),
+ TOBN(0x9910ba6b, 0x23a5d896),
+ TOBN(0x1fe19e35, 0x7fe4364e),
+ TOBN(0x6e1da8c3, 0x9a33c677),
+ TOBN(0x15b4488b, 0x29fd9fd0),
+ TOBN(0x1f439254, 0x1a1f22bf),
+ TOBN(0x920a8a70, 0xab8163e8),
+ TOBN(0x3fd1b249, 0x07e5658e),
+ TOBN(0xf2c4f79c, 0xb6ec839b),
+ TOBN(0x1abbc3d0, 0x4aa38d1b),
+ TOBN(0x3b0db35c, 0xb5d9510e),
+ TOBN(0x1754ac78, 0x3e60dec0),
+ TOBN(0x53272fd7, 0xea099b33),
+ TOBN(0x5fb0494f, 0x07a8e107),
+ TOBN(0x4a89e137, 0x6a8191fa),
+ TOBN(0xa113b7f6, 0x3c4ad544),
+ TOBN(0x88a2e909, 0x6cb9897b),
+ TOBN(0x17d55de3, 0xb44a3f84),
+ TOBN(0xacb2f344, 0x17c6c690),
+ TOBN(0x32088168, 0x10232390),
+ TOBN(0xf2e8a61f, 0x6c733bf7),
+ TOBN(0xa774aab6, 0x9c2d7652),
+ TOBN(0xfb5307e3, 0xed95c5bc),
+ TOBN(0xa05c73c2, 0x4981f110),
+ TOBN(0x1baae31c, 0xa39458c9),
+ TOBN(0x1def185b, 0xcbea62e7),
+ TOBN(0xe8ac9eae, 0xeaf63059),
+ TOBN(0x098a8cfd, 0x9921851c),
+ TOBN(0xd959c3f1, 0x3abe2f5b),
+ TOBN(0xa4f19525, 0x20e40ae5),
+ TOBN(0x320789e3, 0x07a24aa1),
+ TOBN(0x259e6927, 0x7392b2bc),
+ TOBN(0x58f6c667, 0x1918668b),
+ TOBN(0xce1db2bb, 0xc55d2d8b),
+ TOBN(0x41d58bb7, 0xf4f6ca56),
+ TOBN(0x7650b680, 0x8f877614),
+ TOBN(0x905e16ba, 0xf4c349ed),
+ TOBN(0xed415140, 0xf661acac),
+ TOBN(0x3b8784f0, 0xcb2270af),
+ TOBN(0x3bc280ac, 0x8a402cba),
+ TOBN(0xd53f7146, 0x0937921a),
+ TOBN(0xc03c8ee5, 0xe5681e83),
+ TOBN(0x62126105, 0xf6ac9e4a),
+ TOBN(0x9503a53f, 0x936b1a38),
+ TOBN(0x3d45e2d4, 0x782fecbd),
+ TOBN(0x69a5c439, 0x76e8ae98),
+ TOBN(0xb53b2eeb, 0xbfb4b00e),
+ TOBN(0xf1674712, 0x72386c89),
+ TOBN(0x30ca34a2, 0x4268bce4),
+ TOBN(0x7f1ed86c, 0x78341730),
+ TOBN(0x8ef5beb8, 0xb525e248),
+ TOBN(0xbbc489fd, 0xb74fbf38),
+ TOBN(0x38a92a0e, 0x91a0b382),
+ TOBN(0x7a77ba3f, 0x22433ccf),
+ TOBN(0xde8362d6, 0xa29f05a9),
+ TOBN(0x7f6a30ea, 0x61189afc),
+ TOBN(0x693b5505, 0x59ef114f),
+ TOBN(0x50266bc0, 0xcd1797a1),
+ TOBN(0xea17b47e, 0xf4b7af2d),
+ TOBN(0xd6c4025c, 0x3df9483e),
+ TOBN(0x8cbb9d9f, 0xa37b18c9),
+ TOBN(0x91cbfd9c, 0x4d8424cf),
+ TOBN(0xdb7048f1, 0xab1c3506),
+ TOBN(0x9eaf641f, 0x028206a3),
+ TOBN(0xf986f3f9, 0x25bdf6ce),
+ TOBN(0x262143b5, 0x224c08dc),
+ TOBN(0x2bbb09b4, 0x81b50c91),
+ TOBN(0xc16ed709, 0xaca8c84f),
+ TOBN(0xa6210d9d, 0xb2850ca8),
+ TOBN(0x6d8df67a, 0x09cb54d6),
+ TOBN(0x91eef6e0, 0x500919a4),
+ TOBN(0x90f61381, 0x0f132857),
+ TOBN(0x9acede47, 0xf8d5028b),
+ TOBN(0x844d1b71, 0x90b771c3),
+ TOBN(0x563b71e4, 0xba6426be),
+ TOBN(0x2efa2e83, 0xbdb802ff),
+ TOBN(0x3410cbab, 0xab5b4a41),
+ TOBN(0x555b2d26, 0x30da84dd),
+ TOBN(0xd0711ae9, 0xee1cc29a),
+ TOBN(0xcf3e8c60, 0x2f547792),
+ TOBN(0x03d7d5de, 0xdc678b35),
+ TOBN(0x071a2fa8, 0xced806b8),
+ TOBN(0x222e6134, 0x697f1478),
+ TOBN(0xdc16fd5d, 0xabfcdbbf),
+ TOBN(0x44912ebf, 0x121b53b8),
+ TOBN(0xac943674, 0x2496c27c),
+ TOBN(0x8ea3176c, 0x1ffc26b0),
+ TOBN(0xb6e224ac, 0x13debf2c),
+ TOBN(0x524cc235, 0xf372a832),
+ TOBN(0xd706e1d8, 0x9f6f1b18),
+ TOBN(0x2552f005, 0x44cce35b),
+ TOBN(0x8c8326c2, 0xa88e31fc),
+ TOBN(0xb5468b2c, 0xf9552047),
+ TOBN(0xce683e88, 0x3ff90f2b),
+ TOBN(0x77947bdf, 0x2f0a5423),
+ TOBN(0xd0a1b28b, 0xed56e328),
+ TOBN(0xaee35253, 0xc20134ac),
+ TOBN(0x7e98367d, 0x3567962f),
+ TOBN(0x379ed61f, 0x8188bffb),
+ TOBN(0x73bba348, 0xfaf130a1),
+ TOBN(0x6c1f75e1, 0x904ed734),
+ TOBN(0x18956642, 0x3b4a79fc),
+ TOBN(0xf20bc83d, 0x54ef4493),
+ TOBN(0x836d425d, 0x9111eca1),
+ TOBN(0xe5b5c318, 0x009a8dcf),
+ TOBN(0x3360b25d, 0x13221bc5),
+ TOBN(0x707baad2, 0x6b3eeaf7),
+ TOBN(0xd7279ed8, 0x743a95a1),
+ TOBN(0x7450a875, 0x969e809f),
+ TOBN(0x32b6bd53, 0xe5d0338f),
+ TOBN(0x1e77f7af, 0x2b883bbc),
+ TOBN(0x90da12cc, 0x1063ecd0),
+ TOBN(0xe2697b58, 0xc315be47),
+ TOBN(0x2771a5bd, 0xda85d534),
+ TOBN(0x53e78c1f, 0xff980eea),
+ TOBN(0xadf1cf84, 0x900385e7),
+ TOBN(0x7d3b14f6, 0xc9387b62),
+ TOBN(0x170e74b0, 0xcb8f2bd2),
+ TOBN(0x2d50b486, 0x827fa993),
+ TOBN(0xcdbe8c9a, 0xf6f32bab),
+ TOBN(0x55e906b0, 0xc3b93ab8),
+ TOBN(0x747f22fc, 0x8fe280d1),
+ TOBN(0xcd8e0de5, 0xb2e114ab),
+ TOBN(0x5ab7dbeb, 0xe10b68b0),
+ TOBN(0x9dc63a9c, 0xa480d4b2),
+ TOBN(0x78d4bc3b, 0x4be1495f),
+ TOBN(0x25eb3db8, 0x9359122d),
+ TOBN(0x3f8ac05b, 0x0809cbdc),
+ TOBN(0xbf4187bb, 0xd37c702f),
+ TOBN(0x84cea069, 0x1416a6a5),
+ TOBN(0x8f860c79, 0x43ef881c),
+ TOBN(0x41311f8a, 0x38038a5d),
+ TOBN(0xe78c2ec0, 0xfc612067),
+ TOBN(0x494d2e81, 0x5ad73581),
+ TOBN(0xb4cc9e00, 0x59604097),
+ TOBN(0xff558aec, 0xf3612cba),
+ TOBN(0x35beef7a, 0x9e36c39e),
+ TOBN(0x1845c7cf, 0xdbcf41b9),
+ TOBN(0x5703662a, 0xaea997c0),
+ TOBN(0x8b925afe, 0xe402f6d8),
+ TOBN(0xd0a1b1ae, 0x4dd72162),
+ TOBN(0x9f47b375, 0x03c41c4b),
+ TOBN(0xa023829b, 0x0391d042),
+ TOBN(0x5f5045c3, 0x503b8b0a),
+ TOBN(0x123c2688, 0x98c010e5),
+ TOBN(0x324ec0cc, 0x36ba06ee),
+ TOBN(0xface3115, 0x3dd2cc0c),
+ TOBN(0xb364f3be, 0xf333e91f),
+ TOBN(0xef8aff73, 0x28e832b0),
+ TOBN(0x1e9bad04, 0x2d05841b),
+ TOBN(0x42f0e3df, 0x356a21e2),
+ TOBN(0xa3270bcb, 0x4add627e),
+ TOBN(0xb09a8158, 0xd322e711),
+ TOBN(0x86e326a1, 0x0fee104a),
+ TOBN(0xad7788f8, 0x3703f65d),
+ TOBN(0x7e765430, 0x47bc4833),
+ TOBN(0x6cee582b, 0x2b9b893a),
+ TOBN(0x9cd2a167, 0xe8f55a7b),
+ TOBN(0xefbee3c6, 0xd9e4190d),
+ TOBN(0x33ee7185, 0xd40c2e9d),
+ TOBN(0x844cc9c5, 0xa380b548),
+ TOBN(0x323f8ecd, 0x66926e04),
+ TOBN(0x0001e38f, 0x8110c1ba),
+ TOBN(0x8dbcac12, 0xfc6a7f07),
+ TOBN(0xd65e1d58, 0x0cec0827),
+ TOBN(0xd2cd4141, 0xbe76ca2d),
+ TOBN(0x7895cf5c, 0xe892f33a),
+ TOBN(0x956d230d, 0x367139d2),
+ TOBN(0xa91abd3e, 0xd012c4c1),
+ TOBN(0x34fa4883, 0x87eb36bf),
+ TOBN(0xc5f07102, 0x914b8fb4),
+ TOBN(0x90f0e579, 0xadb9c95f),
+ TOBN(0xfe6ea8cb, 0x28888195),
+ TOBN(0x7b9b5065, 0xedfa9284),
+ TOBN(0x6c510bd2, 0x2b8c8d65),
+ TOBN(0xd7b8ebef, 0xcbe8aafd),
+ TOBN(0xedb3af98, 0x96b1da07),
+ TOBN(0x28ff779d, 0x6295d426),
+ TOBN(0x0c4f6ac7, 0x3fa3ad7b),
+ TOBN(0xec44d054, 0x8b8e2604),
+ TOBN(0x9b32a66d, 0x8b0050e1),
+ TOBN(0x1f943366, 0xf0476ce2),
+ TOBN(0x7554d953, 0xa602c7b4),
+ TOBN(0xbe35aca6, 0x524f2809),
+ TOBN(0xb6881229, 0xfd4edbea),
+ TOBN(0xe8cd0c8f, 0x508efb63),
+ TOBN(0x9eb5b5c8, 0x6abcefc7),
+ TOBN(0xf5621f5f, 0xb441ab4f),
+ TOBN(0x79e6c046, 0xb76a2b22),
+ TOBN(0x74a4792c, 0xe37a1f69),
+ TOBN(0xcbd252cb, 0x03542b60),
+ TOBN(0x785f65d5, 0xb3c20bd3),
+ TOBN(0x8dea6143, 0x4fabc60c),
+ TOBN(0x45e21446, 0xde673629),
+ TOBN(0x57f7aa1e, 0x703c2d21),
+ TOBN(0xa0e99b7f, 0x98c868c7),
+ TOBN(0x4e42f66d, 0x8b641676),
+ TOBN(0x602884dc, 0x91077896),
+ TOBN(0xa0d690cf, 0xc2c9885b),
+ TOBN(0xfeb4da33, 0x3b9a5187),
+ TOBN(0x5f789598, 0x153c87ee),
+ TOBN(0x2192dd47, 0x52b16dba),
+ TOBN(0xdeefc0e6, 0x3524c1b1),
+ TOBN(0x465ea76e, 0xe4383693),
+ TOBN(0x79401711, 0x361b8d98),
+ TOBN(0xa5f9ace9, 0xf21a15cb),
+ TOBN(0x73d26163, 0xefee9aeb),
+ TOBN(0xcca844b3, 0xe677016c),
+ TOBN(0x6c122b07, 0x57eaee06),
+ TOBN(0xb782dce7, 0x15f09690),
+ TOBN(0x508b9b12, 0x2dfc0fc9),
+ TOBN(0x9015ab4b, 0x65d89fc6),
+ TOBN(0x5e79dab7, 0xd6d5bb0f),
+ TOBN(0x64f021f0, 0x6c775aa2),
+ TOBN(0xdf09d8cc, 0x37c7eca1),
+ TOBN(0x9a761367, 0xef2fa506),
+ TOBN(0xed4ca476, 0x5b81eec6),
+ TOBN(0x262ede36, 0x10bbb8b5),
+ TOBN(0x0737ce83, 0x0641ada3),
+ TOBN(0x4c94288a, 0xe9831ccc),
+ TOBN(0x487fc1ce, 0x8065e635),
+ TOBN(0xb13d7ab3, 0xb8bb3659),
+ TOBN(0xdea5df3e, 0x855e4120),
+ TOBN(0xb9a18573, 0x85eb0244),
+ TOBN(0x1a1b8ea3, 0xa7cfe0a3),
+ TOBN(0x3b837119, 0x67b0867c),
+ TOBN(0x8d5e0d08, 0x9d364520),
+ TOBN(0x52dccc1e, 0xd930f0e3),
+ TOBN(0xefbbcec7, 0xbf20bbaf),
+ TOBN(0x99cffcab, 0x0263ad10),
+ TOBN(0xd8199e6d, 0xfcd18f8a),
+ TOBN(0x64e2773f, 0xe9f10617),
+ TOBN(0x0079e8e1, 0x08704848),
+ TOBN(0x1169989f, 0x8a342283),
+ TOBN(0x8097799c, 0xa83012e6),
+ TOBN(0xece966cb, 0x8a6a9001),
+ TOBN(0x93b3afef, 0x072ac7fc),
+ TOBN(0xe6893a2a, 0x2db3d5ba),
+ TOBN(0x263dc462, 0x89bf4fdc),
+ TOBN(0x8852dfc9, 0xe0396673),
+ TOBN(0x7ac70895, 0x3af362b6),
+ TOBN(0xbb9cce4d, 0x5c2f342b),
+ TOBN(0xbf80907a, 0xb52d7aae),
+ TOBN(0x97f3d3cd, 0x2161bcd0),
+ TOBN(0xb25b0834, 0x0962744d),
+ TOBN(0xc5b18ea5, 0x6c3a1dda),
+ TOBN(0xfe4ec7eb, 0x06c92317),
+ TOBN(0xb787b890, 0xad1c4afe),
+ TOBN(0xdccd9a92, 0x0ede801a),
+ TOBN(0x9ac6ddda, 0xdb58da1f),
+ TOBN(0x22bbc12f, 0xb8cae6ee),
+ TOBN(0xc6f8bced, 0x815c4a43),
+ TOBN(0x8105a92c, 0xf96480c7),
+ TOBN(0x0dc3dbf3, 0x7a859d51),
+ TOBN(0xe3ec7ce6, 0x3041196b),
+ TOBN(0xd9f64b25, 0x0d1067c9),
+ TOBN(0xf2321321, 0x3d1f8dd8),
+ TOBN(0x8b5c619c, 0x76497ee8),
+ TOBN(0x5d2b0ac6, 0xc717370e),
+ TOBN(0x98204cb6, 0x4fcf68e1),
+ TOBN(0x0bdec211, 0x62bc6792),
+ TOBN(0x6973ccef, 0xa63b1011),
+ TOBN(0xf9e3fa97, 0xe0de1ac5),
+ TOBN(0x5efb693e, 0x3d0e0c8b),
+ TOBN(0x037248e9, 0xd2d4fcb4),
+ },
+ { TOBN(0x80802dc9, 0x1ec34f9e), TOBN(0xd8772d35, 0x33810603),
+ TOBN(0x3f06d66c, 0x530cb4f3), TOBN(0x7be5ed0d, 0xc475c129),
+ TOBN(0xcb9e3c19, 0x31e82b10), TOBN(0xc63d2857, 0xc9ff6b4c),
+ TOBN(0xb92118c6, 0x92a1b45e), TOBN(0x0aec4414, 0x7285bbca),
+ TOBN(0xfc189ae7, 0x1e29a3ef), TOBN(0xcbe906f0, 0x4c93302e),
+ TOBN(0xd0107914, 0xceaae10e), TOBN(0xb7a23f34, 0xb68e19f8),
+ TOBN(0xe9d875c2, 0xefd2119d), TOBN(0x03198c6e, 0xfcadc9c8),
+ TOBN(0x65591bf6, 0x4da17113), TOBN(0x3cf0bbf8, 0x3d443038),
+ TOBN(0xae485bb7, 0x2b724759), TOBN(0x945353e1, 0xb2d4c63a),
+ TOBN(0x82159d07, 0xde7d6f2c), TOBN(0x389caef3, 0x4ec5b109),
+ TOBN(0x4a8ebb53, 0xdb65ef14), TOBN(0x2dc2cb7e, 0xdd99de43),
+ TOBN(0x816fa3ed, 0x83f2405f), TOBN(0x73429bb9, 0xc14208a3),
+ TOBN(0xb618d590, 0xb01e6e27), TOBN(0x047e2ccd, 0xe180b2dc),
+ TOBN(0xd1b299b5, 0x04aea4a9), TOBN(0x412c9e1e, 0x9fa403a4),
+ TOBN(0x88d28a36, 0x79407552), TOBN(0x49c50136, 0xf332b8e3),
+ TOBN(0x3a1b6fcc, 0xe668de19), TOBN(0x178851bc, 0x75122b97),
+ TOBN(0xb1e13752, 0xfb85fa4c), TOBN(0xd61257ce, 0x383c8ce9),
+ TOBN(0xd43da670, 0xd2f74dae), TOBN(0xa35aa23f, 0xbf846bbb),
+ TOBN(0x5e74235d, 0x4421fc83), TOBN(0xf6df8ee0, 0xc363473b),
+ TOBN(0x34d7f52a, 0x3c4aa158), TOBN(0x50d05aab, 0x9bc6d22e),
+ TOBN(0x8c56e735, 0xa64785f4), TOBN(0xbc56637b, 0x5f29cd07),
+ TOBN(0x53b2bb80, 0x3ee35067), TOBN(0x50235a0f, 0xdc919270),
+ TOBN(0x191ab6d8, 0xf2c4aa65), TOBN(0xc3475831, 0x8396023b),
+ TOBN(0x80400ba5, 0xf0f805ba), TOBN(0x8881065b, 0x5ec0f80f),
+ TOBN(0xc370e522, 0xcc1b5e83), TOBN(0xde2d4ad1, 0x860b8bfb),
+ TOBN(0xad364df0, 0x67b256df), TOBN(0x8f12502e, 0xe0138997),
+ TOBN(0x503fa0dc, 0x7783920a), TOBN(0xe80014ad, 0xc0bc866a),
+ TOBN(0x3f89b744, 0xd3064ba6), TOBN(0x03511dcd, 0xcba5dba5),
+ TOBN(0x197dd46d, 0x95a7b1a2), TOBN(0x9c4e7ad6, 0x3c6341fb),
+ TOBN(0x426eca29, 0x484c2ece), TOBN(0x9211e489, 0xde7f4f8a),
+ TOBN(0x14997f6e, 0xc78ef1f4), TOBN(0x2b2c0910, 0x06574586),
+ TOBN(0x17286a6e, 0x1c3eede8), TOBN(0x25f92e47, 0x0f60e018),
+ TOBN(0x805c5646, 0x31890a36), TOBN(0x703ef600, 0x57feea5b),
+ TOBN(0x389f747c, 0xaf3c3030), TOBN(0xe0e5daeb, 0x54dd3739),
+ TOBN(0xfe24a4c3, 0xc9c9f155), TOBN(0x7e4bf176, 0xb5393962),
+ TOBN(0x37183de2, 0xaf20bf29), TOBN(0x4a1bd7b5, 0xf95a8c3b),
+ TOBN(0xa83b9699, 0x46191d3d), TOBN(0x281fc8dd, 0x7b87f257),
+ TOBN(0xb18e2c13, 0x54107588), TOBN(0x6372def7, 0x9b2bafe8),
+ TOBN(0xdaf4bb48, 0x0d8972ca), TOBN(0x3f2dd4b7, 0x56167a3f),
+ TOBN(0x1eace32d, 0x84310cf4), TOBN(0xe3bcefaf, 0xe42700aa),
+ TOBN(0x5fe5691e, 0xd785e73d), TOBN(0xa5db5ab6, 0x2ea60467),
+ TOBN(0x02e23d41, 0xdfc6514a), TOBN(0x35e8048e, 0xe03c3665),
+ TOBN(0x3f8b118f, 0x1adaa0f8), TOBN(0x28ec3b45, 0x84ce1a5a),
+ TOBN(0xe8cacc6e, 0x2c6646b8), TOBN(0x1343d185, 0xdbd0e40f),
+ TOBN(0xe5d7f844, 0xcaaa358c), TOBN(0x1a1db7e4, 0x9924182a),
+ TOBN(0xd64cd42d, 0x9c875d9a), TOBN(0xb37b515f, 0x042eeec8),
+ TOBN(0x4d4dd409, 0x7b165fbe), TOBN(0xfc322ed9, 0xe206eff3),
+ TOBN(0x7dee4102, 0x59b7e17e), TOBN(0x55a481c0, 0x8236ca00),
+ TOBN(0x8c885312, 0xc23fc975), TOBN(0x15715806, 0x05d6297b),
+ TOBN(0xa078868e, 0xf78edd39), TOBN(0x956b31e0, 0x03c45e52),
+ TOBN(0x470275d5, 0xff7b33a6), TOBN(0xc8d5dc3a, 0x0c7e673f),
+ TOBN(0x419227b4, 0x7e2f2598), TOBN(0x8b37b634, 0x4c14a975),
+ TOBN(0xd0667ed6, 0x8b11888c), TOBN(0x5e0e8c3e, 0x803e25dc),
+ TOBN(0x34e5d0dc, 0xb987a24a), TOBN(0x9f40ac3b, 0xae920323),
+ TOBN(0x5463de95, 0x34e0f63a), TOBN(0xa128bf92, 0x6b6328f9),
+ TOBN(0x491ccd7c, 0xda64f1b7), TOBN(0x7ef1ec27, 0xc47bde35),
+ TOBN(0xa857240f, 0xa36a2737), TOBN(0x35dc1366, 0x63621bc1),
+ TOBN(0x7a3a6453, 0xd4fb6897), TOBN(0x80f1a439, 0xc929319d),
+ TOBN(0xfc18274b, 0xf8cb0ba0), TOBN(0xb0b53766, 0x8078c5eb),
+ TOBN(0xfb0d4924, 0x1e01d0ef), TOBN(0x50d7c67d, 0x372ab09c),
+ TOBN(0xb4e370af, 0x3aeac968), TOBN(0xe4f7fee9, 0xc4b63266),
+ TOBN(0xb4acd4c2, 0xe3ac5664), TOBN(0xf8910bd2, 0xceb38cbf),
+ TOBN(0x1c3ae50c, 0xc9c0726e), TOBN(0x15309569, 0xd97b40bf),
+ TOBN(0x70884b7f, 0xfd5a5a1b), TOBN(0x3890896a, 0xef8314cd),
+ TOBN(0x58e1515c, 0xa5618c93), TOBN(0xe665432b, 0x77d942d1),
+ TOBN(0xb32181bf, 0xb6f767a8), TOBN(0x753794e8, 0x3a604110),
+ TOBN(0x09afeb7c, 0xe8c0dbcc), TOBN(0x31e02613, 0x598673a3),
+ TOBN(0x5d98e557, 0x7d46db00), TOBN(0xfc21fb8c, 0x9d985b28),
+ TOBN(0xc9040116, 0xb0843e0b), TOBN(0x53b1b3a8, 0x69b04531),
+ TOBN(0xdd1649f0, 0x85d7d830), TOBN(0xbb3bcc87, 0xcb7427e8),
+ TOBN(0x77261100, 0xc93dce83), TOBN(0x7e79da61, 0xa1922a2a),
+ TOBN(0x587a2b02, 0xf3149ce8), TOBN(0x147e1384, 0xde92ec83),
+ TOBN(0x484c83d3, 0xaf077f30), TOBN(0xea78f844, 0x0658b53a),
+ TOBN(0x912076c2, 0x027aec53), TOBN(0xf34714e3, 0x93c8177d),
+ TOBN(0x37ef5d15, 0xc2376c84), TOBN(0x8315b659, 0x3d1aa783),
+ TOBN(0x3a75c484, 0xef852a90), TOBN(0x0ba0c58a, 0x16086bd4),
+ TOBN(0x29688d7a, 0x529a6d48), TOBN(0x9c7f250d, 0xc2f19203),
+ TOBN(0x123042fb, 0x682e2df9), TOBN(0x2b7587e7, 0xad8121bc),
+ TOBN(0x30fc0233, 0xe0182a65), TOBN(0xb82ecf87, 0xe3e1128a),
+ TOBN(0x71682861, 0x93fb098f), TOBN(0x043e21ae, 0x85e9e6a7),
+ TOBN(0xab5b49d6, 0x66c834ea), TOBN(0x3be43e18, 0x47414287),
+ TOBN(0xf40fb859, 0x219a2a47), TOBN(0x0e6559e9, 0xcc58df3c),
+ TOBN(0xfe1dfe8e, 0x0c6615b4), TOBN(0x14abc8fd, 0x56459d70),
+ TOBN(0x7be0fa8e, 0x05de0386), TOBN(0x8e63ef68, 0xe9035c7c),
+ TOBN(0x116401b4, 0x53b31e91), TOBN(0x0cba7ad4, 0x4436b4d8),
+ TOBN(0x9151f9a0, 0x107afd66), TOBN(0xafaca8d0, 0x1f0ee4c4),
+ TOBN(0x75fe5c1d, 0x9ee9761c), TOBN(0x3497a16b, 0xf0c0588f),
+ TOBN(0x3ee2bebd, 0x0304804c), TOBN(0xa8fb9a60, 0xc2c990b9),
+ TOBN(0xd14d32fe, 0x39251114), TOBN(0x36bf25bc, 0xcac73366),
+ TOBN(0xc9562c66, 0xdba7495c), TOBN(0x324d301b, 0x46ad348b),
+ TOBN(0x9f46620c, 0xd670407e), TOBN(0x0ea8d4f1, 0xe3733a01),
+ TOBN(0xd396d532, 0xb0c324e0), TOBN(0x5b211a0e, 0x03c317cd),
+ TOBN(0x090d7d20, 0x5ffe7b37), TOBN(0x3b7f3efb, 0x1747d2da),
+ TOBN(0xa2cb525f, 0xb54fc519), TOBN(0x6e220932, 0xf66a971e),
+ TOBN(0xddc160df, 0xb486d440), TOBN(0x7fcfec46, 0x3fe13465),
+ TOBN(0x83da7e4e, 0x76e4c151), TOBN(0xd6fa48a1, 0xd8d302b5),
+ TOBN(0xc6304f26, 0x5872cd88), TOBN(0x806c1d3c, 0x278b90a1),
+ TOBN(0x3553e725, 0xcaf0bc1c), TOBN(0xff59e603, 0xbb9d8d5c),
+ TOBN(0xa4550f32, 0x7a0b85dd), TOBN(0xdec5720a, 0x93ecc217),
+ TOBN(0x0b88b741, 0x69d62213), TOBN(0x7212f245, 0x5b365955),
+ TOBN(0x20764111, 0xb5cae787), TOBN(0x13cb7f58, 0x1dfd3124),
+ TOBN(0x2dca77da, 0x1175aefb), TOBN(0xeb75466b, 0xffaae775),
+ TOBN(0x74d76f3b, 0xdb6cff32), TOBN(0x7440f37a, 0x61fcda9a),
+ TOBN(0x1bb3ac92, 0xb525028b), TOBN(0x20fbf8f7, 0xa1975f29),
+ TOBN(0x982692e1, 0xdf83097f), TOBN(0x28738f6c, 0x554b0800),
+ TOBN(0xdc703717, 0xa2ce2f2f), TOBN(0x7913b93c, 0x40814194),
+ TOBN(0x04924593, 0x1fe89636), TOBN(0x7b98443f, 0xf78834a6),
+ TOBN(0x11c6ab01, 0x5114a5a1), TOBN(0x60deb383, 0xffba5f4c),
+ TOBN(0x4caa54c6, 0x01a982e6), TOBN(0x1dd35e11, 0x3491cd26),
+ TOBN(0x973c315f, 0x7cbd6b05), TOBN(0xcab00775, 0x52494724),
+ TOBN(0x04659b1f, 0x6565e15a), TOBN(0xbf30f529, 0x8c8fb026),
+ TOBN(0xfc21641b, 0xa8a0de37), TOBN(0xe9c7a366, 0xfa5e5114),
+ TOBN(0xdb849ca5, 0x52f03ad8), TOBN(0xc7e8dbe9, 0x024e35c0),
+ TOBN(0xa1a2bbac, 0xcfc3c789), TOBN(0xbf733e7d, 0x9c26f262),
+ TOBN(0x882ffbf5, 0xb8444823), TOBN(0xb7224e88, 0x6bf8483b),
+ TOBN(0x53023b8b, 0x65bef640), TOBN(0xaabfec91, 0xd4d5f8cd),
+ TOBN(0xa40e1510, 0x079ea1bd), TOBN(0x1ad9addc, 0xd05d5d26),
+ TOBN(0xdb3f2eab, 0x13e68d4f), TOBN(0x1cff1ae2, 0x640f803f),
+ TOBN(0xe0e7b749, 0xd4cee117), TOBN(0x8e9f275b, 0x4036d909),
+ TOBN(0xce34e31d, 0x8f4d4c38), TOBN(0x22b37f69, 0xd75130fc),
+ TOBN(0x83e0f1fd, 0xb4014604), TOBN(0xa8ce9919, 0x89415078),
+ TOBN(0x82375b75, 0x41792efe), TOBN(0x4f59bf5c, 0x97d4515b),
+ TOBN(0xac4f324f, 0x923a277d), TOBN(0xd9bc9b7d, 0x650f3406),
+ TOBN(0xc6fa87d1, 0x8a39bc51), TOBN(0x82588530, 0x5ccc108f),
+ TOBN(0x5ced3c9f, 0x82e4c634), TOBN(0x8efb8314, 0x3a4464f8),
+ TOBN(0xe706381b, 0x7a1dca25), TOBN(0x6cd15a3c, 0x5a2a412b),
+ TOBN(0x9347a8fd, 0xbfcd8fb5), TOBN(0x31db2eef, 0x6e54cd22),
+ TOBN(0xc4aeb11e, 0xf8d8932f), TOBN(0x11e7c1ed, 0x344411af),
+ TOBN(0x2653050c, 0xdc9a151e), TOBN(0x9edbfc08, 0x3bb0a859),
+ TOBN(0x926c81c7, 0xfd5691e7), TOBN(0x9c1b2342, 0x6f39019a),
+ TOBN(0x64a81c8b, 0x7f8474b9), TOBN(0x90657c07, 0x01761819),
+ TOBN(0x390b3331, 0x55e0375a), TOBN(0xc676c626, 0xb6ebc47d),
+ TOBN(0x51623247, 0xb7d6dee8), TOBN(0x0948d927, 0x79659313),
+ TOBN(0x99700161, 0xe9ab35ed), TOBN(0x06cc32b4, 0x8ddde408),
+ TOBN(0x6f2fd664, 0x061ef338), TOBN(0x1606fa02, 0xc202e9ed),
+ TOBN(0x55388bc1, 0x929ba99b), TOBN(0xc4428c5e, 0x1e81df69),
+ TOBN(0xce2028ae, 0xf91b0b2a), TOBN(0xce870a23, 0xf03dfd3f),
+ TOBN(0x66ec2c87, 0x0affe8ed), TOBN(0xb205fb46, 0x284d0c00),
+ TOBN(0xbf5dffe7, 0x44cefa48), TOBN(0xb6fc37a8, 0xa19876d7),
+ TOBN(0xbecfa84c, 0x08b72863), TOBN(0xd7205ff5, 0x2576374f),
+ TOBN(0x80330d32, 0x8887de41), TOBN(0x5de0df0c, 0x869ea534),
+ TOBN(0x13f42753, 0x3c56ea17), TOBN(0xeb1f6069, 0x452b1a78),
+ TOBN(0x50474396, 0xe30ea15c), TOBN(0x575816a1, 0xc1494125),
+ TOBN(0xbe1ce55b, 0xfe6bb38f), TOBN(0xb901a948, 0x96ae30f7),
+ TOBN(0xe5af0f08, 0xd8fc3548), TOBN(0x5010b5d0, 0xd73bfd08),
+ TOBN(0x993d2880, 0x53fe655a), TOBN(0x99f2630b, 0x1c1309fd),
+ TOBN(0xd8677baf, 0xb4e3b76f), TOBN(0x14e51ddc, 0xb840784b),
+ TOBN(0x326c750c, 0xbf0092ce), TOBN(0xc83d306b, 0xf528320f),
+ TOBN(0xc4456715, 0x77d4715c), TOBN(0xd30019f9, 0x6b703235),
+ TOBN(0x207ccb2e, 0xd669e986), TOBN(0x57c824af, 0xf6dbfc28),
+ TOBN(0xf0eb532f, 0xd8f92a23), TOBN(0x4a557fd4, 0x9bb98fd2),
+ TOBN(0xa57acea7, 0xc1e6199a), TOBN(0x0c663820, 0x8b94b1ed),
+ TOBN(0x9b42be8f, 0xf83a9266), TOBN(0xc7741c97, 0x0101bd45),
+ TOBN(0x95770c11, 0x07bd9ceb), TOBN(0x1f50250a, 0x8b2e0744),
+ TOBN(0xf762eec8, 0x1477b654), TOBN(0xc65b900e, 0x15efe59a),
+ TOBN(0x88c96148, 0x9546a897), TOBN(0x7e8025b3, 0xc30b4d7c),
+ TOBN(0xae4065ef, 0x12045cf9), TOBN(0x6fcb2caf, 0x9ccce8bd),
+ TOBN(0x1fa0ba4e, 0xf2cf6525), TOBN(0xf683125d, 0xcb72c312),
+ TOBN(0xa01da4ea, 0xe312410e), TOBN(0x67e28677, 0x6cd8e830),
+ TOBN(0xabd95752, 0x98fb3f07), TOBN(0x05f11e11, 0xeef649a5),
+ TOBN(0xba47faef, 0x9d3472c2), TOBN(0x3adff697, 0xc77d1345),
+ TOBN(0x4761fa04, 0xdd15afee), TOBN(0x64f1f61a, 0xb9e69462),
+ TOBN(0xfa691fab, 0x9bfb9093), TOBN(0x3df8ae8f, 0xa1133dfe),
+ TOBN(0xcd5f8967, 0x58cc710d), TOBN(0xfbb88d50, 0x16c7fe79),
+ TOBN(0x8e011b4c, 0xe88c50d1), TOBN(0x7532e807, 0xa8771c4f),
+ TOBN(0x64c78a48, 0xe2278ee4), TOBN(0x0b283e83, 0x3845072a),
+ TOBN(0x98a6f291, 0x49e69274), TOBN(0xb96e9668, 0x1868b21c),
+ TOBN(0x38f0adc2, 0xb1a8908e), TOBN(0x90afcff7, 0x1feb829d),
+ TOBN(0x9915a383, 0x210b0856), TOBN(0xa5a80602, 0xdef04889),
+ TOBN(0x800e9af9, 0x7c64d509), TOBN(0x81382d0b, 0xb8996f6f),
+ TOBN(0x490eba53, 0x81927e27), TOBN(0x46c63b32, 0x4af50182),
+ TOBN(0x784c5fd9, 0xd3ad62ce), TOBN(0xe4fa1870, 0xf8ae8736),
+ TOBN(0x4ec9d0bc, 0xd7466b25), TOBN(0x84ddbe1a, 0xdb235c65),
+ TOBN(0x5e2645ee, 0x163c1688), TOBN(0x570bd00e, 0x00eba747),
+ TOBN(0xfa51b629, 0x128bfa0f), TOBN(0x92fce1bd, 0x6c1d3b68),
+ TOBN(0x3e7361dc, 0xb66778b1), TOBN(0x9c7d249d, 0x5561d2bb),
+ TOBN(0xa40b28bf, 0x0bbc6229), TOBN(0x1c83c05e, 0xdfd91497),
+ TOBN(0x5f9f5154, 0xf083df05), TOBN(0xbac38b3c, 0xeee66c9d),
+ TOBN(0xf71db7e3, 0xec0dfcfd), TOBN(0xf2ecda8e, 0x8b0a8416),
+ TOBN(0x52fddd86, 0x7812aa66), TOBN(0x2896ef10, 0x4e6f4272),
+ TOBN(0xff27186a, 0x0fe9a745), TOBN(0x08249fcd, 0x49ca70db),
+ TOBN(0x7425a2e6, 0x441cac49), TOBN(0xf4a0885a, 0xece5ff57),
+ TOBN(0x6e2cb731, 0x7d7ead58), TOBN(0xf96cf7d6, 0x1898d104),
+ TOBN(0xafe67c9d, 0x4f2c9a89), TOBN(0x89895a50, 0x1c7bf5bc),
+ TOBN(0xdc7cb8e5, 0x573cecfa), TOBN(0x66497eae, 0xd15f03e6),
+ TOBN(0x6bc0de69, 0x3f084420), TOBN(0x323b9b36, 0xacd532b0),
+ TOBN(0xcfed390a, 0x0115a3c1), TOBN(0x9414c40b, 0x2d65ca0e),
+ TOBN(0x641406bd, 0x2f530c78), TOBN(0x29369a44, 0x833438f2),
+ TOBN(0x996884f5, 0x903fa271), TOBN(0xe6da0fd2, 0xb9da921e),
+ TOBN(0xa6f2f269, 0x5db01e54), TOBN(0x1ee3e9bd, 0x6876214e),
+ TOBN(0xa26e181c, 0xe27a9497), TOBN(0x36d254e4, 0x8e215e04),
+ TOBN(0x42f32a6c, 0x252cabca), TOBN(0x99481487, 0x80b57614),
+ TOBN(0x4c4dfe69, 0x40d9cae1), TOBN(0x05869580, 0x11a10f09),
+ TOBN(0xca287b57, 0x3491b64b), TOBN(0x77862d5d, 0x3fd4a53b),
+ TOBN(0xbf94856e, 0x50349126), TOBN(0x2be30bd1, 0x71c5268f),
+ TOBN(0x10393f19, 0xcbb650a6), TOBN(0x639531fe, 0x778cf9fd),
+ TOBN(0x02556a11, 0xb2935359), TOBN(0xda38aa96, 0xaf8c126e),
+ TOBN(0x47dbe6c2, 0x0960167f), TOBN(0x37bbabb6, 0x501901cd),
+ TOBN(0xb6e979e0, 0x2c947778), TOBN(0xd69a5175, 0x7a1a1dc6),
+ TOBN(0xc3ed5095, 0x9d9faf0c), TOBN(0x4dd9c096, 0x1d5fa5f0),
+ TOBN(0xa0c4304d, 0x64f16ea8), TOBN(0x8b1cac16, 0x7e718623),
+ TOBN(0x0b576546, 0x7c67f03e), TOBN(0x559cf5ad, 0xcbd88c01),
+ TOBN(0x074877bb, 0x0e2af19a), TOBN(0x1f717ec1, 0xa1228c92),
+ TOBN(0x70bcb800, 0x326e8920), TOBN(0xec6e2c5c, 0x4f312804),
+ TOBN(0x426aea7d, 0x3fca4752), TOBN(0xf12c0949, 0x2211f62a),
+ TOBN(0x24beecd8, 0x7be7b6b5), TOBN(0xb77eaf4c, 0x36d7a27d),
+ TOBN(0x154c2781, 0xfda78fd3), TOBN(0x848a83b0, 0x264eeabe),
+ TOBN(0x81287ef0, 0x4ffe2bc4), TOBN(0x7b6d88c6, 0xb6b6fc2a),
+ TOBN(0x805fb947, 0xce417d99), TOBN(0x4b93dcc3, 0x8b916cc4),
+ TOBN(0x72e65bb3, 0x21273323), TOBN(0xbcc1badd, 0x6ea9886e),
+ TOBN(0x0e223011, 0x4bc5ee85), TOBN(0xa561be74, 0xc18ee1e4),
+ TOBN(0x762fd2d4, 0xa6bcf1f1), TOBN(0x50e6a5a4, 0x95231489),
+ TOBN(0xca96001f, 0xa00b500b), TOBN(0x5c098cfc, 0x5d7dcdf5),
+ TOBN(0xa64e2d2e, 0x8c446a85), TOBN(0xbae9bcf1, 0x971f3c62),
+ TOBN(0x4ec22683, 0x8435a2c5), TOBN(0x8ceaed6c, 0x4bad4643),
+ TOBN(0xe9f8fb47, 0xccccf4e3), TOBN(0xbd4f3fa4, 0x1ce3b21e),
+ TOBN(0xd79fb110, 0xa3db3292), TOBN(0xe28a37da, 0xb536c66a),
+ TOBN(0x279ce87b, 0x8e49e6a9), TOBN(0x70ccfe8d, 0xfdcec8e3),
+ TOBN(0x2193e4e0, 0x3ba464b2), TOBN(0x0f39d60e, 0xaca9a398),
+ TOBN(0x7d7932af, 0xf82c12ab), TOBN(0xd8ff50ed, 0x91e7e0f7),
+ TOBN(0xea961058, 0xfa28a7e0), TOBN(0xc726cf25, 0x0bf5ec74),
+ TOBN(0xe74d55c8, 0xdb229666), TOBN(0x0bd9abbf, 0xa57f5799),
+ TOBN(0x7479ef07, 0x4dfc47b3), TOBN(0xd9c65fc3, 0x0c52f91d),
+ TOBN(0x8e0283fe, 0x36a8bde2), TOBN(0xa32a8b5e, 0x7d4b7280),
+ TOBN(0x6a677c61, 0x12e83233), TOBN(0x0fbb3512, 0xdcc9bf28),
+ TOBN(0x562e8ea5, 0x0d780f61), TOBN(0x0db8b22b, 0x1dc4e89c),
+ TOBN(0x0a6fd1fb, 0x89be0144), TOBN(0x8c77d246, 0xca57113b),
+ TOBN(0x4639075d, 0xff09c91c), TOBN(0x5b47b17f, 0x5060824c),
+ TOBN(0x58aea2b0, 0x16287b52), TOBN(0xa1343520, 0xd0cd8eb0),
+ TOBN(0x6148b4d0, 0xc5d58573), TOBN(0xdd2b6170, 0x291c68ae),
+ TOBN(0xa61b3929, 0x1da3b3b7), TOBN(0x5f946d79, 0x08c4ac10),
+ TOBN(0x4105d4a5, 0x7217d583), TOBN(0x5061da3d, 0x25e6de5e),
+ TOBN(0x3113940d, 0xec1b4991), TOBN(0xf12195e1, 0x36f485ae),
+ TOBN(0xa7507fb2, 0x731a2ee0), TOBN(0x95057a8e, 0x6e9e196e),
+ TOBN(0xa3c2c911, 0x2e130136), TOBN(0x97dfbb36, 0x33c60d15),
+ TOBN(0xcaf3c581, 0xb300ee2b), TOBN(0x77f25d90, 0xf4bac8b8),
+ TOBN(0xdb1c4f98, 0x6d840cd6), TOBN(0x471d62c0, 0xe634288c),
+ TOBN(0x8ec2f85e, 0xcec8a161), TOBN(0x41f37cbc, 0xfa6f4ae2),
+ TOBN(0x6793a20f, 0x4b709985), TOBN(0x7a7bd33b, 0xefa8985b),
+ TOBN(0x2c6a3fbd, 0x938e6446), TOBN(0x19042619, 0x2a8d47c1),
+ TOBN(0x16848667, 0xcc36975f), TOBN(0x02acf168, 0x9d5f1dfb),
+ TOBN(0x62d41ad4, 0x613baa94), TOBN(0xb56fbb92, 0x9f684670),
+ TOBN(0xce610d0d, 0xe9e40569), TOBN(0x7b99c65f, 0x35489fef),
+ TOBN(0x0c88ad1b, 0x3df18b97), TOBN(0x81b7d9be, 0x5d0e9edb),
+ TOBN(0xd85218c0, 0xc716cc0a), TOBN(0xf4b5ff90, 0x85691c49),
+ TOBN(0xa4fd666b, 0xce356ac6), TOBN(0x17c72895, 0x4b327a7a),
+ TOBN(0xf93d5085, 0xda6be7de), TOBN(0xff71530e, 0x3301d34e),
+ TOBN(0x4cd96442, 0xd8f448e8), TOBN(0x9283d331, 0x2ed18ffa),
+ TOBN(0x4d33dd99, 0x2a849870), TOBN(0xa716964b, 0x41576335),
+ TOBN(0xff5e3a9b, 0x179be0e5), TOBN(0x5b9d6b1b, 0x83b13632),
+ TOBN(0x3b8bd7d4, 0xa52f313b), TOBN(0xc9dd95a0, 0x637a4660),
+ TOBN(0x30035962, 0x0b3e218f), TOBN(0xce1481a3, 0xc7b28a3c),
+ TOBN(0xab41b43a, 0x43228d83), TOBN(0x24ae1c30, 0x4ad63f99),
+ TOBN(0x8e525f1a, 0x46a51229), TOBN(0x14af860f, 0xcd26d2b4),
+ TOBN(0xd6baef61, 0x3f714aa1), TOBN(0xf51865ad, 0xeb78795e),
+ TOBN(0xd3e21fce, 0xe6a9d694), TOBN(0x82ceb1dd, 0x8a37b527) }
+ };
diff --git a/crypto/ec/ecp_oct.c b/crypto/ec/ecp_oct.c
index 2379bcffd3..dcef2dfe80 100644
--- a/crypto/ec/ecp_oct.c
+++ b/crypto/ec/ecp_oct.c
@@ -20,9 +20,9 @@
#include "ec_local.h"
int ossl_ec_GFp_simple_set_compressed_coordinates(const EC_GROUP *group,
- EC_POINT *point,
- const BIGNUM *x_, int y_bit,
- BN_CTX *ctx)
+ EC_POINT *point,
+ const BIGNUM *x_, int y_bit,
+ BN_CTX *ctx)
{
BN_CTX *new_ctx = NULL;
BIGNUM *tmp1, *tmp2, *x, *y;
@@ -150,15 +150,15 @@ int ossl_ec_GFp_simple_set_compressed_coordinates(const EC_GROUP *group,
ret = 1;
- err:
+err:
BN_CTX_end(ctx);
BN_CTX_free(new_ctx);
return ret;
}
size_t ossl_ec_GFp_simple_point2oct(const EC_GROUP *group, const EC_POINT *point,
- point_conversion_form_t form,
- unsigned char *buf, size_t len, BN_CTX *ctx)
+ point_conversion_form_t form,
+ unsigned char *buf, size_t len, BN_CTX *ctx)
{
size_t ret;
BN_CTX *new_ctx = NULL;
@@ -187,9 +187,7 @@ size_t ossl_ec_GFp_simple_point2oct(const EC_GROUP *group, const EC_POINT *point
/* ret := required output buffer length */
field_len = BN_num_bytes(group->field);
- ret =
- (form ==
- POINT_CONVERSION_COMPRESSED) ? 1 + field_len : 1 + 2 * field_len;
+ ret = (form == POINT_CONVERSION_COMPRESSED) ? 1 + field_len : 1 + 2 * field_len;
/* if 'buf' is NULL, just return required length */
if (buf != NULL) {
@@ -215,7 +213,8 @@ size_t ossl_ec_GFp_simple_point2oct(const EC_GROUP *group, const EC_POINT *point
goto err;
if ((form == POINT_CONVERSION_COMPRESSED
- || form == POINT_CONVERSION_HYBRID) && BN_is_odd(y))
+ || form == POINT_CONVERSION_HYBRID)
+ && BN_is_odd(y))
buf[0] = form + 1;
else
buf[0] = form;
@@ -264,7 +263,7 @@ size_t ossl_ec_GFp_simple_point2oct(const EC_GROUP *group, const EC_POINT *point
BN_CTX_free(new_ctx);
return ret;
- err:
+err:
if (used_ctx)
BN_CTX_end(ctx);
BN_CTX_free(new_ctx);
@@ -272,8 +271,8 @@ size_t ossl_ec_GFp_simple_point2oct(const EC_GROUP *group, const EC_POINT *point
}
int ossl_ec_GFp_simple_oct2point(const EC_GROUP *group, EC_POINT *point,
- const unsigned char *buf, size_t len,
- BN_CTX *ctx)
+ const unsigned char *buf, size_t len,
+ BN_CTX *ctx)
{
point_conversion_form_t form;
int y_bit;
@@ -310,9 +309,7 @@ int ossl_ec_GFp_simple_oct2point(const EC_GROUP *group, EC_POINT *point,
}
field_len = BN_num_bytes(group->field);
- enc_len =
- (form ==
- POINT_CONVERSION_COMPRESSED) ? 1 + field_len : 1 + 2 * field_len;
+ enc_len = (form == POINT_CONVERSION_COMPRESSED) ? 1 + field_len : 1 + 2 * field_len;
if (len != (size_t)enc_len) {
ERR_raise(ERR_LIB_EC, EC_R_INVALID_ENCODING);
@@ -365,7 +362,7 @@ int ossl_ec_GFp_simple_oct2point(const EC_GROUP *group, EC_POINT *point,
ret = 1;
- err:
+err:
BN_CTX_end(ctx);
BN_CTX_free(new_ctx);
return ret;
diff --git a/crypto/ec/ecp_ppc.c b/crypto/ec/ecp_ppc.c
index b2b9f772b8..e038a07475 100644
--- a/crypto/ec/ecp_ppc.c
+++ b/crypto/ec/ecp_ppc.c
@@ -12,15 +12,15 @@
#include "ec_local.h"
void ecp_nistz256_mul_mont(unsigned long res[4], const unsigned long a[4],
- const unsigned long b[4]);
+ const unsigned long b[4]);
void ecp_nistz256_to_mont(unsigned long res[4], const unsigned long in[4]);
void ecp_nistz256_to_mont(unsigned long res[4], const unsigned long in[4])
{
static const unsigned long RR[] = { 0x0000000000000003U,
- 0xfffffffbffffffffU,
- 0xfffffffffffffffeU,
- 0x00000004fffffffdU };
+ 0xfffffffbffffffffU,
+ 0xfffffffffffffffeU,
+ 0x00000004fffffffdU };
ecp_nistz256_mul_mont(res, in, RR);
}
diff --git a/crypto/ec/ecp_s390x_nistp.c b/crypto/ec/ecp_s390x_nistp.c
index 085b630090..30754d4e75 100644
--- a/crypto/ec/ecp_s390x_nistp.c
+++ b/crypto/ec/ecp_s390x_nistp.c
@@ -21,36 +21,36 @@
#include "s390x_arch.h"
/* Size of parameter blocks */
-#define S390X_SIZE_PARAM 4096
+#define S390X_SIZE_PARAM 4096
/* Size of fields in parameter blocks */
-#define S390X_SIZE_P256 32
-#define S390X_SIZE_P384 48
-#define S390X_SIZE_P521 80
+#define S390X_SIZE_P256 32
+#define S390X_SIZE_P384 48
+#define S390X_SIZE_P521 80
/* Offsets of fields in PCC parameter blocks */
-#define S390X_OFF_RES_X(n) (0 * n)
-#define S390X_OFF_RES_Y(n) (1 * n)
-#define S390X_OFF_SRC_X(n) (2 * n)
-#define S390X_OFF_SRC_Y(n) (3 * n)
-#define S390X_OFF_SCALAR(n) (4 * n)
+#define S390X_OFF_RES_X(n) (0 * n)
+#define S390X_OFF_RES_Y(n) (1 * n)
+#define S390X_OFF_SRC_X(n) (2 * n)
+#define S390X_OFF_SRC_Y(n) (3 * n)
+#define S390X_OFF_SCALAR(n) (4 * n)
/* Offsets of fields in KDSA parameter blocks */
-#define S390X_OFF_R(n) (0 * n)
-#define S390X_OFF_S(n) (1 * n)
-#define S390X_OFF_H(n) (2 * n)
-#define S390X_OFF_K(n) (3 * n)
-#define S390X_OFF_X(n) (3 * n)
-#define S390X_OFF_RN(n) (4 * n)
-#define S390X_OFF_Y(n) (4 * n)
+#define S390X_OFF_R(n) (0 * n)
+#define S390X_OFF_S(n) (1 * n)
+#define S390X_OFF_H(n) (2 * n)
+#define S390X_OFF_K(n) (3 * n)
+#define S390X_OFF_X(n) (3 * n)
+#define S390X_OFF_RN(n) (4 * n)
+#define S390X_OFF_Y(n) (4 * n)
-#define S390X_PAD(n) (n == 80 ? 14 : 0)
+#define S390X_PAD(n) (n == 80 ? 14 : 0)
static int ec_GFp_s390x_nistp_mul(const EC_GROUP *group, EC_POINT *r,
- const BIGNUM *scalar,
- size_t num, const EC_POINT *points[],
- const BIGNUM *scalars[],
- BN_CTX *ctx, unsigned int fc, int len)
+ const BIGNUM *scalar,
+ size_t num, const EC_POINT *points[],
+ const BIGNUM *scalars[],
+ BN_CTX *ctx, unsigned int fc, int len)
{
unsigned char param[S390X_SIZE_PARAM];
BIGNUM *x, *y;
@@ -99,16 +99,19 @@ static int ec_GFp_s390x_nistp_mul(const EC_GROUP *group, EC_POINT *r,
memset(¶m, 0, sizeof(param));
if (group->meth->point_get_affine_coordinates(group, point_ptr,
- x, y, ctx) != 1
+ x, y, ctx)
+ != 1
|| BN_bn2binpad(x, param + S390X_OFF_SRC_X(len), len) == -1
|| BN_bn2binpad(y, param + S390X_OFF_SRC_Y(len), len) == -1
|| BN_bn2binpad(scalar_ptr,
- param + S390X_OFF_SCALAR(len), len) == -1
+ param + S390X_OFF_SCALAR(len), len)
+ == -1
|| s390x_pcc(fc, param) != 0
|| BN_bin2bn(param + S390X_OFF_RES_X(len), len, x) == NULL
|| BN_bin2bn(param + S390X_OFF_RES_Y(len), len, y) == NULL
|| group->meth->point_set_affine_coordinates(group, r,
- x, y, ctx) != 1)
+ x, y, ctx)
+ != 1)
goto ret;
rc = 1;
@@ -125,11 +128,11 @@ ret:
}
static ECDSA_SIG *ecdsa_s390x_nistp_sign_sig(const unsigned char *dgst,
- int dgstlen,
- const BIGNUM *kinv,
- const BIGNUM *r,
- EC_KEY *eckey,
- unsigned int fc, int len)
+ int dgstlen,
+ const BIGNUM *kinv,
+ const BIGNUM *r,
+ EC_KEY *eckey,
+ unsigned int fc, int len)
{
unsigned char param[S390X_SIZE_PARAM];
int ok = 0;
@@ -186,11 +189,12 @@ static ECDSA_SIG *ecdsa_s390x_nistp_sign_sig(const unsigned char *dgst,
* because kdsa instruction constructs an in-range, invertible nonce
* internally implementing counter-measures for RNG weakness.
*/
- if (RAND_priv_bytes_ex(eckey->libctx, param + S390X_OFF_RN(len),
- (size_t)len, 0) != 1) {
- ERR_raise(ERR_LIB_EC, EC_R_RANDOM_NUMBER_GENERATION_FAILED);
- goto ret;
- }
+ if (RAND_priv_bytes_ex(eckey->libctx, param + S390X_OFF_RN(len),
+ (size_t)len, 0)
+ != 1) {
+ ERR_raise(ERR_LIB_EC, EC_R_RANDOM_NUMBER_GENERATION_FAILED);
+ goto ret;
+ }
} else {
bn_ctx = BN_CTX_secure_new_ex(ossl_ec_key_get_libctx(eckey));
if (bn_ctx == NULL)
@@ -230,8 +234,8 @@ ret:
}
static int ecdsa_s390x_nistp_verify_sig(const unsigned char *dgst, int dgstlen,
- const ECDSA_SIG *sig, EC_KEY *eckey,
- unsigned int fc, int len)
+ const ECDSA_SIG *sig, EC_KEY *eckey,
+ unsigned int fc, int len)
{
unsigned char param[S390X_SIZE_PARAM];
int rc = -1;
@@ -275,16 +279,19 @@ static int ecdsa_s390x_nistp_verify_sig(const unsigned char *dgst, int dgstlen,
/* Check for invalid malformed signatures (r/s negative or too large) */
if (BN_is_negative(sig->r) || BN_is_negative(sig->s)
|| BN_bn2binpad(sig->r, param + S390X_OFF_R(len) + S390X_PAD(len),
- len - S390X_PAD(len)) == -1
+ len - S390X_PAD(len))
+ == -1
|| BN_bn2binpad(sig->s, param + S390X_OFF_S(len) + S390X_PAD(len),
- len - S390X_PAD(len)) == -1) {
+ len - S390X_PAD(len))
+ == -1) {
ERR_raise(ERR_LIB_EC, EC_R_BAD_SIGNATURE);
rc = 0;
goto ret;
}
if (group->meth->point_get_affine_coordinates(group, pubkey,
- x, y, ctx) != 1
+ x, y, ctx)
+ != 1
|| BN_bn2binpad(x, param + S390X_OFF_X(len), len) == -1
|| BN_bn2binpad(y, param + S390X_OFF_Y(len), len) == -1) {
ERR_raise(ERR_LIB_EC, ERR_R_BN_LIB);
@@ -301,119 +308,117 @@ ret:
return rc;
}
-#define EC_GFP_S390X_NISTP_METHOD(bits) \
- \
-static int ec_GFp_s390x_nistp##bits##_mul(const EC_GROUP *group, \
- EC_POINT *r, \
- const BIGNUM *scalar, \
- size_t num, \
- const EC_POINT *points[], \
- const BIGNUM *scalars[], \
- BN_CTX *ctx) \
-{ \
- return ec_GFp_s390x_nistp_mul(group, r, scalar, num, points, \
- scalars, ctx, \
- S390X_SCALAR_MULTIPLY_P##bits, \
- S390X_SIZE_P##bits); \
-} \
- \
-static ECDSA_SIG *ecdsa_s390x_nistp##bits##_sign_sig(const unsigned \
- char *dgst, \
- int dgstlen, \
- const BIGNUM *kinv,\
- const BIGNUM *r, \
- EC_KEY *eckey) \
-{ \
- return ecdsa_s390x_nistp_sign_sig(dgst, dgstlen, kinv, r, eckey, \
- S390X_ECDSA_SIGN_P##bits, \
- S390X_SIZE_P##bits); \
-} \
- \
-static int ecdsa_s390x_nistp##bits##_verify_sig(const \
- unsigned char *dgst, \
- int dgstlen, \
- const ECDSA_SIG *sig, \
- EC_KEY *eckey) \
-{ \
- return ecdsa_s390x_nistp_verify_sig(dgst, dgstlen, sig, eckey, \
- S390X_ECDSA_VERIFY_P##bits, \
- S390X_SIZE_P##bits); \
-} \
- \
-const EC_METHOD *EC_GFp_s390x_nistp##bits##_method(void) \
-{ \
- static const EC_METHOD EC_GFp_s390x_nistp##bits##_meth = { \
- EC_FLAGS_DEFAULT_OCT, \
- NID_X9_62_prime_field, \
- ossl_ec_GFp_simple_group_init, \
- ossl_ec_GFp_simple_group_finish, \
- ossl_ec_GFp_simple_group_clear_finish, \
- ossl_ec_GFp_simple_group_copy, \
- ossl_ec_GFp_simple_group_set_curve, \
- ossl_ec_GFp_simple_group_get_curve, \
- ossl_ec_GFp_simple_group_get_degree, \
- ossl_ec_group_simple_order_bits, \
- ossl_ec_GFp_simple_group_check_discriminant, \
- ossl_ec_GFp_simple_point_init, \
- ossl_ec_GFp_simple_point_finish, \
- ossl_ec_GFp_simple_point_clear_finish, \
- ossl_ec_GFp_simple_point_copy, \
- ossl_ec_GFp_simple_point_set_to_infinity, \
- ossl_ec_GFp_simple_point_set_affine_coordinates, \
- ossl_ec_GFp_simple_point_get_affine_coordinates, \
- NULL, /* point_set_compressed_coordinates */ \
- NULL, /* point2oct */ \
- NULL, /* oct2point */ \
- ossl_ec_GFp_simple_add, \
- ossl_ec_GFp_simple_dbl, \
- ossl_ec_GFp_simple_invert, \
- ossl_ec_GFp_simple_is_at_infinity, \
- ossl_ec_GFp_simple_is_on_curve, \
- ossl_ec_GFp_simple_cmp, \
- ossl_ec_GFp_simple_make_affine, \
- ossl_ec_GFp_simple_points_make_affine, \
- ec_GFp_s390x_nistp##bits##_mul, \
- NULL, /* precompute_mult */ \
- NULL, /* have_precompute_mult */ \
- ossl_ec_GFp_simple_field_mul, \
- ossl_ec_GFp_simple_field_sqr, \
- NULL, /* field_div */ \
- ossl_ec_GFp_simple_field_inv, \
- NULL, /* field_encode */ \
- NULL, /* field_decode */ \
- NULL, /* field_set_to_one */ \
- ossl_ec_key_simple_priv2oct, \
- ossl_ec_key_simple_oct2priv, \
- NULL, /* set_private */ \
- ossl_ec_key_simple_generate_key, \
- ossl_ec_key_simple_check_key, \
- ossl_ec_key_simple_generate_public_key, \
- NULL, /* keycopy */ \
- NULL, /* keyfinish */ \
- ossl_ecdh_simple_compute_key, \
- ossl_ecdsa_simple_sign_setup, \
- ecdsa_s390x_nistp##bits##_sign_sig, \
- ecdsa_s390x_nistp##bits##_verify_sig, \
- NULL, /* field_inverse_mod_ord */ \
- ossl_ec_GFp_simple_blind_coordinates, \
- ossl_ec_GFp_simple_ladder_pre, \
- ossl_ec_GFp_simple_ladder_step, \
- ossl_ec_GFp_simple_ladder_post \
- }; \
- static const EC_METHOD *ret; \
- \
- if ((OPENSSL_s390xcap_P.pcc[1] \
- & S390X_CAPBIT(S390X_SCALAR_MULTIPLY_P##bits)) \
- && (OPENSSL_s390xcap_P.kdsa[0] \
- & S390X_CAPBIT(S390X_ECDSA_VERIFY_P##bits)) \
- && (OPENSSL_s390xcap_P.kdsa[0] \
- & S390X_CAPBIT(S390X_ECDSA_SIGN_P##bits))) \
- ret = &EC_GFp_s390x_nistp##bits##_meth; \
- else \
- ret = EC_GFp_mont_method(); \
- \
- return ret; \
-}
+#define EC_GFP_S390X_NISTP_METHOD(bits) \
+ \
+ static int ec_GFp_s390x_nistp##bits##_mul(const EC_GROUP *group, \
+ EC_POINT *r, \
+ const BIGNUM *scalar, \
+ size_t num, \
+ const EC_POINT *points[], \
+ const BIGNUM *scalars[], \
+ BN_CTX *ctx) \
+ { \
+ return ec_GFp_s390x_nistp_mul(group, r, scalar, num, points, \
+ scalars, ctx, \
+ S390X_SCALAR_MULTIPLY_P##bits, \
+ S390X_SIZE_P##bits); \
+ } \
+ \
+ static ECDSA_SIG *ecdsa_s390x_nistp##bits##_sign_sig(const unsigned char *dgst, \
+ int dgstlen, \
+ const BIGNUM *kinv, \
+ const BIGNUM *r, \
+ EC_KEY *eckey) \
+ { \
+ return ecdsa_s390x_nistp_sign_sig(dgst, dgstlen, kinv, r, eckey, \
+ S390X_ECDSA_SIGN_P##bits, \
+ S390X_SIZE_P##bits); \
+ } \
+ \
+ static int ecdsa_s390x_nistp##bits##_verify_sig(const unsigned char *dgst, \
+ int dgstlen, \
+ const ECDSA_SIG *sig, \
+ EC_KEY *eckey) \
+ { \
+ return ecdsa_s390x_nistp_verify_sig(dgst, dgstlen, sig, eckey, \
+ S390X_ECDSA_VERIFY_P##bits, \
+ S390X_SIZE_P##bits); \
+ } \
+ \
+ const EC_METHOD *EC_GFp_s390x_nistp##bits##_method(void) \
+ { \
+ static const EC_METHOD EC_GFp_s390x_nistp##bits##_meth = { \
+ EC_FLAGS_DEFAULT_OCT, \
+ NID_X9_62_prime_field, \
+ ossl_ec_GFp_simple_group_init, \
+ ossl_ec_GFp_simple_group_finish, \
+ ossl_ec_GFp_simple_group_clear_finish, \
+ ossl_ec_GFp_simple_group_copy, \
+ ossl_ec_GFp_simple_group_set_curve, \
+ ossl_ec_GFp_simple_group_get_curve, \
+ ossl_ec_GFp_simple_group_get_degree, \
+ ossl_ec_group_simple_order_bits, \
+ ossl_ec_GFp_simple_group_check_discriminant, \
+ ossl_ec_GFp_simple_point_init, \
+ ossl_ec_GFp_simple_point_finish, \
+ ossl_ec_GFp_simple_point_clear_finish, \
+ ossl_ec_GFp_simple_point_copy, \
+ ossl_ec_GFp_simple_point_set_to_infinity, \
+ ossl_ec_GFp_simple_point_set_affine_coordinates, \
+ ossl_ec_GFp_simple_point_get_affine_coordinates, \
+ NULL, /* point_set_compressed_coordinates */ \
+ NULL, /* point2oct */ \
+ NULL, /* oct2point */ \
+ ossl_ec_GFp_simple_add, \
+ ossl_ec_GFp_simple_dbl, \
+ ossl_ec_GFp_simple_invert, \
+ ossl_ec_GFp_simple_is_at_infinity, \
+ ossl_ec_GFp_simple_is_on_curve, \
+ ossl_ec_GFp_simple_cmp, \
+ ossl_ec_GFp_simple_make_affine, \
+ ossl_ec_GFp_simple_points_make_affine, \
+ ec_GFp_s390x_nistp##bits##_mul, \
+ NULL, /* precompute_mult */ \
+ NULL, /* have_precompute_mult */ \
+ ossl_ec_GFp_simple_field_mul, \
+ ossl_ec_GFp_simple_field_sqr, \
+ NULL, /* field_div */ \
+ ossl_ec_GFp_simple_field_inv, \
+ NULL, /* field_encode */ \
+ NULL, /* field_decode */ \
+ NULL, /* field_set_to_one */ \
+ ossl_ec_key_simple_priv2oct, \
+ ossl_ec_key_simple_oct2priv, \
+ NULL, /* set_private */ \
+ ossl_ec_key_simple_generate_key, \
+ ossl_ec_key_simple_check_key, \
+ ossl_ec_key_simple_generate_public_key, \
+ NULL, /* keycopy */ \
+ NULL, /* keyfinish */ \
+ ossl_ecdh_simple_compute_key, \
+ ossl_ecdsa_simple_sign_setup, \
+ ecdsa_s390x_nistp##bits##_sign_sig, \
+ ecdsa_s390x_nistp##bits##_verify_sig, \
+ NULL, /* field_inverse_mod_ord */ \
+ ossl_ec_GFp_simple_blind_coordinates, \
+ ossl_ec_GFp_simple_ladder_pre, \
+ ossl_ec_GFp_simple_ladder_step, \
+ ossl_ec_GFp_simple_ladder_post \
+ }; \
+ static const EC_METHOD *ret; \
+ \
+ if ((OPENSSL_s390xcap_P.pcc[1] \
+ & S390X_CAPBIT(S390X_SCALAR_MULTIPLY_P##bits)) \
+ && (OPENSSL_s390xcap_P.kdsa[0] \
+ & S390X_CAPBIT(S390X_ECDSA_VERIFY_P##bits)) \
+ && (OPENSSL_s390xcap_P.kdsa[0] \
+ & S390X_CAPBIT(S390X_ECDSA_SIGN_P##bits))) \
+ ret = &EC_GFp_s390x_nistp##bits##_meth; \
+ else \
+ ret = EC_GFp_mont_method(); \
+ \
+ return ret; \
+ }
EC_GFP_S390X_NISTP_METHOD(256)
EC_GFP_S390X_NISTP_METHOD(384)
diff --git a/crypto/ec/ecp_sm2p256.c b/crypto/ec/ecp_sm2p256.c
index 7c7857807e..fef5e46d8e 100644
--- a/crypto/ec/ecp_sm2p256.c
+++ b/crypto/ec/ecp_sm2p256.c
@@ -46,8 +46,10 @@ ALIGN32 static const BN_ULONG def_xG[P256_LIMBS] = {
};
ALIGN32 static const BN_ULONG def_yG[P256_LIMBS] = {
- 0x02df32e52139f0a0, 0xd0a9877cc62a4740,
- 0x59bdcee36b692153, 0xbc3736a2f4f6779c,
+ 0x02df32e52139f0a0,
+ 0xd0a9877cc62a4740,
+ 0x59bdcee36b692153,
+ 0xbc3736a2f4f6779c,
};
#endif
@@ -57,7 +59,7 @@ ALIGN32 static const BN_ULONG def_p[P256_LIMBS] = {
0xffffffffffffffff, 0xfffffffeffffffff
};
-ALIGN32 static const BN_ULONG ONE[P256_LIMBS] = {1, 0, 0, 0};
+ALIGN32 static const BN_ULONG ONE[P256_LIMBS] = { 1, 0, 0, 0 };
/* Functions implemented in assembly */
/*
@@ -123,10 +125,8 @@ static ossl_inline int is_greater(const BN_ULONG *a, const BN_ULONG *b)
#define is_one(a) is_equal(a, ONE)
#define is_even(a) !(a[0] & 1)
-#define is_point_equal(a, b) \
- is_equal(a->X, b->X) && \
- is_equal(a->Y, b->Y) && \
- is_equal(a->Z, b->Z)
+#define is_point_equal(a, b) \
+ is_equal(a->X, b->X) && is_equal(a->Y, b->Y) && is_equal(a->Z, b->Z)
/* Bignum and field elements conversion */
#define ecp_sm2p256_bignum_field_elem(out, in) \
@@ -137,8 +137,8 @@ static ossl_inline int is_greater(const BN_ULONG *a, const BN_ULONG *b)
do { \
ALIGN32 BN_ULONG u[4]; \
ALIGN32 BN_ULONG v[4]; \
- ALIGN32 BN_ULONG x1[4] = {1, 0, 0, 0}; \
- ALIGN32 BN_ULONG x2[4] = {0}; \
+ ALIGN32 BN_ULONG x1[4] = { 1, 0, 0, 0 }; \
+ ALIGN32 BN_ULONG x2[4] = { 0 }; \
\
if (is_zeros(in)) \
return; \
@@ -168,8 +168,9 @@ static ossl_inline int is_greater(const BN_ULONG *a, const BN_ULONG *b)
} while (0)
/* Modular inverse |out| = |in|^(-1) mod |p|. */
-static ossl_inline void ecp_sm2p256_mod_inverse(BN_ULONG* out,
- const BN_ULONG* in) {
+static ossl_inline void ecp_sm2p256_mod_inverse(BN_ULONG *out,
+ const BN_ULONG *in)
+{
BN_MOD_INV(out, in, ecp_sm2p256_div_by_2, ecp_sm2p256_sub, def_p);
}
@@ -211,13 +212,13 @@ static void ecp_sm2p256_point_double(P256_POINT *R, const P256_POINT *P)
/* Point add affine: R <- P + Q */
static void ecp_sm2p256_point_add_affine(P256_POINT *R, const P256_POINT *P,
- const P256_POINT_AFFINE *Q)
+ const P256_POINT_AFFINE *Q)
{
unsigned int i;
- ALIGN32 BN_ULONG tmp0[P256_LIMBS] = {0};
- ALIGN32 BN_ULONG tmp1[P256_LIMBS] = {0};
- ALIGN32 BN_ULONG tmp2[P256_LIMBS] = {0};
- ALIGN32 BN_ULONG tmp3[P256_LIMBS] = {0};
+ ALIGN32 BN_ULONG tmp0[P256_LIMBS] = { 0 };
+ ALIGN32 BN_ULONG tmp1[P256_LIMBS] = { 0 };
+ ALIGN32 BN_ULONG tmp2[P256_LIMBS] = { 0 };
+ ALIGN32 BN_ULONG tmp3[P256_LIMBS] = { 0 };
/* zero-check P->Z */
if (is_zeros(P->Z)) {
@@ -274,12 +275,12 @@ static void ecp_sm2p256_point_add_affine(P256_POINT *R, const P256_POINT *P,
/* Point add: R <- P + Q */
static void ecp_sm2p256_point_add(P256_POINT *R, const P256_POINT *P,
- const P256_POINT *Q)
+ const P256_POINT *Q)
{
unsigned int i;
- ALIGN32 BN_ULONG tmp0[P256_LIMBS] = {0};
- ALIGN32 BN_ULONG tmp1[P256_LIMBS] = {0};
- ALIGN32 BN_ULONG tmp2[P256_LIMBS] = {0};
+ ALIGN32 BN_ULONG tmp0[P256_LIMBS] = { 0 };
+ ALIGN32 BN_ULONG tmp1[P256_LIMBS] = { 0 };
+ ALIGN32 BN_ULONG tmp2[P256_LIMBS] = { 0 };
/* zero-check P | Q ->Z */
if (is_zeros(P->Z)) {
@@ -367,7 +368,7 @@ static void ecp_sm2p256_point_G_mul_by_scalar(P256_POINT *R, const BN_ULONG *k)
* Affine point mul by scalar: k - scalar, P - affine point
*/
static void ecp_sm2p256_point_P_mul_by_scalar(P256_POINT *R, const BN_ULONG *k,
- P256_POINT_AFFINE P)
+ P256_POINT_AFFINE P)
{
int i, init = 0;
unsigned int index, mask = 0x0f;
@@ -414,10 +415,10 @@ static void ecp_sm2p256_point_P_mul_by_scalar(P256_POINT *R, const BN_ULONG *k,
/* Get affine point */
static void ecp_sm2p256_point_get_affine(P256_POINT_AFFINE *R,
- const P256_POINT *P)
+ const P256_POINT *P)
{
- ALIGN32 BN_ULONG z_inv3[P256_LIMBS] = {0};
- ALIGN32 BN_ULONG z_inv2[P256_LIMBS] = {0};
+ ALIGN32 BN_ULONG z_inv3[P256_LIMBS] = { 0 };
+ ALIGN32 BN_ULONG z_inv2[P256_LIMBS] = { 0 };
if (is_one(P->Z)) {
memcpy(R->X, P->X, 32);
@@ -436,24 +437,24 @@ static void ecp_sm2p256_point_get_affine(P256_POINT_AFFINE *R,
static int ecp_sm2p256_is_affine_G(const EC_POINT *generator)
{
return (bn_get_top(generator->X) == P256_LIMBS)
- && (bn_get_top(generator->Y) == P256_LIMBS)
- && is_equal(bn_get_words(generator->X), def_xG)
- && is_equal(bn_get_words(generator->Y), def_yG)
- && (generator->Z_is_one == 1);
+ && (bn_get_top(generator->Y) == P256_LIMBS)
+ && is_equal(bn_get_words(generator->X), def_xG)
+ && is_equal(bn_get_words(generator->Y), def_yG)
+ && (generator->Z_is_one == 1);
}
#endif
/* r = sum(scalar[i]*point[i]) */
static int ecp_sm2p256_windowed_mul(const EC_GROUP *group,
- P256_POINT *r,
- const BIGNUM **scalar,
- const EC_POINT **point,
- size_t num, BN_CTX *ctx)
+ P256_POINT *r,
+ const BIGNUM **scalar,
+ const EC_POINT **point,
+ size_t num, BN_CTX *ctx)
{
unsigned int i;
int ret = 0;
const BIGNUM **scalars = NULL;
- ALIGN32 BN_ULONG k[P256_LIMBS] = {0};
+ ALIGN32 BN_ULONG k[P256_LIMBS] = { 0 };
P256_POINT kP;
ALIGN32 union {
P256_POINT p;
@@ -507,15 +508,15 @@ err:
/* r = scalar*G + sum(scalars[i]*points[i]) */
static int ecp_sm2p256_points_mul(const EC_GROUP *group,
- EC_POINT *r,
- const BIGNUM *scalar,
- size_t num,
- const EC_POINT *points[],
- const BIGNUM *scalars[], BN_CTX *ctx)
+ EC_POINT *r,
+ const BIGNUM *scalar,
+ size_t num,
+ const EC_POINT *points[],
+ const BIGNUM *scalars[], BN_CTX *ctx)
{
int ret = 0, p_is_infinity = 0;
const EC_POINT *generator = NULL;
- ALIGN32 BN_ULONG k[P256_LIMBS] = {0};
+ ALIGN32 BN_ULONG k[P256_LIMBS] = { 0 };
ALIGN32 union {
P256_POINT p;
P256_POINT_AFFINE a;
@@ -553,8 +554,9 @@ static int ecp_sm2p256_points_mul(const EC_GROUP *group,
g_scalars[0] = scalar;
if (!ecp_sm2p256_windowed_mul(group, &p.p, g_scalars, new_generator,
- (new_generator[0] != NULL
- && g_scalars[0] != NULL), ctx))
+ (new_generator[0] != NULL
+ && g_scalars[0] != NULL),
+ ctx))
goto err;
}
} else {
@@ -587,11 +589,11 @@ err:
}
static int ecp_sm2p256_field_mul(const EC_GROUP *group, BIGNUM *r,
- const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
+ const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
{
- ALIGN32 BN_ULONG a_fe[P256_LIMBS] = {0};
- ALIGN32 BN_ULONG b_fe[P256_LIMBS] = {0};
- ALIGN32 BN_ULONG r_fe[P256_LIMBS] = {0};
+ ALIGN32 BN_ULONG a_fe[P256_LIMBS] = { 0 };
+ ALIGN32 BN_ULONG b_fe[P256_LIMBS] = { 0 };
+ ALIGN32 BN_ULONG r_fe[P256_LIMBS] = { 0 };
if (a == NULL || b == NULL || r == NULL)
return 0;
@@ -611,10 +613,10 @@ static int ecp_sm2p256_field_mul(const EC_GROUP *group, BIGNUM *r,
}
static int ecp_sm2p256_field_sqr(const EC_GROUP *group, BIGNUM *r,
- const BIGNUM *a, BN_CTX *ctx)
+ const BIGNUM *a, BN_CTX *ctx)
{
- ALIGN32 BN_ULONG a_fe[P256_LIMBS] = {0};
- ALIGN32 BN_ULONG r_fe[P256_LIMBS] = {0};
+ ALIGN32 BN_ULONG a_fe[P256_LIMBS] = { 0 };
+ ALIGN32 BN_ULONG r_fe[P256_LIMBS] = { 0 };
if (a == NULL || r == NULL)
return 0;
@@ -688,7 +690,7 @@ const EC_METHOD *EC_GFp_sm2p256_method(void)
0, /* blind_coordinates */
0, /* ladder_pre */
0, /* ladder_step */
- 0 /* ladder_post */
+ 0 /* ladder_post */
};
return &ret;
diff --git a/crypto/ec/ecp_sm2p256_table.c b/crypto/ec/ecp_sm2p256_table.c
index e19df48f55..0eff5dae6b 100644
--- a/crypto/ec/ecp_sm2p256_table.c
+++ b/crypto/ec/ecp_sm2p256_table.c
@@ -28,7 +28,7 @@ __attribute((aligned(4096)))
#elif defined(_MSC_VER)
__declspec(align(4096))
#elif defined(__SUNPRO_C)
-# pragma align 4096(ecp_sm2p256_precomputed)
+#pragma align 4096(ecp_sm2p256_precomputed)
#endif
extern const BN_ULONG ecp_sm2p256_precomputed[8 * 32 * 256];
const BN_ULONG ecp_sm2p256_precomputed[8 * 32 * 256] = {
diff --git a/crypto/ec/ecp_smpl.c b/crypto/ec/ecp_smpl.c
index 833b5e80be..b37cc28216 100644
--- a/crypto/ec/ecp_smpl.c
+++ b/crypto/ec/ecp_smpl.c
@@ -49,16 +49,16 @@ const EC_METHOD *EC_GFp_simple_method(void)
ossl_ec_GFp_simple_cmp,
ossl_ec_GFp_simple_make_affine,
ossl_ec_GFp_simple_points_make_affine,
- 0 /* mul */ ,
- 0 /* precompute_mult */ ,
- 0 /* have_precompute_mult */ ,
+ 0 /* mul */,
+ 0 /* precompute_mult */,
+ 0 /* have_precompute_mult */,
ossl_ec_GFp_simple_field_mul,
ossl_ec_GFp_simple_field_sqr,
- 0 /* field_div */ ,
+ 0 /* field_div */,
ossl_ec_GFp_simple_field_inv,
- 0 /* field_encode */ ,
- 0 /* field_decode */ ,
- 0, /* field_set_to_one */
+ 0 /* field_encode */,
+ 0 /* field_decode */,
+ 0, /* field_set_to_one */
ossl_ec_key_simple_priv2oct,
ossl_ec_key_simple_oct2priv,
0, /* set private */
@@ -139,8 +139,8 @@ int ossl_ec_GFp_simple_group_copy(EC_GROUP *dest, const EC_GROUP *src)
}
int ossl_ec_GFp_simple_group_set_curve(EC_GROUP *group,
- const BIGNUM *p, const BIGNUM *a,
- const BIGNUM *b, BN_CTX *ctx)
+ const BIGNUM *p, const BIGNUM *a,
+ const BIGNUM *b, BN_CTX *ctx)
{
int ret = 0;
BN_CTX *new_ctx = NULL;
@@ -191,14 +191,14 @@ int ossl_ec_GFp_simple_group_set_curve(EC_GROUP *group,
ret = 1;
- err:
+err:
BN_CTX_end(ctx);
BN_CTX_free(new_ctx);
return ret;
}
int ossl_ec_GFp_simple_group_get_curve(const EC_GROUP *group, BIGNUM *p,
- BIGNUM *a, BIGNUM *b, BN_CTX *ctx)
+ BIGNUM *a, BIGNUM *b, BN_CTX *ctx)
{
int ret = 0;
BN_CTX *new_ctx = NULL;
@@ -237,7 +237,7 @@ int ossl_ec_GFp_simple_group_get_curve(const EC_GROUP *group, BIGNUM *p,
ret = 1;
- err:
+err:
BN_CTX_free(new_ctx);
return ret;
}
@@ -248,7 +248,7 @@ int ossl_ec_GFp_simple_group_get_degree(const EC_GROUP *group)
}
int ossl_ec_GFp_simple_group_check_discriminant(const EC_GROUP *group,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
int ret = 0;
BIGNUM *a, *b, *order, *tmp_1, *tmp_2;
@@ -313,7 +313,7 @@ int ossl_ec_GFp_simple_group_check_discriminant(const EC_GROUP *group,
}
ret = 1;
- err:
+err:
BN_CTX_end(ctx);
BN_CTX_free(new_ctx);
return ret;
@@ -365,7 +365,7 @@ int ossl_ec_GFp_simple_point_copy(EC_POINT *dest, const EC_POINT *src)
}
int ossl_ec_GFp_simple_point_set_to_infinity(const EC_GROUP *group,
- EC_POINT *point)
+ EC_POINT *point)
{
point->Z_is_one = 0;
BN_zero(point->Z);
@@ -373,11 +373,11 @@ int ossl_ec_GFp_simple_point_set_to_infinity(const EC_GROUP *group,
}
int ossl_ec_GFp_simple_set_Jprojective_coordinates_GFp(const EC_GROUP *group,
- EC_POINT *point,
- const BIGNUM *x,
- const BIGNUM *y,
- const BIGNUM *z,
- BN_CTX *ctx)
+ EC_POINT *point,
+ const BIGNUM *x,
+ const BIGNUM *y,
+ const BIGNUM *z,
+ BN_CTX *ctx)
{
BN_CTX *new_ctx = NULL;
int ret = 0;
@@ -417,8 +417,7 @@ int ossl_ec_GFp_simple_set_Jprojective_coordinates_GFp(const EC_GROUP *group,
if (!group->meth->field_set_to_one(group, point->Z, ctx))
goto err;
} else {
- if (!group->
- meth->field_encode(group, point->Z, point->Z, ctx))
+ if (!group->meth->field_encode(group, point->Z, point->Z, ctx))
goto err;
}
}
@@ -427,15 +426,15 @@ int ossl_ec_GFp_simple_set_Jprojective_coordinates_GFp(const EC_GROUP *group,
ret = 1;
- err:
+err:
BN_CTX_free(new_ctx);
return ret;
}
int ossl_ec_GFp_simple_get_Jprojective_coordinates_GFp(const EC_GROUP *group,
- const EC_POINT *point,
- BIGNUM *x, BIGNUM *y,
- BIGNUM *z, BN_CTX *ctx)
+ const EC_POINT *point,
+ BIGNUM *x, BIGNUM *y,
+ BIGNUM *z, BN_CTX *ctx)
{
BN_CTX *new_ctx = NULL;
int ret = 0;
@@ -476,15 +475,15 @@ int ossl_ec_GFp_simple_get_Jprojective_coordinates_GFp(const EC_GROUP *group,
ret = 1;
- err:
+err:
BN_CTX_free(new_ctx);
return ret;
}
int ossl_ec_GFp_simple_point_set_affine_coordinates(const EC_GROUP *group,
- EC_POINT *point,
- const BIGNUM *x,
- const BIGNUM *y, BN_CTX *ctx)
+ EC_POINT *point,
+ const BIGNUM *x,
+ const BIGNUM *y, BN_CTX *ctx)
{
if (x == NULL || y == NULL) {
/*
@@ -495,13 +494,13 @@ int ossl_ec_GFp_simple_point_set_affine_coordinates(const EC_GROUP *group,
}
return EC_POINT_set_Jprojective_coordinates_GFp(group, point, x, y,
- BN_value_one(), ctx);
+ BN_value_one(), ctx);
}
int ossl_ec_GFp_simple_point_get_affine_coordinates(const EC_GROUP *group,
- const EC_POINT *point,
- BIGNUM *x, BIGNUM *y,
- BN_CTX *ctx)
+ const EC_POINT *point,
+ BIGNUM *x, BIGNUM *y,
+ BN_CTX *ctx)
{
BN_CTX *new_ctx = NULL;
BIGNUM *Z, *Z_1, *Z_2, *Z_3;
@@ -604,18 +603,18 @@ int ossl_ec_GFp_simple_point_get_affine_coordinates(const EC_GROUP *group,
ret = 1;
- err:
+err:
BN_CTX_end(ctx);
BN_CTX_free(new_ctx);
return ret;
}
int ossl_ec_GFp_simple_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a,
- const EC_POINT *b, BN_CTX *ctx)
+ const EC_POINT *b, BN_CTX *ctx)
{
- int (*field_mul) (const EC_GROUP *, BIGNUM *, const BIGNUM *,
- const BIGNUM *, BN_CTX *);
- int (*field_sqr) (const EC_GROUP *, BIGNUM *, const BIGNUM *, BN_CTX *);
+ int (*field_mul)(const EC_GROUP *, BIGNUM *, const BIGNUM *,
+ const BIGNUM *, BN_CTX *);
+ int (*field_sqr)(const EC_GROUP *, BIGNUM *, const BIGNUM *, BN_CTX *);
const BIGNUM *p;
BN_CTX *new_ctx = NULL;
BIGNUM *n0, *n1, *n2, *n3, *n4, *n5, *n6;
@@ -774,7 +773,7 @@ int ossl_ec_GFp_simple_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a
if (!field_mul(group, n0, n0, n6, ctx))
goto end;
if (!field_mul(group, n5, n4, n5, ctx))
- goto end; /* now n5 is n5^3 */
+ goto end; /* now n5 is n5^3 */
if (!field_mul(group, n1, n2, n5, ctx))
goto end;
if (!BN_mod_sub_quick(n0, n0, n1, p))
@@ -789,18 +788,18 @@ int ossl_ec_GFp_simple_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a
ret = 1;
- end:
+end:
BN_CTX_end(ctx);
BN_CTX_free(new_ctx);
return ret;
}
int ossl_ec_GFp_simple_dbl(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
- int (*field_mul) (const EC_GROUP *, BIGNUM *, const BIGNUM *,
- const BIGNUM *, BN_CTX *);
- int (*field_sqr) (const EC_GROUP *, BIGNUM *, const BIGNUM *, BN_CTX *);
+ int (*field_mul)(const EC_GROUP *, BIGNUM *, const BIGNUM *,
+ const BIGNUM *, BN_CTX *);
+ int (*field_sqr)(const EC_GROUP *, BIGNUM *, const BIGNUM *, BN_CTX *);
const BIGNUM *p;
BN_CTX *new_ctx = NULL;
BIGNUM *n0, *n1, *n2, *n3;
@@ -931,14 +930,14 @@ int ossl_ec_GFp_simple_dbl(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a
ret = 1;
- err:
+err:
BN_CTX_end(ctx);
BN_CTX_free(new_ctx);
return ret;
}
int ossl_ec_GFp_simple_invert(const EC_GROUP *group, EC_POINT *point,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
if (EC_POINT_is_at_infinity(group, point) || BN_is_zero(point->Y))
/* point is its own inverse */
@@ -948,17 +947,17 @@ int ossl_ec_GFp_simple_invert(const EC_GROUP *group, EC_POINT *point,
}
int ossl_ec_GFp_simple_is_at_infinity(const EC_GROUP *group,
- const EC_POINT *point)
+ const EC_POINT *point)
{
return BN_is_zero(point->Z);
}
int ossl_ec_GFp_simple_is_on_curve(const EC_GROUP *group, const EC_POINT *point,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
- int (*field_mul) (const EC_GROUP *, BIGNUM *, const BIGNUM *,
- const BIGNUM *, BN_CTX *);
- int (*field_sqr) (const EC_GROUP *, BIGNUM *, const BIGNUM *, BN_CTX *);
+ int (*field_mul)(const EC_GROUP *, BIGNUM *, const BIGNUM *,
+ const BIGNUM *, BN_CTX *);
+ int (*field_sqr)(const EC_GROUP *, BIGNUM *, const BIGNUM *, BN_CTX *);
const BIGNUM *p;
BN_CTX *new_ctx = NULL;
BIGNUM *rh, *tmp, *Z4, *Z6;
@@ -1050,14 +1049,14 @@ int ossl_ec_GFp_simple_is_on_curve(const EC_GROUP *group, const EC_POINT *point,
ret = (0 == BN_ucmp(tmp, rh));
- err:
+err:
BN_CTX_end(ctx);
BN_CTX_free(new_ctx);
return ret;
}
int ossl_ec_GFp_simple_cmp(const EC_GROUP *group, const EC_POINT *a,
- const EC_POINT *b, BN_CTX *ctx)
+ const EC_POINT *b, BN_CTX *ctx)
{
/*-
* return values:
@@ -1066,9 +1065,9 @@ int ossl_ec_GFp_simple_cmp(const EC_GROUP *group, const EC_POINT *a,
* 1 not equal
*/
- int (*field_mul) (const EC_GROUP *, BIGNUM *, const BIGNUM *,
- const BIGNUM *, BN_CTX *);
- int (*field_sqr) (const EC_GROUP *, BIGNUM *, const BIGNUM *, BN_CTX *);
+ int (*field_mul)(const EC_GROUP *, BIGNUM *, const BIGNUM *,
+ const BIGNUM *, BN_CTX *);
+ int (*field_sqr)(const EC_GROUP *, BIGNUM *, const BIGNUM *, BN_CTX *);
BN_CTX *new_ctx = NULL;
BIGNUM *tmp1, *tmp2, *Za23, *Zb23;
const BIGNUM *tmp1_, *tmp2_;
@@ -1128,7 +1127,7 @@ int ossl_ec_GFp_simple_cmp(const EC_GROUP *group, const EC_POINT *a,
/* compare X_a*Z_b^2 with X_b*Z_a^2 */
if (BN_cmp(tmp1_, tmp2_) != 0) {
- ret = 1; /* points differ */
+ ret = 1; /* points differ */
goto end;
}
@@ -1151,21 +1150,21 @@ int ossl_ec_GFp_simple_cmp(const EC_GROUP *group, const EC_POINT *a,
/* compare Y_a*Z_b^3 with Y_b*Z_a^3 */
if (BN_cmp(tmp1_, tmp2_) != 0) {
- ret = 1; /* points differ */
+ ret = 1; /* points differ */
goto end;
}
/* points are equal */
ret = 0;
- end:
+end:
BN_CTX_end(ctx);
BN_CTX_free(new_ctx);
return ret;
}
int ossl_ec_GFp_simple_make_affine(const EC_GROUP *group, EC_POINT *point,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
BN_CTX *new_ctx = NULL;
BIGNUM *x, *y;
@@ -1197,14 +1196,14 @@ int ossl_ec_GFp_simple_make_affine(const EC_GROUP *group, EC_POINT *point,
ret = 1;
- err:
+err:
BN_CTX_end(ctx);
BN_CTX_free(new_ctx);
return ret;
}
int ossl_ec_GFp_simple_points_make_affine(const EC_GROUP *group, size_t num,
- EC_POINT *points[], BN_CTX *ctx)
+ EC_POINT *points[], BN_CTX *ctx)
{
BN_CTX *new_ctx = NULL;
BIGNUM *tmp, *tmp_Z;
@@ -1256,9 +1255,8 @@ int ossl_ec_GFp_simple_points_make_affine(const EC_GROUP *group, size_t num,
for (i = 1; i < num; i++) {
if (!BN_is_zero(points[i]->Z)) {
- if (!group->
- meth->field_mul(group, prod_Z[i], prod_Z[i - 1], points[i]->Z,
- ctx))
+ if (!group->meth->field_mul(group, prod_Z[i], prod_Z[i - 1], points[i]->Z,
+ ctx))
goto err;
} else {
if (!BN_copy(prod_Z[i], prod_Z[i - 1]))
@@ -1297,8 +1295,7 @@ int ossl_ec_GFp_simple_points_make_affine(const EC_GROUP *group, size_t num,
* Set tmp_Z to the inverse of points[i]->Z (as product of Z
* inverses 0 .. i, Z values 0 .. i - 1).
*/
- if (!group->
- meth->field_mul(group, tmp_Z, prod_Z[i - 1], tmp, ctx))
+ if (!group->meth->field_mul(group, tmp_Z, prod_Z[i - 1], tmp, ctx))
goto err;
/*
* Update tmp to satisfy the loop invariant for i - 1.
@@ -1348,7 +1345,7 @@ int ossl_ec_GFp_simple_points_make_affine(const EC_GROUP *group, size_t num,
ret = 1;
- err:
+err:
BN_CTX_end(ctx);
BN_CTX_free(new_ctx);
if (prod_Z != NULL) {
@@ -1363,13 +1360,13 @@ int ossl_ec_GFp_simple_points_make_affine(const EC_GROUP *group, size_t num,
}
int ossl_ec_GFp_simple_field_mul(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a,
- const BIGNUM *b, BN_CTX *ctx)
+ const BIGNUM *b, BN_CTX *ctx)
{
return BN_mod_mul(r, a, b, group->field, ctx);
}
int ossl_ec_GFp_simple_field_sqr(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
return BN_mod_sqr(r, a, group->field, ctx);
}
@@ -1381,14 +1378,14 @@ int ossl_ec_GFp_simple_field_sqr(const EC_GROUP *group, BIGNUM *r, const BIGNUM
* NB: "a" must be in _decoded_ form. (i.e. field_decode must precede.)
*/
int ossl_ec_GFp_simple_field_inv(const EC_GROUP *group, BIGNUM *r,
- const BIGNUM *a, BN_CTX *ctx)
+ const BIGNUM *a, BN_CTX *ctx)
{
BIGNUM *e = NULL;
BN_CTX *new_ctx = NULL;
int ret = 0;
if (ctx == NULL
- && (ctx = new_ctx = BN_CTX_secure_new_ex(group->libctx)) == NULL)
+ && (ctx = new_ctx = BN_CTX_secure_new_ex(group->libctx)) == NULL)
return 0;
BN_CTX_start(ctx);
@@ -1397,7 +1394,7 @@ int ossl_ec_GFp_simple_field_inv(const EC_GROUP *group, BIGNUM *r,
do {
if (!BN_priv_rand_range_ex(e, group->field, 0, ctx))
- goto err;
+ goto err;
} while (BN_is_zero(e));
/* r := a * e */
@@ -1414,7 +1411,7 @@ int ossl_ec_GFp_simple_field_inv(const EC_GROUP *group, BIGNUM *r,
ret = 1;
- err:
+err:
BN_CTX_end(ctx);
BN_CTX_free(new_ctx);
return ret;
@@ -1428,7 +1425,7 @@ int ossl_ec_GFp_simple_field_inv(const EC_GROUP *group, BIGNUM *r,
*
*/
int ossl_ec_GFp_simple_blind_coordinates(const EC_GROUP *group, EC_POINT *p,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
int ret = 0;
BIGNUM *lambda = NULL;
@@ -1459,7 +1456,7 @@ int ossl_ec_GFp_simple_blind_coordinates(const EC_GROUP *group, EC_POINT *p,
/* if field_encode defined convert between representations */
if ((group->meth->field_encode != NULL
- && !group->meth->field_encode(group, lambda, lambda, ctx))
+ && !group->meth->field_encode(group, lambda, lambda, ctx))
|| !group->meth->field_mul(group, p->Z, p->Z, lambda, ctx)
|| !group->meth->field_sqr(group, temp, lambda, ctx)
|| !group->meth->field_mul(group, p->X, p->X, temp, ctx)
@@ -1470,7 +1467,7 @@ int ossl_ec_GFp_simple_blind_coordinates(const EC_GROUP *group, EC_POINT *p,
p->Z_is_one = 0;
ret = 1;
- end:
+end:
BN_CTX_end(ctx);
return ret;
}
@@ -1491,8 +1488,8 @@ int ossl_ec_GFp_simple_blind_coordinates(const EC_GROUP *group, EC_POINT *p,
* for any non-zero \lambda that holds for projective (homogeneous) coords.
*/
int ossl_ec_GFp_simple_ladder_pre(const EC_GROUP *group,
- EC_POINT *r, EC_POINT *s,
- EC_POINT *p, BN_CTX *ctx)
+ EC_POINT *r, EC_POINT *s,
+ EC_POINT *p, BN_CTX *ctx)
{
BIGNUM *t1, *t2, *t3, *t4, *t5 = NULL;
@@ -1561,8 +1558,8 @@ int ossl_ec_GFp_simple_ladder_pre(const EC_GROUP *group,
* https://hyperelliptic.org/EFD/g1p/auto-shortw-xz.html#ladder-mladd-2002-it-4
*/
int ossl_ec_GFp_simple_ladder_step(const EC_GROUP *group,
- EC_POINT *r, EC_POINT *s,
- EC_POINT *p, BN_CTX *ctx)
+ EC_POINT *r, EC_POINT *s,
+ EC_POINT *p, BN_CTX *ctx)
{
int ret = 0;
BIGNUM *t0, *t1, *t2, *t3, *t4, *t5, *t6 = NULL;
@@ -1620,7 +1617,7 @@ int ossl_ec_GFp_simple_ladder_step(const EC_GROUP *group,
ret = 1;
- err:
+err:
BN_CTX_end(ctx);
return ret;
}
@@ -1649,8 +1646,8 @@ int ossl_ec_GFp_simple_ladder_step(const EC_GROUP *group,
* one of the BN_is_zero(...) branches.
*/
int ossl_ec_GFp_simple_ladder_post(const EC_GROUP *group,
- EC_POINT *r, EC_POINT *s,
- EC_POINT *p, BN_CTX *ctx)
+ EC_POINT *r, EC_POINT *s,
+ EC_POINT *p, BN_CTX *ctx)
{
int ret = 0;
BIGNUM *t0, *t1, *t2, *t3, *t4, *t5, *t6 = NULL;
@@ -1717,7 +1714,7 @@ int ossl_ec_GFp_simple_ladder_post(const EC_GROUP *group,
r->Z_is_one = 1;
ret = 1;
- err:
+err:
BN_CTX_end(ctx);
return ret;
}
diff --git a/crypto/ec/ecx_backend.c b/crypto/ec/ecx_backend.c
index 7df8bb3f71..40daf30e1a 100644
--- a/crypto/ec/ecx_backend.c
+++ b/crypto/ec/ecx_backend.c
@@ -14,7 +14,7 @@
#include <openssl/rand.h>
#include <openssl/err.h>
#ifndef FIPS_MODULE
-# include <openssl/x509.h>
+#include <openssl/x509.h>
#endif
#include "crypto/ecx.h"
#include "ecx_backend.h"
@@ -33,7 +33,7 @@ int ossl_ecx_public_from_private(ECX_KEY *key)
break;
case ECX_KEY_TYPE_ED25519:
if (!ossl_ed25519_public_from_private(key->libctx, key->pubkey,
- key->privkey, key->propq)) {
+ key->privkey, key->propq)) {
ERR_raise(ERR_LIB_EC, EC_R_FAILED_MAKING_PUBLIC_KEY);
return 0;
}
@@ -43,7 +43,7 @@ int ossl_ecx_public_from_private(ECX_KEY *key)
break;
case ECX_KEY_TYPE_ED448:
if (!ossl_ed448_public_from_private(key->libctx, key->pubkey,
- key->privkey, key->propq)) {
+ key->privkey, key->propq)) {
ERR_raise(ERR_LIB_EC, EC_R_FAILED_MAKING_PUBLIC_KEY);
return 0;
}
@@ -53,8 +53,8 @@ int ossl_ecx_public_from_private(ECX_KEY *key)
}
int ossl_ecx_key_fromdata(ECX_KEY *ecx, const OSSL_PARAM *param_pub_key,
- const OSSL_PARAM *param_priv_key,
- int include_private)
+ const OSSL_PARAM *param_priv_key,
+ int include_private)
{
size_t privkeylen = 0, pubkeylen = 0;
unsigned char *pubkey;
@@ -67,8 +67,8 @@ int ossl_ecx_key_fromdata(ECX_KEY *ecx, const OSSL_PARAM *param_pub_key,
if (include_private && param_priv_key != NULL) {
if (!OSSL_PARAM_get_octet_string(param_priv_key,
- (void **)&ecx->privkey, ecx->keylen,
- &privkeylen))
+ (void **)&ecx->privkey, ecx->keylen,
+ &privkeylen))
return 0;
if (privkeylen != ecx->keylen) {
/*
@@ -85,8 +85,8 @@ int ossl_ecx_key_fromdata(ECX_KEY *ecx, const OSSL_PARAM *param_pub_key,
pubkey = ecx->pubkey;
if (param_pub_key != NULL
&& !OSSL_PARAM_get_octet_string(param_pub_key,
- (void **)&pubkey,
- sizeof(ecx->pubkey), &pubkeylen))
+ (void **)&pubkey,
+ sizeof(ecx->pubkey), &pubkeylen))
return 0;
if ((param_pub_key != NULL && pubkeylen != ecx->keylen))
@@ -146,9 +146,9 @@ err:
#ifndef FIPS_MODULE
ECX_KEY *ossl_ecx_key_op(const X509_ALGOR *palg,
- const unsigned char *p, int plen,
- int id, ecx_key_op_t op,
- OSSL_LIB_CTX *libctx, const char *propq)
+ const unsigned char *p, int plen,
+ int id, ecx_key_op_t op,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
ECX_KEY *key = NULL;
unsigned char *privkey, *pubkey;
@@ -215,13 +215,13 @@ ECX_KEY *ossl_ecx_key_op(const X509_ALGOR *palg,
}
return key;
- err:
+err:
ossl_ecx_key_free(key);
return NULL;
}
ECX_KEY *ossl_ecx_key_from_pkcs8(const PKCS8_PRIV_KEY_INFO *p8inf,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_LIB_CTX *libctx, const char *propq)
{
ECX_KEY *ecx = NULL;
const unsigned char *p;
@@ -246,7 +246,7 @@ ECX_KEY *ossl_ecx_key_from_pkcs8(const PKCS8_PRIV_KEY_INFO *p8inf,
* on its own.
*/
ecx = ossl_ecx_key_op(palg, p, plen, EVP_PKEY_NONE, KEY_OP_PRIVATE,
- libctx, propq);
+ libctx, propq);
ASN1_OCTET_STRING_free(oct);
return ecx;
}
diff --git a/crypto/ec/ecx_backend.h b/crypto/ec/ecx_backend.h
index 2c01294789..d3d889c3a5 100644
--- a/crypto/ec/ecx_backend.h
+++ b/crypto/ec/ecx_backend.h
@@ -7,14 +7,14 @@
* https://www.openssl.org/source/license.html
*/
-#define ISX448(id) ((id) == EVP_PKEY_X448)
-#define IS25519(id) ((id) == EVP_PKEY_X25519 || (id) == EVP_PKEY_ED25519)
-#define KEYLENID(id) (IS25519(id) ? X25519_KEYLEN \
- : ((id) == EVP_PKEY_X448 ? X448_KEYLEN \
- : ED448_KEYLEN))
-#define KEYNID2TYPE(id) \
- (IS25519(id) ? ((id) == EVP_PKEY_X25519 ? ECX_KEY_TYPE_X25519 \
+#define ISX448(id) ((id) == EVP_PKEY_X448)
+#define IS25519(id) ((id) == EVP_PKEY_X25519 || (id) == EVP_PKEY_ED25519)
+#define KEYLENID(id) (IS25519(id) ? X25519_KEYLEN \
+ : ((id) == EVP_PKEY_X448 ? X448_KEYLEN \
+ : ED448_KEYLEN))
+#define KEYNID2TYPE(id) \
+ (IS25519(id) ? ((id) == EVP_PKEY_X25519 ? ECX_KEY_TYPE_X25519 \
: ECX_KEY_TYPE_ED25519) \
- : ((id) == EVP_PKEY_X448 ? ECX_KEY_TYPE_X448 \
+ : ((id) == EVP_PKEY_X448 ? ECX_KEY_TYPE_X448 \
: ECX_KEY_TYPE_ED448))
-#define KEYLEN(p) KEYLENID((p)->ameth->pkey_id)
+#define KEYLEN(p) KEYLENID((p)->ameth->pkey_id)
diff --git a/crypto/ec/ecx_key.c b/crypto/ec/ecx_key.c
index 7b09494912..2fed62c361 100644
--- a/crypto/ec/ecx_key.c
+++ b/crypto/ec/ecx_key.c
@@ -14,11 +14,11 @@
#include "internal/common.h" /* for ossl_assert() */
#ifdef S390X_EC_ASM
-# include "s390x_arch.h"
+#include "s390x_arch.h"
#endif
ECX_KEY *ossl_ecx_key_new(OSSL_LIB_CTX *libctx, ECX_KEY_TYPE type, int haspubkey,
- const char *propq)
+ const char *propq)
{
ECX_KEY *ret = OPENSSL_zalloc(sizeof(*ret));
@@ -108,11 +108,11 @@ unsigned char *ossl_ecx_key_allocate_privkey(ECX_KEY *key)
}
int ossl_ecx_compute_key(ECX_KEY *peer, ECX_KEY *priv, size_t keylen,
- unsigned char *secret, size_t *secretlen, size_t outlen)
+ unsigned char *secret, size_t *secretlen, size_t outlen)
{
if (priv == NULL
- || priv->privkey == NULL
- || peer == NULL) {
+ || priv->privkey == NULL
+ || peer == NULL) {
ERR_raise(ERR_LIB_PROV, PROV_R_MISSING_KEY);
return 0;
}
@@ -135,28 +135,28 @@ int ossl_ecx_compute_key(ECX_KEY *peer, ECX_KEY *priv, size_t keylen,
if (keylen == X25519_KEYLEN) {
#ifdef S390X_EC_ASM
if (OPENSSL_s390xcap_P.pcc[1]
- & S390X_CAPBIT(S390X_SCALAR_MULTIPLY_X25519)) {
+ & S390X_CAPBIT(S390X_SCALAR_MULTIPLY_X25519)) {
if (s390x_x25519_mul(secret, peer->pubkey, priv->privkey) == 0) {
ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_DURING_DERIVATION);
return 0;
}
} else
#endif
- if (ossl_x25519(secret, priv->privkey, peer->pubkey) == 0) {
+ if (ossl_x25519(secret, priv->privkey, peer->pubkey) == 0) {
ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_DURING_DERIVATION);
return 0;
}
} else {
#ifdef S390X_EC_ASM
if (OPENSSL_s390xcap_P.pcc[1]
- & S390X_CAPBIT(S390X_SCALAR_MULTIPLY_X448)) {
+ & S390X_CAPBIT(S390X_SCALAR_MULTIPLY_X448)) {
if (s390x_x448_mul(secret, peer->pubkey, priv->privkey) == 0) {
ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_DURING_DERIVATION);
return 0;
}
} else
#endif
- if (ossl_x448(secret, priv->privkey, peer->pubkey) == 0) {
+ if (ossl_x448(secret, priv->privkey, peer->pubkey) == 0) {
ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_DURING_DERIVATION);
return 0;
}
diff --git a/crypto/ec/ecx_meth.c b/crypto/ec/ecx_meth.c
index 0de2819f79..7642954187 100644
--- a/crypto/ec/ecx_meth.c
+++ b/crypto/ec/ecx_meth.c
@@ -43,7 +43,7 @@ static int ecx_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
return 0;
if (!X509_PUBKEY_set0_param(pk, OBJ_nid2obj(pkey->ameth->pkey_id),
- V_ASN1_UNDEF, NULL, penc, KEYLEN(pkey))) {
+ V_ASN1_UNDEF, NULL, penc, KEYLEN(pkey))) {
OPENSSL_free(penc);
ERR_raise(ERR_LIB_EC, ERR_R_X509_LIB);
return 0;
@@ -62,7 +62,7 @@ static int ecx_pub_decode(EVP_PKEY *pkey, const X509_PUBKEY *pubkey)
if (!X509_PUBKEY_get0_param(NULL, &p, &pklen, &palg, pubkey))
return 0;
ecx = ossl_ecx_key_op(palg, p, pklen, pkey->ameth->pkey_id,
- KEY_OP_PUBLIC, NULL, NULL);
+ KEY_OP_PUBLIC, NULL, NULL);
if (ecx != NULL) {
ret = 1;
EVP_PKEY_assign(pkey, pkey->ameth->pkey_id, ecx);
@@ -82,7 +82,7 @@ static int ecx_pub_cmp(const EVP_PKEY *a, const EVP_PKEY *b)
}
static int ecx_priv_decode_ex(EVP_PKEY *pkey, const PKCS8_PRIV_KEY_INFO *p8,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_LIB_CTX *libctx, const char *propq)
{
int ret = 0;
ECX_KEY *ecx = ossl_ecx_key_from_pkcs8(p8, libctx, propq);
@@ -118,7 +118,7 @@ static int ecx_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
}
if (!PKCS8_pkey_set0(p8, OBJ_nid2obj(pkey->ameth->pkey_id), 0,
- V_ASN1_UNDEF, NULL, penc, penclen)) {
+ V_ASN1_UNDEF, NULL, penc, penclen)) {
OPENSSL_clear_free(penc, penclen);
ERR_raise(ERR_LIB_EC, ERR_R_ASN1_LIB);
return 0;
@@ -164,7 +164,7 @@ static int ecx_cmp_parameters(const EVP_PKEY *a, const EVP_PKEY *b)
}
static int ecx_key_print(BIO *bp, const EVP_PKEY *pkey, int indent,
- ASN1_PCTX *ctx, ecx_key_op_t op)
+ ASN1_PCTX *ctx, ecx_key_op_t op)
{
const ECX_KEY *ecxkey = pkey->pkey.ecx;
const char *nm = OBJ_nid2ln(pkey->ameth->pkey_id);
@@ -180,7 +180,8 @@ static int ecx_key_print(BIO *bp, const EVP_PKEY *pkey, int indent,
if (BIO_printf(bp, "%*spriv:\n", indent, "") <= 0)
return 0;
if (ASN1_buf_print(bp, ecxkey->privkey, KEYLEN(pkey),
- indent + 4) == 0)
+ indent + 4)
+ == 0)
return 0;
} else {
if (ecxkey == NULL) {
@@ -195,19 +196,20 @@ static int ecx_key_print(BIO *bp, const EVP_PKEY *pkey, int indent,
return 0;
if (ASN1_buf_print(bp, ecxkey->pubkey, KEYLEN(pkey),
- indent + 4) == 0)
+ indent + 4)
+ == 0)
return 0;
return 1;
}
static int ecx_priv_print(BIO *bp, const EVP_PKEY *pkey, int indent,
- ASN1_PCTX *ctx)
+ ASN1_PCTX *ctx)
{
return ecx_key_print(bp, pkey, indent, ctx, KEY_OP_PRIVATE);
}
static int ecx_pub_print(BIO *bp, const EVP_PKEY *pkey, int indent,
- ASN1_PCTX *ctx)
+ ASN1_PCTX *ctx)
{
return ecx_key_print(bp, pkey, indent, ctx, KEY_OP_PUBLIC);
}
@@ -218,7 +220,7 @@ static int ecx_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2)
case ASN1_PKEY_CTRL_SET1_TLS_ENCPT: {
ECX_KEY *ecx = ossl_ecx_key_op(NULL, arg2, arg1, pkey->ameth->pkey_id,
- KEY_OP_PUBLIC, NULL, NULL);
+ KEY_OP_PUBLIC, NULL, NULL);
if (ecx != NULL) {
EVP_PKEY_assign(pkey, pkey->ameth->pkey_id, ecx);
@@ -238,7 +240,6 @@ static int ecx_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2)
default:
return -2;
-
}
}
@@ -252,12 +253,11 @@ static int ecd_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2)
default:
return -2;
-
}
}
static int ecx_set_priv_key(EVP_PKEY *pkey, const unsigned char *priv,
- size_t len)
+ size_t len)
{
OSSL_LIB_CTX *libctx = NULL;
ECX_KEY *ecx = NULL;
@@ -266,7 +266,7 @@ static int ecx_set_priv_key(EVP_PKEY *pkey, const unsigned char *priv,
libctx = ossl_provider_libctx(EVP_KEYMGMT_get0_provider(pkey->keymgmt));
ecx = ossl_ecx_key_op(NULL, priv, (int)len, pkey->ameth->pkey_id,
- KEY_OP_PRIVATE, libctx, NULL);
+ KEY_OP_PRIVATE, libctx, NULL);
if (ecx != NULL) {
EVP_PKEY_assign(pkey, pkey->ameth->pkey_id, ecx);
@@ -284,7 +284,7 @@ static int ecx_set_pub_key(EVP_PKEY *pkey, const unsigned char *pub, size_t len)
libctx = ossl_provider_libctx(EVP_KEYMGMT_get0_provider(pkey->keymgmt));
ecx = ossl_ecx_key_op(NULL, pub, (int)len, pkey->ameth->pkey_id,
- KEY_OP_PUBLIC, libctx, NULL);
+ KEY_OP_PUBLIC, libctx, NULL);
if (ecx != NULL) {
EVP_PKEY_assign(pkey, pkey->ameth->pkey_id, ecx);
@@ -294,7 +294,7 @@ static int ecx_set_pub_key(EVP_PKEY *pkey, const unsigned char *pub, size_t len)
}
static int ecx_get_priv_key(const EVP_PKEY *pkey, unsigned char *priv,
- size_t *len)
+ size_t *len)
{
const ECX_KEY *key = pkey->pkey.ecx;
@@ -304,8 +304,8 @@ static int ecx_get_priv_key(const EVP_PKEY *pkey, unsigned char *priv,
}
if (key == NULL
- || key->privkey == NULL
- || *len < (size_t)KEYLENID(pkey->ameth->pkey_id))
+ || key->privkey == NULL
+ || *len < (size_t)KEYLENID(pkey->ameth->pkey_id))
return 0;
*len = KEYLENID(pkey->ameth->pkey_id);
@@ -315,7 +315,7 @@ static int ecx_get_priv_key(const EVP_PKEY *pkey, unsigned char *priv,
}
static int ecx_get_pub_key(const EVP_PKEY *pkey, unsigned char *pub,
- size_t *len)
+ size_t *len)
{
const ECX_KEY *key = pkey->pkey.ecx;
@@ -325,7 +325,7 @@ static int ecx_get_pub_key(const EVP_PKEY *pkey, unsigned char *pub,
}
if (key == NULL
- || *len < (size_t)KEYLENID(pkey->ameth->pkey_id))
+ || *len < (size_t)KEYLENID(pkey->ameth->pkey_id))
return 0;
*len = KEYLENID(pkey->ameth->pkey_id);
@@ -344,8 +344,8 @@ static size_t ecx_pkey_dirty_cnt(const EVP_PKEY *pkey)
}
static int ecx_pkey_export_to(const EVP_PKEY *from, void *to_keydata,
- OSSL_FUNC_keymgmt_import_fn *importer,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_FUNC_keymgmt_import_fn *importer,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
const ECX_KEY *key = from->pkey.ecx;
OSSL_PARAM_BLD *tmpl = OSSL_PARAM_BLD_new();
@@ -358,14 +358,14 @@ static int ecx_pkey_export_to(const EVP_PKEY *from, void *to_keydata,
/* A key must at least have a public part */
if (!OSSL_PARAM_BLD_push_octet_string(tmpl, OSSL_PKEY_PARAM_PUB_KEY,
- key->pubkey, key->keylen))
+ key->pubkey, key->keylen))
goto err;
selection |= OSSL_KEYMGMT_SELECT_PUBLIC_KEY;
if (key->privkey != NULL) {
if (!OSSL_PARAM_BLD_push_octet_string(tmpl,
- OSSL_PKEY_PARAM_PRIV_KEY,
- key->privkey, key->keylen))
+ OSSL_PKEY_PARAM_PRIV_KEY,
+ key->privkey, key->keylen))
goto err;
selection |= OSSL_KEYMGMT_SELECT_PRIVATE_KEY;
}
@@ -375,19 +375,19 @@ static int ecx_pkey_export_to(const EVP_PKEY *from, void *to_keydata,
/* We export, the provider imports */
rv = importer(to_keydata, selection, params);
- err:
+err:
OSSL_PARAM_BLD_free(tmpl);
OSSL_PARAM_free(params);
return rv;
}
static int ecx_generic_import_from(const OSSL_PARAM params[], void *vpctx,
- int keytype)
+ int keytype)
{
EVP_PKEY_CTX *pctx = vpctx;
EVP_PKEY *pkey = EVP_PKEY_CTX_get0_pkey(pctx);
ECX_KEY *ecx = ossl_ecx_key_new(pctx->libctx, KEYNID2TYPE(keytype), 0,
- pctx->propquery);
+ pctx->propquery);
const OSSL_PARAM *pub = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_PUB_KEY);
const OSSL_PARAM *priv = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_PRIV_KEY);
@@ -540,8 +540,8 @@ static int ecd_size448(const EVP_PKEY *pkey)
}
static int ecd_item_verify(EVP_MD_CTX *ctx, const ASN1_ITEM *it,
- const void *asn, const X509_ALGOR *sigalg,
- const ASN1_BIT_STRING *str, EVP_PKEY *pkey)
+ const void *asn, const X509_ALGOR *sigalg,
+ const ASN1_BIT_STRING *str, EVP_PKEY *pkey)
{
const ASN1_OBJECT *obj;
int ptype;
@@ -573,34 +573,34 @@ static int ecd_item_sign(X509_ALGOR *alg1, X509_ALGOR *alg2, int nid)
}
static int ecd_item_sign25519(EVP_MD_CTX *ctx, const ASN1_ITEM *it,
- const void *asn,
- X509_ALGOR *alg1, X509_ALGOR *alg2,
- ASN1_BIT_STRING *str)
+ const void *asn,
+ X509_ALGOR *alg1, X509_ALGOR *alg2,
+ ASN1_BIT_STRING *str)
{
return ecd_item_sign(alg1, alg2, NID_ED25519);
}
static int ecd_sig_info_set25519(X509_SIG_INFO *siginf, const X509_ALGOR *alg,
- const ASN1_STRING *sig)
+ const ASN1_STRING *sig)
{
X509_SIG_INFO_set(siginf, NID_undef, NID_ED25519, X25519_SECURITY_BITS,
- X509_SIG_INFO_TLS);
+ X509_SIG_INFO_TLS);
return 1;
}
static int ecd_item_sign448(EVP_MD_CTX *ctx, const ASN1_ITEM *it,
- const void *asn,
- X509_ALGOR *alg1, X509_ALGOR *alg2,
- ASN1_BIT_STRING *str)
+ const void *asn,
+ X509_ALGOR *alg1, X509_ALGOR *alg2,
+ ASN1_BIT_STRING *str)
{
return ecd_item_sign(alg1, alg2, NID_ED448);
}
static int ecd_sig_info_set448(X509_SIG_INFO *siginf, const X509_ALGOR *alg,
- const ASN1_STRING *sig)
+ const ASN1_STRING *sig)
{
X509_SIG_INFO_set(siginf, NID_undef, NID_ED448, X448_SECURITY_BITS,
- X509_SIG_INFO_TLS);
+ X509_SIG_INFO_TLS);
return 1;
}
@@ -713,7 +713,7 @@ const EVP_PKEY_ASN1_METHOD ossl_ed448_asn1_meth = {
static int pkey_ecx_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
{
ECX_KEY *ecx = ossl_ecx_key_op(NULL, NULL, 0, ctx->pmeth->pkey_id,
- KEY_OP_KEYGEN, NULL, NULL);
+ KEY_OP_KEYGEN, NULL, NULL);
if (ecx != NULL) {
EVP_PKEY_assign(pkey, ctx->pmeth->pkey_id, ecx);
@@ -723,9 +723,9 @@ static int pkey_ecx_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
}
static int validate_ecx_derive(EVP_PKEY_CTX *ctx, unsigned char *key,
- size_t *keylen,
- const unsigned char **privkey,
- const unsigned char **pubkey)
+ size_t *keylen,
+ const unsigned char **privkey,
+ const unsigned char **pubkey)
{
const ECX_KEY *ecxkey, *peerkey;
@@ -750,26 +750,26 @@ static int validate_ecx_derive(EVP_PKEY_CTX *ctx, unsigned char *key,
}
static int pkey_ecx_derive25519(EVP_PKEY_CTX *ctx, unsigned char *key,
- size_t *keylen)
+ size_t *keylen)
{
const unsigned char *privkey, *pubkey;
if (!validate_ecx_derive(ctx, key, keylen, &privkey, &pubkey)
- || (key != NULL
- && ossl_x25519(key, privkey, pubkey) == 0))
+ || (key != NULL
+ && ossl_x25519(key, privkey, pubkey) == 0))
return 0;
*keylen = X25519_KEYLEN;
return 1;
}
static int pkey_ecx_derive448(EVP_PKEY_CTX *ctx, unsigned char *key,
- size_t *keylen)
+ size_t *keylen)
{
const unsigned char *privkey, *pubkey;
if (!validate_ecx_derive(ctx, key, keylen, &privkey, &pubkey)
- || (key != NULL
- && ossl_x448(key, privkey, pubkey) == 0))
+ || (key != NULL
+ && ossl_x448(key, privkey, pubkey) == 0))
return 0;
*keylen = X448_KEYLEN;
return 1;
@@ -804,8 +804,8 @@ static const EVP_PKEY_METHOD ecx448_pkey_meth = {
};
static int pkey_ecd_digestsign25519(EVP_MD_CTX *ctx, unsigned char *sig,
- size_t *siglen, const unsigned char *tbs,
- size_t tbslen)
+ size_t *siglen, const unsigned char *tbs,
+ size_t tbslen)
{
const ECX_KEY *edkey = evp_pkey_get_legacy(EVP_MD_CTX_get_pkey_ctx(ctx)->pkey);
@@ -824,17 +824,18 @@ static int pkey_ecd_digestsign25519(EVP_MD_CTX *ctx, unsigned char *sig,
}
if (ossl_ed25519_sign(sig, tbs, tbslen, edkey->pubkey, edkey->privkey,
- 0, 0, 0,
- NULL, 0,
- NULL, NULL) == 0)
+ 0, 0, 0,
+ NULL, 0,
+ NULL, NULL)
+ == 0)
return 0;
*siglen = ED25519_SIGSIZE;
return 1;
}
static int pkey_ecd_digestsign448(EVP_MD_CTX *ctx, unsigned char *sig,
- size_t *siglen, const unsigned char *tbs,
- size_t tbslen)
+ size_t *siglen, const unsigned char *tbs,
+ size_t tbslen)
{
const ECX_KEY *edkey = evp_pkey_get_legacy(EVP_MD_CTX_get_pkey_ctx(ctx)->pkey);
@@ -853,15 +854,16 @@ static int pkey_ecd_digestsign448(EVP_MD_CTX *ctx, unsigned char *sig,
}
if (ossl_ed448_sign(edkey->libctx, sig, tbs, tbslen, edkey->pubkey,
- edkey->privkey, NULL, 0, 0, edkey->propq) == 0)
+ edkey->privkey, NULL, 0, 0, edkey->propq)
+ == 0)
return 0;
*siglen = ED448_SIGSIZE;
return 1;
}
static int pkey_ecd_digestverify25519(EVP_MD_CTX *ctx, const unsigned char *sig,
- size_t siglen, const unsigned char *tbs,
- size_t tbslen)
+ size_t siglen, const unsigned char *tbs,
+ size_t tbslen)
{
const ECX_KEY *edkey = evp_pkey_get_legacy(EVP_MD_CTX_get_pkey_ctx(ctx)->pkey);
@@ -874,14 +876,14 @@ static int pkey_ecd_digestverify25519(EVP_MD_CTX *ctx, const unsigned char *sig,
return 0;
return ossl_ed25519_verify(tbs, tbslen, sig, edkey->pubkey,
- 0, 0, 0,
- NULL, 0,
- edkey->libctx, edkey->propq);
+ 0, 0, 0,
+ NULL, 0,
+ edkey->libctx, edkey->propq);
}
static int pkey_ecd_digestverify448(EVP_MD_CTX *ctx, const unsigned char *sig,
- size_t siglen, const unsigned char *tbs,
- size_t tbslen)
+ size_t siglen, const unsigned char *tbs,
+ size_t tbslen)
{
const ECX_KEY *edkey = evp_pkey_get_legacy(EVP_MD_CTX_get_pkey_ctx(ctx)->pkey);
@@ -894,7 +896,7 @@ static int pkey_ecd_digestverify448(EVP_MD_CTX *ctx, const unsigned char *sig,
return 0;
return ossl_ed448_verify(edkey->libctx, tbs, tbslen, sig, edkey->pubkey,
- NULL, 0, 0, edkey->propq);
+ NULL, 0, 0, edkey->propq);
}
static int pkey_ecd_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
@@ -936,7 +938,7 @@ static const EVP_PKEY_METHOD ed448_pkey_meth = {
};
#ifdef S390X_EC_ASM
-# include "s390x_arch.h"
+#include "s390x_arch.h"
static int s390x_pkey_ecx_keygen25519(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
{
@@ -946,7 +948,7 @@ static int s390x_pkey_ecx_keygen25519(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
};
ECX_KEY *key = ossl_ecx_key_new(ctx->libctx, ECX_KEY_TYPE_X25519, 1,
- ctx->propquery);
+ ctx->propquery);
unsigned char *privkey = NULL, *pubkey;
if (key == NULL) {
@@ -974,7 +976,7 @@ static int s390x_pkey_ecx_keygen25519(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
EVP_PKEY_assign(pkey, ctx->pmeth->pkey_id, key);
return 1;
- err:
+err:
ossl_ecx_key_free(key);
return 0;
}
@@ -989,7 +991,7 @@ static int s390x_pkey_ecx_keygen448(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
};
ECX_KEY *key = ossl_ecx_key_new(ctx->libctx, ECX_KEY_TYPE_X448, 1,
- ctx->propquery);
+ ctx->propquery);
unsigned char *privkey = NULL, *pubkey;
if (key == NULL) {
@@ -1016,7 +1018,7 @@ static int s390x_pkey_ecx_keygen448(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
EVP_PKEY_assign(pkey, ctx->pmeth->pkey_id, key);
return 1;
- err:
+err:
ossl_ecx_key_free(key);
return 0;
}
@@ -1029,13 +1031,42 @@ static int s390x_pkey_ecd_keygen25519(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
0xfe, 0x53, 0x6e, 0xcd, 0xd3, 0x36, 0x69, 0x21
};
static const unsigned char generator_y[] = {
- 0x58, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66,
- 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66,
- 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66,
+ 0x58,
+ 0x66,
+ 0x66,
+ 0x66,
+ 0x66,
+ 0x66,
+ 0x66,
+ 0x66,
+ 0x66,
+ 0x66,
+ 0x66,
+ 0x66,
+ 0x66,
+ 0x66,
+ 0x66,
+ 0x66,
+ 0x66,
+ 0x66,
+ 0x66,
+ 0x66,
+ 0x66,
+ 0x66,
+ 0x66,
+ 0x66,
+ 0x66,
+ 0x66,
+ 0x66,
+ 0x66,
+ 0x66,
+ 0x66,
+ 0x66,
+ 0x66,
};
unsigned char x_dst[32], buff[SHA512_DIGEST_LENGTH];
ECX_KEY *key = ossl_ecx_key_new(ctx->libctx, ECX_KEY_TYPE_ED25519, 1,
- ctx->propquery);
+ ctx->propquery);
unsigned char *privkey = NULL, *pubkey;
unsigned int sz;
EVP_MD *md = NULL;
@@ -1071,14 +1102,15 @@ static int s390x_pkey_ecd_keygen25519(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
buff[31] |= 64;
if (s390x_ed25519_mul(x_dst, pubkey,
- generator_x, generator_y, buff) != 1)
+ generator_x, generator_y, buff)
+ != 1)
goto err;
pubkey[31] |= ((x_dst[0] & 0x01) << 7);
EVP_PKEY_assign(pkey, ctx->pmeth->pkey_id, key);
return 1;
- err:
+err:
ossl_ecx_key_free(key);
return 0;
}
@@ -1101,7 +1133,7 @@ static int s390x_pkey_ecd_keygen448(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
};
unsigned char x_dst[57], buff[114];
ECX_KEY *key = ossl_ecx_key_new(ctx->libctx, ECX_KEY_TYPE_ED448, 1,
- ctx->propquery);
+ ctx->propquery);
unsigned char *privkey = NULL, *pubkey;
EVP_MD_CTX *hashctx = NULL;
EVP_MD *md = NULL;
@@ -1146,7 +1178,8 @@ static int s390x_pkey_ecd_keygen448(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
buff[56] = 0;
if (s390x_ed448_mul(x_dst, pubkey,
- generator_x, generator_y, buff) != 1)
+ generator_x, generator_y, buff)
+ != 1)
goto err;
pubkey[56] |= ((x_dst[0] & 0x01) << 7);
@@ -1154,14 +1187,14 @@ static int s390x_pkey_ecd_keygen448(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
EVP_PKEY_assign(pkey, ctx->pmeth->pkey_id, key);
EVP_MD_CTX_free(hashctx);
return 1;
- err:
+err:
ossl_ecx_key_free(key);
EVP_MD_CTX_free(hashctx);
return 0;
}
static int s390x_pkey_ecx_derive25519(EVP_PKEY_CTX *ctx, unsigned char *key,
- size_t *keylen)
+ size_t *keylen)
{
const unsigned char *privkey, *pubkey;
@@ -1174,7 +1207,7 @@ static int s390x_pkey_ecx_derive25519(EVP_PKEY_CTX *ctx, unsigned char *key,
}
static int s390x_pkey_ecx_derive448(EVP_PKEY_CTX *ctx, unsigned char *key,
- size_t *keylen)
+ size_t *keylen)
{
const unsigned char *privkey, *pubkey;
@@ -1187,9 +1220,9 @@ static int s390x_pkey_ecx_derive448(EVP_PKEY_CTX *ctx, unsigned char *key,
}
static int s390x_pkey_ecd_digestsign25519(EVP_MD_CTX *ctx,
- unsigned char *sig, size_t *siglen,
- const unsigned char *tbs,
- size_t tbslen)
+ unsigned char *sig, size_t *siglen,
+ const unsigned char *tbs,
+ size_t tbslen)
{
union {
struct {
@@ -1232,9 +1265,9 @@ static int s390x_pkey_ecd_digestsign25519(EVP_MD_CTX *ctx,
}
static int s390x_pkey_ecd_digestsign448(EVP_MD_CTX *ctx,
- unsigned char *sig, size_t *siglen,
- const unsigned char *tbs,
- size_t tbslen)
+ unsigned char *sig, size_t *siglen,
+ const unsigned char *tbs,
+ size_t tbslen)
{
union {
struct {
@@ -1279,10 +1312,10 @@ static int s390x_pkey_ecd_digestsign448(EVP_MD_CTX *ctx,
}
static int s390x_pkey_ecd_digestverify25519(EVP_MD_CTX *ctx,
- const unsigned char *sig,
- size_t siglen,
- const unsigned char *tbs,
- size_t tbslen)
+ const unsigned char *sig,
+ size_t siglen,
+ const unsigned char *tbs,
+ size_t tbslen)
{
union {
struct {
@@ -1307,14 +1340,17 @@ static int s390x_pkey_ecd_digestverify25519(EVP_MD_CTX *ctx,
s390x_flip_endian32(param.ed25519.pub, edkey->pubkey);
return s390x_kdsa(S390X_EDDSA_VERIFY_ED25519,
- ¶m.ed25519, tbs, tbslen) == 0 ? 1 : 0;
+ ¶m.ed25519, tbs, tbslen)
+ == 0
+ ? 1
+ : 0;
}
static int s390x_pkey_ecd_digestverify448(EVP_MD_CTX *ctx,
- const unsigned char *sig,
- size_t siglen,
- const unsigned char *tbs,
- size_t tbslen)
+ const unsigned char *sig,
+ size_t siglen,
+ const unsigned char *tbs,
+ size_t tbslen)
{
union {
struct {
@@ -1342,7 +1378,10 @@ static int s390x_pkey_ecd_digestverify448(EVP_MD_CTX *ctx,
s390x_flip_endian64(param.ed448.pub, param.ed448.pub);
return s390x_kdsa(S390X_EDDSA_VERIFY_ED448,
- ¶m.ed448, tbs, tbslen) == 0 ? 1 : 0;
+ ¶m.ed448, tbs, tbslen)
+ == 0
+ ? 1
+ : 0;
}
static const EVP_PKEY_METHOD ecx25519_s390x_pkey_meth = {
diff --git a/crypto/ec/ecx_s390x.c b/crypto/ec/ecx_s390x.c
index d424d6252d..4b9514084a 100644
--- a/crypto/ec/ecx_s390x.c
+++ b/crypto/ec/ecx_s390x.c
@@ -39,7 +39,7 @@ static void s390x_x25519_mod_p(unsigned char u[32])
c = (u_red[0] & 0x80) >> 7;
u_red[0] &= 0x7f;
constant_time_cond_swap_buff(0 - (unsigned char)c,
- u, u_red, sizeof(u_red));
+ u, u_red, sizeof(u_red));
}
static void s390x_x448_mod_p(unsigned char u[56])
@@ -71,12 +71,12 @@ static void s390x_x448_mod_p(unsigned char u[56])
}
constant_time_cond_swap_buff(0 - (unsigned char)c,
- u, u_red, sizeof(u_red));
+ u, u_red, sizeof(u_red));
}
int s390x_x25519_mul(unsigned char u_dst[32],
- const unsigned char u_src[32],
- const unsigned char d_src[32])
+ const unsigned char u_src[32],
+ const unsigned char d_src[32])
{
union {
struct {
@@ -108,8 +108,8 @@ int s390x_x25519_mul(unsigned char u_dst[32],
}
int s390x_x448_mul(unsigned char u_dst[56],
- const unsigned char u_src[56],
- const unsigned char d_src[56])
+ const unsigned char u_src[56],
+ const unsigned char d_src[56])
{
union {
struct {
@@ -144,10 +144,10 @@ int s390x_x448_mul(unsigned char u_dst[56],
}
int s390x_ed25519_mul(unsigned char x_dst[32],
- unsigned char y_dst[32],
- const unsigned char x_src[32],
- const unsigned char y_src[32],
- const unsigned char d_src[32])
+ unsigned char y_dst[32],
+ const unsigned char x_src[32],
+ const unsigned char y_src[32],
+ const unsigned char d_src[32])
{
union {
struct {
@@ -178,10 +178,10 @@ int s390x_ed25519_mul(unsigned char x_dst[32],
}
int s390x_ed448_mul(unsigned char x_dst[57],
- unsigned char y_dst[57],
- const unsigned char x_src[57],
- const unsigned char y_src[57],
- const unsigned char d_src[57])
+ unsigned char y_dst[57],
+ const unsigned char x_src[57],
+ const unsigned char y_src[57],
+ const unsigned char d_src[57])
{
union {
struct {
diff --git a/crypto/encode_decode/decoder_err.c b/crypto/encode_decode/decoder_err.c
index 88324a1d50..9e6556a146 100644
--- a/crypto/encode_decode/decoder_err.c
+++ b/crypto/encode_decode/decoder_err.c
@@ -15,13 +15,13 @@
#ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA OSSL_DECODER_str_reasons[] = {
- {ERR_PACK(ERR_LIB_OSSL_DECODER, 0, OSSL_DECODER_R_COULD_NOT_DECODE_OBJECT),
- "could not decode object"},
- {ERR_PACK(ERR_LIB_OSSL_DECODER, 0, OSSL_DECODER_R_DECODER_NOT_FOUND),
- "decoder not found"},
- {ERR_PACK(ERR_LIB_OSSL_DECODER, 0, OSSL_DECODER_R_MISSING_GET_PARAMS),
- "missing get params"},
- {0, NULL}
+ { ERR_PACK(ERR_LIB_OSSL_DECODER, 0, OSSL_DECODER_R_COULD_NOT_DECODE_OBJECT),
+ "could not decode object" },
+ { ERR_PACK(ERR_LIB_OSSL_DECODER, 0, OSSL_DECODER_R_DECODER_NOT_FOUND),
+ "decoder not found" },
+ { ERR_PACK(ERR_LIB_OSSL_DECODER, 0, OSSL_DECODER_R_MISSING_GET_PARAMS),
+ "missing get params" },
+ { 0, NULL }
};
#endif
diff --git a/crypto/encode_decode/decoder_lib.c b/crypto/encode_decode/decoder_lib.c
index 339fd5d192..e827659c9a 100644
--- a/crypto/encode_decode/decoder_lib.c
+++ b/crypto/encode_decode/decoder_lib.c
@@ -58,9 +58,9 @@ int OSSL_DECODER_from_bio(OSSL_DECODER_CTX *ctx, BIO *in)
if (OSSL_DECODER_CTX_get_num_decoders(ctx) == 0) {
ERR_raise_data(ERR_LIB_OSSL_DECODER, OSSL_DECODER_R_DECODER_NOT_FOUND,
- "No decoders were found. For standard decoders you need "
- "at least one of the default or base providers "
- "available. Did you forget to load them?");
+ "No decoders were found. For standard decoders you need "
+ "at least one of the default or base providers "
+ "available. Did you forget to load them?");
return 0;
}
@@ -84,14 +84,16 @@ int OSSL_DECODER_from_bio(OSSL_DECODER_CTX *ctx, BIO *in)
if (!data.flag_construct_called) {
const char *spaces
= ctx->start_input_type != NULL && ctx->input_structure != NULL
- ? " " : "";
+ ? " "
+ : "";
const char *input_type_label
= ctx->start_input_type != NULL ? "Input type: " : "";
const char *input_structure_label
= ctx->input_structure != NULL ? "Input structure: " : "";
const char *comma
= ctx->start_input_type != NULL && ctx->input_structure != NULL
- ? ", " : "";
+ ? ", "
+ : "";
const char *input_type
= ctx->start_input_type != NULL ? ctx->start_input_type : "";
const char *input_structure
@@ -100,9 +102,9 @@ int OSSL_DECODER_from_bio(OSSL_DECODER_CTX *ctx, BIO *in)
if (ERR_peek_last_error() == lasterr || ERR_peek_error() == 0)
/* Prevent spurious decoding error but add at least something */
ERR_raise_data(ERR_LIB_OSSL_DECODER, ERR_R_UNSUPPORTED,
- "No supported data to decode. %s%s%s%s%s%s",
- spaces, input_type_label, input_type, comma,
- input_structure_label, input_structure);
+ "No supported data to decode. %s%s%s%s%s%s",
+ spaces, input_type_label, input_type, comma,
+ input_structure_label, input_structure);
ok = 0;
}
@@ -143,7 +145,7 @@ int OSSL_DECODER_from_fp(OSSL_DECODER_CTX *ctx, FILE *fp)
#endif
int OSSL_DECODER_from_data(OSSL_DECODER_CTX *ctx, const unsigned char **pdata,
- size_t *pdata_len)
+ size_t *pdata_len)
{
BIO *membio;
int ret = 0;
@@ -184,7 +186,7 @@ int OSSL_DECODER_CTX_set_selection(OSSL_DECODER_CTX *ctx, int selection)
}
int OSSL_DECODER_CTX_set_input_type(OSSL_DECODER_CTX *ctx,
- const char *input_type)
+ const char *input_type)
{
if (ctx == NULL) {
ERR_raise(ERR_LIB_OSSL_DECODER, ERR_R_PASSED_NULL_PARAMETER);
@@ -205,7 +207,7 @@ int OSSL_DECODER_CTX_set_input_type(OSSL_DECODER_CTX *ctx,
}
int OSSL_DECODER_CTX_set_input_structure(OSSL_DECODER_CTX *ctx,
- const char *input_structure)
+ const char *input_structure)
{
if (ctx == NULL) {
ERR_raise(ERR_LIB_OSSL_DECODER, ERR_R_PASSED_NULL_PARAMETER);
@@ -227,7 +229,7 @@ int OSSL_DECODER_CTX_set_input_structure(OSSL_DECODER_CTX *ctx,
OSSL_DECODER_INSTANCE *
ossl_decoder_instance_new_forprov(OSSL_DECODER *decoder, void *provctx,
- const char *input_structure)
+ const char *input_structure)
{
void *decoderctx;
@@ -242,9 +244,8 @@ ossl_decoder_instance_new_forprov(OSSL_DECODER *decoder, void *provctx,
if (input_structure != NULL && decoder->set_ctx_params != NULL) {
OSSL_PARAM params[] = { OSSL_PARAM_END, OSSL_PARAM_END };
- params[0] =
- OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_STRUCTURE,
- (char *)input_structure, 0);
+ params[0] = OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_STRUCTURE,
+ (char *)input_structure, 0);
if (!decoder->set_ctx_params(decoderctx, params)) {
decoder->freectx(decoderctx);
return 0;
@@ -254,7 +255,7 @@ ossl_decoder_instance_new_forprov(OSSL_DECODER *decoder, void *provctx,
}
OSSL_DECODER_INSTANCE *ossl_decoder_instance_new(OSSL_DECODER *decoder,
- void *decoderctx)
+ void *decoderctx)
{
OSSL_DECODER_INSTANCE *decoder_inst = NULL;
const OSSL_PROVIDER *prov;
@@ -275,8 +276,8 @@ OSSL_DECODER_INSTANCE *ossl_decoder_instance_new(OSSL_DECODER *decoder,
props = ossl_decoder_parsed_properties(decoder);
if (props == NULL) {
ERR_raise_data(ERR_LIB_OSSL_DECODER, ERR_R_INVALID_PROPERTY_DEFINITION,
- "there are no property definitions with decoder %s",
- OSSL_DECODER_get0_name(decoder));
+ "there are no property definitions with decoder %s",
+ OSSL_DECODER_get0_name(decoder));
goto err;
}
@@ -286,10 +287,10 @@ OSSL_DECODER_INSTANCE *ossl_decoder_instance_new(OSSL_DECODER *decoder,
decoder_inst->input_type_id = 0;
if (decoder_inst->input_type == NULL) {
ERR_raise_data(ERR_LIB_OSSL_DECODER, ERR_R_INVALID_PROPERTY_DEFINITION,
- "the mandatory 'input' property is missing "
- "for decoder %s (properties: %s)",
- OSSL_DECODER_get0_name(decoder),
- OSSL_DECODER_get0_properties(decoder));
+ "the mandatory 'input' property is missing "
+ "for decoder %s (properties: %s)",
+ OSSL_DECODER_get0_name(decoder),
+ OSSL_DECODER_get0_properties(decoder));
goto err;
}
@@ -307,7 +308,7 @@ OSSL_DECODER_INSTANCE *ossl_decoder_instance_new(OSSL_DECODER *decoder,
decoder_inst->decoder = decoder;
decoder_inst->decoderctx = decoderctx;
return decoder_inst;
- err:
+err:
ossl_decoder_instance_free(decoder_inst);
return NULL;
}
@@ -350,7 +351,7 @@ OSSL_DECODER_INSTANCE *ossl_decoder_instance_dup(const OSSL_DECODER_INSTANCE *sr
return dest;
- err:
+err:
OPENSSL_free(dest);
return NULL;
}
@@ -366,27 +367,28 @@ int ossl_decoder_ctx_get_harderr(const OSSL_DECODER_CTX *ctx)
}
int ossl_decoder_ctx_add_decoder_inst(OSSL_DECODER_CTX *ctx,
- OSSL_DECODER_INSTANCE *di)
+ OSSL_DECODER_INSTANCE *di)
{
int ok;
if (ctx->decoder_insts == NULL
- && (ctx->decoder_insts =
- sk_OSSL_DECODER_INSTANCE_new_null()) == NULL) {
+ && (ctx->decoder_insts = sk_OSSL_DECODER_INSTANCE_new_null()) == NULL) {
ERR_raise(ERR_LIB_OSSL_DECODER, ERR_R_CRYPTO_LIB);
return 0;
}
ok = (sk_OSSL_DECODER_INSTANCE_push(ctx->decoder_insts, di) > 0);
if (ok) {
- OSSL_TRACE_BEGIN(DECODER) {
+ OSSL_TRACE_BEGIN(DECODER)
+ {
BIO_printf(trc_out,
- "(ctx %p) Added decoder instance %p for decoder %p\n"
- " %s with %s\n",
- (void *)ctx, (void *)di, (void *)di->decoder,
- OSSL_DECODER_get0_name(di->decoder),
- OSSL_DECODER_get0_properties(di->decoder));
- } OSSL_TRACE_END(DECODER);
+ "(ctx %p) Added decoder instance %p for decoder %p\n"
+ " %s with %s\n",
+ (void *)ctx, (void *)di, (void *)di->decoder,
+ OSSL_DECODER_get0_name(di->decoder),
+ OSSL_DECODER_get0_properties(di->decoder));
+ }
+ OSSL_TRACE_END(DECODER);
}
return ok;
}
@@ -412,8 +414,7 @@ int OSSL_DECODER_CTX_add_decoder(OSSL_DECODER_CTX *ctx, OSSL_DECODER *decoder)
provctx = OSSL_PROVIDER_get0_provider_ctx(prov);
if ((decoderctx = decoder->newctx(provctx)) == NULL
- || (decoder_inst =
- ossl_decoder_instance_new(decoder, decoderctx)) == NULL)
+ || (decoder_inst = ossl_decoder_instance_new(decoder, decoderctx)) == NULL)
goto err;
/* Avoid double free of decoderctx on further errors */
decoderctx = NULL;
@@ -422,7 +423,7 @@ int OSSL_DECODER_CTX_add_decoder(OSSL_DECODER_CTX *ctx, OSSL_DECODER *decoder)
goto err;
return 1;
- err:
+err:
ossl_decoder_instance_free(decoder_inst);
if (decoderctx != NULL)
decoder->freectx(decoderctx);
@@ -438,9 +439,10 @@ struct collect_extra_decoder_data_st {
* 0 to check that the decoder's input type is the same as the decoder name
* 1 to check that the decoder's input type differs from the decoder name
*/
- enum { IS_SAME = 0, IS_DIFFERENT = 1 } type_check;
+ enum { IS_SAME = 0,
+ IS_DIFFERENT = 1 } type_check;
int w_prev_start, w_prev_end; /* "previous" decoders */
- int w_new_start, w_new_end; /* "new" decoders */
+ int w_new_start, w_new_end; /* "new" decoders */
};
DEFINE_STACK_OF(OSSL_DECODER)
@@ -450,7 +452,7 @@ static void collect_all_decoders(OSSL_DECODER *decoder, void *arg)
STACK_OF(OSSL_DECODER) *skdecoders = arg;
if (OSSL_DECODER_up_ref(decoder)
- && !sk_OSSL_DECODER_push(skdecoders, decoder))
+ && !sk_OSSL_DECODER_push(skdecoders, decoder))
OSSL_DECODER_free(decoder);
}
@@ -465,14 +467,16 @@ static void collect_extra_decoder(OSSL_DECODER *decoder, void *arg)
void *decoderctx = NULL;
OSSL_DECODER_INSTANCE *di = NULL;
- OSSL_TRACE_BEGIN(DECODER) {
+ OSSL_TRACE_BEGIN(DECODER)
+ {
BIO_printf(trc_out,
- "(ctx %p) [%d] Checking out decoder %p:\n"
- " %s with %s\n",
- (void *)data->ctx, data->type_check, (void *)decoder,
- OSSL_DECODER_get0_name(decoder),
- OSSL_DECODER_get0_properties(decoder));
- } OSSL_TRACE_END(DECODER);
+ "(ctx %p) [%d] Checking out decoder %p:\n"
+ " %s with %s\n",
+ (void *)data->ctx, data->type_check, (void *)decoder,
+ OSSL_DECODER_get0_name(decoder),
+ OSSL_DECODER_get0_properties(decoder));
+ }
+ OSSL_TRACE_END(DECODER);
/*
* Check that we don't already have this decoder in our stack,
@@ -480,15 +484,16 @@ static void collect_extra_decoder(OSSL_DECODER *decoder, void *arg)
* we have added in the current window.
*/
for (j = data->w_prev_start; j < data->w_new_end; j++) {
- OSSL_DECODER_INSTANCE *check_inst =
- sk_OSSL_DECODER_INSTANCE_value(data->ctx->decoder_insts, j);
+ OSSL_DECODER_INSTANCE *check_inst = sk_OSSL_DECODER_INSTANCE_value(data->ctx->decoder_insts, j);
if (decoder->base.algodef == check_inst->decoder->base.algodef) {
/* We found it, so don't do anything more */
- OSSL_TRACE_BEGIN(DECODER) {
+ OSSL_TRACE_BEGIN(DECODER)
+ {
BIO_printf(trc_out,
- " REJECTED: already exists in the chain\n");
- } OSSL_TRACE_END(DECODER);
+ " REJECTED: already exists in the chain\n");
+ }
+ OSSL_TRACE_END(DECODER);
return;
}
}
@@ -501,9 +506,8 @@ static void collect_extra_decoder(OSSL_DECODER *decoder, void *arg)
OSSL_PARAM params[] = { OSSL_PARAM_END, OSSL_PARAM_END };
const char *str = data->ctx->input_structure;
- params[0] =
- OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_STRUCTURE,
- (char *)str, 0);
+ params[0] = OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_STRUCTURE,
+ (char *)str, 0);
if (!decoder->set_ctx_params(decoderctx, params)) {
decoder->freectx(decoderctx);
return;
@@ -519,26 +523,30 @@ static void collect_extra_decoder(OSSL_DECODER *decoder, void *arg)
case IS_SAME:
/* If it differs, this is not a decoder to add for now. */
if (!ossl_decoder_fast_is_a(decoder,
- OSSL_DECODER_INSTANCE_get_input_type(di),
- &di->input_type_id)) {
+ OSSL_DECODER_INSTANCE_get_input_type(di),
+ &di->input_type_id)) {
ossl_decoder_instance_free(di);
- OSSL_TRACE_BEGIN(DECODER) {
+ OSSL_TRACE_BEGIN(DECODER)
+ {
BIO_printf(trc_out,
- " REJECTED: input type doesn't match output type\n");
- } OSSL_TRACE_END(DECODER);
+ " REJECTED: input type doesn't match output type\n");
+ }
+ OSSL_TRACE_END(DECODER);
return;
}
break;
case IS_DIFFERENT:
/* If it's the same, this is not a decoder to add for now. */
if (ossl_decoder_fast_is_a(decoder,
- OSSL_DECODER_INSTANCE_get_input_type(di),
- &di->input_type_id)) {
+ OSSL_DECODER_INSTANCE_get_input_type(di),
+ &di->input_type_id)) {
ossl_decoder_instance_free(di);
- OSSL_TRACE_BEGIN(DECODER) {
+ OSSL_TRACE_BEGIN(DECODER)
+ {
BIO_printf(trc_out,
- " REJECTED: input type matches output type\n");
- } OSSL_TRACE_END(DECODER);
+ " REJECTED: input type matches output type\n");
+ }
+ OSSL_TRACE_END(DECODER);
return;
}
break;
@@ -558,7 +566,7 @@ static void collect_extra_decoder(OSSL_DECODER *decoder, void *arg)
}
static int decoder_sk_cmp(const OSSL_DECODER_INSTANCE *const *a,
- const OSSL_DECODER_INSTANCE *const *b)
+ const OSSL_DECODER_INSTANCE *const *b)
{
if ((*a)->score == (*b)->score)
return (*a)->order - (*b)->order;
@@ -566,7 +574,7 @@ static int decoder_sk_cmp(const OSSL_DECODER_INSTANCE *const *a,
}
int OSSL_DECODER_CTX_add_extra(OSSL_DECODER_CTX *ctx,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_LIB_CTX *libctx, const char *propq)
{
/*
* This function goes through existing decoder methods in
@@ -614,11 +622,12 @@ int OSSL_DECODER_CTX_add_extra(OSSL_DECODER_CTX *ctx,
if (ctx->decoder_insts == NULL)
return 1;
- OSSL_TRACE_BEGIN(DECODER) {
+ OSSL_TRACE_BEGIN(DECODER)
+ {
BIO_printf(trc_out, "(ctx %p) Looking for extra decoders\n",
- (void *)ctx);
- } OSSL_TRACE_END(DECODER);
-
+ (void *)ctx);
+ }
+ OSSL_TRACE_END(DECODER);
skdecoders = sk_OSSL_DECODER_new_null();
if (skdecoders == NULL) {
@@ -637,8 +646,7 @@ int OSSL_DECODER_CTX_add_extra(OSSL_DECODER_CTX *ctx,
int num_decoder_insts = sk_OSSL_DECODER_INSTANCE_num(ctx->decoder_insts);
int i;
OSSL_DECODER_INSTANCE *di;
- sk_OSSL_DECODER_INSTANCE_compfunc old_cmp =
- sk_OSSL_DECODER_INSTANCE_set_cmp_func(ctx->decoder_insts, decoder_sk_cmp);
+ sk_OSSL_DECODER_INSTANCE_compfunc old_cmp = sk_OSSL_DECODER_INSTANCE_set_cmp_func(ctx->decoder_insts, decoder_sk_cmp);
for (i = 0; i < num_decoder_insts; i++) {
di = sk_OSSL_DECODER_INSTANCE_value(ctx->decoder_insts, i);
@@ -665,11 +673,10 @@ int OSSL_DECODER_CTX_add_extra(OSSL_DECODER_CTX *ctx,
* 1. All decoders that a different name than their input type.
*/
for (data.type_check = IS_SAME;
- data.type_check <= IS_DIFFERENT;
- data.type_check++) {
+ data.type_check <= IS_DIFFERENT;
+ data.type_check++) {
for (i = data.w_prev_start; i < data.w_prev_end; i++) {
- OSSL_DECODER_INSTANCE *decoder_inst =
- sk_OSSL_DECODER_INSTANCE_value(ctx->decoder_insts, i);
+ OSSL_DECODER_INSTANCE *decoder_inst = sk_OSSL_DECODER_INSTANCE_value(ctx->decoder_insts, i);
data.output_type
= OSSL_DECODER_INSTANCE_get_input_type(decoder_inst);
@@ -678,7 +685,7 @@ int OSSL_DECODER_CTX_add_extra(OSSL_DECODER_CTX *ctx,
for (j = 0; j < numdecoders; j++)
collect_extra_decoder(sk_OSSL_DECODER_value(skdecoders, j),
- &data);
+ &data);
}
}
/* How many were added in this iteration */
@@ -703,7 +710,7 @@ int OSSL_DECODER_CTX_get_num_decoders(OSSL_DECODER_CTX *ctx)
}
int OSSL_DECODER_CTX_set_construct(OSSL_DECODER_CTX *ctx,
- OSSL_DECODER_CONSTRUCT *construct)
+ OSSL_DECODER_CONSTRUCT *construct)
{
if (ctx == NULL) {
ERR_raise(ERR_LIB_OSSL_DECODER, ERR_R_PASSED_NULL_PARAMETER);
@@ -720,7 +727,7 @@ int OSSL_DECODER_CTX_set_construct(OSSL_DECODER_CTX *ctx,
}
int OSSL_DECODER_CTX_set_construct_data(OSSL_DECODER_CTX *ctx,
- void *construct_data)
+ void *construct_data)
{
if (ctx == NULL) {
ERR_raise(ERR_LIB_OSSL_DECODER, ERR_R_PASSED_NULL_PARAMETER);
@@ -737,7 +744,7 @@ int OSSL_DECODER_CTX_set_construct_data(OSSL_DECODER_CTX *ctx,
}
int OSSL_DECODER_CTX_set_cleanup(OSSL_DECODER_CTX *ctx,
- OSSL_DECODER_CLEANUP *cleanup)
+ OSSL_DECODER_CLEANUP *cleanup)
{
if (ctx == NULL) {
ERR_raise(ERR_LIB_OSSL_DECODER, ERR_R_PASSED_NULL_PARAMETER);
@@ -777,8 +784,8 @@ OSSL_DECODER_CTX_get_cleanup(OSSL_DECODER_CTX *ctx)
}
int OSSL_DECODER_export(OSSL_DECODER_INSTANCE *decoder_inst,
- void *reference, size_t reference_sz,
- OSSL_CALLBACK *export_cb, void *export_cbarg)
+ void *reference, size_t reference_sz,
+ OSSL_CALLBACK *export_cb, void *export_cbarg)
{
OSSL_DECODER *decoder = NULL;
void *decoderctx = NULL;
@@ -792,7 +799,7 @@ int OSSL_DECODER_export(OSSL_DECODER_INSTANCE *decoder_inst,
decoder = OSSL_DECODER_INSTANCE_get_decoder(decoder_inst);
decoderctx = OSSL_DECODER_INSTANCE_get_decoder_ctx(decoder_inst);
return decoder->export_object(decoderctx, reference, reference_sz,
- export_cb, export_cbarg);
+ export_cb, export_cbarg);
}
OSSL_DECODER *
@@ -821,7 +828,7 @@ OSSL_DECODER_INSTANCE_get_input_type(OSSL_DECODER_INSTANCE *decoder_inst)
const char *
OSSL_DECODER_INSTANCE_get_input_structure(OSSL_DECODER_INSTANCE *decoder_inst,
- int *was_set)
+ int *was_set)
{
if (decoder_inst == NULL)
return NULL;
@@ -858,49 +865,53 @@ static int decoder_process(const OSSL_PARAM params[], void *arg)
new_data.recursion = data->recursion + 1;
#define LEVEL_STR ">>>>>>>>>>>>>>>>"
-#define LEVEL ((size_t)new_data.recursion < sizeof(LEVEL_STR) \
- ? &LEVEL_STR[sizeof(LEVEL_STR) - new_data.recursion - 1] \
- : LEVEL_STR "...")
+#define LEVEL ((size_t)new_data.recursion < sizeof(LEVEL_STR) \
+ ? &LEVEL_STR[sizeof(LEVEL_STR) - new_data.recursion - 1] \
+ : LEVEL_STR "...")
if (params == NULL) {
/* First iteration, where we prepare for what is to come */
- OSSL_TRACE_BEGIN(DECODER) {
+ OSSL_TRACE_BEGIN(DECODER)
+ {
BIO_printf(trc_out,
- "(ctx %p) starting to walk the decoder chain\n",
- (void *)new_data.ctx);
- } OSSL_TRACE_END(DECODER);
+ "(ctx %p) starting to walk the decoder chain\n",
+ (void *)new_data.ctx);
+ }
+ OSSL_TRACE_END(DECODER);
- data->current_decoder_inst_index =
- OSSL_DECODER_CTX_get_num_decoders(ctx);
+ data->current_decoder_inst_index = OSSL_DECODER_CTX_get_num_decoders(ctx);
bio = data->bio;
} else {
const OSSL_PARAM *p;
const char *trace_data_structure;
- decoder_inst =
- sk_OSSL_DECODER_INSTANCE_value(ctx->decoder_insts,
- data->current_decoder_inst_index);
+ decoder_inst = sk_OSSL_DECODER_INSTANCE_value(ctx->decoder_insts,
+ data->current_decoder_inst_index);
decoder = OSSL_DECODER_INSTANCE_get_decoder(decoder_inst);
data->flag_construct_called = 0;
if (ctx->construct != NULL) {
int rv;
- OSSL_TRACE_BEGIN(DECODER) {
+ OSSL_TRACE_BEGIN(DECODER)
+ {
BIO_printf(trc_out,
- "(ctx %p) %s Running constructor\n",
- (void *)new_data.ctx, LEVEL);
- } OSSL_TRACE_END(DECODER);
+ "(ctx %p) %s Running constructor\n",
+ (void *)new_data.ctx, LEVEL);
+ }
+ OSSL_TRACE_END(DECODER);
rv = ctx->construct(decoder_inst, params, ctx->construct_data);
- OSSL_TRACE_BEGIN(DECODER) {
+ OSSL_TRACE_BEGIN(DECODER)
+ {
BIO_printf(trc_out,
- "(ctx %p) %s Running constructor => %d\n",
- (void *)new_data.ctx, LEVEL, rv);
- } OSSL_TRACE_END(DECODER);
+ "(ctx %p) %s Running constructor => %d\n",
+ (void *)new_data.ctx, LEVEL, rv);
+ }
+ OSSL_TRACE_END(DECODER);
ok = (rv > 0);
if (ok) {
@@ -970,15 +981,18 @@ static int decoder_process(const OSSL_PARAM params[], void *arg)
&& OPENSSL_strcasecmp(data_structure, "type-specific") == 0)
data_structure = NULL;
- OSSL_TRACE_BEGIN(DECODER) {
+ OSSL_TRACE_BEGIN(DECODER)
+ {
BIO_printf(trc_out,
- "(ctx %p) %s incoming from previous decoder (%p):\n"
- " data type: %s, data structure: %s%s\n",
- (void *)new_data.ctx, LEVEL, (void *)decoder,
- data_type, trace_data_structure,
- (trace_data_structure == data_structure
- ? "" : " (dropped)"));
- } OSSL_TRACE_END(DECODER);
+ "(ctx %p) %s incoming from previous decoder (%p):\n"
+ " data type: %s, data structure: %s%s\n",
+ (void *)new_data.ctx, LEVEL, (void *)decoder,
+ data_type, trace_data_structure,
+ (trace_data_structure == data_structure
+ ? ""
+ : " (dropped)"));
+ }
+ OSSL_TRACE_END(DECODER);
}
/*
@@ -999,30 +1013,27 @@ static int decoder_process(const OSSL_PARAM params[], void *arg)
}
for (i = data->current_decoder_inst_index; i-- > 0;) {
- OSSL_DECODER_INSTANCE *new_decoder_inst =
- sk_OSSL_DECODER_INSTANCE_value(ctx->decoder_insts, i);
- OSSL_DECODER *new_decoder =
- OSSL_DECODER_INSTANCE_get_decoder(new_decoder_inst);
+ OSSL_DECODER_INSTANCE *new_decoder_inst = sk_OSSL_DECODER_INSTANCE_value(ctx->decoder_insts, i);
+ OSSL_DECODER *new_decoder = OSSL_DECODER_INSTANCE_get_decoder(new_decoder_inst);
const char *new_decoder_name = NULL;
- void *new_decoderctx =
- OSSL_DECODER_INSTANCE_get_decoder_ctx(new_decoder_inst);
- const char *new_input_type =
- OSSL_DECODER_INSTANCE_get_input_type(new_decoder_inst);
- int n_i_s_was_set = 0; /* We don't care here */
- const char *new_input_structure =
- OSSL_DECODER_INSTANCE_get_input_structure(new_decoder_inst,
- &n_i_s_was_set);
-
- OSSL_TRACE_BEGIN(DECODER) {
+ void *new_decoderctx = OSSL_DECODER_INSTANCE_get_decoder_ctx(new_decoder_inst);
+ const char *new_input_type = OSSL_DECODER_INSTANCE_get_input_type(new_decoder_inst);
+ int n_i_s_was_set = 0; /* We don't care here */
+ const char *new_input_structure = OSSL_DECODER_INSTANCE_get_input_structure(new_decoder_inst,
+ &n_i_s_was_set);
+
+ OSSL_TRACE_BEGIN(DECODER)
+ {
new_decoder_name = OSSL_DECODER_get0_name(new_decoder);
BIO_printf(trc_out,
- "(ctx %p) %s [%u] Considering decoder instance %p (decoder %p):\n"
- " %s with %s\n",
- (void *)new_data.ctx, LEVEL, (unsigned int)i,
- (void *)new_decoder_inst, (void *)new_decoder,
- new_decoder_name,
- OSSL_DECODER_get0_properties(new_decoder));
- } OSSL_TRACE_END(DECODER);
+ "(ctx %p) %s [%u] Considering decoder instance %p (decoder %p):\n"
+ " %s with %s\n",
+ (void *)new_data.ctx, LEVEL, (unsigned int)i,
+ (void *)new_decoder_inst, (void *)new_decoder,
+ new_decoder_name,
+ OSSL_DECODER_get0_properties(new_decoder));
+ }
+ OSSL_TRACE_END(DECODER);
/*
* If |decoder| is NULL, it means we've just started, and the caller
@@ -1031,12 +1042,14 @@ static int decoder_process(const OSSL_PARAM params[], void *arg)
*/
if (decoder == NULL && ctx->start_input_type != NULL
&& OPENSSL_strcasecmp(ctx->start_input_type, new_input_type) != 0) {
- OSSL_TRACE_BEGIN(DECODER) {
+ OSSL_TRACE_BEGIN(DECODER)
+ {
BIO_printf(trc_out,
- "(ctx %p) %s [%u] the start input type '%s' doesn't match the input type of the considered decoder, skipping...\n",
- (void *)new_data.ctx, LEVEL, (unsigned int)i,
- ctx->start_input_type);
- } OSSL_TRACE_END(DECODER);
+ "(ctx %p) %s [%u] the start input type '%s' doesn't match the input type of the considered decoder, skipping...\n",
+ (void *)new_data.ctx, LEVEL, (unsigned int)i,
+ ctx->start_input_type);
+ }
+ OSSL_TRACE_END(DECODER);
continue;
}
@@ -1046,14 +1059,15 @@ static int decoder_process(const OSSL_PARAM params[], void *arg)
* |new_input_type| holds the value of the "input-type" parameter
* for the decoder we're currently considering.
*/
- if (decoder != NULL && !ossl_decoder_fast_is_a(decoder, new_input_type,
- &new_decoder_inst->input_type_id)) {
- OSSL_TRACE_BEGIN(DECODER) {
+ if (decoder != NULL && !ossl_decoder_fast_is_a(decoder, new_input_type, &new_decoder_inst->input_type_id)) {
+ OSSL_TRACE_BEGIN(DECODER)
+ {
BIO_printf(trc_out,
- "(ctx %p) %s [%u] the input type doesn't match the name of the previous decoder (%p), skipping...\n",
- (void *)new_data.ctx, LEVEL, (unsigned int)i,
- (void *)decoder);
- } OSSL_TRACE_END(DECODER);
+ "(ctx %p) %s [%u] the input type doesn't match the name of the previous decoder (%p), skipping...\n",
+ (void *)new_data.ctx, LEVEL, (unsigned int)i,
+ (void *)decoder);
+ }
+ OSSL_TRACE_END(DECODER);
continue;
}
@@ -1062,11 +1076,13 @@ static int decoder_process(const OSSL_PARAM params[], void *arg)
* if that matches the decoder we're currently considering.
*/
if (data_type != NULL && !OSSL_DECODER_is_a(new_decoder, data_type)) {
- OSSL_TRACE_BEGIN(DECODER) {
+ OSSL_TRACE_BEGIN(DECODER)
+ {
BIO_printf(trc_out,
- "(ctx %p) %s [%u] the previous decoder's data type doesn't match the name of the considered decoder, skipping...\n",
- (void *)new_data.ctx, LEVEL, (unsigned int)i);
- } OSSL_TRACE_END(DECODER);
+ "(ctx %p) %s [%u] the previous decoder's data type doesn't match the name of the considered decoder, skipping...\n",
+ (void *)new_data.ctx, LEVEL, (unsigned int)i);
+ }
+ OSSL_TRACE_END(DECODER);
continue;
}
@@ -1078,12 +1094,15 @@ static int decoder_process(const OSSL_PARAM params[], void *arg)
if (data_structure != NULL
&& (new_input_structure == NULL
|| OPENSSL_strcasecmp(data_structure,
- new_input_structure) != 0)) {
- OSSL_TRACE_BEGIN(DECODER) {
+ new_input_structure)
+ != 0)) {
+ OSSL_TRACE_BEGIN(DECODER)
+ {
BIO_printf(trc_out,
- "(ctx %p) %s [%u] the previous decoder's data structure doesn't match the input structure of the considered decoder, skipping...\n",
- (void *)new_data.ctx, LEVEL, (unsigned int)i);
- } OSSL_TRACE_END(DECODER);
+ "(ctx %p) %s [%u] the previous decoder's data structure doesn't match the input structure of the considered decoder, skipping...\n",
+ (void *)new_data.ctx, LEVEL, (unsigned int)i);
+ }
+ OSSL_TRACE_END(DECODER);
continue;
}
@@ -1098,12 +1117,15 @@ static int decoder_process(const OSSL_PARAM params[], void *arg)
&& new_input_structure != NULL) {
data->flag_input_structure_checked = 1;
if (OPENSSL_strcasecmp(new_input_structure,
- ctx->input_structure) != 0) {
- OSSL_TRACE_BEGIN(DECODER) {
+ ctx->input_structure)
+ != 0) {
+ OSSL_TRACE_BEGIN(DECODER)
+ {
BIO_printf(trc_out,
- "(ctx %p) %s [%u] the previous decoder's data structure doesn't match the input structure given by the user, skipping...\n",
- (void *)new_data.ctx, LEVEL, (unsigned int)i);
- } OSSL_TRACE_END(DECODER);
+ "(ctx %p) %s [%u] the previous decoder's data structure doesn't match the input structure given by the user, skipping...\n",
+ (void *)new_data.ctx, LEVEL, (unsigned int)i);
+ }
+ OSSL_TRACE_END(DECODER);
continue;
}
}
@@ -1123,12 +1145,14 @@ static int decoder_process(const OSSL_PARAM params[], void *arg)
goto end;
/* Recurse */
- OSSL_TRACE_BEGIN(DECODER) {
+ OSSL_TRACE_BEGIN(DECODER)
+ {
BIO_printf(trc_out,
- "(ctx %p) %s [%u] Running decoder instance %s (%p)\n",
- (void *)new_data.ctx, LEVEL, (unsigned int)i,
- new_decoder_name, (void *)new_decoder_inst);
- } OSSL_TRACE_END(DECODER);
+ "(ctx %p) %s [%u] Running decoder instance %s (%p)\n",
+ (void *)new_data.ctx, LEVEL, (unsigned int)i,
+ new_decoder_name, (void *)new_decoder_inst);
+ }
+ OSSL_TRACE_END(DECODER);
/*
* We only care about errors reported from decoder implementations
@@ -1140,20 +1164,22 @@ static int decoder_process(const OSSL_PARAM params[], void *arg)
new_data.flag_input_structure_checked
= data->flag_input_structure_checked;
ok = new_decoder->decode(new_decoderctx, cbio,
- new_data.ctx->selection,
- decoder_process, &new_data,
- ossl_pw_passphrase_callback_dec,
- &new_data.ctx->pwdata);
+ new_data.ctx->selection,
+ decoder_process, &new_data,
+ ossl_pw_passphrase_callback_dec,
+ &new_data.ctx->pwdata);
- OSSL_TRACE_BEGIN(DECODER) {
+ OSSL_TRACE_BEGIN(DECODER)
+ {
BIO_printf(trc_out,
- "(ctx %p) %s [%u] Running decoder instance %s (%p) => %d"
- " (recursed further: %s, construct called: %s)\n",
- (void *)new_data.ctx, LEVEL, (unsigned int)i,
- new_decoder_name, (void *)new_decoder_inst, ok,
- new_data.flag_next_level_called ? "yes" : "no",
- new_data.flag_construct_called ? "yes" : "no");
- } OSSL_TRACE_END(DECODER);
+ "(ctx %p) %s [%u] Running decoder instance %s (%p) => %d"
+ " (recursed further: %s, construct called: %s)\n",
+ (void *)new_data.ctx, LEVEL, (unsigned int)i,
+ new_decoder_name, (void *)new_decoder_inst, ok,
+ new_data.flag_next_level_called ? "yes" : "no",
+ new_data.flag_construct_called ? "yes" : "no");
+ }
+ OSSL_TRACE_END(DECODER);
data->flag_construct_called = new_data.flag_construct_called;
@@ -1172,7 +1198,7 @@ static int decoder_process(const OSSL_PARAM params[], void *arg)
break;
}
- end:
+end:
ossl_core_bio_free(cbio);
BIO_free(new_data.bio);
ctx->start_input_type = start_input_type;
diff --git a/crypto/encode_decode/decoder_meth.c b/crypto/encode_decode/decoder_meth.c
index 8043d7a074..4d460af1c2 100644
--- a/crypto/encode_decode/decoder_meth.c
+++ b/crypto/encode_decode/decoder_meth.c
@@ -77,9 +77,9 @@ void OSSL_DECODER_free(OSSL_DECODER *decoder)
/* Data to be passed through ossl_method_construct() */
struct decoder_data_st {
OSSL_LIB_CTX *libctx;
- int id; /* For get_decoder_from_store() */
- const char *names; /* For get_decoder_from_store() */
- const char *propquery; /* For get_decoder_from_store() */
+ int id; /* For get_decoder_from_store() */
+ const char *names; /* For get_decoder_from_store() */
+ const char *propquery; /* For get_decoder_from_store() */
OSSL_METHOD_STORE *tmp_store; /* For get_tmp_decoder_store() */
@@ -137,7 +137,7 @@ static int unreserve_decoder_store(void *store, void *data)
/* Get decoder methods from a store, or put one in */
static void *get_decoder_from_store(void *store, const OSSL_PROVIDER **prov,
- void *data)
+ void *data)
{
struct decoder_data_st *methdata = data;
void *method = NULL;
@@ -172,9 +172,9 @@ static void *get_decoder_from_store(void *store, const OSSL_PROVIDER **prov,
}
static int put_decoder_in_store(void *store, void *method,
- const OSSL_PROVIDER *prov,
- const char *names, const char *propdef,
- void *data)
+ const OSSL_PROVIDER *prov,
+ const char *names, const char *propdef,
+ void *data)
{
struct decoder_data_st *methdata = data;
OSSL_NAMEMAP *namemap;
@@ -201,13 +201,13 @@ static int put_decoder_in_store(void *store, void *method,
return 0;
return ossl_method_store_add(store, prov, id, propdef, method,
- ossl_decoder_up_ref,
- ossl_decoder_free);
+ ossl_decoder_up_ref,
+ ossl_decoder_free);
}
/* Create and populate a decoder method */
void *ossl_decoder_from_algorithm(int id, const OSSL_ALGORITHM *algodef,
- OSSL_PROVIDER *prov)
+ OSSL_PROVIDER *prov)
{
OSSL_DECODER *decoder = NULL;
const OSSL_DISPATCH *fns = algodef->implementation;
@@ -222,7 +222,8 @@ void *ossl_decoder_from_algorithm(int id, const OSSL_ALGORITHM *algodef,
}
decoder->base.algodef = algodef;
if ((decoder->base.parsed_propdef
- = ossl_parse_property(libctx, algodef->property_definition)) == NULL) {
+ = ossl_parse_property(libctx, algodef->property_definition))
+ == NULL) {
OSSL_DECODER_free(decoder);
return NULL;
}
@@ -239,28 +240,23 @@ void *ossl_decoder_from_algorithm(int id, const OSSL_ALGORITHM *algodef,
break;
case OSSL_FUNC_DECODER_GET_PARAMS:
if (decoder->get_params == NULL)
- decoder->get_params =
- OSSL_FUNC_decoder_get_params(fns);
+ decoder->get_params = OSSL_FUNC_decoder_get_params(fns);
break;
case OSSL_FUNC_DECODER_GETTABLE_PARAMS:
if (decoder->gettable_params == NULL)
- decoder->gettable_params =
- OSSL_FUNC_decoder_gettable_params(fns);
+ decoder->gettable_params = OSSL_FUNC_decoder_gettable_params(fns);
break;
case OSSL_FUNC_DECODER_SET_CTX_PARAMS:
if (decoder->set_ctx_params == NULL)
- decoder->set_ctx_params =
- OSSL_FUNC_decoder_set_ctx_params(fns);
+ decoder->set_ctx_params = OSSL_FUNC_decoder_set_ctx_params(fns);
break;
case OSSL_FUNC_DECODER_SETTABLE_CTX_PARAMS:
if (decoder->settable_ctx_params == NULL)
- decoder->settable_ctx_params =
- OSSL_FUNC_decoder_settable_ctx_params(fns);
+ decoder->settable_ctx_params = OSSL_FUNC_decoder_settable_ctx_params(fns);
break;
case OSSL_FUNC_DECODER_DOES_SELECTION:
if (decoder->does_selection == NULL)
- decoder->does_selection =
- OSSL_FUNC_decoder_does_selection(fns);
+ decoder->does_selection = OSSL_FUNC_decoder_does_selection(fns);
break;
case OSSL_FUNC_DECODER_DECODE:
if (decoder->decode == NULL)
@@ -278,7 +274,7 @@ void *ossl_decoder_from_algorithm(int id, const OSSL_ALGORITHM *algodef,
* You must have at least one of the encoding driver functions.
*/
if (!((decoder->newctx == NULL && decoder->freectx == NULL)
- || (decoder->newctx != NULL && decoder->freectx != NULL))
+ || (decoder->newctx != NULL && decoder->freectx != NULL))
|| decoder->decode == NULL) {
OSSL_DECODER_free(decoder);
ERR_raise(ERR_LIB_OSSL_DECODER, ERR_R_INVALID_PROVIDER_FUNCTIONS);
@@ -294,14 +290,13 @@ void *ossl_decoder_from_algorithm(int id, const OSSL_ALGORITHM *algodef,
return decoder;
}
-
/*
* The core fetching functionality passes the names of the implementation.
* This function is responsible to getting an identity number for them,
* then call ossl_decoder_from_algorithm() with that identity number.
*/
static void *construct_decoder(const OSSL_ALGORITHM *algodef,
- OSSL_PROVIDER *prov, void *data)
+ OSSL_PROVIDER *prov, void *data)
{
/*
* This function is only called if get_decoder_from_store() returned
@@ -349,7 +344,7 @@ static void free_decoder(void *method)
/* Fetching support. Can fetch by numeric identity or by name */
static OSSL_DECODER *
inner_ossl_decoder_fetch(struct decoder_data_st *methdata,
- const char *name, const char *properties)
+ const char *name, const char *properties)
{
OSSL_METHOD_STORE *store = get_decoder_store(methdata->libctx);
OSSL_NAMEMAP *namemap = ossl_namemap_stored(methdata->libctx);
@@ -388,8 +383,9 @@ inner_ossl_decoder_fetch(struct decoder_data_st *methdata,
methdata->propquery = propq;
methdata->flag_construct_error_occurred = 0;
if ((method = ossl_method_construct(methdata->libctx, OSSL_OP_DECODER,
- &prov, 0 /* !force_cache */,
- &mcm, methdata)) != NULL) {
+ &prov, 0 /* !force_cache */,
+ &mcm, methdata))
+ != NULL) {
/*
* If construction did create a method for us, we know that
* there is a correct name_id and meth_id, since those have
@@ -400,7 +396,7 @@ inner_ossl_decoder_fetch(struct decoder_data_st *methdata,
id = ossl_namemap_name2num(namemap, name);
if (id != 0)
ossl_method_store_cache_set(store, prov, id, propq, method,
- up_ref_decoder, free_decoder);
+ up_ref_decoder, free_decoder);
}
/*
@@ -416,17 +412,17 @@ inner_ossl_decoder_fetch(struct decoder_data_st *methdata,
if (name == NULL)
name = ossl_namemap_num2name(namemap, id, 0);
ERR_raise_data(ERR_LIB_OSSL_DECODER, code,
- "%s, Name (%s : %d), Properties (%s)",
- ossl_lib_ctx_get_descriptor(methdata->libctx),
- name == NULL ? "<null>" : name, id,
- properties == NULL ? "<null>" : properties);
+ "%s, Name (%s : %d), Properties (%s)",
+ ossl_lib_ctx_get_descriptor(methdata->libctx),
+ name == NULL ? "<null>" : name, id,
+ properties == NULL ? "<null>" : properties);
}
return method;
}
OSSL_DECODER *OSSL_DECODER_fetch(OSSL_LIB_CTX *libctx, const char *name,
- const char *properties)
+ const char *properties)
{
struct decoder_data_st methdata;
void *method;
@@ -554,9 +550,9 @@ static void do_one(ossl_unused int id, void *method, void *arg)
}
void OSSL_DECODER_do_all_provided(OSSL_LIB_CTX *libctx,
- void (*user_fn)(OSSL_DECODER *decoder,
- void *arg),
- void *user_arg)
+ void (*user_fn)(OSSL_DECODER *decoder,
+ void *arg),
+ void *user_arg)
{
struct decoder_data_st methdata;
struct do_one_data_st data;
@@ -574,8 +570,8 @@ void OSSL_DECODER_do_all_provided(OSSL_LIB_CTX *libctx,
}
int OSSL_DECODER_names_do_all(const OSSL_DECODER *decoder,
- void (*fn)(const char *name, void *data),
- void *data)
+ void (*fn)(const char *name, void *data),
+ void *data)
{
if (decoder == NULL)
return 0;
@@ -638,7 +634,7 @@ OSSL_DECODER_CTX *OSSL_DECODER_CTX_new(void)
}
int OSSL_DECODER_CTX_set_params(OSSL_DECODER_CTX *ctx,
- const OSSL_PARAM params[])
+ const OSSL_PARAM params[])
{
int ok = 1;
int i;
@@ -654,12 +650,9 @@ int OSSL_DECODER_CTX_set_params(OSSL_DECODER_CTX *ctx,
l = OSSL_DECODER_CTX_get_num_decoders(ctx);
for (i = 0; i < l; i++) {
- OSSL_DECODER_INSTANCE *decoder_inst =
- sk_OSSL_DECODER_INSTANCE_value(ctx->decoder_insts, i);
- OSSL_DECODER *decoder =
- OSSL_DECODER_INSTANCE_get_decoder(decoder_inst);
- OSSL_DECODER *decoderctx =
- OSSL_DECODER_INSTANCE_get_decoder_ctx(decoder_inst);
+ OSSL_DECODER_INSTANCE *decoder_inst = sk_OSSL_DECODER_INSTANCE_value(ctx->decoder_insts, i);
+ OSSL_DECODER *decoder = OSSL_DECODER_INSTANCE_get_decoder(decoder_inst);
+ OSSL_DECODER *decoderctx = OSSL_DECODER_INSTANCE_get_decoder_ctx(decoder_inst);
if (decoderctx == NULL || decoder->set_ctx_params == NULL)
continue;
@@ -675,7 +668,7 @@ void OSSL_DECODER_CTX_free(OSSL_DECODER_CTX *ctx)
if (ctx->cleanup != NULL)
ctx->cleanup(ctx->construct_data);
sk_OSSL_DECODER_INSTANCE_pop_free(ctx->decoder_insts,
- ossl_decoder_instance_free);
+ ossl_decoder_instance_free);
ossl_pw_clear_passphrase_data(&ctx->pwdata);
OPENSSL_free(ctx);
}
diff --git a/crypto/encode_decode/decoder_pkey.c b/crypto/encode_decode/decoder_pkey.c
index 2e3a14ba81..2704ad2656 100644
--- a/crypto/encode_decode/decoder_pkey.c
+++ b/crypto/encode_decode/decoder_pkey.c
@@ -24,28 +24,28 @@
#include "internal/sizes.h"
int OSSL_DECODER_CTX_set_passphrase(OSSL_DECODER_CTX *ctx,
- const unsigned char *kstr,
- size_t klen)
+ const unsigned char *kstr,
+ size_t klen)
{
return ossl_pw_set_passphrase(&ctx->pwdata, kstr, klen);
}
int OSSL_DECODER_CTX_set_passphrase_ui(OSSL_DECODER_CTX *ctx,
- const UI_METHOD *ui_method,
- void *ui_data)
+ const UI_METHOD *ui_method,
+ void *ui_data)
{
return ossl_pw_set_ui_method(&ctx->pwdata, ui_method, ui_data);
}
int OSSL_DECODER_CTX_set_pem_password_cb(OSSL_DECODER_CTX *ctx,
- pem_password_cb *cb, void *cbarg)
+ pem_password_cb *cb, void *cbarg)
{
return ossl_pw_set_pem_password_cb(&ctx->pwdata, cb, cbarg);
}
int OSSL_DECODER_CTX_set_passphrase_cb(OSSL_DECODER_CTX *ctx,
- OSSL_PASSPHRASE_CALLBACK *cb,
- void *cbarg)
+ OSSL_PASSPHRASE_CALLBACK *cb,
+ void *cbarg)
{
return ossl_pw_set_ossl_passphrase_cb(&ctx->pwdata, cb, cbarg);
}
@@ -63,14 +63,14 @@ struct decoder_pkey_data_st {
int selection;
STACK_OF(EVP_KEYMGMT) *keymgmts;
- char *object_type; /* recorded object data type, may be NULL */
- void **object; /* Where the result should end up */
- OSSL_DECODER_CTX *ctx; /* The parent decoder context */
+ char *object_type; /* recorded object data type, may be NULL */
+ void **object; /* Where the result should end up */
+ OSSL_DECODER_CTX *ctx; /* The parent decoder context */
};
static int decoder_construct_pkey(OSSL_DECODER_INSTANCE *decoder_inst,
- const OSSL_PARAM *params,
- void *construct_data)
+ const OSSL_PARAM *params,
+ void *construct_data)
{
struct decoder_pkey_data_st *data = construct_data;
OSSL_DECODER *decoder = OSSL_DECODER_INSTANCE_get_decoder(decoder_inst);
@@ -131,8 +131,9 @@ static int decoder_construct_pkey(OSSL_DECODER_INSTANCE *decoder_inst,
if (!EVP_KEYMGMT_up_ref(keymgmt))
return 0;
} else if ((keymgmt = EVP_KEYMGMT_fetch(data->libctx,
- data->object_type,
- data->propq)) != NULL) {
+ data->object_type,
+ data->propq))
+ != NULL) {
keymgmt_prov = EVP_KEYMGMT_get0_provider(keymgmt);
}
@@ -166,9 +167,9 @@ static int decoder_construct_pkey(OSSL_DECODER_INSTANCE *decoder_inst,
* |import_data.keydata| is as much an indicator.
*/
(void)decoder->export_object(decoderctx,
- object_ref, object_ref_sz,
- &evp_keymgmt_util_try_import,
- &import_data);
+ object_ref, object_ref_sz,
+ &evp_keymgmt_util_try_import,
+ &import_data);
keydata = import_data.keydata;
import_data.keydata = NULL;
}
@@ -218,8 +219,8 @@ struct collect_data_st {
const char *keytype; /* the keytype requested, if any */
int keytype_id; /* if keytype_resolved is set, keymgmt name_id; else 0 */
- int sm2_id; /* if keytype_resolved is set and EC, SM2 name_id; else 0 */
- int total; /* number of matching results */
+ int sm2_id; /* if keytype_resolved is set and EC, SM2 name_id; else 0 */
+ int total; /* number of matching results */
char error_occurred;
char keytype_resolved;
OSSL_PROPERTY_LIST *pq;
@@ -232,7 +233,7 @@ struct collect_data_st {
* if a decoder was added, 0 otherwise.
*/
static int collect_decoder_keymgmt(EVP_KEYMGMT *keymgmt, OSSL_DECODER *decoder,
- void *provctx, struct collect_data_st *data)
+ void *provctx, struct collect_data_st *data)
{
void *decoderctx = NULL;
OSSL_DECODER_INSTANCE *di = NULL;
@@ -272,14 +273,16 @@ static int collect_decoder_keymgmt(EVP_KEYMGMT *keymgmt, OSSL_DECODER *decoder,
return 0;
}
- OSSL_TRACE_BEGIN(DECODER) {
+ OSSL_TRACE_BEGIN(DECODER)
+ {
BIO_printf(trc_out,
- "(ctx %p) Checking out decoder %p:\n"
- " %s with %s\n",
- (void *)data->ctx, (void *)decoder,
- OSSL_DECODER_get0_name(decoder),
- OSSL_DECODER_get0_properties(decoder));
- } OSSL_TRACE_END(DECODER);
+ "(ctx %p) Checking out decoder %p:\n"
+ " %s with %s\n",
+ (void *)data->ctx, (void *)decoder,
+ OSSL_DECODER_get0_name(decoder),
+ OSSL_DECODER_get0_properties(decoder));
+ }
+ OSSL_TRACE_END(DECODER);
/*
* Get the property match score so the decoders can be prioritized later.
@@ -328,17 +331,19 @@ static void collect_decoder(OSSL_DECODER *decoder, void *arg)
* doesn't have |does_selection|, it's seen as taking anything.
*/
if (decoder->does_selection != NULL
- && !decoder->does_selection(provctx, data->ctx->selection))
+ && !decoder->does_selection(provctx, data->ctx->selection))
return;
- OSSL_TRACE_BEGIN(DECODER) {
+ OSSL_TRACE_BEGIN(DECODER)
+ {
BIO_printf(trc_out,
- "(ctx %p) Checking out decoder %p:\n"
- " %s with %s\n",
- (void *)data->ctx, (void *)decoder,
- OSSL_DECODER_get0_name(decoder),
- OSSL_DECODER_get0_properties(decoder));
- } OSSL_TRACE_END(DECODER);
+ "(ctx %p) Checking out decoder %p:\n"
+ " %s with %s\n",
+ (void *)data->ctx, (void *)decoder,
+ OSSL_DECODER_get0_name(decoder),
+ OSSL_DECODER_get0_properties(decoder));
+ }
+ OSSL_TRACE_END(DECODER);
end_i = sk_EVP_KEYMGMT_num(keymgmts);
for (i = 0; i < end_i; ++i) {
@@ -424,9 +429,9 @@ static void collect_keymgmt(EVP_KEYMGMT *keymgmt, void *arg)
* etc. If 'keytype' is NULL, decoders for all keytypes are bound.
*/
static int ossl_decoder_ctx_setup_for_pkey(OSSL_DECODER_CTX *ctx,
- const char *keytype,
- OSSL_LIB_CTX *libctx,
- const char *propquery)
+ const char *keytype,
+ OSSL_LIB_CTX *libctx,
+ const char *propquery)
{
int ok = 0;
struct decoder_pkey_data_st *process_data = NULL;
@@ -435,20 +440,22 @@ static int ossl_decoder_ctx_setup_for_pkey(OSSL_DECODER_CTX *ctx,
OSSL_PROPERTY_LIST **plp;
OSSL_PROPERTY_LIST *pq = NULL, *p2 = NULL;
- OSSL_TRACE_BEGIN(DECODER) {
+ OSSL_TRACE_BEGIN(DECODER)
+ {
const char *input_type = ctx->start_input_type;
const char *input_structure = ctx->input_structure;
BIO_printf(trc_out,
- "(ctx %p) Looking for decoders producing %s%s%s%s%s%s\n",
- (void *)ctx,
- keytype != NULL ? keytype : "",
- keytype != NULL ? " keys" : "keys of any type",
- input_type != NULL ? " from " : "",
- input_type != NULL ? input_type : "",
- input_structure != NULL ? " with " : "",
- input_structure != NULL ? input_structure : "");
- } OSSL_TRACE_END(DECODER);
+ "(ctx %p) Looking for decoders producing %s%s%s%s%s%s\n",
+ (void *)ctx,
+ keytype != NULL ? keytype : "",
+ keytype != NULL ? " keys" : "keys of any type",
+ input_type != NULL ? " from " : "",
+ input_type != NULL ? input_type : "",
+ input_structure != NULL ? " with " : "",
+ input_structure != NULL ? input_structure : "");
+ }
+ OSSL_TRACE_END(DECODER);
/* Allocate data. */
if ((process_data = OPENSSL_zalloc(sizeof(*process_data))) == NULL)
@@ -464,10 +471,10 @@ static int ossl_decoder_ctx_setup_for_pkey(OSSL_DECODER_CTX *ctx,
goto err;
}
- process_data->object = NULL;
- process_data->libctx = libctx;
+ process_data->object = NULL;
+ process_data->libctx = libctx;
process_data->selection = ctx->selection;
- process_data->keymgmts = keymgmts;
+ process_data->keymgmts = keymgmts;
/*
* Collect passed and default properties to prioritize the decoders.
@@ -503,11 +510,11 @@ static int ossl_decoder_ctx_setup_for_pkey(OSSL_DECODER_CTX *ctx,
* upfront, as this ensures that the names for all loaded providers have
* been registered by the time we try to resolve the keytype string.
*/
- collect_data.ctx = ctx;
- collect_data.libctx = libctx;
- collect_data.keymgmts = keymgmts;
- collect_data.keytype = keytype;
- collect_data.pq = pq;
+ collect_data.ctx = ctx;
+ collect_data.libctx = libctx;
+ collect_data.keymgmts = keymgmts;
+ collect_data.keytype = keytype;
+ collect_data.pq = pq;
EVP_KEYMGMT_do_all_provided(libctx, collect_keymgmt, &collect_data);
if (collect_data.error_occurred)
@@ -519,11 +526,13 @@ static int ossl_decoder_ctx_setup_for_pkey(OSSL_DECODER_CTX *ctx,
if (collect_data.error_occurred)
goto err;
- OSSL_TRACE_BEGIN(DECODER) {
+ OSSL_TRACE_BEGIN(DECODER)
+ {
BIO_printf(trc_out,
- "(ctx %p) Got %d decoders producing keys\n",
- (void *)ctx, collect_data.total);
- } OSSL_TRACE_END(DECODER);
+ "(ctx %p) Got %d decoders producing keys\n",
+ (void *)ctx, collect_data.total);
+ }
+ OSSL_TRACE_END(DECODER);
/*
* Finish initializing the decoder context. If one or more decoders matched
@@ -534,14 +543,14 @@ static int ossl_decoder_ctx_setup_for_pkey(OSSL_DECODER_CTX *ctx,
if (!OSSL_DECODER_CTX_set_construct(ctx, decoder_construct_pkey)
|| !OSSL_DECODER_CTX_set_construct_data(ctx, process_data)
|| !OSSL_DECODER_CTX_set_cleanup(ctx,
- decoder_clean_pkey_construct_arg))
+ decoder_clean_pkey_construct_arg))
goto err;
process_data = NULL; /* Avoid it being freed */
}
ok = 1;
- err:
+err:
decoder_clean_pkey_construct_arg(process_data);
ossl_property_free(p2);
return ok;
@@ -564,9 +573,9 @@ static EVP_KEYMGMT *keymgmt_dup(const EVP_KEYMGMT *keymgmt)
*/
static OSSL_DECODER_CTX *
ossl_decoder_ctx_for_pkey_dup(OSSL_DECODER_CTX *src,
- EVP_PKEY **pkey,
- const char *input_type,
- const char *input_structure)
+ EVP_PKEY **pkey,
+ const char *input_type,
+ const char *input_structure)
{
OSSL_DECODER_CTX *dest;
struct decoder_pkey_data_st *process_data_src, *process_data_dest = NULL;
@@ -580,7 +589,7 @@ ossl_decoder_ctx_for_pkey_dup(OSSL_DECODER_CTX *src,
}
if (!OSSL_DECODER_CTX_set_input_type(dest, input_type)
- || !OSSL_DECODER_CTX_set_input_structure(dest, input_structure)) {
+ || !OSSL_DECODER_CTX_set_input_structure(dest, input_structure)) {
ERR_raise(ERR_LIB_OSSL_DECODER, ERR_R_OSSL_DECODER_LIB);
goto err;
}
@@ -589,8 +598,8 @@ ossl_decoder_ctx_for_pkey_dup(OSSL_DECODER_CTX *src,
if (src->decoder_insts != NULL) {
dest->decoder_insts
= sk_OSSL_DECODER_INSTANCE_deep_copy(src->decoder_insts,
- ossl_decoder_instance_dup,
- ossl_decoder_instance_free);
+ ossl_decoder_instance_dup,
+ ossl_decoder_instance_free);
if (dest->decoder_insts == NULL) {
ERR_raise(ERR_LIB_OSSL_DECODER, ERR_R_OSSL_DECODER_LIB);
goto err;
@@ -598,7 +607,7 @@ ossl_decoder_ctx_for_pkey_dup(OSSL_DECODER_CTX *src,
}
if (!OSSL_DECODER_CTX_set_construct(dest,
- OSSL_DECODER_CTX_get_construct(src))) {
+ OSSL_DECODER_CTX_get_construct(src))) {
ERR_raise(ERR_LIB_OSSL_DECODER, ERR_R_OSSL_DECODER_LIB);
goto err;
}
@@ -621,18 +630,18 @@ ossl_decoder_ctx_for_pkey_dup(OSSL_DECODER_CTX *src,
if (process_data_src->keymgmts != NULL) {
process_data_dest->keymgmts
= sk_EVP_KEYMGMT_deep_copy(process_data_src->keymgmts,
- keymgmt_dup,
- EVP_KEYMGMT_free);
+ keymgmt_dup,
+ EVP_KEYMGMT_free);
if (process_data_dest->keymgmts == NULL) {
ERR_raise(ERR_LIB_OSSL_DECODER, ERR_R_EVP_LIB);
goto err;
}
}
- process_data_dest->object = (void **)pkey;
- process_data_dest->libctx = process_data_src->libctx;
+ process_data_dest->object = (void **)pkey;
+ process_data_dest->libctx = process_data_src->libctx;
process_data_dest->selection = process_data_src->selection;
- process_data_dest->ctx = dest;
+ process_data_dest->ctx = dest;
if (!OSSL_DECODER_CTX_set_construct_data(dest, process_data_dest)) {
ERR_raise(ERR_LIB_OSSL_DECODER, ERR_R_OSSL_DECODER_LIB);
goto err;
@@ -641,14 +650,14 @@ ossl_decoder_ctx_for_pkey_dup(OSSL_DECODER_CTX *src,
}
if (!OSSL_DECODER_CTX_set_cleanup(dest,
- OSSL_DECODER_CTX_get_cleanup(src))) {
+ OSSL_DECODER_CTX_get_cleanup(src))) {
ERR_raise(ERR_LIB_OSSL_DECODER, ERR_R_OSSL_DECODER_LIB);
goto err;
}
dest->frozen = src->frozen;
return dest;
- err:
+err:
decoder_clean_pkey_construct_arg(process_data_dest);
OSSL_DECODER_CTX_free(dest);
return NULL;
@@ -687,17 +696,21 @@ static unsigned long decoder_cache_entry_hash(const DECODER_CACHE_ENTRY *cache)
unsigned long hash = 17;
hash = (hash * 23)
- + (cache->propquery == NULL
- ? 0 : ossl_lh_strcasehash(cache->propquery));
+ + (cache->propquery == NULL
+ ? 0
+ : ossl_lh_strcasehash(cache->propquery));
hash = (hash * 23)
- + (cache->input_structure == NULL
- ? 0 : ossl_lh_strcasehash(cache->input_structure));
+ + (cache->input_structure == NULL
+ ? 0
+ : ossl_lh_strcasehash(cache->input_structure));
hash = (hash * 23)
- + (cache->input_type == NULL
- ? 0 : ossl_lh_strcasehash(cache->input_type));
+ + (cache->input_type == NULL
+ ? 0
+ : ossl_lh_strcasehash(cache->input_type));
hash = (hash * 23)
- + (cache->keytype == NULL
- ? 0 : ossl_lh_strcasehash(cache->keytype));
+ + (cache->keytype == NULL
+ ? 0
+ : ossl_lh_strcasehash(cache->keytype));
hash ^= cache->selection;
@@ -724,7 +737,7 @@ static ossl_inline int nullstrcmp(const char *a, const char *b, int casecmp)
}
static int decoder_cache_entry_cmp(const DECODER_CACHE_ENTRY *a,
- const DECODER_CACHE_ENTRY *b)
+ const DECODER_CACHE_ENTRY *b)
{
int cmp;
@@ -761,7 +774,7 @@ void *ossl_decoder_cache_new(OSSL_LIB_CTX *ctx)
return NULL;
}
cache->hashtable = lh_DECODER_CACHE_ENTRY_new(decoder_cache_entry_hash,
- decoder_cache_entry_cmp);
+ decoder_cache_entry_cmp);
if (cache->hashtable == NULL) {
CRYPTO_THREAD_lock_free(cache->lock);
OPENSSL_free(cache);
@@ -793,7 +806,6 @@ int ossl_decoder_cache_flush(OSSL_LIB_CTX *libctx)
if (cache == NULL)
return 0;
-
if (!CRYPTO_THREAD_write_lock(cache->lock)) {
ERR_raise(ERR_LIB_OSSL_DECODER, ERR_R_OSSL_DECODER_LIB);
return 0;
@@ -808,10 +820,10 @@ int ossl_decoder_cache_flush(OSSL_LIB_CTX *libctx)
OSSL_DECODER_CTX *
OSSL_DECODER_CTX_new_for_pkey(EVP_PKEY **pkey,
- const char *input_type,
- const char *input_structure,
- const char *keytype, int selection,
- OSSL_LIB_CTX *libctx, const char *propquery)
+ const char *input_type,
+ const char *input_structure,
+ const char *keytype, int selection,
+ OSSL_LIB_CTX *libctx, const char *propquery)
{
OSSL_DECODER_CTX *ctx = NULL;
OSSL_PARAM decoder_params[] = {
@@ -829,13 +841,11 @@ OSSL_DECODER_CTX_new_for_pkey(EVP_PKEY **pkey,
return NULL;
}
if (input_structure != NULL)
- decoder_params[i++] =
- OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_STRUCTURE,
- (char *)input_structure, 0);
+ decoder_params[i++] = OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_STRUCTURE,
+ (char *)input_structure, 0);
if (propquery != NULL)
- decoder_params[i++] =
- OSSL_PARAM_construct_utf8_string(OSSL_DECODER_PARAM_PROPERTIES,
- (char *)propquery, 0);
+ decoder_params[i++] = OSSL_PARAM_construct_utf8_string(OSSL_DECODER_PARAM_PROPERTIES,
+ (char *)propquery, 0);
/* It is safe to cast away the const here */
cacheent.input_type = (char *)input_type;
@@ -865,13 +875,15 @@ OSSL_DECODER_CTX_new_for_pkey(EVP_PKEY **pkey,
return NULL;
}
- OSSL_TRACE_BEGIN(DECODER) {
+ OSSL_TRACE_BEGIN(DECODER)
+ {
BIO_printf(trc_out,
- "(ctx %p) Looking for %s decoders with selection %d\n",
- (void *)ctx, keytype, selection);
+ "(ctx %p) Looking for %s decoders with selection %d\n",
+ (void *)ctx, keytype, selection);
BIO_printf(trc_out, " input type: %s, input structure: %s\n",
- input_type, input_structure);
- } OSSL_TRACE_END(DECODER);
+ input_type, input_structure);
+ }
+ OSSL_TRACE_END(DECODER);
if (OSSL_DECODER_CTX_set_input_type(ctx, input_type)
&& OSSL_DECODER_CTX_set_input_structure(ctx, input_structure)
@@ -881,10 +893,12 @@ OSSL_DECODER_CTX_new_for_pkey(EVP_PKEY **pkey,
&& (propquery == NULL
|| OSSL_DECODER_CTX_set_params(ctx, decoder_params))) {
ctx->frozen = 1;
- OSSL_TRACE_BEGIN(DECODER) {
+ OSSL_TRACE_BEGIN(DECODER)
+ {
BIO_printf(trc_out, "(ctx %p) Got %d decoders\n",
- (void *)ctx, OSSL_DECODER_CTX_get_num_decoders(ctx));
- } OSSL_TRACE_END(DECODER);
+ (void *)ctx, OSSL_DECODER_CTX_get_num_decoders(ctx));
+ }
+ OSSL_TRACE_END(DECODER);
} else {
ERR_raise(ERR_LIB_OSSL_DECODER, ERR_R_OSSL_DECODER_LIB);
OSSL_DECODER_CTX_free(ctx);
@@ -950,7 +964,7 @@ OSSL_DECODER_CTX_new_for_pkey(EVP_PKEY **pkey,
CRYPTO_THREAD_unlock(cache->lock);
return ctx;
- err:
+err:
decoder_cache_entry_free(newcache);
OSSL_DECODER_CTX_free(ctx);
return NULL;
diff --git a/crypto/encode_decode/encoder_err.c b/crypto/encode_decode/encoder_err.c
index a904e87ef2..79b12f9c31 100644
--- a/crypto/encode_decode/encoder_err.c
+++ b/crypto/encode_decode/encoder_err.c
@@ -15,13 +15,13 @@
#ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA OSSL_ENCODER_str_reasons[] = {
- {ERR_PACK(ERR_LIB_OSSL_ENCODER, 0, OSSL_ENCODER_R_ENCODER_NOT_FOUND),
- "encoder not found"},
- {ERR_PACK(ERR_LIB_OSSL_ENCODER, 0, OSSL_ENCODER_R_INCORRECT_PROPERTY_QUERY),
- "incorrect property query"},
- {ERR_PACK(ERR_LIB_OSSL_ENCODER, 0, OSSL_ENCODER_R_MISSING_GET_PARAMS),
- "missing get params"},
- {0, NULL}
+ { ERR_PACK(ERR_LIB_OSSL_ENCODER, 0, OSSL_ENCODER_R_ENCODER_NOT_FOUND),
+ "encoder not found" },
+ { ERR_PACK(ERR_LIB_OSSL_ENCODER, 0, OSSL_ENCODER_R_INCORRECT_PROPERTY_QUERY),
+ "incorrect property query" },
+ { ERR_PACK(ERR_LIB_OSSL_ENCODER, 0, OSSL_ENCODER_R_MISSING_GET_PARAMS),
+ "missing get params" },
+ { 0, NULL }
};
#endif
diff --git a/crypto/encode_decode/encoder_lib.c b/crypto/encode_decode/encoder_lib.c
index a27479c76c..375c98188c 100644
--- a/crypto/encode_decode/encoder_lib.c
+++ b/crypto/encode_decode/encoder_lib.c
@@ -24,23 +24,23 @@
#include "encoder_local.h"
/* Number of octets per line */
-#define LABELED_BUF_PRINT_WIDTH 16
-#define LABELED_BN_PRINT_WIDTH 16
+#define LABELED_BUF_PRINT_WIDTH 16
+#define LABELED_BN_PRINT_WIDTH 16
-# ifdef SIXTY_FOUR_BIT_LONG
-# define BN_FMTu "%lu"
-# define BN_FMTx "%lx"
-# endif
+#ifdef SIXTY_FOUR_BIT_LONG
+#define BN_FMTu "%lu"
+#define BN_FMTx "%lx"
+#endif
-# ifdef SIXTY_FOUR_BIT
-# define BN_FMTu "%llu"
-# define BN_FMTx "%llx"
-# endif
+#ifdef SIXTY_FOUR_BIT
+#define BN_FMTu "%llu"
+#define BN_FMTx "%llx"
+#endif
-# ifdef THIRTY_TWO_BIT
-# define BN_FMTu "%u"
-# define BN_FMTx "%x"
-# endif
+#ifdef THIRTY_TWO_BIT
+#define BN_FMTu "%u"
+#define BN_FMTx "%x"
+#endif
struct encoder_process_data_st {
OSSL_ENCODER_CTX *ctx;
@@ -52,7 +52,7 @@ struct encoder_process_data_st {
int current_encoder_inst_index;
/* Processing data passed down through recursion */
- int level; /* Recursion level */
+ int level; /* Recursion level */
OSSL_ENCODER_INSTANCE *next_encoder_inst;
int count_output_structure;
@@ -77,9 +77,9 @@ int OSSL_ENCODER_to_bio(OSSL_ENCODER_CTX *ctx, BIO *out)
if (data.current_encoder_inst_index == 0) {
ERR_raise_data(ERR_LIB_OSSL_ENCODER, OSSL_ENCODER_R_ENCODER_NOT_FOUND,
- "No encoders were found. For standard encoders you need "
- "at least one of the default or base providers "
- "available. Did you forget to load them?");
+ "No encoders were found. For standard encoders you need "
+ "at least one of the default or base providers "
+ "available. Did you forget to load them?");
return 0;
}
@@ -118,7 +118,7 @@ int OSSL_ENCODER_to_fp(OSSL_ENCODER_CTX *ctx, FILE *fp)
#endif
int OSSL_ENCODER_to_data(OSSL_ENCODER_CTX *ctx, unsigned char **pdata,
- size_t *pdata_len)
+ size_t *pdata_len)
{
BIO *out;
BUF_MEM *buf = NULL;
@@ -190,7 +190,7 @@ int OSSL_ENCODER_CTX_set_selection(OSSL_ENCODER_CTX *ctx, int selection)
}
int OSSL_ENCODER_CTX_set_output_type(OSSL_ENCODER_CTX *ctx,
- const char *output_type)
+ const char *output_type)
{
if (ctx == NULL || output_type == NULL) {
ERR_raise(ERR_LIB_OSSL_ENCODER, ERR_R_PASSED_NULL_PARAMETER);
@@ -207,7 +207,7 @@ int OSSL_ENCODER_CTX_set_output_type(OSSL_ENCODER_CTX *ctx,
}
int OSSL_ENCODER_CTX_set_output_structure(OSSL_ENCODER_CTX *ctx,
- const char *output_structure)
+ const char *output_structure)
{
if (ctx == NULL || output_structure == NULL) {
ERR_raise(ERR_LIB_OSSL_ENCODER, ERR_R_PASSED_NULL_PARAMETER);
@@ -224,7 +224,7 @@ int OSSL_ENCODER_CTX_set_output_structure(OSSL_ENCODER_CTX *ctx,
}
static OSSL_ENCODER_INSTANCE *ossl_encoder_instance_new(OSSL_ENCODER *encoder,
- void *encoderctx)
+ void *encoderctx)
{
OSSL_ENCODER_INSTANCE *encoder_inst = NULL;
const OSSL_PROVIDER *prov;
@@ -250,8 +250,8 @@ static OSSL_ENCODER_INSTANCE *ossl_encoder_instance_new(OSSL_ENCODER *encoder,
props = ossl_encoder_parsed_properties(encoder);
if (props == NULL) {
ERR_raise_data(ERR_LIB_OSSL_DECODER, ERR_R_INVALID_PROPERTY_DEFINITION,
- "there are no property definitions with encoder %s",
- OSSL_ENCODER_get0_name(encoder));
+ "there are no property definitions with encoder %s",
+ OSSL_ENCODER_get0_name(encoder));
goto err;
}
@@ -260,10 +260,10 @@ static OSSL_ENCODER_INSTANCE *ossl_encoder_instance_new(OSSL_ENCODER *encoder,
encoder_inst->output_type = ossl_property_get_string_value(libctx, prop);
if (encoder_inst->output_type == NULL) {
ERR_raise_data(ERR_LIB_OSSL_DECODER, ERR_R_INVALID_PROPERTY_DEFINITION,
- "the mandatory 'output' property is missing "
- "for encoder %s (properties: %s)",
- OSSL_ENCODER_get0_name(encoder),
- OSSL_ENCODER_get0_properties(encoder));
+ "the mandatory 'output' property is missing "
+ "for encoder %s (properties: %s)",
+ OSSL_ENCODER_get0_name(encoder),
+ OSSL_ENCODER_get0_properties(encoder));
goto err;
}
@@ -276,7 +276,7 @@ static OSSL_ENCODER_INSTANCE *ossl_encoder_instance_new(OSSL_ENCODER *encoder,
encoder_inst->encoder = encoder;
encoder_inst->encoderctx = encoderctx;
return encoder_inst;
- err:
+err:
ossl_encoder_instance_free(encoder_inst);
return NULL;
}
@@ -294,27 +294,28 @@ void ossl_encoder_instance_free(OSSL_ENCODER_INSTANCE *encoder_inst)
}
static int ossl_encoder_ctx_add_encoder_inst(OSSL_ENCODER_CTX *ctx,
- OSSL_ENCODER_INSTANCE *ei)
+ OSSL_ENCODER_INSTANCE *ei)
{
int ok;
if (ctx->encoder_insts == NULL
- && (ctx->encoder_insts =
- sk_OSSL_ENCODER_INSTANCE_new_null()) == NULL) {
+ && (ctx->encoder_insts = sk_OSSL_ENCODER_INSTANCE_new_null()) == NULL) {
ERR_raise(ERR_LIB_OSSL_ENCODER, ERR_R_CRYPTO_LIB);
return 0;
}
ok = (sk_OSSL_ENCODER_INSTANCE_push(ctx->encoder_insts, ei) > 0);
if (ok) {
- OSSL_TRACE_BEGIN(ENCODER) {
+ OSSL_TRACE_BEGIN(ENCODER)
+ {
BIO_printf(trc_out,
- "(ctx %p) Added encoder instance %p (encoder %p):\n"
- " %s with %s\n",
- (void *)ctx, (void *)ei, (void *)ei->encoder,
- OSSL_ENCODER_get0_name(ei->encoder),
- OSSL_ENCODER_get0_properties(ei->encoder));
- } OSSL_TRACE_END(ENCODER);
+ "(ctx %p) Added encoder instance %p (encoder %p):\n"
+ " %s with %s\n",
+ (void *)ctx, (void *)ei, (void *)ei->encoder,
+ OSSL_ENCODER_get0_name(ei->encoder),
+ OSSL_ENCODER_get0_properties(ei->encoder));
+ }
+ OSSL_TRACE_END(ENCODER);
}
return ok;
}
@@ -340,8 +341,7 @@ int OSSL_ENCODER_CTX_add_encoder(OSSL_ENCODER_CTX *ctx, OSSL_ENCODER *encoder)
provctx = OSSL_PROVIDER_get0_provider_ctx(prov);
if ((encoderctx = encoder->newctx(provctx)) == NULL
- || (encoder_inst =
- ossl_encoder_instance_new(encoder, encoderctx)) == NULL)
+ || (encoder_inst = ossl_encoder_instance_new(encoder, encoderctx)) == NULL)
goto err;
/* Avoid double free of encoderctx on further errors */
encoderctx = NULL;
@@ -350,7 +350,7 @@ int OSSL_ENCODER_CTX_add_encoder(OSSL_ENCODER_CTX *ctx, OSSL_ENCODER *encoder)
goto err;
return 1;
- err:
+err:
ossl_encoder_instance_free(encoder_inst);
if (encoderctx != NULL)
encoder->freectx(encoderctx);
@@ -358,7 +358,7 @@ int OSSL_ENCODER_CTX_add_encoder(OSSL_ENCODER_CTX *ctx, OSSL_ENCODER *encoder)
}
int OSSL_ENCODER_CTX_add_extra(OSSL_ENCODER_CTX *ctx,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_LIB_CTX *libctx, const char *propq)
{
if (ctx == NULL) {
ERR_raise(ERR_LIB_OSSL_ENCODER, ERR_R_PASSED_NULL_PARAMETER);
@@ -381,7 +381,7 @@ int OSSL_ENCODER_CTX_get_num_encoders(OSSL_ENCODER_CTX *ctx)
}
int OSSL_ENCODER_CTX_set_construct(OSSL_ENCODER_CTX *ctx,
- OSSL_ENCODER_CONSTRUCT *construct)
+ OSSL_ENCODER_CONSTRUCT *construct)
{
if (ctx == NULL) {
ERR_raise(ERR_LIB_OSSL_ENCODER, ERR_R_PASSED_NULL_PARAMETER);
@@ -398,7 +398,7 @@ int OSSL_ENCODER_CTX_set_construct(OSSL_ENCODER_CTX *ctx,
}
int OSSL_ENCODER_CTX_set_construct_data(OSSL_ENCODER_CTX *ctx,
- void *construct_data)
+ void *construct_data)
{
if (ctx == NULL) {
ERR_raise(ERR_LIB_OSSL_ENCODER, ERR_R_PASSED_NULL_PARAMETER);
@@ -415,7 +415,7 @@ int OSSL_ENCODER_CTX_set_construct_data(OSSL_ENCODER_CTX *ctx,
}
int OSSL_ENCODER_CTX_set_cleanup(OSSL_ENCODER_CTX *ctx,
- OSSL_ENCODER_CLEANUP *cleanup)
+ OSSL_ENCODER_CLEANUP *cleanup)
{
if (ctx == NULL) {
ERR_raise(ERR_LIB_OSSL_ENCODER, ERR_R_PASSED_NULL_PARAMETER);
@@ -473,14 +473,13 @@ static int encoder_process(struct encoder_process_data_st *data)
OSSL_PARAM abstract[10];
const OSSL_PARAM *current_abstract = NULL;
int i;
- int ok = -1; /* -1 signifies that the lookup loop gave nothing */
+ int ok = -1; /* -1 signifies that the lookup loop gave nothing */
int top = 0;
if (data->next_encoder_inst == NULL) {
/* First iteration, where we prepare for what is to come */
- data->count_output_structure =
- data->ctx->output_structure == NULL ? -1 : 0;
+ data->count_output_structure = data->ctx->output_structure == NULL ? -1 : 0;
top = 1;
}
@@ -491,19 +490,13 @@ static int encoder_process(struct encoder_process_data_st *data)
struct encoder_process_data_st new_data;
if (!top)
- next_encoder =
- OSSL_ENCODER_INSTANCE_get_encoder(data->next_encoder_inst);
-
- current_encoder_inst =
- sk_OSSL_ENCODER_INSTANCE_value(data->ctx->encoder_insts, i);
- current_encoder =
- OSSL_ENCODER_INSTANCE_get_encoder(current_encoder_inst);
- current_encoder_ctx =
- OSSL_ENCODER_INSTANCE_get_encoder_ctx(current_encoder_inst);
- current_output_type =
- OSSL_ENCODER_INSTANCE_get_output_type(current_encoder_inst);
- current_output_structure =
- OSSL_ENCODER_INSTANCE_get_output_structure(current_encoder_inst);
+ next_encoder = OSSL_ENCODER_INSTANCE_get_encoder(data->next_encoder_inst);
+
+ current_encoder_inst = sk_OSSL_ENCODER_INSTANCE_value(data->ctx->encoder_insts, i);
+ current_encoder = OSSL_ENCODER_INSTANCE_get_encoder(current_encoder_inst);
+ current_encoder_ctx = OSSL_ENCODER_INSTANCE_get_encoder_ctx(current_encoder_inst);
+ current_output_type = OSSL_ENCODER_INSTANCE_get_output_type(current_encoder_inst);
+ current_output_structure = OSSL_ENCODER_INSTANCE_get_output_structure(current_encoder_inst);
memset(&new_data, 0, sizeof(new_data));
new_data.ctx = data->ctx;
new_data.current_encoder_inst_index = i;
@@ -511,12 +504,14 @@ static int encoder_process(struct encoder_process_data_st *data)
new_data.count_output_structure = data->count_output_structure;
new_data.level = data->level + 1;
- OSSL_TRACE_BEGIN(ENCODER) {
+ OSSL_TRACE_BEGIN(ENCODER)
+ {
BIO_printf(trc_out,
- "[%d] (ctx %p) Considering encoder instance %p (encoder %p)\n",
- data->level, (void *)data->ctx,
- (void *)current_encoder_inst, (void *)current_encoder);
- } OSSL_TRACE_END(ENCODER);
+ "[%d] (ctx %p) Considering encoder instance %p (encoder %p)\n",
+ data->level, (void *)data->ctx,
+ (void *)current_encoder_inst, (void *)current_encoder);
+ }
+ OSSL_TRACE_END(ENCODER);
/*
* If this is the top call, we check if the output type of the current
@@ -528,23 +523,28 @@ static int encoder_process(struct encoder_process_data_st *data)
if (top) {
if (data->ctx->output_type != NULL
&& OPENSSL_strcasecmp(current_output_type,
- data->ctx->output_type) != 0) {
- OSSL_TRACE_BEGIN(ENCODER) {
+ data->ctx->output_type)
+ != 0) {
+ OSSL_TRACE_BEGIN(ENCODER)
+ {
BIO_printf(trc_out,
- "[%d] Skipping because current encoder output type (%s) != desired output type (%s)\n",
- data->level,
- current_output_type, data->ctx->output_type);
- } OSSL_TRACE_END(ENCODER);
+ "[%d] Skipping because current encoder output type (%s) != desired output type (%s)\n",
+ data->level,
+ current_output_type, data->ctx->output_type);
+ }
+ OSSL_TRACE_END(ENCODER);
continue;
}
} else {
if (!OSSL_ENCODER_is_a(next_encoder, current_output_type)) {
- OSSL_TRACE_BEGIN(ENCODER) {
+ OSSL_TRACE_BEGIN(ENCODER)
+ {
BIO_printf(trc_out,
- "[%d] Skipping because current encoder output type (%s) != name of encoder %p\n",
- data->level,
- current_output_type, (void *)next_encoder);
- } OSSL_TRACE_END(ENCODER);
+ "[%d] Skipping because current encoder output type (%s) != name of encoder %p\n",
+ data->level,
+ current_output_type, (void *)next_encoder);
+ }
+ OSSL_TRACE_END(ENCODER);
continue;
}
}
@@ -557,14 +557,17 @@ static int encoder_process(struct encoder_process_data_st *data)
if (data->ctx->output_structure != NULL
&& current_output_structure != NULL) {
if (OPENSSL_strcasecmp(data->ctx->output_structure,
- current_output_structure) != 0) {
- OSSL_TRACE_BEGIN(ENCODER) {
+ current_output_structure)
+ != 0) {
+ OSSL_TRACE_BEGIN(ENCODER)
+ {
BIO_printf(trc_out,
- "[%d] Skipping because current encoder output structure (%s) != ctx output structure (%s)\n",
- data->level,
- current_output_structure,
- data->ctx->output_structure);
- } OSSL_TRACE_END(ENCODER);
+ "[%d] Skipping because current encoder output structure (%s) != ctx output structure (%s)\n",
+ data->level,
+ current_output_structure,
+ data->ctx->output_structure);
+ }
+ OSSL_TRACE_END(ENCODER);
continue;
}
@@ -595,11 +598,13 @@ static int encoder_process(struct encoder_process_data_st *data)
if (ok != 0)
break;
- OSSL_TRACE_BEGIN(ENCODER) {
+ OSSL_TRACE_BEGIN(ENCODER)
+ {
BIO_printf(trc_out,
- "[%d] Skipping because recursion level %d failed\n",
- data->level, new_data.level);
- } OSSL_TRACE_END(ENCODER);
+ "[%d] Skipping because recursion level %d failed\n",
+ data->level, new_data.level);
+ }
+ OSSL_TRACE_END(ENCODER);
}
/*
@@ -609,11 +614,13 @@ static int encoder_process(struct encoder_process_data_st *data)
if (i < 0) {
ok = -1;
- OSSL_TRACE_BEGIN(ENCODER) {
+ OSSL_TRACE_BEGIN(ENCODER)
+ {
BIO_printf(trc_out,
- "[%d] (ctx %p) No suitable encoder found\n",
- data->level, (void *)data->ctx);
- } OSSL_TRACE_END(ENCODER);
+ "[%d] (ctx %p) No suitable encoder found\n",
+ data->level, (void *)data->ctx);
+ }
+ OSSL_TRACE_END(ENCODER);
} else {
/* Preparations */
@@ -639,9 +646,8 @@ static int encoder_process(struct encoder_process_data_st *data)
if (data->count_output_structure == 0)
return 0;
- original_data =
- data->ctx->construct(current_encoder_inst,
- data->ctx->construct_data);
+ original_data = data->ctx->construct(current_encoder_inst,
+ data->ctx->construct_data);
/* Also set the data type, using the encoder implementation name */
data->data_type = OSSL_ENCODER_get0_name(current_encoder);
@@ -666,21 +672,17 @@ static int encoder_process(struct encoder_process_data_st *data)
*/
OSSL_PARAM *abstract_p = abstract;
- const char *prev_output_structure =
- OSSL_ENCODER_INSTANCE_get_output_structure(data->prev_encoder_inst);
+ const char *prev_output_structure = OSSL_ENCODER_INSTANCE_get_output_structure(data->prev_encoder_inst);
- *abstract_p++ =
- OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_TYPE,
- (char *)data->data_type, 0);
+ *abstract_p++ = OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_TYPE,
+ (char *)data->data_type, 0);
if (prev_output_structure != NULL)
- *abstract_p++ =
- OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_STRUCTURE,
- (char *)prev_output_structure,
- 0);
- *abstract_p++ =
- OSSL_PARAM_construct_octet_string(OSSL_OBJECT_PARAM_DATA,
- data->running_output,
- data->running_output_length);
+ *abstract_p++ = OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_STRUCTURE,
+ (char *)prev_output_structure,
+ 0);
+ *abstract_p++ = OSSL_PARAM_construct_octet_string(OSSL_OBJECT_PARAM_DATA,
+ data->running_output,
+ data->running_output_length);
*abstract_p = OSSL_PARAM_construct_end();
current_abstract = abstract;
}
@@ -700,23 +702,25 @@ static int encoder_process(struct encoder_process_data_st *data)
if (top)
current_out = data->bio;
else if ((current_out = allocated_out = BIO_new(BIO_s_mem()))
- == NULL)
- ok = 0; /* Assume BIO_new() recorded an error */
+ == NULL)
+ ok = 0; /* Assume BIO_new() recorded an error */
if (ok)
ok = (cbio = ossl_core_bio_new_from_bio(current_out)) != NULL;
if (ok) {
ok = current_encoder->encode(current_encoder_ctx, cbio,
- original_data, current_abstract,
- data->ctx->selection,
- ossl_pw_passphrase_callback_enc,
- &data->ctx->pwdata);
- OSSL_TRACE_BEGIN(ENCODER) {
+ original_data, current_abstract,
+ data->ctx->selection,
+ ossl_pw_passphrase_callback_enc,
+ &data->ctx->pwdata);
+ OSSL_TRACE_BEGIN(ENCODER)
+ {
BIO_printf(trc_out,
- "[%d] (ctx %p) Running encoder instance %p => %d\n",
- data->level, (void *)data->ctx,
- (void *)current_encoder_inst, ok);
- } OSSL_TRACE_END(ENCODER);
+ "[%d] (ctx %p) Running encoder instance %p => %d\n",
+ data->level, (void *)data->ctx,
+ (void *)current_encoder_inst, ok);
+ }
+ OSSL_TRACE_END(ENCODER);
}
ossl_core_bio_free(cbio);
@@ -775,7 +779,7 @@ int ossl_bio_print_labeled_bignum(BIO *out, const char *label, const BIGNUM *bn)
neg = "-";
return BIO_printf(out, "%s%s%s" BN_FMTu " (%s0x" BN_FMTx ")\n",
- label, post_label_spc, neg, words[0], neg, words[0]);
+ label, post_label_spc, neg, words[0], neg, words[0]);
}
hex_str = BN_bn2hex(bn);
@@ -804,8 +808,9 @@ int ossl_bio_print_labeled_bignum(BIO *out, const char *label, const BIGNUM *bn)
use_sep = 0; /* The first byte on the next line doesn't have a : */
}
if (BIO_printf(out, "%s%c%c", use_sep ? ":" : "",
- tolower((unsigned char)p[0]),
- tolower((unsigned char)p[1])) <= 0)
+ tolower((unsigned char)p[0]),
+ tolower((unsigned char)p[1]))
+ <= 0)
goto err;
++bytes;
p += 2;
@@ -820,7 +825,7 @@ err:
}
int ossl_bio_print_labeled_buf(BIO *out, const char *label,
- const unsigned char *buf, size_t buflen)
+ const unsigned char *buf, size_t buflen)
{
size_t i;
@@ -836,7 +841,8 @@ int ossl_bio_print_labeled_buf(BIO *out, const char *label,
}
if (BIO_printf(out, "%02x%s", buf[i],
- (i == buflen - 1) ? "" : ":") <= 0)
+ (i == buflen - 1) ? "" : ":")
+ <= 0)
return 0;
}
if (BIO_printf(out, "\n") <= 0)
diff --git a/crypto/encode_decode/encoder_local.h b/crypto/encode_decode/encoder_local.h
index 39c786d001..a35c6174db 100644
--- a/crypto/encode_decode/encoder_local.h
+++ b/crypto/encode_decode/encoder_local.h
@@ -56,9 +56,9 @@ struct ossl_decoder_st {
};
struct ossl_encoder_instance_st {
- OSSL_ENCODER *encoder; /* Never NULL */
- void *encoderctx; /* Never NULL */
- const char *output_type; /* Never NULL */
+ OSSL_ENCODER *encoder; /* Never NULL */
+ void *encoderctx; /* Never NULL */
+ const char *output_type; /* Never NULL */
const char *output_structure; /* May be NULL */
};
@@ -107,13 +107,13 @@ struct ossl_encoder_ctx_st {
};
struct ossl_decoder_instance_st {
- OSSL_DECODER *decoder; /* Never NULL */
- void *decoderctx; /* Never NULL */
- const char *input_type; /* Never NULL */
+ OSSL_DECODER *decoder; /* Never NULL */
+ void *decoderctx; /* Never NULL */
+ const char *input_type; /* Never NULL */
const char *input_structure; /* May be NULL */
int input_type_id;
- int order; /* For stable ordering of decoders wrt proqs */
- int score; /* For ordering decoders wrt proqs */
+ int order; /* For stable ordering of decoders wrt proqs */
+ int score; /* For ordering decoders wrt proqs */
unsigned int flag_input_structure_was_set : 1;
};
@@ -176,4 +176,4 @@ const OSSL_PROPERTY_LIST *
ossl_encoder_parsed_properties(const OSSL_ENCODER *encoder);
int ossl_decoder_fast_is_a(OSSL_DECODER *decoder,
- const char *name, int *id_cache);
+ const char *name, int *id_cache);
diff --git a/crypto/encode_decode/encoder_meth.c b/crypto/encode_decode/encoder_meth.c
index 88b8561188..0bae49fa90 100644
--- a/crypto/encode_decode/encoder_meth.c
+++ b/crypto/encode_decode/encoder_meth.c
@@ -77,9 +77,9 @@ void OSSL_ENCODER_free(OSSL_ENCODER *encoder)
/* Data to be passed through ossl_method_construct() */
struct encoder_data_st {
OSSL_LIB_CTX *libctx;
- int id; /* For get_encoder_from_store() */
- const char *names; /* For get_encoder_from_store() */
- const char *propquery; /* For get_encoder_from_store() */
+ int id; /* For get_encoder_from_store() */
+ const char *names; /* For get_encoder_from_store() */
+ const char *propquery; /* For get_encoder_from_store() */
OSSL_METHOD_STORE *tmp_store; /* For get_tmp_encoder_store() */
@@ -137,7 +137,7 @@ static int unreserve_encoder_store(void *store, void *data)
/* Get encoder methods from a store, or put one in */
static void *get_encoder_from_store(void *store, const OSSL_PROVIDER **prov,
- void *data)
+ void *data)
{
struct encoder_data_st *methdata = data;
void *method = NULL;
@@ -172,9 +172,9 @@ static void *get_encoder_from_store(void *store, const OSSL_PROVIDER **prov,
}
static int put_encoder_in_store(void *store, void *method,
- const OSSL_PROVIDER *prov,
- const char *names, const char *propdef,
- void *data)
+ const OSSL_PROVIDER *prov,
+ const char *names, const char *propdef,
+ void *data)
{
struct encoder_data_st *methdata = data;
OSSL_NAMEMAP *namemap;
@@ -201,13 +201,13 @@ static int put_encoder_in_store(void *store, void *method,
return 0;
return ossl_method_store_add(store, prov, id, propdef, method,
- ossl_encoder_up_ref,
- ossl_encoder_free);
+ ossl_encoder_up_ref,
+ ossl_encoder_free);
}
/* Create and populate a encoder method */
static void *encoder_from_algorithm(int id, const OSSL_ALGORITHM *algodef,
- OSSL_PROVIDER *prov)
+ OSSL_PROVIDER *prov)
{
OSSL_ENCODER *encoder = NULL;
const OSSL_DISPATCH *fns = algodef->implementation;
@@ -222,7 +222,8 @@ static void *encoder_from_algorithm(int id, const OSSL_ALGORITHM *algodef,
}
encoder->base.algodef = algodef;
if ((encoder->base.parsed_propdef
- = ossl_parse_property(libctx, algodef->property_definition)) == NULL) {
+ = ossl_parse_property(libctx, algodef->property_definition))
+ == NULL) {
OSSL_ENCODER_free(encoder);
return NULL;
}
@@ -231,38 +232,31 @@ static void *encoder_from_algorithm(int id, const OSSL_ALGORITHM *algodef,
switch (fns->function_id) {
case OSSL_FUNC_ENCODER_NEWCTX:
if (encoder->newctx == NULL)
- encoder->newctx =
- OSSL_FUNC_encoder_newctx(fns);
+ encoder->newctx = OSSL_FUNC_encoder_newctx(fns);
break;
case OSSL_FUNC_ENCODER_FREECTX:
if (encoder->freectx == NULL)
- encoder->freectx =
- OSSL_FUNC_encoder_freectx(fns);
+ encoder->freectx = OSSL_FUNC_encoder_freectx(fns);
break;
case OSSL_FUNC_ENCODER_GET_PARAMS:
if (encoder->get_params == NULL)
- encoder->get_params =
- OSSL_FUNC_encoder_get_params(fns);
+ encoder->get_params = OSSL_FUNC_encoder_get_params(fns);
break;
case OSSL_FUNC_ENCODER_GETTABLE_PARAMS:
if (encoder->gettable_params == NULL)
- encoder->gettable_params =
- OSSL_FUNC_encoder_gettable_params(fns);
+ encoder->gettable_params = OSSL_FUNC_encoder_gettable_params(fns);
break;
case OSSL_FUNC_ENCODER_SET_CTX_PARAMS:
if (encoder->set_ctx_params == NULL)
- encoder->set_ctx_params =
- OSSL_FUNC_encoder_set_ctx_params(fns);
+ encoder->set_ctx_params = OSSL_FUNC_encoder_set_ctx_params(fns);
break;
case OSSL_FUNC_ENCODER_SETTABLE_CTX_PARAMS:
if (encoder->settable_ctx_params == NULL)
- encoder->settable_ctx_params =
- OSSL_FUNC_encoder_settable_ctx_params(fns);
+ encoder->settable_ctx_params = OSSL_FUNC_encoder_settable_ctx_params(fns);
break;
case OSSL_FUNC_ENCODER_DOES_SELECTION:
if (encoder->does_selection == NULL)
- encoder->does_selection =
- OSSL_FUNC_encoder_does_selection(fns);
+ encoder->does_selection = OSSL_FUNC_encoder_does_selection(fns);
break;
case OSSL_FUNC_ENCODER_ENCODE:
if (encoder->encode == NULL)
@@ -270,13 +264,11 @@ static void *encoder_from_algorithm(int id, const OSSL_ALGORITHM *algodef,
break;
case OSSL_FUNC_ENCODER_IMPORT_OBJECT:
if (encoder->import_object == NULL)
- encoder->import_object =
- OSSL_FUNC_encoder_import_object(fns);
+ encoder->import_object = OSSL_FUNC_encoder_import_object(fns);
break;
case OSSL_FUNC_ENCODER_FREE_OBJECT:
if (encoder->free_object == NULL)
- encoder->free_object =
- OSSL_FUNC_encoder_free_object(fns);
+ encoder->free_object = OSSL_FUNC_encoder_free_object(fns);
break;
}
}
@@ -286,9 +278,9 @@ static void *encoder_from_algorithm(int id, const OSSL_ALGORITHM *algodef,
* You must have the encoding driver functions.
*/
if (!((encoder->newctx == NULL && encoder->freectx == NULL)
- || (encoder->newctx != NULL && encoder->freectx != NULL)
- || (encoder->import_object != NULL && encoder->free_object != NULL)
- || (encoder->import_object == NULL && encoder->free_object == NULL))
+ || (encoder->newctx != NULL && encoder->freectx != NULL)
+ || (encoder->import_object != NULL && encoder->free_object != NULL)
+ || (encoder->import_object == NULL && encoder->free_object == NULL))
|| encoder->encode == NULL) {
OSSL_ENCODER_free(encoder);
ERR_raise(ERR_LIB_OSSL_ENCODER, ERR_R_INVALID_PROVIDER_FUNCTIONS);
@@ -304,14 +296,13 @@ static void *encoder_from_algorithm(int id, const OSSL_ALGORITHM *algodef,
return encoder;
}
-
/*
* The core fetching functionality passes the names of the implementation.
* This function is responsible to getting an identity number for them,
* then call encoder_from_algorithm() with that identity number.
*/
static void *construct_encoder(const OSSL_ALGORITHM *algodef,
- OSSL_PROVIDER *prov, void *data)
+ OSSL_PROVIDER *prov, void *data)
{
/*
* This function is only called if get_encoder_from_store() returned
@@ -359,7 +350,7 @@ static void free_encoder(void *method)
/* Fetching support. Can fetch by numeric identity or by name */
static OSSL_ENCODER *
inner_ossl_encoder_fetch(struct encoder_data_st *methdata,
- const char *name, const char *properties)
+ const char *name, const char *properties)
{
OSSL_METHOD_STORE *store = get_encoder_store(methdata->libctx);
OSSL_NAMEMAP *namemap = ossl_namemap_stored(methdata->libctx);
@@ -398,8 +389,9 @@ inner_ossl_encoder_fetch(struct encoder_data_st *methdata,
methdata->propquery = propq;
methdata->flag_construct_error_occurred = 0;
if ((method = ossl_method_construct(methdata->libctx, OSSL_OP_ENCODER,
- &prov, 0 /* !force_cache */,
- &mcm, methdata)) != NULL) {
+ &prov, 0 /* !force_cache */,
+ &mcm, methdata))
+ != NULL) {
/*
* If construction did create a method for us, we know that
* there is a correct name_id and meth_id, since those have
@@ -409,7 +401,7 @@ inner_ossl_encoder_fetch(struct encoder_data_st *methdata,
if (id == 0)
id = ossl_namemap_name2num(namemap, name);
ossl_method_store_cache_set(store, prov, id, propq, method,
- up_ref_encoder, free_encoder);
+ up_ref_encoder, free_encoder);
}
/*
@@ -425,17 +417,17 @@ inner_ossl_encoder_fetch(struct encoder_data_st *methdata,
if (name == NULL)
name = ossl_namemap_num2name(namemap, id, 0);
ERR_raise_data(ERR_LIB_OSSL_ENCODER, code,
- "%s, Name (%s : %d), Properties (%s)",
- ossl_lib_ctx_get_descriptor(methdata->libctx),
- name == NULL ? "<null>" : name, id,
- properties == NULL ? "<null>" : properties);
+ "%s, Name (%s : %d), Properties (%s)",
+ ossl_lib_ctx_get_descriptor(methdata->libctx),
+ name == NULL ? "<null>" : name, id,
+ properties == NULL ? "<null>" : properties);
}
return method;
}
OSSL_ENCODER *OSSL_ENCODER_fetch(OSSL_LIB_CTX *libctx, const char *name,
- const char *properties)
+ const char *properties)
{
struct encoder_data_st methdata;
void *method;
@@ -545,9 +537,9 @@ static void do_one(ossl_unused int id, void *method, void *arg)
}
void OSSL_ENCODER_do_all_provided(OSSL_LIB_CTX *libctx,
- void (*user_fn)(OSSL_ENCODER *encoder,
- void *arg),
- void *user_arg)
+ void (*user_fn)(OSSL_ENCODER *encoder,
+ void *arg),
+ void *user_arg)
{
struct encoder_data_st methdata;
struct do_one_data_st data;
@@ -565,8 +557,8 @@ void OSSL_ENCODER_do_all_provided(OSSL_LIB_CTX *libctx,
}
int OSSL_ENCODER_names_do_all(const OSSL_ENCODER *encoder,
- void (*fn)(const char *name, void *data),
- void *data)
+ void (*fn)(const char *name, void *data),
+ void *data)
{
if (encoder == NULL)
return 0;
@@ -622,7 +614,7 @@ OSSL_ENCODER_CTX *OSSL_ENCODER_CTX_new(void)
}
int OSSL_ENCODER_CTX_set_params(OSSL_ENCODER_CTX *ctx,
- const OSSL_PARAM params[])
+ const OSSL_PARAM params[])
{
int ok = 1;
int i;
@@ -638,8 +630,7 @@ int OSSL_ENCODER_CTX_set_params(OSSL_ENCODER_CTX *ctx,
l = OSSL_ENCODER_CTX_get_num_encoders(ctx);
for (i = 0; i < l; i++) {
- OSSL_ENCODER_INSTANCE *encoder_inst =
- sk_OSSL_ENCODER_INSTANCE_value(ctx->encoder_insts, i);
+ OSSL_ENCODER_INSTANCE *encoder_inst = sk_OSSL_ENCODER_INSTANCE_value(ctx->encoder_insts, i);
OSSL_ENCODER *encoder = OSSL_ENCODER_INSTANCE_get_encoder(encoder_inst);
void *encoderctx = OSSL_ENCODER_INSTANCE_get_encoder_ctx(encoder_inst);
@@ -655,7 +646,7 @@ void OSSL_ENCODER_CTX_free(OSSL_ENCODER_CTX *ctx)
{
if (ctx != NULL) {
sk_OSSL_ENCODER_INSTANCE_pop_free(ctx->encoder_insts,
- ossl_encoder_instance_free);
+ ossl_encoder_instance_free);
OPENSSL_free(ctx->construct_data);
ossl_pw_clear_passphrase_data(&ctx->pwdata);
OPENSSL_free(ctx);
diff --git a/crypto/encode_decode/encoder_pkey.c b/crypto/encode_decode/encoder_pkey.c
index 4d749edeab..87149f0805 100644
--- a/crypto/encode_decode/encoder_pkey.c
+++ b/crypto/encode_decode/encoder_pkey.c
@@ -24,44 +24,42 @@
DEFINE_STACK_OF(OSSL_ENCODER)
int OSSL_ENCODER_CTX_set_cipher(OSSL_ENCODER_CTX *ctx,
- const char *cipher_name,
- const char *propquery)
+ const char *cipher_name,
+ const char *propquery)
{
OSSL_PARAM params[] = { OSSL_PARAM_END, OSSL_PARAM_END, OSSL_PARAM_END };
- params[0] =
- OSSL_PARAM_construct_utf8_string(OSSL_ENCODER_PARAM_CIPHER,
- (void *)cipher_name, 0);
- params[1] =
- OSSL_PARAM_construct_utf8_string(OSSL_ENCODER_PARAM_PROPERTIES,
- (void *)propquery, 0);
+ params[0] = OSSL_PARAM_construct_utf8_string(OSSL_ENCODER_PARAM_CIPHER,
+ (void *)cipher_name, 0);
+ params[1] = OSSL_PARAM_construct_utf8_string(OSSL_ENCODER_PARAM_PROPERTIES,
+ (void *)propquery, 0);
return OSSL_ENCODER_CTX_set_params(ctx, params);
}
int OSSL_ENCODER_CTX_set_passphrase(OSSL_ENCODER_CTX *ctx,
- const unsigned char *kstr,
- size_t klen)
+ const unsigned char *kstr,
+ size_t klen)
{
return ossl_pw_set_passphrase(&ctx->pwdata, kstr, klen);
}
int OSSL_ENCODER_CTX_set_passphrase_ui(OSSL_ENCODER_CTX *ctx,
- const UI_METHOD *ui_method,
- void *ui_data)
+ const UI_METHOD *ui_method,
+ void *ui_data)
{
return ossl_pw_set_ui_method(&ctx->pwdata, ui_method, ui_data);
}
int OSSL_ENCODER_CTX_set_pem_password_cb(OSSL_ENCODER_CTX *ctx,
- pem_password_cb *cb, void *cbarg)
+ pem_password_cb *cb, void *cbarg)
{
return ossl_pw_set_pem_password_cb(&ctx->pwdata, cb, cbarg);
}
int OSSL_ENCODER_CTX_set_passphrase_cb(OSSL_ENCODER_CTX *ctx,
- OSSL_PASSPHRASE_CALLBACK *cb,
- void *cbarg)
+ OSSL_PASSPHRASE_CALLBACK *cb,
+ void *cbarg)
{
return ossl_pw_set_ossl_passphrase_cb(&ctx->pwdata, cb, cbarg);
}
@@ -79,7 +77,7 @@ struct collected_encoder_st {
const OSSL_PROVIDER *keymgmt_prov;
OSSL_ENCODER_CTX *ctx;
- unsigned int flag_find_same_provider:1;
+ unsigned int flag_find_same_provider : 1;
int error_occurred;
};
@@ -92,7 +90,7 @@ static void collect_encoder(OSSL_ENCODER *encoder, void *arg)
if (data->error_occurred)
return;
- data->error_occurred = 1; /* Assume the worst */
+ data->error_occurred = 1; /* Assume the worst */
prov = OSSL_ENCODER_get0_provider(encoder);
/*
@@ -111,7 +109,7 @@ static void collect_encoder(OSSL_ENCODER *encoder, void *arg)
match = (data->id_names[i] == encoder->base.id);
else
match = OSSL_ENCODER_is_a(encoder,
- sk_OPENSSL_CSTRING_value(data->names, i));
+ sk_OPENSSL_CSTRING_value(data->names, i));
if (!match
|| (encoder->does_selection != NULL
&& !encoder->does_selection(provctx, data->ctx->selection))
@@ -125,12 +123,12 @@ static void collect_encoder(OSSL_ENCODER *encoder, void *arg)
}
}
- data->error_occurred = 0; /* All is good now */
+ data->error_occurred = 0; /* All is good now */
}
struct collected_names_st {
STACK_OF(OPENSSL_CSTRING) *names;
- unsigned int error_occurred:1;
+ unsigned int error_occurred : 1;
};
static void collect_name(const char *name, void *arg)
@@ -140,12 +138,12 @@ static void collect_name(const char *name, void *arg)
if (data->error_occurred)
return;
- data->error_occurred = 1; /* Assume the worst */
+ data->error_occurred = 1; /* Assume the worst */
if (sk_OPENSSL_CSTRING_push(data->names, name) <= 0)
return;
- data->error_occurred = 0; /* All is good now */
+ data->error_occurred = 0; /* All is good now */
}
/*
@@ -170,8 +168,7 @@ static int encoder_import_cb(const OSSL_PARAM params[], void *arg)
OSSL_ENCODER *encoder = OSSL_ENCODER_INSTANCE_get_encoder(encoder_inst);
void *encoderctx = OSSL_ENCODER_INSTANCE_get_encoder_ctx(encoder_inst);
- construct_data->constructed_obj =
- encoder->import_object(encoderctx, construct_data->selection, params);
+ construct_data->constructed_obj = encoder->import_object(encoderctx, construct_data->selection, params);
return (construct_data->constructed_obj != NULL);
}
@@ -182,8 +179,7 @@ encoder_construct_pkey(OSSL_ENCODER_INSTANCE *encoder_inst, void *arg)
struct construct_data_st *data = arg;
if (data->obj == NULL) {
- OSSL_ENCODER *encoder =
- OSSL_ENCODER_INSTANCE_get_encoder(encoder_inst);
+ OSSL_ENCODER *encoder = OSSL_ENCODER_INSTANCE_get_encoder(encoder_inst);
const EVP_PKEY *pk = data->pk;
const OSSL_PROVIDER *k_prov = EVP_KEYMGMT_get0_provider(pk->keymgmt);
const OSSL_PROVIDER *e_prov = OSSL_ENCODER_get0_provider(encoder);
@@ -196,7 +192,7 @@ encoder_construct_pkey(OSSL_ENCODER_INSTANCE *encoder_inst, void *arg)
data->encoder_inst = encoder_inst;
if (!evp_keymgmt_export(pk->keymgmt, pk->keydata, selection,
- &encoder_import_cb, data))
+ &encoder_import_cb, data))
return NULL;
data->obj = data->constructed_obj;
} else {
@@ -213,8 +209,7 @@ static void encoder_destruct_pkey(void *arg)
int match = (data->obj == data->constructed_obj);
if (data->encoder_inst != NULL) {
- OSSL_ENCODER *encoder =
- OSSL_ENCODER_INSTANCE_get_encoder(data->encoder_inst);
+ OSSL_ENCODER *encoder = OSSL_ENCODER_INSTANCE_get_encoder(data->encoder_inst);
encoder->free_object(data->constructed_obj);
}
@@ -230,9 +225,9 @@ static void encoder_destruct_pkey(void *arg)
* and to use fallback methods if the result is NULL.
*/
static int ossl_encoder_ctx_setup_for_pkey(OSSL_ENCODER_CTX *ctx,
- const EVP_PKEY *pkey,
- int selection,
- const char *propquery)
+ const EVP_PKEY *pkey,
+ int selection,
+ const char *propquery)
{
struct construct_data_st *data = NULL;
const OSSL_PROVIDER *prov = NULL;
@@ -332,11 +327,11 @@ static int ossl_encoder_ctx_setup_for_pkey(OSSL_ENCODER_CTX *ctx,
data->pk = pkey;
data->selection = selection;
- data = NULL; /* Avoid it being freed */
+ data = NULL; /* Avoid it being freed */
}
ok = 1;
- err:
+err:
if (data != NULL) {
OSSL_ENCODER_CTX_set_construct_data(ctx, NULL);
OPENSSL_free(data);
@@ -345,10 +340,10 @@ static int ossl_encoder_ctx_setup_for_pkey(OSSL_ENCODER_CTX *ctx,
}
OSSL_ENCODER_CTX *OSSL_ENCODER_CTX_new_for_pkey(const EVP_PKEY *pkey,
- int selection,
- const char *output_type,
- const char *output_struct,
- const char *propquery)
+ int selection,
+ const char *output_type,
+ const char *output_struct,
+ const char *propquery)
{
OSSL_ENCODER_CTX *ctx = NULL;
OSSL_LIB_CTX *libctx = NULL;
@@ -360,7 +355,7 @@ OSSL_ENCODER_CTX *OSSL_ENCODER_CTX_new_for_pkey(const EVP_PKEY *pkey,
if (!evp_pkey_is_assigned(pkey)) {
ERR_raise_data(ERR_LIB_OSSL_ENCODER, ERR_R_PASSED_INVALID_ARGUMENT,
- "The passed EVP_PKEY must be assigned a key");
+ "The passed EVP_PKEY must be assigned a key");
return NULL;
}
@@ -375,13 +370,15 @@ OSSL_ENCODER_CTX *OSSL_ENCODER_CTX_new_for_pkey(const EVP_PKEY *pkey,
libctx = ossl_provider_libctx(prov);
}
- OSSL_TRACE_BEGIN(ENCODER) {
+ OSSL_TRACE_BEGIN(ENCODER)
+ {
BIO_printf(trc_out,
- "(ctx %p) Looking for %s encoders with selection %d\n",
- (void *)ctx, EVP_PKEY_get0_type_name(pkey), selection);
+ "(ctx %p) Looking for %s encoders with selection %d\n",
+ (void *)ctx, EVP_PKEY_get0_type_name(pkey), selection);
BIO_printf(trc_out, " output type: %s, output structure: %s\n",
- output_type, output_struct);
- } OSSL_TRACE_END(ENCODER);
+ output_type, output_struct);
+ }
+ OSSL_TRACE_END(ENCODER);
if (OSSL_ENCODER_CTX_set_output_type(ctx, output_type)
&& (output_struct == NULL
@@ -394,14 +391,16 @@ OSSL_ENCODER_CTX *OSSL_ENCODER_CTX_new_for_pkey(const EVP_PKEY *pkey,
ctx->frozen = 1;
params[0] = OSSL_PARAM_construct_int(OSSL_ENCODER_PARAM_SAVE_PARAMETERS,
- &save_parameters);
+ &save_parameters);
/* ignoring error as this is only auxiliary parameter */
(void)OSSL_ENCODER_CTX_set_params(ctx, params);
- OSSL_TRACE_BEGIN(ENCODER) {
+ OSSL_TRACE_BEGIN(ENCODER)
+ {
BIO_printf(trc_out, "(ctx %p) Got %d encoders\n",
- (void *)ctx, OSSL_ENCODER_CTX_get_num_encoders(ctx));
- } OSSL_TRACE_END(ENCODER);
+ (void *)ctx, OSSL_ENCODER_CTX_get_num_encoders(ctx));
+ }
+ OSSL_TRACE_END(ENCODER);
return ctx;
}
diff --git a/crypto/err/err.c b/crypto/err/err.c
index a127988a0d..e9920f00e3 100644
--- a/crypto/err/err.c
+++ b/crypto/err/err.c
@@ -36,50 +36,50 @@ static int err_load_strings(const ERR_STRING_DATA *str);
#ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA ERR_str_libraries[] = {
- {ERR_PACK(ERR_LIB_NONE, 0, 0), "unknown library"},
- {ERR_PACK(ERR_LIB_SYS, 0, 0), "system library"},
- {ERR_PACK(ERR_LIB_BN, 0, 0), "bignum routines"},
- {ERR_PACK(ERR_LIB_RSA, 0, 0), "rsa routines"},
- {ERR_PACK(ERR_LIB_DH, 0, 0), "Diffie-Hellman routines"},
- {ERR_PACK(ERR_LIB_EVP, 0, 0), "digital envelope routines"},
- {ERR_PACK(ERR_LIB_BUF, 0, 0), "memory buffer routines"},
- {ERR_PACK(ERR_LIB_OBJ, 0, 0), "object identifier routines"},
- {ERR_PACK(ERR_LIB_PEM, 0, 0), "PEM routines"},
- {ERR_PACK(ERR_LIB_DSA, 0, 0), "dsa routines"},
- {ERR_PACK(ERR_LIB_X509, 0, 0), "x509 certificate routines"},
- {ERR_PACK(ERR_LIB_ASN1, 0, 0), "asn1 encoding routines"},
- {ERR_PACK(ERR_LIB_CONF, 0, 0), "configuration file routines"},
- {ERR_PACK(ERR_LIB_CRYPTO, 0, 0), "common libcrypto routines"},
- {ERR_PACK(ERR_LIB_EC, 0, 0), "elliptic curve routines"},
- {ERR_PACK(ERR_LIB_ECDSA, 0, 0), "ECDSA routines"},
- {ERR_PACK(ERR_LIB_ECDH, 0, 0), "ECDH routines"},
- {ERR_PACK(ERR_LIB_SSL, 0, 0), "SSL routines"},
- {ERR_PACK(ERR_LIB_BIO, 0, 0), "BIO routines"},
- {ERR_PACK(ERR_LIB_PKCS7, 0, 0), "PKCS7 routines"},
- {ERR_PACK(ERR_LIB_X509V3, 0, 0), "X509 V3 routines"},
- {ERR_PACK(ERR_LIB_PKCS12, 0, 0), "PKCS12 routines"},
- {ERR_PACK(ERR_LIB_RAND, 0, 0), "random number generator"},
- {ERR_PACK(ERR_LIB_DSO, 0, 0), "DSO support routines"},
- {ERR_PACK(ERR_LIB_TS, 0, 0), "time stamp routines"},
- {ERR_PACK(ERR_LIB_ENGINE, 0, 0), "engine routines"},
- {ERR_PACK(ERR_LIB_OCSP, 0, 0), "OCSP routines"},
- {ERR_PACK(ERR_LIB_UI, 0, 0), "UI routines"},
- {ERR_PACK(ERR_LIB_FIPS, 0, 0), "FIPS routines"},
- {ERR_PACK(ERR_LIB_CMS, 0, 0), "CMS routines"},
- {ERR_PACK(ERR_LIB_CRMF, 0, 0), "CRMF routines"},
- {ERR_PACK(ERR_LIB_CMP, 0, 0), "CMP routines"},
- {ERR_PACK(ERR_LIB_HMAC, 0, 0), "HMAC routines"},
- {ERR_PACK(ERR_LIB_CT, 0, 0), "CT routines"},
- {ERR_PACK(ERR_LIB_ASYNC, 0, 0), "ASYNC routines"},
- {ERR_PACK(ERR_LIB_KDF, 0, 0), "KDF routines"},
- {ERR_PACK(ERR_LIB_OSSL_STORE, 0, 0), "STORE routines"},
- {ERR_PACK(ERR_LIB_SM2, 0, 0), "SM2 routines"},
- {ERR_PACK(ERR_LIB_ESS, 0, 0), "ESS routines"},
- {ERR_PACK(ERR_LIB_PROV, 0, 0), "Provider routines"},
- {ERR_PACK(ERR_LIB_OSSL_ENCODER, 0, 0), "ENCODER routines"},
- {ERR_PACK(ERR_LIB_OSSL_DECODER, 0, 0), "DECODER routines"},
- {ERR_PACK(ERR_LIB_HTTP, 0, 0), "HTTP routines"},
- {0, NULL},
+ { ERR_PACK(ERR_LIB_NONE, 0, 0), "unknown library" },
+ { ERR_PACK(ERR_LIB_SYS, 0, 0), "system library" },
+ { ERR_PACK(ERR_LIB_BN, 0, 0), "bignum routines" },
+ { ERR_PACK(ERR_LIB_RSA, 0, 0), "rsa routines" },
+ { ERR_PACK(ERR_LIB_DH, 0, 0), "Diffie-Hellman routines" },
+ { ERR_PACK(ERR_LIB_EVP, 0, 0), "digital envelope routines" },
+ { ERR_PACK(ERR_LIB_BUF, 0, 0), "memory buffer routines" },
+ { ERR_PACK(ERR_LIB_OBJ, 0, 0), "object identifier routines" },
+ { ERR_PACK(ERR_LIB_PEM, 0, 0), "PEM routines" },
+ { ERR_PACK(ERR_LIB_DSA, 0, 0), "dsa routines" },
+ { ERR_PACK(ERR_LIB_X509, 0, 0), "x509 certificate routines" },
+ { ERR_PACK(ERR_LIB_ASN1, 0, 0), "asn1 encoding routines" },
+ { ERR_PACK(ERR_LIB_CONF, 0, 0), "configuration file routines" },
+ { ERR_PACK(ERR_LIB_CRYPTO, 0, 0), "common libcrypto routines" },
+ { ERR_PACK(ERR_LIB_EC, 0, 0), "elliptic curve routines" },
+ { ERR_PACK(ERR_LIB_ECDSA, 0, 0), "ECDSA routines" },
+ { ERR_PACK(ERR_LIB_ECDH, 0, 0), "ECDH routines" },
+ { ERR_PACK(ERR_LIB_SSL, 0, 0), "SSL routines" },
+ { ERR_PACK(ERR_LIB_BIO, 0, 0), "BIO routines" },
+ { ERR_PACK(ERR_LIB_PKCS7, 0, 0), "PKCS7 routines" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, 0), "X509 V3 routines" },
+ { ERR_PACK(ERR_LIB_PKCS12, 0, 0), "PKCS12 routines" },
+ { ERR_PACK(ERR_LIB_RAND, 0, 0), "random number generator" },
+ { ERR_PACK(ERR_LIB_DSO, 0, 0), "DSO support routines" },
+ { ERR_PACK(ERR_LIB_TS, 0, 0), "time stamp routines" },
+ { ERR_PACK(ERR_LIB_ENGINE, 0, 0), "engine routines" },
+ { ERR_PACK(ERR_LIB_OCSP, 0, 0), "OCSP routines" },
+ { ERR_PACK(ERR_LIB_UI, 0, 0), "UI routines" },
+ { ERR_PACK(ERR_LIB_FIPS, 0, 0), "FIPS routines" },
+ { ERR_PACK(ERR_LIB_CMS, 0, 0), "CMS routines" },
+ { ERR_PACK(ERR_LIB_CRMF, 0, 0), "CRMF routines" },
+ { ERR_PACK(ERR_LIB_CMP, 0, 0), "CMP routines" },
+ { ERR_PACK(ERR_LIB_HMAC, 0, 0), "HMAC routines" },
+ { ERR_PACK(ERR_LIB_CT, 0, 0), "CT routines" },
+ { ERR_PACK(ERR_LIB_ASYNC, 0, 0), "ASYNC routines" },
+ { ERR_PACK(ERR_LIB_KDF, 0, 0), "KDF routines" },
+ { ERR_PACK(ERR_LIB_OSSL_STORE, 0, 0), "STORE routines" },
+ { ERR_PACK(ERR_LIB_SM2, 0, 0), "SM2 routines" },
+ { ERR_PACK(ERR_LIB_ESS, 0, 0), "ESS routines" },
+ { ERR_PACK(ERR_LIB_PROV, 0, 0), "Provider routines" },
+ { ERR_PACK(ERR_LIB_OSSL_ENCODER, 0, 0), "ENCODER routines" },
+ { ERR_PACK(ERR_LIB_OSSL_DECODER, 0, 0), "DECODER routines" },
+ { ERR_PACK(ERR_LIB_HTTP, 0, 0), "HTTP routines" },
+ { 0, NULL },
};
/*
@@ -87,55 +87,55 @@ static const ERR_STRING_DATA ERR_str_libraries[] = {
* are listed. For maintainability, please keep all reasons in the same order.
*/
static const ERR_STRING_DATA ERR_str_reasons[] = {
- {ERR_R_SYS_LIB, "system lib"},
- {ERR_R_BN_LIB, "BN lib"},
- {ERR_R_RSA_LIB, "RSA lib"},
- {ERR_R_DH_LIB, "DH lib"},
- {ERR_R_EVP_LIB, "EVP lib"},
- {ERR_R_BUF_LIB, "BUF lib"},
- {ERR_R_OBJ_LIB, "OBJ lib"},
- {ERR_R_PEM_LIB, "PEM lib"},
- {ERR_R_DSA_LIB, "DSA lib"},
- {ERR_R_X509_LIB, "X509 lib"},
- {ERR_R_ASN1_LIB, "ASN1 lib"},
- {ERR_R_CRYPTO_LIB, "CRYPTO lib"},
- {ERR_R_EC_LIB, "EC lib"},
- {ERR_R_BIO_LIB, "BIO lib"},
- {ERR_R_PKCS7_LIB, "PKCS7 lib"},
- {ERR_R_X509V3_LIB, "X509V3 lib"},
- {ERR_R_ENGINE_LIB, "ENGINE lib"},
- {ERR_R_UI_LIB, "UI lib"},
- {ERR_R_ECDSA_LIB, "ECDSA lib"},
- {ERR_R_OSSL_STORE_LIB, "OSSL_STORE lib"},
- {ERR_R_OSSL_DECODER_LIB, "OSSL_DECODER lib"},
-
- {ERR_R_FATAL, "fatal"},
- {ERR_R_MALLOC_FAILURE, "malloc failure"},
- {ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED,
- "called a function you should not call"},
- {ERR_R_PASSED_NULL_PARAMETER, "passed a null parameter"},
- {ERR_R_INTERNAL_ERROR, "internal error"},
- {ERR_R_DISABLED, "called a function that was disabled at compile-time"},
- {ERR_R_INIT_FAIL, "init fail"},
- {ERR_R_PASSED_INVALID_ARGUMENT, "passed invalid argument"},
- {ERR_R_OPERATION_FAIL, "operation fail"},
- {ERR_R_INVALID_PROVIDER_FUNCTIONS, "invalid provider functions"},
- {ERR_R_INTERRUPTED_OR_CANCELLED, "interrupted or cancelled"},
- {ERR_R_NESTED_ASN1_ERROR, "nested asn1 error"},
- {ERR_R_MISSING_ASN1_EOS, "missing asn1 eos"},
+ { ERR_R_SYS_LIB, "system lib" },
+ { ERR_R_BN_LIB, "BN lib" },
+ { ERR_R_RSA_LIB, "RSA lib" },
+ { ERR_R_DH_LIB, "DH lib" },
+ { ERR_R_EVP_LIB, "EVP lib" },
+ { ERR_R_BUF_LIB, "BUF lib" },
+ { ERR_R_OBJ_LIB, "OBJ lib" },
+ { ERR_R_PEM_LIB, "PEM lib" },
+ { ERR_R_DSA_LIB, "DSA lib" },
+ { ERR_R_X509_LIB, "X509 lib" },
+ { ERR_R_ASN1_LIB, "ASN1 lib" },
+ { ERR_R_CRYPTO_LIB, "CRYPTO lib" },
+ { ERR_R_EC_LIB, "EC lib" },
+ { ERR_R_BIO_LIB, "BIO lib" },
+ { ERR_R_PKCS7_LIB, "PKCS7 lib" },
+ { ERR_R_X509V3_LIB, "X509V3 lib" },
+ { ERR_R_ENGINE_LIB, "ENGINE lib" },
+ { ERR_R_UI_LIB, "UI lib" },
+ { ERR_R_ECDSA_LIB, "ECDSA lib" },
+ { ERR_R_OSSL_STORE_LIB, "OSSL_STORE lib" },
+ { ERR_R_OSSL_DECODER_LIB, "OSSL_DECODER lib" },
+
+ { ERR_R_FATAL, "fatal" },
+ { ERR_R_MALLOC_FAILURE, "malloc failure" },
+ { ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED,
+ "called a function you should not call" },
+ { ERR_R_PASSED_NULL_PARAMETER, "passed a null parameter" },
+ { ERR_R_INTERNAL_ERROR, "internal error" },
+ { ERR_R_DISABLED, "called a function that was disabled at compile-time" },
+ { ERR_R_INIT_FAIL, "init fail" },
+ { ERR_R_PASSED_INVALID_ARGUMENT, "passed invalid argument" },
+ { ERR_R_OPERATION_FAIL, "operation fail" },
+ { ERR_R_INVALID_PROVIDER_FUNCTIONS, "invalid provider functions" },
+ { ERR_R_INTERRUPTED_OR_CANCELLED, "interrupted or cancelled" },
+ { ERR_R_NESTED_ASN1_ERROR, "nested asn1 error" },
+ { ERR_R_MISSING_ASN1_EOS, "missing asn1 eos" },
/*
* Something is unsupported, exactly what is expressed with additional data
*/
- {ERR_R_UNSUPPORTED, "unsupported"},
+ { ERR_R_UNSUPPORTED, "unsupported" },
/*
* A fetch failed for other reasons than the name to be fetched being
* unsupported.
*/
- {ERR_R_FETCH_FAILED, "fetch failed"},
- {ERR_R_INVALID_PROPERTY_DEFINITION, "invalid property definition"},
- {ERR_R_UNABLE_TO_GET_READ_LOCK, "unable to get read lock"},
- {ERR_R_UNABLE_TO_GET_WRITE_LOCK, "unable to get write lock"},
- {0, NULL},
+ { ERR_R_FETCH_FAILED, "fetch failed" },
+ { ERR_R_INVALID_PROPERTY_DEFINITION, "invalid property definition" },
+ { ERR_R_UNABLE_TO_GET_READ_LOCK, "unable to get read lock" },
+ { ERR_R_UNABLE_TO_GET_WRITE_LOCK, "unable to get write lock" },
+ { 0, NULL },
};
#endif
@@ -156,13 +156,15 @@ static LHASH_OF(ERR_STRING_DATA) *int_error_hash = NULL;
static int int_err_library_number = ERR_LIB_USER;
typedef enum ERR_GET_ACTION_e {
- EV_POP, EV_PEEK, EV_PEEK_LAST
+ EV_POP,
+ EV_PEEK,
+ EV_PEEK_LAST
} ERR_GET_ACTION;
static unsigned long get_error_values(ERR_GET_ACTION g,
- const char **file, int *line,
- const char **func, const char **data,
- int *flags);
+ const char **file, int *line,
+ const char **func, const char **data,
+ int *flags);
#ifndef OPENSSL_NO_ERR
static unsigned long err_string_data_hash(const ERR_STRING_DATA *a)
@@ -175,7 +177,7 @@ static unsigned long err_string_data_hash(const ERR_STRING_DATA *a)
}
static int err_string_data_cmp(const ERR_STRING_DATA *a,
- const ERR_STRING_DATA *b)
+ const ERR_STRING_DATA *b)
{
if (a->error == b->error)
return 0;
@@ -216,7 +218,7 @@ DEFINE_RUN_ONCE_STATIC(do_err_strings_init)
return 0;
#ifndef OPENSSL_NO_ERR
int_error_hash = lh_ERR_STRING_DATA_new(err_string_data_hash,
- err_string_data_cmp);
+ err_string_data_cmp);
if (int_error_hash == NULL) {
CRYPTO_THREAD_lock_free(err_string_lock);
err_string_lock = NULL;
@@ -257,7 +259,7 @@ static int err_load_strings(const ERR_STRING_DATA *str)
return 0;
for (; str->error; str++)
(void)lh_ERR_STRING_DATA_insert(int_error_hash,
- (ERR_STRING_DATA *)str);
+ (ERR_STRING_DATA *)str);
CRYPTO_THREAD_unlock(err_string_lock);
return 1;
}
@@ -347,8 +349,8 @@ unsigned long ERR_get_error(void)
}
unsigned long ERR_get_error_all(const char **file, int *line,
- const char **func,
- const char **data, int *flags)
+ const char **func,
+ const char **data, int *flags)
{
return get_error_values(EV_POP, file, line, func, data, flags);
}
@@ -360,7 +362,7 @@ unsigned long ERR_get_error_line(const char **file, int *line)
}
unsigned long ERR_get_error_line_data(const char **file, int *line,
- const char **data, int *flags)
+ const char **data, int *flags)
{
return get_error_values(EV_POP, file, line, NULL, data, flags);
}
@@ -387,15 +389,15 @@ unsigned long ERR_peek_error_data(const char **data, int *flags)
}
unsigned long ERR_peek_error_all(const char **file, int *line,
- const char **func,
- const char **data, int *flags)
+ const char **func,
+ const char **data, int *flags)
{
return get_error_values(EV_PEEK, file, line, func, data, flags);
}
#ifndef OPENSSL_NO_DEPRECATED_3_0
unsigned long ERR_peek_error_line_data(const char **file, int *line,
- const char **data, int *flags)
+ const char **data, int *flags)
{
return get_error_values(EV_PEEK, file, line, NULL, data, flags);
}
@@ -422,24 +424,24 @@ unsigned long ERR_peek_last_error_data(const char **data, int *flags)
}
unsigned long ERR_peek_last_error_all(const char **file, int *line,
- const char **func,
- const char **data, int *flags)
+ const char **func,
+ const char **data, int *flags)
{
return get_error_values(EV_PEEK_LAST, file, line, func, data, flags);
}
#ifndef OPENSSL_NO_DEPRECATED_3_0
unsigned long ERR_peek_last_error_line_data(const char **file, int *line,
- const char **data, int *flags)
+ const char **data, int *flags)
{
return get_error_values(EV_PEEK_LAST, file, line, NULL, data, flags);
}
#endif
static unsigned long get_error_values(ERR_GET_ACTION g,
- const char **file, int *line,
- const char **func,
- const char **data, int *flags)
+ const char **file, int *line,
+ const char **func,
+ const char **data, int *flags)
{
int i = 0;
ERR_STATE *es;
@@ -514,7 +516,7 @@ static unsigned long get_error_values(ERR_GET_ACTION g,
}
void ossl_err_string_int(unsigned long e, const char *func,
- char *buf, size_t len)
+ char *buf, size_t len)
{
char lsbuf[64], rsbuf[256];
const char *ls, *rs = NULL;
@@ -547,7 +549,7 @@ void ossl_err_string_int(unsigned long e, const char *func,
#endif
if (rs == NULL) {
BIO_snprintf(rsbuf, sizeof(rsbuf), "reason(%lu)",
- r & ~(ERR_RFLAGS_MASK << ERR_RFLAGS_OFFSET));
+ r & ~(ERR_RFLAGS_MASK << ERR_RFLAGS_OFFSET));
rs = rsbuf;
}
@@ -558,7 +560,6 @@ void ossl_err_string_int(unsigned long e, const char *func,
}
}
-
void ERR_error_string_n(unsigned long e, char *buf, size_t len)
{
ossl_err_string_int(e, "", buf, len);
@@ -639,13 +640,13 @@ const char *ERR_reason_error_string(unsigned long e)
static void err_delete_thread_state(void *unused)
{
ERR_STATE *state = CRYPTO_THREAD_get_local_ex(CRYPTO_THREAD_LOCAL_ERR_KEY,
- CRYPTO_THREAD_NO_CONTEXT);
+ CRYPTO_THREAD_NO_CONTEXT);
if (state == NULL)
return;
CRYPTO_THREAD_set_local_ex(CRYPTO_THREAD_LOCAL_ERR_KEY,
- CRYPTO_THREAD_NO_CONTEXT, NULL);
+ CRYPTO_THREAD_NO_CONTEXT, NULL);
OSSL_ERR_STATE_free(state);
}
@@ -670,28 +671,28 @@ ERR_STATE *ossl_err_get_state_int(void)
return NULL;
state = CRYPTO_THREAD_get_local_ex(CRYPTO_THREAD_LOCAL_ERR_KEY,
- CRYPTO_THREAD_NO_CONTEXT);
+ CRYPTO_THREAD_NO_CONTEXT);
if (state == (ERR_STATE *)-1)
return NULL;
if (state == NULL) {
if (!CRYPTO_THREAD_set_local_ex(CRYPTO_THREAD_LOCAL_ERR_KEY,
- CRYPTO_THREAD_NO_CONTEXT, (ERR_STATE *)-1))
+ CRYPTO_THREAD_NO_CONTEXT, (ERR_STATE *)-1))
return NULL;
state = OSSL_ERR_STATE_new();
if (state == NULL) {
CRYPTO_THREAD_set_local_ex(CRYPTO_THREAD_LOCAL_ERR_KEY,
- CRYPTO_THREAD_NO_CONTEXT, NULL);
+ CRYPTO_THREAD_NO_CONTEXT, NULL);
return NULL;
}
if (!ossl_init_thread_start(NULL, NULL, err_delete_thread_state)
- || !CRYPTO_THREAD_set_local_ex(CRYPTO_THREAD_LOCAL_ERR_KEY,
- CRYPTO_THREAD_NO_CONTEXT, state)) {
+ || !CRYPTO_THREAD_set_local_ex(CRYPTO_THREAD_LOCAL_ERR_KEY,
+ CRYPTO_THREAD_NO_CONTEXT, state)) {
OSSL_ERR_STATE_free(state);
CRYPTO_THREAD_set_local_ex(CRYPTO_THREAD_LOCAL_ERR_KEY,
- CRYPTO_THREAD_NO_CONTEXT, NULL);
+ CRYPTO_THREAD_NO_CONTEXT, NULL);
return NULL;
}
@@ -710,7 +711,6 @@ ERR_STATE *ERR_get_state(void)
}
#endif
-
/*
* err_shelve_state returns the current thread local error state
* and freezes the error module until err_unshelve_state is called.
@@ -735,9 +735,9 @@ int err_shelve_state(void **state)
return 0;
*state = CRYPTO_THREAD_get_local_ex(CRYPTO_THREAD_LOCAL_ERR_KEY,
- CRYPTO_THREAD_NO_CONTEXT);
+ CRYPTO_THREAD_NO_CONTEXT);
if (!CRYPTO_THREAD_set_local_ex(CRYPTO_THREAD_LOCAL_ERR_KEY,
- CRYPTO_THREAD_NO_CONTEXT, (ERR_STATE *)-1))
+ CRYPTO_THREAD_NO_CONTEXT, (ERR_STATE *)-1))
return 0;
set_sys_error(saveerrno);
@@ -748,11 +748,11 @@ int err_shelve_state(void **state)
* err_unshelve_state restores the error state that was returned
* by err_shelve_state previously.
*/
-void err_unshelve_state(void* state)
+void err_unshelve_state(void *state)
{
- if (state != (void*)-1)
+ if (state != (void *)-1)
CRYPTO_THREAD_set_local_ex(CRYPTO_THREAD_LOCAL_ERR_KEY,
- CRYPTO_THREAD_NO_CONTEXT, (ERR_STATE *)state);
+ CRYPTO_THREAD_NO_CONTEXT, (ERR_STATE *)state);
}
int ERR_get_next_error_library(void)
@@ -770,7 +770,7 @@ int ERR_get_next_error_library(void)
}
static int err_set_error_data_int(char *data, size_t size, int flags,
- int deallocate)
+ int deallocate)
{
ERR_STATE *es;
@@ -830,7 +830,7 @@ void ERR_add_error_vdata(int num, va_list args)
* Otherwise, allocate a small new buffer.
*/
if ((es->err_data_flags[i] & flags) == flags
- && ossl_assert(es->err_data[i] != NULL)) {
+ && ossl_assert(es->err_data[i] != NULL)) {
str = es->err_data[i];
size = es->err_data_size[i];
@@ -888,6 +888,6 @@ void err_clear_last_constant_time(int clear)
* accessing the same error stack location, revealing timing information.
*/
clear = constant_time_select_int(constant_time_eq_int(clear, 0),
- 0, ERR_FLAG_CLEAR);
+ 0, ERR_FLAG_CLEAR);
es->err_flags[top] |= clear;
}
diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c
index 9463cf62ea..be3d91280a 100644
--- a/crypto/err/err_all.c
+++ b/crypto/err/err_all.c
@@ -51,26 +51,26 @@ int ossl_err_load_crypto_strings(void)
|| ossl_err_load_ERR_strings() == 0 /* include error strings for SYSerr */
|| ossl_err_load_BN_strings() == 0
|| ossl_err_load_RSA_strings() == 0
-# ifndef OPENSSL_NO_DH
+#ifndef OPENSSL_NO_DH
|| ossl_err_load_DH_strings() == 0
-# endif
+#endif
|| ossl_err_load_EVP_strings() == 0
|| ossl_err_load_BUF_strings() == 0
|| ossl_err_load_OBJ_strings() == 0
|| ossl_err_load_PEM_strings() == 0
-# ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DSA
|| ossl_err_load_DSA_strings() == 0
-# endif
+#endif
|| ossl_err_load_X509_strings() == 0
|| ossl_err_load_ASN1_strings() == 0
|| ossl_err_load_CONF_strings() == 0
|| ossl_err_load_CRYPTO_strings() == 0
-# ifndef OPENSSL_NO_COMP
+#ifndef OPENSSL_NO_COMP
|| ossl_err_load_COMP_strings() == 0
-# endif
-# ifndef OPENSSL_NO_EC
+#endif
+#ifndef OPENSSL_NO_EC
|| ossl_err_load_EC_strings() == 0
-# endif
+#endif
/* skip ossl_err_load_SSL_strings() because it is not in this library */
|| ossl_err_load_BIO_strings() == 0
|| ossl_err_load_PKCS7_strings() == 0
@@ -78,33 +78,33 @@ int ossl_err_load_crypto_strings(void)
|| ossl_err_load_PKCS12_strings() == 0
|| ossl_err_load_RAND_strings() == 0
|| ossl_err_load_DSO_strings() == 0
-# ifndef OPENSSL_NO_TS
+#ifndef OPENSSL_NO_TS
|| ossl_err_load_TS_strings() == 0
-# endif
-# ifndef OPENSSL_NO_HTTP
+#endif
+#ifndef OPENSSL_NO_HTTP
|| ossl_err_load_HTTP_strings() == 0
-# endif
-# ifndef OPENSSL_NO_OCSP
+#endif
+#ifndef OPENSSL_NO_OCSP
|| ossl_err_load_OCSP_strings() == 0
-# endif
+#endif
|| ossl_err_load_UI_strings() == 0
-# ifndef OPENSSL_NO_CMS
+#ifndef OPENSSL_NO_CMS
|| ossl_err_load_CMS_strings() == 0
-# endif
-# ifndef OPENSSL_NO_CRMF
+#endif
+#ifndef OPENSSL_NO_CRMF
|| ossl_err_load_CRMF_strings() == 0
|| ossl_err_load_CMP_strings() == 0
-# endif
-# ifndef OPENSSL_NO_CT
+#endif
+#ifndef OPENSSL_NO_CT
|| ossl_err_load_CT_strings() == 0
-# endif
+#endif
|| ossl_err_load_ESS_strings() == 0
|| ossl_err_load_ASYNC_strings() == 0
|| ossl_err_load_OSSL_STORE_strings() == 0
|| ossl_err_load_PROP_strings() == 0
|| ossl_err_load_PROV_strings() == 0
#endif
- )
+ )
return 0;
return 1;
diff --git a/crypto/err/err_all_legacy.c b/crypto/err/err_all_legacy.c
index 1a1443597f..1817e85fa0 100644
--- a/crypto/err/err_all_legacy.c
+++ b/crypto/err/err_all_legacy.c
@@ -12,90 +12,90 @@
#ifndef OPENSSL_NO_DEPRECATED_3_0
-# include "crypto/err.h"
-# include "crypto/asn1err.h"
-# include "crypto/asyncerr.h"
-# include "crypto/bnerr.h"
-# include "crypto/buffererr.h"
-# include "crypto/bioerr.h"
-# include "crypto/cmserr.h"
-# include "crypto/comperr.h"
-# include "crypto/conferr.h"
-# include "crypto/cryptoerr.h"
-# include "crypto/cterr.h"
-# include "crypto/dherr.h"
-# include "crypto/dsaerr.h"
-# include "internal/dsoerr.h"
-# include "crypto/ecerr.h"
-# include "crypto/evperr.h"
-# include "crypto/httperr.h"
-# include "crypto/objectserr.h"
-# include "crypto/ocsperr.h"
-# include "crypto/pemerr.h"
-# include "crypto/pkcs12err.h"
-# include "crypto/pkcs7err.h"
-# include "crypto/randerr.h"
-# include "crypto/rsaerr.h"
-# include "crypto/storeerr.h"
-# include "crypto/tserr.h"
-# include "crypto/uierr.h"
-# include "crypto/x509err.h"
-# include "crypto/x509v3err.h"
+#include "crypto/err.h"
+#include "crypto/asn1err.h"
+#include "crypto/asyncerr.h"
+#include "crypto/bnerr.h"
+#include "crypto/buffererr.h"
+#include "crypto/bioerr.h"
+#include "crypto/cmserr.h"
+#include "crypto/comperr.h"
+#include "crypto/conferr.h"
+#include "crypto/cryptoerr.h"
+#include "crypto/cterr.h"
+#include "crypto/dherr.h"
+#include "crypto/dsaerr.h"
+#include "internal/dsoerr.h"
+#include "crypto/ecerr.h"
+#include "crypto/evperr.h"
+#include "crypto/httperr.h"
+#include "crypto/objectserr.h"
+#include "crypto/ocsperr.h"
+#include "crypto/pemerr.h"
+#include "crypto/pkcs12err.h"
+#include "crypto/pkcs7err.h"
+#include "crypto/randerr.h"
+#include "crypto/rsaerr.h"
+#include "crypto/storeerr.h"
+#include "crypto/tserr.h"
+#include "crypto/uierr.h"
+#include "crypto/x509err.h"
+#include "crypto/x509v3err.h"
-# ifdef OPENSSL_NO_ERR
-# define IMPLEMENT_LEGACY_ERR_LOAD(lib) \
- int ERR_load_##lib##_strings(void) \
- { \
- return 1; \
+#ifdef OPENSSL_NO_ERR
+#define IMPLEMENT_LEGACY_ERR_LOAD(lib) \
+ int ERR_load_##lib##_strings(void) \
+ { \
+ return 1; \
}
-# else
-# define IMPLEMENT_LEGACY_ERR_LOAD(lib) \
+#else
+#define IMPLEMENT_LEGACY_ERR_LOAD(lib) \
int ERR_load_##lib##_strings(void) \
{ \
return ossl_err_load_##lib##_strings(); \
}
-# endif
+#endif
IMPLEMENT_LEGACY_ERR_LOAD(ASN1)
IMPLEMENT_LEGACY_ERR_LOAD(ASYNC)
IMPLEMENT_LEGACY_ERR_LOAD(BIO)
IMPLEMENT_LEGACY_ERR_LOAD(BN)
IMPLEMENT_LEGACY_ERR_LOAD(BUF)
-# ifndef OPENSSL_NO_CMS
+#ifndef OPENSSL_NO_CMS
IMPLEMENT_LEGACY_ERR_LOAD(CMS)
-# endif
-# ifndef OPENSSL_NO_COMP
+#endif
+#ifndef OPENSSL_NO_COMP
IMPLEMENT_LEGACY_ERR_LOAD(COMP)
-# endif
+#endif
IMPLEMENT_LEGACY_ERR_LOAD(CONF)
IMPLEMENT_LEGACY_ERR_LOAD(CRYPTO)
-# ifndef OPENSSL_NO_CT
+#ifndef OPENSSL_NO_CT
IMPLEMENT_LEGACY_ERR_LOAD(CT)
-# endif
-# ifndef OPENSSL_NO_DH
+#endif
+#ifndef OPENSSL_NO_DH
IMPLEMENT_LEGACY_ERR_LOAD(DH)
-# endif
-# ifndef OPENSSL_NO_DSA
+#endif
+#ifndef OPENSSL_NO_DSA
IMPLEMENT_LEGACY_ERR_LOAD(DSA)
-# endif
-# ifndef OPENSSL_NO_EC
+#endif
+#ifndef OPENSSL_NO_EC
IMPLEMENT_LEGACY_ERR_LOAD(EC)
-# endif
+#endif
IMPLEMENT_LEGACY_ERR_LOAD(ERR)
IMPLEMENT_LEGACY_ERR_LOAD(EVP)
IMPLEMENT_LEGACY_ERR_LOAD(OBJ)
-# ifndef OPENSSL_NO_OCSP
+#ifndef OPENSSL_NO_OCSP
IMPLEMENT_LEGACY_ERR_LOAD(OCSP)
-# endif
+#endif
IMPLEMENT_LEGACY_ERR_LOAD(PEM)
IMPLEMENT_LEGACY_ERR_LOAD(PKCS12)
IMPLEMENT_LEGACY_ERR_LOAD(PKCS7)
IMPLEMENT_LEGACY_ERR_LOAD(RAND)
IMPLEMENT_LEGACY_ERR_LOAD(RSA)
IMPLEMENT_LEGACY_ERR_LOAD(OSSL_STORE)
-# ifndef OPENSSL_NO_TS
+#ifndef OPENSSL_NO_TS
IMPLEMENT_LEGACY_ERR_LOAD(TS)
-# endif
+#endif
IMPLEMENT_LEGACY_ERR_LOAD(UI)
IMPLEMENT_LEGACY_ERR_LOAD(X509)
IMPLEMENT_LEGACY_ERR_LOAD(X509V3)
diff --git a/crypto/err/err_local.h b/crypto/err/err_local.h
index c5c5bf45ba..4d30059386 100644
--- a/crypto/err/err_local.h
+++ b/crypto/err/err_local.h
@@ -38,17 +38,16 @@ static ossl_inline void err_clear_data(ERR_STATE *es, size_t i, int deall)
}
static ossl_inline void err_set_error(ERR_STATE *es, size_t i,
- int lib, int reason)
+ int lib, int reason)
{
- es->err_buffer[i] =
- lib == ERR_LIB_SYS
- ? (unsigned int)(ERR_SYSTEM_FLAG | reason)
+ es->err_buffer[i] = lib == ERR_LIB_SYS
+ ? (unsigned int)(ERR_SYSTEM_FLAG | reason)
: ERR_PACK(lib, 0, reason);
}
static ossl_inline void err_set_debug(ERR_STATE *es, size_t i,
- const char *file, int line,
- const char *fn)
+ const char *file, int line,
+ const char *fn)
{
/*
* We dup the file and fn strings because they may be provider owned. If the
@@ -58,7 +57,8 @@ static ossl_inline void err_set_debug(ERR_STATE *es, size_t i,
if (file == NULL || file[0] == '\0')
es->err_file[i] = NULL;
else if ((es->err_file[i] = CRYPTO_malloc(strlen(file) + 1,
- NULL, 0)) != NULL)
+ NULL, 0))
+ != NULL)
/* We cannot use OPENSSL_strdup due to possible recursion */
strcpy(es->err_file[i], file);
@@ -67,12 +67,13 @@ static ossl_inline void err_set_debug(ERR_STATE *es, size_t i,
if (fn == NULL || fn[0] == '\0')
es->err_func[i] = NULL;
else if ((es->err_func[i] = CRYPTO_malloc(strlen(fn) + 1,
- NULL, 0)) != NULL)
+ NULL, 0))
+ != NULL)
strcpy(es->err_func[i], fn);
}
static ossl_inline void err_set_data(ERR_STATE *es, size_t i,
- void *data, size_t datasz, int flags)
+ void *data, size_t datasz, int flags)
{
if ((es->err_data_flags[i] & ERR_TXT_MALLOCED) != 0)
OPENSSL_free(es->err_data[i]);
@@ -96,4 +97,4 @@ static ossl_inline void err_clear(ERR_STATE *es, size_t i, int deall)
ERR_STATE *ossl_err_get_state_int(void);
void ossl_err_string_int(unsigned long e, const char *func,
- char *buf, size_t len);
+ char *buf, size_t len);
diff --git a/crypto/err/err_mark.c b/crypto/err/err_mark.c
index cb01a1f4f6..33fa6b2127 100644
--- a/crypto/err/err_mark.c
+++ b/crypto/err/err_mark.c
@@ -48,7 +48,7 @@ int ERR_pop_to_mark(void)
return 0;
while (es->bottom != es->top
- && es->err_marks[es->top] == 0) {
+ && es->err_marks[es->top] == 0) {
err_clear(es, es->top, 0);
es->top = es->top > 0 ? es->top - 1 : ERR_NUM_ERRORS - 1;
}
@@ -70,7 +70,7 @@ int ERR_count_to_mark(void)
top = es->top;
while (es->bottom != top
- && es->err_marks[top] == 0) {
+ && es->err_marks[top] == 0) {
++count;
top = top > 0 ? top - 1 : ERR_NUM_ERRORS - 1;
}
@@ -89,7 +89,7 @@ int ERR_clear_last_mark(void)
top = es->top;
while (es->bottom != top
- && es->err_marks[top] == 0) {
+ && es->err_marks[top] == 0) {
top = top > 0 ? top - 1 : ERR_NUM_ERRORS - 1;
}
@@ -98,4 +98,3 @@ int ERR_clear_last_mark(void)
es->err_marks[top]--;
return 1;
}
-
diff --git a/crypto/err/err_prn.c b/crypto/err/err_prn.c
index 9507d4c2bd..907cbc22ef 100644
--- a/crypto/err/err_prn.c
+++ b/crypto/err/err_prn.c
@@ -17,8 +17,8 @@
#include "err_local.h"
#define ERR_PRINT_BUF_SIZE 4096
-void ERR_print_errors_cb(int (*cb) (const char *str, size_t len, void *u),
- void *u)
+void ERR_print_errors_cb(int (*cb)(const char *str, size_t len, void *u),
+ void *u)
{
CRYPTO_THREAD_ID tid = CRYPTO_THREAD_get_current_id();
unsigned long l;
@@ -39,16 +39,16 @@ void ERR_print_errors_cb(int (*cb) (const char *str, size_t len, void *u),
ossl_err_string_int(l, func, buf + offset, sizeof(buf) - offset);
offset += (int)strlen(buf + offset);
BIO_snprintf(buf + offset, sizeof(buf) - offset, ":%s:%d:%s\n",
- file, line, data);
+ file, line, data);
OPENSSL_free(hex);
if (cb(buf, strlen(buf), u) <= 0)
- break; /* abort outputting the error report */
+ break; /* abort outputting the error report */
}
}
/* auxiliary function for incrementally reporting texts via the error queue */
static void put_error(int lib, const char *func, int reason,
- const char *file, int line)
+ const char *file, int line)
{
ERR_new();
ERR_set_debug(file, line, func);
@@ -87,7 +87,7 @@ void ERR_add_error_txt(const char *separator, const char *txt)
/* workaround for limit of ERR_print_errors_cb() */
if (data_len >= MAX_DATA_LEN
- || strlen(separator) >= (size_t)(MAX_DATA_LEN - data_len))
+ || strlen(separator) >= (size_t)(MAX_DATA_LEN - data_len))
available_len = 0;
else
available_len = MAX_DATA_LEN - data_len - strlen(separator) - 1;
diff --git a/crypto/err/err_save.c b/crypto/err/err_save.c
index 5db7f80dc9..ab58081fef 100644
--- a/crypto/err/err_save.c
+++ b/crypto/err/err_save.c
@@ -63,9 +63,9 @@ void OSSL_ERR_STATE_save_to_mark(ERR_STATE *es)
/* Determine number of errors we are going to move. */
for (count = 0, top = thread_es->top;
- thread_es->bottom != top
- && thread_es->err_marks[top] == 0;
- ++count)
+ thread_es->bottom != top
+ && thread_es->err_marks[top] == 0;
+ ++count)
top = top > 0 ? top - 1 : ERR_NUM_ERRORS - 1;
/* Move the errors, preserving order. */
@@ -75,31 +75,31 @@ void OSSL_ERR_STATE_save_to_mark(ERR_STATE *es)
err_clear(es, i, 1);
/* Move the error entry to the given ERR_STATE. */
- es->err_flags[i] = thread_es->err_flags[j];
- es->err_marks[i] = 0;
- es->err_buffer[i] = thread_es->err_buffer[j];
- es->err_data[i] = thread_es->err_data[j];
- es->err_data_size[i] = thread_es->err_data_size[j];
- es->err_data_flags[i] = thread_es->err_data_flags[j];
- es->err_file[i] = thread_es->err_file[j];
- es->err_line[i] = thread_es->err_line[j];
- es->err_func[i] = thread_es->err_func[j];
-
- thread_es->err_flags[j] = 0;
- thread_es->err_buffer[j] = 0;
- thread_es->err_data[j] = NULL;
- thread_es->err_data_size[j] = 0;
+ es->err_flags[i] = thread_es->err_flags[j];
+ es->err_marks[i] = 0;
+ es->err_buffer[i] = thread_es->err_buffer[j];
+ es->err_data[i] = thread_es->err_data[j];
+ es->err_data_size[i] = thread_es->err_data_size[j];
+ es->err_data_flags[i] = thread_es->err_data_flags[j];
+ es->err_file[i] = thread_es->err_file[j];
+ es->err_line[i] = thread_es->err_line[j];
+ es->err_func[i] = thread_es->err_func[j];
+
+ thread_es->err_flags[j] = 0;
+ thread_es->err_buffer[j] = 0;
+ thread_es->err_data[j] = NULL;
+ thread_es->err_data_size[j] = 0;
thread_es->err_data_flags[j] = 0;
- thread_es->err_file[j] = NULL;
- thread_es->err_line[j] = 0;
- thread_es->err_func[j] = NULL;
+ thread_es->err_file[j] = NULL;
+ thread_es->err_line[j] = 0;
+ thread_es->err_func[j] = NULL;
}
if (i > 0) {
thread_es->top = top;
/* If we moved anything, es's stack always starts at [0]. */
- es->top = i - 1;
- es->bottom = ERR_NUM_ERRORS - 1;
+ es->top = i - 1;
+ es->bottom = ERR_NUM_ERRORS - 1;
} else {
/* Didn't move anything - empty stack */
es->top = es->bottom = 0;
@@ -137,7 +137,7 @@ void OSSL_ERR_STATE_restore(const ERR_STATE *es)
thread_es->err_buffer[top] = es->err_buffer[i];
err_set_debug(thread_es, top, es->err_file[i], es->err_line[i],
- es->err_func[i]);
+ es->err_func[i]);
if (es->err_data[i] != NULL && es->err_data_size[i] != 0) {
void *data;
@@ -147,7 +147,7 @@ void OSSL_ERR_STATE_restore(const ERR_STATE *es)
if (data != NULL) {
memcpy(data, es->err_data[i], data_sz);
err_set_data(thread_es, top, data, data_sz,
- es->err_data_flags[i] | ERR_TXT_MALLOCED);
+ es->err_data_flags[i] | ERR_TXT_MALLOCED);
}
} else {
err_clear_data(thread_es, top, 0);
diff --git a/crypto/ess/ess_asn1.c b/crypto/ess/ess_asn1.c
index 68bc854c99..297f2cead0 100644
--- a/crypto/ess/ess_asn1.c
+++ b/crypto/ess/ess_asn1.c
@@ -17,41 +17,41 @@
/* ASN1 stuff for ESS Structure */
ASN1_SEQUENCE(ESS_ISSUER_SERIAL) = {
- ASN1_SEQUENCE_OF(ESS_ISSUER_SERIAL, issuer, GENERAL_NAME),
- ASN1_SIMPLE(ESS_ISSUER_SERIAL, serial, ASN1_INTEGER)
+ ASN1_SEQUENCE_OF(ESS_ISSUER_SERIAL, issuer, GENERAL_NAME),
+ ASN1_SIMPLE(ESS_ISSUER_SERIAL, serial, ASN1_INTEGER)
} static_ASN1_SEQUENCE_END(ESS_ISSUER_SERIAL)
-IMPLEMENT_ASN1_FUNCTIONS(ESS_ISSUER_SERIAL)
+ IMPLEMENT_ASN1_FUNCTIONS(ESS_ISSUER_SERIAL)
IMPLEMENT_ASN1_DUP_FUNCTION(ESS_ISSUER_SERIAL)
ASN1_SEQUENCE(ESS_CERT_ID) = {
- ASN1_SIMPLE(ESS_CERT_ID, hash, ASN1_OCTET_STRING),
- ASN1_OPT(ESS_CERT_ID, issuer_serial, ESS_ISSUER_SERIAL)
+ ASN1_SIMPLE(ESS_CERT_ID, hash, ASN1_OCTET_STRING),
+ ASN1_OPT(ESS_CERT_ID, issuer_serial, ESS_ISSUER_SERIAL)
} static_ASN1_SEQUENCE_END(ESS_CERT_ID)
-IMPLEMENT_ASN1_FUNCTIONS(ESS_CERT_ID)
+ IMPLEMENT_ASN1_FUNCTIONS(ESS_CERT_ID)
IMPLEMENT_ASN1_DUP_FUNCTION(ESS_CERT_ID)
ASN1_SEQUENCE(ESS_SIGNING_CERT) = {
- ASN1_SEQUENCE_OF(ESS_SIGNING_CERT, cert_ids, ESS_CERT_ID),
- ASN1_SEQUENCE_OF_OPT(ESS_SIGNING_CERT, policy_info, POLICYINFO)
+ ASN1_SEQUENCE_OF(ESS_SIGNING_CERT, cert_ids, ESS_CERT_ID),
+ ASN1_SEQUENCE_OF_OPT(ESS_SIGNING_CERT, policy_info, POLICYINFO)
} ASN1_SEQUENCE_END(ESS_SIGNING_CERT)
IMPLEMENT_ASN1_FUNCTIONS(ESS_SIGNING_CERT)
IMPLEMENT_ASN1_DUP_FUNCTION(ESS_SIGNING_CERT)
ASN1_SEQUENCE(ESS_CERT_ID_V2) = {
- ASN1_OPT(ESS_CERT_ID_V2, hash_alg, X509_ALGOR),
- ASN1_SIMPLE(ESS_CERT_ID_V2, hash, ASN1_OCTET_STRING),
- ASN1_OPT(ESS_CERT_ID_V2, issuer_serial, ESS_ISSUER_SERIAL)
+ ASN1_OPT(ESS_CERT_ID_V2, hash_alg, X509_ALGOR),
+ ASN1_SIMPLE(ESS_CERT_ID_V2, hash, ASN1_OCTET_STRING),
+ ASN1_OPT(ESS_CERT_ID_V2, issuer_serial, ESS_ISSUER_SERIAL)
} static_ASN1_SEQUENCE_END(ESS_CERT_ID_V2)
-IMPLEMENT_ASN1_FUNCTIONS(ESS_CERT_ID_V2)
+ IMPLEMENT_ASN1_FUNCTIONS(ESS_CERT_ID_V2)
IMPLEMENT_ASN1_DUP_FUNCTION(ESS_CERT_ID_V2)
ASN1_SEQUENCE(ESS_SIGNING_CERT_V2) = {
- ASN1_SEQUENCE_OF(ESS_SIGNING_CERT_V2, cert_ids, ESS_CERT_ID_V2),
- ASN1_SEQUENCE_OF_OPT(ESS_SIGNING_CERT_V2, policy_info, POLICYINFO)
+ ASN1_SEQUENCE_OF(ESS_SIGNING_CERT_V2, cert_ids, ESS_CERT_ID_V2),
+ ASN1_SEQUENCE_OF_OPT(ESS_SIGNING_CERT_V2, policy_info, POLICYINFO)
} ASN1_SEQUENCE_END(ESS_SIGNING_CERT_V2)
IMPLEMENT_ASN1_FUNCTIONS(ESS_SIGNING_CERT_V2)
diff --git a/crypto/ess/ess_err.c b/crypto/ess/ess_err.c
index eb76dfe7cc..cd232d8934 100644
--- a/crypto/ess/ess_err.c
+++ b/crypto/ess/ess_err.c
@@ -15,25 +15,25 @@
#ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA ESS_str_reasons[] = {
- {ERR_PACK(ERR_LIB_ESS, 0, ESS_R_EMPTY_ESS_CERT_ID_LIST),
- "empty ess cert id list"},
- {ERR_PACK(ERR_LIB_ESS, 0, ESS_R_ESS_CERT_DIGEST_ERROR),
- "ess cert digest error"},
- {ERR_PACK(ERR_LIB_ESS, 0, ESS_R_ESS_CERT_ID_NOT_FOUND),
- "ess cert id not found"},
- {ERR_PACK(ERR_LIB_ESS, 0, ESS_R_ESS_CERT_ID_WRONG_ORDER),
- "ess cert id wrong order"},
- {ERR_PACK(ERR_LIB_ESS, 0, ESS_R_ESS_DIGEST_ALG_UNKNOWN),
- "ess digest alg unknown"},
- {ERR_PACK(ERR_LIB_ESS, 0, ESS_R_ESS_SIGNING_CERTIFICATE_ERROR),
- "ess signing certificate error"},
- {ERR_PACK(ERR_LIB_ESS, 0, ESS_R_ESS_SIGNING_CERT_ADD_ERROR),
- "ess signing cert add error"},
- {ERR_PACK(ERR_LIB_ESS, 0, ESS_R_ESS_SIGNING_CERT_V2_ADD_ERROR),
- "ess signing cert v2 add error"},
- {ERR_PACK(ERR_LIB_ESS, 0, ESS_R_MISSING_SIGNING_CERTIFICATE_ATTRIBUTE),
- "missing signing certificate attribute"},
- {0, NULL}
+ { ERR_PACK(ERR_LIB_ESS, 0, ESS_R_EMPTY_ESS_CERT_ID_LIST),
+ "empty ess cert id list" },
+ { ERR_PACK(ERR_LIB_ESS, 0, ESS_R_ESS_CERT_DIGEST_ERROR),
+ "ess cert digest error" },
+ { ERR_PACK(ERR_LIB_ESS, 0, ESS_R_ESS_CERT_ID_NOT_FOUND),
+ "ess cert id not found" },
+ { ERR_PACK(ERR_LIB_ESS, 0, ESS_R_ESS_CERT_ID_WRONG_ORDER),
+ "ess cert id wrong order" },
+ { ERR_PACK(ERR_LIB_ESS, 0, ESS_R_ESS_DIGEST_ALG_UNKNOWN),
+ "ess digest alg unknown" },
+ { ERR_PACK(ERR_LIB_ESS, 0, ESS_R_ESS_SIGNING_CERTIFICATE_ERROR),
+ "ess signing certificate error" },
+ { ERR_PACK(ERR_LIB_ESS, 0, ESS_R_ESS_SIGNING_CERT_ADD_ERROR),
+ "ess signing cert add error" },
+ { ERR_PACK(ERR_LIB_ESS, 0, ESS_R_ESS_SIGNING_CERT_V2_ADD_ERROR),
+ "ess signing cert v2 add error" },
+ { ERR_PACK(ERR_LIB_ESS, 0, ESS_R_MISSING_SIGNING_CERTIFICATE_ATTRIBUTE),
+ "missing signing certificate attribute" },
+ { 0, NULL }
};
#endif
diff --git a/crypto/ess/ess_lib.c b/crypto/ess/ess_lib.c
index ff174470da..0486beffc4 100644
--- a/crypto/ess/ess_lib.c
+++ b/crypto/ess/ess_lib.c
@@ -16,14 +16,14 @@
#include "crypto/x509.h"
static ESS_CERT_ID *ESS_CERT_ID_new_init(const X509 *cert,
- int set_issuer_serial);
+ int set_issuer_serial);
static ESS_CERT_ID_V2 *ESS_CERT_ID_V2_new_init(const EVP_MD *hash_alg,
- const X509 *cert,
- int set_issuer_serial);
+ const X509 *cert,
+ int set_issuer_serial);
ESS_SIGNING_CERT *OSSL_ESS_signing_cert_new_init(const X509 *signcert,
- const STACK_OF(X509) *certs,
- int set_issuer_serial)
+ const STACK_OF(X509) *certs,
+ int set_issuer_serial)
{
ESS_CERT_ID *cid = NULL;
ESS_SIGNING_CERT *sc;
@@ -58,14 +58,14 @@ ESS_SIGNING_CERT *OSSL_ESS_signing_cert_new_init(const X509 *signcert,
}
return sc;
- err:
+err:
ESS_SIGNING_CERT_free(sc);
ESS_CERT_ID_free(cid);
return NULL;
}
static ESS_CERT_ID *ESS_CERT_ID_new_init(const X509 *cert,
- int set_issuer_serial)
+ int set_issuer_serial)
{
ESS_CERT_ID *cid = NULL;
GENERAL_NAME *name = NULL;
@@ -106,26 +106,26 @@ static ESS_CERT_ID *ESS_CERT_ID_new_init(const X509 *cert,
ERR_raise(ERR_LIB_ESS, ERR_R_CRYPTO_LIB);
goto err;
}
- name = NULL; /* Ownership is lost. */
+ name = NULL; /* Ownership is lost. */
ASN1_INTEGER_free(cid->issuer_serial->serial);
if ((cid->issuer_serial->serial
- = ASN1_INTEGER_dup(X509_get0_serialNumber(cert))) == NULL) {
+ = ASN1_INTEGER_dup(X509_get0_serialNumber(cert)))
+ == NULL) {
ERR_raise(ERR_LIB_ESS, ERR_R_ASN1_LIB);
goto err;
}
return cid;
- err:
+err:
GENERAL_NAME_free(name);
ESS_CERT_ID_free(cid);
return NULL;
}
ESS_SIGNING_CERT_V2 *OSSL_ESS_signing_cert_v2_new_init(const EVP_MD *hash_alg,
- const X509 *signcert,
- const
- STACK_OF(X509) *certs,
- int set_issuer_serial)
+ const X509 *signcert,
+ const STACK_OF(X509) *certs,
+ int set_issuer_serial)
{
ESS_CERT_ID_V2 *cid = NULL;
ESS_SIGNING_CERT_V2 *sc;
@@ -161,15 +161,15 @@ ESS_SIGNING_CERT_V2 *OSSL_ESS_signing_cert_v2_new_init(const EVP_MD *hash_alg,
}
return sc;
- err:
+err:
ESS_SIGNING_CERT_V2_free(sc);
ESS_CERT_ID_V2_free(cid);
return NULL;
}
static ESS_CERT_ID_V2 *ESS_CERT_ID_V2_new_init(const EVP_MD *hash_alg,
- const X509 *cert,
- int set_issuer_serial)
+ const X509 *cert,
+ int set_issuer_serial)
{
ESS_CERT_ID_V2 *cid;
GENERAL_NAME *name = NULL;
@@ -231,7 +231,7 @@ static ESS_CERT_ID_V2 *ESS_CERT_ID_V2_new_init(const EVP_MD *hash_alg,
ERR_raise(ERR_LIB_ESS, ERR_R_CRYPTO_LIB);
goto err;
}
- name = NULL; /* Ownership is lost. */
+ name = NULL; /* Ownership is lost. */
ASN1_INTEGER_free(cid->issuer_serial->serial);
cid->issuer_serial->serial = ASN1_INTEGER_dup(X509_get0_serialNumber(cert));
if (cid->issuer_serial->serial == NULL) {
@@ -240,7 +240,7 @@ static ESS_CERT_ID_V2 *ESS_CERT_ID_V2_new_init(const EVP_MD *hash_alg,
}
return cid;
- err:
+err:
X509_ALGOR_free(alg);
GENERAL_NAME_free(name);
ESS_CERT_ID_V2_free(cid);
@@ -268,7 +268,7 @@ static int ess_issuer_serial_cmp(const ESS_ISSUER_SERIAL *is, const X509 *cert)
* Return 0 on not found, -1 on error, else 1 + the position in |certs|.
*/
static int find(const ESS_CERT_ID *cid, const ESS_CERT_ID_V2 *cid_v2,
- int index, const STACK_OF(X509) *certs)
+ int index, const STACK_OF(X509) *certs)
{
const X509 *cert;
EVP_MD *md = NULL;
@@ -309,13 +309,14 @@ static int find(const ESS_CERT_ID *cid, const ESS_CERT_ID_V2 *cid_v2,
cid_hash_len = cid != NULL ? cid->hash->length : cid_v2->hash->length;
if (!X509_digest(cert, md, cert_digest, &len)
- || cid_hash_len != len) {
+ || cid_hash_len != len) {
ERR_raise(ERR_LIB_ESS, ESS_R_ESS_CERT_DIGEST_ERROR);
goto end;
}
if (memcmp(cid != NULL ? cid->hash->data : cid_v2->hash->data,
- cert_digest, len) == 0) {
+ cert_digest, len)
+ == 0) {
is = cid != NULL ? cid->issuer_serial : cid_v2->issuer_serial;
/* Well, it's not really required to match the serial numbers. */
if (is == NULL || ess_issuer_serial_cmp(is, cert) == 0) {
@@ -337,9 +338,9 @@ end:
}
int OSSL_ESS_check_signing_certs(const ESS_SIGNING_CERT *ss,
- const ESS_SIGNING_CERT_V2 *ssv2,
- const STACK_OF(X509) *chain,
- int require_signing_cert)
+ const ESS_SIGNING_CERT_V2 *ssv2,
+ const STACK_OF(X509) *chain,
+ int require_signing_cert)
{
int n_v1 = ss == NULL ? -1 : sk_ESS_CERT_ID_num(ss->cert_ids);
int n_v2 = ssv2 == NULL ? -1 : sk_ESS_CERT_ID_V2_num(ssv2->cert_ids);
diff --git a/crypto/evp/asymcipher.c b/crypto/evp/asymcipher.c
index c97ce338fd..652303483d 100644
--- a/crypto/evp/asymcipher.c
+++ b/crypto/evp/asymcipher.c
@@ -28,7 +28,7 @@ static int evp_asym_cipher_up_ref(void *data)
}
static int evp_pkey_asym_cipher_init(EVP_PKEY_CTX *ctx, int operation,
- const OSSL_PARAM params[])
+ const OSSL_PARAM params[])
{
int ret = 0;
void *provkey = NULL;
@@ -62,14 +62,14 @@ static int evp_pkey_asym_cipher_init(EVP_PKEY_CTX *ctx, int operation,
* Try to derive the supported asym cipher from |ctx->keymgmt|.
*/
if (!ossl_assert(ctx->pkey->keymgmt == NULL
- || ctx->pkey->keymgmt == ctx->keymgmt)) {
+ || ctx->pkey->keymgmt == ctx->keymgmt)) {
ERR_clear_last_mark();
ERR_raise(ERR_LIB_EVP, ERR_R_INTERNAL_ERROR);
goto err;
}
supported_ciph
= evp_keymgmt_util_query_operation_name(ctx->keymgmt,
- OSSL_OP_ASYM_CIPHER);
+ OSSL_OP_ASYM_CIPHER);
if (supported_ciph == NULL) {
ERR_clear_last_mark();
ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
@@ -107,15 +107,14 @@ static int evp_pkey_asym_cipher_init(EVP_PKEY_CTX *ctx, int operation,
switch (iter) {
case 1:
cipher = EVP_ASYM_CIPHER_fetch(ctx->libctx, supported_ciph,
- ctx->propquery);
+ ctx->propquery);
if (cipher != NULL)
tmp_prov = EVP_ASYM_CIPHER_get0_provider(cipher);
break;
case 2:
tmp_prov = EVP_KEYMGMT_get0_provider(ctx->keymgmt);
- cipher =
- evp_asym_cipher_fetch_from_prov((OSSL_PROVIDER *)tmp_prov,
- supported_ciph, ctx->propquery);
+ cipher = evp_asym_cipher_fetch_from_prov((OSSL_PROVIDER *)tmp_prov,
+ supported_ciph, ctx->propquery);
if (cipher == NULL)
goto legacy;
break;
@@ -134,11 +133,11 @@ static int evp_pkey_asym_cipher_init(EVP_PKEY_CTX *ctx, int operation,
*/
tmp_keymgmt_tofree = tmp_keymgmt
= evp_keymgmt_fetch_from_prov((OSSL_PROVIDER *)tmp_prov,
- EVP_KEYMGMT_get0_name(ctx->keymgmt),
- ctx->propquery);
+ EVP_KEYMGMT_get0_name(ctx->keymgmt),
+ ctx->propquery);
if (tmp_keymgmt != NULL)
provkey = evp_pkey_export_to_provider(ctx->pkey, ctx->libctx,
- &tmp_keymgmt, ctx->propquery);
+ &tmp_keymgmt, ctx->propquery);
if (tmp_keymgmt == NULL)
EVP_KEYMGMT_free(tmp_keymgmt_tofree);
}
@@ -165,7 +164,7 @@ static int evp_pkey_asym_cipher_init(EVP_PKEY_CTX *ctx, int operation,
case EVP_PKEY_OP_ENCRYPT:
if (cipher->encrypt_init == NULL) {
ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_ASYM_CIPHER_NOT_SUPPORTED,
- "%s encrypt_init:%s", cipher->type_name, desc);
+ "%s encrypt_init:%s", cipher->type_name, desc);
ret = -2;
goto err;
}
@@ -174,7 +173,7 @@ static int evp_pkey_asym_cipher_init(EVP_PKEY_CTX *ctx, int operation,
case EVP_PKEY_OP_DECRYPT:
if (cipher->decrypt_init == NULL) {
ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_ASYM_CIPHER_NOT_SUPPORTED,
- "%s decrypt_init:%s", cipher->type_name, desc);
+ "%s decrypt_init:%s", cipher->type_name, desc);
ret = -2;
goto err;
}
@@ -190,7 +189,7 @@ static int evp_pkey_asym_cipher_init(EVP_PKEY_CTX *ctx, int operation,
EVP_KEYMGMT_free(tmp_keymgmt);
return 1;
- legacy:
+legacy:
/*
* If we don't have the full support we need with provided methods,
* let's go see if legacy does.
@@ -219,7 +218,7 @@ static int evp_pkey_asym_cipher_init(EVP_PKEY_CTX *ctx, int operation,
ret = -1;
}
- err:
+err:
if (ret <= 0) {
evp_pkey_ctx_free_old_ops(ctx);
ctx->operation = EVP_PKEY_OP_UNDEFINED;
@@ -239,8 +238,8 @@ int EVP_PKEY_encrypt_init_ex(EVP_PKEY_CTX *ctx, const OSSL_PARAM params[])
}
int EVP_PKEY_encrypt(EVP_PKEY_CTX *ctx,
- unsigned char *out, size_t *outlen,
- const unsigned char *in, size_t inlen)
+ unsigned char *out, size_t *outlen,
+ const unsigned char *in, size_t inlen)
{
EVP_ASYM_CIPHER *cipher;
const char *desc;
@@ -265,17 +264,16 @@ int EVP_PKEY_encrypt(EVP_PKEY_CTX *ctx,
ret = cipher->encrypt(ctx->op.ciph.algctx, out, outlen, (out == NULL ? 0 : *outlen), in, inlen);
if (ret <= 0 && ERR_count_to_mark() == 0)
ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_ASYM_CIPHER_FAILURE,
- "%s encrypt:%s", cipher->type_name, desc);
+ "%s encrypt:%s", cipher->type_name, desc);
ERR_clear_last_mark();
return ret;
- legacy:
+legacy:
if (ctx->pmeth == NULL || ctx->pmeth->encrypt == NULL) {
ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
return -2;
}
- M_check_autoarg(ctx, out, outlen, EVP_F_EVP_PKEY_ENCRYPT)
- return ctx->pmeth->encrypt(ctx, out, outlen, in, inlen);
+ M_check_autoarg(ctx, out, outlen, EVP_F_EVP_PKEY_ENCRYPT) return ctx->pmeth->encrypt(ctx, out, outlen, in, inlen);
}
int EVP_PKEY_decrypt_init(EVP_PKEY_CTX *ctx)
@@ -289,8 +287,8 @@ int EVP_PKEY_decrypt_init_ex(EVP_PKEY_CTX *ctx, const OSSL_PARAM params[])
}
int EVP_PKEY_decrypt(EVP_PKEY_CTX *ctx,
- unsigned char *out, size_t *outlen,
- const unsigned char *in, size_t inlen)
+ unsigned char *out, size_t *outlen,
+ const unsigned char *in, size_t inlen)
{
EVP_ASYM_CIPHER *cipher;
const char *desc;
@@ -315,31 +313,30 @@ int EVP_PKEY_decrypt(EVP_PKEY_CTX *ctx,
ret = cipher->decrypt(ctx->op.ciph.algctx, out, outlen, (out == NULL ? 0 : *outlen), in, inlen);
if (ret <= 0 && ERR_count_to_mark() == 0)
ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_ASYM_CIPHER_FAILURE,
- "%s decrypt:%s", cipher->type_name, desc);
+ "%s decrypt:%s", cipher->type_name, desc);
ERR_clear_last_mark();
return ret;
- legacy:
+legacy:
if (ctx->pmeth == NULL || ctx->pmeth->decrypt == NULL) {
ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
return -2;
}
- M_check_autoarg(ctx, out, outlen, EVP_F_EVP_PKEY_DECRYPT)
- return ctx->pmeth->decrypt(ctx, out, outlen, in, inlen);
+ M_check_autoarg(ctx, out, outlen, EVP_F_EVP_PKEY_DECRYPT) return ctx->pmeth->decrypt(ctx, out, outlen, in, inlen);
}
/* decrypt to new buffer of dynamic size, checking any pre-determined size */
int evp_pkey_decrypt_alloc(EVP_PKEY_CTX *ctx, unsigned char **outp,
- size_t *outlenp, size_t expected_outlen,
- const unsigned char *in, size_t inlen)
+ size_t *outlenp, size_t expected_outlen,
+ const unsigned char *in, size_t inlen)
{
if (EVP_PKEY_decrypt(ctx, NULL, outlenp, in, inlen) <= 0
- || (*outp = OPENSSL_malloc(*outlenp)) == NULL)
+ || (*outp = OPENSSL_malloc(*outlenp)) == NULL)
return -1;
if (EVP_PKEY_decrypt(ctx, *outp, outlenp, in, inlen) <= 0
- || *outlenp == 0
- || (expected_outlen != 0 && *outlenp != expected_outlen)) {
+ || *outlenp == 0
+ || (expected_outlen != 0 && *outlenp != expected_outlen)) {
ERR_raise(ERR_LIB_EVP, ERR_R_EVP_LIB);
OPENSSL_clear_free(*outp, *outlenp);
*outp = NULL;
@@ -356,7 +353,7 @@ static EVP_ASYM_CIPHER *evp_asym_cipher_new(OSSL_PROVIDER *prov)
return NULL;
if (!CRYPTO_NEW_REF(&cipher->refcnt, 1)
- || !ossl_provider_up_ref(prov)) {
+ || !ossl_provider_up_ref(prov)) {
CRYPTO_FREE_REF(&cipher->refcnt);
OPENSSL_free(cipher);
return NULL;
@@ -367,8 +364,8 @@ static EVP_ASYM_CIPHER *evp_asym_cipher_new(OSSL_PROVIDER *prov)
}
static void *evp_asym_cipher_from_algorithm(int name_id,
- const OSSL_ALGORITHM *algodef,
- OSSL_PROVIDER *prov)
+ const OSSL_ALGORITHM *algodef,
+ OSSL_PROVIDER *prov)
{
const OSSL_DISPATCH *fns = algodef->implementation;
EVP_ASYM_CIPHER *cipher = NULL;
@@ -478,7 +475,7 @@ static void *evp_asym_cipher_from_algorithm(int name_id,
}
return cipher;
- err:
+err:
EVP_ASYM_CIPHER_free(cipher);
return NULL;
}
@@ -512,23 +509,23 @@ OSSL_PROVIDER *EVP_ASYM_CIPHER_get0_provider(const EVP_ASYM_CIPHER *cipher)
}
EVP_ASYM_CIPHER *EVP_ASYM_CIPHER_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
- const char *properties)
+ const char *properties)
{
return evp_generic_fetch(ctx, OSSL_OP_ASYM_CIPHER, algorithm, properties,
- evp_asym_cipher_from_algorithm,
- evp_asym_cipher_up_ref,
- evp_asym_cipher_free);
+ evp_asym_cipher_from_algorithm,
+ evp_asym_cipher_up_ref,
+ evp_asym_cipher_free);
}
EVP_ASYM_CIPHER *evp_asym_cipher_fetch_from_prov(OSSL_PROVIDER *prov,
- const char *algorithm,
- const char *properties)
+ const char *algorithm,
+ const char *properties)
{
return evp_generic_fetch_from_prov(prov, OSSL_OP_ASYM_CIPHER,
- algorithm, properties,
- evp_asym_cipher_from_algorithm,
- evp_asym_cipher_up_ref,
- evp_asym_cipher_free);
+ algorithm, properties,
+ evp_asym_cipher_from_algorithm,
+ evp_asym_cipher_up_ref,
+ evp_asym_cipher_free);
}
int EVP_ASYM_CIPHER_is_a(const EVP_ASYM_CIPHER *cipher, const char *name)
@@ -552,21 +549,20 @@ const char *EVP_ASYM_CIPHER_get0_description(const EVP_ASYM_CIPHER *cipher)
}
void EVP_ASYM_CIPHER_do_all_provided(OSSL_LIB_CTX *libctx,
- void (*fn)(EVP_ASYM_CIPHER *cipher,
- void *arg),
- void *arg)
+ void (*fn)(EVP_ASYM_CIPHER *cipher,
+ void *arg),
+ void *arg)
{
evp_generic_do_all(libctx, OSSL_OP_ASYM_CIPHER,
- (void (*)(void *, void *))fn, arg,
- evp_asym_cipher_from_algorithm,
- evp_asym_cipher_up_ref,
- evp_asym_cipher_free);
+ (void (*)(void *, void *))fn, arg,
+ evp_asym_cipher_from_algorithm,
+ evp_asym_cipher_up_ref,
+ evp_asym_cipher_free);
}
-
int EVP_ASYM_CIPHER_names_do_all(const EVP_ASYM_CIPHER *cipher,
- void (*fn)(const char *name, void *data),
- void *data)
+ void (*fn)(const char *name, void *data),
+ void *data)
{
if (cipher->prov != NULL)
return evp_names_do_all(cipher->prov, cipher->name_id, fn, data);
diff --git a/crypto/evp/bio_b64.c b/crypto/evp/bio_b64.c
index cde56e0d7b..de95a57057 100644
--- a/crypto/evp/bio_b64.c
+++ b/crypto/evp/bio_b64.c
@@ -21,11 +21,11 @@ static long b64_ctrl(BIO *h, int cmd, long arg1, void *arg2);
static int b64_new(BIO *h);
static int b64_free(BIO *data);
static long b64_callback_ctrl(BIO *h, int cmd, BIO_info_cb *fp);
-#define B64_BLOCK_SIZE 1024
+#define B64_BLOCK_SIZE 1024
#define B64_BLOCK_SIZE2 768
-#define B64_NONE 0
-#define B64_ENCODE 1
-#define B64_DECODE 2
+#define B64_NONE 0
+#define B64_ENCODE 1
+#define B64_DECODE 2
typedef struct b64_struct {
/*
@@ -33,11 +33,11 @@ typedef struct b64_struct {
*/
int buf_len;
int buf_off;
- int tmp_len; /* used to find the start when decoding */
- int tmp_nl; /* If true, scan until '\n' */
+ int tmp_len; /* used to find the start when decoding */
+ int tmp_nl; /* If true, scan until '\n' */
int encode;
- int start; /* have we started decoding yet? */
- int cont; /* <= 0 when finished */
+ int start; /* have we started decoding yet? */
+ int cont; /* <= 0 when finished */
EVP_ENCODE_CTX *base64;
unsigned char buf[EVP_ENCODE_LENGTH(B64_BLOCK_SIZE) + 10];
unsigned char tmp[B64_BLOCK_SIZE];
@@ -51,7 +51,7 @@ static const BIO_METHOD methods_b64 = {
bread_conv,
b64_read,
b64_puts,
- NULL, /* b64_gets, */
+ NULL, /* b64_gets, */
b64_ctrl,
b64_new,
b64_free,
@@ -174,7 +174,7 @@ static int b64_read(BIO *b, char *out, int outl)
break;
i = BIO_read(next, &(ctx->tmp[ctx->tmp_len]),
- B64_BLOCK_SIZE - ctx->tmp_len);
+ B64_BLOCK_SIZE - ctx->tmp_len);
if (i <= 0) {
ret_code = i;
@@ -283,7 +283,7 @@ static int b64_read(BIO *b, char *out, int outl)
}
i = EVP_DecodeUpdate(ctx->base64, ctx->buf, &ctx->buf_len,
- ctx->tmp, i);
+ ctx->tmp, i);
ctx->tmp_len = 0;
/*
* If eof or an error was signalled, then the condition
@@ -399,8 +399,7 @@ static int b64_write(BIO *b, const char *in, int inl)
ret += n;
if (ctx->tmp_len < 3)
break;
- ctx->buf_len =
- EVP_EncodeBlock(ctx->buf, ctx->tmp, ctx->tmp_len);
+ ctx->buf_len = EVP_EncodeBlock(ctx->buf, ctx->tmp, ctx->tmp_len);
if (!ossl_assert(ctx->buf_len <= (int)sizeof(ctx->buf))) {
ERR_raise(ERR_LIB_BIO, ERR_R_INTERNAL_ERROR);
return ret == 0 ? -1 : ret;
@@ -422,8 +421,7 @@ static int b64_write(BIO *b, const char *in, int inl)
break;
}
n -= n % 3;
- ctx->buf_len =
- EVP_EncodeBlock(ctx->buf, (unsigned char *)in, n);
+ ctx->buf_len = EVP_EncodeBlock(ctx->buf, (unsigned char *)in, n);
if (!ossl_assert(ctx->buf_len <= (int)sizeof(ctx->buf))) {
ERR_raise(ERR_LIB_BIO, ERR_R_INTERNAL_ERROR);
return ret == 0 ? -1 : ret;
@@ -436,7 +434,7 @@ static int b64_write(BIO *b, const char *in, int inl)
}
} else {
if (!EVP_EncodeUpdate(ctx->base64, ctx->buf, &ctx->buf_len,
- (unsigned char *)in, n))
+ (unsigned char *)in, n))
return ret == 0 ? -1 : ret;
if (!ossl_assert(ctx->buf_len <= (int)sizeof(ctx->buf))) {
ERR_raise(ERR_LIB_BIO, ERR_R_INTERNAL_ERROR);
@@ -495,13 +493,13 @@ static long b64_ctrl(BIO *b, int cmd, long num, void *ptr)
ctx->encode = B64_NONE;
ret = BIO_ctrl(next, cmd, num, ptr);
break;
- case BIO_CTRL_EOF: /* More to read */
+ case BIO_CTRL_EOF: /* More to read */
if (ctx->cont <= 0)
ret = 1;
else
ret = BIO_ctrl(next, cmd, num, ptr);
break;
- case BIO_CTRL_WPENDING: /* More to write in buffer */
+ case BIO_CTRL_WPENDING: /* More to write in buffer */
if (!ossl_assert(ctx->buf_len >= ctx->buf_off)) {
ERR_raise(ERR_LIB_BIO, ERR_R_INTERNAL_ERROR);
return -1;
@@ -513,7 +511,7 @@ static long b64_ctrl(BIO *b, int cmd, long num, void *ptr)
else if (ret <= 0)
ret = BIO_ctrl(next, cmd, num, ptr);
break;
- case BIO_CTRL_PENDING: /* More to read in buffer */
+ case BIO_CTRL_PENDING: /* More to read in buffer */
if (!ossl_assert(ctx->buf_len >= ctx->buf_off)) {
ERR_raise(ERR_LIB_BIO, ERR_R_INTERNAL_ERROR);
return -1;
@@ -524,7 +522,7 @@ static long b64_ctrl(BIO *b, int cmd, long num, void *ptr)
break;
case BIO_CTRL_FLUSH:
/* do a final write */
- again:
+ again:
while (ctx->buf_len != ctx->buf_off) {
i = b64_write(b, NULL, 0);
if (i < 0)
@@ -533,13 +531,13 @@ static long b64_ctrl(BIO *b, int cmd, long num, void *ptr)
if (BIO_get_flags(b) & BIO_FLAGS_BASE64_NO_NL) {
if (ctx->tmp_len != 0) {
ctx->buf_len = EVP_EncodeBlock(ctx->buf,
- ctx->tmp, ctx->tmp_len);
+ ctx->tmp, ctx->tmp_len);
ctx->buf_off = 0;
ctx->tmp_len = 0;
goto again;
}
} else if (ctx->encode != B64_NONE
- && EVP_ENCODE_CTX_num(ctx->base64) != 0) {
+ && EVP_ENCODE_CTX_num(ctx->base64) != 0) {
ctx->buf_off = 0;
EVP_EncodeFinal(ctx->base64, ctx->buf, &(ctx->buf_len));
/* push out the bytes */
diff --git a/crypto/evp/bio_enc.c b/crypto/evp/bio_enc.c
index deaa4dbb9c..fc319d6425 100644
--- a/crypto/evp/bio_enc.c
+++ b/crypto/evp/bio_enc.c
@@ -22,16 +22,16 @@ static long enc_ctrl(BIO *h, int cmd, long arg1, void *arg2);
static int enc_new(BIO *h);
static int enc_free(BIO *data);
static long enc_callback_ctrl(BIO *h, int cmd, BIO_info_cb *fps);
-#define ENC_BLOCK_SIZE (1024*4)
-#define ENC_MIN_CHUNK (256)
-#define BUF_OFFSET (ENC_MIN_CHUNK + EVP_MAX_BLOCK_LENGTH)
+#define ENC_BLOCK_SIZE (1024 * 4)
+#define ENC_MIN_CHUNK (256)
+#define BUF_OFFSET (ENC_MIN_CHUNK + EVP_MAX_BLOCK_LENGTH)
typedef struct enc_struct {
int buf_len;
int buf_off;
- int cont; /* <= 0 when finished */
+ int cont; /* <= 0 when finished */
int finished;
- int ok; /* bad decrypt */
+ int ok; /* bad decrypt */
EVP_CIPHER_CTX *cipher;
unsigned char *read_start, *read_end;
/*
@@ -48,8 +48,8 @@ static const BIO_METHOD methods_enc = {
enc_write,
bread_conv,
enc_read,
- NULL, /* enc_puts, */
- NULL, /* enc_gets, */
+ NULL, /* enc_puts, */
+ NULL, /* enc_gets, */
enc_ctrl,
enc_new,
enc_free,
@@ -163,7 +163,7 @@ static int enc_read(BIO *b, char *out, int outl)
ctx->cont = i;
ctx->finished = 1;
i = EVP_CipherFinal_ex(ctx->cipher,
- ctx->buf, &(ctx->buf_len));
+ ctx->buf, &(ctx->buf_len));
ctx->ok = i;
ctx->buf_off = 0;
} else {
@@ -180,8 +180,8 @@ static int enc_read(BIO *b, char *out, int outl)
int j = outl - blocksize, buf_len;
if (!EVP_CipherUpdate(ctx->cipher,
- (unsigned char *)out, &buf_len,
- ctx->read_start, i > j ? j : i)) {
+ (unsigned char *)out, &buf_len,
+ ctx->read_start, i > j ? j : i)) {
BIO_clear_retry_flags(b);
return 0;
}
@@ -198,8 +198,8 @@ static int enc_read(BIO *b, char *out, int outl)
if (i > ENC_MIN_CHUNK)
i = ENC_MIN_CHUNK;
if (!EVP_CipherUpdate(ctx->cipher,
- ctx->buf, &ctx->buf_len,
- ctx->read_start, i)) {
+ ctx->buf, &ctx->buf_len,
+ ctx->read_start, i)) {
BIO_clear_retry_flags(b);
ctx->ok = 0;
return 0;
@@ -267,8 +267,8 @@ static int enc_write(BIO *b, const char *in, int inl)
while (inl > 0) {
n = (inl > ENC_BLOCK_SIZE) ? ENC_BLOCK_SIZE : inl;
if (!EVP_CipherUpdate(ctx->cipher,
- ctx->buf, &ctx->buf_len,
- (const unsigned char *)in, n)) {
+ ctx->buf, &ctx->buf_len,
+ (const unsigned char *)in, n)) {
BIO_clear_retry_flags(b);
ctx->ok = 0;
return 0;
@@ -314,11 +314,11 @@ static long enc_ctrl(BIO *b, int cmd, long num, void *ptr)
ctx->ok = 1;
ctx->finished = 0;
if (!EVP_CipherInit_ex(ctx->cipher, NULL, NULL, NULL, NULL,
- EVP_CIPHER_CTX_is_encrypting(ctx->cipher)))
+ EVP_CIPHER_CTX_is_encrypting(ctx->cipher)))
return 0;
ret = BIO_ctrl(next, cmd, num, ptr);
break;
- case BIO_CTRL_EOF: /* More to read */
+ case BIO_CTRL_EOF: /* More to read */
if (ctx->cont <= 0)
ret = 1;
else
@@ -329,14 +329,14 @@ static long enc_ctrl(BIO *b, int cmd, long num, void *ptr)
if (ret <= 0)
ret = BIO_ctrl(next, cmd, num, ptr);
break;
- case BIO_CTRL_PENDING: /* More to read in buffer */
+ case BIO_CTRL_PENDING: /* More to read in buffer */
ret = ctx->buf_len - ctx->buf_off;
if (ret <= 0)
ret = BIO_ctrl(next, cmd, num, ptr);
break;
case BIO_CTRL_FLUSH:
/* do a final write */
- again:
+ again:
while (ctx->buf_len != ctx->buf_off) {
pend = ctx->buf_len - ctx->buf_off;
i = enc_write(b, NULL, 0);
@@ -353,8 +353,8 @@ static long enc_ctrl(BIO *b, int cmd, long num, void *ptr)
ctx->finished = 1;
ctx->buf_off = 0;
ret = EVP_CipherFinal_ex(ctx->cipher,
- (unsigned char *)ctx->buf,
- &(ctx->buf_len));
+ (unsigned char *)ctx->buf,
+ &(ctx->buf_len));
ctx->ok = (int)ret;
if (ret <= 0)
break;
@@ -408,12 +408,12 @@ static long enc_callback_ctrl(BIO *b, int cmd, BIO_info_cb *fp)
}
int BIO_set_cipher(BIO *b, const EVP_CIPHER *c, const unsigned char *k,
- const unsigned char *i, int e)
+ const unsigned char *i, int e)
{
BIO_ENC_CTX *ctx;
BIO_callback_fn_ex callback_ex;
#ifndef OPENSSL_NO_DEPRECATED_3_0
- long (*callback) (struct bio_st *, int, const char *, int, long, long) = NULL;
+ long (*callback)(struct bio_st *, int, const char *, int, long, long) = NULL;
#endif
ctx = BIO_get_data(b);
@@ -422,16 +422,15 @@ int BIO_set_cipher(BIO *b, const EVP_CIPHER *c, const unsigned char *k,
if ((callback_ex = BIO_get_callback_ex(b)) != NULL) {
if (callback_ex(b, BIO_CB_CTRL, (const char *)c, 0, BIO_CTRL_SET,
- e, 1, NULL) <= 0)
+ e, 1, NULL)
+ <= 0)
return 0;
}
#ifndef OPENSSL_NO_DEPRECATED_3_0
else {
callback = BIO_get_callback(b);
- if ((callback != NULL) &&
- (callback(b, BIO_CB_CTRL, (const char *)c, BIO_CTRL_SET, e,
- 0L) <= 0))
+ if ((callback != NULL) && (callback(b, BIO_CB_CTRL, (const char *)c, BIO_CTRL_SET, e, 0L) <= 0))
return 0;
}
#endif
@@ -443,7 +442,7 @@ int BIO_set_cipher(BIO *b, const EVP_CIPHER *c, const unsigned char *k,
if (callback_ex != NULL)
return callback_ex(b, BIO_CB_CTRL | BIO_CB_RETURN, (const char *)c, 0,
- BIO_CTRL_SET, e, 1, NULL);
+ BIO_CTRL_SET, e, 1, NULL);
#ifndef OPENSSL_NO_DEPRECATED_3_0
else if (callback != NULL)
return callback(b, BIO_CB_CTRL, (const char *)c, BIO_CTRL_SET, e, 1L);
diff --git a/crypto/evp/bio_md.c b/crypto/evp/bio_md.c
index 1a85be1811..a2d9afcf0e 100644
--- a/crypto/evp/bio_md.c
+++ b/crypto/evp/bio_md.c
@@ -32,7 +32,7 @@ static const BIO_METHOD methods_md = {
md_write,
bread_conv,
md_read,
- NULL, /* md_puts, */
+ NULL, /* md_puts, */
md_gets,
md_ctrl,
md_new,
@@ -89,7 +89,8 @@ static int md_read(BIO *b, char *out, int outl)
if (BIO_get_init(b)) {
if (ret > 0) {
if (EVP_DigestUpdate(ctx, (unsigned char *)out,
- (unsigned int)ret) <= 0)
+ (unsigned int)ret)
+ <= 0)
return -1;
}
}
@@ -115,7 +116,7 @@ static int md_write(BIO *b, const char *in, int inl)
if (BIO_get_init(b)) {
if (ret > 0) {
if (!EVP_DigestUpdate(ctx, (const unsigned char *)in,
- (unsigned int)ret)) {
+ (unsigned int)ret)) {
BIO_clear_retry_flags(b);
return 0;
}
@@ -136,7 +137,6 @@ static long md_ctrl(BIO *b, int cmd, long num, void *ptr)
long ret = 1;
BIO *dbio, *next;
-
ctx = BIO_get_data(b);
next = BIO_next(b);
diff --git a/crypto/evp/bio_ok.c b/crypto/evp/bio_ok.c
index bd44d27a70..9b48c3c745 100644
--- a/crypto/evp/bio_ok.c
+++ b/crypto/evp/bio_ok.c
@@ -77,7 +77,7 @@
#include <openssl/evp.h>
#include <openssl/rand.h>
#include "internal/endian.h"
-#include "internal/numbers.h" /* includes SIZE_MAX */
+#include "internal/numbers.h" /* includes SIZE_MAX */
#include "crypto/evp.h"
static int ok_write(BIO *h, const char *buf, int num);
@@ -91,9 +91,9 @@ static __owur int sig_out(BIO *b);
static __owur int sig_in(BIO *b);
static __owur int block_out(BIO *b);
static __owur int block_in(BIO *b);
-#define OK_BLOCK_SIZE (1024*4)
-#define OK_BLOCK_BLOCK 4
-#define IOBS (OK_BLOCK_SIZE+ OK_BLOCK_BLOCK+ 3*EVP_MAX_MD_SIZE)
+#define OK_BLOCK_SIZE (1024 * 4)
+#define OK_BLOCK_BLOCK 4
+#define IOBS (OK_BLOCK_SIZE + OK_BLOCK_BLOCK + 3 * EVP_MAX_MD_SIZE)
#define WELLKNOWN "The quick brown fox jumped over the lazy dog's back."
typedef struct ok_struct {
@@ -101,11 +101,11 @@ typedef struct ok_struct {
size_t buf_off;
size_t buf_len_save;
size_t buf_off_save;
- int cont; /* <= 0 when finished */
+ int cont; /* <= 0 when finished */
int finished;
EVP_MD_CTX *md;
- int blockout; /* output block is ready */
- int sigio; /* must process signature */
+ int blockout; /* output block is ready */
+ int sigio; /* must process signature */
unsigned char buf[IOBS];
} BIO_OK_CTX;
@@ -116,8 +116,8 @@ static const BIO_METHOD methods_ok = {
ok_write,
bread_conv,
ok_read,
- NULL, /* ok_puts, */
- NULL, /* ok_gets, */
+ NULL, /* ok_puts, */
+ NULL, /* ok_gets, */
ok_ctrl,
ok_new,
ok_free,
@@ -204,7 +204,7 @@ static int ok_read(BIO *b, char *out, int outl)
if (ctx->buf_len_save > ctx->buf_off_save) {
ctx->buf_len = ctx->buf_len_save - ctx->buf_off_save;
memmove(ctx->buf, &(ctx->buf[ctx->buf_off_save]),
- ctx->buf_len);
+ ctx->buf_len);
} else {
ctx->buf_len = 0;
}
@@ -221,7 +221,7 @@ static int ok_read(BIO *b, char *out, int outl)
i = BIO_read(next, &(ctx->buf[ctx->buf_len]), n);
if (i <= 0)
- break; /* nothing new */
+ break; /* nothing new */
ctx->buf_len += i;
@@ -244,7 +244,6 @@ static int ok_read(BIO *b, char *out, int outl)
/* invalid block -- cancel */
if (ctx->cont <= 0)
break;
-
}
BIO_clear_retry_flags(b);
@@ -296,8 +295,7 @@ static int ok_write(BIO *b, const char *in, int inl)
if ((in == NULL) || (inl <= 0))
return 0;
- n = (inl + ctx->buf_len > OK_BLOCK_SIZE + OK_BLOCK_BLOCK) ?
- (int)(OK_BLOCK_SIZE + OK_BLOCK_BLOCK - ctx->buf_len) : inl;
+ n = (inl + ctx->buf_len > OK_BLOCK_SIZE + OK_BLOCK_BLOCK) ? (int)(OK_BLOCK_SIZE + OK_BLOCK_BLOCK - ctx->buf_len) : inl;
memcpy(&ctx->buf[ctx->buf_len], in, n);
ctx->buf_len += n;
@@ -341,14 +339,14 @@ static long ok_ctrl(BIO *b, int cmd, long num, void *ptr)
ctx->sigio = 1;
ret = BIO_ctrl(next, cmd, num, ptr);
break;
- case BIO_CTRL_EOF: /* More to read */
+ case BIO_CTRL_EOF: /* More to read */
if (ctx->cont <= 0)
ret = 1;
else
ret = BIO_ctrl(next, cmd, num, ptr);
break;
- case BIO_CTRL_PENDING: /* More to read in buffer */
- case BIO_CTRL_WPENDING: /* More to read in buffer */
+ case BIO_CTRL_PENDING: /* More to read in buffer */
+ case BIO_CTRL_WPENDING: /* More to read in buffer */
ret = ctx->blockout ? (long)(ctx->buf_len - ctx->buf_off) : 0;
if (ret <= 0)
ret = BIO_ctrl(next, cmd, num, ptr);
@@ -469,7 +467,7 @@ static int sig_out(BIO *b)
ctx->blockout = 1;
ctx->sigio = 0;
return 1;
- berr:
+berr:
BIO_clear_retry_flags(b);
return 0;
}
@@ -511,7 +509,7 @@ static int sig_in(BIO *b)
ctx->sigio = 0;
if (ctx->buf_len != ctx->buf_off) {
memmove(ctx->buf, &(ctx->buf[ctx->buf_off]),
- ctx->buf_len - ctx->buf_off);
+ ctx->buf_len - ctx->buf_off);
}
ctx->buf_len -= ctx->buf_off;
ctx->buf_off = 0;
@@ -519,7 +517,7 @@ static int sig_in(BIO *b)
ctx->cont = 0;
}
return 1;
- berr:
+berr:
BIO_clear_retry_flags(b);
return 0;
}
@@ -545,14 +543,14 @@ static int block_out(BIO *b)
ctx->buf[2] = (unsigned char)(tl >> 8);
ctx->buf[3] = (unsigned char)(tl);
if (!EVP_DigestUpdate(md,
- (unsigned char *)&(ctx->buf[OK_BLOCK_BLOCK]), tl))
+ (unsigned char *)&(ctx->buf[OK_BLOCK_BLOCK]), tl))
goto berr;
if (!EVP_DigestFinal_ex(md, &(ctx->buf[ctx->buf_len]), NULL))
goto berr;
ctx->buf_len += md_size;
ctx->blockout = 1;
return 1;
- berr:
+berr:
BIO_clear_retry_flags(b);
return 0;
}
@@ -573,9 +571,9 @@ static int block_in(BIO *b)
assert(sizeof(tl) >= OK_BLOCK_BLOCK); /* always true */
tl = ((size_t)ctx->buf[0] << 24)
- | ((size_t)ctx->buf[1] << 16)
- | ((size_t)ctx->buf[2] << 8)
- | ((size_t)ctx->buf[3]);
+ | ((size_t)ctx->buf[1] << 16)
+ | ((size_t)ctx->buf[2] << 8)
+ | ((size_t)ctx->buf[3]);
if (tl > OK_BLOCK_SIZE)
goto berr;
@@ -587,7 +585,7 @@ static int block_in(BIO *b)
return 1;
if (!EVP_DigestUpdate(md,
- (unsigned char *)&(ctx->buf[OK_BLOCK_BLOCK]), tl))
+ (unsigned char *)&(ctx->buf[OK_BLOCK_BLOCK]), tl))
goto berr;
if (!EVP_DigestFinal_ex(md, tmp, NULL))
goto berr;
@@ -602,7 +600,7 @@ static int block_in(BIO *b)
ctx->cont = 0;
}
return 1;
- berr:
+berr:
BIO_clear_retry_flags(b);
return 0;
}
diff --git a/crypto/evp/c_allc.c b/crypto/evp/c_allc.c
index c74b3dcd75..16cf6403bf 100644
--- a/crypto/evp/c_allc.c
+++ b/crypto/evp/c_allc.c
@@ -56,9 +56,9 @@ void openssl_add_all_ciphers_int(void)
#ifndef OPENSSL_NO_RC4
EVP_add_cipher(EVP_rc4());
EVP_add_cipher(EVP_rc4_40());
-# ifndef OPENSSL_NO_MD5
+#ifndef OPENSSL_NO_MD5
EVP_add_cipher(EVP_rc4_hmac_md5());
-# endif
+#endif
#endif
#ifndef OPENSSL_NO_IDEA
@@ -261,8 +261,8 @@ void openssl_add_all_ciphers_int(void)
#ifndef OPENSSL_NO_CHACHA
EVP_add_cipher(EVP_chacha20());
-# ifndef OPENSSL_NO_POLY1305
+#ifndef OPENSSL_NO_POLY1305
EVP_add_cipher(EVP_chacha20_poly1305());
-# endif
+#endif
#endif
}
diff --git a/crypto/evp/cmeth_lib.c b/crypto/evp/cmeth_lib.c
index 41a1bade2c..5e71d0061c 100644
--- a/crypto/evp/cmeth_lib.c
+++ b/crypto/evp/cmeth_lib.c
@@ -45,7 +45,8 @@ EVP_CIPHER *EVP_CIPHER_meth_dup(const EVP_CIPHER *cipher)
return NULL;
if ((to = EVP_CIPHER_meth_new(cipher->nid, cipher->block_size,
- cipher->key_len)) != NULL) {
+ cipher->key_len))
+ != NULL) {
CRYPTO_REF_COUNT refcnt = to->refcnt;
memcpy(to, cipher, sizeof(*to));
@@ -58,7 +59,7 @@ EVP_CIPHER *EVP_CIPHER_meth_dup(const EVP_CIPHER *cipher)
void EVP_CIPHER_meth_free(EVP_CIPHER *cipher)
{
if (cipher == NULL || cipher->origin != EVP_ORIG_METH)
- return;
+ return;
evp_cipher_free_int(cipher);
}
@@ -91,10 +92,10 @@ int EVP_CIPHER_meth_set_impl_ctx_size(EVP_CIPHER *cipher, int ctx_size)
}
int EVP_CIPHER_meth_set_init(EVP_CIPHER *cipher,
- int (*init) (EVP_CIPHER_CTX *ctx,
- const unsigned char *key,
- const unsigned char *iv,
- int enc))
+ int (*init)(EVP_CIPHER_CTX *ctx,
+ const unsigned char *key,
+ const unsigned char *iv,
+ int enc))
{
if (cipher->init != NULL)
return 0;
@@ -104,10 +105,10 @@ int EVP_CIPHER_meth_set_init(EVP_CIPHER *cipher,
}
int EVP_CIPHER_meth_set_do_cipher(EVP_CIPHER *cipher,
- int (*do_cipher) (EVP_CIPHER_CTX *ctx,
- unsigned char *out,
- const unsigned char *in,
- size_t inl))
+ int (*do_cipher)(EVP_CIPHER_CTX *ctx,
+ unsigned char *out,
+ const unsigned char *in,
+ size_t inl))
{
if (cipher->do_cipher != NULL)
return 0;
@@ -117,7 +118,7 @@ int EVP_CIPHER_meth_set_do_cipher(EVP_CIPHER *cipher,
}
int EVP_CIPHER_meth_set_cleanup(EVP_CIPHER *cipher,
- int (*cleanup) (EVP_CIPHER_CTX *))
+ int (*cleanup)(EVP_CIPHER_CTX *))
{
if (cipher->cleanup != NULL)
return 0;
@@ -127,8 +128,8 @@ int EVP_CIPHER_meth_set_cleanup(EVP_CIPHER *cipher,
}
int EVP_CIPHER_meth_set_set_asn1_params(EVP_CIPHER *cipher,
- int (*set_asn1_parameters) (EVP_CIPHER_CTX *,
- ASN1_TYPE *))
+ int (*set_asn1_parameters)(EVP_CIPHER_CTX *,
+ ASN1_TYPE *))
{
if (cipher->set_asn1_parameters != NULL)
return 0;
@@ -138,8 +139,8 @@ int EVP_CIPHER_meth_set_set_asn1_params(EVP_CIPHER *cipher,
}
int EVP_CIPHER_meth_set_get_asn1_params(EVP_CIPHER *cipher,
- int (*get_asn1_parameters) (EVP_CIPHER_CTX *,
- ASN1_TYPE *))
+ int (*get_asn1_parameters)(EVP_CIPHER_CTX *,
+ ASN1_TYPE *))
{
if (cipher->get_asn1_parameters != NULL)
return 0;
@@ -149,8 +150,8 @@ int EVP_CIPHER_meth_set_get_asn1_params(EVP_CIPHER *cipher,
}
int EVP_CIPHER_meth_set_ctrl(EVP_CIPHER *cipher,
- int (*ctrl) (EVP_CIPHER_CTX *, int type,
- int arg, void *ptr))
+ int (*ctrl)(EVP_CIPHER_CTX *, int type,
+ int arg, void *ptr))
{
if (cipher->ctrl != NULL)
return 0;
@@ -159,18 +160,17 @@ int EVP_CIPHER_meth_set_ctrl(EVP_CIPHER *cipher,
return 1;
}
-
int (*EVP_CIPHER_meth_get_init(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *ctx,
- const unsigned char *key,
- const unsigned char *iv,
- int enc)
+ const unsigned char *key,
+ const unsigned char *iv,
+ int enc)
{
return cipher->init;
}
int (*EVP_CIPHER_meth_get_do_cipher(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *ctx,
- unsigned char *out,
- const unsigned char *in,
- size_t inl)
+ unsigned char *out,
+ const unsigned char *in,
+ size_t inl)
{
return cipher->do_cipher;
}
@@ -181,21 +181,20 @@ int (*EVP_CIPHER_meth_get_cleanup(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *)
}
int (*EVP_CIPHER_meth_get_set_asn1_params(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *,
- ASN1_TYPE *)
+ ASN1_TYPE *)
{
return cipher->set_asn1_parameters;
}
int (*EVP_CIPHER_meth_get_get_asn1_params(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *,
- ASN1_TYPE *)
+ ASN1_TYPE *)
{
return cipher->get_asn1_parameters;
}
int (*EVP_CIPHER_meth_get_ctrl(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *,
- int type, int arg,
- void *ptr)
+ int type, int arg,
+ void *ptr)
{
return cipher->ctrl;
}
-
diff --git a/crypto/evp/ctrl_params_translate.c b/crypto/evp/ctrl_params_translate.c
index 0ddc2acfc8..d4bbc6cf72 100644
--- a/crypto/evp/ctrl_params_translate.c
+++ b/crypto/evp/ctrl_params_translate.c
@@ -37,8 +37,8 @@
#include "crypto/dh.h"
#include "crypto/ec.h"
-struct translation_ctx_st; /* Forwarding */
-struct translation_st; /* Forwarding */
+struct translation_ctx_st; /* Forwarding */
+struct translation_st; /* Forwarding */
/*
* The fixup_args functions are called with the following parameters:
@@ -145,19 +145,27 @@ struct translation_st; /* Forwarding */
*/
enum state {
PKEY,
- PRE_CTRL_TO_PARAMS, POST_CTRL_TO_PARAMS, CLEANUP_CTRL_TO_PARAMS,
- PRE_CTRL_STR_TO_PARAMS, POST_CTRL_STR_TO_PARAMS, CLEANUP_CTRL_STR_TO_PARAMS,
- PRE_PARAMS_TO_CTRL, POST_PARAMS_TO_CTRL, CLEANUP_PARAMS_TO_CTRL
+ PRE_CTRL_TO_PARAMS,
+ POST_CTRL_TO_PARAMS,
+ CLEANUP_CTRL_TO_PARAMS,
+ PRE_CTRL_STR_TO_PARAMS,
+ POST_CTRL_STR_TO_PARAMS,
+ CLEANUP_CTRL_STR_TO_PARAMS,
+ PRE_PARAMS_TO_CTRL,
+ POST_PARAMS_TO_CTRL,
+ CLEANUP_PARAMS_TO_CTRL
};
enum action {
- OSSL_ACTION_NONE = 0, OSSL_ACTION_GET = 1, OSSL_ACTION_SET = 2
+ OSSL_ACTION_NONE = 0,
+ OSSL_ACTION_GET = 1,
+ OSSL_ACTION_SET = 2
};
typedef int fixup_args_fn(enum state state,
- const struct translation_st *translation,
- struct translation_ctx_st *ctx);
+ const struct translation_st *translation,
+ struct translation_ctx_st *ctx);
typedef int cleanup_args_fn(enum state state,
- const struct translation_st *translation,
- struct translation_ctx_st *ctx);
+ const struct translation_st *translation,
+ struct translation_ctx_st *ctx);
struct translation_ctx_st {
/*
@@ -234,9 +242,9 @@ struct translation_st {
* will check and return an error if it's not supported).
* Any of these may be set to 0 to indicate that they are unset.
*/
- int keytype1; /* The EVP_PKEY_XXX type, i.e. NIDs. #legacy */
- int keytype2; /* Another EVP_PKEY_XXX type, used for aliases */
- int optype; /* The operation type */
+ int keytype1; /* The EVP_PKEY_XXX type, i.e. NIDs. #legacy */
+ int keytype2; /* Another EVP_PKEY_XXX type, used for aliases */
+ int optype; /* The operation type */
/*
* Lookup and translation attributes
@@ -256,10 +264,10 @@ struct translation_st {
* to |ctrl_str|. That will signal to default_fixup_args() that the
* value must always be interpreted as hex.
*/
- int ctrl_num; /* EVP_PKEY_CTRL_xxx */
- const char *ctrl_str; /* The corresponding ctrl string */
+ int ctrl_num; /* EVP_PKEY_CTRL_xxx */
+ const char *ctrl_str; /* The corresponding ctrl string */
const char *ctrl_hexstr; /* The alternative "hex{str}" ctrl string */
- const char *param_key; /* The corresponding OSSL_PARAM key */
+ const char *param_key; /* The corresponding OSSL_PARAM key */
/*
* The appropriate OSSL_PARAM data type. This may be 0 to indicate that
* this OSSL_PARAM may have more than one data type, depending on input
@@ -287,8 +295,8 @@ struct translation_st {
* perform certain standard checks.
*/
static int default_check(enum state state,
- const struct translation_st *translation,
- const struct translation_ctx_st *ctx)
+ const struct translation_st *translation,
+ const struct translation_ctx_st *ctx)
{
switch (state) {
default:
@@ -385,8 +393,8 @@ static int default_check(enum state state,
* PRE_CTRL_TO_PARAMS, OSSL_ACTION_SET.
*/
static int default_fixup_args(enum state state,
- const struct translation_st *translation,
- struct translation_ctx_st *ctx)
+ const struct translation_st *translation,
+ struct translation_ctx_st *ctx)
{
int ret;
@@ -397,7 +405,7 @@ static int default_fixup_args(enum state state,
default:
/* For states this function should never have been called with */
ERR_raise_data(ERR_LIB_EVP, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED,
- "[action:%d, state:%d]", ctx->action_type, state);
+ "[action:%d, state:%d]", ctx->action_type, state);
return 0;
/*
@@ -414,13 +422,13 @@ static int default_fixup_args(enum state state,
* special fixup function.
*/
ERR_raise_data(ERR_LIB_EVP, ERR_R_UNSUPPORTED,
- "[action:%d, state:%d]", ctx->action_type, state);
+ "[action:%d, state:%d]", ctx->action_type, state);
return 0;
}
if (translation->optype != 0) {
if ((EVP_PKEY_CTX_IS_SIGNATURE_OP(ctx->pctx)
- && ctx->pctx->op.sig.algctx == NULL)
+ && ctx->pctx->op.sig.algctx == NULL)
|| (EVP_PKEY_CTX_IS_DERIVE_OP(ctx->pctx)
&& ctx->pctx->op.kex.algctx == NULL)
|| (EVP_PKEY_CTX_IS_ASYM_CIPHER_OP(ctx->pctx)
@@ -447,7 +455,7 @@ static int default_fixup_args(enum state state,
switch (translation->param_data_type) {
case OSSL_PARAM_INTEGER:
*ctx->params = OSSL_PARAM_construct_int(translation->param_key,
- &ctx->p1);
+ &ctx->p1);
break;
case OSSL_PARAM_UNSIGNED_INTEGER:
/*
@@ -462,55 +470,51 @@ static int default_fixup_args(enum state state,
if (ctx->action_type == OSSL_ACTION_SET) {
ctx->buflen = BN_num_bytes(ctx->p2);
if ((ctx->allocated_buf
- = OPENSSL_malloc(ctx->buflen)) == NULL)
+ = OPENSSL_malloc(ctx->buflen))
+ == NULL)
return 0;
if (BN_bn2nativepad(ctx->p2,
- ctx->allocated_buf,
- (int)ctx->buflen) < 0) {
+ ctx->allocated_buf,
+ (int)ctx->buflen)
+ < 0) {
OPENSSL_free(ctx->allocated_buf);
ctx->allocated_buf = NULL;
return 0;
}
- *ctx->params =
- OSSL_PARAM_construct_BN(translation->param_key,
- ctx->allocated_buf,
- ctx->buflen);
+ *ctx->params = OSSL_PARAM_construct_BN(translation->param_key,
+ ctx->allocated_buf,
+ ctx->buflen);
} else {
/*
* No support for getting a BIGNUM by ctrl, this needs
* fixup_args function support.
*/
ERR_raise_data(ERR_LIB_EVP, ERR_R_UNSUPPORTED,
- "[action:%d, state:%d] trying to get a "
- "BIGNUM via ctrl call",
- ctx->action_type, state);
+ "[action:%d, state:%d] trying to get a "
+ "BIGNUM via ctrl call",
+ ctx->action_type, state);
return 0;
}
} else {
- *ctx->params =
- OSSL_PARAM_construct_uint(translation->param_key,
- (unsigned int *)&ctx->p1);
+ *ctx->params = OSSL_PARAM_construct_uint(translation->param_key,
+ (unsigned int *)&ctx->p1);
}
break;
case OSSL_PARAM_UTF8_STRING:
- *ctx->params =
- OSSL_PARAM_construct_utf8_string(translation->param_key,
- ctx->p2, (size_t)ctx->p1);
+ *ctx->params = OSSL_PARAM_construct_utf8_string(translation->param_key,
+ ctx->p2, (size_t)ctx->p1);
break;
case OSSL_PARAM_UTF8_PTR:
- *ctx->params =
- OSSL_PARAM_construct_utf8_ptr(translation->param_key,
- ctx->p2, (size_t)ctx->p1);
+ *ctx->params = OSSL_PARAM_construct_utf8_ptr(translation->param_key,
+ ctx->p2, (size_t)ctx->p1);
break;
case OSSL_PARAM_OCTET_STRING:
- *ctx->params =
- OSSL_PARAM_construct_octet_string(translation->param_key,
- ctx->p2, (size_t)ctx->p1);
+ *ctx->params = OSSL_PARAM_construct_octet_string(translation->param_key,
+ ctx->p2, (size_t)ctx->p1);
break;
case OSSL_PARAM_OCTET_PTR:
- *ctx->params =
- OSSL_PARAM_construct_octet_ptr(translation->param_key,
- ctx->p2, (size_t)ctx->p1);
+ *ctx->params = OSSL_PARAM_construct_octet_ptr(translation->param_key,
+ ctx->p2, (size_t)ctx->p1);
break;
}
break;
@@ -538,59 +542,58 @@ static int default_fixup_args(enum state state,
* |*params|, and POST_CTRL_TO_PARAMS currently has nothing to do, since
* there's no support for getting data via ctrl_str calls.
*/
- case PRE_CTRL_STR_TO_PARAMS:
- {
- /* This is ctrl_str to params translation */
- const char *tmp_ctrl_str = ctx->ctrl_str;
- const char *orig_ctrl_str = ctx->ctrl_str;
- const char *orig_value = ctx->p2;
- const OSSL_PARAM *settable = NULL;
- int exists = 0;
-
- /* Only setting is supported here */
- if (ctx->action_type != OSSL_ACTION_SET) {
- ERR_raise_data(ERR_LIB_EVP, EVP_R_COMMAND_NOT_SUPPORTED,
- "[action:%d, state:%d] only setting allowed",
- ctx->action_type, state);
- return 0;
- }
+ case PRE_CTRL_STR_TO_PARAMS: {
+ /* This is ctrl_str to params translation */
+ const char *tmp_ctrl_str = ctx->ctrl_str;
+ const char *orig_ctrl_str = ctx->ctrl_str;
+ const char *orig_value = ctx->p2;
+ const OSSL_PARAM *settable = NULL;
+ int exists = 0;
+
+ /* Only setting is supported here */
+ if (ctx->action_type != OSSL_ACTION_SET) {
+ ERR_raise_data(ERR_LIB_EVP, EVP_R_COMMAND_NOT_SUPPORTED,
+ "[action:%d, state:%d] only setting allowed",
+ ctx->action_type, state);
+ return 0;
+ }
- /*
- * If no translation exists, we simply pass the control string
- * unmodified.
- */
- if (translation != NULL) {
- tmp_ctrl_str = ctx->ctrl_str = translation->param_key;
-
- if (ctx->ishex) {
- strcpy(ctx->name_buf, "hex");
- if (OPENSSL_strlcat(ctx->name_buf, tmp_ctrl_str,
- sizeof(ctx->name_buf)) <= 3) {
- ERR_raise(ERR_LIB_EVP, ERR_R_INTERNAL_ERROR);
- return -1;
- }
- tmp_ctrl_str = ctx->name_buf;
+ /*
+ * If no translation exists, we simply pass the control string
+ * unmodified.
+ */
+ if (translation != NULL) {
+ tmp_ctrl_str = ctx->ctrl_str = translation->param_key;
+
+ if (ctx->ishex) {
+ strcpy(ctx->name_buf, "hex");
+ if (OPENSSL_strlcat(ctx->name_buf, tmp_ctrl_str,
+ sizeof(ctx->name_buf))
+ <= 3) {
+ ERR_raise(ERR_LIB_EVP, ERR_R_INTERNAL_ERROR);
+ return -1;
}
+ tmp_ctrl_str = ctx->name_buf;
}
+ }
- settable = EVP_PKEY_CTX_settable_params(ctx->pctx);
- if (!OSSL_PARAM_allocate_from_text(ctx->params, settable,
- tmp_ctrl_str,
- ctx->p2, strlen(ctx->p2),
- &exists)) {
- if (!exists) {
- ERR_raise_data(ERR_LIB_EVP, EVP_R_COMMAND_NOT_SUPPORTED,
- "[action:%d, state:%d] name=%s, value=%s",
- ctx->action_type, state,
- orig_ctrl_str, orig_value);
- return -2;
- }
- return 0;
+ settable = EVP_PKEY_CTX_settable_params(ctx->pctx);
+ if (!OSSL_PARAM_allocate_from_text(ctx->params, settable,
+ tmp_ctrl_str,
+ ctx->p2, strlen(ctx->p2),
+ &exists)) {
+ if (!exists) {
+ ERR_raise_data(ERR_LIB_EVP, EVP_R_COMMAND_NOT_SUPPORTED,
+ "[action:%d, state:%d] name=%s, value=%s",
+ ctx->action_type, state,
+ orig_ctrl_str, orig_value);
+ return -2;
}
- ctx->allocated_buf = ctx->params->data;
- ctx->buflen = ctx->params->data_size;
+ return 0;
}
- break;
+ ctx->allocated_buf = ctx->params->data;
+ ctx->buflen = ctx->params->data_size;
+ } break;
case POST_CTRL_STR_TO_PARAMS:
/* Nothing to be done */
break;
@@ -611,107 +614,106 @@ static int default_fixup_args(enum state state,
case POST_PARAMS_TO_CTRL:
ret = ctx->p1;
/* FALLTHRU */
- case PRE_PARAMS_TO_CTRL:
- {
- /* This is params to ctrl translation */
- if (state == PRE_PARAMS_TO_CTRL && ctx->action_type == OSSL_ACTION_SET) {
- /* For the PRE state, only setting needs some work to be done */
-
- /* When setting, we populate |p1| and |p2| from |*params| */
- switch (translation->param_data_type) {
- case OSSL_PARAM_INTEGER:
- return OSSL_PARAM_get_int(ctx->params, &ctx->p1);
- case OSSL_PARAM_UNSIGNED_INTEGER:
- if (ctx->p2 != NULL) {
- /* BIGNUM passed down with p2 */
- if (!OSSL_PARAM_get_BN(ctx->params, ctx->p2))
- return 0;
- } else {
- /* Normal C unsigned int passed down */
- if (!OSSL_PARAM_get_uint(ctx->params,
- (unsigned int *)&ctx->p1))
- return 0;
- }
- return 1;
- case OSSL_PARAM_UTF8_STRING:
- return OSSL_PARAM_get_utf8_string(ctx->params,
- ctx->p2, ctx->sz);
- case OSSL_PARAM_OCTET_STRING:
- return OSSL_PARAM_get_octet_string(ctx->params,
- &ctx->p2, ctx->sz,
- (size_t *)&ctx->p1);
- case OSSL_PARAM_OCTET_PTR:
- return OSSL_PARAM_get_octet_ptr(ctx->params,
- ctx->p2, &ctx->sz);
- default:
- ERR_raise_data(ERR_LIB_EVP, ERR_R_UNSUPPORTED,
- "[action:%d, state:%d] "
- "unknown OSSL_PARAM data type %d",
- ctx->action_type, state,
- translation->param_data_type);
- return 0;
- }
- } else if ((state == POST_PARAMS_TO_CTRL || state == PKEY)
- && ctx->action_type == OSSL_ACTION_GET) {
- /* For the POST state, only getting needs some work to be done */
- unsigned int param_data_type = translation->param_data_type;
- size_t size = (size_t)ctx->p1;
-
- if (state == PKEY)
- size = ctx->sz;
- if (param_data_type == 0) {
- /* we must have a fixup_args function to work */
- if (!ossl_assert(translation->fixup_args != NULL)) {
- ERR_raise(ERR_LIB_EVP, ERR_R_INTERNAL_ERROR);
+ case PRE_PARAMS_TO_CTRL: {
+ /* This is params to ctrl translation */
+ if (state == PRE_PARAMS_TO_CTRL && ctx->action_type == OSSL_ACTION_SET) {
+ /* For the PRE state, only setting needs some work to be done */
+
+ /* When setting, we populate |p1| and |p2| from |*params| */
+ switch (translation->param_data_type) {
+ case OSSL_PARAM_INTEGER:
+ return OSSL_PARAM_get_int(ctx->params, &ctx->p1);
+ case OSSL_PARAM_UNSIGNED_INTEGER:
+ if (ctx->p2 != NULL) {
+ /* BIGNUM passed down with p2 */
+ if (!OSSL_PARAM_get_BN(ctx->params, ctx->p2))
+ return 0;
+ } else {
+ /* Normal C unsigned int passed down */
+ if (!OSSL_PARAM_get_uint(ctx->params,
+ (unsigned int *)&ctx->p1))
return 0;
- }
- param_data_type = ctx->params->data_type;
}
- /* When getting, we populate |*params| from |p1| and |p2| */
- switch (param_data_type) {
- case OSSL_PARAM_INTEGER:
- return OSSL_PARAM_set_int(ctx->params, ctx->p1);
- case OSSL_PARAM_UNSIGNED_INTEGER:
- if (ctx->p2 != NULL) {
- /* BIGNUM passed back */
- return OSSL_PARAM_set_BN(ctx->params, ctx->p2);
- } else {
- /* Normal C unsigned int passed back */
- return OSSL_PARAM_set_uint(ctx->params,
- (unsigned int)ctx->p1);
- }
- return 0;
- case OSSL_PARAM_UTF8_STRING:
- return OSSL_PARAM_set_utf8_string(ctx->params, ctx->p2);
- case OSSL_PARAM_OCTET_STRING:
- return OSSL_PARAM_set_octet_string(ctx->params, ctx->p2,
- size);
- case OSSL_PARAM_OCTET_PTR:
- return OSSL_PARAM_set_octet_ptr(ctx->params, *(void **)ctx->p2,
- size);
- default:
- ERR_raise_data(ERR_LIB_EVP, ERR_R_UNSUPPORTED,
- "[action:%d, state:%d] "
- "unsupported OSSL_PARAM data type %d",
- ctx->action_type, state,
- translation->param_data_type);
+ return 1;
+ case OSSL_PARAM_UTF8_STRING:
+ return OSSL_PARAM_get_utf8_string(ctx->params,
+ ctx->p2, ctx->sz);
+ case OSSL_PARAM_OCTET_STRING:
+ return OSSL_PARAM_get_octet_string(ctx->params,
+ &ctx->p2, ctx->sz,
+ (size_t *)&ctx->p1);
+ case OSSL_PARAM_OCTET_PTR:
+ return OSSL_PARAM_get_octet_ptr(ctx->params,
+ ctx->p2, &ctx->sz);
+ default:
+ ERR_raise_data(ERR_LIB_EVP, ERR_R_UNSUPPORTED,
+ "[action:%d, state:%d] "
+ "unknown OSSL_PARAM data type %d",
+ ctx->action_type, state,
+ translation->param_data_type);
+ return 0;
+ }
+ } else if ((state == POST_PARAMS_TO_CTRL || state == PKEY)
+ && ctx->action_type == OSSL_ACTION_GET) {
+ /* For the POST state, only getting needs some work to be done */
+ unsigned int param_data_type = translation->param_data_type;
+ size_t size = (size_t)ctx->p1;
+
+ if (state == PKEY)
+ size = ctx->sz;
+ if (param_data_type == 0) {
+ /* we must have a fixup_args function to work */
+ if (!ossl_assert(translation->fixup_args != NULL)) {
+ ERR_raise(ERR_LIB_EVP, ERR_R_INTERNAL_ERROR);
return 0;
}
- } else if (state == PRE_PARAMS_TO_CTRL && ctx->action_type == OSSL_ACTION_GET) {
- if (translation->param_data_type == OSSL_PARAM_OCTET_PTR)
- ctx->p2 = &ctx->bufp;
+ param_data_type = ctx->params->data_type;
}
+ /* When getting, we populate |*params| from |p1| and |p2| */
+ switch (param_data_type) {
+ case OSSL_PARAM_INTEGER:
+ return OSSL_PARAM_set_int(ctx->params, ctx->p1);
+ case OSSL_PARAM_UNSIGNED_INTEGER:
+ if (ctx->p2 != NULL) {
+ /* BIGNUM passed back */
+ return OSSL_PARAM_set_BN(ctx->params, ctx->p2);
+ } else {
+ /* Normal C unsigned int passed back */
+ return OSSL_PARAM_set_uint(ctx->params,
+ (unsigned int)ctx->p1);
+ }
+ return 0;
+ case OSSL_PARAM_UTF8_STRING:
+ return OSSL_PARAM_set_utf8_string(ctx->params, ctx->p2);
+ case OSSL_PARAM_OCTET_STRING:
+ return OSSL_PARAM_set_octet_string(ctx->params, ctx->p2,
+ size);
+ case OSSL_PARAM_OCTET_PTR:
+ return OSSL_PARAM_set_octet_ptr(ctx->params, *(void **)ctx->p2,
+ size);
+ default:
+ ERR_raise_data(ERR_LIB_EVP, ERR_R_UNSUPPORTED,
+ "[action:%d, state:%d] "
+ "unsupported OSSL_PARAM data type %d",
+ ctx->action_type, state,
+ translation->param_data_type);
+ return 0;
+ }
+ } else if (state == PRE_PARAMS_TO_CTRL && ctx->action_type == OSSL_ACTION_GET) {
+ if (translation->param_data_type == OSSL_PARAM_OCTET_PTR)
+ ctx->p2 = &ctx->bufp;
}
- /* Any other combination is simply pass-through */
- break;
+ }
+ /* Any other combination is simply pass-through */
+ break;
}
return ret;
}
static int
cleanup_translation_ctx(enum state state,
- const struct translation_st *translation,
- struct translation_ctx_st *ctx)
+ const struct translation_st *translation,
+ struct translation_ctx_st *ctx)
{
if (ctx->allocated_buf != NULL)
OPENSSL_free(ctx->allocated_buf);
@@ -744,11 +746,11 @@ static const void *get_md_by_name(OSSL_LIB_CTX *libctx, const char *name)
}
static int fix_cipher_md(enum state state,
- const struct translation_st *translation,
- struct translation_ctx_st *ctx,
- const char *(*get_name)(void *algo),
- const void *(*get_algo_by_name)(OSSL_LIB_CTX *libctx,
- const char *name))
+ const struct translation_st *translation,
+ struct translation_ctx_st *ctx,
+ const char *(*get_name)(void *algo),
+ const void *(*get_algo_by_name)(OSSL_LIB_CTX *libctx,
+ const char *name))
{
int ret = 1;
@@ -773,8 +775,8 @@ static int fix_cipher_md(enum state state,
* EVP_CIPHER pointer as p2...
*/
ctx->p2 = (char *)(ctx->p2 == NULL
- ? OBJ_nid2sn(ctx->p1)
- : get_name(ctx->p2));
+ ? OBJ_nid2sn(ctx->p1)
+ : get_name(ctx->p2));
ctx->p1 = (int)strlen(ctx->p2);
} else if (state == POST_PARAMS_TO_CTRL && ctx->action_type == OSSL_ACTION_GET) {
ctx->p2 = (ctx->p2 == NULL ? "" : (char *)get_name(ctx->p2));
@@ -789,8 +791,7 @@ static int fix_cipher_md(enum state state,
* Here's how we reuse |ctx->orig_p2| that was set in the
* PRE_CTRL_TO_PARAMS state above.
*/
- *(void **)ctx->orig_p2 =
- (void *)get_algo_by_name(ctx->pctx->libctx, ctx->p2);
+ *(void **)ctx->orig_p2 = (void *)get_algo_by_name(ctx->pctx->libctx, ctx->p2);
ctx->p1 = 1;
} else if (state == PRE_PARAMS_TO_CTRL && ctx->action_type == OSSL_ACTION_SET) {
ctx->p2 = (void *)get_algo_by_name(ctx->pctx->libctx, ctx->p2);
@@ -801,31 +802,32 @@ static int fix_cipher_md(enum state state,
}
static int fix_cipher(enum state state,
- const struct translation_st *translation,
- struct translation_ctx_st *ctx)
+ const struct translation_st *translation,
+ struct translation_ctx_st *ctx)
{
return fix_cipher_md(state, translation, ctx,
- get_cipher_name, get_cipher_by_name);
+ get_cipher_name, get_cipher_by_name);
}
static int fix_md(enum state state,
- const struct translation_st *translation,
- struct translation_ctx_st *ctx)
+ const struct translation_st *translation,
+ struct translation_ctx_st *ctx)
{
return fix_cipher_md(state, translation, ctx,
- get_md_name, get_md_by_name);
+ get_md_name, get_md_by_name);
}
static int fix_distid_len(enum state state,
- const struct translation_st *translation,
- struct translation_ctx_st *ctx)
+ const struct translation_st *translation,
+ struct translation_ctx_st *ctx)
{
int ret = default_fixup_args(state, translation, ctx);
if (ret > 0) {
ret = 0;
if ((state == POST_CTRL_TO_PARAMS
- || state == POST_CTRL_STR_TO_PARAMS) && ctx->action_type == OSSL_ACTION_GET) {
+ || state == POST_CTRL_STR_TO_PARAMS)
+ && ctx->action_type == OSSL_ACTION_GET) {
*(size_t *)ctx->p2 = ctx->sz;
ret = 1;
}
@@ -839,9 +841,9 @@ struct kdf_type_map_st {
};
static int fix_kdf_type(enum state state,
- const struct translation_st *translation,
- struct translation_ctx_st *ctx,
- const struct kdf_type_map_st *kdf_type_map)
+ const struct translation_st *translation,
+ struct translation_ctx_st *ctx,
+ const struct kdf_type_map_st *kdf_type_map)
{
/*
* The EVP_PKEY_CTRL_DH_KDF_TYPE ctrl command is a bit special, in
@@ -917,14 +919,14 @@ static int fix_kdf_type(enum state state,
} else if (state == PRE_PARAMS_TO_CTRL && ctx->action_type == OSSL_ACTION_GET) {
ctx->p1 = -2;
}
- end:
+end:
return ret;
}
/* EVP_PKEY_CTRL_DH_KDF_TYPE */
static int fix_dh_kdf_type(enum state state,
- const struct translation_st *translation,
- struct translation_ctx_st *ctx)
+ const struct translation_st *translation,
+ struct translation_ctx_st *ctx)
{
static const struct kdf_type_map_st kdf_type_map[] = {
{ EVP_PKEY_DH_KDF_NONE, "" },
@@ -937,8 +939,8 @@ static int fix_dh_kdf_type(enum state state,
/* EVP_PKEY_CTRL_EC_KDF_TYPE */
static int fix_ec_kdf_type(enum state state,
- const struct translation_st *translation,
- struct translation_ctx_st *ctx)
+ const struct translation_st *translation,
+ struct translation_ctx_st *ctx)
{
static const struct kdf_type_map_st kdf_type_map[] = {
{ EVP_PKEY_ECDH_KDF_NONE, "" },
@@ -951,8 +953,8 @@ static int fix_ec_kdf_type(enum state state,
/* EVP_PKEY_CTRL_DH_KDF_OID, EVP_PKEY_CTRL_GET_DH_KDF_OID, ...??? */
static int fix_oid(enum state state,
- const struct translation_st *translation,
- struct translation_ctx_st *ctx)
+ const struct translation_st *translation,
+ struct translation_ctx_st *ctx)
{
int ret;
@@ -994,8 +996,8 @@ static int fix_oid(enum state state,
/* EVP_PKEY_CTRL_DH_NID */
static int fix_dh_nid(enum state state,
- const struct translation_st *translation,
- struct translation_ctx_st *ctx)
+ const struct translation_st *translation,
+ struct translation_ctx_st *ctx)
{
int ret;
@@ -1007,8 +1009,7 @@ static int fix_dh_nid(enum state state,
return 0;
if (state == PRE_CTRL_TO_PARAMS) {
- if ((ctx->p2 = (char *)ossl_ffc_named_group_get_name
- (ossl_ffc_uid_to_dh_named_group(ctx->p1))) == NULL) {
+ if ((ctx->p2 = (char *)ossl_ffc_named_group_get_name(ossl_ffc_uid_to_dh_named_group(ctx->p1))) == NULL) {
ERR_raise(ERR_LIB_EVP, EVP_R_INVALID_VALUE);
return 0;
}
@@ -1020,8 +1021,8 @@ static int fix_dh_nid(enum state state,
/* EVP_PKEY_CTRL_DH_RFC5114 */
static int fix_dh_nid5114(enum state state,
- const struct translation_st *translation,
- struct translation_ctx_st *ctx)
+ const struct translation_st *translation,
+ struct translation_ctx_st *ctx)
{
int ret;
@@ -1034,8 +1035,7 @@ static int fix_dh_nid5114(enum state state,
switch (state) {
case PRE_CTRL_TO_PARAMS:
- if ((ctx->p2 = (char *)ossl_ffc_named_group_get_name
- (ossl_ffc_uid_to_dh_named_group(ctx->p1))) == NULL) {
+ if ((ctx->p2 = (char *)ossl_ffc_named_group_get_name(ossl_ffc_uid_to_dh_named_group(ctx->p1))) == NULL) {
ERR_raise(ERR_LIB_EVP, EVP_R_INVALID_VALUE);
return 0;
}
@@ -1046,8 +1046,7 @@ static int fix_dh_nid5114(enum state state,
case PRE_CTRL_STR_TO_PARAMS:
if (ctx->p2 == NULL)
return 0;
- if ((ctx->p2 = (char *)ossl_ffc_named_group_get_name
- (ossl_ffc_uid_to_dh_named_group(atoi(ctx->p2)))) == NULL) {
+ if ((ctx->p2 = (char *)ossl_ffc_named_group_get_name(ossl_ffc_uid_to_dh_named_group(atoi(ctx->p2)))) == NULL) {
ERR_raise(ERR_LIB_EVP, EVP_R_INVALID_VALUE);
return 0;
}
@@ -1064,8 +1063,8 @@ static int fix_dh_nid5114(enum state state,
/* EVP_PKEY_CTRL_DH_PARAMGEN_TYPE */
static int fix_dh_paramgen_type(enum state state,
- const struct translation_st *translation,
- struct translation_ctx_st *ctx)
+ const struct translation_st *translation,
+ struct translation_ctx_st *ctx)
{
int ret;
@@ -1078,7 +1077,7 @@ static int fix_dh_paramgen_type(enum state state,
if (state == PRE_CTRL_STR_TO_PARAMS) {
if ((ctx->p2 = (char *)ossl_dh_gen_type_id2name(atoi(ctx->p2)))
- == NULL) {
+ == NULL) {
ERR_raise(ERR_LIB_EVP, EVP_R_INVALID_VALUE);
return 0;
}
@@ -1090,8 +1089,8 @@ static int fix_dh_paramgen_type(enum state state,
/* EVP_PKEY_CTRL_EC_PARAM_ENC */
static int fix_ec_param_enc(enum state state,
- const struct translation_st *translation,
- struct translation_ctx_st *ctx)
+ const struct translation_st *translation,
+ struct translation_ctx_st *ctx)
{
int ret;
@@ -1130,7 +1129,7 @@ static int fix_ec_param_enc(enum state state,
ctx->p2 = NULL;
}
- end:
+end:
if (ret == -2)
ERR_raise(ERR_LIB_EVP, EVP_R_COMMAND_NOT_SUPPORTED);
return ret;
@@ -1138,8 +1137,8 @@ static int fix_ec_param_enc(enum state state,
/* EVP_PKEY_CTRL_EC_PARAMGEN_CURVE_NID */
static int fix_ec_paramgen_curve_nid(enum state state,
- const struct translation_st *translation,
- struct translation_ctx_st *ctx)
+ const struct translation_st *translation,
+ struct translation_ctx_st *ctx)
{
char *p2 = NULL;
int ret;
@@ -1181,8 +1180,8 @@ static int fix_ec_paramgen_curve_nid(enum state state,
/* EVP_PKEY_CTRL_EC_ECDH_COFACTOR */
static int fix_ecdh_cofactor(enum state state,
- const struct translation_st *translation,
- struct translation_ctx_st *ctx)
+ const struct translation_st *translation,
+ struct translation_ctx_st *ctx)
{
/*
* The EVP_PKEY_CTRL_EC_ECDH_COFACTOR ctrl command is a bit special, in
@@ -1248,18 +1247,18 @@ static int fix_ecdh_cofactor(enum state state,
/* EVP_PKEY_CTRL_RSA_PADDING, EVP_PKEY_CTRL_GET_RSA_PADDING */
static int fix_rsa_padding_mode(enum state state,
- const struct translation_st *translation,
- struct translation_ctx_st *ctx)
+ const struct translation_st *translation,
+ struct translation_ctx_st *ctx)
{
static const OSSL_ITEM str_value_map[] = {
- { RSA_PKCS1_PADDING, "pkcs1" },
- { RSA_NO_PADDING, "none" },
- { RSA_PKCS1_OAEP_PADDING, "oaep" },
- { RSA_PKCS1_OAEP_PADDING, "oeap" },
- { RSA_X931_PADDING, "x931" },
- { RSA_PKCS1_PSS_PADDING, "pss" },
+ { RSA_PKCS1_PADDING, "pkcs1" },
+ { RSA_NO_PADDING, "none" },
+ { RSA_PKCS1_OAEP_PADDING, "oaep" },
+ { RSA_PKCS1_OAEP_PADDING, "oeap" },
+ { RSA_X931_PADDING, "x931" },
+ { RSA_PKCS1_PSS_PADDING, "pss" },
/* Special case, will pass directly as an integer */
- { RSA_PKCS1_WITH_TLS_PADDING, NULL }
+ { RSA_PKCS1_WITH_TLS_PADDING, NULL }
};
int ret;
@@ -1300,7 +1299,7 @@ static int fix_rsa_padding_mode(enum state state,
* build the OSSL_PARAM item ourselves and return immediately.
*/
ctx->params[0] = OSSL_PARAM_construct_int(translation->param_key,
- &ctx->p1);
+ &ctx->p1);
return 1;
} else if (state == POST_PARAMS_TO_CTRL && ctx->action_type == OSSL_ACTION_GET) {
size_t i;
@@ -1326,8 +1325,8 @@ static int fix_rsa_padding_mode(enum state state,
}
if (i == OSSL_NELEM(str_value_map)) {
ERR_raise_data(ERR_LIB_RSA, RSA_R_UNKNOWN_PADDING_TYPE,
- "[action:%d, state:%d] padding number %d",
- ctx->action_type, state, ctx->p1);
+ "[action:%d, state:%d] padding number %d",
+ ctx->action_type, state, ctx->p1);
return -2;
}
/*
@@ -1356,8 +1355,8 @@ static int fix_rsa_padding_mode(enum state state,
if (i == OSSL_NELEM(str_value_map)) {
ERR_raise_data(ERR_LIB_RSA, RSA_R_UNKNOWN_PADDING_TYPE,
- "[action:%d, state:%d] padding name %s",
- ctx->action_type, state, (const char *)ctx->p2);
+ "[action:%d, state:%d] padding name %s",
+ ctx->action_type, state, (const char *)ctx->p2);
ctx->p1 = ret = -2;
} else if (state == POST_CTRL_TO_PARAMS) {
/* EVP_PKEY_CTRL_GET_RSA_PADDING weirdness explained further up */
@@ -1373,13 +1372,13 @@ static int fix_rsa_padding_mode(enum state state,
/* EVP_PKEY_CTRL_RSA_PSS_SALTLEN, EVP_PKEY_CTRL_GET_RSA_PSS_SALTLEN */
static int fix_rsa_pss_saltlen(enum state state,
- const struct translation_st *translation,
- struct translation_ctx_st *ctx)
+ const struct translation_st *translation,
+ struct translation_ctx_st *ctx)
{
static const OSSL_ITEM str_value_map[] = {
{ (unsigned int)RSA_PSS_SALTLEN_DIGEST, "digest" },
- { (unsigned int)RSA_PSS_SALTLEN_MAX, "max" },
- { (unsigned int)RSA_PSS_SALTLEN_AUTO, "auto" }
+ { (unsigned int)RSA_PSS_SALTLEN_MAX, "max" },
+ { (unsigned int)RSA_PSS_SALTLEN_AUTO, "auto" }
};
int ret;
@@ -1403,7 +1402,7 @@ static int fix_rsa_pss_saltlen(enum state state,
ctx->p2 = ctx->name_buf;
ctx->p1 = sizeof(ctx->name_buf);
} else if ((ctx->action_type == OSSL_ACTION_SET && state == PRE_CTRL_TO_PARAMS)
- || (ctx->action_type == OSSL_ACTION_GET && state == POST_PARAMS_TO_CTRL)) {
+ || (ctx->action_type == OSSL_ACTION_GET && state == POST_PARAMS_TO_CTRL)) {
size_t i;
for (i = 0; i < OSSL_NELEM(str_value_map); i++) {
@@ -1453,13 +1452,13 @@ static int fix_rsa_pss_saltlen(enum state state,
/* EVP_PKEY_CTRL_HKDF_MODE */
static int fix_hkdf_mode(enum state state,
- const struct translation_st *translation,
- struct translation_ctx_st *ctx)
+ const struct translation_st *translation,
+ struct translation_ctx_st *ctx)
{
static const OSSL_ITEM str_value_map[] = {
{ EVP_KDF_HKDF_MODE_EXTRACT_AND_EXPAND, "EXTRACT_AND_EXPAND" },
- { EVP_KDF_HKDF_MODE_EXTRACT_ONLY, "EXTRACT_ONLY" },
- { EVP_KDF_HKDF_MODE_EXPAND_ONLY, "EXPAND_ONLY" }
+ { EVP_KDF_HKDF_MODE_EXTRACT_ONLY, "EXTRACT_ONLY" },
+ { EVP_KDF_HKDF_MODE_EXPAND_ONLY, "EXPAND_ONLY" }
};
int ret;
@@ -1514,41 +1513,35 @@ static int fix_hkdf_mode(enum state state,
/* Pilfering DH, DSA and EC_KEY */
static int get_payload_group_name(enum state state,
- const struct translation_st *translation,
- struct translation_ctx_st *ctx)
+ const struct translation_st *translation,
+ struct translation_ctx_st *ctx)
{
EVP_PKEY *pkey = ctx->p2;
ctx->p2 = NULL;
switch (EVP_PKEY_get_base_id(pkey)) {
#ifndef OPENSSL_NO_DH
- case EVP_PKEY_DH:
- {
- const DH *dh = EVP_PKEY_get0_DH(pkey);
- int uid = DH_get_nid(dh);
+ case EVP_PKEY_DH: {
+ const DH *dh = EVP_PKEY_get0_DH(pkey);
+ int uid = DH_get_nid(dh);
- if (uid != NID_undef) {
- const DH_NAMED_GROUP *dh_group =
- ossl_ffc_uid_to_dh_named_group(uid);
+ if (uid != NID_undef) {
+ const DH_NAMED_GROUP *dh_group = ossl_ffc_uid_to_dh_named_group(uid);
- ctx->p2 = (char *)ossl_ffc_named_group_get_name(dh_group);
- }
+ ctx->p2 = (char *)ossl_ffc_named_group_get_name(dh_group);
}
- break;
+ } break;
#endif
#ifndef OPENSSL_NO_EC
- case EVP_PKEY_EC:
- {
- const EC_GROUP *grp =
- EC_KEY_get0_group(EVP_PKEY_get0_EC_KEY(pkey));
- int nid = NID_undef;
-
- if (grp != NULL)
- nid = EC_GROUP_get_curve_name(grp);
- if (nid != NID_undef)
- ctx->p2 = (char *)OSSL_EC_curve_nid2name(nid);
- }
- break;
+ case EVP_PKEY_EC: {
+ const EC_GROUP *grp = EC_KEY_get0_group(EVP_PKEY_get0_EC_KEY(pkey));
+ int nid = NID_undef;
+
+ if (grp != NULL)
+ nid = EC_GROUP_get_curve_name(grp);
+ if (nid != NID_undef)
+ ctx->p2 = (char *)OSSL_EC_curve_nid2name(nid);
+ } break;
#endif
default:
ERR_raise(ERR_LIB_EVP, EVP_R_UNSUPPORTED_KEY_TYPE);
@@ -1567,8 +1560,8 @@ static int get_payload_group_name(enum state state,
}
static int get_payload_private_key(enum state state,
- const struct translation_st *translation,
- struct translation_ctx_st *ctx)
+ const struct translation_st *translation,
+ struct translation_ctx_st *ctx)
{
EVP_PKEY *pkey = ctx->p2;
@@ -1578,22 +1571,18 @@ static int get_payload_private_key(enum state state,
switch (EVP_PKEY_get_base_id(pkey)) {
#ifndef OPENSSL_NO_DH
- case EVP_PKEY_DH:
- {
- const DH *dh = EVP_PKEY_get0_DH(pkey);
+ case EVP_PKEY_DH: {
+ const DH *dh = EVP_PKEY_get0_DH(pkey);
- ctx->p2 = (BIGNUM *)DH_get0_priv_key(dh);
- }
- break;
+ ctx->p2 = (BIGNUM *)DH_get0_priv_key(dh);
+ } break;
#endif
#ifndef OPENSSL_NO_EC
- case EVP_PKEY_EC:
- {
- const EC_KEY *ec = EVP_PKEY_get0_EC_KEY(pkey);
+ case EVP_PKEY_EC: {
+ const EC_KEY *ec = EVP_PKEY_get0_EC_KEY(pkey);
- ctx->p2 = (BIGNUM *)EC_KEY_get0_private_key(ec);
- }
- break;
+ ctx->p2 = (BIGNUM *)EC_KEY_get0_private_key(ec);
+ } break;
#endif
default:
ERR_raise(ERR_LIB_EVP, EVP_R_UNSUPPORTED_KEY_TYPE);
@@ -1604,8 +1593,8 @@ static int get_payload_private_key(enum state state,
}
static int get_payload_public_key(enum state state,
- const struct translation_st *translation,
- struct translation_ctx_st *ctx)
+ const struct translation_st *translation,
+ struct translation_ctx_st *ctx)
{
EVP_PKEY *pkey = ctx->p2;
unsigned char *buf = NULL;
@@ -1648,8 +1637,8 @@ static int get_payload_public_key(enum state state,
if (bnctx == NULL)
return 0;
ctx->sz = EC_POINT_point2buf(ecg, point,
- POINT_CONVERSION_COMPRESSED,
- &buf, bnctx);
+ POINT_CONVERSION_COMPRESSED,
+ &buf, bnctx);
ctx->p2 = buf;
BN_CTX_free(bnctx);
break;
@@ -1667,8 +1656,8 @@ static int get_payload_public_key(enum state state,
}
static int get_payload_public_key_ec(enum state state,
- const struct translation_st *translation,
- struct translation_ctx_st *ctx)
+ const struct translation_st *translation,
+ struct translation_ctx_st *ctx)
{
#ifndef OPENSSL_NO_EC
EVP_PKEY *pkey = ctx->p2;
@@ -1725,8 +1714,8 @@ out:
}
static int get_payload_bn(enum state state,
- const struct translation_st *translation,
- struct translation_ctx_st *ctx, const BIGNUM *bn)
+ const struct translation_st *translation,
+ struct translation_ctx_st *ctx, const BIGNUM *bn)
{
if (bn == NULL)
return 0;
@@ -1738,8 +1727,8 @@ static int get_payload_bn(enum state state,
}
static int get_dh_dsa_payload_p(enum state state,
- const struct translation_st *translation,
- struct translation_ctx_st *ctx)
+ const struct translation_st *translation,
+ struct translation_ctx_st *ctx)
{
const BIGNUM *bn = NULL;
EVP_PKEY *pkey = ctx->p2;
@@ -1763,8 +1752,8 @@ static int get_dh_dsa_payload_p(enum state state,
}
static int get_dh_dsa_payload_q(enum state state,
- const struct translation_st *translation,
- struct translation_ctx_st *ctx)
+ const struct translation_st *translation,
+ struct translation_ctx_st *ctx)
{
const BIGNUM *bn = NULL;
@@ -1785,8 +1774,8 @@ static int get_dh_dsa_payload_q(enum state state,
}
static int get_dh_dsa_payload_g(enum state state,
- const struct translation_st *translation,
- struct translation_ctx_st *ctx)
+ const struct translation_st *translation,
+ struct translation_ctx_st *ctx)
{
const BIGNUM *bn = NULL;
@@ -1807,9 +1796,9 @@ static int get_dh_dsa_payload_g(enum state state,
}
static int get_payload_int(enum state state,
- const struct translation_st *translation,
- struct translation_ctx_st *ctx,
- const int val)
+ const struct translation_st *translation,
+ struct translation_ctx_st *ctx,
+ const int val)
{
if (ctx->params->data_type != OSSL_PARAM_INTEGER)
return 0;
@@ -1820,8 +1809,8 @@ static int get_payload_int(enum state state,
}
static int get_ec_decoded_from_explicit_params(enum state state,
- const struct translation_st *translation,
- struct translation_ctx_st *ctx)
+ const struct translation_st *translation,
+ struct translation_ctx_st *ctx)
{
int val = 0;
EVP_PKEY *pkey = ctx->p2;
@@ -1845,8 +1834,8 @@ static int get_ec_decoded_from_explicit_params(enum state state,
}
static int get_rsa_payload_n(enum state state,
- const struct translation_st *translation,
- struct translation_ctx_st *ctx)
+ const struct translation_st *translation,
+ struct translation_ctx_st *ctx)
{
const BIGNUM *bn = NULL;
@@ -1859,8 +1848,8 @@ static int get_rsa_payload_n(enum state state,
}
static int get_rsa_payload_e(enum state state,
- const struct translation_st *translation,
- struct translation_ctx_st *ctx)
+ const struct translation_st *translation,
+ struct translation_ctx_st *ctx)
{
const BIGNUM *bn = NULL;
@@ -1873,8 +1862,8 @@ static int get_rsa_payload_e(enum state state,
}
static int get_rsa_payload_d(enum state state,
- const struct translation_st *translation,
- struct translation_ctx_st *ctx)
+ const struct translation_st *translation,
+ struct translation_ctx_st *ctx)
{
const BIGNUM *bn = NULL;
@@ -1887,9 +1876,9 @@ static int get_rsa_payload_d(enum state state,
}
static int get_rsa_payload_factor(enum state state,
- const struct translation_st *translation,
- struct translation_ctx_st *ctx,
- size_t factornum)
+ const struct translation_st *translation,
+ struct translation_ctx_st *ctx,
+ size_t factornum)
{
const RSA *r = EVP_PKEY_get0_RSA(ctx->p2);
const BIGNUM *bn = NULL;
@@ -1901,25 +1890,23 @@ static int get_rsa_payload_factor(enum state state,
case 1:
bn = RSA_get0_q(r);
break;
- default:
- {
- size_t pnum = RSA_get_multi_prime_extra_count(r);
- const BIGNUM *factors[10];
-
- if (factornum - 2 < pnum
- && RSA_get0_multi_prime_factors(r, factors))
- bn = factors[factornum - 2];
- }
- break;
+ default: {
+ size_t pnum = RSA_get_multi_prime_extra_count(r);
+ const BIGNUM *factors[10];
+
+ if (factornum - 2 < pnum
+ && RSA_get0_multi_prime_factors(r, factors))
+ bn = factors[factornum - 2];
+ } break;
}
return get_payload_bn(state, translation, ctx, bn);
}
static int get_rsa_payload_exponent(enum state state,
- const struct translation_st *translation,
- struct translation_ctx_st *ctx,
- size_t exponentnum)
+ const struct translation_st *translation,
+ struct translation_ctx_st *ctx,
+ size_t exponentnum)
{
const RSA *r = EVP_PKEY_get0_RSA(ctx->p2);
const BIGNUM *bn = NULL;
@@ -1931,25 +1918,23 @@ static int get_rsa_payload_exponent(enum state state,
case 1:
bn = RSA_get0_dmq1(r);
break;
- default:
- {
- size_t pnum = RSA_get_multi_prime_extra_count(r);
- const BIGNUM *exps[10], *coeffs[10];
-
- if (exponentnum - 2 < pnum
- && RSA_get0_multi_prime_crt_params(r, exps, coeffs))
- bn = exps[exponentnum - 2];
- }
- break;
+ default: {
+ size_t pnum = RSA_get_multi_prime_extra_count(r);
+ const BIGNUM *exps[10], *coeffs[10];
+
+ if (exponentnum - 2 < pnum
+ && RSA_get0_multi_prime_crt_params(r, exps, coeffs))
+ bn = exps[exponentnum - 2];
+ } break;
}
return get_payload_bn(state, translation, ctx, bn);
}
static int get_rsa_payload_coefficient(enum state state,
- const struct translation_st *translation,
- struct translation_ctx_st *ctx,
- size_t coefficientnum)
+ const struct translation_st *translation,
+ struct translation_ctx_st *ctx,
+ size_t coefficientnum)
{
const RSA *r = EVP_PKEY_get0_RSA(ctx->p2);
const BIGNUM *bn = NULL;
@@ -1958,57 +1943,55 @@ static int get_rsa_payload_coefficient(enum state state,
case 0:
bn = RSA_get0_iqmp(r);
break;
- default:
- {
- size_t pnum = RSA_get_multi_prime_extra_count(r);
- const BIGNUM *exps[10], *coeffs[10];
-
- if (coefficientnum - 1 < pnum
- && RSA_get0_multi_prime_crt_params(r, exps, coeffs))
- bn = coeffs[coefficientnum - 1];
- }
- break;
+ default: {
+ size_t pnum = RSA_get_multi_prime_extra_count(r);
+ const BIGNUM *exps[10], *coeffs[10];
+
+ if (coefficientnum - 1 < pnum
+ && RSA_get0_multi_prime_crt_params(r, exps, coeffs))
+ bn = coeffs[coefficientnum - 1];
+ } break;
}
return get_payload_bn(state, translation, ctx, bn);
}
-#define IMPL_GET_RSA_PAYLOAD_FACTOR(n) \
- static int \
- get_rsa_payload_f##n(enum state state, \
- const struct translation_st *translation, \
- struct translation_ctx_st *ctx) \
- { \
- if (EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA \
- && EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA_PSS) \
- return 0; \
- return get_rsa_payload_factor(state, translation, ctx, n - 1); \
+#define IMPL_GET_RSA_PAYLOAD_FACTOR(n) \
+ static int \
+ get_rsa_payload_f##n(enum state state, \
+ const struct translation_st *translation, \
+ struct translation_ctx_st *ctx) \
+ { \
+ if (EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA \
+ && EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA_PSS) \
+ return 0; \
+ return get_rsa_payload_factor(state, translation, ctx, n - 1); \
}
-#define IMPL_GET_RSA_PAYLOAD_EXPONENT(n) \
- static int \
- get_rsa_payload_e##n(enum state state, \
- const struct translation_st *translation, \
- struct translation_ctx_st *ctx) \
- { \
- if (EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA \
- && EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA_PSS) \
- return 0; \
- return get_rsa_payload_exponent(state, translation, ctx, \
- n - 1); \
+#define IMPL_GET_RSA_PAYLOAD_EXPONENT(n) \
+ static int \
+ get_rsa_payload_e##n(enum state state, \
+ const struct translation_st *translation, \
+ struct translation_ctx_st *ctx) \
+ { \
+ if (EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA \
+ && EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA_PSS) \
+ return 0; \
+ return get_rsa_payload_exponent(state, translation, ctx, \
+ n - 1); \
}
-#define IMPL_GET_RSA_PAYLOAD_COEFFICIENT(n) \
- static int \
- get_rsa_payload_c##n(enum state state, \
- const struct translation_st *translation, \
- struct translation_ctx_st *ctx) \
- { \
- if (EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA \
- && EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA_PSS) \
- return 0; \
- return get_rsa_payload_coefficient(state, translation, ctx, \
- n - 1); \
+#define IMPL_GET_RSA_PAYLOAD_COEFFICIENT(n) \
+ static int \
+ get_rsa_payload_c##n(enum state state, \
+ const struct translation_st *translation, \
+ struct translation_ctx_st *ctx) \
+ { \
+ if (EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA \
+ && EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA_PSS) \
+ return 0; \
+ return get_rsa_payload_coefficient(state, translation, ctx, \
+ n - 1); \
}
IMPL_GET_RSA_PAYLOAD_FACTOR(1)
@@ -2042,8 +2025,8 @@ IMPL_GET_RSA_PAYLOAD_COEFFICIENT(8)
IMPL_GET_RSA_PAYLOAD_COEFFICIENT(9)
static int fix_group_ecx(enum state state,
- const struct translation_st *translation,
- struct translation_ctx_st *ctx)
+ const struct translation_st *translation,
+ struct translation_ctx_st *ctx)
{
const char *value = NULL;
@@ -2054,8 +2037,7 @@ static int fix_group_ecx(enum state state,
ctx->action_type = OSSL_ACTION_NONE;
return 1;
case POST_PARAMS_TO_CTRL:
- if (OSSL_PARAM_get_utf8_string_ptr(ctx->params, &value) == 0 ||
- OPENSSL_strcasecmp(ctx->pctx->keytype, value) != 0) {
+ if (OSSL_PARAM_get_utf8_string_ptr(ctx->params, &value) == 0 || OPENSSL_strcasecmp(ctx->pctx->keytype, value) != 0) {
ERR_raise(ERR_LIB_EVP, ERR_R_PASSED_INVALID_ARGUMENT);
ctx->p1 = 0;
return 0;
@@ -2082,14 +2064,14 @@ static const struct translation_st evp_pkey_ctx_translations[] = {
* the length of the DistID automatically when getting the DistID itself.
*/
{ OSSL_ACTION_SET, -1, -1, EVP_PKEY_OP_TYPE_SIG,
- EVP_PKEY_CTRL_SET1_ID, "distid", "hexdistid",
- OSSL_PKEY_PARAM_DIST_ID, OSSL_PARAM_OCTET_STRING, NULL },
+ EVP_PKEY_CTRL_SET1_ID, "distid", "hexdistid",
+ OSSL_PKEY_PARAM_DIST_ID, OSSL_PARAM_OCTET_STRING, NULL },
{ OSSL_ACTION_GET, -1, -1, -1,
- EVP_PKEY_CTRL_GET1_ID, "distid", "hexdistid",
- OSSL_PKEY_PARAM_DIST_ID, OSSL_PARAM_OCTET_PTR, NULL },
+ EVP_PKEY_CTRL_GET1_ID, "distid", "hexdistid",
+ OSSL_PKEY_PARAM_DIST_ID, OSSL_PARAM_OCTET_PTR, NULL },
{ OSSL_ACTION_GET, -1, -1, -1,
- EVP_PKEY_CTRL_GET1_ID_LEN, NULL, NULL,
- OSSL_PKEY_PARAM_DIST_ID, OSSL_PARAM_OCTET_PTR, fix_distid_len },
+ EVP_PKEY_CTRL_GET1_ID_LEN, NULL, NULL,
+ OSSL_PKEY_PARAM_DIST_ID, OSSL_PARAM_OCTET_PTR, fix_distid_len },
/*-
* DH & DHX
@@ -2101,171 +2083,171 @@ static const struct translation_st evp_pkey_ctx_translations[] = {
* fixup function has to handle this...
*/
{ OSSL_ACTION_NONE, EVP_PKEY_DHX, 0, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_DH_KDF_TYPE, NULL, NULL,
- OSSL_EXCHANGE_PARAM_KDF_TYPE, OSSL_PARAM_UTF8_STRING,
- fix_dh_kdf_type },
+ EVP_PKEY_CTRL_DH_KDF_TYPE, NULL, NULL,
+ OSSL_EXCHANGE_PARAM_KDF_TYPE, OSSL_PARAM_UTF8_STRING,
+ fix_dh_kdf_type },
{ OSSL_ACTION_SET, EVP_PKEY_DHX, 0, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_DH_KDF_MD, NULL, NULL,
- OSSL_EXCHANGE_PARAM_KDF_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
+ EVP_PKEY_CTRL_DH_KDF_MD, NULL, NULL,
+ OSSL_EXCHANGE_PARAM_KDF_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
{ OSSL_ACTION_GET, EVP_PKEY_DHX, 0, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_GET_DH_KDF_MD, NULL, NULL,
- OSSL_EXCHANGE_PARAM_KDF_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
+ EVP_PKEY_CTRL_GET_DH_KDF_MD, NULL, NULL,
+ OSSL_EXCHANGE_PARAM_KDF_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
{ OSSL_ACTION_SET, EVP_PKEY_DHX, 0, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_DH_KDF_OUTLEN, NULL, NULL,
- OSSL_EXCHANGE_PARAM_KDF_OUTLEN, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
+ EVP_PKEY_CTRL_DH_KDF_OUTLEN, NULL, NULL,
+ OSSL_EXCHANGE_PARAM_KDF_OUTLEN, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
{ OSSL_ACTION_GET, EVP_PKEY_DHX, 0, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_GET_DH_KDF_OUTLEN, NULL, NULL,
- OSSL_EXCHANGE_PARAM_KDF_OUTLEN, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
+ EVP_PKEY_CTRL_GET_DH_KDF_OUTLEN, NULL, NULL,
+ OSSL_EXCHANGE_PARAM_KDF_OUTLEN, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
{ OSSL_ACTION_SET, EVP_PKEY_DHX, 0, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_DH_KDF_UKM, NULL, NULL,
- OSSL_EXCHANGE_PARAM_KDF_UKM, OSSL_PARAM_OCTET_STRING, NULL },
+ EVP_PKEY_CTRL_DH_KDF_UKM, NULL, NULL,
+ OSSL_EXCHANGE_PARAM_KDF_UKM, OSSL_PARAM_OCTET_STRING, NULL },
{ OSSL_ACTION_GET, EVP_PKEY_DHX, 0, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_GET_DH_KDF_UKM, NULL, NULL,
- OSSL_EXCHANGE_PARAM_KDF_UKM, OSSL_PARAM_OCTET_PTR, NULL },
+ EVP_PKEY_CTRL_GET_DH_KDF_UKM, NULL, NULL,
+ OSSL_EXCHANGE_PARAM_KDF_UKM, OSSL_PARAM_OCTET_PTR, NULL },
{ OSSL_ACTION_SET, EVP_PKEY_DHX, 0, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_DH_KDF_OID, NULL, NULL,
- OSSL_KDF_PARAM_CEK_ALG, OSSL_PARAM_UTF8_STRING, fix_oid },
+ EVP_PKEY_CTRL_DH_KDF_OID, NULL, NULL,
+ OSSL_KDF_PARAM_CEK_ALG, OSSL_PARAM_UTF8_STRING, fix_oid },
{ OSSL_ACTION_GET, EVP_PKEY_DHX, 0, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_GET_DH_KDF_OID, NULL, NULL,
- OSSL_KDF_PARAM_CEK_ALG, OSSL_PARAM_UTF8_STRING, fix_oid },
+ EVP_PKEY_CTRL_GET_DH_KDF_OID, NULL, NULL,
+ OSSL_KDF_PARAM_CEK_ALG, OSSL_PARAM_UTF8_STRING, fix_oid },
/* DHX Keygen Parameters that are shared with DH */
{ OSSL_ACTION_SET, EVP_PKEY_DHX, 0, EVP_PKEY_OP_PARAMGEN,
- EVP_PKEY_CTRL_DH_PARAMGEN_TYPE, "dh_paramgen_type", NULL,
- OSSL_PKEY_PARAM_FFC_TYPE, OSSL_PARAM_UTF8_STRING, fix_dh_paramgen_type },
+ EVP_PKEY_CTRL_DH_PARAMGEN_TYPE, "dh_paramgen_type", NULL,
+ OSSL_PKEY_PARAM_FFC_TYPE, OSSL_PARAM_UTF8_STRING, fix_dh_paramgen_type },
{ OSSL_ACTION_SET, EVP_PKEY_DHX, 0, EVP_PKEY_OP_PARAMGEN,
- EVP_PKEY_CTRL_DH_PARAMGEN_PRIME_LEN, "dh_paramgen_prime_len", NULL,
- OSSL_PKEY_PARAM_FFC_PBITS, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
+ EVP_PKEY_CTRL_DH_PARAMGEN_PRIME_LEN, "dh_paramgen_prime_len", NULL,
+ OSSL_PKEY_PARAM_FFC_PBITS, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
{ OSSL_ACTION_SET, EVP_PKEY_DHX, 0, EVP_PKEY_OP_PARAMGEN | EVP_PKEY_OP_KEYGEN,
- EVP_PKEY_CTRL_DH_NID, "dh_param", NULL,
- OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING, NULL },
+ EVP_PKEY_CTRL_DH_NID, "dh_param", NULL,
+ OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING, NULL },
{ OSSL_ACTION_SET, EVP_PKEY_DHX, 0, EVP_PKEY_OP_PARAMGEN | EVP_PKEY_OP_KEYGEN,
- EVP_PKEY_CTRL_DH_RFC5114, "dh_rfc5114", NULL,
- OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING, fix_dh_nid5114 },
+ EVP_PKEY_CTRL_DH_RFC5114, "dh_rfc5114", NULL,
+ OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING, fix_dh_nid5114 },
/* DH Keygen Parameters that are shared with DHX */
{ OSSL_ACTION_SET, EVP_PKEY_DH, 0, EVP_PKEY_OP_PARAMGEN,
- EVP_PKEY_CTRL_DH_PARAMGEN_TYPE, "dh_paramgen_type", NULL,
- OSSL_PKEY_PARAM_FFC_TYPE, OSSL_PARAM_UTF8_STRING, fix_dh_paramgen_type },
+ EVP_PKEY_CTRL_DH_PARAMGEN_TYPE, "dh_paramgen_type", NULL,
+ OSSL_PKEY_PARAM_FFC_TYPE, OSSL_PARAM_UTF8_STRING, fix_dh_paramgen_type },
{ OSSL_ACTION_SET, EVP_PKEY_DH, 0, EVP_PKEY_OP_PARAMGEN,
- EVP_PKEY_CTRL_DH_PARAMGEN_PRIME_LEN, "dh_paramgen_prime_len", NULL,
- OSSL_PKEY_PARAM_FFC_PBITS, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
+ EVP_PKEY_CTRL_DH_PARAMGEN_PRIME_LEN, "dh_paramgen_prime_len", NULL,
+ OSSL_PKEY_PARAM_FFC_PBITS, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
{ OSSL_ACTION_SET, EVP_PKEY_DH, 0, EVP_PKEY_OP_PARAMGEN | EVP_PKEY_OP_KEYGEN,
- EVP_PKEY_CTRL_DH_NID, "dh_param", NULL,
- OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING, fix_dh_nid },
+ EVP_PKEY_CTRL_DH_NID, "dh_param", NULL,
+ OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING, fix_dh_nid },
{ OSSL_ACTION_SET, EVP_PKEY_DH, 0, EVP_PKEY_OP_PARAMGEN | EVP_PKEY_OP_KEYGEN,
- EVP_PKEY_CTRL_DH_RFC5114, "dh_rfc5114", NULL,
- OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING, fix_dh_nid5114 },
+ EVP_PKEY_CTRL_DH_RFC5114, "dh_rfc5114", NULL,
+ OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING, fix_dh_nid5114 },
/* DH specific Keygen Parameters */
{ OSSL_ACTION_SET, EVP_PKEY_DH, 0, EVP_PKEY_OP_PARAMGEN,
- EVP_PKEY_CTRL_DH_PARAMGEN_GENERATOR, "dh_paramgen_generator", NULL,
- OSSL_PKEY_PARAM_DH_GENERATOR, OSSL_PARAM_INTEGER, NULL },
+ EVP_PKEY_CTRL_DH_PARAMGEN_GENERATOR, "dh_paramgen_generator", NULL,
+ OSSL_PKEY_PARAM_DH_GENERATOR, OSSL_PARAM_INTEGER, NULL },
/* DHX specific Keygen Parameters */
{ OSSL_ACTION_SET, EVP_PKEY_DHX, 0, EVP_PKEY_OP_PARAMGEN,
- EVP_PKEY_CTRL_DH_PARAMGEN_SUBPRIME_LEN, "dh_paramgen_subprime_len", NULL,
- OSSL_PKEY_PARAM_FFC_QBITS, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
+ EVP_PKEY_CTRL_DH_PARAMGEN_SUBPRIME_LEN, "dh_paramgen_subprime_len", NULL,
+ OSSL_PKEY_PARAM_FFC_QBITS, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
{ OSSL_ACTION_SET, EVP_PKEY_DH, 0, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_DH_PAD, "dh_pad", NULL,
- OSSL_EXCHANGE_PARAM_PAD, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
+ EVP_PKEY_CTRL_DH_PAD, "dh_pad", NULL,
+ OSSL_EXCHANGE_PARAM_PAD, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
/*-
* DSA
* ===
*/
{ OSSL_ACTION_SET, EVP_PKEY_DSA, 0, EVP_PKEY_OP_PARAMGEN,
- EVP_PKEY_CTRL_DSA_PARAMGEN_BITS, "dsa_paramgen_bits", NULL,
- OSSL_PKEY_PARAM_FFC_PBITS, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
+ EVP_PKEY_CTRL_DSA_PARAMGEN_BITS, "dsa_paramgen_bits", NULL,
+ OSSL_PKEY_PARAM_FFC_PBITS, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
{ OSSL_ACTION_SET, EVP_PKEY_DSA, 0, EVP_PKEY_OP_PARAMGEN,
- EVP_PKEY_CTRL_DSA_PARAMGEN_Q_BITS, "dsa_paramgen_q_bits", NULL,
- OSSL_PKEY_PARAM_FFC_QBITS, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
+ EVP_PKEY_CTRL_DSA_PARAMGEN_Q_BITS, "dsa_paramgen_q_bits", NULL,
+ OSSL_PKEY_PARAM_FFC_QBITS, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
{ OSSL_ACTION_SET, EVP_PKEY_DSA, 0, EVP_PKEY_OP_PARAMGEN,
- EVP_PKEY_CTRL_DSA_PARAMGEN_MD, "dsa_paramgen_md", NULL,
- OSSL_PKEY_PARAM_FFC_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
+ EVP_PKEY_CTRL_DSA_PARAMGEN_MD, "dsa_paramgen_md", NULL,
+ OSSL_PKEY_PARAM_FFC_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
/*-
* EC
* ==
*/
{ OSSL_ACTION_SET, EVP_PKEY_EC, 0, EVP_PKEY_OP_PARAMGEN | EVP_PKEY_OP_KEYGEN,
- EVP_PKEY_CTRL_EC_PARAM_ENC, "ec_param_enc", NULL,
- OSSL_PKEY_PARAM_EC_ENCODING, OSSL_PARAM_UTF8_STRING, fix_ec_param_enc },
+ EVP_PKEY_CTRL_EC_PARAM_ENC, "ec_param_enc", NULL,
+ OSSL_PKEY_PARAM_EC_ENCODING, OSSL_PARAM_UTF8_STRING, fix_ec_param_enc },
{ OSSL_ACTION_SET, EVP_PKEY_EC, 0, EVP_PKEY_OP_PARAMGEN | EVP_PKEY_OP_KEYGEN,
- EVP_PKEY_CTRL_EC_PARAMGEN_CURVE_NID, "ec_paramgen_curve", NULL,
- OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING,
- fix_ec_paramgen_curve_nid },
+ EVP_PKEY_CTRL_EC_PARAMGEN_CURVE_NID, "ec_paramgen_curve", NULL,
+ OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING,
+ fix_ec_paramgen_curve_nid },
/*
* EVP_PKEY_CTRL_EC_ECDH_COFACTOR and EVP_PKEY_CTRL_EC_KDF_TYPE are used
* both for setting and getting. The fixup function has to handle this...
*/
{ OSSL_ACTION_NONE, EVP_PKEY_EC, 0, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_EC_ECDH_COFACTOR, "ecdh_cofactor_mode", NULL,
- OSSL_EXCHANGE_PARAM_EC_ECDH_COFACTOR_MODE, OSSL_PARAM_INTEGER,
- fix_ecdh_cofactor },
+ EVP_PKEY_CTRL_EC_ECDH_COFACTOR, "ecdh_cofactor_mode", NULL,
+ OSSL_EXCHANGE_PARAM_EC_ECDH_COFACTOR_MODE, OSSL_PARAM_INTEGER,
+ fix_ecdh_cofactor },
{ OSSL_ACTION_NONE, EVP_PKEY_EC, 0, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_EC_KDF_TYPE, NULL, NULL,
- OSSL_EXCHANGE_PARAM_KDF_TYPE, OSSL_PARAM_UTF8_STRING, fix_ec_kdf_type },
+ EVP_PKEY_CTRL_EC_KDF_TYPE, NULL, NULL,
+ OSSL_EXCHANGE_PARAM_KDF_TYPE, OSSL_PARAM_UTF8_STRING, fix_ec_kdf_type },
{ OSSL_ACTION_SET, EVP_PKEY_EC, 0, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_EC_KDF_MD, "ecdh_kdf_md", NULL,
- OSSL_EXCHANGE_PARAM_KDF_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
+ EVP_PKEY_CTRL_EC_KDF_MD, "ecdh_kdf_md", NULL,
+ OSSL_EXCHANGE_PARAM_KDF_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
{ OSSL_ACTION_GET, EVP_PKEY_EC, 0, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_GET_EC_KDF_MD, NULL, NULL,
- OSSL_EXCHANGE_PARAM_KDF_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
+ EVP_PKEY_CTRL_GET_EC_KDF_MD, NULL, NULL,
+ OSSL_EXCHANGE_PARAM_KDF_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
{ OSSL_ACTION_SET, EVP_PKEY_EC, 0, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_EC_KDF_OUTLEN, NULL, NULL,
- OSSL_EXCHANGE_PARAM_KDF_OUTLEN, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
+ EVP_PKEY_CTRL_EC_KDF_OUTLEN, NULL, NULL,
+ OSSL_EXCHANGE_PARAM_KDF_OUTLEN, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
{ OSSL_ACTION_GET, EVP_PKEY_EC, 0, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_GET_EC_KDF_OUTLEN, NULL, NULL,
- OSSL_EXCHANGE_PARAM_KDF_OUTLEN, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
+ EVP_PKEY_CTRL_GET_EC_KDF_OUTLEN, NULL, NULL,
+ OSSL_EXCHANGE_PARAM_KDF_OUTLEN, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
{ OSSL_ACTION_SET, EVP_PKEY_EC, 0, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_EC_KDF_UKM, NULL, NULL,
- OSSL_EXCHANGE_PARAM_KDF_UKM, OSSL_PARAM_OCTET_STRING, NULL },
+ EVP_PKEY_CTRL_EC_KDF_UKM, NULL, NULL,
+ OSSL_EXCHANGE_PARAM_KDF_UKM, OSSL_PARAM_OCTET_STRING, NULL },
{ OSSL_ACTION_GET, EVP_PKEY_EC, 0, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_GET_EC_KDF_UKM, NULL, NULL,
- OSSL_EXCHANGE_PARAM_KDF_UKM, OSSL_PARAM_OCTET_PTR, NULL },
+ EVP_PKEY_CTRL_GET_EC_KDF_UKM, NULL, NULL,
+ OSSL_EXCHANGE_PARAM_KDF_UKM, OSSL_PARAM_OCTET_PTR, NULL },
/*-
* SM2
* ==
*/
{ OSSL_ACTION_SET, EVP_PKEY_SM2, 0, EVP_PKEY_OP_PARAMGEN | EVP_PKEY_OP_KEYGEN,
- EVP_PKEY_CTRL_EC_PARAM_ENC, "ec_param_enc", NULL,
- OSSL_PKEY_PARAM_EC_ENCODING, OSSL_PARAM_UTF8_STRING, fix_ec_param_enc },
+ EVP_PKEY_CTRL_EC_PARAM_ENC, "ec_param_enc", NULL,
+ OSSL_PKEY_PARAM_EC_ENCODING, OSSL_PARAM_UTF8_STRING, fix_ec_param_enc },
{ OSSL_ACTION_SET, EVP_PKEY_SM2, 0, EVP_PKEY_OP_PARAMGEN | EVP_PKEY_OP_KEYGEN,
- EVP_PKEY_CTRL_EC_PARAMGEN_CURVE_NID, "ec_paramgen_curve", NULL,
- OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING,
- fix_ec_paramgen_curve_nid },
+ EVP_PKEY_CTRL_EC_PARAMGEN_CURVE_NID, "ec_paramgen_curve", NULL,
+ OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING,
+ fix_ec_paramgen_curve_nid },
/*
* EVP_PKEY_CTRL_EC_ECDH_COFACTOR and EVP_PKEY_CTRL_EC_KDF_TYPE are used
* both for setting and getting. The fixup function has to handle this...
*/
{ OSSL_ACTION_NONE, EVP_PKEY_SM2, 0, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_EC_ECDH_COFACTOR, "ecdh_cofactor_mode", NULL,
- OSSL_EXCHANGE_PARAM_EC_ECDH_COFACTOR_MODE, OSSL_PARAM_INTEGER,
- fix_ecdh_cofactor },
+ EVP_PKEY_CTRL_EC_ECDH_COFACTOR, "ecdh_cofactor_mode", NULL,
+ OSSL_EXCHANGE_PARAM_EC_ECDH_COFACTOR_MODE, OSSL_PARAM_INTEGER,
+ fix_ecdh_cofactor },
{ OSSL_ACTION_NONE, EVP_PKEY_SM2, 0, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_EC_KDF_TYPE, NULL, NULL,
- OSSL_EXCHANGE_PARAM_KDF_TYPE, OSSL_PARAM_UTF8_STRING, fix_ec_kdf_type },
+ EVP_PKEY_CTRL_EC_KDF_TYPE, NULL, NULL,
+ OSSL_EXCHANGE_PARAM_KDF_TYPE, OSSL_PARAM_UTF8_STRING, fix_ec_kdf_type },
{ OSSL_ACTION_SET, EVP_PKEY_SM2, 0, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_EC_KDF_MD, "ecdh_kdf_md", NULL,
- OSSL_EXCHANGE_PARAM_KDF_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
+ EVP_PKEY_CTRL_EC_KDF_MD, "ecdh_kdf_md", NULL,
+ OSSL_EXCHANGE_PARAM_KDF_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
{ OSSL_ACTION_GET, EVP_PKEY_SM2, 0, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_GET_EC_KDF_MD, NULL, NULL,
- OSSL_EXCHANGE_PARAM_KDF_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
+ EVP_PKEY_CTRL_GET_EC_KDF_MD, NULL, NULL,
+ OSSL_EXCHANGE_PARAM_KDF_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
{ OSSL_ACTION_SET, EVP_PKEY_SM2, 0, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_EC_KDF_OUTLEN, NULL, NULL,
- OSSL_EXCHANGE_PARAM_KDF_OUTLEN, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
+ EVP_PKEY_CTRL_EC_KDF_OUTLEN, NULL, NULL,
+ OSSL_EXCHANGE_PARAM_KDF_OUTLEN, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
{ OSSL_ACTION_GET, EVP_PKEY_SM2, 0, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_GET_EC_KDF_OUTLEN, NULL, NULL,
- OSSL_EXCHANGE_PARAM_KDF_OUTLEN, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
+ EVP_PKEY_CTRL_GET_EC_KDF_OUTLEN, NULL, NULL,
+ OSSL_EXCHANGE_PARAM_KDF_OUTLEN, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
{ OSSL_ACTION_SET, EVP_PKEY_SM2, 0, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_EC_KDF_UKM, NULL, NULL,
- OSSL_EXCHANGE_PARAM_KDF_UKM, OSSL_PARAM_OCTET_STRING, NULL },
+ EVP_PKEY_CTRL_EC_KDF_UKM, NULL, NULL,
+ OSSL_EXCHANGE_PARAM_KDF_UKM, OSSL_PARAM_OCTET_STRING, NULL },
{ OSSL_ACTION_GET, EVP_PKEY_SM2, 0, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_GET_EC_KDF_UKM, NULL, NULL,
- OSSL_EXCHANGE_PARAM_KDF_UKM, OSSL_PARAM_OCTET_PTR, NULL },
+ EVP_PKEY_CTRL_GET_EC_KDF_UKM, NULL, NULL,
+ OSSL_EXCHANGE_PARAM_KDF_UKM, OSSL_PARAM_OCTET_PTR, NULL },
/*-
* RSA
* ===
@@ -2278,22 +2260,22 @@ static const struct translation_st evp_pkey_ctx_translations[] = {
* idea.
*/
{ OSSL_ACTION_SET, EVP_PKEY_RSA, EVP_PKEY_RSA_PSS,
- EVP_PKEY_OP_TYPE_CRYPT | EVP_PKEY_OP_TYPE_SIG,
- EVP_PKEY_CTRL_RSA_PADDING, "rsa_padding_mode", NULL,
- OSSL_PKEY_PARAM_PAD_MODE, OSSL_PARAM_UTF8_STRING, fix_rsa_padding_mode },
+ EVP_PKEY_OP_TYPE_CRYPT | EVP_PKEY_OP_TYPE_SIG,
+ EVP_PKEY_CTRL_RSA_PADDING, "rsa_padding_mode", NULL,
+ OSSL_PKEY_PARAM_PAD_MODE, OSSL_PARAM_UTF8_STRING, fix_rsa_padding_mode },
{ OSSL_ACTION_GET, EVP_PKEY_RSA, EVP_PKEY_RSA_PSS,
- EVP_PKEY_OP_TYPE_CRYPT | EVP_PKEY_OP_TYPE_SIG,
- EVP_PKEY_CTRL_GET_RSA_PADDING, NULL, NULL,
- OSSL_PKEY_PARAM_PAD_MODE, OSSL_PARAM_UTF8_STRING, fix_rsa_padding_mode },
+ EVP_PKEY_OP_TYPE_CRYPT | EVP_PKEY_OP_TYPE_SIG,
+ EVP_PKEY_CTRL_GET_RSA_PADDING, NULL, NULL,
+ OSSL_PKEY_PARAM_PAD_MODE, OSSL_PARAM_UTF8_STRING, fix_rsa_padding_mode },
{ OSSL_ACTION_SET, EVP_PKEY_RSA, EVP_PKEY_RSA_PSS,
- EVP_PKEY_OP_TYPE_CRYPT | EVP_PKEY_OP_TYPE_SIG,
- EVP_PKEY_CTRL_RSA_MGF1_MD, "rsa_mgf1_md", NULL,
- OSSL_PKEY_PARAM_MGF1_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
+ EVP_PKEY_OP_TYPE_CRYPT | EVP_PKEY_OP_TYPE_SIG,
+ EVP_PKEY_CTRL_RSA_MGF1_MD, "rsa_mgf1_md", NULL,
+ OSSL_PKEY_PARAM_MGF1_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
{ OSSL_ACTION_GET, EVP_PKEY_RSA, EVP_PKEY_RSA_PSS,
- EVP_PKEY_OP_TYPE_CRYPT | EVP_PKEY_OP_TYPE_SIG,
- EVP_PKEY_CTRL_GET_RSA_MGF1_MD, NULL, NULL,
- OSSL_PKEY_PARAM_MGF1_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
+ EVP_PKEY_OP_TYPE_CRYPT | EVP_PKEY_OP_TYPE_SIG,
+ EVP_PKEY_CTRL_GET_RSA_MGF1_MD, NULL, NULL,
+ OSSL_PKEY_PARAM_MGF1_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
/*
* RSA-PSS saltlen is essentially numeric, but certain values can be
@@ -2302,20 +2284,20 @@ static const struct translation_st evp_pkey_ctx_translations[] = {
* fix_rsa_pss_saltlen() takes care of the distinction.
*/
{ OSSL_ACTION_SET, EVP_PKEY_RSA, EVP_PKEY_RSA_PSS, EVP_PKEY_OP_TYPE_SIG,
- EVP_PKEY_CTRL_RSA_PSS_SALTLEN, "rsa_pss_saltlen", NULL,
- OSSL_PKEY_PARAM_RSA_PSS_SALTLEN, OSSL_PARAM_UTF8_STRING,
- fix_rsa_pss_saltlen },
+ EVP_PKEY_CTRL_RSA_PSS_SALTLEN, "rsa_pss_saltlen", NULL,
+ OSSL_PKEY_PARAM_RSA_PSS_SALTLEN, OSSL_PARAM_UTF8_STRING,
+ fix_rsa_pss_saltlen },
{ OSSL_ACTION_GET, EVP_PKEY_RSA, EVP_PKEY_RSA_PSS, EVP_PKEY_OP_TYPE_SIG,
- EVP_PKEY_CTRL_GET_RSA_PSS_SALTLEN, NULL, NULL,
- OSSL_PKEY_PARAM_RSA_PSS_SALTLEN, OSSL_PARAM_UTF8_STRING,
- fix_rsa_pss_saltlen },
+ EVP_PKEY_CTRL_GET_RSA_PSS_SALTLEN, NULL, NULL,
+ OSSL_PKEY_PARAM_RSA_PSS_SALTLEN, OSSL_PARAM_UTF8_STRING,
+ fix_rsa_pss_saltlen },
{ OSSL_ACTION_SET, EVP_PKEY_RSA, 0, EVP_PKEY_OP_TYPE_CRYPT,
- EVP_PKEY_CTRL_RSA_OAEP_MD, "rsa_oaep_md", NULL,
- OSSL_ASYM_CIPHER_PARAM_OAEP_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
+ EVP_PKEY_CTRL_RSA_OAEP_MD, "rsa_oaep_md", NULL,
+ OSSL_ASYM_CIPHER_PARAM_OAEP_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
{ OSSL_ACTION_GET, EVP_PKEY_RSA, 0, EVP_PKEY_OP_TYPE_CRYPT,
- EVP_PKEY_CTRL_GET_RSA_OAEP_MD, NULL, NULL,
- OSSL_ASYM_CIPHER_PARAM_OAEP_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
+ EVP_PKEY_CTRL_GET_RSA_OAEP_MD, NULL, NULL,
+ OSSL_ASYM_CIPHER_PARAM_OAEP_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
/*
* The "rsa_oaep_label" ctrl_str expects the value to always be hex.
* This is accommodated by default_fixup_args() above, which mimics that
@@ -2323,128 +2305,128 @@ static const struct translation_st evp_pkey_ctx_translations[] = {
* |ctrl_hexstr| is non-NULL.
*/
{ OSSL_ACTION_SET, EVP_PKEY_RSA, 0, EVP_PKEY_OP_TYPE_CRYPT,
- EVP_PKEY_CTRL_RSA_OAEP_LABEL, NULL, "rsa_oaep_label",
- OSSL_ASYM_CIPHER_PARAM_OAEP_LABEL, OSSL_PARAM_OCTET_STRING, NULL },
+ EVP_PKEY_CTRL_RSA_OAEP_LABEL, NULL, "rsa_oaep_label",
+ OSSL_ASYM_CIPHER_PARAM_OAEP_LABEL, OSSL_PARAM_OCTET_STRING, NULL },
{ OSSL_ACTION_GET, EVP_PKEY_RSA, 0, EVP_PKEY_OP_TYPE_CRYPT,
- EVP_PKEY_CTRL_GET_RSA_OAEP_LABEL, NULL, NULL,
- OSSL_ASYM_CIPHER_PARAM_OAEP_LABEL, OSSL_PARAM_OCTET_PTR, NULL },
+ EVP_PKEY_CTRL_GET_RSA_OAEP_LABEL, NULL, NULL,
+ OSSL_ASYM_CIPHER_PARAM_OAEP_LABEL, OSSL_PARAM_OCTET_PTR, NULL },
{ OSSL_ACTION_SET, EVP_PKEY_RSA, 0, EVP_PKEY_OP_TYPE_CRYPT,
- EVP_PKEY_CTRL_RSA_IMPLICIT_REJECTION, NULL,
- "rsa_pkcs1_implicit_rejection",
- OSSL_ASYM_CIPHER_PARAM_IMPLICIT_REJECTION, OSSL_PARAM_UNSIGNED_INTEGER,
- NULL },
+ EVP_PKEY_CTRL_RSA_IMPLICIT_REJECTION, NULL,
+ "rsa_pkcs1_implicit_rejection",
+ OSSL_ASYM_CIPHER_PARAM_IMPLICIT_REJECTION, OSSL_PARAM_UNSIGNED_INTEGER,
+ NULL },
{ OSSL_ACTION_SET, EVP_PKEY_RSA_PSS, 0, EVP_PKEY_OP_TYPE_GEN,
- EVP_PKEY_CTRL_MD, "rsa_pss_keygen_md", NULL,
- OSSL_ALG_PARAM_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
+ EVP_PKEY_CTRL_MD, "rsa_pss_keygen_md", NULL,
+ OSSL_ALG_PARAM_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
{ OSSL_ACTION_SET, EVP_PKEY_RSA_PSS, 0, EVP_PKEY_OP_TYPE_GEN,
- EVP_PKEY_CTRL_RSA_MGF1_MD, "rsa_pss_keygen_mgf1_md", NULL,
- OSSL_PKEY_PARAM_MGF1_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
+ EVP_PKEY_CTRL_RSA_MGF1_MD, "rsa_pss_keygen_mgf1_md", NULL,
+ OSSL_PKEY_PARAM_MGF1_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
{ OSSL_ACTION_SET, EVP_PKEY_RSA_PSS, 0, EVP_PKEY_OP_TYPE_GEN,
- EVP_PKEY_CTRL_RSA_PSS_SALTLEN, "rsa_pss_keygen_saltlen", NULL,
- OSSL_SIGNATURE_PARAM_PSS_SALTLEN, OSSL_PARAM_INTEGER, NULL },
+ EVP_PKEY_CTRL_RSA_PSS_SALTLEN, "rsa_pss_keygen_saltlen", NULL,
+ OSSL_SIGNATURE_PARAM_PSS_SALTLEN, OSSL_PARAM_INTEGER, NULL },
{ OSSL_ACTION_SET, EVP_PKEY_RSA, EVP_PKEY_RSA_PSS, EVP_PKEY_OP_KEYGEN,
- EVP_PKEY_CTRL_RSA_KEYGEN_BITS, "rsa_keygen_bits", NULL,
- OSSL_PKEY_PARAM_RSA_BITS, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
+ EVP_PKEY_CTRL_RSA_KEYGEN_BITS, "rsa_keygen_bits", NULL,
+ OSSL_PKEY_PARAM_RSA_BITS, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
{ OSSL_ACTION_SET, EVP_PKEY_RSA, EVP_PKEY_RSA_PSS, EVP_PKEY_OP_KEYGEN,
- EVP_PKEY_CTRL_RSA_KEYGEN_PUBEXP, "rsa_keygen_pubexp", NULL,
- OSSL_PKEY_PARAM_RSA_E, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
+ EVP_PKEY_CTRL_RSA_KEYGEN_PUBEXP, "rsa_keygen_pubexp", NULL,
+ OSSL_PKEY_PARAM_RSA_E, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
{ OSSL_ACTION_SET, EVP_PKEY_RSA, EVP_PKEY_RSA_PSS, EVP_PKEY_OP_KEYGEN,
- EVP_PKEY_CTRL_RSA_KEYGEN_PRIMES, "rsa_keygen_primes", NULL,
- OSSL_PKEY_PARAM_RSA_PRIMES, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
+ EVP_PKEY_CTRL_RSA_KEYGEN_PRIMES, "rsa_keygen_primes", NULL,
+ OSSL_PKEY_PARAM_RSA_PRIMES, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
/*-
* SipHash
* ======
*/
{ OSSL_ACTION_SET, -1, -1, EVP_PKEY_OP_TYPE_SIG,
- EVP_PKEY_CTRL_SET_DIGEST_SIZE, "digestsize", NULL,
- OSSL_MAC_PARAM_SIZE, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
+ EVP_PKEY_CTRL_SET_DIGEST_SIZE, "digestsize", NULL,
+ OSSL_MAC_PARAM_SIZE, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
/*-
* TLS1-PRF
* ========
*/
{ OSSL_ACTION_SET, -1, -1, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_TLS_MD, "md", NULL,
- OSSL_KDF_PARAM_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
+ EVP_PKEY_CTRL_TLS_MD, "md", NULL,
+ OSSL_KDF_PARAM_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
{ OSSL_ACTION_SET, -1, -1, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_TLS_SECRET, "secret", "hexsecret",
- OSSL_KDF_PARAM_SECRET, OSSL_PARAM_OCTET_STRING, NULL },
+ EVP_PKEY_CTRL_TLS_SECRET, "secret", "hexsecret",
+ OSSL_KDF_PARAM_SECRET, OSSL_PARAM_OCTET_STRING, NULL },
{ OSSL_ACTION_SET, -1, -1, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_TLS_SEED, "seed", "hexseed",
- OSSL_KDF_PARAM_SEED, OSSL_PARAM_OCTET_STRING, NULL },
+ EVP_PKEY_CTRL_TLS_SEED, "seed", "hexseed",
+ OSSL_KDF_PARAM_SEED, OSSL_PARAM_OCTET_STRING, NULL },
/*-
* HKDF
* ====
*/
{ OSSL_ACTION_SET, -1, -1, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_HKDF_MD, "md", NULL,
- OSSL_KDF_PARAM_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
+ EVP_PKEY_CTRL_HKDF_MD, "md", NULL,
+ OSSL_KDF_PARAM_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
{ OSSL_ACTION_SET, -1, -1, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_HKDF_SALT, "salt", "hexsalt",
- OSSL_KDF_PARAM_SALT, OSSL_PARAM_OCTET_STRING, NULL },
+ EVP_PKEY_CTRL_HKDF_SALT, "salt", "hexsalt",
+ OSSL_KDF_PARAM_SALT, OSSL_PARAM_OCTET_STRING, NULL },
{ OSSL_ACTION_SET, -1, -1, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_HKDF_KEY, "key", "hexkey",
- OSSL_KDF_PARAM_KEY, OSSL_PARAM_OCTET_STRING, NULL },
+ EVP_PKEY_CTRL_HKDF_KEY, "key", "hexkey",
+ OSSL_KDF_PARAM_KEY, OSSL_PARAM_OCTET_STRING, NULL },
{ OSSL_ACTION_SET, -1, -1, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_HKDF_INFO, "info", "hexinfo",
- OSSL_KDF_PARAM_INFO, OSSL_PARAM_OCTET_STRING, NULL },
+ EVP_PKEY_CTRL_HKDF_INFO, "info", "hexinfo",
+ OSSL_KDF_PARAM_INFO, OSSL_PARAM_OCTET_STRING, NULL },
{ OSSL_ACTION_SET, -1, -1, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_HKDF_MODE, "mode", NULL,
- OSSL_KDF_PARAM_MODE, OSSL_PARAM_INTEGER, fix_hkdf_mode },
+ EVP_PKEY_CTRL_HKDF_MODE, "mode", NULL,
+ OSSL_KDF_PARAM_MODE, OSSL_PARAM_INTEGER, fix_hkdf_mode },
/*-
* Scrypt
* ======
*/
{ OSSL_ACTION_SET, -1, -1, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_PASS, "pass", "hexpass",
- OSSL_KDF_PARAM_PASSWORD, OSSL_PARAM_OCTET_STRING, NULL },
+ EVP_PKEY_CTRL_PASS, "pass", "hexpass",
+ OSSL_KDF_PARAM_PASSWORD, OSSL_PARAM_OCTET_STRING, NULL },
{ OSSL_ACTION_SET, -1, -1, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_SCRYPT_SALT, "salt", "hexsalt",
- OSSL_KDF_PARAM_SALT, OSSL_PARAM_OCTET_STRING, NULL },
+ EVP_PKEY_CTRL_SCRYPT_SALT, "salt", "hexsalt",
+ OSSL_KDF_PARAM_SALT, OSSL_PARAM_OCTET_STRING, NULL },
{ OSSL_ACTION_SET, -1, -1, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_SCRYPT_N, "N", NULL,
- OSSL_KDF_PARAM_SCRYPT_N, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
+ EVP_PKEY_CTRL_SCRYPT_N, "N", NULL,
+ OSSL_KDF_PARAM_SCRYPT_N, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
{ OSSL_ACTION_SET, -1, -1, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_SCRYPT_R, "r", NULL,
- OSSL_KDF_PARAM_SCRYPT_R, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
+ EVP_PKEY_CTRL_SCRYPT_R, "r", NULL,
+ OSSL_KDF_PARAM_SCRYPT_R, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
{ OSSL_ACTION_SET, -1, -1, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_SCRYPT_P, "p", NULL,
- OSSL_KDF_PARAM_SCRYPT_P, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
+ EVP_PKEY_CTRL_SCRYPT_P, "p", NULL,
+ OSSL_KDF_PARAM_SCRYPT_P, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
{ OSSL_ACTION_SET, -1, -1, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_SCRYPT_MAXMEM_BYTES, "maxmem_bytes", NULL,
- OSSL_KDF_PARAM_SCRYPT_MAXMEM, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
+ EVP_PKEY_CTRL_SCRYPT_MAXMEM_BYTES, "maxmem_bytes", NULL,
+ OSSL_KDF_PARAM_SCRYPT_MAXMEM, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
{ OSSL_ACTION_SET, -1, -1, EVP_PKEY_OP_KEYGEN | EVP_PKEY_OP_TYPE_CRYPT,
- EVP_PKEY_CTRL_CIPHER, NULL, NULL,
- OSSL_PKEY_PARAM_CIPHER, OSSL_PARAM_UTF8_STRING, fix_cipher },
+ EVP_PKEY_CTRL_CIPHER, NULL, NULL,
+ OSSL_PKEY_PARAM_CIPHER, OSSL_PARAM_UTF8_STRING, fix_cipher },
{ OSSL_ACTION_SET, -1, -1, EVP_PKEY_OP_KEYGEN,
- EVP_PKEY_CTRL_SET_MAC_KEY, "key", "hexkey",
- OSSL_PKEY_PARAM_PRIV_KEY, OSSL_PARAM_OCTET_STRING, NULL },
+ EVP_PKEY_CTRL_SET_MAC_KEY, "key", "hexkey",
+ OSSL_PKEY_PARAM_PRIV_KEY, OSSL_PARAM_OCTET_STRING, NULL },
{ OSSL_ACTION_SET, -1, -1, EVP_PKEY_OP_TYPE_SIG,
- EVP_PKEY_CTRL_MD, NULL, NULL,
- OSSL_SIGNATURE_PARAM_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
+ EVP_PKEY_CTRL_MD, NULL, NULL,
+ OSSL_SIGNATURE_PARAM_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
{ OSSL_ACTION_GET, -1, -1, EVP_PKEY_OP_TYPE_SIG,
- EVP_PKEY_CTRL_GET_MD, NULL, NULL,
- OSSL_SIGNATURE_PARAM_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
+ EVP_PKEY_CTRL_GET_MD, NULL, NULL,
+ OSSL_SIGNATURE_PARAM_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
/*-
* ECX
* ===
*/
{ OSSL_ACTION_SET, EVP_PKEY_X25519, EVP_PKEY_X25519, EVP_PKEY_OP_KEYGEN, -1, NULL, NULL,
- OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING, fix_group_ecx },
+ OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING, fix_group_ecx },
{ OSSL_ACTION_SET, EVP_PKEY_X25519, EVP_PKEY_X25519, EVP_PKEY_OP_PARAMGEN, -1, NULL, NULL,
- OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING, fix_group_ecx },
+ OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING, fix_group_ecx },
{ OSSL_ACTION_SET, EVP_PKEY_X448, EVP_PKEY_X448, EVP_PKEY_OP_KEYGEN, -1, NULL, NULL,
- OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING, fix_group_ecx },
+ OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING, fix_group_ecx },
{ OSSL_ACTION_SET, EVP_PKEY_X448, EVP_PKEY_X448, EVP_PKEY_OP_PARAMGEN, -1, NULL, NULL,
- OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING, fix_group_ecx },
+ OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING, fix_group_ecx },
};
static const struct translation_st evp_pkey_translations[] = {
@@ -2457,141 +2439,141 @@ static const struct translation_st evp_pkey_translations[] = {
/* DH, DSA & EC */
{ OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
- OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING,
- get_payload_group_name },
+ OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING,
+ get_payload_group_name },
{ OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
- OSSL_PKEY_PARAM_PRIV_KEY, OSSL_PARAM_UNSIGNED_INTEGER,
- get_payload_private_key },
+ OSSL_PKEY_PARAM_PRIV_KEY, OSSL_PARAM_UNSIGNED_INTEGER,
+ get_payload_private_key },
{ OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
- OSSL_PKEY_PARAM_PUB_KEY,
- 0 /* no data type, let get_payload_public_key() handle that */,
- get_payload_public_key },
+ OSSL_PKEY_PARAM_PUB_KEY,
+ 0 /* no data type, let get_payload_public_key() handle that */,
+ get_payload_public_key },
{ OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
- OSSL_PKEY_PARAM_EC_PUB_X, OSSL_PARAM_UNSIGNED_INTEGER,
- get_payload_public_key_ec },
+ OSSL_PKEY_PARAM_EC_PUB_X, OSSL_PARAM_UNSIGNED_INTEGER,
+ get_payload_public_key_ec },
{ OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
- OSSL_PKEY_PARAM_EC_PUB_Y, OSSL_PARAM_UNSIGNED_INTEGER,
- get_payload_public_key_ec },
+ OSSL_PKEY_PARAM_EC_PUB_Y, OSSL_PARAM_UNSIGNED_INTEGER,
+ get_payload_public_key_ec },
/* DH and DSA */
{ OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
- OSSL_PKEY_PARAM_FFC_P, OSSL_PARAM_UNSIGNED_INTEGER,
- get_dh_dsa_payload_p },
+ OSSL_PKEY_PARAM_FFC_P, OSSL_PARAM_UNSIGNED_INTEGER,
+ get_dh_dsa_payload_p },
{ OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
- OSSL_PKEY_PARAM_FFC_G, OSSL_PARAM_UNSIGNED_INTEGER,
- get_dh_dsa_payload_g },
+ OSSL_PKEY_PARAM_FFC_G, OSSL_PARAM_UNSIGNED_INTEGER,
+ get_dh_dsa_payload_g },
{ OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
- OSSL_PKEY_PARAM_FFC_Q, OSSL_PARAM_UNSIGNED_INTEGER,
- get_dh_dsa_payload_q },
+ OSSL_PKEY_PARAM_FFC_Q, OSSL_PARAM_UNSIGNED_INTEGER,
+ get_dh_dsa_payload_q },
/* RSA */
{ OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
- OSSL_PKEY_PARAM_RSA_N, OSSL_PARAM_UNSIGNED_INTEGER,
- get_rsa_payload_n },
+ OSSL_PKEY_PARAM_RSA_N, OSSL_PARAM_UNSIGNED_INTEGER,
+ get_rsa_payload_n },
{ OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
- OSSL_PKEY_PARAM_RSA_E, OSSL_PARAM_UNSIGNED_INTEGER,
- get_rsa_payload_e },
+ OSSL_PKEY_PARAM_RSA_E, OSSL_PARAM_UNSIGNED_INTEGER,
+ get_rsa_payload_e },
{ OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
- OSSL_PKEY_PARAM_RSA_D, OSSL_PARAM_UNSIGNED_INTEGER,
- get_rsa_payload_d },
+ OSSL_PKEY_PARAM_RSA_D, OSSL_PARAM_UNSIGNED_INTEGER,
+ get_rsa_payload_d },
{ OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
- OSSL_PKEY_PARAM_RSA_FACTOR1, OSSL_PARAM_UNSIGNED_INTEGER,
- get_rsa_payload_f1 },
+ OSSL_PKEY_PARAM_RSA_FACTOR1, OSSL_PARAM_UNSIGNED_INTEGER,
+ get_rsa_payload_f1 },
{ OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
- OSSL_PKEY_PARAM_RSA_FACTOR2, OSSL_PARAM_UNSIGNED_INTEGER,
- get_rsa_payload_f2 },
+ OSSL_PKEY_PARAM_RSA_FACTOR2, OSSL_PARAM_UNSIGNED_INTEGER,
+ get_rsa_payload_f2 },
{ OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
- OSSL_PKEY_PARAM_RSA_FACTOR3, OSSL_PARAM_UNSIGNED_INTEGER,
- get_rsa_payload_f3 },
+ OSSL_PKEY_PARAM_RSA_FACTOR3, OSSL_PARAM_UNSIGNED_INTEGER,
+ get_rsa_payload_f3 },
{ OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
- OSSL_PKEY_PARAM_RSA_FACTOR4, OSSL_PARAM_UNSIGNED_INTEGER,
- get_rsa_payload_f4 },
+ OSSL_PKEY_PARAM_RSA_FACTOR4, OSSL_PARAM_UNSIGNED_INTEGER,
+ get_rsa_payload_f4 },
{ OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
- OSSL_PKEY_PARAM_RSA_FACTOR5, OSSL_PARAM_UNSIGNED_INTEGER,
- get_rsa_payload_f5 },
+ OSSL_PKEY_PARAM_RSA_FACTOR5, OSSL_PARAM_UNSIGNED_INTEGER,
+ get_rsa_payload_f5 },
{ OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
- OSSL_PKEY_PARAM_RSA_FACTOR6, OSSL_PARAM_UNSIGNED_INTEGER,
- get_rsa_payload_f6 },
+ OSSL_PKEY_PARAM_RSA_FACTOR6, OSSL_PARAM_UNSIGNED_INTEGER,
+ get_rsa_payload_f6 },
{ OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
- OSSL_PKEY_PARAM_RSA_FACTOR7, OSSL_PARAM_UNSIGNED_INTEGER,
- get_rsa_payload_f7 },
+ OSSL_PKEY_PARAM_RSA_FACTOR7, OSSL_PARAM_UNSIGNED_INTEGER,
+ get_rsa_payload_f7 },
{ OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
- OSSL_PKEY_PARAM_RSA_FACTOR8, OSSL_PARAM_UNSIGNED_INTEGER,
- get_rsa_payload_f8 },
+ OSSL_PKEY_PARAM_RSA_FACTOR8, OSSL_PARAM_UNSIGNED_INTEGER,
+ get_rsa_payload_f8 },
{ OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
- OSSL_PKEY_PARAM_RSA_FACTOR9, OSSL_PARAM_UNSIGNED_INTEGER,
- get_rsa_payload_f9 },
+ OSSL_PKEY_PARAM_RSA_FACTOR9, OSSL_PARAM_UNSIGNED_INTEGER,
+ get_rsa_payload_f9 },
{ OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
- OSSL_PKEY_PARAM_RSA_FACTOR10, OSSL_PARAM_UNSIGNED_INTEGER,
- get_rsa_payload_f10 },
+ OSSL_PKEY_PARAM_RSA_FACTOR10, OSSL_PARAM_UNSIGNED_INTEGER,
+ get_rsa_payload_f10 },
{ OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
- OSSL_PKEY_PARAM_RSA_EXPONENT1, OSSL_PARAM_UNSIGNED_INTEGER,
- get_rsa_payload_e1 },
+ OSSL_PKEY_PARAM_RSA_EXPONENT1, OSSL_PARAM_UNSIGNED_INTEGER,
+ get_rsa_payload_e1 },
{ OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
- OSSL_PKEY_PARAM_RSA_EXPONENT2, OSSL_PARAM_UNSIGNED_INTEGER,
- get_rsa_payload_e2 },
+ OSSL_PKEY_PARAM_RSA_EXPONENT2, OSSL_PARAM_UNSIGNED_INTEGER,
+ get_rsa_payload_e2 },
{ OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
- OSSL_PKEY_PARAM_RSA_EXPONENT3, OSSL_PARAM_UNSIGNED_INTEGER,
- get_rsa_payload_e3 },
+ OSSL_PKEY_PARAM_RSA_EXPONENT3, OSSL_PARAM_UNSIGNED_INTEGER,
+ get_rsa_payload_e3 },
{ OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
- OSSL_PKEY_PARAM_RSA_EXPONENT4, OSSL_PARAM_UNSIGNED_INTEGER,
- get_rsa_payload_e4 },
+ OSSL_PKEY_PARAM_RSA_EXPONENT4, OSSL_PARAM_UNSIGNED_INTEGER,
+ get_rsa_payload_e4 },
{ OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
- OSSL_PKEY_PARAM_RSA_EXPONENT5, OSSL_PARAM_UNSIGNED_INTEGER,
- get_rsa_payload_e5 },
+ OSSL_PKEY_PARAM_RSA_EXPONENT5, OSSL_PARAM_UNSIGNED_INTEGER,
+ get_rsa_payload_e5 },
{ OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
- OSSL_PKEY_PARAM_RSA_EXPONENT6, OSSL_PARAM_UNSIGNED_INTEGER,
- get_rsa_payload_e6 },
+ OSSL_PKEY_PARAM_RSA_EXPONENT6, OSSL_PARAM_UNSIGNED_INTEGER,
+ get_rsa_payload_e6 },
{ OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
- OSSL_PKEY_PARAM_RSA_EXPONENT7, OSSL_PARAM_UNSIGNED_INTEGER,
- get_rsa_payload_e7 },
+ OSSL_PKEY_PARAM_RSA_EXPONENT7, OSSL_PARAM_UNSIGNED_INTEGER,
+ get_rsa_payload_e7 },
{ OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
- OSSL_PKEY_PARAM_RSA_EXPONENT8, OSSL_PARAM_UNSIGNED_INTEGER,
- get_rsa_payload_e8 },
+ OSSL_PKEY_PARAM_RSA_EXPONENT8, OSSL_PARAM_UNSIGNED_INTEGER,
+ get_rsa_payload_e8 },
{ OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
- OSSL_PKEY_PARAM_RSA_EXPONENT9, OSSL_PARAM_UNSIGNED_INTEGER,
- get_rsa_payload_e9 },
+ OSSL_PKEY_PARAM_RSA_EXPONENT9, OSSL_PARAM_UNSIGNED_INTEGER,
+ get_rsa_payload_e9 },
{ OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
- OSSL_PKEY_PARAM_RSA_EXPONENT10, OSSL_PARAM_UNSIGNED_INTEGER,
- get_rsa_payload_e10 },
+ OSSL_PKEY_PARAM_RSA_EXPONENT10, OSSL_PARAM_UNSIGNED_INTEGER,
+ get_rsa_payload_e10 },
{ OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
- OSSL_PKEY_PARAM_RSA_COEFFICIENT1, OSSL_PARAM_UNSIGNED_INTEGER,
- get_rsa_payload_c1 },
+ OSSL_PKEY_PARAM_RSA_COEFFICIENT1, OSSL_PARAM_UNSIGNED_INTEGER,
+ get_rsa_payload_c1 },
{ OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
- OSSL_PKEY_PARAM_RSA_COEFFICIENT2, OSSL_PARAM_UNSIGNED_INTEGER,
- get_rsa_payload_c2 },
+ OSSL_PKEY_PARAM_RSA_COEFFICIENT2, OSSL_PARAM_UNSIGNED_INTEGER,
+ get_rsa_payload_c2 },
{ OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
- OSSL_PKEY_PARAM_RSA_COEFFICIENT3, OSSL_PARAM_UNSIGNED_INTEGER,
- get_rsa_payload_c3 },
+ OSSL_PKEY_PARAM_RSA_COEFFICIENT3, OSSL_PARAM_UNSIGNED_INTEGER,
+ get_rsa_payload_c3 },
{ OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
- OSSL_PKEY_PARAM_RSA_COEFFICIENT4, OSSL_PARAM_UNSIGNED_INTEGER,
- get_rsa_payload_c4 },
+ OSSL_PKEY_PARAM_RSA_COEFFICIENT4, OSSL_PARAM_UNSIGNED_INTEGER,
+ get_rsa_payload_c4 },
{ OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
- OSSL_PKEY_PARAM_RSA_COEFFICIENT5, OSSL_PARAM_UNSIGNED_INTEGER,
- get_rsa_payload_c5 },
+ OSSL_PKEY_PARAM_RSA_COEFFICIENT5, OSSL_PARAM_UNSIGNED_INTEGER,
+ get_rsa_payload_c5 },
{ OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
- OSSL_PKEY_PARAM_RSA_COEFFICIENT6, OSSL_PARAM_UNSIGNED_INTEGER,
- get_rsa_payload_c6 },
+ OSSL_PKEY_PARAM_RSA_COEFFICIENT6, OSSL_PARAM_UNSIGNED_INTEGER,
+ get_rsa_payload_c6 },
{ OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
- OSSL_PKEY_PARAM_RSA_COEFFICIENT7, OSSL_PARAM_UNSIGNED_INTEGER,
- get_rsa_payload_c7 },
+ OSSL_PKEY_PARAM_RSA_COEFFICIENT7, OSSL_PARAM_UNSIGNED_INTEGER,
+ get_rsa_payload_c7 },
{ OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
- OSSL_PKEY_PARAM_RSA_COEFFICIENT8, OSSL_PARAM_UNSIGNED_INTEGER,
- get_rsa_payload_c8 },
+ OSSL_PKEY_PARAM_RSA_COEFFICIENT8, OSSL_PARAM_UNSIGNED_INTEGER,
+ get_rsa_payload_c8 },
{ OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
- OSSL_PKEY_PARAM_RSA_COEFFICIENT9, OSSL_PARAM_UNSIGNED_INTEGER,
- get_rsa_payload_c9 },
+ OSSL_PKEY_PARAM_RSA_COEFFICIENT9, OSSL_PARAM_UNSIGNED_INTEGER,
+ get_rsa_payload_c9 },
/* EC */
{ OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
- OSSL_PKEY_PARAM_EC_DECODED_FROM_EXPLICIT_PARAMS, OSSL_PARAM_INTEGER,
- get_ec_decoded_from_explicit_params },
+ OSSL_PKEY_PARAM_EC_DECODED_FROM_EXPLICIT_PARAMS, OSSL_PARAM_INTEGER,
+ get_ec_decoded_from_explicit_params },
};
static const struct translation_st *
lookup_translation(struct translation_st *tmpl,
- const struct translation_st *translations,
- size_t translations_num)
+ const struct translation_st *translations,
+ size_t translations_num)
{
size_t i;
@@ -2607,7 +2589,6 @@ lookup_translation(struct translation_st *tmpl,
if (!ossl_assert((item->keytype1 == -1) == (item->keytype2 == -1)))
continue;
-
/*
* Base search criteria: check that the optype and keytypes match,
* if relevant. All callers must synthesise these bits somehow.
@@ -2651,8 +2632,9 @@ lookup_translation(struct translation_st *tmpl,
&& OPENSSL_strcasecmp(tmpl->ctrl_str, item->ctrl_str) == 0)
ctrl_str = tmpl->ctrl_str;
else if (item->ctrl_hexstr != NULL
- && OPENSSL_strcasecmp(tmpl->ctrl_hexstr,
- item->ctrl_hexstr) == 0)
+ && OPENSSL_strcasecmp(tmpl->ctrl_hexstr,
+ item->ctrl_hexstr)
+ == 0)
ctrl_hexstr = tmpl->ctrl_hexstr;
else
continue;
@@ -2678,10 +2660,11 @@ lookup_translation(struct translation_st *tmpl,
* therefore take the action type into account in this case.
*/
if ((item->action_type != OSSL_ACTION_NONE
- && tmpl->action_type != item->action_type)
+ && tmpl->action_type != item->action_type)
|| (item->param_key != NULL
&& OPENSSL_strcasecmp(tmpl->param_key,
- item->param_key) != 0))
+ item->param_key)
+ != 0))
continue;
} else {
return NULL;
@@ -2697,23 +2680,27 @@ static const struct translation_st *
lookup_evp_pkey_ctx_translation(struct translation_st *tmpl)
{
return lookup_translation(tmpl, evp_pkey_ctx_translations,
- OSSL_NELEM(evp_pkey_ctx_translations));
+ OSSL_NELEM(evp_pkey_ctx_translations));
}
static const struct translation_st *
lookup_evp_pkey_translation(struct translation_st *tmpl)
{
return lookup_translation(tmpl, evp_pkey_translations,
- OSSL_NELEM(evp_pkey_translations));
+ OSSL_NELEM(evp_pkey_translations));
}
/* This must ONLY be called for provider side operations */
int evp_pkey_ctx_ctrl_to_param(EVP_PKEY_CTX *pctx,
- int keytype, int optype,
- int cmd, int p1, void *p2)
+ int keytype, int optype,
+ int cmd, int p1, void *p2)
{
- struct translation_ctx_st ctx = { 0, };
- struct translation_st tmpl = { 0, };
+ struct translation_ctx_st ctx = {
+ 0,
+ };
+ struct translation_st tmpl = {
+ 0,
+ };
const struct translation_st *translation = NULL;
OSSL_PARAM params[2] = { OSSL_PARAM_END, OSSL_PARAM_END };
int ret;
@@ -2778,10 +2765,14 @@ int evp_pkey_ctx_ctrl_to_param(EVP_PKEY_CTX *pctx,
/* This must ONLY be called for provider side operations */
int evp_pkey_ctx_ctrl_str_to_param(EVP_PKEY_CTX *pctx,
- const char *name, const char *value)
+ const char *name, const char *value)
{
- struct translation_ctx_st ctx = { 0, };
- struct translation_st tmpl = { 0, };
+ struct translation_ctx_st ctx = {
+ 0,
+ };
+ struct translation_st tmpl = {
+ 0,
+ };
const struct translation_st *translation = NULL;
OSSL_PARAM params[2] = { OSSL_PARAM_END, OSSL_PARAM_END };
int keytype = pctx->legacy_keytype;
@@ -2840,15 +2831,19 @@ int evp_pkey_ctx_ctrl_str_to_param(EVP_PKEY_CTX *pctx,
/* This must ONLY be called for legacy operations */
static int evp_pkey_ctx_setget_params_to_ctrl(EVP_PKEY_CTX *pctx,
- enum action action_type,
- OSSL_PARAM *params)
+ enum action action_type,
+ OSSL_PARAM *params)
{
int keytype = pctx->legacy_keytype;
int optype = pctx->operation == 0 ? -1 : pctx->operation;
for (; params != NULL && params->key != NULL; params++) {
- struct translation_ctx_st ctx = { 0, };
- struct translation_st tmpl = { 0, };
+ struct translation_ctx_st ctx = {
+ 0,
+ };
+ struct translation_st tmpl = {
+ 0,
+ };
const struct translation_st *translation = NULL;
fixup_args_fn *fixup = default_fixup_args;
int ret;
@@ -2871,7 +2866,7 @@ static int evp_pkey_ctx_setget_params_to_ctrl(EVP_PKEY_CTX *pctx,
if (ret > 0 && ctx.action_type != OSSL_ACTION_NONE)
ret = EVP_PKEY_CTX_ctrl(pctx, keytype, optype,
- ctx.ctrl_cmd, ctx.p1, ctx.p2);
+ ctx.ctrl_cmd, ctx.p1, ctx.p2);
/*
* In POST, we pass the return value as p1, allowing the fixup_args
@@ -2913,14 +2908,18 @@ int evp_pkey_ctx_get_params_to_ctrl(EVP_PKEY_CTX *ctx, OSSL_PARAM *params)
/* This must ONLY be called for legacy EVP_PKEYs */
static int evp_pkey_setget_params_to_ctrl(const EVP_PKEY *pkey,
- enum action action_type,
- OSSL_PARAM *params)
+ enum action action_type,
+ OSSL_PARAM *params)
{
int ret = 1;
for (; params != NULL && params->key != NULL; params++) {
- struct translation_ctx_st ctx = { 0, };
- struct translation_st tmpl = { 0, };
+ struct translation_ctx_st ctx = {
+ 0,
+ };
+ struct translation_st tmpl = {
+ 0,
+ };
const struct translation_st *translation = NULL;
fixup_args_fn *fixup = default_fixup_args;
diff --git a/crypto/evp/dh_ctrl.c b/crypto/evp/dh_ctrl.c
index fee7757d9a..48f454cee2 100644
--- a/crypto/evp/dh_ctrl.c
+++ b/crypto/evp/dh_ctrl.c
@@ -61,8 +61,8 @@ int EVP_PKEY_CTX_set_dh_paramgen_gindex(EVP_PKEY_CTX *ctx, int gindex)
}
int EVP_PKEY_CTX_set_dh_paramgen_seed(EVP_PKEY_CTX *ctx,
- const unsigned char *seed,
- size_t seedlen)
+ const unsigned char *seed,
+ size_t seedlen)
{
int ret;
OSSL_PARAM params[2], *p = params;
@@ -71,7 +71,7 @@ int EVP_PKEY_CTX_set_dh_paramgen_seed(EVP_PKEY_CTX *ctx,
return ret;
*p++ = OSSL_PARAM_construct_octet_string(OSSL_PKEY_PARAM_FFC_SEED,
- (void *)seed, seedlen);
+ (void *)seed, seedlen);
*p = OSSL_PARAM_construct_end();
return evp_pkey_ctx_set_params_strict(ctx, params);
@@ -84,7 +84,7 @@ int EVP_PKEY_CTX_set_dh_paramgen_seed(EVP_PKEY_CTX *ctx,
int EVP_PKEY_CTX_set_dh_paramgen_type(EVP_PKEY_CTX *ctx, int typ)
{
return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DH, EVP_PKEY_OP_PARAMGEN,
- EVP_PKEY_CTRL_DH_PARAMGEN_TYPE, typ, NULL);
+ EVP_PKEY_CTRL_DH_PARAMGEN_TYPE, typ, NULL);
}
int EVP_PKEY_CTX_set_dh_paramgen_prime_len(EVP_PKEY_CTX *ctx, int pbits)
@@ -137,7 +137,7 @@ int EVP_PKEY_CTX_set_dh_paramgen_generator(EVP_PKEY_CTX *ctx, int gen)
int EVP_PKEY_CTX_set_dh_rfc5114(EVP_PKEY_CTX *ctx, int gen)
{
return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, EVP_PKEY_OP_PARAMGEN,
- EVP_PKEY_CTRL_DH_RFC5114, gen, NULL);
+ EVP_PKEY_CTRL_DH_RFC5114, gen, NULL);
}
int EVP_PKEY_CTX_set_dhx_rfc5114(EVP_PKEY_CTX *ctx, int gen)
@@ -152,8 +152,8 @@ int EVP_PKEY_CTX_set_dhx_rfc5114(EVP_PKEY_CTX *ctx, int gen)
int EVP_PKEY_CTX_set_dh_nid(EVP_PKEY_CTX *ctx, int nid)
{
return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DH,
- EVP_PKEY_OP_PARAMGEN | EVP_PKEY_OP_KEYGEN,
- EVP_PKEY_CTRL_DH_NID, nid, NULL);
+ EVP_PKEY_OP_PARAMGEN | EVP_PKEY_OP_KEYGEN,
+ EVP_PKEY_CTRL_DH_NID, nid, NULL);
}
int EVP_PKEY_CTX_set_dh_pad(EVP_PKEY_CTX *ctx, int pad)
@@ -180,7 +180,7 @@ int EVP_PKEY_CTX_set_dh_pad(EVP_PKEY_CTX *ctx, int pad)
int EVP_PKEY_CTX_set_dh_kdf_type(EVP_PKEY_CTX *ctx, int kdf)
{
return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_DH_KDF_TYPE, kdf, NULL);
+ EVP_PKEY_CTRL_DH_KDF_TYPE, kdf, NULL);
}
/*
@@ -190,7 +190,7 @@ int EVP_PKEY_CTX_set_dh_kdf_type(EVP_PKEY_CTX *ctx, int kdf)
int EVP_PKEY_CTX_get_dh_kdf_type(EVP_PKEY_CTX *ctx)
{
return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_DH_KDF_TYPE, -2, NULL);
+ EVP_PKEY_CTRL_DH_KDF_TYPE, -2, NULL);
}
/*
@@ -200,7 +200,7 @@ int EVP_PKEY_CTX_get_dh_kdf_type(EVP_PKEY_CTX *ctx)
int EVP_PKEY_CTX_set0_dh_kdf_oid(EVP_PKEY_CTX *ctx, ASN1_OBJECT *oid)
{
return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_DH_KDF_OID, 0, (void *)(oid));
+ EVP_PKEY_CTRL_DH_KDF_OID, 0, (void *)(oid));
}
/*
@@ -210,7 +210,7 @@ int EVP_PKEY_CTX_set0_dh_kdf_oid(EVP_PKEY_CTX *ctx, ASN1_OBJECT *oid)
int EVP_PKEY_CTX_get0_dh_kdf_oid(EVP_PKEY_CTX *ctx, ASN1_OBJECT **oid)
{
return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_GET_DH_KDF_OID, 0, (void *)(oid));
+ EVP_PKEY_CTRL_GET_DH_KDF_OID, 0, (void *)(oid));
}
/*
@@ -220,7 +220,7 @@ int EVP_PKEY_CTX_get0_dh_kdf_oid(EVP_PKEY_CTX *ctx, ASN1_OBJECT **oid)
int EVP_PKEY_CTX_set_dh_kdf_md(EVP_PKEY_CTX *ctx, const EVP_MD *md)
{
return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_DH_KDF_MD, 0, (void *)(md));
+ EVP_PKEY_CTRL_DH_KDF_MD, 0, (void *)(md));
}
/*
@@ -229,8 +229,8 @@ int EVP_PKEY_CTX_set_dh_kdf_md(EVP_PKEY_CTX *ctx, const EVP_MD *md)
*/
int EVP_PKEY_CTX_get_dh_kdf_md(EVP_PKEY_CTX *ctx, const EVP_MD **pmd)
{
- return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_GET_DH_KDF_MD, 0, (void *)(pmd));
+ return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, EVP_PKEY_OP_DERIVE,
+ EVP_PKEY_CTRL_GET_DH_KDF_MD, 0, (void *)(pmd));
}
int EVP_PKEY_CTX_set_dh_kdf_outlen(EVP_PKEY_CTX *ctx, int outlen)
@@ -253,7 +253,7 @@ int EVP_PKEY_CTX_set_dh_kdf_outlen(EVP_PKEY_CTX *ctx, int outlen)
}
*p++ = OSSL_PARAM_construct_size_t(OSSL_EXCHANGE_PARAM_KDF_OUTLEN,
- &len);
+ &len);
*p = OSSL_PARAM_construct_end();
ret = evp_pkey_ctx_set_params_strict(ctx, params);
@@ -273,7 +273,7 @@ int EVP_PKEY_CTX_get_dh_kdf_outlen(EVP_PKEY_CTX *ctx, int *plen)
return ret;
*p++ = OSSL_PARAM_construct_size_t(OSSL_EXCHANGE_PARAM_KDF_OUTLEN,
- &len);
+ &len);
*p = OSSL_PARAM_construct_end();
ret = evp_pkey_ctx_get_params_strict(ctx, params);
@@ -300,12 +300,12 @@ int EVP_PKEY_CTX_set0_dh_kdf_ukm(EVP_PKEY_CTX *ctx, unsigned char *ukm, int len)
return ret;
*p++ = OSSL_PARAM_construct_octet_string(OSSL_EXCHANGE_PARAM_KDF_UKM,
- /*
- * Cast away the const. This is read
- * only so should be safe
- */
- (void *)ukm,
- (size_t)len);
+ /*
+ * Cast away the const. This is read
+ * only so should be safe
+ */
+ (void *)ukm,
+ (size_t)len);
*p = OSSL_PARAM_construct_end();
ret = evp_pkey_ctx_set_params_strict(ctx, params);
@@ -328,7 +328,7 @@ int EVP_PKEY_CTX_get0_dh_kdf_ukm(EVP_PKEY_CTX *ctx, unsigned char **pukm)
return ret;
*p++ = OSSL_PARAM_construct_octet_ptr(OSSL_EXCHANGE_PARAM_KDF_UKM,
- (void **)pukm, 0);
+ (void **)pukm, 0);
*p = OSSL_PARAM_construct_end();
ret = evp_pkey_ctx_get_params_strict(ctx, params);
diff --git a/crypto/evp/dh_support.c b/crypto/evp/dh_support.c
index d247287422..257a83b58e 100644
--- a/crypto/evp/dh_support.c
+++ b/crypto/evp/dh_support.c
@@ -21,11 +21,11 @@ typedef struct dh_name2id_st {
/* Indicates that the paramgen_type can be used for either DH or DHX */
#define TYPE_ANY -1
#ifndef OPENSSL_NO_DH
-# define TYPE_DH DH_FLAG_TYPE_DH
-# define TYPE_DHX DH_FLAG_TYPE_DHX
+#define TYPE_DH DH_FLAG_TYPE_DH
+#define TYPE_DHX DH_FLAG_TYPE_DHX
#else
-# define TYPE_DH 0
-# define TYPE_DHX 0
+#define TYPE_DH 0
+#define TYPE_DHX 0
#endif
static const DH_GENTYPE_NAME2ID dhtype2id[] = {
@@ -53,7 +53,7 @@ int ossl_dh_gen_type_name2id(const char *name, int type)
for (i = 0; i < OSSL_NELEM(dhtype2id); ++i) {
if ((dhtype2id[i].type == TYPE_ANY
- || type == dhtype2id[i].type)
+ || type == dhtype2id[i].type)
&& strcmp(dhtype2id[i].name, name) == 0)
return dhtype2id[i].id;
}
diff --git a/crypto/evp/digest.c b/crypto/evp/digest.c
index 99623acc1f..7184f9a051 100644
--- a/crypto/evp/digest.c
+++ b/crypto/evp/digest.c
@@ -25,11 +25,11 @@ static void cleanup_old_md_data(EVP_MD_CTX *ctx, int force)
{
if (ctx->digest != NULL) {
if (ctx->digest->cleanup != NULL
- && !EVP_MD_CTX_test_flags(ctx, EVP_MD_CTX_FLAG_CLEANED))
+ && !EVP_MD_CTX_test_flags(ctx, EVP_MD_CTX_FLAG_CLEANED))
ctx->digest->cleanup(ctx);
if (ctx->md_data != NULL && ctx->digest->ctx_size > 0
- && (!EVP_MD_CTX_test_flags(ctx, EVP_MD_CTX_FLAG_REUSE)
- || force)) {
+ && (!EVP_MD_CTX_test_flags(ctx, EVP_MD_CTX_FLAG_REUSE)
+ || force)) {
OPENSSL_clear_free(ctx->md_data, ctx->digest->ctx_size);
ctx->md_data = NULL;
}
@@ -92,7 +92,7 @@ int EVP_MD_CTX_reset(EVP_MD_CTX *ctx)
#ifndef FIPS_MODULE
EVP_MD_CTX *evp_md_ctx_new_ex(EVP_PKEY *pkey, const ASN1_OCTET_STRING *id,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_LIB_CTX *libctx, const char *propq)
{
EVP_MD_CTX *ctx;
EVP_PKEY_CTX *pctx = NULL;
@@ -109,7 +109,7 @@ EVP_MD_CTX *evp_md_ctx_new_ex(EVP_PKEY *pkey, const ASN1_OCTET_STRING *id,
EVP_MD_CTX_set_pkey_ctx(ctx, pctx);
return ctx;
- err:
+err:
EVP_PKEY_CTX_free(pctx);
EVP_MD_CTX_free(ctx);
return NULL;
@@ -145,12 +145,12 @@ int evp_md_ctx_free_algctx(EVP_MD_CTX *ctx)
}
static int evp_md_init_internal(EVP_MD_CTX *ctx, const EVP_MD *type,
- const OSSL_PARAM params[])
+ const OSSL_PARAM params[])
{
#if !defined(FIPS_MODULE)
if (ctx->pctx != NULL
- && EVP_PKEY_CTX_IS_SIGNATURE_OP(ctx->pctx)
- && ctx->pctx->op.sig.algctx != NULL) {
+ && EVP_PKEY_CTX_IS_SIGNATURE_OP(ctx->pctx)
+ && ctx->pctx->op.sig.algctx != NULL) {
/*
* Prior to OpenSSL 3.0 calling EVP_DigestInit_ex() on an mdctx
* previously initialised with EVP_DigestSignInit() would retain
@@ -166,8 +166,7 @@ static int evp_md_init_internal(EVP_MD_CTX *ctx, const EVP_MD *type,
}
#endif
- EVP_MD_CTX_clear_flags(ctx, EVP_MD_CTX_FLAG_CLEANED
- | EVP_MD_CTX_FLAG_FINALISED);
+ EVP_MD_CTX_clear_flags(ctx, EVP_MD_CTX_FLAG_CLEANED | EVP_MD_CTX_FLAG_FINALISED);
if (type != NULL) {
ctx->reqdigest = type;
@@ -184,9 +183,9 @@ static int evp_md_init_internal(EVP_MD_CTX *ctx, const EVP_MD *type,
* should use legacy handling for now.
*/
if ((ctx->flags & EVP_MD_CTX_FLAG_NO_INIT) != 0
- || (type != NULL && type->origin == EVP_ORIG_METH)
- || (type == NULL && ctx->digest != NULL
- && ctx->digest->origin == EVP_ORIG_METH)) {
+ || (type != NULL && type->origin == EVP_ORIG_METH)
+ || (type == NULL && ctx->digest != NULL
+ && ctx->digest->origin == EVP_ORIG_METH)) {
/* If we were using provided hash before, cleanup algctx */
if (!evp_md_ctx_free_algctx(ctx))
return 0;
@@ -218,8 +217,9 @@ static int evp_md_init_internal(EVP_MD_CTX *ctx, const EVP_MD *type,
#else
/* The NULL digest is a special case */
EVP_MD *provmd = EVP_MD_fetch(NULL,
- type->type != NID_undef ? OBJ_nid2sn(type->type)
- : "NULL", "");
+ type->type != NID_undef ? OBJ_nid2sn(type->type)
+ : "NULL",
+ "");
if (provmd == NULL) {
ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
@@ -256,7 +256,7 @@ static int evp_md_init_internal(EVP_MD_CTX *ctx, const EVP_MD *type,
return ctx->digest->dinit(ctx->algctx, params);
/* Code below to be removed when legacy support is dropped. */
- legacy:
+legacy:
if (ctx->digest != type) {
cleanup_old_md_data(ctx, 1);
@@ -271,11 +271,11 @@ static int evp_md_init_internal(EVP_MD_CTX *ctx, const EVP_MD *type,
}
#ifndef FIPS_MODULE
if (ctx->pctx != NULL
- && (!EVP_PKEY_CTX_IS_SIGNATURE_OP(ctx->pctx)
- || ctx->pctx->op.sig.signature == NULL)) {
+ && (!EVP_PKEY_CTX_IS_SIGNATURE_OP(ctx->pctx)
+ || ctx->pctx->op.sig.signature == NULL)) {
int r;
r = EVP_PKEY_CTX_ctrl(ctx->pctx, -1, EVP_PKEY_OP_TYPE_SIG,
- EVP_PKEY_CTRL_DIGESTINIT, 0, ctx);
+ EVP_PKEY_CTRL_DIGESTINIT, 0, ctx);
if (r <= 0 && (r != -2))
return 0;
}
@@ -286,7 +286,7 @@ static int evp_md_init_internal(EVP_MD_CTX *ctx, const EVP_MD *type,
}
int EVP_DigestInit_ex2(EVP_MD_CTX *ctx, const EVP_MD *type,
- const OSSL_PARAM params[])
+ const OSSL_PARAM params[])
{
return evp_md_init_internal(ctx, type, params);
}
@@ -315,8 +315,8 @@ int EVP_DigestUpdate(EVP_MD_CTX *ctx, const void *data, size_t count)
}
if (ossl_unlikely(ctx->pctx != NULL)
- && EVP_PKEY_CTX_IS_SIGNATURE_OP(ctx->pctx)
- && ctx->pctx->op.sig.algctx != NULL) {
+ && EVP_PKEY_CTX_IS_SIGNATURE_OP(ctx->pctx)
+ && ctx->pctx->op.sig.algctx != NULL) {
#ifndef FIPS_MODULE
/*
* Prior to OpenSSL 3.0 EVP_DigestSignUpdate() and
@@ -336,8 +336,8 @@ int EVP_DigestUpdate(EVP_MD_CTX *ctx, const void *data, size_t count)
}
if (ctx->digest == NULL
- || ctx->digest->prov == NULL
- || ossl_unlikely((ctx->flags & EVP_MD_CTX_FLAG_NO_INIT) != 0))
+ || ctx->digest->prov == NULL
+ || ossl_unlikely((ctx->flags & EVP_MD_CTX_FLAG_NO_INIT) != 0))
goto legacy;
if (ossl_unlikely(ctx->digest->dupdate == NULL)) {
@@ -347,7 +347,7 @@ int EVP_DigestUpdate(EVP_MD_CTX *ctx, const void *data, size_t count)
return ctx->digest->dupdate(ctx->algctx, data, count);
/* Code below to be removed when legacy support is dropped. */
- legacy:
+legacy:
return ctx->update != NULL ? ctx->update(ctx, data, count) : 0;
}
@@ -403,7 +403,7 @@ int EVP_DigestFinal_ex(EVP_MD_CTX *ctx, unsigned char *md, unsigned int *isize)
return ret;
/* Code below to be removed when legacy support is dropped. */
- legacy:
+legacy:
OPENSSL_assert(mdsize <= EVP_MAX_MD_SIZE);
ret = ctx->digest->final(ctx, md);
if (isize != NULL)
@@ -531,7 +531,7 @@ int EVP_MD_CTX_copy_ex(EVP_MD_CTX *out, const EVP_MD_CTX *in)
}
if (in->digest->prov == NULL
- || (in->flags & EVP_MD_CTX_FLAG_NO_INIT) != 0)
+ || (in->flags & EVP_MD_CTX_FLAG_NO_INIT) != 0)
goto legacy;
if (in->digest->dupctx == NULL) {
@@ -572,7 +572,7 @@ int EVP_MD_CTX_copy_ex(EVP_MD_CTX *out, const EVP_MD_CTX *in)
}
}
- clone_pkey:
+clone_pkey:
/* copied EVP_MD_CTX should free the copied EVP_PKEY_CTX */
EVP_MD_CTX_clear_flags(out, EVP_MD_CTX_FLAG_KEEP_PKEY_CTX);
#ifndef FIPS_MODULE
@@ -589,7 +589,7 @@ int EVP_MD_CTX_copy_ex(EVP_MD_CTX *out, const EVP_MD_CTX *in)
return 1;
/* Code below to be removed when legacy support is dropped. */
- legacy:
+legacy:
if (out->digest == in->digest) {
tmp_buf = out->md_data;
@@ -639,8 +639,8 @@ int EVP_MD_CTX_copy_ex(EVP_MD_CTX *out, const EVP_MD_CTX *in)
}
int EVP_Digest(const void *data, size_t count,
- unsigned char *md, unsigned int *size, const EVP_MD *type,
- ENGINE *impl)
+ unsigned char *md, unsigned int *size, const EVP_MD *type,
+ ENGINE *impl)
{
EVP_MD_CTX *ctx;
int ret;
@@ -661,8 +661,8 @@ int EVP_Digest(const void *data, size_t count,
}
int EVP_Q_digest(OSSL_LIB_CTX *libctx, const char *name, const char *propq,
- const void *data, size_t datalen,
- unsigned char *md, size_t *mdlen)
+ const void *data, size_t datalen,
+ unsigned char *md, size_t *mdlen)
{
EVP_MD *digest = EVP_MD_fetch(libctx, name, propq);
unsigned int temp = 0;
@@ -688,7 +688,7 @@ const OSSL_PARAM *EVP_MD_gettable_params(const EVP_MD *digest)
{
if (digest != NULL && digest->gettable_params != NULL)
return digest->gettable_params(
- ossl_provider_ctx(EVP_MD_get0_provider(digest)));
+ ossl_provider_ctx(EVP_MD_get0_provider(digest)));
return NULL;
}
@@ -698,12 +698,12 @@ int EVP_MD_CTX_set_params(EVP_MD_CTX *ctx, const OSSL_PARAM params[])
/* If we have a pctx then we should try that first */
if (ossl_unlikely(pctx != NULL)
- && (pctx->operation == EVP_PKEY_OP_VERIFYCTX
- || pctx->operation == EVP_PKEY_OP_SIGNCTX)
- && pctx->op.sig.algctx != NULL
- && pctx->op.sig.signature->set_ctx_md_params != NULL)
+ && (pctx->operation == EVP_PKEY_OP_VERIFYCTX
+ || pctx->operation == EVP_PKEY_OP_SIGNCTX)
+ && pctx->op.sig.algctx != NULL
+ && pctx->op.sig.signature->set_ctx_md_params != NULL)
return pctx->op.sig.signature->set_ctx_md_params(pctx->op.sig.algctx,
- params);
+ params);
if (ossl_likely(ctx->digest != NULL && ctx->digest->set_ctx_params != NULL))
return ctx->digest->set_ctx_params(ctx->algctx, params);
@@ -733,12 +733,12 @@ const OSSL_PARAM *EVP_MD_CTX_settable_params(EVP_MD_CTX *ctx)
/* If we have a pctx then we should try that first */
pctx = ctx->pctx;
if (pctx != NULL
- && (pctx->operation == EVP_PKEY_OP_VERIFYCTX
- || pctx->operation == EVP_PKEY_OP_SIGNCTX)
- && pctx->op.sig.algctx != NULL
- && pctx->op.sig.signature->settable_ctx_md_params != NULL)
+ && (pctx->operation == EVP_PKEY_OP_VERIFYCTX
+ || pctx->operation == EVP_PKEY_OP_SIGNCTX)
+ && pctx->op.sig.algctx != NULL
+ && pctx->op.sig.signature->settable_ctx_md_params != NULL)
return pctx->op.sig.signature->settable_ctx_md_params(
- pctx->op.sig.algctx);
+ pctx->op.sig.algctx);
if (ctx->digest != NULL && ctx->digest->settable_ctx_params != NULL) {
alg = ossl_provider_ctx(EVP_MD_get0_provider(ctx->digest));
@@ -754,12 +754,12 @@ int EVP_MD_CTX_get_params(EVP_MD_CTX *ctx, OSSL_PARAM params[])
/* If we have a pctx then we should try that first */
if (pctx != NULL
- && (pctx->operation == EVP_PKEY_OP_VERIFYCTX
- || pctx->operation == EVP_PKEY_OP_SIGNCTX)
- && pctx->op.sig.algctx != NULL
- && pctx->op.sig.signature->get_ctx_md_params != NULL)
+ && (pctx->operation == EVP_PKEY_OP_VERIFYCTX
+ || pctx->operation == EVP_PKEY_OP_SIGNCTX)
+ && pctx->op.sig.algctx != NULL
+ && pctx->op.sig.signature->get_ctx_md_params != NULL)
return pctx->op.sig.signature->get_ctx_md_params(pctx->op.sig.algctx,
- params);
+ params);
if (ctx->digest != NULL && ctx->digest->get_ctx_params != NULL)
return ctx->digest->get_ctx_params(ctx->algctx, params);
@@ -789,15 +789,15 @@ const OSSL_PARAM *EVP_MD_CTX_gettable_params(EVP_MD_CTX *ctx)
/* If we have a pctx then we should try that first */
pctx = ctx->pctx;
if (ossl_unlikely(pctx != NULL)
- && (pctx->operation == EVP_PKEY_OP_VERIFYCTX
- || pctx->operation == EVP_PKEY_OP_SIGNCTX)
- && pctx->op.sig.algctx != NULL
- && pctx->op.sig.signature->gettable_ctx_md_params != NULL)
+ && (pctx->operation == EVP_PKEY_OP_VERIFYCTX
+ || pctx->operation == EVP_PKEY_OP_SIGNCTX)
+ && pctx->op.sig.algctx != NULL
+ && pctx->op.sig.signature->gettable_ctx_md_params != NULL)
return pctx->op.sig.signature->gettable_ctx_md_params(
- pctx->op.sig.algctx);
+ pctx->op.sig.algctx);
if (ossl_unlikely(ctx->digest != NULL
- && ctx->digest->gettable_ctx_params != NULL)) {
+ && ctx->digest->gettable_ctx_params != NULL)) {
provctx = ossl_provider_ctx(EVP_MD_get0_provider(ctx->digest));
return ctx->digest->gettable_ctx_params(ctx->algctx, provctx);
}
@@ -827,11 +827,11 @@ int EVP_MD_CTX_ctrl(EVP_MD_CTX *ctx, int cmd, int p1, void *p2)
case EVP_MD_CTRL_MICALG:
set_params = 0;
params[0] = OSSL_PARAM_construct_utf8_string(OSSL_DIGEST_PARAM_MICALG,
- p2, p1 ? p1 : 9999);
+ p2, p1 ? p1 : 9999);
break;
case EVP_CTRL_SSL3_MASTER_SECRET:
params[0] = OSSL_PARAM_construct_octet_string(OSSL_DIGEST_PARAM_SSL3_MS,
- p2, p1);
+ p2, p1);
break;
default:
goto conclude;
@@ -843,16 +843,15 @@ int EVP_MD_CTX_ctrl(EVP_MD_CTX *ctx, int cmd, int p1, void *p2)
ret = EVP_MD_CTX_get_params(ctx, params);
goto conclude;
-
/* Code below to be removed when legacy support is dropped. */
- legacy:
+legacy:
if (ctx->digest->md_ctrl == NULL) {
ERR_raise(ERR_LIB_EVP, EVP_R_CTRL_NOT_IMPLEMENTED);
return 0;
}
ret = ctx->digest->md_ctrl(ctx, cmd, p1, p2);
- conclude:
+conclude:
if (ret <= 0)
return 0;
return ret;
@@ -886,7 +885,7 @@ static void set_legacy_nid(const char *name, void *vlegacy_nid)
*/
const void *legacy_method = OBJ_NAME_get(name, OBJ_NAME_TYPE_MD_METH);
- if (*legacy_nid == -1) /* We found a clash already */
+ if (*legacy_nid == -1) /* We found a clash already */
return;
if (legacy_method == NULL)
@@ -916,7 +915,7 @@ static int evp_md_cache_constants(EVP_MD *md)
params[1] = OSSL_PARAM_construct_size_t(OSSL_DIGEST_PARAM_SIZE, &mdsize);
params[2] = OSSL_PARAM_construct_int(OSSL_DIGEST_PARAM_XOF, &xof);
params[3] = OSSL_PARAM_construct_int(OSSL_DIGEST_PARAM_ALGID_ABSENT,
- &algid_absent);
+ &algid_absent);
params[4] = OSSL_PARAM_construct_end();
ok = evp_do_md_getparams(md, params) > 0;
if (mdsize > INT_MAX || blksz > INT_MAX)
@@ -933,8 +932,8 @@ static int evp_md_cache_constants(EVP_MD *md)
}
static void *evp_md_from_algorithm(int name_id,
- const OSSL_ALGORITHM *algodef,
- OSSL_PROVIDER *prov)
+ const OSSL_ALGORITHM *algodef,
+ OSSL_PROVIDER *prov)
{
const OSSL_DISPATCH *fns = algodef->implementation;
EVP_MD *md = NULL;
@@ -949,7 +948,7 @@ static void *evp_md_from_algorithm(int name_id,
#ifndef FIPS_MODULE
md->type = NID_undef;
if (!evp_names_do_all(prov, name_id, set_legacy_nid, &md->type)
- || md->type == -1) {
+ || md->type == -1) {
ERR_raise(ERR_LIB_EVP, ERR_R_INTERNAL_ERROR);
goto err;
}
@@ -1026,18 +1025,15 @@ static void *evp_md_from_algorithm(int name_id,
break;
case OSSL_FUNC_DIGEST_SETTABLE_CTX_PARAMS:
if (md->settable_ctx_params == NULL)
- md->settable_ctx_params =
- OSSL_FUNC_digest_settable_ctx_params(fns);
+ md->settable_ctx_params = OSSL_FUNC_digest_settable_ctx_params(fns);
break;
case OSSL_FUNC_DIGEST_GETTABLE_CTX_PARAMS:
if (md->gettable_ctx_params == NULL)
- md->gettable_ctx_params =
- OSSL_FUNC_digest_gettable_ctx_params(fns);
+ md->gettable_ctx_params = OSSL_FUNC_digest_gettable_ctx_params(fns);
break;
case OSSL_FUNC_DIGEST_COPYCTX:
if (md->copyctx == NULL)
- md->copyctx =
- OSSL_FUNC_digest_copyctx(fns);
+ md->copyctx = OSSL_FUNC_digest_copyctx(fns);
break;
}
}
@@ -1080,11 +1076,10 @@ static void evp_md_free(void *md)
}
EVP_MD *EVP_MD_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
- const char *properties)
+ const char *properties)
{
- EVP_MD *md =
- evp_generic_fetch(ctx, OSSL_OP_DIGEST, algorithm, properties,
- evp_md_from_algorithm, evp_md_up_ref, evp_md_free);
+ EVP_MD *md = evp_generic_fetch(ctx, OSSL_OP_DIGEST, algorithm, properties,
+ evp_md_from_algorithm, evp_md_up_ref, evp_md_free);
return md;
}
@@ -1112,23 +1107,23 @@ void EVP_MD_free(EVP_MD *md)
}
void EVP_MD_do_all_provided(OSSL_LIB_CTX *libctx,
- void (*fn)(EVP_MD *mac, void *arg),
- void *arg)
+ void (*fn)(EVP_MD *mac, void *arg),
+ void *arg)
{
evp_generic_do_all(libctx, OSSL_OP_DIGEST,
- (void (*)(void *, void *))fn, arg,
- evp_md_from_algorithm, evp_md_up_ref, evp_md_free);
+ (void (*)(void *, void *))fn, arg,
+ evp_md_from_algorithm, evp_md_up_ref, evp_md_free);
}
EVP_MD *evp_digest_fetch_from_prov(OSSL_PROVIDER *prov,
- const char *algorithm,
- const char *properties)
+ const char *algorithm,
+ const char *properties)
{
return evp_generic_fetch_from_prov(prov, OSSL_OP_DIGEST,
- algorithm, properties,
- evp_md_from_algorithm,
- evp_md_up_ref,
- evp_md_free);
+ algorithm, properties,
+ evp_md_from_algorithm,
+ evp_md_up_ref,
+ evp_md_free);
}
typedef struct {
@@ -1137,21 +1132,21 @@ typedef struct {
} ossl_hmacmd_pair;
static const ossl_hmacmd_pair ossl_hmacmd_pairs[] = {
- {NID_sha1, NID_hmacWithSHA1},
- {NID_md5, NID_hmacWithMD5},
- {NID_sha224, NID_hmacWithSHA224},
- {NID_sha256, NID_hmacWithSHA256},
- {NID_sha384, NID_hmacWithSHA384},
- {NID_sha512, NID_hmacWithSHA512},
- {NID_id_GostR3411_94, NID_id_HMACGostR3411_94},
- {NID_id_GostR3411_2012_256, NID_id_tc26_hmac_gost_3411_2012_256},
- {NID_id_GostR3411_2012_512, NID_id_tc26_hmac_gost_3411_2012_512},
- {NID_sha3_224, NID_hmac_sha3_224},
- {NID_sha3_256, NID_hmac_sha3_256},
- {NID_sha3_384, NID_hmac_sha3_384},
- {NID_sha3_512, NID_hmac_sha3_512},
- {NID_sha512_224, NID_hmacWithSHA512_224},
- {NID_sha512_256, NID_hmacWithSHA512_256}
+ { NID_sha1, NID_hmacWithSHA1 },
+ { NID_md5, NID_hmacWithMD5 },
+ { NID_sha224, NID_hmacWithSHA224 },
+ { NID_sha256, NID_hmacWithSHA256 },
+ { NID_sha384, NID_hmacWithSHA384 },
+ { NID_sha512, NID_hmacWithSHA512 },
+ { NID_id_GostR3411_94, NID_id_HMACGostR3411_94 },
+ { NID_id_GostR3411_2012_256, NID_id_tc26_hmac_gost_3411_2012_256 },
+ { NID_id_GostR3411_2012_512, NID_id_tc26_hmac_gost_3411_2012_512 },
+ { NID_sha3_224, NID_hmac_sha3_224 },
+ { NID_sha3_256, NID_hmac_sha3_256 },
+ { NID_sha3_384, NID_hmac_sha3_384 },
+ { NID_sha3_512, NID_hmac_sha3_512 },
+ { NID_sha512_224, NID_hmacWithSHA512_224 },
+ { NID_sha512_256, NID_hmacWithSHA512_256 }
};
int ossl_hmac2mdnid(int hmac_nid)
diff --git a/crypto/evp/dsa_ctrl.c b/crypto/evp/dsa_ctrl.c
index 531a21fa8d..af1b055ee4 100644
--- a/crypto/evp/dsa_ctrl.c
+++ b/crypto/evp/dsa_ctrl.c
@@ -36,7 +36,7 @@ int EVP_PKEY_CTX_set_dsa_paramgen_type(EVP_PKEY_CTX *ctx, const char *name)
return ret;
*p++ = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_FFC_TYPE,
- (char *)name, 0);
+ (char *)name, 0);
*p++ = OSSL_PARAM_construct_end();
return EVP_PKEY_CTX_set_params(ctx, params);
@@ -57,8 +57,8 @@ int EVP_PKEY_CTX_set_dsa_paramgen_gindex(EVP_PKEY_CTX *ctx, int gindex)
}
int EVP_PKEY_CTX_set_dsa_paramgen_seed(EVP_PKEY_CTX *ctx,
- const unsigned char *seed,
- size_t seedlen)
+ const unsigned char *seed,
+ size_t seedlen)
{
int ret;
OSSL_PARAM params[2], *p = params;
@@ -67,7 +67,7 @@ int EVP_PKEY_CTX_set_dsa_paramgen_seed(EVP_PKEY_CTX *ctx,
return ret;
*p++ = OSSL_PARAM_construct_octet_string(OSSL_PKEY_PARAM_FFC_SEED,
- (void *)seed, seedlen);
+ (void *)seed, seedlen);
*p++ = OSSL_PARAM_construct_end();
return EVP_PKEY_CTX_set_params(ctx, params);
@@ -104,8 +104,8 @@ int EVP_PKEY_CTX_set_dsa_paramgen_q_bits(EVP_PKEY_CTX *ctx, int qbits)
}
int EVP_PKEY_CTX_set_dsa_paramgen_md_props(EVP_PKEY_CTX *ctx,
- const char *md_name,
- const char *md_properties)
+ const char *md_name,
+ const char *md_properties)
{
int ret;
OSSL_PARAM params[3], *p = params;
@@ -114,10 +114,10 @@ int EVP_PKEY_CTX_set_dsa_paramgen_md_props(EVP_PKEY_CTX *ctx,
return ret;
*p++ = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_FFC_DIGEST,
- (char *)md_name, 0);
+ (char *)md_name, 0);
if (md_properties != NULL)
*p++ = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_FFC_DIGEST_PROPS,
- (char *)md_properties, 0);
+ (char *)md_properties, 0);
*p++ = OSSL_PARAM_construct_end();
return EVP_PKEY_CTX_set_params(ctx, params);
@@ -127,6 +127,6 @@ int EVP_PKEY_CTX_set_dsa_paramgen_md_props(EVP_PKEY_CTX *ctx,
int EVP_PKEY_CTX_set_dsa_paramgen_md(EVP_PKEY_CTX *ctx, const EVP_MD *md)
{
return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DSA, EVP_PKEY_OP_PARAMGEN,
- EVP_PKEY_CTRL_DSA_PARAMGEN_MD, 0, (void *)(md));
+ EVP_PKEY_CTRL_DSA_PARAMGEN_MD, 0, (void *)(md));
}
#endif
diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c
index e73a1e7955..748df92baa 100644
--- a/crypto/evp/e_aes.c
+++ b/crypto/evp/e_aes.c
@@ -45,17 +45,17 @@ typedef struct {
union {
OSSL_UNION_ALIGN;
AES_KEY ks;
- } ks; /* AES key schedule to use */
- int key_set; /* Set if key initialised */
- int iv_set; /* Set if an iv is set */
+ } ks; /* AES key schedule to use */
+ int key_set; /* Set if key initialised */
+ int iv_set; /* Set if an iv is set */
GCM128_CONTEXT gcm;
- unsigned char *iv; /* Temporary IV store */
- int ivlen; /* IV length */
+ unsigned char *iv; /* Temporary IV store */
+ int ivlen; /* IV length */
int taglen;
- int iv_gen; /* It is OK to generate IVs */
- int iv_gen_rand; /* No IV was specified, so generate a rand IV */
- int tls_aad_len; /* TLS AAD length */
- uint64_t tls_enc_records; /* Number of TLS records encrypted */
+ int iv_gen; /* It is OK to generate IVs */
+ int iv_gen_rand; /* No IV was specified, so generate a rand IV */
+ int tls_aad_len; /* TLS AAD length */
+ uint64_t tls_enc_records; /* Number of TLS records encrypted */
ctr128_f ctr;
} EVP_AES_GCM_CTX;
@@ -63,12 +63,12 @@ typedef struct {
union {
OSSL_UNION_ALIGN;
AES_KEY ks;
- } ks1, ks2; /* AES key schedules to use */
+ } ks1, ks2; /* AES key schedules to use */
XTS128_CONTEXT xts;
- void (*stream) (const unsigned char *in,
- unsigned char *out, size_t length,
- const AES_KEY *key1, const AES_KEY *key2,
- const unsigned char iv[16]);
+ void (*stream)(const unsigned char *in,
+ unsigned char *out, size_t length,
+ const AES_KEY *key1, const AES_KEY *key2,
+ const unsigned char iv[16]);
} EVP_AES_XTS_CTX;
#ifdef FIPS_MODULE
@@ -81,13 +81,13 @@ typedef struct {
union {
OSSL_UNION_ALIGN;
AES_KEY ks;
- } ks; /* AES key schedule to use */
- int key_set; /* Set if key initialised */
- int iv_set; /* Set if an iv is set */
- int tag_set; /* Set if tag is valid */
- int len_set; /* Set if message length set */
- int L, M; /* L and M parameters from RFC3610 */
- int tls_aad_len; /* TLS AAD length */
+ } ks; /* AES key schedule to use */
+ int key_set; /* Set if key initialised */
+ int iv_set; /* Set if an iv is set */
+ int tag_set; /* Set if tag is valid */
+ int len_set; /* Set if message length set */
+ int L, M; /* L and M parameters from RFC3610 */
+ int tls_aad_len; /* TLS AAD length */
CCM128_CONTEXT ccm;
ccm128_f str;
} EVP_AES_CCM_CTX;
@@ -97,26 +97,26 @@ typedef struct {
union {
OSSL_UNION_ALIGN;
AES_KEY ks;
- } ksenc; /* AES key schedule to use for encryption */
+ } ksenc; /* AES key schedule to use for encryption */
union {
OSSL_UNION_ALIGN;
AES_KEY ks;
- } ksdec; /* AES key schedule to use for decryption */
- int key_set; /* Set if key initialised */
- int iv_set; /* Set if an iv is set */
+ } ksdec; /* AES key schedule to use for decryption */
+ int key_set; /* Set if key initialised */
+ int iv_set; /* Set if an iv is set */
OCB128_CONTEXT ocb;
- unsigned char *iv; /* Temporary IV store */
+ unsigned char *iv; /* Temporary IV store */
unsigned char tag[16];
unsigned char data_buf[16]; /* Store partial data blocks */
- unsigned char aad_buf[16]; /* Store partial AAD blocks */
+ unsigned char aad_buf[16]; /* Store partial AAD blocks */
int data_buf_len;
int aad_buf_len;
- int ivlen; /* IV length */
+ int ivlen; /* IV length */
int taglen;
} EVP_AES_OCB_CTX;
#endif
-#define MAXBITCHUNK ((size_t)1<<(sizeof(size_t)*8-4))
+#define MAXBITCHUNK ((size_t)1 << (sizeof(size_t) * 8 - 4))
/* increment counter (64-bit int) by 1 */
static void ctr64_inc(unsigned char *counter)
@@ -135,17 +135,16 @@ static void ctr64_inc(unsigned char *counter)
}
#if defined(AESNI_CAPABLE)
-# if defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)
-# define AES_GCM_ASM2(gctx) (gctx->gcm.block==(block128_f)aesni_encrypt && \
- gctx->gcm.ghash==gcm_ghash_avx)
-# undef AES_GCM_ASM2 /* minor size optimization */
-# endif
+#if defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)
+#define AES_GCM_ASM2(gctx) (gctx->gcm.block == (block128_f)aesni_encrypt && gctx->gcm.ghash == gcm_ghash_avx)
+#undef AES_GCM_ASM2 /* minor size optimization */
+#endif
static int aesni_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc)
+ const unsigned char *iv, int enc)
{
int ret, mode;
- EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY,ctx);
+ EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY, ctx);
const int keylen = EVP_CIPHER_CTX_get_key_length(ctx) * 8;
if (keylen <= 0) {
@@ -156,16 +155,15 @@ static int aesni_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
if ((mode == EVP_CIPH_ECB_MODE || mode == EVP_CIPH_CBC_MODE)
&& !enc) {
ret = aesni_set_decrypt_key(key, keylen, &dat->ks.ks);
- dat->block = (block128_f) aesni_decrypt;
- dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ?
- (cbc128_f) aesni_cbc_encrypt : NULL;
+ dat->block = (block128_f)aesni_decrypt;
+ dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ? (cbc128_f)aesni_cbc_encrypt : NULL;
} else {
ret = aesni_set_encrypt_key(key, keylen, &dat->ks.ks);
- dat->block = (block128_f) aesni_encrypt;
+ dat->block = (block128_f)aesni_encrypt;
if (mode == EVP_CIPH_CBC_MODE)
- dat->stream.cbc = (cbc128_f) aesni_cbc_encrypt;
+ dat->stream.cbc = (cbc128_f)aesni_cbc_encrypt;
else if (mode == EVP_CIPH_CTR_MODE)
- dat->stream.ctr = (ctr128_f) aesni_ctr32_encrypt_blocks;
+ dat->stream.ctr = (ctr128_f)aesni_ctr32_encrypt_blocks;
else
dat->stream.cbc = NULL;
}
@@ -179,50 +177,50 @@ static int aesni_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
}
static int aesni_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len)
+ const unsigned char *in, size_t len)
{
- aesni_cbc_encrypt(in, out, len, &EVP_C_DATA(EVP_AES_KEY,ctx)->ks.ks,
- ctx->iv, EVP_CIPHER_CTX_is_encrypting(ctx));
+ aesni_cbc_encrypt(in, out, len, &EVP_C_DATA(EVP_AES_KEY, ctx)->ks.ks,
+ ctx->iv, EVP_CIPHER_CTX_is_encrypting(ctx));
return 1;
}
static int aesni_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len)
+ const unsigned char *in, size_t len)
{
size_t bl = EVP_CIPHER_CTX_get_block_size(ctx);
if (len < bl)
return 1;
- aesni_ecb_encrypt(in, out, len, &EVP_C_DATA(EVP_AES_KEY,ctx)->ks.ks,
- EVP_CIPHER_CTX_is_encrypting(ctx));
+ aesni_ecb_encrypt(in, out, len, &EVP_C_DATA(EVP_AES_KEY, ctx)->ks.ks,
+ EVP_CIPHER_CTX_is_encrypting(ctx));
return 1;
}
-# define aesni_ofb_cipher aes_ofb_cipher
+#define aesni_ofb_cipher aes_ofb_cipher
static int aesni_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len);
+ const unsigned char *in, size_t len);
-# define aesni_cfb_cipher aes_cfb_cipher
+#define aesni_cfb_cipher aes_cfb_cipher
static int aesni_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len);
+ const unsigned char *in, size_t len);
-# define aesni_cfb8_cipher aes_cfb8_cipher
+#define aesni_cfb8_cipher aes_cfb8_cipher
static int aesni_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len);
+ const unsigned char *in, size_t len);
-# define aesni_cfb1_cipher aes_cfb1_cipher
+#define aesni_cfb1_cipher aes_cfb1_cipher
static int aesni_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len);
+ const unsigned char *in, size_t len);
-# define aesni_ctr_cipher aes_ctr_cipher
+#define aesni_ctr_cipher aes_ctr_cipher
static int aesni_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len);
+ const unsigned char *in, size_t len);
static int aesni_gcm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc)
+ const unsigned char *iv, int enc)
{
EVP_AES_GCM_CTX *gctx = EVP_C_DATA(EVP_AES_GCM_CTX, ctx);
@@ -237,8 +235,8 @@ static int aesni_gcm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
return 0;
}
aesni_set_encrypt_key(key, keylen, &gctx->ks.ks);
- CRYPTO_gcm128_init(&gctx->gcm, &gctx->ks, (block128_f) aesni_encrypt);
- gctx->ctr = (ctr128_f) aesni_ctr32_encrypt_blocks;
+ CRYPTO_gcm128_init(&gctx->gcm, &gctx->ks, (block128_f)aesni_encrypt);
+ gctx->ctr = (ctr128_f)aesni_ctr32_encrypt_blocks;
/*
* If we have an iv can set it directly, otherwise use saved IV.
*/
@@ -261,14 +259,14 @@ static int aesni_gcm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
return 1;
}
-# define aesni_gcm_cipher aes_gcm_cipher
+#define aesni_gcm_cipher aes_gcm_cipher
static int aesni_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len);
+ const unsigned char *in, size_t len);
static int aesni_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc)
+ const unsigned char *iv, int enc)
{
- EVP_AES_XTS_CTX *xctx = EVP_C_DATA(EVP_AES_XTS_CTX,ctx);
+ EVP_AES_XTS_CTX *xctx = EVP_C_DATA(EVP_AES_XTS_CTX, ctx);
if (iv == NULL && key == NULL)
return 1;
@@ -290,7 +288,7 @@ static int aesni_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
* See comment in aes_xts_init_key() below.
*/
if ((!allow_insecure_decrypt || enc)
- && CRYPTO_memcmp(key, key + bytes, bytes) == 0) {
+ && CRYPTO_memcmp(key, key + bytes, bytes) == 0) {
ERR_raise(ERR_LIB_EVP, EVP_R_XTS_DUPLICATED_KEYS);
return 0;
}
@@ -298,16 +296,16 @@ static int aesni_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
/* key_len is two AES keys */
if (enc) {
aesni_set_encrypt_key(key, bits, &xctx->ks1.ks);
- xctx->xts.block1 = (block128_f) aesni_encrypt;
+ xctx->xts.block1 = (block128_f)aesni_encrypt;
xctx->stream = aesni_xts_encrypt;
} else {
aesni_set_decrypt_key(key, bits, &xctx->ks1.ks);
- xctx->xts.block1 = (block128_f) aesni_decrypt;
+ xctx->xts.block1 = (block128_f)aesni_decrypt;
xctx->stream = aesni_xts_decrypt;
}
aesni_set_encrypt_key(key + bytes, bits, &xctx->ks2.ks);
- xctx->xts.block2 = (block128_f) aesni_encrypt;
+ xctx->xts.block2 = (block128_f)aesni_encrypt;
xctx->xts.key1 = &xctx->ks1;
}
@@ -320,14 +318,14 @@ static int aesni_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
return 1;
}
-# define aesni_xts_cipher aes_xts_cipher
+#define aesni_xts_cipher aes_xts_cipher
static int aesni_xts_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len);
+ const unsigned char *in, size_t len);
static int aesni_ccm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc)
+ const unsigned char *iv, int enc)
{
- EVP_AES_CCM_CTX *cctx = EVP_C_DATA(EVP_AES_CCM_CTX,ctx);
+ EVP_AES_CCM_CTX *cctx = EVP_C_DATA(EVP_AES_CCM_CTX, ctx);
if (iv == NULL && key == NULL)
return 1;
@@ -341,9 +339,8 @@ static int aesni_ccm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
}
aesni_set_encrypt_key(key, keylen, &cctx->ks.ks);
CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L,
- &cctx->ks, (block128_f) aesni_encrypt);
- cctx->str = enc ? (ccm128_f) aesni_ccm64_encrypt_blocks :
- (ccm128_f) aesni_ccm64_decrypt_blocks;
+ &cctx->ks, (block128_f)aesni_encrypt);
+ cctx->str = enc ? (ccm128_f)aesni_ccm64_encrypt_blocks : (ccm128_f)aesni_ccm64_decrypt_blocks;
cctx->key_set = 1;
}
if (iv) {
@@ -353,15 +350,15 @@ static int aesni_ccm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
return 1;
}
-# define aesni_ccm_cipher aes_ccm_cipher
+#define aesni_ccm_cipher aes_ccm_cipher
static int aesni_ccm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len);
+ const unsigned char *in, size_t len);
-# ifndef OPENSSL_NO_OCB
+#ifndef OPENSSL_NO_OCB
static int aesni_ocb_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc)
+ const unsigned char *iv, int enc)
{
- EVP_AES_OCB_CTX *octx = EVP_C_DATA(EVP_AES_OCB_CTX,ctx);
+ EVP_AES_OCB_CTX *octx = EVP_C_DATA(EVP_AES_OCB_CTX, ctx);
if (iv == NULL && key == NULL)
return 1;
@@ -382,14 +379,13 @@ static int aesni_ocb_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
aesni_set_encrypt_key(key, keylen, &octx->ksenc.ks);
aesni_set_decrypt_key(key, keylen, &octx->ksdec.ks);
if (!CRYPTO_ocb128_init(&octx->ocb,
- &octx->ksenc.ks, &octx->ksdec.ks,
- (block128_f) aesni_encrypt,
- (block128_f) aesni_decrypt,
- enc ? aesni_ocb_encrypt
- : aesni_ocb_decrypt))
+ &octx->ksenc.ks, &octx->ksdec.ks,
+ (block128_f)aesni_encrypt,
+ (block128_f)aesni_decrypt,
+ enc ? aesni_ocb_encrypt
+ : aesni_ocb_decrypt))
return 0;
- }
- while (0);
+ } while (0);
/*
* If we have an iv we can set it directly, otherwise use saved IV.
@@ -414,67 +410,75 @@ static int aesni_ocb_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
return 1;
}
-# define aesni_ocb_cipher aes_ocb_cipher
+#define aesni_ocb_cipher aes_ocb_cipher
static int aesni_ocb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len);
-# endif /* OPENSSL_NO_OCB */
-
-# define BLOCK_CIPHER_generic(nid,keylen,blocksize,ivlen,nmode,mode,MODE,flags) \
-static const EVP_CIPHER aesni_##keylen##_##mode = { \
- nid##_##keylen##_##nmode,blocksize,keylen/8,ivlen, \
- flags|EVP_CIPH_##MODE##_MODE, \
- EVP_ORIG_GLOBAL, \
- aesni_init_key, \
- aesni_##mode##_cipher, \
- NULL, \
- sizeof(EVP_AES_KEY), \
- NULL,NULL,NULL,NULL }; \
-static const EVP_CIPHER aes_##keylen##_##mode = { \
- nid##_##keylen##_##nmode,blocksize, \
- keylen/8,ivlen, \
- flags|EVP_CIPH_##MODE##_MODE, \
- EVP_ORIG_GLOBAL, \
- aes_init_key, \
- aes_##mode##_cipher, \
- NULL, \
- sizeof(EVP_AES_KEY), \
- NULL,NULL,NULL,NULL }; \
-const EVP_CIPHER *EVP_aes_##keylen##_##mode(void) \
-{ return AESNI_CAPABLE?&aesni_##keylen##_##mode:&aes_##keylen##_##mode; }
-
-# define BLOCK_CIPHER_custom(nid,keylen,blocksize,ivlen,mode,MODE,flags) \
-static const EVP_CIPHER aesni_##keylen##_##mode = { \
- nid##_##keylen##_##mode,blocksize, \
- (EVP_CIPH_##MODE##_MODE==EVP_CIPH_XTS_MODE||EVP_CIPH_##MODE##_MODE==EVP_CIPH_SIV_MODE?2:1)*keylen/8, \
- ivlen, \
- flags|EVP_CIPH_##MODE##_MODE, \
- EVP_ORIG_GLOBAL, \
- aesni_##mode##_init_key, \
- aesni_##mode##_cipher, \
- aes_##mode##_cleanup, \
- sizeof(EVP_AES_##MODE##_CTX), \
- NULL,NULL,aes_##mode##_ctrl,NULL }; \
-static const EVP_CIPHER aes_##keylen##_##mode = { \
- nid##_##keylen##_##mode,blocksize, \
- (EVP_CIPH_##MODE##_MODE==EVP_CIPH_XTS_MODE||EVP_CIPH_##MODE##_MODE==EVP_CIPH_SIV_MODE?2:1)*keylen/8, \
- ivlen, \
- flags|EVP_CIPH_##MODE##_MODE, \
- EVP_ORIG_GLOBAL, \
- aes_##mode##_init_key, \
- aes_##mode##_cipher, \
- aes_##mode##_cleanup, \
- sizeof(EVP_AES_##MODE##_CTX), \
- NULL,NULL,aes_##mode##_ctrl,NULL }; \
-const EVP_CIPHER *EVP_aes_##keylen##_##mode(void) \
-{ return AESNI_CAPABLE?&aesni_##keylen##_##mode:&aes_##keylen##_##mode; }
+ const unsigned char *in, size_t len);
+#endif /* OPENSSL_NO_OCB */
+
+#define BLOCK_CIPHER_generic(nid, keylen, blocksize, ivlen, nmode, mode, MODE, flags) \
+ static const EVP_CIPHER aesni_##keylen##_##mode = { \
+ nid##_##keylen##_##nmode, blocksize, keylen / 8, ivlen, \
+ flags | EVP_CIPH_##MODE##_MODE, \
+ EVP_ORIG_GLOBAL, \
+ aesni_init_key, \
+ aesni_##mode##_cipher, \
+ NULL, \
+ sizeof(EVP_AES_KEY), \
+ NULL, NULL, NULL, NULL \
+ }; \
+ static const EVP_CIPHER aes_##keylen##_##mode = { \
+ nid##_##keylen##_##nmode, blocksize, \
+ keylen / 8, ivlen, \
+ flags | EVP_CIPH_##MODE##_MODE, \
+ EVP_ORIG_GLOBAL, \
+ aes_init_key, \
+ aes_##mode##_cipher, \
+ NULL, \
+ sizeof(EVP_AES_KEY), \
+ NULL, NULL, NULL, NULL \
+ }; \
+ const EVP_CIPHER *EVP_aes_##keylen##_##mode(void) \
+ { \
+ return AESNI_CAPABLE ? &aesni_##keylen##_##mode : &aes_##keylen##_##mode; \
+ }
+
+#define BLOCK_CIPHER_custom(nid, keylen, blocksize, ivlen, mode, MODE, flags) \
+ static const EVP_CIPHER aesni_##keylen##_##mode = { \
+ nid##_##keylen##_##mode, blocksize, \
+ (EVP_CIPH_##MODE##_MODE == EVP_CIPH_XTS_MODE || EVP_CIPH_##MODE##_MODE == EVP_CIPH_SIV_MODE ? 2 : 1) * keylen / 8, \
+ ivlen, \
+ flags | EVP_CIPH_##MODE##_MODE, \
+ EVP_ORIG_GLOBAL, \
+ aesni_##mode##_init_key, \
+ aesni_##mode##_cipher, \
+ aes_##mode##_cleanup, \
+ sizeof(EVP_AES_##MODE##_CTX), \
+ NULL, NULL, aes_##mode##_ctrl, NULL \
+ }; \
+ static const EVP_CIPHER aes_##keylen##_##mode = { \
+ nid##_##keylen##_##mode, blocksize, \
+ (EVP_CIPH_##MODE##_MODE == EVP_CIPH_XTS_MODE || EVP_CIPH_##MODE##_MODE == EVP_CIPH_SIV_MODE ? 2 : 1) * keylen / 8, \
+ ivlen, \
+ flags | EVP_CIPH_##MODE##_MODE, \
+ EVP_ORIG_GLOBAL, \
+ aes_##mode##_init_key, \
+ aes_##mode##_cipher, \
+ aes_##mode##_cleanup, \
+ sizeof(EVP_AES_##MODE##_CTX), \
+ NULL, NULL, aes_##mode##_ctrl, NULL \
+ }; \
+ const EVP_CIPHER *EVP_aes_##keylen##_##mode(void) \
+ { \
+ return AESNI_CAPABLE ? &aesni_##keylen##_##mode : &aes_##keylen##_##mode; \
+ }
#elif defined(SPARC_AES_CAPABLE)
static int aes_t4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc)
+ const unsigned char *iv, int enc)
{
int ret, mode, bits;
- EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY,ctx);
+ EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY, ctx);
mode = EVP_CIPHER_CTX_get_mode(ctx);
bits = EVP_CIPHER_CTX_get_key_length(ctx) * 8;
@@ -486,19 +490,16 @@ static int aes_t4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
&& !enc) {
ret = 0;
aes_t4_set_decrypt_key(key, bits, &dat->ks.ks);
- dat->block = (block128_f) aes_t4_decrypt;
+ dat->block = (block128_f)aes_t4_decrypt;
switch (bits) {
case 128:
- dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ?
- (cbc128_f) aes128_t4_cbc_decrypt : NULL;
+ dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ? (cbc128_f)aes128_t4_cbc_decrypt : NULL;
break;
case 192:
- dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ?
- (cbc128_f) aes192_t4_cbc_decrypt : NULL;
+ dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ? (cbc128_f)aes192_t4_cbc_decrypt : NULL;
break;
case 256:
- dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ?
- (cbc128_f) aes256_t4_cbc_decrypt : NULL;
+ dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ? (cbc128_f)aes256_t4_cbc_decrypt : NULL;
break;
default:
ret = -1;
@@ -506,29 +507,29 @@ static int aes_t4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
} else {
ret = 0;
aes_t4_set_encrypt_key(key, bits, &dat->ks.ks);
- dat->block = (block128_f) aes_t4_encrypt;
+ dat->block = (block128_f)aes_t4_encrypt;
switch (bits) {
case 128:
if (mode == EVP_CIPH_CBC_MODE)
- dat->stream.cbc = (cbc128_f) aes128_t4_cbc_encrypt;
+ dat->stream.cbc = (cbc128_f)aes128_t4_cbc_encrypt;
else if (mode == EVP_CIPH_CTR_MODE)
- dat->stream.ctr = (ctr128_f) aes128_t4_ctr32_encrypt;
+ dat->stream.ctr = (ctr128_f)aes128_t4_ctr32_encrypt;
else
dat->stream.cbc = NULL;
break;
case 192:
if (mode == EVP_CIPH_CBC_MODE)
- dat->stream.cbc = (cbc128_f) aes192_t4_cbc_encrypt;
+ dat->stream.cbc = (cbc128_f)aes192_t4_cbc_encrypt;
else if (mode == EVP_CIPH_CTR_MODE)
- dat->stream.ctr = (ctr128_f) aes192_t4_ctr32_encrypt;
+ dat->stream.ctr = (ctr128_f)aes192_t4_ctr32_encrypt;
else
dat->stream.cbc = NULL;
break;
case 256:
if (mode == EVP_CIPH_CBC_MODE)
- dat->stream.cbc = (cbc128_f) aes256_t4_cbc_encrypt;
+ dat->stream.cbc = (cbc128_f)aes256_t4_cbc_encrypt;
else if (mode == EVP_CIPH_CTR_MODE)
- dat->stream.ctr = (ctr128_f) aes256_t4_ctr32_encrypt;
+ dat->stream.ctr = (ctr128_f)aes256_t4_ctr32_encrypt;
else
dat->stream.cbc = NULL;
break;
@@ -545,38 +546,38 @@ static int aes_t4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
return 1;
}
-# define aes_t4_cbc_cipher aes_cbc_cipher
+#define aes_t4_cbc_cipher aes_cbc_cipher
static int aes_t4_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len);
+ const unsigned char *in, size_t len);
-# define aes_t4_ecb_cipher aes_ecb_cipher
+#define aes_t4_ecb_cipher aes_ecb_cipher
static int aes_t4_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len);
+ const unsigned char *in, size_t len);
-# define aes_t4_ofb_cipher aes_ofb_cipher
+#define aes_t4_ofb_cipher aes_ofb_cipher
static int aes_t4_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len);
+ const unsigned char *in, size_t len);
-# define aes_t4_cfb_cipher aes_cfb_cipher
+#define aes_t4_cfb_cipher aes_cfb_cipher
static int aes_t4_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len);
+ const unsigned char *in, size_t len);
-# define aes_t4_cfb8_cipher aes_cfb8_cipher
+#define aes_t4_cfb8_cipher aes_cfb8_cipher
static int aes_t4_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len);
+ const unsigned char *in, size_t len);
-# define aes_t4_cfb1_cipher aes_cfb1_cipher
+#define aes_t4_cfb1_cipher aes_cfb1_cipher
static int aes_t4_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len);
+ const unsigned char *in, size_t len);
-# define aes_t4_ctr_cipher aes_ctr_cipher
+#define aes_t4_ctr_cipher aes_ctr_cipher
static int aes_t4_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len);
+ const unsigned char *in, size_t len);
static int aes_t4_gcm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc)
+ const unsigned char *iv, int enc)
{
- EVP_AES_GCM_CTX *gctx = EVP_C_DATA(EVP_AES_GCM_CTX,ctx);
+ EVP_AES_GCM_CTX *gctx = EVP_C_DATA(EVP_AES_GCM_CTX, ctx);
if (iv == NULL && key == NULL)
return 1;
@@ -589,16 +590,16 @@ static int aes_t4_gcm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
}
aes_t4_set_encrypt_key(key, bits, &gctx->ks.ks);
CRYPTO_gcm128_init(&gctx->gcm, &gctx->ks,
- (block128_f) aes_t4_encrypt);
+ (block128_f)aes_t4_encrypt);
switch (bits) {
case 128:
- gctx->ctr = (ctr128_f) aes128_t4_ctr32_encrypt;
+ gctx->ctr = (ctr128_f)aes128_t4_ctr32_encrypt;
break;
case 192:
- gctx->ctr = (ctr128_f) aes192_t4_ctr32_encrypt;
+ gctx->ctr = (ctr128_f)aes192_t4_ctr32_encrypt;
break;
case 256:
- gctx->ctr = (ctr128_f) aes256_t4_ctr32_encrypt;
+ gctx->ctr = (ctr128_f)aes256_t4_ctr32_encrypt;
break;
default:
return 0;
@@ -625,14 +626,14 @@ static int aes_t4_gcm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
return 1;
}
-# define aes_t4_gcm_cipher aes_gcm_cipher
+#define aes_t4_gcm_cipher aes_gcm_cipher
static int aes_t4_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len);
+ const unsigned char *in, size_t len);
static int aes_t4_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc)
+ const unsigned char *iv, int enc)
{
- EVP_AES_XTS_CTX *xctx = EVP_C_DATA(EVP_AES_XTS_CTX,ctx);
+ EVP_AES_XTS_CTX *xctx = EVP_C_DATA(EVP_AES_XTS_CTX, ctx);
if (!iv && !key)
return 1;
@@ -654,7 +655,7 @@ static int aes_t4_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
* See comment in aes_xts_init_key() below.
*/
if ((!allow_insecure_decrypt || enc)
- && CRYPTO_memcmp(key, key + bytes, bytes) == 0) {
+ && CRYPTO_memcmp(key, key + bytes, bytes) == 0) {
ERR_raise(ERR_LIB_EVP, EVP_R_XTS_DUPLICATED_KEYS);
return 0;
}
@@ -663,7 +664,7 @@ static int aes_t4_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
/* key_len is two AES keys */
if (enc) {
aes_t4_set_encrypt_key(key, bits, &xctx->ks1.ks);
- xctx->xts.block1 = (block128_f) aes_t4_encrypt;
+ xctx->xts.block1 = (block128_f)aes_t4_encrypt;
switch (bits) {
case 128:
xctx->stream = aes128_t4_xts_encrypt;
@@ -676,7 +677,7 @@ static int aes_t4_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
}
} else {
aes_t4_set_decrypt_key(key, bits, &xctx->ks1.ks);
- xctx->xts.block1 = (block128_f) aes_t4_decrypt;
+ xctx->xts.block1 = (block128_f)aes_t4_decrypt;
switch (bits) {
case 128:
xctx->stream = aes128_t4_xts_decrypt;
@@ -690,7 +691,7 @@ static int aes_t4_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
}
aes_t4_set_encrypt_key(key + bytes, bits, &xctx->ks2.ks);
- xctx->xts.block2 = (block128_f) aes_t4_encrypt;
+ xctx->xts.block2 = (block128_f)aes_t4_encrypt;
xctx->xts.key1 = &xctx->ks1;
}
@@ -703,14 +704,14 @@ static int aes_t4_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
return 1;
}
-# define aes_t4_xts_cipher aes_xts_cipher
+#define aes_t4_xts_cipher aes_xts_cipher
static int aes_t4_xts_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len);
+ const unsigned char *in, size_t len);
static int aes_t4_ccm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc)
+ const unsigned char *iv, int enc)
{
- EVP_AES_CCM_CTX *cctx = EVP_C_DATA(EVP_AES_CCM_CTX,ctx);
+ EVP_AES_CCM_CTX *cctx = EVP_C_DATA(EVP_AES_CCM_CTX, ctx);
if (iv == NULL && key == NULL)
return 1;
@@ -724,7 +725,7 @@ static int aes_t4_ccm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
}
aes_t4_set_encrypt_key(key, bits, &cctx->ks.ks);
CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L,
- &cctx->ks, (block128_f) aes_t4_encrypt);
+ &cctx->ks, (block128_f)aes_t4_encrypt);
cctx->str = NULL;
cctx->key_set = 1;
}
@@ -735,15 +736,15 @@ static int aes_t4_ccm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
return 1;
}
-# define aes_t4_ccm_cipher aes_ccm_cipher
+#define aes_t4_ccm_cipher aes_ccm_cipher
static int aes_t4_ccm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len);
+ const unsigned char *in, size_t len);
-# ifndef OPENSSL_NO_OCB
+#ifndef OPENSSL_NO_OCB
static int aes_t4_ocb_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc)
+ const unsigned char *iv, int enc)
{
- EVP_AES_OCB_CTX *octx = EVP_C_DATA(EVP_AES_OCB_CTX,ctx);
+ EVP_AES_OCB_CTX *octx = EVP_C_DATA(EVP_AES_OCB_CTX, ctx);
if (iv == NULL && key == NULL)
return 1;
@@ -764,13 +765,12 @@ static int aes_t4_ocb_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
aes_t4_set_encrypt_key(key, keylen, &octx->ksenc.ks);
aes_t4_set_decrypt_key(key, keylen, &octx->ksdec.ks);
if (!CRYPTO_ocb128_init(&octx->ocb,
- &octx->ksenc.ks, &octx->ksdec.ks,
- (block128_f) aes_t4_encrypt,
- (block128_f) aes_t4_decrypt,
- NULL))
+ &octx->ksenc.ks, &octx->ksdec.ks,
+ (block128_f)aes_t4_encrypt,
+ (block128_f)aes_t4_decrypt,
+ NULL))
return 0;
- }
- while (0);
+ } while (0);
/*
* If we have an iv we can set it directly, otherwise use saved IV.
@@ -795,64 +795,72 @@ static int aes_t4_ocb_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
return 1;
}
-# define aes_t4_ocb_cipher aes_ocb_cipher
+#define aes_t4_ocb_cipher aes_ocb_cipher
static int aes_t4_ocb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len);
-# endif /* OPENSSL_NO_OCB */
-
-# ifndef OPENSSL_NO_SIV
-# define aes_t4_siv_init_key aes_siv_init_key
-# define aes_t4_siv_cipher aes_siv_cipher
-# endif /* OPENSSL_NO_SIV */
-
-# define BLOCK_CIPHER_generic(nid,keylen,blocksize,ivlen,nmode,mode,MODE,flags) \
-static const EVP_CIPHER aes_t4_##keylen##_##mode = { \
- nid##_##keylen##_##nmode,blocksize,keylen/8,ivlen, \
- flags|EVP_CIPH_##MODE##_MODE, \
- EVP_ORIG_GLOBAL, \
- aes_t4_init_key, \
- aes_t4_##mode##_cipher, \
- NULL, \
- sizeof(EVP_AES_KEY), \
- NULL,NULL,NULL,NULL }; \
-static const EVP_CIPHER aes_##keylen##_##mode = { \
- nid##_##keylen##_##nmode,blocksize, \
- keylen/8,ivlen, \
- flags|EVP_CIPH_##MODE##_MODE, \
- EVP_ORIG_GLOBAL, \
- aes_init_key, \
- aes_##mode##_cipher, \
- NULL, \
- sizeof(EVP_AES_KEY), \
- NULL,NULL,NULL,NULL }; \
-const EVP_CIPHER *EVP_aes_##keylen##_##mode(void) \
-{ return SPARC_AES_CAPABLE?&aes_t4_##keylen##_##mode:&aes_##keylen##_##mode; }
-
-# define BLOCK_CIPHER_custom(nid,keylen,blocksize,ivlen,mode,MODE,flags) \
-static const EVP_CIPHER aes_t4_##keylen##_##mode = { \
- nid##_##keylen##_##mode,blocksize, \
- (EVP_CIPH_##MODE##_MODE==EVP_CIPH_XTS_MODE||EVP_CIPH_##MODE##_MODE==EVP_CIPH_SIV_MODE?2:1)*keylen/8, \
- ivlen, \
- flags|EVP_CIPH_##MODE##_MODE, \
- EVP_ORIG_GLOBAL, \
- aes_t4_##mode##_init_key, \
- aes_t4_##mode##_cipher, \
- aes_##mode##_cleanup, \
- sizeof(EVP_AES_##MODE##_CTX), \
- NULL,NULL,aes_##mode##_ctrl,NULL }; \
-static const EVP_CIPHER aes_##keylen##_##mode = { \
- nid##_##keylen##_##mode,blocksize, \
- (EVP_CIPH_##MODE##_MODE==EVP_CIPH_XTS_MODE||EVP_CIPH_##MODE##_MODE==EVP_CIPH_SIV_MODE?2:1)*keylen/8, \
- ivlen, \
- flags|EVP_CIPH_##MODE##_MODE, \
- EVP_ORIG_GLOBAL, \
- aes_##mode##_init_key, \
- aes_##mode##_cipher, \
- aes_##mode##_cleanup, \
- sizeof(EVP_AES_##MODE##_CTX), \
- NULL,NULL,aes_##mode##_ctrl,NULL }; \
-const EVP_CIPHER *EVP_aes_##keylen##_##mode(void) \
-{ return SPARC_AES_CAPABLE?&aes_t4_##keylen##_##mode:&aes_##keylen##_##mode; }
+ const unsigned char *in, size_t len);
+#endif /* OPENSSL_NO_OCB */
+
+#ifndef OPENSSL_NO_SIV
+#define aes_t4_siv_init_key aes_siv_init_key
+#define aes_t4_siv_cipher aes_siv_cipher
+#endif /* OPENSSL_NO_SIV */
+
+#define BLOCK_CIPHER_generic(nid, keylen, blocksize, ivlen, nmode, mode, MODE, flags) \
+ static const EVP_CIPHER aes_t4_##keylen##_##mode = { \
+ nid##_##keylen##_##nmode, blocksize, keylen / 8, ivlen, \
+ flags | EVP_CIPH_##MODE##_MODE, \
+ EVP_ORIG_GLOBAL, \
+ aes_t4_init_key, \
+ aes_t4_##mode##_cipher, \
+ NULL, \
+ sizeof(EVP_AES_KEY), \
+ NULL, NULL, NULL, NULL \
+ }; \
+ static const EVP_CIPHER aes_##keylen##_##mode = { \
+ nid##_##keylen##_##nmode, blocksize, \
+ keylen / 8, ivlen, \
+ flags | EVP_CIPH_##MODE##_MODE, \
+ EVP_ORIG_GLOBAL, \
+ aes_init_key, \
+ aes_##mode##_cipher, \
+ NULL, \
+ sizeof(EVP_AES_KEY), \
+ NULL, NULL, NULL, NULL \
+ }; \
+ const EVP_CIPHER *EVP_aes_##keylen##_##mode(void) \
+ { \
+ return SPARC_AES_CAPABLE ? &aes_t4_##keylen##_##mode : &aes_##keylen##_##mode; \
+ }
+
+#define BLOCK_CIPHER_custom(nid, keylen, blocksize, ivlen, mode, MODE, flags) \
+ static const EVP_CIPHER aes_t4_##keylen##_##mode = { \
+ nid##_##keylen##_##mode, blocksize, \
+ (EVP_CIPH_##MODE##_MODE == EVP_CIPH_XTS_MODE || EVP_CIPH_##MODE##_MODE == EVP_CIPH_SIV_MODE ? 2 : 1) * keylen / 8, \
+ ivlen, \
+ flags | EVP_CIPH_##MODE##_MODE, \
+ EVP_ORIG_GLOBAL, \
+ aes_t4_##mode##_init_key, \
+ aes_t4_##mode##_cipher, \
+ aes_##mode##_cleanup, \
+ sizeof(EVP_AES_##MODE##_CTX), \
+ NULL, NULL, aes_##mode##_ctrl, NULL \
+ }; \
+ static const EVP_CIPHER aes_##keylen##_##mode = { \
+ nid##_##keylen##_##mode, blocksize, \
+ (EVP_CIPH_##MODE##_MODE == EVP_CIPH_XTS_MODE || EVP_CIPH_##MODE##_MODE == EVP_CIPH_SIV_MODE ? 2 : 1) * keylen / 8, \
+ ivlen, \
+ flags | EVP_CIPH_##MODE##_MODE, \
+ EVP_ORIG_GLOBAL, \
+ aes_##mode##_init_key, \
+ aes_##mode##_cipher, \
+ aes_##mode##_cleanup, \
+ sizeof(EVP_AES_##MODE##_CTX), \
+ NULL, NULL, aes_##mode##_ctrl, NULL \
+ }; \
+ const EVP_CIPHER *EVP_aes_##keylen##_##mode(void) \
+ { \
+ return SPARC_AES_CAPABLE ? &aes_t4_##keylen##_##mode : &aes_##keylen##_##mode; \
+ }
#elif defined(S390X_aes_128_CAPABLE)
/* IBM S390X support */
@@ -949,7 +957,7 @@ typedef struct {
int kreslen;
int tls_aad_len;
- uint64_t tls_enc_records; /* Number of TLS records encrypted */
+ uint64_t tls_enc_records; /* Number of TLS records encrypted */
} S390X_AES_GCM_CTX;
typedef struct {
@@ -1004,21 +1012,21 @@ typedef struct {
} aes;
} S390X_AES_CCM_CTX;
-# define s390x_aes_init_key aes_init_key
+#define s390x_aes_init_key aes_init_key
static int s390x_aes_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc);
+ const unsigned char *iv, int enc);
-# define S390X_AES_CBC_CTX EVP_AES_KEY
+#define S390X_AES_CBC_CTX EVP_AES_KEY
-# define s390x_aes_cbc_init_key aes_init_key
+#define s390x_aes_cbc_init_key aes_init_key
-# define s390x_aes_cbc_cipher aes_cbc_cipher
+#define s390x_aes_cbc_cipher aes_cbc_cipher
static int s390x_aes_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len);
+ const unsigned char *in, size_t len);
static int s390x_aes_ecb_init_key(EVP_CIPHER_CTX *ctx,
- const unsigned char *key,
- const unsigned char *iv, int enc)
+ const unsigned char *key,
+ const unsigned char *iv, int enc)
{
S390X_AES_ECB_CTX *cctx = EVP_C_DATA(S390X_AES_ECB_CTX, ctx);
const int keylen = EVP_CIPHER_CTX_get_key_length(ctx);
@@ -1036,7 +1044,7 @@ static int s390x_aes_ecb_init_key(EVP_CIPHER_CTX *ctx,
}
static int s390x_aes_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len)
+ const unsigned char *in, size_t len)
{
S390X_AES_ECB_CTX *cctx = EVP_C_DATA(S390X_AES_ECB_CTX, ctx);
@@ -1045,8 +1053,8 @@ static int s390x_aes_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
}
static int s390x_aes_ofb_init_key(EVP_CIPHER_CTX *ctx,
- const unsigned char *key,
- const unsigned char *ivec, int enc)
+ const unsigned char *key,
+ const unsigned char *ivec, int enc)
{
S390X_AES_OFB_CTX *cctx = EVP_C_DATA(S390X_AES_OFB_CTX, ctx);
const unsigned char *iv = ctx->oiv;
@@ -1068,7 +1076,7 @@ static int s390x_aes_ofb_init_key(EVP_CIPHER_CTX *ctx,
}
static int s390x_aes_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len)
+ const unsigned char *in, size_t len)
{
S390X_AES_OFB_CTX *cctx = EVP_C_DATA(S390X_AES_OFB_CTX, ctx);
const int ivlen = EVP_CIPHER_CTX_get_iv_length(ctx);
@@ -1097,7 +1105,7 @@ static int s390x_aes_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
if (rem) {
s390x_km(cctx->kmo.param.cv, 16, cctx->kmo.param.cv, cctx->fc,
- cctx->kmo.param.k);
+ cctx->kmo.param.k);
while (rem--) {
out[n] = in[n] ^ cctx->kmo.param.cv[n];
@@ -1111,8 +1119,8 @@ static int s390x_aes_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
}
static int s390x_aes_cfb_init_key(EVP_CIPHER_CTX *ctx,
- const unsigned char *key,
- const unsigned char *ivec, int enc)
+ const unsigned char *key,
+ const unsigned char *ivec, int enc)
{
S390X_AES_CFB_CTX *cctx = EVP_C_DATA(S390X_AES_CFB_CTX, ctx);
const unsigned char *iv = ctx->oiv;
@@ -1128,7 +1136,7 @@ static int s390x_aes_cfb_init_key(EVP_CIPHER_CTX *ctx,
return 0;
}
cctx->fc = S390X_AES_FC(keylen);
- cctx->fc |= 16 << 24; /* 16 bytes cipher feedback */
+ cctx->fc |= 16 << 24; /* 16 bytes cipher feedback */
if (!enc)
cctx->fc |= S390X_DECRYPT;
@@ -1138,7 +1146,7 @@ static int s390x_aes_cfb_init_key(EVP_CIPHER_CTX *ctx,
}
static int s390x_aes_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len)
+ const unsigned char *in, size_t len)
{
S390X_AES_CFB_CTX *cctx = EVP_C_DATA(S390X_AES_CFB_CTX, ctx);
const int keylen = EVP_CIPHER_CTX_get_key_length(ctx);
@@ -1180,7 +1188,7 @@ static int s390x_aes_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
if (rem) {
s390x_km(cctx->kmf.param.cv, 16, cctx->kmf.param.cv,
- S390X_AES_FC(keylen), cctx->kmf.param.k);
+ S390X_AES_FC(keylen), cctx->kmf.param.k);
while (rem--) {
tmp = in[n];
@@ -1196,8 +1204,8 @@ static int s390x_aes_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
}
static int s390x_aes_cfb8_init_key(EVP_CIPHER_CTX *ctx,
- const unsigned char *key,
- const unsigned char *ivec, int enc)
+ const unsigned char *key,
+ const unsigned char *ivec, int enc)
{
S390X_AES_CFB_CTX *cctx = EVP_C_DATA(S390X_AES_CFB_CTX, ctx);
const unsigned char *iv = ctx->oiv;
@@ -1213,7 +1221,7 @@ static int s390x_aes_cfb8_init_key(EVP_CIPHER_CTX *ctx,
return 0;
}
cctx->fc = S390X_AES_FC(keylen);
- cctx->fc |= 1 << 24; /* 1 byte cipher feedback */
+ cctx->fc |= 1 << 24; /* 1 byte cipher feedback */
if (!enc)
cctx->fc |= S390X_DECRYPT;
@@ -1223,7 +1231,7 @@ static int s390x_aes_cfb8_init_key(EVP_CIPHER_CTX *ctx,
}
static int s390x_aes_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len)
+ const unsigned char *in, size_t len)
{
S390X_AES_CFB_CTX *cctx = EVP_C_DATA(S390X_AES_CFB_CTX, ctx);
const int ivlen = EVP_CIPHER_CTX_get_iv_length(ctx);
@@ -1235,29 +1243,29 @@ static int s390x_aes_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
return 1;
}
-# define s390x_aes_cfb1_init_key aes_init_key
+#define s390x_aes_cfb1_init_key aes_init_key
-# define s390x_aes_cfb1_cipher aes_cfb1_cipher
+#define s390x_aes_cfb1_cipher aes_cfb1_cipher
static int s390x_aes_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len);
+ const unsigned char *in, size_t len);
-# define S390X_AES_CTR_CTX EVP_AES_KEY
+#define S390X_AES_CTR_CTX EVP_AES_KEY
-# define s390x_aes_ctr_init_key aes_init_key
+#define s390x_aes_ctr_init_key aes_init_key
-# define s390x_aes_ctr_cipher aes_ctr_cipher
+#define s390x_aes_ctr_cipher aes_ctr_cipher
static int s390x_aes_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len);
+ const unsigned char *in, size_t len);
/* iv + padding length for iv lengths != 12 */
-# define S390X_gcm_ivpadlen(i) ((((i) + 15) >> 4 << 4) + 16)
+#define S390X_gcm_ivpadlen(i) ((((i) + 15) >> 4 << 4) + 16)
/*-
* Process additional authenticated data. Returns 0 on success. Code is
* big-endian.
*/
static int s390x_aes_gcm_aad(S390X_AES_GCM_CTX *ctx, const unsigned char *aad,
- size_t len)
+ size_t len)
{
unsigned long long alen;
int n, rem;
@@ -1311,7 +1319,7 @@ static int s390x_aes_gcm_aad(S390X_AES_GCM_CTX *ctx, const unsigned char *aad,
* success. Code is big-endian.
*/
static int s390x_aes_gcm(S390X_AES_GCM_CTX *ctx, const unsigned char *in,
- unsigned char *out, size_t len)
+ unsigned char *out, size_t len)
{
const unsigned char *inptr;
unsigned long long mlen;
@@ -1340,7 +1348,7 @@ static int s390x_aes_gcm(S390X_AES_GCM_CTX *ctx, const unsigned char *in,
/* ctx->mres contains a complete block if offset has wrapped around */
if (!n) {
s390x_kma(ctx->ares, ctx->areslen, ctx->mres, 16, buf.b,
- ctx->fc | S390X_KMA_LAAD, &ctx->kma.param);
+ ctx->fc | S390X_KMA_LAAD, &ctx->kma.param);
ctx->fc |= S390X_KMA_HS;
ctx->areslen = 0;
@@ -1363,7 +1371,7 @@ static int s390x_aes_gcm(S390X_AES_GCM_CTX *ctx, const unsigned char *in,
len &= ~(size_t)0xf;
if (len) {
s390x_kma(ctx->ares, ctx->areslen, in, len, out,
- ctx->fc | S390X_KMA_LAAD, &ctx->kma.param);
+ ctx->fc | S390X_KMA_LAAD, &ctx->kma.param);
in += len;
out += len;
ctx->fc |= S390X_KMA_HS;
@@ -1399,7 +1407,7 @@ static int s390x_aes_gcm(S390X_AES_GCM_CTX *ctx, const unsigned char *in,
* Initialize context structure. Code is big-endian.
*/
static void s390x_aes_gcm_setiv(S390X_AES_GCM_CTX *ctx,
- const unsigned char *iv)
+ const unsigned char *iv)
{
ctx->kma.param.t.g[0] = 0;
ctx->kma.param.t.g[1] = 0;
@@ -1417,7 +1425,7 @@ static void s390x_aes_gcm_setiv(S390X_AES_GCM_CTX *ctx,
/* ctx->iv has the right size and is already padded. */
memcpy(ctx->iv, iv, ctx->ivlen);
s390x_kma(ctx->iv, S390X_gcm_ivpadlen(ctx->ivlen), NULL, 0, NULL,
- ctx->fc, &ctx->kma.param);
+ ctx->fc, &ctx->kma.param);
ctx->fc |= S390X_KMA_HS;
ctx->kma.param.j0.g[0] = ctx->kma.param.t.g[0];
@@ -1602,8 +1610,8 @@ static int s390x_aes_gcm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
* Set key and/or iv. Returns 1 on success. Otherwise 0 is returned.
*/
static int s390x_aes_gcm_init_key(EVP_CIPHER_CTX *ctx,
- const unsigned char *key,
- const unsigned char *iv, int enc)
+ const unsigned char *key,
+ const unsigned char *iv, int enc)
{
S390X_AES_GCM_CTX *gctx = EVP_C_DATA(S390X_AES_GCM_CTX, ctx);
int keylen;
@@ -1649,7 +1657,7 @@ static int s390x_aes_gcm_init_key(EVP_CIPHER_CTX *ctx,
* if successful. Otherwise -1 is returned. Code is big-endian.
*/
static int s390x_aes_gcm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len)
+ const unsigned char *in, size_t len)
{
S390X_AES_GCM_CTX *gctx = EVP_C_DATA(S390X_AES_GCM_CTX, ctx);
const unsigned char *buf = EVP_CIPHER_CTX_buf_noconst(ctx);
@@ -1670,9 +1678,9 @@ static int s390x_aes_gcm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
goto err;
}
- if (EVP_CIPHER_CTX_ctrl(ctx, enc ? EVP_CTRL_GCM_IV_GEN
- : EVP_CTRL_GCM_SET_IV_INV,
- EVP_GCM_TLS_EXPLICIT_IV_LEN, out) <= 0)
+ if (EVP_CIPHER_CTX_ctrl(ctx, enc ? EVP_CTRL_GCM_IV_GEN : EVP_CTRL_GCM_SET_IV_INV,
+ EVP_GCM_TLS_EXPLICIT_IV_LEN, out)
+ <= 0)
goto err;
in += EVP_GCM_TLS_EXPLICIT_IV_LEN;
@@ -1682,14 +1690,14 @@ static int s390x_aes_gcm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
gctx->kma.param.taadl = gctx->tls_aad_len << 3;
gctx->kma.param.tpcl = len << 3;
s390x_kma(buf, gctx->tls_aad_len, in, len, out,
- gctx->fc | S390X_KMA_LAAD | S390X_KMA_LPC, &gctx->kma.param);
+ gctx->fc | S390X_KMA_LAAD | S390X_KMA_LPC, &gctx->kma.param);
if (enc) {
memcpy(out + len, gctx->kma.param.t.b, EVP_GCM_TLS_TAG_LEN);
rv = len + EVP_GCM_TLS_EXPLICIT_IV_LEN + EVP_GCM_TLS_TAG_LEN;
} else {
if (CRYPTO_memcmp(gctx->kma.param.t.b, in + len,
- EVP_GCM_TLS_TAG_LEN)) {
+ EVP_GCM_TLS_TAG_LEN)) {
OPENSSL_cleanse(out, len);
goto err;
}
@@ -1708,7 +1716,7 @@ err:
* written on success. Otherwise -1 is returned. Code is big-endian.
*/
static int s390x_aes_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len)
+ const unsigned char *in, size_t len)
{
S390X_AES_GCM_CTX *gctx = EVP_C_DATA(S390X_AES_GCM_CTX, ctx);
unsigned char *buf, tmp[16];
@@ -1736,7 +1744,7 @@ static int s390x_aes_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
gctx->kma.param.taadl <<= 3;
gctx->kma.param.tpcl <<= 3;
s390x_kma(gctx->ares, gctx->areslen, gctx->mres, gctx->mreslen, tmp,
- gctx->fc | S390X_KMA_LAAD | S390X_KMA_LPC, &gctx->kma.param);
+ gctx->fc | S390X_KMA_LAAD | S390X_KMA_LPC, &gctx->kma.param);
/* recall that we already did en-/decrypt gctx->mres
* and returned it to caller... */
OPENSSL_cleanse(tmp, gctx->mreslen);
@@ -1771,25 +1779,25 @@ static int s390x_aes_gcm_cleanup(EVP_CIPHER_CTX *c)
return 1;
}
-# define S390X_AES_XTS_CTX EVP_AES_XTS_CTX
+#define S390X_AES_XTS_CTX EVP_AES_XTS_CTX
-# define s390x_aes_xts_init_key aes_xts_init_key
+#define s390x_aes_xts_init_key aes_xts_init_key
static int s390x_aes_xts_init_key(EVP_CIPHER_CTX *ctx,
- const unsigned char *key,
- const unsigned char *iv, int enc);
-# define s390x_aes_xts_cipher aes_xts_cipher
+ const unsigned char *key,
+ const unsigned char *iv, int enc);
+#define s390x_aes_xts_cipher aes_xts_cipher
static int s390x_aes_xts_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len);
-# define s390x_aes_xts_ctrl aes_xts_ctrl
+ const unsigned char *in, size_t len);
+#define s390x_aes_xts_ctrl aes_xts_ctrl
static int s390x_aes_xts_ctrl(EVP_CIPHER_CTX *, int type, int arg, void *ptr);
-# define s390x_aes_xts_cleanup aes_xts_cleanup
+#define s390x_aes_xts_cleanup aes_xts_cleanup
/*-
* Set nonce and length fields. Code is big-endian.
*/
static inline void s390x_aes_ccm_setiv(S390X_AES_CCM_CTX *ctx,
- const unsigned char *nonce,
- size_t mlen)
+ const unsigned char *nonce,
+ size_t mlen)
{
ctx->aes.ccm.nonce.b[0] &= ~S390X_CCM_AAD_FLAG;
ctx->aes.ccm.nonce.g[1] = mlen;
@@ -1800,7 +1808,7 @@ static inline void s390x_aes_ccm_setiv(S390X_AES_CCM_CTX *ctx,
* Process additional authenticated data. Code is big-endian.
*/
static void s390x_aes_ccm_aad(S390X_AES_CCM_CTX *ctx, const unsigned char *aad,
- size_t alen)
+ size_t alen)
{
unsigned char *ptr;
int i, rem;
@@ -1817,7 +1825,7 @@ static void s390x_aes_ccm_aad(S390X_AES_CCM_CTX *ctx, const unsigned char *aad,
*(uint16_t *)ptr = alen;
i = 2;
} else if (sizeof(alen) == 8
- && alen >= (size_t)1 << (32 % (sizeof(alen) * 8))) {
+ && alen >= (size_t)1 << (32 % (sizeof(alen) * 8))) {
*(uint16_t *)ptr = 0xffff;
*(uint64_t *)(ptr + 2) = alen;
i = 10;
@@ -1841,7 +1849,7 @@ static void s390x_aes_ccm_aad(S390X_AES_CCM_CTX *ctx, const unsigned char *aad,
ctx->aes.ccm.kmac_param.icv.g[0] = 0;
ctx->aes.ccm.kmac_param.icv.g[1] = 0;
s390x_kmac(ctx->aes.ccm.nonce.b, 32, ctx->aes.ccm.fc,
- &ctx->aes.ccm.kmac_param);
+ &ctx->aes.ccm.kmac_param);
ctx->aes.ccm.blocks += 2;
rem = alen & 0xf;
@@ -1856,8 +1864,8 @@ static void s390x_aes_ccm_aad(S390X_AES_CCM_CTX *ctx, const unsigned char *aad,
ctx->aes.ccm.kmac_param.icv.b[i] ^= aad[i];
s390x_km(ctx->aes.ccm.kmac_param.icv.b, 16,
- ctx->aes.ccm.kmac_param.icv.b, ctx->aes.ccm.fc,
- ctx->aes.ccm.kmac_param.k);
+ ctx->aes.ccm.kmac_param.icv.b, ctx->aes.ccm.fc,
+ ctx->aes.ccm.kmac_param.k);
ctx->aes.ccm.blocks++;
}
}
@@ -1867,7 +1875,7 @@ static void s390x_aes_ccm_aad(S390X_AES_CCM_CTX *ctx, const unsigned char *aad,
* success.
*/
static int s390x_aes_ccm(S390X_AES_CCM_CTX *ctx, const unsigned char *in,
- unsigned char *out, size_t len, int enc)
+ unsigned char *out, size_t len, int enc)
{
size_t n, rem;
unsigned int i, l, num;
@@ -1876,7 +1884,7 @@ static int s390x_aes_ccm(S390X_AES_CCM_CTX *ctx, const unsigned char *in,
flags = ctx->aes.ccm.nonce.b[0];
if (!(flags & S390X_CCM_AAD_FLAG)) {
s390x_km(ctx->aes.ccm.nonce.b, 16, ctx->aes.ccm.kmac_param.icv.b,
- ctx->aes.ccm.fc, ctx->aes.ccm.kmac_param.k);
+ ctx->aes.ccm.fc, ctx->aes.ccm.kmac_param.k);
ctx->aes.ccm.blocks++;
}
l = flags & 0x7;
@@ -1896,13 +1904,13 @@ static int s390x_aes_ccm(S390X_AES_CCM_CTX *ctx, const unsigned char *in,
ctx->aes.ccm.nonce.b[15] = 1;
if (n != len)
- return -1; /* length mismatch */
+ return -1; /* length mismatch */
if (enc) {
/* Two operations per block plus one for tag encryption */
ctx->aes.ccm.blocks += (((len + 15) >> 4) << 1) + 1;
if (ctx->aes.ccm.blocks > (1ULL << 61))
- return -2; /* too much data */
+ return -2; /* too much data */
}
num = 0;
@@ -1918,18 +1926,18 @@ static int s390x_aes_ccm(S390X_AES_CCM_CTX *ctx, const unsigned char *in,
ctx->aes.ccm.kmac_param.icv.b[i] ^= in[len + i];
s390x_km(ctx->aes.ccm.kmac_param.icv.b, 16,
- ctx->aes.ccm.kmac_param.icv.b, ctx->aes.ccm.fc,
- ctx->aes.ccm.kmac_param.k);
+ ctx->aes.ccm.kmac_param.icv.b, ctx->aes.ccm.fc,
+ ctx->aes.ccm.kmac_param.k);
}
CRYPTO_ctr128_encrypt_ctr32(in, out, len + rem, &ctx->aes.key.k,
- ctx->aes.ccm.nonce.b, ctx->aes.ccm.buf.b,
- &num, (ctr128_f)AES_ctr32_encrypt);
+ ctx->aes.ccm.nonce.b, ctx->aes.ccm.buf.b,
+ &num, (ctr128_f)AES_ctr32_encrypt);
} else {
/* decrypt-then-mac */
CRYPTO_ctr128_encrypt_ctr32(in, out, len + rem, &ctx->aes.key.k,
- ctx->aes.ccm.nonce.b, ctx->aes.ccm.buf.b,
- &num, (ctr128_f)AES_ctr32_encrypt);
+ ctx->aes.ccm.nonce.b, ctx->aes.ccm.buf.b,
+ &num, (ctr128_f)AES_ctr32_encrypt);
if (len)
s390x_kmac(out, len, ctx->aes.ccm.fc, &ctx->aes.ccm.kmac_param);
@@ -1938,8 +1946,8 @@ static int s390x_aes_ccm(S390X_AES_CCM_CTX *ctx, const unsigned char *in,
ctx->aes.ccm.kmac_param.icv.b[i] ^= out[len + i];
s390x_km(ctx->aes.ccm.kmac_param.icv.b, 16,
- ctx->aes.ccm.kmac_param.icv.b, ctx->aes.ccm.fc,
- ctx->aes.ccm.kmac_param.k);
+ ctx->aes.ccm.kmac_param.icv.b, ctx->aes.ccm.fc,
+ ctx->aes.ccm.kmac_param.k);
}
}
/* encrypt tag */
@@ -1947,11 +1955,11 @@ static int s390x_aes_ccm(S390X_AES_CCM_CTX *ctx, const unsigned char *in,
ctx->aes.ccm.nonce.b[i] = 0;
s390x_km(ctx->aes.ccm.nonce.b, 16, ctx->aes.ccm.buf.b, ctx->aes.ccm.fc,
- ctx->aes.ccm.kmac_param.k);
+ ctx->aes.ccm.kmac_param.k);
ctx->aes.ccm.kmac_param.icv.g[0] ^= ctx->aes.ccm.buf.g[0];
ctx->aes.ccm.kmac_param.icv.g[1] ^= ctx->aes.ccm.buf.g[1];
- ctx->aes.ccm.nonce.b[0] = flags; /* restore flags field */
+ ctx->aes.ccm.nonce.b[0] = flags; /* restore flags field */
return 0;
}
@@ -1960,7 +1968,7 @@ static int s390x_aes_ccm(S390X_AES_CCM_CTX *ctx, const unsigned char *in,
* if successful. Otherwise -1 is returned.
*/
static int s390x_aes_ccm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len)
+ const unsigned char *in, size_t len)
{
S390X_AES_CCM_CTX *cctx = EVP_C_DATA(S390X_AES_CCM_CTX, ctx);
unsigned char *ivec = ctx->iv;
@@ -1968,7 +1976,7 @@ static int s390x_aes_ccm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
const int enc = EVP_CIPHER_CTX_is_encrypting(ctx);
if (out != in
- || len < (EVP_CCM_TLS_EXPLICIT_IV_LEN + (size_t)cctx->aes.ccm.m))
+ || len < (EVP_CCM_TLS_EXPLICIT_IV_LEN + (size_t)cctx->aes.ccm.m))
return -1;
if (enc) {
@@ -1999,7 +2007,7 @@ static int s390x_aes_ccm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
} else {
if (!s390x_aes_ccm(cctx, in, out, len, enc)) {
if (!CRYPTO_memcmp(cctx->aes.ccm.kmac_param.icv.b, in + len,
- cctx->aes.ccm.m))
+ cctx->aes.ccm.m))
return len;
}
@@ -2013,8 +2021,8 @@ static int s390x_aes_ccm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
* returned.
*/
static int s390x_aes_ccm_init_key(EVP_CIPHER_CTX *ctx,
- const unsigned char *key,
- const unsigned char *iv, int enc)
+ const unsigned char *key,
+ const unsigned char *iv, int enc)
{
S390X_AES_CCM_CTX *cctx = EVP_C_DATA(S390X_AES_CCM_CTX, ctx);
int keylen;
@@ -2034,9 +2042,9 @@ static int s390x_aes_ccm_init_key(EVP_CIPHER_CTX *ctx,
/* Store encoded m and l. */
cctx->aes.ccm.nonce.b[0] = ((cctx->aes.ccm.l - 1) & 0x7)
- | (((cctx->aes.ccm.m - 2) >> 1) & 0x7) << 3;
+ | (((cctx->aes.ccm.m - 2) >> 1) & 0x7) << 3;
memset(cctx->aes.ccm.nonce.b + 1, 0,
- sizeof(cctx->aes.ccm.nonce.b));
+ sizeof(cctx->aes.ccm.nonce.b));
cctx->aes.ccm.blocks = 0;
cctx->aes.ccm.key_set = 1;
@@ -2058,7 +2066,7 @@ static int s390x_aes_ccm_init_key(EVP_CIPHER_CTX *ctx,
* written on success. Otherwise -1 is returned.
*/
static int s390x_aes_ccm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len)
+ const unsigned char *in, size_t len)
{
S390X_AES_CCM_CTX *cctx = EVP_C_DATA(S390X_AES_CCM_CTX, ctx);
const int enc = EVP_CIPHER_CTX_is_encrypting(ctx);
@@ -2127,7 +2135,7 @@ static int s390x_aes_ccm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
if (!s390x_aes_ccm(cctx, in, out, len, enc)) {
buf = EVP_CIPHER_CTX_buf_noconst(ctx);
if (!CRYPTO_memcmp(cctx->aes.ccm.kmac_param.icv.b, buf,
- cctx->aes.ccm.m))
+ cctx->aes.ccm.m))
rv = len;
}
@@ -2256,155 +2264,159 @@ static int s390x_aes_ccm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
}
}
-# define s390x_aes_ccm_cleanup aes_ccm_cleanup
+#define s390x_aes_ccm_cleanup aes_ccm_cleanup
-# ifndef OPENSSL_NO_OCB
-# define S390X_AES_OCB_CTX EVP_AES_OCB_CTX
+#ifndef OPENSSL_NO_OCB
+#define S390X_AES_OCB_CTX EVP_AES_OCB_CTX
-# define s390x_aes_ocb_init_key aes_ocb_init_key
+#define s390x_aes_ocb_init_key aes_ocb_init_key
static int s390x_aes_ocb_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc);
-# define s390x_aes_ocb_cipher aes_ocb_cipher
+ const unsigned char *iv, int enc);
+#define s390x_aes_ocb_cipher aes_ocb_cipher
static int s390x_aes_ocb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len);
-# define s390x_aes_ocb_cleanup aes_ocb_cleanup
+ const unsigned char *in, size_t len);
+#define s390x_aes_ocb_cleanup aes_ocb_cleanup
static int s390x_aes_ocb_cleanup(EVP_CIPHER_CTX *);
-# define s390x_aes_ocb_ctrl aes_ocb_ctrl
+#define s390x_aes_ocb_ctrl aes_ocb_ctrl
static int s390x_aes_ocb_ctrl(EVP_CIPHER_CTX *, int type, int arg, void *ptr);
-# endif
-
-# ifndef OPENSSL_NO_SIV
-# define S390X_AES_SIV_CTX EVP_AES_SIV_CTX
-
-# define s390x_aes_siv_init_key aes_siv_init_key
-# define s390x_aes_siv_cipher aes_siv_cipher
-# define s390x_aes_siv_cleanup aes_siv_cleanup
-# define s390x_aes_siv_ctrl aes_siv_ctrl
-# endif
-
-# define BLOCK_CIPHER_generic(nid,keylen,blocksize,ivlen,nmode,mode, \
- MODE,flags) \
-static const EVP_CIPHER s390x_aes_##keylen##_##mode = { \
- nid##_##keylen##_##nmode,blocksize, \
- keylen / 8, \
- ivlen, \
- flags | EVP_CIPH_##MODE##_MODE, \
- EVP_ORIG_GLOBAL, \
- s390x_aes_##mode##_init_key, \
- s390x_aes_##mode##_cipher, \
- NULL, \
- sizeof(S390X_AES_##MODE##_CTX), \
- NULL, \
- NULL, \
- NULL, \
- NULL \
-}; \
-static const EVP_CIPHER aes_##keylen##_##mode = { \
- nid##_##keylen##_##nmode, \
- blocksize, \
- keylen / 8, \
- ivlen, \
- flags | EVP_CIPH_##MODE##_MODE, \
- EVP_ORIG_GLOBAL, \
- aes_init_key, \
- aes_##mode##_cipher, \
- NULL, \
- sizeof(EVP_AES_KEY), \
- NULL, \
- NULL, \
- NULL, \
- NULL \
-}; \
-const EVP_CIPHER *EVP_aes_##keylen##_##mode(void) \
-{ \
- return S390X_aes_##keylen##_##mode##_CAPABLE ? \
- &s390x_aes_##keylen##_##mode : &aes_##keylen##_##mode; \
-}
+#endif
-# define BLOCK_CIPHER_custom(nid,keylen,blocksize,ivlen,mode,MODE,flags)\
-static const EVP_CIPHER s390x_aes_##keylen##_##mode = { \
- nid##_##keylen##_##mode, \
- blocksize, \
- (EVP_CIPH_##MODE##_MODE==EVP_CIPH_XTS_MODE||EVP_CIPH_##MODE##_MODE==EVP_CIPH_SIV_MODE ? 2 : 1) * keylen / 8, \
- ivlen, \
- flags | EVP_CIPH_##MODE##_MODE, \
- EVP_ORIG_GLOBAL, \
- s390x_aes_##mode##_init_key, \
- s390x_aes_##mode##_cipher, \
- s390x_aes_##mode##_cleanup, \
- sizeof(S390X_AES_##MODE##_CTX), \
- NULL, \
- NULL, \
- s390x_aes_##mode##_ctrl, \
- NULL \
-}; \
-static const EVP_CIPHER aes_##keylen##_##mode = { \
- nid##_##keylen##_##mode,blocksize, \
- (EVP_CIPH_##MODE##_MODE==EVP_CIPH_XTS_MODE||EVP_CIPH_##MODE##_MODE==EVP_CIPH_SIV_MODE ? 2 : 1) * keylen / 8, \
- ivlen, \
- flags | EVP_CIPH_##MODE##_MODE, \
- EVP_ORIG_GLOBAL, \
- aes_##mode##_init_key, \
- aes_##mode##_cipher, \
- aes_##mode##_cleanup, \
- sizeof(EVP_AES_##MODE##_CTX), \
- NULL, \
- NULL, \
- aes_##mode##_ctrl, \
- NULL \
-}; \
-const EVP_CIPHER *EVP_aes_##keylen##_##mode(void) \
-{ \
- return S390X_aes_##keylen##_##mode##_CAPABLE ? \
- &s390x_aes_##keylen##_##mode : &aes_##keylen##_##mode; \
-}
+#ifndef OPENSSL_NO_SIV
+#define S390X_AES_SIV_CTX EVP_AES_SIV_CTX
+
+#define s390x_aes_siv_init_key aes_siv_init_key
+#define s390x_aes_siv_cipher aes_siv_cipher
+#define s390x_aes_siv_cleanup aes_siv_cleanup
+#define s390x_aes_siv_ctrl aes_siv_ctrl
+#endif
+
+#define BLOCK_CIPHER_generic(nid, keylen, blocksize, ivlen, nmode, mode, \
+ MODE, flags) \
+ static const EVP_CIPHER s390x_aes_##keylen##_##mode = { \
+ nid##_##keylen##_##nmode, blocksize, \
+ keylen / 8, \
+ ivlen, \
+ flags | EVP_CIPH_##MODE##_MODE, \
+ EVP_ORIG_GLOBAL, \
+ s390x_aes_##mode##_init_key, \
+ s390x_aes_##mode##_cipher, \
+ NULL, \
+ sizeof(S390X_AES_##MODE##_CTX), \
+ NULL, \
+ NULL, \
+ NULL, \
+ NULL \
+ }; \
+ static const EVP_CIPHER aes_##keylen##_##mode = { \
+ nid##_##keylen##_##nmode, \
+ blocksize, \
+ keylen / 8, \
+ ivlen, \
+ flags | EVP_CIPH_##MODE##_MODE, \
+ EVP_ORIG_GLOBAL, \
+ aes_init_key, \
+ aes_##mode##_cipher, \
+ NULL, \
+ sizeof(EVP_AES_KEY), \
+ NULL, \
+ NULL, \
+ NULL, \
+ NULL \
+ }; \
+ const EVP_CIPHER *EVP_aes_##keylen##_##mode(void) \
+ { \
+ return S390X_aes_##keylen##_##mode##_CAPABLE ? &s390x_aes_##keylen##_##mode : &aes_##keylen##_##mode; \
+ }
+
+#define BLOCK_CIPHER_custom(nid, keylen, blocksize, ivlen, mode, MODE, flags) \
+ static const EVP_CIPHER s390x_aes_##keylen##_##mode = { \
+ nid##_##keylen##_##mode, \
+ blocksize, \
+ (EVP_CIPH_##MODE##_MODE == EVP_CIPH_XTS_MODE || EVP_CIPH_##MODE##_MODE == EVP_CIPH_SIV_MODE ? 2 : 1) * keylen / 8, \
+ ivlen, \
+ flags | EVP_CIPH_##MODE##_MODE, \
+ EVP_ORIG_GLOBAL, \
+ s390x_aes_##mode##_init_key, \
+ s390x_aes_##mode##_cipher, \
+ s390x_aes_##mode##_cleanup, \
+ sizeof(S390X_AES_##MODE##_CTX), \
+ NULL, \
+ NULL, \
+ s390x_aes_##mode##_ctrl, \
+ NULL \
+ }; \
+ static const EVP_CIPHER aes_##keylen##_##mode = { \
+ nid##_##keylen##_##mode, blocksize, \
+ (EVP_CIPH_##MODE##_MODE == EVP_CIPH_XTS_MODE || EVP_CIPH_##MODE##_MODE == EVP_CIPH_SIV_MODE ? 2 : 1) * keylen / 8, \
+ ivlen, \
+ flags | EVP_CIPH_##MODE##_MODE, \
+ EVP_ORIG_GLOBAL, \
+ aes_##mode##_init_key, \
+ aes_##mode##_cipher, \
+ aes_##mode##_cleanup, \
+ sizeof(EVP_AES_##MODE##_CTX), \
+ NULL, \
+ NULL, \
+ aes_##mode##_ctrl, \
+ NULL \
+ }; \
+ const EVP_CIPHER *EVP_aes_##keylen##_##mode(void) \
+ { \
+ return S390X_aes_##keylen##_##mode##_CAPABLE ? &s390x_aes_##keylen##_##mode : &aes_##keylen##_##mode; \
+ }
#else
-# define BLOCK_CIPHER_generic(nid,keylen,blocksize,ivlen,nmode,mode,MODE,flags) \
-static const EVP_CIPHER aes_##keylen##_##mode = { \
- nid##_##keylen##_##nmode,blocksize,keylen/8,ivlen, \
- flags|EVP_CIPH_##MODE##_MODE, \
- EVP_ORIG_GLOBAL, \
- aes_init_key, \
- aes_##mode##_cipher, \
- NULL, \
- sizeof(EVP_AES_KEY), \
- NULL,NULL,NULL,NULL }; \
-const EVP_CIPHER *EVP_aes_##keylen##_##mode(void) \
-{ return &aes_##keylen##_##mode; }
-
-# define BLOCK_CIPHER_custom(nid,keylen,blocksize,ivlen,mode,MODE,flags) \
-static const EVP_CIPHER aes_##keylen##_##mode = { \
- nid##_##keylen##_##mode,blocksize, \
- (EVP_CIPH_##MODE##_MODE==EVP_CIPH_XTS_MODE||EVP_CIPH_##MODE##_MODE==EVP_CIPH_SIV_MODE?2:1)*keylen/8, \
- ivlen, \
- flags|EVP_CIPH_##MODE##_MODE, \
- EVP_ORIG_GLOBAL, \
- aes_##mode##_init_key, \
- aes_##mode##_cipher, \
- aes_##mode##_cleanup, \
- sizeof(EVP_AES_##MODE##_CTX), \
- NULL,NULL,aes_##mode##_ctrl,NULL }; \
-const EVP_CIPHER *EVP_aes_##keylen##_##mode(void) \
-{ return &aes_##keylen##_##mode; }
+#define BLOCK_CIPHER_generic(nid, keylen, blocksize, ivlen, nmode, mode, MODE, flags) \
+ static const EVP_CIPHER aes_##keylen##_##mode = { \
+ nid##_##keylen##_##nmode, blocksize, keylen / 8, ivlen, \
+ flags | EVP_CIPH_##MODE##_MODE, \
+ EVP_ORIG_GLOBAL, \
+ aes_init_key, \
+ aes_##mode##_cipher, \
+ NULL, \
+ sizeof(EVP_AES_KEY), \
+ NULL, NULL, NULL, NULL \
+ }; \
+ const EVP_CIPHER *EVP_aes_##keylen##_##mode(void) \
+ { \
+ return &aes_##keylen##_##mode; \
+ }
+
+#define BLOCK_CIPHER_custom(nid, keylen, blocksize, ivlen, mode, MODE, flags) \
+ static const EVP_CIPHER aes_##keylen##_##mode = { \
+ nid##_##keylen##_##mode, blocksize, \
+ (EVP_CIPH_##MODE##_MODE == EVP_CIPH_XTS_MODE || EVP_CIPH_##MODE##_MODE == EVP_CIPH_SIV_MODE ? 2 : 1) * keylen / 8, \
+ ivlen, \
+ flags | EVP_CIPH_##MODE##_MODE, \
+ EVP_ORIG_GLOBAL, \
+ aes_##mode##_init_key, \
+ aes_##mode##_cipher, \
+ aes_##mode##_cleanup, \
+ sizeof(EVP_AES_##MODE##_CTX), \
+ NULL, NULL, aes_##mode##_ctrl, NULL \
+ }; \
+ const EVP_CIPHER *EVP_aes_##keylen##_##mode(void) \
+ { \
+ return &aes_##keylen##_##mode; \
+ }
#endif
-#define BLOCK_CIPHER_generic_pack(nid,keylen,flags) \
- BLOCK_CIPHER_generic(nid,keylen,16,16,cbc,cbc,CBC,flags|EVP_CIPH_FLAG_DEFAULT_ASN1) \
- BLOCK_CIPHER_generic(nid,keylen,16,0,ecb,ecb,ECB,flags|EVP_CIPH_FLAG_DEFAULT_ASN1) \
- BLOCK_CIPHER_generic(nid,keylen,1,16,ofb128,ofb,OFB,flags|EVP_CIPH_FLAG_DEFAULT_ASN1) \
- BLOCK_CIPHER_generic(nid,keylen,1,16,cfb128,cfb,CFB,flags|EVP_CIPH_FLAG_DEFAULT_ASN1) \
- BLOCK_CIPHER_generic(nid,keylen,1,16,cfb1,cfb1,CFB,flags) \
- BLOCK_CIPHER_generic(nid,keylen,1,16,cfb8,cfb8,CFB,flags) \
- BLOCK_CIPHER_generic(nid,keylen,1,16,ctr,ctr,CTR,flags)
+#define BLOCK_CIPHER_generic_pack(nid, keylen, flags) \
+ BLOCK_CIPHER_generic(nid, keylen, 16, 16, cbc, cbc, CBC, flags | EVP_CIPH_FLAG_DEFAULT_ASN1) \
+ BLOCK_CIPHER_generic(nid, keylen, 16, 0, ecb, ecb, ECB, flags | EVP_CIPH_FLAG_DEFAULT_ASN1) \
+ BLOCK_CIPHER_generic(nid, keylen, 1, 16, ofb128, ofb, OFB, flags | EVP_CIPH_FLAG_DEFAULT_ASN1) \
+ BLOCK_CIPHER_generic(nid, keylen, 1, 16, cfb128, cfb, CFB, flags | EVP_CIPH_FLAG_DEFAULT_ASN1) \
+ BLOCK_CIPHER_generic(nid, keylen, 1, 16, cfb1, cfb1, CFB, flags) \
+ BLOCK_CIPHER_generic(nid, keylen, 1, 16, cfb8, cfb8, CFB, flags) \
+ BLOCK_CIPHER_generic(nid, keylen, 1, 16, ctr, ctr, CTR, flags)
static int aes_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc)
+ const unsigned char *iv, int enc)
{
int ret, mode;
- EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY,ctx);
+ EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY, ctx);
const int keylen = EVP_CIPHER_CTX_get_key_length(ctx) * 8;
if (keylen <= 0) {
@@ -2418,77 +2430,73 @@ static int aes_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
#ifdef HWAES_CAPABLE
if (HWAES_CAPABLE) {
ret = HWAES_set_decrypt_key(key, keylen, &dat->ks.ks);
- dat->block = (block128_f) HWAES_decrypt;
+ dat->block = (block128_f)HWAES_decrypt;
dat->stream.cbc = NULL;
-# ifdef HWAES_cbc_encrypt
+#ifdef HWAES_cbc_encrypt
if (mode == EVP_CIPH_CBC_MODE)
- dat->stream.cbc = (cbc128_f) HWAES_cbc_encrypt;
-# endif
+ dat->stream.cbc = (cbc128_f)HWAES_cbc_encrypt;
+#endif
} else
#endif
#ifdef BSAES_CAPABLE
- if (BSAES_CAPABLE && mode == EVP_CIPH_CBC_MODE) {
+ if (BSAES_CAPABLE && mode == EVP_CIPH_CBC_MODE) {
ret = AES_set_decrypt_key(key, keylen, &dat->ks.ks);
- dat->block = (block128_f) AES_decrypt;
- dat->stream.cbc = (cbc128_f) ossl_bsaes_cbc_encrypt;
+ dat->block = (block128_f)AES_decrypt;
+ dat->stream.cbc = (cbc128_f)ossl_bsaes_cbc_encrypt;
} else
#endif
#ifdef VPAES_CAPABLE
- if (VPAES_CAPABLE) {
+ if (VPAES_CAPABLE) {
ret = vpaes_set_decrypt_key(key, keylen, &dat->ks.ks);
- dat->block = (block128_f) vpaes_decrypt;
- dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ?
- (cbc128_f) vpaes_cbc_encrypt : NULL;
+ dat->block = (block128_f)vpaes_decrypt;
+ dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ? (cbc128_f)vpaes_cbc_encrypt : NULL;
} else
#endif
{
ret = AES_set_decrypt_key(key, keylen, &dat->ks.ks);
- dat->block = (block128_f) AES_decrypt;
- dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ?
- (cbc128_f) AES_cbc_encrypt : NULL;
+ dat->block = (block128_f)AES_decrypt;
+ dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ? (cbc128_f)AES_cbc_encrypt : NULL;
}
} else
#ifdef HWAES_CAPABLE
- if (HWAES_CAPABLE) {
+ if (HWAES_CAPABLE) {
ret = HWAES_set_encrypt_key(key, keylen, &dat->ks.ks);
- dat->block = (block128_f) HWAES_encrypt;
+ dat->block = (block128_f)HWAES_encrypt;
dat->stream.cbc = NULL;
-# ifdef HWAES_cbc_encrypt
+#ifdef HWAES_cbc_encrypt
if (mode == EVP_CIPH_CBC_MODE)
- dat->stream.cbc = (cbc128_f) HWAES_cbc_encrypt;
+ dat->stream.cbc = (cbc128_f)HWAES_cbc_encrypt;
else
-# endif
-# ifdef HWAES_ctr32_encrypt_blocks
- if (mode == EVP_CIPH_CTR_MODE)
- dat->stream.ctr = (ctr128_f) HWAES_ctr32_encrypt_blocks;
+#endif
+#ifdef HWAES_ctr32_encrypt_blocks
+ if (mode == EVP_CIPH_CTR_MODE)
+ dat->stream.ctr = (ctr128_f)HWAES_ctr32_encrypt_blocks;
else
-# endif
- (void)0; /* terminate potentially open 'else' */
+#endif
+ (void)0; /* terminate potentially open 'else' */
} else
#endif
#ifdef BSAES_CAPABLE
- if (BSAES_CAPABLE && mode == EVP_CIPH_CTR_MODE) {
+ if (BSAES_CAPABLE && mode == EVP_CIPH_CTR_MODE) {
ret = AES_set_encrypt_key(key, keylen, &dat->ks.ks);
- dat->block = (block128_f) AES_encrypt;
- dat->stream.ctr = (ctr128_f) ossl_bsaes_ctr32_encrypt_blocks;
+ dat->block = (block128_f)AES_encrypt;
+ dat->stream.ctr = (ctr128_f)ossl_bsaes_ctr32_encrypt_blocks;
} else
#endif
#ifdef VPAES_CAPABLE
- if (VPAES_CAPABLE) {
+ if (VPAES_CAPABLE) {
ret = vpaes_set_encrypt_key(key, keylen, &dat->ks.ks);
- dat->block = (block128_f) vpaes_encrypt;
- dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ?
- (cbc128_f) vpaes_cbc_encrypt : NULL;
+ dat->block = (block128_f)vpaes_encrypt;
+ dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ? (cbc128_f)vpaes_cbc_encrypt : NULL;
} else
#endif
{
ret = AES_set_encrypt_key(key, keylen, &dat->ks.ks);
- dat->block = (block128_f) AES_encrypt;
- dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ?
- (cbc128_f) AES_cbc_encrypt : NULL;
+ dat->block = (block128_f)AES_encrypt;
+ dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ? (cbc128_f)AES_cbc_encrypt : NULL;
#ifdef AES_CTR_ASM
if (mode == EVP_CIPH_CTR_MODE)
- dat->stream.ctr = (ctr128_f) AES_ctr32_encrypt;
+ dat->stream.ctr = (ctr128_f)AES_ctr32_encrypt;
#endif
}
@@ -2501,87 +2509,87 @@ static int aes_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
}
static int aes_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len)
+ const unsigned char *in, size_t len)
{
- EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY,ctx);
+ EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY, ctx);
if (dat->stream.cbc)
- (*dat->stream.cbc) (in, out, len, &dat->ks, ctx->iv,
- EVP_CIPHER_CTX_is_encrypting(ctx));
+ (*dat->stream.cbc)(in, out, len, &dat->ks, ctx->iv,
+ EVP_CIPHER_CTX_is_encrypting(ctx));
else if (EVP_CIPHER_CTX_is_encrypting(ctx))
CRYPTO_cbc128_encrypt(in, out, len, &dat->ks, ctx->iv,
- dat->block);
+ dat->block);
else
CRYPTO_cbc128_decrypt(in, out, len, &dat->ks,
- ctx->iv, dat->block);
+ ctx->iv, dat->block);
return 1;
}
static int aes_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len)
+ const unsigned char *in, size_t len)
{
size_t bl = EVP_CIPHER_CTX_get_block_size(ctx);
size_t i;
- EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY,ctx);
+ EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY, ctx);
if (len < bl)
return 1;
for (i = 0, len -= bl; i <= len; i += bl)
- (*dat->block) (in + i, out + i, &dat->ks);
+ (*dat->block)(in + i, out + i, &dat->ks);
return 1;
}
static int aes_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len)
+ const unsigned char *in, size_t len)
{
- EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY,ctx);
+ EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY, ctx);
int num = EVP_CIPHER_CTX_get_num(ctx);
CRYPTO_ofb128_encrypt(in, out, len, &dat->ks,
- ctx->iv, &num, dat->block);
+ ctx->iv, &num, dat->block);
EVP_CIPHER_CTX_set_num(ctx, num);
return 1;
}
static int aes_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len)
+ const unsigned char *in, size_t len)
{
- EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY,ctx);
+ EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY, ctx);
int num = EVP_CIPHER_CTX_get_num(ctx);
CRYPTO_cfb128_encrypt(in, out, len, &dat->ks,
- ctx->iv, &num,
- EVP_CIPHER_CTX_is_encrypting(ctx), dat->block);
+ ctx->iv, &num,
+ EVP_CIPHER_CTX_is_encrypting(ctx), dat->block);
EVP_CIPHER_CTX_set_num(ctx, num);
return 1;
}
static int aes_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len)
+ const unsigned char *in, size_t len)
{
- EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY,ctx);
+ EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY, ctx);
int num = EVP_CIPHER_CTX_get_num(ctx);
CRYPTO_cfb128_8_encrypt(in, out, len, &dat->ks,
- ctx->iv, &num,
- EVP_CIPHER_CTX_is_encrypting(ctx), dat->block);
+ ctx->iv, &num,
+ EVP_CIPHER_CTX_is_encrypting(ctx), dat->block);
EVP_CIPHER_CTX_set_num(ctx, num);
return 1;
}
static int aes_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len)
+ const unsigned char *in, size_t len)
{
- EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY,ctx);
+ EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY, ctx);
if (EVP_CIPHER_CTX_test_flags(ctx, EVP_CIPH_FLAG_LENGTH_BITS)) {
int num = EVP_CIPHER_CTX_get_num(ctx);
CRYPTO_cfb128_1_encrypt(in, out, len, &dat->ks,
- ctx->iv, &num,
- EVP_CIPHER_CTX_is_encrypting(ctx), dat->block);
+ ctx->iv, &num,
+ EVP_CIPHER_CTX_is_encrypting(ctx), dat->block);
EVP_CIPHER_CTX_set_num(ctx, num);
return 1;
}
@@ -2589,18 +2597,18 @@ static int aes_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
while (len >= MAXBITCHUNK) {
int num = EVP_CIPHER_CTX_get_num(ctx);
CRYPTO_cfb128_1_encrypt(in, out, MAXBITCHUNK * 8, &dat->ks,
- ctx->iv, &num,
- EVP_CIPHER_CTX_is_encrypting(ctx), dat->block);
+ ctx->iv, &num,
+ EVP_CIPHER_CTX_is_encrypting(ctx), dat->block);
EVP_CIPHER_CTX_set_num(ctx, num);
len -= MAXBITCHUNK;
out += MAXBITCHUNK;
- in += MAXBITCHUNK;
+ in += MAXBITCHUNK;
}
if (len) {
int num = EVP_CIPHER_CTX_get_num(ctx);
CRYPTO_cfb128_1_encrypt(in, out, len * 8, &dat->ks,
- ctx->iv, &num,
- EVP_CIPHER_CTX_is_encrypting(ctx), dat->block);
+ ctx->iv, &num,
+ EVP_CIPHER_CTX_is_encrypting(ctx), dat->block);
EVP_CIPHER_CTX_set_num(ctx, num);
}
@@ -2608,11 +2616,11 @@ static int aes_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
}
static int aes_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len)
+ const unsigned char *in, size_t len)
{
int n = EVP_CIPHER_CTX_get_num(ctx);
unsigned int num;
- EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY,ctx);
+ EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY, ctx);
if (n < 0)
return 0;
@@ -2620,25 +2628,25 @@ static int aes_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
if (dat->stream.ctr)
CRYPTO_ctr128_encrypt_ctr32(in, out, len, &dat->ks,
- ctx->iv,
- EVP_CIPHER_CTX_buf_noconst(ctx),
- &num, dat->stream.ctr);
+ ctx->iv,
+ EVP_CIPHER_CTX_buf_noconst(ctx),
+ &num, dat->stream.ctr);
else
CRYPTO_ctr128_encrypt(in, out, len, &dat->ks,
- ctx->iv,
- EVP_CIPHER_CTX_buf_noconst(ctx), &num,
- dat->block);
+ ctx->iv,
+ EVP_CIPHER_CTX_buf_noconst(ctx), &num,
+ dat->block);
EVP_CIPHER_CTX_set_num(ctx, num);
return 1;
}
BLOCK_CIPHER_generic_pack(NID_aes, 128, 0)
BLOCK_CIPHER_generic_pack(NID_aes, 192, 0)
- BLOCK_CIPHER_generic_pack(NID_aes, 256, 0)
+ BLOCK_CIPHER_generic_pack(NID_aes, 256, 0)
-static int aes_gcm_cleanup(EVP_CIPHER_CTX *c)
+ static int aes_gcm_cleanup(EVP_CIPHER_CTX *c)
{
- EVP_AES_GCM_CTX *gctx = EVP_C_DATA(EVP_AES_GCM_CTX,c);
+ EVP_AES_GCM_CTX *gctx = EVP_C_DATA(EVP_AES_GCM_CTX, c);
if (gctx == NULL)
return 0;
OPENSSL_cleanse(&gctx->gcm, sizeof(gctx->gcm));
@@ -2649,7 +2657,7 @@ static int aes_gcm_cleanup(EVP_CIPHER_CTX *c)
static int aes_gcm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
{
- EVP_AES_GCM_CTX *gctx = EVP_C_DATA(EVP_AES_GCM_CTX,c);
+ EVP_AES_GCM_CTX *gctx = EVP_C_DATA(EVP_AES_GCM_CTX, c);
switch (type) {
case EVP_CTRL_INIT:
gctx->key_set = 0;
@@ -2760,35 +2768,33 @@ static int aes_gcm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
/* Extra padding: tag appended to record */
return EVP_GCM_TLS_TAG_LEN;
- case EVP_CTRL_COPY:
- {
- EVP_CIPHER_CTX *out = ptr;
- EVP_AES_GCM_CTX *gctx_out = EVP_C_DATA(EVP_AES_GCM_CTX,out);
- if (gctx->gcm.key) {
- if (gctx->gcm.key != &gctx->ks)
- return 0;
- gctx_out->gcm.key = &gctx_out->ks;
- }
- if (gctx->iv == c->iv)
- gctx_out->iv = out->iv;
- else {
- if ((gctx_out->iv = OPENSSL_malloc(gctx->ivlen)) == NULL)
- return 0;
- memcpy(gctx_out->iv, gctx->iv, gctx->ivlen);
- }
- return 1;
+ case EVP_CTRL_COPY: {
+ EVP_CIPHER_CTX *out = ptr;
+ EVP_AES_GCM_CTX *gctx_out = EVP_C_DATA(EVP_AES_GCM_CTX, out);
+ if (gctx->gcm.key) {
+ if (gctx->gcm.key != &gctx->ks)
+ return 0;
+ gctx_out->gcm.key = &gctx_out->ks;
+ }
+ if (gctx->iv == c->iv)
+ gctx_out->iv = out->iv;
+ else {
+ if ((gctx_out->iv = OPENSSL_malloc(gctx->ivlen)) == NULL)
+ return 0;
+ memcpy(gctx_out->iv, gctx->iv, gctx->ivlen);
}
+ return 1;
+ }
default:
return -1;
-
}
}
static int aes_gcm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc)
+ const unsigned char *iv, int enc)
{
- EVP_AES_GCM_CTX *gctx = EVP_C_DATA(EVP_AES_GCM_CTX,ctx);
+ EVP_AES_GCM_CTX *gctx = EVP_C_DATA(EVP_AES_GCM_CTX, ctx);
if (iv == NULL && key == NULL)
return 1;
@@ -2805,40 +2811,40 @@ static int aes_gcm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
if (HWAES_CAPABLE) {
HWAES_set_encrypt_key(key, keylen, &gctx->ks.ks);
CRYPTO_gcm128_init(&gctx->gcm, &gctx->ks,
- (block128_f) HWAES_encrypt);
-# ifdef HWAES_ctr32_encrypt_blocks
- gctx->ctr = (ctr128_f) HWAES_ctr32_encrypt_blocks;
-# else
+ (block128_f)HWAES_encrypt);
+#ifdef HWAES_ctr32_encrypt_blocks
+ gctx->ctr = (ctr128_f)HWAES_ctr32_encrypt_blocks;
+#else
gctx->ctr = NULL;
-# endif
+#endif
break;
} else
#endif
#ifdef BSAES_CAPABLE
- if (BSAES_CAPABLE) {
+ if (BSAES_CAPABLE) {
AES_set_encrypt_key(key, keylen, &gctx->ks.ks);
CRYPTO_gcm128_init(&gctx->gcm, &gctx->ks,
- (block128_f) AES_encrypt);
- gctx->ctr = (ctr128_f) ossl_bsaes_ctr32_encrypt_blocks;
+ (block128_f)AES_encrypt);
+ gctx->ctr = (ctr128_f)ossl_bsaes_ctr32_encrypt_blocks;
break;
} else
#endif
#ifdef VPAES_CAPABLE
- if (VPAES_CAPABLE) {
+ if (VPAES_CAPABLE) {
vpaes_set_encrypt_key(key, keylen, &gctx->ks.ks);
CRYPTO_gcm128_init(&gctx->gcm, &gctx->ks,
- (block128_f) vpaes_encrypt);
+ (block128_f)vpaes_encrypt);
gctx->ctr = NULL;
break;
} else
#endif
- (void)0; /* terminate potentially open 'else' */
+ (void)0; /* terminate potentially open 'else' */
AES_set_encrypt_key(key, keylen, &gctx->ks.ks);
CRYPTO_gcm128_init(&gctx->gcm, &gctx->ks,
- (block128_f) AES_encrypt);
+ (block128_f)AES_encrypt);
#ifdef AES_CTR_ASM
- gctx->ctr = (ctr128_f) AES_ctr32_encrypt;
+ gctx->ctr = (ctr128_f)AES_ctr32_encrypt;
#else
gctx->ctr = NULL;
#endif
@@ -2874,9 +2880,9 @@ static int aes_gcm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
*/
static int aes_gcm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len)
+ const unsigned char *in, size_t len)
{
- EVP_AES_GCM_CTX *gctx = EVP_C_DATA(EVP_AES_GCM_CTX,ctx);
+ EVP_AES_GCM_CTX *gctx = EVP_C_DATA(EVP_AES_GCM_CTX, ctx);
int rv = -1;
/* Encrypt/decrypt must be performed in place */
if (out != in
@@ -2899,13 +2905,13 @@ static int aes_gcm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
* buffer.
*/
if (EVP_CIPHER_CTX_ctrl(ctx,
- EVP_CIPHER_CTX_is_encrypting(ctx) ?
- EVP_CTRL_GCM_IV_GEN : EVP_CTRL_GCM_SET_IV_INV,
- EVP_GCM_TLS_EXPLICIT_IV_LEN, out) <= 0)
+ EVP_CIPHER_CTX_is_encrypting(ctx) ? EVP_CTRL_GCM_IV_GEN : EVP_CTRL_GCM_SET_IV_INV,
+ EVP_GCM_TLS_EXPLICIT_IV_LEN, out)
+ <= 0)
goto err;
/* Use saved AAD */
if (CRYPTO_gcm128_aad(&gctx->gcm, EVP_CIPHER_CTX_buf_noconst(ctx),
- gctx->tls_aad_len))
+ gctx->tls_aad_len))
goto err;
/* Fix buffer and length to point to payload */
in += EVP_GCM_TLS_EXPLICIT_IV_LEN;
@@ -2921,15 +2927,15 @@ static int aes_gcm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
return -1;
bulk = AES_gcm_encrypt(in, out, len,
- gctx->gcm.key,
- gctx->gcm.Yi.c, gctx->gcm.Xi.u);
+ gctx->gcm.key,
+ gctx->gcm.Yi.c, gctx->gcm.Xi.u);
gctx->gcm.len.u[1] += bulk;
}
#endif
if (CRYPTO_gcm128_encrypt_ctr32(&gctx->gcm,
- in + bulk,
- out + bulk,
- len - bulk, gctx->ctr))
+ in + bulk,
+ out + bulk,
+ len - bulk, gctx->ctr))
goto err;
} else {
size_t bulk = 0;
@@ -2939,13 +2945,13 @@ static int aes_gcm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
return -1;
bulk = AES_gcm_encrypt(in, out, len,
- gctx->gcm.key,
- gctx->gcm.Yi.c, gctx->gcm.Xi.u);
+ gctx->gcm.key,
+ gctx->gcm.Yi.c, gctx->gcm.Xi.u);
gctx->gcm.len.u[1] += bulk;
}
#endif
if (CRYPTO_gcm128_encrypt(&gctx->gcm,
- in + bulk, out + bulk, len - bulk))
+ in + bulk, out + bulk, len - bulk))
goto err;
}
out += len;
@@ -2962,15 +2968,15 @@ static int aes_gcm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
return -1;
bulk = AES_gcm_decrypt(in, out, len,
- gctx->gcm.key,
- gctx->gcm.Yi.c, gctx->gcm.Xi.u);
+ gctx->gcm.key,
+ gctx->gcm.Yi.c, gctx->gcm.Xi.u);
gctx->gcm.len.u[1] += bulk;
}
#endif
if (CRYPTO_gcm128_decrypt_ctr32(&gctx->gcm,
- in + bulk,
- out + bulk,
- len - bulk, gctx->ctr))
+ in + bulk,
+ out + bulk,
+ len - bulk, gctx->ctr))
goto err;
} else {
size_t bulk = 0;
@@ -2980,28 +2986,28 @@ static int aes_gcm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
return -1;
bulk = AES_gcm_decrypt(in, out, len,
- gctx->gcm.key,
- gctx->gcm.Yi.c, gctx->gcm.Xi.u);
+ gctx->gcm.key,
+ gctx->gcm.Yi.c, gctx->gcm.Xi.u);
gctx->gcm.len.u[1] += bulk;
}
#endif
if (CRYPTO_gcm128_decrypt(&gctx->gcm,
- in + bulk, out + bulk, len - bulk))
+ in + bulk, out + bulk, len - bulk))
goto err;
}
/* Retrieve tag */
CRYPTO_gcm128_tag(&gctx->gcm, EVP_CIPHER_CTX_buf_noconst(ctx),
- EVP_GCM_TLS_TAG_LEN);
+ EVP_GCM_TLS_TAG_LEN);
/* If tag mismatch wipe buffer */
if (CRYPTO_memcmp(EVP_CIPHER_CTX_buf_noconst(ctx), in + len,
- EVP_GCM_TLS_TAG_LEN)) {
+ EVP_GCM_TLS_TAG_LEN)) {
OPENSSL_cleanse(out, len);
goto err;
}
rv = (int)len;
}
- err:
+err:
gctx->iv_set = 0;
gctx->tls_aad_len = -1;
return rv;
@@ -3032,9 +3038,9 @@ static int aes_gcm_iv_generate(EVP_AES_GCM_CTX *gctx, int offset)
#endif /* FIPS_MODULE */
static int aes_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len)
+ const unsigned char *in, size_t len)
{
- EVP_AES_GCM_CTX *gctx = EVP_C_DATA(EVP_AES_GCM_CTX,ctx);
+ EVP_AES_GCM_CTX *gctx = EVP_C_DATA(EVP_AES_GCM_CTX, ctx);
/* If not set up, return error */
if (!gctx->key_set)
@@ -3077,17 +3083,17 @@ static int aes_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
return -1;
bulk = AES_gcm_encrypt(in + res,
- out + res, len - res,
- gctx->gcm.key, gctx->gcm.Yi.c,
- gctx->gcm.Xi.u);
+ out + res, len - res,
+ gctx->gcm.key, gctx->gcm.Yi.c,
+ gctx->gcm.Xi.u);
gctx->gcm.len.u[1] += bulk;
bulk += res;
}
#endif
if (CRYPTO_gcm128_encrypt_ctr32(&gctx->gcm,
- in + bulk,
- out + bulk,
- len - bulk, gctx->ctr))
+ in + bulk,
+ out + bulk,
+ len - bulk, gctx->ctr))
return -1;
} else {
size_t bulk = 0;
@@ -3099,15 +3105,15 @@ static int aes_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
return -1;
bulk = AES_gcm_encrypt(in + res,
- out + res, len - res,
- gctx->gcm.key, gctx->gcm.Yi.c,
- gctx->gcm.Xi.u);
+ out + res, len - res,
+ gctx->gcm.key, gctx->gcm.Yi.c,
+ gctx->gcm.Xi.u);
gctx->gcm.len.u[1] += bulk;
bulk += res;
}
#endif
if (CRYPTO_gcm128_encrypt(&gctx->gcm,
- in + bulk, out + bulk, len - bulk))
+ in + bulk, out + bulk, len - bulk))
return -1;
}
} else {
@@ -3121,17 +3127,17 @@ static int aes_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
return -1;
bulk = AES_gcm_decrypt(in + res,
- out + res, len - res,
- gctx->gcm.key,
- gctx->gcm.Yi.c, gctx->gcm.Xi.u);
+ out + res, len - res,
+ gctx->gcm.key,
+ gctx->gcm.Yi.c, gctx->gcm.Xi.u);
gctx->gcm.len.u[1] += bulk;
bulk += res;
}
#endif
if (CRYPTO_gcm128_decrypt_ctr32(&gctx->gcm,
- in + bulk,
- out + bulk,
- len - bulk, gctx->ctr))
+ in + bulk,
+ out + bulk,
+ len - bulk, gctx->ctr))
return -1;
} else {
size_t bulk = 0;
@@ -3143,15 +3149,15 @@ static int aes_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
return -1;
bulk = AES_gcm_decrypt(in + res,
- out + res, len - res,
- gctx->gcm.key,
- gctx->gcm.Yi.c, gctx->gcm.Xi.u);
+ out + res, len - res,
+ gctx->gcm.key,
+ gctx->gcm.Yi.c, gctx->gcm.Xi.u);
gctx->gcm.len.u[1] += bulk;
bulk += res;
}
#endif
if (CRYPTO_gcm128_decrypt(&gctx->gcm,
- in + bulk, out + bulk, len - bulk))
+ in + bulk, out + bulk, len - bulk))
return -1;
}
}
@@ -3161,8 +3167,9 @@ static int aes_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
if (gctx->taglen < 0)
return -1;
if (CRYPTO_gcm128_finish(&gctx->gcm,
- EVP_CIPHER_CTX_buf_noconst(ctx),
- gctx->taglen) != 0)
+ EVP_CIPHER_CTX_buf_noconst(ctx),
+ gctx->taglen)
+ != 0)
return -1;
gctx->iv_set = 0;
return 0;
@@ -3173,28 +3180,27 @@ static int aes_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
gctx->iv_set = 0;
return 0;
}
-
}
-#define CUSTOM_FLAGS (EVP_CIPH_FLAG_DEFAULT_ASN1 \
- | EVP_CIPH_CUSTOM_IV | EVP_CIPH_FLAG_CUSTOM_CIPHER \
- | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CTRL_INIT \
- | EVP_CIPH_CUSTOM_COPY | EVP_CIPH_CUSTOM_IV_LENGTH)
+#define CUSTOM_FLAGS (EVP_CIPH_FLAG_DEFAULT_ASN1 \
+ | EVP_CIPH_CUSTOM_IV | EVP_CIPH_FLAG_CUSTOM_CIPHER \
+ | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CTRL_INIT \
+ | EVP_CIPH_CUSTOM_COPY | EVP_CIPH_CUSTOM_IV_LENGTH)
BLOCK_CIPHER_custom(NID_aes, 128, 1, 12, gcm, GCM,
- EVP_CIPH_FLAG_AEAD_CIPHER | CUSTOM_FLAGS)
-BLOCK_CIPHER_custom(NID_aes, 192, 1, 12, gcm, GCM,
- EVP_CIPH_FLAG_AEAD_CIPHER | CUSTOM_FLAGS)
-BLOCK_CIPHER_custom(NID_aes, 256, 1, 12, gcm, GCM,
- EVP_CIPH_FLAG_AEAD_CIPHER | CUSTOM_FLAGS)
+ EVP_CIPH_FLAG_AEAD_CIPHER | CUSTOM_FLAGS)
+ BLOCK_CIPHER_custom(NID_aes, 192, 1, 12, gcm, GCM,
+ EVP_CIPH_FLAG_AEAD_CIPHER | CUSTOM_FLAGS)
+ BLOCK_CIPHER_custom(NID_aes, 256, 1, 12, gcm, GCM,
+ EVP_CIPH_FLAG_AEAD_CIPHER | CUSTOM_FLAGS)
-static int aes_xts_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
+ static int aes_xts_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
{
EVP_AES_XTS_CTX *xctx = EVP_C_DATA(EVP_AES_XTS_CTX, c);
if (type == EVP_CTRL_COPY) {
EVP_CIPHER_CTX *out = ptr;
- EVP_AES_XTS_CTX *xctx_out = EVP_C_DATA(EVP_AES_XTS_CTX,out);
+ EVP_AES_XTS_CTX *xctx_out = EVP_C_DATA(EVP_AES_XTS_CTX, out);
if (xctx->xts.key1) {
if (xctx->xts.key1 != &xctx->ks1)
@@ -3216,9 +3222,9 @@ static int aes_xts_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
}
static int aes_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc)
+ const unsigned char *iv, int enc)
{
- EVP_AES_XTS_CTX *xctx = EVP_C_DATA(EVP_AES_XTS_CTX,ctx);
+ EVP_AES_XTS_CTX *xctx = EVP_C_DATA(EVP_AES_XTS_CTX, ctx);
if (iv == NULL && key == NULL)
return 1;
@@ -3251,7 +3257,7 @@ static int aes_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
* data with them."
*/
if ((!allow_insecure_decrypt || enc)
- && CRYPTO_memcmp(key, key + bytes, bytes) == 0) {
+ && CRYPTO_memcmp(key, key + bytes, bytes) == 0) {
ERR_raise(ERR_LIB_EVP, EVP_R_XTS_DUPLICATED_KEYS);
return 0;
}
@@ -3266,59 +3272,59 @@ static int aes_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
if (HWAES_CAPABLE) {
if (enc) {
HWAES_set_encrypt_key(key, bits, &xctx->ks1.ks);
- xctx->xts.block1 = (block128_f) HWAES_encrypt;
-# ifdef HWAES_xts_encrypt
+ xctx->xts.block1 = (block128_f)HWAES_encrypt;
+#ifdef HWAES_xts_encrypt
xctx->stream = HWAES_xts_encrypt;
-# endif
+#endif
} else {
HWAES_set_decrypt_key(key, bits, &xctx->ks1.ks);
- xctx->xts.block1 = (block128_f) HWAES_decrypt;
-# ifdef HWAES_xts_decrypt
+ xctx->xts.block1 = (block128_f)HWAES_decrypt;
+#ifdef HWAES_xts_decrypt
xctx->stream = HWAES_xts_decrypt;
#endif
}
HWAES_set_encrypt_key(key + bytes, bits, &xctx->ks2.ks);
- xctx->xts.block2 = (block128_f) HWAES_encrypt;
+ xctx->xts.block2 = (block128_f)HWAES_encrypt;
xctx->xts.key1 = &xctx->ks1;
break;
} else
#endif
#ifdef BSAES_CAPABLE
- if (BSAES_CAPABLE)
+ if (BSAES_CAPABLE)
xctx->stream = enc ? ossl_bsaes_xts_encrypt : ossl_bsaes_xts_decrypt;
else
#endif
#ifdef VPAES_CAPABLE
- if (VPAES_CAPABLE) {
+ if (VPAES_CAPABLE) {
if (enc) {
vpaes_set_encrypt_key(key, bits, &xctx->ks1.ks);
- xctx->xts.block1 = (block128_f) vpaes_encrypt;
+ xctx->xts.block1 = (block128_f)vpaes_encrypt;
} else {
vpaes_set_decrypt_key(key, bits, &xctx->ks1.ks);
- xctx->xts.block1 = (block128_f) vpaes_decrypt;
+ xctx->xts.block1 = (block128_f)vpaes_decrypt;
}
vpaes_set_encrypt_key(key + bytes, bits, &xctx->ks2.ks);
- xctx->xts.block2 = (block128_f) vpaes_encrypt;
+ xctx->xts.block2 = (block128_f)vpaes_encrypt;
xctx->xts.key1 = &xctx->ks1;
break;
} else
#endif
- (void)0; /* terminate potentially open 'else' */
+ (void)0; /* terminate potentially open 'else' */
if (enc) {
AES_set_encrypt_key(key, bits, &xctx->ks1.ks);
- xctx->xts.block1 = (block128_f) AES_encrypt;
+ xctx->xts.block1 = (block128_f)AES_encrypt;
} else {
AES_set_decrypt_key(key, bits, &xctx->ks1.ks);
- xctx->xts.block1 = (block128_f) AES_decrypt;
+ xctx->xts.block1 = (block128_f)AES_decrypt;
}
AES_set_encrypt_key(key + bytes, bits, &xctx->ks2.ks);
- xctx->xts.block2 = (block128_f) AES_encrypt;
+ xctx->xts.block2 = (block128_f)AES_encrypt;
xctx->xts.key1 = &xctx->ks1;
} while (0);
@@ -3333,15 +3339,15 @@ static int aes_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
}
static int aes_xts_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len)
+ const unsigned char *in, size_t len)
{
- EVP_AES_XTS_CTX *xctx = EVP_C_DATA(EVP_AES_XTS_CTX,ctx);
+ EVP_AES_XTS_CTX *xctx = EVP_C_DATA(EVP_AES_XTS_CTX, ctx);
if (xctx->xts.key1 == NULL
- || xctx->xts.key2 == NULL
- || out == NULL
- || in == NULL
- || len < AES_BLOCK_SIZE)
+ || xctx->xts.key2 == NULL
+ || out == NULL
+ || in == NULL
+ || len < AES_BLOCK_SIZE)
return 0;
/*
@@ -3356,27 +3362,27 @@ static int aes_xts_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
}
if (xctx->stream)
- (*xctx->stream) (in, out, len,
- xctx->xts.key1, xctx->xts.key2,
- ctx->iv);
+ (*xctx->stream)(in, out, len,
+ xctx->xts.key1, xctx->xts.key2,
+ ctx->iv);
else if (CRYPTO_xts128_encrypt(&xctx->xts, ctx->iv, in, out, len,
- EVP_CIPHER_CTX_is_encrypting(ctx)))
+ EVP_CIPHER_CTX_is_encrypting(ctx)))
return 0;
return 1;
}
#define aes_xts_cleanup NULL
-#define XTS_FLAGS (EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CUSTOM_IV \
- | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CTRL_INIT \
- | EVP_CIPH_CUSTOM_COPY)
+#define XTS_FLAGS (EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CUSTOM_IV \
+ | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CTRL_INIT \
+ | EVP_CIPH_CUSTOM_COPY)
BLOCK_CIPHER_custom(NID_aes, 128, 1, 16, xts, XTS, XTS_FLAGS)
-BLOCK_CIPHER_custom(NID_aes, 256, 1, 16, xts, XTS, XTS_FLAGS)
+ BLOCK_CIPHER_custom(NID_aes, 256, 1, 16, xts, XTS, XTS_FLAGS)
-static int aes_ccm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
+ static int aes_ccm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
{
- EVP_AES_CCM_CTX *cctx = EVP_C_DATA(EVP_AES_CCM_CTX,c);
+ EVP_AES_CCM_CTX *cctx = EVP_C_DATA(EVP_AES_CCM_CTX, c);
switch (type) {
case EVP_CTRL_INIT:
cctx->key_set = 0;
@@ -3399,8 +3405,7 @@ static int aes_ccm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
memcpy(EVP_CIPHER_CTX_buf_noconst(c), ptr, arg);
cctx->tls_aad_len = arg;
{
- uint16_t len =
- EVP_CIPHER_CTX_buf_noconst(c)[arg - 2] << 8
+ uint16_t len = EVP_CIPHER_CTX_buf_noconst(c)[arg - 2] << 8
| EVP_CIPHER_CTX_buf_noconst(c)[arg - 1];
/* Correct length for explicit IV */
if (len < EVP_CCM_TLS_EXPLICIT_IV_LEN)
@@ -3457,28 +3462,26 @@ static int aes_ccm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
cctx->len_set = 0;
return 1;
- case EVP_CTRL_COPY:
- {
- EVP_CIPHER_CTX *out = ptr;
- EVP_AES_CCM_CTX *cctx_out = EVP_C_DATA(EVP_AES_CCM_CTX,out);
- if (cctx->ccm.key) {
- if (cctx->ccm.key != &cctx->ks)
- return 0;
- cctx_out->ccm.key = &cctx_out->ks;
- }
- return 1;
+ case EVP_CTRL_COPY: {
+ EVP_CIPHER_CTX *out = ptr;
+ EVP_AES_CCM_CTX *cctx_out = EVP_C_DATA(EVP_AES_CCM_CTX, out);
+ if (cctx->ccm.key) {
+ if (cctx->ccm.key != &cctx->ks)
+ return 0;
+ cctx_out->ccm.key = &cctx_out->ks;
}
+ return 1;
+ }
default:
return -1;
-
}
}
static int aes_ccm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc)
+ const unsigned char *iv, int enc)
{
- EVP_AES_CCM_CTX *cctx = EVP_C_DATA(EVP_AES_CCM_CTX,ctx);
+ EVP_AES_CCM_CTX *cctx = EVP_C_DATA(EVP_AES_CCM_CTX, ctx);
if (iv == NULL && key == NULL)
return 1;
@@ -3496,17 +3499,17 @@ static int aes_ccm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
HWAES_set_encrypt_key(key, keylen, &cctx->ks.ks);
CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L,
- &cctx->ks, (block128_f) HWAES_encrypt);
+ &cctx->ks, (block128_f)HWAES_encrypt);
cctx->str = NULL;
cctx->key_set = 1;
break;
} else
#endif
#ifdef VPAES_CAPABLE
- if (VPAES_CAPABLE) {
+ if (VPAES_CAPABLE) {
vpaes_set_encrypt_key(key, keylen, &cctx->ks.ks);
CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L,
- &cctx->ks, (block128_f) vpaes_encrypt);
+ &cctx->ks, (block128_f)vpaes_encrypt);
cctx->str = NULL;
cctx->key_set = 1;
break;
@@ -3514,7 +3517,7 @@ static int aes_ccm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
#endif
AES_set_encrypt_key(key, keylen, &cctx->ks.ks);
CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L,
- &cctx->ks, (block128_f) AES_encrypt);
+ &cctx->ks, (block128_f)AES_encrypt);
cctx->str = NULL;
cctx->key_set = 1;
} while (0);
@@ -3527,9 +3530,9 @@ static int aes_ccm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
}
static int aes_ccm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len)
+ const unsigned char *in, size_t len)
{
- EVP_AES_CCM_CTX *cctx = EVP_C_DATA(EVP_AES_CCM_CTX,ctx);
+ EVP_AES_CCM_CTX *cctx = EVP_C_DATA(EVP_AES_CCM_CTX, ctx);
CCM128_CONTEXT *ccm = &cctx->ccm;
/* Encrypt/decrypt must be performed in place */
if (out != in || len < (EVP_CCM_TLS_EXPLICIT_IV_LEN + (size_t)cctx->M))
@@ -3537,33 +3540,33 @@ static int aes_ccm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
/* If encrypting set explicit IV from sequence number (start of AAD) */
if (EVP_CIPHER_CTX_is_encrypting(ctx))
memcpy(out, EVP_CIPHER_CTX_buf_noconst(ctx),
- EVP_CCM_TLS_EXPLICIT_IV_LEN);
+ EVP_CCM_TLS_EXPLICIT_IV_LEN);
/* Get rest of IV from explicit IV */
memcpy(ctx->iv + EVP_CCM_TLS_FIXED_IV_LEN, in,
- EVP_CCM_TLS_EXPLICIT_IV_LEN);
+ EVP_CCM_TLS_EXPLICIT_IV_LEN);
/* Correct length value */
len -= EVP_CCM_TLS_EXPLICIT_IV_LEN + cctx->M;
if (CRYPTO_ccm128_setiv(ccm, ctx->iv, 15 - cctx->L,
- len))
- return -1;
+ len))
+ return -1;
/* Use saved AAD */
CRYPTO_ccm128_aad(ccm, EVP_CIPHER_CTX_buf_noconst(ctx),
- cctx->tls_aad_len);
+ cctx->tls_aad_len);
/* Fix buffer to point to payload */
in += EVP_CCM_TLS_EXPLICIT_IV_LEN;
out += EVP_CCM_TLS_EXPLICIT_IV_LEN;
if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
if (cctx->str ? CRYPTO_ccm128_encrypt_ccm64(ccm, in, out, len,
- cctx->str) :
- CRYPTO_ccm128_encrypt(ccm, in, out, len))
+ cctx->str)
+ : CRYPTO_ccm128_encrypt(ccm, in, out, len))
return -1;
if (!CRYPTO_ccm128_tag(ccm, out + len, cctx->M))
return -1;
return (int)(len + EVP_CCM_TLS_EXPLICIT_IV_LEN + cctx->M);
} else {
if (cctx->str ? !CRYPTO_ccm128_decrypt_ccm64(ccm, in, out, len,
- cctx->str) :
- !CRYPTO_ccm128_decrypt(ccm, in, out, len)) {
+ cctx->str)
+ : !CRYPTO_ccm128_decrypt(ccm, in, out, len)) {
unsigned char tag[16];
if (CRYPTO_ccm128_tag(ccm, tag, cctx->M)) {
if (!CRYPTO_memcmp(tag, in + len, cctx->M))
@@ -3576,9 +3579,9 @@ static int aes_ccm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
}
static int aes_ccm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len)
+ const unsigned char *in, size_t len)
{
- EVP_AES_CCM_CTX *cctx = EVP_C_DATA(EVP_AES_CCM_CTX,ctx);
+ EVP_AES_CCM_CTX *cctx = EVP_C_DATA(EVP_AES_CCM_CTX, ctx);
CCM128_CONTEXT *ccm = &cctx->ccm;
/* If not set up, return error */
if (!cctx->key_set)
@@ -3597,7 +3600,7 @@ static int aes_ccm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
if (!out) {
if (!in) {
if (CRYPTO_ccm128_setiv(ccm, ctx->iv,
- 15 - cctx->L, len))
+ 15 - cctx->L, len))
return -1;
cctx->len_set = 1;
return (int)len;
@@ -3621,20 +3624,20 @@ static int aes_ccm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
}
if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
if (cctx->str ? CRYPTO_ccm128_encrypt_ccm64(ccm, in, out, len,
- cctx->str) :
- CRYPTO_ccm128_encrypt(ccm, in, out, len))
+ cctx->str)
+ : CRYPTO_ccm128_encrypt(ccm, in, out, len))
return -1;
cctx->tag_set = 1;
return (int)len;
} else {
int rv = -1;
if (cctx->str ? !CRYPTO_ccm128_decrypt_ccm64(ccm, in, out, len,
- cctx->str) :
- !CRYPTO_ccm128_decrypt(ccm, in, out, len)) {
+ cctx->str)
+ : !CRYPTO_ccm128_decrypt(ccm, in, out, len)) {
unsigned char tag[16];
if (CRYPTO_ccm128_tag(ccm, tag, cctx->M)) {
if (!CRYPTO_memcmp(tag, EVP_CIPHER_CTX_buf_noconst(ctx),
- cctx->M))
+ cctx->M))
rv = (int)len;
}
}
@@ -3650,13 +3653,13 @@ static int aes_ccm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
#define aes_ccm_cleanup NULL
BLOCK_CIPHER_custom(NID_aes, 128, 1, 12, ccm, CCM,
- EVP_CIPH_FLAG_AEAD_CIPHER | CUSTOM_FLAGS)
-BLOCK_CIPHER_custom(NID_aes, 192, 1, 12, ccm, CCM,
- EVP_CIPH_FLAG_AEAD_CIPHER | CUSTOM_FLAGS)
-BLOCK_CIPHER_custom(NID_aes, 256, 1, 12, ccm, CCM,
- EVP_CIPH_FLAG_AEAD_CIPHER | CUSTOM_FLAGS)
+ EVP_CIPH_FLAG_AEAD_CIPHER | CUSTOM_FLAGS)
+ BLOCK_CIPHER_custom(NID_aes, 192, 1, 12, ccm, CCM,
+ EVP_CIPH_FLAG_AEAD_CIPHER | CUSTOM_FLAGS)
+ BLOCK_CIPHER_custom(NID_aes, 256, 1, 12, ccm, CCM,
+ EVP_CIPH_FLAG_AEAD_CIPHER | CUSTOM_FLAGS)
-typedef struct {
+ typedef struct {
union {
OSSL_UNION_ALIGN;
AES_KEY ks;
@@ -3666,10 +3669,10 @@ typedef struct {
} EVP_AES_WRAP_CTX;
static int aes_wrap_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc)
+ const unsigned char *iv, int enc)
{
int len;
- EVP_AES_WRAP_CTX *wctx = EVP_C_DATA(EVP_AES_WRAP_CTX,ctx);
+ EVP_AES_WRAP_CTX *wctx = EVP_C_DATA(EVP_AES_WRAP_CTX, ctx);
if (iv == NULL && key == NULL)
return 1;
@@ -3697,9 +3700,9 @@ static int aes_wrap_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
}
static int aes_wrap_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t inlen)
+ const unsigned char *in, size_t inlen)
{
- EVP_AES_WRAP_CTX *wctx = EVP_C_DATA(EVP_AES_WRAP_CTX,ctx);
+ EVP_AES_WRAP_CTX *wctx = EVP_C_DATA(EVP_AES_WRAP_CTX, ctx);
size_t rv;
/* AES wrap with padding has IV length of 4, without padding 8 */
int pad = EVP_CIPHER_CTX_get_iv_length(ctx) == 4;
@@ -3738,26 +3741,26 @@ static int aes_wrap_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
if (pad) {
if (EVP_CIPHER_CTX_is_encrypting(ctx))
rv = CRYPTO_128_wrap_pad(&wctx->ks.ks, wctx->iv,
- out, in, inlen,
- (block128_f) AES_encrypt);
+ out, in, inlen,
+ (block128_f)AES_encrypt);
else
rv = CRYPTO_128_unwrap_pad(&wctx->ks.ks, wctx->iv,
- out, in, inlen,
- (block128_f) AES_decrypt);
+ out, in, inlen,
+ (block128_f)AES_decrypt);
} else {
if (EVP_CIPHER_CTX_is_encrypting(ctx))
rv = CRYPTO_128_wrap(&wctx->ks.ks, wctx->iv,
- out, in, inlen, (block128_f) AES_encrypt);
+ out, in, inlen, (block128_f)AES_encrypt);
else
rv = CRYPTO_128_unwrap(&wctx->ks.ks, wctx->iv,
- out, in, inlen, (block128_f) AES_decrypt);
+ out, in, inlen, (block128_f)AES_decrypt);
}
return rv ? (int)rv : -1;
}
-#define WRAP_FLAGS (EVP_CIPH_WRAP_MODE \
- | EVP_CIPH_CUSTOM_IV | EVP_CIPH_FLAG_CUSTOM_CIPHER \
- | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_FLAG_DEFAULT_ASN1)
+#define WRAP_FLAGS (EVP_CIPH_WRAP_MODE \
+ | EVP_CIPH_CUSTOM_IV | EVP_CIPH_FLAG_CUSTOM_CIPHER \
+ | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_FLAG_DEFAULT_ASN1)
static const EVP_CIPHER aes_128_wrap = {
NID_id_aes128_wrap,
@@ -3846,7 +3849,7 @@ const EVP_CIPHER *EVP_aes_256_wrap_pad(void)
#ifndef OPENSSL_NO_OCB
static int aes_ocb_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
{
- EVP_AES_OCB_CTX *octx = EVP_C_DATA(EVP_AES_OCB_CTX,c);
+ EVP_AES_OCB_CTX *octx = EVP_C_DATA(EVP_AES_OCB_CTX, c);
EVP_CIPHER_CTX *newc;
EVP_AES_OCB_CTX *new_octx;
@@ -3896,27 +3899,26 @@ static int aes_ocb_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
case EVP_CTRL_COPY:
newc = (EVP_CIPHER_CTX *)ptr;
- new_octx = EVP_C_DATA(EVP_AES_OCB_CTX,newc);
+ new_octx = EVP_C_DATA(EVP_AES_OCB_CTX, newc);
return CRYPTO_ocb128_copy_ctx(&new_octx->ocb, &octx->ocb,
- &new_octx->ksenc.ks,
- &new_octx->ksdec.ks);
+ &new_octx->ksenc.ks,
+ &new_octx->ksdec.ks);
default:
return -1;
-
}
}
static int aes_ocb_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc)
+ const unsigned char *iv, int enc)
{
- EVP_AES_OCB_CTX *octx = EVP_C_DATA(EVP_AES_OCB_CTX,ctx);
+ EVP_AES_OCB_CTX *octx = EVP_C_DATA(EVP_AES_OCB_CTX, ctx);
if (iv == NULL && key == NULL)
return 1;
if (key != NULL) {
- const int keylen = EVP_CIPHER_CTX_get_key_length(ctx) * 8;
+ const int keylen = EVP_CIPHER_CTX_get_key_length(ctx) * 8;
if (keylen <= 0) {
ERR_raise(ERR_LIB_EVP, EVP_R_INVALID_KEY_LENGTH);
@@ -3928,43 +3930,42 @@ static int aes_ocb_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
* needs both. We could possibly optimise to remove setting the
* decrypt for an encryption operation.
*/
-# ifdef HWAES_CAPABLE
+#ifdef HWAES_CAPABLE
if (HWAES_CAPABLE) {
HWAES_set_encrypt_key(key, keylen, &octx->ksenc.ks);
HWAES_set_decrypt_key(key, keylen, &octx->ksdec.ks);
if (!CRYPTO_ocb128_init(&octx->ocb,
- &octx->ksenc.ks, &octx->ksdec.ks,
- (block128_f) HWAES_encrypt,
- (block128_f) HWAES_decrypt,
- enc ? HWAES_ocb_encrypt
- : HWAES_ocb_decrypt))
+ &octx->ksenc.ks, &octx->ksdec.ks,
+ (block128_f)HWAES_encrypt,
+ (block128_f)HWAES_decrypt,
+ enc ? HWAES_ocb_encrypt
+ : HWAES_ocb_decrypt))
return 0;
break;
}
-# endif
-# ifdef VPAES_CAPABLE
+#endif
+#ifdef VPAES_CAPABLE
if (VPAES_CAPABLE) {
vpaes_set_encrypt_key(key, keylen, &octx->ksenc.ks);
vpaes_set_decrypt_key(key, keylen, &octx->ksdec.ks);
if (!CRYPTO_ocb128_init(&octx->ocb,
- &octx->ksenc.ks, &octx->ksdec.ks,
- (block128_f) vpaes_encrypt,
- (block128_f) vpaes_decrypt,
- NULL))
+ &octx->ksenc.ks, &octx->ksdec.ks,
+ (block128_f)vpaes_encrypt,
+ (block128_f)vpaes_decrypt,
+ NULL))
return 0;
break;
}
-# endif
+#endif
AES_set_encrypt_key(key, keylen, &octx->ksenc.ks);
AES_set_decrypt_key(key, keylen, &octx->ksdec.ks);
if (!CRYPTO_ocb128_init(&octx->ocb,
- &octx->ksenc.ks, &octx->ksdec.ks,
- (block128_f) AES_encrypt,
- (block128_f) AES_decrypt,
- NULL))
+ &octx->ksenc.ks, &octx->ksdec.ks,
+ (block128_f)AES_encrypt,
+ (block128_f)AES_decrypt,
+ NULL))
return 0;
- }
- while (0);
+ } while (0);
/*
* If we have an iv we can set it directly, otherwise use saved IV.
@@ -3990,13 +3991,13 @@ static int aes_ocb_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
}
static int aes_ocb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len)
+ const unsigned char *in, size_t len)
{
unsigned char *buf;
int *buf_len;
int written_len = 0;
size_t trailing_len;
- EVP_AES_OCB_CTX *octx = EVP_C_DATA(EVP_AES_OCB_CTX,ctx);
+ EVP_AES_OCB_CTX *octx = EVP_C_DATA(EVP_AES_OCB_CTX, ctx);
/* If IV or Key not set then return error */
if (!octx->iv_set)
@@ -4052,11 +4053,11 @@ static int aes_ocb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
return -1;
} else if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
if (!CRYPTO_ocb128_encrypt(&octx->ocb, buf, out,
- AES_BLOCK_SIZE))
+ AES_BLOCK_SIZE))
return -1;
} else {
if (!CRYPTO_ocb128_decrypt(&octx->ocb, buf, out,
- AES_BLOCK_SIZE))
+ AES_BLOCK_SIZE))
return -1;
}
written_len = AES_BLOCK_SIZE;
@@ -4076,12 +4077,10 @@ static int aes_ocb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
if (!CRYPTO_ocb128_aad(&octx->ocb, in, len - trailing_len))
return -1;
} else if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
- if (!CRYPTO_ocb128_encrypt
- (&octx->ocb, in, out, len - trailing_len))
+ if (!CRYPTO_ocb128_encrypt(&octx->ocb, in, out, len - trailing_len))
return -1;
} else {
- if (!CRYPTO_ocb128_decrypt
- (&octx->ocb, in, out, len - trailing_len))
+ if (!CRYPTO_ocb128_decrypt(&octx->ocb, in, out, len - trailing_len))
return -1;
}
written_len += (int)(len - trailing_len);
@@ -4103,19 +4102,18 @@ static int aes_ocb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
if (octx->data_buf_len > 0) {
if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
if (!CRYPTO_ocb128_encrypt(&octx->ocb, octx->data_buf, out,
- octx->data_buf_len))
+ octx->data_buf_len))
return -1;
} else {
if (!CRYPTO_ocb128_decrypt(&octx->ocb, octx->data_buf, out,
- octx->data_buf_len))
+ octx->data_buf_len))
return -1;
}
written_len = octx->data_buf_len;
octx->data_buf_len = 0;
}
if (octx->aad_buf_len > 0) {
- if (!CRYPTO_ocb128_aad
- (&octx->ocb, octx->aad_buf, octx->aad_buf_len))
+ if (!CRYPTO_ocb128_aad(&octx->ocb, octx->aad_buf, octx->aad_buf_len))
return -1;
octx->aad_buf_len = 0;
}
@@ -4124,7 +4122,8 @@ static int aes_ocb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
if (octx->taglen < 0)
return -1;
if (CRYPTO_ocb128_finish(&octx->ocb,
- octx->tag, octx->taglen) != 0)
+ octx->tag, octx->taglen)
+ != 0)
return -1;
octx->iv_set = 0;
return written_len;
@@ -4140,15 +4139,15 @@ static int aes_ocb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
static int aes_ocb_cleanup(EVP_CIPHER_CTX *c)
{
- EVP_AES_OCB_CTX *octx = EVP_C_DATA(EVP_AES_OCB_CTX,c);
+ EVP_AES_OCB_CTX *octx = EVP_C_DATA(EVP_AES_OCB_CTX, c);
CRYPTO_ocb128_cleanup(&octx->ocb);
return 1;
}
BLOCK_CIPHER_custom(NID_aes, 128, 16, 12, ocb, OCB,
- EVP_CIPH_FLAG_AEAD_CIPHER | CUSTOM_FLAGS)
-BLOCK_CIPHER_custom(NID_aes, 192, 16, 12, ocb, OCB,
- EVP_CIPH_FLAG_AEAD_CIPHER | CUSTOM_FLAGS)
-BLOCK_CIPHER_custom(NID_aes, 256, 16, 12, ocb, OCB,
- EVP_CIPH_FLAG_AEAD_CIPHER | CUSTOM_FLAGS)
-#endif /* OPENSSL_NO_OCB */
+ EVP_CIPH_FLAG_AEAD_CIPHER | CUSTOM_FLAGS)
+ BLOCK_CIPHER_custom(NID_aes, 192, 16, 12, ocb, OCB,
+ EVP_CIPH_FLAG_AEAD_CIPHER | CUSTOM_FLAGS)
+ BLOCK_CIPHER_custom(NID_aes, 256, 16, 12, ocb, OCB,
+ EVP_CIPH_FLAG_AEAD_CIPHER | CUSTOM_FLAGS)
+#endif /* OPENSSL_NO_OCB */
diff --git a/crypto/evp/e_aes_cbc_hmac_sha1.c b/crypto/evp/e_aes_cbc_hmac_sha1.c
index 56bf41b781..6e914ef096 100644
--- a/crypto/evp/e_aes_cbc_hmac_sha1.c
+++ b/crypto/evp/e_aes_cbc_hmac_sha1.c
@@ -31,44 +31,42 @@
typedef struct {
AES_KEY ks;
SHA_CTX head, tail, md;
- size_t payload_length; /* AAD length in decrypt case */
+ size_t payload_length; /* AAD length in decrypt case */
union {
unsigned int tls_ver;
unsigned char tls_aad[16]; /* 13 used */
} aux;
} EVP_AES_HMAC_SHA1;
-#define NO_PAYLOAD_LENGTH ((size_t)-1)
+#define NO_PAYLOAD_LENGTH ((size_t)-1)
-#if defined(AES_ASM) && ( \
- defined(__x86_64) || defined(__x86_64__) || \
- defined(_M_AMD64) || defined(_M_X64) )
+#if defined(AES_ASM) && (defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64))
-# define AESNI_CAPABLE (1<<(57-32))
+#define AESNI_CAPABLE (1 << (57 - 32))
int aesni_set_encrypt_key(const unsigned char *userKey, int bits,
- AES_KEY *key);
+ AES_KEY *key);
int aesni_set_decrypt_key(const unsigned char *userKey, int bits,
- AES_KEY *key);
+ AES_KEY *key);
void aesni_cbc_encrypt(const unsigned char *in,
- unsigned char *out,
- size_t length,
- const AES_KEY *key, unsigned char *ivec, int enc);
+ unsigned char *out,
+ size_t length,
+ const AES_KEY *key, unsigned char *ivec, int enc);
void aesni_cbc_sha1_enc(const void *inp, void *out, size_t blocks,
- const AES_KEY *key, unsigned char iv[16],
- SHA_CTX *ctx, const void *in0);
+ const AES_KEY *key, unsigned char iv[16],
+ SHA_CTX *ctx, const void *in0);
void aesni256_cbc_sha1_dec(const void *inp, void *out, size_t blocks,
- const AES_KEY *key, unsigned char iv[16],
- SHA_CTX *ctx, const void *in0);
+ const AES_KEY *key, unsigned char iv[16],
+ SHA_CTX *ctx, const void *in0);
-# define data(ctx) ((EVP_AES_HMAC_SHA1 *)EVP_CIPHER_CTX_get_cipher_data(ctx))
+#define data(ctx) ((EVP_AES_HMAC_SHA1 *)EVP_CIPHER_CTX_get_cipher_data(ctx))
static int aesni_cbc_hmac_sha1_init_key(EVP_CIPHER_CTX *ctx,
- const unsigned char *inkey,
- const unsigned char *iv, int enc)
+ const unsigned char *inkey,
+ const unsigned char *iv, int enc)
{
EVP_AES_HMAC_SHA1 *key = data(ctx);
int ret;
@@ -83,7 +81,7 @@ static int aesni_cbc_hmac_sha1_init_key(EVP_CIPHER_CTX *ctx,
else
ret = aesni_set_decrypt_key(inkey, keylen, &key->ks);
- SHA1_Init(&key->head); /* handy when benchmarking */
+ SHA1_Init(&key->head); /* handy when benchmarking */
key->tail = key->head;
key->md = key->head;
@@ -92,12 +90,12 @@ static int aesni_cbc_hmac_sha1_init_key(EVP_CIPHER_CTX *ctx,
return ret < 0 ? 0 : 1;
}
-# define STITCHED_CALL
-# undef STITCHED_DECRYPT_CALL
+#define STITCHED_CALL
+#undef STITCHED_DECRYPT_CALL
-# if !defined(STITCHED_CALL)
-# define aes_off 0
-# endif
+#if !defined(STITCHED_CALL)
+#define aes_off 0
+#endif
void sha1_block_data_order(void *c, const void *p, size_t len);
@@ -132,12 +130,12 @@ static void sha1_update(SHA_CTX *c, const void *data, size_t len)
SHA1_Update(c, ptr, res);
}
-# ifdef SHA1_Update
-# undef SHA1_Update
-# endif
-# define SHA1_Update sha1_update
+#ifdef SHA1_Update
+#undef SHA1_Update
+#endif
+#define SHA1_Update sha1_update
-# if !defined(OPENSSL_NO_MULTIBLOCK)
+#if !defined(OPENSSL_NO_MULTIBLOCK)
typedef struct {
unsigned int A[8], B[8], C[8], D[8], E[8];
@@ -159,10 +157,10 @@ typedef struct {
void aesni_multi_cbc_encrypt(CIPH_DESC *, void *, int);
static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA1 *key,
- unsigned char *out,
- const unsigned char *inp,
- size_t inp_len, int n4x)
-{ /* n4x is 1 or 2 */
+ unsigned char *out,
+ const unsigned char *inp,
+ size_t inp_len, int n4x)
+{ /* n4x is 1 or 2 */
HASH_DESC hash_d[8], edges[8];
CIPH_DESC ciph_d[8];
unsigned char storage[sizeof(SHA1_MB_CTX) + 32];
@@ -172,19 +170,18 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA1 *key,
u8 c[128];
} blocks[8];
SHA1_MB_CTX *ctx;
- unsigned int frag, last, packlen, i, x4 = 4 * n4x, minblocks, processed =
- 0;
+ unsigned int frag, last, packlen, i, x4 = 4 * n4x, minblocks, processed = 0;
size_t ret = 0;
u8 *IVs;
-# if defined(BSWAP8)
+#if defined(BSWAP8)
u64 seqnum;
-# endif
+#endif
/* ask for IVs in bulk */
if (RAND_bytes((IVs = blocks[0].c), 16 * x4) <= 0)
return 0;
- ctx = (SHA1_MB_CTX *) (storage + 32 - ((size_t)storage % 32)); /* align */
+ ctx = (SHA1_MB_CTX *)(storage + 32 - ((size_t)storage % 32)); /* align */
frag = (unsigned int)inp_len >> (1 + n4x);
last = (unsigned int)inp_len + frag - (frag << (1 + n4x));
@@ -212,15 +209,15 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA1 *key,
IVs += 16;
}
-# if defined(BSWAP8)
+#if defined(BSWAP8)
memcpy(blocks[0].c, key->md.data, 8);
seqnum = BSWAP8(blocks[0].q[0]);
-# endif
+#endif
for (i = 0; i < x4; i++) {
unsigned int len = (i == (x4 - 1) ? last : frag);
-# if !defined(BSWAP8)
+#if !defined(BSWAP8)
unsigned int carry, j;
-# endif
+#endif
ctx->A[i] = key->md.h0;
ctx->B[i] = key->md.h1;
@@ -229,14 +226,14 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA1 *key,
ctx->E[i] = key->md.h4;
/* fix seqnum */
-# if defined(BSWAP8)
+#if defined(BSWAP8)
blocks[i].q[0] = BSWAP8(seqnum + i);
-# else
+#else
for (carry = i, j = 8; j--;) {
blocks[i].c[j] = ((u8 *)key->md.data)[j] + carry;
carry = (blocks[i].c[j] - carry) >> (sizeof(carry) * 8 - 1);
}
-# endif
+#endif
blocks[i].c[8] = ((u8 *)key->md.data)[8];
blocks[i].c[9] = ((u8 *)key->md.data)[9];
blocks[i].c[10] = ((u8 *)key->md.data)[10];
@@ -255,10 +252,10 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA1 *key,
/* hash 13-byte headers and first 64-13 bytes of inputs */
sha1_multi_block(ctx, edges, n4x);
/* hash bulk inputs */
-# define MAXCHUNKSIZE 2048
-# if MAXCHUNKSIZE%64
-# error "MAXCHUNKSIZE is not divisible by 64"
-# elif MAXCHUNKSIZE
+#define MAXCHUNKSIZE 2048
+#if MAXCHUNKSIZE % 64
+#error "MAXCHUNKSIZE is not divisible by 64"
+#elif MAXCHUNKSIZE
/*
* goal is to minimize pressure on L1 cache by moving in shorter steps,
* so that hashed data is still in the cache by the time we encrypt it
@@ -287,34 +284,34 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA1 *key,
minblocks -= MAXCHUNKSIZE / 64;
} while (minblocks > MAXCHUNKSIZE / 64);
}
-# endif
-# undef MAXCHUNKSIZE
+#endif
+#undef MAXCHUNKSIZE
sha1_multi_block(ctx, hash_d, n4x);
memset(blocks, 0, sizeof(blocks));
for (i = 0; i < x4; i++) {
unsigned int len = (i == (x4 - 1) ? last : frag),
- off = hash_d[i].blocks * 64;
+ off = hash_d[i].blocks * 64;
const unsigned char *ptr = hash_d[i].ptr + off;
off = (len - processed) - (64 - 13) - off; /* remainder actually */
memcpy(blocks[i].c, ptr, off);
blocks[i].c[off] = 0x80;
- len += 64 + 13; /* 64 is HMAC header */
- len *= 8; /* convert to bits */
+ len += 64 + 13; /* 64 is HMAC header */
+ len *= 8; /* convert to bits */
if (off < (64 - 8)) {
-# ifdef BSWAP4
+#ifdef BSWAP4
blocks[i].d[15] = BSWAP4(len);
-# else
+#else
PUTU32(blocks[i].c + 60, len);
-# endif
+#endif
edges[i].blocks = 1;
} else {
-# ifdef BSWAP4
+#ifdef BSWAP4
blocks[i].d[31] = BSWAP4(len);
-# else
+#else
PUTU32(blocks[i].c + 124, len);
-# endif
+#endif
edges[i].blocks = 2;
}
edges[i].ptr = blocks[i].c;
@@ -325,7 +322,7 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA1 *key,
memset(blocks, 0, sizeof(blocks));
for (i = 0; i < x4; i++) {
-# ifdef BSWAP4
+#ifdef BSWAP4
blocks[i].d[0] = BSWAP4(ctx->A[i]);
ctx->A[i] = key->tail.h0;
blocks[i].d[1] = BSWAP4(ctx->B[i]);
@@ -338,7 +335,7 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA1 *key,
ctx->E[i] = key->tail.h4;
blocks[i].c[20] = 0x80;
blocks[i].d[15] = BSWAP4((64 + 20) * 8);
-# else
+#else
PUTU32(blocks[i].c + 0, ctx->A[i]);
ctx->A[i] = key->tail.h0;
PUTU32(blocks[i].c + 4, ctx->B[i]);
@@ -351,7 +348,7 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA1 *key,
ctx->E[i] = key->tail.h4;
blocks[i].c[20] = 0x80;
PUTU32(blocks[i].c + 60, (64 + 20) * 8);
-# endif
+#endif
edges[i].ptr = blocks[i].c;
edges[i].blocks = 1;
}
@@ -384,7 +381,7 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA1 *key,
len += pad + 1;
ciph_d[i].blocks = (len - processed) / 16;
- len += 16; /* account for explicit iv */
+ len += 16; /* account for explicit iv */
/* arrange header */
out0[0] = ((u8 *)key->md.data)[8];
@@ -404,21 +401,21 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA1 *key,
return ret;
}
-# endif
+#endif
static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len)
+ const unsigned char *in, size_t len)
{
EVP_AES_HMAC_SHA1 *key = data(ctx);
unsigned int l;
size_t plen = key->payload_length, iv = 0, /* explicit IV in TLS 1.1 and
* later */
sha_off = 0;
-# if defined(STITCHED_CALL)
+#if defined(STITCHED_CALL)
size_t aes_off = 0, blocks;
sha_off = SHA_CBLOCK - key->md.num;
-# endif
+#endif
key->payload_length = NO_PAYLOAD_LENGTH;
@@ -428,20 +425,18 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
if (plen == NO_PAYLOAD_LENGTH)
plen = len;
- else if (len !=
- ((plen + SHA_DIGEST_LENGTH +
- AES_BLOCK_SIZE) & -AES_BLOCK_SIZE))
+ else if (len != ((plen + SHA_DIGEST_LENGTH + AES_BLOCK_SIZE) & -AES_BLOCK_SIZE))
return 0;
else if (key->aux.tls_ver >= TLS1_1_VERSION)
iv = AES_BLOCK_SIZE;
-# if defined(STITCHED_CALL)
+#if defined(STITCHED_CALL)
if (plen > (sha_off + iv)
&& (blocks = (plen - (sha_off + iv)) / SHA_CBLOCK)) {
SHA1_Update(&key->md, in + iv, sha_off);
aesni_cbc_sha1_enc(in, out, blocks, &key->ks, ctx->iv,
- &key->md, in + iv + sha_off);
+ &key->md, in + iv + sha_off);
blocks *= SHA_CBLOCK;
aes_off += blocks;
sha_off += blocks;
@@ -452,11 +447,11 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
} else {
sha_off = 0;
}
-# endif
+#endif
sha_off += iv;
SHA1_Update(&key->md, in + sha_off, plen - sha_off);
- if (plen != len) { /* "TLS" mode of operation */
+ if (plen != len) { /* "TLS" mode of operation */
if (in != out)
memcpy(out + aes_off, in + aes_off, plen - aes_off);
@@ -472,10 +467,10 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
out[plen] = l;
/* encrypt HMAC|padding at once */
aesni_cbc_encrypt(out + aes_off, out + aes_off, len - aes_off,
- &key->ks, ctx->iv, 1);
+ &key->ks, ctx->iv, 1);
} else {
aesni_cbc_encrypt(in + aes_off, out + aes_off, len - aes_off,
- &key->ks, ctx->iv, 1);
+ &key->ks, ctx->iv, 1);
}
} else {
union {
@@ -494,7 +489,7 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
unsigned int u[SHA_LBLOCK];
unsigned char c[SHA_CBLOCK];
} *data = (void *)key->md.data;
-# if defined(STITCHED_DECRYPT_CALL)
+#if defined(STITCHED_DECRYPT_CALL)
unsigned char tail_iv[AES_BLOCK_SIZE];
int stitch = 0;
const int keylen = EVP_CIPHER_CTX_get_key_length(ctx);
@@ -503,7 +498,7 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
ERR_raise(ERR_LIB_EVP, EVP_R_INVALID_KEY_LENGTH);
return 0;
}
-# endif
+#endif
if ((key->aux.tls_aad[plen - 4] << 8 | key->aux.tls_aad[plen - 3])
>= TLS1_1_VERSION) {
@@ -519,20 +514,20 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
} else if (len < (SHA_DIGEST_LENGTH + 1))
return 0;
-# if defined(STITCHED_DECRYPT_CALL)
+#if defined(STITCHED_DECRYPT_CALL)
if (len >= 1024 && keylen == 32) {
/* decrypt last block */
memcpy(tail_iv, in + len - 2 * AES_BLOCK_SIZE,
- AES_BLOCK_SIZE);
+ AES_BLOCK_SIZE);
aesni_cbc_encrypt(in + len - AES_BLOCK_SIZE,
- out + len - AES_BLOCK_SIZE, AES_BLOCK_SIZE,
- &key->ks, tail_iv, 0);
+ out + len - AES_BLOCK_SIZE, AES_BLOCK_SIZE,
+ &key->ks, tail_iv, 0);
stitch = 1;
} else
-# endif
+#endif
/* decrypt HMAC|padding at once */
aesni_cbc_encrypt(in, out, len, &key->ks,
- ctx->iv, 0);
+ ctx->iv, 0);
/* figure out payload length */
pad = out[len - 1];
@@ -559,7 +554,7 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
key->md = key->head;
SHA1_Update(&key->md, key->aux.tls_aad, plen);
-# if defined(STITCHED_DECRYPT_CALL)
+#if defined(STITCHED_DECRYPT_CALL)
if (stitch) {
blocks = (len - (256 + 32 + SHA_CBLOCK)) / SHA_CBLOCK;
aes_off = len - AES_BLOCK_SIZE - blocks * SHA_CBLOCK;
@@ -569,8 +564,8 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
SHA1_Update(&key->md, out, sha_off);
aesni256_cbc_sha1_dec(in + aes_off,
- out + aes_off, blocks, &key->ks,
- ctx->iv, &key->md, out + sha_off);
+ out + aes_off, blocks, &key->ks,
+ ctx->iv, &key->md, out + sha_off);
sha_off += blocks *= SHA_CBLOCK;
out += sha_off;
@@ -580,9 +575,9 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
key->md.Nl += (blocks << 3); /* at most 18 bits */
memcpy(ctx->iv, tail_iv, AES_BLOCK_SIZE);
}
-# endif
+#endif
-# if 1 /* see original reference version in #else */
+#if 1 /* see original reference version in #else */
len -= SHA_DIGEST_LENGTH; /* amend mac */
if (len >= (256 + SHA_CBLOCK)) {
j = (len - (256 + SHA_CBLOCK)) & (0 - SHA_CBLOCK);
@@ -595,15 +590,15 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
/* but pretend as if we hashed padded payload */
bitlen = key->md.Nl + (unsigned int)(inp_len << 3); /* at most 18 bits */
-# ifdef BSWAP4
+#ifdef BSWAP4
bitlen = BSWAP4(bitlen);
-# else
+#else
mac.c[0] = 0;
mac.c[1] = (unsigned char)(bitlen >> 16);
mac.c[2] = (unsigned char)(bitlen >> 8);
mac.c[3] = (unsigned char)bitlen;
bitlen = mac.u[0];
-# endif
+#endif
pmac->u[0] = 0;
pmac->u[1] = 0;
@@ -660,13 +655,13 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
pmac->u[3] |= key->md.h3 & mask;
pmac->u[4] |= key->md.h4 & mask;
-# ifdef BSWAP4
+#ifdef BSWAP4
pmac->u[0] = BSWAP4(pmac->u[0]);
pmac->u[1] = BSWAP4(pmac->u[1]);
pmac->u[2] = BSWAP4(pmac->u[2]);
pmac->u[3] = BSWAP4(pmac->u[3]);
pmac->u[4] = BSWAP4(pmac->u[4]);
-# else
+#else
for (i = 0; i < 5; i++) {
res = pmac->u[i];
pmac->c[4 * i + 0] = (unsigned char)(res >> 24);
@@ -674,9 +669,9 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
pmac->c[4 * i + 2] = (unsigned char)(res >> 8);
pmac->c[4 * i + 3] = (unsigned char)res;
}
-# endif
+#endif
len += SHA_DIGEST_LENGTH;
-# else /* pre-lucky-13 reference version of above */
+#else /* pre-lucky-13 reference version of above */
SHA1_Update(&key->md, out, inp_len);
res = key->md.num;
SHA1_Final(pmac->c, &key->md);
@@ -685,17 +680,15 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
unsigned int inp_blocks, pad_blocks;
/* but pretend as if we hashed padded payload */
- inp_blocks =
- 1 + ((SHA_CBLOCK - 9 - res) >> (sizeof(res) * 8 - 1));
+ inp_blocks = 1 + ((SHA_CBLOCK - 9 - res) >> (sizeof(res) * 8 - 1));
res += (unsigned int)(len - inp_len);
pad_blocks = res / SHA_CBLOCK;
res %= SHA_CBLOCK;
- pad_blocks +=
- 1 + ((SHA_CBLOCK - 9 - res) >> (sizeof(res) * 8 - 1));
+ pad_blocks += 1 + ((SHA_CBLOCK - 9 - res) >> (sizeof(res) * 8 - 1));
for (; inp_blocks < pad_blocks; inp_blocks++)
sha1_block_data_order(&key->md, data, 1);
}
-# endif
+#endif
key->md = key->tail;
SHA1_Update(&key->md, pmac->c, SHA_DIGEST_LENGTH);
SHA1_Final(pmac->c, &key->md);
@@ -703,7 +696,7 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
/* verify HMAC */
out += inp_len;
len -= inp_len;
-# if 1 /* see original reference version in #else */
+#if 1 /* see original reference version in #else */
{
unsigned char *p = out + len - 1 - maxpad - SHA_DIGEST_LENGTH;
size_t off = out - p;
@@ -711,9 +704,7 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
for (res = 0, i = 0, j = 0; j < maxpad + SHA_DIGEST_LENGTH; j++) {
c = p[j];
- cmask =
- ((int)(j - off - SHA_DIGEST_LENGTH)) >> (sizeof(int) *
- 8 - 1);
+ cmask = ((int)(j - off - SHA_DIGEST_LENGTH)) >> (sizeof(int) * 8 - 1);
res |= (c ^ pad) & ~cmask; /* ... and padding */
cmask &= ((int)(off - 1 - j)) >> (sizeof(int) * 8 - 1);
res |= (c ^ pmac->c[i]) & cmask;
@@ -723,7 +714,7 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
res = 0 - ((0 - res) >> (sizeof(res) * 8 - 1));
ret &= (int)~res;
}
-# else /* pre-lucky-13 reference version of above */
+#else /* pre-lucky-13 reference version of above */
for (res = 0, i = 0; i < SHA_DIGEST_LENGTH; i++)
res |= out[i] ^ pmac->c[i];
res = 0 - ((0 - res) >> (sizeof(res) * 8 - 1));
@@ -737,10 +728,10 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
res = (0 - res) >> (sizeof(res) * 8 - 1);
ret &= (int)~res;
-# endif
+#endif
return ret;
} else {
-# if defined(STITCHED_DECRYPT_CALL)
+#if defined(STITCHED_DECRYPT_CALL)
if (len >= 1024 && keylen == 32) {
if (sha_off %= SHA_CBLOCK)
blocks = (len - 3 * SHA_CBLOCK) / SHA_CBLOCK;
@@ -751,8 +742,8 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
aesni_cbc_encrypt(in, out, aes_off, &key->ks, ctx->iv, 0);
SHA1_Update(&key->md, out, sha_off);
aesni256_cbc_sha1_dec(in + aes_off,
- out + aes_off, blocks, &key->ks,
- ctx->iv, &key->md, out + sha_off);
+ out + aes_off, blocks, &key->ks,
+ ctx->iv, &key->md, out + sha_off);
sha_off += blocks *= SHA_CBLOCK;
out += sha_off;
@@ -763,10 +754,10 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
if (key->md.Nl < (unsigned int)blocks)
key->md.Nh++;
} else
-# endif
+#endif
/* decrypt HMAC|padding at once */
aesni_cbc_encrypt(in, out, len, &key->ks,
- ctx->iv, 0);
+ ctx->iv, 0);
SHA1_Update(&key->md, out, len);
}
@@ -776,151 +767,142 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
}
static int aesni_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,
- void *ptr)
+ void *ptr)
{
EVP_AES_HMAC_SHA1 *key = data(ctx);
switch (type) {
- case EVP_CTRL_AEAD_SET_MAC_KEY:
- {
- unsigned int i;
- unsigned char hmac_key[64];
-
- memset(hmac_key, 0, sizeof(hmac_key));
-
- if (arg > (int)sizeof(hmac_key)) {
- SHA1_Init(&key->head);
- SHA1_Update(&key->head, ptr, arg);
- SHA1_Final(hmac_key, &key->head);
- } else {
- memcpy(hmac_key, ptr, arg);
- }
+ case EVP_CTRL_AEAD_SET_MAC_KEY: {
+ unsigned int i;
+ unsigned char hmac_key[64];
- for (i = 0; i < sizeof(hmac_key); i++)
- hmac_key[i] ^= 0x36; /* ipad */
+ memset(hmac_key, 0, sizeof(hmac_key));
+
+ if (arg > (int)sizeof(hmac_key)) {
SHA1_Init(&key->head);
- SHA1_Update(&key->head, hmac_key, sizeof(hmac_key));
+ SHA1_Update(&key->head, ptr, arg);
+ SHA1_Final(hmac_key, &key->head);
+ } else {
+ memcpy(hmac_key, ptr, arg);
+ }
- for (i = 0; i < sizeof(hmac_key); i++)
- hmac_key[i] ^= 0x36 ^ 0x5c; /* opad */
- SHA1_Init(&key->tail);
- SHA1_Update(&key->tail, hmac_key, sizeof(hmac_key));
+ for (i = 0; i < sizeof(hmac_key); i++)
+ hmac_key[i] ^= 0x36; /* ipad */
+ SHA1_Init(&key->head);
+ SHA1_Update(&key->head, hmac_key, sizeof(hmac_key));
- OPENSSL_cleanse(hmac_key, sizeof(hmac_key));
+ for (i = 0; i < sizeof(hmac_key); i++)
+ hmac_key[i] ^= 0x36 ^ 0x5c; /* opad */
+ SHA1_Init(&key->tail);
+ SHA1_Update(&key->tail, hmac_key, sizeof(hmac_key));
- return 1;
- }
- case EVP_CTRL_AEAD_TLS1_AAD:
- {
- unsigned char *p = ptr;
- unsigned int len;
+ OPENSSL_cleanse(hmac_key, sizeof(hmac_key));
- if (arg != EVP_AEAD_TLS1_AAD_LEN)
- return -1;
+ return 1;
+ }
+ case EVP_CTRL_AEAD_TLS1_AAD: {
+ unsigned char *p = ptr;
+ unsigned int len;
- len = p[arg - 2] << 8 | p[arg - 1];
-
- if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
- key->payload_length = len;
- if ((key->aux.tls_ver =
- p[arg - 4] << 8 | p[arg - 3]) >= TLS1_1_VERSION) {
- if (len < AES_BLOCK_SIZE)
- return 0;
- len -= AES_BLOCK_SIZE;
- p[arg - 2] = len >> 8;
- p[arg - 1] = len;
- }
- key->md = key->head;
- SHA1_Update(&key->md, p, arg);
+ if (arg != EVP_AEAD_TLS1_AAD_LEN)
+ return -1;
- return (int)(((len + SHA_DIGEST_LENGTH +
- AES_BLOCK_SIZE) & -AES_BLOCK_SIZE)
- - len);
- } else {
- memcpy(key->aux.tls_aad, ptr, arg);
- key->payload_length = arg;
+ len = p[arg - 2] << 8 | p[arg - 1];
- return SHA_DIGEST_LENGTH;
+ if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
+ key->payload_length = len;
+ if ((key->aux.tls_ver = p[arg - 4] << 8 | p[arg - 3]) >= TLS1_1_VERSION) {
+ if (len < AES_BLOCK_SIZE)
+ return 0;
+ len -= AES_BLOCK_SIZE;
+ p[arg - 2] = len >> 8;
+ p[arg - 1] = len;
}
+ key->md = key->head;
+ SHA1_Update(&key->md, p, arg);
+
+ return (int)(((len + SHA_DIGEST_LENGTH + AES_BLOCK_SIZE) & -AES_BLOCK_SIZE)
+ - len);
+ } else {
+ memcpy(key->aux.tls_aad, ptr, arg);
+ key->payload_length = arg;
+
+ return SHA_DIGEST_LENGTH;
}
-# if !defined(OPENSSL_NO_MULTIBLOCK)
+ }
+#if !defined(OPENSSL_NO_MULTIBLOCK)
case EVP_CTRL_TLS1_1_MULTIBLOCK_MAX_BUFSIZE:
return (int)(5 + 16 + ((arg + 20 + 16) & -16));
- case EVP_CTRL_TLS1_1_MULTIBLOCK_AAD:
- {
- EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *param =
- (EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *) ptr;
- unsigned int n4x = 1, x4;
- unsigned int frag, last, packlen, inp_len;
-
- if (arg < (int)sizeof(EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM))
- return -1;
+ case EVP_CTRL_TLS1_1_MULTIBLOCK_AAD: {
+ EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *param = (EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *)ptr;
+ unsigned int n4x = 1, x4;
+ unsigned int frag, last, packlen, inp_len;
- inp_len = param->inp[11] << 8 | param->inp[12];
+ if (arg < (int)sizeof(EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM))
+ return -1;
- if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
- if ((param->inp[9] << 8 | param->inp[10]) < TLS1_1_VERSION)
- return -1;
+ inp_len = param->inp[11] << 8 | param->inp[12];
- if (inp_len) {
- if (inp_len < 4096)
- return 0; /* too short */
+ if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
+ if ((param->inp[9] << 8 | param->inp[10]) < TLS1_1_VERSION)
+ return -1;
- if (inp_len >= 8192 && OPENSSL_ia32cap_P[2] & (1 << 5))
- n4x = 2; /* AVX2 */
- } else if ((n4x = param->interleave / 4) && n4x <= 2)
- inp_len = (unsigned int)param->len;
- else
- return -1;
+ if (inp_len) {
+ if (inp_len < 4096)
+ return 0; /* too short */
+
+ if (inp_len >= 8192 && OPENSSL_ia32cap_P[2] & (1 << 5))
+ n4x = 2; /* AVX2 */
+ } else if ((n4x = param->interleave / 4) && n4x <= 2)
+ inp_len = (unsigned int)param->len;
+ else
+ return -1;
- key->md = key->head;
- SHA1_Update(&key->md, param->inp, 13);
+ key->md = key->head;
+ SHA1_Update(&key->md, param->inp, 13);
- x4 = 4 * n4x;
- n4x += 1;
+ x4 = 4 * n4x;
+ n4x += 1;
- frag = inp_len >> n4x;
- last = inp_len + frag - (frag << n4x);
- if (last > frag && ((last + 13 + 9) % 64 < (x4 - 1))) {
- frag++;
- last -= x4 - 1;
- }
+ frag = inp_len >> n4x;
+ last = inp_len + frag - (frag << n4x);
+ if (last > frag && ((last + 13 + 9) % 64 < (x4 - 1))) {
+ frag++;
+ last -= x4 - 1;
+ }
- packlen = 5 + 16 + ((frag + 20 + 16) & -16);
- packlen = (packlen << n4x) - packlen;
- packlen += 5 + 16 + ((last + 20 + 16) & -16);
+ packlen = 5 + 16 + ((frag + 20 + 16) & -16);
+ packlen = (packlen << n4x) - packlen;
+ packlen += 5 + 16 + ((last + 20 + 16) & -16);
- param->interleave = x4;
+ param->interleave = x4;
- return (int)packlen;
- } else
- return -1; /* not yet */
- }
- case EVP_CTRL_TLS1_1_MULTIBLOCK_ENCRYPT:
- {
- EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *param =
- (EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *) ptr;
-
- return (int)tls1_1_multi_block_encrypt(key, param->out,
- param->inp, param->len,
- param->interleave / 4);
- }
+ return (int)packlen;
+ } else
+ return -1; /* not yet */
+ }
+ case EVP_CTRL_TLS1_1_MULTIBLOCK_ENCRYPT: {
+ EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *param = (EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *)ptr;
+
+ return (int)tls1_1_multi_block_encrypt(key, param->out,
+ param->inp, param->len,
+ param->interleave / 4);
+ }
case EVP_CTRL_TLS1_1_MULTIBLOCK_DECRYPT:
-# endif
+#endif
default:
return -1;
}
}
static const EVP_CIPHER aesni_128_cbc_hmac_sha1_cipher = {
-# ifdef NID_aes_128_cbc_hmac_sha1
+#ifdef NID_aes_128_cbc_hmac_sha1
NID_aes_128_cbc_hmac_sha1,
-# else
+#else
NID_undef,
-# endif
+#endif
AES_BLOCK_SIZE, 16, AES_BLOCK_SIZE,
- EVP_CIPH_CBC_MODE | EVP_CIPH_FLAG_DEFAULT_ASN1 |
- EVP_CIPH_FLAG_AEAD_CIPHER | EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK,
+ EVP_CIPH_CBC_MODE | EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_FLAG_AEAD_CIPHER | EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK,
EVP_ORIG_GLOBAL,
aesni_cbc_hmac_sha1_init_key,
aesni_cbc_hmac_sha1_cipher,
@@ -933,14 +915,13 @@ static const EVP_CIPHER aesni_128_cbc_hmac_sha1_cipher = {
};
static const EVP_CIPHER aesni_256_cbc_hmac_sha1_cipher = {
-# ifdef NID_aes_256_cbc_hmac_sha1
+#ifdef NID_aes_256_cbc_hmac_sha1
NID_aes_256_cbc_hmac_sha1,
-# else
+#else
NID_undef,
-# endif
+#endif
AES_BLOCK_SIZE, 32, AES_BLOCK_SIZE,
- EVP_CIPH_CBC_MODE | EVP_CIPH_FLAG_DEFAULT_ASN1 |
- EVP_CIPH_FLAG_AEAD_CIPHER | EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK,
+ EVP_CIPH_CBC_MODE | EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_FLAG_AEAD_CIPHER | EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK,
EVP_ORIG_GLOBAL,
aesni_cbc_hmac_sha1_init_key,
aesni_cbc_hmac_sha1_cipher,
@@ -954,14 +935,12 @@ static const EVP_CIPHER aesni_256_cbc_hmac_sha1_cipher = {
const EVP_CIPHER *EVP_aes_128_cbc_hmac_sha1(void)
{
- return (OPENSSL_ia32cap_P[1] & AESNI_CAPABLE ?
- &aesni_128_cbc_hmac_sha1_cipher : NULL);
+ return (OPENSSL_ia32cap_P[1] & AESNI_CAPABLE ? &aesni_128_cbc_hmac_sha1_cipher : NULL);
}
const EVP_CIPHER *EVP_aes_256_cbc_hmac_sha1(void)
{
- return (OPENSSL_ia32cap_P[1] & AESNI_CAPABLE ?
- &aesni_256_cbc_hmac_sha1_cipher : NULL);
+ return (OPENSSL_ia32cap_P[1] & AESNI_CAPABLE ? &aesni_256_cbc_hmac_sha1_cipher : NULL);
}
#else
const EVP_CIPHER *EVP_aes_128_cbc_hmac_sha1(void)
diff --git a/crypto/evp/e_aes_cbc_hmac_sha256.c b/crypto/evp/e_aes_cbc_hmac_sha256.c
index 45b250aeba..28e2bace00 100644
--- a/crypto/evp/e_aes_cbc_hmac_sha256.c
+++ b/crypto/evp/e_aes_cbc_hmac_sha256.c
@@ -31,54 +31,52 @@
typedef struct {
AES_KEY ks;
SHA256_CTX head, tail, md;
- size_t payload_length; /* AAD length in decrypt case */
+ size_t payload_length; /* AAD length in decrypt case */
union {
unsigned int tls_ver;
unsigned char tls_aad[16]; /* 13 used */
} aux;
} EVP_AES_HMAC_SHA256;
-# define NO_PAYLOAD_LENGTH ((size_t)-1)
+#define NO_PAYLOAD_LENGTH ((size_t)-1)
-#if defined(AES_ASM) && ( \
- defined(__x86_64) || defined(__x86_64__) || \
- defined(_M_AMD64) || defined(_M_X64) )
+#if defined(AES_ASM) && (defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64))
-# define AESNI_CAPABLE (1<<(57-32))
+#define AESNI_CAPABLE (1 << (57 - 32))
int aesni_set_encrypt_key(const unsigned char *userKey, int bits,
- AES_KEY *key);
+ AES_KEY *key);
int aesni_set_decrypt_key(const unsigned char *userKey, int bits,
- AES_KEY *key);
+ AES_KEY *key);
void aesni_cbc_encrypt(const unsigned char *in,
- unsigned char *out,
- size_t length,
- const AES_KEY *key, unsigned char *ivec, int enc);
+ unsigned char *out,
+ size_t length,
+ const AES_KEY *key, unsigned char *ivec, int enc);
int aesni_cbc_sha256_enc(const void *inp, void *out, size_t blocks,
- const AES_KEY *key, unsigned char iv[16],
- SHA256_CTX *ctx, const void *in0);
+ const AES_KEY *key, unsigned char iv[16],
+ SHA256_CTX *ctx, const void *in0);
-# define data(ctx) ((EVP_AES_HMAC_SHA256 *)EVP_CIPHER_CTX_get_cipher_data(ctx))
+#define data(ctx) ((EVP_AES_HMAC_SHA256 *)EVP_CIPHER_CTX_get_cipher_data(ctx))
static int aesni_cbc_hmac_sha256_init_key(EVP_CIPHER_CTX *ctx,
- const unsigned char *inkey,
- const unsigned char *iv, int enc)
+ const unsigned char *inkey,
+ const unsigned char *iv, int enc)
{
EVP_AES_HMAC_SHA256 *key = data(ctx);
int ret;
if (enc)
ret = aesni_set_encrypt_key(inkey,
- EVP_CIPHER_CTX_get_key_length(ctx) * 8,
- &key->ks);
+ EVP_CIPHER_CTX_get_key_length(ctx) * 8,
+ &key->ks);
else
ret = aesni_set_decrypt_key(inkey,
- EVP_CIPHER_CTX_get_key_length(ctx) * 8,
- &key->ks);
+ EVP_CIPHER_CTX_get_key_length(ctx) * 8,
+ &key->ks);
- SHA256_Init(&key->head); /* handy when benchmarking */
+ SHA256_Init(&key->head); /* handy when benchmarking */
key->tail = key->head;
key->md = key->head;
@@ -87,11 +85,11 @@ static int aesni_cbc_hmac_sha256_init_key(EVP_CIPHER_CTX *ctx,
return ret < 0 ? 0 : 1;
}
-# define STITCHED_CALL
+#define STITCHED_CALL
-# if !defined(STITCHED_CALL)
-# define aes_off 0
-# endif
+#if !defined(STITCHED_CALL)
+#define aes_off 0
+#endif
void sha256_block_data_order(void *c, const void *p, size_t len);
@@ -126,12 +124,12 @@ static void sha256_update(SHA256_CTX *c, const void *data, size_t len)
SHA256_Update(c, ptr, res);
}
-# ifdef SHA256_Update
-# undef SHA256_Update
-# endif
-# define SHA256_Update sha256_update
+#ifdef SHA256_Update
+#undef SHA256_Update
+#endif
+#define SHA256_Update sha256_update
-# if !defined(OPENSSL_NO_MULTIBLOCK)
+#if !defined(OPENSSL_NO_MULTIBLOCK)
typedef struct {
unsigned int A[8], B[8], C[8], D[8], E[8], F[8], G[8], H[8];
@@ -153,10 +151,10 @@ typedef struct {
void aesni_multi_cbc_encrypt(CIPH_DESC *, void *, int);
static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA256 *key,
- unsigned char *out,
- const unsigned char *inp,
- size_t inp_len, int n4x)
-{ /* n4x is 1 or 2 */
+ unsigned char *out,
+ const unsigned char *inp,
+ size_t inp_len, int n4x)
+{ /* n4x is 1 or 2 */
HASH_DESC hash_d[8], edges[8];
CIPH_DESC ciph_d[8];
unsigned char storage[sizeof(SHA256_MB_CTX) + 32];
@@ -166,20 +164,19 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA256 *key,
u8 c[128];
} blocks[8];
SHA256_MB_CTX *ctx;
- unsigned int frag, last, packlen, i, x4 = 4 * n4x, minblocks, processed =
- 0;
+ unsigned int frag, last, packlen, i, x4 = 4 * n4x, minblocks, processed = 0;
size_t ret = 0;
u8 *IVs;
-# if defined(BSWAP8)
+#if defined(BSWAP8)
u64 seqnum;
-# endif
+#endif
/* ask for IVs in bulk */
if (RAND_bytes((IVs = blocks[0].c), 16 * x4) <= 0)
return 0;
/* align */
- ctx = (SHA256_MB_CTX *) (storage + 32 - ((size_t)storage % 32));
+ ctx = (SHA256_MB_CTX *)(storage + 32 - ((size_t)storage % 32));
frag = (unsigned int)inp_len >> (1 + n4x);
last = (unsigned int)inp_len + frag - (frag << (1 + n4x));
@@ -207,15 +204,15 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA256 *key,
IVs += 16;
}
-# if defined(BSWAP8)
+#if defined(BSWAP8)
memcpy(blocks[0].c, key->md.data, 8);
seqnum = BSWAP8(blocks[0].q[0]);
-# endif
+#endif
for (i = 0; i < x4; i++) {
unsigned int len = (i == (x4 - 1) ? last : frag);
-# if !defined(BSWAP8)
+#if !defined(BSWAP8)
unsigned int carry, j;
-# endif
+#endif
ctx->A[i] = key->md.h[0];
ctx->B[i] = key->md.h[1];
@@ -227,14 +224,14 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA256 *key,
ctx->H[i] = key->md.h[7];
/* fix seqnum */
-# if defined(BSWAP8)
+#if defined(BSWAP8)
blocks[i].q[0] = BSWAP8(seqnum + i);
-# else
+#else
for (carry = i, j = 8; j--;) {
blocks[i].c[j] = ((u8 *)key->md.data)[j] + carry;
carry = (blocks[i].c[j] - carry) >> (sizeof(carry) * 8 - 1);
}
-# endif
+#endif
blocks[i].c[8] = ((u8 *)key->md.data)[8];
blocks[i].c[9] = ((u8 *)key->md.data)[9];
blocks[i].c[10] = ((u8 *)key->md.data)[10];
@@ -253,10 +250,10 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA256 *key,
/* hash 13-byte headers and first 64-13 bytes of inputs */
sha256_multi_block(ctx, edges, n4x);
/* hash bulk inputs */
-# define MAXCHUNKSIZE 2048
-# if MAXCHUNKSIZE%64
-# error "MAXCHUNKSIZE is not divisible by 64"
-# elif MAXCHUNKSIZE
+#define MAXCHUNKSIZE 2048
+#if MAXCHUNKSIZE % 64
+#error "MAXCHUNKSIZE is not divisible by 64"
+#elif MAXCHUNKSIZE
/*
* goal is to minimize pressure on L1 cache by moving in shorter steps,
* so that hashed data is still in the cache by the time we encrypt it
@@ -285,34 +282,34 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA256 *key,
minblocks -= MAXCHUNKSIZE / 64;
} while (minblocks > MAXCHUNKSIZE / 64);
}
-# endif
-# undef MAXCHUNKSIZE
+#endif
+#undef MAXCHUNKSIZE
sha256_multi_block(ctx, hash_d, n4x);
memset(blocks, 0, sizeof(blocks));
for (i = 0; i < x4; i++) {
unsigned int len = (i == (x4 - 1) ? last : frag),
- off = hash_d[i].blocks * 64;
+ off = hash_d[i].blocks * 64;
const unsigned char *ptr = hash_d[i].ptr + off;
off = (len - processed) - (64 - 13) - off; /* remainder actually */
memcpy(blocks[i].c, ptr, off);
blocks[i].c[off] = 0x80;
- len += 64 + 13; /* 64 is HMAC header */
- len *= 8; /* convert to bits */
+ len += 64 + 13; /* 64 is HMAC header */
+ len *= 8; /* convert to bits */
if (off < (64 - 8)) {
-# ifdef BSWAP4
+#ifdef BSWAP4
blocks[i].d[15] = BSWAP4(len);
-# else
+#else
PUTU32(blocks[i].c + 60, len);
-# endif
+#endif
edges[i].blocks = 1;
} else {
-# ifdef BSWAP4
+#ifdef BSWAP4
blocks[i].d[31] = BSWAP4(len);
-# else
+#else
PUTU32(blocks[i].c + 124, len);
-# endif
+#endif
edges[i].blocks = 2;
}
edges[i].ptr = blocks[i].c;
@@ -323,7 +320,7 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA256 *key,
memset(blocks, 0, sizeof(blocks));
for (i = 0; i < x4; i++) {
-# ifdef BSWAP4
+#ifdef BSWAP4
blocks[i].d[0] = BSWAP4(ctx->A[i]);
ctx->A[i] = key->tail.h[0];
blocks[i].d[1] = BSWAP4(ctx->B[i]);
@@ -342,7 +339,7 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA256 *key,
ctx->H[i] = key->tail.h[7];
blocks[i].c[32] = 0x80;
blocks[i].d[15] = BSWAP4((64 + 32) * 8);
-# else
+#else
PUTU32(blocks[i].c + 0, ctx->A[i]);
ctx->A[i] = key->tail.h[0];
PUTU32(blocks[i].c + 4, ctx->B[i]);
@@ -361,7 +358,7 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA256 *key,
ctx->H[i] = key->tail.h[7];
blocks[i].c[32] = 0x80;
PUTU32(blocks[i].c + 60, (64 + 32) * 8);
-# endif
+#endif
edges[i].ptr = blocks[i].c;
edges[i].blocks = 1;
}
@@ -397,7 +394,7 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA256 *key,
len += pad + 1;
ciph_d[i].blocks = (len - processed) / 16;
- len += 16; /* account for explicit iv */
+ len += 16; /* account for explicit iv */
/* arrange header */
out0[0] = ((u8 *)key->md.data)[8];
@@ -417,22 +414,22 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA256 *key,
return ret;
}
-# endif
+#endif
static int aesni_cbc_hmac_sha256_cipher(EVP_CIPHER_CTX *ctx,
- unsigned char *out,
- const unsigned char *in, size_t len)
+ unsigned char *out,
+ const unsigned char *in, size_t len)
{
EVP_AES_HMAC_SHA256 *key = data(ctx);
unsigned int l;
size_t plen = key->payload_length, iv = 0, /* explicit IV in TLS 1.1 and
* later */
sha_off = 0;
-# if defined(STITCHED_CALL)
+#if defined(STITCHED_CALL)
size_t aes_off = 0, blocks;
sha_off = SHA256_CBLOCK - key->md.num;
-# endif
+#endif
key->payload_length = NO_PAYLOAD_LENGTH;
@@ -442,14 +439,12 @@ static int aesni_cbc_hmac_sha256_cipher(EVP_CIPHER_CTX *ctx,
if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
if (plen == NO_PAYLOAD_LENGTH)
plen = len;
- else if (len !=
- ((plen + SHA256_DIGEST_LENGTH +
- AES_BLOCK_SIZE) & -AES_BLOCK_SIZE))
+ else if (len != ((plen + SHA256_DIGEST_LENGTH + AES_BLOCK_SIZE) & -AES_BLOCK_SIZE))
return 0;
else if (key->aux.tls_ver >= TLS1_1_VERSION)
iv = AES_BLOCK_SIZE;
-# if defined(STITCHED_CALL)
+#if defined(STITCHED_CALL)
/*
* Assembly stitch handles AVX-capable processors, but its
* performance is not optimal on AMD Jaguar, ~40% worse, for
@@ -460,16 +455,16 @@ static int aesni_cbc_hmac_sha256_cipher(EVP_CIPHER_CTX *ctx,
* either even XOP-capable Bulldozer-based or GenuineIntel one.
* But SHAEXT-capable go ahead...
*/
- if (((OPENSSL_ia32cap_P[2] & (1 << 29)) || /* SHAEXT? */
- ((OPENSSL_ia32cap_P[1] & (1 << (60 - 32))) && /* AVX? */
- ((OPENSSL_ia32cap_P[1] & (1 << (43 - 32))) /* XOP? */
- | (OPENSSL_ia32cap_P[0] & (1 << 30))))) && /* "Intel CPU"? */
- plen > (sha_off + iv) &&
- (blocks = (plen - (sha_off + iv)) / SHA256_CBLOCK)) {
+ if (((OPENSSL_ia32cap_P[2] & (1 << 29)) || /* SHAEXT? */
+ ((OPENSSL_ia32cap_P[1] & (1 << (60 - 32))) && /* AVX? */
+ ((OPENSSL_ia32cap_P[1] & (1 << (43 - 32))) /* XOP? */
+ | (OPENSSL_ia32cap_P[0] & (1 << 30)))))
+ && /* "Intel CPU"? */
+ plen > (sha_off + iv) && (blocks = (plen - (sha_off + iv)) / SHA256_CBLOCK)) {
SHA256_Update(&key->md, in + iv, sha_off);
(void)aesni_cbc_sha256_enc(in, out, blocks, &key->ks,
- ctx->iv, &key->md, in + iv + sha_off);
+ ctx->iv, &key->md, in + iv + sha_off);
blocks *= SHA256_CBLOCK;
aes_off += blocks;
sha_off += blocks;
@@ -480,11 +475,11 @@ static int aesni_cbc_hmac_sha256_cipher(EVP_CIPHER_CTX *ctx,
} else {
sha_off = 0;
}
-# endif
+#endif
sha_off += iv;
SHA256_Update(&key->md, in + sha_off, plen - sha_off);
- if (plen != len) { /* "TLS" mode of operation */
+ if (plen != len) { /* "TLS" mode of operation */
if (in != out)
memcpy(out + aes_off, in + aes_off, plen - aes_off);
@@ -500,10 +495,10 @@ static int aesni_cbc_hmac_sha256_cipher(EVP_CIPHER_CTX *ctx,
out[plen] = l;
/* encrypt HMAC|padding at once */
aesni_cbc_encrypt(out + aes_off, out + aes_off, len - aes_off,
- &key->ks, ctx->iv, 1);
+ &key->ks, ctx->iv, 1);
} else {
aesni_cbc_encrypt(in + aes_off, out + aes_off, len - aes_off,
- &key->ks, ctx->iv, 1);
+ &key->ks, ctx->iv, 1);
}
} else {
union {
@@ -516,7 +511,7 @@ static int aesni_cbc_hmac_sha256_cipher(EVP_CIPHER_CTX *ctx,
/* decrypt HMAC|padding at once */
aesni_cbc_encrypt(in, out, len, &key->ks,
- ctx->iv, 0);
+ ctx->iv, 0);
if (plen != NO_PAYLOAD_LENGTH) { /* "TLS" mode of operation */
size_t inp_len, mask, j, i;
@@ -563,7 +558,7 @@ static int aesni_cbc_hmac_sha256_cipher(EVP_CIPHER_CTX *ctx,
key->md = key->head;
SHA256_Update(&key->md, key->aux.tls_aad, plen);
-# if 1 /* see original reference version in #else */
+#if 1 /* see original reference version in #else */
len -= SHA256_DIGEST_LENGTH; /* amend mac */
if (len >= (256 + SHA256_CBLOCK)) {
j = (len - (256 + SHA256_CBLOCK)) & (0 - SHA256_CBLOCK);
@@ -576,15 +571,15 @@ static int aesni_cbc_hmac_sha256_cipher(EVP_CIPHER_CTX *ctx,
/* but pretend as if we hashed padded payload */
bitlen = key->md.Nl + (unsigned int)(inp_len << 3); /* at most 18 bits */
-# ifdef BSWAP4
+#ifdef BSWAP4
bitlen = BSWAP4(bitlen);
-# else
+#else
mac.c[0] = 0;
mac.c[1] = (unsigned char)(bitlen >> 16);
mac.c[2] = (unsigned char)(bitlen >> 8);
mac.c[3] = (unsigned char)bitlen;
bitlen = mac.u[0];
-# endif
+#endif
pmac->u[0] = 0;
pmac->u[1] = 0;
@@ -653,7 +648,7 @@ static int aesni_cbc_hmac_sha256_cipher(EVP_CIPHER_CTX *ctx,
pmac->u[6] |= key->md.h[6] & mask;
pmac->u[7] |= key->md.h[7] & mask;
-# ifdef BSWAP4
+#ifdef BSWAP4
pmac->u[0] = BSWAP4(pmac->u[0]);
pmac->u[1] = BSWAP4(pmac->u[1]);
pmac->u[2] = BSWAP4(pmac->u[2]);
@@ -662,7 +657,7 @@ static int aesni_cbc_hmac_sha256_cipher(EVP_CIPHER_CTX *ctx,
pmac->u[5] = BSWAP4(pmac->u[5]);
pmac->u[6] = BSWAP4(pmac->u[6]);
pmac->u[7] = BSWAP4(pmac->u[7]);
-# else
+#else
for (i = 0; i < 8; i++) {
res = pmac->u[i];
pmac->c[4 * i + 0] = (unsigned char)(res >> 24);
@@ -670,9 +665,9 @@ static int aesni_cbc_hmac_sha256_cipher(EVP_CIPHER_CTX *ctx,
pmac->c[4 * i + 2] = (unsigned char)(res >> 8);
pmac->c[4 * i + 3] = (unsigned char)res;
}
-# endif
+#endif
len += SHA256_DIGEST_LENGTH;
-# else
+#else
SHA256_Update(&key->md, out, inp_len);
res = key->md.num;
SHA256_Final(pmac->c, &key->md);
@@ -681,17 +676,15 @@ static int aesni_cbc_hmac_sha256_cipher(EVP_CIPHER_CTX *ctx,
unsigned int inp_blocks, pad_blocks;
/* but pretend as if we hashed padded payload */
- inp_blocks =
- 1 + ((SHA256_CBLOCK - 9 - res) >> (sizeof(res) * 8 - 1));
+ inp_blocks = 1 + ((SHA256_CBLOCK - 9 - res) >> (sizeof(res) * 8 - 1));
res += (unsigned int)(len - inp_len);
pad_blocks = res / SHA256_CBLOCK;
res %= SHA256_CBLOCK;
- pad_blocks +=
- 1 + ((SHA256_CBLOCK - 9 - res) >> (sizeof(res) * 8 - 1));
+ pad_blocks += 1 + ((SHA256_CBLOCK - 9 - res) >> (sizeof(res) * 8 - 1));
for (; inp_blocks < pad_blocks; inp_blocks++)
sha1_block_data_order(&key->md, data, 1);
}
-# endif /* pre-lucky-13 reference version of above */
+#endif /* pre-lucky-13 reference version of above */
key->md = key->tail;
SHA256_Update(&key->md, pmac->c, SHA256_DIGEST_LENGTH);
SHA256_Final(pmac->c, &key->md);
@@ -699,19 +692,16 @@ static int aesni_cbc_hmac_sha256_cipher(EVP_CIPHER_CTX *ctx,
/* verify HMAC */
out += inp_len;
len -= inp_len;
-# if 1 /* see original reference version in #else */
+#if 1 /* see original reference version in #else */
{
- unsigned char *p =
- out + len - 1 - maxpad - SHA256_DIGEST_LENGTH;
+ unsigned char *p = out + len - 1 - maxpad - SHA256_DIGEST_LENGTH;
size_t off = out - p;
unsigned int c, cmask;
for (res = 0, i = 0, j = 0; j < maxpad + SHA256_DIGEST_LENGTH;
- j++) {
+ j++) {
c = p[j];
- cmask =
- ((int)(j - off - SHA256_DIGEST_LENGTH)) >>
- (sizeof(int) * 8 - 1);
+ cmask = ((int)(j - off - SHA256_DIGEST_LENGTH)) >> (sizeof(int) * 8 - 1);
res |= (c ^ pad) & ~cmask; /* ... and padding */
cmask &= ((int)(off - 1 - j)) >> (sizeof(int) * 8 - 1);
res |= (c ^ pmac->c[i]) & cmask;
@@ -721,7 +711,7 @@ static int aesni_cbc_hmac_sha256_cipher(EVP_CIPHER_CTX *ctx,
res = 0 - ((0 - res) >> (sizeof(res) * 8 - 1));
ret &= (int)~res;
}
-# else /* pre-lucky-13 reference version of above */
+#else /* pre-lucky-13 reference version of above */
for (res = 0, i = 0; i < SHA256_DIGEST_LENGTH; i++)
res |= out[i] ^ pmac->c[i];
res = 0 - ((0 - res) >> (sizeof(res) * 8 - 1));
@@ -735,7 +725,7 @@ static int aesni_cbc_hmac_sha256_cipher(EVP_CIPHER_CTX *ctx,
res = (0 - res) >> (sizeof(res) * 8 - 1);
ret &= (int)~res;
-# endif
+#endif
return ret;
} else {
SHA256_Update(&key->md, out, len);
@@ -746,158 +736,149 @@ static int aesni_cbc_hmac_sha256_cipher(EVP_CIPHER_CTX *ctx,
}
static int aesni_cbc_hmac_sha256_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,
- void *ptr)
+ void *ptr)
{
EVP_AES_HMAC_SHA256 *key = data(ctx);
unsigned int u_arg = (unsigned int)arg;
switch (type) {
- case EVP_CTRL_AEAD_SET_MAC_KEY:
- {
- unsigned int i;
- unsigned char hmac_key[64];
+ case EVP_CTRL_AEAD_SET_MAC_KEY: {
+ unsigned int i;
+ unsigned char hmac_key[64];
- memset(hmac_key, 0, sizeof(hmac_key));
+ memset(hmac_key, 0, sizeof(hmac_key));
- if (arg < 0)
- return -1;
+ if (arg < 0)
+ return -1;
- if (u_arg > sizeof(hmac_key)) {
- SHA256_Init(&key->head);
- SHA256_Update(&key->head, ptr, arg);
- SHA256_Final(hmac_key, &key->head);
- } else {
- memcpy(hmac_key, ptr, arg);
- }
-
- for (i = 0; i < sizeof(hmac_key); i++)
- hmac_key[i] ^= 0x36; /* ipad */
+ if (u_arg > sizeof(hmac_key)) {
SHA256_Init(&key->head);
- SHA256_Update(&key->head, hmac_key, sizeof(hmac_key));
-
- for (i = 0; i < sizeof(hmac_key); i++)
- hmac_key[i] ^= 0x36 ^ 0x5c; /* opad */
- SHA256_Init(&key->tail);
- SHA256_Update(&key->tail, hmac_key, sizeof(hmac_key));
-
- OPENSSL_cleanse(hmac_key, sizeof(hmac_key));
-
- return 1;
+ SHA256_Update(&key->head, ptr, arg);
+ SHA256_Final(hmac_key, &key->head);
+ } else {
+ memcpy(hmac_key, ptr, arg);
}
- case EVP_CTRL_AEAD_TLS1_AAD:
- {
- unsigned char *p = ptr;
- unsigned int len;
- if (arg != EVP_AEAD_TLS1_AAD_LEN)
- return -1;
+ for (i = 0; i < sizeof(hmac_key); i++)
+ hmac_key[i] ^= 0x36; /* ipad */
+ SHA256_Init(&key->head);
+ SHA256_Update(&key->head, hmac_key, sizeof(hmac_key));
- len = p[arg - 2] << 8 | p[arg - 1];
-
- if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
- key->payload_length = len;
- if ((key->aux.tls_ver =
- p[arg - 4] << 8 | p[arg - 3]) >= TLS1_1_VERSION) {
- if (len < AES_BLOCK_SIZE)
- return 0;
- len -= AES_BLOCK_SIZE;
- p[arg - 2] = len >> 8;
- p[arg - 1] = len;
- }
- key->md = key->head;
- SHA256_Update(&key->md, p, arg);
+ for (i = 0; i < sizeof(hmac_key); i++)
+ hmac_key[i] ^= 0x36 ^ 0x5c; /* opad */
+ SHA256_Init(&key->tail);
+ SHA256_Update(&key->tail, hmac_key, sizeof(hmac_key));
- return (int)(((len + SHA256_DIGEST_LENGTH +
- AES_BLOCK_SIZE) & -AES_BLOCK_SIZE)
- - len);
- } else {
- memcpy(key->aux.tls_aad, ptr, arg);
- key->payload_length = arg;
+ OPENSSL_cleanse(hmac_key, sizeof(hmac_key));
- return SHA256_DIGEST_LENGTH;
+ return 1;
+ }
+ case EVP_CTRL_AEAD_TLS1_AAD: {
+ unsigned char *p = ptr;
+ unsigned int len;
+
+ if (arg != EVP_AEAD_TLS1_AAD_LEN)
+ return -1;
+
+ len = p[arg - 2] << 8 | p[arg - 1];
+
+ if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
+ key->payload_length = len;
+ if ((key->aux.tls_ver = p[arg - 4] << 8 | p[arg - 3]) >= TLS1_1_VERSION) {
+ if (len < AES_BLOCK_SIZE)
+ return 0;
+ len -= AES_BLOCK_SIZE;
+ p[arg - 2] = len >> 8;
+ p[arg - 1] = len;
}
+ key->md = key->head;
+ SHA256_Update(&key->md, p, arg);
+
+ return (int)(((len + SHA256_DIGEST_LENGTH + AES_BLOCK_SIZE) & -AES_BLOCK_SIZE)
+ - len);
+ } else {
+ memcpy(key->aux.tls_aad, ptr, arg);
+ key->payload_length = arg;
+
+ return SHA256_DIGEST_LENGTH;
}
-# if !defined(OPENSSL_NO_MULTIBLOCK)
+ }
+#if !defined(OPENSSL_NO_MULTIBLOCK)
case EVP_CTRL_TLS1_1_MULTIBLOCK_MAX_BUFSIZE:
return (int)(5 + 16 + ((arg + 32 + 16) & -16));
- case EVP_CTRL_TLS1_1_MULTIBLOCK_AAD:
- {
- EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *param =
- (EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *) ptr;
- unsigned int n4x = 1, x4;
- unsigned int frag, last, packlen, inp_len;
-
- if (arg < 0)
- return -1;
+ case EVP_CTRL_TLS1_1_MULTIBLOCK_AAD: {
+ EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *param = (EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *)ptr;
+ unsigned int n4x = 1, x4;
+ unsigned int frag, last, packlen, inp_len;
- if (u_arg < sizeof(EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM))
- return -1;
+ if (arg < 0)
+ return -1;
+
+ if (u_arg < sizeof(EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM))
+ return -1;
+
+ inp_len = param->inp[11] << 8 | param->inp[12];
- inp_len = param->inp[11] << 8 | param->inp[12];
+ if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
+ if ((param->inp[9] << 8 | param->inp[10]) < TLS1_1_VERSION)
+ return -1;
- if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
- if ((param->inp[9] << 8 | param->inp[10]) < TLS1_1_VERSION)
- return -1;
+ if (inp_len) {
+ if (inp_len < 4096)
+ return 0; /* too short */
- if (inp_len) {
- if (inp_len < 4096)
- return 0; /* too short */
+ if (inp_len >= 8192 && OPENSSL_ia32cap_P[2] & (1 << 5))
+ n4x = 2; /* AVX2 */
+ } else if ((n4x = param->interleave / 4) && n4x <= 2)
+ inp_len = (unsigned int)param->len;
+ else
+ return -1;
- if (inp_len >= 8192 && OPENSSL_ia32cap_P[2] & (1 << 5))
- n4x = 2; /* AVX2 */
- } else if ((n4x = param->interleave / 4) && n4x <= 2)
- inp_len = (unsigned int)param->len;
- else
- return -1;
+ key->md = key->head;
+ SHA256_Update(&key->md, param->inp, 13);
- key->md = key->head;
- SHA256_Update(&key->md, param->inp, 13);
+ x4 = 4 * n4x;
+ n4x += 1;
- x4 = 4 * n4x;
- n4x += 1;
+ frag = inp_len >> n4x;
+ last = inp_len + frag - (frag << n4x);
+ if (last > frag && ((last + 13 + 9) % 64 < (x4 - 1))) {
+ frag++;
+ last -= x4 - 1;
+ }
- frag = inp_len >> n4x;
- last = inp_len + frag - (frag << n4x);
- if (last > frag && ((last + 13 + 9) % 64 < (x4 - 1))) {
- frag++;
- last -= x4 - 1;
- }
+ packlen = 5 + 16 + ((frag + 32 + 16) & -16);
+ packlen = (packlen << n4x) - packlen;
+ packlen += 5 + 16 + ((last + 32 + 16) & -16);
- packlen = 5 + 16 + ((frag + 32 + 16) & -16);
- packlen = (packlen << n4x) - packlen;
- packlen += 5 + 16 + ((last + 32 + 16) & -16);
+ param->interleave = x4;
- param->interleave = x4;
+ return (int)packlen;
+ } else
+ return -1; /* not yet */
+ }
+ case EVP_CTRL_TLS1_1_MULTIBLOCK_ENCRYPT: {
+ EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *param = (EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *)ptr;
- return (int)packlen;
- } else
- return -1; /* not yet */
- }
- case EVP_CTRL_TLS1_1_MULTIBLOCK_ENCRYPT:
- {
- EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *param =
- (EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *) ptr;
-
- return (int)tls1_1_multi_block_encrypt(key, param->out,
- param->inp, param->len,
- param->interleave / 4);
- }
+ return (int)tls1_1_multi_block_encrypt(key, param->out,
+ param->inp, param->len,
+ param->interleave / 4);
+ }
case EVP_CTRL_TLS1_1_MULTIBLOCK_DECRYPT:
-# endif
+#endif
default:
return -1;
}
}
static const EVP_CIPHER aesni_128_cbc_hmac_sha256_cipher = {
-# ifdef NID_aes_128_cbc_hmac_sha256
+#ifdef NID_aes_128_cbc_hmac_sha256
NID_aes_128_cbc_hmac_sha256,
-# else
+#else
NID_undef,
-# endif
+#endif
AES_BLOCK_SIZE, 16, AES_BLOCK_SIZE,
- EVP_CIPH_CBC_MODE | EVP_CIPH_FLAG_DEFAULT_ASN1 |
- EVP_CIPH_FLAG_AEAD_CIPHER | EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK,
+ EVP_CIPH_CBC_MODE | EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_FLAG_AEAD_CIPHER | EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK,
EVP_ORIG_GLOBAL,
aesni_cbc_hmac_sha256_init_key,
aesni_cbc_hmac_sha256_cipher,
@@ -910,14 +891,13 @@ static const EVP_CIPHER aesni_128_cbc_hmac_sha256_cipher = {
};
static const EVP_CIPHER aesni_256_cbc_hmac_sha256_cipher = {
-# ifdef NID_aes_256_cbc_hmac_sha256
+#ifdef NID_aes_256_cbc_hmac_sha256
NID_aes_256_cbc_hmac_sha256,
-# else
+#else
NID_undef,
-# endif
+#endif
AES_BLOCK_SIZE, 32, AES_BLOCK_SIZE,
- EVP_CIPH_CBC_MODE | EVP_CIPH_FLAG_DEFAULT_ASN1 |
- EVP_CIPH_FLAG_AEAD_CIPHER | EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK,
+ EVP_CIPH_CBC_MODE | EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_FLAG_AEAD_CIPHER | EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK,
EVP_ORIG_GLOBAL,
aesni_cbc_hmac_sha256_init_key,
aesni_cbc_hmac_sha256_cipher,
@@ -931,16 +911,12 @@ static const EVP_CIPHER aesni_256_cbc_hmac_sha256_cipher = {
const EVP_CIPHER *EVP_aes_128_cbc_hmac_sha256(void)
{
- return ((OPENSSL_ia32cap_P[1] & AESNI_CAPABLE) &&
- aesni_cbc_sha256_enc(NULL, NULL, 0, NULL, NULL, NULL, NULL) ?
- &aesni_128_cbc_hmac_sha256_cipher : NULL);
+ return ((OPENSSL_ia32cap_P[1] & AESNI_CAPABLE) && aesni_cbc_sha256_enc(NULL, NULL, 0, NULL, NULL, NULL, NULL) ? &aesni_128_cbc_hmac_sha256_cipher : NULL);
}
const EVP_CIPHER *EVP_aes_256_cbc_hmac_sha256(void)
{
- return ((OPENSSL_ia32cap_P[1] & AESNI_CAPABLE) &&
- aesni_cbc_sha256_enc(NULL, NULL, 0, NULL, NULL, NULL, NULL) ?
- &aesni_256_cbc_hmac_sha256_cipher : NULL);
+ return ((OPENSSL_ia32cap_P[1] & AESNI_CAPABLE) && aesni_cbc_sha256_enc(NULL, NULL, 0, NULL, NULL, NULL, NULL) ? &aesni_256_cbc_hmac_sha256_cipher : NULL);
}
#else
const EVP_CIPHER *EVP_aes_128_cbc_hmac_sha256(void)
diff --git a/crypto/evp/e_aria.c b/crypto/evp/e_aria.c
index 119f203bc3..83e272232e 100644
--- a/crypto/evp/e_aria.c
+++ b/crypto/evp/e_aria.c
@@ -12,13 +12,13 @@
#include "internal/cryptlib.h"
#ifndef OPENSSL_NO_ARIA
-# include <openssl/evp.h>
-# include <openssl/modes.h>
-# include <openssl/rand.h>
-# include "crypto/aria.h"
-# include "crypto/evp.h"
-# include "crypto/modes.h"
-# include "evp_local.h"
+#include <openssl/evp.h>
+#include <openssl/modes.h>
+#include <openssl/rand.h>
+#include "crypto/aria.h"
+#include "crypto/evp.h"
+#include "crypto/modes.h"
+#include "evp_local.h"
/* ARIA subkey Structure */
typedef struct {
@@ -30,15 +30,15 @@ typedef struct {
union {
OSSL_UNION_ALIGN;
ARIA_KEY ks;
- } ks; /* ARIA subkey to use */
- int key_set; /* Set if key initialised */
- int iv_set; /* Set if an iv is set */
+ } ks; /* ARIA subkey to use */
+ int key_set; /* Set if key initialised */
+ int iv_set; /* Set if an iv is set */
GCM128_CONTEXT gcm;
- unsigned char *iv; /* Temporary IV store */
- int ivlen; /* IV length */
+ unsigned char *iv; /* Temporary IV store */
+ int ivlen; /* IV length */
int taglen;
- int iv_gen; /* It is OK to generate IVs */
- int tls_aad_len; /* TLS AAD length */
+ int iv_gen; /* It is OK to generate IVs */
+ int tls_aad_len; /* TLS AAD length */
} EVP_ARIA_GCM_CTX;
/* ARIA CCM context */
@@ -46,32 +46,32 @@ typedef struct {
union {
OSSL_UNION_ALIGN;
ARIA_KEY ks;
- } ks; /* ARIA key schedule to use */
- int key_set; /* Set if key initialised */
- int iv_set; /* Set if an iv is set */
- int tag_set; /* Set if tag is valid */
- int len_set; /* Set if message length set */
- int L, M; /* L and M parameters from RFC3610 */
- int tls_aad_len; /* TLS AAD length */
+ } ks; /* ARIA key schedule to use */
+ int key_set; /* Set if key initialised */
+ int iv_set; /* Set if an iv is set */
+ int tag_set; /* Set if tag is valid */
+ int len_set; /* Set if message length set */
+ int L, M; /* L and M parameters from RFC3610 */
+ int tls_aad_len; /* TLS AAD length */
CCM128_CONTEXT ccm;
ccm128_f str;
} EVP_ARIA_CCM_CTX;
/* The subkey for ARIA is generated. */
static int aria_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc)
+ const unsigned char *iv, int enc)
{
int ret;
int mode = EVP_CIPHER_CTX_get_mode(ctx);
if (enc || (mode != EVP_CIPH_ECB_MODE && mode != EVP_CIPH_CBC_MODE))
ret = ossl_aria_set_encrypt_key(key,
- EVP_CIPHER_CTX_get_key_length(ctx) * 8,
- EVP_CIPHER_CTX_get_cipher_data(ctx));
+ EVP_CIPHER_CTX_get_key_length(ctx) * 8,
+ EVP_CIPHER_CTX_get_cipher_data(ctx));
else
ret = ossl_aria_set_decrypt_key(key,
- EVP_CIPHER_CTX_get_key_length(ctx) * 8,
- EVP_CIPHER_CTX_get_cipher_data(ctx));
+ EVP_CIPHER_CTX_get_key_length(ctx) * 8,
+ EVP_CIPHER_CTX_get_cipher_data(ctx));
if (ret < 0) {
ERR_raise(ERR_LIB_EVP, EVP_R_ARIA_KEY_SETUP_FAILED);
return 0;
@@ -80,100 +80,103 @@ static int aria_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
}
static void aria_cbc_encrypt(const unsigned char *in, unsigned char *out,
- size_t len, const ARIA_KEY *key,
- unsigned char *ivec, const int enc)
+ size_t len, const ARIA_KEY *key,
+ unsigned char *ivec, const int enc)
{
if (enc)
CRYPTO_cbc128_encrypt(in, out, len, key, ivec,
- (block128_f) ossl_aria_encrypt);
+ (block128_f)ossl_aria_encrypt);
else
CRYPTO_cbc128_decrypt(in, out, len, key, ivec,
- (block128_f) ossl_aria_encrypt);
+ (block128_f)ossl_aria_encrypt);
}
static void aria_cfb128_encrypt(const unsigned char *in, unsigned char *out,
- size_t length, const ARIA_KEY *key,
- unsigned char *ivec, int *num, const int enc)
+ size_t length, const ARIA_KEY *key,
+ unsigned char *ivec, int *num, const int enc)
{
CRYPTO_cfb128_encrypt(in, out, length, key, ivec, num, enc,
- (block128_f) ossl_aria_encrypt);
+ (block128_f)ossl_aria_encrypt);
}
static void aria_cfb1_encrypt(const unsigned char *in, unsigned char *out,
- size_t length, const ARIA_KEY *key,
- unsigned char *ivec, int *num, const int enc)
+ size_t length, const ARIA_KEY *key,
+ unsigned char *ivec, int *num, const int enc)
{
CRYPTO_cfb128_1_encrypt(in, out, length, key, ivec, num, enc,
- (block128_f) ossl_aria_encrypt);
+ (block128_f)ossl_aria_encrypt);
}
static void aria_cfb8_encrypt(const unsigned char *in, unsigned char *out,
- size_t length, const ARIA_KEY *key,
- unsigned char *ivec, int *num, const int enc)
+ size_t length, const ARIA_KEY *key,
+ unsigned char *ivec, int *num, const int enc)
{
CRYPTO_cfb128_8_encrypt(in, out, length, key, ivec, num, enc,
- (block128_f) ossl_aria_encrypt);
+ (block128_f)ossl_aria_encrypt);
}
static void aria_ecb_encrypt(const unsigned char *in, unsigned char *out,
- const ARIA_KEY *key, const int enc)
+ const ARIA_KEY *key, const int enc)
{
ossl_aria_encrypt(in, out, key);
}
static void aria_ofb128_encrypt(const unsigned char *in, unsigned char *out,
- size_t length, const ARIA_KEY *key,
- unsigned char *ivec, int *num)
+ size_t length, const ARIA_KEY *key,
+ unsigned char *ivec, int *num)
{
CRYPTO_ofb128_encrypt(in, out, length, key, ivec, num,
- (block128_f) ossl_aria_encrypt);
+ (block128_f)ossl_aria_encrypt);
}
IMPLEMENT_BLOCK_CIPHER(aria_128, ks, aria, EVP_ARIA_KEY,
- NID_aria_128, 16, 16, 16, 128,
- 0, aria_init_key, NULL,
- EVP_CIPHER_set_asn1_iv,
- EVP_CIPHER_get_asn1_iv,
- NULL)
+ NID_aria_128, 16, 16, 16, 128,
+ 0, aria_init_key, NULL,
+ EVP_CIPHER_set_asn1_iv,
+ EVP_CIPHER_get_asn1_iv,
+ NULL)
IMPLEMENT_BLOCK_CIPHER(aria_192, ks, aria, EVP_ARIA_KEY,
- NID_aria_192, 16, 24, 16, 128,
- 0, aria_init_key, NULL,
- EVP_CIPHER_set_asn1_iv,
- EVP_CIPHER_get_asn1_iv,
- NULL)
+ NID_aria_192, 16, 24, 16, 128,
+ 0, aria_init_key, NULL,
+ EVP_CIPHER_set_asn1_iv,
+ EVP_CIPHER_get_asn1_iv,
+ NULL)
IMPLEMENT_BLOCK_CIPHER(aria_256, ks, aria, EVP_ARIA_KEY,
- NID_aria_256, 16, 32, 16, 128,
- 0, aria_init_key, NULL,
- EVP_CIPHER_set_asn1_iv,
- EVP_CIPHER_get_asn1_iv,
- NULL)
-
-# define IMPLEMENT_ARIA_CFBR(ksize,cbits) \
- IMPLEMENT_CFBR(aria,aria,EVP_ARIA_KEY,ks,ksize,cbits,16,0)
-IMPLEMENT_ARIA_CFBR(128,1)
-IMPLEMENT_ARIA_CFBR(192,1)
-IMPLEMENT_ARIA_CFBR(256,1)
-IMPLEMENT_ARIA_CFBR(128,8)
-IMPLEMENT_ARIA_CFBR(192,8)
-IMPLEMENT_ARIA_CFBR(256,8)
-
-# define BLOCK_CIPHER_generic(nid,keylen,blocksize,ivlen,nmode,mode,MODE,flags) \
-static const EVP_CIPHER aria_##keylen##_##mode = { \
- nid##_##keylen##_##nmode,blocksize,keylen/8,ivlen, \
- flags|EVP_CIPH_##MODE##_MODE, \
- EVP_ORIG_GLOBAL, \
- aria_init_key, \
- aria_##mode##_cipher, \
- NULL, \
- sizeof(EVP_ARIA_KEY), \
- NULL,NULL,NULL,NULL }; \
-const EVP_CIPHER *EVP_aria_##keylen##_##mode(void) \
-{ return &aria_##keylen##_##mode; }
+ NID_aria_256, 16, 32, 16, 128,
+ 0, aria_init_key, NULL,
+ EVP_CIPHER_set_asn1_iv,
+ EVP_CIPHER_get_asn1_iv,
+ NULL)
+
+#define IMPLEMENT_ARIA_CFBR(ksize, cbits) \
+ IMPLEMENT_CFBR(aria, aria, EVP_ARIA_KEY, ks, ksize, cbits, 16, 0)
+IMPLEMENT_ARIA_CFBR(128, 1)
+IMPLEMENT_ARIA_CFBR(192, 1)
+IMPLEMENT_ARIA_CFBR(256, 1)
+IMPLEMENT_ARIA_CFBR(128, 8)
+IMPLEMENT_ARIA_CFBR(192, 8)
+IMPLEMENT_ARIA_CFBR(256, 8)
+
+#define BLOCK_CIPHER_generic(nid, keylen, blocksize, ivlen, nmode, mode, MODE, flags) \
+ static const EVP_CIPHER aria_##keylen##_##mode = { \
+ nid##_##keylen##_##nmode, blocksize, keylen / 8, ivlen, \
+ flags | EVP_CIPH_##MODE##_MODE, \
+ EVP_ORIG_GLOBAL, \
+ aria_init_key, \
+ aria_##mode##_cipher, \
+ NULL, \
+ sizeof(EVP_ARIA_KEY), \
+ NULL, NULL, NULL, NULL \
+ }; \
+ const EVP_CIPHER *EVP_aria_##keylen##_##mode(void) \
+ { \
+ return &aria_##keylen##_##mode; \
+ }
static int aria_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len)
+ const unsigned char *in, size_t len)
{
int n = EVP_CIPHER_CTX_get_num(ctx);
unsigned int num;
@@ -184,20 +187,20 @@ static int aria_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
num = (unsigned int)n;
CRYPTO_ctr128_encrypt(in, out, len, &dat->ks, ctx->iv,
- EVP_CIPHER_CTX_buf_noconst(ctx), &num,
- (block128_f) ossl_aria_encrypt);
+ EVP_CIPHER_CTX_buf_noconst(ctx), &num,
+ (block128_f)ossl_aria_encrypt);
EVP_CIPHER_CTX_set_num(ctx, num);
return 1;
}
BLOCK_CIPHER_generic(NID_aria, 128, 1, 16, ctr, ctr, CTR, 0)
-BLOCK_CIPHER_generic(NID_aria, 192, 1, 16, ctr, ctr, CTR, 0)
-BLOCK_CIPHER_generic(NID_aria, 256, 1, 16, ctr, ctr, CTR, 0)
+ BLOCK_CIPHER_generic(NID_aria, 192, 1, 16, ctr, ctr, CTR, 0)
+ BLOCK_CIPHER_generic(NID_aria, 256, 1, 16, ctr, ctr, CTR, 0)
-/* Authenticated cipher modes (GCM/CCM) */
+ /* Authenticated cipher modes (GCM/CCM) */
-/* increment counter (64-bit int) by 1 */
-static void ctr64_inc(unsigned char *counter)
+ /* increment counter (64-bit int) by 1 */
+ static void ctr64_inc(unsigned char *counter)
{
int n = 8;
unsigned char c;
@@ -213,7 +216,7 @@ static void ctr64_inc(unsigned char *counter)
}
static int aria_gcm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc)
+ const unsigned char *iv, int enc)
{
int ret;
EVP_ARIA_GCM_CTX *gctx = EVP_C_DATA(EVP_ARIA_GCM_CTX, ctx);
@@ -222,10 +225,10 @@ static int aria_gcm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
return 1;
if (key) {
ret = ossl_aria_set_encrypt_key(key,
- EVP_CIPHER_CTX_get_key_length(ctx) * 8,
- &gctx->ks.ks);
+ EVP_CIPHER_CTX_get_key_length(ctx) * 8,
+ &gctx->ks.ks);
CRYPTO_gcm128_init(&gctx->gcm, &gctx->ks,
- (block128_f) ossl_aria_encrypt);
+ (block128_f)ossl_aria_encrypt);
if (ret < 0) {
ERR_raise(ERR_LIB_EVP, EVP_R_ARIA_KEY_SETUP_FAILED);
return 0;
@@ -351,8 +354,7 @@ static int aria_gcm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
memcpy(EVP_CIPHER_CTX_buf_noconst(c), ptr, arg);
gctx->tls_aad_len = arg;
{
- unsigned int len =
- EVP_CIPHER_CTX_buf_noconst(c)[arg - 2] << 8
+ unsigned int len = EVP_CIPHER_CTX_buf_noconst(c)[arg - 2] << 8
| EVP_CIPHER_CTX_buf_noconst(c)[arg - 1];
/* Correct length for explicit IV */
if (len < EVP_GCM_TLS_EXPLICIT_IV_LEN)
@@ -370,33 +372,31 @@ static int aria_gcm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
/* Extra padding: tag appended to record */
return EVP_GCM_TLS_TAG_LEN;
- case EVP_CTRL_COPY:
- {
- EVP_CIPHER_CTX *out = ptr;
- EVP_ARIA_GCM_CTX *gctx_out = EVP_C_DATA(EVP_ARIA_GCM_CTX, out);
- if (gctx->gcm.key) {
- if (gctx->gcm.key != &gctx->ks)
- return 0;
- gctx_out->gcm.key = &gctx_out->ks;
- }
- if (gctx->iv == c->iv)
- gctx_out->iv = out->iv;
- else {
- if ((gctx_out->iv = OPENSSL_malloc(gctx->ivlen)) == NULL)
- return 0;
- memcpy(gctx_out->iv, gctx->iv, gctx->ivlen);
- }
- return 1;
+ case EVP_CTRL_COPY: {
+ EVP_CIPHER_CTX *out = ptr;
+ EVP_ARIA_GCM_CTX *gctx_out = EVP_C_DATA(EVP_ARIA_GCM_CTX, out);
+ if (gctx->gcm.key) {
+ if (gctx->gcm.key != &gctx->ks)
+ return 0;
+ gctx_out->gcm.key = &gctx_out->ks;
+ }
+ if (gctx->iv == c->iv)
+ gctx_out->iv = out->iv;
+ else {
+ if ((gctx_out->iv = OPENSSL_malloc(gctx->ivlen)) == NULL)
+ return 0;
+ memcpy(gctx_out->iv, gctx->iv, gctx->ivlen);
}
+ return 1;
+ }
default:
return -1;
-
}
}
static int aria_gcm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len)
+ const unsigned char *in, size_t len)
{
EVP_ARIA_GCM_CTX *gctx = EVP_C_DATA(EVP_ARIA_GCM_CTX, ctx);
int rv = -1;
@@ -409,13 +409,13 @@ static int aria_gcm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
* Set IV from start of buffer or generate IV and write to start of
* buffer.
*/
- if (EVP_CIPHER_CTX_ctrl(ctx, EVP_CIPHER_CTX_is_encrypting(ctx) ?
- EVP_CTRL_GCM_IV_GEN : EVP_CTRL_GCM_SET_IV_INV,
- EVP_GCM_TLS_EXPLICIT_IV_LEN, out) <= 0)
+ if (EVP_CIPHER_CTX_ctrl(ctx, EVP_CIPHER_CTX_is_encrypting(ctx) ? EVP_CTRL_GCM_IV_GEN : EVP_CTRL_GCM_SET_IV_INV,
+ EVP_GCM_TLS_EXPLICIT_IV_LEN, out)
+ <= 0)
goto err;
/* Use saved AAD */
if (CRYPTO_gcm128_aad(&gctx->gcm, EVP_CIPHER_CTX_buf_noconst(ctx),
- gctx->tls_aad_len))
+ gctx->tls_aad_len))
goto err;
/* Fix buffer and length to point to payload */
in += EVP_GCM_TLS_EXPLICIT_IV_LEN;
@@ -435,24 +435,24 @@ static int aria_gcm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
goto err;
/* Retrieve tag */
CRYPTO_gcm128_tag(&gctx->gcm, EVP_CIPHER_CTX_buf_noconst(ctx),
- EVP_GCM_TLS_TAG_LEN);
+ EVP_GCM_TLS_TAG_LEN);
/* If tag mismatch wipe buffer */
if (CRYPTO_memcmp(EVP_CIPHER_CTX_buf_noconst(ctx), in + len,
- EVP_GCM_TLS_TAG_LEN)) {
+ EVP_GCM_TLS_TAG_LEN)) {
OPENSSL_cleanse(out, len);
goto err;
}
rv = (int)len;
}
- err:
+err:
gctx->iv_set = 0;
gctx->tls_aad_len = -1;
return rv;
}
static int aria_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len)
+ const unsigned char *in, size_t len)
{
EVP_ARIA_GCM_CTX *gctx = EVP_C_DATA(EVP_ARIA_GCM_CTX, ctx);
@@ -482,8 +482,9 @@ static int aria_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
if (gctx->taglen < 0)
return -1;
if (CRYPTO_gcm128_finish(&gctx->gcm,
- EVP_CIPHER_CTX_buf_noconst(ctx),
- gctx->taglen) != 0)
+ EVP_CIPHER_CTX_buf_noconst(ctx),
+ gctx->taglen)
+ != 0)
return -1;
gctx->iv_set = 0;
return 0;
@@ -506,7 +507,7 @@ static int aria_gcm_cleanup(EVP_CIPHER_CTX *ctx)
}
static int aria_ccm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc)
+ const unsigned char *iv, int enc)
{
int ret;
EVP_ARIA_CCM_CTX *cctx = EVP_C_DATA(EVP_ARIA_CCM_CTX, ctx);
@@ -516,10 +517,10 @@ static int aria_ccm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
if (key) {
ret = ossl_aria_set_encrypt_key(key,
- EVP_CIPHER_CTX_get_key_length(ctx) * 8,
- &cctx->ks.ks);
+ EVP_CIPHER_CTX_get_key_length(ctx) * 8,
+ &cctx->ks.ks);
CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L,
- &cctx->ks, (block128_f) ossl_aria_encrypt);
+ &cctx->ks, (block128_f)ossl_aria_encrypt);
if (ret < 0) {
ERR_raise(ERR_LIB_EVP, EVP_R_ARIA_KEY_SETUP_FAILED);
return 0;
@@ -560,8 +561,7 @@ static int aria_ccm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
memcpy(EVP_CIPHER_CTX_buf_noconst(c), ptr, arg);
cctx->tls_aad_len = arg;
{
- uint16_t len =
- EVP_CIPHER_CTX_buf_noconst(c)[arg - 2] << 8
+ uint16_t len = EVP_CIPHER_CTX_buf_noconst(c)[arg - 2] << 8
| EVP_CIPHER_CTX_buf_noconst(c)[arg - 1];
/* Correct length for explicit IV */
if (len < EVP_CCM_TLS_EXPLICIT_IV_LEN)
@@ -617,17 +617,16 @@ static int aria_ccm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
cctx->len_set = 0;
return 1;
- case EVP_CTRL_COPY:
- {
- EVP_CIPHER_CTX *out = ptr;
- EVP_ARIA_CCM_CTX *cctx_out = EVP_C_DATA(EVP_ARIA_CCM_CTX, out);
- if (cctx->ccm.key) {
- if (cctx->ccm.key != &cctx->ks)
- return 0;
- cctx_out->ccm.key = &cctx_out->ks;
- }
- return 1;
+ case EVP_CTRL_COPY: {
+ EVP_CIPHER_CTX *out = ptr;
+ EVP_ARIA_CCM_CTX *cctx_out = EVP_C_DATA(EVP_ARIA_CCM_CTX, out);
+ if (cctx->ccm.key) {
+ if (cctx->ccm.key != &cctx->ks)
+ return 0;
+ cctx_out->ccm.key = &cctx_out->ks;
}
+ return 1;
+ }
default:
return -1;
@@ -635,7 +634,7 @@ static int aria_ccm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
}
static int aria_ccm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len)
+ const unsigned char *in, size_t len)
{
EVP_ARIA_CCM_CTX *cctx = EVP_C_DATA(EVP_ARIA_CCM_CTX, ctx);
CCM128_CONTEXT *ccm = &cctx->ccm;
@@ -646,18 +645,18 @@ static int aria_ccm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
/* If encrypting set explicit IV from sequence number (start of AAD) */
if (EVP_CIPHER_CTX_is_encrypting(ctx))
memcpy(out, EVP_CIPHER_CTX_buf_noconst(ctx),
- EVP_CCM_TLS_EXPLICIT_IV_LEN);
+ EVP_CCM_TLS_EXPLICIT_IV_LEN);
/* Get rest of IV from explicit IV */
memcpy(ctx->iv + EVP_CCM_TLS_FIXED_IV_LEN, in,
- EVP_CCM_TLS_EXPLICIT_IV_LEN);
+ EVP_CCM_TLS_EXPLICIT_IV_LEN);
/* Correct length value */
len -= EVP_CCM_TLS_EXPLICIT_IV_LEN + cctx->M;
if (CRYPTO_ccm128_setiv(ccm, ctx->iv, 15 - cctx->L,
- len))
- return -1;
+ len))
+ return -1;
/* Use saved AAD */
CRYPTO_ccm128_aad(ccm, EVP_CIPHER_CTX_buf_noconst(ctx),
- cctx->tls_aad_len);
+ cctx->tls_aad_len);
/* Fix buffer to point to payload */
in += EVP_CCM_TLS_EXPLICIT_IV_LEN;
out += EVP_CCM_TLS_EXPLICIT_IV_LEN;
@@ -683,7 +682,7 @@ static int aria_ccm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
}
static int aria_ccm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len)
+ const unsigned char *in, size_t len)
{
EVP_ARIA_CCM_CTX *cctx = EVP_C_DATA(EVP_ARIA_CCM_CTX, ctx);
CCM128_CONTEXT *ccm = &cctx->ccm;
@@ -735,12 +734,12 @@ static int aria_ccm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
} else {
int rv = -1;
if (cctx->str ? !CRYPTO_ccm128_decrypt_ccm64(ccm, in, out, len,
- cctx->str) :
- !CRYPTO_ccm128_decrypt(ccm, in, out, len)) {
+ cctx->str)
+ : !CRYPTO_ccm128_decrypt(ccm, in, out, len)) {
unsigned char tag[16];
if (CRYPTO_ccm128_tag(ccm, tag, cctx->M)) {
if (!CRYPTO_memcmp(tag, EVP_CIPHER_CTX_buf_noconst(ctx),
- cctx->M))
+ cctx->M))
rv = (int)len;
}
}
@@ -753,34 +752,37 @@ static int aria_ccm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
}
}
-#define aria_ccm_cleanup NULL
-
-#define ARIA_AUTH_FLAGS (EVP_CIPH_FLAG_DEFAULT_ASN1 \
- | EVP_CIPH_CUSTOM_IV | EVP_CIPH_FLAG_CUSTOM_CIPHER \
- | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CTRL_INIT \
- | EVP_CIPH_CUSTOM_COPY | EVP_CIPH_FLAG_AEAD_CIPHER \
- | EVP_CIPH_CUSTOM_IV_LENGTH)
-
-#define BLOCK_CIPHER_aead(keylen,mode,MODE) \
-static const EVP_CIPHER aria_##keylen##_##mode = { \
- NID_aria_##keylen##_##mode, \
- 1, keylen/8, 12, \
- ARIA_AUTH_FLAGS|EVP_CIPH_##MODE##_MODE, \
- EVP_ORIG_GLOBAL, \
- aria_##mode##_init_key, \
- aria_##mode##_cipher, \
- aria_##mode##_cleanup, \
- sizeof(EVP_ARIA_##MODE##_CTX), \
- NULL,NULL,aria_##mode##_ctrl,NULL }; \
-const EVP_CIPHER *EVP_aria_##keylen##_##mode(void) \
-{ return (EVP_CIPHER*)&aria_##keylen##_##mode; }
+#define aria_ccm_cleanup NULL
+
+#define ARIA_AUTH_FLAGS (EVP_CIPH_FLAG_DEFAULT_ASN1 \
+ | EVP_CIPH_CUSTOM_IV | EVP_CIPH_FLAG_CUSTOM_CIPHER \
+ | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CTRL_INIT \
+ | EVP_CIPH_CUSTOM_COPY | EVP_CIPH_FLAG_AEAD_CIPHER \
+ | EVP_CIPH_CUSTOM_IV_LENGTH)
+
+#define BLOCK_CIPHER_aead(keylen, mode, MODE) \
+ static const EVP_CIPHER aria_##keylen##_##mode = { \
+ NID_aria_##keylen##_##mode, \
+ 1, keylen / 8, 12, \
+ ARIA_AUTH_FLAGS | EVP_CIPH_##MODE##_MODE, \
+ EVP_ORIG_GLOBAL, \
+ aria_##mode##_init_key, \
+ aria_##mode##_cipher, \
+ aria_##mode##_cleanup, \
+ sizeof(EVP_ARIA_##MODE##_CTX), \
+ NULL, NULL, aria_##mode##_ctrl, NULL \
+ }; \
+ const EVP_CIPHER *EVP_aria_##keylen##_##mode(void) \
+ { \
+ return (EVP_CIPHER *)&aria_##keylen##_##mode; \
+ }
BLOCK_CIPHER_aead(128, gcm, GCM)
-BLOCK_CIPHER_aead(192, gcm, GCM)
-BLOCK_CIPHER_aead(256, gcm, GCM)
+ BLOCK_CIPHER_aead(192, gcm, GCM)
+ BLOCK_CIPHER_aead(256, gcm, GCM)
-BLOCK_CIPHER_aead(128, ccm, CCM)
-BLOCK_CIPHER_aead(192, ccm, CCM)
-BLOCK_CIPHER_aead(256, ccm, CCM)
+ BLOCK_CIPHER_aead(128, ccm, CCM)
+ BLOCK_CIPHER_aead(192, ccm, CCM)
+ BLOCK_CIPHER_aead(256, ccm, CCM)
#endif
diff --git a/crypto/evp/e_bf.c b/crypto/evp/e_bf.c
index 2aeda2ecf0..8cac877e91 100644
--- a/crypto/evp/e_bf.c
+++ b/crypto/evp/e_bf.c
@@ -16,27 +16,27 @@
#include <stdio.h>
#include "internal/cryptlib.h"
#ifndef OPENSSL_NO_BF
-# include <openssl/evp.h>
-# include "crypto/evp.h"
-# include <openssl/objects.h>
-# include <openssl/blowfish.h>
-# include "evp_local.h"
+#include <openssl/evp.h>
+#include "crypto/evp.h"
+#include <openssl/objects.h>
+#include <openssl/blowfish.h>
+#include "evp_local.h"
static int bf_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc);
+ const unsigned char *iv, int enc);
typedef struct {
BF_KEY ks;
} EVP_BF_KEY;
-# define data(ctx) EVP_C_DATA(EVP_BF_KEY,ctx)
+#define data(ctx) EVP_C_DATA(EVP_BF_KEY, ctx)
IMPLEMENT_BLOCK_CIPHER(bf, ks, BF, EVP_BF_KEY, NID_bf, 8, 16, 8, 64,
- EVP_CIPH_VARIABLE_LENGTH, bf_init_key, NULL,
- EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, NULL)
+ EVP_CIPH_VARIABLE_LENGTH, bf_init_key, NULL,
+ EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, NULL)
static int bf_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc)
+ const unsigned char *iv, int enc)
{
int len = EVP_CIPHER_CTX_get_key_length(ctx);
diff --git a/crypto/evp/e_camellia.c b/crypto/evp/e_camellia.c
index cb69516bde..c994bb395d 100644
--- a/crypto/evp/e_camellia.c
+++ b/crypto/evp/e_camellia.c
@@ -26,7 +26,7 @@
#include "evp_local.h"
static int camellia_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc);
+ const unsigned char *iv, int enc);
/* Camellia subkey Structure */
typedef struct {
@@ -38,22 +38,21 @@ typedef struct {
} stream;
} EVP_CAMELLIA_KEY;
-#define MAXBITCHUNK ((size_t)1<<(sizeof(size_t)*8-4))
+#define MAXBITCHUNK ((size_t)1 << (sizeof(size_t) * 8 - 4))
/* Attribute operation for Camellia */
-#define data(ctx) EVP_C_DATA(EVP_CAMELLIA_KEY,ctx)
+#define data(ctx) EVP_C_DATA(EVP_CAMELLIA_KEY, ctx)
#if defined(AES_ASM) && (defined(__sparc) || defined(__sparc__))
/* ---------^^^ this is not a typo, just a way to detect that
* assembler support was in general requested... */
-# include "crypto/sparc_arch.h"
+#include "crypto/sparc_arch.h"
static int cmll_t4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc)
+ const unsigned char *iv, int enc)
{
int ret, mode, bits;
- EVP_CAMELLIA_KEY *dat =
- (EVP_CAMELLIA_KEY *)EVP_CIPHER_CTX_get_cipher_data(ctx);
+ EVP_CAMELLIA_KEY *dat = (EVP_CAMELLIA_KEY *)EVP_CIPHER_CTX_get_cipher_data(ctx);
mode = EVP_CIPHER_CTX_get_mode(ctx);
bits = EVP_CIPHER_CTX_get_key_length(ctx) * 8;
@@ -63,38 +62,36 @@ static int cmll_t4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
if ((mode == EVP_CIPH_ECB_MODE || mode == EVP_CIPH_CBC_MODE)
&& !enc) {
ret = 0;
- dat->block = (block128_f) cmll_t4_decrypt;
+ dat->block = (block128_f)cmll_t4_decrypt;
switch (bits) {
case 128:
- dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ?
- (cbc128_f) cmll128_t4_cbc_decrypt : NULL;
+ dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ? (cbc128_f)cmll128_t4_cbc_decrypt : NULL;
break;
case 192:
case 256:
- dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ?
- (cbc128_f) cmll256_t4_cbc_decrypt : NULL;
+ dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ? (cbc128_f)cmll256_t4_cbc_decrypt : NULL;
break;
default:
ret = -1;
}
} else {
ret = 0;
- dat->block = (block128_f) cmll_t4_encrypt;
+ dat->block = (block128_f)cmll_t4_encrypt;
switch (bits) {
case 128:
if (mode == EVP_CIPH_CBC_MODE)
- dat->stream.cbc = (cbc128_f) cmll128_t4_cbc_encrypt;
+ dat->stream.cbc = (cbc128_f)cmll128_t4_cbc_encrypt;
else if (mode == EVP_CIPH_CTR_MODE)
- dat->stream.ctr = (ctr128_f) cmll128_t4_ctr32_encrypt;
+ dat->stream.ctr = (ctr128_f)cmll128_t4_ctr32_encrypt;
else
dat->stream.cbc = NULL;
break;
case 192:
case 256:
if (mode == EVP_CIPH_CBC_MODE)
- dat->stream.cbc = (cbc128_f) cmll256_t4_cbc_encrypt;
+ dat->stream.cbc = (cbc128_f)cmll256_t4_cbc_encrypt;
else if (mode == EVP_CIPH_CTR_MODE)
- dat->stream.ctr = (ctr128_f) cmll256_t4_ctr32_encrypt;
+ dat->stream.ctr = (ctr128_f)cmll256_t4_ctr32_encrypt;
else
dat->stream.cbc = NULL;
break;
@@ -111,92 +108,99 @@ static int cmll_t4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
return 1;
}
-# define cmll_t4_cbc_cipher camellia_cbc_cipher
+#define cmll_t4_cbc_cipher camellia_cbc_cipher
static int cmll_t4_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len);
+ const unsigned char *in, size_t len);
-# define cmll_t4_ecb_cipher camellia_ecb_cipher
+#define cmll_t4_ecb_cipher camellia_ecb_cipher
static int cmll_t4_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len);
+ const unsigned char *in, size_t len);
-# define cmll_t4_ofb_cipher camellia_ofb_cipher
+#define cmll_t4_ofb_cipher camellia_ofb_cipher
static int cmll_t4_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len);
+ const unsigned char *in, size_t len);
-# define cmll_t4_cfb_cipher camellia_cfb_cipher
+#define cmll_t4_cfb_cipher camellia_cfb_cipher
static int cmll_t4_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len);
+ const unsigned char *in, size_t len);
-# define cmll_t4_cfb8_cipher camellia_cfb8_cipher
+#define cmll_t4_cfb8_cipher camellia_cfb8_cipher
static int cmll_t4_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len);
+ const unsigned char *in, size_t len);
-# define cmll_t4_cfb1_cipher camellia_cfb1_cipher
+#define cmll_t4_cfb1_cipher camellia_cfb1_cipher
static int cmll_t4_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len);
+ const unsigned char *in, size_t len);
-# define cmll_t4_ctr_cipher camellia_ctr_cipher
+#define cmll_t4_ctr_cipher camellia_ctr_cipher
static int cmll_t4_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len);
-
-# define BLOCK_CIPHER_generic(nid,keylen,blocksize,ivlen,nmode,mode,MODE,flags) \
-static const EVP_CIPHER cmll_t4_##keylen##_##mode = { \
- nid##_##keylen##_##nmode,blocksize,keylen/8,ivlen, \
- flags|EVP_CIPH_##MODE##_MODE, \
- EVP_ORIG_GLOBAL, \
- cmll_t4_init_key, \
- cmll_t4_##mode##_cipher, \
- NULL, \
- sizeof(EVP_CAMELLIA_KEY), \
- NULL,NULL,NULL,NULL }; \
-static const EVP_CIPHER camellia_##keylen##_##mode = { \
- nid##_##keylen##_##nmode,blocksize, \
- keylen/8,ivlen, \
- flags|EVP_CIPH_##MODE##_MODE, \
- EVP_ORIG_GLOBAL, \
- camellia_init_key, \
- camellia_##mode##_cipher, \
- NULL, \
- sizeof(EVP_CAMELLIA_KEY), \
- NULL,NULL,NULL,NULL }; \
-const EVP_CIPHER *EVP_camellia_##keylen##_##mode(void) \
-{ return SPARC_CMLL_CAPABLE?&cmll_t4_##keylen##_##mode:&camellia_##keylen##_##mode; }
+ const unsigned char *in, size_t len);
+
+#define BLOCK_CIPHER_generic(nid, keylen, blocksize, ivlen, nmode, mode, MODE, flags) \
+ static const EVP_CIPHER cmll_t4_##keylen##_##mode = { \
+ nid##_##keylen##_##nmode, blocksize, keylen / 8, ivlen, \
+ flags | EVP_CIPH_##MODE##_MODE, \
+ EVP_ORIG_GLOBAL, \
+ cmll_t4_init_key, \
+ cmll_t4_##mode##_cipher, \
+ NULL, \
+ sizeof(EVP_CAMELLIA_KEY), \
+ NULL, NULL, NULL, NULL \
+ }; \
+ static const EVP_CIPHER camellia_##keylen##_##mode = { \
+ nid##_##keylen##_##nmode, blocksize, \
+ keylen / 8, ivlen, \
+ flags | EVP_CIPH_##MODE##_MODE, \
+ EVP_ORIG_GLOBAL, \
+ camellia_init_key, \
+ camellia_##mode##_cipher, \
+ NULL, \
+ sizeof(EVP_CAMELLIA_KEY), \
+ NULL, NULL, NULL, NULL \
+ }; \
+ const EVP_CIPHER *EVP_camellia_##keylen##_##mode(void) \
+ { \
+ return SPARC_CMLL_CAPABLE ? &cmll_t4_##keylen##_##mode : &camellia_##keylen##_##mode; \
+ }
#else
-# define BLOCK_CIPHER_generic(nid,keylen,blocksize,ivlen,nmode,mode,MODE,flags) \
-static const EVP_CIPHER camellia_##keylen##_##mode = { \
- nid##_##keylen##_##nmode,blocksize,keylen/8,ivlen, \
- flags|EVP_CIPH_##MODE##_MODE, \
- EVP_ORIG_GLOBAL, \
- camellia_init_key, \
- camellia_##mode##_cipher, \
- NULL, \
- sizeof(EVP_CAMELLIA_KEY), \
- NULL,NULL,NULL,NULL }; \
-const EVP_CIPHER *EVP_camellia_##keylen##_##mode(void) \
-{ return &camellia_##keylen##_##mode; }
+#define BLOCK_CIPHER_generic(nid, keylen, blocksize, ivlen, nmode, mode, MODE, flags) \
+ static const EVP_CIPHER camellia_##keylen##_##mode = { \
+ nid##_##keylen##_##nmode, blocksize, keylen / 8, ivlen, \
+ flags | EVP_CIPH_##MODE##_MODE, \
+ EVP_ORIG_GLOBAL, \
+ camellia_init_key, \
+ camellia_##mode##_cipher, \
+ NULL, \
+ sizeof(EVP_CAMELLIA_KEY), \
+ NULL, NULL, NULL, NULL \
+ }; \
+ const EVP_CIPHER *EVP_camellia_##keylen##_##mode(void) \
+ { \
+ return &camellia_##keylen##_##mode; \
+ }
#endif
-#define BLOCK_CIPHER_generic_pack(nid,keylen,flags) \
- BLOCK_CIPHER_generic(nid,keylen,16,16,cbc,cbc,CBC,flags|EVP_CIPH_FLAG_DEFAULT_ASN1) \
- BLOCK_CIPHER_generic(nid,keylen,16,0,ecb,ecb,ECB,flags|EVP_CIPH_FLAG_DEFAULT_ASN1) \
- BLOCK_CIPHER_generic(nid,keylen,1,16,ofb128,ofb,OFB,flags|EVP_CIPH_FLAG_DEFAULT_ASN1) \
- BLOCK_CIPHER_generic(nid,keylen,1,16,cfb128,cfb,CFB,flags|EVP_CIPH_FLAG_DEFAULT_ASN1) \
- BLOCK_CIPHER_generic(nid,keylen,1,16,cfb1,cfb1,CFB,flags) \
- BLOCK_CIPHER_generic(nid,keylen,1,16,cfb8,cfb8,CFB,flags) \
- BLOCK_CIPHER_generic(nid, keylen, 1, 16, ctr, ctr, CTR, flags)
+#define BLOCK_CIPHER_generic_pack(nid, keylen, flags) \
+ BLOCK_CIPHER_generic(nid, keylen, 16, 16, cbc, cbc, CBC, flags | EVP_CIPH_FLAG_DEFAULT_ASN1) \
+ BLOCK_CIPHER_generic(nid, keylen, 16, 0, ecb, ecb, ECB, flags | EVP_CIPH_FLAG_DEFAULT_ASN1) \
+ BLOCK_CIPHER_generic(nid, keylen, 1, 16, ofb128, ofb, OFB, flags | EVP_CIPH_FLAG_DEFAULT_ASN1) \
+ BLOCK_CIPHER_generic(nid, keylen, 1, 16, cfb128, cfb, CFB, flags | EVP_CIPH_FLAG_DEFAULT_ASN1) \
+ BLOCK_CIPHER_generic(nid, keylen, 1, 16, cfb1, cfb1, CFB, flags) \
+ BLOCK_CIPHER_generic(nid, keylen, 1, 16, cfb8, cfb8, CFB, flags) \
+ BLOCK_CIPHER_generic(nid, keylen, 1, 16, ctr, ctr, CTR, flags)
/* The subkey for Camellia is generated. */
static int camellia_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc)
+ const unsigned char *iv, int enc)
{
int ret, mode;
EVP_CAMELLIA_KEY *dat = EVP_C_DATA(EVP_CAMELLIA_KEY, ctx);
ret = Camellia_set_key(key, EVP_CIPHER_CTX_get_key_length(ctx) * 8,
- &dat->ks);
+ &dat->ks);
if (ret < 0) {
ERR_raise(ERR_LIB_EVP, EVP_R_CAMELLIA_KEY_SETUP_FAILED);
return 0;
@@ -205,26 +209,24 @@ static int camellia_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
mode = EVP_CIPHER_CTX_get_mode(ctx);
if ((mode == EVP_CIPH_ECB_MODE || mode == EVP_CIPH_CBC_MODE)
&& !enc) {
- dat->block = (block128_f) Camellia_decrypt;
- dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ?
- (cbc128_f) Camellia_cbc_encrypt : NULL;
+ dat->block = (block128_f)Camellia_decrypt;
+ dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ? (cbc128_f)Camellia_cbc_encrypt : NULL;
} else {
- dat->block = (block128_f) Camellia_encrypt;
- dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ?
- (cbc128_f) Camellia_cbc_encrypt : NULL;
+ dat->block = (block128_f)Camellia_encrypt;
+ dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ? (cbc128_f)Camellia_cbc_encrypt : NULL;
}
return 1;
}
static int camellia_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len)
+ const unsigned char *in, size_t len)
{
EVP_CAMELLIA_KEY *dat = EVP_C_DATA(EVP_CAMELLIA_KEY, ctx);
if (dat->stream.cbc)
- (*dat->stream.cbc) (in, out, len, &dat->ks, ctx->iv,
- EVP_CIPHER_CTX_is_encrypting(ctx));
+ (*dat->stream.cbc)(in, out, len, &dat->ks, ctx->iv,
+ EVP_CIPHER_CTX_is_encrypting(ctx));
else if (EVP_CIPHER_CTX_is_encrypting(ctx))
CRYPTO_cbc128_encrypt(in, out, len, &dat->ks, ctx->iv, dat->block);
else
@@ -234,7 +236,7 @@ static int camellia_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
}
static int camellia_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len)
+ const unsigned char *in, size_t len)
{
size_t bl = EVP_CIPHER_CTX_get_block_size(ctx);
size_t i;
@@ -244,13 +246,13 @@ static int camellia_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
return 1;
for (i = 0, len -= bl; i <= len; i += bl)
- (*dat->block) (in + i, out + i, &dat->ks);
+ (*dat->block)(in + i, out + i, &dat->ks);
return 1;
}
static int camellia_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len)
+ const unsigned char *in, size_t len)
{
EVP_CAMELLIA_KEY *dat = EVP_C_DATA(EVP_CAMELLIA_KEY, ctx);
@@ -261,39 +263,39 @@ static int camellia_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
}
static int camellia_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len)
+ const unsigned char *in, size_t len)
{
EVP_CAMELLIA_KEY *dat = EVP_C_DATA(EVP_CAMELLIA_KEY, ctx);
int num = EVP_CIPHER_CTX_get_num(ctx);
CRYPTO_cfb128_encrypt(in, out, len, &dat->ks, ctx->iv, &num,
- EVP_CIPHER_CTX_is_encrypting(ctx), dat->block);
+ EVP_CIPHER_CTX_is_encrypting(ctx), dat->block);
EVP_CIPHER_CTX_set_num(ctx, num);
return 1;
}
static int camellia_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len)
+ const unsigned char *in, size_t len)
{
EVP_CAMELLIA_KEY *dat = EVP_C_DATA(EVP_CAMELLIA_KEY, ctx);
int num = EVP_CIPHER_CTX_get_num(ctx);
CRYPTO_cfb128_8_encrypt(in, out, len, &dat->ks, ctx->iv, &num,
- EVP_CIPHER_CTX_is_encrypting(ctx), dat->block);
+ EVP_CIPHER_CTX_is_encrypting(ctx), dat->block);
EVP_CIPHER_CTX_set_num(ctx, num);
return 1;
}
static int camellia_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len)
+ const unsigned char *in, size_t len)
{
EVP_CAMELLIA_KEY *dat = EVP_C_DATA(EVP_CAMELLIA_KEY, ctx);
if (EVP_CIPHER_CTX_test_flags(ctx, EVP_CIPH_FLAG_LENGTH_BITS)) {
int num = EVP_CIPHER_CTX_get_num(ctx);
CRYPTO_cfb128_1_encrypt(in, out, len, &dat->ks, ctx->iv, &num,
- EVP_CIPHER_CTX_is_encrypting(ctx),
- dat->block);
+ EVP_CIPHER_CTX_is_encrypting(ctx),
+ dat->block);
EVP_CIPHER_CTX_set_num(ctx, num);
return 1;
}
@@ -301,20 +303,20 @@ static int camellia_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
while (len >= MAXBITCHUNK) {
int num = EVP_CIPHER_CTX_get_num(ctx);
CRYPTO_cfb128_1_encrypt(in, out, MAXBITCHUNK * 8, &dat->ks,
- ctx->iv, &num,
- EVP_CIPHER_CTX_is_encrypting(ctx),
- dat->block);
+ ctx->iv, &num,
+ EVP_CIPHER_CTX_is_encrypting(ctx),
+ dat->block);
EVP_CIPHER_CTX_set_num(ctx, num);
len -= MAXBITCHUNK;
out += MAXBITCHUNK;
- in += MAXBITCHUNK;
+ in += MAXBITCHUNK;
}
if (len) {
int num = EVP_CIPHER_CTX_get_num(ctx);
CRYPTO_cfb128_1_encrypt(in, out, len * 8, &dat->ks,
- ctx->iv, &num,
- EVP_CIPHER_CTX_is_encrypting(ctx),
- dat->block);
+ ctx->iv, &num,
+ EVP_CIPHER_CTX_is_encrypting(ctx),
+ dat->block);
EVP_CIPHER_CTX_set_num(ctx, num);
}
@@ -322,7 +324,7 @@ static int camellia_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
}
static int camellia_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len)
+ const unsigned char *in, size_t len)
{
int snum = EVP_CIPHER_CTX_get_num(ctx);
unsigned int num;
@@ -333,17 +335,17 @@ static int camellia_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
num = snum;
if (dat->stream.ctr)
CRYPTO_ctr128_encrypt_ctr32(in, out, len, &dat->ks, ctx->iv,
- EVP_CIPHER_CTX_buf_noconst(ctx),
- &num,
- dat->stream.ctr);
+ EVP_CIPHER_CTX_buf_noconst(ctx),
+ &num,
+ dat->stream.ctr);
else
CRYPTO_ctr128_encrypt(in, out, len, &dat->ks, ctx->iv,
- EVP_CIPHER_CTX_buf_noconst(ctx), &num,
- dat->block);
+ EVP_CIPHER_CTX_buf_noconst(ctx), &num,
+ dat->block);
EVP_CIPHER_CTX_set_num(ctx, num);
return 1;
}
BLOCK_CIPHER_generic_pack(NID_camellia, 128, 0)
BLOCK_CIPHER_generic_pack(NID_camellia, 192, 0)
- BLOCK_CIPHER_generic_pack(NID_camellia, 256, 0)
+ BLOCK_CIPHER_generic_pack(NID_camellia, 256, 0)
diff --git a/crypto/evp/e_cast.c b/crypto/evp/e_cast.c
index 5e9be2dc7d..f45469e821 100644
--- a/crypto/evp/e_cast.c
+++ b/crypto/evp/e_cast.c
@@ -17,28 +17,28 @@
#include "internal/cryptlib.h"
#ifndef OPENSSL_NO_CAST
-# include <openssl/evp.h>
-# include <openssl/objects.h>
-# include "crypto/evp.h"
-# include <openssl/cast.h>
-# include "evp_local.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include "crypto/evp.h"
+#include <openssl/cast.h>
+#include "evp_local.h"
static int cast_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc);
+ const unsigned char *iv, int enc);
typedef struct {
CAST_KEY ks;
} EVP_CAST_KEY;
-# define data(ctx) EVP_C_DATA(EVP_CAST_KEY,ctx)
+#define data(ctx) EVP_C_DATA(EVP_CAST_KEY, ctx)
IMPLEMENT_BLOCK_CIPHER(cast5, ks, CAST, EVP_CAST_KEY,
- NID_cast5, 8, CAST_KEY_LENGTH, 8, 64,
- EVP_CIPH_VARIABLE_LENGTH, cast_init_key, NULL,
- EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, NULL)
+ NID_cast5, 8, CAST_KEY_LENGTH, 8, 64,
+ EVP_CIPH_VARIABLE_LENGTH, cast_init_key, NULL,
+ EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, NULL)
static int cast_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc)
+ const unsigned char *iv, int enc)
{
int keylen = EVP_CIPHER_CTX_get_key_length(ctx);
diff --git a/crypto/evp/e_chacha20_poly1305.c b/crypto/evp/e_chacha20_poly1305.c
index 03bf63b502..4db2fd12f9 100644
--- a/crypto/evp/e_chacha20_poly1305.c
+++ b/crypto/evp/e_chacha20_poly1305.c
@@ -13,41 +13,41 @@
#ifndef OPENSSL_NO_CHACHA
-# include <openssl/evp.h>
-# include <openssl/objects.h>
-# include "crypto/evp.h"
-# include "evp_local.h"
-# include "crypto/chacha.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include "crypto/evp.h"
+#include "evp_local.h"
+#include "crypto/chacha.h"
typedef struct {
union {
- OSSL_UNION_ALIGN; /* this ensures even sizeof(EVP_CHACHA_KEY)%8==0 */
+ OSSL_UNION_ALIGN; /* this ensures even sizeof(EVP_CHACHA_KEY)%8==0 */
unsigned int d[CHACHA_KEY_SIZE / 4];
} key;
- unsigned int counter[CHACHA_CTR_SIZE / 4];
+ unsigned int counter[CHACHA_CTR_SIZE / 4];
unsigned char buf[CHACHA_BLK_SIZE];
- unsigned int partial_len;
+ unsigned int partial_len;
} EVP_CHACHA_KEY;
-#define data(ctx) ((EVP_CHACHA_KEY *)(ctx)->cipher_data)
+#define data(ctx) ((EVP_CHACHA_KEY *)(ctx)->cipher_data)
-#define CHACHA20_POLY1305_MAX_IVLEN 12
+#define CHACHA20_POLY1305_MAX_IVLEN 12
static int chacha_init_key(EVP_CIPHER_CTX *ctx,
- const unsigned char user_key[CHACHA_KEY_SIZE],
- const unsigned char iv[CHACHA_CTR_SIZE], int enc)
+ const unsigned char user_key[CHACHA_KEY_SIZE],
+ const unsigned char iv[CHACHA_CTR_SIZE], int enc)
{
EVP_CHACHA_KEY *key = data(ctx);
unsigned int i;
if (user_key)
- for (i = 0; i < CHACHA_KEY_SIZE; i+=4) {
- key->key.d[i/4] = CHACHA_U8TOU32(user_key+i);
+ for (i = 0; i < CHACHA_KEY_SIZE; i += 4) {
+ key->key.d[i / 4] = CHACHA_U8TOU32(user_key + i);
}
if (iv)
- for (i = 0; i < CHACHA_CTR_SIZE; i+=4) {
- key->counter[i/4] = CHACHA_U8TOU32(iv+i);
+ for (i = 0; i < CHACHA_CTR_SIZE; i += 4) {
+ key->counter[i / 4] = CHACHA_U8TOU32(iv + i);
}
key->partial_len = 0;
@@ -56,7 +56,7 @@ static int chacha_init_key(EVP_CIPHER_CTX *ctx,
}
static int chacha_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *inp, size_t len)
+ const unsigned char *inp, size_t len)
{
EVP_CHACHA_KEY *key = data(ctx);
unsigned int n, rem, ctr32;
@@ -89,8 +89,8 @@ static int chacha_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
* Below condition is practically never met, but it has to
* be checked for code correctness.
*/
- if (sizeof(size_t)>sizeof(unsigned int) && blocks>(1U<<28))
- blocks = (1U<<28);
+ if (sizeof(size_t) > sizeof(unsigned int) && blocks > (1U << 28))
+ blocks = (1U << 28);
/*
* As ChaCha20_ctr32 operates on 32-bit counter, caller
@@ -110,13 +110,14 @@ static int chacha_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
out += blocks;
key->counter[0] = ctr32;
- if (ctr32 == 0) key->counter[1]++;
+ if (ctr32 == 0)
+ key->counter[1]++;
}
if (rem) {
memset(key->buf, 0, sizeof(key->buf));
ChaCha20_ctr32(key->buf, key->buf, CHACHA_BLK_SIZE,
- key->key.d, key->counter);
+ key->key.d, key->counter);
for (n = 0; n < rem; n++)
out[n] = inp[n] ^ key->buf[n];
key->partial_len = rem;
@@ -127,9 +128,9 @@ static int chacha_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
static const EVP_CIPHER chacha20 = {
NID_chacha20,
- 1, /* block_size */
- CHACHA_KEY_SIZE, /* key_len */
- CHACHA_CTR_SIZE, /* iv_len, 128-bit counter in the context */
+ 1, /* block_size */
+ CHACHA_KEY_SIZE, /* key_len */
+ CHACHA_CTR_SIZE, /* iv_len, 128-bit counter in the context */
EVP_CIPH_CUSTOM_IV | EVP_CIPH_ALWAYS_CALL_INIT,
EVP_ORIG_GLOBAL,
chacha_init_key,
@@ -147,12 +148,12 @@ const EVP_CIPHER *EVP_chacha20(void)
return &chacha20;
}
-# ifndef OPENSSL_NO_POLY1305
-# include "crypto/poly1305.h"
+#ifndef OPENSSL_NO_POLY1305
+#include "crypto/poly1305.h"
typedef struct {
EVP_CHACHA_KEY key;
- unsigned int nonce[12/4];
+ unsigned int nonce[12 / 4];
unsigned char tag[POLY1305_BLOCK_SIZE];
unsigned char tls_aad[POLY1305_BLOCK_SIZE];
struct {
@@ -162,13 +163,13 @@ typedef struct {
size_t tls_payload_length;
} EVP_CHACHA_AEAD_CTX;
-# define NO_TLS_PAYLOAD_LENGTH ((size_t)-1)
-# define aead_data(ctx) ((EVP_CHACHA_AEAD_CTX *)(ctx)->cipher_data)
-# define POLY1305_ctx(actx) ((POLY1305 *)(actx + 1))
+#define NO_TLS_PAYLOAD_LENGTH ((size_t)-1)
+#define aead_data(ctx) ((EVP_CHACHA_AEAD_CTX *)(ctx)->cipher_data)
+#define POLY1305_ctx(actx) ((POLY1305 *)(actx + 1))
static int chacha20_poly1305_init_key(EVP_CIPHER_CTX *ctx,
- const unsigned char *inkey,
- const unsigned char *iv, int enc)
+ const unsigned char *inkey,
+ const unsigned char *iv, int enc)
{
EVP_CHACHA_AEAD_CTX *actx = aead_data(ctx);
@@ -187,7 +188,7 @@ static int chacha20_poly1305_init_key(EVP_CIPHER_CTX *ctx,
/* pad on the left */
if (actx->nonce_len <= CHACHA_CTR_SIZE)
memcpy(temp + CHACHA_CTR_SIZE - actx->nonce_len, iv,
- actx->nonce_len);
+ actx->nonce_len);
chacha_init_key(ctx, inkey, temp, enc);
@@ -201,20 +202,19 @@ static int chacha20_poly1305_init_key(EVP_CIPHER_CTX *ctx,
return 1;
}
-# if !defined(OPENSSL_SMALL_FOOTPRINT)
+#if !defined(OPENSSL_SMALL_FOOTPRINT)
-# if defined(POLY1305_ASM) && (defined(__x86_64) || defined(__x86_64__) || \
- defined(_M_AMD64) || defined(_M_X64))
-# define XOR128_HELPERS
+#if defined(POLY1305_ASM) && (defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64))
+#define XOR128_HELPERS
void *xor128_encrypt_n_pad(void *out, const void *inp, void *otp, size_t len);
void *xor128_decrypt_n_pad(void *out, const void *inp, void *otp, size_t len);
static const unsigned char zero[4 * CHACHA_BLK_SIZE] = { 0 };
-# else
+#else
static const unsigned char zero[2 * CHACHA_BLK_SIZE] = { 0 };
-# endif
+#endif
static int chacha20_poly1305_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len)
+ const unsigned char *in, size_t len)
{
EVP_CHACHA_AEAD_CTX *actx = aead_data(ctx);
size_t tail, tohash_len, buf_len, plen = actx->tls_payload_length;
@@ -223,16 +223,16 @@ static int chacha20_poly1305_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
if (len != plen + POLY1305_BLOCK_SIZE)
return -1;
- buf = storage + ((0 - (size_t)storage) & 15); /* align */
+ buf = storage + ((0 - (size_t)storage) & 15); /* align */
ctr = buf + CHACHA_BLK_SIZE;
tohash = buf + CHACHA_BLK_SIZE - POLY1305_BLOCK_SIZE;
-# ifdef XOR128_HELPERS
+#ifdef XOR128_HELPERS
if (plen <= 3 * CHACHA_BLK_SIZE) {
actx->key.counter[0] = 0;
buf_len = (plen + 2 * CHACHA_BLK_SIZE - 1) & (0 - CHACHA_BLK_SIZE);
ChaCha20_ctr32(buf, zero, buf_len, actx->key.key.d,
- actx->key.counter);
+ actx->key.counter);
Poly1305_Init(POLY1305_ctx(actx), buf);
actx->key.partial_len = 0;
memcpy(tohash, actx->tls_aad, POLY1305_BLOCK_SIZE);
@@ -251,13 +251,13 @@ static int chacha20_poly1305_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
tohash_len = (size_t)(ctr - tohash);
}
}
-# else
+#else
if (plen <= CHACHA_BLK_SIZE) {
size_t i;
actx->key.counter[0] = 0;
ChaCha20_ctr32(buf, zero, (buf_len = 2 * CHACHA_BLK_SIZE),
- actx->key.key.d, actx->key.counter);
+ actx->key.key.d, actx->key.counter);
Poly1305_Init(POLY1305_ctx(actx), buf);
actx->key.partial_len = 0;
memcpy(tohash, actx->tls_aad, POLY1305_BLOCK_SIZE);
@@ -285,11 +285,11 @@ static int chacha20_poly1305_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
ctr += i + tail;
tohash_len += i + tail;
}
-# endif
+#endif
else {
actx->key.counter[0] = 0;
ChaCha20_ctr32(buf, zero, (buf_len = CHACHA_BLK_SIZE),
- actx->key.key.d, actx->key.counter);
+ actx->key.key.d, actx->key.counter);
Poly1305_Init(POLY1305_ctx(actx), buf);
actx->key.counter[0] = 1;
actx->key.partial_len = 0;
@@ -319,23 +319,23 @@ static int chacha20_poly1305_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
if (IS_LITTLE_ENDIAN) {
memcpy(ctr, (unsigned char *)&actx->len, POLY1305_BLOCK_SIZE);
} else {
- ctr[0] = (unsigned char)(actx->len.aad);
- ctr[1] = (unsigned char)(actx->len.aad>>8);
- ctr[2] = (unsigned char)(actx->len.aad>>16);
- ctr[3] = (unsigned char)(actx->len.aad>>24);
- ctr[4] = (unsigned char)(actx->len.aad>>32);
- ctr[5] = (unsigned char)(actx->len.aad>>40);
- ctr[6] = (unsigned char)(actx->len.aad>>48);
- ctr[7] = (unsigned char)(actx->len.aad>>56);
-
- ctr[8] = (unsigned char)(actx->len.text);
- ctr[9] = (unsigned char)(actx->len.text>>8);
- ctr[10] = (unsigned char)(actx->len.text>>16);
- ctr[11] = (unsigned char)(actx->len.text>>24);
- ctr[12] = (unsigned char)(actx->len.text>>32);
- ctr[13] = (unsigned char)(actx->len.text>>40);
- ctr[14] = (unsigned char)(actx->len.text>>48);
- ctr[15] = (unsigned char)(actx->len.text>>56);
+ ctr[0] = (unsigned char)(actx->len.aad);
+ ctr[1] = (unsigned char)(actx->len.aad >> 8);
+ ctr[2] = (unsigned char)(actx->len.aad >> 16);
+ ctr[3] = (unsigned char)(actx->len.aad >> 24);
+ ctr[4] = (unsigned char)(actx->len.aad >> 32);
+ ctr[5] = (unsigned char)(actx->len.aad >> 40);
+ ctr[6] = (unsigned char)(actx->len.aad >> 48);
+ ctr[7] = (unsigned char)(actx->len.aad >> 56);
+
+ ctr[8] = (unsigned char)(actx->len.text);
+ ctr[9] = (unsigned char)(actx->len.text >> 8);
+ ctr[10] = (unsigned char)(actx->len.text >> 16);
+ ctr[11] = (unsigned char)(actx->len.text >> 24);
+ ctr[12] = (unsigned char)(actx->len.text >> 32);
+ ctr[13] = (unsigned char)(actx->len.text >> 40);
+ ctr[14] = (unsigned char)(actx->len.text >> 48);
+ ctr[15] = (unsigned char)(actx->len.text >> 56);
}
tohash_len += POLY1305_BLOCK_SIZE;
}
@@ -343,7 +343,7 @@ static int chacha20_poly1305_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
Poly1305_Update(POLY1305_ctx(actx), tohash, tohash_len);
OPENSSL_cleanse(buf, buf_len);
Poly1305_Final(POLY1305_ctx(actx),
- EVP_CIPHER_CTX_is_encrypting(ctx) ? actx->tag : tohash);
+ EVP_CIPHER_CTX_is_encrypting(ctx) ? actx->tag : tohash);
actx->tls_payload_length = NO_TLS_PAYLOAD_LENGTH;
@@ -352,31 +352,31 @@ static int chacha20_poly1305_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
} else {
if (CRYPTO_memcmp(tohash, in, POLY1305_BLOCK_SIZE)) {
memset(out - (len - POLY1305_BLOCK_SIZE), 0,
- len - POLY1305_BLOCK_SIZE);
+ len - POLY1305_BLOCK_SIZE);
return -1;
}
}
return (int)len;
}
-# else
+#else
static const unsigned char zero[CHACHA_BLK_SIZE] = { 0 };
-# endif
+#endif
static int chacha20_poly1305_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len)
+ const unsigned char *in, size_t len)
{
EVP_CHACHA_AEAD_CTX *actx = aead_data(ctx);
size_t rem, plen = actx->tls_payload_length;
if (!actx->mac_inited) {
-# if !defined(OPENSSL_SMALL_FOOTPRINT)
+#if !defined(OPENSSL_SMALL_FOOTPRINT)
if (plen != NO_TLS_PAYLOAD_LENGTH && out != NULL)
return chacha20_poly1305_tls_cipher(ctx, out, in, len);
-# endif
+#endif
actx->key.counter[0] = 0;
ChaCha20_ctr32(actx->key.buf, zero, CHACHA_BLK_SIZE,
- actx->key.key.d, actx->key.counter);
+ actx->key.key.d, actx->key.counter);
Poly1305_Init(POLY1305_ctx(actx), actx->key.buf);
actx->key.counter[0] = 1;
actx->key.partial_len = 0;
@@ -384,23 +384,23 @@ static int chacha20_poly1305_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
actx->mac_inited = 1;
if (plen != NO_TLS_PAYLOAD_LENGTH) {
Poly1305_Update(POLY1305_ctx(actx), actx->tls_aad,
- EVP_AEAD_TLS1_AAD_LEN);
+ EVP_AEAD_TLS1_AAD_LEN);
actx->len.aad = EVP_AEAD_TLS1_AAD_LEN;
actx->aad = 1;
}
}
- if (in) { /* aad or text */
- if (out == NULL) { /* aad */
+ if (in) { /* aad or text */
+ if (out == NULL) { /* aad */
Poly1305_Update(POLY1305_ctx(actx), in, len);
actx->len.aad += len;
actx->aad = 1;
return (int)len;
- } else { /* plain- or ciphertext */
- if (actx->aad) { /* wrap up aad */
+ } else { /* plain- or ciphertext */
+ if (actx->aad) { /* wrap up aad */
if ((rem = (size_t)actx->len.aad % POLY1305_BLOCK_SIZE))
Poly1305_Update(POLY1305_ctx(actx), zero,
- POLY1305_BLOCK_SIZE - rem);
+ POLY1305_BLOCK_SIZE - rem);
actx->aad = 0;
}
@@ -410,13 +410,13 @@ static int chacha20_poly1305_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
else if (len != plen + POLY1305_BLOCK_SIZE)
return -1;
- if (EVP_CIPHER_CTX_is_encrypting(ctx)) { /* plaintext */
+ if (EVP_CIPHER_CTX_is_encrypting(ctx)) { /* plaintext */
chacha_cipher(ctx, out, in, plen);
Poly1305_Update(POLY1305_ctx(actx), out, plen);
in += plen;
out += plen;
actx->len.text += plen;
- } else { /* ciphertext */
+ } else { /* ciphertext */
Poly1305_Update(POLY1305_ctx(actx), in, plen);
chacha_cipher(ctx, out, in, plen);
in += plen;
@@ -425,51 +425,51 @@ static int chacha20_poly1305_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
}
}
}
- if (in == NULL /* explicit final */
- || plen != len) { /* or tls mode */
+ if (in == NULL /* explicit final */
+ || plen != len) { /* or tls mode */
DECLARE_IS_ENDIAN;
unsigned char temp[POLY1305_BLOCK_SIZE];
- if (actx->aad) { /* wrap up aad */
+ if (actx->aad) { /* wrap up aad */
if ((rem = (size_t)actx->len.aad % POLY1305_BLOCK_SIZE))
Poly1305_Update(POLY1305_ctx(actx), zero,
- POLY1305_BLOCK_SIZE - rem);
+ POLY1305_BLOCK_SIZE - rem);
actx->aad = 0;
}
if ((rem = (size_t)actx->len.text % POLY1305_BLOCK_SIZE))
Poly1305_Update(POLY1305_ctx(actx), zero,
- POLY1305_BLOCK_SIZE - rem);
+ POLY1305_BLOCK_SIZE - rem);
if (IS_LITTLE_ENDIAN) {
Poly1305_Update(POLY1305_ctx(actx),
- (unsigned char *)&actx->len, POLY1305_BLOCK_SIZE);
+ (unsigned char *)&actx->len, POLY1305_BLOCK_SIZE);
} else {
- temp[0] = (unsigned char)(actx->len.aad);
- temp[1] = (unsigned char)(actx->len.aad>>8);
- temp[2] = (unsigned char)(actx->len.aad>>16);
- temp[3] = (unsigned char)(actx->len.aad>>24);
- temp[4] = (unsigned char)(actx->len.aad>>32);
- temp[5] = (unsigned char)(actx->len.aad>>40);
- temp[6] = (unsigned char)(actx->len.aad>>48);
- temp[7] = (unsigned char)(actx->len.aad>>56);
-
- temp[8] = (unsigned char)(actx->len.text);
- temp[9] = (unsigned char)(actx->len.text>>8);
- temp[10] = (unsigned char)(actx->len.text>>16);
- temp[11] = (unsigned char)(actx->len.text>>24);
- temp[12] = (unsigned char)(actx->len.text>>32);
- temp[13] = (unsigned char)(actx->len.text>>40);
- temp[14] = (unsigned char)(actx->len.text>>48);
- temp[15] = (unsigned char)(actx->len.text>>56);
+ temp[0] = (unsigned char)(actx->len.aad);
+ temp[1] = (unsigned char)(actx->len.aad >> 8);
+ temp[2] = (unsigned char)(actx->len.aad >> 16);
+ temp[3] = (unsigned char)(actx->len.aad >> 24);
+ temp[4] = (unsigned char)(actx->len.aad >> 32);
+ temp[5] = (unsigned char)(actx->len.aad >> 40);
+ temp[6] = (unsigned char)(actx->len.aad >> 48);
+ temp[7] = (unsigned char)(actx->len.aad >> 56);
+
+ temp[8] = (unsigned char)(actx->len.text);
+ temp[9] = (unsigned char)(actx->len.text >> 8);
+ temp[10] = (unsigned char)(actx->len.text >> 16);
+ temp[11] = (unsigned char)(actx->len.text >> 24);
+ temp[12] = (unsigned char)(actx->len.text >> 32);
+ temp[13] = (unsigned char)(actx->len.text >> 40);
+ temp[14] = (unsigned char)(actx->len.text >> 48);
+ temp[15] = (unsigned char)(actx->len.text >> 56);
Poly1305_Update(POLY1305_ctx(actx), temp, POLY1305_BLOCK_SIZE);
}
Poly1305_Final(POLY1305_ctx(actx),
- EVP_CIPHER_CTX_is_encrypting(ctx) ? actx->tag : temp);
+ EVP_CIPHER_CTX_is_encrypting(ctx) ? actx->tag : temp);
actx->mac_inited = 0;
- if (in != NULL && len != plen) { /* tls mode */
+ if (in != NULL && len != plen) { /* tls mode */
if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
memcpy(out, actx->tag, POLY1305_BLOCK_SIZE);
} else {
@@ -478,8 +478,7 @@ static int chacha20_poly1305_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
return -1;
}
}
- }
- else if (!EVP_CIPHER_CTX_is_encrypting(ctx)) {
+ } else if (!EVP_CIPHER_CTX_is_encrypting(ctx)) {
if (CRYPTO_memcmp(temp, actx->tag, actx->tag_len))
return -1;
}
@@ -496,7 +495,7 @@ static int chacha20_poly1305_cleanup(EVP_CIPHER_CTX *ctx)
}
static int chacha20_poly1305_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,
- void *ptr)
+ void *ptr)
{
EVP_CHACHA_AEAD_CTX *actx = aead_data(ctx);
@@ -504,7 +503,7 @@ static int chacha20_poly1305_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,
case EVP_CTRL_INIT:
if (actx == NULL)
actx = ctx->cipher_data
- = OPENSSL_zalloc(sizeof(*actx) + Poly1305_ctx_size());
+ = OPENSSL_zalloc(sizeof(*actx) + Poly1305_ctx_size());
if (actx == NULL) {
ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
return 0;
@@ -523,8 +522,7 @@ static int chacha20_poly1305_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,
if (actx) {
EVP_CIPHER_CTX *dst = (EVP_CIPHER_CTX *)ptr;
- dst->cipher_data =
- OPENSSL_memdup(actx, sizeof(*actx) + Poly1305_ctx_size());
+ dst->cipher_data = OPENSSL_memdup(actx, sizeof(*actx) + Poly1305_ctx_size());
if (dst->cipher_data == NULL) {
ERR_raise(ERR_LIB_EVP, EVP_R_COPY_ERROR);
return 0;
@@ -546,11 +544,11 @@ static int chacha20_poly1305_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,
if (arg != 12)
return 0;
actx->nonce[0] = actx->key.counter[1]
- = CHACHA_U8TOU32((unsigned char *)ptr);
+ = CHACHA_U8TOU32((unsigned char *)ptr);
actx->nonce[1] = actx->key.counter[2]
- = CHACHA_U8TOU32((unsigned char *)ptr+4);
+ = CHACHA_U8TOU32((unsigned char *)ptr + 4);
actx->nonce[2] = actx->key.counter[3]
- = CHACHA_U8TOU32((unsigned char *)ptr+8);
+ = CHACHA_U8TOU32((unsigned char *)ptr + 8);
return 1;
case EVP_CTRL_AEAD_SET_TAG:
@@ -563,8 +561,7 @@ static int chacha20_poly1305_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,
return 1;
case EVP_CTRL_AEAD_GET_TAG:
- if (arg <= 0 || arg > POLY1305_BLOCK_SIZE ||
- !EVP_CIPHER_CTX_is_encrypting(ctx))
+ if (arg <= 0 || arg > POLY1305_BLOCK_SIZE || !EVP_CIPHER_CTX_is_encrypting(ctx))
return 0;
memcpy(ptr, actx->tag, arg);
return 1;
@@ -577,13 +574,12 @@ static int chacha20_poly1305_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,
unsigned char *aad = ptr;
memcpy(actx->tls_aad, ptr, EVP_AEAD_TLS1_AAD_LEN);
- len = aad[EVP_AEAD_TLS1_AAD_LEN - 2] << 8 |
- aad[EVP_AEAD_TLS1_AAD_LEN - 1];
+ len = aad[EVP_AEAD_TLS1_AAD_LEN - 2] << 8 | aad[EVP_AEAD_TLS1_AAD_LEN - 1];
aad = actx->tls_aad;
if (!EVP_CIPHER_CTX_is_encrypting(ctx)) {
if (len < POLY1305_BLOCK_SIZE)
return 0;
- len -= POLY1305_BLOCK_SIZE; /* discount attached tag */
+ len -= POLY1305_BLOCK_SIZE; /* discount attached tag */
aad[EVP_AEAD_TLS1_AAD_LEN - 2] = (unsigned char)(len >> 8);
aad[EVP_AEAD_TLS1_AAD_LEN - 1] = (unsigned char)len;
}
@@ -594,10 +590,10 @@ static int chacha20_poly1305_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,
*/
actx->key.counter[1] = actx->nonce[0];
actx->key.counter[2] = actx->nonce[1] ^ CHACHA_U8TOU32(aad);
- actx->key.counter[3] = actx->nonce[2] ^ CHACHA_U8TOU32(aad+4);
+ actx->key.counter[3] = actx->nonce[2] ^ CHACHA_U8TOU32(aad + 4);
actx->mac_inited = 0;
- return POLY1305_BLOCK_SIZE; /* tag length */
+ return POLY1305_BLOCK_SIZE; /* tag length */
}
case EVP_CTRL_AEAD_SET_MAC_KEY:
@@ -611,27 +607,24 @@ static int chacha20_poly1305_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,
static const EVP_CIPHER chacha20_poly1305 = {
NID_chacha20_poly1305,
- 1, /* block_size */
- CHACHA_KEY_SIZE, /* key_len */
- 12, /* iv_len, 96-bit nonce in the context */
- EVP_CIPH_FLAG_AEAD_CIPHER | EVP_CIPH_CUSTOM_IV |
- EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CTRL_INIT |
- EVP_CIPH_CUSTOM_COPY | EVP_CIPH_FLAG_CUSTOM_CIPHER |
- EVP_CIPH_CUSTOM_IV_LENGTH,
+ 1, /* block_size */
+ CHACHA_KEY_SIZE, /* key_len */
+ 12, /* iv_len, 96-bit nonce in the context */
+ EVP_CIPH_FLAG_AEAD_CIPHER | EVP_CIPH_CUSTOM_IV | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CTRL_INIT | EVP_CIPH_CUSTOM_COPY | EVP_CIPH_FLAG_CUSTOM_CIPHER | EVP_CIPH_CUSTOM_IV_LENGTH,
EVP_ORIG_GLOBAL,
chacha20_poly1305_init_key,
chacha20_poly1305_cipher,
chacha20_poly1305_cleanup,
- 0, /* 0 moves context-specific structure allocation to ctrl */
- NULL, /* set_asn1_parameters */
- NULL, /* get_asn1_parameters */
+ 0, /* 0 moves context-specific structure allocation to ctrl */
+ NULL, /* set_asn1_parameters */
+ NULL, /* get_asn1_parameters */
chacha20_poly1305_ctrl,
- NULL /* app_data */
+ NULL /* app_data */
};
const EVP_CIPHER *EVP_chacha20_poly1305(void)
{
- return(&chacha20_poly1305);
+ return (&chacha20_poly1305);
}
-# endif
+#endif
#endif
diff --git a/crypto/evp/e_des.c b/crypto/evp/e_des.c
index 6eb49c0339..b8d10829c2 100644
--- a/crypto/evp/e_des.c
+++ b/crypto/evp/e_des.c
@@ -16,12 +16,12 @@
#include <stdio.h>
#include "internal/cryptlib.h"
#ifndef OPENSSL_NO_DES
-# include <openssl/evp.h>
-# include <openssl/objects.h>
-# include "crypto/evp.h"
-# include <openssl/des.h>
-# include <openssl/rand.h>
-# include "evp_local.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include "crypto/evp.h"
+#include <openssl/des.h>
+#include <openssl/rand.h>
+#include "evp_local.h"
typedef struct {
union {
@@ -29,27 +29,27 @@ typedef struct {
DES_key_schedule ks;
} ks;
union {
- void (*cbc) (const void *, void *, size_t,
- const DES_key_schedule *, unsigned char *);
+ void (*cbc)(const void *, void *, size_t,
+ const DES_key_schedule *, unsigned char *);
} stream;
} EVP_DES_KEY;
-# if defined(AES_ASM) && (defined(__sparc) || defined(__sparc__))
+#if defined(AES_ASM) && (defined(__sparc) || defined(__sparc__))
/* ----------^^^ this is not a typo, just a way to detect that
* assembler support was in general requested... */
-# include "crypto/sparc_arch.h"
+#include "crypto/sparc_arch.h"
-# define SPARC_DES_CAPABLE (OPENSSL_sparcv9cap_P[1] & CFR_DES)
+#define SPARC_DES_CAPABLE (OPENSSL_sparcv9cap_P[1] & CFR_DES)
void des_t4_key_expand(const void *key, DES_key_schedule *ks);
void des_t4_cbc_encrypt(const void *inp, void *out, size_t len,
- const DES_key_schedule *ks, unsigned char iv[8]);
+ const DES_key_schedule *ks, unsigned char iv[8]);
void des_t4_cbc_decrypt(const void *inp, void *out, size_t len,
- const DES_key_schedule *ks, unsigned char iv[8]);
-# endif
+ const DES_key_schedule *ks, unsigned char iv[8]);
+#endif
static int des_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc);
+ const unsigned char *iv, int enc);
static int des_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr);
/*
@@ -58,23 +58,23 @@ static int des_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr);
*/
static int des_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t inl)
+ const unsigned char *in, size_t inl)
{
BLOCK_CIPHER_ecb_loop()
DES_ecb_encrypt((DES_cblock *)(in + i), (DES_cblock *)(out + i),
- EVP_CIPHER_CTX_get_cipher_data(ctx),
- EVP_CIPHER_CTX_is_encrypting(ctx));
+ EVP_CIPHER_CTX_get_cipher_data(ctx),
+ EVP_CIPHER_CTX_is_encrypting(ctx));
return 1;
}
static int des_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t inl)
+ const unsigned char *in, size_t inl)
{
while (inl >= EVP_MAXCHUNK) {
int num = EVP_CIPHER_CTX_get_num(ctx);
DES_ofb64_encrypt(in, out, (long)EVP_MAXCHUNK,
- EVP_CIPHER_CTX_get_cipher_data(ctx),
- (DES_cblock *)ctx->iv, &num);
+ EVP_CIPHER_CTX_get_cipher_data(ctx),
+ (DES_cblock *)ctx->iv, &num);
EVP_CIPHER_CTX_set_num(ctx, num);
inl -= EVP_MAXCHUNK;
in += EVP_MAXCHUNK;
@@ -83,48 +83,48 @@ static int des_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
if (inl) {
int num = EVP_CIPHER_CTX_get_num(ctx);
DES_ofb64_encrypt(in, out, (long)inl,
- EVP_CIPHER_CTX_get_cipher_data(ctx),
- (DES_cblock *)ctx->iv, &num);
+ EVP_CIPHER_CTX_get_cipher_data(ctx),
+ (DES_cblock *)ctx->iv, &num);
EVP_CIPHER_CTX_set_num(ctx, num);
}
return 1;
}
static int des_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t inl)
+ const unsigned char *in, size_t inl)
{
- EVP_DES_KEY *dat = (EVP_DES_KEY *) EVP_CIPHER_CTX_get_cipher_data(ctx);
+ EVP_DES_KEY *dat = (EVP_DES_KEY *)EVP_CIPHER_CTX_get_cipher_data(ctx);
if (dat->stream.cbc != NULL) {
- (*dat->stream.cbc) (in, out, inl, &dat->ks.ks, ctx->iv);
+ (*dat->stream.cbc)(in, out, inl, &dat->ks.ks, ctx->iv);
return 1;
}
while (inl >= EVP_MAXCHUNK) {
DES_ncbc_encrypt(in, out, (long)EVP_MAXCHUNK,
- EVP_CIPHER_CTX_get_cipher_data(ctx),
- (DES_cblock *)ctx->iv,
- EVP_CIPHER_CTX_is_encrypting(ctx));
+ EVP_CIPHER_CTX_get_cipher_data(ctx),
+ (DES_cblock *)ctx->iv,
+ EVP_CIPHER_CTX_is_encrypting(ctx));
inl -= EVP_MAXCHUNK;
in += EVP_MAXCHUNK;
out += EVP_MAXCHUNK;
}
if (inl)
DES_ncbc_encrypt(in, out, (long)inl,
- EVP_CIPHER_CTX_get_cipher_data(ctx),
- (DES_cblock *)ctx->iv,
- EVP_CIPHER_CTX_is_encrypting(ctx));
+ EVP_CIPHER_CTX_get_cipher_data(ctx),
+ (DES_cblock *)ctx->iv,
+ EVP_CIPHER_CTX_is_encrypting(ctx));
return 1;
}
static int des_cfb64_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t inl)
+ const unsigned char *in, size_t inl)
{
while (inl >= EVP_MAXCHUNK) {
int num = EVP_CIPHER_CTX_get_num(ctx);
DES_cfb64_encrypt(in, out, (long)EVP_MAXCHUNK,
- EVP_CIPHER_CTX_get_cipher_data(ctx),
- (DES_cblock *)ctx->iv, &num,
- EVP_CIPHER_CTX_is_encrypting(ctx));
+ EVP_CIPHER_CTX_get_cipher_data(ctx),
+ (DES_cblock *)ctx->iv, &num,
+ EVP_CIPHER_CTX_is_encrypting(ctx));
EVP_CIPHER_CTX_set_num(ctx, num);
inl -= EVP_MAXCHUNK;
in += EVP_MAXCHUNK;
@@ -133,9 +133,9 @@ static int des_cfb64_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
if (inl) {
int num = EVP_CIPHER_CTX_get_num(ctx);
DES_cfb64_encrypt(in, out, (long)inl,
- EVP_CIPHER_CTX_get_cipher_data(ctx),
- (DES_cblock *)ctx->iv, &num,
- EVP_CIPHER_CTX_is_encrypting(ctx));
+ EVP_CIPHER_CTX_get_cipher_data(ctx),
+ (DES_cblock *)ctx->iv, &num,
+ EVP_CIPHER_CTX_is_encrypting(ctx));
EVP_CIPHER_CTX_set_num(ctx, num);
}
return 1;
@@ -146,11 +146,11 @@ static int des_cfb64_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
* way, so wrap it here
*/
static int des_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t inl)
+ const unsigned char *in, size_t inl)
{
size_t n, chunk = EVP_MAXCHUNK / 8;
unsigned char c[1];
- unsigned char d[1] = { 0 }; /* Appease Coverity */
+ unsigned char d[1] = { 0 }; /* Appease Coverity */
if (inl < chunk)
chunk = inl;
@@ -159,11 +159,9 @@ static int des_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
for (n = 0; n < chunk * 8; ++n) {
c[0] = (in[n / 8] & (1 << (7 - n % 8))) ? 0x80 : 0;
DES_cfb_encrypt(c, d, 1, 1, EVP_CIPHER_CTX_get_cipher_data(ctx),
- (DES_cblock *)ctx->iv,
- EVP_CIPHER_CTX_is_encrypting(ctx));
- out[n / 8] =
- (out[n / 8] & ~(0x80 >> (unsigned int)(n % 8))) |
- ((d[0] & 0x80) >> (unsigned int)(n % 8));
+ (DES_cblock *)ctx->iv,
+ EVP_CIPHER_CTX_is_encrypting(ctx));
+ out[n / 8] = (out[n / 8] & ~(0x80 >> (unsigned int)(n % 8))) | ((d[0] & 0x80) >> (unsigned int)(n % 8));
}
inl -= chunk;
in += chunk;
@@ -176,45 +174,45 @@ static int des_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
}
static int des_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t inl)
+ const unsigned char *in, size_t inl)
{
while (inl >= EVP_MAXCHUNK) {
DES_cfb_encrypt(in, out, 8, (long)EVP_MAXCHUNK,
- EVP_CIPHER_CTX_get_cipher_data(ctx),
- (DES_cblock *)ctx->iv,
- EVP_CIPHER_CTX_is_encrypting(ctx));
+ EVP_CIPHER_CTX_get_cipher_data(ctx),
+ (DES_cblock *)ctx->iv,
+ EVP_CIPHER_CTX_is_encrypting(ctx));
inl -= EVP_MAXCHUNK;
in += EVP_MAXCHUNK;
out += EVP_MAXCHUNK;
}
if (inl)
DES_cfb_encrypt(in, out, 8, (long)inl,
- EVP_CIPHER_CTX_get_cipher_data(ctx),
- (DES_cblock *)ctx->iv,
- EVP_CIPHER_CTX_is_encrypting(ctx));
+ EVP_CIPHER_CTX_get_cipher_data(ctx),
+ (DES_cblock *)ctx->iv,
+ EVP_CIPHER_CTX_is_encrypting(ctx));
return 1;
}
BLOCK_CIPHER_defs(des, EVP_DES_KEY, NID_des, 8, 8, 8, 64,
- EVP_CIPH_RAND_KEY, des_init_key, NULL,
- EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, des_ctrl)
+ EVP_CIPH_RAND_KEY, des_init_key, NULL,
+ EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, des_ctrl)
BLOCK_CIPHER_def_cfb(des, EVP_DES_KEY, NID_des, 8, 8, 1,
- EVP_CIPH_RAND_KEY, des_init_key, NULL,
- EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, des_ctrl)
+ EVP_CIPH_RAND_KEY, des_init_key, NULL,
+ EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, des_ctrl)
- BLOCK_CIPHER_def_cfb(des, EVP_DES_KEY, NID_des, 8, 8, 8,
- EVP_CIPH_RAND_KEY, des_init_key, NULL,
- EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, des_ctrl)
+ BLOCK_CIPHER_def_cfb(des, EVP_DES_KEY, NID_des, 8, 8, 8,
+ EVP_CIPH_RAND_KEY, des_init_key, NULL,
+ EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, des_ctrl)
-static int des_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc)
+ static int des_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+ const unsigned char *iv, int enc)
{
DES_cblock *deskey = (DES_cblock *)key;
- EVP_DES_KEY *dat = (EVP_DES_KEY *) EVP_CIPHER_CTX_get_cipher_data(ctx);
+ EVP_DES_KEY *dat = (EVP_DES_KEY *)EVP_CIPHER_CTX_get_cipher_data(ctx);
dat->stream.cbc = NULL;
-# if defined(SPARC_DES_CAPABLE)
+#if defined(SPARC_DES_CAPABLE)
if (SPARC_DES_CAPABLE) {
int mode = EVP_CIPHER_CTX_get_mode(ctx);
@@ -224,7 +222,7 @@ static int des_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
return 1;
}
}
-# endif
+#endif
DES_set_key_unchecked(deskey, EVP_CIPHER_CTX_get_cipher_data(ctx));
return 1;
}
diff --git a/crypto/evp/e_des3.c b/crypto/evp/e_des3.c
index 2270dc4daf..7a674cc718 100644
--- a/crypto/evp/e_des3.c
+++ b/crypto/evp/e_des3.c
@@ -16,12 +16,12 @@
#include <stdio.h>
#include "internal/cryptlib.h"
#ifndef OPENSSL_NO_DES
-# include <openssl/objects.h>
-# include "crypto/evp.h"
-# include "crypto/sha.h"
-# include <openssl/des.h>
-# include <openssl/rand.h>
-# include "evp_local.h"
+#include <openssl/objects.h>
+#include "crypto/evp.h"
+#include "crypto/sha.h"
+#include <openssl/des.h>
+#include <openssl/rand.h>
+#include "evp_local.h"
typedef struct {
union {
@@ -29,37 +29,37 @@ typedef struct {
DES_key_schedule ks[3];
} ks;
union {
- void (*cbc) (const void *, void *, size_t,
- const DES_key_schedule *, unsigned char *);
+ void (*cbc)(const void *, void *, size_t,
+ const DES_key_schedule *, unsigned char *);
} stream;
} DES_EDE_KEY;
-# define ks1 ks.ks[0]
-# define ks2 ks.ks[1]
-# define ks3 ks.ks[2]
+#define ks1 ks.ks[0]
+#define ks2 ks.ks[1]
+#define ks3 ks.ks[2]
-# if defined(AES_ASM) && (defined(__sparc) || defined(__sparc__))
+#if defined(AES_ASM) && (defined(__sparc) || defined(__sparc__))
/* ---------^^^ this is not a typo, just a way to detect that
* assembler support was in general requested... */
-# include "crypto/sparc_arch.h"
+#include "crypto/sparc_arch.h"
-# define SPARC_DES_CAPABLE (OPENSSL_sparcv9cap_P[1] & CFR_DES)
+#define SPARC_DES_CAPABLE (OPENSSL_sparcv9cap_P[1] & CFR_DES)
void des_t4_key_expand(const void *key, DES_key_schedule *ks);
void des_t4_ede3_cbc_encrypt(const void *inp, void *out, size_t len,
- const DES_key_schedule ks[3], unsigned char iv[8]);
+ const DES_key_schedule ks[3], unsigned char iv[8]);
void des_t4_ede3_cbc_decrypt(const void *inp, void *out, size_t len,
- const DES_key_schedule ks[3], unsigned char iv[8]);
-# endif
+ const DES_key_schedule ks[3], unsigned char iv[8]);
+#endif
static int des_ede_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc);
+ const unsigned char *iv, int enc);
static int des_ede3_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc);
+ const unsigned char *iv, int enc);
static int des3_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr);
-# define data(ctx) EVP_C_DATA(DES_EDE_KEY,ctx)
+#define data(ctx) EVP_C_DATA(DES_EDE_KEY, ctx)
/*
* Because of various casts and different args can't use
@@ -67,26 +67,26 @@ static int des3_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr);
*/
static int des_ede_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t inl)
+ const unsigned char *in, size_t inl)
{
BLOCK_CIPHER_ecb_loop()
DES_ecb3_encrypt((const_DES_cblock *)(in + i),
- (DES_cblock *)(out + i),
- &data(ctx)->ks1, &data(ctx)->ks2,
- &data(ctx)->ks3, EVP_CIPHER_CTX_is_encrypting(ctx));
+ (DES_cblock *)(out + i),
+ &data(ctx)->ks1, &data(ctx)->ks2,
+ &data(ctx)->ks3, EVP_CIPHER_CTX_is_encrypting(ctx));
return 1;
}
static int des_ede_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t inl)
+ const unsigned char *in, size_t inl)
{
while (inl >= EVP_MAXCHUNK) {
int num = EVP_CIPHER_CTX_get_num(ctx);
DES_ede3_ofb64_encrypt(in, out, (long)EVP_MAXCHUNK,
- &data(ctx)->ks1, &data(ctx)->ks2,
- &data(ctx)->ks3,
- (DES_cblock *)ctx->iv,
- &num);
+ &data(ctx)->ks1, &data(ctx)->ks2,
+ &data(ctx)->ks3,
+ (DES_cblock *)ctx->iv,
+ &num);
EVP_CIPHER_CTX_set_num(ctx, num);
inl -= EVP_MAXCHUNK;
in += EVP_MAXCHUNK;
@@ -95,52 +95,52 @@ static int des_ede_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
if (inl) {
int num = EVP_CIPHER_CTX_get_num(ctx);
DES_ede3_ofb64_encrypt(in, out, (long)inl,
- &data(ctx)->ks1, &data(ctx)->ks2,
- &data(ctx)->ks3,
- (DES_cblock *)ctx->iv,
- &num);
+ &data(ctx)->ks1, &data(ctx)->ks2,
+ &data(ctx)->ks3,
+ (DES_cblock *)ctx->iv,
+ &num);
EVP_CIPHER_CTX_set_num(ctx, num);
}
return 1;
}
static int des_ede_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t inl)
+ const unsigned char *in, size_t inl)
{
DES_EDE_KEY *dat = data(ctx);
if (dat->stream.cbc != NULL) {
- (*dat->stream.cbc) (in, out, inl, dat->ks.ks,
- ctx->iv);
+ (*dat->stream.cbc)(in, out, inl, dat->ks.ks,
+ ctx->iv);
return 1;
}
while (inl >= EVP_MAXCHUNK) {
DES_ede3_cbc_encrypt(in, out, (long)EVP_MAXCHUNK,
- &dat->ks1, &dat->ks2, &dat->ks3,
- (DES_cblock *)ctx->iv,
- EVP_CIPHER_CTX_is_encrypting(ctx));
+ &dat->ks1, &dat->ks2, &dat->ks3,
+ (DES_cblock *)ctx->iv,
+ EVP_CIPHER_CTX_is_encrypting(ctx));
inl -= EVP_MAXCHUNK;
in += EVP_MAXCHUNK;
out += EVP_MAXCHUNK;
}
if (inl)
DES_ede3_cbc_encrypt(in, out, (long)inl,
- &dat->ks1, &dat->ks2, &dat->ks3,
- (DES_cblock *)ctx->iv,
- EVP_CIPHER_CTX_is_encrypting(ctx));
+ &dat->ks1, &dat->ks2, &dat->ks3,
+ (DES_cblock *)ctx->iv,
+ EVP_CIPHER_CTX_is_encrypting(ctx));
return 1;
}
static int des_ede_cfb64_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t inl)
+ const unsigned char *in, size_t inl)
{
while (inl >= EVP_MAXCHUNK) {
int num = EVP_CIPHER_CTX_get_num(ctx);
DES_ede3_cfb64_encrypt(in, out, (long)EVP_MAXCHUNK,
- &data(ctx)->ks1, &data(ctx)->ks2,
- &data(ctx)->ks3, (DES_cblock *)ctx->iv,
- &num, EVP_CIPHER_CTX_is_encrypting(ctx));
+ &data(ctx)->ks1, &data(ctx)->ks2,
+ &data(ctx)->ks3, (DES_cblock *)ctx->iv,
+ &num, EVP_CIPHER_CTX_is_encrypting(ctx));
EVP_CIPHER_CTX_set_num(ctx, num);
inl -= EVP_MAXCHUNK;
in += EVP_MAXCHUNK;
@@ -149,9 +149,9 @@ static int des_ede_cfb64_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
if (inl) {
int num = EVP_CIPHER_CTX_get_num(ctx);
DES_ede3_cfb64_encrypt(in, out, (long)inl,
- &data(ctx)->ks1, &data(ctx)->ks2,
- &data(ctx)->ks3, (DES_cblock *)ctx->iv,
- &num, EVP_CIPHER_CTX_is_encrypting(ctx));
+ &data(ctx)->ks1, &data(ctx)->ks2,
+ &data(ctx)->ks3, (DES_cblock *)ctx->iv,
+ &num, EVP_CIPHER_CTX_is_encrypting(ctx));
EVP_CIPHER_CTX_set_num(ctx, num);
}
return 1;
@@ -162,20 +162,20 @@ static int des_ede_cfb64_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
* right way, so wrap it here
*/
static int des_ede3_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t inl)
+ const unsigned char *in, size_t inl)
{
size_t n;
unsigned char c[1];
unsigned char d[1] = { 0 }; /* Appease Coverity */
if (!EVP_CIPHER_CTX_test_flags(ctx, EVP_CIPH_FLAG_LENGTH_BITS))
- inl *= 8;
+ inl *= 8;
for (n = 0; n < inl; ++n) {
c[0] = (in[n / 8] & (1 << (7 - n % 8))) ? 0x80 : 0;
DES_ede3_cfb_encrypt(c, d, 1, 1,
- &data(ctx)->ks1, &data(ctx)->ks2,
- &data(ctx)->ks3, (DES_cblock *)ctx->iv,
- EVP_CIPHER_CTX_is_encrypting(ctx));
+ &data(ctx)->ks1, &data(ctx)->ks2,
+ &data(ctx)->ks3, (DES_cblock *)ctx->iv,
+ EVP_CIPHER_CTX_is_encrypting(ctx));
out[n / 8] = (out[n / 8] & ~(0x80 >> (unsigned int)(n % 8)))
| ((d[0] & 0x80) >> (unsigned int)(n % 8));
}
@@ -184,52 +184,52 @@ static int des_ede3_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
}
static int des_ede3_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t inl)
+ const unsigned char *in, size_t inl)
{
while (inl >= EVP_MAXCHUNK) {
DES_ede3_cfb_encrypt(in, out, 8, (long)EVP_MAXCHUNK,
- &data(ctx)->ks1, &data(ctx)->ks2,
- &data(ctx)->ks3, (DES_cblock *)ctx->iv,
- EVP_CIPHER_CTX_is_encrypting(ctx));
+ &data(ctx)->ks1, &data(ctx)->ks2,
+ &data(ctx)->ks3, (DES_cblock *)ctx->iv,
+ EVP_CIPHER_CTX_is_encrypting(ctx));
inl -= EVP_MAXCHUNK;
in += EVP_MAXCHUNK;
out += EVP_MAXCHUNK;
}
if (inl)
DES_ede3_cfb_encrypt(in, out, 8, (long)inl,
- &data(ctx)->ks1, &data(ctx)->ks2,
- &data(ctx)->ks3, (DES_cblock *)ctx->iv,
- EVP_CIPHER_CTX_is_encrypting(ctx));
+ &data(ctx)->ks1, &data(ctx)->ks2,
+ &data(ctx)->ks3, (DES_cblock *)ctx->iv,
+ EVP_CIPHER_CTX_is_encrypting(ctx));
return 1;
}
BLOCK_CIPHER_defs(des_ede, DES_EDE_KEY, NID_des_ede, 8, 16, 8, 64,
- EVP_CIPH_RAND_KEY | EVP_CIPH_FLAG_DEFAULT_ASN1,
- des_ede_init_key, NULL, NULL, NULL, des3_ctrl)
-# define des_ede3_cfb64_cipher des_ede_cfb64_cipher
-# define des_ede3_ofb_cipher des_ede_ofb_cipher
-# define des_ede3_cbc_cipher des_ede_cbc_cipher
-# define des_ede3_ecb_cipher des_ede_ecb_cipher
+ EVP_CIPH_RAND_KEY | EVP_CIPH_FLAG_DEFAULT_ASN1,
+ des_ede_init_key, NULL, NULL, NULL, des3_ctrl)
+#define des_ede3_cfb64_cipher des_ede_cfb64_cipher
+#define des_ede3_ofb_cipher des_ede_ofb_cipher
+#define des_ede3_cbc_cipher des_ede_cbc_cipher
+#define des_ede3_ecb_cipher des_ede_ecb_cipher
BLOCK_CIPHER_defs(des_ede3, DES_EDE_KEY, NID_des_ede3, 8, 24, 8, 64,
- EVP_CIPH_RAND_KEY | EVP_CIPH_FLAG_DEFAULT_ASN1,
- des_ede3_init_key, NULL, NULL, NULL, des3_ctrl)
+ EVP_CIPH_RAND_KEY | EVP_CIPH_FLAG_DEFAULT_ASN1,
+ des_ede3_init_key, NULL, NULL, NULL, des3_ctrl)
- BLOCK_CIPHER_def_cfb(des_ede3, DES_EDE_KEY, NID_des_ede3, 24, 8, 1,
- EVP_CIPH_RAND_KEY | EVP_CIPH_FLAG_DEFAULT_ASN1,
- des_ede3_init_key, NULL, NULL, NULL, des3_ctrl)
+ BLOCK_CIPHER_def_cfb(des_ede3, DES_EDE_KEY, NID_des_ede3, 24, 8, 1,
+ EVP_CIPH_RAND_KEY | EVP_CIPH_FLAG_DEFAULT_ASN1,
+ des_ede3_init_key, NULL, NULL, NULL, des3_ctrl)
- BLOCK_CIPHER_def_cfb(des_ede3, DES_EDE_KEY, NID_des_ede3, 24, 8, 8,
- EVP_CIPH_RAND_KEY | EVP_CIPH_FLAG_DEFAULT_ASN1,
- des_ede3_init_key, NULL, NULL, NULL, des3_ctrl)
+ BLOCK_CIPHER_def_cfb(des_ede3, DES_EDE_KEY, NID_des_ede3, 24, 8, 8,
+ EVP_CIPH_RAND_KEY | EVP_CIPH_FLAG_DEFAULT_ASN1,
+ des_ede3_init_key, NULL, NULL, NULL, des3_ctrl)
-static int des_ede_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc)
+ static int des_ede_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+ const unsigned char *iv, int enc)
{
DES_cblock *deskey = (DES_cblock *)key;
DES_EDE_KEY *dat = data(ctx);
dat->stream.cbc = NULL;
-# if defined(SPARC_DES_CAPABLE)
+#if defined(SPARC_DES_CAPABLE)
if (SPARC_DES_CAPABLE) {
int mode = EVP_CIPHER_CTX_get_mode(ctx);
@@ -237,12 +237,11 @@ static int des_ede_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
des_t4_key_expand(&deskey[0], &dat->ks1);
des_t4_key_expand(&deskey[1], &dat->ks2);
memcpy(&dat->ks3, &dat->ks1, sizeof(dat->ks1));
- dat->stream.cbc = enc ? des_t4_ede3_cbc_encrypt :
- des_t4_ede3_cbc_decrypt;
+ dat->stream.cbc = enc ? des_t4_ede3_cbc_encrypt : des_t4_ede3_cbc_decrypt;
return 1;
}
}
-# endif
+#endif
DES_set_key_unchecked(&deskey[0], &dat->ks1);
DES_set_key_unchecked(&deskey[1], &dat->ks2);
memcpy(&dat->ks3, &dat->ks1, sizeof(dat->ks1));
@@ -250,13 +249,13 @@ static int des_ede_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
}
static int des_ede3_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc)
+ const unsigned char *iv, int enc)
{
DES_cblock *deskey = (DES_cblock *)key;
DES_EDE_KEY *dat = data(ctx);
dat->stream.cbc = NULL;
-# if defined(SPARC_DES_CAPABLE)
+#if defined(SPARC_DES_CAPABLE)
if (SPARC_DES_CAPABLE) {
int mode = EVP_CIPHER_CTX_get_mode(ctx);
@@ -264,12 +263,11 @@ static int des_ede3_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
des_t4_key_expand(&deskey[0], &dat->ks1);
des_t4_key_expand(&deskey[1], &dat->ks2);
des_t4_key_expand(&deskey[2], &dat->ks3);
- dat->stream.cbc = enc ? des_t4_ede3_cbc_encrypt :
- des_t4_ede3_cbc_decrypt;
+ dat->stream.cbc = enc ? des_t4_ede3_cbc_encrypt : des_t4_ede3_cbc_decrypt;
return 1;
}
}
-# endif
+#endif
DES_set_key_unchecked(&deskey[0], &dat->ks1);
DES_set_key_unchecked(&deskey[1], &dat->ks2);
DES_set_key_unchecked(&deskey[2], &dat->ks3);
@@ -309,15 +307,14 @@ const EVP_CIPHER *EVP_des_ede3(void)
return &des_ede3_ecb;
}
-
-# include <openssl/sha.h>
+#include <openssl/sha.h>
static const unsigned char wrap_iv[8] = {
0x4a, 0xdd, 0xa2, 0x2c, 0x79, 0xe8, 0x21, 0x05
};
static int des_ede3_unwrap(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t inl)
+ const unsigned char *in, size_t inl)
{
unsigned char icv[8], iv[8], sha1tmp[SHA_DIGEST_LENGTH];
int rv = -1;
@@ -348,8 +345,8 @@ static int des_ede3_unwrap(EVP_CIPHER_CTX *ctx, unsigned char *out,
/* Decrypt again using new IV */
des_ede_cbc_cipher(ctx, out, out, inl - 16);
des_ede_cbc_cipher(ctx, icv, icv, 8);
- if (ossl_sha1(out, inl - 16, sha1tmp) /* Work out hash of first portion */
- && CRYPTO_memcmp(sha1tmp, icv, 8) == 0)
+ if (ossl_sha1(out, inl - 16, sha1tmp) /* Work out hash of first portion */
+ && CRYPTO_memcmp(sha1tmp, icv, 8) == 0)
rv = (int)(inl - 16);
OPENSSL_cleanse(icv, 8);
OPENSSL_cleanse(sha1tmp, SHA_DIGEST_LENGTH);
@@ -362,7 +359,7 @@ static int des_ede3_unwrap(EVP_CIPHER_CTX *ctx, unsigned char *out,
}
static int des_ede3_wrap(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t inl)
+ const unsigned char *in, size_t inl)
{
unsigned char sha1tmp[SHA_DIGEST_LENGTH];
if (out == NULL)
@@ -387,7 +384,7 @@ static int des_ede3_wrap(EVP_CIPHER_CTX *ctx, unsigned char *out,
}
static int des_ede3_wrap_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t inl)
+ const unsigned char *in, size_t inl)
{
/*
* Sanity check input length: we typically only wrap keys so EVP_MAXCHUNK
diff --git a/crypto/evp/e_idea.c b/crypto/evp/e_idea.c
index 93da93823d..0371094fe3 100644
--- a/crypto/evp/e_idea.c
+++ b/crypto/evp/e_idea.c
@@ -18,11 +18,11 @@
#include "internal/cryptlib.h"
#ifndef OPENSSL_NO_IDEA
-# include <openssl/evp.h>
-# include <openssl/objects.h>
-# include "crypto/evp.h"
-# include <openssl/idea.h>
-# include "evp_local.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include "crypto/evp.h"
+#include <openssl/idea.h>
+#include "evp_local.h"
/* Can't use IMPLEMENT_BLOCK_CIPHER because IDEA_ecb_encrypt is different */
@@ -31,7 +31,7 @@ typedef struct {
} EVP_IDEA_KEY;
static int idea_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc);
+ const unsigned char *iv, int enc);
/*
* NB IDEA_ecb_encrypt doesn't take an 'encrypt' argument so we treat it as a
@@ -39,7 +39,7 @@ static int idea_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
*/
static int idea_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t inl)
+ const unsigned char *in, size_t inl)
{
BLOCK_CIPHER_ecb_loop()
IDEA_ecb_encrypt(in + i, out + i, &EVP_C_DATA(EVP_IDEA_KEY, ctx)->ks);
@@ -47,15 +47,15 @@ static int idea_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
}
BLOCK_CIPHER_func_cbc(idea, IDEA, EVP_IDEA_KEY, ks)
-BLOCK_CIPHER_func_ofb(idea, IDEA, 64, EVP_IDEA_KEY, ks)
-BLOCK_CIPHER_func_cfb(idea, IDEA, 64, EVP_IDEA_KEY, ks)
+ BLOCK_CIPHER_func_ofb(idea, IDEA, 64, EVP_IDEA_KEY, ks)
+ BLOCK_CIPHER_func_cfb(idea, IDEA, 64, EVP_IDEA_KEY, ks)
-BLOCK_CIPHER_defs(idea, IDEA_KEY_SCHEDULE, NID_idea, 8, 16, 8, 64,
- 0, idea_init_key, NULL,
- EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, NULL)
+ BLOCK_CIPHER_defs(idea, IDEA_KEY_SCHEDULE, NID_idea, 8, 16, 8, 64,
+ 0, idea_init_key, NULL,
+ EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, NULL)
-static int idea_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc)
+ static int idea_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+ const unsigned char *iv, int enc)
{
if (!enc) {
if (EVP_CIPHER_CTX_get_mode(ctx) == EVP_CIPH_OFB_MODE)
diff --git a/crypto/evp/e_null.c b/crypto/evp/e_null.c
index af900c5298..1303caa892 100644
--- a/crypto/evp/e_null.c
+++ b/crypto/evp/e_null.c
@@ -14,9 +14,9 @@
#include "crypto/evp.h"
static int null_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc);
+ const unsigned char *iv, int enc);
static int null_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t inl);
+ const unsigned char *in, size_t inl);
static const EVP_CIPHER n_cipher = {
NID_undef,
1, 0, 0, 0,
@@ -37,13 +37,13 @@ const EVP_CIPHER *EVP_enc_null(void)
}
static int null_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc)
+ const unsigned char *iv, int enc)
{
return 1;
}
static int null_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t inl)
+ const unsigned char *in, size_t inl)
{
if (in != out)
memcpy(out, in, inl);
diff --git a/crypto/evp/e_old.c b/crypto/evp/e_old.c
index e9c9f22119..c2e5319b2d 100644
--- a/crypto/evp/e_old.c
+++ b/crypto/evp/e_old.c
@@ -19,7 +19,7 @@
*/
#ifndef OPENSSL_NO_BF
-# undef EVP_bf_cfb
+#undef EVP_bf_cfb
const EVP_CIPHER *EVP_bf_cfb(void);
const EVP_CIPHER *EVP_bf_cfb(void)
{
@@ -28,21 +28,21 @@ const EVP_CIPHER *EVP_bf_cfb(void)
#endif
#ifndef OPENSSL_NO_DES
-# undef EVP_des_cfb
+#undef EVP_des_cfb
const EVP_CIPHER *EVP_des_cfb(void);
const EVP_CIPHER *EVP_des_cfb(void)
{
return EVP_des_cfb64();
}
-# undef EVP_des_ede3_cfb
+#undef EVP_des_ede3_cfb
const EVP_CIPHER *EVP_des_ede3_cfb(void);
const EVP_CIPHER *EVP_des_ede3_cfb(void)
{
return EVP_des_ede3_cfb64();
}
-# undef EVP_des_ede_cfb
+#undef EVP_des_ede_cfb
const EVP_CIPHER *EVP_des_ede_cfb(void);
const EVP_CIPHER *EVP_des_ede_cfb(void)
{
@@ -51,7 +51,7 @@ const EVP_CIPHER *EVP_des_ede_cfb(void)
#endif
#ifndef OPENSSL_NO_IDEA
-# undef EVP_idea_cfb
+#undef EVP_idea_cfb
const EVP_CIPHER *EVP_idea_cfb(void);
const EVP_CIPHER *EVP_idea_cfb(void)
{
@@ -60,7 +60,7 @@ const EVP_CIPHER *EVP_idea_cfb(void)
#endif
#ifndef OPENSSL_NO_RC2
-# undef EVP_rc2_cfb
+#undef EVP_rc2_cfb
const EVP_CIPHER *EVP_rc2_cfb(void);
const EVP_CIPHER *EVP_rc2_cfb(void)
{
@@ -69,7 +69,7 @@ const EVP_CIPHER *EVP_rc2_cfb(void)
#endif
#ifndef OPENSSL_NO_CAST
-# undef EVP_cast5_cfb
+#undef EVP_cast5_cfb
const EVP_CIPHER *EVP_cast5_cfb(void);
const EVP_CIPHER *EVP_cast5_cfb(void)
{
@@ -78,7 +78,7 @@ const EVP_CIPHER *EVP_cast5_cfb(void)
#endif
#ifndef OPENSSL_NO_RC5
-# undef EVP_rc5_32_12_16_cfb
+#undef EVP_rc5_32_12_16_cfb
const EVP_CIPHER *EVP_rc5_32_12_16_cfb(void);
const EVP_CIPHER *EVP_rc5_32_12_16_cfb(void)
{
diff --git a/crypto/evp/e_rc2.c b/crypto/evp/e_rc2.c
index ffeb17fb1e..88e359bd44 100644
--- a/crypto/evp/e_rc2.c
+++ b/crypto/evp/e_rc2.c
@@ -18,14 +18,14 @@
#ifndef OPENSSL_NO_RC2
-# include <openssl/evp.h>
-# include <openssl/objects.h>
-# include "crypto/evp.h"
-# include <openssl/rc2.h>
-# include "evp_local.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include "crypto/evp.h"
+#include <openssl/rc2.h>
+#include "evp_local.h"
static int rc2_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc);
+ const unsigned char *iv, int enc);
static int rc2_meth_to_magic(EVP_CIPHER_CTX *ctx);
static int rc2_magic_to_meth(int i);
static int rc2_set_asn1_type_and_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type);
@@ -33,25 +33,25 @@ static int rc2_get_asn1_type_and_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type);
static int rc2_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr);
typedef struct {
- int key_bits; /* effective key bits */
- RC2_KEY ks; /* key schedule */
+ int key_bits; /* effective key bits */
+ RC2_KEY ks; /* key schedule */
} EVP_RC2_KEY;
-# define data(ctx) EVP_C_DATA(EVP_RC2_KEY,ctx)
+#define data(ctx) EVP_C_DATA(EVP_RC2_KEY, ctx)
IMPLEMENT_BLOCK_CIPHER(rc2, ks, RC2, EVP_RC2_KEY, NID_rc2,
- 8,
- RC2_KEY_LENGTH, 8, 64,
- EVP_CIPH_VARIABLE_LENGTH | EVP_CIPH_CTRL_INIT,
- rc2_init_key, NULL,
- rc2_set_asn1_type_and_iv, rc2_get_asn1_type_and_iv,
- rc2_ctrl)
-# define RC2_40_MAGIC 0xa0
-# define RC2_64_MAGIC 0x78
-# define RC2_128_MAGIC 0x3a
+ 8,
+ RC2_KEY_LENGTH, 8, 64,
+ EVP_CIPH_VARIABLE_LENGTH | EVP_CIPH_CTRL_INIT,
+ rc2_init_key, NULL,
+ rc2_set_asn1_type_and_iv, rc2_get_asn1_type_and_iv,
+ rc2_ctrl)
+#define RC2_40_MAGIC 0xa0
+#define RC2_64_MAGIC 0x78
+#define RC2_128_MAGIC 0x3a
static const EVP_CIPHER r2_64_cbc_cipher = {
NID_rc2_64_cbc,
- 8, 8 /* 64 bit */ , 8,
+ 8, 8 /* 64 bit */, 8,
EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH | EVP_CIPH_CTRL_INIT,
EVP_ORIG_GLOBAL,
rc2_init_key,
@@ -66,7 +66,7 @@ static const EVP_CIPHER r2_64_cbc_cipher = {
static const EVP_CIPHER r2_40_cbc_cipher = {
NID_rc2_40_cbc,
- 8, 5 /* 40 bit */ , 8,
+ 8, 5 /* 40 bit */, 8,
EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH | EVP_CIPH_CTRL_INIT,
EVP_ORIG_GLOBAL,
rc2_init_key,
@@ -90,10 +90,10 @@ const EVP_CIPHER *EVP_rc2_40_cbc(void)
}
static int rc2_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc)
+ const unsigned char *iv, int enc)
{
RC2_set_key(&data(ctx)->ks, EVP_CIPHER_CTX_get_key_length(ctx),
- key, data(ctx)->key_bits);
+ key, data(ctx)->key_bits);
return 1;
}
@@ -147,8 +147,9 @@ static int rc2_get_asn1_type_and_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type)
if (i > 0 && !EVP_CipherInit_ex(c, NULL, NULL, NULL, iv, -1))
return -1;
if (EVP_CIPHER_CTX_ctrl(c, EVP_CTRL_SET_RC2_KEY_BITS, key_bits,
- NULL) <= 0
- || EVP_CIPHER_CTX_set_key_length(c, key_bits / 8) <= 0)
+ NULL)
+ <= 0
+ || EVP_CIPHER_CTX_set_key_length(c, key_bits / 8) <= 0)
return -1;
}
return i;
@@ -184,11 +185,11 @@ static int rc2_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
return 1;
}
return 0;
-# ifdef PBE_PRF_TEST
+#ifdef PBE_PRF_TEST
case EVP_CTRL_PBE_PRF_NID:
*(int *)ptr = NID_hmacWithMD5;
return 1;
-# endif
+#endif
default:
return -1;
diff --git a/crypto/evp/e_rc4.c b/crypto/evp/e_rc4.c
index e22e81d467..7ca5e797e5 100644
--- a/crypto/evp/e_rc4.c
+++ b/crypto/evp/e_rc4.c
@@ -18,22 +18,22 @@
#ifndef OPENSSL_NO_RC4
-# include <openssl/evp.h>
-# include <openssl/objects.h>
-# include <openssl/rc4.h>
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include <openssl/rc4.h>
-# include "crypto/evp.h"
+#include "crypto/evp.h"
typedef struct {
- RC4_KEY ks; /* working key */
+ RC4_KEY ks; /* working key */
} EVP_RC4_KEY;
-# define data(ctx) ((EVP_RC4_KEY *)EVP_CIPHER_CTX_get_cipher_data(ctx))
+#define data(ctx) ((EVP_RC4_KEY *)EVP_CIPHER_CTX_get_cipher_data(ctx))
static int rc4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc);
+ const unsigned char *iv, int enc);
static int rc4_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t inl);
+ const unsigned char *in, size_t inl);
static const EVP_CIPHER r4_cipher = {
NID_rc4,
1, EVP_RC4_KEY_SIZE, 0,
@@ -51,7 +51,7 @@ static const EVP_CIPHER r4_cipher = {
static const EVP_CIPHER r4_40_cipher = {
NID_rc4_40,
- 1, 5 /* 40 bit */ , 0,
+ 1, 5 /* 40 bit */, 0,
EVP_CIPH_VARIABLE_LENGTH,
EVP_ORIG_GLOBAL,
rc4_init_key,
@@ -75,7 +75,7 @@ const EVP_CIPHER *EVP_rc4_40(void)
}
static int rc4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc)
+ const unsigned char *iv, int enc)
{
int keylen;
@@ -86,7 +86,7 @@ static int rc4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
}
static int rc4_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t inl)
+ const unsigned char *in, size_t inl)
{
RC4(&data(ctx)->ks, inl, in, out);
return 1;
diff --git a/crypto/evp/e_rc4_hmac_md5.c b/crypto/evp/e_rc4_hmac_md5.c
index ec7dd02ce5..53d502650a 100644
--- a/crypto/evp/e_rc4_hmac_md5.c
+++ b/crypto/evp/e_rc4_hmac_md5.c
@@ -21,12 +21,12 @@
#if !defined(OPENSSL_NO_RC4) && !defined(OPENSSL_NO_MD5)
-# include <openssl/crypto.h>
-# include <openssl/evp.h>
-# include <openssl/objects.h>
-# include <openssl/rc4.h>
-# include <openssl/md5.h>
-# include "crypto/evp.h"
+#include <openssl/crypto.h>
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include <openssl/rc4.h>
+#include <openssl/md5.h>
+#include "crypto/evp.h"
typedef struct {
RC4_KEY ks;
@@ -34,16 +34,16 @@ typedef struct {
size_t payload_length;
} EVP_RC4_HMAC_MD5;
-# define NO_PAYLOAD_LENGTH ((size_t)-1)
+#define NO_PAYLOAD_LENGTH ((size_t)-1)
void rc4_md5_enc(RC4_KEY *key, const void *in0, void *out,
- MD5_CTX *ctx, const void *inp, size_t blocks);
+ MD5_CTX *ctx, const void *inp, size_t blocks);
-# define data(ctx) ((EVP_RC4_HMAC_MD5 *)EVP_CIPHER_CTX_get_cipher_data(ctx))
+#define data(ctx) ((EVP_RC4_HMAC_MD5 *)EVP_CIPHER_CTX_get_cipher_data(ctx))
static int rc4_hmac_md5_init_key(EVP_CIPHER_CTX *ctx,
- const unsigned char *inkey,
- const unsigned char *iv, int enc)
+ const unsigned char *inkey,
+ const unsigned char *iv, int enc)
{
EVP_RC4_HMAC_MD5 *key = data(ctx);
const int keylen = EVP_CIPHER_CTX_get_key_length(ctx);
@@ -53,7 +53,7 @@ static int rc4_hmac_md5_init_key(EVP_CIPHER_CTX *ctx,
RC4_set_key(&key->ks, keylen, inkey);
- MD5_Init(&key->head); /* handy when benchmarking */
+ MD5_Init(&key->head); /* handy when benchmarking */
key->tail = key->head;
key->md = key->head;
@@ -62,27 +62,25 @@ static int rc4_hmac_md5_init_key(EVP_CIPHER_CTX *ctx,
return 1;
}
-# if defined(RC4_ASM) && defined(MD5_ASM) && ( \
- defined(__x86_64) || defined(__x86_64__) || \
- defined(_M_AMD64) || defined(_M_X64) )
-# define STITCHED_CALL
-# endif
+#if defined(RC4_ASM) && defined(MD5_ASM) && (defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64))
+#define STITCHED_CALL
+#endif
-# if !defined(STITCHED_CALL)
-# define rc4_off 0
-# define md5_off 0
-# endif
+#if !defined(STITCHED_CALL)
+#define rc4_off 0
+#define md5_off 0
+#endif
static int rc4_hmac_md5_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len)
+ const unsigned char *in, size_t len)
{
EVP_RC4_HMAC_MD5 *key = data(ctx);
-# if defined(STITCHED_CALL)
+#if defined(STITCHED_CALL)
size_t rc4_off = 32 - 1 - (key->ks.x & (32 - 1)), /* 32 is $MOD from
* rc4_md5-x86_64.pl */
md5_off = MD5_CBLOCK - key->md.num, blocks;
unsigned int l;
-# endif
+#endif
size_t plen = key->payload_length;
if (plen != NO_PAYLOAD_LENGTH && len != (plen + MD5_DIGEST_LENGTH))
@@ -91,18 +89,17 @@ static int rc4_hmac_md5_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
if (plen == NO_PAYLOAD_LENGTH)
plen = len;
-# if defined(STITCHED_CALL)
+#if defined(STITCHED_CALL)
/* cipher has to "fall behind" */
if (rc4_off > md5_off)
md5_off += MD5_CBLOCK;
- if (plen > md5_off && (blocks = (plen - md5_off) / MD5_CBLOCK) &&
- (OPENSSL_ia32cap_P[0] & (1 << 20)) == 0) {
+ if (plen > md5_off && (blocks = (plen - md5_off) / MD5_CBLOCK) && (OPENSSL_ia32cap_P[0] & (1 << 20)) == 0) {
MD5_Update(&key->md, in, md5_off);
RC4(&key->ks, rc4_off, in, out);
rc4_md5_enc(&key->ks, in + rc4_off, out + rc4_off,
- &key->md, in + md5_off, blocks);
+ &key->md, in + md5_off, blocks);
blocks *= MD5_CBLOCK;
rc4_off += blocks;
md5_off += blocks;
@@ -114,10 +111,10 @@ static int rc4_hmac_md5_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
rc4_off = 0;
md5_off = 0;
}
-# endif
+#endif
MD5_Update(&key->md, in + md5_off, plen - md5_off);
- if (plen != len) { /* "TLS" mode of operation */
+ if (plen != len) { /* "TLS" mode of operation */
if (in != out)
memcpy(out + rc4_off, in + rc4_off, plen - rc4_off);
@@ -133,20 +130,19 @@ static int rc4_hmac_md5_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
}
} else {
unsigned char mac[MD5_DIGEST_LENGTH];
-# if defined(STITCHED_CALL)
+#if defined(STITCHED_CALL)
/* digest has to "fall behind" */
if (md5_off > rc4_off)
rc4_off += 2 * MD5_CBLOCK;
else
rc4_off += MD5_CBLOCK;
- if (len > rc4_off && (blocks = (len - rc4_off) / MD5_CBLOCK) &&
- (OPENSSL_ia32cap_P[0] & (1 << 20)) == 0) {
+ if (len > rc4_off && (blocks = (len - rc4_off) / MD5_CBLOCK) && (OPENSSL_ia32cap_P[0] & (1 << 20)) == 0) {
RC4(&key->ks, rc4_off, in, out);
MD5_Update(&key->md, out, md5_off);
rc4_md5_enc(&key->ks, in + rc4_off, out + rc4_off,
- &key->md, out + md5_off, blocks);
+ &key->md, out + md5_off, blocks);
blocks *= MD5_CBLOCK;
rc4_off += blocks;
md5_off += blocks;
@@ -159,7 +155,7 @@ static int rc4_hmac_md5_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
md5_off = 0;
rc4_off = 0;
}
-# endif
+#endif
/* decrypt HMAC at once */
RC4(&key->ks, len - rc4_off, in + rc4_off, out + rc4_off);
if (plen != NO_PAYLOAD_LENGTH) { /* "TLS" mode of operation */
@@ -184,77 +180,74 @@ static int rc4_hmac_md5_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
}
static int rc4_hmac_md5_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,
- void *ptr)
+ void *ptr)
{
EVP_RC4_HMAC_MD5 *key = data(ctx);
switch (type) {
- case EVP_CTRL_AEAD_SET_MAC_KEY:
- {
- unsigned int i;
- unsigned char hmac_key[64];
-
- memset(hmac_key, 0, sizeof(hmac_key));
-
- if (arg > (int)sizeof(hmac_key)) {
- MD5_Init(&key->head);
- MD5_Update(&key->head, ptr, arg);
- MD5_Final(hmac_key, &key->head);
- } else {
- memcpy(hmac_key, ptr, arg);
- }
-
- for (i = 0; i < sizeof(hmac_key); i++)
- hmac_key[i] ^= 0x36; /* ipad */
+ case EVP_CTRL_AEAD_SET_MAC_KEY: {
+ unsigned int i;
+ unsigned char hmac_key[64];
+
+ memset(hmac_key, 0, sizeof(hmac_key));
+
+ if (arg > (int)sizeof(hmac_key)) {
MD5_Init(&key->head);
- MD5_Update(&key->head, hmac_key, sizeof(hmac_key));
+ MD5_Update(&key->head, ptr, arg);
+ MD5_Final(hmac_key, &key->head);
+ } else {
+ memcpy(hmac_key, ptr, arg);
+ }
- for (i = 0; i < sizeof(hmac_key); i++)
- hmac_key[i] ^= 0x36 ^ 0x5c; /* opad */
- MD5_Init(&key->tail);
- MD5_Update(&key->tail, hmac_key, sizeof(hmac_key));
+ for (i = 0; i < sizeof(hmac_key); i++)
+ hmac_key[i] ^= 0x36; /* ipad */
+ MD5_Init(&key->head);
+ MD5_Update(&key->head, hmac_key, sizeof(hmac_key));
- OPENSSL_cleanse(hmac_key, sizeof(hmac_key));
+ for (i = 0; i < sizeof(hmac_key); i++)
+ hmac_key[i] ^= 0x36 ^ 0x5c; /* opad */
+ MD5_Init(&key->tail);
+ MD5_Update(&key->tail, hmac_key, sizeof(hmac_key));
- return 1;
- }
- case EVP_CTRL_AEAD_TLS1_AAD:
- {
- unsigned char *p = ptr;
- unsigned int len;
+ OPENSSL_cleanse(hmac_key, sizeof(hmac_key));
- if (arg != EVP_AEAD_TLS1_AAD_LEN)
- return -1;
+ return 1;
+ }
+ case EVP_CTRL_AEAD_TLS1_AAD: {
+ unsigned char *p = ptr;
+ unsigned int len;
- len = p[arg - 2] << 8 | p[arg - 1];
+ if (arg != EVP_AEAD_TLS1_AAD_LEN)
+ return -1;
- if (!EVP_CIPHER_CTX_is_encrypting(ctx)) {
- if (len < MD5_DIGEST_LENGTH)
- return -1;
- len -= MD5_DIGEST_LENGTH;
- p[arg - 2] = len >> 8;
- p[arg - 1] = len;
- }
- key->payload_length = len;
- key->md = key->head;
- MD5_Update(&key->md, p, arg);
+ len = p[arg - 2] << 8 | p[arg - 1];
- return MD5_DIGEST_LENGTH;
+ if (!EVP_CIPHER_CTX_is_encrypting(ctx)) {
+ if (len < MD5_DIGEST_LENGTH)
+ return -1;
+ len -= MD5_DIGEST_LENGTH;
+ p[arg - 2] = len >> 8;
+ p[arg - 1] = len;
}
+ key->payload_length = len;
+ key->md = key->head;
+ MD5_Update(&key->md, p, arg);
+
+ return MD5_DIGEST_LENGTH;
+ }
default:
return -1;
}
}
static const EVP_CIPHER r4_hmac_md5_cipher = {
-# ifdef NID_rc4_hmac_md5
+#ifdef NID_rc4_hmac_md5
NID_rc4_hmac_md5,
-# else
+#else
NID_undef,
-# endif
+#endif
1, EVP_RC4_KEY_SIZE, 0,
- EVP_CIPH_STREAM_CIPHER | EVP_CIPH_VARIABLE_LENGTH |
- EVP_CIPH_FLAG_AEAD_CIPHER,
+ EVP_CIPH_STREAM_CIPHER | EVP_CIPH_VARIABLE_LENGTH | EVP_CIPH_FLAG_AEAD_CIPHER,
EVP_ORIG_GLOBAL,
rc4_hmac_md5_init_key,
rc4_hmac_md5_cipher,
diff --git a/crypto/evp/e_rc5.c b/crypto/evp/e_rc5.c
index 3496a70193..5133b28d36 100644
--- a/crypto/evp/e_rc5.c
+++ b/crypto/evp/e_rc5.c
@@ -18,27 +18,27 @@
#ifndef OPENSSL_NO_RC5
-# include <openssl/evp.h>
-# include "crypto/evp.h"
-# include <openssl/objects.h>
-# include "evp_local.h"
-# include <openssl/rc5.h>
+#include <openssl/evp.h>
+#include "crypto/evp.h"
+#include <openssl/objects.h>
+#include "evp_local.h"
+#include <openssl/rc5.h>
static int r_32_12_16_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc);
+ const unsigned char *iv, int enc);
static int rc5_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr);
typedef struct {
- int rounds; /* number of rounds */
- RC5_32_KEY ks; /* key schedule */
+ int rounds; /* number of rounds */
+ RC5_32_KEY ks; /* key schedule */
} EVP_RC5_KEY;
-# define data(ctx) EVP_C_DATA(EVP_RC5_KEY,ctx)
+#define data(ctx) EVP_C_DATA(EVP_RC5_KEY, ctx)
IMPLEMENT_BLOCK_CIPHER(rc5_32_12_16, ks, RC5_32, EVP_RC5_KEY, NID_rc5,
- 8, RC5_32_KEY_LENGTH, 8, 64,
- EVP_CIPH_VARIABLE_LENGTH | EVP_CIPH_CTRL_INIT,
- r_32_12_16_init_key, NULL, NULL, NULL, rc5_ctrl)
+ 8, RC5_32_KEY_LENGTH, 8, 64,
+ EVP_CIPH_VARIABLE_LENGTH | EVP_CIPH_CTRL_INIT,
+ r_32_12_16_init_key, NULL, NULL, NULL, rc5_ctrl)
static int rc5_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
{
@@ -70,7 +70,7 @@ static int rc5_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
}
static int r_32_12_16_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc)
+ const unsigned char *iv, int enc)
{
const int key_len = EVP_CIPHER_CTX_get_key_length(ctx);
diff --git a/crypto/evp/e_seed.c b/crypto/evp/e_seed.c
index 65ddb57335..a88cab0294 100644
--- a/crypto/evp/e_seed.c
+++ b/crypto/evp/e_seed.c
@@ -23,18 +23,18 @@
#include "evp_local.h"
static int seed_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc);
+ const unsigned char *iv, int enc);
typedef struct {
SEED_KEY_SCHEDULE ks;
} EVP_SEED_KEY;
IMPLEMENT_BLOCK_CIPHER(seed, ks, SEED, EVP_SEED_KEY, NID_seed,
- 16, 16, 16, 128, EVP_CIPH_FLAG_DEFAULT_ASN1,
- seed_init_key, 0, 0, 0, 0)
+ 16, 16, 16, 128, EVP_CIPH_FLAG_DEFAULT_ASN1,
+ seed_init_key, 0, 0, 0, 0)
static int seed_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc)
+ const unsigned char *iv, int enc)
{
SEED_set_key(key, &EVP_C_DATA(EVP_SEED_KEY, ctx)->ks);
return 1;
diff --git a/crypto/evp/e_sm4.c b/crypto/evp/e_sm4.c
index eeb4fd8e09..f833e75516 100644
--- a/crypto/evp/e_sm4.c
+++ b/crypto/evp/e_sm4.c
@@ -13,12 +13,12 @@
#include "internal/cryptlib.h"
#ifndef OPENSSL_NO_SM4
-# include <openssl/evp.h>
-# include <openssl/modes.h>
-# include "crypto/sm4.h"
-# include "crypto/evp.h"
-# include "crypto/sm4_platform.h"
-# include "evp_local.h"
+#include <openssl/evp.h>
+#include <openssl/modes.h>
+#include "crypto/sm4.h"
+#include "crypto/evp.h"
+#include "crypto/sm4_platform.h"
+#include "evp_local.h"
typedef struct {
union {
@@ -33,31 +33,34 @@ typedef struct {
} stream;
} EVP_SM4_KEY;
-# define BLOCK_CIPHER_generic(nid,blocksize,ivlen,nmode,mode,MODE,flags) \
-static const EVP_CIPHER sm4_##mode = { \
- nid##_##nmode,blocksize,128/8,ivlen, \
- flags|EVP_CIPH_##MODE##_MODE, \
- EVP_ORIG_GLOBAL, \
- sm4_init_key, \
- sm4_##mode##_cipher, \
- NULL, \
- sizeof(EVP_SM4_KEY), \
- NULL,NULL,NULL,NULL }; \
-const EVP_CIPHER *EVP_sm4_##mode(void) \
-{ return &sm4_##mode; }
-
-#define DEFINE_BLOCK_CIPHERS(nid,flags) \
- BLOCK_CIPHER_generic(nid,16,16,cbc,cbc,CBC,flags|EVP_CIPH_FLAG_DEFAULT_ASN1) \
- BLOCK_CIPHER_generic(nid,16,0,ecb,ecb,ECB,flags|EVP_CIPH_FLAG_DEFAULT_ASN1) \
- BLOCK_CIPHER_generic(nid,1,16,ofb128,ofb,OFB,flags|EVP_CIPH_FLAG_DEFAULT_ASN1) \
- BLOCK_CIPHER_generic(nid,1,16,cfb128,cfb,CFB,flags|EVP_CIPH_FLAG_DEFAULT_ASN1) \
- BLOCK_CIPHER_generic(nid,1,16,ctr,ctr,CTR,flags)
+#define BLOCK_CIPHER_generic(nid, blocksize, ivlen, nmode, mode, MODE, flags) \
+ static const EVP_CIPHER sm4_##mode = { \
+ nid##_##nmode, blocksize, 128 / 8, ivlen, \
+ flags | EVP_CIPH_##MODE##_MODE, \
+ EVP_ORIG_GLOBAL, \
+ sm4_init_key, \
+ sm4_##mode##_cipher, \
+ NULL, \
+ sizeof(EVP_SM4_KEY), \
+ NULL, NULL, NULL, NULL \
+ }; \
+ const EVP_CIPHER *EVP_sm4_##mode(void) \
+ { \
+ return &sm4_##mode; \
+ }
+
+#define DEFINE_BLOCK_CIPHERS(nid, flags) \
+ BLOCK_CIPHER_generic(nid, 16, 16, cbc, cbc, CBC, flags | EVP_CIPH_FLAG_DEFAULT_ASN1) \
+ BLOCK_CIPHER_generic(nid, 16, 0, ecb, ecb, ECB, flags | EVP_CIPH_FLAG_DEFAULT_ASN1) \
+ BLOCK_CIPHER_generic(nid, 1, 16, ofb128, ofb, OFB, flags | EVP_CIPH_FLAG_DEFAULT_ASN1) \
+ BLOCK_CIPHER_generic(nid, 1, 16, cfb128, cfb, CFB, flags | EVP_CIPH_FLAG_DEFAULT_ASN1) \
+ BLOCK_CIPHER_generic(nid, 1, 16, ctr, ctr, CTR, flags)
static int sm4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc)
+ const unsigned char *iv, int enc)
{
int mode;
- EVP_SM4_KEY *dat = EVP_C_DATA(EVP_SM4_KEY,ctx);
+ EVP_SM4_KEY *dat = EVP_C_DATA(EVP_SM4_KEY, ctx);
mode = EVP_CIPHER_CTX_get_mode(ctx);
if ((mode == EVP_CIPH_ECB_MODE || mode == EVP_CIPH_CBC_MODE)
@@ -65,145 +68,145 @@ static int sm4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
#ifdef HWSM4_CAPABLE
if (HWSM4_CAPABLE) {
HWSM4_set_decrypt_key(key, &dat->ks.ks);
- dat->block = (block128_f) HWSM4_decrypt;
+ dat->block = (block128_f)HWSM4_decrypt;
dat->stream.cbc = NULL;
-# ifdef HWSM4_cbc_encrypt
+#ifdef HWSM4_cbc_encrypt
if (mode == EVP_CIPH_CBC_MODE)
- dat->stream.cbc = (cbc128_f) HWSM4_cbc_encrypt;
-# endif
-# ifdef HWSM4_ecb_encrypt
+ dat->stream.cbc = (cbc128_f)HWSM4_cbc_encrypt;
+#endif
+#ifdef HWSM4_ecb_encrypt
if (mode == EVP_CIPH_ECB_MODE)
- dat->stream.ecb = (ecb128_f) HWSM4_ecb_encrypt;
-# endif
+ dat->stream.ecb = (ecb128_f)HWSM4_ecb_encrypt;
+#endif
} else
#endif
#ifdef VPSM4_CAPABLE
- if (VPSM4_CAPABLE) {
+ if (VPSM4_CAPABLE) {
vpsm4_set_decrypt_key(key, &dat->ks.ks);
- dat->block = (block128_f) vpsm4_decrypt;
+ dat->block = (block128_f)vpsm4_decrypt;
dat->stream.cbc = NULL;
if (mode == EVP_CIPH_CBC_MODE)
- dat->stream.cbc = (cbc128_f) vpsm4_cbc_encrypt;
+ dat->stream.cbc = (cbc128_f)vpsm4_cbc_encrypt;
else if (mode == EVP_CIPH_ECB_MODE)
- dat->stream.ecb = (ecb128_f) vpsm4_ecb_encrypt;
+ dat->stream.ecb = (ecb128_f)vpsm4_ecb_encrypt;
} else
#endif
{
- dat->block = (block128_f) ossl_sm4_decrypt;
+ dat->block = (block128_f)ossl_sm4_decrypt;
ossl_sm4_set_key(key, EVP_CIPHER_CTX_get_cipher_data(ctx));
}
} else
#ifdef HWSM4_CAPABLE
- if (HWSM4_CAPABLE) {
+ if (HWSM4_CAPABLE) {
HWSM4_set_encrypt_key(key, &dat->ks.ks);
- dat->block = (block128_f) HWSM4_encrypt;
+ dat->block = (block128_f)HWSM4_encrypt;
dat->stream.cbc = NULL;
-# ifdef HWSM4_cbc_encrypt
+#ifdef HWSM4_cbc_encrypt
if (mode == EVP_CIPH_CBC_MODE)
- dat->stream.cbc = (cbc128_f) HWSM4_cbc_encrypt;
+ dat->stream.cbc = (cbc128_f)HWSM4_cbc_encrypt;
else
-# endif
-# ifdef HWSM4_ecb_encrypt
- if (mode == EVP_CIPH_ECB_MODE)
- dat->stream.ecb = (ecb128_f) HWSM4_ecb_encrypt;
+#endif
+#ifdef HWSM4_ecb_encrypt
+ if (mode == EVP_CIPH_ECB_MODE)
+ dat->stream.ecb = (ecb128_f)HWSM4_ecb_encrypt;
else
-# endif
-# ifdef HWSM4_ctr32_encrypt_blocks
- if (mode == EVP_CIPH_CTR_MODE)
- dat->stream.ctr = (ctr128_f) HWSM4_ctr32_encrypt_blocks;
+#endif
+#ifdef HWSM4_ctr32_encrypt_blocks
+ if (mode == EVP_CIPH_CTR_MODE)
+ dat->stream.ctr = (ctr128_f)HWSM4_ctr32_encrypt_blocks;
else
-# endif
- (void)0; /* terminate potentially open 'else' */
+#endif
+ (void)0; /* terminate potentially open 'else' */
} else
#endif
#ifdef VPSM4_CAPABLE
- if (VPSM4_CAPABLE) {
+ if (VPSM4_CAPABLE) {
vpsm4_set_encrypt_key(key, &dat->ks.ks);
- dat->block = (block128_f) vpsm4_encrypt;
+ dat->block = (block128_f)vpsm4_encrypt;
dat->stream.cbc = NULL;
if (mode == EVP_CIPH_CBC_MODE)
- dat->stream.cbc = (cbc128_f) vpsm4_cbc_encrypt;
+ dat->stream.cbc = (cbc128_f)vpsm4_cbc_encrypt;
else if (mode == EVP_CIPH_ECB_MODE)
- dat->stream.ecb = (ecb128_f) vpsm4_ecb_encrypt;
+ dat->stream.ecb = (ecb128_f)vpsm4_ecb_encrypt;
else if (mode == EVP_CIPH_CTR_MODE)
- dat->stream.ctr = (ctr128_f) vpsm4_ctr32_encrypt_blocks;
+ dat->stream.ctr = (ctr128_f)vpsm4_ctr32_encrypt_blocks;
} else
#endif
{
- dat->block = (block128_f) ossl_sm4_encrypt;
+ dat->block = (block128_f)ossl_sm4_encrypt;
ossl_sm4_set_key(key, EVP_CIPHER_CTX_get_cipher_data(ctx));
}
return 1;
}
static int sm4_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len)
+ const unsigned char *in, size_t len)
{
- EVP_SM4_KEY *dat = EVP_C_DATA(EVP_SM4_KEY,ctx);
+ EVP_SM4_KEY *dat = EVP_C_DATA(EVP_SM4_KEY, ctx);
if (dat->stream.cbc)
- (*dat->stream.cbc) (in, out, len, &dat->ks.ks, ctx->iv,
- EVP_CIPHER_CTX_is_encrypting(ctx));
+ (*dat->stream.cbc)(in, out, len, &dat->ks.ks, ctx->iv,
+ EVP_CIPHER_CTX_is_encrypting(ctx));
else if (EVP_CIPHER_CTX_is_encrypting(ctx))
CRYPTO_cbc128_encrypt(in, out, len, &dat->ks, ctx->iv,
- dat->block);
+ dat->block);
else
CRYPTO_cbc128_decrypt(in, out, len, &dat->ks,
- ctx->iv, dat->block);
+ ctx->iv, dat->block);
return 1;
}
static int sm4_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len)
+ const unsigned char *in, size_t len)
{
- EVP_SM4_KEY *dat = EVP_C_DATA(EVP_SM4_KEY,ctx);
+ EVP_SM4_KEY *dat = EVP_C_DATA(EVP_SM4_KEY, ctx);
int num = EVP_CIPHER_CTX_get_num(ctx);
CRYPTO_cfb128_encrypt(in, out, len, &dat->ks,
- ctx->iv, &num,
- EVP_CIPHER_CTX_is_encrypting(ctx), dat->block);
+ ctx->iv, &num,
+ EVP_CIPHER_CTX_is_encrypting(ctx), dat->block);
EVP_CIPHER_CTX_set_num(ctx, num);
return 1;
}
static int sm4_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len)
+ const unsigned char *in, size_t len)
{
size_t bl = EVP_CIPHER_CTX_get_block_size(ctx);
size_t i;
- EVP_SM4_KEY *dat = EVP_C_DATA(EVP_SM4_KEY,ctx);
+ EVP_SM4_KEY *dat = EVP_C_DATA(EVP_SM4_KEY, ctx);
if (len < bl)
return 1;
if (dat->stream.ecb != NULL)
- (*dat->stream.ecb) (in, out, len, &dat->ks.ks,
- EVP_CIPHER_CTX_is_encrypting(ctx));
+ (*dat->stream.ecb)(in, out, len, &dat->ks.ks,
+ EVP_CIPHER_CTX_is_encrypting(ctx));
else
for (i = 0, len -= bl; i <= len; i += bl)
- (*dat->block) (in + i, out + i, &dat->ks);
+ (*dat->block)(in + i, out + i, &dat->ks);
return 1;
}
static int sm4_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len)
+ const unsigned char *in, size_t len)
{
- EVP_SM4_KEY *dat = EVP_C_DATA(EVP_SM4_KEY,ctx);
+ EVP_SM4_KEY *dat = EVP_C_DATA(EVP_SM4_KEY, ctx);
int num = EVP_CIPHER_CTX_get_num(ctx);
CRYPTO_ofb128_encrypt(in, out, len, &dat->ks,
- ctx->iv, &num, dat->block);
+ ctx->iv, &num, dat->block);
EVP_CIPHER_CTX_set_num(ctx, num);
return 1;
}
static int sm4_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t len)
+ const unsigned char *in, size_t len)
{
int n = EVP_CIPHER_CTX_get_num(ctx);
unsigned int num;
- EVP_SM4_KEY *dat = EVP_C_DATA(EVP_SM4_KEY,ctx);
+ EVP_SM4_KEY *dat = EVP_C_DATA(EVP_SM4_KEY, ctx);
if (n < 0)
return 0;
@@ -211,14 +214,14 @@ static int sm4_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
if (dat->stream.ctr)
CRYPTO_ctr128_encrypt_ctr32(in, out, len, &dat->ks,
- ctx->iv,
- EVP_CIPHER_CTX_buf_noconst(ctx),
- &num, dat->stream.ctr);
+ ctx->iv,
+ EVP_CIPHER_CTX_buf_noconst(ctx),
+ &num, dat->stream.ctr);
else
CRYPTO_ctr128_encrypt(in, out, len, &dat->ks,
- ctx->iv,
- EVP_CIPHER_CTX_buf_noconst(ctx), &num,
- dat->block);
+ ctx->iv,
+ EVP_CIPHER_CTX_buf_noconst(ctx), &num,
+ dat->block);
EVP_CIPHER_CTX_set_num(ctx, num);
return 1;
}
diff --git a/crypto/evp/e_xcbc_d.c b/crypto/evp/e_xcbc_d.c
index f930941887..eaa021be2c 100644
--- a/crypto/evp/e_xcbc_d.c
+++ b/crypto/evp/e_xcbc_d.c
@@ -18,24 +18,24 @@
#ifndef OPENSSL_NO_DES
-# include <openssl/evp.h>
-# include <openssl/objects.h>
-# include "crypto/evp.h"
-# include <openssl/des.h>
-# include "evp_local.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include "crypto/evp.h"
+#include <openssl/des.h>
+#include "evp_local.h"
static int desx_cbc_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc);
+ const unsigned char *iv, int enc);
static int desx_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t inl);
+ const unsigned char *in, size_t inl);
typedef struct {
- DES_key_schedule ks; /* key schedule */
+ DES_key_schedule ks; /* key schedule */
DES_cblock inw;
DES_cblock outw;
} DESX_CBC_KEY;
-# define data(ctx) EVP_C_DATA(DESX_CBC_KEY,ctx)
+#define data(ctx) EVP_C_DATA(DESX_CBC_KEY, ctx)
static const EVP_CIPHER d_xcbc_cipher = {
NID_desx_cbc,
@@ -58,7 +58,7 @@ const EVP_CIPHER *EVP_desx_cbc(void)
}
static int desx_cbc_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc)
+ const unsigned char *iv, int enc)
{
DES_cblock *deskey = (DES_cblock *)key;
@@ -70,22 +70,22 @@ static int desx_cbc_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
}
static int desx_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t inl)
+ const unsigned char *in, size_t inl)
{
while (inl >= EVP_MAXCHUNK) {
DES_xcbc_encrypt(in, out, (long)EVP_MAXCHUNK, &data(ctx)->ks,
- (DES_cblock *)ctx->iv,
- &data(ctx)->inw, &data(ctx)->outw,
- EVP_CIPHER_CTX_is_encrypting(ctx));
+ (DES_cblock *)ctx->iv,
+ &data(ctx)->inw, &data(ctx)->outw,
+ EVP_CIPHER_CTX_is_encrypting(ctx));
inl -= EVP_MAXCHUNK;
in += EVP_MAXCHUNK;
out += EVP_MAXCHUNK;
}
if (inl)
DES_xcbc_encrypt(in, out, (long)inl, &data(ctx)->ks,
- (DES_cblock *)ctx->iv,
- &data(ctx)->inw, &data(ctx)->outw,
- EVP_CIPHER_CTX_is_encrypting(ctx));
+ (DES_cblock *)ctx->iv,
+ &data(ctx)->inw, &data(ctx)->outw,
+ EVP_CIPHER_CTX_is_encrypting(ctx));
return 1;
}
#endif
diff --git a/crypto/evp/ec_ctrl.c b/crypto/evp/ec_ctrl.c
index c1cf221a0d..096f7f18d7 100644
--- a/crypto/evp/ec_ctrl.c
+++ b/crypto/evp/ec_ctrl.c
@@ -20,8 +20,7 @@
* keys.
*/
-static ossl_inline
-int evp_pkey_ctx_getset_ecdh_param_checks(const EVP_PKEY_CTX *ctx)
+static ossl_inline int evp_pkey_ctx_getset_ecdh_param_checks(const EVP_PKEY_CTX *ctx)
{
if (ctx == NULL || !EVP_PKEY_CTX_IS_DERIVE_OP(ctx)) {
ERR_raise(ERR_LIB_EVP, EVP_R_COMMAND_NOT_SUPPORTED);
@@ -58,7 +57,7 @@ int EVP_PKEY_CTX_set_ecdh_cofactor_mode(EVP_PKEY_CTX *ctx, int cofactor_mode)
}
*p++ = OSSL_PARAM_construct_int(OSSL_EXCHANGE_PARAM_EC_ECDH_COFACTOR_MODE,
- &cofactor_mode);
+ &cofactor_mode);
*p++ = OSSL_PARAM_construct_end();
ret = evp_pkey_ctx_set_params_strict(ctx, params);
@@ -77,7 +76,7 @@ int EVP_PKEY_CTX_get_ecdh_cofactor_mode(EVP_PKEY_CTX *ctx)
return ret;
*p++ = OSSL_PARAM_construct_int(OSSL_EXCHANGE_PARAM_EC_ECDH_COFACTOR_MODE,
- &mode);
+ &mode);
*p++ = OSSL_PARAM_construct_end();
ret = evp_pkey_ctx_get_params_strict(ctx, params);
@@ -111,7 +110,7 @@ int EVP_PKEY_CTX_get_ecdh_cofactor_mode(EVP_PKEY_CTX *ctx)
int EVP_PKEY_CTX_set_ecdh_kdf_type(EVP_PKEY_CTX *ctx, int kdf)
{
return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_EC_KDF_TYPE, kdf, NULL);
+ EVP_PKEY_CTRL_EC_KDF_TYPE, kdf, NULL);
}
/*
@@ -121,7 +120,7 @@ int EVP_PKEY_CTX_set_ecdh_kdf_type(EVP_PKEY_CTX *ctx, int kdf)
int EVP_PKEY_CTX_get_ecdh_kdf_type(EVP_PKEY_CTX *ctx)
{
return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_EC_KDF_TYPE, -2, NULL);
+ EVP_PKEY_CTRL_EC_KDF_TYPE, -2, NULL);
}
/*
@@ -131,7 +130,7 @@ int EVP_PKEY_CTX_get_ecdh_kdf_type(EVP_PKEY_CTX *ctx)
int EVP_PKEY_CTX_set_ecdh_kdf_md(EVP_PKEY_CTX *ctx, const EVP_MD *md)
{
return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_EC_KDF_MD, 0, (void *)(md));
+ EVP_PKEY_CTRL_EC_KDF_MD, 0, (void *)(md));
}
/*
@@ -141,7 +140,7 @@ int EVP_PKEY_CTX_set_ecdh_kdf_md(EVP_PKEY_CTX *ctx, const EVP_MD *md)
int EVP_PKEY_CTX_get_ecdh_kdf_md(EVP_PKEY_CTX *ctx, const EVP_MD **pmd)
{
return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_GET_EC_KDF_MD, 0, (void *)(pmd));
+ EVP_PKEY_CTRL_GET_EC_KDF_MD, 0, (void *)(pmd));
}
int EVP_PKEY_CTX_set_ecdh_kdf_outlen(EVP_PKEY_CTX *ctx, int outlen)
@@ -164,7 +163,7 @@ int EVP_PKEY_CTX_set_ecdh_kdf_outlen(EVP_PKEY_CTX *ctx, int outlen)
}
*p++ = OSSL_PARAM_construct_size_t(OSSL_EXCHANGE_PARAM_KDF_OUTLEN,
- &len);
+ &len);
*p++ = OSSL_PARAM_construct_end();
ret = evp_pkey_ctx_set_params_strict(ctx, params);
@@ -184,7 +183,7 @@ int EVP_PKEY_CTX_get_ecdh_kdf_outlen(EVP_PKEY_CTX *ctx, int *plen)
return ret;
*p++ = OSSL_PARAM_construct_size_t(OSSL_EXCHANGE_PARAM_KDF_OUTLEN,
- &len);
+ &len);
*p++ = OSSL_PARAM_construct_end();
ret = evp_pkey_ctx_get_params_strict(ctx, params);
@@ -217,12 +216,12 @@ int EVP_PKEY_CTX_set0_ecdh_kdf_ukm(EVP_PKEY_CTX *ctx, unsigned char *ukm, int le
return ret;
*p++ = OSSL_PARAM_construct_octet_string(OSSL_EXCHANGE_PARAM_KDF_UKM,
- /*
- * Cast away the const. This is read
- * only so should be safe
- */
- (void *)ukm,
- (size_t)len);
+ /*
+ * Cast away the const. This is read
+ * only so should be safe
+ */
+ (void *)ukm,
+ (size_t)len);
*p++ = OSSL_PARAM_construct_end();
ret = evp_pkey_ctx_set_params_strict(ctx, params);
@@ -251,7 +250,7 @@ int EVP_PKEY_CTX_get0_ecdh_kdf_ukm(EVP_PKEY_CTX *ctx, unsigned char **pukm)
return ret;
*p++ = OSSL_PARAM_construct_octet_ptr(OSSL_EXCHANGE_PARAM_KDF_UKM,
- (void **)pukm, 0);
+ (void **)pukm, 0);
*p++ = OSSL_PARAM_construct_end();
ret = evp_pkey_ctx_get_params_strict(ctx, params);
@@ -286,8 +285,8 @@ int EVP_PKEY_CTX_set_ec_paramgen_curve_nid(EVP_PKEY_CTX *ctx, int nid)
int keytype = nid == EVP_PKEY_SM2 ? EVP_PKEY_SM2 : EVP_PKEY_EC;
return EVP_PKEY_CTX_ctrl(ctx, keytype, EVP_PKEY_OP_TYPE_GEN,
- EVP_PKEY_CTRL_EC_PARAMGEN_CURVE_NID,
- nid, NULL);
+ EVP_PKEY_CTRL_EC_PARAMGEN_CURVE_NID,
+ nid, NULL);
}
/*
@@ -297,6 +296,6 @@ int EVP_PKEY_CTX_set_ec_paramgen_curve_nid(EVP_PKEY_CTX *ctx, int nid)
int EVP_PKEY_CTX_set_ec_param_enc(EVP_PKEY_CTX *ctx, int param_enc)
{
return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, EVP_PKEY_OP_TYPE_GEN,
- EVP_PKEY_CTRL_EC_PARAM_ENC, param_enc, NULL);
+ EVP_PKEY_CTRL_EC_PARAM_ENC, param_enc, NULL);
}
#endif
diff --git a/crypto/evp/ec_support.c b/crypto/evp/ec_support.c
index 1ec10143d2..20883c48f1 100644
--- a/crypto/evp/ec_support.c
+++ b/crypto/evp/ec_support.c
@@ -20,99 +20,99 @@ typedef struct ec_name2nid_st {
static const EC_NAME2NID curve_list[] = {
/* prime field curves */
/* secg curves */
- {"secp112r1", NID_secp112r1 },
- {"secp112r2", NID_secp112r2 },
- {"secp128r1", NID_secp128r1 },
- {"secp128r2", NID_secp128r2 },
- {"secp160k1", NID_secp160k1 },
- {"secp160r1", NID_secp160r1 },
- {"secp160r2", NID_secp160r2 },
- {"secp192k1", NID_secp192k1 },
- {"secp224k1", NID_secp224k1 },
- {"secp224r1", NID_secp224r1 },
- {"secp256k1", NID_secp256k1 },
- {"secp384r1", NID_secp384r1 },
- {"secp521r1", NID_secp521r1 },
+ { "secp112r1", NID_secp112r1 },
+ { "secp112r2", NID_secp112r2 },
+ { "secp128r1", NID_secp128r1 },
+ { "secp128r2", NID_secp128r2 },
+ { "secp160k1", NID_secp160k1 },
+ { "secp160r1", NID_secp160r1 },
+ { "secp160r2", NID_secp160r2 },
+ { "secp192k1", NID_secp192k1 },
+ { "secp224k1", NID_secp224k1 },
+ { "secp224r1", NID_secp224r1 },
+ { "secp256k1", NID_secp256k1 },
+ { "secp384r1", NID_secp384r1 },
+ { "secp521r1", NID_secp521r1 },
/* X9.62 curves */
- {"prime192v1", NID_X9_62_prime192v1 },
- {"prime192v2", NID_X9_62_prime192v2 },
- {"prime192v3", NID_X9_62_prime192v3 },
- {"prime239v1", NID_X9_62_prime239v1 },
- {"prime239v2", NID_X9_62_prime239v2 },
- {"prime239v3", NID_X9_62_prime239v3 },
- {"prime256v1", NID_X9_62_prime256v1 },
+ { "prime192v1", NID_X9_62_prime192v1 },
+ { "prime192v2", NID_X9_62_prime192v2 },
+ { "prime192v3", NID_X9_62_prime192v3 },
+ { "prime239v1", NID_X9_62_prime239v1 },
+ { "prime239v2", NID_X9_62_prime239v2 },
+ { "prime239v3", NID_X9_62_prime239v3 },
+ { "prime256v1", NID_X9_62_prime256v1 },
/* characteristic two field curves */
/* NIST/SECG curves */
- {"sect113r1", NID_sect113r1 },
- {"sect113r2", NID_sect113r2 },
- {"sect131r1", NID_sect131r1 },
- {"sect131r2", NID_sect131r2 },
- {"sect163k1", NID_sect163k1 },
- {"sect163r1", NID_sect163r1 },
- {"sect163r2", NID_sect163r2 },
- {"sect193r1", NID_sect193r1 },
- {"sect193r2", NID_sect193r2 },
- {"sect233k1", NID_sect233k1 },
- {"sect233r1", NID_sect233r1 },
- {"sect239k1", NID_sect239k1 },
- {"sect283k1", NID_sect283k1 },
- {"sect283r1", NID_sect283r1 },
- {"sect409k1", NID_sect409k1 },
- {"sect409r1", NID_sect409r1 },
- {"sect571k1", NID_sect571k1 },
- {"sect571r1", NID_sect571r1 },
+ { "sect113r1", NID_sect113r1 },
+ { "sect113r2", NID_sect113r2 },
+ { "sect131r1", NID_sect131r1 },
+ { "sect131r2", NID_sect131r2 },
+ { "sect163k1", NID_sect163k1 },
+ { "sect163r1", NID_sect163r1 },
+ { "sect163r2", NID_sect163r2 },
+ { "sect193r1", NID_sect193r1 },
+ { "sect193r2", NID_sect193r2 },
+ { "sect233k1", NID_sect233k1 },
+ { "sect233r1", NID_sect233r1 },
+ { "sect239k1", NID_sect239k1 },
+ { "sect283k1", NID_sect283k1 },
+ { "sect283r1", NID_sect283r1 },
+ { "sect409k1", NID_sect409k1 },
+ { "sect409r1", NID_sect409r1 },
+ { "sect571k1", NID_sect571k1 },
+ { "sect571r1", NID_sect571r1 },
/* X9.62 curves */
- {"c2pnb163v1", NID_X9_62_c2pnb163v1 },
- {"c2pnb163v2", NID_X9_62_c2pnb163v2 },
- {"c2pnb163v3", NID_X9_62_c2pnb163v3 },
- {"c2pnb176v1", NID_X9_62_c2pnb176v1 },
- {"c2tnb191v1", NID_X9_62_c2tnb191v1 },
- {"c2tnb191v2", NID_X9_62_c2tnb191v2 },
- {"c2tnb191v3", NID_X9_62_c2tnb191v3 },
- {"c2pnb208w1", NID_X9_62_c2pnb208w1 },
- {"c2tnb239v1", NID_X9_62_c2tnb239v1 },
- {"c2tnb239v2", NID_X9_62_c2tnb239v2 },
- {"c2tnb239v3", NID_X9_62_c2tnb239v3 },
- {"c2pnb272w1", NID_X9_62_c2pnb272w1 },
- {"c2pnb304w1", NID_X9_62_c2pnb304w1 },
- {"c2tnb359v1", NID_X9_62_c2tnb359v1 },
- {"c2pnb368w1", NID_X9_62_c2pnb368w1 },
- {"c2tnb431r1", NID_X9_62_c2tnb431r1 },
+ { "c2pnb163v1", NID_X9_62_c2pnb163v1 },
+ { "c2pnb163v2", NID_X9_62_c2pnb163v2 },
+ { "c2pnb163v3", NID_X9_62_c2pnb163v3 },
+ { "c2pnb176v1", NID_X9_62_c2pnb176v1 },
+ { "c2tnb191v1", NID_X9_62_c2tnb191v1 },
+ { "c2tnb191v2", NID_X9_62_c2tnb191v2 },
+ { "c2tnb191v3", NID_X9_62_c2tnb191v3 },
+ { "c2pnb208w1", NID_X9_62_c2pnb208w1 },
+ { "c2tnb239v1", NID_X9_62_c2tnb239v1 },
+ { "c2tnb239v2", NID_X9_62_c2tnb239v2 },
+ { "c2tnb239v3", NID_X9_62_c2tnb239v3 },
+ { "c2pnb272w1", NID_X9_62_c2pnb272w1 },
+ { "c2pnb304w1", NID_X9_62_c2pnb304w1 },
+ { "c2tnb359v1", NID_X9_62_c2tnb359v1 },
+ { "c2pnb368w1", NID_X9_62_c2pnb368w1 },
+ { "c2tnb431r1", NID_X9_62_c2tnb431r1 },
/*
* the WAP/WTLS curves [unlike SECG, spec has its own OIDs for curves
* from X9.62]
*/
- {"wap-wsg-idm-ecid-wtls1", NID_wap_wsg_idm_ecid_wtls1 },
- {"wap-wsg-idm-ecid-wtls3", NID_wap_wsg_idm_ecid_wtls3 },
- {"wap-wsg-idm-ecid-wtls4", NID_wap_wsg_idm_ecid_wtls4 },
- {"wap-wsg-idm-ecid-wtls5", NID_wap_wsg_idm_ecid_wtls5 },
- {"wap-wsg-idm-ecid-wtls6", NID_wap_wsg_idm_ecid_wtls6 },
- {"wap-wsg-idm-ecid-wtls7", NID_wap_wsg_idm_ecid_wtls7 },
- {"wap-wsg-idm-ecid-wtls8", NID_wap_wsg_idm_ecid_wtls8 },
- {"wap-wsg-idm-ecid-wtls9", NID_wap_wsg_idm_ecid_wtls9 },
- {"wap-wsg-idm-ecid-wtls10", NID_wap_wsg_idm_ecid_wtls10 },
- {"wap-wsg-idm-ecid-wtls11", NID_wap_wsg_idm_ecid_wtls11 },
- {"wap-wsg-idm-ecid-wtls12", NID_wap_wsg_idm_ecid_wtls12 },
+ { "wap-wsg-idm-ecid-wtls1", NID_wap_wsg_idm_ecid_wtls1 },
+ { "wap-wsg-idm-ecid-wtls3", NID_wap_wsg_idm_ecid_wtls3 },
+ { "wap-wsg-idm-ecid-wtls4", NID_wap_wsg_idm_ecid_wtls4 },
+ { "wap-wsg-idm-ecid-wtls5", NID_wap_wsg_idm_ecid_wtls5 },
+ { "wap-wsg-idm-ecid-wtls6", NID_wap_wsg_idm_ecid_wtls6 },
+ { "wap-wsg-idm-ecid-wtls7", NID_wap_wsg_idm_ecid_wtls7 },
+ { "wap-wsg-idm-ecid-wtls8", NID_wap_wsg_idm_ecid_wtls8 },
+ { "wap-wsg-idm-ecid-wtls9", NID_wap_wsg_idm_ecid_wtls9 },
+ { "wap-wsg-idm-ecid-wtls10", NID_wap_wsg_idm_ecid_wtls10 },
+ { "wap-wsg-idm-ecid-wtls11", NID_wap_wsg_idm_ecid_wtls11 },
+ { "wap-wsg-idm-ecid-wtls12", NID_wap_wsg_idm_ecid_wtls12 },
/* IPSec curves */
- {"Oakley-EC2N-3", NID_ipsec3 },
- {"Oakley-EC2N-4", NID_ipsec4 },
+ { "Oakley-EC2N-3", NID_ipsec3 },
+ { "Oakley-EC2N-4", NID_ipsec4 },
/* brainpool curves */
- {"brainpoolP160r1", NID_brainpoolP160r1 },
- {"brainpoolP160t1", NID_brainpoolP160t1 },
- {"brainpoolP192r1", NID_brainpoolP192r1 },
- {"brainpoolP192t1", NID_brainpoolP192t1 },
- {"brainpoolP224r1", NID_brainpoolP224r1 },
- {"brainpoolP224t1", NID_brainpoolP224t1 },
- {"brainpoolP256r1", NID_brainpoolP256r1 },
- {"brainpoolP256t1", NID_brainpoolP256t1 },
- {"brainpoolP320r1", NID_brainpoolP320r1 },
- {"brainpoolP320t1", NID_brainpoolP320t1 },
- {"brainpoolP384r1", NID_brainpoolP384r1 },
- {"brainpoolP384t1", NID_brainpoolP384t1 },
- {"brainpoolP512r1", NID_brainpoolP512r1 },
- {"brainpoolP512t1", NID_brainpoolP512t1 },
+ { "brainpoolP160r1", NID_brainpoolP160r1 },
+ { "brainpoolP160t1", NID_brainpoolP160t1 },
+ { "brainpoolP192r1", NID_brainpoolP192r1 },
+ { "brainpoolP192t1", NID_brainpoolP192t1 },
+ { "brainpoolP224r1", NID_brainpoolP224r1 },
+ { "brainpoolP224t1", NID_brainpoolP224t1 },
+ { "brainpoolP256r1", NID_brainpoolP256r1 },
+ { "brainpoolP256t1", NID_brainpoolP256t1 },
+ { "brainpoolP320r1", NID_brainpoolP320r1 },
+ { "brainpoolP320t1", NID_brainpoolP320t1 },
+ { "brainpoolP384r1", NID_brainpoolP384r1 },
+ { "brainpoolP384t1", NID_brainpoolP384t1 },
+ { "brainpoolP512r1", NID_brainpoolP512r1 },
+ { "brainpoolP512t1", NID_brainpoolP512t1 },
/* SM2 curve */
- {"SM2", NID_sm2 },
+ { "SM2", NID_sm2 },
};
const char *OSSL_EC_curve_nid2name(int nid)
@@ -150,21 +150,21 @@ int ossl_ec_curve_name2nid(const char *name)
/* Functions to translate between common NIST curve names and NIDs */
static const EC_NAME2NID nist_curves[] = {
- {"B-163", NID_sect163r2},
- {"B-233", NID_sect233r1},
- {"B-283", NID_sect283r1},
- {"B-409", NID_sect409r1},
- {"B-571", NID_sect571r1},
- {"K-163", NID_sect163k1},
- {"K-233", NID_sect233k1},
- {"K-283", NID_sect283k1},
- {"K-409", NID_sect409k1},
- {"K-571", NID_sect571k1},
- {"P-192", NID_X9_62_prime192v1},
- {"P-224", NID_secp224r1},
- {"P-256", NID_X9_62_prime256v1},
- {"P-384", NID_secp384r1},
- {"P-521", NID_secp521r1}
+ { "B-163", NID_sect163r2 },
+ { "B-233", NID_sect233r1 },
+ { "B-283", NID_sect283r1 },
+ { "B-409", NID_sect409r1 },
+ { "B-571", NID_sect571r1 },
+ { "K-163", NID_sect163k1 },
+ { "K-233", NID_sect233k1 },
+ { "K-283", NID_sect283k1 },
+ { "K-409", NID_sect409k1 },
+ { "K-571", NID_sect571k1 },
+ { "P-192", NID_X9_62_prime192v1 },
+ { "P-224", NID_secp224r1 },
+ { "P-256", NID_X9_62_prime256v1 },
+ { "P-384", NID_secp384r1 },
+ { "P-521", NID_secp521r1 }
};
const char *ossl_ec_curve_nid2nist_int(int nid)
diff --git a/crypto/evp/encode.c b/crypto/evp/encode.c
index 7b2680db34..53575e7b60 100644
--- a/crypto/evp/encode.c
+++ b/crypto/evp/encode.c
@@ -15,14 +15,14 @@
#include "evp_local.h"
static unsigned char conv_ascii2bin(unsigned char a,
- const unsigned char *table);
+ const unsigned char *table);
static int evp_encodeblock_int(EVP_ENCODE_CTX *ctx, unsigned char *t,
- const unsigned char *f, int dlen);
+ const unsigned char *f, int dlen);
static int evp_decodeblock_int(EVP_ENCODE_CTX *ctx, unsigned char *t,
- const unsigned char *f, int n, int eof);
+ const unsigned char *f, int n, int eof);
#ifndef CHARSET_EBCDIC
-# define conv_bin2ascii(a, table) ((table)[(a)&0x3f])
+#define conv_bin2ascii(a, table) ((table)[(a) & 0x3f])
#else
/*
* We assume that PEM encoded files are EBCDIC files (i.e., printable text
@@ -30,7 +30,7 @@ static int evp_decodeblock_int(EVP_ENCODE_CTX *ctx, unsigned char *t,
* (text) format again. (No need for conversion in the conv_bin2ascii macro,
* as the underlying textstring data_bin2ascii[] is already EBCDIC)
*/
-# define conv_bin2ascii(a, table) ((table)[(a)&0x3f])
+#define conv_bin2ascii(a, table) ((table)[(a) & 0x3f])
#endif
/*-
@@ -41,17 +41,14 @@ static int evp_decodeblock_int(EVP_ENCODE_CTX *ctx, unsigned char *t,
* 2 bytes => xxx=
* 3 bytes => xxxx
*/
-#define BIN_PER_LINE (64/4*3)
-#define CHUNKS_PER_LINE (64/4)
-#define CHAR_PER_LINE (64+1)
+#define BIN_PER_LINE (64 / 4 * 3)
+#define CHUNKS_PER_LINE (64 / 4)
+#define CHAR_PER_LINE (64 + 1)
-static const unsigned char data_bin2ascii[65] =
- "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+static const unsigned char data_bin2ascii[65] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
/* SRP uses a different base64 alphabet */
-static const unsigned char srpdata_bin2ascii[65] =
- "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz./";
-
+static const unsigned char srpdata_bin2ascii[65] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz./";
/*-
* 0xF0 is a EOLN
@@ -61,50 +58,274 @@ static const unsigned char srpdata_bin2ascii[65] =
* 0xFF is error
*/
-#define B64_EOLN 0xF0
-#define B64_CR 0xF1
-#define B64_EOF 0xF2
-#define B64_WS 0xE0
-#define B64_ERROR 0xFF
-#define B64_NOT_BASE64(a) (((a)|0x13) == 0xF3)
-#define B64_BASE64(a) (!B64_NOT_BASE64(a))
+#define B64_EOLN 0xF0
+#define B64_CR 0xF1
+#define B64_EOF 0xF2
+#define B64_WS 0xE0
+#define B64_ERROR 0xFF
+#define B64_NOT_BASE64(a) (((a) | 0x13) == 0xF3)
+#define B64_BASE64(a) (!B64_NOT_BASE64(a))
static const unsigned char data_ascii2bin[128] = {
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xE0, 0xF0, 0xFF, 0xFF, 0xF1, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0x3E, 0xFF, 0xF2, 0xFF, 0x3F,
- 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B,
- 0x3C, 0x3D, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF,
- 0xFF, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06,
- 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E,
- 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16,
- 0x17, 0x18, 0x19, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20,
- 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28,
- 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30,
- 0x31, 0x32, 0x33, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xE0,
+ 0xF0,
+ 0xFF,
+ 0xFF,
+ 0xF1,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xE0,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0x3E,
+ 0xFF,
+ 0xF2,
+ 0xFF,
+ 0x3F,
+ 0x34,
+ 0x35,
+ 0x36,
+ 0x37,
+ 0x38,
+ 0x39,
+ 0x3A,
+ 0x3B,
+ 0x3C,
+ 0x3D,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0x00,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0x00,
+ 0x01,
+ 0x02,
+ 0x03,
+ 0x04,
+ 0x05,
+ 0x06,
+ 0x07,
+ 0x08,
+ 0x09,
+ 0x0A,
+ 0x0B,
+ 0x0C,
+ 0x0D,
+ 0x0E,
+ 0x0F,
+ 0x10,
+ 0x11,
+ 0x12,
+ 0x13,
+ 0x14,
+ 0x15,
+ 0x16,
+ 0x17,
+ 0x18,
+ 0x19,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0x1A,
+ 0x1B,
+ 0x1C,
+ 0x1D,
+ 0x1E,
+ 0x1F,
+ 0x20,
+ 0x21,
+ 0x22,
+ 0x23,
+ 0x24,
+ 0x25,
+ 0x26,
+ 0x27,
+ 0x28,
+ 0x29,
+ 0x2A,
+ 0x2B,
+ 0x2C,
+ 0x2D,
+ 0x2E,
+ 0x2F,
+ 0x30,
+ 0x31,
+ 0x32,
+ 0x33,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
};
static const unsigned char srpdata_ascii2bin[128] = {
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xE0, 0xF0, 0xFF, 0xFF, 0xF1, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF2, 0x3E, 0x3F,
- 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
- 0x08, 0x09, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF,
- 0xFF, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10,
- 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18,
- 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20,
- 0x21, 0x22, 0x23, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A,
- 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30, 0x31, 0x32,
- 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A,
- 0x3B, 0x3C, 0x3D, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xE0,
+ 0xF0,
+ 0xFF,
+ 0xFF,
+ 0xF1,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xE0,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xF2,
+ 0x3E,
+ 0x3F,
+ 0x00,
+ 0x01,
+ 0x02,
+ 0x03,
+ 0x04,
+ 0x05,
+ 0x06,
+ 0x07,
+ 0x08,
+ 0x09,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0x00,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0x0A,
+ 0x0B,
+ 0x0C,
+ 0x0D,
+ 0x0E,
+ 0x0F,
+ 0x10,
+ 0x11,
+ 0x12,
+ 0x13,
+ 0x14,
+ 0x15,
+ 0x16,
+ 0x17,
+ 0x18,
+ 0x19,
+ 0x1A,
+ 0x1B,
+ 0x1C,
+ 0x1D,
+ 0x1E,
+ 0x1F,
+ 0x20,
+ 0x21,
+ 0x22,
+ 0x23,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0x24,
+ 0x25,
+ 0x26,
+ 0x27,
+ 0x28,
+ 0x29,
+ 0x2A,
+ 0x2B,
+ 0x2C,
+ 0x2D,
+ 0x2E,
+ 0x2F,
+ 0x30,
+ 0x31,
+ 0x32,
+ 0x33,
+ 0x34,
+ 0x35,
+ 0x36,
+ 0x37,
+ 0x38,
+ 0x39,
+ 0x3A,
+ 0x3B,
+ 0x3C,
+ 0x3D,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
+ 0xFF,
};
#ifndef CHARSET_EBCDIC
@@ -160,7 +381,7 @@ void EVP_EncodeInit(EVP_ENCODE_CTX *ctx)
}
int EVP_EncodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl,
- const unsigned char *in, int inl)
+ const unsigned char *in, int inl)
{
int i, j;
size_t total = 0;
@@ -229,7 +450,7 @@ void EVP_EncodeFinal(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl)
}
static int evp_encodeblock_int(EVP_ENCODE_CTX *ctx, unsigned char *t,
- const unsigned char *f, int dlen)
+ const unsigned char *f, int dlen)
{
int i, ret = 0;
unsigned long l;
@@ -242,8 +463,7 @@ static int evp_encodeblock_int(EVP_ENCODE_CTX *ctx, unsigned char *t,
for (i = dlen; i > 0; i -= 3) {
if (i >= 3) {
- l = (((unsigned long)f[0]) << 16L) |
- (((unsigned long)f[1]) << 8L) | f[2];
+ l = (((unsigned long)f[0]) << 16L) | (((unsigned long)f[1]) << 8L) | f[2];
*(t++) = conv_bin2ascii(l >> 18L, table);
*(t++) = conv_bin2ascii(l >> 12L, table);
*(t++) = conv_bin2ascii(l >> 6L, table);
@@ -301,7 +521,7 @@ void EVP_DecodeInit(EVP_ENCODE_CTX *ctx)
* - B64_EOF is detected after an incomplete base64 block.
*/
int EVP_DecodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl,
- const unsigned char *in, int inl)
+ const unsigned char *in, int inl)
{
int seof = 0, eof = 0, rv = -1, ret = 0, i, v, tmp, n, decoded_len;
unsigned char *d;
@@ -316,7 +536,7 @@ int EVP_DecodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl,
eof++;
}
- /* Legacy behaviour: an empty input chunk signals end of input. */
+ /* Legacy behaviour: an empty input chunk signals end of input. */
if (inl == 0) {
rv = 0;
goto end;
@@ -411,8 +631,8 @@ end:
}
static int evp_decodeblock_int(EVP_ENCODE_CTX *ctx, unsigned char *t,
- const unsigned char *f, int n,
- int eof)
+ const unsigned char *f, int n,
+ int eof)
{
int i, ret = 0, a, b, c, d;
unsigned long l;
@@ -452,9 +672,7 @@ static int evp_decodeblock_int(EVP_ENCODE_CTX *ctx, unsigned char *t,
d = conv_ascii2bin(*(f++), table);
if ((a | b | c | d) & 0x80)
return -1;
- l = ((((unsigned long)a) << 18L) |
- (((unsigned long)b) << 12L) |
- (((unsigned long)c) << 6L) | (((unsigned long)d)));
+ l = ((((unsigned long)a) << 18L) | (((unsigned long)b) << 12L) | (((unsigned long)c) << 6L) | (((unsigned long)d)));
*(t++) = (unsigned char)(l >> 16L) & 0xff;
*(t++) = (unsigned char)(l >> 8L) & 0xff;
*(t++) = (unsigned char)(l) & 0xff;
@@ -468,9 +686,7 @@ static int evp_decodeblock_int(EVP_ENCODE_CTX *ctx, unsigned char *t,
d = conv_ascii2bin(*(f++), table);
if ((a | b | c | d) & 0x80)
return -1;
- l = ((((unsigned long)a) << 18L) |
- (((unsigned long)b) << 12L) |
- (((unsigned long)c) << 6L) | (((unsigned long)d)));
+ l = ((((unsigned long)a) << 18L) | (((unsigned long)b) << 12L) | (((unsigned long)c) << 6L) | (((unsigned long)d)));
if (eof == -1)
eof = (f[2] == '=') + (f[3] == '=');
diff --git a/crypto/evp/evp_cnf.c b/crypto/evp/evp_cnf.c
index 0e7fe64cf9..184bab933c 100644
--- a/crypto/evp/evp_cnf.c
+++ b/crypto/evp/evp_cnf.c
@@ -26,7 +26,7 @@ static int alg_module_init(CONF_IMODULE *md, const CONF *cnf)
CONF_VALUE *oval;
OSSL_TRACE2(CONF, "Loading EVP module: name %s, value %s\n",
- CONF_imodule_get_name(md), CONF_imodule_get_value(md));
+ CONF_imodule_get_name(md), CONF_imodule_get_value(md));
oid_section = CONF_imodule_get_value(md);
if ((sktmp = NCONF_get_section(cnf, oid_section)) == NULL) {
@@ -53,16 +53,15 @@ static int alg_module_init(CONF_IMODULE *md, const CONF *cnf)
}
} else if (strcmp(oval->name, "default_properties") == 0) {
if (!evp_set_default_properties_int(NCONF_get0_libctx((CONF *)cnf),
- oval->value, 0, 0)) {
+ oval->value, 0, 0)) {
ERR_raise(ERR_LIB_EVP, EVP_R_SET_DEFAULT_PROPERTY_FAILURE);
return 0;
}
} else {
ERR_raise_data(ERR_LIB_EVP, EVP_R_UNKNOWN_OPTION,
- "name=%s, value=%s", oval->name, oval->value);
+ "name=%s, value=%s", oval->name, oval->value);
return 0;
}
-
}
return 1;
}
diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c
index 92bf546327..7716a1dbf2 100644
--- a/crypto/evp/evp_enc.c
+++ b/crypto/evp/evp_enc.c
@@ -46,7 +46,7 @@ int EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *ctx)
return 1;
/* Remove legacy code below when legacy support is removed. */
- legacy:
+legacy:
if (ctx->cipher != NULL) {
if (ctx->cipher->cleanup && !ctx->cipher->cleanup(ctx))
@@ -82,11 +82,11 @@ void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *ctx)
}
static int evp_cipher_init_internal(EVP_CIPHER_CTX *ctx,
- const EVP_CIPHER *cipher,
- const unsigned char *key,
- const unsigned char *iv, int enc,
- uint8_t is_pipeline,
- const OSSL_PARAM params[])
+ const EVP_CIPHER *cipher,
+ const unsigned char *key,
+ const unsigned char *iv, int enc,
+ uint8_t is_pipeline,
+ const OSSL_PARAM params[])
{
int n;
@@ -116,8 +116,8 @@ static int evp_cipher_init_internal(EVP_CIPHER_CTX *ctx,
* If there are engines involved then we should use legacy handling for now.
*/
if ((cipher != NULL && cipher->origin == EVP_ORIG_METH)
- || (cipher == NULL && ctx->cipher != NULL
- && ctx->cipher->origin == EVP_ORIG_METH)) {
+ || (cipher == NULL && ctx->cipher != NULL
+ && ctx->cipher->origin == EVP_ORIG_METH)) {
if (ctx->cipher == ctx->fetched_cipher)
ctx->cipher = NULL;
EVP_CIPHER_free(ctx->fetched_cipher);
@@ -156,11 +156,10 @@ nonlegacy:
ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
return 0;
#else
- EVP_CIPHER *provciph =
- EVP_CIPHER_fetch(NULL,
- cipher->nid == NID_undef ? "NULL"
- : OBJ_nid2sn(cipher->nid),
- "");
+ EVP_CIPHER *provciph = EVP_CIPHER_fetch(NULL,
+ cipher->nid == NID_undef ? "NULL"
+ : OBJ_nid2sn(cipher->nid),
+ "");
if (provciph == NULL)
return 0;
@@ -220,7 +219,7 @@ nonlegacy:
*/
if (params != NULL) {
OSSL_PARAM param_lens[3] = { OSSL_PARAM_END, OSSL_PARAM_END,
- OSSL_PARAM_END };
+ OSSL_PARAM_END };
OSSL_PARAM *q = param_lens;
const OSSL_PARAM *p;
@@ -256,23 +255,23 @@ nonlegacy:
*/
if (key == NULL && ctx->cipher->einit_skey != NULL) {
return ctx->cipher->einit_skey(ctx->algctx, NULL,
- iv,
- iv == NULL ? 0
- : EVP_CIPHER_CTX_get_iv_length(ctx),
- params);
+ iv,
+ iv == NULL ? 0
+ : EVP_CIPHER_CTX_get_iv_length(ctx),
+ params);
}
ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
return 0;
}
return ctx->cipher->einit(ctx->algctx,
- key,
- key == NULL ? 0
- : EVP_CIPHER_CTX_get_key_length(ctx),
- iv,
- iv == NULL ? 0
- : EVP_CIPHER_CTX_get_iv_length(ctx),
- params);
+ key,
+ key == NULL ? 0
+ : EVP_CIPHER_CTX_get_key_length(ctx),
+ iv,
+ iv == NULL ? 0
+ : EVP_CIPHER_CTX_get_iv_length(ctx),
+ params);
}
if (ctx->cipher->dinit == NULL) {
@@ -282,26 +281,26 @@ nonlegacy:
*/
if (key == NULL && ctx->cipher->dinit_skey != NULL) {
return ctx->cipher->dinit_skey(ctx->algctx, NULL,
- iv,
- iv == NULL ? 0
- : EVP_CIPHER_CTX_get_iv_length(ctx),
- params);
+ iv,
+ iv == NULL ? 0
+ : EVP_CIPHER_CTX_get_iv_length(ctx),
+ params);
}
ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
return 0;
}
return ctx->cipher->dinit(ctx->algctx,
- key,
- key == NULL ? 0
- : EVP_CIPHER_CTX_get_key_length(ctx),
- iv,
- iv == NULL ? 0
- : EVP_CIPHER_CTX_get_iv_length(ctx),
- params);
+ key,
+ key == NULL ? 0
+ : EVP_CIPHER_CTX_get_key_length(ctx),
+ iv,
+ iv == NULL ? 0
+ : EVP_CIPHER_CTX_get_iv_length(ctx),
+ params);
/* Code below to be removed when legacy support is dropped. */
- legacy:
+legacy:
if (cipher != NULL) {
/*
@@ -343,8 +342,8 @@ nonlegacy:
/* we assume block size is a power of 2 in *cryptUpdate */
OPENSSL_assert(ctx->cipher->block_size == 1
- || ctx->cipher->block_size == 8
- || ctx->cipher->block_size == 16);
+ || ctx->cipher->block_size == 8
+ || ctx->cipher->block_size == 16);
if (!(ctx->flags & EVP_CIPHER_CTX_FLAG_WRAP_ALLOW)
&& EVP_CIPHER_CTX_get_mode(ctx) == EVP_CIPH_WRAP_MODE) {
@@ -353,7 +352,8 @@ nonlegacy:
}
if ((EVP_CIPHER_get_flags(EVP_CIPHER_CTX_get0_cipher(ctx))
- & EVP_CIPH_CUSTOM_IV) == 0) {
+ & EVP_CIPH_CUSTOM_IV)
+ == 0) {
switch (EVP_CIPHER_CTX_get_mode(ctx)) {
case EVP_CIPH_STREAM_CIPHER:
@@ -410,10 +410,10 @@ nonlegacy:
* They should be combined when engines are not supported any longer.
*/
static int evp_cipher_init_skey_internal(EVP_CIPHER_CTX *ctx,
- const EVP_CIPHER *cipher,
- const EVP_SKEY *skey,
- const unsigned char *iv, size_t iv_len,
- int enc, const OSSL_PARAM params[])
+ const EVP_CIPHER *cipher,
+ const EVP_SKEY *skey,
+ const unsigned char *iv, size_t iv_len,
+ int enc, const OSSL_PARAM params[])
{
int ret;
@@ -436,8 +436,8 @@ static int evp_cipher_init_skey_internal(EVP_CIPHER_CTX *ctx,
* If there are engines involved then we throw an error
*/
if ((cipher != NULL && cipher->origin == EVP_ORIG_METH)
- || (cipher == NULL && ctx->cipher != NULL
- && ctx->cipher->origin == EVP_ORIG_METH)) {
+ || (cipher == NULL && ctx->cipher != NULL
+ && ctx->cipher->origin == EVP_ORIG_METH)) {
ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
return 0;
}
@@ -522,11 +522,11 @@ static int evp_cipher_init_skey_internal(EVP_CIPHER_CTX *ctx,
}
ret = ctx->cipher->einit(ctx->algctx, keydata, keylen,
- iv, iv_len, params);
+ iv, iv_len, params);
} else {
ret = ctx->cipher->einit_skey(ctx->algctx,
- skey == NULL ? NULL : skey->keydata,
- iv, iv_len, params);
+ skey == NULL ? NULL : skey->keydata,
+ iv, iv_len, params);
}
} else {
if (ctx->cipher->dinit_skey == NULL) {
@@ -543,11 +543,11 @@ static int evp_cipher_init_skey_internal(EVP_CIPHER_CTX *ctx,
}
ret = ctx->cipher->dinit(ctx->algctx, keydata, keylen,
- iv, iv_len, params);
+ iv, iv_len, params);
} else {
ret = ctx->cipher->dinit_skey(ctx->algctx,
- skey == NULL ? NULL : skey->keydata,
- iv, iv_len, params);
+ skey == NULL ? NULL : skey->keydata,
+ iv, iv_len, params);
}
}
@@ -555,21 +555,21 @@ static int evp_cipher_init_skey_internal(EVP_CIPHER_CTX *ctx,
}
int EVP_CipherInit_SKEY(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
- EVP_SKEY *skey, const unsigned char *iv, size_t iv_len,
- int enc, const OSSL_PARAM params[])
+ EVP_SKEY *skey, const unsigned char *iv, size_t iv_len,
+ int enc, const OSSL_PARAM params[])
{
return evp_cipher_init_skey_internal(ctx, cipher, skey, iv, iv_len, enc, params);
}
int EVP_CipherInit_ex2(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
- const unsigned char *key, const unsigned char *iv,
- int enc, const OSSL_PARAM params[])
+ const unsigned char *key, const unsigned char *iv,
+ int enc, const OSSL_PARAM params[])
{
return evp_cipher_init_internal(ctx, cipher, key, iv, enc, 0, params);
}
int EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
- const unsigned char *key, const unsigned char *iv, int enc)
+ const unsigned char *key, const unsigned char *iv, int enc)
{
if (cipher != NULL)
EVP_CIPHER_CTX_reset(ctx);
@@ -577,8 +577,8 @@ int EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
}
int EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
- ENGINE *impl, const unsigned char *key,
- const unsigned char *iv, int enc)
+ ENGINE *impl, const unsigned char *key,
+ const unsigned char *iv, int enc)
{
if (!ossl_assert(impl == NULL))
return 0;
@@ -586,9 +586,9 @@ int EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
}
int EVP_CipherPipelineEncryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
- const unsigned char *key, size_t keylen,
- size_t numpipes,
- const unsigned char **iv, size_t ivlen)
+ const unsigned char *key, size_t keylen,
+ size_t numpipes,
+ const unsigned char **iv, size_t ivlen)
{
if (numpipes > EVP_MAX_PIPES) {
ERR_raise(ERR_LIB_EVP, EVP_R_TOO_MANY_PIPES);
@@ -598,7 +598,7 @@ int EVP_CipherPipelineEncryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
ctx->numpipes = numpipes;
if (!evp_cipher_init_internal(ctx, cipher, NULL, NULL, 1, 1,
- NULL))
+ NULL))
return 0;
if (ctx->cipher->p_einit == NULL) {
@@ -607,18 +607,18 @@ int EVP_CipherPipelineEncryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
}
return ctx->cipher->p_einit(ctx->algctx,
- key,
- keylen,
- numpipes,
- iv,
- ivlen,
- NULL);
+ key,
+ keylen,
+ numpipes,
+ iv,
+ ivlen,
+ NULL);
}
int EVP_CipherPipelineDecryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
- const unsigned char *key, size_t keylen,
- size_t numpipes,
- const unsigned char **iv, size_t ivlen)
+ const unsigned char *key, size_t keylen,
+ size_t numpipes,
+ const unsigned char **iv, size_t ivlen)
{
if (numpipes > EVP_MAX_PIPES) {
ERR_raise(ERR_LIB_EVP, EVP_R_TOO_MANY_PIPES);
@@ -628,7 +628,7 @@ int EVP_CipherPipelineDecryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
ctx->numpipes = numpipes;
if (!evp_cipher_init_internal(ctx, cipher, NULL, NULL, 0, 1,
- NULL))
+ NULL))
return 0;
if (ctx->cipher->p_dinit == NULL) {
@@ -637,16 +637,16 @@ int EVP_CipherPipelineDecryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
}
return ctx->cipher->p_dinit(ctx->algctx,
- key,
- keylen,
- numpipes,
- iv,
- ivlen,
- NULL);
+ key,
+ keylen,
+ numpipes,
+ iv,
+ ivlen,
+ NULL);
}
int EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
- const unsigned char *in, int inl)
+ const unsigned char *in, int inl)
{
if (ctx->encrypt)
return EVP_EncryptUpdate(ctx, out, outl, in, inl);
@@ -655,9 +655,9 @@ int EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
}
int EVP_CipherPipelineUpdate(EVP_CIPHER_CTX *ctx,
- unsigned char **out, size_t *outl,
- const size_t *outsize,
- const unsigned char **in, const size_t *inl)
+ unsigned char **out, size_t *outl,
+ const size_t *outsize,
+ const unsigned char **in, const size_t *inl)
{
size_t i;
@@ -685,8 +685,8 @@ int EVP_CipherPipelineUpdate(EVP_CIPHER_CTX *ctx,
outl[i] = 0;
return ctx->cipher->p_cupdate(ctx->algctx, ctx->numpipes,
- out, outl, outsize,
- in, inl);
+ out, outl, outsize,
+ in, inl);
}
int EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
@@ -706,8 +706,8 @@ int EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
}
int EVP_CipherPipelineFinal(EVP_CIPHER_CTX *ctx,
- unsigned char **out, size_t *outl,
- const size_t *outsize)
+ unsigned char **out, size_t *outl,
+ const size_t *outsize)
{
size_t i;
@@ -735,18 +735,18 @@ int EVP_CipherPipelineFinal(EVP_CIPHER_CTX *ctx,
outl[i] = 0;
return ctx->cipher->p_cfinal(ctx->algctx, ctx->numpipes,
- out, outl, outsize);
+ out, outl, outsize);
}
int EVP_EncryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
- const unsigned char *key, const unsigned char *iv)
+ const unsigned char *key, const unsigned char *iv)
{
return EVP_CipherInit(ctx, cipher, key, iv, 1);
}
int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
- ENGINE *impl, const unsigned char *key,
- const unsigned char *iv)
+ ENGINE *impl, const unsigned char *key,
+ const unsigned char *iv)
{
if (!ossl_assert(impl == NULL))
return 0;
@@ -754,21 +754,21 @@ int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
}
int EVP_EncryptInit_ex2(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
- const unsigned char *key, const unsigned char *iv,
- const OSSL_PARAM params[])
+ const unsigned char *key, const unsigned char *iv,
+ const OSSL_PARAM params[])
{
return EVP_CipherInit_ex2(ctx, cipher, key, iv, 1, params);
}
int EVP_DecryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
- const unsigned char *key, const unsigned char *iv)
+ const unsigned char *key, const unsigned char *iv)
{
return EVP_CipherInit(ctx, cipher, key, iv, 0);
}
int EVP_DecryptInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
- ENGINE *impl, const unsigned char *key,
- const unsigned char *iv)
+ ENGINE *impl, const unsigned char *key,
+ const unsigned char *iv)
{
if (!ossl_assert(impl == NULL))
return 0;
@@ -776,8 +776,8 @@ int EVP_DecryptInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
}
int EVP_DecryptInit_ex2(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
- const unsigned char *key, const unsigned char *iv,
- const OSSL_PARAM params[])
+ const unsigned char *key, const unsigned char *iv,
+ const OSSL_PARAM params[])
{
return EVP_CipherInit_ex2(ctx, cipher, key, iv, 0, params);
}
@@ -789,9 +789,9 @@ int EVP_DecryptInit_ex2(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
* are not partially overlapping with standard pointer arithmetic.
*/
#ifdef PTRDIFF_T
-# undef PTRDIFF_T
+#undef PTRDIFF_T
#endif
-#if defined(OPENSSL_SYS_VMS) && __INITIAL_POINTER_SIZE==64
+#if defined(OPENSSL_SYS_VMS) && __INITIAL_POINTER_SIZE == 64
/*
* Then we have VMS that distinguishes itself by adhering to
* sizeof(size_t)==4 even in 64-bit builds, which means that
@@ -800,28 +800,27 @@ int EVP_DecryptInit_ex2(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
* equality is implemented. To be on the safe side we adhere to
* PTRDIFF_T even for comparison for equality.
*/
-# define PTRDIFF_T uint64_t
+#define PTRDIFF_T uint64_t
#else
-# define PTRDIFF_T size_t
+#define PTRDIFF_T size_t
#endif
int ossl_is_partially_overlapping(const void *ptr1, const void *ptr2, int len)
{
- PTRDIFF_T diff = (PTRDIFF_T)ptr1-(PTRDIFF_T)ptr2;
+ PTRDIFF_T diff = (PTRDIFF_T)ptr1 - (PTRDIFF_T)ptr2;
/*
* Check for partially overlapping buffers. [Binary logical
* operations are used instead of boolean to minimize number
* of conditional branches.]
*/
- int overlapped = (len > 0) & (diff != 0) & ((diff < (PTRDIFF_T)len) |
- (diff > (0 - (PTRDIFF_T)len)));
+ int overlapped = (len > 0) & (diff != 0) & ((diff < (PTRDIFF_T)len) | (diff > (0 - (PTRDIFF_T)len)));
return overlapped;
}
static int evp_EncryptDecryptUpdate(EVP_CIPHER_CTX *ctx,
- unsigned char *out, int *outl,
- const unsigned char *in, int inl)
+ unsigned char *out, int *outl,
+ const unsigned char *in, int inl)
{
int i, j, bl, cmpl = inl;
@@ -909,9 +908,8 @@ static int evp_EncryptDecryptUpdate(EVP_CIPHER_CTX *ctx,
return 1;
}
-
int EVP_EncryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
- const unsigned char *in, int inl)
+ const unsigned char *in, int inl)
{
int ret;
size_t soutl, inl_ = (size_t)inl;
@@ -946,8 +944,8 @@ int EVP_EncryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
}
ret = ctx->cipher->cupdate(ctx->algctx, out, &soutl,
- inl_ + (size_t)(blocksize == 1 ? 0 : blocksize),
- in, inl_);
+ inl_ + (size_t)(blocksize == 1 ? 0 : blocksize),
+ in, inl_);
if (ossl_likely(ret)) {
if (ossl_unlikely(soutl > INT_MAX)) {
@@ -960,7 +958,7 @@ int EVP_EncryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
return ret;
/* Code below to be removed when legacy support is dropped. */
- legacy:
+legacy:
return evp_EncryptDecryptUpdate(ctx, out, outl, in, inl);
}
@@ -1007,7 +1005,7 @@ int EVP_EncryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
}
ret = ctx->cipher->cfinal(ctx->algctx, out, &soutl,
- blocksize == 1 ? 0 : blocksize);
+ blocksize == 1 ? 0 : blocksize);
if (ret) {
if (soutl > INT_MAX) {
@@ -1020,7 +1018,7 @@ int EVP_EncryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
return ret;
/* Code below to be removed when legacy support is dropped. */
- legacy:
+legacy:
if (ctx->cipher->flags & EVP_CIPH_FLAG_CUSTOM_CIPHER) {
ret = ctx->cipher->do_cipher(ctx, out, NULL, 0);
@@ -1059,7 +1057,7 @@ int EVP_EncryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
}
int EVP_DecryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
- const unsigned char *in, int inl)
+ const unsigned char *in, int inl)
{
int fix_len, cmpl = inl, ret;
unsigned int b;
@@ -1093,8 +1091,8 @@ int EVP_DecryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
return 0;
}
ret = ctx->cipher->cupdate(ctx->algctx, out, &soutl,
- inl_ + (size_t)(blocksize == 1 ? 0 : blocksize),
- in, inl_);
+ inl_ + (size_t)(blocksize == 1 ? 0 : blocksize),
+ in, inl_);
if (ossl_likely(ret)) {
if (ossl_unlikely(soutl > INT_MAX)) {
@@ -1107,7 +1105,7 @@ int EVP_DecryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
return ret;
/* Code below to be removed when legacy support is dropped. */
- legacy:
+legacy:
b = ctx->cipher->block_size;
@@ -1229,7 +1227,7 @@ int EVP_DecryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
}
ret = ctx->cipher->cfinal(ctx->algctx, out, &soutl,
- blocksize == 1 ? 0 : blocksize);
+ blocksize == 1 ? 0 : blocksize);
if (ret) {
if (soutl > INT_MAX) {
@@ -1242,7 +1240,7 @@ int EVP_DecryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
return ret;
/* Code below to be removed when legacy support is dropped. */
- legacy:
+legacy:
*outl = 0;
if (ctx->cipher->flags & EVP_CIPH_FLAG_CUSTOM_CIPHER) {
@@ -1305,7 +1303,8 @@ int EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *c, int keylen)
/* Check the cipher actually understands this parameter */
if (OSSL_PARAM_locate_const(EVP_CIPHER_settable_ctx_params(c->cipher),
- OSSL_CIPHER_PARAM_KEYLEN) == NULL) {
+ OSSL_CIPHER_PARAM_KEYLEN)
+ == NULL) {
ERR_raise(ERR_LIB_EVP, EVP_R_INVALID_KEY_LENGTH);
return 0;
}
@@ -1385,11 +1384,10 @@ int EVP_CIPHER_CTX_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr)
params[0] = OSSL_PARAM_construct_size_t(OSSL_CIPHER_PARAM_KEYLEN, &sz);
ctx->key_len = -1;
break;
- case EVP_CTRL_RAND_KEY: /* Used by DES */
+ case EVP_CTRL_RAND_KEY: /* Used by DES */
set_params = 0;
- params[0] =
- OSSL_PARAM_construct_octet_string(OSSL_CIPHER_PARAM_RANDOM_KEY,
- ptr, sz);
+ params[0] = OSSL_PARAM_construct_octet_string(OSSL_CIPHER_PARAM_RANDOM_KEY,
+ ptr, sz);
break;
case EVP_CTRL_INIT:
@@ -1422,20 +1420,20 @@ int EVP_CIPHER_CTX_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr)
break;
case EVP_CTRL_AEAD_SET_IV_FIXED:
params[0] = OSSL_PARAM_construct_octet_string(
- OSSL_CIPHER_PARAM_AEAD_TLS1_IV_FIXED, ptr, sz);
+ OSSL_CIPHER_PARAM_AEAD_TLS1_IV_FIXED, ptr, sz);
break;
case EVP_CTRL_GCM_IV_GEN:
set_params = 0;
if (arg < 0)
sz = 0; /* special case that uses the iv length */
params[0] = OSSL_PARAM_construct_octet_string(
- OSSL_CIPHER_PARAM_AEAD_TLS1_GET_IV_GEN, ptr, sz);
+ OSSL_CIPHER_PARAM_AEAD_TLS1_GET_IV_GEN, ptr, sz);
break;
case EVP_CTRL_GCM_SET_IV_INV:
if (arg < 0)
return 0;
params[0] = OSSL_PARAM_construct_octet_string(
- OSSL_CIPHER_PARAM_AEAD_TLS1_SET_IV_INV, ptr, sz);
+ OSSL_CIPHER_PARAM_AEAD_TLS1_SET_IV_INV, ptr, sz);
break;
case EVP_CTRL_GET_RC5_ROUNDS:
set_params = 0; /* Fall thru */
@@ -1455,18 +1453,16 @@ int EVP_CIPHER_CTX_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr)
set_params = 0; /* Fall thru */
case EVP_CTRL_AEAD_SET_TAG:
params[0] = OSSL_PARAM_construct_octet_string(OSSL_CIPHER_PARAM_AEAD_TAG,
- ptr, sz);
+ ptr, sz);
break;
case EVP_CTRL_AEAD_TLS1_AAD:
/* This one does a set and a get - since it returns a size */
- params[0] =
- OSSL_PARAM_construct_octet_string(OSSL_CIPHER_PARAM_AEAD_TLS1_AAD,
- ptr, sz);
+ params[0] = OSSL_PARAM_construct_octet_string(OSSL_CIPHER_PARAM_AEAD_TLS1_AAD,
+ ptr, sz);
ret = evp_do_ciph_ctx_setparams(ctx->cipher, ctx->algctx, params);
if (ret <= 0)
goto end;
- params[0] =
- OSSL_PARAM_construct_size_t(OSSL_CIPHER_PARAM_AEAD_TLS1_AAD_PAD, &sz);
+ params[0] = OSSL_PARAM_construct_size_t(OSSL_CIPHER_PARAM_AEAD_TLS1_AAD_PAD, &sz);
ret = evp_do_ciph_ctx_getparams(ctx->cipher, ctx->algctx, params);
if (ret <= 0)
goto end;
@@ -1483,37 +1479,36 @@ int EVP_CIPHER_CTX_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr)
#if !defined(OPENSSL_NO_MULTIBLOCK)
case EVP_CTRL_TLS1_1_MULTIBLOCK_MAX_BUFSIZE:
params[0] = OSSL_PARAM_construct_size_t(
- OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_MAX_SEND_FRAGMENT, &sz);
+ OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_MAX_SEND_FRAGMENT, &sz);
ret = evp_do_ciph_ctx_setparams(ctx->cipher, ctx->algctx, params);
if (ret <= 0)
return 0;
params[0] = OSSL_PARAM_construct_size_t(
- OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_MAX_BUFSIZE, &sz);
+ OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_MAX_BUFSIZE, &sz);
params[1] = OSSL_PARAM_construct_end();
ret = evp_do_ciph_ctx_getparams(ctx->cipher, ctx->algctx, params);
if (ret <= 0 || sz > INT_MAX)
return 0;
return (int)sz;
case EVP_CTRL_TLS1_1_MULTIBLOCK_AAD: {
- EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *p =
- (EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *)ptr;
+ EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *p = (EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *)ptr;
if (arg < (int)sizeof(EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM))
return 0;
params[0] = OSSL_PARAM_construct_octet_string(
- OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_AAD, (void*)p->inp, p->len);
+ OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_AAD, (void *)p->inp, p->len);
params[1] = OSSL_PARAM_construct_uint(
- OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_INTERLEAVE, &p->interleave);
+ OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_INTERLEAVE, &p->interleave);
ret = evp_do_ciph_ctx_setparams(ctx->cipher, ctx->algctx, params);
if (ret <= 0)
return ret;
/* Retrieve the return values changed by the set */
params[0] = OSSL_PARAM_construct_size_t(
- OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_AAD_PACKLEN, &sz);
+ OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_AAD_PACKLEN, &sz);
params[1] = OSSL_PARAM_construct_uint(
- OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_INTERLEAVE, &p->interleave);
+ OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_INTERLEAVE, &p->interleave);
params[2] = OSSL_PARAM_construct_end();
ret = evp_do_ciph_ctx_getparams(ctx->cipher, ctx->algctx, params);
if (ret <= 0 || sz > INT_MAX)
@@ -1521,22 +1516,21 @@ int EVP_CIPHER_CTX_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr)
return (int)sz;
}
case EVP_CTRL_TLS1_1_MULTIBLOCK_ENCRYPT: {
- EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *p =
- (EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *)ptr;
+ EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *p = (EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *)ptr;
params[0] = OSSL_PARAM_construct_octet_string(
- OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_ENC, p->out, p->len);
+ OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_ENC, p->out, p->len);
params[1] = OSSL_PARAM_construct_octet_string(
- OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_ENC_IN, (void*)p->inp,
- p->len);
+ OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_ENC_IN, (void *)p->inp,
+ p->len);
params[2] = OSSL_PARAM_construct_uint(
- OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_INTERLEAVE, &p->interleave);
+ OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_INTERLEAVE, &p->interleave);
ret = evp_do_ciph_ctx_setparams(ctx->cipher, ctx->algctx, params);
if (ret <= 0)
return ret;
params[0] = OSSL_PARAM_construct_size_t(
- OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_ENC_LEN, &sz);
+ OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_ENC_LEN, &sz);
params[1] = OSSL_PARAM_construct_end();
ret = evp_do_ciph_ctx_getparams(ctx->cipher, ctx->algctx, params);
if (ret <= 0 || sz > INT_MAX)
@@ -1548,7 +1542,7 @@ int EVP_CIPHER_CTX_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr)
if (arg < 0)
return -1;
params[0] = OSSL_PARAM_construct_octet_string(
- OSSL_CIPHER_PARAM_AEAD_MAC_KEY, ptr, sz);
+ OSSL_CIPHER_PARAM_AEAD_MAC_KEY, ptr, sz);
break;
}
@@ -1567,7 +1561,7 @@ legacy:
ret = ctx->cipher->ctrl(ctx, type, arg, ptr);
- end:
+end:
if (ret == EVP_CTRL_RET_UNSUPPORTED) {
ERR_raise(ERR_LIB_EVP, EVP_R_CTRL_OPERATION_NOT_IMPLEMENTED);
return 0;
@@ -1618,7 +1612,7 @@ const OSSL_PARAM *EVP_CIPHER_gettable_params(const EVP_CIPHER *cipher)
{
if (cipher != NULL && cipher->gettable_params != NULL)
return cipher->gettable_params(
- ossl_provider_ctx(EVP_CIPHER_get0_provider(cipher)));
+ ossl_provider_ctx(EVP_CIPHER_get0_provider(cipher)));
return NULL;
}
@@ -1745,7 +1739,7 @@ int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, const EVP_CIPHER_CTX *in)
return 1;
/* Code below to be removed when legacy support is dropped. */
- legacy:
+legacy:
EVP_CIPHER_CTX_reset(out);
memcpy(out, in, sizeof(*out));
@@ -1797,7 +1791,7 @@ static void set_legacy_nid(const char *name, void *vlegacy_nid)
*/
const void *legacy_method = OBJ_NAME_get(name, OBJ_NAME_TYPE_CIPHER_METH);
- if (*legacy_nid == -1) /* We found a clash already */
+ if (*legacy_nid == -1) /* We found a clash already */
return;
if (legacy_method == NULL)
return;
@@ -1811,8 +1805,8 @@ static void set_legacy_nid(const char *name, void *vlegacy_nid)
#endif
static void *evp_cipher_from_algorithm(const int name_id,
- const OSSL_ALGORITHM *algodef,
- OSSL_PROVIDER *prov)
+ const OSSL_ALGORITHM *algodef,
+ OSSL_PROVIDER *prov)
{
const OSSL_DISPATCH *fns = algodef->implementation;
EVP_CIPHER *cipher = NULL;
@@ -1826,7 +1820,7 @@ static void *evp_cipher_from_algorithm(const int name_id,
#ifndef FIPS_MODULE
cipher->nid = NID_undef;
if (!evp_names_do_all(prov, name_id, set_legacy_nid, &cipher->nid)
- || cipher->nid == -1) {
+ || cipher->nid == -1) {
ERR_raise(ERR_LIB_EVP, ERR_R_INTERNAL_ERROR);
goto err;
}
@@ -1945,23 +1939,20 @@ static void *evp_cipher_from_algorithm(const int name_id,
case OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS:
if (cipher->gettable_ctx_params != NULL)
break;
- cipher->gettable_ctx_params =
- OSSL_FUNC_cipher_gettable_ctx_params(fns);
+ cipher->gettable_ctx_params = OSSL_FUNC_cipher_gettable_ctx_params(fns);
break;
case OSSL_FUNC_CIPHER_SETTABLE_CTX_PARAMS:
if (cipher->settable_ctx_params != NULL)
break;
- cipher->settable_ctx_params =
- OSSL_FUNC_cipher_settable_ctx_params(fns);
+ cipher->settable_ctx_params = OSSL_FUNC_cipher_settable_ctx_params(fns);
break;
}
}
fnciphcnt += encinit + decinit;
if ((fnciphcnt != 0 && fnciphcnt != 3 && fnciphcnt != 4)
- || (fnciphcnt == 0 && cipher->ccipher == NULL && fnpipecnt == 0)
- || (fnpipecnt != 0 && (fnpipecnt < 3 || cipher->p_cupdate == NULL
- || cipher->p_cfinal == NULL))
- || fnctxcnt != 2) {
+ || (fnciphcnt == 0 && cipher->ccipher == NULL && fnpipecnt == 0)
+ || (fnpipecnt != 0 && (fnpipecnt < 3 || cipher->p_cupdate == NULL || cipher->p_cfinal == NULL))
+ || fnctxcnt != 2) {
/*
* In order to be a consistent set of functions we must have at least
* a complete set of "encrypt" functions, or a complete set of "decrypt"
@@ -1999,25 +1990,24 @@ static void evp_cipher_free(void *cipher)
}
EVP_CIPHER *EVP_CIPHER_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
- const char *properties)
+ const char *properties)
{
- EVP_CIPHER *cipher =
- evp_generic_fetch(ctx, OSSL_OP_CIPHER, algorithm, properties,
- evp_cipher_from_algorithm, evp_cipher_up_ref,
- evp_cipher_free);
+ EVP_CIPHER *cipher = evp_generic_fetch(ctx, OSSL_OP_CIPHER, algorithm, properties,
+ evp_cipher_from_algorithm, evp_cipher_up_ref,
+ evp_cipher_free);
return cipher;
}
EVP_CIPHER *evp_cipher_fetch_from_prov(OSSL_PROVIDER *prov,
- const char *algorithm,
- const char *properties)
+ const char *algorithm,
+ const char *properties)
{
return evp_generic_fetch_from_prov(prov, OSSL_OP_CIPHER,
- algorithm, properties,
- evp_cipher_from_algorithm,
- evp_cipher_up_ref,
- evp_cipher_free);
+ algorithm, properties,
+ evp_cipher_from_algorithm,
+ evp_cipher_up_ref,
+ evp_cipher_free);
}
int EVP_CIPHER_can_pipeline(const EVP_CIPHER *cipher, int enc)
@@ -2060,11 +2050,11 @@ void EVP_CIPHER_free(EVP_CIPHER *cipher)
}
void EVP_CIPHER_do_all_provided(OSSL_LIB_CTX *libctx,
- void (*fn)(EVP_CIPHER *mac, void *arg),
- void *arg)
+ void (*fn)(EVP_CIPHER *mac, void *arg),
+ void *arg)
{
evp_generic_do_all(libctx, OSSL_OP_CIPHER,
- (void (*)(void *, void *))fn, arg,
- evp_cipher_from_algorithm, evp_cipher_up_ref,
- evp_cipher_free);
+ (void (*)(void *, void *))fn, arg,
+ evp_cipher_from_algorithm, evp_cipher_up_ref,
+ evp_cipher_free);
}
diff --git a/crypto/evp/evp_err.c b/crypto/evp/evp_err.c
index 0511a124b8..5672e7293f 100644
--- a/crypto/evp/evp_err.c
+++ b/crypto/evp/evp_err.c
@@ -15,212 +15,212 @@
#ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA EVP_str_reasons[] = {
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_AES_KEY_SETUP_FAILED),
- "aes key setup failed"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_ARIA_KEY_SETUP_FAILED),
- "aria key setup failed"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_BAD_ALGORITHM_NAME), "bad algorithm name"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_BAD_DECRYPT), "bad decrypt"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_BAD_KEY_LENGTH), "bad key length"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_BUFFER_TOO_SMALL), "buffer too small"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_CACHE_CONSTANTS_FAILED),
- "cache constants failed"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_CAMELLIA_KEY_SETUP_FAILED),
- "camellia key setup failed"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_CANNOT_GET_PARAMETERS),
- "cannot get parameters"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_CANNOT_SET_PARAMETERS),
- "cannot set parameters"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_CIPHER_NOT_GCM_MODE),
- "cipher not gcm mode"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_CIPHER_PARAMETER_ERROR),
- "cipher parameter error"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_COMMAND_NOT_SUPPORTED),
- "command not supported"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_CONFLICTING_ALGORITHM_NAME),
- "conflicting algorithm name"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_COPY_ERROR), "copy error"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_CTRL_NOT_IMPLEMENTED),
- "ctrl not implemented"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_CTRL_OPERATION_NOT_IMPLEMENTED),
- "ctrl operation not implemented"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_DATA_NOT_MULTIPLE_OF_BLOCK_LENGTH),
- "data not multiple of block length"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_DECODE_ERROR), "decode error"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_DEFAULT_QUERY_PARSE_ERROR),
- "default query parse error"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_DIFFERENT_KEY_TYPES),
- "different key types"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_DIFFERENT_PARAMETERS),
- "different parameters"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_ERROR_LOADING_SECTION),
- "error loading section"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_EXPECTING_AN_HMAC_KEY),
- "expecting an hmac key"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_EXPECTING_AN_RSA_KEY),
- "expecting an rsa key"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_EXPECTING_A_DH_KEY), "expecting a dh key"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_EXPECTING_A_DSA_KEY),
- "expecting a dsa key"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_EXPECTING_A_ECX_KEY),
- "expecting an ecx key"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_EXPECTING_A_EC_KEY), "expecting an ec key"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_EXPECTING_A_POLY1305_KEY),
- "expecting a poly1305 key"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_EXPECTING_A_SIPHASH_KEY),
- "expecting a siphash key"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_FINAL_ERROR), "final error"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_GENERATE_ERROR), "generate error"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_GETTING_ALGORITHMIDENTIFIER_NOT_SUPPORTED),
- "getting AlgorithmIdentifier not supported"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_GET_RAW_KEY_FAILED), "get raw key failed"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_ILLEGAL_SCRYPT_PARAMETERS),
- "illegal scrypt parameters"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INACCESSIBLE_DOMAIN_PARAMETERS),
- "inaccessible domain parameters"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INACCESSIBLE_KEY), "inaccessible key"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INITIALIZATION_ERROR),
- "initialization error"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INPUT_NOT_INITIALIZED),
- "input not initialized"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_CUSTOM_LENGTH),
- "invalid custom length"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_DIGEST), "invalid digest"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_IV_LENGTH), "invalid iv length"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_KEY), "invalid key"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_KEY_LENGTH), "invalid key length"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_LENGTH), "invalid length"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_NULL_ALGORITHM),
- "invalid null algorithm"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_OPERATION), "invalid operation"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_PROVIDER_FUNCTIONS),
- "invalid provider functions"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_SALT_LENGTH),
- "invalid salt length"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_SECRET_LENGTH),
- "invalid secret length"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_SEED_LENGTH),
- "invalid seed length"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_VALUE), "invalid value"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_KEYMGMT_EXPORT_FAILURE),
- "keymgmt export failure"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_KEY_SETUP_FAILED), "key setup failed"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_LOCKING_NOT_SUPPORTED),
- "locking not supported"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_MEMORY_LIMIT_EXCEEDED),
- "memory limit exceeded"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_MESSAGE_DIGEST_IS_NULL),
- "message digest is null"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_METHOD_NOT_SUPPORTED),
- "method not supported"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_MISSING_PARAMETERS), "missing parameters"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_NOT_ABLE_TO_COPY_CTX),
- "not able to copy ctx"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_NOT_XOF_OR_INVALID_LENGTH),
- "not XOF or invalid length"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_NO_CIPHER_SET), "no cipher set"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_NO_DEFAULT_DIGEST), "no default digest"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_NO_DIGEST_SET), "no digest set"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_NO_IMPORT_FUNCTION), "no import function"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_NO_KEYMGMT_AVAILABLE),
- "no keymgmt available"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_NO_KEYMGMT_PRESENT), "no keymgmt present"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_NO_KEY_SET), "no key set"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_NO_OPERATION_SET), "no operation set"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_NULL_MAC_PKEY_CTX), "null mac pkey ctx"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_ONLY_ONESHOT_SUPPORTED),
- "only oneshot supported"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_OPERATION_NOT_INITIALIZED),
- "operation not initialized"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE),
- "operation not supported for this keytype"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_SIGNATURE_TYPE),
- "operation not supported for this signature type"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_OUTPUT_WOULD_OVERFLOW),
- "output would overflow"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PARAMETER_TOO_LARGE),
- "parameter too large"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PARTIALLY_OVERLAPPING),
- "partially overlapping buffers"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PBKDF2_ERROR), "pbkdf2 error"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PIPELINE_NOT_SUPPORTED),
- "pipeline not supported"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PKEY_APPLICATION_ASN1_METHOD_ALREADY_REGISTERED),
- "pkey application asn1 method already registered"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PRIVATE_KEY_DECODE_ERROR),
- "private key decode error"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PRIVATE_KEY_ENCODE_ERROR),
- "private key encode error"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PROVIDER_ASYM_CIPHER_FAILURE),
- "provider asym cipher failure"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PROVIDER_ASYM_CIPHER_NOT_SUPPORTED),
- "provider asym cipher not supported"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PROVIDER_GET_CTX_PARAMS_NOT_SUPPORTED),
- "provider get ctx params not supported"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PROVIDER_KEYMGMT_FAILURE),
- "provider keymgmt failure"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PROVIDER_KEYMGMT_NOT_SUPPORTED),
- "provider keymgmt not supported"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PROVIDER_SIGNATURE_FAILURE),
- "provider signature failure"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PROVIDER_SIGNATURE_NOT_SUPPORTED),
- "provider signature not supported"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PUBLIC_KEY_NOT_RSA), "public key not rsa"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_SETTING_XOF_FAILED), "setting xof failed"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_SET_DEFAULT_PROPERTY_FAILURE),
- "set default property failure"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_SIGNATURE_TYPE_AND_KEY_TYPE_INCOMPATIBLE),
- "signature type and key type incompatible"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_TOO_MANY_PIPES), "too many pipes"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_TOO_MANY_RECORDS), "too many records"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNABLE_TO_ENABLE_LOCKING),
- "unable to enable locking"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNABLE_TO_GET_MAXIMUM_REQUEST_SIZE),
- "unable to get maximum request size"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNABLE_TO_GET_RANDOM_STRENGTH),
- "unable to get random strength"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNABLE_TO_LOCK_CONTEXT),
- "unable to lock context"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNABLE_TO_SET_CALLBACKS),
- "unable to set callbacks"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNKNOWN_BITS), "unknown bits"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNKNOWN_CIPHER), "unknown cipher"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNKNOWN_DIGEST), "unknown digest"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNKNOWN_KEY_TYPE), "unknown key type"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNKNOWN_MAX_SIZE), "unknown max size"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNKNOWN_OPTION), "unknown option"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNKNOWN_PBE_ALGORITHM),
- "unknown pbe algorithm"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNKNOWN_SECURITY_BITS),
- "unknown security bits"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNSUPPORTED_ALGORITHM),
- "unsupported algorithm"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNSUPPORTED_CIPHER), "unsupported cipher"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNSUPPORTED_KEYLENGTH),
- "unsupported keylength"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNSUPPORTED_KEY_DERIVATION_FUNCTION),
- "unsupported key derivation function"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNSUPPORTED_KEY_SIZE),
- "unsupported key size"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNSUPPORTED_KEY_TYPE),
- "unsupported key type"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNSUPPORTED_NUMBER_OF_ROUNDS),
- "unsupported number of rounds"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNSUPPORTED_PRF), "unsupported prf"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNSUPPORTED_PRIVATE_KEY_ALGORITHM),
- "unsupported private key algorithm"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNSUPPORTED_SALT_TYPE),
- "unsupported salt type"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UPDATE_ERROR), "update error"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_WRAP_MODE_NOT_ALLOWED),
- "wrap mode not allowed"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_WRONG_FINAL_BLOCK_LENGTH),
- "wrong final block length"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_XTS_DATA_UNIT_IS_TOO_LARGE),
- "xts data unit is too large"},
- {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_XTS_DUPLICATED_KEYS),
- "xts duplicated keys"},
- {0, NULL}
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_AES_KEY_SETUP_FAILED),
+ "aes key setup failed" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_ARIA_KEY_SETUP_FAILED),
+ "aria key setup failed" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_BAD_ALGORITHM_NAME), "bad algorithm name" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_BAD_DECRYPT), "bad decrypt" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_BAD_KEY_LENGTH), "bad key length" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_BUFFER_TOO_SMALL), "buffer too small" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_CACHE_CONSTANTS_FAILED),
+ "cache constants failed" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_CAMELLIA_KEY_SETUP_FAILED),
+ "camellia key setup failed" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_CANNOT_GET_PARAMETERS),
+ "cannot get parameters" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_CANNOT_SET_PARAMETERS),
+ "cannot set parameters" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_CIPHER_NOT_GCM_MODE),
+ "cipher not gcm mode" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_CIPHER_PARAMETER_ERROR),
+ "cipher parameter error" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_COMMAND_NOT_SUPPORTED),
+ "command not supported" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_CONFLICTING_ALGORITHM_NAME),
+ "conflicting algorithm name" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_COPY_ERROR), "copy error" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_CTRL_NOT_IMPLEMENTED),
+ "ctrl not implemented" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_CTRL_OPERATION_NOT_IMPLEMENTED),
+ "ctrl operation not implemented" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_DATA_NOT_MULTIPLE_OF_BLOCK_LENGTH),
+ "data not multiple of block length" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_DECODE_ERROR), "decode error" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_DEFAULT_QUERY_PARSE_ERROR),
+ "default query parse error" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_DIFFERENT_KEY_TYPES),
+ "different key types" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_DIFFERENT_PARAMETERS),
+ "different parameters" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_ERROR_LOADING_SECTION),
+ "error loading section" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_EXPECTING_AN_HMAC_KEY),
+ "expecting an hmac key" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_EXPECTING_AN_RSA_KEY),
+ "expecting an rsa key" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_EXPECTING_A_DH_KEY), "expecting a dh key" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_EXPECTING_A_DSA_KEY),
+ "expecting a dsa key" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_EXPECTING_A_ECX_KEY),
+ "expecting an ecx key" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_EXPECTING_A_EC_KEY), "expecting an ec key" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_EXPECTING_A_POLY1305_KEY),
+ "expecting a poly1305 key" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_EXPECTING_A_SIPHASH_KEY),
+ "expecting a siphash key" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_FINAL_ERROR), "final error" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_GENERATE_ERROR), "generate error" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_GETTING_ALGORITHMIDENTIFIER_NOT_SUPPORTED),
+ "getting AlgorithmIdentifier not supported" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_GET_RAW_KEY_FAILED), "get raw key failed" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_ILLEGAL_SCRYPT_PARAMETERS),
+ "illegal scrypt parameters" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INACCESSIBLE_DOMAIN_PARAMETERS),
+ "inaccessible domain parameters" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INACCESSIBLE_KEY), "inaccessible key" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INITIALIZATION_ERROR),
+ "initialization error" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INPUT_NOT_INITIALIZED),
+ "input not initialized" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_CUSTOM_LENGTH),
+ "invalid custom length" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_DIGEST), "invalid digest" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_IV_LENGTH), "invalid iv length" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_KEY), "invalid key" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_KEY_LENGTH), "invalid key length" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_LENGTH), "invalid length" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_NULL_ALGORITHM),
+ "invalid null algorithm" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_OPERATION), "invalid operation" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_PROVIDER_FUNCTIONS),
+ "invalid provider functions" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_SALT_LENGTH),
+ "invalid salt length" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_SECRET_LENGTH),
+ "invalid secret length" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_SEED_LENGTH),
+ "invalid seed length" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_VALUE), "invalid value" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_KEYMGMT_EXPORT_FAILURE),
+ "keymgmt export failure" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_KEY_SETUP_FAILED), "key setup failed" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_LOCKING_NOT_SUPPORTED),
+ "locking not supported" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_MEMORY_LIMIT_EXCEEDED),
+ "memory limit exceeded" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_MESSAGE_DIGEST_IS_NULL),
+ "message digest is null" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_METHOD_NOT_SUPPORTED),
+ "method not supported" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_MISSING_PARAMETERS), "missing parameters" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_NOT_ABLE_TO_COPY_CTX),
+ "not able to copy ctx" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_NOT_XOF_OR_INVALID_LENGTH),
+ "not XOF or invalid length" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_NO_CIPHER_SET), "no cipher set" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_NO_DEFAULT_DIGEST), "no default digest" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_NO_DIGEST_SET), "no digest set" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_NO_IMPORT_FUNCTION), "no import function" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_NO_KEYMGMT_AVAILABLE),
+ "no keymgmt available" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_NO_KEYMGMT_PRESENT), "no keymgmt present" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_NO_KEY_SET), "no key set" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_NO_OPERATION_SET), "no operation set" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_NULL_MAC_PKEY_CTX), "null mac pkey ctx" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_ONLY_ONESHOT_SUPPORTED),
+ "only oneshot supported" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_OPERATION_NOT_INITIALIZED),
+ "operation not initialized" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE),
+ "operation not supported for this keytype" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_SIGNATURE_TYPE),
+ "operation not supported for this signature type" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_OUTPUT_WOULD_OVERFLOW),
+ "output would overflow" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PARAMETER_TOO_LARGE),
+ "parameter too large" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PARTIALLY_OVERLAPPING),
+ "partially overlapping buffers" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PBKDF2_ERROR), "pbkdf2 error" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PIPELINE_NOT_SUPPORTED),
+ "pipeline not supported" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PKEY_APPLICATION_ASN1_METHOD_ALREADY_REGISTERED),
+ "pkey application asn1 method already registered" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PRIVATE_KEY_DECODE_ERROR),
+ "private key decode error" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PRIVATE_KEY_ENCODE_ERROR),
+ "private key encode error" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PROVIDER_ASYM_CIPHER_FAILURE),
+ "provider asym cipher failure" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PROVIDER_ASYM_CIPHER_NOT_SUPPORTED),
+ "provider asym cipher not supported" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PROVIDER_GET_CTX_PARAMS_NOT_SUPPORTED),
+ "provider get ctx params not supported" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PROVIDER_KEYMGMT_FAILURE),
+ "provider keymgmt failure" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PROVIDER_KEYMGMT_NOT_SUPPORTED),
+ "provider keymgmt not supported" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PROVIDER_SIGNATURE_FAILURE),
+ "provider signature failure" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PROVIDER_SIGNATURE_NOT_SUPPORTED),
+ "provider signature not supported" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PUBLIC_KEY_NOT_RSA), "public key not rsa" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_SETTING_XOF_FAILED), "setting xof failed" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_SET_DEFAULT_PROPERTY_FAILURE),
+ "set default property failure" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_SIGNATURE_TYPE_AND_KEY_TYPE_INCOMPATIBLE),
+ "signature type and key type incompatible" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_TOO_MANY_PIPES), "too many pipes" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_TOO_MANY_RECORDS), "too many records" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNABLE_TO_ENABLE_LOCKING),
+ "unable to enable locking" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNABLE_TO_GET_MAXIMUM_REQUEST_SIZE),
+ "unable to get maximum request size" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNABLE_TO_GET_RANDOM_STRENGTH),
+ "unable to get random strength" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNABLE_TO_LOCK_CONTEXT),
+ "unable to lock context" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNABLE_TO_SET_CALLBACKS),
+ "unable to set callbacks" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNKNOWN_BITS), "unknown bits" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNKNOWN_CIPHER), "unknown cipher" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNKNOWN_DIGEST), "unknown digest" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNKNOWN_KEY_TYPE), "unknown key type" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNKNOWN_MAX_SIZE), "unknown max size" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNKNOWN_OPTION), "unknown option" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNKNOWN_PBE_ALGORITHM),
+ "unknown pbe algorithm" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNKNOWN_SECURITY_BITS),
+ "unknown security bits" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNSUPPORTED_ALGORITHM),
+ "unsupported algorithm" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNSUPPORTED_CIPHER), "unsupported cipher" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNSUPPORTED_KEYLENGTH),
+ "unsupported keylength" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNSUPPORTED_KEY_DERIVATION_FUNCTION),
+ "unsupported key derivation function" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNSUPPORTED_KEY_SIZE),
+ "unsupported key size" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNSUPPORTED_KEY_TYPE),
+ "unsupported key type" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNSUPPORTED_NUMBER_OF_ROUNDS),
+ "unsupported number of rounds" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNSUPPORTED_PRF), "unsupported prf" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNSUPPORTED_PRIVATE_KEY_ALGORITHM),
+ "unsupported private key algorithm" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNSUPPORTED_SALT_TYPE),
+ "unsupported salt type" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UPDATE_ERROR), "update error" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_WRAP_MODE_NOT_ALLOWED),
+ "wrap mode not allowed" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_WRONG_FINAL_BLOCK_LENGTH),
+ "wrong final block length" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_XTS_DATA_UNIT_IS_TOO_LARGE),
+ "xts data unit is too large" },
+ { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_XTS_DUPLICATED_KEYS),
+ "xts duplicated keys" },
+ { 0, NULL }
};
#endif
diff --git a/crypto/evp/evp_fetch.c b/crypto/evp/evp_fetch.c
index fbebca1b63..612e57e6f0 100644
--- a/crypto/evp/evp_fetch.c
+++ b/crypto/evp/evp_fetch.c
@@ -18,7 +18,7 @@
#include "internal/provider.h"
#include "internal/namemap.h"
#include "crypto/decoder.h"
-#include "crypto/evp.h" /* evp_local.h needs it */
+#include "crypto/evp.h" /* evp_local.h needs it */
#include "evp_local.h"
#define NAME_SEPARATOR ':'
@@ -26,17 +26,17 @@
/* Data to be passed through ossl_method_construct() */
struct evp_method_data_st {
OSSL_LIB_CTX *libctx;
- int operation_id; /* For get_evp_method_from_store() */
- int name_id; /* For get_evp_method_from_store() */
- const char *names; /* For get_evp_method_from_store() */
- const char *propquery; /* For get_evp_method_from_store() */
+ int operation_id; /* For get_evp_method_from_store() */
+ int name_id; /* For get_evp_method_from_store() */
+ const char *names; /* For get_evp_method_from_store() */
+ const char *propquery; /* For get_evp_method_from_store() */
OSSL_METHOD_STORE *tmp_store; /* For get_tmp_evp_method_store() */
unsigned int flag_construct_error_occurred : 1;
void *(*method_from_algorithm)(int name_id, const OSSL_ALGORITHM *,
- OSSL_PROVIDER *);
+ OSSL_PROVIDER *);
int (*refcnt_up_method)(void *method);
void (*destruct_method)(void *method);
};
@@ -57,7 +57,7 @@ static void *get_tmp_evp_method_store(void *data)
return methdata->tmp_store;
}
- static void dealloc_tmp_evp_method_store(void *store)
+static void dealloc_tmp_evp_method_store(void *store)
{
OSSL_TRACE1(QUERY, "Deallocating the tmp_store %p\n", store);
if (store != NULL)
@@ -108,23 +108,23 @@ static int unreserve_evp_method_store(void *store, void *data)
* passed to ossl_method_store_cache_set(), and it's in that form that it
* gets passed along to filter_on_operation_id(), defined further down.
*/
-#define METHOD_ID_OPERATION_MASK 0x000000FF
-#define METHOD_ID_OPERATION_MAX ((1 << 8) - 1)
-#define METHOD_ID_NAME_MASK 0x7FFFFF00
-#define METHOD_ID_NAME_OFFSET 8
-#define METHOD_ID_NAME_MAX ((1 << 23) - 1)
+#define METHOD_ID_OPERATION_MASK 0x000000FF
+#define METHOD_ID_OPERATION_MAX ((1 << 8) - 1)
+#define METHOD_ID_NAME_MASK 0x7FFFFF00
+#define METHOD_ID_NAME_OFFSET 8
+#define METHOD_ID_NAME_MAX ((1 << 23) - 1)
static uint32_t evp_method_id(int name_id, unsigned int operation_id)
{
if (!ossl_assert(name_id > 0 && name_id <= METHOD_ID_NAME_MAX)
|| !ossl_assert(operation_id > 0
- && operation_id <= METHOD_ID_OPERATION_MAX))
+ && operation_id <= METHOD_ID_OPERATION_MAX))
return 0;
return (((name_id << METHOD_ID_NAME_OFFSET) & METHOD_ID_NAME_MASK)
- | (operation_id & METHOD_ID_OPERATION_MASK));
+ | (operation_id & METHOD_ID_OPERATION_MASK));
}
static void *get_evp_method_from_store(void *store, const OSSL_PROVIDER **prov,
- void *data)
+ void *data)
{
struct evp_method_data_st *methdata = data;
void *method = NULL;
@@ -156,15 +156,15 @@ static void *get_evp_method_from_store(void *store, const OSSL_PROVIDER **prov,
return NULL;
if (!ossl_method_store_fetch(store, meth_id, methdata->propquery, prov,
- &method))
+ &method))
return NULL;
return method;
}
static int put_evp_method_in_store(void *store, void *method,
- const OSSL_PROVIDER *prov,
- const char *names, const char *propdef,
- void *data)
+ const OSSL_PROVIDER *prov,
+ const char *names, const char *propdef,
+ void *data)
{
struct evp_method_data_st *methdata = data;
OSSL_NAMEMAP *namemap;
@@ -195,12 +195,12 @@ static int put_evp_method_in_store(void *store, void *method,
return 0;
OSSL_TRACE5(QUERY,
- "put_evp_method_in_store: "
- "store: %p, names: %s, operation_id %d, method_id: %d, properties: %s\n",
- store, names, methdata->operation_id, meth_id, propdef ? propdef : "<null>");
+ "put_evp_method_in_store: "
+ "store: %p, names: %s, operation_id %d, method_id: %d, properties: %s\n",
+ store, names, methdata->operation_id, meth_id, propdef ? propdef : "<null>");
return ossl_method_store_add(store, prov, meth_id, propdef, method,
- methdata->refcnt_up_method,
- methdata->destruct_method);
+ methdata->refcnt_up_method,
+ methdata->destruct_method);
}
/*
@@ -208,7 +208,7 @@ static int put_evp_method_in_store(void *store, void *method,
* This function is responsible to getting an identity number for it.
*/
static void *construct_evp_method(const OSSL_ALGORITHM *algodef,
- OSSL_PROVIDER *prov, void *data)
+ OSSL_PROVIDER *prov, void *data)
{
/*
* This function is only called if get_evp_method_from_store() returned
@@ -249,13 +249,13 @@ static void destruct_evp_method(void *method, void *data)
static void *
inner_evp_generic_fetch(struct evp_method_data_st *methdata,
- OSSL_PROVIDER *prov, int operation_id,
- const char *name, ossl_unused const char *properties,
- void *(*new_method)(int name_id,
- const OSSL_ALGORITHM *algodef,
- OSSL_PROVIDER *prov),
- int (*up_ref_method)(void *),
- void (*free_method)(void *))
+ OSSL_PROVIDER *prov, int operation_id,
+ const char *name, ossl_unused const char *properties,
+ void *(*new_method)(int name_id,
+ const OSSL_ALGORITHM *algodef,
+ OSSL_PROVIDER *prov),
+ int (*up_ref_method)(void *),
+ void (*free_method)(void *))
{
OSSL_METHOD_STORE *store = get_evp_method_store(methdata->libctx);
OSSL_NAMEMAP *namemap = ossl_namemap_stored(methdata->libctx);
@@ -269,7 +269,7 @@ inner_evp_generic_fetch(struct evp_method_data_st *methdata,
const char *const propq = "";
#else
const char *const propq = properties != NULL ? properties : "";
-#endif /* FIPS_MODULE */
+#endif /* FIPS_MODULE */
uint32_t meth_id = 0;
void *method = NULL;
int unsupported, name_id;
@@ -331,8 +331,9 @@ inner_evp_generic_fetch(struct evp_method_data_st *methdata,
methdata->destruct_method = free_method;
methdata->flag_construct_error_occurred = 0;
if ((method = ossl_method_construct(methdata->libctx, operation_id,
- &prov, 0 /* !force_cache */,
- &mcm, methdata)) != NULL) {
+ &prov, 0 /* !force_cache */,
+ &mcm, methdata))
+ != NULL) {
/*
* If construction did create a method for us, we know that
* there is a correct name_id and meth_id, since those have
@@ -349,14 +350,14 @@ inner_evp_generic_fetch(struct evp_method_data_st *methdata,
name_id = ossl_namemap_name2num(namemap, name);
if (name_id == 0) {
ERR_raise_data(ERR_LIB_EVP, ERR_R_FETCH_FAILED,
- "Algorithm %s cannot be found", name);
+ "Algorithm %s cannot be found", name);
free_method(method);
method = NULL;
} else {
meth_id = evp_method_id(name_id, operation_id);
if (meth_id != 0)
ossl_method_store_cache_set(store, prov, meth_id, propq,
- method, up_ref_method, free_method);
+ method, up_ref_method, free_method);
}
}
@@ -373,27 +374,27 @@ inner_evp_generic_fetch(struct evp_method_data_st *methdata,
if (name == NULL)
name = ossl_namemap_num2name(namemap, name_id, 0);
ERR_raise_data(ERR_LIB_EVP, code,
- "%s, Algorithm (%s : %d), Properties (%s)",
- ossl_lib_ctx_get_descriptor(methdata->libctx),
- name == NULL ? "<null>" : name, name_id,
- properties == NULL ? "<null>" : properties);
+ "%s, Algorithm (%s : %d), Properties (%s)",
+ ossl_lib_ctx_get_descriptor(methdata->libctx),
+ name == NULL ? "<null>" : name, name_id,
+ properties == NULL ? "<null>" : properties);
} else {
OSSL_TRACE4(QUERY, "%s, Algorithm (%s : %d), Properties (%s)\n",
- ossl_lib_ctx_get_descriptor(methdata->libctx),
- name == NULL ? "<null>" : name, name_id,
- properties == NULL ? "<null>" : properties);
+ ossl_lib_ctx_get_descriptor(methdata->libctx),
+ name == NULL ? "<null>" : name, name_id,
+ properties == NULL ? "<null>" : properties);
}
return method;
}
void *evp_generic_fetch(OSSL_LIB_CTX *libctx, int operation_id,
- const char *name, const char *properties,
- void *(*new_method)(int name_id,
- const OSSL_ALGORITHM *algodef,
- OSSL_PROVIDER *prov),
- int (*up_ref_method)(void *),
- void (*free_method)(void *))
+ const char *name, const char *properties,
+ void *(*new_method)(int name_id,
+ const OSSL_ALGORITHM *algodef,
+ OSSL_PROVIDER *prov),
+ int (*up_ref_method)(void *),
+ void (*free_method)(void *))
{
struct evp_method_data_st methdata;
void *method;
@@ -401,8 +402,8 @@ void *evp_generic_fetch(OSSL_LIB_CTX *libctx, int operation_id,
methdata.libctx = libctx;
methdata.tmp_store = NULL;
method = inner_evp_generic_fetch(&methdata, NULL, operation_id,
- name, properties,
- new_method, up_ref_method, free_method);
+ name, properties,
+ new_method, up_ref_method, free_method);
dealloc_tmp_evp_method_store(methdata.tmp_store);
return method;
}
@@ -414,12 +415,12 @@ void *evp_generic_fetch(OSSL_LIB_CTX *libctx, int operation_id,
* method.
*/
void *evp_generic_fetch_from_prov(OSSL_PROVIDER *prov, int operation_id,
- const char *name, const char *properties,
- void *(*new_method)(int name_id,
- const OSSL_ALGORITHM *algodef,
- OSSL_PROVIDER *prov),
- int (*up_ref_method)(void *),
- void (*free_method)(void *))
+ const char *name, const char *properties,
+ void *(*new_method)(int name_id,
+ const OSSL_ALGORITHM *algodef,
+ OSSL_PROVIDER *prov),
+ int (*up_ref_method)(void *),
+ void (*free_method)(void *))
{
struct evp_method_data_st methdata;
void *method;
@@ -427,8 +428,8 @@ void *evp_generic_fetch_from_prov(OSSL_PROVIDER *prov, int operation_id,
methdata.libctx = ossl_provider_libctx(prov);
methdata.tmp_store = NULL;
method = inner_evp_generic_fetch(&methdata, prov, operation_id,
- name, properties,
- new_method, up_ref_method, free_method);
+ name, properties,
+ new_method, up_ref_method, free_method);
dealloc_tmp_evp_method_store(methdata.tmp_store);
return method;
}
@@ -453,9 +454,9 @@ int evp_method_store_remove_all_provided(const OSSL_PROVIDER *prov)
}
static int evp_set_parsed_default_properties(OSSL_LIB_CTX *libctx,
- OSSL_PROPERTY_LIST *def_prop,
- int loadconfig,
- int mirrored)
+ OSSL_PROPERTY_LIST *def_prop,
+ int loadconfig,
+ int mirrored)
{
OSSL_METHOD_STORE *store = get_evp_method_store(libctx);
OSSL_PROPERTY_LIST **plp = ossl_ctx_global_properties(libctx, loadconfig);
@@ -485,7 +486,8 @@ static int evp_set_parsed_default_properties(OSSL_LIB_CTX *libctx,
return 0;
}
if (ossl_property_list_to_string(libctx, def_prop, propstr,
- strsz) == 0) {
+ strsz)
+ == 0) {
OPENSSL_free(propstr);
ERR_raise(ERR_LIB_EVP, ERR_R_INTERNAL_ERROR);
return 0;
@@ -507,7 +509,7 @@ static int evp_set_parsed_default_properties(OSSL_LIB_CTX *libctx,
}
int evp_set_default_properties_int(OSSL_LIB_CTX *libctx, const char *propq,
- int loadconfig, int mirrored)
+ int loadconfig, int mirrored)
{
OSSL_PROPERTY_LIST *pl = NULL;
@@ -528,7 +530,7 @@ int EVP_set_default_properties(OSSL_LIB_CTX *libctx, const char *propq)
}
static int evp_default_properties_merge(OSSL_LIB_CTX *libctx, const char *propq,
- int loadconfig)
+ int loadconfig)
{
OSSL_PROPERTY_LIST **plp = ossl_ctx_global_properties(libctx, loadconfig);
OSSL_PROPERTY_LIST *pl1, *pl2;
@@ -555,7 +557,7 @@ static int evp_default_properties_merge(OSSL_LIB_CTX *libctx, const char *propq,
}
static int evp_default_property_is_enabled(OSSL_LIB_CTX *libctx,
- const char *prop_name)
+ const char *prop_name)
{
OSSL_PROPERTY_LIST **plp = ossl_ctx_global_properties(libctx, 1);
@@ -568,7 +570,7 @@ int EVP_default_properties_is_fips_enabled(OSSL_LIB_CTX *libctx)
}
int evp_default_properties_enable_fips_int(OSSL_LIB_CTX *libctx, int enable,
- int loadconfig)
+ int loadconfig)
{
const char *query = (enable != 0) ? "fips=yes" : "-fips";
@@ -626,13 +628,13 @@ static void filter_on_operation_id(int id, void *method, void *arg)
}
void evp_generic_do_all(OSSL_LIB_CTX *libctx, int operation_id,
- void (*user_fn)(void *method, void *arg),
- void *user_arg,
- void *(*new_method)(int name_id,
- const OSSL_ALGORITHM *algodef,
- OSSL_PROVIDER *prov),
- int (*up_ref_method)(void *),
- void (*free_method)(void *))
+ void (*user_fn)(void *method, void *arg),
+ void *user_arg,
+ void *(*new_method)(int name_id,
+ const OSSL_ALGORITHM *algodef,
+ OSSL_PROVIDER *prov),
+ int (*up_ref_method)(void *),
+ void (*free_method)(void *))
{
struct evp_method_data_st methdata;
struct filter_data_st data;
@@ -640,21 +642,21 @@ void evp_generic_do_all(OSSL_LIB_CTX *libctx, int operation_id,
methdata.libctx = libctx;
methdata.tmp_store = NULL;
(void)inner_evp_generic_fetch(&methdata, NULL, operation_id, NULL, NULL,
- new_method, up_ref_method, free_method);
+ new_method, up_ref_method, free_method);
data.operation_id = operation_id;
data.user_fn = user_fn;
data.user_arg = user_arg;
if (methdata.tmp_store != NULL)
ossl_method_store_do_all(methdata.tmp_store, &filter_on_operation_id,
- &data);
+ &data);
ossl_method_store_do_all(get_evp_method_store(libctx),
- &filter_on_operation_id, &data);
+ &filter_on_operation_id, &data);
dealloc_tmp_evp_method_store(methdata.tmp_store);
}
int evp_is_a(OSSL_PROVIDER *prov, int number,
- const char *legacy_name, const char *name)
+ const char *legacy_name, const char *name)
{
/*
* For a |prov| that is NULL, the library context will be NULL
@@ -668,8 +670,8 @@ int evp_is_a(OSSL_PROVIDER *prov, int number,
}
int evp_names_do_all(OSSL_PROVIDER *prov, int number,
- void (*fn)(const char *name, void *data),
- void *data)
+ void (*fn)(const char *name, void *data),
+ void *data)
{
OSSL_LIB_CTX *libctx = ossl_provider_libctx(prov);
OSSL_NAMEMAP *namemap = ossl_namemap_stored(libctx);
diff --git a/crypto/evp/evp_key.c b/crypto/evp/evp_key.c
index 7ef94e44eb..4f8fdd8727 100644
--- a/crypto/evp/evp_key.c
+++ b/crypto/evp/evp_key.c
@@ -15,7 +15,7 @@
#include <openssl/ui.h>
#ifndef BUFSIZ
-# define BUFSIZ 256
+#define BUFSIZ 256
#endif
/* should be init to zeros. */
@@ -50,7 +50,7 @@ int EVP_read_pw_string(char *buf, int len, const char *prompt, int verify)
}
int EVP_read_pw_string_min(char *buf, int min, int len, const char *prompt,
- int verify)
+ int verify)
{
int ret = -1;
char buff[BUFSIZ];
@@ -62,23 +62,25 @@ int EVP_read_pw_string_min(char *buf, int min, int len, const char *prompt,
if (ui == NULL)
return ret;
if (UI_add_input_string(ui, prompt, 0, buf, min,
- (len >= BUFSIZ) ? BUFSIZ - 1 : len) < 0
+ (len >= BUFSIZ) ? BUFSIZ - 1 : len)
+ < 0
|| (verify
&& UI_add_verify_string(ui, prompt, 0, buff, min,
- (len >= BUFSIZ) ? BUFSIZ - 1 : len,
- buf) < 0))
+ (len >= BUFSIZ) ? BUFSIZ - 1 : len,
+ buf)
+ < 0))
goto end;
ret = UI_process(ui);
OPENSSL_cleanse(buff, BUFSIZ);
- end:
+end:
UI_free(ui);
return ret;
}
int EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md,
- const unsigned char *salt, const unsigned char *data,
- int datal, int count, unsigned char *key,
- unsigned char *iv)
+ const unsigned char *salt, const unsigned char *data,
+ int datal, int count, unsigned char *key,
+ unsigned char *iv)
{
EVP_MD_CTX *c;
unsigned char md_buf[EVP_MAX_MD_SIZE];
@@ -147,7 +149,7 @@ int EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md,
break;
}
rv = EVP_CIPHER_get_key_length(type);
- err:
+err:
EVP_MD_CTX_free(c);
OPENSSL_cleanse(md_buf, sizeof(md_buf));
return rv;
diff --git a/crypto/evp/evp_lib.c b/crypto/evp/evp_lib.c
index c99d847974..f6c3c92b7f 100644
--- a/crypto/evp/evp_lib.c
+++ b/crypto/evp/evp_lib.c
@@ -30,7 +30,7 @@
#include "evp_local.h"
#if !defined(FIPS_MODULE)
-# include "crypto/asn1.h"
+#include "crypto/asn1.h"
int EVP_CIPHER_param_to_asn1(EVP_CIPHER_CTX *c, ASN1_TYPE *type)
{
@@ -79,9 +79,9 @@ int EVP_CIPHER_set_asn1_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type)
}
int evp_cipher_param_to_asn1_ex(EVP_CIPHER_CTX *c, ASN1_TYPE *type,
- evp_cipher_aead_asn1_params *asn1_params)
+ evp_cipher_aead_asn1_params *asn1_params)
{
- int ret = -1; /* Assume the worst */
+ int ret = -1; /* Assume the worst */
const EVP_CIPHER *cipher;
if (c == NULL || c->cipher == NULL)
@@ -139,7 +139,7 @@ int evp_cipher_param_to_asn1_ex(EVP_CIPHER_CTX *c, ASN1_TYPE *type,
ret = -2;
}
- err:
+err:
if (ret == -2)
ERR_raise(ERR_LIB_EVP, EVP_R_UNSUPPORTED_CIPHER);
else if (ret <= 0)
@@ -150,9 +150,9 @@ int evp_cipher_param_to_asn1_ex(EVP_CIPHER_CTX *c, ASN1_TYPE *type,
}
int evp_cipher_asn1_to_param_ex(EVP_CIPHER_CTX *c, ASN1_TYPE *type,
- evp_cipher_aead_asn1_params *asn1_params)
+ evp_cipher_aead_asn1_params *asn1_params)
{
- int ret = -1; /* Assume the worst */
+ int ret = -1; /* Assume the worst */
const EVP_CIPHER *cipher;
if (c == NULL || c->cipher == NULL)
@@ -219,7 +219,7 @@ err:
}
int evp_cipher_get_asn1_aead_params(EVP_CIPHER_CTX *c, ASN1_TYPE *type,
- evp_cipher_aead_asn1_params *asn1_params)
+ evp_cipher_aead_asn1_params *asn1_params)
{
int i = 0;
long tl;
@@ -240,14 +240,14 @@ int evp_cipher_get_asn1_aead_params(EVP_CIPHER_CTX *c, ASN1_TYPE *type,
}
int evp_cipher_set_asn1_aead_params(EVP_CIPHER_CTX *c, ASN1_TYPE *type,
- evp_cipher_aead_asn1_params *asn1_params)
+ evp_cipher_aead_asn1_params *asn1_params)
{
if (type == NULL || asn1_params == NULL)
return 0;
return ossl_asn1_type_set_octetstring_int(type, asn1_params->tag_len,
- asn1_params->iv,
- asn1_params->iv_len);
+ asn1_params->iv,
+ asn1_params->iv_len);
}
#endif /* !defined(FIPS_MODULE) */
@@ -304,15 +304,15 @@ int EVP_CIPHER_get_type(const EVP_CIPHER *cipher)
#ifdef FIPS_MODULE
return NID_undef;
#else
- {
- /* Check it has an OID and it is valid */
- ASN1_OBJECT *otmp = OBJ_nid2obj(nid);
-
- if (OBJ_get0_data(otmp) == NULL)
- nid = NID_undef;
- ASN1_OBJECT_free(otmp);
- return nid;
- }
+ {
+ /* Check it has an OID and it is valid */
+ ASN1_OBJECT *otmp = OBJ_nid2obj(nid);
+
+ if (OBJ_get0_data(otmp) == NULL)
+ nid = NID_undef;
+ ASN1_OBJECT_free(otmp);
+ return nid;
+ }
#endif
}
}
@@ -333,14 +333,14 @@ int evp_cipher_cache_constants(EVP_CIPHER *cipher)
params[3] = OSSL_PARAM_construct_uint(OSSL_CIPHER_PARAM_MODE, &mode);
params[4] = OSSL_PARAM_construct_int(OSSL_CIPHER_PARAM_AEAD, &aead);
params[5] = OSSL_PARAM_construct_int(OSSL_CIPHER_PARAM_CUSTOM_IV,
- &custom_iv);
+ &custom_iv);
params[6] = OSSL_PARAM_construct_int(OSSL_CIPHER_PARAM_CTS, &cts);
params[7] = OSSL_PARAM_construct_int(OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK,
- &multiblock);
+ &multiblock);
params[8] = OSSL_PARAM_construct_int(OSSL_CIPHER_PARAM_HAS_RAND_KEY,
- &randkey);
+ &randkey);
params[9] = OSSL_PARAM_construct_int(OSSL_CIPHER_PARAM_ENCRYPT_THEN_MAC,
- &encrypt_then_mac);
+ &encrypt_then_mac);
params[10] = OSSL_PARAM_construct_end();
ok = evp_do_ciph_getparams(cipher, params) > 0;
if (ok) {
@@ -363,7 +363,7 @@ int evp_cipher_cache_constants(EVP_CIPHER *cipher)
if (encrypt_then_mac)
cipher->flags |= EVP_CIPH_FLAG_ENC_THEN_MAC;
if (OSSL_PARAM_locate_const(EVP_CIPHER_gettable_ctx_params(cipher),
- OSSL_CIPHER_PARAM_ALGORITHM_ID_PARAMS))
+ OSSL_CIPHER_PARAM_ALGORITHM_ID_PARAMS))
cipher->flags |= EVP_CIPH_FLAG_CUSTOM_ASN1;
}
return ok;
@@ -385,7 +385,7 @@ int EVP_CIPHER_impl_ctx_size(const EVP_CIPHER *e)
}
int EVP_Cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, unsigned int inl)
+ const unsigned char *in, unsigned int inl)
{
if (ctx == NULL || ctx->cipher == NULL)
return 0;
@@ -406,17 +406,18 @@ int EVP_Cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
return 0;
if (ctx->cipher->ccipher != NULL)
- ret = ctx->cipher->ccipher(ctx->algctx, out, &outl,
- inl + (blocksize == 1 ? 0 : blocksize),
- in, (size_t)inl)
- ? (int)outl : -1;
+ ret = ctx->cipher->ccipher(ctx->algctx, out, &outl,
+ inl + (blocksize == 1 ? 0 : blocksize),
+ in, (size_t)inl)
+ ? (int)outl
+ : -1;
else if (in != NULL)
ret = ctx->cipher->cupdate(ctx->algctx, out, &outl,
- inl + (blocksize == 1 ? 0 : blocksize),
- in, (size_t)inl);
+ inl + (blocksize == 1 ? 0 : blocksize),
+ in, (size_t)inl);
else
ret = ctx->cipher->cfinal(ctx->algctx, out, &outl,
- blocksize == 1 ? 0 : blocksize);
+ blocksize == 1 ? 0 : blocksize);
return ret;
}
@@ -504,11 +505,11 @@ int EVP_CIPHER_CTX_get_iv_length(const EVP_CIPHER_CTX *ctx)
if (ctx->cipher->get_ctx_params != NULL) {
params[0] = OSSL_PARAM_construct_size_t(OSSL_CIPHER_PARAM_IVLEN,
- &v);
+ &v);
rv = evp_do_ciph_ctx_getparams(ctx->cipher, ctx->algctx, params);
if (rv > 0) {
if (OSSL_PARAM_modified(params)
- && !OSSL_PARAM_get_int(params, &len))
+ && !OSSL_PARAM_get_int(params, &len))
return -1;
} else if (rv != EVP_CTRL_RET_UNSUPPORTED) {
return -1;
@@ -516,9 +517,10 @@ int EVP_CIPHER_CTX_get_iv_length(const EVP_CIPHER_CTX *ctx)
}
/* Code below to be removed when legacy support is dropped. */
else if ((EVP_CIPHER_get_flags(ctx->cipher)
- & EVP_CIPH_CUSTOM_IV_LENGTH) != 0) {
+ & EVP_CIPH_CUSTOM_IV_LENGTH)
+ != 0) {
rv = EVP_CIPHER_CTX_ctrl((EVP_CIPHER_CTX *)ctx, EVP_CTRL_GET_IVLEN,
- 0, &len);
+ 0, &len);
if (rv <= 0)
return -1;
}
@@ -549,9 +551,8 @@ const unsigned char *EVP_CIPHER_CTX_original_iv(const EVP_CIPHER_CTX *ctx)
const unsigned char *v = ctx->oiv;
OSSL_PARAM params[2] = { OSSL_PARAM_END, OSSL_PARAM_END };
- params[0] =
- OSSL_PARAM_construct_octet_ptr(OSSL_CIPHER_PARAM_IV,
- (void **)&v, sizeof(ctx->oiv));
+ params[0] = OSSL_PARAM_construct_octet_ptr(OSSL_CIPHER_PARAM_IV,
+ (void **)&v, sizeof(ctx->oiv));
ok = evp_do_ciph_ctx_getparams(ctx->cipher, ctx->algctx, params);
return ok != 0 ? v : NULL;
@@ -566,9 +567,8 @@ const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *ctx)
const unsigned char *v = ctx->iv;
OSSL_PARAM params[2] = { OSSL_PARAM_END, OSSL_PARAM_END };
- params[0] =
- OSSL_PARAM_construct_octet_ptr(OSSL_CIPHER_PARAM_UPDATED_IV,
- (void **)&v, sizeof(ctx->iv));
+ params[0] = OSSL_PARAM_construct_octet_ptr(OSSL_CIPHER_PARAM_UPDATED_IV,
+ (void **)&v, sizeof(ctx->iv));
ok = evp_do_ciph_ctx_getparams(ctx->cipher, ctx->algctx, params);
return ok != 0 ? v : NULL;
@@ -580,9 +580,8 @@ unsigned char *EVP_CIPHER_CTX_iv_noconst(EVP_CIPHER_CTX *ctx)
unsigned char *v = ctx->iv;
OSSL_PARAM params[2] = { OSSL_PARAM_END, OSSL_PARAM_END };
- params[0] =
- OSSL_PARAM_construct_octet_ptr(OSSL_CIPHER_PARAM_UPDATED_IV,
- (void **)&v, sizeof(ctx->iv));
+ params[0] = OSSL_PARAM_construct_octet_ptr(OSSL_CIPHER_PARAM_UPDATED_IV,
+ (void **)&v, sizeof(ctx->iv));
ok = evp_do_ciph_ctx_getparams(ctx->cipher, ctx->algctx, params);
return ok != 0 ? v : NULL;
@@ -593,8 +592,7 @@ int EVP_CIPHER_CTX_get_updated_iv(EVP_CIPHER_CTX *ctx, void *buf, size_t len)
{
OSSL_PARAM params[2] = { OSSL_PARAM_END, OSSL_PARAM_END };
- params[0] =
- OSSL_PARAM_construct_octet_string(OSSL_CIPHER_PARAM_UPDATED_IV, buf, len);
+ params[0] = OSSL_PARAM_construct_octet_string(OSSL_CIPHER_PARAM_UPDATED_IV, buf, len);
return evp_do_ciph_ctx_getparams(ctx->cipher, ctx->algctx, params) > 0;
}
@@ -602,8 +600,7 @@ int EVP_CIPHER_CTX_get_original_iv(EVP_CIPHER_CTX *ctx, void *buf, size_t len)
{
OSSL_PARAM params[2] = { OSSL_PARAM_END, OSSL_PARAM_END };
- params[0] =
- OSSL_PARAM_construct_octet_string(OSSL_CIPHER_PARAM_IV, buf, len);
+ params[0] = OSSL_PARAM_construct_octet_string(OSSL_CIPHER_PARAM_IV, buf, len);
return evp_do_ciph_ctx_getparams(ctx->cipher, ctx->algctx, params) > 0;
}
@@ -719,8 +716,8 @@ const char *EVP_CIPHER_get0_description(const EVP_CIPHER *cipher)
}
int EVP_CIPHER_names_do_all(const EVP_CIPHER *cipher,
- void (*fn)(const char *name, void *data),
- void *data)
+ void (*fn)(const char *name, void *data),
+ void *data)
{
if (cipher->prov != NULL)
return evp_names_do_all(cipher->prov, cipher->name_id, fn, data);
@@ -777,8 +774,8 @@ const char *EVP_MD_get0_name(const EVP_MD *md)
}
int EVP_MD_names_do_all(const EVP_MD *md,
- void (*fn)(const char *name, void *data),
- void *data)
+ void (*fn)(const char *name, void *data),
+ void *data)
{
if (md->prov != NULL)
return evp_names_do_all(md->prov, md->name_id, fn, data);
@@ -873,7 +870,7 @@ void evp_md_free_int(EVP_MD *md)
void EVP_MD_meth_free(EVP_MD *md)
{
if (md == NULL || md->origin != EVP_ORIG_METH)
- return;
+ return;
evp_md_free_int(md);
}
@@ -918,9 +915,7 @@ int EVP_MD_meth_set_init(EVP_MD *md, int (*init)(EVP_MD_CTX *ctx))
md->init = init;
return 1;
}
-int EVP_MD_meth_set_update(EVP_MD *md, int (*update)(EVP_MD_CTX *ctx,
- const void *data,
- size_t count))
+int EVP_MD_meth_set_update(EVP_MD *md, int (*update)(EVP_MD_CTX *ctx, const void *data, size_t count))
{
if (md->update != NULL)
return 0;
@@ -928,8 +923,7 @@ int EVP_MD_meth_set_update(EVP_MD *md, int (*update)(EVP_MD_CTX *ctx,
md->update = update;
return 1;
}
-int EVP_MD_meth_set_final(EVP_MD *md, int (*final)(EVP_MD_CTX *ctx,
- unsigned char *md))
+int EVP_MD_meth_set_final(EVP_MD *md, int (*final)(EVP_MD_CTX *ctx, unsigned char *md))
{
if (md->final != NULL)
return 0;
@@ -937,8 +931,7 @@ int EVP_MD_meth_set_final(EVP_MD *md, int (*final)(EVP_MD_CTX *ctx,
md->final = final;
return 1;
}
-int EVP_MD_meth_set_copy(EVP_MD *md, int (*copy)(EVP_MD_CTX *to,
- const EVP_MD_CTX *from))
+int EVP_MD_meth_set_copy(EVP_MD *md, int (*copy)(EVP_MD_CTX *to, const EVP_MD_CTX *from))
{
if (md->copy != NULL)
return 0;
@@ -954,8 +947,7 @@ int EVP_MD_meth_set_cleanup(EVP_MD *md, int (*cleanup)(EVP_MD_CTX *ctx))
md->cleanup = cleanup;
return 1;
}
-int EVP_MD_meth_set_ctrl(EVP_MD *md, int (*ctrl)(EVP_MD_CTX *ctx, int cmd,
- int p1, void *p2))
+int EVP_MD_meth_set_ctrl(EVP_MD *md, int (*ctrl)(EVP_MD_CTX *ctx, int cmd, int p1, void *p2))
{
if (md->md_ctrl != NULL)
return 0;
@@ -985,18 +977,18 @@ int (*EVP_MD_meth_get_init(const EVP_MD *md))(EVP_MD_CTX *ctx)
return md->init;
}
int (*EVP_MD_meth_get_update(const EVP_MD *md))(EVP_MD_CTX *ctx,
- const void *data,
- size_t count)
+ const void *data,
+ size_t count)
{
return md->update;
}
int (*EVP_MD_meth_get_final(const EVP_MD *md))(EVP_MD_CTX *ctx,
- unsigned char *md)
+ unsigned char *md)
{
return md->final;
}
int (*EVP_MD_meth_get_copy(const EVP_MD *md))(EVP_MD_CTX *to,
- const EVP_MD_CTX *from)
+ const EVP_MD_CTX *from)
{
return md->copy;
}
@@ -1005,7 +997,7 @@ int (*EVP_MD_meth_get_cleanup(const EVP_MD *md))(EVP_MD_CTX *ctx)
return md->cleanup;
}
int (*EVP_MD_meth_get_ctrl(const EVP_MD *md))(EVP_MD_CTX *ctx, int cmd,
- int p1, void *p2)
+ int p1, void *p2)
{
return md->md_ctrl;
}
@@ -1045,8 +1037,9 @@ int EVP_MD_CTX_get_size_ex(const EVP_MD_CTX *ctx)
gettables = EVP_MD_CTX_gettable_params(c);
if (gettables != NULL
- && OSSL_PARAM_locate_const(gettables,
- OSSL_DIGEST_PARAM_SIZE) != NULL) {
+ && OSSL_PARAM_locate_const(gettables,
+ OSSL_DIGEST_PARAM_SIZE)
+ != NULL) {
OSSL_PARAM params[2] = { OSSL_PARAM_END, OSSL_PARAM_END };
size_t sz = 0;
@@ -1057,8 +1050,8 @@ int EVP_MD_CTX_get_size_ex(const EVP_MD_CTX *ctx)
*/
params[0] = OSSL_PARAM_construct_size_t(OSSL_DIGEST_PARAM_SIZE, &sz);
if (EVP_MD_CTX_get_params(c, params) != 1
- || sz > INT_MAX
- || sz == 0)
+ || sz > INT_MAX
+ || sz == 0)
return -1;
return (int)sz;
}
@@ -1098,14 +1091,14 @@ void *EVP_MD_CTX_get0_md_data(const EVP_MD_CTX *ctx)
}
int (*EVP_MD_CTX_update_fn(EVP_MD_CTX *ctx))(EVP_MD_CTX *ctx,
- const void *data, size_t count)
+ const void *data, size_t count)
{
return ctx->update;
}
void EVP_MD_CTX_set_update_fn(EVP_MD_CTX *ctx,
- int (*update) (EVP_MD_CTX *ctx,
- const void *data, size_t count))
+ int (*update)(EVP_MD_CTX *ctx,
+ const void *data, size_t count))
{
ctx->update = update;
}
@@ -1126,7 +1119,7 @@ int EVP_MD_CTX_test_flags(const EVP_MD_CTX *ctx, int flags)
}
static int evp_cipher_ctx_enable_use_bits(EVP_CIPHER_CTX *ctx,
- unsigned int enable)
+ unsigned int enable)
{
OSSL_PARAM params[] = { OSSL_PARAM_END, OSSL_PARAM_END };
@@ -1173,7 +1166,7 @@ int EVP_PKEY_CTX_set_group_name(EVP_PKEY_CTX *ctx, const char *name)
return -1;
params[0] = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_GROUP_NAME,
- (char *)name, 0);
+ (char *)name, 0);
return EVP_PKEY_CTX_set_params(ctx, params);
}
@@ -1193,12 +1186,12 @@ int EVP_PKEY_CTX_get_group_name(EVP_PKEY_CTX *ctx, char *name, size_t namelen)
return -1;
*p++ = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_GROUP_NAME,
- name, namelen);
+ name, namelen);
if (!EVP_PKEY_CTX_get_params(ctx, params))
return -1;
return 1;
}
-#endif /* !FIPS_MODULE */
+#endif /* !FIPS_MODULE */
/*
* evp_pkey_keygen() abstracts from the explicit use of B<EVP_PKEY_CTX>
@@ -1210,14 +1203,14 @@ int EVP_PKEY_CTX_get_group_name(EVP_PKEY_CTX *ctx, char *name, size_t namelen)
* such as the RSA modulus size or the name of an EC curve.
*/
static EVP_PKEY *evp_pkey_keygen(OSSL_LIB_CTX *libctx, const char *name,
- const char *propq, const OSSL_PARAM *params)
+ const char *propq, const OSSL_PARAM *params)
{
EVP_PKEY *pkey = NULL;
EVP_PKEY_CTX *ctx = EVP_PKEY_CTX_new_from_name(libctx, name, propq);
if (ctx != NULL
- && EVP_PKEY_keygen_init(ctx) > 0
- && EVP_PKEY_CTX_set_params(ctx, params))
+ && EVP_PKEY_keygen_init(ctx) > 0
+ && EVP_PKEY_CTX_set_params(ctx, params))
(void)EVP_PKEY_generate(ctx, &pkey);
EVP_PKEY_CTX_free(ctx);
@@ -1225,7 +1218,7 @@ static EVP_PKEY *evp_pkey_keygen(OSSL_LIB_CTX *libctx, const char *name,
}
EVP_PKEY *EVP_PKEY_Q_keygen(OSSL_LIB_CTX *libctx, const char *propq,
- const char *type, ...)
+ const char *type, ...)
{
va_list args;
size_t bits;
@@ -1241,7 +1234,7 @@ EVP_PKEY *EVP_PKEY_Q_keygen(OSSL_LIB_CTX *libctx, const char *propq,
} else if (OPENSSL_strcasecmp(type, "EC") == 0) {
name = va_arg(args, char *);
params[0] = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_GROUP_NAME,
- name, 0);
+ name, 0);
}
ret = evp_pkey_keygen(libctx, type, propq, params);
@@ -1253,7 +1246,7 @@ EVP_PKEY *EVP_PKEY_Q_keygen(OSSL_LIB_CTX *libctx, const char *propq,
#if !defined(FIPS_MODULE)
int EVP_CIPHER_CTX_set_algor_params(EVP_CIPHER_CTX *ctx, const X509_ALGOR *alg)
{
- int ret = -1; /* Assume the worst */
+ int ret = -1; /* Assume the worst */
unsigned char *der = NULL;
int derl = -1;
@@ -1277,7 +1270,7 @@ int EVP_CIPHER_CTX_set_algor_params(EVP_CIPHER_CTX *ctx, const X509_ALGOR *alg)
int EVP_CIPHER_CTX_get_algor_params(EVP_CIPHER_CTX *ctx, X509_ALGOR *alg)
{
- int ret = -1; /* Assume the worst */
+ int ret = -1; /* Assume the worst */
unsigned char *der = NULL;
size_t derl;
ASN1_TYPE *type = NULL;
@@ -1327,7 +1320,8 @@ int EVP_CIPHER_CTX_get_algor_params(EVP_CIPHER_CTX *ctx, X509_ALGOR *alg)
if (EVP_CIPHER_CTX_get_params(ctx, params)
&& OSSL_PARAM_modified(¶ms[i])
&& d2i_ASN1_TYPE(&type, (const unsigned char **)&derp,
- (int)derl) != NULL) {
+ (int)derl)
+ != NULL) {
/*
* Don't free alg->parameter, see comment further up.
* Worst case, alg->parameter gets assigned its own value.
@@ -1336,14 +1330,14 @@ int EVP_CIPHER_CTX_get_algor_params(EVP_CIPHER_CTX *ctx, X509_ALGOR *alg)
ret = 1;
}
}
- err:
+err:
OPENSSL_free(der);
return ret;
}
int EVP_CIPHER_CTX_get_algor(EVP_CIPHER_CTX *ctx, X509_ALGOR **alg)
{
- int ret = -1; /* Assume the worst */
+ int ret = -1; /* Assume the worst */
OSSL_PARAM params[2];
size_t aid_len = 0;
const char *k_aid = OSSL_SIGNATURE_PARAM_ALGORITHM_ID;
@@ -1375,13 +1369,13 @@ int EVP_CIPHER_CTX_get_algor(EVP_CIPHER_CTX *ctx, X509_ALGOR **alg)
}
OPENSSL_free(aid);
}
- err:
+err:
return ret;
}
int EVP_PKEY_CTX_set_algor_params(EVP_PKEY_CTX *ctx, const X509_ALGOR *alg)
{
- int ret = -1; /* Assume the worst */
+ int ret = -1; /* Assume the worst */
unsigned char *der = NULL;
int derl = -1;
@@ -1403,7 +1397,7 @@ int EVP_PKEY_CTX_set_algor_params(EVP_PKEY_CTX *ctx, const X509_ALGOR *alg)
int EVP_PKEY_CTX_get_algor_params(EVP_PKEY_CTX *ctx, X509_ALGOR *alg)
{
- int ret = -1; /* Assume the worst */
+ int ret = -1; /* Assume the worst */
OSSL_PARAM params[2];
unsigned char *der = NULL;
size_t derl;
@@ -1444,7 +1438,8 @@ int EVP_PKEY_CTX_get_algor_params(EVP_PKEY_CTX *ctx, X509_ALGOR *alg)
if (EVP_PKEY_CTX_get_params(ctx, params)
&& OSSL_PARAM_modified(¶ms[0])
&& d2i_ASN1_TYPE(&type, (const unsigned char **)&derp,
- (long)derl) != NULL) {
+ (long)derl)
+ != NULL) {
/*
* Don't free alg->parameter, see comment further up.
* Worst case, alg->parameter gets assigned its own value.
@@ -1453,14 +1448,14 @@ int EVP_PKEY_CTX_get_algor_params(EVP_PKEY_CTX *ctx, X509_ALGOR *alg)
ret = 1;
}
}
- err:
+err:
OPENSSL_free(der);
return ret;
}
int EVP_PKEY_CTX_get_algor(EVP_PKEY_CTX *ctx, X509_ALGOR **alg)
{
- int ret = -1; /* Assume the worst */
+ int ret = -1; /* Assume the worst */
OSSL_PARAM params[2];
size_t aid_len = 0;
const char *k_aid = OSSL_SIGNATURE_PARAM_ALGORITHM_ID;
@@ -1492,7 +1487,7 @@ int EVP_PKEY_CTX_get_algor(EVP_PKEY_CTX *ctx, X509_ALGOR **alg)
}
OPENSSL_free(aid);
}
- err:
+err:
return ret;
}
diff --git a/crypto/evp/evp_local.h b/crypto/evp/evp_local.h
index 9da138ede9..b3f9bafe23 100644
--- a/crypto/evp/evp_local.h
+++ b/crypto/evp/evp_local.h
@@ -12,16 +12,15 @@
#define EVP_CTRL_RET_UNSUPPORTED -1
-
struct evp_md_ctx_st {
- const EVP_MD *reqdigest; /* The original requested digest */
+ const EVP_MD *reqdigest; /* The original requested digest */
const EVP_MD *digest;
unsigned long flags;
void *md_data;
/* Public key context for sign/verify */
EVP_PKEY_CTX *pctx;
/* Update function: usually copied from EVP_MD */
- int (*update) (EVP_MD_CTX *ctx, const void *data, size_t count);
+ int (*update)(EVP_MD_CTX *ctx, const void *data, size_t count);
/*
* Opaque ctx returned from a providers digest algorithm implementation
@@ -29,22 +28,22 @@ struct evp_md_ctx_st {
*/
void *algctx;
EVP_MD *fetched_digest;
-} /* EVP_MD_CTX */ ;
+} /* EVP_MD_CTX */;
struct evp_cipher_ctx_st {
const EVP_CIPHER *cipher;
- int encrypt; /* encrypt or decrypt */
- int buf_len; /* number we have left */
+ int encrypt; /* encrypt or decrypt */
+ int buf_len; /* number we have left */
unsigned char oiv[EVP_MAX_IV_LENGTH]; /* original iv */
unsigned char iv[EVP_MAX_IV_LENGTH]; /* working iv */
unsigned char buf[EVP_MAX_BLOCK_LENGTH]; /* saved partial block */
- int num; /* used by cfb/ofb/ctr mode */
+ int num; /* used by cfb/ofb/ctr mode */
/* FIXME: Should this even exist? It appears unused */
- void *app_data; /* application stuff */
- int key_len; /* May change for variable length cipher */
- int iv_len; /* IV length */
- unsigned long flags; /* Various flags */
- void *cipher_data; /* per EVP data */
+ void *app_data; /* application stuff */
+ int key_len; /* May change for variable length cipher */
+ int iv_len; /* IV length */
+ unsigned long flags; /* Various flags */
+ void *cipher_data; /* per EVP data */
int final_used;
int block_mask;
unsigned char final[EVP_MAX_BLOCK_LENGTH]; /* possible final block */
@@ -56,10 +55,10 @@ struct evp_cipher_ctx_st {
*/
void *algctx;
EVP_CIPHER *fetched_cipher;
-} /* EVP_CIPHER_CTX */ ;
+} /* EVP_CIPHER_CTX */;
struct evp_mac_ctx_st {
- EVP_MAC *meth; /* Method structure */
+ EVP_MAC *meth; /* Method structure */
/*
* Opaque ctx returned from a providers MAC algorithm implementation
* OSSL_FUNC_mac_newctx()
@@ -68,28 +67,28 @@ struct evp_mac_ctx_st {
} /* EVP_MAC_CTX */;
struct evp_kdf_ctx_st {
- EVP_KDF *meth; /* Method structure */
+ EVP_KDF *meth; /* Method structure */
/*
* Opaque ctx returned from a providers KDF algorithm implementation
* OSSL_FUNC_kdf_newctx()
*/
void *algctx;
-} /* EVP_KDF_CTX */ ;
+} /* EVP_KDF_CTX */;
struct evp_rand_ctx_st {
- EVP_RAND *meth; /* Method structure */
+ EVP_RAND *meth; /* Method structure */
/*
* Opaque ctx returned from a providers rand algorithm implementation
* OSSL_FUNC_rand_newctx()
*/
void *algctx;
- EVP_RAND_CTX *parent; /* Parent EVP_RAND or NULL if none */
- CRYPTO_REF_COUNT refcnt; /* Context reference count */
+ EVP_RAND_CTX *parent; /* Parent EVP_RAND or NULL if none */
+ CRYPTO_REF_COUNT refcnt; /* Context reference count */
CRYPTO_RWLOCK *refcnt_lock;
-} /* EVP_RAND_CTX */ ;
+} /* EVP_RAND_CTX */;
struct evp_keymgmt_st {
- int id; /* libcrypto internal */
+ int id; /* libcrypto internal */
int name_id;
/* NID for the legacy alg if there is one */
@@ -133,7 +132,7 @@ struct evp_keymgmt_st {
OSSL_FUNC_keymgmt_export_types_fn *export_types;
OSSL_FUNC_keymgmt_export_types_ex_fn *export_types_ex;
OSSL_FUNC_keymgmt_dup_fn *dup;
-} /* EVP_KEYMGMT */ ;
+} /* EVP_KEYMGMT */;
struct evp_keyexch_st {
int name_id;
@@ -264,13 +263,13 @@ struct evp_kem_st {
} /* EVP_KEM */;
int PKCS5_v2_PBKDF2_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass,
- int passlen, ASN1_TYPE *param,
- const EVP_CIPHER *c, const EVP_MD *md,
- int en_de);
+ int passlen, ASN1_TYPE *param,
+ const EVP_CIPHER *c, const EVP_MD *md,
+ int en_de);
int PKCS5_v2_PBKDF2_keyivgen_ex(EVP_CIPHER_CTX *ctx, const char *pass,
- int passlen, ASN1_TYPE *param,
- const EVP_CIPHER *c, const EVP_MD *md,
- int en_de, OSSL_LIB_CTX *libctx, const char *propq);
+ int passlen, ASN1_TYPE *param,
+ const EVP_CIPHER *c, const EVP_MD *md,
+ int en_de, OSSL_LIB_CTX *libctx, const char *propq);
struct evp_Encode_Ctx_st {
/* number saved in a partial encode/decode */
@@ -297,64 +296,64 @@ int ossl_is_partially_overlapping(const void *ptr1, const void *ptr2, int len);
#include <openssl/core.h>
void *evp_generic_fetch(OSSL_LIB_CTX *ctx, int operation_id,
- const char *name, const char *properties,
- void *(*new_method)(int name_id,
- const OSSL_ALGORITHM *algodef,
- OSSL_PROVIDER *prov),
- int (*up_ref_method)(void *),
- void (*free_method)(void *));
+ const char *name, const char *properties,
+ void *(*new_method)(int name_id,
+ const OSSL_ALGORITHM *algodef,
+ OSSL_PROVIDER *prov),
+ int (*up_ref_method)(void *),
+ void (*free_method)(void *));
void *evp_generic_fetch_from_prov(OSSL_PROVIDER *prov, int operation_id,
- const char *name, const char *properties,
- void *(*new_method)(int name_id,
- const OSSL_ALGORITHM *algodef,
- OSSL_PROVIDER *prov),
- int (*up_ref_method)(void *),
- void (*free_method)(void *));
+ const char *name, const char *properties,
+ void *(*new_method)(int name_id,
+ const OSSL_ALGORITHM *algodef,
+ OSSL_PROVIDER *prov),
+ int (*up_ref_method)(void *),
+ void (*free_method)(void *));
void evp_generic_do_all_prefetched(OSSL_LIB_CTX *libctx, int operation_id,
- void (*user_fn)(void *method, void *arg),
- void *user_arg);
+ void (*user_fn)(void *method, void *arg),
+ void *user_arg);
void evp_generic_do_all(OSSL_LIB_CTX *libctx, int operation_id,
- void (*user_fn)(void *method, void *arg),
- void *user_arg,
- void *(*new_method)(int name_id,
- const OSSL_ALGORITHM *algodef,
- OSSL_PROVIDER *prov),
- int (*up_ref_method)(void *),
- void (*free_method)(void *));
+ void (*user_fn)(void *method, void *arg),
+ void *user_arg,
+ void *(*new_method)(int name_id,
+ const OSSL_ALGORITHM *algodef,
+ OSSL_PROVIDER *prov),
+ int (*up_ref_method)(void *),
+ void (*free_method)(void *));
/* Internal fetchers for method types that are to be combined with others */
EVP_KEYMGMT *evp_keymgmt_fetch_by_number(OSSL_LIB_CTX *ctx, int name_id,
- const char *properties);
+ const char *properties);
EVP_SIGNATURE *evp_signature_fetch_from_prov(OSSL_PROVIDER *prov,
- const char *name,
- const char *properties);
+ const char *name,
+ const char *properties);
EVP_ASYM_CIPHER *evp_asym_cipher_fetch_from_prov(OSSL_PROVIDER *prov,
- const char *name,
- const char *properties);
+ const char *name,
+ const char *properties);
EVP_KEYEXCH *evp_keyexch_fetch_from_prov(OSSL_PROVIDER *prov,
- const char *name,
- const char *properties);
+ const char *name,
+ const char *properties);
EVP_KEM *evp_kem_fetch_from_prov(OSSL_PROVIDER *prov,
- const char *name,
- const char *properties);
+ const char *name,
+ const char *properties);
EVP_CIPHER *evp_cipher_fetch_from_prov(OSSL_PROVIDER *prov,
- const char *algorithm,
- const char *properties);
+ const char *algorithm,
+ const char *properties);
EVP_MD *evp_digest_fetch_from_prov(OSSL_PROVIDER *prov,
- const char *algorithm,
- const char *properties);
+ const char *algorithm,
+ const char *properties);
EVP_MAC *evp_mac_fetch_from_prov(OSSL_PROVIDER *prov,
- const char *algorithm,
- const char *properties);
+ const char *algorithm,
+ const char *properties);
/* Internal structure constructors for fetched methods */
EVP_MD *evp_md_new(void);
EVP_CIPHER *evp_cipher_new(void);
int evp_cipher_get_asn1_aead_params(EVP_CIPHER_CTX *c, ASN1_TYPE *type,
- evp_cipher_aead_asn1_params *asn1_params);
+ evp_cipher_aead_asn1_params *asn1_params);
int evp_cipher_set_asn1_aead_params(EVP_CIPHER_CTX *c, ASN1_TYPE *type,
- evp_cipher_aead_asn1_params *asn1_params);
+ evp_cipher_aead_asn1_params *asn1_params);
/* Helper functions to avoid duplicating code */
@@ -371,33 +370,33 @@ int evp_cipher_set_asn1_aead_params(EVP_CIPHER_CTX *c, ASN1_TYPE *type,
*/
int evp_do_ciph_getparams(const EVP_CIPHER *ciph, OSSL_PARAM params[]);
int evp_do_ciph_ctx_getparams(const EVP_CIPHER *ciph, void *provctx,
- OSSL_PARAM params[]);
+ OSSL_PARAM params[]);
int evp_do_ciph_ctx_setparams(const EVP_CIPHER *ciph, void *provctx,
- OSSL_PARAM params[]);
+ OSSL_PARAM params[]);
int evp_do_md_getparams(const EVP_MD *md, OSSL_PARAM params[]);
int evp_do_md_ctx_getparams(const EVP_MD *md, void *provctx,
- OSSL_PARAM params[]);
+ OSSL_PARAM params[]);
int evp_do_md_ctx_setparams(const EVP_MD *md, void *provctx,
- OSSL_PARAM params[]);
+ OSSL_PARAM params[]);
OSSL_PARAM *evp_pkey_to_param(EVP_PKEY *pkey, size_t *sz);
-#define M_check_autoarg(ctx, arg, arglen, err) \
- if (ctx->pmeth->flags & EVP_PKEY_FLAG_AUTOARGLEN) { \
- size_t pksize = (size_t)EVP_PKEY_get_size(ctx->pkey); \
- \
- if (pksize == 0) { \
- ERR_raise(ERR_LIB_EVP, EVP_R_INVALID_KEY); /*ckerr_ignore*/ \
- return 0; \
- } \
- if (arg == NULL) { \
- *arglen = pksize; \
- return 1; \
- } \
- if (*arglen < pksize) { \
+#define M_check_autoarg(ctx, arg, arglen, err) \
+ if (ctx->pmeth->flags & EVP_PKEY_FLAG_AUTOARGLEN) { \
+ size_t pksize = (size_t)EVP_PKEY_get_size(ctx->pkey); \
+ \
+ if (pksize == 0) { \
+ ERR_raise(ERR_LIB_EVP, EVP_R_INVALID_KEY); /*ckerr_ignore*/ \
+ return 0; \
+ } \
+ if (arg == NULL) { \
+ *arglen = pksize; \
+ return 1; \
+ } \
+ if (*arglen < pksize) { \
ERR_raise(ERR_LIB_EVP, EVP_R_BUFFER_TOO_SMALL); /*ckerr_ignore*/ \
- return 0; \
- } \
+ return 0; \
+ } \
}
void evp_pkey_ctx_free_old_ops(EVP_PKEY_CTX *ctx);
@@ -406,8 +405,8 @@ void evp_md_free_int(EVP_MD *md);
/* OSSL_PROVIDER * is only used to get the library context */
int evp_is_a(OSSL_PROVIDER *prov, int number,
- const char *legacy_name, const char *name);
+ const char *legacy_name, const char *name);
int evp_names_do_all(OSSL_PROVIDER *prov, int number,
- void (*fn)(const char *name, void *data),
- void *data);
+ void (*fn)(const char *name, void *data),
+ void *data);
int evp_cipher_cache_constants(EVP_CIPHER *cipher);
diff --git a/crypto/evp/evp_pbe.c b/crypto/evp/evp_pbe.c
index 101b32a771..27e8925377 100644
--- a/crypto/evp/evp_pbe.c
+++ b/crypto/evp/evp_pbe.c
@@ -33,70 +33,69 @@ struct evp_pbe_st {
static STACK_OF(EVP_PBE_CTL) *pbe_algs;
static const EVP_PBE_CTL builtin_pbe[] = {
- {EVP_PBE_TYPE_OUTER, NID_pbeWithMD2AndDES_CBC,
- NID_des_cbc, NID_md2, PKCS5_PBE_keyivgen, PKCS5_PBE_keyivgen_ex},
- {EVP_PBE_TYPE_OUTER, NID_pbeWithMD5AndDES_CBC,
- NID_des_cbc, NID_md5, PKCS5_PBE_keyivgen, PKCS5_PBE_keyivgen_ex},
- {EVP_PBE_TYPE_OUTER, NID_pbeWithSHA1AndRC2_CBC,
- NID_rc2_64_cbc, NID_sha1, PKCS5_PBE_keyivgen, PKCS5_PBE_keyivgen_ex},
-
- {EVP_PBE_TYPE_OUTER, NID_id_pbkdf2, -1, -1, PKCS5_v2_PBKDF2_keyivgen,
- PKCS5_v2_PBKDF2_keyivgen_ex},
-
- {EVP_PBE_TYPE_OUTER, NID_pbe_WithSHA1And128BitRC4,
- NID_rc4, NID_sha1, PKCS12_PBE_keyivgen, &PKCS12_PBE_keyivgen_ex},
- {EVP_PBE_TYPE_OUTER, NID_pbe_WithSHA1And40BitRC4,
- NID_rc4_40, NID_sha1, PKCS12_PBE_keyivgen, &PKCS12_PBE_keyivgen_ex},
- {EVP_PBE_TYPE_OUTER, NID_pbe_WithSHA1And3_Key_TripleDES_CBC,
- NID_des_ede3_cbc, NID_sha1, PKCS12_PBE_keyivgen, &PKCS12_PBE_keyivgen_ex},
- {EVP_PBE_TYPE_OUTER, NID_pbe_WithSHA1And2_Key_TripleDES_CBC,
- NID_des_ede_cbc, NID_sha1, PKCS12_PBE_keyivgen, &PKCS12_PBE_keyivgen_ex},
- {EVP_PBE_TYPE_OUTER, NID_pbe_WithSHA1And128BitRC2_CBC,
- NID_rc2_cbc, NID_sha1, PKCS12_PBE_keyivgen, &PKCS12_PBE_keyivgen_ex},
- {EVP_PBE_TYPE_OUTER, NID_pbe_WithSHA1And40BitRC2_CBC,
- NID_rc2_40_cbc, NID_sha1, PKCS12_PBE_keyivgen, &PKCS12_PBE_keyivgen_ex},
-
- {EVP_PBE_TYPE_OUTER, NID_pbes2, -1, -1, PKCS5_v2_PBE_keyivgen, &PKCS5_v2_PBE_keyivgen_ex},
-
- {EVP_PBE_TYPE_OUTER, NID_pbeWithMD2AndRC2_CBC,
- NID_rc2_64_cbc, NID_md2, PKCS5_PBE_keyivgen, PKCS5_PBE_keyivgen_ex},
- {EVP_PBE_TYPE_OUTER, NID_pbeWithMD5AndRC2_CBC,
- NID_rc2_64_cbc, NID_md5, PKCS5_PBE_keyivgen, PKCS5_PBE_keyivgen_ex},
- {EVP_PBE_TYPE_OUTER, NID_pbeWithSHA1AndDES_CBC,
- NID_des_cbc, NID_sha1, PKCS5_PBE_keyivgen, PKCS5_PBE_keyivgen_ex},
-
- {EVP_PBE_TYPE_PRF, NID_hmacWithSHA1, -1, NID_sha1, 0},
- {EVP_PBE_TYPE_PRF, NID_hmac_md5, -1, NID_md5, 0},
- {EVP_PBE_TYPE_PRF, NID_hmac_sha1, -1, NID_sha1, 0},
- {EVP_PBE_TYPE_PRF, NID_hmacWithMD5, -1, NID_md5, 0},
- {EVP_PBE_TYPE_PRF, NID_hmacWithSHA224, -1, NID_sha224, 0},
- {EVP_PBE_TYPE_PRF, NID_hmacWithSHA256, -1, NID_sha256, 0},
- {EVP_PBE_TYPE_PRF, NID_hmacWithSHA384, -1, NID_sha384, 0},
- {EVP_PBE_TYPE_PRF, NID_hmacWithSHA512, -1, NID_sha512, 0},
- {EVP_PBE_TYPE_PRF, NID_id_HMACGostR3411_94, -1, NID_id_GostR3411_94, 0},
- {EVP_PBE_TYPE_PRF, NID_id_tc26_hmac_gost_3411_2012_256, -1,
- NID_id_GostR3411_2012_256, 0},
- {EVP_PBE_TYPE_PRF, NID_id_tc26_hmac_gost_3411_2012_512, -1,
- NID_id_GostR3411_2012_512, 0},
- {EVP_PBE_TYPE_PRF, NID_hmac_sha3_224, -1, NID_sha3_224, 0},
- {EVP_PBE_TYPE_PRF, NID_hmac_sha3_256, -1, NID_sha3_256, 0},
- {EVP_PBE_TYPE_PRF, NID_hmac_sha3_384, -1, NID_sha3_384, 0},
- {EVP_PBE_TYPE_PRF, NID_hmac_sha3_512, -1, NID_sha3_512, 0},
- {EVP_PBE_TYPE_PRF, NID_hmacWithSHA512_224, -1, NID_sha512_224, 0},
- {EVP_PBE_TYPE_PRF, NID_hmacWithSHA512_256, -1, NID_sha512_256, 0},
+ { EVP_PBE_TYPE_OUTER, NID_pbeWithMD2AndDES_CBC,
+ NID_des_cbc, NID_md2, PKCS5_PBE_keyivgen, PKCS5_PBE_keyivgen_ex },
+ { EVP_PBE_TYPE_OUTER, NID_pbeWithMD5AndDES_CBC,
+ NID_des_cbc, NID_md5, PKCS5_PBE_keyivgen, PKCS5_PBE_keyivgen_ex },
+ { EVP_PBE_TYPE_OUTER, NID_pbeWithSHA1AndRC2_CBC,
+ NID_rc2_64_cbc, NID_sha1, PKCS5_PBE_keyivgen, PKCS5_PBE_keyivgen_ex },
+
+ { EVP_PBE_TYPE_OUTER, NID_id_pbkdf2, -1, -1, PKCS5_v2_PBKDF2_keyivgen,
+ PKCS5_v2_PBKDF2_keyivgen_ex },
+
+ { EVP_PBE_TYPE_OUTER, NID_pbe_WithSHA1And128BitRC4,
+ NID_rc4, NID_sha1, PKCS12_PBE_keyivgen, &PKCS12_PBE_keyivgen_ex },
+ { EVP_PBE_TYPE_OUTER, NID_pbe_WithSHA1And40BitRC4,
+ NID_rc4_40, NID_sha1, PKCS12_PBE_keyivgen, &PKCS12_PBE_keyivgen_ex },
+ { EVP_PBE_TYPE_OUTER, NID_pbe_WithSHA1And3_Key_TripleDES_CBC,
+ NID_des_ede3_cbc, NID_sha1, PKCS12_PBE_keyivgen, &PKCS12_PBE_keyivgen_ex },
+ { EVP_PBE_TYPE_OUTER, NID_pbe_WithSHA1And2_Key_TripleDES_CBC,
+ NID_des_ede_cbc, NID_sha1, PKCS12_PBE_keyivgen, &PKCS12_PBE_keyivgen_ex },
+ { EVP_PBE_TYPE_OUTER, NID_pbe_WithSHA1And128BitRC2_CBC,
+ NID_rc2_cbc, NID_sha1, PKCS12_PBE_keyivgen, &PKCS12_PBE_keyivgen_ex },
+ { EVP_PBE_TYPE_OUTER, NID_pbe_WithSHA1And40BitRC2_CBC,
+ NID_rc2_40_cbc, NID_sha1, PKCS12_PBE_keyivgen, &PKCS12_PBE_keyivgen_ex },
+
+ { EVP_PBE_TYPE_OUTER, NID_pbes2, -1, -1, PKCS5_v2_PBE_keyivgen, &PKCS5_v2_PBE_keyivgen_ex },
+
+ { EVP_PBE_TYPE_OUTER, NID_pbeWithMD2AndRC2_CBC,
+ NID_rc2_64_cbc, NID_md2, PKCS5_PBE_keyivgen, PKCS5_PBE_keyivgen_ex },
+ { EVP_PBE_TYPE_OUTER, NID_pbeWithMD5AndRC2_CBC,
+ NID_rc2_64_cbc, NID_md5, PKCS5_PBE_keyivgen, PKCS5_PBE_keyivgen_ex },
+ { EVP_PBE_TYPE_OUTER, NID_pbeWithSHA1AndDES_CBC,
+ NID_des_cbc, NID_sha1, PKCS5_PBE_keyivgen, PKCS5_PBE_keyivgen_ex },
+
+ { EVP_PBE_TYPE_PRF, NID_hmacWithSHA1, -1, NID_sha1, 0 },
+ { EVP_PBE_TYPE_PRF, NID_hmac_md5, -1, NID_md5, 0 },
+ { EVP_PBE_TYPE_PRF, NID_hmac_sha1, -1, NID_sha1, 0 },
+ { EVP_PBE_TYPE_PRF, NID_hmacWithMD5, -1, NID_md5, 0 },
+ { EVP_PBE_TYPE_PRF, NID_hmacWithSHA224, -1, NID_sha224, 0 },
+ { EVP_PBE_TYPE_PRF, NID_hmacWithSHA256, -1, NID_sha256, 0 },
+ { EVP_PBE_TYPE_PRF, NID_hmacWithSHA384, -1, NID_sha384, 0 },
+ { EVP_PBE_TYPE_PRF, NID_hmacWithSHA512, -1, NID_sha512, 0 },
+ { EVP_PBE_TYPE_PRF, NID_id_HMACGostR3411_94, -1, NID_id_GostR3411_94, 0 },
+ { EVP_PBE_TYPE_PRF, NID_id_tc26_hmac_gost_3411_2012_256, -1,
+ NID_id_GostR3411_2012_256, 0 },
+ { EVP_PBE_TYPE_PRF, NID_id_tc26_hmac_gost_3411_2012_512, -1,
+ NID_id_GostR3411_2012_512, 0 },
+ { EVP_PBE_TYPE_PRF, NID_hmac_sha3_224, -1, NID_sha3_224, 0 },
+ { EVP_PBE_TYPE_PRF, NID_hmac_sha3_256, -1, NID_sha3_256, 0 },
+ { EVP_PBE_TYPE_PRF, NID_hmac_sha3_384, -1, NID_sha3_384, 0 },
+ { EVP_PBE_TYPE_PRF, NID_hmac_sha3_512, -1, NID_sha3_512, 0 },
+ { EVP_PBE_TYPE_PRF, NID_hmacWithSHA512_224, -1, NID_sha512_224, 0 },
+ { EVP_PBE_TYPE_PRF, NID_hmacWithSHA512_256, -1, NID_sha512_256, 0 },
#ifndef OPENSSL_NO_SM3
- {EVP_PBE_TYPE_PRF, NID_hmacWithSM3, -1, NID_sm3, 0},
+ { EVP_PBE_TYPE_PRF, NID_hmacWithSM3, -1, NID_sm3, 0 },
#endif
- {EVP_PBE_TYPE_KDF, NID_id_pbkdf2, -1, -1, PKCS5_v2_PBKDF2_keyivgen, &PKCS5_v2_PBKDF2_keyivgen_ex},
+ { EVP_PBE_TYPE_KDF, NID_id_pbkdf2, -1, -1, PKCS5_v2_PBKDF2_keyivgen, &PKCS5_v2_PBKDF2_keyivgen_ex },
#ifndef OPENSSL_NO_SCRYPT
- {EVP_PBE_TYPE_KDF, NID_id_scrypt, -1, -1, PKCS5_v2_scrypt_keyivgen, &PKCS5_v2_scrypt_keyivgen_ex}
+ { EVP_PBE_TYPE_KDF, NID_id_scrypt, -1, -1, PKCS5_v2_scrypt_keyivgen, &PKCS5_v2_scrypt_keyivgen_ex }
#endif
};
-
int EVP_PBE_CipherInit_ex(ASN1_OBJECT *pbe_obj, const char *pass, int passlen,
- ASN1_TYPE *param, EVP_CIPHER_CTX *ctx, int en_de,
- OSSL_LIB_CTX *libctx, const char *propq)
+ ASN1_TYPE *param, EVP_CIPHER_CTX *ctx, int en_de,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
const EVP_CIPHER *cipher = NULL;
EVP_CIPHER *cipher_fetch = NULL;
@@ -107,7 +106,7 @@ int EVP_PBE_CipherInit_ex(ASN1_OBJECT *pbe_obj, const char *pass, int passlen,
EVP_PBE_KEYGEN *keygen;
if (!EVP_PBE_find_ex(EVP_PBE_TYPE_OUTER, OBJ_obj2nid(pbe_obj),
- &cipher_nid, &md_nid, &keygen, &keygen_ex)) {
+ &cipher_nid, &md_nid, &keygen, &keygen_ex)) {
char obj_tmp[80];
if (pbe_obj == NULL)
@@ -115,7 +114,7 @@ int EVP_PBE_CipherInit_ex(ASN1_OBJECT *pbe_obj, const char *pass, int passlen,
else
i2t_ASN1_OBJECT(obj_tmp, sizeof(obj_tmp), pbe_obj);
ERR_raise_data(ERR_LIB_EVP, EVP_R_UNKNOWN_PBE_ALGORITHM,
- "TYPE=%s", obj_tmp);
+ "TYPE=%s", obj_tmp);
goto err;
}
@@ -133,7 +132,7 @@ int EVP_PBE_CipherInit_ex(ASN1_OBJECT *pbe_obj, const char *pass, int passlen,
if (cipher == NULL) {
(void)ERR_clear_last_mark();
ERR_raise_data(ERR_LIB_EVP, EVP_R_UNKNOWN_CIPHER,
- OBJ_nid2sn(cipher_nid));
+ OBJ_nid2sn(cipher_nid));
goto err;
}
(void)ERR_pop_to_mark();
@@ -168,7 +167,7 @@ err:
}
int EVP_PBE_CipherInit(ASN1_OBJECT *pbe_obj, const char *pass, int passlen,
- ASN1_TYPE *param, EVP_CIPHER_CTX *ctx, int en_de)
+ ASN1_TYPE *param, EVP_CIPHER_CTX *ctx, int en_de)
{
return EVP_PBE_CipherInit_ex(pbe_obj, pass, passlen, param, ctx, en_de, NULL, NULL);
}
@@ -198,7 +197,7 @@ static int pbe_cmp(const EVP_PBE_CTL *const *a, const EVP_PBE_CTL *const *b)
/* Add a PBE algorithm */
int EVP_PBE_alg_add_type(int pbe_type, int pbe_nid, int cipher_nid,
- int md_nid, EVP_PBE_KEYGEN *keygen)
+ int md_nid, EVP_PBE_KEYGEN *keygen)
{
EVP_PBE_CTL *pbe_tmp = NULL;
@@ -225,13 +224,13 @@ int EVP_PBE_alg_add_type(int pbe_type, int pbe_nid, int cipher_nid,
}
return 1;
- err:
+err:
OPENSSL_free(pbe_tmp);
return 0;
}
int EVP_PBE_alg_add(int nid, const EVP_CIPHER *cipher, const EVP_MD *md,
- EVP_PBE_KEYGEN *keygen)
+ EVP_PBE_KEYGEN *keygen)
{
int cipher_nid, md_nid;
@@ -245,11 +244,11 @@ int EVP_PBE_alg_add(int nid, const EVP_CIPHER *cipher, const EVP_MD *md,
md_nid = -1;
return EVP_PBE_alg_add_type(EVP_PBE_TYPE_OUTER, nid,
- cipher_nid, md_nid, keygen);
+ cipher_nid, md_nid, keygen);
}
int EVP_PBE_find_ex(int type, int pbe_nid, int *pcnid, int *pmnid,
- EVP_PBE_KEYGEN **pkeygen, EVP_PBE_KEYGEN_EX **pkeygen_ex)
+ EVP_PBE_KEYGEN **pkeygen, EVP_PBE_KEYGEN_EX **pkeygen_ex)
{
EVP_PBE_CTL *pbetmp = NULL, pbelu;
int i;
@@ -282,7 +281,7 @@ int EVP_PBE_find_ex(int type, int pbe_nid, int *pcnid, int *pmnid,
}
int EVP_PBE_find(int type, int pbe_nid,
- int *pcnid, int *pmnid, EVP_PBE_KEYGEN **pkeygen)
+ int *pcnid, int *pmnid, EVP_PBE_KEYGEN **pkeygen)
{
return EVP_PBE_find_ex(type, pbe_nid, pcnid, pmnid, pkeygen, NULL);
}
diff --git a/crypto/evp/evp_pkey.c b/crypto/evp/evp_pkey.c
index d8e4b31314..690839cffb 100644
--- a/crypto/evp/evp_pkey.c
+++ b/crypto/evp/evp_pkey.c
@@ -28,7 +28,7 @@
/* Extract a private key from a PKCS8 structure */
EVP_PKEY *evp_pkcs82pkey_legacy(const PKCS8_PRIV_KEY_INFO *p8, OSSL_LIB_CTX *libctx,
- const char *propq)
+ const char *propq)
{
EVP_PKEY *pkey = NULL;
const ASN1_OBJECT *algoid;
@@ -45,7 +45,7 @@ EVP_PKEY *evp_pkcs82pkey_legacy(const PKCS8_PRIV_KEY_INFO *p8, OSSL_LIB_CTX *lib
if (!EVP_PKEY_set_type(pkey, OBJ_obj2nid(algoid))) {
i2t_ASN1_OBJECT(obj_tmp, 80, algoid);
ERR_raise_data(ERR_LIB_EVP, EVP_R_UNSUPPORTED_PRIVATE_KEY_ALGORITHM,
- "TYPE=%s", obj_tmp);
+ "TYPE=%s", obj_tmp);
goto error;
}
@@ -64,13 +64,13 @@ EVP_PKEY *evp_pkcs82pkey_legacy(const PKCS8_PRIV_KEY_INFO *p8, OSSL_LIB_CTX *lib
return pkey;
- error:
+error:
EVP_PKEY_free(pkey);
return NULL;
}
EVP_PKEY *EVP_PKCS82PKEY_ex(const PKCS8_PRIV_KEY_INFO *p8, OSSL_LIB_CTX *libctx,
- const char *propq)
+ const char *propq)
{
EVP_PKEY *pkey = NULL;
const unsigned char *p8_data = NULL;
@@ -83,19 +83,19 @@ EVP_PKEY *EVP_PKCS82PKEY_ex(const PKCS8_PRIV_KEY_INFO *p8, OSSL_LIB_CTX *libctx,
char keytype[OSSL_MAX_NAME_SIZE];
if (p8 == NULL
- || !PKCS8_pkey_get0(&algoid, NULL, NULL, NULL, p8)
- || !OBJ_obj2txt(keytype, sizeof(keytype), algoid, 0))
+ || !PKCS8_pkey_get0(&algoid, NULL, NULL, NULL, p8)
+ || !OBJ_obj2txt(keytype, sizeof(keytype), algoid, 0))
return NULL;
if ((encoded_len = i2d_PKCS8_PRIV_KEY_INFO(p8, &encoded_data)) <= 0
- || encoded_data == NULL)
+ || encoded_data == NULL)
return NULL;
p8_data = encoded_data;
len = encoded_len;
selection = EVP_PKEY_KEYPAIR | EVP_PKEY_KEY_PARAMETERS;
dctx = OSSL_DECODER_CTX_new_for_pkey(&pkey, "DER", "PrivateKeyInfo",
- keytype, selection, libctx, propq);
+ keytype, selection, libctx, propq);
if (dctx != NULL && OSSL_DECODER_CTX_get_num_decoders(dctx) == 0) {
OSSL_DECODER_CTX_free(dctx);
@@ -106,7 +106,7 @@ EVP_PKEY *EVP_PKCS82PKEY_ex(const PKCS8_PRIV_KEY_INFO *p8, OSSL_LIB_CTX *libctx,
* keytype
*/
dctx = OSSL_DECODER_CTX_new_for_pkey(&pkey, "DER", "PrivateKeyInfo",
- NULL, selection, libctx, propq);
+ NULL, selection, libctx, propq);
}
if (dctx == NULL
@@ -143,8 +143,9 @@ PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8(const EVP_PKEY *pkey)
const unsigned char *pp;
if ((ctx = OSSL_ENCODER_CTX_new_for_pkey(pkey, selection,
- "DER", "PrivateKeyInfo",
- NULL)) == NULL
+ "DER", "PrivateKeyInfo",
+ NULL))
+ == NULL
|| !OSSL_ENCODER_to_data(ctx, &der, &derlen))
goto error;
@@ -155,7 +156,7 @@ PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8(const EVP_PKEY *pkey)
goto error;
} else {
p8 = PKCS8_PRIV_KEY_INFO_new();
- if (p8 == NULL) {
+ if (p8 == NULL) {
ERR_raise(ERR_LIB_EVP, ERR_R_ASN1_LIB);
return NULL;
}
@@ -176,13 +177,12 @@ PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8(const EVP_PKEY *pkey)
}
}
goto end;
- error:
+error:
PKCS8_PRIV_KEY_INFO_free(p8);
p8 = NULL;
- end:
+end:
OSSL_ENCODER_CTX_free(ctx);
return p8;
-
}
/* EVP_PKEY attribute functions */
@@ -198,7 +198,7 @@ int EVP_PKEY_get_attr_by_NID(const EVP_PKEY *key, int nid, int lastpos)
}
int EVP_PKEY_get_attr_by_OBJ(const EVP_PKEY *key, const ASN1_OBJECT *obj,
- int lastpos)
+ int lastpos)
{
return X509at_get_attr_by_OBJ(key->attributes, obj, lastpos);
}
@@ -221,8 +221,8 @@ int EVP_PKEY_add1_attr(EVP_PKEY *key, X509_ATTRIBUTE *attr)
}
int EVP_PKEY_add1_attr_by_OBJ(EVP_PKEY *key,
- const ASN1_OBJECT *obj, int type,
- const unsigned char *bytes, int len)
+ const ASN1_OBJECT *obj, int type,
+ const unsigned char *bytes, int len)
{
if (X509at_add1_attr_by_OBJ(&key->attributes, obj, type, bytes, len))
return 1;
@@ -230,8 +230,8 @@ int EVP_PKEY_add1_attr_by_OBJ(EVP_PKEY *key,
}
int EVP_PKEY_add1_attr_by_NID(EVP_PKEY *key,
- int nid, int type,
- const unsigned char *bytes, int len)
+ int nid, int type,
+ const unsigned char *bytes, int len)
{
if (X509at_add1_attr_by_NID(&key->attributes, nid, type, bytes, len))
return 1;
@@ -239,8 +239,8 @@ int EVP_PKEY_add1_attr_by_NID(EVP_PKEY *key,
}
int EVP_PKEY_add1_attr_by_txt(EVP_PKEY *key,
- const char *attrname, int type,
- const unsigned char *bytes, int len)
+ const char *attrname, int type,
+ const unsigned char *bytes, int len)
{
if (X509at_add1_attr_by_txt(&key->attributes, attrname, type, bytes, len))
return 1;
@@ -262,7 +262,7 @@ const char *EVP_PKEY_get0_type_name(const EVP_PKEY *key)
ameth = EVP_PKEY_get0_asn1(key);
if (ameth != NULL)
EVP_PKEY_asn1_get0_info(NULL, NULL,
- NULL, NULL, &name, ameth);
+ NULL, NULL, &name, ameth);
#endif
return name;
diff --git a/crypto/evp/evp_pkey_type.c b/crypto/evp/evp_pkey_type.c
index 70ca5aee77..7d9f82d72a 100644
--- a/crypto/evp/evp_pkey_type.c
+++ b/crypto/evp/evp_pkey_type.c
@@ -13,10 +13,10 @@
#include <openssl/core_names.h>
#include <openssl/macros.h>
#ifndef OPENSSL_NO_DEPRECATED_3_6
-# include "crypto/asn1.h"
+#include "crypto/asn1.h"
#include <openssl/types.h>
#else
-# include "internal/nelem.h"
+#include "internal/nelem.h"
#endif
#ifdef OPENSSL_NO_DEPRECATED_3_6
@@ -31,30 +31,30 @@ struct pkid2bid {
};
static const struct pkid2bid base_id_conversion[] = {
- {EVP_PKEY_RSA, EVP_PKEY_RSA},
- {EVP_PKEY_RSA2, EVP_PKEY_RSA},
- {EVP_PKEY_RSA_PSS, EVP_PKEY_RSA_PSS},
+ { EVP_PKEY_RSA, EVP_PKEY_RSA },
+ { EVP_PKEY_RSA2, EVP_PKEY_RSA },
+ { EVP_PKEY_RSA_PSS, EVP_PKEY_RSA_PSS },
#ifndef OPENSSL_NO_DH
- {EVP_PKEY_DH, EVP_PKEY_DH},
- {EVP_PKEY_DHX, EVP_PKEY_DHX},
+ { EVP_PKEY_DH, EVP_PKEY_DH },
+ { EVP_PKEY_DHX, EVP_PKEY_DHX },
#endif
#ifndef OPENSSL_NO_DSA
- {EVP_PKEY_DSA1, EVP_PKEY_DSA},
- {EVP_PKEY_DSA4, EVP_PKEY_DSA2},
- {EVP_PKEY_DSA3, EVP_PKEY_DSA2},
- {EVP_PKEY_DSA, EVP_PKEY_DSA},
+ { EVP_PKEY_DSA1, EVP_PKEY_DSA },
+ { EVP_PKEY_DSA4, EVP_PKEY_DSA2 },
+ { EVP_PKEY_DSA3, EVP_PKEY_DSA2 },
+ { EVP_PKEY_DSA, EVP_PKEY_DSA },
#endif
#ifndef OPENSSL_NO_EC
- {EVP_PKEY_EC, EVP_PKEY_EC},
+ { EVP_PKEY_EC, EVP_PKEY_EC },
#endif
#ifndef OPENSSL_NO_ECX
- {EVP_PKEY_X25519, EVP_PKEY_X25519},
- {EVP_PKEY_X448, EVP_PKEY_X448},
- {EVP_PKEY_ED25519, EVP_PKEY_ED25519},
- {EVP_PKEY_ED448, EVP_PKEY_ED448},
+ { EVP_PKEY_X25519, EVP_PKEY_X25519 },
+ { EVP_PKEY_X448, EVP_PKEY_X448 },
+ { EVP_PKEY_ED25519, EVP_PKEY_ED25519 },
+ { EVP_PKEY_ED448, EVP_PKEY_ED448 },
#endif
#ifndef OPENSSL_NO_SM2
- {EVP_PKEY_SM2, EVP_PKEY_EC},
+ { EVP_PKEY_SM2, EVP_PKEY_EC },
#endif
};
#endif
diff --git a/crypto/evp/evp_rand.c b/crypto/evp/evp_rand.c
index acdd9d5a51..689243ef10 100644
--- a/crypto/evp/evp_rand.c
+++ b/crypto/evp/evp_rand.c
@@ -48,7 +48,7 @@ struct evp_rand_st {
OSSL_FUNC_rand_verify_zeroization_fn *verify_zeroization;
OSSL_FUNC_rand_get_seed_fn *get_seed;
OSSL_FUNC_rand_clear_seed_fn *clear_seed;
-} /* EVP_RAND */ ;
+} /* EVP_RAND */;
static int evp_rand_up_ref(void *vrand)
{
@@ -115,8 +115,8 @@ static void evp_rand_unlock(EVP_RAND_CTX *rand)
}
static void *evp_rand_from_algorithm(int name_id,
- const OSSL_ALGORITHM *algodef,
- OSSL_PROVIDER *prov)
+ const OSSL_ALGORITHM *algodef,
+ OSSL_PROVIDER *prov)
{
const OSSL_DISPATCH *fns = algodef->implementation;
EVP_RAND *rand = NULL;
@@ -157,7 +157,7 @@ static void *evp_rand_from_algorithm(int name_id,
fnrandcnt++;
break;
case OSSL_FUNC_RAND_UNINSTANTIATE:
- if (rand->uninstantiate != NULL)
+ if (rand->uninstantiate != NULL)
break;
rand->uninstantiate = OSSL_FUNC_rand_uninstantiate(fns);
fnrandcnt++;
@@ -199,20 +199,17 @@ static void *evp_rand_from_algorithm(int name_id,
case OSSL_FUNC_RAND_GETTABLE_PARAMS:
if (rand->gettable_params != NULL)
break;
- rand->gettable_params =
- OSSL_FUNC_rand_gettable_params(fns);
+ rand->gettable_params = OSSL_FUNC_rand_gettable_params(fns);
break;
case OSSL_FUNC_RAND_GETTABLE_CTX_PARAMS:
if (rand->gettable_ctx_params != NULL)
break;
- rand->gettable_ctx_params =
- OSSL_FUNC_rand_gettable_ctx_params(fns);
+ rand->gettable_ctx_params = OSSL_FUNC_rand_gettable_ctx_params(fns);
break;
case OSSL_FUNC_RAND_SETTABLE_CTX_PARAMS:
if (rand->settable_ctx_params != NULL)
break;
- rand->settable_ctx_params =
- OSSL_FUNC_rand_settable_ctx_params(fns);
+ rand->settable_ctx_params = OSSL_FUNC_rand_settable_ctx_params(fns);
break;
case OSSL_FUNC_RAND_GET_PARAMS:
if (rand->get_params != NULL)
@@ -260,13 +257,13 @@ static void *evp_rand_from_algorithm(int name_id,
* locking functions.
*/
if (fnrandcnt != 3
- || fnctxcnt != 3
- || (fnenablelockcnt != 0 && fnenablelockcnt != 1)
- || (fnlockcnt != 0 && fnlockcnt != 2)
+ || fnctxcnt != 3
+ || (fnenablelockcnt != 0 && fnenablelockcnt != 1)
+ || (fnlockcnt != 0 && fnlockcnt != 2)
#ifdef FIPS_MODULE
- || fnzeroizecnt != 1
+ || fnzeroizecnt != 1
#endif
- ) {
+ ) {
evp_rand_free(rand);
ERR_raise(ERR_LIB_EVP, EVP_R_INVALID_PROVIDER_FUNCTIONS);
return NULL;
@@ -283,11 +280,11 @@ static void *evp_rand_from_algorithm(int name_id,
}
EVP_RAND *EVP_RAND_fetch(OSSL_LIB_CTX *libctx, const char *algorithm,
- const char *properties)
+ const char *properties)
{
return evp_generic_fetch(libctx, OSSL_OP_RAND, algorithm, properties,
- evp_rand_from_algorithm, evp_rand_up_ref,
- evp_rand_free);
+ evp_rand_from_algorithm, evp_rand_up_ref,
+ evp_rand_free);
}
int EVP_RAND_up_ref(EVP_RAND *rand)
@@ -368,8 +365,9 @@ EVP_RAND_CTX *EVP_RAND_CTX_new(EVP_RAND *rand, EVP_RAND_CTX *parent)
parent_dispatch = parent->meth->dispatch;
}
if ((ctx->algctx = rand->newctx(ossl_provider_ctx(rand->prov), parent_ctx,
- parent_dispatch)) == NULL
- || !EVP_RAND_up_ref(rand)) {
+ parent_dispatch))
+ == NULL
+ || !EVP_RAND_up_ref(rand)) {
ERR_raise(ERR_LIB_EVP, ERR_R_EVP_LIB);
rand->freectx(ctx->algctx);
CRYPTO_FREE_REF(&ctx->refcnt);
@@ -408,7 +406,7 @@ EVP_RAND *EVP_RAND_CTX_get0_rand(EVP_RAND_CTX *ctx)
}
static int evp_rand_get_ctx_params_locked(EVP_RAND_CTX *ctx,
- OSSL_PARAM params[])
+ OSSL_PARAM params[])
{
return ctx->meth->get_ctx_params(ctx->algctx, params);
}
@@ -425,7 +423,7 @@ int EVP_RAND_CTX_get_params(EVP_RAND_CTX *ctx, OSSL_PARAM params[])
}
static int evp_rand_set_ctx_params_locked(EVP_RAND_CTX *ctx,
- const OSSL_PARAM params[])
+ const OSSL_PARAM params[])
{
if (ctx->meth->set_ctx_params != NULL)
return ctx->meth->set_ctx_params(ctx->algctx, params);
@@ -491,18 +489,18 @@ const OSSL_PARAM *EVP_RAND_CTX_settable_params(EVP_RAND_CTX *ctx)
}
void EVP_RAND_do_all_provided(OSSL_LIB_CTX *libctx,
- void (*fn)(EVP_RAND *rand, void *arg),
- void *arg)
+ void (*fn)(EVP_RAND *rand, void *arg),
+ void *arg)
{
evp_generic_do_all(libctx, OSSL_OP_RAND,
- (void (*)(void *, void *))fn, arg,
- evp_rand_from_algorithm, evp_rand_up_ref,
- evp_rand_free);
+ (void (*)(void *, void *))fn, arg,
+ evp_rand_from_algorithm, evp_rand_up_ref,
+ evp_rand_free);
}
int EVP_RAND_names_do_all(const EVP_RAND *rand,
- void (*fn)(const char *name, void *data),
- void *data)
+ void (*fn)(const char *name, void *data),
+ void *data)
{
if (rand->prov != NULL)
return evp_names_do_all(rand->prov, rand->name_id, fn, data);
@@ -510,25 +508,24 @@ int EVP_RAND_names_do_all(const EVP_RAND *rand,
return 1;
}
-static int evp_rand_instantiate_locked
- (EVP_RAND_CTX *ctx, unsigned int strength, int prediction_resistance,
- const unsigned char *pstr, size_t pstr_len, const OSSL_PARAM params[])
+static int evp_rand_instantiate_locked(EVP_RAND_CTX *ctx, unsigned int strength, int prediction_resistance,
+ const unsigned char *pstr, size_t pstr_len, const OSSL_PARAM params[])
{
return ctx->meth->instantiate(ctx->algctx, strength, prediction_resistance,
- pstr, pstr_len, params);
+ pstr, pstr_len, params);
}
int EVP_RAND_instantiate(EVP_RAND_CTX *ctx, unsigned int strength,
- int prediction_resistance,
- const unsigned char *pstr, size_t pstr_len,
- const OSSL_PARAM params[])
+ int prediction_resistance,
+ const unsigned char *pstr, size_t pstr_len,
+ const OSSL_PARAM params[])
{
int res;
if (!evp_rand_lock(ctx))
return 0;
res = evp_rand_instantiate_locked(ctx, strength, prediction_resistance,
- pstr, pstr_len, params);
+ pstr, pstr_len, params);
evp_rand_unlock(ctx);
return res;
}
@@ -550,25 +547,25 @@ int EVP_RAND_uninstantiate(EVP_RAND_CTX *ctx)
}
static int evp_rand_generate_locked(EVP_RAND_CTX *ctx, unsigned char *out,
- size_t outlen, unsigned int strength,
- int prediction_resistance,
- const unsigned char *addin,
- size_t addin_len)
+ size_t outlen, unsigned int strength,
+ int prediction_resistance,
+ const unsigned char *addin,
+ size_t addin_len)
{
size_t chunk, max_request = 0;
OSSL_PARAM params[2] = { OSSL_PARAM_END, OSSL_PARAM_END };
params[0] = OSSL_PARAM_construct_size_t(OSSL_RAND_PARAM_MAX_REQUEST,
- &max_request);
+ &max_request);
if (!evp_rand_get_ctx_params_locked(ctx, params)
- || max_request == 0) {
+ || max_request == 0) {
ERR_raise(ERR_LIB_EVP, EVP_R_UNABLE_TO_GET_MAXIMUM_REQUEST_SIZE);
return 0;
}
for (; outlen > 0; outlen -= chunk, out += chunk) {
chunk = outlen > max_request ? max_request : outlen;
if (!ctx->meth->generate(ctx->algctx, out, chunk, strength,
- prediction_resistance, addin, addin_len)) {
+ prediction_resistance, addin, addin_len)) {
ERR_raise(ERR_LIB_EVP, EVP_R_GENERATE_ERROR);
return 0;
}
@@ -582,39 +579,39 @@ static int evp_rand_generate_locked(EVP_RAND_CTX *ctx, unsigned char *out,
}
int EVP_RAND_generate(EVP_RAND_CTX *ctx, unsigned char *out, size_t outlen,
- unsigned int strength, int prediction_resistance,
- const unsigned char *addin, size_t addin_len)
+ unsigned int strength, int prediction_resistance,
+ const unsigned char *addin, size_t addin_len)
{
int res;
if (!evp_rand_lock(ctx))
return 0;
res = evp_rand_generate_locked(ctx, out, outlen, strength,
- prediction_resistance, addin, addin_len);
+ prediction_resistance, addin, addin_len);
evp_rand_unlock(ctx);
return res;
}
static int evp_rand_reseed_locked(EVP_RAND_CTX *ctx, int prediction_resistance,
- const unsigned char *ent, size_t ent_len,
- const unsigned char *addin, size_t addin_len)
+ const unsigned char *ent, size_t ent_len,
+ const unsigned char *addin, size_t addin_len)
{
if (ctx->meth->reseed != NULL)
return ctx->meth->reseed(ctx->algctx, prediction_resistance,
- ent, ent_len, addin, addin_len);
+ ent, ent_len, addin, addin_len);
return 1;
}
int EVP_RAND_reseed(EVP_RAND_CTX *ctx, int prediction_resistance,
- const unsigned char *ent, size_t ent_len,
- const unsigned char *addin, size_t addin_len)
+ const unsigned char *ent, size_t ent_len,
+ const unsigned char *addin, size_t addin_len)
{
int res;
if (!evp_rand_lock(ctx))
return 0;
res = evp_rand_reseed_locked(ctx, prediction_resistance,
- ent, ent_len, addin, addin_len);
+ ent, ent_len, addin, addin_len);
evp_rand_unlock(ctx);
return res;
}
@@ -642,7 +639,7 @@ unsigned int EVP_RAND_get_strength(EVP_RAND_CTX *ctx)
}
static int evp_rand_nonce_locked(EVP_RAND_CTX *ctx, unsigned char *out,
- size_t outlen)
+ size_t outlen)
{
unsigned int str = evp_rand_strength_locked(ctx);
@@ -702,49 +699,49 @@ int evp_rand_can_seed(EVP_RAND_CTX *ctx)
}
static size_t evp_rand_get_seed_locked(EVP_RAND_CTX *ctx,
- unsigned char **buffer,
- int entropy,
- size_t min_len, size_t max_len,
- int prediction_resistance,
- const unsigned char *adin,
- size_t adin_len)
+ unsigned char **buffer,
+ int entropy,
+ size_t min_len, size_t max_len,
+ int prediction_resistance,
+ const unsigned char *adin,
+ size_t adin_len)
{
if (ctx->meth->get_seed != NULL)
return ctx->meth->get_seed(ctx->algctx, buffer,
- entropy, min_len, max_len,
- prediction_resistance,
- adin, adin_len);
+ entropy, min_len, max_len,
+ prediction_resistance,
+ adin, adin_len);
return 0;
}
size_t evp_rand_get_seed(EVP_RAND_CTX *ctx,
- unsigned char **buffer,
- int entropy, size_t min_len, size_t max_len,
- int prediction_resistance,
- const unsigned char *adin, size_t adin_len)
+ unsigned char **buffer,
+ int entropy, size_t min_len, size_t max_len,
+ int prediction_resistance,
+ const unsigned char *adin, size_t adin_len)
{
size_t res;
if (!evp_rand_lock(ctx))
return 0;
res = evp_rand_get_seed_locked(ctx,
- buffer,
- entropy, min_len, max_len,
- prediction_resistance,
- adin, adin_len);
+ buffer,
+ entropy, min_len, max_len,
+ prediction_resistance,
+ adin, adin_len);
evp_rand_unlock(ctx);
return res;
}
static void evp_rand_clear_seed_locked(EVP_RAND_CTX *ctx,
- unsigned char *buffer, size_t b_len)
+ unsigned char *buffer, size_t b_len)
{
if (ctx->meth->clear_seed != NULL)
ctx->meth->clear_seed(ctx->algctx, buffer, b_len);
}
void evp_rand_clear_seed(EVP_RAND_CTX *ctx,
- unsigned char *buffer, size_t b_len)
+ unsigned char *buffer, size_t b_len)
{
if (!evp_rand_lock(ctx))
return;
diff --git a/crypto/evp/evp_utils.c b/crypto/evp/evp_utils.c
index 3cc17921f8..68a04b6519 100644
--- a/crypto/evp/evp_utils.c
+++ b/crypto/evp/evp_utils.c
@@ -12,9 +12,9 @@
#include <openssl/core.h>
#include <openssl/evp.h>
#include <openssl/err.h>
-#include <openssl/asn1.h> /* evp_local.h needs it */
-#include <openssl/safestack.h> /* evp_local.h needs it */
-#include "crypto/evp.h" /* evp_local.h needs it */
+#include <openssl/asn1.h> /* evp_local.h needs it */
+#include <openssl/safestack.h> /* evp_local.h needs it */
+#include "crypto/evp.h" /* evp_local.h needs it */
#include "evp_local.h"
/*
@@ -24,36 +24,36 @@
* Since these functions are used to implement ctrl functionality, we
* use the same value, and other callers will have to compensate.
*/
-#define PARAM_CHECK(obj, func, errfunc) \
- if (obj == NULL) \
- return 0; \
- if (obj->prov == NULL) \
- return EVP_CTRL_RET_UNSUPPORTED; \
- if (obj->func == NULL) { \
- errfunc(); \
- return 0; \
+#define PARAM_CHECK(obj, func, errfunc) \
+ if (obj == NULL) \
+ return 0; \
+ if (obj->prov == NULL) \
+ return EVP_CTRL_RET_UNSUPPORTED; \
+ if (obj->func == NULL) { \
+ errfunc(); \
+ return 0; \
}
-#define PARAM_FUNC(name, func, type, err) \
-int name (const type *obj, OSSL_PARAM params[]) \
-{ \
- PARAM_CHECK(obj, func, err) \
- return obj->func(params); \
-}
+#define PARAM_FUNC(name, func, type, err) \
+ int name(const type *obj, OSSL_PARAM params[]) \
+ { \
+ PARAM_CHECK(obj, func, err) \
+ return obj->func(params); \
+ }
-#define PARAM_CTX_FUNC(name, func, type, err) \
-int name (const type *obj, void *algctx, OSSL_PARAM params[]) \
-{ \
- PARAM_CHECK(obj, func, err) \
- return obj->func(algctx, params); \
-}
+#define PARAM_CTX_FUNC(name, func, type, err) \
+ int name(const type *obj, void *algctx, OSSL_PARAM params[]) \
+ { \
+ PARAM_CHECK(obj, func, err) \
+ return obj->func(algctx, params); \
+ }
-#define PARAM_FUNCTIONS(type, \
- getname, getfunc, \
- getctxname, getctxfunc, \
- setctxname, setctxfunc) \
- PARAM_FUNC(getname, getfunc, type, geterr) \
- PARAM_CTX_FUNC(getctxname, getctxfunc, type, geterr) \
+#define PARAM_FUNCTIONS(type, \
+ getname, getfunc, \
+ getctxname, getctxfunc, \
+ setctxname, setctxfunc) \
+ PARAM_FUNC(getname, getfunc, type, geterr) \
+ PARAM_CTX_FUNC(getctxname, getctxfunc, type, geterr) \
PARAM_CTX_FUNC(setctxname, setctxfunc, type, seterr)
/*
@@ -71,11 +71,11 @@ static void seterr(void)
}
PARAM_FUNCTIONS(EVP_CIPHER,
- evp_do_ciph_getparams, get_params,
- evp_do_ciph_ctx_getparams, get_ctx_params,
- evp_do_ciph_ctx_setparams, set_ctx_params)
+ evp_do_ciph_getparams, get_params,
+ evp_do_ciph_ctx_getparams, get_ctx_params,
+ evp_do_ciph_ctx_setparams, set_ctx_params)
PARAM_FUNCTIONS(EVP_MD,
- evp_do_md_getparams, get_params,
- evp_do_md_ctx_getparams, get_ctx_params,
- evp_do_md_ctx_setparams, set_ctx_params)
+ evp_do_md_getparams, get_params,
+ evp_do_md_ctx_getparams, get_ctx_params,
+ evp_do_md_ctx_setparams, set_ctx_params)
diff --git a/crypto/evp/exchange.c b/crypto/evp/exchange.c
index d323a7c67c..de2c966638 100644
--- a/crypto/evp/exchange.c
+++ b/crypto/evp/exchange.c
@@ -15,7 +15,7 @@
#include "internal/refcount.h"
#include "internal/provider.h"
#include "internal/core.h"
-#include "internal/numbers.h" /* includes SIZE_MAX */
+#include "internal/numbers.h" /* includes SIZE_MAX */
#include "crypto/evp.h"
#include "evp_local.h"
@@ -48,8 +48,8 @@ static EVP_KEYEXCH *evp_keyexch_new(OSSL_PROVIDER *prov)
}
static void *evp_keyexch_from_algorithm(int name_id,
- const OSSL_ALGORITHM *algodef,
- OSSL_PROVIDER *prov)
+ const OSSL_ALGORITHM *algodef,
+ OSSL_PROVIDER *prov)
{
const OSSL_DISPATCH *fns = algodef->implementation;
EVP_KEYEXCH *exchange = NULL;
@@ -137,8 +137,8 @@ static void *evp_keyexch_from_algorithm(int name_id,
}
fncnt += derive_found;
if (fncnt != 4
- || (gparamfncnt != 0 && gparamfncnt != 2)
- || (sparamfncnt != 0 && sparamfncnt != 2)) {
+ || (gparamfncnt != 0 && gparamfncnt != 2)
+ || (sparamfncnt != 0 && sparamfncnt != 2)) {
/*
* In order to be a consistent set of functions we must have at least
* a complete set of "exchange" functions: init, derive, newctx,
@@ -153,7 +153,7 @@ static void *evp_keyexch_from_algorithm(int name_id,
return exchange;
- err:
+err:
EVP_KEYEXCH_free(exchange);
return NULL;
}
@@ -187,23 +187,23 @@ OSSL_PROVIDER *EVP_KEYEXCH_get0_provider(const EVP_KEYEXCH *exchange)
}
EVP_KEYEXCH *EVP_KEYEXCH_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
- const char *properties)
+ const char *properties)
{
return evp_generic_fetch(ctx, OSSL_OP_KEYEXCH, algorithm, properties,
- evp_keyexch_from_algorithm,
- evp_keyexch_up_ref,
- evp_keyexch_free);
+ evp_keyexch_from_algorithm,
+ evp_keyexch_up_ref,
+ evp_keyexch_free);
}
EVP_KEYEXCH *evp_keyexch_fetch_from_prov(OSSL_PROVIDER *prov,
- const char *algorithm,
- const char *properties)
+ const char *algorithm,
+ const char *properties)
{
return evp_generic_fetch_from_prov(prov, OSSL_OP_KEYEXCH,
- algorithm, properties,
- evp_keyexch_from_algorithm,
- evp_keyexch_up_ref,
- evp_keyexch_free);
+ algorithm, properties,
+ evp_keyexch_from_algorithm,
+ evp_keyexch_up_ref,
+ evp_keyexch_free);
}
int EVP_PKEY_derive_init(EVP_PKEY_CTX *ctx)
@@ -256,20 +256,19 @@ int EVP_PKEY_derive_init_ex(EVP_PKEY_CTX *ctx, const OSSL_PARAM params[])
* Try to derive the supported exch from |ctx->keymgmt|.
*/
if (!ossl_assert(ctx->pkey->keymgmt == NULL
- || ctx->pkey->keymgmt == ctx->keymgmt)) {
+ || ctx->pkey->keymgmt == ctx->keymgmt)) {
ERR_clear_last_mark();
ERR_raise(ERR_LIB_EVP, ERR_R_INTERNAL_ERROR);
goto err;
}
supported_exch = evp_keymgmt_util_query_operation_name(ctx->keymgmt,
- OSSL_OP_KEYEXCH);
+ OSSL_OP_KEYEXCH);
if (supported_exch == NULL) {
ERR_clear_last_mark();
ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
goto err;
}
-
/*
* We perform two iterations:
*
@@ -300,16 +299,14 @@ int EVP_PKEY_derive_init_ex(EVP_PKEY_CTX *ctx, const OSSL_PARAM params[])
switch (iter) {
case 1:
- exchange =
- EVP_KEYEXCH_fetch(ctx->libctx, supported_exch, ctx->propquery);
+ exchange = EVP_KEYEXCH_fetch(ctx->libctx, supported_exch, ctx->propquery);
if (exchange != NULL)
tmp_prov = EVP_KEYEXCH_get0_provider(exchange);
break;
case 2:
tmp_prov = EVP_KEYMGMT_get0_provider(ctx->keymgmt);
- exchange =
- evp_keyexch_fetch_from_prov((OSSL_PROVIDER *)tmp_prov,
- supported_exch, ctx->propquery);
+ exchange = evp_keyexch_fetch_from_prov((OSSL_PROVIDER *)tmp_prov,
+ supported_exch, ctx->propquery);
if (exchange == NULL)
goto legacy;
break;
@@ -326,13 +323,12 @@ int EVP_PKEY_derive_init_ex(EVP_PKEY_CTX *ctx, const OSSL_PARAM params[])
* to it (evp_pkey_export_to_provider() is smart enough to only actually
* export it if |tmp_keymgmt| is different from |ctx->pkey|'s keymgmt)
*/
- tmp_keymgmt_tofree = tmp_keymgmt =
- evp_keymgmt_fetch_from_prov((OSSL_PROVIDER *)tmp_prov,
- EVP_KEYMGMT_get0_name(ctx->keymgmt),
- ctx->propquery);
+ tmp_keymgmt_tofree = tmp_keymgmt = evp_keymgmt_fetch_from_prov((OSSL_PROVIDER *)tmp_prov,
+ EVP_KEYMGMT_get0_name(ctx->keymgmt),
+ ctx->propquery);
if (tmp_keymgmt != NULL)
provkey = evp_pkey_export_to_provider(ctx->pkey, ctx->libctx,
- &tmp_keymgmt, ctx->propquery);
+ &tmp_keymgmt, ctx->propquery);
if (tmp_keymgmt == NULL)
EVP_KEYMGMT_free(tmp_keymgmt_tofree);
}
@@ -361,13 +357,13 @@ int EVP_PKEY_derive_init_ex(EVP_PKEY_CTX *ctx, const OSSL_PARAM params[])
EVP_KEYMGMT_free(tmp_keymgmt);
return ret ? 1 : 0;
- err:
+err:
evp_pkey_ctx_free_old_ops(ctx);
ctx->operation = EVP_PKEY_OP_UNDEFINED;
EVP_KEYMGMT_free(tmp_keymgmt);
return 0;
- legacy:
+legacy:
/*
* If we don't have the full support we need with provided methods,
* let's go see if legacy does.
@@ -393,7 +389,7 @@ int EVP_PKEY_derive_init_ex(EVP_PKEY_CTX *ctx, const OSSL_PARAM params[])
}
int EVP_PKEY_derive_set_peer_ex(EVP_PKEY_CTX *ctx, EVP_PKEY *peer,
- int validate_peer)
+ int validate_peer)
{
int ret = 0, check;
void *provkey = NULL;
@@ -432,16 +428,15 @@ int EVP_PKEY_derive_set_peer_ex(EVP_PKEY_CTX *ctx, EVP_PKEY *peer,
* to it (evp_pkey_export_to_provider() is smart enough to only actually
* export it if |tmp_keymgmt| is different from |peer|'s keymgmt)
*/
- tmp_keymgmt_tofree = tmp_keymgmt =
- evp_keymgmt_fetch_from_prov((OSSL_PROVIDER *)
- EVP_KEYEXCH_get0_provider(ctx->op.kex.exchange),
- EVP_KEYMGMT_get0_name(ctx->keymgmt),
- ctx->propquery);
+ tmp_keymgmt_tofree = tmp_keymgmt = evp_keymgmt_fetch_from_prov((OSSL_PROVIDER *)
+ EVP_KEYEXCH_get0_provider(ctx->op.kex.exchange),
+ EVP_KEYMGMT_get0_name(ctx->keymgmt),
+ ctx->propquery);
if (tmp_keymgmt != NULL)
/* A Coverity issue with up_ref/down_ref and free */
/* coverity[pass_freed_arg] */
provkey = evp_pkey_export_to_provider(peer, ctx->libctx,
- &tmp_keymgmt, ctx->propquery);
+ &tmp_keymgmt, ctx->propquery);
EVP_KEYMGMT_free(tmp_keymgmt_tofree);
/*
@@ -455,14 +450,14 @@ int EVP_PKEY_derive_set_peer_ex(EVP_PKEY_CTX *ctx, EVP_PKEY *peer,
return ret;
goto common;
- legacy:
+legacy:
#ifdef FIPS_MODULE
return ret;
#else
if (ctx->pmeth == NULL
|| !(ctx->pmeth->derive != NULL
- || ctx->pmeth->encrypt != NULL
- || ctx->pmeth->decrypt != NULL)
+ || ctx->pmeth->encrypt != NULL
+ || ctx->pmeth->decrypt != NULL)
|| ctx->pmeth->ctrl == NULL) {
ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
return -2;
@@ -499,8 +494,7 @@ int EVP_PKEY_derive_set_peer_ex(EVP_PKEY_CTX *ctx, EVP_PKEY *peer,
* (different key types) is impossible here because it is checked earlier.
* -2 is OK for us here, as well as 1, so we can check for 0 only.
*/
- if (!EVP_PKEY_missing_parameters(peer) &&
- !EVP_PKEY_parameters_eq(ctx->pkey, peer)) {
+ if (!EVP_PKEY_missing_parameters(peer) && !EVP_PKEY_parameters_eq(ctx->pkey, peer)) {
ERR_raise(ERR_LIB_EVP, EVP_R_DIFFERENT_PARAMETERS);
return -1;
}
@@ -510,7 +504,7 @@ int EVP_PKEY_derive_set_peer_ex(EVP_PKEY_CTX *ctx, EVP_PKEY *peer,
return ret;
#endif
- common:
+common:
if (!EVP_PKEY_up_ref(peer))
return -1;
@@ -543,22 +537,21 @@ int EVP_PKEY_derive(EVP_PKEY_CTX *ctx, unsigned char *key, size_t *pkeylen)
goto legacy;
ret = ctx->op.kex.exchange->derive(ctx->op.kex.algctx, key, pkeylen,
- key != NULL ? *pkeylen : 0);
+ key != NULL ? *pkeylen : 0);
return ret;
- legacy:
+legacy:
if (ctx->pmeth == NULL || ctx->pmeth->derive == NULL) {
ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
return -2;
}
- M_check_autoarg(ctx, key, pkeylen, EVP_F_EVP_PKEY_DERIVE)
- return ctx->pmeth->derive(ctx, key, pkeylen);
+ M_check_autoarg(ctx, key, pkeylen, EVP_F_EVP_PKEY_DERIVE) return ctx->pmeth->derive(ctx, key, pkeylen);
}
EVP_SKEY *EVP_PKEY_derive_SKEY(EVP_PKEY_CTX *ctx, EVP_SKEYMGMT *mgmt,
- const char *key_type, const char *propquery,
- size_t keylen, const OSSL_PARAM params[])
+ const char *key_type, const char *propquery,
+ size_t keylen, const OSSL_PARAM params[])
{
EVP_SKEYMGMT *skeymgmt = NULL;
EVP_SKEY *ret = NULL;
@@ -582,7 +575,7 @@ EVP_SKEY *EVP_PKEY_derive_SKEY(EVP_PKEY_CTX *ctx, EVP_SKEYMGMT *mgmt,
skeymgmt = mgmt;
} else {
skeymgmt = evp_skeymgmt_fetch_from_prov(ctx->op.kex.exchange->prov,
- key_type, propquery);
+ key_type, propquery);
if (skeymgmt == NULL) {
/*
* The provider does not support skeymgmt, let's try to fallback
@@ -597,11 +590,10 @@ EVP_SKEY *EVP_PKEY_derive_SKEY(EVP_PKEY_CTX *ctx, EVP_SKEYMGMT *mgmt,
}
/* Fallback to raw derive + import if necessary */
- if (skeymgmt->prov != ctx->op.kex.exchange->prov ||
- ctx->op.kex.exchange->derive_skey == NULL) {
+ if (skeymgmt->prov != ctx->op.kex.exchange->prov || ctx->op.kex.exchange->derive_skey == NULL) {
size_t tmplen = keylen;
unsigned char *key = NULL;
- OSSL_PARAM import_params[2] = {OSSL_PARAM_END, OSSL_PARAM_END};
+ OSSL_PARAM import_params[2] = { OSSL_PARAM_END, OSSL_PARAM_END };
if (ctx->op.kex.exchange->derive == NULL) {
ERR_raise(ERR_R_EVP_LIB, ERR_R_UNSUPPORTED);
@@ -615,7 +607,7 @@ EVP_SKEY *EVP_PKEY_derive_SKEY(EVP_PKEY_CTX *ctx, EVP_SKEYMGMT *mgmt,
}
if (!ctx->op.kex.exchange->derive(ctx->op.kex.algctx, key, &tmplen,
- tmplen)) {
+ tmplen)) {
OPENSSL_free(key);
return NULL;
}
@@ -626,10 +618,10 @@ EVP_SKEY *EVP_PKEY_derive_SKEY(EVP_PKEY_CTX *ctx, EVP_SKEYMGMT *mgmt,
return NULL;
}
import_params[0] = OSSL_PARAM_construct_octet_string(OSSL_SKEY_PARAM_RAW_BYTES,
- key, keylen);
+ key, keylen);
ret = EVP_SKEY_import_SKEYMGMT(ctx->libctx, skeymgmt,
- OSSL_SKEYMGMT_SELECT_SECRET_KEY, import_params);
+ OSSL_SKEYMGMT_SELECT_SECRET_KEY, import_params);
OPENSSL_clear_free(key, keylen);
if (mgmt != skeymgmt)
EVP_SKEYMGMT_free(skeymgmt);
@@ -644,8 +636,8 @@ EVP_SKEY *EVP_PKEY_derive_SKEY(EVP_PKEY_CTX *ctx, EVP_SKEYMGMT *mgmt,
}
ret->keydata = ctx->op.kex.exchange->derive_skey(ctx->op.kex.algctx, key_type,
- ossl_provider_ctx(skeymgmt->prov),
- skeymgmt->import, keylen, params);
+ ossl_provider_ctx(skeymgmt->prov),
+ skeymgmt->import, keylen, params);
if (mgmt != skeymgmt)
EVP_SKEYMGMT_free(skeymgmt);
@@ -676,23 +668,23 @@ const char *EVP_KEYEXCH_get0_description(const EVP_KEYEXCH *keyexch)
int EVP_KEYEXCH_is_a(const EVP_KEYEXCH *keyexch, const char *name)
{
return keyexch != NULL
- && evp_is_a(keyexch->prov, keyexch->name_id, NULL, name);
+ && evp_is_a(keyexch->prov, keyexch->name_id, NULL, name);
}
void EVP_KEYEXCH_do_all_provided(OSSL_LIB_CTX *libctx,
- void (*fn)(EVP_KEYEXCH *keyexch, void *arg),
- void *arg)
+ void (*fn)(EVP_KEYEXCH *keyexch, void *arg),
+ void *arg)
{
evp_generic_do_all(libctx, OSSL_OP_KEYEXCH,
- (void (*)(void *, void *))fn, arg,
- evp_keyexch_from_algorithm,
- evp_keyexch_up_ref,
- evp_keyexch_free);
+ (void (*)(void *, void *))fn, arg,
+ evp_keyexch_from_algorithm,
+ evp_keyexch_up_ref,
+ evp_keyexch_free);
}
int EVP_KEYEXCH_names_do_all(const EVP_KEYEXCH *keyexch,
- void (*fn)(const char *name, void *data),
- void *data)
+ void (*fn)(const char *name, void *data),
+ void *data)
{
if (keyexch->prov != NULL)
return evp_names_do_all(keyexch->prov, keyexch->name_id, fn, data);
diff --git a/crypto/evp/kdf_lib.c b/crypto/evp/kdf_lib.c
index 3f67548570..4c98942992 100644
--- a/crypto/evp/kdf_lib.c
+++ b/crypto/evp/kdf_lib.c
@@ -129,15 +129,15 @@ size_t EVP_KDF_CTX_get_kdf_size(EVP_KDF_CTX *ctx)
*params = OSSL_PARAM_construct_size_t(OSSL_KDF_PARAM_SIZE, &s);
if (ctx->meth->get_ctx_params != NULL
&& ctx->meth->get_ctx_params(ctx->algctx, params))
- return s;
+ return s;
if (ctx->meth->get_params != NULL
&& ctx->meth->get_params(params))
- return s;
+ return s;
return 0;
}
int EVP_KDF_derive(EVP_KDF_CTX *ctx, unsigned char *key, size_t keylen,
- const OSSL_PARAM params[])
+ const OSSL_PARAM params[])
{
if (ctx == NULL)
return 0;
@@ -194,15 +194,15 @@ int EVP_KDF_CTX_set_SKEY(EVP_KDF_CTX *ctx, EVP_SKEY *key, const char *paramname)
return 0;
if (EVP_SKEY_export(key, OSSL_SKEYMGMT_SELECT_SECRET_KEY,
- convert_key_cb, &ckey))
+ convert_key_cb, &ckey))
return ctx->meth->set_ctx_params(ctx->algctx, params);
return 0;
}
EVP_SKEY *EVP_KDF_derive_SKEY(EVP_KDF_CTX *ctx, EVP_SKEYMGMT *mgmt,
- const char *key_type, const char *propquery,
- size_t keylen, const OSSL_PARAM params[])
+ const char *key_type, const char *propquery,
+ size_t keylen, const OSSL_PARAM params[])
{
EVP_SKEYMGMT *skeymgmt = NULL;
EVP_SKEY *ret = NULL;
@@ -216,14 +216,14 @@ EVP_SKEY *EVP_KDF_derive_SKEY(EVP_KDF_CTX *ctx, EVP_SKEYMGMT *mgmt,
skeymgmt = mgmt;
} else {
skeymgmt = evp_skeymgmt_fetch_from_prov(ctx->meth->prov,
- key_type, propquery);
+ key_type, propquery);
if (skeymgmt == NULL) {
/*
* The provider does not support skeymgmt, let's try to fallback
* to a provider that supports it
*/
skeymgmt = EVP_SKEYMGMT_fetch(ossl_provider_libctx(ctx->meth->prov),
- key_type, propquery);
+ key_type, propquery);
}
if (skeymgmt == NULL) {
@@ -233,10 +233,9 @@ EVP_SKEY *EVP_KDF_derive_SKEY(EVP_KDF_CTX *ctx, EVP_SKEYMGMT *mgmt,
}
/* Fallback to raw derive + import if necessary */
- if (skeymgmt->prov != ctx->meth->prov ||
- ctx->meth->derive_skey == NULL) {
+ if (skeymgmt->prov != ctx->meth->prov || ctx->meth->derive_skey == NULL) {
unsigned char *key = NULL;
- OSSL_PARAM import_params[2] = {OSSL_PARAM_END, OSSL_PARAM_END};
+ OSSL_PARAM import_params[2] = { OSSL_PARAM_END, OSSL_PARAM_END };
if (ctx->meth->derive == NULL) {
ERR_raise(ERR_R_EVP_LIB, ERR_R_UNSUPPORTED);
@@ -252,10 +251,10 @@ EVP_SKEY *EVP_KDF_derive_SKEY(EVP_KDF_CTX *ctx, EVP_SKEYMGMT *mgmt,
return NULL;
}
import_params[0] = OSSL_PARAM_construct_octet_string(OSSL_SKEY_PARAM_RAW_BYTES,
- key, keylen);
+ key, keylen);
ret = EVP_SKEY_import_SKEYMGMT(ossl_provider_libctx(ctx->meth->prov), skeymgmt,
- OSSL_SKEYMGMT_SELECT_SECRET_KEY, import_params);
+ OSSL_SKEYMGMT_SELECT_SECRET_KEY, import_params);
if (mgmt != skeymgmt)
EVP_SKEYMGMT_free(skeymgmt);
@@ -272,7 +271,7 @@ EVP_SKEY *EVP_KDF_derive_SKEY(EVP_KDF_CTX *ctx, EVP_SKEYMGMT *mgmt,
}
ret->keydata = ctx->meth->derive_skey(ctx->algctx, key_type, ossl_provider_ctx(skeymgmt->prov),
- skeymgmt->import, keylen, params);
+ skeymgmt->import, keylen, params);
if (ret->keydata == NULL) {
EVP_SKEY_free(ret);
ret = NULL;
@@ -311,8 +310,8 @@ int EVP_KDF_CTX_set_params(EVP_KDF_CTX *ctx, const OSSL_PARAM params[])
}
int EVP_KDF_names_do_all(const EVP_KDF *kdf,
- void (*fn)(const char *name, void *data),
- void *data)
+ void (*fn)(const char *name, void *data),
+ void *data)
{
if (kdf->prov != NULL)
return evp_names_do_all(kdf->prov, kdf->name_id, fn, data);
diff --git a/crypto/evp/kdf_meth.c b/crypto/evp/kdf_meth.c
index 65c875f2cc..5ac6a94013 100644
--- a/crypto/evp/kdf_meth.c
+++ b/crypto/evp/kdf_meth.c
@@ -56,8 +56,8 @@ static void *evp_kdf_new(void)
}
static void *evp_kdf_from_algorithm(int name_id,
- const OSSL_ALGORITHM *algodef,
- OSSL_PROVIDER *prov)
+ const OSSL_ALGORITHM *algodef,
+ OSSL_PROVIDER *prov)
{
const OSSL_DISPATCH *fns = algodef->implementation;
EVP_KDF *kdf = NULL;
@@ -106,20 +106,17 @@ static void *evp_kdf_from_algorithm(int name_id,
case OSSL_FUNC_KDF_GETTABLE_PARAMS:
if (kdf->gettable_params != NULL)
break;
- kdf->gettable_params =
- OSSL_FUNC_kdf_gettable_params(fns);
+ kdf->gettable_params = OSSL_FUNC_kdf_gettable_params(fns);
break;
case OSSL_FUNC_KDF_GETTABLE_CTX_PARAMS:
if (kdf->gettable_ctx_params != NULL)
break;
- kdf->gettable_ctx_params =
- OSSL_FUNC_kdf_gettable_ctx_params(fns);
+ kdf->gettable_ctx_params = OSSL_FUNC_kdf_gettable_ctx_params(fns);
break;
case OSSL_FUNC_KDF_SETTABLE_CTX_PARAMS:
if (kdf->settable_ctx_params != NULL)
break;
- kdf->settable_ctx_params =
- OSSL_FUNC_kdf_settable_ctx_params(fns);
+ kdf->settable_ctx_params = OSSL_FUNC_kdf_settable_ctx_params(fns);
break;
case OSSL_FUNC_KDF_GET_PARAMS:
if (kdf->get_params != NULL)
@@ -170,11 +167,11 @@ err:
}
EVP_KDF *EVP_KDF_fetch(OSSL_LIB_CTX *libctx, const char *algorithm,
- const char *properties)
+ const char *properties)
{
return evp_generic_fetch(libctx, OSSL_OP_KDF, algorithm, properties,
- evp_kdf_from_algorithm, evp_kdf_up_ref,
- evp_kdf_free);
+ evp_kdf_from_algorithm, evp_kdf_up_ref,
+ evp_kdf_free);
}
int EVP_KDF_up_ref(EVP_KDF *kdf)
@@ -235,10 +232,10 @@ const OSSL_PARAM *EVP_KDF_CTX_settable_params(EVP_KDF_CTX *ctx)
}
void EVP_KDF_do_all_provided(OSSL_LIB_CTX *libctx,
- void (*fn)(EVP_KDF *kdf, void *arg),
- void *arg)
+ void (*fn)(EVP_KDF *kdf, void *arg),
+ void *arg)
{
evp_generic_do_all(libctx, OSSL_OP_KDF,
- (void (*)(void *, void *))fn, arg,
- evp_kdf_from_algorithm, evp_kdf_up_ref, evp_kdf_free);
+ (void (*)(void *, void *))fn, arg,
+ evp_kdf_from_algorithm, evp_kdf_up_ref, evp_kdf_free);
}
diff --git a/crypto/evp/kem.c b/crypto/evp/kem.c
index 2bc03e1d4e..6c36164760 100644
--- a/crypto/evp/kem.c
+++ b/crypto/evp/kem.c
@@ -28,7 +28,7 @@ static int evp_kem_up_ref(void *data)
}
static int evp_kem_init(EVP_PKEY_CTX *ctx, int operation,
- const OSSL_PARAM params[], EVP_PKEY *authkey)
+ const OSSL_PARAM params[], EVP_PKEY *authkey)
{
int ret = 0;
EVP_KEM *kem = NULL;
@@ -58,12 +58,12 @@ static int evp_kem_init(EVP_PKEY_CTX *ctx, int operation,
* Try to derive the supported kem from |ctx->keymgmt|.
*/
if (!ossl_assert(ctx->pkey->keymgmt == NULL
- || ctx->pkey->keymgmt == ctx->keymgmt)) {
+ || ctx->pkey->keymgmt == ctx->keymgmt)) {
ERR_raise(ERR_LIB_EVP, ERR_R_INTERNAL_ERROR);
goto err;
}
supported_kem = evp_keymgmt_util_query_operation_name(ctx->keymgmt,
- OSSL_OP_KEM);
+ OSSL_OP_KEM);
if (supported_kem == NULL) {
ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
goto err;
@@ -108,11 +108,11 @@ static int evp_kem_init(EVP_PKEY_CTX *ctx, int operation,
case 2:
tmp_prov = EVP_KEYMGMT_get0_provider(ctx->keymgmt);
kem = evp_kem_fetch_from_prov((OSSL_PROVIDER *)tmp_prov,
- supported_kem, ctx->propquery);
+ supported_kem, ctx->propquery);
if (kem == NULL) {
ERR_raise(ERR_LIB_EVP,
- EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
+ EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
ret = -2;
goto err;
}
@@ -129,17 +129,16 @@ static int evp_kem_init(EVP_PKEY_CTX *ctx, int operation,
* to it (evp_pkey_export_to_provider() is smart enough to only actually
* export it if |tmp_keymgmt| is different from |ctx->pkey|'s keymgmt)
*/
- tmp_keymgmt_tofree = tmp_keymgmt =
- evp_keymgmt_fetch_from_prov((OSSL_PROVIDER *)tmp_prov,
- EVP_KEYMGMT_get0_name(ctx->keymgmt),
- ctx->propquery);
+ tmp_keymgmt_tofree = tmp_keymgmt = evp_keymgmt_fetch_from_prov((OSSL_PROVIDER *)tmp_prov,
+ EVP_KEYMGMT_get0_name(ctx->keymgmt),
+ ctx->propquery);
if (tmp_keymgmt != NULL) {
provkey = evp_pkey_export_to_provider(ctx->pkey, ctx->libctx,
- &tmp_keymgmt, ctx->propquery);
+ &tmp_keymgmt, ctx->propquery);
if (provkey != NULL && authkey != NULL) {
provauthkey = evp_pkey_export_to_provider(authkey, ctx->libctx,
- &tmp_keymgmt,
- ctx->propquery);
+ &tmp_keymgmt,
+ ctx->propquery);
if (provauthkey == NULL) {
EVP_KEM_free(kem);
ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
@@ -169,7 +168,7 @@ static int evp_kem_init(EVP_PKEY_CTX *ctx, int operation,
case EVP_PKEY_OP_ENCAPSULATE:
if (provauthkey != NULL && kem->auth_encapsulate_init != NULL) {
ret = kem->auth_encapsulate_init(ctx->op.encap.algctx, provkey,
- provauthkey, params);
+ provauthkey, params);
} else if (provauthkey == NULL && kem->encapsulate_init != NULL) {
ret = kem->encapsulate_init(ctx->op.encap.algctx, provkey, params);
} else {
@@ -181,7 +180,7 @@ static int evp_kem_init(EVP_PKEY_CTX *ctx, int operation,
case EVP_PKEY_OP_DECAPSULATE:
if (provauthkey != NULL && kem->auth_decapsulate_init != NULL) {
ret = kem->auth_decapsulate_init(ctx->op.encap.algctx, provkey,
- provauthkey, params);
+ provauthkey, params);
} else if (provauthkey == NULL && kem->encapsulate_init != NULL) {
ret = kem->decapsulate_init(ctx->op.encap.algctx, provkey, params);
} else {
@@ -200,7 +199,7 @@ static int evp_kem_init(EVP_PKEY_CTX *ctx, int operation,
if (ret > 0)
return 1;
- err:
+err:
if (ret <= 0) {
evp_pkey_ctx_free_old_ops(ctx);
ctx->operation = EVP_PKEY_OP_UNDEFINED;
@@ -210,7 +209,7 @@ static int evp_kem_init(EVP_PKEY_CTX *ctx, int operation,
}
int EVP_PKEY_auth_encapsulate_init(EVP_PKEY_CTX *ctx, EVP_PKEY *authpriv,
- const OSSL_PARAM params[])
+ const OSSL_PARAM params[])
{
if (authpriv == NULL)
return 0;
@@ -223,8 +222,8 @@ int EVP_PKEY_encapsulate_init(EVP_PKEY_CTX *ctx, const OSSL_PARAM params[])
}
int EVP_PKEY_encapsulate(EVP_PKEY_CTX *ctx,
- unsigned char *out, size_t *outlen,
- unsigned char *secret, size_t *secretlen)
+ unsigned char *out, size_t *outlen,
+ unsigned char *secret, size_t *secretlen)
{
if (ctx == NULL)
return 0;
@@ -243,7 +242,7 @@ int EVP_PKEY_encapsulate(EVP_PKEY_CTX *ctx,
return 0;
return ctx->op.encap.kem->encapsulate(ctx->op.encap.algctx,
- out, outlen, secret, secretlen);
+ out, outlen, secret, secretlen);
}
int EVP_PKEY_decapsulate_init(EVP_PKEY_CTX *ctx, const OSSL_PARAM params[])
@@ -252,7 +251,7 @@ int EVP_PKEY_decapsulate_init(EVP_PKEY_CTX *ctx, const OSSL_PARAM params[])
}
int EVP_PKEY_auth_decapsulate_init(EVP_PKEY_CTX *ctx, EVP_PKEY *authpub,
- const OSSL_PARAM params[])
+ const OSSL_PARAM params[])
{
if (authpub == NULL)
return 0;
@@ -260,8 +259,8 @@ int EVP_PKEY_auth_decapsulate_init(EVP_PKEY_CTX *ctx, EVP_PKEY *authpub,
}
int EVP_PKEY_decapsulate(EVP_PKEY_CTX *ctx,
- unsigned char *secret, size_t *secretlen,
- const unsigned char *in, size_t inlen)
+ unsigned char *secret, size_t *secretlen,
+ const unsigned char *in, size_t inlen)
{
if (ctx == NULL
|| (in == NULL || inlen == 0)
@@ -278,7 +277,7 @@ int EVP_PKEY_decapsulate(EVP_PKEY_CTX *ctx,
return -2;
}
return ctx->op.encap.kem->decapsulate(ctx->op.encap.algctx,
- secret, secretlen, in, inlen);
+ secret, secretlen, in, inlen);
}
static EVP_KEM *evp_kem_new(OSSL_PROVIDER *prov)
@@ -300,7 +299,7 @@ static EVP_KEM *evp_kem_new(OSSL_PROVIDER *prov)
}
static void *evp_kem_from_algorithm(int name_id, const OSSL_ALGORITHM *algodef,
- OSSL_PROVIDER *prov)
+ OSSL_PROVIDER *prov)
{
const OSSL_DISPATCH *fns = algodef->implementation;
EVP_KEM *kem = NULL;
@@ -424,7 +423,7 @@ static void *evp_kem_from_algorithm(int name_id, const OSSL_ALGORITHM *algodef,
}
return kem;
- err:
+err:
EVP_KEM_free(kem);
return NULL;
}
@@ -459,21 +458,21 @@ OSSL_PROVIDER *EVP_KEM_get0_provider(const EVP_KEM *kem)
}
EVP_KEM *EVP_KEM_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
- const char *properties)
+ const char *properties)
{
return evp_generic_fetch(ctx, OSSL_OP_KEM, algorithm, properties,
- evp_kem_from_algorithm,
- evp_kem_up_ref,
- evp_kem_free);
+ evp_kem_from_algorithm,
+ evp_kem_up_ref,
+ evp_kem_free);
}
EVP_KEM *evp_kem_fetch_from_prov(OSSL_PROVIDER *prov, const char *algorithm,
- const char *properties)
+ const char *properties)
{
return evp_generic_fetch_from_prov(prov, OSSL_OP_KEM, algorithm, properties,
- evp_kem_from_algorithm,
- evp_kem_up_ref,
- evp_kem_free);
+ evp_kem_from_algorithm,
+ evp_kem_up_ref,
+ evp_kem_free);
}
int EVP_KEM_is_a(const EVP_KEM *kem, const char *name)
@@ -497,18 +496,18 @@ const char *EVP_KEM_get0_description(const EVP_KEM *kem)
}
void EVP_KEM_do_all_provided(OSSL_LIB_CTX *libctx,
- void (*fn)(EVP_KEM *kem, void *arg),
- void *arg)
+ void (*fn)(EVP_KEM *kem, void *arg),
+ void *arg)
{
evp_generic_do_all(libctx, OSSL_OP_KEM, (void (*)(void *, void *))fn, arg,
- evp_kem_from_algorithm,
- evp_kem_up_ref,
- evp_kem_free);
+ evp_kem_from_algorithm,
+ evp_kem_up_ref,
+ evp_kem_free);
}
int EVP_KEM_names_do_all(const EVP_KEM *kem,
- void (*fn)(const char *name, void *data),
- void *data)
+ void (*fn)(const char *name, void *data),
+ void *data)
{
if (kem->prov != NULL)
return evp_names_do_all(kem->prov, kem->name_id, fn, data);
diff --git a/crypto/evp/keymgmt_lib.c b/crypto/evp/keymgmt_lib.c
index 9166c5ad22..04ac443aad 100644
--- a/crypto/evp/keymgmt_lib.c
+++ b/crypto/evp/keymgmt_lib.c
@@ -48,7 +48,7 @@ int evp_keymgmt_util_try_import(const OSSL_PARAM params[], void *arg)
return 1;
if (evp_keymgmt_import(data->keymgmt, data->keydata, data->selection,
- params))
+ params))
return 1;
if (delete_on_error) {
evp_keymgmt_freedata(data->keymgmt, data->keydata);
@@ -58,7 +58,7 @@ int evp_keymgmt_util_try_import(const OSSL_PARAM params[], void *arg)
}
int evp_keymgmt_util_assign_pkey(EVP_PKEY *pkey, EVP_KEYMGMT *keymgmt,
- void *keydata)
+ void *keydata)
{
if (pkey == NULL || keymgmt == NULL || keydata == NULL
|| !EVP_PKEY_set_type_by_keymgmt(pkey, keymgmt)) {
@@ -85,16 +85,16 @@ EVP_PKEY *evp_keymgmt_util_make_pkey(EVP_KEYMGMT *keymgmt, void *keydata)
}
int evp_keymgmt_util_export(const EVP_PKEY *pk, int selection,
- OSSL_CALLBACK *export_cb, void *export_cbarg)
+ OSSL_CALLBACK *export_cb, void *export_cbarg)
{
if (pk == NULL || export_cb == NULL)
return 0;
return evp_keymgmt_export(pk->keymgmt, pk->keydata, selection,
- export_cb, export_cbarg);
+ export_cb, export_cbarg);
}
void *evp_keymgmt_util_export_to_provider(EVP_PKEY *pk, EVP_KEYMGMT *keymgmt,
- int selection)
+ int selection)
{
struct evp_keymgmt_util_try_import_data_st import_data;
OP_CACHE_ELEM *op;
@@ -156,7 +156,7 @@ void *evp_keymgmt_util_export_to_provider(EVP_PKEY *pk, EVP_KEYMGMT *keymgmt,
*/
/* Setup for the export callback */
- import_data.keydata = NULL; /* evp_keymgmt_util_try_import will create it */
+ import_data.keydata = NULL; /* evp_keymgmt_util_try_import will create it */
import_data.keymgmt = keymgmt;
import_data.selection = selection;
@@ -165,7 +165,7 @@ void *evp_keymgmt_util_export_to_provider(EVP_PKEY *pk, EVP_KEYMGMT *keymgmt,
* which does the import for us. If successful, we're done.
*/
if (!evp_keymgmt_util_export(pk, selection,
- &evp_keymgmt_util_try_import, &import_data))
+ &evp_keymgmt_util_try_import, &import_data))
/* If there was an error, bail out */
return NULL;
@@ -198,7 +198,7 @@ void *evp_keymgmt_util_export_to_provider(EVP_PKEY *pk, EVP_KEYMGMT *keymgmt,
/* Add the new export to the operation cache */
if (!evp_keymgmt_util_cache_keydata(pk, keymgmt, import_data.keydata,
- selection)) {
+ selection)) {
CRYPTO_THREAD_unlock(pk->lock);
evp_keymgmt_freedata(keymgmt, import_data.keydata);
return NULL;
@@ -230,8 +230,8 @@ int evp_keymgmt_util_clear_operation_cache(EVP_PKEY *pk)
}
OP_CACHE_ELEM *evp_keymgmt_util_find_operation_cache(EVP_PKEY *pk,
- EVP_KEYMGMT *keymgmt,
- int selection)
+ EVP_KEYMGMT *keymgmt,
+ int selection)
{
int i, end = sk_OP_CACHE_ELEM_num(pk->operation_cache);
OP_CACHE_ELEM *p;
@@ -245,16 +245,16 @@ OP_CACHE_ELEM *evp_keymgmt_util_find_operation_cache(EVP_PKEY *pk,
for (i = 0; i < end; i++) {
p = sk_OP_CACHE_ELEM_value(pk->operation_cache, i);
if ((p->selection & selection) == selection
- && (keymgmt == p->keymgmt
- || (keymgmt->name_id == p->keymgmt->name_id
- && keymgmt->prov == p->keymgmt->prov)))
+ && (keymgmt == p->keymgmt
+ || (keymgmt->name_id == p->keymgmt->name_id
+ && keymgmt->prov == p->keymgmt->prov)))
return p;
}
return NULL;
}
int evp_keymgmt_util_cache_keydata(EVP_PKEY *pk, EVP_KEYMGMT *keymgmt,
- void *keydata, int selection)
+ void *keydata, int selection)
{
OP_CACHE_ELEM *p = NULL;
@@ -302,9 +302,9 @@ void evp_keymgmt_util_cache_keyinfo(EVP_PKEY *pk)
params[0] = OSSL_PARAM_construct_int(OSSL_PKEY_PARAM_BITS, &bits);
params[1] = OSSL_PARAM_construct_int(OSSL_PKEY_PARAM_SECURITY_BITS,
- &security_bits);
+ &security_bits);
params[2] = OSSL_PARAM_construct_int(OSSL_PKEY_PARAM_SECURITY_CATEGORY,
- &security_category);
+ &security_category);
params[3] = OSSL_PARAM_construct_int(OSSL_PKEY_PARAM_MAX_SIZE, &size);
params[4] = OSSL_PARAM_construct_end();
if (evp_keymgmt_get_params(pk->keymgmt, pk->keydata, params)) {
@@ -317,7 +317,7 @@ void evp_keymgmt_util_cache_keyinfo(EVP_PKEY *pk)
}
void *evp_keymgmt_util_fromdata(EVP_PKEY *target, EVP_KEYMGMT *keymgmt,
- int selection, const OSSL_PARAM params[])
+ int selection, const OSSL_PARAM params[])
{
void *keydata = NULL;
@@ -386,7 +386,7 @@ int evp_keymgmt_util_match(EVP_PKEY *pk1, EVP_PKEY *pk2, int selection)
&& keymgmt2 != NULL
&& !match_type(keymgmt1, keymgmt2)) {
ERR_raise(ERR_LIB_EVP, EVP_R_DIFFERENT_KEY_TYPES);
- return -1; /* Not the same type */
+ return -1; /* Not the same type */
}
/*
@@ -399,9 +399,8 @@ int evp_keymgmt_util_match(EVP_PKEY *pk1, EVP_PKEY *pk2, int selection)
ok = 1;
if (keydata1 != NULL) {
- tmp_keydata =
- evp_keymgmt_util_export_to_provider(pk1, keymgmt2,
- selection);
+ tmp_keydata = evp_keymgmt_util_export_to_provider(pk1, keymgmt2,
+ selection);
ok = (tmp_keydata != NULL);
}
if (ok) {
@@ -420,9 +419,8 @@ int evp_keymgmt_util_match(EVP_PKEY *pk1, EVP_PKEY *pk2, int selection)
ok = 1;
if (keydata2 != NULL) {
- tmp_keydata =
- evp_keymgmt_util_export_to_provider(pk2, keymgmt1,
- selection);
+ tmp_keydata = evp_keymgmt_util_export_to_provider(pk2, keymgmt1,
+ selection);
ok = (tmp_keydata != NULL);
}
if (ok) {
@@ -467,8 +465,8 @@ int evp_keymgmt_util_copy(EVP_PKEY *to, EVP_PKEY *from, int selection)
if (to_keymgmt == from->keymgmt && to_keymgmt->dup != NULL
&& to_keydata == NULL) {
to_keydata = alloc_keydata = evp_keymgmt_dup(to_keymgmt,
- from->keydata,
- selection);
+ from->keydata,
+ selection);
if (to_keydata == NULL)
return 0;
} else if (match_type(to_keymgmt, from->keymgmt)) {
@@ -479,8 +477,8 @@ int evp_keymgmt_util_copy(EVP_PKEY *to, EVP_PKEY *from, int selection)
import_data.selection = selection;
if (!evp_keymgmt_util_export(from, selection,
- &evp_keymgmt_util_try_import,
- &import_data))
+ &evp_keymgmt_util_try_import,
+ &import_data))
return 0;
/*
@@ -515,7 +513,7 @@ int evp_keymgmt_util_copy(EVP_PKEY *to, EVP_PKEY *from, int selection)
}
void *evp_keymgmt_util_gen(EVP_PKEY *target, EVP_KEYMGMT *keymgmt,
- void *genctx, OSSL_CALLBACK *cb, void *cbarg)
+ void *genctx, OSSL_CALLBACK *cb, void *cbarg)
{
void *keydata = NULL;
@@ -535,8 +533,8 @@ void *evp_keymgmt_util_gen(EVP_PKEY *target, EVP_KEYMGMT *keymgmt,
* returns for no digest.
*/
int evp_keymgmt_util_get_deflt_digest_name(EVP_KEYMGMT *keymgmt,
- void *keydata,
- char *mdname, size_t mdname_sz)
+ void *keydata,
+ char *mdname, size_t mdname_sz)
{
OSSL_PARAM params[3];
char mddefault[100] = "";
@@ -544,13 +542,11 @@ int evp_keymgmt_util_get_deflt_digest_name(EVP_KEYMGMT *keymgmt,
char *result = NULL;
int rv = -2;
- params[0] =
- OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_DEFAULT_DIGEST,
- mddefault, sizeof(mddefault));
- params[1] =
- OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_MANDATORY_DIGEST,
- mdmandatory,
- sizeof(mdmandatory));
+ params[0] = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_DEFAULT_DIGEST,
+ mddefault, sizeof(mddefault));
+ params[1] = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_MANDATORY_DIGEST,
+ mdmandatory,
+ sizeof(mdmandatory));
params[2] = OSSL_PARAM_construct_end();
if (!evp_keymgmt_get_params(keymgmt, keydata, params))
@@ -580,7 +576,7 @@ int evp_keymgmt_util_get_deflt_digest_name(EVP_KEYMGMT *keymgmt,
* assuming that it works as a default operation name.
*/
const char *evp_keymgmt_util_query_operation_name(EVP_KEYMGMT *keymgmt,
- int op_id)
+ int op_id)
{
const char *name = NULL;
diff --git a/crypto/evp/keymgmt_meth.c b/crypto/evp/keymgmt_meth.c
index 7efab62327..465e669a71 100644
--- a/crypto/evp/keymgmt_meth.c
+++ b/crypto/evp/keymgmt_meth.c
@@ -42,7 +42,7 @@ static void *keymgmt_new(void)
#ifndef FIPS_MODULE
static void help_get_legacy_alg_type_from_keymgmt(const char *keytype,
- void *arg)
+ void *arg)
{
int *type = arg;
@@ -55,14 +55,14 @@ static int get_legacy_alg_type_from_keymgmt(const EVP_KEYMGMT *keymgmt)
int type = NID_undef;
EVP_KEYMGMT_names_do_all(keymgmt, help_get_legacy_alg_type_from_keymgmt,
- &type);
+ &type);
return type;
}
#endif
static void *keymgmt_from_algorithm(int name_id,
- const OSSL_ALGORITHM *algodef,
- OSSL_PROVIDER *prov)
+ const OSSL_ALGORITHM *algodef,
+ OSSL_PROVIDER *prov)
{
const OSSL_DISPATCH *fns = algodef->implementation;
EVP_KEYMGMT *keymgmt = NULL;
@@ -94,35 +94,30 @@ static void *keymgmt_from_algorithm(int name_id,
break;
case OSSL_FUNC_KEYMGMT_GEN_SET_TEMPLATE:
if (keymgmt->gen_set_template == NULL)
- keymgmt->gen_set_template =
- OSSL_FUNC_keymgmt_gen_set_template(fns);
+ keymgmt->gen_set_template = OSSL_FUNC_keymgmt_gen_set_template(fns);
break;
case OSSL_FUNC_KEYMGMT_GEN_SET_PARAMS:
if (keymgmt->gen_set_params == NULL) {
setgenparamfncnt++;
- keymgmt->gen_set_params =
- OSSL_FUNC_keymgmt_gen_set_params(fns);
+ keymgmt->gen_set_params = OSSL_FUNC_keymgmt_gen_set_params(fns);
}
break;
case OSSL_FUNC_KEYMGMT_GEN_SETTABLE_PARAMS:
if (keymgmt->gen_settable_params == NULL) {
setgenparamfncnt++;
- keymgmt->gen_settable_params =
- OSSL_FUNC_keymgmt_gen_settable_params(fns);
+ keymgmt->gen_settable_params = OSSL_FUNC_keymgmt_gen_settable_params(fns);
}
break;
case OSSL_FUNC_KEYMGMT_GEN_GET_PARAMS:
if (keymgmt->gen_get_params == NULL) {
getgenparamfncnt++;
- keymgmt->gen_get_params =
- OSSL_FUNC_keymgmt_gen_get_params(fns);
+ keymgmt->gen_get_params = OSSL_FUNC_keymgmt_gen_get_params(fns);
}
break;
case OSSL_FUNC_KEYMGMT_GEN_GETTABLE_PARAMS:
if (keymgmt->gen_gettable_params == NULL) {
getgenparamfncnt++;
- keymgmt->gen_gettable_params =
- OSSL_FUNC_keymgmt_gen_gettable_params(fns);
+ keymgmt->gen_gettable_params = OSSL_FUNC_keymgmt_gen_gettable_params(fns);
}
break;
case OSSL_FUNC_KEYMGMT_GEN:
@@ -150,11 +145,10 @@ static void *keymgmt_from_algorithm(int name_id,
case OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS:
if (keymgmt->gettable_params == NULL) {
getparamfncnt++;
- keymgmt->gettable_params =
- OSSL_FUNC_keymgmt_gettable_params(fns);
+ keymgmt->gettable_params = OSSL_FUNC_keymgmt_gettable_params(fns);
}
break;
- case OSSL_FUNC_KEYMGMT_SET_PARAMS:
+ case OSSL_FUNC_KEYMGMT_SET_PARAMS:
if (keymgmt->set_params == NULL) {
setparamfncnt++;
keymgmt->set_params = OSSL_FUNC_keymgmt_set_params(fns);
@@ -163,14 +157,12 @@ static void *keymgmt_from_algorithm(int name_id,
case OSSL_FUNC_KEYMGMT_SETTABLE_PARAMS:
if (keymgmt->settable_params == NULL) {
setparamfncnt++;
- keymgmt->settable_params =
- OSSL_FUNC_keymgmt_settable_params(fns);
+ keymgmt->settable_params = OSSL_FUNC_keymgmt_settable_params(fns);
}
break;
case OSSL_FUNC_KEYMGMT_QUERY_OPERATION_NAME:
if (keymgmt->query_operation_name == NULL)
- keymgmt->query_operation_name =
- OSSL_FUNC_keymgmt_query_operation_name(fns);
+ keymgmt->query_operation_name = OSSL_FUNC_keymgmt_query_operation_name(fns);
break;
case OSSL_FUNC_KEYMGMT_HAS:
if (keymgmt->has == NULL)
@@ -275,23 +267,23 @@ static void *keymgmt_from_algorithm(int name_id,
}
EVP_KEYMGMT *evp_keymgmt_fetch_from_prov(OSSL_PROVIDER *prov,
- const char *name,
- const char *properties)
+ const char *name,
+ const char *properties)
{
return evp_generic_fetch_from_prov(prov, OSSL_OP_KEYMGMT,
- name, properties,
- keymgmt_from_algorithm,
- evp_keymgmt_up_ref,
- evp_keymgmt_free);
+ name, properties,
+ keymgmt_from_algorithm,
+ evp_keymgmt_up_ref,
+ evp_keymgmt_free);
}
EVP_KEYMGMT *EVP_KEYMGMT_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
- const char *properties)
+ const char *properties)
{
return evp_generic_fetch(ctx, OSSL_OP_KEYMGMT, algorithm, properties,
- keymgmt_from_algorithm,
- evp_keymgmt_up_ref,
- evp_keymgmt_free);
+ keymgmt_from_algorithm,
+ evp_keymgmt_up_ref,
+ evp_keymgmt_free);
}
int EVP_KEYMGMT_up_ref(EVP_KEYMGMT *keymgmt)
@@ -346,23 +338,23 @@ const char *EVP_KEYMGMT_get0_name(const EVP_KEYMGMT *keymgmt)
int EVP_KEYMGMT_is_a(const EVP_KEYMGMT *keymgmt, const char *name)
{
return keymgmt != NULL
- && evp_is_a(keymgmt->prov, keymgmt->name_id, NULL, name);
+ && evp_is_a(keymgmt->prov, keymgmt->name_id, NULL, name);
}
void EVP_KEYMGMT_do_all_provided(OSSL_LIB_CTX *libctx,
- void (*fn)(EVP_KEYMGMT *keymgmt, void *arg),
- void *arg)
+ void (*fn)(EVP_KEYMGMT *keymgmt, void *arg),
+ void *arg)
{
evp_generic_do_all(libctx, OSSL_OP_KEYMGMT,
- (void (*)(void *, void *))fn, arg,
- keymgmt_from_algorithm,
- evp_keymgmt_up_ref,
- evp_keymgmt_free);
+ (void (*)(void *, void *))fn, arg,
+ keymgmt_from_algorithm,
+ evp_keymgmt_up_ref,
+ evp_keymgmt_free);
}
int EVP_KEYMGMT_names_do_all(const EVP_KEYMGMT *keymgmt,
- void (*fn)(const char *name, void *data),
- void *data)
+ void (*fn)(const char *name, void *data),
+ void *data)
{
if (keymgmt->prov != NULL)
return evp_names_do_all(keymgmt->prov, keymgmt->name_id, fn, data);
@@ -394,7 +386,7 @@ void evp_keymgmt_freedata(const EVP_KEYMGMT *keymgmt, void *keydata)
}
void *evp_keymgmt_gen_init(const EVP_KEYMGMT *keymgmt, int selection,
- const OSSL_PARAM params[])
+ const OSSL_PARAM params[])
{
void *provctx = ossl_provider_ctx(EVP_KEYMGMT_get0_provider(keymgmt));
@@ -404,7 +396,7 @@ void *evp_keymgmt_gen_init(const EVP_KEYMGMT *keymgmt, int selection,
}
int evp_keymgmt_gen_set_template(const EVP_KEYMGMT *keymgmt, void *genctx,
- void *templ)
+ void *templ)
{
/*
* It's arguable if we actually should return success in this case, as
@@ -418,7 +410,7 @@ int evp_keymgmt_gen_set_template(const EVP_KEYMGMT *keymgmt, void *genctx,
}
int evp_keymgmt_gen_set_params(const EVP_KEYMGMT *keymgmt, void *genctx,
- const OSSL_PARAM params[])
+ const OSSL_PARAM params[])
{
if (keymgmt->gen_set_params == NULL)
return 0;
@@ -435,7 +427,7 @@ const OSSL_PARAM *EVP_KEYMGMT_gen_settable_params(const EVP_KEYMGMT *keymgmt)
}
int evp_keymgmt_gen_get_params(const EVP_KEYMGMT *keymgmt, void *genctx,
- OSSL_PARAM params[])
+ OSSL_PARAM params[])
{
if (keymgmt->gen_get_params == NULL)
return 0;
@@ -452,14 +444,14 @@ const OSSL_PARAM *EVP_KEYMGMT_gen_gettable_params(const EVP_KEYMGMT *keymgmt)
}
void *evp_keymgmt_gen(const EVP_KEYMGMT *keymgmt, void *genctx,
- OSSL_CALLBACK *cb, void *cbarg)
+ OSSL_CALLBACK *cb, void *cbarg)
{
void *ret;
const char *desc = keymgmt->description != NULL ? keymgmt->description : "";
if (keymgmt->gen == NULL) {
ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_KEYMGMT_NOT_SUPPORTED,
- "%s key generation:%s", keymgmt->type_name, desc);
+ "%s key generation:%s", keymgmt->type_name, desc);
return NULL;
}
@@ -467,7 +459,7 @@ void *evp_keymgmt_gen(const EVP_KEYMGMT *keymgmt, void *genctx,
ret = keymgmt->gen(genctx, cb, cbarg);
if (ret == NULL && ERR_count_to_mark() == 0)
ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_KEYMGMT_FAILURE,
- "%s key generation:%s", keymgmt->type_name, desc);
+ "%s key generation:%s", keymgmt->type_name, desc);
ERR_clear_last_mark();
return ret;
}
@@ -484,7 +476,7 @@ int evp_keymgmt_has_load(const EVP_KEYMGMT *keymgmt)
}
void *evp_keymgmt_load(const EVP_KEYMGMT *keymgmt,
- const void *objref, size_t objref_sz)
+ const void *objref, size_t objref_sz)
{
if (evp_keymgmt_has_load(keymgmt))
return keymgmt->load(objref, objref_sz);
@@ -492,7 +484,7 @@ void *evp_keymgmt_load(const EVP_KEYMGMT *keymgmt,
}
int evp_keymgmt_get_params(const EVP_KEYMGMT *keymgmt, void *keydata,
- OSSL_PARAM params[])
+ OSSL_PARAM params[])
{
if (keymgmt->get_params == NULL)
return 1;
@@ -509,7 +501,7 @@ const OSSL_PARAM *EVP_KEYMGMT_gettable_params(const EVP_KEYMGMT *keymgmt)
}
int evp_keymgmt_set_params(const EVP_KEYMGMT *keymgmt, void *keydata,
- const OSSL_PARAM params[])
+ const OSSL_PARAM params[])
{
if (keymgmt->set_params == NULL)
return 1;
@@ -532,7 +524,7 @@ int evp_keymgmt_has(const EVP_KEYMGMT *keymgmt, void *keydata, int selection)
}
int evp_keymgmt_validate(const EVP_KEYMGMT *keymgmt, void *keydata,
- int selection, int checktype)
+ int selection, int checktype)
{
/* We assume valid if the implementation doesn't have a function */
if (keymgmt->validate == NULL)
@@ -541,8 +533,8 @@ int evp_keymgmt_validate(const EVP_KEYMGMT *keymgmt, void *keydata,
}
int evp_keymgmt_match(const EVP_KEYMGMT *keymgmt,
- const void *keydata1, const void *keydata2,
- int selection)
+ const void *keydata1, const void *keydata2,
+ int selection)
{
/* We assume no match if the implementation doesn't have a function */
if (keymgmt->match == NULL)
@@ -551,7 +543,7 @@ int evp_keymgmt_match(const EVP_KEYMGMT *keymgmt,
}
int evp_keymgmt_import(const EVP_KEYMGMT *keymgmt, void *keydata,
- int selection, const OSSL_PARAM params[])
+ int selection, const OSSL_PARAM params[])
{
if (keymgmt->import == NULL)
return 0;
@@ -559,7 +551,7 @@ int evp_keymgmt_import(const EVP_KEYMGMT *keymgmt, void *keydata,
}
const OSSL_PARAM *evp_keymgmt_import_types(const EVP_KEYMGMT *keymgmt,
- int selection)
+ int selection)
{
void *provctx = ossl_provider_ctx(EVP_KEYMGMT_get0_provider(keymgmt));
@@ -571,7 +563,7 @@ const OSSL_PARAM *evp_keymgmt_import_types(const EVP_KEYMGMT *keymgmt,
}
int evp_keymgmt_export(const EVP_KEYMGMT *keymgmt, void *keydata,
- int selection, OSSL_CALLBACK *param_cb, void *cbarg)
+ int selection, OSSL_CALLBACK *param_cb, void *cbarg)
{
if (keymgmt->export == NULL)
return 0;
@@ -579,7 +571,7 @@ int evp_keymgmt_export(const EVP_KEYMGMT *keymgmt, void *keydata,
}
const OSSL_PARAM *evp_keymgmt_export_types(const EVP_KEYMGMT *keymgmt,
- int selection)
+ int selection)
{
void *provctx = ossl_provider_ctx(EVP_KEYMGMT_get0_provider(keymgmt));
@@ -591,7 +583,7 @@ const OSSL_PARAM *evp_keymgmt_export_types(const EVP_KEYMGMT *keymgmt,
}
void *evp_keymgmt_dup(const EVP_KEYMGMT *keymgmt, const void *keydata_from,
- int selection)
+ int selection)
{
/* We assume no dup if the implementation doesn't have a function */
if (keymgmt->dup == NULL)
diff --git a/crypto/evp/legacy_blake2.c b/crypto/evp/legacy_blake2.c
index 5a5f05044c..af8ad536fa 100644
--- a/crypto/evp/legacy_blake2.c
+++ b/crypto/evp/legacy_blake2.c
@@ -8,7 +8,7 @@
*/
#include "crypto/evp.h"
-#include "prov/blake2.h" /* diverse BLAKE2 macros */
+#include "prov/blake2.h" /* diverse BLAKE2 macros */
#include "legacy_meth.h"
/*
@@ -44,7 +44,7 @@ static const EVP_MD blake2b_md = {
0,
EVP_ORIG_GLOBAL,
LEGACY_EVP_MD_METH_TABLE(blake2b_int_init, blake2b_int_update,
- blake2b_int_final, NULL, BLAKE2B_BLOCKBYTES),
+ blake2b_int_final, NULL, BLAKE2B_BLOCKBYTES),
};
const EVP_MD *EVP_blake2b512(void)
@@ -59,7 +59,7 @@ static const EVP_MD blake2s_md = {
0,
EVP_ORIG_GLOBAL,
LEGACY_EVP_MD_METH_TABLE(blake2s_int_init, blake2s_int_update,
- blake2s_int_final, NULL, BLAKE2S_BLOCKBYTES),
+ blake2s_int_final, NULL, BLAKE2S_BLOCKBYTES),
};
const EVP_MD *EVP_blake2s256(void)
diff --git a/crypto/evp/legacy_md5_sha1.c b/crypto/evp/legacy_md5_sha1.c
index b84bf3deaa..62947f8b9a 100644
--- a/crypto/evp/legacy_md5_sha1.c
+++ b/crypto/evp/legacy_md5_sha1.c
@@ -15,7 +15,7 @@
#include "internal/deprecated.h"
#include "crypto/evp.h"
-#include "prov/md5_sha1.h" /* diverse MD5_SHA1 macros */
+#include "prov/md5_sha1.h" /* diverse MD5_SHA1 macros */
#include "legacy_meth.h"
IMPLEMENT_LEGACY_EVP_MD_METH_LC(md5_sha1_int, ossl_md5_sha1)
@@ -31,8 +31,8 @@ static const EVP_MD md5_sha1_md = {
0,
EVP_ORIG_GLOBAL,
LEGACY_EVP_MD_METH_TABLE(md5_sha1_int_init, md5_sha1_int_update,
- md5_sha1_int_final, md5_sha1_int_ctrl,
- MD5_SHA1_CBLOCK),
+ md5_sha1_int_final, md5_sha1_int_ctrl,
+ MD5_SHA1_CBLOCK),
};
const EVP_MD *EVP_md5_sha1(void)
diff --git a/crypto/evp/legacy_mdc2.c b/crypto/evp/legacy_mdc2.c
index 317d87c61b..2ad432426c 100644
--- a/crypto/evp/legacy_mdc2.c
+++ b/crypto/evp/legacy_mdc2.c
@@ -26,7 +26,7 @@ static const EVP_MD mdc2_md = {
0,
EVP_ORIG_GLOBAL,
LEGACY_EVP_MD_METH_TABLE(mdc2_init, mdc2_update, mdc2_final, NULL,
- MDC2_BLOCK),
+ MDC2_BLOCK),
};
const EVP_MD *EVP_mdc2(void)
diff --git a/crypto/evp/legacy_meth.h b/crypto/evp/legacy_meth.h
index a6e58bc824..ea1e84c7e7 100644
--- a/crypto/evp/legacy_meth.h
+++ b/crypto/evp/legacy_meth.h
@@ -7,34 +7,33 @@
* https://www.openssl.org/source/license.html
*/
-#define IMPLEMENT_LEGACY_EVP_MD_METH(nm, fn) \
-static int nm##_init(EVP_MD_CTX *ctx) \
-{ \
- return fn##_Init(EVP_MD_CTX_get0_md_data(ctx)); \
-} \
-static int nm##_update(EVP_MD_CTX *ctx, const void *data, size_t count) \
-{ \
- return fn##_Update(EVP_MD_CTX_get0_md_data(ctx), data, count); \
-} \
-static int nm##_final(EVP_MD_CTX *ctx, unsigned char *md) \
-{ \
- return fn##_Final(md, EVP_MD_CTX_get0_md_data(ctx)); \
-}
+#define IMPLEMENT_LEGACY_EVP_MD_METH(nm, fn) \
+ static int nm##_init(EVP_MD_CTX *ctx) \
+ { \
+ return fn##_Init(EVP_MD_CTX_get0_md_data(ctx)); \
+ } \
+ static int nm##_update(EVP_MD_CTX *ctx, const void *data, size_t count) \
+ { \
+ return fn##_Update(EVP_MD_CTX_get0_md_data(ctx), data, count); \
+ } \
+ static int nm##_final(EVP_MD_CTX *ctx, unsigned char *md) \
+ { \
+ return fn##_Final(md, EVP_MD_CTX_get0_md_data(ctx)); \
+ }
-#define IMPLEMENT_LEGACY_EVP_MD_METH_LC(nm, fn) \
-static int nm##_init(EVP_MD_CTX *ctx) \
-{ \
- return fn##_init(EVP_MD_CTX_get0_md_data(ctx)); \
-} \
-static int nm##_update(EVP_MD_CTX *ctx, const void *data, size_t count) \
-{ \
- return fn##_update(EVP_MD_CTX_get0_md_data(ctx), data, count); \
-} \
-static int nm##_final(EVP_MD_CTX *ctx, unsigned char *md) \
-{ \
- return fn##_final(md, EVP_MD_CTX_get0_md_data(ctx)); \
-}
+#define IMPLEMENT_LEGACY_EVP_MD_METH_LC(nm, fn) \
+ static int nm##_init(EVP_MD_CTX *ctx) \
+ { \
+ return fn##_init(EVP_MD_CTX_get0_md_data(ctx)); \
+ } \
+ static int nm##_update(EVP_MD_CTX *ctx, const void *data, size_t count) \
+ { \
+ return fn##_update(EVP_MD_CTX_get0_md_data(ctx), data, count); \
+ } \
+ static int nm##_final(EVP_MD_CTX *ctx, unsigned char *md) \
+ { \
+ return fn##_final(md, EVP_MD_CTX_get0_md_data(ctx)); \
+ }
-
-#define LEGACY_EVP_MD_METH_TABLE(init, update, final, ctrl, blksz) \
+#define LEGACY_EVP_MD_METH_TABLE(init, update, final, ctrl, blksz) \
init, update, final, NULL, NULL, blksz, 0, ctrl
diff --git a/crypto/evp/legacy_ripemd.c b/crypto/evp/legacy_ripemd.c
index 1fa1ebc049..80f551a97d 100644
--- a/crypto/evp/legacy_ripemd.c
+++ b/crypto/evp/legacy_ripemd.c
@@ -26,7 +26,7 @@ static const EVP_MD ripemd160_md = {
0,
EVP_ORIG_GLOBAL,
LEGACY_EVP_MD_METH_TABLE(ripe_init, ripe_update, ripe_final, NULL,
- RIPEMD160_CBLOCK),
+ RIPEMD160_CBLOCK),
};
const EVP_MD *EVP_ripemd160(void)
diff --git a/crypto/evp/legacy_sha.c b/crypto/evp/legacy_sha.c
index a9894d4d2a..0c1a74de30 100644
--- a/crypto/evp/legacy_sha.c
+++ b/crypto/evp/legacy_sha.c
@@ -13,8 +13,8 @@
*/
#include "internal/deprecated.h"
-#include <openssl/sha.h> /* diverse SHA macros */
-#include "internal/sha3.h" /* KECCAK1600_WIDTH */
+#include <openssl/sha.h> /* diverse SHA macros */
+#include "internal/sha3.h" /* KECCAK1600_WIDTH */
#include "crypto/evp.h"
/* Used by legacy methods */
#include "crypto/sha.h"
@@ -26,33 +26,33 @@
* These only remain to support engines that can get these methods.
* Hardware support for SHA3 has been removed from these legacy cases.
*/
-#define IMPLEMENT_LEGACY_EVP_MD_METH_SHA3(nm, fn, tag) \
-static int nm##_init(EVP_MD_CTX *ctx) \
-{ \
- return fn##_init(EVP_MD_CTX_get0_md_data(ctx), tag, ctx->digest->md_size * 8); \
-} \
-static int nm##_update(EVP_MD_CTX *ctx, const void *data, size_t count) \
-{ \
- return fn##_update(EVP_MD_CTX_get0_md_data(ctx), data, count); \
-} \
-static int nm##_final(EVP_MD_CTX *ctx, unsigned char *md) \
-{ \
- KECCAK1600_CTX *kctx = EVP_MD_CTX_get0_md_data(ctx); \
- return fn##_final(kctx, md, kctx->md_size); \
-}
-#define IMPLEMENT_LEGACY_EVP_MD_METH_SHAKE(nm, fn, tag) \
-static int nm##_init(EVP_MD_CTX *ctx) \
-{ \
- return fn##_init(EVP_MD_CTX_get0_md_data(ctx), tag, ctx->digest->md_size * 8); \
-} \
+#define IMPLEMENT_LEGACY_EVP_MD_METH_SHA3(nm, fn, tag) \
+ static int nm##_init(EVP_MD_CTX *ctx) \
+ { \
+ return fn##_init(EVP_MD_CTX_get0_md_data(ctx), tag, ctx->digest->md_size * 8); \
+ } \
+ static int nm##_update(EVP_MD_CTX *ctx, const void *data, size_t count) \
+ { \
+ return fn##_update(EVP_MD_CTX_get0_md_data(ctx), data, count); \
+ } \
+ static int nm##_final(EVP_MD_CTX *ctx, unsigned char *md) \
+ { \
+ KECCAK1600_CTX *kctx = EVP_MD_CTX_get0_md_data(ctx); \
+ return fn##_final(kctx, md, kctx->md_size); \
+ }
+#define IMPLEMENT_LEGACY_EVP_MD_METH_SHAKE(nm, fn, tag) \
+ static int nm##_init(EVP_MD_CTX *ctx) \
+ { \
+ return fn##_init(EVP_MD_CTX_get0_md_data(ctx), tag, ctx->digest->md_size * 8); \
+ }
-#define sha512_224_Init sha512_224_init
-#define sha512_256_Init sha512_256_init
+#define sha512_224_Init sha512_224_init
+#define sha512_256_Init sha512_256_init
-#define sha512_224_Update SHA512_Update
-#define sha512_224_Final SHA512_Final
-#define sha512_256_Update SHA512_Update
-#define sha512_256_Final SHA512_Final
+#define sha512_224_Update SHA512_Update
+#define sha512_224_Final SHA512_Final
+#define sha512_256_Update SHA512_Update
+#define sha512_256_Final SHA512_Final
IMPLEMENT_LEGACY_EVP_MD_METH(sha1, SHA1)
IMPLEMENT_LEGACY_EVP_MD_METH(sha224, SHA224)
@@ -67,7 +67,7 @@ IMPLEMENT_LEGACY_EVP_MD_METH_SHAKE(shake, ossl_sha3, '\x1f')
static int sha1_int_ctrl(EVP_MD_CTX *ctx, int cmd, int p1, void *p2)
{
return ossl_sha1_ctrl(ctx != NULL ? EVP_MD_CTX_get0_md_data(ctx) : NULL,
- cmd, p1, p2);
+ cmd, p1, p2);
}
static int shake_ctrl(EVP_MD_CTX *evp_ctx, int cmd, int p1, void *p2)
@@ -87,8 +87,6 @@ static int shake_ctrl(EVP_MD_CTX *evp_ctx, int cmd, int p1, void *p2)
}
}
-
-
static const EVP_MD sha1_md = {
NID_sha1,
NID_sha1WithRSAEncryption,
@@ -96,7 +94,7 @@ static const EVP_MD sha1_md = {
EVP_MD_FLAG_DIGALGID_ABSENT,
EVP_ORIG_GLOBAL,
LEGACY_EVP_MD_METH_TABLE(sha1_init, sha1_update, sha1_final, sha1_int_ctrl,
- SHA_CBLOCK),
+ SHA_CBLOCK),
};
const EVP_MD *EVP_sha1(void)
@@ -111,7 +109,7 @@ static const EVP_MD sha224_md = {
EVP_MD_FLAG_DIGALGID_ABSENT,
EVP_ORIG_GLOBAL,
LEGACY_EVP_MD_METH_TABLE(sha224_init, sha224_update, sha224_final, NULL,
- SHA256_CBLOCK),
+ SHA256_CBLOCK),
};
const EVP_MD *EVP_sha224(void)
@@ -126,7 +124,7 @@ static const EVP_MD sha256_md = {
EVP_MD_FLAG_DIGALGID_ABSENT,
EVP_ORIG_GLOBAL,
LEGACY_EVP_MD_METH_TABLE(sha256_init, sha256_update, sha256_final, NULL,
- SHA256_CBLOCK),
+ SHA256_CBLOCK),
};
const EVP_MD *EVP_sha256(void)
@@ -141,7 +139,7 @@ static const EVP_MD sha512_224_md = {
EVP_MD_FLAG_DIGALGID_ABSENT,
EVP_ORIG_GLOBAL,
LEGACY_EVP_MD_METH_TABLE(sha512_224_int_init, sha512_224_int_update,
- sha512_224_int_final, NULL, SHA512_CBLOCK),
+ sha512_224_int_final, NULL, SHA512_CBLOCK),
};
const EVP_MD *EVP_sha512_224(void)
@@ -156,7 +154,7 @@ static const EVP_MD sha512_256_md = {
EVP_MD_FLAG_DIGALGID_ABSENT,
EVP_ORIG_GLOBAL,
LEGACY_EVP_MD_METH_TABLE(sha512_256_int_init, sha512_256_int_update,
- sha512_256_int_final, NULL, SHA512_CBLOCK),
+ sha512_256_int_final, NULL, SHA512_CBLOCK),
};
const EVP_MD *EVP_sha512_256(void)
@@ -171,7 +169,7 @@ static const EVP_MD sha384_md = {
EVP_MD_FLAG_DIGALGID_ABSENT,
EVP_ORIG_GLOBAL,
LEGACY_EVP_MD_METH_TABLE(sha384_init, sha384_update, sha384_final, NULL,
- SHA512_CBLOCK),
+ SHA512_CBLOCK),
};
const EVP_MD *EVP_sha384(void)
@@ -186,7 +184,7 @@ static const EVP_MD sha512_md = {
EVP_MD_FLAG_DIGALGID_ABSENT,
EVP_ORIG_GLOBAL,
LEGACY_EVP_MD_METH_TABLE(sha512_init, sha512_update, sha512_final, NULL,
- SHA512_CBLOCK),
+ SHA512_CBLOCK),
};
const EVP_MD *EVP_sha512(void)
@@ -194,35 +192,35 @@ const EVP_MD *EVP_sha512(void)
return &sha512_md;
}
-#define EVP_MD_SHA3(bitlen) \
-const EVP_MD *EVP_sha3_##bitlen(void) \
-{ \
- static const EVP_MD sha3_##bitlen##_md = { \
- NID_sha3_##bitlen, \
- NID_RSA_SHA3_##bitlen, \
- bitlen / 8, \
- EVP_MD_FLAG_DIGALGID_ABSENT, \
- EVP_ORIG_GLOBAL, \
- LEGACY_EVP_MD_METH_TABLE(sha3_int_init, sha3_int_update, \
- sha3_int_final, NULL, \
- (KECCAK1600_WIDTH - bitlen * 2) / 8), \
- }; \
- return &sha3_##bitlen##_md; \
-}
-#define EVP_MD_SHAKE(bitlen) \
-const EVP_MD *EVP_shake##bitlen(void) \
-{ \
- static const EVP_MD shake##bitlen##_md = { \
- NID_shake##bitlen, \
- 0, \
- bitlen / 8, \
- EVP_MD_FLAG_XOF | EVP_MD_FLAG_DIGALGID_ABSENT, \
- EVP_ORIG_GLOBAL, \
- LEGACY_EVP_MD_METH_TABLE(shake_init, sha3_int_update, sha3_int_final, \
- shake_ctrl, (KECCAK1600_WIDTH - bitlen * 2) / 8), \
- }; \
- return &shake##bitlen##_md; \
-}
+#define EVP_MD_SHA3(bitlen) \
+ const EVP_MD *EVP_sha3_##bitlen(void) \
+ { \
+ static const EVP_MD sha3_##bitlen##_md = { \
+ NID_sha3_##bitlen, \
+ NID_RSA_SHA3_##bitlen, \
+ bitlen / 8, \
+ EVP_MD_FLAG_DIGALGID_ABSENT, \
+ EVP_ORIG_GLOBAL, \
+ LEGACY_EVP_MD_METH_TABLE(sha3_int_init, sha3_int_update, \
+ sha3_int_final, NULL, \
+ (KECCAK1600_WIDTH - bitlen * 2) / 8), \
+ }; \
+ return &sha3_##bitlen##_md; \
+ }
+#define EVP_MD_SHAKE(bitlen) \
+ const EVP_MD *EVP_shake##bitlen(void) \
+ { \
+ static const EVP_MD shake##bitlen##_md = { \
+ NID_shake##bitlen, \
+ 0, \
+ bitlen / 8, \
+ EVP_MD_FLAG_XOF | EVP_MD_FLAG_DIGALGID_ABSENT, \
+ EVP_ORIG_GLOBAL, \
+ LEGACY_EVP_MD_METH_TABLE(shake_init, sha3_int_update, sha3_int_final, \
+ shake_ctrl, (KECCAK1600_WIDTH - bitlen * 2) / 8), \
+ }; \
+ return &shake##bitlen##_md; \
+ }
EVP_MD_SHA3(224)
EVP_MD_SHA3(256)
diff --git a/crypto/evp/legacy_wp.c b/crypto/evp/legacy_wp.c
index 3976ff73fb..21865e6350 100644
--- a/crypto/evp/legacy_wp.c
+++ b/crypto/evp/legacy_wp.c
@@ -26,7 +26,7 @@ static const EVP_MD whirlpool_md = {
0,
EVP_ORIG_GLOBAL,
LEGACY_EVP_MD_METH_TABLE(wp_init, wp_update, wp_final, NULL,
- WHIRLPOOL_BBLOCK / 8),
+ WHIRLPOOL_BBLOCK / 8),
};
const EVP_MD *EVP_whirlpool(void)
diff --git a/crypto/evp/m_sigver.c b/crypto/evp/m_sigver.c
index d15bece28b..d37f8a0f77 100644
--- a/crypto/evp/m_sigver.c
+++ b/crypto/evp/m_sigver.c
@@ -13,7 +13,7 @@
#include <openssl/objects.h>
#include "crypto/evp.h"
#include "internal/provider.h"
-#include "internal/numbers.h" /* includes SIZE_MAX */
+#include "internal/numbers.h" /* includes SIZE_MAX */
#include "internal/common.h"
#include "evp_local.h"
@@ -36,10 +36,10 @@ static const char *canon_mdname(const char *mdname)
}
static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
- const EVP_MD *type, const char *mdname,
- OSSL_LIB_CTX *libctx, const char *props,
- EVP_PKEY *pkey, int ver,
- const OSSL_PARAM params[])
+ const EVP_MD *type, const char *mdname,
+ OSSL_LIB_CTX *libctx, const char *props,
+ EVP_PKEY *pkey, int ver,
+ const OSSL_PARAM params[])
{
EVP_PKEY_CTX *locpctx = NULL;
EVP_SIGNATURE *signature = NULL;
@@ -47,7 +47,7 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
EVP_KEYMGMT *tmp_keymgmt = NULL;
const OSSL_PROVIDER *tmp_prov = NULL;
const char *supported_sig = NULL;
- char locmdname[80] = ""; /* 80 chars should be enough */
+ char locmdname[80] = ""; /* 80 chars should be enough */
void *provkey = NULL;
int ret, iter, reinit = 1;
@@ -72,8 +72,7 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
/* do not reinitialize if pkey is set or operation is different */
if (reinit
&& (pkey != NULL
- || locpctx->operation != (ver ? EVP_PKEY_OP_VERIFYCTX
- : EVP_PKEY_OP_SIGNCTX)
+ || locpctx->operation != (ver ? EVP_PKEY_OP_VERIFYCTX : EVP_PKEY_OP_SIGNCTX)
|| (signature = locpctx->op.sig.signature) == NULL
|| locpctx->op.sig.algctx == NULL))
reinit = 0;
@@ -99,13 +98,13 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
* Try to derive the supported signature from |locpctx->keymgmt|.
*/
if (!ossl_assert(locpctx->pkey->keymgmt == NULL
- || locpctx->pkey->keymgmt == locpctx->keymgmt)) {
+ || locpctx->pkey->keymgmt == locpctx->keymgmt)) {
ERR_clear_last_mark();
ERR_raise(ERR_LIB_EVP, ERR_R_INTERNAL_ERROR);
goto err;
}
supported_sig = evp_keymgmt_util_query_operation_name(locpctx->keymgmt,
- OSSL_OP_SIGNATURE);
+ OSSL_OP_SIGNATURE);
if (supported_sig == NULL) {
ERR_clear_last_mark();
ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
@@ -143,15 +142,14 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
switch (iter) {
case 1:
signature = EVP_SIGNATURE_fetch(locpctx->libctx, supported_sig,
- locpctx->propquery);
+ locpctx->propquery);
if (signature != NULL)
tmp_prov = EVP_SIGNATURE_get0_provider(signature);
break;
case 2:
tmp_prov = EVP_KEYMGMT_get0_provider(locpctx->keymgmt);
- signature =
- evp_signature_fetch_from_prov((OSSL_PROVIDER *)tmp_prov,
- supported_sig, locpctx->propquery);
+ signature = evp_signature_fetch_from_prov((OSSL_PROVIDER *)tmp_prov,
+ supported_sig, locpctx->propquery);
if (signature == NULL)
goto legacy;
break;
@@ -169,13 +167,12 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
* export it if |tmp_keymgmt| is different from |locpctx->pkey|'s keymgmt)
*/
- tmp_keymgmt_tofree = tmp_keymgmt =
- evp_keymgmt_fetch_from_prov((OSSL_PROVIDER *)tmp_prov,
- EVP_KEYMGMT_get0_name(locpctx->keymgmt),
- locpctx->propquery);
+ tmp_keymgmt_tofree = tmp_keymgmt = evp_keymgmt_fetch_from_prov((OSSL_PROVIDER *)tmp_prov,
+ EVP_KEYMGMT_get0_name(locpctx->keymgmt),
+ locpctx->propquery);
if (tmp_keymgmt != NULL)
provkey = evp_pkey_export_to_provider(locpctx->pkey, locpctx->libctx,
- &tmp_keymgmt, locpctx->propquery);
+ &tmp_keymgmt, locpctx->propquery);
if (tmp_keymgmt == NULL)
EVP_KEYMGMT_free(tmp_keymgmt_tofree);
}
@@ -197,11 +194,11 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
locpctx->op.sig.algctx
= signature->newctx(ossl_provider_ctx(signature->prov), props);
if (locpctx->op.sig.algctx == NULL) {
- ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
+ ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
goto err;
}
- reinitialize:
+reinitialize:
if (pctx != NULL)
*pctx = locpctx;
@@ -212,8 +209,9 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
} else {
if (mdname == NULL && !reinit) {
if (evp_keymgmt_util_get_deflt_digest_name(tmp_keymgmt, provkey,
- locmdname,
- sizeof(locmdname)) > 0) {
+ locmdname,
+ sizeof(locmdname))
+ > 0) {
mdname = canon_mdname(locmdname);
}
}
@@ -254,19 +252,19 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
if (ver) {
if (signature->digest_verify_init == NULL) {
ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_NOT_SUPPORTED,
- "%s digest_verify_init:%s", signature->type_name, desc);
+ "%s digest_verify_init:%s", signature->type_name, desc);
goto err;
}
ret = signature->digest_verify_init(locpctx->op.sig.algctx,
- mdname, provkey, params);
+ mdname, provkey, params);
} else {
if (signature->digest_sign_init == NULL) {
ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_NOT_SUPPORTED,
- "%s digest_sign_init:%s", signature->type_name, desc);
+ "%s digest_sign_init:%s", signature->type_name, desc);
goto err;
}
ret = signature->digest_sign_init(locpctx->op.sig.algctx,
- mdname, provkey, params);
+ mdname, provkey, params);
}
/*
@@ -275,19 +273,19 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
*/
if (ret > 0 || mdname != NULL)
goto end;
- if (type == NULL) /* This check is redundant but clarifies matters */
+ if (type == NULL) /* This check is redundant but clarifies matters */
ERR_raise(ERR_LIB_EVP, EVP_R_NO_DEFAULT_DIGEST);
ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_FAILURE,
- ver ? "%s digest_verify_init:%s" : "%s digest_sign_init:%s",
- signature->type_name, desc);
+ ver ? "%s digest_verify_init:%s" : "%s digest_sign_init:%s",
+ signature->type_name, desc);
- err:
+err:
evp_pkey_ctx_free_old_ops(locpctx);
locpctx->operation = EVP_PKEY_OP_UNDEFINED;
EVP_KEYMGMT_free(tmp_keymgmt);
return 0;
- legacy:
+legacy:
/*
* If we don't have the full support we need with provided methods,
* let's go see if legacy does.
@@ -301,8 +299,8 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
if (ctx->pctx->pmeth == NULL) {
ERR_raise_data(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE,
- ver ? "%s digest_verify_init" : "%s digest_sign_init",
- EVP_PKEY_get0_type_name(locpctx->pkey));
+ ver ? "%s digest_verify_init" : "%s digest_sign_init",
+ EVP_PKEY_get0_type_name(locpctx->pkey));
return 0;
}
@@ -360,7 +358,7 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
ctx->pctx->flag_call_digest_custom = 1;
ret = 1;
- end:
+end:
if (ret > 0)
ret = evp_pkey_ctx_use_cached_data(locpctx);
@@ -369,39 +367,39 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
}
int EVP_DigestSignInit_ex(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
- const char *mdname, OSSL_LIB_CTX *libctx,
- const char *props, EVP_PKEY *pkey,
- const OSSL_PARAM params[])
+ const char *mdname, OSSL_LIB_CTX *libctx,
+ const char *props, EVP_PKEY *pkey,
+ const OSSL_PARAM params[])
{
return do_sigver_init(ctx, pctx, NULL, mdname, libctx, props, pkey, 0,
- params);
+ params);
}
int EVP_DigestSignInit(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
- const EVP_MD *type, ENGINE *e, EVP_PKEY *pkey)
+ const EVP_MD *type, ENGINE *e, EVP_PKEY *pkey)
{
if (!ossl_assert(e == NULL))
return 0;
return do_sigver_init(ctx, pctx, type, NULL, NULL, NULL, pkey, 0,
- NULL);
+ NULL);
}
int EVP_DigestVerifyInit_ex(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
- const char *mdname, OSSL_LIB_CTX *libctx,
- const char *props, EVP_PKEY *pkey,
- const OSSL_PARAM params[])
+ const char *mdname, OSSL_LIB_CTX *libctx,
+ const char *props, EVP_PKEY *pkey,
+ const OSSL_PARAM params[])
{
return do_sigver_init(ctx, pctx, NULL, mdname, libctx, props, pkey, 1,
- params);
+ params);
}
int EVP_DigestVerifyInit(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
- const EVP_MD *type, ENGINE *e, EVP_PKEY *pkey)
+ const EVP_MD *type, ENGINE *e, EVP_PKEY *pkey)
{
if (!ossl_assert(e == NULL))
return 0;
return do_sigver_init(ctx, pctx, type, NULL, NULL, NULL, pkey, 1,
- NULL);
+ NULL);
}
int EVP_DigestSignUpdate(EVP_MD_CTX *ctx, const void *data, size_t dsize)
@@ -417,16 +415,16 @@ int EVP_DigestSignUpdate(EVP_MD_CTX *ctx, const void *data, size_t dsize)
}
if (pctx == NULL
- || pctx->operation != EVP_PKEY_OP_SIGNCTX
- || pctx->op.sig.algctx == NULL
- || pctx->op.sig.signature == NULL)
+ || pctx->operation != EVP_PKEY_OP_SIGNCTX
+ || pctx->op.sig.algctx == NULL
+ || pctx->op.sig.signature == NULL)
goto legacy;
signature = pctx->op.sig.signature;
desc = signature->description != NULL ? signature->description : "";
if (signature->digest_sign_update == NULL) {
ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_NOT_SUPPORTED,
- "%s digest_sign_update:%s", signature->type_name, desc);
+ "%s digest_sign_update:%s", signature->type_name, desc);
return 0;
}
@@ -434,11 +432,11 @@ int EVP_DigestSignUpdate(EVP_MD_CTX *ctx, const void *data, size_t dsize)
ret = signature->digest_sign_update(pctx->op.sig.algctx, data, dsize);
if (ret <= 0 && ERR_count_to_mark() == 0)
ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_FAILURE,
- "%s digest_sign_update:%s", signature->type_name, desc);
+ "%s digest_sign_update:%s", signature->type_name, desc);
ERR_clear_last_mark();
return ret;
- legacy:
+legacy:
if (pctx != NULL) {
if (pctx->pmeth == NULL) {
ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
@@ -467,16 +465,16 @@ int EVP_DigestVerifyUpdate(EVP_MD_CTX *ctx, const void *data, size_t dsize)
}
if (pctx == NULL
- || pctx->operation != EVP_PKEY_OP_VERIFYCTX
- || pctx->op.sig.algctx == NULL
- || pctx->op.sig.signature == NULL)
+ || pctx->operation != EVP_PKEY_OP_VERIFYCTX
+ || pctx->op.sig.algctx == NULL
+ || pctx->op.sig.signature == NULL)
goto legacy;
signature = pctx->op.sig.signature;
desc = signature->description != NULL ? signature->description : "";
if (signature->digest_verify_update == NULL) {
ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_NOT_SUPPORTED,
- "%s digest_verify_update:%s", signature->type_name, desc);
+ "%s digest_verify_update:%s", signature->type_name, desc);
return 0;
}
@@ -484,11 +482,11 @@ int EVP_DigestVerifyUpdate(EVP_MD_CTX *ctx, const void *data, size_t dsize)
ret = signature->digest_verify_update(pctx->op.sig.algctx, data, dsize);
if (ret <= 0 && ERR_count_to_mark() == 0)
ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_FAILURE,
- "%s digest_verify_update:%s", signature->type_name, desc);
+ "%s digest_verify_update:%s", signature->type_name, desc);
ERR_clear_last_mark();
return ret;
- legacy:
+legacy:
if (pctx != NULL) {
/* do_sigver_init() checked that |digest_custom| is non-NULL */
if (pctx->flag_call_digest_custom
@@ -501,7 +499,7 @@ int EVP_DigestVerifyUpdate(EVP_MD_CTX *ctx, const void *data, size_t dsize)
}
int EVP_DigestSignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
- size_t *siglen)
+ size_t *siglen)
{
EVP_SIGNATURE *signature;
const char *desc;
@@ -515,16 +513,16 @@ int EVP_DigestSignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
}
if (pctx == NULL
- || pctx->operation != EVP_PKEY_OP_SIGNCTX
- || pctx->op.sig.algctx == NULL
- || pctx->op.sig.signature == NULL)
+ || pctx->operation != EVP_PKEY_OP_SIGNCTX
+ || pctx->op.sig.algctx == NULL
+ || pctx->op.sig.signature == NULL)
goto legacy;
signature = pctx->op.sig.signature;
desc = signature->description != NULL ? signature->description : "";
if (signature->digest_sign_final == NULL) {
ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_NOT_SUPPORTED,
- "%s digest_sign_final:%s", signature->type_name, desc);
+ "%s digest_sign_final:%s", signature->type_name, desc);
return 0;
}
@@ -537,10 +535,10 @@ int EVP_DigestSignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
ERR_set_mark();
r = signature->digest_sign_final(pctx->op.sig.algctx, sigret, siglen,
- sigret == NULL ? 0 : *siglen);
+ sigret == NULL ? 0 : *siglen);
if (!r && ERR_count_to_mark() == 0)
ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_FAILURE,
- "%s digest_sign_final:%s", signature->type_name, desc);
+ "%s digest_sign_final:%s", signature->type_name, desc);
ERR_clear_last_mark();
if (dctx == NULL && sigret != NULL)
ctx->flags |= EVP_MD_CTX_FLAG_FINALISED;
@@ -548,7 +546,7 @@ int EVP_DigestSignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
EVP_PKEY_CTX_free(dctx);
return r;
- legacy:
+legacy:
if (pctx == NULL || pctx->pmeth == NULL) {
ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
return 0;
@@ -599,7 +597,7 @@ int EVP_DigestSignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
}
if (sctx)
r = tmp_ctx->pctx->pmeth->signctx(tmp_ctx->pctx,
- sigret, siglen, tmp_ctx);
+ sigret, siglen, tmp_ctx);
else
r = EVP_DigestFinal_ex(tmp_ctx, md, &mdlen);
EVP_MD_CTX_free(tmp_ctx);
@@ -623,7 +621,7 @@ int EVP_DigestSignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
}
int EVP_DigestSign(EVP_MD_CTX *ctx, unsigned char *sigret, size_t *siglen,
- const unsigned char *tbs, size_t tbslen)
+ const unsigned char *tbs, size_t tbslen)
{
EVP_PKEY_CTX *pctx = ctx->pctx;
int ret;
@@ -639,8 +637,8 @@ int EVP_DigestSign(EVP_MD_CTX *ctx, unsigned char *sigret, size_t *siglen,
}
if (pctx->operation == EVP_PKEY_OP_SIGNCTX
- && pctx->op.sig.algctx != NULL
- && pctx->op.sig.signature != NULL) {
+ && pctx->op.sig.algctx != NULL
+ && pctx->op.sig.signature != NULL) {
EVP_SIGNATURE *signature = pctx->op.sig.signature;
if (signature->digest_sign != NULL) {
@@ -650,10 +648,10 @@ int EVP_DigestSign(EVP_MD_CTX *ctx, unsigned char *sigret, size_t *siglen,
ctx->flags |= EVP_MD_CTX_FLAG_FINALISED;
ERR_set_mark();
ret = signature->digest_sign(pctx->op.sig.algctx, sigret, siglen,
- sigret == NULL ? 0 : *siglen, tbs, tbslen);
+ sigret == NULL ? 0 : *siglen, tbs, tbslen);
if (ret <= 0 && ERR_count_to_mark() == 0)
ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_FAILURE,
- "%s digest_sign:%s", signature->type_name, desc);
+ "%s digest_sign:%s", signature->type_name, desc);
ERR_clear_last_mark();
return ret;
}
@@ -669,7 +667,7 @@ int EVP_DigestSign(EVP_MD_CTX *ctx, unsigned char *sigret, size_t *siglen,
}
int EVP_DigestVerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sig,
- size_t siglen)
+ size_t siglen)
{
EVP_SIGNATURE *signature;
const char *desc;
@@ -685,16 +683,16 @@ int EVP_DigestVerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sig,
}
if (pctx == NULL
- || pctx->operation != EVP_PKEY_OP_VERIFYCTX
- || pctx->op.sig.algctx == NULL
- || pctx->op.sig.signature == NULL)
+ || pctx->operation != EVP_PKEY_OP_VERIFYCTX
+ || pctx->op.sig.algctx == NULL
+ || pctx->op.sig.signature == NULL)
goto legacy;
signature = pctx->op.sig.signature;
desc = signature->description != NULL ? signature->description : "";
if (signature->digest_verify_final == NULL) {
ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_NOT_SUPPORTED,
- "%s digest_verify_final:%s", signature->type_name, desc);
+ "%s digest_verify_final:%s", signature->type_name, desc);
return 0;
}
@@ -709,7 +707,7 @@ int EVP_DigestVerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sig,
r = signature->digest_verify_final(pctx->op.sig.algctx, sig, siglen);
if (!r && ERR_count_to_mark() == 0)
ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_FAILURE,
- "%s digest_verify_final:%s", signature->type_name, desc);
+ "%s digest_verify_final:%s", signature->type_name, desc);
ERR_clear_last_mark();
if (dctx == NULL)
ctx->flags |= EVP_MD_CTX_FLAG_FINALISED;
@@ -717,7 +715,7 @@ int EVP_DigestVerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sig,
EVP_PKEY_CTX_free(dctx);
return r;
- legacy:
+legacy:
if (pctx == NULL || pctx->pmeth == NULL) {
ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
return 0;
@@ -749,7 +747,7 @@ int EVP_DigestVerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sig,
}
if (vctx)
r = tmp_ctx->pctx->pmeth->verifyctx(tmp_ctx->pctx,
- sig, (int)siglen, tmp_ctx);
+ sig, (int)siglen, tmp_ctx);
else
r = EVP_DigestFinal_ex(tmp_ctx, md, &mdlen);
EVP_MD_CTX_free(tmp_ctx);
@@ -760,7 +758,7 @@ int EVP_DigestVerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sig,
}
int EVP_DigestVerify(EVP_MD_CTX *ctx, const unsigned char *sigret,
- size_t siglen, const unsigned char *tbs, size_t tbslen)
+ size_t siglen, const unsigned char *tbs, size_t tbslen)
{
EVP_PKEY_CTX *pctx = ctx->pctx;
@@ -775,8 +773,8 @@ int EVP_DigestVerify(EVP_MD_CTX *ctx, const unsigned char *sigret,
}
if (pctx->operation == EVP_PKEY_OP_VERIFYCTX
- && pctx->op.sig.algctx != NULL
- && pctx->op.sig.signature != NULL) {
+ && pctx->op.sig.algctx != NULL
+ && pctx->op.sig.signature != NULL) {
if (pctx->op.sig.signature->digest_verify != NULL) {
EVP_SIGNATURE *signature = pctx->op.sig.signature;
const char *desc = signature->description != NULL ? signature->description : "";
@@ -787,7 +785,7 @@ int EVP_DigestVerify(EVP_MD_CTX *ctx, const unsigned char *sigret,
ret = signature->digest_verify(pctx->op.sig.algctx, sigret, siglen, tbs, tbslen);
if (ret <= 0 && ERR_count_to_mark() == 0)
ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_FAILURE,
- "%s digest_verify:%s", signature->type_name, desc);
+ "%s digest_verify:%s", signature->type_name, desc);
ERR_clear_last_mark();
return ret;
}
diff --git a/crypto/evp/mac_lib.c b/crypto/evp/mac_lib.c
index 2a7fa12043..404141dc11 100644
--- a/crypto/evp/mac_lib.c
+++ b/crypto/evp/mac_lib.c
@@ -113,7 +113,7 @@ size_t EVP_MAC_CTX_get_block_size(EVP_MAC_CTX *ctx)
}
int EVP_MAC_init(EVP_MAC_CTX *ctx, const unsigned char *key, size_t keylen,
- const OSSL_PARAM params[])
+ const OSSL_PARAM params[])
{
if (ctx->meth->init == NULL) {
ERR_raise(ERR_R_EVP_LIB, ERR_R_UNSUPPORTED);
@@ -139,7 +139,7 @@ int EVP_MAC_update(EVP_MAC_CTX *ctx, const unsigned char *data, size_t datalen)
}
static int evp_mac_final(EVP_MAC_CTX *ctx, int xof,
- unsigned char *out, size_t *outl, size_t outsize)
+ unsigned char *out, size_t *outl, size_t outsize)
{
size_t l;
int res;
@@ -184,7 +184,7 @@ static int evp_mac_final(EVP_MAC_CTX *ctx, int xof,
}
int EVP_MAC_final(EVP_MAC_CTX *ctx,
- unsigned char *out, size_t *outl, size_t outsize)
+ unsigned char *out, size_t *outl, size_t outsize)
{
return evp_mac_final(ctx, 0, out, outl, outsize);
}
@@ -242,8 +242,8 @@ int EVP_MAC_is_a(const EVP_MAC *mac, const char *name)
}
int EVP_MAC_names_do_all(const EVP_MAC *mac,
- void (*fn)(const char *name, void *data),
- void *data)
+ void (*fn)(const char *name, void *data),
+ void *data)
{
if (mac->prov != NULL)
return evp_names_do_all(mac->prov, mac->name_id, fn, data);
@@ -252,11 +252,11 @@ int EVP_MAC_names_do_all(const EVP_MAC *mac,
}
unsigned char *EVP_Q_mac(OSSL_LIB_CTX *libctx,
- const char *name, const char *propq,
- const char *subalg, const OSSL_PARAM *params,
- const void *key, size_t keylen,
- const unsigned char *data, size_t datalen,
- unsigned char *out, size_t outsize, size_t *outlen)
+ const char *name, const char *propq,
+ const char *subalg, const OSSL_PARAM *params,
+ const void *key, size_t keylen,
+ const unsigned char *data, size_t datalen,
+ unsigned char *out, size_t outsize, size_t *outlen)
{
EVP_MAC *mac = EVP_MAC_fetch(libctx, name, propq);
OSSL_PARAM subalg_param[3];
@@ -301,7 +301,7 @@ unsigned char *EVP_Q_mac(OSSL_LIB_CTX *libctx,
*/
if (propq != NULL)
*p++ = OSSL_PARAM_construct_utf8_string(OSSL_ALG_PARAM_PROPERTIES,
- (char *)propq, 0);
+ (char *)propq, 0);
*p = OSSL_PARAM_construct_end();
@@ -309,11 +309,11 @@ unsigned char *EVP_Q_mac(OSSL_LIB_CTX *libctx,
if (key == NULL && keylen == 0)
key = data;
if ((ctx = EVP_MAC_CTX_new(mac)) != NULL
- && EVP_MAC_CTX_set_params(ctx, subalg_param)
- && EVP_MAC_CTX_set_params(ctx, params)
- && EVP_MAC_init(ctx, key, keylen, params)
- && EVP_MAC_update(ctx, data, datalen)
- && EVP_MAC_final(ctx, out, &len, outsize)) {
+ && EVP_MAC_CTX_set_params(ctx, subalg_param)
+ && EVP_MAC_CTX_set_params(ctx, params)
+ && EVP_MAC_init(ctx, key, keylen, params)
+ && EVP_MAC_update(ctx, data, datalen)
+ && EVP_MAC_final(ctx, out, &len, outsize)) {
if (out == NULL) {
out = OPENSSL_malloc(len);
if (out != NULL && !EVP_MAC_final(ctx, out, NULL, len)) {
@@ -326,7 +326,7 @@ unsigned char *EVP_Q_mac(OSSL_LIB_CTX *libctx,
*outlen = len;
}
- err:
+err:
EVP_MAC_CTX_free(ctx);
EVP_MAC_free(mac);
return res;
diff --git a/crypto/evp/mac_meth.c b/crypto/evp/mac_meth.c
index 3c7a1365fd..ee29f58b3e 100644
--- a/crypto/evp/mac_meth.c
+++ b/crypto/evp/mac_meth.c
@@ -55,8 +55,8 @@ static void *evp_mac_new(void)
}
static void *evp_mac_from_algorithm(int name_id,
- const OSSL_ALGORITHM *algodef,
- OSSL_PROVIDER *prov)
+ const OSSL_ALGORITHM *algodef,
+ OSSL_PROVIDER *prov)
{
const OSSL_DISPATCH *fns = algodef->implementation;
EVP_MAC *mac = NULL;
@@ -113,20 +113,17 @@ static void *evp_mac_from_algorithm(int name_id,
case OSSL_FUNC_MAC_GETTABLE_PARAMS:
if (mac->gettable_params != NULL)
break;
- mac->gettable_params =
- OSSL_FUNC_mac_gettable_params(fns);
+ mac->gettable_params = OSSL_FUNC_mac_gettable_params(fns);
break;
case OSSL_FUNC_MAC_GETTABLE_CTX_PARAMS:
if (mac->gettable_ctx_params != NULL)
break;
- mac->gettable_ctx_params =
- OSSL_FUNC_mac_gettable_ctx_params(fns);
+ mac->gettable_ctx_params = OSSL_FUNC_mac_gettable_ctx_params(fns);
break;
case OSSL_FUNC_MAC_SETTABLE_CTX_PARAMS:
if (mac->settable_ctx_params != NULL)
break;
- mac->settable_ctx_params =
- OSSL_FUNC_mac_settable_ctx_params(fns);
+ mac->settable_ctx_params = OSSL_FUNC_mac_settable_ctx_params(fns);
break;
case OSSL_FUNC_MAC_GET_PARAMS:
if (mac->get_params != NULL)
@@ -176,11 +173,11 @@ err:
}
EVP_MAC *EVP_MAC_fetch(OSSL_LIB_CTX *libctx, const char *algorithm,
- const char *properties)
+ const char *properties)
{
return evp_generic_fetch(libctx, OSSL_OP_MAC, algorithm, properties,
- evp_mac_from_algorithm, evp_mac_up_ref,
- evp_mac_free);
+ evp_mac_from_algorithm, evp_mac_up_ref,
+ evp_mac_free);
}
int EVP_MAC_up_ref(EVP_MAC *mac)
@@ -246,21 +243,21 @@ const OSSL_PARAM *EVP_MAC_CTX_settable_params(EVP_MAC_CTX *ctx)
}
void EVP_MAC_do_all_provided(OSSL_LIB_CTX *libctx,
- void (*fn)(EVP_MAC *mac, void *arg),
- void *arg)
+ void (*fn)(EVP_MAC *mac, void *arg),
+ void *arg)
{
evp_generic_do_all(libctx, OSSL_OP_MAC,
- (void (*)(void *, void *))fn, arg,
- evp_mac_from_algorithm, evp_mac_up_ref, evp_mac_free);
+ (void (*)(void *, void *))fn, arg,
+ evp_mac_from_algorithm, evp_mac_up_ref, evp_mac_free);
}
EVP_MAC *evp_mac_fetch_from_prov(OSSL_PROVIDER *prov,
- const char *algorithm,
- const char *properties)
+ const char *algorithm,
+ const char *properties)
{
return evp_generic_fetch_from_prov(prov, OSSL_OP_MAC,
- algorithm, properties,
- evp_mac_from_algorithm,
- evp_mac_up_ref,
- evp_mac_free);
+ algorithm, properties,
+ evp_mac_from_algorithm,
+ evp_mac_up_ref,
+ evp_mac_free);
}
diff --git a/crypto/evp/names.c b/crypto/evp/names.c
index 7ff850f997..0129732542 100644
--- a/crypto/evp/names.c
+++ b/crypto/evp/names.c
@@ -24,11 +24,11 @@ int EVP_add_cipher(const EVP_CIPHER *c)
return 0;
r = OBJ_NAME_add(OBJ_nid2sn(c->nid), OBJ_NAME_TYPE_CIPHER_METH,
- (const char *)c);
+ (const char *)c);
if (r == 0)
return 0;
r = OBJ_NAME_add(OBJ_nid2ln(c->nid), OBJ_NAME_TYPE_CIPHER_METH,
- (const char *)c);
+ (const char *)c);
return r;
}
@@ -42,17 +42,17 @@ int EVP_add_digest(const EVP_MD *md)
if (r == 0)
return 0;
r = OBJ_NAME_add(OBJ_nid2ln(md->type), OBJ_NAME_TYPE_MD_METH,
- (const char *)md);
+ (const char *)md);
if (r == 0)
return 0;
if (md->pkey_type && md->type != md->pkey_type) {
r = OBJ_NAME_add(OBJ_nid2sn(md->pkey_type),
- OBJ_NAME_TYPE_MD_METH | OBJ_NAME_ALIAS, name);
+ OBJ_NAME_TYPE_MD_METH | OBJ_NAME_ALIAS, name);
if (r == 0)
return 0;
r = OBJ_NAME_add(OBJ_nid2ln(md->pkey_type),
- OBJ_NAME_TYPE_MD_METH | OBJ_NAME_ALIAS, name);
+ OBJ_NAME_TYPE_MD_METH | OBJ_NAME_ALIAS, name);
}
return r;
}
@@ -73,7 +73,7 @@ const EVP_CIPHER *EVP_get_cipherbyname(const char *name)
}
const EVP_CIPHER *evp_get_cipherbyname_ex(OSSL_LIB_CTX *libctx,
- const char *name)
+ const char *name)
{
const EVP_CIPHER *cp;
OSSL_NAMEMAP *namemap;
@@ -95,7 +95,7 @@ const EVP_CIPHER *evp_get_cipherbyname_ex(OSSL_LIB_CTX *libctx,
*/
namemap = ossl_namemap_stored(libctx);
- retry:
+retry:
id = ossl_namemap_name2num(namemap, name);
if (id == 0) {
EVP_CIPHER *fetched_cipher;
@@ -154,7 +154,7 @@ const EVP_MD *evp_get_digestbyname_ex(OSSL_LIB_CTX *libctx, const char *name)
*/
namemap = ossl_namemap_stored(libctx);
- retry:
+retry:
id = ossl_namemap_name2num(namemap, name);
if (id == 0) {
EVP_MD *fetched_md;
@@ -196,8 +196,8 @@ void evp_cleanup_int(void)
struct doall_cipher {
void *arg;
- void (*fn) (const EVP_CIPHER *ciph,
- const char *from, const char *to, void *arg);
+ void (*fn)(const EVP_CIPHER *ciph,
+ const char *from, const char *to, void *arg);
};
static void do_all_cipher_fn(const OBJ_NAME *nm, void *arg)
@@ -209,9 +209,9 @@ static void do_all_cipher_fn(const OBJ_NAME *nm, void *arg)
dc->fn((const EVP_CIPHER *)nm->data, nm->name, NULL, dc->arg);
}
-void EVP_CIPHER_do_all(void (*fn) (const EVP_CIPHER *ciph,
- const char *from, const char *to, void *x),
- void *arg)
+void EVP_CIPHER_do_all(void (*fn)(const EVP_CIPHER *ciph,
+ const char *from, const char *to, void *x),
+ void *arg)
{
struct doall_cipher dc;
@@ -223,9 +223,10 @@ void EVP_CIPHER_do_all(void (*fn) (const EVP_CIPHER *ciph,
OBJ_NAME_do_all(OBJ_NAME_TYPE_CIPHER_METH, do_all_cipher_fn, &dc);
}
-void EVP_CIPHER_do_all_sorted(void (*fn) (const EVP_CIPHER *ciph,
- const char *from, const char *to,
- void *x), void *arg)
+void EVP_CIPHER_do_all_sorted(void (*fn)(const EVP_CIPHER *ciph,
+ const char *from, const char *to,
+ void *x),
+ void *arg)
{
struct doall_cipher dc;
@@ -239,8 +240,8 @@ void EVP_CIPHER_do_all_sorted(void (*fn) (const EVP_CIPHER *ciph,
struct doall_md {
void *arg;
- void (*fn) (const EVP_MD *ciph,
- const char *from, const char *to, void *arg);
+ void (*fn)(const EVP_MD *ciph,
+ const char *from, const char *to, void *arg);
};
static void do_all_md_fn(const OBJ_NAME *nm, void *arg)
@@ -252,9 +253,9 @@ static void do_all_md_fn(const OBJ_NAME *nm, void *arg)
dc->fn((const EVP_MD *)nm->data, nm->name, NULL, dc->arg);
}
-void EVP_MD_do_all(void (*fn) (const EVP_MD *md,
- const char *from, const char *to, void *x),
- void *arg)
+void EVP_MD_do_all(void (*fn)(const EVP_MD *md,
+ const char *from, const char *to, void *x),
+ void *arg)
{
struct doall_md dc;
@@ -266,9 +267,10 @@ void EVP_MD_do_all(void (*fn) (const EVP_MD *md,
OBJ_NAME_do_all(OBJ_NAME_TYPE_MD_METH, do_all_md_fn, &dc);
}
-void EVP_MD_do_all_sorted(void (*fn) (const EVP_MD *md,
- const char *from, const char *to,
- void *x), void *arg)
+void EVP_MD_do_all_sorted(void (*fn)(const EVP_MD *md,
+ const char *from, const char *to,
+ void *x),
+ void *arg)
{
struct doall_md dc;
diff --git a/crypto/evp/p5_crpt.c b/crypto/evp/p5_crpt.c
index b7705bf7af..570544c798 100644
--- a/crypto/evp/p5_crpt.c
+++ b/crypto/evp/p5_crpt.c
@@ -24,9 +24,9 @@ void PKCS5_PBE_add(void)
}
int PKCS5_PBE_keyivgen_ex(EVP_CIPHER_CTX *cctx, const char *pass, int passlen,
- ASN1_TYPE *param, const EVP_CIPHER *cipher,
- const EVP_MD *md, int en_de, OSSL_LIB_CTX *libctx,
- const char *propq)
+ ASN1_TYPE *param, const EVP_CIPHER *cipher,
+ const EVP_MD *md, int en_de, OSSL_LIB_CTX *libctx,
+ const char *propq)
{
unsigned char md_tmp[EVP_MAX_MD_SIZE];
unsigned char key[EVP_MAX_KEY_LENGTH], iv[EVP_MAX_IV_LENGTH];
@@ -42,8 +42,7 @@ int PKCS5_PBE_keyivgen_ex(EVP_CIPHER_CTX *cctx, const char *pass, int passlen,
const char *mdname = EVP_MD_name(md);
/* Extract useful info from parameter */
- if (param == NULL || param->type != V_ASN1_SEQUENCE ||
- param->value.sequence == NULL) {
+ if (param == NULL || param->type != V_ASN1_SEQUENCE || param->value.sequence == NULL) {
ERR_raise(ERR_LIB_EVP, EVP_R_DECODE_ERROR);
return 0;
}
@@ -87,12 +86,12 @@ int PKCS5_PBE_keyivgen_ex(EVP_CIPHER_CTX *cctx, const char *pass, int passlen,
if (kctx == NULL)
goto err;
*p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_PASSWORD,
- (char *)pass, (size_t)passlen);
+ (char *)pass, (size_t)passlen);
*p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SALT,
- salt, saltlen);
+ salt, saltlen);
*p++ = OSSL_PARAM_construct_int(OSSL_KDF_PARAM_ITER, &iter);
*p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST,
- (char *)mdname, 0);
+ (char *)mdname, 0);
*p = OSSL_PARAM_construct_end();
if (EVP_KDF_derive(kctx, md_tmp, mdsize, params) != 1)
goto err;
@@ -104,17 +103,16 @@ int PKCS5_PBE_keyivgen_ex(EVP_CIPHER_CTX *cctx, const char *pass, int passlen,
OPENSSL_cleanse(key, EVP_MAX_KEY_LENGTH);
OPENSSL_cleanse(iv, EVP_MAX_IV_LENGTH);
rv = 1;
- err:
+err:
EVP_KDF_CTX_free(kctx);
PBEPARAM_free(pbe);
return rv;
}
int PKCS5_PBE_keyivgen(EVP_CIPHER_CTX *cctx, const char *pass, int passlen,
- ASN1_TYPE *param, const EVP_CIPHER *cipher,
- const EVP_MD *md, int en_de)
+ ASN1_TYPE *param, const EVP_CIPHER *cipher,
+ const EVP_MD *md, int en_de)
{
return PKCS5_PBE_keyivgen_ex(cctx, pass, passlen, param, cipher, md, en_de,
- NULL, NULL);
+ NULL, NULL);
}
-
diff --git a/crypto/evp/p5_crpt2.c b/crypto/evp/p5_crpt2.c
index 348c56098f..c944496339 100644
--- a/crypto/evp/p5_crpt2.c
+++ b/crypto/evp/p5_crpt2.c
@@ -20,9 +20,9 @@
#include "evp_local.h"
int ossl_pkcs5_pbkdf2_hmac_ex(const char *pass, int passlen,
- const unsigned char *salt, int saltlen, int iter,
- const EVP_MD *digest, int keylen, unsigned char *out,
- OSSL_LIB_CTX *libctx, const char *propq)
+ const unsigned char *salt, int saltlen, int iter,
+ const EVP_MD *digest, int keylen, unsigned char *out,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
const char *empty = "";
int rv = 1, mode = 1;
@@ -43,62 +43,63 @@ int ossl_pkcs5_pbkdf2_hmac_ex(const char *pass, int passlen,
kdf = EVP_KDF_fetch(libctx, OSSL_KDF_NAME_PBKDF2, propq);
if (kdf == NULL)
- return 0;
+ return 0;
kctx = EVP_KDF_CTX_new(kdf);
EVP_KDF_free(kdf);
if (kctx == NULL)
return 0;
*p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_PASSWORD,
- (char *)pass, (size_t)passlen);
+ (char *)pass, (size_t)passlen);
*p++ = OSSL_PARAM_construct_int(OSSL_KDF_PARAM_PKCS5, &mode);
*p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SALT,
- (unsigned char *)salt, saltlen);
+ (unsigned char *)salt, saltlen);
*p++ = OSSL_PARAM_construct_int(OSSL_KDF_PARAM_ITER, &iter);
*p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST,
- (char *)mdname, 0);
+ (char *)mdname, 0);
*p = OSSL_PARAM_construct_end();
if (EVP_KDF_derive(kctx, out, keylen, params) != 1)
rv = 0;
EVP_KDF_CTX_free(kctx);
- OSSL_TRACE_BEGIN(PKCS5V2) {
+ OSSL_TRACE_BEGIN(PKCS5V2)
+ {
BIO_printf(trc_out, "Password:\n");
BIO_hex_string(trc_out,
- 0, passlen, pass, passlen);
+ 0, passlen, pass, passlen);
BIO_printf(trc_out, "\n");
BIO_printf(trc_out, "Salt:\n");
BIO_hex_string(trc_out,
- 0, saltlen, salt, saltlen);
+ 0, saltlen, salt, saltlen);
BIO_printf(trc_out, "\n");
BIO_printf(trc_out, "Iteration count %d\n", iter);
BIO_printf(trc_out, "Key:\n");
BIO_hex_string(trc_out,
- 0, keylen, out, keylen);
+ 0, keylen, out, keylen);
BIO_printf(trc_out, "\n");
- } OSSL_TRACE_END(PKCS5V2);
+ }
+ OSSL_TRACE_END(PKCS5V2);
return rv;
}
int PKCS5_PBKDF2_HMAC(const char *pass, int passlen, const unsigned char *salt,
- int saltlen, int iter, const EVP_MD *digest, int keylen,
- unsigned char *out)
+ int saltlen, int iter, const EVP_MD *digest, int keylen,
+ unsigned char *out)
{
return ossl_pkcs5_pbkdf2_hmac_ex(pass, passlen, salt, saltlen, iter, digest,
- keylen, out, NULL, NULL);
+ keylen, out, NULL, NULL);
}
-
int PKCS5_PBKDF2_HMAC_SHA1(const char *pass, int passlen,
- const unsigned char *salt, int saltlen, int iter,
- int keylen, unsigned char *out)
+ const unsigned char *salt, int saltlen, int iter,
+ int keylen, unsigned char *out)
{
EVP_MD *digest;
int r = 0;
if ((digest = EVP_MD_fetch(NULL, SN_sha1, NULL)) != NULL)
r = ossl_pkcs5_pbkdf2_hmac_ex(pass, passlen, salt, saltlen, iter,
- digest, keylen, out, NULL, NULL);
+ digest, keylen, out, NULL, NULL);
EVP_MD_free(digest);
return r;
}
@@ -110,9 +111,9 @@ int PKCS5_PBKDF2_HMAC_SHA1(const char *pass, int passlen,
*/
int PKCS5_v2_PBE_keyivgen_ex(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
- ASN1_TYPE *param, const EVP_CIPHER *c,
- const EVP_MD *md, int en_de,
- OSSL_LIB_CTX *libctx, const char *propq)
+ ASN1_TYPE *param, const EVP_CIPHER *c,
+ const EVP_MD *md, int en_de,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
PBE2PARAM *pbe2 = NULL;
char ciph_name[80];
@@ -130,7 +131,7 @@ int PKCS5_v2_PBE_keyivgen_ex(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
/* See if we recognise the key derivation function */
if (!EVP_PBE_find_ex(EVP_PBE_TYPE_KDF, OBJ_obj2nid(pbe2->keyfunc->algorithm),
- NULL, NULL, NULL, &kdf)) {
+ NULL, NULL, NULL, &kdf)) {
ERR_raise(ERR_LIB_EVP, EVP_R_UNSUPPORTED_KEY_DERIVATION_FUNCTION);
goto err;
}
@@ -164,23 +165,23 @@ int PKCS5_v2_PBE_keyivgen_ex(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
goto err;
}
rv = kdf(ctx, pass, passlen, pbe2->keyfunc->parameter, NULL, NULL, en_de, libctx, propq);
- err:
+err:
EVP_CIPHER_free(cipher_fetch);
PBE2PARAM_free(pbe2);
return rv;
}
int PKCS5_v2_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
- ASN1_TYPE *param, const EVP_CIPHER *c,
- const EVP_MD *md, int en_de)
+ ASN1_TYPE *param, const EVP_CIPHER *c,
+ const EVP_MD *md, int en_de)
{
return PKCS5_v2_PBE_keyivgen_ex(ctx, pass, passlen, param, c, md, en_de, NULL, NULL);
}
int PKCS5_v2_PBKDF2_keyivgen_ex(EVP_CIPHER_CTX *ctx, const char *pass,
- int passlen, ASN1_TYPE *param,
- const EVP_CIPHER *c, const EVP_MD *md, int en_de,
- OSSL_LIB_CTX *libctx, const char *propq)
+ int passlen, ASN1_TYPE *param,
+ const EVP_CIPHER *c, const EVP_MD *md, int en_de,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
unsigned char *salt, key[EVP_MAX_KEY_LENGTH];
int saltlen, iter, t;
@@ -252,10 +253,10 @@ int PKCS5_v2_PBKDF2_keyivgen_ex(EVP_CIPHER_CTX *ctx, const char *pass,
saltlen = kdf->salt->value.octet_string->length;
iter = ASN1_INTEGER_get(kdf->iter);
if (!ossl_pkcs5_pbkdf2_hmac_ex(pass, passlen, salt, saltlen, iter, prfmd,
- keylen, key, libctx, propq))
+ keylen, key, libctx, propq))
goto err;
rv = EVP_CipherInit_ex(ctx, NULL, NULL, key, NULL, en_de);
- err:
+err:
OPENSSL_cleanse(key, keylen);
PBKDF2PARAM_free(kdf);
EVP_MD_free(prfmd_fetch);
@@ -263,9 +264,9 @@ int PKCS5_v2_PBKDF2_keyivgen_ex(EVP_CIPHER_CTX *ctx, const char *pass,
}
int PKCS5_v2_PBKDF2_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass,
- int passlen, ASN1_TYPE *param,
- const EVP_CIPHER *c, const EVP_MD *md, int en_de)
+ int passlen, ASN1_TYPE *param,
+ const EVP_CIPHER *c, const EVP_MD *md, int en_de)
{
return PKCS5_v2_PBKDF2_keyivgen_ex(ctx, pass, passlen, param, c, md, en_de,
- NULL, NULL);
+ NULL, NULL);
}
diff --git a/crypto/evp/p_dec.c b/crypto/evp/p_dec.c
index 29ea3f5fbc..ef53f3ada6 100644
--- a/crypto/evp/p_dec.c
+++ b/crypto/evp/p_dec.c
@@ -19,7 +19,7 @@
#include "crypto/evp.h"
int EVP_PKEY_decrypt_old(unsigned char *key, const unsigned char *ek, int ekl,
- EVP_PKEY *priv)
+ EVP_PKEY *priv)
{
int ret = -1;
RSA *rsa = NULL;
@@ -33,8 +33,7 @@ int EVP_PKEY_decrypt_old(unsigned char *key, const unsigned char *ek, int ekl,
if (rsa == NULL)
goto err;
- ret =
- RSA_private_decrypt(ekl, ek, key, rsa, RSA_PKCS1_PADDING);
- err:
+ ret = RSA_private_decrypt(ekl, ek, key, rsa, RSA_PKCS1_PADDING);
+err:
return ret;
}
diff --git a/crypto/evp/p_enc.c b/crypto/evp/p_enc.c
index 64e6751456..a843b8f4e9 100644
--- a/crypto/evp/p_enc.c
+++ b/crypto/evp/p_enc.c
@@ -19,7 +19,7 @@
#include "crypto/evp.h"
int EVP_PKEY_encrypt_old(unsigned char *ek, const unsigned char *key,
- int key_len, EVP_PKEY *pubk)
+ int key_len, EVP_PKEY *pubk)
{
int ret = 0;
RSA *rsa = NULL;
@@ -33,8 +33,7 @@ int EVP_PKEY_encrypt_old(unsigned char *ek, const unsigned char *key,
if (rsa == NULL)
goto err;
- ret =
- RSA_public_encrypt(key_len, key, ek, rsa, RSA_PKCS1_PADDING);
- err:
+ ret = RSA_public_encrypt(key_len, key, ek, rsa, RSA_PKCS1_PADDING);
+err:
return ret;
}
diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c
index c76e6c5ac3..df4ca9bce1 100644
--- a/crypto/evp/p_lib.c
+++ b/crypto/evp/p_lib.c
@@ -32,7 +32,7 @@
#include <openssl/encoder.h>
#include <openssl/core_names.h>
-#include "internal/numbers.h" /* includes SIZE_MAX */
+#include "internal/numbers.h" /* includes SIZE_MAX */
#include "internal/ffc.h"
#include "crypto/evp.h"
#include "crypto/dh.h"
@@ -41,19 +41,19 @@
#include "crypto/ecx.h"
#include "crypto/rsa.h"
#ifndef FIPS_MODULE
-# include "crypto/asn1.h"
-# include "crypto/x509.h"
+#include "crypto/asn1.h"
+#include "crypto/x509.h"
#endif
#include "internal/provider.h"
#include "internal/common.h"
#include "evp_local.h"
static int pkey_set_type(EVP_PKEY *pkey, int type, const char *str,
- int len, EVP_KEYMGMT *keymgmt);
+ int len, EVP_KEYMGMT *keymgmt);
static void evp_pkey_free_it(EVP_PKEY *key);
/* The type of parameters selected in key parameter functions */
-# define SELECT_PARAMETERS OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS
+#define SELECT_PARAMETERS OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS
#ifndef FIPS_MODULE
int EVP_PKEY_get_bits(const EVP_PKEY *pkey)
@@ -95,7 +95,7 @@ int EVP_PKEY_get_security_category(const EVP_PKEY *pkey)
int EVP_PKEY_save_parameters(EVP_PKEY *pkey, int mode)
{
-# ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DSA
if (pkey->type == EVP_PKEY_DSA) {
int ret = pkey->save_parameters;
@@ -103,8 +103,8 @@ int EVP_PKEY_save_parameters(EVP_PKEY *pkey, int mode)
pkey->save_parameters = mode;
return ret;
}
-# endif
-# ifndef OPENSSL_NO_EC
+#endif
+#ifndef OPENSSL_NO_EC
if (pkey->type == EVP_PKEY_EC) {
int ret = pkey->save_parameters;
@@ -112,7 +112,7 @@ int EVP_PKEY_save_parameters(EVP_PKEY *pkey, int mode)
pkey->save_parameters = mode;
return ret;
}
-# endif
+#endif
return 0;
}
@@ -125,7 +125,7 @@ void *EVP_PKEY_get_ex_data(const EVP_PKEY *key, int idx)
{
return CRYPTO_get_ex_data(&key->ex_data, idx);
}
-#endif /* !FIPS_MODULE */
+#endif /* !FIPS_MODULE */
int EVP_PKEY_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from)
{
@@ -146,7 +146,7 @@ int EVP_PKEY_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from)
goto end;
from = downgraded_from;
}
-#endif /* !FIPS_MODULE */
+#endif /* !FIPS_MODULE */
/*
* Make sure |to| is typed. Content is less important at this early
@@ -166,7 +166,7 @@ int EVP_PKEY_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from)
if (EVP_PKEY_set_type(to, from->type) == 0)
goto end;
} else
-#endif /* !FIPS_MODULE */
+#endif /* !FIPS_MODULE */
{
if (EVP_PKEY_set_type_by_keymgmt(to, from->keymgmt) == 0)
goto end;
@@ -179,7 +179,7 @@ int EVP_PKEY_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from)
goto end;
}
}
-#endif /* !FIPS_MODULE */
+#endif /* !FIPS_MODULE */
if (EVP_PKEY_missing_parameters(from)) {
ERR_raise(ERR_LIB_EVP, EVP_R_MISSING_PARAMETERS);
@@ -210,9 +210,8 @@ int EVP_PKEY_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from)
*/
if (to->keymgmt != NULL && to->keydata == NULL) {
EVP_KEYMGMT *to_keymgmt = to->keymgmt;
- void *from_keydata =
- evp_pkey_export_to_provider((EVP_PKEY *)from, NULL, &to_keymgmt,
- NULL);
+ void *from_keydata = evp_pkey_export_to_provider((EVP_PKEY *)from, NULL, &to_keymgmt,
+ NULL);
/*
* If we get a NULL, it could be an internal error, or it could be
@@ -222,16 +221,17 @@ int EVP_PKEY_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from)
ERR_raise(ERR_LIB_EVP, EVP_R_DIFFERENT_KEY_TYPES);
else
ok = (to->keydata = evp_keymgmt_dup(to->keymgmt,
- from_keydata,
- SELECT_PARAMETERS)) != NULL;
+ from_keydata,
+ SELECT_PARAMETERS))
+ != NULL;
goto end;
}
/* Both keys are legacy */
if (from->ameth != NULL && from->ameth->param_copy != NULL)
ok = from->ameth->param_copy(to, from);
-#endif /* !FIPS_MODULE */
- end:
+#endif /* !FIPS_MODULE */
+end:
EVP_PKEY_free(downgraded_from);
return ok;
}
@@ -246,7 +246,7 @@ int EVP_PKEY_missing_parameters(const EVP_PKEY *pkey)
return !evp_keymgmt_util_has((EVP_PKEY *)pkey, SELECT_PARAMETERS);
if (pkey->ameth != NULL && pkey->ameth->param_missing != NULL)
return pkey->ameth->param_missing(pkey);
-#endif /* FIPS_MODULE */
+#endif /* FIPS_MODULE */
}
return 0;
}
@@ -257,7 +257,7 @@ int EVP_PKEY_missing_parameters(const EVP_PKEY *pkey)
* a call to evp_keymgmt_util_match().
*/
static int evp_pkey_cmp_any(const EVP_PKEY *a, const EVP_PKEY *b,
- int selection)
+ int selection)
{
#ifdef FIPS_MODULE
return evp_keymgmt_util_match((EVP_PKEY *)a, (EVP_PKEY *)b, selection);
@@ -279,10 +279,10 @@ static int evp_pkey_cmp_any(const EVP_PKEY *a, const EVP_PKEY *b,
*/
if (evp_pkey_is_legacy(a)
&& !EVP_KEYMGMT_is_a(b->keymgmt, OBJ_nid2sn(a->type)))
- return -1; /* not the same key type */
+ return -1; /* not the same key type */
if (evp_pkey_is_legacy(b)
&& !EVP_KEYMGMT_is_a(a->keymgmt, OBJ_nid2sn(b->type)))
- return -1; /* not the same key type */
+ return -1; /* not the same key type */
/*
* We've determined that they both are the same keytype, so the next
@@ -295,16 +295,14 @@ static int evp_pkey_cmp_any(const EVP_PKEY *a, const EVP_PKEY *b,
keydata2 = b->keydata;
if (keymgmt2 != NULL && keymgmt2->match != NULL) {
- tmp_keydata =
- evp_pkey_export_to_provider((EVP_PKEY *)a, NULL, &keymgmt2, NULL);
+ tmp_keydata = evp_pkey_export_to_provider((EVP_PKEY *)a, NULL, &keymgmt2, NULL);
if (tmp_keydata != NULL) {
keymgmt1 = keymgmt2;
keydata1 = tmp_keydata;
}
}
if (tmp_keydata == NULL && keymgmt1 != NULL && keymgmt1->match != NULL) {
- tmp_keydata =
- evp_pkey_export_to_provider((EVP_PKEY *)b, NULL, &keymgmt1, NULL);
+ tmp_keydata = evp_pkey_export_to_provider((EVP_PKEY *)b, NULL, &keymgmt1, NULL);
if (tmp_keydata != NULL) {
keymgmt2 = keymgmt1;
keydata2 = tmp_keydata;
@@ -320,17 +318,17 @@ static int evp_pkey_cmp_any(const EVP_PKEY *a, const EVP_PKEY *b,
return -2;
return evp_keymgmt_match(keymgmt1, keydata1, keydata2, selection);
-#endif /* FIPS_MODULE */
+#endif /* FIPS_MODULE */
}
#ifndef FIPS_MODULE
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
int EVP_PKEY_cmp_parameters(const EVP_PKEY *a, const EVP_PKEY *b)
{
return EVP_PKEY_parameters_eq(a, b);
}
-# endif
-#endif /* FIPS_MODULE */
+#endif
+#endif /* FIPS_MODULE */
int EVP_PKEY_parameters_eq(const EVP_PKEY *a, const EVP_PKEY *b)
{
@@ -351,17 +349,17 @@ int EVP_PKEY_parameters_eq(const EVP_PKEY *a, const EVP_PKEY *b)
if (a->ameth != NULL && a->ameth->param_cmp != NULL)
return a->ameth->param_cmp(a, b);
return -2;
-#endif /* !FIPS_MODULE */
+#endif /* !FIPS_MODULE */
}
#ifndef FIPS_MODULE
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
int EVP_PKEY_cmp(const EVP_PKEY *a, const EVP_PKEY *b)
{
return EVP_PKEY_eq(a, b);
}
-# endif
-#endif /* !FIPS_MODULE */
+#endif
+#endif /* !FIPS_MODULE */
int EVP_PKEY_eq(const EVP_PKEY *a, const EVP_PKEY *b)
{
@@ -378,7 +376,7 @@ int EVP_PKEY_eq(const EVP_PKEY *a, const EVP_PKEY *b)
#ifndef FIPS_MODULE
if (a->keymgmt != NULL || b->keymgmt != NULL)
-#endif /* !FIPS_MODULE */
+#endif /* !FIPS_MODULE */
{
int selection = SELECT_PARAMETERS;
@@ -409,26 +407,26 @@ int EVP_PKEY_eq(const EVP_PKEY *a, const EVP_PKEY *b)
}
return -2;
-#endif /* !FIPS_MODULE */
+#endif /* !FIPS_MODULE */
}
#ifndef FIPS_MODULE
static EVP_PKEY *new_raw_key_int(OSSL_LIB_CTX *libctx,
- const char *strtype,
- const char *propq,
- int nidtype,
- const unsigned char *key,
- size_t len,
- int key_is_priv)
+ const char *strtype,
+ const char *propq,
+ int nidtype,
+ const unsigned char *key,
+ size_t len,
+ int key_is_priv)
{
EVP_PKEY *pkey = NULL;
EVP_PKEY_CTX *ctx = NULL;
int result = 0;
ctx = EVP_PKEY_CTX_new_from_name(libctx,
- strtype != NULL ? strtype
- : OBJ_nid2sn(nidtype),
- propq);
+ strtype != NULL ? strtype
+ : OBJ_nid2sn(nidtype),
+ propq);
if (ctx == NULL)
goto err;
/* May fail if no provider available */
@@ -438,9 +436,9 @@ static EVP_PKEY *new_raw_key_int(OSSL_LIB_CTX *libctx,
ERR_clear_last_mark();
params[0] = OSSL_PARAM_construct_octet_string(
- key_is_priv ? OSSL_PKEY_PARAM_PRIV_KEY
- : OSSL_PKEY_PARAM_PUB_KEY,
- (void *)key, len);
+ key_is_priv ? OSSL_PKEY_PARAM_PRIV_KEY
+ : OSSL_PKEY_PARAM_PUB_KEY,
+ (void *)key, len);
if (EVP_PKEY_fromdata(ctx, &pkey, EVP_PKEY_KEYPAIR, params) != 1) {
ERR_raise(ERR_LIB_EVP, EVP_R_KEY_SETUP_FAILED);
@@ -493,7 +491,7 @@ static EVP_PKEY *new_raw_key_int(OSSL_LIB_CTX *libctx,
}
result = 1;
- err:
+err:
if (!result) {
EVP_PKEY_free(pkey);
pkey = NULL;
@@ -503,17 +501,17 @@ static EVP_PKEY *new_raw_key_int(OSSL_LIB_CTX *libctx,
}
EVP_PKEY *EVP_PKEY_new_raw_private_key_ex(OSSL_LIB_CTX *libctx,
- const char *keytype,
- const char *propq,
- const unsigned char *priv, size_t len)
+ const char *keytype,
+ const char *propq,
+ const unsigned char *priv, size_t len)
{
return new_raw_key_int(libctx, keytype, propq, EVP_PKEY_NONE, priv,
- len, 1);
+ len, 1);
}
EVP_PKEY *EVP_PKEY_new_raw_private_key(int type, ENGINE *e,
- const unsigned char *priv,
- size_t len)
+ const unsigned char *priv,
+ size_t len)
{
if (!ossl_assert(e == NULL))
return NULL;
@@ -521,16 +519,16 @@ EVP_PKEY *EVP_PKEY_new_raw_private_key(int type, ENGINE *e,
}
EVP_PKEY *EVP_PKEY_new_raw_public_key_ex(OSSL_LIB_CTX *libctx,
- const char *keytype, const char *propq,
- const unsigned char *pub, size_t len)
+ const char *keytype, const char *propq,
+ const unsigned char *pub, size_t len)
{
return new_raw_key_int(libctx, keytype, propq, EVP_PKEY_NONE, pub,
- len, 0);
+ len, 0);
}
EVP_PKEY *EVP_PKEY_new_raw_public_key(int type, ENGINE *e,
- const unsigned char *pub,
- size_t len)
+ const unsigned char *pub,
+ size_t len)
{
if (!ossl_assert(e == NULL))
return NULL;
@@ -551,23 +549,23 @@ static int get_raw_key_details(const OSSL_PARAM params[], void *arg)
if (raw_key->selection == OSSL_KEYMGMT_SELECT_PRIVATE_KEY) {
if ((p = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_PRIV_KEY))
- != NULL)
+ != NULL)
return OSSL_PARAM_get_octet_string(p, (void **)raw_key->key,
- raw_key->key == NULL ? 0 : *raw_key->len,
- raw_key->len);
+ raw_key->key == NULL ? 0 : *raw_key->len,
+ raw_key->len);
} else if (raw_key->selection == OSSL_KEYMGMT_SELECT_PUBLIC_KEY) {
if ((p = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_PUB_KEY))
- != NULL)
+ != NULL)
return OSSL_PARAM_get_octet_string(p, (void **)raw_key->key,
- raw_key->key == NULL ? 0 : *raw_key->len,
- raw_key->len);
+ raw_key->key == NULL ? 0 : *raw_key->len,
+ raw_key->len);
}
return 0;
}
int EVP_PKEY_get_raw_private_key(const EVP_PKEY *pkey, unsigned char *priv,
- size_t *len)
+ size_t *len)
{
if (pkey->keymgmt != NULL) {
struct raw_key_details_st raw_key;
@@ -577,7 +575,7 @@ int EVP_PKEY_get_raw_private_key(const EVP_PKEY *pkey, unsigned char *priv,
raw_key.selection = OSSL_KEYMGMT_SELECT_PRIVATE_KEY;
return evp_keymgmt_util_export(pkey, OSSL_KEYMGMT_SELECT_PRIVATE_KEY,
- get_raw_key_details, &raw_key);
+ get_raw_key_details, &raw_key);
}
if (pkey->ameth == NULL) {
@@ -599,7 +597,7 @@ int EVP_PKEY_get_raw_private_key(const EVP_PKEY *pkey, unsigned char *priv,
}
int EVP_PKEY_get_raw_public_key(const EVP_PKEY *pkey, unsigned char *pub,
- size_t *len)
+ size_t *len)
{
if (pkey->keymgmt != NULL) {
struct raw_key_details_st raw_key;
@@ -609,7 +607,7 @@ int EVP_PKEY_get_raw_public_key(const EVP_PKEY *pkey, unsigned char *pub,
raw_key.selection = OSSL_KEYMGMT_SELECT_PUBLIC_KEY;
return evp_keymgmt_util_export(pkey, OSSL_KEYMGMT_SELECT_PUBLIC_KEY,
- get_raw_key_details, &raw_key);
+ get_raw_key_details, &raw_key);
}
if (pkey->ameth == NULL) {
@@ -617,7 +615,7 @@ int EVP_PKEY_get_raw_public_key(const EVP_PKEY *pkey, unsigned char *pub,
return 0;
}
- if (pkey->ameth->get_pub_key == NULL) {
+ if (pkey->ameth->get_pub_key == NULL) {
ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
return 0;
}
@@ -631,12 +629,12 @@ int EVP_PKEY_get_raw_public_key(const EVP_PKEY *pkey, unsigned char *pub,
}
static EVP_PKEY *new_cmac_key_int(const unsigned char *priv, size_t len,
- const char *cipher_name,
- const EVP_CIPHER *cipher,
- OSSL_LIB_CTX *libctx,
- const char *propq)
+ const char *cipher_name,
+ const EVP_CIPHER *cipher,
+ OSSL_LIB_CTX *libctx,
+ const char *propq)
{
-# ifndef OPENSSL_NO_CMAC
+#ifndef OPENSSL_NO_CMAC
OSSL_PARAM params[5], *p = params;
EVP_PKEY *pkey = NULL;
EVP_PKEY_CTX *ctx;
@@ -659,12 +657,12 @@ static EVP_PKEY *new_cmac_key_int(const unsigned char *priv, size_t len,
}
*p++ = OSSL_PARAM_construct_octet_string(OSSL_PKEY_PARAM_PRIV_KEY,
- (void *)priv, len);
+ (void *)priv, len);
*p++ = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_CIPHER,
- (char *)cipher_name, 0);
+ (char *)cipher_name, 0);
if (propq != NULL)
*p++ = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_PROPERTIES,
- (char *)propq, 0);
+ (char *)propq, 0);
*p = OSSL_PARAM_construct_end();
if (EVP_PKEY_fromdata(ctx, &pkey, EVP_PKEY_KEYPAIR, params) <= 0) {
@@ -672,18 +670,18 @@ static EVP_PKEY *new_cmac_key_int(const unsigned char *priv, size_t len,
goto err;
}
- err:
+err:
EVP_PKEY_CTX_free(ctx);
return pkey;
-# else
+#else
ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
return NULL;
-# endif
+#endif
}
EVP_PKEY *EVP_PKEY_new_CMAC_key(ENGINE *e, const unsigned char *priv,
- size_t len, const EVP_CIPHER *cipher)
+ size_t len, const EVP_CIPHER *cipher)
{
if (!ossl_assert(e == NULL))
return NULL;
@@ -700,33 +698,33 @@ int EVP_PKEY_set_type_str(EVP_PKEY *pkey, const char *str, int len)
return pkey_set_type(pkey, EVP_PKEY_NONE, str, len, NULL);
}
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
static void detect_foreign_key(EVP_PKEY *pkey)
{
switch (pkey->type) {
case EVP_PKEY_RSA:
case EVP_PKEY_RSA_PSS:
pkey->foreign = pkey->pkey.rsa != NULL
- && ossl_rsa_is_foreign(pkey->pkey.rsa);
+ && ossl_rsa_is_foreign(pkey->pkey.rsa);
break;
-# ifndef OPENSSL_NO_EC
+#ifndef OPENSSL_NO_EC
case EVP_PKEY_SM2:
break;
case EVP_PKEY_EC:
pkey->foreign = pkey->pkey.ec != NULL
- && ossl_ec_key_is_foreign(pkey->pkey.ec);
+ && ossl_ec_key_is_foreign(pkey->pkey.ec);
break;
-# endif
-# ifndef OPENSSL_NO_DSA
+#endif
+#ifndef OPENSSL_NO_DSA
case EVP_PKEY_DSA:
pkey->foreign = pkey->pkey.dsa != NULL
- && ossl_dsa_is_foreign(pkey->pkey.dsa);
+ && ossl_dsa_is_foreign(pkey->pkey.dsa);
break;
#endif
-# ifndef OPENSSL_NO_DH
+#ifndef OPENSSL_NO_DH
case EVP_PKEY_DH:
pkey->foreign = pkey->pkey.dh != NULL
- && ossl_dh_is_foreign(pkey->pkey.dh);
+ && ossl_dh_is_foreign(pkey->pkey.dh);
break;
#endif
default:
@@ -737,7 +735,7 @@ static void detect_foreign_key(EVP_PKEY *pkey)
int EVP_PKEY_assign(EVP_PKEY *pkey, int type, void *key)
{
-# ifndef OPENSSL_NO_EC
+#ifndef OPENSSL_NO_EC
int pktype;
pktype = EVP_PKEY_type(type);
@@ -753,11 +751,11 @@ int EVP_PKEY_assign(EVP_PKEY *pkey, int type, void *key)
*/
if (curve == NID_sm2 && pktype == EVP_PKEY_EC)
type = EVP_PKEY_SM2;
- else if(curve != NID_sm2 && pktype == EVP_PKEY_SM2)
+ else if (curve != NID_sm2 && pktype == EVP_PKEY_SM2)
type = EVP_PKEY_EC;
}
}
-# endif
+#endif
if (pkey == NULL || !EVP_PKEY_set_type(pkey, type))
return 0;
@@ -767,7 +765,7 @@ int EVP_PKEY_assign(EVP_PKEY *pkey, int type, void *key)
return (key != NULL);
}
-# endif
+#endif
void *EVP_PKEY_get0(const EVP_PKEY *pkey)
{
@@ -795,7 +793,7 @@ const unsigned char *EVP_PKEY_get0_hmac(const EVP_PKEY *pkey, size_t *len)
return NULL;
}
-# ifndef OPENSSL_NO_POLY1305
+#ifndef OPENSSL_NO_POLY1305
const unsigned char *EVP_PKEY_get0_poly1305(const EVP_PKEY *pkey, size_t *len)
{
const ASN1_OCTET_STRING *os = NULL;
@@ -810,9 +808,9 @@ const unsigned char *EVP_PKEY_get0_poly1305(const EVP_PKEY *pkey, size_t *len)
}
return NULL;
}
-# endif
+#endif
-# ifndef OPENSSL_NO_SIPHASH
+#ifndef OPENSSL_NO_SIPHASH
const unsigned char *EVP_PKEY_get0_siphash(const EVP_PKEY *pkey, size_t *len)
{
const ASN1_OCTET_STRING *os = NULL;
@@ -828,9 +826,9 @@ const unsigned char *EVP_PKEY_get0_siphash(const EVP_PKEY *pkey, size_t *len)
}
return NULL;
}
-# endif
+#endif
-# ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DSA
static DSA *evp_pkey_get0_DSA_int(const EVP_PKEY *pkey)
{
if (pkey->type != EVP_PKEY_DSA) {
@@ -868,9 +866,9 @@ DSA *EVP_PKEY_get1_DSA(EVP_PKEY *pkey)
return ret;
}
-# endif /* OPENSSL_NO_DSA */
+#endif /* OPENSSL_NO_DSA */
-# ifndef OPENSSL_NO_ECX
+#ifndef OPENSSL_NO_ECX
static const ECX_KEY *evp_pkey_get0_ECX_KEY(const EVP_PKEY *pkey, int type)
{
if (EVP_PKEY_get_base_id(pkey) != type) {
@@ -889,19 +887,19 @@ static ECX_KEY *evp_pkey_get1_ECX_KEY(EVP_PKEY *pkey, int type)
return ret;
}
-# define IMPLEMENT_ECX_VARIANT(NAME) \
- ECX_KEY *ossl_evp_pkey_get1_##NAME(EVP_PKEY *pkey) \
- { \
- return evp_pkey_get1_ECX_KEY(pkey, EVP_PKEY_##NAME); \
+#define IMPLEMENT_ECX_VARIANT(NAME) \
+ ECX_KEY *ossl_evp_pkey_get1_##NAME(EVP_PKEY *pkey) \
+ { \
+ return evp_pkey_get1_ECX_KEY(pkey, EVP_PKEY_##NAME); \
}
IMPLEMENT_ECX_VARIANT(X25519)
IMPLEMENT_ECX_VARIANT(X448)
IMPLEMENT_ECX_VARIANT(ED25519)
IMPLEMENT_ECX_VARIANT(ED448)
-# endif /* OPENSSL_NO_ECX */
+#endif /* OPENSSL_NO_ECX */
-# if !defined(OPENSSL_NO_DH) && !defined(OPENSSL_NO_DEPRECATED_3_0)
+#if !defined(OPENSSL_NO_DH) && !defined(OPENSSL_NO_DEPRECATED_3_0)
int EVP_PKEY_set1_DH(EVP_PKEY *pkey, DH *dhkey)
{
@@ -965,7 +963,7 @@ DH *EVP_PKEY_get1_DH(EVP_PKEY *pkey)
return ret;
}
-# endif
+#endif
int EVP_PKEY_get_id(const EVP_PKEY *pkey)
{
@@ -990,18 +988,18 @@ int EVP_PKEY_get_base_id(const EVP_PKEY *pkey)
* This should be cleaned away along with all other #legacy support.
*/
static const OSSL_ITEM standard_name2type[] = {
- { EVP_PKEY_RSA, "RSA" },
+ { EVP_PKEY_RSA, "RSA" },
{ EVP_PKEY_RSA_PSS, "RSA-PSS" },
- { EVP_PKEY_EC, "EC" },
+ { EVP_PKEY_EC, "EC" },
{ EVP_PKEY_ED25519, "ED25519" },
- { EVP_PKEY_ED448, "ED448" },
- { EVP_PKEY_X25519, "X25519" },
- { EVP_PKEY_X448, "X448" },
- { EVP_PKEY_SM2, "SM2" },
- { EVP_PKEY_DH, "DH" },
- { EVP_PKEY_DHX, "X9.42 DH" },
- { EVP_PKEY_DHX, "DHX" },
- { EVP_PKEY_DSA, "DSA" },
+ { EVP_PKEY_ED448, "ED448" },
+ { EVP_PKEY_X25519, "X25519" },
+ { EVP_PKEY_X448, "X448" },
+ { EVP_PKEY_SM2, "SM2" },
+ { EVP_PKEY_DH, "DH" },
+ { EVP_PKEY_DHX, "X9.42 DH" },
+ { EVP_PKEY_DHX, "DHX" },
+ { EVP_PKEY_DSA, "DSA" },
};
int evp_pkey_name2type(const char *name)
@@ -1041,8 +1039,8 @@ int EVP_PKEY_is_a(const EVP_PKEY *pkey, const char *name)
}
int EVP_PKEY_type_names_do_all(const EVP_PKEY *pkey,
- void (*fn)(const char *name, void *data),
- void *data)
+ void (*fn)(const char *name, void *data),
+ void *data)
{
if (!evp_pkey_is_typed(pkey))
return 0;
@@ -1063,17 +1061,17 @@ int EVP_PKEY_can_sign(const EVP_PKEY *pkey)
case EVP_PKEY_RSA:
case EVP_PKEY_RSA_PSS:
return 1;
-# ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DSA
case EVP_PKEY_DSA:
return 1;
-# endif
-# ifndef OPENSSL_NO_EC
+#endif
+#ifndef OPENSSL_NO_EC
case EVP_PKEY_ED25519:
case EVP_PKEY_ED448:
return 1;
- case EVP_PKEY_EC: /* Including SM2 */
+ case EVP_PKEY_EC: /* Including SM2 */
return EC_KEY_can_sign(pkey->pkey.ec);
-# endif
+#endif
default:
break;
}
@@ -1084,7 +1082,7 @@ int EVP_PKEY_can_sign(const EVP_PKEY *pkey)
const char *name;
name = evp_keymgmt_util_query_operation_name(pkey->keymgmt,
- OSSL_OP_SIGNATURE);
+ OSSL_OP_SIGNATURE);
sig = EVP_SIGNATURE_fetch(libctx, name, NULL);
if (sig != NULL) {
EVP_SIGNATURE_free(sig);
@@ -1107,14 +1105,14 @@ static int print_reset_indent(BIO **out, int pop_f_prefix, long saved_indent)
}
static int print_set_indent(BIO **out, int *pop_f_prefix, long *saved_indent,
- long indent)
+ long indent)
{
*pop_f_prefix = 0;
*saved_indent = 0;
if (indent > 0) {
long i = BIO_get_indent(*out);
- *saved_indent = (i < 0 ? 0 : i);
+ *saved_indent = (i < 0 ? 0 : i);
if (BIO_set_indent(*out, indent) <= 0) {
BIO *prefbio = BIO_new(BIO_f_prefix());
@@ -1132,30 +1130,31 @@ static int print_set_indent(BIO **out, int *pop_f_prefix, long *saved_indent,
}
static int unsup_alg(BIO *out, const EVP_PKEY *pkey, int indent,
- const char *kstr)
+ const char *kstr)
{
return BIO_indent(out, indent, 128)
&& BIO_printf(out, "%s algorithm \"%s\" unsupported\n",
- kstr, OBJ_nid2ln(pkey->type)) > 0;
+ kstr, OBJ_nid2ln(pkey->type))
+ > 0;
}
static int print_pkey(const EVP_PKEY *pkey, BIO *out, int indent,
- int selection /* For provided encoding */,
- const char *propquery /* For provided encoding */,
- int (*legacy_print)(BIO *out, const EVP_PKEY *pkey,
- int indent, ASN1_PCTX *pctx),
- ASN1_PCTX *legacy_pctx /* For legacy print */)
+ int selection /* For provided encoding */,
+ const char *propquery /* For provided encoding */,
+ int (*legacy_print)(BIO *out, const EVP_PKEY *pkey,
+ int indent, ASN1_PCTX *pctx),
+ ASN1_PCTX *legacy_pctx /* For legacy print */)
{
int pop_f_prefix;
long saved_indent;
OSSL_ENCODER_CTX *ctx = NULL;
- int ret = -2; /* default to unsupported */
+ int ret = -2; /* default to unsupported */
if (!print_set_indent(&out, &pop_f_prefix, &saved_indent, indent))
return 0;
ctx = OSSL_ENCODER_CTX_new_for_pkey(pkey, selection, "TEXT", NULL,
- propquery);
+ propquery);
if (OSSL_ENCODER_CTX_get_num_encoders(ctx) != 0)
ret = OSSL_ENCODER_to_bio(ctx, out);
OSSL_ENCODER_CTX_free(ctx);
@@ -1169,38 +1168,38 @@ static int print_pkey(const EVP_PKEY *pkey, BIO *out, int indent,
else
ret = unsup_alg(out, pkey, 0, "Public Key");
- end:
+end:
print_reset_indent(&out, pop_f_prefix, saved_indent);
return ret;
}
int EVP_PKEY_print_public(BIO *out, const EVP_PKEY *pkey,
- int indent, ASN1_PCTX *pctx)
+ int indent, ASN1_PCTX *pctx)
{
return print_pkey(pkey, out, indent, EVP_PKEY_PUBLIC_KEY, NULL,
- (pkey->ameth != NULL ? pkey->ameth->pub_print : NULL),
- pctx);
+ (pkey->ameth != NULL ? pkey->ameth->pub_print : NULL),
+ pctx);
}
int EVP_PKEY_print_private(BIO *out, const EVP_PKEY *pkey,
- int indent, ASN1_PCTX *pctx)
+ int indent, ASN1_PCTX *pctx)
{
return print_pkey(pkey, out, indent, EVP_PKEY_PRIVATE_KEY, NULL,
- (pkey->ameth != NULL ? pkey->ameth->priv_print : NULL),
- pctx);
+ (pkey->ameth != NULL ? pkey->ameth->priv_print : NULL),
+ pctx);
}
int EVP_PKEY_print_params(BIO *out, const EVP_PKEY *pkey,
- int indent, ASN1_PCTX *pctx)
+ int indent, ASN1_PCTX *pctx)
{
return print_pkey(pkey, out, indent, EVP_PKEY_KEY_PARAMETERS, NULL,
- (pkey->ameth != NULL ? pkey->ameth->param_print : NULL),
- pctx);
+ (pkey->ameth != NULL ? pkey->ameth->param_print : NULL),
+ pctx);
}
-# ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_STDIO
int EVP_PKEY_print_public_fp(FILE *fp, const EVP_PKEY *pkey,
- int indent, ASN1_PCTX *pctx)
+ int indent, ASN1_PCTX *pctx)
{
int ret;
BIO *b = BIO_new_fp(fp, BIO_NOCLOSE);
@@ -1213,7 +1212,7 @@ int EVP_PKEY_print_public_fp(FILE *fp, const EVP_PKEY *pkey,
}
int EVP_PKEY_print_private_fp(FILE *fp, const EVP_PKEY *pkey,
- int indent, ASN1_PCTX *pctx)
+ int indent, ASN1_PCTX *pctx)
{
int ret;
BIO *b = BIO_new_fp(fp, BIO_NOCLOSE);
@@ -1226,7 +1225,7 @@ int EVP_PKEY_print_private_fp(FILE *fp, const EVP_PKEY *pkey,
}
int EVP_PKEY_print_params_fp(FILE *fp, const EVP_PKEY *pkey,
- int indent, ASN1_PCTX *pctx)
+ int indent, ASN1_PCTX *pctx)
{
int ret;
BIO *b = BIO_new_fp(fp, BIO_NOCLOSE);
@@ -1237,7 +1236,7 @@ int EVP_PKEY_print_params_fp(FILE *fp, const EVP_PKEY *pkey,
BIO_free(b);
return ret;
}
-# endif
+#endif
static void mdname2nid(const char *mdname, void *data)
{
@@ -1252,49 +1251,48 @@ static void mdname2nid(const char *mdname, void *data)
}
static int legacy_asn1_ctrl_to_param(EVP_PKEY *pkey, int op,
- int arg1, void *arg2)
+ int arg1, void *arg2)
{
if (pkey->keymgmt == NULL)
return 0;
switch (op) {
- case ASN1_PKEY_CTRL_DEFAULT_MD_NID:
- {
- char mdname[80] = "";
- int rv = EVP_PKEY_get_default_digest_name(pkey, mdname,
- sizeof(mdname));
-
- if (rv > 0) {
- int mdnum;
- OSSL_LIB_CTX *libctx = ossl_provider_libctx(pkey->keymgmt->prov);
- /* Make sure the MD is in the namemap if available */
- EVP_MD *md;
- OSSL_NAMEMAP *namemap;
- int nid = NID_undef;
-
- (void)ERR_set_mark();
- md = EVP_MD_fetch(libctx, mdname, NULL);
- (void)ERR_pop_to_mark();
- namemap = ossl_namemap_stored(libctx);
+ case ASN1_PKEY_CTRL_DEFAULT_MD_NID: {
+ char mdname[80] = "";
+ int rv = EVP_PKEY_get_default_digest_name(pkey, mdname,
+ sizeof(mdname));
+
+ if (rv > 0) {
+ int mdnum;
+ OSSL_LIB_CTX *libctx = ossl_provider_libctx(pkey->keymgmt->prov);
+ /* Make sure the MD is in the namemap if available */
+ EVP_MD *md;
+ OSSL_NAMEMAP *namemap;
+ int nid = NID_undef;
+
+ (void)ERR_set_mark();
+ md = EVP_MD_fetch(libctx, mdname, NULL);
+ (void)ERR_pop_to_mark();
+ namemap = ossl_namemap_stored(libctx);
- /*
- * The only reason to fetch the MD was to make sure it is in the
- * namemap. We can immediately free it.
- */
- EVP_MD_free(md);
- mdnum = ossl_namemap_name2num(namemap, mdname);
- if (mdnum == 0)
- return 0;
+ /*
+ * The only reason to fetch the MD was to make sure it is in the
+ * namemap. We can immediately free it.
+ */
+ EVP_MD_free(md);
+ mdnum = ossl_namemap_name2num(namemap, mdname);
+ if (mdnum == 0)
+ return 0;
- /*
- * We have the namemap number - now we need to find the
- * associated nid
- */
- if (!ossl_namemap_doall_names(namemap, mdnum, mdname2nid, &nid))
- return 0;
- *(int *)arg2 = nid;
- }
- return rv;
+ /*
+ * We have the namemap number - now we need to find the
+ * associated nid
+ */
+ if (!ossl_namemap_doall_names(namemap, mdnum, mdname2nid, &nid))
+ return 0;
+ *(int *)arg2 = nid;
}
+ return rv;
+ }
default:
return -2;
}
@@ -1317,12 +1315,12 @@ int EVP_PKEY_get_default_digest_nid(EVP_PKEY *pkey, int *pnid)
}
int EVP_PKEY_get_default_digest_name(EVP_PKEY *pkey,
- char *mdname, size_t mdname_sz)
+ char *mdname, size_t mdname_sz)
{
if (pkey->ameth == NULL)
return evp_keymgmt_util_get_deflt_digest_name(pkey->keymgmt,
- pkey->keydata,
- mdname, mdname_sz);
+ pkey->keydata,
+ mdname, mdname_sz);
{
int nid = NID_undef;
@@ -1336,14 +1334,14 @@ int EVP_PKEY_get_default_digest_name(EVP_PKEY *pkey,
}
int EVP_PKEY_get_group_name(const EVP_PKEY *pkey, char *gname, size_t gname_sz,
- size_t *gname_len)
+ size_t *gname_len)
{
return EVP_PKEY_get_utf8_string_param(pkey, OSSL_PKEY_PARAM_GROUP_NAME,
- gname, gname_sz, gname_len);
+ gname, gname_sz, gname_len);
}
int EVP_PKEY_digestsign_supports_digest(EVP_PKEY *pkey, OSSL_LIB_CTX *libctx,
- const char *name, const char *propq)
+ const char *name, const char *propq)
{
int rv;
EVP_MD_CTX *ctx = NULL;
@@ -1353,36 +1351,36 @@ int EVP_PKEY_digestsign_supports_digest(EVP_PKEY *pkey, OSSL_LIB_CTX *libctx,
ERR_set_mark();
rv = EVP_DigestSignInit_ex(ctx, NULL, name, libctx,
- propq, pkey, NULL);
+ propq, pkey, NULL);
ERR_pop_to_mark();
EVP_MD_CTX_free(ctx);
return rv;
}
-#endif /* !FIPS_MODULE */
+#endif /* !FIPS_MODULE */
int EVP_PKEY_set1_encoded_public_key(EVP_PKEY *pkey, const unsigned char *pub,
- size_t publen)
+ size_t publen)
{
if (pkey == NULL)
return 0;
#ifndef FIPS_MODULE
if (evp_pkey_is_provided(pkey))
-#endif /* !FIPS_MODULE */
- return
- EVP_PKEY_set_octet_string_param(pkey,
- OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY,
- (unsigned char *)pub, publen);
+#endif /* !FIPS_MODULE */
+ return EVP_PKEY_set_octet_string_param(pkey,
+ OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY,
+ (unsigned char *)pub, publen);
#ifndef FIPS_MODULE
if (publen > INT_MAX)
return 0;
/* Historically this function was EVP_PKEY_set1_tls_encodedpoint */
if (evp_pkey_asn1_ctrl(pkey, ASN1_PKEY_CTRL_SET1_TLS_ENCPT, (int)publen,
- (void *)pub) <= 0)
+ (void *)pub)
+ <= 0)
return 0;
return 1;
-#endif /* !FIPS_MODULE */
+#endif /* !FIPS_MODULE */
}
size_t EVP_PKEY_get1_encoded_public_key(EVP_PKEY *pkey, unsigned char **ppub)
@@ -1401,8 +1399,8 @@ size_t EVP_PKEY_get1_encoded_public_key(EVP_PKEY *pkey, unsigned char **ppub)
* to allocate.
*/
EVP_PKEY_get_octet_string_param(pkey,
- OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY,
- NULL, 0, &return_size);
+ OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY,
+ NULL, 0, &return_size);
if (return_size == OSSL_PARAM_UNMODIFIED)
return 0;
@@ -1412,8 +1410,8 @@ size_t EVP_PKEY_get1_encoded_public_key(EVP_PKEY *pkey, unsigned char **ppub)
return 0;
if (!EVP_PKEY_get_octet_string_param(pkey,
- OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY,
- buf, return_size, NULL)) {
+ OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY,
+ buf, return_size, NULL)) {
OPENSSL_free(buf);
return 0;
}
@@ -1428,7 +1426,7 @@ size_t EVP_PKEY_get1_encoded_public_key(EVP_PKEY *pkey, unsigned char **ppub)
return 0;
return rv;
}
-#endif /* !FIPS_MODULE */
+#endif /* !FIPS_MODULE */
}
/*- All methods below can also be used in FIPS_MODULE */
@@ -1461,7 +1459,7 @@ EVP_PKEY *EVP_PKEY_new(void)
#endif
return ret;
- err:
+err:
CRYPTO_FREE_REF(&ret->references);
CRYPTO_THREAD_lock_free(ret->lock);
OPENSSL_free(ret);
@@ -1482,7 +1480,7 @@ EVP_PKEY *EVP_PKEY_new(void)
*/
static int pkey_set_type(EVP_PKEY *pkey, int type, const char *str,
- int len, EVP_KEYMGMT *keymgmt)
+ int len, EVP_KEYMGMT *keymgmt)
{
#ifndef FIPS_MODULE
const EVP_PKEY_ASN1_METHOD *ameth = NULL;
@@ -1524,7 +1522,6 @@ static int pkey_set_type(EVP_PKEY *pkey, int type, const char *str,
ameth = EVP_PKEY_asn1_find(NULL, type);
#endif
-
{
int check = 1;
@@ -1588,7 +1585,7 @@ static void find_ameth(const char *name, void *data)
ERR_set_mark();
if (pkey_set_type(NULL, EVP_PKEY_NONE, name, (int)strlen(name),
- NULL)) {
+ NULL)) {
if (str[0] == NULL)
str[0] = name;
else if (str[1] == NULL)
@@ -1602,8 +1599,8 @@ static void find_ameth(const char *name, void *data)
int EVP_PKEY_set_type_by_keymgmt(EVP_PKEY *pkey, EVP_KEYMGMT *keymgmt)
{
#ifndef FIPS_MODULE
-# define EVP_PKEY_TYPE_STR str[0]
-# define EVP_PKEY_TYPE_STRLEN (str[0] == NULL ? -1 : (int)strlen(str[0]))
+#define EVP_PKEY_TYPE_STR str[0]
+#define EVP_PKEY_TYPE_STRLEN (str[0] == NULL ? -1 : (int)strlen(str[0]))
/*
* Find at most two strings that have an associated EVP_PKEY_ASN1_METHOD
* Ideally, only one should be found. If two (or more) are found, the
@@ -1612,17 +1609,17 @@ int EVP_PKEY_set_type_by_keymgmt(EVP_PKEY *pkey, EVP_KEYMGMT *keymgmt)
const char *str[2] = { NULL, NULL };
if (!EVP_KEYMGMT_names_do_all(keymgmt, find_ameth, &str)
- || str[1] != NULL) {
+ || str[1] != NULL) {
ERR_raise(ERR_LIB_EVP, ERR_R_INTERNAL_ERROR);
return 0;
}
#else
-# define EVP_PKEY_TYPE_STR NULL
-# define EVP_PKEY_TYPE_STRLEN -1
+#define EVP_PKEY_TYPE_STR NULL
+#define EVP_PKEY_TYPE_STRLEN -1
#endif
return pkey_set_type(pkey, EVP_PKEY_NONE,
- EVP_PKEY_TYPE_STR, EVP_PKEY_TYPE_STRLEN,
- keymgmt);
+ EVP_PKEY_TYPE_STR, EVP_PKEY_TYPE_STRLEN,
+ keymgmt);
#undef EVP_PKEY_TYPE_STR
#undef EVP_PKEY_TYPE_STRLEN
@@ -1657,10 +1654,10 @@ EVP_PKEY *EVP_PKEY_dup(EVP_PKEY *pkey)
#ifndef FIPS_MODULE
if (evp_pkey_is_provided(pkey))
-#endif /* !FIPS_MODULE */
+#endif /* !FIPS_MODULE */
{
if (!evp_keymgmt_util_copy(dup_pk, pkey,
- OSSL_KEYMGMT_SELECT_ALL))
+ OSSL_KEYMGMT_SELECT_ALL))
goto err;
goto done;
}
@@ -1680,21 +1677,21 @@ EVP_PKEY *EVP_PKEY_dup(EVP_PKEY *pkey)
goto err;
goto done;
}
-#endif /* !FIPS_MODULE */
+#endif /* !FIPS_MODULE */
goto err;
done:
#ifndef FIPS_MODULE
/* copy auxiliary data */
if (!CRYPTO_dup_ex_data(CRYPTO_EX_INDEX_EVP_PKEY,
- &dup_pk->ex_data, &pkey->ex_data))
+ &dup_pk->ex_data, &pkey->ex_data))
goto err;
if (pkey->attributes != NULL) {
if ((dup_pk->attributes = ossl_x509at_dup(pkey->attributes)) == NULL)
goto err;
}
-#endif /* !FIPS_MODULE */
+#endif /* !FIPS_MODULE */
return dup_pk;
err:
EVP_PKEY_free(dup_pk);
@@ -1728,7 +1725,7 @@ void evp_pkey_free_legacy(EVP_PKEY *x)
x->pkey.ptr = NULL;
}
}
-#endif /* FIPS_MODULE */
+#endif /* FIPS_MODULE */
static void evp_pkey_free_it(EVP_PKEY *x)
{
@@ -1804,8 +1801,8 @@ const char *EVP_PKEY_get0_description(const EVP_PKEY *pkey)
}
void *evp_pkey_export_to_provider(EVP_PKEY *pk, OSSL_LIB_CTX *libctx,
- EVP_KEYMGMT **keymgmt,
- const char *propquery)
+ EVP_KEYMGMT **keymgmt,
+ const char *propquery)
{
EVP_KEYMGMT *allocated_keymgmt = NULL;
EVP_KEYMGMT *tmp_keymgmt = NULL;
@@ -1872,7 +1869,7 @@ void *evp_pkey_export_to_provider(EVP_PKEY *pk, OSSL_LIB_CTX *libctx,
if (!CRYPTO_THREAD_read_lock(pk->lock))
goto end;
op = evp_keymgmt_util_find_operation_cache(pk, tmp_keymgmt,
- selection);
+ selection);
/*
* If |tmp_keymgmt| is present in the operation cache, it means
@@ -1904,7 +1901,7 @@ void *evp_pkey_export_to_provider(EVP_PKEY *pk, OSSL_LIB_CTX *libctx,
goto end;
if (!pk->ameth->export_to(pk, keydata, tmp_keymgmt->import,
- libctx, propquery)) {
+ libctx, propquery)) {
evp_keymgmt_freedata(tmp_keymgmt, keydata);
keydata = NULL;
goto end;
@@ -1925,7 +1922,7 @@ void *evp_pkey_export_to_provider(EVP_PKEY *pk, OSSL_LIB_CTX *libctx,
if (!CRYPTO_THREAD_write_lock(pk->lock))
goto end;
if (pk->ameth->dirty_cnt(pk) != pk->dirty_cnt_copy
- && !evp_keymgmt_util_clear_operation_cache(pk)) {
+ && !evp_keymgmt_util_clear_operation_cache(pk)) {
CRYPTO_THREAD_unlock(pk->lock);
evp_keymgmt_freedata(tmp_keymgmt, keydata);
keydata = NULL;
@@ -1947,7 +1944,7 @@ void *evp_pkey_export_to_provider(EVP_PKEY *pk, OSSL_LIB_CTX *libctx,
/* Add the new export to the operation cache */
if (!evp_keymgmt_util_cache_keydata(pk, tmp_keymgmt, keydata,
- selection)) {
+ selection)) {
CRYPTO_THREAD_unlock(pk->lock);
evp_keymgmt_freedata(tmp_keymgmt, keydata);
keydata = NULL;
@@ -1960,11 +1957,11 @@ void *evp_pkey_export_to_provider(EVP_PKEY *pk, OSSL_LIB_CTX *libctx,
CRYPTO_THREAD_unlock(pk->lock);
goto end;
}
-#endif /* FIPS_MODULE */
+#endif /* FIPS_MODULE */
keydata = evp_keymgmt_util_export_to_provider(pk, tmp_keymgmt, selection);
- end:
+end:
/*
* If nothing was exported, |tmp_keymgmt| might point at a freed
* EVP_KEYMGMT, so we clear it to be safe. It shouldn't be useful for
@@ -2006,8 +2003,8 @@ int evp_pkey_copy_downgraded(EVP_PKEY **dest, const EVP_PKEY *src)
*/
if (!ossl_assert(type != EVP_PKEY_NONE)) {
ERR_raise_data(ERR_LIB_EVP, ERR_R_INTERNAL_ERROR,
- "keymgmt key type = %s but legacy type = EVP_PKEY_NONE",
- keytype);
+ "keymgmt key type = %s but legacy type = EVP_PKEY_NONE",
+ keytype);
return 0;
}
@@ -2033,25 +2030,23 @@ int evp_pkey_copy_downgraded(EVP_PKEY **dest, const EVP_PKEY *src)
if ((*dest)->ameth->import_from == NULL) {
ERR_raise_data(ERR_LIB_EVP, EVP_R_NO_IMPORT_FUNCTION,
- "key type = %s", keytype);
+ "key type = %s", keytype);
} else {
/*
* We perform the export in the same libctx as the keymgmt
* that we are using.
*/
- OSSL_LIB_CTX *libctx =
- ossl_provider_libctx(keymgmt->prov);
- EVP_PKEY_CTX *pctx =
- EVP_PKEY_CTX_new_from_pkey(libctx, *dest, NULL);
+ OSSL_LIB_CTX *libctx = ossl_provider_libctx(keymgmt->prov);
+ EVP_PKEY_CTX *pctx = EVP_PKEY_CTX_new_from_pkey(libctx, *dest, NULL);
if (pctx == NULL)
ERR_raise(ERR_LIB_EVP, ERR_R_EVP_LIB);
if (pctx != NULL
&& evp_keymgmt_export(keymgmt, keydata,
- OSSL_KEYMGMT_SELECT_ALL,
- (*dest)->ameth->import_from,
- pctx)) {
+ OSSL_KEYMGMT_SELECT_ALL,
+ (*dest)->ameth->import_from,
+ pctx)) {
/* Synchronize the dirty count */
(*dest)->dirty_cnt_copy = (*dest)->ameth->dirty_cnt(*dest);
@@ -2062,7 +2057,7 @@ int evp_pkey_copy_downgraded(EVP_PKEY **dest, const EVP_PKEY *src)
}
ERR_raise_data(ERR_LIB_EVP, EVP_R_KEYMGMT_EXPORT_FAILURE,
- "key type = %s", keytype);
+ "key type = %s", keytype);
}
}
@@ -2120,15 +2115,15 @@ void *evp_pkey_get_legacy(EVP_PKEY *pk)
goto err;
}
- err:
+err:
EVP_PKEY_free(tmp_copy);
return ret;
}
-#endif /* FIPS_MODULE */
+#endif /* FIPS_MODULE */
int EVP_PKEY_get_bn_param(const EVP_PKEY *pkey, const char *key_name,
- BIGNUM **bn)
+ BIGNUM **bn)
{
int ret = 0;
OSSL_PARAM params[2];
@@ -2177,8 +2172,8 @@ err:
}
int EVP_PKEY_get_octet_string_param(const EVP_PKEY *pkey, const char *key_name,
- unsigned char *buf, size_t max_buf_sz,
- size_t *out_len)
+ unsigned char *buf, size_t max_buf_sz,
+ size_t *out_len)
{
OSSL_PARAM params[2];
int ret1 = 0, ret2 = 0;
@@ -2196,8 +2191,8 @@ int EVP_PKEY_get_octet_string_param(const EVP_PKEY *pkey, const char *key_name,
}
int EVP_PKEY_get_utf8_string_param(const EVP_PKEY *pkey, const char *key_name,
- char *str, size_t max_buf_sz,
- size_t *out_len)
+ char *str, size_t max_buf_sz,
+ size_t *out_len)
{
OSSL_PARAM params[2];
int ret1 = 0, ret2 = 0;
@@ -2223,7 +2218,7 @@ int EVP_PKEY_get_utf8_string_param(const EVP_PKEY *pkey, const char *key_name,
}
int EVP_PKEY_get_int_param(const EVP_PKEY *pkey, const char *key_name,
- int *out)
+ int *out)
{
OSSL_PARAM params[2];
@@ -2237,7 +2232,7 @@ int EVP_PKEY_get_int_param(const EVP_PKEY *pkey, const char *key_name,
}
int EVP_PKEY_get_size_t_param(const EVP_PKEY *pkey, const char *key_name,
- size_t *out)
+ size_t *out)
{
OSSL_PARAM params[2];
@@ -2275,7 +2270,7 @@ int EVP_PKEY_set_size_t_param(EVP_PKEY *pkey, const char *key_name, size_t in)
}
int EVP_PKEY_set_bn_param(EVP_PKEY *pkey, const char *key_name,
- const BIGNUM *bn)
+ const BIGNUM *bn)
{
OSSL_PARAM params[2];
unsigned char buffer[2048];
@@ -2299,7 +2294,7 @@ int EVP_PKEY_set_bn_param(EVP_PKEY *pkey, const char *key_name,
}
int EVP_PKEY_set_utf8_string_param(EVP_PKEY *pkey, const char *key_name,
- const char *str)
+ const char *str)
{
OSSL_PARAM params[2];
@@ -2312,7 +2307,7 @@ int EVP_PKEY_set_utf8_string_param(EVP_PKEY *pkey, const char *key_name,
}
int EVP_PKEY_set_octet_string_param(EVP_PKEY *pkey, const char *key_name,
- const unsigned char *buf, size_t bsize)
+ const unsigned char *buf, size_t bsize)
{
OSSL_PARAM params[2];
@@ -2320,7 +2315,7 @@ int EVP_PKEY_set_octet_string_param(EVP_PKEY *pkey, const char *key_name,
return 0;
params[0] = OSSL_PARAM_construct_octet_string(key_name,
- (unsigned char *)buf, bsize);
+ (unsigned char *)buf, bsize);
params[1] = OSSL_PARAM_construct_end();
return EVP_PKEY_set_params(pkey, params);
}
@@ -2346,11 +2341,11 @@ int EVP_PKEY_set_params(EVP_PKEY *pkey, OSSL_PARAM params[])
* sure. This bit of code can be enabled if we find the need. If
* not, it can safely be removed when #legacy support is removed.
*/
-# if 0
+#if 0
else if (evp_pkey_is_legacy(pkey)) {
return evp_pkey_set_params_to_ctrl(pkey, params);
}
-# endif
+#endif
#endif
}
ERR_raise(ERR_LIB_EVP, EVP_R_INVALID_KEY);
@@ -2388,8 +2383,8 @@ int EVP_PKEY_get_ec_point_conv_form(const EVP_PKEY *pkey)
return 0;
if (pkey->keymgmt == NULL
- || pkey->keydata == NULL) {
-# ifndef OPENSSL_NO_EC
+ || pkey->keydata == NULL) {
+#ifndef OPENSSL_NO_EC
/* Might work through the legacy route */
const EC_KEY *ec = EVP_PKEY_get0_EC_KEY(pkey);
@@ -2397,14 +2392,14 @@ int EVP_PKEY_get_ec_point_conv_form(const EVP_PKEY *pkey)
return 0;
return EC_KEY_get_conv_form(ec);
-# else
+#else
return 0;
-# endif
+#endif
}
if (!EVP_PKEY_get_utf8_string_param(pkey,
- OSSL_PKEY_PARAM_EC_POINT_CONVERSION_FORMAT,
- name, sizeof(name), &name_len))
+ OSSL_PKEY_PARAM_EC_POINT_CONVERSION_FORMAT,
+ name, sizeof(name), &name_len))
return 0;
if (strcmp(name, "uncompressed") == 0)
@@ -2428,8 +2423,8 @@ int EVP_PKEY_get_field_type(const EVP_PKEY *pkey)
return 0;
if (pkey->keymgmt == NULL
- || pkey->keydata == NULL) {
-# ifndef OPENSSL_NO_EC
+ || pkey->keydata == NULL) {
+#ifndef OPENSSL_NO_EC
/* Might work through the legacy route */
const EC_KEY *ec = EVP_PKEY_get0_EC_KEY(pkey);
const EC_GROUP *grp;
@@ -2441,13 +2436,13 @@ int EVP_PKEY_get_field_type(const EVP_PKEY *pkey)
return 0;
return EC_GROUP_get_field_type(grp);
-# else
+#else
return 0;
-# endif
+#endif
}
if (!EVP_PKEY_get_utf8_string_param(pkey, OSSL_PKEY_PARAM_EC_FIELD_TYPE,
- fstr, sizeof(fstr), &fstrlen))
+ fstr, sizeof(fstr), &fstrlen))
return 0;
if (strcmp(fstr, SN_X9_62_prime_field) == 0)
diff --git a/crypto/evp/p_open.c b/crypto/evp/p_open.c
index 7f208541fd..c567638490 100644
--- a/crypto/evp/p_open.c
+++ b/crypto/evp/p_open.c
@@ -16,8 +16,8 @@
#include <openssl/rsa.h>
int EVP_OpenInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
- const unsigned char *ek, int ekl, const unsigned char *iv,
- EVP_PKEY *priv)
+ const unsigned char *ek, int ekl, const unsigned char *iv,
+ EVP_PKEY *priv)
{
unsigned char *key = NULL;
size_t keylen = 0;
@@ -53,7 +53,7 @@ int EVP_OpenInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
goto err;
ret = 1;
- err:
+err:
EVP_PKEY_CTX_free(pctx);
OPENSSL_clear_free(key, keylen);
return ret;
diff --git a/crypto/evp/p_seal.c b/crypto/evp/p_seal.c
index 99c640cc73..9be4175a41 100644
--- a/crypto/evp/p_seal.c
+++ b/crypto/evp/p_seal.c
@@ -17,8 +17,8 @@
#include <openssl/x509.h>
int EVP_SealInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
- unsigned char **ek, int *ekl, unsigned char *iv,
- EVP_PKEY **pubk, int npubk)
+ unsigned char **ek, int *ekl, unsigned char *iv,
+ EVP_PKEY **pubk, int npubk)
{
unsigned char key[EVP_MAX_KEY_LENGTH];
const OSSL_PROVIDER *prov;
@@ -34,7 +34,7 @@ int EVP_SealInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
return 0;
}
if ((cipher = EVP_CIPHER_CTX_get0_cipher(ctx)) != NULL
- && (prov = EVP_CIPHER_get0_provider(cipher)) != NULL)
+ && (prov = EVP_CIPHER_get0_provider(cipher)) != NULL)
libctx = ossl_provider_libctx(prov);
if ((npubk <= 0) || !pubk)
return 1;
diff --git a/crypto/evp/p_sign.c b/crypto/evp/p_sign.c
index 7292979d47..1d1ac2aa2d 100644
--- a/crypto/evp/p_sign.c
+++ b/crypto/evp/p_sign.c
@@ -15,8 +15,8 @@
#include "crypto/evp.h"
int EVP_SignFinal_ex(EVP_MD_CTX *ctx, unsigned char *sigret,
- unsigned int *siglen, EVP_PKEY *pkey, OSSL_LIB_CTX *libctx,
- const char *propq)
+ unsigned int *siglen, EVP_PKEY *pkey, OSSL_LIB_CTX *libctx,
+ const char *propq)
{
unsigned char m[EVP_MAX_MD_SIZE];
unsigned int m_len = 0;
@@ -59,13 +59,13 @@ int EVP_SignFinal_ex(EVP_MD_CTX *ctx, unsigned char *sigret,
goto err;
*siglen = (unsigned int)sltmp;
i = 1;
- err:
+err:
EVP_PKEY_CTX_free(pkctx);
return i;
}
int EVP_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
- unsigned int *siglen, EVP_PKEY *pkey)
+ unsigned int *siglen, EVP_PKEY *pkey)
{
return EVP_SignFinal_ex(ctx, sigret, siglen, pkey, NULL, NULL);
}
diff --git a/crypto/evp/p_verify.c b/crypto/evp/p_verify.c
index 02db143d13..9116ec9dad 100644
--- a/crypto/evp/p_verify.c
+++ b/crypto/evp/p_verify.c
@@ -15,8 +15,8 @@
#include "crypto/evp.h"
int EVP_VerifyFinal_ex(EVP_MD_CTX *ctx, const unsigned char *sigbuf,
- unsigned int siglen, EVP_PKEY *pkey, OSSL_LIB_CTX *libctx,
- const char *propq)
+ unsigned int siglen, EVP_PKEY *pkey, OSSL_LIB_CTX *libctx,
+ const char *propq)
{
unsigned char m[EVP_MAX_MD_SIZE];
unsigned int m_len = 0;
@@ -53,13 +53,13 @@ int EVP_VerifyFinal_ex(EVP_MD_CTX *ctx, const unsigned char *sigbuf,
if (EVP_PKEY_CTX_set_signature_md(pkctx, EVP_MD_CTX_get0_md(ctx)) <= 0)
goto err;
i = EVP_PKEY_verify(pkctx, sigbuf, siglen, m, m_len);
- err:
+err:
EVP_PKEY_CTX_free(pkctx);
return i;
}
int EVP_VerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sigbuf,
- unsigned int siglen, EVP_PKEY *pkey)
+ unsigned int siglen, EVP_PKEY *pkey)
{
return EVP_VerifyFinal_ex(ctx, sigbuf, siglen, pkey, NULL, NULL);
}
diff --git a/crypto/evp/pbe_scrypt.c b/crypto/evp/pbe_scrypt.c
index 78b2d13ec9..cf123fd172 100644
--- a/crypto/evp/pbe_scrypt.c
+++ b/crypto/evp/pbe_scrypt.c
@@ -21,24 +21,24 @@
*/
#ifdef SCRYPT_MAX_MEM
-# if SCRYPT_MAX_MEM == 0
-# undef SCRYPT_MAX_MEM
+#if SCRYPT_MAX_MEM == 0
+#undef SCRYPT_MAX_MEM
/*
* Although we could theoretically allocate SIZE_MAX memory that would leave
* no memory available for anything else so set limit as half that.
*/
-# define SCRYPT_MAX_MEM (SIZE_MAX/2)
-# endif
+#define SCRYPT_MAX_MEM (SIZE_MAX / 2)
+#endif
#else
/* Default memory limit: 32 MB */
-# define SCRYPT_MAX_MEM (1024 * 1024 * 32)
+#define SCRYPT_MAX_MEM (1024 * 1024 * 32)
#endif
int EVP_PBE_scrypt_ex(const char *pass, size_t passlen,
- const unsigned char *salt, size_t saltlen,
- uint64_t N, uint64_t r, uint64_t p, uint64_t maxmem,
- unsigned char *key, size_t keylen,
- OSSL_LIB_CTX *ctx, const char *propq)
+ const unsigned char *salt, size_t saltlen,
+ uint64_t N, uint64_t r, uint64_t p, uint64_t maxmem,
+ unsigned char *key, size_t keylen,
+ OSSL_LIB_CTX *ctx, const char *propq)
{
const char *empty = "";
int rv = 1;
@@ -71,10 +71,10 @@ int EVP_PBE_scrypt_ex(const char *pass, size_t passlen,
return 0;
*z++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_PASSWORD,
- (unsigned char *)pass,
- passlen);
+ (unsigned char *)pass,
+ passlen);
*z++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SALT,
- (unsigned char *)salt, saltlen);
+ (unsigned char *)salt, saltlen);
*z++ = OSSL_PARAM_construct_uint64(OSSL_KDF_PARAM_SCRYPT_N, &N);
*z++ = OSSL_PARAM_construct_uint64(OSSL_KDF_PARAM_SCRYPT_R, &r);
*z++ = OSSL_PARAM_construct_uint64(OSSL_KDF_PARAM_SCRYPT_P, &p);
@@ -88,12 +88,12 @@ int EVP_PBE_scrypt_ex(const char *pass, size_t passlen,
}
int EVP_PBE_scrypt(const char *pass, size_t passlen,
- const unsigned char *salt, size_t saltlen,
- uint64_t N, uint64_t r, uint64_t p, uint64_t maxmem,
- unsigned char *key, size_t keylen)
+ const unsigned char *salt, size_t saltlen,
+ uint64_t N, uint64_t r, uint64_t p, uint64_t maxmem,
+ unsigned char *key, size_t keylen)
{
return EVP_PBE_scrypt_ex(pass, passlen, salt, saltlen, N, r, p, maxmem,
- key, keylen, NULL, NULL);
+ key, keylen, NULL, NULL);
}
#endif
diff --git a/crypto/evp/pmeth_check.c b/crypto/evp/pmeth_check.c
index 7f3a2e3a1c..ebab82809c 100644
--- a/crypto/evp/pmeth_check.c
+++ b/crypto/evp/pmeth_check.c
@@ -14,7 +14,7 @@
#include <openssl/evp.h>
#include "crypto/bn.h"
#ifndef FIPS_MODULE
-# include "crypto/asn1.h"
+#include "crypto/asn1.h"
#endif
#include "crypto/evp.h"
#include "evp_local.h"
@@ -35,7 +35,7 @@ static int try_provided_check(EVP_PKEY_CTX *ctx, int selection, int checktype)
keymgmt = ctx->keymgmt;
keydata = evp_pkey_export_to_provider(ctx->pkey, ctx->libctx,
- &keymgmt, ctx->propquery);
+ &keymgmt, ctx->propquery);
if (keydata == NULL) {
ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
return 0;
@@ -55,7 +55,8 @@ static int evp_pkey_public_check_combined(EVP_PKEY_CTX *ctx, int checktype)
}
if ((ok = try_provided_check(ctx, OSSL_KEYMGMT_SELECT_PUBLIC_KEY,
- checktype)) != -1)
+ checktype))
+ != -1)
return ok;
if (pkey->type == EVP_PKEY_NONE)
@@ -73,7 +74,7 @@ static int evp_pkey_public_check_combined(EVP_PKEY_CTX *ctx, int checktype)
return pkey->ameth->pkey_public_check(pkey);
#endif
- not_supported:
+not_supported:
ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
return -2;
}
@@ -99,8 +100,9 @@ static int evp_pkey_param_check_combined(EVP_PKEY_CTX *ctx, int checktype)
}
if ((ok = try_provided_check(ctx,
- OSSL_KEYMGMT_SELECT_ALL_PARAMETERS,
- checktype)) != -1)
+ OSSL_KEYMGMT_SELECT_ALL_PARAMETERS,
+ checktype))
+ != -1)
return ok;
if (pkey->type == EVP_PKEY_NONE)
@@ -118,7 +120,7 @@ static int evp_pkey_param_check_combined(EVP_PKEY_CTX *ctx, int checktype)
return pkey->ameth->pkey_param_check(pkey);
#endif
- not_supported:
+not_supported:
ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
return -2;
}
@@ -144,7 +146,8 @@ int EVP_PKEY_private_check(EVP_PKEY_CTX *ctx)
}
if ((ok = try_provided_check(ctx, OSSL_KEYMGMT_SELECT_PRIVATE_KEY,
- OSSL_KEYMGMT_VALIDATE_FULL_CHECK)) != -1)
+ OSSL_KEYMGMT_VALIDATE_FULL_CHECK))
+ != -1)
return ok;
/* not supported for legacy keys */
@@ -168,7 +171,8 @@ int EVP_PKEY_pairwise_check(EVP_PKEY_CTX *ctx)
}
if ((ok = try_provided_check(ctx, OSSL_KEYMGMT_SELECT_KEYPAIR,
- OSSL_KEYMGMT_VALIDATE_FULL_CHECK)) != -1)
+ OSSL_KEYMGMT_VALIDATE_FULL_CHECK))
+ != -1)
return ok;
if (pkey->type == EVP_PKEY_NONE)
@@ -186,8 +190,7 @@ int EVP_PKEY_pairwise_check(EVP_PKEY_CTX *ctx)
return pkey->ameth->pkey_check(pkey);
#endif
- not_supported:
+not_supported:
ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
return -2;
}
-
diff --git a/crypto/evp/pmeth_gn.c b/crypto/evp/pmeth_gn.c
index f71447f060..0351990a78 100644
--- a/crypto/evp/pmeth_gn.c
+++ b/crypto/evp/pmeth_gn.c
@@ -18,7 +18,7 @@
#include <openssl/evp.h>
#include "crypto/bn.h"
#ifndef FIPS_MODULE
-# include "crypto/asn1.h"
+#include "crypto/asn1.h"
#endif
#include "crypto/evp.h"
#include "evp_local.h"
@@ -38,14 +38,12 @@ static int gen_init(EVP_PKEY_CTX *ctx, int operation)
switch (operation) {
case EVP_PKEY_OP_PARAMGEN:
- ctx->op.keymgmt.genctx =
- evp_keymgmt_gen_init(ctx->keymgmt,
- OSSL_KEYMGMT_SELECT_ALL_PARAMETERS, NULL);
+ ctx->op.keymgmt.genctx = evp_keymgmt_gen_init(ctx->keymgmt,
+ OSSL_KEYMGMT_SELECT_ALL_PARAMETERS, NULL);
break;
case EVP_PKEY_OP_KEYGEN:
- ctx->op.keymgmt.genctx =
- evp_keymgmt_gen_init(ctx->keymgmt, OSSL_KEYMGMT_SELECT_KEYPAIR,
- NULL);
+ ctx->op.keymgmt.genctx = evp_keymgmt_gen_init(ctx->keymgmt, OSSL_KEYMGMT_SELECT_KEYPAIR,
+ NULL);
break;
}
@@ -55,7 +53,7 @@ static int gen_init(EVP_PKEY_CTX *ctx, int operation)
ret = 1;
goto end;
- legacy:
+legacy:
#ifdef FIPS_MODULE
goto not_supported;
#else
@@ -79,14 +77,14 @@ static int gen_init(EVP_PKEY_CTX *ctx, int operation)
}
#endif
- end:
+end:
if (ret <= 0 && ctx != NULL) {
evp_pkey_ctx_free_old_ops(ctx);
ctx->operation = EVP_PKEY_OP_UNDEFINED;
}
return ret;
- not_supported:
+not_supported:
ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
ret = -2;
goto end;
@@ -109,14 +107,14 @@ static int ossl_callback_to_pkey_gencb(const OSSL_PARAM params[], void *arg)
int p = -1, n = -1;
if (ctx->pkey_gencb == NULL)
- return 1; /* No callback? That's fine */
+ return 1; /* No callback? That's fine */
if ((param = OSSL_PARAM_locate_const(params, OSSL_GEN_PARAM_POTENTIAL))
- == NULL
+ == NULL
|| !OSSL_PARAM_get_int(param, &p))
return 0;
if ((param = OSSL_PARAM_locate_const(params, OSSL_GEN_PARAM_ITERATION))
- == NULL
+ == NULL
|| !OSSL_PARAM_get_int(param, &n))
return 0;
@@ -168,9 +166,8 @@ int EVP_PKEY_generate(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey)
ret = 1;
if (ctx->pkey != NULL) {
EVP_KEYMGMT *tmp_keymgmt = ctx->keymgmt;
- void *keydata =
- evp_pkey_export_to_provider(ctx->pkey, ctx->libctx,
- &tmp_keymgmt, ctx->propquery);
+ void *keydata = evp_pkey_export_to_provider(ctx->pkey, ctx->libctx,
+ &tmp_keymgmt, ctx->propquery);
if (tmp_keymgmt == NULL)
goto not_supported;
@@ -179,7 +176,7 @@ int EVP_PKEY_generate(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey)
* with that as it sees fit.
*/
ret = evp_keymgmt_gen_set_template(ctx->keymgmt,
- ctx->op.keymgmt.genctx, keydata);
+ ctx->op.keymgmt.genctx, keydata);
}
/*
@@ -188,7 +185,7 @@ int EVP_PKEY_generate(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey)
*/
ret = ret
&& (evp_keymgmt_util_gen(*ppkey, ctx->keymgmt, ctx->op.keymgmt.genctx,
- ossl_callback_to_pkey_gencb, ctx)
+ ossl_callback_to_pkey_gencb, ctx)
!= NULL);
ctx->keygen_info = NULL;
@@ -206,7 +203,7 @@ int EVP_PKEY_generate(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey)
goto end;
- legacy:
+legacy:
#ifdef FIPS_MODULE
goto not_supported;
#else
@@ -233,7 +230,7 @@ int EVP_PKEY_generate(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey)
}
#endif
- end:
+end:
if (ret <= 0) {
if (allocated_pkey != NULL)
*ppkey = NULL;
@@ -241,16 +238,16 @@ int EVP_PKEY_generate(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey)
}
return ret;
- not_supported:
+not_supported:
ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
ret = -2;
goto end;
- not_initialized:
+not_initialized:
ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_INITIALIZED);
ret = -1;
goto end;
#ifndef FIPS_MODULE
- not_accessible:
+not_accessible:
ERR_raise(ERR_LIB_EVP, EVP_R_INACCESSIBLE_DOMAIN_PARAMETERS);
ret = -1;
goto end;
@@ -315,7 +312,7 @@ int EVP_PKEY_CTX_get_keygen_info(EVP_PKEY_CTX *ctx, int idx)
#ifndef FIPS_MODULE
EVP_PKEY *EVP_PKEY_new_mac_key(int type, ENGINE *e,
- const unsigned char *key, int keylen)
+ const unsigned char *key, int keylen)
{
EVP_PKEY_CTX *mac_ctx = NULL;
EVP_PKEY *mac_key = NULL;
@@ -331,7 +328,7 @@ EVP_PKEY *EVP_PKEY_new_mac_key(int type, ENGINE *e,
goto merr;
if (EVP_PKEY_keygen(mac_ctx, &mac_key) <= 0)
goto merr;
- merr:
+merr:
EVP_PKEY_CTX_free(mac_ctx);
return mac_key;
}
@@ -352,7 +349,7 @@ static int fromdata_init(EVP_PKEY_CTX *ctx, int operation)
ctx->operation = operation;
return 1;
- not_supported:
+not_supported:
if (ctx != NULL)
ctx->operation = EVP_PKEY_OP_UNDEFINED;
ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
@@ -365,7 +362,7 @@ int EVP_PKEY_fromdata_init(EVP_PKEY_CTX *ctx)
}
int EVP_PKEY_fromdata(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey, int selection,
- OSSL_PARAM params[])
+ OSSL_PARAM params[])
{
void *keydata = NULL;
EVP_PKEY *allocated_pkey = NULL;
@@ -431,7 +428,7 @@ struct fake_import_data_st {
static OSSL_FUNC_keymgmt_import_fn pkey_fake_import;
static int pkey_fake_import(void *fake_keydata, int ignored_selection,
- const OSSL_PARAM params[])
+ const OSSL_PARAM params[])
{
struct fake_import_data_st *data = fake_keydata;
@@ -440,7 +437,7 @@ static int pkey_fake_import(void *fake_keydata, int ignored_selection,
#endif
int EVP_PKEY_export(const EVP_PKEY *pkey, int selection,
- OSSL_CALLBACK *export_cb, void *export_cbarg)
+ OSSL_CALLBACK *export_cb, void *export_cbarg)
{
if (pkey == NULL) {
ERR_raise(ERR_LIB_EVP, ERR_R_PASSED_NULL_PARAMETER);
@@ -458,7 +455,7 @@ int EVP_PKEY_export(const EVP_PKEY *pkey, int selection,
* interested in the resulting OSSL_PARAM array.
*/
return pkey->ameth->export_to(pkey, &data, pkey_fake_import,
- NULL, NULL);
+ NULL, NULL);
}
#endif
return evp_keymgmt_util_export(pkey, selection, export_cb, export_cbarg);
diff --git a/crypto/evp/pmeth_lib.c b/crypto/evp/pmeth_lib.c
index 06f52ea463..70abf69b81 100644
--- a/crypto/evp/pmeth_lib.c
+++ b/crypto/evp/pmeth_lib.c
@@ -22,7 +22,7 @@
#include <openssl/kdf.h>
#include "internal/cryptlib.h"
#ifndef FIPS_MODULE
-# include "crypto/asn1.h"
+#include "crypto/asn1.h"
#endif
#include "crypto/evp.h"
#include "crypto/dh.h"
@@ -36,11 +36,11 @@
#ifndef FIPS_MODULE
static int evp_pkey_ctx_store_cached_data(EVP_PKEY_CTX *ctx,
- int keytype, int optype,
- int cmd, const char *name,
- const void *data, size_t data_len);
+ int keytype, int optype,
+ int cmd, const char *name,
+ const void *data, size_t data_len);
static void evp_pkey_ctx_free_cached_data(EVP_PKEY_CTX *ctx,
- int cmd, const char *name);
+ int cmd, const char *name);
static void evp_pkey_ctx_free_all_cached_data(EVP_PKEY_CTX *ctx);
typedef const EVP_PKEY_METHOD *(*pmeth_fn)(void);
@@ -51,25 +51,25 @@ static STACK_OF(EVP_PKEY_METHOD) *app_pkey_methods = NULL;
/* This array needs to be in order of NIDs */
static pmeth_fn standard_methods[] = {
ossl_rsa_pkey_method,
-# ifndef OPENSSL_NO_DH
+#ifndef OPENSSL_NO_DH
ossl_dh_pkey_method,
-# endif
-# ifndef OPENSSL_NO_DSA
+#endif
+#ifndef OPENSSL_NO_DSA
ossl_dsa_pkey_method,
-# endif
-# ifndef OPENSSL_NO_EC
+#endif
+#ifndef OPENSSL_NO_EC
ossl_ec_pkey_method,
-# endif
+#endif
ossl_rsa_pss_pkey_method,
-# ifndef OPENSSL_NO_DH
+#ifndef OPENSSL_NO_DH
ossl_dhx_pkey_method,
-# endif
-# ifndef OPENSSL_NO_ECX
+#endif
+#ifndef OPENSSL_NO_ECX
ossl_ecx25519_pkey_method,
ossl_ecx448_pkey_method,
ossl_ed25519_pkey_method,
ossl_ed448_pkey_method,
-# endif
+#endif
};
DECLARE_OBJ_BSEARCH_CMP_FN(const EVP_PKEY_METHOD *, pmeth_fn, pmeth_func);
@@ -82,7 +82,7 @@ static int pmeth_func_cmp(const EVP_PKEY_METHOD *const *a, pmeth_fn const *b)
IMPLEMENT_OBJ_BSEARCH_CMP_FN(const EVP_PKEY_METHOD *, pmeth_fn, pmeth_func);
static int pmeth_cmp(const EVP_PKEY_METHOD *const *a,
- const EVP_PKEY_METHOD *const *b)
+ const EVP_PKEY_METHOD *const *b)
{
return ((*a)->pkey_id - (*b)->pkey_id);
}
@@ -113,7 +113,7 @@ const EVP_PKEY_METHOD *EVP_PKEY_meth_find(int type)
tmp.pkey_id = type;
t = &tmp;
ret = OBJ_bsearch_pmeth_func(&t, standard_methods,
- OSSL_NELEM(standard_methods));
+ OSSL_NELEM(standard_methods));
if (ret == NULL || *ret == NULL)
return NULL;
return (**ret)();
@@ -139,7 +139,7 @@ int evp_pkey_ctx_state(const EVP_PKEY_CTX *ctx)
return EVP_PKEY_STATE_UNKNOWN;
if ((EVP_PKEY_CTX_IS_DERIVE_OP(ctx)
- && ctx->op.kex.algctx != NULL)
+ && ctx->op.kex.algctx != NULL)
|| (EVP_PKEY_CTX_IS_SIGNATURE_OP(ctx)
&& ctx->op.sig.algctx != NULL)
|| (EVP_PKEY_CTX_IS_ASYM_CIPHER_OP(ctx)
@@ -154,8 +154,8 @@ int evp_pkey_ctx_state(const EVP_PKEY_CTX *ctx)
}
static EVP_PKEY_CTX *int_ctx_new(OSSL_LIB_CTX *libctx, EVP_PKEY *pkey,
- const char *keytype, const char *propquery,
- int id)
+ const char *keytype, const char *propquery,
+ int id)
{
EVP_PKEY_CTX *ret = NULL;
@@ -201,7 +201,7 @@ static EVP_PKEY_CTX *int_ctx_new(OSSL_LIB_CTX *libctx, EVP_PKEY *pkey,
/* END legacy */
#endif /* FIPS_MODULE */
- common:
+common:
/*
* If there's no app supplied pmeth and there's a name, we try
* fetching a provider implementation.
@@ -222,7 +222,7 @@ static EVP_PKEY_CTX *int_ctx_new(OSSL_LIB_CTX *libctx, EVP_PKEY *pkey,
keymgmt = EVP_KEYMGMT_fetch(libctx, keytype, propquery);
}
if (keymgmt == NULL)
- return NULL; /* EVP_KEYMGMT_fetch() recorded an error */
+ return NULL; /* EVP_KEYMGMT_fetch() recorded an error */
#ifndef FIPS_MODULE
/*
@@ -300,14 +300,14 @@ static EVP_PKEY_CTX *int_ctx_new(OSSL_LIB_CTX *libctx, EVP_PKEY *pkey,
/*- All methods below can also be used in FIPS_MODULE */
EVP_PKEY_CTX *EVP_PKEY_CTX_new_from_name(OSSL_LIB_CTX *libctx,
- const char *name,
- const char *propquery)
+ const char *name,
+ const char *propquery)
{
return int_ctx_new(libctx, NULL, name, propquery, -1);
}
EVP_PKEY_CTX *EVP_PKEY_CTX_new_from_pkey(OSSL_LIB_CTX *libctx, EVP_PKEY *pkey,
- const char *propquery)
+ const char *propquery)
{
return int_ctx_new(libctx, pkey, NULL, propquery, -1);
}
@@ -332,8 +332,7 @@ void evp_pkey_ctx_free_old_ops(EVP_PKEY_CTX *ctx)
EVP_KEM_free(ctx->op.encap.kem);
ctx->op.encap.algctx = NULL;
ctx->op.encap.kem = NULL;
- }
- else if (EVP_PKEY_CTX_IS_ASYM_CIPHER_OP(ctx)) {
+ } else if (EVP_PKEY_CTX_IS_ASYM_CIPHER_OP(ctx)) {
if (ctx->op.ciph.algctx != NULL && ctx->op.ciph.cipher != NULL)
ctx->op.ciph.cipher->freectx(ctx->op.ciph.algctx);
EVP_ASYM_CIPHER_free(ctx->op.ciph.cipher);
@@ -368,7 +367,7 @@ void EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx)
#ifndef FIPS_MODULE
void EVP_PKEY_meth_get0_info(int *ppkey_id, int *pflags,
- const EVP_PKEY_METHOD *meth)
+ const EVP_PKEY_METHOD *meth)
{
if (ppkey_id)
*ppkey_id = meth->pkey_id;
@@ -542,7 +541,7 @@ EVP_PKEY_CTX *EVP_PKEY_CTX_dup(const EVP_PKEY_CTX *pctx)
return rctx;
provkey = evp_pkey_export_to_provider(pctx->pkey, pctx->libctx,
- &tmp_keymgmt, pctx->propquery);
+ &tmp_keymgmt, pctx->propquery);
if (provkey == NULL)
goto err;
if (!EVP_KEYMGMT_up_ref(tmp_keymgmt))
@@ -630,33 +629,28 @@ int EVP_PKEY_CTX_set_params(EVP_PKEY_CTX *ctx, const OSSL_PARAM *params)
if (EVP_PKEY_CTX_IS_DERIVE_OP(ctx)
&& ctx->op.kex.exchange != NULL
&& ctx->op.kex.exchange->set_ctx_params != NULL)
- return
- ctx->op.kex.exchange->set_ctx_params(ctx->op.kex.algctx,
- params);
+ return ctx->op.kex.exchange->set_ctx_params(ctx->op.kex.algctx,
+ params);
if (EVP_PKEY_CTX_IS_SIGNATURE_OP(ctx)
&& ctx->op.sig.signature != NULL
&& ctx->op.sig.signature->set_ctx_params != NULL)
- return
- ctx->op.sig.signature->set_ctx_params(ctx->op.sig.algctx,
- params);
+ return ctx->op.sig.signature->set_ctx_params(ctx->op.sig.algctx,
+ params);
if (EVP_PKEY_CTX_IS_ASYM_CIPHER_OP(ctx)
&& ctx->op.ciph.cipher != NULL
&& ctx->op.ciph.cipher->set_ctx_params != NULL)
- return
- ctx->op.ciph.cipher->set_ctx_params(ctx->op.ciph.algctx,
- params);
+ return ctx->op.ciph.cipher->set_ctx_params(ctx->op.ciph.algctx,
+ params);
if (EVP_PKEY_CTX_IS_GEN_OP(ctx)
&& ctx->keymgmt != NULL
&& ctx->keymgmt->gen_set_params != NULL)
- return
- evp_keymgmt_gen_set_params(ctx->keymgmt, ctx->op.keymgmt.genctx,
- params);
+ return evp_keymgmt_gen_set_params(ctx->keymgmt, ctx->op.keymgmt.genctx,
+ params);
if (EVP_PKEY_CTX_IS_KEM_OP(ctx)
&& ctx->op.encap.kem != NULL
&& ctx->op.encap.kem->set_ctx_params != NULL)
- return
- ctx->op.encap.kem->set_ctx_params(ctx->op.encap.algctx,
- params);
+ return ctx->op.encap.kem->set_ctx_params(ctx->op.encap.algctx,
+ params);
break;
case EVP_PKEY_STATE_UNKNOWN:
break;
@@ -675,33 +669,28 @@ int EVP_PKEY_CTX_get_params(EVP_PKEY_CTX *ctx, OSSL_PARAM *params)
if (EVP_PKEY_CTX_IS_DERIVE_OP(ctx)
&& ctx->op.kex.exchange != NULL
&& ctx->op.kex.exchange->get_ctx_params != NULL)
- return
- ctx->op.kex.exchange->get_ctx_params(ctx->op.kex.algctx,
- params);
+ return ctx->op.kex.exchange->get_ctx_params(ctx->op.kex.algctx,
+ params);
if (EVP_PKEY_CTX_IS_SIGNATURE_OP(ctx)
&& ctx->op.sig.signature != NULL
&& ctx->op.sig.signature->get_ctx_params != NULL)
- return
- ctx->op.sig.signature->get_ctx_params(ctx->op.sig.algctx,
- params);
+ return ctx->op.sig.signature->get_ctx_params(ctx->op.sig.algctx,
+ params);
if (EVP_PKEY_CTX_IS_ASYM_CIPHER_OP(ctx)
&& ctx->op.ciph.cipher != NULL
&& ctx->op.ciph.cipher->get_ctx_params != NULL)
- return
- ctx->op.ciph.cipher->get_ctx_params(ctx->op.ciph.algctx,
- params);
+ return ctx->op.ciph.cipher->get_ctx_params(ctx->op.ciph.algctx,
+ params);
if (EVP_PKEY_CTX_IS_KEM_OP(ctx)
&& ctx->op.encap.kem != NULL
&& ctx->op.encap.kem->get_ctx_params != NULL)
- return
- ctx->op.encap.kem->get_ctx_params(ctx->op.encap.algctx,
- params);
+ return ctx->op.encap.kem->get_ctx_params(ctx->op.encap.algctx,
+ params);
if (EVP_PKEY_CTX_IS_GEN_OP(ctx)
&& ctx->keymgmt != NULL
&& ctx->keymgmt->gen_get_params != NULL)
- return
- evp_keymgmt_gen_get_params(ctx->keymgmt, ctx->op.keymgmt.genctx,
- params);
+ return evp_keymgmt_gen_get_params(ctx->keymgmt, ctx->op.keymgmt.genctx,
+ params);
break;
case EVP_PKEY_STATE_UNKNOWN:
break;
@@ -711,7 +700,7 @@ int EVP_PKEY_CTX_get_params(EVP_PKEY_CTX *ctx, OSSL_PARAM *params)
#endif
}
ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_GET_CTX_PARAMS_NOT_SUPPORTED,
- "EVP_PKEY_OP=0x%x", ctx->operation);
+ "EVP_PKEY_OP=0x%x", ctx->operation);
return 0;
}
@@ -721,41 +710,41 @@ const OSSL_PARAM *EVP_PKEY_CTX_gettable_params(const EVP_PKEY_CTX *ctx)
void *provctx;
if (EVP_PKEY_CTX_IS_DERIVE_OP(ctx)
- && ctx->op.kex.exchange != NULL
- && ctx->op.kex.exchange->gettable_ctx_params != NULL) {
+ && ctx->op.kex.exchange != NULL
+ && ctx->op.kex.exchange->gettable_ctx_params != NULL) {
provctx = ossl_provider_ctx(EVP_KEYEXCH_get0_provider(ctx->op.kex.exchange));
return ctx->op.kex.exchange->gettable_ctx_params(ctx->op.kex.algctx,
- provctx);
+ provctx);
}
if (EVP_PKEY_CTX_IS_SIGNATURE_OP(ctx)
- && ctx->op.sig.signature != NULL
- && ctx->op.sig.signature->gettable_ctx_params != NULL) {
+ && ctx->op.sig.signature != NULL
+ && ctx->op.sig.signature->gettable_ctx_params != NULL) {
provctx = ossl_provider_ctx(
- EVP_SIGNATURE_get0_provider(ctx->op.sig.signature));
+ EVP_SIGNATURE_get0_provider(ctx->op.sig.signature));
return ctx->op.sig.signature->gettable_ctx_params(ctx->op.sig.algctx,
- provctx);
+ provctx);
}
if (EVP_PKEY_CTX_IS_ASYM_CIPHER_OP(ctx)
- && ctx->op.ciph.cipher != NULL
- && ctx->op.ciph.cipher->gettable_ctx_params != NULL) {
+ && ctx->op.ciph.cipher != NULL
+ && ctx->op.ciph.cipher->gettable_ctx_params != NULL) {
provctx = ossl_provider_ctx(
- EVP_ASYM_CIPHER_get0_provider(ctx->op.ciph.cipher));
+ EVP_ASYM_CIPHER_get0_provider(ctx->op.ciph.cipher));
return ctx->op.ciph.cipher->gettable_ctx_params(ctx->op.ciph.algctx,
- provctx);
+ provctx);
}
if (EVP_PKEY_CTX_IS_KEM_OP(ctx)
&& ctx->op.encap.kem != NULL
&& ctx->op.encap.kem->gettable_ctx_params != NULL) {
provctx = ossl_provider_ctx(EVP_KEM_get0_provider(ctx->op.encap.kem));
return ctx->op.encap.kem->gettable_ctx_params(ctx->op.encap.algctx,
- provctx);
+ provctx);
}
if (EVP_PKEY_CTX_IS_GEN_OP(ctx)
- && ctx->keymgmt != NULL
- && ctx->keymgmt->gen_gettable_params != NULL) {
+ && ctx->keymgmt != NULL
+ && ctx->keymgmt->gen_gettable_params != NULL) {
provctx = ossl_provider_ctx(EVP_KEYMGMT_get0_provider(ctx->keymgmt));
return ctx->keymgmt->gen_gettable_params(ctx->op.keymgmt.genctx,
- provctx);
+ provctx);
}
return NULL;
}
@@ -765,41 +754,41 @@ const OSSL_PARAM *EVP_PKEY_CTX_settable_params(const EVP_PKEY_CTX *ctx)
void *provctx;
if (EVP_PKEY_CTX_IS_DERIVE_OP(ctx)
- && ctx->op.kex.exchange != NULL
- && ctx->op.kex.exchange->settable_ctx_params != NULL) {
+ && ctx->op.kex.exchange != NULL
+ && ctx->op.kex.exchange->settable_ctx_params != NULL) {
provctx = ossl_provider_ctx(EVP_KEYEXCH_get0_provider(ctx->op.kex.exchange));
return ctx->op.kex.exchange->settable_ctx_params(ctx->op.kex.algctx,
- provctx);
+ provctx);
}
if (EVP_PKEY_CTX_IS_SIGNATURE_OP(ctx)
- && ctx->op.sig.signature != NULL
- && ctx->op.sig.signature->settable_ctx_params != NULL) {
+ && ctx->op.sig.signature != NULL
+ && ctx->op.sig.signature->settable_ctx_params != NULL) {
provctx = ossl_provider_ctx(
- EVP_SIGNATURE_get0_provider(ctx->op.sig.signature));
+ EVP_SIGNATURE_get0_provider(ctx->op.sig.signature));
return ctx->op.sig.signature->settable_ctx_params(ctx->op.sig.algctx,
- provctx);
+ provctx);
}
if (EVP_PKEY_CTX_IS_ASYM_CIPHER_OP(ctx)
- && ctx->op.ciph.cipher != NULL
- && ctx->op.ciph.cipher->settable_ctx_params != NULL) {
+ && ctx->op.ciph.cipher != NULL
+ && ctx->op.ciph.cipher->settable_ctx_params != NULL) {
provctx = ossl_provider_ctx(
- EVP_ASYM_CIPHER_get0_provider(ctx->op.ciph.cipher));
+ EVP_ASYM_CIPHER_get0_provider(ctx->op.ciph.cipher));
return ctx->op.ciph.cipher->settable_ctx_params(ctx->op.ciph.algctx,
- provctx);
+ provctx);
}
if (EVP_PKEY_CTX_IS_GEN_OP(ctx)
- && ctx->keymgmt != NULL
- && ctx->keymgmt->gen_settable_params != NULL) {
+ && ctx->keymgmt != NULL
+ && ctx->keymgmt->gen_settable_params != NULL) {
provctx = ossl_provider_ctx(EVP_KEYMGMT_get0_provider(ctx->keymgmt));
return ctx->keymgmt->gen_settable_params(ctx->op.keymgmt.genctx,
- provctx);
+ provctx);
}
if (EVP_PKEY_CTX_IS_KEM_OP(ctx)
&& ctx->op.encap.kem != NULL
&& ctx->op.encap.kem->settable_ctx_params != NULL) {
provctx = ossl_provider_ctx(EVP_KEM_get0_provider(ctx->op.encap.kem));
return ctx->op.encap.kem->settable_ctx_params(ctx->op.encap.algctx,
- provctx);
+ provctx);
}
return NULL;
}
@@ -881,11 +870,11 @@ int EVP_PKEY_CTX_get_signature_md(EVP_PKEY_CTX *ctx, const EVP_MD **md)
if (ctx->op.sig.algctx == NULL)
return EVP_PKEY_CTX_ctrl(ctx, -1, EVP_PKEY_OP_TYPE_SIG,
- EVP_PKEY_CTRL_GET_MD, 0, (void *)(md));
+ EVP_PKEY_CTRL_GET_MD, 0, (void *)(md));
*p++ = OSSL_PARAM_construct_utf8_string(OSSL_SIGNATURE_PARAM_DIGEST,
- name,
- sizeof(name));
+ name,
+ sizeof(name));
*p = OSSL_PARAM_construct_end();
if (!EVP_PKEY_CTX_get_params(ctx, sig_md_params))
@@ -901,8 +890,8 @@ int EVP_PKEY_CTX_get_signature_md(EVP_PKEY_CTX *ctx, const EVP_MD **md)
}
static int evp_pkey_ctx_set_md(EVP_PKEY_CTX *ctx, const EVP_MD *md,
- int fallback, const char *param, int op,
- int ctrl)
+ int fallback, const char *param, int op,
+ int ctrl)
{
OSSL_PARAM md_params[2], *p = md_params;
const char *name;
@@ -923,11 +912,11 @@ static int evp_pkey_ctx_set_md(EVP_PKEY_CTX *ctx, const EVP_MD *md,
}
*p++ = OSSL_PARAM_construct_utf8_string(param,
- /*
- * Cast away the const. This is read
- * only so should be safe
- */
- (char *)name, 0);
+ /*
+ * Cast away the const. This is read
+ * only so should be safe
+ */
+ (char *)name, 0);
*p = OSSL_PARAM_construct_end();
return EVP_PKEY_CTX_set_params(ctx, md_params);
@@ -936,21 +925,21 @@ static int evp_pkey_ctx_set_md(EVP_PKEY_CTX *ctx, const EVP_MD *md,
int EVP_PKEY_CTX_set_signature_md(EVP_PKEY_CTX *ctx, const EVP_MD *md)
{
return evp_pkey_ctx_set_md(ctx, md, ctx->op.sig.algctx == NULL,
- OSSL_SIGNATURE_PARAM_DIGEST,
- EVP_PKEY_OP_TYPE_SIG, EVP_PKEY_CTRL_MD);
+ OSSL_SIGNATURE_PARAM_DIGEST,
+ EVP_PKEY_OP_TYPE_SIG, EVP_PKEY_CTRL_MD);
}
int EVP_PKEY_CTX_set_tls1_prf_md(EVP_PKEY_CTX *ctx, const EVP_MD *md)
{
return evp_pkey_ctx_set_md(ctx, md, ctx->op.kex.algctx == NULL,
- OSSL_KDF_PARAM_DIGEST,
- EVP_PKEY_OP_DERIVE, EVP_PKEY_CTRL_TLS_MD);
+ OSSL_KDF_PARAM_DIGEST,
+ EVP_PKEY_OP_DERIVE, EVP_PKEY_CTRL_TLS_MD);
}
static int evp_pkey_ctx_set1_octet_string(EVP_PKEY_CTX *ctx, int fallback,
- const char *param, int op, int ctrl,
- const unsigned char *data,
- int datalen)
+ const char *param, int op, int ctrl,
+ const unsigned char *data,
+ int datalen)
{
OSSL_PARAM octet_string_params[2], *p = octet_string_params;
@@ -971,21 +960,21 @@ static int evp_pkey_ctx_set1_octet_string(EVP_PKEY_CTX *ctx, int fallback,
}
*p++ = OSSL_PARAM_construct_octet_string(param,
- /*
- * Cast away the const. This is read
- * only so should be safe
- */
- (unsigned char *)data,
- (size_t)datalen);
+ /*
+ * Cast away the const. This is read
+ * only so should be safe
+ */
+ (unsigned char *)data,
+ (size_t)datalen);
*p = OSSL_PARAM_construct_end();
return EVP_PKEY_CTX_set_params(ctx, octet_string_params);
}
static int evp_pkey_ctx_add1_octet_string(EVP_PKEY_CTX *ctx, int fallback,
- const char *param, int op, int ctrl,
- const unsigned char *data,
- int datalen)
+ const char *param, int op, int ctrl,
+ const unsigned char *data,
+ int datalen)
{
OSSL_PARAM os_params[2];
const OSSL_PARAM *gettables;
@@ -1016,7 +1005,7 @@ static int evp_pkey_ctx_add1_octet_string(EVP_PKEY_CTX *ctx, int fallback,
gettables = EVP_PKEY_CTX_gettable_params(ctx);
if (gettables == NULL || OSSL_PARAM_locate_const(gettables, param) == NULL)
return evp_pkey_ctx_set1_octet_string(ctx, fallback, param, op, ctrl,
- data, datalen);
+ data, datalen);
/* Get the original value length */
os_params[0] = OSSL_PARAM_construct_octet_string(param, NULL, 0);
@@ -1049,66 +1038,66 @@ static int evp_pkey_ctx_add1_octet_string(EVP_PKEY_CTX *ctx, int fallback,
memcpy(&info[info_len], data, datalen);
ret = EVP_PKEY_CTX_set_params(ctx, os_params);
- error:
+error:
OPENSSL_clear_free(info, info_alloc);
return ret;
}
int EVP_PKEY_CTX_set1_tls1_prf_secret(EVP_PKEY_CTX *ctx,
- const unsigned char *sec, int seclen)
+ const unsigned char *sec, int seclen)
{
return evp_pkey_ctx_set1_octet_string(ctx, ctx->op.kex.algctx == NULL,
- OSSL_KDF_PARAM_SECRET,
- EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_TLS_SECRET,
- sec, seclen);
+ OSSL_KDF_PARAM_SECRET,
+ EVP_PKEY_OP_DERIVE,
+ EVP_PKEY_CTRL_TLS_SECRET,
+ sec, seclen);
}
int EVP_PKEY_CTX_add1_tls1_prf_seed(EVP_PKEY_CTX *ctx,
- const unsigned char *seed, int seedlen)
+ const unsigned char *seed, int seedlen)
{
return evp_pkey_ctx_set1_octet_string(ctx, ctx->op.kex.algctx == NULL,
- OSSL_KDF_PARAM_SEED,
- EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_TLS_SEED,
- seed, seedlen);
+ OSSL_KDF_PARAM_SEED,
+ EVP_PKEY_OP_DERIVE,
+ EVP_PKEY_CTRL_TLS_SEED,
+ seed, seedlen);
}
int EVP_PKEY_CTX_set_hkdf_md(EVP_PKEY_CTX *ctx, const EVP_MD *md)
{
return evp_pkey_ctx_set_md(ctx, md, ctx->op.kex.algctx == NULL,
- OSSL_KDF_PARAM_DIGEST,
- EVP_PKEY_OP_DERIVE, EVP_PKEY_CTRL_HKDF_MD);
+ OSSL_KDF_PARAM_DIGEST,
+ EVP_PKEY_OP_DERIVE, EVP_PKEY_CTRL_HKDF_MD);
}
int EVP_PKEY_CTX_set1_hkdf_salt(EVP_PKEY_CTX *ctx,
- const unsigned char *salt, int saltlen)
+ const unsigned char *salt, int saltlen)
{
return evp_pkey_ctx_set1_octet_string(ctx, ctx->op.kex.algctx == NULL,
- OSSL_KDF_PARAM_SALT,
- EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_HKDF_SALT,
- salt, saltlen);
+ OSSL_KDF_PARAM_SALT,
+ EVP_PKEY_OP_DERIVE,
+ EVP_PKEY_CTRL_HKDF_SALT,
+ salt, saltlen);
}
int EVP_PKEY_CTX_set1_hkdf_key(EVP_PKEY_CTX *ctx,
- const unsigned char *key, int keylen)
+ const unsigned char *key, int keylen)
{
return evp_pkey_ctx_set1_octet_string(ctx, ctx->op.kex.algctx == NULL,
- OSSL_KDF_PARAM_KEY,
- EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_HKDF_KEY,
- key, keylen);
+ OSSL_KDF_PARAM_KEY,
+ EVP_PKEY_OP_DERIVE,
+ EVP_PKEY_CTRL_HKDF_KEY,
+ key, keylen);
}
int EVP_PKEY_CTX_add1_hkdf_info(EVP_PKEY_CTX *ctx,
- const unsigned char *info, int infolen)
+ const unsigned char *info, int infolen)
{
return evp_pkey_ctx_add1_octet_string(ctx, ctx->op.kex.algctx == NULL,
- OSSL_KDF_PARAM_INFO,
- EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_HKDF_INFO,
- info, infolen);
+ OSSL_KDF_PARAM_INFO,
+ EVP_PKEY_OP_DERIVE,
+ EVP_PKEY_CTRL_HKDF_INFO,
+ info, infolen);
}
int EVP_PKEY_CTX_set_hkdf_mode(EVP_PKEY_CTX *ctx, int mode)
@@ -1124,7 +1113,7 @@ int EVP_PKEY_CTX_set_hkdf_mode(EVP_PKEY_CTX *ctx, int mode)
/* Code below to be removed when legacy support is dropped. */
if (ctx->op.kex.algctx == NULL)
return EVP_PKEY_CTX_ctrl(ctx, -1, EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_HKDF_MODE, mode, NULL);
+ EVP_PKEY_CTRL_HKDF_MODE, mode, NULL);
/* end of legacy support */
if (mode < 0) {
@@ -1139,27 +1128,27 @@ int EVP_PKEY_CTX_set_hkdf_mode(EVP_PKEY_CTX *ctx, int mode)
}
int EVP_PKEY_CTX_set1_pbe_pass(EVP_PKEY_CTX *ctx, const char *pass,
- int passlen)
+ int passlen)
{
return evp_pkey_ctx_set1_octet_string(ctx, ctx->op.kex.algctx == NULL,
- OSSL_KDF_PARAM_PASSWORD,
- EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_PASS,
- (const unsigned char *)pass, passlen);
+ OSSL_KDF_PARAM_PASSWORD,
+ EVP_PKEY_OP_DERIVE,
+ EVP_PKEY_CTRL_PASS,
+ (const unsigned char *)pass, passlen);
}
int EVP_PKEY_CTX_set1_scrypt_salt(EVP_PKEY_CTX *ctx,
- const unsigned char *salt, int saltlen)
+ const unsigned char *salt, int saltlen)
{
return evp_pkey_ctx_set1_octet_string(ctx, ctx->op.kex.algctx == NULL,
- OSSL_KDF_PARAM_SALT,
- EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_SCRYPT_SALT,
- salt, saltlen);
+ OSSL_KDF_PARAM_SALT,
+ EVP_PKEY_OP_DERIVE,
+ EVP_PKEY_CTRL_SCRYPT_SALT,
+ salt, saltlen);
}
static int evp_pkey_ctx_set_uint64(EVP_PKEY_CTX *ctx, const char *param,
- int op, int ctrl, uint64_t val)
+ int op, int ctrl, uint64_t val)
{
OSSL_PARAM uint64_params[2], *p = uint64_params;
@@ -1183,41 +1172,41 @@ static int evp_pkey_ctx_set_uint64(EVP_PKEY_CTX *ctx, const char *param,
int EVP_PKEY_CTX_set_scrypt_N(EVP_PKEY_CTX *ctx, uint64_t n)
{
return evp_pkey_ctx_set_uint64(ctx, OSSL_KDF_PARAM_SCRYPT_N,
- EVP_PKEY_OP_DERIVE, EVP_PKEY_CTRL_SCRYPT_N,
- n);
+ EVP_PKEY_OP_DERIVE, EVP_PKEY_CTRL_SCRYPT_N,
+ n);
}
int EVP_PKEY_CTX_set_scrypt_r(EVP_PKEY_CTX *ctx, uint64_t r)
{
return evp_pkey_ctx_set_uint64(ctx, OSSL_KDF_PARAM_SCRYPT_R,
- EVP_PKEY_OP_DERIVE, EVP_PKEY_CTRL_SCRYPT_R,
- r);
+ EVP_PKEY_OP_DERIVE, EVP_PKEY_CTRL_SCRYPT_R,
+ r);
}
int EVP_PKEY_CTX_set_scrypt_p(EVP_PKEY_CTX *ctx, uint64_t p)
{
return evp_pkey_ctx_set_uint64(ctx, OSSL_KDF_PARAM_SCRYPT_P,
- EVP_PKEY_OP_DERIVE, EVP_PKEY_CTRL_SCRYPT_P,
- p);
+ EVP_PKEY_OP_DERIVE, EVP_PKEY_CTRL_SCRYPT_P,
+ p);
}
int EVP_PKEY_CTX_set_scrypt_maxmem_bytes(EVP_PKEY_CTX *ctx,
- uint64_t maxmem_bytes)
+ uint64_t maxmem_bytes)
{
return evp_pkey_ctx_set_uint64(ctx, OSSL_KDF_PARAM_SCRYPT_MAXMEM,
- EVP_PKEY_OP_DERIVE,
- EVP_PKEY_CTRL_SCRYPT_MAXMEM_BYTES,
- maxmem_bytes);
+ EVP_PKEY_OP_DERIVE,
+ EVP_PKEY_CTRL_SCRYPT_MAXMEM_BYTES,
+ maxmem_bytes);
}
int EVP_PKEY_CTX_set_mac_key(EVP_PKEY_CTX *ctx, const unsigned char *key,
- int keylen)
+ int keylen)
{
return evp_pkey_ctx_set1_octet_string(ctx, ctx->op.keymgmt.genctx == NULL,
- OSSL_PKEY_PARAM_PRIV_KEY,
- EVP_PKEY_OP_KEYGEN,
- EVP_PKEY_CTRL_SET_MAC_KEY,
- key, keylen);
+ OSSL_PKEY_PARAM_PRIV_KEY,
+ EVP_PKEY_OP_KEYGEN,
+ EVP_PKEY_CTRL_SET_MAC_KEY,
+ key, keylen);
}
int EVP_PKEY_CTX_set_kem_op(EVP_PKEY_CTX *ctx, const char *op)
@@ -1233,7 +1222,7 @@ int EVP_PKEY_CTX_set_kem_op(EVP_PKEY_CTX *ctx, const char *op)
return -2;
}
*p++ = OSSL_PARAM_construct_utf8_string(OSSL_KEM_PARAM_OPERATION,
- (char *)op, 0);
+ (char *)op, 0);
*p = OSSL_PARAM_construct_end();
return EVP_PKEY_CTX_set_params(ctx, params);
}
@@ -1241,22 +1230,22 @@ int EVP_PKEY_CTX_set_kem_op(EVP_PKEY_CTX *ctx, const char *op)
int EVP_PKEY_CTX_set1_id(EVP_PKEY_CTX *ctx, const void *id, int len)
{
return EVP_PKEY_CTX_ctrl(ctx, -1, -1,
- EVP_PKEY_CTRL_SET1_ID, (int)len, (void*)(id));
+ EVP_PKEY_CTRL_SET1_ID, (int)len, (void *)(id));
}
int EVP_PKEY_CTX_get1_id(EVP_PKEY_CTX *ctx, void *id)
{
- return EVP_PKEY_CTX_ctrl(ctx, -1, -1, EVP_PKEY_CTRL_GET1_ID, 0, (void*)id);
+ return EVP_PKEY_CTX_ctrl(ctx, -1, -1, EVP_PKEY_CTRL_GET1_ID, 0, (void *)id);
}
int EVP_PKEY_CTX_get1_id_len(EVP_PKEY_CTX *ctx, size_t *id_len)
{
return EVP_PKEY_CTX_ctrl(ctx, -1, -1,
- EVP_PKEY_CTRL_GET1_ID_LEN, 0, (void*)id_len);
+ EVP_PKEY_CTRL_GET1_ID_LEN, 0, (void *)id_len);
}
static int evp_pkey_ctx_ctrl_int(EVP_PKEY_CTX *ctx, int keytype, int optype,
- int cmd, int p1, void *p2)
+ int cmd, int p1, void *p2)
{
int ret = 0;
@@ -1299,7 +1288,7 @@ static int evp_pkey_ctx_ctrl_int(EVP_PKEY_CTX *ctx, int keytype, int optype,
}
int EVP_PKEY_CTX_ctrl(EVP_PKEY_CTX *ctx, int keytype, int optype,
- int cmd, int p1, void *p2)
+ int cmd, int p1, void *p2)
{
int ret = 0;
@@ -1310,7 +1299,7 @@ int EVP_PKEY_CTX_ctrl(EVP_PKEY_CTX *ctx, int keytype, int optype,
/* If unsupported, we don't want that reported here */
ERR_set_mark();
ret = evp_pkey_ctx_store_cached_data(ctx, keytype, optype,
- cmd, NULL, p2, p1);
+ cmd, NULL, p2, p1);
if (ret == -2) {
ERR_pop_to_mark();
} else {
@@ -1327,14 +1316,13 @@ int EVP_PKEY_CTX_ctrl(EVP_PKEY_CTX *ctx, int keytype, int optype,
}
int EVP_PKEY_CTX_ctrl_uint64(EVP_PKEY_CTX *ctx, int keytype, int optype,
- int cmd, uint64_t value)
+ int cmd, uint64_t value)
{
return EVP_PKEY_CTX_ctrl(ctx, keytype, optype, cmd, 0, &value);
}
-
static int evp_pkey_ctx_ctrl_str_int(EVP_PKEY_CTX *ctx,
- const char *name, const char *value)
+ const char *name, const char *value)
{
int ret = 0;
@@ -1354,8 +1342,8 @@ static int evp_pkey_ctx_ctrl_str_int(EVP_PKEY_CTX *ctx,
}
if (strcmp(name, "digest") == 0)
ret = EVP_PKEY_CTX_md(ctx,
- EVP_PKEY_OP_TYPE_SIG | EVP_PKEY_OP_TYPE_CRYPT,
- EVP_PKEY_CTRL_MD, value);
+ EVP_PKEY_OP_TYPE_SIG | EVP_PKEY_OP_TYPE_CRYPT,
+ EVP_PKEY_CTRL_MD, value);
else
ret = ctx->pmeth->ctrl_str(ctx, name, value);
break;
@@ -1365,14 +1353,14 @@ static int evp_pkey_ctx_ctrl_str_int(EVP_PKEY_CTX *ctx,
}
int EVP_PKEY_CTX_ctrl_str(EVP_PKEY_CTX *ctx,
- const char *name, const char *value)
+ const char *name, const char *value)
{
int ret = 0;
/* If unsupported, we don't want that reported here */
ERR_set_mark();
ret = evp_pkey_ctx_store_cached_data(ctx, -1, -1, -1,
- name, value, strlen(value) + 1);
+ name, value, strlen(value) + 1);
if (ret == -2) {
ERR_pop_to_mark();
} else {
@@ -1406,9 +1394,9 @@ static int decode_cmd(int cmd, const char *name)
}
static int evp_pkey_ctx_store_cached_data(EVP_PKEY_CTX *ctx,
- int keytype, int optype,
- int cmd, const char *name,
- const void *data, size_t data_len)
+ int keytype, int optype,
+ int cmd, const char *name,
+ const void *data, size_t data_len)
{
/*
* Check that it's one of the supported commands. The ctrl commands
@@ -1431,7 +1419,7 @@ static int evp_pkey_ctx_store_cached_data(EVP_PKEY_CTX *ctx,
return -2;
}
if (!EVP_KEYMGMT_is_a(ctx->keymgmt,
- evp_pkey_type2name(keytype))) {
+ evp_pkey_type2name(keytype))) {
ERR_raise(ERR_LIB_EVP, EVP_R_INVALID_OPERATION);
return -1;
}
@@ -1475,7 +1463,7 @@ static int evp_pkey_ctx_store_cached_data(EVP_PKEY_CTX *ctx,
}
static void evp_pkey_ctx_free_cached_data(EVP_PKEY_CTX *ctx,
- int cmd, const char *name)
+ int cmd, const char *name)
{
cmd = decode_cmd(cmd, name);
switch (cmd) {
@@ -1506,8 +1494,8 @@ int evp_pkey_ctx_use_cached_data(EVP_PKEY_CTX *ctx)
ret = evp_pkey_ctx_ctrl_str_int(ctx, name, val);
else
ret = evp_pkey_ctx_ctrl_int(ctx, -1, ctx->operation,
- EVP_PKEY_CTRL_SET1_ID,
- (int)len, (void *)val);
+ EVP_PKEY_CTRL_SET1_ID,
+ (int)len, (void *)val);
}
return ret;
@@ -1626,213 +1614,212 @@ void *EVP_PKEY_CTX_get_app_data(EVP_PKEY_CTX *ctx)
}
void EVP_PKEY_meth_set_init(EVP_PKEY_METHOD *pmeth,
- int (*init) (EVP_PKEY_CTX *ctx))
+ int (*init)(EVP_PKEY_CTX *ctx))
{
pmeth->init = init;
}
void EVP_PKEY_meth_set_copy(EVP_PKEY_METHOD *pmeth,
- int (*copy) (EVP_PKEY_CTX *dst,
- const EVP_PKEY_CTX *src))
+ int (*copy)(EVP_PKEY_CTX *dst,
+ const EVP_PKEY_CTX *src))
{
pmeth->copy = copy;
}
void EVP_PKEY_meth_set_cleanup(EVP_PKEY_METHOD *pmeth,
- void (*cleanup) (EVP_PKEY_CTX *ctx))
+ void (*cleanup)(EVP_PKEY_CTX *ctx))
{
pmeth->cleanup = cleanup;
}
void EVP_PKEY_meth_set_paramgen(EVP_PKEY_METHOD *pmeth,
- int (*paramgen_init) (EVP_PKEY_CTX *ctx),
- int (*paramgen) (EVP_PKEY_CTX *ctx,
- EVP_PKEY *pkey))
+ int (*paramgen_init)(EVP_PKEY_CTX *ctx),
+ int (*paramgen)(EVP_PKEY_CTX *ctx,
+ EVP_PKEY *pkey))
{
pmeth->paramgen_init = paramgen_init;
pmeth->paramgen = paramgen;
}
void EVP_PKEY_meth_set_keygen(EVP_PKEY_METHOD *pmeth,
- int (*keygen_init) (EVP_PKEY_CTX *ctx),
- int (*keygen) (EVP_PKEY_CTX *ctx,
- EVP_PKEY *pkey))
+ int (*keygen_init)(EVP_PKEY_CTX *ctx),
+ int (*keygen)(EVP_PKEY_CTX *ctx,
+ EVP_PKEY *pkey))
{
pmeth->keygen_init = keygen_init;
pmeth->keygen = keygen;
}
void EVP_PKEY_meth_set_sign(EVP_PKEY_METHOD *pmeth,
- int (*sign_init) (EVP_PKEY_CTX *ctx),
- int (*sign) (EVP_PKEY_CTX *ctx,
- unsigned char *sig, size_t *siglen,
- const unsigned char *tbs,
- size_t tbslen))
+ int (*sign_init)(EVP_PKEY_CTX *ctx),
+ int (*sign)(EVP_PKEY_CTX *ctx,
+ unsigned char *sig, size_t *siglen,
+ const unsigned char *tbs,
+ size_t tbslen))
{
pmeth->sign_init = sign_init;
pmeth->sign = sign;
}
void EVP_PKEY_meth_set_verify(EVP_PKEY_METHOD *pmeth,
- int (*verify_init) (EVP_PKEY_CTX *ctx),
- int (*verify) (EVP_PKEY_CTX *ctx,
- const unsigned char *sig,
- size_t siglen,
- const unsigned char *tbs,
- size_t tbslen))
+ int (*verify_init)(EVP_PKEY_CTX *ctx),
+ int (*verify)(EVP_PKEY_CTX *ctx,
+ const unsigned char *sig,
+ size_t siglen,
+ const unsigned char *tbs,
+ size_t tbslen))
{
pmeth->verify_init = verify_init;
pmeth->verify = verify;
}
void EVP_PKEY_meth_set_verify_recover(EVP_PKEY_METHOD *pmeth,
- int (*verify_recover_init) (EVP_PKEY_CTX
- *ctx),
- int (*verify_recover) (EVP_PKEY_CTX
- *ctx,
- unsigned char
- *sig,
- size_t *siglen,
- const unsigned
- char *tbs,
- size_t tbslen))
+ int (*verify_recover_init)(EVP_PKEY_CTX
+ *ctx),
+ int (*verify_recover)(EVP_PKEY_CTX
+ *ctx,
+ unsigned char
+ *sig,
+ size_t *siglen,
+ const unsigned char *tbs,
+ size_t tbslen))
{
pmeth->verify_recover_init = verify_recover_init;
pmeth->verify_recover = verify_recover;
}
void EVP_PKEY_meth_set_signctx(EVP_PKEY_METHOD *pmeth,
- int (*signctx_init) (EVP_PKEY_CTX *ctx,
- EVP_MD_CTX *mctx),
- int (*signctx) (EVP_PKEY_CTX *ctx,
- unsigned char *sig,
- size_t *siglen,
- EVP_MD_CTX *mctx))
+ int (*signctx_init)(EVP_PKEY_CTX *ctx,
+ EVP_MD_CTX *mctx),
+ int (*signctx)(EVP_PKEY_CTX *ctx,
+ unsigned char *sig,
+ size_t *siglen,
+ EVP_MD_CTX *mctx))
{
pmeth->signctx_init = signctx_init;
pmeth->signctx = signctx;
}
void EVP_PKEY_meth_set_verifyctx(EVP_PKEY_METHOD *pmeth,
- int (*verifyctx_init) (EVP_PKEY_CTX *ctx,
- EVP_MD_CTX *mctx),
- int (*verifyctx) (EVP_PKEY_CTX *ctx,
- const unsigned char *sig,
- int siglen,
- EVP_MD_CTX *mctx))
+ int (*verifyctx_init)(EVP_PKEY_CTX *ctx,
+ EVP_MD_CTX *mctx),
+ int (*verifyctx)(EVP_PKEY_CTX *ctx,
+ const unsigned char *sig,
+ int siglen,
+ EVP_MD_CTX *mctx))
{
pmeth->verifyctx_init = verifyctx_init;
pmeth->verifyctx = verifyctx;
}
void EVP_PKEY_meth_set_encrypt(EVP_PKEY_METHOD *pmeth,
- int (*encrypt_init) (EVP_PKEY_CTX *ctx),
- int (*encryptfn) (EVP_PKEY_CTX *ctx,
- unsigned char *out,
- size_t *outlen,
- const unsigned char *in,
- size_t inlen))
+ int (*encrypt_init)(EVP_PKEY_CTX *ctx),
+ int (*encryptfn)(EVP_PKEY_CTX *ctx,
+ unsigned char *out,
+ size_t *outlen,
+ const unsigned char *in,
+ size_t inlen))
{
pmeth->encrypt_init = encrypt_init;
pmeth->encrypt = encryptfn;
}
void EVP_PKEY_meth_set_decrypt(EVP_PKEY_METHOD *pmeth,
- int (*decrypt_init) (EVP_PKEY_CTX *ctx),
- int (*decrypt) (EVP_PKEY_CTX *ctx,
- unsigned char *out,
- size_t *outlen,
- const unsigned char *in,
- size_t inlen))
+ int (*decrypt_init)(EVP_PKEY_CTX *ctx),
+ int (*decrypt)(EVP_PKEY_CTX *ctx,
+ unsigned char *out,
+ size_t *outlen,
+ const unsigned char *in,
+ size_t inlen))
{
pmeth->decrypt_init = decrypt_init;
pmeth->decrypt = decrypt;
}
void EVP_PKEY_meth_set_derive(EVP_PKEY_METHOD *pmeth,
- int (*derive_init) (EVP_PKEY_CTX *ctx),
- int (*derive) (EVP_PKEY_CTX *ctx,
- unsigned char *key,
- size_t *keylen))
+ int (*derive_init)(EVP_PKEY_CTX *ctx),
+ int (*derive)(EVP_PKEY_CTX *ctx,
+ unsigned char *key,
+ size_t *keylen))
{
pmeth->derive_init = derive_init;
pmeth->derive = derive;
}
void EVP_PKEY_meth_set_ctrl(EVP_PKEY_METHOD *pmeth,
- int (*ctrl) (EVP_PKEY_CTX *ctx, int type, int p1,
- void *p2),
- int (*ctrl_str) (EVP_PKEY_CTX *ctx,
- const char *type,
- const char *value))
+ int (*ctrl)(EVP_PKEY_CTX *ctx, int type, int p1,
+ void *p2),
+ int (*ctrl_str)(EVP_PKEY_CTX *ctx,
+ const char *type,
+ const char *value))
{
pmeth->ctrl = ctrl;
pmeth->ctrl_str = ctrl_str;
}
void EVP_PKEY_meth_set_digestsign(EVP_PKEY_METHOD *pmeth,
- int (*digestsign) (EVP_MD_CTX *ctx, unsigned char *sig, size_t *siglen,
- const unsigned char *tbs, size_t tbslen))
+ int (*digestsign)(EVP_MD_CTX *ctx, unsigned char *sig, size_t *siglen,
+ const unsigned char *tbs, size_t tbslen))
{
pmeth->digestsign = digestsign;
}
void EVP_PKEY_meth_set_digestverify(EVP_PKEY_METHOD *pmeth,
- int (*digestverify) (EVP_MD_CTX *ctx, const unsigned char *sig,
- size_t siglen, const unsigned char *tbs,
- size_t tbslen))
+ int (*digestverify)(EVP_MD_CTX *ctx, const unsigned char *sig,
+ size_t siglen, const unsigned char *tbs,
+ size_t tbslen))
{
pmeth->digestverify = digestverify;
}
void EVP_PKEY_meth_set_check(EVP_PKEY_METHOD *pmeth,
- int (*check) (EVP_PKEY *pkey))
+ int (*check)(EVP_PKEY *pkey))
{
pmeth->check = check;
}
void EVP_PKEY_meth_set_public_check(EVP_PKEY_METHOD *pmeth,
- int (*check) (EVP_PKEY *pkey))
+ int (*check)(EVP_PKEY *pkey))
{
pmeth->public_check = check;
}
void EVP_PKEY_meth_set_param_check(EVP_PKEY_METHOD *pmeth,
- int (*check) (EVP_PKEY *pkey))
+ int (*check)(EVP_PKEY *pkey))
{
pmeth->param_check = check;
}
void EVP_PKEY_meth_set_digest_custom(EVP_PKEY_METHOD *pmeth,
- int (*digest_custom) (EVP_PKEY_CTX *ctx,
- EVP_MD_CTX *mctx))
+ int (*digest_custom)(EVP_PKEY_CTX *ctx,
+ EVP_MD_CTX *mctx))
{
pmeth->digest_custom = digest_custom;
}
void EVP_PKEY_meth_get_init(const EVP_PKEY_METHOD *pmeth,
- int (**pinit) (EVP_PKEY_CTX *ctx))
+ int (**pinit)(EVP_PKEY_CTX *ctx))
{
*pinit = pmeth->init;
}
void EVP_PKEY_meth_get_copy(const EVP_PKEY_METHOD *pmeth,
- int (**pcopy) (EVP_PKEY_CTX *dst,
- const EVP_PKEY_CTX *src))
+ int (**pcopy)(EVP_PKEY_CTX *dst,
+ const EVP_PKEY_CTX *src))
{
*pcopy = pmeth->copy;
}
void EVP_PKEY_meth_get_cleanup(const EVP_PKEY_METHOD *pmeth,
- void (**pcleanup) (EVP_PKEY_CTX *ctx))
+ void (**pcleanup)(EVP_PKEY_CTX *ctx))
{
*pcleanup = pmeth->cleanup;
}
void EVP_PKEY_meth_get_paramgen(const EVP_PKEY_METHOD *pmeth,
- int (**pparamgen_init) (EVP_PKEY_CTX *ctx),
- int (**pparamgen) (EVP_PKEY_CTX *ctx,
- EVP_PKEY *pkey))
+ int (**pparamgen_init)(EVP_PKEY_CTX *ctx),
+ int (**pparamgen)(EVP_PKEY_CTX *ctx,
+ EVP_PKEY *pkey))
{
if (pparamgen_init)
*pparamgen_init = pmeth->paramgen_init;
@@ -1841,9 +1828,9 @@ void EVP_PKEY_meth_get_paramgen(const EVP_PKEY_METHOD *pmeth,
}
void EVP_PKEY_meth_get_keygen(const EVP_PKEY_METHOD *pmeth,
- int (**pkeygen_init) (EVP_PKEY_CTX *ctx),
- int (**pkeygen) (EVP_PKEY_CTX *ctx,
- EVP_PKEY *pkey))
+ int (**pkeygen_init)(EVP_PKEY_CTX *ctx),
+ int (**pkeygen)(EVP_PKEY_CTX *ctx,
+ EVP_PKEY *pkey))
{
if (pkeygen_init)
*pkeygen_init = pmeth->keygen_init;
@@ -1852,11 +1839,11 @@ void EVP_PKEY_meth_get_keygen(const EVP_PKEY_METHOD *pmeth,
}
void EVP_PKEY_meth_get_sign(const EVP_PKEY_METHOD *pmeth,
- int (**psign_init) (EVP_PKEY_CTX *ctx),
- int (**psign) (EVP_PKEY_CTX *ctx,
- unsigned char *sig, size_t *siglen,
- const unsigned char *tbs,
- size_t tbslen))
+ int (**psign_init)(EVP_PKEY_CTX *ctx),
+ int (**psign)(EVP_PKEY_CTX *ctx,
+ unsigned char *sig, size_t *siglen,
+ const unsigned char *tbs,
+ size_t tbslen))
{
if (psign_init)
*psign_init = pmeth->sign_init;
@@ -1865,12 +1852,12 @@ void EVP_PKEY_meth_get_sign(const EVP_PKEY_METHOD *pmeth,
}
void EVP_PKEY_meth_get_verify(const EVP_PKEY_METHOD *pmeth,
- int (**pverify_init) (EVP_PKEY_CTX *ctx),
- int (**pverify) (EVP_PKEY_CTX *ctx,
- const unsigned char *sig,
- size_t siglen,
- const unsigned char *tbs,
- size_t tbslen))
+ int (**pverify_init)(EVP_PKEY_CTX *ctx),
+ int (**pverify)(EVP_PKEY_CTX *ctx,
+ const unsigned char *sig,
+ size_t siglen,
+ const unsigned char *tbs,
+ size_t tbslen))
{
if (pverify_init)
*pverify_init = pmeth->verify_init;
@@ -1879,16 +1866,15 @@ void EVP_PKEY_meth_get_verify(const EVP_PKEY_METHOD *pmeth,
}
void EVP_PKEY_meth_get_verify_recover(const EVP_PKEY_METHOD *pmeth,
- int (**pverify_recover_init) (EVP_PKEY_CTX
- *ctx),
- int (**pverify_recover) (EVP_PKEY_CTX
- *ctx,
- unsigned char
- *sig,
- size_t *siglen,
- const unsigned
- char *tbs,
- size_t tbslen))
+ int (**pverify_recover_init)(EVP_PKEY_CTX
+ *ctx),
+ int (**pverify_recover)(EVP_PKEY_CTX
+ *ctx,
+ unsigned char
+ *sig,
+ size_t *siglen,
+ const unsigned char *tbs,
+ size_t tbslen))
{
if (pverify_recover_init)
*pverify_recover_init = pmeth->verify_recover_init;
@@ -1897,12 +1883,12 @@ void EVP_PKEY_meth_get_verify_recover(const EVP_PKEY_METHOD *pmeth,
}
void EVP_PKEY_meth_get_signctx(const EVP_PKEY_METHOD *pmeth,
- int (**psignctx_init) (EVP_PKEY_CTX *ctx,
- EVP_MD_CTX *mctx),
- int (**psignctx) (EVP_PKEY_CTX *ctx,
- unsigned char *sig,
- size_t *siglen,
- EVP_MD_CTX *mctx))
+ int (**psignctx_init)(EVP_PKEY_CTX *ctx,
+ EVP_MD_CTX *mctx),
+ int (**psignctx)(EVP_PKEY_CTX *ctx,
+ unsigned char *sig,
+ size_t *siglen,
+ EVP_MD_CTX *mctx))
{
if (psignctx_init)
*psignctx_init = pmeth->signctx_init;
@@ -1911,12 +1897,12 @@ void EVP_PKEY_meth_get_signctx(const EVP_PKEY_METHOD *pmeth,
}
void EVP_PKEY_meth_get_verifyctx(const EVP_PKEY_METHOD *pmeth,
- int (**pverifyctx_init) (EVP_PKEY_CTX *ctx,
- EVP_MD_CTX *mctx),
- int (**pverifyctx) (EVP_PKEY_CTX *ctx,
- const unsigned char *sig,
- int siglen,
- EVP_MD_CTX *mctx))
+ int (**pverifyctx_init)(EVP_PKEY_CTX *ctx,
+ EVP_MD_CTX *mctx),
+ int (**pverifyctx)(EVP_PKEY_CTX *ctx,
+ const unsigned char *sig,
+ int siglen,
+ EVP_MD_CTX *mctx))
{
if (pverifyctx_init)
*pverifyctx_init = pmeth->verifyctx_init;
@@ -1925,12 +1911,12 @@ void EVP_PKEY_meth_get_verifyctx(const EVP_PKEY_METHOD *pmeth,
}
void EVP_PKEY_meth_get_encrypt(const EVP_PKEY_METHOD *pmeth,
- int (**pencrypt_init) (EVP_PKEY_CTX *ctx),
- int (**pencryptfn) (EVP_PKEY_CTX *ctx,
- unsigned char *out,
- size_t *outlen,
- const unsigned char *in,
- size_t inlen))
+ int (**pencrypt_init)(EVP_PKEY_CTX *ctx),
+ int (**pencryptfn)(EVP_PKEY_CTX *ctx,
+ unsigned char *out,
+ size_t *outlen,
+ const unsigned char *in,
+ size_t inlen))
{
if (pencrypt_init)
*pencrypt_init = pmeth->encrypt_init;
@@ -1939,12 +1925,12 @@ void EVP_PKEY_meth_get_encrypt(const EVP_PKEY_METHOD *pmeth,
}
void EVP_PKEY_meth_get_decrypt(const EVP_PKEY_METHOD *pmeth,
- int (**pdecrypt_init) (EVP_PKEY_CTX *ctx),
- int (**pdecrypt) (EVP_PKEY_CTX *ctx,
- unsigned char *out,
- size_t *outlen,
- const unsigned char *in,
- size_t inlen))
+ int (**pdecrypt_init)(EVP_PKEY_CTX *ctx),
+ int (**pdecrypt)(EVP_PKEY_CTX *ctx,
+ unsigned char *out,
+ size_t *outlen,
+ const unsigned char *in,
+ size_t inlen))
{
if (pdecrypt_init)
*pdecrypt_init = pmeth->decrypt_init;
@@ -1953,10 +1939,10 @@ void EVP_PKEY_meth_get_decrypt(const EVP_PKEY_METHOD *pmeth,
}
void EVP_PKEY_meth_get_derive(const EVP_PKEY_METHOD *pmeth,
- int (**pderive_init) (EVP_PKEY_CTX *ctx),
- int (**pderive) (EVP_PKEY_CTX *ctx,
- unsigned char *key,
- size_t *keylen))
+ int (**pderive_init)(EVP_PKEY_CTX *ctx),
+ int (**pderive)(EVP_PKEY_CTX *ctx,
+ unsigned char *key,
+ size_t *keylen))
{
if (pderive_init)
*pderive_init = pmeth->derive_init;
@@ -1965,11 +1951,11 @@ void EVP_PKEY_meth_get_derive(const EVP_PKEY_METHOD *pmeth,
}
void EVP_PKEY_meth_get_ctrl(const EVP_PKEY_METHOD *pmeth,
- int (**pctrl) (EVP_PKEY_CTX *ctx, int type, int p1,
- void *p2),
- int (**pctrl_str) (EVP_PKEY_CTX *ctx,
- const char *type,
- const char *value))
+ int (**pctrl)(EVP_PKEY_CTX *ctx, int type, int p1,
+ void *p2),
+ int (**pctrl_str)(EVP_PKEY_CTX *ctx,
+ const char *type,
+ const char *value))
{
if (pctrl)
*pctrl = pmeth->ctrl;
@@ -1978,46 +1964,46 @@ void EVP_PKEY_meth_get_ctrl(const EVP_PKEY_METHOD *pmeth,
}
void EVP_PKEY_meth_get_digestsign(const EVP_PKEY_METHOD *pmeth,
- int (**digestsign) (EVP_MD_CTX *ctx, unsigned char *sig, size_t *siglen,
- const unsigned char *tbs, size_t tbslen))
+ int (**digestsign)(EVP_MD_CTX *ctx, unsigned char *sig, size_t *siglen,
+ const unsigned char *tbs, size_t tbslen))
{
if (digestsign)
*digestsign = pmeth->digestsign;
}
void EVP_PKEY_meth_get_digestverify(const EVP_PKEY_METHOD *pmeth,
- int (**digestverify) (EVP_MD_CTX *ctx, const unsigned char *sig,
- size_t siglen, const unsigned char *tbs,
- size_t tbslen))
+ int (**digestverify)(EVP_MD_CTX *ctx, const unsigned char *sig,
+ size_t siglen, const unsigned char *tbs,
+ size_t tbslen))
{
if (digestverify)
*digestverify = pmeth->digestverify;
}
void EVP_PKEY_meth_get_check(const EVP_PKEY_METHOD *pmeth,
- int (**pcheck) (EVP_PKEY *pkey))
+ int (**pcheck)(EVP_PKEY *pkey))
{
if (pcheck != NULL)
*pcheck = pmeth->check;
}
void EVP_PKEY_meth_get_public_check(const EVP_PKEY_METHOD *pmeth,
- int (**pcheck) (EVP_PKEY *pkey))
+ int (**pcheck)(EVP_PKEY *pkey))
{
if (pcheck != NULL)
*pcheck = pmeth->public_check;
}
void EVP_PKEY_meth_get_param_check(const EVP_PKEY_METHOD *pmeth,
- int (**pcheck) (EVP_PKEY *pkey))
+ int (**pcheck)(EVP_PKEY *pkey))
{
if (pcheck != NULL)
*pcheck = pmeth->param_check;
}
void EVP_PKEY_meth_get_digest_custom(const EVP_PKEY_METHOD *pmeth,
- int (**pdigest_custom) (EVP_PKEY_CTX *ctx,
- EVP_MD_CTX *mctx))
+ int (**pdigest_custom)(EVP_PKEY_CTX *ctx,
+ EVP_MD_CTX *mctx))
{
if (pdigest_custom != NULL)
*pdigest_custom = pmeth->digest_custom;
diff --git a/crypto/evp/s_lib.c b/crypto/evp/s_lib.c
index 50bbfe54d1..f4d26846c4 100644
--- a/crypto/evp/s_lib.c
+++ b/crypto/evp/s_lib.c
@@ -19,7 +19,7 @@
#include "evp_local.h"
int EVP_SKEY_export(const EVP_SKEY *skey, int selection,
- OSSL_CALLBACK *export_cb, void *export_cbarg)
+ OSSL_CALLBACK *export_cb, void *export_cbarg)
{
if (skey == NULL) {
ERR_raise(ERR_LIB_EVP, ERR_R_PASSED_NULL_PARAMETER);
@@ -54,7 +54,7 @@ EVP_SKEY *evp_skey_alloc(EVP_SKEYMGMT *skeymgmt)
goto err;
}
- err:
+err:
CRYPTO_FREE_REF(&skey->references);
CRYPTO_THREAD_lock_free(skey->lock);
OPENSSL_free(skey);
@@ -62,8 +62,8 @@ EVP_SKEY *evp_skey_alloc(EVP_SKEYMGMT *skeymgmt)
}
static EVP_SKEY *evp_skey_alloc_fetch(OSSL_LIB_CTX *libctx,
- const char *skeymgmtname,
- const char *propquery)
+ const char *skeymgmtname,
+ const char *propquery)
{
EVP_SKEYMGMT *skeymgmt;
EVP_SKEY *skey;
@@ -88,7 +88,7 @@ static EVP_SKEY *evp_skey_alloc_fetch(OSSL_LIB_CTX *libctx,
}
EVP_SKEY *EVP_SKEY_import(OSSL_LIB_CTX *libctx, const char *skeymgmtname, const char *propquery,
- int selection, const OSSL_PARAM *params)
+ int selection, const OSSL_PARAM *params)
{
EVP_SKEY *skey = evp_skey_alloc_fetch(libctx, skeymgmtname, propquery);
@@ -101,13 +101,13 @@ EVP_SKEY *EVP_SKEY_import(OSSL_LIB_CTX *libctx, const char *skeymgmtname, const
return skey;
- err:
+err:
EVP_SKEY_free(skey);
return NULL;
}
EVP_SKEY *EVP_SKEY_import_SKEYMGMT(OSSL_LIB_CTX *libctx, EVP_SKEYMGMT *skeymgmt,
- int selection, const OSSL_PARAM *params)
+ int selection, const OSSL_PARAM *params)
{
EVP_SKEY *skey = evp_skey_alloc(skeymgmt);
@@ -120,13 +120,13 @@ EVP_SKEY *EVP_SKEY_import_SKEYMGMT(OSSL_LIB_CTX *libctx, EVP_SKEYMGMT *skeymgmt,
return skey;
- err:
+err:
EVP_SKEY_free(skey);
return NULL;
}
EVP_SKEY *EVP_SKEY_generate(OSSL_LIB_CTX *libctx, const char *skeymgmtname,
- const char *propquery, const OSSL_PARAM *params)
+ const char *propquery, const OSSL_PARAM *params)
{
EVP_SKEY *skey = evp_skey_alloc_fetch(libctx, skeymgmtname, propquery);
@@ -139,7 +139,7 @@ EVP_SKEY *EVP_SKEY_generate(OSSL_LIB_CTX *libctx, const char *skeymgmtname,
return skey;
- err:
+err:
EVP_SKEY_free(skey);
return NULL;
}
@@ -161,7 +161,7 @@ static int get_secret_key(const OSSL_PARAM params[], void *arg)
}
int EVP_SKEY_get0_raw_key(const EVP_SKEY *skey, const unsigned char **key,
- size_t *len)
+ size_t *len)
{
struct raw_key_details_st raw_key;
@@ -174,22 +174,22 @@ int EVP_SKEY_get0_raw_key(const EVP_SKEY *skey, const unsigned char **key,
raw_key.len = len;
return evp_skeymgmt_export(skey->skeymgmt, skey->keydata,
- OSSL_SKEYMGMT_SELECT_SECRET_KEY,
- get_secret_key, &raw_key);
+ OSSL_SKEYMGMT_SELECT_SECRET_KEY,
+ get_secret_key, &raw_key);
}
EVP_SKEY *EVP_SKEY_import_raw_key(OSSL_LIB_CTX *libctx, const char *skeymgmtname,
- unsigned char *key, size_t keylen,
- const char *propquery)
+ unsigned char *key, size_t keylen,
+ const char *propquery)
{
OSSL_PARAM params[2];
params[0] = OSSL_PARAM_construct_octet_string(OSSL_SKEY_PARAM_RAW_BYTES,
- (void *)key, keylen);
+ (void *)key, keylen);
params[1] = OSSL_PARAM_construct_end();
return EVP_SKEY_import(libctx, skeymgmtname, propquery,
- OSSL_SKEYMGMT_SELECT_SECRET_KEY, params);
+ OSSL_SKEYMGMT_SELECT_SECRET_KEY, params);
}
int EVP_SKEY_up_ref(EVP_SKEY *skey)
@@ -242,7 +242,6 @@ const char *EVP_SKEY_get0_skeymgmt_name(const EVP_SKEY *skey)
return NULL;
return skey->skeymgmt->type_name;
-
}
const char *EVP_SKEY_get0_provider_name(const EVP_SKEY *skey)
@@ -276,7 +275,7 @@ static int transfer_cb(const OSSL_PARAM params[], void *arg)
}
EVP_SKEY *EVP_SKEY_to_provider(EVP_SKEY *skey, OSSL_LIB_CTX *libctx,
- OSSL_PROVIDER *prov, const char *propquery)
+ OSSL_PROVIDER *prov, const char *propquery)
{
struct transfer_cb_ctx ctx = { 0 };
EVP_SKEYMGMT *skeymgmt = NULL;
@@ -292,11 +291,11 @@ EVP_SKEY *EVP_SKEY_to_provider(EVP_SKEY *skey, OSSL_LIB_CTX *libctx,
skeymgmt = skey->skeymgmt;
else
skeymgmt = evp_skeymgmt_fetch_from_prov(prov, skey->skeymgmt->type_name,
- propquery);
+ propquery);
} else {
/* If no provider, get the default skeymgmt */
skeymgmt = EVP_SKEYMGMT_fetch(libctx, skey->skeymgmt->type_name,
- propquery);
+ propquery);
}
if (skeymgmt == NULL) {
ERR_raise(ERR_LIB_EVP, ERR_R_FETCH_FAILED);
@@ -329,7 +328,7 @@ EVP_SKEY *EVP_SKEY_to_provider(EVP_SKEY *skey, OSSL_LIB_CTX *libctx,
return ret;
- err:
+err:
EVP_SKEYMGMT_free(skeymgmt);
EVP_SKEY_free(ret);
return NULL;
diff --git a/crypto/evp/signature.c b/crypto/evp/signature.c
index 195d237802..c7fbb6e706 100644
--- a/crypto/evp/signature.c
+++ b/crypto/evp/signature.c
@@ -13,7 +13,7 @@
#include <openssl/core_names.h>
#include <openssl/objects.h>
#include <openssl/evp.h>
-#include "internal/numbers.h" /* includes SIZE_MAX */
+#include "internal/numbers.h" /* includes SIZE_MAX */
#include "internal/cryptlib.h"
#include "internal/provider.h"
#include "internal/core.h"
@@ -50,8 +50,8 @@ static EVP_SIGNATURE *evp_signature_new(OSSL_PROVIDER *prov)
}
static void *evp_signature_from_algorithm(int name_id,
- const OSSL_ALGORITHM *algodef,
- OSSL_PROVIDER *prov)
+ const OSSL_ALGORITHM *algodef,
+ OSSL_PROVIDER *prov)
{
const OSSL_DISPATCH *fns = algodef->implementation;
EVP_SIGNATURE *signature = NULL;
@@ -294,7 +294,7 @@ static void *evp_signature_from_algorithm(int name_id,
/* Start with the ones where counters say enough */
if (ctxfncnt != 2) {
ERR_raise_data(ERR_LIB_EVP, EVP_R_INVALID_PROVIDER_FUNCTIONS,
- "missing %s newctx or freectx:%s", signature->type_name, desc);
+ "missing %s newctx or freectx:%s", signature->type_name, desc);
valid = 0;
}
if (valid
@@ -308,26 +308,26 @@ static void *evp_signature_from_algorithm(int name_id,
* associated gettable, etc
*/
ERR_raise_data(ERR_LIB_EVP, EVP_R_INVALID_PROVIDER_FUNCTIONS,
- "missing %s params getter or setter:%s", signature->type_name, desc);
+ "missing %s params getter or setter:%s", signature->type_name, desc);
valid = 0;
}
if (valid && initfncnt == 0) {
ERR_raise_data(ERR_LIB_EVP, EVP_R_INVALID_PROVIDER_FUNCTIONS,
- "missing %s init:%s", signature->type_name, desc);
+ "missing %s init:%s", signature->type_name, desc);
valid = 0;
}
/* Now we check for function combinations */
if (valid
&& ((signature->sign_init != NULL
- && signature->sign == NULL)
+ && signature->sign == NULL)
|| (signature->sign_message_init != NULL
&& signature->sign == NULL
&& (signature->sign_message_update == NULL
|| signature->sign_message_final == NULL)))) {
/* sign_init function(s) with no signing function? That's weird */
ERR_raise_data(ERR_LIB_EVP, EVP_R_INVALID_PROVIDER_FUNCTIONS,
- "missing %s signing function:%s", signature->type_name, desc);
+ "missing %s signing function:%s", signature->type_name, desc);
valid = 0;
}
if (valid
@@ -338,20 +338,20 @@ static void *evp_signature_from_algorithm(int name_id,
&& signature->sign_message_init == NULL) {
/* signing function(s) with no sign_init? That's odd */
ERR_raise_data(ERR_LIB_EVP, EVP_R_INVALID_PROVIDER_FUNCTIONS,
- "missing %s sign_init or sign_message_init:%s", signature->type_name, desc);
+ "missing %s sign_init or sign_message_init:%s", signature->type_name, desc);
valid = 0;
}
if (valid
&& ((signature->verify_init != NULL
- && signature->verify == NULL)
+ && signature->verify == NULL)
|| (signature->verify_message_init != NULL
&& signature->verify == NULL
&& (signature->verify_message_update == NULL
|| signature->verify_message_final == NULL)))) {
/* verify_init function(s) with no verification function? That's weird */
ERR_raise_data(ERR_LIB_EVP, EVP_R_INVALID_PROVIDER_FUNCTIONS,
- "missing %s verification function:%s", signature->type_name, desc);
+ "missing %s verification function:%s", signature->type_name, desc);
valid = 0;
}
if (valid
@@ -359,20 +359,20 @@ static void *evp_signature_from_algorithm(int name_id,
|| signature->verify_message_update != NULL
|| signature->verify_message_final != NULL)
&& signature->verify_init == NULL
- && signature->verify_message_init == NULL) {
+ && signature->verify_message_init == NULL) {
ERR_raise_data(ERR_LIB_EVP, EVP_R_INVALID_PROVIDER_FUNCTIONS,
- "missing %s verify_init or verify_message_init:%s",
- signature->type_name, desc);
+ "missing %s verify_init or verify_message_init:%s",
+ signature->type_name, desc);
/* verification function(s) with no verify_init? That's odd */
valid = 0;
}
if (valid
&& (signature->verify_recover_init != NULL)
- && (signature->verify_recover == NULL)) {
+ && (signature->verify_recover == NULL)) {
/* verify_recover_init function with no verify_recover? How quaint */
ERR_raise_data(ERR_LIB_EVP, EVP_R_INVALID_PROVIDER_FUNCTIONS,
- "missing %s verify_recover:%s", signature->type_name, desc);
+ "missing %s verify_recover:%s", signature->type_name, desc);
valid = 0;
}
@@ -383,18 +383,18 @@ static void *evp_signature_from_algorithm(int name_id,
|| signature->digest_sign_final == NULL))) {
/* You can't have a digest_sign_init without *some* performing functions */
ERR_raise_data(ERR_LIB_EVP, EVP_R_INVALID_PROVIDER_FUNCTIONS,
- "missing %s digest_sign function:%s", signature->type_name, desc);
+ "missing %s digest_sign function:%s", signature->type_name, desc);
valid = 0;
}
if (valid
&& ((signature->digest_verify_init != NULL
- && signature->digest_verify == NULL
- && (signature->digest_verify_update == NULL
- || signature->digest_verify_final == NULL)))) {
+ && signature->digest_verify == NULL
+ && (signature->digest_verify_update == NULL
+ || signature->digest_verify_final == NULL)))) {
/* You can't have a digest_verify_init without *some* performing functions */
ERR_raise_data(ERR_LIB_EVP, EVP_R_INVALID_PROVIDER_FUNCTIONS,
- "missing %s digest_verify function:%s", signature->type_name, desc);
+ "missing %s digest_verify function:%s", signature->type_name, desc);
valid = 0;
}
@@ -402,56 +402,52 @@ static void *evp_signature_from_algorithm(int name_id,
goto err;
if ((signature->digest_sign != NULL
- || signature->digest_sign_update != NULL
- || signature->digest_sign_final != NULL)
+ || signature->digest_sign_update != NULL
+ || signature->digest_sign_final != NULL)
&& signature->digest_sign_init == NULL) {
/* digest signing function(s) with no digest_sign_init? That's odd */
ERR_raise_data(ERR_LIB_EVP, EVP_R_INVALID_PROVIDER_FUNCTIONS,
- "missing %s digest_sign_init:%s", signature->type_name, desc);
+ "missing %s digest_sign_init:%s", signature->type_name, desc);
goto err;
}
if ((signature->digest_verify != NULL
- || signature->digest_verify_update != NULL
- || signature->digest_verify_final != NULL)
+ || signature->digest_verify_update != NULL
+ || signature->digest_verify_final != NULL)
&& signature->digest_verify_init == NULL) {
/* digest verification function(s) with no digest_verify_init? That's odd */
ERR_raise_data(ERR_LIB_EVP, EVP_R_INVALID_PROVIDER_FUNCTIONS,
- "missing %s digest_verify_init:%s", signature->type_name, desc);
+ "missing %s digest_verify_init:%s", signature->type_name, desc);
goto err;
}
- if ((signature->sign_message_update == NULL) !=
- (signature->sign_message_final == NULL)) {
+ if ((signature->sign_message_update == NULL) != (signature->sign_message_final == NULL)) {
ERR_raise_data(ERR_LIB_EVP, EVP_R_INVALID_PROVIDER_FUNCTIONS,
- "only one of %s message signing update and final available:%s",
- signature->type_name, desc);
+ "only one of %s message signing update and final available:%s",
+ signature->type_name, desc);
goto err;
}
- if ((signature->verify_message_update == NULL) !=
- (signature->verify_message_final == NULL)) {
+ if ((signature->verify_message_update == NULL) != (signature->verify_message_final == NULL)) {
ERR_raise_data(ERR_LIB_EVP, EVP_R_INVALID_PROVIDER_FUNCTIONS,
- "only one of %s message verification update and final available:%s",
- signature->type_name, desc);
+ "only one of %s message verification update and final available:%s",
+ signature->type_name, desc);
goto err;
}
- if ((signature->digest_sign_update == NULL) !=
- (signature->digest_sign_final == NULL)) {
+ if ((signature->digest_sign_update == NULL) != (signature->digest_sign_final == NULL)) {
ERR_raise_data(ERR_LIB_EVP, EVP_R_INVALID_PROVIDER_FUNCTIONS,
- "only one of %s digest signing update and final available:%s",
- signature->type_name, desc);
+ "only one of %s digest signing update and final available:%s",
+ signature->type_name, desc);
goto err;
}
- if ((signature->digest_verify_update == NULL) !=
- (signature->digest_verify_final == NULL)) {
+ if ((signature->digest_verify_update == NULL) != (signature->digest_verify_final == NULL)) {
ERR_raise_data(ERR_LIB_EVP, EVP_R_INVALID_PROVIDER_FUNCTIONS,
- "only one of %s digest verification update and final available:%s",
- signature->type_name, desc);
+ "only one of %s digest verification update and final available:%s",
+ signature->type_name, desc);
goto err;
}
return signature;
- err:
+err:
EVP_SIGNATURE_free(signature);
return NULL;
}
@@ -485,35 +481,35 @@ OSSL_PROVIDER *EVP_SIGNATURE_get0_provider(const EVP_SIGNATURE *signature)
}
EVP_SIGNATURE *EVP_SIGNATURE_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
- const char *properties)
+ const char *properties)
{
return evp_generic_fetch(ctx, OSSL_OP_SIGNATURE, algorithm, properties,
- evp_signature_from_algorithm,
- evp_signature_up_ref,
- evp_signature_free);
+ evp_signature_from_algorithm,
+ evp_signature_up_ref,
+ evp_signature_free);
}
EVP_SIGNATURE *evp_signature_fetch_from_prov(OSSL_PROVIDER *prov,
- const char *algorithm,
- const char *properties)
+ const char *algorithm,
+ const char *properties)
{
return evp_generic_fetch_from_prov(prov, OSSL_OP_SIGNATURE,
- algorithm, properties,
- evp_signature_from_algorithm,
- evp_signature_up_ref,
- evp_signature_free);
+ algorithm, properties,
+ evp_signature_from_algorithm,
+ evp_signature_up_ref,
+ evp_signature_free);
}
int EVP_SIGNATURE_is_a(const EVP_SIGNATURE *signature, const char *name)
{
return signature != NULL
- && evp_is_a(signature->prov, signature->name_id, NULL, name);
+ && evp_is_a(signature->prov, signature->name_id, NULL, name);
}
int EVP_SIGNATURE_has_message_update(const EVP_SIGNATURE *signature)
{
return signature->verify_message_update != NULL
- && signature->sign_message_update != NULL;
+ && signature->sign_message_update != NULL;
}
int evp_signature_get_number(const EVP_SIGNATURE *signature)
@@ -532,21 +528,20 @@ const char *EVP_SIGNATURE_get0_description(const EVP_SIGNATURE *signature)
}
void EVP_SIGNATURE_do_all_provided(OSSL_LIB_CTX *libctx,
- void (*fn)(EVP_SIGNATURE *signature,
- void *arg),
- void *arg)
+ void (*fn)(EVP_SIGNATURE *signature,
+ void *arg),
+ void *arg)
{
evp_generic_do_all(libctx, OSSL_OP_SIGNATURE,
- (void (*)(void *, void *))fn, arg,
- evp_signature_from_algorithm,
- evp_signature_up_ref,
- evp_signature_free);
+ (void (*)(void *, void *))fn, arg,
+ evp_signature_from_algorithm,
+ evp_signature_up_ref,
+ evp_signature_free);
}
-
int EVP_SIGNATURE_names_do_all(const EVP_SIGNATURE *signature,
- void (*fn)(const char *name, void *data),
- void *data)
+ void (*fn)(const char *name, void *data),
+ void *data)
{
if (signature->prov != NULL)
return evp_names_do_all(signature->prov, signature->name_id, fn, data);
@@ -577,7 +572,7 @@ const OSSL_PARAM *EVP_SIGNATURE_settable_ctx_params(const EVP_SIGNATURE *sig)
}
static int evp_pkey_signature_init(EVP_PKEY_CTX *ctx, EVP_SIGNATURE *signature,
- int operation, const OSSL_PARAM params[])
+ int operation, const OSSL_PARAM params[])
{
const char *desc;
int ret = 0;
@@ -619,13 +614,12 @@ static int evp_pkey_signature_init(EVP_PKEY_CTX *ctx, EVP_SIGNATURE *signature,
* is different from |ctx->pkey|'s keymgmt)
*/
tmp_prov = EVP_SIGNATURE_get0_provider(signature);
- tmp_keymgmt_tofree = tmp_keymgmt =
- evp_keymgmt_fetch_from_prov((OSSL_PROVIDER *)tmp_prov,
- EVP_KEYMGMT_get0_name(ctx->keymgmt),
- ctx->propquery);
+ tmp_keymgmt_tofree = tmp_keymgmt = evp_keymgmt_fetch_from_prov((OSSL_PROVIDER *)tmp_prov,
+ EVP_KEYMGMT_get0_name(ctx->keymgmt),
+ ctx->propquery);
if (tmp_keymgmt != NULL)
provkey = evp_pkey_export_to_provider(ctx->pkey, ctx->libctx,
- &tmp_keymgmt, ctx->propquery);
+ &tmp_keymgmt, ctx->propquery);
if (tmp_keymgmt == NULL)
EVP_KEYMGMT_free(tmp_keymgmt_tofree);
@@ -665,7 +659,7 @@ static int evp_pkey_signature_init(EVP_PKEY_CTX *ctx, EVP_SIGNATURE *signature,
if (!ok) {
const char *signame
= evp_keymgmt_util_query_operation_name(ctx->keymgmt,
- OSSL_OP_SIGNATURE);
+ OSSL_OP_SIGNATURE);
ok = EVP_SIGNATURE_is_a(signature, signame);
}
@@ -696,14 +690,14 @@ static int evp_pkey_signature_init(EVP_PKEY_CTX *ctx, EVP_SIGNATURE *signature,
* Try to derive the supported signature from |ctx->keymgmt|.
*/
if (!ossl_assert(ctx->pkey->keymgmt == NULL
- || ctx->pkey->keymgmt == ctx->keymgmt)) {
+ || ctx->pkey->keymgmt == ctx->keymgmt)) {
ERR_clear_last_mark();
ERR_raise(ERR_LIB_EVP, ERR_R_INTERNAL_ERROR);
goto err;
}
supported_sig
= evp_keymgmt_util_query_operation_name(ctx->keymgmt,
- OSSL_OP_SIGNATURE);
+ OSSL_OP_SIGNATURE);
if (supported_sig == NULL) {
ERR_clear_last_mark();
ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
@@ -740,16 +734,14 @@ static int evp_pkey_signature_init(EVP_PKEY_CTX *ctx, EVP_SIGNATURE *signature,
switch (iter) {
case 1:
- signature =
- EVP_SIGNATURE_fetch(ctx->libctx, supported_sig, ctx->propquery);
+ signature = EVP_SIGNATURE_fetch(ctx->libctx, supported_sig, ctx->propquery);
if (signature != NULL)
tmp_prov = EVP_SIGNATURE_get0_provider(signature);
break;
case 2:
tmp_prov = EVP_KEYMGMT_get0_provider(ctx->keymgmt);
- signature =
- evp_signature_fetch_from_prov((OSSL_PROVIDER *)tmp_prov,
- supported_sig, ctx->propquery);
+ signature = evp_signature_fetch_from_prov((OSSL_PROVIDER *)tmp_prov,
+ supported_sig, ctx->propquery);
if (signature == NULL)
goto legacy;
break;
@@ -767,13 +759,12 @@ static int evp_pkey_signature_init(EVP_PKEY_CTX *ctx, EVP_SIGNATURE *signature,
* is smart enough to only actually export it if |tmp_keymgmt|
* is different from |ctx->pkey|'s keymgmt)
*/
- tmp_keymgmt_tofree = tmp_keymgmt =
- evp_keymgmt_fetch_from_prov((OSSL_PROVIDER *)tmp_prov,
- EVP_KEYMGMT_get0_name(ctx->keymgmt),
- ctx->propquery);
+ tmp_keymgmt_tofree = tmp_keymgmt = evp_keymgmt_fetch_from_prov((OSSL_PROVIDER *)tmp_prov,
+ EVP_KEYMGMT_get0_name(ctx->keymgmt),
+ ctx->propquery);
if (tmp_keymgmt != NULL)
provkey = evp_pkey_export_to_provider(ctx->pkey, ctx->libctx,
- &tmp_keymgmt, ctx->propquery);
+ &tmp_keymgmt, ctx->propquery);
if (tmp_keymgmt == NULL)
EVP_KEYMGMT_free(tmp_keymgmt_tofree);
}
@@ -791,8 +782,7 @@ static int evp_pkey_signature_init(EVP_PKEY_CTX *ctx, EVP_SIGNATURE *signature,
ctx->op.sig.signature = signature;
desc = signature->description != NULL ? signature->description : "";
- ctx->op.sig.algctx =
- signature->newctx(ossl_provider_ctx(signature->prov), ctx->propquery);
+ ctx->op.sig.algctx = signature->newctx(ossl_provider_ctx(signature->prov), ctx->propquery);
if (ctx->op.sig.algctx == NULL) {
/* The provider key can stay in the cache */
ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
@@ -803,7 +793,7 @@ static int evp_pkey_signature_init(EVP_PKEY_CTX *ctx, EVP_SIGNATURE *signature,
case EVP_PKEY_OP_SIGN:
if (signature->sign_init == NULL) {
ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_NOT_SUPPORTED,
- "%s sign_init:%s", signature->type_name, desc);
+ "%s sign_init:%s", signature->type_name, desc);
ret = -2;
goto err;
}
@@ -812,7 +802,7 @@ static int evp_pkey_signature_init(EVP_PKEY_CTX *ctx, EVP_SIGNATURE *signature,
case EVP_PKEY_OP_SIGNMSG:
if (signature->sign_message_init == NULL) {
ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_NOT_SUPPORTED,
- "%s sign_message_init:%s", signature->type_name, desc);
+ "%s sign_message_init:%s", signature->type_name, desc);
ret = -2;
goto err;
}
@@ -821,7 +811,7 @@ static int evp_pkey_signature_init(EVP_PKEY_CTX *ctx, EVP_SIGNATURE *signature,
case EVP_PKEY_OP_VERIFY:
if (signature->verify_init == NULL) {
ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_NOT_SUPPORTED,
- "%s verify_init:%s", signature->type_name, desc);
+ "%s verify_init:%s", signature->type_name, desc);
ret = -2;
goto err;
}
@@ -830,7 +820,7 @@ static int evp_pkey_signature_init(EVP_PKEY_CTX *ctx, EVP_SIGNATURE *signature,
case EVP_PKEY_OP_VERIFYMSG:
if (signature->verify_message_init == NULL) {
ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_NOT_SUPPORTED,
- "%s verify_message_init:%s", signature->type_name, desc);
+ "%s verify_message_init:%s", signature->type_name, desc);
ret = -2;
goto err;
}
@@ -839,7 +829,7 @@ static int evp_pkey_signature_init(EVP_PKEY_CTX *ctx, EVP_SIGNATURE *signature,
case EVP_PKEY_OP_VERIFYRECOVER:
if (signature->verify_recover_init == NULL) {
ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_NOT_SUPPORTED,
- "%s verify_recover_init:%s", signature->type_name, desc);
+ "%s verify_recover_init:%s", signature->type_name, desc);
ret = -2;
goto err;
}
@@ -857,7 +847,7 @@ static int evp_pkey_signature_init(EVP_PKEY_CTX *ctx, EVP_SIGNATURE *signature,
}
goto end;
- legacy:
+legacy:
/*
* If we don't have the full support we need with provided methods,
* let's go see if legacy does.
@@ -867,10 +857,10 @@ static int evp_pkey_signature_init(EVP_PKEY_CTX *ctx, EVP_SIGNATURE *signature,
tmp_keymgmt = NULL;
if (ctx->pmeth == NULL
- || (operation == EVP_PKEY_OP_SIGN && ctx->pmeth->sign == NULL)
- || (operation == EVP_PKEY_OP_VERIFY && ctx->pmeth->verify == NULL)
- || (operation == EVP_PKEY_OP_VERIFYRECOVER
- && ctx->pmeth->verify_recover == NULL)) {
+ || (operation == EVP_PKEY_OP_SIGN && ctx->pmeth->sign == NULL)
+ || (operation == EVP_PKEY_OP_VERIFY && ctx->pmeth->verify == NULL)
+ || (operation == EVP_PKEY_OP_VERIFYRECOVER
+ && ctx->pmeth->verify_recover == NULL)) {
ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
return -2;
}
@@ -897,7 +887,7 @@ static int evp_pkey_signature_init(EVP_PKEY_CTX *ctx, EVP_SIGNATURE *signature,
}
if (ret <= 0)
goto err;
- end:
+end:
#ifndef FIPS_MODULE
if (ret > 0)
ret = evp_pkey_ctx_use_cached_data(ctx);
@@ -905,7 +895,7 @@ static int evp_pkey_signature_init(EVP_PKEY_CTX *ctx, EVP_SIGNATURE *signature,
EVP_KEYMGMT_free(tmp_keymgmt);
return ret;
- err:
+err:
evp_pkey_ctx_free_old_ops(ctx);
ctx->operation = EVP_PKEY_OP_UNDEFINED;
EVP_KEYMGMT_free(tmp_keymgmt);
@@ -923,19 +913,19 @@ int EVP_PKEY_sign_init_ex(EVP_PKEY_CTX *ctx, const OSSL_PARAM params[])
}
int EVP_PKEY_sign_init_ex2(EVP_PKEY_CTX *ctx,
- EVP_SIGNATURE *algo, const OSSL_PARAM params[])
+ EVP_SIGNATURE *algo, const OSSL_PARAM params[])
{
return evp_pkey_signature_init(ctx, algo, EVP_PKEY_OP_SIGN, params);
}
int EVP_PKEY_sign_message_init(EVP_PKEY_CTX *ctx,
- EVP_SIGNATURE *algo, const OSSL_PARAM params[])
+ EVP_SIGNATURE *algo, const OSSL_PARAM params[])
{
return evp_pkey_signature_init(ctx, algo, EVP_PKEY_OP_SIGNMSG, params);
}
int EVP_PKEY_sign_message_update(EVP_PKEY_CTX *ctx,
- const unsigned char *in, size_t inlen)
+ const unsigned char *in, size_t inlen)
{
EVP_SIGNATURE *signature;
const char *desc;
@@ -955,19 +945,19 @@ int EVP_PKEY_sign_message_update(EVP_PKEY_CTX *ctx,
desc = signature->description != NULL ? signature->description : "";
if (signature->sign_message_update == NULL) {
ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_NOT_SUPPORTED,
- "%s sign_message_update:%s", signature->type_name, desc);
+ "%s sign_message_update:%s", signature->type_name, desc);
return -2;
}
ret = signature->sign_message_update(ctx->op.sig.algctx, in, inlen);
if (ret <= 0)
ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_FAILURE,
- "%s sign_message_update:%s", signature->type_name, desc);
+ "%s sign_message_update:%s", signature->type_name, desc);
return ret;
}
int EVP_PKEY_sign_message_final(EVP_PKEY_CTX *ctx,
- unsigned char *sig, size_t *siglen)
+ unsigned char *sig, size_t *siglen)
{
EVP_SIGNATURE *signature;
const char *desc;
@@ -987,21 +977,21 @@ int EVP_PKEY_sign_message_final(EVP_PKEY_CTX *ctx,
desc = signature->description != NULL ? signature->description : "";
if (signature->sign_message_final == NULL) {
ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_NOT_SUPPORTED,
- "%s sign_message_final:%s", signature->type_name, desc);
+ "%s sign_message_final:%s", signature->type_name, desc);
return -2;
}
ret = signature->sign_message_final(ctx->op.sig.algctx, sig, siglen,
- (sig == NULL) ? 0 : *siglen);
+ (sig == NULL) ? 0 : *siglen);
if (ret <= 0)
ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_FAILURE,
- "%s sign_message_final:%s", signature->type_name, desc);
+ "%s sign_message_final:%s", signature->type_name, desc);
return ret;
}
int EVP_PKEY_sign(EVP_PKEY_CTX *ctx,
- unsigned char *sig, size_t *siglen,
- const unsigned char *tbs, size_t tbslen)
+ unsigned char *sig, size_t *siglen,
+ const unsigned char *tbs, size_t tbslen)
{
EVP_SIGNATURE *signature;
const char *desc;
@@ -1025,25 +1015,24 @@ int EVP_PKEY_sign(EVP_PKEY_CTX *ctx,
desc = signature->description != NULL ? signature->description : "";
if (signature->sign == NULL) {
ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_NOT_SUPPORTED,
- "%s sign:%s", signature->type_name, desc);
+ "%s sign:%s", signature->type_name, desc);
return -2;
}
ret = signature->sign(ctx->op.sig.algctx, sig, siglen,
- (sig == NULL) ? 0 : *siglen, tbs, tbslen);
+ (sig == NULL) ? 0 : *siglen, tbs, tbslen);
if (ret <= 0)
ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_FAILURE,
- "%s sign:%s", signature->type_name, desc);
+ "%s sign:%s", signature->type_name, desc);
return ret;
- legacy:
+legacy:
if (ctx->pmeth == NULL || ctx->pmeth->sign == NULL) {
ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
return -2;
}
- M_check_autoarg(ctx, sig, siglen, EVP_F_EVP_PKEY_SIGN)
- return ctx->pmeth->sign(ctx, sig, siglen, tbs, tbslen);
+ M_check_autoarg(ctx, sig, siglen, EVP_F_EVP_PKEY_SIGN) return ctx->pmeth->sign(ctx, sig, siglen, tbs, tbslen);
}
int EVP_PKEY_verify_init(EVP_PKEY_CTX *ctx)
@@ -1057,19 +1046,19 @@ int EVP_PKEY_verify_init_ex(EVP_PKEY_CTX *ctx, const OSSL_PARAM params[])
}
int EVP_PKEY_verify_init_ex2(EVP_PKEY_CTX *ctx,
- EVP_SIGNATURE *algo, const OSSL_PARAM params[])
+ EVP_SIGNATURE *algo, const OSSL_PARAM params[])
{
return evp_pkey_signature_init(ctx, algo, EVP_PKEY_OP_VERIFY, params);
}
int EVP_PKEY_verify_message_init(EVP_PKEY_CTX *ctx,
- EVP_SIGNATURE *algo, const OSSL_PARAM params[])
+ EVP_SIGNATURE *algo, const OSSL_PARAM params[])
{
return evp_pkey_signature_init(ctx, algo, EVP_PKEY_OP_VERIFYMSG, params);
}
int EVP_PKEY_CTX_set_signature(EVP_PKEY_CTX *ctx,
- const unsigned char *sig, size_t siglen)
+ const unsigned char *sig, size_t siglen)
{
OSSL_PARAM sig_params[2], *p = sig_params;
@@ -1079,18 +1068,18 @@ int EVP_PKEY_CTX_set_signature(EVP_PKEY_CTX *ctx,
}
*p++ = OSSL_PARAM_construct_octet_string(OSSL_SIGNATURE_PARAM_SIGNATURE,
- /*
- * Cast away the const. This is
- * read only so should be safe
- */
- (char *)sig, siglen);
+ /*
+ * Cast away the const. This is
+ * read only so should be safe
+ */
+ (char *)sig, siglen);
*p = OSSL_PARAM_construct_end();
return EVP_PKEY_CTX_set_params(ctx, sig_params);
}
int EVP_PKEY_verify_message_update(EVP_PKEY_CTX *ctx,
- const unsigned char *in, size_t inlen)
+ const unsigned char *in, size_t inlen)
{
EVP_SIGNATURE *signature;
const char *desc;
@@ -1110,14 +1099,14 @@ int EVP_PKEY_verify_message_update(EVP_PKEY_CTX *ctx,
desc = signature->description != NULL ? signature->description : "";
if (signature->verify_message_update == NULL) {
ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_NOT_SUPPORTED,
- "%s verify_message_update:%s", signature->type_name, desc);
+ "%s verify_message_update:%s", signature->type_name, desc);
return -2;
}
ret = signature->verify_message_update(ctx->op.sig.algctx, in, inlen);
if (ret <= 0)
ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_FAILURE,
- "%s verify_message_update:%s", signature->type_name, desc);
+ "%s verify_message_update:%s", signature->type_name, desc);
return ret;
}
@@ -1141,7 +1130,7 @@ int EVP_PKEY_verify_message_final(EVP_PKEY_CTX *ctx)
desc = signature->description != NULL ? signature->description : "";
if (signature->verify_message_final == NULL) {
ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_NOT_SUPPORTED,
- "%s verify_message_final:%s", signature->type_name, desc);
+ "%s verify_message_final:%s", signature->type_name, desc);
return -2;
}
@@ -1149,13 +1138,13 @@ int EVP_PKEY_verify_message_final(EVP_PKEY_CTX *ctx)
ret = signature->verify_message_final(ctx->op.sig.algctx);
if (ret <= 0)
ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_FAILURE,
- "%s verify_message_final:%s", signature->type_name, desc);
+ "%s verify_message_final:%s", signature->type_name, desc);
return ret;
}
int EVP_PKEY_verify(EVP_PKEY_CTX *ctx,
- const unsigned char *sig, size_t siglen,
- const unsigned char *tbs, size_t tbslen)
+ const unsigned char *sig, size_t siglen,
+ const unsigned char *tbs, size_t tbslen)
{
EVP_SIGNATURE *signature;
const char *desc;
@@ -1179,18 +1168,18 @@ int EVP_PKEY_verify(EVP_PKEY_CTX *ctx,
desc = signature->description != NULL ? signature->description : "";
if (signature->verify == NULL) {
ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_NOT_SUPPORTED,
- "%s verify:%s", signature->type_name, desc);
+ "%s verify:%s", signature->type_name, desc);
return -2;
}
ret = ctx->op.sig.signature->verify(ctx->op.sig.algctx, sig, siglen,
- tbs, tbslen);
+ tbs, tbslen);
if (ret <= 0)
ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_FAILURE,
- "%s verify:%s", signature->type_name, desc);
+ "%s verify:%s", signature->type_name, desc);
return ret;
- legacy:
+legacy:
if (ctx->pmeth == NULL || ctx->pmeth->verify == NULL) {
ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
return -2;
@@ -1205,20 +1194,20 @@ int EVP_PKEY_verify_recover_init(EVP_PKEY_CTX *ctx)
}
int EVP_PKEY_verify_recover_init_ex(EVP_PKEY_CTX *ctx,
- const OSSL_PARAM params[])
+ const OSSL_PARAM params[])
{
return evp_pkey_signature_init(ctx, NULL, EVP_PKEY_OP_VERIFYRECOVER, params);
}
int EVP_PKEY_verify_recover_init_ex2(EVP_PKEY_CTX *ctx,
- EVP_SIGNATURE *algo, const OSSL_PARAM params[])
+ EVP_SIGNATURE *algo, const OSSL_PARAM params[])
{
return evp_pkey_signature_init(ctx, algo, EVP_PKEY_OP_VERIFYRECOVER, params);
}
int EVP_PKEY_verify_recover(EVP_PKEY_CTX *ctx,
- unsigned char *rout, size_t *routlen,
- const unsigned char *sig, size_t siglen)
+ unsigned char *rout, size_t *routlen,
+ const unsigned char *sig, size_t siglen)
{
EVP_SIGNATURE *signature;
const char *desc;
@@ -1241,21 +1230,20 @@ int EVP_PKEY_verify_recover(EVP_PKEY_CTX *ctx,
desc = signature->description != NULL ? signature->description : "";
if (signature->verify_recover == NULL) {
ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_NOT_SUPPORTED,
- "%s verify_recover:%s", signature->type_name, desc);
+ "%s verify_recover:%s", signature->type_name, desc);
return -2;
}
ret = signature->verify_recover(ctx->op.sig.algctx, rout, routlen,
- (rout == NULL ? 0 : *routlen), sig, siglen);
+ (rout == NULL ? 0 : *routlen), sig, siglen);
if (ret <= 0)
ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_FAILURE,
- "%s verify_recover:%s", signature->type_name, desc);
+ "%s verify_recover:%s", signature->type_name, desc);
return ret;
- legacy:
+legacy:
if (ctx->pmeth == NULL || ctx->pmeth->verify_recover == NULL) {
ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
return -2;
}
- M_check_autoarg(ctx, rout, routlen, EVP_F_EVP_PKEY_VERIFY_RECOVER)
- return ctx->pmeth->verify_recover(ctx, rout, routlen, sig, siglen);
+ M_check_autoarg(ctx, rout, routlen, EVP_F_EVP_PKEY_VERIFY_RECOVER) return ctx->pmeth->verify_recover(ctx, rout, routlen, sig, siglen);
}
diff --git a/crypto/evp/skeymgmt_meth.c b/crypto/evp/skeymgmt_meth.c
index 9ecab50fa0..46ea0c5443 100644
--- a/crypto/evp/skeymgmt_meth.c
+++ b/crypto/evp/skeymgmt_meth.c
@@ -33,7 +33,7 @@ void *evp_skeymgmt_import(const EVP_SKEYMGMT *skeymgmt, int selection, const OSS
}
int evp_skeymgmt_export(const EVP_SKEYMGMT *skeymgmt, void *keydata,
- int selection, OSSL_CALLBACK *param_cb, void *cbarg)
+ int selection, OSSL_CALLBACK *param_cb, void *cbarg)
{
/* This is mandatory, no need to check for its presence */
return skeymgmt->export(keydata, selection, param_cb, cbarg);
@@ -59,8 +59,8 @@ static void *skeymgmt_new(void)
}
static void *skeymgmt_from_algorithm(int name_id,
- const OSSL_ALGORITHM *algodef,
- OSSL_PROVIDER *prov)
+ const OSSL_ALGORITHM *algodef,
+ OSSL_PROVIDER *prov)
{
const OSSL_DISPATCH *fns = algodef->implementation;
EVP_SKEYMGMT *skeymgmt = NULL;
@@ -128,24 +128,24 @@ static void *skeymgmt_from_algorithm(int name_id,
}
EVP_SKEYMGMT *evp_skeymgmt_fetch_from_prov(OSSL_PROVIDER *prov,
- const char *name,
- const char *properties)
+ const char *name,
+ const char *properties)
{
return evp_generic_fetch_from_prov(prov,
- OSSL_OP_SKEYMGMT,
- name, properties,
- skeymgmt_from_algorithm,
- (int (*)(void *))EVP_SKEYMGMT_up_ref,
- (void (*)(void *))EVP_SKEYMGMT_free);
+ OSSL_OP_SKEYMGMT,
+ name, properties,
+ skeymgmt_from_algorithm,
+ (int (*)(void *))EVP_SKEYMGMT_up_ref,
+ (void (*)(void *))EVP_SKEYMGMT_free);
}
EVP_SKEYMGMT *EVP_SKEYMGMT_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
- const char *properties)
+ const char *properties)
{
return evp_generic_fetch(ctx, OSSL_OP_SKEYMGMT, algorithm, properties,
- skeymgmt_from_algorithm,
- (int (*)(void *))EVP_SKEYMGMT_up_ref,
- (void (*)(void *))EVP_SKEYMGMT_free);
+ skeymgmt_from_algorithm,
+ (int (*)(void *))EVP_SKEYMGMT_up_ref,
+ (void (*)(void *))EVP_SKEYMGMT_free);
}
int EVP_SKEYMGMT_up_ref(EVP_SKEYMGMT *skeymgmt)
@@ -194,19 +194,19 @@ int EVP_SKEYMGMT_is_a(const EVP_SKEYMGMT *skeymgmt, const char *name)
}
void EVP_SKEYMGMT_do_all_provided(OSSL_LIB_CTX *libctx,
- void (*fn)(EVP_SKEYMGMT *skeymgmt, void *arg),
- void *arg)
+ void (*fn)(EVP_SKEYMGMT *skeymgmt, void *arg),
+ void *arg)
{
evp_generic_do_all(libctx, OSSL_OP_SKEYMGMT,
- (void (*)(void *, void *))fn, arg,
- skeymgmt_from_algorithm,
- (int (*)(void *))EVP_SKEYMGMT_up_ref,
- (void (*)(void *))EVP_SKEYMGMT_free);
+ (void (*)(void *, void *))fn, arg,
+ skeymgmt_from_algorithm,
+ (int (*)(void *))EVP_SKEYMGMT_up_ref,
+ (void (*)(void *))EVP_SKEYMGMT_free);
}
int EVP_SKEYMGMT_names_do_all(const EVP_SKEYMGMT *skeymgmt,
- void (*fn)(const char *name, void *data),
- void *data)
+ void (*fn)(const char *name, void *data),
+ void *data)
{
if (skeymgmt == NULL)
return 0;
diff --git a/crypto/ex_data.c b/crypto/ex_data.c
index 9e7e994909..98119d5a6c 100644
--- a/crypto/ex_data.c
+++ b/crypto/ex_data.c
@@ -29,7 +29,7 @@ int ossl_do_ex_data_init(OSSL_LIB_CTX *ctx)
* If |read| is 1 then a read lock is obtained. Otherwise it is a write lock.
*/
static EX_CALLBACKS *get_and_lock(OSSL_EX_DATA_GLOBAL *global, int class_index,
- int read)
+ int read)
{
EX_CALLBACKS *ip;
@@ -43,7 +43,7 @@ static EX_CALLBACKS *get_and_lock(OSSL_EX_DATA_GLOBAL *global, int class_index,
* If we get here, someone (who?) cleaned up the lock, so just
* treat it as an error.
*/
- return NULL;
+ return NULL;
}
if (read) {
@@ -88,24 +88,23 @@ void ossl_crypto_cleanup_all_ex_data_int(OSSL_LIB_CTX *ctx)
global->ex_data_lock = NULL;
}
-
/*
* Unregister a new index by replacing the callbacks with no-ops.
* Any in-use instances are leaked.
*/
static void dummy_new(void *parent, void *ptr, CRYPTO_EX_DATA *ad, int idx,
- long argl, void *argp)
+ long argl, void *argp)
{
}
static void dummy_free(void *parent, void *ptr, CRYPTO_EX_DATA *ad, int idx,
- long argl, void *argp)
+ long argl, void *argp)
{
}
static int dummy_dup(CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from,
- void **from_d, int idx,
- long argl, void *argp)
+ void **from_d, int idx,
+ long argl, void *argp)
{
return 1;
}
@@ -147,11 +146,11 @@ int CRYPTO_free_ex_index(int class_index, int idx)
* Register a new index.
*/
int ossl_crypto_get_ex_new_index_ex(OSSL_LIB_CTX *ctx, int class_index,
- long argl, void *argp,
- CRYPTO_EX_new *new_func,
- CRYPTO_EX_dup *dup_func,
- CRYPTO_EX_free *free_func,
- int priority)
+ long argl, void *argp,
+ CRYPTO_EX_new *new_func,
+ CRYPTO_EX_dup *dup_func,
+ CRYPTO_EX_free *free_func,
+ int priority)
{
int toret = -1;
EX_CALLBACK *a;
@@ -196,17 +195,17 @@ int ossl_crypto_get_ex_new_index_ex(OSSL_LIB_CTX *ctx, int class_index,
toret = sk_EX_CALLBACK_num(ip->meth) - 1;
(void)sk_EX_CALLBACK_set(ip->meth, toret, a);
- err:
+err:
CRYPTO_THREAD_unlock(global->ex_data_lock);
return toret;
}
int CRYPTO_get_ex_new_index(int class_index, long argl, void *argp,
- CRYPTO_EX_new *new_func, CRYPTO_EX_dup *dup_func,
- CRYPTO_EX_free *free_func)
+ CRYPTO_EX_new *new_func, CRYPTO_EX_dup *dup_func,
+ CRYPTO_EX_free *free_func)
{
return ossl_crypto_get_ex_new_index_ex(NULL, class_index, argl, argp,
- new_func, dup_func, free_func, 0);
+ new_func, dup_func, free_func, 0);
}
/*
@@ -217,7 +216,7 @@ int CRYPTO_get_ex_new_index(int class_index, long argl, void *argp,
* to the global "ex_data" state (ie. class definitions), not 'ad' itself.
*/
int ossl_crypto_new_ex_data_ex(OSSL_LIB_CTX *ctx, int class_index, void *obj,
- CRYPTO_EX_DATA *ad)
+ CRYPTO_EX_DATA *ad)
{
int mx, i;
void *ptr;
@@ -253,7 +252,7 @@ int ossl_crypto_new_ex_data_ex(OSSL_LIB_CTX *ctx, int class_index, void *obj,
if (storage[i] != NULL && storage[i]->new_func != NULL) {
ptr = CRYPTO_get_ex_data(ad, i);
storage[i]->new_func(obj, ptr, ad, i,
- storage[i]->argl, storage[i]->argp);
+ storage[i]->argl, storage[i]->argp);
}
}
if (storage != stack)
@@ -271,7 +270,7 @@ int CRYPTO_new_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad)
* for each index in the class used by this variable
*/
int CRYPTO_dup_ex_data(int class_index, CRYPTO_EX_DATA *to,
- const CRYPTO_EX_DATA *from)
+ const CRYPTO_EX_DATA *from)
{
int mx, j, i;
void *ptr;
@@ -327,12 +326,12 @@ int CRYPTO_dup_ex_data(int class_index, CRYPTO_EX_DATA *to,
ptr = CRYPTO_get_ex_data(from, i);
if (storage[i] != NULL && storage[i]->dup_func != NULL)
if (!storage[i]->dup_func(to, from, &ptr, i,
- storage[i]->argl, storage[i]->argp))
+ storage[i]->argl, storage[i]->argp))
goto err;
CRYPTO_set_ex_data(to, i, ptr);
}
toret = 1;
- err:
+err:
if (storage != stack)
OPENSSL_free(storage);
return toret;
@@ -410,7 +409,7 @@ void CRYPTO_free_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad)
if (storage != stack)
OPENSSL_free(storage);
- err:
+err:
sk_void_free(ad->sk);
ad->sk = NULL;
ad->ctx = NULL;
@@ -421,7 +420,7 @@ void CRYPTO_free_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad)
* function
*/
int CRYPTO_alloc_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad,
- int idx)
+ int idx)
{
void *curval;
@@ -434,7 +433,7 @@ int CRYPTO_alloc_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad,
}
int ossl_crypto_alloc_ex_data_intern(int class_index, void *obj,
- CRYPTO_EX_DATA *ad, int idx)
+ CRYPTO_EX_DATA *ad, int idx)
{
EX_CALLBACK *f;
EX_CALLBACKS *ip;
diff --git a/crypto/ffc/ffc_backend.c b/crypto/ffc/ffc_backend.c
index c12a88148f..fa3182bc80 100644
--- a/crypto/ffc/ffc_backend.c
+++ b/crypto/ffc/ffc_backend.c
@@ -24,7 +24,7 @@ int ossl_ffc_params_fromdata(FFC_PARAMS *ffc, const OSSL_PARAM params[])
BIGNUM *p = NULL, *q = NULL, *g = NULL, *j = NULL;
int i;
- prm = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_GROUP_NAME);
+ prm = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_GROUP_NAME);
if (prm != NULL) {
/*
* In a no-dh build we just go straight to err because we have no
@@ -54,7 +54,7 @@ int ossl_ffc_params_fromdata(FFC_PARAMS *ffc, const OSSL_PARAM params[])
if (prm != NULL) {
if (!OSSL_PARAM_get_int(prm, &i))
goto err;
- ffc->gindex = i;
+ ffc->gindex = i;
}
prm = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_FFC_PCOUNTER);
if (prm != NULL) {
@@ -69,27 +69,27 @@ int ossl_ffc_params_fromdata(FFC_PARAMS *ffc, const OSSL_PARAM params[])
if (prm != NULL) {
if (!OSSL_PARAM_get_int(prm, &i))
goto err;
- ffc->h = i;
+ ffc->h = i;
}
- prm = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_FFC_SEED);
+ prm = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_FFC_SEED);
if (prm != NULL) {
if (prm->data_type != OSSL_PARAM_OCTET_STRING
|| !ossl_ffc_params_set_seed(ffc, prm->data, prm->data_size))
goto err;
}
- prm = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_FFC_VALIDATE_PQ);
+ prm = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_FFC_VALIDATE_PQ);
if (prm != NULL) {
if (!OSSL_PARAM_get_int(prm, &i))
goto err;
ossl_ffc_params_enable_flags(ffc, FFC_PARAM_FLAG_VALIDATE_PQ, i);
}
- prm = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_FFC_VALIDATE_G);
+ prm = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_FFC_VALIDATE_G);
if (prm != NULL) {
if (!OSSL_PARAM_get_int(prm, &i))
goto err;
ossl_ffc_params_enable_flags(ffc, FFC_PARAM_FLAG_VALIDATE_G, i);
}
- prm = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_FFC_VALIDATE_LEGACY);
+ prm = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_FFC_VALIDATE_LEGACY);
if (prm != NULL) {
if (!OSSL_PARAM_get_int(prm, &i))
goto err;
@@ -115,7 +115,7 @@ int ossl_ffc_params_fromdata(FFC_PARAMS *ffc, const OSSL_PARAM params[])
ossl_ffc_params_set0_j(ffc, j);
return 1;
- err:
+err:
BN_free(j);
BN_free(p);
BN_free(q);
diff --git a/crypto/ffc/ffc_dh.c b/crypto/ffc/ffc_dh.c
index df07e173bc..e4077e5e52 100644
--- a/crypto/ffc/ffc_dh.c
+++ b/crypto/ffc/ffc_dh.c
@@ -13,35 +13,37 @@
#ifndef OPENSSL_NO_DH
-# define FFDHE(sz, keylength) { \
- SN_ffdhe##sz, NID_ffdhe##sz, \
- sz, \
- keylength, \
- &ossl_bignum_ffdhe##sz##_p, &ossl_bignum_ffdhe##sz##_q, \
- &ossl_bignum_const_2, \
- }
+#define FFDHE(sz, keylength) { \
+ SN_ffdhe##sz, \
+ NID_ffdhe##sz, \
+ sz, \
+ keylength, \
+ &ossl_bignum_ffdhe##sz##_p, \
+ &ossl_bignum_ffdhe##sz##_q, \
+ &ossl_bignum_const_2, \
+}
-# define MODP(sz, keylength) { \
- SN_modp_##sz, NID_modp_##sz, \
- sz, \
- keylength, \
- &ossl_bignum_modp_##sz##_p, &ossl_bignum_modp_##sz##_q, \
- &ossl_bignum_const_2 \
- }
+#define MODP(sz, keylength) { \
+ SN_modp_##sz, NID_modp_##sz, \
+ sz, \
+ keylength, \
+ &ossl_bignum_modp_##sz##_p, &ossl_bignum_modp_##sz##_q, \
+ &ossl_bignum_const_2 \
+}
-# define RFC5114(name, uid, sz, tag) { \
- name, uid, \
- sz, \
- 0, \
- &ossl_bignum_dh##tag##_p, &ossl_bignum_dh##tag##_q, \
- &ossl_bignum_dh##tag##_g \
- }
+#define RFC5114(name, uid, sz, tag) { \
+ name, uid, \
+ sz, \
+ 0, \
+ &ossl_bignum_dh##tag##_p, &ossl_bignum_dh##tag##_q, \
+ &ossl_bignum_dh##tag##_g \
+}
#else
-# define FFDHE(sz, keylength) { SN_ffdhe##sz, NID_ffdhe##sz }
-# define MODP(sz, keylength) { SN_modp_##sz, NID_modp_##sz }
-# define RFC5114(name, uid, sz, tag) { name, uid }
+#define FFDHE(sz, keylength) { SN_ffdhe##sz, NID_ffdhe##sz }
+#define MODP(sz, keylength) { SN_modp_##sz, NID_modp_##sz }
+#define RFC5114(name, uid, sz, tag) { name, uid }
#endif
@@ -76,10 +78,10 @@ static const DH_NAMED_GROUP dh_named_groups[] = {
MODP(4096, 325),
MODP(6144, 375),
MODP(8192, 400),
- /*
- * Additional dh named groups from RFC 5114 that have a different g.
- * The uid can be any unique identifier.
- */
+/*
+ * Additional dh named groups from RFC 5114 that have a different g.
+ * The uid can be any unique identifier.
+ */
#ifndef FIPS_MODULE
RFC5114("dh_1024_160", 1, 1024, 1024_160),
RFC5114("dh_2048_224", 2, 2048, 2048_224),
@@ -111,8 +113,8 @@ const DH_NAMED_GROUP *ossl_ffc_uid_to_dh_named_group(int uid)
#ifndef OPENSSL_NO_DH
const DH_NAMED_GROUP *ossl_ffc_numbers_to_dh_named_group(const BIGNUM *p,
- const BIGNUM *q,
- const BIGNUM *g)
+ const BIGNUM *q,
+ const BIGNUM *g)
{
size_t i;
@@ -163,7 +165,7 @@ int ossl_ffc_named_group_set(FFC_PARAMS *ffc, const DH_NAMED_GROUP *group)
return 0;
ossl_ffc_params_set0_pqg(ffc, (BIGNUM *)group->p, (BIGNUM *)group->q,
- (BIGNUM *)group->g);
+ (BIGNUM *)group->g);
ffc->keylength = group->keylength;
/* flush the cached nid, The DH layer is responsible for caching */
diff --git a/crypto/ffc/ffc_key_generate.c b/crypto/ffc/ffc_key_generate.c
index cb895f2abd..1625a272aa 100644
--- a/crypto/ffc/ffc_key_generate.c
+++ b/crypto/ffc/ffc_key_generate.c
@@ -20,7 +20,7 @@
* priv_key is the returned private key,
*/
int ossl_ffc_generate_private_key(BN_CTX *ctx, const FFC_PARAMS *params,
- int N, int s, BIGNUM *priv)
+ int N, int s, BIGNUM *priv)
{
int ret = 0, qbits = BN_num_bits(params->q);
BIGNUM *m, *two_powN = NULL;
diff --git a/crypto/ffc/ffc_key_validate.c b/crypto/ffc/ffc_key_validate.c
index a4a2a58e9a..9b48c74ffc 100644
--- a/crypto/ffc/ffc_key_validate.c
+++ b/crypto/ffc/ffc_key_validate.c
@@ -17,7 +17,7 @@
* ret contains 0 on success, or error flags (see FFC_ERROR_PUBKEY_TOO_SMALL)
*/
int ossl_ffc_validate_public_key_partial(const FFC_PARAMS *params,
- const BIGNUM *pub_key, int *ret)
+ const BIGNUM *pub_key, int *ret)
{
int ok = 0;
BIGNUM *tmp = NULL;
@@ -48,7 +48,7 @@ int ossl_ffc_validate_public_key_partial(const FFC_PARAMS *params,
if (BN_cmp(pub_key, tmp) >= 0)
*ret |= FFC_ERROR_PUBKEY_TOO_LARGE;
ok = 1;
- err:
+err:
if (ctx != NULL) {
BN_CTX_end(ctx);
BN_CTX_free(ctx);
@@ -60,7 +60,7 @@ int ossl_ffc_validate_public_key_partial(const FFC_PARAMS *params,
* See SP800-56Ar3 Section 5.6.2.3.1 : FFC Full public key validation.
*/
int ossl_ffc_validate_public_key(const FFC_PARAMS *params,
- const BIGNUM *pub_key, int *ret)
+ const BIGNUM *pub_key, int *ret)
{
int ok = 0;
BIGNUM *tmp = NULL;
@@ -85,7 +85,7 @@ int ossl_ffc_validate_public_key(const FFC_PARAMS *params,
}
ok = 1;
- err:
+err:
if (ctx != NULL) {
BN_CTX_end(ctx);
BN_CTX_free(ctx);
@@ -100,7 +100,7 @@ int ossl_ffc_validate_public_key(const FFC_PARAMS *params,
* Note: This assumes that the domain parameters are valid.
*/
int ossl_ffc_validate_private_key(const BIGNUM *upper, const BIGNUM *priv,
- int *ret)
+ int *ret)
{
int ok = 0;
diff --git a/crypto/ffc/ffc_params.c b/crypto/ffc/ffc_params.c
index b65cafdaa8..438997931b 100644
--- a/crypto/ffc/ffc_params.c
+++ b/crypto/ffc/ffc_params.c
@@ -14,7 +14,7 @@
#include "internal/nelem.h"
#ifndef FIPS_MODULE
-# include <openssl/asn1.h> /* ossl_ffc_params_print */
+#include <openssl/asn1.h> /* ossl_ffc_params_print */
#endif
void ossl_ffc_params_init(FFC_PARAMS *params)
@@ -60,7 +60,7 @@ void ossl_ffc_params_set0_pqg(FFC_PARAMS *d, BIGNUM *p, BIGNUM *q, BIGNUM *g)
}
void ossl_ffc_params_get0_pqg(const FFC_PARAMS *d, const BIGNUM **p,
- const BIGNUM **q, const BIGNUM **g)
+ const BIGNUM **q, const BIGNUM **g)
{
if (p != NULL)
*p = d->p;
@@ -70,7 +70,6 @@ void ossl_ffc_params_get0_pqg(const FFC_PARAMS *d, const BIGNUM **p,
*g = d->g;
}
-
/* j is the 'cofactor' that is optionally output for ASN1. */
void ossl_ffc_params_set0_j(FFC_PARAMS *d, BIGNUM *j)
{
@@ -81,7 +80,7 @@ void ossl_ffc_params_set0_j(FFC_PARAMS *d, BIGNUM *j)
}
int ossl_ffc_params_set_seed(FFC_PARAMS *params,
- const unsigned char *seed, size_t seedlen)
+ const unsigned char *seed, size_t seedlen)
{
if (params->seed != NULL) {
if (params->seed == seed)
@@ -122,7 +121,7 @@ void ossl_ffc_params_set_flags(FFC_PARAMS *params, unsigned int flags)
}
void ossl_ffc_params_enable_flags(FFC_PARAMS *params, unsigned int flags,
- int enable)
+ int enable)
{
if (enable)
params->flags |= flags;
@@ -137,8 +136,8 @@ void ossl_ffc_set_digest(FFC_PARAMS *params, const char *alg, const char *props)
}
int ossl_ffc_params_set_validate_params(FFC_PARAMS *params,
- const unsigned char *seed,
- size_t seedlen, int counter)
+ const unsigned char *seed,
+ size_t seedlen, int counter)
{
if (!ossl_ffc_params_set_seed(params, seed, seedlen))
return 0;
@@ -147,8 +146,8 @@ int ossl_ffc_params_set_validate_params(FFC_PARAMS *params,
}
void ossl_ffc_params_get_validate_params(const FFC_PARAMS *params,
- unsigned char **seed, size_t *seedlen,
- int *pcounter)
+ unsigned char **seed, size_t *seedlen,
+ int *pcounter)
{
if (seed != NULL)
*seed = params->seed;
@@ -169,7 +168,7 @@ static int ffc_bn_cpy(BIGNUM **dst, const BIGNUM *src)
if (src == NULL)
a = NULL;
else if (BN_get_flags(src, BN_FLG_STATIC_DATA)
- && !BN_get_flags(src, BN_FLG_MALLOCED))
+ && !BN_get_flags(src, BN_FLG_MALLOCED))
a = (BIGNUM *)src;
else if ((a = BN_dup(src)) == NULL)
return 0;
@@ -192,7 +191,7 @@ int ossl_ffc_params_copy(FFC_PARAMS *dst, const FFC_PARAMS *src)
dst->seedlen = src->seedlen;
if (src->seed != NULL) {
dst->seed = OPENSSL_memdup(src->seed, src->seedlen);
- if (dst->seed == NULL)
+ if (dst->seed == NULL)
return 0;
} else {
dst->seed = NULL;
@@ -209,12 +208,12 @@ int ossl_ffc_params_copy(FFC_PARAMS *dst, const FFC_PARAMS *src)
int ossl_ffc_params_cmp(const FFC_PARAMS *a, const FFC_PARAMS *b, int ignore_q)
{
return BN_cmp(a->p, b->p) == 0
- && BN_cmp(a->g, b->g) == 0
- && (ignore_q || BN_cmp(a->q, b->q) == 0); /* Note: q may be NULL */
+ && BN_cmp(a->g, b->g) == 0
+ && (ignore_q || BN_cmp(a->q, b->q) == 0); /* Note: q may be NULL */
}
int ossl_ffc_params_todata(const FFC_PARAMS *ffc, OSSL_PARAM_BLD *bld,
- const FFC_OSSL_PARAMS *pp)
+ const FFC_OSSL_PARAMS *pp)
{
int test_flags;
@@ -230,20 +229,20 @@ int ossl_ffc_params_todata(const FFC_PARAMS *ffc, OSSL_PARAM_BLD *bld,
return 0;
if (ffc->j != NULL
&& !ossl_param_build_set_bn(bld, PP(cofactor),
- OSSL_PKEY_PARAM_FFC_COFACTOR, ffc->j))
+ OSSL_PKEY_PARAM_FFC_COFACTOR, ffc->j))
return 0;
if (!ossl_param_build_set_int(bld, PP(g_index), OSSL_PKEY_PARAM_FFC_GINDEX,
- ffc->gindex))
+ ffc->gindex))
return 0;
if (!ossl_param_build_set_int(bld, PP(p_counter), OSSL_PKEY_PARAM_FFC_PCOUNTER,
- ffc->pcounter))
+ ffc->pcounter))
return 0;
if (!ossl_param_build_set_int(bld, PP(h), OSSL_PKEY_PARAM_FFC_H, ffc->h))
return 0;
if (ffc->seed != NULL
&& !ossl_param_build_set_octet_string(bld, PP(seed),
- OSSL_PKEY_PARAM_FFC_SEED,
- ffc->seed, ffc->seedlen))
+ OSSL_PKEY_PARAM_FFC_SEED,
+ ffc->seed, ffc->seedlen))
return 0;
if (ffc->nid != NID_undef) {
const DH_NAMED_GROUP *group = ossl_ffc_uid_to_dh_named_group(ffc->nid);
@@ -251,33 +250,33 @@ int ossl_ffc_params_todata(const FFC_PARAMS *ffc, OSSL_PARAM_BLD *bld,
if (name == NULL
|| !ossl_param_build_set_utf8_string(bld, PP(group_name),
- OSSL_PKEY_PARAM_GROUP_NAME,
- name))
+ OSSL_PKEY_PARAM_GROUP_NAME,
+ name))
return 0;
}
test_flags = ((ffc->flags & FFC_PARAM_FLAG_VALIDATE_PQ) != 0);
if (!ossl_param_build_set_int(bld, PP(validate_pq),
- OSSL_PKEY_PARAM_FFC_VALIDATE_PQ, test_flags))
+ OSSL_PKEY_PARAM_FFC_VALIDATE_PQ, test_flags))
return 0;
test_flags = ((ffc->flags & FFC_PARAM_FLAG_VALIDATE_G) != 0);
if (!ossl_param_build_set_int(bld, PP(validate_g),
- OSSL_PKEY_PARAM_FFC_VALIDATE_G, test_flags))
+ OSSL_PKEY_PARAM_FFC_VALIDATE_G, test_flags))
return 0;
test_flags = ((ffc->flags & FFC_PARAM_FLAG_VALIDATE_LEGACY) != 0);
if (!ossl_param_build_set_int(bld, PP(validate_legacy),
- OSSL_PKEY_PARAM_FFC_VALIDATE_LEGACY,
- test_flags))
+ OSSL_PKEY_PARAM_FFC_VALIDATE_LEGACY,
+ test_flags))
return 0;
if (ffc->mdname != NULL
&& !ossl_param_build_set_utf8_string(bld, PP(digest),
- OSSL_PKEY_PARAM_FFC_DIGEST,
- ffc->mdname))
- return 0;
+ OSSL_PKEY_PARAM_FFC_DIGEST,
+ ffc->mdname))
+ return 0;
if (ffc->mdprops != NULL
&& !ossl_param_build_set_utf8_string(bld, PP(propq),
- OSSL_PKEY_PARAM_FFC_DIGEST_PROPS,
- ffc->mdprops))
+ OSSL_PKEY_PARAM_FFC_DIGEST_PROPS,
+ ffc->mdprops))
return 0;
#undef PP
return 1;
@@ -309,7 +308,8 @@ int ossl_ffc_params_print(BIO *bp, const FFC_PARAMS *ffc, int indent)
goto err;
}
if (BIO_printf(bp, "%02x%s", ffc->seed[i],
- ((i + 1) == ffc->seedlen) ? "" : ":") <= 0)
+ ((i + 1) == ffc->seedlen) ? "" : ":")
+ <= 0)
goto err;
}
if (BIO_write(bp, "\n", 1) <= 0)
diff --git a/crypto/ffc/ffc_params_generate.c b/crypto/ffc/ffc_params_generate.c
index cf0f9ebb2c..d2792383eb 100644
--- a/crypto/ffc/ffc_params_generate.c
+++ b/crypto/ffc/ffc_params_generate.c
@@ -45,9 +45,9 @@ static int ffc_validate_LN(size_t L, size_t N, int type, int verify)
/* Valid DH L,N parameters from SP800-56Ar3 5.5.1 Table 1 */
if (L == 2048 && (N == 224 || N == 256))
return 112;
-# ifndef OPENSSL_NO_DH
+#ifndef OPENSSL_NO_DH
ERR_raise(ERR_LIB_DH, DH_R_BAD_FFC_PARAMETERS);
-# endif
+#endif
} else if (type == FFC_PARAM_TYPE_DSA) {
/* Valid DSA L,N parameters from FIPS 186-4 Section 4.2 */
/* In fips mode 1024/160 can only be used for verification */
@@ -57,9 +57,9 @@ static int ffc_validate_LN(size_t L, size_t N, int type, int verify)
return 112;
if (L == 3072 && N == 256)
return 128;
-# ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DSA
ERR_raise(ERR_LIB_DSA, DSA_R_BAD_FFC_PARAMETERS);
-# endif
+#endif
}
return 0;
}
@@ -73,9 +73,9 @@ static int ffc_validate_LN(size_t L, size_t N, int type, int verify)
/* Valid DH L,N parameters from SP800-56Ar3 5.5.1 Table 1 */
if (L == 2048 && (N == 224 || N == 256))
return 112;
-# ifndef OPENSSL_NO_DH
+#ifndef OPENSSL_NO_DH
ERR_raise(ERR_LIB_DH, DH_R_BAD_FFC_PARAMETERS);
-# endif
+#endif
} else if (type == FFC_PARAM_TYPE_DSA) {
if (L >= 3072 && N >= 256)
return 128;
@@ -83,9 +83,9 @@ static int ffc_validate_LN(size_t L, size_t N, int type, int verify)
return 112;
if (L >= 1024 && N >= 160)
return 80;
-# ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DSA
ERR_raise(ERR_LIB_DSA, DSA_R_BAD_FFC_PARAMETERS);
-# endif
+#endif
}
return 0;
}
@@ -93,9 +93,9 @@ static int ffc_validate_LN(size_t L, size_t N, int type, int verify)
/* FIPS186-4 A.2.1 Unverifiable Generation of Generator g */
static int generate_unverifiable_g(BN_CTX *ctx, BN_MONT_CTX *mont, BIGNUM *g,
- BIGNUM *hbn, const BIGNUM *p,
- const BIGNUM *e,const BIGNUM *pm1,
- int *hret)
+ BIGNUM *hbn, const BIGNUM *p,
+ const BIGNUM *e, const BIGNUM *pm1,
+ int *hret)
{
int h = 2;
@@ -130,9 +130,9 @@ static int generate_unverifiable_g(BN_CTX *ctx, BN_MONT_CTX *mont, BIGNUM *g,
* Returns a value in g.
*/
static int generate_canonical_g(BN_CTX *ctx, BN_MONT_CTX *mont,
- const EVP_MD *evpmd, BIGNUM *g, BIGNUM *tmp,
- const BIGNUM *p, const BIGNUM *e,
- int gindex, unsigned char *seed, size_t seedlen)
+ const EVP_MD *evpmd, BIGNUM *g, BIGNUM *tmp,
+ const BIGNUM *p, const BIGNUM *e,
+ int gindex, unsigned char *seed, size_t seedlen)
{
int ret = 0;
int counter = 1;
@@ -148,11 +148,11 @@ static int generate_canonical_g(BN_CTX *ctx, BN_MONT_CTX *mont,
if (mctx == NULL)
return 0;
- /*
- * A.2.3 Step (4) & (5)
- * A.2.4 Step (6) & (7)
- * counter = 0; counter += 1
- */
+ /*
+ * A.2.3 Step (4) & (5)
+ * A.2.4 Step (6) & (7)
+ * counter = 0; counter += 1
+ */
for (counter = 1; counter <= 0xFFFF; ++counter) {
/*
* A.2.3 Step (7) & (8) & (9)
@@ -166,13 +166,13 @@ static int generate_canonical_g(BN_CTX *ctx, BN_MONT_CTX *mont,
md[1] = (unsigned char)((counter >> 8) & 0xff);
md[2] = (unsigned char)(counter & 0xff);
if (!EVP_DigestInit_ex(mctx, evpmd, NULL)
- || !EVP_DigestUpdate(mctx, seed, seedlen)
- || !EVP_DigestUpdate(mctx, ggen, sizeof(ggen))
- || !EVP_DigestUpdate(mctx, md, 3)
- || !EVP_DigestFinal_ex(mctx, md, NULL)
- || (BN_bin2bn(md, mdsize, tmp) == NULL)
- || !BN_mod_exp_mont(g, tmp, e, p, ctx, mont))
- break; /* exit on failure */
+ || !EVP_DigestUpdate(mctx, seed, seedlen)
+ || !EVP_DigestUpdate(mctx, ggen, sizeof(ggen))
+ || !EVP_DigestUpdate(mctx, md, 3)
+ || !EVP_DigestFinal_ex(mctx, md, NULL)
+ || (BN_bin2bn(md, mdsize, tmp) == NULL)
+ || !BN_mod_exp_mont(g, tmp, e, p, ctx, mont))
+ break; /* exit on failure */
/*
* A.2.3 Step (10)
* A.2.4 Step (12)
@@ -189,9 +189,9 @@ static int generate_canonical_g(BN_CTX *ctx, BN_MONT_CTX *mont,
/* Generation of p is the same for FIPS 186-4 & FIPS 186-2 */
static int generate_p(BN_CTX *ctx, const EVP_MD *evpmd, int max_counter, int n,
- unsigned char *buf, size_t buf_len, const BIGNUM *q,
- BIGNUM *p, int L, BN_GENCB *cb, int *counter,
- int *res)
+ unsigned char *buf, size_t buf_len, const BIGNUM *q,
+ BIGNUM *p, int L, BN_GENCB *cb, int *counter,
+ int *res)
{
int ret = -1;
int i, j, k, r;
@@ -242,14 +242,14 @@ static int generate_p(BN_CTX *ctx, const EVP_MD *evpmd, int max_counter, int n,
* tmp = V(j) = Hash((seed + offset + j) % 2^seedlen)
*/
if (!EVP_Digest(buf, buf_len, md, NULL, evpmd, NULL)
- || (BN_bin2bn(md, mdsize, tmp) == NULL)
- /*
- * A.1.1.2 Step (11.2)
- * A.1.1.3 Step (13.2)
- * W += V(j) * 2^(outlen * j)
- */
- || !BN_lshift(tmp, tmp, (mdsize << 3) * j)
- || !BN_add(W, W, tmp))
+ || (BN_bin2bn(md, mdsize, tmp) == NULL)
+ /*
+ * A.1.1.2 Step (11.2)
+ * A.1.1.3 Step (13.2)
+ * W += V(j) * 2^(outlen * j)
+ */
+ || !BN_lshift(tmp, tmp, (mdsize << 3) * j)
+ || !BN_add(W, W, tmp))
goto err;
}
@@ -259,22 +259,22 @@ static int generate_p(BN_CTX *ctx, const EVP_MD *evpmd, int max_counter, int n,
* X = W + 2^(L-1) where W < 2^(L-1)
*/
if (!BN_mask_bits(W, L - 1)
- || !BN_copy(X, W)
- || !BN_add(X, X, test)
- /*
- * A.1.1.2 Step (11.4) AND
- * A.1.1.3 Step (13.4)
- * c = X mod 2q
- */
- || !BN_lshift1(tmp, q)
- || !BN_mod(c, X, tmp, ctx)
- /*
- * A.1.1.2 Step (11.5) AND
- * A.1.1.3 Step (13.5)
- * p = X - (c - 1)
- */
- || !BN_sub(tmp, c, BN_value_one())
- || !BN_sub(p, X, tmp))
+ || !BN_copy(X, W)
+ || !BN_add(X, X, test)
+ /*
+ * A.1.1.2 Step (11.4) AND
+ * A.1.1.3 Step (13.4)
+ * c = X mod 2q
+ */
+ || !BN_lshift1(tmp, q)
+ || !BN_mod(c, X, tmp, ctx)
+ /*
+ * A.1.1.2 Step (11.5) AND
+ * A.1.1.3 Step (13.5)
+ * p = X - (c - 1)
+ */
+ || !BN_sub(tmp, c, BN_value_one())
+ || !BN_sub(p, X, tmp))
goto err;
/*
@@ -294,7 +294,7 @@ static int generate_p(BN_CTX *ctx, const EVP_MD *evpmd, int max_counter, int n,
/* A.1.1.2 Step (11.8) : Return if p is prime */
if (r > 0) {
*counter = i;
- ret = 1; /* return success */
+ ret = 1; /* return success */
goto err;
}
if (r != 0)
@@ -311,9 +311,9 @@ err:
}
static int generate_q_fips186_4(BN_CTX *ctx, BIGNUM *q, const EVP_MD *evpmd,
- int qsize, unsigned char *seed, size_t seedlen,
- int generate_seed, int *retm, int *res,
- BN_GENCB *cb)
+ int qsize, unsigned char *seed, size_t seedlen,
+ int generate_seed, int *retm, int *res,
+ BN_GENCB *cb)
{
int ret = 0, r;
int m = *retm;
@@ -332,7 +332,7 @@ static int generate_q_fips186_4(BN_CTX *ctx, BIGNUM *q, const EVP_MD *evpmd,
/* A.1.1.2 Step (5) : generate seed with size seed_len */
if (generate_seed
- && RAND_bytes_ex(libctx, seed, seedlen, 0) <= 0)
+ && RAND_bytes_ex(libctx, seed, seedlen, 0) <= 0)
goto err;
/*
* A.1.1.2 Step (6) AND
@@ -355,7 +355,7 @@ static int generate_q_fips186_4(BN_CTX *ctx, BIGNUM *q, const EVP_MD *evpmd,
* q = U + 2^(N-1) + (1 - U %2) (This sets top and bottom bits)
*/
pmd[0] |= 0x80;
- pmd[qsize-1] |= 0x01;
+ pmd[qsize - 1] |= 0x01;
if (!BN_bin2bn(pmd, qsize, q))
goto err;
@@ -387,9 +387,9 @@ err:
}
static int generate_q_fips186_2(BN_CTX *ctx, BIGNUM *q, const EVP_MD *evpmd,
- unsigned char *buf, unsigned char *seed,
- size_t qsize, int generate_seed, int *retm,
- int *res, BN_GENCB *cb)
+ unsigned char *buf, unsigned char *seed,
+ size_t qsize, int generate_seed, int *retm,
+ int *res, BN_GENCB *cb)
{
unsigned char buf2[EVP_MAX_MD_SIZE];
unsigned char md[EVP_MAX_MD_SIZE];
@@ -514,9 +514,9 @@ static const char *default_mdname(size_t N)
* but G is unverifiable.
*/
int ossl_ffc_params_FIPS186_4_gen_verify(OSSL_LIB_CTX *libctx,
- FFC_PARAMS *params, int mode, int type,
- size_t L, size_t N, int *res,
- BN_GENCB *cb)
+ FFC_PARAMS *params, int mode, int type,
+ size_t L, size_t N, int *res,
+ BN_GENCB *cb)
{
int ok = FFC_PARAM_RET_STATUS_FAILED;
unsigned char *seed = NULL, *seed_tmp = NULL;
@@ -684,7 +684,7 @@ int ossl_ffc_params_FIPS186_4_gen_verify(OSSL_LIB_CTX *libctx,
for (;;) {
if (!generate_q_fips186_4(ctx, q, md, qsize, seed, seedlen,
- seed != params->seed, &m, res, cb))
+ seed != params->seed, &m, res, cb))
goto err;
/* A.1.1.3 Step (9): Verify that q matches the expected value */
if (verify && (BN_cmp(q, params->q) != 0)) {
@@ -698,7 +698,7 @@ int ossl_ffc_params_FIPS186_4_gen_verify(OSSL_LIB_CTX *libctx,
memcpy(seed_tmp, seed, seedlen);
r = generate_p(ctx, md, counter, n, seed_tmp, seedlen, q, p, (int)L,
- cb, &pcounter, res);
+ cb, &pcounter, res);
if (r > 0)
break; /* found p */
if (r < 0)
@@ -713,7 +713,7 @@ int ossl_ffc_params_FIPS186_4_gen_verify(OSSL_LIB_CTX *libctx,
goto err;
}
}
- if(!BN_GENCB_call(cb, 2, 1))
+ if (!BN_GENCB_call(cb, 2, 1))
goto err;
/*
* Gets here if we found p.
@@ -733,7 +733,7 @@ g_only:
if (((flags & FFC_PARAM_FLAG_VALIDATE_G) != 0)
&& !ossl_ffc_params_validate_unverifiable_g(ctx, mont, p, q, params->g,
- tmp, res))
+ tmp, res))
goto err;
/*
@@ -749,7 +749,7 @@ g_only:
if ((seed != NULL) && (params->gindex != FFC_UNVERIFIABLE_GINDEX)) {
canonical_g = 1;
if (!generate_canonical_g(ctx, mont, md, g, tmp, p, e,
- params->gindex, seed, seedlen)) {
+ params->gindex, seed, seedlen)) {
*res = FFC_CHECK_INVALID_G;
goto err;
}
@@ -782,7 +782,7 @@ g_only:
if (params->p == NULL || params->q == NULL || params->g == NULL)
goto err;
if (!ossl_ffc_params_set_validate_params(params, seed, seedlen,
- pcounter))
+ pcounter))
goto err;
params->h = hret;
}
@@ -807,9 +807,9 @@ err:
/* Note this function is only used for verification in fips mode */
int ossl_ffc_params_FIPS186_2_gen_verify(OSSL_LIB_CTX *libctx,
- FFC_PARAMS *params, int mode, int type,
- size_t L, size_t N, int *res,
- BN_GENCB *cb)
+ FFC_PARAMS *params, int mode, int type,
+ size_t L, size_t N, int *res,
+ BN_GENCB *cb)
{
int ok = FFC_PARAM_RET_STATUS_FAILED;
unsigned char seed[SHA256_DIGEST_LENGTH];
@@ -935,7 +935,7 @@ int ossl_ffc_params_FIPS186_2_gen_verify(OSSL_LIB_CTX *libctx,
use_random_seed = (seed_in == NULL);
for (;;) {
if (!generate_q_fips186_2(ctx, q, md, buf, seed, qsize,
- use_random_seed, &m, res, cb))
+ use_random_seed, &m, res, cb))
goto err;
if (!BN_GENCB_call(cb, 2, 0))
@@ -956,7 +956,7 @@ int ossl_ffc_params_FIPS186_2_gen_verify(OSSL_LIB_CTX *libctx,
}
rv = generate_p(ctx, md, counter, n, buf, qsize, q, p, (int)L, cb,
- &pcounter, res);
+ &pcounter, res);
if (rv > 0)
break; /* found it */
if (rv == -1)
@@ -998,9 +998,9 @@ g_only:
if (!generate_unverifiable_g(ctx, mont, g, tmp, p, r0, test, &hret))
goto err;
} else if (((flags & FFC_PARAM_FLAG_VALIDATE_G) != 0)
- && !ossl_ffc_params_validate_unverifiable_g(ctx, mont, p, q,
- params->g, tmp,
- res)) {
+ && !ossl_ffc_params_validate_unverifiable_g(ctx, mont, p, q,
+ params->g, tmp,
+ res)) {
goto err;
}
@@ -1041,22 +1041,22 @@ err:
}
int ossl_ffc_params_FIPS186_4_generate(OSSL_LIB_CTX *libctx, FFC_PARAMS *params,
- int type, size_t L, size_t N,
- int *res, BN_GENCB *cb)
+ int type, size_t L, size_t N,
+ int *res, BN_GENCB *cb)
{
return ossl_ffc_params_FIPS186_4_gen_verify(libctx, params,
- FFC_PARAM_MODE_GENERATE,
- type, L, N, res, cb);
+ FFC_PARAM_MODE_GENERATE,
+ type, L, N, res, cb);
}
/* This should no longer be used in FIPS mode */
int ossl_ffc_params_FIPS186_2_generate(OSSL_LIB_CTX *libctx, FFC_PARAMS *params,
- int type, size_t L, size_t N,
- int *res, BN_GENCB *cb)
+ int type, size_t L, size_t N,
+ int *res, BN_GENCB *cb)
{
if (!ossl_ffc_params_FIPS186_2_gen_verify(libctx, params,
- FFC_PARAM_MODE_GENERATE,
- type, L, N, res, cb))
+ FFC_PARAM_MODE_GENERATE,
+ type, L, N, res, cb))
return 0;
ossl_ffc_params_enable_flags(params, FFC_PARAM_FLAG_VALIDATE_LEGACY, 1);
diff --git a/crypto/ffc/ffc_params_validate.c b/crypto/ffc/ffc_params_validate.c
index c1b4cf05d2..36ea9449b6 100644
--- a/crypto/ffc/ffc_params_validate.c
+++ b/crypto/ffc/ffc_params_validate.c
@@ -21,9 +21,9 @@
/* FIPS186-4 A.2.2 Unverifiable partial validation of Generator g */
int ossl_ffc_params_validate_unverifiable_g(BN_CTX *ctx, BN_MONT_CTX *mont,
- const BIGNUM *p, const BIGNUM *q,
- const BIGNUM *g, BIGNUM *tmp,
- int *ret)
+ const BIGNUM *p, const BIGNUM *q,
+ const BIGNUM *g, BIGNUM *tmp,
+ int *ret)
{
/*
* A.2.2 Step (1) AND
@@ -50,8 +50,8 @@ int ossl_ffc_params_validate_unverifiable_g(BN_CTX *ctx, BN_MONT_CTX *mont,
}
int ossl_ffc_params_FIPS186_4_validate(OSSL_LIB_CTX *libctx,
- const FFC_PARAMS *params, int type,
- int *res, BN_GENCB *cb)
+ const FFC_PARAMS *params, int type,
+ int *res, BN_GENCB *cb)
{
size_t L, N;
@@ -62,14 +62,14 @@ int ossl_ffc_params_FIPS186_4_validate(OSSL_LIB_CTX *libctx,
L = BN_num_bits(params->p);
N = BN_num_bits(params->q);
return ossl_ffc_params_FIPS186_4_gen_verify(libctx, (FFC_PARAMS *)params,
- FFC_PARAM_MODE_VERIFY, type,
- L, N, res, cb);
+ FFC_PARAM_MODE_VERIFY, type,
+ L, N, res, cb);
}
/* This may be used in FIPS mode to validate deprecated FIPS-186-2 Params */
int ossl_ffc_params_FIPS186_2_validate(OSSL_LIB_CTX *libctx,
- const FFC_PARAMS *params, int type,
- int *res, BN_GENCB *cb)
+ const FFC_PARAMS *params, int type,
+ int *res, BN_GENCB *cb)
{
size_t L, N;
@@ -82,8 +82,8 @@ int ossl_ffc_params_FIPS186_2_validate(OSSL_LIB_CTX *libctx,
L = BN_num_bits(params->p);
N = BN_num_bits(params->q);
return ossl_ffc_params_FIPS186_2_gen_verify(libctx, (FFC_PARAMS *)params,
- FFC_PARAM_MODE_VERIFY, type,
- L, N, res, cb);
+ FFC_PARAM_MODE_VERIFY, type,
+ L, N, res, cb);
}
/*
@@ -93,11 +93,11 @@ int ossl_ffc_params_FIPS186_2_validate(OSSL_LIB_CTX *libctx,
* this test.
*/
int ossl_ffc_params_simple_validate(OSSL_LIB_CTX *libctx, const FFC_PARAMS *params,
- int paramstype, int *res)
+ int paramstype, int *res)
{
int ret;
int tmpres = 0;
- FFC_PARAMS tmpparams = {0};
+ FFC_PARAMS tmpparams = { 0 };
if (params == NULL)
return 0;
@@ -114,11 +114,11 @@ int ossl_ffc_params_simple_validate(OSSL_LIB_CTX *libctx, const FFC_PARAMS *para
#ifndef FIPS_MODULE
if (params->flags & FFC_PARAM_FLAG_VALIDATE_LEGACY)
ret = ossl_ffc_params_FIPS186_2_validate(libctx, &tmpparams, paramstype,
- res, NULL);
+ res, NULL);
else
#endif
ret = ossl_ffc_params_FIPS186_4_validate(libctx, &tmpparams, paramstype,
- res, NULL);
+ res, NULL);
#ifndef OPENSSL_NO_DH
if (ret == FFC_PARAM_RET_STATUS_FAILED
&& (*res & FFC_ERROR_NOT_SUITABLE_GENERATOR) != 0) {
@@ -137,7 +137,7 @@ int ossl_ffc_params_simple_validate(OSSL_LIB_CTX *libctx, const FFC_PARAMS *para
* p and q.
*/
int ossl_ffc_params_full_validate(OSSL_LIB_CTX *libctx, const FFC_PARAMS *params,
- int paramstype, int *res)
+ int paramstype, int *res)
{
int tmpres = 0;
@@ -149,15 +149,15 @@ int ossl_ffc_params_full_validate(OSSL_LIB_CTX *libctx, const FFC_PARAMS *params
#ifdef FIPS_MODULE
return ossl_ffc_params_FIPS186_4_validate(libctx, params, paramstype,
- res, NULL);
+ res, NULL);
#else
if (params->seed != NULL) {
if (params->flags & FFC_PARAM_FLAG_VALIDATE_LEGACY)
return ossl_ffc_params_FIPS186_2_validate(libctx, params, paramstype,
- res, NULL);
+ res, NULL);
else
return ossl_ffc_params_FIPS186_4_validate(libctx, params, paramstype,
- res, NULL);
+ res, NULL);
} else {
int ret = 0;
@@ -168,15 +168,15 @@ int ossl_ffc_params_full_validate(OSSL_LIB_CTX *libctx, const FFC_PARAMS *params
if ((ctx = BN_CTX_new_ex(libctx)) == NULL)
return 0;
if (BN_check_prime(params->q, ctx, NULL) != 1) {
-# ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DSA
ERR_raise(ERR_LIB_DSA, DSA_R_Q_NOT_PRIME);
-# endif
+#endif
ret = 0;
}
if (ret && BN_check_prime(params->p, ctx, NULL) != 1) {
-# ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DSA
ERR_raise(ERR_LIB_DSA, DSA_R_P_NOT_PRIME);
-# endif
+#endif
ret = 0;
}
BN_CTX_free(ctx);
diff --git a/crypto/getenv.c b/crypto/getenv.c
index fe8444f417..aa01ea8af7 100644
--- a/crypto/getenv.c
+++ b/crypto/getenv.c
@@ -8,7 +8,7 @@
*/
#ifndef _GNU_SOURCE
-# define _GNU_SOURCE
+#define _GNU_SOURCE
#endif
#include <stdlib.h>
@@ -34,10 +34,7 @@ char *ossl_safe_getenv(const char *name)
* For the code pages listed below, dwFlags must be set to 0.
* Otherwise, the function fails with ERROR_INVALID_FLAGS.
*/
- if (curacp == 50220 || curacp == 50221 || curacp == 50222 ||
- curacp == 50225 || curacp == 50227 || curacp == 50229 ||
- (57002 <= curacp && curacp <=57011) || curacp == 65000 ||
- curacp == 42)
+ if (curacp == 50220 || curacp == 50221 || curacp == 50222 || curacp == 50225 || curacp == 50227 || curacp == 50229 || (57002 <= curacp && curacp <= 57011) || curacp == 65000 || curacp == 42)
dwFlags = 0;
/* query for buffer len */
@@ -62,7 +59,7 @@ char *ossl_safe_getenv(const char *name)
if (GetEnvironmentVariableW(namew, valw, envlen) < envlen) {
/* determine value string size in utf-8 */
vallen = WideCharToMultiByte(CP_UTF8, 0, valw, -1, NULL, 0,
- NULL, NULL);
+ NULL, NULL);
}
}
@@ -72,7 +69,8 @@ char *ossl_safe_getenv(const char *name)
if (NULL != val) {
/* convert value string from wide to utf-8 */
if (WideCharToMultiByte(CP_UTF8, 0, valw, -1, val, vallen,
- NULL, NULL) == 0) {
+ NULL, NULL)
+ == 0) {
OPENSSL_free(val);
val = NULL;
}
@@ -89,10 +87,10 @@ char *ossl_safe_getenv(const char *name)
#endif
#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
-# if __GLIBC_PREREQ(2, 17)
-# define SECURE_GETENV
+#if __GLIBC_PREREQ(2, 17)
+#define SECURE_GETENV
return secure_getenv(name);
-# endif
+#endif
#endif
#ifndef SECURE_GETENV
diff --git a/crypto/hashtable/hashtable.c b/crypto/hashtable/hashtable.c
index da81dab130..10dda82a74 100644
--- a/crypto/hashtable/hashtable.c
+++ b/crypto/hashtable/hashtable.c
@@ -62,13 +62,13 @@
* map the latter to the former
*/
#if defined(__clang__) && defined(__has_feature)
-# if __has_feature(thread_sanitizer)
-# define __SANITIZE_THREADS__
-# endif
+#if __has_feature(thread_sanitizer)
+#define __SANITIZE_THREADS__
+#endif
#endif
#ifdef __SANITIZE_THREADS__
-# include <sanitizer/tsan_interface.h>
+#include <sanitizer/tsan_interface.h>
#endif
/*
@@ -79,11 +79,11 @@
* structure for faster lookups
*/
#if defined(__GNUC__) || defined(__CLANG__)
-# define PREFETCH_NEIGHBORHOOD(x) __builtin_prefetch(x.entries)
-# define PREFETCH(x) __builtin_prefetch(x)
+#define PREFETCH_NEIGHBORHOOD(x) __builtin_prefetch(x.entries)
+#define PREFETCH(x) __builtin_prefetch(x)
#else
-# define PREFETCH_NEIGHBORHOOD(x)
-# define PREFETCH(x)
+#define PREFETCH_NEIGHBORHOOD(x)
+#define PREFETCH(x)
#endif
/*
@@ -149,20 +149,19 @@ struct ht_internal_st {
static void free_value(struct ht_internal_value_st *v);
static struct ht_neighborhood_st *alloc_new_neighborhood_list(size_t len,
- void **freeptr)
+ void **freeptr)
{
struct ht_neighborhood_st *ret;
#if !defined(OPENSSL_SMALL_FOOTPRINT)
ret = OPENSSL_aligned_alloc_array(len, sizeof(struct ht_neighborhood_st),
- CACHE_LINE_BYTES, freeptr);
+ CACHE_LINE_BYTES, freeptr);
/* fall back to regular malloc */
if (ret == NULL)
#endif
{
- ret = *freeptr =
- OPENSSL_malloc_array(len, sizeof(struct ht_neighborhood_st));
+ ret = *freeptr = OPENSSL_malloc_array(len, sizeof(struct ht_neighborhood_st));
if (ret == NULL)
return NULL;
}
@@ -218,9 +217,8 @@ HT *ossl_ht_new(const HT_CONFIG *conf)
if (new->md == NULL)
goto err;
- new->md->neighborhoods =
- alloc_new_neighborhood_list(new->wpd.neighborhood_len,
- &new->md->neighborhood_ptr_to_free);
+ new->md->neighborhoods = alloc_new_neighborhood_list(new->wpd.neighborhood_len,
+ &new->md->neighborhood_ptr_to_free);
if (new->md->neighborhoods == NULL)
goto err;
new->md->neighborhood_mask = new->wpd.neighborhood_len - 1;
@@ -317,7 +315,7 @@ static int ossl_ht_flush_internal(HT *h)
return 0;
newmd->neighborhoods = alloc_new_neighborhood_list(DEFAULT_NEIGH_LEN,
- &newmd->neighborhood_ptr_to_free);
+ &newmd->neighborhood_ptr_to_free);
if (newmd->neighborhoods == NULL) {
OPENSSL_free(newmd);
return 0;
@@ -381,7 +379,7 @@ size_t ossl_ht_count(HT *h)
}
void ossl_ht_foreach_until(HT *h, int (*cb)(HT_VALUE *obj, void *arg),
- void *arg)
+ void *arg)
{
size_t i, j;
struct ht_mutable_data_st *md;
@@ -401,12 +399,12 @@ out:
}
HT_VALUE_LIST *ossl_ht_filter(HT *h, size_t max_len,
- int (*filter)(HT_VALUE *obj, void *arg),
- void *arg)
+ int (*filter)(HT_VALUE *obj, void *arg),
+ void *arg)
{
struct ht_mutable_data_st *md;
HT_VALUE_LIST *list = OPENSSL_zalloc(sizeof(HT_VALUE_LIST)
- + (sizeof(HT_VALUE *) * max_len));
+ + (sizeof(HT_VALUE *) * max_len));
size_t i, j;
struct ht_internal_value_st *v;
@@ -421,7 +419,7 @@ HT_VALUE_LIST *ossl_ht_filter(HT *h, size_t max_len,
md = ossl_rcu_deref(&h->md);
for (i = 0; i < md->neighborhood_mask + 1; i++) {
- PREFETCH_NEIGHBORHOOD(md->neighborhoods[i+1]);
+ PREFETCH_NEIGHBORHOOD(md->neighborhoods[i + 1]);
for (j = 0; j < NEIGHBORHOOD_LEN; j++) {
v = md->neighborhoods[i].entries[j].value;
if (v != NULL && filter((HT_VALUE *)v, arg)) {
@@ -476,7 +474,7 @@ static int grow_hashtable(HT *h, size_t oldsize)
/* bucket list is always a power of 2 */
newmd->neighborhoods = alloc_new_neighborhood_list(oldsize * 2,
- &newmd->neighborhood_ptr_to_free);
+ &newmd->neighborhood_ptr_to_free);
if (newmd->neighborhoods == NULL)
goto out_free;
@@ -571,8 +569,8 @@ static ossl_inline int match_key(HT_KEY *a, HT_KEY *b)
}
static int ossl_ht_insert_locked(HT *h, uint64_t hash,
- struct ht_internal_value_st *newval,
- HT_VALUE **olddata)
+ struct ht_internal_value_st *newval,
+ HT_VALUE **olddata)
{
struct ht_mutable_data_st *md = h->md;
uint64_t neigh_idx_start = hash & md->neighborhood_mask;
@@ -600,13 +598,12 @@ static int ossl_ht_insert_locked(HT *h, uint64_t hash,
}
if (!h->config.no_rcu) {
if (!CRYPTO_atomic_load(&md->neighborhoods[neigh_idx].entries[j].hash,
- &ihash, h->atomic_lock))
+ &ihash, h->atomic_lock))
return 0;
} else {
ihash = md->neighborhoods[neigh_idx].entries[j].hash;
}
- if (compare_hash(hash, ihash) && match_key(&newval->value.key,
- &ival->key)) {
+ if (compare_hash(hash, ihash) && match_key(&newval->value.key, &ival->key)) {
if (olddata == NULL) {
/* This would insert a duplicate -> fail */
return 0;
@@ -614,11 +611,11 @@ static int ossl_ht_insert_locked(HT *h, uint64_t hash,
/* Do a replacement */
if (!h->config.no_rcu) {
if (!CRYPTO_atomic_store(&md->neighborhoods[neigh_idx].entries[j].hash,
- hash, h->atomic_lock))
+ hash, h->atomic_lock))
return 0;
*olddata = (HT_VALUE *)md->neighborhoods[neigh_idx].entries[j].value;
ossl_rcu_assign_ptr(&md->neighborhoods[neigh_idx].entries[j].value,
- &newval);
+ &newval);
ossl_rcu_call(h->lock, free_old_ht_value, *olddata);
} else {
md->neighborhoods[neigh_idx].entries[j].hash = hash;
@@ -635,16 +632,16 @@ static int ossl_ht_insert_locked(HT *h, uint64_t hash,
neigh_idx = (neigh_idx + 1) & md->neighborhood_mask;
} while (neigh_idx != neigh_idx_start);
- not_found:
+not_found:
/* If we get to here, its just an insert */
if (empty_idx == SIZE_MAX)
return -1; /* out of space */
if (!h->config.no_rcu) {
if (!CRYPTO_atomic_store(&md->neighborhoods[neigh_idx].entries[empty_idx].hash,
- hash, h->atomic_lock))
+ hash, h->atomic_lock))
return 0;
ossl_rcu_assign_ptr(&md->neighborhoods[neigh_idx].entries[empty_idx].value,
- &newval);
+ &newval);
} else {
md->neighborhoods[neigh_idx].entries[empty_idx].hash = hash;
md->neighborhoods[neigh_idx].entries[empty_idx].value = newval;
@@ -654,8 +651,8 @@ static int ossl_ht_insert_locked(HT *h, uint64_t hash,
}
static struct ht_internal_value_st *alloc_new_value(HT *h, HT_KEY *key,
- void *data,
- uintptr_t *type)
+ void *data,
+ uintptr_t *type)
{
struct ht_internal_value_st *tmp;
size_t nvsize = sizeof(*tmp);
@@ -678,7 +675,6 @@ static struct ht_internal_value_st *alloc_new_value(HT *h, HT_KEY *key,
memcpy(tmp->value.key.keybuf, key->keybuf, key->keysize);
}
-
return tmp;
}
@@ -709,9 +705,9 @@ int ossl_ht_insert(HT *h, HT_KEY *key, HT_VALUE *data, HT_VALUE **olddata)
hash = h->config.ht_hash_fn(key);
for (i = 0;
- (rc = ossl_ht_insert_locked(h, hash, newval, olddata)) == -1
- && i < 4;
- ++i)
+ (rc = ossl_ht_insert_locked(h, hash, newval, olddata)) == -1
+ && i < 4;
+ ++i)
if (!grow_hashtable(h, h->wpd.neighborhood_len)) {
rc = -1;
break;
@@ -757,7 +753,7 @@ HT_VALUE *ossl_ht_get(HT *h, HT_KEY *key)
}
if (!h->config.no_rcu) {
if (!CRYPTO_atomic_load(&md->neighborhoods[neigh_idx].entries[j].hash,
- &ehash, h->atomic_lock))
+ &ehash, h->atomic_lock))
return NULL;
} else {
ehash = md->neighborhoods[neigh_idx].entries[j].hash;
@@ -806,7 +802,7 @@ int ossl_ht_delete(HT *h, HT_KEY *key)
&& match_key(key, &v->value.key)) {
if (!h->config.no_rcu) {
if (!CRYPTO_atomic_store(&h->md->neighborhoods[neigh_idx].entries[j].hash,
- 0, h->atomic_lock))
+ 0, h->atomic_lock))
break;
ossl_rcu_assign_ptr(&h->md->neighborhoods[neigh_idx].entries[j].value, &nv);
} else {
diff --git a/crypto/hmac/hmac.c b/crypto/hmac/hmac.c
index 005ccb7727..400dde4d40 100644
--- a/crypto/hmac/hmac.c
+++ b/crypto/hmac/hmac.c
@@ -23,7 +23,7 @@
#include "hmac_local.h"
int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
- const EVP_MD *md, ENGINE *impl)
+ const EVP_MD *md, ENGINE *impl)
{
int rv = 0, reset = 0;
int i, j;
@@ -68,9 +68,9 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
return 0;
if (j < len) {
if (!EVP_DigestInit_ex(ctx->md_ctx, md, NULL)
- || !EVP_DigestUpdate(ctx->md_ctx, key, len)
- || !EVP_DigestFinal_ex(ctx->md_ctx, keytmp,
- &keytmp_length))
+ || !EVP_DigestUpdate(ctx->md_ctx, key, len)
+ || !EVP_DigestFinal_ex(ctx->md_ctx, keytmp,
+ &keytmp_length))
return 0;
} else {
if (len < 0 || len > (int)sizeof(keytmp))
@@ -80,26 +80,26 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
}
if (keytmp_length != HMAC_MAX_MD_CBLOCK_SIZE)
memset(&keytmp[keytmp_length], 0,
- HMAC_MAX_MD_CBLOCK_SIZE - keytmp_length);
+ HMAC_MAX_MD_CBLOCK_SIZE - keytmp_length);
for (i = 0; i < HMAC_MAX_MD_CBLOCK_SIZE; i++)
pad[i] = 0x36 ^ keytmp[i];
if (!EVP_DigestInit_ex(ctx->i_ctx, md, NULL)
- || !EVP_DigestUpdate(ctx->i_ctx, pad,
- EVP_MD_get_block_size(md)))
+ || !EVP_DigestUpdate(ctx->i_ctx, pad,
+ EVP_MD_get_block_size(md)))
goto err;
for (i = 0; i < HMAC_MAX_MD_CBLOCK_SIZE; i++)
pad[i] = 0x5c ^ keytmp[i];
if (!EVP_DigestInit_ex(ctx->o_ctx, md, NULL)
- || !EVP_DigestUpdate(ctx->o_ctx, pad,
- EVP_MD_get_block_size(md)))
+ || !EVP_DigestUpdate(ctx->o_ctx, pad,
+ EVP_MD_get_block_size(md)))
goto err;
}
if (!EVP_MD_CTX_copy_ex(ctx->md_ctx, ctx->i_ctx))
goto err;
rv = 1;
- err:
+err:
if (reset) {
OPENSSL_cleanse(keytmp, sizeof(keytmp));
OPENSSL_cleanse(pad, sizeof(pad));
@@ -151,7 +151,7 @@ int HMAC_Final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len)
if (!EVP_DigestFinal_ex(ctx->md_ctx, md, len))
goto err;
return 1;
- err:
+err:
return 0;
}
@@ -243,14 +243,14 @@ int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx)
#endif
return 1;
- err:
+err:
hmac_ctx_cleanup(dctx);
return 0;
}
unsigned char *HMAC(const EVP_MD *evp_md, const void *key, int key_len,
- const unsigned char *data, size_t data_len,
- unsigned char *md, unsigned int *md_len)
+ const unsigned char *data, size_t data_len,
+ unsigned char *md, unsigned int *md_len)
{
static unsigned char static_md[EVP_MAX_MD_SIZE];
int size = EVP_MD_get_size(evp_md);
@@ -259,8 +259,8 @@ unsigned char *HMAC(const EVP_MD *evp_md, const void *key, int key_len,
if (size > 0) {
ret = EVP_Q_mac(NULL, "HMAC", NULL, EVP_MD_get0_name(evp_md), NULL,
- key, key_len, data, data_len,
- md == NULL ? static_md : md, size, &temp_md_len);
+ key, key_len, data, data_len,
+ md == NULL ? static_md : md, size, &temp_md_len);
if (md_len != NULL)
*md_len = (unsigned int)temp_md_len;
}
diff --git a/crypto/hmac/hmac_local.h b/crypto/hmac/hmac_local.h
index 0b5c6146eb..e991bece7e 100644
--- a/crypto/hmac/hmac_local.h
+++ b/crypto/hmac/hmac_local.h
@@ -8,14 +8,14 @@
*/
#ifndef OSSL_CRYPTO_HMAC_LOCAL_H
-# define OSSL_CRYPTO_HMAC_LOCAL_H
+#define OSSL_CRYPTO_HMAC_LOCAL_H
-# include "internal/common.h"
-# include "internal/numbers.h"
-# include "openssl/sha.h"
+#include "internal/common.h"
+#include "internal/numbers.h"
+#include "openssl/sha.h"
/* The current largest case is for SHA3-224 */
-#define HMAC_MAX_MD_CBLOCK_SIZE 144
+#define HMAC_MAX_MD_CBLOCK_SIZE 144
struct hmac_ctx_st {
const EVP_MD *md;
@@ -26,7 +26,7 @@ struct hmac_ctx_st {
/* Platform specific data */
union {
int dummy;
-# ifdef OPENSSL_HMAC_S390X
+#ifdef OPENSSL_HMAC_S390X
struct {
unsigned int fc; /* 0 if not supported by kmac instruction */
int blk_size;
@@ -49,18 +49,18 @@ struct hmac_ctx_st {
} hmac_384_512;
} param;
} s390x;
-# endif /* OPENSSL_HMAC_S390X */
+#endif /* OPENSSL_HMAC_S390X */
} plat;
};
-# ifdef OPENSSL_HMAC_S390X
-# define HMAC_S390X_BUF_NUM_BLOCKS 64
+#ifdef OPENSSL_HMAC_S390X
+#define HMAC_S390X_BUF_NUM_BLOCKS 64
int s390x_HMAC_init(HMAC_CTX *ctx, const void *key, int key_len);
int s390x_HMAC_update(HMAC_CTX *ctx, const unsigned char *data, size_t len);
int s390x_HMAC_final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len);
int s390x_HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx);
int s390x_HMAC_CTX_cleanup(HMAC_CTX *ctx);
-# endif /* OPENSSL_HMAC_S390X */
+#endif /* OPENSSL_HMAC_S390X */
#endif
diff --git a/crypto/hmac/hmac_s390x.c b/crypto/hmac/hmac_s390x.c
index 35a50fb15c..eede428cf0 100644
--- a/crypto/hmac/hmac_s390x.c
+++ b/crypto/hmac/hmac_s390x.c
@@ -80,16 +80,14 @@ int s390x_HMAC_init(HMAC_CTX *ctx, const void *key, int key_len)
if (ctx->plat.s390x.blk_size < 0)
return 0;
- if (ctx->plat.s390x.size !=
- (size_t)(ctx->plat.s390x.blk_size * HMAC_S390X_BUF_NUM_BLOCKS)) {
+ if (ctx->plat.s390x.size != (size_t)(ctx->plat.s390x.blk_size * HMAC_S390X_BUF_NUM_BLOCKS)) {
OPENSSL_clear_free(ctx->plat.s390x.buf, ctx->plat.s390x.size);
ctx->plat.s390x.size = 0;
ctx->plat.s390x.buf = OPENSSL_calloc(HMAC_S390X_BUF_NUM_BLOCKS,
- ctx->plat.s390x.blk_size);
+ ctx->plat.s390x.blk_size);
if (ctx->plat.s390x.buf == NULL)
return 0;
- ctx->plat.s390x.size = ctx->plat.s390x.blk_size *
- HMAC_S390X_BUF_NUM_BLOCKS;
+ ctx->plat.s390x.size = ctx->plat.s390x.blk_size * HMAC_S390X_BUF_NUM_BLOCKS;
}
ctx->plat.s390x.num = 0;
@@ -101,13 +99,13 @@ int s390x_HMAC_init(HMAC_CTX *ctx, const void *key, int key_len)
case S390X_HMAC_SHA_256:
ctx->plat.s390x.param.hmac_224_256.imbl = 0;
OPENSSL_cleanse(ctx->plat.s390x.param.hmac_224_256.h,
- sizeof(ctx->plat.s390x.param.hmac_224_256.h));
+ sizeof(ctx->plat.s390x.param.hmac_224_256.h));
break;
case S390X_HMAC_SHA_384:
case S390X_HMAC_SHA_512:
ctx->plat.s390x.param.hmac_384_512.imbl = 0;
OPENSSL_cleanse(ctx->plat.s390x.param.hmac_384_512.h,
- sizeof(ctx->plat.s390x.param.hmac_384_512.h));
+ sizeof(ctx->plat.s390x.param.hmac_384_512.h));
break;
default:
return 0;
@@ -118,14 +116,14 @@ int s390x_HMAC_init(HMAC_CTX *ctx, const void *key, int key_len)
case S390X_HMAC_SHA_224:
case S390X_HMAC_SHA_256:
OPENSSL_cleanse(&ctx->plat.s390x.param.hmac_224_256.key,
- sizeof(ctx->plat.s390x.param.hmac_224_256.key));
+ sizeof(ctx->plat.s390x.param.hmac_224_256.key));
key_param = ctx->plat.s390x.param.hmac_224_256.key;
key_param_len = sizeof(ctx->plat.s390x.param.hmac_224_256.key);
break;
case S390X_HMAC_SHA_384:
case S390X_HMAC_SHA_512:
OPENSSL_cleanse(&ctx->plat.s390x.param.hmac_384_512.key,
- sizeof(ctx->plat.s390x.param.hmac_384_512.key));
+ sizeof(ctx->plat.s390x.param.hmac_384_512.key));
key_param = ctx->plat.s390x.param.hmac_384_512.key;
key_param_len = sizeof(ctx->plat.s390x.param.hmac_384_512.key);
break;
@@ -138,9 +136,9 @@ int s390x_HMAC_init(HMAC_CTX *ctx, const void *key, int key_len)
if (key_len > ctx->plat.s390x.blk_size) {
if (!EVP_DigestInit_ex(ctx->md_ctx, ctx->md, NULL)
- || !EVP_DigestUpdate(ctx->md_ctx, key, key_len)
- || !EVP_DigestFinal_ex(ctx->md_ctx, key_param,
- &key_param_len))
+ || !EVP_DigestUpdate(ctx->md_ctx, key, key_len)
+ || !EVP_DigestFinal_ex(ctx->md_ctx, key_param,
+ &key_param_len))
return 0;
} else {
if (key_len < 0 || key_len > (int)key_param_len)
@@ -269,13 +267,13 @@ int s390x_HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx)
dctx->plat.s390x.iimp = sctx->plat.s390x.iimp;
memcpy(&dctx->plat.s390x.param, &sctx->plat.s390x.param,
- sizeof(dctx->plat.s390x.param));
+ sizeof(dctx->plat.s390x.param));
OPENSSL_clear_free(dctx->plat.s390x.buf, dctx->plat.s390x.size);
dctx->plat.s390x.buf = NULL;
if (sctx->plat.s390x.buf != NULL) {
dctx->plat.s390x.buf = OPENSSL_memdup(sctx->plat.s390x.buf,
- sctx->plat.s390x.size);
+ sctx->plat.s390x.size);
if (dctx->plat.s390x.buf == NULL)
return 0;
}
diff --git a/crypto/hpke/hpke.c b/crypto/hpke/hpke.c
index 3003d7bd11..0a301e462f 100644
--- a/crypto/hpke/hpke.c
+++ b/crypto/hpke/hpke.c
@@ -100,17 +100,17 @@ static int hpke_kem_id_nist_curve(uint16_t kem_id)
* future, but would likely require a name change.
*/
static EVP_PKEY *evp_pkey_new_raw_nist_public_key(OSSL_LIB_CTX *libctx,
- const char *propq,
- const char *gname,
- const unsigned char *buf,
- size_t buflen)
+ const char *propq,
+ const char *gname,
+ const unsigned char *buf,
+ size_t buflen)
{
OSSL_PARAM params[2];
EVP_PKEY *ret = NULL;
EVP_PKEY_CTX *cctx = EVP_PKEY_CTX_new_from_name(libctx, "EC", propq);
params[0] = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_GROUP_NAME,
- (char *)gname, 0);
+ (char *)gname, 0);
params[1] = OSSL_PARAM_construct_end();
if (cctx == NULL
|| EVP_PKEY_paramgen_init(cctx) <= 0
@@ -139,9 +139,9 @@ static EVP_PKEY *evp_pkey_new_raw_nist_public_key(OSSL_LIB_CTX *libctx,
* @return 1 on success, 0 otherwise
*/
static int hpke_aead_dec(OSSL_HPKE_CTX *hctx, const unsigned char *iv,
- const unsigned char *aad, size_t aadlen,
- const unsigned char *ct, size_t ctlen,
- unsigned char *pt, size_t *ptlen)
+ const unsigned char *aad, size_t aadlen,
+ const unsigned char *ct, size_t ctlen,
+ unsigned char *pt, size_t *ptlen)
{
int erv = 0;
EVP_CIPHER_CTX *ctx = NULL;
@@ -163,7 +163,8 @@ static int hpke_aead_dec(OSSL_HPKE_CTX *hctx, const unsigned char *iv,
goto err;
}
if (EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_IVLEN,
- (int)hctx->noncelen, NULL) != 1) {
+ (int)hctx->noncelen, NULL)
+ != 1) {
ERR_raise(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR);
goto err;
}
@@ -185,7 +186,7 @@ static int hpke_aead_dec(OSSL_HPKE_CTX *hctx, const unsigned char *iv,
}
*ptlen = len;
if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG,
- (int)taglen, (void *)(ct + ctlen - taglen))) {
+ (int)taglen, (void *)(ct + ctlen - taglen))) {
ERR_raise(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR);
goto err;
}
@@ -216,9 +217,9 @@ err:
* @return 1 for success, 0 otherwise
*/
static int hpke_aead_enc(OSSL_HPKE_CTX *hctx, const unsigned char *iv,
- const unsigned char *aad, size_t aadlen,
- const unsigned char *pt, size_t ptlen,
- unsigned char *ct, size_t *ctlen)
+ const unsigned char *aad, size_t aadlen,
+ const unsigned char *pt, size_t ptlen,
+ unsigned char *ct, size_t *ctlen)
{
int erv = 0;
EVP_CIPHER_CTX *ctx = NULL;
@@ -245,7 +246,8 @@ static int hpke_aead_enc(OSSL_HPKE_CTX *hctx, const unsigned char *iv,
goto err;
}
if (EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_IVLEN,
- (int)hctx->noncelen, NULL) != 1) {
+ (int)hctx->noncelen, NULL)
+ != 1) {
ERR_raise(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR);
goto err;
}
@@ -313,9 +315,9 @@ static int hpke_mode_check(unsigned int mode)
* @return 1 for good, 0 otherwise
*/
static int hpke_suite_check(OSSL_HPKE_SUITE suite,
- const OSSL_HPKE_KEM_INFO **kem_info,
- const OSSL_HPKE_KDF_INFO **kdf_info,
- const OSSL_HPKE_AEAD_INFO **aead_info)
+ const OSSL_HPKE_KEM_INFO **kem_info,
+ const OSSL_HPKE_KDF_INFO **kdf_info,
+ const OSSL_HPKE_AEAD_INFO **aead_info)
{
const OSSL_HPKE_KEM_INFO *kem_info_;
const OSSL_HPKE_KDF_INFO *kdf_info_;
@@ -347,8 +349,8 @@ static int hpke_suite_check(OSSL_HPKE_SUITE suite,
* @return 1 for success, 0 otherwise
*/
static int hpke_random_suite(OSSL_LIB_CTX *libctx,
- const char *propq,
- OSSL_HPKE_SUITE *suite)
+ const char *propq,
+ OSSL_HPKE_SUITE *suite)
{
const OSSL_HPKE_KEM_INFO *kem_info = NULL;
const OSSL_HPKE_KDF_INFO *kdf_info = NULL;
@@ -390,9 +392,9 @@ static int hpke_random_suite(OSSL_LIB_CTX *libctx,
* @return 1 for success, 0 otherwise
*/
static int hpke_expansion(OSSL_HPKE_SUITE suite,
- size_t *enclen,
- size_t clearlen,
- size_t *cipherlen)
+ size_t *enclen,
+ size_t clearlen,
+ size_t *cipherlen)
{
const OSSL_HPKE_AEAD_INFO *aead_info = NULL;
const OSSL_HPKE_KEM_INFO *kem_info = NULL;
@@ -418,7 +420,7 @@ static int hpke_expansion(OSSL_HPKE_SUITE suite,
* @return 0 for error, otherwise blen
*/
static size_t hpke_seqnonce2buf(OSSL_HPKE_CTX *ctx,
- unsigned char *buf, size_t blen)
+ unsigned char *buf, size_t blen)
{
size_t i;
uint64_t seq_copy;
@@ -446,7 +448,7 @@ static size_t hpke_seqnonce2buf(OSSL_HPKE_CTX *ctx,
* @return 1 for success, 0 for error
*/
static int hpke_encap(OSSL_HPKE_CTX *ctx, unsigned char *enc, size_t *enclen,
- const unsigned char *pub, size_t publen)
+ const unsigned char *pub, size_t publen)
{
int erv = 0;
OSSL_PARAM params[3], *p = params;
@@ -472,12 +474,12 @@ static int hpke_encap(OSSL_HPKE_CTX *ctx, unsigned char *enc, size_t *enclen,
}
if (hpke_kem_id_nist_curve(ctx->suite.kem_id) == 1) {
pkR = evp_pkey_new_raw_nist_public_key(ctx->libctx, ctx->propq,
- kem_info->groupname,
- pub, publen);
+ kem_info->groupname,
+ pub, publen);
} else {
pkR = EVP_PKEY_new_raw_public_key_ex(ctx->libctx,
- kem_info->keytype,
- ctx->propq, pub, publen);
+ kem_info->keytype,
+ ctx->propq, pub, publen);
}
if (pkR == NULL) {
ERR_raise(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR);
@@ -489,17 +491,18 @@ static int hpke_encap(OSSL_HPKE_CTX *ctx, unsigned char *enc, size_t *enclen,
goto err;
}
*p++ = OSSL_PARAM_construct_utf8_string(OSSL_KEM_PARAM_OPERATION,
- OSSL_KEM_PARAM_OPERATION_DHKEM,
- 0);
+ OSSL_KEM_PARAM_OPERATION_DHKEM,
+ 0);
if (ctx->ikme != NULL) {
*p++ = OSSL_PARAM_construct_octet_string(OSSL_KEM_PARAM_IKME,
- ctx->ikme, ctx->ikmelen);
+ ctx->ikme, ctx->ikmelen);
}
*p = OSSL_PARAM_construct_end();
if (ctx->mode == OSSL_HPKE_MODE_AUTH
|| ctx->mode == OSSL_HPKE_MODE_PSKAUTH) {
if (EVP_PKEY_auth_encapsulate_init(pctx, ctx->authpriv,
- params) != 1) {
+ params)
+ != 1) {
ERR_raise(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR);
goto err;
}
@@ -523,7 +526,8 @@ static int hpke_encap(OSSL_HPKE_CTX *ctx, unsigned char *enc, size_t *enclen,
goto err;
ctx->shared_secretlen = lsslen;
if (EVP_PKEY_encapsulate(pctx, enc, enclen, ctx->shared_secret,
- &ctx->shared_secretlen) != 1) {
+ &ctx->shared_secretlen)
+ != 1) {
ctx->shared_secretlen = 0;
OPENSSL_free(ctx->shared_secret);
ctx->shared_secret = NULL;
@@ -547,8 +551,8 @@ err:
* @return 1 for success, 0 for error
*/
static int hpke_decap(OSSL_HPKE_CTX *ctx,
- const unsigned char *enc, size_t enclen,
- EVP_PKEY *priv)
+ const unsigned char *enc, size_t enclen,
+ EVP_PKEY *priv)
{
int erv = 0;
EVP_PKEY_CTX *pctx = NULL;
@@ -571,8 +575,8 @@ static int hpke_decap(OSSL_HPKE_CTX *ctx,
goto err;
}
*p++ = OSSL_PARAM_construct_utf8_string(OSSL_KEM_PARAM_OPERATION,
- OSSL_KEM_PARAM_OPERATION_DHKEM,
- 0);
+ OSSL_KEM_PARAM_OPERATION_DHKEM,
+ 0);
*p = OSSL_PARAM_construct_end();
if (ctx->mode == OSSL_HPKE_MODE_AUTH
|| ctx->mode == OSSL_HPKE_MODE_PSKAUTH) {
@@ -585,15 +589,15 @@ static int hpke_decap(OSSL_HPKE_CTX *ctx,
}
if (hpke_kem_id_nist_curve(ctx->suite.kem_id) == 1) {
spub = evp_pkey_new_raw_nist_public_key(ctx->libctx, ctx->propq,
- kem_info->groupname,
- ctx->authpub,
- ctx->authpublen);
+ kem_info->groupname,
+ ctx->authpub,
+ ctx->authpublen);
} else {
spub = EVP_PKEY_new_raw_public_key_ex(ctx->libctx,
- kem_info->keytype,
- ctx->propq,
- ctx->authpub,
- ctx->authpublen);
+ kem_info->keytype,
+ ctx->propq,
+ ctx->authpub,
+ ctx->authpublen);
}
if (spub == NULL) {
ERR_raise(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR);
@@ -617,7 +621,8 @@ static int hpke_decap(OSSL_HPKE_CTX *ctx,
if (ctx->shared_secret == NULL)
goto err;
if (EVP_PKEY_decapsulate(pctx, ctx->shared_secret, &lsslen,
- enc, enclen) != 1) {
+ enc, enclen)
+ != 1) {
ERR_raise(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR);
goto err;
}
@@ -647,7 +652,7 @@ err:
* ctx fields for the shared_secret, nonce, key and exporter_secret
*/
static int hpke_do_middle(OSSL_HPKE_CTX *ctx,
- const unsigned char *info, size_t infolen)
+ const unsigned char *info, size_t infolen)
{
int erv = 0;
size_t ks_contextlen = OSSL_HPKE_MAXSIZE;
@@ -714,18 +719,20 @@ static int hpke_do_middle(OSSL_HPKE_CTX *ctx,
suitebuf[5] = ctx->suite.aead_id % 256;
/* Extract and Expand variously... */
if (ossl_hpke_labeled_extract(kctx, ks_context + 1, halflen,
- NULL, 0, OSSL_HPKE_SEC51LABEL,
- suitebuf, sizeof(suitebuf),
- OSSL_HPKE_PSKIDHASH_LABEL,
- (unsigned char *)ctx->pskid, pskidlen) != 1) {
+ NULL, 0, OSSL_HPKE_SEC51LABEL,
+ suitebuf, sizeof(suitebuf),
+ OSSL_HPKE_PSKIDHASH_LABEL,
+ (unsigned char *)ctx->pskid, pskidlen)
+ != 1) {
ERR_raise(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR);
goto err;
}
if (ossl_hpke_labeled_extract(kctx, ks_context + 1 + halflen, halflen,
- NULL, 0, OSSL_HPKE_SEC51LABEL,
- suitebuf, sizeof(suitebuf),
- OSSL_HPKE_INFOHASH_LABEL,
- (unsigned char *)info, infolen) != 1) {
+ NULL, 0, OSSL_HPKE_SEC51LABEL,
+ suitebuf, sizeof(suitebuf),
+ OSSL_HPKE_INFOHASH_LABEL,
+ (unsigned char *)info, infolen)
+ != 1) {
ERR_raise(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR);
goto err;
}
@@ -736,11 +743,12 @@ static int hpke_do_middle(OSSL_HPKE_CTX *ctx,
goto err;
}
if (ossl_hpke_labeled_extract(kctx, secret, secretlen,
- ctx->shared_secret, ctx->shared_secretlen,
- OSSL_HPKE_SEC51LABEL,
- suitebuf, sizeof(suitebuf),
- OSSL_HPKE_SECRET_LABEL,
- ctx->psk, ctx->psklen) != 1) {
+ ctx->shared_secret, ctx->shared_secretlen,
+ OSSL_HPKE_SEC51LABEL,
+ suitebuf, sizeof(suitebuf),
+ OSSL_HPKE_SECRET_LABEL,
+ ctx->psk, ctx->psklen)
+ != 1) {
ERR_raise(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR);
goto err;
}
@@ -751,10 +759,11 @@ static int hpke_do_middle(OSSL_HPKE_CTX *ctx,
if (ctx->nonce == NULL)
goto err;
if (ossl_hpke_labeled_expand(kctx, ctx->nonce, ctx->noncelen,
- secret, secretlen, OSSL_HPKE_SEC51LABEL,
- suitebuf, sizeof(suitebuf),
- OSSL_HPKE_NONCE_LABEL,
- ks_context, ks_contextlen) != 1) {
+ secret, secretlen, OSSL_HPKE_SEC51LABEL,
+ suitebuf, sizeof(suitebuf),
+ OSSL_HPKE_NONCE_LABEL,
+ ks_context, ks_contextlen)
+ != 1) {
ERR_raise(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR);
goto err;
}
@@ -763,10 +772,11 @@ static int hpke_do_middle(OSSL_HPKE_CTX *ctx,
if (ctx->key == NULL)
goto err;
if (ossl_hpke_labeled_expand(kctx, ctx->key, ctx->keylen,
- secret, secretlen, OSSL_HPKE_SEC51LABEL,
- suitebuf, sizeof(suitebuf),
- OSSL_HPKE_KEY_LABEL,
- ks_context, ks_contextlen) != 1) {
+ secret, secretlen, OSSL_HPKE_SEC51LABEL,
+ suitebuf, sizeof(suitebuf),
+ OSSL_HPKE_KEY_LABEL,
+ ks_context, ks_contextlen)
+ != 1) {
ERR_raise(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR);
goto err;
}
@@ -776,10 +786,11 @@ static int hpke_do_middle(OSSL_HPKE_CTX *ctx,
if (ctx->exportersec == NULL)
goto err;
if (ossl_hpke_labeled_expand(kctx, ctx->exportersec, ctx->exporterseclen,
- secret, secretlen, OSSL_HPKE_SEC51LABEL,
- suitebuf, sizeof(suitebuf),
- OSSL_HPKE_EXP_LABEL,
- ks_context, ks_contextlen) != 1) {
+ secret, secretlen, OSSL_HPKE_SEC51LABEL,
+ suitebuf, sizeof(suitebuf),
+ OSSL_HPKE_EXP_LABEL,
+ ks_context, ks_contextlen)
+ != 1) {
ERR_raise(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR);
goto err;
}
@@ -798,7 +809,7 @@ err:
*/
OSSL_HPKE_CTX *OSSL_HPKE_CTX_new(int mode, OSSL_HPKE_SUITE suite, int role,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_LIB_CTX *libctx, const char *propq)
{
OSSL_HPKE_CTX *ctx = NULL;
const OSSL_HPKE_KEM_INFO *kem_info;
@@ -841,7 +852,7 @@ OSSL_HPKE_CTX *OSSL_HPKE_CTX_new(int mode, OSSL_HPKE_SUITE suite, int role,
ctx->aead_info = aead_info;
return ctx;
- err:
+err:
EVP_CIPHER_free(ctx->aead_ciph);
OPENSSL_free(ctx->propq);
OPENSSL_free(ctx);
@@ -869,8 +880,8 @@ void OSSL_HPKE_CTX_free(OSSL_HPKE_CTX *ctx)
}
int OSSL_HPKE_CTX_set1_psk(OSSL_HPKE_CTX *ctx,
- const char *pskid,
- const unsigned char *psk, size_t psklen)
+ const char *pskid,
+ const unsigned char *psk, size_t psklen)
{
if (ctx == NULL || pskid == NULL || psk == NULL || psklen == 0) {
ERR_raise(ERR_LIB_CRYPTO, ERR_R_PASSED_INVALID_ARGUMENT);
@@ -915,7 +926,7 @@ int OSSL_HPKE_CTX_set1_psk(OSSL_HPKE_CTX *ctx,
}
int OSSL_HPKE_CTX_set1_ikme(OSSL_HPKE_CTX *ctx,
- const unsigned char *ikme, size_t ikmelen)
+ const unsigned char *ikme, size_t ikmelen)
{
if (ctx == NULL || ikme == NULL) {
ERR_raise(ERR_LIB_CRYPTO, ERR_R_PASSED_NULL_PARAMETER);
@@ -960,7 +971,7 @@ int OSSL_HPKE_CTX_set1_authpriv(OSSL_HPKE_CTX *ctx, EVP_PKEY *priv)
}
int OSSL_HPKE_CTX_set1_authpub(OSSL_HPKE_CTX *ctx,
- const unsigned char *pub, size_t publen)
+ const unsigned char *pub, size_t publen)
{
int erv = 0;
EVP_PKEY *pubp = NULL;
@@ -987,13 +998,13 @@ int OSSL_HPKE_CTX_set1_authpub(OSSL_HPKE_CTX *ctx,
return 0;
if (hpke_kem_id_nist_curve(ctx->suite.kem_id) == 1) {
pubp = evp_pkey_new_raw_nist_public_key(ctx->libctx, ctx->propq,
- kem_info->groupname,
- pub, publen);
+ kem_info->groupname,
+ pub, publen);
} else {
pubp = EVP_PKEY_new_raw_public_key_ex(ctx->libctx,
- kem_info->keytype,
- ctx->propq,
- pub, publen);
+ kem_info->keytype,
+ ctx->propq,
+ pub, publen);
}
if (pubp == NULL) {
/* can happen based on external input - buffer value may be garbage */
@@ -1008,8 +1019,8 @@ int OSSL_HPKE_CTX_set1_authpub(OSSL_HPKE_CTX *ctx,
if (lpub == NULL)
goto err;
if (EVP_PKEY_get_octet_string_param(pubp,
- OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY,
- lpub, OSSL_HPKE_MAXSIZE, &lpublen)
+ OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY,
+ lpub, OSSL_HPKE_MAXSIZE, &lpublen)
!= 1) {
OPENSSL_free(lpub);
ERR_raise(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR);
@@ -1056,9 +1067,9 @@ int OSSL_HPKE_CTX_set_seq(OSSL_HPKE_CTX *ctx, uint64_t seq)
}
int OSSL_HPKE_encap(OSSL_HPKE_CTX *ctx,
- unsigned char *enc, size_t *enclen,
- const unsigned char *pub, size_t publen,
- const unsigned char *info, size_t infolen)
+ unsigned char *enc, size_t *enclen,
+ const unsigned char *pub, size_t publen,
+ const unsigned char *info, size_t infolen)
{
int erv = 1;
size_t minenc = 0;
@@ -1104,9 +1115,9 @@ int OSSL_HPKE_encap(OSSL_HPKE_CTX *ctx,
}
int OSSL_HPKE_decap(OSSL_HPKE_CTX *ctx,
- const unsigned char *enc, size_t enclen,
- EVP_PKEY *recippriv,
- const unsigned char *info, size_t infolen)
+ const unsigned char *enc, size_t enclen,
+ EVP_PKEY *recippriv,
+ const unsigned char *info, size_t infolen)
{
int erv = 1;
size_t minenc = 0;
@@ -1152,9 +1163,9 @@ int OSSL_HPKE_decap(OSSL_HPKE_CTX *ctx,
}
int OSSL_HPKE_seal(OSSL_HPKE_CTX *ctx,
- unsigned char *ct, size_t *ctlen,
- const unsigned char *aad, size_t aadlen,
- const unsigned char *pt, size_t ptlen)
+ unsigned char *ct, size_t *ctlen,
+ const unsigned char *aad, size_t aadlen,
+ const unsigned char *pt, size_t ptlen)
{
unsigned char seqbuf[OSSL_HPKE_MAX_NONCELEN];
size_t seqlen = 0;
@@ -1194,9 +1205,9 @@ int OSSL_HPKE_seal(OSSL_HPKE_CTX *ctx,
}
int OSSL_HPKE_open(OSSL_HPKE_CTX *ctx,
- unsigned char *pt, size_t *ptlen,
- const unsigned char *aad, size_t aadlen,
- const unsigned char *ct, size_t ctlen)
+ unsigned char *pt, size_t *ptlen,
+ const unsigned char *aad, size_t aadlen,
+ const unsigned char *ct, size_t ctlen)
{
unsigned char seqbuf[OSSL_HPKE_MAX_NONCELEN];
size_t seqlen = 0;
@@ -1235,8 +1246,8 @@ int OSSL_HPKE_open(OSSL_HPKE_CTX *ctx,
}
int OSSL_HPKE_export(OSSL_HPKE_CTX *ctx,
- unsigned char *secret, size_t secretlen,
- const unsigned char *label, size_t labellen)
+ unsigned char *secret, size_t secretlen,
+ const unsigned char *label, size_t labellen)
{
int erv = 0;
EVP_KDF_CTX *kctx = NULL;
@@ -1279,11 +1290,11 @@ int OSSL_HPKE_export(OSSL_HPKE_CTX *ctx,
suitebuf[4] = ctx->suite.aead_id / 256;
suitebuf[5] = ctx->suite.aead_id % 256;
erv = ossl_hpke_labeled_expand(kctx, secret, secretlen,
- ctx->exportersec, ctx->exporterseclen,
- OSSL_HPKE_SEC51LABEL,
- suitebuf, sizeof(suitebuf),
- OSSL_HPKE_EXP_SEC_LABEL,
- label, labellen);
+ ctx->exportersec, ctx->exporterseclen,
+ OSSL_HPKE_SEC51LABEL,
+ suitebuf, sizeof(suitebuf),
+ OSSL_HPKE_EXP_SEC_LABEL,
+ label, labellen);
EVP_KDF_CTX_free(kctx);
if (erv != 1)
ERR_raise(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR);
@@ -1291,9 +1302,9 @@ int OSSL_HPKE_export(OSSL_HPKE_CTX *ctx,
}
int OSSL_HPKE_keygen(OSSL_HPKE_SUITE suite,
- unsigned char *pub, size_t *publen, EVP_PKEY **priv,
- const unsigned char *ikm, size_t ikmlen,
- OSSL_LIB_CTX *libctx, const char *propq)
+ unsigned char *pub, size_t *publen, EVP_PKEY **priv,
+ const unsigned char *ikm, size_t ikmlen,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
int erv = 0; /* Our error return value - 1 is success */
EVP_PKEY_CTX *pctx = NULL;
@@ -1318,7 +1329,7 @@ int OSSL_HPKE_keygen(OSSL_HPKE_SUITE suite,
if (hpke_kem_id_nist_curve(suite.kem_id) == 1) {
*p++ = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_GROUP_NAME,
- (char *)kem_info->groupname, 0);
+ (char *)kem_info->groupname, 0);
pctx = EVP_PKEY_CTX_new_from_name(libctx, "EC", propq);
} else {
pctx = EVP_PKEY_CTX_new_from_name(libctx, kem_info->keytype, propq);
@@ -1330,7 +1341,7 @@ int OSSL_HPKE_keygen(OSSL_HPKE_SUITE suite,
}
if (ikm != NULL)
*p++ = OSSL_PARAM_construct_octet_string(OSSL_PKEY_PARAM_DHKEM_IKM,
- (char *)ikm, ikmlen);
+ (char *)ikm, ikmlen);
*p = OSSL_PARAM_construct_end();
if (EVP_PKEY_CTX_set_params(pctx, params) <= 0) {
ERR_raise(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR);
@@ -1343,7 +1354,8 @@ int OSSL_HPKE_keygen(OSSL_HPKE_SUITE suite,
EVP_PKEY_CTX_free(pctx);
pctx = NULL;
if (EVP_PKEY_get_octet_string_param(skR, OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY,
- pub, *publen, publen) != 1) {
+ pub, *publen, publen)
+ != 1) {
ERR_raise(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR);
goto err;
}
@@ -1363,10 +1375,10 @@ int OSSL_HPKE_suite_check(OSSL_HPKE_SUITE suite)
}
int OSSL_HPKE_get_grease_value(const OSSL_HPKE_SUITE *suite_in,
- OSSL_HPKE_SUITE *suite,
- unsigned char *enc, size_t *enclen,
- unsigned char *ct, size_t ctlen,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_HPKE_SUITE *suite,
+ unsigned char *enc, size_t *enclen,
+ unsigned char *ct, size_t ctlen,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
OSSL_HPKE_SUITE chosen;
size_t plen = 0;
@@ -1412,7 +1424,8 @@ int OSSL_HPKE_get_grease_value(const OSSL_HPKE_SUITE *suite_in,
* the relevant curve.
*/
if (OSSL_HPKE_keygen(chosen, enc, enclen, &fakepriv, NULL, 0,
- libctx, propq) != 1) {
+ libctx, propq)
+ != 1) {
ERR_raise(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR);
goto err;
}
diff --git a/crypto/hpke/hpke_util.c b/crypto/hpke/hpke_util.c
index 252246ff97..5a37f4ca52 100644
--- a/crypto/hpke/hpke_util.c
+++ b/crypto/hpke/hpke_util.c
@@ -63,19 +63,19 @@ static const char LABEL_HPKEV1[] = "\x48\x50\x4B\x45\x2D\x76\x31";
static const OSSL_HPKE_KEM_INFO hpke_kem_tab[] = {
#ifndef OPENSSL_NO_EC
{ OSSL_HPKE_KEM_ID_P256, "EC", OSSL_HPKE_KEMSTR_P256,
- LN_sha256, SHA256_DIGEST_LENGTH, 65, 65, 32, 0xFF },
+ LN_sha256, SHA256_DIGEST_LENGTH, 65, 65, 32, 0xFF },
{ OSSL_HPKE_KEM_ID_P384, "EC", OSSL_HPKE_KEMSTR_P384,
- LN_sha384, SHA384_DIGEST_LENGTH, 97, 97, 48, 0xFF },
+ LN_sha384, SHA384_DIGEST_LENGTH, 97, 97, 48, 0xFF },
{ OSSL_HPKE_KEM_ID_P521, "EC", OSSL_HPKE_KEMSTR_P521,
- LN_sha512, SHA512_DIGEST_LENGTH, 133, 133, 66, 0x01 },
-# ifndef OPENSSL_NO_ECX
+ LN_sha512, SHA512_DIGEST_LENGTH, 133, 133, 66, 0x01 },
+#ifndef OPENSSL_NO_ECX
{ OSSL_HPKE_KEM_ID_X25519, OSSL_HPKE_KEMSTR_X25519, NULL,
- LN_sha256, SHA256_DIGEST_LENGTH,
- X25519_KEYLEN, X25519_KEYLEN, X25519_KEYLEN, 0x00 },
+ LN_sha256, SHA256_DIGEST_LENGTH,
+ X25519_KEYLEN, X25519_KEYLEN, X25519_KEYLEN, 0x00 },
{ OSSL_HPKE_KEM_ID_X448, OSSL_HPKE_KEMSTR_X448, NULL,
- LN_sha512, SHA512_DIGEST_LENGTH,
- X448_KEYLEN, X448_KEYLEN, X448_KEYLEN, 0x00 }
-# endif
+ LN_sha512, SHA512_DIGEST_LENGTH,
+ X448_KEYLEN, X448_KEYLEN, X448_KEYLEN, 0x00 }
+#endif
#else
{ OSSL_HPKE_KEM_ID_RESERVED, NULL, NULL, NULL, 0, 0, 0, 0, 0x00 }
#endif
@@ -87,12 +87,12 @@ static const OSSL_HPKE_KEM_INFO hpke_kem_tab[] = {
*/
static const OSSL_HPKE_AEAD_INFO hpke_aead_tab[] = {
{ OSSL_HPKE_AEAD_ID_AES_GCM_128, LN_aes_128_gcm, 16, 16,
- OSSL_HPKE_MAX_NONCELEN },
+ OSSL_HPKE_MAX_NONCELEN },
{ OSSL_HPKE_AEAD_ID_AES_GCM_256, LN_aes_256_gcm, 16, 32,
- OSSL_HPKE_MAX_NONCELEN },
+ OSSL_HPKE_MAX_NONCELEN },
#if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305)
{ OSSL_HPKE_AEAD_ID_CHACHA_POLY1305, LN_chacha20_poly1305, 16, 32,
- OSSL_HPKE_MAX_NONCELEN },
+ OSSL_HPKE_MAX_NONCELEN },
#endif
{ OSSL_HPKE_AEAD_ID_EXPORTONLY, NULL, 0, 0, 0 }
};
@@ -120,36 +120,36 @@ static const OSSL_HPKE_KDF_INFO hpke_kdf_tab[] = {
* sizes (i.e. allow exactly 4 synonyms) don't change.
*/
static const synonymttab_t kemstrtab[] = {
- {OSSL_HPKE_KEM_ID_P256,
- {OSSL_HPKE_KEMSTR_P256, "0x10", "0x10", "16" }},
- {OSSL_HPKE_KEM_ID_P384,
- {OSSL_HPKE_KEMSTR_P384, "0x11", "0x11", "17" }},
- {OSSL_HPKE_KEM_ID_P521,
- {OSSL_HPKE_KEMSTR_P521, "0x12", "0x12", "18" }},
-# ifndef OPENSSL_NO_ECX
- {OSSL_HPKE_KEM_ID_X25519,
- {OSSL_HPKE_KEMSTR_X25519, "0x20", "0x20", "32" }},
- {OSSL_HPKE_KEM_ID_X448,
- {OSSL_HPKE_KEMSTR_X448, "0x21", "0x21", "33" }}
-# endif
+ { OSSL_HPKE_KEM_ID_P256,
+ { OSSL_HPKE_KEMSTR_P256, "0x10", "0x10", "16" } },
+ { OSSL_HPKE_KEM_ID_P384,
+ { OSSL_HPKE_KEMSTR_P384, "0x11", "0x11", "17" } },
+ { OSSL_HPKE_KEM_ID_P521,
+ { OSSL_HPKE_KEMSTR_P521, "0x12", "0x12", "18" } },
+#ifndef OPENSSL_NO_ECX
+ { OSSL_HPKE_KEM_ID_X25519,
+ { OSSL_HPKE_KEMSTR_X25519, "0x20", "0x20", "32" } },
+ { OSSL_HPKE_KEM_ID_X448,
+ { OSSL_HPKE_KEMSTR_X448, "0x21", "0x21", "33" } }
+#endif
};
static const synonymttab_t kdfstrtab[] = {
- {OSSL_HPKE_KDF_ID_HKDF_SHA256,
- {OSSL_HPKE_KDFSTR_256, "0x1", "0x01", "1"}},
- {OSSL_HPKE_KDF_ID_HKDF_SHA384,
- {OSSL_HPKE_KDFSTR_384, "0x2", "0x02", "2"}},
- {OSSL_HPKE_KDF_ID_HKDF_SHA512,
- {OSSL_HPKE_KDFSTR_512, "0x3", "0x03", "3"}}
+ { OSSL_HPKE_KDF_ID_HKDF_SHA256,
+ { OSSL_HPKE_KDFSTR_256, "0x1", "0x01", "1" } },
+ { OSSL_HPKE_KDF_ID_HKDF_SHA384,
+ { OSSL_HPKE_KDFSTR_384, "0x2", "0x02", "2" } },
+ { OSSL_HPKE_KDF_ID_HKDF_SHA512,
+ { OSSL_HPKE_KDFSTR_512, "0x3", "0x03", "3" } }
};
static const synonymttab_t aeadstrtab[] = {
- {OSSL_HPKE_AEAD_ID_AES_GCM_128,
- {OSSL_HPKE_AEADSTR_AES128GCM, "0x1", "0x01", "1"}},
- {OSSL_HPKE_AEAD_ID_AES_GCM_256,
- {OSSL_HPKE_AEADSTR_AES256GCM, "0x2", "0x02", "2"}},
- {OSSL_HPKE_AEAD_ID_CHACHA_POLY1305,
- {OSSL_HPKE_AEADSTR_CP, "0x3", "0x03", "3"}},
- {OSSL_HPKE_AEAD_ID_EXPORTONLY,
- {OSSL_HPKE_AEADSTR_EXP, "ff", "0xff", "255"}}
+ { OSSL_HPKE_AEAD_ID_AES_GCM_128,
+ { OSSL_HPKE_AEADSTR_AES128GCM, "0x1", "0x01", "1" } },
+ { OSSL_HPKE_AEAD_ID_AES_GCM_256,
+ { OSSL_HPKE_AEADSTR_AES256GCM, "0x2", "0x02", "2" } },
+ { OSSL_HPKE_AEAD_ID_CHACHA_POLY1305,
+ { OSSL_HPKE_AEADSTR_CP, "0x3", "0x03", "3" } },
+ { OSSL_HPKE_AEAD_ID_EXPORTONLY,
+ { OSSL_HPKE_AEADSTR_EXP, "ff", "0xff", "255" } }
};
/* Return an object containing KEM constants associated with a EC curve name */
@@ -245,10 +245,10 @@ const OSSL_HPKE_AEAD_INFO *ossl_HPKE_AEAD_INFO_find_random(OSSL_LIB_CTX *ctx)
}
static int kdf_derive(EVP_KDF_CTX *kctx,
- unsigned char *out, size_t outlen, int mode,
- const unsigned char *salt, size_t saltlen,
- const unsigned char *ikm, size_t ikmlen,
- const unsigned char *info, size_t infolen)
+ unsigned char *out, size_t outlen, int mode,
+ const unsigned char *salt, size_t saltlen,
+ const unsigned char *ikm, size_t ikmlen,
+ const unsigned char *info, size_t infolen)
{
int ret;
OSSL_PARAM params[5], *p = params;
@@ -256,13 +256,13 @@ static int kdf_derive(EVP_KDF_CTX *kctx,
*p++ = OSSL_PARAM_construct_int(OSSL_KDF_PARAM_MODE, &mode);
if (salt != NULL)
*p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SALT,
- (char *)salt, saltlen);
+ (char *)salt, saltlen);
if (ikm != NULL)
*p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_KEY,
- (char *)ikm, ikmlen);
+ (char *)ikm, ikmlen);
if (info != NULL)
*p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_INFO,
- (char *)info, infolen);
+ (char *)info, infolen);
*p = OSSL_PARAM_construct_end();
ret = EVP_KDF_derive(kctx, out, outlen, params) > 0;
if (!ret)
@@ -271,34 +271,34 @@ static int kdf_derive(EVP_KDF_CTX *kctx,
}
int ossl_hpke_kdf_extract(EVP_KDF_CTX *kctx,
- unsigned char *prk, size_t prklen,
- const unsigned char *salt, size_t saltlen,
- const unsigned char *ikm, size_t ikmlen)
+ unsigned char *prk, size_t prklen,
+ const unsigned char *salt, size_t saltlen,
+ const unsigned char *ikm, size_t ikmlen)
{
return kdf_derive(kctx, prk, prklen, EVP_KDF_HKDF_MODE_EXTRACT_ONLY,
- salt, saltlen, ikm, ikmlen, NULL, 0);
+ salt, saltlen, ikm, ikmlen, NULL, 0);
}
/* Common code to perform a HKDF expand */
int ossl_hpke_kdf_expand(EVP_KDF_CTX *kctx,
- unsigned char *okm, size_t okmlen,
- const unsigned char *prk, size_t prklen,
- const unsigned char *info, size_t infolen)
+ unsigned char *okm, size_t okmlen,
+ const unsigned char *prk, size_t prklen,
+ const unsigned char *info, size_t infolen)
{
return kdf_derive(kctx, okm, okmlen, EVP_KDF_HKDF_MODE_EXPAND_ONLY,
- NULL, 0, prk, prklen, info, infolen);
+ NULL, 0, prk, prklen, info, infolen);
}
/*
* See RFC 9180 Section 4 LabelExtract()
*/
int ossl_hpke_labeled_extract(EVP_KDF_CTX *kctx,
- unsigned char *prk, size_t prklen,
- const unsigned char *salt, size_t saltlen,
- const char *protocol_label,
- const unsigned char *suiteid, size_t suiteidlen,
- const char *label,
- const unsigned char *ikm, size_t ikmlen)
+ unsigned char *prk, size_t prklen,
+ const unsigned char *salt, size_t saltlen,
+ const char *protocol_label,
+ const unsigned char *suiteid, size_t suiteidlen,
+ const char *label,
+ const unsigned char *ikm, size_t ikmlen)
{
int ret = 0;
size_t label_hpkev1len = 0;
@@ -319,19 +319,19 @@ int ossl_hpke_labeled_extract(EVP_KDF_CTX *kctx,
/* labeled_ikm = concat("HPKE-v1", suiteid, label, ikm) */
if (!WPACKET_init_static_len(&pkt, labeled_ikm, labeled_ikmlen, 0)
- || !WPACKET_memcpy(&pkt, LABEL_HPKEV1, label_hpkev1len)
- || !WPACKET_memcpy(&pkt, protocol_label, protocol_labellen)
- || !WPACKET_memcpy(&pkt, suiteid, suiteidlen)
- || !WPACKET_memcpy(&pkt, label, labellen)
- || !WPACKET_memcpy(&pkt, ikm, ikmlen)
- || !WPACKET_get_total_written(&pkt, &labeled_ikmlen)
- || !WPACKET_finish(&pkt)) {
+ || !WPACKET_memcpy(&pkt, LABEL_HPKEV1, label_hpkev1len)
+ || !WPACKET_memcpy(&pkt, protocol_label, protocol_labellen)
+ || !WPACKET_memcpy(&pkt, suiteid, suiteidlen)
+ || !WPACKET_memcpy(&pkt, label, labellen)
+ || !WPACKET_memcpy(&pkt, ikm, ikmlen)
+ || !WPACKET_get_total_written(&pkt, &labeled_ikmlen)
+ || !WPACKET_finish(&pkt)) {
ERR_raise(ERR_LIB_PROV, PROV_R_OUTPUT_BUFFER_TOO_SMALL);
goto end;
}
ret = ossl_hpke_kdf_extract(kctx, prk, prklen, salt, saltlen,
- labeled_ikm, labeled_ikmlen);
+ labeled_ikm, labeled_ikmlen);
end:
WPACKET_cleanup(&pkt);
OPENSSL_cleanse(labeled_ikm, labeled_ikmlen);
@@ -343,12 +343,12 @@ end:
* See RFC 9180 Section 4 LabelExpand()
*/
int ossl_hpke_labeled_expand(EVP_KDF_CTX *kctx,
- unsigned char *okm, size_t okmlen,
- const unsigned char *prk, size_t prklen,
- const char *protocol_label,
- const unsigned char *suiteid, size_t suiteidlen,
- const char *label,
- const unsigned char *info, size_t infolen)
+ unsigned char *okm, size_t okmlen,
+ const unsigned char *prk, size_t prklen,
+ const char *protocol_label,
+ const unsigned char *suiteid, size_t suiteidlen,
+ const char *label,
+ const unsigned char *info, size_t infolen)
{
int ret = 0;
size_t label_hpkev1len = 0;
@@ -369,20 +369,20 @@ int ossl_hpke_labeled_expand(EVP_KDF_CTX *kctx,
/* labeled_info = concat(okmlen, "HPKE-v1", suiteid, label, info) */
if (!WPACKET_init_static_len(&pkt, labeled_info, labeled_infolen, 0)
- || !WPACKET_put_bytes_u16(&pkt, okmlen)
- || !WPACKET_memcpy(&pkt, LABEL_HPKEV1, label_hpkev1len)
- || !WPACKET_memcpy(&pkt, protocol_label, protocol_labellen)
- || !WPACKET_memcpy(&pkt, suiteid, suiteidlen)
- || !WPACKET_memcpy(&pkt, label, labellen)
- || !WPACKET_memcpy(&pkt, info, infolen)
- || !WPACKET_get_total_written(&pkt, &labeled_infolen)
- || !WPACKET_finish(&pkt)) {
+ || !WPACKET_put_bytes_u16(&pkt, okmlen)
+ || !WPACKET_memcpy(&pkt, LABEL_HPKEV1, label_hpkev1len)
+ || !WPACKET_memcpy(&pkt, protocol_label, protocol_labellen)
+ || !WPACKET_memcpy(&pkt, suiteid, suiteidlen)
+ || !WPACKET_memcpy(&pkt, label, labellen)
+ || !WPACKET_memcpy(&pkt, info, infolen)
+ || !WPACKET_get_total_written(&pkt, &labeled_infolen)
+ || !WPACKET_finish(&pkt)) {
ERR_raise(ERR_LIB_PROV, PROV_R_OUTPUT_BUFFER_TOO_SMALL);
goto end;
}
ret = ossl_hpke_kdf_expand(kctx, okm, okmlen,
- prk, prklen, labeled_info, labeled_infolen);
+ prk, prklen, labeled_info, labeled_infolen);
end:
WPACKET_cleanup(&pkt);
OPENSSL_free(labeled_info);
@@ -391,7 +391,7 @@ end:
/* Common code to create a HKDF ctx */
EVP_KDF_CTX *ossl_kdf_ctx_create(const char *kdfname, const char *mdname,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_LIB_CTX *libctx, const char *propq)
{
EVP_KDF *kdf;
EVP_KDF_CTX *kctx = NULL;
@@ -408,10 +408,10 @@ EVP_KDF_CTX *ossl_kdf_ctx_create(const char *kdfname, const char *mdname,
if (mdname != NULL)
*p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST,
- (char *)mdname, 0);
+ (char *)mdname, 0);
if (propq != NULL)
*p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_PROPERTIES,
- (char *)propq, 0);
+ (char *)propq, 0);
*p = OSSL_PARAM_construct_end();
if (EVP_KDF_CTX_set_params(kctx, params) <= 0) {
EVP_KDF_CTX_free(kctx);
@@ -429,7 +429,7 @@ EVP_KDF_CTX *ossl_kdf_ctx_create(const char *kdfname, const char *mdname,
* @return 0 when not found, else the matching item id.
*/
static uint16_t synonyms_name2id(const char *st, const synonymttab_t *synp,
- size_t arrsize)
+ size_t arrsize)
{
size_t i, j;
@@ -498,15 +498,18 @@ int ossl_hpke_str2suite(const char *suitestr, OSSL_HPKE_SUITE *suite)
/* check if string is known or number and if so handle appropriately */
if (labels == 0
&& (kem = synonyms_name2id(st, kemstrtab,
- OSSL_NELEM(kemstrtab))) == 0)
+ OSSL_NELEM(kemstrtab)))
+ == 0)
goto fail;
else if (labels == 1
- && (kdf = synonyms_name2id(st, kdfstrtab,
- OSSL_NELEM(kdfstrtab))) == 0)
+ && (kdf = synonyms_name2id(st, kdfstrtab,
+ OSSL_NELEM(kdfstrtab)))
+ == 0)
goto fail;
else if (labels == 2
- && (aead = synonyms_name2id(st, aeadstrtab,
- OSSL_NELEM(aeadstrtab))) == 0)
+ && (aead = synonyms_name2id(st, aeadstrtab,
+ OSSL_NELEM(aeadstrtab)))
+ == 0)
goto fail;
if (cp == NULL)
diff --git a/crypto/http/http_client.c b/crypto/http/http_client.c
index c5766aae15..181b50e688 100644
--- a/crypto/http/http_client.c
+++ b/crypto/http/http_client.c
@@ -27,71 +27,71 @@
#define HTTP_PREFIX "HTTP/"
#define HTTP_VERSION_PATT "1." /* allow 1.x */
#define HTTP_VERSION_STR_LEN sizeof(HTTP_VERSION_PATT) /* == strlen("1.0") */
-#define HTTP_PREFIX_VERSION HTTP_PREFIX""HTTP_VERSION_PATT
-#define HTTP_1_0 HTTP_PREFIX_VERSION"0" /* "HTTP/1.0" */
+#define HTTP_PREFIX_VERSION HTTP_PREFIX "" HTTP_VERSION_PATT
+#define HTTP_1_0 HTTP_PREFIX_VERSION "0" /* "HTTP/1.0" */
#define HTTP_LINE1_MINLEN (sizeof(HTTP_PREFIX_VERSION "x 200\n") - 1)
#define HTTP_VERSION_MAX_REDIRECTIONS 50
-#define HTTP_STATUS_CODE_OK 200
+#define HTTP_STATUS_CODE_OK 200
#define HTTP_STATUS_CODE_MOVED_PERMANENTLY 301
-#define HTTP_STATUS_CODE_FOUND 302
-#define HTTP_STATUS_CODES_NONFATAL_ERROR 400
-#define HTTP_STATUS_CODE_NOT_FOUND 404
+#define HTTP_STATUS_CODE_FOUND 302
+#define HTTP_STATUS_CODES_NONFATAL_ERROR 400
+#define HTTP_STATUS_CODE_NOT_FOUND 404
/* Stateful HTTP request code, supporting blocking and non-blocking I/O */
/* Opaque HTTP request status structure */
struct ossl_http_req_ctx_st {
- int state; /* Current I/O state */
- unsigned char *buf; /* Buffer to write request or read response */
- int buf_size; /* Buffer size */
- int free_wbio; /* wbio allocated internally, free with ctx */
- BIO *wbio; /* BIO to write/send request to */
- BIO *rbio; /* BIO to read/receive response from */
- OSSL_HTTP_bio_cb_t upd_fn; /* Optional BIO update callback used for TLS */
- void *upd_arg; /* Optional arg for update callback function */
- int use_ssl; /* Use HTTPS */
- char *proxy; /* Optional proxy name or URI */
- char *server; /* Optional server hostname */
- char *port; /* Optional server port */
- BIO *mem; /* Mem BIO holding request header or response */
- BIO *req; /* BIO holding the request provided by caller */
- int method_POST; /* HTTP method is POST (else GET) */
- int text; /* Request content type is (likely) text */
- char *expected_ct; /* Optional expected Content-Type */
- int expect_asn1; /* Response content must be ASN.1-encoded */
- unsigned char *pos; /* Current position sending data */
- long len_to_send; /* Number of bytes still to send */
- size_t resp_len; /* Length of response */
- size_t max_resp_len; /* Maximum length of response, or 0 */
- int keep_alive; /* Persistent conn. 0=no, 1=prefer, 2=require */
- time_t max_time; /* Maximum end time of current transfer, or 0 */
- time_t max_total_time; /* Maximum end time of total transfer, or 0 */
- char *redirection_url; /* Location obtained from HTTP status 301/302 */
- size_t max_hdr_lines; /* Max. number of response header lines, or 0 */
+ int state; /* Current I/O state */
+ unsigned char *buf; /* Buffer to write request or read response */
+ int buf_size; /* Buffer size */
+ int free_wbio; /* wbio allocated internally, free with ctx */
+ BIO *wbio; /* BIO to write/send request to */
+ BIO *rbio; /* BIO to read/receive response from */
+ OSSL_HTTP_bio_cb_t upd_fn; /* Optional BIO update callback used for TLS */
+ void *upd_arg; /* Optional arg for update callback function */
+ int use_ssl; /* Use HTTPS */
+ char *proxy; /* Optional proxy name or URI */
+ char *server; /* Optional server hostname */
+ char *port; /* Optional server port */
+ BIO *mem; /* Mem BIO holding request header or response */
+ BIO *req; /* BIO holding the request provided by caller */
+ int method_POST; /* HTTP method is POST (else GET) */
+ int text; /* Request content type is (likely) text */
+ char *expected_ct; /* Optional expected Content-Type */
+ int expect_asn1; /* Response content must be ASN.1-encoded */
+ unsigned char *pos; /* Current position sending data */
+ long len_to_send; /* Number of bytes still to send */
+ size_t resp_len; /* Length of response */
+ size_t max_resp_len; /* Maximum length of response, or 0 */
+ int keep_alive; /* Persistent conn. 0=no, 1=prefer, 2=require */
+ time_t max_time; /* Maximum end time of current transfer, or 0 */
+ time_t max_total_time; /* Maximum end time of total transfer, or 0 */
+ char *redirection_url; /* Location obtained from HTTP status 301/302 */
+ size_t max_hdr_lines; /* Max. number of response header lines, or 0 */
};
/* HTTP client OSSL_HTTP_REQ_CTX_nbio() internal states, in typical order */
-#define OHS_NOREAD 0x1000 /* If set no reading should be performed */
-#define OHS_ERROR (0 | OHS_NOREAD) /* Error condition */
-#define OHS_ADD_HEADERS (1 | OHS_NOREAD) /* Adding header lines to request */
-#define OHS_WRITE_INIT (2 | OHS_NOREAD) /* 1st call: ready to start send */
-#define OHS_WRITE_HDR1 (3 | OHS_NOREAD) /* Request header to be sent */
-#define OHS_WRITE_HDR (4 | OHS_NOREAD) /* Request header being sent */
-#define OHS_WRITE_REQ (5 | OHS_NOREAD) /* Request content (body) being sent */
-#define OHS_FLUSH (6 | OHS_NOREAD) /* Request being flushed */
-
-#define OHS_FIRSTLINE 1 /* First line of response being read */
-#define OHS_HEADERS 2 /* MIME headers of response being read */
-#define OHS_HEADERS_ERROR 3 /* MIME headers of response being read after fatal error */
-#define OHS_REDIRECT 4 /* MIME headers being read, expecting Location */
-#define OHS_ASN1_HEADER 5 /* ASN1 sequence header (tag+length) being read */
-#define OHS_ASN1_CONTENT 6 /* ASN1 content octets being read */
-#define OHS_ASN1_DONE 7 /* ASN1 content read completed */
-#define OHS_STREAM 8 /* HTTP content stream to be read by caller */
-#define OHS_ERROR_CONTENT 9 /* response content (body) being read after fatal error */
+#define OHS_NOREAD 0x1000 /* If set no reading should be performed */
+#define OHS_ERROR (0 | OHS_NOREAD) /* Error condition */
+#define OHS_ADD_HEADERS (1 | OHS_NOREAD) /* Adding header lines to request */
+#define OHS_WRITE_INIT (2 | OHS_NOREAD) /* 1st call: ready to start send */
+#define OHS_WRITE_HDR1 (3 | OHS_NOREAD) /* Request header to be sent */
+#define OHS_WRITE_HDR (4 | OHS_NOREAD) /* Request header being sent */
+#define OHS_WRITE_REQ (5 | OHS_NOREAD) /* Request content (body) being sent */
+#define OHS_FLUSH (6 | OHS_NOREAD) /* Request being flushed */
+
+#define OHS_FIRSTLINE 1 /* First line of response being read */
+#define OHS_HEADERS 2 /* MIME headers of response being read */
+#define OHS_HEADERS_ERROR 3 /* MIME headers of response being read after fatal error */
+#define OHS_REDIRECT 4 /* MIME headers being read, expecting Location */
+#define OHS_ASN1_HEADER 5 /* ASN1 sequence header (tag+length) being read */
+#define OHS_ASN1_CONTENT 6 /* ASN1 content octets being read */
+#define OHS_ASN1_DONE 7 /* ASN1 content read completed */
+#define OHS_STREAM 8 /* HTTP content stream to be read by caller */
+#define OHS_ERROR_CONTENT 9 /* response content (body) being read after fatal error */
/* Low-level HTTP API implementation */
@@ -162,7 +162,7 @@ size_t OSSL_HTTP_REQ_CTX_get_resp_len(const OSSL_HTTP_REQ_CTX *rctx)
}
void OSSL_HTTP_REQ_CTX_set_max_response_length(OSSL_HTTP_REQ_CTX *rctx,
- unsigned long len)
+ unsigned long len)
{
if (rctx == NULL) {
ERR_raise(ERR_LIB_HTTP, ERR_R_PASSED_NULL_PARAMETER);
@@ -177,8 +177,8 @@ void OSSL_HTTP_REQ_CTX_set_max_response_length(OSSL_HTTP_REQ_CTX *rctx,
* a plain HTTP proxy is used and |path| does not begin with 'http://'.
*/
int OSSL_HTTP_REQ_CTX_set_request_line(OSSL_HTTP_REQ_CTX *rctx, int method_POST,
- const char *server, const char *port,
- const char *path)
+ const char *server, const char *port,
+ const char *path)
{
if (rctx == NULL) {
ERR_raise(ERR_LIB_HTTP, ERR_R_PASSED_NULL_PARAMETER);
@@ -197,14 +197,14 @@ int OSSL_HTTP_REQ_CTX_set_request_line(OSSL_HTTP_REQ_CTX *rctx, int method_POST,
* Section 5.1.2 of RFC 1945 states that the absoluteURI form is only
* allowed when using a proxy
*/
- if (BIO_printf(rctx->mem, OSSL_HTTP_PREFIX"%s", server) <= 0)
+ if (BIO_printf(rctx->mem, OSSL_HTTP_PREFIX "%s", server) <= 0)
return 0;
if (port != NULL && BIO_printf(rctx->mem, ":%s", port) <= 0)
return 0;
}
/* Make sure path includes a forward slash (abs_path) */
- if (path == NULL) {
+ if (path == NULL) {
path = "/";
} else if (HAS_PREFIX(path, "http://")) { /* absoluteURI for proxy use */
if (server != NULL) {
@@ -218,7 +218,7 @@ int OSSL_HTTP_REQ_CTX_set_request_line(OSSL_HTTP_REQ_CTX *rctx, int method_POST,
* Add (the rest of) the path and the HTTP version,
* which is fixed to 1.0 for straightforward implementation of keep-alive
*/
- if (BIO_printf(rctx->mem, "%s "HTTP_1_0"\r\n", path) <= 0)
+ if (BIO_printf(rctx->mem, "%s " HTTP_1_0 "\r\n", path) <= 0)
return 0;
rctx->resp_len = 0;
@@ -227,7 +227,7 @@ int OSSL_HTTP_REQ_CTX_set_request_line(OSSL_HTTP_REQ_CTX *rctx, int method_POST,
}
int OSSL_HTTP_REQ_CTX_add1_header(OSSL_HTTP_REQ_CTX *rctx,
- const char *name, const char *value)
+ const char *name, const char *value)
{
if (rctx == NULL || name == NULL) {
ERR_raise(ERR_LIB_HTTP, ERR_R_PASSED_NULL_PARAMETER);
@@ -250,15 +250,15 @@ int OSSL_HTTP_REQ_CTX_add1_header(OSSL_HTTP_REQ_CTX *rctx,
}
int OSSL_HTTP_REQ_CTX_set_expected(OSSL_HTTP_REQ_CTX *rctx,
- const char *content_type, int asn1,
- int timeout, int keep_alive)
+ const char *content_type, int asn1,
+ int timeout, int keep_alive)
{
if (rctx == NULL) {
ERR_raise(ERR_LIB_HTTP, ERR_R_PASSED_NULL_PARAMETER);
return 0;
}
if (keep_alive != 0
- && rctx->state != OHS_ERROR && rctx->state != OHS_ADD_HEADERS) {
+ && rctx->state != OHS_ERROR && rctx->state != OHS_ADD_HEADERS) {
/* Cannot anymore set keep-alive in request header */
ERR_raise(ERR_LIB_HTTP, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
return 0;
@@ -267,7 +267,7 @@ int OSSL_HTTP_REQ_CTX_set_expected(OSSL_HTTP_REQ_CTX *rctx,
OPENSSL_free(rctx->expected_ct);
rctx->expected_ct = NULL;
if (content_type != NULL
- && (rctx->expected_ct = OPENSSL_strdup(content_type)) == NULL)
+ && (rctx->expected_ct = OPENSSL_strdup(content_type)) == NULL)
return 0;
rctx->expect_asn1 = asn1;
@@ -280,7 +280,7 @@ int OSSL_HTTP_REQ_CTX_set_expected(OSSL_HTTP_REQ_CTX *rctx,
}
static int set1_content(OSSL_HTTP_REQ_CTX *rctx,
- const char *content_type, BIO *req)
+ const char *content_type, BIO *req)
{
long req_len = 0;
#ifndef OPENSSL_NO_STDIO
@@ -293,7 +293,7 @@ static int set1_content(OSSL_HTTP_REQ_CTX *rctx,
}
if (rctx->keep_alive != 0
- && !OSSL_HTTP_REQ_CTX_add1_header(rctx, "Connection", "keep-alive"))
+ && !OSSL_HTTP_REQ_CTX_add1_header(rctx, "Connection", "keep-alive"))
return 0;
BIO_free(rctx->req);
@@ -336,10 +336,10 @@ static int set1_content(OSSL_HTTP_REQ_CTX *rctx,
}
if ((
#ifndef OPENSSL_NO_STDIO
- fp != NULL /* definitely correct req_len */ ||
+ fp != NULL /* definitely correct req_len */ ||
#endif
- req_len > 0)
- && BIO_printf(rctx->mem, "Content-Length: %ld\r\n", req_len) < 0)
+ req_len > 0)
+ && BIO_printf(rctx->mem, "Content-Length: %ld\r\n", req_len) < 0)
return 0;
if (!BIO_up_ref(req))
@@ -349,7 +349,7 @@ static int set1_content(OSSL_HTTP_REQ_CTX *rctx,
}
int OSSL_HTTP_REQ_CTX_set1_req(OSSL_HTTP_REQ_CTX *rctx, const char *content_type,
- const ASN1_ITEM *it, const ASN1_VALUE *req)
+ const ASN1_ITEM *it, const ASN1_VALUE *req)
{
BIO *mem = NULL;
int res = 1;
@@ -362,7 +362,7 @@ int OSSL_HTTP_REQ_CTX_set1_req(OSSL_HTTP_REQ_CTX *rctx, const char *content_type
}
void OSSL_HTTP_REQ_CTX_set_max_response_hdr_lines(OSSL_HTTP_REQ_CTX *rctx,
- size_t count)
+ size_t count)
{
if (rctx == NULL) {
ERR_raise(ERR_LIB_HTTP, ERR_R_PASSED_NULL_PARAMETER);
@@ -372,7 +372,7 @@ void OSSL_HTTP_REQ_CTX_set_max_response_hdr_lines(OSSL_HTTP_REQ_CTX *rctx,
}
static int add1_headers(OSSL_HTTP_REQ_CTX *rctx,
- const STACK_OF(CONF_VALUE) *headers, const char *host)
+ const STACK_OF(CONF_VALUE) *headers, const char *host)
{
int i;
int add_host = host != NULL && *host != '\0';
@@ -393,11 +393,11 @@ static int add1_headers(OSSL_HTTP_REQ_CTX *rctx,
/* Create OSSL_HTTP_REQ_CTX structure using the values provided. */
static OSSL_HTTP_REQ_CTX *http_req_ctx_new(int free_wbio, BIO *wbio, BIO *rbio,
- OSSL_HTTP_bio_cb_t bio_update_fn,
- void *arg, int use_ssl,
- const char *proxy,
- const char *server, const char *port,
- int buf_size, int overall_timeout)
+ OSSL_HTTP_bio_cb_t bio_update_fn,
+ void *arg, int use_ssl,
+ const char *proxy,
+ const char *server, const char *port,
+ int buf_size, int overall_timeout)
{
OSSL_HTTP_REQ_CTX *rctx = OSSL_HTTP_REQ_CTX_new(wbio, rbio, buf_size);
@@ -408,19 +408,18 @@ static OSSL_HTTP_REQ_CTX *http_req_ctx_new(int free_wbio, BIO *wbio, BIO *rbio,
rctx->upd_arg = arg;
rctx->use_ssl = use_ssl;
if (proxy != NULL
- && (rctx->proxy = OPENSSL_strdup(proxy)) == NULL)
+ && (rctx->proxy = OPENSSL_strdup(proxy)) == NULL)
goto err;
if (server != NULL
- && (rctx->server = OPENSSL_strdup(server)) == NULL)
+ && (rctx->server = OPENSSL_strdup(server)) == NULL)
goto err;
if (port != NULL
- && (rctx->port = OPENSSL_strdup(port)) == NULL)
+ && (rctx->port = OPENSSL_strdup(port)) == NULL)
goto err;
- rctx->max_total_time =
- overall_timeout > 0 ? time(NULL) + overall_timeout : 0;
+ rctx->max_total_time = overall_timeout > 0 ? time(NULL) + overall_timeout : 0;
return rctx;
- err:
+err:
OSSL_HTTP_REQ_CTX_free(rctx);
return NULL;
}
@@ -498,7 +497,7 @@ static int parse_http_line1(char *line, int *found_keep_alive)
return retcode;
}
- err:
+err:
for (i = 0; i < 60 && line[i] != '\0'; i++)
if (!ossl_isprint(line[i]))
line[i] = ' ';
@@ -511,7 +510,7 @@ static int check_max_len(const char *desc, size_t max_len, size_t len)
{
if (max_len != 0 && len > max_len) {
ERR_raise_data(ERR_LIB_HTTP, HTTP_R_MAX_RESP_LEN_EXCEEDED,
- "%s length=%zu, max=%zu", desc, len, max_len);
+ "%s length=%zu, max=%zu", desc, len, max_len);
return 0;
}
return 1;
@@ -523,7 +522,7 @@ static int check_set_resp_len(const char *desc, OSSL_HTTP_REQ_CTX *rctx, size_t
return 0;
if (rctx->resp_len != 0 && rctx->resp_len != len) {
ERR_raise_data(ERR_LIB_HTTP, HTTP_R_INCONSISTENT_CONTENT_LENGTH,
- "%s length=%zu, Content-Length=%zu", desc, len, rctx->resp_len);
+ "%s length=%zu, Content-Length=%zu", desc, len, rctx->resp_len);
return 0;
}
rctx->resp_len = len;
@@ -569,11 +568,10 @@ int OSSL_HTTP_REQ_CTX_nbio(OSSL_HTTP_REQ_CTX *rctx)
}
rctx->redirection_url = NULL;
- next_io:
+next_io:
buf = (char *)rctx->buf;
if ((rctx->state & OHS_NOREAD) == 0) {
- if (rctx->expect_asn1 && (rctx->state == OHS_ASN1_HEADER
- || rctx->state == OHS_ASN1_CONTENT)) {
+ if (rctx->expect_asn1 && (rctx->state == OHS_ASN1_HEADER || rctx->state == OHS_ASN1_CONTENT)) {
n = BIO_read(rctx->rbio, buf, rctx->buf_size);
} else { /* read one text line */
(void)ERR_set_mark();
@@ -643,7 +641,7 @@ int OSSL_HTTP_REQ_CTX_nbio(OSSL_HTTP_REQ_CTX *rctx)
OSSL_TRACE(HTTP, "Sending request header: [\n");
/* for request headers, this usually traces several lines at once: */
OSSL_TRACE_STRING(HTTP, rctx->state != OHS_WRITE_REQ || rctx->text,
- rctx->state != OHS_WRITE_REQ, rctx->pos, sz);
+ rctx->state != OHS_WRITE_REQ, rctx->pos, sz);
OSSL_TRACE(HTTP, "]\n"); /* end of request header or content */
}
if (rctx->state == OHS_WRITE_HDR1)
@@ -659,7 +657,7 @@ int OSSL_HTTP_REQ_CTX_nbio(OSSL_HTTP_REQ_CTX *rctx)
if (rctx->req != NULL && !BIO_eof(rctx->req)) {
if (OSSL_TRACE_ENABLED(HTTP))
OSSL_TRACE1(HTTP, "Sending request content (likely %s)\n",
- rctx->text ? "text" : "ASN.1");
+ rctx->text ? "text" : "ASN.1");
n = BIO_read(rctx->req, rctx->buf, rctx->buf_size);
if (n <= 0) {
if (BIO_should_retry(rctx->req))
@@ -698,7 +696,7 @@ int OSSL_HTTP_REQ_CTX_nbio(OSSL_HTTP_REQ_CTX *rctx)
case OHS_ERROR_CONTENT:
/* Attempt to read a line in */
- next_line:
+ next_line:
/*
* Due to strange memory BIO behavior with BIO_gets we have to check
* there's a complete line in there before calling BIO_gets or we'll
@@ -770,7 +768,8 @@ int OSSL_HTTP_REQ_CTX_nbio(OSSL_HTTP_REQ_CTX *rctx)
default:
/* must return content if status >= 400 */
rctx->state = i < HTTP_STATUS_CODES_NONFATAL_ERROR
- ? OHS_HEADERS_ERROR : OHS_HEADERS;
+ ? OHS_HEADERS_ERROR
+ : OHS_HEADERS;
goto next_line; /* continue parsing, also on HTTP error */
}
}
@@ -788,7 +787,7 @@ int OSSL_HTTP_REQ_CTX_nbio(OSSL_HTTP_REQ_CTX *rctx)
}
if (value != NULL && line_end != NULL) {
if (rctx->state == OHS_REDIRECT
- && OPENSSL_strcasecmp(key, "Location") == 0) {
+ && OPENSSL_strcasecmp(key, "Location") == 0) {
rctx->redirection_url = value;
if (OSSL_TRACE_ENABLED(HTTP))
OSSL_TRACE(HTTP, "]\n");
@@ -808,11 +807,12 @@ int OSSL_HTTP_REQ_CTX_nbio(OSSL_HTTP_REQ_CTX *rctx)
|| (semicolon = strchr(value, ';')) == NULL
|| (size_t)(semicolon - value) != strlen(rctx->expected_ct)
|| OPENSSL_strncasecmp(rctx->expected_ct, value,
- semicolon - value) != 0)) {
+ semicolon - value)
+ != 0)) {
ERR_raise_data(ERR_LIB_HTTP,
- HTTP_R_UNEXPECTED_CONTENT_TYPE,
- "expected=%s, actual=%s",
- rctx->expected_ct, value);
+ HTTP_R_UNEXPECTED_CONTENT_TYPE,
+ "expected=%s, actual=%s",
+ rctx->expected_ct, value);
return 0;
}
found_expected_ct = 1;
@@ -830,8 +830,8 @@ int OSSL_HTTP_REQ_CTX_nbio(OSSL_HTTP_REQ_CTX *rctx)
if (line_end == value || *line_end != '\0') {
ERR_raise_data(ERR_LIB_HTTP,
- HTTP_R_ERROR_PARSING_CONTENT_LENGTH,
- "input=%s", value);
+ HTTP_R_ERROR_PARSING_CONTENT_LENGTH,
+ "input=%s", value);
return 0;
}
if (!check_set_resp_len("response content-length", rctx, content_len))
@@ -852,7 +852,7 @@ int OSSL_HTTP_REQ_CTX_nbio(OSSL_HTTP_REQ_CTX *rctx)
OSSL_TRACE(HTTP, "]\n"); /* end of response header */
if (rctx->keep_alive != 0 /* do not let server initiate keep_alive */
- && !found_keep_alive /* otherwise there is no change */) {
+ && !found_keep_alive /* otherwise there is no change */) {
if (rctx->keep_alive == 2) {
rctx->keep_alive = 0;
ERR_raise(ERR_LIB_HTTP, HTTP_R_SERVER_CANCELED_CONNECTION);
@@ -865,7 +865,7 @@ int OSSL_HTTP_REQ_CTX_nbio(OSSL_HTTP_REQ_CTX *rctx)
rctx->state = OHS_ERROR_CONTENT;
if (OSSL_TRACE_ENABLED(HTTP)) {
OSSL_TRACE1(HTTP, "Receiving error response content (likely %s): [\n",
- got_text ? "text" : "ASN.1");
+ got_text ? "text" : "ASN.1");
goto next_line;
}
/* discard response content when trace not enabled */
@@ -875,7 +875,7 @@ int OSSL_HTTP_REQ_CTX_nbio(OSSL_HTTP_REQ_CTX *rctx)
if (rctx->expected_ct != NULL && !found_expected_ct) {
ERR_raise_data(ERR_LIB_HTTP, HTTP_R_MISSING_CONTENT_TYPE,
- "expected=%s", rctx->expected_ct);
+ "expected=%s", rctx->expected_ct);
return 0;
}
if (rctx->state == OHS_REDIRECT) {
@@ -958,7 +958,7 @@ int OSSL_HTTP_REQ_CTX_nbio(OSSL_HTTP_REQ_CTX *rctx)
}
int OSSL_HTTP_REQ_CTX_nbio_d2i(OSSL_HTTP_REQ_CTX *rctx,
- ASN1_VALUE **pval, const ASN1_ITEM *it)
+ ASN1_VALUE **pval, const ASN1_ITEM *it)
{
const unsigned char *p;
int rv;
@@ -968,7 +968,6 @@ int OSSL_HTTP_REQ_CTX_nbio_d2i(OSSL_HTTP_REQ_CTX *rctx,
return rv;
*pval = ASN1_item_d2i(NULL, &p, BIO_get_mem_data(rctx->mem, &p), it);
return *pval != NULL;
-
}
#ifndef OPENSSL_NO_SOCK
@@ -989,10 +988,10 @@ static const char *explict_or_default_port(const char *hostserv, const char *por
/* set up a new connection BIO, to HTTP server or to HTTP(S) proxy if given */
static BIO *http_new_bio(const char *server /* optionally includes ":port" */,
- const char *server_port /* explicit server port */,
- int use_ssl,
- const char *proxy /* optionally includes ":port" */,
- const char *proxy_port /* explicit proxy port */)
+ const char *server_port /* explicit server port */,
+ int use_ssl,
+ const char *proxy /* optionally includes ":port" */,
+ const char *proxy_port /* explicit proxy port */)
{
const char *host = server;
const char *port = server_port;
@@ -1014,7 +1013,7 @@ static BIO *http_new_bio(const char *server /* optionally includes ":port" */,
if (port != NULL)
(void)BIO_set_conn_port(cbio, port);
- end:
+end:
return cbio;
}
#endif /* OPENSSL_NO_SOCK */
@@ -1060,10 +1059,10 @@ int OSSL_HTTP_is_alive(const OSSL_HTTP_REQ_CTX *rctx)
/* Initiate an HTTP session using bio, else use given server, proxy, etc. */
OSSL_HTTP_REQ_CTX *OSSL_HTTP_open(const char *server, const char *port,
- const char *proxy, const char *no_proxy,
- int use_ssl, BIO *bio, BIO *rbio,
- OSSL_HTTP_bio_cb_t bio_update_fn, void *arg,
- int buf_size, int overall_timeout)
+ const char *proxy, const char *no_proxy,
+ int use_ssl, BIO *bio, BIO *rbio,
+ OSSL_HTTP_bio_cb_t bio_update_fn, void *arg,
+ int buf_size, int overall_timeout)
{
BIO *cbio; /* == bio if supplied, used as connection BIO if rbio is NULL */
OSSL_HTTP_REQ_CTX *rctx = NULL;
@@ -1096,8 +1095,8 @@ OSSL_HTTP_REQ_CTX *OSSL_HTTP_open(const char *server, const char *port,
proxy = OSSL_HTTP_adapt_proxy(proxy, no_proxy, server, use_ssl);
if (proxy != NULL
&& !OSSL_HTTP_parse_url(proxy, NULL /* use_ssl */, NULL /* user */,
- &proxy_host, &proxy_port, NULL /* num */,
- NULL /* path */, NULL, NULL))
+ &proxy_host, &proxy_port, NULL /* num */,
+ NULL /* path */, NULL, NULL))
return NULL;
cbio = http_new_bio(server, port, use_ssl, proxy_host, proxy_port);
OPENSSL_free(proxy_host);
@@ -1132,10 +1131,10 @@ OSSL_HTTP_REQ_CTX *OSSL_HTTP_open(const char *server, const char *port,
}
rctx = http_req_ctx_new(bio == NULL, cbio, rbio != NULL ? rbio : cbio,
- bio_update_fn, arg, use_ssl, proxy, server, port,
- buf_size, overall_timeout);
+ bio_update_fn, arg, use_ssl, proxy, server, port,
+ buf_size, overall_timeout);
- end:
+end:
if (rctx != NULL)
/* remove any spurious error queue entries by ssl_add_cert_chain() */
(void)ERR_pop_to_mark();
@@ -1146,10 +1145,10 @@ OSSL_HTTP_REQ_CTX *OSSL_HTTP_open(const char *server, const char *port,
}
int OSSL_HTTP_set1_request(OSSL_HTTP_REQ_CTX *rctx, const char *path,
- const STACK_OF(CONF_VALUE) *headers,
- const char *content_type, BIO *req,
- const char *expected_content_type, int expect_asn1,
- size_t max_resp_len, int timeout, int keep_alive)
+ const STACK_OF(CONF_VALUE) *headers,
+ const char *content_type, BIO *req,
+ const char *expected_content_type, int expect_asn1,
+ size_t max_resp_len, int timeout, int keep_alive)
{
int use_http_proxy;
@@ -1165,11 +1164,12 @@ int OSSL_HTTP_set1_request(OSSL_HTTP_REQ_CTX *rctx, const char *path,
rctx->max_resp_len = max_resp_len; /* allows for 0: indefinite */
return OSSL_HTTP_REQ_CTX_set_request_line(rctx, req != NULL,
- use_http_proxy ? rctx->server
- : NULL, rctx->port, path)
+ use_http_proxy ? rctx->server
+ : NULL,
+ rctx->port, path)
&& add1_headers(rctx, headers, rctx->server)
&& OSSL_HTTP_REQ_CTX_set_expected(rctx, expected_content_type,
- expect_asn1, timeout, keep_alive)
+ expect_asn1, timeout, keep_alive)
&& set1_content(rctx, content_type, req);
}
@@ -1205,26 +1205,25 @@ BIO *OSSL_HTTP_exchange(OSSL_HTTP_REQ_CTX *rctx, char **redirection_url)
int reason = ERR_GET_REASON(err);
if (lib == ERR_LIB_SSL || lib == ERR_LIB_HTTP
- || (lib == ERR_LIB_BIO && reason == BIO_R_CONNECT_TIMEOUT)
- || (lib == ERR_LIB_BIO && reason == BIO_R_CONNECT_ERROR)
+ || (lib == ERR_LIB_BIO && reason == BIO_R_CONNECT_TIMEOUT)
+ || (lib == ERR_LIB_BIO && reason == BIO_R_CONNECT_ERROR)
#ifndef OPENSSL_NO_CMP
- || (lib == ERR_LIB_CMP
- && reason == CMP_R_POTENTIALLY_INVALID_CERTIFICATE)
+ || (lib == ERR_LIB_CMP
+ && reason == CMP_R_POTENTIALLY_INVALID_CERTIFICATE)
#endif
- ) {
+ ) {
if (rctx->server != NULL && *rctx->server != '\0') {
BIO_snprintf(buf, sizeof(buf), "server=http%s://%s%s%s",
- rctx->use_ssl ? "s" : "", rctx->server,
- rctx->port != NULL ? ":" : "",
- rctx->port != NULL ? rctx->port : "");
+ rctx->use_ssl ? "s" : "", rctx->server,
+ rctx->port != NULL ? ":" : "",
+ rctx->port != NULL ? rctx->port : "");
ERR_add_error_data(1, buf);
}
if (rctx->proxy != NULL)
ERR_add_error_data(2, " proxy=", rctx->proxy);
if (err == 0) {
BIO_snprintf(buf, sizeof(buf), " peer has disconnected%s",
- rctx->use_ssl ? " violating the protocol" :
- ", likely because it requires the use of TLS");
+ rctx->use_ssl ? " violating the protocol" : ", likely because it requires the use of TLS");
ERR_add_error_data(1, buf);
}
}
@@ -1244,8 +1243,7 @@ static int redirection_ok(int n_redir, const char *old_url, const char *new_url)
}
if (*new_url == '/') /* redirection to same server => same protocol */
return 1;
- if (HAS_PREFIX(old_url, OSSL_HTTPS_NAME":") &&
- !HAS_PREFIX(new_url, OSSL_HTTPS_NAME":")) {
+ if (HAS_PREFIX(old_url, OSSL_HTTPS_NAME ":") && !HAS_PREFIX(new_url, OSSL_HTTPS_NAME ":")) {
ERR_raise(ERR_LIB_HTTP, HTTP_R_REDIRECTION_FROM_HTTPS_TO_HTTP);
return 0;
}
@@ -1254,11 +1252,11 @@ static int redirection_ok(int n_redir, const char *old_url, const char *new_url)
/* Get data via HTTP from server at given URL, potentially with redirection */
BIO *OSSL_HTTP_get(const char *url, const char *proxy, const char *no_proxy,
- BIO *bio, BIO *rbio,
- OSSL_HTTP_bio_cb_t bio_update_fn, void *arg,
- int buf_size, const STACK_OF(CONF_VALUE) *headers,
- const char *expected_ct, int expect_asn1,
- size_t max_resp_len, int timeout)
+ BIO *bio, BIO *rbio,
+ OSSL_HTTP_bio_cb_t bio_update_fn, void *arg,
+ int buf_size, const STACK_OF(CONF_VALUE) *headers,
+ const char *expected_ct, int expect_asn1,
+ size_t max_resp_len, int timeout)
{
char *current_url;
int n_redirs = 0;
@@ -1281,21 +1279,21 @@ BIO *OSSL_HTTP_get(const char *url, const char *proxy, const char *no_proxy,
char *redirection_url;
if (!OSSL_HTTP_parse_url(current_url, &use_ssl, NULL /* user */, &host,
- &port, NULL /* port_num */, &path, NULL, NULL))
+ &port, NULL /* port_num */, &path, NULL, NULL))
break;
rctx = OSSL_HTTP_open(host, port, proxy, no_proxy,
- use_ssl, bio, rbio, bio_update_fn, arg,
- buf_size, timeout);
+ use_ssl, bio, rbio, bio_update_fn, arg,
+ buf_size, timeout);
new_rpath:
redirection_url = NULL;
if (rctx != NULL) {
if (!OSSL_HTTP_set1_request(rctx, path, headers,
- NULL /* content_type */,
- NULL /* req */,
- expected_ct, expect_asn1, max_resp_len,
- -1 /* use same max time (timeout) */,
- 0 /* no keep_alive */)) {
+ NULL /* content_type */,
+ NULL /* req */,
+ expected_ct, expect_asn1, max_resp_len,
+ -1 /* use same max time (timeout) */,
+ 0 /* no keep_alive */)) {
OSSL_HTTP_REQ_CTX_free(rctx);
rctx = NULL;
} else {
@@ -1305,7 +1303,7 @@ BIO *OSSL_HTTP_get(const char *url, const char *proxy, const char *no_proxy,
OPENSSL_free(path);
if (resp == NULL && redirection_url != NULL) {
if (redirection_ok(++n_redirs, current_url, redirection_url)
- && may_still_retry(max_time, &timeout)) {
+ && may_still_retry(max_time, &timeout)) {
(void)BIO_reset(bio);
OPENSSL_free(current_url);
current_url = redirection_url;
@@ -1343,29 +1341,29 @@ BIO *OSSL_HTTP_get(const char *url, const char *proxy, const char *no_proxy,
/* Exchange request and response over a connection managed via |prctx| */
BIO *OSSL_HTTP_transfer(OSSL_HTTP_REQ_CTX **prctx,
- const char *server, const char *port,
- const char *path, int use_ssl,
- const char *proxy, const char *no_proxy,
- BIO *bio, BIO *rbio,
- OSSL_HTTP_bio_cb_t bio_update_fn, void *arg,
- int buf_size, const STACK_OF(CONF_VALUE) *headers,
- const char *content_type, BIO *req,
- const char *expected_ct, int expect_asn1,
- size_t max_resp_len, int timeout, int keep_alive)
+ const char *server, const char *port,
+ const char *path, int use_ssl,
+ const char *proxy, const char *no_proxy,
+ BIO *bio, BIO *rbio,
+ OSSL_HTTP_bio_cb_t bio_update_fn, void *arg,
+ int buf_size, const STACK_OF(CONF_VALUE) *headers,
+ const char *content_type, BIO *req,
+ const char *expected_ct, int expect_asn1,
+ size_t max_resp_len, int timeout, int keep_alive)
{
OSSL_HTTP_REQ_CTX *rctx = prctx == NULL ? NULL : *prctx;
BIO *resp = NULL;
if (rctx == NULL) {
rctx = OSSL_HTTP_open(server, port, proxy, no_proxy,
- use_ssl, bio, rbio, bio_update_fn, arg,
- buf_size, timeout);
+ use_ssl, bio, rbio, bio_update_fn, arg,
+ buf_size, timeout);
timeout = -1; /* Already set during opening the connection */
}
if (rctx != NULL) {
if (OSSL_HTTP_set1_request(rctx, path, headers, content_type, req,
- expected_ct, expect_asn1,
- max_resp_len, timeout, keep_alive))
+ expected_ct, expect_asn1,
+ max_resp_len, timeout, keep_alive))
resp = OSSL_HTTP_exchange(rctx, NULL);
if (resp == NULL || !OSSL_HTTP_is_alive(rctx)) {
if (!OSSL_HTTP_close(rctx, resp != NULL)) {
@@ -1388,7 +1386,7 @@ int OSSL_HTTP_close(OSSL_HTTP_REQ_CTX *rctx, int ok)
/* callback can be used to finish TLS session and free its BIO */
if (rctx != NULL && rctx->upd_fn != NULL) {
wbio = (*rctx->upd_fn)(rctx->wbio, rctx->upd_arg,
- 0 /* disconnect */, ok);
+ 0 /* disconnect */, ok);
ret = wbio != NULL;
if (ret)
rctx->wbio = wbio;
@@ -1429,8 +1427,8 @@ static char *base64encode(const void *buf, size_t len)
* to print additional diagnostic information in a user-oriented way.
*/
int OSSL_HTTP_proxy_connect(BIO *bio, const char *server, const char *port,
- const char *proxyuser, const char *proxypass,
- int timeout, BIO *bio_err, const char *prog)
+ const char *proxyuser, const char *proxypass,
+ int timeout, BIO *bio_err, const char *prog)
{
#undef BUF_SIZE
#define BUF_SIZE (8 * 1024)
@@ -1443,7 +1441,7 @@ int OSSL_HTTP_proxy_connect(BIO *bio, const char *server, const char *port,
time_t max_time = timeout > 0 ? time(NULL) + timeout : 0;
if (bio == NULL || server == NULL
- || (bio_err != NULL && prog == NULL)) {
+ || (bio_err != NULL && prog == NULL)) {
ERR_raise(ERR_LIB_HTTP, ERR_R_PASSED_NULL_PARAMETER);
goto end;
}
@@ -1456,7 +1454,7 @@ int OSSL_HTTP_proxy_connect(BIO *bio, const char *server, const char *port,
}
BIO_push(fbio, bio);
- BIO_printf(fbio, "CONNECT %s:%s "HTTP_1_0"\r\n", server, port);
+ BIO_printf(fbio, "CONNECT %s:%s " HTTP_1_0 "\r\n", server, port);
/*
* Workaround for broken proxies which would otherwise close
@@ -1475,7 +1473,8 @@ int OSSL_HTTP_proxy_connect(BIO *bio, const char *server, const char *port,
if (proxyauth == NULL)
goto end;
if (BIO_snprintf(proxyauth, len + 1, "%s:%s", proxyuser,
- proxypass != NULL ? proxypass : "") != (int)len)
+ proxypass != NULL ? proxypass : "")
+ != (int)len)
goto proxy_end;
proxyauthenc = base64encode(proxyauth, len);
if (proxyauthenc != NULL) {
@@ -1504,7 +1503,7 @@ int OSSL_HTTP_proxy_connect(BIO *bio, const char *server, const char *port,
rv = BIO_wait(fbio, max_time, 100 /* milliseconds */);
if (rv <= 0) {
BIO_printf(bio_err, "%s: HTTP CONNECT %s\n", prog,
- rv == 0 ? "timed out" : "failed waiting for data");
+ rv == 0 ? "timed out" : "failed waiting for data");
goto end;
}
@@ -1523,15 +1522,15 @@ int OSSL_HTTP_proxy_connect(BIO *bio, const char *server, const char *port,
if (!CHECK_AND_SKIP_PREFIX(mbufp, HTTP_PREFIX)) {
ERR_raise(ERR_LIB_HTTP, HTTP_R_HEADER_PARSE_ERROR);
BIO_printf(bio_err, "%s: HTTP CONNECT failed, non-HTTP response\n",
- prog);
+ prog);
/* Wrong protocol, not even HTTP, so stop reading headers */
goto end;
}
if (!HAS_PREFIX(mbufp, HTTP_VERSION_PATT)) {
ERR_raise(ERR_LIB_HTTP, HTTP_R_RECEIVED_WRONG_HTTP_VERSION);
BIO_printf(bio_err,
- "%s: HTTP CONNECT failed, bad HTTP version %.*s\n",
- prog, (int)HTTP_VERSION_STR_LEN, mbufp);
+ "%s: HTTP CONNECT failed, bad HTTP version %.*s\n",
+ prog, (int)HTTP_VERSION_STR_LEN, mbufp);
goto end;
}
mbufp += HTTP_VERSION_STR_LEN;
@@ -1545,9 +1544,9 @@ int OSSL_HTTP_proxy_connect(BIO *bio, const char *server, const char *port,
read_len--;
mbuf[read_len] = '\0';
ERR_raise_data(ERR_LIB_HTTP, HTTP_R_CONNECT_FAILURE,
- "reason=%s", mbufp);
+ "reason=%s", mbufp);
BIO_printf(bio_err, "%s: HTTP CONNECT failed, reason=%s\n",
- prog, mbufp);
+ prog, mbufp);
goto end;
}
ret = 1;
@@ -1563,7 +1562,7 @@ int OSSL_HTTP_proxy_connect(BIO *bio, const char *server, const char *port,
read_len = BIO_gets(fbio, mbuf, BUF_SIZE);
} while (read_len > 2);
- end:
+end:
if (fbio != NULL) {
(void)BIO_flush(fbio);
BIO_pop(fbio);
diff --git a/crypto/http/http_err.c b/crypto/http/http_err.c
index 22c2b40e61..947a403d60 100644
--- a/crypto/http/http_err.c
+++ b/crypto/http/http_err.c
@@ -14,74 +14,74 @@
#ifndef OPENSSL_NO_HTTP
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA HTTP_str_reasons[] = {
- {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_ASN1_LEN_EXCEEDS_MAX_RESP_LEN),
- "asn1 len exceeds max resp len"},
- {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_CONNECT_FAILURE), "connect failure"},
- {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_ERROR_PARSING_ASN1_LENGTH),
- "error parsing asn1 length"},
- {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_ERROR_PARSING_CONTENT_LENGTH),
- "error parsing content length"},
- {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_ERROR_PARSING_URL), "error parsing url"},
- {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_ERROR_RECEIVING), "error receiving"},
- {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_ERROR_SENDING), "error sending"},
- {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_FAILED_READING_DATA),
- "failed reading data"},
- {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_HEADER_PARSE_ERROR),
- "header parse error"},
- {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_INCONSISTENT_CONTENT_LENGTH),
- "inconsistent content length"},
- {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_INVALID_PORT_NUMBER),
- "invalid port number"},
- {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_INVALID_URL_PATH), "invalid url path"},
- {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_INVALID_URL_SCHEME),
- "invalid url scheme"},
- {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_MAX_RESP_LEN_EXCEEDED),
- "max resp len exceeded"},
- {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_MISSING_ASN1_ENCODING),
- "missing asn1 encoding"},
- {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_MISSING_CONTENT_TYPE),
- "missing content type"},
- {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_MISSING_REDIRECT_LOCATION),
- "missing redirect location"},
- {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_RECEIVED_ERROR), "received error"},
- {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_RECEIVED_WRONG_HTTP_VERSION),
- "received wrong http version"},
- {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_REDIRECTION_FROM_HTTPS_TO_HTTP),
- "redirection from https to http"},
- {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_REDIRECTION_NOT_ENABLED),
- "redirection not enabled"},
- {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_RESPONSE_LINE_TOO_LONG),
- "response line too long"},
- {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_RESPONSE_PARSE_ERROR),
- "response parse error"},
- {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_RESPONSE_TOO_MANY_HDRLINES),
- "response too many hdrlines"},
- {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_RETRY_TIMEOUT), "retry timeout"},
- {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_SERVER_CANCELED_CONNECTION),
- "server canceled connection"},
- {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_SOCK_NOT_SUPPORTED),
- "sock not supported"},
- {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_STATUS_CODE_UNSUPPORTED),
- "status code unsupported"},
- {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_TLS_NOT_ENABLED), "tls not enabled"},
- {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_TOO_MANY_REDIRECTIONS),
- "too many redirections"},
- {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_UNEXPECTED_CONTENT_TYPE),
- "unexpected content type"},
- {0, NULL}
+ { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_ASN1_LEN_EXCEEDS_MAX_RESP_LEN),
+ "asn1 len exceeds max resp len" },
+ { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_CONNECT_FAILURE), "connect failure" },
+ { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_ERROR_PARSING_ASN1_LENGTH),
+ "error parsing asn1 length" },
+ { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_ERROR_PARSING_CONTENT_LENGTH),
+ "error parsing content length" },
+ { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_ERROR_PARSING_URL), "error parsing url" },
+ { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_ERROR_RECEIVING), "error receiving" },
+ { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_ERROR_SENDING), "error sending" },
+ { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_FAILED_READING_DATA),
+ "failed reading data" },
+ { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_HEADER_PARSE_ERROR),
+ "header parse error" },
+ { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_INCONSISTENT_CONTENT_LENGTH),
+ "inconsistent content length" },
+ { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_INVALID_PORT_NUMBER),
+ "invalid port number" },
+ { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_INVALID_URL_PATH), "invalid url path" },
+ { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_INVALID_URL_SCHEME),
+ "invalid url scheme" },
+ { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_MAX_RESP_LEN_EXCEEDED),
+ "max resp len exceeded" },
+ { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_MISSING_ASN1_ENCODING),
+ "missing asn1 encoding" },
+ { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_MISSING_CONTENT_TYPE),
+ "missing content type" },
+ { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_MISSING_REDIRECT_LOCATION),
+ "missing redirect location" },
+ { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_RECEIVED_ERROR), "received error" },
+ { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_RECEIVED_WRONG_HTTP_VERSION),
+ "received wrong http version" },
+ { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_REDIRECTION_FROM_HTTPS_TO_HTTP),
+ "redirection from https to http" },
+ { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_REDIRECTION_NOT_ENABLED),
+ "redirection not enabled" },
+ { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_RESPONSE_LINE_TOO_LONG),
+ "response line too long" },
+ { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_RESPONSE_PARSE_ERROR),
+ "response parse error" },
+ { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_RESPONSE_TOO_MANY_HDRLINES),
+ "response too many hdrlines" },
+ { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_RETRY_TIMEOUT), "retry timeout" },
+ { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_SERVER_CANCELED_CONNECTION),
+ "server canceled connection" },
+ { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_SOCK_NOT_SUPPORTED),
+ "sock not supported" },
+ { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_STATUS_CODE_UNSUPPORTED),
+ "status code unsupported" },
+ { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_TLS_NOT_ENABLED), "tls not enabled" },
+ { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_TOO_MANY_REDIRECTIONS),
+ "too many redirections" },
+ { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_UNEXPECTED_CONTENT_TYPE),
+ "unexpected content type" },
+ { 0, NULL }
};
-# endif
+#endif
int ossl_err_load_HTTP_strings(void)
{
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(HTTP_str_reasons[0].error) == NULL)
ERR_load_strings_const(HTTP_str_reasons);
-# endif
+#endif
return 1;
}
#else
diff --git a/crypto/http/http_lib.c b/crypto/http/http_lib.c
index 022b8c194c..54c5c6ec1d 100644
--- a/crypto/http/http_lib.c
+++ b/crypto/http/http_lib.c
@@ -7,7 +7,7 @@
* https://www.openssl.org/source/license.html
*/
-#include <stdio.h> /* for sscanf() */
+#include <stdio.h> /* for sscanf() */
#include <string.h>
#include <openssl/http.h>
#include <openssl/httperr.h>
@@ -15,10 +15,10 @@
#include <openssl/err.h>
#include "internal/cryptlib.h" /* for ossl_assert() */
#ifndef OPENSSL_NO_SOCK
-# include "internal/bio_addr.h" /* for NI_MAXHOST */
+#include "internal/bio_addr.h" /* for NI_MAXHOST */
#endif
#ifndef NI_MAXHOST
-# define NI_MAXHOST 255
+#define NI_MAXHOST 255
#endif
#include "crypto/ctype.h" /* for ossl_isspace() */
@@ -51,8 +51,8 @@ static void free_pstring(char **pstr)
}
int OSSL_parse_url(const char *url, char **pscheme, char **puser, char **phost,
- char **pport, int *pport_num,
- char **ppath, char **pquery, char **pfrag)
+ char **pport, int *pport_num,
+ char **ppath, char **pquery, char **pfrag)
{
const char *p, *tmp;
const char *scheme, *scheme_end;
@@ -156,11 +156,11 @@ int OSSL_parse_url(const char *url, char **pscheme, char **puser, char **phost,
}
if (!copy_substring(pscheme, scheme, scheme_end)
- || !copy_substring(phost, host, host_end)
- || !copy_substring(pport, port, port_end)
- || !copy_substring(puser, user, user_end)
- || !copy_substring(pquery, query, query_end)
- || !copy_substring(pfrag, frag, frag_end))
+ || !copy_substring(phost, host, host_end)
+ || !copy_substring(pport, port, port_end)
+ || !copy_substring(puser, user, user_end)
+ || !copy_substring(pquery, query, query_end)
+ || !copy_substring(pfrag, frag, frag_end))
goto err;
if (pport_num != NULL)
*pport_num = (int)portnum;
@@ -176,10 +176,10 @@ int OSSL_parse_url(const char *url, char **pscheme, char **puser, char **phost,
}
return 1;
- parse_err:
+parse_err:
ERR_raise(ERR_LIB_HTTP, HTTP_R_ERROR_PARSING_URL);
- err:
+err:
free_pstring(pscheme);
free_pstring(puser);
free_pstring(phost);
@@ -193,8 +193,8 @@ int OSSL_parse_url(const char *url, char **pscheme, char **puser, char **phost,
#ifndef OPENSSL_NO_HTTP
int OSSL_HTTP_parse_url(const char *url, int *pssl, char **puser, char **phost,
- char **pport, int *pport_num,
- char **ppath, char **pquery, char **pfrag)
+ char **pport, int *pport_num,
+ char **ppath, char **pquery, char **pfrag)
{
char *scheme, *port;
int ssl = 0, portnum;
@@ -203,7 +203,7 @@ int OSSL_HTTP_parse_url(const char *url, int *pssl, char **puser, char **phost,
if (pssl != NULL)
*pssl = 0;
if (!OSSL_parse_url(url, &scheme, puser, phost, &port, pport_num,
- ppath, pquery, pfrag))
+ ppath, pquery, pfrag))
return 0;
/* check for optional HTTP scheme "http[s]" */
@@ -240,7 +240,7 @@ int OSSL_HTTP_parse_url(const char *url, int *pssl, char **puser, char **phost,
}
return 1;
- err:
+err:
free_pstring(puser);
free_pstring(phost);
free_pstring(ppath);
@@ -279,15 +279,15 @@ static int use_proxy(const char *no_proxy, const char *server)
if (no_proxy != NULL)
found = strstr(no_proxy, server);
while (found != NULL
- && ((found != no_proxy && !ossl_isspace(found[-1]) && found[-1] != ',')
- || (found[sl] != '\0' && !ossl_isspace(found[sl]) && found[sl] != ',')))
+ && ((found != no_proxy && !ossl_isspace(found[-1]) && found[-1] != ',')
+ || (found[sl] != '\0' && !ossl_isspace(found[sl]) && found[sl] != ',')))
found = strstr(found + 1, server);
return found == NULL;
}
/* Take default value from environment variable(s), respect no_proxy */
const char *OSSL_HTTP_adapt_proxy(const char *proxy, const char *no_proxy,
- const char *server, int use_ssl)
+ const char *server, int use_ssl)
{
/*
* using environment variable names, both lowercase and uppercase variants,
diff --git a/crypto/idea/i_cbc.c b/crypto/idea/i_cbc.c
index e9608e82f5..a3b3a554f4 100644
--- a/crypto/idea/i_cbc.c
+++ b/crypto/idea/i_cbc.c
@@ -18,8 +18,8 @@
#include "idea_local.h"
void IDEA_cbc_encrypt(const unsigned char *in, unsigned char *out,
- long length, IDEA_KEY_SCHEDULE *ks, unsigned char *iv,
- int encrypt)
+ long length, IDEA_KEY_SCHEDULE *ks, unsigned char *iv,
+ int encrypt)
{
register unsigned long tin0, tin1;
register unsigned long tout0, tout1, xor0, xor1;
diff --git a/crypto/idea/i_cfb64.c b/crypto/idea/i_cfb64.c
index afea89edfa..c8ed385328 100644
--- a/crypto/idea/i_cfb64.c
+++ b/crypto/idea/i_cfb64.c
@@ -24,8 +24,8 @@
*/
void IDEA_cfb64_encrypt(const unsigned char *in, unsigned char *out,
- long length, IDEA_KEY_SCHEDULE *schedule,
- unsigned char *ivec, int *num, int encrypt)
+ long length, IDEA_KEY_SCHEDULE *schedule,
+ unsigned char *ivec, int *num, int encrypt)
{
register unsigned long v0, v1, t;
register int n = *num;
diff --git a/crypto/idea/i_ecb.c b/crypto/idea/i_ecb.c
index 6304e6cac8..34360ad7ed 100644
--- a/crypto/idea/i_ecb.c
+++ b/crypto/idea/i_ecb.c
@@ -24,7 +24,7 @@ const char *IDEA_options(void)
}
void IDEA_ecb_encrypt(const unsigned char *in, unsigned char *out,
- IDEA_KEY_SCHEDULE *ks)
+ IDEA_KEY_SCHEDULE *ks)
{
unsigned long l0, l1, d[2];
diff --git a/crypto/idea/i_ofb64.c b/crypto/idea/i_ofb64.c
index a6a149764d..afa6a960d4 100644
--- a/crypto/idea/i_ofb64.c
+++ b/crypto/idea/i_ofb64.c
@@ -23,8 +23,8 @@
* used is contained in *num;
*/
void IDEA_ofb64_encrypt(const unsigned char *in, unsigned char *out,
- long length, IDEA_KEY_SCHEDULE *schedule,
- unsigned char *ivec, int *num)
+ long length, IDEA_KEY_SCHEDULE *schedule,
+ unsigned char *ivec, int *num)
{
register unsigned long v0, v1, t;
register int n = *num;
diff --git a/crypto/idea/idea_local.h b/crypto/idea/idea_local.h
index 29836a84ba..73dcd3adbd 100644
--- a/crypto/idea/idea_local.h
+++ b/crypto/idea/idea_local.h
@@ -7,95 +7,116 @@
* https://www.openssl.org/source/license.html
*/
-#define idea_mul(r,a,b,ul) \
-ul=(unsigned long)a*b; \
-if (ul != 0) { \
- r=(ul&0xffff)-(ul>>16); \
- r-=((r)>>16); \
-} else { \
- r=(-(int)a-b+1); /* assuming a or b is 0 and in range */ \
-}
+#define idea_mul(r, a, b, ul) \
+ ul = (unsigned long)a * b; \
+ if (ul != 0) { \
+ r = (ul & 0xffff) - (ul >> 16); \
+ r -= ((r) >> 16); \
+ } else { \
+ r = (-(int)a - b + 1); /* assuming a or b is 0 and in range */ \
+ }
/* NOTE - c is not incremented as per n2l */
-#define n2ln(c,l1,l2,n) { \
- c+=n; \
- l1=l2=0; \
- switch (n) { \
- case 8: l2 =((unsigned long)(*(--(c)))) ; \
- /* fall through */ \
- case 7: l2|=((unsigned long)(*(--(c))))<< 8; \
- /* fall through */ \
- case 6: l2|=((unsigned long)(*(--(c))))<<16; \
- /* fall through */ \
- case 5: l2|=((unsigned long)(*(--(c))))<<24; \
- /* fall through */ \
- case 4: l1 =((unsigned long)(*(--(c)))) ; \
- /* fall through */ \
- case 3: l1|=((unsigned long)(*(--(c))))<< 8; \
- /* fall through */ \
- case 2: l1|=((unsigned long)(*(--(c))))<<16; \
- /* fall through */ \
- case 1: l1|=((unsigned long)(*(--(c))))<<24; \
- } \
- }
+#define n2ln(c, l1, l2, n) \
+ { \
+ c += n; \
+ l1 = l2 = 0; \
+ switch (n) { \
+ case 8: \
+ l2 = ((unsigned long)(*(--(c)))); \
+ /* fall through */ \
+ case 7: \
+ l2 |= ((unsigned long)(*(--(c)))) << 8; \
+ /* fall through */ \
+ case 6: \
+ l2 |= ((unsigned long)(*(--(c)))) << 16; \
+ /* fall through */ \
+ case 5: \
+ l2 |= ((unsigned long)(*(--(c)))) << 24; \
+ /* fall through */ \
+ case 4: \
+ l1 = ((unsigned long)(*(--(c)))); \
+ /* fall through */ \
+ case 3: \
+ l1 |= ((unsigned long)(*(--(c)))) << 8; \
+ /* fall through */ \
+ case 2: \
+ l1 |= ((unsigned long)(*(--(c)))) << 16; \
+ /* fall through */ \
+ case 1: \
+ l1 |= ((unsigned long)(*(--(c)))) << 24; \
+ } \
+ }
/* NOTE - c is not incremented as per l2n */
-#define l2nn(l1,l2,c,n) { \
- c+=n; \
- switch (n) { \
- case 8: *(--(c))=(unsigned char)(((l2) )&0xff); \
- /* fall through */ \
- case 7: *(--(c))=(unsigned char)(((l2)>> 8)&0xff); \
- /* fall through */ \
- case 6: *(--(c))=(unsigned char)(((l2)>>16)&0xff); \
- /* fall through */ \
- case 5: *(--(c))=(unsigned char)(((l2)>>24)&0xff); \
- /* fall through */ \
- case 4: *(--(c))=(unsigned char)(((l1) )&0xff); \
- /* fall through */ \
- case 3: *(--(c))=(unsigned char)(((l1)>> 8)&0xff); \
- /* fall through */ \
- case 2: *(--(c))=(unsigned char)(((l1)>>16)&0xff); \
- /* fall through */ \
- case 1: *(--(c))=(unsigned char)(((l1)>>24)&0xff); \
- } \
- }
+#define l2nn(l1, l2, c, n) \
+ { \
+ c += n; \
+ switch (n) { \
+ case 8: \
+ *(--(c)) = (unsigned char)(((l2)) & 0xff); \
+ /* fall through */ \
+ case 7: \
+ *(--(c)) = (unsigned char)(((l2) >> 8) & 0xff); \
+ /* fall through */ \
+ case 6: \
+ *(--(c)) = (unsigned char)(((l2) >> 16) & 0xff); \
+ /* fall through */ \
+ case 5: \
+ *(--(c)) = (unsigned char)(((l2) >> 24) & 0xff); \
+ /* fall through */ \
+ case 4: \
+ *(--(c)) = (unsigned char)(((l1)) & 0xff); \
+ /* fall through */ \
+ case 3: \
+ *(--(c)) = (unsigned char)(((l1) >> 8) & 0xff); \
+ /* fall through */ \
+ case 2: \
+ *(--(c)) = (unsigned char)(((l1) >> 16) & 0xff); \
+ /* fall through */ \
+ case 1: \
+ *(--(c)) = (unsigned char)(((l1) >> 24) & 0xff); \
+ } \
+ }
#undef n2l
-#define n2l(c,l) (l =((unsigned long)(*((c)++)))<<24L, \
- l|=((unsigned long)(*((c)++)))<<16L, \
- l|=((unsigned long)(*((c)++)))<< 8L, \
- l|=((unsigned long)(*((c)++))))
+#define n2l(c, l) (l = ((unsigned long)(*((c)++))) << 24L, \
+ l |= ((unsigned long)(*((c)++))) << 16L, \
+ l |= ((unsigned long)(*((c)++))) << 8L, \
+ l |= ((unsigned long)(*((c)++))))
#undef l2n
-#define l2n(l,c) (*((c)++)=(unsigned char)(((l)>>24L)&0xff), \
- *((c)++)=(unsigned char)(((l)>>16L)&0xff), \
- *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \
- *((c)++)=(unsigned char)(((l) )&0xff))
+#define l2n(l, c) (*((c)++) = (unsigned char)(((l) >> 24L) & 0xff), \
+ *((c)++) = (unsigned char)(((l) >> 16L) & 0xff), \
+ *((c)++) = (unsigned char)(((l) >> 8L) & 0xff), \
+ *((c)++) = (unsigned char)(((l)) & 0xff))
#undef s2n
-#define s2n(l,c) (*((c)++)=(unsigned char)(((l) )&0xff), \
- *((c)++)=(unsigned char)(((l)>> 8L)&0xff))
+#define s2n(l, c) (*((c)++) = (unsigned char)(((l)) & 0xff), \
+ *((c)++) = (unsigned char)(((l) >> 8L) & 0xff))
#undef n2s
-#define n2s(c,l) (l =((IDEA_INT)(*((c)++)))<< 8L, \
- l|=((IDEA_INT)(*((c)++))) )
+#define n2s(c, l) (l = ((IDEA_INT)(*((c)++))) << 8L, \
+ l |= ((IDEA_INT)(*((c)++))))
-
-#define E_IDEA(num) \
- x1&=0xffff; \
- idea_mul(x1,x1,*p,ul); p++; \
- x2+= *(p++); \
- x3+= *(p++); \
- x4&=0xffff; \
- idea_mul(x4,x4,*p,ul); p++; \
- t0=(x1^x3)&0xffff; \
- idea_mul(t0,t0,*p,ul); p++; \
- t1=(t0+(x2^x4))&0xffff; \
- idea_mul(t1,t1,*p,ul); p++; \
- t0+=t1; \
- x1^=t1; \
- x4^=t0; \
- ul=x2^t0; /* do the swap to x3 */ \
- x2=x3^t1; \
- x3=ul;
+#define E_IDEA(num) \
+ x1 &= 0xffff; \
+ idea_mul(x1, x1, *p, ul); \
+ p++; \
+ x2 += *(p++); \
+ x3 += *(p++); \
+ x4 &= 0xffff; \
+ idea_mul(x4, x4, *p, ul); \
+ p++; \
+ t0 = (x1 ^ x3) & 0xffff; \
+ idea_mul(t0, t0, *p, ul); \
+ p++; \
+ t1 = (t0 + (x2 ^ x4)) & 0xffff; \
+ idea_mul(t1, t1, *p, ul); \
+ p++; \
+ t0 += t1; \
+ x1 ^= t1; \
+ x4 ^= t0; \
+ ul = x2 ^ t0; /* do the swap to x3 */ \
+ x2 = x3 ^ t1; \
+ x3 = ul;
diff --git a/crypto/indicator_core.c b/crypto/indicator_core.c
index 4b3c122717..5b1f9cecd6 100644
--- a/crypto/indicator_core.c
+++ b/crypto/indicator_core.c
@@ -13,8 +13,7 @@
#include "internal/cryptlib.h"
#include "crypto/context.h"
-typedef struct indicator_cb_st
-{
+typedef struct indicator_cb_st {
OSSL_INDICATOR_CALLBACK *cb;
} INDICATOR_CB;
@@ -37,7 +36,7 @@ static INDICATOR_CB *get_indicator_callback(OSSL_LIB_CTX *libctx)
}
void OSSL_INDICATOR_set_callback(OSSL_LIB_CTX *libctx,
- OSSL_INDICATOR_CALLBACK *cb)
+ OSSL_INDICATOR_CALLBACK *cb)
{
INDICATOR_CB *icb = get_indicator_callback(libctx);
@@ -46,7 +45,7 @@ void OSSL_INDICATOR_set_callback(OSSL_LIB_CTX *libctx,
}
void OSSL_INDICATOR_get_callback(OSSL_LIB_CTX *libctx,
- OSSL_INDICATOR_CALLBACK **cb)
+ OSSL_INDICATOR_CALLBACK **cb)
{
INDICATOR_CB *icb = get_indicator_callback(libctx);
diff --git a/crypto/info.c b/crypto/info.c
index 54c3498dfe..fe8e5fa2a9 100644
--- a/crypto/info.c
+++ b/crypto/info.c
@@ -16,27 +16,27 @@
#include "buildinf.h"
#ifndef OPENSSL_NO_JITTER
-# include <stdio.h>
-# include <jitterentropy.h>
+#include <stdio.h>
+#include <jitterentropy.h>
#endif
#if defined(__arm__) || defined(__arm) || defined(__aarch64__)
-# include "arm_arch.h"
-# define CPU_INFO_STR_LEN 128
+#include "arm_arch.h"
+#define CPU_INFO_STR_LEN 128
#elif defined(__powerpc__) || defined(__POWERPC__) || defined(_ARCH_PPC)
-# include "crypto/ppc_arch.h"
-# define CPU_INFO_STR_LEN 128
+#include "crypto/ppc_arch.h"
+#define CPU_INFO_STR_LEN 128
#elif defined(__sparcv9) || defined(__sparcv9__)
-# include "crypto/sparc_arch.h"
-# define CPU_INFO_STR_LEN 128
+#include "crypto/sparc_arch.h"
+#define CPU_INFO_STR_LEN 128
#elif defined(__s390__) || defined(__s390x__)
-# include "s390x_arch.h"
-# define CPU_INFO_STR_LEN 2048
+#include "s390x_arch.h"
+#define CPU_INFO_STR_LEN 2048
#elif defined(__riscv)
-# include "crypto/riscv_arch.h"
-# define CPU_INFO_STR_LEN 2048
+#include "crypto/riscv_arch.h"
+#define CPU_INFO_STR_LEN 2048
#else
-# define CPU_INFO_STR_LEN 256
+#define CPU_INFO_STR_LEN 256
#endif
/* extern declaration to avoid warning */
@@ -52,175 +52,168 @@ static CRYPTO_ONCE init_info = CRYPTO_ONCE_STATIC_INIT;
DEFINE_RUN_ONCE_STATIC(init_info_strings)
{
#if defined(OPENSSL_CPUID_OBJ)
-# if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
- defined(__x86_64) || defined(__x86_64__) || \
- defined(_M_AMD64) || defined(_M_X64)
+#if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)
const char *env;
BIO_snprintf(ossl_cpu_info_str, sizeof(ossl_cpu_info_str),
- CPUINFO_PREFIX "OPENSSL_ia32cap=0x%.16llx:0x%.16llx:0x%.16llx:0x%.16llx:0x%.16llx",
- (unsigned long long)OPENSSL_ia32cap_P[0] |
- (unsigned long long)OPENSSL_ia32cap_P[1] << 32,
- (unsigned long long)OPENSSL_ia32cap_P[2] |
- (unsigned long long)OPENSSL_ia32cap_P[3] << 32,
- (unsigned long long)OPENSSL_ia32cap_P[4] |
- (unsigned long long)OPENSSL_ia32cap_P[5] << 32,
- (unsigned long long)OPENSSL_ia32cap_P[6] |
- (unsigned long long)OPENSSL_ia32cap_P[7] << 32,
- (unsigned long long)OPENSSL_ia32cap_P[8] |
- (unsigned long long)OPENSSL_ia32cap_P[9] << 32);
+ CPUINFO_PREFIX "OPENSSL_ia32cap=0x%.16llx:0x%.16llx:0x%.16llx:0x%.16llx:0x%.16llx",
+ (unsigned long long)OPENSSL_ia32cap_P[0] | (unsigned long long)OPENSSL_ia32cap_P[1] << 32,
+ (unsigned long long)OPENSSL_ia32cap_P[2] | (unsigned long long)OPENSSL_ia32cap_P[3] << 32,
+ (unsigned long long)OPENSSL_ia32cap_P[4] | (unsigned long long)OPENSSL_ia32cap_P[5] << 32,
+ (unsigned long long)OPENSSL_ia32cap_P[6] | (unsigned long long)OPENSSL_ia32cap_P[7] << 32,
+ (unsigned long long)OPENSSL_ia32cap_P[8] | (unsigned long long)OPENSSL_ia32cap_P[9] << 32);
if ((env = getenv("OPENSSL_ia32cap")) != NULL)
BIO_snprintf(ossl_cpu_info_str + strlen(ossl_cpu_info_str),
- sizeof(ossl_cpu_info_str) - strlen(ossl_cpu_info_str),
- " env:%s", env);
-# elif defined(__arm__) || defined(__arm) || defined(__aarch64__)
+ sizeof(ossl_cpu_info_str) - strlen(ossl_cpu_info_str),
+ " env:%s", env);
+#elif defined(__arm__) || defined(__arm) || defined(__aarch64__)
const char *env;
BIO_snprintf(ossl_cpu_info_str, sizeof(ossl_cpu_info_str),
- CPUINFO_PREFIX "OPENSSL_armcap=0x%x", OPENSSL_armcap_P);
+ CPUINFO_PREFIX "OPENSSL_armcap=0x%x", OPENSSL_armcap_P);
if ((env = getenv("OPENSSL_armcap")) != NULL)
BIO_snprintf(ossl_cpu_info_str + strlen(ossl_cpu_info_str),
- sizeof(ossl_cpu_info_str) - strlen(ossl_cpu_info_str),
- " env:%s", env);
-# elif defined(__powerpc__) || defined(__POWERPC__) || defined(_ARCH_PPC)
+ sizeof(ossl_cpu_info_str) - strlen(ossl_cpu_info_str),
+ " env:%s", env);
+#elif defined(__powerpc__) || defined(__POWERPC__) || defined(_ARCH_PPC)
const char *env;
BIO_snprintf(ossl_cpu_info_str, sizeof(ossl_cpu_info_str),
- CPUINFO_PREFIX "OPENSSL_ppccap=0x%x", OPENSSL_ppccap_P);
+ CPUINFO_PREFIX "OPENSSL_ppccap=0x%x", OPENSSL_ppccap_P);
if ((env = getenv("OPENSSL_ppccap")) != NULL)
BIO_snprintf(ossl_cpu_info_str + strlen(ossl_cpu_info_str),
- sizeof(ossl_cpu_info_str) - strlen(ossl_cpu_info_str),
- " env:%s", env);
-# elif defined(__sparcv9) || defined(__sparcv9__)
+ sizeof(ossl_cpu_info_str) - strlen(ossl_cpu_info_str),
+ " env:%s", env);
+#elif defined(__sparcv9) || defined(__sparcv9__)
const char *env;
BIO_snprintf(ossl_cpu_info_str, sizeof(ossl_cpu_info_str),
- CPUINFO_PREFIX "OPENSSL_sparcv9cap=0x%x:0x%x",
- OPENSSL_sparcv9cap_P[0], OPENSSL_sparcv9cap_P[1]);
+ CPUINFO_PREFIX "OPENSSL_sparcv9cap=0x%x:0x%x",
+ OPENSSL_sparcv9cap_P[0], OPENSSL_sparcv9cap_P[1]);
if ((env = getenv("OPENSSL_sparcv9cap")) != NULL)
BIO_snprintf(ossl_cpu_info_str + strlen(ossl_cpu_info_str),
- sizeof(ossl_cpu_info_str) - strlen(ossl_cpu_info_str),
- " env:%s", env);
-# elif defined(__s390__) || defined(__s390x__)
+ sizeof(ossl_cpu_info_str) - strlen(ossl_cpu_info_str),
+ " env:%s", env);
+#elif defined(__s390__) || defined(__s390x__)
const char *env;
BIO_snprintf(ossl_cpu_info_str, sizeof(ossl_cpu_info_str),
- CPUINFO_PREFIX "OPENSSL_s390xcap="
- "stfle:0x%llx:0x%llx:0x%llx:0x%llx:"
- "kimd:0x%llx:0x%llx:"
- "klmd:0x%llx:0x%llx:"
- "km:0x%llx:0x%llx:"
- "kmc:0x%llx:0x%llx:"
- "kmac:0x%llx:0x%llx:"
- "kmctr:0x%llx:0x%llx:"
- "kmo:0x%llx:0x%llx:"
- "kmf:0x%llx:0x%llx:"
- "prno:0x%llx:0x%llx:"
- "kma:0x%llx:0x%llx:"
- "pcc:0x%llx:0x%llx:"
- "kdsa:0x%llx:0x%llx",
- OPENSSL_s390xcap_P.stfle[0], OPENSSL_s390xcap_P.stfle[1],
- OPENSSL_s390xcap_P.stfle[2], OPENSSL_s390xcap_P.stfle[3],
- OPENSSL_s390xcap_P.kimd[0], OPENSSL_s390xcap_P.kimd[1],
- OPENSSL_s390xcap_P.klmd[0], OPENSSL_s390xcap_P.klmd[1],
- OPENSSL_s390xcap_P.km[0], OPENSSL_s390xcap_P.km[1],
- OPENSSL_s390xcap_P.kmc[0], OPENSSL_s390xcap_P.kmc[1],
- OPENSSL_s390xcap_P.kmac[0], OPENSSL_s390xcap_P.kmac[1],
- OPENSSL_s390xcap_P.kmctr[0], OPENSSL_s390xcap_P.kmctr[1],
- OPENSSL_s390xcap_P.kmo[0], OPENSSL_s390xcap_P.kmo[1],
- OPENSSL_s390xcap_P.kmf[0], OPENSSL_s390xcap_P.kmf[1],
- OPENSSL_s390xcap_P.prno[0], OPENSSL_s390xcap_P.prno[1],
- OPENSSL_s390xcap_P.kma[0], OPENSSL_s390xcap_P.kma[1],
- OPENSSL_s390xcap_P.pcc[0], OPENSSL_s390xcap_P.pcc[1],
- OPENSSL_s390xcap_P.kdsa[0], OPENSSL_s390xcap_P.kdsa[1]);
+ CPUINFO_PREFIX "OPENSSL_s390xcap="
+ "stfle:0x%llx:0x%llx:0x%llx:0x%llx:"
+ "kimd:0x%llx:0x%llx:"
+ "klmd:0x%llx:0x%llx:"
+ "km:0x%llx:0x%llx:"
+ "kmc:0x%llx:0x%llx:"
+ "kmac:0x%llx:0x%llx:"
+ "kmctr:0x%llx:0x%llx:"
+ "kmo:0x%llx:0x%llx:"
+ "kmf:0x%llx:0x%llx:"
+ "prno:0x%llx:0x%llx:"
+ "kma:0x%llx:0x%llx:"
+ "pcc:0x%llx:0x%llx:"
+ "kdsa:0x%llx:0x%llx",
+ OPENSSL_s390xcap_P.stfle[0], OPENSSL_s390xcap_P.stfle[1],
+ OPENSSL_s390xcap_P.stfle[2], OPENSSL_s390xcap_P.stfle[3],
+ OPENSSL_s390xcap_P.kimd[0], OPENSSL_s390xcap_P.kimd[1],
+ OPENSSL_s390xcap_P.klmd[0], OPENSSL_s390xcap_P.klmd[1],
+ OPENSSL_s390xcap_P.km[0], OPENSSL_s390xcap_P.km[1],
+ OPENSSL_s390xcap_P.kmc[0], OPENSSL_s390xcap_P.kmc[1],
+ OPENSSL_s390xcap_P.kmac[0], OPENSSL_s390xcap_P.kmac[1],
+ OPENSSL_s390xcap_P.kmctr[0], OPENSSL_s390xcap_P.kmctr[1],
+ OPENSSL_s390xcap_P.kmo[0], OPENSSL_s390xcap_P.kmo[1],
+ OPENSSL_s390xcap_P.kmf[0], OPENSSL_s390xcap_P.kmf[1],
+ OPENSSL_s390xcap_P.prno[0], OPENSSL_s390xcap_P.prno[1],
+ OPENSSL_s390xcap_P.kma[0], OPENSSL_s390xcap_P.kma[1],
+ OPENSSL_s390xcap_P.pcc[0], OPENSSL_s390xcap_P.pcc[1],
+ OPENSSL_s390xcap_P.kdsa[0], OPENSSL_s390xcap_P.kdsa[1]);
if ((env = getenv("OPENSSL_s390xcap")) != NULL)
BIO_snprintf(ossl_cpu_info_str + strlen(ossl_cpu_info_str),
- sizeof(ossl_cpu_info_str) - strlen(ossl_cpu_info_str),
- " env:%s", env);
-# elif defined(__riscv)
+ sizeof(ossl_cpu_info_str) - strlen(ossl_cpu_info_str),
+ " env:%s", env);
+#elif defined(__riscv)
const char *env;
size_t i;
BIO_snprintf(ossl_cpu_info_str, sizeof(ossl_cpu_info_str),
- CPUINFO_PREFIX "OPENSSL_riscvcap=RV"
-# if __riscv_xlen == 32
- "32"
-# elif __riscv_xlen == 64
- "64"
-# elif __riscv_xlen == 128
- "128"
-# endif
-# if defined(__riscv_i) && defined(__riscv_m) && defined(__riscv_a) \
- && defined(__riscv_f) && defined(__riscv_d) \
- && defined(__riscv_zicsr) && defined(__riscv_zifencei)
- "G" /* shorthand for IMAFD_Zicsr_Zifencei */
-# else
-# ifdef __riscv_i
- "I"
-# endif
-# ifdef __riscv_m
- "M"
-# endif
-# ifdef __riscv_a
- "A"
-# endif
-# ifdef __riscv_f
- "F"
-# endif
-# ifdef __riscv_d
- "D"
-# endif
-# endif
-# ifdef __riscv_c
- "C"
-# endif
- );
+ CPUINFO_PREFIX "OPENSSL_riscvcap=RV"
+#if __riscv_xlen == 32
+ "32"
+#elif __riscv_xlen == 64
+ "64"
+#elif __riscv_xlen == 128
+ "128"
+#endif
+#if defined(__riscv_i) && defined(__riscv_m) && defined(__riscv_a) \
+ && defined(__riscv_f) && defined(__riscv_d) \
+ && defined(__riscv_zicsr) && defined(__riscv_zifencei)
+ "G" /* shorthand for IMAFD_Zicsr_Zifencei */
+#else
+#ifdef __riscv_i
+ "I"
+#endif
+#ifdef __riscv_m
+ "M"
+#endif
+#ifdef __riscv_a
+ "A"
+#endif
+#ifdef __riscv_f
+ "F"
+#endif
+#ifdef __riscv_d
+ "D"
+#endif
+#endif
+#ifdef __riscv_c
+ "C"
+#endif
+ );
for (i = 0; i < kRISCVNumCaps; i++) {
if (OPENSSL_riscvcap_P[RISCV_capabilities[i].index]
- & (1 << RISCV_capabilities[i].bit_offset))
+ & (1 << RISCV_capabilities[i].bit_offset))
/* Match, display the name */
BIO_snprintf(ossl_cpu_info_str + strlen(ossl_cpu_info_str),
- sizeof(ossl_cpu_info_str) - strlen(ossl_cpu_info_str),
- "_%s", RISCV_capabilities[i].name);
+ sizeof(ossl_cpu_info_str) - strlen(ossl_cpu_info_str),
+ "_%s", RISCV_capabilities[i].name);
}
if (RISCV_HAS_V())
BIO_snprintf(ossl_cpu_info_str + strlen(ossl_cpu_info_str),
- sizeof(ossl_cpu_info_str) - strlen(ossl_cpu_info_str),
- " vlen:%lu", riscv_vlen());
+ sizeof(ossl_cpu_info_str) - strlen(ossl_cpu_info_str),
+ " vlen:%lu", riscv_vlen());
if ((env = getenv("OPENSSL_riscvcap")) != NULL)
BIO_snprintf(ossl_cpu_info_str + strlen(ossl_cpu_info_str),
- sizeof(ossl_cpu_info_str) - strlen(ossl_cpu_info_str),
- " env:%s", env);
-# endif
+ sizeof(ossl_cpu_info_str) - strlen(ossl_cpu_info_str),
+ " env:%s", env);
+#endif
#endif
{
static char seeds[512] = "";
-#define add_seeds_string(str) \
- do { \
- if (seeds[0] != '\0') \
- OPENSSL_strlcat(seeds, " ", sizeof(seeds)); \
- OPENSSL_strlcat(seeds, str, sizeof(seeds)); \
- } while (0)
-#define add_seeds_stringlist(label, strlist) \
- do { \
- add_seeds_string(label "("); \
- { \
- const char *dev[] = { strlist, NULL }; \
- const char **p; \
- int first = 1; \
- \
- for (p = dev; *p != NULL; p++) { \
- if (!first) \
- OPENSSL_strlcat(seeds, " ", sizeof(seeds)); \
- first = 0; \
- OPENSSL_strlcat(seeds, *p, sizeof(seeds)); \
- } \
- } \
- OPENSSL_strlcat(seeds, ")", sizeof(seeds)); \
- } while (0)
+#define add_seeds_string(str) \
+ do { \
+ if (seeds[0] != '\0') \
+ OPENSSL_strlcat(seeds, " ", sizeof(seeds)); \
+ OPENSSL_strlcat(seeds, str, sizeof(seeds)); \
+ } while (0)
+#define add_seeds_stringlist(label, strlist) \
+ do { \
+ add_seeds_string(label "("); \
+ { \
+ const char *dev[] = { strlist, NULL }; \
+ const char **p; \
+ int first = 1; \
+ \
+ for (p = dev; *p != NULL; p++) { \
+ if (!first) \
+ OPENSSL_strlcat(seeds, " ", sizeof(seeds)); \
+ first = 0; \
+ OPENSSL_strlcat(seeds, *p, sizeof(seeds)); \
+ } \
+ } \
+ OPENSSL_strlcat(seeds, ")", sizeof(seeds)); \
+ } while (0)
#ifdef OPENSSL_RAND_SEED_NONE
add_seeds_string("none");
@@ -229,11 +222,11 @@ DEFINE_RUN_ONCE_STATIC(init_info_strings)
add_seeds_string("rdtsc");
#endif
#ifdef OPENSSL_RAND_SEED_RDCPU
-# ifdef __aarch64__
+#ifdef __aarch64__
add_seeds_string("rndr ( rndrrs rndr )");
-# else
+#else
add_seeds_string("rdrand ( rdseed rdrand )");
-# endif
+#endif
#endif
#ifdef OPENSSL_RAND_SEED_GETRANDOM
add_seeds_string("getrandom-syscall");
@@ -283,14 +276,13 @@ const char *OPENSSL_info(int t)
return "\\";
#elif defined(__VMS)
return "";
-#else /* Assume POSIX */
+#else /* Assume POSIX */
return "/";
#endif
- case OPENSSL_INFO_LIST_SEPARATOR:
- {
- static const char list_sep[] = { LIST_SEPARATOR_CHAR, '\0' };
- return list_sep;
- }
+ case OPENSSL_INFO_LIST_SEPARATOR: {
+ static const char list_sep[] = { LIST_SEPARATOR_CHAR, '\0' };
+ return list_sep;
+ }
case OPENSSL_INFO_SEED_SOURCE:
return seed_sources;
case OPENSSL_INFO_CPU_SETTINGS:
diff --git a/crypto/init.c b/crypto/init.c
index 9c01f1065c..457ce4ca69 100644
--- a/crypto/init.c
+++ b/crypto/init.c
@@ -96,26 +96,26 @@ static int win32atexit(void)
DEFINE_RUN_ONCE_STATIC(ossl_init_register_atexit)
{
#ifndef OPENSSL_NO_ATEXIT
-# ifdef OPENSSL_INIT_DEBUG
+#ifdef OPENSSL_INIT_DEBUG
fprintf(stderr, "OPENSSL_INIT: ossl_init_register_atexit()\n");
-# endif
-# ifndef OPENSSL_SYS_UEFI
-# if defined(_WIN32) && !defined(__BORLANDC__)
+#endif
+#ifndef OPENSSL_SYS_UEFI
+#if defined(_WIN32) && !defined(__BORLANDC__)
/* We use _onexit() in preference because it gets called on DLL unload */
if (_onexit(win32atexit) == NULL)
return 0;
-# else
+#else
if (atexit(OPENSSL_cleanup) != 0)
return 0;
-# endif
-# endif
+#endif
+#endif
#endif
return 1;
}
DEFINE_RUN_ONCE_STATIC_ALT(ossl_init_no_register_atexit,
- ossl_init_register_atexit)
+ ossl_init_register_atexit)
{
#ifdef OPENSSL_INIT_DEBUG
fprintf(stderr, "OPENSSL_INIT: ossl_init_no_register_atexit ok!\n");
@@ -131,23 +131,23 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_load_crypto_nodelete)
#if !defined(OPENSSL_USE_NODELETE) \
&& !defined(OPENSSL_NO_PINSHARED)
-# if defined(DSO_WIN32) && !defined(_WIN32_WCE)
+#if defined(DSO_WIN32) && !defined(_WIN32_WCE)
{
HMODULE handle = NULL;
BOOL ret;
/* We don't use the DSO route for WIN32 because there is a better way */
ret = GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS
- | GET_MODULE_HANDLE_EX_FLAG_PIN,
- (void *)&base_inited, &handle);
+ | GET_MODULE_HANDLE_EX_FLAG_PIN,
+ (void *)&base_inited, &handle);
OSSL_TRACE1(INIT,
- "ossl_init_load_crypto_nodelete: "
- "obtained DSO reference? %s\n",
- (ret == TRUE ? "No!" : "Yes."));
+ "ossl_init_load_crypto_nodelete: "
+ "obtained DSO reference? %s\n",
+ (ret == TRUE ? "No!" : "Yes."));
return (ret == TRUE) ? 1 : 0;
}
-# elif !defined(DSO_NONE)
+#elif !defined(DSO_NONE)
/*
* Deliberately leak a reference to ourselves. This will force the library
* to remain loaded until the atexit() handler is run at process exit.
@@ -166,11 +166,11 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_load_crypto_nodelete)
* already.
*/
OSSL_TRACE1(INIT, "obtained DSO reference? %s\n",
- (dso == NULL ? "No!" : "Yes."));
+ (dso == NULL ? "No!" : "Yes."));
DSO_free(dso);
err_unshelve_state(err);
}
-# endif
+#endif
#endif
return 1;
@@ -200,7 +200,7 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_load_crypto_strings)
}
DEFINE_RUN_ONCE_STATIC_ALT(ossl_init_no_load_crypto_strings,
- ossl_init_load_crypto_strings)
+ ossl_init_load_crypto_strings)
{
/* Do nothing in this case */
return 1;
@@ -222,7 +222,7 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_load_ssl_strings)
}
DEFINE_RUN_ONCE_STATIC_ALT(ossl_init_no_load_ssl_strings,
- ossl_init_load_ssl_strings)
+ ossl_init_load_ssl_strings)
{
/* Do nothing in this case */
return 1;
@@ -243,7 +243,7 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_add_all_ciphers)
}
DEFINE_RUN_ONCE_STATIC_ALT(ossl_init_no_add_all_ciphers,
- ossl_init_add_all_ciphers)
+ ossl_init_add_all_ciphers)
{
/* Do nothing */
return 1;
@@ -264,7 +264,7 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_add_all_digests)
}
DEFINE_RUN_ONCE_STATIC_ALT(ossl_init_no_add_all_digests,
- ossl_init_add_all_digests)
+ ossl_init_add_all_digests)
{
/* Do nothing */
return 1;
@@ -428,7 +428,7 @@ int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings)
uint64_t tmp;
int aloaddone = 0;
- /* Applications depend on 0 being returned when cleanup was already done */
+ /* Applications depend on 0 being returned when cleanup was already done */
if (ossl_unlikely(stopped)) {
if (!(opts & OPENSSL_INIT_BASE_ONLY))
ERR_raise(ERR_LIB_CRYPTO, ERR_R_INIT_FAIL);
@@ -494,7 +494,7 @@ int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings)
*/
if ((opts & OPENSSL_INIT_NO_ATEXIT) != 0) {
if (!RUN_ONCE_ALT(®ister_atexit, ossl_init_no_register_atexit,
- ossl_init_register_atexit))
+ ossl_init_register_atexit))
return 0;
} else if (!RUN_ONCE(®ister_atexit, ossl_init_register_atexit)) {
return 0;
@@ -504,18 +504,18 @@ int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings)
return 0;
if ((opts & OPENSSL_INIT_NO_LOAD_CRYPTO_STRINGS)
- && !RUN_ONCE_ALT(&load_crypto_strings,
- ossl_init_no_load_crypto_strings,
- ossl_init_load_crypto_strings))
+ && !RUN_ONCE_ALT(&load_crypto_strings,
+ ossl_init_no_load_crypto_strings,
+ ossl_init_load_crypto_strings))
return 0;
if ((opts & OPENSSL_INIT_LOAD_CRYPTO_STRINGS)
- && !RUN_ONCE(&load_crypto_strings, ossl_init_load_crypto_strings))
+ && !RUN_ONCE(&load_crypto_strings, ossl_init_load_crypto_strings))
return 0;
if ((opts & OPENSSL_INIT_NO_LOAD_SSL_STRINGS)
&& !RUN_ONCE_ALT(&ssl_strings, ossl_init_no_load_ssl_strings,
- ossl_init_load_ssl_strings))
+ ossl_init_load_ssl_strings))
return 0;
if ((opts & OPENSSL_INIT_LOAD_SSL_STRINGS)
@@ -523,29 +523,29 @@ int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings)
return 0;
if ((opts & OPENSSL_INIT_NO_ADD_ALL_CIPHERS)
- && !RUN_ONCE_ALT(&add_all_ciphers, ossl_init_no_add_all_ciphers,
- ossl_init_add_all_ciphers))
+ && !RUN_ONCE_ALT(&add_all_ciphers, ossl_init_no_add_all_ciphers,
+ ossl_init_add_all_ciphers))
return 0;
if ((opts & OPENSSL_INIT_ADD_ALL_CIPHERS)
- && !RUN_ONCE(&add_all_ciphers, ossl_init_add_all_ciphers))
+ && !RUN_ONCE(&add_all_ciphers, ossl_init_add_all_ciphers))
return 0;
if ((opts & OPENSSL_INIT_NO_ADD_ALL_DIGESTS)
- && !RUN_ONCE_ALT(&add_all_digests, ossl_init_no_add_all_digests,
- ossl_init_add_all_digests))
+ && !RUN_ONCE_ALT(&add_all_digests, ossl_init_no_add_all_digests,
+ ossl_init_add_all_digests))
return 0;
if ((opts & OPENSSL_INIT_ADD_ALL_DIGESTS)
- && !RUN_ONCE(&add_all_digests, ossl_init_add_all_digests))
+ && !RUN_ONCE(&add_all_digests, ossl_init_add_all_digests))
return 0;
if ((opts & OPENSSL_INIT_ATFORK)
- && !openssl_init_fork_handlers())
+ && !openssl_init_fork_handlers())
return 0;
if ((opts & OPENSSL_INIT_NO_LOAD_CONFIG)
- && !RUN_ONCE_ALT(&config, ossl_init_no_config, ossl_init_config))
+ && !RUN_ONCE_ALT(&config, ossl_init_no_config, ossl_init_config))
return 0;
if (opts & OPENSSL_INIT_LOAD_CONFIG) {
@@ -564,7 +564,7 @@ int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings)
return 0;
conf_settings = settings;
ret = RUN_ONCE_ALT(&config, ossl_init_config_settings,
- ossl_init_config);
+ ossl_init_config);
conf_settings = NULL;
CRYPTO_THREAD_unlock(init_lock);
}
@@ -575,7 +575,7 @@ int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings)
}
if ((opts & OPENSSL_INIT_ASYNC)
- && !RUN_ONCE(&async, ossl_init_async))
+ && !RUN_ONCE(&async, ossl_init_async))
return 0;
if (!CRYPTO_atomic_or(&optsdone, opts, &tmp, optsdone_lock))
@@ -588,10 +588,10 @@ int OPENSSL_atexit(void (*handler)(void))
{
OPENSSL_INIT_STOP *newhand;
-#if !defined(OPENSSL_USE_NODELETE)\
+#if !defined(OPENSSL_USE_NODELETE) \
&& !defined(OPENSSL_NO_PINSHARED)
{
-# if defined(DSO_WIN32) && !defined(_WIN32_WCE)
+#if defined(DSO_WIN32) && !defined(_WIN32_WCE)
HMODULE handle = NULL;
BOOL ret;
union {
@@ -606,12 +606,12 @@ int OPENSSL_atexit(void (*handler)(void))
* way
*/
ret = GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS
- | GET_MODULE_HANDLE_EX_FLAG_PIN,
- handlersym.sym, &handle);
+ | GET_MODULE_HANDLE_EX_FLAG_PIN,
+ handlersym.sym, &handle);
if (!ret)
return 0;
-# elif !defined(DSO_NONE)
+#elif !defined(DSO_NONE)
/*
* Deliberately leak a reference to the handler. This will force the
* library/code containing the handler to remain loaded until we run the
@@ -630,11 +630,11 @@ int OPENSSL_atexit(void (*handler)(void))
dso = DSO_dsobyaddr(handlersym.sym, DSO_FLAG_NO_UNLOAD_ON_FREE);
/* See same code above in ossl_init_base() for an explanation. */
OSSL_TRACE1(INIT,
- "atexit: obtained DSO reference? %s\n",
- (dso == NULL ? "No!" : "Yes."));
+ "atexit: obtained DSO reference? %s\n",
+ (dso == NULL ? "No!" : "Yes."));
DSO_free(dso);
ERR_pop_to_mark();
-# endif
+#endif
}
#endif
@@ -647,4 +647,3 @@ int OPENSSL_atexit(void (*handler)(void))
return 1;
}
-
diff --git a/crypto/initthread.c b/crypto/initthread.c
index 07f0cc1c5f..1e1b9e69db 100644
--- a/crypto/initthread.c
+++ b/crypto/initthread.c
@@ -103,14 +103,14 @@ static union {
CRYPTO_THREAD_LOCAL value;
} destructor_key = { -1 };
-static int init_thread_push_handlers(THREAD_EVENT_HANDLER **hands);
+static int init_thread_push_handlers(THREAD_EVENT_HANDLER **hands);
static void init_thread_remove_handlers(THREAD_EVENT_HANDLER **handsin);
static void init_thread_destructor(void *hands);
-static int init_thread_deregister(void *arg, int all);
+static int init_thread_deregister(void *arg, int all);
#endif
static void init_thread_stop(void *arg, THREAD_EVENT_HANDLER **hands);
-static THREAD_EVENT_HANDLER ** get_thread_event_handler(OSSL_LIB_CTX *ctx)
+static THREAD_EVENT_HANDLER **get_thread_event_handler(OSSL_LIB_CTX *ctx)
{
#ifdef FIPS_MODULE
return CRYPTO_THREAD_get_local_ex(CRYPTO_THREAD_LOCAL_TEVENT_KEY, ctx);
@@ -239,7 +239,7 @@ static void init_thread_destructor(void *hands)
int ossl_init_thread(void)
{
if (!CRYPTO_THREAD_init_local(&destructor_key.value,
- init_thread_destructor))
+ init_thread_destructor))
return 0;
return 1;
@@ -294,7 +294,7 @@ static void ossl_arg_thread_stop(void *arg);
int ossl_thread_register_fips(OSSL_LIB_CTX *libctx)
{
return c_thread_start(FIPS_get_core_handle(libctx), ossl_arg_thread_stop,
- libctx);
+ libctx);
}
int ossl_thread_event_ctx_new(OSSL_LIB_CTX *libctx)
@@ -319,7 +319,7 @@ int ossl_thread_event_ctx_new(OSSL_LIB_CTX *libctx)
*/
return 1;
- err:
+err:
OPENSSL_free(hands);
return 0;
}
@@ -344,7 +344,6 @@ void ossl_ctx_thread_stop(OSSL_LIB_CTX *ctx)
}
#endif /* FIPS_MODULE */
-
static void init_thread_stop(void *arg, THREAD_EVENT_HANDLER **hands)
{
THREAD_EVENT_HANDLER *curr, *prev = NULL, *tmp;
@@ -389,7 +388,7 @@ static void init_thread_stop(void *arg, THREAD_EVENT_HANDLER **hands)
}
int ossl_init_thread_start(const void *index, void *arg,
- OSSL_thread_stop_handler_fn handfn)
+ OSSL_thread_stop_handler_fn handfn)
{
THREAD_EVENT_HANDLER **hands;
THREAD_EVENT_HANDLER *hand;
diff --git a/crypto/lhash/lh_stats.c b/crypto/lhash/lh_stats.c
index ea0a3252a6..3e540b40af 100644
--- a/crypto/lhash/lh_stats.c
+++ b/crypto/lhash/lh_stats.c
@@ -22,8 +22,8 @@
#include <openssl/lhash.h>
#include "lhash_local.h"
-# ifndef OPENSSL_NO_STDIO
-# ifndef OPENSSL_NO_DEPRECATED_3_1
+#ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_DEPRECATED_3_1
void OPENSSL_LH_stats(const OPENSSL_LHASH *lh, FILE *fp)
{
BIO *bp;
@@ -59,10 +59,10 @@ void OPENSSL_LH_node_usage_stats(const OPENSSL_LHASH *lh, FILE *fp)
OPENSSL_LH_node_usage_stats_bio(lh, bp);
BIO_free(bp);
}
-# endif
-# endif
+#endif
+#endif
-# ifndef OPENSSL_NO_DEPRECATED_3_1
+#ifndef OPENSSL_NO_DEPRECATED_3_1
/*
* These functions are implemented as separate static functions as they are
* called from the stdio functions above and calling deprecated functions will
@@ -71,8 +71,8 @@ void OPENSSL_LH_node_usage_stats(const OPENSSL_LHASH *lh, FILE *fp)
void OPENSSL_LH_stats_bio(const OPENSSL_LHASH *lh, BIO *out)
{
BIO_printf(out, "num_items = %lu\n", lh->num_items);
- BIO_printf(out, "num_nodes = %u\n", lh->num_nodes);
- BIO_printf(out, "num_alloc_nodes = %u\n", lh->num_alloc_nodes);
+ BIO_printf(out, "num_nodes = %u\n", lh->num_nodes);
+ BIO_printf(out, "num_alloc_nodes = %u\n", lh->num_alloc_nodes);
BIO_printf(out, "num_expands = 0\n");
BIO_printf(out, "num_expand_reallocs = 0\n");
BIO_printf(out, "num_contracts = 0\n");
@@ -120,8 +120,8 @@ void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *lh, BIO *out)
if (n_used == 0)
return;
BIO_printf(out, "load %d.%02d actual load %d.%02d\n",
- (int)(total / lh->num_nodes),
- (int)((total % lh->num_nodes) * 100 / lh->num_nodes),
- (int)(total / n_used), (int)((total % n_used) * 100 / n_used));
+ (int)(total / lh->num_nodes),
+ (int)((total % lh->num_nodes) * 100 / lh->num_nodes),
+ (int)(total / n_used), (int)((total % n_used) * 100 / n_used));
}
-# endif
+#endif
diff --git a/crypto/lhash/lhash.c b/crypto/lhash/lhash.c
index dcb50ca074..ad8c7a6280 100644
--- a/crypto/lhash/lhash.c
+++ b/crypto/lhash/lhash.c
@@ -36,19 +36,19 @@
*/
#undef MIN_NODES
-#define MIN_NODES 16
-#define UP_LOAD (2*LH_LOAD_MULT) /* load times 256 (default 2) */
-#define DOWN_LOAD (LH_LOAD_MULT) /* load times 256 (default 1) */
+#define MIN_NODES 16
+#define UP_LOAD (2 * LH_LOAD_MULT) /* load times 256 (default 2) */
+#define DOWN_LOAD (LH_LOAD_MULT) /* load times 256 (default 1) */
static int expand(OPENSSL_LHASH *lh);
static void contract(OPENSSL_LHASH *lh);
static OPENSSL_LH_NODE **getrn(OPENSSL_LHASH *lh, const void *data, unsigned long *rhash);
OPENSSL_LHASH *OPENSSL_LH_set_thunks(OPENSSL_LHASH *lh,
- OPENSSL_LH_HASHFUNCTHUNK hw,
- OPENSSL_LH_COMPFUNCTHUNK cw,
- OPENSSL_LH_DOALL_FUNC_THUNK daw,
- OPENSSL_LH_DOALL_FUNCARG_THUNK daaw)
+ OPENSSL_LH_HASHFUNCTHUNK hw,
+ OPENSSL_LH_COMPFUNCTHUNK cw,
+ OPENSSL_LH_DOALL_FUNC_THUNK daw,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw)
{
if (lh == NULL)
@@ -122,7 +122,7 @@ void *OPENSSL_LH_insert(OPENSSL_LHASH *lh, void *data)
lh->error = 0;
if ((lh->up_load <= (lh->num_items * LH_LOAD_MULT / lh->num_nodes)) && !expand(lh))
- return NULL; /* 'lh->error++' already done in 'expand' */
+ return NULL; /* 'lh->error++' already done in 'expand' */
rn = getrn(lh, data, &hash);
@@ -137,7 +137,7 @@ void *OPENSSL_LH_insert(OPENSSL_LHASH *lh, void *data)
*rn = nn;
ret = NULL;
lh->num_items++;
- } else { /* replace same key */
+ } else { /* replace same key */
ret = (*rn)->data;
(*rn)->data = data;
}
@@ -163,8 +163,7 @@ void *OPENSSL_LH_delete(OPENSSL_LHASH *lh, const void *data)
}
lh->num_items--;
- if ((lh->num_nodes > MIN_NODES) &&
- (lh->down_load >= (lh->num_items * LH_LOAD_MULT / lh->num_nodes)))
+ if ((lh->num_nodes > MIN_NODES) && (lh->down_load >= (lh->num_items * LH_LOAD_MULT / lh->num_nodes)))
contract(lh);
return ret;
@@ -184,11 +183,11 @@ void *OPENSSL_LH_retrieve(OPENSSL_LHASH *lh, const void *data)
}
static void doall_util_fn(OPENSSL_LHASH *lh, int use_arg,
- OPENSSL_LH_DOALL_FUNC_THUNK wfunc,
- OPENSSL_LH_DOALL_FUNC func,
- OPENSSL_LH_DOALL_FUNCARG func_arg,
- OPENSSL_LH_DOALL_FUNCARG_THUNK wfunc_arg,
- void *arg)
+ OPENSSL_LH_DOALL_FUNC_THUNK wfunc,
+ OPENSSL_LH_DOALL_FUNC func,
+ OPENSSL_LH_DOALL_FUNCARG func_arg,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK wfunc_arg,
+ void *arg)
{
int i;
OPENSSL_LH_NODE *a, *n;
@@ -219,25 +218,25 @@ void OPENSSL_LH_doall(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNC func)
return;
doall_util_fn(lh, 0, lh->daw, func, (OPENSSL_LH_DOALL_FUNCARG)NULL,
- (OPENSSL_LH_DOALL_FUNCARG_THUNK)NULL, NULL);
+ (OPENSSL_LH_DOALL_FUNCARG_THUNK)NULL, NULL);
}
void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh,
- OPENSSL_LH_DOALL_FUNCARG func, void *arg)
+ OPENSSL_LH_DOALL_FUNCARG func, void *arg)
{
if (lh == NULL)
return;
doall_util_fn(lh, 1, (OPENSSL_LH_DOALL_FUNC_THUNK)NULL,
- (OPENSSL_LH_DOALL_FUNC)NULL, func, lh->daaw, arg);
+ (OPENSSL_LH_DOALL_FUNC)NULL, func, lh->daaw, arg);
}
void OPENSSL_LH_doall_arg_thunk(OPENSSL_LHASH *lh,
- OPENSSL_LH_DOALL_FUNCARG_THUNK daaw,
- OPENSSL_LH_DOALL_FUNCARG fn, void *arg)
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw,
+ OPENSSL_LH_DOALL_FUNCARG fn, void *arg)
{
doall_util_fn(lh, 1, (OPENSSL_LH_DOALL_FUNC_THUNK)NULL,
- (OPENSSL_LH_DOALL_FUNC)NULL, fn, daaw, arg);
+ (OPENSSL_LH_DOALL_FUNC)NULL, fn, daaw, arg);
}
static int expand(OPENSSL_LHASH *lh)
@@ -317,7 +316,7 @@ static void contract(OPENSSL_LHASH *lh)
}
static OPENSSL_LH_NODE **getrn(OPENSSL_LHASH *lh,
- const void *data, unsigned long *rhash)
+ const void *data, unsigned long *rhash)
{
OPENSSL_LH_NODE **ret, *n1;
unsigned long hash, nn;
diff --git a/crypto/lhash/lhash_local.h b/crypto/lhash/lhash_local.h
index 8da63b9add..4a7cdfb9f6 100644
--- a/crypto/lhash/lhash_local.h
+++ b/crypto/lhash/lhash_local.h
@@ -28,8 +28,8 @@ struct lhash_st {
unsigned int num_alloc_nodes;
unsigned int p;
unsigned int pmax;
- unsigned long up_load; /* load times 256 */
- unsigned long down_load; /* load times 256 */
+ unsigned long up_load; /* load times 256 */
+ unsigned long down_load; /* load times 256 */
unsigned long num_items;
int error;
};
diff --git a/crypto/lms/lm_ots_params.c b/crypto/lms/lm_ots_params.c
index 09613ce9b8..14e36ed068 100644
--- a/crypto/lms/lm_ots_params.c
+++ b/crypto/lms/lm_ots_params.c
@@ -13,23 +13,23 @@
/* Refer to SP800-208 Section 4 LM-OTS parameter sets */
static const LM_OTS_PARAMS lm_ots_params[] = {
- { OSSL_LM_OTS_TYPE_SHA256_N32_W1, 32, 1, 265, 7, "SHA256"},
- { OSSL_LM_OTS_TYPE_SHA256_N32_W2, 32, 2, 133, 6, "SHA256"},
- { OSSL_LM_OTS_TYPE_SHA256_N32_W4, 32, 4, 67, 4, "SHA256"},
- { OSSL_LM_OTS_TYPE_SHA256_N32_W8, 32, 8, 34, 0, "SHA256"},
- { OSSL_LM_OTS_TYPE_SHA256_N24_W1, 24, 1, 200, 8, "SHA256-192"},
- { OSSL_LM_OTS_TYPE_SHA256_N24_W2, 24, 2, 101, 6, "SHA256-192"},
- { OSSL_LM_OTS_TYPE_SHA256_N24_W4, 24, 4, 51, 4, "SHA256-192"},
- { OSSL_LM_OTS_TYPE_SHA256_N24_W8, 24, 8, 26, 0, "SHA256-192"},
- { OSSL_LM_OTS_TYPE_SHAKE_N32_W1, 32, 1, 265, 7, "SHAKE-256"},
- { OSSL_LM_OTS_TYPE_SHAKE_N32_W2, 32, 2, 133, 6, "SHAKE-256"},
- { OSSL_LM_OTS_TYPE_SHAKE_N32_W4, 32, 4, 67, 4, "SHAKE-256"},
- { OSSL_LM_OTS_TYPE_SHAKE_N32_W8, 32, 8, 34, 0, "SHAKE-256"},
+ { OSSL_LM_OTS_TYPE_SHA256_N32_W1, 32, 1, 265, 7, "SHA256" },
+ { OSSL_LM_OTS_TYPE_SHA256_N32_W2, 32, 2, 133, 6, "SHA256" },
+ { OSSL_LM_OTS_TYPE_SHA256_N32_W4, 32, 4, 67, 4, "SHA256" },
+ { OSSL_LM_OTS_TYPE_SHA256_N32_W8, 32, 8, 34, 0, "SHA256" },
+ { OSSL_LM_OTS_TYPE_SHA256_N24_W1, 24, 1, 200, 8, "SHA256-192" },
+ { OSSL_LM_OTS_TYPE_SHA256_N24_W2, 24, 2, 101, 6, "SHA256-192" },
+ { OSSL_LM_OTS_TYPE_SHA256_N24_W4, 24, 4, 51, 4, "SHA256-192" },
+ { OSSL_LM_OTS_TYPE_SHA256_N24_W8, 24, 8, 26, 0, "SHA256-192" },
+ { OSSL_LM_OTS_TYPE_SHAKE_N32_W1, 32, 1, 265, 7, "SHAKE-256" },
+ { OSSL_LM_OTS_TYPE_SHAKE_N32_W2, 32, 2, 133, 6, "SHAKE-256" },
+ { OSSL_LM_OTS_TYPE_SHAKE_N32_W4, 32, 4, 67, 4, "SHAKE-256" },
+ { OSSL_LM_OTS_TYPE_SHAKE_N32_W8, 32, 8, 34, 0, "SHAKE-256" },
/* SHAKE-256/192 - OpenSSL does not support this as a name */
- { OSSL_LM_OTS_TYPE_SHAKE_N24_W1, 24, 1, 200, 8, "SHAKE-256"},
- { OSSL_LM_OTS_TYPE_SHAKE_N24_W2, 24, 2, 101, 6, "SHAKE-256"},
- { OSSL_LM_OTS_TYPE_SHAKE_N24_W4, 24, 4, 51, 4, "SHAKE-256"},
- { OSSL_LM_OTS_TYPE_SHAKE_N24_W8, 24, 8, 26, 0, "SHAKE-256"},
+ { OSSL_LM_OTS_TYPE_SHAKE_N24_W1, 24, 1, 200, 8, "SHAKE-256" },
+ { OSSL_LM_OTS_TYPE_SHAKE_N24_W2, 24, 2, 101, 6, "SHAKE-256" },
+ { OSSL_LM_OTS_TYPE_SHAKE_N24_W4, 24, 4, 51, 4, "SHAKE-256" },
+ { OSSL_LM_OTS_TYPE_SHAKE_N24_W8, 24, 8, 26, 0, "SHAKE-256" },
{ 0, 0, 0, 0, 0, NULL },
};
@@ -52,7 +52,7 @@ const LM_OTS_PARAMS *ossl_lm_ots_params_get(uint32_t ots_type)
/* See RFC 8554 Section 4.4 Checksum */
uint16_t ossl_lm_ots_params_checksum(const LM_OTS_PARAMS *params,
- const unsigned char *S)
+ const unsigned char *S)
{
uint16_t sum = 0;
uint16_t i;
diff --git a/crypto/lms/lm_ots_verify.c b/crypto/lms/lm_ots_verify.c
index 0579fdb17c..53d3620031 100644
--- a/crypto/lms/lm_ots_verify.c
+++ b/crypto/lms/lm_ots_verify.c
@@ -13,7 +13,7 @@
#include "crypto/lms_util.h"
static int lm_ots_compute_pubkey_final(EVP_MD_CTX *ctx, EVP_MD_CTX *ctxIq,
- const LM_OTS_SIG *sig, unsigned char *Kc);
+ const LM_OTS_SIG *sig, unsigned char *Kc);
/**
* @brief OTS Signature verification.
@@ -35,10 +35,10 @@ static int lm_ots_compute_pubkey_final(EVP_MD_CTX *ctx, EVP_MD_CTX *ctxIq,
* @returns 1 on success, or 0 otherwise.
*/
int ossl_lm_ots_compute_pubkey(EVP_MD_CTX *ctx, EVP_MD_CTX *ctxIq,
- const LM_OTS_SIG *sig, const LM_OTS_PARAMS *pub,
- const unsigned char *Id, uint32_t q,
- const unsigned char *msg, size_t msglen,
- unsigned char *Kc)
+ const LM_OTS_SIG *sig, const LM_OTS_PARAMS *pub,
+ const unsigned char *Id, uint32_t q,
+ const unsigned char *msg, size_t msglen,
+ unsigned char *Kc)
{
unsigned char qbuf[LMS_SIZE_q];
unsigned char d_mesg[sizeof(uint16_t)];
@@ -50,13 +50,13 @@ int ossl_lm_ots_compute_pubkey(EVP_MD_CTX *ctx, EVP_MD_CTX *ctxIq,
OPENSSL_store_u16_be(d_mesg, OSSL_LMS_D_MESG);
return (EVP_DigestUpdate(ctxIq, Id, LMS_SIZE_I)
- && EVP_DigestUpdate(ctxIq, qbuf, sizeof(qbuf))
- && EVP_MD_CTX_copy_ex(ctx, ctxIq)
- /* Q = H(I || u32str(q) || u16str(D_MESG) || C || msg) */
- && EVP_DigestUpdate(ctx, d_mesg, sizeof(d_mesg))
- && EVP_DigestUpdate(ctx, sig->C, sig->params->n)
- && EVP_DigestUpdate(ctx, msg, msglen)
- && lm_ots_compute_pubkey_final(ctx, ctxIq, sig, Kc));
+ && EVP_DigestUpdate(ctxIq, qbuf, sizeof(qbuf))
+ && EVP_MD_CTX_copy_ex(ctx, ctxIq)
+ /* Q = H(I || u32str(q) || u16str(D_MESG) || C || msg) */
+ && EVP_DigestUpdate(ctx, d_mesg, sizeof(d_mesg))
+ && EVP_DigestUpdate(ctx, sig->C, sig->params->n)
+ && EVP_DigestUpdate(ctx, msg, msglen)
+ && lm_ots_compute_pubkey_final(ctx, ctxIq, sig, Kc));
}
/**
@@ -84,7 +84,7 @@ static ossl_inline void INC16(unsigned char *tag)
* @returns 1 on success, or 0 otherwise.
*/
static int lm_ots_compute_pubkey_final(EVP_MD_CTX *ctx, EVP_MD_CTX *ctxIq,
- const LM_OTS_SIG *sig, unsigned char *Kc)
+ const LM_OTS_SIG *sig, unsigned char *Kc)
{
int ret = 0, i;
EVP_MD_CTX *ctxKc = NULL;
@@ -101,7 +101,7 @@ static int lm_ots_compute_pubkey_final(EVP_MD_CTX *ctx, EVP_MD_CTX *ctxIq,
unsigned char *y;
if (!EVP_DigestFinal_ex(ctx, Q, NULL)
- || (ctxKc = EVP_MD_CTX_create()) == NULL)
+ || (ctxKc = EVP_MD_CTX_create()) == NULL)
return 0;
sum = ossl_lm_ots_params_checksum(params, Q);
@@ -111,7 +111,7 @@ static int lm_ots_compute_pubkey_final(EVP_MD_CTX *ctx, EVP_MD_CTX *ctxIq,
OPENSSL_store_u16_be(d_pblc, OSSL_LMS_D_PBLC);
if (!(EVP_MD_CTX_copy_ex(ctxKc, ctxIq))
- || !EVP_DigestUpdate(ctxKc, d_pblc, sizeof(d_pblc)))
+ || !EVP_DigestUpdate(ctxKc, d_pblc, sizeof(d_pblc)))
goto err;
y = sig->y;
@@ -130,9 +130,9 @@ static int lm_ots_compute_pubkey_final(EVP_MD_CTX *ctx, EVP_MD_CTX *ctxIq,
for (j = a; j < end; ++j) {
*tag2 = (j & 0xFF);
if (!(EVP_MD_CTX_copy_ex(ctx, ctxIq))
- || !EVP_DigestUpdate(ctx, tag, sizeof(tag))
- || !EVP_DigestUpdate(ctx, z, n)
- || !EVP_DigestFinal_ex(ctx, z, NULL))
+ || !EVP_DigestUpdate(ctx, tag, sizeof(tag))
+ || !EVP_DigestUpdate(ctx, z, n)
+ || !EVP_DigestFinal_ex(ctx, z, NULL))
goto err;
}
INC16(tag);
diff --git a/crypto/lms/lms_key.c b/crypto/lms/lms_key.c
index f8baf4f136..a5d87ad845 100644
--- a/crypto/lms/lms_key.c
+++ b/crypto/lms/lms_key.c
@@ -57,7 +57,7 @@ int ossl_lms_key_equal(const LMS_KEY *key1, const LMS_KEY *key2, int selection)
int ok = 1;
if (key1->lms_params != key2->lms_params
- || key1->ots_params != key2->ots_params)
+ || key1->ots_params != key2->ots_params)
return 0;
if ((selection & OSSL_KEYMGMT_SELECT_PUBLIC_KEY) != 0) {
@@ -65,7 +65,8 @@ int ossl_lms_key_equal(const LMS_KEY *key1, const LMS_KEY *key2, int selection)
return 0;
ok = (key1->pub.encodedlen == 0)
|| (memcmp(key1->pub.encoded, key2->pub.encoded,
- key1->pub.encodedlen) == 0);
+ key1->pub.encodedlen)
+ == 0);
}
return ok;
}
diff --git a/crypto/lms/lms_params.c b/crypto/lms/lms_params.c
index ebf5f2e28b..6ac6dcdb81 100644
--- a/crypto/lms/lms_params.c
+++ b/crypto/lms/lms_params.c
@@ -11,29 +11,29 @@
/* Refer to SP800-208 Section 4 LMS Parameter Sets */
static const LMS_PARAMS lms_params[] = {
- {OSSL_LMS_TYPE_SHA256_N32_H5, "SHA256", 32, 5},
- {OSSL_LMS_TYPE_SHA256_N32_H10, "SHA256", 32, 10},
- {OSSL_LMS_TYPE_SHA256_N32_H15, "SHA256", 32, 15},
- {OSSL_LMS_TYPE_SHA256_N32_H20, "SHA256", 32, 20},
- {OSSL_LMS_TYPE_SHA256_N32_H25, "SHA256", 32, 25},
- {OSSL_LMS_TYPE_SHA256_N24_H5, "SHA256-192", 24, 5},
- {OSSL_LMS_TYPE_SHA256_N24_H10, "SHA256-192", 24, 10},
- {OSSL_LMS_TYPE_SHA256_N24_H15, "SHA256-192", 24, 15},
- {OSSL_LMS_TYPE_SHA256_N24_H20, "SHA256-192", 24, 20},
- {OSSL_LMS_TYPE_SHA256_N24_H25, "SHA256-192", 24, 25},
- {OSSL_LMS_TYPE_SHAKE_N32_H5, "SHAKE-256", 32, 5},
- {OSSL_LMS_TYPE_SHAKE_N32_H10, "SHAKE-256", 32, 10},
- {OSSL_LMS_TYPE_SHAKE_N32_H15, "SHAKE-256", 32, 15},
- {OSSL_LMS_TYPE_SHAKE_N32_H20, "SHAKE-256", 32, 20},
- {OSSL_LMS_TYPE_SHAKE_N32_H25, "SHAKE-256", 32, 25},
+ { OSSL_LMS_TYPE_SHA256_N32_H5, "SHA256", 32, 5 },
+ { OSSL_LMS_TYPE_SHA256_N32_H10, "SHA256", 32, 10 },
+ { OSSL_LMS_TYPE_SHA256_N32_H15, "SHA256", 32, 15 },
+ { OSSL_LMS_TYPE_SHA256_N32_H20, "SHA256", 32, 20 },
+ { OSSL_LMS_TYPE_SHA256_N32_H25, "SHA256", 32, 25 },
+ { OSSL_LMS_TYPE_SHA256_N24_H5, "SHA256-192", 24, 5 },
+ { OSSL_LMS_TYPE_SHA256_N24_H10, "SHA256-192", 24, 10 },
+ { OSSL_LMS_TYPE_SHA256_N24_H15, "SHA256-192", 24, 15 },
+ { OSSL_LMS_TYPE_SHA256_N24_H20, "SHA256-192", 24, 20 },
+ { OSSL_LMS_TYPE_SHA256_N24_H25, "SHA256-192", 24, 25 },
+ { OSSL_LMS_TYPE_SHAKE_N32_H5, "SHAKE-256", 32, 5 },
+ { OSSL_LMS_TYPE_SHAKE_N32_H10, "SHAKE-256", 32, 10 },
+ { OSSL_LMS_TYPE_SHAKE_N32_H15, "SHAKE-256", 32, 15 },
+ { OSSL_LMS_TYPE_SHAKE_N32_H20, "SHAKE-256", 32, 20 },
+ { OSSL_LMS_TYPE_SHAKE_N32_H25, "SHAKE-256", 32, 25 },
/* SHAKE-256/192 */
- {OSSL_LMS_TYPE_SHAKE_N24_H5, "SHAKE-256", 24, 5},
- {OSSL_LMS_TYPE_SHAKE_N24_H10, "SHAKE-256", 24, 10},
- {OSSL_LMS_TYPE_SHAKE_N24_H15, "SHAKE-256", 24, 15},
- {OSSL_LMS_TYPE_SHAKE_N24_H20, "SHAKE-256", 24, 20},
- {OSSL_LMS_TYPE_SHAKE_N24_H25, "SHAKE-256", 24, 25},
+ { OSSL_LMS_TYPE_SHAKE_N24_H5, "SHAKE-256", 24, 5 },
+ { OSSL_LMS_TYPE_SHAKE_N24_H10, "SHAKE-256", 24, 10 },
+ { OSSL_LMS_TYPE_SHAKE_N24_H15, "SHAKE-256", 24, 15 },
+ { OSSL_LMS_TYPE_SHAKE_N24_H20, "SHAKE-256", 24, 20 },
+ { OSSL_LMS_TYPE_SHAKE_N24_H25, "SHAKE-256", 24, 25 },
- {0, NULL, 0, 0}
+ { 0, NULL, 0, 0 }
};
/**
diff --git a/crypto/lms/lms_pubkey_decode.c b/crypto/lms/lms_pubkey_decode.c
index 1e4ac03622..b5bb3dc74b 100644
--- a/crypto/lms/lms_pubkey_decode.c
+++ b/crypto/lms/lms_pubkey_decode.c
@@ -26,8 +26,8 @@ size_t ossl_lms_pubkey_length(const unsigned char *data, size_t datalen)
const LMS_PARAMS *params;
if (!PACKET_buf_init(&pkt, data, datalen)
- || !PACKET_get_net_4_len_u32(&pkt, &lms_type)
- || (params = ossl_lms_params_get(lms_type)) == NULL)
+ || !PACKET_get_net_4_len_u32(&pkt, &lms_type)
+ || (params = ossl_lms_params_get(lms_type)) == NULL)
return 0;
return LMS_SIZE_LMS_TYPE + LMS_SIZE_OTS_TYPE + LMS_SIZE_I + params->n;
}
@@ -45,9 +45,8 @@ size_t ossl_lms_pubkey_length(const unsigned char *data, size_t datalen)
* @param lmskey The object to store the public key into
* @return 1 on success or 0 otherwise.
*/
-static
-int lms_pubkey_from_pkt(LMS_KEY *lmskey, const unsigned char *pubkeydata,
- size_t publen)
+static int lms_pubkey_from_pkt(LMS_KEY *lmskey, const unsigned char *pubkeydata,
+ size_t publen)
{
uint32_t lms_type;
uint32_t ots_type;
@@ -61,7 +60,7 @@ int lms_pubkey_from_pkt(LMS_KEY *lmskey, const unsigned char *pubkeydata,
goto err;
lmskey->lms_params = ossl_lms_params_get(lms_type);
if (lmskey->lms_params == NULL
- || !PACKET_get_net_4_len_u32(&pkt, &ots_type))
+ || !PACKET_get_net_4_len_u32(&pkt, &ots_type))
goto err;
lmskey->ots_params = ossl_lm_ots_params_get(ots_type);
if (lmskey->ots_params == NULL)
@@ -69,10 +68,10 @@ int lms_pubkey_from_pkt(LMS_KEY *lmskey, const unsigned char *pubkeydata,
/* The digest used must be the same */
if (HASH_NOT_MATCHED(lmskey->ots_params, lmskey->lms_params)
- || !PACKET_get_bytes(&pkt, (const unsigned char **)&lmskey->Id,
- LMS_SIZE_I)
- || !PACKET_get_bytes(&pkt, (const unsigned char **)&key->K,
- lmskey->lms_params->n))
+ || !PACKET_get_bytes(&pkt, (const unsigned char **)&lmskey->Id,
+ LMS_SIZE_I)
+ || !PACKET_get_bytes(&pkt, (const unsigned char **)&key->K,
+ lmskey->lms_params->n))
goto err;
key->encodedlen = (unsigned char *)PACKET_data(&pkt) - key->encoded;
return PACKET_remaining(&pkt) == 0;
@@ -92,7 +91,7 @@ err:
* invalid or |publen| is not the correct size (i.e. trailing data is not allowed)
*/
int ossl_lms_pubkey_decode(const unsigned char *pub, size_t publen,
- LMS_KEY *lmskey)
+ LMS_KEY *lmskey)
{
LMS_PUB_KEY *pkey = &lmskey->pub;
@@ -125,8 +124,8 @@ int ossl_lms_pubkey_from_params(const OSSL_PARAM *pub, LMS_KEY *lmskey)
{
if (pub != NULL) {
if (pub->data == NULL
- || pub->data_type != OSSL_PARAM_OCTET_STRING
- || !ossl_lms_pubkey_decode(pub->data, pub->data_size, lmskey))
+ || pub->data_type != OSSL_PARAM_OCTET_STRING
+ || !ossl_lms_pubkey_decode(pub->data, pub->data_size, lmskey))
return 0;
}
return 1;
diff --git a/crypto/lms/lms_sig_decoder.c b/crypto/lms/lms_sig_decoder.c
index 3074c882db..47c20be847 100644
--- a/crypto/lms/lms_sig_decoder.c
+++ b/crypto/lms/lms_sig_decoder.c
@@ -38,25 +38,25 @@ LMS_SIG *ossl_lms_sig_from_pkt(PACKET *pkt, const LMS_KEY *pub)
if (lsig == NULL)
return NULL;
- if (!PACKET_get_net_4_len_u32(pkt, &lsig->q) /* q = Leaf Index */
- || !PACKET_get_net_4_len_u32(pkt, &sig_ots_type)
- || pub_ots_params->lm_ots_type != sig_ots_type)
+ if (!PACKET_get_net_4_len_u32(pkt, &lsig->q) /* q = Leaf Index */
+ || !PACKET_get_net_4_len_u32(pkt, &sig_ots_type)
+ || pub_ots_params->lm_ots_type != sig_ots_type)
goto err;
sig_params = pub_ots_params;
lsig->sig.params = sig_params;
lsig->params = lparams;
if (!PACKET_get_bytes(pkt, (const unsigned char **)&lsig->sig.C,
- sig_params->n)
- || !PACKET_get_bytes(pkt, (const unsigned char **)&lsig->sig.y,
- sig_params->p * sig_params->n)
- || !PACKET_get_net_4_len_u32(pkt, &sig_lms_type)
- || (lparams->lms_type != sig_lms_type)
- || HASH_NOT_MATCHED(lparams, sig_params)
- || lsig->q >= (uint32_t)(1 << lparams->h)
- || !PACKET_get_bytes(pkt, (const unsigned char **)&lsig->paths,
- lparams->h * lparams->n)
- || PACKET_remaining(pkt) > 0)
+ sig_params->n)
+ || !PACKET_get_bytes(pkt, (const unsigned char **)&lsig->sig.y,
+ sig_params->p * sig_params->n)
+ || !PACKET_get_net_4_len_u32(pkt, &sig_lms_type)
+ || (lparams->lms_type != sig_lms_type)
+ || HASH_NOT_MATCHED(lparams, sig_params)
+ || lsig->q >= (uint32_t)(1 << lparams->h)
+ || !PACKET_get_bytes(pkt, (const unsigned char **)&lsig->paths,
+ lparams->h * lparams->n)
+ || PACKET_remaining(pkt) > 0)
goto err;
return lsig;
err:
@@ -79,7 +79,7 @@ err:
* otherwise it returns 0.
*/
int ossl_lms_sig_decode(LMS_SIG **out, LMS_KEY *pub,
- const unsigned char *sig, size_t siglen)
+ const unsigned char *sig, size_t siglen)
{
PACKET pkt;
LMS_SIG *s = NULL;
diff --git a/crypto/lms/lms_verify.c b/crypto/lms/lms_verify.c
index 43633ce034..602658d47d 100644
--- a/crypto/lms/lms_verify.c
+++ b/crypto/lms/lms_verify.c
@@ -16,10 +16,10 @@
* Constants used for obtaining unique inputs for different hashing operations
* e.g H(I || q || OSSL_LMS_D_LEAF || ... )
*/
-const uint16_t OSSL_LMS_D_PBLC = 0x8080;
-const uint16_t OSSL_LMS_D_MESG = 0x8181;
-const uint16_t OSSL_LMS_D_LEAF = 0x8282;
-const uint16_t OSSL_LMS_D_INTR = 0x8383;
+const uint16_t OSSL_LMS_D_PBLC = 0x8080;
+const uint16_t OSSL_LMS_D_MESG = 0x8181;
+const uint16_t OSSL_LMS_D_LEAF = 0x8282;
+const uint16_t OSSL_LMS_D_INTR = 0x8383;
/*
* @brief Compute the candidate LMS root value Tc
@@ -36,11 +36,10 @@ const uint16_t OSSL_LMS_D_INTR = 0x8383;
* and on output returns the calculated candidate public key.
* @returns 1 on success, or 0 otherwise.
*/
-static
-int lms_sig_compute_tc_from_path(const unsigned char *paths, uint32_t n,
- uint32_t node_num,
- EVP_MD_CTX *ctx, EVP_MD_CTX *ctxI,
- unsigned char *Tc)
+static int lms_sig_compute_tc_from_path(const unsigned char *paths, uint32_t n,
+ uint32_t node_num,
+ EVP_MD_CTX *ctx, EVP_MD_CTX *ctxI,
+ unsigned char *Tc)
{
int ret = 0;
unsigned char qbuf[4];
@@ -69,8 +68,8 @@ int lms_sig_compute_tc_from_path(const unsigned char *paths, uint32_t n,
* Tc(parent) = H(I || node_q || 0x8383 || Tc(left) || paths[i][n])
*/
if (!EVP_MD_CTX_copy_ex(ctx, ctxI)
- || !EVP_DigestUpdate(ctx, qbuf, sizeof(qbuf))
- || !EVP_DigestUpdate(ctx, d_intr, sizeof(d_intr)))
+ || !EVP_DigestUpdate(ctx, qbuf, sizeof(qbuf))
+ || !EVP_DigestUpdate(ctx, d_intr, sizeof(d_intr)))
goto err;
if (odd) {
@@ -107,8 +106,8 @@ err:
* @returns 1 if the verification succeeded, or 0 otherwise.
*/
int ossl_lms_sig_verify(const LMS_SIG *lms_sig, const LMS_KEY *pub,
- const EVP_MD *md,
- const unsigned char *msg, size_t msglen)
+ const EVP_MD *md,
+ const unsigned char *msg, size_t msglen)
{
int ret = 0;
EVP_MD_CTX *ctx = NULL, *ctxIq = NULL;
@@ -134,8 +133,8 @@ int ossl_lms_sig_verify(const LMS_SIG *lms_sig, const LMS_KEY *pub,
* and the identifiers I, q
*/
if (!ossl_lm_ots_compute_pubkey(ctx, ctxIq, &lms_sig->sig,
- pub->ots_params, pub->Id,
- lms_sig->q, msg, msglen, Kc))
+ pub->ots_params, pub->Id,
+ lms_sig->q, msg, msglen, Kc))
goto err;
/*
@@ -156,14 +155,14 @@ int ossl_lms_sig_verify(const LMS_SIG *lms_sig, const LMS_KEY *pub,
* so there is no need to reinitialise it here.
*/
if (!EVP_DigestInit_ex2(ctx, NULL, NULL)
- || !EVP_DigestUpdate(ctx, pub->Id, LMS_SIZE_I)
- || !EVP_MD_CTX_copy_ex(ctxI, ctx)
- || !EVP_DigestUpdate(ctx, qbuf, sizeof(qbuf))
- || !EVP_DigestUpdate(ctx, d_leaf, sizeof(d_leaf))
- || !EVP_DigestUpdate(ctx, Kc, n)
- || !EVP_DigestFinal_ex(ctx, Tc, NULL)
- || !lms_sig_compute_tc_from_path(lms_sig->paths, n, node_num,
- ctx, ctxI, Tc))
+ || !EVP_DigestUpdate(ctx, pub->Id, LMS_SIZE_I)
+ || !EVP_MD_CTX_copy_ex(ctxI, ctx)
+ || !EVP_DigestUpdate(ctx, qbuf, sizeof(qbuf))
+ || !EVP_DigestUpdate(ctx, d_leaf, sizeof(d_leaf))
+ || !EVP_DigestUpdate(ctx, Kc, n)
+ || !EVP_DigestFinal_ex(ctx, Tc, NULL)
+ || !lms_sig_compute_tc_from_path(lms_sig->paths, n, node_num,
+ ctx, ctxI, Tc))
goto err;
/* Algorithm 6: Step 4 */
ret = (memcmp(pub->pub.K, Tc, n) == 0);
diff --git a/crypto/loongarch_arch.h b/crypto/loongarch_arch.h
index c7fd42df1e..e1a7f82293 100644
--- a/crypto/loongarch_arch.h
+++ b/crypto/loongarch_arch.h
@@ -7,13 +7,13 @@
* https://www.openssl.org/source/license.html
*/
#ifndef OSSL_CRYPTO_LOONGARCH_ARCH_H
-# define OSSL_CRYPTO_LOONGARCH_ARCH_H
+#define OSSL_CRYPTO_LOONGARCH_ARCH_H
-# ifndef __ASSEMBLER__
+#ifndef __ASSEMBLER__
extern unsigned int OPENSSL_loongarch_hwcap_P;
-# endif
+#endif
-# define LOONGARCH_HWCAP_LSX (1 << 4)
-# define LOONGARCH_HWCAP_LASX (1 << 5)
+#define LOONGARCH_HWCAP_LSX (1 << 4)
+#define LOONGARCH_HWCAP_LASX (1 << 5)
#endif
diff --git a/crypto/md2/md2_dgst.c b/crypto/md2/md2_dgst.c
index 0b00335438..61c4b72507 100644
--- a/crypto/md2/md2_dgst.c
+++ b/crypto/md2/md2_dgst.c
@@ -24,7 +24,7 @@
* Implemented from RFC1319 The MD2 Message-Digest Algorithm
*/
-#define UCHAR unsigned char
+#define UCHAR unsigned char
static void md2_block(MD2_CTX *c, const unsigned char *d);
/*
@@ -32,38 +32,262 @@ static void md2_block(MD2_CTX *c, const unsigned char *d);
* a random byte string.
*/
static const MD2_INT S[256] = {
- 0x29, 0x2E, 0x43, 0xC9, 0xA2, 0xD8, 0x7C, 0x01,
- 0x3D, 0x36, 0x54, 0xA1, 0xEC, 0xF0, 0x06, 0x13,
- 0x62, 0xA7, 0x05, 0xF3, 0xC0, 0xC7, 0x73, 0x8C,
- 0x98, 0x93, 0x2B, 0xD9, 0xBC, 0x4C, 0x82, 0xCA,
- 0x1E, 0x9B, 0x57, 0x3C, 0xFD, 0xD4, 0xE0, 0x16,
- 0x67, 0x42, 0x6F, 0x18, 0x8A, 0x17, 0xE5, 0x12,
- 0xBE, 0x4E, 0xC4, 0xD6, 0xDA, 0x9E, 0xDE, 0x49,
- 0xA0, 0xFB, 0xF5, 0x8E, 0xBB, 0x2F, 0xEE, 0x7A,
- 0xA9, 0x68, 0x79, 0x91, 0x15, 0xB2, 0x07, 0x3F,
- 0x94, 0xC2, 0x10, 0x89, 0x0B, 0x22, 0x5F, 0x21,
- 0x80, 0x7F, 0x5D, 0x9A, 0x5A, 0x90, 0x32, 0x27,
- 0x35, 0x3E, 0xCC, 0xE7, 0xBF, 0xF7, 0x97, 0x03,
- 0xFF, 0x19, 0x30, 0xB3, 0x48, 0xA5, 0xB5, 0xD1,
- 0xD7, 0x5E, 0x92, 0x2A, 0xAC, 0x56, 0xAA, 0xC6,
- 0x4F, 0xB8, 0x38, 0xD2, 0x96, 0xA4, 0x7D, 0xB6,
- 0x76, 0xFC, 0x6B, 0xE2, 0x9C, 0x74, 0x04, 0xF1,
- 0x45, 0x9D, 0x70, 0x59, 0x64, 0x71, 0x87, 0x20,
- 0x86, 0x5B, 0xCF, 0x65, 0xE6, 0x2D, 0xA8, 0x02,
- 0x1B, 0x60, 0x25, 0xAD, 0xAE, 0xB0, 0xB9, 0xF6,
- 0x1C, 0x46, 0x61, 0x69, 0x34, 0x40, 0x7E, 0x0F,
- 0x55, 0x47, 0xA3, 0x23, 0xDD, 0x51, 0xAF, 0x3A,
- 0xC3, 0x5C, 0xF9, 0xCE, 0xBA, 0xC5, 0xEA, 0x26,
- 0x2C, 0x53, 0x0D, 0x6E, 0x85, 0x28, 0x84, 0x09,
- 0xD3, 0xDF, 0xCD, 0xF4, 0x41, 0x81, 0x4D, 0x52,
- 0x6A, 0xDC, 0x37, 0xC8, 0x6C, 0xC1, 0xAB, 0xFA,
- 0x24, 0xE1, 0x7B, 0x08, 0x0C, 0xBD, 0xB1, 0x4A,
- 0x78, 0x88, 0x95, 0x8B, 0xE3, 0x63, 0xE8, 0x6D,
- 0xE9, 0xCB, 0xD5, 0xFE, 0x3B, 0x00, 0x1D, 0x39,
- 0xF2, 0xEF, 0xB7, 0x0E, 0x66, 0x58, 0xD0, 0xE4,
- 0xA6, 0x77, 0x72, 0xF8, 0xEB, 0x75, 0x4B, 0x0A,
- 0x31, 0x44, 0x50, 0xB4, 0x8F, 0xED, 0x1F, 0x1A,
- 0xDB, 0x99, 0x8D, 0x33, 0x9F, 0x11, 0x83, 0x14,
+ 0x29,
+ 0x2E,
+ 0x43,
+ 0xC9,
+ 0xA2,
+ 0xD8,
+ 0x7C,
+ 0x01,
+ 0x3D,
+ 0x36,
+ 0x54,
+ 0xA1,
+ 0xEC,
+ 0xF0,
+ 0x06,
+ 0x13,
+ 0x62,
+ 0xA7,
+ 0x05,
+ 0xF3,
+ 0xC0,
+ 0xC7,
+ 0x73,
+ 0x8C,
+ 0x98,
+ 0x93,
+ 0x2B,
+ 0xD9,
+ 0xBC,
+ 0x4C,
+ 0x82,
+ 0xCA,
+ 0x1E,
+ 0x9B,
+ 0x57,
+ 0x3C,
+ 0xFD,
+ 0xD4,
+ 0xE0,
+ 0x16,
+ 0x67,
+ 0x42,
+ 0x6F,
+ 0x18,
+ 0x8A,
+ 0x17,
+ 0xE5,
+ 0x12,
+ 0xBE,
+ 0x4E,
+ 0xC4,
+ 0xD6,
+ 0xDA,
+ 0x9E,
+ 0xDE,
+ 0x49,
+ 0xA0,
+ 0xFB,
+ 0xF5,
+ 0x8E,
+ 0xBB,
+ 0x2F,
+ 0xEE,
+ 0x7A,
+ 0xA9,
+ 0x68,
+ 0x79,
+ 0x91,
+ 0x15,
+ 0xB2,
+ 0x07,
+ 0x3F,
+ 0x94,
+ 0xC2,
+ 0x10,
+ 0x89,
+ 0x0B,
+ 0x22,
+ 0x5F,
+ 0x21,
+ 0x80,
+ 0x7F,
+ 0x5D,
+ 0x9A,
+ 0x5A,
+ 0x90,
+ 0x32,
+ 0x27,
+ 0x35,
+ 0x3E,
+ 0xCC,
+ 0xE7,
+ 0xBF,
+ 0xF7,
+ 0x97,
+ 0x03,
+ 0xFF,
+ 0x19,
+ 0x30,
+ 0xB3,
+ 0x48,
+ 0xA5,
+ 0xB5,
+ 0xD1,
+ 0xD7,
+ 0x5E,
+ 0x92,
+ 0x2A,
+ 0xAC,
+ 0x56,
+ 0xAA,
+ 0xC6,
+ 0x4F,
+ 0xB8,
+ 0x38,
+ 0xD2,
+ 0x96,
+ 0xA4,
+ 0x7D,
+ 0xB6,
+ 0x76,
+ 0xFC,
+ 0x6B,
+ 0xE2,
+ 0x9C,
+ 0x74,
+ 0x04,
+ 0xF1,
+ 0x45,
+ 0x9D,
+ 0x70,
+ 0x59,
+ 0x64,
+ 0x71,
+ 0x87,
+ 0x20,
+ 0x86,
+ 0x5B,
+ 0xCF,
+ 0x65,
+ 0xE6,
+ 0x2D,
+ 0xA8,
+ 0x02,
+ 0x1B,
+ 0x60,
+ 0x25,
+ 0xAD,
+ 0xAE,
+ 0xB0,
+ 0xB9,
+ 0xF6,
+ 0x1C,
+ 0x46,
+ 0x61,
+ 0x69,
+ 0x34,
+ 0x40,
+ 0x7E,
+ 0x0F,
+ 0x55,
+ 0x47,
+ 0xA3,
+ 0x23,
+ 0xDD,
+ 0x51,
+ 0xAF,
+ 0x3A,
+ 0xC3,
+ 0x5C,
+ 0xF9,
+ 0xCE,
+ 0xBA,
+ 0xC5,
+ 0xEA,
+ 0x26,
+ 0x2C,
+ 0x53,
+ 0x0D,
+ 0x6E,
+ 0x85,
+ 0x28,
+ 0x84,
+ 0x09,
+ 0xD3,
+ 0xDF,
+ 0xCD,
+ 0xF4,
+ 0x41,
+ 0x81,
+ 0x4D,
+ 0x52,
+ 0x6A,
+ 0xDC,
+ 0x37,
+ 0xC8,
+ 0x6C,
+ 0xC1,
+ 0xAB,
+ 0xFA,
+ 0x24,
+ 0xE1,
+ 0x7B,
+ 0x08,
+ 0x0C,
+ 0xBD,
+ 0xB1,
+ 0x4A,
+ 0x78,
+ 0x88,
+ 0x95,
+ 0x8B,
+ 0xE3,
+ 0x63,
+ 0xE8,
+ 0x6D,
+ 0xE9,
+ 0xCB,
+ 0xD5,
+ 0xFE,
+ 0x3B,
+ 0x00,
+ 0x1D,
+ 0x39,
+ 0xF2,
+ 0xEF,
+ 0xB7,
+ 0x0E,
+ 0x66,
+ 0x58,
+ 0xD0,
+ 0xE4,
+ 0xA6,
+ 0x77,
+ 0x72,
+ 0xF8,
+ 0xEB,
+ 0x75,
+ 0x4B,
+ 0x0A,
+ 0x31,
+ 0x44,
+ 0x50,
+ 0xB4,
+ 0x8F,
+ 0xED,
+ 0x1F,
+ 0x1A,
+ 0xDB,
+ 0x99,
+ 0x8D,
+ 0x33,
+ 0x9F,
+ 0x11,
+ 0x83,
+ 0x14,
};
const char *MD2_options(void)
@@ -164,16 +388,16 @@ int MD2_Final(unsigned char *md, MD2_CTX *c)
p2 = c->cksm;
v = MD2_BLOCK - c->num;
for (i = c->num; i < MD2_BLOCK; i++)
- cp[i] = (UCHAR) v;
+ cp[i] = (UCHAR)v;
md2_block(c, cp);
for (i = 0; i < MD2_BLOCK; i++)
- cp[i] = (UCHAR) p2[i];
+ cp[i] = (UCHAR)p2[i];
md2_block(c, cp);
for (i = 0; i < 16; i++)
- md[i] = (UCHAR) (p1[i] & 0xff);
+ md[i] = (UCHAR)(p1[i] & 0xff);
OPENSSL_cleanse(c, sizeof(*c));
return 1;
}
diff --git a/crypto/md4/md4_dgst.c b/crypto/md4/md4_dgst.c
index aefe6a3a37..3912fe2833 100644
--- a/crypto/md4/md4_dgst.c
+++ b/crypto/md4/md4_dgst.c
@@ -37,22 +37,22 @@ int MD4_Init(MD4_CTX *c)
}
#ifndef md4_block_data_order
-# ifdef X
-# undef X
-# endif
+#ifdef X
+#undef X
+#endif
void md4_block_data_order(MD4_CTX *c, const void *data_, size_t num)
{
const unsigned char *data = data_;
register unsigned MD32_REG_T A, B, C, D, l;
-# ifndef MD32_XARRAY
+#ifndef MD32_XARRAY
/* See comment in crypto/sha/sha_local.h for details. */
unsigned MD32_REG_T XX0, XX1, XX2, XX3, XX4, XX5, XX6, XX7,
XX8, XX9, XX10, XX11, XX12, XX13, XX14, XX15;
-# define X(i) XX##i
-# else
+#define X(i) XX##i
+#else
MD4_LONG XX[MD4_LBLOCK];
-# define X(i) XX[i]
-# endif
+#define X(i) XX[i]
+#endif
A = c->A;
B = c->B;
diff --git a/crypto/md4/md4_local.h b/crypto/md4/md4_local.h
index 66aa5e4038..ec2a8c361c 100644
--- a/crypto/md4/md4_local.h
+++ b/crypto/md4/md4_local.h
@@ -16,20 +16,25 @@ void md4_block_data_order(MD4_CTX *c, const void *p, size_t num);
#define DATA_ORDER_IS_LITTLE_ENDIAN
-#define HASH_LONG MD4_LONG
-#define HASH_CTX MD4_CTX
-#define HASH_CBLOCK MD4_CBLOCK
-#define HASH_UPDATE MD4_Update
-#define HASH_TRANSFORM MD4_Transform
-#define HASH_FINAL MD4_Final
-#define HASH_MAKE_STRING(c,s) do { \
- unsigned long ll; \
- ll=(c)->A; (void)HOST_l2c(ll,(s)); \
- ll=(c)->B; (void)HOST_l2c(ll,(s)); \
- ll=(c)->C; (void)HOST_l2c(ll,(s)); \
- ll=(c)->D; (void)HOST_l2c(ll,(s)); \
- } while (0)
-#define HASH_BLOCK_DATA_ORDER md4_block_data_order
+#define HASH_LONG MD4_LONG
+#define HASH_CTX MD4_CTX
+#define HASH_CBLOCK MD4_CBLOCK
+#define HASH_UPDATE MD4_Update
+#define HASH_TRANSFORM MD4_Transform
+#define HASH_FINAL MD4_Final
+#define HASH_MAKE_STRING(c, s) \
+ do { \
+ unsigned long ll; \
+ ll = (c)->A; \
+ (void)HOST_l2c(ll, (s)); \
+ ll = (c)->B; \
+ (void)HOST_l2c(ll, (s)); \
+ ll = (c)->C; \
+ (void)HOST_l2c(ll, (s)); \
+ ll = (c)->D; \
+ (void)HOST_l2c(ll, (s)); \
+ } while (0)
+#define HASH_BLOCK_DATA_ORDER md4_block_data_order
#include "crypto/md32_common.h"
@@ -43,18 +48,24 @@ void md4_block_data_order(MD4_CTX *c, const void *p, size_t num);
* below. Wei attributes these optimizations to Peter Gutmann's SHS code,
* and he attributes it to Rich Schroeppel.
*/
-#define F(b,c,d) ((((c) ^ (d)) & (b)) ^ (d))
-#define G(b,c,d) (((b) & (c)) | ((b) & (d)) | ((c) & (d)))
-#define H(b,c,d) ((b) ^ (c) ^ (d))
+#define F(b, c, d) ((((c) ^ (d)) & (b)) ^ (d))
+#define G(b, c, d) (((b) & (c)) | ((b) & (d)) | ((c) & (d)))
+#define H(b, c, d) ((b) ^ (c) ^ (d))
-#define R0(a,b,c,d,k,s,t) { \
- a+=((k)+(t)+F((b),(c),(d))); \
- a=ROTATE(a,s); };
+#define R0(a, b, c, d, k, s, t) \
+ { \
+ a += ((k) + (t) + F((b), (c), (d))); \
+ a = ROTATE(a, s); \
+ };
-#define R1(a,b,c,d,k,s,t) { \
- a+=((k)+(t)+G((b),(c),(d))); \
- a=ROTATE(a,s); };
+#define R1(a, b, c, d, k, s, t) \
+ { \
+ a += ((k) + (t) + G((b), (c), (d))); \
+ a = ROTATE(a, s); \
+ };
-#define R2(a,b,c,d,k,s,t) { \
- a+=((k)+(t)+H((b),(c),(d))); \
- a=ROTATE(a,s); };
+#define R2(a, b, c, d, k, s, t) \
+ { \
+ a += ((k) + (t) + H((b), (c), (d))); \
+ a = ROTATE(a, s); \
+ };
diff --git a/crypto/md4/md4_one.c b/crypto/md4/md4_one.c
index 36fa88dd41..c7512209e7 100644
--- a/crypto/md4/md4_one.c
+++ b/crypto/md4/md4_one.c
@@ -19,7 +19,7 @@
#include <openssl/crypto.h>
#ifdef CHARSET_EBCDIC
-# include <openssl/ebcdic.h>
+#include <openssl/ebcdic.h>
#endif
unsigned char *MD4(const unsigned char *d, size_t n, unsigned char *md)
diff --git a/crypto/md5/md5_dgst.c b/crypto/md5/md5_dgst.c
index 913b1ea5ca..4b240e1fc6 100644
--- a/crypto/md5/md5_dgst.c
+++ b/crypto/md5/md5_dgst.c
@@ -37,22 +37,22 @@ int MD5_Init(MD5_CTX *c)
}
#ifndef md5_block_data_order
-# ifdef X
-# undef X
-# endif
+#ifdef X
+#undef X
+#endif
void md5_block_data_order(MD5_CTX *c, const void *data_, size_t num)
{
const unsigned char *data = data_;
register unsigned MD32_REG_T A, B, C, D, l;
-# ifndef MD32_XARRAY
+#ifndef MD32_XARRAY
/* See comment in crypto/sha/sha_local.h for details. */
unsigned MD32_REG_T XX0, XX1, XX2, XX3, XX4, XX5, XX6, XX7,
XX8, XX9, XX10, XX11, XX12, XX13, XX14, XX15;
-# define X(i) XX##i
-# else
+#define X(i) XX##i
+#else
MD5_LONG XX[MD5_LBLOCK];
-# define X(i) XX[i]
-# endif
+#define X(i) XX[i]
+#endif
A = c->A;
B = c->B;
diff --git a/crypto/md5/md5_local.h b/crypto/md5/md5_local.h
index d1136cfe91..7af5254457 100644
--- a/crypto/md5/md5_local.h
+++ b/crypto/md5/md5_local.h
@@ -13,37 +13,38 @@
#include <openssl/md5.h>
#ifdef MD5_ASM
-# if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
- defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || \
- defined(_M_X64) || defined(__aarch64__) || \
- (defined(__loongarch__) && __loongarch_grlen == 64) || \
- (defined(__riscv) && __riscv_xlen == 64)
-# define md5_block_data_order ossl_md5_block_asm_data_order
-# elif defined(__ia64) || defined(__ia64__) || defined(_M_IA64)
-# define md5_block_data_order ossl_md5_block_asm_data_order
-# elif defined(__sparc) || defined(__sparc__)
-# define md5_block_data_order ossl_md5_block_asm_data_order
-# endif
+#if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64) || defined(__aarch64__) || (defined(__loongarch__) && __loongarch_grlen == 64) || (defined(__riscv) && __riscv_xlen == 64)
+#define md5_block_data_order ossl_md5_block_asm_data_order
+#elif defined(__ia64) || defined(__ia64__) || defined(_M_IA64)
+#define md5_block_data_order ossl_md5_block_asm_data_order
+#elif defined(__sparc) || defined(__sparc__)
+#define md5_block_data_order ossl_md5_block_asm_data_order
+#endif
#endif
void md5_block_data_order(MD5_CTX *c, const void *p, size_t num);
#define DATA_ORDER_IS_LITTLE_ENDIAN
-#define HASH_LONG MD5_LONG
-#define HASH_CTX MD5_CTX
-#define HASH_CBLOCK MD5_CBLOCK
-#define HASH_UPDATE MD5_Update
-#define HASH_TRANSFORM MD5_Transform
-#define HASH_FINAL MD5_Final
-#define HASH_MAKE_STRING(c,s) do { \
- unsigned long ll; \
- ll=(c)->A; (void)HOST_l2c(ll,(s)); \
- ll=(c)->B; (void)HOST_l2c(ll,(s)); \
- ll=(c)->C; (void)HOST_l2c(ll,(s)); \
- ll=(c)->D; (void)HOST_l2c(ll,(s)); \
- } while (0)
-#define HASH_BLOCK_DATA_ORDER md5_block_data_order
+#define HASH_LONG MD5_LONG
+#define HASH_CTX MD5_CTX
+#define HASH_CBLOCK MD5_CBLOCK
+#define HASH_UPDATE MD5_Update
+#define HASH_TRANSFORM MD5_Transform
+#define HASH_FINAL MD5_Final
+#define HASH_MAKE_STRING(c, s) \
+ do { \
+ unsigned long ll; \
+ ll = (c)->A; \
+ (void)HOST_l2c(ll, (s)); \
+ ll = (c)->B; \
+ (void)HOST_l2c(ll, (s)); \
+ ll = (c)->C; \
+ (void)HOST_l2c(ll, (s)); \
+ ll = (c)->D; \
+ (void)HOST_l2c(ll, (s)); \
+ } while (0)
+#define HASH_BLOCK_DATA_ORDER md5_block_data_order
#include "crypto/md32_common.h"
@@ -57,27 +58,35 @@ void md5_block_data_order(MD5_CTX *c, const void *p, size_t num);
* below. Wei attributes these optimizations to Peter Gutmann's
* SHS code, and he attributes it to Rich Schroeppel.
*/
-#define F(b,c,d) ((((c) ^ (d)) & (b)) ^ (d))
-#define G(b,c,d) ((((b) ^ (c)) & (d)) ^ (c))
-#define H(b,c,d) ((b) ^ (c) ^ (d))
-#define I(b,c,d) (((~(d)) | (b)) ^ (c))
+#define F(b, c, d) ((((c) ^ (d)) & (b)) ^ (d))
+#define G(b, c, d) ((((b) ^ (c)) & (d)) ^ (c))
+#define H(b, c, d) ((b) ^ (c) ^ (d))
+#define I(b, c, d) (((~(d)) | (b)) ^ (c))
-#define R0(a,b,c,d,k,s,t) { \
- a+=((k)+(t)+F((b),(c),(d))); \
- a=ROTATE(a,s); \
- a+=b; };
+#define R0(a, b, c, d, k, s, t) \
+ { \
+ a += ((k) + (t) + F((b), (c), (d))); \
+ a = ROTATE(a, s); \
+ a += b; \
+ };
-#define R1(a,b,c,d,k,s,t) { \
- a+=((k)+(t)+G((b),(c),(d))); \
- a=ROTATE(a,s); \
- a+=b; };
+#define R1(a, b, c, d, k, s, t) \
+ { \
+ a += ((k) + (t) + G((b), (c), (d))); \
+ a = ROTATE(a, s); \
+ a += b; \
+ };
-#define R2(a,b,c,d,k,s,t) { \
- a+=((k)+(t)+H((b),(c),(d))); \
- a=ROTATE(a,s); \
- a+=b; };
+#define R2(a, b, c, d, k, s, t) \
+ { \
+ a += ((k) + (t) + H((b), (c), (d))); \
+ a = ROTATE(a, s); \
+ a += b; \
+ };
-#define R3(a,b,c,d,k,s,t) { \
- a+=((k)+(t)+I((b),(c),(d))); \
- a=ROTATE(a,s); \
- a+=b; };
+#define R3(a, b, c, d, k, s, t) \
+ { \
+ a += ((k) + (t) + I((b), (c), (d))); \
+ a = ROTATE(a, s); \
+ a += b; \
+ };
diff --git a/crypto/md5/md5_one.c b/crypto/md5/md5_one.c
index fe9b3df29e..37b7c1c3cd 100644
--- a/crypto/md5/md5_one.c
+++ b/crypto/md5/md5_one.c
@@ -19,7 +19,7 @@
#include <openssl/crypto.h>
#ifdef CHARSET_EBCDIC
-# include <openssl/ebcdic.h>
+#include <openssl/ebcdic.h>
#endif
unsigned char *MD5(const unsigned char *d, size_t n, unsigned char *md)
diff --git a/crypto/mdc2/mdc2dgst.c b/crypto/mdc2/mdc2dgst.c
index 607f9fc73a..6fa9bbd356 100644
--- a/crypto/mdc2/mdc2dgst.c
+++ b/crypto/mdc2/mdc2dgst.c
@@ -21,16 +21,16 @@
#include <openssl/mdc2.h>
#undef c2l
-#define c2l(c,l) (l =((DES_LONG)(*((c)++))) , \
- l|=((DES_LONG)(*((c)++)))<< 8L, \
- l|=((DES_LONG)(*((c)++)))<<16L, \
- l|=((DES_LONG)(*((c)++)))<<24L)
+#define c2l(c, l) (l = ((DES_LONG)(*((c)++))), \
+ l |= ((DES_LONG)(*((c)++))) << 8L, \
+ l |= ((DES_LONG)(*((c)++))) << 16L, \
+ l |= ((DES_LONG)(*((c)++))) << 24L)
#undef l2c
-#define l2c(l,c) (*((c)++)=(unsigned char)(((l) )&0xff), \
- *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \
- *((c)++)=(unsigned char)(((l)>>16L)&0xff), \
- *((c)++)=(unsigned char)(((l)>>24L)&0xff))
+#define l2c(l, c) (*((c)++) = (unsigned char)(((l)) & 0xff), \
+ *((c)++) = (unsigned char)(((l) >> 8L) & 0xff), \
+ *((c)++) = (unsigned char)(((l) >> 16L) & 0xff), \
+ *((c)++) = (unsigned char)(((l) >> 24L) & 0xff))
static void mdc2_body(MDC2_CTX *c, const unsigned char *in, size_t len);
int MDC2_Init(MDC2_CTX *c)
diff --git a/crypto/mem.c b/crypto/mem.c
index f772e6c461..10252e4ae7 100644
--- a/crypto/mem.c
+++ b/crypto/mem.c
@@ -25,19 +25,19 @@ static CRYPTO_realloc_fn realloc_impl = CRYPTO_realloc;
static CRYPTO_free_fn free_impl = CRYPTO_free;
#if !defined(OPENSSL_NO_CRYPTO_MDEBUG) && !defined(FIPS_MODULE)
-# include "internal/tsan_assist.h"
+#include "internal/tsan_assist.h"
-# ifdef TSAN_REQUIRES_LOCKING
-# define INCREMENT(x) /* empty */
-# define LOAD(x) 0
-# else /* TSAN_REQUIRES_LOCKING */
+#ifdef TSAN_REQUIRES_LOCKING
+#define INCREMENT(x) /* empty */
+#define LOAD(x) 0
+#else /* TSAN_REQUIRES_LOCKING */
static TSAN_QUALIFIER int malloc_count;
static TSAN_QUALIFIER int realloc_count;
static TSAN_QUALIFIER int free_count;
-# define INCREMENT(x) tsan_counter(&(x))
-# define LOAD(x) tsan_load(&x)
-# endif /* TSAN_REQUIRES_LOCKING */
+#define INCREMENT(x) tsan_counter(&(x))
+#define LOAD(x) tsan_load(&x)
+#endif /* TSAN_REQUIRES_LOCKING */
static char md_failbuf[CRYPTO_MEM_CHECK_MAX_FS + 1];
static char *md_failstring = NULL;
@@ -48,17 +48,19 @@ static int md_tracefd = -1;
static void parseit(void);
static int shouldfail(void);
-# define FAILTEST() if (shouldfail()) return NULL
+#define FAILTEST() \
+ if (shouldfail()) \
+ return NULL
#else
-# define INCREMENT(x) /* empty */
-# define FAILTEST() /* empty */
+#define INCREMENT(x) /* empty */
+#define FAILTEST() /* empty */
#endif
int CRYPTO_set_mem_functions(CRYPTO_malloc_fn malloc_fn,
- CRYPTO_realloc_fn realloc_fn,
- CRYPTO_free_fn free_fn)
+ CRYPTO_realloc_fn realloc_fn,
+ CRYPTO_free_fn free_fn)
{
if (!allow_customize)
return 0;
@@ -72,8 +74,8 @@ int CRYPTO_set_mem_functions(CRYPTO_malloc_fn malloc_fn,
}
void CRYPTO_get_mem_functions(CRYPTO_malloc_fn *malloc_fn,
- CRYPTO_realloc_fn *realloc_fn,
- CRYPTO_free_fn *free_fn)
+ CRYPTO_realloc_fn *realloc_fn,
+ CRYPTO_free_fn *free_fn)
{
if (malloc_fn != NULL)
*malloc_fn = malloc_impl;
@@ -128,10 +130,10 @@ static void parseit(void)
* Some rand() implementations aren't good, but we're not
* dealing with secure randomness here.
*/
-# ifdef _WIN32
-# define random() rand()
-# define srandom(seed) srand(seed)
-# endif
+#ifdef _WIN32
+#define random() rand()
+#define srandom(seed) srand(seed)
+#endif
/*
* See if the current malloc should fail.
*/
@@ -139,20 +141,20 @@ static int shouldfail(void)
{
int roll = (int)(random() % 10000);
int shoulditfail = roll < md_fail_percent;
-# ifndef _WIN32
-/* suppressed on Windows as POSIX-like file descriptors are non-inheritable */
+#ifndef _WIN32
+ /* suppressed on Windows as POSIX-like file descriptors are non-inheritable */
int len;
char buff[80];
if (md_tracefd > 0) {
BIO_snprintf(buff, sizeof(buff),
- "%c C%ld %%%d R%d\n",
- shoulditfail ? '-' : '+', md_count, md_fail_percent, roll);
+ "%c C%ld %%%d R%d\n",
+ shoulditfail ? '-' : '+', md_count, md_fail_percent, roll);
len = strlen(buff);
if (write(md_tracefd, buff, len) != len)
perror("shouldfail write failed");
}
-# endif
+#endif
if (md_count) {
/* If we used up this one, go to the next. */
@@ -212,7 +214,7 @@ void *CRYPTO_malloc(size_t num, const char *file, int line)
ptr = malloc(num);
if (ossl_likely(ptr != NULL))
return ptr;
- err:
+err:
ossl_report_alloc_err(file, line);
return NULL;
}
@@ -229,7 +231,7 @@ void *CRYPTO_zalloc(size_t num, const char *file, int line)
}
void *CRYPTO_aligned_alloc(size_t num, size_t alignment, void **freeptr,
- const char *file, int line)
+ const char *file, int line)
{
*freeptr = NULL;
@@ -292,7 +294,7 @@ err:
}
void *CRYPTO_clear_realloc(void *str, size_t old_len, size_t num,
- const char *file, int line)
+ const char *file, int line)
{
void *ret = NULL;
@@ -306,7 +308,7 @@ void *CRYPTO_clear_realloc(void *str, size_t old_len, size_t num,
/* Can't shrink the buffer since memcpy below copies |old_len| bytes. */
if (num < old_len) {
- OPENSSL_cleanse((char*)str + num, old_len - num);
+ OPENSSL_cleanse((char *)str + num, old_len - num);
return str;
}
@@ -340,7 +342,7 @@ void CRYPTO_clear_free(void *str, size_t num, const char *file, int line)
#if !defined(OPENSSL_NO_CRYPTO_MDEBUG)
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
int CRYPTO_mem_ctrl(int mode)
{
(void)mode;
@@ -355,7 +357,9 @@ int CRYPTO_set_mem_debug(int flag)
int CRYPTO_mem_debug_push(const char *info, const char *file, int line)
{
- (void)info; (void)file; (void)line;
+ (void)info;
+ (void)file;
+ (void)line;
return 0;
}
@@ -365,21 +369,33 @@ int CRYPTO_mem_debug_pop(void)
}
void CRYPTO_mem_debug_malloc(void *addr, size_t num, int flag,
- const char *file, int line)
+ const char *file, int line)
{
- (void)addr; (void)num; (void)flag; (void)file; (void)line;
+ (void)addr;
+ (void)num;
+ (void)flag;
+ (void)file;
+ (void)line;
}
void CRYPTO_mem_debug_realloc(void *addr1, void *addr2, size_t num, int flag,
- const char *file, int line)
+ const char *file, int line)
{
- (void)addr1; (void)addr2; (void)num; (void)flag; (void)file; (void)line;
+ (void)addr1;
+ (void)addr2;
+ (void)num;
+ (void)flag;
+ (void)file;
+ (void)line;
}
void CRYPTO_mem_debug_free(void *addr, int flag,
- const char *file, int line)
+ const char *file, int line)
{
- (void)addr; (void)flag; (void)file; (void)line;
+ (void)addr;
+ (void)flag;
+ (void)file;
+ (void)line;
}
int CRYPTO_mem_leaks(BIO *b)
@@ -388,21 +404,22 @@ int CRYPTO_mem_leaks(BIO *b)
return -1;
}
-# ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_STDIO
int CRYPTO_mem_leaks_fp(FILE *fp)
{
(void)fp;
return -1;
}
-# endif
+#endif
int CRYPTO_mem_leaks_cb(int (*cb)(const char *str, size_t len, void *u),
- void *u)
+ void *u)
{
- (void)cb; (void)u;
+ (void)cb;
+ (void)u;
return -1;
}
-# endif
+#endif
#endif
diff --git a/crypto/mem_sec.c b/crypto/mem_sec.c
index b9eb541bf2..330c726f2c 100644
--- a/crypto/mem_sec.c
+++ b/crypto/mem_sec.c
@@ -22,69 +22,68 @@
#include <string.h>
#ifndef OPENSSL_NO_SECURE_MEMORY
-# if defined(_WIN32)
-# include <windows.h>
-# if defined(WINAPI_FAMILY_PARTITION)
-# if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM)
+#if defined(_WIN32)
+#include <windows.h>
+#if defined(WINAPI_FAMILY_PARTITION)
+#if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM)
/*
* While VirtualLock is available under the app partition (e.g. UWP),
* the headers do not define the API. Define it ourselves instead.
*/
WINBASEAPI
BOOL
-WINAPI
-VirtualLock(
- _In_ LPVOID lpAddress,
- _In_ SIZE_T dwSize
- );
-# endif
-# endif
-# endif
-# include <stdlib.h>
-# include <assert.h>
-# if defined(OPENSSL_SYS_UNIX)
-# include <unistd.h>
-# endif
-# include <sys/types.h>
-# if defined(OPENSSL_SYS_UNIX)
-# include <sys/mman.h>
-# if defined(__FreeBSD__)
-# define MADV_DONTDUMP MADV_NOCORE
-# endif
-# if !defined(MAP_CONCEAL)
-# define MAP_CONCEAL 0
-# endif
-# endif
-# if defined(OPENSSL_SYS_LINUX)
-# include <sys/syscall.h>
-# if defined(SYS_mlock2)
-# include <linux/mman.h>
-# include <errno.h>
-# endif
-# include <sys/param.h>
-# endif
-# include <sys/stat.h>
-# include <fcntl.h>
+ WINAPI
+ VirtualLock(
+ _In_ LPVOID lpAddress,
+ _In_ SIZE_T dwSize);
+#endif
+#endif
+#endif
+#include <stdlib.h>
+#include <assert.h>
+#if defined(OPENSSL_SYS_UNIX)
+#include <unistd.h>
+#endif
+#include <sys/types.h>
+#if defined(OPENSSL_SYS_UNIX)
+#include <sys/mman.h>
+#if defined(__FreeBSD__)
+#define MADV_DONTDUMP MADV_NOCORE
+#endif
+#if !defined(MAP_CONCEAL)
+#define MAP_CONCEAL 0
+#endif
+#endif
+#if defined(OPENSSL_SYS_LINUX)
+#include <sys/syscall.h>
+#if defined(SYS_mlock2)
+#include <linux/mman.h>
+#include <errno.h>
+#endif
+#include <sys/param.h>
+#endif
+#include <sys/stat.h>
+#include <fcntl.h>
#endif
#ifndef HAVE_MADVISE
-# if defined(MADV_DONTDUMP)
-# define HAVE_MADVISE 1
-# else
-# define HAVE_MADVISE 0
-# endif
+#if defined(MADV_DONTDUMP)
+#define HAVE_MADVISE 1
+#else
+#define HAVE_MADVISE 0
+#endif
#endif
#if HAVE_MADVISE
-# undef NO_MADVISE
+#undef NO_MADVISE
#else
-# define NO_MADVISE
+#define NO_MADVISE
#endif
#define CLEAR(p, s) OPENSSL_cleanse(p, s)
#ifndef PAGE_SIZE
-# define PAGE_SIZE 4096
+#define PAGE_SIZE 4096
#endif
#if !defined(MAP_ANON) && defined(MAP_ANONYMOUS)
-# define MAP_ANON MAP_ANONYMOUS
+#define MAP_ANON MAP_ANONYMOUS
#endif
#ifndef OPENSSL_NO_SECURE_MEMORY
@@ -169,7 +168,7 @@ void *CRYPTO_secure_malloc(size_t num, const char *file, int line)
actual_size = ret ? sh_actual_size(ret) : 0;
secure_mem_used += actual_size;
CRYPTO_THREAD_unlock(sec_malloc_lock);
- err:
+err:
if (ret == NULL && (file != NULL || line != 0)) {
ERR_new();
ERR_set_debug(file, line, NULL);
@@ -215,7 +214,7 @@ void CRYPTO_secure_free(void *ptr, const char *file, int line)
}
void CRYPTO_secure_clear_free(void *ptr, size_t num,
- const char *file, int line)
+ const char *file, int line)
{
#ifndef OPENSSL_NO_SECURE_MEMORY
size_t actual_size;
@@ -297,7 +296,6 @@ size_t CRYPTO_secure_actual_size(void *ptr)
*/
#ifndef OPENSSL_NO_SECURE_MEMORY
-
/*
* The implementation provided here uses a fixed-sized mmap() heap,
* which is locked into memory, not written to core files, and protected
@@ -315,15 +313,14 @@ size_t CRYPTO_secure_actual_size(void *ptr)
#define ONE ((size_t)1)
-# define TESTBIT(t, b) (t[(b) >> 3] & (ONE << ((b) & 7)))
-# define SETBIT(t, b) (t[(b) >> 3] |= (ONE << ((b) & 7)))
-# define CLEARBIT(t, b) (t[(b) >> 3] &= (0xFF & ~(ONE << ((b) & 7))))
+#define TESTBIT(t, b) (t[(b) >> 3] & (ONE << ((b) & 7)))
+#define SETBIT(t, b) (t[(b) >> 3] |= (ONE << ((b) & 7)))
+#define CLEARBIT(t, b) (t[(b) >> 3] &= (0xFF & ~(ONE << ((b) & 7))))
#define WITHIN_ARENA(p) \
- ((char*)(p) >= sh.arena && (char*)(p) < &sh.arena[sh.arena_size])
+ ((char *)(p) >= sh.arena && (char *)(p) < &sh.arena[sh.arena_size])
#define WITHIN_FREELIST(p) \
- ((char*)(p) >= (char*)sh.freelist && (char*)(p) < (char*)&sh.freelist[sh.freelist_size])
-
+ ((char *)(p) >= (char *)sh.freelist && (char *)(p) < (char *)&sh.freelist[sh.freelist_size])
typedef struct sh_list_st {
struct sh_list_st *next;
@@ -331,7 +328,7 @@ typedef struct sh_list_st {
} SH_LIST;
typedef struct sh_st {
- char* map_result;
+ char *map_result;
size_t map_size;
char *arena;
size_t arena_size;
@@ -359,7 +356,6 @@ static size_t sh_getlist(char *ptr)
return list;
}
-
static int sh_testbit(char *ptr, int list, unsigned char *table)
{
size_t bit;
@@ -430,7 +426,6 @@ static void sh_remove_from_list(char *ptr)
OPENSSL_assert(WITHIN_FREELIST(temp2->p_next) || WITHIN_ARENA(temp2->p_next));
}
-
static int sh_init(size_t size, size_t minsize)
{
int ret;
@@ -467,9 +462,9 @@ static int sh_init(size_t size, size_t minsize)
minsize++;
} else {
/* make sure minsize is a powers of 2 */
- OPENSSL_assert((minsize & (minsize - 1)) == 0);
- if ((minsize & (minsize - 1)) != 0)
- goto err;
+ OPENSSL_assert((minsize & (minsize - 1)) == 0);
+ if ((minsize & (minsize - 1)) != 0)
+ goto err;
}
sh.arena_size = size;
@@ -500,13 +495,13 @@ static int sh_init(size_t size, size_t minsize)
goto err;
/* Allocate space for heap, and two extra pages as guards */
-#if defined(_SC_PAGE_SIZE) || defined (_SC_PAGESIZE)
+#if defined(_SC_PAGE_SIZE) || defined(_SC_PAGESIZE)
{
-# if defined(_SC_PAGE_SIZE)
+#if defined(_SC_PAGE_SIZE)
long tmppgsize = sysconf(_SC_PAGE_SIZE);
-# else
+#else
long tmppgsize = sysconf(_SC_PAGESIZE);
-# endif
+#endif
if (tmppgsize < 1)
pgsize = PAGE_SIZE;
else
@@ -521,28 +516,28 @@ static int sh_init(size_t size, size_t minsize)
sh.map_size = pgsize + sh.arena_size + pgsize;
#if !defined(_WIN32)
-# ifdef MAP_ANON
+#ifdef MAP_ANON
sh.map_result = mmap(NULL, sh.map_size,
- PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE|MAP_CONCEAL, -1, 0);
-# else
+ PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE | MAP_CONCEAL, -1, 0);
+#else
{
int fd;
sh.map_result = MAP_FAILED;
if ((fd = open("/dev/zero", O_RDWR)) >= 0) {
sh.map_result = mmap(NULL, sh.map_size,
- PROT_READ|PROT_WRITE, MAP_PRIVATE, fd, 0);
+ PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
close(fd);
}
}
-# endif
+#endif
if (sh.map_result == MAP_FAILED)
goto err;
#else
sh.map_result = VirtualAlloc(NULL, sh.map_size, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
if (sh.map_result == NULL)
- goto err;
+ goto err;
#endif
sh.arena = (char *)(sh.map_result + pgsize);
@@ -594,7 +589,7 @@ static int sh_init(size_t size, size_t minsize)
return ret;
- err:
+err:
sh_done();
return 0;
}
@@ -681,7 +676,7 @@ static void *sh_malloc(size_t size)
sh_add_to_list(&sh.freelist[slist], temp);
OPENSSL_assert(sh.freelist[slist] == temp);
- OPENSSL_assert(temp-(sh.arena_size >> slist) == sh_find_my_buddy(temp, (int)slist));
+ OPENSSL_assert(temp - (sh.arena_size >> slist) == sh_find_my_buddy(temp, (int)slist));
}
/* peel off memory to hand back */
diff --git a/crypto/mips_arch.h b/crypto/mips_arch.h
index 12a27615f1..ddc1293b2e 100644
--- a/crypto/mips_arch.h
+++ b/crypto/mips_arch.h
@@ -8,33 +8,31 @@
*/
#ifndef OSSL_CRYPTO_MIPS_ARCH_H
-# define OSSL_CRYPTO_MIPS_ARCH_H
+#define OSSL_CRYPTO_MIPS_ARCH_H
-# if (defined(__mips_smartmips) || defined(_MIPS_ARCH_MIPS32R3) || \
- defined(_MIPS_ARCH_MIPS32R5) || defined(_MIPS_ARCH_MIPS32R6)) \
- && !defined(_MIPS_ARCH_MIPS32R2)
-# define _MIPS_ARCH_MIPS32R2
-# endif
+#if (defined(__mips_smartmips) || defined(_MIPS_ARCH_MIPS32R3) || defined(_MIPS_ARCH_MIPS32R5) || defined(_MIPS_ARCH_MIPS32R6)) \
+ && !defined(_MIPS_ARCH_MIPS32R2)
+#define _MIPS_ARCH_MIPS32R2
+#endif
-# if (defined(_MIPS_ARCH_MIPS64R3) || defined(_MIPS_ARCH_MIPS64R5) || \
- defined(_MIPS_ARCH_MIPS64R6)) \
- && !defined(_MIPS_ARCH_MIPS64R2)
-# define _MIPS_ARCH_MIPS64R2
-# endif
+#if (defined(_MIPS_ARCH_MIPS64R3) || defined(_MIPS_ARCH_MIPS64R5) || defined(_MIPS_ARCH_MIPS64R6)) \
+ && !defined(_MIPS_ARCH_MIPS64R2)
+#define _MIPS_ARCH_MIPS64R2
+#endif
-# if defined(_MIPS_ARCH_MIPS64R6)
-# define dmultu(rs,rt)
-# define mflo(rd,rs,rt) dmulu rd,rs,rt
-# define mfhi(rd,rs,rt) dmuhu rd,rs,rt
-# elif defined(_MIPS_ARCH_MIPS32R6)
-# define multu(rs,rt)
-# define mflo(rd,rs,rt) mulu rd,rs,rt
-# define mfhi(rd,rs,rt) muhu rd,rs,rt
-# else
-# define dmultu(rs,rt) dmultu rs,rt
-# define multu(rs,rt) multu rs,rt
-# define mflo(rd,rs,rt) mflo rd
-# define mfhi(rd,rs,rt) mfhi rd
-# endif
+#if defined(_MIPS_ARCH_MIPS64R6)
+#define dmultu(rs, rt)
+#define mflo(rd, rs, rt) dmulu rd, rs, rt
+#define mfhi(rd, rs, rt) dmuhu rd, rs, rt
+#elif defined(_MIPS_ARCH_MIPS32R6)
+#define multu(rs, rt)
+#define mflo(rd, rs, rt) mulu rd, rs, rt
+#define mfhi(rd, rs, rt) muhu rd, rs, rt
+#else
+#define dmultu(rs, rt) dmultu rs, rt
+#define multu(rs, rt) multu rs, rt
+#define mflo(rd, rs, rt) mflo rd
+#define mfhi(rd, rs, rt) mfhi rd
+#endif
#endif
diff --git a/crypto/ml_dsa/ml_dsa_encoders.c b/crypto/ml_dsa/ml_dsa_encoders.c
index 59490662b1..de93f404fa 100644
--- a/crypto/ml_dsa/ml_dsa_encoders.c
+++ b/crypto/ml_dsa/ml_dsa_encoders.c
@@ -16,12 +16,12 @@
#include "ml_dsa_sign.h"
#include "internal/packet.h"
-#define POLY_COEFF_NUM_BYTES(bits) ((bits) * (ML_DSA_NUM_POLY_COEFFICIENTS / 8))
+#define POLY_COEFF_NUM_BYTES(bits) ((bits) * (ML_DSA_NUM_POLY_COEFFICIENTS / 8))
/* Cast mod_sub result in support of left-shifts that create 64-bit values. */
-#define mod_sub_64(a, b) ((uint64_t) mod_sub(a, b))
+#define mod_sub_64(a, b) ((uint64_t)mod_sub(a, b))
-typedef int (ENCODE_FN)(const POLY *s, WPACKET *pkt);
-typedef int (DECODE_FN)(POLY *s, PACKET *pkt);
+typedef int(ENCODE_FN)(const POLY *s, WPACKET *pkt);
+typedef int(DECODE_FN)(POLY *s, PACKET *pkt);
static ENCODE_FN poly_encode_signed_2;
static ENCODE_FN poly_encode_signed_4;
@@ -258,7 +258,7 @@ static int poly_decode_signed_4(POLY *p, PACKET *pkt)
*out++ = mod_sub(4, v >> 28);
}
ret = 1;
- err:
+err:
return ret;
}
@@ -304,8 +304,8 @@ static int poly_encode_signed_2(const POLY *p, WPACKET *pkt)
z |= mod_sub(2, *in++) << 18;
z |= mod_sub(2, *in++) << 21;
- out = OPENSSL_store_u16_le(out, (uint16_t) z);
- *out++ = (uint8_t) (z >> 16);
+ out = OPENSSL_store_u16_le(out, (uint16_t)z);
+ *out++ = (uint8_t)(z >> 16);
} while (in < end);
return 1;
}
@@ -358,7 +358,7 @@ static int poly_decode_signed_2(POLY *p, PACKET *pkt)
*out++ = mod_sub(2, (v >> 21) & 7);
}
ret = 1;
- err:
+err:
return ret;
}
@@ -405,8 +405,8 @@ static int poly_encode_signed_two_to_power_12(const POLY *p, WPACKET *pkt)
a2 |= mod_sub_64(range, *in++) << 27;
out = OPENSSL_store_u64_le(out, a1);
- out = OPENSSL_store_u32_le(out, (uint32_t) a2);
- *out = (uint8_t) (a2 >> 32);
+ out = OPENSSL_store_u32_le(out, (uint32_t)a2);
+ *out = (uint8_t)(a2 >> 32);
} while (in < end);
return 1;
}
@@ -436,7 +436,7 @@ static int poly_decode_signed_two_to_power_12(POLY *p, PACKET *pkt)
goto err;
in = OPENSSL_load_u64_le(&a1, in);
in = OPENSSL_load_u32_le(&a2, in);
- b13 = (uint32_t) *in;
+ b13 = (uint32_t)*in;
*out++ = mod_sub(range, a1 & mask_13_bits);
*out++ = mod_sub(range, (a1 >> 13) & mask_13_bits);
@@ -448,7 +448,7 @@ static int poly_decode_signed_two_to_power_12(POLY *p, PACKET *pkt)
*out++ = mod_sub(range, (a2 >> 27) | (b13 << 5));
}
ret = 1;
- err:
+err:
return ret;
}
@@ -491,7 +491,7 @@ static int poly_encode_signed_two_to_power_19(const POLY *p, WPACKET *pkt)
out = OPENSSL_store_u32_le(out, z0);
out = OPENSSL_store_u32_le(out, z1);
- out = OPENSSL_store_u16_le(out, (uint16_t) (z2 >> 4));
+ out = OPENSSL_store_u16_le(out, (uint16_t)(z2 >> 4));
} while (in < end);
return 1;
}
@@ -529,7 +529,7 @@ static int poly_decode_signed_two_to_power_19(POLY *p, PACKET *pkt)
*out++ = mod_sub(range, (a2 >> 28) | (a3 << 4));
}
ret = 1;
- err:
+err:
return ret;
}
@@ -601,7 +601,7 @@ static int poly_decode_signed_two_to_power_17(POLY *p, PACKET *pkt)
return 0;
in = OPENSSL_load_u32_le(&a1, in);
in = OPENSSL_load_u32_le(&a2, in);
- a3 = (uint32_t) *in;
+ a3 = (uint32_t)*in;
*out++ = mod_sub(range, a1 & mask_18_bits);
*out++ = mod_sub(range, (a1 >> 18) | ((a2 & 0xF) << 14));
@@ -633,13 +633,13 @@ int ossl_ml_dsa_pk_encode(ML_DSA_KEY *key)
return 0;
if (!WPACKET_init_static_len(&pkt, enc, enc_len, 0)
- || !WPACKET_memcpy(&pkt, key->rho, sizeof(key->rho)))
+ || !WPACKET_memcpy(&pkt, key->rho, sizeof(key->rho)))
goto err;
for (i = 0; i < t1_len; i++)
if (!poly_encode_10_bits(t1 + i, &pkt))
goto err;
if (!WPACKET_get_total_written(&pkt, &written)
- || written != enc_len)
+ || written != enc_len)
goto err;
OPENSSL_free(key->pub_encoding);
key->pub_encoding = enc;
@@ -679,7 +679,7 @@ int ossl_ml_dsa_pk_decode(ML_DSA_KEY *key, const uint8_t *in, size_t in_len)
if (ctx == NULL)
goto err;
if (!PACKET_buf_init(&pkt, in, in_len)
- || !PACKET_copy_bytes(&pkt, key->rho, sizeof(key->rho)))
+ || !PACKET_copy_bytes(&pkt, key->rho, sizeof(key->rho)))
goto err;
for (i = 0; i < key->t1.num_poly; i++)
if (!poly_decode_10_bits(key->t1.poly + i, &pkt))
@@ -725,9 +725,9 @@ int ossl_ml_dsa_sk_encode(ML_DSA_KEY *key)
encode_fn = poly_encode_signed_2;
if (!WPACKET_init_static_len(&pkt, enc, enc_len, 0)
- || !WPACKET_memcpy(&pkt, key->rho, sizeof(key->rho))
- || !WPACKET_memcpy(&pkt, key->K, sizeof(key->K))
- || !WPACKET_memcpy(&pkt, key->tr, sizeof(key->tr)))
+ || !WPACKET_memcpy(&pkt, key->rho, sizeof(key->rho))
+ || !WPACKET_memcpy(&pkt, key->K, sizeof(key->K))
+ || !WPACKET_memcpy(&pkt, key->tr, sizeof(key->tr)))
goto err;
for (i = 0; i < l; ++i)
if (!encode_fn(key->s1.poly + i, &pkt))
@@ -739,7 +739,7 @@ int ossl_ml_dsa_sk_encode(ML_DSA_KEY *key)
if (!poly_encode_signed_two_to_power_12(t0++, &pkt))
goto err;
if (!WPACKET_get_total_written(&pkt, &written)
- || written != enc_len)
+ || written != enc_len)
goto err;
OPENSSL_secure_clear_free(key->priv_encoding, enc_len);
key->priv_encoding = enc;
@@ -789,9 +789,9 @@ int ossl_ml_dsa_sk_decode(ML_DSA_KEY *key, const uint8_t *in, size_t in_len)
decode_fn = poly_decode_signed_2;
if (!PACKET_buf_init(&pkt, in, in_len)
- || !PACKET_copy_bytes(&pkt, key->rho, sizeof(key->rho))
- || !PACKET_copy_bytes(&pkt, key->K, sizeof(key->K))
- || !PACKET_copy_bytes(&pkt, input_tr, sizeof(input_tr)))
+ || !PACKET_copy_bytes(&pkt, key->rho, sizeof(key->rho))
+ || !PACKET_copy_bytes(&pkt, key->K, sizeof(key->K))
+ || !PACKET_copy_bytes(&pkt, input_tr, sizeof(input_tr)))
return 0;
for (i = 0; i < l; ++i)
@@ -816,16 +816,16 @@ int ossl_ml_dsa_sk_decode(ML_DSA_KEY *key, const uint8_t *in, size_t in_len)
* the |tr| value in the private key, else the key was corrupted.
*/
if (!ossl_ml_dsa_key_public_from_private(key)
- || memcmp(input_tr, key->tr, sizeof(input_tr)) != 0) {
+ || memcmp(input_tr, key->tr, sizeof(input_tr)) != 0) {
ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_KEY,
- "%s private key does not match its pubkey part",
- key->params->alg);
+ "%s private key does not match its pubkey part",
+ key->params->alg);
ossl_ml_dsa_key_reset(key);
goto err;
}
return 1;
- err:
+err:
return 0;
}
@@ -871,7 +871,7 @@ static int hint_bits_decode(VECTOR *hint, PACKET *pkt, uint32_t omega)
POLY *p = hint->poly, *end = p + k;
if (!PACKET_get_bytes(pkt, &in, omega)
- || !PACKET_get_bytes(pkt, &limits, k))
+ || !PACKET_get_bytes(pkt, &limits, k))
return 0;
vector_zero(hint); /* Set all coefficients to zero */
@@ -908,7 +908,7 @@ static int hint_bits_decode(VECTOR *hint, PACKET *pkt, uint32_t omega)
* @returns 1 if the signature was encoded successfully or 0 otherwise.
*/
int ossl_ml_dsa_sig_encode(const ML_DSA_SIG *sig, const ML_DSA_PARAMS *params,
- uint8_t *out)
+ uint8_t *out)
{
int ret = 0;
size_t i;
@@ -924,7 +924,7 @@ int ossl_ml_dsa_sig_encode(const ML_DSA_SIG *sig, const ML_DSA_PARAMS *params,
encode_fn = poly_encode_signed_two_to_power_17;
if (!WPACKET_init_static_len(&pkt, out, params->sig_len, 0)
- || !WPACKET_memcpy(&pkt, sig->c_tilde, sig->c_tilde_len))
+ || !WPACKET_memcpy(&pkt, sig->c_tilde, sig->c_tilde_len))
goto err;
for (i = 0; i < sig->z.num_poly; ++i)
@@ -946,7 +946,7 @@ err:
* @returns 1 if the signature was successfully decoded or 0 otherwise.
*/
int ossl_ml_dsa_sig_decode(ML_DSA_SIG *sig, const uint8_t *in, size_t in_len,
- const ML_DSA_PARAMS *params)
+ const ML_DSA_PARAMS *params)
{
int ret = 0;
size_t i;
@@ -959,14 +959,14 @@ int ossl_ml_dsa_sig_decode(ML_DSA_SIG *sig, const uint8_t *in, size_t in_len,
decode_fn = poly_decode_signed_two_to_power_17;
if (!PACKET_buf_init(&pkt, in, in_len)
- || !PACKET_copy_bytes(&pkt, sig->c_tilde, sig->c_tilde_len))
+ || !PACKET_copy_bytes(&pkt, sig->c_tilde, sig->c_tilde_len))
goto err;
for (i = 0; i < sig->z.num_poly; ++i)
if (!decode_fn(sig->z.poly + i, &pkt))
goto err;
if (!hint_bits_decode(&sig->hint, &pkt, params->omega)
- || PACKET_remaining(&pkt) != 0)
+ || PACKET_remaining(&pkt) != 0)
goto err;
ret = 1;
err:
@@ -974,8 +974,8 @@ err:
}
int ossl_ml_dsa_poly_decode_expand_mask(POLY *out,
- const uint8_t *in, size_t in_len,
- uint32_t gamma1)
+ const uint8_t *in, size_t in_len,
+ uint32_t gamma1)
{
PACKET pkt;
@@ -999,7 +999,7 @@ int ossl_ml_dsa_poly_decode_expand_mask(POLY *out,
* @returns 1 if the signature was encoded successfully or 0 otherwise.
*/
int ossl_ml_dsa_w1_encode(const VECTOR *w1, uint32_t gamma2,
- uint8_t *out, size_t out_len)
+ uint8_t *out, size_t out_len)
{
WPACKET pkt;
ENCODE_FN *encode_fn;
diff --git a/crypto/ml_dsa/ml_dsa_hash.h b/crypto/ml_dsa/ml_dsa_hash.h
index 3d06225969..7625d3367d 100644
--- a/crypto/ml_dsa/ml_dsa_hash.h
+++ b/crypto/ml_dsa/ml_dsa_hash.h
@@ -11,16 +11,16 @@
static ossl_inline ossl_unused int
shake_xof(EVP_MD_CTX *ctx, const EVP_MD *md, const uint8_t *in, size_t in_len,
- uint8_t *out, size_t out_len)
+ uint8_t *out, size_t out_len)
{
return (EVP_DigestInit_ex2(ctx, md, NULL) == 1
- && EVP_DigestUpdate(ctx, in, in_len) == 1
- && EVP_DigestSqueeze(ctx, out, out_len) == 1);
+ && EVP_DigestUpdate(ctx, in, in_len) == 1
+ && EVP_DigestSqueeze(ctx, out, out_len) == 1);
}
static ossl_inline ossl_unused int
shake_xof_2(EVP_MD_CTX *ctx, const EVP_MD *md, const uint8_t *in1, size_t in1_len,
- const uint8_t *in2, size_t in2_len, uint8_t *out, size_t out_len)
+ const uint8_t *in2, size_t in2_len, uint8_t *out, size_t out_len)
{
return EVP_DigestInit_ex2(ctx, md, NULL)
&& EVP_DigestUpdate(ctx, in1, in1_len)
@@ -30,8 +30,8 @@ shake_xof_2(EVP_MD_CTX *ctx, const EVP_MD *md, const uint8_t *in1, size_t in1_le
static ossl_inline ossl_unused int
shake_xof_3(EVP_MD_CTX *ctx, const EVP_MD *md, const uint8_t *in1, size_t in1_len,
- const uint8_t *in2, size_t in2_len,
- const uint8_t *in3, size_t in3_len, uint8_t *out, size_t out_len)
+ const uint8_t *in2, size_t in2_len,
+ const uint8_t *in3, size_t in3_len, uint8_t *out, size_t out_len)
{
return EVP_DigestInit_ex2(ctx, md, NULL)
&& EVP_DigestUpdate(ctx, in1, in1_len)
diff --git a/crypto/ml_dsa/ml_dsa_key.c b/crypto/ml_dsa/ml_dsa_key.c
index c5ef15c603..fdbd3eec6c 100644
--- a/crypto/ml_dsa/ml_dsa_key.c
+++ b/crypto/ml_dsa/ml_dsa_key.c
@@ -35,8 +35,8 @@ int ossl_ml_dsa_key_get_prov_flags(const ML_DSA_KEY *key)
}
int ossl_ml_dsa_set_prekey(ML_DSA_KEY *key, int flags_set, int flags_clr,
- const uint8_t *seed, size_t seed_len,
- const uint8_t *sk, size_t sk_len)
+ const uint8_t *seed, size_t seed_len,
+ const uint8_t *sk, size_t sk_len)
{
int ret = 0;
@@ -64,7 +64,7 @@ int ossl_ml_dsa_set_prekey(ML_DSA_KEY *key, int flags_set, int flags_clr,
key->prov_flags &= ~flags_clr;
ret = 1;
- end:
+end:
if (!ret) {
OPENSSL_secure_clear_free(key->priv_encoding, sk_len);
OPENSSL_secure_clear_free(key->seed, seed_len);
@@ -82,7 +82,7 @@ int ossl_ml_dsa_set_prekey(ML_DSA_KEY *key, int flags_set, int flags_clr,
* @returns The new ML_DSA_KEY object on success, or NULL on malloc failure
*/
ML_DSA_KEY *ossl_ml_dsa_key_new(OSSL_LIB_CTX *libctx, const char *propq,
- int evp_type)
+ int evp_type)
{
ML_DSA_KEY *ret;
const ML_DSA_PARAMS *params = ossl_ml_dsa_params_get(evp_type);
@@ -210,7 +210,8 @@ ML_DSA_KEY *ossl_ml_dsa_key_dup(const ML_DSA_KEY *src, int selection)
vector_copy(&ret->t1, &src->t1);
}
if ((ret->pub_encoding = OPENSSL_memdup(src->pub_encoding,
- src->params->pk_len)) == NULL)
+ src->params->pk_len))
+ == NULL)
goto err;
}
if ((selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0) {
@@ -242,7 +243,7 @@ ML_DSA_KEY *ossl_ml_dsa_key_dup(const ML_DSA_KEY *src, int selection)
ret->shake256_md = src->shake256_md;
}
return ret;
- err:
+err:
ossl_ml_dsa_key_free(ret);
return NULL;
}
@@ -260,7 +261,7 @@ ML_DSA_KEY *ossl_ml_dsa_key_dup(const ML_DSA_KEY *src, int selection)
* @returns 1 if the keys are equal otherwise it returns 0.
*/
int ossl_ml_dsa_key_equal(const ML_DSA_KEY *key1, const ML_DSA_KEY *key2,
- int selection)
+ int selection)
{
int key_checked = 0;
@@ -271,16 +272,18 @@ int ossl_ml_dsa_key_equal(const ML_DSA_KEY *key1, const ML_DSA_KEY *key2,
if ((selection & OSSL_KEYMGMT_SELECT_PUBLIC_KEY) != 0) {
if (key1->pub_encoding != NULL && key2->pub_encoding != NULL) {
if (memcmp(key1->pub_encoding, key2->pub_encoding,
- key1->params->pk_len) != 0)
+ key1->params->pk_len)
+ != 0)
return 0;
key_checked = 1;
}
}
if (!key_checked
- && (selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0) {
+ && (selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0) {
if (key1->priv_encoding != NULL && key2->priv_encoding != NULL) {
if (memcmp(key1->priv_encoding, key2->priv_encoding,
- key1->params->sk_len) != 0)
+ key1->params->sk_len)
+ != 0)
return 0;
key_checked = 1;
}
@@ -297,7 +300,7 @@ int ossl_ml_dsa_key_has(const ML_DSA_KEY *key, int selection)
if (ossl_ml_dsa_key_get_pub(key) == NULL)
return 0; /* No public key */
if ((selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0
- && ossl_ml_dsa_key_get_priv(key) == NULL)
+ && ossl_ml_dsa_key_get_priv(key) == NULL)
return 0; /* No private key */
return 1;
}
@@ -317,7 +320,7 @@ int ossl_ml_dsa_key_has(const ML_DSA_KEY *key, int selection)
* @returns 1 on success, or 0 on failure.
*/
static int public_from_private(const ML_DSA_KEY *key, EVP_MD_CTX *md_ctx,
- VECTOR *t1, VECTOR *t0)
+ VECTOR *t1, VECTOR *t0)
{
int ret = 0;
const ML_DSA_PARAMS *params = key->params;
@@ -366,14 +369,14 @@ int ossl_ml_dsa_key_public_from_private(ML_DSA_KEY *key)
if (!vector_alloc(&t0, key->params->k)) /* t0 is already in the private key */
return 0;
- ret = ((md_ctx = EVP_MD_CTX_new())!= NULL)
- && ossl_ml_dsa_key_pub_alloc(key) /* allocate space for t1 */
+ ret = ((md_ctx = EVP_MD_CTX_new()) != NULL)
+ && ossl_ml_dsa_key_pub_alloc(key) /* allocate space for t1 */
&& public_from_private(key, md_ctx, &key->t1, &t0)
&& vector_equal(&t0, &key->t0) /* compare the generated t0 to the expected */
&& ossl_ml_dsa_pk_encode(key)
&& shake_xof(md_ctx, key->shake256_md,
- key->pub_encoding, key->params->pk_len,
- key->tr, sizeof(key->tr));
+ key->pub_encoding, key->params->pk_len,
+ key->tr, sizeof(key->tr));
vector_free(&t0);
EVP_MD_CTX_free(md_ctx);
return ret;
@@ -440,7 +443,7 @@ static int keygen_internal(ML_DSA_KEY *out)
augmented_seed[ML_DSA_SEED_BYTES + 1] = (uint8_t)params->l;
/* Expand the seed into p[32], p'[64], K[32] */
if (!shake_xof(md_ctx, out->shake256_md, augmented_seed, sizeof(augmented_seed),
- expanded_seed, sizeof(expanded_seed)))
+ expanded_seed, sizeof(expanded_seed)))
goto err;
memcpy(out->rho, rho, sizeof(out->rho));
@@ -450,7 +453,7 @@ static int keygen_internal(ML_DSA_KEY *out)
&& public_from_private(out, md_ctx, &out->t1, &out->t0)
&& ossl_ml_dsa_pk_encode(out)
&& shake_xof(md_ctx, out->shake256_md, out->pub_encoding, out->params->pk_len,
- out->tr, sizeof(out->tr))
+ out->tr, sizeof(out->tr))
&& ossl_ml_dsa_sk_encode(out);
err:
@@ -486,8 +489,8 @@ int ossl_ml_dsa_generate_key(ML_DSA_KEY *out)
ret = 0;
ossl_ml_dsa_key_reset(out);
ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_KEY,
- "explicit %s private key does not match seed",
- out->params->alg);
+ "explicit %s private key does not match seed",
+ out->params->alg);
}
OPENSSL_free(sk);
}
diff --git a/crypto/ml_dsa/ml_dsa_key.h b/crypto/ml_dsa/ml_dsa_key.h
index 83f93fc9ca..e89bb01ca4 100644
--- a/crypto/ml_dsa/ml_dsa_key.h
+++ b/crypto/ml_dsa/ml_dsa_key.h
@@ -20,8 +20,8 @@ struct ml_dsa_key_st {
EVP_MD *shake256_md;
uint8_t rho[ML_DSA_RHO_BYTES]; /* public random seed */
- uint8_t tr[ML_DSA_TR_BYTES]; /* Pre-cached public key Hash */
- uint8_t K[ML_DSA_K_BYTES]; /* Private random seed for signing */
+ uint8_t tr[ML_DSA_TR_BYTES]; /* Pre-cached public key Hash */
+ uint8_t K[ML_DSA_K_BYTES]; /* Private random seed for signing */
/*
* The encoded public and private keys, these are non NULL if the key
@@ -52,5 +52,5 @@ struct ml_dsa_key_st {
VECTOR t0;
VECTOR s2; /* private secret of size K with short coefficients (-4..4) or (-2..2) */
VECTOR s1; /* private secret of size L with short coefficients (-4..4) or (-2..2) */
- /* The s1->poly block is allocated and has space for s2 and t0 also */
+ /* The s1->poly block is allocated and has space for s2 and t0 also */
};
diff --git a/crypto/ml_dsa/ml_dsa_key_compress.c b/crypto/ml_dsa/ml_dsa_key_compress.c
index fa46f2ba72..3fea03d21b 100644
--- a/crypto/ml_dsa/ml_dsa_key_compress.c
+++ b/crypto/ml_dsa/ml_dsa_key_compress.c
@@ -36,7 +36,7 @@ void ossl_ml_dsa_key_compress_power2_round(uint32_t r, uint32_t *r1, uint32_t *r
unsigned int mask;
uint32_t r0_adjusted, r1_adjusted;
- *r1 = r >> ML_DSA_D_BITS; /* top 13 bits */
+ *r1 = r >> ML_DSA_D_BITS; /* top 13 bits */
*r0 = r - (*r1 << ML_DSA_D_BITS); /* The remainder mod q */
r0_adjusted = mod_sub(*r0, 1 << ML_DSA_D_BITS);
@@ -84,7 +84,7 @@ uint32_t ossl_ml_dsa_key_compress_high_bits(uint32_t r, uint32_t gamma2)
* @param r0 The returned low order bits
*/
void ossl_ml_dsa_key_compress_decompose(uint32_t r, uint32_t gamma2,
- uint32_t *r1, int32_t *r0)
+ uint32_t *r1, int32_t *r0)
{
*r1 = ossl_ml_dsa_key_compress_high_bits(r, gamma2);
@@ -131,13 +131,13 @@ int32_t ossl_ml_dsa_key_compress_low_bits(uint32_t r, uint32_t gamma2)
* @returns The hint bit.
*/
int32_t ossl_ml_dsa_key_compress_make_hint(uint32_t ct0, uint32_t cs2,
- uint32_t gamma2, uint32_t w)
+ uint32_t gamma2, uint32_t w)
{
uint32_t r_plus_z = mod_sub(w, cs2);
uint32_t r = reduce_once(r_plus_z + ct0);
- return ossl_ml_dsa_key_compress_high_bits(r, gamma2)
- != ossl_ml_dsa_key_compress_high_bits(r_plus_z, gamma2);
+ return ossl_ml_dsa_key_compress_high_bits(r, gamma2)
+ != ossl_ml_dsa_key_compress_high_bits(r_plus_z, gamma2);
}
/*
@@ -152,7 +152,7 @@ int32_t ossl_ml_dsa_key_compress_make_hint(uint32_t ct0, uint32_t cs2,
* @returns The adjusted high bits or r.
*/
uint32_t ossl_ml_dsa_key_compress_use_hint(uint32_t hint, uint32_t r,
- uint32_t gamma2)
+ uint32_t gamma2)
{
uint32_t r1;
int32_t r0;
diff --git a/crypto/ml_dsa/ml_dsa_local.h b/crypto/ml_dsa/ml_dsa_local.h
index 3bbe7556e4..d4f63f7e99 100644
--- a/crypto/ml_dsa/ml_dsa_local.h
+++ b/crypto/ml_dsa/ml_dsa_local.h
@@ -8,28 +8,28 @@
*/
#ifndef OSSL_CRYPTO_ML_DSA_LOCAL_H
-# define OSSL_CRYPTO_ML_DSA_LOCAL_H
+#define OSSL_CRYPTO_ML_DSA_LOCAL_H
-# include "crypto/ml_dsa.h"
-# include "internal/constant_time.h"
-# include "internal/packet.h"
+#include "crypto/ml_dsa.h"
+#include "internal/constant_time.h"
+#include "internal/packet.h"
/* The following constants are shared by ML-DSA-44, ML-DSA-65 & ML-DSA-87 */
-# define ML_DSA_Q 8380417 /* The modulus is 23 bits (2^23 - 2^13 + 1) */
-# define ML_DSA_Q_MINUS1_DIV2 ((ML_DSA_Q - 1) / 2)
-
-# define ML_DSA_Q_BITS 23
-# define ML_DSA_Q_INV 58728449 /* q^-1 satisfies: q^-1 * q = 1 mod 2^32 */
-# define ML_DSA_Q_NEG_INV 4236238847 /* Inverse of -q modulo 2^32 */
-# define ML_DSA_DEGREE_INV_MONTGOMERY 41978 /* Inverse of 256 mod q, in Montgomery form. */
-
-# define ML_DSA_D_BITS 13 /* The number of bits dropped from the public vector t */
-# define ML_DSA_NUM_POLY_COEFFICIENTS 256 /* The number of coefficients in the polynomials */
-# define ML_DSA_RHO_BYTES 32 /* p = Public Random Seed */
-# define ML_DSA_PRIV_SEED_BYTES 64 /* p' = Private random seed */
-# define ML_DSA_K_BYTES 32 /* K = Private random seed for signing */
-# define ML_DSA_TR_BYTES 64 /* Size of the Hash of the public key used for signing */
-# define ML_DSA_RHO_PRIME_BYTES 64 /* private random seed size */
+#define ML_DSA_Q 8380417 /* The modulus is 23 bits (2^23 - 2^13 + 1) */
+#define ML_DSA_Q_MINUS1_DIV2 ((ML_DSA_Q - 1) / 2)
+
+#define ML_DSA_Q_BITS 23
+#define ML_DSA_Q_INV 58728449 /* q^-1 satisfies: q^-1 * q = 1 mod 2^32 */
+#define ML_DSA_Q_NEG_INV 4236238847 /* Inverse of -q modulo 2^32 */
+#define ML_DSA_DEGREE_INV_MONTGOMERY 41978 /* Inverse of 256 mod q, in Montgomery form. */
+
+#define ML_DSA_D_BITS 13 /* The number of bits dropped from the public vector t */
+#define ML_DSA_NUM_POLY_COEFFICIENTS 256 /* The number of coefficients in the polynomials */
+#define ML_DSA_RHO_BYTES 32 /* p = Public Random Seed */
+#define ML_DSA_PRIV_SEED_BYTES 64 /* p' = Private random seed */
+#define ML_DSA_K_BYTES 32 /* K = Private random seed for signing */
+#define ML_DSA_TR_BYTES 64 /* Size of the Hash of the public key used for signing */
+#define ML_DSA_RHO_PRIME_BYTES 64 /* private random seed size */
/*
* There is special case code related to encoding/decoding that tests the
@@ -39,20 +39,20 @@
* The possible value for eta - If a new value is added, then all code
* that accesses ML_DSA_ETA_4 would need to be modified.
*/
-# define ML_DSA_ETA_4 4
-# define ML_DSA_ETA_2 2
+#define ML_DSA_ETA_4 4
+#define ML_DSA_ETA_2 2
/*
* The possible values of gamma1 - If a new value is added, then all code
* that accesses ML_DSA_GAMMA1_TWO_POWER_19 would need to be modified.
*/
-# define ML_DSA_GAMMA1_TWO_POWER_19 (1 << 19)
-# define ML_DSA_GAMMA1_TWO_POWER_17 (1 << 17)
+#define ML_DSA_GAMMA1_TWO_POWER_19 (1 << 19)
+#define ML_DSA_GAMMA1_TWO_POWER_17 (1 << 17)
/*
* The possible values for gamma2 - If a new value is added, then all code
* that accesses ML_DSA_GAMMA2_Q_MINUS1_DIV32 would need to be modified.
*/
-# define ML_DSA_GAMMA2_Q_MINUS1_DIV32 ((ML_DSA_Q - 1) / 32)
-# define ML_DSA_GAMMA2_Q_MINUS1_DIV88 ((ML_DSA_Q - 1) / 88)
+#define ML_DSA_GAMMA2_Q_MINUS1_DIV32 ((ML_DSA_Q - 1) / 32)
+#define ML_DSA_GAMMA2_Q_MINUS1_DIV88 ((ML_DSA_Q - 1) / 88)
typedef struct poly_st POLY;
typedef struct vector_st VECTOR;
@@ -60,17 +60,17 @@ typedef struct matrix_st MATRIX;
typedef struct ml_dsa_sig_st ML_DSA_SIG;
int ossl_ml_dsa_matrix_expand_A(EVP_MD_CTX *g_ctx, const EVP_MD *md,
- const uint8_t *rho, MATRIX *out);
+ const uint8_t *rho, MATRIX *out);
int ossl_ml_dsa_vector_expand_S(EVP_MD_CTX *h_ctx, const EVP_MD *md, int eta,
- const uint8_t *seed, VECTOR *s1, VECTOR *s2);
+ const uint8_t *seed, VECTOR *s1, VECTOR *s2);
void ossl_ml_dsa_matrix_mult_vector(const MATRIX *matrix_kl, const VECTOR *vl,
- VECTOR *vk);
+ VECTOR *vk);
int ossl_ml_dsa_poly_expand_mask(POLY *out, const uint8_t *seed, size_t seed_len,
- uint32_t gamma1,
- EVP_MD_CTX *h_ctx, const EVP_MD *md);
+ uint32_t gamma1,
+ EVP_MD_CTX *h_ctx, const EVP_MD *md);
int ossl_ml_dsa_poly_sample_in_ball(POLY *out_c, const uint8_t *seed, int seed_len,
- EVP_MD_CTX *h_ctx, const EVP_MD *md,
- uint32_t tau);
+ EVP_MD_CTX *h_ctx, const EVP_MD *md,
+ uint32_t tau);
void ossl_ml_dsa_poly_ntt(POLY *s);
void ossl_ml_dsa_poly_ntt_inverse(POLY *s);
@@ -79,27 +79,27 @@ void ossl_ml_dsa_poly_ntt_mult(const POLY *lhs, const POLY *rhs, POLY *out);
void ossl_ml_dsa_key_compress_power2_round(uint32_t r, uint32_t *r1, uint32_t *r0);
uint32_t ossl_ml_dsa_key_compress_high_bits(uint32_t r, uint32_t gamma2);
void ossl_ml_dsa_key_compress_decompose(uint32_t r, uint32_t gamma2,
- uint32_t *r1, int32_t *r0);
+ uint32_t *r1, int32_t *r0);
void ossl_ml_dsa_key_compress_decompose(uint32_t r, uint32_t gamma2,
- uint32_t *r1, int32_t *r0);
+ uint32_t *r1, int32_t *r0);
int32_t ossl_ml_dsa_key_compress_low_bits(uint32_t r, uint32_t gamma2);
int32_t ossl_ml_dsa_key_compress_make_hint(uint32_t ct0, uint32_t cs2,
- uint32_t gamma2, uint32_t w);
+ uint32_t gamma2, uint32_t w);
uint32_t ossl_ml_dsa_key_compress_use_hint(uint32_t hint, uint32_t r,
- uint32_t gamma2);
+ uint32_t gamma2);
int ossl_ml_dsa_pk_encode(ML_DSA_KEY *key);
int ossl_ml_dsa_sk_encode(ML_DSA_KEY *key);
int ossl_ml_dsa_sig_encode(const ML_DSA_SIG *sig, const ML_DSA_PARAMS *params,
- uint8_t *out);
+ uint8_t *out);
int ossl_ml_dsa_sig_decode(ML_DSA_SIG *sig, const uint8_t *in, size_t in_len,
- const ML_DSA_PARAMS *params);
+ const ML_DSA_PARAMS *params);
int ossl_ml_dsa_w1_encode(const VECTOR *w1, uint32_t gamma2,
- uint8_t *out, size_t out_len);
+ uint8_t *out, size_t out_len);
int ossl_ml_dsa_poly_decode_expand_mask(POLY *out,
- const uint8_t *in, size_t in_len,
- uint32_t gamma1);
+ const uint8_t *in, size_t in_len,
+ uint32_t gamma1);
/*
* @brief Reduces x mod q in constant time
@@ -145,7 +145,7 @@ static ossl_inline ossl_unused uint32_t abs_signed(uint32_t x)
static ossl_inline ossl_unused uint32_t abs_mod_prime(uint32_t x)
{
return constant_time_select_32(constant_time_lt_32(ML_DSA_Q_MINUS1_DIV2, x),
- ML_DSA_Q - x, x);
+ ML_DSA_Q - x, x);
}
/*
diff --git a/crypto/ml_dsa/ml_dsa_matrix.c b/crypto/ml_dsa/ml_dsa_matrix.c
index 1b892b20c5..c7ff598452 100644
--- a/crypto/ml_dsa/ml_dsa_matrix.c
+++ b/crypto/ml_dsa/ml_dsa_matrix.c
@@ -21,7 +21,7 @@
* @param t 1 * k vector of polynomial results in NTT form
*/
void ossl_ml_dsa_matrix_mult_vector(const MATRIX *a, const VECTOR *s,
- VECTOR *t)
+ VECTOR *t)
{
size_t i, j;
POLY *poly = a->m_poly;
diff --git a/crypto/ml_dsa/ml_dsa_matrix.h b/crypto/ml_dsa/ml_dsa_matrix.h
index 3051563049..0352ecac7a 100644
--- a/crypto/ml_dsa/ml_dsa_matrix.h
+++ b/crypto/ml_dsa/ml_dsa_matrix.h
@@ -38,7 +38,7 @@ matrix_mult_vector(const MATRIX *a, const VECTOR *s, VECTOR *t)
static ossl_inline ossl_unused int
matrix_expand_A(EVP_MD_CTX *g_ctx, const EVP_MD *md, const uint8_t *rho,
- MATRIX *out)
+ MATRIX *out)
{
return ossl_ml_dsa_matrix_expand_A(g_ctx, md, rho, out);
}
diff --git a/crypto/ml_dsa/ml_dsa_ntt.c b/crypto/ml_dsa/ml_dsa_ntt.c
index 9628b12541..2cce462292 100644
--- a/crypto/ml_dsa/ml_dsa_ntt.c
+++ b/crypto/ml_dsa/ml_dsa_ntt.c
@@ -45,37 +45,37 @@
* reduce_montgomery() is defined below..
*/
static const uint32_t zetas_montgomery[256] = {
- 4193792, 25847, 5771523, 7861508, 237124, 7602457, 7504169, 466468,
+ 4193792, 25847, 5771523, 7861508, 237124, 7602457, 7504169, 466468,
1826347, 2353451, 8021166, 6288512, 3119733, 5495562, 3111497, 2680103,
2725464, 1024112, 7300517, 3585928, 7830929, 7260833, 2619752, 6271868,
6262231, 4520680, 6980856, 5102745, 1757237, 8360995, 4010497, 280005,
- 2706023, 95776, 3077325, 3530437, 6718724, 4788269, 5842901, 3915439,
+ 2706023, 95776, 3077325, 3530437, 6718724, 4788269, 5842901, 3915439,
4519302, 5336701, 3574422, 5512770, 3539968, 8079950, 2348700, 7841118,
6681150, 6736599, 3505694, 4558682, 3507263, 6239768, 6779997, 3699596,
- 811944, 531354, 954230, 3881043, 3900724, 5823537, 2071892, 5582638,
+ 811944, 531354, 954230, 3881043, 3900724, 5823537, 2071892, 5582638,
4450022, 6851714, 4702672, 5339162, 6927966, 3475950, 2176455, 6795196,
7122806, 1939314, 4296819, 7380215, 5190273, 5223087, 4747489, 126922,
3412210, 7396998, 2147896, 2715295, 5412772, 4686924, 7969390, 5903370,
7709315, 7151892, 8357436, 7072248, 7998430, 1349076, 1852771, 6949987,
- 5037034, 264944, 508951, 3097992, 44288, 7280319, 904516, 3958618,
- 4656075, 8371839, 1653064, 5130689, 2389356, 8169440, 759969, 7063561,
- 189548, 4827145, 3159746, 6529015, 5971092, 8202977, 1315589, 1341330,
+ 5037034, 264944, 508951, 3097992, 44288, 7280319, 904516, 3958618,
+ 4656075, 8371839, 1653064, 5130689, 2389356, 8169440, 759969, 7063561,
+ 189548, 4827145, 3159746, 6529015, 5971092, 8202977, 1315589, 1341330,
1285669, 6795489, 7567685, 6940675, 5361315, 4499357, 4751448, 3839961,
2091667, 3407706, 2316500, 3817976, 5037939, 2244091, 5933984, 4817955,
- 266997, 2434439, 7144689, 3513181, 4860065, 4621053, 7183191, 5187039,
- 900702, 1859098, 909542, 819034, 495491, 6767243, 8337157, 7857917,
+ 266997, 2434439, 7144689, 3513181, 4860065, 4621053, 7183191, 5187039,
+ 900702, 1859098, 909542, 819034, 495491, 6767243, 8337157, 7857917,
7725090, 5257975, 2031748, 3207046, 4823422, 7855319, 7611795, 4784579,
- 342297, 286988, 5942594, 4108315, 3437287, 5038140, 1735879, 203044,
+ 342297, 286988, 5942594, 4108315, 3437287, 5038140, 1735879, 203044,
2842341, 2691481, 5790267, 1265009, 4055324, 1247620, 2486353, 1595974,
4613401, 1250494, 2635921, 4832145, 5386378, 1869119, 1903435, 7329447,
7047359, 1237275, 5062207, 6950192, 7929317, 1312455, 3306115, 6417775,
- 7100756, 1917081, 5834105, 7005614, 1500165, 777191, 2235880, 3406031,
- 7838005, 5548557, 6709241, 6533464, 5796124, 4656147, 594136, 4603424,
- 6366809, 2432395, 2454455, 8215696, 1957272, 3369112, 185531, 7173032,
- 5196991, 162844, 1616392, 3014001, 810149, 1652634, 4686184, 6581310,
- 5341501, 3523897, 3866901, 269760, 2213111, 7404533, 1717735, 472078,
+ 7100756, 1917081, 5834105, 7005614, 1500165, 777191, 2235880, 3406031,
+ 7838005, 5548557, 6709241, 6533464, 5796124, 4656147, 594136, 4603424,
+ 6366809, 2432395, 2454455, 8215696, 1957272, 3369112, 185531, 7173032,
+ 5196991, 162844, 1616392, 3014001, 810149, 1652634, 4686184, 6581310,
+ 5341501, 3523897, 3866901, 269760, 2213111, 7404533, 1717735, 472078,
7953734, 1723600, 6577327, 1910376, 6712985, 7276084, 8119771, 4546524,
- 5441381, 6144432, 7959518, 6094090, 183443, 7403526, 1612842, 4834730,
+ 5441381, 6144432, 7959518, 6094090, 183443, 7403526, 1612842, 4834730,
7826001, 3919660, 8332111, 7018208, 3937738, 1400424, 7534263, 1976782
};
@@ -113,8 +113,7 @@ void ossl_ml_dsa_poly_ntt_mult(const POLY *lhs, const POLY *rhs, POLY *out)
int i;
for (i = 0; i < ML_DSA_NUM_POLY_COEFFICIENTS; i++)
- out->coeff[i] =
- reduce_montgomery((uint64_t)lhs->coeff[i] * (uint64_t)rhs->coeff[i]);
+ out->coeff[i] = reduce_montgomery((uint64_t)lhs->coeff[i] * (uint64_t)rhs->coeff[i]);
}
/*
@@ -141,9 +140,8 @@ void ossl_ml_dsa_poly_ntt(POLY *p)
for (j = k; j < k + offset; j++) {
uint32_t w_even = p->coeff[j];
- uint32_t t_odd =
- reduce_montgomery((uint64_t)z_step_root
- * (uint64_t)p->coeff[j + offset]);
+ uint32_t t_odd = reduce_montgomery((uint64_t)z_step_root
+ * (uint64_t)p->coeff[j + offset]);
p->coeff[j] = reduce_once(w_even + t_odd);
p->coeff[j + offset] = mod_sub(w_even, t_odd);
@@ -177,22 +175,19 @@ void ossl_ml_dsa_poly_ntt_inverse(POLY *p)
step >>= 1;
k = 0;
for (i = 0; i < step; i++) {
- const uint32_t step_root =
- ML_DSA_Q - zetas_montgomery[step + (step - 1 - i)];
+ const uint32_t step_root = ML_DSA_Q - zetas_montgomery[step + (step - 1 - i)];
for (j = k; j < k + offset; j++) {
uint32_t even = p->coeff[j];
uint32_t odd = p->coeff[j + offset];
p->coeff[j] = reduce_once(odd + even);
- p->coeff[j + offset] =
- reduce_montgomery((uint64_t)step_root
- * (uint64_t)(ML_DSA_Q + even - odd));
+ p->coeff[j + offset] = reduce_montgomery((uint64_t)step_root
+ * (uint64_t)(ML_DSA_Q + even - odd));
}
k += 2 * offset;
}
}
for (i = 0; i < ML_DSA_NUM_POLY_COEFFICIENTS; i++)
- p->coeff[i] = reduce_montgomery((uint64_t)p->coeff[i] *
- (uint64_t)inverse_degree_montgomery);
+ p->coeff[i] = reduce_montgomery((uint64_t)p->coeff[i] * (uint64_t)inverse_degree_montgomery);
}
diff --git a/crypto/ml_dsa/ml_dsa_params.c b/crypto/ml_dsa/ml_dsa_params.c
index 2fd569d5e7..03b3c43f47 100644
--- a/crypto/ml_dsa/ml_dsa_params.c
+++ b/crypto/ml_dsa/ml_dsa_params.c
@@ -43,54 +43,51 @@
static const ML_DSA_PARAMS ml_dsa_params[] = {
{ "ML-DSA-44",
- EVP_PKEY_ML_DSA_44,
- ML_DSA_44_TAU,
- ML_DSA_44_LAMBDA,
- ML_DSA_GAMMA1_TWO_POWER_17,
- ML_DSA_GAMMA2_Q_MINUS1_DIV88,
- ML_DSA_44_K,
- ML_DSA_44_L,
- ML_DSA_44_ETA,
- ML_DSA_44_BETA,
- ML_DSA_44_OMEGA,
- ML_DSA_44_SECURITY_CATEGORY,
- ML_DSA_44_PRIV_LEN,
- ML_DSA_44_PUB_LEN,
- ML_DSA_44_SIG_LEN
- },
+ EVP_PKEY_ML_DSA_44,
+ ML_DSA_44_TAU,
+ ML_DSA_44_LAMBDA,
+ ML_DSA_GAMMA1_TWO_POWER_17,
+ ML_DSA_GAMMA2_Q_MINUS1_DIV88,
+ ML_DSA_44_K,
+ ML_DSA_44_L,
+ ML_DSA_44_ETA,
+ ML_DSA_44_BETA,
+ ML_DSA_44_OMEGA,
+ ML_DSA_44_SECURITY_CATEGORY,
+ ML_DSA_44_PRIV_LEN,
+ ML_DSA_44_PUB_LEN,
+ ML_DSA_44_SIG_LEN },
{ "ML-DSA-65",
- EVP_PKEY_ML_DSA_65,
- ML_DSA_65_TAU,
- ML_DSA_65_LAMBDA,
- ML_DSA_GAMMA1_TWO_POWER_19,
- ML_DSA_GAMMA2_Q_MINUS1_DIV32,
- ML_DSA_65_K,
- ML_DSA_65_L,
- ML_DSA_65_ETA,
- ML_DSA_65_BETA,
- ML_DSA_65_OMEGA,
- ML_DSA_65_SECURITY_CATEGORY,
- ML_DSA_65_PRIV_LEN,
- ML_DSA_65_PUB_LEN,
- ML_DSA_65_SIG_LEN
- },
+ EVP_PKEY_ML_DSA_65,
+ ML_DSA_65_TAU,
+ ML_DSA_65_LAMBDA,
+ ML_DSA_GAMMA1_TWO_POWER_19,
+ ML_DSA_GAMMA2_Q_MINUS1_DIV32,
+ ML_DSA_65_K,
+ ML_DSA_65_L,
+ ML_DSA_65_ETA,
+ ML_DSA_65_BETA,
+ ML_DSA_65_OMEGA,
+ ML_DSA_65_SECURITY_CATEGORY,
+ ML_DSA_65_PRIV_LEN,
+ ML_DSA_65_PUB_LEN,
+ ML_DSA_65_SIG_LEN },
{ "ML-DSA-87",
- EVP_PKEY_ML_DSA_87,
- ML_DSA_87_TAU,
- ML_DSA_87_LAMBDA,
- ML_DSA_GAMMA1_TWO_POWER_19,
- ML_DSA_GAMMA2_Q_MINUS1_DIV32,
- ML_DSA_87_K,
- ML_DSA_87_L,
- ML_DSA_87_ETA,
- ML_DSA_87_BETA,
- ML_DSA_87_OMEGA,
- ML_DSA_87_SECURITY_CATEGORY,
- ML_DSA_87_PRIV_LEN,
- ML_DSA_87_PUB_LEN,
- ML_DSA_87_SIG_LEN
- },
- {NULL},
+ EVP_PKEY_ML_DSA_87,
+ ML_DSA_87_TAU,
+ ML_DSA_87_LAMBDA,
+ ML_DSA_GAMMA1_TWO_POWER_19,
+ ML_DSA_GAMMA2_Q_MINUS1_DIV32,
+ ML_DSA_87_K,
+ ML_DSA_87_L,
+ ML_DSA_87_ETA,
+ ML_DSA_87_BETA,
+ ML_DSA_87_OMEGA,
+ ML_DSA_87_SECURITY_CATEGORY,
+ ML_DSA_87_PRIV_LEN,
+ ML_DSA_87_PUB_LEN,
+ ML_DSA_87_SIG_LEN },
+ { NULL },
};
/**
diff --git a/crypto/ml_dsa/ml_dsa_poly.h b/crypto/ml_dsa/ml_dsa_poly.h
index ad4a41b520..5edc11be80 100644
--- a/crypto/ml_dsa/ml_dsa_poly.h
+++ b/crypto/ml_dsa/ml_dsa_poly.h
@@ -72,7 +72,7 @@ poly_ntt(POLY *p)
static ossl_inline ossl_unused int
poly_sample_in_ball_ntt(POLY *out, const uint8_t *seed, int seed_len,
- EVP_MD_CTX *h_ctx, const EVP_MD *md, uint32_t tau)
+ EVP_MD_CTX *h_ctx, const EVP_MD *md, uint32_t tau)
{
if (!ossl_ml_dsa_poly_sample_in_ball(out, seed, seed_len, h_ctx, md, tau))
return 0;
@@ -82,7 +82,7 @@ poly_sample_in_ball_ntt(POLY *out, const uint8_t *seed, int seed_len,
static ossl_inline ossl_unused int
poly_expand_mask(POLY *out, const uint8_t *seed, size_t seed_len,
- uint32_t gamma1, EVP_MD_CTX *h_ctx, const EVP_MD *md)
+ uint32_t gamma1, EVP_MD_CTX *h_ctx, const EVP_MD *md)
{
return ossl_ml_dsa_poly_expand_mask(out, seed, seed_len, gamma1, h_ctx, md);
}
@@ -105,7 +105,7 @@ poly_power2_round(const POLY *t, POLY *t1, POLY *t0)
for (i = 0; i < ML_DSA_NUM_POLY_COEFFICIENTS; i++)
ossl_ml_dsa_key_compress_power2_round(t->coeff[i],
- t1->coeff + i, t0->coeff + i);
+ t1->coeff + i, t0->coeff + i);
}
static ossl_inline ossl_unused void
@@ -137,14 +137,14 @@ poly_low_bits(const POLY *in, uint32_t gamma2, POLY *out)
static ossl_inline ossl_unused void
poly_make_hint(const POLY *ct0, const POLY *cs2, const POLY *w, uint32_t gamma2,
- POLY *out)
+ POLY *out)
{
int i;
for (i = 0; i < ML_DSA_NUM_POLY_COEFFICIENTS; i++)
out->coeff[i] = ossl_ml_dsa_key_compress_make_hint(ct0->coeff[i],
- cs2->coeff[i],
- gamma2, w->coeff[i]);
+ cs2->coeff[i],
+ gamma2, w->coeff[i]);
}
static ossl_inline ossl_unused void
@@ -154,7 +154,7 @@ poly_use_hint(const POLY *h, const POLY *r, uint32_t gamma2, POLY *out)
for (i = 0; i < ML_DSA_NUM_POLY_COEFFICIENTS; i++)
out->coeff[i] = ossl_ml_dsa_key_compress_use_hint(h->coeff[i],
- r->coeff[i], gamma2);
+ r->coeff[i], gamma2);
}
static ossl_inline ossl_unused void
diff --git a/crypto/ml_dsa/ml_dsa_sample.c b/crypto/ml_dsa/ml_dsa_sample.c
index 82fcb63e49..6fae4c4a0d 100644
--- a/crypto/ml_dsa/ml_dsa_sample.c
+++ b/crypto/ml_dsa/ml_dsa_sample.c
@@ -26,10 +26,10 @@
#define MOD5(n) ((n) - 5 * (0x3335 * (n) >> 16))
#if SHAKE128_BLOCKSIZE % 3 != 0
-# error "rej_ntt_poly() requires SHAKE128_BLOCKSIZE to be a multiple of 3"
+#error "rej_ntt_poly() requires SHAKE128_BLOCKSIZE to be a multiple of 3"
#endif
-typedef int (COEFF_FROM_NIBBLE_FUNC)(uint32_t nibble, uint32_t *out);
+typedef int(COEFF_FROM_NIBBLE_FUNC)(uint32_t nibble, uint32_t *out);
static COEFF_FROM_NIBBLE_FUNC coeff_from_nibble_4;
static COEFF_FROM_NIBBLE_FUNC coeff_from_nibble_2;
@@ -114,7 +114,7 @@ static ossl_inline int coeff_from_nibble_2(uint32_t nibble, uint32_t *out)
* digest operations failed.
*/
static int rej_ntt_poly(EVP_MD_CTX *g_ctx, const EVP_MD *md,
- const uint8_t *seed, size_t seed_len, POLY *out)
+ const uint8_t *seed, size_t seed_len, POLY *out)
{
int j = 0;
uint8_t blocks[SHAKE128_BLOCKSIZE], *b, *end = blocks + sizeof(blocks);
@@ -130,7 +130,7 @@ static int rej_ntt_poly(EVP_MD_CTX *g_ctx, const EVP_MD *md,
for (b = blocks; b < end; b += 3) {
if (coeff_from_three_bytes(b, &(out->coeff[j]))) {
if (++j >= ML_DSA_NUM_POLY_COEFFICIENTS)
- return 1; /* finished */
+ return 1; /* finished */
}
}
if (!EVP_DigestSqueeze(g_ctx, blocks, sizeof(blocks)))
@@ -156,8 +156,8 @@ static int rej_ntt_poly(EVP_MD_CTX *g_ctx, const EVP_MD *md,
* digest operations failed.
*/
static int rej_bounded_poly(EVP_MD_CTX *h_ctx, const EVP_MD *md,
- COEFF_FROM_NIBBLE_FUNC *coef_from_nibble,
- const uint8_t *seed, size_t seed_len, POLY *out)
+ COEFF_FROM_NIBBLE_FUNC *coef_from_nibble,
+ const uint8_t *seed, size_t seed_len, POLY *out)
{
int j = 0;
uint32_t z0, z1;
@@ -170,13 +170,13 @@ static int rej_bounded_poly(EVP_MD_CTX *h_ctx, const EVP_MD *md,
while (1) {
for (b = blocks; b < end; b++) {
z0 = *b & 0x0F; /* lower nibble of byte */
- z1 = *b >> 4; /* high nibble of byte */
+ z1 = *b >> 4; /* high nibble of byte */
if (coef_from_nibble(z0, &out->coeff[j])
- && ++j >= ML_DSA_NUM_POLY_COEFFICIENTS)
+ && ++j >= ML_DSA_NUM_POLY_COEFFICIENTS)
return 1;
if (coef_from_nibble(z1, &out->coeff[j])
- && ++j >= ML_DSA_NUM_POLY_COEFFICIENTS)
+ && ++j >= ML_DSA_NUM_POLY_COEFFICIENTS)
return 1;
}
if (!EVP_DigestSqueeze(h_ctx, blocks, sizeof(blocks)))
@@ -198,7 +198,7 @@ static int rej_bounded_poly(EVP_MD_CTX *h_ctx, const EVP_MD *md,
* @returns 1 if the matrix was generated, or 0 on error.
*/
int ossl_ml_dsa_matrix_expand_A(EVP_MD_CTX *g_ctx, const EVP_MD *md,
- const uint8_t *rho, MATRIX *out)
+ const uint8_t *rho, MATRIX *out)
{
int ret = 0;
size_t i, j;
@@ -241,7 +241,7 @@ err:
* @returns 1 if s1 and s2 were successfully generated, or 0 otherwise.
*/
int ossl_ml_dsa_vector_expand_S(EVP_MD_CTX *h_ctx, const EVP_MD *md, int eta,
- const uint8_t *seed, VECTOR *s1, VECTOR *s2)
+ const uint8_t *seed, VECTOR *s1, VECTOR *s2)
{
int ret = 0;
size_t i;
@@ -262,13 +262,13 @@ int ossl_ml_dsa_vector_expand_S(EVP_MD_CTX *h_ctx, const EVP_MD *md, int eta,
for (i = 0; i < l; i++) {
if (!rej_bounded_poly(h_ctx, md, coef_from_nibble_fn,
- derived_seed, sizeof(derived_seed), &s1->poly[i]))
+ derived_seed, sizeof(derived_seed), &s1->poly[i]))
goto err;
++derived_seed[ML_DSA_PRIV_SEED_BYTES];
}
for (i = 0; i < k; i++) {
if (!rej_bounded_poly(h_ctx, md, coef_from_nibble_fn,
- derived_seed, sizeof(derived_seed), &s2->poly[i]))
+ derived_seed, sizeof(derived_seed), &s2->poly[i]))
goto err;
++derived_seed[ML_DSA_PRIV_SEED_BYTES];
}
@@ -279,8 +279,8 @@ err:
/* See FIPS 204, Algorithm 34, ExpandMask(), Step 4 & 5 */
int ossl_ml_dsa_poly_expand_mask(POLY *out, const uint8_t *seed, size_t seed_len,
- uint32_t gamma1,
- EVP_MD_CTX *h_ctx, const EVP_MD *md)
+ uint32_t gamma1,
+ EVP_MD_CTX *h_ctx, const EVP_MD *md)
{
uint8_t buf[32 * 20];
size_t buf_len = 32 * (gamma1 == ML_DSA_GAMMA1_TWO_POWER_19 ? 20 : 18);
@@ -304,8 +304,8 @@ int ossl_ml_dsa_poly_expand_mask(POLY *out, const uint8_t *seed, size_t seed_len
* that is less than or equal to 64
*/
int ossl_ml_dsa_poly_sample_in_ball(POLY *out_c, const uint8_t *seed, int seed_len,
- EVP_MD_CTX *h_ctx, const EVP_MD *md,
- uint32_t tau)
+ EVP_MD_CTX *h_ctx, const EVP_MD *md,
+ uint32_t tau)
{
uint8_t block[SHAKE256_BLOCKSIZE];
uint64_t signs;
diff --git a/crypto/ml_dsa/ml_dsa_sign.c b/crypto/ml_dsa/ml_dsa_sign.c
index 599897bab9..21946ab2be 100644
--- a/crypto/ml_dsa/ml_dsa_sign.c
+++ b/crypto/ml_dsa/ml_dsa_sign.c
@@ -36,8 +36,8 @@
* @param c_tilde_len The size of |c_tilde|
*/
static void signature_init(ML_DSA_SIG *sig,
- POLY *hint, uint32_t k, POLY *z, uint32_t l,
- uint8_t *c_tilde, size_t c_tilde_len)
+ POLY *hint, uint32_t k, POLY *z, uint32_t l,
+ uint8_t *c_tilde, size_t c_tilde_len)
{
vector_init(&sig->z, z, l);
vector_init(&sig->hint, hint, k);
@@ -67,7 +67,7 @@ static void signature_init(ML_DSA_SIG *sig,
*/
EVP_MD_CTX *ossl_ml_dsa_mu_init(const ML_DSA_KEY *key, int encode,
- const uint8_t *ctx, size_t ctx_len)
+ const uint8_t *ctx, size_t ctx_len)
{
EVP_MD_CTX *md_ctx;
uint8_t itb[2];
@@ -153,9 +153,9 @@ int ossl_ml_dsa_mu_finalize(EVP_MD_CTX *md_ctx, uint8_t *mu, size_t mu_len)
* @returns 1 on success, 0 on error
*/
static int ml_dsa_sign_internal(const ML_DSA_KEY *priv,
- const uint8_t *mu, size_t mu_len,
- const uint8_t *rnd, size_t rnd_len,
- uint8_t *out_sig)
+ const uint8_t *mu, size_t mu_len,
+ const uint8_t *rnd, size_t rnd_len,
+ uint8_t *out_sig)
{
int ret = 0;
const ML_DSA_PARAMS *params = priv->params;
@@ -188,8 +188,7 @@ static int ml_dsa_sign_internal(const ML_DSA_KEY *priv,
*/
w1_encoded_len = k * (gamma2 == ML_DSA_GAMMA2_Q_MINUS1_DIV88 ? 192 : 128);
alloc_len = w1_encoded_len
- + sizeof(*p) * (1 + num_polys_k + num_polys_l
- + num_polys_k_by_l + num_polys_sig_k);
+ + sizeof(*p) * (1 + num_polys_k + num_polys_l + num_polys_k_by_l + num_polys_sig_k);
alloc = OPENSSL_malloc(alloc_len);
if (alloc == NULL)
return 0;
@@ -220,8 +219,8 @@ static int ml_dsa_sign_internal(const ML_DSA_KEY *priv,
goto err;
if (!shake_xof_3(md_ctx, priv->shake256_md, priv->K, sizeof(priv->K),
- rnd, rnd_len, mu, mu_len,
- rho_prime, sizeof(rho_prime)))
+ rnd, rnd_len, mu, mu_len,
+ rho_prime, sizeof(rho_prime)))
goto err;
vector_copy(&s1_ntt, &priv->s1);
@@ -235,14 +234,14 @@ static int ml_dsa_sign_internal(const ML_DSA_KEY *priv,
* kappa must not exceed 2^16. But the probability of it
* exceeding even 1000 iterations is vanishingly small.
*/
- for (kappa = 0; ; kappa += l) {
+ for (kappa = 0;; kappa += l) {
VECTOR *y_ntt = &cs1;
VECTOR *r0 = &w1;
VECTOR *ct0 = &w1;
uint32_t z_max, r0_max, ct0_max, h_ones;
vector_expand_mask(&y, rho_prime, sizeof(rho_prime), (uint32_t)kappa,
- gamma1, md_ctx, priv->shake256_md);
+ gamma1, md_ctx, priv->shake256_md);
vector_copy(y_ntt, &y);
vector_ntt(y_ntt);
@@ -253,11 +252,11 @@ static int ml_dsa_sign_internal(const ML_DSA_KEY *priv,
ossl_ml_dsa_w1_encode(&w1, gamma2, w1_encoded, w1_encoded_len);
if (!shake_xof_2(md_ctx, priv->shake256_md, mu, mu_len,
- w1_encoded, w1_encoded_len, c_tilde, c_tilde_len))
+ w1_encoded, w1_encoded_len, c_tilde, c_tilde_len))
break;
if (!poly_sample_in_ball_ntt(c_ntt, c_tilde, (int)c_tilde_len,
- md_ctx, priv->shake256_md, params->tau))
+ md_ctx, priv->shake256_md, params->tau))
break;
vector_mult_scalar(&s1_ntt, c_ntt, &cs1);
@@ -278,7 +277,7 @@ static int ml_dsa_sign_internal(const ML_DSA_KEY *priv,
z_max = vector_max(&sig.z);
r0_max = vector_max_signed(r0);
if (value_barrier_32(constant_time_ge(z_max, gamma1 - params->beta)
- | constant_time_ge(r0_max, gamma2 - params->beta)))
+ | constant_time_ge(r0_max, gamma2 - params->beta)))
continue;
vector_mult_scalar(&t0_ntt, c_ntt, ct0);
@@ -289,7 +288,7 @@ static int ml_dsa_sign_internal(const ML_DSA_KEY *priv,
h_ones = (uint32_t)vector_count_ones(&sig.hint);
/* Same reasoning applies to the leak as above */
if (value_barrier_32(constant_time_ge(ct0_max, gamma2)
- | constant_time_lt(params->omega, h_ones)))
+ | constant_time_lt(params->omega, h_ones)))
continue;
ret = ossl_ml_dsa_sig_encode(&sig, params, out_sig);
break;
@@ -315,9 +314,9 @@ err:
* @returns 1 on success, 0 on error
*/
static int ml_dsa_verify_internal(const ML_DSA_KEY *pub,
- const uint8_t *mu, size_t mu_len,
- const uint8_t *sig_enc,
- size_t sig_enc_len)
+ const uint8_t *mu, size_t mu_len,
+ const uint8_t *sig_enc,
+ size_t sig_enc_len)
{
int ret = 0;
uint8_t *alloc = NULL, *w1_encoded;
@@ -346,14 +345,10 @@ static int ml_dsa_verify_internal(const ML_DSA_KEY *pub,
return 0;
}
-
/* Allocate space for all the POLYNOMIALS used by temporary VECTORS */
w1_encoded_len = k * (gamma2 == ML_DSA_GAMMA2_Q_MINUS1_DIV88 ? 192 : 128);
alloc = OPENSSL_malloc(w1_encoded_len
- + sizeof(*p) * (1 + num_polys_k
- + num_polys_l
- + num_polys_k_by_l
- + num_polys_sig));
+ + sizeof(*p) * (1 + num_polys_k + num_polys_l + num_polys_k_by_l + num_polys_sig));
if (alloc == NULL)
return 0;
md_ctx = EVP_MD_CTX_new();
@@ -372,12 +367,12 @@ static int ml_dsa_verify_internal(const ML_DSA_KEY *pub,
vector_init(&ct1_ntt, p + k, k);
if (!ossl_ml_dsa_sig_decode(&sig, sig_enc, sig_enc_len, pub->params)
- || !matrix_expand_A(md_ctx, pub->shake128_md, pub->rho, &a_ntt))
+ || !matrix_expand_A(md_ctx, pub->shake128_md, pub->rho, &a_ntt))
goto err;
/* Compute verifiers challenge c_ntt = NTT(SampleInBall(c_tilde)) */
if (!poly_sample_in_ball_ntt(c_ntt, c_tilde_sig, (int)c_tilde_len,
- md_ctx, pub->shake256_md, params->tau))
+ md_ctx, pub->shake256_md, params->tau))
goto err;
/* ct1_ntt = NTT(c) * NTT(t1 * 2^d) */
@@ -401,7 +396,7 @@ static int ml_dsa_verify_internal(const ML_DSA_KEY *pub,
ossl_ml_dsa_w1_encode(w1, gamma2, w1_encoded, w1_encoded_len);
if (!shake_xof_3(md_ctx, pub->shake256_md, mu, mu_len,
- w1_encoded, w1_encoded_len, NULL, 0, c_tilde, c_tilde_len))
+ w1_encoded, w1_encoded_len, NULL, 0, c_tilde, c_tilde_len))
goto err;
ret = (z_max < (uint32_t)(params->gamma1 - params->beta))
@@ -418,10 +413,10 @@ err:
* @returns 1 on success, or 0 on error.
*/
int ossl_ml_dsa_sign(const ML_DSA_KEY *priv, int msg_is_mu,
- const uint8_t *msg, size_t msg_len,
- const uint8_t *context, size_t context_len,
- const uint8_t *rand, size_t rand_len, int encode,
- unsigned char *sig, size_t *sig_len, size_t sig_size)
+ const uint8_t *msg, size_t msg_len,
+ const uint8_t *context, size_t context_len,
+ const uint8_t *rand, size_t rand_len, int encode,
+ unsigned char *sig, size_t *sig_len, size_t sig_size)
{
EVP_MD_CTX *md_ctx = NULL;
uint8_t mu[ML_DSA_MU_BYTES];
@@ -468,9 +463,9 @@ err:
* @returns 1 on success, or 0 on error.
*/
int ossl_ml_dsa_verify(const ML_DSA_KEY *pub, int msg_is_mu,
- const uint8_t *msg, size_t msg_len,
- const uint8_t *context, size_t context_len, int encode,
- const uint8_t *sig, size_t sig_len)
+ const uint8_t *msg, size_t msg_len,
+ const uint8_t *context, size_t context_len, int encode,
+ const uint8_t *sig, size_t sig_len)
{
EVP_MD_CTX *md_ctx = NULL;
uint8_t mu[ML_DSA_MU_BYTES];
diff --git a/crypto/ml_dsa/ml_dsa_vector.h b/crypto/ml_dsa/ml_dsa_vector.h
index bcb638d0c6..b68a4d95d0 100644
--- a/crypto/ml_dsa/ml_dsa_vector.h
+++ b/crypto/ml_dsa/ml_dsa_vector.h
@@ -23,15 +23,13 @@ struct vector_st {
* does not own/free this.
* @param num_polys The number of |polys| blocks (k or l)
*/
-static ossl_inline ossl_unused
-void vector_init(VECTOR *v, POLY *polys, size_t num_polys)
+static ossl_inline ossl_unused void vector_init(VECTOR *v, POLY *polys, size_t num_polys)
{
v->poly = polys;
v->num_poly = num_polys;
}
-static ossl_inline ossl_unused
-int vector_alloc(VECTOR *v, size_t num_polys)
+static ossl_inline ossl_unused int vector_alloc(VECTOR *v, size_t num_polys)
{
v->poly = OPENSSL_malloc_array(num_polys, sizeof(POLY));
if (v->poly == NULL)
@@ -40,8 +38,7 @@ int vector_alloc(VECTOR *v, size_t num_polys)
return 1;
}
-static ossl_inline ossl_unused
-int vector_secure_alloc(VECTOR *v, size_t num_polys)
+static ossl_inline ossl_unused int vector_secure_alloc(VECTOR *v, size_t num_polys)
{
v->poly = OPENSSL_secure_malloc_array(num_polys, sizeof(POLY));
if (v->poly == NULL)
@@ -50,16 +47,14 @@ int vector_secure_alloc(VECTOR *v, size_t num_polys)
return 1;
}
-static ossl_inline ossl_unused
-void vector_free(VECTOR *v)
+static ossl_inline ossl_unused void vector_free(VECTOR *v)
{
OPENSSL_free(v->poly);
v->poly = NULL;
v->num_poly = 0;
}
-static ossl_inline ossl_unused
-void vector_secure_free(VECTOR *v, size_t rank)
+static ossl_inline ossl_unused void vector_secure_free(VECTOR *v, size_t rank)
{
OPENSSL_secure_clear_free(v->poly, rank * sizeof(POLY));
v->poly = NULL;
@@ -67,8 +62,7 @@ void vector_secure_free(VECTOR *v, size_t rank)
}
/* @brief zeroize a vectors polynomial coefficients */
-static ossl_inline ossl_unused
-void vector_zero(VECTOR *va)
+static ossl_inline ossl_unused void vector_zero(VECTOR *va)
{
if (va->poly != NULL)
memset(va->poly, 0, va->num_poly * sizeof(va->poly[0]));
@@ -152,15 +146,15 @@ vector_mult_scalar(const VECTOR *lhs, const POLY *rhs, VECTOR *out)
static ossl_inline ossl_unused int
vector_expand_S(EVP_MD_CTX *h_ctx, const EVP_MD *md, int eta,
- const uint8_t *seed, VECTOR *s1, VECTOR *s2)
+ const uint8_t *seed, VECTOR *s1, VECTOR *s2)
{
return ossl_ml_dsa_vector_expand_S(h_ctx, md, eta, seed, s1, s2);
}
static ossl_inline ossl_unused void
vector_expand_mask(VECTOR *out, const uint8_t *rho_prime, size_t rho_prime_len,
- uint32_t kappa, uint32_t gamma1,
- EVP_MD_CTX *h_ctx, const EVP_MD *md)
+ uint32_t kappa, uint32_t gamma1,
+ EVP_MD_CTX *h_ctx, const EVP_MD *md)
{
size_t i;
uint8_t derived_seed[ML_DSA_RHO_PRIME_BYTES + 2];
@@ -173,7 +167,7 @@ vector_expand_mask(VECTOR *out, const uint8_t *rho_prime, size_t rho_prime_len,
derived_seed[ML_DSA_RHO_PRIME_BYTES] = index & 0xFF;
derived_seed[ML_DSA_RHO_PRIME_BYTES + 1] = (index >> 8) & 0xFF;
poly_expand_mask(out->poly + i, derived_seed, sizeof(derived_seed),
- gamma1, h_ctx, md);
+ gamma1, h_ctx, md);
}
}
@@ -256,13 +250,13 @@ vector_count_ones(const VECTOR *v)
static ossl_inline ossl_unused void
vector_make_hint(const VECTOR *ct0, const VECTOR *cs2, const VECTOR *w,
- uint32_t gamma2, VECTOR *out)
+ uint32_t gamma2, VECTOR *out)
{
size_t i;
for (i = 0; i < out->num_poly; i++)
poly_make_hint(ct0->poly + i, cs2->poly + i, w->poly + i, gamma2,
- out->poly + i);
+ out->poly + i);
}
static ossl_inline ossl_unused void
diff --git a/crypto/ml_kem/ml_kem.c b/crypto/ml_kem/ml_kem.c
index ec76147331..53952a9116 100644
--- a/crypto/ml_kem/ml_kem.c
+++ b/crypto/ml_kem/ml_kem.c
@@ -20,31 +20,31 @@
#endif
#if ML_KEM_SEED_BYTES != ML_KEM_SHARED_SECRET_BYTES + ML_KEM_RANDOM_BYTES
-# error "ML-KEM keygen seed length != shared secret + random bytes length"
+#error "ML-KEM keygen seed length != shared secret + random bytes length"
#endif
#if ML_KEM_SHARED_SECRET_BYTES != ML_KEM_RANDOM_BYTES
-# error "Invalid unequal lengths of ML-KEM shared secret and random inputs"
+#error "Invalid unequal lengths of ML-KEM shared secret and random inputs"
#endif
#if UINT_MAX < UINT32_MAX
-# error "Unsupported compiler: sizeof(unsigned int) < sizeof(uint32_t)"
+#error "Unsupported compiler: sizeof(unsigned int) < sizeof(uint32_t)"
#endif
/* Handy function-like bit-extraction macros */
-#define bit0(b) ((b) & 1)
-#define bitn(n, b) (((b) >> n) & 1)
+#define bit0(b) ((b) & 1)
+#define bitn(n, b) (((b) >> n) & 1)
/*
* 12 bits are sufficient to losslessly represent values in [0, q-1].
* INVERSE_DEGREE is (n/2)^-1 mod q; used in inverse NTT.
*/
-#define DEGREE ML_KEM_DEGREE
-#define INVERSE_DEGREE (ML_KEM_PRIME - 2 * 13)
-#define LOG2PRIME 12
-#define BARRETT_SHIFT (2 * LOG2PRIME)
+#define DEGREE ML_KEM_DEGREE
+#define INVERSE_DEGREE (ML_KEM_PRIME - 2 * 13)
+#define LOG2PRIME 12
+#define BARRETT_SHIFT (2 * LOG2PRIME)
#ifdef SHA3_BLOCKSIZE
-# define SHAKE128_BLOCKSIZE SHA3_BLOCKSIZE(128)
+#define SHAKE128_BLOCKSIZE SHA3_BLOCKSIZE(128)
#endif
/*
@@ -65,9 +65,9 @@
* |reduce_once|. (David Benjamin, Chromium)
*/
#if 0
-# define constish_time_non_zero(b) (~constant_time_is_zero(b));
+#define constish_time_non_zero(b) (~constant_time_is_zero(b));
#else
-# define constish_time_non_zero(b) (0u - (b))
+#define constish_time_non_zero(b) (0u - (b))
#endif
/*
@@ -80,9 +80,9 @@
* fallback.
*/
#if defined(SHAKE128_BLOCKSIZE) && (SHAKE128_BLOCKSIZE) % 12 == 0
-# define SCALAR_SAMPLING_BUFSIZE (SHAKE128_BLOCKSIZE)
+#define SCALAR_SAMPLING_BUFSIZE (SHAKE128_BLOCKSIZE)
#else
-# define SCALAR_SAMPLING_BUFSIZE 168
+#define SCALAR_SAMPLING_BUFSIZE 168
#endif
/*
@@ -94,22 +94,22 @@ typedef struct ossl_ml_kem_scalar_st {
} scalar;
/* Key material allocation layout */
-#define DECLARE_ML_KEM_PUBKEYDATA(name, rank) \
- struct name##_alloc { \
- /* Public vector |t| */ \
- scalar tbuf[(rank)]; \
+#define DECLARE_ML_KEM_PUBKEYDATA(name, rank) \
+ struct name##_alloc { \
+ /* Public vector |t| */ \
+ scalar tbuf[(rank)]; \
/* Pre-computed matrix |m| (FIPS 203 |A| transpose) */ \
- scalar mbuf[(rank)*(rank)]; \
+ scalar mbuf[(rank) * (rank)]; \
}
-#define DECLARE_ML_KEM_PRVKEYDATA(name, rank) \
- struct name##_alloc { \
- scalar sbuf[rank]; \
+#define DECLARE_ML_KEM_PRVKEYDATA(name, rank) \
+ struct name##_alloc { \
+ scalar sbuf[rank]; \
uint8_t zbuf[2 * ML_KEM_RANDOM_BYTES]; \
}
/* Declare variant-specific public and private storage */
-#define DECLARE_ML_KEM_VARIANT_KEYDATA(bits) \
+#define DECLARE_ML_KEM_VARIANT_KEYDATA(bits) \
DECLARE_ML_KEM_PUBKEYDATA(pubkey_##bits, ML_KEM_##bits##_RANK); \
DECLARE_ML_KEM_PRVKEYDATA(prvkey_##bits, ML_KEM_##bits##_RANK)
@@ -120,9 +120,8 @@ DECLARE_ML_KEM_VARIANT_KEYDATA(1024);
#undef DECLARE_ML_KEM_PUBKEYDATA
#undef DECLARE_ML_KEM_PRVKEYDATA
-typedef __owur
-int (*CBD_FUNC)(scalar *out, uint8_t in[ML_KEM_RANDOM_BYTES + 1],
- EVP_MD_CTX *mdctx, const ML_KEM_KEY *key);
+typedef __owur int (*CBD_FUNC)(scalar *out, uint8_t in[ML_KEM_RANDOM_BYTES + 1],
+ EVP_MD_CTX *mdctx, const ML_KEM_KEY *key);
static void scalar_encode(uint8_t *out, const scalar *s, int bits);
/*
@@ -134,9 +133,9 @@ static void scalar_encode(uint8_t *out, const scalar *s, int bits);
* Our serialised private key concatenates serialisations of the private vector
* |s|, the public key, the public key hash, and the failure secret |z|.
*/
-#define VECTOR_BYTES(b) ((3 * DEGREE / 2) * ML_KEM_##b##_RANK)
-#define PUBKEY_BYTES(b) (VECTOR_BYTES(b) + ML_KEM_RANDOM_BYTES)
-#define PRVKEY_BYTES(b) (2 * PUBKEY_BYTES(b) + ML_KEM_PKHASH_BYTES)
+#define VECTOR_BYTES(b) ((3 * DEGREE / 2) * ML_KEM_##b##_RANK)
+#define PUBKEY_BYTES(b) (VECTOR_BYTES(b) + ML_KEM_RANDOM_BYTES)
+#define PRVKEY_BYTES(b) (2 * PUBKEY_BYTES(b) + ML_KEM_PKHASH_BYTES)
/*
* Encapsulation produces a vector "u" and a scalar "v", whose coordinates
@@ -144,9 +143,9 @@ static void scalar_encode(uint8_t *out, const scalar *s, int bits);
* "dv" bits, respectively. This encoding is the ciphertext input for
* decapsulation.
*/
-#define U_VECTOR_BYTES(b) ((DEGREE / 8) * ML_KEM_##b##_DU * ML_KEM_##b##_RANK)
-#define V_SCALAR_BYTES(b) ((DEGREE / 8) * ML_KEM_##b##_DV)
-#define CTEXT_BYTES(b) (U_VECTOR_BYTES(b) + V_SCALAR_BYTES(b))
+#define U_VECTOR_BYTES(b) ((DEGREE / 8) * ML_KEM_##b##_DU * ML_KEM_##b##_RANK)
+#define V_SCALAR_BYTES(b) ((DEGREE / 8) * ML_KEM_##b##_DV)
+#define CTEXT_BYTES(b) (U_VECTOR_BYTES(b) + V_SCALAR_BYTES(b))
#if defined(OPENSSL_CONSTANT_TIME_VALIDATION)
@@ -156,35 +155,34 @@ static void scalar_encode(uint8_t *out, const scalar *s, int bits);
* other parts of a memory. If secret data is used as a condition for a branch,
* or as a memory index, it will trigger warnings in valgrind.
*/
-# define CONSTTIME_SECRET(ptr, len) VALGRIND_MAKE_MEM_UNDEFINED(ptr, len)
+#define CONSTTIME_SECRET(ptr, len) VALGRIND_MAKE_MEM_UNDEFINED(ptr, len)
/*
* CONSTTIME_DECLASSIFY takes a pointer and a number of bytes and marks that
* region of memory as public. Public data is not subject to constant-time
* rules.
*/
-# define CONSTTIME_DECLASSIFY(ptr, len) VALGRIND_MAKE_MEM_DEFINED(ptr, len)
+#define CONSTTIME_DECLASSIFY(ptr, len) VALGRIND_MAKE_MEM_DEFINED(ptr, len)
#else
-# define CONSTTIME_SECRET(ptr, len)
-# define CONSTTIME_DECLASSIFY(ptr, len)
+#define CONSTTIME_SECRET(ptr, len)
+#define CONSTTIME_DECLASSIFY(ptr, len)
#endif
/*
* Indices of slots in the vinfo tables below
*/
-#define ML_KEM_512_VINFO 0
-#define ML_KEM_768_VINFO 1
-#define ML_KEM_1024_VINFO 2
+#define ML_KEM_512_VINFO 0
+#define ML_KEM_768_VINFO 1
+#define ML_KEM_1024_VINFO 2
/*
* Per-variant fixed parameters
*/
static const ML_KEM_VINFO vinfo_map[3] = {
- {
- "ML-KEM-512",
+ { "ML-KEM-512",
PRVKEY_BYTES(512),
sizeof(struct prvkey_512_alloc),
PUBKEY_BYTES(512),
@@ -198,10 +196,8 @@ static const ML_KEM_VINFO vinfo_map[3] = {
ML_KEM_512_DU,
ML_KEM_512_DV,
ML_KEM_512_SECBITS,
- ML_KEM_512_SECURITY_CATEGORY
- },
- {
- "ML-KEM-768",
+ ML_KEM_512_SECURITY_CATEGORY },
+ { "ML-KEM-768",
PRVKEY_BYTES(768),
sizeof(struct prvkey_768_alloc),
PUBKEY_BYTES(768),
@@ -215,10 +211,8 @@ static const ML_KEM_VINFO vinfo_map[3] = {
ML_KEM_768_DU,
ML_KEM_768_DV,
ML_KEM_768_SECBITS,
- ML_KEM_768_SECURITY_CATEGORY
- },
- {
- "ML-KEM-1024",
+ ML_KEM_768_SECURITY_CATEGORY },
+ { "ML-KEM-1024",
PRVKEY_BYTES(1024),
sizeof(struct prvkey_1024_alloc),
PUBKEY_BYTES(1024),
@@ -232,8 +226,7 @@ static const ML_KEM_VINFO vinfo_map[3] = {
ML_KEM_1024_DU,
ML_KEM_1024_DV,
ML_KEM_1024_SECBITS,
- ML_KEM_1024_SECURITY_CATEGORY
- }
+ ML_KEM_1024_SECURITY_CATEGORY }
};
/*
@@ -243,7 +236,7 @@ static const ML_KEM_VINFO vinfo_map[3] = {
*/
static const int kPrime = ML_KEM_PRIME;
static const unsigned int kBarrettShift = BARRETT_SHIFT;
-static const size_t kBarrettMultiplier = (1 << BARRETT_SHIFT) / ML_KEM_PRIME;
+static const size_t kBarrettMultiplier = (1 << BARRETT_SHIFT) / ML_KEM_PRIME;
static const uint16_t kHalfPrime = (ML_KEM_PRIME - 1) / 2;
static const uint16_t kInverseDegree = INVERSE_DEGREE;
@@ -266,22 +259,134 @@ static const uint16_t kInverseDegree = INVERSE_DEGREE;
* kNTTRoots = [pow(17, bitreverse(i), p) for i in range(128)]
*/
static const uint16_t kNTTRoots[128] = {
- 1, 1729, 2580, 3289, 2642, 630, 1897, 848,
- 1062, 1919, 193, 797, 2786, 3260, 569, 1746,
- 296, 2447, 1339, 1476, 3046, 56, 2240, 1333,
- 1426, 2094, 535, 2882, 2393, 2879, 1974, 821,
- 289, 331, 3253, 1756, 1197, 2304, 2277, 2055,
- 650, 1977, 2513, 632, 2865, 33, 1320, 1915,
- 2319, 1435, 807, 452, 1438, 2868, 1534, 2402,
- 2647, 2617, 1481, 648, 2474, 3110, 1227, 910,
- 17, 2761, 583, 2649, 1637, 723, 2288, 1100,
- 1409, 2662, 3281, 233, 756, 2156, 3015, 3050,
- 1703, 1651, 2789, 1789, 1847, 952, 1461, 2687,
- 939, 2308, 2437, 2388, 733, 2337, 268, 641,
- 1584, 2298, 2037, 3220, 375, 2549, 2090, 1645,
- 1063, 319, 2773, 757, 2099, 561, 2466, 2594,
- 2804, 1092, 403, 1026, 1143, 2150, 2775, 886,
- 1722, 1212, 1874, 1029, 2110, 2935, 885, 2154,
+ 1,
+ 1729,
+ 2580,
+ 3289,
+ 2642,
+ 630,
+ 1897,
+ 848,
+ 1062,
+ 1919,
+ 193,
+ 797,
+ 2786,
+ 3260,
+ 569,
+ 1746,
+ 296,
+ 2447,
+ 1339,
+ 1476,
+ 3046,
+ 56,
+ 2240,
+ 1333,
+ 1426,
+ 2094,
+ 535,
+ 2882,
+ 2393,
+ 2879,
+ 1974,
+ 821,
+ 289,
+ 331,
+ 3253,
+ 1756,
+ 1197,
+ 2304,
+ 2277,
+ 2055,
+ 650,
+ 1977,
+ 2513,
+ 632,
+ 2865,
+ 33,
+ 1320,
+ 1915,
+ 2319,
+ 1435,
+ 807,
+ 452,
+ 1438,
+ 2868,
+ 1534,
+ 2402,
+ 2647,
+ 2617,
+ 1481,
+ 648,
+ 2474,
+ 3110,
+ 1227,
+ 910,
+ 17,
+ 2761,
+ 583,
+ 2649,
+ 1637,
+ 723,
+ 2288,
+ 1100,
+ 1409,
+ 2662,
+ 3281,
+ 233,
+ 756,
+ 2156,
+ 3015,
+ 3050,
+ 1703,
+ 1651,
+ 2789,
+ 1789,
+ 1847,
+ 952,
+ 1461,
+ 2687,
+ 939,
+ 2308,
+ 2437,
+ 2388,
+ 733,
+ 2337,
+ 268,
+ 641,
+ 1584,
+ 2298,
+ 2037,
+ 3220,
+ 375,
+ 2549,
+ 2090,
+ 1645,
+ 1063,
+ 319,
+ 2773,
+ 757,
+ 2099,
+ 561,
+ 2466,
+ 2594,
+ 2804,
+ 1092,
+ 403,
+ 1026,
+ 1143,
+ 2150,
+ 2775,
+ 886,
+ 1722,
+ 1212,
+ 1874,
+ 1029,
+ 2110,
+ 2935,
+ 885,
+ 2154,
};
/*
@@ -291,22 +396,134 @@ static const uint16_t kNTTRoots[128] = {
* 0, 64, 65, ..., 127, 32, 33, ..., 63, 16, 17, ..., 31, 8, 9, ...
*/
static const uint16_t kInverseNTTRoots[128] = {
- 1, 1175, 2444, 394, 1219, 2300, 1455, 2117,
- 1607, 2443, 554, 1179, 2186, 2303, 2926, 2237,
- 525, 735, 863, 2768, 1230, 2572, 556, 3010,
- 2266, 1684, 1239, 780, 2954, 109, 1292, 1031,
- 1745, 2688, 3061, 992, 2596, 941, 892, 1021,
- 2390, 642, 1868, 2377, 1482, 1540, 540, 1678,
- 1626, 279, 314, 1173, 2573, 3096, 48, 667,
- 1920, 2229, 1041, 2606, 1692, 680, 2746, 568,
- 3312, 2419, 2102, 219, 855, 2681, 1848, 712,
- 682, 927, 1795, 461, 1891, 2877, 2522, 1894,
- 1010, 1414, 2009, 3296, 464, 2697, 816, 1352,
- 2679, 1274, 1052, 1025, 2132, 1573, 76, 2998,
- 3040, 2508, 1355, 450, 936, 447, 2794, 1235,
- 1903, 1996, 1089, 3273, 283, 1853, 1990, 882,
- 3033, 1583, 2760, 69, 543, 2532, 3136, 1410,
- 2267, 2481, 1432, 2699, 687, 40, 749, 1600,
+ 1,
+ 1175,
+ 2444,
+ 394,
+ 1219,
+ 2300,
+ 1455,
+ 2117,
+ 1607,
+ 2443,
+ 554,
+ 1179,
+ 2186,
+ 2303,
+ 2926,
+ 2237,
+ 525,
+ 735,
+ 863,
+ 2768,
+ 1230,
+ 2572,
+ 556,
+ 3010,
+ 2266,
+ 1684,
+ 1239,
+ 780,
+ 2954,
+ 109,
+ 1292,
+ 1031,
+ 1745,
+ 2688,
+ 3061,
+ 992,
+ 2596,
+ 941,
+ 892,
+ 1021,
+ 2390,
+ 642,
+ 1868,
+ 2377,
+ 1482,
+ 1540,
+ 540,
+ 1678,
+ 1626,
+ 279,
+ 314,
+ 1173,
+ 2573,
+ 3096,
+ 48,
+ 667,
+ 1920,
+ 2229,
+ 1041,
+ 2606,
+ 1692,
+ 680,
+ 2746,
+ 568,
+ 3312,
+ 2419,
+ 2102,
+ 219,
+ 855,
+ 2681,
+ 1848,
+ 712,
+ 682,
+ 927,
+ 1795,
+ 461,
+ 1891,
+ 2877,
+ 2522,
+ 1894,
+ 1010,
+ 1414,
+ 2009,
+ 3296,
+ 464,
+ 2697,
+ 816,
+ 1352,
+ 2679,
+ 1274,
+ 1052,
+ 1025,
+ 2132,
+ 1573,
+ 76,
+ 2998,
+ 3040,
+ 2508,
+ 1355,
+ 450,
+ 936,
+ 447,
+ 2794,
+ 1235,
+ 1903,
+ 1996,
+ 1089,
+ 3273,
+ 283,
+ 1853,
+ 1990,
+ 882,
+ 3033,
+ 1583,
+ 2760,
+ 69,
+ 543,
+ 2532,
+ 3136,
+ 1410,
+ 2267,
+ 2481,
+ 1432,
+ 2699,
+ 687,
+ 40,
+ 749,
+ 1600,
};
/*
@@ -315,17 +532,134 @@ static const uint16_t kInverseNTTRoots[128] = {
* ModRoots = [pow(17, 2*bitreverse(i) + 1, p) for i in range(128)]
*/
static const uint16_t kModRoots[128] = {
- 17, 3312, 2761, 568, 583, 2746, 2649, 680, 1637, 1692, 723, 2606,
- 2288, 1041, 1100, 2229, 1409, 1920, 2662, 667, 3281, 48, 233, 3096,
- 756, 2573, 2156, 1173, 3015, 314, 3050, 279, 1703, 1626, 1651, 1678,
- 2789, 540, 1789, 1540, 1847, 1482, 952, 2377, 1461, 1868, 2687, 642,
- 939, 2390, 2308, 1021, 2437, 892, 2388, 941, 733, 2596, 2337, 992,
- 268, 3061, 641, 2688, 1584, 1745, 2298, 1031, 2037, 1292, 3220, 109,
- 375, 2954, 2549, 780, 2090, 1239, 1645, 1684, 1063, 2266, 319, 3010,
- 2773, 556, 757, 2572, 2099, 1230, 561, 2768, 2466, 863, 2594, 735,
- 2804, 525, 1092, 2237, 403, 2926, 1026, 2303, 1143, 2186, 2150, 1179,
- 2775, 554, 886, 2443, 1722, 1607, 1212, 2117, 1874, 1455, 1029, 2300,
- 2110, 1219, 2935, 394, 885, 2444, 2154, 1175,
+ 17,
+ 3312,
+ 2761,
+ 568,
+ 583,
+ 2746,
+ 2649,
+ 680,
+ 1637,
+ 1692,
+ 723,
+ 2606,
+ 2288,
+ 1041,
+ 1100,
+ 2229,
+ 1409,
+ 1920,
+ 2662,
+ 667,
+ 3281,
+ 48,
+ 233,
+ 3096,
+ 756,
+ 2573,
+ 2156,
+ 1173,
+ 3015,
+ 314,
+ 3050,
+ 279,
+ 1703,
+ 1626,
+ 1651,
+ 1678,
+ 2789,
+ 540,
+ 1789,
+ 1540,
+ 1847,
+ 1482,
+ 952,
+ 2377,
+ 1461,
+ 1868,
+ 2687,
+ 642,
+ 939,
+ 2390,
+ 2308,
+ 1021,
+ 2437,
+ 892,
+ 2388,
+ 941,
+ 733,
+ 2596,
+ 2337,
+ 992,
+ 268,
+ 3061,
+ 641,
+ 2688,
+ 1584,
+ 1745,
+ 2298,
+ 1031,
+ 2037,
+ 1292,
+ 3220,
+ 109,
+ 375,
+ 2954,
+ 2549,
+ 780,
+ 2090,
+ 1239,
+ 1645,
+ 1684,
+ 1063,
+ 2266,
+ 319,
+ 3010,
+ 2773,
+ 556,
+ 757,
+ 2572,
+ 2099,
+ 1230,
+ 561,
+ 2768,
+ 2466,
+ 863,
+ 2594,
+ 735,
+ 2804,
+ 525,
+ 1092,
+ 2237,
+ 403,
+ 2926,
+ 1026,
+ 2303,
+ 1143,
+ 2186,
+ 2150,
+ 1179,
+ 2775,
+ 554,
+ 886,
+ 2443,
+ 1722,
+ 1607,
+ 1212,
+ 2117,
+ 1874,
+ 1455,
+ 1029,
+ 2300,
+ 2110,
+ 1219,
+ 2935,
+ 394,
+ 885,
+ 2444,
+ 2154,
+ 1175,
};
/*
@@ -333,27 +667,25 @@ static const uint16_t kModRoots[128] = {
* output to |out|. If the |md| specifies a fixed-output function, like
* SHA3-256, then |outlen| must be the correct length for that function.
*/
-static __owur
-int single_keccak(uint8_t *out, size_t outlen, const uint8_t *in, size_t inlen,
- EVP_MD_CTX *mdctx)
+static __owur int single_keccak(uint8_t *out, size_t outlen, const uint8_t *in, size_t inlen,
+ EVP_MD_CTX *mdctx)
{
- unsigned int sz = (unsigned int) outlen;
+ unsigned int sz = (unsigned int)outlen;
if (!EVP_DigestUpdate(mdctx, in, inlen))
return 0;
if (EVP_MD_xof(EVP_MD_CTX_get0_md(mdctx)))
return EVP_DigestFinalXOF(mdctx, out, outlen);
return EVP_DigestFinal_ex(mdctx, out, &sz)
- && ossl_assert((size_t) sz == outlen);
+ && ossl_assert((size_t)sz == outlen);
}
/*
* FIPS 203, Section 4.1, equation (4.3): PRF. Takes 32+1 input bytes, and uses
* SHAKE256 to produce the input to SamplePolyCBD_eta: FIPS 203, algorithm 8.
*/
-static __owur
-int prf(uint8_t *out, size_t len, const uint8_t in[ML_KEM_RANDOM_BYTES + 1],
- EVP_MD_CTX *mdctx, const ML_KEM_KEY *key)
+static __owur int prf(uint8_t *out, size_t len, const uint8_t in[ML_KEM_RANDOM_BYTES + 1],
+ EVP_MD_CTX *mdctx, const ML_KEM_KEY *key)
{
return EVP_DigestInit_ex(mdctx, key->shake256_md, NULL)
&& single_keccak(out, len, in, ML_KEM_RANDOM_BYTES + 1, mdctx);
@@ -363,9 +695,8 @@ int prf(uint8_t *out, size_t len, const uint8_t in[ML_KEM_RANDOM_BYTES + 1],
* FIPS 203, Section 4.1, equation (4.4): H. SHA3-256 hash of a variable
* length input, producing 32 bytes of output.
*/
-static __owur
-int hash_h(uint8_t out[ML_KEM_PKHASH_BYTES], const uint8_t *in, size_t len,
- EVP_MD_CTX *mdctx, const ML_KEM_KEY *key)
+static __owur int hash_h(uint8_t out[ML_KEM_PKHASH_BYTES], const uint8_t *in, size_t len,
+ EVP_MD_CTX *mdctx, const ML_KEM_KEY *key)
{
return EVP_DigestInit_ex(mdctx, key->sha3_256_md, NULL)
&& single_keccak(out, ML_KEM_PKHASH_BYTES, in, len, mdctx);
@@ -374,7 +705,7 @@ int hash_h(uint8_t out[ML_KEM_PKHASH_BYTES], const uint8_t *in, size_t len,
/* Incremental hash_h of expanded public key */
static int
hash_h_pubkey(uint8_t pkhash[ML_KEM_PKHASH_BYTES],
- EVP_MD_CTX *mdctx, ML_KEM_KEY *key)
+ EVP_MD_CTX *mdctx, ML_KEM_KEY *key)
{
const ML_KEM_VINFO *vinfo = key->vinfo;
const scalar *t = key->t, *end = t + vinfo->rank;
@@ -402,9 +733,8 @@ hash_h_pubkey(uint8_t pkhash[ML_KEM_PKHASH_BYTES],
* length input, producing 64 bytes of output, in particular the seeds
* (d,z) for key generation.
*/
-static __owur
-int hash_g(uint8_t out[ML_KEM_SEED_BYTES], const uint8_t *in, size_t len,
- EVP_MD_CTX *mdctx, const ML_KEM_KEY *key)
+static __owur int hash_g(uint8_t out[ML_KEM_SEED_BYTES], const uint8_t *in, size_t len,
+ EVP_MD_CTX *mdctx, const ML_KEM_KEY *key)
{
return EVP_DigestInit_ex(mdctx, key->sha3_512_md, NULL)
&& single_keccak(out, ML_KEM_SEED_BYTES, in, len, mdctx);
@@ -416,11 +746,10 @@ int hash_g(uint8_t out[ML_KEM_SEED_BYTES], const uint8_t *in, size_t len,
* length as the expected shared secret. (Computed even on success to avoid
* side-channel leaks).
*/
-static __owur
-int kdf(uint8_t out[ML_KEM_SHARED_SECRET_BYTES],
- const uint8_t z[ML_KEM_RANDOM_BYTES],
- const uint8_t *ctext, size_t len,
- EVP_MD_CTX *mdctx, const ML_KEM_KEY *key)
+static __owur int kdf(uint8_t out[ML_KEM_SHARED_SECRET_BYTES],
+ const uint8_t z[ML_KEM_RANDOM_BYTES],
+ const uint8_t *ctext, size_t len,
+ EVP_MD_CTX *mdctx, const ML_KEM_KEY *key)
{
return EVP_DigestInit_ex(mdctx, key->shake256_md, NULL)
&& EVP_DigestUpdate(mdctx, z, ML_KEM_RANDOM_BYTES)
@@ -434,8 +763,7 @@ int kdf(uint8_t out[ML_KEM_SHARED_SECRET_BYTES],
* uniformly distributed elements in the range [0,q). This is used for matrix
* expansion and only operates on public inputs.
*/
-static __owur
-int sample_scalar(scalar *out, EVP_MD_CTX *mdctx)
+static __owur int sample_scalar(scalar *out, EVP_MD_CTX *mdctx)
{
uint16_t *curr = out->c, *endout = curr + DEGREE;
uint8_t buf[SCALAR_SAMPLING_BUFSIZE], *in;
@@ -601,7 +929,7 @@ static void scalar_sub(scalar *lhs, const scalar *rhs)
* even if an uint64_t could hold 3 multiplied numbers.
*/
static void scalar_mult(scalar *out, const scalar *lhs,
- const scalar *rhs)
+ const scalar *rhs)
{
uint16_t *curr = out->c, *end = curr + DEGREE;
const uint16_t *lc = lhs->c, *rc = rhs->c;
@@ -618,9 +946,8 @@ static void scalar_mult(scalar *out, const scalar *lhs,
}
/* Above, but add the result to an existing scalar */
-static ossl_inline
-void scalar_mult_add(scalar *out, const scalar *lhs,
- const scalar *rhs)
+static ossl_inline void scalar_mult_add(scalar *out, const scalar *lhs,
+ const scalar *rhs)
{
uint16_t *curr = out->c, *end = curr + DEGREE;
const uint16_t *lc = lhs->c, *rc = rhs->c;
@@ -695,7 +1022,7 @@ static void scalar_decode(scalar *out, const uint8_t *in, int bits)
uint16_t *curr = out->c, *end = curr + DEGREE;
uint64_t accum = 0;
int accum_bits = 0, todo = bits;
- uint16_t bitmask = (((uint16_t) 1) << bits) - 1, mask = bitmask;
+ uint16_t bitmask = (((uint16_t)1) << bits) - 1, mask = bitmask;
uint16_t element = 0;
do {
@@ -705,12 +1032,12 @@ static void scalar_decode(scalar *out, const uint8_t *in, int bits)
}
if (todo == bits && accum_bits >= bits) {
/* No partial "element", and all the required bits available */
- *curr++ = ((uint16_t) accum) & mask;
+ *curr++ = ((uint16_t)accum) & mask;
accum >>= bits;
accum_bits -= bits;
} else if (accum_bits >= todo) {
/* A partial "element", and all the required bits available */
- *curr++ = element | ((((uint16_t) accum) & mask) << (bits - todo));
+ *curr++ = element | ((((uint16_t)accum) & mask) << (bits - todo));
accum >>= todo;
accum_bits -= todo;
element = 0;
@@ -727,7 +1054,7 @@ static void scalar_decode(scalar *out, const uint8_t *in, int bits)
* less, if we're here, the previous iteration had all the
* requisite bits, and so there are no kept bits in |element|.
*/
- element = ((uint16_t) accum) & mask;
+ element = ((uint16_t)accum) & mask;
todo -= accum_bits;
mask = bitmask >> accum_bits;
accum_bits = 0;
@@ -735,8 +1062,7 @@ static void scalar_decode(scalar *out, const uint8_t *in, int bits)
} while (curr < end);
}
-static __owur
-int scalar_decode_12(scalar *out, const uint8_t in[3 * DEGREE / 2])
+static __owur int scalar_decode_12(scalar *out, const uint8_t in[3 * DEGREE / 2])
{
int i;
uint16_t *c = out->c;
@@ -779,11 +1105,11 @@ scalar_decode_decompress_add(scalar *out, const uint8_t in[DEGREE / 8])
* avoiding the "clangover" attack. See |constish_time_non_zero| for a
* discussion on why the value barrier is by default omitted.
*/
-#define decode_decompress_add_bit \
- mask = constish_time_non_zero(bit0(b)); \
- *curr = reduce_once(*curr + (mask & half_q_plus_1)); \
- curr++; \
- b >>= 1
+#define decode_decompress_add_bit \
+ mask = constish_time_non_zero(bit0(b)); \
+ *curr = reduce_once(*curr + (mask & half_q_plus_1)); \
+ curr++; \
+ b >>= 1
/* Unrolled to process each byte in one iteration */
do {
@@ -921,8 +1247,7 @@ vector_decode_decompress_ntt(scalar *out, const uint8_t *in, int bits, int rank)
}
/* vector_decode(), specialised to bits == 12. */
-static __owur
-int vector_decode_12(scalar *out, const uint8_t in[3 * DEGREE / 2], int rank)
+static __owur int vector_decode_12(scalar *out, const uint8_t in[3 * DEGREE / 2], int rank)
{
int stride = 3 * DEGREE / 2;
@@ -942,7 +1267,7 @@ static void vector_compress(scalar *a, int bits, int rank)
/* The output scalar must not overlap with the inputs */
static void inner_product(scalar *out, const scalar *lhs, const scalar *rhs,
- int rank)
+ int rank)
{
scalar_mult(out, lhs, rhs);
while (--rank > 0)
@@ -976,7 +1301,7 @@ matrix_mult_transpose_add(scalar *out, const scalar *m, const scalar *a, int ran
for (i = rank; i-- > 0; ++out) {
scalar_mult_add(out, mr = mc++, ar = a);
- for (j = rank; --j > 0; )
+ for (j = rank; --j > 0;)
scalar_mult_add(out, (mr += rank), ++ar);
}
}
@@ -988,8 +1313,7 @@ matrix_mult_transpose_add(scalar *out, const scalar *m, const scalar *a, int ran
*
* Where FIPS 203 computes t = A * s + e, we use the transpose of "m".
*/
-static __owur
-int matrix_expand(EVP_MD_CTX *mdctx, ML_KEM_KEY *key)
+static __owur int matrix_expand(EVP_MD_CTX *mdctx, ML_KEM_KEY *key)
{
scalar *out = key->m;
uint8_t input[ML_KEM_RANDOM_BYTES + 2];
@@ -1018,12 +1342,11 @@ int matrix_expand(EVP_MD_CTX *mdctx, ML_KEM_KEY *key)
* two this gives -2/2 with a probability of 1/16, -1/1 with probability 1/4,
* and 0 with probability 3/8.
*/
-static __owur
-int cbd_2(scalar *out, uint8_t in[ML_KEM_RANDOM_BYTES + 1],
- EVP_MD_CTX *mdctx, const ML_KEM_KEY *key)
+static __owur int cbd_2(scalar *out, uint8_t in[ML_KEM_RANDOM_BYTES + 1],
+ EVP_MD_CTX *mdctx, const ML_KEM_KEY *key)
{
uint16_t *curr = out->c, *end = curr + DEGREE;
- uint8_t randbuf[4 * DEGREE / 8], *r = randbuf; /* 64 * eta slots */
+ uint8_t randbuf[4 * DEGREE / 8], *r = randbuf; /* 64 * eta slots */
uint16_t value, mask;
uint8_t b;
@@ -1059,12 +1382,11 @@ int cbd_2(scalar *out, uint8_t in[ML_KEM_RANDOM_BYTES + 1],
* and setting the coefficient to the count of the first bits minus the count of
* the second bits, resulting in a centered binomial distribution.
*/
-static __owur
-int cbd_3(scalar *out, uint8_t in[ML_KEM_RANDOM_BYTES + 1],
- EVP_MD_CTX *mdctx, const ML_KEM_KEY *key)
+static __owur int cbd_3(scalar *out, uint8_t in[ML_KEM_RANDOM_BYTES + 1],
+ EVP_MD_CTX *mdctx, const ML_KEM_KEY *key)
{
uint16_t *curr = out->c, *end = curr + DEGREE;
- uint8_t randbuf[6 * DEGREE / 8], *r = randbuf; /* 64 * eta slots */
+ uint8_t randbuf[6 * DEGREE / 8], *r = randbuf; /* 64 * eta slots */
uint8_t b1, b2, b3;
uint16_t value, mask;
@@ -1084,7 +1406,7 @@ int cbd_3(scalar *out, uint8_t in[ML_KEM_RANDOM_BYTES + 1],
* versions of Clang to emit a branch.
*/
value = bit0(b1) + bitn(1, b1) + bitn(2, b1);
- value -= bitn(3, b1) + bitn(4, b1) + bitn(5, b1);
+ value -= bitn(3, b1) + bitn(4, b1) + bitn(5, b1);
mask = constish_time_non_zero(value >> 15);
*curr++ = value + (kPrime & mask);
@@ -1110,10 +1432,9 @@ int cbd_3(scalar *out, uint8_t in[ML_KEM_RANDOM_BYTES + 1],
* Generates a secret vector by using |cbd| with the given seed to generate
* scalar elements and incrementing |counter| for each slot of the vector.
*/
-static __owur
-int gencbd_vector(scalar *out, CBD_FUNC cbd, uint8_t *counter,
- const uint8_t seed[ML_KEM_RANDOM_BYTES], int rank,
- EVP_MD_CTX *mdctx, const ML_KEM_KEY *key)
+static __owur int gencbd_vector(scalar *out, CBD_FUNC cbd, uint8_t *counter,
+ const uint8_t seed[ML_KEM_RANDOM_BYTES], int rank,
+ EVP_MD_CTX *mdctx, const ML_KEM_KEY *key)
{
uint8_t input[ML_KEM_RANDOM_BYTES + 1];
@@ -1129,10 +1450,9 @@ int gencbd_vector(scalar *out, CBD_FUNC cbd, uint8_t *counter,
/*
* As above plus NTT transform.
*/
-static __owur
-int gencbd_vector_ntt(scalar *out, CBD_FUNC cbd, uint8_t *counter,
- const uint8_t seed[ML_KEM_RANDOM_BYTES], int rank,
- EVP_MD_CTX *mdctx, const ML_KEM_KEY *key)
+static __owur int gencbd_vector_ntt(scalar *out, CBD_FUNC cbd, uint8_t *counter,
+ const uint8_t seed[ML_KEM_RANDOM_BYTES], int rank,
+ EVP_MD_CTX *mdctx, const ML_KEM_KEY *key)
{
uint8_t input[ML_KEM_RANDOM_BYTES + 1];
@@ -1147,7 +1467,7 @@ int gencbd_vector_ntt(scalar *out, CBD_FUNC cbd, uint8_t *counter,
}
/* The |ETA1| value for ML-KEM-512 is 3, the rest and all ETA2 values are 2. */
-#define CBD1(evp_type) ((evp_type) == EVP_PKEY_ML_KEM_512 ? cbd_3 : cbd_2)
+#define CBD1(evp_type) ((evp_type) == EVP_PKEY_ML_KEM_512 ? cbd_3 : cbd_2)
/*
* FIPS 203, Section 5.2, Algorithm 14: K-PKE.Encrypt.
@@ -1165,11 +1485,10 @@ int gencbd_vector_ntt(scalar *out, CBD_FUNC cbd, uint8_t *counter,
*
* Caller passes storage in |tmp| for for two temporary vectors.
*/
-static __owur
-int encrypt_cpa(uint8_t out[ML_KEM_SHARED_SECRET_BYTES],
- const uint8_t message[DEGREE / 8],
- const uint8_t r[ML_KEM_RANDOM_BYTES], scalar *tmp,
- EVP_MD_CTX *mdctx, const ML_KEM_KEY *key)
+static __owur int encrypt_cpa(uint8_t out[ML_KEM_SHARED_SECRET_BYTES],
+ const uint8_t message[DEGREE / 8],
+ const uint8_t r[ML_KEM_RANDOM_BYTES], scalar *tmp,
+ EVP_MD_CTX *mdctx, const ML_KEM_KEY *key)
{
const ML_KEM_VINFO *vinfo = key->vinfo;
CBD_FUNC cbd_1 = CBD1(vinfo->evp_type);
@@ -1219,7 +1538,7 @@ int encrypt_cpa(uint8_t out[ML_KEM_SHARED_SECRET_BYTES],
*/
static void
decrypt_cpa(uint8_t out[ML_KEM_SHARED_SECRET_BYTES],
- const uint8_t *ctext, scalar *u, const ML_KEM_KEY *key)
+ const uint8_t *ctext, scalar *u, const ML_KEM_KEY *key)
{
const ML_KEM_VINFO *vinfo = key->vinfo;
scalar v, mask;
@@ -1288,8 +1607,8 @@ static int parse_pubkey(const uint8_t *in, EVP_MD_CTX *mdctx, ML_KEM_KEY *key)
/* Decode and check |t| */
if (!vector_decode_12(key->t, in, vinfo->rank)) {
ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_KEY,
- "%s invalid public 't' vector",
- vinfo->algorithm_name);
+ "%s invalid public 't' vector",
+ vinfo->algorithm_name);
return 0;
}
/* Save the matrix |m| recovery seed |rho| */
@@ -1301,8 +1620,8 @@ static int parse_pubkey(const uint8_t *in, EVP_MD_CTX *mdctx, ML_KEM_KEY *key)
if (!hash_h(key->pkhash, in, vinfo->pubkey_bytes, mdctx, key)
|| !matrix_expand(mdctx, key)) {
ERR_raise_data(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR,
- "internal error while parsing %s public key",
- vinfo->algorithm_name);
+ "internal error while parsing %s public key",
+ vinfo->algorithm_name);
return 0;
}
return 1;
@@ -1321,8 +1640,8 @@ static int parse_prvkey(const uint8_t *in, EVP_MD_CTX *mdctx, ML_KEM_KEY *key)
/* Decode and check |s|. */
if (!vector_decode_12(key->s, in, vinfo->rank)) {
ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_KEY,
- "%s invalid private 's' vector",
- vinfo->algorithm_name);
+ "%s invalid private 's' vector",
+ vinfo->algorithm_name);
return 0;
}
in += vinfo->vector_bytes;
@@ -1334,8 +1653,8 @@ static int parse_prvkey(const uint8_t *in, EVP_MD_CTX *mdctx, ML_KEM_KEY *key)
/* Check public key hash. */
if (memcmp(key->pkhash, in, ML_KEM_PKHASH_BYTES) != 0) {
ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_KEY,
- "%s public key hash mismatch",
- vinfo->algorithm_name);
+ "%s public key hash mismatch",
+ vinfo->algorithm_name);
return 0;
}
in += ML_KEM_PKHASH_BYTES;
@@ -1369,9 +1688,8 @@ static int parse_prvkey(const uint8_t *in, EVP_MD_CTX *mdctx, ML_KEM_KEY *key)
* constant time, with no side channel leaks, on all well-formed (valid length,
* and correctly encoded) ciphertext inputs.
*/
-static __owur
-int genkey(const uint8_t seed[ML_KEM_SEED_BYTES],
- EVP_MD_CTX *mdctx, uint8_t *pubenc, ML_KEM_KEY *key)
+static __owur int genkey(const uint8_t seed[ML_KEM_SEED_BYTES],
+ EVP_MD_CTX *mdctx, uint8_t *pubenc, ML_KEM_KEY *key)
{
uint8_t hashed[2 * ML_KEM_RANDOM_BYTES];
const uint8_t *const sigma = hashed + ML_KEM_RANDOM_BYTES;
@@ -1387,7 +1705,7 @@ int genkey(const uint8_t seed[ML_KEM_SEED_BYTES],
* seeds rho and sigma.
*/
memcpy(augmented_seed, seed, ML_KEM_RANDOM_BYTES);
- augmented_seed[ML_KEM_RANDOM_BYTES] = (uint8_t) rank;
+ augmented_seed[ML_KEM_RANDOM_BYTES] = (uint8_t)rank;
if (!hash_g(hashed, augmented_seed, sizeof(augmented_seed), mdctx, key))
goto end;
memcpy(key->rho, hashed, ML_KEM_RANDOM_BYTES);
@@ -1423,13 +1741,13 @@ int genkey(const uint8_t seed[ML_KEM_SEED_BYTES],
memcpy(key->d, seed, ML_KEM_RANDOM_BYTES);
ret = 1;
- end:
+end:
OPENSSL_cleanse((void *)augmented_seed, ML_KEM_RANDOM_BYTES);
OPENSSL_cleanse((void *)sigma, ML_KEM_RANDOM_BYTES);
if (ret == 0) {
ERR_raise_data(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR,
- "internal error while generating %s private key",
- vinfo->algorithm_name);
+ "internal error while generating %s private key",
+ vinfo->algorithm_name);
}
return ret;
}
@@ -1442,10 +1760,9 @@ int genkey(const uint8_t seed[ML_KEM_SEED_BYTES],
* The |ctext| buffer have space for the ciphertext of the ML-KEM variant
* of the provided key.
*/
-static
-int encap(uint8_t *ctext, uint8_t secret[ML_KEM_SHARED_SECRET_BYTES],
- const uint8_t entropy[ML_KEM_RANDOM_BYTES],
- scalar *tmp, EVP_MD_CTX *mdctx, const ML_KEM_KEY *key)
+static int encap(uint8_t *ctext, uint8_t secret[ML_KEM_SHARED_SECRET_BYTES],
+ const uint8_t entropy[ML_KEM_RANDOM_BYTES],
+ scalar *tmp, EVP_MD_CTX *mdctx, const ML_KEM_KEY *key)
{
uint8_t input[ML_KEM_RANDOM_BYTES + ML_KEM_PKHASH_BYTES];
uint8_t Kr[ML_KEM_SHARED_SECRET_BYTES + ML_KEM_RANDOM_BYTES];
@@ -1462,8 +1779,8 @@ int encap(uint8_t *ctext, uint8_t secret[ML_KEM_SHARED_SECRET_BYTES],
memcpy(secret, Kr, ML_KEM_SHARED_SECRET_BYTES);
else
ERR_raise_data(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR,
- "internal error while performing %s encapsulation",
- key->vinfo->algorithm_name);
+ "internal error while performing %s encapsulation",
+ key->vinfo->algorithm_name);
return ret;
}
@@ -1478,10 +1795,9 @@ int encap(uint8_t *ctext, uint8_t secret[ML_KEM_SHARED_SECRET_BYTES],
* The |ctext| and |tmp_ctext| buffers must each have space for the ciphertext
* of the key's ML-KEM variant.
*/
-static
-int decap(uint8_t secret[ML_KEM_SHARED_SECRET_BYTES],
- const uint8_t *ctext, uint8_t *tmp_ctext, scalar *tmp,
- EVP_MD_CTX *mdctx, const ML_KEM_KEY *key)
+static int decap(uint8_t secret[ML_KEM_SHARED_SECRET_BYTES],
+ const uint8_t *ctext, uint8_t *tmp_ctext, scalar *tmp,
+ EVP_MD_CTX *mdctx, const ML_KEM_KEY *key)
{
uint8_t decrypted[ML_KEM_SHARED_SECRET_BYTES + ML_KEM_PKHASH_BYTES];
uint8_t failure_key[ML_KEM_RANDOM_BYTES];
@@ -1509,8 +1825,8 @@ int decap(uint8_t secret[ML_KEM_SHARED_SECRET_BYTES],
*/
if (!kdf(failure_key, key->z, ctext, vinfo->ctext_bytes, mdctx, key)) {
ERR_raise_data(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR,
- "internal error while performing %s decapsulation",
- vinfo->algorithm_name);
+ "internal error while performing %s decapsulation",
+ vinfo->algorithm_name);
return 0;
}
decrypt_cpa(decrypted, ctext, tmp, key);
@@ -1537,8 +1853,7 @@ int decap(uint8_t secret[ML_KEM_SHARED_SECRET_BYTES],
* The caller should only store private data in `priv` *after* a successful
* (non-zero) return from this function.
*/
-static __owur
-int add_storage(scalar *pub, scalar *priv, int private, ML_KEM_KEY *key)
+static __owur int add_storage(scalar *pub, scalar *priv, int private, ML_KEM_KEY *key)
{
int rank = key->vinfo->rank;
@@ -1579,8 +1894,7 @@ int add_storage(scalar *pub, scalar *priv, int private, ML_KEM_KEY *key)
* After freeing the storage associated with a key that failed to be
* constructed, reset the internal pointers back to NULL.
*/
-void
-ossl_ml_kem_key_reset(ML_KEM_KEY *key)
+void ossl_ml_kem_key_reset(ML_KEM_KEY *key)
{
/*
* seedbuf can be allocated and contain |z| and |d| if the key is
@@ -1603,8 +1917,7 @@ ossl_ml_kem_key_reset(ML_KEM_KEY *key)
OPENSSL_secure_clear_free(key->s, key->vinfo->prvalloc);
OPENSSL_free(key->t);
}
- key->d = key->z = key->seedbuf = key->encoded_dk =
- (uint8_t *)(key->s = key->m = key->t = NULL);
+ key->d = key->z = key->seedbuf = key->encoded_dk = (uint8_t *)(key->s = key->m = key->t = NULL);
}
/*
@@ -1629,14 +1942,14 @@ const ML_KEM_VINFO *ossl_ml_kem_get_vinfo(int evp_type)
}
ML_KEM_KEY *ossl_ml_kem_key_new(OSSL_LIB_CTX *libctx, const char *properties,
- int evp_type)
+ int evp_type)
{
const ML_KEM_VINFO *vinfo = ossl_ml_kem_get_vinfo(evp_type);
ML_KEM_KEY *key;
if (vinfo == NULL) {
ERR_raise_data(ERR_LIB_CRYPTO, ERR_R_PASSED_INVALID_ARGUMENT,
- "unsupported ML-KEM key type: %d", evp_type);
+ "unsupported ML-KEM key type: %d", evp_type);
return NULL;
}
@@ -1661,8 +1974,8 @@ ML_KEM_KEY *ossl_ml_kem_key_new(OSSL_LIB_CTX *libctx, const char *properties,
ossl_ml_kem_key_free(key);
ERR_raise_data(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR,
- "missing SHA3 digest algorithms while creating %s key",
- vinfo->algorithm_name);
+ "missing SHA3 digest algorithms while creating %s key",
+ vinfo->algorithm_name);
return NULL;
}
@@ -1747,7 +2060,7 @@ void ossl_ml_kem_key_free(ML_KEM_KEY *key)
/* Serialise the public component of an ML-KEM key */
int ossl_ml_kem_encode_public_key(uint8_t *out, size_t len,
- const ML_KEM_KEY *key)
+ const ML_KEM_KEY *key)
{
if (!ossl_ml_kem_have_pubkey(key)
|| len != key->vinfo->pubkey_bytes)
@@ -1758,7 +2071,7 @@ int ossl_ml_kem_encode_public_key(uint8_t *out, size_t len,
/* Serialise an ML-KEM private key */
int ossl_ml_kem_encode_private_key(uint8_t *out, size_t len,
- const ML_KEM_KEY *key)
+ const ML_KEM_KEY *key)
{
if (!ossl_ml_kem_have_prvkey(key)
|| len != key->vinfo->prvkey_bytes)
@@ -1768,7 +2081,7 @@ int ossl_ml_kem_encode_private_key(uint8_t *out, size_t len,
}
int ossl_ml_kem_encode_seed(uint8_t *out, size_t len,
- const ML_KEM_KEY *key)
+ const ML_KEM_KEY *key)
{
if (key == NULL || key->d == NULL || len != ML_KEM_SEED_BYTES)
return 0;
@@ -1838,7 +2151,7 @@ int ossl_ml_kem_parse_public_key(const uint8_t *in, size_t len, ML_KEM_KEY *key)
/* Parse input as a new private key */
int ossl_ml_kem_parse_private_key(const uint8_t *in, size_t len,
- ML_KEM_KEY *key)
+ ML_KEM_KEY *key)
{
EVP_MD_CTX *mdctx = NULL;
const ML_KEM_VINFO *vinfo;
@@ -1856,7 +2169,7 @@ int ossl_ml_kem_parse_private_key(const uint8_t *in, size_t len,
return 0;
if (add_storage(OPENSSL_malloc(vinfo->puballoc),
- OPENSSL_secure_malloc(vinfo->prvalloc), 1, key))
+ OPENSSL_secure_malloc(vinfo->prvalloc), 1, key))
ret = parse_prvkey(in, mdctx, key);
if (!ret)
@@ -1890,7 +2203,8 @@ int ossl_ml_kem_genkey(uint8_t *pubenc, size_t publen, ML_KEM_KEY *key)
return 0;
ossl_ml_kem_key_reset(key);
} else if (RAND_priv_bytes_ex(key->libctx, seed, sizeof(seed),
- key->vinfo->secbits) <= 0) {
+ key->vinfo->secbits)
+ <= 0) {
return 0;
}
@@ -1904,7 +2218,7 @@ int ossl_ml_kem_genkey(uint8_t *pubenc, size_t publen, ML_KEM_KEY *key)
CONSTTIME_SECRET(seed, ML_KEM_SEED_BYTES);
if (add_storage(OPENSSL_malloc(vinfo->puballoc),
- OPENSSL_secure_malloc(vinfo->prvalloc), 1, key))
+ OPENSSL_secure_malloc(vinfo->prvalloc), 1, key))
ret = genkey(seed, mdctx, pubenc, key);
OPENSSL_cleanse(seed, sizeof(seed));
@@ -1928,9 +2242,9 @@ int ossl_ml_kem_genkey(uint8_t *pubenc, size_t publen, ML_KEM_KEY *key)
* This is the deterministic version with randomness supplied externally.
*/
int ossl_ml_kem_encap_seed(uint8_t *ctext, size_t clen,
- uint8_t *shared_secret, size_t slen,
- const uint8_t *entropy, size_t elen,
- const ML_KEM_KEY *key)
+ uint8_t *shared_secret, size_t slen,
+ const uint8_t *entropy, size_t elen,
+ const ML_KEM_KEY *key)
{
const ML_KEM_VINFO *vinfo;
EVP_MD_CTX *mdctx;
@@ -1956,21 +2270,20 @@ int ossl_ml_kem_encap_seed(uint8_t *ctext, size_t clen,
* each) vectors, that are never retained on return from this function.
* We stack-allocate these.
*/
-# define case_encap_seed(bits) \
- case EVP_PKEY_ML_KEM_##bits: \
- { \
- scalar tmp[2 * ML_KEM_##bits##_RANK]; \
- \
- ret = encap(ctext, shared_secret, entropy, tmp, mdctx, key); \
- OPENSSL_cleanse((void *)tmp, sizeof(tmp)); \
- break; \
- }
+#define case_encap_seed(bits) \
+ case EVP_PKEY_ML_KEM_##bits: { \
+ scalar tmp[2 * ML_KEM_##bits##_RANK]; \
+ \
+ ret = encap(ctext, shared_secret, entropy, tmp, mdctx, key); \
+ OPENSSL_cleanse((void *)tmp, sizeof(tmp)); \
+ break; \
+ }
switch (vinfo->evp_type) {
- case_encap_seed(512);
- case_encap_seed(768);
- case_encap_seed(1024);
+ case_encap_seed(512);
+ case_encap_seed(768);
+ case_encap_seed(1024);
}
-# undef case_encap_seed
+#undef case_encap_seed
/* Declassify secret inputs and derived outputs before returning control */
CONSTTIME_DECLASSIFY(entropy, elen);
@@ -1982,8 +2295,8 @@ int ossl_ml_kem_encap_seed(uint8_t *ctext, size_t clen,
}
int ossl_ml_kem_encap_rand(uint8_t *ctext, size_t clen,
- uint8_t *shared_secret, size_t slen,
- const ML_KEM_KEY *key)
+ uint8_t *shared_secret, size_t slen,
+ const ML_KEM_KEY *key)
{
uint8_t r[ML_KEM_RANDOM_BYTES];
@@ -1991,16 +2304,17 @@ int ossl_ml_kem_encap_rand(uint8_t *ctext, size_t clen,
return 0;
if (RAND_bytes_ex(key->libctx, r, ML_KEM_RANDOM_BYTES,
- key->vinfo->secbits) < 1)
+ key->vinfo->secbits)
+ < 1)
return 0;
return ossl_ml_kem_encap_seed(ctext, clen, shared_secret, slen,
- r, sizeof(r), key);
+ r, sizeof(r), key);
}
int ossl_ml_kem_decap(uint8_t *shared_secret, size_t slen,
- const uint8_t *ctext, size_t clen,
- const ML_KEM_KEY *key)
+ const uint8_t *ctext, size_t clen,
+ const ML_KEM_KEY *key)
{
const ML_KEM_VINFO *vinfo;
EVP_MD_CTX *mdctx;
@@ -2018,7 +2332,7 @@ int ossl_ml_kem_decap(uint8_t *shared_secret, size_t slen,
|| ctext == NULL || clen != vinfo->ctext_bytes
|| (mdctx = EVP_MD_CTX_new()) == NULL) {
(void)RAND_bytes_ex(key->libctx, shared_secret,
- ML_KEM_SHARED_SECRET_BYTES, vinfo->secbits);
+ ML_KEM_SHARED_SECRET_BYTES, vinfo->secbits);
return 0;
}
#if defined(OPENSSL_CONSTANT_TIME_VALIDATION)
@@ -2036,20 +2350,19 @@ int ossl_ml_kem_decap(uint8_t *shared_secret, size_t slen,
* retained on return from this function.
* We stack-allocate these.
*/
-# define case_decap(bits) \
- case EVP_PKEY_ML_KEM_##bits: \
- { \
- uint8_t cbuf[CTEXT_BYTES(bits)]; \
- scalar tmp[2 * ML_KEM_##bits##_RANK]; \
- \
- ret = decap(shared_secret, ctext, cbuf, tmp, mdctx, key); \
- OPENSSL_cleanse((void *)tmp, sizeof(tmp)); \
- break; \
- }
+#define case_decap(bits) \
+ case EVP_PKEY_ML_KEM_##bits: { \
+ uint8_t cbuf[CTEXT_BYTES(bits)]; \
+ scalar tmp[2 * ML_KEM_##bits##_RANK]; \
+ \
+ ret = decap(shared_secret, ctext, cbuf, tmp, mdctx, key); \
+ OPENSSL_cleanse((void *)tmp, sizeof(tmp)); \
+ break; \
+ }
switch (vinfo->evp_type) {
- case_decap(512);
- case_decap(768);
- case_decap(1024);
+ case_decap(512);
+ case_decap(768);
+ case_decap(1024);
}
/* Declassify secret inputs and derived outputs before returning control */
@@ -2058,7 +2371,7 @@ int ossl_ml_kem_decap(uint8_t *shared_secret, size_t slen,
EVP_MD_CTX_free(mdctx);
return ret;
-# undef case_decap
+#undef case_decap
}
int ossl_ml_kem_pubkey_cmp(const ML_KEM_KEY *key1, const ML_KEM_KEY *key2)
diff --git a/crypto/modes/cbc128.c b/crypto/modes/cbc128.c
index f3818032a4..db1c0fadee 100644
--- a/crypto/modes/cbc128.c
+++ b/crypto/modes/cbc128.c
@@ -12,7 +12,7 @@
#include "crypto/modes.h"
#if !defined(STRICT_ALIGNMENT) && !defined(PEDANTIC)
-# define STRICT_ALIGNMENT 0
+#define STRICT_ALIGNMENT 0
#endif
#if defined(__GNUC__) && !STRICT_ALIGNMENT
@@ -22,8 +22,8 @@ typedef size_t size_t_aX;
#endif
void CRYPTO_cbc128_encrypt(const unsigned char *in, unsigned char *out,
- size_t len, const void *key,
- unsigned char ivec[16], block128_f block)
+ size_t len, const void *key,
+ unsigned char ivec[16], block128_f block)
{
size_t n;
const unsigned char *iv = ivec;
@@ -32,12 +32,11 @@ void CRYPTO_cbc128_encrypt(const unsigned char *in, unsigned char *out,
return;
#if !defined(OPENSSL_SMALL_FOOTPRINT)
- if (STRICT_ALIGNMENT &&
- ((size_t)in | (size_t)out | (size_t)ivec) % sizeof(size_t) != 0) {
+ if (STRICT_ALIGNMENT && ((size_t)in | (size_t)out | (size_t)ivec) % sizeof(size_t) != 0) {
while (len >= 16) {
for (n = 0; n < 16; ++n)
out[n] = in[n] ^ iv[n];
- (*block) (out, out, key);
+ (*block)(out, out, key);
iv = out;
len -= 16;
in += 16;
@@ -46,9 +45,8 @@ void CRYPTO_cbc128_encrypt(const unsigned char *in, unsigned char *out,
} else {
while (len >= 16) {
for (n = 0; n < 16; n += sizeof(size_t))
- *(size_t_aX *)(out + n) =
- *(size_t_aX *)(in + n) ^ *(size_t_aX *)(iv + n);
- (*block) (out, out, key);
+ *(size_t_aX *)(out + n) = *(size_t_aX *)(in + n) ^ *(size_t_aX *)(iv + n);
+ (*block)(out, out, key);
iv = out;
len -= 16;
in += 16;
@@ -61,7 +59,7 @@ void CRYPTO_cbc128_encrypt(const unsigned char *in, unsigned char *out,
out[n] = in[n] ^ iv[n];
for (; n < 16; ++n)
out[n] = iv[n];
- (*block) (out, out, key);
+ (*block)(out, out, key);
iv = out;
if (len <= 16)
break;
@@ -74,8 +72,8 @@ void CRYPTO_cbc128_encrypt(const unsigned char *in, unsigned char *out,
}
void CRYPTO_cbc128_decrypt(const unsigned char *in, unsigned char *out,
- size_t len, const void *key,
- unsigned char ivec[16], block128_f block)
+ size_t len, const void *key,
+ unsigned char ivec[16], block128_f block)
{
size_t n;
union {
@@ -90,10 +88,9 @@ void CRYPTO_cbc128_decrypt(const unsigned char *in, unsigned char *out,
if (in != out) {
const unsigned char *iv = ivec;
- if (STRICT_ALIGNMENT &&
- ((size_t)in | (size_t)out | (size_t)ivec) % sizeof(size_t) != 0) {
+ if (STRICT_ALIGNMENT && ((size_t)in | (size_t)out | (size_t)ivec) % sizeof(size_t) != 0) {
while (len >= 16) {
- (*block) (in, out, key);
+ (*block)(in, out, key);
for (n = 0; n < 16; ++n)
out[n] ^= iv[n];
iv = in;
@@ -106,7 +103,7 @@ void CRYPTO_cbc128_decrypt(const unsigned char *in, unsigned char *out,
size_t_aX *out_t = (size_t_aX *)out;
size_t_aX *iv_t = (size_t_aX *)iv;
- (*block) (in, out, key);
+ (*block)(in, out, key);
for (n = 0; n < 16 / sizeof(size_t); n++)
out_t[n] ^= iv_t[n];
iv = in;
@@ -118,11 +115,10 @@ void CRYPTO_cbc128_decrypt(const unsigned char *in, unsigned char *out,
if (ivec != iv)
memcpy(ivec, iv, 16);
} else {
- if (STRICT_ALIGNMENT &&
- ((size_t)in | (size_t)out | (size_t)ivec) % sizeof(size_t) != 0) {
+ if (STRICT_ALIGNMENT && ((size_t)in | (size_t)out | (size_t)ivec) % sizeof(size_t) != 0) {
unsigned char c;
while (len >= 16) {
- (*block) (in, tmp.c, key);
+ (*block)(in, tmp.c, key);
for (n = 0; n < 16; ++n) {
c = in[n];
out[n] = tmp.c[n] ^ ivec[n];
@@ -139,7 +135,7 @@ void CRYPTO_cbc128_decrypt(const unsigned char *in, unsigned char *out,
size_t_aX *ivec_t = (size_t_aX *)ivec;
const size_t_aX *in_t = (const size_t_aX *)in;
- (*block) (in, tmp.c, key);
+ (*block)(in, tmp.c, key);
for (n = 0; n < 16 / sizeof(size_t); n++) {
c = in_t[n];
out_t[n] = tmp.t[n] ^ ivec_t[n];
@@ -154,7 +150,7 @@ void CRYPTO_cbc128_decrypt(const unsigned char *in, unsigned char *out,
#endif
while (len) {
unsigned char c;
- (*block) (in, tmp.c, key);
+ (*block)(in, tmp.c, key);
for (n = 0; n < 16 && n < len; ++n) {
c = in[n];
out[n] = tmp.c[n] ^ ivec[n];
diff --git a/crypto/modes/ccm128.c b/crypto/modes/ccm128.c
index eee7a69c3a..02ab4f8831 100644
--- a/crypto/modes/ccm128.c
+++ b/crypto/modes/ccm128.c
@@ -12,11 +12,11 @@
#include "crypto/modes.h"
#ifndef STRICT_ALIGNMENT
-# ifdef __GNUC__
+#ifdef __GNUC__
typedef u64 u64_a1 __attribute((__aligned__(1)));
-# else
+#else
typedef u64 u64_a1;
-# endif
+#endif
#endif
/*
@@ -24,8 +24,8 @@ typedef u64 u64_a1;
* called once per session setup...
*/
void CRYPTO_ccm128_init(CCM128_CONTEXT *ctx,
- unsigned int M, unsigned int L, void *key,
- block128_f block)
+ unsigned int M, unsigned int L, void *key,
+ block128_f block)
{
memset(ctx->nonce.c, 0, sizeof(ctx->nonce.c));
ctx->nonce.c[0] = ((u8)(L - 1) & 7) | (u8)(((M - 2) / 2) & 7) << 3;
@@ -38,12 +38,12 @@ void CRYPTO_ccm128_init(CCM128_CONTEXT *ctx,
/* Then you setup per-message nonce and pass the length of the message */
int CRYPTO_ccm128_setiv(CCM128_CONTEXT *ctx,
- const unsigned char *nonce, size_t nlen, size_t mlen)
+ const unsigned char *nonce, size_t nlen, size_t mlen)
{
unsigned int L = ctx->nonce.c[0] & 7; /* the L parameter */
if (nlen < (14 - L))
- return -1; /* nonce is too short */
+ return -1; /* nonce is too short */
if (sizeof(mlen) == 8 && L >= 3) {
ctx->nonce.c[8] = (u8)(mlen >> (56 % (sizeof(mlen) * 8)));
@@ -58,7 +58,7 @@ int CRYPTO_ccm128_setiv(CCM128_CONTEXT *ctx,
ctx->nonce.c[14] = (u8)(mlen >> 8);
ctx->nonce.c[15] = (u8)mlen;
- ctx->nonce.c[0] &= ~0x40; /* clear Adata flag */
+ ctx->nonce.c[0] &= ~0x40; /* clear Adata flag */
memcpy(&ctx->nonce.c[1], nonce, 14 - L);
return 0;
@@ -66,7 +66,7 @@ int CRYPTO_ccm128_setiv(CCM128_CONTEXT *ctx,
/* Then you pass additional authentication data, this is optional */
void CRYPTO_ccm128_aad(CCM128_CONTEXT *ctx,
- const unsigned char *aad, size_t alen)
+ const unsigned char *aad, size_t alen)
{
unsigned int i;
block128_f block = ctx->block;
@@ -74,15 +74,15 @@ void CRYPTO_ccm128_aad(CCM128_CONTEXT *ctx,
if (alen == 0)
return;
- ctx->nonce.c[0] |= 0x40; /* set Adata flag */
- (*block) (ctx->nonce.c, ctx->cmac.c, ctx->key), ctx->blocks++;
+ ctx->nonce.c[0] |= 0x40; /* set Adata flag */
+ (*block)(ctx->nonce.c, ctx->cmac.c, ctx->key), ctx->blocks++;
if (alen < (0x10000 - 0x100)) {
ctx->cmac.c[0] ^= (u8)(alen >> 8);
ctx->cmac.c[1] ^= (u8)alen;
i = 2;
} else if (sizeof(alen) == 8
- && alen >= (size_t)1 << (32 % (sizeof(alen) * 8))) {
+ && alen >= (size_t)1 << (32 % (sizeof(alen) * 8))) {
ctx->cmac.c[0] ^= 0xFF;
ctx->cmac.c[1] ^= 0xFF;
ctx->cmac.c[2] ^= (u8)(alen >> (56 % (sizeof(alen) * 8)));
@@ -107,7 +107,7 @@ void CRYPTO_ccm128_aad(CCM128_CONTEXT *ctx,
do {
for (; i < 16 && alen; ++i, ++aad, --alen)
ctx->cmac.c[i] ^= *aad;
- (*block) (ctx->cmac.c, ctx->cmac.c, ctx->key), ctx->blocks++;
+ (*block)(ctx->cmac.c, ctx->cmac.c, ctx->key), ctx->blocks++;
i = 0;
} while (alen);
}
@@ -135,8 +135,8 @@ static void ctr64_inc(unsigned char *counter)
}
int CRYPTO_ccm128_encrypt(CCM128_CONTEXT *ctx,
- const unsigned char *inp, unsigned char *out,
- size_t len)
+ const unsigned char *inp, unsigned char *out,
+ size_t len)
{
size_t n;
unsigned int i, L;
@@ -149,7 +149,7 @@ int CRYPTO_ccm128_encrypt(CCM128_CONTEXT *ctx,
} scratch;
if (!(flags0 & 0x40))
- (*block) (ctx->nonce.c, ctx->cmac.c, key), ctx->blocks++;
+ (*block)(ctx->nonce.c, ctx->cmac.c, key), ctx->blocks++;
ctx->nonce.c[0] = L = flags0 & 7;
for (n = 0, i = 15 - L; i < 15; ++i) {
@@ -157,15 +157,15 @@ int CRYPTO_ccm128_encrypt(CCM128_CONTEXT *ctx,
ctx->nonce.c[i] = 0;
n <<= 8;
}
- n |= ctx->nonce.c[15]; /* reconstructed length */
+ n |= ctx->nonce.c[15]; /* reconstructed length */
ctx->nonce.c[15] = 1;
if (n != len)
- return -1; /* length mismatch */
+ return -1; /* length mismatch */
ctx->blocks += ((len + 15) >> 3) | 1;
if (ctx->blocks > (U64(1) << 61))
- return -2; /* too much data */
+ return -2; /* too much data */
while (len >= 16) {
#if defined(STRICT_ALIGNMENT)
@@ -181,8 +181,8 @@ int CRYPTO_ccm128_encrypt(CCM128_CONTEXT *ctx,
ctx->cmac.u[0] ^= ((u64_a1 *)inp)[0];
ctx->cmac.u[1] ^= ((u64_a1 *)inp)[1];
#endif
- (*block) (ctx->cmac.c, ctx->cmac.c, key);
- (*block) (ctx->nonce.c, scratch.c, key);
+ (*block)(ctx->cmac.c, ctx->cmac.c, key);
+ (*block)(ctx->nonce.c, scratch.c, key);
ctr64_inc(ctx->nonce.c);
#if defined(STRICT_ALIGNMENT)
temp.u[0] ^= scratch.u[0];
@@ -200,8 +200,8 @@ int CRYPTO_ccm128_encrypt(CCM128_CONTEXT *ctx,
if (len) {
for (i = 0; i < len; ++i)
ctx->cmac.c[i] ^= inp[i];
- (*block) (ctx->cmac.c, ctx->cmac.c, key);
- (*block) (ctx->nonce.c, scratch.c, key);
+ (*block)(ctx->cmac.c, ctx->cmac.c, key);
+ (*block)(ctx->nonce.c, scratch.c, key);
for (i = 0; i < len; ++i)
out[i] = scratch.c[i] ^ inp[i];
}
@@ -209,7 +209,7 @@ int CRYPTO_ccm128_encrypt(CCM128_CONTEXT *ctx,
for (i = 15 - L; i < 16; ++i)
ctx->nonce.c[i] = 0;
- (*block) (ctx->nonce.c, scratch.c, key);
+ (*block)(ctx->nonce.c, scratch.c, key);
ctx->cmac.u[0] ^= scratch.u[0];
ctx->cmac.u[1] ^= scratch.u[1];
@@ -219,8 +219,8 @@ int CRYPTO_ccm128_encrypt(CCM128_CONTEXT *ctx,
}
int CRYPTO_ccm128_decrypt(CCM128_CONTEXT *ctx,
- const unsigned char *inp, unsigned char *out,
- size_t len)
+ const unsigned char *inp, unsigned char *out,
+ size_t len)
{
size_t n;
unsigned int i, L;
@@ -233,7 +233,7 @@ int CRYPTO_ccm128_decrypt(CCM128_CONTEXT *ctx,
} scratch;
if (!(flags0 & 0x40))
- (*block) (ctx->nonce.c, ctx->cmac.c, key);
+ (*block)(ctx->nonce.c, ctx->cmac.c, key);
ctx->nonce.c[0] = L = flags0 & 7;
for (n = 0, i = 15 - L; i < 15; ++i) {
@@ -241,7 +241,7 @@ int CRYPTO_ccm128_decrypt(CCM128_CONTEXT *ctx,
ctx->nonce.c[i] = 0;
n <<= 8;
}
- n |= ctx->nonce.c[15]; /* reconstructed length */
+ n |= ctx->nonce.c[15]; /* reconstructed length */
ctx->nonce.c[15] = 1;
if (n != len)
@@ -254,7 +254,7 @@ int CRYPTO_ccm128_decrypt(CCM128_CONTEXT *ctx,
u8 c[16];
} temp;
#endif
- (*block) (ctx->nonce.c, scratch.c, key);
+ (*block)(ctx->nonce.c, scratch.c, key);
ctr64_inc(ctx->nonce.c);
#if defined(STRICT_ALIGNMENT)
memcpy(temp.c, inp, 16);
@@ -263,11 +263,11 @@ int CRYPTO_ccm128_decrypt(CCM128_CONTEXT *ctx,
memcpy(out, scratch.c, 16);
#else
ctx->cmac.u[0] ^= (((u64_a1 *)out)[0]
- = scratch.u[0] ^ ((u64_a1 *)inp)[0]);
+ = scratch.u[0] ^ ((u64_a1 *)inp)[0]);
ctx->cmac.u[1] ^= (((u64_a1 *)out)[1]
- = scratch.u[1] ^ ((u64_a1 *)inp)[1]);
+ = scratch.u[1] ^ ((u64_a1 *)inp)[1]);
#endif
- (*block) (ctx->cmac.c, ctx->cmac.c, key);
+ (*block)(ctx->cmac.c, ctx->cmac.c, key);
inp += 16;
out += 16;
@@ -275,16 +275,16 @@ int CRYPTO_ccm128_decrypt(CCM128_CONTEXT *ctx,
}
if (len) {
- (*block) (ctx->nonce.c, scratch.c, key);
+ (*block)(ctx->nonce.c, scratch.c, key);
for (i = 0; i < len; ++i)
ctx->cmac.c[i] ^= (out[i] = scratch.c[i] ^ inp[i]);
- (*block) (ctx->cmac.c, ctx->cmac.c, key);
+ (*block)(ctx->cmac.c, ctx->cmac.c, key);
}
for (i = 15 - L; i < 16; ++i)
ctx->nonce.c[i] = 0;
- (*block) (ctx->nonce.c, scratch.c, key);
+ (*block)(ctx->nonce.c, scratch.c, key);
ctx->cmac.u[0] ^= scratch.u[0];
ctx->cmac.u[1] ^= scratch.u[1];
@@ -302,14 +302,14 @@ static void ctr64_add(unsigned char *counter, size_t inc)
--n;
val += counter[n] + (inc & 0xff);
counter[n] = (unsigned char)val;
- val >>= 8; /* carry bit */
+ val >>= 8; /* carry bit */
inc >>= 8;
} while (n && (inc || val));
}
int CRYPTO_ccm128_encrypt_ccm64(CCM128_CONTEXT *ctx,
- const unsigned char *inp, unsigned char *out,
- size_t len, ccm128_f stream)
+ const unsigned char *inp, unsigned char *out,
+ size_t len, ccm128_f stream)
{
size_t n;
unsigned int i, L;
@@ -322,7 +322,7 @@ int CRYPTO_ccm128_encrypt_ccm64(CCM128_CONTEXT *ctx,
} scratch;
if (!(flags0 & 0x40))
- (*block) (ctx->nonce.c, ctx->cmac.c, key), ctx->blocks++;
+ (*block)(ctx->nonce.c, ctx->cmac.c, key), ctx->blocks++;
ctx->nonce.c[0] = L = flags0 & 7;
for (n = 0, i = 15 - L; i < 15; ++i) {
@@ -330,18 +330,18 @@ int CRYPTO_ccm128_encrypt_ccm64(CCM128_CONTEXT *ctx,
ctx->nonce.c[i] = 0;
n <<= 8;
}
- n |= ctx->nonce.c[15]; /* reconstructed length */
+ n |= ctx->nonce.c[15]; /* reconstructed length */
ctx->nonce.c[15] = 1;
if (n != len)
- return -1; /* length mismatch */
+ return -1; /* length mismatch */
ctx->blocks += ((len + 15) >> 3) | 1;
if (ctx->blocks > (U64(1) << 61))
- return -2; /* too much data */
+ return -2; /* too much data */
if ((n = len / 16)) {
- (*stream) (inp, out, n, key, ctx->nonce.c, ctx->cmac.c);
+ (*stream)(inp, out, n, key, ctx->nonce.c, ctx->cmac.c);
n *= 16;
inp += n;
out += n;
@@ -353,8 +353,8 @@ int CRYPTO_ccm128_encrypt_ccm64(CCM128_CONTEXT *ctx,
if (len) {
for (i = 0; i < len; ++i)
ctx->cmac.c[i] ^= inp[i];
- (*block) (ctx->cmac.c, ctx->cmac.c, key);
- (*block) (ctx->nonce.c, scratch.c, key);
+ (*block)(ctx->cmac.c, ctx->cmac.c, key);
+ (*block)(ctx->nonce.c, scratch.c, key);
for (i = 0; i < len; ++i)
out[i] = scratch.c[i] ^ inp[i];
}
@@ -362,7 +362,7 @@ int CRYPTO_ccm128_encrypt_ccm64(CCM128_CONTEXT *ctx,
for (i = 15 - L; i < 16; ++i)
ctx->nonce.c[i] = 0;
- (*block) (ctx->nonce.c, scratch.c, key);
+ (*block)(ctx->nonce.c, scratch.c, key);
ctx->cmac.u[0] ^= scratch.u[0];
ctx->cmac.u[1] ^= scratch.u[1];
@@ -372,8 +372,8 @@ int CRYPTO_ccm128_encrypt_ccm64(CCM128_CONTEXT *ctx,
}
int CRYPTO_ccm128_decrypt_ccm64(CCM128_CONTEXT *ctx,
- const unsigned char *inp, unsigned char *out,
- size_t len, ccm128_f stream)
+ const unsigned char *inp, unsigned char *out,
+ size_t len, ccm128_f stream)
{
size_t n;
unsigned int i, L;
@@ -386,7 +386,7 @@ int CRYPTO_ccm128_decrypt_ccm64(CCM128_CONTEXT *ctx,
} scratch;
if (!(flags0 & 0x40))
- (*block) (ctx->nonce.c, ctx->cmac.c, key);
+ (*block)(ctx->nonce.c, ctx->cmac.c, key);
ctx->nonce.c[0] = L = flags0 & 7;
for (n = 0, i = 15 - L; i < 15; ++i) {
@@ -394,14 +394,14 @@ int CRYPTO_ccm128_decrypt_ccm64(CCM128_CONTEXT *ctx,
ctx->nonce.c[i] = 0;
n <<= 8;
}
- n |= ctx->nonce.c[15]; /* reconstructed length */
+ n |= ctx->nonce.c[15]; /* reconstructed length */
ctx->nonce.c[15] = 1;
if (n != len)
return -1;
if ((n = len / 16)) {
- (*stream) (inp, out, n, key, ctx->nonce.c, ctx->cmac.c);
+ (*stream)(inp, out, n, key, ctx->nonce.c, ctx->cmac.c);
n *= 16;
inp += n;
out += n;
@@ -411,16 +411,16 @@ int CRYPTO_ccm128_decrypt_ccm64(CCM128_CONTEXT *ctx,
}
if (len) {
- (*block) (ctx->nonce.c, scratch.c, key);
+ (*block)(ctx->nonce.c, scratch.c, key);
for (i = 0; i < len; ++i)
ctx->cmac.c[i] ^= (out[i] = scratch.c[i] ^ inp[i]);
- (*block) (ctx->cmac.c, ctx->cmac.c, key);
+ (*block)(ctx->cmac.c, ctx->cmac.c, key);
}
for (i = 15 - L; i < 16; ++i)
ctx->nonce.c[i] = 0;
- (*block) (ctx->nonce.c, scratch.c, key);
+ (*block)(ctx->nonce.c, scratch.c, key);
ctx->cmac.u[0] ^= scratch.u[0];
ctx->cmac.u[1] ^= scratch.u[1];
diff --git a/crypto/modes/cfb128.c b/crypto/modes/cfb128.c
index 2d37bcb586..70345636dd 100644
--- a/crypto/modes/cfb128.c
+++ b/crypto/modes/cfb128.c
@@ -23,9 +23,9 @@ typedef size_t size_t_aX;
* used is contained in *num;
*/
void CRYPTO_cfb128_encrypt(const unsigned char *in, unsigned char *out,
- size_t len, const void *key,
- unsigned char ivec[16], int *num,
- int enc, block128_f block)
+ size_t len, const void *key,
+ unsigned char ivec[16], int *num,
+ int enc, block128_f block)
{
unsigned int n;
size_t l = 0;
@@ -46,17 +46,15 @@ void CRYPTO_cfb128_encrypt(const unsigned char *in, unsigned char *out,
--len;
n = (n + 1) % 16;
}
-# if defined(STRICT_ALIGNMENT)
- if (((size_t)in | (size_t)out | (size_t)ivec) %
- sizeof(size_t) != 0)
+#if defined(STRICT_ALIGNMENT)
+ if (((size_t)in | (size_t)out | (size_t)ivec) % sizeof(size_t) != 0)
break;
-# endif
+#endif
while (len >= 16) {
- (*block) (ivec, ivec, key);
+ (*block)(ivec, ivec, key);
for (; n < 16; n += sizeof(size_t)) {
- *(size_t_aX *)(out + n) =
- *(size_t_aX *)(ivec + n)
- ^= *(size_t_aX *)(in + n);
+ *(size_t_aX *)(out + n) = *(size_t_aX *)(ivec + n)
+ ^= *(size_t_aX *)(in + n);
}
len -= 16;
out += 16;
@@ -64,7 +62,7 @@ void CRYPTO_cfb128_encrypt(const unsigned char *in, unsigned char *out,
n = 0;
}
if (len) {
- (*block) (ivec, ivec, key);
+ (*block)(ivec, ivec, key);
while (len--) {
out[n] = ivec[n] ^= in[n];
++n;
@@ -78,7 +76,7 @@ void CRYPTO_cfb128_encrypt(const unsigned char *in, unsigned char *out,
#endif
while (l < len) {
if (n == 0) {
- (*block) (ivec, ivec, key);
+ (*block)(ivec, ivec, key);
}
out[l] = ivec[n] ^= in[l];
++l;
@@ -96,13 +94,12 @@ void CRYPTO_cfb128_encrypt(const unsigned char *in, unsigned char *out,
--len;
n = (n + 1) % 16;
}
-# if defined(STRICT_ALIGNMENT)
- if (((size_t)in | (size_t)out | (size_t)ivec) %
- sizeof(size_t) != 0)
+#if defined(STRICT_ALIGNMENT)
+ if (((size_t)in | (size_t)out | (size_t)ivec) % sizeof(size_t) != 0)
break;
-# endif
+#endif
while (len >= 16) {
- (*block) (ivec, ivec, key);
+ (*block)(ivec, ivec, key);
for (; n < 16; n += sizeof(size_t)) {
size_t t = *(size_t_aX *)(in + n);
*(size_t_aX *)(out + n)
@@ -115,7 +112,7 @@ void CRYPTO_cfb128_encrypt(const unsigned char *in, unsigned char *out,
n = 0;
}
if (len) {
- (*block) (ivec, ivec, key);
+ (*block)(ivec, ivec, key);
while (len--) {
unsigned char c;
out[n] = ivec[n] ^ (c = in[n]);
@@ -132,7 +129,7 @@ void CRYPTO_cfb128_encrypt(const unsigned char *in, unsigned char *out,
while (l < len) {
unsigned char c;
if (n == 0) {
- (*block) (ivec, ivec, key);
+ (*block)(ivec, ivec, key);
}
out[l] = ivec[n] ^ (c = in[l]);
ivec[n] = c;
@@ -148,9 +145,9 @@ void CRYPTO_cfb128_encrypt(const unsigned char *in, unsigned char *out,
* it corrupts any extra bits in the last byte of out
*/
static void cfbr_encrypt_block(const unsigned char *in, unsigned char *out,
- int nbits, const void *key,
- unsigned char ivec[16], int enc,
- block128_f block)
+ int nbits, const void *key,
+ unsigned char ivec[16], int enc,
+ block128_f block)
{
int n, rem, num;
unsigned char ovec[16 * 2 + 1]; /* +1 because we dereference (but don't
@@ -162,12 +159,12 @@ static void cfbr_encrypt_block(const unsigned char *in, unsigned char *out,
/* fill in the first half of the new IV with the current IV */
memcpy(ovec, ivec, 16);
/* construct the new IV */
- (*block) (ivec, ivec, key);
+ (*block)(ivec, ivec, key);
num = (nbits + 7) / 8;
- if (enc) /* encrypt the input */
+ if (enc) /* encrypt the input */
for (n = 0; n < num; ++n)
out[n] = (ovec[16 + n] = in[n] ^ ivec[n]);
- else /* decrypt the input */
+ else /* decrypt the input */
for (n = 0; n < num; ++n)
out[n] = (ovec[16 + n] = in[n]) ^ ivec[n];
/* shift ovec left... */
@@ -184,9 +181,9 @@ static void cfbr_encrypt_block(const unsigned char *in, unsigned char *out,
/* N.B. This expects the input to be packed, MS bit first */
void CRYPTO_cfb128_1_encrypt(const unsigned char *in, unsigned char *out,
- size_t bits, const void *key,
- unsigned char ivec[16], int *num,
- int enc, block128_f block)
+ size_t bits, const void *key,
+ unsigned char ivec[16], int *num,
+ int enc, block128_f block)
{
size_t n;
unsigned char c[1], d[1];
@@ -194,15 +191,14 @@ void CRYPTO_cfb128_1_encrypt(const unsigned char *in, unsigned char *out,
for (n = 0; n < bits; ++n) {
c[0] = (in[n / 8] & (1 << (7 - n % 8))) ? 0x80 : 0;
cfbr_encrypt_block(c, d, 1, key, ivec, enc, block);
- out[n / 8] = (out[n / 8] & ~(1 << (unsigned int)(7 - n % 8))) |
- ((d[0] & 0x80) >> (unsigned int)(n % 8));
+ out[n / 8] = (out[n / 8] & ~(1 << (unsigned int)(7 - n % 8))) | ((d[0] & 0x80) >> (unsigned int)(n % 8));
}
}
void CRYPTO_cfb128_8_encrypt(const unsigned char *in, unsigned char *out,
- size_t length, const void *key,
- unsigned char ivec[16], int *num,
- int enc, block128_f block)
+ size_t length, const void *key,
+ unsigned char ivec[16], int *num,
+ int enc, block128_f block)
{
size_t n;
diff --git a/crypto/modes/ctr128.c b/crypto/modes/ctr128.c
index 58014e76e2..6013d6ee41 100644
--- a/crypto/modes/ctr128.c
+++ b/crypto/modes/ctr128.c
@@ -71,10 +71,10 @@ static void ctr128_inc_aligned(unsigned char *counter)
* doesn't overflow into the rest of the IV when incremented.
*/
void CRYPTO_ctr128_encrypt(const unsigned char *in, unsigned char *out,
- size_t len, const void *key,
- unsigned char ivec[16],
- unsigned char ecount_buf[16], unsigned int *num,
- block128_f block)
+ size_t len, const void *key,
+ unsigned char ivec[16],
+ unsigned char ecount_buf[16], unsigned int *num,
+ block128_f block)
{
unsigned int n;
size_t l = 0;
@@ -90,17 +90,17 @@ void CRYPTO_ctr128_encrypt(const unsigned char *in, unsigned char *out,
n = (n + 1) % 16;
}
-# if defined(STRICT_ALIGNMENT)
+#if defined(STRICT_ALIGNMENT)
if (((size_t)in | (size_t)out | (size_t)ecount_buf)
- % sizeof(size_t) != 0)
+ % sizeof(size_t)
+ != 0)
break;
-# endif
+#endif
while (len >= 16) {
- (*block) (ivec, ecount_buf, key);
+ (*block)(ivec, ecount_buf, key);
ctr128_inc_aligned(ivec);
for (n = 0; n < 16; n += sizeof(size_t))
- *(size_t_aX *)(out + n) =
- *(size_t_aX *)(in + n)
+ *(size_t_aX *)(out + n) = *(size_t_aX *)(in + n)
^ *(size_t_aX *)(ecount_buf + n);
len -= 16;
out += 16;
@@ -108,7 +108,7 @@ void CRYPTO_ctr128_encrypt(const unsigned char *in, unsigned char *out,
n = 0;
}
if (len) {
- (*block) (ivec, ecount_buf, key);
+ (*block)(ivec, ecount_buf, key);
ctr128_inc_aligned(ivec);
while (len--) {
out[n] = in[n] ^ ecount_buf[n];
@@ -123,7 +123,7 @@ void CRYPTO_ctr128_encrypt(const unsigned char *in, unsigned char *out,
#endif
while (l < len) {
if (n == 0) {
- (*block) (ivec, ecount_buf, key);
+ (*block)(ivec, ecount_buf, key);
ctr128_inc(ivec);
}
out[l] = in[l] ^ ecount_buf[n];
@@ -148,14 +148,14 @@ static void ctr96_inc(unsigned char *counter)
}
void CRYPTO_ctr128_encrypt_ctr32(const unsigned char *in, unsigned char *out,
- size_t len, const void *key,
- unsigned char ivec[16],
- unsigned char ecount_buf[16],
- unsigned int *num, ctr128_f func)
+ size_t len, const void *key,
+ unsigned char ivec[16],
+ unsigned char ecount_buf[16],
+ unsigned int *num, ctr128_f func)
{
unsigned int n, ctr32;
- n = *num;
+ n = *num;
while (n && len) {
*(out++) = *(in++) ^ ecount_buf[n];
@@ -184,7 +184,7 @@ void CRYPTO_ctr128_encrypt_ctr32(const unsigned char *in, unsigned char *out,
blocks -= ctr32;
ctr32 = 0;
}
- (*func) (in, out, blocks, key, ivec);
+ (*func)(in, out, blocks, key, ivec);
/* (*ctr) does not update ivec, caller does: */
PUTU32(ivec + 12, ctr32);
/* ... overflow was detected, propagate carry. */
@@ -197,7 +197,7 @@ void CRYPTO_ctr128_encrypt_ctr32(const unsigned char *in, unsigned char *out,
}
if (len) {
memset(ecount_buf, 0, 16);
- (*func) (ecount_buf, ecount_buf, 1, key, ivec);
+ (*func)(ecount_buf, ecount_buf, 1, key, ivec);
++ctr32;
PUTU32(ivec + 12, ctr32);
if (ctr32 == 0)
diff --git a/crypto/modes/cts128.c b/crypto/modes/cts128.c
index 5600d9c54b..f6f1592543 100644
--- a/crypto/modes/cts128.c
+++ b/crypto/modes/cts128.c
@@ -25,9 +25,9 @@
*/
size_t CRYPTO_cts128_encrypt_block(const unsigned char *in,
- unsigned char *out, size_t len,
- const void *key, unsigned char ivec[16],
- block128_f block)
+ unsigned char *out, size_t len,
+ const void *key, unsigned char ivec[16],
+ block128_f block)
{
size_t residue, n;
@@ -46,7 +46,7 @@ size_t CRYPTO_cts128_encrypt_block(const unsigned char *in,
for (n = 0; n < residue; ++n)
ivec[n] ^= in[n];
- (*block) (ivec, ivec, key);
+ (*block)(ivec, ivec, key);
memcpy(out, out - 16, residue);
memcpy(out - 16, ivec, 16);
@@ -54,10 +54,10 @@ size_t CRYPTO_cts128_encrypt_block(const unsigned char *in,
}
size_t CRYPTO_nistcts128_encrypt_block(const unsigned char *in,
- unsigned char *out, size_t len,
- const void *key,
- unsigned char ivec[16],
- block128_f block)
+ unsigned char *out, size_t len,
+ const void *key,
+ unsigned char ivec[16],
+ block128_f block)
{
size_t residue, n;
@@ -78,15 +78,15 @@ size_t CRYPTO_nistcts128_encrypt_block(const unsigned char *in,
for (n = 0; n < residue; ++n)
ivec[n] ^= in[n];
- (*block) (ivec, ivec, key);
+ (*block)(ivec, ivec, key);
memcpy(out - 16 + residue, ivec, 16);
return len + residue;
}
size_t CRYPTO_cts128_encrypt(const unsigned char *in, unsigned char *out,
- size_t len, const void *key,
- unsigned char ivec[16], cbc128_f cbc)
+ size_t len, const void *key,
+ unsigned char ivec[16], cbc128_f cbc)
{
size_t residue;
union {
@@ -102,27 +102,27 @@ size_t CRYPTO_cts128_encrypt(const unsigned char *in, unsigned char *out,
len -= residue;
- (*cbc) (in, out, len, key, ivec, 1);
+ (*cbc)(in, out, len, key, ivec, 1);
in += len;
out += len;
#if defined(CBC_HANDLES_TRUNCATED_IO)
memcpy(tmp.c, out - 16, 16);
- (*cbc) (in, out - 16, residue, key, ivec, 1);
+ (*cbc)(in, out - 16, residue, key, ivec, 1);
memcpy(out, tmp.c, residue);
#else
memset(tmp.c, 0, sizeof(tmp));
memcpy(tmp.c, in, residue);
memcpy(out, out - 16, residue);
- (*cbc) (tmp.c, out - 16, 16, key, ivec, 1);
+ (*cbc)(tmp.c, out - 16, 16, key, ivec, 1);
#endif
return len + residue;
}
size_t CRYPTO_nistcts128_encrypt(const unsigned char *in, unsigned char *out,
- size_t len, const void *key,
- unsigned char ivec[16], cbc128_f cbc)
+ size_t len, const void *key,
+ unsigned char ivec[16], cbc128_f cbc)
{
size_t residue;
union {
@@ -137,7 +137,7 @@ size_t CRYPTO_nistcts128_encrypt(const unsigned char *in, unsigned char *out,
len -= residue;
- (*cbc) (in, out, len, key, ivec, 1);
+ (*cbc)(in, out, len, key, ivec, 1);
if (residue == 0)
return len;
@@ -146,19 +146,19 @@ size_t CRYPTO_nistcts128_encrypt(const unsigned char *in, unsigned char *out,
out += len;
#if defined(CBC_HANDLES_TRUNCATED_IO)
- (*cbc) (in, out - 16 + residue, residue, key, ivec, 1);
+ (*cbc)(in, out - 16 + residue, residue, key, ivec, 1);
#else
memset(tmp.c, 0, sizeof(tmp));
memcpy(tmp.c, in, residue);
- (*cbc) (tmp.c, out - 16 + residue, 16, key, ivec, 1);
+ (*cbc)(tmp.c, out - 16 + residue, 16, key, ivec, 1);
#endif
return len + residue;
}
size_t CRYPTO_cts128_decrypt_block(const unsigned char *in,
- unsigned char *out, size_t len,
- const void *key, unsigned char ivec[16],
- block128_f block)
+ unsigned char *out, size_t len,
+ const void *key, unsigned char ivec[16],
+ block128_f block)
{
size_t residue, n;
union {
@@ -180,11 +180,11 @@ size_t CRYPTO_cts128_decrypt_block(const unsigned char *in,
out += len;
}
- (*block) (in, tmp.c + 16, key);
+ (*block)(in, tmp.c + 16, key);
memcpy(tmp.c, tmp.c + 16, 16);
memcpy(tmp.c, in + 16, residue);
- (*block) (tmp.c, tmp.c, key);
+ (*block)(tmp.c, tmp.c, key);
for (n = 0; n < 16; ++n) {
unsigned char c = in[n];
@@ -198,10 +198,10 @@ size_t CRYPTO_cts128_decrypt_block(const unsigned char *in,
}
size_t CRYPTO_nistcts128_decrypt_block(const unsigned char *in,
- unsigned char *out, size_t len,
- const void *key,
- unsigned char ivec[16],
- block128_f block)
+ unsigned char *out, size_t len,
+ const void *key,
+ unsigned char ivec[16],
+ block128_f block)
{
size_t residue, n;
union {
@@ -227,11 +227,11 @@ size_t CRYPTO_nistcts128_decrypt_block(const unsigned char *in,
out += len;
}
- (*block) (in + residue, tmp.c + 16, key);
+ (*block)(in + residue, tmp.c + 16, key);
memcpy(tmp.c, tmp.c + 16, 16);
memcpy(tmp.c, in, residue);
- (*block) (tmp.c, tmp.c, key);
+ (*block)(tmp.c, tmp.c, key);
for (n = 0; n < 16; ++n) {
unsigned char c = in[n];
@@ -246,8 +246,8 @@ size_t CRYPTO_nistcts128_decrypt_block(const unsigned char *in,
}
size_t CRYPTO_cts128_decrypt(const unsigned char *in, unsigned char *out,
- size_t len, const void *key,
- unsigned char ivec[16], cbc128_f cbc)
+ size_t len, const void *key,
+ unsigned char ivec[16], cbc128_f cbc)
{
size_t residue;
union {
@@ -264,7 +264,7 @@ size_t CRYPTO_cts128_decrypt(const unsigned char *in, unsigned char *out,
len -= 16 + residue;
if (len) {
- (*cbc) (in, out, len, key, ivec, 0);
+ (*cbc)(in, out, len, key, ivec, 0);
in += len;
out += len;
}
@@ -273,21 +273,21 @@ size_t CRYPTO_cts128_decrypt(const unsigned char *in, unsigned char *out,
/*
* this places in[16] at &tmp.c[16] and decrypted block at &tmp.c[0]
*/
- (*cbc) (in, tmp.c, 16, key, tmp.c + 16, 0);
+ (*cbc)(in, tmp.c, 16, key, tmp.c + 16, 0);
memcpy(tmp.c, in + 16, residue);
#if defined(CBC_HANDLES_TRUNCATED_IO)
- (*cbc) (tmp.c, out, 16 + residue, key, ivec, 0);
+ (*cbc)(tmp.c, out, 16 + residue, key, ivec, 0);
#else
- (*cbc) (tmp.c, tmp.c, 32, key, ivec, 0);
+ (*cbc)(tmp.c, tmp.c, 32, key, ivec, 0);
memcpy(out, tmp.c, 16 + residue);
#endif
return 16 + len + residue;
}
size_t CRYPTO_nistcts128_decrypt(const unsigned char *in, unsigned char *out,
- size_t len, const void *key,
- unsigned char ivec[16], cbc128_f cbc)
+ size_t len, const void *key,
+ unsigned char ivec[16], cbc128_f cbc)
{
size_t residue;
union {
@@ -301,14 +301,14 @@ size_t CRYPTO_nistcts128_decrypt(const unsigned char *in, unsigned char *out,
residue = len % 16;
if (residue == 0) {
- (*cbc) (in, out, len, key, ivec, 0);
+ (*cbc)(in, out, len, key, ivec, 0);
return len;
}
len -= 16 + residue;
if (len) {
- (*cbc) (in, out, len, key, ivec, 0);
+ (*cbc)(in, out, len, key, ivec, 0);
in += len;
out += len;
}
@@ -317,13 +317,13 @@ size_t CRYPTO_nistcts128_decrypt(const unsigned char *in, unsigned char *out,
/*
* this places in[16] at &tmp.c[16] and decrypted block at &tmp.c[0]
*/
- (*cbc) (in + residue, tmp.c, 16, key, tmp.c + 16, 0);
+ (*cbc)(in + residue, tmp.c, 16, key, tmp.c + 16, 0);
memcpy(tmp.c, in, residue);
#if defined(CBC_HANDLES_TRUNCATED_IO)
- (*cbc) (tmp.c, out, 16 + residue, key, ivec, 0);
+ (*cbc)(tmp.c, out, 16 + residue, key, ivec, 0);
#else
- (*cbc) (tmp.c, tmp.c, 32, key, ivec, 0);
+ (*cbc)(tmp.c, tmp.c, 32, key, ivec, 0);
memcpy(out, tmp.c, 16 + residue);
#endif
return 16 + len + residue;
diff --git a/crypto/modes/gcm128.c b/crypto/modes/gcm128.c
index 366fe11215..16c13e2961 100644
--- a/crypto/modes/gcm128.c
+++ b/crypto/modes/gcm128.c
@@ -21,31 +21,31 @@ typedef size_t size_t_aX;
#if defined(BSWAP4) && defined(STRICT_ALIGNMENT)
/* redefine, because alignment is ensured */
-# undef GETU32
-# define GETU32(p) BSWAP4(*(const u32 *)(p))
-# undef PUTU32
-# define PUTU32(p,v) *(u32 *)(p) = BSWAP4(v)
+#undef GETU32
+#define GETU32(p) BSWAP4(*(const u32 *)(p))
+#undef PUTU32
+#define PUTU32(p, v) *(u32 *)(p) = BSWAP4(v)
#endif
/* RISC-V uses C implementation as a fallback. */
#if defined(__riscv)
-# define INCLUDE_C_GMULT_4BIT
-# define INCLUDE_C_GHASH_4BIT
-#endif
-
-#define PACK(s) ((size_t)(s)<<(sizeof(size_t)*8-16))
-#define REDUCE1BIT(V) do { \
- if (sizeof(size_t)==8) { \
- u64 T = U64(0xe100000000000000) & (0-(V.lo&1)); \
- V.lo = (V.hi<<63)|(V.lo>>1); \
- V.hi = (V.hi>>1 )^T; \
- } \
- else { \
- u32 T = 0xe1000000U & (0-(u32)(V.lo&1)); \
- V.lo = (V.hi<<63)|(V.lo>>1); \
- V.hi = (V.hi>>1 )^((u64)T<<32); \
- } \
-} while(0)
+#define INCLUDE_C_GMULT_4BIT
+#define INCLUDE_C_GHASH_4BIT
+#endif
+
+#define PACK(s) ((size_t)(s) << (sizeof(size_t) * 8 - 16))
+#define REDUCE1BIT(V) \
+ do { \
+ if (sizeof(size_t) == 8) { \
+ u64 T = U64(0xe100000000000000) & (0 - (V.lo & 1)); \
+ V.lo = (V.hi << 63) | (V.lo >> 1); \
+ V.hi = (V.hi >> 1) ^ T; \
+ } else { \
+ u32 T = 0xe1000000U & (0 - (u32)(V.lo & 1)); \
+ V.lo = (V.hi << 63) | (V.lo >> 1); \
+ V.hi = (V.hi >> 1) ^ ((u64)T << 32); \
+ } \
+ } while (0)
/*-
*
@@ -88,16 +88,16 @@ typedef size_t size_t_aX;
static void gcm_init_4bit(u128 Htable[16], const u64 H[2])
{
u128 V;
-# if defined(OPENSSL_SMALL_FOOTPRINT)
+#if defined(OPENSSL_SMALL_FOOTPRINT)
int i;
-# endif
+#endif
Htable[0].hi = 0;
Htable[0].lo = 0;
V.hi = H[0];
V.lo = H[1];
-# if defined(OPENSSL_SMALL_FOOTPRINT)
+#if defined(OPENSSL_SMALL_FOOTPRINT)
for (Htable[8] = V, i = 4; i > 0; i >>= 1) {
REDUCE1BIT(V);
Htable[i] = V;
@@ -111,7 +111,7 @@ static void gcm_init_4bit(u128 Htable[16], const u64 H[2])
Hi[j].lo = V.lo ^ Htable[j].lo;
}
}
-# else
+#else
Htable[8] = V;
REDUCE1BIT(V);
Htable[4] = V;
@@ -132,8 +132,8 @@ static void gcm_init_4bit(u128 Htable[16], const u64 H[2])
Htable[13].hi = V.hi ^ Htable[5].hi, Htable[13].lo = V.lo ^ Htable[5].lo;
Htable[14].hi = V.hi ^ Htable[6].hi, Htable[14].lo = V.lo ^ Htable[6].lo;
Htable[15].hi = V.hi ^ Htable[7].hi, Htable[15].lo = V.lo ^ Htable[7].lo;
-# endif
-# if defined(GHASH_ASM) && (defined(__arm__) || defined(__arm))
+#endif
+#if defined(GHASH_ASM) && (defined(__arm__) || defined(__arm))
/*
* ARM assembler expects specific dword order in Htable.
*/
@@ -146,17 +146,18 @@ static void gcm_init_4bit(u128 Htable[16], const u64 H[2])
V = Htable[j];
Htable[j].hi = V.lo;
Htable[j].lo = V.hi;
- } else
+ }
+ else
for (j = 0; j < 16; ++j) {
V = Htable[j];
Htable[j].hi = V.lo << 32 | V.lo >> 32;
Htable[j].lo = V.hi << 32 | V.hi >> 32;
}
}
-# endif
+#endif
}
-# if !defined(GHASH_ASM) || defined(INCLUDE_C_GMULT_4BIT)
+#if !defined(GHASH_ASM) || defined(INCLUDE_C_GMULT_4BIT)
static const size_t rem_4bit[16] = {
PACK(0x0000), PACK(0x1C20), PACK(0x3840), PACK(0x2460),
PACK(0x7080), PACK(0x6CA0), PACK(0x48C0), PACK(0x54E0),
@@ -210,10 +211,10 @@ static void gcm_gmult_4bit(u64 Xi[2], const u128 Htable[16])
}
if (IS_LITTLE_ENDIAN) {
-# ifdef BSWAP8
+#ifdef BSWAP8
Xi[0] = BSWAP8(Z.hi);
Xi[1] = BSWAP8(Z.lo);
-# else
+#else
u8 *p = (u8 *)Xi;
u32 v;
v = (u32)(Z.hi >> 32);
@@ -224,17 +225,17 @@ static void gcm_gmult_4bit(u64 Xi[2], const u128 Htable[16])
PUTU32(p + 8, v);
v = (u32)(Z.lo);
PUTU32(p + 12, v);
-# endif
+#endif
} else {
Xi[0] = Z.hi;
Xi[1] = Z.lo;
}
}
-# endif
+#endif
-# if !defined(GHASH_ASM) || defined(INCLUDE_C_GHASH_4BIT)
-# if !defined(OPENSSL_SMALL_FOOTPRINT)
+#if !defined(GHASH_ASM) || defined(INCLUDE_C_GHASH_4BIT)
+#if !defined(OPENSSL_SMALL_FOOTPRINT)
/*
* Streamed gcm_mult_4bit, see CRYPTO_gcm128_[en|de]crypt for
* details... Compiler-generated code doesn't seem to give any
@@ -243,7 +244,7 @@ static void gcm_gmult_4bit(u64 Xi[2], const u128 Htable[16])
* non-trivial optimization[s]...
*/
static void gcm_ghash_4bit(u64 Xi[2], const u128 Htable[16],
- const u8 *inp, size_t len)
+ const u8 *inp, size_t len)
{
u128 Z;
int cnt;
@@ -293,10 +294,10 @@ static void gcm_ghash_4bit(u64 Xi[2], const u128 Htable[16],
}
if (IS_LITTLE_ENDIAN) {
-# ifdef BSWAP8
+#ifdef BSWAP8
Xi[0] = BSWAP8(Z.hi);
Xi[1] = BSWAP8(Z.lo);
-# else
+#else
u8 *p = (u8 *)Xi;
u32 v;
v = (u32)(Z.hi >> 32);
@@ -307,7 +308,7 @@ static void gcm_ghash_4bit(u64 Xi[2], const u128 Htable[16],
PUTU32(p + 8, v);
v = (u32)(Z.lo);
PUTU32(p + 12, v);
-# endif
+#endif
} else {
Xi[0] = Z.hi;
Xi[1] = Z.lo;
@@ -318,91 +319,88 @@ static void gcm_ghash_4bit(u64 Xi[2], const u128 Htable[16],
len -= 16;
} while (len > 0);
}
-# endif
-# else
+#endif
+#else
void gcm_gmult_4bit(u64 Xi[2], const u128 Htable[16]);
void gcm_ghash_4bit(u64 Xi[2], const u128 Htable[16], const u8 *inp,
- size_t len);
-# endif
+ size_t len);
+#endif
-# define GCM_MUL(ctx) ctx->funcs.gmult(ctx->Xi.u,ctx->Htable)
-# if defined(GHASH_ASM) || !defined(OPENSSL_SMALL_FOOTPRINT)
-# define GHASH(ctx,in,len) ctx->funcs.ghash((ctx)->Xi.u,(ctx)->Htable,in,len)
+#define GCM_MUL(ctx) ctx->funcs.gmult(ctx->Xi.u, ctx->Htable)
+#if defined(GHASH_ASM) || !defined(OPENSSL_SMALL_FOOTPRINT)
+#define GHASH(ctx, in, len) ctx->funcs.ghash((ctx)->Xi.u, (ctx)->Htable, in, len)
/*
* GHASH_CHUNK is "stride parameter" missioned to mitigate cache trashing
* effect. In other words idea is to hash data while it's still in L1 cache
* after encryption pass...
*/
-# define GHASH_CHUNK (3*1024)
-# endif
+#define GHASH_CHUNK (3 * 1024)
+#endif
-#if (defined(GHASH_ASM) || defined(OPENSSL_CPUID_OBJ))
-# if !defined(I386_ONLY) && \
- (defined(__i386) || defined(__i386__) || \
- defined(__x86_64) || defined(__x86_64__) || \
- defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64))
-# define GHASH_ASM_X86_OR_64
+#if (defined(GHASH_ASM) || defined(OPENSSL_CPUID_OBJ))
+#if !defined(I386_ONLY) && (defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__) || defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64))
+#define GHASH_ASM_X86_OR_64
void gcm_init_clmul(u128 Htable[16], const u64 Xi[2]);
void gcm_gmult_clmul(u64 Xi[2], const u128 Htable[16]);
void gcm_ghash_clmul(u64 Xi[2], const u128 Htable[16], const u8 *inp,
- size_t len);
+ size_t len);
-# if defined(__i386) || defined(__i386__) || defined(_M_IX86)
-# define gcm_init_avx gcm_init_clmul
-# define gcm_gmult_avx gcm_gmult_clmul
-# define gcm_ghash_avx gcm_ghash_clmul
-# else
+#if defined(__i386) || defined(__i386__) || defined(_M_IX86)
+#define gcm_init_avx gcm_init_clmul
+#define gcm_gmult_avx gcm_gmult_clmul
+#define gcm_ghash_avx gcm_ghash_clmul
+#else
void gcm_init_avx(u128 Htable[16], const u64 Xi[2]);
void gcm_gmult_avx(u64 Xi[2], const u128 Htable[16]);
void gcm_ghash_avx(u64 Xi[2], const u128 Htable[16], const u8 *inp,
- size_t len);
-# endif
+ size_t len);
+#endif
-# if defined(__i386) || defined(__i386__) || defined(_M_IX86)
-# define GHASH_ASM_X86
+#if defined(__i386) || defined(__i386__) || defined(_M_IX86)
+#define GHASH_ASM_X86
void gcm_gmult_4bit_mmx(u64 Xi[2], const u128 Htable[16]);
void gcm_ghash_4bit_mmx(u64 Xi[2], const u128 Htable[16], const u8 *inp,
- size_t len);
+ size_t len);
void gcm_gmult_4bit_x86(u64 Xi[2], const u128 Htable[16]);
void gcm_ghash_4bit_x86(u64 Xi[2], const u128 Htable[16], const u8 *inp,
- size_t len);
-# endif
-# elif defined(__arm__) || defined(__arm) || defined(__aarch64__) || defined(_M_ARM64)
-# include "arm_arch.h"
-# if __ARM_MAX_ARCH__>=7
-# define GHASH_ASM_ARM
-# define PMULL_CAPABLE (OPENSSL_armcap_P & ARMV8_PMULL)
-# if defined(__arm__) || defined(__arm)
-# define NEON_CAPABLE (OPENSSL_armcap_P & ARMV7_NEON)
-# endif
+ size_t len);
+#endif
+#elif defined(__arm__) || defined(__arm) || defined(__aarch64__) || defined(_M_ARM64)
+#include "arm_arch.h"
+#if __ARM_MAX_ARCH__ >= 7
+#define GHASH_ASM_ARM
+#define PMULL_CAPABLE (OPENSSL_armcap_P & ARMV8_PMULL)
+#if defined(__arm__) || defined(__arm)
+#define NEON_CAPABLE (OPENSSL_armcap_P & ARMV7_NEON)
+#endif
void gcm_init_neon(u128 Htable[16], const u64 Xi[2]);
void gcm_gmult_neon(u64 Xi[2], const u128 Htable[16]);
void gcm_ghash_neon(u64 Xi[2], const u128 Htable[16], const u8 *inp,
- size_t len);
+ size_t len);
void gcm_init_v8(u128 Htable[16], const u64 Xi[2]);
void gcm_gmult_v8(u64 Xi[2], const u128 Htable[16]);
void gcm_ghash_v8(u64 Xi[2], const u128 Htable[16], const u8 *inp,
- size_t len);
-# endif
-# elif defined(__sparc__) || defined(__sparc)
-# include "crypto/sparc_arch.h"
-# define GHASH_ASM_SPARC
+ size_t len);
+#endif
+#elif defined(__sparc__) || defined(__sparc)
+#include "crypto/sparc_arch.h"
+#define GHASH_ASM_SPARC
void gcm_init_vis3(u128 Htable[16], const u64 Xi[2]);
void gcm_gmult_vis3(u64 Xi[2], const u128 Htable[16]);
void gcm_ghash_vis3(u64 Xi[2], const u128 Htable[16], const u8 *inp,
- size_t len);
-# elif defined(OPENSSL_CPUID_OBJ) && (defined(__powerpc__) || defined(__POWERPC__) || defined(_ARCH_PPC))
-# include "crypto/ppc_arch.h"
-# define GHASH_ASM_PPC
+ size_t len);
+#elif defined(OPENSSL_CPUID_OBJ) && (defined(__powerpc__) || defined(__POWERPC__) || defined(_ARCH_PPC))
+#include "crypto/ppc_arch.h"
+#define GHASH_ASM_PPC
void gcm_init_p8(u128 Htable[16], const u64 Xi[2]);
void gcm_gmult_p8(u64 Xi[2], const u128 Htable[16]);
void gcm_ghash_p8(u64 Xi[2], const u128 Htable[16], const u8 *inp,
- size_t len);
-# elif defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64
-# include "crypto/riscv_arch.h"
-# define GHASH_ASM_RV64I
+ size_t len);
+#elif defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64
+#include "crypto/riscv_arch.h"
+#define GHASH_ASM_RV64I
/* Zbc/Zbkc (scalar crypto with clmul) based routines. */
void gcm_init_rv64i_zbc(u128 Htable[16], const u64 Xi[2]);
void gcm_init_rv64i_zbc__zbb(u128 Htable[16], const u64 Xi[2]);
@@ -410,21 +408,21 @@ void gcm_init_rv64i_zbc__zbkb(u128 Htable[16], const u64 Xi[2]);
void gcm_gmult_rv64i_zbc(u64 Xi[2], const u128 Htable[16]);
void gcm_gmult_rv64i_zbc__zbkb(u64 Xi[2], const u128 Htable[16]);
void gcm_ghash_rv64i_zbc(u64 Xi[2], const u128 Htable[16],
- const u8 *inp, size_t len);
+ const u8 *inp, size_t len);
void gcm_ghash_rv64i_zbc__zbkb(u64 Xi[2], const u128 Htable[16],
- const u8 *inp, size_t len);
+ const u8 *inp, size_t len);
/* zvkb/Zvbc (vector crypto with vclmul) based routines. */
void gcm_init_rv64i_zvkb_zvbc(u128 Htable[16], const u64 Xi[2]);
void gcm_gmult_rv64i_zvkb_zvbc(u64 Xi[2], const u128 Htable[16]);
void gcm_ghash_rv64i_zvkb_zvbc(u64 Xi[2], const u128 Htable[16],
- const u8 *inp, size_t len);
+ const u8 *inp, size_t len);
/* Zvkg (vector crypto with vgmul.vv and vghsh.vv). */
void gcm_init_rv64i_zvkg(u128 Htable[16], const u64 Xi[2]);
void gcm_init_rv64i_zvkg_zvkb(u128 Htable[16], const u64 Xi[2]);
void gcm_gmult_rv64i_zvkg(u64 Xi[2], const u128 Htable[16]);
void gcm_ghash_rv64i_zvkg(u64 Xi[2], const u128 Htable[16],
- const u8 *inp, size_t len);
-# endif
+ const u8 *inp, size_t len);
+#endif
#endif
static void gcm_get_funcs(struct gcm_funcs_st *ctx)
@@ -443,7 +441,7 @@ static void gcm_get_funcs(struct gcm_funcs_st *ctx)
#endif
#if defined(GHASH_ASM_X86_OR_64)
-# if !defined(GHASH_ASM_X86) || defined(OPENSSL_IA32_SSE2)
+#if !defined(GHASH_ASM_X86) || defined(OPENSSL_IA32_SSE2)
/* x86_64 */
if (OPENSSL_ia32cap_P[1] & (1 << 1)) { /* check PCLMULQDQ bit */
if (((OPENSSL_ia32cap_P[1] >> 22) & 0x41) == 0x41) { /* AVX+MOVBE */
@@ -457,52 +455,52 @@ static void gcm_get_funcs(struct gcm_funcs_st *ctx)
}
return;
}
-# endif
-# if defined(GHASH_ASM_X86)
+#endif
+#if defined(GHASH_ASM_X86)
/* x86 only */
-# if defined(OPENSSL_IA32_SSE2)
+#if defined(OPENSSL_IA32_SSE2)
if (OPENSSL_ia32cap_P[0] & (1 << 25)) { /* check SSE bit */
ctx->gmult = gcm_gmult_4bit_mmx;
ctx->ghash = gcm_ghash_4bit_mmx;
return;
}
-# else
+#else
if (OPENSSL_ia32cap_P[0] & (1 << 23)) { /* check MMX bit */
ctx->gmult = gcm_gmult_4bit_mmx;
ctx->ghash = gcm_ghash_4bit_mmx;
return;
}
-# endif
+#endif
ctx->gmult = gcm_gmult_4bit_x86;
ctx->ghash = gcm_ghash_4bit_x86;
return;
-# else
+#else
/* x86_64 fallback defaults */
ctx->gmult = gcm_gmult_4bit;
ctx->ghash = gcm_ghash_4bit;
return;
-# endif
+#endif
#elif defined(GHASH_ASM_ARM)
/* ARM defaults */
ctx->gmult = gcm_gmult_4bit;
-# if !defined(OPENSSL_SMALL_FOOTPRINT)
+#if !defined(OPENSSL_SMALL_FOOTPRINT)
ctx->ghash = gcm_ghash_4bit;
-# else
+#else
ctx->ghash = NULL;
-# endif
-# ifdef PMULL_CAPABLE
+#endif
+#ifdef PMULL_CAPABLE
if (PMULL_CAPABLE) {
ctx->ginit = (gcm_init_fn)gcm_init_v8;
ctx->gmult = gcm_gmult_v8;
ctx->ghash = gcm_ghash_v8;
}
-# elif defined(NEON_CAPABLE)
+#elif defined(NEON_CAPABLE)
if (NEON_CAPABLE) {
ctx->ginit = gcm_init_neon;
ctx->gmult = gcm_gmult_neon;
ctx->ghash = gcm_ghash_neon;
}
-# endif
+#endif
return;
#elif defined(GHASH_ASM_SPARC)
/* SPARC defaults */
@@ -579,7 +577,7 @@ void ossl_gcm_gmult_4bit(u64 Xi[2], const u128 Htable[16])
}
void ossl_gcm_ghash_4bit(u64 Xi[2], const u128 Htable[16],
- const u8 *inp, size_t len)
+ const u8 *inp, size_t len)
{
struct gcm_funcs_st funcs;
u64 tmp[2];
@@ -607,7 +605,7 @@ void CRYPTO_gcm128_init(GCM128_CONTEXT *ctx, void *key, block128_f block)
ctx->block = block;
ctx->key = key;
- (*block) (ctx->H.c, ctx->H.c, key);
+ (*block)(ctx->H.c, ctx->H.c, key);
if (IS_LITTLE_ENDIAN) {
/* H is stored in host byte order */
@@ -629,13 +627,13 @@ void CRYPTO_gcm128_init(GCM128_CONTEXT *ctx, void *key, block128_f block)
}
void CRYPTO_gcm128_setiv(GCM128_CONTEXT *ctx, const unsigned char *iv,
- size_t len)
+ size_t len)
{
DECLARE_IS_ENDIAN;
unsigned int ctr;
- ctx->len.u[0] = 0; /* AAD length */
- ctx->len.u[1] = 0; /* message length */
+ ctx->len.u[0] = 0; /* AAD length */
+ ctx->len.u[1] = 0; /* message length */
ctx->ares = 0;
ctx->mres = 0;
@@ -703,7 +701,7 @@ void CRYPTO_gcm128_setiv(GCM128_CONTEXT *ctx, const unsigned char *iv,
ctx->Xi.u[0] = 0;
ctx->Xi.u[1] = 0;
- (*ctx->block) (ctx->Yi.c, ctx->EK0.c, ctx->key);
+ (*ctx->block)(ctx->Yi.c, ctx->EK0.c, ctx->key);
++ctr;
if (IS_LITTLE_ENDIAN)
#ifdef BSWAP4
@@ -716,7 +714,7 @@ void CRYPTO_gcm128_setiv(GCM128_CONTEXT *ctx, const unsigned char *iv,
}
int CRYPTO_gcm128_aad(GCM128_CONTEXT *ctx, const unsigned char *aad,
- size_t len)
+ size_t len)
{
size_t i;
unsigned int n;
@@ -770,8 +768,8 @@ int CRYPTO_gcm128_aad(GCM128_CONTEXT *ctx, const unsigned char *aad,
}
int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx,
- const unsigned char *in, unsigned char *out,
- size_t len)
+ const unsigned char *in, unsigned char *out,
+ size_t len)
{
DECLARE_IS_ENDIAN;
unsigned int n, ctr, mres;
@@ -819,7 +817,7 @@ int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx,
if (16 % sizeof(size_t) == 0) { /* always true actually */
do {
if (n) {
-# if defined(GHASH)
+#if defined(GHASH)
while (n && len) {
ctx->Xn[mres++] = *(out++) = *(in++) ^ ctx->EKi.c[n];
--len;
@@ -832,7 +830,7 @@ int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx,
ctx->mres = mres;
return 0;
}
-# else
+#else
while (n && len) {
ctx->Xi.c[n] ^= *(out++) = *(in++) ^ ctx->EKi.c[n];
--len;
@@ -845,18 +843,18 @@ int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx,
ctx->mres = n;
return 0;
}
-# endif
+#endif
}
-# if defined(STRICT_ALIGNMENT)
+#if defined(STRICT_ALIGNMENT)
if (((size_t)in | (size_t)out) % sizeof(size_t) != 0)
break;
-# endif
-# if defined(GHASH)
+#endif
+#if defined(GHASH)
if (len >= 16 && mres) {
GHASH(ctx, ctx->Xn, mres);
mres = 0;
}
-# if defined(GHASH_CHUNK)
+#if defined(GHASH_CHUNK)
while (len >= GHASH_CHUNK) {
size_t j = GHASH_CHUNK;
@@ -864,14 +862,14 @@ int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx,
size_t_aX *out_t = (size_t_aX *)out;
const size_t_aX *in_t = (const size_t_aX *)in;
- (*block) (ctx->Yi.c, ctx->EKi.c, key);
+ (*block)(ctx->Yi.c, ctx->EKi.c, key);
++ctr;
if (IS_LITTLE_ENDIAN)
-# ifdef BSWAP4
+#ifdef BSWAP4
ctx->Yi.d[3] = BSWAP4(ctr);
-# else
+#else
PUTU32(ctx->Yi.c + 12, ctr);
-# endif
+#endif
else
ctx->Yi.d[3] = ctr;
for (i = 0; i < 16 / sizeof(size_t); ++i)
@@ -883,7 +881,7 @@ int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx,
GHASH(ctx, out - GHASH_CHUNK, GHASH_CHUNK);
len -= GHASH_CHUNK;
}
-# endif
+#endif
if ((i = (len & (size_t)-16))) {
size_t j = i;
@@ -891,14 +889,14 @@ int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx,
size_t_aX *out_t = (size_t_aX *)out;
const size_t_aX *in_t = (const size_t_aX *)in;
- (*block) (ctx->Yi.c, ctx->EKi.c, key);
+ (*block)(ctx->Yi.c, ctx->EKi.c, key);
++ctr;
if (IS_LITTLE_ENDIAN)
-# ifdef BSWAP4
+#ifdef BSWAP4
ctx->Yi.d[3] = BSWAP4(ctr);
-# else
+#else
PUTU32(ctx->Yi.c + 12, ctr);
-# endif
+#endif
else
ctx->Yi.d[3] = ctr;
for (i = 0; i < 16 / sizeof(size_t); ++i)
@@ -909,19 +907,19 @@ int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx,
}
GHASH(ctx, out - j, j);
}
-# else
+#else
while (len >= 16) {
size_t *out_t = (size_t *)out;
const size_t *in_t = (const size_t *)in;
- (*block) (ctx->Yi.c, ctx->EKi.c, key);
+ (*block)(ctx->Yi.c, ctx->EKi.c, key);
++ctr;
if (IS_LITTLE_ENDIAN)
-# ifdef BSWAP4
+#ifdef BSWAP4
ctx->Yi.d[3] = BSWAP4(ctr);
-# else
+#else
PUTU32(ctx->Yi.c + 12, ctr);
-# endif
+#endif
else
ctx->Yi.d[3] = ctr;
for (i = 0; i < 16 / sizeof(size_t); ++i)
@@ -931,30 +929,30 @@ int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx,
in += 16;
len -= 16;
}
-# endif
+#endif
if (len) {
- (*block) (ctx->Yi.c, ctx->EKi.c, key);
+ (*block)(ctx->Yi.c, ctx->EKi.c, key);
++ctr;
if (IS_LITTLE_ENDIAN)
-# ifdef BSWAP4
+#ifdef BSWAP4
ctx->Yi.d[3] = BSWAP4(ctr);
-# else
+#else
PUTU32(ctx->Yi.c + 12, ctr);
-# endif
+#endif
else
ctx->Yi.d[3] = ctr;
-# if defined(GHASH)
+#if defined(GHASH)
while (len--) {
ctx->Xn[mres++] = out[n] = in[n] ^ ctx->EKi.c[n];
++n;
}
-# else
+#else
while (len--) {
ctx->Xi.c[n] ^= out[n] = in[n] ^ ctx->EKi.c[n];
++n;
}
mres = n;
-# endif
+#endif
}
ctx->mres = mres;
@@ -964,7 +962,7 @@ int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx,
#endif
for (i = 0; i < len; ++i) {
if (n == 0) {
- (*block) (ctx->Yi.c, ctx->EKi.c, key);
+ (*block)(ctx->Yi.c, ctx->EKi.c, key);
++ctr;
if (IS_LITTLE_ENDIAN)
#ifdef BSWAP4
@@ -979,7 +977,7 @@ int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx,
ctx->Xn[mres++] = out[i] = in[i] ^ ctx->EKi.c[n];
n = (n + 1) % 16;
if (mres == sizeof(ctx->Xn)) {
- GHASH(ctx,ctx->Xn,sizeof(ctx->Xn));
+ GHASH(ctx, ctx->Xn, sizeof(ctx->Xn));
mres = 0;
}
#else
@@ -995,8 +993,8 @@ int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx,
}
int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx,
- const unsigned char *in, unsigned char *out,
- size_t len)
+ const unsigned char *in, unsigned char *out,
+ size_t len)
{
DECLARE_IS_ENDIAN;
unsigned int n, ctr, mres;
@@ -1044,7 +1042,7 @@ int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx,
if (16 % sizeof(size_t) == 0) { /* always true actually */
do {
if (n) {
-# if defined(GHASH)
+#if defined(GHASH)
while (n && len) {
*(out++) = (ctx->Xn[mres++] = *(in++)) ^ ctx->EKi.c[n];
--len;
@@ -1057,7 +1055,7 @@ int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx,
ctx->mres = mres;
return 0;
}
-# else
+#else
while (n && len) {
u8 c = *(in++);
*(out++) = c ^ ctx->EKi.c[n];
@@ -1072,18 +1070,18 @@ int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx,
ctx->mres = n;
return 0;
}
-# endif
+#endif
}
-# if defined(STRICT_ALIGNMENT)
+#if defined(STRICT_ALIGNMENT)
if (((size_t)in | (size_t)out) % sizeof(size_t) != 0)
break;
-# endif
-# if defined(GHASH)
+#endif
+#if defined(GHASH)
if (len >= 16 && mres) {
GHASH(ctx, ctx->Xn, mres);
mres = 0;
}
-# if defined(GHASH_CHUNK)
+#if defined(GHASH_CHUNK)
while (len >= GHASH_CHUNK) {
size_t j = GHASH_CHUNK;
@@ -1092,14 +1090,14 @@ int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx,
size_t_aX *out_t = (size_t_aX *)out;
const size_t_aX *in_t = (const size_t_aX *)in;
- (*block) (ctx->Yi.c, ctx->EKi.c, key);
+ (*block)(ctx->Yi.c, ctx->EKi.c, key);
++ctr;
if (IS_LITTLE_ENDIAN)
-# ifdef BSWAP4
+#ifdef BSWAP4
ctx->Yi.d[3] = BSWAP4(ctr);
-# else
+#else
PUTU32(ctx->Yi.c + 12, ctr);
-# endif
+#endif
else
ctx->Yi.d[3] = ctr;
for (i = 0; i < 16 / sizeof(size_t); ++i)
@@ -1110,21 +1108,21 @@ int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx,
}
len -= GHASH_CHUNK;
}
-# endif
+#endif
if ((i = (len & (size_t)-16))) {
GHASH(ctx, in, i);
while (len >= 16) {
size_t_aX *out_t = (size_t_aX *)out;
const size_t_aX *in_t = (const size_t_aX *)in;
- (*block) (ctx->Yi.c, ctx->EKi.c, key);
+ (*block)(ctx->Yi.c, ctx->EKi.c, key);
++ctr;
if (IS_LITTLE_ENDIAN)
-# ifdef BSWAP4
+#ifdef BSWAP4
ctx->Yi.d[3] = BSWAP4(ctr);
-# else
+#else
PUTU32(ctx->Yi.c + 12, ctr);
-# endif
+#endif
else
ctx->Yi.d[3] = ctr;
for (i = 0; i < 16 / sizeof(size_t); ++i)
@@ -1134,19 +1132,19 @@ int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx,
len -= 16;
}
}
-# else
+#else
while (len >= 16) {
size_t *out_t = (size_t *)out;
const size_t *in_t = (const size_t *)in;
- (*block) (ctx->Yi.c, ctx->EKi.c, key);
+ (*block)(ctx->Yi.c, ctx->EKi.c, key);
++ctr;
if (IS_LITTLE_ENDIAN)
-# ifdef BSWAP4
+#ifdef BSWAP4
ctx->Yi.d[3] = BSWAP4(ctr);
-# else
+#else
PUTU32(ctx->Yi.c + 12, ctr);
-# endif
+#endif
else
ctx->Yi.d[3] = ctr;
for (i = 0; i < 16 / sizeof(size_t); ++i) {
@@ -1159,24 +1157,24 @@ int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx,
in += 16;
len -= 16;
}
-# endif
+#endif
if (len) {
- (*block) (ctx->Yi.c, ctx->EKi.c, key);
+ (*block)(ctx->Yi.c, ctx->EKi.c, key);
++ctr;
if (IS_LITTLE_ENDIAN)
-# ifdef BSWAP4
+#ifdef BSWAP4
ctx->Yi.d[3] = BSWAP4(ctr);
-# else
+#else
PUTU32(ctx->Yi.c + 12, ctr);
-# endif
+#endif
else
ctx->Yi.d[3] = ctr;
-# if defined(GHASH)
+#if defined(GHASH)
while (len--) {
out[n] = (ctx->Xn[mres++] = in[n]) ^ ctx->EKi.c[n];
++n;
}
-# else
+#else
while (len--) {
u8 c = in[n];
ctx->Xi.c[n] ^= c;
@@ -1184,7 +1182,7 @@ int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx,
++n;
}
mres = n;
-# endif
+#endif
}
ctx->mres = mres;
@@ -1195,7 +1193,7 @@ int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx,
for (i = 0; i < len; ++i) {
u8 c;
if (n == 0) {
- (*block) (ctx->Yi.c, ctx->EKi.c, key);
+ (*block)(ctx->Yi.c, ctx->EKi.c, key);
++ctr;
if (IS_LITTLE_ENDIAN)
#ifdef BSWAP4
@@ -1210,7 +1208,7 @@ int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx,
out[i] = (ctx->Xn[mres++] = c = in[i]) ^ ctx->EKi.c[n];
n = (n + 1) % 16;
if (mres == sizeof(ctx->Xn)) {
- GHASH(ctx,ctx->Xn,sizeof(ctx->Xn));
+ GHASH(ctx, ctx->Xn, sizeof(ctx->Xn));
mres = 0;
}
#else
@@ -1228,8 +1226,8 @@ int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx,
}
int CRYPTO_gcm128_encrypt_ctr32(GCM128_CONTEXT *ctx,
- const unsigned char *in, unsigned char *out,
- size_t len, ctr128_f stream)
+ const unsigned char *in, unsigned char *out,
+ size_t len, ctr128_f stream)
{
#if defined(OPENSSL_SMALL_FOOTPRINT)
return CRYPTO_gcm128_encrypt(ctx, in, out, len);
@@ -1266,17 +1264,17 @@ int CRYPTO_gcm128_encrypt_ctr32(GCM128_CONTEXT *ctx,
}
if (IS_LITTLE_ENDIAN)
-# ifdef BSWAP4
+#ifdef BSWAP4
ctr = BSWAP4(ctx->Yi.d[3]);
-# else
+#else
ctr = GETU32(ctx->Yi.c + 12);
-# endif
+#endif
else
ctr = ctx->Yi.d[3];
n = mres % 16;
if (n) {
-# if defined(GHASH)
+#if defined(GHASH)
while (n && len) {
ctx->Xn[mres++] = *(out++) = *(in++) ^ ctx->EKi.c[n];
--len;
@@ -1289,7 +1287,7 @@ int CRYPTO_gcm128_encrypt_ctr32(GCM128_CONTEXT *ctx,
ctx->mres = mres;
return 0;
}
-# else
+#else
while (n && len) {
ctx->Xi.c[n] ^= *(out++) = *(in++) ^ ctx->EKi.c[n];
--len;
@@ -1302,23 +1300,23 @@ int CRYPTO_gcm128_encrypt_ctr32(GCM128_CONTEXT *ctx,
ctx->mres = n;
return 0;
}
-# endif
+#endif
}
-# if defined(GHASH)
- if (len >= 16 && mres) {
- GHASH(ctx, ctx->Xn, mres);
- mres = 0;
- }
-# if defined(GHASH_CHUNK)
+#if defined(GHASH)
+ if (len >= 16 && mres) {
+ GHASH(ctx, ctx->Xn, mres);
+ mres = 0;
+ }
+#if defined(GHASH_CHUNK)
while (len >= GHASH_CHUNK) {
- (*stream) (in, out, GHASH_CHUNK / 16, key, ctx->Yi.c);
+ (*stream)(in, out, GHASH_CHUNK / 16, key, ctx->Yi.c);
ctr += GHASH_CHUNK / 16;
if (IS_LITTLE_ENDIAN)
-# ifdef BSWAP4
+#ifdef BSWAP4
ctx->Yi.d[3] = BSWAP4(ctr);
-# else
+#else
PUTU32(ctx->Yi.c + 12, ctr);
-# endif
+#endif
else
ctx->Yi.d[3] = ctr;
GHASH(ctx, out, GHASH_CHUNK);
@@ -1326,52 +1324,52 @@ int CRYPTO_gcm128_encrypt_ctr32(GCM128_CONTEXT *ctx,
in += GHASH_CHUNK;
len -= GHASH_CHUNK;
}
-# endif
-# endif
+#endif
+#endif
if ((i = (len & (size_t)-16))) {
size_t j = i / 16;
- (*stream) (in, out, j, key, ctx->Yi.c);
+ (*stream)(in, out, j, key, ctx->Yi.c);
ctr += (unsigned int)j;
if (IS_LITTLE_ENDIAN)
-# ifdef BSWAP4
+#ifdef BSWAP4
ctx->Yi.d[3] = BSWAP4(ctr);
-# else
+#else
PUTU32(ctx->Yi.c + 12, ctr);
-# endif
+#endif
else
ctx->Yi.d[3] = ctr;
in += i;
len -= i;
-# if defined(GHASH)
+#if defined(GHASH)
GHASH(ctx, out, i);
out += i;
-# else
+#else
while (j--) {
for (i = 0; i < 16; ++i)
ctx->Xi.c[i] ^= out[i];
GCM_MUL(ctx);
out += 16;
}
-# endif
+#endif
}
if (len) {
- (*ctx->block) (ctx->Yi.c, ctx->EKi.c, key);
+ (*ctx->block)(ctx->Yi.c, ctx->EKi.c, key);
++ctr;
if (IS_LITTLE_ENDIAN)
-# ifdef BSWAP4
+#ifdef BSWAP4
ctx->Yi.d[3] = BSWAP4(ctr);
-# else
+#else
PUTU32(ctx->Yi.c + 12, ctr);
-# endif
+#endif
else
ctx->Yi.d[3] = ctr;
while (len--) {
-# if defined(GHASH)
+#if defined(GHASH)
ctx->Xn[mres++] = out[n] = in[n] ^ ctx->EKi.c[n];
-# else
+#else
ctx->Xi.c[mres++] ^= out[n] = in[n] ^ ctx->EKi.c[n];
-# endif
+#endif
++n;
}
}
@@ -1382,8 +1380,8 @@ int CRYPTO_gcm128_encrypt_ctr32(GCM128_CONTEXT *ctx,
}
int CRYPTO_gcm128_decrypt_ctr32(GCM128_CONTEXT *ctx,
- const unsigned char *in, unsigned char *out,
- size_t len, ctr128_f stream)
+ const unsigned char *in, unsigned char *out,
+ size_t len, ctr128_f stream)
{
#if defined(OPENSSL_SMALL_FOOTPRINT)
return CRYPTO_gcm128_decrypt(ctx, in, out, len);
@@ -1403,7 +1401,7 @@ int CRYPTO_gcm128_decrypt_ctr32(GCM128_CONTEXT *ctx,
if (ctx->ares) {
/* First call to decrypt finalizes GHASH(AAD) */
-# if defined(GHASH)
+#if defined(GHASH)
if (len == 0) {
GCM_MUL(ctx);
ctx->ares = 0;
@@ -1413,24 +1411,24 @@ int CRYPTO_gcm128_decrypt_ctr32(GCM128_CONTEXT *ctx,
ctx->Xi.u[0] = 0;
ctx->Xi.u[1] = 0;
mres = sizeof(ctx->Xi);
-# else
+#else
GCM_MUL(ctx);
-# endif
+#endif
ctx->ares = 0;
}
if (IS_LITTLE_ENDIAN)
-# ifdef BSWAP4
+#ifdef BSWAP4
ctr = BSWAP4(ctx->Yi.d[3]);
-# else
+#else
ctr = GETU32(ctx->Yi.c + 12);
-# endif
+#endif
else
ctr = ctx->Yi.d[3];
n = mres % 16;
if (n) {
-# if defined(GHASH)
+#if defined(GHASH)
while (n && len) {
*(out++) = (ctx->Xn[mres++] = *(in++)) ^ ctx->EKi.c[n];
--len;
@@ -1443,7 +1441,7 @@ int CRYPTO_gcm128_decrypt_ctr32(GCM128_CONTEXT *ctx,
ctx->mres = mres;
return 0;
}
-# else
+#else
while (n && len) {
u8 c = *(in++);
*(out++) = c ^ ctx->EKi.c[n];
@@ -1458,38 +1456,38 @@ int CRYPTO_gcm128_decrypt_ctr32(GCM128_CONTEXT *ctx,
ctx->mres = n;
return 0;
}
-# endif
+#endif
}
-# if defined(GHASH)
+#if defined(GHASH)
if (len >= 16 && mres) {
GHASH(ctx, ctx->Xn, mres);
mres = 0;
}
-# if defined(GHASH_CHUNK)
+#if defined(GHASH_CHUNK)
while (len >= GHASH_CHUNK) {
GHASH(ctx, in, GHASH_CHUNK);
- (*stream) (in, out, GHASH_CHUNK / 16, key, ctx->Yi.c);
+ (*stream)(in, out, GHASH_CHUNK / 16, key, ctx->Yi.c);
ctr += GHASH_CHUNK / 16;
if (IS_LITTLE_ENDIAN)
-# ifdef BSWAP4
+#ifdef BSWAP4
ctx->Yi.d[3] = BSWAP4(ctr);
-# else
+#else
PUTU32(ctx->Yi.c + 12, ctr);
-# endif
+#endif
else
ctx->Yi.d[3] = ctr;
out += GHASH_CHUNK;
in += GHASH_CHUNK;
len -= GHASH_CHUNK;
}
-# endif
-# endif
+#endif
+#endif
if ((i = (len & (size_t)-16))) {
size_t j = i / 16;
-# if defined(GHASH)
+#if defined(GHASH)
GHASH(ctx, in, i);
-# else
+#else
while (j--) {
size_t k;
for (k = 0; k < 16; ++k)
@@ -1499,15 +1497,15 @@ int CRYPTO_gcm128_decrypt_ctr32(GCM128_CONTEXT *ctx,
}
j = i / 16;
in -= i;
-# endif
- (*stream) (in, out, j, key, ctx->Yi.c);
+#endif
+ (*stream)(in, out, j, key, ctx->Yi.c);
ctr += (unsigned int)j;
if (IS_LITTLE_ENDIAN)
-# ifdef BSWAP4
+#ifdef BSWAP4
ctx->Yi.d[3] = BSWAP4(ctr);
-# else
+#else
PUTU32(ctx->Yi.c + 12, ctr);
-# endif
+#endif
else
ctx->Yi.d[3] = ctr;
out += i;
@@ -1515,24 +1513,24 @@ int CRYPTO_gcm128_decrypt_ctr32(GCM128_CONTEXT *ctx,
len -= i;
}
if (len) {
- (*ctx->block) (ctx->Yi.c, ctx->EKi.c, key);
+ (*ctx->block)(ctx->Yi.c, ctx->EKi.c, key);
++ctr;
if (IS_LITTLE_ENDIAN)
-# ifdef BSWAP4
+#ifdef BSWAP4
ctx->Yi.d[3] = BSWAP4(ctr);
-# else
+#else
PUTU32(ctx->Yi.c + 12, ctr);
-# endif
+#endif
else
ctx->Yi.d[3] = ctr;
while (len--) {
-# if defined(GHASH)
+#if defined(GHASH)
out[n] = (ctx->Xn[mres++] = in[n]) ^ ctx->EKi.c[n];
-# else
+#else
u8 c = in[n];
ctx->Xi.c[mres++] ^= c;
out[n] = c ^ ctx->EKi.c[n];
-# endif
+#endif
++n;
}
}
@@ -1543,7 +1541,7 @@ int CRYPTO_gcm128_decrypt_ctr32(GCM128_CONTEXT *ctx,
}
int CRYPTO_gcm128_finish(GCM128_CONTEXT *ctx, const unsigned char *tag,
- size_t len)
+ size_t len)
{
DECLARE_IS_ENDIAN;
u64 alen = ctx->len.u[0] << 3;
@@ -1610,7 +1608,7 @@ void CRYPTO_gcm128_tag(GCM128_CONTEXT *ctx, unsigned char *tag, size_t len)
{
CRYPTO_gcm128_finish(ctx, NULL, 0);
memcpy(tag, ctx->Xi.c,
- len <= sizeof(ctx->Xi.c) ? len : sizeof(ctx->Xi.c));
+ len <= sizeof(ctx->Xi.c) ? len : sizeof(ctx->Xi.c));
}
GCM128_CONTEXT *CRYPTO_gcm128_new(void *key, block128_f block)
diff --git a/crypto/modes/ocb128.c b/crypto/modes/ocb128.c
index 37e8f7acb3..ce72baf6da 100644
--- a/crypto/modes/ocb128.c
+++ b/crypto/modes/ocb128.c
@@ -40,7 +40,7 @@ static u32 ocb_ntz(u64 n)
* Shift a block of 16 bytes left by shift bits
*/
static void ocb_block_lshift(const unsigned char *in, size_t shift,
- unsigned char *out)
+ unsigned char *out)
{
int i;
unsigned char carry = 0, carry_next;
@@ -76,8 +76,8 @@ static void ocb_double(OCB_BLOCK *in, OCB_BLOCK *out)
* Perform an xor on in1 and in2 - each of len bytes. Store result in out
*/
static void ocb_block_xor(const unsigned char *in1,
- const unsigned char *in2, size_t len,
- unsigned char *out)
+ const unsigned char *in2, size_t len,
+ unsigned char *out)
{
size_t i;
for (i = 0; i < len; i++) {
@@ -128,15 +128,15 @@ static OCB_BLOCK *ocb_lookup_l(OCB128_CONTEXT *ctx, size_t idx)
* Create a new OCB128_CONTEXT
*/
OCB128_CONTEXT *CRYPTO_ocb128_new(void *keyenc, void *keydec,
- block128_f encrypt, block128_f decrypt,
- ocb128_f stream)
+ block128_f encrypt, block128_f decrypt,
+ ocb128_f stream)
{
OCB128_CONTEXT *octx;
int ret;
if ((octx = OPENSSL_malloc(sizeof(*octx))) != NULL) {
ret = CRYPTO_ocb128_init(octx, keyenc, keydec, encrypt, decrypt,
- stream);
+ stream);
if (ret)
return octx;
OPENSSL_free(octx);
@@ -149,8 +149,8 @@ OCB128_CONTEXT *CRYPTO_ocb128_new(void *keyenc, void *keydec,
* Initialise an existing OCB128_CONTEXT
*/
int CRYPTO_ocb128_init(OCB128_CONTEXT *ctx, void *keyenc, void *keydec,
- block128_f encrypt, block128_f decrypt,
- ocb128_f stream)
+ block128_f encrypt, block128_f decrypt,
+ ocb128_f stream)
{
memset(ctx, 0, sizeof(*ctx));
ctx->l_index = 0;
@@ -179,11 +179,11 @@ int CRYPTO_ocb128_init(OCB128_CONTEXT *ctx, void *keyenc, void *keydec,
ocb_double(&ctx->l_dollar, ctx->l);
/* L_{i} = double(L_{i-1}) */
- ocb_double(ctx->l, ctx->l+1);
- ocb_double(ctx->l+1, ctx->l+2);
- ocb_double(ctx->l+2, ctx->l+3);
- ocb_double(ctx->l+3, ctx->l+4);
- ctx->l_index = 4; /* enough to process up to 496 bytes */
+ ocb_double(ctx->l, ctx->l + 1);
+ ocb_double(ctx->l + 1, ctx->l + 2);
+ ocb_double(ctx->l + 2, ctx->l + 3);
+ ocb_double(ctx->l + 3, ctx->l + 4);
+ ctx->l_index = 4; /* enough to process up to 496 bytes */
return 1;
}
@@ -192,7 +192,7 @@ int CRYPTO_ocb128_init(OCB128_CONTEXT *ctx, void *keyenc, void *keydec,
* Copy an OCB128_CONTEXT object
*/
int CRYPTO_ocb128_copy_ctx(OCB128_CONTEXT *dest, OCB128_CONTEXT *src,
- void *keyenc, void *keydec)
+ void *keyenc, void *keydec)
{
memcpy(dest, src, sizeof(OCB128_CONTEXT));
if (keyenc)
@@ -211,7 +211,7 @@ int CRYPTO_ocb128_copy_ctx(OCB128_CONTEXT *dest, OCB128_CONTEXT *src,
* Set the IV to be used for this operation. Must be 1 - 15 bytes.
*/
int CRYPTO_ocb128_setiv(OCB128_CONTEXT *ctx, const unsigned char *iv,
- size_t len, size_t taglen)
+ size_t len, size_t taglen)
{
unsigned char ktop[16], tmp[16], mask;
unsigned char stretch[24], nonce[16];
@@ -251,8 +251,7 @@ int CRYPTO_ocb128_setiv(OCB128_CONTEXT *ctx, const unsigned char *iv,
ocb_block_lshift(stretch + (bottom / 8), shift, ctx->sess.offset.c);
mask = 0xff;
mask <<= 8 - shift;
- ctx->sess.offset.c[15] |=
- (*(stretch + (bottom / 8) + 16) & mask) >> (8 - shift);
+ ctx->sess.offset.c[15] |= (*(stretch + (bottom / 8) + 16) & mask) >> (8 - shift);
return 1;
}
@@ -262,7 +261,7 @@ int CRYPTO_ocb128_setiv(OCB128_CONTEXT *ctx, const unsigned char *iv,
* have a partial block
*/
int CRYPTO_ocb128_aad(OCB128_CONTEXT *ctx, const unsigned char *aad,
- size_t len)
+ size_t len)
{
u64 i, all_num_blocks;
size_t num_blocks, last_len;
@@ -300,7 +299,7 @@ int CRYPTO_ocb128_aad(OCB128_CONTEXT *ctx, const unsigned char *aad,
if (last_len > 0) {
/* Offset_* = Offset_m xor L_* */
ocb_block16_xor(&ctx->sess.offset_aad, &ctx->l_star,
- &ctx->sess.offset_aad);
+ &ctx->sess.offset_aad);
/* CipherInput = (A_* || 1 || zeros(127-bitlen(A_*))) xor Offset_* */
memset(tmp.c, 0, 16);
@@ -323,8 +322,8 @@ int CRYPTO_ocb128_aad(OCB128_CONTEXT *ctx, const unsigned char *aad,
* the final time can have a partial block
*/
int CRYPTO_ocb128_encrypt(OCB128_CONTEXT *ctx,
- const unsigned char *in, unsigned char *out,
- size_t len)
+ const unsigned char *in, unsigned char *out,
+ size_t len)
{
u64 i, all_num_blocks;
size_t num_blocks, last_len;
@@ -350,8 +349,8 @@ int CRYPTO_ocb128_encrypt(OCB128_CONTEXT *ctx,
return 0;
ctx->stream(in, out, num_blocks, ctx->keyenc,
- (size_t)ctx->sess.blocks_processed + 1, ctx->sess.offset.c,
- (const unsigned char (*)[16])ctx->l, ctx->sess.checksum.c);
+ (size_t)ctx->sess.blocks_processed + 1, ctx->sess.offset.c,
+ (const unsigned char (*)[16])ctx->l, ctx->sess.checksum.c);
} else {
/* Loop through all full blocks to be encrypted */
for (i = ctx->sess.blocks_processed + 1; i <= all_num_blocks; i++) {
@@ -399,7 +398,7 @@ int CRYPTO_ocb128_encrypt(OCB128_CONTEXT *ctx,
ocb_block_xor(in, pad.c, last_len, out);
/* Checksum_* = Checksum_m xor (P_* || 1 || zeros(127-bitlen(P_*))) */
- memset(pad.c, 0, 16); /* borrow pad */
+ memset(pad.c, 0, 16); /* borrow pad */
memcpy(pad.c, in, last_len);
pad.c[last_len] = 0x80;
ocb_block16_xor(&pad, &ctx->sess.checksum, &ctx->sess.checksum);
@@ -415,8 +414,8 @@ int CRYPTO_ocb128_encrypt(OCB128_CONTEXT *ctx,
* the final time can have a partial block
*/
int CRYPTO_ocb128_decrypt(OCB128_CONTEXT *ctx,
- const unsigned char *in, unsigned char *out,
- size_t len)
+ const unsigned char *in, unsigned char *out,
+ size_t len)
{
u64 i, all_num_blocks;
size_t num_blocks, last_len;
@@ -442,8 +441,8 @@ int CRYPTO_ocb128_decrypt(OCB128_CONTEXT *ctx,
return 0;
ctx->stream(in, out, num_blocks, ctx->keydec,
- (size_t)ctx->sess.blocks_processed + 1, ctx->sess.offset.c,
- (const unsigned char (*)[16])ctx->l, ctx->sess.checksum.c);
+ (size_t)ctx->sess.blocks_processed + 1, ctx->sess.offset.c,
+ (const unsigned char (*)[16])ctx->l, ctx->sess.checksum.c);
} else {
OCB_BLOCK tmp;
@@ -491,7 +490,7 @@ int CRYPTO_ocb128_decrypt(OCB128_CONTEXT *ctx,
ocb_block_xor(in, pad.c, last_len, out);
/* Checksum_* = Checksum_m xor (P_* || 1 || zeros(127-bitlen(P_*))) */
- memset(pad.c, 0, 16); /* borrow pad */
+ memset(pad.c, 0, 16); /* borrow pad */
memcpy(pad.c, out, last_len);
pad.c[last_len] = 0x80;
ocb_block16_xor(&pad, &ctx->sess.checksum, &ctx->sess.checksum);
@@ -503,7 +502,7 @@ int CRYPTO_ocb128_decrypt(OCB128_CONTEXT *ctx,
}
static int ocb_finish(OCB128_CONTEXT *ctx, unsigned char *tag, size_t len,
- int write)
+ int write)
{
OCB_BLOCK tmp;
@@ -531,9 +530,9 @@ static int ocb_finish(OCB128_CONTEXT *ctx, unsigned char *tag, size_t len,
* Calculate the tag and verify it against the supplied tag
*/
int CRYPTO_ocb128_finish(OCB128_CONTEXT *ctx, const unsigned char *tag,
- size_t len)
+ size_t len)
{
- return ocb_finish(ctx, (unsigned char*)tag, len, 0);
+ return ocb_finish(ctx, (unsigned char *)tag, len, 0);
}
/*
@@ -555,4 +554,4 @@ void CRYPTO_ocb128_cleanup(OCB128_CONTEXT *ctx)
}
}
-#endif /* OPENSSL_NO_OCB */
+#endif /* OPENSSL_NO_OCB */
diff --git a/crypto/modes/ofb128.c b/crypto/modes/ofb128.c
index d8319f861e..6aa308bce3 100644
--- a/crypto/modes/ofb128.c
+++ b/crypto/modes/ofb128.c
@@ -23,8 +23,8 @@ typedef size_t size_t_aX;
* used is contained in *num;
*/
void CRYPTO_ofb128_encrypt(const unsigned char *in, unsigned char *out,
- size_t len, const void *key,
- unsigned char ivec[16], int *num, block128_f block)
+ size_t len, const void *key,
+ unsigned char ivec[16], int *num, block128_f block)
{
unsigned int n;
size_t l = 0;
@@ -44,16 +44,14 @@ void CRYPTO_ofb128_encrypt(const unsigned char *in, unsigned char *out,
--len;
n = (n + 1) % 16;
}
-# if defined(STRICT_ALIGNMENT)
- if (((size_t)in | (size_t)out | (size_t)ivec) % sizeof(size_t) !=
- 0)
+#if defined(STRICT_ALIGNMENT)
+ if (((size_t)in | (size_t)out | (size_t)ivec) % sizeof(size_t) != 0)
break;
-# endif
+#endif
while (len >= 16) {
- (*block) (ivec, ivec, key);
+ (*block)(ivec, ivec, key);
for (; n < 16; n += sizeof(size_t))
- *(size_t_aX *)(out + n) =
- *(size_t_aX *)(in + n)
+ *(size_t_aX *)(out + n) = *(size_t_aX *)(in + n)
^ *(size_t_aX *)(ivec + n);
len -= 16;
out += 16;
@@ -61,7 +59,7 @@ void CRYPTO_ofb128_encrypt(const unsigned char *in, unsigned char *out,
n = 0;
}
if (len) {
- (*block) (ivec, ivec, key);
+ (*block)(ivec, ivec, key);
while (len--) {
out[n] = in[n] ^ ivec[n];
++n;
@@ -75,7 +73,7 @@ void CRYPTO_ofb128_encrypt(const unsigned char *in, unsigned char *out,
#endif
while (l < len) {
if (n == 0) {
- (*block) (ivec, ivec, key);
+ (*block)(ivec, ivec, key);
}
out[l] = in[l] ^ ivec[n];
++l;
diff --git a/crypto/modes/siv128.c b/crypto/modes/siv128.c
index 4e52d8eb87..0ab183b37b 100644
--- a/crypto/modes/siv128.c
+++ b/crypto/modes/siv128.c
@@ -59,7 +59,7 @@ static ossl_inline void siv128_putword(SIV_BLOCK *b, size_t i, uint64_t x)
}
static ossl_inline void siv128_xorblock(SIV_BLOCK *x,
- SIV_BLOCK const *y)
+ SIV_BLOCK const *y)
{
x->word[0] ^= y->word[0];
x->word[1] ^= y->word[1];
@@ -87,7 +87,7 @@ static ossl_inline void siv128_dbl(SIV_BLOCK *b)
}
__owur static ossl_inline int siv128_do_s2v_p(SIV128_CONTEXT *ctx, SIV_BLOCK *out,
- unsigned char const* in, size_t len)
+ unsigned char const *in, size_t len)
{
SIV_BLOCK t;
size_t out_len = sizeof(out->byte);
@@ -101,7 +101,7 @@ __owur static ossl_inline int siv128_do_s2v_p(SIV128_CONTEXT *ctx, SIV_BLOCK *ou
if (len >= SIV_LEN) {
if (!EVP_MAC_update(mac_ctx, in, len - SIV_LEN))
goto err;
- memcpy(&t, in + (len-SIV_LEN), SIV_LEN);
+ memcpy(&t, in + (len - SIV_LEN), SIV_LEN);
siv128_xorblock(&t, &ctx->d);
if (!EVP_MAC_update(mac_ctx, t.byte, SIV_LEN))
goto err;
@@ -125,10 +125,9 @@ err:
return ret;
}
-
__owur static ossl_inline int siv128_do_encrypt(EVP_CIPHER_CTX *ctx, unsigned char *out,
- unsigned char const *in, size_t len,
- SIV_BLOCK *icv)
+ unsigned char const *in, size_t len,
+ SIV_BLOCK *icv)
{
int out_len = (int)len;
@@ -141,8 +140,8 @@ __owur static ossl_inline int siv128_do_encrypt(EVP_CIPHER_CTX *ctx, unsigned ch
* Create a new SIV128_CONTEXT
*/
SIV128_CONTEXT *ossl_siv128_new(const unsigned char *key, int klen,
- EVP_CIPHER *cbc, EVP_CIPHER *ctr,
- OSSL_LIB_CTX *libctx, const char *propq)
+ EVP_CIPHER *cbc, EVP_CIPHER *ctr,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
SIV128_CONTEXT *ctx;
int ret;
@@ -161,8 +160,8 @@ SIV128_CONTEXT *ossl_siv128_new(const unsigned char *key, int klen,
* Initialise an existing SIV128_CONTEXT
*/
int ossl_siv128_init(SIV128_CONTEXT *ctx, const unsigned char *key, int klen,
- const EVP_CIPHER *cbc, const EVP_CIPHER *ctr,
- OSSL_LIB_CTX *libctx, const char *propq)
+ const EVP_CIPHER *cbc, const EVP_CIPHER *ctr,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
static const unsigned char zero[SIV_LEN] = { 0 };
size_t out_len = SIV_LEN;
@@ -186,21 +185,20 @@ int ossl_siv128_init(SIV128_CONTEXT *ctx, const unsigned char *key, int klen,
cbc_name = EVP_CIPHER_get0_name(cbc);
params[0] = OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_CIPHER,
- (char *)cbc_name, 0);
+ (char *)cbc_name, 0);
params[1] = OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_KEY,
- (void *)key, klen);
+ (void *)key, klen);
params[2] = OSSL_PARAM_construct_end();
if ((ctx->cipher_ctx = EVP_CIPHER_CTX_new()) == NULL
- || (ctx->mac =
- EVP_MAC_fetch(libctx, OSSL_MAC_NAME_CMAC, propq)) == NULL
- || (ctx->mac_ctx_init = EVP_MAC_CTX_new(ctx->mac)) == NULL
- || !EVP_MAC_CTX_set_params(ctx->mac_ctx_init, params)
- || !EVP_EncryptInit_ex(ctx->cipher_ctx, ctr, NULL, key + klen, NULL)
- || (mac_ctx = EVP_MAC_CTX_dup(ctx->mac_ctx_init)) == NULL
- || !EVP_MAC_update(mac_ctx, zero, sizeof(zero))
- || !EVP_MAC_final(mac_ctx, ctx->d.byte, &out_len,
- sizeof(ctx->d.byte))) {
+ || (ctx->mac = EVP_MAC_fetch(libctx, OSSL_MAC_NAME_CMAC, propq)) == NULL
+ || (ctx->mac_ctx_init = EVP_MAC_CTX_new(ctx->mac)) == NULL
+ || !EVP_MAC_CTX_set_params(ctx->mac_ctx_init, params)
+ || !EVP_EncryptInit_ex(ctx->cipher_ctx, ctr, NULL, key + klen, NULL)
+ || (mac_ctx = EVP_MAC_CTX_dup(ctx->mac_ctx_init)) == NULL
+ || !EVP_MAC_update(mac_ctx, zero, sizeof(zero))
+ || !EVP_MAC_final(mac_ctx, ctx->d.byte, &out_len,
+ sizeof(ctx->d.byte))) {
EVP_CIPHER_CTX_free(ctx->cipher_ctx);
ctx->cipher_ctx = NULL;
EVP_MAC_CTX_free(ctx->mac_ctx_init);
@@ -247,7 +245,7 @@ int ossl_siv128_copy_ctx(SIV128_CONTEXT *dest, SIV128_CONTEXT *src)
* is the nonce, but it's not treated special
*/
int ossl_siv128_aad(SIV128_CONTEXT *ctx, const unsigned char *aad,
- size_t len)
+ size_t len)
{
SIV_BLOCK mac_out;
size_t out_len = SIV_LEN;
@@ -258,7 +256,7 @@ int ossl_siv128_aad(SIV128_CONTEXT *ctx, const unsigned char *aad,
if ((mac_ctx = EVP_MAC_CTX_dup(ctx->mac_ctx_init)) == NULL
|| !EVP_MAC_update(mac_ctx, aad, len)
|| !EVP_MAC_final(mac_ctx, mac_out.byte, &out_len,
- sizeof(mac_out.byte))
+ sizeof(mac_out.byte))
|| out_len != SIV_LEN) {
EVP_MAC_CTX_free(mac_ctx);
return 0;
@@ -274,8 +272,8 @@ int ossl_siv128_aad(SIV128_CONTEXT *ctx, const unsigned char *aad,
* Provide any data to be encrypted. This can be called once.
*/
int ossl_siv128_encrypt(SIV128_CONTEXT *ctx,
- const unsigned char *in, unsigned char *out,
- size_t len)
+ const unsigned char *in, unsigned char *out,
+ size_t len)
{
SIV_BLOCK q;
@@ -301,10 +299,10 @@ int ossl_siv128_encrypt(SIV128_CONTEXT *ctx,
* Provide any data to be decrypted. This can be called once.
*/
int ossl_siv128_decrypt(SIV128_CONTEXT *ctx,
- const unsigned char *in, unsigned char *out,
- size_t len)
+ const unsigned char *in, unsigned char *out,
+ size_t len)
{
- unsigned char* p;
+ unsigned char *p;
SIV_BLOCK t, q;
int i;
@@ -393,4 +391,4 @@ int ossl_siv128_speed(SIV128_CONTEXT *ctx, int arg)
return 1;
}
-#endif /* OPENSSL_NO_SIV */
+#endif /* OPENSSL_NO_SIV */
diff --git a/crypto/modes/wrap128.c b/crypto/modes/wrap128.c
index 5e053988f6..9dbb640129 100644
--- a/crypto/modes/wrap128.c
+++ b/crypto/modes/wrap128.c
@@ -18,7 +18,14 @@
/** RFC 3394 section 2.2.3.1 Default Initial Value */
static const unsigned char default_iv[] = {
- 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6,
+ 0xA6,
+ 0xA6,
+ 0xA6,
+ 0xA6,
+ 0xA6,
+ 0xA6,
+ 0xA6,
+ 0xA6,
};
/** RFC 5649 section 3 Alternative Initial Value 32-bit constant */
@@ -46,9 +53,9 @@ static const unsigned char default_aiv[] = {
* Output length if wrapping succeeded.
*/
size_t CRYPTO_128_wrap(void *key, const unsigned char *iv,
- unsigned char *out,
- const unsigned char *in, size_t inlen,
- block128_f block)
+ unsigned char *out,
+ const unsigned char *in, size_t inlen,
+ block128_f block)
{
unsigned char *A, B[16], *R;
size_t i, j, t;
@@ -97,9 +104,9 @@ size_t CRYPTO_128_wrap(void *key, const unsigned char *iv,
* Output length otherwise.
*/
static size_t crypto_128_unwrap_raw(void *key, unsigned char *iv,
- unsigned char *out,
- const unsigned char *in, size_t inlen,
- block128_f block)
+ unsigned char *out,
+ const unsigned char *in, size_t inlen,
+ block128_f block)
{
unsigned char *A, B[16], *R;
size_t i, j, t;
@@ -148,8 +155,8 @@ static size_t crypto_128_unwrap_raw(void *key, unsigned char *iv,
* Output length otherwise.
*/
size_t CRYPTO_128_unwrap(void *key, const unsigned char *iv,
- unsigned char *out, const unsigned char *in,
- size_t inlen, block128_f block)
+ unsigned char *out, const unsigned char *in,
+ size_t inlen, block128_f block)
{
size_t ret;
unsigned char got_iv[8];
@@ -181,9 +188,9 @@ size_t CRYPTO_128_unwrap(void *key, const unsigned char *iv,
* Output length if wrapping succeeded.
*/
size_t CRYPTO_128_wrap_pad(void *key, const unsigned char *icv,
- unsigned char *out,
- const unsigned char *in, size_t inlen,
- block128_f block)
+ unsigned char *out,
+ const unsigned char *in, size_t inlen,
+ block128_f block)
{
/* n: number of 64-bit blocks in the padded key data
*
@@ -206,7 +213,7 @@ size_t CRYPTO_128_wrap_pad(void *key, const unsigned char *icv,
if (!icv)
memcpy(aiv, default_aiv, 4);
else
- memcpy(aiv, icv, 4); /* Standard doesn't mention this. */
+ memcpy(aiv, icv, 4); /* Standard doesn't mention this. */
aiv[4] = (inlen >> 24) & 0xFF;
aiv[5] = (inlen >> 16) & 0xFF;
@@ -223,7 +230,7 @@ size_t CRYPTO_128_wrap_pad(void *key, const unsigned char *icv,
memcpy(out, aiv, 8);
memset(out + 8 + inlen, 0, padding_len);
block(out, out, key);
- ret = 16; /* AIV + padded input */
+ ret = 16; /* AIV + padded input */
} else {
memmove(out, in, inlen);
memset(out + inlen, 0, padding_len); /* Section 4.1 step 1 */
@@ -249,9 +256,9 @@ size_t CRYPTO_128_wrap_pad(void *key, const unsigned char *icv,
* Output length if unwrapping succeeded and IV matches.
*/
size_t CRYPTO_128_unwrap_pad(void *key, const unsigned char *icv,
- unsigned char *out,
- const unsigned char *in, size_t inlen,
- block128_f block)
+ unsigned char *out,
+ const unsigned char *in, size_t inlen,
+ block128_f block)
{
/* n: number of 64-bit blocks in the padded key data */
size_t n = inlen / 8 - 1;
@@ -307,10 +314,10 @@ size_t CRYPTO_128_unwrap_pad(void *key, const unsigned char *icv,
* LSB(32,AIV).
*/
- ptext_len = ((unsigned int)aiv[4] << 24)
- | ((unsigned int)aiv[5] << 16)
- | ((unsigned int)aiv[6] << 8)
- | (unsigned int)aiv[7];
+ ptext_len = ((unsigned int)aiv[4] << 24)
+ | ((unsigned int)aiv[5] << 16)
+ | ((unsigned int)aiv[6] << 8)
+ | (unsigned int)aiv[7];
if (8 * (n - 1) >= ptext_len || ptext_len > 8 * n) {
OPENSSL_cleanse(out, inlen);
return 0;
diff --git a/crypto/modes/xts128.c b/crypto/modes/xts128.c
index 55b81366bf..7b55d1e0b3 100644
--- a/crypto/modes/xts128.c
+++ b/crypto/modes/xts128.c
@@ -13,17 +13,17 @@
#include "crypto/modes.h"
#ifndef STRICT_ALIGNMENT
-# ifdef __GNUC__
+#ifdef __GNUC__
typedef u64 u64_a1 __attribute((__aligned__(1)));
-# else
+#else
typedef u64 u64_a1;
-# endif
+#endif
#endif
int CRYPTO_xts128_encrypt(const XTS128_CONTEXT *ctx,
- const unsigned char iv[16],
- const unsigned char *inp, unsigned char *out,
- size_t len, int enc)
+ const unsigned char iv[16],
+ const unsigned char *inp, unsigned char *out,
+ size_t len, int enc)
{
DECLARE_IS_ENDIAN;
union {
@@ -38,7 +38,7 @@ int CRYPTO_xts128_encrypt(const XTS128_CONTEXT *ctx,
memcpy(tweak.c, iv, 16);
- (*ctx->block2) (tweak.c, tweak.c, ctx->key2);
+ (*ctx->block2)(tweak.c, tweak.c, ctx->key2);
if (!enc && (len % 16))
len -= 16;
@@ -52,7 +52,7 @@ int CRYPTO_xts128_encrypt(const XTS128_CONTEXT *ctx,
scratch.u[0] = ((u64_a1 *)inp)[0] ^ tweak.u[0];
scratch.u[1] = ((u64_a1 *)inp)[1] ^ tweak.u[1];
#endif
- (*ctx->block1) (scratch.c, scratch.c, ctx->key1);
+ (*ctx->block1)(scratch.c, scratch.c, ctx->key1);
#if defined(STRICT_ALIGNMENT)
scratch.u[0] ^= tweak.u[0];
scratch.u[1] ^= tweak.u[1];
@@ -97,7 +97,7 @@ int CRYPTO_xts128_encrypt(const XTS128_CONTEXT *ctx,
}
scratch.u[0] ^= tweak.u[0];
scratch.u[1] ^= tweak.u[1];
- (*ctx->block1) (scratch.c, scratch.c, ctx->key1);
+ (*ctx->block1)(scratch.c, scratch.c, ctx->key1);
scratch.u[0] ^= tweak.u[0];
scratch.u[1] ^= tweak.u[1];
memcpy(out - 16, scratch.c, 16);
@@ -135,7 +135,7 @@ int CRYPTO_xts128_encrypt(const XTS128_CONTEXT *ctx,
scratch.u[0] = ((u64_a1 *)inp)[0] ^ tweak1.u[0];
scratch.u[1] = ((u64_a1 *)inp)[1] ^ tweak1.u[1];
#endif
- (*ctx->block1) (scratch.c, scratch.c, ctx->key1);
+ (*ctx->block1)(scratch.c, scratch.c, ctx->key1);
scratch.u[0] ^= tweak1.u[0];
scratch.u[1] ^= tweak1.u[1];
@@ -146,7 +146,7 @@ int CRYPTO_xts128_encrypt(const XTS128_CONTEXT *ctx,
}
scratch.u[0] ^= tweak.u[0];
scratch.u[1] ^= tweak.u[1];
- (*ctx->block1) (scratch.c, scratch.c, ctx->key1);
+ (*ctx->block1)(scratch.c, scratch.c, ctx->key1);
#if defined(STRICT_ALIGNMENT)
scratch.u[0] ^= tweak.u[0];
scratch.u[1] ^= tweak.u[1];
diff --git a/crypto/modes/xts128gb.c b/crypto/modes/xts128gb.c
index 021c0597e4..563077277c 100644
--- a/crypto/modes/xts128gb.c
+++ b/crypto/modes/xts128gb.c
@@ -13,17 +13,17 @@
#include "crypto/modes.h"
#ifndef STRICT_ALIGNMENT
-# ifdef __GNUC__
+#ifdef __GNUC__
typedef u64 u64_a1 __attribute((__aligned__(1)));
-# else
+#else
typedef u64 u64_a1;
-# endif
+#endif
#endif
int ossl_crypto_xts128gb_encrypt(const XTS128_CONTEXT *ctx,
- const unsigned char iv[16],
- const unsigned char *inp, unsigned char *out,
- size_t len, int enc)
+ const unsigned char iv[16],
+ const unsigned char *inp, unsigned char *out,
+ size_t len, int enc)
{
DECLARE_IS_ENDIAN;
union {
@@ -38,7 +38,7 @@ int ossl_crypto_xts128gb_encrypt(const XTS128_CONTEXT *ctx,
memcpy(tweak.c, iv, 16);
- (*ctx->block2) (tweak.c, tweak.c, ctx->key2);
+ (*ctx->block2)(tweak.c, tweak.c, ctx->key2);
if (!enc && (len % 16))
len -= 16;
@@ -52,7 +52,7 @@ int ossl_crypto_xts128gb_encrypt(const XTS128_CONTEXT *ctx,
scratch.u[0] = ((u64_a1 *)inp)[0] ^ tweak.u[0];
scratch.u[1] = ((u64_a1 *)inp)[1] ^ tweak.u[1];
#endif
- (*ctx->block1) (scratch.c, scratch.c, ctx->key1);
+ (*ctx->block1)(scratch.c, scratch.c, ctx->key1);
#if defined(STRICT_ALIGNMENT)
scratch.u[0] ^= tweak.u[0];
scratch.u[1] ^= tweak.u[1];
@@ -116,7 +116,7 @@ int ossl_crypto_xts128gb_encrypt(const XTS128_CONTEXT *ctx,
}
scratch.u[0] ^= tweak.u[0];
scratch.u[1] ^= tweak.u[1];
- (*ctx->block1) (scratch.c, scratch.c, ctx->key1);
+ (*ctx->block1)(scratch.c, scratch.c, ctx->key1);
scratch.u[0] ^= tweak.u[0];
scratch.u[1] ^= tweak.u[1];
memcpy(out - 16, scratch.c, 16);
@@ -173,7 +173,7 @@ int ossl_crypto_xts128gb_encrypt(const XTS128_CONTEXT *ctx,
scratch.u[0] = ((u64_a1 *)inp)[0] ^ tweak1.u[0];
scratch.u[1] = ((u64_a1 *)inp)[1] ^ tweak1.u[1];
#endif
- (*ctx->block1) (scratch.c, scratch.c, ctx->key1);
+ (*ctx->block1)(scratch.c, scratch.c, ctx->key1);
scratch.u[0] ^= tweak1.u[0];
scratch.u[1] ^= tweak1.u[1];
@@ -184,7 +184,7 @@ int ossl_crypto_xts128gb_encrypt(const XTS128_CONTEXT *ctx,
}
scratch.u[0] ^= tweak.u[0];
scratch.u[1] ^= tweak.u[1];
- (*ctx->block1) (scratch.c, scratch.c, ctx->key1);
+ (*ctx->block1)(scratch.c, scratch.c, ctx->key1);
#if defined(STRICT_ALIGNMENT)
scratch.u[0] ^= tweak.u[0];
scratch.u[1] ^= tweak.u[1];
diff --git a/crypto/o_fopen.c b/crypto/o_fopen.c
index bfbf6873ef..9b13f0a896 100644
--- a/crypto/o_fopen.c
+++ b/crypto/o_fopen.c
@@ -7,7 +7,7 @@
* https://www.openssl.org/source/license.html
*/
-# if defined(__linux) || defined(__sun) || defined(__hpux)
+#if defined(__linux) || defined(__sun) || defined(__hpux)
/*
* Following definition aliases fopen to fopen64 on above mentioned
* platforms. This makes it possible to open and sequentially access files
@@ -20,32 +20,32 @@
* of 32-bit platforms which allow for sequential access of large files
* without extra "magic" comprise *BSD, Darwin, IRIX...
*/
-# ifndef _FILE_OFFSET_BITS
-# define _FILE_OFFSET_BITS 64
-# endif
-# endif
+#ifndef _FILE_OFFSET_BITS
+#define _FILE_OFFSET_BITS 64
+#endif
+#endif
#include "internal/e_os.h"
#include "internal/cryptlib.h"
#if !defined(OPENSSL_NO_STDIO)
-# include <stdio.h>
-# ifdef __DJGPP__
-# include <unistd.h>
-# endif
+#include <stdio.h>
+#ifdef __DJGPP__
+#include <unistd.h>
+#endif
FILE *openssl_fopen(const char *filename, const char *mode)
{
FILE *file = NULL;
-# if defined(_WIN32) && defined(CP_UTF8)
+#if defined(_WIN32) && defined(CP_UTF8)
int sz, len_0;
DWORD flags;
-# endif
+#endif
if (filename == NULL)
return NULL;
-# if defined(_WIN32) && defined(CP_UTF8)
+#if defined(_WIN32) && defined(CP_UTF8)
len_0 = (int)strlen(filename) + 1;
/*
@@ -61,21 +61,17 @@ FILE *openssl_fopen(const char *filename, const char *mode)
* back to fopen...
*/
if ((sz = MultiByteToWideChar(CP_UTF8, (flags = MB_ERR_INVALID_CHARS),
- filename, len_0, NULL, 0)) > 0 ||
- (GetLastError() == ERROR_INVALID_FLAGS &&
- (sz = MultiByteToWideChar(CP_UTF8, (flags = 0),
- filename, len_0, NULL, 0)) > 0)
- ) {
+ filename, len_0, NULL, 0))
+ > 0
+ || (GetLastError() == ERROR_INVALID_FLAGS && (sz = MultiByteToWideChar(CP_UTF8, (flags = 0), filename, len_0, NULL, 0)) > 0)) {
WCHAR wmode[8];
WCHAR *wfilename = _alloca(sz * sizeof(WCHAR));
if (MultiByteToWideChar(CP_UTF8, flags,
- filename, len_0, wfilename, sz) &&
- MultiByteToWideChar(CP_UTF8, 0, mode, (int)(strlen(mode) + 1),
- wmode, OSSL_NELEM(wmode)) &&
- (file = _wfopen(wfilename, wmode)) == NULL &&
- (errno == ENOENT || errno == EBADF)
- ) {
+ filename, len_0, wfilename, sz)
+ && MultiByteToWideChar(CP_UTF8, 0, mode, (int)(strlen(mode) + 1),
+ wmode, OSSL_NELEM(wmode))
+ && (file = _wfopen(wfilename, wmode)) == NULL && (errno == ENOENT || errno == EBADF)) {
/*
* UTF-8 decode succeeded, but no file, filename
* could still have been locale-ized...
@@ -85,11 +81,11 @@ FILE *openssl_fopen(const char *filename, const char *mode)
} else if (GetLastError() == ERROR_NO_UNICODE_TRANSLATION) {
file = fopen(filename, mode);
}
-# elif defined(__DJGPP__)
+#elif defined(__DJGPP__)
{
char *newname = NULL;
- if (pathconf(filename, _PC_NAME_MAX) <= 12) { /* 8.3 file system? */
+ if (pathconf(filename, _PC_NAME_MAX) <= 12) { /* 8.3 file system? */
char *iterator;
char lastchar;
@@ -114,9 +110,9 @@ FILE *openssl_fopen(const char *filename, const char *mode)
OPENSSL_free(newname);
}
-# else
+#else
file = fopen(filename, mode);
-# endif
+#endif
return file;
}
diff --git a/crypto/o_str.c b/crypto/o_str.c
index 152878c6df..22d8028beb 100644
--- a/crypto/o_str.c
+++ b/crypto/o_str.c
@@ -19,7 +19,7 @@
#define DEFAULT_SEPARATOR ':'
#define CH_ZERO '\0'
-char *CRYPTO_strdup(const char *str, const char* file, int line)
+char *CRYPTO_strdup(const char *str, const char *file, int line)
{
char *ret;
size_t len;
@@ -34,7 +34,7 @@ char *CRYPTO_strdup(const char *str, const char* file, int line)
return ret;
}
-char *CRYPTO_strndup(const char *str, size_t s, const char* file, int line)
+char *CRYPTO_strndup(const char *str, size_t s, const char *file, int line)
{
size_t maxlen;
char *ret;
@@ -52,7 +52,7 @@ char *CRYPTO_strndup(const char *str, size_t s, const char* file, int line)
return ret;
}
-void *CRYPTO_memdup(const void *data, size_t siz, const char* file, int line)
+void *CRYPTO_memdup(const void *data, size_t siz, const char *file, int line)
{
void *ret;
@@ -69,7 +69,8 @@ size_t OPENSSL_strnlen(const char *str, size_t maxlen)
{
const char *p;
- for (p = str; maxlen-- != 0 && *p != CH_ZERO; ++p) ;
+ for (p = str; maxlen-- != 0 && *p != CH_ZERO; ++p)
+ ;
return p - str;
}
@@ -124,7 +125,7 @@ size_t OPENSSL_strlcat(char *dst, const char *src, size_t size)
* by endptr.
*/
int OPENSSL_strtoul(const char *str, char **endptr, int base,
- unsigned long *num)
+ unsigned long *num)
{
char *tmp_endptr;
char **internal_endptr = endptr == NULL ? &tmp_endptr : endptr;
@@ -154,9 +155,7 @@ int OPENSSL_strtoul(const char *str, char **endptr, int base,
* means there was some part of the string left over after translation
* 3) If no bytes of the string were consumed
*/
- if (errno != 0 ||
- (endptr == NULL && **internal_endptr != '\0') ||
- (str == *internal_endptr))
+ if (errno != 0 || (endptr == NULL && **internal_endptr != '\0') || (str == *internal_endptr))
return 0;
return 1;
@@ -178,35 +177,41 @@ int OPENSSL_hexchar2int(unsigned char c)
case '3':
return 3;
case '4':
- return 4;
+ return 4;
case '5':
- return 5;
+ return 5;
case '6':
- return 6;
+ return 6;
case '7':
- return 7;
+ return 7;
case '8':
- return 8;
+ return 8;
case '9':
- return 9;
- case 'a': case 'A':
- return 0x0A;
- case 'b': case 'B':
- return 0x0B;
- case 'c': case 'C':
- return 0x0C;
- case 'd': case 'D':
- return 0x0D;
- case 'e': case 'E':
- return 0x0E;
- case 'f': case 'F':
- return 0x0F;
+ return 9;
+ case 'a':
+ case 'A':
+ return 0x0A;
+ case 'b':
+ case 'B':
+ return 0x0B;
+ case 'c':
+ case 'C':
+ return 0x0C;
+ case 'd':
+ case 'D':
+ return 0x0D;
+ case 'e':
+ case 'E':
+ return 0x0E;
+ case 'f':
+ case 'F':
+ return 0x0F;
}
return -1;
}
static int hexstr2buf_sep(unsigned char *buf, size_t buf_n, size_t *buflen,
- const char *str, const char sep)
+ const char *str, const char sep)
{
unsigned char *q;
unsigned char ch, cl;
@@ -214,7 +219,7 @@ static int hexstr2buf_sep(unsigned char *buf, size_t buf_n, size_t *buflen,
const unsigned char *p;
size_t cnt;
- for (p = (const unsigned char *)str, q = buf, cnt = 0; *p; ) {
+ for (p = (const unsigned char *)str, q = buf, cnt = 0; *p;) {
ch = *p++;
/* A separator of CH_ZERO means there is no separator */
if (ch == sep && sep != CH_ZERO)
@@ -249,13 +254,13 @@ static int hexstr2buf_sep(unsigned char *buf, size_t buf_n, size_t *buflen,
* Given a string of hex digits convert to a buffer
*/
int OPENSSL_hexstr2buf_ex(unsigned char *buf, size_t buf_n, size_t *buflen,
- const char *str, const char sep)
+ const char *str, const char sep)
{
return hexstr2buf_sep(buf, buf_n, buflen, str, sep);
}
unsigned char *ossl_hexstr2buf_sep(const char *str, long *buflen,
- const char sep)
+ const char sep)
{
unsigned char *buf;
size_t buf_n, tmp_buflen;
@@ -287,8 +292,8 @@ unsigned char *OPENSSL_hexstr2buf(const char *str, long *buflen)
}
static int buf2hexstr_sep(char *str, size_t str_n, size_t *strlength,
- const unsigned char *buf, size_t buflen,
- const char sep)
+ const unsigned char *buf, size_t buflen,
+ const char sep)
{
char *q;
int has_sep = (sep != CH_ZERO);
@@ -323,8 +328,8 @@ static int buf2hexstr_sep(char *str, size_t str_n, size_t *strlength,
}
int OPENSSL_buf2hexstr_ex(char *str, size_t str_n, size_t *strlength,
- const unsigned char *buf, size_t buflen,
- const char sep)
+ const unsigned char *buf, size_t buflen,
+ const char sep)
{
return buf2hexstr_sep(str, str_n, strlength, buf, buflen, sep);
}
@@ -349,7 +354,6 @@ char *ossl_buf2hexstr_sep(const unsigned char *buf, long buflen, char sep)
return NULL;
}
-
/*
* Given a buffer of length 'buflen' return a OPENSSL_malloc'ed string with
* its hex representation @@@ (Contents of buffer are always kept in ASCII,
@@ -362,7 +366,7 @@ char *OPENSSL_buf2hexstr(const unsigned char *buf, long buflen)
int openssl_strerror_r(int errnum, char *buf, size_t buflen)
{
-#if defined(_MSC_VER) && _MSC_VER>=1400 && !defined(_WIN32_WCE)
+#if defined(_MSC_VER) && _MSC_VER >= 1400 && !defined(_WIN32_WCE)
return !strerror_s(buf, buflen, errnum);
#elif defined(_GNU_SOURCE)
char *err;
@@ -385,8 +389,7 @@ int openssl_strerror_r(int errnum, char *buf, size_t buflen)
if (err != buf)
OPENSSL_strlcpy(buf, err, buflen);
return 1;
-#elif (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L) || \
- (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 600)
+#elif (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L) || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 600)
/*
* We can use "real" strerror_r. The OpenSSL version differs in that it
* gives 1 on success and 0 on failure for consistency with other OpenSSL
diff --git a/crypto/objects/o_names.c b/crypto/objects/o_names.c
index 2217d0c4cd..7c0bdddc7c 100644
--- a/crypto/objects/o_names.c
+++ b/crypto/objects/o_names.c
@@ -30,9 +30,9 @@ static int names_type_num = OBJ_NAME_TYPE_NUM;
static CRYPTO_RWLOCK *obj_lock = NULL;
struct name_funcs_st {
- unsigned long (*hash_func) (const char *name);
- int (*cmp_func) (const char *a, const char *b);
- void (*free_func) (const char *, int, const char *);
+ unsigned long (*hash_func)(const char *name);
+ int (*cmp_func)(const char *a, const char *b);
+ void (*free_func)(const char *, int, const char *);
};
static STACK_OF(NAME_FUNCS) *name_funcs_stack;
@@ -65,9 +65,9 @@ int OBJ_NAME_init(void)
return RUN_ONCE(&init, o_names_init);
}
-int OBJ_NAME_new_index(unsigned long (*hash_func) (const char *),
- int (*cmp_func) (const char *, const char *),
- void (*free_func) (const char *, int, const char *))
+int OBJ_NAME_new_index(unsigned long (*hash_func)(const char *),
+ int (*cmp_func)(const char *, const char *),
+ void (*free_func)(const char *, int, const char *))
{
int ret = 0, i, push;
NAME_FUNCS *name_funcs;
@@ -125,7 +125,8 @@ static int obj_name_cmp(const OBJ_NAME *a, const OBJ_NAME *b)
if ((name_funcs_stack != NULL)
&& (sk_NAME_FUNCS_num(name_funcs_stack) > a->type)) {
ret = sk_NAME_FUNCS_value(name_funcs_stack,
- a->type)->cmp_func(a->name, b->name);
+ a->type)
+ ->cmp_func(a->name, b->name);
} else
ret = OPENSSL_strcasecmp(a->name, b->name);
}
@@ -138,9 +139,9 @@ static unsigned long obj_name_hash(const OBJ_NAME *a)
if ((name_funcs_stack != NULL)
&& (sk_NAME_FUNCS_num(name_funcs_stack) > a->type)) {
- ret =
- sk_NAME_FUNCS_value(name_funcs_stack,
- a->type)->hash_func(a->name);
+ ret = sk_NAME_FUNCS_value(name_funcs_stack,
+ a->type)
+ ->hash_func(a->name);
} else {
ret = ossl_lh_strcasehash(a->name);
}
@@ -220,8 +221,9 @@ int OBJ_NAME_add(const char *name, int type, const char *data)
* get three arguments... -- Richard Levitte
*/
sk_NAME_FUNCS_value(name_funcs_stack,
- ret->type)->free_func(ret->name, ret->type,
- ret->data);
+ ret->type)
+ ->free_func(ret->name, ret->type,
+ ret->data);
}
OPENSSL_free(ret);
} else {
@@ -263,8 +265,9 @@ int OBJ_NAME_remove(const char *name, int type)
* get three arguments... -- Richard Levitte
*/
sk_NAME_FUNCS_value(name_funcs_stack,
- ret->type)->free_func(ret->name, ret->type,
- ret->data);
+ ret->type)
+ ->free_func(ret->name, ret->type,
+ ret->data);
}
OPENSSL_free(ret);
ok = 1;
@@ -276,7 +279,7 @@ int OBJ_NAME_remove(const char *name, int type)
typedef struct {
int type;
- void (*fn) (const OBJ_NAME *, void *arg);
+ void (*fn)(const OBJ_NAME *, void *arg);
void *arg;
} OBJ_DOALL;
@@ -288,8 +291,8 @@ static void do_all_fn(const OBJ_NAME *name, OBJ_DOALL *d)
IMPLEMENT_LHASH_DOALL_ARG_CONST(OBJ_NAME, OBJ_DOALL);
-void OBJ_NAME_do_all(int type, void (*fn) (const OBJ_NAME *, void *arg),
- void *arg)
+void OBJ_NAME_do_all(int type, void (*fn)(const OBJ_NAME *, void *arg),
+ void *arg)
{
OBJ_DOALL d;
@@ -325,15 +328,14 @@ static int do_all_sorted_cmp(const void *n1_, const void *n2_)
}
void OBJ_NAME_do_all_sorted(int type,
- void (*fn) (const OBJ_NAME *, void *arg),
- void *arg)
+ void (*fn)(const OBJ_NAME *, void *arg),
+ void *arg)
{
struct doall_sorted d;
int n;
d.type = type;
- d.names =
- OPENSSL_malloc_array(lh_OBJ_NAME_num_items(names_lh), sizeof(*d.names));
+ d.names = OPENSSL_malloc_array(lh_OBJ_NAME_num_items(names_lh), sizeof(*d.names));
/* Really should return an error if !d.names...but its a void function! */
if (d.names != NULL) {
d.n = 0;
diff --git a/crypto/objects/obj_compat.h b/crypto/objects/obj_compat.h
index 7d890d1c0b..76390cf2a9 100644
--- a/crypto/objects/obj_compat.h
+++ b/crypto/objects/obj_compat.h
@@ -9,46 +9,46 @@
#ifndef OPENSSL_NO_DEPRECATED_3_0
-#define SN_id_tc26_cipher_gostr3412_2015_magma_ctracpkm SN_magma_ctr_acpkm
-#define NID_id_tc26_cipher_gostr3412_2015_magma_ctracpkm NID_magma_ctr_acpkm
-#define OBJ_id_tc26_cipher_gostr3412_2015_magma_ctracpkm OBJ_magma_ctr_acpkm
+#define SN_id_tc26_cipher_gostr3412_2015_magma_ctracpkm SN_magma_ctr_acpkm
+#define NID_id_tc26_cipher_gostr3412_2015_magma_ctracpkm NID_magma_ctr_acpkm
+#define OBJ_id_tc26_cipher_gostr3412_2015_magma_ctracpkm OBJ_magma_ctr_acpkm
-#define SN_id_tc26_cipher_gostr3412_2015_magma_ctracpkm_omac SN_magma_ctr_acpkm_omac
-#define NID_id_tc26_cipher_gostr3412_2015_magma_ctracpkm_omac NID_magma_ctr_acpkm_omac
-#define OBJ_id_tc26_cipher_gostr3412_2015_magma_ctracpkm_omac OBJ_magma_ctr_acpkm_omac
+#define SN_id_tc26_cipher_gostr3412_2015_magma_ctracpkm_omac SN_magma_ctr_acpkm_omac
+#define NID_id_tc26_cipher_gostr3412_2015_magma_ctracpkm_omac NID_magma_ctr_acpkm_omac
+#define OBJ_id_tc26_cipher_gostr3412_2015_magma_ctracpkm_omac OBJ_magma_ctr_acpkm_omac
-#define SN_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm SN_kuznyechik_ctr_acpkm
-#define NID_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm NID_kuznyechik_ctr_acpkm
-#define OBJ_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm OBJ_kuznyechik_ctr_acpkm
+#define SN_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm SN_kuznyechik_ctr_acpkm
+#define NID_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm NID_kuznyechik_ctr_acpkm
+#define OBJ_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm OBJ_kuznyechik_ctr_acpkm
-#define SN_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm_omac SN_kuznyechik_ctr_acpkm_omac
-#define NID_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm_omac NID_kuznyechik_ctr_acpkm_omac
-#define OBJ_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm_omac OBJ_kuznyechik_ctr_acpkm_omac
+#define SN_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm_omac SN_kuznyechik_ctr_acpkm_omac
+#define NID_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm_omac NID_kuznyechik_ctr_acpkm_omac
+#define OBJ_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm_omac OBJ_kuznyechik_ctr_acpkm_omac
-#define SN_id_tc26_wrap_gostr3412_2015_magma_kexp15 SN_magma_kexp15
-#define NID_id_tc26_wrap_gostr3412_2015_magma_kexp15 NID_magma_kexp15
-#define OBJ_id_tc26_wrap_gostr3412_2015_magma_kexp15 OBJ_magma_kexp15
+#define SN_id_tc26_wrap_gostr3412_2015_magma_kexp15 SN_magma_kexp15
+#define NID_id_tc26_wrap_gostr3412_2015_magma_kexp15 NID_magma_kexp15
+#define OBJ_id_tc26_wrap_gostr3412_2015_magma_kexp15 OBJ_magma_kexp15
-#define SN_id_tc26_wrap_gostr3412_2015_kuznyechik_kexp15 SN_kuznyechik_kexp15
-#define NID_id_tc26_wrap_gostr3412_2015_kuznyechik_kexp15 NID_kuznyechik_kexp15
-#define OBJ_id_tc26_wrap_gostr3412_2015_kuznyechik_kexp15 OBJ_kuznyechik_kexp15
+#define SN_id_tc26_wrap_gostr3412_2015_kuznyechik_kexp15 SN_kuznyechik_kexp15
+#define NID_id_tc26_wrap_gostr3412_2015_kuznyechik_kexp15 NID_kuznyechik_kexp15
+#define OBJ_id_tc26_wrap_gostr3412_2015_kuznyechik_kexp15 OBJ_kuznyechik_kexp15
-#define SN_grasshopper_ecb SN_kuznyechik_ecb
-#define NID_grasshopper_ecb NID_kuznyechik_ecb
+#define SN_grasshopper_ecb SN_kuznyechik_ecb
+#define NID_grasshopper_ecb NID_kuznyechik_ecb
-#define SN_grasshopper_ctr SN_kuznyechik_ctr
-#define NID_grasshopper_ctr NID_kuznyechik_ctr
+#define SN_grasshopper_ctr SN_kuznyechik_ctr
+#define NID_grasshopper_ctr NID_kuznyechik_ctr
-#define SN_grasshopper_ofb SN_kuznyechik_ofb
-#define NID_grasshopper_ofb NID_kuznyechik_ofb
+#define SN_grasshopper_ofb SN_kuznyechik_ofb
+#define NID_grasshopper_ofb NID_kuznyechik_ofb
-#define SN_grasshopper_cbc SN_kuznyechik_cbc
-#define NID_grasshopper_cbc NID_kuznyechik_cbc
+#define SN_grasshopper_cbc SN_kuznyechik_cbc
+#define NID_grasshopper_cbc NID_kuznyechik_cbc
-#define SN_grasshopper_cfb SN_kuznyechik_cfb
-#define NID_grasshopper_cfb NID_kuznyechik_cfb
+#define SN_grasshopper_cfb SN_kuznyechik_cfb
+#define NID_grasshopper_cfb NID_kuznyechik_cfb
-#define SN_grasshopper_mac SN_kuznyechik_mac
-#define NID_grasshopper_mac NID_kuznyechik_mac
+#define SN_grasshopper_mac SN_kuznyechik_mac
+#define NID_grasshopper_mac NID_kuznyechik_mac
-#endif /* OPENSSL_NO_DEPRECATED_3_0 */
+#endif /* OPENSSL_NO_DEPRECATED_3_0 */
diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c
index 88136eba51..ac95d098b9 100644
--- a/crypto/objects/obj_dat.c
+++ b/crypto/objects/obj_dat.c
@@ -27,10 +27,10 @@ DECLARE_OBJ_BSEARCH_CMP_FN(const ASN1_OBJECT *, unsigned int, sn);
DECLARE_OBJ_BSEARCH_CMP_FN(const ASN1_OBJECT *, unsigned int, ln);
DECLARE_OBJ_BSEARCH_CMP_FN(const ASN1_OBJECT *, unsigned int, obj);
-#define ADDED_DATA 0
-#define ADDED_SNAME 1
-#define ADDED_LNAME 2
-#define ADDED_NID 3
+#define ADDED_DATA 0
+#define ADDED_SNAME 1
+#define ADDED_LNAME 2
+#define ADDED_NID 3
struct added_obj_st {
int type;
@@ -210,8 +210,7 @@ static int added_obj_cmp(const ADDED_OBJ *ca, const ADDED_OBJ *cb)
static void cleanup1_doall(ADDED_OBJ *a)
{
a->obj->nid = 0;
- a->obj->flags |= ASN1_OBJECT_FLAG_DYNAMIC |
- ASN1_OBJECT_FLAG_DYNAMIC_STRINGS | ASN1_OBJECT_FLAG_DYNAMIC_DATA;
+ a->obj->flags |= ASN1_OBJECT_FLAG_DYNAMIC | ASN1_OBJECT_FLAG_DYNAMIC_STRINGS | ASN1_OBJECT_FLAG_DYNAMIC_DATA;
}
static void cleanup2_doall(ADDED_OBJ *a)
@@ -541,7 +540,7 @@ int OBJ_obj2txt(char *buf, int buf_len, const ASN1_OBJECT *a, int no_name)
BN_free(bl);
return n;
- err:
+err:
BN_free(bl);
return -1;
}
@@ -609,15 +608,15 @@ int OBJ_sn2nid(const char *s)
}
const void *OBJ_bsearch_(const void *key, const void *base, int num, int size,
- int (*cmp) (const void *, const void *))
+ int (*cmp)(const void *, const void *))
{
return OBJ_bsearch_ex_(key, base, num, size, cmp, 0);
}
const void *OBJ_bsearch_ex_(const void *key, const void *base, int num,
- int size,
- int (*cmp) (const void *, const void *),
- int flags)
+ int size,
+ int (*cmp)(const void *, const void *),
+ int flags)
{
const char *p = ossl_bsearch(key, base, num, size, cmp, flags);
@@ -634,7 +633,7 @@ const void *OBJ_bsearch_ex_(const void *key, const void *base, int num,
for (i = 0; i < num; ++i) {
p1 = &(base_[i * size]);
- c = (*cmp) (key, p1);
+ c = (*cmp)(key, p1);
if (c == 0
|| (c < 0 && (flags & OBJ_BSEARCH_VALUE_ON_NOMATCH)))
return p1;
@@ -710,7 +709,7 @@ int OBJ_create(const char *oid, const char *sn, const char *ln)
/* Check to see if short or long name already present */
if ((sn != NULL && OBJ_sn2nid(sn) != NID_undef)
- || (ln != NULL && OBJ_ln2nid(ln) != NID_undef)) {
+ || (ln != NULL && OBJ_ln2nid(ln) != NID_undef)) {
ERR_raise(ERR_LIB_OBJ, OBJ_R_OID_EXISTS);
return NID_undef;
}
@@ -745,7 +744,7 @@ int OBJ_create(const char *oid, const char *sn, const char *ln)
tmpoid->sn = NULL;
tmpoid->ln = NULL;
- err:
+err:
ASN1_OBJECT_free(tmpoid);
return ok;
}
@@ -783,24 +782,24 @@ static int add_object(const ASN1_OBJECT *obj, int indirect)
return ret;
o->nid = nid;
} else if (nid < NUM_NID
- || (obj->data != NULL
- && OBJ_bsearch_obj(&obj, obj_objs, NUM_OBJ) != NULL)
- || (obj->sn != NULL
- && OBJ_bsearch_sn(&obj, sn_objs, NUM_SN) != NULL)
- || (obj->ln != NULL
- && OBJ_bsearch_ln(&obj, ln_objs, NUM_LN) != NULL)
- || (o = OBJ_dup(obj)) == NULL) {
+ || (obj->data != NULL
+ && OBJ_bsearch_obj(&obj, obj_objs, NUM_OBJ) != NULL)
+ || (obj->sn != NULL
+ && OBJ_bsearch_sn(&obj, sn_objs, NUM_SN) != NULL)
+ || (obj->ln != NULL
+ && OBJ_bsearch_ln(&obj, ln_objs, NUM_LN) != NULL)
+ || (o = OBJ_dup(obj)) == NULL) {
return ret;
}
if ((ao[ADDED_NID] = OPENSSL_malloc(sizeof(*ao[0]))) == NULL
- || (o->length != 0
- && obj->data != NULL
- && (ao[ADDED_DATA] = OPENSSL_malloc(sizeof(*ao[0]))) == NULL)
- || (o->sn != NULL
- && (ao[ADDED_SNAME] = OPENSSL_malloc(sizeof(*ao[0]))) == NULL)
- || (o->ln != NULL
- && (ao[ADDED_LNAME] = OPENSSL_malloc(sizeof(*ao[0]))) == NULL))
+ || (o->length != 0
+ && obj->data != NULL
+ && (ao[ADDED_DATA] = OPENSSL_malloc(sizeof(*ao[0]))) == NULL)
+ || (o->sn != NULL
+ && (ao[ADDED_SNAME] = OPENSSL_malloc(sizeof(*ao[0]))) == NULL)
+ || (o->ln != NULL
+ && (ao[ADDED_LNAME] = OPENSSL_malloc(sizeof(*ao[0]))) == NULL))
goto err2;
if (!ossl_obj_write_lock()) {
@@ -846,16 +845,14 @@ static int add_object(const ASN1_OBJECT *obj, int indirect)
goto err;
}
}
- o->flags &=
- ~(ASN1_OBJECT_FLAG_DYNAMIC | ASN1_OBJECT_FLAG_DYNAMIC_STRINGS |
- ASN1_OBJECT_FLAG_DYNAMIC_DATA);
+ o->flags &= ~(ASN1_OBJECT_FLAG_DYNAMIC | ASN1_OBJECT_FLAG_DYNAMIC_STRINGS | ASN1_OBJECT_FLAG_DYNAMIC_DATA);
ossl_obj_unlock();
return o->nid;
- err:
+err:
ossl_obj_unlock();
- err2:
+err2:
for (i = ADDED_DATA; i <= ADDED_NID; i++)
OPENSSL_free(ao[i]);
ASN1_OBJECT_free(o);
diff --git a/crypto/objects/obj_err.c b/crypto/objects/obj_err.c
index b4c8df09e6..c3c5478034 100644
--- a/crypto/objects/obj_err.c
+++ b/crypto/objects/obj_err.c
@@ -15,11 +15,11 @@
#ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA OBJ_str_reasons[] = {
- {ERR_PACK(ERR_LIB_OBJ, 0, OBJ_R_OID_EXISTS), "oid exists"},
- {ERR_PACK(ERR_LIB_OBJ, 0, OBJ_R_UNKNOWN_NID), "unknown nid"},
- {ERR_PACK(ERR_LIB_OBJ, 0, OBJ_R_UNKNOWN_OBJECT_NAME),
- "unknown object name"},
- {0, NULL}
+ { ERR_PACK(ERR_LIB_OBJ, 0, OBJ_R_OID_EXISTS), "oid exists" },
+ { ERR_PACK(ERR_LIB_OBJ, 0, OBJ_R_UNKNOWN_NID), "unknown nid" },
+ { ERR_PACK(ERR_LIB_OBJ, 0, OBJ_R_UNKNOWN_OBJECT_NAME),
+ "unknown object name" },
+ { 0, NULL }
};
#endif
diff --git a/crypto/objects/obj_lib.c b/crypto/objects/obj_lib.c
index 6cdc1d7e74..adc22a10e2 100644
--- a/crypto/objects/obj_lib.c
+++ b/crypto/objects/obj_lib.c
@@ -31,9 +31,7 @@ ASN1_OBJECT *OBJ_dup(const ASN1_OBJECT *o)
/* Set dynamic flags so everything gets freed up on error */
- r->flags = o->flags | (ASN1_OBJECT_FLAG_DYNAMIC |
- ASN1_OBJECT_FLAG_DYNAMIC_STRINGS |
- ASN1_OBJECT_FLAG_DYNAMIC_DATA);
+ r->flags = o->flags | (ASN1_OBJECT_FLAG_DYNAMIC | ASN1_OBJECT_FLAG_DYNAMIC_STRINGS | ASN1_OBJECT_FLAG_DYNAMIC_DATA);
if (o->length > 0 && (r->data = OPENSSL_memdup(o->data, o->length)) == NULL)
goto err;
@@ -48,7 +46,7 @@ ASN1_OBJECT *OBJ_dup(const ASN1_OBJECT *o)
goto err;
return r;
- err:
+err:
ASN1_OBJECT_free(r);
return NULL;
}
diff --git a/crypto/objects/obj_xref.c b/crypto/objects/obj_xref.c
index 2eb757cb77..afa7372c18 100644
--- a/crypto/objects/obj_xref.c
+++ b/crypto/objects/obj_xref.c
@@ -64,7 +64,7 @@ static ossl_inline int obj_sig_init(void)
}
static int ossl_obj_find_sigid_algs(int signid, int *pdig_nid, int *ppkey_nid,
- int lock)
+ int lock)
{
nid_triple tmp;
const nid_triple *rv;
@@ -191,7 +191,7 @@ int OBJ_add_sigid(int signid, int dig_id, int pkey_id)
if (!sk_nid_triple_push(sig_app, ntr))
goto err;
if (!sk_nid_triple_push(sigx_app, ntr)) {
- ntr = NULL; /* This is referenced by sig_app still */
+ ntr = NULL; /* This is referenced by sig_app still */
goto err;
}
@@ -200,7 +200,7 @@ int OBJ_add_sigid(int signid, int dig_id, int pkey_id)
ntr = NULL;
ret = 1;
- err:
+err:
OPENSSL_free(ntr);
CRYPTO_THREAD_unlock(sig_lock);
return ret;
diff --git a/crypto/ocsp/ocsp_asn.c b/crypto/ocsp/ocsp_asn.c
index 4b4342825c..ef70d4c204 100644
--- a/crypto/ocsp/ocsp_asn.c
+++ b/crypto/ocsp/ocsp_asn.c
@@ -13,41 +13,41 @@
#include "ocsp_local.h"
ASN1_SEQUENCE(OCSP_SIGNATURE) = {
- ASN1_EMBED(OCSP_SIGNATURE, signatureAlgorithm, X509_ALGOR),
- ASN1_SIMPLE(OCSP_SIGNATURE, signature, ASN1_BIT_STRING),
- ASN1_EXP_SEQUENCE_OF_OPT(OCSP_SIGNATURE, certs, X509, 0)
+ ASN1_EMBED(OCSP_SIGNATURE, signatureAlgorithm, X509_ALGOR),
+ ASN1_SIMPLE(OCSP_SIGNATURE, signature, ASN1_BIT_STRING),
+ ASN1_EXP_SEQUENCE_OF_OPT(OCSP_SIGNATURE, certs, X509, 0)
} ASN1_SEQUENCE_END(OCSP_SIGNATURE)
IMPLEMENT_ASN1_FUNCTIONS(OCSP_SIGNATURE)
ASN1_SEQUENCE(OCSP_CERTID) = {
- ASN1_EMBED(OCSP_CERTID, hashAlgorithm, X509_ALGOR),
- ASN1_EMBED(OCSP_CERTID, issuerNameHash, ASN1_OCTET_STRING),
- ASN1_EMBED(OCSP_CERTID, issuerKeyHash, ASN1_OCTET_STRING),
- ASN1_EMBED(OCSP_CERTID, serialNumber, ASN1_INTEGER)
+ ASN1_EMBED(OCSP_CERTID, hashAlgorithm, X509_ALGOR),
+ ASN1_EMBED(OCSP_CERTID, issuerNameHash, ASN1_OCTET_STRING),
+ ASN1_EMBED(OCSP_CERTID, issuerKeyHash, ASN1_OCTET_STRING),
+ ASN1_EMBED(OCSP_CERTID, serialNumber, ASN1_INTEGER)
} ASN1_SEQUENCE_END(OCSP_CERTID)
IMPLEMENT_ASN1_FUNCTIONS(OCSP_CERTID)
ASN1_SEQUENCE(OCSP_ONEREQ) = {
- ASN1_SIMPLE(OCSP_ONEREQ, reqCert, OCSP_CERTID),
- ASN1_EXP_SEQUENCE_OF_OPT(OCSP_ONEREQ, singleRequestExtensions, X509_EXTENSION, 0)
+ ASN1_SIMPLE(OCSP_ONEREQ, reqCert, OCSP_CERTID),
+ ASN1_EXP_SEQUENCE_OF_OPT(OCSP_ONEREQ, singleRequestExtensions, X509_EXTENSION, 0)
} ASN1_SEQUENCE_END(OCSP_ONEREQ)
IMPLEMENT_ASN1_FUNCTIONS(OCSP_ONEREQ)
ASN1_SEQUENCE(OCSP_REQINFO) = {
- ASN1_EXP_OPT(OCSP_REQINFO, version, ASN1_INTEGER, 0),
- ASN1_EXP_OPT(OCSP_REQINFO, requestorName, GENERAL_NAME, 1),
- ASN1_SEQUENCE_OF(OCSP_REQINFO, requestList, OCSP_ONEREQ),
- ASN1_EXP_SEQUENCE_OF_OPT(OCSP_REQINFO, requestExtensions, X509_EXTENSION, 2)
+ ASN1_EXP_OPT(OCSP_REQINFO, version, ASN1_INTEGER, 0),
+ ASN1_EXP_OPT(OCSP_REQINFO, requestorName, GENERAL_NAME, 1),
+ ASN1_SEQUENCE_OF(OCSP_REQINFO, requestList, OCSP_ONEREQ),
+ ASN1_EXP_SEQUENCE_OF_OPT(OCSP_REQINFO, requestExtensions, X509_EXTENSION, 2)
} ASN1_SEQUENCE_END(OCSP_REQINFO)
IMPLEMENT_ASN1_FUNCTIONS(OCSP_REQINFO)
ASN1_SEQUENCE(OCSP_REQUEST) = {
- ASN1_EMBED(OCSP_REQUEST, tbsRequest, OCSP_REQINFO),
- ASN1_EXP_OPT(OCSP_REQUEST, optionalSignature, OCSP_SIGNATURE, 0)
+ ASN1_EMBED(OCSP_REQUEST, tbsRequest, OCSP_REQINFO),
+ ASN1_EXP_OPT(OCSP_REQUEST, optionalSignature, OCSP_SIGNATURE, 0)
} ASN1_SEQUENCE_END(OCSP_REQUEST)
IMPLEMENT_ASN1_FUNCTIONS(OCSP_REQUEST)
@@ -55,81 +55,81 @@ IMPLEMENT_ASN1_FUNCTIONS(OCSP_REQUEST)
/* OCSP_RESPONSE templates */
ASN1_SEQUENCE(OCSP_RESPBYTES) = {
- ASN1_SIMPLE(OCSP_RESPBYTES, responseType, ASN1_OBJECT),
- ASN1_SIMPLE(OCSP_RESPBYTES, response, ASN1_OCTET_STRING)
+ ASN1_SIMPLE(OCSP_RESPBYTES, responseType, ASN1_OBJECT),
+ ASN1_SIMPLE(OCSP_RESPBYTES, response, ASN1_OCTET_STRING)
} ASN1_SEQUENCE_END(OCSP_RESPBYTES)
IMPLEMENT_ASN1_FUNCTIONS(OCSP_RESPBYTES)
ASN1_SEQUENCE(OCSP_RESPONSE) = {
- ASN1_SIMPLE(OCSP_RESPONSE, responseStatus, ASN1_ENUMERATED),
- ASN1_EXP_OPT(OCSP_RESPONSE, responseBytes, OCSP_RESPBYTES, 0)
+ ASN1_SIMPLE(OCSP_RESPONSE, responseStatus, ASN1_ENUMERATED),
+ ASN1_EXP_OPT(OCSP_RESPONSE, responseBytes, OCSP_RESPBYTES, 0)
} ASN1_SEQUENCE_END(OCSP_RESPONSE)
IMPLEMENT_ASN1_FUNCTIONS(OCSP_RESPONSE)
ASN1_CHOICE(OCSP_RESPID) = {
- ASN1_EXP(OCSP_RESPID, value.byName, X509_NAME, 1),
- ASN1_EXP(OCSP_RESPID, value.byKey, ASN1_OCTET_STRING, 2)
+ ASN1_EXP(OCSP_RESPID, value.byName, X509_NAME, 1),
+ ASN1_EXP(OCSP_RESPID, value.byKey, ASN1_OCTET_STRING, 2)
} ASN1_CHOICE_END(OCSP_RESPID)
IMPLEMENT_ASN1_FUNCTIONS(OCSP_RESPID)
ASN1_SEQUENCE(OCSP_REVOKEDINFO) = {
- ASN1_SIMPLE(OCSP_REVOKEDINFO, revocationTime, ASN1_GENERALIZEDTIME),
- ASN1_EXP_OPT(OCSP_REVOKEDINFO, revocationReason, ASN1_ENUMERATED, 0)
+ ASN1_SIMPLE(OCSP_REVOKEDINFO, revocationTime, ASN1_GENERALIZEDTIME),
+ ASN1_EXP_OPT(OCSP_REVOKEDINFO, revocationReason, ASN1_ENUMERATED, 0)
} ASN1_SEQUENCE_END(OCSP_REVOKEDINFO)
IMPLEMENT_ASN1_FUNCTIONS(OCSP_REVOKEDINFO)
ASN1_CHOICE(OCSP_CERTSTATUS) = {
- ASN1_IMP(OCSP_CERTSTATUS, value.good, ASN1_NULL, 0),
- ASN1_IMP(OCSP_CERTSTATUS, value.revoked, OCSP_REVOKEDINFO, 1),
- ASN1_IMP(OCSP_CERTSTATUS, value.unknown, ASN1_NULL, 2)
+ ASN1_IMP(OCSP_CERTSTATUS, value.good, ASN1_NULL, 0),
+ ASN1_IMP(OCSP_CERTSTATUS, value.revoked, OCSP_REVOKEDINFO, 1),
+ ASN1_IMP(OCSP_CERTSTATUS, value.unknown, ASN1_NULL, 2)
} ASN1_CHOICE_END(OCSP_CERTSTATUS)
IMPLEMENT_ASN1_FUNCTIONS(OCSP_CERTSTATUS)
ASN1_SEQUENCE(OCSP_SINGLERESP) = {
- ASN1_SIMPLE(OCSP_SINGLERESP, certId, OCSP_CERTID),
- ASN1_SIMPLE(OCSP_SINGLERESP, certStatus, OCSP_CERTSTATUS),
- ASN1_SIMPLE(OCSP_SINGLERESP, thisUpdate, ASN1_GENERALIZEDTIME),
- ASN1_EXP_OPT(OCSP_SINGLERESP, nextUpdate, ASN1_GENERALIZEDTIME, 0),
- ASN1_EXP_SEQUENCE_OF_OPT(OCSP_SINGLERESP, singleExtensions, X509_EXTENSION, 1)
+ ASN1_SIMPLE(OCSP_SINGLERESP, certId, OCSP_CERTID),
+ ASN1_SIMPLE(OCSP_SINGLERESP, certStatus, OCSP_CERTSTATUS),
+ ASN1_SIMPLE(OCSP_SINGLERESP, thisUpdate, ASN1_GENERALIZEDTIME),
+ ASN1_EXP_OPT(OCSP_SINGLERESP, nextUpdate, ASN1_GENERALIZEDTIME, 0),
+ ASN1_EXP_SEQUENCE_OF_OPT(OCSP_SINGLERESP, singleExtensions, X509_EXTENSION, 1)
} ASN1_SEQUENCE_END(OCSP_SINGLERESP)
IMPLEMENT_ASN1_FUNCTIONS(OCSP_SINGLERESP)
ASN1_SEQUENCE(OCSP_RESPDATA) = {
- ASN1_EXP_OPT(OCSP_RESPDATA, version, ASN1_INTEGER, 0),
- ASN1_EMBED(OCSP_RESPDATA, responderId, OCSP_RESPID),
- ASN1_SIMPLE(OCSP_RESPDATA, producedAt, ASN1_GENERALIZEDTIME),
- ASN1_SEQUENCE_OF(OCSP_RESPDATA, responses, OCSP_SINGLERESP),
- ASN1_EXP_SEQUENCE_OF_OPT(OCSP_RESPDATA, responseExtensions, X509_EXTENSION, 1)
+ ASN1_EXP_OPT(OCSP_RESPDATA, version, ASN1_INTEGER, 0),
+ ASN1_EMBED(OCSP_RESPDATA, responderId, OCSP_RESPID),
+ ASN1_SIMPLE(OCSP_RESPDATA, producedAt, ASN1_GENERALIZEDTIME),
+ ASN1_SEQUENCE_OF(OCSP_RESPDATA, responses, OCSP_SINGLERESP),
+ ASN1_EXP_SEQUENCE_OF_OPT(OCSP_RESPDATA, responseExtensions, X509_EXTENSION, 1)
} ASN1_SEQUENCE_END(OCSP_RESPDATA)
IMPLEMENT_ASN1_FUNCTIONS(OCSP_RESPDATA)
ASN1_SEQUENCE(OCSP_BASICRESP) = {
- ASN1_EMBED(OCSP_BASICRESP, tbsResponseData, OCSP_RESPDATA),
- ASN1_EMBED(OCSP_BASICRESP, signatureAlgorithm, X509_ALGOR),
- ASN1_SIMPLE(OCSP_BASICRESP, signature, ASN1_BIT_STRING),
- ASN1_EXP_SEQUENCE_OF_OPT(OCSP_BASICRESP, certs, X509, 0)
+ ASN1_EMBED(OCSP_BASICRESP, tbsResponseData, OCSP_RESPDATA),
+ ASN1_EMBED(OCSP_BASICRESP, signatureAlgorithm, X509_ALGOR),
+ ASN1_SIMPLE(OCSP_BASICRESP, signature, ASN1_BIT_STRING),
+ ASN1_EXP_SEQUENCE_OF_OPT(OCSP_BASICRESP, certs, X509, 0)
} ASN1_SEQUENCE_END(OCSP_BASICRESP)
IMPLEMENT_ASN1_FUNCTIONS(OCSP_BASICRESP)
ASN1_SEQUENCE(OCSP_CRLID) = {
- ASN1_EXP_OPT(OCSP_CRLID, crlUrl, ASN1_IA5STRING, 0),
- ASN1_EXP_OPT(OCSP_CRLID, crlNum, ASN1_INTEGER, 1),
- ASN1_EXP_OPT(OCSP_CRLID, crlTime, ASN1_GENERALIZEDTIME, 2)
+ ASN1_EXP_OPT(OCSP_CRLID, crlUrl, ASN1_IA5STRING, 0),
+ ASN1_EXP_OPT(OCSP_CRLID, crlNum, ASN1_INTEGER, 1),
+ ASN1_EXP_OPT(OCSP_CRLID, crlTime, ASN1_GENERALIZEDTIME, 2)
} ASN1_SEQUENCE_END(OCSP_CRLID)
IMPLEMENT_ASN1_FUNCTIONS(OCSP_CRLID)
ASN1_SEQUENCE(OCSP_SERVICELOC) = {
- ASN1_SIMPLE(OCSP_SERVICELOC, issuer, X509_NAME),
- ASN1_SEQUENCE_OF_OPT(OCSP_SERVICELOC, locator, ACCESS_DESCRIPTION)
+ ASN1_SIMPLE(OCSP_SERVICELOC, issuer, X509_NAME),
+ ASN1_SEQUENCE_OF_OPT(OCSP_SERVICELOC, locator, ACCESS_DESCRIPTION)
} ASN1_SEQUENCE_END(OCSP_SERVICELOC)
IMPLEMENT_ASN1_FUNCTIONS(OCSP_SERVICELOC)
diff --git a/crypto/ocsp/ocsp_cl.c b/crypto/ocsp/ocsp_cl.c
index afb996cb71..22d6692a91 100644
--- a/crypto/ocsp/ocsp_cl.c
+++ b/crypto/ocsp/ocsp_cl.c
@@ -53,12 +53,12 @@ int OCSP_request_set1_name(OCSP_REQUEST *req, const X509_NAME *nm)
int OCSP_request_add1_cert(OCSP_REQUEST *req, X509 *cert)
{
if (req->optionalSignature == NULL
- && (req->optionalSignature = OCSP_SIGNATURE_new()) == NULL)
+ && (req->optionalSignature = OCSP_SIGNATURE_new()) == NULL)
return 0;
if (cert == NULL)
return 1;
return ossl_x509_add_cert_new(&req->optionalSignature->certs, cert,
- X509_ADD_FLAG_UP_REF);
+ X509_ADD_FLAG_UP_REF);
}
/*
@@ -67,10 +67,10 @@ int OCSP_request_add1_cert(OCSP_REQUEST *req, X509 *cert)
* in the request. Behaves like PKCS7_sign().
*/
int OCSP_request_sign(OCSP_REQUEST *req,
- X509 *signer,
- EVP_PKEY *key,
- const EVP_MD *dgst,
- STACK_OF(X509) *certs, unsigned long flags)
+ X509 *signer,
+ EVP_PKEY *key,
+ const EVP_MD *dgst,
+ STACK_OF(X509) *certs, unsigned long flags)
{
if (!OCSP_request_set1_name(req, X509_get_subject_name(signer)))
goto err;
@@ -80,7 +80,7 @@ int OCSP_request_sign(OCSP_REQUEST *req,
if (key != NULL) {
if (!X509_check_private_key(signer, key)) {
ERR_raise(ERR_LIB_OCSP,
- OCSP_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE);
+ OCSP_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE);
goto err;
}
if (!OCSP_REQUEST_sign(req, key, dgst, signer->libctx, signer->propq))
@@ -90,12 +90,12 @@ int OCSP_request_sign(OCSP_REQUEST *req,
if ((flags & OCSP_NOCERTS) == 0) {
if (!OCSP_request_add1_cert(req, signer)
|| !X509_add_certs(req->optionalSignature->certs, certs,
- X509_ADD_FLAG_UP_REF))
+ X509_ADD_FLAG_UP_REF))
goto err;
}
return 1;
- err:
+err:
OCSP_SIGNATURE_free(req->optionalSignature);
req->optionalSignature = NULL;
return 0;
@@ -170,8 +170,8 @@ const STACK_OF(X509) *OCSP_resp_get0_certs(const OCSP_BASICRESP *bs)
}
int OCSP_resp_get0_id(const OCSP_BASICRESP *bs,
- const ASN1_OCTET_STRING **pid,
- const X509_NAME **pname)
+ const ASN1_OCTET_STRING **pid,
+ const X509_NAME **pname)
{
const OCSP_RESPID *rid = &bs->tbsResponseData.responderId;
@@ -188,8 +188,8 @@ int OCSP_resp_get0_id(const OCSP_BASICRESP *bs,
}
int OCSP_resp_get1_id(const OCSP_BASICRESP *bs,
- ASN1_OCTET_STRING **pid,
- X509_NAME **pname)
+ ASN1_OCTET_STRING **pid,
+ X509_NAME **pname)
{
const OCSP_RESPID *rid = &bs->tbsResponseData.responderId;
@@ -235,9 +235,9 @@ int OCSP_resp_find(OCSP_BASICRESP *bs, OCSP_CERTID *id, int last)
* revoked. Returns numerical value of status.
*/
int OCSP_single_get0_status(OCSP_SINGLERESP *single, int *reason,
- ASN1_GENERALIZEDTIME **revtime,
- ASN1_GENERALIZEDTIME **thisupd,
- ASN1_GENERALIZEDTIME **nextupd)
+ ASN1_GENERALIZEDTIME **revtime,
+ ASN1_GENERALIZEDTIME **thisupd,
+ ASN1_GENERALIZEDTIME **nextupd)
{
int ret;
OCSP_CERTSTATUS *cst;
@@ -270,10 +270,10 @@ int OCSP_single_get0_status(OCSP_SINGLERESP *single, int *reason,
* found extract status information. Return 0 is successful.
*/
int OCSP_resp_find_status(OCSP_BASICRESP *bs, OCSP_CERTID *id, int *status,
- int *reason,
- ASN1_GENERALIZEDTIME **revtime,
- ASN1_GENERALIZEDTIME **thisupd,
- ASN1_GENERALIZEDTIME **nextupd)
+ int *reason,
+ ASN1_GENERALIZEDTIME **revtime,
+ ASN1_GENERALIZEDTIME **thisupd,
+ ASN1_GENERALIZEDTIME **nextupd)
{
int i = OCSP_resp_find(bs, id, -1);
OCSP_SINGLERESP *single;
@@ -297,7 +297,7 @@ int OCSP_resp_find_status(OCSP_BASICRESP *bs, OCSP_CERTID *id, int *status,
* parameter specifies the maximum age the thisUpdate field can be.
*/
int OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd,
- ASN1_GENERALIZEDTIME *nextupd, long nsec, long maxsec)
+ ASN1_GENERALIZEDTIME *nextupd, long nsec, long maxsec)
{
int ret = 1;
time_t t_now, t_tmp;
diff --git a/crypto/ocsp/ocsp_err.c b/crypto/ocsp/ocsp_err.c
index c33a7d3e6b..aa0ee11af4 100644
--- a/crypto/ocsp/ocsp_err.c
+++ b/crypto/ocsp/ocsp_err.c
@@ -14,60 +14,60 @@
#ifndef OPENSSL_NO_OCSP
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA OCSP_str_reasons[] = {
- {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_CERTIFICATE_VERIFY_ERROR),
- "certificate verify error"},
- {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_DIGEST_ERR), "digest err"},
- {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_DIGEST_NAME_ERR), "digest name err"},
- {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_DIGEST_SIZE_ERR), "digest size err"},
- {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_ERROR_IN_NEXTUPDATE_FIELD),
- "error in nextupdate field"},
- {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_ERROR_IN_THISUPDATE_FIELD),
- "error in thisupdate field"},
- {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_MISSING_OCSPSIGNING_USAGE),
- "missing ocspsigning usage"},
- {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_NEXTUPDATE_BEFORE_THISUPDATE),
- "nextupdate before thisupdate"},
- {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_NOT_BASIC_RESPONSE),
- "not basic response"},
- {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_NO_CERTIFICATES_IN_CHAIN),
- "no certificates in chain"},
- {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_NO_RESPONSE_DATA), "no response data"},
- {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_NO_REVOKED_TIME), "no revoked time"},
- {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_NO_SIGNER_KEY), "no signer key"},
- {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE),
- "private key does not match certificate"},
- {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_REQUEST_NOT_SIGNED),
- "request not signed"},
- {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_RESPONSE_CONTAINS_NO_REVOCATION_DATA),
- "response contains no revocation data"},
- {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_ROOT_CA_NOT_TRUSTED),
- "root ca not trusted"},
- {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_SIGNATURE_FAILURE), "signature failure"},
- {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_SIGNER_CERTIFICATE_NOT_FOUND),
- "signer certificate not found"},
- {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_STATUS_EXPIRED), "status expired"},
- {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_STATUS_NOT_YET_VALID),
- "status not yet valid"},
- {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_STATUS_TOO_OLD), "status too old"},
- {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_UNKNOWN_MESSAGE_DIGEST),
- "unknown message digest"},
- {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_UNKNOWN_NID), "unknown nid"},
- {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_UNSUPPORTED_REQUESTORNAME_TYPE),
- "unsupported requestorname type"},
- {0, NULL}
+ { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_CERTIFICATE_VERIFY_ERROR),
+ "certificate verify error" },
+ { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_DIGEST_ERR), "digest err" },
+ { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_DIGEST_NAME_ERR), "digest name err" },
+ { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_DIGEST_SIZE_ERR), "digest size err" },
+ { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_ERROR_IN_NEXTUPDATE_FIELD),
+ "error in nextupdate field" },
+ { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_ERROR_IN_THISUPDATE_FIELD),
+ "error in thisupdate field" },
+ { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_MISSING_OCSPSIGNING_USAGE),
+ "missing ocspsigning usage" },
+ { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_NEXTUPDATE_BEFORE_THISUPDATE),
+ "nextupdate before thisupdate" },
+ { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_NOT_BASIC_RESPONSE),
+ "not basic response" },
+ { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_NO_CERTIFICATES_IN_CHAIN),
+ "no certificates in chain" },
+ { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_NO_RESPONSE_DATA), "no response data" },
+ { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_NO_REVOKED_TIME), "no revoked time" },
+ { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_NO_SIGNER_KEY), "no signer key" },
+ { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE),
+ "private key does not match certificate" },
+ { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_REQUEST_NOT_SIGNED),
+ "request not signed" },
+ { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_RESPONSE_CONTAINS_NO_REVOCATION_DATA),
+ "response contains no revocation data" },
+ { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_ROOT_CA_NOT_TRUSTED),
+ "root ca not trusted" },
+ { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_SIGNATURE_FAILURE), "signature failure" },
+ { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_SIGNER_CERTIFICATE_NOT_FOUND),
+ "signer certificate not found" },
+ { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_STATUS_EXPIRED), "status expired" },
+ { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_STATUS_NOT_YET_VALID),
+ "status not yet valid" },
+ { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_STATUS_TOO_OLD), "status too old" },
+ { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_UNKNOWN_MESSAGE_DIGEST),
+ "unknown message digest" },
+ { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_UNKNOWN_NID), "unknown nid" },
+ { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_UNSUPPORTED_REQUESTORNAME_TYPE),
+ "unsupported requestorname type" },
+ { 0, NULL }
};
-# endif
+#endif
int ossl_err_load_OCSP_strings(void)
{
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(OCSP_str_reasons[0].error) == NULL)
ERR_load_strings_const(OCSP_str_reasons);
-# endif
+#endif
return 1;
}
#else
diff --git a/crypto/ocsp/ocsp_ext.c b/crypto/ocsp/ocsp_ext.c
index 95f693ba0c..4149f7f66d 100644
--- a/crypto/ocsp/ocsp_ext.c
+++ b/crypto/ocsp/ocsp_ext.c
@@ -27,21 +27,18 @@ int OCSP_REQUEST_get_ext_count(OCSP_REQUEST *x)
int OCSP_REQUEST_get_ext_by_NID(OCSP_REQUEST *x, int nid, int lastpos)
{
- return (X509v3_get_ext_by_NID
- (x->tbsRequest.requestExtensions, nid, lastpos));
+ return (X509v3_get_ext_by_NID(x->tbsRequest.requestExtensions, nid, lastpos));
}
int OCSP_REQUEST_get_ext_by_OBJ(OCSP_REQUEST *x, const ASN1_OBJECT *obj,
- int lastpos)
+ int lastpos)
{
- return (X509v3_get_ext_by_OBJ
- (x->tbsRequest.requestExtensions, obj, lastpos));
+ return (X509v3_get_ext_by_OBJ(x->tbsRequest.requestExtensions, obj, lastpos));
}
int OCSP_REQUEST_get_ext_by_critical(OCSP_REQUEST *x, int crit, int lastpos)
{
- return (X509v3_get_ext_by_critical
- (x->tbsRequest.requestExtensions, crit, lastpos));
+ return (X509v3_get_ext_by_critical(x->tbsRequest.requestExtensions, crit, lastpos));
}
X509_EXTENSION *OCSP_REQUEST_get_ext(OCSP_REQUEST *x, int loc)
@@ -60,16 +57,15 @@ void *OCSP_REQUEST_get1_ext_d2i(OCSP_REQUEST *x, int nid, int *crit, int *idx)
}
int OCSP_REQUEST_add1_ext_i2d(OCSP_REQUEST *x, int nid, void *value, int crit,
- unsigned long flags)
+ unsigned long flags)
{
return X509V3_add1_i2d(&x->tbsRequest.requestExtensions, nid, value,
- crit, flags);
+ crit, flags);
}
int OCSP_REQUEST_add_ext(OCSP_REQUEST *x, X509_EXTENSION *ex, int loc)
{
- return (X509v3_add_ext(&(x->tbsRequest.requestExtensions), ex, loc) !=
- NULL);
+ return (X509v3_add_ext(&(x->tbsRequest.requestExtensions), ex, loc) != NULL);
}
/* Single extensions */
@@ -85,15 +81,14 @@ int OCSP_ONEREQ_get_ext_by_NID(OCSP_ONEREQ *x, int nid, int lastpos)
}
int OCSP_ONEREQ_get_ext_by_OBJ(OCSP_ONEREQ *x, const ASN1_OBJECT *obj,
- int lastpos)
+ int lastpos)
{
return X509v3_get_ext_by_OBJ(x->singleRequestExtensions, obj, lastpos);
}
int OCSP_ONEREQ_get_ext_by_critical(OCSP_ONEREQ *x, int crit, int lastpos)
{
- return (X509v3_get_ext_by_critical
- (x->singleRequestExtensions, crit, lastpos));
+ return (X509v3_get_ext_by_critical(x->singleRequestExtensions, crit, lastpos));
}
X509_EXTENSION *OCSP_ONEREQ_get_ext(OCSP_ONEREQ *x, int loc)
@@ -112,10 +107,10 @@ void *OCSP_ONEREQ_get1_ext_d2i(OCSP_ONEREQ *x, int nid, int *crit, int *idx)
}
int OCSP_ONEREQ_add1_ext_i2d(OCSP_ONEREQ *x, int nid, void *value, int crit,
- unsigned long flags)
+ unsigned long flags)
{
return X509V3_add1_i2d(&x->singleRequestExtensions, nid, value, crit,
- flags);
+ flags);
}
int OCSP_ONEREQ_add_ext(OCSP_ONEREQ *x, X509_EXTENSION *ex, int loc)
@@ -132,22 +127,19 @@ int OCSP_BASICRESP_get_ext_count(OCSP_BASICRESP *x)
int OCSP_BASICRESP_get_ext_by_NID(OCSP_BASICRESP *x, int nid, int lastpos)
{
- return (X509v3_get_ext_by_NID
- (x->tbsResponseData.responseExtensions, nid, lastpos));
+ return (X509v3_get_ext_by_NID(x->tbsResponseData.responseExtensions, nid, lastpos));
}
int OCSP_BASICRESP_get_ext_by_OBJ(OCSP_BASICRESP *x, const ASN1_OBJECT *obj,
- int lastpos)
+ int lastpos)
{
- return (X509v3_get_ext_by_OBJ
- (x->tbsResponseData.responseExtensions, obj, lastpos));
+ return (X509v3_get_ext_by_OBJ(x->tbsResponseData.responseExtensions, obj, lastpos));
}
int OCSP_BASICRESP_get_ext_by_critical(OCSP_BASICRESP *x, int crit,
- int lastpos)
+ int lastpos)
{
- return (X509v3_get_ext_by_critical
- (x->tbsResponseData.responseExtensions, crit, lastpos));
+ return (X509v3_get_ext_by_critical(x->tbsResponseData.responseExtensions, crit, lastpos));
}
X509_EXTENSION *OCSP_BASICRESP_get_ext(OCSP_BASICRESP *x, int loc)
@@ -161,23 +153,23 @@ X509_EXTENSION *OCSP_BASICRESP_delete_ext(OCSP_BASICRESP *x, int loc)
}
void *OCSP_BASICRESP_get1_ext_d2i(OCSP_BASICRESP *x, int nid, int *crit,
- int *idx)
+ int *idx)
{
return X509V3_get_d2i(x->tbsResponseData.responseExtensions, nid, crit,
- idx);
+ idx);
}
int OCSP_BASICRESP_add1_ext_i2d(OCSP_BASICRESP *x, int nid, void *value,
- int crit, unsigned long flags)
+ int crit, unsigned long flags)
{
return X509V3_add1_i2d(&x->tbsResponseData.responseExtensions, nid,
- value, crit, flags);
+ value, crit, flags);
}
int OCSP_BASICRESP_add_ext(OCSP_BASICRESP *x, X509_EXTENSION *ex, int loc)
{
return (X509v3_add_ext(&(x->tbsResponseData.responseExtensions), ex, loc)
- != NULL);
+ != NULL);
}
/* OCSP single response extensions */
@@ -193,13 +185,13 @@ int OCSP_SINGLERESP_get_ext_by_NID(OCSP_SINGLERESP *x, int nid, int lastpos)
}
int OCSP_SINGLERESP_get_ext_by_OBJ(OCSP_SINGLERESP *x, const ASN1_OBJECT *obj,
- int lastpos)
+ int lastpos)
{
return X509v3_get_ext_by_OBJ(x->singleExtensions, obj, lastpos);
}
int OCSP_SINGLERESP_get_ext_by_critical(OCSP_SINGLERESP *x, int crit,
- int lastpos)
+ int lastpos)
{
return X509v3_get_ext_by_critical(x->singleExtensions, crit, lastpos);
}
@@ -215,13 +207,13 @@ X509_EXTENSION *OCSP_SINGLERESP_delete_ext(OCSP_SINGLERESP *x, int loc)
}
void *OCSP_SINGLERESP_get1_ext_d2i(OCSP_SINGLERESP *x, int nid, int *crit,
- int *idx)
+ int *idx)
{
return X509V3_get_d2i(x->singleExtensions, nid, crit, idx);
}
int OCSP_SINGLERESP_add1_ext_i2d(OCSP_SINGLERESP *x, int nid, void *value,
- int crit, unsigned long flags)
+ int crit, unsigned long flags)
{
return X509V3_add1_i2d(&x->singleExtensions, nid, value, crit, flags);
}
@@ -242,7 +234,7 @@ int OCSP_SINGLERESP_add_ext(OCSP_SINGLERESP *x, X509_EXTENSION *ex, int loc)
*/
static int ocsp_add1_nonce(STACK_OF(X509_EXTENSION) **exts,
- unsigned char *val, int len)
+ unsigned char *val, int len)
{
unsigned char *tmpval;
ASN1_OCTET_STRING os;
@@ -269,10 +261,11 @@ static int ocsp_add1_nonce(STACK_OF(X509_EXTENSION) **exts,
else if (RAND_bytes(tmpval, len) <= 0)
goto err;
if (X509V3_add1_i2d(exts, NID_id_pkix_OCSP_Nonce,
- &os, 0, X509V3_ADD_REPLACE) <= 0)
+ &os, 0, X509V3_ADD_REPLACE)
+ <= 0)
goto err;
ret = 1;
- err:
+err:
OPENSSL_free(os.data);
return ret;
}
@@ -289,7 +282,7 @@ int OCSP_request_add1_nonce(OCSP_REQUEST *req, unsigned char *val, int len)
int OCSP_basic_add1_nonce(OCSP_BASICRESP *resp, unsigned char *val, int len)
{
return ocsp_add1_nonce(&resp->tbsResponseData.responseExtensions, val,
- len);
+ len);
}
/*-
@@ -335,7 +328,7 @@ int OCSP_check_nonce(OCSP_REQUEST *req, OCSP_BASICRESP *bs)
req_ext = OCSP_REQUEST_get_ext(req, req_idx);
resp_ext = OCSP_BASICRESP_get_ext(bs, resp_idx);
if (ASN1_OCTET_STRING_cmp(X509_EXTENSION_get_data(req_ext),
- X509_EXTENSION_get_data(resp_ext)))
+ X509_EXTENSION_get_data(resp_ext)))
return 0;
return 1;
}
@@ -383,7 +376,7 @@ X509_EXTENSION *OCSP_crlID_new(const char *url, long *n, char *tim)
goto err;
}
x = X509V3_EXT_i2d(NID_id_pkix_OCSP_CrlID, 0, cid);
- err:
+err:
OCSP_CRLID_free(cid);
return x;
}
@@ -405,7 +398,7 @@ X509_EXTENSION *OCSP_accept_responses_new(char **oids)
oids++;
}
x = X509V3_EXT_i2d(NID_id_pkix_OCSP_acceptableResponses, 0, sk);
- err:
+err:
sk_ASN1_OBJECT_pop_free(sk, ASN1_OBJECT_free);
return x;
}
@@ -421,7 +414,7 @@ X509_EXTENSION *OCSP_archive_cutoff_new(char *tim)
if (!(ASN1_GENERALIZEDTIME_set_string(gt, tim)))
goto err;
x = X509V3_EXT_i2d(NID_id_pkix_OCSP_archiveCutoff, 0, gt);
- err:
+err:
ASN1_GENERALIZEDTIME_free(gt);
return x;
}
@@ -465,7 +458,7 @@ X509_EXTENSION *OCSP_url_svcloc_new(const X509_NAME *issuer, const char **urls)
urls++;
}
x = X509V3_EXT_i2d(NID_id_pkix_OCSP_serviceLocator, 0, sloc);
- err:
+err:
ASN1_IA5STRING_free(ia5);
ACCESS_DESCRIPTION_free(ad);
OCSP_SERVICELOC_free(sloc);
diff --git a/crypto/ocsp/ocsp_http.c b/crypto/ocsp/ocsp_http.c
index e8b6406d3c..776de02ae7 100644
--- a/crypto/ocsp/ocsp_http.c
+++ b/crypto/ocsp/ocsp_http.c
@@ -13,7 +13,7 @@
#ifndef OPENSSL_NO_OCSP
OSSL_HTTP_REQ_CTX *OCSP_sendreq_new(BIO *io, const char *path,
- const OCSP_REQUEST *req, int buf_size)
+ const OCSP_REQUEST *req, int buf_size)
{
OSSL_HTTP_REQ_CTX *rctx = OSSL_HTTP_REQ_CTX_new(io, io, buf_size);
@@ -29,21 +29,21 @@ OSSL_HTTP_REQ_CTX *OCSP_sendreq_new(BIO *io, const char *path,
* max_resp_len = 100 KiB
*/
if (!OSSL_HTTP_REQ_CTX_set_request_line(rctx, 1 /* POST */,
- NULL, NULL, path))
+ NULL, NULL, path))
goto err;
/* by default, no extra headers */
if (!OSSL_HTTP_REQ_CTX_set_expected(rctx,
- NULL /* content_type */, 1 /* asn1 */,
- 0 /* timeout */, 0 /* keep_alive */))
+ NULL /* content_type */, 1 /* asn1 */,
+ 0 /* timeout */, 0 /* keep_alive */))
goto err;
if (req != NULL
&& !OSSL_HTTP_REQ_CTX_set1_req(rctx, "application/ocsp-request",
- ASN1_ITEM_rptr(OCSP_REQUEST),
- (const ASN1_VALUE *)req))
+ ASN1_ITEM_rptr(OCSP_REQUEST),
+ (const ASN1_VALUE *)req))
goto err;
return rctx;
- err:
+err:
OSSL_HTTP_REQ_CTX_free(rctx);
return NULL;
}
@@ -60,7 +60,7 @@ OCSP_RESPONSE *OCSP_sendreq_bio(BIO *b, const char *path, OCSP_REQUEST *req)
mem = OSSL_HTTP_REQ_CTX_exchange(ctx);
/* ASN1_item_d2i_bio handles NULL bio gracefully */
resp = (OCSP_RESPONSE *)ASN1_item_d2i_bio(ASN1_ITEM_rptr(OCSP_RESPONSE),
- mem, NULL);
+ mem, NULL);
OSSL_HTTP_REQ_CTX_free(ctx);
return resp;
diff --git a/crypto/ocsp/ocsp_lib.c b/crypto/ocsp/ocsp_lib.c
index 285634dec3..b8f3bdccc0 100644
--- a/crypto/ocsp/ocsp_lib.c
+++ b/crypto/ocsp/ocsp_lib.c
@@ -20,7 +20,7 @@
/* Convert a certificate and its issuer to an OCSP_CERTID */
OCSP_CERTID *OCSP_cert_to_id(const EVP_MD *dgst, const X509 *subject,
- const X509 *issuer)
+ const X509 *issuer)
{
const X509_NAME *iname;
const ASN1_INTEGER *serial;
@@ -40,9 +40,9 @@ OCSP_CERTID *OCSP_cert_to_id(const EVP_MD *dgst, const X509 *subject,
}
OCSP_CERTID *OCSP_cert_id_new(const EVP_MD *dgst,
- const X509_NAME *issuerName,
- const ASN1_BIT_STRING *issuerKey,
- const ASN1_INTEGER *serialNumber)
+ const X509_NAME *issuerName,
+ const ASN1_BIT_STRING *issuerKey,
+ const ASN1_INTEGER *serialNumber)
{
int nid;
unsigned int i;
@@ -82,9 +82,9 @@ OCSP_CERTID *OCSP_cert_id_new(const EVP_MD *dgst,
goto err;
}
return cid;
- digerr:
+digerr:
ERR_raise(ERR_LIB_OCSP, OCSP_R_DIGEST_ERR);
- err:
+err:
OCSP_CERTID_free(cid);
return NULL;
}
diff --git a/crypto/ocsp/ocsp_local.h b/crypto/ocsp/ocsp_local.h
index e1633403c6..03c5aaef86 100644
--- a/crypto/ocsp/ocsp_local.h
+++ b/crypto/ocsp/ocsp_local.h
@@ -168,26 +168,26 @@ struct ocsp_response_data_st {
* signature BIT STRING,
* certs [0] EXPLICIT SEQUENCE OF Certificate OPTIONAL }
*/
- /*
- * Note 1: The value for "signature" is specified in the OCSP rfc2560 as
- * follows: "The value for the signature SHALL be computed on the hash of
- * the DER encoding ResponseData." This means that you must hash the
- * DER-encoded tbsResponseData, and then run it through a crypto-signing
- * function, which will (at least w/RSA) do a hash-'n'-private-encrypt
- * operation. This seems a bit odd, but that's the spec. Also note that
- * the data structures do not leave anywhere to independently specify the
- * algorithm used for the initial hash. So, we look at the
- * signature-specification algorithm, and try to do something intelligent.
- * -- Kathy Weinhold, CertCo
- */
- /*
- * Note 2: It seems that the mentioned passage from RFC 2560 (section
- * 4.2.1) is open for interpretation. I've done tests against another
- * responder, and found that it doesn't do the double hashing that the RFC
- * seems to say one should. Therefore, all relevant functions take a flag
- * saying which variant should be used. -- Richard Levitte, OpenSSL team
- * and CeloCom
- */
+/*
+ * Note 1: The value for "signature" is specified in the OCSP rfc2560 as
+ * follows: "The value for the signature SHALL be computed on the hash of
+ * the DER encoding ResponseData." This means that you must hash the
+ * DER-encoded tbsResponseData, and then run it through a crypto-signing
+ * function, which will (at least w/RSA) do a hash-'n'-private-encrypt
+ * operation. This seems a bit odd, but that's the spec. Also note that
+ * the data structures do not leave anywhere to independently specify the
+ * algorithm used for the initial hash. So, we look at the
+ * signature-specification algorithm, and try to do something intelligent.
+ * -- Kathy Weinhold, CertCo
+ */
+/*
+ * Note 2: It seems that the mentioned passage from RFC 2560 (section
+ * 4.2.1) is open for interpretation. I've done tests against another
+ * responder, and found that it doesn't do the double hashing that the RFC
+ * seems to say one should. Therefore, all relevant functions take a flag
+ * saying which variant should be used. -- Richard Levitte, OpenSSL team
+ * and CeloCom
+ */
struct ocsp_basic_response_st {
OCSP_RESPDATA tbsResponseData;
X509_ALGOR signatureAlgorithm;
@@ -217,30 +217,30 @@ struct ocsp_service_locator_st {
STACK_OF(ACCESS_DESCRIPTION) *locator;
};
-# define OCSP_REQUEST_sign(o, pkey, md, libctx, propq)\
- ASN1_item_sign_ex(ASN1_ITEM_rptr(OCSP_REQINFO),\
- &(o)->optionalSignature->signatureAlgorithm, NULL,\
- (o)->optionalSignature->signature, &(o)->tbsRequest,\
- NULL, pkey, md, libctx, propq)
-
-# define OCSP_BASICRESP_sign(o, pkey, md, d, libctx, propq)\
- ASN1_item_sign_ex(ASN1_ITEM_rptr(OCSP_RESPDATA),\
- &(o)->signatureAlgorithm, NULL,\
- (o)->signature, &(o)->tbsResponseData,\
- NULL, pkey, md, libctx, propq)
-
-# define OCSP_BASICRESP_sign_ctx(o, ctx, d)\
- ASN1_item_sign_ctx(ASN1_ITEM_rptr(OCSP_RESPDATA),\
- &(o)->signatureAlgorithm, NULL,\
- (o)->signature, &(o)->tbsResponseData, ctx)
-
-# define OCSP_REQUEST_verify(a, r, libctx, propq)\
- ASN1_item_verify_ex(ASN1_ITEM_rptr(OCSP_REQINFO),\
- &(a)->optionalSignature->signatureAlgorithm,\
- (a)->optionalSignature->signature, &(a)->tbsRequest,\
- NULL, r, libctx, propq)
-
-# define OCSP_BASICRESP_verify(a, r, libctx, propq)\
- ASN1_item_verify_ex(ASN1_ITEM_rptr(OCSP_RESPDATA),\
- &(a)->signatureAlgorithm, (a)->signature,\
- &(a)->tbsResponseData, NULL, r, libctx, propq)
+#define OCSP_REQUEST_sign(o, pkey, md, libctx, propq) \
+ ASN1_item_sign_ex(ASN1_ITEM_rptr(OCSP_REQINFO), \
+ &(o)->optionalSignature->signatureAlgorithm, NULL, \
+ (o)->optionalSignature->signature, &(o)->tbsRequest, \
+ NULL, pkey, md, libctx, propq)
+
+#define OCSP_BASICRESP_sign(o, pkey, md, d, libctx, propq) \
+ ASN1_item_sign_ex(ASN1_ITEM_rptr(OCSP_RESPDATA), \
+ &(o)->signatureAlgorithm, NULL, \
+ (o)->signature, &(o)->tbsResponseData, \
+ NULL, pkey, md, libctx, propq)
+
+#define OCSP_BASICRESP_sign_ctx(o, ctx, d) \
+ ASN1_item_sign_ctx(ASN1_ITEM_rptr(OCSP_RESPDATA), \
+ &(o)->signatureAlgorithm, NULL, \
+ (o)->signature, &(o)->tbsResponseData, ctx)
+
+#define OCSP_REQUEST_verify(a, r, libctx, propq) \
+ ASN1_item_verify_ex(ASN1_ITEM_rptr(OCSP_REQINFO), \
+ &(a)->optionalSignature->signatureAlgorithm, \
+ (a)->optionalSignature->signature, &(a)->tbsRequest, \
+ NULL, r, libctx, propq)
+
+#define OCSP_BASICRESP_verify(a, r, libctx, propq) \
+ ASN1_item_verify_ex(ASN1_ITEM_rptr(OCSP_RESPDATA), \
+ &(a)->signatureAlgorithm, (a)->signature, \
+ &(a)->tbsResponseData, NULL, r, libctx, propq)
diff --git a/crypto/ocsp/ocsp_prn.c b/crypto/ocsp/ocsp_prn.c
index 6fe65b6c0d..5a9e49480c 100644
--- a/crypto/ocsp/ocsp_prn.c
+++ b/crypto/ocsp/ocsp_prn.c
@@ -49,12 +49,12 @@ static const char *do_table2string(long s, const OCSP_TBLSTR *ts, size_t len)
const char *OCSP_response_status_str(long s)
{
static const OCSP_TBLSTR rstat_tbl[] = {
- {OCSP_RESPONSE_STATUS_SUCCESSFUL, "successful"},
- {OCSP_RESPONSE_STATUS_MALFORMEDREQUEST, "malformedrequest"},
- {OCSP_RESPONSE_STATUS_INTERNALERROR, "internalerror"},
- {OCSP_RESPONSE_STATUS_TRYLATER, "trylater"},
- {OCSP_RESPONSE_STATUS_SIGREQUIRED, "sigrequired"},
- {OCSP_RESPONSE_STATUS_UNAUTHORIZED, "unauthorized"}
+ { OCSP_RESPONSE_STATUS_SUCCESSFUL, "successful" },
+ { OCSP_RESPONSE_STATUS_MALFORMEDREQUEST, "malformedrequest" },
+ { OCSP_RESPONSE_STATUS_INTERNALERROR, "internalerror" },
+ { OCSP_RESPONSE_STATUS_TRYLATER, "trylater" },
+ { OCSP_RESPONSE_STATUS_SIGREQUIRED, "sigrequired" },
+ { OCSP_RESPONSE_STATUS_UNAUTHORIZED, "unauthorized" }
};
return table2string(s, rstat_tbl);
}
@@ -62,9 +62,9 @@ const char *OCSP_response_status_str(long s)
const char *OCSP_cert_status_str(long s)
{
static const OCSP_TBLSTR cstat_tbl[] = {
- {V_OCSP_CERTSTATUS_GOOD, "good"},
- {V_OCSP_CERTSTATUS_REVOKED, "revoked"},
- {V_OCSP_CERTSTATUS_UNKNOWN, "unknown"}
+ { V_OCSP_CERTSTATUS_GOOD, "good" },
+ { V_OCSP_CERTSTATUS_REVOKED, "revoked" },
+ { V_OCSP_CERTSTATUS_UNKNOWN, "unknown" }
};
return table2string(s, cstat_tbl);
}
@@ -72,16 +72,16 @@ const char *OCSP_cert_status_str(long s)
const char *OCSP_crl_reason_str(long s)
{
static const OCSP_TBLSTR reason_tbl[] = {
- {OCSP_REVOKED_STATUS_UNSPECIFIED, "unspecified"},
- {OCSP_REVOKED_STATUS_KEYCOMPROMISE, "keyCompromise"},
- {OCSP_REVOKED_STATUS_CACOMPROMISE, "cACompromise"},
- {OCSP_REVOKED_STATUS_AFFILIATIONCHANGED, "affiliationChanged"},
- {OCSP_REVOKED_STATUS_SUPERSEDED, "superseded"},
- {OCSP_REVOKED_STATUS_CESSATIONOFOPERATION, "cessationOfOperation"},
- {OCSP_REVOKED_STATUS_CERTIFICATEHOLD, "certificateHold"},
- {OCSP_REVOKED_STATUS_REMOVEFROMCRL, "removeFromCRL"},
- {OCSP_REVOKED_STATUS_PRIVILEGEWITHDRAWN, "privilegeWithdrawn"},
- {OCSP_REVOKED_STATUS_AACOMPROMISE, "aACompromise"}
+ { OCSP_REVOKED_STATUS_UNSPECIFIED, "unspecified" },
+ { OCSP_REVOKED_STATUS_KEYCOMPROMISE, "keyCompromise" },
+ { OCSP_REVOKED_STATUS_CACOMPROMISE, "cACompromise" },
+ { OCSP_REVOKED_STATUS_AFFILIATIONCHANGED, "affiliationChanged" },
+ { OCSP_REVOKED_STATUS_SUPERSEDED, "superseded" },
+ { OCSP_REVOKED_STATUS_CESSATIONOFOPERATION, "cessationOfOperation" },
+ { OCSP_REVOKED_STATUS_CERTIFICATEHOLD, "certificateHold" },
+ { OCSP_REVOKED_STATUS_REMOVEFROMCRL, "removeFromCRL" },
+ { OCSP_REVOKED_STATUS_PRIVILEGEWITHDRAWN, "privilegeWithdrawn" },
+ { OCSP_REVOKED_STATUS_AACOMPROMISE, "aACompromise" }
};
return table2string(s, reason_tbl);
}
@@ -112,12 +112,12 @@ int OCSP_REQUEST_print(BIO *bp, OCSP_REQUEST *o, unsigned long flags)
cid = one->reqCert;
ocsp_certid_print(bp, cid, 8);
if (!X509V3_extensions_print(bp,
- "Request Single Extensions",
- one->singleRequestExtensions, flags, 8))
+ "Request Single Extensions",
+ one->singleRequestExtensions, flags, 8))
goto err;
}
if (!X509V3_extensions_print(bp, "Request Extensions",
- inf->requestExtensions, flags, 4))
+ inf->requestExtensions, flags, 4))
goto err;
if (sig) {
X509_signature_print(bp, &sig->signatureAlgorithm, sig->signature);
@@ -127,7 +127,7 @@ int OCSP_REQUEST_print(BIO *bp, OCSP_REQUEST *o, unsigned long flags)
}
}
return 1;
- err:
+err:
return 0;
}
@@ -148,7 +148,8 @@ int OCSP_RESPONSE_print(BIO *bp, OCSP_RESPONSE *o, unsigned long flags)
goto err;
l = ASN1_ENUMERATED_get(o->responseStatus);
if (BIO_printf(bp, " OCSP Response Status: %s (0x%lx)\n",
- OCSP_response_status_str(l), l) <= 0)
+ OCSP_response_status_str(l), l)
+ <= 0)
goto err;
if (rb == NULL)
return 1;
@@ -195,7 +196,8 @@ int OCSP_RESPONSE_print(BIO *bp, OCSP_RESPONSE *o, unsigned long flags)
goto err;
cst = single->certStatus;
if (BIO_printf(bp, " Cert Status: %s",
- OCSP_cert_status_str(cst->type)) <= 0)
+ OCSP_cert_status_str(cst->type))
+ <= 0)
goto err;
if (cst->type == V_OCSP_CERTSTATUS_REVOKED) {
rev = cst->value.revoked;
@@ -206,8 +208,9 @@ int OCSP_RESPONSE_print(BIO *bp, OCSP_RESPONSE *o, unsigned long flags)
if (rev->revocationReason) {
l = ASN1_ENUMERATED_get(rev->revocationReason);
if (BIO_printf(bp,
- "\n Revocation Reason: %s (0x%lx)",
- OCSP_crl_reason_str(l), l) <= 0)
+ "\n Revocation Reason: %s (0x%lx)",
+ OCSP_crl_reason_str(l), l)
+ <= 0)
goto err;
}
}
@@ -224,14 +227,14 @@ int OCSP_RESPONSE_print(BIO *bp, OCSP_RESPONSE *o, unsigned long flags)
if (BIO_write(bp, "\n", 1) <= 0)
goto err;
if (!X509V3_extensions_print(bp,
- "Response Single Extensions",
- single->singleExtensions, flags, 8))
+ "Response Single Extensions",
+ single->singleExtensions, flags, 8))
goto err;
if (BIO_write(bp, "\n", 1) <= 0)
goto err;
}
if (!X509V3_extensions_print(bp, "Response Extensions",
- rd->responseExtensions, flags, 4))
+ rd->responseExtensions, flags, 4))
goto err;
if (X509_signature_print(bp, &br->signatureAlgorithm, br->signature) <= 0)
goto err;
@@ -242,7 +245,7 @@ int OCSP_RESPONSE_print(BIO *bp, OCSP_RESPONSE *o, unsigned long flags)
}
ret = 1;
- err:
+err:
OCSP_BASICRESP_free(br);
return ret;
}
diff --git a/crypto/ocsp/ocsp_srv.c b/crypto/ocsp/ocsp_srv.c
index dbb6e760b2..56276ad601 100644
--- a/crypto/ocsp/ocsp_srv.c
+++ b/crypto/ocsp/ocsp_srv.c
@@ -36,8 +36,8 @@ OCSP_CERTID *OCSP_onereq_get0_id(OCSP_ONEREQ *one)
}
int OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd,
- ASN1_OCTET_STRING **pikeyHash,
- ASN1_INTEGER **pserial, OCSP_CERTID *cid)
+ ASN1_OCTET_STRING **pikeyHash,
+ ASN1_INTEGER **pserial, OCSP_CERTID *cid)
{
if (!cid)
return 0;
@@ -73,21 +73,20 @@ OCSP_RESPONSE *OCSP_response_create(int status, OCSP_BASICRESP *bs)
if ((rsp->responseBytes = OCSP_RESPBYTES_new()) == NULL)
goto err;
rsp->responseBytes->responseType = OBJ_nid2obj(NID_id_pkix_OCSP_basic);
- if (!ASN1_item_pack
- (bs, ASN1_ITEM_rptr(OCSP_BASICRESP), &rsp->responseBytes->response))
- goto err;
+ if (!ASN1_item_pack(bs, ASN1_ITEM_rptr(OCSP_BASICRESP), &rsp->responseBytes->response))
+ goto err;
return rsp;
- err:
+err:
OCSP_RESPONSE_free(rsp);
return NULL;
}
OCSP_SINGLERESP *OCSP_basic_add1_status(OCSP_BASICRESP *rsp,
- OCSP_CERTID *cid,
- int status, int reason,
- ASN1_TIME *revtime,
- ASN1_TIME *thisupd,
- ASN1_TIME *nextupd)
+ OCSP_CERTID *cid,
+ int status, int reason,
+ ASN1_TIME *revtime,
+ ASN1_TIME *thisupd,
+ ASN1_TIME *nextupd)
{
OCSP_SINGLERESP *single = NULL;
OCSP_CERTSTATUS *cs;
@@ -95,7 +94,8 @@ OCSP_SINGLERESP *OCSP_basic_add1_status(OCSP_BASICRESP *rsp,
if (rsp->tbsResponseData.responses == NULL
&& (rsp->tbsResponseData.responses
- = sk_OCSP_SINGLERESP_new_null()) == NULL)
+ = sk_OCSP_SINGLERESP_new_null())
+ == NULL)
goto err;
if ((single = OCSP_SINGLERESP_new()) == NULL)
@@ -103,8 +103,7 @@ OCSP_SINGLERESP *OCSP_basic_add1_status(OCSP_BASICRESP *rsp,
if (!ASN1_TIME_to_generalizedtime(thisupd, &single->thisUpdate))
goto err;
- if (nextupd &&
- !ASN1_TIME_to_generalizedtime(nextupd, &single->nextUpdate))
+ if (nextupd && !ASN1_TIME_to_generalizedtime(nextupd, &single->nextUpdate))
goto err;
OCSP_CERTID_free(single->certId);
@@ -143,12 +142,11 @@ OCSP_SINGLERESP *OCSP_basic_add1_status(OCSP_BASICRESP *rsp,
default:
goto err;
-
}
if (!(sk_OCSP_SINGLERESP_push(rsp->tbsResponseData.responses, single)))
goto err;
return single;
- err:
+err:
OCSP_SINGLERESP_free(single);
return NULL;
}
@@ -165,8 +163,8 @@ int OCSP_basic_add1_cert(OCSP_BASICRESP *resp, X509 *cert)
* include one or more optional certificates in the response.
*/
int OCSP_basic_sign_ctx(OCSP_BASICRESP *brsp,
- X509 *signer, EVP_MD_CTX *ctx,
- STACK_OF(X509) *certs, unsigned long flags)
+ X509 *signer, EVP_MD_CTX *ctx,
+ STACK_OF(X509) *certs, unsigned long flags)
{
OCSP_RESPID *rid;
EVP_PKEY *pkey;
@@ -196,8 +194,7 @@ int OCSP_basic_sign_ctx(OCSP_BASICRESP *brsp,
goto err;
}
- if (!(flags & OCSP_NOTIME) &&
- !X509_gmtime_adj(brsp->tbsResponseData.producedAt, 0))
+ if (!(flags & OCSP_NOTIME) && !X509_gmtime_adj(brsp->tbsResponseData.producedAt, 0))
goto err;
/*
@@ -208,13 +205,13 @@ int OCSP_basic_sign_ctx(OCSP_BASICRESP *brsp,
goto err;
return 1;
- err:
+err:
return 0;
}
int OCSP_basic_sign(OCSP_BASICRESP *brsp,
- X509 *signer, EVP_PKEY *key, const EVP_MD *dgst,
- STACK_OF(X509) *certs, unsigned long flags)
+ X509 *signer, EVP_PKEY *key, const EVP_MD *dgst,
+ STACK_OF(X509) *certs, unsigned long flags)
{
EVP_MD_CTX *ctx = EVP_MD_CTX_new();
EVP_PKEY_CTX *pkctx = NULL;
@@ -224,7 +221,7 @@ int OCSP_basic_sign(OCSP_BASICRESP *brsp,
return 0;
if (!EVP_DigestSignInit_ex(ctx, &pkctx, EVP_MD_get0_name(dgst),
- signer->libctx, signer->propq, key, NULL)) {
+ signer->libctx, signer->propq, key, NULL)) {
EVP_MD_CTX_free(ctx);
return 0;
}
@@ -244,7 +241,7 @@ int OCSP_RESPID_set_by_name(OCSP_RESPID *respid, X509 *cert)
}
int OCSP_RESPID_set_by_key_ex(OCSP_RESPID *respid, X509 *cert,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_LIB_CTX *libctx, const char *propq)
{
ASN1_OCTET_STRING *byKey = NULL;
unsigned char md[SHA_DIGEST_LENGTH];
@@ -271,7 +268,7 @@ int OCSP_RESPID_set_by_key_ex(OCSP_RESPID *respid, X509 *cert,
respid->value.byKey = byKey;
ret = 1;
- err:
+err:
EVP_MD_free(sha1);
return ret;
}
@@ -284,7 +281,7 @@ int OCSP_RESPID_set_by_key(OCSP_RESPID *respid, X509 *cert)
}
int OCSP_RESPID_match_ex(OCSP_RESPID *respid, X509 *cert, OSSL_LIB_CTX *libctx,
- const char *propq)
+ const char *propq)
{
EVP_MD *sha1 = NULL;
int ret = 0;
@@ -304,17 +301,19 @@ int OCSP_RESPID_match_ex(OCSP_RESPID *respid, X509 *cert, OSSL_LIB_CTX *libctx,
goto err;
ret = (ASN1_STRING_length(respid->value.byKey) == SHA_DIGEST_LENGTH)
- && (memcmp(ASN1_STRING_get0_data(respid->value.byKey), md,
- SHA_DIGEST_LENGTH) == 0);
+ && (memcmp(ASN1_STRING_get0_data(respid->value.byKey), md,
+ SHA_DIGEST_LENGTH)
+ == 0);
} else if (respid->type == V_OCSP_RESPID_NAME) {
if (respid->value.byName == NULL)
return 0;
return X509_NAME_cmp(respid->value.byName,
- X509_get_subject_name(cert)) == 0;
+ X509_get_subject_name(cert))
+ == 0;
}
- err:
+err:
EVP_MD_free(sha1);
return ret;
}
diff --git a/crypto/ocsp/ocsp_vfy.c b/crypto/ocsp/ocsp_vfy.c
index b0c2d6fd12..3b6b1fe052 100644
--- a/crypto/ocsp/ocsp_vfy.c
+++ b/crypto/ocsp/ocsp_vfy.c
@@ -14,22 +14,22 @@
#include "ocsp_local.h"
static int ocsp_find_signer(X509 **psigner, OCSP_BASICRESP *bs,
- STACK_OF(X509) *certs, unsigned long flags);
+ STACK_OF(X509) *certs, unsigned long flags);
static X509 *ocsp_find_signer_sk(STACK_OF(X509) *certs, OCSP_RESPID *id);
static int ocsp_check_issuer(OCSP_BASICRESP *bs, STACK_OF(X509) *chain);
static int ocsp_check_ids(STACK_OF(OCSP_SINGLERESP) *sresp,
- OCSP_CERTID **ret);
+ OCSP_CERTID **ret);
static int ocsp_match_issuerid(X509 *cert, OCSP_CERTID *cid,
- STACK_OF(OCSP_SINGLERESP) *sresp);
+ STACK_OF(OCSP_SINGLERESP) *sresp);
static int ocsp_check_delegated(X509 *x);
static int ocsp_req_find_signer(X509 **psigner, OCSP_REQUEST *req,
- const X509_NAME *nm, STACK_OF(X509) *certs,
- unsigned long flags);
+ const X509_NAME *nm, STACK_OF(X509) *certs,
+ unsigned long flags);
/* Returns 1 on success, 0 on failure, or -1 on fatal error */
static int ocsp_verify_signer(X509 *signer, int response,
- X509_STORE *st, unsigned long flags,
- STACK_OF(X509) *untrusted, STACK_OF(X509) **chain)
+ X509_STORE *st, unsigned long flags,
+ STACK_OF(X509) *untrusted, STACK_OF(X509) **chain)
{
X509_STORE_CTX *ctx = X509_STORE_CTX_new();
X509_VERIFY_PARAM *vp;
@@ -48,7 +48,7 @@ static int ocsp_verify_signer(X509 *signer, int response,
if ((flags & OCSP_PARTIAL_CHAIN) != 0)
X509_VERIFY_PARAM_set_flags(vp, X509_V_FLAG_PARTIAL_CHAIN);
if (response
- && X509_get_ext_by_NID(signer, NID_id_pkix_OCSP_noCheck, -1) >= 0)
+ && X509_get_ext_by_NID(signer, NID_id_pkix_OCSP_noCheck, -1) >= 0)
/*
* Locally disable revocation status checking for OCSP responder cert.
* Done here for CRLs; should be done also for OCSP-based checks.
@@ -62,19 +62,19 @@ static int ocsp_verify_signer(X509 *signer, int response,
int err = X509_STORE_CTX_get_error(ctx);
ERR_raise_data(ERR_LIB_OCSP, OCSP_R_CERTIFICATE_VERIFY_ERROR,
- "Verify error: %s", X509_verify_cert_error_string(err));
+ "Verify error: %s", X509_verify_cert_error_string(err));
goto end;
}
if (chain != NULL)
*chain = X509_STORE_CTX_get1_chain(ctx);
- end:
+end:
X509_STORE_CTX_free(ctx);
return ret;
}
static int ocsp_verify(OCSP_REQUEST *req, OCSP_BASICRESP *bs,
- X509 *signer, unsigned long flags)
+ X509 *signer, unsigned long flags)
{
EVP_PKEY *skey;
int ret = 1;
@@ -96,7 +96,7 @@ static int ocsp_verify(OCSP_REQUEST *req, OCSP_BASICRESP *bs,
/* Verify a basic response message */
int OCSP_basic_verify(OCSP_BASICRESP *bs, STACK_OF(X509) *certs,
- X509_STORE *st, unsigned long flags)
+ X509_STORE *st, unsigned long flags)
{
X509 *signer, *x;
STACK_OF(X509) *chain = NULL;
@@ -153,20 +153,20 @@ int OCSP_basic_verify(OCSP_BASICRESP *bs, STACK_OF(X509) *certs,
ret = 1;
}
- end:
+end:
OSSL_STACK_OF_X509_free(chain);
sk_X509_free(untrusted);
return ret;
}
int OCSP_resp_get0_signer(OCSP_BASICRESP *bs, X509 **signer,
- STACK_OF(X509) *extra_certs)
+ STACK_OF(X509) *extra_certs)
{
return ocsp_find_signer(signer, bs, extra_certs, 0) > 0;
}
static int ocsp_find_signer(X509 **psigner, OCSP_BASICRESP *bs,
- STACK_OF(X509) *certs, unsigned long flags)
+ STACK_OF(X509) *certs, unsigned long flags)
{
X509 *signer;
OCSP_RESPID *rid = &bs->tbsResponseData.responderId;
@@ -175,8 +175,7 @@ static int ocsp_find_signer(X509 **psigner, OCSP_BASICRESP *bs,
*psigner = signer;
return 2;
}
- if ((flags & OCSP_NOINTERN) == 0 &&
- (signer = ocsp_find_signer_sk(bs->certs, rid))) {
+ if ((flags & OCSP_NOINTERN) == 0 && (signer = ocsp_find_signer_sk(bs->certs, rid))) {
*psigner = signer;
return 1;
}
@@ -284,7 +283,7 @@ static int ocsp_check_ids(STACK_OF(OCSP_SINGLERESP) *sresp, OCSP_CERTID **ret)
if (OCSP_id_issuer_cmp(cid, tmpid)) {
/* If algorithm mismatch let caller deal with it */
if (OBJ_cmp(tmpid->hashAlgorithm.algorithm,
- cid->hashAlgorithm.algorithm))
+ cid->hashAlgorithm.algorithm))
return 2;
/* Else mismatch */
return 0;
@@ -301,7 +300,7 @@ static int ocsp_check_ids(STACK_OF(OCSP_SINGLERESP) *sresp, OCSP_CERTID **ret)
* Returns -1 on fatal error, 0 if there is no match and 1 if there is a match.
*/
static int ocsp_match_issuerid(X509 *cert, OCSP_CERTID *cid,
- STACK_OF(OCSP_SINGLERESP) *sresp)
+ STACK_OF(OCSP_SINGLERESP) *sresp)
{
int ret = -1;
EVP_MD *dgst = NULL;
@@ -332,8 +331,7 @@ static int ocsp_match_issuerid(X509 *cert, OCSP_CERTID *cid,
ERR_raise(ERR_LIB_OCSP, OCSP_R_DIGEST_SIZE_ERR);
goto end;
}
- if (cid->issuerNameHash.length != mdlen ||
- cid->issuerKeyHash.length != mdlen) {
+ if (cid->issuerNameHash.length != mdlen || cid->issuerKeyHash.length != mdlen) {
ret = 0;
goto end;
}
@@ -383,7 +381,7 @@ static int ocsp_check_delegated(X509 *x)
* Returns 1 on success, 0 on failure and on fatal error.
*/
int OCSP_request_verify(OCSP_REQUEST *req, STACK_OF(X509) *certs,
- X509_STORE *store, unsigned long flags)
+ X509_STORE *store, unsigned long flags)
{
X509 *signer;
const X509_NAME *nm;
@@ -413,14 +411,14 @@ int OCSP_request_verify(OCSP_REQUEST *req, STACK_OF(X509) *certs,
if ((flags & OCSP_NOVERIFY) != 0)
return 1;
return ocsp_verify_signer(signer, 0, store, flags,
- (flags & OCSP_NOCHAIN) != 0 ?
- NULL : req->optionalSignature->certs, NULL) > 0;
+ (flags & OCSP_NOCHAIN) != 0 ? NULL : req->optionalSignature->certs, NULL)
+ > 0;
/* using '> 0' here to avoid breaking backward compatibility returning -1 */
}
static int ocsp_req_find_signer(X509 **psigner, OCSP_REQUEST *req,
- const X509_NAME *nm, STACK_OF(X509) *certs,
- unsigned long flags)
+ const X509_NAME *nm, STACK_OF(X509) *certs,
+ unsigned long flags)
{
X509 *signer;
diff --git a/crypto/ocsp/v3_ocsp.c b/crypto/ocsp/v3_ocsp.c
index 4c83df4d9f..d31c74ef45 100644
--- a/crypto/ocsp/v3_ocsp.c
+++ b/crypto/ocsp/v3_ocsp.c
@@ -21,23 +21,23 @@
*/
static int i2r_ocsp_crlid(const X509V3_EXT_METHOD *method, void *nonce,
- BIO *out, int indent);
+ BIO *out, int indent);
static int i2r_ocsp_acutoff(const X509V3_EXT_METHOD *method, void *nonce,
- BIO *out, int indent);
+ BIO *out, int indent);
static void *ocsp_nonce_new(void);
static int i2d_ocsp_nonce(const void *a, unsigned char **pp);
static void *d2i_ocsp_nonce(void *a, const unsigned char **pp, long length);
static void ocsp_nonce_free(void *a);
static int i2r_ocsp_nonce(const X509V3_EXT_METHOD *method, void *nonce,
- BIO *out, int indent);
+ BIO *out, int indent);
static int i2r_ocsp_nocheck(const X509V3_EXT_METHOD *method,
- void *nocheck, BIO *out, int indent);
+ void *nocheck, BIO *out, int indent);
static void *s2i_ocsp_nocheck(const X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx, const char *str);
+ X509V3_CTX *ctx, const char *str);
static int i2r_ocsp_serviceloc(const X509V3_EXT_METHOD *method, void *in,
- BIO *bp, int ind);
+ BIO *bp, int ind);
const X509V3_EXT_METHOD ossl_v3_ocsp_crlid = {
NID_id_pkix_OCSP_CrlID, 0, ASN1_ITEM_ref(OCSP_CRLID),
@@ -88,7 +88,7 @@ const X509V3_EXT_METHOD ossl_v3_ocsp_serviceloc = {
};
static int i2r_ocsp_crlid(const X509V3_EXT_METHOD *method, void *in, BIO *bp,
- int ind)
+ int ind)
{
OCSP_CRLID *a = in;
if (a->crlUrl) {
@@ -116,12 +116,12 @@ static int i2r_ocsp_crlid(const X509V3_EXT_METHOD *method, void *in, BIO *bp,
goto err;
}
return 1;
- err:
+err:
return 0;
}
static int i2r_ocsp_acutoff(const X509V3_EXT_METHOD *method, void *cutoff,
- BIO *bp, int ind)
+ BIO *bp, int ind)
{
if (BIO_printf(bp, "%*s", ind, "") <= 0)
return 0;
@@ -170,7 +170,7 @@ static void *d2i_ocsp_nonce(void *a, const unsigned char **pp, long length)
*pos = os;
return os;
- err:
+err:
if ((pos == NULL) || (*pos != os))
ASN1_OCTET_STRING_free(os);
ERR_raise(ERR_LIB_OCSP, ERR_R_ASN1_LIB);
@@ -183,7 +183,7 @@ static void ocsp_nonce_free(void *a)
}
static int i2r_ocsp_nonce(const X509V3_EXT_METHOD *method, void *nonce,
- BIO *out, int indent)
+ BIO *out, int indent)
{
if (BIO_printf(out, "%*s", indent, "") <= 0)
return 0;
@@ -195,19 +195,19 @@ static int i2r_ocsp_nonce(const X509V3_EXT_METHOD *method, void *nonce,
/* Nocheck is just a single NULL. Don't print anything and always set it */
static int i2r_ocsp_nocheck(const X509V3_EXT_METHOD *method, void *nocheck,
- BIO *out, int indent)
+ BIO *out, int indent)
{
return 1;
}
static void *s2i_ocsp_nocheck(const X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx, const char *str)
+ X509V3_CTX *ctx, const char *str)
{
return ASN1_NULL_new();
}
static int i2r_ocsp_serviceloc(const X509V3_EXT_METHOD *method, void *in,
- BIO *bp, int ind)
+ BIO *bp, int ind)
{
int i;
OCSP_SERVICELOC *a = in;
@@ -229,6 +229,6 @@ static int i2r_ocsp_serviceloc(const X509V3_EXT_METHOD *method, void *in,
goto err;
}
return 1;
- err:
+err:
return 0;
}
diff --git a/crypto/packet.c b/crypto/packet.c
index 8594b5ad04..b728ad5a07 100644
--- a/crypto/packet.c
+++ b/crypto/packet.c
@@ -10,11 +10,11 @@
#include "internal/cryptlib.h"
#include "internal/packet.h"
#if !defined OPENSSL_NO_QUIC && !defined FIPS_MODULE
-# include "internal/packet_quic.h"
+#include "internal/packet_quic.h"
#endif
#include <openssl/err.h>
-#define DEFAULT_BUF_SIZE 256
+#define DEFAULT_BUF_SIZE 256
int WPACKET_allocate_bytes(WPACKET *pkt, size_t len, unsigned char **allocbytes)
{
@@ -27,21 +27,21 @@ int WPACKET_allocate_bytes(WPACKET *pkt, size_t len, unsigned char **allocbytes)
}
int WPACKET_sub_allocate_bytes__(WPACKET *pkt, size_t len,
- unsigned char **allocbytes, size_t lenbytes)
+ unsigned char **allocbytes, size_t lenbytes)
{
if (!WPACKET_start_sub_packet_len__(pkt, lenbytes)
- || !WPACKET_allocate_bytes(pkt, len, allocbytes)
- || !WPACKET_close(pkt))
+ || !WPACKET_allocate_bytes(pkt, len, allocbytes)
+ || !WPACKET_close(pkt))
return 0;
return 1;
}
-#define GETBUF(p) (((p)->staticbuf != NULL) \
- ? (p)->staticbuf \
- : ((p)->buf != NULL \
- ? (unsigned char *)(p)->buf->data \
- : NULL))
+#define GETBUF(p) (((p)->staticbuf != NULL) \
+ ? (p)->staticbuf \
+ : ((p)->buf != NULL \
+ ? (unsigned char *)(p)->buf->data \
+ : NULL))
int WPACKET_reserve_bytes(WPACKET *pkt, size_t len, unsigned char **allocbytes)
{
@@ -78,7 +78,7 @@ int WPACKET_reserve_bytes(WPACKET *pkt, size_t len, unsigned char **allocbytes)
}
int WPACKET_sub_reserve_bytes__(WPACKET *pkt, size_t len,
- unsigned char **allocbytes, size_t lenbytes)
+ unsigned char **allocbytes, size_t lenbytes)
{
if (pkt->endfirst && lenbytes > 0)
return 0;
@@ -127,7 +127,7 @@ static int wpacket_intern_init_len(WPACKET *pkt, size_t lenbytes)
}
int WPACKET_init_static_len(WPACKET *pkt, unsigned char *buf, size_t len,
- size_t lenbytes)
+ size_t lenbytes)
{
size_t max = maxmaxsize(lenbytes);
@@ -252,11 +252,11 @@ static int wpacket_intern_close(WPACKET *pkt, WPACKET_SUB *sub, int doclose)
size_t packlen = pkt->written - sub->pwritten;
if (packlen == 0
- && (sub->flags & WPACKET_FLAGS_NON_ZERO_LENGTH) != 0)
+ && (sub->flags & WPACKET_FLAGS_NON_ZERO_LENGTH) != 0)
return 0;
if (packlen == 0
- && sub->flags & WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH) {
+ && sub->flags & WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH) {
/* We can't handle this case. Return an error */
if (!doclose)
return 0;
@@ -291,9 +291,10 @@ static int wpacket_intern_close(WPACKET *pkt, WPACKET_SUB *sub, int doclose)
#endif
}
} else if (pkt->endfirst && sub->parent != NULL
- && (packlen != 0
- || (sub->flags
- & WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH) == 0)) {
+ && (packlen != 0
+ || (sub->flags
+ & WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH)
+ == 0)) {
size_t tmplen = packlen;
size_t numlenbytes = 1;
@@ -408,8 +409,8 @@ int WPACKET_put_bytes__(WPACKET *pkt, uint64_t val, size_t size)
/* Internal API, so should not fail */
if (!ossl_assert(size <= sizeof(uint64_t))
- || !WPACKET_allocate_bytes(pkt, size, &data)
- || !put_value(data, val, size))
+ || !WPACKET_allocate_bytes(pkt, size, &data)
+ || !put_value(data, val, size))
return 0;
return 1;
@@ -473,11 +474,11 @@ int WPACKET_memcpy(WPACKET *pkt, const void *src, size_t len)
}
int WPACKET_sub_memcpy__(WPACKET *pkt, const void *src, size_t len,
- size_t lenbytes)
+ size_t lenbytes)
{
if (!WPACKET_start_sub_packet_len__(pkt, lenbytes)
- || !WPACKET_memcpy(pkt, src, len)
- || !WPACKET_close(pkt))
+ || !WPACKET_memcpy(pkt, src, len)
+ || !WPACKET_close(pkt))
return 0;
return 1;
@@ -562,8 +563,8 @@ int WPACKET_start_quic_sub_packet(WPACKET *pkt)
int WPACKET_quic_sub_allocate_bytes(WPACKET *pkt, size_t len, unsigned char **allocbytes)
{
if (!WPACKET_start_quic_sub_packet_bound(pkt, len)
- || !WPACKET_allocate_bytes(pkt, len, allocbytes)
- || !WPACKET_close(pkt))
+ || !WPACKET_allocate_bytes(pkt, len, allocbytes)
+ || !WPACKET_close(pkt))
return 0;
return 1;
diff --git a/crypto/param_build.c b/crypto/param_build.c
index d2f082ff9e..b1b7c3518b 100644
--- a/crypto/param_build.c
+++ b/crypto/param_build.c
@@ -49,8 +49,8 @@ struct ossl_param_bld_st {
};
static OSSL_PARAM_BLD_DEF *param_push(OSSL_PARAM_BLD *bld, const char *key,
- size_t size, size_t alloc, int type,
- int secure)
+ size_t size, size_t alloc, int type,
+ int secure)
{
OSSL_PARAM_BLD_DEF *pd = OPENSSL_zalloc(sizeof(*pd));
@@ -72,7 +72,7 @@ static OSSL_PARAM_BLD_DEF *param_push(OSSL_PARAM_BLD *bld, const char *key,
}
static int param_push_num(OSSL_PARAM_BLD *bld, const char *key,
- void *num, size_t size, int type)
+ void *num, size_t size, int type)
{
OSSL_PARAM_BLD_DEF *pd = param_push(bld, key, size, size, type, 0);
@@ -125,85 +125,85 @@ int OSSL_PARAM_BLD_push_int(OSSL_PARAM_BLD *bld, const char *key, int num)
}
int OSSL_PARAM_BLD_push_uint(OSSL_PARAM_BLD *bld, const char *key,
- unsigned int num)
+ unsigned int num)
{
return param_push_num(bld, key, &num, sizeof(num),
- OSSL_PARAM_UNSIGNED_INTEGER);
+ OSSL_PARAM_UNSIGNED_INTEGER);
}
int OSSL_PARAM_BLD_push_long(OSSL_PARAM_BLD *bld, const char *key,
- long int num)
+ long int num)
{
return param_push_num(bld, key, &num, sizeof(num), OSSL_PARAM_INTEGER);
}
int OSSL_PARAM_BLD_push_ulong(OSSL_PARAM_BLD *bld, const char *key,
- unsigned long int num)
+ unsigned long int num)
{
return param_push_num(bld, key, &num, sizeof(num),
- OSSL_PARAM_UNSIGNED_INTEGER);
+ OSSL_PARAM_UNSIGNED_INTEGER);
}
int OSSL_PARAM_BLD_push_int32(OSSL_PARAM_BLD *bld, const char *key,
- int32_t num)
+ int32_t num)
{
return param_push_num(bld, key, &num, sizeof(num), OSSL_PARAM_INTEGER);
}
int OSSL_PARAM_BLD_push_uint32(OSSL_PARAM_BLD *bld, const char *key,
- uint32_t num)
+ uint32_t num)
{
return param_push_num(bld, key, &num, sizeof(num),
- OSSL_PARAM_UNSIGNED_INTEGER);
+ OSSL_PARAM_UNSIGNED_INTEGER);
}
int OSSL_PARAM_BLD_push_int64(OSSL_PARAM_BLD *bld, const char *key,
- int64_t num)
+ int64_t num)
{
return param_push_num(bld, key, &num, sizeof(num), OSSL_PARAM_INTEGER);
}
int OSSL_PARAM_BLD_push_uint64(OSSL_PARAM_BLD *bld, const char *key,
- uint64_t num)
+ uint64_t num)
{
return param_push_num(bld, key, &num, sizeof(num),
- OSSL_PARAM_UNSIGNED_INTEGER);
+ OSSL_PARAM_UNSIGNED_INTEGER);
}
int OSSL_PARAM_BLD_push_size_t(OSSL_PARAM_BLD *bld, const char *key,
- size_t num)
+ size_t num)
{
return param_push_num(bld, key, &num, sizeof(num),
- OSSL_PARAM_UNSIGNED_INTEGER);
+ OSSL_PARAM_UNSIGNED_INTEGER);
}
int OSSL_PARAM_BLD_push_time_t(OSSL_PARAM_BLD *bld, const char *key,
- time_t num)
+ time_t num)
{
return param_push_num(bld, key, &num, sizeof(num),
- OSSL_PARAM_INTEGER);
+ OSSL_PARAM_INTEGER);
}
int OSSL_PARAM_BLD_push_double(OSSL_PARAM_BLD *bld, const char *key,
- double num)
+ double num)
{
return param_push_num(bld, key, &num, sizeof(num), OSSL_PARAM_REAL);
}
static int push_BN(OSSL_PARAM_BLD *bld, const char *key,
- const BIGNUM *bn, size_t sz, int type)
+ const BIGNUM *bn, size_t sz, int type)
{
int n, secure = 0;
OSSL_PARAM_BLD_DEF *pd;
if (!ossl_assert(type == OSSL_PARAM_UNSIGNED_INTEGER
- || type == OSSL_PARAM_INTEGER))
+ || type == OSSL_PARAM_INTEGER))
return 0;
if (bn != NULL) {
if (type == OSSL_PARAM_UNSIGNED_INTEGER && BN_is_negative(bn)) {
ERR_raise_data(ERR_LIB_CRYPTO, ERR_R_UNSUPPORTED,
- "Negative big numbers are unsupported for OSSL_PARAM_UNSIGNED_INTEGER");
+ "Negative big numbers are unsupported for OSSL_PARAM_UNSIGNED_INTEGER");
return 0;
}
@@ -231,26 +231,26 @@ static int push_BN(OSSL_PARAM_BLD *bld, const char *key,
}
int OSSL_PARAM_BLD_push_BN(OSSL_PARAM_BLD *bld, const char *key,
- const BIGNUM *bn)
+ const BIGNUM *bn)
{
if (bn != NULL && BN_is_negative(bn))
return push_BN(bld, key, bn, BN_num_bytes(bn) + 1,
- OSSL_PARAM_INTEGER);
+ OSSL_PARAM_INTEGER);
return push_BN(bld, key, bn, bn == NULL ? 0 : BN_num_bytes(bn),
- OSSL_PARAM_UNSIGNED_INTEGER);
+ OSSL_PARAM_UNSIGNED_INTEGER);
}
int OSSL_PARAM_BLD_push_BN_pad(OSSL_PARAM_BLD *bld, const char *key,
- const BIGNUM *bn, size_t sz)
+ const BIGNUM *bn, size_t sz)
{
if (bn != NULL && BN_is_negative(bn))
return push_BN(bld, key, bn, BN_num_bytes(bn),
- OSSL_PARAM_INTEGER);
+ OSSL_PARAM_INTEGER);
return push_BN(bld, key, bn, sz, OSSL_PARAM_UNSIGNED_INTEGER);
}
int OSSL_PARAM_BLD_push_utf8_string(OSSL_PARAM_BLD *bld, const char *key,
- const char *buf, size_t bsize)
+ const char *buf, size_t bsize)
{
OSSL_PARAM_BLD_DEF *pd;
int secure;
@@ -266,7 +266,7 @@ int OSSL_PARAM_BLD_push_utf8_string(OSSL_PARAM_BLD *bld, const char *key,
}
int OSSL_PARAM_BLD_push_utf8_ptr(OSSL_PARAM_BLD *bld, const char *key,
- char *buf, size_t bsize)
+ char *buf, size_t bsize)
{
OSSL_PARAM_BLD_DEF *pd;
@@ -280,7 +280,7 @@ int OSSL_PARAM_BLD_push_utf8_ptr(OSSL_PARAM_BLD *bld, const char *key,
}
int OSSL_PARAM_BLD_push_octet_string(OSSL_PARAM_BLD *bld, const char *key,
- const void *buf, size_t bsize)
+ const void *buf, size_t bsize)
{
OSSL_PARAM_BLD_DEF *pd;
int secure;
@@ -294,7 +294,7 @@ int OSSL_PARAM_BLD_push_octet_string(OSSL_PARAM_BLD *bld, const char *key,
}
int OSSL_PARAM_BLD_push_octet_ptr(OSSL_PARAM_BLD *bld, const char *key,
- void *buf, size_t bsize)
+ void *buf, size_t bsize)
{
OSSL_PARAM_BLD_DEF *pd;
@@ -306,8 +306,8 @@ int OSSL_PARAM_BLD_push_octet_ptr(OSSL_PARAM_BLD *bld, const char *key,
}
static OSSL_PARAM *param_bld_convert(OSSL_PARAM_BLD *bld, OSSL_PARAM *param,
- OSSL_PARAM_ALIGNED_BLOCK *blk,
- OSSL_PARAM_ALIGNED_BLOCK *secure)
+ OSSL_PARAM_ALIGNED_BLOCK *blk,
+ OSSL_PARAM_ALIGNED_BLOCK *secure)
{
int i, num = sk_OSSL_PARAM_BLD_DEF_num(bld->params);
OSSL_PARAM_BLD_DEF *pd;
@@ -335,11 +335,11 @@ static OSSL_PARAM *param_bld_convert(OSSL_PARAM_BLD *bld, OSSL_PARAM *param,
else
BN_signed_bn2native(pd->bn, (unsigned char *)p, (int)pd->size);
} else if (pd->type == OSSL_PARAM_OCTET_PTR
- || pd->type == OSSL_PARAM_UTF8_PTR) {
+ || pd->type == OSSL_PARAM_UTF8_PTR) {
/* PTR */
*(const void **)p = pd->string;
} else if (pd->type == OSSL_PARAM_OCTET_STRING
- || pd->type == OSSL_PARAM_UTF8_STRING) {
+ || pd->type == OSSL_PARAM_UTF8_STRING) {
if (pd->string != NULL)
memcpy(p, pd->string, pd->size);
else
diff --git a/crypto/param_build_set.c b/crypto/param_build_set.c
index f205d10193..db49683ed9 100644
--- a/crypto/param_build_set.c
+++ b/crypto/param_build_set.c
@@ -20,7 +20,7 @@
DEFINE_SPECIAL_STACK_OF_CONST(BIGNUM_const, BIGNUM)
int ossl_param_build_set_int(OSSL_PARAM_BLD *bld, OSSL_PARAM *p,
- const char *key, int num)
+ const char *key, int num)
{
if (bld != NULL)
return OSSL_PARAM_BLD_push_int(bld, key, num);
@@ -31,7 +31,7 @@ int ossl_param_build_set_int(OSSL_PARAM_BLD *bld, OSSL_PARAM *p,
}
int ossl_param_build_set_long(OSSL_PARAM_BLD *bld, OSSL_PARAM *p,
- const char *key, long num)
+ const char *key, long num)
{
if (bld != NULL)
return OSSL_PARAM_BLD_push_long(bld, key, num);
@@ -42,7 +42,7 @@ int ossl_param_build_set_long(OSSL_PARAM_BLD *bld, OSSL_PARAM *p,
}
int ossl_param_build_set_utf8_string(OSSL_PARAM_BLD *bld, OSSL_PARAM *p,
- const char *key, const char *buf)
+ const char *key, const char *buf)
{
if (bld != NULL)
return OSSL_PARAM_BLD_push_utf8_string(bld, key, buf, 0);
@@ -53,9 +53,9 @@ int ossl_param_build_set_utf8_string(OSSL_PARAM_BLD *bld, OSSL_PARAM *p,
}
int ossl_param_build_set_octet_string(OSSL_PARAM_BLD *bld, OSSL_PARAM *p,
- const char *key,
- const unsigned char *data,
- size_t data_len)
+ const char *key,
+ const unsigned char *data,
+ size_t data_len)
{
if (bld != NULL)
return OSSL_PARAM_BLD_push_octet_string(bld, key, data, data_len);
@@ -67,7 +67,7 @@ int ossl_param_build_set_octet_string(OSSL_PARAM_BLD *bld, OSSL_PARAM *p,
}
int ossl_param_build_set_bn_pad(OSSL_PARAM_BLD *bld, OSSL_PARAM *p,
- const char *key, const BIGNUM *bn, size_t sz)
+ const char *key, const BIGNUM *bn, size_t sz)
{
if (bld != NULL)
return OSSL_PARAM_BLD_push_BN_pad(bld, key, bn, sz);
@@ -84,7 +84,7 @@ int ossl_param_build_set_bn_pad(OSSL_PARAM_BLD *bld, OSSL_PARAM *p,
}
int ossl_param_build_set_bn(OSSL_PARAM_BLD *bld, OSSL_PARAM *p,
- const char *key, const BIGNUM *bn)
+ const char *key, const BIGNUM *bn)
{
if (bld != NULL)
return OSSL_PARAM_BLD_push_BN(bld, key, bn);
@@ -96,8 +96,8 @@ int ossl_param_build_set_bn(OSSL_PARAM_BLD *bld, OSSL_PARAM *p,
}
int ossl_param_build_set_multi_key_bn(OSSL_PARAM_BLD *bld, OSSL_PARAM *params,
- const char *names[],
- STACK_OF(BIGNUM_const) *stk)
+ const char *names[],
+ STACK_OF(BIGNUM_const) *stk)
{
int i, sz = sk_BIGNUM_const_num(stk);
OSSL_PARAM *p;
diff --git a/crypto/params.c b/crypto/params.c
index ae40488765..b6d278243d 100644
--- a/crypto/params.c
+++ b/crypto/params.c
@@ -21,22 +21,22 @@
/* Shortcuts for raising errors that are widely used */
#define err_unsigned_negative \
ERR_raise(ERR_LIB_CRYPTO, \
- CRYPTO_R_PARAM_UNSIGNED_INTEGER_NEGATIVE_VALUE_UNSUPPORTED)
+ CRYPTO_R_PARAM_UNSIGNED_INTEGER_NEGATIVE_VALUE_UNSUPPORTED)
#define err_out_of_range \
ERR_raise(ERR_LIB_CRYPTO, \
- CRYPTO_R_PARAM_VALUE_TOO_LARGE_FOR_DESTINATION)
+ CRYPTO_R_PARAM_VALUE_TOO_LARGE_FOR_DESTINATION)
#define err_inexact \
ERR_raise(ERR_LIB_CRYPTO, \
- CRYPTO_R_PARAM_CANNOT_BE_REPRESENTED_EXACTLY)
-#define err_not_integer \
+ CRYPTO_R_PARAM_CANNOT_BE_REPRESENTED_EXACTLY)
+#define err_not_integer \
ERR_raise(ERR_LIB_CRYPTO, CRYPTO_R_PARAM_NOT_INTEGER_TYPE)
-#define err_too_small \
+#define err_too_small \
ERR_raise(ERR_LIB_CRYPTO, CRYPTO_R_TOO_SMALL_BUFFER)
-#define err_bad_type \
+#define err_bad_type \
ERR_raise(ERR_LIB_CRYPTO, CRYPTO_R_PARAM_OF_INCOMPATIBLE_TYPE)
-#define err_null_argument \
+#define err_null_argument \
ERR_raise(ERR_LIB_CRYPTO, ERR_R_PASSED_NULL_PARAMETER)
-#define err_unsupported_real \
+#define err_unsupported_real \
ERR_raise(ERR_LIB_CRYPTO, CRYPTO_R_PARAM_UNSUPPORTED_FLOATING_POINT_FORMAT)
#ifndef OPENSSL_SYS_UEFI
@@ -66,7 +66,7 @@ const OSSL_PARAM *OSSL_PARAM_locate_const(const OSSL_PARAM *p, const char *key)
}
static OSSL_PARAM ossl_param_construct(const char *key, unsigned int data_type,
- void *data, size_t data_size)
+ void *data, size_t data_size)
{
OSSL_PARAM res;
@@ -116,8 +116,8 @@ static int check_sign_bytes(const unsigned char *p, size_t n, unsigned char s)
* Both integers are in native byte ordering.
*/
static int copy_integer(unsigned char *dest, size_t dest_len,
- const unsigned char *src, size_t src_len,
- unsigned char pad, int signed_int)
+ const unsigned char *src, size_t src_len,
+ unsigned char pad, int signed_int)
{
size_t n;
DECLARE_IS_ENDIAN;
@@ -130,11 +130,11 @@ static int copy_integer(unsigned char *dest, size_t dest_len,
} else {
n = src_len - dest_len;
if (!check_sign_bytes(src, n, pad)
- /*
- * Shortening a signed value must retain the correct sign.
- * Avoiding this kind of thing: -253 = 0xff03 -> 0x03 = 3
- */
- || (signed_int && ((pad ^ src[n]) & 0x80) != 0)) {
+ /*
+ * Shortening a signed value must retain the correct sign.
+ * Avoiding this kind of thing: -253 = 0xff03 -> 0x03 = 3
+ */
+ || (signed_int && ((pad ^ src[n]) & 0x80) != 0)) {
err_out_of_range;
return 0;
}
@@ -148,11 +148,11 @@ static int copy_integer(unsigned char *dest, size_t dest_len,
} else {
n = src_len - dest_len;
if (!check_sign_bytes(src + dest_len, n, pad)
- /*
- * Shortening a signed value must retain the correct sign.
- * Avoiding this kind of thing: 130 = 0x0082 -> 0x82 = -126
- */
- || (signed_int && ((pad ^ src[dest_len - 1]) & 0x80) != 0)) {
+ /*
+ * Shortening a signed value must retain the correct sign.
+ * Avoiding this kind of thing: 130 = 0x0082 -> 0x82 = -126
+ */
+ || (signed_int && ((pad ^ src[dest_len - 1]) & 0x80) != 0)) {
err_out_of_range;
return 0;
}
@@ -164,22 +164,22 @@ static int copy_integer(unsigned char *dest, size_t dest_len,
/* Copy a signed number to a signed number of possibly different length */
static int signed_from_signed(void *dest, size_t dest_len,
- const void *src, size_t src_len)
+ const void *src, size_t src_len)
{
return copy_integer(dest, dest_len, src, src_len,
- is_negative(src, src_len) ? 0xff : 0, 1);
+ is_negative(src, src_len) ? 0xff : 0, 1);
}
/* Copy an unsigned number to a signed number of possibly different length */
static int signed_from_unsigned(void *dest, size_t dest_len,
- const void *src, size_t src_len)
+ const void *src, size_t src_len)
{
return copy_integer(dest, dest_len, src, src_len, 0, 1);
}
/* Copy a signed number to an unsigned number of possibly different length */
static int unsigned_from_signed(void *dest, size_t dest_len,
- const void *src, size_t src_len)
+ const void *src, size_t src_len)
{
if (is_negative(src, src_len)) {
err_unsigned_negative;
@@ -190,7 +190,7 @@ static int unsigned_from_signed(void *dest, size_t dest_len,
/* Copy an unsigned number to an unsigned number of possibly different length */
static int unsigned_from_unsigned(void *dest, size_t dest_len,
- const void *src, size_t src_len)
+ const void *src, size_t src_len)
{
return copy_integer(dest, dest_len, src, src_len, 0, 0);
}
@@ -324,7 +324,7 @@ int OSSL_PARAM_set_uint(OSSL_PARAM *p, unsigned int val)
OSSL_PARAM OSSL_PARAM_construct_uint(const char *key, unsigned int *buf)
{
return ossl_param_construct(key, OSSL_PARAM_UNSIGNED_INTEGER, buf,
- sizeof(unsigned int));
+ sizeof(unsigned int));
}
int OSSL_PARAM_get_long(const OSSL_PARAM *p, long int *val)
@@ -387,7 +387,7 @@ int OSSL_PARAM_set_ulong(OSSL_PARAM *p, unsigned long int val)
OSSL_PARAM OSSL_PARAM_construct_ulong(const char *key, unsigned long int *buf)
{
return ossl_param_construct(key, OSSL_PARAM_UNSIGNED_INTEGER, buf,
- sizeof(unsigned long int));
+ sizeof(unsigned long int));
}
int OSSL_PARAM_get_int32(const OSSL_PARAM *p, int32_t *val)
@@ -541,7 +541,7 @@ int OSSL_PARAM_set_int32(OSSL_PARAM *p, int32_t val)
OSSL_PARAM OSSL_PARAM_construct_int32(const char *key, int32_t *buf)
{
return ossl_param_construct(key, OSSL_PARAM_INTEGER, buf,
- sizeof(int32_t));
+ sizeof(int32_t));
}
int OSSL_PARAM_get_uint32(const OSSL_PARAM *p, uint32_t *val)
@@ -699,7 +699,7 @@ int OSSL_PARAM_set_uint32(OSSL_PARAM *p, uint32_t val)
OSSL_PARAM OSSL_PARAM_construct_uint32(const char *key, uint32_t *buf)
{
return ossl_param_construct(key, OSSL_PARAM_UNSIGNED_INTEGER, buf,
- sizeof(uint32_t));
+ sizeof(uint32_t));
}
int OSSL_PARAM_get_int64(const OSSL_PARAM *p, int64_t *val)
@@ -753,13 +753,13 @@ int OSSL_PARAM_get_int64(const OSSL_PARAM *p, int64_t *val)
case sizeof(double):
d = *(const double *)p->data;
if (d >= INT64_MIN
- /*
- * By subtracting 65535 (2^16-1) we cancel the low order
- * 15 bits of INT64_MAX to avoid using imprecise floating
- * point values.
- */
- && d < (double)(INT64_MAX - 65535) + 65536.0
- && d == (int64_t)d) {
+ /*
+ * By subtracting 65535 (2^16-1) we cancel the low order
+ * 15 bits of INT64_MAX to avoid using imprecise floating
+ * point values.
+ */
+ && d < (double)(INT64_MAX - 65535) + 65536.0
+ && d == (int64_t)d) {
*val = (int64_t)d;
return 1;
}
@@ -914,13 +914,13 @@ int OSSL_PARAM_get_uint64(const OSSL_PARAM *p, uint64_t *val)
case sizeof(double):
d = *(const double *)p->data;
if (d >= 0
- /*
- * By subtracting 65535 (2^16-1) we cancel the low order
- * 15 bits of UINT64_MAX to avoid using imprecise floating
- * point values.
- */
- && d < (double)(UINT64_MAX - 65535) + 65536.0
- && d == (uint64_t)d) {
+ /*
+ * By subtracting 65535 (2^16-1) we cancel the low order
+ * 15 bits of UINT64_MAX to avoid using imprecise floating
+ * point values.
+ */
+ && d < (double)(UINT64_MAX - 65535) + 65536.0
+ && d == (uint64_t)d) {
*val = (uint64_t)d;
return 1;
}
@@ -1014,7 +1014,7 @@ int OSSL_PARAM_set_uint64(OSSL_PARAM *p, uint64_t val)
OSSL_PARAM OSSL_PARAM_construct_uint64(const char *key, uint64_t *buf)
{
return ossl_param_construct(key, OSSL_PARAM_UNSIGNED_INTEGER, buf,
- sizeof(uint64_t));
+ sizeof(uint64_t));
}
int OSSL_PARAM_get_size_t(const OSSL_PARAM *p, size_t *val)
@@ -1046,7 +1046,7 @@ int OSSL_PARAM_set_size_t(OSSL_PARAM *p, size_t val)
OSSL_PARAM OSSL_PARAM_construct_size_t(const char *key, size_t *buf)
{
return ossl_param_construct(key, OSSL_PARAM_UNSIGNED_INTEGER, buf,
- sizeof(size_t));
+ sizeof(size_t));
}
int OSSL_PARAM_get_time_t(const OSSL_PARAM *p, time_t *val)
@@ -1168,10 +1168,10 @@ int OSSL_PARAM_set_BN(OSSL_PARAM *p, const BIGNUM *val)
}
OSSL_PARAM OSSL_PARAM_construct_BN(const char *key, unsigned char *buf,
- size_t bsize)
+ size_t bsize)
{
return ossl_param_construct(key, OSSL_PARAM_UNSIGNED_INTEGER,
- buf, bsize);
+ buf, bsize);
}
#ifndef OPENSSL_SYS_UEFI
@@ -1229,7 +1229,7 @@ int OSSL_PARAM_get_double(const OSSL_PARAM *p, double *val)
int OSSL_PARAM_set_double(OSSL_PARAM *p, double val)
{
-# define D_POW_31 ((double) (((uint32_t) 1) << 31))
+#define D_POW_31 ((double)(((uint32_t)1) << 31))
const double d_pow_31 = D_POW_31;
const double d_pow_32 = 2.0 * D_POW_31;
const double d_pow_63 = 2.0 * D_POW_31 * D_POW_31;
@@ -1328,8 +1328,8 @@ OSSL_PARAM OSSL_PARAM_construct_double(const char *key, double *buf)
#endif
static int get_string_internal(const OSSL_PARAM *p, void **val,
- size_t *max_len, size_t *used_len,
- unsigned int type)
+ size_t *max_len, size_t *used_len,
+ unsigned int type)
{
size_t sz, alloc_sz;
@@ -1380,7 +1380,7 @@ static int get_string_internal(const OSSL_PARAM *p, void **val,
int OSSL_PARAM_get_utf8_string(const OSSL_PARAM *p, char **val, size_t max_len)
{
int ret = get_string_internal(p, (void **)val, &max_len, NULL,
- OSSL_PARAM_UTF8_STRING);
+ OSSL_PARAM_UTF8_STRING);
/*
* We try to ensure that the copied string is terminated with a
@@ -1401,7 +1401,7 @@ int OSSL_PARAM_get_utf8_string(const OSSL_PARAM *p, char **val, size_t max_len)
data_length = OPENSSL_strnlen(p->data, data_length);
if (data_length >= max_len) {
ERR_raise(ERR_LIB_CRYPTO, CRYPTO_R_NO_SPACE_FOR_TERMINATING_NULL);
- return 0; /* No space for a terminating NUL byte */
+ return 0; /* No space for a terminating NUL byte */
}
(*val)[data_length] = '\0';
@@ -1409,14 +1409,14 @@ int OSSL_PARAM_get_utf8_string(const OSSL_PARAM *p, char **val, size_t max_len)
}
int OSSL_PARAM_get_octet_string(const OSSL_PARAM *p, void **val, size_t max_len,
- size_t *used_len)
+ size_t *used_len)
{
return get_string_internal(p, val, &max_len, used_len,
- OSSL_PARAM_OCTET_STRING);
+ OSSL_PARAM_OCTET_STRING);
}
static int set_string_internal(OSSL_PARAM *p, const void *val, size_t len,
- unsigned int type)
+ unsigned int type)
{
if (p->data_type != type) {
err_bad_type;
@@ -1448,7 +1448,7 @@ int OSSL_PARAM_set_utf8_string(OSSL_PARAM *p, const char *val)
}
int OSSL_PARAM_set_octet_string(OSSL_PARAM *p, const void *val,
- size_t len)
+ size_t len)
{
if (p == NULL || val == NULL) {
err_null_argument;
@@ -1459,7 +1459,7 @@ int OSSL_PARAM_set_octet_string(OSSL_PARAM *p, const void *val,
}
OSSL_PARAM OSSL_PARAM_construct_utf8_string(const char *key, char *buf,
- size_t bsize)
+ size_t bsize)
{
if (buf != NULL && bsize == 0)
bsize = strlen(buf);
@@ -1467,13 +1467,13 @@ OSSL_PARAM OSSL_PARAM_construct_utf8_string(const char *key, char *buf,
}
OSSL_PARAM OSSL_PARAM_construct_octet_string(const char *key, void *buf,
- size_t bsize)
+ size_t bsize)
{
return ossl_param_construct(key, OSSL_PARAM_OCTET_STRING, buf, bsize);
}
static int get_ptr_internal_skip_checks(const OSSL_PARAM *p, const void **val,
- size_t *used_len)
+ size_t *used_len)
{
if (used_len != NULL)
*used_len = p->data_size;
@@ -1482,7 +1482,7 @@ static int get_ptr_internal_skip_checks(const OSSL_PARAM *p, const void **val,
}
static int get_ptr_internal(const OSSL_PARAM *p, const void **val,
- size_t *used_len, unsigned int type)
+ size_t *used_len, unsigned int type)
{
if (val == NULL || p == NULL) {
err_null_argument;
@@ -1501,13 +1501,13 @@ int OSSL_PARAM_get_utf8_ptr(const OSSL_PARAM *p, const char **val)
}
int OSSL_PARAM_get_octet_ptr(const OSSL_PARAM *p, const void **val,
- size_t *used_len)
+ size_t *used_len)
{
return get_ptr_internal(p, val, used_len, OSSL_PARAM_OCTET_PTR);
}
static int set_ptr_internal(OSSL_PARAM *p, const void *val,
- unsigned int type, size_t len)
+ unsigned int type, size_t len)
{
if (p->data_type != type) {
err_bad_type;
@@ -1527,11 +1527,11 @@ int OSSL_PARAM_set_utf8_ptr(OSSL_PARAM *p, const char *val)
}
p->return_size = 0;
return set_ptr_internal(p, val, OSSL_PARAM_UTF8_PTR,
- val == NULL ? 0 : strlen(val));
+ val == NULL ? 0 : strlen(val));
}
int OSSL_PARAM_set_octet_ptr(OSSL_PARAM *p, const void *val,
- size_t used_len)
+ size_t used_len)
{
if (p == NULL) {
err_null_argument;
@@ -1542,13 +1542,13 @@ int OSSL_PARAM_set_octet_ptr(OSSL_PARAM *p, const void *val,
}
OSSL_PARAM OSSL_PARAM_construct_utf8_ptr(const char *key, char **buf,
- size_t bsize)
+ size_t bsize)
{
return ossl_param_construct(key, OSSL_PARAM_UTF8_PTR, buf, bsize);
}
OSSL_PARAM OSSL_PARAM_construct_octet_ptr(const char *key, void **buf,
- size_t bsize)
+ size_t bsize)
{
return ossl_param_construct(key, OSSL_PARAM_OCTET_PTR, buf, bsize);
}
@@ -1563,8 +1563,8 @@ OSSL_PARAM OSSL_PARAM_construct_octet_ptr(const char *key, void **buf,
* doesn't return success.
*/
int ossl_param_get1_octet_string_from_param(const OSSL_PARAM *p,
- unsigned char **out,
- size_t *out_len)
+ unsigned char **out,
+ size_t *out_len)
{
void *buf = NULL;
size_t len = 0;
@@ -1573,8 +1573,8 @@ int ossl_param_get1_octet_string_from_param(const OSSL_PARAM *p,
return -1;
if (p->data != NULL
- && p->data_size > 0
- && !OSSL_PARAM_get_octet_string(p, &buf, 0, &len))
+ && p->data_size > 0
+ && !OSSL_PARAM_get_octet_string(p, &buf, 0, &len))
return 0;
OPENSSL_clear_free(*out, *out_len);
@@ -1584,7 +1584,7 @@ int ossl_param_get1_octet_string_from_param(const OSSL_PARAM *p,
}
int ossl_param_get1_octet_string(const OSSL_PARAM *params, const char *name,
- unsigned char **out, size_t *out_len)
+ unsigned char **out, size_t *out_len)
{
const OSSL_PARAM *p = OSSL_PARAM_locate_const(params, name);
@@ -1592,7 +1592,7 @@ int ossl_param_get1_octet_string(const OSSL_PARAM *params, const char *name,
}
static int setbuf_fromparams(size_t n, OSSL_PARAM *p[],
- unsigned char *out, size_t *outlen)
+ unsigned char *out, size_t *outlen)
{
int ret = 0;
WPACKET pkt;
@@ -1610,12 +1610,12 @@ static int setbuf_fromparams(size_t n, OSSL_PARAM *p[],
if (p[i]->data_type != OSSL_PARAM_OCTET_STRING)
goto err;
if (p[i]->data != NULL
- && p[i]->data_size != 0
- && !WPACKET_memcpy(&pkt, p[i]->data, p[i]->data_size))
+ && p[i]->data_size != 0
+ && !WPACKET_memcpy(&pkt, p[i]->data, p[i]->data_size))
goto err;
}
if (!WPACKET_get_total_written(&pkt, outlen)
- || !WPACKET_finish(&pkt))
+ || !WPACKET_finish(&pkt))
goto err;
ret = 1;
err:
@@ -1624,7 +1624,7 @@ err:
}
int ossl_param_get1_concat_octet_string(size_t n, OSSL_PARAM *params[],
- unsigned char **out, size_t *out_len)
+ unsigned char **out, size_t *out_len)
{
unsigned char *res;
size_t sz = 0;
@@ -1654,7 +1654,7 @@ int ossl_param_get1_concat_octet_string(size_t n, OSSL_PARAM *params[],
return 0;
}
- fin:
+fin:
OPENSSL_clear_free(*out, *out_len);
*out = res;
*out_len = sz;
@@ -1669,8 +1669,8 @@ OSSL_PARAM OSSL_PARAM_construct_end(void)
}
static int get_string_ptr_internal(const OSSL_PARAM *p, const void **val,
- size_t *used_len, unsigned int ref_type,
- unsigned int type)
+ size_t *used_len, unsigned int ref_type,
+ unsigned int type)
{
if (val == NULL || p == NULL) {
err_null_argument;
@@ -1693,20 +1693,20 @@ static int get_string_ptr_internal(const OSSL_PARAM *p, const void **val,
int OSSL_PARAM_get_utf8_string_ptr(const OSSL_PARAM *p, const char **val)
{
return get_string_ptr_internal(p, (const void **)val, NULL,
- OSSL_PARAM_UTF8_PTR,
- OSSL_PARAM_UTF8_STRING);
+ OSSL_PARAM_UTF8_PTR,
+ OSSL_PARAM_UTF8_STRING);
}
int OSSL_PARAM_get_octet_string_ptr(const OSSL_PARAM *p, const void **val,
- size_t *used_len)
+ size_t *used_len)
{
return get_string_ptr_internal(p, (const void **)val, used_len,
- OSSL_PARAM_OCTET_PTR,
- OSSL_PARAM_OCTET_STRING);
+ OSSL_PARAM_OCTET_PTR,
+ OSSL_PARAM_OCTET_STRING);
}
int OSSL_PARAM_set_octet_string_or_ptr(OSSL_PARAM *p, const void *val,
- size_t len)
+ size_t len)
{
if (p == NULL) {
err_null_argument;
diff --git a/crypto/params_dup.c b/crypto/params_dup.c
index 15a26eed9b..fcb99939c8 100644
--- a/crypto/params_dup.c
+++ b/crypto/params_dup.c
@@ -13,18 +13,18 @@
#include "internal/mem_alloc_utils.h"
#include "internal/param_build_set.h"
-#define OSSL_PARAM_ALLOCATED_END 127
-#define OSSL_PARAM_MERGE_LIST_MAX 128
+#define OSSL_PARAM_ALLOCATED_END 127
+#define OSSL_PARAM_MERGE_LIST_MAX 128
#define OSSL_PARAM_BUF_PUBLIC 0
#define OSSL_PARAM_BUF_SECURE 1
-#define OSSL_PARAM_BUF_MAX (OSSL_PARAM_BUF_SECURE + 1)
+#define OSSL_PARAM_BUF_MAX (OSSL_PARAM_BUF_SECURE + 1)
typedef struct {
OSSL_PARAM_ALIGNED_BLOCK *alloc; /* The allocated buffer */
- OSSL_PARAM_ALIGNED_BLOCK *cur; /* Current position in the allocated buf */
- size_t blocks; /* Number of aligned blocks */
- size_t alloc_sz; /* The size of the allocated buffer (in bytes) */
+ OSSL_PARAM_ALIGNED_BLOCK *cur; /* Current position in the allocated buf */
+ size_t blocks; /* Number of aligned blocks */
+ size_t alloc_sz; /* The size of the allocated buffer (in bytes) */
} OSSL_PARAM_BUF;
size_t ossl_param_bytes_to_blocks(size_t bytes)
@@ -33,14 +33,14 @@ size_t ossl_param_bytes_to_blocks(size_t bytes)
}
static int ossl_param_buf_alloc(OSSL_PARAM_BUF *out, size_t extra_blocks,
- int is_secure)
+ int is_secure)
{
size_t num_blocks, sz = 0;
if (ossl_unlikely(!ossl_size_add(extra_blocks, out->blocks, &num_blocks,
- OPENSSL_FILE, OPENSSL_LINE)
- || !ossl_size_mul(num_blocks, OSSL_PARAM_ALIGN_SIZE, &sz,
- OPENSSL_FILE, OPENSSL_LINE)))
+ OPENSSL_FILE, OPENSSL_LINE)
+ || !ossl_size_mul(num_blocks, OSSL_PARAM_ALIGN_SIZE, &sz,
+ OPENSSL_FILE, OPENSSL_LINE)))
return 0;
out->alloc = is_secure ? OPENSSL_secure_zalloc(sz) : OPENSSL_zalloc(sz);
@@ -52,7 +52,7 @@ static int ossl_param_buf_alloc(OSSL_PARAM_BUF *out, size_t extra_blocks,
}
void ossl_param_set_secure_block(OSSL_PARAM *last, void *secure_buffer,
- size_t secure_buffer_sz)
+ size_t secure_buffer_sz)
{
last->key = NULL;
last->data_size = secure_buffer_sz;
@@ -61,8 +61,8 @@ void ossl_param_set_secure_block(OSSL_PARAM *last, void *secure_buffer,
}
static OSSL_PARAM *ossl_param_dup(const OSSL_PARAM *src, OSSL_PARAM *dst,
- OSSL_PARAM_BUF buf[OSSL_PARAM_BUF_MAX],
- int *param_count)
+ OSSL_PARAM_BUF buf[OSSL_PARAM_BUF_MAX],
+ int *param_count)
{
const OSSL_PARAM *in;
int has_dst = (dst != NULL);
@@ -138,7 +138,7 @@ OSSL_PARAM *OSSL_PARAM_dup(const OSSL_PARAM *src)
last = ossl_param_dup(src, dst, buf, NULL);
/* Store the allocated secure memory buffer in the last param block */
ossl_param_set_secure_block(last, buf[OSSL_PARAM_BUF_SECURE].alloc,
- buf[OSSL_PARAM_BUF_SECURE].alloc_sz);
+ buf[OSSL_PARAM_BUF_SECURE].alloc_sz);
last->return_size = buf[OSSL_PARAM_BUF_PUBLIC].alloc_sz;
return dst;
}
@@ -158,7 +158,7 @@ OSSL_PARAM *OSSL_PARAM_merge(const OSSL_PARAM *p1, const OSSL_PARAM *p2)
const OSSL_PARAM *p = NULL;
const OSSL_PARAM **p1cur, **p2cur;
OSSL_PARAM *params, *dst;
- size_t list1_sz = 0, list2_sz = 0;
+ size_t list1_sz = 0, list2_sz = 0;
int diff;
if (p1 == NULL && p2 == NULL) {
@@ -188,7 +188,7 @@ OSSL_PARAM *OSSL_PARAM_merge(const OSSL_PARAM *p1, const OSSL_PARAM *p2)
qsort(list1, list1_sz, sizeof(OSSL_PARAM *), compare_params);
qsort(list2, list2_sz, sizeof(OSSL_PARAM *), compare_params);
- /* Allocate enough space to store the merged parameters */
+ /* Allocate enough space to store the merged parameters */
params = OPENSSL_calloc(list1_sz + list2_sz + 1, sizeof(*p1));
if (params == NULL)
return NULL;
diff --git a/crypto/params_from_text.c b/crypto/params_from_text.c
index 9f63b42edd..60bae1707d 100644
--- a/crypto/params_from_text.c
+++ b/crypto/params_from_text.c
@@ -23,10 +23,10 @@
*/
static int prepare_from_text(const OSSL_PARAM *paramdefs, const char *key,
- const char *value, size_t value_n,
- /* Output parameters */
- const OSSL_PARAM **paramdef, int *ishex,
- size_t *buf_n, BIGNUM **tmpbn, int *found)
+ const char *value, size_t value_n,
+ /* Output parameters */
+ const OSSL_PARAM **paramdef, int *ishex,
+ size_t *buf_n, BIGNUM **tmpbn, int *found)
{
const OSSL_PARAM *p;
size_t buf_bits;
@@ -133,8 +133,8 @@ static int prepare_from_text(const OSSL_PARAM *paramdefs, const char *key,
}
static int construct_from_text(OSSL_PARAM *to, const OSSL_PARAM *paramdef,
- const char *value, size_t value_n, int ishex,
- void *buf, size_t buf_n, BIGNUM *tmpbn)
+ const char *value, size_t value_n, int ishex,
+ void *buf, size_t buf_n, BIGNUM *tmpbn)
{
if (buf == NULL)
return 0;
@@ -199,7 +199,7 @@ static int construct_from_text(OSSL_PARAM *to, const OSSL_PARAM *paramdef,
}
/**
- * OSSL_PARAM_print_to_bio - Print OSSL_PARAM array to a bio
+ * OSSL_PARAM_print_to_bio - Print OSSL_PARAM array to a bio
*
* @p: Array of OSSL_PARAM structures containing keys and values.
* @bio: Pointer to bio where the formatted output will be written.
@@ -292,7 +292,7 @@ int OSSL_PARAM_print_to_bio(const OSSL_PARAM *p, BIO *bio, int print_values)
#endif
default:
ok = BIO_printf(bio, "unknown type (%u) of %zu bytes\n",
- p->data_type, p->data_size);
+ p->data_type, p->data_size);
break;
}
if (ok == -1)
@@ -304,9 +304,9 @@ end:
}
int OSSL_PARAM_allocate_from_text(OSSL_PARAM *to,
- const OSSL_PARAM *paramdefs,
- const char *key, const char *value,
- size_t value_n, int *found)
+ const OSSL_PARAM *paramdefs,
+ const char *key, const char *value,
+ size_t value_n, int *found)
{
const OSSL_PARAM *paramdef = NULL;
int ishex = 0;
@@ -319,19 +319,19 @@ int OSSL_PARAM_allocate_from_text(OSSL_PARAM *to,
return 0;
if (!prepare_from_text(paramdefs, key, value, value_n,
- ¶mdef, &ishex, &buf_n, &tmpbn, found))
+ ¶mdef, &ishex, &buf_n, &tmpbn, found))
goto err;
if ((buf = OPENSSL_zalloc(buf_n > 0 ? buf_n : 1)) == NULL)
goto err;
ok = construct_from_text(to, paramdef, value, value_n, ishex,
- buf, buf_n, tmpbn);
+ buf, buf_n, tmpbn);
BN_free(tmpbn);
if (!ok)
OPENSSL_free(buf);
return ok;
- err:
+err:
BN_free(tmpbn);
return 0;
}
diff --git a/crypto/passphrase.c b/crypto/passphrase.c
index 1063fa6b19..a8bc8bc756 100644
--- a/crypto/passphrase.c
+++ b/crypto/passphrase.c
@@ -18,7 +18,7 @@ void ossl_pw_clear_passphrase_data(struct ossl_passphrase_data_st *data)
if (data != NULL) {
if (data->type == is_expl_passphrase)
OPENSSL_clear_free(data->_.expl_passphrase.passphrase_copy,
- data->_.expl_passphrase.passphrase_len);
+ data->_.expl_passphrase.passphrase_len);
ossl_pw_clear_passphrase_cache(data);
memset(data, 0, sizeof(*data));
}
@@ -31,8 +31,8 @@ void ossl_pw_clear_passphrase_cache(struct ossl_passphrase_data_st *data)
}
int ossl_pw_set_passphrase(struct ossl_passphrase_data_st *data,
- const unsigned char *passphrase,
- size_t passphrase_len)
+ const unsigned char *passphrase,
+ size_t passphrase_len)
{
if (!ossl_assert(data != NULL && passphrase != NULL)) {
ERR_raise(ERR_LIB_CRYPTO, ERR_R_PASSED_NULL_PARAMETER);
@@ -40,9 +40,8 @@ int ossl_pw_set_passphrase(struct ossl_passphrase_data_st *data,
}
ossl_pw_clear_passphrase_data(data);
data->type = is_expl_passphrase;
- data->_.expl_passphrase.passphrase_copy =
- passphrase_len != 0 ? OPENSSL_memdup(passphrase, passphrase_len)
- : OPENSSL_malloc(1);
+ data->_.expl_passphrase.passphrase_copy = passphrase_len != 0 ? OPENSSL_memdup(passphrase, passphrase_len)
+ : OPENSSL_malloc(1);
if (data->_.expl_passphrase.passphrase_copy == NULL)
return 0;
data->_.expl_passphrase.passphrase_len = passphrase_len;
@@ -50,7 +49,7 @@ int ossl_pw_set_passphrase(struct ossl_passphrase_data_st *data,
}
int ossl_pw_set_pem_password_cb(struct ossl_passphrase_data_st *data,
- pem_password_cb *cb, void *cbarg)
+ pem_password_cb *cb, void *cbarg)
{
if (!ossl_assert(data != NULL && cb != NULL)) {
ERR_raise(ERR_LIB_CRYPTO, ERR_R_PASSED_NULL_PARAMETER);
@@ -64,7 +63,7 @@ int ossl_pw_set_pem_password_cb(struct ossl_passphrase_data_st *data,
}
int ossl_pw_set_ossl_passphrase_cb(struct ossl_passphrase_data_st *data,
- OSSL_PASSPHRASE_CALLBACK *cb, void *cbarg)
+ OSSL_PASSPHRASE_CALLBACK *cb, void *cbarg)
{
if (!ossl_assert(data != NULL && cb != NULL)) {
ERR_raise(ERR_LIB_CRYPTO, ERR_R_PASSED_NULL_PARAMETER);
@@ -78,7 +77,7 @@ int ossl_pw_set_ossl_passphrase_cb(struct ossl_passphrase_data_st *data,
}
int ossl_pw_set_ui_method(struct ossl_passphrase_data_st *data,
- const UI_METHOD *ui_method, void *ui_data)
+ const UI_METHOD *ui_method, void *ui_data)
{
if (!ossl_assert(data != NULL && ui_method != NULL)) {
ERR_raise(ERR_LIB_CRYPTO, ERR_R_PASSED_NULL_PARAMETER);
@@ -103,7 +102,6 @@ int ossl_pw_disable_passphrase_caching(struct ossl_passphrase_data_st *data)
return 1;
}
-
/*-
* UI_METHOD processor. It differs from UI_UTIL_read_pw() like this:
*
@@ -114,8 +112,8 @@ int ossl_pw_disable_passphrase_caching(struct ossl_passphrase_data_st *data)
* 4. It reports back the length of the prompted pass phrase.
*/
static int do_ui_passphrase(char *pass, size_t pass_size, size_t *pass_len,
- const char *prompt_info, int verify,
- const UI_METHOD *ui_method, void *ui_data)
+ const char *prompt_info, int verify,
+ const UI_METHOD *ui_method, void *ui_data)
{
char *prompt = NULL, *ipass = NULL, *vpass = NULL;
int prompt_idx = -1, verify_idx = -1, res;
@@ -151,8 +149,9 @@ static int do_ui_passphrase(char *pass, size_t pass_size, size_t *pass_len,
goto end;
prompt_idx = UI_add_input_string(ui, prompt,
- UI_INPUT_FLAG_DEFAULT_PWD,
- ipass, 0, (int)pass_size) - 1;
+ UI_INPUT_FLAG_DEFAULT_PWD,
+ ipass, 0, (int)pass_size)
+ - 1;
if (prompt_idx < 0) {
ERR_raise(ERR_LIB_CRYPTO, ERR_R_UI_LIB);
goto end;
@@ -164,9 +163,10 @@ static int do_ui_passphrase(char *pass, size_t pass_size, size_t *pass_len,
if (vpass == NULL)
goto end;
verify_idx = UI_add_verify_string(ui, prompt,
- UI_INPUT_FLAG_DEFAULT_PWD,
- vpass, 0, (int)pass_size,
- ipass) - 1;
+ UI_INPUT_FLAG_DEFAULT_PWD,
+ vpass, 0, (int)pass_size,
+ ipass)
+ - 1;
if (verify_idx < 0) {
ERR_raise(ERR_LIB_CRYPTO, ERR_R_UI_LIB);
goto end;
@@ -192,7 +192,7 @@ static int do_ui_passphrase(char *pass, size_t pass_size, size_t *pass_len,
break;
}
- end:
+end:
OPENSSL_clear_free(vpass, pass_size + 1);
OPENSSL_clear_free(ipass, pass_size + 1);
OPENSSL_free(prompt);
@@ -202,8 +202,8 @@ static int do_ui_passphrase(char *pass, size_t pass_size, size_t *pass_len,
/* Central pw prompting dispatcher */
int ossl_pw_get_passphrase(char *pass, size_t pass_size, size_t *pass_len,
- const OSSL_PARAM params[], int verify,
- struct ossl_passphrase_data_st *data)
+ const OSSL_PARAM params[], int verify,
+ struct ossl_passphrase_data_st *data)
{
const char *source = NULL;
size_t source_len = 0;
@@ -245,10 +245,11 @@ int ossl_pw_get_passphrase(char *pass, size_t pass_size, size_t *pass_len,
/* Handle the is_pem_password and is_ui_method cases */
if ((p = OSSL_PARAM_locate_const(params,
- OSSL_PASSPHRASE_PARAM_INFO)) != NULL) {
+ OSSL_PASSPHRASE_PARAM_INFO))
+ != NULL) {
if (p->data_type != OSSL_PARAM_UTF8_STRING) {
ERR_raise_data(ERR_LIB_CRYPTO, ERR_R_PASSED_INVALID_ARGUMENT,
- "Prompt info data type incorrect");
+ "Prompt info data type incorrect");
return 0;
}
prompt_info = p->data;
@@ -258,8 +259,7 @@ int ossl_pw_get_passphrase(char *pass, size_t pass_size, size_t *pass_len,
/* We use a UI wrapper for PEM */
pem_password_cb *cb = data->_.pem_password.password_cb;
- ui_method = allocated_ui_method =
- UI_UTIL_wrap_read_pem_callback(cb, verify);
+ ui_method = allocated_ui_method = UI_UTIL_wrap_read_pem_callback(cb, verify);
ui_data = data->_.pem_password.password_cbarg;
if (ui_method == NULL) {
@@ -273,23 +273,22 @@ int ossl_pw_get_passphrase(char *pass, size_t pass_size, size_t *pass_len,
if (ui_method == NULL) {
ERR_raise_data(ERR_LIB_CRYPTO, ERR_R_PASSED_INVALID_ARGUMENT,
- "No password method specified");
+ "No password method specified");
return 0;
}
ret = do_ui_passphrase(pass, pass_size, pass_len, prompt_info, verify,
- ui_method, ui_data);
+ ui_method, ui_data);
UI_destroy_method(allocated_ui_method);
- do_cache:
+do_cache:
if (ret && data->flag_cache_passphrase) {
if (data->cached_passphrase == NULL
|| *pass_len > data->cached_passphrase_len) {
- void *new_cache =
- OPENSSL_clear_realloc(data->cached_passphrase,
- data->cached_passphrase_len,
- *pass_len + 1);
+ void *new_cache = OPENSSL_clear_realloc(data->cached_passphrase,
+ data->cached_passphrase_len,
+ *pass_len + 1);
if (new_cache == NULL) {
OPENSSL_cleanse(pass, *pass_len);
@@ -306,7 +305,7 @@ int ossl_pw_get_passphrase(char *pass, size_t pass_size, size_t *pass_len,
}
static int ossl_pw_get_password(char *buf, int size, int rwflag,
- void *userdata, const char *info)
+ void *userdata, const char *info)
{
size_t password_len = 0;
OSSL_PARAM params[] = {
@@ -316,7 +315,7 @@ static int ossl_pw_get_password(char *buf, int size, int rwflag,
params[0].data = (void *)info;
if (ossl_pw_get_passphrase(buf, (size_t)size, &password_len, params,
- rwflag, userdata))
+ rwflag, userdata))
return (int)password_len;
return -1;
}
@@ -332,15 +331,15 @@ int ossl_pw_pvk_password(char *buf, int size, int rwflag, void *userdata)
}
int ossl_pw_passphrase_callback_enc(char *pass, size_t pass_size,
- size_t *pass_len,
- const OSSL_PARAM params[], void *arg)
+ size_t *pass_len,
+ const OSSL_PARAM params[], void *arg)
{
return ossl_pw_get_passphrase(pass, pass_size, pass_len, params, 1, arg);
}
int ossl_pw_passphrase_callback_dec(char *pass, size_t pass_size,
- size_t *pass_len,
- const OSSL_PARAM params[], void *arg)
+ size_t *pass_len,
+ const OSSL_PARAM params[], void *arg)
{
return ossl_pw_get_passphrase(pass, pass_size, pass_len, params, 0, arg);
}
diff --git a/crypto/pem/pem_all.c b/crypto/pem/pem_all.c
index 222af64397..7cc4e9644e 100644
--- a/crypto/pem/pem_all.c
+++ b/crypto/pem/pem_all.c
@@ -42,7 +42,7 @@ IMPLEMENT_PEM_rw(X509_PUBKEY, X509_PUBKEY, PEM_STRING_PUBLIC, X509_PUBKEY)
IMPLEMENT_PEM_rw(PKCS7, PKCS7, PEM_STRING_PKCS7, PKCS7)
IMPLEMENT_PEM_rw(NETSCAPE_CERT_SEQUENCE, NETSCAPE_CERT_SEQUENCE,
- PEM_STRING_X509, NETSCAPE_CERT_SEQUENCE)
+ PEM_STRING_X509, NETSCAPE_CERT_SEQUENCE)
#ifndef OPENSSL_NO_DEPRECATED_3_0
/*
* We treat RSA or DSA private keys as a special case. For private keys we
@@ -67,14 +67,14 @@ static RSA *pkey_get_rsa(EVP_PKEY *key, RSA **rsa)
}
RSA *PEM_read_bio_RSAPrivateKey(BIO *bp, RSA **rsa, pem_password_cb *cb,
- void *u)
+ void *u)
{
EVP_PKEY *pktmp;
pktmp = PEM_read_bio_PrivateKey(bp, NULL, cb, u);
return pkey_get_rsa(pktmp, rsa);
}
-# ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_STDIO
RSA *PEM_read_RSAPrivateKey(FILE *fp, RSA **rsa, pem_password_cb *cb, void *u)
{
@@ -83,7 +83,7 @@ RSA *PEM_read_RSAPrivateKey(FILE *fp, RSA **rsa, pem_password_cb *cb, void *u)
return pkey_get_rsa(pktmp, rsa);
}
-# endif
+#endif
IMPLEMENT_PEM_write_cb(RSAPrivateKey, RSA, PEM_STRING_RSA, RSAPrivateKey)
IMPLEMENT_PEM_rw(RSAPublicKey, RSA, PEM_STRING_RSA_PUBLIC, RSAPublicKey)
@@ -107,7 +107,7 @@ static DSA *pkey_get_dsa(EVP_PKEY *key, DSA **dsa)
}
DSA *PEM_read_bio_DSAPrivateKey(BIO *bp, DSA **dsa, pem_password_cb *cb,
- void *u)
+ void *u)
{
EVP_PKEY *pktmp;
pktmp = PEM_read_bio_PrivateKey(bp, NULL, cb, u);
@@ -116,7 +116,7 @@ DSA *PEM_read_bio_DSAPrivateKey(BIO *bp, DSA **dsa, pem_password_cb *cb,
IMPLEMENT_PEM_write_cb(DSAPrivateKey, DSA, PEM_STRING_DSA, DSAPrivateKey)
IMPLEMENT_PEM_rw(DSA_PUBKEY, DSA, PEM_STRING_PUBLIC, DSA_PUBKEY)
-# ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_STDIO
DSA *PEM_read_DSAPrivateKey(FILE *fp, DSA **dsa, pem_password_cb *cb, void *u)
{
EVP_PKEY *pktmp;
@@ -124,13 +124,13 @@ DSA *PEM_read_DSAPrivateKey(FILE *fp, DSA **dsa, pem_password_cb *cb, void *u)
return pkey_get_dsa(pktmp, dsa); /* will free pktmp */
}
-# endif
+#endif
IMPLEMENT_PEM_rw(DSAparams, DSA, PEM_STRING_DSAPARAMS, DSAparams)
#endif
#ifndef OPENSSL_NO_DEPRECATED_3_0
-# ifndef OPENSSL_NO_EC
+#ifndef OPENSSL_NO_EC
static EC_KEY *pkey_get_eckey(EVP_PKEY *key, EC_KEY **eckey)
{
EC_KEY *dtmp;
@@ -148,7 +148,7 @@ static EC_KEY *pkey_get_eckey(EVP_PKEY *key, EC_KEY **eckey)
}
EC_KEY *PEM_read_bio_ECPrivateKey(BIO *bp, EC_KEY **key, pem_password_cb *cb,
- void *u)
+ void *u)
{
EVP_PKEY *pktmp;
pktmp = PEM_read_bio_PrivateKey(bp, NULL, cb, u);
@@ -156,22 +156,21 @@ EC_KEY *PEM_read_bio_ECPrivateKey(BIO *bp, EC_KEY **key, pem_password_cb *cb,
}
IMPLEMENT_PEM_rw(ECPKParameters, EC_GROUP, PEM_STRING_ECPARAMETERS,
- ECPKParameters)
-
+ ECPKParameters)
IMPLEMENT_PEM_write_cb(ECPrivateKey, EC_KEY, PEM_STRING_ECPRIVATEKEY,
- ECPrivateKey)
+ ECPrivateKey)
IMPLEMENT_PEM_rw(EC_PUBKEY, EC_KEY, PEM_STRING_PUBLIC, EC_PUBKEY)
-# ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_STDIO
EC_KEY *PEM_read_ECPrivateKey(FILE *fp, EC_KEY **eckey, pem_password_cb *cb,
- void *u)
+ void *u)
{
EVP_PKEY *pktmp;
pktmp = PEM_read_PrivateKey(fp, NULL, cb, u);
return pkey_get_eckey(pktmp, eckey); /* will free pktmp */
}
-# endif
-# endif /* !OPENSSL_NO_EC */
+#endif
+#endif /* !OPENSSL_NO_EC */
#endif /* !OPENSSL_NO_DEPRECATED_3_0 */
#ifndef OPENSSL_NO_DH
@@ -205,7 +204,7 @@ DH *PEM_read_bio_DHparams(BIO *bp, DH **x, pem_password_cb *cb, void *u)
return ret;
}
-# ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_STDIO
DH *PEM_read_DHparams(FILE *fp, DH **x, pem_password_cb *cb, void *u)
{
BIO *b;
@@ -220,7 +219,7 @@ DH *PEM_read_DHparams(FILE *fp, DH **x, pem_password_cb *cb, void *u)
BIO_free(b);
return ret;
}
-# endif
+#endif
#endif
IMPLEMENT_PEM_provided_write(PUBKEY, EVP_PKEY, pkey, PEM_STRING_PUBLIC, PUBKEY)
diff --git a/crypto/pem/pem_err.c b/crypto/pem/pem_err.c
index e5e5facfb4..d51e584c00 100644
--- a/crypto/pem/pem_err.c
+++ b/crypto/pem/pem_err.c
@@ -15,53 +15,53 @@
#ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA PEM_str_reasons[] = {
- {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_BAD_BASE64_DECODE), "bad base64 decode"},
- {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_BAD_DECRYPT), "bad decrypt"},
- {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_BAD_END_LINE), "bad end line"},
- {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_BAD_IV_CHARS), "bad iv chars"},
- {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_BAD_MAGIC_NUMBER), "bad magic number"},
- {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_BAD_PASSWORD_READ), "bad password read"},
- {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_BAD_VERSION_NUMBER), "bad version number"},
- {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_BIO_WRITE_FAILURE), "bio write failure"},
- {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_CIPHER_IS_NULL), "cipher is null"},
- {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_ERROR_CONVERTING_PRIVATE_KEY),
- "error converting private key"},
- {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_EXPECTING_DSS_KEY_BLOB),
- "expecting dss key blob"},
- {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_EXPECTING_PRIVATE_KEY_BLOB),
- "expecting private key blob"},
- {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_EXPECTING_PUBLIC_KEY_BLOB),
- "expecting public key blob"},
- {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_EXPECTING_RSA_KEY_BLOB),
- "expecting rsa key blob"},
- {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_HEADER_TOO_LONG), "header too long"},
- {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_INCONSISTENT_HEADER),
- "inconsistent header"},
- {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_KEYBLOB_HEADER_PARSE_ERROR),
- "keyblob header parse error"},
- {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_KEYBLOB_TOO_SHORT), "keyblob too short"},
- {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_MISSING_DEK_IV), "missing dek iv"},
- {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_NOT_DEK_INFO), "not dek info"},
- {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_NOT_ENCRYPTED), "not encrypted"},
- {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_NOT_PROC_TYPE), "not proc type"},
- {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_NO_START_LINE), "no start line"},
- {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_PROBLEMS_GETTING_PASSWORD),
- "problems getting password"},
- {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_PVK_DATA_TOO_SHORT), "pvk data too short"},
- {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_PVK_TOO_SHORT), "pvk too short"},
- {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_READ_KEY), "read key"},
- {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_SHORT_HEADER), "short header"},
- {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_UNEXPECTED_DEK_IV), "unexpected dek iv"},
- {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_UNSUPPORTED_CIPHER), "unsupported cipher"},
- {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_UNSUPPORTED_ENCRYPTION),
- "unsupported encryption"},
- {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_UNSUPPORTED_KEY_COMPONENTS),
- "unsupported key components"},
- {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_UNSUPPORTED_PUBLIC_KEY_TYPE),
- "unsupported public key type"},
- {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_UNSUPPORTED_PVK_KEY_TYPE),
- "unsupported pvk key type"},
- {0, NULL}
+ { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_BAD_BASE64_DECODE), "bad base64 decode" },
+ { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_BAD_DECRYPT), "bad decrypt" },
+ { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_BAD_END_LINE), "bad end line" },
+ { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_BAD_IV_CHARS), "bad iv chars" },
+ { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_BAD_MAGIC_NUMBER), "bad magic number" },
+ { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_BAD_PASSWORD_READ), "bad password read" },
+ { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_BAD_VERSION_NUMBER), "bad version number" },
+ { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_BIO_WRITE_FAILURE), "bio write failure" },
+ { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_CIPHER_IS_NULL), "cipher is null" },
+ { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_ERROR_CONVERTING_PRIVATE_KEY),
+ "error converting private key" },
+ { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_EXPECTING_DSS_KEY_BLOB),
+ "expecting dss key blob" },
+ { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_EXPECTING_PRIVATE_KEY_BLOB),
+ "expecting private key blob" },
+ { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_EXPECTING_PUBLIC_KEY_BLOB),
+ "expecting public key blob" },
+ { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_EXPECTING_RSA_KEY_BLOB),
+ "expecting rsa key blob" },
+ { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_HEADER_TOO_LONG), "header too long" },
+ { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_INCONSISTENT_HEADER),
+ "inconsistent header" },
+ { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_KEYBLOB_HEADER_PARSE_ERROR),
+ "keyblob header parse error" },
+ { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_KEYBLOB_TOO_SHORT), "keyblob too short" },
+ { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_MISSING_DEK_IV), "missing dek iv" },
+ { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_NOT_DEK_INFO), "not dek info" },
+ { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_NOT_ENCRYPTED), "not encrypted" },
+ { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_NOT_PROC_TYPE), "not proc type" },
+ { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_NO_START_LINE), "no start line" },
+ { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_PROBLEMS_GETTING_PASSWORD),
+ "problems getting password" },
+ { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_PVK_DATA_TOO_SHORT), "pvk data too short" },
+ { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_PVK_TOO_SHORT), "pvk too short" },
+ { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_READ_KEY), "read key" },
+ { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_SHORT_HEADER), "short header" },
+ { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_UNEXPECTED_DEK_IV), "unexpected dek iv" },
+ { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_UNSUPPORTED_CIPHER), "unsupported cipher" },
+ { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_UNSUPPORTED_ENCRYPTION),
+ "unsupported encryption" },
+ { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_UNSUPPORTED_KEY_COMPONENTS),
+ "unsupported key components" },
+ { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_UNSUPPORTED_PUBLIC_KEY_TYPE),
+ "unsupported public key type" },
+ { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_UNSUPPORTED_PVK_KEY_TYPE),
+ "unsupported pvk key type" },
+ { 0, NULL }
};
#endif
diff --git a/crypto/pem/pem_info.c b/crypto/pem/pem_info.c
index f8dc4416e2..8f38fe0580 100644
--- a/crypto/pem/pem_info.c
+++ b/crypto/pem/pem_info.c
@@ -27,7 +27,7 @@
#ifndef OPENSSL_NO_STDIO
STACK_OF(X509_INFO)
*PEM_X509_INFO_read_ex(FILE *fp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb,
- void *u, OSSL_LIB_CTX *libctx, const char *propq)
+ void *u, OSSL_LIB_CTX *libctx, const char *propq)
{
BIO *b;
STACK_OF(X509_INFO) *ret;
@@ -43,16 +43,16 @@ STACK_OF(X509_INFO)
}
STACK_OF(X509_INFO) *PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk,
- pem_password_cb *cb, void *u)
+ pem_password_cb *cb, void *u)
{
return PEM_X509_INFO_read_ex(fp, sk, cb, u, NULL, NULL);
}
#endif
STACK_OF(X509_INFO) *PEM_X509_INFO_read_bio_ex(BIO *bp, STACK_OF(X509_INFO) *sk,
- pem_password_cb *cb, void *u,
- OSSL_LIB_CTX *libctx,
- const char *propq)
+ pem_password_cb *cb, void *u,
+ OSSL_LIB_CTX *libctx,
+ const char *propq)
{
X509_INFO *xi = NULL;
char *name = NULL, *header = NULL, *str;
@@ -90,10 +90,10 @@ STACK_OF(X509_INFO) *PEM_X509_INFO_read_bio_ex(BIO *bp, STACK_OF(X509_INFO) *sk,
goto err;
}
ERR_clear_last_mark();
- start:
+ start:
if (strcmp(name, PEM_STRING_X509) == 0
- || strcmp(name, PEM_STRING_X509_OLD) == 0
- || strcmp(name, PEM_STRING_X509_TRUSTED) == 0) {
+ || strcmp(name, PEM_STRING_X509_OLD) == 0
+ || strcmp(name, PEM_STRING_X509_TRUSTED) == 0) {
if (xi->x509 != NULL) {
if (!sk_X509_INFO_push(ret, xi))
goto err;
@@ -102,15 +102,15 @@ STACK_OF(X509_INFO) *PEM_X509_INFO_read_bio_ex(BIO *bp, STACK_OF(X509_INFO) *sk,
goto start;
}
if ((strcmp(name, PEM_STRING_X509_TRUSTED) == 0))
- d2i = (D2I_OF(void)) d2i_X509_AUX;
+ d2i = (D2I_OF(void))d2i_X509_AUX;
else
- d2i = (D2I_OF(void)) d2i_X509;
+ d2i = (D2I_OF(void))d2i_X509;
xi->x509 = X509_new_ex(libctx, propq);
if (xi->x509 == NULL)
goto err;
pp = &(xi->x509);
} else if (strcmp(name, PEM_STRING_X509_CRL) == 0) {
- d2i = (D2I_OF(void)) d2i_X509_CRL;
+ d2i = (D2I_OF(void))d2i_X509_CRL;
if (xi->crl != NULL) {
if (!sk_X509_INFO_push(ret, xi))
goto err;
@@ -137,13 +137,13 @@ STACK_OF(X509_INFO) *PEM_X509_INFO_read_bio_ex(BIO *bp, STACK_OF(X509_INFO) *sk,
xi->enc_data = NULL;
xi->enc_len = 0;
- d2i = (D2I_OF(void)) d2i_AutoPrivateKey;
+ d2i = (D2I_OF(void))d2i_AutoPrivateKey;
xi->x_pkey = X509_PKEY_new();
if (xi->x_pkey == NULL)
goto err;
pp = &xi->x_pkey->dec_pkey;
if ((int)strlen(header) > 10 /* assume encrypted */
- || strcmp(name, PEM_STRING_PKCS8) == 0)
+ || strcmp(name, PEM_STRING_PKCS8) == 0)
raw = 1;
} else { /* unknown */
d2i = NULL;
@@ -161,7 +161,8 @@ STACK_OF(X509_INFO) *PEM_X509_INFO_read_bio_ex(BIO *bp, STACK_OF(X509_INFO) *sk,
p = data;
if (ptype) {
if (d2i_PrivateKey_ex(ptype, pp, &p, len,
- libctx, propq) == NULL) {
+ libctx, propq)
+ == NULL) {
ERR_raise(ERR_LIB_PEM, ERR_R_ASN1_LIB);
goto err;
}
@@ -169,7 +170,7 @@ STACK_OF(X509_INFO) *PEM_X509_INFO_read_bio_ex(BIO *bp, STACK_OF(X509_INFO) *sk,
ERR_raise(ERR_LIB_PEM, ERR_R_ASN1_LIB);
goto err;
}
- } else { /* encrypted key data */
+ } else { /* encrypted key data */
if (!PEM_get_EVP_CIPHER_INFO(header, &xi->enc_cipher))
goto err;
xi->enc_data = (char *)data;
@@ -189,14 +190,13 @@ STACK_OF(X509_INFO) *PEM_X509_INFO_read_bio_ex(BIO *bp, STACK_OF(X509_INFO) *sk,
* if the last one hasn't been pushed yet and there is anything in it
* then add it to the stack ...
*/
- if ((xi->x509 != NULL) || (xi->crl != NULL) ||
- (xi->x_pkey != NULL) || (xi->enc_data != NULL)) {
+ if ((xi->x509 != NULL) || (xi->crl != NULL) || (xi->x_pkey != NULL) || (xi->enc_data != NULL)) {
if (!sk_X509_INFO_push(ret, xi))
goto err;
xi = NULL;
}
ok = 1;
- err:
+err:
X509_INFO_free(xi);
if (!ok) {
for (i = 0; ((int)i) < sk_X509_INFO_num(ret); i++) {
@@ -215,15 +215,15 @@ STACK_OF(X509_INFO) *PEM_X509_INFO_read_bio_ex(BIO *bp, STACK_OF(X509_INFO) *sk,
}
STACK_OF(X509_INFO) *PEM_X509_INFO_read_bio(BIO *bp, STACK_OF(X509_INFO) *sk,
- pem_password_cb *cb, void *u)
+ pem_password_cb *cb, void *u)
{
return PEM_X509_INFO_read_bio_ex(bp, sk, cb, u, NULL, NULL);
}
/* A TJH addition */
int PEM_X509_INFO_write_bio(BIO *bp, const X509_INFO *xi, EVP_CIPHER *enc,
- const unsigned char *kstr, int klen,
- pem_password_cb *cb, void *u)
+ const unsigned char *kstr, int klen,
+ pem_password_cb *cb, void *u)
{
int i, ret = 0;
unsigned char *data = NULL;
@@ -234,12 +234,12 @@ int PEM_X509_INFO_write_bio(BIO *bp, const X509_INFO *xi, EVP_CIPHER *enc,
if (enc != NULL) {
objstr = EVP_CIPHER_get0_name(enc);
if (objstr == NULL
- /*
- * Check "Proc-Type: 4,Encrypted\nDEK-Info: objstr,hex-iv\n"
- * fits into buf
- */
+ /*
+ * Check "Proc-Type: 4,Encrypted\nDEK-Info: objstr,hex-iv\n"
+ * fits into buf
+ */
|| strlen(objstr) + 23 + 2 * EVP_CIPHER_get_iv_length(enc) + 13
- > sizeof(buf)) {
+ > sizeof(buf)) {
ERR_raise(ERR_LIB_PEM, PEM_R_UNSUPPORTED_CIPHER);
goto err;
}
@@ -277,7 +277,7 @@ int PEM_X509_INFO_write_bio(BIO *bp, const X509_INFO *xi, EVP_CIPHER *enc,
buf[0] = '\0';
PEM_proc_type(buf, PEM_TYPE_ENCRYPTED);
PEM_dek_info(buf, objstr, EVP_CIPHER_get_iv_length(enc),
- (const char *)iv);
+ (const char *)iv);
/* use the normal code to write things out */
i = PEM_write_bio(bp, PEM_STRING_RSA, buf, data, i);
@@ -287,8 +287,9 @@ int PEM_X509_INFO_write_bio(BIO *bp, const X509_INFO *xi, EVP_CIPHER *enc,
/* Add DSA/DH */
/* normal optionally encrypted stuff */
if (PEM_write_bio_RSAPrivateKey(bp,
- EVP_PKEY_get0_RSA(xi->x_pkey->dec_pkey),
- enc, kstr, klen, cb, u) <= 0)
+ EVP_PKEY_get0_RSA(xi->x_pkey->dec_pkey),
+ enc, kstr, klen, cb, u)
+ <= 0)
goto err;
}
}
@@ -305,7 +306,7 @@ int PEM_X509_INFO_write_bio(BIO *bp, const X509_INFO *xi, EVP_CIPHER *enc,
ret = 1;
- err:
+err:
OPENSSL_cleanse(buf, PEM_BUFSIZE);
return ret;
}
diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c
index b2c1ad50f0..2f7e51b16b 100644
--- a/crypto/pem/pem_lib.c
+++ b/crypto/pem/pem_lib.c
@@ -26,7 +26,7 @@
#include "crypto/asn1.h"
#include <openssl/des.h>
-#define MIN_LENGTH 4
+#define MIN_LENGTH 4
static int load_iv(char **fromp, unsigned char *to, int num);
static int check_pem(const char *nm, const char *name);
@@ -108,7 +108,7 @@ void PEM_dek_info(char *buf, const char *type, int len, const char *str)
#ifndef OPENSSL_NO_STDIO
void *PEM_ASN1_read(d2i_of_void *d2i, const char *name, FILE *fp, void **x,
- pem_password_cb *cb, void *u)
+ pem_password_cb *cb, void *u)
{
BIO *b;
void *ret;
@@ -215,10 +215,10 @@ static int check_pem(const char *nm, const char *name)
return 0;
}
-#define PEM_FREE(p, flags, num) \
+#define PEM_FREE(p, flags, num) \
pem_free((p), (flags), (num), OPENSSL_FILE, OPENSSL_LINE)
static void pem_free(void *p, unsigned int flags, size_t num,
- const char *file, int line)
+ const char *file, int line)
{
if (flags & PEM_FLAG_SECURE)
CRYPTO_secure_clear_free(p, num, file, line);
@@ -226,20 +226,19 @@ static void pem_free(void *p, unsigned int flags, size_t num,
CRYPTO_free(p, file, line);
}
-#define PEM_MALLOC(num, flags) \
+#define PEM_MALLOC(num, flags) \
pem_malloc((num), (flags), OPENSSL_FILE, OPENSSL_LINE)
static void *pem_malloc(int num, unsigned int flags,
- const char *file, int line)
+ const char *file, int line)
{
return (flags & PEM_FLAG_SECURE) ? CRYPTO_secure_malloc(num, file, line)
: CRYPTO_malloc(num, file, line);
-
}
static int pem_bytes_read_bio_flags(unsigned char **pdata, long *plen,
- char **pnm, const char *name, BIO *bp,
- pem_password_cb *cb, void *u,
- unsigned int flags)
+ char **pnm, const char *name, BIO *bp,
+ pem_password_cb *cb, void *u,
+ unsigned int flags)
{
EVP_CIPHER_INFO cipher;
char *nm = NULL, *header = NULL;
@@ -270,7 +269,7 @@ static int pem_bytes_read_bio_flags(unsigned char **pdata, long *plen,
ret = 1;
- err:
+err:
if (!ret || pnm == NULL)
PEM_FREE(nm, flags, 0);
PEM_FREE(header, flags, 0);
@@ -280,24 +279,26 @@ static int pem_bytes_read_bio_flags(unsigned char **pdata, long *plen,
}
int PEM_bytes_read_bio(unsigned char **pdata, long *plen, char **pnm,
- const char *name, BIO *bp, pem_password_cb *cb,
- void *u) {
+ const char *name, BIO *bp, pem_password_cb *cb,
+ void *u)
+{
return pem_bytes_read_bio_flags(pdata, plen, pnm, name, bp, cb, u,
- PEM_FLAG_EAY_COMPATIBLE);
+ PEM_FLAG_EAY_COMPATIBLE);
}
int PEM_bytes_read_bio_secmem(unsigned char **pdata, long *plen, char **pnm,
- const char *name, BIO *bp, pem_password_cb *cb,
- void *u) {
+ const char *name, BIO *bp, pem_password_cb *cb,
+ void *u)
+{
return pem_bytes_read_bio_flags(pdata, plen, pnm, name, bp, cb, u,
- PEM_FLAG_SECURE | PEM_FLAG_EAY_COMPATIBLE);
+ PEM_FLAG_SECURE | PEM_FLAG_EAY_COMPATIBLE);
}
#ifndef OPENSSL_NO_STDIO
int PEM_ASN1_write(i2d_of_void *i2d, const char *name, FILE *fp,
- const void *x, const EVP_CIPHER *enc,
- const unsigned char *kstr, int klen,
- pem_password_cb *callback, void *u)
+ const void *x, const EVP_CIPHER *enc,
+ const unsigned char *kstr, int klen,
+ pem_password_cb *callback, void *u)
{
BIO *b;
int ret;
@@ -330,13 +331,13 @@ PEM_ASN1_write_bio_internal(
if (enc != NULL) {
objstr = EVP_CIPHER_get0_name(enc);
if (objstr == NULL || EVP_CIPHER_get_iv_length(enc) == 0
- || EVP_CIPHER_get_iv_length(enc) > (int)sizeof(iv)
- /*
- * Check "Proc-Type: 4,Encrypted\nDEK-Info: objstr,hex-iv\n"
- * fits into buf
- */
- || strlen(objstr) + 23 + 2 * EVP_CIPHER_get_iv_length(enc) + 13
- > sizeof(buf)) {
+ || EVP_CIPHER_get_iv_length(enc) > (int)sizeof(iv)
+ /*
+ * Check "Proc-Type: 4,Encrypted\nDEK-Info: objstr,hex-iv\n"
+ * fits into buf
+ */
+ || strlen(objstr) + 23 + 2 * EVP_CIPHER_get_iv_length(enc) + 13
+ > sizeof(buf)) {
ERR_raise(ERR_LIB_PEM, PEM_R_UNSUPPORTED_CIPHER);
goto err;
}
@@ -365,7 +366,7 @@ PEM_ASN1_write_bio_internal(
if (callback == NULL)
klen = PEM_def_callback(buf, PEM_BUFSIZE, 1, u);
else
- klen = (*callback) (buf, PEM_BUFSIZE, 1, u);
+ klen = (*callback)(buf, PEM_BUFSIZE, 1, u);
if (klen <= 0) {
ERR_raise(ERR_LIB_PEM, PEM_R_READ_KEY);
goto err;
@@ -410,7 +411,7 @@ PEM_ASN1_write_bio_internal(
i = PEM_write_bio(bp, name, buf, data, i);
if (i <= 0)
ret = 0;
- err:
+err:
OPENSSL_cleanse(key, sizeof(key));
OPENSSL_cleanse(iv, sizeof(iv));
EVP_CIPHER_CTX_free(ctx);
@@ -419,31 +420,30 @@ PEM_ASN1_write_bio_internal(
return ret;
}
-int
-PEM_ASN1_write_bio(i2d_of_void *i2d, const char *name, BIO *bp, const void *x,
- const EVP_CIPHER *enc, const unsigned char *kstr, int klen,
- pem_password_cb *callback, void *u)
+int PEM_ASN1_write_bio(i2d_of_void *i2d, const char *name, BIO *bp, const void *x,
+ const EVP_CIPHER *enc, const unsigned char *kstr, int klen,
+ pem_password_cb *callback, void *u)
{
return PEM_ASN1_write_bio_internal(i2d, NULL, NULL, name, bp, x, enc,
- kstr, klen, callback, u);
+ kstr, klen, callback, u);
}
int PEM_ASN1_write_bio_ctx(OSSL_i2d_of_void_ctx *i2d, void *vctx,
- const char *name, BIO *bp, const void *x,
- const EVP_CIPHER *enc, const unsigned char *kstr,
- int klen, pem_password_cb *callback, void *u)
+ const char *name, BIO *bp, const void *x,
+ const EVP_CIPHER *enc, const unsigned char *kstr,
+ int klen, pem_password_cb *callback, void *u)
{
return PEM_ASN1_write_bio_internal(NULL, i2d, vctx, name, bp, x, enc,
- kstr, klen, callback, u);
+ kstr, klen, callback, u);
}
int PEM_do_header(EVP_CIPHER_INFO *cipher, unsigned char *data, long *plen,
- pem_password_cb *callback, void *u)
+ pem_password_cb *callback, void *u)
{
int ok;
int keylen;
long len = *plen;
- int ilen = (int) len; /* EVP_DecryptUpdate etc. take int lengths */
+ int ilen = (int)len; /* EVP_DecryptUpdate etc. take int lengths */
EVP_CIPHER_CTX *ctx;
unsigned char key[EVP_MAX_KEY_LENGTH];
char buf[PEM_BUFSIZE];
@@ -472,7 +472,7 @@ int PEM_do_header(EVP_CIPHER_INFO *cipher, unsigned char *data, long *plen,
#endif
if (!EVP_BytesToKey(cipher->cipher, EVP_md5(), &(cipher->iv[0]),
- (unsigned char *)buf, keylen, 1, key, NULL))
+ (unsigned char *)buf, keylen, 1, key, NULL))
return 0;
ctx = EVP_CIPHER_CTX_new();
@@ -535,8 +535,7 @@ int PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher)
header += strspn(header, " \t");
/* We expect "ENCRYPTED" followed by optional white-space + line break */
- if (!CHECK_AND_SKIP_PREFIX(header, ENCRYPTED) ||
- strspn(header, " \t\r\n") == 0) {
+ if (!CHECK_AND_SKIP_PREFIX(header, ENCRYPTED) || strspn(header, " \t\r\n") == 0) {
ERR_raise(ERR_LIB_PEM, PEM_R_NOT_ENCRYPTED);
return 0;
}
@@ -612,7 +611,7 @@ static int load_iv(char **fromp, unsigned char *to, int num)
#ifndef OPENSSL_NO_STDIO
int PEM_write(FILE *fp, const char *name, const char *header,
- const unsigned char *data, long len)
+ const unsigned char *data, long len)
{
BIO *b;
int ret;
@@ -629,7 +628,7 @@ int PEM_write(FILE *fp, const char *name, const char *header,
#endif
int PEM_write_bio(BIO *bp, const char *name, const char *header,
- const unsigned char *data, long len)
+ const unsigned char *data, long len)
{
int nlen, n, i, j, outl;
unsigned char *buf = NULL;
@@ -645,9 +644,7 @@ int PEM_write_bio(BIO *bp, const char *name, const char *header,
EVP_EncodeInit(ctx);
nlen = (int)strlen(name);
- if ((BIO_write(bp, "-----BEGIN ", 11) != 11) ||
- (BIO_write(bp, name, nlen) != nlen) ||
- (BIO_write(bp, "-----\n", 6) != 6)) {
+ if ((BIO_write(bp, "-----BEGIN ", 11) != 11) || (BIO_write(bp, name, nlen) != nlen) || (BIO_write(bp, "-----\n", 6) != 6)) {
reason = ERR_R_BIO_LIB;
goto err;
}
@@ -684,15 +681,13 @@ int PEM_write_bio(BIO *bp, const char *name, const char *header,
reason = ERR_R_BIO_LIB;
goto err;
}
- if ((BIO_write(bp, "-----END ", 9) != 9) ||
- (BIO_write(bp, name, nlen) != nlen) ||
- (BIO_write(bp, "-----\n", 6) != 6)) {
+ if ((BIO_write(bp, "-----END ", 9) != 9) || (BIO_write(bp, name, nlen) != nlen) || (BIO_write(bp, "-----\n", 6) != 6)) {
reason = ERR_R_BIO_LIB;
goto err;
}
retval = i + outl;
- err:
+err:
if (retval == 0 && reason != 0)
ERR_raise(ERR_LIB_PEM, reason);
EVP_ENCODE_CTX_free(ctx);
@@ -702,7 +697,7 @@ int PEM_write_bio(BIO *bp, const char *name, const char *header,
#ifndef OPENSSL_NO_STDIO
int PEM_read(FILE *fp, char **name, char **header, unsigned char **data,
- long *len)
+ long *len)
{
BIO *b;
int ret;
@@ -725,7 +720,7 @@ static int sanitize_line(char *linebuf, int len, unsigned int flags, int first_c
if (first_call) {
/* Other BOMs imply unsupported multibyte encoding,
* so don't strip them and let the error raise */
- const unsigned char utf8_bom[3] = {0xEF, 0xBB, 0xBF};
+ const unsigned char utf8_bom[3] = { 0xEF, 0xBB, 0xBF };
if (len > 3 && memcmp(linebuf, utf8_bom, 3) == 0) {
memmove(linebuf, linebuf + 3, len - 3);
@@ -801,8 +796,8 @@ static int get_name(BIO *bp, char **name, unsigned int flags)
/* Allow leading empty or non-matching lines. */
} while (!HAS_PREFIX(linebuf, BEGINSTR)
- || len < TAILLEN
- || !HAS_PREFIX(linebuf + len - TAILLEN, TAILSTR));
+ || len < TAILLEN
+ || !HAS_PREFIX(linebuf + len - TAILLEN, TAILSTR));
linebuf[len - TAILLEN] = '\0';
len = len - BEGINLEN - TAILLEN + 1;
*name = PEM_MALLOC(len, flags);
@@ -835,7 +830,7 @@ enum header_status {
* We need the name of the PEM-encoded type to verify the end string.
*/
static int get_header_and_data(BIO *bp, BIO **header, BIO **data, char *name,
- unsigned int flags)
+ unsigned int flags)
{
BIO *tmp = *header;
char *linebuf, *p;
@@ -851,7 +846,7 @@ static int get_header_and_data(BIO *bp, BIO **header, BIO **data, char *name,
if (linebuf == NULL)
return 0;
- while(1) {
+ while (1) {
flags_mask = ~0u;
len = BIO_gets(bp, linebuf, LINESIZE);
if (len <= 0) {
@@ -865,7 +860,7 @@ static int get_header_and_data(BIO *bp, BIO **header, BIO **data, char *name,
* appear due to reading a line up until the char before the newline.
*/
prev_partial_line_read = partial_line_read;
- partial_line_read = len == LINESIZE-1 && linebuf[LINESIZE-2] != '\n';
+ partial_line_read = len == LINESIZE - 1 && linebuf[LINESIZE - 2] != '\n';
if (got_header == MAYBE_HEADER) {
if (memchr(linebuf, ':', len) != NULL)
@@ -897,8 +892,7 @@ static int get_header_and_data(BIO *bp, BIO **header, BIO **data, char *name,
p = linebuf;
if (CHECK_AND_SKIP_PREFIX(p, ENDSTR)) {
namelen = strlen(name);
- if (strncmp(p, name, namelen) != 0 ||
- !HAS_PREFIX(p + namelen, TAILSTR)) {
+ if (strncmp(p, name, namelen) != 0 || !HAS_PREFIX(p + namelen, TAILSTR)) {
ERR_raise(ERR_LIB_PEM, PEM_R_BAD_END_LINE);
goto err;
}
@@ -943,7 +937,7 @@ err:
* for line endings). Other characters are malformed input and will be rejected.
*/
int PEM_read_bio_ex(BIO *bp, char **name_out, char **header,
- unsigned char **data, long *len_out, unsigned int flags)
+ unsigned char **data, long *len_out, unsigned int flags)
{
EVP_ENCODE_CTX *ctx = NULL;
const BIO_METHOD *bmeth;
@@ -992,10 +986,12 @@ int PEM_read_bio_ex(BIO *bp, char **name_out, char **header,
}
EVP_DecodeInit(ctx);
- if (EVP_DecodeUpdate(ctx, (unsigned char*)buf_mem->data, &len,
- (unsigned char*)buf_mem->data, len) < 0
- || EVP_DecodeFinal(ctx, (unsigned char*)&(buf_mem->data[len]),
- &taillen) < 0) {
+ if (EVP_DecodeUpdate(ctx, (unsigned char *)buf_mem->data, &len,
+ (unsigned char *)buf_mem->data, len)
+ < 0
+ || EVP_DecodeFinal(ctx, (unsigned char *)&(buf_mem->data[len]),
+ &taillen)
+ < 0) {
ERR_raise(ERR_LIB_PEM, PEM_R_BAD_BASE64_DECODE);
goto end;
}
@@ -1032,7 +1028,7 @@ end:
}
int PEM_read_bio(BIO *bp, char **name, char **header, unsigned char **data,
- long *len)
+ long *len)
{
return PEM_read_bio_ex(bp, name, header, data, len, PEM_FLAG_EAY_COMPATIBLE);
}
diff --git a/crypto/pem/pem_local.h b/crypto/pem/pem_local.h
index 220b935418..ef2874db4a 100644
--- a/crypto/pem/pem_local.h
+++ b/crypto/pem/pem_local.h
@@ -23,34 +23,33 @@
* decoding operation can return an object that contains what libcrypto
* expects.
*/
-# define PEM_SELECTION_PUBKEY EVP_PKEY_PUBLIC_KEY
-# define PEM_SELECTION_PrivateKey EVP_PKEY_KEYPAIR
-# define PEM_SELECTION_Parameters EVP_PKEY_KEY_PARAMETERS
+#define PEM_SELECTION_PUBKEY EVP_PKEY_PUBLIC_KEY
+#define PEM_SELECTION_PrivateKey EVP_PKEY_KEYPAIR
+#define PEM_SELECTION_Parameters EVP_PKEY_KEY_PARAMETERS
/*
* Properties, named according to the ASN.1 names used throughout libcrypto.
*/
-# define PEM_STRUCTURE_PUBKEY "SubjectPublicKeyInfo"
-# define PEM_STRUCTURE_PrivateKey "PrivateKeyInfo"
-# define PEM_STRUCTURE_Parameters "type-specific"
+#define PEM_STRUCTURE_PUBKEY "SubjectPublicKeyInfo"
+#define PEM_STRUCTURE_PrivateKey "PrivateKeyInfo"
+#define PEM_STRUCTURE_Parameters "type-specific"
-# define PEM_STRUCTURE_RSAPrivateKey "type-specific"
-# define PEM_STRUCTURE_RSAPublicKey "type-specific"
+#define PEM_STRUCTURE_RSAPrivateKey "type-specific"
+#define PEM_STRUCTURE_RSAPublicKey "type-specific"
/* Alternative IMPLEMENT macros for provided encoders */
-# define IMPLEMENT_PEM_provided_write_body_vars(type, asn1, pq) \
- int ret = 0; \
- OSSL_ENCODER_CTX *ctx = \
- OSSL_ENCODER_CTX_new_for_##type(x, PEM_SELECTION_##asn1, \
- "PEM", PEM_STRUCTURE_##asn1, \
- (pq)); \
- \
- if (OSSL_ENCODER_CTX_get_num_encoders(ctx) == 0) { \
- OSSL_ENCODER_CTX_free(ctx); \
- goto legacy; \
+#define IMPLEMENT_PEM_provided_write_body_vars(type, asn1, pq) \
+ int ret = 0; \
+ OSSL_ENCODER_CTX *ctx = OSSL_ENCODER_CTX_new_for_##type(x, PEM_SELECTION_##asn1, \
+ "PEM", PEM_STRUCTURE_##asn1, \
+ (pq)); \
+ \
+ if (OSSL_ENCODER_CTX_get_num_encoders(ctx) == 0) { \
+ OSSL_ENCODER_CTX_free(ctx); \
+ goto legacy; \
}
-# define IMPLEMENT_PEM_provided_write_body_pass() \
+#define IMPLEMENT_PEM_provided_write_body_pass() \
ret = 1; \
if (kstr == NULL && cb == NULL) { \
if (u != NULL) { \
@@ -63,14 +62,14 @@
if (enc != NULL) { \
ret = 0; \
if (OSSL_ENCODER_CTX_set_cipher(ctx, EVP_CIPHER_get0_name(enc), \
- NULL)) { \
+ NULL)) { \
ret = 1; \
if (kstr != NULL \
&& !OSSL_ENCODER_CTX_set_passphrase(ctx, kstr, klen)) \
ret = 0; \
else if (cb != NULL \
- && !OSSL_ENCODER_CTX_set_pem_password_cb(ctx, \
- cb, u)) \
+ && !OSSL_ENCODER_CTX_set_pem_password_cb(ctx, \
+ cb, u)) \
ret = 0; \
} \
} \
@@ -78,48 +77,47 @@
OSSL_ENCODER_CTX_free(ctx); \
return 0; \
}
-# define IMPLEMENT_PEM_provided_write_body_main(type, outtype) \
- ret = OSSL_ENCODER_to_##outtype(ctx, out); \
- OSSL_ENCODER_CTX_free(ctx); \
+#define IMPLEMENT_PEM_provided_write_body_main(type, outtype) \
+ ret = OSSL_ENCODER_to_##outtype(ctx, out); \
+ OSSL_ENCODER_CTX_free(ctx); \
return ret
-# define IMPLEMENT_PEM_provided_write_body_fallback(str, asn1, \
- writename) \
- legacy: \
- return PEM_ASN1_##writename((i2d_of_void *)i2d_##asn1, str, out, \
- x, NULL, NULL, 0, NULL, NULL)
-# define IMPLEMENT_PEM_provided_write_body_fallback_cb(str, asn1, \
- writename) \
- legacy: \
- return PEM_ASN1_##writename##((i2d_of_void *)i2d_##asn1, str, out, \
- x, enc, kstr, klen, cb, u)
-
-# define IMPLEMENT_PEM_provided_write_to(name, TYPE, type, str, asn1, \
- OUTTYPE, outtype, writename) \
- PEM_write_fnsig(name, TYPE, OUTTYPE, writename) \
- { \
- IMPLEMENT_PEM_provided_write_body_vars(type, asn1, NULL); \
- IMPLEMENT_PEM_provided_write_body_main(type, outtype); \
- IMPLEMENT_PEM_provided_write_body_fallback(str, asn1, \
- writename); \
- } \
- PEM_write_ex_fnsig(name, TYPE, OUTTYPE, writename) \
- { \
- IMPLEMENT_PEM_provided_write_body_vars(type, asn1, propq); \
- IMPLEMENT_PEM_provided_write_body_main(type, outtype); \
- IMPLEMENT_PEM_provided_write_body_fallback(str, asn1, \
- writename); \
+#define IMPLEMENT_PEM_provided_write_body_fallback(str, asn1, \
+ writename) \
+ legacy: \
+ return PEM_ASN1_##writename((i2d_of_void *)i2d_##asn1, str, out, \
+ x, NULL, NULL, 0, NULL, NULL)
+#define IMPLEMENT_PEM_provided_write_body_fallback_cb(str, asn1, \
+ writename) \
+ legacy: \
+ return PEM_ASN1_##writename##((i2d_of_void *)i2d_##asn1, str, out, \
+ x, enc, kstr, klen, cb, u)
+
+#define IMPLEMENT_PEM_provided_write_to(name, TYPE, type, str, asn1, \
+ OUTTYPE, outtype, writename) \
+ PEM_write_fnsig(name, TYPE, OUTTYPE, writename) \
+ { \
+ IMPLEMENT_PEM_provided_write_body_vars(type, asn1, NULL); \
+ IMPLEMENT_PEM_provided_write_body_main(type, outtype); \
+ IMPLEMENT_PEM_provided_write_body_fallback(str, asn1, \
+ writename); \
+ } \
+ PEM_write_ex_fnsig(name, TYPE, OUTTYPE, writename) \
+ { \
+ IMPLEMENT_PEM_provided_write_body_vars(type, asn1, propq); \
+ IMPLEMENT_PEM_provided_write_body_main(type, outtype); \
+ IMPLEMENT_PEM_provided_write_body_fallback(str, asn1, \
+ writename); \
}
-
-# define IMPLEMENT_PEM_provided_write_cb_to(name, TYPE, type, str, asn1, \
- OUTTYPE, outtype, writename) \
+#define IMPLEMENT_PEM_provided_write_cb_to(name, TYPE, type, str, asn1, \
+ OUTTYPE, outtype, writename) \
PEM_write_cb_fnsig(name, TYPE, OUTTYPE, writename) \
{ \
IMPLEMENT_PEM_provided_write_body_vars(type, asn1, NULL); \
IMPLEMENT_PEM_provided_write_body_pass(); \
IMPLEMENT_PEM_provided_write_body_main(type, outtype); \
IMPLEMENT_PEM_provided_write_body_fallback_cb(str, asn1, \
- writename); \
+ writename); \
} \
PEM_write_ex_cb_fnsig(name, TYPE, OUTTYPE, writename) \
{ \
@@ -127,41 +125,40 @@
IMPLEMENT_PEM_provided_write_body_pass(); \
IMPLEMENT_PEM_provided_write_body_main(type, outtype); \
IMPLEMENT_PEM_provided_write_body_fallback(str, asn1, \
- writename); \
+ writename); \
}
-# ifdef OPENSSL_NO_STDIO
+#ifdef OPENSSL_NO_STDIO
-# define IMPLEMENT_PEM_provided_write_fp(name, TYPE, type, str, asn1)
-# define IMPLEMENT_PEM_provided_write_cb_fp(name, TYPE, type, str, asn1)
+#define IMPLEMENT_PEM_provided_write_fp(name, TYPE, type, str, asn1)
+#define IMPLEMENT_PEM_provided_write_cb_fp(name, TYPE, type, str, asn1)
-# else
+#else
-# define IMPLEMENT_PEM_provided_write_fp(name, TYPE, type, str, asn1) \
+#define IMPLEMENT_PEM_provided_write_fp(name, TYPE, type, str, asn1) \
IMPLEMENT_PEM_provided_write_to(name, TYPE, type, str, asn1, FILE, fp, write)
-# define IMPLEMENT_PEM_provided_write_cb_fp(name, TYPE, type, str, asn1) \
+#define IMPLEMENT_PEM_provided_write_cb_fp(name, TYPE, type, str, asn1) \
IMPLEMENT_PEM_provided_write_cb_to(name, TYPE, type, str, asn1, FILE, fp, write)
-# endif
+#endif
-# define IMPLEMENT_PEM_provided_write_bio(name, TYPE, type, str, asn1) \
+#define IMPLEMENT_PEM_provided_write_bio(name, TYPE, type, str, asn1) \
IMPLEMENT_PEM_provided_write_to(name, TYPE, type, str, asn1, BIO, bio, write_bio)
-# define IMPLEMENT_PEM_provided_write_cb_bio(name, TYPE, type, str, asn1) \
+#define IMPLEMENT_PEM_provided_write_cb_bio(name, TYPE, type, str, asn1) \
IMPLEMENT_PEM_provided_write_cb_to(name, TYPE, type, str, asn1, BIO, bio, write_bio)
-# define IMPLEMENT_PEM_provided_write(name, TYPE, type, str, asn1) \
- IMPLEMENT_PEM_provided_write_bio(name, TYPE, type, str, asn1) \
+#define IMPLEMENT_PEM_provided_write(name, TYPE, type, str, asn1) \
+ IMPLEMENT_PEM_provided_write_bio(name, TYPE, type, str, asn1) \
IMPLEMENT_PEM_provided_write_fp(name, TYPE, type, str, asn1)
-# define IMPLEMENT_PEM_provided_write_cb(name, TYPE, type, str, asn1) \
- IMPLEMENT_PEM_provided_write_cb_bio(name, TYPE, type, str, asn1) \
+#define IMPLEMENT_PEM_provided_write_cb(name, TYPE, type, str, asn1) \
+ IMPLEMENT_PEM_provided_write_cb_bio(name, TYPE, type, str, asn1) \
IMPLEMENT_PEM_provided_write_cb_fp(name, TYPE, type, str, asn1)
-# define IMPLEMENT_PEM_provided_rw(name, TYPE, type, str, asn1) \
- IMPLEMENT_PEM_read(name, TYPE, str, asn1) \
+#define IMPLEMENT_PEM_provided_rw(name, TYPE, type, str, asn1) \
+ IMPLEMENT_PEM_read(name, TYPE, str, asn1) \
IMPLEMENT_PEM_provided_write(name, TYPE, type, str, asn1)
-# define IMPLEMENT_PEM_provided_rw_cb(name, TYPE, type, str, asn1) \
- IMPLEMENT_PEM_read(name, TYPE, str, asn1) \
+#define IMPLEMENT_PEM_provided_rw_cb(name, TYPE, type, str, asn1) \
+ IMPLEMENT_PEM_read(name, TYPE, str, asn1) \
IMPLEMENT_PEM_provided_write_cb(name, TYPE, type, str, asn1)
-
diff --git a/crypto/pem/pem_oth.c b/crypto/pem/pem_oth.c
index db62246174..85e600a5ea 100644
--- a/crypto/pem/pem_oth.c
+++ b/crypto/pem/pem_oth.c
@@ -18,7 +18,7 @@
/* Handle 'other' PEMs: not private keys */
void *PEM_ASN1_read_bio(d2i_of_void *d2i, const char *name, BIO *bp, void **x,
- pem_password_cb *cb, void *u)
+ pem_password_cb *cb, void *u)
{
const unsigned char *p = NULL;
unsigned char *data = NULL;
diff --git a/crypto/pem/pem_pk8.c b/crypto/pem/pem_pk8.c
index 9b9a88f92f..c548a6ba1e 100644
--- a/crypto/pem/pem_pk8.c
+++ b/crypto/pem/pem_pk8.c
@@ -19,17 +19,17 @@
#include <openssl/encoder.h>
static int do_pk8pkey(BIO *bp, const EVP_PKEY *x, int isder,
- int nid, const EVP_CIPHER *enc,
- const char *kstr, int klen,
- pem_password_cb *cb, void *u,
- const char *propq);
+ int nid, const EVP_CIPHER *enc,
+ const char *kstr, int klen,
+ pem_password_cb *cb, void *u,
+ const char *propq);
#ifndef OPENSSL_NO_STDIO
static int do_pk8pkey_fp(FILE *bp, const EVP_PKEY *x, int isder,
- int nid, const EVP_CIPHER *enc,
- const char *kstr, int klen,
- pem_password_cb *cb, void *u,
- const char *propq);
+ int nid, const EVP_CIPHER *enc,
+ const char *kstr, int klen,
+ pem_password_cb *cb, void *u,
+ const char *propq);
#endif
/*
* These functions write a private key in PKCS#8 format: it is a "drop in"
@@ -39,42 +39,41 @@ static int do_pk8pkey_fp(FILE *bp, const EVP_PKEY *x, int isder,
*/
int PEM_write_bio_PKCS8PrivateKey_nid(BIO *bp, const EVP_PKEY *x, int nid,
- const char *kstr, int klen,
- pem_password_cb *cb, void *u)
+ const char *kstr, int klen,
+ pem_password_cb *cb, void *u)
{
return do_pk8pkey(bp, x, 0, nid, NULL, kstr, klen, cb, u, NULL);
}
int PEM_write_bio_PKCS8PrivateKey(BIO *bp, const EVP_PKEY *x, const EVP_CIPHER *enc,
- const char *kstr, int klen,
- pem_password_cb *cb, void *u)
+ const char *kstr, int klen,
+ pem_password_cb *cb, void *u)
{
return do_pk8pkey(bp, x, 0, -1, enc, kstr, klen, cb, u, NULL);
}
int i2d_PKCS8PrivateKey_bio(BIO *bp, const EVP_PKEY *x, const EVP_CIPHER *enc,
- const char *kstr, int klen,
- pem_password_cb *cb, void *u)
+ const char *kstr, int klen,
+ pem_password_cb *cb, void *u)
{
return do_pk8pkey(bp, x, 1, -1, enc, kstr, klen, cb, u, NULL);
}
int i2d_PKCS8PrivateKey_nid_bio(BIO *bp, const EVP_PKEY *x, int nid,
- const char *kstr, int klen,
- pem_password_cb *cb, void *u)
+ const char *kstr, int klen,
+ pem_password_cb *cb, void *u)
{
return do_pk8pkey(bp, x, 1, nid, NULL, kstr, klen, cb, u, NULL);
}
static int do_pk8pkey(BIO *bp, const EVP_PKEY *x, int isder, int nid,
- const EVP_CIPHER *enc, const char *kstr, int klen,
- pem_password_cb *cb, void *u, const char *propq)
+ const EVP_CIPHER *enc, const char *kstr, int klen,
+ pem_password_cb *cb, void *u, const char *propq)
{
int ret = 0;
const char *outtype = isder ? "DER" : "PEM";
- OSSL_ENCODER_CTX *ctx =
- OSSL_ENCODER_CTX_new_for_pkey(x, OSSL_KEYMGMT_SELECT_ALL,
- outtype, "PrivateKeyInfo", propq);
+ OSSL_ENCODER_CTX *ctx = OSSL_ENCODER_CTX_new_for_pkey(x, OSSL_KEYMGMT_SELECT_ALL,
+ outtype, "PrivateKeyInfo", propq);
if (ctx == NULL)
return 0;
@@ -104,7 +103,7 @@ static int do_pk8pkey(BIO *bp, const EVP_PKEY *x, int isder, int nid,
if (enc != NULL) {
ret = 0;
if (OSSL_ENCODER_CTX_set_cipher(ctx, EVP_CIPHER_get0_name(enc),
- NULL)) {
+ NULL)) {
const unsigned char *ukstr = (const unsigned char *)kstr;
/*
@@ -118,7 +117,7 @@ static int do_pk8pkey(BIO *bp, const EVP_PKEY *x, int isder, int nid,
&& !OSSL_ENCODER_CTX_set_passphrase(ctx, ukstr, klen))
ret = 0;
else if (cb != NULL
- && !OSSL_ENCODER_CTX_set_pem_password_cb(ctx, cb, u))
+ && !OSSL_ENCODER_CTX_set_pem_password_cb(ctx, cb, u))
ret = 0;
}
}
@@ -159,7 +158,7 @@ static int do_pk8pkey(BIO *bp, const EVP_PKEY *x, int isder, int nid,
else
ret = PEM_write_bio_PKCS8_PRIV_KEY_INFO(bp, p8inf);
}
- legacy_end:
+ legacy_end:
PKCS8_PRIV_KEY_INFO_free(p8inf);
}
OSSL_ENCODER_CTX_free(ctx);
@@ -167,7 +166,7 @@ static int do_pk8pkey(BIO *bp, const EVP_PKEY *x, int isder, int nid,
}
EVP_PKEY *d2i_PKCS8PrivateKey_bio(BIO *bp, EVP_PKEY **x, pem_password_cb *cb,
- void *u)
+ void *u)
{
PKCS8_PRIV_KEY_INFO *p8inf = NULL;
X509_SIG *p8 = NULL;
@@ -206,36 +205,36 @@ EVP_PKEY *d2i_PKCS8PrivateKey_bio(BIO *bp, EVP_PKEY **x, pem_password_cb *cb,
#ifndef OPENSSL_NO_STDIO
int i2d_PKCS8PrivateKey_fp(FILE *fp, const EVP_PKEY *x, const EVP_CIPHER *enc,
- const char *kstr, int klen,
- pem_password_cb *cb, void *u)
+ const char *kstr, int klen,
+ pem_password_cb *cb, void *u)
{
return do_pk8pkey_fp(fp, x, 1, -1, enc, kstr, klen, cb, u, NULL);
}
int i2d_PKCS8PrivateKey_nid_fp(FILE *fp, const EVP_PKEY *x, int nid,
- const char *kstr, int klen,
- pem_password_cb *cb, void *u)
+ const char *kstr, int klen,
+ pem_password_cb *cb, void *u)
{
return do_pk8pkey_fp(fp, x, 1, nid, NULL, kstr, klen, cb, u, NULL);
}
int PEM_write_PKCS8PrivateKey_nid(FILE *fp, const EVP_PKEY *x, int nid,
- const char *kstr, int klen,
- pem_password_cb *cb, void *u)
+ const char *kstr, int klen,
+ pem_password_cb *cb, void *u)
{
return do_pk8pkey_fp(fp, x, 0, nid, NULL, kstr, klen, cb, u, NULL);
}
int PEM_write_PKCS8PrivateKey(FILE *fp, const EVP_PKEY *x, const EVP_CIPHER *enc,
- const char *kstr, int klen,
- pem_password_cb *cb, void *u)
+ const char *kstr, int klen,
+ pem_password_cb *cb, void *u)
{
return do_pk8pkey_fp(fp, x, 0, -1, enc, kstr, klen, cb, u, NULL);
}
static int do_pk8pkey_fp(FILE *fp, const EVP_PKEY *x, int isder, int nid,
- const EVP_CIPHER *enc, const char *kstr, int klen,
- pem_password_cb *cb, void *u, const char *propq)
+ const EVP_CIPHER *enc, const char *kstr, int klen,
+ pem_password_cb *cb, void *u, const char *propq)
{
BIO *bp;
int ret;
@@ -250,7 +249,7 @@ static int do_pk8pkey_fp(FILE *fp, const EVP_PKEY *x, int isder, int nid,
}
EVP_PKEY *d2i_PKCS8PrivateKey_fp(FILE *fp, EVP_PKEY **x, pem_password_cb *cb,
- void *u)
+ void *u)
{
BIO *bp;
EVP_PKEY *ret;
@@ -268,6 +267,5 @@ EVP_PKEY *d2i_PKCS8PrivateKey_fp(FILE *fp, EVP_PKEY **x, pem_password_cb *cb,
IMPLEMENT_PEM_rw(PKCS8, X509_SIG, PEM_STRING_PKCS8, X509_SIG)
-
IMPLEMENT_PEM_rw(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO, PEM_STRING_PKCS8INF,
- PKCS8_PRIV_KEY_INFO)
+ PKCS8_PRIV_KEY_INFO)
diff --git a/crypto/pem/pem_pkey.c b/crypto/pem/pem_pkey.c
index 02ade5bfbc..6542aa2a7c 100644
--- a/crypto/pem/pem_pkey.c
+++ b/crypto/pem/pem_pkey.c
@@ -32,10 +32,10 @@
int ossl_pem_check_suffix(const char *pem_str, const char *suffix);
static EVP_PKEY *pem_read_bio_key_decoder(BIO *bp, EVP_PKEY **x,
- pem_password_cb *cb, void *u,
- OSSL_LIB_CTX *libctx,
- const char *propq,
- int selection)
+ pem_password_cb *cb, void *u,
+ OSSL_LIB_CTX *libctx,
+ const char *propq,
+ int selection)
{
EVP_PKEY *pkey = NULL;
OSSL_DECODER_CTX *dctx = NULL;
@@ -46,7 +46,7 @@ static EVP_PKEY *pem_read_bio_key_decoder(BIO *bp, EVP_PKEY **x,
return NULL;
dctx = OSSL_DECODER_CTX_new_for_pkey(&pkey, "PEM", NULL, NULL,
- selection, libctx, propq);
+ selection, libctx, propq);
if (dctx == NULL)
return NULL;
@@ -92,16 +92,16 @@ static EVP_PKEY *pem_read_bio_key_decoder(BIO *bp, EVP_PKEY **x,
*x = pkey;
}
- err:
+err:
OSSL_DECODER_CTX_free(dctx);
return pkey;
}
static EVP_PKEY *pem_read_bio_key_legacy(BIO *bp, EVP_PKEY **x,
- pem_password_cb *cb, void *u,
- OSSL_LIB_CTX *libctx,
- const char *propq,
- int selection)
+ pem_password_cb *cb, void *u,
+ OSSL_LIB_CTX *libctx,
+ const char *propq,
+ int selection)
{
char *nm = NULL;
const unsigned char *p = NULL;
@@ -110,22 +110,22 @@ static EVP_PKEY *pem_read_bio_key_legacy(BIO *bp, EVP_PKEY **x,
int slen;
EVP_PKEY *ret = NULL;
- ERR_set_mark(); /* not interested in PEM read errors */
+ ERR_set_mark(); /* not interested in PEM read errors */
if ((selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0) {
if (!PEM_bytes_read_bio_secmem(&data, &len, &nm,
- PEM_STRING_EVP_PKEY,
- bp, cb, u)) {
+ PEM_STRING_EVP_PKEY,
+ bp, cb, u)) {
ERR_pop_to_mark();
return NULL;
- }
+ }
} else {
const char *pem_string = PEM_STRING_PARAMETERS;
if ((selection & OSSL_KEYMGMT_SELECT_PUBLIC_KEY) != 0)
pem_string = PEM_STRING_PUBLIC;
if (!PEM_bytes_read_bio(&data, &len, &nm,
- pem_string,
- bp, cb, u)) {
+ pem_string,
+ bp, cb, u)) {
ERR_pop_to_mark();
return NULL;
}
@@ -178,13 +178,13 @@ static EVP_PKEY *pem_read_bio_key_legacy(BIO *bp, EVP_PKEY **x,
if (ameth == NULL || ameth->old_priv_decode == NULL)
goto p8err;
ret = ossl_d2i_PrivateKey_legacy(ameth->pkey_id, x, &p, len, libctx,
- propq);
+ propq);
} else if ((selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) == 0
- && (selection & OSSL_KEYMGMT_SELECT_PUBLIC_KEY) != 0) {
+ && (selection & OSSL_KEYMGMT_SELECT_PUBLIC_KEY) != 0) {
/* Trying legacy PUBKEY decoding only if we do not want private key. */
ret = ossl_d2i_PUBKEY_legacy(x, &p, len);
} else if ((selection & EVP_PKEY_KEYPAIR) == 0
- && (slen = ossl_pem_check_suffix(nm, "PARAMETERS")) > 0) {
+ && (slen = ossl_pem_check_suffix(nm, "PARAMETERS")) > 0) {
/* Trying legacy params decoding only if we do not want a key. */
ret = EVP_PKEY_new();
if (ret == NULL)
@@ -202,21 +202,21 @@ static EVP_PKEY *pem_read_bio_key_legacy(BIO *bp, EVP_PKEY **x,
}
}
- p8err:
+p8err:
if (ret == NULL && ERR_peek_last_error() == 0)
/* ensure some error is reported but do not hide the real one */
ERR_raise(ERR_LIB_PEM, ERR_R_ASN1_LIB);
- err:
+err:
OPENSSL_secure_free(nm);
OPENSSL_secure_clear_free(data, len);
return ret;
}
static EVP_PKEY *pem_read_bio_key(BIO *bp, EVP_PKEY **x,
- pem_password_cb *cb, void *u,
- OSSL_LIB_CTX *libctx,
- const char *propq,
- int selection)
+ pem_password_cb *cb, void *u,
+ OSSL_LIB_CTX *libctx,
+ const char *propq,
+ int selection)
{
EVP_PKEY *ret = NULL;
BIO *new_bio = NULL;
@@ -240,18 +240,19 @@ static EVP_PKEY *pem_read_bio_key(BIO *bp, EVP_PKEY **x,
ERR_set_mark();
ret = pem_read_bio_key_decoder(bp, x, ossl_pw_pem_password, &pwdata,
- libctx, propq, selection);
+ libctx, propq, selection);
if (ret == NULL
&& (BIO_seek(bp, pos) < 0
|| (ret = pem_read_bio_key_legacy(bp, x,
- ossl_pw_pem_password, &pwdata,
- libctx, propq,
- selection)) == NULL))
+ ossl_pw_pem_password, &pwdata,
+ libctx, propq,
+ selection))
+ == NULL))
ERR_clear_last_mark();
else
ERR_pop_to_mark();
- err:
+err:
ossl_pw_clear_passphrase_data(&pwdata);
if (new_bio != NULL) {
BIO_pop(new_bio);
@@ -261,23 +262,23 @@ static EVP_PKEY *pem_read_bio_key(BIO *bp, EVP_PKEY **x,
}
EVP_PKEY *PEM_read_bio_PUBKEY_ex(BIO *bp, EVP_PKEY **x,
- pem_password_cb *cb, void *u,
- OSSL_LIB_CTX *libctx, const char *propq)
+ pem_password_cb *cb, void *u,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
return pem_read_bio_key(bp, x, cb, u, libctx, propq,
- EVP_PKEY_PUBLIC_KEY);
+ EVP_PKEY_PUBLIC_KEY);
}
EVP_PKEY *PEM_read_bio_PUBKEY(BIO *bp, EVP_PKEY **x, pem_password_cb *cb,
- void *u)
+ void *u)
{
return PEM_read_bio_PUBKEY_ex(bp, x, cb, u, NULL, NULL);
}
#ifndef OPENSSL_NO_STDIO
EVP_PKEY *PEM_read_PUBKEY_ex(FILE *fp, EVP_PKEY **x,
- pem_password_cb *cb, void *u,
- OSSL_LIB_CTX *libctx, const char *propq)
+ pem_password_cb *cb, void *u,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
BIO *b;
EVP_PKEY *ret;
@@ -299,16 +300,16 @@ EVP_PKEY *PEM_read_PUBKEY(FILE *fp, EVP_PKEY **x, pem_password_cb *cb, void *u)
#endif
EVP_PKEY *PEM_read_bio_PrivateKey_ex(BIO *bp, EVP_PKEY **x,
- pem_password_cb *cb, void *u,
- OSSL_LIB_CTX *libctx, const char *propq)
+ pem_password_cb *cb, void *u,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
return pem_read_bio_key(bp, x, cb, u, libctx, propq,
- /* we also want the public key, if available */
- EVP_PKEY_KEYPAIR);
+ /* we also want the public key, if available */
+ EVP_PKEY_KEYPAIR);
}
EVP_PKEY *PEM_read_bio_PrivateKey(BIO *bp, EVP_PKEY **x, pem_password_cb *cb,
- void *u)
+ void *u)
{
return PEM_read_bio_PrivateKey_ex(bp, x, cb, u, NULL, NULL);
}
@@ -320,17 +321,17 @@ PEM_write_cb_ex_fnsig(PrivateKey, EVP_PKEY, BIO, write_bio)
IMPLEMENT_PEM_provided_write_body_pass();
IMPLEMENT_PEM_provided_write_body_main(pkey, bio);
- legacy:
+legacy:
if (x != NULL && (x->ameth == NULL || x->ameth->priv_encode != NULL))
return PEM_write_bio_PKCS8PrivateKey(out, x, enc,
- (const char *)kstr, klen, cb, u);
+ (const char *)kstr, klen, cb, u);
return PEM_write_bio_PrivateKey_traditional(out, x, enc, kstr, klen, cb, u);
}
PEM_write_cb_fnsig(PrivateKey, EVP_PKEY, BIO, write_bio)
{
return PEM_write_bio_PrivateKey_ex(out, x, enc, kstr, klen, cb, u,
- NULL, NULL);
+ NULL, NULL);
}
/*
@@ -338,9 +339,9 @@ PEM_write_cb_fnsig(PrivateKey, EVP_PKEY, BIO, write_bio)
* encoding. Therefore, if the pkey is provided, we try to take a copy
*/
int PEM_write_bio_PrivateKey_traditional(BIO *bp, const EVP_PKEY *x,
- const EVP_CIPHER *enc,
- const unsigned char *kstr, int klen,
- pem_password_cb *cb, void *u)
+ const EVP_CIPHER *enc,
+ const unsigned char *kstr, int klen,
+ pem_password_cb *cb, void *u)
{
char pem_str[80];
EVP_PKEY *copy = NULL;
@@ -361,7 +362,7 @@ int PEM_write_bio_PrivateKey_traditional(BIO *bp, const EVP_PKEY *x,
}
BIO_snprintf(pem_str, 80, "%s PRIVATE KEY", x->ameth->pem_str);
ret = PEM_ASN1_write_bio((i2d_of_void *)i2d_PrivateKey,
- pem_str, bp, x, enc, kstr, klen, cb, u);
+ pem_str, bp, x, enc, kstr, klen, cb, u);
EVP_PKEY_free(copy);
return ret;
@@ -373,14 +374,14 @@ static int no_password_cb(char *buf, int num, int rwflag, void *userdata)
}
EVP_PKEY *PEM_read_bio_Parameters_ex(BIO *bp, EVP_PKEY **x,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_LIB_CTX *libctx, const char *propq)
{
/*
* PEM_read_bio_Parameters(_ex) should never ask for a password. Any attempt
* to get a password just fails.
*/
return pem_read_bio_key(bp, x, no_password_cb, NULL, libctx, propq,
- EVP_PKEY_KEY_PARAMETERS);
+ EVP_PKEY_KEY_PARAMETERS);
}
EVP_PKEY *PEM_read_bio_Parameters(BIO *bp, EVP_PKEY **x)
@@ -395,19 +396,19 @@ PEM_write_fnsig(Parameters, EVP_PKEY, BIO, write_bio)
IMPLEMENT_PEM_provided_write_body_main(pkey, bio);
- legacy:
+legacy:
if (!x->ameth || !x->ameth->param_encode)
return 0;
BIO_snprintf(pem_str, 80, "%s PARAMETERS", x->ameth->pem_str);
return PEM_ASN1_write_bio((i2d_of_void *)x->ameth->param_encode,
- pem_str, out, x, NULL, NULL, 0, 0, NULL);
+ pem_str, out, x, NULL, NULL, 0, 0, NULL);
}
#ifndef OPENSSL_NO_STDIO
EVP_PKEY *PEM_read_PrivateKey_ex(FILE *fp, EVP_PKEY **x, pem_password_cb *cb,
- void *u, OSSL_LIB_CTX *libctx,
- const char *propq)
+ void *u, OSSL_LIB_CTX *libctx,
+ const char *propq)
{
BIO *b;
EVP_PKEY *ret;
@@ -423,7 +424,7 @@ EVP_PKEY *PEM_read_PrivateKey_ex(FILE *fp, EVP_PKEY **x, pem_password_cb *cb,
}
EVP_PKEY *PEM_read_PrivateKey(FILE *fp, EVP_PKEY **x, pem_password_cb *cb,
- void *u)
+ void *u)
{
return PEM_read_PrivateKey_ex(fp, x, cb, u, NULL, NULL);
}
@@ -438,7 +439,7 @@ PEM_write_cb_ex_fnsig(PrivateKey, EVP_PKEY, FILE, write)
return 0;
}
ret = PEM_write_bio_PrivateKey_ex(b, x, enc, kstr, klen, cb, u,
- libctx, propq);
+ libctx, propq);
BIO_free(b);
return ret;
}
diff --git a/crypto/pem/pem_sign.c b/crypto/pem/pem_sign.c
index f6b0ff4dda..161cfa0f19 100644
--- a/crypto/pem/pem_sign.c
+++ b/crypto/pem/pem_sign.c
@@ -20,13 +20,13 @@ int PEM_SignInit(EVP_MD_CTX *ctx, EVP_MD *type)
}
int PEM_SignUpdate(EVP_MD_CTX *ctx,
- const unsigned char *data, unsigned int count)
+ const unsigned char *data, unsigned int count)
{
return EVP_DigestUpdate(ctx, data, count);
}
int PEM_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
- unsigned int *siglen, EVP_PKEY *pkey)
+ unsigned int *siglen, EVP_PKEY *pkey)
{
unsigned char *m;
int i, ret = 0;
@@ -42,7 +42,7 @@ int PEM_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
i = EVP_EncodeBlock(sigret, m, m_len);
*siglen = i;
ret = 1;
- err:
+err:
/* ctx has been zeroed by EVP_SignFinal() */
OPENSSL_free(m);
return ret;
diff --git a/crypto/pem/pvkfmt.c b/crypto/pem/pvkfmt.c
index 3d234a507b..9bfbb01e43 100644
--- a/crypto/pem/pvkfmt.c
+++ b/crypto/pem/pvkfmt.c
@@ -67,8 +67,9 @@ static int read_lebn(const unsigned char **in, unsigned int nbyte, BIGNUM **r)
* (EVP_PKEY_RSA or EVP_PKEY_DSA), even if the resulting EVP_PKEY wasn't
* created.
*/
-#define isdss_to_evp_type(isdss) \
- (isdss == 0 ? EVP_PKEY_RSA : isdss == 1 ? EVP_PKEY_DSA : EVP_PKEY_NONE)
+#define isdss_to_evp_type(isdss) \
+ (isdss == 0 ? EVP_PKEY_RSA : isdss == 1 ? EVP_PKEY_DSA \
+ : EVP_PKEY_NONE)
static EVP_PKEY *evp_pkey_new0_key(void *key, int evp_type)
{
EVP_PKEY *pkey = NULL;
@@ -124,27 +125,27 @@ static EVP_PKEY *evp_pkey_new0_key(void *key, int evp_type)
/* Convert private key blob to EVP_PKEY: RSA and DSA keys supported */
-# define MS_PUBLICKEYBLOB 0x6
-# define MS_PRIVATEKEYBLOB 0x7
-# define MS_RSA1MAGIC 0x31415352L
-# define MS_RSA2MAGIC 0x32415352L
-# define MS_DSS1MAGIC 0x31535344L
-# define MS_DSS2MAGIC 0x32535344L
+#define MS_PUBLICKEYBLOB 0x6
+#define MS_PRIVATEKEYBLOB 0x7
+#define MS_RSA1MAGIC 0x31415352L
+#define MS_RSA2MAGIC 0x32415352L
+#define MS_DSS1MAGIC 0x31535344L
+#define MS_DSS2MAGIC 0x32535344L
-# define MS_KEYALG_RSA_KEYX 0xa400
-# define MS_KEYALG_DSS_SIGN 0x2200
+#define MS_KEYALG_RSA_KEYX 0xa400
+#define MS_KEYALG_DSS_SIGN 0x2200
-# define MS_KEYTYPE_KEYX 0x1
-# define MS_KEYTYPE_SIGN 0x2
+#define MS_KEYTYPE_KEYX 0x1
+#define MS_KEYTYPE_SIGN 0x2
/* The PVK file magic number: seems to spell out "bobsfile", who is Bob? */
-# define MS_PVKMAGIC 0xb0b5f11eL
+#define MS_PVKMAGIC 0xb0b5f11eL
/* Salt length for PVK files */
-# define PVK_SALTLEN 0x10
+#define PVK_SALTLEN 0x10
/* Maximum length in PVK header */
-# define PVK_MAX_KEYLEN 102400
+#define PVK_MAX_KEYLEN 102400
/* Maximum salt length */
-# define PVK_MAX_SALTLEN 10240
+#define PVK_MAX_SALTLEN 10240
/*
* Read the MSBLOB header and get relevant data from it.
@@ -161,8 +162,8 @@ static EVP_PKEY *evp_pkey_new0_key(void *key, int evp_type)
* header data.
*/
int ossl_do_blob_header(const unsigned char **in, unsigned int length,
- unsigned int *pmagic, unsigned int *pbitlen,
- int *pisdss, int *pispub)
+ unsigned int *pmagic, unsigned int *pbitlen,
+ int *pisdss, int *pispub)
{
const unsigned char *p = *in;
@@ -280,11 +281,10 @@ unsigned int ossl_blob_length(unsigned bitlen, int isdss, int ispub)
*/
return 4 + 2 * nbyte + 5 * hnbyte;
}
-
}
static void *do_b2i_key(const unsigned char **in, unsigned int length,
- int *isdss, int *ispub)
+ int *isdss, int *ispub)
{
const unsigned char *p = *in;
unsigned int bitlen, magic;
@@ -366,14 +366,14 @@ EVP_PKEY *ossl_b2i_bio(BIO *in, int *ispub)
}
pkey = evp_pkey_new0_key(key, isdss_to_evp_type(isdss));
- err:
+err:
OPENSSL_free(buf);
return pkey;
}
#ifndef OPENSSL_NO_DSA
DSA *ossl_b2i_DSA_after_header(const unsigned char **in, unsigned int bitlen,
- int ispub)
+ int ispub)
{
const unsigned char *p = *in;
DSA *dsa = NULL;
@@ -427,13 +427,13 @@ DSA *ossl_b2i_DSA_after_header(const unsigned char **in, unsigned int bitlen,
*in = p;
return dsa;
- dsaerr:
+dsaerr:
ERR_raise(ERR_LIB_PEM, ERR_R_DSA_LIB);
goto err;
- bnerr:
+bnerr:
ERR_raise(ERR_LIB_PEM, ERR_R_BN_LIB);
- err:
+err:
DSA_free(dsa);
BN_free(pbn);
BN_free(qbn);
@@ -446,7 +446,7 @@ DSA *ossl_b2i_DSA_after_header(const unsigned char **in, unsigned int bitlen,
#endif
RSA *ossl_b2i_RSA_after_header(const unsigned char **in, unsigned int bitlen,
- int ispub)
+ int ispub)
{
const unsigned char *pin = *in;
BIGNUM *e = NULL, *n = NULL, *d = NULL;
@@ -492,13 +492,13 @@ RSA *ossl_b2i_RSA_after_header(const unsigned char **in, unsigned int bitlen,
*in = pin;
return rsa;
- rsaerr:
+rsaerr:
ERR_raise(ERR_LIB_PEM, ERR_R_RSA_LIB);
goto err;
- bnerr:
+bnerr:
ERR_raise(ERR_LIB_PEM, ERR_R_BN_LIB);
- err:
+err:
BN_free(e);
BN_free(n);
BN_free(p);
@@ -614,7 +614,7 @@ static int do_i2b(unsigned char **out, const EVP_PKEY *pk, int ispub)
#endif
if (!noinc)
*out += outlen;
- end:
+end:
return outlen;
}
@@ -668,7 +668,7 @@ static int check_bitlen_rsa(const RSA *rsa, int ispub, unsigned int *pmagic)
goto badkey;
}
return bitlen;
- badkey:
+badkey:
ERR_raise(ERR_LIB_PEM, PEM_R_UNSUPPORTED_KEY_COMPONENTS);
return 0;
}
@@ -719,7 +719,7 @@ static int check_bitlen_dsa(const DSA *dsa, int ispub, unsigned int *pmagic)
}
return bitlen;
- badkey:
+badkey:
ERR_raise(ERR_LIB_PEM, PEM_R_UNSUPPORTED_KEY_COMPONENTS);
return 0;
}
@@ -758,8 +758,8 @@ int i2b_PublicKey_bio(BIO *out, const EVP_PKEY *pk)
}
int ossl_do_PVK_header(const unsigned char **in, unsigned int length,
- int skip_magic, int *isdss,
- unsigned int *psaltlen, unsigned int *pkeylen)
+ int skip_magic, int *isdss,
+ unsigned int *psaltlen, unsigned int *pkeylen)
{
const unsigned char *p = *in;
unsigned int pvk_magic, is_encrypted;
@@ -820,9 +820,9 @@ int ossl_do_PVK_header(const unsigned char **in, unsigned int length,
#ifndef OPENSSL_NO_RC4
static int derive_pvk_key(unsigned char *key, size_t keylen,
- const unsigned char *salt, unsigned int saltlen,
- const unsigned char *pass, int passlen,
- OSSL_LIB_CTX *libctx, const char *propq)
+ const unsigned char *salt, unsigned int saltlen,
+ const unsigned char *pass, int passlen,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
EVP_KDF *kdf;
EVP_KDF_CTX *ctx;
@@ -837,12 +837,12 @@ static int derive_pvk_key(unsigned char *key, size_t keylen,
return 0;
*p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SALT,
- (void *)salt, saltlen);
+ (void *)salt, saltlen);
*p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_PASSWORD,
- (void *)pass, passlen);
+ (void *)pass, passlen);
*p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST, SN_sha1, 0);
*p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_PROPERTIES,
- (char *)propq, 0);
+ (char *)propq, 0);
*p = OSSL_PARAM_construct_end();
rv = EVP_KDF_derive(ctx, key, keylen, params);
@@ -852,10 +852,10 @@ static int derive_pvk_key(unsigned char *key, size_t keylen,
#endif
static void *do_PVK_body_key(const unsigned char **in,
- unsigned int saltlen, unsigned int keylen,
- pem_password_cb *cb, void *u,
- int *isdss, int *ispub,
- OSSL_LIB_CTX *libctx, const char *propq)
+ unsigned int saltlen, unsigned int keylen,
+ pem_password_cb *cb, void *u,
+ int *isdss, int *ispub,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
const unsigned char *p = *in;
unsigned char *enctmp = NULL;
@@ -890,7 +890,7 @@ static void *do_PVK_body_key(const unsigned char **in,
if (enctmp == NULL)
goto err;
if (!derive_pvk_key(keybuf, sizeof(keybuf), p, saltlen,
- (unsigned char *)psbuf, inlen, libctx, propq))
+ (unsigned char *)psbuf, inlen, libctx, propq))
goto err;
p += saltlen;
/* Copy BLOBHEADER across, decrypt rest */
@@ -934,7 +934,7 @@ static void *do_PVK_body_key(const unsigned char **in,
}
key = do_b2i_key(&p, keylen, isdss, ispub);
- err:
+err:
EVP_CIPHER_CTX_free(cctx);
#ifndef OPENSSL_NO_RC4
EVP_CIPHER_free(rc4);
@@ -947,8 +947,8 @@ static void *do_PVK_body_key(const unsigned char **in,
}
static void *do_PVK_key_bio(BIO *in, pem_password_cb *cb, void *u,
- int *isdss, int *ispub,
- OSSL_LIB_CTX *libctx, const char *propq)
+ int *isdss, int *ispub,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
unsigned char pvk_hdr[24], *buf = NULL;
const unsigned char *p;
@@ -975,17 +975,17 @@ static void *do_PVK_key_bio(BIO *in, pem_password_cb *cb, void *u,
}
key = do_PVK_body_key(&p, saltlen, keylen, cb, u, isdss, ispub, libctx, propq);
- err:
+err:
OPENSSL_clear_free(buf, buflen);
return key;
}
#ifndef OPENSSL_NO_DSA
DSA *b2i_DSA_PVK_bio_ex(BIO *in, pem_password_cb *cb, void *u,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_LIB_CTX *libctx, const char *propq)
{
int isdss = 1;
- int ispub = 0; /* PVK keys are always private */
+ int ispub = 0; /* PVK keys are always private */
return do_PVK_key_bio(in, cb, u, &isdss, &ispub, libctx, propq);
}
@@ -997,10 +997,10 @@ DSA *b2i_DSA_PVK_bio(BIO *in, pem_password_cb *cb, void *u)
#endif
RSA *b2i_RSA_PVK_bio_ex(BIO *in, pem_password_cb *cb, void *u,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_LIB_CTX *libctx, const char *propq)
{
int isdss = 0;
- int ispub = 0; /* PVK keys are always private */
+ int ispub = 0; /* PVK keys are always private */
return do_PVK_key_bio(in, cb, u, &isdss, &ispub, libctx, propq);
}
@@ -1011,7 +1011,7 @@ RSA *b2i_RSA_PVK_bio(BIO *in, pem_password_cb *cb, void *u)
}
EVP_PKEY *b2i_PVK_bio_ex(BIO *in, pem_password_cb *cb, void *u,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_LIB_CTX *libctx, const char *propq)
{
int isdss = -1;
int ispub = -1;
@@ -1026,8 +1026,8 @@ EVP_PKEY *b2i_PVK_bio(BIO *in, pem_password_cb *cb, void *u)
}
static int i2b_PVK(unsigned char **out, const EVP_PKEY *pk, int enclevel,
- pem_password_cb *cb, void *u, OSSL_LIB_CTX *libctx,
- const char *propq)
+ pem_password_cb *cb, void *u, OSSL_LIB_CTX *libctx,
+ const char *propq)
{
int ret = -1;
int outlen = 24, pklen;
@@ -1092,7 +1092,7 @@ static int i2b_PVK(unsigned char **out, const EVP_PKEY *pk, int enclevel,
goto error;
}
if (!derive_pvk_key(keybuf, sizeof(keybuf), salt, PVK_SALTLEN,
- (unsigned char *)psbuf, inlen, libctx, propq))
+ (unsigned char *)psbuf, inlen, libctx, propq))
goto error;
if ((rc4 = EVP_CIPHER_fetch(libctx, "RC4", propq)) == NULL)
goto error;
@@ -1115,7 +1115,7 @@ static int i2b_PVK(unsigned char **out, const EVP_PKEY *pk, int enclevel,
if (*out == NULL)
*out = start;
ret = outlen;
- error:
+error:
EVP_CIPHER_CTX_free(cctx);
#ifndef OPENSSL_NO_RC4
EVP_CIPHER_free(rc4);
@@ -1127,8 +1127,8 @@ static int i2b_PVK(unsigned char **out, const EVP_PKEY *pk, int enclevel,
}
int i2b_PVK_bio_ex(BIO *out, const EVP_PKEY *pk, int enclevel,
- pem_password_cb *cb, void *u, OSSL_LIB_CTX *libctx,
- const char *propq)
+ pem_password_cb *cb, void *u, OSSL_LIB_CTX *libctx,
+ const char *propq)
{
unsigned char *tmp = NULL;
int outlen, wrlen;
@@ -1146,8 +1146,7 @@ int i2b_PVK_bio_ex(BIO *out, const EVP_PKEY *pk, int enclevel,
}
int i2b_PVK_bio(BIO *out, const EVP_PKEY *pk, int enclevel,
- pem_password_cb *cb, void *u)
+ pem_password_cb *cb, void *u)
{
return i2b_PVK_bio_ex(out, pk, enclevel, cb, u, NULL, NULL);
}
-
diff --git a/crypto/pkcs12/p12_add.c b/crypto/pkcs12/p12_add.c
index b2635ff1f6..4750974d60 100644
--- a/crypto/pkcs12/p12_add.c
+++ b/crypto/pkcs12/p12_add.c
@@ -18,7 +18,7 @@
/* Pack an object into an OCTET STRING and turn into a safebag */
PKCS12_SAFEBAG *PKCS12_item_pack_safebag(void *obj, const ASN1_ITEM *it,
- int nid1, int nid2)
+ int nid1, int nid2)
{
PKCS12_BAGS *bag;
PKCS12_SAFEBAG *safebag;
@@ -40,7 +40,7 @@ PKCS12_SAFEBAG *PKCS12_item_pack_safebag(void *obj, const ASN1_ITEM *it,
safebag->type = OBJ_nid2obj(nid2);
return safebag;
- err:
+err:
PKCS12_BAGS_free(bag);
return NULL;
}
@@ -66,7 +66,7 @@ PKCS7 *PKCS12_pack_p7data(STACK_OF(PKCS12_SAFEBAG) *sk)
}
return p7;
- err:
+err:
PKCS7_free(p7);
return NULL;
}
@@ -85,16 +85,16 @@ STACK_OF(PKCS12_SAFEBAG) *PKCS12_unpack_p7data(PKCS7 *p7)
}
return ASN1_item_unpack_ex(p7->d.data, ASN1_ITEM_rptr(PKCS12_SAFEBAGS),
- ossl_pkcs7_ctx_get0_libctx(&p7->ctx),
- ossl_pkcs7_ctx_get0_propq(&p7->ctx));
+ ossl_pkcs7_ctx_get0_libctx(&p7->ctx),
+ ossl_pkcs7_ctx_get0_propq(&p7->ctx));
}
/* Turn a stack of SAFEBAGS into a PKCS#7 encrypted data ContentInfo */
PKCS7 *PKCS12_pack_p7encdata_ex(int pbe_nid, const char *pass, int passlen,
- unsigned char *salt, int saltlen, int iter,
- STACK_OF(PKCS12_SAFEBAG) *bags,
- OSSL_LIB_CTX *ctx, const char *propq)
+ unsigned char *salt, int saltlen, int iter,
+ STACK_OF(PKCS12_SAFEBAG) *bags,
+ OSSL_LIB_CTX *ctx, const char *propq)
{
PKCS7 *p7;
X509_ALGOR *pbe;
@@ -129,9 +129,8 @@ PKCS7 *PKCS12_pack_p7encdata_ex(int pbe_nid, const char *pass, int passlen,
X509_ALGOR_free(p7->d.encrypted->enc_data->algorithm);
p7->d.encrypted->enc_data->algorithm = pbe;
ASN1_OCTET_STRING_free(p7->d.encrypted->enc_data->enc_data);
- if (!(p7->d.encrypted->enc_data->enc_data =
- PKCS12_item_i2d_encrypt_ex(pbe, ASN1_ITEM_rptr(PKCS12_SAFEBAGS), pass,
- passlen, bags, 1, ctx, propq))) {
+ if (!(p7->d.encrypted->enc_data->enc_data = PKCS12_item_i2d_encrypt_ex(pbe, ASN1_ITEM_rptr(PKCS12_SAFEBAGS), pass,
+ passlen, bags, 1, ctx, propq))) {
ERR_raise(ERR_LIB_PKCS12, PKCS12_R_ENCRYPT_ERROR);
goto err;
}
@@ -139,22 +138,22 @@ PKCS7 *PKCS12_pack_p7encdata_ex(int pbe_nid, const char *pass, int passlen,
EVP_CIPHER_free(pbe_ciph_fetch);
return p7;
- err:
+err:
PKCS7_free(p7);
EVP_CIPHER_free(pbe_ciph_fetch);
return NULL;
}
PKCS7 *PKCS12_pack_p7encdata(int pbe_nid, const char *pass, int passlen,
- unsigned char *salt, int saltlen, int iter,
- STACK_OF(PKCS12_SAFEBAG) *bags)
+ unsigned char *salt, int saltlen, int iter,
+ STACK_OF(PKCS12_SAFEBAG) *bags)
{
return PKCS12_pack_p7encdata_ex(pbe_nid, pass, passlen, salt, saltlen,
- iter, bags, NULL, NULL);
+ iter, bags, NULL, NULL);
}
STACK_OF(PKCS12_SAFEBAG) *PKCS12_unpack_p7encdata(PKCS7 *p7, const char *pass,
- int passlen)
+ int passlen)
{
if (!PKCS7_type_is_encrypted(p7))
return NULL;
@@ -165,21 +164,21 @@ STACK_OF(PKCS12_SAFEBAG) *PKCS12_unpack_p7encdata(PKCS7 *p7, const char *pass,
}
return PKCS12_item_decrypt_d2i_ex(p7->d.encrypted->enc_data->algorithm,
- ASN1_ITEM_rptr(PKCS12_SAFEBAGS),
- pass, passlen,
- p7->d.encrypted->enc_data->enc_data, 1,
- p7->ctx.libctx, p7->ctx.propq);
+ ASN1_ITEM_rptr(PKCS12_SAFEBAGS),
+ pass, passlen,
+ p7->d.encrypted->enc_data->enc_data, 1,
+ p7->ctx.libctx, p7->ctx.propq);
}
PKCS8_PRIV_KEY_INFO *PKCS12_decrypt_skey_ex(const PKCS12_SAFEBAG *bag,
- const char *pass, int passlen,
- OSSL_LIB_CTX *ctx, const char *propq)
+ const char *pass, int passlen,
+ OSSL_LIB_CTX *ctx, const char *propq)
{
return PKCS8_decrypt_ex(bag->value.shkeybag, pass, passlen, ctx, propq);
}
PKCS8_PRIV_KEY_INFO *PKCS12_decrypt_skey(const PKCS12_SAFEBAG *bag,
- const char *pass, int passlen)
+ const char *pass, int passlen)
{
return PKCS12_decrypt_skey_ex(bag, pass, passlen, NULL, NULL);
}
@@ -187,7 +186,7 @@ PKCS8_PRIV_KEY_INFO *PKCS12_decrypt_skey(const PKCS12_SAFEBAG *bag,
int PKCS12_pack_authsafes(PKCS12 *p12, STACK_OF(PKCS7) *safes)
{
if (ASN1_item_pack(safes, ASN1_ITEM_rptr(PKCS12_AUTHSAFES),
- &p12->authsafes->d.data))
+ &p12->authsafes->d.data))
return 1;
return 0;
}
@@ -211,9 +210,9 @@ STACK_OF(PKCS7) *PKCS12_unpack_authsafes(const PKCS12 *p12)
p7ctx = &p12->authsafes->ctx;
p7s = ASN1_item_unpack_ex(p12->authsafes->d.data,
- ASN1_ITEM_rptr(PKCS12_AUTHSAFES),
- ossl_pkcs7_ctx_get0_libctx(p7ctx),
- ossl_pkcs7_ctx_get0_propq(p7ctx));
+ ASN1_ITEM_rptr(PKCS12_AUTHSAFES),
+ ossl_pkcs7_ctx_get0_libctx(p7ctx),
+ ossl_pkcs7_ctx_get0_propq(p7ctx));
if (p7s != NULL) {
for (i = 0; i < sk_PKCS7_num(p7s); i++) {
p7 = sk_PKCS7_value(p7s, i);
diff --git a/crypto/pkcs12/p12_asn.c b/crypto/pkcs12/p12_asn.c
index e4247b27fc..79fbd33606 100644
--- a/crypto/pkcs12/p12_asn.c
+++ b/crypto/pkcs12/p12_asn.c
@@ -17,9 +17,9 @@
/* PKCS#12 ASN1 module */
ASN1_SEQUENCE(PKCS12) = {
- ASN1_SIMPLE(PKCS12, version, ASN1_INTEGER),
- ASN1_SIMPLE(PKCS12, authsafes, PKCS7),
- ASN1_OPT(PKCS12, mac, PKCS12_MAC_DATA)
+ ASN1_SIMPLE(PKCS12, version, ASN1_INTEGER),
+ ASN1_SIMPLE(PKCS12, authsafes, PKCS7),
+ ASN1_OPT(PKCS12, mac, PKCS12_MAC_DATA)
} ASN1_SEQUENCE_END(PKCS12)
IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(PKCS12, PKCS12, PKCS12)
@@ -39,9 +39,9 @@ void PKCS12_free(PKCS12 *p12)
}
ASN1_SEQUENCE(PKCS12_MAC_DATA) = {
- ASN1_SIMPLE(PKCS12_MAC_DATA, dinfo, X509_SIG),
- ASN1_SIMPLE(PKCS12_MAC_DATA, salt, ASN1_OCTET_STRING),
- ASN1_OPT(PKCS12_MAC_DATA, iter, ASN1_INTEGER)
+ ASN1_SIMPLE(PKCS12_MAC_DATA, dinfo, X509_SIG),
+ ASN1_SIMPLE(PKCS12_MAC_DATA, salt, ASN1_OCTET_STRING),
+ ASN1_OPT(PKCS12_MAC_DATA, iter, ASN1_INTEGER)
} ASN1_SEQUENCE_END(PKCS12_MAC_DATA)
IMPLEMENT_ASN1_FUNCTIONS(PKCS12_MAC_DATA)
@@ -49,14 +49,14 @@ IMPLEMENT_ASN1_FUNCTIONS(PKCS12_MAC_DATA)
ASN1_ADB_TEMPLATE(bag_default) = ASN1_EXP(PKCS12_BAGS, value.other, ASN1_ANY, 0);
ASN1_ADB(PKCS12_BAGS) = {
- ADB_ENTRY(NID_x509Certificate, ASN1_EXP(PKCS12_BAGS, value.x509cert, ASN1_OCTET_STRING, 0)),
- ADB_ENTRY(NID_x509Crl, ASN1_EXP(PKCS12_BAGS, value.x509crl, ASN1_OCTET_STRING, 0)),
- ADB_ENTRY(NID_sdsiCertificate, ASN1_EXP(PKCS12_BAGS, value.sdsicert, ASN1_IA5STRING, 0)),
+ ADB_ENTRY(NID_x509Certificate, ASN1_EXP(PKCS12_BAGS, value.x509cert, ASN1_OCTET_STRING, 0)),
+ ADB_ENTRY(NID_x509Crl, ASN1_EXP(PKCS12_BAGS, value.x509crl, ASN1_OCTET_STRING, 0)),
+ ADB_ENTRY(NID_sdsiCertificate, ASN1_EXP(PKCS12_BAGS, value.sdsicert, ASN1_IA5STRING, 0)),
} ASN1_ADB_END(PKCS12_BAGS, 0, type, 0, &bag_default_tt, NULL);
ASN1_SEQUENCE(PKCS12_BAGS) = {
- ASN1_SIMPLE(PKCS12_BAGS, type, ASN1_OBJECT),
- ASN1_ADB_OBJECT(PKCS12_BAGS),
+ ASN1_SIMPLE(PKCS12_BAGS, type, ASN1_OBJECT),
+ ASN1_ADB_OBJECT(PKCS12_BAGS),
} ASN1_SEQUENCE_END(PKCS12_BAGS)
IMPLEMENT_ASN1_FUNCTIONS(PKCS12_BAGS)
@@ -64,28 +64,26 @@ IMPLEMENT_ASN1_FUNCTIONS(PKCS12_BAGS)
ASN1_ADB_TEMPLATE(safebag_default) = ASN1_EXP(PKCS12_SAFEBAG, value.other, ASN1_ANY, 0);
ASN1_ADB(PKCS12_SAFEBAG) = {
- ADB_ENTRY(NID_keyBag, ASN1_EXP(PKCS12_SAFEBAG, value.keybag, PKCS8_PRIV_KEY_INFO, 0)),
- ADB_ENTRY(NID_pkcs8ShroudedKeyBag, ASN1_EXP(PKCS12_SAFEBAG, value.shkeybag, X509_SIG, 0)),
- ADB_ENTRY(NID_safeContentsBag, ASN1_EXP_SEQUENCE_OF(PKCS12_SAFEBAG, value.safes, PKCS12_SAFEBAG, 0)),
- ADB_ENTRY(NID_certBag, ASN1_EXP(PKCS12_SAFEBAG, value.bag, PKCS12_BAGS, 0)),
- ADB_ENTRY(NID_crlBag, ASN1_EXP(PKCS12_SAFEBAG, value.bag, PKCS12_BAGS, 0)),
- ADB_ENTRY(NID_secretBag, ASN1_EXP(PKCS12_SAFEBAG, value.bag, PKCS12_BAGS, 0))
+ ADB_ENTRY(NID_keyBag, ASN1_EXP(PKCS12_SAFEBAG, value.keybag, PKCS8_PRIV_KEY_INFO, 0)),
+ ADB_ENTRY(NID_pkcs8ShroudedKeyBag, ASN1_EXP(PKCS12_SAFEBAG, value.shkeybag, X509_SIG, 0)),
+ ADB_ENTRY(NID_safeContentsBag, ASN1_EXP_SEQUENCE_OF(PKCS12_SAFEBAG, value.safes, PKCS12_SAFEBAG, 0)),
+ ADB_ENTRY(NID_certBag, ASN1_EXP(PKCS12_SAFEBAG, value.bag, PKCS12_BAGS, 0)),
+ ADB_ENTRY(NID_crlBag, ASN1_EXP(PKCS12_SAFEBAG, value.bag, PKCS12_BAGS, 0)),
+ ADB_ENTRY(NID_secretBag, ASN1_EXP(PKCS12_SAFEBAG, value.bag, PKCS12_BAGS, 0))
} ASN1_ADB_END(PKCS12_SAFEBAG, 0, type, 0, &safebag_default_tt, NULL);
ASN1_SEQUENCE(PKCS12_SAFEBAG) = {
- ASN1_SIMPLE(PKCS12_SAFEBAG, type, ASN1_OBJECT),
- ASN1_ADB_OBJECT(PKCS12_SAFEBAG),
- ASN1_SET_OF_OPT(PKCS12_SAFEBAG, attrib, X509_ATTRIBUTE)
+ ASN1_SIMPLE(PKCS12_SAFEBAG, type, ASN1_OBJECT),
+ ASN1_ADB_OBJECT(PKCS12_SAFEBAG),
+ ASN1_SET_OF_OPT(PKCS12_SAFEBAG, attrib, X509_ATTRIBUTE)
} ASN1_SEQUENCE_END(PKCS12_SAFEBAG)
IMPLEMENT_ASN1_FUNCTIONS(PKCS12_SAFEBAG)
/* SEQUENCE OF SafeBag */
-ASN1_ITEM_TEMPLATE(PKCS12_SAFEBAGS) =
- ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, PKCS12_SAFEBAGS, PKCS12_SAFEBAG)
+ASN1_ITEM_TEMPLATE(PKCS12_SAFEBAGS) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, PKCS12_SAFEBAGS, PKCS12_SAFEBAG)
ASN1_ITEM_TEMPLATE_END(PKCS12_SAFEBAGS)
/* Authsafes: SEQUENCE OF PKCS7 */
-ASN1_ITEM_TEMPLATE(PKCS12_AUTHSAFES) =
- ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, PKCS12_AUTHSAFES, PKCS7)
+ASN1_ITEM_TEMPLATE(PKCS12_AUTHSAFES) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, PKCS12_AUTHSAFES, PKCS7)
ASN1_ITEM_TEMPLATE_END(PKCS12_AUTHSAFES)
diff --git a/crypto/pkcs12/p12_attr.c b/crypto/pkcs12/p12_attr.c
index ea0d027c10..ec609d9b5a 100644
--- a/crypto/pkcs12/p12_attr.c
+++ b/crypto/pkcs12/p12_attr.c
@@ -15,10 +15,11 @@
/* Add a local keyid to a safebag */
int PKCS12_add_localkeyid(PKCS12_SAFEBAG *bag, unsigned char *name,
- int namelen)
+ int namelen)
{
if (X509at_add1_attr_by_NID(&bag->attrib, NID_localKeyID,
- V_ASN1_OCTET_STRING, name, namelen) != NULL)
+ V_ASN1_OCTET_STRING, name, namelen)
+ != NULL)
return 1;
else
return 0;
@@ -30,36 +31,39 @@ int PKCS8_add_keyusage(PKCS8_PRIV_KEY_INFO *p8, int usage)
{
unsigned char us_val = (unsigned char)usage;
return PKCS8_pkey_add1_attr_by_NID(p8, NID_key_usage,
- V_ASN1_BIT_STRING, &us_val, 1);
+ V_ASN1_BIT_STRING, &us_val, 1);
}
/* Add a friendlyname to a safebag */
int PKCS12_add_friendlyname_asc(PKCS12_SAFEBAG *bag, const char *name,
- int namelen)
+ int namelen)
{
if (X509at_add1_attr_by_NID(&bag->attrib, NID_friendlyName,
- MBSTRING_ASC, (unsigned char *)name, namelen) != NULL)
+ MBSTRING_ASC, (unsigned char *)name, namelen)
+ != NULL)
return 1;
else
return 0;
}
int PKCS12_add_friendlyname_utf8(PKCS12_SAFEBAG *bag, const char *name,
- int namelen)
+ int namelen)
{
if (X509at_add1_attr_by_NID(&bag->attrib, NID_friendlyName,
- MBSTRING_UTF8, (unsigned char *)name, namelen) != NULL)
+ MBSTRING_UTF8, (unsigned char *)name, namelen)
+ != NULL)
return 1;
else
return 0;
}
int PKCS12_add_friendlyname_uni(PKCS12_SAFEBAG *bag,
- const unsigned char *name, int namelen)
+ const unsigned char *name, int namelen)
{
if (X509at_add1_attr_by_NID(&bag->attrib, NID_friendlyName,
- MBSTRING_BMP, name, namelen) != NULL)
+ MBSTRING_BMP, name, namelen)
+ != NULL)
return 1;
else
return 0;
@@ -68,14 +72,15 @@ int PKCS12_add_friendlyname_uni(PKCS12_SAFEBAG *bag,
int PKCS12_add_CSPName_asc(PKCS12_SAFEBAG *bag, const char *name, int namelen)
{
if (X509at_add1_attr_by_NID(&bag->attrib, NID_ms_csp_name,
- MBSTRING_ASC, (unsigned char *)name, namelen) != NULL)
+ MBSTRING_ASC, (unsigned char *)name, namelen)
+ != NULL)
return 1;
else
return 0;
}
int PKCS12_add1_attr_by_NID(PKCS12_SAFEBAG *bag, int nid, int type,
- const unsigned char *bytes, int len)
+ const unsigned char *bytes, int len)
{
if (X509at_add1_attr_by_NID(&bag->attrib, nid, type, bytes, len) != NULL)
return 1;
@@ -84,7 +89,7 @@ int PKCS12_add1_attr_by_NID(PKCS12_SAFEBAG *bag, int nid, int type,
}
int PKCS12_add1_attr_by_txt(PKCS12_SAFEBAG *bag, const char *attrname, int type,
- const unsigned char *bytes, int len)
+ const unsigned char *bytes, int len)
{
if (X509at_add1_attr_by_txt(&bag->attrib, attrname, type, bytes, len) != NULL)
return 1;
@@ -93,7 +98,7 @@ int PKCS12_add1_attr_by_txt(PKCS12_SAFEBAG *bag, const char *attrname, int type,
}
ASN1_TYPE *PKCS12_get_attr_gen(const STACK_OF(X509_ATTRIBUTE) *attrs,
- int attr_nid)
+ int attr_nid)
{
int i = X509at_get_attr_by_NID(attrs, attr_nid, -1);
@@ -111,7 +116,7 @@ char *PKCS12_get_friendlyname(PKCS12_SAFEBAG *bag)
if (atype->type != V_ASN1_BMPSTRING)
return NULL;
return OPENSSL_uni2utf8(atype->value.bmpstring->data,
- atype->value.bmpstring->length);
+ atype->value.bmpstring->length);
}
const STACK_OF(X509_ATTRIBUTE) *
@@ -123,7 +128,7 @@ PKCS12_SAFEBAG_get0_attrs(const PKCS12_SAFEBAG *bag)
void PKCS12_SAFEBAG_set0_attrs(PKCS12_SAFEBAG *bag, STACK_OF(X509_ATTRIBUTE) *attrs)
{
if (bag->attrib != attrs)
- sk_X509_ATTRIBUTE_free(bag->attrib);
+ sk_X509_ATTRIBUTE_free(bag->attrib);
bag->attrib = attrs;
}
diff --git a/crypto/pkcs12/p12_crpt.c b/crypto/pkcs12/p12_crpt.c
index 57d1caecfc..b7519f7b58 100644
--- a/crypto/pkcs12/p12_crpt.c
+++ b/crypto/pkcs12/p12_crpt.c
@@ -21,9 +21,9 @@ void PKCS12_PBE_add(void)
}
int PKCS12_PBE_keyivgen_ex(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
- ASN1_TYPE *param, const EVP_CIPHER *cipher,
- const EVP_MD *md, int en_de,
- OSSL_LIB_CTX *libctx, const char *propq)
+ ASN1_TYPE *param, const EVP_CIPHER *cipher,
+ const EVP_MD *md, int en_de,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
PBEPARAM *pbe;
int saltlen, iter, ret;
@@ -49,18 +49,18 @@ int PKCS12_PBE_keyivgen_ex(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
salt = pbe->salt->data;
saltlen = pbe->salt->length;
if (!PKCS12_key_gen_utf8_ex(pass, passlen, salt, saltlen, PKCS12_KEY_ID,
- iter, EVP_CIPHER_get_key_length(cipher),
- key, md,
- libctx, propq)) {
+ iter, EVP_CIPHER_get_key_length(cipher),
+ key, md,
+ libctx, propq)) {
ERR_raise(ERR_LIB_PKCS12, PKCS12_R_KEY_GEN_ERROR);
PBEPARAM_free(pbe);
return 0;
}
if (EVP_CIPHER_get_iv_length(cipher) > 0) {
if (!PKCS12_key_gen_utf8_ex(pass, passlen, salt, saltlen, PKCS12_IV_ID,
- iter, EVP_CIPHER_get_iv_length(cipher),
- iv, md,
- libctx, propq)) {
+ iter, EVP_CIPHER_get_iv_length(cipher),
+ iv, md,
+ libctx, propq)) {
ERR_raise(ERR_LIB_PKCS12, PKCS12_R_IV_GEN_ERROR);
PBEPARAM_free(pbe);
return 0;
@@ -76,10 +76,9 @@ int PKCS12_PBE_keyivgen_ex(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
}
int PKCS12_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
- ASN1_TYPE *param, const EVP_CIPHER *cipher,
- const EVP_MD *md, int en_de)
+ ASN1_TYPE *param, const EVP_CIPHER *cipher,
+ const EVP_MD *md, int en_de)
{
return PKCS12_PBE_keyivgen_ex(ctx, pass, passlen, param, cipher, md, en_de,
- NULL, NULL);
+ NULL, NULL);
}
-
diff --git a/crypto/pkcs12/p12_crt.c b/crypto/pkcs12/p12_crt.c
index 60cc49820f..90a6fe1182 100644
--- a/crypto/pkcs12/p12_crt.c
+++ b/crypto/pkcs12/p12_crt.c
@@ -13,15 +13,15 @@
#include "p12_local.h"
static int pkcs12_add_bag(STACK_OF(PKCS12_SAFEBAG) **pbags,
- PKCS12_SAFEBAG *bag);
+ PKCS12_SAFEBAG *bag);
static int pkcs12_remove_bag(STACK_OF(PKCS12_SAFEBAG) **pbags,
- PKCS12_SAFEBAG *bag);
+ PKCS12_SAFEBAG *bag);
static PKCS12_SAFEBAG *pkcs12_add_cert_bag(STACK_OF(PKCS12_SAFEBAG) **pbags,
- X509 *cert,
- const char *name,
- int namelen,
- unsigned char *keyid,
- int keyidlen);
+ X509 *cert,
+ const char *name,
+ int namelen,
+ unsigned char *keyid,
+ int keyidlen);
static int copy_bag_attr(PKCS12_SAFEBAG *bag, EVP_PKEY *pkey, int nid)
{
@@ -33,10 +33,10 @@ static int copy_bag_attr(PKCS12_SAFEBAG *bag, EVP_PKEY *pkey, int nid)
}
PKCS12 *PKCS12_create_ex2(const char *pass, const char *name, EVP_PKEY *pkey,
- X509 *cert, STACK_OF(X509) *ca, int nid_key, int nid_cert,
- int iter, int mac_iter, int keytype,
- OSSL_LIB_CTX *ctx, const char *propq,
- PKCS12_create_cb *cb, void *cbarg)
+ X509 *cert, STACK_OF(X509) *ca, int nid_key, int nid_cert,
+ int iter, int mac_iter, int keytype,
+ OSSL_LIB_CTX *ctx, const char *propq,
+ PKCS12_create_cb *cb, void *cbarg)
{
PKCS12 *p12 = NULL;
STACK_OF(PKCS7) *safes = NULL;
@@ -84,7 +84,7 @@ PKCS12 *PKCS12_create_ex2(const char *pass, const char *name, EVP_PKEY *pkey,
bag = pkcs12_add_cert_bag(&bags, cert, name, namelen, pkeyid, pkeyidlen);
if (cb != NULL) {
cbret = cb(bag, cbarg);
- if (cbret == -1) {
+ if (cbret == -1) {
ERR_raise(ERR_LIB_PKCS12, PKCS12_R_CALLBACK_FAILED);
goto err;
} else if (cbret == 0) {
@@ -99,7 +99,7 @@ PKCS12 *PKCS12_create_ex2(const char *pass, const char *name, EVP_PKEY *pkey,
goto err;
if (cb != NULL) {
cbret = cb(bag, cbarg);
- if (cbret == -1) {
+ if (cbret == -1) {
ERR_raise(ERR_LIB_PKCS12, PKCS12_R_CALLBACK_FAILED);
goto err;
} else if (cbret == 0) {
@@ -108,8 +108,7 @@ PKCS12 *PKCS12_create_ex2(const char *pass, const char *name, EVP_PKEY *pkey,
}
}
- if (bags && !PKCS12_add_safe_ex(&safes, bags, nid_cert, iter, pass,
- ctx, propq))
+ if (bags && !PKCS12_add_safe_ex(&safes, bags, nid_cert, iter, pass, ctx, propq))
goto err;
sk_PKCS12_SAFEBAG_pop_free(bags, PKCS12_SAFEBAG_free);
@@ -117,7 +116,7 @@ PKCS12 *PKCS12_create_ex2(const char *pass, const char *name, EVP_PKEY *pkey,
if (pkey) {
bag = PKCS12_add_key_ex(&bags, pkey, keytype, iter, nid_key, pass,
- ctx, propq);
+ ctx, propq);
if (!bag)
goto err;
@@ -133,7 +132,7 @@ PKCS12 *PKCS12_create_ex2(const char *pass, const char *name, EVP_PKEY *pkey,
goto err;
if (cb != NULL) {
cbret = cb(bag, cbarg);
- if (cbret == -1) {
+ if (cbret == -1) {
ERR_raise(ERR_LIB_PKCS12, PKCS12_R_CALLBACK_FAILED);
goto err;
} else if (cbret == 0) {
@@ -157,44 +156,42 @@ PKCS12 *PKCS12_create_ex2(const char *pass, const char *name, EVP_PKEY *pkey,
safes = NULL;
- if ((mac_iter != -1) &&
- !PKCS12_set_mac(p12, pass, -1, NULL, 0, mac_iter, NULL))
+ if ((mac_iter != -1) && !PKCS12_set_mac(p12, pass, -1, NULL, 0, mac_iter, NULL))
goto err;
return p12;
- err:
+err:
PKCS12_free(p12);
sk_PKCS7_pop_free(safes, PKCS7_free);
sk_PKCS12_SAFEBAG_pop_free(bags, PKCS12_SAFEBAG_free);
return NULL;
-
}
PKCS12 *PKCS12_create_ex(const char *pass, const char *name, EVP_PKEY *pkey, X509 *cert,
- STACK_OF(X509) *ca, int nid_key, int nid_cert, int iter,
- int mac_iter, int keytype,
- OSSL_LIB_CTX *ctx, const char *propq)
+ STACK_OF(X509) *ca, int nid_key, int nid_cert, int iter,
+ int mac_iter, int keytype,
+ OSSL_LIB_CTX *ctx, const char *propq)
{
return PKCS12_create_ex2(pass, name, pkey, cert, ca, nid_key, nid_cert,
- iter, mac_iter, keytype, ctx, propq,
- NULL, NULL);
+ iter, mac_iter, keytype, ctx, propq,
+ NULL, NULL);
}
PKCS12 *PKCS12_create(const char *pass, const char *name, EVP_PKEY *pkey, X509 *cert,
- STACK_OF(X509) *ca, int nid_key, int nid_cert, int iter,
- int mac_iter, int keytype)
+ STACK_OF(X509) *ca, int nid_key, int nid_cert, int iter,
+ int mac_iter, int keytype)
{
return PKCS12_create_ex(pass, name, pkey, cert, ca, nid_key, nid_cert,
- iter, mac_iter, keytype, NULL, NULL);
+ iter, mac_iter, keytype, NULL, NULL);
}
static PKCS12_SAFEBAG *pkcs12_add_cert_bag(STACK_OF(PKCS12_SAFEBAG) **pbags,
- X509 *cert,
- const char *name,
- int namelen,
- unsigned char *keyid,
- int keyidlen)
+ X509 *cert,
+ const char *name,
+ int namelen,
+ unsigned char *keyid,
+ int keyidlen)
{
PKCS12_SAFEBAG *bag = NULL;
@@ -213,7 +210,7 @@ static PKCS12_SAFEBAG *pkcs12_add_cert_bag(STACK_OF(PKCS12_SAFEBAG) **pbags,
return bag;
- err:
+err:
PKCS12_SAFEBAG_free(bag);
return NULL;
}
@@ -235,9 +232,9 @@ PKCS12_SAFEBAG *PKCS12_add_cert(STACK_OF(PKCS12_SAFEBAG) **pbags, X509 *cert)
}
PKCS12_SAFEBAG *PKCS12_add_key_ex(STACK_OF(PKCS12_SAFEBAG) **pbags,
- EVP_PKEY *key, int key_usage, int iter,
- int nid_key, const char *pass,
- OSSL_LIB_CTX *ctx, const char *propq)
+ EVP_PKEY *key, int key_usage, int iter,
+ int nid_key, const char *pass,
+ OSSL_LIB_CTX *ctx, const char *propq)
{
PKCS12_SAFEBAG *bag = NULL;
@@ -253,11 +250,11 @@ PKCS12_SAFEBAG *PKCS12_add_key_ex(STACK_OF(PKCS12_SAFEBAG) **pbags,
if (nid_key != -1) {
/* This call does not take ownership of p8 */
bag = PKCS12_SAFEBAG_create_pkcs8_encrypt_ex(nid_key, pass, -1, NULL, 0,
- iter, p8, ctx, propq);
+ iter, p8, ctx, propq);
} else {
bag = PKCS12_SAFEBAG_create0_p8inf(p8);
if (bag != NULL)
- p8 = NULL; /* bag takes ownership of p8 */
+ p8 = NULL; /* bag takes ownership of p8 */
}
/* This does not need to be in the error path */
if (p8 != NULL)
@@ -268,22 +265,21 @@ PKCS12_SAFEBAG *PKCS12_add_key_ex(STACK_OF(PKCS12_SAFEBAG) **pbags,
return bag;
- err:
+err:
PKCS12_SAFEBAG_free(bag);
return NULL;
-
}
PKCS12_SAFEBAG *PKCS12_add_key(STACK_OF(PKCS12_SAFEBAG) **pbags,
- EVP_PKEY *key, int key_usage, int iter,
- int nid_key, const char *pass)
+ EVP_PKEY *key, int key_usage, int iter,
+ int nid_key, const char *pass)
{
return PKCS12_add_key_ex(pbags, key, key_usage, iter, nid_key, pass,
- NULL, NULL);
+ NULL, NULL);
}
PKCS12_SAFEBAG *PKCS12_add_secret(STACK_OF(PKCS12_SAFEBAG) **pbags,
- int nid_type, const unsigned char *value, int len)
+ int nid_type, const unsigned char *value, int len)
{
PKCS12_SAFEBAG *bag = NULL;
@@ -295,14 +291,14 @@ PKCS12_SAFEBAG *PKCS12_add_secret(STACK_OF(PKCS12_SAFEBAG) **pbags,
goto err;
return bag;
- err:
+err:
PKCS12_SAFEBAG_free(bag);
return NULL;
}
int PKCS12_add_safe_ex(STACK_OF(PKCS7) **psafes, STACK_OF(PKCS12_SAFEBAG) *bags,
- int nid_safe, int iter, const char *pass,
- OSSL_LIB_CTX *ctx, const char *propq)
+ int nid_safe, int iter, const char *pass,
+ OSSL_LIB_CTX *ctx, const char *propq)
{
PKCS7 *p7 = NULL;
int free_safes = 0;
@@ -333,7 +329,7 @@ int PKCS12_add_safe_ex(STACK_OF(PKCS7) **psafes, STACK_OF(PKCS12_SAFEBAG) *bags,
return 1;
- err:
+err:
if (free_safes) {
sk_PKCS7_free(*psafes);
*psafes = NULL;
@@ -343,14 +339,13 @@ int PKCS12_add_safe_ex(STACK_OF(PKCS7) **psafes, STACK_OF(PKCS12_SAFEBAG) *bags,
}
int PKCS12_add_safe(STACK_OF(PKCS7) **psafes, STACK_OF(PKCS12_SAFEBAG) *bags,
- int nid_safe, int iter, const char *pass)
+ int nid_safe, int iter, const char *pass)
{
return PKCS12_add_safe_ex(psafes, bags, nid_safe, iter, pass, NULL, NULL);
}
-
static int pkcs12_remove_bag(STACK_OF(PKCS12_SAFEBAG) **pbags,
- PKCS12_SAFEBAG *bag)
+ PKCS12_SAFEBAG *bag)
{
PKCS12_SAFEBAG *tmp;
@@ -365,7 +360,7 @@ static int pkcs12_remove_bag(STACK_OF(PKCS12_SAFEBAG) **pbags,
}
static int pkcs12_add_bag(STACK_OF(PKCS12_SAFEBAG) **pbags,
- PKCS12_SAFEBAG *bag)
+ PKCS12_SAFEBAG *bag)
{
int free_bags = 0;
@@ -387,11 +382,10 @@ static int pkcs12_add_bag(STACK_OF(PKCS12_SAFEBAG) **pbags,
}
return 1;
-
}
PKCS12 *PKCS12_add_safes_ex(STACK_OF(PKCS7) *safes, int nid_p7,
- OSSL_LIB_CTX *ctx, const char *propq)
+ OSSL_LIB_CTX *ctx, const char *propq)
{
PKCS12 *p12;
@@ -407,7 +401,6 @@ PKCS12 *PKCS12_add_safes_ex(STACK_OF(PKCS7) *safes, int nid_p7,
}
return p12;
-
}
PKCS12 *PKCS12_add_safes(STACK_OF(PKCS7) *safes, int nid_p7)
diff --git a/crypto/pkcs12/p12_decr.c b/crypto/pkcs12/p12_decr.c
index 3fa9c9c8cc..606713b9ee 100644
--- a/crypto/pkcs12/p12_decr.c
+++ b/crypto/pkcs12/p12_decr.c
@@ -17,10 +17,10 @@
* OPENSSL_malloc'ed buffer
*/
unsigned char *PKCS12_pbe_crypt_ex(const X509_ALGOR *algor,
- const char *pass, int passlen,
- const unsigned char *in, int inlen,
- unsigned char **data, int *datalen, int en_de,
- OSSL_LIB_CTX *libctx, const char *propq)
+ const char *pass, int passlen,
+ const unsigned char *in, int inlen,
+ unsigned char **data, int *datalen, int en_de,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
unsigned char *out = NULL;
int outlen, i;
@@ -35,7 +35,7 @@ unsigned char *PKCS12_pbe_crypt_ex(const X509_ALGOR *algor,
/* Process data */
if (!EVP_PBE_CipherInit_ex(algor->algorithm, pass, passlen,
- algor->parameter, ctx, en_de, libctx, propq))
+ algor->parameter, ctx, en_de, libctx, propq))
goto err;
/*
@@ -53,7 +53,8 @@ unsigned char *PKCS12_pbe_crypt_ex(const X509_ALGOR *algor,
max_out_len = inlen + block_size;
if ((EVP_CIPHER_get_flags(EVP_CIPHER_CTX_get0_cipher(ctx))
- & EVP_CIPH_FLAG_CIPHER_WITH_MAC) != 0) {
+ & EVP_CIPH_FLAG_CIPHER_WITH_MAC)
+ != 0) {
if (EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_TLS1_AAD, 0, &mac_len) < 0) {
ERR_raise(ERR_LIB_PKCS12, ERR_R_INTERNAL_ERROR);
goto err;
@@ -68,7 +69,8 @@ unsigned char *PKCS12_pbe_crypt_ex(const X509_ALGOR *algor,
}
inlen -= mac_len;
if (EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG,
- (int)mac_len, (unsigned char *)in+inlen) < 0) {
+ (int)mac_len, (unsigned char *)in + inlen)
+ < 0) {
ERR_raise(ERR_LIB_PKCS12, ERR_R_INTERNAL_ERROR);
goto err;
}
@@ -90,16 +92,18 @@ unsigned char *PKCS12_pbe_crypt_ex(const X509_ALGOR *algor,
OPENSSL_free(out);
out = NULL;
ERR_raise_data(ERR_LIB_PKCS12, PKCS12_R_PKCS12_CIPHERFINAL_ERROR,
- passlen == 0 ? "empty password"
- : "maybe wrong password");
+ passlen == 0 ? "empty password"
+ : "maybe wrong password");
goto err;
}
outlen += i;
if ((EVP_CIPHER_get_flags(EVP_CIPHER_CTX_get0_cipher(ctx))
- & EVP_CIPH_FLAG_CIPHER_WITH_MAC) != 0) {
+ & EVP_CIPH_FLAG_CIPHER_WITH_MAC)
+ != 0) {
if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
if (EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_GET_TAG,
- (int)mac_len, out+outlen) < 0) {
+ (int)mac_len, out + outlen)
+ < 0) {
OPENSSL_free(out);
out = NULL;
ERR_raise(ERR_LIB_PKCS12, ERR_R_INTERNAL_ERROR);
@@ -112,19 +116,18 @@ unsigned char *PKCS12_pbe_crypt_ex(const X509_ALGOR *algor,
*datalen = outlen;
if (data)
*data = out;
- err:
+err:
EVP_CIPHER_CTX_free(ctx);
return out;
-
}
unsigned char *PKCS12_pbe_crypt(const X509_ALGOR *algor,
- const char *pass, int passlen,
- const unsigned char *in, int inlen,
- unsigned char **data, int *datalen, int en_de)
+ const char *pass, int passlen,
+ const unsigned char *in, int inlen,
+ unsigned char **data, int *datalen, int en_de)
{
return PKCS12_pbe_crypt_ex(algor, pass, passlen, in, inlen, data, datalen,
- en_de, NULL, NULL);
+ en_de, NULL, NULL);
}
/*
@@ -133,10 +136,10 @@ unsigned char *PKCS12_pbe_crypt(const X509_ALGOR *algor,
*/
void *PKCS12_item_decrypt_d2i_ex(const X509_ALGOR *algor, const ASN1_ITEM *it,
- const char *pass, int passlen,
- const ASN1_OCTET_STRING *oct, int zbuf,
- OSSL_LIB_CTX *libctx,
- const char *propq)
+ const char *pass, int passlen,
+ const ASN1_OCTET_STRING *oct, int zbuf,
+ OSSL_LIB_CTX *libctx,
+ const char *propq)
{
unsigned char *out = NULL;
const unsigned char *p;
@@ -144,14 +147,16 @@ void *PKCS12_item_decrypt_d2i_ex(const X509_ALGOR *algor, const ASN1_ITEM *it,
int outlen = 0;
if (!PKCS12_pbe_crypt_ex(algor, pass, passlen, oct->data, oct->length,
- &out, &outlen, 0, libctx, propq))
+ &out, &outlen, 0, libctx, propq))
return NULL;
p = out;
- OSSL_TRACE_BEGIN(PKCS12_DECRYPT) {
+ OSSL_TRACE_BEGIN(PKCS12_DECRYPT)
+ {
BIO_printf(trc_out, "\n");
BIO_dump(trc_out, out, outlen);
BIO_printf(trc_out, "\n");
- } OSSL_TRACE_END(PKCS12_DECRYPT);
+ }
+ OSSL_TRACE_END(PKCS12_DECRYPT);
ret = ASN1_item_d2i(NULL, &p, outlen, it);
if (zbuf)
OPENSSL_cleanse(out, outlen);
@@ -162,11 +167,11 @@ void *PKCS12_item_decrypt_d2i_ex(const X509_ALGOR *algor, const ASN1_ITEM *it,
}
void *PKCS12_item_decrypt_d2i(const X509_ALGOR *algor, const ASN1_ITEM *it,
- const char *pass, int passlen,
- const ASN1_OCTET_STRING *oct, int zbuf)
+ const char *pass, int passlen,
+ const ASN1_OCTET_STRING *oct, int zbuf)
{
return PKCS12_item_decrypt_d2i_ex(algor, it, pass, passlen, oct, zbuf,
- NULL, NULL);
+ NULL, NULL);
}
/*
@@ -175,11 +180,11 @@ void *PKCS12_item_decrypt_d2i(const X509_ALGOR *algor, const ASN1_ITEM *it,
*/
ASN1_OCTET_STRING *PKCS12_item_i2d_encrypt_ex(X509_ALGOR *algor,
- const ASN1_ITEM *it,
- const char *pass, int passlen,
- void *obj, int zbuf,
- OSSL_LIB_CTX *ctx,
- const char *propq)
+ const ASN1_ITEM *it,
+ const char *pass, int passlen,
+ void *obj, int zbuf,
+ OSSL_LIB_CTX *ctx,
+ const char *propq)
{
ASN1_OCTET_STRING *oct = NULL;
unsigned char *in = NULL;
@@ -195,7 +200,7 @@ ASN1_OCTET_STRING *PKCS12_item_i2d_encrypt_ex(X509_ALGOR *algor,
goto err;
}
if (!PKCS12_pbe_crypt_ex(algor, pass, passlen, in, inlen, &oct->data,
- &oct->length, 1, ctx, propq)) {
+ &oct->length, 1, ctx, propq)) {
ERR_raise(ERR_LIB_PKCS12, PKCS12_R_ENCRYPT_ERROR);
OPENSSL_free(in);
goto err;
@@ -204,15 +209,15 @@ ASN1_OCTET_STRING *PKCS12_item_i2d_encrypt_ex(X509_ALGOR *algor,
OPENSSL_cleanse(in, inlen);
OPENSSL_free(in);
return oct;
- err:
+err:
ASN1_OCTET_STRING_free(oct);
return NULL;
}
ASN1_OCTET_STRING *PKCS12_item_i2d_encrypt(X509_ALGOR *algor,
- const ASN1_ITEM *it,
- const char *pass, int passlen,
- void *obj, int zbuf)
+ const ASN1_ITEM *it,
+ const char *pass, int passlen,
+ void *obj, int zbuf)
{
return PKCS12_item_i2d_encrypt_ex(algor, it, pass, passlen, obj, zbuf, NULL, NULL);
}
diff --git a/crypto/pkcs12/p12_init.c b/crypto/pkcs12/p12_init.c
index 537a1e3168..fe264a89d6 100644
--- a/crypto/pkcs12/p12_init.c
+++ b/crypto/pkcs12/p12_init.c
@@ -46,7 +46,7 @@ PKCS12 *PKCS12_init_ex(int mode, OSSL_LIB_CTX *ctx, const char *propq)
}
return pkcs12;
- err:
+err:
PKCS12_free(pkcs12);
return NULL;
}
diff --git a/crypto/pkcs12/p12_key.c b/crypto/pkcs12/p12_key.c
index b5102110cd..bd3ae5d247 100644
--- a/crypto/pkcs12/p12_key.c
+++ b/crypto/pkcs12/p12_key.c
@@ -17,9 +17,9 @@
#include "internal/provider.h"
int PKCS12_key_gen_asc_ex(const char *pass, int passlen, unsigned char *salt,
- int saltlen, int id, int iter, int n,
- unsigned char *out, const EVP_MD *md_type,
- OSSL_LIB_CTX *ctx, const char *propq)
+ int saltlen, int id, int iter, int n,
+ unsigned char *out, const EVP_MD *md_type,
+ OSSL_LIB_CTX *ctx, const char *propq)
{
int ret;
unsigned char *unipass;
@@ -33,23 +33,23 @@ int PKCS12_key_gen_asc_ex(const char *pass, int passlen, unsigned char *salt,
return 0;
}
ret = PKCS12_key_gen_uni_ex(unipass, uniplen, salt, saltlen, id, iter,
- n, out, md_type, ctx, propq);
+ n, out, md_type, ctx, propq);
OPENSSL_clear_free(unipass, uniplen);
return ret > 0;
}
int PKCS12_key_gen_asc(const char *pass, int passlen, unsigned char *salt,
- int saltlen, int id, int iter, int n,
- unsigned char *out, const EVP_MD *md_type)
+ int saltlen, int id, int iter, int n,
+ unsigned char *out, const EVP_MD *md_type)
{
return PKCS12_key_gen_asc_ex(pass, passlen, salt, saltlen, id, iter, n,
- out, md_type, NULL, NULL);
+ out, md_type, NULL, NULL);
}
int PKCS12_key_gen_utf8_ex(const char *pass, int passlen, unsigned char *salt,
- int saltlen, int id, int iter, int n,
- unsigned char *out, const EVP_MD *md_type,
- OSSL_LIB_CTX *ctx, const char *propq)
+ int saltlen, int id, int iter, int n,
+ unsigned char *out, const EVP_MD *md_type,
+ OSSL_LIB_CTX *ctx, const char *propq)
{
int ret;
unsigned char *unipass;
@@ -63,23 +63,23 @@ int PKCS12_key_gen_utf8_ex(const char *pass, int passlen, unsigned char *salt,
return 0;
}
ret = PKCS12_key_gen_uni_ex(unipass, uniplen, salt, saltlen, id, iter,
- n, out, md_type, ctx, propq);
+ n, out, md_type, ctx, propq);
OPENSSL_clear_free(unipass, uniplen);
return ret > 0;
}
int PKCS12_key_gen_utf8(const char *pass, int passlen, unsigned char *salt,
- int saltlen, int id, int iter, int n,
- unsigned char *out, const EVP_MD *md_type)
+ int saltlen, int id, int iter, int n,
+ unsigned char *out, const EVP_MD *md_type)
{
return PKCS12_key_gen_utf8_ex(pass, passlen, salt, saltlen, id, iter, n,
- out, md_type, NULL, NULL);
+ out, md_type, NULL, NULL);
}
int PKCS12_key_gen_uni_ex(unsigned char *pass, int passlen, unsigned char *salt,
- int saltlen, int id, int iter, int n,
- unsigned char *out, const EVP_MD *md_type,
- OSSL_LIB_CTX *libctx, const char *propq)
+ int saltlen, int id, int iter, int n,
+ unsigned char *out, const EVP_MD *md_type,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
int res = 0;
EVP_KDF *kdf;
@@ -98,17 +98,18 @@ int PKCS12_key_gen_uni_ex(unsigned char *pass, int passlen, unsigned char *salt,
return 0;
*p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST,
- (char *)EVP_MD_get0_name(md_type),
- 0);
+ (char *)EVP_MD_get0_name(md_type),
+ 0);
*p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_PASSWORD,
- pass, passlen);
+ pass, passlen);
*p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SALT,
- salt, saltlen);
+ salt, saltlen);
*p++ = OSSL_PARAM_construct_int(OSSL_KDF_PARAM_PKCS12_ID, &id);
*p++ = OSSL_PARAM_construct_int(OSSL_KDF_PARAM_ITER, &iter);
*p = OSSL_PARAM_construct_end();
- OSSL_TRACE_BEGIN(PKCS12_KEYGEN) {
+ OSSL_TRACE_BEGIN(PKCS12_KEYGEN)
+ {
BIO_printf(trc_out, "PKCS12_key_gen_uni_ex(): ID %d, ITER %d\n", id, iter);
BIO_printf(trc_out, "Password (length %d):\n", passlen);
BIO_hex_string(trc_out, 0, passlen, pass, passlen);
@@ -116,23 +117,26 @@ int PKCS12_key_gen_uni_ex(unsigned char *pass, int passlen, unsigned char *salt,
BIO_printf(trc_out, "Salt (length %d):\n", saltlen);
BIO_hex_string(trc_out, 0, saltlen, salt, saltlen);
BIO_printf(trc_out, "\n");
- } OSSL_TRACE_END(PKCS12_KEYGEN);
+ }
+ OSSL_TRACE_END(PKCS12_KEYGEN);
if (EVP_KDF_derive(ctx, out, (size_t)n, params)) {
res = 1;
- OSSL_TRACE_BEGIN(PKCS12_KEYGEN) {
+ OSSL_TRACE_BEGIN(PKCS12_KEYGEN)
+ {
BIO_printf(trc_out, "Output KEY (length %d)\n", n);
BIO_hex_string(trc_out, 0, n, out, n);
BIO_printf(trc_out, "\n");
- } OSSL_TRACE_END(PKCS12_KEYGEN);
+ }
+ OSSL_TRACE_END(PKCS12_KEYGEN);
}
EVP_KDF_CTX_free(ctx);
return res;
}
int PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt,
- int saltlen, int id, int iter, int n,
- unsigned char *out, const EVP_MD *md_type)
+ int saltlen, int id, int iter, int n,
+ unsigned char *out, const EVP_MD *md_type)
{
return PKCS12_key_gen_uni_ex(pass, passlen, salt, saltlen, id, iter, n, out, md_type, NULL, NULL);
}
diff --git a/crypto/pkcs12/p12_kiss.c b/crypto/pkcs12/p12_kiss.c
index 0901dc9408..10b581612d 100644
--- a/crypto/pkcs12/p12_kiss.c
+++ b/crypto/pkcs12/p12_kiss.c
@@ -15,15 +15,15 @@
/* Simplified PKCS#12 routines */
static int parse_pk12(PKCS12 *p12, const char *pass, int passlen,
- EVP_PKEY **pkey, STACK_OF(X509) *ocerts);
+ EVP_PKEY **pkey, STACK_OF(X509) *ocerts);
static int parse_bags(const STACK_OF(PKCS12_SAFEBAG) *bags, const char *pass,
- int passlen, EVP_PKEY **pkey, STACK_OF(X509) *ocerts,
- OSSL_LIB_CTX *libctx, const char *propq);
+ int passlen, EVP_PKEY **pkey, STACK_OF(X509) *ocerts,
+ OSSL_LIB_CTX *libctx, const char *propq);
static int parse_bag(PKCS12_SAFEBAG *bag, const char *pass, int passlen,
- EVP_PKEY **pkey, STACK_OF(X509) *ocerts,
- OSSL_LIB_CTX *libctx, const char *propq);
+ EVP_PKEY **pkey, STACK_OF(X509) *ocerts,
+ OSSL_LIB_CTX *libctx, const char *propq);
/*
* Parse and decrypt a PKCS#12 structure returning user key, user cert and
@@ -33,7 +33,7 @@ static int parse_bag(PKCS12_SAFEBAG *bag, const char *pass, int passlen,
*/
int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,
- STACK_OF(X509) **ca)
+ STACK_OF(X509) **ca)
{
STACK_OF(X509) *ocerts = NULL;
X509 *x = NULL;
@@ -77,7 +77,7 @@ int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,
/* If needed, allocate stack for other certificates */
if ((cert != NULL || ca != NULL)
- && (ocerts = sk_X509_new_null()) == NULL) {
+ && (ocerts = sk_X509_new_null()) == NULL) {
ERR_raise(ERR_LIB_PKCS12, ERR_R_CRYPTO_LIB);
goto err;
}
@@ -86,7 +86,7 @@ int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,
int err = ERR_peek_last_error();
if (ERR_GET_LIB(err) != ERR_LIB_EVP
- && ERR_GET_REASON(err) != EVP_R_UNSUPPORTED_ALGORITHM)
+ && ERR_GET_REASON(err) != EVP_R_UNSUPPORTED_ALGORITHM)
ERR_raise(ERR_LIB_PKCS12, PKCS12_R_PARSE_ERROR);
goto err;
}
@@ -94,7 +94,7 @@ int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,
/* Split the certs in ocerts over *cert and *ca as far as requested */
while ((x = sk_X509_shift(ocerts)) != NULL) {
if (pkey != NULL && *pkey != NULL
- && cert != NULL && *cert == NULL) {
+ && cert != NULL && *cert == NULL) {
int match;
ERR_set_mark();
@@ -117,7 +117,7 @@ int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,
return 1;
- err:
+err:
if (pkey != NULL) {
EVP_PKEY_free(*pkey);
@@ -130,14 +130,13 @@ int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,
X509_free(x);
OSSL_STACK_OF_X509_free(ocerts);
return 0;
-
}
/* Parse the outer PKCS#12 structure */
/* pkey and/or ocerts may be NULL */
static int parse_pk12(PKCS12 *p12, const char *pass, int passlen,
- EVP_PKEY **pkey, STACK_OF(X509) *ocerts)
+ EVP_PKEY **pkey, STACK_OF(X509) *ocerts)
{
STACK_OF(PKCS7) *asafes;
STACK_OF(PKCS12_SAFEBAG) *bags;
@@ -160,7 +159,7 @@ static int parse_pk12(PKCS12 *p12, const char *pass, int passlen,
return 0;
}
if (!parse_bags(bags, pass, passlen, pkey, ocerts,
- p7->ctx.libctx, p7->ctx.propq)) {
+ p7->ctx.libctx, p7->ctx.propq)) {
sk_PKCS12_SAFEBAG_pop_free(bags, PKCS12_SAFEBAG_free);
sk_PKCS7_pop_free(asafes, PKCS7_free);
return 0;
@@ -173,14 +172,14 @@ static int parse_pk12(PKCS12 *p12, const char *pass, int passlen,
/* pkey and/or ocerts may be NULL */
static int parse_bags(const STACK_OF(PKCS12_SAFEBAG) *bags, const char *pass,
- int passlen, EVP_PKEY **pkey, STACK_OF(X509) *ocerts,
- OSSL_LIB_CTX *libctx, const char *propq)
+ int passlen, EVP_PKEY **pkey, STACK_OF(X509) *ocerts,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
int i;
for (i = 0; i < sk_PKCS12_SAFEBAG_num(bags); i++) {
if (!parse_bag(sk_PKCS12_SAFEBAG_value(bags, i),
- pass, passlen, pkey, ocerts,
- libctx, propq))
+ pass, passlen, pkey, ocerts,
+ libctx, propq))
return 0;
}
return 1;
@@ -188,8 +187,8 @@ static int parse_bags(const STACK_OF(PKCS12_SAFEBAG) *bags, const char *pass,
/* pkey and/or ocerts may be NULL */
static int parse_bag(PKCS12_SAFEBAG *bag, const char *pass, int passlen,
- EVP_PKEY **pkey, STACK_OF(X509) *ocerts,
- OSSL_LIB_CTX *libctx, const char *propq)
+ EVP_PKEY **pkey, STACK_OF(X509) *ocerts,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
PKCS8_PRIV_KEY_INFO *p8;
X509 *x509;
@@ -208,7 +207,7 @@ static int parse_bag(PKCS12_SAFEBAG *bag, const char *pass, int passlen,
if (pkey == NULL || *pkey != NULL)
return 1;
*pkey = EVP_PKCS82PKEY_ex(PKCS12_SAFEBAG_get0_p8inf(bag),
- libctx, propq);
+ libctx, propq);
if (*pkey == NULL)
return 0;
break;
@@ -217,7 +216,8 @@ static int parse_bag(PKCS12_SAFEBAG *bag, const char *pass, int passlen,
if (pkey == NULL || *pkey != NULL)
return 1;
if ((p8 = PKCS12_decrypt_skey_ex(bag, pass, passlen,
- libctx, propq)) == NULL)
+ libctx, propq))
+ == NULL)
return 0;
*pkey = EVP_PKCS82PKEY_ex(p8, libctx, propq);
PKCS8_PRIV_KEY_INFO_free(p8);
@@ -227,7 +227,7 @@ static int parse_bag(PKCS12_SAFEBAG *bag, const char *pass, int passlen,
case NID_certBag:
if (ocerts == NULL
- || PKCS12_SAFEBAG_get_bag_nid(bag) != NID_x509Certificate)
+ || PKCS12_SAFEBAG_get_bag_nid(bag) != NID_x509Certificate)
return 1;
if ((x509 = PKCS12_SAFEBAG_get1_cert_ex(bag, libctx, propq)) == NULL)
return 0;
@@ -259,7 +259,7 @@ static int parse_bag(PKCS12_SAFEBAG *bag, const char *pass, int passlen,
case NID_safeContentsBag:
return parse_bags(PKCS12_SAFEBAG_get0_safes(bag), pass, passlen, pkey,
- ocerts, libctx, propq);
+ ocerts, libctx, propq);
default:
return 1;
diff --git a/crypto/pkcs12/p12_local.h b/crypto/pkcs12/p12_local.h
index 7f02874a97..34ffffb692 100644
--- a/crypto/pkcs12/p12_local.h
+++ b/crypto/pkcs12/p12_local.h
@@ -10,7 +10,7 @@
struct PKCS12_MAC_DATA_st {
X509_SIG *dinfo;
ASN1_OCTET_STRING *salt;
- ASN1_INTEGER *iter; /* defaults to 1 */
+ ASN1_INTEGER *iter; /* defaults to 1 */
};
struct PKCS12_st {
@@ -24,7 +24,7 @@ struct PKCS12_SAFEBAG_st {
union {
struct pkcs12_bag_st *bag; /* secret, crl and certbag */
struct pkcs8_priv_key_info_st *keybag; /* keybag */
- X509_SIG *shkeybag; /* shrouded key bag */
+ X509_SIG *shkeybag; /* shrouded key bag */
STACK_OF(PKCS12_SAFEBAG) *safes;
ASN1_TYPE *other;
} value;
@@ -38,7 +38,7 @@ struct pkcs12_bag_st {
ASN1_OCTET_STRING *x509crl;
ASN1_OCTET_STRING *octet;
ASN1_IA5STRING *sdsicert;
- ASN1_TYPE *other; /* Secret or other bag */
+ ASN1_TYPE *other; /* Secret or other bag */
} value;
};
diff --git a/crypto/pkcs12/p12_mutl.c b/crypto/pkcs12/p12_mutl.c
index f28a0d9d36..f8d0bbd109 100644
--- a/crypto/pkcs12/p12_mutl.c
+++ b/crypto/pkcs12/p12_mutl.c
@@ -23,11 +23,11 @@
#include "p12_local.h"
static int pkcs12_pbmac1_pbkdf2_key_gen(const char *pass, int passlen,
- unsigned char *salt, int saltlen,
- int id, int iter, int keylen,
- unsigned char *out,
- const EVP_MD *md_type,
- OSSL_LIB_CTX *libctx, const char *propq);
+ unsigned char *salt, int saltlen,
+ int id, int iter, int keylen,
+ unsigned char *out,
+ const EVP_MD *md_type,
+ OSSL_LIB_CTX *libctx, const char *propq);
int PKCS12_mac_present(const PKCS12 *p12)
{
@@ -35,10 +35,10 @@ int PKCS12_mac_present(const PKCS12 *p12)
}
void PKCS12_get0_mac(const ASN1_OCTET_STRING **pmac,
- const X509_ALGOR **pmacalg,
- const ASN1_OCTET_STRING **psalt,
- const ASN1_INTEGER **piter,
- const PKCS12 *p12)
+ const X509_ALGOR **pmacalg,
+ const ASN1_OCTET_STRING **psalt,
+ const ASN1_INTEGER **piter,
+ const PKCS12 *p12)
{
if (p12->mac) {
X509_SIG_get0(p12->mac->dinfo, pmacalg, pmac);
@@ -61,9 +61,9 @@ void PKCS12_get0_mac(const ASN1_OCTET_STRING **pmac,
#define TK26_MAC_KEY_LEN 32
static int pkcs12_gen_gost_mac_key(const char *pass, int passlen,
- const unsigned char *salt, int saltlen,
- int iter, int keylen, unsigned char *key,
- const EVP_MD *digest)
+ const unsigned char *salt, int saltlen,
+ int iter, int keylen, unsigned char *key,
+ const EVP_MD *digest)
{
unsigned char out[96];
@@ -72,7 +72,7 @@ static int pkcs12_gen_gost_mac_key(const char *pass, int passlen,
}
if (!PKCS5_PBKDF2_HMAC(pass, passlen, salt, saltlen, iter,
- digest, sizeof(out), out)) {
+ digest, sizeof(out), out)) {
return 0;
}
memcpy(key, out + sizeof(out) - TK26_MAC_KEY_LEN, TK26_MAC_KEY_LEN);
@@ -100,15 +100,15 @@ PBKDF2PARAM *PBMAC1_get1_pbkdf2_param(const X509_ALGOR *macalg)
}
pbkdf2_param = ASN1_TYPE_unpack_sequence(ASN1_ITEM_rptr(PBKDF2PARAM),
- param->keyDerivationFunc->parameter);
+ param->keyDerivationFunc->parameter);
PBMAC1PARAM_free(param);
return pbkdf2_param;
}
static int PBMAC1_PBKDF2_HMAC(OSSL_LIB_CTX *ctx, const char *propq,
- const char *pass, int passlen,
- const X509_ALGOR *macalg, unsigned char *key)
+ const char *pass, int passlen,
+ const X509_ALGOR *macalg, unsigned char *key)
{
PBKDF2PARAM *pbkdf2_param = NULL;
const ASN1_OBJECT *kdf_hmac_oid;
@@ -140,13 +140,14 @@ static int PBMAC1_PBKDF2_HMAC(OSSL_LIB_CTX *ctx, const char *propq,
}
if (PKCS5_PBKDF2_HMAC(pass, passlen, pbkdf2_salt->data, pbkdf2_salt->length,
- ASN1_INTEGER_get(pbkdf2_param->iter), kdf_md, keylen, key) <= 0) {
+ ASN1_INTEGER_get(pbkdf2_param->iter), kdf_md, keylen, key)
+ <= 0) {
ERR_raise(ERR_LIB_PKCS12, ERR_R_INTERNAL_ERROR);
goto err;
}
ret = keylen;
- err:
+err:
EVP_MD_free(kdf_md);
PBKDF2PARAM_free(pbkdf2_param);
@@ -155,15 +156,15 @@ static int PBMAC1_PBKDF2_HMAC(OSSL_LIB_CTX *ctx, const char *propq,
/* Generate a MAC, also used for verification */
static int pkcs12_gen_mac(PKCS12 *p12, const char *pass, int passlen,
- unsigned char *mac, unsigned int *maclen,
- int pbmac1_md_nid, int pbmac1_kdf_nid,
- int (*pkcs12_key_gen)(const char *pass, int passlen,
- unsigned char *salt, int slen,
- int id, int iter, int n,
- unsigned char *out,
- const EVP_MD *md_type,
- OSSL_LIB_CTX *libctx,
- const char *propq))
+ unsigned char *mac, unsigned int *maclen,
+ int pbmac1_md_nid, int pbmac1_kdf_nid,
+ int (*pkcs12_key_gen)(const char *pass, int passlen,
+ unsigned char *salt, int slen,
+ int id, int iter, int n,
+ unsigned char *out,
+ const EVP_MD *md_type,
+ OSSL_LIB_CTX *libctx,
+ const char *propq))
{
int ret = 0;
const EVP_MD *md;
@@ -229,12 +230,12 @@ static int pkcs12_gen_mac(PKCS12 *p12, const char *pass, int passlen,
if (keylen < 0)
goto err;
} else if ((md_nid == NID_id_GostR3411_94
- || md_nid == NID_id_GostR3411_2012_256
- || md_nid == NID_id_GostR3411_2012_512)
- && ossl_safe_getenv("LEGACY_GOST_PKCS12") == NULL) {
+ || md_nid == NID_id_GostR3411_2012_256
+ || md_nid == NID_id_GostR3411_2012_512)
+ && ossl_safe_getenv("LEGACY_GOST_PKCS12") == NULL) {
keylen = TK26_MAC_KEY_LEN;
if (!pkcs12_gen_gost_mac_key(pass, passlen, salt, saltlen, iter,
- keylen, key, md)) {
+ keylen, key, md)) {
ERR_raise(ERR_LIB_PKCS12, PKCS12_R_KEY_GEN_ERROR);
goto err;
}
@@ -254,7 +255,7 @@ static int pkcs12_gen_mac(PKCS12 *p12, const char *pass, int passlen,
}
if (pkcs12_key_gen != NULL) {
int res = (*pkcs12_key_gen)(pass, passlen, salt, saltlen, PKCS12_MAC_ID,
- iter, keylen, key, hmac_md, libctx, propq);
+ iter, keylen, key, hmac_md, libctx, propq);
if (fetched)
EVP_MD_free(hmac_md);
@@ -267,7 +268,7 @@ static int pkcs12_gen_mac(PKCS12 *p12, const char *pass, int passlen,
EVP_MD_free(hmac_md);
/* Default to UTF-8 password */
if (!PKCS12_key_gen_utf8_ex(pass, passlen, salt, saltlen, PKCS12_MAC_ID,
- iter, keylen, key, md, libctx, propq)) {
+ iter, keylen, key, md, libctx, propq)) {
ERR_raise(ERR_LIB_PKCS12, PKCS12_R_KEY_GEN_ERROR);
goto err;
}
@@ -276,7 +277,7 @@ static int pkcs12_gen_mac(PKCS12 *p12, const char *pass, int passlen,
if ((hmac = HMAC_CTX_new()) == NULL
|| !HMAC_Init_ex(hmac, key, keylen, md, NULL)
|| !HMAC_Update(hmac, p12->authsafes->d.data->data,
- p12->authsafes->d.data->length)
+ p12->authsafes->d.data->length)
|| !HMAC_Final(hmac, mac, maclen)) {
goto err;
}
@@ -290,7 +291,7 @@ err:
}
int PKCS12_gen_mac(PKCS12 *p12, const char *pass, int passlen,
- unsigned char *mac, unsigned int *maclen)
+ unsigned char *mac, unsigned int *maclen)
{
return pkcs12_gen_mac(p12, pass, passlen, mac, maclen, NID_undef, NID_undef, NULL);
}
@@ -346,8 +347,8 @@ int PKCS12_verify_mac(PKCS12 *p12, const char *pass, int passlen)
/* Set a mac */
int PKCS12_set_mac(PKCS12 *p12, const char *pass, int passlen,
- unsigned char *salt, int saltlen, int iter,
- const EVP_MD *md_type)
+ unsigned char *salt, int saltlen, int iter,
+ const EVP_MD *md_type)
{
unsigned char mac[EVP_MAX_MD_SIZE];
unsigned int maclen;
@@ -378,18 +379,18 @@ int PKCS12_set_mac(PKCS12 *p12, const char *pass, int passlen,
}
static int pkcs12_pbmac1_pbkdf2_key_gen(const char *pass, int passlen,
- unsigned char *salt, int saltlen,
- int id, int iter, int keylen,
- unsigned char *out,
- const EVP_MD *md_type,
- OSSL_LIB_CTX *libctx, const char *propq)
+ unsigned char *salt, int saltlen,
+ int id, int iter, int keylen,
+ unsigned char *out,
+ const EVP_MD *md_type,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
return ossl_pkcs5_pbkdf2_hmac_ex(pass, passlen, salt, saltlen, iter, md_type,
- keylen, out, libctx, propq);
+ keylen, out, libctx, propq);
}
static int pkcs12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt, int saltlen,
- int nid)
+ int nid)
{
X509_ALGOR *macalg;
@@ -417,7 +418,8 @@ static int pkcs12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt, int salt
p12->mac->salt->length = saltlen;
if (salt == NULL) {
if (RAND_bytes_ex(p12->authsafes->ctx.libctx, p12->mac->salt->data,
- (size_t)saltlen, 0) <= 0)
+ (size_t)saltlen, 0)
+ <= 0)
return 0;
} else {
memcpy(p12->mac->salt->data, salt, saltlen);
@@ -433,14 +435,14 @@ static int pkcs12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt, int salt
/* Set up a mac structure */
int PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt, int saltlen,
- const EVP_MD *md_type)
+ const EVP_MD *md_type)
{
return pkcs12_setup_mac(p12, iter, salt, saltlen, EVP_MD_get_type(md_type));
}
int PKCS12_set_pbmac1_pbkdf2(PKCS12 *p12, const char *pass, int passlen,
- unsigned char *salt, int saltlen, int iter,
- const EVP_MD *md_type, const char *prf_md_name)
+ unsigned char *salt, int saltlen, int iter,
+ const EVP_MD *md_type, const char *prf_md_name)
{
unsigned char mac[EVP_MAX_MD_SIZE];
unsigned int maclen;
@@ -451,7 +453,7 @@ int PKCS12_set_pbmac1_pbkdf2(PKCS12 *p12, const char *pass, int passlen,
unsigned char *known_salt = NULL;
int keylen = 0;
PBMAC1PARAM *param = NULL;
- X509_ALGOR *hmac_alg = NULL, *macalg = NULL;
+ X509_ALGOR *hmac_alg = NULL, *macalg = NULL;
OSSL_LIB_CTX *libctx = p12->authsafes->ctx.libctx;
if (md_type == NULL)
@@ -468,7 +470,7 @@ int PKCS12_set_pbmac1_pbkdf2(PKCS12 *p12, const char *pass, int passlen,
keylen = EVP_MD_get_size(md_type);
- prf_nid = ossl_md2hmacnid(prf_md_nid);
+ prf_nid = ossl_md2hmacnid(prf_md_nid);
hmac_nid = ossl_md2hmacnid(EVP_MD_get_type(md_type));
if (prf_nid == NID_undef || hmac_nid == NID_undef) {
@@ -496,12 +498,13 @@ int PKCS12_set_pbmac1_pbkdf2(PKCS12 *p12, const char *pass, int passlen,
param = PBMAC1PARAM_new();
hmac_alg = X509_ALGOR_new();
alg = PKCS5_pbkdf2_set_ex(iter, salt ? salt : known_salt, saltlen,
- prf_nid, keylen, libctx);
+ prf_nid, keylen, libctx);
if (param == NULL || hmac_alg == NULL || alg == NULL)
goto err;
if (pkcs12_setup_mac(p12, iter, salt ? salt : known_salt, saltlen,
- NID_pbmac1) == PKCS12_ERROR) {
+ NID_pbmac1)
+ == PKCS12_ERROR) {
ERR_raise(ERR_LIB_PKCS12, PKCS12_R_MAC_SETUP_ERROR);
goto err;
}
@@ -524,8 +527,8 @@ int PKCS12_set_pbmac1_pbkdf2(PKCS12 *p12, const char *pass, int passlen,
* Note that output mac is forced to UTF-8...
*/
if (!pkcs12_gen_mac(p12, pass, passlen, mac, &maclen,
- EVP_MD_get_type(md_type), prf_md_nid,
- pkcs12_pbmac1_pbkdf2_key_gen)) {
+ EVP_MD_get_type(md_type), prf_md_nid,
+ pkcs12_pbmac1_pbkdf2_key_gen)) {
ERR_raise(ERR_LIB_PKCS12, PKCS12_R_MAC_GENERATION_ERROR);
goto err;
}
@@ -535,7 +538,7 @@ int PKCS12_set_pbmac1_pbkdf2(PKCS12 *p12, const char *pass, int passlen,
}
ret = 1;
- err:
+err:
PBMAC1PARAM_free(param);
OPENSSL_free(known_salt);
return ret;
diff --git a/crypto/pkcs12/p12_npas.c b/crypto/pkcs12/p12_npas.c
index 43052d15b6..db0c18c37b 100644
--- a/crypto/pkcs12/p12_npas.c
+++ b/crypto/pkcs12/p12_npas.c
@@ -19,13 +19,13 @@
static int newpass_p12(PKCS12 *p12, const char *oldpass, const char *newpass);
static int newpass_bags(STACK_OF(PKCS12_SAFEBAG) *bags, const char *oldpass,
- const char *newpass,
- OSSL_LIB_CTX *libctx, const char *propq);
+ const char *newpass,
+ OSSL_LIB_CTX *libctx, const char *propq);
static int newpass_bag(PKCS12_SAFEBAG *bag, const char *oldpass,
- const char *newpass,
- OSSL_LIB_CTX *libctx, const char *propq);
+ const char *newpass,
+ OSSL_LIB_CTX *libctx, const char *propq);
static int alg_get(const X509_ALGOR *alg, int *pnid, int *piter,
- int *psaltlen, int *cipherid);
+ int *psaltlen, int *cipherid);
/*
* Change the password on a PKCS#12 structure.
@@ -82,8 +82,8 @@ static int newpass_p12(PKCS12 *p12, const char *oldpass, const char *newpass)
} else if (bagnid == NID_pkcs7_encrypted) {
bags = PKCS12_unpack_p7encdata(p7, oldpass, -1);
if (p7->d.encrypted == NULL
- || !alg_get(p7->d.encrypted->enc_data->algorithm,
- &pbe_nid, &pbe_iter, &pbe_saltlen, &cipherid))
+ || !alg_get(p7->d.encrypted->enc_data->algorithm,
+ &pbe_nid, &pbe_iter, &pbe_saltlen, &cipherid))
goto err;
} else {
continue;
@@ -91,15 +91,15 @@ static int newpass_p12(PKCS12 *p12, const char *oldpass, const char *newpass)
if (bags == NULL)
goto err;
if (!newpass_bags(bags, oldpass, newpass,
- p7->ctx.libctx, p7->ctx.propq))
+ p7->ctx.libctx, p7->ctx.propq))
goto err;
/* Repack bag in same form with new password */
if (bagnid == NID_pkcs7_data)
p7new = PKCS12_pack_p7data(bags);
else
p7new = PKCS12_pack_p7encdata_ex(pbe_nid, newpass, -1, NULL,
- pbe_saltlen, pbe_iter, bags,
- p7->ctx.libctx, p7->ctx.propq);
+ pbe_saltlen, pbe_iter, bags,
+ p7->ctx.libctx, p7->ctx.propq);
if (p7new == NULL || !sk_PKCS7_push(newsafes, p7new)) {
PKCS7_free(p7new);
goto err;
@@ -141,13 +141,13 @@ err:
}
static int newpass_bags(STACK_OF(PKCS12_SAFEBAG) *bags, const char *oldpass,
- const char *newpass,
- OSSL_LIB_CTX *libctx, const char *propq)
+ const char *newpass,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
int i;
for (i = 0; i < sk_PKCS12_SAFEBAG_num(bags); i++) {
if (!newpass_bag(sk_PKCS12_SAFEBAG_value(bags, i), oldpass, newpass,
- libctx, propq))
+ libctx, propq))
return 0;
}
return 1;
@@ -156,8 +156,8 @@ static int newpass_bags(STACK_OF(PKCS12_SAFEBAG) *bags, const char *oldpass,
/* Change password of safebag: only needs handle shrouded keybags */
static int newpass_bag(PKCS12_SAFEBAG *bag, const char *oldpass,
- const char *newpass,
- OSSL_LIB_CTX *libctx, const char *propq)
+ const char *newpass,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
EVP_CIPHER *cipher = NULL;
PKCS8_PRIV_KEY_INFO *p8;
@@ -169,7 +169,8 @@ static int newpass_bag(PKCS12_SAFEBAG *bag, const char *oldpass,
return 1;
if ((p8 = PKCS8_decrypt_ex(bag->value.shkeybag, oldpass, -1,
- libctx, propq)) == NULL)
+ libctx, propq))
+ == NULL)
return 0;
X509_SIG_get0(bag->value.shkeybag, &shalg, NULL);
if (!alg_get(shalg, &p8_nid, &p8_iter, &p8_saltlen, &cipherid)) {
@@ -184,7 +185,7 @@ static int newpass_bag(PKCS12_SAFEBAG *bag, const char *oldpass,
}
}
p8new = PKCS8_encrypt_ex(p8_nid, cipher, newpass, -1, NULL, p8_saltlen,
- p8_iter, p8, libctx, propq);
+ p8_iter, p8, libctx, propq);
PKCS8_PRIV_KEY_INFO_free(p8);
EVP_CIPHER_free(cipher);
if (p8new == NULL)
@@ -195,7 +196,7 @@ static int newpass_bag(PKCS12_SAFEBAG *bag, const char *oldpass,
}
static int alg_get(const X509_ALGOR *alg, int *pnid, int *piter,
- int *psaltlen, int *cipherid)
+ int *psaltlen, int *cipherid)
{
int ret = 0, pbenid, aparamtype;
int encnid, prfnid;
diff --git a/crypto/pkcs12/p12_p8d.c b/crypto/pkcs12/p12_p8d.c
index 449336aa2d..5b4327dc91 100644
--- a/crypto/pkcs12/p12_p8d.c
+++ b/crypto/pkcs12/p12_p8d.c
@@ -12,21 +12,20 @@
#include <openssl/pkcs12.h>
PKCS8_PRIV_KEY_INFO *PKCS8_decrypt_ex(const X509_SIG *p8, const char *pass,
- int passlen, OSSL_LIB_CTX *ctx,
- const char *propq)
+ int passlen, OSSL_LIB_CTX *ctx,
+ const char *propq)
{
const X509_ALGOR *dalg;
const ASN1_OCTET_STRING *doct;
X509_SIG_get0(p8, &dalg, &doct);
return PKCS12_item_decrypt_d2i_ex(dalg,
- ASN1_ITEM_rptr(PKCS8_PRIV_KEY_INFO), pass,
- passlen, doct, 1, ctx, propq);
+ ASN1_ITEM_rptr(PKCS8_PRIV_KEY_INFO), pass,
+ passlen, doct, 1, ctx, propq);
}
PKCS8_PRIV_KEY_INFO *PKCS8_decrypt(const X509_SIG *p8, const char *pass,
- int passlen)
+ int passlen)
{
return PKCS8_decrypt_ex(p8, pass, passlen, NULL, NULL);
}
-
diff --git a/crypto/pkcs12/p12_p8e.c b/crypto/pkcs12/p12_p8e.c
index 1230c8c88c..57f17d5131 100644
--- a/crypto/pkcs12/p12_p8e.c
+++ b/crypto/pkcs12/p12_p8e.c
@@ -14,10 +14,10 @@
#include "crypto/x509.h"
X509_SIG *PKCS8_encrypt_ex(int pbe_nid, const EVP_CIPHER *cipher,
- const char *pass, int passlen,
- unsigned char *salt, int saltlen, int iter,
- PKCS8_PRIV_KEY_INFO *p8inf,
- OSSL_LIB_CTX *libctx, const char *propq)
+ const char *pass, int passlen,
+ unsigned char *salt, int saltlen, int iter,
+ PKCS8_PRIV_KEY_INFO *p8inf,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
X509_SIG *p8 = NULL;
X509_ALGOR *pbe;
@@ -28,7 +28,7 @@ X509_SIG *PKCS8_encrypt_ex(int pbe_nid, const EVP_CIPHER *cipher,
return NULL;
}
pbe = PKCS5_pbe2_set_iv_ex(cipher, iter, salt, saltlen, NULL, -1,
- libctx);
+ libctx);
} else {
ERR_set_mark();
if (EVP_PBE_find(EVP_PBE_TYPE_PRF, pbe_nid, NULL, NULL, 0)) {
@@ -38,7 +38,7 @@ X509_SIG *PKCS8_encrypt_ex(int pbe_nid, const EVP_CIPHER *cipher,
return NULL;
}
pbe = PKCS5_pbe2_set_iv_ex(cipher, iter, salt, saltlen, NULL,
- pbe_nid, libctx);
+ pbe_nid, libctx);
} else {
ERR_pop_to_mark();
pbe = PKCS5_pbe_set_ex(pbe_nid, iter, salt, saltlen, libctx);
@@ -58,24 +58,23 @@ X509_SIG *PKCS8_encrypt_ex(int pbe_nid, const EVP_CIPHER *cipher,
}
X509_SIG *PKCS8_encrypt(int pbe_nid, const EVP_CIPHER *cipher,
- const char *pass, int passlen,
- unsigned char *salt, int saltlen, int iter,
- PKCS8_PRIV_KEY_INFO *p8inf)
+ const char *pass, int passlen,
+ unsigned char *salt, int saltlen, int iter,
+ PKCS8_PRIV_KEY_INFO *p8inf)
{
return PKCS8_encrypt_ex(pbe_nid, cipher, pass, passlen, salt, saltlen, iter,
- p8inf, NULL, NULL);
+ p8inf, NULL, NULL);
}
X509_SIG *PKCS8_set0_pbe_ex(const char *pass, int passlen,
- PKCS8_PRIV_KEY_INFO *p8inf, X509_ALGOR *pbe,
- OSSL_LIB_CTX *ctx, const char *propq)
+ PKCS8_PRIV_KEY_INFO *p8inf, X509_ALGOR *pbe,
+ OSSL_LIB_CTX *ctx, const char *propq)
{
X509_SIG *p8;
ASN1_OCTET_STRING *enckey;
- enckey =
- PKCS12_item_i2d_encrypt_ex(pbe, ASN1_ITEM_rptr(PKCS8_PRIV_KEY_INFO),
- pass, passlen, p8inf, 1, ctx, propq);
+ enckey = PKCS12_item_i2d_encrypt_ex(pbe, ASN1_ITEM_rptr(PKCS8_PRIV_KEY_INFO),
+ pass, passlen, p8inf, 1, ctx, propq);
if (!enckey) {
ERR_raise(ERR_LIB_PKCS12, PKCS12_R_ENCRYPT_ERROR);
return NULL;
@@ -94,7 +93,7 @@ X509_SIG *PKCS8_set0_pbe_ex(const char *pass, int passlen,
}
X509_SIG *PKCS8_set0_pbe(const char *pass, int passlen,
- PKCS8_PRIV_KEY_INFO *p8inf, X509_ALGOR *pbe)
+ PKCS8_PRIV_KEY_INFO *p8inf, X509_ALGOR *pbe)
{
return PKCS8_set0_pbe_ex(pass, passlen, p8inf, pbe, NULL, NULL);
}
diff --git a/crypto/pkcs12/p12_sbag.c b/crypto/pkcs12/p12_sbag.c
index c7ecfb2439..4848daf2e9 100644
--- a/crypto/pkcs12/p12_sbag.c
+++ b/crypto/pkcs12/p12_sbag.c
@@ -21,7 +21,7 @@ ASN1_TYPE *PKCS12_get_attr(const PKCS12_SAFEBAG *bag, int attr_nid)
#endif
const ASN1_TYPE *PKCS12_SAFEBAG_get0_attr(const PKCS12_SAFEBAG *bag,
- int attr_nid)
+ int attr_nid)
{
return PKCS12_get_attr_gen(bag->attrib, attr_nid);
}
@@ -98,7 +98,7 @@ X509 *PKCS12_SAFEBAG_get1_cert(const PKCS12_SAFEBAG *bag)
if (OBJ_obj2nid(bag->value.bag->type) != NID_x509Certificate)
return NULL;
return ASN1_item_unpack(bag->value.bag->value.octet,
- ASN1_ITEM_rptr(X509));
+ ASN1_ITEM_rptr(X509));
}
X509_CRL *PKCS12_SAFEBAG_get1_crl(const PKCS12_SAFEBAG *bag)
@@ -108,11 +108,11 @@ X509_CRL *PKCS12_SAFEBAG_get1_crl(const PKCS12_SAFEBAG *bag)
if (OBJ_obj2nid(bag->value.bag->type) != NID_x509Crl)
return NULL;
return ASN1_item_unpack(bag->value.bag->value.octet,
- ASN1_ITEM_rptr(X509_CRL));
+ ASN1_ITEM_rptr(X509_CRL));
}
X509 *PKCS12_SAFEBAG_get1_cert_ex(const PKCS12_SAFEBAG *bag,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_LIB_CTX *libctx, const char *propq)
{
X509 *ret = NULL;
@@ -121,7 +121,7 @@ X509 *PKCS12_SAFEBAG_get1_cert_ex(const PKCS12_SAFEBAG *bag,
if (OBJ_obj2nid(bag->value.bag->type) != NID_x509Certificate)
return NULL;
ret = ASN1_item_unpack_ex(bag->value.bag->value.octet,
- ASN1_ITEM_rptr(X509), libctx, propq);
+ ASN1_ITEM_rptr(X509), libctx, propq);
if (!ossl_x509_set0_libctx(ret, libctx, propq)) {
X509_free(ret);
return NULL;
@@ -130,7 +130,7 @@ X509 *PKCS12_SAFEBAG_get1_cert_ex(const PKCS12_SAFEBAG *bag,
}
X509_CRL *PKCS12_SAFEBAG_get1_crl_ex(const PKCS12_SAFEBAG *bag,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_LIB_CTX *libctx, const char *propq)
{
X509_CRL *ret = NULL;
@@ -139,7 +139,7 @@ X509_CRL *PKCS12_SAFEBAG_get1_crl_ex(const PKCS12_SAFEBAG *bag,
if (OBJ_obj2nid(bag->value.bag->type) != NID_x509Crl)
return NULL;
ret = ASN1_item_unpack_ex(bag->value.bag->value.octet,
- ASN1_ITEM_rptr(X509_CRL), libctx, propq);
+ ASN1_ITEM_rptr(X509_CRL), libctx, propq);
if (!ossl_x509_crl_set0_libctx(ret, libctx, propq)) {
X509_CRL_free(ret);
return NULL;
@@ -150,13 +150,13 @@ X509_CRL *PKCS12_SAFEBAG_get1_crl_ex(const PKCS12_SAFEBAG *bag,
PKCS12_SAFEBAG *PKCS12_SAFEBAG_create_cert(X509 *x509)
{
return PKCS12_item_pack_safebag(x509, ASN1_ITEM_rptr(X509),
- NID_x509Certificate, NID_certBag);
+ NID_x509Certificate, NID_certBag);
}
PKCS12_SAFEBAG *PKCS12_SAFEBAG_create_crl(X509_CRL *crl)
{
return PKCS12_item_pack_safebag(crl, ASN1_ITEM_rptr(X509_CRL),
- NID_x509Crl, NID_crlBag);
+ NID_x509Crl, NID_crlBag);
}
PKCS12_SAFEBAG *PKCS12_SAFEBAG_create_secret(int type, int vtype, const unsigned char *value, int len)
@@ -171,29 +171,27 @@ PKCS12_SAFEBAG *PKCS12_SAFEBAG_create_secret(int type, int vtype, const unsigned
bag->type = OBJ_nid2obj(type);
switch (vtype) {
- case V_ASN1_OCTET_STRING:
- {
- ASN1_OCTET_STRING *strtmp = ASN1_OCTET_STRING_new();
-
- if (strtmp == NULL) {
- ERR_raise(ERR_LIB_PKCS12, ERR_R_ASN1_LIB);
- goto err;
- }
- /* Pack data into an octet string */
- if (!ASN1_OCTET_STRING_set(strtmp, value, len)) {
- ASN1_OCTET_STRING_free(strtmp);
- ERR_raise(ERR_LIB_PKCS12, PKCS12_R_ENCODE_ERROR);
- goto err;
- }
- bag->value.other = ASN1_TYPE_new();
- if (bag->value.other == NULL) {
- ASN1_OCTET_STRING_free(strtmp);
- ERR_raise(ERR_LIB_PKCS12, ERR_R_ASN1_LIB);
- goto err;
- }
- ASN1_TYPE_set(bag->value.other, vtype, strtmp);
+ case V_ASN1_OCTET_STRING: {
+ ASN1_OCTET_STRING *strtmp = ASN1_OCTET_STRING_new();
+
+ if (strtmp == NULL) {
+ ERR_raise(ERR_LIB_PKCS12, ERR_R_ASN1_LIB);
+ goto err;
+ }
+ /* Pack data into an octet string */
+ if (!ASN1_OCTET_STRING_set(strtmp, value, len)) {
+ ASN1_OCTET_STRING_free(strtmp);
+ ERR_raise(ERR_LIB_PKCS12, PKCS12_R_ENCODE_ERROR);
+ goto err;
}
- break;
+ bag->value.other = ASN1_TYPE_new();
+ if (bag->value.other == NULL) {
+ ASN1_OCTET_STRING_free(strtmp);
+ ERR_raise(ERR_LIB_PKCS12, ERR_R_ASN1_LIB);
+ goto err;
+ }
+ ASN1_TYPE_set(bag->value.other, vtype, strtmp);
+ } break;
default:
ERR_raise(ERR_LIB_PKCS12, PKCS12_R_INVALID_TYPE);
@@ -208,7 +206,7 @@ PKCS12_SAFEBAG *PKCS12_SAFEBAG_create_secret(int type, int vtype, const unsigned
safebag->type = OBJ_nid2obj(NID_secretBag);
return safebag;
- err:
+err:
PKCS12_BAGS_free(bag);
return NULL;
}
@@ -245,13 +243,13 @@ PKCS12_SAFEBAG *PKCS12_SAFEBAG_create0_pkcs8(X509_SIG *p8)
}
PKCS12_SAFEBAG *PKCS12_SAFEBAG_create_pkcs8_encrypt_ex(int pbe_nid,
- const char *pass,
- int passlen,
- unsigned char *salt,
- int saltlen, int iter,
- PKCS8_PRIV_KEY_INFO *p8inf,
- OSSL_LIB_CTX *ctx,
- const char *propq)
+ const char *pass,
+ int passlen,
+ unsigned char *salt,
+ int saltlen, int iter,
+ PKCS8_PRIV_KEY_INFO *p8inf,
+ OSSL_LIB_CTX *ctx,
+ const char *propq)
{
PKCS12_SAFEBAG *bag = NULL;
const EVP_CIPHER *pbe_ciph = NULL;
@@ -268,7 +266,7 @@ PKCS12_SAFEBAG *PKCS12_SAFEBAG_create_pkcs8_encrypt_ex(int pbe_nid,
pbe_nid = -1;
p8 = PKCS8_encrypt_ex(pbe_nid, pbe_ciph, pass, passlen, salt, saltlen, iter,
- p8inf, ctx, propq);
+ p8inf, ctx, propq);
if (p8 == NULL)
goto err;
@@ -282,13 +280,13 @@ err:
}
PKCS12_SAFEBAG *PKCS12_SAFEBAG_create_pkcs8_encrypt(int pbe_nid,
- const char *pass,
- int passlen,
- unsigned char *salt,
- int saltlen, int iter,
- PKCS8_PRIV_KEY_INFO *p8inf)
+ const char *pass,
+ int passlen,
+ unsigned char *salt,
+ int saltlen, int iter,
+ PKCS8_PRIV_KEY_INFO *p8inf)
{
return PKCS12_SAFEBAG_create_pkcs8_encrypt_ex(pbe_nid, pass, passlen,
- salt, saltlen, iter, p8inf,
- NULL, NULL);
+ salt, saltlen, iter, p8inf,
+ NULL, NULL);
}
diff --git a/crypto/pkcs12/p12_utl.c b/crypto/pkcs12/p12_utl.c
index 3c42baf292..50adce6b26 100644
--- a/crypto/pkcs12/p12_utl.c
+++ b/crypto/pkcs12/p12_utl.c
@@ -16,7 +16,7 @@
/* Cheap and nasty Unicode stuff */
unsigned char *OPENSSL_asc2uni(const char *asc, int asclen,
- unsigned char **uni, int *unilen)
+ unsigned char **uni, int *unilen)
{
int ulen, i;
unsigned char *unitmp;
@@ -75,7 +75,7 @@ char *OPENSSL_uni2asc(const unsigned char *uni, int unilen)
* bytes the string occupies, and treat it, the length, accordingly.
*/
unsigned char *OPENSSL_utf82uni(const char *asc, int asclen,
- unsigned char **uni, int *unilen)
+ unsigned char **uni, int *unilen)
{
int ulen, i, j;
unsigned char *unitmp, *ret;
@@ -85,7 +85,7 @@ unsigned char *OPENSSL_utf82uni(const char *asc, int asclen,
asclen = (int)strlen(asc);
for (ulen = 0, i = 0; i < asclen; i += j) {
- j = UTF8_getc((const unsigned char *)asc+i, asclen-i, &utf32chr);
+ j = UTF8_getc((const unsigned char *)asc + i, asclen - i, &utf32chr);
/*
* Following condition is somewhat opportunistic is sense that
@@ -106,34 +106,34 @@ unsigned char *OPENSSL_utf82uni(const char *asc, int asclen,
if (j < 0)
return OPENSSL_asc2uni(asc, asclen, uni, unilen);
- if (utf32chr > 0x10FFFF) /* UTF-16 cap */
+ if (utf32chr > 0x10FFFF) /* UTF-16 cap */
return NULL;
- if (utf32chr >= 0x10000) /* pair of UTF-16 characters */
- ulen += 2*2;
- else /* or just one */
+ if (utf32chr >= 0x10000) /* pair of UTF-16 characters */
+ ulen += 2 * 2;
+ else /* or just one */
ulen += 2;
}
- ulen += 2; /* for trailing UTF16 zero */
+ ulen += 2; /* for trailing UTF16 zero */
if ((ret = OPENSSL_malloc(ulen)) == NULL)
return NULL;
/* re-run the loop writing down UTF-16 characters in big-endian order */
for (unitmp = ret, i = 0; i < asclen; i += j) {
- j = UTF8_getc((const unsigned char *)asc+i, asclen-i, &utf32chr);
- if (utf32chr >= 0x10000) { /* pair if UTF-16 characters */
+ j = UTF8_getc((const unsigned char *)asc + i, asclen - i, &utf32chr);
+ if (utf32chr >= 0x10000) { /* pair if UTF-16 characters */
unsigned int hi, lo;
utf32chr -= 0x10000;
- hi = 0xD800 + (utf32chr>>10);
- lo = 0xDC00 + (utf32chr&0x3ff);
- *unitmp++ = (unsigned char)(hi>>8);
+ hi = 0xD800 + (utf32chr >> 10);
+ lo = 0xDC00 + (utf32chr & 0x3ff);
+ *unitmp++ = (unsigned char)(hi >> 8);
*unitmp++ = (unsigned char)(hi);
- *unitmp++ = (unsigned char)(lo>>8);
+ *unitmp++ = (unsigned char)(lo >> 8);
*unitmp++ = (unsigned char)(lo);
- } else { /* or just one */
- *unitmp++ = (unsigned char)(utf32chr>>8);
+ } else { /* or just one */
+ *unitmp++ = (unsigned char)(utf32chr >> 8);
*unitmp++ = (unsigned char)(utf32chr);
}
}
@@ -151,23 +151,27 @@ static int bmp_to_utf8(char *str, const unsigned char *utf16, int len)
{
unsigned long utf32chr;
- if (len == 0) return 0;
+ if (len == 0)
+ return 0;
- if (len < 2) return -1;
+ if (len < 2)
+ return -1;
/* pull UTF-16 character in big-endian order */
- utf32chr = (utf16[0]<<8) | utf16[1];
+ utf32chr = (utf16[0] << 8) | utf16[1];
- if (utf32chr >= 0xD800 && utf32chr < 0xE000) { /* two chars */
+ if (utf32chr >= 0xD800 && utf32chr < 0xE000) { /* two chars */
unsigned int lo;
- if (len < 4) return -1;
+ if (len < 4)
+ return -1;
utf32chr -= 0xD800;
utf32chr <<= 10;
- lo = (utf16[2]<<8) | utf16[3];
- if (lo < 0xDC00 || lo >= 0xE000) return -1;
- utf32chr |= lo-0xDC00;
+ lo = (utf16[2] << 8) | utf16[3];
+ if (lo < 0xDC00 || lo >= 0xE000)
+ return -1;
+ utf32chr |= lo - 0xDC00;
utf32chr += 0x10000;
}
@@ -183,36 +187,41 @@ char *OPENSSL_uni2utf8(const unsigned char *uni, int unilen)
if (unilen & 1)
return NULL;
- for (asclen = 0, i = 0; i < unilen; ) {
- j = bmp_to_utf8(NULL, uni+i, unilen-i);
+ for (asclen = 0, i = 0; i < unilen;) {
+ j = bmp_to_utf8(NULL, uni + i, unilen - i);
/*
* falling back to OPENSSL_uni2asc makes lesser sense [than
* falling back to OPENSSL_asc2uni in OPENSSL_utf82uni above],
* it's done rather to maintain symmetry...
*/
- if (j < 0) return OPENSSL_uni2asc(uni, unilen);
- if (j == 4) i += 4;
- else i += 2;
+ if (j < 0)
+ return OPENSSL_uni2asc(uni, unilen);
+ if (j == 4)
+ i += 4;
+ else
+ i += 2;
asclen += j;
}
/* If no terminating zero allow for one */
- if (!unilen || (uni[unilen-2]||uni[unilen - 1]))
+ if (!unilen || (uni[unilen - 2] || uni[unilen - 1]))
asclen++;
if ((asctmp = OPENSSL_malloc(asclen)) == NULL)
return NULL;
/* re-run the loop emitting UTF-8 string */
- for (asclen = 0, i = 0; i < unilen; ) {
- j = bmp_to_utf8(asctmp+asclen, uni+i, unilen-i);
- if (j == 4) i += 4;
- else i += 2;
+ for (asclen = 0, i = 0; i < unilen;) {
+ j = bmp_to_utf8(asctmp + asclen, uni + i, unilen - i);
+ if (j == 4)
+ i += 4;
+ else
+ i += 2;
asclen += j;
}
/* If no terminating zero write one */
- if (!unilen || (uni[unilen-2]||uni[unilen - 1]))
+ if (!unilen || (uni[unilen - 2] || uni[unilen - 1]))
asctmp[asclen] = '\0';
return asctmp;
diff --git a/crypto/pkcs12/pk12err.c b/crypto/pkcs12/pk12err.c
index 0e9507a462..5556f2ecee 100644
--- a/crypto/pkcs12/pk12err.c
+++ b/crypto/pkcs12/pk12err.c
@@ -15,41 +15,41 @@
#ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA PKCS12_str_reasons[] = {
- {ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_CALLBACK_FAILED), "callback failed"},
- {ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_CANT_PACK_STRUCTURE),
- "can't pack structure"},
- {ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_CONTENT_TYPE_NOT_DATA),
- "content type not data"},
- {ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_DECODE_ERROR), "decode error"},
- {ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_ENCODE_ERROR), "encode error"},
- {ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_ENCRYPT_ERROR), "encrypt error"},
- {ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_ERROR_SETTING_ENCRYPTED_DATA_TYPE),
- "error setting encrypted data type"},
- {ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_INVALID_NULL_ARGUMENT),
- "invalid null argument"},
- {ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_INVALID_NULL_PKCS12_POINTER),
- "invalid null pkcs12 pointer"},
- {ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_INVALID_SALT_LENGTH),
- "invalid salt length"},
- {ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_INVALID_TYPE), "invalid type"},
- {ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_IV_GEN_ERROR), "iv gen error"},
- {ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_KEY_GEN_ERROR), "key gen error"},
- {ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_MAC_ABSENT), "mac absent"},
- {ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_MAC_GENERATION_ERROR),
- "mac generation error"},
- {ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_MAC_SETUP_ERROR), "mac setup error"},
- {ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_MAC_STRING_SET_ERROR),
- "mac string set error"},
- {ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_MAC_VERIFY_FAILURE),
- "mac verify failure"},
- {ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_PARSE_ERROR), "parse error"},
- {ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_PKCS12_CIPHERFINAL_ERROR),
- "pkcs12 cipherfinal error"},
- {ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_UNKNOWN_DIGEST_ALGORITHM),
- "unknown digest algorithm"},
- {ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_UNSUPPORTED_PKCS12_MODE),
- "unsupported pkcs12 mode"},
- {0, NULL}
+ { ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_CALLBACK_FAILED), "callback failed" },
+ { ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_CANT_PACK_STRUCTURE),
+ "can't pack structure" },
+ { ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_CONTENT_TYPE_NOT_DATA),
+ "content type not data" },
+ { ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_DECODE_ERROR), "decode error" },
+ { ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_ENCODE_ERROR), "encode error" },
+ { ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_ENCRYPT_ERROR), "encrypt error" },
+ { ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_ERROR_SETTING_ENCRYPTED_DATA_TYPE),
+ "error setting encrypted data type" },
+ { ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_INVALID_NULL_ARGUMENT),
+ "invalid null argument" },
+ { ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_INVALID_NULL_PKCS12_POINTER),
+ "invalid null pkcs12 pointer" },
+ { ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_INVALID_SALT_LENGTH),
+ "invalid salt length" },
+ { ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_INVALID_TYPE), "invalid type" },
+ { ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_IV_GEN_ERROR), "iv gen error" },
+ { ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_KEY_GEN_ERROR), "key gen error" },
+ { ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_MAC_ABSENT), "mac absent" },
+ { ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_MAC_GENERATION_ERROR),
+ "mac generation error" },
+ { ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_MAC_SETUP_ERROR), "mac setup error" },
+ { ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_MAC_STRING_SET_ERROR),
+ "mac string set error" },
+ { ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_MAC_VERIFY_FAILURE),
+ "mac verify failure" },
+ { ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_PARSE_ERROR), "parse error" },
+ { ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_PKCS12_CIPHERFINAL_ERROR),
+ "pkcs12 cipherfinal error" },
+ { ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_UNKNOWN_DIGEST_ALGORITHM),
+ "unknown digest algorithm" },
+ { ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_UNSUPPORTED_PKCS12_MODE),
+ "unsupported pkcs12 mode" },
+ { 0, NULL }
};
#endif
diff --git a/crypto/pkcs7/pk7_asn1.c b/crypto/pkcs7/pk7_asn1.c
index 3abcc3dc88..733f3bb69d 100644
--- a/crypto/pkcs7/pk7_asn1.c
+++ b/crypto/pkcs7/pk7_asn1.c
@@ -21,17 +21,17 @@
ASN1_ADB_TEMPLATE(p7default) = ASN1_EXP_OPT(PKCS7, d.other, ASN1_ANY, 0);
ASN1_ADB(PKCS7) = {
- ADB_ENTRY(NID_pkcs7_data, ASN1_NDEF_EXP_OPT(PKCS7, d.data, ASN1_OCTET_STRING_NDEF, 0)),
- ADB_ENTRY(NID_pkcs7_signed, ASN1_NDEF_EXP_OPT(PKCS7, d.sign, PKCS7_SIGNED, 0)),
- ADB_ENTRY(NID_pkcs7_enveloped, ASN1_NDEF_EXP_OPT(PKCS7, d.enveloped, PKCS7_ENVELOPE, 0)),
- ADB_ENTRY(NID_pkcs7_signedAndEnveloped, ASN1_NDEF_EXP_OPT(PKCS7, d.signed_and_enveloped, PKCS7_SIGN_ENVELOPE, 0)),
- ADB_ENTRY(NID_pkcs7_digest, ASN1_NDEF_EXP_OPT(PKCS7, d.digest, PKCS7_DIGEST, 0)),
- ADB_ENTRY(NID_pkcs7_encrypted, ASN1_NDEF_EXP_OPT(PKCS7, d.encrypted, PKCS7_ENCRYPT, 0))
+ ADB_ENTRY(NID_pkcs7_data, ASN1_NDEF_EXP_OPT(PKCS7, d.data, ASN1_OCTET_STRING_NDEF, 0)),
+ ADB_ENTRY(NID_pkcs7_signed, ASN1_NDEF_EXP_OPT(PKCS7, d.sign, PKCS7_SIGNED, 0)),
+ ADB_ENTRY(NID_pkcs7_enveloped, ASN1_NDEF_EXP_OPT(PKCS7, d.enveloped, PKCS7_ENVELOPE, 0)),
+ ADB_ENTRY(NID_pkcs7_signedAndEnveloped, ASN1_NDEF_EXP_OPT(PKCS7, d.signed_and_enveloped, PKCS7_SIGN_ENVELOPE, 0)),
+ ADB_ENTRY(NID_pkcs7_digest, ASN1_NDEF_EXP_OPT(PKCS7, d.digest, PKCS7_DIGEST, 0)),
+ ADB_ENTRY(NID_pkcs7_encrypted, ASN1_NDEF_EXP_OPT(PKCS7, d.encrypted, PKCS7_ENCRYPT, 0))
} ASN1_ADB_END(PKCS7, 0, type, 0, &p7default_tt, NULL);
/* PKCS#7 streaming support */
static int pk7_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
- void *exarg)
+ void *exarg)
{
ASN1_STREAM_ARG *sarg = exarg;
PKCS7 **pp7 = (PKCS7 **)pval;
@@ -53,15 +53,14 @@ static int pk7_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
if (PKCS7_dataFinal(*pp7, sarg->ndef_bio) <= 0)
return 0;
break;
-
}
return 1;
}
ASN1_NDEF_SEQUENCE_cb(PKCS7, pk7_cb) = {
- ASN1_SIMPLE(PKCS7, type, ASN1_OBJECT),
- ASN1_ADB_OBJECT(PKCS7)
-}ASN1_NDEF_SEQUENCE_END_cb(PKCS7, PKCS7)
+ ASN1_SIMPLE(PKCS7, type, ASN1_OBJECT),
+ ASN1_ADB_OBJECT(PKCS7)
+} ASN1_NDEF_SEQUENCE_END_cb(PKCS7, PKCS7)
PKCS7 *d2i_PKCS7(PKCS7 **a, const unsigned char **in, long len)
{
@@ -75,7 +74,7 @@ PKCS7 *d2i_PKCS7(PKCS7 **a, const unsigned char **in, long len)
}
ret = (PKCS7 *)ASN1_item_d2i_ex((ASN1_VALUE **)a, in, len, (PKCS7_it()),
- libctx, propq);
+ libctx, propq);
if (ret != NULL)
ossl_pkcs7_resolve_libctx(ret);
return ret;
@@ -83,7 +82,7 @@ PKCS7 *d2i_PKCS7(PKCS7 **a, const unsigned char **in, long len)
int i2d_PKCS7(const PKCS7 *a, unsigned char **out)
{
- return ASN1_item_i2d((const ASN1_VALUE *)a, out, (PKCS7_it()));\
+ return ASN1_item_i2d((const ASN1_VALUE *)a, out, (PKCS7_it()));
}
PKCS7 *PKCS7_new(void)
@@ -94,7 +93,7 @@ PKCS7 *PKCS7_new(void)
PKCS7 *PKCS7_new_ex(OSSL_LIB_CTX *libctx, const char *propq)
{
PKCS7 *pkcs7 = (PKCS7 *)ASN1_item_new_ex(ASN1_ITEM_rptr(PKCS7), libctx,
- propq);
+ propq);
if (pkcs7 != NULL) {
pkcs7->ctx.libctx = libctx;
@@ -123,19 +122,19 @@ IMPLEMENT_ASN1_NDEF_FUNCTION(PKCS7)
IMPLEMENT_ASN1_DUP_FUNCTION(PKCS7)
ASN1_NDEF_SEQUENCE(PKCS7_SIGNED) = {
- ASN1_SIMPLE(PKCS7_SIGNED, version, ASN1_INTEGER),
- ASN1_SET_OF(PKCS7_SIGNED, md_algs, X509_ALGOR),
- ASN1_SIMPLE(PKCS7_SIGNED, contents, PKCS7),
- ASN1_IMP_SEQUENCE_OF_OPT(PKCS7_SIGNED, cert, X509, 0),
- ASN1_IMP_SET_OF_OPT(PKCS7_SIGNED, crl, X509_CRL, 1),
- ASN1_SET_OF(PKCS7_SIGNED, signer_info, PKCS7_SIGNER_INFO)
+ ASN1_SIMPLE(PKCS7_SIGNED, version, ASN1_INTEGER),
+ ASN1_SET_OF(PKCS7_SIGNED, md_algs, X509_ALGOR),
+ ASN1_SIMPLE(PKCS7_SIGNED, contents, PKCS7),
+ ASN1_IMP_SEQUENCE_OF_OPT(PKCS7_SIGNED, cert, X509, 0),
+ ASN1_IMP_SET_OF_OPT(PKCS7_SIGNED, crl, X509_CRL, 1),
+ ASN1_SET_OF(PKCS7_SIGNED, signer_info, PKCS7_SIGNER_INFO)
} ASN1_NDEF_SEQUENCE_END(PKCS7_SIGNED)
IMPLEMENT_ASN1_FUNCTIONS(PKCS7_SIGNED)
/* Minor tweak to operation: free up EVP_PKEY */
static int si_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
- void *exarg)
+ void *exarg)
{
if (operation == ASN1_OP_FREE_POST) {
PKCS7_SIGNER_INFO *si = (PKCS7_SIGNER_INFO *)*pval;
@@ -145,40 +144,40 @@ static int si_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
}
ASN1_SEQUENCE_cb(PKCS7_SIGNER_INFO, si_cb) = {
- ASN1_SIMPLE(PKCS7_SIGNER_INFO, version, ASN1_INTEGER),
- ASN1_SIMPLE(PKCS7_SIGNER_INFO, issuer_and_serial, PKCS7_ISSUER_AND_SERIAL),
- ASN1_SIMPLE(PKCS7_SIGNER_INFO, digest_alg, X509_ALGOR),
- /* NB this should be a SET OF but we use a SEQUENCE OF so the
- * original order * is retained when the structure is reencoded.
- * Since the attributes are implicitly tagged this will not affect
- * the encoding.
- */
- ASN1_IMP_SEQUENCE_OF_OPT(PKCS7_SIGNER_INFO, auth_attr, X509_ATTRIBUTE, 0),
- ASN1_SIMPLE(PKCS7_SIGNER_INFO, digest_enc_alg, X509_ALGOR),
- ASN1_SIMPLE(PKCS7_SIGNER_INFO, enc_digest, ASN1_OCTET_STRING),
- ASN1_IMP_SET_OF_OPT(PKCS7_SIGNER_INFO, unauth_attr, X509_ATTRIBUTE, 1)
+ ASN1_SIMPLE(PKCS7_SIGNER_INFO, version, ASN1_INTEGER),
+ ASN1_SIMPLE(PKCS7_SIGNER_INFO, issuer_and_serial, PKCS7_ISSUER_AND_SERIAL),
+ ASN1_SIMPLE(PKCS7_SIGNER_INFO, digest_alg, X509_ALGOR),
+ /* NB this should be a SET OF but we use a SEQUENCE OF so the
+ * original order * is retained when the structure is reencoded.
+ * Since the attributes are implicitly tagged this will not affect
+ * the encoding.
+ */
+ ASN1_IMP_SEQUENCE_OF_OPT(PKCS7_SIGNER_INFO, auth_attr, X509_ATTRIBUTE, 0),
+ ASN1_SIMPLE(PKCS7_SIGNER_INFO, digest_enc_alg, X509_ALGOR),
+ ASN1_SIMPLE(PKCS7_SIGNER_INFO, enc_digest, ASN1_OCTET_STRING),
+ ASN1_IMP_SET_OF_OPT(PKCS7_SIGNER_INFO, unauth_attr, X509_ATTRIBUTE, 1)
} ASN1_SEQUENCE_END_cb(PKCS7_SIGNER_INFO, PKCS7_SIGNER_INFO)
IMPLEMENT_ASN1_FUNCTIONS(PKCS7_SIGNER_INFO)
ASN1_SEQUENCE(PKCS7_ISSUER_AND_SERIAL) = {
- ASN1_SIMPLE(PKCS7_ISSUER_AND_SERIAL, issuer, X509_NAME),
- ASN1_SIMPLE(PKCS7_ISSUER_AND_SERIAL, serial, ASN1_INTEGER)
+ ASN1_SIMPLE(PKCS7_ISSUER_AND_SERIAL, issuer, X509_NAME),
+ ASN1_SIMPLE(PKCS7_ISSUER_AND_SERIAL, serial, ASN1_INTEGER)
} ASN1_SEQUENCE_END(PKCS7_ISSUER_AND_SERIAL)
IMPLEMENT_ASN1_FUNCTIONS(PKCS7_ISSUER_AND_SERIAL)
ASN1_NDEF_SEQUENCE(PKCS7_ENVELOPE) = {
- ASN1_SIMPLE(PKCS7_ENVELOPE, version, ASN1_INTEGER),
- ASN1_SET_OF(PKCS7_ENVELOPE, recipientinfo, PKCS7_RECIP_INFO),
- ASN1_SIMPLE(PKCS7_ENVELOPE, enc_data, PKCS7_ENC_CONTENT)
+ ASN1_SIMPLE(PKCS7_ENVELOPE, version, ASN1_INTEGER),
+ ASN1_SET_OF(PKCS7_ENVELOPE, recipientinfo, PKCS7_RECIP_INFO),
+ ASN1_SIMPLE(PKCS7_ENVELOPE, enc_data, PKCS7_ENC_CONTENT)
} ASN1_NDEF_SEQUENCE_END(PKCS7_ENVELOPE)
IMPLEMENT_ASN1_FUNCTIONS(PKCS7_ENVELOPE)
/* Minor tweak to operation: free up X509 */
static int ri_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
- void *exarg)
+ void *exarg)
{
if (operation == ASN1_OP_FREE_POST) {
PKCS7_RECIP_INFO *ri = (PKCS7_RECIP_INFO *)*pval;
@@ -188,46 +187,46 @@ static int ri_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
}
ASN1_SEQUENCE_cb(PKCS7_RECIP_INFO, ri_cb) = {
- ASN1_SIMPLE(PKCS7_RECIP_INFO, version, ASN1_INTEGER),
- ASN1_SIMPLE(PKCS7_RECIP_INFO, issuer_and_serial, PKCS7_ISSUER_AND_SERIAL),
- ASN1_SIMPLE(PKCS7_RECIP_INFO, key_enc_algor, X509_ALGOR),
- ASN1_SIMPLE(PKCS7_RECIP_INFO, enc_key, ASN1_OCTET_STRING)
+ ASN1_SIMPLE(PKCS7_RECIP_INFO, version, ASN1_INTEGER),
+ ASN1_SIMPLE(PKCS7_RECIP_INFO, issuer_and_serial, PKCS7_ISSUER_AND_SERIAL),
+ ASN1_SIMPLE(PKCS7_RECIP_INFO, key_enc_algor, X509_ALGOR),
+ ASN1_SIMPLE(PKCS7_RECIP_INFO, enc_key, ASN1_OCTET_STRING)
} ASN1_SEQUENCE_END_cb(PKCS7_RECIP_INFO, PKCS7_RECIP_INFO)
IMPLEMENT_ASN1_FUNCTIONS(PKCS7_RECIP_INFO)
ASN1_NDEF_SEQUENCE(PKCS7_ENC_CONTENT) = {
- ASN1_SIMPLE(PKCS7_ENC_CONTENT, content_type, ASN1_OBJECT),
- ASN1_SIMPLE(PKCS7_ENC_CONTENT, algorithm, X509_ALGOR),
- ASN1_IMP_OPT(PKCS7_ENC_CONTENT, enc_data, ASN1_OCTET_STRING_NDEF, 0)
+ ASN1_SIMPLE(PKCS7_ENC_CONTENT, content_type, ASN1_OBJECT),
+ ASN1_SIMPLE(PKCS7_ENC_CONTENT, algorithm, X509_ALGOR),
+ ASN1_IMP_OPT(PKCS7_ENC_CONTENT, enc_data, ASN1_OCTET_STRING_NDEF, 0)
} ASN1_NDEF_SEQUENCE_END(PKCS7_ENC_CONTENT)
IMPLEMENT_ASN1_FUNCTIONS(PKCS7_ENC_CONTENT)
ASN1_NDEF_SEQUENCE(PKCS7_SIGN_ENVELOPE) = {
- ASN1_SIMPLE(PKCS7_SIGN_ENVELOPE, version, ASN1_INTEGER),
- ASN1_SET_OF(PKCS7_SIGN_ENVELOPE, recipientinfo, PKCS7_RECIP_INFO),
- ASN1_SET_OF(PKCS7_SIGN_ENVELOPE, md_algs, X509_ALGOR),
- ASN1_SIMPLE(PKCS7_SIGN_ENVELOPE, enc_data, PKCS7_ENC_CONTENT),
- ASN1_IMP_SET_OF_OPT(PKCS7_SIGN_ENVELOPE, cert, X509, 0),
- ASN1_IMP_SET_OF_OPT(PKCS7_SIGN_ENVELOPE, crl, X509_CRL, 1),
- ASN1_SET_OF(PKCS7_SIGN_ENVELOPE, signer_info, PKCS7_SIGNER_INFO)
+ ASN1_SIMPLE(PKCS7_SIGN_ENVELOPE, version, ASN1_INTEGER),
+ ASN1_SET_OF(PKCS7_SIGN_ENVELOPE, recipientinfo, PKCS7_RECIP_INFO),
+ ASN1_SET_OF(PKCS7_SIGN_ENVELOPE, md_algs, X509_ALGOR),
+ ASN1_SIMPLE(PKCS7_SIGN_ENVELOPE, enc_data, PKCS7_ENC_CONTENT),
+ ASN1_IMP_SET_OF_OPT(PKCS7_SIGN_ENVELOPE, cert, X509, 0),
+ ASN1_IMP_SET_OF_OPT(PKCS7_SIGN_ENVELOPE, crl, X509_CRL, 1),
+ ASN1_SET_OF(PKCS7_SIGN_ENVELOPE, signer_info, PKCS7_SIGNER_INFO)
} ASN1_NDEF_SEQUENCE_END(PKCS7_SIGN_ENVELOPE)
IMPLEMENT_ASN1_FUNCTIONS(PKCS7_SIGN_ENVELOPE)
ASN1_NDEF_SEQUENCE(PKCS7_ENCRYPT) = {
- ASN1_SIMPLE(PKCS7_ENCRYPT, version, ASN1_INTEGER),
- ASN1_SIMPLE(PKCS7_ENCRYPT, enc_data, PKCS7_ENC_CONTENT)
+ ASN1_SIMPLE(PKCS7_ENCRYPT, version, ASN1_INTEGER),
+ ASN1_SIMPLE(PKCS7_ENCRYPT, enc_data, PKCS7_ENC_CONTENT)
} ASN1_NDEF_SEQUENCE_END(PKCS7_ENCRYPT)
IMPLEMENT_ASN1_FUNCTIONS(PKCS7_ENCRYPT)
ASN1_NDEF_SEQUENCE(PKCS7_DIGEST) = {
- ASN1_SIMPLE(PKCS7_DIGEST, version, ASN1_INTEGER),
- ASN1_SIMPLE(PKCS7_DIGEST, md, X509_ALGOR),
- ASN1_SIMPLE(PKCS7_DIGEST, contents, PKCS7),
- ASN1_SIMPLE(PKCS7_DIGEST, digest, ASN1_OCTET_STRING)
+ ASN1_SIMPLE(PKCS7_DIGEST, version, ASN1_INTEGER),
+ ASN1_SIMPLE(PKCS7_DIGEST, md, X509_ALGOR),
+ ASN1_SIMPLE(PKCS7_DIGEST, contents, PKCS7),
+ ASN1_SIMPLE(PKCS7_DIGEST, digest, ASN1_OCTET_STRING)
} ASN1_NDEF_SEQUENCE_END(PKCS7_DIGEST)
IMPLEMENT_ASN1_FUNCTIONS(PKCS7_DIGEST)
@@ -239,8 +238,7 @@ IMPLEMENT_ASN1_FUNCTIONS(PKCS7_DIGEST)
* encoding.
*/
-ASN1_ITEM_TEMPLATE(PKCS7_ATTR_SIGN) =
- ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SET_ORDER, 0, PKCS7_ATTRIBUTES, X509_ATTRIBUTE)
+ASN1_ITEM_TEMPLATE(PKCS7_ATTR_SIGN) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SET_ORDER, 0, PKCS7_ATTRIBUTES, X509_ATTRIBUTE)
ASN1_ITEM_TEMPLATE_END(PKCS7_ATTR_SIGN)
/*
@@ -248,9 +246,8 @@ ASN1_ITEM_TEMPLATE_END(PKCS7_ATTR_SIGN)
* SEQUENCE OF and tag it to SET OF
*/
-ASN1_ITEM_TEMPLATE(PKCS7_ATTR_VERIFY) =
- ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF | ASN1_TFLG_IMPTAG | ASN1_TFLG_UNIVERSAL,
- V_ASN1_SET, PKCS7_ATTRIBUTES, X509_ATTRIBUTE)
+ASN1_ITEM_TEMPLATE(PKCS7_ATTR_VERIFY) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF | ASN1_TFLG_IMPTAG | ASN1_TFLG_UNIVERSAL,
+ V_ASN1_SET, PKCS7_ATTRIBUTES, X509_ATTRIBUTE)
ASN1_ITEM_TEMPLATE_END(PKCS7_ATTR_VERIFY)
IMPLEMENT_ASN1_PRINT_FUNCTION(PKCS7)
diff --git a/crypto/pkcs7/pk7_attr.c b/crypto/pkcs7/pk7_attr.c
index df83574eaa..a1c09840e8 100644
--- a/crypto/pkcs7/pk7_attr.c
+++ b/crypto/pkcs7/pk7_attr.c
@@ -18,7 +18,7 @@
#include <openssl/err.h>
int PKCS7_add_attrib_smimecap(PKCS7_SIGNER_INFO *si,
- STACK_OF(X509_ALGOR) *cap)
+ STACK_OF(X509_ALGOR) *cap)
{
ASN1_STRING *seq;
@@ -27,13 +27,13 @@ int PKCS7_add_attrib_smimecap(PKCS7_SIGNER_INFO *si,
return 0;
}
seq->length = ASN1_item_i2d((ASN1_VALUE *)cap, &seq->data,
- ASN1_ITEM_rptr(X509_ALGORS));
+ ASN1_ITEM_rptr(X509_ALGORS));
if (seq->length <= 0 || seq->data == NULL) {
ASN1_STRING_free(seq);
return 1;
}
if (!PKCS7_add_signed_attribute(si, NID_SMIMECapabilities,
- V_ASN1_SEQUENCE, seq)) {
+ V_ASN1_SEQUENCE, seq)) {
ASN1_STRING_free(seq);
return 0;
}
@@ -51,7 +51,7 @@ STACK_OF(X509_ALGOR) *PKCS7_get_smimecap(PKCS7_SIGNER_INFO *si)
p = cap->value.sequence->data;
return (STACK_OF(X509_ALGOR) *)
ASN1_item_d2i(NULL, &p, cap->value.sequence->length,
- ASN1_ITEM_rptr(X509_ALGORS));
+ ASN1_ITEM_rptr(X509_ALGORS));
}
/* Basic smime-capabilities OID and optional integer arg */
@@ -101,7 +101,7 @@ int PKCS7_add_attrib_content_type(PKCS7_SIGNER_INFO *si, ASN1_OBJECT *coid)
if (!coid)
coid = OBJ_nid2obj(NID_pkcs7_data);
return PKCS7_add_signed_attribute(si, NID_pkcs9_contentType,
- V_ASN1_OBJECT, coid);
+ V_ASN1_OBJECT, coid);
}
int PKCS7_add0_attrib_signing_time(PKCS7_SIGNER_INFO *si, ASN1_TIME *t)
@@ -113,7 +113,7 @@ int PKCS7_add0_attrib_signing_time(PKCS7_SIGNER_INFO *si, ASN1_TIME *t)
return 0;
}
if (!PKCS7_add_signed_attribute(si, NID_pkcs9_signingTime,
- V_ASN1_UTCTIME, t)) {
+ V_ASN1_UTCTIME, t)) {
ASN1_TIME_free(tmp);
return 0;
}
@@ -121,7 +121,7 @@ int PKCS7_add0_attrib_signing_time(PKCS7_SIGNER_INFO *si, ASN1_TIME *t)
}
int PKCS7_add1_attrib_digest(PKCS7_SIGNER_INFO *si,
- const unsigned char *md, int mdlen)
+ const unsigned char *md, int mdlen)
{
ASN1_OCTET_STRING *os;
os = ASN1_OCTET_STRING_new();
@@ -129,7 +129,7 @@ int PKCS7_add1_attrib_digest(PKCS7_SIGNER_INFO *si,
return 0;
if (!ASN1_STRING_set(os, md, mdlen)
|| !PKCS7_add_signed_attribute(si, NID_pkcs9_messageDigest,
- V_ASN1_OCTET_STRING, os)) {
+ V_ASN1_OCTET_STRING, os)) {
ASN1_OCTET_STRING_free(os);
return 0;
}
diff --git a/crypto/pkcs7/pk7_doit.c b/crypto/pkcs7/pk7_doit.c
index f0b9486160..02444d983c 100644
--- a/crypto/pkcs7/pk7_doit.c
+++ b/crypto/pkcs7/pk7_doit.c
@@ -19,7 +19,7 @@
#include "pk7_local.h"
static int add_attribute(STACK_OF(X509_ATTRIBUTE) **sk, int nid, int atrtype,
- void *value);
+ void *value);
static ASN1_TYPE *get_attribute(const STACK_OF(X509_ATTRIBUTE) *sk, int nid);
int PKCS7_type_is_other(PKCS7 *p7)
@@ -42,7 +42,6 @@ int PKCS7_type_is_other(PKCS7 *p7)
}
return isOther;
-
}
ASN1_OCTET_STRING *PKCS7_get_octet_string(PKCS7 *p7)
@@ -71,9 +70,9 @@ static ASN1_OCTET_STRING *pkcs7_get1_data(PKCS7 *p7)
/* General case for PKCS#7 content, see RFC 2315 section-7 */
if (PKCS7_type_is_other(p7) && (p7->d.other != NULL)
- && (p7->d.other->type == V_ASN1_SEQUENCE)
- && (p7->d.other->value.sequence != NULL)
- && (p7->d.other->value.sequence->length > 0)) {
+ && (p7->d.other->type == V_ASN1_SEQUENCE)
+ && (p7->d.other->value.sequence != NULL)
+ && (p7->d.other->value.sequence->length > 0)) {
const unsigned char *data = p7->d.other->value.sequence->data;
long len;
int inf, tag, class;
@@ -82,9 +81,9 @@ static ASN1_OCTET_STRING *pkcs7_get1_data(PKCS7 *p7)
if (os == NULL)
return NULL;
inf = ASN1_get_object(&data, &len, &tag, &class,
- p7->d.other->value.sequence->length);
+ p7->d.other->value.sequence->length);
if (inf != V_ASN1_CONSTRUCTED || tag != V_ASN1_SEQUENCE
- || !ASN1_OCTET_STRING_set(os, data, len)) {
+ || !ASN1_OCTET_STRING_set(os, data, len)) {
ASN1_OCTET_STRING_free(os);
os = NULL;
}
@@ -93,7 +92,7 @@ static ASN1_OCTET_STRING *pkcs7_get1_data(PKCS7 *p7)
}
static int pkcs7_bio_add_digest(BIO **pbio, X509_ALGOR *alg,
- const PKCS7_CTX *ctx)
+ const PKCS7_CTX *ctx)
{
BIO *btmp;
char name[OSSL_MAX_NAME_SIZE];
@@ -109,7 +108,7 @@ static int pkcs7_bio_add_digest(BIO **pbio, X509_ALGOR *alg,
(void)ERR_set_mark();
fetched = EVP_MD_fetch(ossl_pkcs7_ctx_get0_libctx(ctx), name,
- ossl_pkcs7_ctx_get0_propq(ctx));
+ ossl_pkcs7_ctx_get0_propq(ctx));
if (fetched != NULL)
md = fetched;
else
@@ -138,13 +137,13 @@ static int pkcs7_bio_add_digest(BIO **pbio, X509_ALGOR *alg,
return 1;
- err:
+err:
BIO_free(btmp);
return 0;
}
static int pkcs7_encode_rinfo(PKCS7_RECIP_INFO *ri,
- unsigned char *key, int keylen)
+ unsigned char *key, int keylen)
{
EVP_PKEY_CTX *pctx = NULL;
EVP_PKEY *pkey = NULL;
@@ -158,7 +157,7 @@ static int pkcs7_encode_rinfo(PKCS7_RECIP_INFO *ri,
return 0;
pctx = EVP_PKEY_CTX_new_from_pkey(ossl_pkcs7_ctx_get0_libctx(ctx), pkey,
- ossl_pkcs7_ctx_get0_propq(ctx));
+ ossl_pkcs7_ctx_get0_propq(ctx));
if (pctx == NULL)
return 0;
@@ -180,16 +179,15 @@ static int pkcs7_encode_rinfo(PKCS7_RECIP_INFO *ri,
ret = 1;
- err:
+err:
EVP_PKEY_CTX_free(pctx);
OPENSSL_free(ek);
return ret;
-
}
static int pkcs7_decrypt_rinfo(unsigned char **pek, int *peklen,
- PKCS7_RECIP_INFO *ri, EVP_PKEY *pkey,
- size_t fixlen)
+ PKCS7_RECIP_INFO *ri, EVP_PKEY *pkey,
+ size_t fixlen)
{
EVP_PKEY_CTX *pctx = NULL;
unsigned char *ek = NULL;
@@ -198,7 +196,7 @@ static int pkcs7_decrypt_rinfo(unsigned char **pek, int *peklen,
const PKCS7_CTX *ctx = ri->ctx;
pctx = EVP_PKEY_CTX_new_from_pkey(ossl_pkcs7_ctx_get0_libctx(ctx), pkey,
- ossl_pkcs7_ctx_get0_propq(ctx));
+ ossl_pkcs7_ctx_get0_propq(ctx));
if (pctx == NULL)
return -1;
@@ -213,7 +211,7 @@ static int pkcs7_decrypt_rinfo(unsigned char **pek, int *peklen,
EVP_PKEY_CTX_ctrl_str(pctx, "rsa_pkcs1_implicit_rejection", "0");
ret = evp_pkey_decrypt_alloc(pctx, &ek, &eklen, fixlen,
- ri->enc_key->data, ri->enc_key->length);
+ ri->enc_key->data, ri->enc_key->length);
if (ret <= 0)
goto err;
@@ -223,7 +221,7 @@ static int pkcs7_decrypt_rinfo(unsigned char **pek, int *peklen,
*pek = ek;
*peklen = (int)eklen;
- err:
+err:
EVP_PKEY_CTX_free(pctx);
if (!ret)
OPENSSL_free(ek);
@@ -336,8 +334,8 @@ BIO *PKCS7_dataInit(PKCS7 *p7, BIO *bio)
(void)ERR_set_mark();
fetched_cipher = EVP_CIPHER_fetch(libctx,
- EVP_CIPHER_get0_name(evp_cipher),
- propq);
+ EVP_CIPHER_get0_name(evp_cipher),
+ propq);
(void)ERR_pop_to_mark();
if (fetched_cipher != NULL)
cipher = fetched_cipher;
@@ -416,7 +414,7 @@ BIO *PKCS7_dataInit(PKCS7 *p7, BIO *bio)
ASN1_OCTET_STRING_free(os);
return out;
- err:
+err:
ASN1_OCTET_STRING_free(os);
EVP_CIPHER_free(fetched_cipher);
BIO_free_all(out);
@@ -428,11 +426,11 @@ static int pkcs7_cmp_ri(PKCS7_RECIP_INFO *ri, X509 *pcert)
{
int ret;
ret = X509_NAME_cmp(ri->issuer_and_serial->issuer,
- X509_get_issuer_name(pcert));
+ X509_get_issuer_name(pcert));
if (ret)
return ret;
return ASN1_INTEGER_cmp(X509_get0_serialNumber(pcert),
- ri->issuer_and_serial->serial);
+ ri->issuer_and_serial->serial);
}
/* int */
@@ -609,7 +607,7 @@ BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert)
}
if (ri == NULL) {
ERR_raise(ERR_LIB_PKCS7,
- PKCS7_R_NO_RECIPIENT_MATCHES_CERTIFICATE);
+ PKCS7_R_NO_RECIPIENT_MATCHES_CERTIFICATE);
goto err;
}
}
@@ -624,7 +622,8 @@ BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert)
ri = sk_PKCS7_RECIP_INFO_value(rsk, i);
ri->ctx = p7_ctx;
if (pkcs7_decrypt_rinfo(&ek, &eklen, ri, pkey,
- EVP_CIPHER_get_key_length(cipher)) < 0)
+ EVP_CIPHER_get_key_length(cipher))
+ < 0)
goto err;
ERR_clear_error();
}
@@ -707,7 +706,7 @@ BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert)
EVP_CIPHER_free(evp_cipher);
return out;
- err:
+err:
EVP_CIPHER_free(evp_cipher);
OPENSSL_clear_free(ek, eklen);
OPENSSL_clear_free(tkey, tkeylen);
@@ -894,8 +893,8 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
goto err;
if (!EVP_SignFinal_ex(ctx_tmp, abuf, &abuflen, si->pkey,
- ossl_pkcs7_ctx_get0_libctx(p7_ctx),
- ossl_pkcs7_ctx_get0_propq(p7_ctx))) {
+ ossl_pkcs7_ctx_get0_libctx(p7_ctx),
+ ossl_pkcs7_ctx_get0_propq(p7_ctx))) {
OPENSSL_free(abuf);
ERR_raise(ERR_LIB_PKCS7, ERR_R_EVP_LIB);
goto err;
@@ -907,7 +906,7 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
unsigned char md_data[EVP_MAX_MD_SIZE];
unsigned int md_len;
if (!PKCS7_find_digest(&mdc, bio,
- OBJ_obj2nid(p7->d.digest->md->algorithm)))
+ OBJ_obj2nid(p7->d.digest->md->algorithm)))
goto err;
if (!EVP_DigestFinal_ex(mdc, md_data, &md_len))
goto err;
@@ -941,7 +940,7 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
}
}
ret = 1;
- err:
+err:
EVP_MD_CTX_free(ctx_tmp);
return ret;
}
@@ -967,13 +966,14 @@ int PKCS7_SIGNER_INFO_sign(PKCS7_SIGNER_INFO *si)
}
if (EVP_DigestSignInit_ex(mctx, &pctx, EVP_MD_get0_name(md),
- ossl_pkcs7_ctx_get0_libctx(ctx),
- ossl_pkcs7_ctx_get0_propq(ctx), si->pkey,
- NULL) <= 0)
+ ossl_pkcs7_ctx_get0_libctx(ctx),
+ ossl_pkcs7_ctx_get0_propq(ctx), si->pkey,
+ NULL)
+ <= 0)
goto err;
alen = ASN1_item_i2d((ASN1_VALUE *)si->auth_attr, &abuf,
- ASN1_ITEM_rptr(PKCS7_ATTR_SIGN));
+ ASN1_ITEM_rptr(PKCS7_ATTR_SIGN));
if (alen < 0 || abuf == NULL)
goto err;
if (EVP_DigestSignUpdate(mctx, abuf, alen) <= 0)
@@ -994,7 +994,7 @@ int PKCS7_SIGNER_INFO_sign(PKCS7_SIGNER_INFO *si)
return 1;
- err:
+err:
OPENSSL_free(abuf);
EVP_MD_CTX_free(mctx);
return 0;
@@ -1002,7 +1002,7 @@ int PKCS7_SIGNER_INFO_sign(PKCS7_SIGNER_INFO *si)
/* This partly overlaps with PKCS7_verify(). It does not support flags. */
int PKCS7_dataVerify(X509_STORE *cert_store, X509_STORE_CTX *ctx, BIO *bio,
- PKCS7 *p7, PKCS7_SIGNER_INFO *si)
+ PKCS7 *p7, PKCS7_SIGNER_INFO *si)
{
PKCS7_ISSUER_AND_SERIAL *ias;
int ret = 0, i;
@@ -1056,12 +1056,12 @@ int PKCS7_dataVerify(X509_STORE *cert_store, X509_STORE_CTX *ctx, BIO *bio,
}
return PKCS7_signatureVerify(bio, p7, si, signer);
- err:
+err:
return ret;
}
int PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si,
- X509 *signer)
+ X509 *signer)
{
ASN1_OCTET_STRING *os;
EVP_MD_CTX *mdc_tmp, *mdc;
@@ -1092,8 +1092,7 @@ int PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si,
btmp = bio;
for (;;) {
- if ((btmp == NULL) ||
- ((btmp = BIO_find_type(btmp, BIO_TYPE_MD)) == NULL)) {
+ if ((btmp == NULL) || ((btmp = BIO_find_type(btmp, BIO_TYPE_MD)) == NULL)) {
ERR_raise(ERR_LIB_PKCS7, PKCS7_R_UNABLE_TO_FIND_MESSAGE_DIGEST);
goto err;
}
@@ -1134,8 +1133,7 @@ int PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si,
ERR_raise(ERR_LIB_PKCS7, PKCS7_R_UNABLE_TO_FIND_MESSAGE_DIGEST);
goto err;
}
- if ((message_digest->length != (int)md_len) ||
- (memcmp(message_digest->data, md_dat, md_len))) {
+ if ((message_digest->length != (int)md_len) || (memcmp(message_digest->data, md_dat, md_len))) {
ERR_raise(ERR_LIB_PKCS7, PKCS7_R_DIGEST_FAILURE);
ret = -1;
goto err;
@@ -1156,7 +1154,7 @@ int PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si,
(void)ERR_pop_to_mark();
alen = ASN1_item_i2d((ASN1_VALUE *)sk, &abuf,
- ASN1_ITEM_rptr(PKCS7_ATTR_VERIFY));
+ ASN1_ITEM_rptr(PKCS7_ATTR_VERIFY));
if (alen <= 0 || abuf == NULL) {
ERR_raise(ERR_LIB_PKCS7, ERR_R_ASN1_LIB);
ret = -1;
@@ -1180,7 +1178,7 @@ int PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si,
goto err;
}
ret = 1;
- err:
+err:
OPENSSL_free(abuf);
EVP_MD_CTX_free(mdc_tmp);
EVP_MD_free(fetched_md);
@@ -1235,7 +1233,7 @@ ASN1_OCTET_STRING *PKCS7_digest_from_attributes(STACK_OF(X509_ATTRIBUTE) *sk)
}
int PKCS7_set_signed_attributes(PKCS7_SIGNER_INFO *p7si,
- STACK_OF(X509_ATTRIBUTE) *sk)
+ STACK_OF(X509_ATTRIBUTE) *sk)
{
sk_X509_ATTRIBUTE_pop_free(p7si->auth_attr, X509_ATTRIBUTE_free);
p7si->auth_attr = sk_X509_ATTRIBUTE_deep_copy(sk, X509_ATTRIBUTE_dup, X509_ATTRIBUTE_free);
@@ -1245,7 +1243,7 @@ int PKCS7_set_signed_attributes(PKCS7_SIGNER_INFO *p7si,
}
int PKCS7_set_attributes(PKCS7_SIGNER_INFO *p7si,
- STACK_OF(X509_ATTRIBUTE) *sk)
+ STACK_OF(X509_ATTRIBUTE) *sk)
{
sk_X509_ATTRIBUTE_pop_free(p7si->unauth_attr, X509_ATTRIBUTE_free);
p7si->unauth_attr = sk_X509_ATTRIBUTE_deep_copy(sk, X509_ATTRIBUTE_dup, X509_ATTRIBUTE_free);
@@ -1255,19 +1253,19 @@ int PKCS7_set_attributes(PKCS7_SIGNER_INFO *p7si,
}
int PKCS7_add_signed_attribute(PKCS7_SIGNER_INFO *p7si, int nid, int atrtype,
- void *value)
+ void *value)
{
return add_attribute(&(p7si->auth_attr), nid, atrtype, value);
}
int PKCS7_add_attribute(PKCS7_SIGNER_INFO *p7si, int nid, int atrtype,
- void *value)
+ void *value)
{
return add_attribute(&(p7si->unauth_attr), nid, atrtype, value);
}
static int add_attribute(STACK_OF(X509_ATTRIBUTE) **sk, int nid, int atrtype,
- void *value)
+ void *value)
{
X509_ATTRIBUTE *attr = NULL;
int i, n;
@@ -1285,7 +1283,7 @@ static int add_attribute(STACK_OF(X509_ATTRIBUTE) **sk, int nid, int atrtype,
if (!sk_X509_ATTRIBUTE_push(*sk, NULL))
return 0;
- end:
+end:
attr = X509_ATTRIBUTE_create(nid, atrtype, value);
if (attr == NULL) {
if (i == n)
@@ -1293,6 +1291,6 @@ static int add_attribute(STACK_OF(X509_ATTRIBUTE) **sk, int nid, int atrtype,
return 0;
}
X509_ATTRIBUTE_free(sk_X509_ATTRIBUTE_value(*sk, i));
- (void) sk_X509_ATTRIBUTE_set(*sk, i, attr);
+ (void)sk_X509_ATTRIBUTE_set(*sk, i, attr);
return 1;
}
diff --git a/crypto/pkcs7/pk7_lib.c b/crypto/pkcs7/pk7_lib.c
index ab0ae39ab2..675c694e66 100644
--- a/crypto/pkcs7/pk7_lib.c
+++ b/crypto/pkcs7/pk7_lib.c
@@ -42,7 +42,7 @@ long PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, char *parg)
}
} else {
ERR_raise(ERR_LIB_PKCS7,
- PKCS7_R_OPERATION_NOT_SUPPORTED_ON_THIS_TYPE);
+ PKCS7_R_OPERATION_NOT_SUPPORTED_ON_THIS_TYPE);
ret = 0;
}
break;
@@ -56,7 +56,7 @@ long PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, char *parg)
p7->detached = ret;
} else {
ERR_raise(ERR_LIB_PKCS7,
- PKCS7_R_OPERATION_NOT_SUPPORTED_ON_THIS_TYPE);
+ PKCS7_R_OPERATION_NOT_SUPPORTED_ON_THIS_TYPE);
ret = 0;
}
@@ -80,7 +80,7 @@ int PKCS7_content_new(PKCS7 *p7, int type)
goto err;
return 1;
- err:
+err:
PKCS7_free(ret);
return 0;
}
@@ -108,7 +108,7 @@ int PKCS7_set_content(PKCS7 *p7, PKCS7 *p7_data)
goto err;
}
return 1;
- err:
+err:
return 0;
}
@@ -119,7 +119,7 @@ int PKCS7_set_type(PKCS7 *p7, int type)
/*
* PKCS7_content_free(p7);
*/
- obj = OBJ_nid2obj(type); /* will not fail */
+ obj = OBJ_nid2obj(type); /* will not fail */
switch (type) {
case NID_pkcs7_signed:
@@ -179,7 +179,7 @@ int PKCS7_set_type(PKCS7 *p7, int type)
goto err;
}
return 1;
- err:
+err:
return 0;
}
@@ -223,7 +223,7 @@ int PKCS7_add_signer(PKCS7 *p7, PKCS7_SIGNER_INFO *psi)
break;
}
}
- if (!j) { /* we need to add another algorithm */
+ if (!j) { /* we need to add another algorithm */
int nid;
if ((alg = X509_ALGOR_new()) == NULL
@@ -309,7 +309,7 @@ int PKCS7_add_crl(PKCS7 *p7, X509_CRL *crl)
}
static int pkcs7_ecdsa_or_dsa_sign_verify_setup(PKCS7_SIGNER_INFO *si,
- int verify)
+ int verify)
{
if (!verify) {
int snid, hnid;
@@ -337,13 +337,13 @@ static int pkcs7_rsa_sign_verify_setup(PKCS7_SIGNER_INFO *si, int verify)
PKCS7_SIGNER_INFO_get0_algs(si, NULL, NULL, &alg);
if (alg != NULL)
return X509_ALGOR_set0(alg, OBJ_nid2obj(NID_rsaEncryption),
- V_ASN1_NULL, NULL);
+ V_ASN1_NULL, NULL);
}
return 1;
}
int PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey,
- const EVP_MD *dgst)
+ const EVP_MD *dgst)
{
int ret;
@@ -351,7 +351,7 @@ int PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey,
if (!ASN1_INTEGER_set(p7i->version, 1))
return 0;
if (!X509_NAME_set(&p7i->issuer_and_serial->issuer,
- X509_get_issuer_name(x509)))
+ X509_get_issuer_name(x509)))
return 0;
/*
@@ -359,8 +359,7 @@ int PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey,
* ugly way.
*/
ASN1_INTEGER_free(p7i->issuer_and_serial->serial);
- if (!(p7i->issuer_and_serial->serial =
- ASN1_INTEGER_dup(X509_get0_serialNumber(x509))))
+ if (!(p7i->issuer_and_serial->serial = ASN1_INTEGER_dup(X509_get0_serialNumber(x509))))
return 0;
/* lets keep the pkey around for a while */
@@ -372,7 +371,7 @@ int PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey,
/* Set the algorithms */
if (!X509_ALGOR_set0(p7i->digest_alg, OBJ_nid2obj(EVP_MD_get_type(dgst)),
- V_ASN1_NULL, NULL))
+ V_ASN1_NULL, NULL))
return 0;
if (EVP_PKEY_is_a(pkey, "EC") || EVP_PKEY_is_a(pkey, "DSA"))
@@ -394,7 +393,7 @@ int PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey,
}
PKCS7_SIGNER_INFO *PKCS7_add_signature(PKCS7 *p7, X509 *x509, EVP_PKEY *pkey,
- const EVP_MD *dgst)
+ const EVP_MD *dgst)
{
PKCS7_SIGNER_INFO *si = NULL;
@@ -416,7 +415,7 @@ PKCS7_SIGNER_INFO *PKCS7_add_signature(PKCS7 *p7, X509 *x509, EVP_PKEY *pkey,
if (!PKCS7_add_signer(p7, si))
goto err;
return si;
- err:
+err:
PKCS7_SIGNER_INFO_free(si);
return NULL;
}
@@ -553,7 +552,7 @@ STACK_OF(PKCS7_SIGNER_INFO) *PKCS7_get_signer_info(PKCS7 *p7)
}
void PKCS7_SIGNER_INFO_get0_algs(PKCS7_SIGNER_INFO *si, EVP_PKEY **pk,
- X509_ALGOR **pdig, X509_ALGOR **psig)
+ X509_ALGOR **pdig, X509_ALGOR **psig)
{
if (pk)
*pk = si->pkey;
@@ -581,7 +580,7 @@ PKCS7_RECIP_INFO *PKCS7_add_recipient(PKCS7 *p7, X509 *x509)
goto err;
ri->ctx = ossl_pkcs7_get0_ctx(p7);
return ri;
- err:
+err:
PKCS7_RECIP_INFO_free(ri);
return NULL;
}
@@ -617,7 +616,7 @@ static int pkcs7_rsa_encrypt_decrypt_setup(PKCS7_RECIP_INFO *ri, int decrypt)
PKCS7_RECIP_INFO_get0_alg(ri, &alg);
if (alg != NULL)
return X509_ALGOR_set0(alg, OBJ_nid2obj(NID_rsaEncryption),
- V_ASN1_NULL, NULL);
+ V_ASN1_NULL, NULL);
}
return 1;
}
@@ -629,12 +628,11 @@ int PKCS7_RECIP_INFO_set(PKCS7_RECIP_INFO *p7i, X509 *x509)
if (!ASN1_INTEGER_set(p7i->version, 0))
return 0;
if (!X509_NAME_set(&p7i->issuer_and_serial->issuer,
- X509_get_issuer_name(x509)))
+ X509_get_issuer_name(x509)))
return 0;
ASN1_INTEGER_free(p7i->issuer_and_serial->serial);
- if (!(p7i->issuer_and_serial->serial =
- ASN1_INTEGER_dup(X509_get0_serialNumber(x509))))
+ if (!(p7i->issuer_and_serial->serial = ASN1_INTEGER_dup(X509_get0_serialNumber(x509))))
return 0;
pkey = X509_get0_pubkey(x509);
@@ -651,14 +649,14 @@ int PKCS7_RECIP_INFO_set(PKCS7_RECIP_INFO *p7i, X509 *x509)
if (pkey->ameth == NULL || pkey->ameth->pkey_ctrl == NULL) {
ERR_raise(ERR_LIB_PKCS7,
- PKCS7_R_ENCRYPTION_NOT_SUPPORTED_FOR_THIS_KEY_TYPE);
+ PKCS7_R_ENCRYPTION_NOT_SUPPORTED_FOR_THIS_KEY_TYPE);
goto err;
}
ret = pkey->ameth->pkey_ctrl(pkey, ASN1_PKEY_CTRL_PKCS7_ENCRYPT, 0, p7i);
if (ret == -2) {
ERR_raise(ERR_LIB_PKCS7,
- PKCS7_R_ENCRYPTION_NOT_SUPPORTED_FOR_THIS_KEY_TYPE);
+ PKCS7_R_ENCRYPTION_NOT_SUPPORTED_FOR_THIS_KEY_TYPE);
goto err;
}
if (ret <= 0) {
@@ -673,7 +671,7 @@ finished:
return 1;
- err:
+err:
return 0;
}
@@ -681,9 +679,8 @@ X509 *PKCS7_cert_from_signer_info(PKCS7 *p7, PKCS7_SIGNER_INFO *si)
{
if (PKCS7_type_is_signed(p7))
return (X509_find_by_issuer_and_serial(p7->d.sign->cert,
- si->issuer_and_serial->issuer,
- si->
- issuer_and_serial->serial));
+ si->issuer_and_serial->issuer,
+ si->issuer_and_serial->serial));
else
return NULL;
}
diff --git a/crypto/pkcs7/pk7_mime.c b/crypto/pkcs7/pk7_mime.c
index d23f7a869f..3117c52637 100644
--- a/crypto/pkcs7/pk7_mime.c
+++ b/crypto/pkcs7/pk7_mime.c
@@ -18,13 +18,13 @@
int i2d_PKCS7_bio_stream(BIO *out, PKCS7 *p7, BIO *in, int flags)
{
return i2d_ASN1_bio_stream(out, (ASN1_VALUE *)p7, in, flags,
- ASN1_ITEM_rptr(PKCS7));
+ ASN1_ITEM_rptr(PKCS7));
}
int PEM_write_bio_PKCS7_stream(BIO *out, PKCS7 *p7, BIO *in, int flags)
{
return PEM_write_bio_ASN1_stream(out, (ASN1_VALUE *)p7, in, flags,
- "PKCS7", ASN1_ITEM_rptr(PKCS7));
+ "PKCS7", ASN1_ITEM_rptr(PKCS7));
}
int SMIME_write_PKCS7(BIO *bio, PKCS7 *p7, BIO *data, int flags)
@@ -44,9 +44,9 @@ int SMIME_write_PKCS7(BIO *bio, PKCS7 *p7, BIO *data, int flags)
flags ^= SMIME_OLDMIME;
return SMIME_write_ASN1_ex(bio, (ASN1_VALUE *)p7, data, flags, ctype_nid,
- NID_undef, mdalgs, ASN1_ITEM_rptr(PKCS7),
- ossl_pkcs7_ctx_get0_libctx(ctx),
- ossl_pkcs7_ctx_get0_propq(ctx));
+ NID_undef, mdalgs, ASN1_ITEM_rptr(PKCS7),
+ ossl_pkcs7_ctx_get0_libctx(ctx),
+ ossl_pkcs7_ctx_get0_propq(ctx));
}
PKCS7 *SMIME_read_PKCS7_ex(BIO *bio, BIO **bcont, PKCS7 **p7)
@@ -61,7 +61,7 @@ PKCS7 *SMIME_read_PKCS7_ex(BIO *bio, BIO **bcont, PKCS7 **p7)
}
ret = (PKCS7 *)SMIME_read_ASN1_ex(bio, 0, bcont, ASN1_ITEM_rptr(PKCS7),
- (ASN1_VALUE **)p7, libctx, propq);
+ (ASN1_VALUE **)p7, libctx, propq);
if (ret != NULL)
ossl_pkcs7_resolve_libctx(ret);
return ret;
diff --git a/crypto/pkcs7/pk7_smime.c b/crypto/pkcs7/pk7_smime.c
index 99f3b9eb97..97f2005897 100644
--- a/crypto/pkcs7/pk7_smime.c
+++ b/crypto/pkcs7/pk7_smime.c
@@ -18,12 +18,11 @@
#define BUFFERSIZE 4096
-
static int pkcs7_copy_existing_digest(PKCS7 *p7, PKCS7_SIGNER_INFO *si);
PKCS7 *PKCS7_sign_ex(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs,
- BIO *data, int flags, OSSL_LIB_CTX *libctx,
- const char *propq)
+ BIO *data, int flags, OSSL_LIB_CTX *libctx,
+ const char *propq)
{
PKCS7 *p7;
int i;
@@ -60,18 +59,17 @@ PKCS7 *PKCS7_sign_ex(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs,
if (PKCS7_final(p7, data, flags))
return p7;
- err:
+err:
PKCS7_free(p7);
return NULL;
}
PKCS7 *PKCS7_sign(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs,
- BIO *data, int flags)
+ BIO *data, int flags)
{
return PKCS7_sign_ex(signcert, pkey, certs, data, flags, NULL, NULL);
}
-
int PKCS7_final(PKCS7 *p7, BIO *data, int flags)
{
BIO *p7bio;
@@ -96,7 +94,6 @@ err:
BIO_free_all(p7bio);
return ret;
-
}
/* Check to see if a cipher exists and if so add S/MIME capabilities */
@@ -116,15 +113,15 @@ static int add_digest_smcap(STACK_OF(X509_ALGOR) *sk, int nid, int arg)
}
PKCS7_SIGNER_INFO *PKCS7_sign_add_signer(PKCS7 *p7, X509 *signcert,
- EVP_PKEY *pkey, const EVP_MD *md,
- int flags)
+ EVP_PKEY *pkey, const EVP_MD *md,
+ int flags)
{
PKCS7_SIGNER_INFO *si = NULL;
STACK_OF(X509_ALGOR) *smcap = NULL;
if (!X509_check_private_key(signcert, pkey)) {
ERR_raise(ERR_LIB_PKCS7,
- PKCS7_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE);
+ PKCS7_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE);
return NULL;
}
@@ -174,7 +171,7 @@ PKCS7_SIGNER_INFO *PKCS7_sign_add_signer(PKCS7 *p7, X509 *signcert,
}
}
return si;
- err:
+err:
sk_X509_ALGOR_pop_free(smcap, X509_ALGOR_free);
return NULL;
}
@@ -201,7 +198,6 @@ static int pkcs7_copy_existing_digest(PKCS7 *p7, PKCS7_SIGNER_INFO *si)
osdig = PKCS7_digest_from_attributes(sitmp->auth_attr);
break;
}
-
}
if (osdig != NULL)
@@ -213,7 +209,7 @@ static int pkcs7_copy_existing_digest(PKCS7 *p7, PKCS7_SIGNER_INFO *si)
/* This strongly overlaps with CMS_verify(), partly with PKCS7_dataVerify() */
int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,
- BIO *indata, BIO *out, int flags)
+ BIO *indata, BIO *out, int flags)
{
STACK_OF(X509) *signers;
STACK_OF(X509) *included_certs;
@@ -272,7 +268,7 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,
/* Now verify the certificates */
p7_ctx = ossl_pkcs7_get0_ctx(p7);
cert_ctx = X509_STORE_CTX_new_ex(ossl_pkcs7_ctx_get0_libctx(p7_ctx),
- ossl_pkcs7_ctx_get0_propq(p7_ctx));
+ ossl_pkcs7_ctx_get0_propq(p7_ctx));
if (cert_ctx == NULL)
goto err;
if ((flags & PKCS7_NOVERIFY) == 0) {
@@ -281,7 +277,7 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,
included_certs = pkcs7_get0_certificates(p7);
if ((flags & PKCS7_NOCHAIN) == 0
&& !ossl_x509_add_certs_new(&untrusted, included_certs,
- X509_ADD_FLAG_NO_DUP))
+ X509_ADD_FLAG_NO_DUP))
goto err;
for (k = 0; k < sk_X509_num(signers); k++) {
@@ -291,7 +287,7 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,
goto err;
}
if ((flags & PKCS7_NOCHAIN) == 0
- && !X509_STORE_CTX_set_default(cert_ctx, "smime_sign"))
+ && !X509_STORE_CTX_set_default(cert_ctx, "smime_sign"))
goto err;
if (!(flags & PKCS7_NOCRL))
X509_STORE_CTX_set0_crls(cert_ctx, p7->d.sign->crl);
@@ -299,8 +295,8 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,
if (i <= 0) {
j = X509_STORE_CTX_get_error(cert_ctx);
ERR_raise_data(ERR_LIB_PKCS7, PKCS7_R_CERTIFICATE_VERIFY_ERROR,
- "Verify error: %s",
- X509_verify_cert_error_string(j));
+ "Verify error: %s",
+ X509_verify_cert_error_string(j));
goto err;
}
/* Check for revocation status here */
@@ -351,7 +347,7 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,
ret = 1;
- err:
+err:
if (flags & PKCS7_TEXT)
BIO_free(tmpout);
X509_STORE_CTX_free(cert_ctx);
@@ -365,7 +361,7 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,
}
STACK_OF(X509) *PKCS7_get0_signers(PKCS7 *p7, STACK_OF(X509) *certs,
- int flags)
+ int flags)
{
STACK_OF(X509) *signers, *included_certs;
STACK_OF(PKCS7_SIGNER_INFO) *sinfos;
@@ -405,10 +401,10 @@ STACK_OF(X509) *PKCS7_get0_signers(PKCS7 *p7, STACK_OF(X509) *certs,
signer = NULL;
/* If any certificates passed they take priority */
signer = X509_find_by_issuer_and_serial(certs,
- ias->issuer, ias->serial);
+ ias->issuer, ias->serial);
if (signer == NULL && (flags & PKCS7_NOINTERN) == 0)
signer = X509_find_by_issuer_and_serial(included_certs,
- ias->issuer, ias->serial);
+ ias->issuer, ias->serial);
if (signer == NULL) {
ERR_raise(ERR_LIB_PKCS7, PKCS7_R_SIGNER_CERTIFICATE_NOT_FOUND);
sk_X509_free(signers);
@@ -426,8 +422,8 @@ STACK_OF(X509) *PKCS7_get0_signers(PKCS7 *p7, STACK_OF(X509) *certs,
/* Build a complete PKCS#7 enveloped data */
PKCS7 *PKCS7_encrypt_ex(STACK_OF(X509) *certs, BIO *in,
- const EVP_CIPHER *cipher, int flags,
- OSSL_LIB_CTX *libctx, const char *propq)
+ const EVP_CIPHER *cipher, int flags,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
PKCS7 *p7;
BIO *p7bio = NULL;
@@ -460,21 +456,19 @@ PKCS7 *PKCS7_encrypt_ex(STACK_OF(X509) *certs, BIO *in,
if (PKCS7_final(p7, in, flags))
return p7;
- err:
+err:
BIO_free_all(p7bio);
PKCS7_free(p7);
return NULL;
-
}
PKCS7 *PKCS7_encrypt(STACK_OF(X509) *certs, BIO *in, const EVP_CIPHER *cipher,
- int flags)
+ int flags)
{
return PKCS7_encrypt_ex(certs, in, cipher, flags, NULL, NULL);
}
-
int PKCS7_decrypt(PKCS7 *p7, EVP_PKEY *pkey, X509 *cert, BIO *data, int flags)
{
BIO *tmpmem;
@@ -494,7 +488,7 @@ int PKCS7_decrypt(PKCS7 *p7, EVP_PKEY *pkey, X509 *cert, BIO *data, int flags)
if (cert && !X509_check_private_key(cert, pkey)) {
ERR_raise(ERR_LIB_PKCS7,
- PKCS7_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE);
+ PKCS7_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE);
return 0;
}
diff --git a/crypto/pkcs7/pkcs7err.c b/crypto/pkcs7/pkcs7err.c
index cd839511e3..45494a9768 100644
--- a/crypto/pkcs7/pkcs7err.c
+++ b/crypto/pkcs7/pkcs7err.c
@@ -15,75 +15,75 @@
#ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA PKCS7_str_reasons[] = {
- {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_CERTIFICATE_VERIFY_ERROR),
- "certificate verify error"},
- {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER),
- "cipher has no object identifier"},
- {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_CIPHER_NOT_INITIALIZED),
- "cipher not initialized"},
- {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_CONTENT_AND_DATA_PRESENT),
- "content and data present"},
- {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_CTRL_ERROR), "ctrl error"},
- {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_DECRYPT_ERROR), "decrypt error"},
- {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_DIGEST_FAILURE), "digest failure"},
- {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_ENCRYPTION_CTRL_FAILURE),
- "encryption ctrl failure"},
- {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_ENCRYPTION_NOT_SUPPORTED_FOR_THIS_KEY_TYPE),
- "encryption not supported for this key type"},
- {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_ERROR_ADDING_RECIPIENT),
- "error adding recipient"},
- {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_ERROR_SETTING_CIPHER),
- "error setting cipher"},
- {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_INVALID_NULL_POINTER),
- "invalid null pointer"},
- {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_INVALID_SIGNED_DATA_TYPE),
- "invalid signed data type"},
- {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_NO_CONTENT), "no content"},
- {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_NO_DEFAULT_DIGEST),
- "no default digest"},
- {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_NO_MATCHING_DIGEST_TYPE_FOUND),
- "no matching digest type found"},
- {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_NO_RECIPIENT_MATCHES_CERTIFICATE),
- "no recipient matches certificate"},
- {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_NO_SIGNATURES_ON_DATA),
- "no signatures on data"},
- {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_NO_SIGNERS), "no signers"},
- {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_OPERATION_NOT_SUPPORTED_ON_THIS_TYPE),
- "operation not supported on this type"},
- {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_PKCS7_ADD_SIGNATURE_ERROR),
- "pkcs7 add signature error"},
- {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_PKCS7_ADD_SIGNER_ERROR),
- "pkcs7 add signer error"},
- {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_PKCS7_DATASIGN), "pkcs7 datasign"},
- {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE),
- "private key does not match certificate"},
- {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_SIGNATURE_FAILURE),
- "signature failure"},
- {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_SIGNER_CERTIFICATE_NOT_FOUND),
- "signer certificate not found"},
- {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_SIGNING_CTRL_FAILURE),
- "signing ctrl failure"},
- {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_SIGNING_NOT_SUPPORTED_FOR_THIS_KEY_TYPE),
- "signing not supported for this key type"},
- {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_SMIME_TEXT_ERROR), "smime text error"},
- {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_UNABLE_TO_FIND_CERTIFICATE),
- "unable to find certificate"},
- {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_UNABLE_TO_FIND_MEM_BIO),
- "unable to find mem bio"},
- {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_UNABLE_TO_FIND_MESSAGE_DIGEST),
- "unable to find message digest"},
- {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_UNKNOWN_DIGEST_TYPE),
- "unknown digest type"},
- {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_UNKNOWN_OPERATION),
- "unknown operation"},
- {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_UNSUPPORTED_CIPHER_TYPE),
- "unsupported cipher type"},
- {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_UNSUPPORTED_CONTENT_TYPE),
- "unsupported content type"},
- {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_WRONG_CONTENT_TYPE),
- "wrong content type"},
- {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_WRONG_PKCS7_TYPE), "wrong pkcs7 type"},
- {0, NULL}
+ { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_CERTIFICATE_VERIFY_ERROR),
+ "certificate verify error" },
+ { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER),
+ "cipher has no object identifier" },
+ { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_CIPHER_NOT_INITIALIZED),
+ "cipher not initialized" },
+ { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_CONTENT_AND_DATA_PRESENT),
+ "content and data present" },
+ { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_CTRL_ERROR), "ctrl error" },
+ { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_DECRYPT_ERROR), "decrypt error" },
+ { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_DIGEST_FAILURE), "digest failure" },
+ { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_ENCRYPTION_CTRL_FAILURE),
+ "encryption ctrl failure" },
+ { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_ENCRYPTION_NOT_SUPPORTED_FOR_THIS_KEY_TYPE),
+ "encryption not supported for this key type" },
+ { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_ERROR_ADDING_RECIPIENT),
+ "error adding recipient" },
+ { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_ERROR_SETTING_CIPHER),
+ "error setting cipher" },
+ { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_INVALID_NULL_POINTER),
+ "invalid null pointer" },
+ { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_INVALID_SIGNED_DATA_TYPE),
+ "invalid signed data type" },
+ { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_NO_CONTENT), "no content" },
+ { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_NO_DEFAULT_DIGEST),
+ "no default digest" },
+ { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_NO_MATCHING_DIGEST_TYPE_FOUND),
+ "no matching digest type found" },
+ { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_NO_RECIPIENT_MATCHES_CERTIFICATE),
+ "no recipient matches certificate" },
+ { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_NO_SIGNATURES_ON_DATA),
+ "no signatures on data" },
+ { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_NO_SIGNERS), "no signers" },
+ { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_OPERATION_NOT_SUPPORTED_ON_THIS_TYPE),
+ "operation not supported on this type" },
+ { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_PKCS7_ADD_SIGNATURE_ERROR),
+ "pkcs7 add signature error" },
+ { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_PKCS7_ADD_SIGNER_ERROR),
+ "pkcs7 add signer error" },
+ { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_PKCS7_DATASIGN), "pkcs7 datasign" },
+ { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE),
+ "private key does not match certificate" },
+ { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_SIGNATURE_FAILURE),
+ "signature failure" },
+ { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_SIGNER_CERTIFICATE_NOT_FOUND),
+ "signer certificate not found" },
+ { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_SIGNING_CTRL_FAILURE),
+ "signing ctrl failure" },
+ { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_SIGNING_NOT_SUPPORTED_FOR_THIS_KEY_TYPE),
+ "signing not supported for this key type" },
+ { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_SMIME_TEXT_ERROR), "smime text error" },
+ { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_UNABLE_TO_FIND_CERTIFICATE),
+ "unable to find certificate" },
+ { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_UNABLE_TO_FIND_MEM_BIO),
+ "unable to find mem bio" },
+ { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_UNABLE_TO_FIND_MESSAGE_DIGEST),
+ "unable to find message digest" },
+ { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_UNKNOWN_DIGEST_TYPE),
+ "unknown digest type" },
+ { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_UNKNOWN_OPERATION),
+ "unknown operation" },
+ { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_UNSUPPORTED_CIPHER_TYPE),
+ "unsupported cipher type" },
+ { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_UNSUPPORTED_CONTENT_TYPE),
+ "unsupported content type" },
+ { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_WRONG_CONTENT_TYPE),
+ "wrong content type" },
+ { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_WRONG_PKCS7_TYPE), "wrong pkcs7 type" },
+ { 0, NULL }
};
#endif
diff --git a/crypto/poly1305/poly1305.c b/crypto/poly1305/poly1305.c
index 1e8e3db23c..656dee783c 100644
--- a/crypto/poly1305/poly1305.c
+++ b/crypto/poly1305/poly1305.c
@@ -21,10 +21,7 @@ size_t Poly1305_ctx_size(void)
/* pick 32-bit unsigned integer in little endian order */
static unsigned int U8TOU32(const unsigned char *p)
{
- return (((unsigned int)(p[0] & 0xff)) |
- ((unsigned int)(p[1] & 0xff) << 8) |
- ((unsigned int)(p[2] & 0xff) << 16) |
- ((unsigned int)(p[3] & 0xff) << 24));
+ return (((unsigned int)(p[0] & 0xff)) | ((unsigned int)(p[1] & 0xff) << 8) | ((unsigned int)(p[2] & 0xff) << 16) | ((unsigned int)(p[3] & 0xff) << 24));
}
/*
@@ -90,11 +87,10 @@ poly1305_blocks(void *ctx, const unsigned char *inp, size_t len, u32 padbit);
/*
* Type-agnostic "rip-off" from constant_time.h
*/
-# define CONSTANT_TIME_CARRY(a,b) ( \
- (a ^ ((a ^ b) | ((a - b) ^ b))) >> (sizeof(a) * 8 - 1) \
- )
+#define CONSTANT_TIME_CARRY(a, b) ( \
+ (a ^ ((a ^ b) | ((a - b) ^ b))) >> (sizeof(a) * 8 - 1))
-# if defined(INT64_MAX) && defined(INT128_MAX)
+#if defined(INT64_MAX) && defined(INT128_MAX)
typedef unsigned long u64;
typedef uint128_t u128;
@@ -107,14 +103,7 @@ typedef struct {
/* pick 32-bit unsigned integer in little endian order */
static u64 U8TOU64(const unsigned char *p)
{
- return (((u64)(p[0] & 0xff)) |
- ((u64)(p[1] & 0xff) << 8) |
- ((u64)(p[2] & 0xff) << 16) |
- ((u64)(p[3] & 0xff) << 24) |
- ((u64)(p[4] & 0xff) << 32) |
- ((u64)(p[5] & 0xff) << 40) |
- ((u64)(p[6] & 0xff) << 48) |
- ((u64)(p[7] & 0xff) << 56));
+ return (((u64)(p[0] & 0xff)) | ((u64)(p[1] & 0xff) << 8) | ((u64)(p[2] & 0xff) << 16) | ((u64)(p[3] & 0xff) << 24) | ((u64)(p[4] & 0xff) << 32) | ((u64)(p[5] & 0xff) << 40) | ((u64)(p[6] & 0xff) << 48) | ((u64)(p[7] & 0xff) << 56));
}
/* store a 32-bit unsigned integer in little endian */
@@ -132,7 +121,7 @@ static void U64TO8(unsigned char *p, u64 v)
static void poly1305_init(void *ctx, const unsigned char key[16])
{
- poly1305_internal *st = (poly1305_internal *) ctx;
+ poly1305_internal *st = (poly1305_internal *)ctx;
/* h = 0 */
st->h[0] = 0;
@@ -173,11 +162,8 @@ poly1305_blocks(void *ctx, const unsigned char *inp, size_t len, u32 padbit)
h2 += (u64)(d1 >> 64) + padbit;
/* h *= r "%" p, where "%" stands for "partial remainder" */
- d0 = ((u128)h0 * r0) +
- ((u128)h1 * s1);
- d1 = ((u128)h0 * r1) +
- ((u128)h1 * r0) +
- (h2 * s1);
+ d0 = ((u128)h0 * r0) + ((u128)h1 * s1);
+ d1 = ((u128)h0 * r1) + ((u128)h1 * r0) + (h2 * s1);
h2 = (h2 * r0);
/* last reduction step: */
@@ -189,8 +175,8 @@ poly1305_blocks(void *ctx, const unsigned char *inp, size_t len, u32 padbit)
c = (h2 >> 2) + (h2 & ~3UL);
h2 &= 3;
h0 += c;
- h1 += (c = CONSTANT_TIME_CARRY(h0,c));
- h2 += CONSTANT_TIME_CARRY(h1,c);
+ h1 += (c = CONSTANT_TIME_CARRY(h0, c));
+ h2 += CONSTANT_TIME_CARRY(h1, c);
/*
* Occasional overflows to 3rd bit of h2 are taken care of
* "naturally". If after this point we end up at the top of
@@ -211,9 +197,9 @@ poly1305_blocks(void *ctx, const unsigned char *inp, size_t len, u32 padbit)
}
static void poly1305_emit(void *ctx, unsigned char mac[16],
- const u32 nonce[4])
+ const u32 nonce[4])
{
- poly1305_internal *st = (poly1305_internal *) ctx;
+ poly1305_internal *st = (poly1305_internal *)ctx;
u64 h0, h1, h2;
u64 g0, g1, g2;
u128 t;
@@ -237,22 +223,22 @@ static void poly1305_emit(void *ctx, unsigned char mac[16],
h1 = (h1 & mask) | g1;
/* mac = (h + nonce) % (2^128) */
- h0 = (u64)(t = (u128)h0 + nonce[0] + ((u64)nonce[1]<<32));
- h1 = (u64)(t = (u128)h1 + nonce[2] + ((u64)nonce[3]<<32) + (t >> 64));
+ h0 = (u64)(t = (u128)h0 + nonce[0] + ((u64)nonce[1] << 32));
+ h1 = (u64)(t = (u128)h1 + nonce[2] + ((u64)nonce[3] << 32) + (t >> 64));
U64TO8(mac + 0, h0);
U64TO8(mac + 8, h1);
}
-# else
+#else
-# if defined(_WIN32) && !defined(__MINGW32__)
+#if defined(_WIN32) && !defined(__MINGW32__)
typedef unsigned __int64 u64;
-# elif defined(__arch64__)
+#elif defined(__arch64__)
typedef unsigned long u64;
-# else
+#else
typedef unsigned long long u64;
-# endif
+#endif
typedef struct {
u32 h[5];
@@ -270,7 +256,7 @@ static void U32TO8(unsigned char *p, unsigned int v)
static void poly1305_init(void *ctx, const unsigned char key[16])
{
- poly1305_internal *st = (poly1305_internal *) ctx;
+ poly1305_internal *st = (poly1305_internal *)ctx;
/* h = 0 */
st->h[0] = 0;
@@ -319,25 +305,10 @@ poly1305_blocks(void *ctx, const unsigned char *inp, size_t len, u32 padbit)
h4 += (u32)(d3 >> 32) + padbit;
/* h *= r "%" p, where "%" stands for "partial remainder" */
- d0 = ((u64)h0 * r0) +
- ((u64)h1 * s3) +
- ((u64)h2 * s2) +
- ((u64)h3 * s1);
- d1 = ((u64)h0 * r1) +
- ((u64)h1 * r0) +
- ((u64)h2 * s3) +
- ((u64)h3 * s2) +
- (h4 * s1);
- d2 = ((u64)h0 * r2) +
- ((u64)h1 * r1) +
- ((u64)h2 * r0) +
- ((u64)h3 * s3) +
- (h4 * s2);
- d3 = ((u64)h0 * r3) +
- ((u64)h1 * r2) +
- ((u64)h2 * r1) +
- ((u64)h3 * r0) +
- (h4 * s3);
+ d0 = ((u64)h0 * r0) + ((u64)h1 * s3) + ((u64)h2 * s2) + ((u64)h3 * s1);
+ d1 = ((u64)h0 * r1) + ((u64)h1 * r0) + ((u64)h2 * s3) + ((u64)h3 * s2) + (h4 * s1);
+ d2 = ((u64)h0 * r2) + ((u64)h1 * r1) + ((u64)h2 * r0) + ((u64)h3 * s3) + (h4 * s2);
+ d3 = ((u64)h0 * r3) + ((u64)h1 * r2) + ((u64)h2 * r1) + ((u64)h3 * r0) + (h4 * s3);
h4 = (h4 * r0);
/* last reduction step: */
@@ -351,10 +322,10 @@ poly1305_blocks(void *ctx, const unsigned char *inp, size_t len, u32 padbit)
c = (h4 >> 2) + (h4 & ~3U);
h4 &= 3;
h0 += c;
- h1 += (c = CONSTANT_TIME_CARRY(h0,c));
- h2 += (c = CONSTANT_TIME_CARRY(h1,c));
- h3 += (c = CONSTANT_TIME_CARRY(h2,c));
- h4 += CONSTANT_TIME_CARRY(h3,c);
+ h1 += (c = CONSTANT_TIME_CARRY(h0, c));
+ h2 += (c = CONSTANT_TIME_CARRY(h1, c));
+ h3 += (c = CONSTANT_TIME_CARRY(h2, c));
+ h4 += CONSTANT_TIME_CARRY(h3, c);
/*
* Occasional overflows to 3rd bit of h4 are taken care of
* "naturally". If after this point we end up at the top of
@@ -377,9 +348,9 @@ poly1305_blocks(void *ctx, const unsigned char *inp, size_t len, u32 padbit)
}
static void poly1305_emit(void *ctx, unsigned char mac[16],
- const u32 nonce[4])
+ const u32 nonce[4])
{
- poly1305_internal *st = (poly1305_internal *) ctx;
+ poly1305_internal *st = (poly1305_internal *)ctx;
u32 h0, h1, h2, h3, h4;
u32 g0, g1, g2, g3, g4;
u64 t;
@@ -421,13 +392,13 @@ static void poly1305_emit(void *ctx, unsigned char mac[16],
U32TO8(mac + 8, h2);
U32TO8(mac + 12, h3);
}
-# endif
+#endif
#else
int poly1305_init(void *ctx, const unsigned char key[16], void *func);
void poly1305_blocks(void *ctx, const unsigned char *inp, size_t len,
- unsigned int padbit);
+ unsigned int padbit);
void poly1305_emit(void *ctx, unsigned char mac[16],
- const unsigned int nonce[4]);
+ const unsigned int nonce[4]);
#endif
void Poly1305_Init(POLY1305 *ctx, const unsigned char key[32])
@@ -453,7 +424,6 @@ void Poly1305_Init(POLY1305 *ctx, const unsigned char key[32])
#endif
ctx->num = 0;
-
}
#ifdef POLY1305_ASM
@@ -461,8 +431,8 @@ void Poly1305_Init(POLY1305 *ctx, const unsigned char key[32])
* This "eclipses" poly1305_blocks and poly1305_emit, but it's
* conscious choice imposed by -Wshadow compiler warnings.
*/
-# define poly1305_blocks (*poly1305_blocks_p)
-# define poly1305_emit (*poly1305_emit_p)
+#define poly1305_blocks (*poly1305_blocks_p)
+#define poly1305_emit (*poly1305_emit_p)
#endif
void Poly1305_Update(POLY1305 *ctx, const unsigned char *inp, size_t len)
@@ -516,7 +486,7 @@ void Poly1305_Final(POLY1305 *ctx, unsigned char mac[16])
size_t num;
if ((num = ctx->num)) {
- ctx->data[num++] = 1; /* pad bit */
+ ctx->data[num++] = 1; /* pad bit */
while (num < POLY1305_BLOCK_SIZE)
ctx->data[num++] = 0;
poly1305_blocks(ctx->opaque, ctx->data, POLY1305_BLOCK_SIZE, 0);
diff --git a/crypto/poly1305/poly1305_base2_44.c b/crypto/poly1305/poly1305_base2_44.c
index a71e5e86e6..7e28970fbe 100644
--- a/crypto/poly1305/poly1305_base2_44.c
+++ b/crypto/poly1305/poly1305_base2_44.c
@@ -31,14 +31,7 @@ typedef struct {
/* pick 64-bit unsigned integer in little endian order */
static u64 U8TOU64(const unsigned char *p)
{
- return (((u64)(p[0] & 0xff)) |
- ((u64)(p[1] & 0xff) << 8) |
- ((u64)(p[2] & 0xff) << 16) |
- ((u64)(p[3] & 0xff) << 24) |
- ((u64)(p[4] & 0xff) << 32) |
- ((u64)(p[5] & 0xff) << 40) |
- ((u64)(p[6] & 0xff) << 48) |
- ((u64)(p[7] & 0xff) << 56));
+ return (((u64)(p[0] & 0xff)) | ((u64)(p[1] & 0xff) << 8) | ((u64)(p[2] & 0xff) << 16) | ((u64)(p[3] & 0xff) << 24) | ((u64)(p[4] & 0xff) << 32) | ((u64)(p[5] & 0xff) << 40) | ((u64)(p[6] & 0xff) << 48) | ((u64)(p[7] & 0xff) << 56));
}
/* store a 64-bit unsigned integer in little endian */
@@ -69,7 +62,7 @@ int poly1305_init(void *ctx, const unsigned char key[16])
/* break r1:r0 to three 44-bit digits, masks are 1<<44-1 */
st->r[0] = r0 & 0x0fffffffffff;
- st->r[1] = ((r0 >> 44) | (r1 << 20)) & 0x0fffffffffff;
+ st->r[1] = ((r0 >> 44) | (r1 << 20)) & 0x0fffffffffff;
st->r[2] = (r1 >> 24);
st->s[0] = (st->r[1] + (st->r[1] << 2)) << 2;
@@ -79,7 +72,7 @@ int poly1305_init(void *ctx, const unsigned char key[16])
}
void poly1305_blocks(void *ctx, const unsigned char *inp, size_t len,
- u32 padbit)
+ u32 padbit)
{
poly1305_internal *st = (poly1305_internal *)ctx;
u64 r0, r1, r2;
@@ -107,8 +100,8 @@ void poly1305_blocks(void *ctx, const unsigned char *inp, size_t len,
/* h += m[i], m[i] is broken to 44-bit digits */
h0 += m0 & 0x0fffffffffff;
- h1 += ((m0 >> 44) | (m1 << 20)) & 0x0fffffffffff;
- h2 += (m1 >> 24) + pad;
+ h1 += ((m0 >> 44) | (m1 << 20)) & 0x0fffffffffff;
+ h2 += (m1 >> 24) + pad;
/* h *= r "%" p, where "%" stands for "partial remainder" */
d0 = ((u128)h0 * r0) + ((u128)h1 * s2) + ((u128)h2 * s1);
@@ -134,7 +127,7 @@ void poly1305_blocks(void *ctx, const unsigned char *inp, size_t len,
void poly1305_emit(void *ctx, unsigned char mac[16], const u32 nonce[4])
{
- poly1305_internal *st = (poly1305_internal *) ctx;
+ poly1305_internal *st = (poly1305_internal *)ctx;
u64 h0, h1, h2;
u64 g0, g1, g2;
u128 t;
@@ -145,8 +138,10 @@ void poly1305_emit(void *ctx, unsigned char mac[16], const u32 nonce[4])
h2 = st->h[2];
/* after "lazy" reduction, convert 44+bit digits to 64-bit ones */
- h0 = (u64)(t = (u128)h0 + (h1 << 44)); h1 >>= 20;
- h1 = (u64)(t = (u128)h1 + (h2 << 24) + (t >> 64)); h2 >>= 40;
+ h0 = (u64)(t = (u128)h0 + (h1 << 44));
+ h1 >>= 20;
+ h1 = (u64)(t = (u128)h1 + (h2 << 24) + (t >> 64));
+ h2 >>= 40;
h2 += (u64)(t >> 64);
/* compare to modulus by computing h + -p */
@@ -163,8 +158,8 @@ void poly1305_emit(void *ctx, unsigned char mac[16], const u32 nonce[4])
h1 = (h1 & mask) | g1;
/* mac = (h + nonce) % (2^128) */
- h0 = (u64)(t = (u128)h0 + nonce[0] + ((u64)nonce[1]<<32));
- h1 = (u64)(t = (u128)h1 + nonce[2] + ((u64)nonce[3]<<32) + (t >> 64));
+ h0 = (u64)(t = (u128)h0 + nonce[0] + ((u64)nonce[1] << 32));
+ h1 = (u64)(t = (u128)h1 + nonce[2] + ((u64)nonce[3] << 32) + (t >> 64));
U64TO8(mac + 0, h0);
U64TO8(mac + 8, h1);
diff --git a/crypto/poly1305/poly1305_ieee754.c b/crypto/poly1305/poly1305_ieee754.c
index 57a08aa248..bd7426466e 100644
--- a/crypto/poly1305/poly1305_ieee754.c
+++ b/crypto/poly1305/poly1305_ieee754.c
@@ -46,8 +46,8 @@
* SPARC T4 16.1
*/
-#if !(defined(__GNUC__) && __GNUC__>=2)
-# error "this is gcc-specific template"
+#if !(defined(__GNUC__) && __GNUC__ >= 2)
+#error "this is gcc-specific template"
#endif
#include <stdlib.h>
@@ -55,35 +55,37 @@
typedef unsigned char u8;
typedef unsigned int u32;
typedef unsigned long long u64;
-typedef union { double d; u64 u; } elem64;
+typedef union {
+ double d;
+ u64 u;
+} elem64;
-#define TWO(p) ((double)(1ULL<<(p)))
-#define TWO0 TWO(0)
-#define TWO32 TWO(32)
-#define TWO64 (TWO32*TWO(32))
-#define TWO96 (TWO64*TWO(32))
-#define TWO130 (TWO96*TWO(34))
+#define TWO(p) ((double)(1ULL << (p)))
+#define TWO0 TWO(0)
+#define TWO32 TWO(32)
+#define TWO64 (TWO32 * TWO(32))
+#define TWO96 (TWO64 * TWO(32))
+#define TWO130 (TWO96 * TWO(34))
-#define EXP(p) ((1023ULL+(p))<<52)
+#define EXP(p) ((1023ULL + (p)) << 52)
#if defined(__x86_64__) || (defined(__PPC__) && defined(__LITTLE_ENDIAN__))
-# define U8TOU32(p) (*(const u32 *)(p))
-# define U32TO8(p,v) (*(u32 *)(p) = (v))
+#define U8TOU32(p) (*(const u32 *)(p))
+#define U32TO8(p, v) (*(u32 *)(p) = (v))
#elif defined(__PPC__) || defined(__POWERPC__)
-# define U8TOU32(p) ({u32 ret; asm ("lwbrx %0,0,%1":"=r"(ret):"b"(p)); ret; })
-# define U32TO8(p,v) asm ("stwbrx %0,0,%1"::"r"(v),"b"(p):"memory")
+#define U8TOU32(p) ({u32 ret; asm ("lwbrx %0,0,%1":"=r"(ret):"b"(p)); ret; })
+#define U32TO8(p, v) asm("stwbrx %0,0,%1" ::"r"(v), "b"(p) : "memory")
#elif defined(__s390x__)
-# define U8TOU32(p) ({u32 ret; asm ("lrv %0,%1":"=d"(ret):"m"(*(u32 *)(p))); ret; })
-# define U32TO8(p,v) asm ("strv %1,%0":"=m"(*(u32 *)(p)):"d"(v))
+#define U8TOU32(p) ({u32 ret; asm ("lrv %0,%1":"=d"(ret):"m"(*(u32 *)(p))); ret; })
+#define U32TO8(p, v) asm("strv %1,%0" : "=m"(*(u32 *)(p)) : "d"(v))
#endif
#ifndef U8TOU32
-# define U8TOU32(p) ((u32)(p)[0] | (u32)(p)[1]<<8 | \
- (u32)(p)[2]<<16 | (u32)(p)[3]<<24 )
+#define U8TOU32(p) ((u32)(p)[0] | (u32)(p)[1] << 8 | (u32)(p)[2] << 16 | (u32)(p)[3] << 24)
#endif
#ifndef U32TO8
-# define U32TO8(p,v) ((p)[0] = (u8)(v), (p)[1] = (u8)((v)>>8), \
- (p)[2] = (u8)((v)>>16), (p)[3] = (u8)((v)>>24) )
+#define U32TO8(p, v) ((p)[0] = (u8)(v), (p)[1] = (u8)((v) >> 8), \
+ (p)[2] = (u8)((v) >> 16), (p)[3] = (u8)((v) >> 24))
#endif
typedef struct {
@@ -100,7 +102,7 @@ static const u64 one = 1;
#elif defined(__s390x__)
static const u32 fpc = 1;
#elif defined(__sparc__)
-static const u64 fsr = 1ULL<<30;
+static const u64 fsr = 1ULL << 30;
#elif defined(__mips__)
static const u32 fcsr = 1;
#else
@@ -109,7 +111,7 @@ static const u32 fcsr = 1;
int poly1305_init(void *ctx, const unsigned char key[16])
{
- poly1305_internal *st = (poly1305_internal *) ctx;
+ poly1305_internal *st = (poly1305_internal *)ctx;
elem64 r0, r1, r2, r3;
/* h = 0, biased */
@@ -119,10 +121,10 @@ int poly1305_init(void *ctx, const unsigned char key[16])
st->h[2].d = TWO(52)*TWO64;
st->h[3].d = TWO(52)*TWO96;
#else
- st->h[0].u = EXP(52+0);
- st->h[1].u = EXP(52+32);
- st->h[2].u = EXP(52+64);
- st->h[3].u = EXP(52+96);
+ st->h[0].u = EXP(52 + 0);
+ st->h[1].u = EXP(52 + 32);
+ st->h[2].u = EXP(52 + 64);
+ st->h[3].u = EXP(52 + 96);
#endif
if (key) {
@@ -132,89 +134,82 @@ int poly1305_init(void *ctx, const unsigned char key[16])
#if defined(__x86_64__)
u32 mxcsr_orig;
- asm volatile ("stmxcsr %0":"=m"(mxcsr_orig));
- asm volatile ("ldmxcsr %0"::"m"(mxcsr));
+ asm volatile("stmxcsr %0" : "=m"(mxcsr_orig));
+ asm volatile("ldmxcsr %0" ::"m"(mxcsr));
#elif defined(__PPC__) || defined(__POWERPC__)
double fpscr_orig, fpscr = *(double *)&one;
- asm volatile ("mffs %0":"=f"(fpscr_orig));
- asm volatile ("mtfsf 255,%0"::"f"(fpscr));
+ asm volatile("mffs %0" : "=f"(fpscr_orig));
+ asm volatile("mtfsf 255,%0" ::"f"(fpscr));
#elif defined(__s390x__)
u32 fpc_orig;
- asm volatile ("stfpc %0":"=m"(fpc_orig));
- asm volatile ("lfpc %0"::"m"(fpc));
+ asm volatile("stfpc %0" : "=m"(fpc_orig));
+ asm volatile("lfpc %0" ::"m"(fpc));
#elif defined(__sparc__)
u64 fsr_orig;
- asm volatile ("stx %%fsr,%0":"=m"(fsr_orig));
- asm volatile ("ldx %0,%%fsr"::"m"(fsr));
+ asm volatile("stx %%fsr,%0" : "=m"(fsr_orig));
+ asm volatile("ldx %0,%%fsr" ::"m"(fsr));
#elif defined(__mips__)
u32 fcsr_orig;
- asm volatile ("cfc1 %0,$31":"=r"(fcsr_orig));
- asm volatile ("ctc1 %0,$31"::"r"(fcsr));
+ asm volatile("cfc1 %0,$31" : "=r"(fcsr_orig));
+ asm volatile("ctc1 %0,$31" ::"r"(fcsr));
#endif
/* r &= 0xffffffc0ffffffc0ffffffc0fffffff */
- r0.u = EXP(52+0) | (U8TOU32(&key[0]) & 0x0fffffff);
- r1.u = EXP(52+32) | (U8TOU32(&key[4]) & 0x0ffffffc);
- r2.u = EXP(52+64) | (U8TOU32(&key[8]) & 0x0ffffffc);
- r3.u = EXP(52+96) | (U8TOU32(&key[12]) & 0x0ffffffc);
+ r0.u = EXP(52 + 0) | (U8TOU32(&key[0]) & 0x0fffffff);
+ r1.u = EXP(52 + 32) | (U8TOU32(&key[4]) & 0x0ffffffc);
+ r2.u = EXP(52 + 64) | (U8TOU32(&key[8]) & 0x0ffffffc);
+ r3.u = EXP(52 + 96) | (U8TOU32(&key[12]) & 0x0ffffffc);
- st->r[0] = r0.d - TWO(52)*TWO0;
- st->r[2] = r1.d - TWO(52)*TWO32;
- st->r[4] = r2.d - TWO(52)*TWO64;
- st->r[6] = r3.d - TWO(52)*TWO96;
+ st->r[0] = r0.d - TWO(52) * TWO0;
+ st->r[2] = r1.d - TWO(52) * TWO32;
+ st->r[4] = r2.d - TWO(52) * TWO64;
+ st->r[6] = r3.d - TWO(52) * TWO96;
- st->s[0] = st->r[2] * (5.0/TWO130);
- st->s[2] = st->r[4] * (5.0/TWO130);
- st->s[4] = st->r[6] * (5.0/TWO130);
+ st->s[0] = st->r[2] * (5.0 / TWO130);
+ st->s[2] = st->r[4] * (5.0 / TWO130);
+ st->s[4] = st->r[6] * (5.0 / TWO130);
/*
* base 2^32 -> base 2^16
*/
- st->r[1] = (st->r[0] + TWO(52)*TWO(16)*TWO0) -
- TWO(52)*TWO(16)*TWO0;
+ st->r[1] = (st->r[0] + TWO(52) * TWO(16) * TWO0) - TWO(52) * TWO(16) * TWO0;
st->r[0] -= st->r[1];
- st->r[3] = (st->r[2] + TWO(52)*TWO(16)*TWO32) -
- TWO(52)*TWO(16)*TWO32;
+ st->r[3] = (st->r[2] + TWO(52) * TWO(16) * TWO32) - TWO(52) * TWO(16) * TWO32;
st->r[2] -= st->r[3];
- st->r[5] = (st->r[4] + TWO(52)*TWO(16)*TWO64) -
- TWO(52)*TWO(16)*TWO64;
+ st->r[5] = (st->r[4] + TWO(52) * TWO(16) * TWO64) - TWO(52) * TWO(16) * TWO64;
st->r[4] -= st->r[5];
- st->r[7] = (st->r[6] + TWO(52)*TWO(16)*TWO96) -
- TWO(52)*TWO(16)*TWO96;
+ st->r[7] = (st->r[6] + TWO(52) * TWO(16) * TWO96) - TWO(52) * TWO(16) * TWO96;
st->r[6] -= st->r[7];
- st->s[1] = (st->s[0] + TWO(52)*TWO(16)*TWO0/TWO96) -
- TWO(52)*TWO(16)*TWO0/TWO96;
+ st->s[1] = (st->s[0] + TWO(52) * TWO(16) * TWO0 / TWO96) - TWO(52) * TWO(16) * TWO0 / TWO96;
st->s[0] -= st->s[1];
- st->s[3] = (st->s[2] + TWO(52)*TWO(16)*TWO32/TWO96) -
- TWO(52)*TWO(16)*TWO32/TWO96;
+ st->s[3] = (st->s[2] + TWO(52) * TWO(16) * TWO32 / TWO96) - TWO(52) * TWO(16) * TWO32 / TWO96;
st->s[2] -= st->s[3];
- st->s[5] = (st->s[4] + TWO(52)*TWO(16)*TWO64/TWO96) -
- TWO(52)*TWO(16)*TWO64/TWO96;
+ st->s[5] = (st->s[4] + TWO(52) * TWO(16) * TWO64 / TWO96) - TWO(52) * TWO(16) * TWO64 / TWO96;
st->s[4] -= st->s[5];
/*
* restore original FPU control register
*/
#if defined(__x86_64__)
- asm volatile ("ldmxcsr %0"::"m"(mxcsr_orig));
+ asm volatile("ldmxcsr %0" ::"m"(mxcsr_orig));
#elif defined(__PPC__) || defined(__POWERPC__)
- asm volatile ("mtfsf 255,%0"::"f"(fpscr_orig));
+ asm volatile("mtfsf 255,%0" ::"f"(fpscr_orig));
#elif defined(__s390x__)
- asm volatile ("lfpc %0"::"m"(fpc_orig));
+ asm volatile("lfpc %0" ::"m"(fpc_orig));
#elif defined(__sparc__)
- asm volatile ("ldx %0,%%fsr"::"m"(fsr_orig));
+ asm volatile("ldx %0,%%fsr" ::"m"(fsr_orig));
#elif defined(__mips__)
- asm volatile ("ctc1 %0,$31"::"r"(fcsr_orig));
+ asm volatile("ctc1 %0,$31" ::"r"(fcsr_orig));
#endif
}
@@ -222,11 +217,11 @@ int poly1305_init(void *ctx, const unsigned char key[16])
}
void poly1305_blocks(void *ctx, const unsigned char *inp, size_t len,
- int padbit)
+ int padbit)
{
poly1305_internal *st = (poly1305_internal *)ctx;
elem64 in0, in1, in2, in3;
- u64 pad = (u64)padbit<<32;
+ u64 pad = (u64)padbit << 32;
double x0, x1, x2, x3;
double h0lo, h0hi, h1lo, h1hi, h2lo, h2hi, h3lo, h3hi;
@@ -254,37 +249,37 @@ void poly1305_blocks(void *ctx, const unsigned char *inp, size_t len,
#if defined(__x86_64__)
u32 mxcsr_orig;
- asm volatile ("stmxcsr %0":"=m"(mxcsr_orig));
- asm volatile ("ldmxcsr %0"::"m"(mxcsr));
+ asm volatile("stmxcsr %0" : "=m"(mxcsr_orig));
+ asm volatile("ldmxcsr %0" ::"m"(mxcsr));
#elif defined(__PPC__) || defined(__POWERPC__)
double fpscr_orig, fpscr = *(double *)&one;
- asm volatile ("mffs %0":"=f"(fpscr_orig));
- asm volatile ("mtfsf 255,%0"::"f"(fpscr));
+ asm volatile("mffs %0" : "=f"(fpscr_orig));
+ asm volatile("mtfsf 255,%0" ::"f"(fpscr));
#elif defined(__s390x__)
u32 fpc_orig;
- asm volatile ("stfpc %0":"=m"(fpc_orig));
- asm volatile ("lfpc %0"::"m"(fpc));
+ asm volatile("stfpc %0" : "=m"(fpc_orig));
+ asm volatile("lfpc %0" ::"m"(fpc));
#elif defined(__sparc__)
u64 fsr_orig;
- asm volatile ("stx %%fsr,%0":"=m"(fsr_orig));
- asm volatile ("ldx %0,%%fsr"::"m"(fsr));
+ asm volatile("stx %%fsr,%0" : "=m"(fsr_orig));
+ asm volatile("ldx %0,%%fsr" ::"m"(fsr));
#elif defined(__mips__)
u32 fcsr_orig;
- asm volatile ("cfc1 %0,$31":"=r"(fcsr_orig));
- asm volatile ("ctc1 %0,$31"::"r"(fcsr));
+ asm volatile("cfc1 %0,$31" : "=r"(fcsr_orig));
+ asm volatile("ctc1 %0,$31" ::"r"(fcsr));
#endif
/*
* load base 2^32 and de-bias
*/
- h0lo = st->h[0].d - TWO(52)*TWO0;
- h1lo = st->h[1].d - TWO(52)*TWO32;
- h2lo = st->h[2].d - TWO(52)*TWO64;
- h3lo = st->h[3].d - TWO(52)*TWO96;
+ h0lo = st->h[0].d - TWO(52) * TWO0;
+ h1lo = st->h[1].d - TWO(52) * TWO32;
+ h2lo = st->h[2].d - TWO(52) * TWO64;
+ h3lo = st->h[3].d - TWO(52) * TWO96;
#ifdef __clang__
h0hi = 0;
@@ -292,15 +287,15 @@ void poly1305_blocks(void *ctx, const unsigned char *inp, size_t len,
h2hi = 0;
h3hi = 0;
#else
- in0.u = EXP(52+0) | U8TOU32(&inp[0]);
- in1.u = EXP(52+32) | U8TOU32(&inp[4]);
- in2.u = EXP(52+64) | U8TOU32(&inp[8]);
- in3.u = EXP(52+96) | U8TOU32(&inp[12]) | pad;
+ in0.u = EXP(52 + 0) | U8TOU32(&inp[0]);
+ in1.u = EXP(52 + 32) | U8TOU32(&inp[4]);
+ in2.u = EXP(52 + 64) | U8TOU32(&inp[8]);
+ in3.u = EXP(52 + 96) | U8TOU32(&inp[12]) | pad;
- x0 = in0.d - TWO(52)*TWO0;
- x1 = in1.d - TWO(52)*TWO32;
- x2 = in2.d - TWO(52)*TWO64;
- x3 = in3.d - TWO(52)*TWO96;
+ x0 = in0.d - TWO(52) * TWO0;
+ x1 = in1.d - TWO(52) * TWO32;
+ x2 = in2.d - TWO(52) * TWO64;
+ x3 = in3.d - TWO(52) * TWO96;
x0 += h0lo;
x1 += h1lo;
@@ -311,15 +306,15 @@ void poly1305_blocks(void *ctx, const unsigned char *inp, size_t len,
#endif
do {
- in0.u = EXP(52+0) | U8TOU32(&inp[0]);
- in1.u = EXP(52+32) | U8TOU32(&inp[4]);
- in2.u = EXP(52+64) | U8TOU32(&inp[8]);
- in3.u = EXP(52+96) | U8TOU32(&inp[12]) | pad;
+ in0.u = EXP(52 + 0) | U8TOU32(&inp[0]);
+ in1.u = EXP(52 + 32) | U8TOU32(&inp[4]);
+ in2.u = EXP(52 + 64) | U8TOU32(&inp[8]);
+ in3.u = EXP(52 + 96) | U8TOU32(&inp[12]) | pad;
- x0 = in0.d - TWO(52)*TWO0;
- x1 = in1.d - TWO(52)*TWO32;
- x2 = in2.d - TWO(52)*TWO64;
- x3 = in3.d - TWO(52)*TWO96;
+ x0 = in0.d - TWO(52) * TWO0;
+ x1 = in1.d - TWO(52) * TWO32;
+ x2 = in2.d - TWO(52) * TWO64;
+ x3 = in3.d - TWO(52) * TWO96;
/*
* note that there are multiple ways to accumulate input, e.g.
@@ -333,28 +328,28 @@ void poly1305_blocks(void *ctx, const unsigned char *inp, size_t len,
/*
* carries that cross 32n-bit (and 130-bit) boundaries
*/
- c0lo = (h0lo + TWO(52)*TWO32) - TWO(52)*TWO32;
- c1lo = (h1lo + TWO(52)*TWO64) - TWO(52)*TWO64;
- c2lo = (h2lo + TWO(52)*TWO96) - TWO(52)*TWO96;
- c3lo = (h3lo + TWO(52)*TWO130) - TWO(52)*TWO130;
+ c0lo = (h0lo + TWO(52) * TWO32) - TWO(52) * TWO32;
+ c1lo = (h1lo + TWO(52) * TWO64) - TWO(52) * TWO64;
+ c2lo = (h2lo + TWO(52) * TWO96) - TWO(52) * TWO96;
+ c3lo = (h3lo + TWO(52) * TWO130) - TWO(52) * TWO130;
- c0hi = (h0hi + TWO(52)*TWO32) - TWO(52)*TWO32;
- c1hi = (h1hi + TWO(52)*TWO64) - TWO(52)*TWO64;
- c2hi = (h2hi + TWO(52)*TWO96) - TWO(52)*TWO96;
- c3hi = (h3hi + TWO(52)*TWO130) - TWO(52)*TWO130;
+ c0hi = (h0hi + TWO(52) * TWO32) - TWO(52) * TWO32;
+ c1hi = (h1hi + TWO(52) * TWO64) - TWO(52) * TWO64;
+ c2hi = (h2hi + TWO(52) * TWO96) - TWO(52) * TWO96;
+ c3hi = (h3hi + TWO(52) * TWO130) - TWO(52) * TWO130;
/*
* base 2^48 -> base 2^32 with last reduction step
*/
- x1 = (h1lo - c1lo) + c0lo;
- x2 = (h2lo - c2lo) + c1lo;
- x3 = (h3lo - c3lo) + c2lo;
- x0 = (h0lo - c0lo) + c3lo * (5.0/TWO130);
+ x1 = (h1lo - c1lo) + c0lo;
+ x2 = (h2lo - c2lo) + c1lo;
+ x3 = (h3lo - c3lo) + c2lo;
+ x0 = (h0lo - c0lo) + c3lo * (5.0 / TWO130);
x1 += (h1hi - c1hi) + c0hi;
x2 += (h2hi - c2hi) + c1hi;
x3 += (h3hi - c3hi) + c2hi;
- x0 += (h0hi - c0hi) + c3hi * (5.0/TWO130);
+ x0 += (h0hi - c0hi) + c3hi * (5.0 / TWO130);
#ifndef __clang__
fast_entry:
@@ -380,56 +375,56 @@ void poly1305_blocks(void *ctx, const unsigned char *inp, size_t len,
/*
* carries that cross 32n-bit (and 130-bit) boundaries
*/
- c0lo = (h0lo + TWO(52)*TWO32) - TWO(52)*TWO32;
- c1lo = (h1lo + TWO(52)*TWO64) - TWO(52)*TWO64;
- c2lo = (h2lo + TWO(52)*TWO96) - TWO(52)*TWO96;
- c3lo = (h3lo + TWO(52)*TWO130) - TWO(52)*TWO130;
+ c0lo = (h0lo + TWO(52) * TWO32) - TWO(52) * TWO32;
+ c1lo = (h1lo + TWO(52) * TWO64) - TWO(52) * TWO64;
+ c2lo = (h2lo + TWO(52) * TWO96) - TWO(52) * TWO96;
+ c3lo = (h3lo + TWO(52) * TWO130) - TWO(52) * TWO130;
- c0hi = (h0hi + TWO(52)*TWO32) - TWO(52)*TWO32;
- c1hi = (h1hi + TWO(52)*TWO64) - TWO(52)*TWO64;
- c2hi = (h2hi + TWO(52)*TWO96) - TWO(52)*TWO96;
- c3hi = (h3hi + TWO(52)*TWO130) - TWO(52)*TWO130;
+ c0hi = (h0hi + TWO(52) * TWO32) - TWO(52) * TWO32;
+ c1hi = (h1hi + TWO(52) * TWO64) - TWO(52) * TWO64;
+ c2hi = (h2hi + TWO(52) * TWO96) - TWO(52) * TWO96;
+ c3hi = (h3hi + TWO(52) * TWO130) - TWO(52) * TWO130;
/*
* base 2^48 -> base 2^32 with last reduction step
*/
- x1 = (h1lo - c1lo) + c0lo;
- x2 = (h2lo - c2lo) + c1lo;
- x3 = (h3lo - c3lo) + c2lo;
- x0 = (h0lo - c0lo) + c3lo * (5.0/TWO130);
+ x1 = (h1lo - c1lo) + c0lo;
+ x2 = (h2lo - c2lo) + c1lo;
+ x3 = (h3lo - c3lo) + c2lo;
+ x0 = (h0lo - c0lo) + c3lo * (5.0 / TWO130);
x1 += (h1hi - c1hi) + c0hi;
x2 += (h2hi - c2hi) + c1hi;
x3 += (h3hi - c3hi) + c2hi;
- x0 += (h0hi - c0hi) + c3hi * (5.0/TWO130);
+ x0 += (h0hi - c0hi) + c3hi * (5.0 / TWO130);
/*
* store base 2^32, with bias
*/
- st->h[1].d = x1 + TWO(52)*TWO32;
- st->h[2].d = x2 + TWO(52)*TWO64;
- st->h[3].d = x3 + TWO(52)*TWO96;
- st->h[0].d = x0 + TWO(52)*TWO0;
+ st->h[1].d = x1 + TWO(52) * TWO32;
+ st->h[2].d = x2 + TWO(52) * TWO64;
+ st->h[3].d = x3 + TWO(52) * TWO96;
+ st->h[0].d = x0 + TWO(52) * TWO0;
/*
* restore original FPU control register
*/
#if defined(__x86_64__)
- asm volatile ("ldmxcsr %0"::"m"(mxcsr_orig));
+ asm volatile("ldmxcsr %0" ::"m"(mxcsr_orig));
#elif defined(__PPC__) || defined(__POWERPC__)
- asm volatile ("mtfsf 255,%0"::"f"(fpscr_orig));
+ asm volatile("mtfsf 255,%0" ::"f"(fpscr_orig));
#elif defined(__s390x__)
- asm volatile ("lfpc %0"::"m"(fpc_orig));
+ asm volatile("lfpc %0" ::"m"(fpc_orig));
#elif defined(__sparc__)
- asm volatile ("ldx %0,%%fsr"::"m"(fsr_orig));
+ asm volatile("ldx %0,%%fsr" ::"m"(fsr_orig));
#elif defined(__mips__)
- asm volatile ("ctc1 %0,$31"::"r"(fcsr_orig));
+ asm volatile("ctc1 %0,$31" ::"r"(fcsr_orig));
#endif
}
void poly1305_emit(void *ctx, unsigned char mac[16], const u32 nonce[4])
{
- poly1305_internal *st = (poly1305_internal *) ctx;
+ poly1305_internal *st = (poly1305_internal *)ctx;
u64 h0, h1, h2, h3, h4;
u32 g0, g1, g2, g3, g4;
u64 t;
@@ -446,15 +441,19 @@ void poly1305_emit(void *ctx, unsigned char mac[16], const u32 nonce[4])
/*
* can be partially reduced, so reduce...
*/
- h4 = h3>>32; h3 &= 0xffffffffU;
- g4 = h4&-4;
+ h4 = h3 >> 32;
+ h3 &= 0xffffffffU;
+ g4 = h4 & -4;
h4 &= 3;
- g4 += g4>>2;
+ g4 += g4 >> 2;
h0 += g4;
- h1 += h0>>32; h0 &= 0xffffffffU;
- h2 += h1>>32; h1 &= 0xffffffffU;
- h3 += h2>>32; h2 &= 0xffffffffU;
+ h1 += h0 >> 32;
+ h0 &= 0xffffffffU;
+ h2 += h1 >> 32;
+ h1 &= 0xffffffffU;
+ h3 += h2 >> 32;
+ h2 &= 0xffffffffU;
/* compute h + -p */
g0 = (u32)(t = h0 + 5);
diff --git a/crypto/poly1305/poly1305_ppc.c b/crypto/poly1305/poly1305_ppc.c
index 4e4e3d1994..a40ce729b7 100644
--- a/crypto/poly1305/poly1305_ppc.c
+++ b/crypto/poly1305/poly1305_ppc.c
@@ -14,34 +14,34 @@
void poly1305_init_int(void *ctx, const unsigned char key[16]);
void poly1305_blocks(void *ctx, const unsigned char *inp, size_t len,
- unsigned int padbit);
+ unsigned int padbit);
void poly1305_emit(void *ctx, unsigned char mac[16],
- const unsigned int nonce[4]);
+ const unsigned int nonce[4]);
void poly1305_init_fpu(void *ctx, const unsigned char key[16]);
void poly1305_blocks_fpu(void *ctx, const unsigned char *inp, size_t len,
- unsigned int padbit);
+ unsigned int padbit);
void poly1305_emit_fpu(void *ctx, unsigned char mac[16],
- const unsigned int nonce[4]);
+ const unsigned int nonce[4]);
void poly1305_init_vsx(void *ctx, const unsigned char key[16]);
void poly1305_blocks_vsx(void *ctx, const unsigned char *inp, size_t len,
- unsigned int padbit);
+ unsigned int padbit);
void poly1305_emit_vsx(void *ctx, unsigned char mac[16],
- const unsigned int nonce[4]);
+ const unsigned int nonce[4]);
int poly1305_init(void *ctx, const unsigned char key[16], void *func[2]);
int poly1305_init(void *ctx, const unsigned char key[16], void *func[2])
{
if (OPENSSL_ppccap_P & PPC_CRYPTO207) {
poly1305_init_int(ctx, key);
- func[0] = (void*)(uintptr_t)poly1305_blocks_vsx;
- func[1] = (void*)(uintptr_t)poly1305_emit;
+ func[0] = (void *)(uintptr_t)poly1305_blocks_vsx;
+ func[1] = (void *)(uintptr_t)poly1305_emit;
} else if (sizeof(size_t) == 4 && (OPENSSL_ppccap_P & PPC_FPU)) {
poly1305_init_fpu(ctx, key);
- func[0] = (void*)(uintptr_t)poly1305_blocks_fpu;
- func[1] = (void*)(uintptr_t)poly1305_emit_fpu;
+ func[0] = (void *)(uintptr_t)poly1305_blocks_fpu;
+ func[1] = (void *)(uintptr_t)poly1305_emit_fpu;
} else {
poly1305_init_int(ctx, key);
- func[0] = (void*)(uintptr_t)poly1305_blocks;
- func[1] = (void*)(uintptr_t)poly1305_emit;
+ func[0] = (void *)(uintptr_t)poly1305_blocks;
+ func[1] = (void *)(uintptr_t)poly1305_emit;
}
return 1;
}
diff --git a/crypto/ppccap.c b/crypto/ppccap.c
index d4d3c8206d..91a3e09573 100644
--- a/crypto/ppccap.c
+++ b/crypto/ppccap.c
@@ -14,17 +14,17 @@
#include <signal.h>
#include <unistd.h>
#if defined(__linux) || defined(_AIX)
-# include <sys/utsname.h>
+#include <sys/utsname.h>
+#endif
+#if defined(_AIX53) /* defined even on post-5.3 */
+#include <sys/systemcfg.h>
+#if !defined(__power_set)
+#define __power_set(a) (_system_configuration.implementation & (a))
#endif
-#if defined(_AIX53) /* defined even on post-5.3 */
-# include <sys/systemcfg.h>
-# if !defined(__power_set)
-# define __power_set(a) (_system_configuration.implementation & (a))
-# endif
#endif
#if defined(__APPLE__) && defined(__MACH__)
-# include <sys/types.h>
-# include <sys/sysctl.h>
+#include <sys/types.h>
+#include <sys/sysctl.h>
#endif
#include <openssl/crypto.h>
#include "internal/cryptlib.h"
@@ -87,53 +87,52 @@ size_t OPENSSL_instrument_bus2(unsigned int *out, size_t cnt, size_t max)
}
#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
-# if __GLIBC_PREREQ(2, 16)
-# include <sys/auxv.h>
-# define OSSL_IMPLEMENT_GETAUXVAL
-# elif defined(__ANDROID_API__)
+#if __GLIBC_PREREQ(2, 16)
+#include <sys/auxv.h>
+#define OSSL_IMPLEMENT_GETAUXVAL
+#elif defined(__ANDROID_API__)
/* see https://developer.android.google.cn/ndk/guides/cpu-features */
-# if __ANDROID_API__ >= 18
-# include <sys/auxv.h>
-# define OSSL_IMPLEMENT_GETAUXVAL
-# endif
-# endif
+#if __ANDROID_API__ >= 18
+#include <sys/auxv.h>
+#define OSSL_IMPLEMENT_GETAUXVAL
+#endif
+#endif
#endif
#if defined(__FreeBSD__) || defined(__OpenBSD__)
-# include <sys/param.h>
-# if (defined(__FreeBSD__) && __FreeBSD_version >= 1104000) || \
- (defined(__OpenBSD__) && OpenBSD >= 202409)
-# include <sys/auxv.h>
-# define OSSL_IMPLEMENT_GETAUXVAL
+#include <sys/param.h>
+#if (defined(__FreeBSD__) && __FreeBSD_version >= 1104000) || (defined(__OpenBSD__) && OpenBSD >= 202409)
+#include <sys/auxv.h>
+#define OSSL_IMPLEMENT_GETAUXVAL
static unsigned long getauxval(unsigned long key)
{
- unsigned long val = 0ul;
+ unsigned long val = 0ul;
- if (elf_aux_info((int)key, &val, sizeof(val)) != 0)
- return 0ul;
+ if (elf_aux_info((int)key, &val, sizeof(val)) != 0)
+ return 0ul;
- return val;
+ return val;
}
-# endif
+#endif
#endif
/* I wish <sys/auxv.h> was universally available */
#ifndef AT_HWCAP
-# define AT_HWCAP 16 /* AT_HWCAP */
+#define AT_HWCAP 16 /* AT_HWCAP */
#endif
-#define HWCAP_PPC64 (1U << 30)
-#define HWCAP_ALTIVEC (1U << 28)
-#define HWCAP_FPU (1U << 27)
-#define HWCAP_POWER6_EXT (1U << 9)
-#define HWCAP_VSX (1U << 7)
+#define HWCAP_PPC64 (1U << 30)
+#define HWCAP_ALTIVEC (1U << 28)
+#define HWCAP_FPU (1U << 27)
+#define HWCAP_POWER6_EXT (1U << 9)
+#define HWCAP_VSX (1U << 7)
#ifndef AT_HWCAP2
-# define AT_HWCAP2 26 /* AT_HWCAP2 */
+#define AT_HWCAP2 26 /* AT_HWCAP2 */
#endif
-#define HWCAP_VEC_CRYPTO (1U << 25)
-#define HWCAP_ARCH_3_00 (1U << 23)
-#define HWCAP_ARCH_3_1 (1U << 18)
+#define HWCAP_VEC_CRYPTO (1U << 25)
+#define HWCAP_ARCH_3_00 (1U << 23)
+#define HWCAP_ARCH_3_1 (1U << 18)
void OPENSSL_cpuid_setup(void)
{
@@ -158,15 +157,15 @@ void OPENSSL_cpuid_setup(void)
if (sizeof(size_t) == 4) {
struct utsname uts;
-# if defined(_SC_AIX_KERNEL_BITMODE)
+#if defined(_SC_AIX_KERNEL_BITMODE)
if (sysconf(_SC_AIX_KERNEL_BITMODE) != 64)
return;
-# endif
+#endif
if (uname(&uts) != 0 || atoi(uts.version) < 6)
return;
}
-# if defined(__power_set)
+#if defined(__power_set)
/*
* Value used in __power_set is a single-bit 1<<n one denoting
* specific processor class. Incidentally 0xffffffff<<n can be
@@ -174,28 +173,28 @@ void OPENSSL_cpuid_setup(void)
*/
if (sizeof(size_t) == 4) {
/* In 32-bit case PPC_FPU64 is always fastest [if option] */
- if (__power_set(0xffffffffU<<13)) /* POWER5 and later */
+ if (__power_set(0xffffffffU << 13)) /* POWER5 and later */
OPENSSL_ppccap_P |= PPC_FPU64;
} else {
/* In 64-bit case PPC_FPU64 is fastest only on POWER6 */
- if (__power_set(0x1U<<14)) /* POWER6 */
+ if (__power_set(0x1U << 14)) /* POWER6 */
OPENSSL_ppccap_P |= PPC_FPU64;
}
- if (__power_set(0xffffffffU<<14)) /* POWER6 and later */
+ if (__power_set(0xffffffffU << 14)) /* POWER6 and later */
OPENSSL_ppccap_P |= PPC_ALTIVEC;
- if (__power_set(0xffffffffU<<16)) /* POWER8 and later */
+ if (__power_set(0xffffffffU << 16)) /* POWER8 and later */
OPENSSL_ppccap_P |= PPC_CRYPTO207;
- if (__power_set(0xffffffffU<<17)) /* POWER9 and later */
+ if (__power_set(0xffffffffU << 17)) /* POWER9 and later */
OPENSSL_ppccap_P |= PPC_MADD300;
- if (__power_set(0xffffffffU<<18)) /* POWER10 and later */
+ if (__power_set(0xffffffffU << 18)) /* POWER10 and later */
OPENSSL_ppccap_P |= PPC_BRD31;
return;
-# endif
+#endif
#endif
#if defined(__APPLE__) && defined(__MACH__)
@@ -279,10 +278,10 @@ void OPENSSL_cpuid_setup(void)
OPENSSL_ppccap_P |= PPC_FPU;
if (sizeof(size_t) == 4) {
-# ifdef __linux
+#ifdef __linux
struct utsname uts;
if (uname(&uts) == 0 && strcmp(uts.machine, "ppc64") == 0)
-# endif
+#endif
if (sigsetjmp(ill_jmp, 1) == 0) {
OPENSSL_ppc64_probe();
OPENSSL_ppccap_P |= PPC_FPU64;
diff --git a/crypto/property/defn_cache.c b/crypto/property/defn_cache.c
index eb68a55aa7..b9608610a4 100644
--- a/crypto/property/defn_cache.c
+++ b/crypto/property/defn_cache.c
@@ -37,7 +37,7 @@ static unsigned long property_defn_hash(const PROPERTY_DEFN_ELEM *a)
}
static int property_defn_cmp(const PROPERTY_DEFN_ELEM *a,
- const PROPERTY_DEFN_ELEM *b)
+ const PROPERTY_DEFN_ELEM *b)
{
return strcmp(a->prop, b->prop);
}
@@ -54,12 +54,13 @@ void ossl_property_defns_free(void *vproperty_defns)
if (property_defns != NULL) {
lh_PROPERTY_DEFN_ELEM_doall(property_defns,
- &property_defn_free);
+ &property_defn_free);
lh_PROPERTY_DEFN_ELEM_free(property_defns);
}
}
-void *ossl_property_defns_new(OSSL_LIB_CTX *ctx) {
+void *ossl_property_defns_new(OSSL_LIB_CTX *ctx)
+{
return lh_PROPERTY_DEFN_ELEM_new(&property_defn_hash, &property_defn_cmp);
}
@@ -69,7 +70,7 @@ OSSL_PROPERTY_LIST *ossl_prop_defn_get(OSSL_LIB_CTX *ctx, const char *prop)
LHASH_OF(PROPERTY_DEFN_ELEM) *property_defns;
property_defns = ossl_lib_ctx_get_data(ctx,
- OSSL_LIB_CTX_PROPERTY_DEFN_INDEX);
+ OSSL_LIB_CTX_PROPERTY_DEFN_INDEX);
if (!ossl_assert(property_defns != NULL) || !ossl_lib_ctx_read_lock(ctx))
return NULL;
@@ -87,7 +88,7 @@ OSSL_PROPERTY_LIST *ossl_prop_defn_get(OSSL_LIB_CTX *ctx, const char *prop)
* overwritten with the existing entry from the cache.
*/
int ossl_prop_defn_set(OSSL_LIB_CTX *ctx, const char *prop,
- OSSL_PROPERTY_LIST **pl)
+ OSSL_PROPERTY_LIST **pl)
{
PROPERTY_DEFN_ELEM elem, *old, *p = NULL;
size_t len;
@@ -95,7 +96,7 @@ int ossl_prop_defn_set(OSSL_LIB_CTX *ctx, const char *prop,
int res = 1;
property_defns = ossl_lib_ctx_get_data(ctx,
- OSSL_LIB_CTX_PROPERTY_DEFN_INDEX);
+ OSSL_LIB_CTX_PROPERTY_DEFN_INDEX);
if (property_defns == NULL)
return 0;
@@ -130,7 +131,7 @@ int ossl_prop_defn_set(OSSL_LIB_CTX *ctx, const char *prop,
}
OPENSSL_free(p);
res = 0;
- end:
+end:
ossl_lib_ctx_unlock(ctx);
return res;
}
diff --git a/crypto/property/property.c b/crypto/property/property.c
index aab184382f..4c35d1eb7e 100644
--- a/crypto/property/property.c
+++ b/crypto/property/property.c
@@ -31,7 +31,7 @@
* If reducing this, also ensure the stochastic test in test/property_test.c
* isn't likely to fail.
*/
-#define IMPL_CACHE_FLUSH_THRESHOLD 500
+#define IMPL_CACHE_FLUSH_THRESHOLD 500
typedef struct {
void *method;
@@ -64,7 +64,7 @@ typedef struct {
struct ossl_method_store_st {
OSSL_LIB_CTX *ctx;
- SPARSE_ARRAY_OF(ALGORITHM) *algs;
+ SPARSE_ARRAY_OF(ALGORITHM) * algs;
/*
* Lock to protect the |algs| array from concurrent writing, when
* individual implementations or queries are inserted. This is used
@@ -107,7 +107,7 @@ typedef struct ossl_global_properties_st {
} OSSL_GLOBAL_PROPERTIES;
static void ossl_method_cache_flush_alg(OSSL_METHOD_STORE *store,
- ALGORITHM *alg);
+ ALGORITHM *alg);
static void ossl_method_cache_flush(OSSL_METHOD_STORE *store, int nid);
/* Global properties are stored per library context */
@@ -127,7 +127,7 @@ void *ossl_ctx_global_properties_new(OSSL_LIB_CTX *ctx)
}
OSSL_PROPERTY_LIST **ossl_ctx_global_properties(OSSL_LIB_CTX *libctx,
- ossl_unused int loadconfig)
+ ossl_unused int loadconfig)
{
OSSL_GLOBAL_PROPERTIES *globp;
@@ -196,7 +196,7 @@ static int query_cmp(const QUERY *a, const QUERY *b)
if (res == 0 && a->provider != NULL && b->provider != NULL)
res = b->provider > a->provider ? 1
: b->provider < a->provider ? -1
- : 0;
+ : 0;
return res;
}
@@ -315,9 +315,9 @@ static int ossl_method_store_insert(OSSL_METHOD_STORE *store, ALGORITHM *alg)
* It is an internal unique identifier.
*/
int ossl_method_store_add(OSSL_METHOD_STORE *store, const OSSL_PROVIDER *prov,
- int nid, const char *properties, void *method,
- int (*method_up_ref)(void *),
- void (*method_destruct)(void *))
+ int nid, const char *properties, void *method,
+ int (*method_up_ref)(void *),
+ void (*method_destruct)(void *))
{
ALGORITHM *alg = NULL;
IMPLEMENTATION *impl;
@@ -388,8 +388,8 @@ int ossl_method_store_add(OSSL_METHOD_STORE *store, const OSSL_PROVIDER *prov,
alg = ossl_method_store_retrieve(store, nid);
if (alg == NULL) {
if ((alg = OPENSSL_zalloc(sizeof(*alg))) == NULL
- || (alg->impls = sk_IMPLEMENTATION_new_null()) == NULL
- || (alg->cache = lh_QUERY_new(&query_hash, &query_cmp)) == NULL)
+ || (alg->impls = sk_IMPLEMENTATION_new_null()) == NULL
+ || (alg->cache = lh_QUERY_new(&query_hash, &query_cmp)) == NULL)
goto err;
alg->nid = nid;
if (!ossl_method_store_insert(store, alg))
@@ -410,13 +410,14 @@ int ossl_method_store_add(OSSL_METHOD_STORE *store, const OSSL_PROVIDER *prov,
&& sk_IMPLEMENTATION_push(alg->impls, impl)) {
ret = 1;
#ifndef FIPS_MODULE
- OSSL_TRACE_BEGIN(QUERY) {
+ OSSL_TRACE_BEGIN(QUERY)
+ {
BIO_printf(trc_out, "Adding to method store "
- "nid: %d\nproperties: %s\nprovider: %s\n",
- nid, properties,
- ossl_provider_name(prov) == NULL ? "none" :
- ossl_provider_name(prov));
- } OSSL_TRACE_END(QUERY);
+ "nid: %d\nproperties: %s\nprovider: %s\n",
+ nid, properties,
+ ossl_provider_name(prov) == NULL ? "none" : ossl_provider_name(prov));
+ }
+ OSSL_TRACE_END(QUERY);
#endif
}
ossl_property_unlock(store);
@@ -432,7 +433,7 @@ err:
}
int ossl_method_store_remove(OSSL_METHOD_STORE *store, int nid,
- const void *method)
+ const void *method)
{
ALGORITHM *alg = NULL;
int i;
@@ -503,18 +504,19 @@ alg_cleanup_by_provider(ossl_uintmax_t idx, ALGORITHM *alg, void *arg)
if (impl->provider == data->prov) {
#ifndef FIPS_MODULE
- OSSL_TRACE_BEGIN(QUERY) {
+ OSSL_TRACE_BEGIN(QUERY)
+ {
char buf[512];
size_t size;
size = ossl_property_list_to_string(NULL, impl->properties, buf,
- sizeof(buf));
+ sizeof(buf));
BIO_printf(trc_out, "Removing implementation from "
- "query cache\nproperties %s\nprovider %s\n",
- size == 0 ? "none" : buf,
- ossl_provider_name(impl->provider) == NULL ? "none" :
- ossl_provider_name(impl->provider));
- } OSSL_TRACE_END(QUERY);
+ "query cache\nproperties %s\nprovider %s\n",
+ size == 0 ? "none" : buf,
+ ossl_provider_name(impl->provider) == NULL ? "none" : ossl_provider_name(impl->provider));
+ }
+ OSSL_TRACE_END(QUERY);
#endif
(void)sk_IMPLEMENTATION_delete(alg->impls, i);
@@ -534,7 +536,7 @@ alg_cleanup_by_provider(ossl_uintmax_t idx, ALGORITHM *alg, void *arg)
}
int ossl_method_store_remove_all_provided(OSSL_METHOD_STORE *store,
- const OSSL_PROVIDER *prov)
+ const OSSL_PROVIDER *prov)
{
struct alg_cleanup_by_provider_data_st data;
@@ -548,8 +550,8 @@ int ossl_method_store_remove_all_provided(OSSL_METHOD_STORE *store,
}
static void alg_do_one(ALGORITHM *alg, IMPLEMENTATION *impl,
- void (*fn)(int id, void *method, void *fnarg),
- void *fnarg)
+ void (*fn)(int id, void *method, void *fnarg),
+ void *fnarg)
{
fn(alg->nid, impl->method.method, fnarg);
}
@@ -574,8 +576,8 @@ static void del_tmpalg(ALGORITHM *alg)
}
void ossl_method_store_do_all(OSSL_METHOD_STORE *store,
- void (*fn)(int id, void *method, void *fnarg),
- void *fnarg)
+ void (*fn)(int id, void *method, void *fnarg),
+ void *fnarg)
{
int i, j;
int numalgs, numimps;
@@ -588,7 +590,7 @@ void ossl_method_store_do_all(OSSL_METHOD_STORE *store,
return;
tmpalgs = sk_ALGORITHM_new_reserve(NULL,
- (int)ossl_sa_ALGORITHM_num(store->algs));
+ (int)ossl_sa_ALGORITHM_num(store->algs));
if (tmpalgs == NULL) {
ossl_property_unlock(store);
return;
@@ -631,8 +633,8 @@ void ossl_method_store_do_all(OSSL_METHOD_STORE *store,
* It is a unique internal identifier value.
*/
int ossl_method_store_fetch(OSSL_METHOD_STORE *store,
- int nid, const char *prop_query,
- const OSSL_PROVIDER **prov_rw, void **method)
+ int nid, const char *prop_query,
+ const OSSL_PROVIDER **prov_rw, void **method)
{
OSSL_PROPERTY_LIST **plp;
ALGORITHM *alg;
@@ -647,7 +649,7 @@ int ossl_method_store_fetch(OSSL_METHOD_STORE *store,
#if !defined(FIPS_MODULE) && !defined(OPENSSL_NO_AUTOLOAD_CONFIG)
if (ossl_lib_ctx_is_default(store->ctx)
- && !OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, NULL))
+ && !OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, NULL))
return 0;
#endif
@@ -736,17 +738,18 @@ fin:
}
#ifndef FIPS_MODULE
- OSSL_TRACE_BEGIN(QUERY) {
+ OSSL_TRACE_BEGIN(QUERY)
+ {
char buf[512];
size_t size;
size = ossl_property_list_to_string(NULL, pq, buf, 512);
BIO_printf(trc_out, "method store query with properties %s "
- "resolves to provider %s\n",
- size == 0 ? "none" : buf,
- best_impl == NULL ? "none" :
- ossl_provider_name(best_impl->provider));
- } OSSL_TRACE_END(QUERY);
+ "resolves to provider %s\n",
+ size == 0 ? "none" : buf,
+ best_impl == NULL ? "none" : ossl_provider_name(best_impl->provider));
+ }
+ OSSL_TRACE_END(QUERY);
#endif
ossl_property_unlock(store);
@@ -755,7 +758,7 @@ fin:
}
static void ossl_method_cache_flush_alg(OSSL_METHOD_STORE *store,
- ALGORITHM *alg)
+ ALGORITHM *alg)
{
store->cache_nelem -= lh_QUERY_num_items(alg->cache);
impl_cache_flush_alg(0, alg);
@@ -821,7 +824,7 @@ static void impl_cache_flush_cache(QUERY *c, IMPL_CACHE_FLUSH *state)
}
static void impl_cache_flush_one_alg(ossl_uintmax_t idx, ALGORITHM *alg,
- void *v)
+ void *v)
{
IMPL_CACHE_FLUSH *state = (IMPL_CACHE_FLUSH *)v;
unsigned long orig_down_load = lh_QUERY_get_down_load(alg->cache);
@@ -829,7 +832,7 @@ static void impl_cache_flush_one_alg(ossl_uintmax_t idx, ALGORITHM *alg,
state->cache = alg->cache;
lh_QUERY_set_down_load(alg->cache, 0);
lh_QUERY_doall_IMPL_CACHE_FLUSH(state->cache, &impl_cache_flush_cache,
- state);
+ state);
lh_QUERY_set_down_load(alg->cache, orig_down_load);
}
@@ -854,7 +857,7 @@ static void ossl_method_cache_flush_some(OSSL_METHOD_STORE *store)
}
int ossl_method_store_cache_get(OSSL_METHOD_STORE *store, OSSL_PROVIDER *prov,
- int nid, const char *prop_query, void **method)
+ int nid, const char *prop_query, void **method)
{
ALGORITHM *alg;
QUERY elem, *r;
@@ -884,9 +887,9 @@ err:
}
int ossl_method_store_cache_set(OSSL_METHOD_STORE *store, OSSL_PROVIDER *prov,
- int nid, const char *prop_query, void *method,
- int (*method_up_ref)(void *),
- void (*method_destruct)(void *))
+ int nid, const char *prop_query, void *method,
+ int (*method_up_ref)(void *),
+ void (*method_destruct)(void *))
{
QUERY elem, *old, *p = NULL;
ALGORITHM *alg;
diff --git a/crypto/property/property_err.c b/crypto/property/property_err.c
index 9a25d60228..2361806fc7 100644
--- a/crypto/property/property_err.c
+++ b/crypto/property/property_err.c
@@ -14,24 +14,24 @@
#ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA PROP_str_reasons[] = {
- {ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NAME_TOO_LONG), "name too long"},
- {ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NOT_AN_ASCII_CHARACTER),
- "not an ascii character"},
- {ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NOT_AN_HEXADECIMAL_DIGIT),
- "not an hexadecimal digit"},
- {ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NOT_AN_IDENTIFIER), "not an identifier"},
- {ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NOT_AN_OCTAL_DIGIT),
- "not an octal digit"},
- {ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NOT_A_DECIMAL_DIGIT),
- "not a decimal digit"},
- {ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NO_MATCHING_STRING_DELIMITER),
- "no matching string delimiter"},
- {ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NO_VALUE), "no value"},
- {ERR_PACK(ERR_LIB_PROP, 0, PROP_R_PARSE_FAILED), "parse failed"},
- {ERR_PACK(ERR_LIB_PROP, 0, PROP_R_STRING_TOO_LONG), "string too long"},
- {ERR_PACK(ERR_LIB_PROP, 0, PROP_R_TRAILING_CHARACTERS),
- "trailing characters"},
- {0, NULL}
+ { ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NAME_TOO_LONG), "name too long" },
+ { ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NOT_AN_ASCII_CHARACTER),
+ "not an ascii character" },
+ { ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NOT_AN_HEXADECIMAL_DIGIT),
+ "not an hexadecimal digit" },
+ { ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NOT_AN_IDENTIFIER), "not an identifier" },
+ { ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NOT_AN_OCTAL_DIGIT),
+ "not an octal digit" },
+ { ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NOT_A_DECIMAL_DIGIT),
+ "not a decimal digit" },
+ { ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NO_MATCHING_STRING_DELIMITER),
+ "no matching string delimiter" },
+ { ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NO_VALUE), "no value" },
+ { ERR_PACK(ERR_LIB_PROP, 0, PROP_R_PARSE_FAILED), "parse failed" },
+ { ERR_PACK(ERR_LIB_PROP, 0, PROP_R_STRING_TOO_LONG), "string too long" },
+ { ERR_PACK(ERR_LIB_PROP, 0, PROP_R_TRAILING_CHARACTERS),
+ "trailing characters" },
+ { 0, NULL }
};
#endif
diff --git a/crypto/property/property_local.h b/crypto/property/property_local.h
index 797fb3bf5f..98484240bb 100644
--- a/crypto/property/property_local.h
+++ b/crypto/property/property_local.h
@@ -14,7 +14,9 @@
typedef int OSSL_PROPERTY_IDX;
typedef enum {
- OSSL_PROPERTY_OPER_EQ, OSSL_PROPERTY_OPER_NE, OSSL_PROPERTY_OVERRIDE
+ OSSL_PROPERTY_OPER_EQ,
+ OSSL_PROPERTY_OPER_NE,
+ OSSL_PROPERTY_OVERRIDE
} OSSL_PROPERTY_OPER;
struct ossl_property_definition_st {
@@ -23,8 +25,8 @@ struct ossl_property_definition_st {
OSSL_PROPERTY_OPER oper;
unsigned int optional : 1;
union {
- int64_t int_val; /* Signed integer */
- OSSL_PROPERTY_IDX str_val; /* String */
+ int64_t int_val; /* Signed integer */
+ OSSL_PROPERTY_IDX str_val; /* String */
} v;
};
@@ -34,15 +36,15 @@ struct ossl_property_list_st {
OSSL_PROPERTY_DEFINITION properties[1];
};
-#define OSSL_PROPERTY_TRUE 1
-#define OSSL_PROPERTY_FALSE 2
+#define OSSL_PROPERTY_TRUE 1
+#define OSSL_PROPERTY_FALSE 2
/* Property string functions */
OSSL_PROPERTY_IDX ossl_property_name(OSSL_LIB_CTX *ctx, const char *s,
- int create);
+ int create);
const char *ossl_property_name_str(OSSL_LIB_CTX *ctx, OSSL_PROPERTY_IDX idx);
OSSL_PROPERTY_IDX ossl_property_value(OSSL_LIB_CTX *ctx, const char *s,
- int create);
+ int create);
const char *ossl_property_value_str(OSSL_LIB_CTX *ctx, OSSL_PROPERTY_IDX idx);
/* Property list functions */
@@ -52,4 +54,4 @@ int ossl_property_has_optional(const OSSL_PROPERTY_LIST *query);
/* Property definition cache functions */
OSSL_PROPERTY_LIST *ossl_prop_defn_get(OSSL_LIB_CTX *ctx, const char *prop);
int ossl_prop_defn_set(OSSL_LIB_CTX *ctx, const char *prop,
- OSSL_PROPERTY_LIST **pl);
+ OSSL_PROPERTY_LIST **pl);
diff --git a/crypto/property/property_parse.c b/crypto/property/property_parse.c
index 23963c89bc..869d19da85 100644
--- a/crypto/property/property_parse.c
+++ b/crypto/property/property_parse.c
@@ -54,7 +54,7 @@ static int match(const char *t[], const char m[], size_t m_len)
}
static int parse_name(OSSL_LIB_CTX *ctx, const char *t[], int create,
- OSSL_PROPERTY_IDX *idx)
+ OSSL_PROPERTY_IDX *idx)
{
char name[100];
int err = 0;
@@ -65,7 +65,7 @@ static int parse_name(OSSL_LIB_CTX *ctx, const char *t[], int create,
for (;;) {
if (!ossl_isalpha(*s)) {
ERR_raise_data(ERR_LIB_PROP, PROP_R_NOT_AN_IDENTIFIER,
- "HERE-->%s", *t);
+ "HERE-->%s", *t);
return 0;
}
do {
@@ -101,20 +101,20 @@ static int parse_number(const char *t[], OSSL_PROPERTY_DEFINITION *res)
do {
if (!ossl_isdigit(*s)) {
ERR_raise_data(ERR_LIB_PROP, PROP_R_NOT_A_DECIMAL_DIGIT,
- "HERE-->%s", *t);
+ "HERE-->%s", *t);
return 0;
}
/* overflow check */
if (v > ((INT64_MAX - (*s - '0')) / 10)) {
ERR_raise_data(ERR_LIB_PROP, PROP_R_PARSE_FAILED,
- "Property %s overflows", *t);
+ "Property %s overflows", *t);
return 0;
}
v = v * 10 + (*s++ - '0');
} while (ossl_isdigit(*s));
if (!ossl_isspace(*s) && *s != '\0' && *s != ',') {
ERR_raise_data(ERR_LIB_PROP, PROP_R_NOT_A_DECIMAL_DIGIT,
- "HERE-->%s", *t);
+ "HERE-->%s", *t);
return 0;
}
*t = skip_space(s);
@@ -136,13 +136,13 @@ static int parse_hex(const char *t[], OSSL_PROPERTY_DEFINITION *res)
sval = ossl_tolower(*s) - 'a' + 10;
} else {
ERR_raise_data(ERR_LIB_PROP, PROP_R_NOT_AN_HEXADECIMAL_DIGIT,
- "%s", *t);
+ "%s", *t);
return 0;
}
if (v > ((INT64_MAX - sval) / 16)) {
ERR_raise_data(ERR_LIB_PROP, PROP_R_PARSE_FAILED,
- "Property %s overflows", *t);
+ "Property %s overflows", *t);
return 0;
}
@@ -151,7 +151,7 @@ static int parse_hex(const char *t[], OSSL_PROPERTY_DEFINITION *res)
} while (ossl_isxdigit(*++s));
if (!ossl_isspace(*s) && *s != '\0' && *s != ',') {
ERR_raise_data(ERR_LIB_PROP, PROP_R_NOT_AN_HEXADECIMAL_DIGIT,
- "HERE-->%s", *t);
+ "HERE-->%s", *t);
return 0;
}
*t = skip_space(s);
@@ -168,12 +168,12 @@ static int parse_oct(const char *t[], OSSL_PROPERTY_DEFINITION *res)
do {
if (*s == '9' || *s == '8' || !ossl_isdigit(*s)) {
ERR_raise_data(ERR_LIB_PROP, PROP_R_NOT_AN_OCTAL_DIGIT,
- "HERE-->%s", *t);
+ "HERE-->%s", *t);
return 0;
}
if (v > ((INT64_MAX - (*s - '0')) / 8)) {
ERR_raise_data(ERR_LIB_PROP, PROP_R_PARSE_FAILED,
- "Property %s overflows", *t);
+ "Property %s overflows", *t);
return 0;
}
@@ -181,7 +181,7 @@ static int parse_oct(const char *t[], OSSL_PROPERTY_DEFINITION *res)
} while (ossl_isdigit(*++s) && *s != '9' && *s != '8');
if (!ossl_isspace(*s) && *s != '\0' && *s != ',') {
ERR_raise_data(ERR_LIB_PROP, PROP_R_NOT_AN_OCTAL_DIGIT,
- "HERE-->%s", *t);
+ "HERE-->%s", *t);
return 0;
}
*t = skip_space(s);
@@ -191,7 +191,7 @@ static int parse_oct(const char *t[], OSSL_PROPERTY_DEFINITION *res)
}
static int parse_string(OSSL_LIB_CTX *ctx, const char *t[], char delim,
- OSSL_PROPERTY_DEFINITION *res, const int create)
+ OSSL_PROPERTY_DEFINITION *res, const int create)
{
char v[1000];
const char *s = *t;
@@ -207,7 +207,7 @@ static int parse_string(OSSL_LIB_CTX *ctx, const char *t[], char delim,
}
if (*s == '\0') {
ERR_raise_data(ERR_LIB_PROP, PROP_R_NO_MATCHING_STRING_DELIMITER,
- "HERE-->%c%s", delim, *t);
+ "HERE-->%c%s", delim, *t);
return 0;
}
v[i] = '\0';
@@ -222,7 +222,7 @@ static int parse_string(OSSL_LIB_CTX *ctx, const char *t[], char delim,
}
static int parse_unquoted(OSSL_LIB_CTX *ctx, const char *t[],
- OSSL_PROPERTY_DEFINITION *res, const int create)
+ OSSL_PROPERTY_DEFINITION *res, const int create)
{
char v[1000];
const char *s = *t;
@@ -240,7 +240,7 @@ static int parse_unquoted(OSSL_LIB_CTX *ctx, const char *t[],
}
if (!ossl_isspace(*s) && *s != '\0' && *s != ',') {
ERR_raise_data(ERR_LIB_PROP, PROP_R_NOT_AN_ASCII_CHARACTER,
- "HERE-->%s", s);
+ "HERE-->%s", s);
return 0;
}
v[i] = 0;
@@ -254,7 +254,7 @@ static int parse_unquoted(OSSL_LIB_CTX *ctx, const char *t[],
}
static int parse_value(OSSL_LIB_CTX *ctx, const char *t[],
- OSSL_PROPERTY_DEFINITION *res, int create)
+ OSSL_PROPERTY_DEFINITION *res, int create)
{
const char *s = *t;
int r = 0;
@@ -285,7 +285,7 @@ static int parse_value(OSSL_LIB_CTX *ctx, const char *t[],
}
static int pd_compare(const OSSL_PROPERTY_DEFINITION *const *p1,
- const OSSL_PROPERTY_DEFINITION *const *p2)
+ const OSSL_PROPERTY_DEFINITION *const *p2)
{
const OSSL_PROPERTY_DEFINITION *pd1 = *p1;
const OSSL_PROPERTY_DEFINITION *pd2 = *p2;
@@ -310,7 +310,7 @@ static void pd_free(OSSL_PROPERTY_DEFINITION *pd)
*/
static OSSL_PROPERTY_LIST *
stack_to_property_list(OSSL_LIB_CTX *ctx,
- STACK_OF(OSSL_PROPERTY_DEFINITION) *sk)
+ STACK_OF(OSSL_PROPERTY_DEFINITION) *sk)
{
const int n = sk_OSSL_PROPERTY_DEFINITION_num(sk);
OSSL_PROPERTY_LIST *r;
@@ -318,7 +318,7 @@ stack_to_property_list(OSSL_LIB_CTX *ctx,
int i;
r = OPENSSL_malloc(sizeof(*r)
- + (n <= 0 ? 0 : n - 1) * sizeof(r->properties[0]));
+ + (n <= 0 ? 0 : n - 1) * sizeof(r->properties[0]));
if (r != NULL) {
sk_OSSL_PROPERTY_DEFINITION_sort(sk);
@@ -331,8 +331,8 @@ stack_to_property_list(OSSL_LIB_CTX *ctx,
if (i > 0 && r->properties[i].name_idx == prev_name_idx) {
OPENSSL_free(r);
ERR_raise_data(ERR_LIB_PROP, PROP_R_PARSE_FAILED,
- "Duplicated name `%s'",
- ossl_property_name_str(ctx, prev_name_idx));
+ "Duplicated name `%s'",
+ ossl_property_name_str(ctx, prev_name_idx));
return NULL;
}
prev_name_idx = r->properties[i].name_idx;
@@ -368,13 +368,13 @@ OSSL_PROPERTY_LIST *ossl_parse_property(OSSL_LIB_CTX *ctx, const char *defn)
prop->oper = OSSL_PROPERTY_OPER_EQ;
if (prop->name_idx == 0) {
ERR_raise_data(ERR_LIB_PROP, PROP_R_PARSE_FAILED,
- "Unknown name HERE-->%s", start);
+ "Unknown name HERE-->%s", start);
goto err;
}
if (match_ch(&s, '=')) {
if (!parse_value(ctx, &s, prop, 1)) {
ERR_raise_data(ERR_LIB_PROP, PROP_R_NO_VALUE,
- "HERE-->%s", start);
+ "HERE-->%s", start);
goto err;
}
} else {
@@ -390,7 +390,7 @@ OSSL_PROPERTY_LIST *ossl_parse_property(OSSL_LIB_CTX *ctx, const char *defn)
}
if (*s != '\0') {
ERR_raise_data(ERR_LIB_PROP, PROP_R_TRAILING_CHARACTERS,
- "HERE-->%s", s);
+ "HERE-->%s", s);
goto err;
}
res = stack_to_property_list(ctx, sk);
@@ -402,7 +402,7 @@ err:
}
OSSL_PROPERTY_LIST *ossl_parse_query(OSSL_LIB_CTX *ctx, const char *s,
- int create_values)
+ int create_values)
{
STACK_OF(OSSL_PROPERTY_DEFINITION) *sk;
OSSL_PROPERTY_LIST *res = NULL;
@@ -445,7 +445,7 @@ OSSL_PROPERTY_LIST *ossl_parse_query(OSSL_LIB_CTX *ctx, const char *s,
if (!parse_value(ctx, &s, prop, create_values))
prop->type = OSSL_PROPERTY_TYPE_VALUE_UNDEFINED;
-skip_value:
+ skip_value:
if (!sk_OSSL_PROPERTY_DEFINITION_push(sk, prop))
goto err;
prop = NULL;
@@ -453,7 +453,7 @@ skip_value:
}
if (*s != '\0') {
ERR_raise_data(ERR_LIB_PROP, PROP_R_TRAILING_CHARACTERS,
- "HERE-->%s", s);
+ "HERE-->%s", s);
goto err;
}
res = stack_to_property_list(ctx, sk);
@@ -469,7 +469,7 @@ err:
* Return the number of clauses matched or -1 if a mandatory clause is false.
*/
int ossl_property_match_count(const OSSL_PROPERTY_LIST *query,
- const OSSL_PROPERTY_LIST *defn)
+ const OSSL_PROPERTY_LIST *defn)
{
const OSSL_PROPERTY_DEFINITION *const q = query->properties;
const OSSL_PROPERTY_DEFINITION *const d = defn->properties;
@@ -482,13 +482,13 @@ int ossl_property_match_count(const OSSL_PROPERTY_LIST *query,
continue;
}
if (j < defn->num_properties) {
- if (q[i].name_idx > d[j].name_idx) { /* skip defn, not in query */
+ if (q[i].name_idx > d[j].name_idx) { /* skip defn, not in query */
j++;
continue;
}
if (q[i].name_idx == d[j].name_idx) { /* both in defn and query */
const int eq = q[i].type == d[j].type
- && memcmp(&q[i].v, &d[j].v, sizeof(q[i].v)) == 0;
+ && memcmp(&q[i].v, &d[j].v, sizeof(q[i].v)) == 0;
if ((eq && oper == OSSL_PROPERTY_OPER_EQ)
|| (!eq && oper == OSSL_PROPERTY_OPER_NE))
@@ -512,10 +512,10 @@ int ossl_property_match_count(const OSSL_PROPERTY_LIST *query,
else if (!q[i].optional)
return -1;
} else if (q[i].type != OSSL_PROPERTY_TYPE_STRING
- || (oper == OSSL_PROPERTY_OPER_EQ
- && q[i].v.str_val != OSSL_PROPERTY_FALSE)
- || (oper == OSSL_PROPERTY_OPER_NE
- && q[i].v.str_val == OSSL_PROPERTY_FALSE)) {
+ || (oper == OSSL_PROPERTY_OPER_EQ
+ && q[i].v.str_val != OSSL_PROPERTY_FALSE)
+ || (oper == OSSL_PROPERTY_OPER_NE
+ && q[i].v.str_val == OSSL_PROPERTY_FALSE)) {
if (!q[i].optional)
return -1;
} else {
@@ -536,7 +536,7 @@ void ossl_property_free(OSSL_PROPERTY_LIST *p)
* If there is a common name, the one from the first list is used.
*/
OSSL_PROPERTY_LIST *ossl_property_merge(const OSSL_PROPERTY_LIST *a,
- const OSSL_PROPERTY_LIST *b)
+ const OSSL_PROPERTY_LIST *b)
{
const OSSL_PROPERTY_DEFINITION *const ap = a->properties;
const OSSL_PROPERTY_DEFINITION *const bp = b->properties;
@@ -546,7 +546,7 @@ OSSL_PROPERTY_LIST *ossl_property_merge(const OSSL_PROPERTY_LIST *a,
const int t = a->num_properties + b->num_properties;
r = OPENSSL_malloc(sizeof(*r)
- + (t == 0 ? 0 : t - 1) * sizeof(r->properties[0]));
+ + (t == 0 ? 0 : t - 1) * sizeof(r->properties[0]));
if (r == NULL)
return NULL;
@@ -574,12 +574,12 @@ OSSL_PROPERTY_LIST *ossl_property_merge(const OSSL_PROPERTY_LIST *a,
int ossl_property_parse_init(OSSL_LIB_CTX *ctx)
{
static const char *const predefined_names[] = {
- "provider", /* Name of provider (default, legacy, fips) */
- "version", /* Version number of this provider */
- "fips", /* FIPS validated or FIPS supporting algorithm */
- "output", /* Output type for encoders */
- "input", /* Input type for decoders */
- "structure", /* Structure name for encoders and decoders */
+ "provider", /* Name of provider (default, legacy, fips) */
+ "version", /* Version number of this provider */
+ "fips", /* FIPS validated or FIPS supporting algorithm */
+ "output", /* Output type for encoders */
+ "input", /* Input type for decoders */
+ "structure", /* Structure name for encoders and decoders */
};
size_t i;
@@ -677,7 +677,8 @@ static void put_num(int64_t val, char **buf, size_t *remain, size_t *needed)
len++;
tmpval = -tmpval;
}
- for (; tmpval > 9; len++, tmpval /= 10);
+ for (; tmpval > 9; len++, tmpval /= 10)
+ ;
*needed += len;
@@ -695,8 +696,8 @@ static void put_num(int64_t val, char **buf, size_t *remain, size_t *needed)
}
size_t ossl_property_list_to_string(OSSL_LIB_CTX *ctx,
- const OSSL_PROPERTY_LIST *list, char *buf,
- size_t bufsize)
+ const OSSL_PROPERTY_LIST *list, char *buf,
+ size_t bufsize)
{
int i;
const OSSL_PROPERTY_DEFINITION *prop = NULL;
@@ -729,31 +730,31 @@ size_t ossl_property_list_to_string(OSSL_LIB_CTX *ctx,
put_str(val, &buf, &bufsize, &needed);
switch (prop->oper) {
- case OSSL_PROPERTY_OPER_NE:
- put_char('!', &buf, &bufsize, &needed);
- /* fall through */
- case OSSL_PROPERTY_OPER_EQ:
- put_char('=', &buf, &bufsize, &needed);
- /* put value */
- switch (prop->type) {
- case OSSL_PROPERTY_TYPE_STRING:
- val = ossl_property_value_str(ctx, prop->v.str_val);
- if (val == NULL)
- return 0;
- put_str(val, &buf, &bufsize, &needed);
- break;
-
- case OSSL_PROPERTY_TYPE_NUMBER:
- put_num(prop->v.int_val, &buf, &bufsize, &needed);
- break;
-
- default:
+ case OSSL_PROPERTY_OPER_NE:
+ put_char('!', &buf, &bufsize, &needed);
+ /* fall through */
+ case OSSL_PROPERTY_OPER_EQ:
+ put_char('=', &buf, &bufsize, &needed);
+ /* put value */
+ switch (prop->type) {
+ case OSSL_PROPERTY_TYPE_STRING:
+ val = ossl_property_value_str(ctx, prop->v.str_val);
+ if (val == NULL)
return 0;
- }
+ put_str(val, &buf, &bufsize, &needed);
break;
- default:
- /* do nothing */
+
+ case OSSL_PROPERTY_TYPE_NUMBER:
+ put_num(prop->v.int_val, &buf, &bufsize, &needed);
break;
+
+ default:
+ return 0;
+ }
+ break;
+ default:
+ /* do nothing */
+ break;
}
}
diff --git a/crypto/property/property_query.c b/crypto/property/property_query.c
index 28cc704840..f5daca2aad 100644
--- a/crypto/property/property_query.c
+++ b/crypto/property/property_query.c
@@ -14,15 +14,14 @@
static int property_idx_cmp(const void *keyp, const void *compare)
{
OSSL_PROPERTY_IDX key = *(const OSSL_PROPERTY_IDX *)keyp;
- const OSSL_PROPERTY_DEFINITION *defn =
- (const OSSL_PROPERTY_DEFINITION *)compare;
+ const OSSL_PROPERTY_DEFINITION *defn = (const OSSL_PROPERTY_DEFINITION *)compare;
return key - defn->name_idx;
}
const OSSL_PROPERTY_DEFINITION *
ossl_property_find_property(const OSSL_PROPERTY_LIST *list,
- OSSL_LIB_CTX *libctx, const char *name)
+ OSSL_LIB_CTX *libctx, const char *name)
{
OSSL_PROPERTY_IDX name_idx;
@@ -31,7 +30,7 @@ ossl_property_find_property(const OSSL_PROPERTY_LIST *list,
return NULL;
return ossl_bsearch(&name_idx, list->properties, list->num_properties,
- sizeof(*list->properties), &property_idx_cmp, 0);
+ sizeof(*list->properties), &property_idx_cmp, 0);
}
OSSL_PROPERTY_TYPE ossl_property_get_type(const OSSL_PROPERTY_DEFINITION *prop)
@@ -40,7 +39,7 @@ OSSL_PROPERTY_TYPE ossl_property_get_type(const OSSL_PROPERTY_DEFINITION *prop)
}
const char *ossl_property_get_string_value(OSSL_LIB_CTX *libctx,
- const OSSL_PROPERTY_DEFINITION *prop)
+ const OSSL_PROPERTY_DEFINITION *prop)
{
const char *value = NULL;
@@ -64,8 +63,8 @@ int ossl_property_has_optional(const OSSL_PROPERTY_LIST *query)
return query->has_optional ? 1 : 0;
}
-int ossl_property_is_enabled(OSSL_LIB_CTX *ctx, const char *property_name,
- const OSSL_PROPERTY_LIST *prop_list)
+int ossl_property_is_enabled(OSSL_LIB_CTX *ctx, const char *property_name,
+ const OSSL_PROPERTY_LIST *prop_list)
{
const OSSL_PROPERTY_DEFINITION *prop;
@@ -74,9 +73,8 @@ int ossl_property_is_enabled(OSSL_LIB_CTX *ctx, const char *property_name,
if (prop == NULL || prop->optional || prop->oper == OSSL_PROPERTY_OVERRIDE)
return 0;
return (prop->type == OSSL_PROPERTY_TYPE_STRING
- && ((prop->oper == OSSL_PROPERTY_OPER_EQ
- && prop->v.str_val == OSSL_PROPERTY_TRUE)
- || (prop->oper == OSSL_PROPERTY_OPER_NE
- && prop->v.str_val != OSSL_PROPERTY_TRUE)));
+ && ((prop->oper == OSSL_PROPERTY_OPER_EQ
+ && prop->v.str_val == OSSL_PROPERTY_TRUE)
+ || (prop->oper == OSSL_PROPERTY_OPER_NE
+ && prop->v.str_val != OSSL_PROPERTY_TRUE)));
}
-
diff --git a/crypto/property/property_string.c b/crypto/property/property_string.c
index e06f47a6b7..6a6849a132 100644
--- a/crypto/property/property_string.c
+++ b/crypto/property/property_string.c
@@ -93,7 +93,8 @@ void ossl_property_string_data_free(void *vpropdata)
OPENSSL_free(propdata);
}
-void *ossl_property_string_data_new(OSSL_LIB_CTX *ctx) {
+void *ossl_property_string_data_new(OSSL_LIB_CTX *ctx)
+{
PROPERTY_STRING_DATA *propdata = OPENSSL_zalloc(sizeof(*propdata));
if (propdata == NULL)
@@ -101,20 +102,20 @@ void *ossl_property_string_data_new(OSSL_LIB_CTX *ctx) {
propdata->lock = CRYPTO_THREAD_lock_new();
propdata->prop_names = lh_PROPERTY_STRING_new(&property_hash,
- &property_cmp);
+ &property_cmp);
propdata->prop_values = lh_PROPERTY_STRING_new(&property_hash,
- &property_cmp);
+ &property_cmp);
#ifndef OPENSSL_SMALL_FOOTPRINT
propdata->prop_namelist = sk_OPENSSL_CSTRING_new_null();
propdata->prop_valuelist = sk_OPENSSL_CSTRING_new_null();
#endif
if (propdata->lock == NULL
#ifndef OPENSSL_SMALL_FOOTPRINT
- || propdata->prop_namelist == NULL
- || propdata->prop_valuelist == NULL
+ || propdata->prop_namelist == NULL
+ || propdata->prop_valuelist == NULL
#endif
- || propdata->prop_names == NULL
- || propdata->prop_values == NULL) {
+ || propdata->prop_names == NULL
+ || propdata->prop_values == NULL) {
ossl_property_string_data_free(propdata);
return NULL;
}
@@ -122,7 +123,7 @@ void *ossl_property_string_data_new(OSSL_LIB_CTX *ctx) {
}
static PROPERTY_STRING *new_property_string(const char *s,
- OSSL_PROPERTY_IDX *pidx)
+ OSSL_PROPERTY_IDX *pidx)
{
const size_t l = strlen(s);
PROPERTY_STRING *ps = OPENSSL_malloc(sizeof(*ps) + l);
@@ -140,7 +141,7 @@ static PROPERTY_STRING *new_property_string(const char *s,
}
static OSSL_PROPERTY_IDX ossl_property_string(OSSL_LIB_CTX *ctx, int name,
- int create, const char *s)
+ int create, const char *s)
{
PROPERTY_STRING p, *ps, *ps_new;
PROP_TABLE *t;
@@ -214,7 +215,7 @@ static void find_str_fn(PROPERTY_STRING *prop, void *vfindstr)
#endif
static const char *ossl_property_str(int name, OSSL_LIB_CTX *ctx,
- OSSL_PROPERTY_IDX idx)
+ OSSL_PROPERTY_IDX idx)
{
const char *r;
PROPERTY_STRING_DATA *propdata
@@ -236,12 +237,13 @@ static const char *ossl_property_str(int name, OSSL_LIB_CTX *ctx,
lh_PROPERTY_STRING_doall_arg(name ? propdata->prop_names
: propdata->prop_values,
- find_str_fn, &findstr);
+ find_str_fn, &findstr);
r = findstr.str;
}
#else
r = sk_OPENSSL_CSTRING_value(name ? propdata->prop_namelist
- : propdata->prop_valuelist, idx - 1);
+ : propdata->prop_valuelist,
+ idx - 1);
#endif
CRYPTO_THREAD_unlock(propdata->lock);
@@ -249,7 +251,7 @@ static const char *ossl_property_str(int name, OSSL_LIB_CTX *ctx,
}
OSSL_PROPERTY_IDX ossl_property_name(OSSL_LIB_CTX *ctx, const char *s,
- int create)
+ int create)
{
return ossl_property_string(ctx, 1, create, s);
}
@@ -260,7 +262,7 @@ const char *ossl_property_name_str(OSSL_LIB_CTX *ctx, OSSL_PROPERTY_IDX idx)
}
OSSL_PROPERTY_IDX ossl_property_value(OSSL_LIB_CTX *ctx, const char *s,
- int create)
+ int create)
{
return ossl_property_string(ctx, 0, create, s);
}
diff --git a/crypto/provider.c b/crypto/provider.c
index c122cb4d0b..6d6f662608 100644
--- a/crypto/provider.c
+++ b/crypto/provider.c
@@ -16,7 +16,7 @@
#include "provider_local.h"
OSSL_PROVIDER *OSSL_PROVIDER_try_load_ex(OSSL_LIB_CTX *libctx, const char *name,
- OSSL_PARAM *params, int retain_fallbacks)
+ OSSL_PARAM *params, int retain_fallbacks)
{
OSSL_PROVIDER *prov = NULL, *actual;
int isnew = 0;
@@ -50,7 +50,7 @@ OSSL_PROVIDER *OSSL_PROVIDER_try_load_ex(OSSL_LIB_CTX *libctx, const char *name,
}
OSSL_PROVIDER *OSSL_PROVIDER_try_load(OSSL_LIB_CTX *libctx, const char *name,
- int retain_fallbacks)
+ int retain_fallbacks)
{
return OSSL_PROVIDER_try_load_ex(libctx, name, NULL, retain_fallbacks);
}
@@ -87,15 +87,15 @@ int OSSL_PROVIDER_get_params(const OSSL_PROVIDER *prov, OSSL_PARAM params[])
}
const OSSL_ALGORITHM *OSSL_PROVIDER_query_operation(const OSSL_PROVIDER *prov,
- int operation_id,
- int *no_cache)
+ int operation_id,
+ int *no_cache)
{
return ossl_provider_query_operation(prov, operation_id, no_cache);
}
void OSSL_PROVIDER_unquery_operation(const OSSL_PROVIDER *prov,
- int operation_id,
- const OSSL_ALGORITHM *algs)
+ int operation_id,
+ const OSSL_ALGORITHM *algs)
{
ossl_provider_unquery_operation(prov, operation_id, algs);
}
@@ -116,15 +116,15 @@ int OSSL_PROVIDER_self_test(const OSSL_PROVIDER *prov)
}
int OSSL_PROVIDER_get_capabilities(const OSSL_PROVIDER *prov,
- const char *capability,
- OSSL_CALLBACK *cb,
- void *arg)
+ const char *capability,
+ OSSL_CALLBACK *cb,
+ void *arg)
{
return ossl_provider_get_capabilities(prov, capability, cb, arg);
}
int OSSL_PROVIDER_add_builtin(OSSL_LIB_CTX *libctx, const char *name,
- OSSL_provider_init_fn *init_fn)
+ OSSL_provider_init_fn *init_fn)
{
OSSL_PROVIDER_INFO entry;
@@ -150,9 +150,9 @@ const char *OSSL_PROVIDER_get0_name(const OSSL_PROVIDER *prov)
}
int OSSL_PROVIDER_do_all(OSSL_LIB_CTX *ctx,
- int (*cb)(OSSL_PROVIDER *provider,
- void *cbdata),
- void *cbdata)
+ int (*cb)(OSSL_PROVIDER *provider,
+ void *cbdata),
+ void *cbdata)
{
return ossl_provider_doall_activated(ctx, cb, cbdata);
}
diff --git a/crypto/provider_child.c b/crypto/provider_child.c
index 52e9cb405f..c2555b59f2 100644
--- a/crypto/provider_child.c
+++ b/crypto/provider_child.c
@@ -50,9 +50,9 @@ void ossl_child_prov_ctx_free(void *vgbl)
static OSSL_provider_init_fn ossl_child_provider_init;
static int ossl_child_provider_init(const OSSL_CORE_HANDLE *handle,
- const OSSL_DISPATCH *in,
- const OSSL_DISPATCH **out,
- void **provctx)
+ const OSSL_DISPATCH *in,
+ const OSSL_DISPATCH **out,
+ void **provctx)
{
OSSL_FUNC_core_get_libctx_fn *c_get_libctx = NULL;
OSSL_LIB_CTX *ctx;
@@ -132,7 +132,8 @@ static int provider_create_child_cb(const OSSL_CORE_HANDLE *prov, void *cbdata)
* init children
*/
if ((cprov = ossl_provider_new(ctx, provname, ossl_child_provider_init,
- NULL, 1)) == NULL)
+ NULL, 1))
+ == NULL)
goto err;
if (!ossl_provider_activate(cprov, 0, 0)) {
@@ -149,7 +150,7 @@ static int provider_create_child_cb(const OSSL_CORE_HANDLE *prov, void *cbdata)
}
ret = 1;
- err:
+err:
CRYPTO_THREAD_unlock(gbl->lock);
return ret;
}
@@ -175,7 +176,7 @@ static int provider_remove_child_cb(const OSSL_CORE_HANDLE *prov, void *cbdata)
*/
ossl_provider_free(cprov);
if (ossl_provider_is_child(cprov)
- && !ossl_provider_deactivate(cprov, 1))
+ && !ossl_provider_deactivate(cprov, 1))
return 0;
return 1;
@@ -189,8 +190,8 @@ static int provider_global_props_cb(const char *props, void *cbdata)
}
int ossl_provider_init_as_child(OSSL_LIB_CTX *ctx,
- const OSSL_CORE_HANDLE *handle,
- const OSSL_DISPATCH *in)
+ const OSSL_CORE_HANDLE *handle,
+ const OSSL_DISPATCH *in)
{
struct child_prov_globals *gbl;
@@ -239,12 +240,12 @@ int ossl_provider_init_as_child(OSSL_LIB_CTX *ctx,
}
if (gbl->c_get_libctx == NULL
- || gbl->c_provider_register_child_cb == NULL
- || gbl->c_prov_name == NULL
- || gbl->c_prov_get0_provider_ctx == NULL
- || gbl->c_prov_get0_dispatch == NULL
- || gbl->c_prov_up_ref == NULL
- || gbl->c_prov_free == NULL)
+ || gbl->c_provider_register_child_cb == NULL
+ || gbl->c_prov_name == NULL
+ || gbl->c_prov_get0_provider_ctx == NULL
+ || gbl->c_prov_get0_dispatch == NULL
+ || gbl->c_prov_up_ref == NULL
+ || gbl->c_prov_free == NULL)
return 0;
gbl->lock = CRYPTO_THREAD_lock_new();
@@ -252,10 +253,10 @@ int ossl_provider_init_as_child(OSSL_LIB_CTX *ctx,
return 0;
if (!gbl->c_provider_register_child_cb(gbl->handle,
- provider_create_child_cb,
- provider_remove_child_cb,
- provider_global_props_cb,
- ctx))
+ provider_create_child_cb,
+ provider_remove_child_cb,
+ provider_global_props_cb,
+ ctx))
return 0;
return 1;
@@ -289,7 +290,7 @@ int ossl_provider_up_ref_parent(OSSL_PROVIDER *prov, int activate)
const OSSL_CORE_HANDLE *parent_handle;
gbl = ossl_lib_ctx_get_data(ossl_provider_libctx(prov),
- OSSL_LIB_CTX_CHILD_PROVIDER_INDEX);
+ OSSL_LIB_CTX_CHILD_PROVIDER_INDEX);
if (gbl == NULL)
return 0;
@@ -305,7 +306,7 @@ int ossl_provider_free_parent(OSSL_PROVIDER *prov, int deactivate)
const OSSL_CORE_HANDLE *parent_handle;
gbl = ossl_lib_ctx_get_data(ossl_provider_libctx(prov),
- OSSL_LIB_CTX_CHILD_PROVIDER_INDEX);
+ OSSL_LIB_CTX_CHILD_PROVIDER_INDEX);
if (gbl == NULL)
return 0;
diff --git a/crypto/provider_conf.c b/crypto/provider_conf.c
index 9649517dd2..f2e76ac402 100644
--- a/crypto/provider_conf.c
+++ b/crypto/provider_conf.c
@@ -48,7 +48,7 @@ void ossl_prov_conf_ctx_free(void *vpcgbl)
PROVIDER_CONF_GLOBAL *pcgbl = vpcgbl;
sk_OSSL_PROVIDER_pop_free(pcgbl->activated_providers,
- ossl_provider_free);
+ ossl_provider_free);
OSSL_TRACE(CONF, "Cleaned up providers\n");
CRYPTO_THREAD_lock_free(pcgbl->lock);
@@ -72,10 +72,10 @@ static const char *skip_dot(const char *name)
* < 0 for fatal errors
*/
static int provider_conf_params_internal(OSSL_PROVIDER *prov,
- OSSL_PROVIDER_INFO *provinfo,
- const char *name, const char *value,
- const CONF *cnf,
- STACK_OF(OPENSSL_CSTRING) *visited)
+ OSSL_PROVIDER_INFO *provinfo,
+ const char *name, const char *value,
+ const CONF *cnf,
+ STACK_OF(OPENSSL_CSTRING) *visited)
{
STACK_OF(CONF_VALUE) *sect;
int ok = 1;
@@ -124,7 +124,7 @@ static int provider_conf_params_internal(OSSL_PROVIDER *prov,
buffer[buffer_len] = '\0';
OPENSSL_strlcat(buffer, sectconf->name, sizeof(buffer));
rc = provider_conf_params_internal(prov, provinfo, buffer,
- sectconf->value, cnf, visited);
+ sectconf->value, cnf, visited);
if (rc < 0) {
sk_OPENSSL_CSTRING_pop(visited);
return rc;
@@ -146,16 +146,16 @@ static int provider_conf_params_internal(OSSL_PROVIDER *prov,
/*
* recursively parse the provider configuration section
- * of the config file.
+ * of the config file.
* Returns
* 1 on success
* 0 on non-fatal error
* < 0 on fatal errors
*/
static int provider_conf_params(OSSL_PROVIDER *prov,
- OSSL_PROVIDER_INFO *provinfo,
- const char *name, const char *value,
- const CONF *cnf)
+ OSSL_PROVIDER_INFO *provinfo,
+ const char *name, const char *value,
+ const CONF *cnf)
{
int rc;
STACK_OF(OPENSSL_CSTRING) *visited = sk_OPENSSL_CSTRING_new_null();
@@ -164,7 +164,7 @@ static int provider_conf_params(OSSL_PROVIDER *prov,
return -1;
rc = provider_conf_params_internal(prov, provinfo, name,
- value, cnf, visited);
+ value, cnf, visited);
sk_OPENSSL_CSTRING_free(visited);
@@ -172,7 +172,7 @@ static int provider_conf_params(OSSL_PROVIDER *prov,
}
static int prov_already_activated(const char *name,
- STACK_OF(OSSL_PROVIDER) *activated)
+ STACK_OF(OSSL_PROVIDER) *activated)
{
int i, max;
@@ -199,8 +199,8 @@ static int prov_already_activated(const char *name,
* < 0 on failed activation for fatal errors
*/
static int provider_conf_activate(OSSL_LIB_CTX *libctx, const char *name,
- const char *value, const char *path,
- int soft, const CONF *cnf)
+ const char *value, const char *path,
+ int soft, const CONF *cnf)
{
PROVIDER_CONF_GLOBAL *pcgbl
= ossl_lib_ctx_get_data(libctx, OSSL_LIB_CTX_PROVIDER_CONF_INDEX);
@@ -213,12 +213,12 @@ static int provider_conf_activate(OSSL_LIB_CTX *libctx, const char *name,
}
if (!prov_already_activated(name, pcgbl->activated_providers)) {
/*
- * There is an attempt to activate a provider, so we should disable
- * loading of fallbacks. Otherwise a misconfiguration could mean the
- * intended provider does not get loaded. Subsequent fetches could
- * then fallback to the default provider - which may be the wrong
- * thing.
- */
+ * There is an attempt to activate a provider, so we should disable
+ * loading of fallbacks. Otherwise a misconfiguration could mean the
+ * intended provider does not get loaded. Subsequent fetches could
+ * then fallback to the default provider - which may be the wrong
+ * thing.
+ */
if (!ossl_provider_disable_fallback_loading(libctx)) {
CRYPTO_THREAD_unlock(pcgbl->lock);
ERR_raise(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR);
@@ -246,7 +246,7 @@ static int provider_conf_activate(OSSL_LIB_CTX *libctx, const char *name,
ossl_provider_deactivate(prov, 1);
ok = 0;
} else if (actual != prov
- && !ossl_provider_activate(actual, 1, 0)) {
+ && !ossl_provider_activate(actual, 1, 0)) {
ossl_provider_free(actual);
ok = 0;
} else {
@@ -254,7 +254,7 @@ static int provider_conf_activate(OSSL_LIB_CTX *libctx, const char *name,
pcgbl->activated_providers = sk_OSSL_PROVIDER_new_null();
if (pcgbl->activated_providers == NULL
|| !sk_OSSL_PROVIDER_push(pcgbl->activated_providers,
- actual)) {
+ actual)) {
ossl_provider_deactivate(actual, 1);
ossl_provider_free(actual);
ok = 0;
@@ -273,13 +273,13 @@ static int provider_conf_activate(OSSL_LIB_CTX *libctx, const char *name,
}
static int provider_conf_parse_bool_setting(const char *confname,
- const char *confvalue, int *val)
+ const char *confvalue, int *val)
{
if (confvalue == NULL) {
ERR_raise_data(ERR_LIB_CRYPTO, CRYPTO_R_PROVIDER_SECTION_ERROR,
- "directive %s set to unrecognized value",
- confname);
+ "directive %s set to unrecognized value",
+ confname);
return 0;
}
if ((strcmp(confvalue, "1") == 0)
@@ -289,19 +289,19 @@ static int provider_conf_parse_bool_setting(const char *confname,
|| (strcmp(confvalue, "TRUE") == 0)
|| (strcmp(confvalue, "on") == 0)
|| (strcmp(confvalue, "ON") == 0)) {
- *val = 1;
+ *val = 1;
} else if ((strcmp(confvalue, "0") == 0)
- || (strcmp(confvalue, "no") == 0)
- || (strcmp(confvalue, "NO") == 0)
- || (strcmp(confvalue, "false") == 0)
- || (strcmp(confvalue, "FALSE") == 0)
- || (strcmp(confvalue, "off") == 0)
- || (strcmp(confvalue, "OFF") == 0)) {
- *val = 0;
+ || (strcmp(confvalue, "no") == 0)
+ || (strcmp(confvalue, "NO") == 0)
+ || (strcmp(confvalue, "false") == 0)
+ || (strcmp(confvalue, "FALSE") == 0)
+ || (strcmp(confvalue, "off") == 0)
+ || (strcmp(confvalue, "OFF") == 0)) {
+ *val = 0;
} else {
ERR_raise_data(ERR_LIB_CRYPTO, CRYPTO_R_PROVIDER_SECTION_ERROR,
- "directive %s set to unrecognized value",
- confname);
+ "directive %s set to unrecognized value",
+ confname);
return 0;
}
@@ -309,7 +309,7 @@ static int provider_conf_parse_bool_setting(const char *confname,
}
static int provider_conf_load(OSSL_LIB_CTX *libctx, const char *name,
- const char *value, const CONF *cnf)
+ const char *value, const CONF *cnf)
{
int i;
STACK_OF(CONF_VALUE) *ecmds;
@@ -326,7 +326,7 @@ static int provider_conf_load(OSSL_LIB_CTX *libctx, const char *name,
if (!ecmds) {
ERR_raise_data(ERR_LIB_CRYPTO, CRYPTO_R_PROVIDER_SECTION_ERROR,
- "section=%s not found", value);
+ "section=%s not found", value);
return 0;
}
@@ -337,7 +337,7 @@ static int provider_conf_load(OSSL_LIB_CTX *libctx, const char *name,
const char *confvalue = ecmd->value;
OSSL_TRACE2(CONF, "Provider command: %s = %s\n",
- confname, confvalue);
+ confname, confvalue);
/* First handle some special pseudo confs */
@@ -346,14 +346,14 @@ static int provider_conf_load(OSSL_LIB_CTX *libctx, const char *name,
name = confvalue;
} else if (strcmp(confname, "soft_load") == 0) {
if (!provider_conf_parse_bool_setting(confname,
- confvalue, &soft))
+ confvalue, &soft))
return 0;
- /* Load a dynamic PROVIDER */
+ /* Load a dynamic PROVIDER */
} else if (strcmp(confname, "module") == 0) {
path = confvalue;
} else if (strcmp(confname, "activate") == 0) {
if (!provider_conf_parse_bool_setting(confname,
- confvalue, &activate))
+ confvalue, &activate))
return 0;
}
}
@@ -403,7 +403,7 @@ static int provider_conf_init(CONF_IMODULE *md, const CONF *cnf)
int i;
OSSL_TRACE1(CONF, "Loading providers module: section %s\n",
- CONF_imodule_get_value(md));
+ CONF_imodule_get_value(md));
/* Value is a section containing PROVIDERs to configure */
elist = NCONF_get_section(cnf, CONF_imodule_get_value(md));
@@ -416,7 +416,7 @@ static int provider_conf_init(CONF_IMODULE *md, const CONF *cnf)
for (i = 0; i < sk_CONF_VALUE_num(elist); i++) {
cval = sk_CONF_VALUE_value(elist, i);
if (!provider_conf_load(NCONF_get0_libctx((CONF *)cnf),
- cval->name, cval->value, cnf))
+ cval->name, cval->value, cnf))
return 0;
}
diff --git a/crypto/provider_core.c b/crypto/provider_core.c
index 87700889d3..0e33e750d9 100644
--- a/crypto/provider_core.c
+++ b/crypto/provider_core.c
@@ -31,8 +31,8 @@
#include "provider_local.h"
#include "crypto/context.h"
#ifndef FIPS_MODULE
-# include <openssl/self_test.h>
-# include <openssl/indicator.h>
+#include <openssl/self_test.h>
+#include <openssl/indicator.h>
#endif
/*
@@ -118,8 +118,8 @@
*/
static OSSL_PROVIDER *provider_new(const char *name,
- OSSL_provider_init_fn *init_function,
- STACK_OF(INFOPAIR) *parameters);
+ OSSL_provider_init_fn *init_function,
+ STACK_OF(INFOPAIR) *parameters);
/*-
* Provider Object structure
@@ -137,12 +137,12 @@ typedef struct {
DEFINE_STACK_OF(OSSL_PROVIDER_CHILD_CB)
#endif
-struct provider_store_st; /* Forward declaration */
+struct provider_store_st; /* Forward declaration */
struct ossl_provider_st {
/* Flag bits */
- unsigned int flag_initialized:1;
- unsigned int flag_activated:1;
+ unsigned int flag_initialized : 1;
+ unsigned int flag_activated : 1;
/* Getting and setting the flags require synchronization */
CRYPTO_RWLOCK *flag_lock;
@@ -163,10 +163,10 @@ struct ossl_provider_st {
* In the FIPS module inner provider, this isn't needed, since the
* error upcalls are always direct calls to the outer provider.
*/
- int error_lib; /* ERR library number, one for each provider */
-# ifndef OPENSSL_NO_ERR
+ int error_lib; /* ERR library number, one for each provider */
+#ifndef OPENSSL_NO_ERR
ERR_STRING_DATA *error_strings; /* Copy of what the provider gives us */
-# endif
+#endif
#endif
/* Provider side functions */
@@ -190,7 +190,7 @@ struct ossl_provider_st {
#ifndef FIPS_MODULE
/* Whether this provider is the child of some other provider */
const OSSL_CORE_HANDLE *handle;
- unsigned int ischild:1;
+ unsigned int ischild : 1;
#endif
/* Provider side data */
@@ -199,8 +199,8 @@ struct ossl_provider_st {
};
DEFINE_STACK_OF(OSSL_PROVIDER)
-static int ossl_provider_cmp(const OSSL_PROVIDER * const *a,
- const OSSL_PROVIDER * const *b)
+static int ossl_provider_cmp(const OSSL_PROVIDER *const *a,
+ const OSSL_PROVIDER *const *b)
{
return strcmp((*a)->name, (*b)->name);
}
@@ -223,8 +223,8 @@ struct provider_store_st {
OSSL_PROVIDER_INFO *provinfo;
size_t numprovinfo;
size_t provinfosz;
- unsigned int use_fallbacks:1;
- unsigned int freeing:1;
+ unsigned int use_fallbacks : 1;
+ unsigned int freeing : 1;
};
/*
@@ -271,7 +271,7 @@ static INFOPAIR *infopair_copy(const INFOPAIR *src)
goto err;
}
return dest;
- err:
+err:
OPENSSL_free(dest->name);
OPENSSL_free(dest);
return NULL;
@@ -296,7 +296,7 @@ void ossl_provider_store_free(void *vstore)
sk_OSSL_PROVIDER_pop_free(store->providers, provider_deactivate_free);
#ifndef FIPS_MODULE
sk_OSSL_PROVIDER_CHILD_CB_pop_free(store->child_cbs,
- ossl_provider_child_cb_free);
+ ossl_provider_child_cb_free);
#endif
CRYPTO_THREAD_lock_free(store->default_path_lock);
CRYPTO_THREAD_lock_free(store->lock);
@@ -350,10 +350,10 @@ int ossl_provider_disable_fallback_loading(OSSL_LIB_CTX *libctx)
return 0;
}
-#define BUILTINS_BLOCK_SIZE 10
+#define BUILTINS_BLOCK_SIZE 10
int ossl_provider_info_add_to_store(OSSL_LIB_CTX *libctx,
- OSSL_PROVIDER_INFO *entry)
+ OSSL_PROVIDER_INFO *entry)
{
struct provider_store_st *store = get_provider_store(libctx);
int ret = 0;
@@ -372,7 +372,7 @@ int ossl_provider_info_add_to_store(OSSL_LIB_CTX *libctx,
return 0;
if (store->provinfosz == 0) {
store->provinfo = OPENSSL_calloc(BUILTINS_BLOCK_SIZE,
- sizeof(*store->provinfo));
+ sizeof(*store->provinfo));
if (store->provinfo == NULL)
goto err;
store->provinfosz = BUILTINS_BLOCK_SIZE;
@@ -381,7 +381,7 @@ int ossl_provider_info_add_to_store(OSSL_LIB_CTX *libctx,
size_t newsz = store->provinfosz + BUILTINS_BLOCK_SIZE;
tmpbuiltins = OPENSSL_realloc_array(store->provinfo,
- newsz, sizeof(*store->provinfo));
+ newsz, sizeof(*store->provinfo));
if (tmpbuiltins == NULL)
goto err;
store->provinfo = tmpbuiltins;
@@ -391,19 +391,21 @@ int ossl_provider_info_add_to_store(OSSL_LIB_CTX *libctx,
store->numprovinfo++;
ret = 1;
- err:
+err:
CRYPTO_THREAD_unlock(store->lock);
return ret;
}
OSSL_PROVIDER *ossl_provider_find(OSSL_LIB_CTX *libctx, const char *name,
- ossl_unused int noconfig)
+ ossl_unused int noconfig)
{
struct provider_store_st *store = NULL;
OSSL_PROVIDER *prov = NULL;
if ((store = get_provider_store(libctx)) != NULL) {
- OSSL_PROVIDER tmpl = { 0, };
+ OSSL_PROVIDER tmpl = {
+ 0,
+ };
int i;
#if !defined(FIPS_MODULE) && !defined(OPENSSL_NO_AUTOLOAD_CONFIG)
@@ -443,8 +445,8 @@ OSSL_PROVIDER *ossl_provider_find(OSSL_LIB_CTX *libctx, const char *name,
*/
static OSSL_PROVIDER *provider_new(const char *name,
- OSSL_provider_init_fn *init_function,
- STACK_OF(INFOPAIR) *parameters)
+ OSSL_provider_init_fn *init_function,
+ STACK_OF(INFOPAIR) *parameters)
{
OSSL_PROVIDER *prov = NULL;
@@ -463,8 +465,9 @@ static OSSL_PROVIDER *provider_new(const char *name,
if ((prov->opbits_lock = CRYPTO_THREAD_lock_new()) == NULL
|| (prov->flag_lock = CRYPTO_THREAD_lock_new()) == NULL
|| (prov->parameters = sk_INFOPAIR_deep_copy(parameters,
- infopair_copy,
- infopair_free)) == NULL) {
+ infopair_copy,
+ infopair_free))
+ == NULL) {
ossl_provider_free(prov);
ERR_raise(ERR_LIB_CRYPTO, ERR_R_CRYPTO_LIB);
return NULL;
@@ -523,8 +526,8 @@ static int provider_free_intern(OSSL_PROVIDER *prov, int deactivate)
* will fail.
*/
OSSL_PROVIDER *ossl_provider_new(OSSL_LIB_CTX *libctx, const char *name,
- OSSL_provider_init_fn *init_function,
- OSSL_PARAM *params, int noconfig)
+ OSSL_provider_init_fn *init_function,
+ OSSL_PARAM *params, int noconfig)
{
struct provider_store_st *store = NULL;
OSSL_PROVIDER_INFO template;
@@ -566,8 +569,8 @@ OSSL_PROVIDER *ossl_provider_new(OSSL_LIB_CTX *libctx, const char *name,
}
/* Always copy to avoid sharing/mutation. */
template.parameters = sk_INFOPAIR_deep_copy(p->parameters,
- infopair_copy,
- infopair_free);
+ infopair_copy,
+ infopair_free);
if (template.parameters == NULL) {
CRYPTO_THREAD_unlock(store->lock);
return NULL;
@@ -592,7 +595,8 @@ OSSL_PROVIDER *ossl_provider_new(OSSL_LIB_CTX *libctx, const char *name,
if (params[i].data_type != OSSL_PARAM_UTF8_STRING)
continue;
if (ossl_provider_info_add_parameter(&template, params[i].key,
- (char *)params[i].data) <= 0) {
+ (char *)params[i].data)
+ <= 0) {
sk_INFOPAIR_pop_free(template.parameters, infopair_free);
return NULL;
}
@@ -652,11 +656,13 @@ static int create_provider_children(OSSL_PROVIDER *prov)
}
int ossl_provider_add_to_store(OSSL_PROVIDER *prov, OSSL_PROVIDER **actualprov,
- int retain_fallbacks)
+ int retain_fallbacks)
{
struct provider_store_st *store;
int idx;
- OSSL_PROVIDER tmpl = { 0, };
+ OSSL_PROVIDER tmpl = {
+ 0,
+ };
OSSL_PROVIDER *actualtmp = NULL;
if (actualprov != NULL)
@@ -724,7 +730,7 @@ int ossl_provider_add_to_store(OSSL_PROVIDER *prov, OSSL_PROVIDER **actualprov,
return 1;
- err:
+err:
CRYPTO_THREAD_unlock(store->lock);
return 0;
}
@@ -748,13 +754,13 @@ void ossl_provider_free(OSSL_PROVIDER *prov)
if (prov->flag_initialized) {
ossl_provider_teardown(prov);
#ifndef OPENSSL_NO_ERR
-# ifndef FIPS_MODULE
+#ifndef FIPS_MODULE
if (prov->error_strings != NULL) {
ERR_unload_strings(prov->error_lib, prov->error_strings);
OPENSSL_free(prov->error_strings);
prov->error_strings = NULL;
}
-# endif
+#endif
#endif
OPENSSL_free(prov->operation_bits);
prov->operation_bits = NULL;
@@ -801,7 +807,7 @@ int ossl_provider_set_module_path(OSSL_PROVIDER *prov, const char *module_path)
}
static int infopair_add(STACK_OF(INFOPAIR) **infopairsk, const char *name,
- const char *value)
+ const char *value)
{
INFOPAIR *pair = NULL;
@@ -811,7 +817,7 @@ static int infopair_add(STACK_OF(INFOPAIR) **infopairsk, const char *name,
goto err;
if ((*infopairsk == NULL
- && (*infopairsk = sk_INFOPAIR_new_null()) == NULL)
+ && (*infopairsk = sk_INFOPAIR_new_null()) == NULL)
|| sk_INFOPAIR_push(*infopairsk, pair) <= 0) {
ERR_raise(ERR_LIB_CRYPTO, ERR_R_CRYPTO_LIB);
goto err;
@@ -819,7 +825,7 @@ static int infopair_add(STACK_OF(INFOPAIR) **infopairsk, const char *name,
return 1;
- err:
+err:
if (pair != NULL) {
OPENSSL_free(pair->name);
OPENSSL_free(pair->value);
@@ -829,13 +835,13 @@ static int infopair_add(STACK_OF(INFOPAIR) **infopairsk, const char *name,
}
int OSSL_PROVIDER_add_conf_parameter(OSSL_PROVIDER *prov,
- const char *name, const char *value)
+ const char *name, const char *value)
{
return infopair_add(&prov->parameters, name, value);
}
int OSSL_PROVIDER_get_conf_parameters(const OSSL_PROVIDER *prov,
- OSSL_PARAM params[])
+ OSSL_PARAM params[])
{
int i;
@@ -854,14 +860,14 @@ int OSSL_PROVIDER_get_conf_parameters(const OSSL_PROVIDER *prov,
}
int OSSL_PROVIDER_conf_get_bool(const OSSL_PROVIDER *prov,
- const char *name, int defval)
+ const char *name, int defval)
{
char *val = NULL;
OSSL_PARAM param[2] = { OSSL_PARAM_END, OSSL_PARAM_END };
param[0].key = (char *)name;
param[0].data_type = OSSL_PARAM_UTF8_PTR;
- param[0].data = (void *) &val;
+ param[0].data = (void *)&val;
param[0].data_size = sizeof(val);
param[0].return_size = OSSL_PARAM_UNMODIFIED;
@@ -875,17 +881,17 @@ int OSSL_PROVIDER_conf_get_bool(const OSSL_PROVIDER *prov,
|| (OPENSSL_strcasecmp(val, "on") == 0))
return 1;
else if ((strcmp(val, "0") == 0)
- || (OPENSSL_strcasecmp(val, "no") == 0)
- || (OPENSSL_strcasecmp(val, "false") == 0)
- || (OPENSSL_strcasecmp(val, "off") == 0))
+ || (OPENSSL_strcasecmp(val, "no") == 0)
+ || (OPENSSL_strcasecmp(val, "false") == 0)
+ || (OPENSSL_strcasecmp(val, "off") == 0))
return 0;
}
return defval;
}
int ossl_provider_info_add_parameter(OSSL_PROVIDER_INFO *provinfo,
- const char *name,
- const char *value)
+ const char *name,
+ const char *value)
{
return infopair_add(&provinfo->parameters, name, value);
}
@@ -905,7 +911,7 @@ int ossl_provider_info_add_parameter(OSSL_PROVIDER_INFO *provinfo,
static const OSSL_DISPATCH *core_dispatch; /* Define further down */
int OSSL_PROVIDER_set_default_search_path(OSSL_LIB_CTX *libctx,
- const char *path)
+ const char *path)
{
struct provider_store_st *store;
char *p = NULL;
@@ -916,7 +922,7 @@ int OSSL_PROVIDER_set_default_search_path(OSSL_LIB_CTX *libctx,
return 0;
}
if ((store = get_provider_store(libctx)) != NULL
- && CRYPTO_THREAD_write_lock(store->default_path_lock)) {
+ && CRYPTO_THREAD_write_lock(store->default_path_lock)) {
OPENSSL_free(store->default_path);
store->default_path = p;
CRYPTO_THREAD_unlock(store->default_path_lock);
@@ -932,7 +938,7 @@ const char *OSSL_PROVIDER_get0_default_search_path(OSSL_LIB_CTX *libctx)
char *path = NULL;
if ((store = get_provider_store(libctx)) != NULL
- && CRYPTO_THREAD_read_lock(store->default_path_lock)) {
+ && CRYPTO_THREAD_read_lock(store->default_path_lock)) {
path = store->default_path;
CRYPTO_THREAD_unlock(store->default_path_lock);
}
@@ -947,11 +953,11 @@ const char *OSSL_PROVIDER_get0_default_search_path(OSSL_LIB_CTX *libctx)
static int provider_init(OSSL_PROVIDER *prov)
{
const OSSL_DISPATCH *provider_dispatch = NULL;
- void *tmp_provctx = NULL; /* safety measure */
+ void *tmp_provctx = NULL; /* safety measure */
#ifndef OPENSSL_NO_ERR
-# ifndef FIPS_MODULE
+#ifndef FIPS_MODULE
OSSL_FUNC_provider_get_reason_strings_fn *p_get_reason_strings = NULL;
-# endif
+#endif
#endif
int ok = 0;
@@ -982,7 +988,7 @@ static int provider_init(OSSL_PROVIDER *prov)
}
if ((store = get_provider_store(prov->libctx)) == NULL
- || !CRYPTO_THREAD_read_lock(store->default_path_lock))
+ || !CRYPTO_THREAD_read_lock(store->default_path_lock))
goto end;
if (store->default_path != NULL) {
@@ -1002,12 +1008,11 @@ static int provider_init(OSSL_PROVIDER *prov)
}
DSO_ctrl(prov->module, DSO_CTRL_SET_FLAGS,
- DSO_FLAG_NAME_TRANSLATION_EXT_ONLY, NULL);
+ DSO_FLAG_NAME_TRANSLATION_EXT_ONLY, NULL);
module_path = prov->path;
if (module_path == NULL)
- module_path = allocated_path =
- DSO_convert_filename(prov->module, prov->name);
+ module_path = allocated_path = DSO_convert_filename(prov->module, prov->name);
if (module_path != NULL)
merged_path = DSO_merge(prov->module, module_path, load_dir);
@@ -1025,7 +1030,7 @@ static int provider_init(OSSL_PROVIDER *prov)
if (prov->module == NULL) {
/* DSO has already recorded errors, this is just a tracepoint */
ERR_raise_data(ERR_LIB_CRYPTO, ERR_R_DSO_LIB,
- "name=%s", prov->name);
+ "name=%s", prov->name);
goto end;
}
@@ -1037,21 +1042,23 @@ static int provider_init(OSSL_PROVIDER *prov)
/* Check for and call the initialise function for the provider. */
if (prov->init_function == NULL) {
ERR_raise_data(ERR_LIB_CRYPTO, ERR_R_UNSUPPORTED,
- "name=%s, provider has no provider init function",
- prov->name);
+ "name=%s, provider has no provider init function",
+ prov->name);
goto end;
}
#ifndef FIPS_MODULE
- OSSL_TRACE_BEGIN(PROVIDER) {
+ OSSL_TRACE_BEGIN(PROVIDER)
+ {
BIO_printf(trc_out,
- "(provider %s) initializing\n", prov->name);
- } OSSL_TRACE_END(PROVIDER);
+ "(provider %s) initializing\n", prov->name);
+ }
+ OSSL_TRACE_END(PROVIDER);
#endif
if (!prov->init_function((OSSL_CORE_HANDLE *)prov, core_dispatch,
- &provider_dispatch, &tmp_provctx)) {
+ &provider_dispatch, &tmp_provctx)) {
ERR_raise_data(ERR_LIB_CRYPTO, ERR_R_INIT_FAIL,
- "name=%s", prov->name);
+ "name=%s", prov->name);
goto end;
}
prov->provctx = tmp_provctx;
@@ -1061,51 +1068,42 @@ static int provider_init(OSSL_PROVIDER *prov)
for (; provider_dispatch->function_id != 0; provider_dispatch++) {
switch (provider_dispatch->function_id) {
case OSSL_FUNC_PROVIDER_TEARDOWN:
- prov->teardown =
- OSSL_FUNC_provider_teardown(provider_dispatch);
+ prov->teardown = OSSL_FUNC_provider_teardown(provider_dispatch);
break;
case OSSL_FUNC_PROVIDER_GETTABLE_PARAMS:
- prov->gettable_params =
- OSSL_FUNC_provider_gettable_params(provider_dispatch);
+ prov->gettable_params = OSSL_FUNC_provider_gettable_params(provider_dispatch);
break;
case OSSL_FUNC_PROVIDER_GET_PARAMS:
- prov->get_params =
- OSSL_FUNC_provider_get_params(provider_dispatch);
+ prov->get_params = OSSL_FUNC_provider_get_params(provider_dispatch);
break;
case OSSL_FUNC_PROVIDER_SELF_TEST:
- prov->self_test =
- OSSL_FUNC_provider_self_test(provider_dispatch);
+ prov->self_test = OSSL_FUNC_provider_self_test(provider_dispatch);
break;
case OSSL_FUNC_PROVIDER_RANDOM_BYTES:
- prov->random_bytes =
- OSSL_FUNC_provider_random_bytes(provider_dispatch);
+ prov->random_bytes = OSSL_FUNC_provider_random_bytes(provider_dispatch);
break;
case OSSL_FUNC_PROVIDER_GET_CAPABILITIES:
- prov->get_capabilities =
- OSSL_FUNC_provider_get_capabilities(provider_dispatch);
+ prov->get_capabilities = OSSL_FUNC_provider_get_capabilities(provider_dispatch);
break;
case OSSL_FUNC_PROVIDER_QUERY_OPERATION:
- prov->query_operation =
- OSSL_FUNC_provider_query_operation(provider_dispatch);
+ prov->query_operation = OSSL_FUNC_provider_query_operation(provider_dispatch);
break;
case OSSL_FUNC_PROVIDER_UNQUERY_OPERATION:
- prov->unquery_operation =
- OSSL_FUNC_provider_unquery_operation(provider_dispatch);
+ prov->unquery_operation = OSSL_FUNC_provider_unquery_operation(provider_dispatch);
break;
#ifndef OPENSSL_NO_ERR
-# ifndef FIPS_MODULE
+#ifndef FIPS_MODULE
case OSSL_FUNC_PROVIDER_GET_REASON_STRINGS:
- p_get_reason_strings =
- OSSL_FUNC_provider_get_reason_strings(provider_dispatch);
+ p_get_reason_strings = OSSL_FUNC_provider_get_reason_strings(provider_dispatch);
break;
-# endif
+#endif
#endif
}
}
}
#ifndef OPENSSL_NO_ERR
-# ifndef FIPS_MODULE
+#ifndef FIPS_MODULE
if (p_get_reason_strings != NULL) {
const OSSL_ITEM *reasonstrings = p_get_reason_strings(prov->provctx);
size_t cnt, cnt2;
@@ -1123,11 +1121,10 @@ static int provider_init(OSSL_PROVIDER *prov)
goto end;
cnt++;
}
- cnt++; /* One for the terminating item */
+ cnt++; /* One for the terminating item */
/* Allocate one extra item for the "library" name */
- prov->error_strings =
- OPENSSL_calloc(cnt + 1, sizeof(ERR_STRING_DATA));
+ prov->error_strings = OPENSSL_calloc(cnt + 1, sizeof(ERR_STRING_DATA));
if (prov->error_strings == NULL)
goto end;
@@ -1141,20 +1138,20 @@ static int provider_init(OSSL_PROVIDER *prov)
* 1..cnt.
*/
for (cnt2 = 1; cnt2 <= cnt; cnt2++) {
- prov->error_strings[cnt2].error = (int)reasonstrings[cnt2-1].id;
- prov->error_strings[cnt2].string = reasonstrings[cnt2-1].ptr;
+ prov->error_strings[cnt2].error = (int)reasonstrings[cnt2 - 1].id;
+ prov->error_strings[cnt2].string = reasonstrings[cnt2 - 1].ptr;
}
ERR_load_strings(prov->error_lib, prov->error_strings);
}
-# endif
+#endif
#endif
/* With this flag set, this provider has become fully "loaded". */
prov->flag_initialized = 1;
ok = 1;
- end:
+end:
return ok;
}
@@ -1165,7 +1162,7 @@ static int provider_init(OSSL_PROVIDER *prov)
* Return -1 on failure and the activation count on success
*/
static int provider_deactivate(OSSL_PROVIDER *prov, int upcalls,
- int removechildren)
+ int removechildren)
{
int count;
struct provider_store_st *store;
@@ -1179,7 +1176,7 @@ static int provider_deactivate(OSSL_PROVIDER *prov, int upcalls,
#ifndef FIPS_MODULE
if (prov->random_bytes != NULL
- && !ossl_rand_check_random_provider_on_unload(prov->libctx, prov))
+ && !ossl_rand_check_random_provider_on_unload(prov->libctx, prov))
return -1;
#endif
@@ -1269,9 +1266,9 @@ static int provider_activate(OSSL_PROVIDER *prov, int lock, int upcalls)
store = prov->store;
/*
- * If the provider hasn't been added to the store, then we don't need
- * any locks because we've not shared it with other threads.
- */
+ * If the provider hasn't been added to the store, then we don't need
+ * any locks because we've not shared it with other threads.
+ */
if (store == NULL) {
lock = 0;
if (!provider_init(prov))
@@ -1280,7 +1277,7 @@ static int provider_activate(OSSL_PROVIDER *prov, int lock, int upcalls)
#ifndef FIPS_MODULE
if (prov->random_bytes != NULL
- && !ossl_rand_check_random_provider_on_load(prov->libctx, prov))
+ && !ossl_rand_check_random_provider_on_load(prov->libctx, prov))
return -1;
if (prov->ischild && upcalls && !ossl_provider_up_ref_parent(prov, 1))
@@ -1426,7 +1423,7 @@ int ossl_provider_deactivate(OSSL_PROVIDER *prov, int removechildren)
int count;
if (prov == NULL
- || (count = provider_deactivate(prov, 1, removechildren)) < 0)
+ || (count = provider_deactivate(prov, 1, removechildren)) < 0)
return 0;
return count == 0 ? provider_remove_store_methods(prov) : 1;
}
@@ -1514,7 +1511,7 @@ static int provider_activate_fallbacks(struct provider_store_st *store)
store->use_fallbacks = 0;
ret = 1;
}
- err:
+err:
CRYPTO_THREAD_unlock(store->lock);
return ret;
}
@@ -1530,9 +1527,9 @@ int ossl_provider_activate_fallbacks(OSSL_LIB_CTX *ctx)
}
int ossl_provider_doall_activated(OSSL_LIB_CTX *ctx,
- int (*cb)(OSSL_PROVIDER *provider,
- void *cbdata),
- void *cbdata)
+ int (*cb)(OSSL_PROVIDER *provider,
+ void *cbdata),
+ void *cbdata)
{
int ret = 0, curr, max, ref = 0;
struct provider_store_st *store = get_provider_store(ctx);
@@ -1590,7 +1587,7 @@ int ossl_provider_doall_activated(OSSL_LIB_CTX *ctx,
* whilst still activated in the child for a short period. That's ok.
*/
if (!CRYPTO_atomic_add(&prov->activatecnt, 1, &ref,
- prov->activatecnt_lock)) {
+ prov->activatecnt_lock)) {
CRYPTO_DOWN_REF(&prov->refcnt, &ref);
CRYPTO_THREAD_unlock(prov->flag_lock);
goto err_unlock;
@@ -1619,9 +1616,9 @@ int ossl_provider_doall_activated(OSSL_LIB_CTX *ctx,
ret = 1;
goto finish;
- err_unlock:
+err_unlock:
CRYPTO_THREAD_unlock(store->lock);
- finish:
+finish:
/*
* The pop_free call doesn't do what we want on an error condition. We
* either start from the first item in the stack, or part way through if
@@ -1631,7 +1628,7 @@ int ossl_provider_doall_activated(OSSL_LIB_CTX *ctx,
OSSL_PROVIDER *prov = sk_OSSL_PROVIDER_value(provs, curr);
if (!CRYPTO_atomic_add(&prov->activatecnt, -1, &ref,
- prov->activatecnt_lock)) {
+ prov->activatecnt_lock)) {
ret = 0;
continue;
}
@@ -1642,7 +1639,7 @@ int ossl_provider_doall_activated(OSSL_LIB_CTX *ctx,
* we avoid it. We up the count again and do a full deactivation
*/
if (CRYPTO_atomic_add(&prov->activatecnt, 1, &ref,
- prov->activatecnt_lock))
+ prov->activatecnt_lock))
provider_deactivate(prov, 0, 1);
else
ret = 0;
@@ -1745,14 +1742,16 @@ void ossl_provider_teardown(const OSSL_PROVIDER *prov)
{
if (prov->teardown != NULL
#ifndef FIPS_MODULE
- && !prov->ischild
+ && !prov->ischild
#endif
- ) {
+ ) {
#ifndef FIPS_MODULE
- OSSL_TRACE_BEGIN(PROVIDER) {
+ OSSL_TRACE_BEGIN(PROVIDER)
+ {
BIO_printf(trc_out, "(provider %s) calling teardown\n",
- ossl_provider_name(prov));
- } OSSL_TRACE_END(PROVIDER);
+ ossl_provider_name(prov));
+ }
+ OSSL_TRACE_END(PROVIDER);
#endif
prov->teardown(prov->provctx);
}
@@ -1779,11 +1778,12 @@ const OSSL_PARAM *ossl_provider_gettable_params(const OSSL_PROVIDER *prov)
ret = prov->gettable_params(prov->provctx);
#ifndef FIPS_MODULE
- OSSL_TRACE_BEGIN(PROVIDER) {
+ OSSL_TRACE_BEGIN(PROVIDER)
+ {
char *buf = NULL;
BIO_printf(trc_out, "(provider %s) gettable params\n",
- ossl_provider_name(prov));
+ ossl_provider_name(prov));
BIO_printf(trc_out, "Parameters:\n");
if (prov->gettable_params != NULL) {
if (!OSSL_PARAM_print_to_bio(ret, trc_out, 0))
@@ -1792,7 +1792,8 @@ const OSSL_PARAM *ossl_provider_gettable_params(const OSSL_PROVIDER *prov)
} else {
BIO_printf(trc_out, "Provider doesn't implement gettable_params\n");
}
- } OSSL_TRACE_END(PROVIDER);
+ }
+ OSSL_TRACE_END(PROVIDER);
#endif
return ret;
@@ -1821,10 +1822,11 @@ int ossl_provider_get_params(const OSSL_PROVIDER *prov, OSSL_PARAM params[])
ret = prov->get_params(prov->provctx, params);
#ifndef FIPS_MODULE
- OSSL_TRACE_BEGIN(PROVIDER) {
+ OSSL_TRACE_BEGIN(PROVIDER)
+ {
BIO_printf(trc_out,
- "(provider %s) calling get_params\n", prov->name);
+ "(provider %s) calling get_params\n", prov->name);
if (ret == 1) {
BIO_printf(trc_out, "Parameters:\n");
if (!OSSL_PARAM_print_to_bio(params, trc_out, 1))
@@ -1832,7 +1834,8 @@ int ossl_provider_get_params(const OSSL_PROVIDER *prov, OSSL_PARAM params[])
} else {
BIO_printf(trc_out, "get_params call failed\n");
}
- } OSSL_TRACE_END(PROVIDER);
+ }
+ OSSL_TRACE_END(PROVIDER);
#endif
return ret;
}
@@ -1859,16 +1862,18 @@ int ossl_provider_self_test(const OSSL_PROVIDER *prov)
ret = prov->self_test(prov->provctx);
#ifndef FIPS_MODULE
- OSSL_TRACE_BEGIN(PROVIDER) {
- if (prov->self_test != NULL)
+ OSSL_TRACE_BEGIN(PROVIDER)
+ {
+ if (prov->self_test != NULL)
BIO_printf(trc_out,
- "(provider %s) Calling self_test, ret = %d\n",
- prov->name, ret);
+ "(provider %s) Calling self_test, ret = %d\n",
+ prov->name, ret);
else
BIO_printf(trc_out,
- "(provider %s) doesn't implement self_test\n",
- prov->name);
- } OSSL_TRACE_END(PROVIDER);
+ "(provider %s) doesn't implement self_test\n",
+ prov->name);
+ }
+ OSSL_TRACE_END(PROVIDER);
#endif
if (ret == 0)
(void)provider_remove_store_methods((OSSL_PROVIDER *)prov);
@@ -1894,26 +1899,29 @@ int ossl_provider_self_test(const OSSL_PROVIDER *prov)
* capabilities.
*/
int ossl_provider_random_bytes(const OSSL_PROVIDER *prov, int which,
- void *buf, size_t n, unsigned int strength)
+ void *buf, size_t n, unsigned int strength)
{
return prov->random_bytes == NULL ? 0
: prov->random_bytes(prov->provctx, which,
- buf, n, strength);
+ buf, n, strength);
}
int ossl_provider_get_capabilities(const OSSL_PROVIDER *prov,
- const char *capability,
- OSSL_CALLBACK *cb,
- void *arg)
+ const char *capability,
+ OSSL_CALLBACK *cb,
+ void *arg)
{
if (prov->get_capabilities != NULL) {
#ifndef FIPS_MODULE
- OSSL_TRACE_BEGIN(PROVIDER) {
+ OSSL_TRACE_BEGIN(PROVIDER)
+ {
BIO_printf(trc_out,
- "(provider %s) Calling get_capabilities "
- "with capabilities %s\n", prov->name,
- capability == NULL ? "none" : capability);
- } OSSL_TRACE_END(PROVIDER);
+ "(provider %s) Calling get_capabilities "
+ "with capabilities %s\n",
+ prov->name,
+ capability == NULL ? "none" : capability);
+ }
+ OSSL_TRACE_END(PROVIDER);
#endif
return prov->get_capabilities(prov->provctx, capability, cb, arg);
}
@@ -1939,44 +1947,45 @@ int ossl_provider_get_capabilities(const OSSL_PROVIDER *prov,
* printed for debugging.
*/
const OSSL_ALGORITHM *ossl_provider_query_operation(const OSSL_PROVIDER *prov,
- int operation_id,
- int *no_cache)
+ int operation_id,
+ int *no_cache)
{
const OSSL_ALGORITHM *res;
if (prov->query_operation == NULL) {
#ifndef FIPS_MODULE
- OSSL_TRACE_BEGIN(PROVIDER) {
+ OSSL_TRACE_BEGIN(PROVIDER)
+ {
BIO_printf(trc_out, "provider %s lacks query operation!\n",
- prov->name);
- } OSSL_TRACE_END(PROVIDER);
+ prov->name);
+ }
+ OSSL_TRACE_END(PROVIDER);
#endif
return NULL;
}
res = prov->query_operation(prov->provctx, operation_id, no_cache);
#ifndef FIPS_MODULE
- OSSL_TRACE_BEGIN(PROVIDER) {
+ OSSL_TRACE_BEGIN(PROVIDER)
+ {
const OSSL_ALGORITHM *idx;
if (res != NULL) {
BIO_printf(trc_out,
- "(provider %s) Calling query, available algs are:\n", prov->name);
+ "(provider %s) Calling query, available algs are:\n", prov->name);
for (idx = res; idx->algorithm_names != NULL; idx++) {
BIO_printf(trc_out,
- "(provider %s) names %s, prop_def %s, desc %s\n",
- prov->name,
- idx->algorithm_names == NULL ? "none" :
- idx->algorithm_names,
- idx->property_definition == NULL ? "none" :
- idx->property_definition,
- idx->algorithm_description == NULL ? "none" :
- idx->algorithm_description);
+ "(provider %s) names %s, prop_def %s, desc %s\n",
+ prov->name,
+ idx->algorithm_names == NULL ? "none" : idx->algorithm_names,
+ idx->property_definition == NULL ? "none" : idx->property_definition,
+ idx->algorithm_description == NULL ? "none" : idx->algorithm_description);
}
} else {
BIO_printf(trc_out, "(provider %s) query_operation failed\n", prov->name);
}
- } OSSL_TRACE_END(PROVIDER);
+ }
+ OSSL_TRACE_END(PROVIDER);
#endif
#if defined(OPENSSL_NO_CACHED_FETCH)
@@ -2002,18 +2011,20 @@ const OSSL_ALGORITHM *ossl_provider_query_operation(const OSSL_PROVIDER *prov,
* is being unqueried.
*/
void ossl_provider_unquery_operation(const OSSL_PROVIDER *prov,
- int operation_id,
- const OSSL_ALGORITHM *algs)
+ int operation_id,
+ const OSSL_ALGORITHM *algs)
{
if (prov->unquery_operation != NULL) {
#ifndef FIPS_MODULE
- OSSL_TRACE_BEGIN(PROVIDER) {
+ OSSL_TRACE_BEGIN(PROVIDER)
+ {
BIO_printf(trc_out,
- "(provider %s) Calling unquery"
- " with operation %d\n",
- prov->name,
- operation_id);
- } OSSL_TRACE_END(PROVIDER);
+ "(provider %s) Calling unquery"
+ " with operation %d\n",
+ prov->name,
+ operation_id);
+ }
+ OSSL_TRACE_END(PROVIDER);
#endif
prov->unquery_operation(prov->provctx, operation_id, algs);
}
@@ -2028,7 +2039,7 @@ int ossl_provider_set_operation_bit(OSSL_PROVIDER *provider, size_t bitnum)
return 0;
if (provider->operation_bits_sz <= byte) {
unsigned char *tmp = OPENSSL_realloc(provider->operation_bits,
- byte + 1);
+ byte + 1);
if (tmp == NULL) {
CRYPTO_THREAD_unlock(provider->opbits_lock);
@@ -2036,7 +2047,7 @@ int ossl_provider_set_operation_bit(OSSL_PROVIDER *provider, size_t bitnum)
}
provider->operation_bits = tmp;
memset(provider->operation_bits + provider->operation_bits_sz,
- '\0', byte + 1 - provider->operation_bits_sz);
+ '\0', byte + 1 - provider->operation_bits_sz);
provider->operation_bits_sz = byte + 1;
}
provider->operation_bits[byte] |= bit;
@@ -2045,7 +2056,7 @@ int ossl_provider_set_operation_bit(OSSL_PROVIDER *provider, size_t bitnum)
}
int ossl_provider_test_operation_bit(OSSL_PROVIDER *provider, size_t bitnum,
- int *result)
+ int *result)
{
size_t byte = bitnum / 8;
unsigned char bit = (1 << (bitnum % 8)) & 0xFF;
@@ -2108,16 +2119,16 @@ int ossl_provider_default_props_update(OSSL_LIB_CTX *libctx, const char *props)
}
static int ossl_provider_register_child_cb(const OSSL_CORE_HANDLE *handle,
- int (*create_cb)(
- const OSSL_CORE_HANDLE *provider,
- void *cbdata),
- int (*remove_cb)(
- const OSSL_CORE_HANDLE *provider,
- void *cbdata),
- int (*global_props_cb)(
- const char *props,
- void *cbdata),
- void *cbdata)
+ int (*create_cb)(
+ const OSSL_CORE_HANDLE *provider,
+ void *cbdata),
+ int (*remove_cb)(
+ const OSSL_CORE_HANDLE *provider,
+ void *cbdata),
+ int (*global_props_cb)(
+ const char *props,
+ void *cbdata),
+ void *cbdata)
{
/*
* This is really an OSSL_PROVIDER that we created and cast to
@@ -2239,10 +2250,10 @@ static void ossl_provider_deregister_child_cb(const OSSL_CORE_HANDLE *handle)
static const OSSL_PARAM param_types[] = {
OSSL_PARAM_DEFN(OSSL_PROV_PARAM_CORE_VERSION, OSSL_PARAM_UTF8_PTR, NULL, 0),
OSSL_PARAM_DEFN(OSSL_PROV_PARAM_CORE_PROV_NAME, OSSL_PARAM_UTF8_PTR,
- NULL, 0),
+ NULL, 0),
#ifndef FIPS_MODULE
OSSL_PARAM_DEFN(OSSL_PROV_PARAM_CORE_MODULE_FILENAME, OSSL_PARAM_UTF8_PTR,
- NULL, 0),
+ NULL, 0),
#endif
OSSL_PARAM_END
};
@@ -2329,7 +2340,8 @@ static int core_get_params(const OSSL_CORE_HANDLE *handle, OSSL_PARAM params[])
#ifndef FIPS_MODULE
if ((p = OSSL_PARAM_locate(params,
- OSSL_PROV_PARAM_CORE_MODULE_FILENAME)) != NULL)
+ OSSL_PROV_PARAM_CORE_MODULE_FILENAME))
+ != NULL)
OSSL_PARAM_set_utf8_ptr(p, ossl_provider_module_path(prov));
#endif
@@ -2355,8 +2367,8 @@ static OPENSSL_CORE_CTX *core_get_libctx(const OSSL_CORE_HANDLE *handle)
}
static int core_thread_start(const OSSL_CORE_HANDLE *handle,
- OSSL_thread_stop_handler_fn handfn,
- void *arg)
+ OSSL_thread_stop_handler_fn handfn,
+ void *arg)
{
/*
* We created this object originally and we know it is actually an
@@ -2386,13 +2398,13 @@ static void core_new_error(const OSSL_CORE_HANDLE *handle)
}
static void core_set_error_debug(const OSSL_CORE_HANDLE *handle,
- const char *file, int line, const char *func)
+ const char *file, int line, const char *func)
{
ERR_set_debug(file, line, func);
}
static void core_vset_error(const OSSL_CORE_HANDLE *handle,
- uint32_t reason, const char *fmt, va_list args)
+ uint32_t reason, const char *fmt, va_list args)
{
/*
* We created this object originally and we know it is actually an
@@ -2433,26 +2445,26 @@ static int core_count_to_mark(const OSSL_CORE_HANDLE *handle)
}
static void core_indicator_get_callback(OPENSSL_CORE_CTX *libctx,
- OSSL_INDICATOR_CALLBACK **cb)
+ OSSL_INDICATOR_CALLBACK **cb)
{
OSSL_INDICATOR_get_callback((OSSL_LIB_CTX *)libctx, cb);
}
static void core_self_test_get_callback(OPENSSL_CORE_CTX *libctx,
- OSSL_CALLBACK **cb, void **cbarg)
+ OSSL_CALLBACK **cb, void **cbarg)
{
OSSL_SELF_TEST_get_callback((OSSL_LIB_CTX *)libctx, cb, cbarg);
}
-# ifdef OPENSSL_NO_FIPS_JITTER
+#ifdef OPENSSL_NO_FIPS_JITTER
static size_t rand_get_entropy(const OSSL_CORE_HANDLE *handle,
- unsigned char **pout, int entropy,
- size_t min_len, size_t max_len)
+ unsigned char **pout, int entropy,
+ size_t min_len, size_t max_len)
{
return ossl_rand_get_entropy((OSSL_LIB_CTX *)core_get_libctx(handle),
- pout, entropy, min_len, max_len);
+ pout, entropy, min_len, max_len);
}
-# else
+#else
/*
* OpenSSL FIPS providers prior to 3.2 call rand_get_entropy API from
* core, instead of the newer get_user_entropy. Newer API call honors
@@ -2471,65 +2483,65 @@ static size_t rand_get_entropy(const OSSL_CORE_HANDLE *handle,
*/
size_t ossl_rand_jitter_get_seed(unsigned char **, int, size_t, size_t);
static size_t rand_get_entropy(const OSSL_CORE_HANDLE *handle,
- unsigned char **pout, int entropy,
- size_t min_len, size_t max_len)
+ unsigned char **pout, int entropy,
+ size_t min_len, size_t max_len)
{
return ossl_rand_jitter_get_seed(pout, entropy, min_len, max_len);
}
-# endif
+#endif
static size_t rand_get_user_entropy(const OSSL_CORE_HANDLE *handle,
- unsigned char **pout, int entropy,
- size_t min_len, size_t max_len)
+ unsigned char **pout, int entropy,
+ size_t min_len, size_t max_len)
{
return ossl_rand_get_user_entropy((OSSL_LIB_CTX *)core_get_libctx(handle),
- pout, entropy, min_len, max_len);
+ pout, entropy, min_len, max_len);
}
static void rand_cleanup_entropy(const OSSL_CORE_HANDLE *handle,
- unsigned char *buf, size_t len)
+ unsigned char *buf, size_t len)
{
ossl_rand_cleanup_entropy((OSSL_LIB_CTX *)core_get_libctx(handle),
- buf, len);
+ buf, len);
}
static void rand_cleanup_user_entropy(const OSSL_CORE_HANDLE *handle,
- unsigned char *buf, size_t len)
+ unsigned char *buf, size_t len)
{
ossl_rand_cleanup_user_entropy((OSSL_LIB_CTX *)core_get_libctx(handle),
- buf, len);
+ buf, len);
}
static size_t rand_get_nonce(const OSSL_CORE_HANDLE *handle,
- unsigned char **pout,
- size_t min_len, size_t max_len,
- const void *salt, size_t salt_len)
+ unsigned char **pout,
+ size_t min_len, size_t max_len,
+ const void *salt, size_t salt_len)
{
return ossl_rand_get_nonce((OSSL_LIB_CTX *)core_get_libctx(handle),
- pout, min_len, max_len, salt, salt_len);
+ pout, min_len, max_len, salt, salt_len);
}
static size_t rand_get_user_nonce(const OSSL_CORE_HANDLE *handle,
- unsigned char **pout,
- size_t min_len, size_t max_len,
- const void *salt, size_t salt_len)
+ unsigned char **pout,
+ size_t min_len, size_t max_len,
+ const void *salt, size_t salt_len)
{
return ossl_rand_get_user_nonce((OSSL_LIB_CTX *)core_get_libctx(handle),
- pout, min_len, max_len, salt, salt_len);
+ pout, min_len, max_len, salt, salt_len);
}
static void rand_cleanup_nonce(const OSSL_CORE_HANDLE *handle,
- unsigned char *buf, size_t len)
+ unsigned char *buf, size_t len)
{
ossl_rand_cleanup_nonce((OSSL_LIB_CTX *)core_get_libctx(handle),
- buf, len);
+ buf, len);
}
static void rand_cleanup_user_nonce(const OSSL_CORE_HANDLE *handle,
- unsigned char *buf, size_t len)
+ unsigned char *buf, size_t len)
{
ossl_rand_cleanup_user_nonce((OSSL_LIB_CTX *)core_get_libctx(handle),
- buf, len);
+ buf, len);
}
static const char *core_provider_get0_name(const OSSL_CORE_HANDLE *prov)
@@ -2549,20 +2561,20 @@ core_provider_get0_dispatch(const OSSL_CORE_HANDLE *prov)
}
static int core_provider_up_ref_intern(const OSSL_CORE_HANDLE *prov,
- int activate)
+ int activate)
{
return provider_up_ref_intern((OSSL_PROVIDER *)prov, activate);
}
static int core_provider_free_intern(const OSSL_CORE_HANDLE *prov,
- int deactivate)
+ int deactivate)
{
return provider_free_intern((OSSL_PROVIDER *)prov, deactivate);
}
static int core_obj_add_sigid(const OSSL_CORE_HANDLE *prov,
- const char *sign_name, const char *digest_name,
- const char *pkey_name)
+ const char *sign_name, const char *digest_name,
+ const char *pkey_name)
{
int sign_nid = OBJ_txt2nid(sign_name);
int digest_nid = NID_undef;
@@ -2570,7 +2582,7 @@ static int core_obj_add_sigid(const OSSL_CORE_HANDLE *prov,
if (digest_name != NULL && digest_name[0] != '\0'
&& (digest_nid = OBJ_txt2nid(digest_name)) == NID_undef)
- return 0;
+ return 0;
if (sign_nid == NID_undef)
return 0;
@@ -2589,11 +2601,11 @@ static int core_obj_add_sigid(const OSSL_CORE_HANDLE *prov,
}
static int core_obj_create(const OSSL_CORE_HANDLE *prov, const char *oid,
- const char *sn, const char *ln)
+ const char *sn, const char *ln)
{
/* Check if it already exists and create it if not */
return OBJ_txt2nid(oid) != NID_undef
- || OBJ_create(oid, sn, ln) != NID_undef;
+ || OBJ_create(oid, sn, ln) != NID_undef;
}
#endif /* FIPS_MODULE */
@@ -2611,7 +2623,7 @@ static const OSSL_DISPATCH core_dispatch_[] = {
{ OSSL_FUNC_CORE_VSET_ERROR, (void (*)(void))core_vset_error },
{ OSSL_FUNC_CORE_SET_ERROR_MARK, (void (*)(void))core_set_error_mark },
{ OSSL_FUNC_CORE_CLEAR_LAST_ERROR_MARK,
- (void (*)(void))core_clear_last_error_mark },
+ (void (*)(void))core_clear_last_error_mark },
{ OSSL_FUNC_CORE_POP_ERROR_TO_MARK, (void (*)(void))core_pop_error_to_mark },
{ OSSL_FUNC_CORE_COUNT_TO_MARK, (void (*)(void))core_count_to_mark },
{ OSSL_FUNC_BIO_NEW_FILE, (void (*)(void))ossl_core_bio_new_file },
diff --git a/crypto/provider_local.h b/crypto/provider_local.h
index e0bcbcb9f9..7799980808 100644
--- a/crypto/provider_local.h
+++ b/crypto/provider_local.h
@@ -20,14 +20,14 @@ typedef struct {
char *path;
OSSL_provider_init_fn *init;
STACK_OF(INFOPAIR) *parameters;
- unsigned int is_fallback:1;
+ unsigned int is_fallback : 1;
} OSSL_PROVIDER_INFO;
extern const OSSL_PROVIDER_INFO ossl_predefined_providers[];
void ossl_provider_info_clear(OSSL_PROVIDER_INFO *info);
int ossl_provider_info_add_to_store(OSSL_LIB_CTX *libctx,
- OSSL_PROVIDER_INFO *entry);
+ OSSL_PROVIDER_INFO *entry);
int ossl_provider_info_add_parameter(OSSL_PROVIDER_INFO *provinfo,
- const char *name,
- const char *value);
+ const char *name,
+ const char *value);
diff --git a/crypto/provider_predefined.c b/crypto/provider_predefined.c
index 068e0b7cd9..2f8d1067a9 100644
--- a/crypto/provider_predefined.c
+++ b/crypto/provider_predefined.c
@@ -22,9 +22,9 @@ const OSSL_PROVIDER_INFO ossl_predefined_providers[] = {
{ "fips", NULL, ossl_fips_intern_provider_init, NULL, 1 },
#else
{ "default", NULL, ossl_default_provider_init, NULL, 1 },
-# ifdef STATIC_LEGACY
+#ifdef STATIC_LEGACY
{ "legacy", NULL, ossl_legacy_provider_init, NULL, 0 },
-# endif
+#endif
{ "base", NULL, ossl_base_provider_init, NULL, 0 },
{ "null", NULL, ossl_null_provider_init, NULL, 0 },
#endif
diff --git a/crypto/punycode.c b/crypto/punycode.c
index e677435032..5098437f69 100644
--- a/crypto/punycode.c
+++ b/crypto/punycode.c
@@ -42,7 +42,7 @@ static const char delimiter = '-';
*/
static int adapt(unsigned int delta, unsigned int numpoints,
- unsigned int firsttime)
+ unsigned int firsttime)
{
unsigned int k = 0;
@@ -117,7 +117,7 @@ static ossl_inline int digit_decoded(const unsigned char a)
*/
int ossl_punycode_decode(const char *pEncoded, const size_t enc_len,
- unsigned int *pDecoded, unsigned int *pout_length)
+ unsigned int *pDecoded, unsigned int *pout_length)
{
unsigned int n = initial_n;
unsigned int i = 0;
@@ -168,7 +168,8 @@ int ossl_punycode_decode(const char *pEncoded, const size_t enc_len,
return 0;
i = i + digit * w;
- t = (k <= bias) ? tmin : (k >= bias + tmax) ? tmax : k - bias;
+ t = (k <= bias) ? tmin : (k >= bias + tmax) ? tmax
+ : k - bias;
if ((unsigned int)digit < t)
break;
@@ -188,7 +189,7 @@ int ossl_punycode_decode(const char *pEncoded, const size_t enc_len,
return 0;
memmove(pDecoded + i + 1, pDecoded + i,
- (written_out - i) * sizeof(*pDecoded));
+ (written_out - i) * sizeof(*pDecoded));
pDecoded[i] = n;
i++;
written_out++;
@@ -259,7 +260,7 @@ int ossl_a2ulabel(const char *in, char *out, size_t outlen)
const char *inptr = in;
int result = 1;
unsigned int i;
- unsigned int buf[LABEL_BUF_SIZE]; /* It's a hostname */
+ unsigned int buf[LABEL_BUF_SIZE]; /* It's a hostname */
WPACKET pkt;
/* Internal API, so should not fail */
@@ -309,7 +310,7 @@ int ossl_a2ulabel(const char *in, char *out, size_t outlen)
if (!WPACKET_put_bytes_u8(&pkt, '\0'))
result = 0;
- end:
+end:
WPACKET_cleanup(&pkt);
return result;
}
diff --git a/crypto/quic_vlint.c b/crypto/quic_vlint.c
index af81739ff7..22048c95e7 100644
--- a/crypto/quic_vlint.c
+++ b/crypto/quic_vlint.c
@@ -13,7 +13,7 @@ void ossl_quic_vlint_encode_n(uint8_t *buf, uint64_t v, int n)
} else if (n == 4) {
buf[0] = (uint8_t)(0x80 | ((v >> 24) & 0x3F));
buf[1] = (uint8_t)(v >> 16);
- buf[2] = (uint8_t)(v >> 8);
+ buf[2] = (uint8_t)(v >> 8);
buf[3] = (uint8_t)v;
} else {
buf[0] = (uint8_t)(0xC0 | ((v >> 56) & 0x3F));
@@ -22,7 +22,7 @@ void ossl_quic_vlint_encode_n(uint8_t *buf, uint64_t v, int n)
buf[3] = (uint8_t)(v >> 32);
buf[4] = (uint8_t)(v >> 24);
buf[5] = (uint8_t)(v >> 16);
- buf[6] = (uint8_t)(v >> 8);
+ buf[6] = (uint8_t)(v >> 8);
buf[7] = (uint8_t)v;
}
}
@@ -42,22 +42,22 @@ uint64_t ossl_quic_vlint_decode_unchecked(const unsigned char *buf)
if (sz == 2)
return ((uint64_t)(first_byte & 0x3F) << 8)
- | buf[1];
+ | buf[1];
if (sz == 4)
return ((uint64_t)(first_byte & 0x3F) << 24)
- | ((uint64_t)buf[1] << 16)
- | ((uint64_t)buf[2] << 8)
- | buf[3];
+ | ((uint64_t)buf[1] << 16)
+ | ((uint64_t)buf[2] << 8)
+ | buf[3];
return ((uint64_t)(first_byte & 0x3F) << 56)
- | ((uint64_t)buf[1] << 48)
- | ((uint64_t)buf[2] << 40)
- | ((uint64_t)buf[3] << 32)
- | ((uint64_t)buf[4] << 24)
- | ((uint64_t)buf[5] << 16)
- | ((uint64_t)buf[6] << 8)
- | buf[7];
+ | ((uint64_t)buf[1] << 48)
+ | ((uint64_t)buf[2] << 40)
+ | ((uint64_t)buf[3] << 32)
+ | ((uint64_t)buf[4] << 24)
+ | ((uint64_t)buf[5] << 16)
+ | ((uint64_t)buf[6] << 8)
+ | buf[7];
}
int ossl_quic_vlint_decode(const unsigned char *buf, size_t buf_len, uint64_t *v)
diff --git a/crypto/rand/prov_seed.c b/crypto/rand/prov_seed.c
index 2985c7f2d8..8466ded8ab 100644
--- a/crypto/rand/prov_seed.c
+++ b/crypto/rand/prov_seed.c
@@ -16,8 +16,8 @@
#include <openssl/err.h>
size_t ossl_rand_get_entropy(ossl_unused OSSL_LIB_CTX *ctx,
- unsigned char **pout, int entropy,
- size_t min_len, size_t max_len)
+ unsigned char **pout, int entropy,
+ size_t min_len, size_t max_len)
{
size_t ret = 0;
size_t entropy_available;
@@ -33,7 +33,7 @@ size_t ossl_rand_get_entropy(ossl_unused OSSL_LIB_CTX *ctx,
entropy_available = ossl_pool_acquire_entropy(pool);
if (entropy_available > 0) {
- ret = ossl_rand_pool_length(pool);
+ ret = ossl_rand_pool_length(pool);
*pout = ossl_rand_pool_detach(pool);
}
@@ -42,26 +42,26 @@ size_t ossl_rand_get_entropy(ossl_unused OSSL_LIB_CTX *ctx,
}
size_t ossl_rand_get_user_entropy(OSSL_LIB_CTX *ctx,
- unsigned char **pout, int entropy,
- size_t min_len, size_t max_len)
+ unsigned char **pout, int entropy,
+ size_t min_len, size_t max_len)
{
EVP_RAND_CTX *rng = ossl_rand_get0_seed_noncreating(ctx);
if (rng != NULL && evp_rand_can_seed(rng))
return evp_rand_get_seed(rng, pout, entropy, min_len, max_len,
- 0, NULL, 0);
+ 0, NULL, 0);
else
return ossl_rand_get_entropy(ctx, pout, entropy, min_len, max_len);
}
void ossl_rand_cleanup_entropy(ossl_unused OSSL_LIB_CTX *ctx,
- unsigned char *buf, size_t len)
+ unsigned char *buf, size_t len)
{
OPENSSL_secure_clear_free(buf, len);
}
void ossl_rand_cleanup_user_entropy(OSSL_LIB_CTX *ctx,
- unsigned char *buf, size_t len)
+ unsigned char *buf, size_t len)
{
EVP_RAND_CTX *rng = ossl_rand_get0_seed_noncreating(ctx);
@@ -72,9 +72,9 @@ void ossl_rand_cleanup_user_entropy(OSSL_LIB_CTX *ctx,
}
size_t ossl_rand_get_nonce(ossl_unused OSSL_LIB_CTX *ctx,
- unsigned char **pout,
- size_t min_len, ossl_unused size_t max_len,
- const void *salt, size_t salt_len)
+ unsigned char **pout,
+ size_t min_len, ossl_unused size_t max_len,
+ const void *salt, size_t salt_len)
{
size_t ret = 0;
RAND_POOL *pool;
@@ -90,17 +90,17 @@ size_t ossl_rand_get_nonce(ossl_unused OSSL_LIB_CTX *ctx,
if (salt != NULL && !ossl_rand_pool_add(pool, salt, salt_len, 0))
goto err;
- ret = ossl_rand_pool_length(pool);
+ ret = ossl_rand_pool_length(pool);
*pout = ossl_rand_pool_detach(pool);
- err:
+err:
ossl_rand_pool_free(pool);
return ret;
}
size_t ossl_rand_get_user_nonce(OSSL_LIB_CTX *ctx,
- unsigned char **pout,
- size_t min_len, size_t max_len,
- const void *salt, size_t salt_len)
+ unsigned char **pout,
+ size_t min_len, size_t max_len,
+ const void *salt, size_t salt_len)
{
unsigned char *buf;
EVP_RAND_CTX *rng = ossl_rand_get0_seed_noncreating(ctx);
@@ -120,13 +120,13 @@ size_t ossl_rand_get_user_nonce(OSSL_LIB_CTX *ctx,
}
void ossl_rand_cleanup_nonce(ossl_unused OSSL_LIB_CTX *ctx,
- unsigned char *buf, size_t len)
+ unsigned char *buf, size_t len)
{
OPENSSL_clear_free(buf, len);
}
void ossl_rand_cleanup_user_nonce(ossl_unused OSSL_LIB_CTX *ctx,
- unsigned char *buf, size_t len)
+ unsigned char *buf, size_t len)
{
OPENSSL_clear_free(buf, len);
}
diff --git a/crypto/rand/rand_deprecated.c b/crypto/rand/rand_deprecated.c
index bd870013f9..d1eabc0080 100644
--- a/crypto/rand/rand_deprecated.c
+++ b/crypto/rand/rand_deprecated.c
@@ -12,10 +12,10 @@
#include <openssl/rand.h>
#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
-# include <windows.h>
-# if OPENSSL_API_COMPAT < 0x10100000L
+#include <windows.h>
+#if OPENSSL_API_COMPAT < 0x10100000L
-# define DEPRECATED_RAND_FUNCTIONS_DEFINED
+#define DEPRECATED_RAND_FUNCTIONS_DEFINED
int RAND_event(UINT iMsg, WPARAM wParam, LPARAM lParam)
{
@@ -27,7 +27,7 @@ void RAND_screen(void)
{
RAND_poll();
}
-# endif
+#endif
#endif
#ifndef DEPRECATED_RAND_FUNCTIONS_DEFINED
diff --git a/crypto/rand/rand_egd.c b/crypto/rand/rand_egd.c
index f44b38d1a9..ba8aa34dc2 100644
--- a/crypto/rand/rand_egd.c
+++ b/crypto/rand/rand_egd.c
@@ -35,22 +35,22 @@ int RAND_egd_bytes(const char *path, int bytes)
#else
-# include <unistd.h>
-# include <stddef.h>
-# include <sys/types.h>
-# include <sys/socket.h>
-# ifndef NO_SYS_UN_H
-# include <sys/un.h>
-# else
+#include <unistd.h>
+#include <stddef.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#ifndef NO_SYS_UN_H
+#include <sys/un.h>
+#else
struct sockaddr_un {
- short sun_family; /* AF_UNIX */
- char sun_path[108]; /* path name (gag) */
+ short sun_family; /* AF_UNIX */
+ char sun_path[108]; /* path name (gag) */
};
-# endif /* NO_SYS_UN_H */
-# include <string.h>
-# include <errno.h>
+#endif /* NO_SYS_UN_H */
+#include <string.h>
+#include <errno.h>
-# if defined(OPENSSL_SYS_TANDEM)
+#if defined(OPENSSL_SYS_TANDEM)
/*
* HPNS:
*
@@ -66,17 +66,16 @@ struct sockaddr_un {
* the two modes or revise the EGD code to listen on two different sockets
* (each in one of the two modes) or use the hardware randomizer.
*/
-_variable
-int hpns_socket(int family,
- int type,
- int protocol,
- char* transport)
+_variable int hpns_socket(int family,
+ int type,
+ int protocol,
+ char *transport)
{
- int socket_rc;
+ int socket_rc;
char current_transport[20];
-# define AF_UNIX_PORTABILITY "$ZAFN2"
-# define AF_UNIX_COMPATIBILITY "$ZPLS"
+#define AF_UNIX_PORTABILITY "$ZAFN2"
+#define AF_UNIX_COMPATIBILITY "$ZPLS"
if (!_arg_present(transport) || transport == NULL || transport[0] == '\0')
return socket(family, type, protocol);
@@ -103,8 +102,7 @@ int hpns_socket(int family,
static int hpns_connect_attempt = 0;
-# endif /* defined(OPENSSL_SYS_HPNS) */
-
+#endif /* defined(OPENSSL_SYS_HPNS) */
int RAND_query_egd_bytes(const char *path, unsigned char *buf, int bytes)
{
@@ -136,27 +134,27 @@ int RAND_query_egd_bytes(const char *path, unsigned char *buf, int bytes)
for (;;) {
if (connect(fd, (struct sockaddr *)&addr, i) == 0)
break;
-# ifdef EISCONN
+#ifdef EISCONN
if (errno == EISCONN)
break;
-# endif
+#endif
switch (errno) {
-# ifdef EINTR
+#ifdef EINTR
case EINTR:
-# endif
-# ifdef EAGAIN
+#endif
+#ifdef EAGAIN
case EAGAIN:
-# endif
-# ifdef EINPROGRESS
+#endif
+#ifdef EINPROGRESS
case EINPROGRESS:
-# endif
-# ifdef EALREADY
+#endif
+#ifdef EALREADY
case EALREADY:
-# endif
+#endif
/* No error, try again */
break;
default:
-# if defined(OPENSSL_SYS_TANDEM)
+#if defined(OPENSSL_SYS_TANDEM)
if (hpns_connect_attempt == 0) {
/* try the other kind of AF_UNIX socket */
close(fd);
@@ -164,9 +162,9 @@ int RAND_query_egd_bytes(const char *path, unsigned char *buf, int bytes)
if (fd == -1)
return -1;
++hpns_connect_attempt;
- break; /* try the connect again */
+ break; /* try the connect again */
}
-# endif
+#endif
ret = -1;
goto err;
@@ -195,7 +193,7 @@ int RAND_query_egd_bytes(const char *path, unsigned char *buf, int bytes)
if (mybuffer)
RAND_add(tempbuf, i, i);
- err:
+err:
if (fp != NULL)
fclose(fp);
return ret;
diff --git a/crypto/rand/rand_err.c b/crypto/rand/rand_err.c
index 6f078935c0..5bd44f2190 100644
--- a/crypto/rand/rand_err.c
+++ b/crypto/rand/rand_err.c
@@ -15,88 +15,88 @@
#ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA RAND_str_reasons[] = {
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ADDITIONAL_INPUT_TOO_LONG),
- "additional input too long"},
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ALREADY_INSTANTIATED),
- "already instantiated"},
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ARGUMENT_OUT_OF_RANGE),
- "argument out of range"},
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_CANNOT_OPEN_FILE), "Cannot open file"},
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_DRBG_ALREADY_INITIALIZED),
- "drbg already initialized"},
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_DRBG_NOT_INITIALISED),
- "drbg not initialised"},
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ENTROPY_INPUT_TOO_LONG),
- "entropy input too long"},
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ENTROPY_OUT_OF_RANGE),
- "entropy out of range"},
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ERROR_ENTROPY_POOL_WAS_IGNORED),
- "error entropy pool was ignored"},
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ERROR_INITIALISING_DRBG),
- "error initialising drbg"},
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ERROR_INSTANTIATING_DRBG),
- "error instantiating drbg"},
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ERROR_RETRIEVING_ADDITIONAL_INPUT),
- "error retrieving additional input"},
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ERROR_RETRIEVING_ENTROPY),
- "error retrieving entropy"},
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ERROR_RETRIEVING_NONCE),
- "error retrieving nonce"},
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_FAILED_TO_CREATE_LOCK),
- "failed to create lock"},
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_FUNC_NOT_IMPLEMENTED),
- "Function not implemented"},
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_FWRITE_ERROR), "Error writing file"},
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_GENERATE_ERROR), "generate error"},
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_INSUFFICIENT_DRBG_STRENGTH),
- "insufficient drbg strength"},
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_INTERNAL_ERROR), "internal error"},
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_INVALID_PROPERTY_QUERY),
- "invalid property query"},
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_IN_ERROR_STATE), "in error state"},
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_NOT_A_REGULAR_FILE),
- "Not a regular file"},
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_NOT_INSTANTIATED), "not instantiated"},
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_NO_DRBG_IMPLEMENTATION_SELECTED),
- "no drbg implementation selected"},
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_PARENT_LOCKING_NOT_ENABLED),
- "parent locking not enabled"},
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_PARENT_STRENGTH_TOO_WEAK),
- "parent strength too weak"},
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_PERSONALISATION_STRING_TOO_LONG),
- "personalisation string too long"},
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_PREDICTION_RESISTANCE_NOT_SUPPORTED),
- "prediction resistance not supported"},
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_PRNG_NOT_SEEDED), "PRNG not seeded"},
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_RANDOM_POOL_IS_EMPTY),
- "random pool is empty"},
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_RANDOM_POOL_OVERFLOW),
- "random pool overflow"},
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_RANDOM_POOL_UNDERFLOW),
- "random pool underflow"},
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_REQUEST_TOO_LARGE_FOR_DRBG),
- "request too large for drbg"},
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_RESEED_ERROR), "reseed error"},
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_SELFTEST_FAILURE), "selftest failure"},
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_TOO_LITTLE_NONCE_REQUESTED),
- "too little nonce requested"},
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_TOO_MUCH_NONCE_REQUESTED),
- "too much nonce requested"},
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_UNABLE_TO_CREATE_DRBG),
- "unable to create drbg"},
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_UNABLE_TO_FETCH_DRBG),
- "unable to fetch drbg"},
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_UNABLE_TO_GET_PARENT_RESEED_PROP_COUNTER),
- "unable to get parent reseed prop counter"},
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_UNABLE_TO_GET_PARENT_STRENGTH),
- "unable to get parent strength"},
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_UNABLE_TO_LOCK_PARENT),
- "unable to lock parent"},
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_UNSUPPORTED_DRBG_FLAGS),
- "unsupported drbg flags"},
- {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_UNSUPPORTED_DRBG_TYPE),
- "unsupported drbg type"},
- {0, NULL}
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ADDITIONAL_INPUT_TOO_LONG),
+ "additional input too long" },
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ALREADY_INSTANTIATED),
+ "already instantiated" },
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ARGUMENT_OUT_OF_RANGE),
+ "argument out of range" },
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_CANNOT_OPEN_FILE), "Cannot open file" },
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_DRBG_ALREADY_INITIALIZED),
+ "drbg already initialized" },
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_DRBG_NOT_INITIALISED),
+ "drbg not initialised" },
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ENTROPY_INPUT_TOO_LONG),
+ "entropy input too long" },
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ENTROPY_OUT_OF_RANGE),
+ "entropy out of range" },
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ERROR_ENTROPY_POOL_WAS_IGNORED),
+ "error entropy pool was ignored" },
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ERROR_INITIALISING_DRBG),
+ "error initialising drbg" },
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ERROR_INSTANTIATING_DRBG),
+ "error instantiating drbg" },
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ERROR_RETRIEVING_ADDITIONAL_INPUT),
+ "error retrieving additional input" },
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ERROR_RETRIEVING_ENTROPY),
+ "error retrieving entropy" },
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ERROR_RETRIEVING_NONCE),
+ "error retrieving nonce" },
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_FAILED_TO_CREATE_LOCK),
+ "failed to create lock" },
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_FUNC_NOT_IMPLEMENTED),
+ "Function not implemented" },
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_FWRITE_ERROR), "Error writing file" },
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_GENERATE_ERROR), "generate error" },
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_INSUFFICIENT_DRBG_STRENGTH),
+ "insufficient drbg strength" },
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_INTERNAL_ERROR), "internal error" },
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_INVALID_PROPERTY_QUERY),
+ "invalid property query" },
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_IN_ERROR_STATE), "in error state" },
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_NOT_A_REGULAR_FILE),
+ "Not a regular file" },
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_NOT_INSTANTIATED), "not instantiated" },
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_NO_DRBG_IMPLEMENTATION_SELECTED),
+ "no drbg implementation selected" },
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_PARENT_LOCKING_NOT_ENABLED),
+ "parent locking not enabled" },
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_PARENT_STRENGTH_TOO_WEAK),
+ "parent strength too weak" },
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_PERSONALISATION_STRING_TOO_LONG),
+ "personalisation string too long" },
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_PREDICTION_RESISTANCE_NOT_SUPPORTED),
+ "prediction resistance not supported" },
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_PRNG_NOT_SEEDED), "PRNG not seeded" },
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_RANDOM_POOL_IS_EMPTY),
+ "random pool is empty" },
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_RANDOM_POOL_OVERFLOW),
+ "random pool overflow" },
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_RANDOM_POOL_UNDERFLOW),
+ "random pool underflow" },
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_REQUEST_TOO_LARGE_FOR_DRBG),
+ "request too large for drbg" },
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_RESEED_ERROR), "reseed error" },
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_SELFTEST_FAILURE), "selftest failure" },
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_TOO_LITTLE_NONCE_REQUESTED),
+ "too little nonce requested" },
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_TOO_MUCH_NONCE_REQUESTED),
+ "too much nonce requested" },
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_UNABLE_TO_CREATE_DRBG),
+ "unable to create drbg" },
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_UNABLE_TO_FETCH_DRBG),
+ "unable to fetch drbg" },
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_UNABLE_TO_GET_PARENT_RESEED_PROP_COUNTER),
+ "unable to get parent reseed prop counter" },
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_UNABLE_TO_GET_PARENT_STRENGTH),
+ "unable to get parent strength" },
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_UNABLE_TO_LOCK_PARENT),
+ "unable to lock parent" },
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_UNSUPPORTED_DRBG_FLAGS),
+ "unsupported drbg flags" },
+ { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_UNSUPPORTED_DRBG_TYPE),
+ "unsupported drbg type" },
+ { 0, NULL }
};
#endif
diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c
index 000d32d908..e3c43a3177 100644
--- a/crypto/rand/rand_lib.c
+++ b/crypto/rand/rand_lib.c
@@ -26,7 +26,7 @@
#include "internal/common.h"
#ifndef OPENSSL_DEFAULT_SEED_SRC
-# define OPENSSL_DEFAULT_SEED_SRC SEED-SRC
+#define OPENSSL_DEFAULT_SEED_SRC SEED - SRC
#endif
typedef struct rand_global_st {
@@ -61,7 +61,7 @@ typedef struct rand_global_st {
#ifndef FIPS_MODULE
OSSL_PROVIDER *random_provider;
char *random_provider_name;
-#endif /* !FIPS_MODULE */
+#endif /* !FIPS_MODULE */
/* Which RNG is being used by default and it's configuration settings */
char *rng_name;
@@ -84,15 +84,15 @@ static RAND_GLOBAL *rand_get_global(OSSL_LIB_CTX *libctx)
}
#ifndef FIPS_MODULE
-# include <stdio.h>
-# include <time.h>
-# include <limits.h>
-# include <openssl/conf.h>
-# include <openssl/trace.h>
-# include "crypto/rand_pool.h"
-# include "prov/seeding.h"
-# include "internal/e_os.h"
-# include "internal/property.h"
+#include <stdio.h>
+#include <time.h>
+#include <limits.h>
+#include <openssl/conf.h>
+#include <openssl/trace.h>
+#include "crypto/rand_pool.h"
+#include "prov/seeding.h"
+#include "internal/e_os.h"
+#include "internal/property.h"
/*
* The default name for the random provider.
@@ -104,7 +104,7 @@ static const char random_provider_fips_name[] = "fips";
static int set_random_provider_name(RAND_GLOBAL *dgbl, const char *name)
{
if (dgbl->random_provider_name != NULL
- && OPENSSL_strcasecmp(dgbl->random_provider_name, name) == 0)
+ && OPENSSL_strcasecmp(dgbl->random_provider_name, name) == 0)
return 1;
OPENSSL_free(dgbl->random_provider_name);
@@ -112,21 +112,21 @@ static int set_random_provider_name(RAND_GLOBAL *dgbl, const char *name)
return dgbl->random_provider_name != NULL;
}
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
static CRYPTO_RWLOCK *rand_meth_lock;
static const RAND_METHOD *default_RAND_meth;
-# endif /* !OPENSSL_NO_DEPRECATED_3_0 */
+#endif /* !OPENSSL_NO_DEPRECATED_3_0 */
static CRYPTO_ONCE rand_init = CRYPTO_ONCE_STATIC_INIT;
static int rand_inited = 0;
DEFINE_RUN_ONCE_STATIC(do_rand_init)
{
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
rand_meth_lock = CRYPTO_THREAD_lock_new();
if (rand_meth_lock == NULL)
goto err;
-# endif /* !OPENSSL_NO_DEPRECATED_3_0 */
+#endif /* !OPENSSL_NO_DEPRECATED_3_0 */
if (!ossl_rand_pool_init())
goto err;
@@ -134,17 +134,17 @@ DEFINE_RUN_ONCE_STATIC(do_rand_init)
rand_inited = 1;
return 1;
- err:
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+err:
+#ifndef OPENSSL_NO_DEPRECATED_3_0
CRYPTO_THREAD_lock_free(rand_meth_lock);
rand_meth_lock = NULL;
-# endif /* !OPENSSL_NO_DEPRECATED_3_0 */
+#endif /* !OPENSSL_NO_DEPRECATED_3_0 */
return 0;
}
void ossl_rand_cleanup_int(void)
{
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
const RAND_METHOD *meth = default_RAND_meth;
if (!rand_inited)
@@ -153,12 +153,12 @@ void ossl_rand_cleanup_int(void)
if (meth != NULL && meth->cleanup != NULL)
meth->cleanup();
RAND_set_rand_method(NULL);
-# endif /* !OPENSSL_NO_DEPRECATED_3_0 */
+#endif /* !OPENSSL_NO_DEPRECATED_3_0 */
ossl_rand_pool_cleanup();
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
CRYPTO_THREAD_lock_free(rand_meth_lock);
rand_meth_lock = NULL;
-# endif /* !OPENSSL_NO_DEPRECATED_3_0 */
+#endif /* !OPENSSL_NO_DEPRECATED_3_0 */
ossl_release_default_drbg_ctx();
rand_inited = 0;
}
@@ -185,7 +185,7 @@ int RAND_poll(void)
{
static const char salt[] = "polling";
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
const RAND_METHOD *meth = RAND_get_rand_method();
int ret = meth == RAND_OpenSSL();
@@ -195,8 +195,8 @@ int RAND_poll(void)
if (!ret) {
/* fill random pool and seed the current legacy RNG */
RAND_POOL *pool = ossl_rand_pool_new(RAND_DRBG_STRENGTH, 1,
- (RAND_DRBG_STRENGTH + 7) / 8,
- RAND_POOL_MAX_LENGTH);
+ (RAND_DRBG_STRENGTH + 7) / 8,
+ RAND_POOL_MAX_LENGTH);
if (pool == NULL)
return 0;
@@ -206,24 +206,25 @@ int RAND_poll(void)
if (meth->add == NULL
|| meth->add(ossl_rand_pool_buffer(pool),
- (int)ossl_rand_pool_length(pool),
- (ossl_rand_pool_entropy(pool) / 8.0)) == 0)
+ (int)ossl_rand_pool_length(pool),
+ (ossl_rand_pool_entropy(pool) / 8.0))
+ == 0)
goto err;
ret = 1;
- err:
+ err:
ossl_rand_pool_free(pool);
return ret;
}
-# endif /* !OPENSSL_NO_DEPRECATED_3_0 */
+#endif /* !OPENSSL_NO_DEPRECATED_3_0 */
RAND_seed(salt, sizeof(salt));
return 1;
}
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
static int rand_set_rand_method_internal(const RAND_METHOD *meth,
- ENGINE *e)
+ ENGINE *e)
{
if (!ossl_assert(e == NULL))
return 0;
@@ -267,19 +268,19 @@ const RAND_METHOD *RAND_get_rand_method(void)
CRYPTO_THREAD_unlock(rand_meth_lock);
return tmp_meth;
}
-# endif /* OPENSSL_NO_DEPRECATED_3_0 */
+#endif /* OPENSSL_NO_DEPRECATED_3_0 */
void RAND_seed(const void *buf, int num)
{
EVP_RAND_CTX *drbg;
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
const RAND_METHOD *meth = RAND_get_rand_method();
if (meth != NULL && meth->seed != NULL) {
meth->seed(buf, num);
return;
}
-# endif
+#endif
drbg = RAND_get0_primary(NULL);
if (drbg != NULL && num > 0)
@@ -289,26 +290,26 @@ void RAND_seed(const void *buf, int num)
void RAND_add(const void *buf, int num, double randomness)
{
EVP_RAND_CTX *drbg;
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
const RAND_METHOD *meth = RAND_get_rand_method();
if (meth != NULL && meth->add != NULL) {
meth->add(buf, num, randomness);
return;
}
-# endif
+#endif
drbg = RAND_get0_primary(NULL);
if (drbg != NULL && num > 0)
-# ifdef OPENSSL_RAND_SEED_NONE
+#ifdef OPENSSL_RAND_SEED_NONE
/* Without an entropy source, we have to rely on the user */
EVP_RAND_reseed(drbg, 0, buf, num, NULL, 0);
-# else
+#else
/* With an entropy source, we downgrade this to additional input */
EVP_RAND_reseed(drbg, 0, NULL, 0, buf, num);
-# endif
+#endif
}
-# if !defined(OPENSSL_NO_DEPRECATED_1_1_0)
+#if !defined(OPENSSL_NO_DEPRECATED_1_1_0)
int RAND_pseudo_bytes(unsigned char *buf, int num)
{
const RAND_METHOD *meth = RAND_get_rand_method();
@@ -318,30 +319,30 @@ int RAND_pseudo_bytes(unsigned char *buf, int num)
ERR_raise(ERR_LIB_RAND, RAND_R_FUNC_NOT_IMPLEMENTED);
return -1;
}
-# endif
+#endif
int RAND_status(void)
{
EVP_RAND_CTX *rand;
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
const RAND_METHOD *meth = RAND_get_rand_method();
if (meth != NULL && meth != RAND_OpenSSL())
return meth->status != NULL ? meth->status() : 0;
-# endif
+#endif
if ((rand = RAND_get0_primary(NULL)) == NULL)
return 0;
return EVP_RAND_get_state(rand) == EVP_RAND_STATE_READY;
}
-# else /* !FIPS_MODULE */
+#else /* !FIPS_MODULE */
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
const RAND_METHOD *RAND_get_rand_method(void)
{
return NULL;
}
-# endif
+#endif
#endif /* !FIPS_MODULE */
/*
@@ -350,7 +351,7 @@ const RAND_METHOD *RAND_get_rand_method(void)
* sure we're instantiated and use the private DRBG.
*/
int RAND_priv_bytes_ex(OSSL_LIB_CTX *ctx, unsigned char *buf, size_t num,
- unsigned int strength)
+ unsigned int strength)
{
RAND_GLOBAL *dgbl;
EVP_RAND_CTX *rand;
@@ -375,9 +376,9 @@ int RAND_priv_bytes_ex(OSSL_LIB_CTX *ctx, unsigned char *buf, size_t num,
#ifndef FIPS_MODULE
if (dgbl->random_provider != NULL)
return ossl_provider_random_bytes(dgbl->random_provider,
- OSSL_PROV_RANDOM_PRIVATE,
- buf, num, strength);
-#endif /* !FIPS_MODULE */
+ OSSL_PROV_RANDOM_PRIVATE,
+ buf, num, strength);
+#endif /* !FIPS_MODULE */
rand = rand_get0_private(ctx, dgbl);
if (rand != NULL)
return EVP_RAND_generate(rand, buf, num, strength, 0, NULL, 0);
@@ -393,7 +394,7 @@ int RAND_priv_bytes(unsigned char *buf, int num)
}
int RAND_bytes_ex(OSSL_LIB_CTX *ctx, unsigned char *buf, size_t num,
- unsigned int strength)
+ unsigned int strength)
{
RAND_GLOBAL *dgbl;
EVP_RAND_CTX *rand;
@@ -418,9 +419,9 @@ int RAND_bytes_ex(OSSL_LIB_CTX *ctx, unsigned char *buf, size_t num,
#ifndef FIPS_MODULE
if (dgbl->random_provider != NULL)
return ossl_provider_random_bytes(dgbl->random_provider,
- OSSL_PROV_RANDOM_PUBLIC,
- buf, num, strength);
-#endif /* !FIPS_MODULE */
+ OSSL_PROV_RANDOM_PUBLIC,
+ buf, num, strength);
+#endif /* !FIPS_MODULE */
rand = rand_get0_public(ctx, dgbl);
if (rand != NULL)
@@ -466,10 +467,10 @@ void *ossl_rand_ctx_new(OSSL_LIB_CTX *libctx)
return dgbl;
- err1:
+err1:
CRYPTO_THREAD_lock_free(dgbl->lock);
#ifndef FIPS_MODULE
- err0:
+err0:
OPENSSL_free(dgbl->random_provider_name);
#endif
OPENSSL_free(dgbl);
@@ -488,7 +489,7 @@ void ossl_rand_ctx_free(void *vdgbl)
EVP_RAND_CTX_free(dgbl->seed);
#ifndef FIPS_MODULE
OPENSSL_free(dgbl->random_provider_name);
-#endif /* !FIPS_MODULE */
+#endif /* !FIPS_MODULE */
OPENSSL_free(dgbl->rng_name);
OPENSSL_free(dgbl->rng_cipher);
OPENSSL_free(dgbl->rng_digest);
@@ -524,7 +525,7 @@ static EVP_RAND_CTX *rand_new_seed(OSSL_LIB_CTX *libctx)
const char *propq;
char *name;
EVP_RAND_CTX *ctx = NULL;
-# ifdef OPENSSL_NO_FIPS_JITTER
+#ifdef OPENSSL_NO_FIPS_JITTER
RAND_GLOBAL *dgbl = rand_get_global(libctx);
if (dgbl == NULL)
@@ -532,10 +533,10 @@ static EVP_RAND_CTX *rand_new_seed(OSSL_LIB_CTX *libctx)
propq = dgbl->seed_propq;
name = dgbl->seed_name != NULL ? dgbl->seed_name
: OPENSSL_MSTR(OPENSSL_DEFAULT_SEED_SRC);
-# else /* !OPENSSL_NO_FIPS_JITTER */
+#else /* !OPENSSL_NO_FIPS_JITTER */
name = "JITTER";
propq = "";
-# endif /* OPENSSL_NO_FIPS_JITTER */
+#endif /* OPENSSL_NO_FIPS_JITTER */
rand = EVP_RAND_fetch(libctx, name, propq);
if (rand == NULL) {
@@ -553,11 +554,11 @@ static EVP_RAND_CTX *rand_new_seed(OSSL_LIB_CTX *libctx)
goto err;
}
return ctx;
- err:
+err:
EVP_RAND_CTX_free(ctx);
return NULL;
}
-#endif /* !FIPS_MODULE || !OPENSSL_NO_FIPS_JITTER */
+#endif /* !FIPS_MODULE || !OPENSSL_NO_FIPS_JITTER */
#ifndef FIPS_MODULE
EVP_RAND_CTX *ossl_rand_get0_seed_noncreating(OSSL_LIB_CTX *ctx)
@@ -574,11 +575,11 @@ EVP_RAND_CTX *ossl_rand_get0_seed_noncreating(OSSL_LIB_CTX *ctx)
CRYPTO_THREAD_unlock(dgbl->lock);
return ret;
}
-#endif /* !FIPS_MODULE */
+#endif /* !FIPS_MODULE */
static EVP_RAND_CTX *rand_new_drbg(OSSL_LIB_CTX *libctx, EVP_RAND_CTX *parent,
- unsigned int reseed_interval,
- time_t reseed_time_interval)
+ unsigned int reseed_interval,
+ time_t reseed_time_interval)
{
EVP_RAND *rand;
RAND_GLOBAL *dgbl = rand_get_global(libctx);
@@ -609,26 +610,26 @@ static EVP_RAND_CTX *rand_new_drbg(OSSL_LIB_CTX *libctx, EVP_RAND_CTX *parent,
if (OSSL_PARAM_locate_const(settables, OSSL_DRBG_PARAM_CIPHER)) {
cipher = dgbl->rng_cipher != NULL ? dgbl->rng_cipher : "AES-256-CTR";
*p++ = OSSL_PARAM_construct_utf8_string(OSSL_DRBG_PARAM_CIPHER,
- cipher, 0);
+ cipher, 0);
}
if (dgbl->rng_digest != NULL
- && OSSL_PARAM_locate_const(settables, OSSL_DRBG_PARAM_DIGEST))
+ && OSSL_PARAM_locate_const(settables, OSSL_DRBG_PARAM_DIGEST))
*p++ = OSSL_PARAM_construct_utf8_string(OSSL_DRBG_PARAM_DIGEST,
- dgbl->rng_digest, 0);
+ dgbl->rng_digest, 0);
if (prov_name != NULL)
*p++ = OSSL_PARAM_construct_utf8_string(OSSL_PROV_PARAM_CORE_PROV_NAME,
- (char *)prov_name, 0);
+ (char *)prov_name, 0);
if (dgbl->rng_propq != NULL)
*p++ = OSSL_PARAM_construct_utf8_string(OSSL_DRBG_PARAM_PROPERTIES,
- dgbl->rng_propq, 0);
+ dgbl->rng_propq, 0);
if (OSSL_PARAM_locate_const(settables, OSSL_ALG_PARAM_MAC))
*p++ = OSSL_PARAM_construct_utf8_string(OSSL_ALG_PARAM_MAC, "HMAC", 0);
if (OSSL_PARAM_locate_const(settables, OSSL_DRBG_PARAM_USE_DF))
*p++ = OSSL_PARAM_construct_int(OSSL_DRBG_PARAM_USE_DF, &use_df);
*p++ = OSSL_PARAM_construct_uint(OSSL_DRBG_PARAM_RESEED_REQUESTS,
- &reseed_interval);
+ &reseed_interval);
*p++ = OSSL_PARAM_construct_time_t(OSSL_DRBG_PARAM_RESEED_TIME_INTERVAL,
- &reseed_time_interval);
+ &reseed_time_interval);
*p = OSSL_PARAM_construct_end();
if (!EVP_RAND_instantiate(ctx, 0, 0, NULL, 0, params)) {
ERR_raise(ERR_LIB_RAND, RAND_R_ERROR_INSTANTIATING_DRBG);
@@ -663,7 +664,7 @@ static EVP_RAND_CTX *rand_new_crngt(OSSL_LIB_CTX *libctx, EVP_RAND_CTX *parent)
}
return ctx;
}
-#endif /* FIPS_MODULE */
+#endif /* FIPS_MODULE */
/*
* Get the primary random generator.
@@ -694,15 +695,15 @@ static EVP_RAND_CTX *rand_get0_primary(OSSL_LIB_CTX *ctx, RAND_GLOBAL *dgbl)
seed = newseed = rand_new_seed(ctx);
ERR_pop_to_mark();
}
-#endif /* !FIPS_MODULE || !OPENSSL_NO_FIPS_JITTER */
+#endif /* !FIPS_MODULE || !OPENSSL_NO_FIPS_JITTER */
#if defined(FIPS_MODULE)
/* The FIPS provider has entropy health tests instead of the primary */
ret = rand_new_crngt(ctx, seed);
-#else /* FIPS_MODULE */
+#else /* FIPS_MODULE */
ret = rand_new_drbg(ctx, seed, PRIMARY_RESEED_INTERVAL,
- PRIMARY_RESEED_TIME_INTERVAL);
-#endif /* FIPS_MODULE */
+ PRIMARY_RESEED_TIME_INTERVAL);
+#endif /* FIPS_MODULE */
/*
* The primary DRBG may be shared between multiple threads so we must
@@ -773,10 +774,10 @@ static EVP_RAND_CTX *rand_get0_public(OSSL_LIB_CTX *ctx, RAND_GLOBAL *dgbl)
* used this thread.
*/
if (CRYPTO_THREAD_get_local_ex(CRYPTO_THREAD_LOCAL_DRBG_PRIV_KEY, ctx) == NULL
- && !ossl_init_thread_start(NULL, ctx, rand_delete_thread_state))
+ && !ossl_init_thread_start(NULL, ctx, rand_delete_thread_state))
return NULL;
rand = rand_new_drbg(ctx, primary, SECONDARY_RESEED_INTERVAL,
- SECONDARY_RESEED_TIME_INTERVAL);
+ SECONDARY_RESEED_TIME_INTERVAL);
if (!CRYPTO_THREAD_set_local_ex(CRYPTO_THREAD_LOCAL_DRBG_PUB_KEY, ctx, rand)) {
EVP_RAND_CTX_free(rand);
rand = NULL;
@@ -816,10 +817,10 @@ static EVP_RAND_CTX *rand_get0_private(OSSL_LIB_CTX *ctx, RAND_GLOBAL *dgbl)
* used this thread.
*/
if (CRYPTO_THREAD_get_local_ex(CRYPTO_THREAD_LOCAL_DRBG_PUB_KEY, ctx) == NULL
- && !ossl_init_thread_start(NULL, ctx, rand_delete_thread_state))
+ && !ossl_init_thread_start(NULL, ctx, rand_delete_thread_state))
return NULL;
rand = rand_new_drbg(ctx, primary, SECONDARY_RESEED_INTERVAL,
- SECONDARY_RESEED_TIME_INTERVAL);
+ SECONDARY_RESEED_TIME_INTERVAL);
if (!CRYPTO_THREAD_set_local_ex(CRYPTO_THREAD_LOCAL_DRBG_PRIV_KEY, ctx, rand)) {
EVP_RAND_CTX_free(rand);
rand = NULL;
@@ -906,7 +907,7 @@ static int random_conf_init(CONF_IMODULE *md, const CONF *cnf)
int i, r = 1;
OSSL_TRACE1(CONF, "Loading random module: section %s\n",
- CONF_imodule_get_value(md));
+ CONF_imodule_get_value(md));
/* Value is a section containing RANDOM configuration */
elist = NCONF_get_section(cnf, CONF_imodule_get_value(md));
@@ -939,7 +940,7 @@ static int random_conf_init(CONF_IMODULE *md, const CONF *cnf)
if (!random_set_string(&dgbl->seed_propq, cval->value))
return 0;
} else if (OPENSSL_strcasecmp(cval->name, "random_provider") == 0) {
-# ifndef FIPS_MODULE
+#ifndef FIPS_MODULE
OSSL_PROVIDER *prov = ossl_provider_find(libctx, cval->value, 0);
if (prov != NULL) {
@@ -962,18 +963,17 @@ static int random_conf_init(CONF_IMODULE *md, const CONF *cnf)
OSSL_PROVIDER_unload(prov);
} else if (!set_random_provider_name(dgbl, cval->value))
return 0;
-# endif
+#endif
} else {
ERR_raise_data(ERR_LIB_CRYPTO,
- CRYPTO_R_UNKNOWN_NAME_IN_RANDOM_SECTION,
- "name=%s, value=%s", cval->name, cval->value);
+ CRYPTO_R_UNKNOWN_NAME_IN_RANDOM_SECTION,
+ "name=%s, value=%s", cval->name, cval->value);
r = 0;
}
}
return r;
}
-
static void random_conf_deinit(CONF_IMODULE *md)
{
OSSL_TRACE(CONF, "Cleaned up random\n");
@@ -986,7 +986,7 @@ void ossl_random_add_conf_module(void)
}
int RAND_set_DRBG_type(OSSL_LIB_CTX *ctx, const char *drbg, const char *propq,
- const char *cipher, const char *digest)
+ const char *cipher, const char *digest)
{
RAND_GLOBAL *dgbl = rand_get_global(ctx);
@@ -1003,7 +1003,7 @@ int RAND_set_DRBG_type(OSSL_LIB_CTX *ctx, const char *drbg, const char *propq,
}
int RAND_set_seed_source_type(OSSL_LIB_CTX *ctx, const char *seed,
- const char *propq)
+ const char *propq)
{
RAND_GLOBAL *dgbl = rand_get_global(ctx);
@@ -1046,7 +1046,7 @@ int RAND_set1_random_provider(OSSL_LIB_CTX *ctx, OSSL_PROVIDER *prov)
* designated randomness provider and register it if it is.
*/
int ossl_rand_check_random_provider_on_load(OSSL_LIB_CTX *ctx,
- OSSL_PROVIDER *prov)
+ OSSL_PROVIDER *prov)
{
RAND_GLOBAL *dgbl = rand_get_global(ctx);
@@ -1070,7 +1070,7 @@ int ossl_rand_check_random_provider_on_load(OSSL_LIB_CTX *ctx,
* we need to deregister it.
*/
int ossl_rand_check_random_provider_on_unload(OSSL_LIB_CTX *ctx,
- OSSL_PROVIDER *prov)
+ OSSL_PROVIDER *prov)
{
RAND_GLOBAL *dgbl = rand_get_global(ctx);
@@ -1082,4 +1082,4 @@ int ossl_rand_check_random_provider_on_unload(OSSL_LIB_CTX *ctx,
return 1;
}
-#endif /* !FIPS_MODULE */
+#endif /* !FIPS_MODULE */
diff --git a/crypto/rand/rand_local.h b/crypto/rand/rand_local.h
index 31428f20c8..c11578dd4d 100644
--- a/crypto/rand/rand_local.h
+++ b/crypto/rand/rand_local.h
@@ -8,26 +8,26 @@
*/
#ifndef OSSL_CRYPTO_RAND_LOCAL_H
-# define OSSL_CRYPTO_RAND_LOCAL_H
+#define OSSL_CRYPTO_RAND_LOCAL_H
-# include <openssl/aes.h>
-# include <openssl/evp.h>
-# include <openssl/sha.h>
-# include <openssl/hmac.h>
-# include <openssl/ec.h>
-# include <openssl/rand.h>
-# include "internal/tsan_assist.h"
-# include "crypto/rand.h"
+#include <openssl/aes.h>
+#include <openssl/evp.h>
+#include <openssl/sha.h>
+#include <openssl/hmac.h>
+#include <openssl/ec.h>
+#include <openssl/rand.h>
+#include "internal/tsan_assist.h"
+#include "crypto/rand.h"
/* Default reseed intervals */
-# define PRIMARY_RESEED_INTERVAL (1 << 8)
-# define SECONDARY_RESEED_INTERVAL (1 << 16)
-# define PRIMARY_RESEED_TIME_INTERVAL (60 * 60) /* 1 hour */
-# define SECONDARY_RESEED_TIME_INTERVAL (7 * 60) /* 7 minutes */
+#define PRIMARY_RESEED_INTERVAL (1 << 8)
+#define SECONDARY_RESEED_INTERVAL (1 << 16)
+#define PRIMARY_RESEED_TIME_INTERVAL (60 * 60) /* 1 hour */
+#define SECONDARY_RESEED_TIME_INTERVAL (7 * 60) /* 7 minutes */
-# ifndef FIPS_MODULE
+#ifndef FIPS_MODULE
/* The global RAND method, and the global buffer and DRBG instance. */
extern RAND_METHOD ossl_rand_meth;
-# endif
+#endif
#endif
diff --git a/crypto/rand/rand_meth.c b/crypto/rand/rand_meth.c
index 276763057d..7f3e1ba649 100644
--- a/crypto/rand/rand_meth.c
+++ b/crypto/rand/rand_meth.c
@@ -36,7 +36,7 @@ static int drbg_status(void)
if (drbg == NULL)
return 0;
- return EVP_RAND_get_state(drbg) == EVP_RAND_STATE_READY ? 1 : 0;
+ return EVP_RAND_get_state(drbg) == EVP_RAND_STATE_READY ? 1 : 0;
}
/* Implements the default OpenSSL RAND_bytes() method */
diff --git a/crypto/rand/rand_pool.c b/crypto/rand/rand_pool.c
index 1c4e49c1d0..b899dd3b74 100644
--- a/crypto/rand/rand_pool.c
+++ b/crypto/rand/rand_pool.c
@@ -19,7 +19,7 @@
* Allocate memory and initialize a new random pool
*/
RAND_POOL *ossl_rand_pool_new(int entropy_requested, int secure,
- size_t min_len, size_t max_len)
+ size_t min_len, size_t max_len)
{
RAND_POOL *pool = OPENSSL_zalloc(sizeof(*pool));
size_t min_alloc_size = RAND_POOL_MIN_ALLOCATION(secure);
@@ -28,8 +28,7 @@ RAND_POOL *ossl_rand_pool_new(int entropy_requested, int secure,
return NULL;
pool->min_len = min_len;
- pool->max_len = (max_len > RAND_POOL_MAX_LENGTH) ?
- RAND_POOL_MAX_LENGTH : max_len;
+ pool->max_len = (max_len > RAND_POOL_MAX_LENGTH) ? RAND_POOL_MAX_LENGTH : max_len;
pool->alloc_len = min_len < min_alloc_size ? min_alloc_size : min_len;
if (pool->alloc_len > pool->max_len)
pool->alloc_len = pool->max_len;
@@ -58,7 +57,7 @@ err:
* provided by RAND_add() and RAND_seed() into the <master> DRBG.
*/
RAND_POOL *ossl_rand_pool_attach(const unsigned char *buffer, size_t len,
- size_t entropy)
+ size_t entropy)
{
RAND_POOL *pool = OPENSSL_zalloc(sizeof(*pool));
@@ -70,7 +69,7 @@ RAND_POOL *ossl_rand_pool_attach(const unsigned char *buffer, size_t len,
* modified (in contrary to allocated buffers which are zeroed and
* freed in the end).
*/
- pool->buffer = (unsigned char *) buffer;
+ pool->buffer = (unsigned char *)buffer;
pool->len = len;
pool->attached = 1;
@@ -161,7 +160,6 @@ void ossl_rand_pool_reattach(RAND_POOL *pool, unsigned char *buffer)
#define ENTROPY_TO_BYTES(bits, entropy_factor) \
(((bits) * (entropy_factor) + 7) / 8)
-
/*
* Checks whether the |pool|'s entropy is available to the caller.
* This is the case when entropy count and buffer length are high enough.
@@ -249,15 +247,14 @@ size_t ossl_rand_pool_bytes_needed(RAND_POOL *pool, unsigned int entropy_factor)
if (bytes_needed > pool->max_len - pool->len) {
/* not enough space left */
ERR_raise_data(ERR_LIB_RAND, RAND_R_RANDOM_POOL_OVERFLOW,
- "entropy_factor=%u, entropy_needed=%zu, bytes_needed=%zu,"
- "pool->max_len=%zu, pool->len=%zu",
- entropy_factor, entropy_needed, bytes_needed,
- pool->max_len, pool->len);
+ "entropy_factor=%u, entropy_needed=%zu, bytes_needed=%zu,"
+ "pool->max_len=%zu, pool->len=%zu",
+ entropy_factor, entropy_needed, bytes_needed,
+ pool->max_len, pool->len);
return 0;
}
- if (pool->len < pool->min_len &&
- bytes_needed < pool->min_len - pool->len)
+ if (pool->len < pool->min_len && bytes_needed < pool->min_len - pool->len)
/* to meet the min_len requirement */
bytes_needed = pool->min_len - pool->len;
@@ -298,7 +295,7 @@ size_t ossl_rand_pool_bytes_remaining(RAND_POOL *pool)
* Returns 1 if the added amount is adequate, otherwise 0
*/
int ossl_rand_pool_add(RAND_POOL *pool,
- const unsigned char *buffer, size_t len, size_t entropy)
+ const unsigned char *buffer, size_t len, size_t entropy)
{
if (len > pool->max_len - pool->len) {
ERR_raise(ERR_LIB_RAND, RAND_R_ENTROPY_INPUT_TOO_LONG);
@@ -418,7 +415,7 @@ int ossl_rand_pool_add_end(RAND_POOL *pool, size_t len, size_t entropy)
*/
int ossl_rand_pool_adin_mix_in(RAND_POOL *pool, const unsigned char *adin,
- size_t adin_len)
+ size_t adin_len)
{
if (adin == NULL || adin_len == 0)
/* Nothing to mix in -> success */
diff --git a/crypto/rand/rand_uniform.c b/crypto/rand/rand_uniform.c
index f0b199b95a..877150af4e 100644
--- a/crypto/rand/rand_uniform.c
+++ b/crypto/rand/rand_uniform.c
@@ -24,9 +24,9 @@
*/
uint32_t ossl_rand_uniform_uint32(OSSL_LIB_CTX *ctx, uint32_t upper, int *err)
{
- uint32_t i, f; /* integer and fractional parts */
- uint32_t f2, rand; /* extra fractional part and random material */
- uint64_t prod; /* temporary holding double width product */
+ uint32_t i, f; /* integer and fractional parts */
+ uint32_t f2, rand; /* extra fractional part and random material */
+ uint64_t prod; /* temporary holding double width product */
const int max_followup_iterations = 10;
int j;
@@ -56,7 +56,7 @@ uint32_t ossl_rand_uniform_uint32(OSSL_LIB_CTX *ctx, uint32_t upper, int *err)
prod = (uint64_t)upper * rand;
i = prod >> 32;
f = prod & 0xffffffff;
- if (ossl_likely(f <= 1 + ~upper)) /* 1+~upper == -upper but compilers whine */
+ if (ossl_likely(f <= 1 + ~upper)) /* 1+~upper == -upper but compilers whine */
return i;
/*
@@ -99,7 +99,7 @@ uint32_t ossl_rand_uniform_uint32(OSSL_LIB_CTX *ctx, uint32_t upper, int *err)
}
uint32_t ossl_rand_range_uint32(OSSL_LIB_CTX *ctx, uint32_t lower, uint32_t upper,
- int *err)
+ int *err)
{
if (!ossl_assert(lower < upper)) {
*err = 1;
diff --git a/crypto/rand/randfile.c b/crypto/rand/randfile.c
index 197aa19b85..ab059bb5e8 100644
--- a/crypto/rand/randfile.c
+++ b/crypto/rand/randfile.c
@@ -7,13 +7,13 @@
* https://www.openssl.org/source/license.html
*/
-#if defined (__TANDEM) && defined (_SPT_MODEL_)
+#if defined(__TANDEM) && defined(_SPT_MODEL_)
/*
* These definitions have to come first in SPT due to scoping of the
* declarations in c99 associated with SPT use of stat.
*/
-# include <sys/types.h>
-# include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/stat.h>
#endif
#include "internal/e_os.h"
@@ -29,22 +29,22 @@
#include <openssl/buffer.h>
#ifdef OPENSSL_SYS_VMS
-# include <unixio.h>
+#include <unixio.h>
#endif
#include <sys/types.h>
#ifndef OPENSSL_NO_POSIX_IO
-# include <sys/stat.h>
-# include <fcntl.h>
-# if defined(_WIN32) && !defined(_WIN32_WCE)
-# include <windows.h>
-# include <io.h>
-# define stat _stat
-# define chmod _chmod
-# define open _open
-# define fdopen _fdopen
-# define fstat _fstat
-# define fileno _fileno
-# endif
+#include <sys/stat.h>
+#include <fcntl.h>
+#if defined(_WIN32) && !defined(_WIN32_WCE)
+#include <windows.h>
+#include <io.h>
+#define stat _stat
+#define chmod _chmod
+#define open _open
+#define fdopen _fdopen
+#define fstat _fstat
+#define fileno _fileno
+#endif
#endif
/*
@@ -54,9 +54,9 @@
* would look like ((m) & MASK == TYPE), but since MASK availability
* is as questionable, we settle for this poor-man fallback...
*/
-# if !defined(S_ISREG)
-# define S_ISREG(m) ((m) & S_IFREG)
-# endif
+#if !defined(S_ISREG)
+#define S_ISREG(m) ((m) & S_IFREG)
+#endif
#define RAND_BUF_SIZE 1024
#define RFILE ".rnd"
@@ -70,11 +70,10 @@
* This declaration is a nasty hack to get around vms' extension to fopen for
* passing in sharing options being disabled by /STANDARD=ANSI89
*/
-static __FILE_ptr32 (*const vms_fopen)(const char *, const char *, ...) =
- (__FILE_ptr32 (*)(const char *, const char *, ...))fopen;
-# define VMS_OPEN_ATTRS \
- "shr=get,put,upd,del","ctx=bin,stm","rfm=stm","rat=none","mrs=0"
-# define openssl_fopen(fname, mode) vms_fopen((fname), (mode), VMS_OPEN_ATTRS)
+static __FILE_ptr32 (*const vms_fopen)(const char *, const char *, ...) = (__FILE_ptr32 (*)(const char *, const char *, ...))fopen;
+#define VMS_OPEN_ATTRS \
+ "shr=get,put,upd,del", "ctx=bin,stm", "rfm=stm", "rat=none", "mrs=0"
+#define openssl_fopen(fname, mode) vms_fopen((fname), (mode), VMS_OPEN_ATTRS)
#endif
/*
@@ -105,14 +104,14 @@ int RAND_load_file(const char *file, long bytes)
if ((in = openssl_fopen(file, "rb")) == NULL) {
ERR_raise_data(ERR_LIB_RAND, RAND_R_CANNOT_OPEN_FILE,
- "Filename=%s", file);
+ "Filename=%s", file);
return -1;
}
#ifndef OPENSSL_NO_POSIX_IO
if (fstat(fileno(in), &sb) < 0) {
ERR_raise_data(ERR_LIB_RAND, RAND_R_INTERNAL_ERROR,
- "Filename=%s", file);
+ "Filename=%s", file);
fclose(in);
return -1;
}
@@ -132,8 +131,8 @@ int RAND_load_file(const char *file, long bytes)
* temporarily.
*/
#if defined(OPENSSL_SYS_VMS) && defined(__DECC)
-# pragma environment save
-# pragma message disable maylosedata2
+#pragma environment save
+#pragma message disable maylosedata2
#endif
/*
* Don't buffer, because even if |file| is regular file, we have
@@ -142,7 +141,7 @@ int RAND_load_file(const char *file, long bytes)
*/
setbuf(in, NULL);
#if defined(OPENSSL_SYS_VMS) && defined(__DECC)
-# pragma environment restore
+#pragma environment restore
#endif
for (;;) {
@@ -193,21 +192,20 @@ int RAND_write_file(const char *file)
if (stat(file, &sb) >= 0 && !S_ISREG(sb.st_mode)) {
ERR_raise_data(ERR_LIB_RAND, RAND_R_NOT_A_REGULAR_FILE,
- "Filename=%s", file);
+ "Filename=%s", file);
return -1;
}
#endif
/* Collect enough random data. */
if (RAND_priv_bytes(buf, (int)sizeof(buf)) != 1)
- return -1;
+ return -1;
-#if defined(O_CREAT) && !defined(OPENSSL_NO_POSIX_IO) && \
- !defined(OPENSSL_SYS_VMS) && !defined(OPENSSL_SYS_WINDOWS)
+#if defined(O_CREAT) && !defined(OPENSSL_NO_POSIX_IO) && !defined(OPENSSL_SYS_VMS) && !defined(OPENSSL_SYS_WINDOWS)
{
-# ifndef O_BINARY
-# define O_BINARY 0
-# endif
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
/*
* chmod(..., 0600) is too late to protect the file, permissions
* should be restrictive from the start
@@ -219,7 +217,7 @@ int RAND_write_file(const char *file)
if (out == NULL) {
close(fd);
ERR_raise_data(ERR_LIB_RAND, RAND_R_CANNOT_OPEN_FILE,
- "Filename=%s", file);
+ "Filename=%s", file);
return -1;
}
}
@@ -251,7 +249,7 @@ int RAND_write_file(const char *file)
out = openssl_fopen(file, "wb");
if (out == NULL) {
ERR_raise_data(ERR_LIB_RAND, RAND_R_CANNOT_OPEN_FILE,
- "Filename=%s", file);
+ "Filename=%s", file);
return -1;
}
@@ -282,8 +280,9 @@ const char *RAND_file_name(char *buf, size_t size)
if ((envlen = GetEnvironmentVariableW(var = L"RANDFILE", NULL, 0)) == 0) {
use_randfile = 0;
if ((envlen = GetEnvironmentVariableW(var = L"HOME", NULL, 0)) == 0
- && (envlen = GetEnvironmentVariableW(var = L"USERPROFILE",
- NULL, 0)) == 0)
+ && (envlen = GetEnvironmentVariableW(var = L"USERPROFILE",
+ NULL, 0))
+ == 0)
envlen = GetEnvironmentVariableW(var = L"SYSTEMROOT", NULL, 0);
}
@@ -293,11 +292,13 @@ const char *RAND_file_name(char *buf, size_t size)
WCHAR *val = _alloca(envlen * sizeof(WCHAR));
if (GetEnvironmentVariableW(var, val, envlen) < envlen
- && (sz = WideCharToMultiByte(CP_UTF8, 0, val, -1, NULL, 0,
- NULL, NULL)) != 0) {
+ && (sz = WideCharToMultiByte(CP_UTF8, 0, val, -1, NULL, 0,
+ NULL, NULL))
+ != 0) {
s = _alloca(sz);
if (WideCharToMultiByte(CP_UTF8, 0, val, -1, s, sz,
- NULL, NULL) == 0)
+ NULL, NULL)
+ == 0)
s = NULL;
}
}
diff --git a/crypto/rc2/rc2_cbc.c b/crypto/rc2/rc2_cbc.c
index d37093fcc7..46baa9b772 100644
--- a/crypto/rc2/rc2_cbc.c
+++ b/crypto/rc2/rc2_cbc.c
@@ -17,7 +17,7 @@
#include "rc2_local.h"
void RC2_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
- RC2_KEY *ks, unsigned char *iv, int encrypt)
+ RC2_KEY *ks, unsigned char *iv, int encrypt)
{
register unsigned long tin0, tin1;
register unsigned long tout0, tout1, xor0, xor1;
@@ -99,11 +99,11 @@ void RC2_encrypt(unsigned long *d, RC2_KEY *key)
unsigned long l;
l = d[0];
- x0 = (RC2_INT) l & 0xffff;
- x1 = (RC2_INT) (l >> 16L);
+ x0 = (RC2_INT)l & 0xffff;
+ x1 = (RC2_INT)(l >> 16L);
l = d[1];
- x2 = (RC2_INT) l & 0xffff;
- x3 = (RC2_INT) (l >> 16L);
+ x2 = (RC2_INT)l & 0xffff;
+ x3 = (RC2_INT)(l >> 16L);
n = 3;
i = 5;
@@ -131,10 +131,8 @@ void RC2_encrypt(unsigned long *d, RC2_KEY *key)
}
}
- d[0] =
- (unsigned long)(x0 & 0xffff) | ((unsigned long)(x1 & 0xffff) << 16L);
- d[1] =
- (unsigned long)(x2 & 0xffff) | ((unsigned long)(x3 & 0xffff) << 16L);
+ d[0] = (unsigned long)(x0 & 0xffff) | ((unsigned long)(x1 & 0xffff) << 16L);
+ d[1] = (unsigned long)(x2 & 0xffff) | ((unsigned long)(x3 & 0xffff) << 16L);
}
void RC2_decrypt(unsigned long *d, RC2_KEY *key)
@@ -145,11 +143,11 @@ void RC2_decrypt(unsigned long *d, RC2_KEY *key)
unsigned long l;
l = d[0];
- x0 = (RC2_INT) l & 0xffff;
- x1 = (RC2_INT) (l >> 16L);
+ x0 = (RC2_INT)l & 0xffff;
+ x1 = (RC2_INT)(l >> 16L);
l = d[1];
- x2 = (RC2_INT) l & 0xffff;
- x3 = (RC2_INT) (l >> 16L);
+ x2 = (RC2_INT)l & 0xffff;
+ x3 = (RC2_INT)(l >> 16L);
n = 3;
i = 5;
@@ -178,8 +176,6 @@ void RC2_decrypt(unsigned long *d, RC2_KEY *key)
}
}
- d[0] =
- (unsigned long)(x0 & 0xffff) | ((unsigned long)(x1 & 0xffff) << 16L);
- d[1] =
- (unsigned long)(x2 & 0xffff) | ((unsigned long)(x3 & 0xffff) << 16L);
+ d[0] = (unsigned long)(x0 & 0xffff) | ((unsigned long)(x1 & 0xffff) << 16L);
+ d[1] = (unsigned long)(x2 & 0xffff) | ((unsigned long)(x3 & 0xffff) << 16L);
}
diff --git a/crypto/rc2/rc2_ecb.c b/crypto/rc2/rc2_ecb.c
index 8861d05673..d305cc8060 100644
--- a/crypto/rc2/rc2_ecb.c
+++ b/crypto/rc2/rc2_ecb.c
@@ -26,7 +26,7 @@
*/
void RC2_ecb_encrypt(const unsigned char *in, unsigned char *out, RC2_KEY *ks,
- int encrypt)
+ int encrypt)
{
unsigned long l, d[2];
diff --git a/crypto/rc2/rc2_local.h b/crypto/rc2/rc2_local.h
index f9ca888a63..f4bd06aaa6 100644
--- a/crypto/rc2/rc2_local.h
+++ b/crypto/rc2/rc2_local.h
@@ -8,61 +8,78 @@
*/
#undef c2l
-#define c2l(c,l) (l =((unsigned long)(*((c)++))) , \
- l|=((unsigned long)(*((c)++)))<< 8L, \
- l|=((unsigned long)(*((c)++)))<<16L, \
- l|=((unsigned long)(*((c)++)))<<24L)
+#define c2l(c, l) (l = ((unsigned long)(*((c)++))), \
+ l |= ((unsigned long)(*((c)++))) << 8L, \
+ l |= ((unsigned long)(*((c)++))) << 16L, \
+ l |= ((unsigned long)(*((c)++))) << 24L)
/* NOTE - c is not incremented as per c2l */
#undef c2ln
-#define c2ln(c,l1,l2,n) { \
- c+=n; \
- l1=l2=0; \
- switch (n) { \
- case 8: l2 =((unsigned long)(*(--(c))))<<24L; \
- /* fall through */ \
- case 7: l2|=((unsigned long)(*(--(c))))<<16L; \
- /* fall through */ \
- case 6: l2|=((unsigned long)(*(--(c))))<< 8L; \
- /* fall through */ \
- case 5: l2|=((unsigned long)(*(--(c)))); \
- /* fall through */ \
- case 4: l1 =((unsigned long)(*(--(c))))<<24L; \
- /* fall through */ \
- case 3: l1|=((unsigned long)(*(--(c))))<<16L; \
- /* fall through */ \
- case 2: l1|=((unsigned long)(*(--(c))))<< 8L; \
- /* fall through */ \
- case 1: l1|=((unsigned long)(*(--(c)))); \
- } \
- }
+#define c2ln(c, l1, l2, n) \
+ { \
+ c += n; \
+ l1 = l2 = 0; \
+ switch (n) { \
+ case 8: \
+ l2 = ((unsigned long)(*(--(c)))) << 24L; \
+ /* fall through */ \
+ case 7: \
+ l2 |= ((unsigned long)(*(--(c)))) << 16L; \
+ /* fall through */ \
+ case 6: \
+ l2 |= ((unsigned long)(*(--(c)))) << 8L; \
+ /* fall through */ \
+ case 5: \
+ l2 |= ((unsigned long)(*(--(c)))); \
+ /* fall through */ \
+ case 4: \
+ l1 = ((unsigned long)(*(--(c)))) << 24L; \
+ /* fall through */ \
+ case 3: \
+ l1 |= ((unsigned long)(*(--(c)))) << 16L; \
+ /* fall through */ \
+ case 2: \
+ l1 |= ((unsigned long)(*(--(c)))) << 8L; \
+ /* fall through */ \
+ case 1: \
+ l1 |= ((unsigned long)(*(--(c)))); \
+ } \
+ }
#undef l2c
-#define l2c(l,c) (*((c)++)=(unsigned char)(((l) )&0xff), \
- *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \
- *((c)++)=(unsigned char)(((l)>>16L)&0xff), \
- *((c)++)=(unsigned char)(((l)>>24L)&0xff))
+#define l2c(l, c) (*((c)++) = (unsigned char)(((l)) & 0xff), \
+ *((c)++) = (unsigned char)(((l) >> 8L) & 0xff), \
+ *((c)++) = (unsigned char)(((l) >> 16L) & 0xff), \
+ *((c)++) = (unsigned char)(((l) >> 24L) & 0xff))
/* NOTE - c is not incremented as per l2c */
#undef l2cn
-#define l2cn(l1,l2,c,n) { \
- c+=n; \
- switch (n) { \
- case 8: *(--(c))=(unsigned char)(((l2)>>24L)&0xff); \
- /* fall through */ \
- case 7: *(--(c))=(unsigned char)(((l2)>>16L)&0xff); \
- /* fall through */ \
- case 6: *(--(c))=(unsigned char)(((l2)>> 8L)&0xff); \
- /* fall through */ \
- case 5: *(--(c))=(unsigned char)(((l2) )&0xff); \
- /* fall through */ \
- case 4: *(--(c))=(unsigned char)(((l1)>>24L)&0xff); \
- /* fall through */ \
- case 3: *(--(c))=(unsigned char)(((l1)>>16L)&0xff); \
- /* fall through */ \
- case 2: *(--(c))=(unsigned char)(((l1)>> 8L)&0xff); \
- /* fall through */ \
- case 1: *(--(c))=(unsigned char)(((l1) )&0xff); \
- } \
- }
-
+#define l2cn(l1, l2, c, n) \
+ { \
+ c += n; \
+ switch (n) { \
+ case 8: \
+ *(--(c)) = (unsigned char)(((l2) >> 24L) & 0xff); \
+ /* fall through */ \
+ case 7: \
+ *(--(c)) = (unsigned char)(((l2) >> 16L) & 0xff); \
+ /* fall through */ \
+ case 6: \
+ *(--(c)) = (unsigned char)(((l2) >> 8L) & 0xff); \
+ /* fall through */ \
+ case 5: \
+ *(--(c)) = (unsigned char)(((l2)) & 0xff); \
+ /* fall through */ \
+ case 4: \
+ *(--(c)) = (unsigned char)(((l1) >> 24L) & 0xff); \
+ /* fall through */ \
+ case 3: \
+ *(--(c)) = (unsigned char)(((l1) >> 16L) & 0xff); \
+ /* fall through */ \
+ case 2: \
+ *(--(c)) = (unsigned char)(((l1) >> 8L) & 0xff); \
+ /* fall through */ \
+ case 1: \
+ *(--(c)) = (unsigned char)(((l1)) & 0xff); \
+ } \
+ }
diff --git a/crypto/rc2/rc2_skey.c b/crypto/rc2/rc2_skey.c
index e43b84af17..e82a7627a0 100644
--- a/crypto/rc2/rc2_skey.c
+++ b/crypto/rc2/rc2_skey.c
@@ -17,32 +17,266 @@
#include "rc2_local.h"
static const unsigned char key_table[256] = {
- 0xd9, 0x78, 0xf9, 0xc4, 0x19, 0xdd, 0xb5, 0xed, 0x28, 0xe9, 0xfd, 0x79,
- 0x4a, 0xa0, 0xd8, 0x9d, 0xc6, 0x7e, 0x37, 0x83, 0x2b, 0x76, 0x53, 0x8e,
- 0x62, 0x4c, 0x64, 0x88, 0x44, 0x8b, 0xfb, 0xa2, 0x17, 0x9a, 0x59, 0xf5,
- 0x87, 0xb3, 0x4f, 0x13, 0x61, 0x45, 0x6d, 0x8d, 0x09, 0x81, 0x7d, 0x32,
- 0xbd, 0x8f, 0x40, 0xeb, 0x86, 0xb7, 0x7b, 0x0b, 0xf0, 0x95, 0x21, 0x22,
- 0x5c, 0x6b, 0x4e, 0x82, 0x54, 0xd6, 0x65, 0x93, 0xce, 0x60, 0xb2, 0x1c,
- 0x73, 0x56, 0xc0, 0x14, 0xa7, 0x8c, 0xf1, 0xdc, 0x12, 0x75, 0xca, 0x1f,
- 0x3b, 0xbe, 0xe4, 0xd1, 0x42, 0x3d, 0xd4, 0x30, 0xa3, 0x3c, 0xb6, 0x26,
- 0x6f, 0xbf, 0x0e, 0xda, 0x46, 0x69, 0x07, 0x57, 0x27, 0xf2, 0x1d, 0x9b,
- 0xbc, 0x94, 0x43, 0x03, 0xf8, 0x11, 0xc7, 0xf6, 0x90, 0xef, 0x3e, 0xe7,
- 0x06, 0xc3, 0xd5, 0x2f, 0xc8, 0x66, 0x1e, 0xd7, 0x08, 0xe8, 0xea, 0xde,
- 0x80, 0x52, 0xee, 0xf7, 0x84, 0xaa, 0x72, 0xac, 0x35, 0x4d, 0x6a, 0x2a,
- 0x96, 0x1a, 0xd2, 0x71, 0x5a, 0x15, 0x49, 0x74, 0x4b, 0x9f, 0xd0, 0x5e,
- 0x04, 0x18, 0xa4, 0xec, 0xc2, 0xe0, 0x41, 0x6e, 0x0f, 0x51, 0xcb, 0xcc,
- 0x24, 0x91, 0xaf, 0x50, 0xa1, 0xf4, 0x70, 0x39, 0x99, 0x7c, 0x3a, 0x85,
- 0x23, 0xb8, 0xb4, 0x7a, 0xfc, 0x02, 0x36, 0x5b, 0x25, 0x55, 0x97, 0x31,
- 0x2d, 0x5d, 0xfa, 0x98, 0xe3, 0x8a, 0x92, 0xae, 0x05, 0xdf, 0x29, 0x10,
- 0x67, 0x6c, 0xba, 0xc9, 0xd3, 0x00, 0xe6, 0xcf, 0xe1, 0x9e, 0xa8, 0x2c,
- 0x63, 0x16, 0x01, 0x3f, 0x58, 0xe2, 0x89, 0xa9, 0x0d, 0x38, 0x34, 0x1b,
- 0xab, 0x33, 0xff, 0xb0, 0xbb, 0x48, 0x0c, 0x5f, 0xb9, 0xb1, 0xcd, 0x2e,
- 0xc5, 0xf3, 0xdb, 0x47, 0xe5, 0xa5, 0x9c, 0x77, 0x0a, 0xa6, 0x20, 0x68,
- 0xfe, 0x7f, 0xc1, 0xad,
+ 0xd9,
+ 0x78,
+ 0xf9,
+ 0xc4,
+ 0x19,
+ 0xdd,
+ 0xb5,
+ 0xed,
+ 0x28,
+ 0xe9,
+ 0xfd,
+ 0x79,
+ 0x4a,
+ 0xa0,
+ 0xd8,
+ 0x9d,
+ 0xc6,
+ 0x7e,
+ 0x37,
+ 0x83,
+ 0x2b,
+ 0x76,
+ 0x53,
+ 0x8e,
+ 0x62,
+ 0x4c,
+ 0x64,
+ 0x88,
+ 0x44,
+ 0x8b,
+ 0xfb,
+ 0xa2,
+ 0x17,
+ 0x9a,
+ 0x59,
+ 0xf5,
+ 0x87,
+ 0xb3,
+ 0x4f,
+ 0x13,
+ 0x61,
+ 0x45,
+ 0x6d,
+ 0x8d,
+ 0x09,
+ 0x81,
+ 0x7d,
+ 0x32,
+ 0xbd,
+ 0x8f,
+ 0x40,
+ 0xeb,
+ 0x86,
+ 0xb7,
+ 0x7b,
+ 0x0b,
+ 0xf0,
+ 0x95,
+ 0x21,
+ 0x22,
+ 0x5c,
+ 0x6b,
+ 0x4e,
+ 0x82,
+ 0x54,
+ 0xd6,
+ 0x65,
+ 0x93,
+ 0xce,
+ 0x60,
+ 0xb2,
+ 0x1c,
+ 0x73,
+ 0x56,
+ 0xc0,
+ 0x14,
+ 0xa7,
+ 0x8c,
+ 0xf1,
+ 0xdc,
+ 0x12,
+ 0x75,
+ 0xca,
+ 0x1f,
+ 0x3b,
+ 0xbe,
+ 0xe4,
+ 0xd1,
+ 0x42,
+ 0x3d,
+ 0xd4,
+ 0x30,
+ 0xa3,
+ 0x3c,
+ 0xb6,
+ 0x26,
+ 0x6f,
+ 0xbf,
+ 0x0e,
+ 0xda,
+ 0x46,
+ 0x69,
+ 0x07,
+ 0x57,
+ 0x27,
+ 0xf2,
+ 0x1d,
+ 0x9b,
+ 0xbc,
+ 0x94,
+ 0x43,
+ 0x03,
+ 0xf8,
+ 0x11,
+ 0xc7,
+ 0xf6,
+ 0x90,
+ 0xef,
+ 0x3e,
+ 0xe7,
+ 0x06,
+ 0xc3,
+ 0xd5,
+ 0x2f,
+ 0xc8,
+ 0x66,
+ 0x1e,
+ 0xd7,
+ 0x08,
+ 0xe8,
+ 0xea,
+ 0xde,
+ 0x80,
+ 0x52,
+ 0xee,
+ 0xf7,
+ 0x84,
+ 0xaa,
+ 0x72,
+ 0xac,
+ 0x35,
+ 0x4d,
+ 0x6a,
+ 0x2a,
+ 0x96,
+ 0x1a,
+ 0xd2,
+ 0x71,
+ 0x5a,
+ 0x15,
+ 0x49,
+ 0x74,
+ 0x4b,
+ 0x9f,
+ 0xd0,
+ 0x5e,
+ 0x04,
+ 0x18,
+ 0xa4,
+ 0xec,
+ 0xc2,
+ 0xe0,
+ 0x41,
+ 0x6e,
+ 0x0f,
+ 0x51,
+ 0xcb,
+ 0xcc,
+ 0x24,
+ 0x91,
+ 0xaf,
+ 0x50,
+ 0xa1,
+ 0xf4,
+ 0x70,
+ 0x39,
+ 0x99,
+ 0x7c,
+ 0x3a,
+ 0x85,
+ 0x23,
+ 0xb8,
+ 0xb4,
+ 0x7a,
+ 0xfc,
+ 0x02,
+ 0x36,
+ 0x5b,
+ 0x25,
+ 0x55,
+ 0x97,
+ 0x31,
+ 0x2d,
+ 0x5d,
+ 0xfa,
+ 0x98,
+ 0xe3,
+ 0x8a,
+ 0x92,
+ 0xae,
+ 0x05,
+ 0xdf,
+ 0x29,
+ 0x10,
+ 0x67,
+ 0x6c,
+ 0xba,
+ 0xc9,
+ 0xd3,
+ 0x00,
+ 0xe6,
+ 0xcf,
+ 0xe1,
+ 0x9e,
+ 0xa8,
+ 0x2c,
+ 0x63,
+ 0x16,
+ 0x01,
+ 0x3f,
+ 0x58,
+ 0xe2,
+ 0x89,
+ 0xa9,
+ 0x0d,
+ 0x38,
+ 0x34,
+ 0x1b,
+ 0xab,
+ 0x33,
+ 0xff,
+ 0xb0,
+ 0xbb,
+ 0x48,
+ 0x0c,
+ 0x5f,
+ 0xb9,
+ 0xb1,
+ 0xcd,
+ 0x2e,
+ 0xc5,
+ 0xf3,
+ 0xdb,
+ 0x47,
+ 0xe5,
+ 0xa5,
+ 0x9c,
+ 0x77,
+ 0x0a,
+ 0xa6,
+ 0x20,
+ 0x68,
+ 0xfe,
+ 0x7f,
+ 0xc1,
+ 0xad,
};
#if defined(_MSC_VER) && defined(_ARM_)
-# pragma optimize("g",off)
+#pragma optimize("g", off)
#endif
/*
@@ -60,7 +294,7 @@ void RC2_set_key(RC2_KEY *key, int len, const unsigned char *data, int bits)
unsigned int c, d;
k = (unsigned char *)&(key->data[0]);
- *k = 0; /* for if there is a zero length key */
+ *k = 0; /* for if there is a zero length key */
if (len > 128)
len = 128;
@@ -100,5 +334,5 @@ void RC2_set_key(RC2_KEY *key, int len, const unsigned char *data, int bits)
}
#if defined(_MSC_VER)
-# pragma optimize("",on)
+#pragma optimize("", on)
#endif
diff --git a/crypto/rc2/rc2cfb64.c b/crypto/rc2/rc2cfb64.c
index 19612d9333..ccc69fa6bf 100644
--- a/crypto/rc2/rc2cfb64.c
+++ b/crypto/rc2/rc2cfb64.c
@@ -23,8 +23,8 @@
*/
void RC2_cfb64_encrypt(const unsigned char *in, unsigned char *out,
- long length, RC2_KEY *schedule, unsigned char *ivec,
- int *num, int encrypt)
+ long length, RC2_KEY *schedule, unsigned char *ivec,
+ int *num, int encrypt)
{
register unsigned long v0, v1, t;
register int n = *num;
diff --git a/crypto/rc2/rc2ofb64.c b/crypto/rc2/rc2ofb64.c
index 82c34b3aab..b659b72a10 100644
--- a/crypto/rc2/rc2ofb64.c
+++ b/crypto/rc2/rc2ofb64.c
@@ -22,8 +22,8 @@
* used is contained in *num;
*/
void RC2_ofb64_encrypt(const unsigned char *in, unsigned char *out,
- long length, RC2_KEY *schedule, unsigned char *ivec,
- int *num)
+ long length, RC2_KEY *schedule, unsigned char *ivec,
+ int *num)
{
register unsigned long v0, v1, t;
register int n = *num;
diff --git a/crypto/rc4/rc4_enc.c b/crypto/rc4/rc4_enc.c
index b2328708c2..e4f9addb91 100644
--- a/crypto/rc4/rc4_enc.c
+++ b/crypto/rc4/rc4_enc.c
@@ -25,7 +25,7 @@
*/
void RC4(RC4_KEY *key, size_t len, const unsigned char *indata,
- unsigned char *outdata)
+ unsigned char *outdata)
{
register RC4_INT *d;
register RC4_INT x, y, tx, ty;
@@ -35,13 +35,13 @@ void RC4(RC4_KEY *key, size_t len, const unsigned char *indata,
y = key->y;
d = key->data;
-#define LOOP(in,out) \
- x=((x+1)&0xff); \
- tx=d[x]; \
- y=(tx+y)&0xff; \
- d[x]=ty=d[y]; \
- d[y]=tx; \
- (out) = d[(tx+ty)&0xff]^ (in);
+#define LOOP(in, out) \
+ x = ((x + 1) & 0xff); \
+ tx = d[x]; \
+ y = (tx + y) & 0xff; \
+ d[x] = ty = d[y]; \
+ d[y] = tx; \
+ (out) = d[(tx + ty) & 0xff] ^ (in);
i = len >> 3;
if (i) {
diff --git a/crypto/rc4/rc4_local.h b/crypto/rc4/rc4_local.h
index f8cf9a89b3..0a84cb701e 100644
--- a/crypto/rc4/rc4_local.h
+++ b/crypto/rc4/rc4_local.h
@@ -8,9 +8,9 @@
*/
#ifndef OSSL_CRYPTO_RC4_LOCAL_H
-# define OSSL_CRYPTO_RC4_LOCAL_H
+#define OSSL_CRYPTO_RC4_LOCAL_H
-# include <openssl/opensslconf.h>
-# include "internal/cryptlib.h"
+#include <openssl/opensslconf.h>
+#include "internal/cryptlib.h"
#endif
diff --git a/crypto/rc4/rc4_skey.c b/crypto/rc4/rc4_skey.c
index 3797eff3e2..34421745db 100644
--- a/crypto/rc4/rc4_skey.c
+++ b/crypto/rc4/rc4_skey.c
@@ -45,12 +45,15 @@ void RC4_set_key(RC4_KEY *key, int len, const unsigned char *data)
key->y = 0;
id1 = id2 = 0;
-#define SK_LOOP(d,n) { \
- tmp=d[(n)]; \
- id2 = (data[id1] + tmp + id2) & 0xff; \
- if (++id1 == len) id1=0; \
- d[(n)]=d[id2]; \
- d[id2]=tmp; }
+#define SK_LOOP(d, n) \
+ { \
+ tmp = d[(n)]; \
+ id2 = (data[id1] + tmp + id2) & 0xff; \
+ if (++id1 == len) \
+ id1 = 0; \
+ d[(n)] = d[id2]; \
+ d[id2] = tmp; \
+ }
for (i = 0; i < 256; i++)
d[i] = i;
diff --git a/crypto/rc5/rc5_ecb.c b/crypto/rc5/rc5_ecb.c
index e533b9ea7e..cddd40221c 100644
--- a/crypto/rc5/rc5_ecb.c
+++ b/crypto/rc5/rc5_ecb.c
@@ -18,7 +18,7 @@
#include <openssl/opensslv.h>
void RC5_32_ecb_encrypt(const unsigned char *in, unsigned char *out,
- RC5_32_KEY *ks, int encrypt)
+ RC5_32_KEY *ks, int encrypt)
{
unsigned long l, d[2];
diff --git a/crypto/rc5/rc5_enc.c b/crypto/rc5/rc5_enc.c
index 2f9feee0e0..31ecd29dcc 100644
--- a/crypto/rc5/rc5_enc.c
+++ b/crypto/rc5/rc5_enc.c
@@ -18,8 +18,8 @@
#include "rc5_local.h"
void RC5_32_cbc_encrypt(const unsigned char *in, unsigned char *out,
- long length, RC5_32_KEY *ks, unsigned char *iv,
- int encrypt)
+ long length, RC5_32_KEY *ks, unsigned char *iv,
+ int encrypt)
{
register unsigned long tin0, tin1;
register unsigned long tout0, tout1, xor0, xor1;
diff --git a/crypto/rc5/rc5_local.h b/crypto/rc5/rc5_local.h
index 4ba8745ca5..57a1642c97 100644
--- a/crypto/rc5/rc5_local.h
+++ b/crypto/rc5/rc5_local.h
@@ -10,116 +10,136 @@
#include <stdlib.h>
#undef c2l
-#define c2l(c,l) (l =((unsigned long)(*((c)++))) , \
- l|=((unsigned long)(*((c)++)))<< 8L, \
- l|=((unsigned long)(*((c)++)))<<16L, \
- l|=((unsigned long)(*((c)++)))<<24L)
+#define c2l(c, l) (l = ((unsigned long)(*((c)++))), \
+ l |= ((unsigned long)(*((c)++))) << 8L, \
+ l |= ((unsigned long)(*((c)++))) << 16L, \
+ l |= ((unsigned long)(*((c)++))) << 24L)
/* NOTE - c is not incremented as per c2l */
#undef c2ln
-#define c2ln(c,l1,l2,n) { \
- c+=n; \
- l1=l2=0; \
- switch (n) { \
- case 8: l2 =((unsigned long)(*(--(c))))<<24L; \
- /* fall through */ \
- case 7: l2|=((unsigned long)(*(--(c))))<<16L; \
- /* fall through */ \
- case 6: l2|=((unsigned long)(*(--(c))))<< 8L; \
- /* fall through */ \
- case 5: l2|=((unsigned long)(*(--(c)))); \
- /* fall through */ \
- case 4: l1 =((unsigned long)(*(--(c))))<<24L; \
- /* fall through */ \
- case 3: l1|=((unsigned long)(*(--(c))))<<16L; \
- /* fall through */ \
- case 2: l1|=((unsigned long)(*(--(c))))<< 8L; \
- /* fall through */ \
- case 1: l1|=((unsigned long)(*(--(c)))); \
- } \
- }
+#define c2ln(c, l1, l2, n) \
+ { \
+ c += n; \
+ l1 = l2 = 0; \
+ switch (n) { \
+ case 8: \
+ l2 = ((unsigned long)(*(--(c)))) << 24L; \
+ /* fall through */ \
+ case 7: \
+ l2 |= ((unsigned long)(*(--(c)))) << 16L; \
+ /* fall through */ \
+ case 6: \
+ l2 |= ((unsigned long)(*(--(c)))) << 8L; \
+ /* fall through */ \
+ case 5: \
+ l2 |= ((unsigned long)(*(--(c)))); \
+ /* fall through */ \
+ case 4: \
+ l1 = ((unsigned long)(*(--(c)))) << 24L; \
+ /* fall through */ \
+ case 3: \
+ l1 |= ((unsigned long)(*(--(c)))) << 16L; \
+ /* fall through */ \
+ case 2: \
+ l1 |= ((unsigned long)(*(--(c)))) << 8L; \
+ /* fall through */ \
+ case 1: \
+ l1 |= ((unsigned long)(*(--(c)))); \
+ } \
+ }
#undef l2c
-#define l2c(l,c) (*((c)++)=(unsigned char)(((l) )&0xff), \
- *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \
- *((c)++)=(unsigned char)(((l)>>16L)&0xff), \
- *((c)++)=(unsigned char)(((l)>>24L)&0xff))
+#define l2c(l, c) (*((c)++) = (unsigned char)(((l)) & 0xff), \
+ *((c)++) = (unsigned char)(((l) >> 8L) & 0xff), \
+ *((c)++) = (unsigned char)(((l) >> 16L) & 0xff), \
+ *((c)++) = (unsigned char)(((l) >> 24L) & 0xff))
/* NOTE - c is not incremented as per l2c */
#undef l2cn
-#define l2cn(l1,l2,c,n) { \
- c+=n; \
- switch (n) { \
- case 8: *(--(c))=(unsigned char)(((l2)>>24L)&0xff); \
- /* fall through */ \
- case 7: *(--(c))=(unsigned char)(((l2)>>16L)&0xff); \
- /* fall through */ \
- case 6: *(--(c))=(unsigned char)(((l2)>> 8L)&0xff); \
- /* fall through */ \
- case 5: *(--(c))=(unsigned char)(((l2) )&0xff); \
- /* fall through */ \
- case 4: *(--(c))=(unsigned char)(((l1)>>24L)&0xff); \
- /* fall through */ \
- case 3: *(--(c))=(unsigned char)(((l1)>>16L)&0xff); \
- /* fall through */ \
- case 2: *(--(c))=(unsigned char)(((l1)>> 8L)&0xff); \
- /* fall through */ \
- case 1: *(--(c))=(unsigned char)(((l1) )&0xff); \
- } \
- }
+#define l2cn(l1, l2, c, n) \
+ { \
+ c += n; \
+ switch (n) { \
+ case 8: \
+ *(--(c)) = (unsigned char)(((l2) >> 24L) & 0xff); \
+ /* fall through */ \
+ case 7: \
+ *(--(c)) = (unsigned char)(((l2) >> 16L) & 0xff); \
+ /* fall through */ \
+ case 6: \
+ *(--(c)) = (unsigned char)(((l2) >> 8L) & 0xff); \
+ /* fall through */ \
+ case 5: \
+ *(--(c)) = (unsigned char)(((l2)) & 0xff); \
+ /* fall through */ \
+ case 4: \
+ *(--(c)) = (unsigned char)(((l1) >> 24L) & 0xff); \
+ /* fall through */ \
+ case 3: \
+ *(--(c)) = (unsigned char)(((l1) >> 16L) & 0xff); \
+ /* fall through */ \
+ case 2: \
+ *(--(c)) = (unsigned char)(((l1) >> 8L) & 0xff); \
+ /* fall through */ \
+ case 1: \
+ *(--(c)) = (unsigned char)(((l1)) & 0xff); \
+ } \
+ }
#if (defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER))
-# define ROTATE_l32(a,n) _lrotl(a,n)
-# define ROTATE_r32(a,n) _lrotr(a,n)
+#define ROTATE_l32(a, n) _lrotl(a, n)
+#define ROTATE_r32(a, n) _lrotr(a, n)
#elif defined(__ICC)
-# define ROTATE_l32(a,n) _rotl(a,n)
-# define ROTATE_r32(a,n) _rotr(a,n)
-#elif defined(__GNUC__) && __GNUC__>=2 && !defined(__STRICT_ANSI__) && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) && !defined(PEDANTIC)
-# if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__)
-# define ROTATE_l32(a,n) ({ register unsigned int ret; \
- asm ("roll %%cl,%0" \
- : "=r"(ret) \
- : "c"(n),"0"((unsigned int)(a)) \
- : "cc"); \
- ret; \
- })
-# define ROTATE_r32(a,n) ({ register unsigned int ret; \
- asm ("rorl %%cl,%0" \
- : "=r"(ret) \
- : "c"(n),"0"((unsigned int)(a)) \
- : "cc"); \
- ret; \
- })
-# endif
+#define ROTATE_l32(a, n) _rotl(a, n)
+#define ROTATE_r32(a, n) _rotr(a, n)
+#elif defined(__GNUC__) && __GNUC__ >= 2 && !defined(__STRICT_ANSI__) && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) && !defined(PEDANTIC)
+#if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__)
+#define ROTATE_l32(a, n) ({ \
+ register unsigned int ret; \
+ asm("roll %%cl,%0" \
+ : "=r"(ret) \
+ : "c"(n), "0"((unsigned int)(a)) \
+ : "cc"); \
+ ret; \
+})
+#define ROTATE_r32(a, n) ({ \
+ register unsigned int ret; \
+ asm("rorl %%cl,%0" \
+ : "=r"(ret) \
+ : "c"(n), "0"((unsigned int)(a)) \
+ : "cc"); \
+ ret; \
+})
+#endif
#endif
#ifndef ROTATE_l32
-# define ROTATE_l32(a,n) (((a)<<(n&0x1f))|(((a)&0xffffffff)>>((32-n)&0x1f)))
+#define ROTATE_l32(a, n) (((a) << (n & 0x1f)) | (((a) & 0xffffffff) >> ((32 - n) & 0x1f)))
#endif
#ifndef ROTATE_r32
-# define ROTATE_r32(a,n) (((a)<<((32-n)&0x1f))|(((a)&0xffffffff)>>(n&0x1f)))
+#define ROTATE_r32(a, n) (((a) << ((32 - n) & 0x1f)) | (((a) & 0xffffffff) >> (n & 0x1f)))
#endif
-#define RC5_32_MASK 0xffffffffL
+#define RC5_32_MASK 0xffffffffL
-#define RC5_32_P 0xB7E15163L
-#define RC5_32_Q 0x9E3779B9L
+#define RC5_32_P 0xB7E15163L
+#define RC5_32_Q 0x9E3779B9L
-#define E_RC5_32(a,b,s,n) \
- a^=b; \
- a=ROTATE_l32(a,b); \
- a+=s[n]; \
- a&=RC5_32_MASK; \
- b^=a; \
- b=ROTATE_l32(b,a); \
- b+=s[n+1]; \
- b&=RC5_32_MASK;
+#define E_RC5_32(a, b, s, n) \
+ a ^= b; \
+ a = ROTATE_l32(a, b); \
+ a += s[n]; \
+ a &= RC5_32_MASK; \
+ b ^= a; \
+ b = ROTATE_l32(b, a); \
+ b += s[n + 1]; \
+ b &= RC5_32_MASK;
-#define D_RC5_32(a,b,s,n) \
- b-=s[n+1]; \
- b&=RC5_32_MASK; \
- b=ROTATE_r32(b,a); \
- b^=a; \
- a-=s[n]; \
- a&=RC5_32_MASK; \
- a=ROTATE_r32(a,b); \
- a^=b;
+#define D_RC5_32(a, b, s, n) \
+ b -= s[n + 1]; \
+ b &= RC5_32_MASK; \
+ b = ROTATE_r32(b, a); \
+ b ^= a; \
+ a -= s[n]; \
+ a &= RC5_32_MASK; \
+ a = ROTATE_r32(a, b); \
+ a ^= b;
diff --git a/crypto/rc5/rc5_skey.c b/crypto/rc5/rc5_skey.c
index a08b940bad..cafb50f22a 100644
--- a/crypto/rc5/rc5_skey.c
+++ b/crypto/rc5/rc5_skey.c
@@ -17,7 +17,7 @@
#include "rc5_local.h"
int RC5_32_set_key(RC5_32_KEY *key, int len, const unsigned char *data,
- int rounds)
+ int rounds)
{
RC5_32_INT L[64], l, ll, A, B, *S, k;
int i, j, m, c, t, ii, jj;
@@ -25,8 +25,7 @@ int RC5_32_set_key(RC5_32_KEY *key, int len, const unsigned char *data,
if (len > 255)
return 0;
- if ((rounds != RC5_16_ROUNDS) &&
- (rounds != RC5_12_ROUNDS) && (rounds != RC5_8_ROUNDS))
+ if ((rounds != RC5_16_ROUNDS) && (rounds != RC5_12_ROUNDS) && (rounds != RC5_8_ROUNDS))
rounds = RC5_16_ROUNDS;
key->rounds = rounds;
diff --git a/crypto/rc5/rc5cfb64.c b/crypto/rc5/rc5cfb64.c
index 9088eb7edd..f2f4b9bdfb 100644
--- a/crypto/rc5/rc5cfb64.c
+++ b/crypto/rc5/rc5cfb64.c
@@ -23,8 +23,8 @@
*/
void RC5_32_cfb64_encrypt(const unsigned char *in, unsigned char *out,
- long length, RC5_32_KEY *schedule,
- unsigned char *ivec, int *num, int encrypt)
+ long length, RC5_32_KEY *schedule,
+ unsigned char *ivec, int *num, int encrypt)
{
register unsigned long v0, v1, t;
register int n = *num;
diff --git a/crypto/rc5/rc5ofb64.c b/crypto/rc5/rc5ofb64.c
index b1128b1f48..30487521f2 100644
--- a/crypto/rc5/rc5ofb64.c
+++ b/crypto/rc5/rc5ofb64.c
@@ -22,8 +22,8 @@
* used is contained in *num;
*/
void RC5_32_ofb64_encrypt(const unsigned char *in, unsigned char *out,
- long length, RC5_32_KEY *schedule,
- unsigned char *ivec, int *num)
+ long length, RC5_32_KEY *schedule,
+ unsigned char *ivec, int *num)
{
register unsigned long v0, v1, t;
register int n = *num;
diff --git a/crypto/rcu_internal.h b/crypto/rcu_internal.h
index fb718580ef..3408923eba 100644
--- a/crypto/rcu_internal.h
+++ b/crypto/rcu_internal.h
@@ -8,8 +8,8 @@
*/
#ifndef OPENSSL_RCU_INTERNAL_H
-# define OPENSSL_RCU_INTERNAL_H
-# pragma once
+#define OPENSSL_RCU_INTERNAL_H
+#pragma once
struct rcu_qp;
diff --git a/crypto/ripemd/rmd_dgst.c b/crypto/ripemd/rmd_dgst.c
index 77b9d32d2b..708408cd86 100644
--- a/crypto/ripemd/rmd_dgst.c
+++ b/crypto/ripemd/rmd_dgst.c
@@ -19,7 +19,7 @@
#ifdef RMD160_ASM
void ripemd160_block_x86(RIPEMD160_CTX *c, unsigned long *p, size_t num);
-# define ripemd160_block ripemd160_block_x86
+#define ripemd160_block ripemd160_block_x86
#else
void ripemd160_block(RIPEMD160_CTX *c, unsigned long *p, size_t num);
#endif
@@ -36,23 +36,23 @@ int RIPEMD160_Init(RIPEMD160_CTX *c)
}
#ifndef ripemd160_block_data_order
-# ifdef X
-# undef X
-# endif
+#ifdef X
+#undef X
+#endif
void ripemd160_block_data_order(RIPEMD160_CTX *ctx, const void *p, size_t num)
{
const unsigned char *data = p;
register unsigned MD32_REG_T A, B, C, D, E;
unsigned MD32_REG_T a, b, c, d, e, l;
-# ifndef MD32_XARRAY
+#ifndef MD32_XARRAY
/* See comment in crypto/sha/sha_local.h for details. */
unsigned MD32_REG_T XX0, XX1, XX2, XX3, XX4, XX5, XX6, XX7,
XX8, XX9, XX10, XX11, XX12, XX13, XX14, XX15;
-# define X(i) XX##i
-# else
+#define X(i) XX##i
+#else
RIPEMD160_LONG XX[16];
-# define X(i) XX[i]
-# endif
+#define X(i) XX[i]
+#endif
for (; num--;) {
@@ -282,7 +282,6 @@ void ripemd160_block_data_order(RIPEMD160_CTX *ctx, const void *p, size_t num)
ctx->D = ctx->E + a + B;
ctx->E = ctx->A + b + C;
ctx->A = D;
-
}
}
#endif
diff --git a/crypto/ripemd/rmd_local.h b/crypto/ripemd/rmd_local.h
index 325cb98cc3..f2934a7332 100644
--- a/crypto/ripemd/rmd_local.h
+++ b/crypto/ripemd/rmd_local.h
@@ -17,71 +17,87 @@
* FOR EXPLANATIONS ON FOLLOWING "CODE."
*/
#ifdef RMD160_ASM
-# if defined(__i386) || defined(__i386__) || defined(_M_IX86)
-# define ripemd160_block_data_order ripemd160_block_asm_data_order
-# endif
+#if defined(__i386) || defined(__i386__) || defined(_M_IX86)
+#define ripemd160_block_data_order ripemd160_block_asm_data_order
+#endif
#endif
void ripemd160_block_data_order(RIPEMD160_CTX *c, const void *p, size_t num);
#define DATA_ORDER_IS_LITTLE_ENDIAN
-#define HASH_LONG RIPEMD160_LONG
-#define HASH_CTX RIPEMD160_CTX
-#define HASH_CBLOCK RIPEMD160_CBLOCK
-#define HASH_UPDATE RIPEMD160_Update
-#define HASH_TRANSFORM RIPEMD160_Transform
-#define HASH_FINAL RIPEMD160_Final
-#define HASH_MAKE_STRING(c,s) do { \
- unsigned long ll; \
- ll=(c)->A; (void)HOST_l2c(ll,(s)); \
- ll=(c)->B; (void)HOST_l2c(ll,(s)); \
- ll=(c)->C; (void)HOST_l2c(ll,(s)); \
- ll=(c)->D; (void)HOST_l2c(ll,(s)); \
- ll=(c)->E; (void)HOST_l2c(ll,(s)); \
- } while (0)
-#define HASH_BLOCK_DATA_ORDER ripemd160_block_data_order
+#define HASH_LONG RIPEMD160_LONG
+#define HASH_CTX RIPEMD160_CTX
+#define HASH_CBLOCK RIPEMD160_CBLOCK
+#define HASH_UPDATE RIPEMD160_Update
+#define HASH_TRANSFORM RIPEMD160_Transform
+#define HASH_FINAL RIPEMD160_Final
+#define HASH_MAKE_STRING(c, s) \
+ do { \
+ unsigned long ll; \
+ ll = (c)->A; \
+ (void)HOST_l2c(ll, (s)); \
+ ll = (c)->B; \
+ (void)HOST_l2c(ll, (s)); \
+ ll = (c)->C; \
+ (void)HOST_l2c(ll, (s)); \
+ ll = (c)->D; \
+ (void)HOST_l2c(ll, (s)); \
+ ll = (c)->E; \
+ (void)HOST_l2c(ll, (s)); \
+ } while (0)
+#define HASH_BLOCK_DATA_ORDER ripemd160_block_data_order
#include "crypto/md32_common.h"
/*
* Transformed F2 and F4 are courtesy of Wei Dai
*/
-#define F1(x,y,z) ((x) ^ (y) ^ (z))
-#define F2(x,y,z) ((((y) ^ (z)) & (x)) ^ (z))
-#define F3(x,y,z) (((~(y)) | (x)) ^ (z))
-#define F4(x,y,z) ((((x) ^ (y)) & (z)) ^ (y))
-#define F5(x,y,z) (((~(z)) | (y)) ^ (x))
+#define F1(x, y, z) ((x) ^ (y) ^ (z))
+#define F2(x, y, z) ((((y) ^ (z)) & (x)) ^ (z))
+#define F3(x, y, z) (((~(y)) | (x)) ^ (z))
+#define F4(x, y, z) ((((x) ^ (y)) & (z)) ^ (y))
+#define F5(x, y, z) (((~(z)) | (y)) ^ (x))
-#define RIPEMD160_A 0x67452301L
-#define RIPEMD160_B 0xEFCDAB89L
-#define RIPEMD160_C 0x98BADCFEL
-#define RIPEMD160_D 0x10325476L
-#define RIPEMD160_E 0xC3D2E1F0L
+#define RIPEMD160_A 0x67452301L
+#define RIPEMD160_B 0xEFCDAB89L
+#define RIPEMD160_C 0x98BADCFEL
+#define RIPEMD160_D 0x10325476L
+#define RIPEMD160_E 0xC3D2E1F0L
#include "rmdconst.h"
-#define RIP1(a,b,c,d,e,w,s) { \
- a+=F1(b,c,d)+X(w); \
- a=ROTATE(a,s)+e; \
- c=ROTATE(c,10); }
+#define RIP1(a, b, c, d, e, w, s) \
+ { \
+ a += F1(b, c, d) + X(w); \
+ a = ROTATE(a, s) + e; \
+ c = ROTATE(c, 10); \
+ }
-#define RIP2(a,b,c,d,e,w,s,K) { \
- a+=F2(b,c,d)+X(w)+K; \
- a=ROTATE(a,s)+e; \
- c=ROTATE(c,10); }
+#define RIP2(a, b, c, d, e, w, s, K) \
+ { \
+ a += F2(b, c, d) + X(w) + K; \
+ a = ROTATE(a, s) + e; \
+ c = ROTATE(c, 10); \
+ }
-#define RIP3(a,b,c,d,e,w,s,K) { \
- a+=F3(b,c,d)+X(w)+K; \
- a=ROTATE(a,s)+e; \
- c=ROTATE(c,10); }
+#define RIP3(a, b, c, d, e, w, s, K) \
+ { \
+ a += F3(b, c, d) + X(w) + K; \
+ a = ROTATE(a, s) + e; \
+ c = ROTATE(c, 10); \
+ }
-#define RIP4(a,b,c,d,e,w,s,K) { \
- a+=F4(b,c,d)+X(w)+K; \
- a=ROTATE(a,s)+e; \
- c=ROTATE(c,10); }
+#define RIP4(a, b, c, d, e, w, s, K) \
+ { \
+ a += F4(b, c, d) + X(w) + K; \
+ a = ROTATE(a, s) + e; \
+ c = ROTATE(c, 10); \
+ }
-#define RIP5(a,b,c,d,e,w,s,K) { \
- a+=F5(b,c,d)+X(w)+K; \
- a=ROTATE(a,s)+e; \
- c=ROTATE(c,10); }
+#define RIP5(a, b, c, d, e, w, s, K) \
+ { \
+ a += F5(b, c, d) + X(w) + K; \
+ a = ROTATE(a, s) + e; \
+ c = ROTATE(c, 10); \
+ }
diff --git a/crypto/ripemd/rmdconst.h b/crypto/ripemd/rmdconst.h
index 0e19410ade..f9daf1b09f 100644
--- a/crypto/ripemd/rmdconst.h
+++ b/crypto/ripemd/rmdconst.h
@@ -19,332 +19,332 @@
#define KR3 0x7A6D76E9L
#define KR4 0x00000000L
-#define WL00 0
+#define WL00 0
#define SL00 11
-#define WL01 1
+#define WL01 1
#define SL01 14
-#define WL02 2
+#define WL02 2
#define SL02 15
-#define WL03 3
+#define WL03 3
#define SL03 12
-#define WL04 4
-#define SL04 5
-#define WL05 5
-#define SL05 8
-#define WL06 6
-#define SL06 7
-#define WL07 7
-#define SL07 9
-#define WL08 8
+#define WL04 4
+#define SL04 5
+#define WL05 5
+#define SL05 8
+#define WL06 6
+#define SL06 7
+#define WL07 7
+#define SL07 9
+#define WL08 8
#define SL08 11
-#define WL09 9
+#define WL09 9
#define SL09 13
#define WL10 10
#define SL10 14
#define WL11 11
#define SL11 15
#define WL12 12
-#define SL12 6
+#define SL12 6
#define WL13 13
-#define SL13 7
+#define SL13 7
#define WL14 14
-#define SL14 9
+#define SL14 9
#define WL15 15
-#define SL15 8
+#define SL15 8
-#define WL16 7
-#define SL16 7
-#define WL17 4
-#define SL17 6
+#define WL16 7
+#define SL16 7
+#define WL17 4
+#define SL17 6
#define WL18 13
-#define SL18 8
-#define WL19 1
+#define SL18 8
+#define WL19 1
#define SL19 13
#define WL20 10
#define SL20 11
-#define WL21 6
-#define SL21 9
+#define WL21 6
+#define SL21 9
#define WL22 15
-#define SL22 7
-#define WL23 3
+#define SL22 7
+#define WL23 3
#define SL23 15
#define WL24 12
-#define SL24 7
-#define WL25 0
+#define SL24 7
+#define WL25 0
#define SL25 12
-#define WL26 9
+#define WL26 9
#define SL26 15
-#define WL27 5
-#define SL27 9
-#define WL28 2
+#define WL27 5
+#define SL27 9
+#define WL28 2
#define SL28 11
#define WL29 14
-#define SL29 7
+#define SL29 7
#define WL30 11
#define SL30 13
-#define WL31 8
+#define WL31 8
#define SL31 12
-#define WL32 3
+#define WL32 3
#define SL32 11
#define WL33 10
#define SL33 13
#define WL34 14
-#define SL34 6
-#define WL35 4
-#define SL35 7
-#define WL36 9
+#define SL34 6
+#define WL35 4
+#define SL35 7
+#define WL36 9
#define SL36 14
#define WL37 15
-#define SL37 9
-#define WL38 8
+#define SL37 9
+#define WL38 8
#define SL38 13
-#define WL39 1
+#define WL39 1
#define SL39 15
-#define WL40 2
+#define WL40 2
#define SL40 14
-#define WL41 7
-#define SL41 8
-#define WL42 0
+#define WL41 7
+#define SL41 8
+#define WL42 0
#define SL42 13
-#define WL43 6
-#define SL43 6
+#define WL43 6
+#define SL43 6
#define WL44 13
-#define SL44 5
+#define SL44 5
#define WL45 11
#define SL45 12
-#define WL46 5
-#define SL46 7
+#define WL46 5
+#define SL46 7
#define WL47 12
-#define SL47 5
+#define SL47 5
-#define WL48 1
+#define WL48 1
#define SL48 11
-#define WL49 9
+#define WL49 9
#define SL49 12
#define WL50 11
#define SL50 14
#define WL51 10
#define SL51 15
-#define WL52 0
+#define WL52 0
#define SL52 14
-#define WL53 8
+#define WL53 8
#define SL53 15
#define WL54 12
-#define SL54 9
-#define WL55 4
-#define SL55 8
+#define SL54 9
+#define WL55 4
+#define SL55 8
#define WL56 13
-#define SL56 9
-#define WL57 3
+#define SL56 9
+#define WL57 3
#define SL57 14
-#define WL58 7
-#define SL58 5
+#define WL58 7
+#define SL58 5
#define WL59 15
-#define SL59 6
+#define SL59 6
#define WL60 14
-#define SL60 8
-#define WL61 5
-#define SL61 6
-#define WL62 6
-#define SL62 5
-#define WL63 2
+#define SL60 8
+#define WL61 5
+#define SL61 6
+#define WL62 6
+#define SL62 5
+#define WL63 2
#define SL63 12
-#define WL64 4
-#define SL64 9
-#define WL65 0
+#define WL64 4
+#define SL64 9
+#define WL65 0
#define SL65 15
-#define WL66 5
-#define SL66 5
-#define WL67 9
+#define WL66 5
+#define SL66 5
+#define WL67 9
#define SL67 11
-#define WL68 7
-#define SL68 6
+#define WL68 7
+#define SL68 6
#define WL69 12
-#define SL69 8
-#define WL70 2
+#define SL69 8
+#define WL70 2
#define SL70 13
#define WL71 10
#define SL71 12
#define WL72 14
-#define SL72 5
-#define WL73 1
+#define SL72 5
+#define WL73 1
#define SL73 12
-#define WL74 3
+#define WL74 3
#define SL74 13
-#define WL75 8
+#define WL75 8
#define SL75 14
#define WL76 11
#define SL76 11
-#define WL77 6
-#define SL77 8
+#define WL77 6
+#define SL77 8
#define WL78 15
-#define SL78 5
+#define SL78 5
#define WL79 13
-#define SL79 6
+#define SL79 6
-#define WR00 5
-#define SR00 8
+#define WR00 5
+#define SR00 8
#define WR01 14
-#define SR01 9
-#define WR02 7
-#define SR02 9
-#define WR03 0
+#define SR01 9
+#define WR02 7
+#define SR02 9
+#define WR03 0
#define SR03 11
-#define WR04 9
+#define WR04 9
#define SR04 13
-#define WR05 2
+#define WR05 2
#define SR05 15
#define WR06 11
#define SR06 15
-#define WR07 4
-#define SR07 5
+#define WR07 4
+#define SR07 5
#define WR08 13
-#define SR08 7
-#define WR09 6
-#define SR09 7
+#define SR08 7
+#define WR09 6
+#define SR09 7
#define WR10 15
-#define SR10 8
-#define WR11 8
+#define SR10 8
+#define WR11 8
#define SR11 11
-#define WR12 1
+#define WR12 1
#define SR12 14
#define WR13 10
#define SR13 14
-#define WR14 3
+#define WR14 3
#define SR14 12
#define WR15 12
-#define SR15 6
+#define SR15 6
-#define WR16 6
-#define SR16 9
+#define WR16 6
+#define SR16 9
#define WR17 11
#define SR17 13
-#define WR18 3
+#define WR18 3
#define SR18 15
-#define WR19 7
-#define SR19 7
-#define WR20 0
+#define WR19 7
+#define SR19 7
+#define WR20 0
#define SR20 12
#define WR21 13
-#define SR21 8
-#define WR22 5
-#define SR22 9
+#define SR21 8
+#define WR22 5
+#define SR22 9
#define WR23 10
#define SR23 11
#define WR24 14
-#define SR24 7
+#define SR24 7
#define WR25 15
-#define SR25 7
-#define WR26 8
+#define SR25 7
+#define WR26 8
#define SR26 12
#define WR27 12
-#define SR27 7
-#define WR28 4
-#define SR28 6
-#define WR29 9
+#define SR27 7
+#define WR28 4
+#define SR28 6
+#define WR29 9
#define SR29 15
-#define WR30 1
+#define WR30 1
#define SR30 13
-#define WR31 2
+#define WR31 2
#define SR31 11
#define WR32 15
-#define SR32 9
-#define WR33 5
-#define SR33 7
-#define WR34 1
+#define SR32 9
+#define WR33 5
+#define SR33 7
+#define WR34 1
#define SR34 15
-#define WR35 3
+#define WR35 3
#define SR35 11
-#define WR36 7
-#define SR36 8
+#define WR36 7
+#define SR36 8
#define WR37 14
-#define SR37 6
-#define WR38 6
-#define SR38 6
-#define WR39 9
+#define SR37 6
+#define WR38 6
+#define SR38 6
+#define WR39 9
#define SR39 14
#define WR40 11
#define SR40 12
-#define WR41 8
+#define WR41 8
#define SR41 13
#define WR42 12
-#define SR42 5
-#define WR43 2
+#define SR42 5
+#define WR43 2
#define SR43 14
#define WR44 10
#define SR44 13
-#define WR45 0
+#define WR45 0
#define SR45 13
-#define WR46 4
-#define SR46 7
+#define WR46 4
+#define SR46 7
#define WR47 13
-#define SR47 5
+#define SR47 5
-#define WR48 8
+#define WR48 8
#define SR48 15
-#define WR49 6
-#define SR49 5
-#define WR50 4
-#define SR50 8
-#define WR51 1
+#define WR49 6
+#define SR49 5
+#define WR50 4
+#define SR50 8
+#define WR51 1
#define SR51 11
-#define WR52 3
+#define WR52 3
#define SR52 14
#define WR53 11
#define SR53 14
#define WR54 15
-#define SR54 6
-#define WR55 0
+#define SR54 6
+#define WR55 0
#define SR55 14
-#define WR56 5
-#define SR56 6
+#define WR56 5
+#define SR56 6
#define WR57 12
-#define SR57 9
-#define WR58 2
+#define SR57 9
+#define WR58 2
#define SR58 12
#define WR59 13
-#define SR59 9
-#define WR60 9
+#define SR59 9
+#define WR60 9
#define SR60 12
-#define WR61 7
-#define SR61 5
+#define WR61 7
+#define SR61 5
#define WR62 10
#define SR62 15
#define WR63 14
-#define SR63 8
+#define SR63 8
#define WR64 12
-#define SR64 8
+#define SR64 8
#define WR65 15
-#define SR65 5
+#define SR65 5
#define WR66 10
#define SR66 12
-#define WR67 4
-#define SR67 9
-#define WR68 1
+#define WR67 4
+#define SR67 9
+#define WR68 1
#define SR68 12
-#define WR69 5
-#define SR69 5
-#define WR70 8
+#define WR69 5
+#define SR69 5
+#define WR70 8
#define SR70 14
-#define WR71 7
-#define SR71 6
-#define WR72 6
-#define SR72 8
-#define WR73 2
+#define WR71 7
+#define SR71 6
+#define WR72 6
+#define SR72 8
+#define WR73 2
#define SR73 13
#define WR74 13
-#define SR74 6
+#define SR74 6
#define WR75 14
-#define SR75 5
-#define WR76 0
+#define SR75 5
+#define WR76 0
#define SR76 15
-#define WR77 3
+#define WR77 3
#define SR77 13
-#define WR78 9
+#define WR78 9
#define SR78 11
#define WR79 11
#define SR79 11
diff --git a/crypto/riscvcap.c b/crypto/riscvcap.c
index 0c44b93eed..54f01f5d39 100644
--- a/crypto/riscvcap.c
+++ b/crypto/riscvcap.c
@@ -18,10 +18,10 @@
#include "crypto/riscv_arch.h"
#ifdef OSSL_RISCV_HWPROBE
-# include <unistd.h>
-# include <sys/syscall.h>
-# include <asm/hwprobe.h>
-# include <sys/auxv.h>
+#include <unistd.h>
+#include <sys/syscall.h>
+#include <asm/hwprobe.h>
+#include <sys/auxv.h>
#endif
extern size_t riscv_vlen_asm(void);
@@ -76,16 +76,15 @@ static void parse_env(const char *envstr)
BIO_snprintf(buf, BUFLEN, "_%s", RISCV_capabilities[i].name);
if (strstr(envstrupper, buf) != NULL) {
/* Match, set relevant bit in OPENSSL_riscvcap_P[] */
- OPENSSL_riscvcap_P[RISCV_capabilities[i].index] |=
- (1 << RISCV_capabilities[i].bit_offset);
+ OPENSSL_riscvcap_P[RISCV_capabilities[i].index] |= (1 << RISCV_capabilities[i].bit_offset);
}
}
}
#ifdef OSSL_RISCV_HWPROBE
static long riscv_hwprobe(struct riscv_hwprobe *pairs, size_t pair_count,
- size_t cpu_count, unsigned long *cpus,
- unsigned int flags)
+ size_t cpu_count, unsigned long *cpus,
+ unsigned int flags)
{
return syscall(__NR_riscv_hwprobe, pairs, pair_count, cpu_count, cpus, flags);
}
@@ -103,12 +102,11 @@ static void hwprobe_to_cap(void)
for (size_t i = 0; i < kRISCVNumCaps; ++i) {
for (size_t j = 0; j != OSSL_RISCV_HWPROBE_PAIR_COUNT; ++j) {
if (pairs[j].key == RISCV_capabilities[i].hwprobe_key
- && (pairs[j].value & RISCV_capabilities[i].hwprobe_value)
- != 0)
+ && (pairs[j].value & RISCV_capabilities[i].hwprobe_value)
+ != 0)
if (!IS_IN_DEPEND_VECTOR(RISCV_capabilities[i].bit_offset) || VECTOR_CAPABLE)
/* Match, set relevant bit in OPENSSL_riscvcap_P[] */
- OPENSSL_riscvcap_P[RISCV_capabilities[i].index] |=
- (1 << RISCV_capabilities[i].bit_offset);
+ OPENSSL_riscvcap_P[RISCV_capabilities[i].index] |= (1 << RISCV_capabilities[i].bit_offset);
}
}
}
diff --git a/crypto/rsa/rsa_acvp_test_params.c b/crypto/rsa/rsa_acvp_test_params.c
index fddc1e0994..77e1c39c3e 100644
--- a/crypto/rsa/rsa_acvp_test_params.c
+++ b/crypto/rsa/rsa_acvp_test_params.c
@@ -92,22 +92,22 @@ int ossl_rsa_acvp_test_set_params(RSA *r, const OSSL_PARAM params[])
/* Set the input parameters */
if ((p = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_RSA_TEST_XP1)) != NULL
- && !OSSL_PARAM_get_BN(p, &t->Xp1))
+ && !OSSL_PARAM_get_BN(p, &t->Xp1))
goto err;
if ((p = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_RSA_TEST_XP2)) != NULL
- && !OSSL_PARAM_get_BN(p, &t->Xp2))
+ && !OSSL_PARAM_get_BN(p, &t->Xp2))
goto err;
if ((p = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_RSA_TEST_XP)) != NULL
- && !OSSL_PARAM_get_BN(p, &t->Xp))
+ && !OSSL_PARAM_get_BN(p, &t->Xp))
goto err;
if ((p = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_RSA_TEST_XQ1)) != NULL
- && !OSSL_PARAM_get_BN(p, &t->Xq1))
+ && !OSSL_PARAM_get_BN(p, &t->Xq1))
goto err;
if ((p = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_RSA_TEST_XQ2)) != NULL
- && !OSSL_PARAM_get_BN(p, &t->Xq2))
+ && !OSSL_PARAM_get_BN(p, &t->Xq2))
goto err;
if ((p = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_RSA_TEST_XQ)) != NULL
- && !OSSL_PARAM_get_BN(p, &t->Xq))
+ && !OSSL_PARAM_get_BN(p, &t->Xq))
goto err;
/* Setup the output parameters */
@@ -133,17 +133,17 @@ int ossl_rsa_acvp_test_get_params(RSA *r, OSSL_PARAM params[])
t = r->acvp_test;
if (t != NULL) {
if ((p = OSSL_PARAM_locate(params, OSSL_PKEY_PARAM_RSA_TEST_P1)) != NULL
- && !OSSL_PARAM_set_BN(p, t->p1))
- return 0;
+ && !OSSL_PARAM_set_BN(p, t->p1))
+ return 0;
if ((p = OSSL_PARAM_locate(params, OSSL_PKEY_PARAM_RSA_TEST_P2)) != NULL
- && !OSSL_PARAM_set_BN(p, t->p2))
- return 0;
+ && !OSSL_PARAM_set_BN(p, t->p2))
+ return 0;
if ((p = OSSL_PARAM_locate(params, OSSL_PKEY_PARAM_RSA_TEST_Q1)) != NULL
- && !OSSL_PARAM_set_BN(p, t->q1))
- return 0;
+ && !OSSL_PARAM_set_BN(p, t->q1))
+ return 0;
if ((p = OSSL_PARAM_locate(params, OSSL_PKEY_PARAM_RSA_TEST_Q2)) != NULL
- && !OSSL_PARAM_set_BN(p, t->q2))
- return 0;
+ && !OSSL_PARAM_set_BN(p, t->q2))
+ return 0;
}
return 1;
}
@@ -164,4 +164,3 @@ void ossl_rsa_acvp_test_free(RSA_ACVP_TEST *t)
OPENSSL_free(t);
}
}
-
diff --git a/crypto/rsa/rsa_ameth.c b/crypto/rsa/rsa_ameth.c
index 972c491755..87bbaf04e3 100644
--- a/crypto/rsa/rsa_ameth.c
+++ b/crypto/rsa/rsa_ameth.c
@@ -27,7 +27,7 @@
/* Set any parameters associated with pkey */
static int rsa_param_encode(const EVP_PKEY *pkey,
- ASN1_STRING **pstr, int *pstrtype)
+ ASN1_STRING **pstr, int *pstrtype)
{
const RSA *rsa = pkey->pkey.rsa;
@@ -65,7 +65,7 @@ static int rsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
return 0;
}
if (X509_PUBKEY_set0_param(pk, OBJ_nid2obj(pkey->ameth->pkey_id),
- strtype, str, penc, penclen))
+ strtype, str, penc, penclen))
return 1;
OPENSSL_free(penc);
@@ -116,7 +116,7 @@ static int rsa_pub_cmp(const EVP_PKEY *a, const EVP_PKEY *b)
* cards.
*/
if (((RSA_flags(a->pkey.rsa) & RSA_METHOD_FLAG_NO_CHECK))
- || (RSA_flags(b->pkey.rsa) & RSA_METHOD_FLAG_NO_CHECK)) {
+ || (RSA_flags(b->pkey.rsa) & RSA_METHOD_FLAG_NO_CHECK)) {
return 1;
}
@@ -127,7 +127,7 @@ static int rsa_pub_cmp(const EVP_PKEY *a, const EVP_PKEY *b)
}
static int old_rsa_priv_decode(EVP_PKEY *pkey,
- const unsigned char **pder, int derlen)
+ const unsigned char **pder, int derlen)
{
RSA *rsa;
@@ -160,7 +160,7 @@ static int rsa_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
}
if (!PKCS8_pkey_set0(p8, OBJ_nid2obj(pkey->ameth->pkey_id), 0,
- strtype, str, rk, rklen)) {
+ strtype, str, rk, rklen)) {
ERR_raise(ERR_LIB_RSA, ERR_R_ASN1_LIB);
ASN1_STRING_free(str);
OPENSSL_clear_free(rk, rklen);
@@ -203,7 +203,7 @@ static void int_rsa_free(EVP_PKEY *pkey)
}
static int rsa_pss_param_print(BIO *bp, int pss_key, RSA_PSS_PARAMS *pss,
- int indent)
+ int indent)
{
int rv = 0;
X509_ALGOR *maskHash = NULL;
@@ -291,10 +291,9 @@ static int rsa_pss_param_print(BIO *bp, int pss_key, RSA_PSS_PARAMS *pss,
rv = 1;
- err:
+err:
X509_ALGOR_free(maskHash);
return rv;
-
}
static int pkey_rsa_print(BIO *bp, const EVP_PKEY *pkey, int off, int priv)
@@ -311,12 +310,13 @@ static int pkey_rsa_print(BIO *bp, const EVP_PKEY *pkey, int off, int priv)
if (!BIO_indent(bp, off, 128))
goto err;
- if (BIO_printf(bp, "%s ", pkey_is_pss(pkey) ? "RSA-PSS" : "RSA") <= 0)
+ if (BIO_printf(bp, "%s ", pkey_is_pss(pkey) ? "RSA-PSS" : "RSA") <= 0)
goto err;
if (priv && x->d) {
if (BIO_printf(bp, "Private-Key: (%d bit, %d primes)\n",
- mod_len, ex_primes <= 0 ? 2 : ex_primes + 2) <= 0)
+ mod_len, ex_primes <= 0 ? 2 : ex_primes + 2)
+ <= 0)
goto err;
str = "modulus:";
s = "publicExponent:";
@@ -382,24 +382,24 @@ static int pkey_rsa_print(BIO *bp, const EVP_PKEY *pkey, int off, int priv)
if (pkey_is_pss(pkey) && !rsa_pss_param_print(bp, 1, x->pss, off))
goto err;
ret = 1;
- err:
+err:
return ret;
}
static int rsa_pub_print(BIO *bp, const EVP_PKEY *pkey, int indent,
- ASN1_PCTX *ctx)
+ ASN1_PCTX *ctx)
{
return pkey_rsa_print(bp, pkey, indent, 0);
}
static int rsa_priv_print(BIO *bp, const EVP_PKEY *pkey, int indent,
- ASN1_PCTX *ctx)
+ ASN1_PCTX *ctx)
{
return pkey_rsa_print(bp, pkey, indent, 1);
}
static int rsa_sig_print(BIO *bp, const X509_ALGOR *sigalg,
- const ASN1_STRING *sig, int indent, ASN1_PCTX *pctx)
+ const ASN1_STRING *sig, int indent, ASN1_PCTX *pctx)
{
if (OBJ_obj2nid(sigalg->algorithm) == EVP_PKEY_RSA_PSS) {
int rv;
@@ -427,7 +427,7 @@ static int rsa_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2)
case ASN1_PKEY_CTRL_DEFAULT_MD_NID:
if (pkey->pkey.rsa->pss != NULL) {
if (!ossl_rsa_pss_get_param(pkey->pkey.rsa->pss, &md, &mgf1md,
- &min_saltlen)) {
+ &min_saltlen)) {
ERR_raise(ERR_LIB_RSA, ERR_R_INTERNAL_ERROR);
return 0;
}
@@ -492,7 +492,7 @@ static RSA_PSS_PARAMS *rsa_ctx_to_pss(EVP_PKEY_CTX *pkctx)
}
RSA_PSS_PARAMS *ossl_rsa_pss_params_create(const EVP_MD *sigmd,
- const EVP_MD *mgf1md, int saltlen)
+ const EVP_MD *mgf1md, int saltlen)
{
RSA_PSS_PARAMS *pss = RSA_PSS_PARAMS_new();
@@ -514,7 +514,7 @@ RSA_PSS_PARAMS *ossl_rsa_pss_params_create(const EVP_MD *sigmd,
if (!ossl_x509_algor_new_from_md(&pss->maskHash, mgf1md))
goto err;
return pss;
- err:
+err:
RSA_PSS_PARAMS_free(pss);
return NULL;
}
@@ -539,7 +539,7 @@ ASN1_STRING *ossl_rsa_ctx_to_pss_string(EVP_PKEY_CTX *pkctx)
*/
int ossl_rsa_pss_to_ctx(EVP_MD_CTX *ctx, EVP_PKEY_CTX *pkctx,
- const X509_ALGOR *sigalg, EVP_PKEY *pkey)
+ const X509_ALGOR *sigalg, EVP_PKEY *pkey)
{
int rv = -1;
int saltlen;
@@ -584,13 +584,13 @@ int ossl_rsa_pss_to_ctx(EVP_MD_CTX *ctx, EVP_PKEY_CTX *pkctx,
/* Carry on */
rv = 1;
- err:
+err:
RSA_PSS_PARAMS_free(pss);
return rv;
}
static int rsa_pss_verify_param(const EVP_MD **pmd, const EVP_MD **pmgf1md,
- int *psaltlen, int *ptrailerField)
+ int *psaltlen, int *ptrailerField)
{
if (psaltlen != NULL && *psaltlen < 0) {
ERR_raise(ERR_LIB_RSA, RSA_R_INVALID_SALT_LENGTH);
@@ -608,7 +608,7 @@ static int rsa_pss_verify_param(const EVP_MD **pmd, const EVP_MD **pmgf1md,
}
int ossl_rsa_pss_get_param(const RSA_PSS_PARAMS *pss, const EVP_MD **pmd,
- const EVP_MD **pmgf1md, int *psaltlen)
+ const EVP_MD **pmgf1md, int *psaltlen)
{
/*
* Callers do not care about the trailer field, and yet, we must
@@ -621,7 +621,7 @@ int ossl_rsa_pss_get_param(const RSA_PSS_PARAMS *pss, const EVP_MD **pmd,
int trailerField = 0;
return ossl_rsa_pss_get_param_unverified(pss, pmd, pmgf1md, psaltlen,
- &trailerField)
+ &trailerField)
&& rsa_pss_verify_param(pmd, pmgf1md, psaltlen, &trailerField);
}
@@ -631,8 +631,8 @@ int ossl_rsa_pss_get_param(const RSA_PSS_PARAMS *pss, const EVP_MD **pmd,
*/
static int rsa_item_verify(EVP_MD_CTX *ctx, const ASN1_ITEM *it,
- const void *asn, const X509_ALGOR *sigalg,
- const ASN1_BIT_STRING *sig, EVP_PKEY *pkey)
+ const void *asn, const X509_ALGOR *sigalg,
+ const ASN1_BIT_STRING *sig, EVP_PKEY *pkey)
{
/* Sanity check: make sure it is PSS */
if (OBJ_obj2nid(sigalg->algorithm) != EVP_PKEY_RSA_PSS) {
@@ -647,8 +647,8 @@ static int rsa_item_verify(EVP_MD_CTX *ctx, const ASN1_ITEM *it,
}
static int rsa_item_sign(EVP_MD_CTX *ctx, const ASN1_ITEM *it, const void *asn,
- X509_ALGOR *alg1, X509_ALGOR *alg2,
- ASN1_BIT_STRING *sig)
+ X509_ALGOR *alg1, X509_ALGOR *alg2,
+ ASN1_BIT_STRING *sig)
{
int pad_mode;
EVP_PKEY_CTX *pkctx = EVP_MD_CTX_get_pkey_ctx(ctx);
@@ -678,16 +678,16 @@ static int rsa_item_sign(EVP_MD_CTX *ctx, const ASN1_ITEM *it, const void *asn,
return 0;
}
if (!X509_ALGOR_set0(alg2, OBJ_nid2obj(EVP_PKEY_RSA_PSS),
- V_ASN1_SEQUENCE, os2)) {
+ V_ASN1_SEQUENCE, os2)) {
ASN1_STRING_free(os1);
ASN1_STRING_free(os2);
return 0;
}
}
if (!X509_ALGOR_set0(alg1, OBJ_nid2obj(EVP_PKEY_RSA_PSS),
- V_ASN1_SEQUENCE, os1)) {
- ASN1_STRING_free(os1);
- return 0;
+ V_ASN1_SEQUENCE, os1)) {
+ ASN1_STRING_free(os1);
+ return 0;
}
return 3;
}
@@ -720,7 +720,7 @@ static int rsa_item_sign(EVP_MD_CTX *ctx, const ASN1_ITEM *it, const void *asn,
}
static int rsa_sig_info_set(X509_SIG_INFO *siginf, const X509_ALGOR *sigalg,
- const ASN1_STRING *sig)
+ const ASN1_STRING *sig)
{
int rv = 0;
int mdnid, saltlen, md_size;
@@ -745,8 +745,8 @@ static int rsa_sig_info_set(X509_SIG_INFO *siginf, const X509_ALGOR *sigalg,
* match and salt length must equal digest size
*/
if ((mdnid == NID_sha256 || mdnid == NID_sha384 || mdnid == NID_sha512)
- && mdnid == EVP_MD_get_type(mgf1md)
- && saltlen == md_size)
+ && mdnid == EVP_MD_get_type(mgf1md)
+ && saltlen == md_size)
flags = X509_SIG_INFO_TLS;
else
flags = 0;
@@ -769,9 +769,9 @@ static int rsa_sig_info_set(X509_SIG_INFO *siginf, const X509_ALGOR *sigalg,
else if (mdnid == NID_md5)
secbits = 39;
X509_SIG_INFO_set(siginf, mdnid, EVP_PKEY_RSA_PSS, secbits,
- flags);
+ flags);
rv = 1;
- err:
+err:
RSA_PSS_PARAMS_free(pss);
return rv;
}
@@ -791,9 +791,9 @@ static size_t rsa_pkey_dirty_cnt(const EVP_PKEY *pkey)
* checks in this method since the caller tests EVP_KEYMGMT_is_a() first.
*/
static int rsa_int_export_to(const EVP_PKEY *from, int rsa_type,
- void *to_keydata,
- OSSL_FUNC_keymgmt_import_fn *importer,
- OSSL_LIB_CTX *libctx, const char *propq)
+ void *to_keydata,
+ OSSL_FUNC_keymgmt_import_fn *importer,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
RSA *rsa = from->pkey.rsa;
OSSL_PARAM_BLD *tmpl = OSSL_PARAM_BLD_new();
@@ -820,14 +820,14 @@ static int rsa_int_export_to(const EVP_PKEY *from, int rsa_type,
RSA_PSS_PARAMS_30 pss_params;
if (!ossl_rsa_pss_get_param_unverified(rsa->pss, &md, &mgf1md,
- &saltlen, &trailerfield))
+ &saltlen, &trailerfield))
goto err;
md_nid = EVP_MD_get_type(md);
mgf1md_nid = EVP_MD_get_type(mgf1md);
if (!ossl_rsa_pss_params_30_set_defaults(&pss_params)
|| !ossl_rsa_pss_params_30_set_hashalg(&pss_params, md_nid)
|| !ossl_rsa_pss_params_30_set_maskgenhashalg(&pss_params,
- mgf1md_nid)
+ mgf1md_nid)
|| !ossl_rsa_pss_params_30_set_saltlen(&pss_params, saltlen)
|| !ossl_rsa_pss_params_30_todata(&pss_params, tmpl, NULL))
goto err;
@@ -840,19 +840,21 @@ static int rsa_int_export_to(const EVP_PKEY *from, int rsa_type,
/* We export, the provider imports */
rv = importer(to_keydata, selection, params);
- err:
+err:
OSSL_PARAM_free(params);
OSSL_PARAM_BLD_free(tmpl);
return rv;
}
static int rsa_int_import_from(const OSSL_PARAM params[], void *vpctx,
- int rsa_type)
+ int rsa_type)
{
EVP_PKEY_CTX *pctx = vpctx;
EVP_PKEY *pkey = EVP_PKEY_CTX_get0_pkey(pctx);
RSA *rsa = ossl_rsa_new_with_ctx(pctx->libctx);
- RSA_PSS_PARAMS_30 rsa_pss_params = { 0, };
+ RSA_PSS_PARAMS_30 rsa_pss_params = {
+ 0,
+ };
int pss_defaults_set = 0;
int ok = 0;
@@ -865,7 +867,7 @@ static int rsa_int_import_from(const OSSL_PARAM params[], void *vpctx,
RSA_set_flags(rsa, rsa_type);
if (!ossl_rsa_pss_params_30_fromdata(&rsa_pss_params, &pss_defaults_set,
- params, pctx->libctx))
+ params, pctx->libctx))
goto err;
switch (rsa_type) {
@@ -891,7 +893,8 @@ static int rsa_int_import_from(const OSSL_PARAM params[], void *vpctx,
const EVP_MD *mgf1md = EVP_get_digestbynid(mgf1mdnid);
if ((rsa->pss = ossl_rsa_pss_params_create(md, mgf1md,
- saltlen)) == NULL)
+ saltlen))
+ == NULL)
goto err;
}
break;
@@ -912,26 +915,26 @@ static int rsa_int_import_from(const OSSL_PARAM params[], void *vpctx,
break;
}
- err:
+err:
if (!ok)
RSA_free(rsa);
return ok;
}
static int rsa_pkey_export_to(const EVP_PKEY *from, void *to_keydata,
- OSSL_FUNC_keymgmt_import_fn *importer,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_FUNC_keymgmt_import_fn *importer,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
return rsa_int_export_to(from, RSA_FLAG_TYPE_RSA, to_keydata,
- importer, libctx, propq);
+ importer, libctx, propq);
}
static int rsa_pss_pkey_export_to(const EVP_PKEY *from, void *to_keydata,
- OSSL_FUNC_keymgmt_import_fn *importer,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_FUNC_keymgmt_import_fn *importer,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
return rsa_int_export_to(from, RSA_FLAG_TYPE_RSASSAPSS, to_keydata,
- importer, libctx, propq);
+ importer, libctx, propq);
}
static int rsa_pkey_import_from(const OSSL_PARAM params[], void *vpctx)
@@ -963,91 +966,88 @@ static int rsa_pkey_copy(EVP_PKEY *to, EVP_PKEY *from)
}
const EVP_PKEY_ASN1_METHOD ossl_rsa_asn1_meths[2] = {
- {
- EVP_PKEY_RSA,
- EVP_PKEY_RSA,
- ASN1_PKEY_SIGPARAM_NULL,
-
- "RSA",
- "OpenSSL RSA method",
-
- rsa_pub_decode,
- rsa_pub_encode,
- rsa_pub_cmp,
- rsa_pub_print,
-
- rsa_priv_decode,
- rsa_priv_encode,
- rsa_priv_print,
-
- int_rsa_size,
- rsa_bits,
- rsa_security_bits,
-
- 0, 0, 0, 0, 0, 0,
-
- rsa_sig_print,
- int_rsa_free,
- rsa_pkey_ctrl,
- old_rsa_priv_decode,
- old_rsa_priv_encode,
- rsa_item_verify,
- rsa_item_sign,
- rsa_sig_info_set,
- rsa_pkey_check,
-
- 0, 0,
- 0, 0, 0, 0,
-
- rsa_pkey_dirty_cnt,
- rsa_pkey_export_to,
- rsa_pkey_import_from,
- rsa_pkey_copy
- },
-
- {
- EVP_PKEY_RSA2,
- EVP_PKEY_RSA,
- ASN1_PKEY_ALIAS}
+ { EVP_PKEY_RSA,
+ EVP_PKEY_RSA,
+ ASN1_PKEY_SIGPARAM_NULL,
+
+ "RSA",
+ "OpenSSL RSA method",
+
+ rsa_pub_decode,
+ rsa_pub_encode,
+ rsa_pub_cmp,
+ rsa_pub_print,
+
+ rsa_priv_decode,
+ rsa_priv_encode,
+ rsa_priv_print,
+
+ int_rsa_size,
+ rsa_bits,
+ rsa_security_bits,
+
+ 0, 0, 0, 0, 0, 0,
+
+ rsa_sig_print,
+ int_rsa_free,
+ rsa_pkey_ctrl,
+ old_rsa_priv_decode,
+ old_rsa_priv_encode,
+ rsa_item_verify,
+ rsa_item_sign,
+ rsa_sig_info_set,
+ rsa_pkey_check,
+
+ 0, 0,
+ 0, 0, 0, 0,
+
+ rsa_pkey_dirty_cnt,
+ rsa_pkey_export_to,
+ rsa_pkey_import_from,
+ rsa_pkey_copy },
+
+ { EVP_PKEY_RSA2,
+ EVP_PKEY_RSA,
+ ASN1_PKEY_ALIAS }
};
const EVP_PKEY_ASN1_METHOD ossl_rsa_pss_asn1_meth = {
- EVP_PKEY_RSA_PSS,
- EVP_PKEY_RSA_PSS,
- ASN1_PKEY_SIGPARAM_NULL,
-
- "RSA-PSS",
- "OpenSSL RSA-PSS method",
-
- rsa_pub_decode,
- rsa_pub_encode,
- rsa_pub_cmp,
- rsa_pub_print,
-
- rsa_priv_decode,
- rsa_priv_encode,
- rsa_priv_print,
-
- int_rsa_size,
- rsa_bits,
- rsa_security_bits,
-
- 0, 0, 0, 0, 0, 0,
-
- rsa_sig_print,
- int_rsa_free,
- rsa_pkey_ctrl,
- 0, 0,
- rsa_item_verify,
- rsa_item_sign,
- rsa_sig_info_set,
- rsa_pkey_check,
-
- 0, 0,
- 0, 0, 0, 0,
-
- rsa_pkey_dirty_cnt,
- rsa_pss_pkey_export_to,
- rsa_pss_pkey_import_from,
- rsa_pkey_copy
+ EVP_PKEY_RSA_PSS,
+ EVP_PKEY_RSA_PSS,
+ ASN1_PKEY_SIGPARAM_NULL,
+
+ "RSA-PSS",
+ "OpenSSL RSA-PSS method",
+
+ rsa_pub_decode,
+ rsa_pub_encode,
+ rsa_pub_cmp,
+ rsa_pub_print,
+
+ rsa_priv_decode,
+ rsa_priv_encode,
+ rsa_priv_print,
+
+ int_rsa_size,
+ rsa_bits,
+ rsa_security_bits,
+
+ 0, 0, 0, 0, 0, 0,
+
+ rsa_sig_print,
+ int_rsa_free,
+ rsa_pkey_ctrl,
+ 0, 0,
+ rsa_item_verify,
+ rsa_item_sign,
+ rsa_sig_info_set,
+ rsa_pkey_check,
+
+ 0, 0,
+ 0, 0, 0, 0,
+
+ rsa_pkey_dirty_cnt,
+ rsa_pss_pkey_export_to,
+ rsa_pss_pkey_import_from,
+ rsa_pkey_copy
};
diff --git a/crypto/rsa/rsa_asn1.c b/crypto/rsa/rsa_asn1.c
index c14cdf415e..bdd83b414b 100644
--- a/crypto/rsa/rsa_asn1.c
+++ b/crypto/rsa/rsa_asn1.c
@@ -26,7 +26,7 @@
* RSA keys.
*/
static int rsa_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
- void *exarg)
+ void *exarg)
{
if (operation == ASN1_OP_NEW_PRE) {
*pval = (ASN1_VALUE *)RSA_new();
@@ -49,33 +49,32 @@ static int rsa_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
/* Based on definitions in RFC 8017 appendix A.1.2 */
ASN1_SEQUENCE(RSA_PRIME_INFO) = {
- ASN1_SIMPLE(RSA_PRIME_INFO, r, CBIGNUM),
- ASN1_SIMPLE(RSA_PRIME_INFO, d, CBIGNUM),
- ASN1_SIMPLE(RSA_PRIME_INFO, t, CBIGNUM),
+ ASN1_SIMPLE(RSA_PRIME_INFO, r, CBIGNUM),
+ ASN1_SIMPLE(RSA_PRIME_INFO, d, CBIGNUM),
+ ASN1_SIMPLE(RSA_PRIME_INFO, t, CBIGNUM),
} ASN1_SEQUENCE_END(RSA_PRIME_INFO)
ASN1_SEQUENCE_cb(RSAPrivateKey, rsa_cb) = {
- ASN1_EMBED(RSA, version, INT32),
- ASN1_SIMPLE(RSA, n, BIGNUM),
- ASN1_SIMPLE(RSA, e, BIGNUM),
- ASN1_SIMPLE(RSA, d, CBIGNUM),
- ASN1_SIMPLE(RSA, p, CBIGNUM),
- ASN1_SIMPLE(RSA, q, CBIGNUM),
- ASN1_SIMPLE(RSA, dmp1, CBIGNUM),
- ASN1_SIMPLE(RSA, dmq1, CBIGNUM),
- ASN1_SIMPLE(RSA, iqmp, CBIGNUM),
- ASN1_SEQUENCE_OF_OPT(RSA, prime_infos, RSA_PRIME_INFO)
+ ASN1_EMBED(RSA, version, INT32),
+ ASN1_SIMPLE(RSA, n, BIGNUM),
+ ASN1_SIMPLE(RSA, e, BIGNUM),
+ ASN1_SIMPLE(RSA, d, CBIGNUM),
+ ASN1_SIMPLE(RSA, p, CBIGNUM),
+ ASN1_SIMPLE(RSA, q, CBIGNUM),
+ ASN1_SIMPLE(RSA, dmp1, CBIGNUM),
+ ASN1_SIMPLE(RSA, dmq1, CBIGNUM),
+ ASN1_SIMPLE(RSA, iqmp, CBIGNUM),
+ ASN1_SEQUENCE_OF_OPT(RSA, prime_infos, RSA_PRIME_INFO)
} ASN1_SEQUENCE_END_cb(RSA, RSAPrivateKey)
-
ASN1_SEQUENCE_cb(RSAPublicKey, rsa_cb) = {
- ASN1_SIMPLE(RSA, n, BIGNUM),
- ASN1_SIMPLE(RSA, e, BIGNUM),
+ ASN1_SIMPLE(RSA, n, BIGNUM),
+ ASN1_SIMPLE(RSA, e, BIGNUM),
} ASN1_SEQUENCE_END_cb(RSA, RSAPublicKey)
/* Free up maskHash */
static int rsa_pss_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
- void *exarg)
+ void *exarg)
{
if (operation == ASN1_OP_FREE_PRE) {
RSA_PSS_PARAMS *pss = (RSA_PSS_PARAMS *)*pval;
@@ -85,10 +84,10 @@ static int rsa_pss_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
}
ASN1_SEQUENCE_cb(RSA_PSS_PARAMS, rsa_pss_cb) = {
- ASN1_EXP_OPT(RSA_PSS_PARAMS, hashAlgorithm, X509_ALGOR,0),
- ASN1_EXP_OPT(RSA_PSS_PARAMS, maskGenAlgorithm, X509_ALGOR,1),
- ASN1_EXP_OPT(RSA_PSS_PARAMS, saltLength, ASN1_INTEGER,2),
- ASN1_EXP_OPT(RSA_PSS_PARAMS, trailerField, ASN1_INTEGER,3)
+ ASN1_EXP_OPT(RSA_PSS_PARAMS, hashAlgorithm, X509_ALGOR, 0),
+ ASN1_EXP_OPT(RSA_PSS_PARAMS, maskGenAlgorithm, X509_ALGOR, 1),
+ ASN1_EXP_OPT(RSA_PSS_PARAMS, saltLength, ASN1_INTEGER, 2),
+ ASN1_EXP_OPT(RSA_PSS_PARAMS, trailerField, ASN1_INTEGER, 3)
} ASN1_SEQUENCE_END_cb(RSA_PSS_PARAMS, RSA_PSS_PARAMS)
IMPLEMENT_ASN1_FUNCTIONS(RSA_PSS_PARAMS)
@@ -96,7 +95,7 @@ IMPLEMENT_ASN1_DUP_FUNCTION(RSA_PSS_PARAMS)
/* Free up maskHash */
static int rsa_oaep_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
- void *exarg)
+ void *exarg)
{
if (operation == ASN1_OP_FREE_PRE) {
RSA_OAEP_PARAMS *oaep = (RSA_OAEP_PARAMS *)*pval;
@@ -106,9 +105,9 @@ static int rsa_oaep_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
}
ASN1_SEQUENCE_cb(RSA_OAEP_PARAMS, rsa_oaep_cb) = {
- ASN1_EXP_OPT(RSA_OAEP_PARAMS, hashFunc, X509_ALGOR, 0),
- ASN1_EXP_OPT(RSA_OAEP_PARAMS, maskGenFunc, X509_ALGOR, 1),
- ASN1_EXP_OPT(RSA_OAEP_PARAMS, pSourceFunc, X509_ALGOR, 2),
+ ASN1_EXP_OPT(RSA_OAEP_PARAMS, hashFunc, X509_ALGOR, 0),
+ ASN1_EXP_OPT(RSA_OAEP_PARAMS, maskGenFunc, X509_ALGOR, 1),
+ ASN1_EXP_OPT(RSA_OAEP_PARAMS, pSourceFunc, X509_ALGOR, 2),
} ASN1_SEQUENCE_END_cb(RSA_OAEP_PARAMS, RSA_OAEP_PARAMS)
IMPLEMENT_ASN1_FUNCTIONS(RSA_OAEP_PARAMS)
diff --git a/crypto/rsa/rsa_backend.c b/crypto/rsa/rsa_backend.c
index 04c4ccdf1b..8ed857414d 100644
--- a/crypto/rsa/rsa_backend.c
+++ b/crypto/rsa/rsa_backend.c
@@ -19,8 +19,8 @@
#include <openssl/err.h>
#include <openssl/evp.h>
#ifndef FIPS_MODULE
-# include <openssl/x509.h>
-# include "crypto/asn1.h"
+#include <openssl/x509.h>
+#include "crypto/asn1.h"
#endif
#include "internal/sizes.h"
#include "internal/param_build_set.h"
@@ -36,7 +36,7 @@
DEFINE_STACK_OF(BIGNUM)
static int collect_numbers(STACK_OF(BIGNUM) *numbers,
- const OSSL_PARAM params[], const char *names[])
+ const OSSL_PARAM params[], const char *names[])
{
const OSSL_PARAM *p = NULL;
int i;
@@ -63,7 +63,7 @@ static int collect_numbers(STACK_OF(BIGNUM) *numbers,
int ossl_rsa_fromdata(RSA *rsa, const OSSL_PARAM params[], int include_private)
{
- const OSSL_PARAM *param_n, *param_e, *param_d = NULL;
+ const OSSL_PARAM *param_n, *param_e, *param_d = NULL;
const OSSL_PARAM *param_p, *param_q = NULL;
const OSSL_PARAM *param_derive = NULL;
BIGNUM *p = NULL, *q = NULL, *n = NULL, *e = NULL, *d = NULL;
@@ -87,7 +87,7 @@ int ossl_rsa_fromdata(RSA *rsa, const OSSL_PARAM params[], int include_private)
if (include_private) {
param_derive = OSSL_PARAM_locate_const(params,
- OSSL_PKEY_PARAM_RSA_DERIVE_FROM_PQ);
+ OSSL_PKEY_PARAM_RSA_DERIVE_FROM_PQ);
if ((param_derive != NULL)
&& !OSSL_PARAM_get_int(param_derive, &derive_from_pq))
goto err;
@@ -111,7 +111,6 @@ int ossl_rsa_fromdata(RSA *rsa, const OSSL_PARAM params[], int include_private)
ERR_raise(ERR_LIB_RSA, ERR_R_PASSED_NULL_PARAMETER);
goto err;
}
-
}
}
@@ -123,11 +122,11 @@ int ossl_rsa_fromdata(RSA *rsa, const OSSL_PARAM params[], int include_private)
if (is_private) {
if (!collect_numbers(factors = sk_BIGNUM_new_null(), params,
- ossl_rsa_mp_factor_names)
+ ossl_rsa_mp_factor_names)
|| !collect_numbers(exps = sk_BIGNUM_new_null(), params,
- ossl_rsa_mp_exp_names)
+ ossl_rsa_mp_exp_names)
|| !collect_numbers(coeffs = sk_BIGNUM_new_null(), params,
- ossl_rsa_mp_coeff_names))
+ ossl_rsa_mp_coeff_names))
goto err;
if (derive_from_pq && sk_BIGNUM_num(exps) == 0
@@ -155,7 +154,7 @@ int ossl_rsa_fromdata(RSA *rsa, const OSSL_PARAM params[], int include_private)
if (sk_BIGNUM_num(factors) == 2) {
/* for 2 factors we can use the sp800 functions to do this */
if (!RSA_set0_factors(rsa, sk_BIGNUM_value(factors, 0),
- sk_BIGNUM_value(factors, 1))) {
+ sk_BIGNUM_value(factors, 1))) {
ERR_raise(ERR_LIB_RSA, ERR_R_INTERNAL_ERROR);
goto err;
}
@@ -173,8 +172,8 @@ int ossl_rsa_fromdata(RSA *rsa, const OSSL_PARAM params[], int include_private)
* the call to ossl_rsa_set0_all_params
*/
if (!ossl_rsa_sp800_56b_derive_params_from_pq(rsa,
- RSA_bits(rsa),
- NULL, ctx)) {
+ RSA_bits(rsa),
+ NULL, ctx)) {
ERR_raise(ERR_LIB_RSA, ERR_R_INTERNAL_ERROR);
goto err;
}
@@ -185,9 +184,9 @@ int ossl_rsa_fromdata(RSA *rsa, const OSSL_PARAM params[], int include_private)
* for each additional prime
*/
if (!ossl_rsa_multiprime_derive(rsa, RSA_bits(rsa),
- sk_BIGNUM_num(factors),
- rsa->e, factors, exps,
- coeffs)) {
+ sk_BIGNUM_num(factors),
+ rsa->e, factors, exps,
+ coeffs)) {
ERR_raise(ERR_LIB_RSA, ERR_R_INTERNAL_ERROR);
goto err;
}
@@ -222,16 +221,16 @@ int ossl_rsa_fromdata(RSA *rsa, const OSSL_PARAM params[], int include_private)
|| sk_BIGNUM_num(exps) != 0
|| sk_BIGNUM_num(coeffs) != 0) {
ERR_raise_data(ERR_LIB_RSA, ERR_R_INTERNAL_ERROR,
- "There are %d, %d, %d elements left on our factors, exps, coeffs stacks\n",
- sk_BIGNUM_num(factors), sk_BIGNUM_num(exps),
- sk_BIGNUM_num(coeffs));
+ "There are %d, %d, %d elements left on our factors, exps, coeffs stacks\n",
+ sk_BIGNUM_num(factors), sk_BIGNUM_num(exps),
+ sk_BIGNUM_num(coeffs));
goto err;
}
}
if (!ossl_rsa_check_factors(rsa)) {
ERR_raise_data(ERR_LIB_RSA, RSA_R_INVALID_KEYPAIR,
- "RSA factors/exponents are too big for for n-modulus\n");
+ "RSA factors/exponents are too big for for n-modulus\n");
goto err;
}
@@ -243,7 +242,7 @@ int ossl_rsa_fromdata(RSA *rsa, const OSSL_PARAM params[], int include_private)
BN_CTX_free(ctx);
return 1;
- err:
+err:
BN_free(n);
BN_free(e);
BN_free(d);
@@ -257,7 +256,7 @@ int ossl_rsa_fromdata(RSA *rsa, const OSSL_PARAM params[], int include_private)
DEFINE_SPECIAL_STACK_OF_CONST(BIGNUM_const, BIGNUM)
int ossl_rsa_todata(RSA *rsa, OSSL_PARAM_BLD *bld, OSSL_PARAM params[],
- int include_private)
+ int include_private)
{
int ret = 0;
const BIGNUM *rsa_d = NULL, *rsa_n = NULL, *rsa_e = NULL;
@@ -279,15 +278,15 @@ int ossl_rsa_todata(RSA *rsa, OSSL_PARAM_BLD *bld, OSSL_PARAM params[],
if (include_private && rsa_d != NULL) {
if (!ossl_param_build_set_bn(bld, params, OSSL_PKEY_PARAM_RSA_D,
- rsa_d)
+ rsa_d)
|| !ossl_param_build_set_multi_key_bn(bld, params,
- ossl_rsa_mp_factor_names,
- factors)
+ ossl_rsa_mp_factor_names,
+ factors)
|| !ossl_param_build_set_multi_key_bn(bld, params,
- ossl_rsa_mp_exp_names, exps)
+ ossl_rsa_mp_exp_names, exps)
|| !ossl_param_build_set_multi_key_bn(bld, params,
- ossl_rsa_mp_coeff_names,
- coeffs))
+ ossl_rsa_mp_coeff_names,
+ coeffs))
goto err;
}
@@ -297,7 +296,7 @@ int ossl_rsa_todata(RSA *rsa, OSSL_PARAM_BLD *bld, OSSL_PARAM params[],
ossl_rsa_acvp_test_get_params(rsa, params);
#endif
ret = 1;
- err:
+err:
sk_BIGNUM_const_free(factors);
sk_BIGNUM_const_free(exps);
sk_BIGNUM_const_free(coeffs);
@@ -305,7 +304,7 @@ int ossl_rsa_todata(RSA *rsa, OSSL_PARAM_BLD *bld, OSSL_PARAM params[],
}
int ossl_rsa_pss_params_30_todata(const RSA_PSS_PARAMS_30 *pss,
- OSSL_PARAM_BLD *bld, OSSL_PARAM params[])
+ OSSL_PARAM_BLD *bld, OSSL_PARAM params[])
{
if (!ossl_rsa_pss_params_30_is_unrestricted(pss)) {
int hashalg_nid = ossl_rsa_pss_params_30_hashalg(pss);
@@ -314,17 +313,16 @@ int ossl_rsa_pss_params_30_todata(const RSA_PSS_PARAMS_30 *pss,
int saltlen = ossl_rsa_pss_params_30_saltlen(pss);
int default_hashalg_nid = ossl_rsa_pss_params_30_hashalg(NULL);
int default_maskgenalg_nid = ossl_rsa_pss_params_30_maskgenalg(NULL);
- int default_maskgenhashalg_nid =
- ossl_rsa_pss_params_30_maskgenhashalg(NULL);
- const char *mdname =
- (hashalg_nid == default_hashalg_nid
- ? NULL : ossl_rsa_oaeppss_nid2name(hashalg_nid));
- const char *mgfname =
- (maskgenalg_nid == default_maskgenalg_nid
- ? NULL : ossl_rsa_oaeppss_nid2name(maskgenalg_nid));
- const char *mgf1mdname =
- (maskgenhashalg_nid == default_maskgenhashalg_nid
- ? NULL : ossl_rsa_oaeppss_nid2name(maskgenhashalg_nid));
+ int default_maskgenhashalg_nid = ossl_rsa_pss_params_30_maskgenhashalg(NULL);
+ const char *mdname = (hashalg_nid == default_hashalg_nid
+ ? NULL
+ : ossl_rsa_oaeppss_nid2name(hashalg_nid));
+ const char *mgfname = (maskgenalg_nid == default_maskgenalg_nid
+ ? NULL
+ : ossl_rsa_oaeppss_nid2name(maskgenalg_nid));
+ const char *mgf1mdname = (maskgenhashalg_nid == default_maskgenhashalg_nid
+ ? NULL
+ : ossl_rsa_oaeppss_nid2name(maskgenhashalg_nid));
const char *key_md = OSSL_PKEY_PARAM_RSA_DIGEST;
const char *key_mgf = OSSL_PKEY_PARAM_RSA_MASKGENFUNC;
const char *key_mgf1_md = OSSL_PKEY_PARAM_RSA_MGF1_DIGEST;
@@ -336,13 +334,13 @@ int ossl_rsa_pss_params_30_todata(const RSA_PSS_PARAMS_30 *pss,
* if it has a default value; saltlen.
*/
if ((mdname != NULL
- && !ossl_param_build_set_utf8_string(bld, params, key_md, mdname))
+ && !ossl_param_build_set_utf8_string(bld, params, key_md, mdname))
|| (mgfname != NULL
&& !ossl_param_build_set_utf8_string(bld, params,
- key_mgf, mgfname))
+ key_mgf, mgfname))
|| (mgf1mdname != NULL
&& !ossl_param_build_set_utf8_string(bld, params,
- key_mgf1_md, mgf1mdname))
+ key_mgf1_md, mgf1mdname))
|| (!ossl_param_build_set_int(bld, params, key_saltlen, saltlen)))
return 0;
}
@@ -350,11 +348,11 @@ int ossl_rsa_pss_params_30_todata(const RSA_PSS_PARAMS_30 *pss,
}
int ossl_rsa_pss_params_30_fromdata(RSA_PSS_PARAMS_30 *pss_params,
- int *defaults_set,
- const OSSL_PARAM params[],
- OSSL_LIB_CTX *libctx)
+ int *defaults_set,
+ const OSSL_PARAM params[],
+ OSSL_LIB_CTX *libctx)
{
- const OSSL_PARAM *param_md, *param_mgf, *param_mgf1md, *param_saltlen;
+ const OSSL_PARAM *param_md, *param_mgf, *param_mgf1md, *param_saltlen;
const OSSL_PARAM *param_propq;
const char *propq = NULL;
EVP_MD *md = NULL, *mgf1md = NULL;
@@ -363,16 +361,11 @@ int ossl_rsa_pss_params_30_fromdata(RSA_PSS_PARAMS_30 *pss_params,
if (pss_params == NULL)
return 0;
- param_propq =
- OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_RSA_DIGEST_PROPS);
- param_md =
- OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_RSA_DIGEST);
- param_mgf =
- OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_RSA_MASKGENFUNC);
- param_mgf1md =
- OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_RSA_MGF1_DIGEST);
- param_saltlen =
- OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_RSA_PSS_SALTLEN);
+ param_propq = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_RSA_DIGEST_PROPS);
+ param_md = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_RSA_DIGEST);
+ param_mgf = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_RSA_MASKGENFUNC);
+ param_mgf1md = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_RSA_MGF1_DIGEST);
+ param_saltlen = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_RSA_PSS_SALTLEN);
if (param_propq != NULL) {
if (param_propq->data_type == OSSL_PARAM_UTF8_STRING)
@@ -401,7 +394,8 @@ int ossl_rsa_pss_params_30_fromdata(RSA_PSS_PARAMS_30 *pss_params,
return 0;
if (OPENSSL_strcasecmp(param_mgf->data,
- ossl_rsa_mgf_nid2name(default_maskgenalg_nid)) != 0)
+ ossl_rsa_mgf_nid2name(default_maskgenalg_nid))
+ != 0)
return 0;
}
@@ -420,7 +414,7 @@ int ossl_rsa_pss_params_30_fromdata(RSA_PSS_PARAMS_30 *pss_params,
if ((md = EVP_MD_fetch(libctx, mdname, propq)) == NULL
|| !ossl_rsa_pss_params_30_set_hashalg(pss_params,
- ossl_rsa_oaeppss_md2nid(md)))
+ ossl_rsa_oaeppss_md2nid(md)))
goto err;
}
@@ -434,7 +428,7 @@ int ossl_rsa_pss_params_30_fromdata(RSA_PSS_PARAMS_30 *pss_params,
if ((mgf1md = EVP_MD_fetch(libctx, mgf1mdname, propq)) == NULL
|| !ossl_rsa_pss_params_30_set_maskgenhashalg(
- pss_params, ossl_rsa_oaeppss_md2nid(mgf1md)))
+ pss_params, ossl_rsa_oaeppss_md2nid(mgf1md)))
goto err;
}
@@ -446,7 +440,7 @@ int ossl_rsa_pss_params_30_fromdata(RSA_PSS_PARAMS_30 *pss_params,
ret = 1;
- err:
+err:
EVP_MD_free(md);
EVP_MD_free(mgf1md);
return ret;
@@ -552,13 +546,13 @@ RSA *ossl_rsa_dup(const RSA *rsa, int selection)
}
}
if (!CRYPTO_dup_ex_data(CRYPTO_EX_INDEX_RSA,
- &dupkey->ex_data, &rsa->ex_data))
+ &dupkey->ex_data, &rsa->ex_data))
goto err;
#endif
return dupkey;
- err:
+err:
RSA_free(dupkey);
return NULL;
}
@@ -569,7 +563,7 @@ RSA_PSS_PARAMS *ossl_rsa_pss_decode(const X509_ALGOR *alg)
RSA_PSS_PARAMS *pss;
pss = ASN1_TYPE_unpack_sequence(ASN1_ITEM_rptr(RSA_PSS_PARAMS),
- alg->parameter);
+ alg->parameter);
if (pss == NULL)
return NULL;
@@ -607,17 +601,17 @@ static int ossl_rsa_sync_to_pss_params_30(RSA *rsa)
* be checked, eventually.
*/
if (!ossl_rsa_pss_get_param_unverified(legacy_pss, &md, &mgf1md,
- &saltlen, &trailerField))
+ &saltlen, &trailerField))
return 0;
md_nid = EVP_MD_get_type(md);
mgf1md_nid = EVP_MD_get_type(mgf1md);
if (!ossl_rsa_pss_params_30_set_defaults(&pss_params)
|| !ossl_rsa_pss_params_30_set_hashalg(&pss_params, md_nid)
|| !ossl_rsa_pss_params_30_set_maskgenhashalg(&pss_params,
- mgf1md_nid)
+ mgf1md_nid)
|| !ossl_rsa_pss_params_30_set_saltlen(&pss_params, saltlen)
|| !ossl_rsa_pss_params_30_set_trailerfield(&pss_params,
- trailerField))
+ trailerField))
return 0;
*pss = pss_params;
}
@@ -625,8 +619,8 @@ static int ossl_rsa_sync_to_pss_params_30(RSA *rsa)
}
int ossl_rsa_pss_get_param_unverified(const RSA_PSS_PARAMS *pss,
- const EVP_MD **pmd, const EVP_MD **pmgf1md,
- int *psaltlen, int *ptrailerField)
+ const EVP_MD **pmd, const EVP_MD **pmgf1md,
+ int *psaltlen, int *ptrailerField)
{
RSA_PSS_PARAMS_30 pss_params;
@@ -680,7 +674,7 @@ int ossl_rsa_param_decode(RSA *rsa, const X509_ALGOR *alg)
}
RSA *ossl_rsa_key_from_pkcs8(const PKCS8_PRIV_KEY_INFO *p8inf,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_LIB_CTX *libctx, const char *propq)
{
const unsigned char *p;
RSA *rsa;
diff --git a/crypto/rsa/rsa_chk.c b/crypto/rsa/rsa_chk.c
index 0df254676a..5a12804f49 100644
--- a/crypto/rsa/rsa_chk.c
+++ b/crypto/rsa/rsa_chk.c
@@ -27,7 +27,7 @@ static int rsa_validate_keypair_multiprime(const RSA *key, BN_GENCB *cb)
RSA_PRIME_INFO *pinfo;
if (key->p == NULL || key->q == NULL || key->n == NULL
- || key->e == NULL || key->d == NULL) {
+ || key->e == NULL || key->d == NULL) {
ERR_raise(ERR_LIB_RSA, RSA_R_VALUE_MISSING);
return 0;
}
@@ -36,7 +36,7 @@ static int rsa_validate_keypair_multiprime(const RSA *key, BN_GENCB *cb)
if (key->version == RSA_ASN1_VERSION_MULTI) {
ex_primes = sk_RSA_PRIME_INFO_num(key->prime_infos);
if (ex_primes <= 0
- || (ex_primes + 2) > ossl_rsa_multip_cap(BN_num_bits(key->n))) {
+ || (ex_primes + 2) > ossl_rsa_multip_cap(BN_num_bits(key->n))) {
ERR_raise(ERR_LIB_RSA, RSA_R_INVALID_MULTI_PRIME_KEY);
return 0;
}
@@ -49,7 +49,7 @@ static int rsa_validate_keypair_multiprime(const RSA *key, BN_GENCB *cb)
m = BN_new();
ctx = BN_CTX_new_ex(key->libctx);
if (i == NULL || j == NULL || k == NULL || l == NULL
- || m == NULL || ctx == NULL) {
+ || m == NULL || ctx == NULL) {
ret = -1;
ERR_raise(ERR_LIB_RSA, ERR_R_BN_LIB);
goto err;
@@ -223,7 +223,7 @@ static int rsa_validate_keypair_multiprime(const RSA *key, BN_GENCB *cb)
}
}
- err:
+err:
BN_free(i);
BN_free(j);
BN_free(k);
@@ -262,8 +262,8 @@ int RSA_check_key_ex(const RSA *key, BN_GENCB *cb)
{
#ifdef FIPS_MODULE
return ossl_rsa_validate_public(key)
- && ossl_rsa_validate_private(key)
- && ossl_rsa_validate_pairwise(key);
+ && ossl_rsa_validate_private(key)
+ && ossl_rsa_validate_pairwise(key);
#else
return rsa_validate_keypair_multiprime(key, cb);
#endif /* FIPS_MODULE */
diff --git a/crypto/rsa/rsa_crpt.c b/crypto/rsa/rsa_crpt.c
index f5015a7c4b..d048d17705 100644
--- a/crypto/rsa/rsa_crpt.c
+++ b/crypto/rsa/rsa_crpt.c
@@ -31,25 +31,25 @@ int RSA_size(const RSA *r)
}
int RSA_public_encrypt(int flen, const unsigned char *from, unsigned char *to,
- RSA *rsa, int padding)
+ RSA *rsa, int padding)
{
return rsa->meth->rsa_pub_enc(flen, from, to, rsa, padding);
}
int RSA_private_encrypt(int flen, const unsigned char *from,
- unsigned char *to, RSA *rsa, int padding)
+ unsigned char *to, RSA *rsa, int padding)
{
return rsa->meth->rsa_priv_enc(flen, from, to, rsa, padding);
}
int RSA_private_decrypt(int flen, const unsigned char *from,
- unsigned char *to, RSA *rsa, int padding)
+ unsigned char *to, RSA *rsa, int padding)
{
return rsa->meth->rsa_priv_dec(flen, from, to, rsa, padding);
}
int RSA_public_decrypt(int flen, const unsigned char *from, unsigned char *to,
- RSA *rsa, int padding)
+ RSA *rsa, int padding)
{
return rsa->meth->rsa_pub_dec(flen, from, to, rsa, padding);
}
@@ -74,7 +74,7 @@ int RSA_blinding_on(RSA *rsa, BN_CTX *ctx)
}
static BIGNUM *rsa_get_public_exp(const BIGNUM *d, const BIGNUM *p,
- const BIGNUM *q, BN_CTX *ctx)
+ const BIGNUM *q, BN_CTX *ctx)
{
BIGNUM *ret = NULL, *r0, *r1, *r2;
@@ -96,7 +96,7 @@ static BIGNUM *rsa_get_public_exp(const BIGNUM *d, const BIGNUM *p,
goto err;
ret = BN_mod_inverse(NULL, d, r0, ctx);
- err:
+err:
BN_CTX_end(ctx);
return ret;
}
@@ -141,7 +141,7 @@ BN_BLINDING *RSA_setup_blinding(RSA *rsa, BN_CTX *in_ctx)
BN_with_flags(n, rsa->n, BN_FLG_CONSTTIME);
ret = BN_BLINDING_create_param(NULL, e, n, ctx, rsa->meth->bn_mod_exp,
- rsa->_method_mod_n);
+ rsa->_method_mod_n);
/* We MUST free n before any further use of rsa->n */
BN_free(n);
}
@@ -150,7 +150,7 @@ BN_BLINDING *RSA_setup_blinding(RSA *rsa, BN_CTX *in_ctx)
goto err;
}
- err:
+err:
BN_CTX_end(ctx);
if (ctx != in_ctx)
BN_CTX_free(ctx);
diff --git a/crypto/rsa/rsa_depr.c b/crypto/rsa/rsa_depr.c
index 3cc89b26a9..ad60c0fdf4 100644
--- a/crypto/rsa/rsa_depr.c
+++ b/crypto/rsa/rsa_depr.c
@@ -27,7 +27,7 @@
#include <openssl/rsa.h>
RSA *RSA_generate_key(int bits, unsigned long e_value,
- void (*callback) (int, int, void *), void *cb_arg)
+ void (*callback)(int, int, void *), void *cb_arg)
{
int i;
BN_GENCB *cb = BN_GENCB_new();
@@ -54,7 +54,7 @@ RSA *RSA_generate_key(int bits, unsigned long e_value,
BN_GENCB_free(cb);
return rsa;
}
- err:
+err:
BN_free(e);
RSA_free(rsa);
BN_GENCB_free(cb);
diff --git a/crypto/rsa/rsa_err.c b/crypto/rsa/rsa_err.c
index 269971c07b..8f20f68efe 100644
--- a/crypto/rsa/rsa_err.c
+++ b/crypto/rsa/rsa_err.c
@@ -15,143 +15,143 @@
#ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA RSA_str_reasons[] = {
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_ALGORITHM_MISMATCH), "algorithm mismatch"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_BAD_E_VALUE), "bad e value"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_BAD_FIXED_HEADER_DECRYPT),
- "bad fixed header decrypt"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_BAD_PAD_BYTE_COUNT), "bad pad byte count"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_BAD_SIGNATURE), "bad signature"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_BLOCK_TYPE_IS_NOT_01),
- "block type is not 01"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_BLOCK_TYPE_IS_NOT_02),
- "block type is not 02"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_DATA_GREATER_THAN_MOD_LEN),
- "data greater than mod len"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_DATA_TOO_LARGE), "data too large"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE),
- "data too large for key size"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_DATA_TOO_LARGE_FOR_MODULUS),
- "data too large for modulus"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_DATA_TOO_SMALL), "data too small"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_DATA_TOO_SMALL_FOR_KEY_SIZE),
- "data too small for key size"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_DIGEST_DOES_NOT_MATCH),
- "digest does not match"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_DIGEST_NOT_ALLOWED), "digest not allowed"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_DIGEST_TOO_BIG_FOR_RSA_KEY),
- "digest too big for rsa key"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_DMP1_NOT_CONGRUENT_TO_D),
- "dmp1 not congruent to d"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_DMQ1_NOT_CONGRUENT_TO_D),
- "dmq1 not congruent to d"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_D_E_NOT_CONGRUENT_TO_1),
- "d e not congruent to 1"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_FIRST_OCTET_INVALID),
- "first octet invalid"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_ILLEGAL_OR_UNSUPPORTED_PADDING_MODE),
- "illegal or unsupported padding mode"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_DIGEST), "invalid digest"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_DIGEST_LENGTH),
- "invalid digest length"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_HEADER), "invalid header"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_KEYPAIR), "invalid keypair"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_KEY_LENGTH), "invalid key length"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_LABEL), "invalid label"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_LENGTH), "invalid length"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_MESSAGE_LENGTH),
- "invalid message length"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_MGF1_MD), "invalid mgf1 md"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_MODULUS), "invalid modulus"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_MULTI_PRIME_KEY),
- "invalid multi prime key"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_OAEP_PARAMETERS),
- "invalid oaep parameters"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_PADDING), "invalid padding"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_PADDING_MODE),
- "invalid padding mode"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_PSS_PARAMETERS),
- "invalid pss parameters"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_PSS_SALTLEN),
- "invalid pss saltlen"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_REQUEST), "invalid request"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_SALT_LENGTH),
- "invalid salt length"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_STRENGTH), "invalid strength"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_TRAILER), "invalid trailer"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_X931_DIGEST),
- "invalid x931 digest"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_IQMP_NOT_INVERSE_OF_Q),
- "iqmp not inverse of q"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_KEY_PRIME_NUM_INVALID),
- "key prime num invalid"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_KEY_SIZE_TOO_SMALL), "key size too small"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_LAST_OCTET_INVALID), "last octet invalid"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_MGF1_DIGEST_NOT_ALLOWED),
- "mgf1 digest not allowed"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_MISSING_PRIVATE_KEY),
- "missing private key"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_MODULUS_TOO_LARGE), "modulus too large"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_MP_COEFFICIENT_NOT_INVERSE_OF_R),
- "mp coefficient not inverse of r"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_MP_EXPONENT_NOT_CONGRUENT_TO_D),
- "mp exponent not congruent to d"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_MP_R_NOT_PRIME), "mp r not prime"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_NO_PUBLIC_EXPONENT), "no public exponent"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_NULL_BEFORE_BLOCK_MISSING),
- "null before block missing"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_N_DOES_NOT_EQUAL_PRODUCT_OF_PRIMES),
- "n does not equal product of primes"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_N_DOES_NOT_EQUAL_P_Q),
- "n does not equal p q"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_OAEP_DECODING_ERROR),
- "oaep decoding error"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE),
- "operation not supported for this keytype"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_PADDING_CHECK_FAILED),
- "padding check failed"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_PAIRWISE_TEST_FAILURE),
- "pairwise test failure"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_PKCS_DECODING_ERROR),
- "pkcs decoding error"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_PSS_SALTLEN_TOO_SMALL),
- "pss saltlen too small"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_PUB_EXPONENT_OUT_OF_RANGE),
- "pub exponent out of range"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_P_NOT_PRIME), "p not prime"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_Q_NOT_PRIME), "q not prime"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_RANDOMNESS_SOURCE_STRENGTH_INSUFFICIENT),
- "randomness source strength insufficient"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_RSA_OPERATIONS_NOT_SUPPORTED),
- "rsa operations not supported"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_SLEN_CHECK_FAILED),
- "salt length check failed"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_SLEN_RECOVERY_FAILED),
- "salt length recovery failed"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_SSLV3_ROLLBACK_ATTACK),
- "sslv3 rollback attack"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD),
- "the asn1 object identifier is not known for this md"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_UNKNOWN_ALGORITHM_TYPE),
- "unknown algorithm type"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_UNKNOWN_DIGEST), "unknown digest"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_UNKNOWN_MASK_DIGEST),
- "unknown mask digest"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_UNKNOWN_PADDING_TYPE),
- "unknown padding type"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_UNSUPPORTED_ENCRYPTION_TYPE),
- "unsupported encryption type"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_UNSUPPORTED_LABEL_SOURCE),
- "unsupported label source"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_UNSUPPORTED_MASK_ALGORITHM),
- "unsupported mask algorithm"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_UNSUPPORTED_MASK_PARAMETER),
- "unsupported mask parameter"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_UNSUPPORTED_SIGNATURE_TYPE),
- "unsupported signature type"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_VALUE_MISSING), "value missing"},
- {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_WRONG_SIGNATURE_LENGTH),
- "wrong signature length"},
- {0, NULL}
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_ALGORITHM_MISMATCH), "algorithm mismatch" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_BAD_E_VALUE), "bad e value" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_BAD_FIXED_HEADER_DECRYPT),
+ "bad fixed header decrypt" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_BAD_PAD_BYTE_COUNT), "bad pad byte count" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_BAD_SIGNATURE), "bad signature" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_BLOCK_TYPE_IS_NOT_01),
+ "block type is not 01" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_BLOCK_TYPE_IS_NOT_02),
+ "block type is not 02" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_DATA_GREATER_THAN_MOD_LEN),
+ "data greater than mod len" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_DATA_TOO_LARGE), "data too large" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE),
+ "data too large for key size" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_DATA_TOO_LARGE_FOR_MODULUS),
+ "data too large for modulus" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_DATA_TOO_SMALL), "data too small" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_DATA_TOO_SMALL_FOR_KEY_SIZE),
+ "data too small for key size" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_DIGEST_DOES_NOT_MATCH),
+ "digest does not match" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_DIGEST_NOT_ALLOWED), "digest not allowed" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_DIGEST_TOO_BIG_FOR_RSA_KEY),
+ "digest too big for rsa key" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_DMP1_NOT_CONGRUENT_TO_D),
+ "dmp1 not congruent to d" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_DMQ1_NOT_CONGRUENT_TO_D),
+ "dmq1 not congruent to d" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_D_E_NOT_CONGRUENT_TO_1),
+ "d e not congruent to 1" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_FIRST_OCTET_INVALID),
+ "first octet invalid" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_ILLEGAL_OR_UNSUPPORTED_PADDING_MODE),
+ "illegal or unsupported padding mode" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_DIGEST), "invalid digest" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_DIGEST_LENGTH),
+ "invalid digest length" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_HEADER), "invalid header" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_KEYPAIR), "invalid keypair" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_KEY_LENGTH), "invalid key length" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_LABEL), "invalid label" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_LENGTH), "invalid length" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_MESSAGE_LENGTH),
+ "invalid message length" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_MGF1_MD), "invalid mgf1 md" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_MODULUS), "invalid modulus" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_MULTI_PRIME_KEY),
+ "invalid multi prime key" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_OAEP_PARAMETERS),
+ "invalid oaep parameters" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_PADDING), "invalid padding" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_PADDING_MODE),
+ "invalid padding mode" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_PSS_PARAMETERS),
+ "invalid pss parameters" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_PSS_SALTLEN),
+ "invalid pss saltlen" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_REQUEST), "invalid request" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_SALT_LENGTH),
+ "invalid salt length" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_STRENGTH), "invalid strength" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_TRAILER), "invalid trailer" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_X931_DIGEST),
+ "invalid x931 digest" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_IQMP_NOT_INVERSE_OF_Q),
+ "iqmp not inverse of q" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_KEY_PRIME_NUM_INVALID),
+ "key prime num invalid" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_KEY_SIZE_TOO_SMALL), "key size too small" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_LAST_OCTET_INVALID), "last octet invalid" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_MGF1_DIGEST_NOT_ALLOWED),
+ "mgf1 digest not allowed" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_MISSING_PRIVATE_KEY),
+ "missing private key" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_MODULUS_TOO_LARGE), "modulus too large" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_MP_COEFFICIENT_NOT_INVERSE_OF_R),
+ "mp coefficient not inverse of r" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_MP_EXPONENT_NOT_CONGRUENT_TO_D),
+ "mp exponent not congruent to d" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_MP_R_NOT_PRIME), "mp r not prime" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_NO_PUBLIC_EXPONENT), "no public exponent" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_NULL_BEFORE_BLOCK_MISSING),
+ "null before block missing" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_N_DOES_NOT_EQUAL_PRODUCT_OF_PRIMES),
+ "n does not equal product of primes" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_N_DOES_NOT_EQUAL_P_Q),
+ "n does not equal p q" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_OAEP_DECODING_ERROR),
+ "oaep decoding error" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE),
+ "operation not supported for this keytype" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_PADDING_CHECK_FAILED),
+ "padding check failed" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_PAIRWISE_TEST_FAILURE),
+ "pairwise test failure" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_PKCS_DECODING_ERROR),
+ "pkcs decoding error" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_PSS_SALTLEN_TOO_SMALL),
+ "pss saltlen too small" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_PUB_EXPONENT_OUT_OF_RANGE),
+ "pub exponent out of range" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_P_NOT_PRIME), "p not prime" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_Q_NOT_PRIME), "q not prime" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_RANDOMNESS_SOURCE_STRENGTH_INSUFFICIENT),
+ "randomness source strength insufficient" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_RSA_OPERATIONS_NOT_SUPPORTED),
+ "rsa operations not supported" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_SLEN_CHECK_FAILED),
+ "salt length check failed" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_SLEN_RECOVERY_FAILED),
+ "salt length recovery failed" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_SSLV3_ROLLBACK_ATTACK),
+ "sslv3 rollback attack" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD),
+ "the asn1 object identifier is not known for this md" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_UNKNOWN_ALGORITHM_TYPE),
+ "unknown algorithm type" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_UNKNOWN_DIGEST), "unknown digest" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_UNKNOWN_MASK_DIGEST),
+ "unknown mask digest" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_UNKNOWN_PADDING_TYPE),
+ "unknown padding type" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_UNSUPPORTED_ENCRYPTION_TYPE),
+ "unsupported encryption type" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_UNSUPPORTED_LABEL_SOURCE),
+ "unsupported label source" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_UNSUPPORTED_MASK_ALGORITHM),
+ "unsupported mask algorithm" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_UNSUPPORTED_MASK_PARAMETER),
+ "unsupported mask parameter" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_UNSUPPORTED_SIGNATURE_TYPE),
+ "unsupported signature type" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_VALUE_MISSING), "value missing" },
+ { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_WRONG_SIGNATURE_LENGTH),
+ "wrong signature length" },
+ { 0, NULL }
};
#endif
diff --git a/crypto/rsa/rsa_gen.c b/crypto/rsa/rsa_gen.c
index 064e675713..ecc0b1b829 100644
--- a/crypto/rsa/rsa_gen.c
+++ b/crypto/rsa/rsa_gen.c
@@ -29,8 +29,8 @@
static int rsa_keygen_pairwise_test(RSA *rsa, OSSL_CALLBACK *cb, void *cbarg);
static int rsa_keygen(OSSL_LIB_CTX *libctx, RSA *rsa, int bits, int primes,
- BIGNUM *e_value, BN_GENCB *cb, int pairwise_test,
- uint32_t a, uint32_t b);
+ BIGNUM *e_value, BN_GENCB *cb, int pairwise_test,
+ uint32_t a, uint32_t b);
/*
* NB: this wrapper would normally be placed in rsa_lib.c and the static
@@ -45,18 +45,18 @@ int RSA_generate_key_ex(RSA *rsa, int bits, BIGNUM *e_value, BN_GENCB *cb)
return rsa->meth->rsa_keygen(rsa, bits, e_value, cb);
return RSA_generate_multi_prime_key(rsa, bits, RSA_DEFAULT_PRIME_NUM,
- e_value, cb);
+ e_value, cb);
}
int ossl_rsa_generate_multi_prime_key(RSA *rsa, int bits, int primes,
- BIGNUM *e_value, BN_GENCB *cb,
- uint32_t a, uint32_t b)
+ BIGNUM *e_value, BN_GENCB *cb,
+ uint32_t a, uint32_t b)
{
#ifndef FIPS_MODULE
/* multi-prime is only supported with the builtin key generation */
if (rsa->meth->rsa_multi_prime_keygen != NULL) {
return rsa->meth->rsa_multi_prime_keygen(rsa, bits, primes,
- e_value, cb);
+ e_value, cb);
} else if (rsa->meth->rsa_keygen != NULL) {
/*
* However, if rsa->meth implements only rsa_keygen, then we
@@ -74,7 +74,7 @@ int ossl_rsa_generate_multi_prime_key(RSA *rsa, int bits, int primes,
}
int RSA_generate_multi_prime_key(RSA *rsa, int bits, int primes,
- BIGNUM *e, BN_GENCB *cb)
+ BIGNUM *e, BN_GENCB *cb)
{
return ossl_rsa_generate_multi_prime_key(rsa, bits, primes, e, cb, 0, 0);
}
@@ -88,10 +88,10 @@ DEFINE_STACK_OF(BIGNUM)
*/
#ifndef FIPS_MODULE
int ossl_rsa_multiprime_derive(RSA *rsa, int bits, int primes,
- BIGNUM *e_value,
- STACK_OF(BIGNUM) *factors,
- STACK_OF(BIGNUM) *exps,
- STACK_OF(BIGNUM) *coeffs)
+ BIGNUM *e_value,
+ STACK_OF(BIGNUM) *factors,
+ STACK_OF(BIGNUM) *exps,
+ STACK_OF(BIGNUM) *coeffs)
{
STACK_OF(BIGNUM) *pplist = NULL, *pdlist = NULL;
BIGNUM *factor = NULL, *newpp = NULL, *newpd = NULL;
@@ -233,7 +233,8 @@ int ossl_rsa_multiprime_derive(RSA *rsa, int bits, int primes,
goto err;
if (BN_mod_inverse(iqmp, sk_BIGNUM_value(factors, 1),
- sk_BIGNUM_value(factors, 0), ctx) == NULL)
+ sk_BIGNUM_value(factors, 0), ctx)
+ == NULL)
goto err;
if (!sk_BIGNUM_insert(coeffs, iqmp, sk_BIGNUM_num(coeffs)))
goto err;
@@ -245,7 +246,8 @@ int ossl_rsa_multiprime_derive(RSA *rsa, int bits, int primes,
if (newcoeff == NULL)
goto err;
if (BN_mod_inverse(newcoeff, newpp, sk_BIGNUM_value(factors, i),
- ctx) == NULL)
+ ctx)
+ == NULL)
goto err;
if (!sk_BIGNUM_insert(coeffs, newcoeff, sk_BIGNUM_num(coeffs)))
goto err;
@@ -253,7 +255,7 @@ int ossl_rsa_multiprime_derive(RSA *rsa, int bits, int primes,
}
ret = 1;
- err:
+err:
BN_free(newcoeff);
BN_free(newexp);
BN_free(dval);
@@ -269,7 +271,7 @@ int ossl_rsa_multiprime_derive(RSA *rsa, int bits, int primes,
}
static int rsa_multiprime_keygen(RSA *rsa, int bits, int primes,
- BIGNUM *e_value, BN_GENCB *cb)
+ BIGNUM *e_value, BN_GENCB *cb)
{
BIGNUM *r0 = NULL, *r1 = NULL, *r2 = NULL, *tmp, *tmp2, *prime;
int n = 0, bitsr[RSA_MAX_PRIME_NUM], bitse = 0;
@@ -358,7 +360,7 @@ static int rsa_multiprime_keygen(RSA *rsa, int bits, int primes,
if (rsa->prime_infos != NULL) {
/* could this happen? */
sk_RSA_PRIME_INFO_pop_free(rsa->prime_infos,
- ossl_rsa_multip_info_free);
+ ossl_rsa_multip_info_free);
}
rsa->prime_infos = prime_infos;
@@ -390,9 +392,9 @@ static int rsa_multiprime_keygen(RSA *rsa, int bits, int primes,
BN_set_flags(prime, BN_FLG_CONSTTIME);
for (;;) {
- redo:
+ redo:
if (!BN_generate_prime_ex2(prime, bitsr[i] + adj, 0, NULL, NULL,
- cb, ctx))
+ cb, ctx))
goto err;
/*
* prime should not be equal to p, q, r_3...
@@ -410,7 +412,8 @@ static int rsa_multiprime_keygen(RSA *rsa, int bits, int primes,
prev_prime = rsa->q;
else
prev_prime = sk_RSA_PRIME_INFO_value(prime_infos,
- j - 2)->r;
+ j - 2)
+ ->r;
if (!BN_cmp(prime, prev_prime)) {
goto redo;
@@ -559,15 +562,14 @@ static int rsa_multiprime_keygen(RSA *rsa, int bits, int primes,
goto err;
}
-
BN_set_flags(r0, BN_FLG_CONSTTIME);
if (BN_mod_inverse(rsa->d, rsa->e, r0, ctx) == NULL) {
- goto err; /* d */
+ goto err; /* d */
}
/* derive any missing exponents and coefficients */
if (!ossl_rsa_multiprime_derive(rsa, bits, primes, e_value,
- factors, exps, coeffs))
+ factors, exps, coeffs))
goto err;
/*
@@ -575,7 +577,7 @@ static int rsa_multiprime_keygen(RSA *rsa, int bits, int primes,
* and the first coeff is in iqmp, so pop those off the stack
* Note, the first 2 factors/exponents are already tracked by p and q
* assign dmp1/dmq1 and iqmp
- * the remaining pinfo values are separately allocated, so copy and delete
+ * the remaining pinfo values are separately allocated, so copy and delete
* those
*/
BN_clear_free(sk_BIGNUM_delete(factors, 0));
@@ -600,7 +602,7 @@ static int rsa_multiprime_keygen(RSA *rsa, int bits, int primes,
goto err;
}
ok = 1;
- err:
+err:
sk_BIGNUM_free(factors);
sk_BIGNUM_free(exps);
sk_BIGNUM_free(coeffs);
@@ -615,8 +617,8 @@ static int rsa_multiprime_keygen(RSA *rsa, int bits, int primes,
#endif /* FIPS_MODULE */
static int rsa_keygen(OSSL_LIB_CTX *libctx, RSA *rsa, int bits, int primes,
- BIGNUM *e_value, BN_GENCB *cb, int pairwise_test,
- uint32_t a, uint32_t b)
+ BIGNUM *e_value, BN_GENCB *cb, int pairwise_test,
+ uint32_t a, uint32_t b)
{
int ok = 0;
@@ -629,8 +631,8 @@ static int rsa_keygen(OSSL_LIB_CTX *libctx, RSA *rsa, int bits, int primes,
* public exponent <= 2^16 will use the older rsa_multiprime_keygen().
*/
if (primes == 2
- && bits >= 2048
- && (e_value == NULL || BN_num_bits(e_value) > 16))
+ && bits >= 2048
+ && (e_value == NULL || BN_num_bits(e_value) > 16))
ok = ossl_rsa_sp800_56b_generate_key(rsa, bits, e_value, cb, a, b);
else
ok = rsa_multiprime_keygen(rsa, bits, primes, e_value, cb);
@@ -704,7 +706,7 @@ static int rsa_keygen_pairwise_test(RSA *rsa, OSSL_CALLBACK *cb, void *cbarg)
if (st == NULL)
goto err;
OSSL_SELF_TEST_onbegin(st, OSSL_SELF_TEST_TYPE_PCT,
- OSSL_SELF_TEST_DESC_PCT_RSA);
+ OSSL_SELF_TEST_DESC_PCT_RSA);
/*
* For RSA_NO_PADDING, RSA_public_encrypt() and RSA_private_decrypt()
@@ -723,16 +725,16 @@ static int rsa_keygen_pairwise_test(RSA *rsa, OSSL_CALLBACK *cb, void *cbarg)
plaintxt[plaintxt_len - 1] = 2;
ciphertxt_len = RSA_public_encrypt(plaintxt_len, plaintxt, ciphertxt, rsa,
- padding);
+ padding);
if (ciphertxt_len <= 0)
goto err;
OSSL_SELF_TEST_oncorrupt_byte(st, ciphertxt);
decoded_len = RSA_private_decrypt(ciphertxt_len, ciphertxt, decoded, rsa,
- padding);
+ padding);
if (decoded_len != plaintxt_len
- || memcmp(decoded, plaintxt, decoded_len) != 0)
+ || memcmp(decoded, plaintxt, decoded_len) != 0)
goto err;
ret = 1;
diff --git a/crypto/rsa/rsa_lib.c b/crypto/rsa/rsa_lib.c
index 2484b1ca71..2781cf82d2 100644
--- a/crypto/rsa/rsa_lib.c
+++ b/crypto/rsa/rsa_lib.c
@@ -109,7 +109,7 @@ static RSA *rsa_new_intern(OSSL_LIB_CTX *libctx)
return ret;
- err:
+err:
RSA_free(ret);
return NULL;
}
@@ -209,10 +209,10 @@ static const unsigned int scale = 1 << 18;
static const unsigned int cbrt_scale = 1 << (2 * 18 / 3);
/* Define some constants, none exceed 32 bits */
-static const unsigned int log_2 = 0x02c5c8; /* scale * log(2) */
-static const unsigned int log_e = 0x05c551; /* scale * log2(M_E) */
-static const unsigned int c1_923 = 0x07b126; /* scale * 1.923 */
-static const unsigned int c4_690 = 0x12c28f; /* scale * 4.690 */
+static const unsigned int log_2 = 0x02c5c8; /* scale * log(2) */
+static const unsigned int log_e = 0x05c551; /* scale * log2(M_E) */
+static const unsigned int c1_923 = 0x07b126; /* scale * 1.923 */
+static const unsigned int c4_690 = 0x12c28f; /* scale * 4.690 */
/*
* Multiply two scaled integers together and rescale the result.
@@ -308,19 +308,19 @@ uint16_t ossl_ifc_ffc_compute_security_bits(int n)
* the standards but are defined to be canonical.
*/
switch (n) {
- case 2048: /* SP 800-56B rev 2 Appendix D and FIPS 140-2 IG 7.5 */
+ case 2048: /* SP 800-56B rev 2 Appendix D and FIPS 140-2 IG 7.5 */
return 112;
- case 3072: /* SP 800-56B rev 2 Appendix D and FIPS 140-2 IG 7.5 */
+ case 3072: /* SP 800-56B rev 2 Appendix D and FIPS 140-2 IG 7.5 */
return 128;
- case 4096: /* SP 800-56B rev 2 Appendix D */
+ case 4096: /* SP 800-56B rev 2 Appendix D */
return 152;
- case 6144: /* SP 800-56B rev 2 Appendix D */
+ case 6144: /* SP 800-56B rev 2 Appendix D */
return 176;
- case 7680: /* FIPS 140-2 IG 7.5 */
+ case 7680: /* FIPS 140-2 IG 7.5 */
return 192;
- case 8192: /* SP 800-56B rev 2 Appendix D */
+ case 8192: /* SP 800-56B rev 2 Appendix D */
return 200;
- case 15360: /* FIPS 140-2 IG 7.5 */
+ case 15360: /* FIPS 140-2 IG 7.5 */
return 256;
}
@@ -350,15 +350,13 @@ uint16_t ossl_ifc_ffc_compute_security_bits(int n)
x = n * (uint64_t)log_2;
lx = ilog_e(x);
y = (uint16_t)((mul2(c1_923, icbrt64(mul2(mul2(x, lx), lx))) - c4_690)
- / log_2);
+ / log_2);
y = (y + 4) & ~7;
if (y > cap)
y = cap;
return y;
}
-
-
int RSA_security_bits(const RSA *rsa)
{
int bits = BN_num_bits(rsa->n);
@@ -463,7 +461,7 @@ int RSA_set0_crt_params(RSA *r, BIGNUM *dmp1, BIGNUM *dmq1, BIGNUM *iqmp)
* and related functions to let user pass a triplet?
*/
int RSA_set0_multi_prime_params(RSA *r, BIGNUM *primes[], BIGNUM *exps[],
- BIGNUM *coeffs[], int pnum)
+ BIGNUM *coeffs[], int pnum)
{
STACK_OF(RSA_PRIME_INFO) *prime_infos, *old = NULL;
RSA_PRIME_INFO *pinfo;
@@ -521,7 +519,7 @@ int RSA_set0_multi_prime_params(RSA *r, BIGNUM *primes[], BIGNUM *exps[],
r->dirty_cnt++;
return 1;
- err:
+err:
/* r, d, t should not be freed */
sk_RSA_PRIME_INFO_pop_free(prime_infos, ossl_rsa_multip_info_free_ex);
return 0;
@@ -529,7 +527,7 @@ int RSA_set0_multi_prime_params(RSA *r, BIGNUM *primes[], BIGNUM *exps[],
#endif
void RSA_get0_key(const RSA *r,
- const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
+ const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
{
if (n != NULL)
*n = r->n;
@@ -580,8 +578,8 @@ int RSA_get0_multi_prime_factors(const RSA *r, const BIGNUM *primes[])
#endif
void RSA_get0_crt_params(const RSA *r,
- const BIGNUM **dmp1, const BIGNUM **dmq1,
- const BIGNUM **iqmp)
+ const BIGNUM **dmp1, const BIGNUM **dmq1,
+ const BIGNUM **iqmp)
{
if (dmp1 != NULL)
*dmp1 = r->dmp1;
@@ -593,7 +591,7 @@ void RSA_get0_crt_params(const RSA *r,
#ifndef FIPS_MODULE
int RSA_get0_multi_prime_crt_params(const RSA *r, const BIGNUM *exps[],
- const BIGNUM *coeffs[])
+ const BIGNUM *coeffs[])
{
int pnum;
@@ -715,7 +713,7 @@ int RSA_pkey_ctx_ctrl(EVP_PKEY_CTX *ctx, int optype, int cmd, int p1, void *p2)
&& ctx->pmeth->pkey_id != EVP_PKEY_RSA
&& ctx->pmeth->pkey_id != EVP_PKEY_RSA_PSS)
return -1;
- return EVP_PKEY_CTX_ctrl(ctx, -1, optype, cmd, p1, p2);
+ return EVP_PKEY_CTX_ctrl(ctx, -1, optype, cmd, p1, p2);
}
#endif
@@ -726,8 +724,8 @@ DEFINE_STACK_OF(BIGNUM)
* stack values as they are consumed and set in the RSA key.
*/
int ossl_rsa_set0_all_params(RSA *r, STACK_OF(BIGNUM) *primes,
- STACK_OF(BIGNUM) *exps,
- STACK_OF(BIGNUM) *coeffs)
+ STACK_OF(BIGNUM) *exps,
+ STACK_OF(BIGNUM) *coeffs)
{
#ifndef FIPS_MODULE
STACK_OF(RSA_PRIME_INFO) *prime_infos, *old_infos = NULL;
@@ -744,7 +742,7 @@ int ossl_rsa_set0_all_params(RSA *r, STACK_OF(BIGNUM) *primes,
return 0;
if (!RSA_set0_factors(r, sk_BIGNUM_value(primes, 0),
- sk_BIGNUM_value(primes, 1)))
+ sk_BIGNUM_value(primes, 1)))
return 0;
/*
@@ -762,9 +760,9 @@ int ossl_rsa_set0_all_params(RSA *r, STACK_OF(BIGNUM) *primes,
&& pnum == sk_BIGNUM_num(coeffs) + 1) {
if (!RSA_set0_crt_params(r, sk_BIGNUM_value(exps, 0),
- sk_BIGNUM_value(exps, 1),
- sk_BIGNUM_value(coeffs, 0)))
- return 0;
+ sk_BIGNUM_value(exps, 1),
+ sk_BIGNUM_value(coeffs, 0)))
+ return 0;
/* as above, once we consume the above params, delete them from the list */
sk_BIGNUM_delete(exps, 0);
@@ -834,7 +832,7 @@ int ossl_rsa_set0_all_params(RSA *r, STACK_OF(BIGNUM) *primes,
return 1;
#ifndef FIPS_MODULE
- err:
+err:
/* r, d, t should not be freed */
sk_RSA_PRIME_INFO_pop_free(prime_infos, ossl_rsa_multip_info_free_ex);
return 0;
@@ -844,8 +842,8 @@ int ossl_rsa_set0_all_params(RSA *r, STACK_OF(BIGNUM) *primes,
DEFINE_SPECIAL_STACK_OF_CONST(BIGNUM_const, BIGNUM)
int ossl_rsa_get0_all_params(RSA *r, STACK_OF(BIGNUM_const) *primes,
- STACK_OF(BIGNUM_const) *exps,
- STACK_OF(BIGNUM_const) *coeffs)
+ STACK_OF(BIGNUM_const) *exps,
+ STACK_OF(BIGNUM_const) *coeffs)
{
#ifndef FIPS_MODULE
RSA_PRIME_INFO *pinfo;
@@ -878,7 +876,7 @@ int ossl_rsa_get0_all_params(RSA *r, STACK_OF(BIGNUM_const) *primes,
return 1;
}
-#define safe_BN_num_bits(_k_) (((_k_) == NULL) ? 0 : BN_num_bits((_k_)))
+#define safe_BN_num_bits(_k_) (((_k_) == NULL) ? 0 : BN_num_bits((_k_)))
int ossl_rsa_check_factors(RSA *r)
{
int valid = 0;
@@ -931,11 +929,11 @@ done:
#ifndef FIPS_MODULE
/* Helpers to set or get diverse hash algorithm names */
static int int_set_rsa_md_name(EVP_PKEY_CTX *ctx,
- /* For checks */
- int keytype, int optype,
- /* For EVP_PKEY_CTX_set_params() */
- const char *mdkey, const char *mdname,
- const char *propkey, const char *mdprops)
+ /* For checks */
+ int keytype, int optype,
+ /* For EVP_PKEY_CTX_set_params() */
+ const char *mdkey, const char *mdname,
+ const char *propkey, const char *mdprops)
{
OSSL_PARAM params[3], *p = params;
@@ -971,11 +969,11 @@ static int int_set_rsa_md_name(EVP_PKEY_CTX *ctx,
/* Helpers to set or get diverse hash algorithm names */
static int int_get_rsa_md_name(EVP_PKEY_CTX *ctx,
- /* For checks */
- int keytype, int optype,
- /* For EVP_PKEY_CTX_get_params() */
- const char *mdkey,
- char *mdname, size_t mdnamesize)
+ /* For checks */
+ int keytype, int optype,
+ /* For EVP_PKEY_CTX_get_params() */
+ const char *mdkey,
+ char *mdname, size_t mdnamesize)
{
OSSL_PARAM params[2], *p = params;
@@ -1012,7 +1010,7 @@ static int int_get_rsa_md_name(EVP_PKEY_CTX *ctx,
int EVP_PKEY_CTX_set_rsa_padding(EVP_PKEY_CTX *ctx, int pad_mode)
{
return RSA_pkey_ctx_ctrl(ctx, -1, EVP_PKEY_CTRL_RSA_PADDING,
- pad_mode, NULL);
+ pad_mode, NULL);
}
/*
@@ -1022,7 +1020,7 @@ int EVP_PKEY_CTX_set_rsa_padding(EVP_PKEY_CTX *ctx, int pad_mode)
int EVP_PKEY_CTX_get_rsa_padding(EVP_PKEY_CTX *ctx, int *pad_mode)
{
return RSA_pkey_ctx_ctrl(ctx, -1, EVP_PKEY_CTRL_GET_RSA_PADDING,
- 0, pad_mode);
+ 0, pad_mode);
}
/*
@@ -1032,16 +1030,16 @@ int EVP_PKEY_CTX_get_rsa_padding(EVP_PKEY_CTX *ctx, int *pad_mode)
int EVP_PKEY_CTX_set_rsa_pss_keygen_md(EVP_PKEY_CTX *ctx, const EVP_MD *md)
{
return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA_PSS, EVP_PKEY_OP_KEYGEN,
- EVP_PKEY_CTRL_MD, 0, (void *)(md));
+ EVP_PKEY_CTRL_MD, 0, (void *)(md));
}
int EVP_PKEY_CTX_set_rsa_pss_keygen_md_name(EVP_PKEY_CTX *ctx,
- const char *mdname,
- const char *mdprops)
+ const char *mdname,
+ const char *mdprops)
{
return int_set_rsa_md_name(ctx, EVP_PKEY_RSA_PSS, EVP_PKEY_OP_KEYGEN,
- OSSL_PKEY_PARAM_RSA_DIGEST, mdname,
- OSSL_PKEY_PARAM_RSA_DIGEST_PROPS, mdprops);
+ OSSL_PKEY_PARAM_RSA_DIGEST, mdname,
+ OSSL_PKEY_PARAM_RSA_DIGEST_PROPS, mdprops);
}
/*
@@ -1055,24 +1053,23 @@ int EVP_PKEY_CTX_set_rsa_oaep_md(EVP_PKEY_CTX *ctx, const EVP_MD *md)
return -1;
return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_TYPE_CRYPT,
- EVP_PKEY_CTRL_RSA_OAEP_MD, 0, (void *)(md));
+ EVP_PKEY_CTRL_RSA_OAEP_MD, 0, (void *)(md));
}
int EVP_PKEY_CTX_set_rsa_oaep_md_name(EVP_PKEY_CTX *ctx, const char *mdname,
- const char *mdprops)
+ const char *mdprops)
{
- return
- int_set_rsa_md_name(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_TYPE_CRYPT,
- OSSL_ASYM_CIPHER_PARAM_OAEP_DIGEST, mdname,
- OSSL_ASYM_CIPHER_PARAM_OAEP_DIGEST_PROPS, mdprops);
+ return int_set_rsa_md_name(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_TYPE_CRYPT,
+ OSSL_ASYM_CIPHER_PARAM_OAEP_DIGEST, mdname,
+ OSSL_ASYM_CIPHER_PARAM_OAEP_DIGEST_PROPS, mdprops);
}
int EVP_PKEY_CTX_get_rsa_oaep_md_name(EVP_PKEY_CTX *ctx, char *name,
- size_t namesize)
+ size_t namesize)
{
return int_get_rsa_md_name(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_TYPE_CRYPT,
- OSSL_ASYM_CIPHER_PARAM_OAEP_DIGEST,
- name, namesize);
+ OSSL_ASYM_CIPHER_PARAM_OAEP_DIGEST,
+ name, namesize);
}
/*
@@ -1086,7 +1083,7 @@ int EVP_PKEY_CTX_get_rsa_oaep_md(EVP_PKEY_CTX *ctx, const EVP_MD **md)
return -1;
return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_TYPE_CRYPT,
- EVP_PKEY_CTRL_GET_RSA_OAEP_MD, 0, (void *)md);
+ EVP_PKEY_CTRL_GET_RSA_OAEP_MD, 0, (void *)md);
}
/*
@@ -1096,24 +1093,24 @@ int EVP_PKEY_CTX_get_rsa_oaep_md(EVP_PKEY_CTX *ctx, const EVP_MD **md)
int EVP_PKEY_CTX_set_rsa_mgf1_md(EVP_PKEY_CTX *ctx, const EVP_MD *md)
{
return RSA_pkey_ctx_ctrl(ctx, EVP_PKEY_OP_TYPE_SIG | EVP_PKEY_OP_TYPE_CRYPT,
- EVP_PKEY_CTRL_RSA_MGF1_MD, 0, (void *)(md));
+ EVP_PKEY_CTRL_RSA_MGF1_MD, 0, (void *)(md));
}
int EVP_PKEY_CTX_set_rsa_mgf1_md_name(EVP_PKEY_CTX *ctx, const char *mdname,
- const char *mdprops)
+ const char *mdprops)
{
return int_set_rsa_md_name(ctx, -1,
- EVP_PKEY_OP_TYPE_CRYPT | EVP_PKEY_OP_TYPE_SIG,
- OSSL_PKEY_PARAM_MGF1_DIGEST, mdname,
- OSSL_PKEY_PARAM_MGF1_PROPERTIES, mdprops);
+ EVP_PKEY_OP_TYPE_CRYPT | EVP_PKEY_OP_TYPE_SIG,
+ OSSL_PKEY_PARAM_MGF1_DIGEST, mdname,
+ OSSL_PKEY_PARAM_MGF1_PROPERTIES, mdprops);
}
int EVP_PKEY_CTX_get_rsa_mgf1_md_name(EVP_PKEY_CTX *ctx, char *name,
- size_t namesize)
+ size_t namesize)
{
return int_get_rsa_md_name(ctx, -1,
- EVP_PKEY_OP_TYPE_CRYPT | EVP_PKEY_OP_TYPE_SIG,
- OSSL_PKEY_PARAM_MGF1_DIGEST, name, namesize);
+ EVP_PKEY_OP_TYPE_CRYPT | EVP_PKEY_OP_TYPE_SIG,
+ OSSL_PKEY_PARAM_MGF1_DIGEST, name, namesize);
}
/*
@@ -1123,15 +1120,15 @@ int EVP_PKEY_CTX_get_rsa_mgf1_md_name(EVP_PKEY_CTX *ctx, char *name,
int EVP_PKEY_CTX_set_rsa_pss_keygen_mgf1_md(EVP_PKEY_CTX *ctx, const EVP_MD *md)
{
return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA_PSS, EVP_PKEY_OP_KEYGEN,
- EVP_PKEY_CTRL_RSA_MGF1_MD, 0, (void *)(md));
+ EVP_PKEY_CTRL_RSA_MGF1_MD, 0, (void *)(md));
}
int EVP_PKEY_CTX_set_rsa_pss_keygen_mgf1_md_name(EVP_PKEY_CTX *ctx,
- const char *mdname)
+ const char *mdname)
{
return int_set_rsa_md_name(ctx, EVP_PKEY_RSA_PSS, EVP_PKEY_OP_KEYGEN,
- OSSL_PKEY_PARAM_MGF1_DIGEST, mdname,
- NULL, NULL);
+ OSSL_PKEY_PARAM_MGF1_DIGEST, mdname,
+ NULL, NULL);
}
/*
@@ -1141,7 +1138,7 @@ int EVP_PKEY_CTX_set_rsa_pss_keygen_mgf1_md_name(EVP_PKEY_CTX *ctx,
int EVP_PKEY_CTX_get_rsa_mgf1_md(EVP_PKEY_CTX *ctx, const EVP_MD **md)
{
return RSA_pkey_ctx_ctrl(ctx, EVP_PKEY_OP_TYPE_SIG | EVP_PKEY_OP_TYPE_CRYPT,
- EVP_PKEY_CTRL_GET_RSA_MGF1_MD, 0, (void *)(md));
+ EVP_PKEY_CTRL_GET_RSA_MGF1_MD, 0, (void *)(md));
}
int EVP_PKEY_CTX_set0_rsa_oaep_label(EVP_PKEY_CTX *ctx, void *label, int llen)
@@ -1171,7 +1168,7 @@ int EVP_PKEY_CTX_set0_rsa_oaep_label(EVP_PKEY_CTX *ctx, void *label, int llen)
/* Cast away the const. This is read only so should be safe */
*p++ = OSSL_PARAM_construct_octet_string(OSSL_ASYM_CIPHER_PARAM_OAEP_LABEL,
- (void *)plabel, (size_t)llen);
+ (void *)plabel, (size_t)llen);
*p++ = OSSL_PARAM_construct_end();
ret = evp_pkey_ctx_set_params_strict(ctx, rsa_params);
@@ -1199,7 +1196,7 @@ int EVP_PKEY_CTX_get0_rsa_oaep_label(EVP_PKEY_CTX *ctx, unsigned char **label)
return -1;
*p++ = OSSL_PARAM_construct_octet_ptr(OSSL_ASYM_CIPHER_PARAM_OAEP_LABEL,
- (void **)label, 0);
+ (void **)label, 0);
*p++ = OSSL_PARAM_construct_end();
if (!EVP_PKEY_CTX_get_params(ctx, rsa_params))
@@ -1229,7 +1226,7 @@ int EVP_PKEY_CTX_set_rsa_pss_saltlen(EVP_PKEY_CTX *ctx, int saltlen)
* EVP_PKEY_OP_TYPE_SIG
*/
return RSA_pkey_ctx_ctrl(ctx, EVP_PKEY_OP_TYPE_SIG,
- EVP_PKEY_CTRL_RSA_PSS_SALTLEN, saltlen, NULL);
+ EVP_PKEY_CTRL_RSA_PSS_SALTLEN, saltlen, NULL);
}
/*
@@ -1248,7 +1245,7 @@ int EVP_PKEY_CTX_get_rsa_pss_saltlen(EVP_PKEY_CTX *ctx, int *saltlen)
* EVP_PKEY_OP_TYPE_SIG
*/
return RSA_pkey_ctx_ctrl(ctx, EVP_PKEY_OP_TYPE_SIG,
- EVP_PKEY_CTRL_GET_RSA_PSS_SALTLEN, 0, saltlen);
+ EVP_PKEY_CTRL_GET_RSA_PSS_SALTLEN, 0, saltlen);
}
int EVP_PKEY_CTX_set_rsa_pss_keygen_saltlen(EVP_PKEY_CTX *ctx, int saltlen)
@@ -1265,7 +1262,7 @@ int EVP_PKEY_CTX_set_rsa_pss_keygen_saltlen(EVP_PKEY_CTX *ctx, int saltlen)
return -1;
*p++ = OSSL_PARAM_construct_int(OSSL_SIGNATURE_PARAM_PSS_SALTLEN,
- &saltlen);
+ &saltlen);
*p++ = OSSL_PARAM_construct_end();
return evp_pkey_ctx_set_params_strict(ctx, pad_params);
@@ -1296,7 +1293,7 @@ int EVP_PKEY_CTX_set_rsa_keygen_bits(EVP_PKEY_CTX *ctx, int bits)
int EVP_PKEY_CTX_set_rsa_keygen_pubexp(EVP_PKEY_CTX *ctx, BIGNUM *pubexp)
{
int ret = RSA_pkey_ctx_ctrl(ctx, EVP_PKEY_OP_KEYGEN,
- EVP_PKEY_CTRL_RSA_KEYGEN_PUBEXP, 0, pubexp);
+ EVP_PKEY_CTRL_RSA_KEYGEN_PUBEXP, 0, pubexp);
/*
* Satisfy memory semantics for pre-3.0 callers of
@@ -1325,7 +1322,7 @@ int EVP_PKEY_CTX_set1_rsa_keygen_pubexp(EVP_PKEY_CTX *ctx, BIGNUM *pubexp)
return 0;
}
ret = EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_KEYGEN,
- EVP_PKEY_CTRL_RSA_KEYGEN_PUBEXP, 0, pubexp);
+ EVP_PKEY_CTRL_RSA_KEYGEN_PUBEXP, 0, pubexp);
if (evp_pkey_ctx_is_legacy(ctx) && ret <= 0)
BN_free(pubexp);
return ret;
diff --git a/crypto/rsa/rsa_local.h b/crypto/rsa/rsa_local.h
index d438283d9e..b41bb34c27 100644
--- a/crypto/rsa/rsa_local.h
+++ b/crypto/rsa/rsa_local.h
@@ -13,7 +13,7 @@
#include "internal/refcount.h"
#include "crypto/rsa.h"
-#define RSA_MAX_PRIME_NUM 5
+#define RSA_MAX_PRIME_NUM 5
typedef struct rsa_prime_info_st {
BIGNUM *r;
@@ -99,23 +99,23 @@ struct rsa_st {
struct rsa_meth_st {
char *name;
- int (*rsa_pub_enc) (int flen, const unsigned char *from,
- unsigned char *to, RSA *rsa, int padding);
- int (*rsa_pub_dec) (int flen, const unsigned char *from,
- unsigned char *to, RSA *rsa, int padding);
- int (*rsa_priv_enc) (int flen, const unsigned char *from,
- unsigned char *to, RSA *rsa, int padding);
- int (*rsa_priv_dec) (int flen, const unsigned char *from,
- unsigned char *to, RSA *rsa, int padding);
+ int (*rsa_pub_enc)(int flen, const unsigned char *from,
+ unsigned char *to, RSA *rsa, int padding);
+ int (*rsa_pub_dec)(int flen, const unsigned char *from,
+ unsigned char *to, RSA *rsa, int padding);
+ int (*rsa_priv_enc)(int flen, const unsigned char *from,
+ unsigned char *to, RSA *rsa, int padding);
+ int (*rsa_priv_dec)(int flen, const unsigned char *from,
+ unsigned char *to, RSA *rsa, int padding);
/* Can be null */
- int (*rsa_mod_exp) (BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx);
+ int (*rsa_mod_exp)(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx);
/* Can be null */
- int (*bn_mod_exp) (BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
- const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
+ int (*bn_mod_exp)(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
+ const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
/* called at new */
- int (*init) (RSA *rsa);
+ int (*init)(RSA *rsa);
/* called at free */
- int (*finish) (RSA *rsa);
+ int (*finish)(RSA *rsa);
/* RSA_METHOD_FLAG_* things */
int flags;
/* may be needed! */
@@ -126,36 +126,36 @@ struct rsa_meth_st {
* this to work the RSA_public_decrypt() and RSA_private_encrypt() should
* *NOT* be used. RSA_sign(), RSA_verify() should be used instead.
*/
- int (*rsa_sign) (int type,
- const unsigned char *m, unsigned int m_length,
- unsigned char *sigret, unsigned int *siglen,
- const RSA *rsa);
- int (*rsa_verify) (int dtype, const unsigned char *m,
- unsigned int m_length, const unsigned char *sigbuf,
- unsigned int siglen, const RSA *rsa);
+ int (*rsa_sign)(int type,
+ const unsigned char *m, unsigned int m_length,
+ unsigned char *sigret, unsigned int *siglen,
+ const RSA *rsa);
+ int (*rsa_verify)(int dtype, const unsigned char *m,
+ unsigned int m_length, const unsigned char *sigbuf,
+ unsigned int siglen, const RSA *rsa);
/*
* If this callback is NULL, the builtin software RSA key-gen will be
* used. This is for behavioural compatibility whilst the code gets
* rewired, but one day it would be nice to assume there are no such
* things as "builtin software" implementations.
*/
- int (*rsa_keygen) (RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb);
- int (*rsa_multi_prime_keygen) (RSA *rsa, int bits, int primes,
- BIGNUM *e, BN_GENCB *cb);
+ int (*rsa_keygen)(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb);
+ int (*rsa_multi_prime_keygen)(RSA *rsa, int bits, int primes,
+ BIGNUM *e, BN_GENCB *cb);
};
/* Macros to test if a pkey or ctx is for a PSS key */
#define pkey_is_pss(pkey) (pkey->ameth->pkey_id == EVP_PKEY_RSA_PSS)
#define pkey_ctx_is_pss(ctx) (ctx->pmeth->pkey_id == EVP_PKEY_RSA_PSS)
int ossl_rsa_multiprime_derive(RSA *rsa, int bits, int primes,
- BIGNUM *e_value,
- STACK_OF(BIGNUM) *factors, STACK_OF(BIGNUM) *exps,
- STACK_OF(BIGNUM) *coeffs);
+ BIGNUM *e_value,
+ STACK_OF(BIGNUM) *factors, STACK_OF(BIGNUM) *exps,
+ STACK_OF(BIGNUM) *coeffs);
RSA_PSS_PARAMS *ossl_rsa_pss_params_create(const EVP_MD *sigmd,
- const EVP_MD *mgf1md, int saltlen);
+ const EVP_MD *mgf1md, int saltlen);
int ossl_rsa_pss_get_param(const RSA_PSS_PARAMS *pss, const EVP_MD **pmd,
- const EVP_MD **pmgf1md, int *psaltlen);
+ const EVP_MD **pmgf1md, int *psaltlen);
/* internal function to clear and free multi-prime parameters */
void ossl_rsa_multip_info_free_ex(RSA_PRIME_INFO *pinfo);
void ossl_rsa_multip_info_free(RSA_PRIME_INFO *pinfo);
@@ -165,10 +165,10 @@ int ossl_rsa_multip_cap(int bits);
int ossl_rsa_sp800_56b_validate_strength(int nbits, int strength);
int ossl_rsa_check_pminusq_diff(BIGNUM *diff, const BIGNUM *p, const BIGNUM *q,
- int nbits);
+ int nbits);
int ossl_rsa_get_lcm(BN_CTX *ctx, const BIGNUM *p, const BIGNUM *q,
- BIGNUM *lcm, BIGNUM *gcd, BIGNUM *p1, BIGNUM *q1,
- BIGNUM *p1q1);
+ BIGNUM *lcm, BIGNUM *gcd, BIGNUM *p1, BIGNUM *q1,
+ BIGNUM *p1q1);
int ossl_rsa_check_public_exponent(const BIGNUM *e);
int ossl_rsa_check_private_exponent(const RSA *rsa, int nbits, BN_CTX *ctx);
@@ -180,19 +180,19 @@ int ossl_rsa_sp800_56b_pairwise_test(RSA *rsa, BN_CTX *ctx);
int ossl_rsa_sp800_56b_check_public(const RSA *rsa);
int ossl_rsa_sp800_56b_check_private(const RSA *rsa);
int ossl_rsa_sp800_56b_check_keypair(const RSA *rsa, const BIGNUM *efixed,
- int strength, int nbits);
+ int strength, int nbits);
int ossl_rsa_sp800_56b_generate_key(RSA *rsa, int nbits, const BIGNUM *efixed,
- BN_GENCB *cb, uint32_t a, uint32_t b);
+ BN_GENCB *cb, uint32_t a, uint32_t b);
int ossl_rsa_sp800_56b_derive_params_from_pq(RSA *rsa, int nbits,
- const BIGNUM *e, BN_CTX *ctx);
+ const BIGNUM *e, BN_CTX *ctx);
int ossl_rsa_fips186_5_gen_prob_primes(RSA *rsa, RSA_ACVP_TEST *test,
- int nbits, const BIGNUM *e, BN_CTX *ctx,
- BN_GENCB *cb, uint32_t a, uint32_t b);
+ int nbits, const BIGNUM *e, BN_CTX *ctx,
+ BN_GENCB *cb, uint32_t a, uint32_t b);
int ossl_rsa_padding_add_PKCS1_type_2_ex(OSSL_LIB_CTX *libctx, unsigned char *to,
- int tlen, const unsigned char *from,
- int flen);
+ int tlen, const unsigned char *from,
+ int flen);
void ossl_rsa_free_blinding(RSA *rsa);
void *ossl_rsa_alloc_blinding(void);
diff --git a/crypto/rsa/rsa_meth.c b/crypto/rsa/rsa_meth.c
index f04098bd08..d3dc37fb71 100644
--- a/crypto/rsa/rsa_meth.c
+++ b/crypto/rsa/rsa_meth.c
@@ -99,190 +99,180 @@ int RSA_meth_set0_app_data(RSA_METHOD *meth, void *app_data)
return 1;
}
-int (*RSA_meth_get_pub_enc(const RSA_METHOD *meth))
- (int flen, const unsigned char *from,
- unsigned char *to, RSA *rsa, int padding)
+int (*RSA_meth_get_pub_enc(const RSA_METHOD *meth))(int flen, const unsigned char *from,
+ unsigned char *to, RSA *rsa, int padding)
{
return meth->rsa_pub_enc;
}
int RSA_meth_set_pub_enc(RSA_METHOD *meth,
- int (*pub_enc) (int flen, const unsigned char *from,
- unsigned char *to, RSA *rsa,
- int padding))
+ int (*pub_enc)(int flen, const unsigned char *from,
+ unsigned char *to, RSA *rsa,
+ int padding))
{
meth->rsa_pub_enc = pub_enc;
return 1;
}
-int (*RSA_meth_get_pub_dec(const RSA_METHOD *meth))
- (int flen, const unsigned char *from,
- unsigned char *to, RSA *rsa, int padding)
+int (*RSA_meth_get_pub_dec(const RSA_METHOD *meth))(int flen, const unsigned char *from,
+ unsigned char *to, RSA *rsa, int padding)
{
return meth->rsa_pub_dec;
}
int RSA_meth_set_pub_dec(RSA_METHOD *meth,
- int (*pub_dec) (int flen, const unsigned char *from,
- unsigned char *to, RSA *rsa,
- int padding))
+ int (*pub_dec)(int flen, const unsigned char *from,
+ unsigned char *to, RSA *rsa,
+ int padding))
{
meth->rsa_pub_dec = pub_dec;
return 1;
}
-int (*RSA_meth_get_priv_enc(const RSA_METHOD *meth))
- (int flen, const unsigned char *from,
- unsigned char *to, RSA *rsa, int padding)
+int (*RSA_meth_get_priv_enc(const RSA_METHOD *meth))(int flen, const unsigned char *from,
+ unsigned char *to, RSA *rsa, int padding)
{
return meth->rsa_priv_enc;
}
int RSA_meth_set_priv_enc(RSA_METHOD *meth,
- int (*priv_enc) (int flen, const unsigned char *from,
- unsigned char *to, RSA *rsa,
- int padding))
+ int (*priv_enc)(int flen, const unsigned char *from,
+ unsigned char *to, RSA *rsa,
+ int padding))
{
meth->rsa_priv_enc = priv_enc;
return 1;
}
-int (*RSA_meth_get_priv_dec(const RSA_METHOD *meth))
- (int flen, const unsigned char *from,
- unsigned char *to, RSA *rsa, int padding)
+int (*RSA_meth_get_priv_dec(const RSA_METHOD *meth))(int flen, const unsigned char *from,
+ unsigned char *to, RSA *rsa, int padding)
{
return meth->rsa_priv_dec;
}
int RSA_meth_set_priv_dec(RSA_METHOD *meth,
- int (*priv_dec) (int flen, const unsigned char *from,
- unsigned char *to, RSA *rsa,
- int padding))
+ int (*priv_dec)(int flen, const unsigned char *from,
+ unsigned char *to, RSA *rsa,
+ int padding))
{
meth->rsa_priv_dec = priv_dec;
return 1;
}
- /* Can be null */
-int (*RSA_meth_get_mod_exp(const RSA_METHOD *meth))
- (BIGNUM *r0, const BIGNUM *i, RSA *rsa, BN_CTX *ctx)
+/* Can be null */
+int (*RSA_meth_get_mod_exp(const RSA_METHOD *meth))(BIGNUM *r0, const BIGNUM *i, RSA *rsa, BN_CTX *ctx)
{
return meth->rsa_mod_exp;
}
int RSA_meth_set_mod_exp(RSA_METHOD *meth,
- int (*mod_exp) (BIGNUM *r0, const BIGNUM *i, RSA *rsa,
- BN_CTX *ctx))
+ int (*mod_exp)(BIGNUM *r0, const BIGNUM *i, RSA *rsa,
+ BN_CTX *ctx))
{
meth->rsa_mod_exp = mod_exp;
return 1;
}
- /* Can be null */
-int (*RSA_meth_get_bn_mod_exp(const RSA_METHOD *meth))
- (BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
- const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx)
+/* Can be null */
+int (*RSA_meth_get_bn_mod_exp(const RSA_METHOD *meth))(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
+ const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx)
{
return meth->bn_mod_exp;
}
int RSA_meth_set_bn_mod_exp(RSA_METHOD *meth,
- int (*bn_mod_exp) (BIGNUM *r,
- const BIGNUM *a,
- const BIGNUM *p,
- const BIGNUM *m,
- BN_CTX *ctx,
- BN_MONT_CTX *m_ctx))
+ int (*bn_mod_exp)(BIGNUM *r,
+ const BIGNUM *a,
+ const BIGNUM *p,
+ const BIGNUM *m,
+ BN_CTX *ctx,
+ BN_MONT_CTX *m_ctx))
{
meth->bn_mod_exp = bn_mod_exp;
return 1;
}
- /* called at new */
-int (*RSA_meth_get_init(const RSA_METHOD *meth)) (RSA *rsa)
+/* called at new */
+int (*RSA_meth_get_init(const RSA_METHOD *meth))(RSA *rsa)
{
return meth->init;
}
-int RSA_meth_set_init(RSA_METHOD *meth, int (*init) (RSA *rsa))
+int RSA_meth_set_init(RSA_METHOD *meth, int (*init)(RSA *rsa))
{
meth->init = init;
return 1;
}
- /* called at free */
-int (*RSA_meth_get_finish(const RSA_METHOD *meth)) (RSA *rsa)
+/* called at free */
+int (*RSA_meth_get_finish(const RSA_METHOD *meth))(RSA *rsa)
{
return meth->finish;
}
-int RSA_meth_set_finish(RSA_METHOD *meth, int (*finish) (RSA *rsa))
+int RSA_meth_set_finish(RSA_METHOD *meth, int (*finish)(RSA *rsa))
{
meth->finish = finish;
return 1;
}
-int (*RSA_meth_get_sign(const RSA_METHOD *meth))
- (int type,
- const unsigned char *m, unsigned int m_length,
- unsigned char *sigret, unsigned int *siglen,
- const RSA *rsa)
+int (*RSA_meth_get_sign(const RSA_METHOD *meth))(int type,
+ const unsigned char *m, unsigned int m_length,
+ unsigned char *sigret, unsigned int *siglen,
+ const RSA *rsa)
{
return meth->rsa_sign;
}
int RSA_meth_set_sign(RSA_METHOD *meth,
- int (*sign) (int type, const unsigned char *m,
- unsigned int m_length,
- unsigned char *sigret, unsigned int *siglen,
- const RSA *rsa))
+ int (*sign)(int type, const unsigned char *m,
+ unsigned int m_length,
+ unsigned char *sigret, unsigned int *siglen,
+ const RSA *rsa))
{
meth->rsa_sign = sign;
return 1;
}
-int (*RSA_meth_get_verify(const RSA_METHOD *meth))
- (int dtype, const unsigned char *m,
- unsigned int m_length, const unsigned char *sigbuf,
- unsigned int siglen, const RSA *rsa)
+int (*RSA_meth_get_verify(const RSA_METHOD *meth))(int dtype, const unsigned char *m,
+ unsigned int m_length, const unsigned char *sigbuf,
+ unsigned int siglen, const RSA *rsa)
{
return meth->rsa_verify;
}
int RSA_meth_set_verify(RSA_METHOD *meth,
- int (*verify) (int dtype, const unsigned char *m,
- unsigned int m_length,
- const unsigned char *sigbuf,
- unsigned int siglen, const RSA *rsa))
+ int (*verify)(int dtype, const unsigned char *m,
+ unsigned int m_length,
+ const unsigned char *sigbuf,
+ unsigned int siglen, const RSA *rsa))
{
meth->rsa_verify = verify;
return 1;
}
-int (*RSA_meth_get_keygen(const RSA_METHOD *meth))
- (RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb)
+int (*RSA_meth_get_keygen(const RSA_METHOD *meth))(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb)
{
return meth->rsa_keygen;
}
int RSA_meth_set_keygen(RSA_METHOD *meth,
- int (*keygen) (RSA *rsa, int bits, BIGNUM *e,
- BN_GENCB *cb))
+ int (*keygen)(RSA *rsa, int bits, BIGNUM *e,
+ BN_GENCB *cb))
{
meth->rsa_keygen = keygen;
return 1;
}
-int (*RSA_meth_get_multi_prime_keygen(const RSA_METHOD *meth))
- (RSA *rsa, int bits, int primes, BIGNUM *e, BN_GENCB *cb)
+int (*RSA_meth_get_multi_prime_keygen(const RSA_METHOD *meth))(RSA *rsa, int bits, int primes, BIGNUM *e, BN_GENCB *cb)
{
return meth->rsa_multi_prime_keygen;
}
int RSA_meth_set_multi_prime_keygen(RSA_METHOD *meth,
- int (*keygen) (RSA *rsa, int bits,
- int primes, BIGNUM *e,
- BN_GENCB *cb))
+ int (*keygen)(RSA *rsa, int bits,
+ int primes, BIGNUM *e,
+ BN_GENCB *cb))
{
meth->rsa_multi_prime_keygen = keygen;
return 1;
diff --git a/crypto/rsa/rsa_mp.c b/crypto/rsa/rsa_mp.c
index 542daecc1f..d73af13528 100644
--- a/crypto/rsa/rsa_mp.c
+++ b/crypto/rsa/rsa_mp.c
@@ -46,7 +46,7 @@ RSA_PRIME_INFO *ossl_rsa_multip_info_new(void)
return pinfo;
- err:
+err:
BN_free(pinfo->r);
BN_free(pinfo->d);
BN_free(pinfo->t);
@@ -90,7 +90,7 @@ int ossl_rsa_multip_calc_product(RSA *rsa)
}
rv = 1;
- err:
+err:
BN_CTX_free(ctx);
return rv;
}
diff --git a/crypto/rsa/rsa_none.c b/crypto/rsa/rsa_none.c
index df93525fc5..6a83bf3ea3 100644
--- a/crypto/rsa/rsa_none.c
+++ b/crypto/rsa/rsa_none.c
@@ -18,7 +18,7 @@
#include <openssl/rsa.h>
int RSA_padding_add_none(unsigned char *to, int tlen,
- const unsigned char *from, int flen)
+ const unsigned char *from, int flen)
{
if (flen > tlen) {
ERR_raise(ERR_LIB_RSA, RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE);
@@ -35,7 +35,7 @@ int RSA_padding_add_none(unsigned char *to, int tlen,
}
int RSA_padding_check_none(unsigned char *to, int tlen,
- const unsigned char *from, int flen, int num)
+ const unsigned char *from, int flen, int num)
{
if (flen > tlen) {
diff --git a/crypto/rsa/rsa_oaep.c b/crypto/rsa/rsa_oaep.c
index 5a1c080fcd..453205b56c 100644
--- a/crypto/rsa/rsa_oaep.c
+++ b/crypto/rsa/rsa_oaep.c
@@ -37,11 +37,11 @@
#include "rsa_local.h"
int RSA_padding_add_PKCS1_OAEP(unsigned char *to, int tlen,
- const unsigned char *from, int flen,
- const unsigned char *param, int plen)
+ const unsigned char *from, int flen,
+ const unsigned char *param, int plen)
{
return ossl_rsa_padding_add_PKCS1_OAEP_mgf1_ex(NULL, to, tlen, from, flen,
- param, plen, NULL, NULL);
+ param, plen, NULL, NULL);
}
/*
@@ -52,11 +52,11 @@ int RSA_padding_add_PKCS1_OAEP(unsigned char *to, int tlen,
* to avoid complicating an already difficult enough function.
*/
int ossl_rsa_padding_add_PKCS1_OAEP_mgf1_ex(OSSL_LIB_CTX *libctx,
- unsigned char *to, int tlen,
- const unsigned char *from, int flen,
- const unsigned char *param,
- int plen, const EVP_MD *md,
- const EVP_MD *mgf1md)
+ unsigned char *to, int tlen,
+ const unsigned char *from, int flen,
+ const unsigned char *param,
+ int plen, const EVP_MD *md,
+ const EVP_MD *mgf1md)
{
int rv = 0;
int i, emlen = tlen - 1;
@@ -142,34 +142,34 @@ int ossl_rsa_padding_add_PKCS1_OAEP_mgf1_ex(OSSL_LIB_CTX *libctx,
seed[i] ^= seedmask[i];
rv = 1;
- err:
+err:
OPENSSL_cleanse(seedmask, sizeof(seedmask));
OPENSSL_clear_free(dbmask, dbmask_len);
return rv;
}
int RSA_padding_add_PKCS1_OAEP_mgf1(unsigned char *to, int tlen,
- const unsigned char *from, int flen,
- const unsigned char *param, int plen,
- const EVP_MD *md, const EVP_MD *mgf1md)
+ const unsigned char *from, int flen,
+ const unsigned char *param, int plen,
+ const EVP_MD *md, const EVP_MD *mgf1md)
{
return ossl_rsa_padding_add_PKCS1_OAEP_mgf1_ex(NULL, to, tlen, from, flen,
- param, plen, md, mgf1md);
+ param, plen, md, mgf1md);
}
int RSA_padding_check_PKCS1_OAEP(unsigned char *to, int tlen,
- const unsigned char *from, int flen, int num,
- const unsigned char *param, int plen)
+ const unsigned char *from, int flen, int num,
+ const unsigned char *param, int plen)
{
return RSA_padding_check_PKCS1_OAEP_mgf1(to, tlen, from, flen, num,
- param, plen, NULL, NULL);
+ param, plen, NULL, NULL);
}
int RSA_padding_check_PKCS1_OAEP_mgf1(unsigned char *to, int tlen,
- const unsigned char *from, int flen,
- int num, const unsigned char *param,
- int plen, const EVP_MD *md,
- const EVP_MD *mgf1md)
+ const unsigned char *from, int flen,
+ int num, const unsigned char *param,
+ int plen, const EVP_MD *md,
+ const EVP_MD *mgf1md)
{
int i, dblen = 0, mlen = -1, one_index = 0, msg_index;
unsigned int good = 0, found_one_byte, mask;
@@ -179,7 +179,7 @@ int RSA_padding_check_PKCS1_OAEP_mgf1(unsigned char *to, int tlen,
* Y || maskedSeed || maskedDB
*/
unsigned char *db = NULL, *em = NULL, seed[EVP_MAX_MD_SIZE],
- phash[EVP_MAX_MD_SIZE];
+ phash[EVP_MAX_MD_SIZE];
int mdlen;
if (md == NULL) {
@@ -278,7 +278,7 @@ int RSA_padding_check_PKCS1_OAEP_mgf1(unsigned char *to, int tlen,
unsigned int equals1 = constant_time_eq(db[i], 1);
unsigned int equals0 = constant_time_is_zero(db[i]);
one_index = constant_time_select_int(~found_one_byte & equals1,
- i, one_index);
+ i, one_index);
found_one_byte |= equals1;
good &= (found_one_byte | equals0);
}
@@ -309,7 +309,7 @@ int RSA_padding_check_PKCS1_OAEP_mgf1(unsigned char *to, int tlen,
* The loop below has overall complexity of O(N*log(N)).
*/
tlen = constant_time_select_int(constant_time_lt(dblen - mdlen - 1, tlen),
- dblen - mdlen - 1, tlen);
+ dblen - mdlen - 1, tlen);
for (msg_index = 1; msg_index < dblen - mdlen - 1; msg_index <<= 1) {
mask = ~constant_time_eq(msg_index & (dblen - mdlen - 1 - mlen), 0);
for (i = mdlen + 1; i < dblen - msg_index; i++)
@@ -332,7 +332,7 @@ int RSA_padding_check_PKCS1_OAEP_mgf1(unsigned char *to, int tlen,
ERR_raise(ERR_LIB_RSA, RSA_R_OAEP_DECODING_ERROR);
err_clear_last_constant_time(1 & good);
#endif
- cleanup:
+cleanup:
OPENSSL_cleanse(seed, sizeof(seed));
OPENSSL_clear_free(db, dblen);
OPENSSL_clear_free(em, num);
@@ -348,7 +348,7 @@ int RSA_padding_check_PKCS1_OAEP_mgf1(unsigned char *to, int tlen,
* The range checking steps inm the process are performed outside.
*/
int PKCS1_MGF1(unsigned char *mask, long len,
- const unsigned char *seed, long seedlen, const EVP_MD *dgst)
+ const unsigned char *seed, long seedlen, const EVP_MD *dgst)
{
long i, outlen = 0;
unsigned char cnt[4];
@@ -386,7 +386,7 @@ int PKCS1_MGF1(unsigned char *mask, long len,
}
}
rv = 0;
- err:
+err:
OPENSSL_cleanse(md, sizeof(md));
EVP_MD_CTX_free(c);
return rv;
diff --git a/crypto/rsa/rsa_ossl.c b/crypto/rsa/rsa_ossl.c
index acebee9145..b883baa58f 100644
--- a/crypto/rsa/rsa_ossl.c
+++ b/crypto/rsa/rsa_ossl.c
@@ -19,8 +19,8 @@
#include "rsa_local.h"
#include "internal/constant_time.h"
#if defined(OPENSSL_SYS_TANDEM)
-# include "internal/tsan_assist.h"
-# include "internal/threads_common.h"
+#include "internal/tsan_assist.h"
+#include "internal/threads_common.h"
#endif
#include <openssl/evp.h>
#include <openssl/sha.h>
@@ -29,55 +29,55 @@
DEFINE_SPARSE_ARRAY_OF(BN_BLINDING);
static int rsa_ossl_public_encrypt(int flen, const unsigned char *from,
- unsigned char *to, RSA *rsa, int padding);
+ unsigned char *to, RSA *rsa, int padding);
static int rsa_ossl_private_encrypt(int flen, const unsigned char *from,
- unsigned char *to, RSA *rsa, int padding);
+ unsigned char *to, RSA *rsa, int padding);
static int rsa_ossl_public_decrypt(int flen, const unsigned char *from,
- unsigned char *to, RSA *rsa, int padding);
+ unsigned char *to, RSA *rsa, int padding);
static int rsa_ossl_private_decrypt(int flen, const unsigned char *from,
- unsigned char *to, RSA *rsa, int padding);
+ unsigned char *to, RSA *rsa, int padding);
static int rsa_ossl_mod_exp(BIGNUM *r0, const BIGNUM *i, RSA *rsa,
- BN_CTX *ctx);
+ BN_CTX *ctx);
static int rsa_ossl_init(RSA *rsa);
static int rsa_ossl_finish(RSA *rsa);
#ifdef S390X_MOD_EXP
static int rsa_ossl_s390x_mod_exp(BIGNUM *r0, const BIGNUM *i, RSA *rsa,
- BN_CTX *ctx);
+ BN_CTX *ctx);
static const RSA_METHOD rsa_pkcs1_ossl_meth = {
"OpenSSL PKCS#1 RSA",
rsa_ossl_public_encrypt,
- rsa_ossl_public_decrypt, /* signature verification */
- rsa_ossl_private_encrypt, /* signing */
+ rsa_ossl_public_decrypt, /* signature verification */
+ rsa_ossl_private_encrypt, /* signing */
rsa_ossl_private_decrypt,
rsa_ossl_s390x_mod_exp,
s390x_mod_exp,
rsa_ossl_init,
rsa_ossl_finish,
- RSA_FLAG_FIPS_METHOD, /* flags */
+ RSA_FLAG_FIPS_METHOD, /* flags */
NULL,
- 0, /* rsa_sign */
- 0, /* rsa_verify */
- NULL, /* rsa_keygen */
- NULL /* rsa_multi_prime_keygen */
+ 0, /* rsa_sign */
+ 0, /* rsa_verify */
+ NULL, /* rsa_keygen */
+ NULL /* rsa_multi_prime_keygen */
};
#else
static const RSA_METHOD rsa_pkcs1_ossl_meth = {
"OpenSSL PKCS#1 RSA",
rsa_ossl_public_encrypt,
- rsa_ossl_public_decrypt, /* signature verification */
- rsa_ossl_private_encrypt, /* signing */
+ rsa_ossl_public_decrypt, /* signature verification */
+ rsa_ossl_private_encrypt, /* signing */
rsa_ossl_private_decrypt,
rsa_ossl_mod_exp,
- BN_mod_exp_mont, /* XXX probably we should not use Montgomery
- * if e == 3 */
+ BN_mod_exp_mont, /* XXX probably we should not use Montgomery
+ * if e == 3 */
rsa_ossl_init,
rsa_ossl_finish,
- RSA_FLAG_FIPS_METHOD, /* flags */
+ RSA_FLAG_FIPS_METHOD, /* flags */
NULL,
- 0, /* rsa_sign */
- 0, /* rsa_verify */
- NULL, /* rsa_keygen */
- NULL /* rsa_multi_prime_keygen */
+ 0, /* rsa_sign */
+ 0, /* rsa_verify */
+ NULL, /* rsa_keygen */
+ NULL /* rsa_multi_prime_keygen */
};
#endif
@@ -104,7 +104,7 @@ const RSA_METHOD *RSA_null_method(void)
}
static int rsa_ossl_public_encrypt(int flen, const unsigned char *from,
- unsigned char *to, RSA *rsa, int padding)
+ unsigned char *to, RSA *rsa, int padding)
{
BIGNUM *f, *ret;
int i, num = 0, r = -1;
@@ -142,12 +142,12 @@ static int rsa_ossl_public_encrypt(int flen, const unsigned char *from,
switch (padding) {
case RSA_PKCS1_PADDING:
i = ossl_rsa_padding_add_PKCS1_type_2_ex(rsa->libctx, buf, num,
- from, flen);
+ from, flen);
break;
case RSA_PKCS1_OAEP_PADDING:
i = ossl_rsa_padding_add_PKCS1_OAEP_mgf1_ex(rsa->libctx, buf, num,
- from, flen, NULL, 0,
- NULL, NULL);
+ from, flen, NULL, 0,
+ NULL, NULL);
break;
case RSA_NO_PADDING:
i = RSA_padding_add_none(buf, num, from, flen);
@@ -176,8 +176,8 @@ static int rsa_ossl_public_encrypt(int flen, const unsigned char *from,
goto err;
}
if (nminus1 == NULL
- || BN_copy(nminus1, rsa->n) == NULL
- || !BN_sub_word(nminus1, 1))
+ || BN_copy(nminus1, rsa->n) == NULL
+ || !BN_sub_word(nminus1, 1))
goto err;
if (BN_ucmp(f, nminus1) >= 0) {
ERR_raise(ERR_LIB_RSA, RSA_R_DATA_TOO_LARGE_FOR_MODULUS);
@@ -195,11 +195,11 @@ static int rsa_ossl_public_encrypt(int flen, const unsigned char *from,
if (rsa->flags & RSA_FLAG_CACHE_PUBLIC)
if (!BN_MONT_CTX_set_locked(&rsa->_method_mod_n, rsa->lock,
- rsa->n, ctx))
+ rsa->n, ctx))
goto err;
if (!rsa->meth->bn_mod_exp(ret, f, rsa->e, rsa->n, ctx,
- rsa->_method_mod_n))
+ rsa->_method_mod_n))
goto err;
/*
@@ -207,7 +207,7 @@ static int rsa_ossl_public_encrypt(int flen, const unsigned char *from,
* the length of the modulus.
*/
r = BN_bn2binpad(ret, to, num);
- err:
+err:
BN_CTX_end(ctx);
BN_CTX_free(ctx);
OPENSSL_clear_free(buf, num);
@@ -222,7 +222,7 @@ static uintptr_t get_unique_thread_id(void)
{
#if defined(OPENSSL_SYS_TANDEM)
uintptr_t thread_id = (uintptr_t)CRYPTO_THREAD_get_local_ex(CRYPTO_THREAD_LOCAL_TANDEM_ID_KEY,
- NULL);
+ NULL);
if (thread_id == 0) {
thread_id = tsan_counter(&tsan_thread_id);
@@ -319,7 +319,7 @@ static int rsa_blinding_invert(BN_BLINDING *b, BIGNUM *f, BN_CTX *ctx)
/* signing */
static int rsa_ossl_private_encrypt(int flen, const unsigned char *from,
- unsigned char *to, RSA *rsa, int padding)
+ unsigned char *to, RSA *rsa, int padding)
{
BIGNUM *f, *ret, *res;
int i, num = 0, r = -1;
@@ -365,7 +365,7 @@ static int rsa_ossl_private_encrypt(int flen, const unsigned char *from,
if (rsa->flags & RSA_FLAG_CACHE_PUBLIC)
if (!BN_MONT_CTX_set_locked(&rsa->_method_mod_n, rsa->lock,
- rsa->n, ctx))
+ rsa->n, ctx))
goto err;
if (!(rsa->flags & RSA_FLAG_NO_BLINDING)) {
@@ -379,11 +379,7 @@ static int rsa_ossl_private_encrypt(int flen, const unsigned char *from,
goto err;
}
- if ((rsa->flags & RSA_FLAG_EXT_PKEY) ||
- (rsa->version == RSA_ASN1_VERSION_MULTI) ||
- ((rsa->p != NULL) &&
- (rsa->q != NULL) &&
- (rsa->dmp1 != NULL) && (rsa->dmq1 != NULL) && (rsa->iqmp != NULL))) {
+ if ((rsa->flags & RSA_FLAG_EXT_PKEY) || (rsa->version == RSA_ASN1_VERSION_MULTI) || ((rsa->p != NULL) && (rsa->q != NULL) && (rsa->dmp1 != NULL) && (rsa->dmq1 != NULL) && (rsa->iqmp != NULL))) {
if (!rsa->meth->rsa_mod_exp(ret, f, rsa, ctx))
goto err;
} else {
@@ -400,7 +396,7 @@ static int rsa_ossl_private_encrypt(int flen, const unsigned char *from,
BN_with_flags(d, rsa->d, BN_FLG_CONSTTIME);
if (!rsa->meth->bn_mod_exp(ret, f, d, rsa->n, ctx,
- rsa->_method_mod_n)) {
+ rsa->_method_mod_n)) {
BN_free(d);
goto err;
}
@@ -428,7 +424,7 @@ static int rsa_ossl_private_encrypt(int flen, const unsigned char *from,
* the length of the modulus.
*/
r = BN_bn2binpad(res, to, num);
- err:
+err:
BN_CTX_end(ctx);
BN_CTX_free(ctx);
OPENSSL_clear_free(buf, num);
@@ -436,13 +432,13 @@ static int rsa_ossl_private_encrypt(int flen, const unsigned char *from,
}
static int derive_kdk(int flen, const unsigned char *from, RSA *rsa,
- unsigned char *buf, int num, unsigned char *kdk)
+ unsigned char *buf, int num, unsigned char *kdk)
{
int ret = 0;
HMAC_CTX *hmac = NULL;
EVP_MD *md = NULL;
unsigned int md_len = SHA256_DIGEST_LENGTH;
- unsigned char d_hash[SHA256_DIGEST_LENGTH] = {0};
+ unsigned char d_hash[SHA256_DIGEST_LENGTH] = { 0 };
/*
* because we use d as a handle to rsa->d we need to keep it local and
* free before any further use of rsa->d
@@ -514,19 +510,19 @@ static int derive_kdk(int flen, const unsigned char *from, RSA *rsa,
}
ret = 1;
- err:
+err:
HMAC_CTX_free(hmac);
EVP_MD_free(md);
return ret;
}
static int rsa_ossl_private_decrypt(int flen, const unsigned char *from,
- unsigned char *to, RSA *rsa, int padding)
+ unsigned char *to, RSA *rsa, int padding)
{
BIGNUM *f, *ret;
int j, num = 0, r = -1;
unsigned char *buf = NULL;
- unsigned char kdk[SHA256_DIGEST_LENGTH] = {0};
+ unsigned char kdk[SHA256_DIGEST_LENGTH] = { 0 };
BN_CTX *ctx = NULL;
BN_BLINDING *blinding = NULL;
@@ -582,8 +578,8 @@ static int rsa_ossl_private_decrypt(int flen, const unsigned char *from,
goto err;
}
if (nminus1 == NULL
- || BN_copy(nminus1, rsa->n) == NULL
- || !BN_sub_word(nminus1, 1))
+ || BN_copy(nminus1, rsa->n) == NULL
+ || !BN_sub_word(nminus1, 1))
goto err;
if (BN_ucmp(f, nminus1) >= 0) {
ERR_raise(ERR_LIB_RSA, RSA_R_DATA_TOO_LARGE_FOR_MODULUS);
@@ -599,7 +595,7 @@ static int rsa_ossl_private_decrypt(int flen, const unsigned char *from,
}
if (rsa->flags & RSA_FLAG_CACHE_PUBLIC)
if (!BN_MONT_CTX_set_locked(&rsa->_method_mod_n, rsa->lock,
- rsa->n, ctx))
+ rsa->n, ctx))
goto err;
if (!(rsa->flags & RSA_FLAG_NO_BLINDING)) {
@@ -614,11 +610,7 @@ static int rsa_ossl_private_decrypt(int flen, const unsigned char *from,
}
/* do the decrypt */
- if ((rsa->flags & RSA_FLAG_EXT_PKEY) ||
- (rsa->version == RSA_ASN1_VERSION_MULTI) ||
- ((rsa->p != NULL) &&
- (rsa->q != NULL) &&
- (rsa->dmp1 != NULL) && (rsa->dmq1 != NULL) && (rsa->iqmp != NULL))) {
+ if ((rsa->flags & RSA_FLAG_EXT_PKEY) || (rsa->version == RSA_ASN1_VERSION_MULTI) || ((rsa->p != NULL) && (rsa->q != NULL) && (rsa->dmp1 != NULL) && (rsa->dmq1 != NULL) && (rsa->iqmp != NULL))) {
if (!rsa->meth->rsa_mod_exp(ret, f, rsa, ctx))
goto err;
} else {
@@ -634,7 +626,7 @@ static int rsa_ossl_private_decrypt(int flen, const unsigned char *from,
}
BN_with_flags(d, rsa->d, BN_FLG_CONSTTIME);
if (!rsa->meth->bn_mod_exp(ret, f, d, rsa->n, ctx,
- rsa->_method_mod_n)) {
+ rsa->_method_mod_n)) {
BN_free(d);
goto err;
}
@@ -686,7 +678,7 @@ static int rsa_ossl_private_decrypt(int flen, const unsigned char *from,
err_clear_last_constant_time(1 & ~constant_time_msb(r));
#endif
- err:
+err:
BN_CTX_end(ctx);
BN_CTX_free(ctx);
OPENSSL_clear_free(buf, num);
@@ -695,7 +687,7 @@ static int rsa_ossl_private_decrypt(int flen, const unsigned char *from,
/* signature verification */
static int rsa_ossl_public_decrypt(int flen, const unsigned char *from,
- unsigned char *to, RSA *rsa, int padding)
+ unsigned char *to, RSA *rsa, int padding)
{
BIGNUM *f, *ret;
int i, num = 0, r = -1;
@@ -753,11 +745,11 @@ static int rsa_ossl_public_decrypt(int flen, const unsigned char *from,
if (rsa->flags & RSA_FLAG_CACHE_PUBLIC)
if (!BN_MONT_CTX_set_locked(&rsa->_method_mod_n, rsa->lock,
- rsa->n, ctx))
+ rsa->n, ctx))
goto err;
if (!rsa->meth->bn_mod_exp(ret, f, rsa->e, rsa->n, ctx,
- rsa->_method_mod_n))
+ rsa->_method_mod_n))
goto err;
/* For X9.31: Assuming e is odd it does a 12 mod 16 test */
@@ -786,7 +778,7 @@ static int rsa_ossl_public_decrypt(int flen, const unsigned char *from,
if (r < 0)
ERR_raise(ERR_LIB_RSA, RSA_R_PADDING_CHECK_FAILED);
- err:
+err:
BN_CTX_end(ctx);
BN_CTX_free(ctx);
OPENSSL_clear_free(buf, num);
@@ -817,7 +809,7 @@ static int rsa_ossl_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
#ifndef FIPS_MODULE
if (rsa->version == RSA_ASN1_VERSION_MULTI
&& ((ex_primes = sk_RSA_PRIME_INFO_num(rsa->prime_infos)) <= 0
- || ex_primes > RSA_MAX_PRIME_NUM - 2))
+ || ex_primes > RSA_MAX_PRIME_NUM - 2))
goto err;
#endif
@@ -832,11 +824,11 @@ static int rsa_ossl_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
* BN_FLG_CONSTTIME flag
*/
if (!(BN_with_flags(factor, rsa->p, BN_FLG_CONSTTIME),
- BN_MONT_CTX_set_locked(&rsa->_method_mod_p, rsa->lock,
- factor, ctx))
+ BN_MONT_CTX_set_locked(&rsa->_method_mod_p, rsa->lock,
+ factor, ctx))
|| !(BN_with_flags(factor, rsa->q, BN_FLG_CONSTTIME),
- BN_MONT_CTX_set_locked(&rsa->_method_mod_q, rsa->lock,
- factor, ctx))) {
+ BN_MONT_CTX_set_locked(&rsa->_method_mod_q, rsa->lock,
+ factor, ctx))) {
BN_free(factor);
goto err;
}
@@ -857,14 +849,14 @@ static int rsa_ossl_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
smooth = (rsa->meth->bn_mod_exp == BN_mod_exp_mont)
#ifndef FIPS_MODULE
- && (ex_primes == 0)
+ && (ex_primes == 0)
#endif
- && (BN_num_bits(rsa->q) == BN_num_bits(rsa->p));
+ && (BN_num_bits(rsa->q) == BN_num_bits(rsa->p));
}
if (rsa->flags & RSA_FLAG_CACHE_PUBLIC)
if (!BN_MONT_CTX_set_locked(&rsa->_method_mod_n, rsa->lock,
- rsa->n, ctx))
+ rsa->n, ctx))
goto err;
if (smooth) {
@@ -888,10 +880,10 @@ static int rsa_ossl_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
* r1 = r1^dmp1 mod p
*/
|| !BN_mod_exp_mont_consttime_x2(m1, m1, rsa->dmq1, rsa->q,
- rsa->_method_mod_q,
- r1, r1, rsa->dmp1, rsa->p,
- rsa->_method_mod_p,
- ctx)
+ rsa->_method_mod_q,
+ r1, r1, rsa->dmp1, rsa->p,
+ rsa->_method_mod_p,
+ ctx)
/* r1 = (r1 - m1) mod p */
/*
* bn_mod_sub_fixed_top is not regular modular subtraction,
@@ -904,7 +896,7 @@ static int rsa_ossl_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
/* r1 = r1 * iqmp mod p */
|| !bn_to_mont_fixed_top(r1, r1, rsa->_method_mod_p, ctx)
|| !bn_mul_mont_fixed_top(r1, r1, rsa->iqmp, rsa->_method_mod_p,
- ctx)
+ ctx)
/* r0 = r1 * q + m1 */
|| !bn_mul_fixed_top(r0, r1, rsa->q, ctx)
|| !bn_mod_add_fixed_top(r0, r0, m1, rsa->n))
@@ -935,7 +927,7 @@ static int rsa_ossl_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
/* compute r1^dmq1 mod q */
if (!rsa->meth->bn_mod_exp(m1, r1, dmq1, rsa->q, ctx,
- rsa->_method_mod_q)) {
+ rsa->_method_mod_q)) {
BN_free(c);
BN_free(dmq1);
goto err;
@@ -961,7 +953,7 @@ static int rsa_ossl_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
/* compute r1^dmp1 mod p */
if (!rsa->meth->bn_mod_exp(r0, r1, dmp1, rsa->p, ctx,
- rsa->_method_mod_p)) {
+ rsa->_method_mod_p)) {
BN_free(dmp1);
goto err;
}
@@ -1098,16 +1090,16 @@ static int rsa_ossl_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
}
#endif
- tail:
+tail:
if (rsa->e && rsa->n) {
if (rsa->meth->bn_mod_exp == BN_mod_exp_mont) {
if (!BN_mod_exp_mont(vrfy, r0, rsa->e, rsa->n, ctx,
- rsa->_method_mod_n))
+ rsa->_method_mod_n))
goto err;
} else {
bn_correct_top(r0);
if (!rsa->meth->bn_mod_exp(vrfy, r0, rsa->e, rsa->n, ctx,
- rsa->_method_mod_n))
+ rsa->_method_mod_n))
goto err;
}
/*
@@ -1121,7 +1113,7 @@ static int rsa_ossl_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
if (BN_is_zero(vrfy)) {
bn_correct_top(r0);
ret = 1;
- goto err; /* not actually error */
+ goto err; /* not actually error */
}
if (!BN_mod(vrfy, vrfy, rsa->n, ctx))
goto err;
@@ -1141,7 +1133,7 @@ static int rsa_ossl_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
BN_with_flags(d, rsa->d, BN_FLG_CONSTTIME);
if (!rsa->meth->bn_mod_exp(r0, I, d, rsa->n, ctx,
- rsa->_method_mod_n)) {
+ rsa->_method_mod_n)) {
BN_free(d);
goto err;
}
@@ -1159,7 +1151,7 @@ static int rsa_ossl_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
*/
bn_correct_top(r0);
ret = 1;
- err:
+err:
BN_CTX_end(ctx);
return ret;
}
@@ -1190,7 +1182,7 @@ static int rsa_ossl_finish(RSA *rsa)
#ifdef S390X_MOD_EXP
static int rsa_ossl_s390x_mod_exp(BIGNUM *r0, const BIGNUM *i, RSA *rsa,
- BN_CTX *ctx)
+ BN_CTX *ctx)
{
if (rsa->version != RSA_ASN1_VERSION_MULTI) {
if (s390x_crt(r0, i, rsa->p, rsa->q, rsa->dmp1, rsa->dmq1, rsa->iqmp) == 1)
diff --git a/crypto/rsa/rsa_pk1.c b/crypto/rsa/rsa_pk1.c
index 7655ef9a97..47fe112be4 100644
--- a/crypto/rsa/rsa_pk1.c
+++ b/crypto/rsa/rsa_pk1.c
@@ -28,9 +28,8 @@
#include "crypto/rsa.h"
#include "rsa_local.h"
-
int RSA_padding_add_PKCS1_type_1(unsigned char *to, int tlen,
- const unsigned char *from, int flen)
+ const unsigned char *from, int flen)
{
int j;
unsigned char *p;
@@ -43,7 +42,7 @@ int RSA_padding_add_PKCS1_type_1(unsigned char *to, int tlen,
p = (unsigned char *)to;
*(p++) = 0;
- *(p++) = 1; /* Private Key BT (Block Type) */
+ *(p++) = 1; /* Private Key BT (Block Type) */
/* pad out with 0xff data */
j = tlen - 3 - flen;
@@ -55,8 +54,8 @@ int RSA_padding_add_PKCS1_type_1(unsigned char *to, int tlen,
}
int RSA_padding_check_PKCS1_type_1(unsigned char *to, int tlen,
- const unsigned char *from, int flen,
- int num)
+ const unsigned char *from, int flen,
+ int num)
{
int i, j;
const unsigned char *p;
@@ -88,9 +87,9 @@ int RSA_padding_check_PKCS1_type_1(unsigned char *to, int tlen,
}
/* scan over padding data */
- j = flen - 1; /* one for type. */
+ j = flen - 1; /* one for type. */
for (i = 0; i < j; i++) {
- if (*p != 0xff) { /* should decrypt to 0xff */
+ if (*p != 0xff) { /* should decrypt to 0xff */
if (*p == 0) {
p++;
break;
@@ -111,7 +110,7 @@ int RSA_padding_check_PKCS1_type_1(unsigned char *to, int tlen,
ERR_raise(ERR_LIB_RSA, RSA_R_BAD_PAD_BYTE_COUNT);
return -1;
}
- i++; /* Skip over the '\0' */
+ i++; /* Skip over the '\0' */
j -= i;
if (j > tlen) {
ERR_raise(ERR_LIB_RSA, RSA_R_DATA_TOO_LARGE);
@@ -123,8 +122,8 @@ int RSA_padding_check_PKCS1_type_1(unsigned char *to, int tlen,
}
int ossl_rsa_padding_add_PKCS1_type_2_ex(OSSL_LIB_CTX *libctx, unsigned char *to,
- int tlen, const unsigned char *from,
- int flen)
+ int tlen, const unsigned char *from,
+ int flen)
{
int i, j;
unsigned char *p;
@@ -140,7 +139,7 @@ int ossl_rsa_padding_add_PKCS1_type_2_ex(OSSL_LIB_CTX *libctx, unsigned char *to
p = (unsigned char *)to;
*(p++) = 0;
- *(p++) = 2; /* Public Key BT (Block Type) */
+ *(p++) = 2; /* Public Key BT (Block Type) */
/* pad out with non-zero random data */
j = tlen - 3 - flen;
@@ -163,14 +162,14 @@ int ossl_rsa_padding_add_PKCS1_type_2_ex(OSSL_LIB_CTX *libctx, unsigned char *to
}
int RSA_padding_add_PKCS1_type_2(unsigned char *to, int tlen,
- const unsigned char *from, int flen)
+ const unsigned char *from, int flen)
{
return ossl_rsa_padding_add_PKCS1_type_2_ex(NULL, to, tlen, from, flen);
}
int RSA_padding_check_PKCS1_type_2(unsigned char *to, int tlen,
- const unsigned char *from, int flen,
- int num)
+ const unsigned char *from, int flen,
+ int num)
{
int i;
/* |em| is the encoded message, zero-padded to exactly |num| bytes */
@@ -216,7 +215,7 @@ int RSA_padding_check_PKCS1_type_2(unsigned char *to, int tlen,
unsigned int equals0 = constant_time_is_zero(em[i]);
zero_index = constant_time_select_int(~found_zero_byte & equals0,
- i, zero_index);
+ i, zero_index);
found_zero_byte |= equals0;
}
@@ -250,7 +249,7 @@ int RSA_padding_check_PKCS1_type_2(unsigned char *to, int tlen,
* The loop below has overall complexity of O(N*log(N)).
*/
tlen = constant_time_select_int(constant_time_lt(num - RSA_PKCS1_PADDING_SIZE, tlen),
- num - RSA_PKCS1_PADDING_SIZE, tlen);
+ num - RSA_PKCS1_PADDING_SIZE, tlen);
for (msg_index = 1; msg_index < num - RSA_PKCS1_PADDING_SIZE; msg_index <<= 1) {
mask = ~constant_time_eq(msg_index & (num - RSA_PKCS1_PADDING_SIZE - mlen), 0);
for (i = RSA_PKCS1_PADDING_SIZE; i < num - msg_index; i++)
@@ -275,12 +274,11 @@ int RSA_padding_check_PKCS1_type_2(unsigned char *to, int tlen,
return constant_time_select_int(good, mlen, -1);
}
-
static int ossl_rsa_prf(OSSL_LIB_CTX *ctx,
- unsigned char *to, int tlen,
- const char *label, int llen,
- const unsigned char *kdk,
- uint16_t bitlen)
+ unsigned char *to, int tlen,
+ const char *label, int llen,
+ const unsigned char *kdk,
+ uint16_t bitlen)
{
int pos;
int ret = -1;
@@ -387,9 +385,9 @@ err:
* remaining padding bytes
*/
int ossl_rsa_padding_check_PKCS1_type_2(OSSL_LIB_CTX *ctx,
- unsigned char *to, int tlen,
- const unsigned char *from, int flen,
- int num, unsigned char *kdk)
+ unsigned char *to, int tlen,
+ const unsigned char *from, int flen,
+ int num, unsigned char *kdk)
{
/*
* We need to generate a random length for the synthetic message, to avoid
@@ -434,8 +432,9 @@ int ossl_rsa_padding_check_PKCS1_type_2(OSSL_LIB_CTX *ctx,
/* decide how long the random message should be */
if (ossl_rsa_prf(ctx, candidate_lengths, sizeof(candidate_lengths),
- "length", 6, kdk,
- MAX_LEN_GEN_TRIES * sizeof(len_candidate) * 8) < 0)
+ "length", 6, kdk,
+ MAX_LEN_GEN_TRIES * sizeof(len_candidate) * 8)
+ < 0)
goto err;
/*
@@ -454,7 +453,7 @@ int ossl_rsa_padding_check_PKCS1_type_2(OSSL_LIB_CTX *ctx,
synthetic_length = 0;
for (i = 0; i < MAX_LEN_GEN_TRIES * (int)sizeof(len_candidate);
- i += sizeof(len_candidate)) {
+ i += sizeof(len_candidate)) {
len_candidate = (candidate_lengths[i] << 8) | candidate_lengths[i + 1];
len_candidate &= len_mask;
@@ -474,7 +473,7 @@ int ossl_rsa_padding_check_PKCS1_type_2(OSSL_LIB_CTX *ctx,
for (i = 2; i < flen; i++) {
unsigned int equals0 = constant_time_is_zero(from[i]);
zero_index = constant_time_select_int(~found_zero_byte & equals0,
- i, zero_index);
+ i, zero_index);
found_zero_byte |= equals0;
}
@@ -545,10 +544,10 @@ err:
* https://tools.ietf.org/html/rfc5246#section-7.4.7.1).
*/
int ossl_rsa_padding_check_PKCS1_type_2_TLS(OSSL_LIB_CTX *libctx,
- unsigned char *to, size_t tlen,
- const unsigned char *from,
- size_t flen, int client_version,
- int alt_version)
+ unsigned char *to, size_t tlen,
+ const unsigned char *from,
+ size_t flen, int client_version,
+ int alt_version)
{
unsigned int i, good, version_good;
unsigned char rand_premaster_secret[SSL_MAX_MASTER_KEY_LENGTH];
@@ -558,7 +557,7 @@ int ossl_rsa_padding_check_PKCS1_type_2_TLS(OSSL_LIB_CTX *libctx,
* we've been called incorrectly. We can fail immediately.
*/
if (flen < RSA_PKCS1_PADDING_SIZE + SSL_MAX_MASTER_KEY_LENGTH
- || tlen < SSL_MAX_MASTER_KEY_LENGTH) {
+ || tlen < SSL_MAX_MASTER_KEY_LENGTH) {
ERR_raise(ERR_LIB_RSA, RSA_R_PKCS_DECODING_ERROR);
return -1;
}
@@ -568,7 +567,8 @@ int ossl_rsa_padding_check_PKCS1_type_2_TLS(OSSL_LIB_CTX *libctx,
* to decrypt.
*/
if (RAND_priv_bytes_ex(libctx, rand_premaster_secret,
- sizeof(rand_premaster_secret), 0) <= 0) {
+ sizeof(rand_premaster_secret), 0)
+ <= 0) {
ERR_raise(ERR_LIB_RSA, ERR_R_INTERNAL_ERROR);
return -1;
}
@@ -581,7 +581,6 @@ int ossl_rsa_padding_check_PKCS1_type_2_TLS(OSSL_LIB_CTX *libctx,
good &= ~constant_time_is_zero_8(from[i]);
good &= constant_time_is_zero_8(from[flen - SSL_MAX_MASTER_KEY_LENGTH - 1]);
-
/*
* If the version in the decrypted pre-master secret is correct then
* version_good will be 0xff, otherwise it'll be zero. The
@@ -590,12 +589,10 @@ int ossl_rsa_padding_check_PKCS1_type_2_TLS(OSSL_LIB_CTX *libctx,
* check as a "bad version oracle". Thus version checks are done in
* constant time and are treated like any other decryption error.
*/
- version_good =
- constant_time_eq(from[flen - SSL_MAX_MASTER_KEY_LENGTH],
- (client_version >> 8) & 0xff);
- version_good &=
- constant_time_eq(from[flen - SSL_MAX_MASTER_KEY_LENGTH + 1],
- client_version & 0xff);
+ version_good = constant_time_eq(from[flen - SSL_MAX_MASTER_KEY_LENGTH],
+ (client_version >> 8) & 0xff);
+ version_good &= constant_time_eq(from[flen - SSL_MAX_MASTER_KEY_LENGTH + 1],
+ client_version & 0xff);
/*
* The premaster secret must contain the same version number as the
@@ -610,27 +607,23 @@ int ossl_rsa_padding_check_PKCS1_type_2_TLS(OSSL_LIB_CTX *libctx,
if (alt_version > 0) {
unsigned int workaround_good;
- workaround_good =
- constant_time_eq(from[flen - SSL_MAX_MASTER_KEY_LENGTH],
- (alt_version >> 8) & 0xff);
- workaround_good &=
- constant_time_eq(from[flen - SSL_MAX_MASTER_KEY_LENGTH + 1],
- alt_version & 0xff);
+ workaround_good = constant_time_eq(from[flen - SSL_MAX_MASTER_KEY_LENGTH],
+ (alt_version >> 8) & 0xff);
+ workaround_good &= constant_time_eq(from[flen - SSL_MAX_MASTER_KEY_LENGTH + 1],
+ alt_version & 0xff);
version_good |= workaround_good;
}
good &= version_good;
-
/*
* Now copy the result over to the to buffer if good, or random data if
* not good.
*/
for (i = 0; i < SSL_MAX_MASTER_KEY_LENGTH; i++) {
- to[i] =
- constant_time_select_8(good,
- from[flen - SSL_MAX_MASTER_KEY_LENGTH + i],
- rand_premaster_secret[i]);
+ to[i] = constant_time_select_8(good,
+ from[flen - SSL_MAX_MASTER_KEY_LENGTH + i],
+ rand_premaster_secret[i]);
}
/*
diff --git a/crypto/rsa/rsa_pmeth.c b/crypto/rsa/rsa_pmeth.c
index 5059d1bd87..dfc9537b3a 100644
--- a/crypto/rsa/rsa_pmeth.c
+++ b/crypto/rsa/rsa_pmeth.c
@@ -115,8 +115,7 @@ static int setup_tbuf(RSA_PKEY_CTX *ctx, EVP_PKEY_CTX *pk)
{
if (ctx->tbuf != NULL)
return 1;
- if ((ctx->tbuf =
- OPENSSL_malloc(RSA_size(EVP_PKEY_get0_RSA(pk->pkey)))) == NULL)
+ if ((ctx->tbuf = OPENSSL_malloc(RSA_size(EVP_PKEY_get0_RSA(pk->pkey)))) == NULL)
return 0;
return 1;
}
@@ -133,8 +132,8 @@ static void pkey_rsa_cleanup(EVP_PKEY_CTX *ctx)
}
static int pkey_rsa_sign(EVP_PKEY_CTX *ctx, unsigned char *sig,
- size_t *siglen, const unsigned char *tbs,
- size_t tbslen)
+ size_t *siglen, const unsigned char *tbs,
+ size_t tbslen)
{
int ret;
RSA_PKEY_CTX *rctx = ctx->data;
@@ -179,11 +178,11 @@ static int pkey_rsa_sign(EVP_PKEY_CTX *ctx, unsigned char *sig,
memcpy(rctx->tbuf, tbs, tbslen);
rctx->tbuf[tbslen] = RSA_X931_hash_id(EVP_MD_get_type(rctx->md));
ret = RSA_private_encrypt((int)(tbslen + 1), rctx->tbuf,
- sig, rsa, RSA_X931_PADDING);
+ sig, rsa, RSA_X931_PADDING);
} else if (rctx->pad_mode == RSA_PKCS1_PADDING) {
unsigned int sltmp;
ret = RSA_sign(EVP_MD_get_type(rctx->md),
- tbs, (unsigned int)tbslen, sig, &sltmp, rsa);
+ tbs, (unsigned int)tbslen, sig, &sltmp, rsa);
if (ret <= 0)
return ret;
ret = sltmp;
@@ -191,12 +190,12 @@ static int pkey_rsa_sign(EVP_PKEY_CTX *ctx, unsigned char *sig,
if (!setup_tbuf(rctx, ctx))
return -1;
if (!RSA_padding_add_PKCS1_PSS_mgf1(rsa,
- rctx->tbuf, tbs,
- rctx->md, rctx->mgf1md,
- rctx->saltlen))
+ rctx->tbuf, tbs,
+ rctx->md, rctx->mgf1md,
+ rctx->saltlen))
return -1;
ret = RSA_private_encrypt(RSA_size(rsa), rctx->tbuf,
- sig, rsa, RSA_NO_PADDING);
+ sig, rsa, RSA_NO_PADDING);
} else {
return -1;
}
@@ -210,8 +209,8 @@ static int pkey_rsa_sign(EVP_PKEY_CTX *ctx, unsigned char *sig,
}
static int pkey_rsa_verifyrecover(EVP_PKEY_CTX *ctx,
- unsigned char *rout, size_t *routlen,
- const unsigned char *sig, size_t siglen)
+ unsigned char *rout, size_t *routlen,
+ const unsigned char *sig, size_t siglen)
{
int ret;
RSA_PKEY_CTX *rctx = ctx->data;
@@ -227,7 +226,7 @@ static int pkey_rsa_verifyrecover(EVP_PKEY_CTX *ctx,
if (!setup_tbuf(rctx, ctx))
return -1;
ret = RSA_public_decrypt((int)siglen, sig, rctx->tbuf, rsa,
- RSA_X931_PADDING);
+ RSA_X931_PADDING);
if (ret <= 0)
return 0;
ret--;
@@ -244,8 +243,8 @@ static int pkey_rsa_verifyrecover(EVP_PKEY_CTX *ctx,
} else if (rctx->pad_mode == RSA_PKCS1_PADDING) {
size_t sltmp;
ret = ossl_rsa_verify(EVP_MD_get_type(rctx->md),
- NULL, 0, rout, &sltmp,
- sig, siglen, rsa);
+ NULL, 0, rout, &sltmp,
+ sig, siglen, rsa);
if (ret <= 0)
return 0;
ret = (int)sltmp;
@@ -262,8 +261,8 @@ static int pkey_rsa_verifyrecover(EVP_PKEY_CTX *ctx,
}
static int pkey_rsa_verify(EVP_PKEY_CTX *ctx,
- const unsigned char *sig, size_t siglen,
- const unsigned char *tbs, size_t tbslen)
+ const unsigned char *sig, size_t siglen,
+ const unsigned char *tbs, size_t tbslen)
{
RSA_PKEY_CTX *rctx = ctx->data;
/*
@@ -278,7 +277,7 @@ static int pkey_rsa_verify(EVP_PKEY_CTX *ctx,
if (rctx->md) {
if (rctx->pad_mode == RSA_PKCS1_PADDING)
return RSA_verify(EVP_MD_get_type(rctx->md), tbs, (unsigned int)tbslen,
- sig, (unsigned int)siglen, rsa);
+ sig, (unsigned int)siglen, rsa);
md_size = EVP_MD_get_size(rctx->md);
if (md_size <= 0) {
ERR_raise(ERR_LIB_RSA, RSA_R_INVALID_DIGEST_LENGTH);
@@ -296,12 +295,12 @@ static int pkey_rsa_verify(EVP_PKEY_CTX *ctx,
if (!setup_tbuf(rctx, ctx))
return -1;
ret = RSA_public_decrypt((int)siglen, sig, rctx->tbuf,
- rsa, RSA_NO_PADDING);
+ rsa, RSA_NO_PADDING);
if (ret <= 0)
return 0;
ret = RSA_verify_PKCS1_PSS_mgf1(rsa, tbs,
- rctx->md, rctx->mgf1md,
- rctx->tbuf, rctx->saltlen);
+ rctx->md, rctx->mgf1md,
+ rctx->tbuf, rctx->saltlen);
if (ret <= 0)
return 0;
return 1;
@@ -312,7 +311,7 @@ static int pkey_rsa_verify(EVP_PKEY_CTX *ctx,
if (!setup_tbuf(rctx, ctx))
return -1;
rslen = RSA_public_decrypt((int)siglen, sig, rctx->tbuf,
- rsa, rctx->pad_mode);
+ rsa, rctx->pad_mode);
if (rslen <= 0)
return 0;
}
@@ -321,12 +320,11 @@ static int pkey_rsa_verify(EVP_PKEY_CTX *ctx,
return 0;
return 1;
-
}
static int pkey_rsa_encrypt(EVP_PKEY_CTX *ctx,
- unsigned char *out, size_t *outlen,
- const unsigned char *in, size_t inlen)
+ unsigned char *out, size_t *outlen,
+ const unsigned char *in, size_t inlen)
{
int ret;
RSA_PKEY_CTX *rctx = ctx->data;
@@ -342,10 +340,10 @@ static int pkey_rsa_encrypt(EVP_PKEY_CTX *ctx,
if (!setup_tbuf(rctx, ctx))
return -1;
if (!RSA_padding_add_PKCS1_OAEP_mgf1(rctx->tbuf, klen,
- in, (int)inlen,
- rctx->oaep_label,
- (int)rctx->oaep_labellen,
- rctx->md, rctx->mgf1md))
+ in, (int)inlen,
+ rctx->oaep_label,
+ (int)rctx->oaep_labellen,
+ rctx->md, rctx->mgf1md))
return -1;
ret = RSA_public_encrypt(klen, rctx->tbuf, out, rsa, RSA_NO_PADDING);
} else {
@@ -358,8 +356,8 @@ static int pkey_rsa_encrypt(EVP_PKEY_CTX *ctx,
}
static int pkey_rsa_decrypt(EVP_PKEY_CTX *ctx,
- unsigned char *out, size_t *outlen,
- const unsigned char *in, size_t inlen)
+ unsigned char *out, size_t *outlen,
+ const unsigned char *in, size_t inlen)
{
int ret;
int pad_mode;
@@ -378,13 +376,12 @@ static int pkey_rsa_decrypt(EVP_PKEY_CTX *ctx,
if (ret <= 0)
return ret;
ret = RSA_padding_check_PKCS1_OAEP_mgf1(out, ret, rctx->tbuf,
- ret, ret,
- rctx->oaep_label,
- (int)rctx->oaep_labellen,
- rctx->md, rctx->mgf1md);
+ ret, ret,
+ rctx->oaep_label,
+ (int)rctx->oaep_labellen,
+ rctx->md, rctx->mgf1md);
} else {
- if (rctx->pad_mode == RSA_PKCS1_PADDING &&
- rctx->implicit_rejection == 0)
+ if (rctx->pad_mode == RSA_PKCS1_PADDING && rctx->implicit_rejection == 0)
pad_mode = RSA_PKCS1_NO_IMPLICIT_REJECT_PADDING;
else
pad_mode = rctx->pad_mode;
@@ -439,7 +436,6 @@ static int check_padding_md(const EVP_MD *md, int padding)
default:
ERR_raise(ERR_LIB_RSA, RSA_R_INVALID_DIGEST);
return 0;
-
}
}
@@ -457,8 +453,7 @@ static int pkey_rsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
if (!check_padding_md(rctx->md, p1))
return 0;
if (p1 == RSA_PKCS1_PSS_PADDING) {
- if (!(ctx->operation &
- (EVP_PKEY_OP_SIGN | EVP_PKEY_OP_VERIFY)))
+ if (!(ctx->operation & (EVP_PKEY_OP_SIGN | EVP_PKEY_OP_VERIFY)))
goto bad_pad;
if (!rctx->md)
rctx->md = EVP_sha1();
@@ -474,7 +469,7 @@ static int pkey_rsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
rctx->pad_mode = p1;
return 1;
}
- bad_pad:
+ bad_pad:
ERR_raise(ERR_LIB_RSA, RSA_R_ILLEGAL_OR_UNSUPPORTED_PADDING_MODE);
return -2;
@@ -505,7 +500,7 @@ static int pkey_rsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
return -2;
}
if ((p1 == RSA_PSS_SALTLEN_DIGEST
- && rctx->min_saltlen > md_size)
+ && rctx->min_saltlen > md_size)
|| (p1 >= 0 && p1 < rctx->min_saltlen)) {
ERR_raise(ERR_LIB_RSA, RSA_R_PSS_SALTLEN_TOO_SMALL);
return 0;
@@ -631,7 +626,7 @@ static int pkey_rsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
#ifndef OPENSSL_NO_CMS
case EVP_PKEY_CTRL_CMS_SIGN:
#endif
- return 1;
+ return 1;
case EVP_PKEY_CTRL_PKCS7_ENCRYPT:
case EVP_PKEY_CTRL_PKCS7_DECRYPT:
@@ -639,8 +634,8 @@ static int pkey_rsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
case EVP_PKEY_CTRL_CMS_DECRYPT:
case EVP_PKEY_CTRL_CMS_ENCRYPT:
#endif
- if (!pkey_ctx_is_pss(ctx))
- return 1;
+ if (!pkey_ctx_is_pss(ctx))
+ return 1;
/* fall through */
case EVP_PKEY_CTRL_PEER_KEY:
ERR_raise(ERR_LIB_RSA, RSA_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
@@ -648,12 +643,11 @@ static int pkey_rsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
default:
return -2;
-
}
}
static int pkey_rsa_ctrl_str(EVP_PKEY_CTX *ctx,
- const char *type, const char *value)
+ const char *type, const char *value)
{
if (value == NULL) {
ERR_raise(ERR_LIB_RSA, RSA_R_VALUE_MISSING);
@@ -720,18 +714,18 @@ static int pkey_rsa_ctrl_str(EVP_PKEY_CTX *ctx,
if (strcmp(type, "rsa_mgf1_md") == 0)
return EVP_PKEY_CTX_md(ctx,
- EVP_PKEY_OP_TYPE_SIG | EVP_PKEY_OP_TYPE_CRYPT,
- EVP_PKEY_CTRL_RSA_MGF1_MD, value);
+ EVP_PKEY_OP_TYPE_SIG | EVP_PKEY_OP_TYPE_CRYPT,
+ EVP_PKEY_CTRL_RSA_MGF1_MD, value);
if (pkey_ctx_is_pss(ctx)) {
if (strcmp(type, "rsa_pss_keygen_mgf1_md") == 0)
return EVP_PKEY_CTX_md(ctx, EVP_PKEY_OP_KEYGEN,
- EVP_PKEY_CTRL_RSA_MGF1_MD, value);
+ EVP_PKEY_CTRL_RSA_MGF1_MD, value);
if (strcmp(type, "rsa_pss_keygen_md") == 0)
return EVP_PKEY_CTX_md(ctx, EVP_PKEY_OP_KEYGEN,
- EVP_PKEY_CTRL_MD, value);
+ EVP_PKEY_CTRL_MD, value);
if (strcmp(type, "rsa_pss_keygen_saltlen") == 0) {
int saltlen = atoi(value);
@@ -742,7 +736,7 @@ static int pkey_rsa_ctrl_str(EVP_PKEY_CTX *ctx,
if (strcmp(type, "rsa_oaep_md") == 0)
return EVP_PKEY_CTX_md(ctx, EVP_PKEY_OP_TYPE_CRYPT,
- EVP_PKEY_CTRL_RSA_OAEP_MD, value);
+ EVP_PKEY_CTRL_RSA_OAEP_MD, value);
if (strcmp(type, "rsa_oaep_label") == 0) {
unsigned char *lab;
@@ -772,8 +766,9 @@ static int rsa_set_pss_param(RSA *rsa, EVP_PKEY_CTX *ctx)
if (rctx->md == NULL && rctx->mgf1md == NULL && rctx->saltlen == -2)
return 1;
rsa->pss = ossl_rsa_pss_params_create(rctx->md, rctx->mgf1md,
- rctx->saltlen == -2
- ? 0 : rctx->saltlen);
+ rctx->saltlen == -2
+ ? 0
+ : rctx->saltlen);
if (rsa->pss == NULL)
return 0;
return 1;
@@ -805,7 +800,7 @@ static int pkey_rsa_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
pcb = NULL;
}
ret = RSA_generate_multi_prime_key(rsa, rctx->nbits, rctx->primes,
- rctx->pub_exp, pcb);
+ rctx->pub_exp, pcb);
BN_GENCB_free(pcb);
if (ret > 0 && !rsa_set_pss_param(rsa, ctx)) {
RSA_free(rsa);
diff --git a/crypto/rsa/rsa_pss.c b/crypto/rsa/rsa_pss.c
index a2bc198a89..98d6e70346 100644
--- a/crypto/rsa/rsa_pss.c
+++ b/crypto/rsa/rsa_pss.c
@@ -25,26 +25,26 @@
static const unsigned char zeroes[] = { 0, 0, 0, 0, 0, 0, 0, 0 };
#if defined(_MSC_VER) && defined(_ARM_)
-# pragma optimize("g", off)
+#pragma optimize("g", off)
#endif
int RSA_verify_PKCS1_PSS(RSA *rsa, const unsigned char *mHash,
- const EVP_MD *Hash, const unsigned char *EM,
- int sLen)
+ const EVP_MD *Hash, const unsigned char *EM,
+ int sLen)
{
return RSA_verify_PKCS1_PSS_mgf1(rsa, mHash, Hash, NULL, EM, sLen);
}
int RSA_verify_PKCS1_PSS_mgf1(RSA *rsa, const unsigned char *mHash,
- const EVP_MD *Hash, const EVP_MD *mgf1Hash,
- const unsigned char *EM, int sLen)
+ const EVP_MD *Hash, const EVP_MD *mgf1Hash,
+ const unsigned char *EM, int sLen)
{
return ossl_rsa_verify_PKCS1_PSS_mgf1(rsa, mHash, Hash, mgf1Hash, EM, &sLen);
}
int ossl_rsa_verify_PKCS1_PSS_mgf1(RSA *rsa, const unsigned char *mHash,
- const EVP_MD *Hash, const EVP_MD *mgf1Hash,
- const unsigned char *EM, int *sLenOut)
+ const EVP_MD *Hash, const EVP_MD *mgf1Hash,
+ const unsigned char *EM, int *sLenOut)
{
int i;
int ret = 0;
@@ -114,17 +114,18 @@ int ossl_rsa_verify_PKCS1_PSS_mgf1(RSA *rsa, const unsigned char *mHash,
DB[i] ^= EM[i];
if (MSBits)
DB[0] &= 0xFF >> (8 - MSBits);
- for (i = 0; DB[i] == 0 && i < (maskedDBLen - 1); i++) ;
+ for (i = 0; DB[i] == 0 && i < (maskedDBLen - 1); i++)
+ ;
if (DB[i++] != 0x1) {
ERR_raise(ERR_LIB_RSA, RSA_R_SLEN_RECOVERY_FAILED);
goto err;
}
if (sLen != RSA_PSS_SALTLEN_AUTO
- && sLen != RSA_PSS_SALTLEN_AUTO_DIGEST_MAX
- && (maskedDBLen - i) != sLen) {
+ && sLen != RSA_PSS_SALTLEN_AUTO_DIGEST_MAX
+ && (maskedDBLen - i) != sLen) {
ERR_raise_data(ERR_LIB_RSA, RSA_R_SLEN_CHECK_FAILED,
- "expected: %d retrieved: %d", sLen,
- maskedDBLen - i);
+ "expected: %d retrieved: %d", sLen,
+ maskedDBLen - i);
goto err;
} else {
sLen = maskedDBLen - i;
@@ -147,33 +148,32 @@ int ossl_rsa_verify_PKCS1_PSS_mgf1(RSA *rsa, const unsigned char *mHash,
}
*sLenOut = sLen;
- err:
+err:
OPENSSL_free(DB);
EVP_MD_CTX_free(ctx);
return ret;
-
}
int RSA_padding_add_PKCS1_PSS(RSA *rsa, unsigned char *EM,
- const unsigned char *mHash,
- const EVP_MD *Hash, int sLen)
+ const unsigned char *mHash,
+ const EVP_MD *Hash, int sLen)
{
return RSA_padding_add_PKCS1_PSS_mgf1(rsa, EM, mHash, Hash, NULL, sLen);
}
int RSA_padding_add_PKCS1_PSS_mgf1(RSA *rsa, unsigned char *EM,
- const unsigned char *mHash,
- const EVP_MD *Hash, const EVP_MD *mgf1Hash,
- int sLen)
+ const unsigned char *mHash,
+ const EVP_MD *Hash, const EVP_MD *mgf1Hash,
+ int sLen)
{
return ossl_rsa_padding_add_PKCS1_PSS_mgf1(rsa, EM, mHash, Hash, mgf1Hash, &sLen);
}
int ossl_rsa_padding_add_PKCS1_PSS_mgf1(RSA *rsa, unsigned char *EM,
- const unsigned char *mHash,
- const EVP_MD *Hash, const EVP_MD *mgf1Hash,
- int *sLenOut)
+ const unsigned char *mHash,
+ const EVP_MD *Hash, const EVP_MD *mgf1Hash,
+ int *sLenOut)
{
int i;
int ret = 0;
@@ -207,7 +207,7 @@ int ossl_rsa_padding_add_PKCS1_PSS_mgf1(RSA *rsa, unsigned char *EM,
if (sLen == RSA_PSS_SALTLEN_DIGEST) {
sLen = hLen;
} else if (sLen == RSA_PSS_SALTLEN_MAX_SIGN
- || sLen == RSA_PSS_SALTLEN_AUTO) {
+ || sLen == RSA_PSS_SALTLEN_AUTO) {
sLen = RSA_PSS_SALTLEN_MAX;
} else if (sLen == RSA_PSS_SALTLEN_AUTO_DIGEST_MAX) {
sLen = RSA_PSS_SALTLEN_MAX;
@@ -282,12 +282,11 @@ int ossl_rsa_padding_add_PKCS1_PSS_mgf1(RSA *rsa, unsigned char *EM,
ret = 1;
*sLenOut = sLen;
- err:
+err:
EVP_MD_CTX_free(ctx);
OPENSSL_clear_free(salt, (size_t)sLen); /* salt != NULL implies sLen > 0 */
return ret;
-
}
/*
@@ -313,13 +312,13 @@ int ossl_rsa_padding_add_PKCS1_PSS_mgf1(RSA *rsa, unsigned char *EM,
* }
*/
static const RSA_PSS_PARAMS_30 default_RSASSA_PSS_params = {
- NID_sha1, /* default hashAlgorithm */
+ NID_sha1, /* default hashAlgorithm */
{
- NID_mgf1, /* default maskGenAlgorithm */
- NID_sha1 /* default MGF1 hash */
+ NID_mgf1, /* default maskGenAlgorithm */
+ NID_sha1 /* default MGF1 hash */
},
- 20, /* default saltLength */
- 1 /* default trailerField (0xBC) */
+ 20, /* default saltLength */
+ 1 /* default trailerField (0xBC) */
};
int ossl_rsa_pss_params_30_set_defaults(RSA_PSS_PARAMS_30 *rsa_pss_params)
@@ -332,22 +331,25 @@ int ossl_rsa_pss_params_30_set_defaults(RSA_PSS_PARAMS_30 *rsa_pss_params)
int ossl_rsa_pss_params_30_is_unrestricted(const RSA_PSS_PARAMS_30 *rsa_pss_params)
{
- static RSA_PSS_PARAMS_30 pss_params_cmp = { 0, };
+ static RSA_PSS_PARAMS_30 pss_params_cmp = {
+ 0,
+ };
return rsa_pss_params == NULL
|| memcmp(rsa_pss_params, &pss_params_cmp,
- sizeof(*rsa_pss_params)) == 0;
+ sizeof(*rsa_pss_params))
+ == 0;
}
int ossl_rsa_pss_params_30_copy(RSA_PSS_PARAMS_30 *to,
- const RSA_PSS_PARAMS_30 *from)
+ const RSA_PSS_PARAMS_30 *from)
{
memcpy(to, from, sizeof(*to));
return 1;
}
int ossl_rsa_pss_params_30_set_hashalg(RSA_PSS_PARAMS_30 *rsa_pss_params,
- int hashalg_nid)
+ int hashalg_nid)
{
if (rsa_pss_params == NULL)
return 0;
@@ -356,7 +358,7 @@ int ossl_rsa_pss_params_30_set_hashalg(RSA_PSS_PARAMS_30 *rsa_pss_params,
}
int ossl_rsa_pss_params_30_set_maskgenhashalg(RSA_PSS_PARAMS_30 *rsa_pss_params,
- int maskgenhashalg_nid)
+ int maskgenhashalg_nid)
{
if (rsa_pss_params == NULL)
return 0;
@@ -365,7 +367,7 @@ int ossl_rsa_pss_params_30_set_maskgenhashalg(RSA_PSS_PARAMS_30 *rsa_pss_params,
}
int ossl_rsa_pss_params_30_set_saltlen(RSA_PSS_PARAMS_30 *rsa_pss_params,
- int saltlen)
+ int saltlen)
{
if (rsa_pss_params == NULL)
return 0;
@@ -374,7 +376,7 @@ int ossl_rsa_pss_params_30_set_saltlen(RSA_PSS_PARAMS_30 *rsa_pss_params,
}
int ossl_rsa_pss_params_30_set_trailerfield(RSA_PSS_PARAMS_30 *rsa_pss_params,
- int trailerfield)
+ int trailerfield)
{
if (rsa_pss_params == NULL)
return 0;
@@ -418,5 +420,5 @@ int ossl_rsa_pss_params_30_trailerfield(const RSA_PSS_PARAMS_30 *rsa_pss_params)
}
#if defined(_MSC_VER)
-# pragma optimize("",on)
+#pragma optimize("", on)
#endif
diff --git a/crypto/rsa/rsa_saos.c b/crypto/rsa/rsa_saos.c
index dc96b6dada..afcc4c9a4d 100644
--- a/crypto/rsa/rsa_saos.c
+++ b/crypto/rsa/rsa_saos.c
@@ -21,9 +21,9 @@
#include <openssl/x509.h>
int RSA_sign_ASN1_OCTET_STRING(int type,
- const unsigned char *m, unsigned int m_len,
- unsigned char *sigret, unsigned int *siglen,
- RSA *rsa)
+ const unsigned char *m, unsigned int m_len,
+ unsigned char *sigret, unsigned int *siglen,
+ RSA *rsa)
{
ASN1_OCTET_STRING sig;
int i, j, ret = 1;
@@ -55,9 +55,9 @@ int RSA_sign_ASN1_OCTET_STRING(int type,
}
int RSA_verify_ASN1_OCTET_STRING(int dtype,
- const unsigned char *m,
- unsigned int m_len, unsigned char *sigbuf,
- unsigned int siglen, RSA *rsa)
+ const unsigned char *m,
+ unsigned int m_len, unsigned char *sigbuf,
+ unsigned int siglen, RSA *rsa)
{
int i, ret = 0;
unsigned char *s;
@@ -82,13 +82,12 @@ int RSA_verify_ASN1_OCTET_STRING(int dtype,
if (sig == NULL)
goto err;
- if (((unsigned int)sig->length != m_len) ||
- (memcmp(m, sig->data, m_len) != 0)) {
+ if (((unsigned int)sig->length != m_len) || (memcmp(m, sig->data, m_len) != 0)) {
ERR_raise(ERR_LIB_RSA, RSA_R_BAD_SIGNATURE);
} else {
ret = 1;
}
- err:
+err:
ASN1_OCTET_STRING_free(sig);
OPENSSL_clear_free(s, (unsigned int)siglen);
return ret;
diff --git a/crypto/rsa/rsa_schemes.c b/crypto/rsa/rsa_schemes.c
index 435f44e016..f487f840f8 100644
--- a/crypto/rsa/rsa_schemes.c
+++ b/crypto/rsa/rsa_schemes.c
@@ -15,8 +15,8 @@
#include "crypto/rsa.h"
static int meth2nid(const void *meth,
- int (*meth_is_a)(const void *meth, const char *name),
- const OSSL_ITEM *items, size_t items_n)
+ int (*meth_is_a)(const void *meth, const char *name),
+ const OSSL_ITEM *items, size_t items_n)
{
size_t i;
@@ -53,13 +53,13 @@ static const char *nid2name(int meth, const OSSL_ITEM *items, size_t items_n)
* }
*/
static const OSSL_ITEM oaeppss_name_nid_map[] = {
- { NID_sha1, OSSL_DIGEST_NAME_SHA1 },
- { NID_sha224, OSSL_DIGEST_NAME_SHA2_224 },
- { NID_sha256, OSSL_DIGEST_NAME_SHA2_256 },
- { NID_sha384, OSSL_DIGEST_NAME_SHA2_384 },
- { NID_sha512, OSSL_DIGEST_NAME_SHA2_512 },
- { NID_sha512_224, OSSL_DIGEST_NAME_SHA2_512_224 },
- { NID_sha512_256, OSSL_DIGEST_NAME_SHA2_512_256 },
+ { NID_sha1, OSSL_DIGEST_NAME_SHA1 },
+ { NID_sha224, OSSL_DIGEST_NAME_SHA2_224 },
+ { NID_sha256, OSSL_DIGEST_NAME_SHA2_256 },
+ { NID_sha384, OSSL_DIGEST_NAME_SHA2_384 },
+ { NID_sha512, OSSL_DIGEST_NAME_SHA2_512 },
+ { NID_sha512_224, OSSL_DIGEST_NAME_SHA2_512_224 },
+ { NID_sha512_256, OSSL_DIGEST_NAME_SHA2_512_256 },
};
static int md_is_a(const void *md, const char *name)
@@ -70,7 +70,7 @@ static int md_is_a(const void *md, const char *name)
int ossl_rsa_oaeppss_md2nid(const EVP_MD *md)
{
return meth2nid(md, md_is_a,
- oaeppss_name_nid_map, OSSL_NELEM(oaeppss_name_nid_map));
+ oaeppss_name_nid_map, OSSL_NELEM(oaeppss_name_nid_map));
}
const char *ossl_rsa_oaeppss_nid2name(int md)
diff --git a/crypto/rsa/rsa_sign.c b/crypto/rsa/rsa_sign.c
index a3235fcbc3..7b6b2ffedb 100644
--- a/crypto/rsa/rsa_sign.c
+++ b/crypto/rsa/rsa_sign.c
@@ -19,24 +19,24 @@
#include <openssl/rsa.h>
#include <openssl/objects.h>
#ifndef FIPS_MODULE
-# ifndef OPENSSL_NO_MD2
-# include <openssl/md2.h> /* uses MD2_DIGEST_LENGTH */
-# endif
-# ifndef OPENSSL_NO_MD4
-# include <openssl/md4.h> /* uses MD4_DIGEST_LENGTH */
-# endif
-# ifndef OPENSSL_NO_MD5
-# include <openssl/md5.h> /* uses MD5_DIGEST_LENGTH */
-# endif
-# ifndef OPENSSL_NO_MDC2
-# include <openssl/mdc2.h> /* uses MDC2_DIGEST_LENGTH */
-# endif
-# ifndef OPENSSL_NO_RMD160
-# include <openssl/ripemd.h> /* uses RIPEMD160_DIGEST_LENGTH */
-# endif
-# ifndef OPENSSL_NO_SM3
-# include "internal/sm3.h" /* uses SM3_DIGEST_LENGTH */
-# endif
+#ifndef OPENSSL_NO_MD2
+#include <openssl/md2.h> /* uses MD2_DIGEST_LENGTH */
+#endif
+#ifndef OPENSSL_NO_MD4
+#include <openssl/md4.h> /* uses MD4_DIGEST_LENGTH */
+#endif
+#ifndef OPENSSL_NO_MD5
+#include <openssl/md5.h> /* uses MD5_DIGEST_LENGTH */
+#endif
+#ifndef OPENSSL_NO_MDC2
+#include <openssl/mdc2.h> /* uses MDC2_DIGEST_LENGTH */
+#endif
+#ifndef OPENSSL_NO_RMD160
+#include <openssl/ripemd.h> /* uses RIPEMD160_DIGEST_LENGTH */
+#endif
+#ifndef OPENSSL_NO_SM3
+#include "internal/sm3.h" /* uses SM3_DIGEST_LENGTH */
+#endif
#endif
#include <openssl/sha.h> /* uses SHA???_DIGEST_LENGTH */
#include "crypto/rsa.h"
@@ -77,74 +77,74 @@
#define ASN1_OID 0x06
/* SHA OIDs are of the form: (2 16 840 1 101 3 4 2 |n|) */
-#define ENCODE_DIGESTINFO_SHA(name, n, sz) \
-static const unsigned char digestinfo_##name##_der[] = { \
- ASN1_SEQUENCE, 0x11 + sz, \
- ASN1_SEQUENCE, 0x0d, \
- ASN1_OID, 0x09, 2 * 40 + 16, 0x86, 0x48, 1, 101, 3, 4, 2, n, \
- ASN1_NULL, 0x00, \
- ASN1_OCTET_STRING, sz \
-};
+#define ENCODE_DIGESTINFO_SHA(name, n, sz) \
+ static const unsigned char digestinfo_##name##_der[] = { \
+ ASN1_SEQUENCE, 0x11 + sz, \
+ ASN1_SEQUENCE, 0x0d, \
+ ASN1_OID, 0x09, 2 * 40 + 16, 0x86, 0x48, 1, 101, 3, 4, 2, n, \
+ ASN1_NULL, 0x00, \
+ ASN1_OCTET_STRING, sz \
+ };
/* MD2, MD4 and MD5 OIDs are of the form: (1 2 840 113549 2 |n|) */
-#define ENCODE_DIGESTINFO_MD(name, n, sz) \
-static const unsigned char digestinfo_##name##_der[] = { \
- ASN1_SEQUENCE, 0x10 + sz, \
- ASN1_SEQUENCE, 0x0c, \
- ASN1_OID, 0x08, 1 * 40 + 2, 0x86, 0x48, 0x86, 0xf7, 0x0d, 2, n, \
- ASN1_NULL, 0x00, \
- ASN1_OCTET_STRING, sz \
-};
+#define ENCODE_DIGESTINFO_MD(name, n, sz) \
+ static const unsigned char digestinfo_##name##_der[] = { \
+ ASN1_SEQUENCE, 0x10 + sz, \
+ ASN1_SEQUENCE, 0x0c, \
+ ASN1_OID, 0x08, 1 * 40 + 2, 0x86, 0x48, 0x86, 0xf7, 0x0d, 2, n, \
+ ASN1_NULL, 0x00, \
+ ASN1_OCTET_STRING, sz \
+ };
#ifndef FIPS_MODULE
-# ifndef OPENSSL_NO_MD2
+#ifndef OPENSSL_NO_MD2
ENCODE_DIGESTINFO_MD(md2, 0x02, MD2_DIGEST_LENGTH)
-# endif
-# ifndef OPENSSL_NO_MD4
+#endif
+#ifndef OPENSSL_NO_MD4
ENCODE_DIGESTINFO_MD(md4, 0x03, MD4_DIGEST_LENGTH)
-# endif
-# ifndef OPENSSL_NO_MD5
+#endif
+#ifndef OPENSSL_NO_MD5
ENCODE_DIGESTINFO_MD(md5, 0x05, MD5_DIGEST_LENGTH)
-# endif
-# ifndef OPENSSL_NO_MDC2
+#endif
+#ifndef OPENSSL_NO_MDC2
/* MDC-2 (2 5 8 3 101) */
static const unsigned char digestinfo_mdc2_der[] = {
ASN1_SEQUENCE, 0x0c + MDC2_DIGEST_LENGTH,
- ASN1_SEQUENCE, 0x08,
- ASN1_OID, 0x04, 2 * 40 + 5, 8, 3, 101,
- ASN1_NULL, 0x00,
- ASN1_OCTET_STRING, MDC2_DIGEST_LENGTH
+ ASN1_SEQUENCE, 0x08,
+ ASN1_OID, 0x04, 2 * 40 + 5, 8, 3, 101,
+ ASN1_NULL, 0x00,
+ ASN1_OCTET_STRING, MDC2_DIGEST_LENGTH
};
-# endif
-# ifndef OPENSSL_NO_RMD160
+#endif
+#ifndef OPENSSL_NO_RMD160
/* RIPEMD160 (1 3 36 3 2 1) */
static const unsigned char digestinfo_ripemd160_der[] = {
ASN1_SEQUENCE, 0x0d + RIPEMD160_DIGEST_LENGTH,
- ASN1_SEQUENCE, 0x09,
- ASN1_OID, 0x05, 1 * 40 + 3, 36, 3, 2, 1,
- ASN1_NULL, 0x00,
- ASN1_OCTET_STRING, RIPEMD160_DIGEST_LENGTH
+ ASN1_SEQUENCE, 0x09,
+ ASN1_OID, 0x05, 1 * 40 + 3, 36, 3, 2, 1,
+ ASN1_NULL, 0x00,
+ ASN1_OCTET_STRING, RIPEMD160_DIGEST_LENGTH
};
-# endif
-# ifndef OPENSSL_NO_SM3
+#endif
+#ifndef OPENSSL_NO_SM3
/* SM3 (1 2 156 10197 1 401) */
static const unsigned char digestinfo_sm3_der[] = {
ASN1_SEQUENCE, 0x10 + SM3_DIGEST_LENGTH,
- ASN1_SEQUENCE, 0x0c,
- ASN1_OID, 0x08, 1 * 40 + 2, 0x81, 0x1c, 0xcf, 0x55, 1, 0x83, 0x78,
- ASN1_NULL, 0x00,
- ASN1_OCTET_STRING, SM3_DIGEST_LENGTH
+ ASN1_SEQUENCE, 0x0c,
+ ASN1_OID, 0x08, 1 * 40 + 2, 0x81, 0x1c, 0xcf, 0x55, 1, 0x83, 0x78,
+ ASN1_NULL, 0x00,
+ ASN1_OCTET_STRING, SM3_DIGEST_LENGTH
};
-# endif
+#endif
#endif /* FIPS_MODULE */
/* SHA-1 (1 3 14 3 2 26) */
static const unsigned char digestinfo_sha1_der[] = {
ASN1_SEQUENCE, 0x0d + SHA_DIGEST_LENGTH,
- ASN1_SEQUENCE, 0x09,
- ASN1_OID, 0x05, 1 * 40 + 3, 14, 3, 2, 26,
- ASN1_NULL, 0x00,
- ASN1_OCTET_STRING, SHA_DIGEST_LENGTH
+ ASN1_SEQUENCE, 0x09,
+ ASN1_OID, 0x05, 1 * 40 + 3, 14, 3, 2, 26,
+ ASN1_NULL, 0x00,
+ ASN1_OCTET_STRING, SHA_DIGEST_LENGTH
};
ENCODE_DIGESTINFO_SHA(sha256, 0x01, SHA256_DIGEST_LENGTH)
@@ -158,93 +158,92 @@ ENCODE_DIGESTINFO_SHA(sha3_256, 0x08, SHA256_DIGEST_LENGTH)
ENCODE_DIGESTINFO_SHA(sha3_384, 0x09, SHA384_DIGEST_LENGTH)
ENCODE_DIGESTINFO_SHA(sha3_512, 0x0a, SHA512_DIGEST_LENGTH)
-#define MD_CASE(name) \
- case NID_##name: \
- *len = sizeof(digestinfo_##name##_der); \
+#define MD_CASE(name) \
+ case NID_##name: \
+ *len = sizeof(digestinfo_##name##_der); \
return digestinfo_##name##_der;
const unsigned char *ossl_rsa_digestinfo_encoding(int md_nid, size_t *len)
{
switch (md_nid) {
#ifndef FIPS_MODULE
-# ifndef OPENSSL_NO_MDC2
- MD_CASE(mdc2)
-# endif
-# ifndef OPENSSL_NO_MD2
- MD_CASE(md2)
-# endif
-# ifndef OPENSSL_NO_MD4
- MD_CASE(md4)
-# endif
-# ifndef OPENSSL_NO_MD5
- MD_CASE(md5)
-# endif
-# ifndef OPENSSL_NO_RMD160
- MD_CASE(ripemd160)
-# endif
-# ifndef OPENSSL_NO_SM3
- MD_CASE(sm3)
-# endif
+#ifndef OPENSSL_NO_MDC2
+ MD_CASE(mdc2)
+#endif
+#ifndef OPENSSL_NO_MD2
+ MD_CASE(md2)
+#endif
+#ifndef OPENSSL_NO_MD4
+ MD_CASE(md4)
+#endif
+#ifndef OPENSSL_NO_MD5
+ MD_CASE(md5)
+#endif
+#ifndef OPENSSL_NO_RMD160
+ MD_CASE(ripemd160)
+#endif
+#ifndef OPENSSL_NO_SM3
+ MD_CASE(sm3)
+#endif
#endif /* FIPS_MODULE */
- MD_CASE(sha1)
- MD_CASE(sha224)
- MD_CASE(sha256)
- MD_CASE(sha384)
- MD_CASE(sha512)
- MD_CASE(sha512_224)
- MD_CASE(sha512_256)
- MD_CASE(sha3_224)
- MD_CASE(sha3_256)
- MD_CASE(sha3_384)
- MD_CASE(sha3_512)
+ MD_CASE(sha1)
+ MD_CASE(sha224)
+ MD_CASE(sha256)
+ MD_CASE(sha384)
+ MD_CASE(sha512)
+ MD_CASE(sha512_224)
+ MD_CASE(sha512_256)
+ MD_CASE(sha3_224)
+ MD_CASE(sha3_256)
+ MD_CASE(sha3_384)
+ MD_CASE(sha3_512)
default:
return NULL;
}
}
-#define MD_NID_CASE(name, sz) \
- case NID_##name: \
+#define MD_NID_CASE(name, sz) \
+ case NID_##name: \
return sz;
static int digest_sz_from_nid(int nid)
{
switch (nid) {
#ifndef FIPS_MODULE
-# ifndef OPENSSL_NO_MDC2
- MD_NID_CASE(mdc2, MDC2_DIGEST_LENGTH)
-# endif
-# ifndef OPENSSL_NO_MD2
- MD_NID_CASE(md2, MD2_DIGEST_LENGTH)
-# endif
-# ifndef OPENSSL_NO_MD4
- MD_NID_CASE(md4, MD4_DIGEST_LENGTH)
-# endif
-# ifndef OPENSSL_NO_MD5
- MD_NID_CASE(md5, MD5_DIGEST_LENGTH)
-# endif
-# ifndef OPENSSL_NO_RMD160
- MD_NID_CASE(ripemd160, RIPEMD160_DIGEST_LENGTH)
-# endif
+#ifndef OPENSSL_NO_MDC2
+ MD_NID_CASE(mdc2, MDC2_DIGEST_LENGTH)
+#endif
+#ifndef OPENSSL_NO_MD2
+ MD_NID_CASE(md2, MD2_DIGEST_LENGTH)
+#endif
+#ifndef OPENSSL_NO_MD4
+ MD_NID_CASE(md4, MD4_DIGEST_LENGTH)
+#endif
+#ifndef OPENSSL_NO_MD5
+ MD_NID_CASE(md5, MD5_DIGEST_LENGTH)
+#endif
+#ifndef OPENSSL_NO_RMD160
+ MD_NID_CASE(ripemd160, RIPEMD160_DIGEST_LENGTH)
+#endif
#endif /* FIPS_MODULE */
- MD_NID_CASE(sha1, SHA_DIGEST_LENGTH)
- MD_NID_CASE(sha224, SHA224_DIGEST_LENGTH)
- MD_NID_CASE(sha256, SHA256_DIGEST_LENGTH)
- MD_NID_CASE(sha384, SHA384_DIGEST_LENGTH)
- MD_NID_CASE(sha512, SHA512_DIGEST_LENGTH)
- MD_NID_CASE(sha512_224, SHA224_DIGEST_LENGTH)
- MD_NID_CASE(sha512_256, SHA256_DIGEST_LENGTH)
- MD_NID_CASE(sha3_224, SHA224_DIGEST_LENGTH)
- MD_NID_CASE(sha3_256, SHA256_DIGEST_LENGTH)
- MD_NID_CASE(sha3_384, SHA384_DIGEST_LENGTH)
- MD_NID_CASE(sha3_512, SHA512_DIGEST_LENGTH)
+ MD_NID_CASE(sha1, SHA_DIGEST_LENGTH)
+ MD_NID_CASE(sha224, SHA224_DIGEST_LENGTH)
+ MD_NID_CASE(sha256, SHA256_DIGEST_LENGTH)
+ MD_NID_CASE(sha384, SHA384_DIGEST_LENGTH)
+ MD_NID_CASE(sha512, SHA512_DIGEST_LENGTH)
+ MD_NID_CASE(sha512_224, SHA224_DIGEST_LENGTH)
+ MD_NID_CASE(sha512_256, SHA256_DIGEST_LENGTH)
+ MD_NID_CASE(sha3_224, SHA224_DIGEST_LENGTH)
+ MD_NID_CASE(sha3_256, SHA256_DIGEST_LENGTH)
+ MD_NID_CASE(sha3_384, SHA384_DIGEST_LENGTH)
+ MD_NID_CASE(sha3_512, SHA512_DIGEST_LENGTH)
default:
return 0;
}
}
-
/* Size of an SSL signature: MD5+SHA1 */
-#define SSL_SIG_LENGTH 36
+#define SSL_SIG_LENGTH 36
/*
* Encodes a DigestInfo prefix of hash |type| and digest |m|, as
@@ -256,7 +255,7 @@ static int digest_sz_from_nid(int nid)
* |*out| with OPENSSL_free(). Otherwise, it returns zero.
*/
static int encode_pkcs1(unsigned char **out, size_t *out_len, int type,
- const unsigned char *m, size_t m_len)
+ const unsigned char *m, size_t m_len)
{
size_t di_prefix_len, dig_info_len;
const unsigned char *di_prefix;
@@ -269,7 +268,7 @@ static int encode_pkcs1(unsigned char **out, size_t *out_len, int type,
di_prefix = ossl_rsa_digestinfo_encoding(type, &di_prefix_len);
if (di_prefix == NULL) {
ERR_raise(ERR_LIB_RSA,
- RSA_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD);
+ RSA_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD);
return 0;
}
dig_info_len = di_prefix_len + m_len;
@@ -285,7 +284,7 @@ static int encode_pkcs1(unsigned char **out, size_t *out_len, int type,
}
int RSA_sign(int type, const unsigned char *m, unsigned int m_len,
- unsigned char *sigret, unsigned int *siglen, RSA *rsa)
+ unsigned char *sigret, unsigned int *siglen, RSA *rsa)
{
int encrypt_len, ret = 0;
size_t encoded_len = 0;
@@ -321,7 +320,7 @@ int RSA_sign(int type, const unsigned char *m, unsigned int m_len,
goto err;
}
encrypt_len = RSA_private_encrypt((int)encoded_len, encoded, sigret, rsa,
- RSA_PKCS1_PADDING);
+ RSA_PKCS1_PADDING);
if (encrypt_len <= 0)
goto err;
@@ -343,8 +342,8 @@ err:
* It returns one on successful verification or zero otherwise.
*/
int ossl_rsa_verify(int type, const unsigned char *m, unsigned int m_len,
- unsigned char *rm, size_t *prm_len,
- const unsigned char *sigbuf, size_t siglen, RSA *rsa)
+ unsigned char *rm, size_t *prm_len,
+ const unsigned char *sigbuf, size_t siglen, RSA *rsa)
{
int len, ret = 0;
size_t decrypt_len, encoded_len = 0;
@@ -361,7 +360,7 @@ int ossl_rsa_verify(int type, const unsigned char *m, unsigned int m_len,
goto err;
len = RSA_public_decrypt((int)siglen, sigbuf, decrypt_buf, rsa,
- RSA_PKCS1_PADDING);
+ RSA_PKCS1_PADDING);
if (len <= 0)
goto err;
decrypt_len = len;
@@ -393,7 +392,7 @@ int ossl_rsa_verify(int type, const unsigned char *m, unsigned int m_len,
}
}
} else if (type == NID_mdc2 && decrypt_len == 2 + 16
- && decrypt_buf[0] == 0x04 && decrypt_buf[1] == 0x10) {
+ && decrypt_buf[0] == 0x04 && decrypt_buf[1] == 0x10) {
/*
* Oddball MDC2 case: signature can be OCTET STRING. check for correct
* tag and length octets.
@@ -438,7 +437,7 @@ int ossl_rsa_verify(int type, const unsigned char *m, unsigned int m_len,
goto err;
if (encoded_len != decrypt_len
- || memcmp(encoded, decrypt_buf, encoded_len) != 0) {
+ || memcmp(encoded, decrypt_buf, encoded_len) != 0) {
ERR_raise(ERR_LIB_RSA, RSA_R_BAD_SIGNATURE);
goto err;
}
@@ -459,7 +458,7 @@ err:
}
int RSA_verify(int type, const unsigned char *m, unsigned int m_len,
- const unsigned char *sigbuf, unsigned int siglen, RSA *rsa)
+ const unsigned char *sigbuf, unsigned int siglen, RSA *rsa)
{
if (rsa->meth->rsa_verify != NULL)
diff --git a/crypto/rsa/rsa_sp800_56b_check.c b/crypto/rsa/rsa_sp800_56b_check.c
index b9aafdfe69..6033988933 100644
--- a/crypto/rsa/rsa_sp800_56b_check.c
+++ b/crypto/rsa/rsa_sp800_56b_check.c
@@ -46,30 +46,30 @@ int ossl_rsa_check_crt_components(const RSA *rsa, BN_CTX *ctx)
ret = 0;
}
ret = ret
- /* p1 = p -1 */
- && (BN_copy(p1, rsa->p) != NULL)
- && BN_sub_word(p1, 1)
- /* q1 = q - 1 */
- && (BN_copy(q1, rsa->q) != NULL)
- && BN_sub_word(q1, 1)
- /* (a) 1 < dP < (p – 1). */
- && (BN_cmp(rsa->dmp1, BN_value_one()) > 0)
- && (BN_cmp(rsa->dmp1, p1) < 0)
- /* (b) 1 < dQ < (q - 1). */
- && (BN_cmp(rsa->dmq1, BN_value_one()) > 0)
- && (BN_cmp(rsa->dmq1, q1) < 0)
- /* (c) 1 < qInv < p */
- && (BN_cmp(rsa->iqmp, BN_value_one()) > 0)
- && (BN_cmp(rsa->iqmp, rsa->p) < 0)
- /* (d) 1 = (dP . e) mod (p - 1)*/
- && BN_mod_mul(r, rsa->dmp1, rsa->e, p1, ctx)
- && BN_is_one(r)
- /* (e) 1 = (dQ . e) mod (q - 1) */
- && BN_mod_mul(r, rsa->dmq1, rsa->e, q1, ctx)
- && BN_is_one(r)
- /* (f) 1 = (qInv . q) mod p */
- && BN_mod_mul(r, rsa->iqmp, rsa->q, rsa->p, ctx)
- && BN_is_one(r);
+ /* p1 = p -1 */
+ && (BN_copy(p1, rsa->p) != NULL)
+ && BN_sub_word(p1, 1)
+ /* q1 = q - 1 */
+ && (BN_copy(q1, rsa->q) != NULL)
+ && BN_sub_word(q1, 1)
+ /* (a) 1 < dP < (p – 1). */
+ && (BN_cmp(rsa->dmp1, BN_value_one()) > 0)
+ && (BN_cmp(rsa->dmp1, p1) < 0)
+ /* (b) 1 < dQ < (q - 1). */
+ && (BN_cmp(rsa->dmq1, BN_value_one()) > 0)
+ && (BN_cmp(rsa->dmq1, q1) < 0)
+ /* (c) 1 < qInv < p */
+ && (BN_cmp(rsa->iqmp, BN_value_one()) > 0)
+ && (BN_cmp(rsa->iqmp, rsa->p) < 0)
+ /* (d) 1 = (dP . e) mod (p - 1)*/
+ && BN_mod_mul(r, rsa->dmp1, rsa->e, p1, ctx)
+ && BN_is_one(r)
+ /* (e) 1 = (dQ . e) mod (q - 1) */
+ && BN_mod_mul(r, rsa->dmq1, rsa->e, q1, ctx)
+ && BN_is_one(r)
+ /* (f) 1 = (qInv . q) mod p */
+ && BN_mod_mul(r, rsa->iqmp, rsa->q, rsa->p, ctx)
+ && BN_is_one(r);
BN_clear(r);
BN_clear(p1);
BN_clear(q1);
@@ -140,8 +140,8 @@ int ossl_rsa_check_prime_factor(BIGNUM *p, BIGNUM *e, int nbits, BN_CTX *ctx)
/* (Steps 5 a-b) prime test */
if (BN_check_prime(p, ctx, NULL) != 1
- /* (Step 5c) (√2)(2^(nbits/2 - 1) <= p <= 2^(nbits/2 - 1) */
- || ossl_rsa_check_prime_factor_range(p, nbits, ctx) != 1)
+ /* (Step 5c) (√2)(2^(nbits/2 - 1) <= p <= 2^(nbits/2 - 1) */
+ || ossl_rsa_check_prime_factor_range(p, nbits, ctx) != 1)
return 0;
BN_CTX_start(ctx);
@@ -155,11 +155,11 @@ int ossl_rsa_check_prime_factor(BIGNUM *p, BIGNUM *e, int nbits, BN_CTX *ctx)
ret = 0;
}
ret = ret
- /* (Step 5d) GCD(p-1, e) = 1 */
- && (BN_copy(p1, p) != NULL)
- && BN_sub_word(p1, 1)
- && BN_gcd(gcd, p1, e, ctx)
- && BN_is_one(gcd);
+ /* (Step 5d) GCD(p-1, e) = 1 */
+ && (BN_copy(p1, p) != NULL)
+ && BN_sub_word(p1, 1)
+ && BN_gcd(gcd, p1, e, ctx)
+ && BN_is_one(gcd);
BN_clear(p1);
BN_CTX_end(ctx);
@@ -200,14 +200,15 @@ int ossl_rsa_check_private_exponent(const RSA *rsa, int nbits, BN_CTX *ctx)
ret = 0;
}
ret = (ret
- /* LCM(p - 1, q - 1) */
- && (ossl_rsa_get_lcm(ctx, rsa->p, rsa->q, lcm, gcd, p1, q1,
- p1q1) == 1)
- /* (Step 6a) d < LCM(p - 1, q - 1) */
- && (BN_cmp(rsa->d, lcm) < 0)
- /* (Step 6b) 1 = (e . d) mod LCM(p - 1, q - 1) */
- && BN_mod_mul(r, rsa->e, rsa->d, lcm, ctx)
- && BN_is_one(r));
+ /* LCM(p - 1, q - 1) */
+ && (ossl_rsa_get_lcm(ctx, rsa->p, rsa->q, lcm, gcd, p1, q1,
+ p1q1)
+ == 1)
+ /* (Step 6a) d < LCM(p - 1, q - 1) */
+ && (BN_cmp(rsa->d, lcm) < 0)
+ /* (Step 6b) 1 = (e . d) mod LCM(p - 1, q - 1) */
+ && BN_mod_mul(r, rsa->e, rsa->d, lcm, ctx)
+ && BN_is_one(r));
BN_clear(r);
BN_clear(p1);
@@ -240,7 +241,7 @@ int ossl_rsa_check_public_exponent(const BIGNUM *e)
* i.e- numbits(p-q-1) > (nbits/2 -100)
*/
int ossl_rsa_check_pminusq_diff(BIGNUM *diff, const BIGNUM *p, const BIGNUM *q,
- int nbits)
+ int nbits)
{
int bitlen = (nbits >> 1) - 100;
@@ -263,14 +264,14 @@ int ossl_rsa_check_pminusq_diff(BIGNUM *diff, const BIGNUM *p, const BIGNUM *q,
* BN_FLG_CONSTTIME.
*/
int ossl_rsa_get_lcm(BN_CTX *ctx, const BIGNUM *p, const BIGNUM *q,
- BIGNUM *lcm, BIGNUM *gcd, BIGNUM *p1, BIGNUM *q1,
- BIGNUM *p1q1)
+ BIGNUM *lcm, BIGNUM *gcd, BIGNUM *p1, BIGNUM *q1,
+ BIGNUM *p1q1)
{
- return BN_sub(p1, p, BN_value_one()) /* p-1 */
- && BN_sub(q1, q, BN_value_one()) /* q-1 */
- && BN_mul(p1q1, p1, q1, ctx) /* (p-1)(q-1) */
- && BN_gcd(gcd, p1, q1, ctx)
- && BN_div(lcm, NULL, p1q1, gcd, ctx); /* LCM((p-1, q-1)) */
+ return BN_sub(p1, p, BN_value_one()) /* p-1 */
+ && BN_sub(q1, q, BN_value_one()) /* q-1 */
+ && BN_mul(p1q1, p1, q1, ctx) /* (p-1)(q-1) */
+ && BN_gcd(gcd, p1, q1, ctx)
+ && BN_div(lcm, NULL, p1q1, gcd, ctx); /* LCM((p-1, q-1)) */
}
/*
@@ -334,9 +335,7 @@ int ossl_rsa_sp800_56b_check_public(const RSA *rsa)
#ifdef FIPS_MODULE
if (ret != 1 || status != BN_PRIMETEST_COMPOSITE_NOT_POWER_OF_PRIME) {
#else
- if (ret != 1 || (status != BN_PRIMETEST_COMPOSITE_NOT_POWER_OF_PRIME
- && (nbits >= RSA_MIN_MODULUS_BITS
- || status != BN_PRIMETEST_COMPOSITE_WITH_FACTOR))) {
+ if (ret != 1 || (status != BN_PRIMETEST_COMPOSITE_NOT_POWER_OF_PRIME && (nbits >= RSA_MIN_MODULUS_BITS || status != BN_PRIMETEST_COMPOSITE_WITH_FACTOR))) {
#endif
ERR_raise(ERR_LIB_RSA, RSA_R_INVALID_MODULUS);
ret = 0;
@@ -372,17 +371,17 @@ int ossl_rsa_sp800_56b_check_private(const RSA *rsa)
* 6.4.1.3.3 "rsakpv2 - crt"
*/
int ossl_rsa_sp800_56b_check_keypair(const RSA *rsa, const BIGNUM *efixed,
- int strength, int nbits)
+ int strength, int nbits)
{
int ret = 0;
BN_CTX *ctx = NULL;
BIGNUM *r = NULL;
if (rsa->p == NULL
- || rsa->q == NULL
- || rsa->e == NULL
- || rsa->d == NULL
- || rsa->n == NULL) {
+ || rsa->q == NULL
+ || rsa->e == NULL
+ || rsa->d == NULL
+ || rsa->n == NULL) {
ERR_raise(ERR_LIB_RSA, RSA_R_INVALID_REQUEST);
return 0;
}
@@ -431,12 +430,12 @@ int ossl_rsa_sp800_56b_check_keypair(const RSA *rsa, const BIGNUM *efixed,
/* (Step 5): check prime factors p & q */
ret = ossl_rsa_check_prime_factor(rsa->p, rsa->e, nbits, ctx)
- && ossl_rsa_check_prime_factor(rsa->q, rsa->e, nbits, ctx)
- && (ossl_rsa_check_pminusq_diff(r, rsa->p, rsa->q, nbits) > 0)
- /* (Step 6): Check the private exponent d */
- && ossl_rsa_check_private_exponent(rsa, nbits, ctx)
- /* 6.4.1.2.3 (Step 7): Check the CRT components */
- && ossl_rsa_check_crt_components(rsa, ctx);
+ && ossl_rsa_check_prime_factor(rsa->q, rsa->e, nbits, ctx)
+ && (ossl_rsa_check_pminusq_diff(r, rsa->p, rsa->q, nbits) > 0)
+ /* (Step 6): Check the private exponent d */
+ && ossl_rsa_check_private_exponent(rsa, nbits, ctx)
+ /* 6.4.1.2.3 (Step 7): Check the CRT components */
+ && ossl_rsa_check_crt_components(rsa, ctx);
if (ret != 1)
ERR_raise(ERR_LIB_RSA, RSA_R_INVALID_KEYPAIR);
diff --git a/crypto/rsa/rsa_sp800_56b_gen.c b/crypto/rsa/rsa_sp800_56b_gen.c
index 940b8c04c0..2a525ddaae 100644
--- a/crypto/rsa/rsa_sp800_56b_gen.c
+++ b/crypto/rsa/rsa_sp800_56b_gen.c
@@ -60,8 +60,8 @@
* (Required for CAVS testing).
*/
int ossl_rsa_fips186_5_gen_prob_primes(RSA *rsa, RSA_ACVP_TEST *test,
- int nbits, const BIGNUM *e, BN_CTX *ctx,
- BN_GENCB *cb, uint32_t a, uint32_t b)
+ int nbits, const BIGNUM *e, BN_CTX *ctx,
+ BN_GENCB *cb, uint32_t a, uint32_t b)
{
int ret = 0, ok;
/* Temp allocated BIGNUMS */
@@ -130,12 +130,12 @@ int ossl_rsa_fips186_5_gen_prob_primes(RSA *rsa, RSA_ACVP_TEST *test,
/* (Step 4) Generate p, Xp */
if (!ossl_bn_rsa_fips186_5_gen_prob_primes(rsa->p, Xpo, p1, p2, Xp, Xp1, Xp2,
- nbits, e, ctx, cb, a))
+ nbits, e, ctx, cb, a))
goto err;
for (;;) {
/* (Step 5) Generate q, Xq*/
if (!ossl_bn_rsa_fips186_5_gen_prob_primes(rsa->q, Xqo, q1, q2, Xq, Xq1,
- Xq2, nbits, e, ctx, cb, b))
+ Xq2, nbits, e, ctx, cb, b))
goto err;
/* (Step 6) |Xp - Xq| > 2^(nbitlen/2 - 100) */
@@ -213,7 +213,7 @@ static int rsa_validate_rng_strength(EVP_RAND_CTX *rng, int nbits)
*/
if (EVP_RAND_get_strength(rng) < ossl_ifc_ffc_compute_security_bits(nbits)) {
ERR_raise(ERR_LIB_RSA,
- RSA_R_RANDOMNESS_SOURCE_STRENGTH_INSUFFICIENT);
+ RSA_R_RANDOMNESS_SOURCE_STRENGTH_INSUFFICIENT);
return 0;
}
#endif
@@ -245,7 +245,7 @@ static int rsa_validate_rng_strength(EVP_RAND_CTX *rng, int nbits)
* already set in the RSA key and do not need to be recalculated.
*/
int ossl_rsa_sp800_56b_derive_params_from_pq(RSA *rsa, int nbits,
- const BIGNUM *e, BN_CTX *ctx)
+ const BIGNUM *e, BN_CTX *ctx)
{
int ret = -1;
BIGNUM *p1, *q1, *lcm, *p1q1, *gcd;
@@ -379,7 +379,7 @@ err:
* Returns: 1 if successfully generated otherwise it returns 0.
*/
int ossl_rsa_sp800_56b_generate_key(RSA *rsa, int nbits, const BIGNUM *efixed,
- BN_GENCB *cb, uint32_t a, uint32_t b)
+ BN_GENCB *cb, uint32_t a, uint32_t b)
{
int ret = 0;
int ok;
@@ -397,7 +397,7 @@ int ossl_rsa_sp800_56b_generate_key(RSA *rsa, int nbits, const BIGNUM *efixed,
return 0;
/* Check that the RNG is capable of generating a key this large */
- if (!rsa_validate_rng_strength(RAND_get0_private(rsa->libctx), nbits))
+ if (!rsa_validate_rng_strength(RAND_get0_private(rsa->libctx), nbits))
return 0;
ctx = BN_CTX_new_ex(rsa->libctx);
@@ -463,9 +463,9 @@ int ossl_rsa_sp800_56b_pairwise_test(RSA *rsa, BN_CTX *ctx)
BN_set_flags(k, BN_FLG_CONSTTIME);
ret = (BN_set_word(k, 2)
- && BN_mod_exp(tmp, k, rsa->e, rsa->n, ctx)
- && BN_mod_exp(tmp, tmp, rsa->d, rsa->n, ctx)
- && BN_cmp(k, tmp) == 0);
+ && BN_mod_exp(tmp, k, rsa->e, rsa->n, ctx)
+ && BN_mod_exp(tmp, tmp, rsa->d, rsa->n, ctx)
+ && BN_cmp(k, tmp) == 0);
if (ret == 0)
ERR_raise(ERR_LIB_RSA, RSA_R_PAIRWISE_TEST_FAILURE);
err:
diff --git a/crypto/rsa/rsa_x931.c b/crypto/rsa/rsa_x931.c
index f84ea9815c..3c8f1364ea 100644
--- a/crypto/rsa/rsa_x931.c
+++ b/crypto/rsa/rsa_x931.c
@@ -41,7 +41,7 @@
* flen The size of the input hash + 1 (trailer byte)
*/
int RSA_padding_add_X931(unsigned char *to, int tlen,
- const unsigned char *from, int flen)
+ const unsigned char *from, int flen)
{
int j;
unsigned char *p;
@@ -77,7 +77,7 @@ int RSA_padding_add_X931(unsigned char *to, int tlen,
}
int RSA_padding_check_X931(unsigned char *to, int tlen,
- const unsigned char *from, int flen, int num)
+ const unsigned char *from, int flen, int num)
{
int i = 0, j;
const unsigned char *p;
@@ -142,7 +142,6 @@ int RSA_X931_hash_id(int nid)
case NID_sha512:
return 0x35;
-
}
return -1;
}
diff --git a/crypto/rsa/rsa_x931g.c b/crypto/rsa/rsa_x931g.c
index 290e95b468..e706722fc2 100644
--- a/crypto/rsa/rsa_x931g.c
+++ b/crypto/rsa/rsa_x931g.c
@@ -23,9 +23,9 @@
/* X9.31 RSA key derivation and generation */
int RSA_X931_derive_ex(RSA *rsa, BIGNUM *p1, BIGNUM *p2, BIGNUM *q1,
- BIGNUM *q2, const BIGNUM *Xp1, const BIGNUM *Xp2,
- const BIGNUM *Xp, const BIGNUM *Xq1, const BIGNUM *Xq2,
- const BIGNUM *Xq, const BIGNUM *e, BN_GENCB *cb)
+ BIGNUM *q2, const BIGNUM *Xp1, const BIGNUM *Xp2,
+ const BIGNUM *Xp, const BIGNUM *Xq1, const BIGNUM *Xq2,
+ const BIGNUM *Xq, const BIGNUM *e, BN_GENCB *cb)
{
BIGNUM *r0 = NULL, *r1 = NULL, *r2 = NULL, *r3 = NULL;
BN_CTX *ctx = NULL, *ctx2 = NULL;
@@ -65,7 +65,7 @@ int RSA_X931_derive_ex(RSA *rsa, BIGNUM *p1, BIGNUM *p2, BIGNUM *q1,
goto err;
if (!BN_X931_derive_prime_ex(rsa->p, p1, p2,
- Xp, Xp1, Xp2, e, ctx, cb))
+ Xp, Xp1, Xp2, e, ctx, cb))
goto err;
}
@@ -74,7 +74,7 @@ int RSA_X931_derive_ex(RSA *rsa, BIGNUM *p1, BIGNUM *p2, BIGNUM *q1,
if (rsa->q == NULL)
goto err;
if (!BN_X931_derive_prime_ex(rsa->q, q1, q2,
- Xq, Xq1, Xq2, e, ctx, cb))
+ Xq, Xq1, Xq2, e, ctx, cb))
goto err;
}
@@ -98,17 +98,17 @@ int RSA_X931_derive_ex(RSA *rsa, BIGNUM *p1, BIGNUM *p2, BIGNUM *q1,
/* calculate d */
if (!BN_sub(r1, rsa->p, BN_value_one()))
- goto err; /* p-1 */
+ goto err; /* p-1 */
if (!BN_sub(r2, rsa->q, BN_value_one()))
- goto err; /* q-1 */
+ goto err; /* q-1 */
if (!BN_mul(r0, r1, r2, ctx))
- goto err; /* (p-1)(q-1) */
+ goto err; /* (p-1)(q-1) */
if (!BN_gcd(r3, r1, r2, ctx))
goto err;
if (!BN_div(r0, NULL, r0, r3, ctx))
- goto err; /* LCM((p-1)(q-1)) */
+ goto err; /* LCM((p-1)(q-1)) */
ctx2 = BN_CTX_new();
if (ctx2 == NULL)
@@ -139,7 +139,7 @@ int RSA_X931_derive_ex(RSA *rsa, BIGNUM *p1, BIGNUM *p2, BIGNUM *q1,
rsa->dirty_cnt++;
ret = 1;
- err:
+err:
BN_CTX_end(ctx);
BN_CTX_free(ctx);
BN_CTX_free(ctx2);
@@ -148,7 +148,7 @@ int RSA_X931_derive_ex(RSA *rsa, BIGNUM *p1, BIGNUM *p2, BIGNUM *q1,
}
int RSA_X931_generate_key_ex(RSA *rsa, int bits, const BIGNUM *e,
- BN_GENCB *cb)
+ BN_GENCB *cb)
{
int ok = 0;
BIGNUM *Xp = NULL, *Xq = NULL;
@@ -174,11 +174,11 @@ int RSA_X931_generate_key_ex(RSA *rsa, int bits, const BIGNUM *e,
/* Generate two primes from Xp, Xq */
if (!BN_X931_generate_prime_ex(rsa->p, NULL, NULL, NULL, NULL, Xp,
- e, ctx, cb))
+ e, ctx, cb))
goto error;
if (!BN_X931_generate_prime_ex(rsa->q, NULL, NULL, NULL, NULL, Xq,
- e, ctx, cb))
+ e, ctx, cb))
goto error;
/*
@@ -187,13 +187,13 @@ int RSA_X931_generate_key_ex(RSA *rsa, int bits, const BIGNUM *e,
*/
if (!RSA_X931_derive_ex(rsa, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, e, cb))
+ NULL, NULL, NULL, NULL, NULL, NULL, e, cb))
goto error;
rsa->dirty_cnt++;
ok = 1;
- error:
+error:
BN_CTX_end(ctx);
BN_CTX_free(ctx);
@@ -201,5 +201,4 @@ int RSA_X931_generate_key_ex(RSA *rsa, int bits, const BIGNUM *e,
return 1;
return 0;
-
}
diff --git a/crypto/s390x_arch.h b/crypto/s390x_arch.h
index e8830b7eed..c3a805b359 100644
--- a/crypto/s390x_arch.h
+++ b/crypto/s390x_arch.h
@@ -8,49 +8,49 @@
*/
#ifndef OSSL_CRYPTO_S390X_ARCH_H
-# define OSSL_CRYPTO_S390X_ARCH_H
+#define OSSL_CRYPTO_S390X_ARCH_H
-# ifndef __ASSEMBLER__
+#ifndef __ASSEMBLER__
#include "crypto/bn.h"
void s390x_kimd(const unsigned char *in, size_t len, unsigned int fc,
- void *param);
+ void *param);
void s390x_klmd(const unsigned char *in, size_t inlen, unsigned char *out,
- size_t outlen, unsigned int fc, void *param);
+ size_t outlen, unsigned int fc, void *param);
void s390x_km(const unsigned char *in, size_t len, unsigned char *out,
- unsigned int fc, void *param);
+ unsigned int fc, void *param);
void s390x_kmac(const unsigned char *in, size_t len, unsigned int fc,
- void *param);
+ void *param);
void s390x_kmo(const unsigned char *in, size_t len, unsigned char *out,
- unsigned int fc, void *param);
+ unsigned int fc, void *param);
void s390x_kmf(const unsigned char *in, size_t len, unsigned char *out,
- unsigned int fc, void *param);
+ unsigned int fc, void *param);
void s390x_kma(const unsigned char *aad, size_t alen, const unsigned char *in,
- size_t len, unsigned char *out, unsigned int fc, void *param);
+ size_t len, unsigned char *out, unsigned int fc, void *param);
int s390x_pcc(unsigned int fc, void *param);
int s390x_kdsa(unsigned int fc, void *param, const unsigned char *in,
- size_t len);
+ size_t len);
void s390x_flip_endian32(unsigned char dst[32], const unsigned char src[32]);
void s390x_flip_endian64(unsigned char dst[64], const unsigned char src[64]);
int s390x_x25519_mul(unsigned char u_dst[32],
- const unsigned char u_src[32],
- const unsigned char d_src[32]);
+ const unsigned char u_src[32],
+ const unsigned char d_src[32]);
int s390x_x448_mul(unsigned char u_dst[56],
- const unsigned char u_src[56],
- const unsigned char d_src[56]);
+ const unsigned char u_src[56],
+ const unsigned char d_src[56]);
int s390x_ed25519_mul(unsigned char x_dst[32],
- unsigned char y_dst[32],
- const unsigned char x_src[32],
- const unsigned char y_src[32],
- const unsigned char d_src[32]);
+ unsigned char y_dst[32],
+ const unsigned char x_src[32],
+ const unsigned char y_src[32],
+ const unsigned char d_src[32]);
int s390x_ed448_mul(unsigned char x_dst[57],
- unsigned char y_dst[57],
- const unsigned char x_src[57],
- const unsigned char y_src[57],
- const unsigned char d_src[57]);
+ unsigned char y_dst[57],
+ const unsigned char x_src[57],
+ const unsigned char y_src[57],
+ const unsigned char d_src[57]);
/*
* The field elements of OPENSSL_s390xcap_P are the 64-bit words returned by
@@ -74,133 +74,133 @@ struct OPENSSL_s390xcap_st {
unsigned long long kdsa[2];
};
-# if defined(__GNUC__) && defined(__linux)
+#if defined(__GNUC__) && defined(__linux)
__attribute__((visibility("hidden")))
-# endif
+#endif
extern struct OPENSSL_s390xcap_st OPENSSL_s390xcap_P;
-# ifdef S390X_MOD_EXP
-# if defined(__GNUC__) && defined(__linux)
+#ifdef S390X_MOD_EXP
+#if defined(__GNUC__) && defined(__linux)
__attribute__((visibility("hidden")))
-# endif
+#endif
extern int OPENSSL_s390xcex;
-# if defined(__GNUC__) && defined(__linux)
+#if defined(__GNUC__) && defined(__linux)
__attribute__((visibility("hidden")))
-# endif
+#endif
extern int OPENSSL_s390xcex_nodev;
-# endif
+#endif
/* Max number of 64-bit words currently returned by STFLE */
-# define S390X_STFLE_MAX 3
+#define S390X_STFLE_MAX 3
/* convert facility bit number or function code to bit mask */
-# define S390X_CAPBIT(i) (1ULL << (63 - (i) % 64))
+#define S390X_CAPBIT(i) (1ULL << (63 - (i) % 64))
-# endif
+#endif
/* OPENSSL_s390xcap_P offsets [bytes] */
-# define S390X_STFLE 0x00
-# define S390X_KIMD 0x20
-# define S390X_KLMD 0x30
-# define S390X_KM 0x40
-# define S390X_KMC 0x50
-# define S390X_KMAC 0x60
-# define S390X_KMCTR 0x70
-# define S390X_KMO 0x80
-# define S390X_KMF 0x90
-# define S390X_PRNO 0xa0
-# define S390X_KMA 0xb0
-# define S390X_PCC 0xc0
-# define S390X_KDSA 0xd0
+#define S390X_STFLE 0x00
+#define S390X_KIMD 0x20
+#define S390X_KLMD 0x30
+#define S390X_KM 0x40
+#define S390X_KMC 0x50
+#define S390X_KMAC 0x60
+#define S390X_KMCTR 0x70
+#define S390X_KMO 0x80
+#define S390X_KMF 0x90
+#define S390X_PRNO 0xa0
+#define S390X_KMA 0xb0
+#define S390X_PCC 0xc0
+#define S390X_KDSA 0xd0
/* Facility Bit Numbers */
-# define S390X_MSA 17 /* message-security-assist */
-# define S390X_STCKF 25 /* store-clock-fast */
-# define S390X_MSA5 57 /* message-security-assist-ext. 5 */
-# define S390X_MSA3 76 /* message-security-assist-ext. 3 */
-# define S390X_MSA4 77 /* message-security-assist-ext. 4 */
-# define S390X_MSA12 86 /* message-security-assist-ext. 12 */
-# define S390X_VX 129 /* vector */
-# define S390X_VXD 134 /* vector packed decimal */
-# define S390X_VXE 135 /* vector enhancements 1 */
-# define S390X_MSA8 146 /* message-security-assist-ext. 8 */
-# define S390X_MSA9 155 /* message-security-assist-ext. 9 */
+#define S390X_MSA 17 /* message-security-assist */
+#define S390X_STCKF 25 /* store-clock-fast */
+#define S390X_MSA5 57 /* message-security-assist-ext. 5 */
+#define S390X_MSA3 76 /* message-security-assist-ext. 3 */
+#define S390X_MSA4 77 /* message-security-assist-ext. 4 */
+#define S390X_MSA12 86 /* message-security-assist-ext. 12 */
+#define S390X_VX 129 /* vector */
+#define S390X_VXD 134 /* vector packed decimal */
+#define S390X_VXE 135 /* vector enhancements 1 */
+#define S390X_MSA8 146 /* message-security-assist-ext. 8 */
+#define S390X_MSA9 155 /* message-security-assist-ext. 9 */
/* Function Codes */
/* all instructions */
-# define S390X_QUERY 0
+#define S390X_QUERY 0
/* kimd/klmd */
-# define S390X_SHA_1 1
-# define S390X_SHA_256 2
-# define S390X_SHA_512 3
-# define S390X_SHA3_224 32
-# define S390X_SHA3_256 33
-# define S390X_SHA3_384 34
-# define S390X_SHA3_512 35
-# define S390X_KECCAK_224 32
-# define S390X_KECCAK_256 33
-# define S390X_KECCAK_384 34
-# define S390X_KECCAK_512 35
-# define S390X_SHAKE_128 36
-# define S390X_SHAKE_256 37
-# define S390X_GHASH 65
+#define S390X_SHA_1 1
+#define S390X_SHA_256 2
+#define S390X_SHA_512 3
+#define S390X_SHA3_224 32
+#define S390X_SHA3_256 33
+#define S390X_SHA3_384 34
+#define S390X_SHA3_512 35
+#define S390X_KECCAK_224 32
+#define S390X_KECCAK_256 33
+#define S390X_KECCAK_384 34
+#define S390X_KECCAK_512 35
+#define S390X_SHAKE_128 36
+#define S390X_SHAKE_256 37
+#define S390X_GHASH 65
/* km/kmc/kmac/kmctr/kmo/kmf/kma */
-# define S390X_AES_128 18
-# define S390X_AES_192 19
-# define S390X_AES_256 20
+#define S390X_AES_128 18
+#define S390X_AES_192 19
+#define S390X_AES_256 20
/* km */
-# define S390X_XTS_AES_128 50
-# define S390X_XTS_AES_256 52
-# define S390X_XTS_AES_128_MSA10 82
-# define S390X_XTS_AES_256_MSA10 84
+#define S390X_XTS_AES_128 50
+#define S390X_XTS_AES_256 52
+#define S390X_XTS_AES_128_MSA10 82
+#define S390X_XTS_AES_256_MSA10 84
/* kmac */
-# define S390X_HMAC_SHA_224 112
-# define S390X_HMAC_SHA_256 113
-# define S390X_HMAC_SHA_384 114
-# define S390X_HMAC_SHA_512 115
+#define S390X_HMAC_SHA_224 112
+#define S390X_HMAC_SHA_256 113
+#define S390X_HMAC_SHA_384 114
+#define S390X_HMAC_SHA_512 115
/* prno */
-# define S390X_SHA_512_DRNG 3
-# define S390X_TRNG 114
+#define S390X_SHA_512_DRNG 3
+#define S390X_TRNG 114
/* pcc */
-# define S390X_SCALAR_MULTIPLY_P256 64
-# define S390X_SCALAR_MULTIPLY_P384 65
-# define S390X_SCALAR_MULTIPLY_P521 66
-# define S390X_SCALAR_MULTIPLY_ED25519 72
-# define S390X_SCALAR_MULTIPLY_ED448 73
-# define S390X_SCALAR_MULTIPLY_X25519 80
-# define S390X_SCALAR_MULTIPLY_X448 81
+#define S390X_SCALAR_MULTIPLY_P256 64
+#define S390X_SCALAR_MULTIPLY_P384 65
+#define S390X_SCALAR_MULTIPLY_P521 66
+#define S390X_SCALAR_MULTIPLY_ED25519 72
+#define S390X_SCALAR_MULTIPLY_ED448 73
+#define S390X_SCALAR_MULTIPLY_X25519 80
+#define S390X_SCALAR_MULTIPLY_X448 81
/* kdsa */
-# define S390X_ECDSA_VERIFY_P256 1
-# define S390X_ECDSA_VERIFY_P384 2
-# define S390X_ECDSA_VERIFY_P521 3
-# define S390X_ECDSA_SIGN_P256 9
-# define S390X_ECDSA_SIGN_P384 10
-# define S390X_ECDSA_SIGN_P521 11
-# define S390X_EDDSA_VERIFY_ED25519 32
-# define S390X_EDDSA_VERIFY_ED448 36
-# define S390X_EDDSA_SIGN_ED25519 40
-# define S390X_EDDSA_SIGN_ED448 44
+#define S390X_ECDSA_VERIFY_P256 1
+#define S390X_ECDSA_VERIFY_P384 2
+#define S390X_ECDSA_VERIFY_P521 3
+#define S390X_ECDSA_SIGN_P256 9
+#define S390X_ECDSA_SIGN_P384 10
+#define S390X_ECDSA_SIGN_P521 11
+#define S390X_EDDSA_VERIFY_ED25519 32
+#define S390X_EDDSA_VERIFY_ED448 36
+#define S390X_EDDSA_SIGN_ED25519 40
+#define S390X_EDDSA_SIGN_ED448 44
/* Register 0 Flags */
-# define S390X_DECRYPT 0x80
-# define S390X_KMA_LPC 0x100
-# define S390X_KMA_LAAD 0x200
-# define S390X_KMA_HS 0x400
-# define S390X_KDSA_D 0x80
-# define S390X_KIMD_NIP 0x8000
-# define S390X_KLMD_DUFOP 0x4000
-# define S390X_KLMD_NIP 0x8000
-# define S390X_KLMD_PS 0x100
-# define S390X_KMAC_IKP 0x8000
-# define S390X_KMAC_IIMP 0x4000
-# define S390X_KMAC_CCUP 0x2000
+#define S390X_DECRYPT 0x80
+#define S390X_KMA_LPC 0x100
+#define S390X_KMA_LAAD 0x200
+#define S390X_KMA_HS 0x400
+#define S390X_KDSA_D 0x80
+#define S390X_KIMD_NIP 0x8000
+#define S390X_KLMD_DUFOP 0x4000
+#define S390X_KLMD_NIP 0x8000
+#define S390X_KLMD_PS 0x100
+#define S390X_KMAC_IKP 0x8000
+#define S390X_KMAC_IIMP 0x4000
+#define S390X_KMAC_CCUP 0x2000
#endif
diff --git a/crypto/s390xcap.c b/crypto/s390xcap.c
index c78c7f1403..e1e75173af 100644
--- a/crypto/s390xcap.c
+++ b/crypto/s390xcap.c
@@ -17,52 +17,56 @@
#include "s390x_arch.h"
#if defined(OPENSSL_SYS_LINUX) && !defined(FIPS_MODULE)
-# include <sys/types.h>
-# include <sys/stat.h>
-# include <fcntl.h>
-# include <asm/zcrypt.h>
-# include <sys/ioctl.h>
-# include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <asm/zcrypt.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
#endif
#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
-# if __GLIBC_PREREQ(2, 16)
-# include <sys/auxv.h>
-# if defined(HWCAP_S390_STFLE) && defined(HWCAP_S390_VX)
-# define OSSL_IMPLEMENT_GETAUXVAL
-# endif
-# endif
+#if __GLIBC_PREREQ(2, 16)
+#include <sys/auxv.h>
+#if defined(HWCAP_S390_STFLE) && defined(HWCAP_S390_VX)
+#define OSSL_IMPLEMENT_GETAUXVAL
+#endif
+#endif
#endif
-#define LEN 128
+#define LEN 128
#define STR_(S) #S
-#define STR(S) STR_(S)
-
-#define TOK_FUNC(NAME) \
- (sscanf(tok_begin, \
- " " STR(NAME) " : %" STR(LEN) "[^:] : " \
- "%" STR(LEN) "s %" STR(LEN) "s ", \
- tok[0], tok[1], tok[2]) == 2) { \
- \
- off = (tok[0][0] == '~') ? 1 : 0; \
- if (sscanf(tok[0] + off, "%llx", &cap->NAME[0]) != 1) \
- goto ret; \
- if (off) \
- cap->NAME[0] = ~cap->NAME[0]; \
- \
- off = (tok[1][0] == '~') ? 1 : 0; \
- if (sscanf(tok[1] + off, "%llx", &cap->NAME[1]) != 1) \
- goto ret; \
- if (off) \
- cap->NAME[1] = ~cap->NAME[1]; \
+#define STR(S) STR_(S)
+
+#define TOK_FUNC(NAME) \
+ (sscanf(tok_begin, \
+ " " STR(NAME) " : %" STR(LEN) "[^:] : " \
+ "%" STR(LEN) "s %" STR(LEN) "s ", \
+ tok[0], tok[1], tok[2]) \
+ == 2) \
+ { \
+ \
+ off = (tok[0][0] == '~') ? 1 : 0; \
+ if (sscanf(tok[0] + off, "%llx", &cap->NAME[0]) != 1) \
+ goto ret; \
+ if (off) \
+ cap->NAME[0] = ~cap->NAME[0]; \
+ \
+ off = (tok[1][0] == '~') ? 1 : 0; \
+ if (sscanf(tok[1] + off, "%llx", &cap->NAME[1]) != 1) \
+ goto ret; \
+ if (off) \
+ cap->NAME[1] = ~cap->NAME[1]; \
}
-#define TOK_CPU_ALIAS(NAME, STRUCT_NAME) \
- (sscanf(tok_begin, \
- " %" STR(LEN) "s %" STR(LEN) "s ", \
- tok[0], tok[1]) == 1 \
- && !strcmp(tok[0], #NAME)) { \
- memcpy(cap, &STRUCT_NAME, sizeof(*cap)); \
+#define TOK_CPU_ALIAS(NAME, STRUCT_NAME) \
+ (sscanf(tok_begin, \
+ " %" STR(LEN) "s %" STR(LEN) "s ", \
+ tok[0], tok[1]) \
+ == 1 \
+ && !strcmp(tok[0], #NAME)) \
+ { \
+ memcpy(cap, &STRUCT_NAME, sizeof(*cap)); \
}
#define TOK_CPU(NAME) TOK_CPU_ALIAS(NAME, NAME)
@@ -90,12 +94,12 @@ int OPENSSL_s390xcex;
int OPENSSL_s390xcex_nodev;
#if defined(__GNUC__)
-__attribute__ ((visibility("hidden")))
+__attribute__((visibility("hidden")))
#endif
void OPENSSL_s390x_cleanup(void);
#if defined(__GNUC__)
-__attribute__ ((visibility("hidden")))
+__attribute__((visibility("hidden")))
#endif
void OPENSSL_s390x_cleanup(void)
{
@@ -107,7 +111,7 @@ void OPENSSL_s390x_cleanup(void)
#endif
#if defined(__GNUC__) && defined(__linux)
-__attribute__ ((visibility("hidden")))
+__attribute__((visibility("hidden")))
#endif
void OPENSSL_cpuid_setup(void)
{
@@ -131,8 +135,8 @@ void OPENSSL_cpuid_setup(void)
/* protection against disabled vector facility */
if (!(hwcap & HWCAP_S390_VX)) {
OPENSSL_s390xcap_P.stfle[2] &= ~(S390X_CAPBIT(S390X_VX)
- | S390X_CAPBIT(S390X_VXD)
- | S390X_CAPBIT(S390X_VXE));
+ | S390X_CAPBIT(S390X_VXD)
+ | S390X_CAPBIT(S390X_VXE));
}
}
#else
@@ -161,8 +165,8 @@ void OPENSSL_cpuid_setup(void)
OPENSSL_vx_probe();
} else {
OPENSSL_s390xcap_P.stfle[2] &= ~(S390X_CAPBIT(S390X_VX)
- | S390X_CAPBIT(S390X_VXD)
- | S390X_CAPBIT(S390X_VXE));
+ | S390X_CAPBIT(S390X_VXD)
+ | S390X_CAPBIT(S390X_VXE));
}
sigaction(SIGFPE, &oact_fpe, NULL);
@@ -235,19 +239,19 @@ static int parse_env(struct OPENSSL_s390xcap_st *cap, int *cex)
* Facility detection would fail on real hw (no STFLE).
*/
static const struct OPENSSL_s390xcap_st z900 = {
- /*.stfle = */{0ULL, 0ULL, 0ULL, 0ULL},
- /*.kimd = */{0ULL, 0ULL},
- /*.klmd = */{0ULL, 0ULL},
- /*.km = */{0ULL, 0ULL},
- /*.kmc = */{0ULL, 0ULL},
- /*.kmac = */{0ULL, 0ULL},
- /*.kmctr = */{0ULL, 0ULL},
- /*.kmo = */{0ULL, 0ULL},
- /*.kmf = */{0ULL, 0ULL},
- /*.prno = */{0ULL, 0ULL},
- /*.kma = */{0ULL, 0ULL},
- /*.pcc = */{0ULL, 0ULL},
- /*.kdsa = */{0ULL, 0ULL},
+ /*.stfle = */ { 0ULL, 0ULL, 0ULL, 0ULL },
+ /*.kimd = */ { 0ULL, 0ULL },
+ /*.klmd = */ { 0ULL, 0ULL },
+ /*.km = */ { 0ULL, 0ULL },
+ /*.kmc = */ { 0ULL, 0ULL },
+ /*.kmac = */ { 0ULL, 0ULL },
+ /*.kmctr = */ { 0ULL, 0ULL },
+ /*.kmo = */ { 0ULL, 0ULL },
+ /*.kmf = */ { 0ULL, 0ULL },
+ /*.prno = */ { 0ULL, 0ULL },
+ /*.kma = */ { 0ULL, 0ULL },
+ /*.pcc = */ { 0ULL, 0ULL },
+ /*.kdsa = */ { 0ULL, 0ULL },
};
/*-
@@ -255,27 +259,20 @@ static int parse_env(struct OPENSSL_s390xcap_st *cap, int *cex)
* Implements MSA. Facility detection would fail on real hw (no STFLE).
*/
static const struct OPENSSL_s390xcap_st z990 = {
- /*.stfle = */{S390X_CAPBIT(S390X_MSA),
- 0ULL, 0ULL, 0ULL},
- /*.kimd = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_SHA_1),
- 0ULL},
- /*.klmd = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_SHA_1),
- 0ULL},
- /*.km = */{S390X_CAPBIT(S390X_QUERY),
- 0ULL},
- /*.kmc = */{S390X_CAPBIT(S390X_QUERY),
- 0ULL},
- /*.kmac = */{S390X_CAPBIT(S390X_QUERY),
- 0ULL},
- /*.kmctr = */{0ULL, 0ULL},
- /*.kmo = */{0ULL, 0ULL},
- /*.kmf = */{0ULL, 0ULL},
- /*.prno = */{0ULL, 0ULL},
- /*.kma = */{0ULL, 0ULL},
- /*.pcc = */{0ULL, 0ULL},
- /*.kdsa = */{0ULL, 0ULL},
+ /*.stfle = */ { S390X_CAPBIT(S390X_MSA),
+ 0ULL, 0ULL, 0ULL },
+ /*.kimd = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_SHA_1), 0ULL },
+ /*.klmd = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_SHA_1), 0ULL },
+ /*.km = */ { S390X_CAPBIT(S390X_QUERY), 0ULL },
+ /*.kmc = */ { S390X_CAPBIT(S390X_QUERY), 0ULL },
+ /*.kmac = */ { S390X_CAPBIT(S390X_QUERY), 0ULL },
+ /*.kmctr = */ { 0ULL, 0ULL },
+ /*.kmo = */ { 0ULL, 0ULL },
+ /*.kmf = */ { 0ULL, 0ULL },
+ /*.prno = */ { 0ULL, 0ULL },
+ /*.kma = */ { 0ULL, 0ULL },
+ /*.pcc = */ { 0ULL, 0ULL },
+ /*.kdsa = */ { 0ULL, 0ULL },
};
/*-
@@ -283,32 +280,21 @@ static int parse_env(struct OPENSSL_s390xcap_st *cap, int *cex)
* Implements MSA and MSA1.
*/
static const struct OPENSSL_s390xcap_st z9 = {
- /*.stfle = */{S390X_CAPBIT(S390X_MSA)
- | S390X_CAPBIT(S390X_STCKF),
- 0ULL, 0ULL, 0ULL},
- /*.kimd = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_SHA_1)
- | S390X_CAPBIT(S390X_SHA_256),
- 0ULL},
- /*.klmd = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_SHA_1)
- | S390X_CAPBIT(S390X_SHA_256),
- 0ULL},
- /*.km = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_AES_128),
- 0ULL},
- /*.kmc = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_AES_128),
- 0ULL},
- /*.kmac = */{S390X_CAPBIT(S390X_QUERY),
- 0ULL},
- /*.kmctr = */{0ULL, 0ULL},
- /*.kmo = */{0ULL, 0ULL},
- /*.kmf = */{0ULL, 0ULL},
- /*.prno = */{0ULL, 0ULL},
- /*.kma = */{0ULL, 0ULL},
- /*.pcc = */{0ULL, 0ULL},
- /*.kdsa = */{0ULL, 0ULL},
+ /*.stfle = */ { S390X_CAPBIT(S390X_MSA)
+ | S390X_CAPBIT(S390X_STCKF),
+ 0ULL, 0ULL, 0ULL },
+ /*.kimd = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_SHA_1) | S390X_CAPBIT(S390X_SHA_256), 0ULL },
+ /*.klmd = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_SHA_1) | S390X_CAPBIT(S390X_SHA_256), 0ULL },
+ /*.km = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128), 0ULL },
+ /*.kmc = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128), 0ULL },
+ /*.kmac = */ { S390X_CAPBIT(S390X_QUERY), 0ULL },
+ /*.kmctr = */ { 0ULL, 0ULL },
+ /*.kmo = */ { 0ULL, 0ULL },
+ /*.kmf = */ { 0ULL, 0ULL },
+ /*.prno = */ { 0ULL, 0ULL },
+ /*.kma = */ { 0ULL, 0ULL },
+ /*.pcc = */ { 0ULL, 0ULL },
+ /*.kdsa = */ { 0ULL, 0ULL },
};
/*-
@@ -316,38 +302,21 @@ static int parse_env(struct OPENSSL_s390xcap_st *cap, int *cex)
* Implements MSA and MSA1-2.
*/
static const struct OPENSSL_s390xcap_st z10 = {
- /*.stfle = */{S390X_CAPBIT(S390X_MSA)
- | S390X_CAPBIT(S390X_STCKF),
- 0ULL, 0ULL, 0ULL},
- /*.kimd = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_SHA_1)
- | S390X_CAPBIT(S390X_SHA_256)
- | S390X_CAPBIT(S390X_SHA_512),
- 0ULL},
- /*.klmd = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_SHA_1)
- | S390X_CAPBIT(S390X_SHA_256)
- | S390X_CAPBIT(S390X_SHA_512),
- 0ULL},
- /*.km = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_AES_128)
- | S390X_CAPBIT(S390X_AES_192)
- | S390X_CAPBIT(S390X_AES_256),
- 0ULL},
- /*.kmc = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_AES_128)
- | S390X_CAPBIT(S390X_AES_192)
- | S390X_CAPBIT(S390X_AES_256),
- 0ULL},
- /*.kmac = */{S390X_CAPBIT(S390X_QUERY),
- 0ULL},
- /*.kmctr = */{0ULL, 0ULL},
- /*.kmo = */{0ULL, 0ULL},
- /*.kmf = */{0ULL, 0ULL},
- /*.prno = */{0ULL, 0ULL},
- /*.kma = */{0ULL, 0ULL},
- /*.pcc = */{0ULL, 0ULL},
- /*.kdsa = */{0ULL, 0ULL},
+ /*.stfle = */ { S390X_CAPBIT(S390X_MSA)
+ | S390X_CAPBIT(S390X_STCKF),
+ 0ULL, 0ULL, 0ULL },
+ /*.kimd = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_SHA_1) | S390X_CAPBIT(S390X_SHA_256) | S390X_CAPBIT(S390X_SHA_512), 0ULL },
+ /*.klmd = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_SHA_1) | S390X_CAPBIT(S390X_SHA_256) | S390X_CAPBIT(S390X_SHA_512), 0ULL },
+ /*.km = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+ /*.kmc = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+ /*.kmac = */ { S390X_CAPBIT(S390X_QUERY), 0ULL },
+ /*.kmctr = */ { 0ULL, 0ULL },
+ /*.kmo = */ { 0ULL, 0ULL },
+ /*.kmf = */ { 0ULL, 0ULL },
+ /*.prno = */ { 0ULL, 0ULL },
+ /*.kma = */ { 0ULL, 0ULL },
+ /*.pcc = */ { 0ULL, 0ULL },
+ /*.kdsa = */ { 0ULL, 0ULL },
};
/*-
@@ -355,58 +324,23 @@ static int parse_env(struct OPENSSL_s390xcap_st *cap, int *cex)
* Implements MSA and MSA1-4.
*/
static const struct OPENSSL_s390xcap_st z196 = {
- /*.stfle = */{S390X_CAPBIT(S390X_MSA)
- | S390X_CAPBIT(S390X_STCKF),
- S390X_CAPBIT(S390X_MSA3)
- | S390X_CAPBIT(S390X_MSA4),
- 0ULL, 0ULL},
- /*.kimd = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_SHA_1)
- | S390X_CAPBIT(S390X_SHA_256)
- | S390X_CAPBIT(S390X_SHA_512),
- S390X_CAPBIT(S390X_GHASH)},
- /*.klmd = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_SHA_1)
- | S390X_CAPBIT(S390X_SHA_256)
- | S390X_CAPBIT(S390X_SHA_512),
- 0ULL},
- /*.km = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_AES_128)
- | S390X_CAPBIT(S390X_AES_192)
- | S390X_CAPBIT(S390X_AES_256)
- | S390X_CAPBIT(S390X_XTS_AES_128)
- | S390X_CAPBIT(S390X_XTS_AES_256),
- 0ULL},
- /*.kmc = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_AES_128)
- | S390X_CAPBIT(S390X_AES_192)
- | S390X_CAPBIT(S390X_AES_256),
- 0ULL},
- /*.kmac = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_AES_128)
- | S390X_CAPBIT(S390X_AES_192)
- | S390X_CAPBIT(S390X_AES_256),
- 0ULL},
- /*.kmctr = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_AES_128)
- | S390X_CAPBIT(S390X_AES_192)
- | S390X_CAPBIT(S390X_AES_256),
- 0ULL},
- /*.kmo = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_AES_128)
- | S390X_CAPBIT(S390X_AES_192)
- | S390X_CAPBIT(S390X_AES_256),
- 0ULL},
- /*.kmf = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_AES_128)
- | S390X_CAPBIT(S390X_AES_192)
- | S390X_CAPBIT(S390X_AES_256),
- 0ULL},
- /*.prno = */{0ULL, 0ULL},
- /*.kma = */{0ULL, 0ULL},
- /*.pcc = */{S390X_CAPBIT(S390X_QUERY),
- 0ULL},
- /*.kdsa = */{0ULL, 0ULL},
+ /*.stfle = */ { S390X_CAPBIT(S390X_MSA)
+ | S390X_CAPBIT(S390X_STCKF),
+ S390X_CAPBIT(S390X_MSA3)
+ | S390X_CAPBIT(S390X_MSA4),
+ 0ULL, 0ULL },
+ /*.kimd = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_SHA_1) | S390X_CAPBIT(S390X_SHA_256) | S390X_CAPBIT(S390X_SHA_512), S390X_CAPBIT(S390X_GHASH) },
+ /*.klmd = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_SHA_1) | S390X_CAPBIT(S390X_SHA_256) | S390X_CAPBIT(S390X_SHA_512), 0ULL },
+ /*.km = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256) | S390X_CAPBIT(S390X_XTS_AES_128) | S390X_CAPBIT(S390X_XTS_AES_256), 0ULL },
+ /*.kmc = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+ /*.kmac = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+ /*.kmctr = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+ /*.kmo = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+ /*.kmf = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+ /*.prno = */ { 0ULL, 0ULL },
+ /*.kma = */ { 0ULL, 0ULL },
+ /*.pcc = */ { S390X_CAPBIT(S390X_QUERY), 0ULL },
+ /*.kdsa = */ { 0ULL, 0ULL },
};
/*-
@@ -414,58 +348,23 @@ static int parse_env(struct OPENSSL_s390xcap_st *cap, int *cex)
* Implements MSA and MSA1-4.
*/
static const struct OPENSSL_s390xcap_st zEC12 = {
- /*.stfle = */{S390X_CAPBIT(S390X_MSA)
- | S390X_CAPBIT(S390X_STCKF),
- S390X_CAPBIT(S390X_MSA3)
- | S390X_CAPBIT(S390X_MSA4),
- 0ULL, 0ULL},
- /*.kimd = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_SHA_1)
- | S390X_CAPBIT(S390X_SHA_256)
- | S390X_CAPBIT(S390X_SHA_512),
- S390X_CAPBIT(S390X_GHASH)},
- /*.klmd = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_SHA_1)
- | S390X_CAPBIT(S390X_SHA_256)
- | S390X_CAPBIT(S390X_SHA_512),
- 0ULL},
- /*.km = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_AES_128)
- | S390X_CAPBIT(S390X_AES_192)
- | S390X_CAPBIT(S390X_AES_256)
- | S390X_CAPBIT(S390X_XTS_AES_128)
- | S390X_CAPBIT(S390X_XTS_AES_256),
- 0ULL},
- /*.kmc = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_AES_128)
- | S390X_CAPBIT(S390X_AES_192)
- | S390X_CAPBIT(S390X_AES_256),
- 0ULL},
- /*.kmac = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_AES_128)
- | S390X_CAPBIT(S390X_AES_192)
- | S390X_CAPBIT(S390X_AES_256),
- 0ULL},
- /*.kmctr = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_AES_128)
- | S390X_CAPBIT(S390X_AES_192)
- | S390X_CAPBIT(S390X_AES_256),
- 0ULL},
- /*.kmo = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_AES_128)
- | S390X_CAPBIT(S390X_AES_192)
- | S390X_CAPBIT(S390X_AES_256),
- 0ULL},
- /*.kmf = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_AES_128)
- | S390X_CAPBIT(S390X_AES_192)
- | S390X_CAPBIT(S390X_AES_256),
- 0ULL},
- /*.prno = */{0ULL, 0ULL},
- /*.kma = */{0ULL, 0ULL},
- /*.pcc = */{S390X_CAPBIT(S390X_QUERY),
- 0ULL},
- /*.kdsa = */{0ULL, 0ULL},
+ /*.stfle = */ { S390X_CAPBIT(S390X_MSA)
+ | S390X_CAPBIT(S390X_STCKF),
+ S390X_CAPBIT(S390X_MSA3)
+ | S390X_CAPBIT(S390X_MSA4),
+ 0ULL, 0ULL },
+ /*.kimd = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_SHA_1) | S390X_CAPBIT(S390X_SHA_256) | S390X_CAPBIT(S390X_SHA_512), S390X_CAPBIT(S390X_GHASH) },
+ /*.klmd = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_SHA_1) | S390X_CAPBIT(S390X_SHA_256) | S390X_CAPBIT(S390X_SHA_512), 0ULL },
+ /*.km = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256) | S390X_CAPBIT(S390X_XTS_AES_128) | S390X_CAPBIT(S390X_XTS_AES_256), 0ULL },
+ /*.kmc = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+ /*.kmac = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+ /*.kmctr = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+ /*.kmo = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+ /*.kmf = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+ /*.prno = */ { 0ULL, 0ULL },
+ /*.kma = */ { 0ULL, 0ULL },
+ /*.pcc = */ { S390X_CAPBIT(S390X_QUERY), 0ULL },
+ /*.kdsa = */ { 0ULL, 0ULL },
};
/*-
@@ -473,62 +372,25 @@ static int parse_env(struct OPENSSL_s390xcap_st *cap, int *cex)
* Implements MSA and MSA1-5.
*/
static const struct OPENSSL_s390xcap_st z13 = {
- /*.stfle = */{S390X_CAPBIT(S390X_MSA)
- | S390X_CAPBIT(S390X_STCKF)
- | S390X_CAPBIT(S390X_MSA5),
- S390X_CAPBIT(S390X_MSA3)
- | S390X_CAPBIT(S390X_MSA4),
- S390X_CAPBIT(S390X_VX),
- 0ULL},
- /*.kimd = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_SHA_1)
- | S390X_CAPBIT(S390X_SHA_256)
- | S390X_CAPBIT(S390X_SHA_512),
- S390X_CAPBIT(S390X_GHASH)},
- /*.klmd = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_SHA_1)
- | S390X_CAPBIT(S390X_SHA_256)
- | S390X_CAPBIT(S390X_SHA_512),
- 0ULL},
- /*.km = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_AES_128)
- | S390X_CAPBIT(S390X_AES_192)
- | S390X_CAPBIT(S390X_AES_256)
- | S390X_CAPBIT(S390X_XTS_AES_128)
- | S390X_CAPBIT(S390X_XTS_AES_256),
- 0ULL},
- /*.kmc = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_AES_128)
- | S390X_CAPBIT(S390X_AES_192)
- | S390X_CAPBIT(S390X_AES_256),
- 0ULL},
- /*.kmac = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_AES_128)
- | S390X_CAPBIT(S390X_AES_192)
- | S390X_CAPBIT(S390X_AES_256),
- 0ULL},
- /*.kmctr = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_AES_128)
- | S390X_CAPBIT(S390X_AES_192)
- | S390X_CAPBIT(S390X_AES_256),
- 0ULL},
- /*.kmo = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_AES_128)
- | S390X_CAPBIT(S390X_AES_192)
- | S390X_CAPBIT(S390X_AES_256),
- 0ULL},
- /*.kmf = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_AES_128)
- | S390X_CAPBIT(S390X_AES_192)
- | S390X_CAPBIT(S390X_AES_256),
- 0ULL},
- /*.prno = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_SHA_512_DRNG),
- 0ULL},
- /*.kma = */{0ULL, 0ULL},
- /*.pcc = */{S390X_CAPBIT(S390X_QUERY),
- 0ULL},
- /*.kdsa = */{0ULL, 0ULL},
+ /*.stfle = */ { S390X_CAPBIT(S390X_MSA)
+ | S390X_CAPBIT(S390X_STCKF)
+ | S390X_CAPBIT(S390X_MSA5),
+ S390X_CAPBIT(S390X_MSA3)
+ | S390X_CAPBIT(S390X_MSA4),
+ S390X_CAPBIT(S390X_VX),
+ 0ULL },
+ /*.kimd = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_SHA_1) | S390X_CAPBIT(S390X_SHA_256) | S390X_CAPBIT(S390X_SHA_512), S390X_CAPBIT(S390X_GHASH) },
+ /*.klmd = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_SHA_1) | S390X_CAPBIT(S390X_SHA_256) | S390X_CAPBIT(S390X_SHA_512), 0ULL },
+ /*.km = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256) | S390X_CAPBIT(S390X_XTS_AES_128) | S390X_CAPBIT(S390X_XTS_AES_256), 0ULL },
+ /*.kmc = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+ /*.kmac = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+ /*.kmctr = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+ /*.kmo = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+ /*.kmf = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+ /*.prno = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_SHA_512_DRNG), 0ULL },
+ /*.kma = */ { 0ULL, 0ULL },
+ /*.pcc = */ { S390X_CAPBIT(S390X_QUERY), 0ULL },
+ /*.kdsa = */ { 0ULL, 0ULL },
};
/*-
@@ -536,81 +398,28 @@ static int parse_env(struct OPENSSL_s390xcap_st *cap, int *cex)
* Implements MSA and MSA1-8.
*/
static const struct OPENSSL_s390xcap_st z14 = {
- /*.stfle = */{S390X_CAPBIT(S390X_MSA)
- | S390X_CAPBIT(S390X_STCKF)
- | S390X_CAPBIT(S390X_MSA5),
- S390X_CAPBIT(S390X_MSA3)
- | S390X_CAPBIT(S390X_MSA4),
- S390X_CAPBIT(S390X_VX)
- | S390X_CAPBIT(S390X_VXD)
- | S390X_CAPBIT(S390X_VXE)
- | S390X_CAPBIT(S390X_MSA8),
- 0ULL},
- /*.kimd = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_SHA_1)
- | S390X_CAPBIT(S390X_SHA_256)
- | S390X_CAPBIT(S390X_SHA_512)
- | S390X_CAPBIT(S390X_SHA3_224)
- | S390X_CAPBIT(S390X_SHA3_256)
- | S390X_CAPBIT(S390X_SHA3_384)
- | S390X_CAPBIT(S390X_SHA3_512)
- | S390X_CAPBIT(S390X_SHAKE_128)
- | S390X_CAPBIT(S390X_SHAKE_256),
- S390X_CAPBIT(S390X_GHASH)},
- /*.klmd = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_SHA_1)
- | S390X_CAPBIT(S390X_SHA_256)
- | S390X_CAPBIT(S390X_SHA_512)
- | S390X_CAPBIT(S390X_SHA3_224)
- | S390X_CAPBIT(S390X_SHA3_256)
- | S390X_CAPBIT(S390X_SHA3_384)
- | S390X_CAPBIT(S390X_SHA3_512)
- | S390X_CAPBIT(S390X_SHAKE_128)
- | S390X_CAPBIT(S390X_SHAKE_256),
- 0ULL},
- /*.km = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_AES_128)
- | S390X_CAPBIT(S390X_AES_192)
- | S390X_CAPBIT(S390X_AES_256)
- | S390X_CAPBIT(S390X_XTS_AES_128)
- | S390X_CAPBIT(S390X_XTS_AES_256),
- 0ULL},
- /*.kmc = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_AES_128)
- | S390X_CAPBIT(S390X_AES_192)
- | S390X_CAPBIT(S390X_AES_256),
- 0ULL},
- /*.kmac = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_AES_128)
- | S390X_CAPBIT(S390X_AES_192)
- | S390X_CAPBIT(S390X_AES_256),
- 0ULL},
- /*.kmctr = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_AES_128)
- | S390X_CAPBIT(S390X_AES_192)
- | S390X_CAPBIT(S390X_AES_256),
- 0ULL},
- /*.kmo = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_AES_128)
- | S390X_CAPBIT(S390X_AES_192)
- | S390X_CAPBIT(S390X_AES_256),
- 0ULL},
- /*.kmf = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_AES_128)
- | S390X_CAPBIT(S390X_AES_192)
- | S390X_CAPBIT(S390X_AES_256),
- 0ULL},
- /*.prno = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_SHA_512_DRNG),
- S390X_CAPBIT(S390X_TRNG)},
- /*.kma = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_AES_128)
- | S390X_CAPBIT(S390X_AES_192)
- | S390X_CAPBIT(S390X_AES_256),
- 0ULL},
- /*.pcc = */{S390X_CAPBIT(S390X_QUERY),
- 0ULL},
- /*.kdsa = */{0ULL, 0ULL},
+ /*.stfle = */ { S390X_CAPBIT(S390X_MSA)
+ | S390X_CAPBIT(S390X_STCKF)
+ | S390X_CAPBIT(S390X_MSA5),
+ S390X_CAPBIT(S390X_MSA3)
+ | S390X_CAPBIT(S390X_MSA4),
+ S390X_CAPBIT(S390X_VX)
+ | S390X_CAPBIT(S390X_VXD)
+ | S390X_CAPBIT(S390X_VXE)
+ | S390X_CAPBIT(S390X_MSA8),
+ 0ULL },
+ /*.kimd = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_SHA_1) | S390X_CAPBIT(S390X_SHA_256) | S390X_CAPBIT(S390X_SHA_512) | S390X_CAPBIT(S390X_SHA3_224) | S390X_CAPBIT(S390X_SHA3_256) | S390X_CAPBIT(S390X_SHA3_384) | S390X_CAPBIT(S390X_SHA3_512) | S390X_CAPBIT(S390X_SHAKE_128) | S390X_CAPBIT(S390X_SHAKE_256), S390X_CAPBIT(S390X_GHASH) },
+ /*.klmd = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_SHA_1) | S390X_CAPBIT(S390X_SHA_256) | S390X_CAPBIT(S390X_SHA_512) | S390X_CAPBIT(S390X_SHA3_224) | S390X_CAPBIT(S390X_SHA3_256) | S390X_CAPBIT(S390X_SHA3_384) | S390X_CAPBIT(S390X_SHA3_512) | S390X_CAPBIT(S390X_SHAKE_128) | S390X_CAPBIT(S390X_SHAKE_256), 0ULL },
+ /*.km = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256) | S390X_CAPBIT(S390X_XTS_AES_128) | S390X_CAPBIT(S390X_XTS_AES_256), 0ULL },
+ /*.kmc = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+ /*.kmac = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+ /*.kmctr = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+ /*.kmo = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+ /*.kmf = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+ /*.prno = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_SHA_512_DRNG), S390X_CAPBIT(S390X_TRNG) },
+ /*.kma = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+ /*.pcc = */ { S390X_CAPBIT(S390X_QUERY), 0ULL },
+ /*.kdsa = */ { 0ULL, 0ULL },
};
/*-
@@ -618,99 +427,29 @@ static int parse_env(struct OPENSSL_s390xcap_st *cap, int *cex)
* Implements MSA and MSA1-9.
*/
static const struct OPENSSL_s390xcap_st z15 = {
- /*.stfle = */{S390X_CAPBIT(S390X_MSA)
- | S390X_CAPBIT(S390X_STCKF)
- | S390X_CAPBIT(S390X_MSA5),
- S390X_CAPBIT(S390X_MSA3)
- | S390X_CAPBIT(S390X_MSA4),
- S390X_CAPBIT(S390X_VX)
- | S390X_CAPBIT(S390X_VXD)
- | S390X_CAPBIT(S390X_VXE)
- | S390X_CAPBIT(S390X_MSA8)
- | S390X_CAPBIT(S390X_MSA9),
- 0ULL},
- /*.kimd = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_SHA_1)
- | S390X_CAPBIT(S390X_SHA_256)
- | S390X_CAPBIT(S390X_SHA_512)
- | S390X_CAPBIT(S390X_SHA3_224)
- | S390X_CAPBIT(S390X_SHA3_256)
- | S390X_CAPBIT(S390X_SHA3_384)
- | S390X_CAPBIT(S390X_SHA3_512)
- | S390X_CAPBIT(S390X_SHAKE_128)
- | S390X_CAPBIT(S390X_SHAKE_256),
- S390X_CAPBIT(S390X_GHASH)},
- /*.klmd = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_SHA_1)
- | S390X_CAPBIT(S390X_SHA_256)
- | S390X_CAPBIT(S390X_SHA_512)
- | S390X_CAPBIT(S390X_SHA3_224)
- | S390X_CAPBIT(S390X_SHA3_256)
- | S390X_CAPBIT(S390X_SHA3_384)
- | S390X_CAPBIT(S390X_SHA3_512)
- | S390X_CAPBIT(S390X_SHAKE_128)
- | S390X_CAPBIT(S390X_SHAKE_256),
- 0ULL},
- /*.km = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_AES_128)
- | S390X_CAPBIT(S390X_AES_192)
- | S390X_CAPBIT(S390X_AES_256)
- | S390X_CAPBIT(S390X_XTS_AES_128)
- | S390X_CAPBIT(S390X_XTS_AES_256),
- 0ULL},
- /*.kmc = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_AES_128)
- | S390X_CAPBIT(S390X_AES_192)
- | S390X_CAPBIT(S390X_AES_256),
- 0ULL},
- /*.kmac = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_AES_128)
- | S390X_CAPBIT(S390X_AES_192)
- | S390X_CAPBIT(S390X_AES_256),
- 0ULL},
- /*.kmctr = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_AES_128)
- | S390X_CAPBIT(S390X_AES_192)
- | S390X_CAPBIT(S390X_AES_256),
- 0ULL},
- /*.kmo = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_AES_128)
- | S390X_CAPBIT(S390X_AES_192)
- | S390X_CAPBIT(S390X_AES_256),
- 0ULL},
- /*.kmf = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_AES_128)
- | S390X_CAPBIT(S390X_AES_192)
- | S390X_CAPBIT(S390X_AES_256),
- 0ULL},
- /*.prno = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_SHA_512_DRNG),
- S390X_CAPBIT(S390X_TRNG)},
- /*.kma = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_AES_128)
- | S390X_CAPBIT(S390X_AES_192)
- | S390X_CAPBIT(S390X_AES_256),
- 0ULL},
- /*.pcc = */{S390X_CAPBIT(S390X_QUERY),
- S390X_CAPBIT(S390X_SCALAR_MULTIPLY_P256)
- | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_P384)
- | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_P521)
- | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_ED25519)
- | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_ED448)
- | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_X25519)
- | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_X448)},
- /*.kdsa = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_ECDSA_VERIFY_P256)
- | S390X_CAPBIT(S390X_ECDSA_VERIFY_P384)
- | S390X_CAPBIT(S390X_ECDSA_VERIFY_P521)
- | S390X_CAPBIT(S390X_ECDSA_SIGN_P256)
- | S390X_CAPBIT(S390X_ECDSA_SIGN_P384)
- | S390X_CAPBIT(S390X_ECDSA_SIGN_P521)
- | S390X_CAPBIT(S390X_EDDSA_VERIFY_ED25519)
- | S390X_CAPBIT(S390X_EDDSA_VERIFY_ED448)
- | S390X_CAPBIT(S390X_EDDSA_SIGN_ED25519)
- | S390X_CAPBIT(S390X_EDDSA_SIGN_ED448),
- 0ULL},
+ /*.stfle = */ { S390X_CAPBIT(S390X_MSA)
+ | S390X_CAPBIT(S390X_STCKF)
+ | S390X_CAPBIT(S390X_MSA5),
+ S390X_CAPBIT(S390X_MSA3)
+ | S390X_CAPBIT(S390X_MSA4),
+ S390X_CAPBIT(S390X_VX)
+ | S390X_CAPBIT(S390X_VXD)
+ | S390X_CAPBIT(S390X_VXE)
+ | S390X_CAPBIT(S390X_MSA8)
+ | S390X_CAPBIT(S390X_MSA9),
+ 0ULL },
+ /*.kimd = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_SHA_1) | S390X_CAPBIT(S390X_SHA_256) | S390X_CAPBIT(S390X_SHA_512) | S390X_CAPBIT(S390X_SHA3_224) | S390X_CAPBIT(S390X_SHA3_256) | S390X_CAPBIT(S390X_SHA3_384) | S390X_CAPBIT(S390X_SHA3_512) | S390X_CAPBIT(S390X_SHAKE_128) | S390X_CAPBIT(S390X_SHAKE_256), S390X_CAPBIT(S390X_GHASH) },
+ /*.klmd = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_SHA_1) | S390X_CAPBIT(S390X_SHA_256) | S390X_CAPBIT(S390X_SHA_512) | S390X_CAPBIT(S390X_SHA3_224) | S390X_CAPBIT(S390X_SHA3_256) | S390X_CAPBIT(S390X_SHA3_384) | S390X_CAPBIT(S390X_SHA3_512) | S390X_CAPBIT(S390X_SHAKE_128) | S390X_CAPBIT(S390X_SHAKE_256), 0ULL },
+ /*.km = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256) | S390X_CAPBIT(S390X_XTS_AES_128) | S390X_CAPBIT(S390X_XTS_AES_256), 0ULL },
+ /*.kmc = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+ /*.kmac = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+ /*.kmctr = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+ /*.kmo = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+ /*.kmf = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+ /*.prno = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_SHA_512_DRNG), S390X_CAPBIT(S390X_TRNG) },
+ /*.kma = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+ /*.pcc = */ { S390X_CAPBIT(S390X_QUERY), S390X_CAPBIT(S390X_SCALAR_MULTIPLY_P256) | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_P384) | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_P521) | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_ED25519) | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_ED448) | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_X25519) | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_X448) },
+ /*.kdsa = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_ECDSA_VERIFY_P256) | S390X_CAPBIT(S390X_ECDSA_VERIFY_P384) | S390X_CAPBIT(S390X_ECDSA_VERIFY_P521) | S390X_CAPBIT(S390X_ECDSA_SIGN_P256) | S390X_CAPBIT(S390X_ECDSA_SIGN_P384) | S390X_CAPBIT(S390X_ECDSA_SIGN_P521) | S390X_CAPBIT(S390X_EDDSA_VERIFY_ED25519) | S390X_CAPBIT(S390X_EDDSA_VERIFY_ED448) | S390X_CAPBIT(S390X_EDDSA_SIGN_ED25519) | S390X_CAPBIT(S390X_EDDSA_SIGN_ED448), 0ULL },
};
/*-
@@ -723,104 +462,30 @@ static int parse_env(struct OPENSSL_s390xcap_st *cap, int *cex)
* Implements MSA and MSA1-12.
*/
static const struct OPENSSL_s390xcap_st z17 = {
- /*.stfle = */{S390X_CAPBIT(S390X_MSA)
- | S390X_CAPBIT(S390X_STCKF)
- | S390X_CAPBIT(S390X_MSA5),
- S390X_CAPBIT(S390X_MSA3)
- | S390X_CAPBIT(S390X_MSA4)
- | S390X_CAPBIT(S390X_MSA12),
- S390X_CAPBIT(S390X_VX)
- | S390X_CAPBIT(S390X_VXD)
- | S390X_CAPBIT(S390X_VXE)
- | S390X_CAPBIT(S390X_MSA8)
- | S390X_CAPBIT(S390X_MSA9),
- 0ULL},
- /*.kimd = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_SHA_1)
- | S390X_CAPBIT(S390X_SHA_256)
- | S390X_CAPBIT(S390X_SHA_512)
- | S390X_CAPBIT(S390X_SHA3_224)
- | S390X_CAPBIT(S390X_SHA3_256)
- | S390X_CAPBIT(S390X_SHA3_384)
- | S390X_CAPBIT(S390X_SHA3_512)
- | S390X_CAPBIT(S390X_SHAKE_128)
- | S390X_CAPBIT(S390X_SHAKE_256),
- S390X_CAPBIT(S390X_GHASH)},
- /*.klmd = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_SHA_1)
- | S390X_CAPBIT(S390X_SHA_256)
- | S390X_CAPBIT(S390X_SHA_512)
- | S390X_CAPBIT(S390X_SHA3_224)
- | S390X_CAPBIT(S390X_SHA3_256)
- | S390X_CAPBIT(S390X_SHA3_384)
- | S390X_CAPBIT(S390X_SHA3_512)
- | S390X_CAPBIT(S390X_SHAKE_128)
- | S390X_CAPBIT(S390X_SHAKE_256),
- 0ULL},
- /*.km = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_AES_128)
- | S390X_CAPBIT(S390X_AES_192)
- | S390X_CAPBIT(S390X_AES_256)
- | S390X_CAPBIT(S390X_XTS_AES_128)
- | S390X_CAPBIT(S390X_XTS_AES_256),
- S390X_CAPBIT(S390X_XTS_AES_128_MSA10)
- | S390X_CAPBIT(S390X_XTS_AES_256_MSA10)},
- /*.kmc = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_AES_128)
- | S390X_CAPBIT(S390X_AES_192)
- | S390X_CAPBIT(S390X_AES_256),
- 0ULL},
- /*.kmac = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_AES_128)
- | S390X_CAPBIT(S390X_AES_192)
- | S390X_CAPBIT(S390X_AES_256),
- S390X_CAPBIT(S390X_HMAC_SHA_224)
- | S390X_CAPBIT(S390X_HMAC_SHA_256)
- | S390X_CAPBIT(S390X_HMAC_SHA_384)
- | S390X_CAPBIT(S390X_HMAC_SHA_512)},
- /*.kmctr = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_AES_128)
- | S390X_CAPBIT(S390X_AES_192)
- | S390X_CAPBIT(S390X_AES_256),
- 0ULL},
- /*.kmo = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_AES_128)
- | S390X_CAPBIT(S390X_AES_192)
- | S390X_CAPBIT(S390X_AES_256),
- 0ULL},
- /*.kmf = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_AES_128)
- | S390X_CAPBIT(S390X_AES_192)
- | S390X_CAPBIT(S390X_AES_256),
- 0ULL},
- /*.prno = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_SHA_512_DRNG),
- S390X_CAPBIT(S390X_TRNG)},
- /*.kma = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_AES_128)
- | S390X_CAPBIT(S390X_AES_192)
- | S390X_CAPBIT(S390X_AES_256),
- 0ULL},
- /*.pcc = */{S390X_CAPBIT(S390X_QUERY),
- S390X_CAPBIT(S390X_SCALAR_MULTIPLY_P256)
- | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_P384)
- | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_P521)
- | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_ED25519)
- | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_ED448)
- | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_X25519)
- | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_X448)},
- /*.kdsa = */{S390X_CAPBIT(S390X_QUERY)
- | S390X_CAPBIT(S390X_ECDSA_VERIFY_P256)
- | S390X_CAPBIT(S390X_ECDSA_VERIFY_P384)
- | S390X_CAPBIT(S390X_ECDSA_VERIFY_P521)
- | S390X_CAPBIT(S390X_ECDSA_SIGN_P256)
- | S390X_CAPBIT(S390X_ECDSA_SIGN_P384)
- | S390X_CAPBIT(S390X_ECDSA_SIGN_P521)
- | S390X_CAPBIT(S390X_EDDSA_VERIFY_ED25519)
- | S390X_CAPBIT(S390X_EDDSA_VERIFY_ED448)
- | S390X_CAPBIT(S390X_EDDSA_SIGN_ED25519)
- | S390X_CAPBIT(S390X_EDDSA_SIGN_ED448),
- 0ULL},
+ /*.stfle = */ { S390X_CAPBIT(S390X_MSA)
+ | S390X_CAPBIT(S390X_STCKF)
+ | S390X_CAPBIT(S390X_MSA5),
+ S390X_CAPBIT(S390X_MSA3)
+ | S390X_CAPBIT(S390X_MSA4)
+ | S390X_CAPBIT(S390X_MSA12),
+ S390X_CAPBIT(S390X_VX)
+ | S390X_CAPBIT(S390X_VXD)
+ | S390X_CAPBIT(S390X_VXE)
+ | S390X_CAPBIT(S390X_MSA8)
+ | S390X_CAPBIT(S390X_MSA9),
+ 0ULL },
+ /*.kimd = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_SHA_1) | S390X_CAPBIT(S390X_SHA_256) | S390X_CAPBIT(S390X_SHA_512) | S390X_CAPBIT(S390X_SHA3_224) | S390X_CAPBIT(S390X_SHA3_256) | S390X_CAPBIT(S390X_SHA3_384) | S390X_CAPBIT(S390X_SHA3_512) | S390X_CAPBIT(S390X_SHAKE_128) | S390X_CAPBIT(S390X_SHAKE_256), S390X_CAPBIT(S390X_GHASH) },
+ /*.klmd = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_SHA_1) | S390X_CAPBIT(S390X_SHA_256) | S390X_CAPBIT(S390X_SHA_512) | S390X_CAPBIT(S390X_SHA3_224) | S390X_CAPBIT(S390X_SHA3_256) | S390X_CAPBIT(S390X_SHA3_384) | S390X_CAPBIT(S390X_SHA3_512) | S390X_CAPBIT(S390X_SHAKE_128) | S390X_CAPBIT(S390X_SHAKE_256), 0ULL },
+ /*.km = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256) | S390X_CAPBIT(S390X_XTS_AES_128) | S390X_CAPBIT(S390X_XTS_AES_256), S390X_CAPBIT(S390X_XTS_AES_128_MSA10) | S390X_CAPBIT(S390X_XTS_AES_256_MSA10) },
+ /*.kmc = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+ /*.kmac = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), S390X_CAPBIT(S390X_HMAC_SHA_224) | S390X_CAPBIT(S390X_HMAC_SHA_256) | S390X_CAPBIT(S390X_HMAC_SHA_384) | S390X_CAPBIT(S390X_HMAC_SHA_512) },
+ /*.kmctr = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+ /*.kmo = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+ /*.kmf = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+ /*.prno = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_SHA_512_DRNG), S390X_CAPBIT(S390X_TRNG) },
+ /*.kma = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+ /*.pcc = */ { S390X_CAPBIT(S390X_QUERY), S390X_CAPBIT(S390X_SCALAR_MULTIPLY_P256) | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_P384) | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_P521) | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_ED25519) | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_ED448) | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_X25519) | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_X448) },
+ /*.kdsa = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_ECDSA_VERIFY_P256) | S390X_CAPBIT(S390X_ECDSA_VERIFY_P384) | S390X_CAPBIT(S390X_ECDSA_VERIFY_P521) | S390X_CAPBIT(S390X_ECDSA_SIGN_P256) | S390X_CAPBIT(S390X_ECDSA_SIGN_P384) | S390X_CAPBIT(S390X_ECDSA_SIGN_P521) | S390X_CAPBIT(S390X_EDDSA_VERIFY_ED25519) | S390X_CAPBIT(S390X_EDDSA_VERIFY_ED448) | S390X_CAPBIT(S390X_EDDSA_SIGN_ED25519) | S390X_CAPBIT(S390X_EDDSA_SIGN_ED448), 0ULL },
};
char *tok_begin, *tok_end, *buff, tok[S390X_STFLE_MAX][LEN + 1];
@@ -841,9 +506,9 @@ static int parse_env(struct OPENSSL_s390xcap_st *cap, int *cex)
while (tok_begin != NULL) {
/* stfle token */
if ((n = sscanf(tok_begin,
- " stfle : %" STR(LEN) "[^:] : "
- "%" STR(LEN) "[^:] : %" STR(LEN) "s ",
- tok[0], tok[1], tok[2]))) {
+ " stfle : %" STR(LEN) "[^:] : "
+ "%" STR(LEN) "[^:] : %" STR(LEN) "s ",
+ tok[0], tok[1], tok[2]))) {
for (i = 0; i < n; i++) {
off = (tok[i][0] == '~') ? 1 : 0;
if (sscanf(tok[i] + off, "%llx", &cap->stfle[i]) != 1)
@@ -854,38 +519,20 @@ static int parse_env(struct OPENSSL_s390xcap_st *cap, int *cex)
}
/* query function tokens */
- else if TOK_FUNC(kimd)
- else if TOK_FUNC(klmd)
- else if TOK_FUNC(km)
- else if TOK_FUNC(kmc)
- else if TOK_FUNC(kmac)
- else if TOK_FUNC(kmctr)
- else if TOK_FUNC(kmo)
- else if TOK_FUNC(kmf)
- else if TOK_FUNC(prno)
- else if TOK_FUNC(kma)
- else if TOK_FUNC(pcc)
- else if TOK_FUNC(kdsa)
-
- /* CPU model tokens */
- else if TOK_CPU(z900)
- else if TOK_CPU(z990)
- else if TOK_CPU(z9)
- else if TOK_CPU(z10)
- else if TOK_CPU(z196)
- else if TOK_CPU(zEC12)
- else if TOK_CPU(z13)
- else if TOK_CPU(z14)
- else if TOK_CPU(z15)
- else if TOK_CPU_ALIAS(z16, z15)
- else if TOK_CPU(z17)
-
- /* nocex to deactivate cex support */
- else if (sscanf(tok_begin, " %" STR(LEN) "s %" STR(LEN) "s ",
- tok[0], tok[1]) == 1
- && !strcmp(tok[0], "nocex")) {
- *cex = 0;
- }
+ else if TOK_FUNC (kimd)
+ else if TOK_FUNC (klmd) else if TOK_FUNC (km) else if TOK_FUNC (kmc) else if TOK_FUNC (kmac) else if TOK_FUNC (kmctr) else if TOK_FUNC (kmo) else if TOK_FUNC (kmf) else if TOK_FUNC (prno) else if TOK_FUNC (kma) else if TOK_FUNC (pcc) else if TOK_FUNC (kdsa)
+
+ /* CPU model tokens */
+ else if TOK_CPU (z900) else if TOK_CPU (z990) else if TOK_CPU (z9) else if TOK_CPU (z10) else if TOK_CPU (z196) else if TOK_CPU (zEC12) else if TOK_CPU (z13) else if TOK_CPU (z14) else if TOK_CPU (z15) else if TOK_CPU_ALIAS (z16, z15) else if TOK_CPU (z17)
+
+ /* nocex to deactivate cex support */
+ else if (sscanf(tok_begin, " %" STR(LEN) "s %" STR(LEN) "s ",
+ tok[0], tok[1])
+ == 1
+ && !strcmp(tok[0], "nocex"))
+ {
+ *cex = 0;
+ }
/* whitespace(ignored) or invalid tokens */
else {
diff --git a/crypto/seed/seed.c b/crypto/seed/seed.c
index de3b3958ea..7811f24d83 100644
--- a/crypto/seed/seed.c
+++ b/crypto/seed/seed.c
@@ -40,411 +40,400 @@
*/
#include "internal/deprecated.h"
-# include <stdio.h>
-# include <stdlib.h>
-# include <string.h>
-# ifdef _WIN32
-# include <memory.h>
-# endif
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifdef _WIN32
+#include <memory.h>
+#endif
-# include <openssl/seed.h>
-# include "seed_local.h"
+#include <openssl/seed.h>
+#include "seed_local.h"
-# ifdef SS /* can get defined on Solaris by inclusion of
- * <stdlib.h> */
-# undef SS
-# endif
+#ifdef SS /* can get defined on Solaris by inclusion of \
+ * <stdlib.h> */
+#undef SS
+#endif
-# if !defined(OPENSSL_SMALL_FOOTPRINT)
+#if !defined(OPENSSL_SMALL_FOOTPRINT)
-# define G_FUNC(v) \
- SS[0][(unsigned char) (v) & 0xff] ^ \
- SS[1][(unsigned char) ((v)>>8) & 0xff] ^ \
- SS[2][(unsigned char)((v)>>16) & 0xff] ^ \
- SS[3][(unsigned char)((v)>>24) & 0xff]
+#define G_FUNC(v) \
+ SS[0][(unsigned char)(v) & 0xff] ^ SS[1][(unsigned char)((v) >> 8) & 0xff] ^ SS[2][(unsigned char)((v) >> 16) & 0xff] ^ SS[3][(unsigned char)((v) >> 24) & 0xff]
static const seed_word SS[4][256] = {
{ 0x2989a1a8, 0x05858184, 0x16c6d2d4, 0x13c3d3d0,
- 0x14445054, 0x1d0d111c, 0x2c8ca0ac, 0x25052124,
- 0x1d4d515c, 0x03434340, 0x18081018, 0x1e0e121c,
- 0x11415150, 0x3cccf0fc, 0x0acac2c8, 0x23436360,
- 0x28082028, 0x04444044, 0x20002020, 0x1d8d919c,
- 0x20c0e0e0, 0x22c2e2e0, 0x08c8c0c8, 0x17071314,
- 0x2585a1a4, 0x0f8f838c, 0x03030300, 0x3b4b7378,
- 0x3b8bb3b8, 0x13031310, 0x12c2d2d0, 0x2ecee2ec,
- 0x30407070, 0x0c8c808c, 0x3f0f333c, 0x2888a0a8,
- 0x32023230, 0x1dcdd1dc, 0x36c6f2f4, 0x34447074,
- 0x2ccce0ec, 0x15859194, 0x0b0b0308, 0x17475354,
- 0x1c4c505c, 0x1b4b5358, 0x3d8db1bc, 0x01010100,
- 0x24042024, 0x1c0c101c, 0x33437370, 0x18889098,
- 0x10001010, 0x0cccc0cc, 0x32c2f2f0, 0x19c9d1d8,
- 0x2c0c202c, 0x27c7e3e4, 0x32427270, 0x03838380,
- 0x1b8b9398, 0x11c1d1d0, 0x06868284, 0x09c9c1c8,
- 0x20406060, 0x10405050, 0x2383a3a0, 0x2bcbe3e8,
- 0x0d0d010c, 0x3686b2b4, 0x1e8e929c, 0x0f4f434c,
- 0x3787b3b4, 0x1a4a5258, 0x06c6c2c4, 0x38487078,
- 0x2686a2a4, 0x12021210, 0x2f8fa3ac, 0x15c5d1d4,
- 0x21416160, 0x03c3c3c0, 0x3484b0b4, 0x01414140,
- 0x12425250, 0x3d4d717c, 0x0d8d818c, 0x08080008,
- 0x1f0f131c, 0x19899198, 0x00000000, 0x19091118,
- 0x04040004, 0x13435350, 0x37c7f3f4, 0x21c1e1e0,
- 0x3dcdf1fc, 0x36467274, 0x2f0f232c, 0x27072324,
- 0x3080b0b0, 0x0b8b8388, 0x0e0e020c, 0x2b8ba3a8,
- 0x2282a2a0, 0x2e4e626c, 0x13839390, 0x0d4d414c,
- 0x29496168, 0x3c4c707c, 0x09090108, 0x0a0a0208,
- 0x3f8fb3bc, 0x2fcfe3ec, 0x33c3f3f0, 0x05c5c1c4,
- 0x07878384, 0x14041014, 0x3ecef2fc, 0x24446064,
- 0x1eced2dc, 0x2e0e222c, 0x0b4b4348, 0x1a0a1218,
- 0x06060204, 0x21012120, 0x2b4b6368, 0x26466264,
- 0x02020200, 0x35c5f1f4, 0x12829290, 0x0a8a8288,
- 0x0c0c000c, 0x3383b3b0, 0x3e4e727c, 0x10c0d0d0,
- 0x3a4a7278, 0x07474344, 0x16869294, 0x25c5e1e4,
- 0x26062224, 0x00808080, 0x2d8da1ac, 0x1fcfd3dc,
- 0x2181a1a0, 0x30003030, 0x37073334, 0x2e8ea2ac,
- 0x36063234, 0x15051114, 0x22022220, 0x38083038,
- 0x34c4f0f4, 0x2787a3a4, 0x05454144, 0x0c4c404c,
- 0x01818180, 0x29c9e1e8, 0x04848084, 0x17879394,
- 0x35053134, 0x0bcbc3c8, 0x0ecec2cc, 0x3c0c303c,
- 0x31417170, 0x11011110, 0x07c7c3c4, 0x09898188,
- 0x35457174, 0x3bcbf3f8, 0x1acad2d8, 0x38c8f0f8,
- 0x14849094, 0x19495158, 0x02828280, 0x04c4c0c4,
- 0x3fcff3fc, 0x09494148, 0x39093138, 0x27476364,
- 0x00c0c0c0, 0x0fcfc3cc, 0x17c7d3d4, 0x3888b0b8,
- 0x0f0f030c, 0x0e8e828c, 0x02424240, 0x23032320,
- 0x11819190, 0x2c4c606c, 0x1bcbd3d8, 0x2484a0a4,
- 0x34043034, 0x31c1f1f0, 0x08484048, 0x02c2c2c0,
- 0x2f4f636c, 0x3d0d313c, 0x2d0d212c, 0x00404040,
- 0x3e8eb2bc, 0x3e0e323c, 0x3c8cb0bc, 0x01c1c1c0,
- 0x2a8aa2a8, 0x3a8ab2b8, 0x0e4e424c, 0x15455154,
- 0x3b0b3338, 0x1cccd0dc, 0x28486068, 0x3f4f737c,
- 0x1c8c909c, 0x18c8d0d8, 0x0a4a4248, 0x16465254,
- 0x37477374, 0x2080a0a0, 0x2dcde1ec, 0x06464244,
- 0x3585b1b4, 0x2b0b2328, 0x25456164, 0x3acaf2f8,
- 0x23c3e3e0, 0x3989b1b8, 0x3181b1b0, 0x1f8f939c,
- 0x1e4e525c, 0x39c9f1f8, 0x26c6e2e4, 0x3282b2b0,
- 0x31013130, 0x2acae2e8, 0x2d4d616c, 0x1f4f535c,
- 0x24c4e0e4, 0x30c0f0f0, 0x0dcdc1cc, 0x08888088,
- 0x16061214, 0x3a0a3238, 0x18485058, 0x14c4d0d4,
- 0x22426260, 0x29092128, 0x07070304, 0x33033330,
- 0x28c8e0e8, 0x1b0b1318, 0x05050104, 0x39497178,
- 0x10809090, 0x2a4a6268, 0x2a0a2228, 0x1a8a9298
- },
+ 0x14445054, 0x1d0d111c, 0x2c8ca0ac, 0x25052124,
+ 0x1d4d515c, 0x03434340, 0x18081018, 0x1e0e121c,
+ 0x11415150, 0x3cccf0fc, 0x0acac2c8, 0x23436360,
+ 0x28082028, 0x04444044, 0x20002020, 0x1d8d919c,
+ 0x20c0e0e0, 0x22c2e2e0, 0x08c8c0c8, 0x17071314,
+ 0x2585a1a4, 0x0f8f838c, 0x03030300, 0x3b4b7378,
+ 0x3b8bb3b8, 0x13031310, 0x12c2d2d0, 0x2ecee2ec,
+ 0x30407070, 0x0c8c808c, 0x3f0f333c, 0x2888a0a8,
+ 0x32023230, 0x1dcdd1dc, 0x36c6f2f4, 0x34447074,
+ 0x2ccce0ec, 0x15859194, 0x0b0b0308, 0x17475354,
+ 0x1c4c505c, 0x1b4b5358, 0x3d8db1bc, 0x01010100,
+ 0x24042024, 0x1c0c101c, 0x33437370, 0x18889098,
+ 0x10001010, 0x0cccc0cc, 0x32c2f2f0, 0x19c9d1d8,
+ 0x2c0c202c, 0x27c7e3e4, 0x32427270, 0x03838380,
+ 0x1b8b9398, 0x11c1d1d0, 0x06868284, 0x09c9c1c8,
+ 0x20406060, 0x10405050, 0x2383a3a0, 0x2bcbe3e8,
+ 0x0d0d010c, 0x3686b2b4, 0x1e8e929c, 0x0f4f434c,
+ 0x3787b3b4, 0x1a4a5258, 0x06c6c2c4, 0x38487078,
+ 0x2686a2a4, 0x12021210, 0x2f8fa3ac, 0x15c5d1d4,
+ 0x21416160, 0x03c3c3c0, 0x3484b0b4, 0x01414140,
+ 0x12425250, 0x3d4d717c, 0x0d8d818c, 0x08080008,
+ 0x1f0f131c, 0x19899198, 0x00000000, 0x19091118,
+ 0x04040004, 0x13435350, 0x37c7f3f4, 0x21c1e1e0,
+ 0x3dcdf1fc, 0x36467274, 0x2f0f232c, 0x27072324,
+ 0x3080b0b0, 0x0b8b8388, 0x0e0e020c, 0x2b8ba3a8,
+ 0x2282a2a0, 0x2e4e626c, 0x13839390, 0x0d4d414c,
+ 0x29496168, 0x3c4c707c, 0x09090108, 0x0a0a0208,
+ 0x3f8fb3bc, 0x2fcfe3ec, 0x33c3f3f0, 0x05c5c1c4,
+ 0x07878384, 0x14041014, 0x3ecef2fc, 0x24446064,
+ 0x1eced2dc, 0x2e0e222c, 0x0b4b4348, 0x1a0a1218,
+ 0x06060204, 0x21012120, 0x2b4b6368, 0x26466264,
+ 0x02020200, 0x35c5f1f4, 0x12829290, 0x0a8a8288,
+ 0x0c0c000c, 0x3383b3b0, 0x3e4e727c, 0x10c0d0d0,
+ 0x3a4a7278, 0x07474344, 0x16869294, 0x25c5e1e4,
+ 0x26062224, 0x00808080, 0x2d8da1ac, 0x1fcfd3dc,
+ 0x2181a1a0, 0x30003030, 0x37073334, 0x2e8ea2ac,
+ 0x36063234, 0x15051114, 0x22022220, 0x38083038,
+ 0x34c4f0f4, 0x2787a3a4, 0x05454144, 0x0c4c404c,
+ 0x01818180, 0x29c9e1e8, 0x04848084, 0x17879394,
+ 0x35053134, 0x0bcbc3c8, 0x0ecec2cc, 0x3c0c303c,
+ 0x31417170, 0x11011110, 0x07c7c3c4, 0x09898188,
+ 0x35457174, 0x3bcbf3f8, 0x1acad2d8, 0x38c8f0f8,
+ 0x14849094, 0x19495158, 0x02828280, 0x04c4c0c4,
+ 0x3fcff3fc, 0x09494148, 0x39093138, 0x27476364,
+ 0x00c0c0c0, 0x0fcfc3cc, 0x17c7d3d4, 0x3888b0b8,
+ 0x0f0f030c, 0x0e8e828c, 0x02424240, 0x23032320,
+ 0x11819190, 0x2c4c606c, 0x1bcbd3d8, 0x2484a0a4,
+ 0x34043034, 0x31c1f1f0, 0x08484048, 0x02c2c2c0,
+ 0x2f4f636c, 0x3d0d313c, 0x2d0d212c, 0x00404040,
+ 0x3e8eb2bc, 0x3e0e323c, 0x3c8cb0bc, 0x01c1c1c0,
+ 0x2a8aa2a8, 0x3a8ab2b8, 0x0e4e424c, 0x15455154,
+ 0x3b0b3338, 0x1cccd0dc, 0x28486068, 0x3f4f737c,
+ 0x1c8c909c, 0x18c8d0d8, 0x0a4a4248, 0x16465254,
+ 0x37477374, 0x2080a0a0, 0x2dcde1ec, 0x06464244,
+ 0x3585b1b4, 0x2b0b2328, 0x25456164, 0x3acaf2f8,
+ 0x23c3e3e0, 0x3989b1b8, 0x3181b1b0, 0x1f8f939c,
+ 0x1e4e525c, 0x39c9f1f8, 0x26c6e2e4, 0x3282b2b0,
+ 0x31013130, 0x2acae2e8, 0x2d4d616c, 0x1f4f535c,
+ 0x24c4e0e4, 0x30c0f0f0, 0x0dcdc1cc, 0x08888088,
+ 0x16061214, 0x3a0a3238, 0x18485058, 0x14c4d0d4,
+ 0x22426260, 0x29092128, 0x07070304, 0x33033330,
+ 0x28c8e0e8, 0x1b0b1318, 0x05050104, 0x39497178,
+ 0x10809090, 0x2a4a6268, 0x2a0a2228, 0x1a8a9298 },
{ 0x38380830, 0xe828c8e0, 0x2c2d0d21, 0xa42686a2,
- 0xcc0fcfc3, 0xdc1eced2, 0xb03383b3, 0xb83888b0,
- 0xac2f8fa3, 0x60204060, 0x54154551, 0xc407c7c3,
- 0x44044440, 0x6c2f4f63, 0x682b4b63, 0x581b4b53,
- 0xc003c3c3, 0x60224262, 0x30330333, 0xb43585b1,
- 0x28290921, 0xa02080a0, 0xe022c2e2, 0xa42787a3,
- 0xd013c3d3, 0x90118191, 0x10110111, 0x04060602,
- 0x1c1c0c10, 0xbc3c8cb0, 0x34360632, 0x480b4b43,
- 0xec2fcfe3, 0x88088880, 0x6c2c4c60, 0xa82888a0,
- 0x14170713, 0xc404c4c0, 0x14160612, 0xf434c4f0,
- 0xc002c2c2, 0x44054541, 0xe021c1e1, 0xd416c6d2,
- 0x3c3f0f33, 0x3c3d0d31, 0x8c0e8e82, 0x98188890,
- 0x28280820, 0x4c0e4e42, 0xf436c6f2, 0x3c3e0e32,
- 0xa42585a1, 0xf839c9f1, 0x0c0d0d01, 0xdc1fcfd3,
- 0xd818c8d0, 0x282b0b23, 0x64264662, 0x783a4a72,
- 0x24270723, 0x2c2f0f23, 0xf031c1f1, 0x70324272,
- 0x40024242, 0xd414c4d0, 0x40014141, 0xc000c0c0,
- 0x70334373, 0x64274763, 0xac2c8ca0, 0x880b8b83,
- 0xf437c7f3, 0xac2d8da1, 0x80008080, 0x1c1f0f13,
- 0xc80acac2, 0x2c2c0c20, 0xa82a8aa2, 0x34340430,
- 0xd012c2d2, 0x080b0b03, 0xec2ecee2, 0xe829c9e1,
- 0x5c1d4d51, 0x94148490, 0x18180810, 0xf838c8f0,
- 0x54174753, 0xac2e8ea2, 0x08080800, 0xc405c5c1,
- 0x10130313, 0xcc0dcdc1, 0x84068682, 0xb83989b1,
- 0xfc3fcff3, 0x7c3d4d71, 0xc001c1c1, 0x30310131,
- 0xf435c5f1, 0x880a8a82, 0x682a4a62, 0xb03181b1,
- 0xd011c1d1, 0x20200020, 0xd417c7d3, 0x00020202,
- 0x20220222, 0x04040400, 0x68284860, 0x70314171,
- 0x04070703, 0xd81bcbd3, 0x9c1d8d91, 0x98198991,
- 0x60214161, 0xbc3e8eb2, 0xe426c6e2, 0x58194951,
- 0xdc1dcdd1, 0x50114151, 0x90108090, 0xdc1cccd0,
- 0x981a8a92, 0xa02383a3, 0xa82b8ba3, 0xd010c0d0,
- 0x80018181, 0x0c0f0f03, 0x44074743, 0x181a0a12,
- 0xe023c3e3, 0xec2ccce0, 0x8c0d8d81, 0xbc3f8fb3,
- 0x94168692, 0x783b4b73, 0x5c1c4c50, 0xa02282a2,
- 0xa02181a1, 0x60234363, 0x20230323, 0x4c0d4d41,
- 0xc808c8c0, 0x9c1e8e92, 0x9c1c8c90, 0x383a0a32,
- 0x0c0c0c00, 0x2c2e0e22, 0xb83a8ab2, 0x6c2e4e62,
- 0x9c1f8f93, 0x581a4a52, 0xf032c2f2, 0x90128292,
- 0xf033c3f3, 0x48094941, 0x78384870, 0xcc0cccc0,
- 0x14150511, 0xf83bcbf3, 0x70304070, 0x74354571,
- 0x7c3f4f73, 0x34350531, 0x10100010, 0x00030303,
- 0x64244460, 0x6c2d4d61, 0xc406c6c2, 0x74344470,
- 0xd415c5d1, 0xb43484b0, 0xe82acae2, 0x08090901,
- 0x74364672, 0x18190911, 0xfc3ecef2, 0x40004040,
- 0x10120212, 0xe020c0e0, 0xbc3d8db1, 0x04050501,
- 0xf83acaf2, 0x00010101, 0xf030c0f0, 0x282a0a22,
- 0x5c1e4e52, 0xa82989a1, 0x54164652, 0x40034343,
- 0x84058581, 0x14140410, 0x88098981, 0x981b8b93,
- 0xb03080b0, 0xe425c5e1, 0x48084840, 0x78394971,
- 0x94178793, 0xfc3cccf0, 0x1c1e0e12, 0x80028282,
- 0x20210121, 0x8c0c8c80, 0x181b0b13, 0x5c1f4f53,
- 0x74374773, 0x54144450, 0xb03282b2, 0x1c1d0d11,
- 0x24250521, 0x4c0f4f43, 0x00000000, 0x44064642,
- 0xec2dcde1, 0x58184850, 0x50124252, 0xe82bcbe3,
- 0x7c3e4e72, 0xd81acad2, 0xc809c9c1, 0xfc3dcdf1,
- 0x30300030, 0x94158591, 0x64254561, 0x3c3c0c30,
- 0xb43686b2, 0xe424c4e0, 0xb83b8bb3, 0x7c3c4c70,
- 0x0c0e0e02, 0x50104050, 0x38390931, 0x24260622,
- 0x30320232, 0x84048480, 0x68294961, 0x90138393,
- 0x34370733, 0xe427c7e3, 0x24240420, 0xa42484a0,
- 0xc80bcbc3, 0x50134353, 0x080a0a02, 0x84078783,
- 0xd819c9d1, 0x4c0c4c40, 0x80038383, 0x8c0f8f83,
- 0xcc0ecec2, 0x383b0b33, 0x480a4a42, 0xb43787b3
- },
+ 0xcc0fcfc3, 0xdc1eced2, 0xb03383b3, 0xb83888b0,
+ 0xac2f8fa3, 0x60204060, 0x54154551, 0xc407c7c3,
+ 0x44044440, 0x6c2f4f63, 0x682b4b63, 0x581b4b53,
+ 0xc003c3c3, 0x60224262, 0x30330333, 0xb43585b1,
+ 0x28290921, 0xa02080a0, 0xe022c2e2, 0xa42787a3,
+ 0xd013c3d3, 0x90118191, 0x10110111, 0x04060602,
+ 0x1c1c0c10, 0xbc3c8cb0, 0x34360632, 0x480b4b43,
+ 0xec2fcfe3, 0x88088880, 0x6c2c4c60, 0xa82888a0,
+ 0x14170713, 0xc404c4c0, 0x14160612, 0xf434c4f0,
+ 0xc002c2c2, 0x44054541, 0xe021c1e1, 0xd416c6d2,
+ 0x3c3f0f33, 0x3c3d0d31, 0x8c0e8e82, 0x98188890,
+ 0x28280820, 0x4c0e4e42, 0xf436c6f2, 0x3c3e0e32,
+ 0xa42585a1, 0xf839c9f1, 0x0c0d0d01, 0xdc1fcfd3,
+ 0xd818c8d0, 0x282b0b23, 0x64264662, 0x783a4a72,
+ 0x24270723, 0x2c2f0f23, 0xf031c1f1, 0x70324272,
+ 0x40024242, 0xd414c4d0, 0x40014141, 0xc000c0c0,
+ 0x70334373, 0x64274763, 0xac2c8ca0, 0x880b8b83,
+ 0xf437c7f3, 0xac2d8da1, 0x80008080, 0x1c1f0f13,
+ 0xc80acac2, 0x2c2c0c20, 0xa82a8aa2, 0x34340430,
+ 0xd012c2d2, 0x080b0b03, 0xec2ecee2, 0xe829c9e1,
+ 0x5c1d4d51, 0x94148490, 0x18180810, 0xf838c8f0,
+ 0x54174753, 0xac2e8ea2, 0x08080800, 0xc405c5c1,
+ 0x10130313, 0xcc0dcdc1, 0x84068682, 0xb83989b1,
+ 0xfc3fcff3, 0x7c3d4d71, 0xc001c1c1, 0x30310131,
+ 0xf435c5f1, 0x880a8a82, 0x682a4a62, 0xb03181b1,
+ 0xd011c1d1, 0x20200020, 0xd417c7d3, 0x00020202,
+ 0x20220222, 0x04040400, 0x68284860, 0x70314171,
+ 0x04070703, 0xd81bcbd3, 0x9c1d8d91, 0x98198991,
+ 0x60214161, 0xbc3e8eb2, 0xe426c6e2, 0x58194951,
+ 0xdc1dcdd1, 0x50114151, 0x90108090, 0xdc1cccd0,
+ 0x981a8a92, 0xa02383a3, 0xa82b8ba3, 0xd010c0d0,
+ 0x80018181, 0x0c0f0f03, 0x44074743, 0x181a0a12,
+ 0xe023c3e3, 0xec2ccce0, 0x8c0d8d81, 0xbc3f8fb3,
+ 0x94168692, 0x783b4b73, 0x5c1c4c50, 0xa02282a2,
+ 0xa02181a1, 0x60234363, 0x20230323, 0x4c0d4d41,
+ 0xc808c8c0, 0x9c1e8e92, 0x9c1c8c90, 0x383a0a32,
+ 0x0c0c0c00, 0x2c2e0e22, 0xb83a8ab2, 0x6c2e4e62,
+ 0x9c1f8f93, 0x581a4a52, 0xf032c2f2, 0x90128292,
+ 0xf033c3f3, 0x48094941, 0x78384870, 0xcc0cccc0,
+ 0x14150511, 0xf83bcbf3, 0x70304070, 0x74354571,
+ 0x7c3f4f73, 0x34350531, 0x10100010, 0x00030303,
+ 0x64244460, 0x6c2d4d61, 0xc406c6c2, 0x74344470,
+ 0xd415c5d1, 0xb43484b0, 0xe82acae2, 0x08090901,
+ 0x74364672, 0x18190911, 0xfc3ecef2, 0x40004040,
+ 0x10120212, 0xe020c0e0, 0xbc3d8db1, 0x04050501,
+ 0xf83acaf2, 0x00010101, 0xf030c0f0, 0x282a0a22,
+ 0x5c1e4e52, 0xa82989a1, 0x54164652, 0x40034343,
+ 0x84058581, 0x14140410, 0x88098981, 0x981b8b93,
+ 0xb03080b0, 0xe425c5e1, 0x48084840, 0x78394971,
+ 0x94178793, 0xfc3cccf0, 0x1c1e0e12, 0x80028282,
+ 0x20210121, 0x8c0c8c80, 0x181b0b13, 0x5c1f4f53,
+ 0x74374773, 0x54144450, 0xb03282b2, 0x1c1d0d11,
+ 0x24250521, 0x4c0f4f43, 0x00000000, 0x44064642,
+ 0xec2dcde1, 0x58184850, 0x50124252, 0xe82bcbe3,
+ 0x7c3e4e72, 0xd81acad2, 0xc809c9c1, 0xfc3dcdf1,
+ 0x30300030, 0x94158591, 0x64254561, 0x3c3c0c30,
+ 0xb43686b2, 0xe424c4e0, 0xb83b8bb3, 0x7c3c4c70,
+ 0x0c0e0e02, 0x50104050, 0x38390931, 0x24260622,
+ 0x30320232, 0x84048480, 0x68294961, 0x90138393,
+ 0x34370733, 0xe427c7e3, 0x24240420, 0xa42484a0,
+ 0xc80bcbc3, 0x50134353, 0x080a0a02, 0x84078783,
+ 0xd819c9d1, 0x4c0c4c40, 0x80038383, 0x8c0f8f83,
+ 0xcc0ecec2, 0x383b0b33, 0x480a4a42, 0xb43787b3 },
{ 0xa1a82989, 0x81840585, 0xd2d416c6, 0xd3d013c3,
- 0x50541444, 0x111c1d0d, 0xa0ac2c8c, 0x21242505,
- 0x515c1d4d, 0x43400343, 0x10181808, 0x121c1e0e,
- 0x51501141, 0xf0fc3ccc, 0xc2c80aca, 0x63602343,
- 0x20282808, 0x40440444, 0x20202000, 0x919c1d8d,
- 0xe0e020c0, 0xe2e022c2, 0xc0c808c8, 0x13141707,
- 0xa1a42585, 0x838c0f8f, 0x03000303, 0x73783b4b,
- 0xb3b83b8b, 0x13101303, 0xd2d012c2, 0xe2ec2ece,
- 0x70703040, 0x808c0c8c, 0x333c3f0f, 0xa0a82888,
- 0x32303202, 0xd1dc1dcd, 0xf2f436c6, 0x70743444,
- 0xe0ec2ccc, 0x91941585, 0x03080b0b, 0x53541747,
- 0x505c1c4c, 0x53581b4b, 0xb1bc3d8d, 0x01000101,
- 0x20242404, 0x101c1c0c, 0x73703343, 0x90981888,
- 0x10101000, 0xc0cc0ccc, 0xf2f032c2, 0xd1d819c9,
- 0x202c2c0c, 0xe3e427c7, 0x72703242, 0x83800383,
- 0x93981b8b, 0xd1d011c1, 0x82840686, 0xc1c809c9,
- 0x60602040, 0x50501040, 0xa3a02383, 0xe3e82bcb,
- 0x010c0d0d, 0xb2b43686, 0x929c1e8e, 0x434c0f4f,
- 0xb3b43787, 0x52581a4a, 0xc2c406c6, 0x70783848,
- 0xa2a42686, 0x12101202, 0xa3ac2f8f, 0xd1d415c5,
- 0x61602141, 0xc3c003c3, 0xb0b43484, 0x41400141,
- 0x52501242, 0x717c3d4d, 0x818c0d8d, 0x00080808,
- 0x131c1f0f, 0x91981989, 0x00000000, 0x11181909,
- 0x00040404, 0x53501343, 0xf3f437c7, 0xe1e021c1,
- 0xf1fc3dcd, 0x72743646, 0x232c2f0f, 0x23242707,
- 0xb0b03080, 0x83880b8b, 0x020c0e0e, 0xa3a82b8b,
- 0xa2a02282, 0x626c2e4e, 0x93901383, 0x414c0d4d,
- 0x61682949, 0x707c3c4c, 0x01080909, 0x02080a0a,
- 0xb3bc3f8f, 0xe3ec2fcf, 0xf3f033c3, 0xc1c405c5,
- 0x83840787, 0x10141404, 0xf2fc3ece, 0x60642444,
- 0xd2dc1ece, 0x222c2e0e, 0x43480b4b, 0x12181a0a,
- 0x02040606, 0x21202101, 0x63682b4b, 0x62642646,
- 0x02000202, 0xf1f435c5, 0x92901282, 0x82880a8a,
- 0x000c0c0c, 0xb3b03383, 0x727c3e4e, 0xd0d010c0,
- 0x72783a4a, 0x43440747, 0x92941686, 0xe1e425c5,
- 0x22242606, 0x80800080, 0xa1ac2d8d, 0xd3dc1fcf,
- 0xa1a02181, 0x30303000, 0x33343707, 0xa2ac2e8e,
- 0x32343606, 0x11141505, 0x22202202, 0x30383808,
- 0xf0f434c4, 0xa3a42787, 0x41440545, 0x404c0c4c,
- 0x81800181, 0xe1e829c9, 0x80840484, 0x93941787,
- 0x31343505, 0xc3c80bcb, 0xc2cc0ece, 0x303c3c0c,
- 0x71703141, 0x11101101, 0xc3c407c7, 0x81880989,
- 0x71743545, 0xf3f83bcb, 0xd2d81aca, 0xf0f838c8,
- 0x90941484, 0x51581949, 0x82800282, 0xc0c404c4,
- 0xf3fc3fcf, 0x41480949, 0x31383909, 0x63642747,
- 0xc0c000c0, 0xc3cc0fcf, 0xd3d417c7, 0xb0b83888,
- 0x030c0f0f, 0x828c0e8e, 0x42400242, 0x23202303,
- 0x91901181, 0x606c2c4c, 0xd3d81bcb, 0xa0a42484,
- 0x30343404, 0xf1f031c1, 0x40480848, 0xc2c002c2,
- 0x636c2f4f, 0x313c3d0d, 0x212c2d0d, 0x40400040,
- 0xb2bc3e8e, 0x323c3e0e, 0xb0bc3c8c, 0xc1c001c1,
- 0xa2a82a8a, 0xb2b83a8a, 0x424c0e4e, 0x51541545,
- 0x33383b0b, 0xd0dc1ccc, 0x60682848, 0x737c3f4f,
- 0x909c1c8c, 0xd0d818c8, 0x42480a4a, 0x52541646,
- 0x73743747, 0xa0a02080, 0xe1ec2dcd, 0x42440646,
- 0xb1b43585, 0x23282b0b, 0x61642545, 0xf2f83aca,
- 0xe3e023c3, 0xb1b83989, 0xb1b03181, 0x939c1f8f,
- 0x525c1e4e, 0xf1f839c9, 0xe2e426c6, 0xb2b03282,
- 0x31303101, 0xe2e82aca, 0x616c2d4d, 0x535c1f4f,
- 0xe0e424c4, 0xf0f030c0, 0xc1cc0dcd, 0x80880888,
- 0x12141606, 0x32383a0a, 0x50581848, 0xd0d414c4,
- 0x62602242, 0x21282909, 0x03040707, 0x33303303,
- 0xe0e828c8, 0x13181b0b, 0x01040505, 0x71783949,
- 0x90901080, 0x62682a4a, 0x22282a0a, 0x92981a8a
- },
+ 0x50541444, 0x111c1d0d, 0xa0ac2c8c, 0x21242505,
+ 0x515c1d4d, 0x43400343, 0x10181808, 0x121c1e0e,
+ 0x51501141, 0xf0fc3ccc, 0xc2c80aca, 0x63602343,
+ 0x20282808, 0x40440444, 0x20202000, 0x919c1d8d,
+ 0xe0e020c0, 0xe2e022c2, 0xc0c808c8, 0x13141707,
+ 0xa1a42585, 0x838c0f8f, 0x03000303, 0x73783b4b,
+ 0xb3b83b8b, 0x13101303, 0xd2d012c2, 0xe2ec2ece,
+ 0x70703040, 0x808c0c8c, 0x333c3f0f, 0xa0a82888,
+ 0x32303202, 0xd1dc1dcd, 0xf2f436c6, 0x70743444,
+ 0xe0ec2ccc, 0x91941585, 0x03080b0b, 0x53541747,
+ 0x505c1c4c, 0x53581b4b, 0xb1bc3d8d, 0x01000101,
+ 0x20242404, 0x101c1c0c, 0x73703343, 0x90981888,
+ 0x10101000, 0xc0cc0ccc, 0xf2f032c2, 0xd1d819c9,
+ 0x202c2c0c, 0xe3e427c7, 0x72703242, 0x83800383,
+ 0x93981b8b, 0xd1d011c1, 0x82840686, 0xc1c809c9,
+ 0x60602040, 0x50501040, 0xa3a02383, 0xe3e82bcb,
+ 0x010c0d0d, 0xb2b43686, 0x929c1e8e, 0x434c0f4f,
+ 0xb3b43787, 0x52581a4a, 0xc2c406c6, 0x70783848,
+ 0xa2a42686, 0x12101202, 0xa3ac2f8f, 0xd1d415c5,
+ 0x61602141, 0xc3c003c3, 0xb0b43484, 0x41400141,
+ 0x52501242, 0x717c3d4d, 0x818c0d8d, 0x00080808,
+ 0x131c1f0f, 0x91981989, 0x00000000, 0x11181909,
+ 0x00040404, 0x53501343, 0xf3f437c7, 0xe1e021c1,
+ 0xf1fc3dcd, 0x72743646, 0x232c2f0f, 0x23242707,
+ 0xb0b03080, 0x83880b8b, 0x020c0e0e, 0xa3a82b8b,
+ 0xa2a02282, 0x626c2e4e, 0x93901383, 0x414c0d4d,
+ 0x61682949, 0x707c3c4c, 0x01080909, 0x02080a0a,
+ 0xb3bc3f8f, 0xe3ec2fcf, 0xf3f033c3, 0xc1c405c5,
+ 0x83840787, 0x10141404, 0xf2fc3ece, 0x60642444,
+ 0xd2dc1ece, 0x222c2e0e, 0x43480b4b, 0x12181a0a,
+ 0x02040606, 0x21202101, 0x63682b4b, 0x62642646,
+ 0x02000202, 0xf1f435c5, 0x92901282, 0x82880a8a,
+ 0x000c0c0c, 0xb3b03383, 0x727c3e4e, 0xd0d010c0,
+ 0x72783a4a, 0x43440747, 0x92941686, 0xe1e425c5,
+ 0x22242606, 0x80800080, 0xa1ac2d8d, 0xd3dc1fcf,
+ 0xa1a02181, 0x30303000, 0x33343707, 0xa2ac2e8e,
+ 0x32343606, 0x11141505, 0x22202202, 0x30383808,
+ 0xf0f434c4, 0xa3a42787, 0x41440545, 0x404c0c4c,
+ 0x81800181, 0xe1e829c9, 0x80840484, 0x93941787,
+ 0x31343505, 0xc3c80bcb, 0xc2cc0ece, 0x303c3c0c,
+ 0x71703141, 0x11101101, 0xc3c407c7, 0x81880989,
+ 0x71743545, 0xf3f83bcb, 0xd2d81aca, 0xf0f838c8,
+ 0x90941484, 0x51581949, 0x82800282, 0xc0c404c4,
+ 0xf3fc3fcf, 0x41480949, 0x31383909, 0x63642747,
+ 0xc0c000c0, 0xc3cc0fcf, 0xd3d417c7, 0xb0b83888,
+ 0x030c0f0f, 0x828c0e8e, 0x42400242, 0x23202303,
+ 0x91901181, 0x606c2c4c, 0xd3d81bcb, 0xa0a42484,
+ 0x30343404, 0xf1f031c1, 0x40480848, 0xc2c002c2,
+ 0x636c2f4f, 0x313c3d0d, 0x212c2d0d, 0x40400040,
+ 0xb2bc3e8e, 0x323c3e0e, 0xb0bc3c8c, 0xc1c001c1,
+ 0xa2a82a8a, 0xb2b83a8a, 0x424c0e4e, 0x51541545,
+ 0x33383b0b, 0xd0dc1ccc, 0x60682848, 0x737c3f4f,
+ 0x909c1c8c, 0xd0d818c8, 0x42480a4a, 0x52541646,
+ 0x73743747, 0xa0a02080, 0xe1ec2dcd, 0x42440646,
+ 0xb1b43585, 0x23282b0b, 0x61642545, 0xf2f83aca,
+ 0xe3e023c3, 0xb1b83989, 0xb1b03181, 0x939c1f8f,
+ 0x525c1e4e, 0xf1f839c9, 0xe2e426c6, 0xb2b03282,
+ 0x31303101, 0xe2e82aca, 0x616c2d4d, 0x535c1f4f,
+ 0xe0e424c4, 0xf0f030c0, 0xc1cc0dcd, 0x80880888,
+ 0x12141606, 0x32383a0a, 0x50581848, 0xd0d414c4,
+ 0x62602242, 0x21282909, 0x03040707, 0x33303303,
+ 0xe0e828c8, 0x13181b0b, 0x01040505, 0x71783949,
+ 0x90901080, 0x62682a4a, 0x22282a0a, 0x92981a8a },
{ 0x08303838, 0xc8e0e828, 0x0d212c2d, 0x86a2a426,
- 0xcfc3cc0f, 0xced2dc1e, 0x83b3b033, 0x88b0b838,
- 0x8fa3ac2f, 0x40606020, 0x45515415, 0xc7c3c407,
- 0x44404404, 0x4f636c2f, 0x4b63682b, 0x4b53581b,
- 0xc3c3c003, 0x42626022, 0x03333033, 0x85b1b435,
- 0x09212829, 0x80a0a020, 0xc2e2e022, 0x87a3a427,
- 0xc3d3d013, 0x81919011, 0x01111011, 0x06020406,
- 0x0c101c1c, 0x8cb0bc3c, 0x06323436, 0x4b43480b,
- 0xcfe3ec2f, 0x88808808, 0x4c606c2c, 0x88a0a828,
- 0x07131417, 0xc4c0c404, 0x06121416, 0xc4f0f434,
- 0xc2c2c002, 0x45414405, 0xc1e1e021, 0xc6d2d416,
- 0x0f333c3f, 0x0d313c3d, 0x8e828c0e, 0x88909818,
- 0x08202828, 0x4e424c0e, 0xc6f2f436, 0x0e323c3e,
- 0x85a1a425, 0xc9f1f839, 0x0d010c0d, 0xcfd3dc1f,
- 0xc8d0d818, 0x0b23282b, 0x46626426, 0x4a72783a,
- 0x07232427, 0x0f232c2f, 0xc1f1f031, 0x42727032,
- 0x42424002, 0xc4d0d414, 0x41414001, 0xc0c0c000,
- 0x43737033, 0x47636427, 0x8ca0ac2c, 0x8b83880b,
- 0xc7f3f437, 0x8da1ac2d, 0x80808000, 0x0f131c1f,
- 0xcac2c80a, 0x0c202c2c, 0x8aa2a82a, 0x04303434,
- 0xc2d2d012, 0x0b03080b, 0xcee2ec2e, 0xc9e1e829,
- 0x4d515c1d, 0x84909414, 0x08101818, 0xc8f0f838,
- 0x47535417, 0x8ea2ac2e, 0x08000808, 0xc5c1c405,
- 0x03131013, 0xcdc1cc0d, 0x86828406, 0x89b1b839,
- 0xcff3fc3f, 0x4d717c3d, 0xc1c1c001, 0x01313031,
- 0xc5f1f435, 0x8a82880a, 0x4a62682a, 0x81b1b031,
- 0xc1d1d011, 0x00202020, 0xc7d3d417, 0x02020002,
- 0x02222022, 0x04000404, 0x48606828, 0x41717031,
- 0x07030407, 0xcbd3d81b, 0x8d919c1d, 0x89919819,
- 0x41616021, 0x8eb2bc3e, 0xc6e2e426, 0x49515819,
- 0xcdd1dc1d, 0x41515011, 0x80909010, 0xccd0dc1c,
- 0x8a92981a, 0x83a3a023, 0x8ba3a82b, 0xc0d0d010,
- 0x81818001, 0x0f030c0f, 0x47434407, 0x0a12181a,
- 0xc3e3e023, 0xcce0ec2c, 0x8d818c0d, 0x8fb3bc3f,
- 0x86929416, 0x4b73783b, 0x4c505c1c, 0x82a2a022,
- 0x81a1a021, 0x43636023, 0x03232023, 0x4d414c0d,
- 0xc8c0c808, 0x8e929c1e, 0x8c909c1c, 0x0a32383a,
- 0x0c000c0c, 0x0e222c2e, 0x8ab2b83a, 0x4e626c2e,
- 0x8f939c1f, 0x4a52581a, 0xc2f2f032, 0x82929012,
- 0xc3f3f033, 0x49414809, 0x48707838, 0xccc0cc0c,
- 0x05111415, 0xcbf3f83b, 0x40707030, 0x45717435,
- 0x4f737c3f, 0x05313435, 0x00101010, 0x03030003,
- 0x44606424, 0x4d616c2d, 0xc6c2c406, 0x44707434,
- 0xc5d1d415, 0x84b0b434, 0xcae2e82a, 0x09010809,
- 0x46727436, 0x09111819, 0xcef2fc3e, 0x40404000,
- 0x02121012, 0xc0e0e020, 0x8db1bc3d, 0x05010405,
- 0xcaf2f83a, 0x01010001, 0xc0f0f030, 0x0a22282a,
- 0x4e525c1e, 0x89a1a829, 0x46525416, 0x43434003,
- 0x85818405, 0x04101414, 0x89818809, 0x8b93981b,
- 0x80b0b030, 0xc5e1e425, 0x48404808, 0x49717839,
- 0x87939417, 0xccf0fc3c, 0x0e121c1e, 0x82828002,
- 0x01212021, 0x8c808c0c, 0x0b13181b, 0x4f535c1f,
- 0x47737437, 0x44505414, 0x82b2b032, 0x0d111c1d,
- 0x05212425, 0x4f434c0f, 0x00000000, 0x46424406,
- 0xcde1ec2d, 0x48505818, 0x42525012, 0xcbe3e82b,
- 0x4e727c3e, 0xcad2d81a, 0xc9c1c809, 0xcdf1fc3d,
- 0x00303030, 0x85919415, 0x45616425, 0x0c303c3c,
- 0x86b2b436, 0xc4e0e424, 0x8bb3b83b, 0x4c707c3c,
- 0x0e020c0e, 0x40505010, 0x09313839, 0x06222426,
- 0x02323032, 0x84808404, 0x49616829, 0x83939013,
- 0x07333437, 0xc7e3e427, 0x04202424, 0x84a0a424,
- 0xcbc3c80b, 0x43535013, 0x0a02080a, 0x87838407,
- 0xc9d1d819, 0x4c404c0c, 0x83838003, 0x8f838c0f,
- 0xcec2cc0e, 0x0b33383b, 0x4a42480a, 0x87b3b437
- }
+ 0xcfc3cc0f, 0xced2dc1e, 0x83b3b033, 0x88b0b838,
+ 0x8fa3ac2f, 0x40606020, 0x45515415, 0xc7c3c407,
+ 0x44404404, 0x4f636c2f, 0x4b63682b, 0x4b53581b,
+ 0xc3c3c003, 0x42626022, 0x03333033, 0x85b1b435,
+ 0x09212829, 0x80a0a020, 0xc2e2e022, 0x87a3a427,
+ 0xc3d3d013, 0x81919011, 0x01111011, 0x06020406,
+ 0x0c101c1c, 0x8cb0bc3c, 0x06323436, 0x4b43480b,
+ 0xcfe3ec2f, 0x88808808, 0x4c606c2c, 0x88a0a828,
+ 0x07131417, 0xc4c0c404, 0x06121416, 0xc4f0f434,
+ 0xc2c2c002, 0x45414405, 0xc1e1e021, 0xc6d2d416,
+ 0x0f333c3f, 0x0d313c3d, 0x8e828c0e, 0x88909818,
+ 0x08202828, 0x4e424c0e, 0xc6f2f436, 0x0e323c3e,
+ 0x85a1a425, 0xc9f1f839, 0x0d010c0d, 0xcfd3dc1f,
+ 0xc8d0d818, 0x0b23282b, 0x46626426, 0x4a72783a,
+ 0x07232427, 0x0f232c2f, 0xc1f1f031, 0x42727032,
+ 0x42424002, 0xc4d0d414, 0x41414001, 0xc0c0c000,
+ 0x43737033, 0x47636427, 0x8ca0ac2c, 0x8b83880b,
+ 0xc7f3f437, 0x8da1ac2d, 0x80808000, 0x0f131c1f,
+ 0xcac2c80a, 0x0c202c2c, 0x8aa2a82a, 0x04303434,
+ 0xc2d2d012, 0x0b03080b, 0xcee2ec2e, 0xc9e1e829,
+ 0x4d515c1d, 0x84909414, 0x08101818, 0xc8f0f838,
+ 0x47535417, 0x8ea2ac2e, 0x08000808, 0xc5c1c405,
+ 0x03131013, 0xcdc1cc0d, 0x86828406, 0x89b1b839,
+ 0xcff3fc3f, 0x4d717c3d, 0xc1c1c001, 0x01313031,
+ 0xc5f1f435, 0x8a82880a, 0x4a62682a, 0x81b1b031,
+ 0xc1d1d011, 0x00202020, 0xc7d3d417, 0x02020002,
+ 0x02222022, 0x04000404, 0x48606828, 0x41717031,
+ 0x07030407, 0xcbd3d81b, 0x8d919c1d, 0x89919819,
+ 0x41616021, 0x8eb2bc3e, 0xc6e2e426, 0x49515819,
+ 0xcdd1dc1d, 0x41515011, 0x80909010, 0xccd0dc1c,
+ 0x8a92981a, 0x83a3a023, 0x8ba3a82b, 0xc0d0d010,
+ 0x81818001, 0x0f030c0f, 0x47434407, 0x0a12181a,
+ 0xc3e3e023, 0xcce0ec2c, 0x8d818c0d, 0x8fb3bc3f,
+ 0x86929416, 0x4b73783b, 0x4c505c1c, 0x82a2a022,
+ 0x81a1a021, 0x43636023, 0x03232023, 0x4d414c0d,
+ 0xc8c0c808, 0x8e929c1e, 0x8c909c1c, 0x0a32383a,
+ 0x0c000c0c, 0x0e222c2e, 0x8ab2b83a, 0x4e626c2e,
+ 0x8f939c1f, 0x4a52581a, 0xc2f2f032, 0x82929012,
+ 0xc3f3f033, 0x49414809, 0x48707838, 0xccc0cc0c,
+ 0x05111415, 0xcbf3f83b, 0x40707030, 0x45717435,
+ 0x4f737c3f, 0x05313435, 0x00101010, 0x03030003,
+ 0x44606424, 0x4d616c2d, 0xc6c2c406, 0x44707434,
+ 0xc5d1d415, 0x84b0b434, 0xcae2e82a, 0x09010809,
+ 0x46727436, 0x09111819, 0xcef2fc3e, 0x40404000,
+ 0x02121012, 0xc0e0e020, 0x8db1bc3d, 0x05010405,
+ 0xcaf2f83a, 0x01010001, 0xc0f0f030, 0x0a22282a,
+ 0x4e525c1e, 0x89a1a829, 0x46525416, 0x43434003,
+ 0x85818405, 0x04101414, 0x89818809, 0x8b93981b,
+ 0x80b0b030, 0xc5e1e425, 0x48404808, 0x49717839,
+ 0x87939417, 0xccf0fc3c, 0x0e121c1e, 0x82828002,
+ 0x01212021, 0x8c808c0c, 0x0b13181b, 0x4f535c1f,
+ 0x47737437, 0x44505414, 0x82b2b032, 0x0d111c1d,
+ 0x05212425, 0x4f434c0f, 0x00000000, 0x46424406,
+ 0xcde1ec2d, 0x48505818, 0x42525012, 0xcbe3e82b,
+ 0x4e727c3e, 0xcad2d81a, 0xc9c1c809, 0xcdf1fc3d,
+ 0x00303030, 0x85919415, 0x45616425, 0x0c303c3c,
+ 0x86b2b436, 0xc4e0e424, 0x8bb3b83b, 0x4c707c3c,
+ 0x0e020c0e, 0x40505010, 0x09313839, 0x06222426,
+ 0x02323032, 0x84808404, 0x49616829, 0x83939013,
+ 0x07333437, 0xc7e3e427, 0x04202424, 0x84a0a424,
+ 0xcbc3c80b, 0x43535013, 0x0a02080a, 0x87838407,
+ 0xc9d1d819, 0x4c404c0c, 0x83838003, 0x8f838c0f,
+ 0xcec2cc0e, 0x0b33383b, 0x4a42480a, 0x87b3b437 }
};
#else
/* on x86_64 >5x size reduction at 40% performance penalty */
static const unsigned char SEED_Sbox[2][256] = {
-{
- 0xA9, 0x85, 0xD6, 0xD3, 0x54, 0x1D, 0xAC, 0x25,
- 0x5D, 0x43, 0x18, 0x1E, 0x51, 0xFC, 0xCA, 0x63,
- 0x28, 0x44, 0x20, 0x9D, 0xE0, 0xE2, 0xC8, 0x17,
- 0xA5, 0x8F, 0x03, 0x7B, 0xBB, 0x13, 0xD2, 0xEE,
- 0x70, 0x8C, 0x3F, 0xA8, 0x32, 0xDD, 0xF6, 0x74,
- 0xEC, 0x95, 0x0B, 0x57, 0x5C, 0x5B, 0xBD, 0x01,
- 0x24, 0x1C, 0x73, 0x98, 0x10, 0xCC, 0xF2, 0xD9,
- 0x2C, 0xE7, 0x72, 0x83, 0x9B, 0xD1, 0x86, 0xC9,
- 0x60, 0x50, 0xA3, 0xEB, 0x0D, 0xB6, 0x9E, 0x4F,
- 0xB7, 0x5A, 0xC6, 0x78, 0xA6, 0x12, 0xAF, 0xD5,
- 0x61, 0xC3, 0xB4, 0x41, 0x52, 0x7D, 0x8D, 0x08,
- 0x1F, 0x99, 0x00, 0x19, 0x04, 0x53, 0xF7, 0xE1,
- 0xFD, 0x76, 0x2F, 0x27, 0xB0, 0x8B, 0x0E, 0xAB,
- 0xA2, 0x6E, 0x93, 0x4D, 0x69, 0x7C, 0x09, 0x0A,
- 0xBF, 0xEF, 0xF3, 0xC5, 0x87, 0x14, 0xFE, 0x64,
- 0xDE, 0x2E, 0x4B, 0x1A, 0x06, 0x21, 0x6B, 0x66,
- 0x02, 0xF5, 0x92, 0x8A, 0x0C, 0xB3, 0x7E, 0xD0,
- 0x7A, 0x47, 0x96, 0xE5, 0x26, 0x80, 0xAD, 0xDF,
- 0xA1, 0x30, 0x37, 0xAE, 0x36, 0x15, 0x22, 0x38,
- 0xF4, 0xA7, 0x45, 0x4C, 0x81, 0xE9, 0x84, 0x97,
- 0x35, 0xCB, 0xCE, 0x3C, 0x71, 0x11, 0xC7, 0x89,
- 0x75, 0xFB, 0xDA, 0xF8, 0x94, 0x59, 0x82, 0xC4,
- 0xFF, 0x49, 0x39, 0x67, 0xC0, 0xCF, 0xD7, 0xB8,
- 0x0F, 0x8E, 0x42, 0x23, 0x91, 0x6C, 0xDB, 0xA4,
- 0x34, 0xF1, 0x48, 0xC2, 0x6F, 0x3D, 0x2D, 0x40,
- 0xBE, 0x3E, 0xBC, 0xC1, 0xAA, 0xBA, 0x4E, 0x55,
- 0x3B, 0xDC, 0x68, 0x7F, 0x9C, 0xD8, 0x4A, 0x56,
- 0x77, 0xA0, 0xED, 0x46, 0xB5, 0x2B, 0x65, 0xFA,
- 0xE3, 0xB9, 0xB1, 0x9F, 0x5E, 0xF9, 0xE6, 0xB2,
- 0x31, 0xEA, 0x6D, 0x5F, 0xE4, 0xF0, 0xCD, 0x88,
- 0x16, 0x3A, 0x58, 0xD4, 0x62, 0x29, 0x07, 0x33,
- 0xE8, 0x1B, 0x05, 0x79, 0x90, 0x6A, 0x2A, 0x9A
- },
- {
- 0x38, 0xE8, 0x2D, 0xA6, 0xCF, 0xDE, 0xB3, 0xB8,
- 0xAF, 0x60, 0x55, 0xC7, 0x44, 0x6F, 0x6B, 0x5B,
- 0xC3, 0x62, 0x33, 0xB5, 0x29, 0xA0, 0xE2, 0xA7,
- 0xD3, 0x91, 0x11, 0x06, 0x1C, 0xBC, 0x36, 0x4B,
- 0xEF, 0x88, 0x6C, 0xA8, 0x17, 0xC4, 0x16, 0xF4,
- 0xC2, 0x45, 0xE1, 0xD6, 0x3F, 0x3D, 0x8E, 0x98,
- 0x28, 0x4E, 0xF6, 0x3E, 0xA5, 0xF9, 0x0D, 0xDF,
- 0xD8, 0x2B, 0x66, 0x7A, 0x27, 0x2F, 0xF1, 0x72,
- 0x42, 0xD4, 0x41, 0xC0, 0x73, 0x67, 0xAC, 0x8B,
- 0xF7, 0xAD, 0x80, 0x1F, 0xCA, 0x2C, 0xAA, 0x34,
- 0xD2, 0x0B, 0xEE, 0xE9, 0x5D, 0x94, 0x18, 0xF8,
- 0x57, 0xAE, 0x08, 0xC5, 0x13, 0xCD, 0x86, 0xB9,
- 0xFF, 0x7D, 0xC1, 0x31, 0xF5, 0x8A, 0x6A, 0xB1,
- 0xD1, 0x20, 0xD7, 0x02, 0x22, 0x04, 0x68, 0x71,
- 0x07, 0xDB, 0x9D, 0x99, 0x61, 0xBE, 0xE6, 0x59,
- 0xDD, 0x51, 0x90, 0xDC, 0x9A, 0xA3, 0xAB, 0xD0,
- 0x81, 0x0F, 0x47, 0x1A, 0xE3, 0xEC, 0x8D, 0xBF,
- 0x96, 0x7B, 0x5C, 0xA2, 0xA1, 0x63, 0x23, 0x4D,
- 0xC8, 0x9E, 0x9C, 0x3A, 0x0C, 0x2E, 0xBA, 0x6E,
- 0x9F, 0x5A, 0xF2, 0x92, 0xF3, 0x49, 0x78, 0xCC,
- 0x15, 0xFB, 0x70, 0x75, 0x7F, 0x35, 0x10, 0x03,
- 0x64, 0x6D, 0xC6, 0x74, 0xD5, 0xB4, 0xEA, 0x09,
- 0x76, 0x19, 0xFE, 0x40, 0x12, 0xE0, 0xBD, 0x05,
- 0xFA, 0x01, 0xF0, 0x2A, 0x5E, 0xA9, 0x56, 0x43,
- 0x85, 0x14, 0x89, 0x9B, 0xB0, 0xE5, 0x48, 0x79,
- 0x97, 0xFC, 0x1E, 0x82, 0x21, 0x8C, 0x1B, 0x5F,
- 0x77, 0x54, 0xB2, 0x1D, 0x25, 0x4F, 0x00, 0x46,
- 0xED, 0x58, 0x52, 0xEB, 0x7E, 0xDA, 0xC9, 0xFD,
- 0x30, 0x95, 0x65, 0x3C, 0xB6, 0xE4, 0xBB, 0x7C,
- 0x0E, 0x50, 0x39, 0x26, 0x32, 0x84, 0x69, 0x93,
- 0x37, 0xE7, 0x24, 0xA4, 0xCB, 0x53, 0x0A, 0x87,
- 0xD9, 0x4C, 0x83, 0x8F, 0xCE, 0x3B, 0x4A, 0xB7
- }
+ { 0xA9, 0x85, 0xD6, 0xD3, 0x54, 0x1D, 0xAC, 0x25,
+ 0x5D, 0x43, 0x18, 0x1E, 0x51, 0xFC, 0xCA, 0x63,
+ 0x28, 0x44, 0x20, 0x9D, 0xE0, 0xE2, 0xC8, 0x17,
+ 0xA5, 0x8F, 0x03, 0x7B, 0xBB, 0x13, 0xD2, 0xEE,
+ 0x70, 0x8C, 0x3F, 0xA8, 0x32, 0xDD, 0xF6, 0x74,
+ 0xEC, 0x95, 0x0B, 0x57, 0x5C, 0x5B, 0xBD, 0x01,
+ 0x24, 0x1C, 0x73, 0x98, 0x10, 0xCC, 0xF2, 0xD9,
+ 0x2C, 0xE7, 0x72, 0x83, 0x9B, 0xD1, 0x86, 0xC9,
+ 0x60, 0x50, 0xA3, 0xEB, 0x0D, 0xB6, 0x9E, 0x4F,
+ 0xB7, 0x5A, 0xC6, 0x78, 0xA6, 0x12, 0xAF, 0xD5,
+ 0x61, 0xC3, 0xB4, 0x41, 0x52, 0x7D, 0x8D, 0x08,
+ 0x1F, 0x99, 0x00, 0x19, 0x04, 0x53, 0xF7, 0xE1,
+ 0xFD, 0x76, 0x2F, 0x27, 0xB0, 0x8B, 0x0E, 0xAB,
+ 0xA2, 0x6E, 0x93, 0x4D, 0x69, 0x7C, 0x09, 0x0A,
+ 0xBF, 0xEF, 0xF3, 0xC5, 0x87, 0x14, 0xFE, 0x64,
+ 0xDE, 0x2E, 0x4B, 0x1A, 0x06, 0x21, 0x6B, 0x66,
+ 0x02, 0xF5, 0x92, 0x8A, 0x0C, 0xB3, 0x7E, 0xD0,
+ 0x7A, 0x47, 0x96, 0xE5, 0x26, 0x80, 0xAD, 0xDF,
+ 0xA1, 0x30, 0x37, 0xAE, 0x36, 0x15, 0x22, 0x38,
+ 0xF4, 0xA7, 0x45, 0x4C, 0x81, 0xE9, 0x84, 0x97,
+ 0x35, 0xCB, 0xCE, 0x3C, 0x71, 0x11, 0xC7, 0x89,
+ 0x75, 0xFB, 0xDA, 0xF8, 0x94, 0x59, 0x82, 0xC4,
+ 0xFF, 0x49, 0x39, 0x67, 0xC0, 0xCF, 0xD7, 0xB8,
+ 0x0F, 0x8E, 0x42, 0x23, 0x91, 0x6C, 0xDB, 0xA4,
+ 0x34, 0xF1, 0x48, 0xC2, 0x6F, 0x3D, 0x2D, 0x40,
+ 0xBE, 0x3E, 0xBC, 0xC1, 0xAA, 0xBA, 0x4E, 0x55,
+ 0x3B, 0xDC, 0x68, 0x7F, 0x9C, 0xD8, 0x4A, 0x56,
+ 0x77, 0xA0, 0xED, 0x46, 0xB5, 0x2B, 0x65, 0xFA,
+ 0xE3, 0xB9, 0xB1, 0x9F, 0x5E, 0xF9, 0xE6, 0xB2,
+ 0x31, 0xEA, 0x6D, 0x5F, 0xE4, 0xF0, 0xCD, 0x88,
+ 0x16, 0x3A, 0x58, 0xD4, 0x62, 0x29, 0x07, 0x33,
+ 0xE8, 0x1B, 0x05, 0x79, 0x90, 0x6A, 0x2A, 0x9A },
+ { 0x38, 0xE8, 0x2D, 0xA6, 0xCF, 0xDE, 0xB3, 0xB8,
+ 0xAF, 0x60, 0x55, 0xC7, 0x44, 0x6F, 0x6B, 0x5B,
+ 0xC3, 0x62, 0x33, 0xB5, 0x29, 0xA0, 0xE2, 0xA7,
+ 0xD3, 0x91, 0x11, 0x06, 0x1C, 0xBC, 0x36, 0x4B,
+ 0xEF, 0x88, 0x6C, 0xA8, 0x17, 0xC4, 0x16, 0xF4,
+ 0xC2, 0x45, 0xE1, 0xD6, 0x3F, 0x3D, 0x8E, 0x98,
+ 0x28, 0x4E, 0xF6, 0x3E, 0xA5, 0xF9, 0x0D, 0xDF,
+ 0xD8, 0x2B, 0x66, 0x7A, 0x27, 0x2F, 0xF1, 0x72,
+ 0x42, 0xD4, 0x41, 0xC0, 0x73, 0x67, 0xAC, 0x8B,
+ 0xF7, 0xAD, 0x80, 0x1F, 0xCA, 0x2C, 0xAA, 0x34,
+ 0xD2, 0x0B, 0xEE, 0xE9, 0x5D, 0x94, 0x18, 0xF8,
+ 0x57, 0xAE, 0x08, 0xC5, 0x13, 0xCD, 0x86, 0xB9,
+ 0xFF, 0x7D, 0xC1, 0x31, 0xF5, 0x8A, 0x6A, 0xB1,
+ 0xD1, 0x20, 0xD7, 0x02, 0x22, 0x04, 0x68, 0x71,
+ 0x07, 0xDB, 0x9D, 0x99, 0x61, 0xBE, 0xE6, 0x59,
+ 0xDD, 0x51, 0x90, 0xDC, 0x9A, 0xA3, 0xAB, 0xD0,
+ 0x81, 0x0F, 0x47, 0x1A, 0xE3, 0xEC, 0x8D, 0xBF,
+ 0x96, 0x7B, 0x5C, 0xA2, 0xA1, 0x63, 0x23, 0x4D,
+ 0xC8, 0x9E, 0x9C, 0x3A, 0x0C, 0x2E, 0xBA, 0x6E,
+ 0x9F, 0x5A, 0xF2, 0x92, 0xF3, 0x49, 0x78, 0xCC,
+ 0x15, 0xFB, 0x70, 0x75, 0x7F, 0x35, 0x10, 0x03,
+ 0x64, 0x6D, 0xC6, 0x74, 0xD5, 0xB4, 0xEA, 0x09,
+ 0x76, 0x19, 0xFE, 0x40, 0x12, 0xE0, 0xBD, 0x05,
+ 0xFA, 0x01, 0xF0, 0x2A, 0x5E, 0xA9, 0x56, 0x43,
+ 0x85, 0x14, 0x89, 0x9B, 0xB0, 0xE5, 0x48, 0x79,
+ 0x97, 0xFC, 0x1E, 0x82, 0x21, 0x8C, 0x1B, 0x5F,
+ 0x77, 0x54, 0xB2, 0x1D, 0x25, 0x4F, 0x00, 0x46,
+ 0xED, 0x58, 0x52, 0xEB, 0x7E, 0xDA, 0xC9, 0xFD,
+ 0x30, 0x95, 0x65, 0x3C, 0xB6, 0xE4, 0xBB, 0x7C,
+ 0x0E, 0x50, 0x39, 0x26, 0x32, 0x84, 0x69, 0x93,
+ 0x37, 0xE7, 0x24, 0xA4, 0xCB, 0x53, 0x0A, 0x87,
+ 0xD9, 0x4C, 0x83, 0x8F, 0xCE, 0x3B, 0x4A, 0xB7 }
};
static unsigned int G_FUNC(unsigned int v)
{
unsigned int s0, s1, s2, s3, ret;
- s0 = SEED_Sbox[0][(unsigned char) (v) & 0xff];
- s1 = SEED_Sbox[1][(unsigned char)((v)>> 8) & 0xff];
- s2 = SEED_Sbox[0][(unsigned char)((v)>>16) & 0xff];
- s3 = SEED_Sbox[1][(unsigned char)((v)>>24) & 0xff];
+ s0 = SEED_Sbox[0][(unsigned char)(v) & 0xff];
+ s1 = SEED_Sbox[1][(unsigned char)((v) >> 8) & 0xff];
+ s2 = SEED_Sbox[0][(unsigned char)((v) >> 16) & 0xff];
+ s3 = SEED_Sbox[1][(unsigned char)((v) >> 24) & 0xff];
- ret = ((s0 & 0xFC) ^ (s1 & 0xF3) ^ (s2 & 0xCF) ^ (s3 & 0x3F));
+ ret = ((s0 & 0xFC) ^ (s1 & 0xF3) ^ (s2 & 0xCF) ^ (s3 & 0x3F));
ret |= ((s0 & 0xF3) ^ (s1 & 0xCF) ^ (s2 & 0x3F) ^ (s3 & 0xFC)) << 8;
ret |= ((s0 & 0xCF) ^ (s1 & 0x3F) ^ (s2 & 0xFC) ^ (s3 & 0xF3)) << 16;
ret |= ((s0 & 0x3F) ^ (s1 & 0xFC) ^ (s2 & 0xF3) ^ (s3 & 0xCF)) << 24;
return ret;
}
-# endif
+#endif
/* key schedule constants - golden ratio */
-# define KC0 0x9e3779b9
-# define KC1 0x3c6ef373
-# define KC2 0x78dde6e6
-# define KC3 0xf1bbcdcc
-# define KC4 0xe3779b99
-# define KC5 0xc6ef3733
-# define KC6 0x8dde6e67
-# define KC7 0x1bbcdccf
-# define KC8 0x3779b99e
-# define KC9 0x6ef3733c
-# define KC10 0xdde6e678
-# define KC11 0xbbcdccf1
-# define KC12 0x779b99e3
-# define KC13 0xef3733c6
-# define KC14 0xde6e678d
-# define KC15 0xbcdccf1b
+#define KC0 0x9e3779b9
+#define KC1 0x3c6ef373
+#define KC2 0x78dde6e6
+#define KC3 0xf1bbcdcc
+#define KC4 0xe3779b99
+#define KC5 0xc6ef3733
+#define KC6 0x8dde6e67
+#define KC7 0x1bbcdccf
+#define KC8 0x3779b99e
+#define KC9 0x6ef3733c
+#define KC10 0xdde6e678
+#define KC11 0xbbcdccf1
+#define KC12 0x779b99e3
+#define KC13 0xef3733c6
+#define KC14 0xde6e678d
+#define KC15 0xbcdccf1b
-# if defined(OPENSSL_SMALL_FOOTPRINT)
+#if defined(OPENSSL_SMALL_FOOTPRINT)
static const seed_word KC[] = {
KC0, KC1, KC2, KC3, KC4, KC5, KC6, KC7,
KC8, KC9, KC10, KC11, KC12, KC13, KC14, KC15
};
-# endif
+#endif
void SEED_set_key(const unsigned char rawkey[SEED_KEY_LENGTH],
- SEED_KEY_SCHEDULE *ks)
+ SEED_KEY_SCHEDULE *ks)
{
seed_word x1, x2, x3, x4;
seed_word t0, t1;
@@ -460,7 +449,7 @@ void SEED_set_key(const unsigned char rawkey[SEED_KEY_LENGTH],
KEYSCHEDULE_UPDATE1(t0, t1, x1, x2, x3, x4, KC1);
KEYUPDATE_TEMP(t0, t1, &ks->data[2]);
-# if !defined(OPENSSL_SMALL_FOOTPRINT)
+#if !defined(OPENSSL_SMALL_FOOTPRINT)
KEYSCHEDULE_UPDATE0(t0, t1, x1, x2, x3, x4, KC2);
KEYUPDATE_TEMP(t0, t1, &ks->data[4]);
KEYSCHEDULE_UPDATE1(t0, t1, x1, x2, x3, x4, KC3);
@@ -489,7 +478,7 @@ void SEED_set_key(const unsigned char rawkey[SEED_KEY_LENGTH],
KEYUPDATE_TEMP(t0, t1, &ks->data[28]);
KEYSCHEDULE_UPDATE1(t0, t1, x1, x2, x3, x4, KC15);
KEYUPDATE_TEMP(t0, t1, &ks->data[30]);
-# else
+#else
{
int i;
for (i = 2; i < 16; i += 2) {
@@ -499,12 +488,12 @@ void SEED_set_key(const unsigned char rawkey[SEED_KEY_LENGTH],
KEYUPDATE_TEMP(t0, t1, &ks->data[i * 2 + 2]);
}
}
-# endif
+#endif
}
void SEED_encrypt(const unsigned char s[SEED_BLOCK_SIZE],
- unsigned char d[SEED_BLOCK_SIZE],
- const SEED_KEY_SCHEDULE *ks)
+ unsigned char d[SEED_BLOCK_SIZE],
+ const SEED_KEY_SCHEDULE *ks)
{
seed_word x1, x2, x3, x4;
seed_word t0, t1;
@@ -514,7 +503,7 @@ void SEED_encrypt(const unsigned char s[SEED_BLOCK_SIZE],
char2word(s + 8, x3);
char2word(s + 12, x4);
-# if !defined(OPENSSL_SMALL_FOOTPRINT)
+#if !defined(OPENSSL_SMALL_FOOTPRINT)
E_SEED(t0, t1, x1, x2, x3, x4, 0);
E_SEED(t0, t1, x3, x4, x1, x2, 2);
E_SEED(t0, t1, x1, x2, x3, x4, 4);
@@ -531,7 +520,7 @@ void SEED_encrypt(const unsigned char s[SEED_BLOCK_SIZE],
E_SEED(t0, t1, x3, x4, x1, x2, 26);
E_SEED(t0, t1, x1, x2, x3, x4, 28);
E_SEED(t0, t1, x3, x4, x1, x2, 30);
-# else
+#else
{
int i;
for (i = 0; i < 30; i += 4) {
@@ -539,7 +528,7 @@ void SEED_encrypt(const unsigned char s[SEED_BLOCK_SIZE],
E_SEED(t0, t1, x3, x4, x1, x2, i + 2);
}
}
-# endif
+#endif
word2char(x3, d);
word2char(x4, d + 4);
@@ -548,8 +537,8 @@ void SEED_encrypt(const unsigned char s[SEED_BLOCK_SIZE],
}
void SEED_decrypt(const unsigned char s[SEED_BLOCK_SIZE],
- unsigned char d[SEED_BLOCK_SIZE],
- const SEED_KEY_SCHEDULE *ks)
+ unsigned char d[SEED_BLOCK_SIZE],
+ const SEED_KEY_SCHEDULE *ks)
{
seed_word x1, x2, x3, x4;
seed_word t0, t1;
@@ -559,7 +548,7 @@ void SEED_decrypt(const unsigned char s[SEED_BLOCK_SIZE],
char2word(s + 8, x3);
char2word(s + 12, x4);
-# if !defined(OPENSSL_SMALL_FOOTPRINT)
+#if !defined(OPENSSL_SMALL_FOOTPRINT)
E_SEED(t0, t1, x1, x2, x3, x4, 30);
E_SEED(t0, t1, x3, x4, x1, x2, 28);
E_SEED(t0, t1, x1, x2, x3, x4, 26);
@@ -576,16 +565,15 @@ void SEED_decrypt(const unsigned char s[SEED_BLOCK_SIZE],
E_SEED(t0, t1, x3, x4, x1, x2, 4);
E_SEED(t0, t1, x1, x2, x3, x4, 2);
E_SEED(t0, t1, x3, x4, x1, x2, 0);
-# else
+#else
{
int i;
for (i = 30; i > 0; i -= 4) {
E_SEED(t0, t1, x1, x2, x3, x4, i);
E_SEED(t0, t1, x3, x4, x1, x2, i - 2);
-
}
}
-# endif
+#endif
word2char(x3, d);
word2char(x4, d + 4);
@@ -593,4 +581,4 @@ void SEED_decrypt(const unsigned char s[SEED_BLOCK_SIZE],
word2char(x2, d + 12);
}
-#endif /* OPENSSL_NO_SEED */
+#endif /* OPENSSL_NO_SEED */
diff --git a/crypto/seed/seed_cbc.c b/crypto/seed/seed_cbc.c
index d5a324fd44..a783d3b7aa 100644
--- a/crypto/seed/seed_cbc.c
+++ b/crypto/seed/seed_cbc.c
@@ -17,13 +17,13 @@
#include <openssl/modes.h>
void SEED_cbc_encrypt(const unsigned char *in, unsigned char *out,
- size_t len, const SEED_KEY_SCHEDULE *ks,
- unsigned char ivec[SEED_BLOCK_SIZE], int enc)
+ size_t len, const SEED_KEY_SCHEDULE *ks,
+ unsigned char ivec[SEED_BLOCK_SIZE], int enc)
{
if (enc)
CRYPTO_cbc128_encrypt(in, out, len, ks, ivec,
- (block128_f) SEED_encrypt);
+ (block128_f)SEED_encrypt);
else
CRYPTO_cbc128_decrypt(in, out, len, ks, ivec,
- (block128_f) SEED_decrypt);
+ (block128_f)SEED_decrypt);
}
diff --git a/crypto/seed/seed_cfb.c b/crypto/seed/seed_cfb.c
index 24fbfbf746..4e39babac5 100644
--- a/crypto/seed/seed_cfb.c
+++ b/crypto/seed/seed_cfb.c
@@ -17,10 +17,10 @@
#include <openssl/modes.h>
void SEED_cfb128_encrypt(const unsigned char *in, unsigned char *out,
- size_t len, const SEED_KEY_SCHEDULE *ks,
- unsigned char ivec[SEED_BLOCK_SIZE], int *num,
- int enc)
+ size_t len, const SEED_KEY_SCHEDULE *ks,
+ unsigned char ivec[SEED_BLOCK_SIZE], int *num,
+ int enc)
{
CRYPTO_cfb128_encrypt(in, out, len, ks, ivec, num, enc,
- (block128_f) SEED_encrypt);
+ (block128_f)SEED_encrypt);
}
diff --git a/crypto/seed/seed_ecb.c b/crypto/seed/seed_ecb.c
index 9f357511cd..0317a31d52 100644
--- a/crypto/seed/seed_ecb.c
+++ b/crypto/seed/seed_ecb.c
@@ -16,7 +16,7 @@
#include <openssl/seed.h>
void SEED_ecb_encrypt(const unsigned char *in, unsigned char *out,
- const SEED_KEY_SCHEDULE *ks, int enc)
+ const SEED_KEY_SCHEDULE *ks, int enc)
{
if (enc)
SEED_encrypt(in, out, ks);
diff --git a/crypto/seed/seed_local.h b/crypto/seed/seed_local.h
index dd40ee69de..6f0b9e7a43 100644
--- a/crypto/seed/seed_local.h
+++ b/crypto/seed/seed_local.h
@@ -33,80 +33,79 @@
*
*/
#ifndef OSSL_CRYPTO_SEED_LOCAL_H
-# define OSSL_CRYPTO_SEED_LOCAL_H
+#define OSSL_CRYPTO_SEED_LOCAL_H
-# include <openssl/e_os2.h>
-# include <openssl/seed.h>
+#include <openssl/e_os2.h>
+#include <openssl/seed.h>
-# ifdef SEED_LONG /* need 32-bit type */
+#ifdef SEED_LONG /* need 32-bit type */
typedef unsigned long seed_word;
-# else
+#else
typedef unsigned int seed_word;
-# endif
+#endif
+#define char2word(c, i) \
+ (i) = ((((seed_word)(c)[0]) << 24) | (((seed_word)(c)[1]) << 16) | (((seed_word)(c)[2]) << 8) | ((seed_word)(c)[3]))
-# define char2word(c, i) \
- (i) = ((((seed_word)(c)[0]) << 24) | (((seed_word)(c)[1]) << 16) | (((seed_word)(c)[2]) << 8) | ((seed_word)(c)[3]))
+#define word2char(l, c) \
+ *((c) + 0) = (unsigned char)((l) >> 24) & 0xff; \
+ *((c) + 1) = (unsigned char)((l) >> 16) & 0xff; \
+ *((c) + 2) = (unsigned char)((l) >> 8) & 0xff; \
+ *((c) + 3) = (unsigned char)((l)) & 0xff
-# define word2char(l, c) \
- *((c)+0) = (unsigned char)((l)>>24) & 0xff; \
- *((c)+1) = (unsigned char)((l)>>16) & 0xff; \
- *((c)+2) = (unsigned char)((l)>> 8) & 0xff; \
- *((c)+3) = (unsigned char)((l)) & 0xff
+#define KEYSCHEDULE_UPDATE0(T0, T1, X1, X2, X3, X4, KC) \
+ (T0) = (X3); \
+ (X3) = (((X3) << 8) ^ ((X4) >> 24)) & 0xffffffff; \
+ (X4) = (((X4) << 8) ^ ((T0) >> 24)) & 0xffffffff; \
+ (T0) = ((X1) + (X3) - (KC)) & 0xffffffff; \
+ (T1) = ((X2) + (KC) - (X4)) & 0xffffffff
-# define KEYSCHEDULE_UPDATE0(T0, T1, X1, X2, X3, X4, KC) \
- (T0) = (X3); \
- (X3) = (((X3)<<8) ^ ((X4)>>24)) & 0xffffffff; \
- (X4) = (((X4)<<8) ^ ((T0)>>24)) & 0xffffffff; \
- (T0) = ((X1) + (X3) - (KC)) & 0xffffffff; \
- (T1) = ((X2) + (KC) - (X4)) & 0xffffffff
+#define KEYSCHEDULE_UPDATE1(T0, T1, X1, X2, X3, X4, KC) \
+ (T0) = (X1); \
+ (X1) = (((X1) >> 8) ^ ((X2) << 24)) & 0xffffffff; \
+ (X2) = (((X2) >> 8) ^ ((T0) << 24)) & 0xffffffff; \
+ (T0) = ((X1) + (X3) - (KC)) & 0xffffffff; \
+ (T1) = ((X2) + (KC) - (X4)) & 0xffffffff
-# define KEYSCHEDULE_UPDATE1(T0, T1, X1, X2, X3, X4, KC) \
- (T0) = (X1); \
- (X1) = (((X1)>>8) ^ ((X2)<<24)) & 0xffffffff; \
- (X2) = (((X2)>>8) ^ ((T0)<<24)) & 0xffffffff; \
- (T0) = ((X1) + (X3) - (KC)) & 0xffffffff; \
- (T1) = ((X2) + (KC) - (X4)) & 0xffffffff
+#define KEYUPDATE_TEMP(T0, T1, K) \
+ (K)[0] = G_FUNC((T0)); \
+ (K)[1] = G_FUNC((T1))
-# define KEYUPDATE_TEMP(T0, T1, K) \
- (K)[0] = G_FUNC((T0)); \
- (K)[1] = G_FUNC((T1))
+#define XOR_SEEDBLOCK(DST, SRC) \
+ ((DST))[0] ^= ((SRC))[0]; \
+ ((DST))[1] ^= ((SRC))[1]; \
+ ((DST))[2] ^= ((SRC))[2]; \
+ ((DST))[3] ^= ((SRC))[3]
-# define XOR_SEEDBLOCK(DST, SRC) \
- ((DST))[0] ^= ((SRC))[0]; \
- ((DST))[1] ^= ((SRC))[1]; \
- ((DST))[2] ^= ((SRC))[2]; \
- ((DST))[3] ^= ((SRC))[3]
+#define MOV_SEEDBLOCK(DST, SRC) \
+ ((DST))[0] = ((SRC))[0]; \
+ ((DST))[1] = ((SRC))[1]; \
+ ((DST))[2] = ((SRC))[2]; \
+ ((DST))[3] = ((SRC))[3]
-# define MOV_SEEDBLOCK(DST, SRC) \
- ((DST))[0] = ((SRC))[0]; \
- ((DST))[1] = ((SRC))[1]; \
- ((DST))[2] = ((SRC))[2]; \
- ((DST))[3] = ((SRC))[3]
+#define CHAR2WORD(C, I) \
+ char2word((C), (I)[0]); \
+ char2word((C + 4), (I)[1]); \
+ char2word((C + 8), (I)[2]); \
+ char2word((C + 12), (I)[3])
-# define CHAR2WORD(C, I) \
- char2word((C), (I)[0]); \
- char2word((C+4), (I)[1]); \
- char2word((C+8), (I)[2]); \
- char2word((C+12), (I)[3])
+#define WORD2CHAR(I, C) \
+ word2char((I)[0], (C)); \
+ word2char((I)[1], (C + 4)); \
+ word2char((I)[2], (C + 8)); \
+ word2char((I)[3], (C + 12))
-# define WORD2CHAR(I, C) \
- word2char((I)[0], (C)); \
- word2char((I)[1], (C+4)); \
- word2char((I)[2], (C+8)); \
- word2char((I)[3], (C+12))
+#define E_SEED(T0, T1, X1, X2, X3, X4, rbase) \
+ (T0) = (X3) ^ (ks->data)[(rbase)]; \
+ (T1) = (X4) ^ (ks->data)[(rbase) + 1]; \
+ (T1) ^= (T0); \
+ (T1) = G_FUNC((T1)); \
+ (T0) = ((T0) + (T1)) & 0xffffffff; \
+ (T0) = G_FUNC((T0)); \
+ (T1) = ((T1) + (T0)) & 0xffffffff; \
+ (T1) = G_FUNC((T1)); \
+ (T0) = ((T0) + (T1)) & 0xffffffff; \
+ (X1) ^= (T0); \
+ (X2) ^= (T1)
-# define E_SEED(T0, T1, X1, X2, X3, X4, rbase) \
- (T0) = (X3) ^ (ks->data)[(rbase)]; \
- (T1) = (X4) ^ (ks->data)[(rbase)+1]; \
- (T1) ^= (T0); \
- (T1) = G_FUNC((T1)); \
- (T0) = ((T0) + (T1)) & 0xffffffff; \
- (T0) = G_FUNC((T0)); \
- (T1) = ((T1) + (T0)) & 0xffffffff; \
- (T1) = G_FUNC((T1)); \
- (T0) = ((T0) + (T1)) & 0xffffffff; \
- (X1) ^= (T0); \
- (X2) ^= (T1)
-
-#endif /* OSSL_CRYPTO_SEED_LOCAL_H */
+#endif /* OSSL_CRYPTO_SEED_LOCAL_H */
diff --git a/crypto/seed/seed_ofb.c b/crypto/seed/seed_ofb.c
index b2e905331d..c51e1ba46b 100644
--- a/crypto/seed/seed_ofb.c
+++ b/crypto/seed/seed_ofb.c
@@ -17,9 +17,9 @@
#include <openssl/modes.h>
void SEED_ofb128_encrypt(const unsigned char *in, unsigned char *out,
- size_t len, const SEED_KEY_SCHEDULE *ks,
- unsigned char ivec[SEED_BLOCK_SIZE], int *num)
+ size_t len, const SEED_KEY_SCHEDULE *ks,
+ unsigned char ivec[SEED_BLOCK_SIZE], int *num)
{
CRYPTO_ofb128_encrypt(in, out, len, ks, ivec, num,
- (block128_f) SEED_encrypt);
+ (block128_f)SEED_encrypt);
}
diff --git a/crypto/self_test_core.c b/crypto/self_test_core.c
index 1496a37b80..b8226c43cc 100644
--- a/crypto/self_test_core.c
+++ b/crypto/self_test_core.c
@@ -50,7 +50,7 @@ static SELF_TEST_CB *get_self_test_callback(OSSL_LIB_CTX *libctx)
}
void OSSL_SELF_TEST_set_callback(OSSL_LIB_CTX *libctx, OSSL_CALLBACK *cb,
- void *cbarg)
+ void *cbarg)
{
SELF_TEST_CB *stcb = get_self_test_callback(libctx);
@@ -61,7 +61,7 @@ void OSSL_SELF_TEST_set_callback(OSSL_LIB_CTX *libctx, OSSL_CALLBACK *cb,
}
void OSSL_SELF_TEST_get_callback(OSSL_LIB_CTX *libctx, OSSL_CALLBACK **cb,
- void **cbarg)
+ void **cbarg)
{
SELF_TEST_CB *stcb = get_self_test_callback(libctx);
@@ -77,15 +77,12 @@ static void self_test_setparams(OSSL_SELF_TEST *st)
size_t n = 0;
if (st->cb != NULL) {
- st->params[n++] =
- OSSL_PARAM_construct_utf8_string(OSSL_PROV_PARAM_SELF_TEST_PHASE,
- (char *)st->phase, 0);
- st->params[n++] =
- OSSL_PARAM_construct_utf8_string(OSSL_PROV_PARAM_SELF_TEST_TYPE,
- (char *)st->type, 0);
- st->params[n++] =
- OSSL_PARAM_construct_utf8_string(OSSL_PROV_PARAM_SELF_TEST_DESC,
- (char *)st->desc, 0);
+ st->params[n++] = OSSL_PARAM_construct_utf8_string(OSSL_PROV_PARAM_SELF_TEST_PHASE,
+ (char *)st->phase, 0);
+ st->params[n++] = OSSL_PARAM_construct_utf8_string(OSSL_PROV_PARAM_SELF_TEST_TYPE,
+ (char *)st->type, 0);
+ st->params[n++] = OSSL_PARAM_construct_utf8_string(OSSL_PROV_PARAM_SELF_TEST_DESC,
+ (char *)st->desc, 0);
}
st->params[n++] = OSSL_PARAM_construct_end();
}
@@ -113,7 +110,7 @@ void OSSL_SELF_TEST_free(OSSL_SELF_TEST *st)
/* Can be used during application testing to log that a test has started. */
void OSSL_SELF_TEST_onbegin(OSSL_SELF_TEST *st, const char *type,
- const char *desc)
+ const char *desc)
{
if (st != NULL && st->cb != NULL) {
st->phase = OSSL_SELF_TEST_PHASE_START;
@@ -131,8 +128,7 @@ void OSSL_SELF_TEST_onbegin(OSSL_SELF_TEST *st, const char *type,
void OSSL_SELF_TEST_onend(OSSL_SELF_TEST *st, int ret)
{
if (st != NULL && st->cb != NULL) {
- st->phase =
- (ret == 1 ? OSSL_SELF_TEST_PHASE_PASS : OSSL_SELF_TEST_PHASE_FAIL);
+ st->phase = (ret == 1 ? OSSL_SELF_TEST_PHASE_PASS : OSSL_SELF_TEST_PHASE_FAIL);
self_test_setparams(st);
(void)st->cb(st->params, st->cb_arg);
diff --git a/crypto/sha/keccak1600.c b/crypto/sha/keccak1600.c
index 5d6abeb463..59e688ce43 100644
--- a/crypto/sha/keccak1600.c
+++ b/crypto/sha/keccak1600.c
@@ -14,7 +14,7 @@
#include "internal/nelem.h"
size_t SHA3_absorb(uint64_t A[5][5], const unsigned char *inp, size_t len,
- size_t r);
+ size_t r);
void SHA3_squeeze(uint64_t A[5][5], unsigned char *out, size_t len, size_t r, int next);
#if !defined(KECCAK1600_ASM) || !defined(SELFTEST)
@@ -22,33 +22,27 @@ void SHA3_squeeze(uint64_t A[5][5], unsigned char *out, size_t len, size_t r, in
/*
* Choose some sensible defaults
*/
-#if !defined(KECCAK_REF) && !defined(KECCAK_1X) && !defined(KECCAK_1X_ALT) && \
- !defined(KECCAK_2X) && !defined(KECCAK_INPLACE)
-# define KECCAK_2X /* default to KECCAK_2X variant */
+#if !defined(KECCAK_REF) && !defined(KECCAK_1X) && !defined(KECCAK_1X_ALT) && !defined(KECCAK_2X) && !defined(KECCAK_INPLACE)
+#define KECCAK_2X /* default to KECCAK_2X variant */
#endif
-#if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
- (defined(__x86_64) && !defined(__BMI__)) || defined(_M_X64) || \
- defined(__mips) || defined(__riscv) || defined(__s390__) || \
- defined(__EMSCRIPTEN__)
+#if defined(__i386) || defined(__i386__) || defined(_M_IX86) || (defined(__x86_64) && !defined(__BMI__)) || defined(_M_X64) || defined(__mips) || defined(__riscv) || defined(__s390__) || defined(__EMSCRIPTEN__)
/*
* These don't have "and with complement" instruction, so minimize amount
* of "not"-s. Implemented only in the [default] KECCAK_2X variant.
*/
-# define KECCAK_COMPLEMENTING_TRANSFORM
+#define KECCAK_COMPLEMENTING_TRANSFORM
#endif
-#if defined(__x86_64__) || defined(__aarch64__) || \
- defined(__mips64) || defined(__ia64) || \
- (defined(__VMS) && !defined(__vax))
+#if defined(__x86_64__) || defined(__aarch64__) || defined(__mips64) || defined(__ia64) || (defined(__VMS) && !defined(__vax))
/*
* These are available even in ILP32 flavours, but even then they are
* capable of performing 64-bit operations as efficiently as in *P64.
* Since it's not given that we can use sizeof(void *), just shunt it.
*/
-# define BIT_INTERLEAVE (0)
+#define BIT_INTERLEAVE (0)
#else
-# define BIT_INTERLEAVE (sizeof(void *) < 8)
+#define BIT_INTERLEAVE (sizeof(void *) < 8)
#endif
#define ROL32(a, offset) (((a) << (offset)) | ((a) >> ((32 - (offset)) & 31)))
@@ -58,7 +52,7 @@ static uint64_t ROL64(uint64_t val, int offset)
if (offset == 0) {
return val;
} else if (!BIT_INTERLEAVE) {
- return (val << offset) | (val >> (64-offset));
+ return (val << offset) | (val >> (64 - offset));
} else {
uint32_t hi = (uint32_t)(val >> 32), lo = (uint32_t)val;
@@ -79,11 +73,11 @@ static uint64_t ROL64(uint64_t val, int offset)
}
static const unsigned char rhotates[5][5] = {
- { 0, 1, 62, 28, 27 },
- { 36, 44, 6, 55, 20 },
- { 3, 10, 43, 25, 39 },
- { 41, 45, 15, 21, 8 },
- { 18, 2, 61, 56, 14 }
+ { 0, 1, 62, 28, 27 },
+ { 36, 44, 6, 55, 20 },
+ { 3, 10, 43, 25, 39 },
+ { 41, 45, 15, 21, 8 },
+ { 18, 2, 61, 56, 14 }
};
static const uint64_t iotas[] = {
@@ -263,8 +257,8 @@ static void KeccakF1600(uint64_t A[5][5])
*/
static void Round(uint64_t A[5][5], size_t i)
{
- uint64_t C[5], E[2]; /* registers */
- uint64_t D[5], T[2][5]; /* memory */
+ uint64_t C[5], E[2]; /* registers */
+ uint64_t D[5], T[2][5]; /* memory */
assert(i < OSSL_NELEM(iotas));
@@ -287,11 +281,11 @@ static void Round(uint64_t A[5][5], size_t i)
T[0][3] = A[0][3] ^ C[2]; /* D[3] */
T[0][4] = A[0][4] ^ E[1]; /* D[4] */
- C[3] = ROL64(A[3][3] ^ C[2], rhotates[3][3]); /* D[3] */
- C[4] = ROL64(A[4][4] ^ E[1], rhotates[4][4]); /* D[4] */
- C[0] = A[0][0] ^ C[0]; /* rotate by 0 */ /* D[0] */
- C[2] = ROL64(A[2][2] ^ C[1], rhotates[2][2]); /* D[2] */
- C[1] = ROL64(A[1][1] ^ E[0], rhotates[1][1]); /* D[1] */
+ C[3] = ROL64(A[3][3] ^ C[2], rhotates[3][3]); /* D[3] */
+ C[4] = ROL64(A[4][4] ^ E[1], rhotates[4][4]); /* D[4] */
+ C[0] = A[0][0] ^ C[0]; /* rotate by 0 */ /* D[0] */
+ C[2] = ROL64(A[2][2] ^ C[1], rhotates[2][2]); /* D[2] */
+ C[1] = ROL64(A[1][1] ^ E[0], rhotates[1][1]); /* D[1] */
#else
D[0] = ROL64(C[1], 1) ^ C[4];
D[1] = ROL64(C[2], 1) ^ C[0];
@@ -305,7 +299,7 @@ static void Round(uint64_t A[5][5], size_t i)
T[0][3] = A[0][3] ^ D[3];
T[0][4] = A[0][4] ^ D[4];
- C[0] = A[0][0] ^ D[0]; /* rotate by 0 */
+ C[0] = A[0][0] ^ D[0]; /* rotate by 0 */
C[1] = ROL64(A[1][1] ^ D[1], rhotates[1][1]);
C[2] = ROL64(A[2][2] ^ D[2], rhotates[2][2]);
C[3] = ROL64(A[3][3] ^ D[3], rhotates[3][3]);
@@ -323,11 +317,11 @@ static void Round(uint64_t A[5][5], size_t i)
T[1][3] = A[1][3] ^ (E[1] = D[3]);
T[1][4] = A[2][4] ^ (C[2] = D[4]); /* borrow T[1][4] */
- C[0] = ROL64(T[0][3], rhotates[0][3]);
- C[1] = ROL64(A[1][4] ^ C[2], rhotates[1][4]); /* D[4] */
- C[2] = ROL64(A[2][0] ^ C[3], rhotates[2][0]); /* D[0] */
- C[3] = ROL64(A[3][1] ^ C[4], rhotates[3][1]); /* D[1] */
- C[4] = ROL64(A[4][2] ^ E[0], rhotates[4][2]); /* D[2] */
+ C[0] = ROL64(T[0][3], rhotates[0][3]);
+ C[1] = ROL64(A[1][4] ^ C[2], rhotates[1][4]); /* D[4] */
+ C[2] = ROL64(A[2][0] ^ C[3], rhotates[2][0]); /* D[0] */
+ C[3] = ROL64(A[3][1] ^ C[4], rhotates[3][1]); /* D[1] */
+ C[4] = ROL64(A[4][2] ^ E[0], rhotates[4][2]); /* D[2] */
A[1][0] = C[0] ^ (~C[1] & C[2]);
A[1][1] = C[1] ^ (~C[2] & C[3]);
@@ -335,8 +329,8 @@ static void Round(uint64_t A[5][5], size_t i)
A[1][3] = C[3] ^ (~C[4] & C[0]);
A[1][4] = C[4] ^ (~C[0] & C[1]);
- C[0] = ROL64(T[0][1], rhotates[0][1]);
- C[1] = ROL64(T[1][2], rhotates[1][2]);
+ C[0] = ROL64(T[0][1], rhotates[0][1]);
+ C[1] = ROL64(T[1][2], rhotates[1][2]);
C[2] = ROL64(A[2][3] ^ D[3], rhotates[2][3]);
C[3] = ROL64(A[3][4] ^ D[4], rhotates[3][4]);
C[4] = ROL64(A[4][0] ^ D[0], rhotates[4][0]);
@@ -347,9 +341,9 @@ static void Round(uint64_t A[5][5], size_t i)
A[2][3] = C[3] ^ (~C[4] & C[0]);
A[2][4] = C[4] ^ (~C[0] & C[1]);
- C[0] = ROL64(T[0][4], rhotates[0][4]);
- C[1] = ROL64(T[1][0], rhotates[1][0]);
- C[2] = ROL64(T[1][1], rhotates[2][1]); /* originally A[2][1] */
+ C[0] = ROL64(T[0][4], rhotates[0][4]);
+ C[1] = ROL64(T[1][0], rhotates[1][0]);
+ C[2] = ROL64(T[1][1], rhotates[2][1]); /* originally A[2][1] */
C[3] = ROL64(A[3][2] ^ D[2], rhotates[3][2]);
C[4] = ROL64(A[4][3] ^ D[3], rhotates[4][3]);
@@ -359,10 +353,10 @@ static void Round(uint64_t A[5][5], size_t i)
A[3][3] = C[3] ^ (~C[4] & C[0]);
A[3][4] = C[4] ^ (~C[0] & C[1]);
- C[0] = ROL64(T[0][2], rhotates[0][2]);
- C[1] = ROL64(T[1][3], rhotates[1][3]);
- C[2] = ROL64(T[1][4], rhotates[2][4]); /* originally A[2][4] */
- C[3] = ROL64(T[0][0], rhotates[3][0]); /* originally A[3][0] */
+ C[0] = ROL64(T[0][2], rhotates[0][2]);
+ C[1] = ROL64(T[1][3], rhotates[1][3]);
+ C[2] = ROL64(T[1][4], rhotates[2][4]); /* originally A[2][4] */
+ C[3] = ROL64(T[0][0], rhotates[3][0]); /* originally A[3][0] */
C[4] = ROL64(A[4][1] ^ D[1], rhotates[4][1]);
A[4][0] = C[0] ^ (~C[1] & C[2]);
@@ -401,8 +395,8 @@ static void Round(uint64_t A[5][5], size_t i)
C[3] = A[0][3] ^ A[1][3] ^ A[2][3] ^ A[3][3] ^ A[4][3];
C[4] = A[0][4] ^ A[1][4] ^ A[2][4] ^ A[3][4] ^ A[4][4];
- D[1] = C[0] ^ ROL64(C[2], 1);
- D[2] = C[1] ^ ROL64(C[3], 1);
+ D[1] = C[0] ^ ROL64(C[2], 1);
+ D[2] = C[1] ^ ROL64(C[3], 1);
D[3] = C[2] ^= ROL64(C[4], 1);
D[4] = C[3] ^= ROL64(C[0], 1);
D[0] = C[4] ^= ROL64(C[1], 1);
@@ -467,10 +461,10 @@ static void Round(uint64_t A[5][5], size_t i)
A[1][2] = ROL64(A[2][0], rhotates[2][0]);
A[3][1] = ROL64(A[1][0], rhotates[1][0]);
- A[1][0] = ROL64(C[3], rhotates[0][3]);
- A[2][0] = ROL64(C[1], rhotates[0][1]);
- A[3][0] = ROL64(C[4], rhotates[0][4]);
- A[4][0] = ROL64(C[2], rhotates[0][2]);
+ A[1][0] = ROL64(C[3], rhotates[0][3]);
+ A[2][0] = ROL64(C[1], rhotates[0][1]);
+ A[3][0] = ROL64(C[4], rhotates[0][4]);
+ A[4][0] = ROL64(C[2], rhotates[0][2]);
C[0] = A[0][0];
C[1] = A[1][0];
@@ -485,8 +479,8 @@ static void Round(uint64_t A[5][5], size_t i)
A[1][2] ^= (~A[1][3] & A[1][4]);
A[0][3] ^= (~A[0][4] & C[0]);
A[1][3] ^= (~A[1][4] & C[1]);
- A[0][4] ^= (~C[0] & D[0]);
- A[1][4] ^= (~C[1] & D[1]);
+ A[0][4] ^= (~C[0] & D[0]);
+ A[1][4] ^= (~C[1] & D[1]);
C[2] = A[2][0];
C[3] = A[3][0];
@@ -501,8 +495,8 @@ static void Round(uint64_t A[5][5], size_t i)
A[3][2] ^= (~A[3][3] & A[3][4]);
A[2][3] ^= (~A[2][4] & C[2]);
A[3][3] ^= (~A[3][4] & C[3]);
- A[2][4] ^= (~C[2] & D[2]);
- A[3][4] ^= (~C[3] & D[3]);
+ A[2][4] ^= (~C[2] & D[2]);
+ A[3][4] ^= (~C[3] & D[3]);
C[4] = A[4][0];
D[4] = A[4][1];
@@ -511,7 +505,7 @@ static void Round(uint64_t A[5][5], size_t i)
A[4][1] ^= (~A[4][2] & A[4][3]);
A[4][2] ^= (~A[4][3] & A[4][4]);
A[4][3] ^= (~A[4][4] & C[4]);
- A[4][4] ^= (~C[4] & D[4]);
+ A[4][4] ^= (~C[4] & D[4]);
A[0][0] ^= iotas[i];
}
@@ -552,18 +546,18 @@ static void Round(uint64_t R[5][5], uint64_t A[5][5], size_t i)
D[3] = ROL64(C[4], 1) ^ C[2];
D[4] = ROL64(C[0], 1) ^ C[3];
- C[0] = A[0][0] ^ D[0]; /* rotate by 0 */
+ C[0] = A[0][0] ^ D[0]; /* rotate by 0 */
C[1] = ROL64(A[1][1] ^ D[1], rhotates[1][1]);
C[2] = ROL64(A[2][2] ^ D[2], rhotates[2][2]);
C[3] = ROL64(A[3][3] ^ D[3], rhotates[3][3]);
C[4] = ROL64(A[4][4] ^ D[4], rhotates[4][4]);
#ifdef KECCAK_COMPLEMENTING_TRANSFORM
- R[0][0] = C[0] ^ ( C[1] | C[2]) ^ iotas[i];
+ R[0][0] = C[0] ^ (C[1] | C[2]) ^ iotas[i];
R[0][1] = C[1] ^ (~C[2] | C[3]);
- R[0][2] = C[2] ^ ( C[3] & C[4]);
- R[0][3] = C[3] ^ ( C[4] | C[0]);
- R[0][4] = C[4] ^ ( C[0] & C[1]);
+ R[0][2] = C[2] ^ (C[3] & C[4]);
+ R[0][3] = C[3] ^ (C[4] | C[0]);
+ R[0][4] = C[4] ^ (C[0] & C[1]);
#else
R[0][0] = C[0] ^ (~C[1] & C[2]) ^ iotas[i];
R[0][1] = C[1] ^ (~C[2] & C[3]);
@@ -579,11 +573,11 @@ static void Round(uint64_t R[5][5], uint64_t A[5][5], size_t i)
C[4] = ROL64(A[4][2] ^ D[2], rhotates[4][2]);
#ifdef KECCAK_COMPLEMENTING_TRANSFORM
- R[1][0] = C[0] ^ (C[1] | C[2]);
- R[1][1] = C[1] ^ (C[2] & C[3]);
+ R[1][0] = C[0] ^ (C[1] | C[2]);
+ R[1][1] = C[1] ^ (C[2] & C[3]);
R[1][2] = C[2] ^ (C[3] | ~C[4]);
- R[1][3] = C[3] ^ (C[4] | C[0]);
- R[1][4] = C[4] ^ (C[0] & C[1]);
+ R[1][3] = C[3] ^ (C[4] | C[0]);
+ R[1][4] = C[4] ^ (C[0] & C[1]);
#else
R[1][0] = C[0] ^ (~C[1] & C[2]);
R[1][1] = C[1] ^ (~C[2] & C[3]);
@@ -599,11 +593,11 @@ static void Round(uint64_t R[5][5], uint64_t A[5][5], size_t i)
C[4] = ROL64(A[4][0] ^ D[0], rhotates[4][0]);
#ifdef KECCAK_COMPLEMENTING_TRANSFORM
- R[2][0] = C[0] ^ ( C[1] | C[2]);
- R[2][1] = C[1] ^ ( C[2] & C[3]);
- R[2][2] = C[2] ^ (~C[3] & C[4]);
- R[2][3] = ~C[3] ^ ( C[4] | C[0]);
- R[2][4] = C[4] ^ ( C[0] & C[1]);
+ R[2][0] = C[0] ^ (C[1] | C[2]);
+ R[2][1] = C[1] ^ (C[2] & C[3]);
+ R[2][2] = C[2] ^ (~C[3] & C[4]);
+ R[2][3] = ~C[3] ^ (C[4] | C[0]);
+ R[2][4] = C[4] ^ (C[0] & C[1]);
#else
R[2][0] = C[0] ^ (~C[1] & C[2]);
R[2][1] = C[1] ^ (~C[2] & C[3]);
@@ -619,11 +613,11 @@ static void Round(uint64_t R[5][5], uint64_t A[5][5], size_t i)
C[4] = ROL64(A[4][3] ^ D[3], rhotates[4][3]);
#ifdef KECCAK_COMPLEMENTING_TRANSFORM
- R[3][0] = C[0] ^ ( C[1] & C[2]);
- R[3][1] = C[1] ^ ( C[2] | C[3]);
- R[3][2] = C[2] ^ (~C[3] | C[4]);
- R[3][3] = ~C[3] ^ ( C[4] & C[0]);
- R[3][4] = C[4] ^ ( C[0] | C[1]);
+ R[3][0] = C[0] ^ (C[1] & C[2]);
+ R[3][1] = C[1] ^ (C[2] | C[3]);
+ R[3][2] = C[2] ^ (~C[3] | C[4]);
+ R[3][3] = ~C[3] ^ (C[4] & C[0]);
+ R[3][4] = C[4] ^ (C[0] | C[1]);
#else
R[3][0] = C[0] ^ (~C[1] & C[2]);
R[3][1] = C[1] ^ (~C[2] & C[3]);
@@ -639,11 +633,11 @@ static void Round(uint64_t R[5][5], uint64_t A[5][5], size_t i)
C[4] = ROL64(A[4][1] ^ D[1], rhotates[4][1]);
#ifdef KECCAK_COMPLEMENTING_TRANSFORM
- R[4][0] = C[0] ^ (~C[1] & C[2]);
- R[4][1] = ~C[1] ^ ( C[2] | C[3]);
- R[4][2] = C[2] ^ ( C[3] & C[4]);
- R[4][3] = C[3] ^ ( C[4] | C[0]);
- R[4][4] = C[4] ^ ( C[0] & C[1]);
+ R[4][0] = C[0] ^ (~C[1] & C[2]);
+ R[4][1] = ~C[1] ^ (C[2] | C[3]);
+ R[4][2] = C[2] ^ (C[3] & C[4]);
+ R[4][3] = C[3] ^ (C[4] | C[0]);
+ R[4][4] = C[4] ^ (C[0] & C[1]);
#else
R[4][0] = C[0] ^ (~C[1] & C[2]);
R[4][1] = C[1] ^ (~C[2] & C[3]);
@@ -682,7 +676,7 @@ static void KeccakF1600(uint64_t A[5][5])
#endif
}
-#else /* define KECCAK_INPLACE to compile this code path */
+#else /* define KECCAK_INPLACE to compile this code path */
/*
* This implementation is KECCAK_1X from above combined 4 times with
* a twist that allows to omit temporary storage and perform in-place
@@ -711,7 +705,7 @@ static void FourRounds(uint64_t A[5][5], size_t i)
D[3] = ROL64(C[4], 1) ^ C[2];
D[4] = ROL64(C[0], 1) ^ C[3];
- B[0] = A[0][0] ^ D[0]; /* rotate by 0 */
+ B[0] = A[0][0] ^ D[0]; /* rotate by 0 */
B[1] = ROL64(A[1][1] ^ D[1], rhotates[1][1]);
B[2] = ROL64(A[2][2] ^ D[2], rhotates[2][2]);
B[3] = ROL64(A[3][3] ^ D[3], rhotates[3][3]);
@@ -778,7 +772,7 @@ static void FourRounds(uint64_t A[5][5], size_t i)
D[3] = ROL64(C[4], 1) ^ C[2];
D[4] = ROL64(C[0], 1) ^ C[3];
- B[0] = A[0][0] ^ D[0]; /* rotate by 0 */
+ B[0] = A[0][0] ^ D[0]; /* rotate by 0 */
B[1] = ROL64(A[3][1] ^ D[1], rhotates[1][1]);
B[2] = ROL64(A[1][2] ^ D[2], rhotates[2][2]);
B[3] = ROL64(A[4][3] ^ D[3], rhotates[3][3]);
@@ -845,7 +839,7 @@ static void FourRounds(uint64_t A[5][5], size_t i)
D[3] = ROL64(C[4], 1) ^ C[2];
D[4] = ROL64(C[0], 1) ^ C[3];
- B[0] = A[0][0] ^ D[0]; /* rotate by 0 */
+ B[0] = A[0][0] ^ D[0]; /* rotate by 0 */
B[1] = ROL64(A[2][1] ^ D[1], rhotates[1][1]);
B[2] = ROL64(A[4][2] ^ D[2], rhotates[2][2]);
B[3] = ROL64(A[1][3] ^ D[3], rhotates[3][3]);
@@ -912,7 +906,7 @@ static void FourRounds(uint64_t A[5][5], size_t i)
D[3] = ROL64(C[4], 1) ^ C[2];
D[4] = ROL64(C[0], 1) ^ C[3];
- B[0] = A[0][0] ^ D[0]; /* rotate by 0 */
+ B[0] = A[0][0] ^ D[0]; /* rotate by 0 */
B[1] = ROL64(A[0][1] ^ D[1], rhotates[1][1]);
B[2] = ROL64(A[0][2] ^ D[2], rhotates[2][2]);
B[3] = ROL64(A[0][3] ^ D[3], rhotates[3][3]);
@@ -991,28 +985,44 @@ static uint64_t BitInterleave(uint64_t Ai)
uint32_t t0, t1;
t0 = lo & 0x55555555;
- t0 |= t0 >> 1; t0 &= 0x33333333;
- t0 |= t0 >> 2; t0 &= 0x0f0f0f0f;
- t0 |= t0 >> 4; t0 &= 0x00ff00ff;
- t0 |= t0 >> 8; t0 &= 0x0000ffff;
+ t0 |= t0 >> 1;
+ t0 &= 0x33333333;
+ t0 |= t0 >> 2;
+ t0 &= 0x0f0f0f0f;
+ t0 |= t0 >> 4;
+ t0 &= 0x00ff00ff;
+ t0 |= t0 >> 8;
+ t0 &= 0x0000ffff;
t1 = hi & 0x55555555;
- t1 |= t1 >> 1; t1 &= 0x33333333;
- t1 |= t1 >> 2; t1 &= 0x0f0f0f0f;
- t1 |= t1 >> 4; t1 &= 0x00ff00ff;
- t1 |= t1 >> 8; t1 <<= 16;
+ t1 |= t1 >> 1;
+ t1 &= 0x33333333;
+ t1 |= t1 >> 2;
+ t1 &= 0x0f0f0f0f;
+ t1 |= t1 >> 4;
+ t1 &= 0x00ff00ff;
+ t1 |= t1 >> 8;
+ t1 <<= 16;
lo &= 0xaaaaaaaa;
- lo |= lo << 1; lo &= 0xcccccccc;
- lo |= lo << 2; lo &= 0xf0f0f0f0;
- lo |= lo << 4; lo &= 0xff00ff00;
- lo |= lo << 8; lo >>= 16;
+ lo |= lo << 1;
+ lo &= 0xcccccccc;
+ lo |= lo << 2;
+ lo &= 0xf0f0f0f0;
+ lo |= lo << 4;
+ lo &= 0xff00ff00;
+ lo |= lo << 8;
+ lo >>= 16;
hi &= 0xaaaaaaaa;
- hi |= hi << 1; hi &= 0xcccccccc;
- hi |= hi << 2; hi &= 0xf0f0f0f0;
- hi |= hi << 4; hi &= 0xff00ff00;
- hi |= hi << 8; hi &= 0xffff0000;
+ hi |= hi << 1;
+ hi &= 0xcccccccc;
+ hi |= hi << 2;
+ hi &= 0xf0f0f0f0;
+ hi |= hi << 4;
+ hi &= 0xff00ff00;
+ hi |= hi << 8;
+ hi &= 0xffff0000;
Ai = ((uint64_t)(hi | lo) << 32) | (t1 | t0);
}
@@ -1027,28 +1037,44 @@ static uint64_t BitDeinterleave(uint64_t Ai)
uint32_t t0, t1;
t0 = lo & 0x0000ffff;
- t0 |= t0 << 8; t0 &= 0x00ff00ff;
- t0 |= t0 << 4; t0 &= 0x0f0f0f0f;
- t0 |= t0 << 2; t0 &= 0x33333333;
- t0 |= t0 << 1; t0 &= 0x55555555;
+ t0 |= t0 << 8;
+ t0 &= 0x00ff00ff;
+ t0 |= t0 << 4;
+ t0 &= 0x0f0f0f0f;
+ t0 |= t0 << 2;
+ t0 &= 0x33333333;
+ t0 |= t0 << 1;
+ t0 &= 0x55555555;
t1 = hi << 16;
- t1 |= t1 >> 8; t1 &= 0xff00ff00;
- t1 |= t1 >> 4; t1 &= 0xf0f0f0f0;
- t1 |= t1 >> 2; t1 &= 0xcccccccc;
- t1 |= t1 >> 1; t1 &= 0xaaaaaaaa;
+ t1 |= t1 >> 8;
+ t1 &= 0xff00ff00;
+ t1 |= t1 >> 4;
+ t1 &= 0xf0f0f0f0;
+ t1 |= t1 >> 2;
+ t1 &= 0xcccccccc;
+ t1 |= t1 >> 1;
+ t1 &= 0xaaaaaaaa;
lo >>= 16;
- lo |= lo << 8; lo &= 0x00ff00ff;
- lo |= lo << 4; lo &= 0x0f0f0f0f;
- lo |= lo << 2; lo &= 0x33333333;
- lo |= lo << 1; lo &= 0x55555555;
+ lo |= lo << 8;
+ lo &= 0x00ff00ff;
+ lo |= lo << 4;
+ lo &= 0x0f0f0f0f;
+ lo |= lo << 2;
+ lo &= 0x33333333;
+ lo |= lo << 1;
+ lo &= 0x55555555;
hi &= 0xffff0000;
- hi |= hi >> 8; hi &= 0xff00ff00;
- hi |= hi >> 4; hi &= 0xf0f0f0f0;
- hi |= hi >> 2; hi &= 0xcccccccc;
- hi |= hi >> 1; hi &= 0xaaaaaaaa;
+ hi |= hi >> 8;
+ hi &= 0xff00ff00;
+ hi |= hi >> 4;
+ hi &= 0xf0f0f0f0;
+ hi |= hi >> 2;
+ hi &= 0xcccccccc;
+ hi |= hi >> 1;
+ hi &= 0xaaaaaaaa;
Ai = ((uint64_t)(hi | lo) << 32) | (t1 | t0);
}
@@ -1067,7 +1093,7 @@ static uint64_t BitDeinterleave(uint64_t Ai)
* caller's responsibility.
*/
size_t SHA3_absorb(uint64_t A[5][5], const unsigned char *inp, size_t len,
- size_t r)
+ size_t r)
{
uint64_t *A_flat = (uint64_t *)A;
size_t i, w = r / 8;
@@ -1076,10 +1102,7 @@ size_t SHA3_absorb(uint64_t A[5][5], const unsigned char *inp, size_t len,
while (len >= r) {
for (i = 0; i < w; i++) {
- uint64_t Ai = (uint64_t)inp[0] | (uint64_t)inp[1] << 8 |
- (uint64_t)inp[2] << 16 | (uint64_t)inp[3] << 24 |
- (uint64_t)inp[4] << 32 | (uint64_t)inp[5] << 40 |
- (uint64_t)inp[6] << 48 | (uint64_t)inp[7] << 56;
+ uint64_t Ai = (uint64_t)inp[0] | (uint64_t)inp[1] << 8 | (uint64_t)inp[2] << 16 | (uint64_t)inp[3] << 24 | (uint64_t)inp[4] << 32 | (uint64_t)inp[5] << 40 | (uint64_t)inp[6] << 48 | (uint64_t)inp[7] << 56;
inp += 8;
A_flat[i] ^= BitInterleave(Ai);
@@ -1101,7 +1124,7 @@ size_t SHA3_absorb(uint64_t A[5][5], const unsigned char *inp, size_t len,
* and |next| must be 0.
*/
void SHA3_squeeze(uint64_t A[5][5], unsigned char *out, size_t len, size_t r,
- int next)
+ int next)
{
uint64_t *A_flat = (uint64_t *)A;
size_t i, w = r / 8;
@@ -1151,7 +1174,7 @@ void SHA3_squeeze(uint64_t A[5][5], unsigned char *out, size_t len, size_t r,
*/
void SHA3_sponge(const unsigned char *inp, size_t len,
- unsigned char *out, size_t d, size_t r)
+ unsigned char *out, size_t d, size_t r)
{
uint64_t A[5][5];
@@ -1160,7 +1183,7 @@ void SHA3_sponge(const unsigned char *inp, size_t len,
SHA3_squeeze(A, out, d, r);
}
-# include <stdio.h>
+#include <stdio.h>
int main(void)
{
diff --git a/crypto/sha/sha256.c b/crypto/sha/sha256.c
index 6a19657bf8..0268e09dde 100644
--- a/crypto/sha/sha256.c
+++ b/crypto/sha/sha256.c
@@ -73,9 +73,9 @@ int SHA224_Final(unsigned char *md, SHA256_CTX *c)
#define DATA_ORDER_IS_BIG_ENDIAN
-#define HASH_LONG SHA_LONG
-#define HASH_CTX SHA256_CTX
-#define HASH_CBLOCK SHA_CBLOCK
+#define HASH_LONG SHA_LONG
+#define HASH_CTX SHA256_CTX
+#define HASH_CBLOCK SHA_CBLOCK
/*
* Note that FIPS180-2 discusses "Truncation of the Hash Function Output."
@@ -85,47 +85,52 @@ int SHA224_Final(unsigned char *md, SHA256_CTX *c)
* Idea behind separate cases for pre-defined lengths is to let the
* compiler decide if it's appropriate to unroll small loops.
*/
-#define HASH_MAKE_STRING(c,s) do { \
- unsigned long ll; \
- unsigned int nn; \
- switch ((c)->md_len) { \
- case SHA256_192_DIGEST_LENGTH: \
- for (nn=0;nn<SHA256_192_DIGEST_LENGTH/4;nn++) { \
- ll=(c)->h[nn]; (void)HOST_l2c(ll,(s)); \
- } \
- break; \
- case SHA224_DIGEST_LENGTH: \
- for (nn=0;nn<SHA224_DIGEST_LENGTH/4;nn++) { \
- ll=(c)->h[nn]; (void)HOST_l2c(ll,(s)); \
- } \
- break; \
- case SHA256_DIGEST_LENGTH: \
- for (nn=0;nn<SHA256_DIGEST_LENGTH/4;nn++) { \
- ll=(c)->h[nn]; (void)HOST_l2c(ll,(s)); \
- } \
- break; \
- default: \
- if ((c)->md_len > SHA256_DIGEST_LENGTH) \
- return 0; \
- for (nn=0;nn<(c)->md_len/4;nn++) { \
- ll=(c)->h[nn]; (void)HOST_l2c(ll,(s)); \
- } \
- break; \
- } \
+#define HASH_MAKE_STRING(c, s) \
+ do { \
+ unsigned long ll; \
+ unsigned int nn; \
+ switch ((c)->md_len) { \
+ case SHA256_192_DIGEST_LENGTH: \
+ for (nn = 0; nn < SHA256_192_DIGEST_LENGTH / 4; nn++) { \
+ ll = (c)->h[nn]; \
+ (void)HOST_l2c(ll, (s)); \
+ } \
+ break; \
+ case SHA224_DIGEST_LENGTH: \
+ for (nn = 0; nn < SHA224_DIGEST_LENGTH / 4; nn++) { \
+ ll = (c)->h[nn]; \
+ (void)HOST_l2c(ll, (s)); \
+ } \
+ break; \
+ case SHA256_DIGEST_LENGTH: \
+ for (nn = 0; nn < SHA256_DIGEST_LENGTH / 4; nn++) { \
+ ll = (c)->h[nn]; \
+ (void)HOST_l2c(ll, (s)); \
+ } \
+ break; \
+ default: \
+ if ((c)->md_len > SHA256_DIGEST_LENGTH) \
+ return 0; \
+ for (nn = 0; nn < (c)->md_len / 4; nn++) { \
+ ll = (c)->h[nn]; \
+ (void)HOST_l2c(ll, (s)); \
+ } \
+ break; \
+ } \
} while (0)
-#define HASH_UPDATE SHA256_Update
-#define HASH_TRANSFORM SHA256_Transform
-#define HASH_FINAL SHA256_Final
-#define HASH_BLOCK_DATA_ORDER sha256_block_data_order
+#define HASH_UPDATE SHA256_Update
+#define HASH_TRANSFORM SHA256_Transform
+#define HASH_FINAL SHA256_Final
+#define HASH_BLOCK_DATA_ORDER sha256_block_data_order
#ifndef SHA256_ASM
static
#else
-# ifdef INCLUDE_C_SHA256
+#ifdef INCLUDE_C_SHA256
void sha256_block_data_order_c(SHA256_CTX *ctx, const void *in, size_t num);
-# endif /* INCLUDE_C_SHA256 */
+#endif /* INCLUDE_C_SHA256 */
#endif /* SHA256_ASM */
-void sha256_block_data_order(SHA256_CTX *ctx, const void *in, size_t num);
+ void sha256_block_data_order(SHA256_CTX *ctx, const void *in, size_t num);
#include "crypto/md32_common.h"
@@ -149,68 +154,67 @@ static const SHA_LONG K256[64] = {
0x90befffaUL, 0xa4506cebUL, 0xbef9a3f7UL, 0xc67178f2UL
};
-# ifndef PEDANTIC
-# if defined(__GNUC__) && __GNUC__>=2 && \
- !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
-# if defined(__riscv_zknh)
-# define Sigma0(x) ({ MD32_REG_T ret; \
+#ifndef PEDANTIC
+#if defined(__GNUC__) && __GNUC__ >= 2 && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
+#if defined(__riscv_zknh)
+#define Sigma0(x) ({ MD32_REG_T ret; \
asm ("sha256sum0 %0, %1" \
: "=r"(ret) \
- : "r"(x)); ret; })
-# define Sigma1(x) ({ MD32_REG_T ret; \
+ : "r"(x)); ret; })
+#define Sigma1(x) ({ MD32_REG_T ret; \
asm ("sha256sum1 %0, %1" \
: "=r"(ret) \
- : "r"(x)); ret; })
-# define sigma0(x) ({ MD32_REG_T ret; \
+ : "r"(x)); ret; })
+#define sigma0(x) ({ MD32_REG_T ret; \
asm ("sha256sig0 %0, %1" \
: "=r"(ret) \
- : "r"(x)); ret; })
-# define sigma1(x) ({ MD32_REG_T ret; \
+ : "r"(x)); ret; })
+#define sigma1(x) ({ MD32_REG_T ret; \
asm ("sha256sig1 %0, %1" \
: "=r"(ret) \
- : "r"(x)); ret; })
-# endif
-# if defined(__riscv_zbt) || defined(__riscv_zpn)
-# define Ch(x,y,z) ({ MD32_REG_T ret; \
+ : "r"(x)); ret; })
+#endif
+#if defined(__riscv_zbt) || defined(__riscv_zpn)
+#define Ch(x, y, z) ({ MD32_REG_T ret; \
asm (".insn r4 0x33, 1, 0x3, %0, %2, %1, %3"\
: "=r"(ret) \
- : "r"(x), "r"(y), "r"(z)); ret; })
-# define Maj(x,y,z) ({ MD32_REG_T ret; \
+ : "r"(x), "r"(y), "r"(z)); ret; })
+#define Maj(x, y, z) ({ MD32_REG_T ret; \
asm (".insn r4 0x33, 1, 0x3, %0, %2, %1, %3"\
: "=r"(ret) \
- : "r"(x^z), "r"(y), "r"(x)); ret; })
-# endif
-# endif
-# endif
+ : "r"(x^z), "r"(y), "r"(x)); ret; })
+#endif
+#endif
+#endif
/*
* FIPS specification refers to right rotations, while our ROTATE macro
* is left one. This is why you might notice that rotation coefficients
* differ from those observed in FIPS document by 32-N...
*/
-# ifndef Sigma0
-# define Sigma0(x) (ROTATE((x),30) ^ ROTATE((x),19) ^ ROTATE((x),10))
-# endif
-# ifndef Sigma1
-# define Sigma1(x) (ROTATE((x),26) ^ ROTATE((x),21) ^ ROTATE((x),7))
-# endif
-# ifndef sigma0
-# define sigma0(x) (ROTATE((x),25) ^ ROTATE((x),14) ^ ((x)>>3))
-# endif
-# ifndef sigma1
-# define sigma1(x) (ROTATE((x),15) ^ ROTATE((x),13) ^ ((x)>>10))
-# endif
-# ifndef Ch
-# define Ch(x,y,z) (((x) & (y)) ^ ((~(x)) & (z)))
-# endif
-# ifndef Maj
-# define Maj(x,y,z) (((x) & (y)) ^ ((x) & (z)) ^ ((y) & (z)))
-# endif
-
-# ifdef OPENSSL_SMALL_FOOTPRINT
+#ifndef Sigma0
+#define Sigma0(x) (ROTATE((x), 30) ^ ROTATE((x), 19) ^ ROTATE((x), 10))
+#endif
+#ifndef Sigma1
+#define Sigma1(x) (ROTATE((x), 26) ^ ROTATE((x), 21) ^ ROTATE((x), 7))
+#endif
+#ifndef sigma0
+#define sigma0(x) (ROTATE((x), 25) ^ ROTATE((x), 14) ^ ((x) >> 3))
+#endif
+#ifndef sigma1
+#define sigma1(x) (ROTATE((x), 15) ^ ROTATE((x), 13) ^ ((x) >> 10))
+#endif
+#ifndef Ch
+#define Ch(x, y, z) (((x) & (y)) ^ ((~(x)) & (z)))
+#endif
+#ifndef Maj
+#define Maj(x, y, z) (((x) & (y)) ^ ((x) & (z)) ^ ((y) & (z)))
+#endif
+
+#ifdef OPENSSL_SMALL_FOOTPRINT
static void sha256_block_data_order(SHA256_CTX *ctx, const void *in,
- size_t num)
+ size_t num)
{
unsigned MD32_REG_T a, b, c, d, e, f, g, h, s0, s1, T1, T2;
SHA_LONG X[16], l;
@@ -270,28 +274,34 @@ static void sha256_block_data_order(SHA256_CTX *ctx, const void *in,
ctx->h[5] += f;
ctx->h[6] += g;
ctx->h[7] += h;
-
}
}
-# else
+#else
-# define ROUND_00_15(i,a,b,c,d,e,f,g,h) do { \
- T1 += h + Sigma1(e) + Ch(e,f,g) + K256[i]; \
- h = Sigma0(a) + Maj(a,b,c); \
- d += T1; h += T1; } while (0)
+#define ROUND_00_15(i, a, b, c, d, e, f, g, h) \
+ do { \
+ T1 += h + Sigma1(e) + Ch(e, f, g) + K256[i]; \
+ h = Sigma0(a) + Maj(a, b, c); \
+ d += T1; \
+ h += T1; \
+ } while (0)
-# define ROUND_16_63(i,a,b,c,d,e,f,g,h,X) do { \
- s0 = X[(i+1)&0x0f]; s0 = sigma0(s0); \
- s1 = X[(i+14)&0x0f]; s1 = sigma1(s1); \
- T1 = X[(i)&0x0f] += s0 + s1 + X[(i+9)&0x0f]; \
- ROUND_00_15(i,a,b,c,d,e,f,g,h); } while (0)
+#define ROUND_16_63(i, a, b, c, d, e, f, g, h, X) \
+ do { \
+ s0 = X[(i + 1) & 0x0f]; \
+ s0 = sigma0(s0); \
+ s1 = X[(i + 14) & 0x0f]; \
+ s1 = sigma1(s1); \
+ T1 = X[(i) & 0x0f] += s0 + s1 + X[(i + 9) & 0x0f]; \
+ ROUND_00_15(i, a, b, c, d, e, f, g, h); \
+ } while (0)
#ifdef INCLUDE_C_SHA256
void sha256_block_data_order_c(SHA256_CTX *ctx, const void *in, size_t num)
#else
static void sha256_block_data_order(SHA256_CTX *ctx, const void *in,
- size_t num)
+ size_t num)
#endif
{
unsigned MD32_REG_T a, b, c, d, e, f, g, h, s0, s1, T1;
@@ -421,9 +431,8 @@ static void sha256_block_data_order(SHA256_CTX *ctx, const void *in,
ctx->h[5] += f;
ctx->h[6] += g;
ctx->h[7] += h;
-
}
}
-# endif
-#endif /* SHA256_ASM */
+#endif
+#endif /* SHA256_ASM */
diff --git a/crypto/sha/sha3.c b/crypto/sha/sha3.c
index 951d5c8883..21e1070bee 100644
--- a/crypto/sha/sha3.c
+++ b/crypto/sha/sha3.c
@@ -9,7 +9,7 @@
#include <string.h>
#if defined(__s390x__) && defined(OPENSSL_CPUID_OBJ)
-# include "crypto/s390x_arch.h"
+#include "crypto/s390x_arch.h"
#endif
#include "internal/sha3.h"
@@ -62,7 +62,7 @@ int ossl_sha3_update(KECCAK1600_CTX *ctx, const void *_inp, size_t len)
|| ctx->xof_state == XOF_STATE_FINAL)
return 0;
- if ((num = ctx->bufsz) != 0) { /* process intermediate buffer? */
+ if ((num = ctx->bufsz) != 0) { /* process intermediate buffer? */
rem = bsz - num;
if (len < rem) {
diff --git a/crypto/sha/sha512.c b/crypto/sha/sha512.c
index ac5e9233b9..4c3a3b6c09 100644
--- a/crypto/sha/sha512.c
+++ b/crypto/sha/sha512.c
@@ -59,20 +59,16 @@
#include "internal/cryptlib.h"
#include "crypto/sha.h"
-#if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
- defined(__x86_64) || defined(_M_AMD64) || defined(_M_X64) || \
- defined(__s390__) || defined(__s390x__) || \
- defined(__aarch64__) || \
- defined(SHA512_ASM)
-# define SHA512_BLOCK_CAN_MANAGE_UNALIGNED_DATA
+#if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__x86_64) || defined(_M_AMD64) || defined(_M_X64) || defined(__s390__) || defined(__s390x__) || defined(__aarch64__) || defined(SHA512_ASM)
+#define SHA512_BLOCK_CAN_MANAGE_UNALIGNED_DATA
#endif
#if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__)
-# define U64(C) C##UI64
+#define U64(C) C##UI64
#elif defined(__arch64__)
-# define U64(C) C##UL
+#define U64(C) C##UL
#else
-# define U64(C) C##ULL
+#define U64(C) C##ULL
#endif
int sha512_224_init(SHA512_CTX *c)
@@ -150,18 +146,18 @@ int SHA512_Init(SHA512_CTX *c)
#ifndef SHA512_ASM
static
#else
-# ifdef INCLUDE_C_SHA512
+#ifdef INCLUDE_C_SHA512
void sha512_block_data_order_c(SHA512_CTX *ctx, const void *in, size_t num);
-# endif
#endif
-void sha512_block_data_order(SHA512_CTX *ctx, const void *in, size_t num);
+#endif
+ void sha512_block_data_order(SHA512_CTX *ctx, const void *in, size_t num);
int SHA512_Final(unsigned char *md, SHA512_CTX *c)
{
unsigned char *p = (unsigned char *)c->u.p;
size_t n = c->num;
- p[n] = 0x80; /* There always is a room for one */
+ p[n] = 0x80; /* There always is a room for one */
n++;
if (n > (sizeof(c->u) - 16)) {
memset(p + n, 0, sizeof(c->u) - n);
@@ -170,7 +166,7 @@ int SHA512_Final(unsigned char *md, SHA512_CTX *c)
}
memset(p + n, 0, sizeof(c->u) - 16 - n);
-#ifdef B_ENDIAN
+#ifdef B_ENDIAN
c->u.d[SHA_LBLOCK - 2] = c->Nh;
c->u.d[SHA_LBLOCK - 1] = c->Nl;
#else
@@ -289,11 +285,11 @@ int SHA512_Update(SHA512_CTX *c, const void *_data, size_t len)
if (len == 0)
return 1;
- l = (c->Nl + (((SHA_LONG64) len) << 3)) & U64(0xffffffffffffffff);
+ l = (c->Nl + (((SHA_LONG64)len) << 3)) & U64(0xffffffffffffffff);
if (l < c->Nl)
c->Nh++;
if (sizeof(len) >= 8)
- c->Nh += (((SHA_LONG64) len) >> 61);
+ c->Nh += (((SHA_LONG64)len) >> 61);
c->Nl = l;
if (c->num != 0) {
@@ -314,12 +310,12 @@ int SHA512_Update(SHA512_CTX *c, const void *_data, size_t len)
if ((size_t)data % sizeof(c->u.d[0]) != 0)
while (len >= sizeof(c->u))
memcpy(p, data, sizeof(c->u)),
- sha512_block_data_order(c, p, 1),
- len -= sizeof(c->u), data += sizeof(c->u);
+ sha512_block_data_order(c, p, 1),
+ len -= sizeof(c->u), data += sizeof(c->u);
else
#endif
sha512_block_data_order(c, data, len / sizeof(c->u)),
- data += len, len %= sizeof(c->u), data -= len;
+ data += len, len %= sizeof(c->u), data -= len;
}
if (len != 0)
@@ -386,58 +382,56 @@ static const SHA_LONG64 K512[80] = {
U64(0x5fcb6fab3ad6faec), U64(0x6c44198c4a475817)
};
-# ifndef PEDANTIC
-# if defined(__GNUC__) && __GNUC__>=2 && \
- !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
-# if defined(__x86_64) || defined(__x86_64__)
-# define ROTR(a,n) ({ SHA_LONG64 ret; \
+#ifndef PEDANTIC
+#if defined(__GNUC__) && __GNUC__ >= 2 && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
+#if defined(__x86_64) || defined(__x86_64__)
+#define ROTR(a, n) ({ SHA_LONG64 ret; \
asm ("rorq %1,%0" \
: "=r"(ret) \
: "J"(n),"0"(a) \
- : "cc"); ret; })
-# if !defined(B_ENDIAN)
-# define PULL64(x) ({ SHA_LONG64 ret=*((const SHA_LONG64 *)(&(x))); \
+ : "cc"); ret; })
+#if !defined(B_ENDIAN)
+#define PULL64(x) ({ SHA_LONG64 ret=*((const SHA_LONG64 *)(&(x))); \
asm ("bswapq %0" \
: "=r"(ret) \
- : "0"(ret)); ret; })
-# endif
-# elif (defined(__i386) || defined(__i386__)) && !defined(B_ENDIAN)
-# if defined(I386_ONLY)
-# define PULL64(x) ({ const unsigned int *p=(const unsigned int *)(&(x));\
+ : "0"(ret)); ret; })
+#endif
+#elif (defined(__i386) || defined(__i386__)) && !defined(B_ENDIAN)
+#if defined(I386_ONLY)
+#define PULL64(x) ({ const unsigned int *p=(const unsigned int *)(&(x));\
unsigned int hi=p[0],lo=p[1]; \
asm("xchgb %%ah,%%al;xchgb %%dh,%%dl;"\
"roll $16,%%eax; roll $16,%%edx; "\
"xchgb %%ah,%%al;xchgb %%dh,%%dl;"\
: "=a"(lo),"=d"(hi) \
: "0"(lo),"1"(hi) : "cc"); \
- ((SHA_LONG64)hi)<<32|lo; })
-# else
-# define PULL64(x) ({ const unsigned int *p=(const unsigned int *)(&(x));\
+ ((SHA_LONG64)hi)<<32|lo; })
+#else
+#define PULL64(x) ({ const unsigned int *p=(const unsigned int *)(&(x));\
unsigned int hi=p[0],lo=p[1]; \
asm ("bswapl %0; bswapl %1;" \
: "=r"(lo),"=r"(hi) \
: "0"(lo),"1"(hi)); \
- ((SHA_LONG64)hi)<<32|lo; })
-# endif
-# elif (defined(_ARCH_PPC) && defined(__64BIT__)) || defined(_ARCH_PPC64)
-# define ROTR(a,n) ({ SHA_LONG64 ret; \
+ ((SHA_LONG64)hi)<<32|lo; })
+#endif
+#elif (defined(_ARCH_PPC) && defined(__64BIT__)) || defined(_ARCH_PPC64)
+#define ROTR(a, n) ({ SHA_LONG64 ret; \
asm ("rotrdi %0,%1,%2" \
: "=r"(ret) \
- : "r"(a),"K"(n)); ret; })
-# elif defined(__aarch64__)
-# define ROTR(a,n) ({ SHA_LONG64 ret; \
+ : "r"(a),"K"(n)); ret; })
+#elif defined(__aarch64__)
+#define ROTR(a, n) ({ SHA_LONG64 ret; \
asm ("ror %0,%1,%2" \
: "=r"(ret) \
- : "r"(a),"I"(n)); ret; })
-# if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \
- __BYTE_ORDER__==__ORDER_LITTLE_ENDIAN__
-# define PULL64(x) ({ SHA_LONG64 ret; \
+ : "r"(a),"I"(n)); ret; })
+#if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+#define PULL64(x) ({ SHA_LONG64 ret; \
asm ("rev %0,%1" \
: "=r"(ret) \
: "r"(*((const SHA_LONG64 *)(&(x))))); ret; })
-# endif
-# elif (defined(__riscv_zbkb) || defined(__riscv_zbb)) && __riscv_xlen == 32
-# define PULL64(x) ({ SHA_LONG64 ret; \
+#endif
+#elif (defined(__riscv_zbkb) || defined(__riscv_zbb)) && __riscv_xlen == 32
+#define PULL64(x) ({ SHA_LONG64 ret; \
unsigned int *r = (unsigned int *)(&(ret)); \
const unsigned int *p = (const unsigned int *)(&(x)); \
asm ("rev8 %0, %1" \
@@ -445,66 +439,66 @@ static const SHA_LONG64 K512[80] = {
: "r" (p[1])); \
asm ("rev8 %0, %1" \
: "=r"(r[1]) \
- : "r" (p[0])); ret; })
-# elif (defined(__riscv_zbkb) || defined(__riscv_zbb)) && __riscv_xlen == 64
-# define PULL64(x) ({ SHA_LONG64 ret; \
+ : "r" (p[0])); ret; })
+#elif (defined(__riscv_zbkb) || defined(__riscv_zbb)) && __riscv_xlen == 64
+#define PULL64(x) ({ SHA_LONG64 ret; \
asm ("rev8 %0, %1" \
: "=r"(ret) \
- : "r"(x)); ret; })
-# endif
-# if defined(__riscv_zknh) && __riscv_xlen == 32
-# define Sigma0(x) ({ SHA_LONG64 ret; unsigned int *r = (unsigned int *)(&(ret)); \
+ : "r"(x)); ret; })
+#endif
+#if defined(__riscv_zknh) && __riscv_xlen == 32
+#define Sigma0(x) ({ SHA_LONG64 ret; unsigned int *r = (unsigned int *)(&(ret)); \
const unsigned int *p = (const unsigned int *)(&(x)); \
asm ("sha512sum0r %0, %1, %2" \
: "=r"(r[0]) \
: "r" (p[0]), "r" (p[1])); \
asm ("sha512sum0r %0, %2, %1" \
: "=r"(r[1]) \
- : "r" (p[0]), "r" (p[1])); ret; })
-# define Sigma1(x) ({ SHA_LONG64 ret; unsigned int *r = (unsigned int *)(&(ret)); \
+ : "r" (p[0]), "r" (p[1])); ret; })
+#define Sigma1(x) ({ SHA_LONG64 ret; unsigned int *r = (unsigned int *)(&(ret)); \
const unsigned int *p = (const unsigned int *)(&(x)); \
asm ("sha512sum1r %0, %1, %2" \
: "=r"(r[0]) \
: "r" (p[0]), "r" (p[1])); \
asm ("sha512sum1r %0, %2, %1" \
: "=r"(r[1]) \
- : "r" (p[0]), "r" (p[1])); ret; })
-# define sigma0(x) ({ SHA_LONG64 ret; unsigned int *r = (unsigned int *)(&(ret)); \
+ : "r" (p[0]), "r" (p[1])); ret; })
+#define sigma0(x) ({ SHA_LONG64 ret; unsigned int *r = (unsigned int *)(&(ret)); \
const unsigned int *p = (const unsigned int *)(&(x)); \
asm ("sha512sig0l %0, %1, %2" \
: "=r"(r[0]) \
: "r" (p[0]), "r" (p[1])); \
asm ("sha512sig0h %0, %2, %1" \
: "=r"(r[1]) \
- : "r" (p[0]), "r" (p[1])); ret; })
-# define sigma1(x) ({ SHA_LONG64 ret; unsigned int *r = (unsigned int *)(&(ret)); \
+ : "r" (p[0]), "r" (p[1])); ret; })
+#define sigma1(x) ({ SHA_LONG64 ret; unsigned int *r = (unsigned int *)(&(ret)); \
const unsigned int *p = (const unsigned int *)(&(x)); \
asm ("sha512sig1l %0, %1, %2" \
: "=r"(r[0]) \
: "r" (p[0]), "r" (p[1])); \
asm ("sha512sig1h %0, %2, %1" \
: "=r"(r[1]) \
- : "r" (p[0]), "r" (p[1])); ret; })
-# elif defined(__riscv_zknh) && __riscv_xlen == 64
-# define Sigma0(x) ({ SHA_LONG64 ret; \
+ : "r" (p[0]), "r" (p[1])); ret; })
+#elif defined(__riscv_zknh) && __riscv_xlen == 64
+#define Sigma0(x) ({ SHA_LONG64 ret; \
asm ("sha512sum0 %0, %1" \
: "=r"(ret) \
- : "r"(x)); ret; })
-# define Sigma1(x) ({ SHA_LONG64 ret; \
+ : "r"(x)); ret; })
+#define Sigma1(x) ({ SHA_LONG64 ret; \
asm ("sha512sum1 %0, %1" \
: "=r"(ret) \
- : "r"(x)); ret; })
-# define sigma0(x) ({ SHA_LONG64 ret; \
+ : "r"(x)); ret; })
+#define sigma0(x) ({ SHA_LONG64 ret; \
asm ("sha512sig0 %0, %1" \
: "=r"(ret) \
- : "r"(x)); ret; })
-# define sigma1(x) ({ SHA_LONG64 ret; \
+ : "r"(x)); ret; })
+#define sigma1(x) ({ SHA_LONG64 ret; \
asm ("sha512sig1 %0, %1" \
: "=r"(ret) \
- : "r"(x)); ret; })
-# endif
-# if (defined(__riscv_zbt) || defined(__riscv_zpn)) && __riscv_xlen == 32
-# define Ch(x,y,z) ({ SHA_LONG64 ret; unsigned int *r = (unsigned int *)(&(ret)); \
+ : "r"(x)); ret; })
+#endif
+#if (defined(__riscv_zbt) || defined(__riscv_zpn)) && __riscv_xlen == 32
+#define Ch(x, y, z) ({ SHA_LONG64 ret; unsigned int *r = (unsigned int *)(&(ret)); \
const unsigned int *xp = (const unsigned int *)(&(x)); \
const unsigned int *yp = (const unsigned int *)(&(y)); \
const unsigned int *zp = (const unsigned int *)(&(z)); \
@@ -513,8 +507,8 @@ static const SHA_LONG64 K512[80] = {
: "r"(xp[0]), "r"(yp[0]), "r"(zp[0])); \
asm (".insn r4 0x33, 1, 0x3, %0, %2, %1, %3\n\t" \
: "=r"(r[1]) \
- : "r"(xp[1]), "r"(yp[1]), "r"(zp[1])); ret; })
-# define Maj(x,y,z) ({ SHA_LONG64 ret; unsigned int *r = (unsigned int *)(&(ret)); \
+ : "r"(xp[1]), "r"(yp[1]), "r"(zp[1])); ret; })
+#define Maj(x, y, z) ({ SHA_LONG64 ret; unsigned int *r = (unsigned int *)(&(ret)); \
const unsigned int *xp = (const unsigned int *)(&(x)); \
const unsigned int *yp = (const unsigned int *)(&(y)); \
const unsigned int *zp = (const unsigned int *)(&(z)); \
@@ -523,83 +517,71 @@ static const SHA_LONG64 K512[80] = {
: "r"(xp[0]^zp[0]), "r"(yp[0]), "r"(zp[0])); \
asm (".insn r4 0x33, 1, 0x3, %0, %2, %1, %3\n\t" \
: "=r"(r[1]) \
- : "r"(xp[1]^zp[1]), "r"(yp[1]), "r"(zp[1])); ret; })
-# elif (defined(__riscv_zbt) || defined(__riscv_zpn)) && __riscv_xlen == 64
-# define Ch(x,y,z) ({ SHA_LONG64 ret; \
+ : "r"(xp[1]^zp[1]), "r"(yp[1]), "r"(zp[1])); ret; })
+#elif (defined(__riscv_zbt) || defined(__riscv_zpn)) && __riscv_xlen == 64
+#define Ch(x, y, z) ({ SHA_LONG64 ret; \
asm (".insn r4 0x33, 1, 0x3, %0, %2, %1, %3"\
: "=r"(ret) \
- : "r"(x), "r"(y), "r"(z)); ret; })
-# define Maj(x,y,z) ({ SHA_LONG64 ret; \
+ : "r"(x), "r"(y), "r"(z)); ret; })
+#define Maj(x, y, z) ({ SHA_LONG64 ret; \
asm (".insn r4 0x33, 1, 0x3, %0, %2, %1, %3"\
: "=r"(ret) \
- : "r"(x^z), "r"(y), "r"(x)); ret; })
-# endif
-# elif defined(_MSC_VER)
-# if defined(_WIN64) /* applies to both IA-64 and AMD64 */
-# pragma intrinsic(_rotr64)
-# define ROTR(a,n) _rotr64((a),n)
-# endif
-# if defined(_M_IX86) && !defined(OPENSSL_NO_ASM) && \
- !defined(OPENSSL_NO_INLINE_ASM)
-# if defined(I386_ONLY)
+ : "r"(x^z), "r"(y), "r"(x)); ret; })
+#endif
+#elif defined(_MSC_VER)
+#if defined(_WIN64) /* applies to both IA-64 and AMD64 */
+#pragma intrinsic(_rotr64)
+#define ROTR(a, n) _rotr64((a), n)
+#endif
+#if defined(_M_IX86) && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
+#if defined(I386_ONLY)
static SHA_LONG64 __fastcall __pull64be(const void *x)
{
- _asm mov edx,[ecx + 0]
- _asm mov eax,[ecx + 4]
- _asm xchg dh, dl
- _asm xchg ah, al
- _asm rol edx, 16
- _asm rol eax, 16
- _asm xchg dh, dl
- _asm xchg ah, al
+ _asm mov edx, [ecx + 0] _asm mov eax, [ecx + 4] _asm xchg dh, dl _asm xchg ah, al _asm rol edx, 16 _asm rol eax, 16 _asm xchg dh, dl _asm xchg ah, al
}
-# else
-static SHA_LONG64 __fastcall __pull64be(const void *x)
-{
- _asm mov edx,[ecx + 0]
- _asm mov eax,[ecx + 4]
- _asm bswap edx
- _asm bswap eax
+#else
+static SHA_LONG64 __fastcall __pull64be(const void *x) {
+ _asm mov edx, [ecx + 0] _asm mov eax, [ecx + 4] _asm bswap edx _asm bswap eax
}
-# endif
-# define PULL64(x) __pull64be(&(x))
-# endif
-# endif
-# endif
-# ifndef PULL64
-# define B(x,j) (((SHA_LONG64)(*(((const unsigned char *)(&x))+j)))<<((7-j)*8))
-# define PULL64(x) (B(x,0)|B(x,1)|B(x,2)|B(x,3)|B(x,4)|B(x,5)|B(x,6)|B(x,7))
-# endif
-# ifndef ROTR
-# define ROTR(x,s) (((x)>>s) | (x)<<(64-s))
-# endif
-# ifndef Sigma0
-# define Sigma0(x) (ROTR((x),28) ^ ROTR((x),34) ^ ROTR((x),39))
-# endif
-# ifndef Sigma1
-# define Sigma1(x) (ROTR((x),14) ^ ROTR((x),18) ^ ROTR((x),41))
-# endif
-# ifndef sigma0
-# define sigma0(x) (ROTR((x),1) ^ ROTR((x),8) ^ ((x)>>7))
-# endif
-# ifndef sigma1
-# define sigma1(x) (ROTR((x),19) ^ ROTR((x),61) ^ ((x)>>6))
-# endif
-# ifndef Ch
-# define Ch(x,y,z) (((x) & (y)) ^ ((~(x)) & (z)))
-# endif
-# ifndef Maj
-# define Maj(x,y,z) (((x) & (y)) ^ ((x) & (z)) ^ ((y) & (z)))
-# endif
-
-# if defined(__i386) || defined(__i386__) || defined(_M_IX86)
+#endif
+#define PULL64(x) __pull64be(&(x))
+#endif
+#endif
+#endif
+#ifndef PULL64
+#define B(x, j) (((SHA_LONG64)(*(((const unsigned char *)(&x)) + j))) << ((7 - j) * 8))
+#define PULL64(x) (B(x, 0) | B(x, 1) | B(x, 2) | B(x, 3) | B(x, 4) | B(x, 5) | B(x, 6) | B(x, 7))
+#endif
+#ifndef ROTR
+#define ROTR(x, s) (((x) >> s) | (x) << (64 - s))
+#endif
+#ifndef Sigma0
+#define Sigma0(x) (ROTR((x), 28) ^ ROTR((x), 34) ^ ROTR((x), 39))
+#endif
+#ifndef Sigma1
+#define Sigma1(x) (ROTR((x), 14) ^ ROTR((x), 18) ^ ROTR((x), 41))
+#endif
+#ifndef sigma0
+#define sigma0(x) (ROTR((x), 1) ^ ROTR((x), 8) ^ ((x) >> 7))
+#endif
+#ifndef sigma1
+#define sigma1(x) (ROTR((x), 19) ^ ROTR((x), 61) ^ ((x) >> 6))
+#endif
+#ifndef Ch
+#define Ch(x, y, z) (((x) & (y)) ^ ((~(x)) & (z)))
+#endif
+#ifndef Maj
+#define Maj(x, y, z) (((x) & (y)) ^ ((x) & (z)) ^ ((y) & (z)))
+#endif
+
+#if defined(__i386) || defined(__i386__) || defined(_M_IX86)
/*
* This code should give better results on 32-bit CPU with less than
* ~24 registers, both size and performance wise...
*/
static void sha512_block_data_order(SHA512_CTX *ctx, const void *in,
- size_t num)
+ size_t num)
{
const SHA_LONG64 *W = in;
SHA_LONG64 A, E, T;
@@ -619,11 +601,11 @@ static void sha512_block_data_order(SHA512_CTX *ctx, const void *in,
F[7] = ctx->h[7];
for (i = 0; i < 16; i++, F--) {
-# ifdef B_ENDIAN
+#ifdef B_ENDIAN
T = W[i];
-# else
+#else
T = PULL64(W[i]);
-# endif
+#endif
F[0] = A;
F[4] = E;
F[8] = T;
@@ -658,10 +640,10 @@ static void sha512_block_data_order(SHA512_CTX *ctx, const void *in,
}
}
-# elif defined(OPENSSL_SMALL_FOOTPRINT)
+#elif defined(OPENSSL_SMALL_FOOTPRINT)
static void sha512_block_data_order(SHA512_CTX *ctx, const void *in,
- size_t num)
+ size_t num)
{
const SHA_LONG64 *W = in;
SHA_LONG64 a, b, c, d, e, f, g, h, s0, s1, T1, T2;
@@ -680,11 +662,11 @@ static void sha512_block_data_order(SHA512_CTX *ctx, const void *in,
h = ctx->h[7];
for (i = 0; i < 16; i++) {
-# ifdef B_ENDIAN
+#ifdef B_ENDIAN
T1 = X[i] = W[i];
-# else
+#else
T1 = X[i] = PULL64(W[i]);
-# endif
+#endif
T1 += h + Sigma1(e) + Ch(e, f, g) + K512[i];
T2 = Sigma0(a) + Maj(a, b, c);
h = g;
@@ -729,23 +711,30 @@ static void sha512_block_data_order(SHA512_CTX *ctx, const void *in,
}
}
-# else
-# define ROUND_00_15(i,a,b,c,d,e,f,g,h) do { \
- T1 += h + Sigma1(e) + Ch(e,f,g) + K512[i]; \
- h = Sigma0(a) + Maj(a,b,c); \
- d += T1; h += T1; } while (0)
-
-# define ROUND_16_80(i,j,a,b,c,d,e,f,g,h,X) do { \
- s0 = X[(j+1)&0x0f]; s0 = sigma0(s0); \
- s1 = X[(j+14)&0x0f]; s1 = sigma1(s1); \
- T1 = X[(j)&0x0f] += s0 + s1 + X[(j+9)&0x0f]; \
- ROUND_00_15(i+j,a,b,c,d,e,f,g,h); } while (0)
+#else
+#define ROUND_00_15(i, a, b, c, d, e, f, g, h) \
+ do { \
+ T1 += h + Sigma1(e) + Ch(e, f, g) + K512[i]; \
+ h = Sigma0(a) + Maj(a, b, c); \
+ d += T1; \
+ h += T1; \
+ } while (0)
+
+#define ROUND_16_80(i, j, a, b, c, d, e, f, g, h, X) \
+ do { \
+ s0 = X[(j + 1) & 0x0f]; \
+ s0 = sigma0(s0); \
+ s1 = X[(j + 14) & 0x0f]; \
+ s1 = sigma1(s1); \
+ T1 = X[(j) & 0x0f] += s0 + s1 + X[(j + 9) & 0x0f]; \
+ ROUND_00_15(i + j, a, b, c, d, e, f, g, h); \
+ } while (0)
#ifdef INCLUDE_C_SHA512
void sha512_block_data_order_c(SHA512_CTX *ctx, const void *in, size_t num)
#else
static void sha512_block_data_order(SHA512_CTX *ctx, const void *in,
- size_t num)
+ size_t num)
#endif
{
const SHA_LONG64 *W = in;
@@ -764,7 +753,7 @@ static void sha512_block_data_order(SHA512_CTX *ctx, const void *in,
g = ctx->h[6];
h = ctx->h[7];
-# ifdef B_ENDIAN
+#ifdef B_ENDIAN
T1 = X[0] = W[0];
ROUND_00_15(0, a, b, c, d, e, f, g, h);
T1 = X[1] = W[1];
@@ -797,7 +786,7 @@ static void sha512_block_data_order(SHA512_CTX *ctx, const void *in,
ROUND_00_15(14, c, d, e, f, g, h, a, b);
T1 = X[15] = W[15];
ROUND_00_15(15, b, c, d, e, f, g, h, a);
-# else
+#else
T1 = X[0] = PULL64(W[0]);
ROUND_00_15(0, a, b, c, d, e, f, g, h);
T1 = X[1] = PULL64(W[1]);
@@ -830,7 +819,7 @@ static void sha512_block_data_order(SHA512_CTX *ctx, const void *in,
ROUND_00_15(14, c, d, e, f, g, h, a, b);
T1 = X[15] = PULL64(W[15]);
ROUND_00_15(15, b, c, d, e, f, g, h, a);
-# endif
+#endif
for (i = 16; i < 80; i += 16) {
ROUND_16_80(i, 0, a, b, c, d, e, f, g, h, X);
@@ -864,6 +853,6 @@ static void sha512_block_data_order(SHA512_CTX *ctx, const void *in,
}
}
-# endif
+#endif
-#endif /* SHA512_ASM */
+#endif /* SHA512_ASM */
diff --git a/crypto/sha/sha_local.h b/crypto/sha/sha_local.h
index 81de72ba4f..3879c57526 100644
--- a/crypto/sha/sha_local.h
+++ b/crypto/sha/sha_local.h
@@ -16,26 +16,31 @@
#define DATA_ORDER_IS_BIG_ENDIAN
-#define HASH_LONG SHA_LONG
-#define HASH_CTX SHA_CTX
-#define HASH_CBLOCK SHA_CBLOCK
-#define HASH_MAKE_STRING(c,s) do { \
- unsigned long ll; \
- ll=(c)->h0; (void)HOST_l2c(ll,(s)); \
- ll=(c)->h1; (void)HOST_l2c(ll,(s)); \
- ll=(c)->h2; (void)HOST_l2c(ll,(s)); \
- ll=(c)->h3; (void)HOST_l2c(ll,(s)); \
- ll=(c)->h4; (void)HOST_l2c(ll,(s)); \
- } while (0)
-
-#define HASH_UPDATE SHA1_Update
-#define HASH_TRANSFORM SHA1_Transform
-#define HASH_FINAL SHA1_Final
-#define HASH_INIT SHA1_Init
-#define HASH_BLOCK_DATA_ORDER sha1_block_data_order
-#define Xupdate(a,ix,ia,ib,ic,id) ( (a)=(ia^ib^ic^id), \
- ix=(a)=ROTATE((a),1) \
- )
+#define HASH_LONG SHA_LONG
+#define HASH_CTX SHA_CTX
+#define HASH_CBLOCK SHA_CBLOCK
+#define HASH_MAKE_STRING(c, s) \
+ do { \
+ unsigned long ll; \
+ ll = (c)->h0; \
+ (void)HOST_l2c(ll, (s)); \
+ ll = (c)->h1; \
+ (void)HOST_l2c(ll, (s)); \
+ ll = (c)->h2; \
+ (void)HOST_l2c(ll, (s)); \
+ ll = (c)->h3; \
+ (void)HOST_l2c(ll, (s)); \
+ ll = (c)->h4; \
+ (void)HOST_l2c(ll, (s)); \
+ } while (0)
+
+#define HASH_UPDATE SHA1_Update
+#define HASH_TRANSFORM SHA1_Transform
+#define HASH_FINAL SHA1_Final
+#define HASH_INIT SHA1_Init
+#define HASH_BLOCK_DATA_ORDER sha1_block_data_order
+#define Xupdate(a, ix, ia, ib, ic, id) ((a) = (ia ^ ib ^ ic ^ id), \
+ ix = (a) = ROTATE((a), 1))
#ifndef SHA1_ASM
static void sha1_block_data_order(SHA_CTX *c, const void *p, size_t num);
@@ -75,75 +80,75 @@ int HASH_INIT(SHA_CTX *c)
* I've just become aware of another tweak to be made, again from Wei Dai,
* in F_40_59, (x&a)|(y&a) -> (x|y)&a
*/
-#define F_00_19(b,c,d) ((((c) ^ (d)) & (b)) ^ (d))
-#define F_20_39(b,c,d) ((b) ^ (c) ^ (d))
-#define F_40_59(b,c,d) (((b) & (c)) | (((b)|(c)) & (d)))
-#define F_60_79(b,c,d) F_20_39(b,c,d)
+#define F_00_19(b, c, d) ((((c) ^ (d)) & (b)) ^ (d))
+#define F_20_39(b, c, d) ((b) ^ (c) ^ (d))
+#define F_40_59(b, c, d) (((b) & (c)) | (((b) | (c)) & (d)))
+#define F_60_79(b, c, d) F_20_39(b, c, d)
#ifndef OPENSSL_SMALL_FOOTPRINT
-# define BODY_00_15(i,a,b,c,d,e,f,xi) \
- (f)=xi+(e)+K_00_19+ROTATE((a),5)+F_00_19((b),(c),(d)); \
- (b)=ROTATE((b),30);
-
-# define BODY_16_19(i,a,b,c,d,e,f,xi,xa,xb,xc,xd) \
- Xupdate(f,xi,xa,xb,xc,xd); \
- (f)+=(e)+K_00_19+ROTATE((a),5)+F_00_19((b),(c),(d)); \
- (b)=ROTATE((b),30);
-
-# define BODY_20_31(i,a,b,c,d,e,f,xi,xa,xb,xc,xd) \
- Xupdate(f,xi,xa,xb,xc,xd); \
- (f)+=(e)+K_20_39+ROTATE((a),5)+F_20_39((b),(c),(d)); \
- (b)=ROTATE((b),30);
-
-# define BODY_32_39(i,a,b,c,d,e,f,xa,xb,xc,xd) \
- Xupdate(f,xa,xa,xb,xc,xd); \
- (f)+=(e)+K_20_39+ROTATE((a),5)+F_20_39((b),(c),(d)); \
- (b)=ROTATE((b),30);
-
-# define BODY_40_59(i,a,b,c,d,e,f,xa,xb,xc,xd) \
- Xupdate(f,xa,xa,xb,xc,xd); \
- (f)+=(e)+K_40_59+ROTATE((a),5)+F_40_59((b),(c),(d)); \
- (b)=ROTATE((b),30);
-
-# define BODY_60_79(i,a,b,c,d,e,f,xa,xb,xc,xd) \
- Xupdate(f,xa,xa,xb,xc,xd); \
- (f)=xa+(e)+K_60_79+ROTATE((a),5)+F_60_79((b),(c),(d)); \
- (b)=ROTATE((b),30);
-
-# ifdef X
-# undef X
-# endif
-# ifndef MD32_XARRAY
- /*
- * Originally X was an array. As it's automatic it's natural
- * to expect RISC compiler to accommodate at least part of it in
- * the register bank, isn't it? Unfortunately not all compilers
- * "find" this expectation reasonable:-( On order to make such
- * compilers generate better code I replace X[] with a bunch of
- * X0, X1, etc. See the function body below...
- */
-# define X(i) XX##i
-# else
- /*
- * However! Some compilers (most notably HP C) get overwhelmed by
- * that many local variables so that we have to have the way to
- * fall down to the original behavior.
- */
-# define X(i) XX[i]
-# endif
-
-# if !defined(SHA1_ASM)
+#define BODY_00_15(i, a, b, c, d, e, f, xi) \
+ (f) = xi + (e) + K_00_19 + ROTATE((a), 5) + F_00_19((b), (c), (d)); \
+ (b) = ROTATE((b), 30);
+
+#define BODY_16_19(i, a, b, c, d, e, f, xi, xa, xb, xc, xd) \
+ Xupdate(f, xi, xa, xb, xc, xd); \
+ (f) += (e) + K_00_19 + ROTATE((a), 5) + F_00_19((b), (c), (d)); \
+ (b) = ROTATE((b), 30);
+
+#define BODY_20_31(i, a, b, c, d, e, f, xi, xa, xb, xc, xd) \
+ Xupdate(f, xi, xa, xb, xc, xd); \
+ (f) += (e) + K_20_39 + ROTATE((a), 5) + F_20_39((b), (c), (d)); \
+ (b) = ROTATE((b), 30);
+
+#define BODY_32_39(i, a, b, c, d, e, f, xa, xb, xc, xd) \
+ Xupdate(f, xa, xa, xb, xc, xd); \
+ (f) += (e) + K_20_39 + ROTATE((a), 5) + F_20_39((b), (c), (d)); \
+ (b) = ROTATE((b), 30);
+
+#define BODY_40_59(i, a, b, c, d, e, f, xa, xb, xc, xd) \
+ Xupdate(f, xa, xa, xb, xc, xd); \
+ (f) += (e) + K_40_59 + ROTATE((a), 5) + F_40_59((b), (c), (d)); \
+ (b) = ROTATE((b), 30);
+
+#define BODY_60_79(i, a, b, c, d, e, f, xa, xb, xc, xd) \
+ Xupdate(f, xa, xa, xb, xc, xd); \
+ (f) = xa + (e) + K_60_79 + ROTATE((a), 5) + F_60_79((b), (c), (d)); \
+ (b) = ROTATE((b), 30);
+
+#ifdef X
+#undef X
+#endif
+#ifndef MD32_XARRAY
+/*
+ * Originally X was an array. As it's automatic it's natural
+ * to expect RISC compiler to accommodate at least part of it in
+ * the register bank, isn't it? Unfortunately not all compilers
+ * "find" this expectation reasonable:-( On order to make such
+ * compilers generate better code I replace X[] with a bunch of
+ * X0, X1, etc. See the function body below...
+ */
+#define X(i) XX##i
+#else
+/*
+ * However! Some compilers (most notably HP C) get overwhelmed by
+ * that many local variables so that we have to have the way to
+ * fall down to the original behavior.
+ */
+#define X(i) XX[i]
+#endif
+
+#if !defined(SHA1_ASM)
static void HASH_BLOCK_DATA_ORDER(SHA_CTX *c, const void *p, size_t num)
{
const unsigned char *data = p;
register unsigned MD32_REG_T A, B, C, D, E, T, l;
-# ifndef MD32_XARRAY
+#ifndef MD32_XARRAY
unsigned MD32_REG_T XX0, XX1, XX2, XX3, XX4, XX5, XX6, XX7,
XX8, XX9, XX10, XX11, XX12, XX13, XX14, XX15;
-# else
+#else
SHA_LONG XX[16];
-# endif
+#endif
A = c->h0;
B = c->h1;
@@ -326,43 +331,52 @@ static void HASH_BLOCK_DATA_ORDER(SHA_CTX *c, const void *p, size_t num)
C = c->h2;
D = c->h3;
E = c->h4;
-
}
}
-# endif
-
-#else /* OPENSSL_SMALL_FOOTPRINT */
-
-# define BODY_00_15(xi) do { \
- T=E+K_00_19+F_00_19(B,C,D); \
- E=D, D=C, C=ROTATE(B,30), B=A; \
- A=ROTATE(A,5)+T+xi; } while(0)
-
-# define BODY_16_19(xa,xb,xc,xd) do { \
- Xupdate(T,xa,xa,xb,xc,xd); \
- T+=E+K_00_19+F_00_19(B,C,D); \
- E=D, D=C, C=ROTATE(B,30), B=A; \
- A=ROTATE(A,5)+T; } while(0)
-
-# define BODY_20_39(xa,xb,xc,xd) do { \
- Xupdate(T,xa,xa,xb,xc,xd); \
- T+=E+K_20_39+F_20_39(B,C,D); \
- E=D, D=C, C=ROTATE(B,30), B=A; \
- A=ROTATE(A,5)+T; } while(0)
-
-# define BODY_40_59(xa,xb,xc,xd) do { \
- Xupdate(T,xa,xa,xb,xc,xd); \
- T+=E+K_40_59+F_40_59(B,C,D); \
- E=D, D=C, C=ROTATE(B,30), B=A; \
- A=ROTATE(A,5)+T; } while(0)
-
-# define BODY_60_79(xa,xb,xc,xd) do { \
- Xupdate(T,xa,xa,xb,xc,xd); \
- T=E+K_60_79+F_60_79(B,C,D); \
- E=D, D=C, C=ROTATE(B,30), B=A; \
- A=ROTATE(A,5)+T+xa; } while(0)
-
-# if !defined(SHA1_ASM)
+#endif
+
+#else /* OPENSSL_SMALL_FOOTPRINT */
+
+#define BODY_00_15(xi) \
+ do { \
+ T = E + K_00_19 + F_00_19(B, C, D); \
+ E = D, D = C, C = ROTATE(B, 30), B = A; \
+ A = ROTATE(A, 5) + T + xi; \
+ } while (0)
+
+#define BODY_16_19(xa, xb, xc, xd) \
+ do { \
+ Xupdate(T, xa, xa, xb, xc, xd); \
+ T += E + K_00_19 + F_00_19(B, C, D); \
+ E = D, D = C, C = ROTATE(B, 30), B = A; \
+ A = ROTATE(A, 5) + T; \
+ } while (0)
+
+#define BODY_20_39(xa, xb, xc, xd) \
+ do { \
+ Xupdate(T, xa, xa, xb, xc, xd); \
+ T += E + K_20_39 + F_20_39(B, C, D); \
+ E = D, D = C, C = ROTATE(B, 30), B = A; \
+ A = ROTATE(A, 5) + T; \
+ } while (0)
+
+#define BODY_40_59(xa, xb, xc, xd) \
+ do { \
+ Xupdate(T, xa, xa, xb, xc, xd); \
+ T += E + K_40_59 + F_40_59(B, C, D); \
+ E = D, D = C, C = ROTATE(B, 30), B = A; \
+ A = ROTATE(A, 5) + T; \
+ } while (0)
+
+#define BODY_60_79(xa, xb, xc, xd) \
+ do { \
+ Xupdate(T, xa, xa, xb, xc, xd); \
+ T = E + K_60_79 + F_60_79(B, C, D); \
+ E = D, D = C, C = ROTATE(B, 30), B = A; \
+ A = ROTATE(A, 5) + T + xa; \
+ } while (0)
+
+#if !defined(SHA1_ASM)
static void HASH_BLOCK_DATA_ORDER(SHA_CTX *c, const void *p, size_t num)
{
const unsigned char *data = p;
@@ -387,15 +401,15 @@ static void HASH_BLOCK_DATA_ORDER(SHA_CTX *c, const void *p, size_t num)
}
for (; i < 24; i++) {
BODY_20_39(X[i & 15], X[(i + 2) & 15], X[(i + 8) & 15],
- X[(i + 13) & 15]);
+ X[(i + 13) & 15]);
}
for (i = 0; i < 20; i++) {
BODY_40_59(X[(i + 8) & 15], X[(i + 10) & 15], X[i & 15],
- X[(i + 5) & 15]);
+ X[(i + 5) & 15]);
}
for (i = 4; i < 24; i++) {
BODY_60_79(X[(i + 8) & 15], X[(i + 10) & 15], X[i & 15],
- X[(i + 5) & 15]);
+ X[(i + 5) & 15]);
}
c->h0 = (c->h0 + A) & 0xffffffffL;
@@ -412,9 +426,8 @@ static void HASH_BLOCK_DATA_ORDER(SHA_CTX *c, const void *p, size_t num)
C = c->h2;
D = c->h3;
E = c->h4;
-
}
}
-# endif
+#endif
#endif
diff --git a/crypto/sha/sha_ppc.c b/crypto/sha/sha_ppc.c
index accf19d8a2..9853a2321a 100644
--- a/crypto/sha/sha_ppc.c
+++ b/crypto/sha/sha_ppc.c
@@ -19,8 +19,7 @@ void sha256_block_ppc(void *ctx, const void *inp, size_t len);
void sha256_block_data_order(void *ctx, const void *inp, size_t len);
void sha256_block_data_order(void *ctx, const void *inp, size_t len)
{
- OPENSSL_ppccap_P & PPC_CRYPTO207 ? sha256_block_p8(ctx, inp, len) :
- sha256_block_ppc(ctx, inp, len);
+ OPENSSL_ppccap_P &PPC_CRYPTO207 ? sha256_block_p8(ctx, inp, len) : sha256_block_ppc(ctx, inp, len);
}
void sha512_block_p8(void *ctx, const void *inp, size_t len);
@@ -28,6 +27,5 @@ void sha512_block_ppc(void *ctx, const void *inp, size_t len);
void sha512_block_data_order(void *ctx, const void *inp, size_t len);
void sha512_block_data_order(void *ctx, const void *inp, size_t len)
{
- OPENSSL_ppccap_P & PPC_CRYPTO207 ? sha512_block_p8(ctx, inp, len) :
- sha512_block_ppc(ctx, inp, len);
+ OPENSSL_ppccap_P &PPC_CRYPTO207 ? sha512_block_p8(ctx, inp, len) : sha512_block_ppc(ctx, inp, len);
}
diff --git a/crypto/sha/sha_riscv.c b/crypto/sha/sha_riscv.c
index 9cf4d22976..5a0eaaf11b 100644
--- a/crypto/sha/sha_riscv.c
+++ b/crypto/sha/sha_riscv.c
@@ -15,15 +15,14 @@
#include "crypto/riscv_arch.h"
void sha256_block_data_order_zvkb_zvknha_or_zvknhb(void *ctx, const void *in,
- size_t num);
+ size_t num);
void sha256_block_data_order_zbb(void *ctx, const void *in, size_t num);
void sha256_block_data_order_riscv64(void *ctx, const void *in, size_t num);
void sha256_block_data_order(SHA256_CTX *ctx, const void *in, size_t num);
void sha256_block_data_order(SHA256_CTX *ctx, const void *in, size_t num)
{
- if (RISCV_HAS_ZVKB() && (RISCV_HAS_ZVKNHA() || RISCV_HAS_ZVKNHB()) &&
- riscv_vlen() >= 128) {
+ if (RISCV_HAS_ZVKB() && (RISCV_HAS_ZVKNHA() || RISCV_HAS_ZVKNHB()) && riscv_vlen() >= 128) {
sha256_block_data_order_zvkb_zvknha_or_zvknhb(ctx, in, num);
} else if (RISCV_HAS_ZBB()) {
sha256_block_data_order_zbb(ctx, in, num);
diff --git a/crypto/siphash/siphash.c b/crypto/siphash/siphash.c
index 3d05754239..0b50d8b69f 100644
--- a/crypto/siphash/siphash.c
+++ b/crypto/siphash/siphash.c
@@ -31,38 +31,35 @@
#define ROTL(x, b) (uint64_t)(((x) << (b)) | ((x) >> (64 - (b))))
-#define U32TO8_LE(p, v) \
- (p)[0] = (uint8_t)((v)); \
- (p)[1] = (uint8_t)((v) >> 8); \
- (p)[2] = (uint8_t)((v) >> 16); \
+#define U32TO8_LE(p, v) \
+ (p)[0] = (uint8_t)((v)); \
+ (p)[1] = (uint8_t)((v) >> 8); \
+ (p)[2] = (uint8_t)((v) >> 16); \
(p)[3] = (uint8_t)((v) >> 24);
-#define U64TO8_LE(p, v) \
- U32TO8_LE((p), (uint32_t)((v))); \
+#define U64TO8_LE(p, v) \
+ U32TO8_LE((p), (uint32_t)((v))); \
U32TO8_LE((p) + 4, (uint32_t)((v) >> 32));
-#define U8TO64_LE(p) \
- (((uint64_t)((p)[0])) | ((uint64_t)((p)[1]) << 8) | \
- ((uint64_t)((p)[2]) << 16) | ((uint64_t)((p)[3]) << 24) | \
- ((uint64_t)((p)[4]) << 32) | ((uint64_t)((p)[5]) << 40) | \
- ((uint64_t)((p)[6]) << 48) | ((uint64_t)((p)[7]) << 56))
-
-#define SIPROUND \
- do { \
- v0 += v1; \
- v1 = ROTL(v1, 13); \
- v1 ^= v0; \
- v0 = ROTL(v0, 32); \
- v2 += v3; \
- v3 = ROTL(v3, 16); \
- v3 ^= v2; \
- v0 += v3; \
- v3 = ROTL(v3, 21); \
- v3 ^= v0; \
- v2 += v1; \
- v1 = ROTL(v1, 17); \
- v1 ^= v2; \
- v2 = ROTL(v2, 32); \
+#define U8TO64_LE(p) \
+ (((uint64_t)((p)[0])) | ((uint64_t)((p)[1]) << 8) | ((uint64_t)((p)[2]) << 16) | ((uint64_t)((p)[3]) << 24) | ((uint64_t)((p)[4]) << 32) | ((uint64_t)((p)[5]) << 40) | ((uint64_t)((p)[6]) << 48) | ((uint64_t)((p)[7]) << 56))
+
+#define SIPROUND \
+ do { \
+ v0 += v1; \
+ v1 = ROTL(v1, 13); \
+ v1 ^= v0; \
+ v0 = ROTL(v0, 32); \
+ v2 += v3; \
+ v3 = ROTL(v3, 16); \
+ v3 ^= v2; \
+ v0 += v3; \
+ v3 = ROTL(v3, 21); \
+ v3 ^= v0; \
+ v2 += v1; \
+ v1 = ROTL(v1, 17); \
+ v1 ^= v2; \
+ v2 = ROTL(v2, 32); \
} while (0)
size_t SipHash_ctx_size(void)
@@ -172,7 +169,7 @@ void SipHash_Update(SIPHASH *ctx, const unsigned char *in, size_t inlen)
SIPROUND;
v0 ^= m;
}
- left = inlen & (SIPHASH_BLOCK_SIZE-1); /* gets put into leavings */
+ left = inlen & (SIPHASH_BLOCK_SIZE - 1); /* gets put into leavings */
end = in + inlen - left;
for (; in != end; in += 8) {
@@ -224,7 +221,7 @@ int SipHash_Final(SIPHASH *ctx, unsigned char *out, size_t outlen)
b |= ((uint64_t)ctx->leavings[2]) << 16;
/* fall through */
case 2:
- b |= ((uint64_t)ctx->leavings[1]) << 8;
+ b |= ((uint64_t)ctx->leavings[1]) << 8;
/* fall through */
case 1:
b |= ((uint64_t)ctx->leavings[0]);
@@ -242,14 +239,14 @@ int SipHash_Final(SIPHASH *ctx, unsigned char *out, size_t outlen)
v2 ^= 0xff;
for (i = 0; i < ctx->drounds; ++i)
SIPROUND;
- b = v0 ^ v1 ^ v2 ^ v3;
+ b = v0 ^ v1 ^ v2 ^ v3;
U64TO8_LE(out, b);
if (ctx->hash_size == SIPHASH_MIN_DIGEST_SIZE)
return 1;
v1 ^= 0xdd;
for (i = 0; i < ctx->drounds; ++i)
SIPROUND;
- b = v0 ^ v1 ^ v2 ^ v3;
+ b = v0 ^ v1 ^ v2 ^ v3;
U64TO8_LE(out + 8, b);
return 1;
}
diff --git a/crypto/sleep.c b/crypto/sleep.c
index 08fb064d83..9273995be6 100644
--- a/crypto/sleep.c
+++ b/crypto/sleep.c
@@ -14,8 +14,8 @@
/* system-specific variants defining OSSL_sleep() */
#if (defined(OPENSSL_SYS_UNIX) || defined(__DJGPP__)) && !defined(OPENSSL_USE_SLEEP_BUSYLOOP)
-# if defined(OPENSSL_USE_USLEEP) \
- || defined(__DJGPP__) \
+#if defined(OPENSSL_USE_USLEEP) \
+ || defined(__DJGPP__) \
|| (defined(__TANDEM) && defined(_REENTRANT))
/*
@@ -26,7 +26,7 @@
* usleep, if it turns out that nanosleep() is unavailable.
*/
-# include <unistd.h>
+#include <unistd.h>
static void ossl_sleep_millis(uint64_t millis)
{
unsigned int s = (unsigned int)(millis / 1000);
@@ -43,31 +43,31 @@ static void ossl_sleep_millis(uint64_t millis)
usleep(us);
}
-# elif defined(__TANDEM) && !defined(_REENTRANT)
+#elif defined(__TANDEM) && !defined(_REENTRANT)
-# include <cextdecs.h(PROCESS_DELAY_)>
+#include <cextdecs.h(PROCESS_DELAY_)>
static void ossl_sleep_millis(uint64_t millis)
{
/* HPNS does not support usleep for non threaded apps */
PROCESS_DELAY_(millis * 1000);
}
-# else
+#else
/* nanosleep is defined by POSIX.1-2001 */
-# include <time.h>
+#include <time.h>
static void ossl_sleep_millis(uint64_t millis)
{
struct timespec ts;
- ts.tv_sec = (long int) (millis / 1000);
- ts.tv_nsec = (long int) (millis % 1000) * 1000000ul;
+ ts.tv_sec = (long int)(millis / 1000);
+ ts.tv_nsec = (long int)(millis % 1000) * 1000000ul;
nanosleep(&ts, NULL);
}
-# endif
+#endif
#elif defined(_WIN32) && !defined(OPENSSL_SYS_UEFI)
-# include <windows.h>
+#include <windows.h>
static void ossl_sleep_millis(uint64_t millis)
{
@@ -84,7 +84,7 @@ static void ossl_sleep_millis(uint64_t millis)
#else
/* Fallback to a busy wait */
-# define USE_SLEEP_SECS
+#define USE_SLEEP_SECS
static void ossl_sleep_secs(uint64_t secs)
{
@@ -106,7 +106,7 @@ static void ossl_sleep_millis(uint64_t millis)
= ossl_time_add(ossl_time_now(), ossl_ms2time(millis));
while (ossl_time_compare(ossl_time_now(), finish) < 0)
- /* busy wait */ ;
+ /* busy wait */;
}
#endif /* defined(OPENSSL_SYS_UNIX) || defined(__DJGPP__) */
diff --git a/crypto/slh_dsa/slh_adrs.c b/crypto/slh_dsa/slh_adrs.c
index 595a129c5a..e6fbfe6b8c 100644
--- a/crypto/slh_dsa/slh_adrs.c
+++ b/crypto/slh_dsa/slh_adrs.c
@@ -11,28 +11,28 @@
#include "slh_adrs.h"
/* See FIPS 205 - Section 4.3 Table 1 Uncompressed Addresses */
-#define SLH_ADRS_OFF_LAYER_ADR 0
-#define SLH_ADRS_OFF_TREE_ADR 4
-#define SLH_ADRS_OFF_TYPE 16
-#define SLH_ADRS_OFF_KEYPAIR_ADDR 20
-#define SLH_ADRS_OFF_CHAIN_ADDR 24
-#define SLH_ADRS_OFF_HASH_ADDR 28
-#define SLH_ADRS_OFF_TREE_INDEX SLH_ADRS_OFF_HASH_ADDR
-#define SLH_ADRS_SIZE_TYPE 4
+#define SLH_ADRS_OFF_LAYER_ADR 0
+#define SLH_ADRS_OFF_TREE_ADR 4
+#define SLH_ADRS_OFF_TYPE 16
+#define SLH_ADRS_OFF_KEYPAIR_ADDR 20
+#define SLH_ADRS_OFF_CHAIN_ADDR 24
+#define SLH_ADRS_OFF_HASH_ADDR 28
+#define SLH_ADRS_OFF_TREE_INDEX SLH_ADRS_OFF_HASH_ADDR
+#define SLH_ADRS_SIZE_TYPE 4
/* Number of bytes after type to clear */
-#define SLH_ADRS_SIZE_TYPECLEAR SLH_ADRS_SIZE - (SLH_ADRS_OFF_TYPE + SLH_ADRS_SIZE_TYPE)
-#define SLH_ADRS_SIZE_KEYPAIR_ADDR 4
+#define SLH_ADRS_SIZE_TYPECLEAR SLH_ADRS_SIZE - (SLH_ADRS_OFF_TYPE + SLH_ADRS_SIZE_TYPE)
+#define SLH_ADRS_SIZE_KEYPAIR_ADDR 4
/* See FIPS 205 - Section 11.2 Table 3 Compressed Addresses */
-#define SLH_ADRSC_OFF_LAYER_ADR 0
-#define SLH_ADRSC_OFF_TREE_ADR 1
-#define SLH_ADRSC_OFF_TYPE 9
-#define SLH_ADRSC_OFF_KEYPAIR_ADDR 10
-#define SLH_ADRSC_OFF_CHAIN_ADDR 14
-#define SLH_ADRSC_OFF_HASH_ADDR 18
-#define SLH_ADRSC_OFF_TREE_INDEX SLH_ADRSC_OFF_HASH_ADDR
-#define SLH_ADRSC_SIZE_TYPE 1
-#define SLH_ADRSC_SIZE_TYPECLEAR SLH_ADRS_SIZE_TYPECLEAR
+#define SLH_ADRSC_OFF_LAYER_ADR 0
+#define SLH_ADRSC_OFF_TREE_ADR 1
+#define SLH_ADRSC_OFF_TYPE 9
+#define SLH_ADRSC_OFF_KEYPAIR_ADDR 10
+#define SLH_ADRSC_OFF_CHAIN_ADDR 14
+#define SLH_ADRSC_OFF_HASH_ADDR 18
+#define SLH_ADRSC_OFF_TREE_INDEX SLH_ADRSC_OFF_HASH_ADDR
+#define SLH_ADRSC_SIZE_TYPE 1
+#define SLH_ADRSC_SIZE_TYPECLEAR SLH_ADRS_SIZE_TYPECLEAR
#define SLH_ADRSC_SIZE_KEYPAIR_ADDR SLH_ADRS_SIZE_KEYPAIR_ADDR
#define slh_adrs_set_tree_height slh_adrs_set_chain_address
@@ -91,7 +91,7 @@ static void slh_adrs_set_keypair_address(uint8_t *adrs, uint32_t in)
static void slh_adrs_copy_keypair_address(uint8_t *dst, const uint8_t *src)
{
memcpy(dst + SLH_ADRS_OFF_KEYPAIR_ADDR, src + SLH_ADRS_OFF_KEYPAIR_ADDR,
- SLH_ADRS_SIZE_KEYPAIR_ADDR);
+ SLH_ADRS_SIZE_KEYPAIR_ADDR);
}
static void slh_adrs_set_chain_address(uint8_t *adrs, uint32_t in)
{
@@ -131,7 +131,7 @@ static void slh_adrsc_set_keypair_address(uint8_t *adrsc, uint32_t in)
static void slh_adrsc_copy_keypair_address(uint8_t *dst, const uint8_t *src)
{
memcpy(dst + SLH_ADRSC_OFF_KEYPAIR_ADDR, src + SLH_ADRSC_OFF_KEYPAIR_ADDR,
- SLH_ADRSC_SIZE_KEYPAIR_ADDR);
+ SLH_ADRSC_SIZE_KEYPAIR_ADDR);
}
static void slh_adrsc_set_chain_address(uint8_t *adrsc, uint32_t in)
{
diff --git a/crypto/slh_dsa/slh_adrs.h b/crypto/slh_dsa/slh_adrs.h
index e8219ebfb8..556d0ad286 100644
--- a/crypto/slh_dsa/slh_adrs.h
+++ b/crypto/slh_dsa/slh_adrs.h
@@ -20,39 +20,39 @@
* The compressed format is discussed in Section 11.2.
*/
-#define SLH_ADRS_SIZE 32 /* size of the ADRS blob */
-#define SLH_ADRSC_SIZE 22 /* size of a compact ADRS blob */
+#define SLH_ADRS_SIZE 32 /* size of the ADRS blob */
+#define SLH_ADRSC_SIZE 22 /* size of a compact ADRS blob */
#define SLH_ADRS_SIZE_MAX SLH_ADRS_SIZE
/* 7 Different types of addresses */
-#define SLH_ADRS_TYPE_WOTS_HASH 0
-#define SLH_ADRS_TYPE_WOTS_PK 1
-#define SLH_ADRS_TYPE_TREE 2
-#define SLH_ADRS_TYPE_FORS_TREE 3
+#define SLH_ADRS_TYPE_WOTS_HASH 0
+#define SLH_ADRS_TYPE_WOTS_PK 1
+#define SLH_ADRS_TYPE_TREE 2
+#define SLH_ADRS_TYPE_FORS_TREE 3
#define SLH_ADRS_TYPE_FORS_ROOTS 4
-#define SLH_ADRS_TYPE_WOTS_PRF 5
-#define SLH_ADRS_TYPE_FORS_PRF 6
+#define SLH_ADRS_TYPE_WOTS_PRF 5
+#define SLH_ADRS_TYPE_FORS_PRF 6
#define SLH_ADRS_DECLARE(a) uint8_t a[SLH_ADRS_SIZE_MAX]
#define SLH_ADRS_FUNC_DECLARE(ctx, adrsf) \
const SLH_ADRS_FUNC *adrsf = ctx->adrs_func
#define SLH_ADRS_FN_DECLARE(adrsf, t) OSSL_SLH_ADRS_FUNC_##t *t = adrsf->t
-typedef void (OSSL_SLH_ADRS_FUNC_zero)(uint8_t *adrs);
-typedef void (OSSL_SLH_ADRS_FUNC_copy)(uint8_t *dst, const uint8_t *src);
-typedef void (OSSL_SLH_ADRS_FUNC_copy_keypair_address)(uint8_t *dst, const uint8_t *src);
+typedef void(OSSL_SLH_ADRS_FUNC_zero)(uint8_t *adrs);
+typedef void(OSSL_SLH_ADRS_FUNC_copy)(uint8_t *dst, const uint8_t *src);
+typedef void(OSSL_SLH_ADRS_FUNC_copy_keypair_address)(uint8_t *dst, const uint8_t *src);
/*
* Note that the tree address is actually 12 bytes in uncompressed format,
* but we only use 8 bytes
*/
-typedef void (OSSL_SLH_ADRS_FUNC_set_tree_address)(uint8_t *adrs, uint64_t in);
-typedef void (OSSL_SLH_ADRS_FUNC_set_layer_address)(uint8_t *adrs, uint32_t layer);
-typedef void (OSSL_SLH_ADRS_FUNC_set_type_and_clear)(uint8_t *adrs, uint32_t type);
-typedef void (OSSL_SLH_ADRS_FUNC_set_keypair_address)(uint8_t *adrs, uint32_t in);
-typedef void (OSSL_SLH_ADRS_FUNC_set_chain_address)(uint8_t *adrs, uint32_t in);
-typedef void (OSSL_SLH_ADRS_FUNC_set_tree_height)(uint8_t *adrs, uint32_t in);
-typedef void (OSSL_SLH_ADRS_FUNC_set_hash_address)(uint8_t *adrs, uint32_t in);
-typedef void (OSSL_SLH_ADRS_FUNC_set_tree_index)(uint8_t *adrs, uint32_t in);
+typedef void(OSSL_SLH_ADRS_FUNC_set_tree_address)(uint8_t *adrs, uint64_t in);
+typedef void(OSSL_SLH_ADRS_FUNC_set_layer_address)(uint8_t *adrs, uint32_t layer);
+typedef void(OSSL_SLH_ADRS_FUNC_set_type_and_clear)(uint8_t *adrs, uint32_t type);
+typedef void(OSSL_SLH_ADRS_FUNC_set_keypair_address)(uint8_t *adrs, uint32_t in);
+typedef void(OSSL_SLH_ADRS_FUNC_set_chain_address)(uint8_t *adrs, uint32_t in);
+typedef void(OSSL_SLH_ADRS_FUNC_set_tree_height)(uint8_t *adrs, uint32_t in);
+typedef void(OSSL_SLH_ADRS_FUNC_set_hash_address)(uint8_t *adrs, uint32_t in);
+typedef void(OSSL_SLH_ADRS_FUNC_set_tree_index)(uint8_t *adrs, uint32_t in);
typedef struct slh_adrs_func_st {
OSSL_SLH_ADRS_FUNC_set_layer_address *set_layer_address;
diff --git a/crypto/slh_dsa/slh_dsa.c b/crypto/slh_dsa/slh_dsa.c
index 6c7b913d2f..77c20daceb 100644
--- a/crypto/slh_dsa/slh_dsa.c
+++ b/crypto/slh_dsa/slh_dsa.c
@@ -18,7 +18,7 @@
#define MD_LEN(params) (((params)->k * (params)->a + 7) >> 3)
static int get_tree_ids(PACKET *pkt, const SLH_DSA_PARAMS *params,
- uint64_t *tree_id, uint32_t *leaf_id);
+ uint64_t *tree_id, uint32_t *leaf_id);
/**
* @brief SLH-DSA Signature generation
@@ -40,9 +40,9 @@ static int get_tree_ids(PACKET *pkt, const SLH_DSA_PARAMS *params,
* @returns 1 if the signature generation succeeded or 0 otherwise.
*/
static int slh_sign_internal(SLH_DSA_HASH_CTX *hctx,
- const uint8_t *msg, size_t msg_len,
- uint8_t *sig, size_t *sig_len, size_t sig_size,
- const uint8_t *opt_rand)
+ const uint8_t *msg, size_t msg_len,
+ uint8_t *sig, size_t *sig_len, size_t sig_size,
+ const uint8_t *opt_rand)
{
int ret = 0;
const SLH_DSA_KEY *priv = hctx->key;
@@ -71,7 +71,7 @@ static int slh_sign_internal(SLH_DSA_HASH_CTX *hctx,
if (sig_size < sig_len_expected) {
ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_SIGNATURE_SIZE,
- "is %zu, should be at least %zu", sig_size, sig_len_expected);
+ "is %zu, should be at least %zu", sig_size, sig_len_expected);
return 0;
}
/* Exit if private key is not set */
@@ -95,13 +95,13 @@ static int slh_sign_internal(SLH_DSA_HASH_CTX *hctx,
/* calculate Randomness value r, and output to the SLH-DSA signature */
r = WPACKET_get_curr(wpkt);
if (!hashf->PRF_MSG(hctx, SLH_DSA_SK_PRF(priv), opt_rand, msg, msg_len, wpkt)
- /* generate a digest of size |params->m| bytes where m is (30..49) */
- || !hashf->H_MSG(hctx, r, pk_seed, SLH_DSA_PK_ROOT(priv), msg, msg_len,
- m_digest, sizeof(m_digest))
- /* Grab the first md_len bytes of m_digest to use in fors_sign() */
- || !PACKET_get_bytes(rpkt, &md, md_len)
- /* Grab remaining bytes from m_digest to select tree and leaf id's */
- || !get_tree_ids(rpkt, params, &tree_id, &leaf_id))
+ /* generate a digest of size |params->m| bytes where m is (30..49) */
+ || !hashf->H_MSG(hctx, r, pk_seed, SLH_DSA_PK_ROOT(priv), msg, msg_len,
+ m_digest, sizeof(m_digest))
+ /* Grab the first md_len bytes of m_digest to use in fors_sign() */
+ || !PACKET_get_bytes(rpkt, &md, md_len)
+ /* Grab remaining bytes from m_digest to select tree and leaf id's */
+ || !get_tree_ids(rpkt, params, &tree_id, &leaf_id))
goto err;
adrsf->set_tree_address(adrs, tree_id);
@@ -115,13 +115,13 @@ static int slh_sign_internal(SLH_DSA_HASH_CTX *hctx,
&& PACKET_buf_init(rpkt, sig_fors, WPACKET_get_curr(wpkt) - sig_fors)
/* Calculate the FORS public key using the generated FORS signature */
&& ossl_slh_fors_pk_from_sig(hctx, rpkt, md, pk_seed, adrs,
- pk_fors, sizeof(pk_fors))
+ pk_fors, sizeof(pk_fors))
/* Generate ht signature and append to the SLH-DSA signature */
&& ossl_slh_ht_sign(hctx, pk_fors, sk_seed, pk_seed, tree_id, leaf_id,
- wpkt);
+ wpkt);
*sig_len = sig_len_expected;
ret = 1;
- err:
+err:
if (!WPACKET_finish(wpkt))
ret = 0;
return ret;
@@ -145,8 +145,8 @@ static int slh_sign_internal(SLH_DSA_HASH_CTX *hctx,
* @returns 1 if the signature verification succeeded or 0 otherwise.
*/
static int slh_verify_internal(SLH_DSA_HASH_CTX *hctx,
- const uint8_t *msg, size_t msg_len,
- const uint8_t *sig, size_t sig_len)
+ const uint8_t *msg, size_t msg_len,
+ const uint8_t *sig, size_t sig_len)
{
const SLH_DSA_KEY *pub = hctx->key;
SLH_HASH_FUNC_DECLARE(pub, hashf);
@@ -173,7 +173,7 @@ static int slh_verify_internal(SLH_DSA_HASH_CTX *hctx,
/* Exit if signature is invalid size */
if (sig_len != params->sig_len
- || !PACKET_buf_init(sig_rpkt, sig, sig_len))
+ || !PACKET_buf_init(sig_rpkt, sig, sig_len))
return 0;
if (!PACKET_get_bytes(sig_rpkt, &r, n))
return 0;
@@ -184,7 +184,7 @@ static int slh_verify_internal(SLH_DSA_HASH_CTX *hctx,
pk_root = SLH_DSA_PK_ROOT(pub);
if (!hashf->H_MSG(hctx, r, pk_seed, pk_root, msg, msg_len,
- m_digest, sizeof(m_digest)))
+ m_digest, sizeof(m_digest)))
return 0;
/*
@@ -193,17 +193,17 @@ static int slh_verify_internal(SLH_DSA_HASH_CTX *hctx,
* from the remaining bytes in m_digest.
*/
if (!PACKET_buf_init(m_digest_rpkt, m_digest, sizeof(m_digest))
- || !PACKET_get_bytes(m_digest_rpkt, &md, md_len)
- || !get_tree_ids(m_digest_rpkt, params, &tree_id, &leaf_id))
+ || !PACKET_get_bytes(m_digest_rpkt, &md, md_len)
+ || !get_tree_ids(m_digest_rpkt, params, &tree_id, &leaf_id))
return 0;
adrsf->set_tree_address(adrs, tree_id);
adrsf->set_type_and_clear(adrs, SLH_ADRS_TYPE_FORS_TREE);
adrsf->set_keypair_address(adrs, leaf_id);
return ossl_slh_fors_pk_from_sig(hctx, sig_rpkt, md, pk_seed, adrs,
- pk_fors, sizeof(pk_fors))
+ pk_fors, sizeof(pk_fors))
&& ossl_slh_ht_verify(hctx, pk_fors, sig_rpkt, pk_seed,
- tree_id, leaf_id, pk_root)
+ tree_id, leaf_id, pk_root)
&& PACKET_remaining(sig_rpkt) == 0;
}
@@ -229,8 +229,8 @@ static int slh_verify_internal(SLH_DSA_HASH_CTX *hctx,
* is 0 then it returns |msg|. NULL is returned if there is a failure.
*/
static uint8_t *msg_encode(const uint8_t *msg, size_t msg_len,
- const uint8_t *ctx, size_t ctx_len, int encode,
- uint8_t *tmp, size_t tmp_len, size_t *out_len)
+ const uint8_t *ctx, size_t ctx_len, int encode,
+ uint8_t *tmp, size_t tmp_len, size_t *out_len)
{
uint8_t *encoded = NULL;
size_t encoded_len;
@@ -265,10 +265,10 @@ static uint8_t *msg_encode(const uint8_t *msg, size_t msg_len,
* @returns 1 on success, or 0 on error.
*/
int ossl_slh_dsa_sign(SLH_DSA_HASH_CTX *slh_ctx,
- const uint8_t *msg, size_t msg_len,
- const uint8_t *ctx, size_t ctx_len,
- const uint8_t *add_rand, int encode,
- unsigned char *sig, size_t *siglen, size_t sigsize)
+ const uint8_t *msg, size_t msg_len,
+ const uint8_t *ctx, size_t ctx_len,
+ const uint8_t *add_rand, int encode,
+ unsigned char *sig, size_t *siglen, size_t sigsize)
{
uint8_t m_tmp[1024], *m = m_tmp;
size_t m_len = 0;
@@ -276,7 +276,7 @@ int ossl_slh_dsa_sign(SLH_DSA_HASH_CTX *slh_ctx,
if (sig != NULL) {
m = msg_encode(msg, msg_len, ctx, ctx_len, encode, m_tmp, sizeof(m_tmp),
- &m_len);
+ &m_len);
if (m == NULL)
return 0;
}
@@ -291,9 +291,9 @@ int ossl_slh_dsa_sign(SLH_DSA_HASH_CTX *slh_ctx,
* @returns 1 on success, or 0 on error.
*/
int ossl_slh_dsa_verify(SLH_DSA_HASH_CTX *slh_ctx,
- const uint8_t *msg, size_t msg_len,
- const uint8_t *ctx, size_t ctx_len, int encode,
- const uint8_t *sig, size_t sig_len)
+ const uint8_t *msg, size_t msg_len,
+ const uint8_t *ctx, size_t ctx_len, int encode,
+ const uint8_t *sig, size_t sig_len)
{
uint8_t *m;
size_t m_len;
@@ -301,7 +301,7 @@ int ossl_slh_dsa_verify(SLH_DSA_HASH_CTX *slh_ctx,
int ret = 0;
m = msg_encode(msg, msg_len, ctx, ctx_len, encode, m_tmp, sizeof(m_tmp),
- &m_len);
+ &m_len);
if (m == NULL)
return 0;
@@ -332,7 +332,7 @@ static uint64_t bytes_to_u64_be(const uint8_t *in, size_t in_len)
* The sizes are determined by the |params| parameter set.
*/
static int get_tree_ids(PACKET *rpkt, const SLH_DSA_PARAMS *params,
- uint64_t *tree_id, uint32_t *leaf_id)
+ uint64_t *tree_id, uint32_t *leaf_id)
{
const uint8_t *tree_id_bytes, *leaf_id_bytes;
uint32_t tree_id_len, leaf_id_len;
@@ -342,7 +342,7 @@ static int get_tree_ids(PACKET *rpkt, const SLH_DSA_PARAMS *params,
leaf_id_len = ((params->hm + 7) >> 3); /* 1 or 2 bytes */
if (!PACKET_get_bytes(rpkt, &tree_id_bytes, tree_id_len)
- || !PACKET_get_bytes(rpkt, &leaf_id_bytes, leaf_id_len))
+ || !PACKET_get_bytes(rpkt, &leaf_id_bytes, leaf_id_len))
return 0;
/*
diff --git a/crypto/slh_dsa/slh_dsa_hash_ctx.c b/crypto/slh_dsa/slh_dsa_hash_ctx.c
index 47dd8f2590..9dca01acf5 100644
--- a/crypto/slh_dsa/slh_dsa_hash_ctx.c
+++ b/crypto/slh_dsa/slh_dsa_hash_ctx.c
@@ -55,7 +55,7 @@ SLH_DSA_HASH_CTX *ossl_slh_dsa_hash_ctx_new(const SLH_DSA_KEY *key)
}
}
return ret;
- err:
+err:
ossl_slh_dsa_hash_ctx_free(ret);
return NULL;
}
@@ -77,7 +77,7 @@ SLH_DSA_HASH_CTX *ossl_slh_dsa_hash_ctx_dup(const SLH_DSA_HASH_CTX *src)
ret->key = src->key;
if (src->md_ctx != NULL
- && (ret->md_ctx = EVP_MD_CTX_dup(src->md_ctx)) == NULL)
+ && (ret->md_ctx = EVP_MD_CTX_dup(src->md_ctx)) == NULL)
goto err;
if (src->md_big_ctx != NULL) {
if (src->md_big_ctx != src->md_ctx) {
@@ -88,10 +88,10 @@ SLH_DSA_HASH_CTX *ossl_slh_dsa_hash_ctx_dup(const SLH_DSA_HASH_CTX *src)
}
}
if (src->hmac_ctx != NULL
- && (ret->hmac_ctx = EVP_MAC_CTX_dup(src->hmac_ctx)) == NULL)
+ && (ret->hmac_ctx = EVP_MAC_CTX_dup(src->hmac_ctx)) == NULL)
goto err;
return ret;
- err:
+err:
ossl_slh_dsa_hash_ctx_free(ret);
return NULL;
}
diff --git a/crypto/slh_dsa/slh_dsa_key.c b/crypto/slh_dsa/slh_dsa_key.c
index d13d2cbf67..9df2d75a86 100644
--- a/crypto/slh_dsa/slh_dsa_key.c
+++ b/crypto/slh_dsa/slh_dsa_key.c
@@ -61,7 +61,7 @@ static int slh_dsa_key_hash_init(SLH_DSA_KEY *key)
key->adrs_func = ossl_slh_get_adrs_fn(is_shake == 0);
key->hash_func = ossl_slh_get_hash_fn(is_shake);
return 1;
- err:
+err:
slh_dsa_key_hash_cleanup(key);
return 0;
}
@@ -96,7 +96,7 @@ OSSL_LIB_CTX *ossl_slh_dsa_key_get0_libctx(const SLH_DSA_KEY *key)
* @returns The new SLH_DSA_KEY object on success, or NULL on malloc failure
*/
SLH_DSA_KEY *ossl_slh_dsa_key_new(OSSL_LIB_CTX *libctx, const char *propq,
- const char *alg)
+ const char *alg)
{
SLH_DSA_KEY *ret;
const SLH_DSA_PARAMS *params = ossl_slh_dsa_params_get(alg);
@@ -117,7 +117,7 @@ SLH_DSA_KEY *ossl_slh_dsa_key_new(OSSL_LIB_CTX *libctx, const char *propq,
goto err;
}
return ret;
- err:
+err:
ossl_slh_dsa_key_free(ret);
return NULL;
}
@@ -171,7 +171,7 @@ SLH_DSA_KEY *ossl_slh_dsa_key_dup(const SLH_DSA_KEY *src, int selection)
}
}
return ret;
- err:
+err:
ossl_slh_dsa_key_free(ret);
return NULL;
}
@@ -187,7 +187,7 @@ SLH_DSA_KEY *ossl_slh_dsa_key_dup(const SLH_DSA_KEY *src, int selection)
* @returns 1 if the keys are equal otherwise it returns 0.
*/
int ossl_slh_dsa_key_equal(const SLH_DSA_KEY *key1, const SLH_DSA_KEY *key2,
- int selection)
+ int selection)
{
int key_checked = 0;
@@ -204,10 +204,11 @@ int ossl_slh_dsa_key_equal(const SLH_DSA_KEY *key1, const SLH_DSA_KEY *key2,
}
}
if (!key_checked
- && (selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0) {
+ && (selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0) {
if (key1->has_priv && key2->has_priv) {
if (memcmp(key1->priv, key2->priv,
- key1->params->pk_len) != 0)
+ key1->params->pk_len)
+ != 0)
return 0;
key_checked = 1;
}
@@ -223,7 +224,7 @@ int ossl_slh_dsa_key_has(const SLH_DSA_KEY *key, int selection)
if (key->pub == NULL)
return 0; /* No public key */
if ((selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0
- && key->has_priv == 0)
+ && key->has_priv == 0)
return 0; /* No private key */
return 1;
}
@@ -265,8 +266,8 @@ void ossl_slh_dsa_key_reset(SLH_DSA_KEY *key)
* @returns 1 on success, or 0 on failure.
*/
int ossl_slh_dsa_key_fromdata(SLH_DSA_KEY *key, const OSSL_PARAM *param_pub,
- const OSSL_PARAM *param_priv,
- int include_private)
+ const OSSL_PARAM *param_priv,
+ int include_private)
{
size_t priv_len, key_len, data_len = 0;
void *p;
@@ -305,12 +306,12 @@ int ossl_slh_dsa_key_fromdata(SLH_DSA_KEY *key, const OSSL_PARAM *param_pub,
*/
p = SLH_DSA_PUB(key);
if (param_pub == NULL
- || !OSSL_PARAM_get_octet_string(param_pub, &p, key_len, &data_len)
- || data_len != key_len)
+ || !OSSL_PARAM_get_octet_string(param_pub, &p, key_len, &data_len)
+ || data_len != key_len)
goto err;
key->pub = p;
return 1;
- err:
+err:
ossl_slh_dsa_key_reset(key);
return 0;
}
@@ -327,7 +328,7 @@ int ossl_slh_dsa_key_fromdata(SLH_DSA_KEY *key, const OSSL_PARAM *param_pub,
* @returns 1 if the root key is generated or compared successfully, or 0 on error.
*/
static int slh_dsa_compute_pk_root(SLH_DSA_HASH_CTX *ctx, SLH_DSA_KEY *out,
- int validate)
+ int validate)
{
const SLH_DSA_KEY *key = ctx->key;
SLH_ADRS_FUNC_DECLARE(key, adrsf);
@@ -343,7 +344,7 @@ static int slh_dsa_compute_pk_root(SLH_DSA_HASH_CTX *ctx, SLH_DSA_KEY *out,
/* Generate the ROOT public key */
return ossl_slh_xmss_node(ctx, SLH_DSA_SK_SEED(key), 0, params->hm,
- SLH_DSA_PK_SEED(key), adrs, dst, n)
+ SLH_DSA_PK_SEED(key), adrs, dst, n)
&& (validate == 0 || memcmp(dst, SLH_DSA_PK_ROOT(out), n) == 0);
}
@@ -362,12 +363,12 @@ static int slh_dsa_compute_pk_root(SLH_DSA_HASH_CTX *ctx, SLH_DSA_KEY *out,
* @returns 1 if the key is generated or 0 otherwise.
*/
int ossl_slh_dsa_generate_key(SLH_DSA_HASH_CTX *ctx, SLH_DSA_KEY *out,
- OSSL_LIB_CTX *lib_ctx,
- const uint8_t *entropy, size_t entropy_len)
+ OSSL_LIB_CTX *lib_ctx,
+ const uint8_t *entropy, size_t entropy_len)
{
size_t n = out->params->n;
size_t secret_key_len = 2 * n; /* The length of SK_SEED + SK_PRF */
- size_t pk_seed_len = n; /* The length of PK_SEED */
+ size_t pk_seed_len = n; /* The length of PK_SEED */
size_t entropy_len_expected = secret_key_len + pk_seed_len;
uint8_t *priv = SLH_DSA_PRIV(out);
uint8_t *pub = SLH_DSA_PUB(out);
@@ -378,7 +379,7 @@ int ossl_slh_dsa_generate_key(SLH_DSA_HASH_CTX *ctx, SLH_DSA_KEY *out,
memcpy(priv, entropy, entropy_len_expected);
} else {
if (RAND_priv_bytes_ex(lib_ctx, priv, secret_key_len, 0) <= 0
- || RAND_bytes_ex(lib_ctx, pub, pk_seed_len, 0) <= 0)
+ || RAND_bytes_ex(lib_ctx, pub, pk_seed_len, 0) <= 0)
goto err;
}
if (!slh_dsa_compute_pk_root(ctx, out, 0))
@@ -492,20 +493,20 @@ int ossl_slh_dsa_key_to_text(BIO *out, const SLH_DSA_KEY *key, int selection)
if (ossl_slh_dsa_key_get_pub(key) == NULL) {
/* Regardless of the |selection|, there must be a public key */
ERR_raise_data(ERR_LIB_PROV, PROV_R_MISSING_KEY,
- "no %s key material available", name);
+ "no %s key material available", name);
return 0;
}
if ((selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0) {
if (ossl_slh_dsa_key_get_priv(key) == NULL) {
ERR_raise_data(ERR_LIB_PROV, PROV_R_MISSING_KEY,
- "no %s key material available", name);
+ "no %s key material available", name);
return 0;
}
if (BIO_printf(out, "%s Private-Key:\n", name) <= 0)
return 0;
if (!ossl_bio_print_labeled_buf(out, "priv:", ossl_slh_dsa_key_get_priv(key),
- ossl_slh_dsa_key_get_priv_len(key)))
+ ossl_slh_dsa_key_get_priv_len(key)))
return 0;
} else if ((selection & OSSL_KEYMGMT_SELECT_PUBLIC_KEY) != 0) {
if (BIO_printf(out, "%s Public-Key:\n", name) <= 0)
@@ -513,7 +514,7 @@ int ossl_slh_dsa_key_to_text(BIO *out, const SLH_DSA_KEY *key, int selection)
}
if (!ossl_bio_print_labeled_buf(out, "pub:", ossl_slh_dsa_key_get_pub(key),
- ossl_slh_dsa_key_get_pub_len(key)))
+ ossl_slh_dsa_key_get_pub_len(key)))
return 0;
return 1;
diff --git a/crypto/slh_dsa/slh_dsa_key.h b/crypto/slh_dsa/slh_dsa_key.h
index f8fb68e6ef..37b7aa1b16 100644
--- a/crypto/slh_dsa/slh_dsa_key.h
+++ b/crypto/slh_dsa/slh_dsa_key.h
@@ -11,7 +11,7 @@
#define SLH_DSA_MAX_N 32
#define SLH_DSA_SK_SEED(key) ((key)->priv)
-#define SLH_DSA_SK_PRF(key) ((key)->priv + (key)->params->n)
+#define SLH_DSA_SK_PRF(key) ((key)->priv + (key)->params->n)
#define SLH_DSA_PK_SEED(key) ((key)->priv + (key)->params->n * 2)
#define SLH_DSA_PK_ROOT(key) ((key)->priv + (key)->params->n * 3)
#define SLH_DSA_PUB(key) SLH_DSA_PK_SEED(key)
diff --git a/crypto/slh_dsa/slh_dsa_local.h b/crypto/slh_dsa/slh_dsa_local.h
index 2373589740..57dfc1eb13 100644
--- a/crypto/slh_dsa/slh_dsa_local.h
+++ b/crypto/slh_dsa/slh_dsa_local.h
@@ -47,49 +47,49 @@
*/
struct slh_dsa_hash_ctx_st {
const SLH_DSA_KEY *key; /* This key is not owned by this object */
- EVP_MD_CTX *md_ctx; /* Either SHAKE OR SHA-256 */
+ EVP_MD_CTX *md_ctx; /* Either SHAKE OR SHA-256 */
EVP_MD_CTX *md_big_ctx; /* Either SHA-512 or points to |md_ctx| for SHA-256*/
- EVP_MAC_CTX *hmac_ctx; /* required by SHA algorithms for PRFmsg() */
- int hmac_digest_used; /* Used for lazy init of hmac_ctx digest */
+ EVP_MAC_CTX *hmac_ctx; /* required by SHA algorithms for PRFmsg() */
+ int hmac_digest_used; /* Used for lazy init of hmac_ctx digest */
};
__owur int ossl_slh_wots_pk_gen(SLH_DSA_HASH_CTX *ctx, const uint8_t *sk_seed,
- const uint8_t *pk_seed, uint8_t *adrs,
- uint8_t *pk_out, size_t pk_out_len);
+ const uint8_t *pk_seed, uint8_t *adrs,
+ uint8_t *pk_out, size_t pk_out_len);
__owur int ossl_slh_wots_sign(SLH_DSA_HASH_CTX *ctx, const uint8_t *msg,
- const uint8_t *sk_seed, const uint8_t *pk_seed,
- uint8_t *adrs, WPACKET *sig_wpkt);
+ const uint8_t *sk_seed, const uint8_t *pk_seed,
+ uint8_t *adrs, WPACKET *sig_wpkt);
__owur int ossl_slh_wots_pk_from_sig(SLH_DSA_HASH_CTX *ctx,
- PACKET *sig_rpkt, const uint8_t *msg,
- const uint8_t *pk_seed, uint8_t *adrs,
- uint8_t *pk_out, size_t pk_out_len);
+ PACKET *sig_rpkt, const uint8_t *msg,
+ const uint8_t *pk_seed, uint8_t *adrs,
+ uint8_t *pk_out, size_t pk_out_len);
__owur int ossl_slh_xmss_node(SLH_DSA_HASH_CTX *ctx, const uint8_t *sk_seed,
- uint32_t node_id, uint32_t height,
- const uint8_t *pk_seed, uint8_t *adrs,
- uint8_t *pk_out, size_t pk_out_len);
+ uint32_t node_id, uint32_t height,
+ const uint8_t *pk_seed, uint8_t *adrs,
+ uint8_t *pk_out, size_t pk_out_len);
__owur int ossl_slh_xmss_sign(SLH_DSA_HASH_CTX *ctx, const uint8_t *msg,
- const uint8_t *sk_seed, uint32_t node_id,
- const uint8_t *pk_seed, uint8_t *adrs,
- WPACKET *sig_wpkt);
+ const uint8_t *sk_seed, uint32_t node_id,
+ const uint8_t *pk_seed, uint8_t *adrs,
+ WPACKET *sig_wpkt);
__owur int ossl_slh_xmss_pk_from_sig(SLH_DSA_HASH_CTX *ctx, uint32_t node_id,
- PACKET *sig_rpkt, const uint8_t *msg,
- const uint8_t *pk_seed, uint8_t *adrs,
- uint8_t *pk_out, size_t pk_out_len);
+ PACKET *sig_rpkt, const uint8_t *msg,
+ const uint8_t *pk_seed, uint8_t *adrs,
+ uint8_t *pk_out, size_t pk_out_len);
__owur int ossl_slh_ht_sign(SLH_DSA_HASH_CTX *ctx, const uint8_t *msg,
- const uint8_t *sk_seed, const uint8_t *pk_seed,
- uint64_t tree_id, uint32_t leaf_id,
- WPACKET *sig_wpkt);
+ const uint8_t *sk_seed, const uint8_t *pk_seed,
+ uint64_t tree_id, uint32_t leaf_id,
+ WPACKET *sig_wpkt);
__owur int ossl_slh_ht_verify(SLH_DSA_HASH_CTX *ctx, const uint8_t *msg,
- PACKET *sig_rpkt, const uint8_t *pk_seed,
- uint64_t tree_id, uint32_t leaf_id,
- const uint8_t *pk_root);
+ PACKET *sig_rpkt, const uint8_t *pk_seed,
+ uint64_t tree_id, uint32_t leaf_id,
+ const uint8_t *pk_root);
__owur int ossl_slh_fors_sign(SLH_DSA_HASH_CTX *ctx, const uint8_t *md,
- const uint8_t *sk_seed, const uint8_t *pk_seed,
- uint8_t *adrs, WPACKET *sig_wpkt);
+ const uint8_t *sk_seed, const uint8_t *pk_seed,
+ uint8_t *adrs, WPACKET *sig_wpkt);
__owur int ossl_slh_fors_pk_from_sig(SLH_DSA_HASH_CTX *ctx, PACKET *sig_rpkt,
- const uint8_t *md, const uint8_t *pk_seed,
- uint8_t *adrs,
- uint8_t *pk_out, size_t pk_out_len);
+ const uint8_t *md, const uint8_t *pk_seed,
+ uint8_t *adrs,
+ uint8_t *pk_out, size_t pk_out_len);
diff --git a/crypto/slh_dsa/slh_fors.c b/crypto/slh_dsa/slh_fors.c
index eca4644261..78587589db 100644
--- a/crypto/slh_dsa/slh_fors.c
+++ b/crypto/slh_dsa/slh_fors.c
@@ -13,12 +13,12 @@
#include "slh_dsa_key.h"
/* k = 14, 17, 22, 33, 35 (number of trees) */
-#define SLH_MAX_K 35
+#define SLH_MAX_K 35
/* a = 6, 8, 9, 12 or 14 - There are (2^a) merkle trees */
-#define SLH_MAX_A 9
+#define SLH_MAX_A 9
-#define SLH_MAX_K_TIMES_A (SLH_MAX_A * SLH_MAX_K)
-#define SLH_MAX_ROOTS (SLH_MAX_K_TIMES_A * SLH_MAX_N)
+#define SLH_MAX_K_TIMES_A (SLH_MAX_A * SLH_MAX_K)
+#define SLH_MAX_ROOTS (SLH_MAX_K_TIMES_A * SLH_MAX_N)
static void slh_base_2b(const uint8_t *in, uint32_t b, uint32_t *out, size_t out_len);
@@ -39,8 +39,8 @@ static void slh_base_2b(const uint8_t *in, uint32_t b, uint32_t *out, size_t out
* @returns 1 on success, or 0 on error.
*/
static int slh_fors_sk_gen(SLH_DSA_HASH_CTX *ctx, const uint8_t *sk_seed,
- const uint8_t *pk_seed, uint8_t *adrs, uint32_t id,
- uint8_t *pk_out, size_t pk_out_len)
+ const uint8_t *pk_seed, uint8_t *adrs, uint32_t id,
+ uint8_t *pk_out, size_t pk_out_len)
{
const SLH_DSA_KEY *key = ctx->key;
SLH_ADRS_DECLARE(sk_adrs);
@@ -75,8 +75,8 @@ static int slh_fors_sk_gen(SLH_DSA_HASH_CTX *ctx, const uint8_t *sk_seed,
* @returns 1 on success, or 0 on error.
*/
static int slh_fors_node(SLH_DSA_HASH_CTX *ctx, const uint8_t *sk_seed,
- const uint8_t *pk_seed, uint8_t *adrs, uint32_t node_id,
- uint32_t height, uint8_t *node, size_t node_len)
+ const uint8_t *pk_seed, uint8_t *adrs, uint32_t node_id,
+ uint32_t height, uint8_t *node, size_t node_len)
{
int ret = 0;
const SLH_DSA_KEY *key = ctx->key;
@@ -96,9 +96,9 @@ static int slh_fors_node(SLH_DSA_HASH_CTX *ctx, const uint8_t *sk_seed,
return ret;
} else {
if (!slh_fors_node(ctx, sk_seed, pk_seed, adrs, 2 * node_id, height - 1,
- lnode, sizeof(rnode))
- || !slh_fors_node(ctx, sk_seed, pk_seed, adrs, 2 * node_id + 1,
- height - 1, rnode, sizeof(rnode)))
+ lnode, sizeof(rnode))
+ || !slh_fors_node(ctx, sk_seed, pk_seed, adrs, 2 * node_id + 1,
+ height - 1, rnode, sizeof(rnode)))
return 0;
adrsf->set_tree_height(adrs, height);
adrsf->set_tree_index(adrs, node_id);
@@ -129,8 +129,8 @@ static int slh_fors_node(SLH_DSA_HASH_CTX *ctx, const uint8_t *sk_seed,
* @returns 1 on success, or 0 on error.
*/
int ossl_slh_fors_sign(SLH_DSA_HASH_CTX *ctx, const uint8_t *md,
- const uint8_t *sk_seed, const uint8_t *pk_seed,
- uint8_t *adrs, WPACKET *sig_wpkt)
+ const uint8_t *sk_seed, const uint8_t *pk_seed,
+ uint8_t *adrs, WPACKET *sig_wpkt)
{
const SLH_DSA_KEY *key = ctx->key;
uint32_t tree_id, layer, s, tree_offset;
@@ -163,8 +163,8 @@ int ossl_slh_fors_sign(SLH_DSA_HASH_CTX *ctx, const uint8_t *md,
tree_offset = tree_id_times_two_power_a;
if (!slh_fors_sk_gen(ctx, sk_seed, pk_seed, adrs,
- node_id + tree_id_times_two_power_a, out, sizeof(out))
- || !WPACKET_memcpy(sig_wpkt, out, n))
+ node_id + tree_id_times_two_power_a, out, sizeof(out))
+ || !WPACKET_memcpy(sig_wpkt, out, n))
return 0;
/*
@@ -177,7 +177,7 @@ int ossl_slh_fors_sign(SLH_DSA_HASH_CTX *ctx, const uint8_t *md,
for (layer = 0; layer < a; ++layer) {
s = node_id ^ 1; /* XOR gets the index of the other child in a binary tree */
if (!slh_fors_node(ctx, sk_seed, pk_seed, adrs,
- s + tree_offset, layer, out, sizeof(out)))
+ s + tree_offset, layer, out, sizeof(out)))
return 0;
node_id >>= 1; /* Get the parent node id */
tree_offset >>= 1; /* Each layer up has half as many nodes */
@@ -208,8 +208,8 @@ int ossl_slh_fors_sign(SLH_DSA_HASH_CTX *ctx, const uint8_t *md,
* @returns 1 on success, or 0 on error.
*/
int ossl_slh_fors_pk_from_sig(SLH_DSA_HASH_CTX *ctx, PACKET *fors_sig_rpkt,
- const uint8_t *md, const uint8_t *pk_seed,
- uint8_t *adrs, uint8_t *pk_out, size_t pk_out_len)
+ const uint8_t *md, const uint8_t *pk_seed,
+ uint8_t *adrs, uint8_t *pk_out, size_t pk_out_len)
{
const SLH_DSA_KEY *key = ctx->key;
int ret = 0;
@@ -250,8 +250,8 @@ int ossl_slh_fors_pk_from_sig(SLH_DSA_HASH_CTX *ctx, PACKET *fors_sig_rpkt,
/* Regenerate the public key of the leaf */
if (!PACKET_get_bytes(fors_sig_rpkt, &sk, n)
- || !WPACKET_allocate_bytes(wroot_pkt, n, &node0)
- || !F(ctx, pk_seed, adrs, sk, n, node0, n))
+ || !WPACKET_allocate_bytes(wroot_pkt, n, &node0)
+ || !F(ctx, pk_seed, adrs, sk, n, node0, n))
goto err;
/* This omits the copying of the nodes that the FIPS 205 code does */
@@ -285,7 +285,7 @@ int ossl_slh_fors_pk_from_sig(SLH_DSA_HASH_CTX *ctx, PACKET *fors_sig_rpkt,
adrsf->set_type_and_clear(pk_adrs, SLH_ADRS_TYPE_FORS_ROOTS);
adrsf->copy_keypair_address(pk_adrs, adrs);
ret = hashf->T(ctx, pk_seed, pk_adrs, roots, roots_len, pk_out, pk_out_len);
- err:
+err:
if (!WPACKET_finish(wroot_pkt))
ret = 0;
return ret;
@@ -303,7 +303,7 @@ int ossl_slh_fors_pk_from_sig(SLH_DSA_HASH_CTX *ctx, PACKET *fors_sig_rpkt,
* @param out_len The size of |out|
*/
static void slh_base_2b(const uint8_t *in, uint32_t b,
- uint32_t *out, size_t out_len)
+ uint32_t *out, size_t out_len)
{
size_t consumed = 0;
uint32_t bits = 0;
diff --git a/crypto/slh_dsa/slh_hash.c b/crypto/slh_dsa/slh_hash.c
index 979d81e797..951019819c 100644
--- a/crypto/slh_dsa/slh_hash.c
+++ b/crypto/slh_dsa/slh_hash.c
@@ -33,64 +33,64 @@ static OSSL_SLH_HASHFUNC_H slh_h_shake;
static OSSL_SLH_HASHFUNC_T slh_t_shake;
static ossl_inline int xof_digest_3(EVP_MD_CTX *ctx,
- const uint8_t *in1, size_t in1_len,
- const uint8_t *in2, size_t in2_len,
- const uint8_t *in3, size_t in3_len,
- uint8_t *out, size_t out_len)
+ const uint8_t *in1, size_t in1_len,
+ const uint8_t *in2, size_t in2_len,
+ const uint8_t *in3, size_t in3_len,
+ uint8_t *out, size_t out_len)
{
return (EVP_DigestInit_ex2(ctx, NULL, NULL) == 1
- && EVP_DigestUpdate(ctx, in1, in1_len) == 1
- && EVP_DigestUpdate(ctx, in2, in2_len) == 1
- && EVP_DigestUpdate(ctx, in3, in3_len) == 1
- && EVP_DigestFinalXOF(ctx, out, out_len) == 1);
+ && EVP_DigestUpdate(ctx, in1, in1_len) == 1
+ && EVP_DigestUpdate(ctx, in2, in2_len) == 1
+ && EVP_DigestUpdate(ctx, in3, in3_len) == 1
+ && EVP_DigestFinalXOF(ctx, out, out_len) == 1);
}
static ossl_inline int xof_digest_4(EVP_MD_CTX *ctx,
- const uint8_t *in1, size_t in1_len,
- const uint8_t *in2, size_t in2_len,
- const uint8_t *in3, size_t in3_len,
- const uint8_t *in4, size_t in4_len,
- uint8_t *out, size_t out_len)
+ const uint8_t *in1, size_t in1_len,
+ const uint8_t *in2, size_t in2_len,
+ const uint8_t *in3, size_t in3_len,
+ const uint8_t *in4, size_t in4_len,
+ uint8_t *out, size_t out_len)
{
return (EVP_DigestInit_ex2(ctx, NULL, NULL) == 1
- && EVP_DigestUpdate(ctx, in1, in1_len) == 1
- && EVP_DigestUpdate(ctx, in2, in2_len) == 1
- && EVP_DigestUpdate(ctx, in3, in3_len) == 1
- && EVP_DigestUpdate(ctx, in4, in4_len) == 1
- && EVP_DigestFinalXOF(ctx, out, out_len) == 1);
+ && EVP_DigestUpdate(ctx, in1, in1_len) == 1
+ && EVP_DigestUpdate(ctx, in2, in2_len) == 1
+ && EVP_DigestUpdate(ctx, in3, in3_len) == 1
+ && EVP_DigestUpdate(ctx, in4, in4_len) == 1
+ && EVP_DigestFinalXOF(ctx, out, out_len) == 1);
}
/* See FIPS 205 Section 11.1 */
static int
slh_hmsg_shake(SLH_DSA_HASH_CTX *ctx, const uint8_t *r,
- const uint8_t *pk_seed, const uint8_t *pk_root,
- const uint8_t *msg, size_t msg_len,
- uint8_t *out, size_t out_len)
+ const uint8_t *pk_seed, const uint8_t *pk_root,
+ const uint8_t *msg, size_t msg_len,
+ uint8_t *out, size_t out_len)
{
const SLH_DSA_PARAMS *params = ctx->key->params;
size_t m = params->m;
size_t n = params->n;
return xof_digest_4(ctx->md_ctx, r, n, pk_seed, n, pk_root, n,
- msg, msg_len, out, m);
+ msg, msg_len, out, m);
}
static int
slh_prf_shake(SLH_DSA_HASH_CTX *ctx,
- const uint8_t *pk_seed, const uint8_t *sk_seed,
- const uint8_t *adrs, uint8_t *out, size_t out_len)
+ const uint8_t *pk_seed, const uint8_t *sk_seed,
+ const uint8_t *adrs, uint8_t *out, size_t out_len)
{
const SLH_DSA_PARAMS *params = ctx->key->params;
size_t n = params->n;
return xof_digest_3(ctx->md_ctx, pk_seed, n, adrs, SLH_ADRS_SIZE,
- sk_seed, n, out, n);
+ sk_seed, n, out, n);
}
static int
slh_prf_msg_shake(SLH_DSA_HASH_CTX *ctx, const uint8_t *sk_prf,
- const uint8_t *opt_rand, const uint8_t *msg, size_t msg_len,
- WPACKET *pkt)
+ const uint8_t *opt_rand, const uint8_t *msg, size_t msg_len,
+ WPACKET *pkt)
{
unsigned char out[SLH_MAX_N];
const SLH_DSA_PARAMS *params = ctx->key->params;
@@ -102,7 +102,7 @@ slh_prf_msg_shake(SLH_DSA_HASH_CTX *ctx, const uint8_t *sk_prf,
static int
slh_f_shake(SLH_DSA_HASH_CTX *ctx, const uint8_t *pk_seed, const uint8_t *adrs,
- const uint8_t *m1, size_t m1_len, uint8_t *out, size_t out_len)
+ const uint8_t *m1, size_t m1_len, uint8_t *out, size_t out_len)
{
const SLH_DSA_PARAMS *params = ctx->key->params;
size_t n = params->n;
@@ -112,7 +112,7 @@ slh_f_shake(SLH_DSA_HASH_CTX *ctx, const uint8_t *pk_seed, const uint8_t *adrs,
static int
slh_h_shake(SLH_DSA_HASH_CTX *ctx, const uint8_t *pk_seed, const uint8_t *adrs,
- const uint8_t *m1, const uint8_t *m2, uint8_t *out, size_t out_len)
+ const uint8_t *m1, const uint8_t *m2, uint8_t *out, size_t out_len)
{
const SLH_DSA_PARAMS *params = ctx->key->params;
size_t n = params->n;
@@ -122,7 +122,7 @@ slh_h_shake(SLH_DSA_HASH_CTX *ctx, const uint8_t *pk_seed, const uint8_t *adrs,
static int
slh_t_shake(SLH_DSA_HASH_CTX *ctx, const uint8_t *pk_seed, const uint8_t *adrs,
- const uint8_t *ml, size_t ml_len, uint8_t *out, size_t out_len)
+ const uint8_t *ml, size_t ml_len, uint8_t *out, size_t out_len)
{
const SLH_DSA_PARAMS *params = ctx->key->params;
size_t n = params->n;
@@ -132,24 +132,24 @@ slh_t_shake(SLH_DSA_HASH_CTX *ctx, const uint8_t *pk_seed, const uint8_t *adrs,
static ossl_inline int
digest_4(EVP_MD_CTX *ctx,
- const uint8_t *in1, size_t in1_len, const uint8_t *in2, size_t in2_len,
- const uint8_t *in3, size_t in3_len, const uint8_t *in4, size_t in4_len,
- uint8_t *out)
+ const uint8_t *in1, size_t in1_len, const uint8_t *in2, size_t in2_len,
+ const uint8_t *in3, size_t in3_len, const uint8_t *in4, size_t in4_len,
+ uint8_t *out)
{
return (EVP_DigestInit_ex2(ctx, NULL, NULL) == 1
- && EVP_DigestUpdate(ctx, in1, in1_len) == 1
- && EVP_DigestUpdate(ctx, in2, in2_len) == 1
- && EVP_DigestUpdate(ctx, in3, in3_len) == 1
- && EVP_DigestUpdate(ctx, in4, in4_len) == 1
- && EVP_DigestFinal_ex(ctx, out, NULL) == 1);
+ && EVP_DigestUpdate(ctx, in1, in1_len) == 1
+ && EVP_DigestUpdate(ctx, in2, in2_len) == 1
+ && EVP_DigestUpdate(ctx, in3, in3_len) == 1
+ && EVP_DigestUpdate(ctx, in4, in4_len) == 1
+ && EVP_DigestFinal_ex(ctx, out, NULL) == 1);
}
/* FIPS 205 Section 11.2.1 and 11.2.2 */
static int
slh_hmsg_sha2(SLH_DSA_HASH_CTX *hctx, const uint8_t *r, const uint8_t *pk_seed,
- const uint8_t *pk_root, const uint8_t *msg, size_t msg_len,
- uint8_t *out, size_t out_len)
+ const uint8_t *pk_root, const uint8_t *msg, size_t msg_len,
+ uint8_t *out, size_t out_len)
{
const SLH_DSA_PARAMS *params = hctx->key->params;
size_t m = params->m;
@@ -164,21 +164,21 @@ slh_hmsg_sha2(SLH_DSA_HASH_CTX *hctx, const uint8_t *r, const uint8_t *pk_seed,
memcpy(seed, r, n);
memcpy(seed + n, pk_seed, n);
return digest_4(hctx->md_big_ctx, r, n, pk_seed, n, pk_root, n, msg, msg_len,
- seed + 2 * n)
+ seed + 2 * n)
&& (PKCS1_MGF1(out, (long)m, seed, (long)seed_len, hctx->key->md_big) == 0);
}
static int
slh_prf_msg_sha2(SLH_DSA_HASH_CTX *hctx,
- const uint8_t *sk_prf, const uint8_t *opt_rand,
- const uint8_t *msg, size_t msg_len, WPACKET *pkt)
+ const uint8_t *sk_prf, const uint8_t *opt_rand,
+ const uint8_t *msg, size_t msg_len, WPACKET *pkt)
{
int ret;
const SLH_DSA_KEY *key = hctx->key;
EVP_MAC_CTX *mctx = hctx->hmac_ctx;
const SLH_DSA_PARAMS *prms = key->params;
size_t n = prms->n;
- uint8_t mac[MAX_DIGEST_SIZE] = {0};
+ uint8_t mac[MAX_DIGEST_SIZE] = { 0 };
OSSL_PARAM *p = NULL;
OSSL_PARAM params[3];
@@ -191,10 +191,10 @@ slh_prf_msg_sha2(SLH_DSA_HASH_CTX *hctx,
p = params;
/* The underlying digest to be used */
*p++ = OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_DIGEST,
- (char *)EVP_MD_get0_name(key->md_big), 0);
+ (char *)EVP_MD_get0_name(key->md_big), 0);
if (key->propq != NULL)
*p++ = OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_PROPERTIES,
- (char *)key->propq, 0);
+ (char *)key->propq, 0);
*p = OSSL_PARAM_construct_end();
p = params;
hctx->hmac_digest_used = 1;
@@ -210,14 +210,14 @@ slh_prf_msg_sha2(SLH_DSA_HASH_CTX *hctx,
static ossl_inline int
do_hash(EVP_MD_CTX *ctx, size_t n, const uint8_t *pk_seed, const uint8_t *adrs,
- const uint8_t *m, size_t m_len, size_t b, uint8_t *out, size_t out_len)
+ const uint8_t *m, size_t m_len, size_t b, uint8_t *out, size_t out_len)
{
int ret;
uint8_t zeros[128] = { 0 };
uint8_t digest[MAX_DIGEST_SIZE];
ret = digest_4(ctx, pk_seed, n, zeros, b - n, adrs, SLH_ADRSC_SIZE,
- m, m_len, digest);
+ m, m_len, digest);
/* Truncated returned value is n = 16 bytes */
memcpy(out, digest, n);
return ret;
@@ -225,26 +225,26 @@ do_hash(EVP_MD_CTX *ctx, size_t n, const uint8_t *pk_seed, const uint8_t *adrs,
static int
slh_prf_sha2(SLH_DSA_HASH_CTX *hctx, const uint8_t *pk_seed,
- const uint8_t *sk_seed, const uint8_t *adrs,
- uint8_t *out, size_t out_len)
+ const uint8_t *sk_seed, const uint8_t *adrs,
+ uint8_t *out, size_t out_len)
{
size_t n = hctx->key->params->n;
return do_hash(hctx->md_ctx, n, pk_seed, adrs, sk_seed, n,
- OSSL_SLH_DSA_SHA2_NUM_ZEROS_H_AND_T_BOUND1, out, out_len);
+ OSSL_SLH_DSA_SHA2_NUM_ZEROS_H_AND_T_BOUND1, out, out_len);
}
static int
slh_f_sha2(SLH_DSA_HASH_CTX *hctx, const uint8_t *pk_seed, const uint8_t *adrs,
- const uint8_t *m1, size_t m1_len, uint8_t *out, size_t out_len)
+ const uint8_t *m1, size_t m1_len, uint8_t *out, size_t out_len)
{
return do_hash(hctx->md_ctx, hctx->key->params->n, pk_seed, adrs, m1, m1_len,
- OSSL_SLH_DSA_SHA2_NUM_ZEROS_H_AND_T_BOUND1, out, out_len);
+ OSSL_SLH_DSA_SHA2_NUM_ZEROS_H_AND_T_BOUND1, out, out_len);
}
static int
slh_h_sha2(SLH_DSA_HASH_CTX *hctx, const uint8_t *pk_seed, const uint8_t *adrs,
- const uint8_t *m1, const uint8_t *m2, uint8_t *out, size_t out_len)
+ const uint8_t *m1, const uint8_t *m2, uint8_t *out, size_t out_len)
{
uint8_t m[SLH_MAX_N * 2];
const SLH_DSA_PARAMS *prms = hctx->key->params;
@@ -253,38 +253,34 @@ slh_h_sha2(SLH_DSA_HASH_CTX *hctx, const uint8_t *pk_seed, const uint8_t *adrs,
memcpy(m, m1, n);
memcpy(m + n, m2, n);
return do_hash(hctx->md_big_ctx, n, pk_seed, adrs, m, 2 * n,
- prms->sha2_h_and_t_bound, out, out_len);
+ prms->sha2_h_and_t_bound, out, out_len);
}
static int
slh_t_sha2(SLH_DSA_HASH_CTX *hctx, const uint8_t *pk_seed, const uint8_t *adrs,
- const uint8_t *ml, size_t ml_len, uint8_t *out, size_t out_len)
+ const uint8_t *ml, size_t ml_len, uint8_t *out, size_t out_len)
{
const SLH_DSA_PARAMS *prms = hctx->key->params;
return do_hash(hctx->md_big_ctx, prms->n, pk_seed, adrs, ml, ml_len,
- prms->sha2_h_and_t_bound, out, out_len);
+ prms->sha2_h_and_t_bound, out, out_len);
}
const SLH_HASH_FUNC *ossl_slh_get_hash_fn(int is_shake)
{
static const SLH_HASH_FUNC methods[] = {
- {
- slh_hmsg_shake,
+ { slh_hmsg_shake,
slh_prf_shake,
slh_prf_msg_shake,
slh_f_shake,
slh_h_shake,
- slh_t_shake
- },
- {
- slh_hmsg_sha2,
+ slh_t_shake },
+ { slh_hmsg_sha2,
slh_prf_sha2,
slh_prf_msg_sha2,
slh_f_sha2,
slh_h_sha2,
- slh_t_sha2
- }
+ slh_t_sha2 }
};
return &methods[is_shake ? 0 : 1];
}
diff --git a/crypto/slh_dsa/slh_hash.h b/crypto/slh_dsa/slh_hash.h
index 3033b657ab..51e542139f 100644
--- a/crypto/slh_dsa/slh_hash.h
+++ b/crypto/slh_dsa/slh_hash.h
@@ -8,49 +8,49 @@
*/
#ifndef OSSL_CRYPTO_SLH_HASH_H
-# define OSSL_CRYPTO_SLH_HASH_H
-# pragma once
+#define OSSL_CRYPTO_SLH_HASH_H
+#pragma once
-# include <openssl/e_os2.h>
-# include "slh_adrs.h"
-# include "internal/packet.h"
+#include <openssl/e_os2.h>
+#include "slh_adrs.h"
+#include "internal/packet.h"
-# define SLH_HASH_FUNC_DECLARE(ctx, hashf) \
- const SLH_HASH_FUNC *hashf = ctx->hash_func \
+#define SLH_HASH_FUNC_DECLARE(ctx, hashf) \
+ const SLH_HASH_FUNC *hashf = ctx->hash_func
-# define SLH_HASH_FN_DECLARE(hashf, t) OSSL_SLH_HASHFUNC_##t * t = hashf->t
+#define SLH_HASH_FN_DECLARE(hashf, t) OSSL_SLH_HASHFUNC_##t *t = hashf->t
/*
* @params out is |m| bytes which ranges from (30..49) bytes
*/
-typedef int (OSSL_SLH_HASHFUNC_H_MSG)(SLH_DSA_HASH_CTX *ctx, const uint8_t *r,
- const uint8_t *pk_seed, const uint8_t *pk_root,
- const uint8_t *msg, size_t msg_len,
- uint8_t *out, size_t out_len);
+typedef int(OSSL_SLH_HASHFUNC_H_MSG)(SLH_DSA_HASH_CTX *ctx, const uint8_t *r,
+ const uint8_t *pk_seed, const uint8_t *pk_root,
+ const uint8_t *msg, size_t msg_len,
+ uint8_t *out, size_t out_len);
-typedef int (OSSL_SLH_HASHFUNC_PRF)(SLH_DSA_HASH_CTX *ctx, const uint8_t *pk_seed,
- const uint8_t *sk_seed, const uint8_t *adrs,
- uint8_t *out, size_t out_len);
+typedef int(OSSL_SLH_HASHFUNC_PRF)(SLH_DSA_HASH_CTX *ctx, const uint8_t *pk_seed,
+ const uint8_t *sk_seed, const uint8_t *adrs,
+ uint8_t *out, size_t out_len);
-typedef int (OSSL_SLH_HASHFUNC_PRF_MSG)(SLH_DSA_HASH_CTX *ctx, const uint8_t *sk_prf,
- const uint8_t *opt_rand,
- const uint8_t *msg, size_t msg_len,
- WPACKET *pkt);
+typedef int(OSSL_SLH_HASHFUNC_PRF_MSG)(SLH_DSA_HASH_CTX *ctx, const uint8_t *sk_prf,
+ const uint8_t *opt_rand,
+ const uint8_t *msg, size_t msg_len,
+ WPACKET *pkt);
-typedef int (OSSL_SLH_HASHFUNC_F)(SLH_DSA_HASH_CTX *ctx, const uint8_t *pk_seed,
- const uint8_t *adrs,
- const uint8_t *m1, size_t m1_len,
- uint8_t *out, size_t out_len);
+typedef int(OSSL_SLH_HASHFUNC_F)(SLH_DSA_HASH_CTX *ctx, const uint8_t *pk_seed,
+ const uint8_t *adrs,
+ const uint8_t *m1, size_t m1_len,
+ uint8_t *out, size_t out_len);
-typedef int (OSSL_SLH_HASHFUNC_H)(SLH_DSA_HASH_CTX *ctx, const uint8_t *pk_seed,
- const uint8_t *adrs,
- const uint8_t *m1, const uint8_t *m2,
- uint8_t *out, size_t out_len);
+typedef int(OSSL_SLH_HASHFUNC_H)(SLH_DSA_HASH_CTX *ctx, const uint8_t *pk_seed,
+ const uint8_t *adrs,
+ const uint8_t *m1, const uint8_t *m2,
+ uint8_t *out, size_t out_len);
-typedef int (OSSL_SLH_HASHFUNC_T)(SLH_DSA_HASH_CTX *ctx, const uint8_t *pk_seed,
- const uint8_t *adrs,
- const uint8_t *m1, size_t m1_len,
- uint8_t *out, size_t out_len);
+typedef int(OSSL_SLH_HASHFUNC_T)(SLH_DSA_HASH_CTX *ctx, const uint8_t *pk_seed,
+ const uint8_t *adrs,
+ const uint8_t *m1, size_t m1_len,
+ uint8_t *out, size_t out_len);
typedef struct slh_hash_func_st {
OSSL_SLH_HASHFUNC_H_MSG *H_MSG;
diff --git a/crypto/slh_dsa/slh_hypertree.c b/crypto/slh_dsa/slh_hypertree.c
index e9debef6ff..bc352bf5bc 100644
--- a/crypto/slh_dsa/slh_hypertree.c
+++ b/crypto/slh_dsa/slh_hypertree.c
@@ -29,9 +29,9 @@
* @returns 1 on success, or 0 on error.
*/
int ossl_slh_ht_sign(SLH_DSA_HASH_CTX *ctx,
- const uint8_t *msg, const uint8_t *sk_seed,
- const uint8_t *pk_seed,
- uint64_t tree_id, uint32_t leaf_id, WPACKET *sig_wpkt)
+ const uint8_t *msg, const uint8_t *sk_seed,
+ const uint8_t *pk_seed,
+ uint64_t tree_id, uint32_t leaf_id, WPACKET *sig_wpkt)
{
const SLH_DSA_KEY *key = ctx->key;
SLH_ADRS_FUNC_DECLARE(key, adrsf);
@@ -69,7 +69,7 @@ int ossl_slh_ht_sign(SLH_DSA_HASH_CTX *ctx,
adrsf->set_tree_address(adrs, tree_id);
psig = WPACKET_get_curr(sig_wpkt);
if (!ossl_slh_xmss_sign(ctx, root, sk_seed, leaf_id, pk_seed, adrs,
- sig_wpkt))
+ sig_wpkt))
return 0;
/*
* On the last loop it skips getting the public key since it is not needed
@@ -78,10 +78,10 @@ int ossl_slh_ht_sign(SLH_DSA_HASH_CTX *ctx,
*/
if (layer < d - 1) {
if (!PACKET_buf_init(xmss_sig_rpkt, psig,
- WPACKET_get_curr(sig_wpkt) - psig))
+ WPACKET_get_curr(sig_wpkt) - psig))
return 0;
if (!ossl_slh_xmss_pk_from_sig(ctx, leaf_id, xmss_sig_rpkt, root,
- pk_seed, adrs, root, sizeof(root)))
+ pk_seed, adrs, root, sizeof(root)))
return 0;
leaf_id = tree_id & mask;
tree_id >>= hm;
@@ -105,8 +105,8 @@ int ossl_slh_ht_sign(SLH_DSA_HASH_CTX *ctx,
* @returns 1 if the computed XMSS public key matches pk_root, or 0 otherwise.
*/
int ossl_slh_ht_verify(SLH_DSA_HASH_CTX *ctx, const uint8_t *msg, PACKET *sig_pkt,
- const uint8_t *pk_seed, uint64_t tree_id, uint32_t leaf_id,
- const uint8_t *pk_root)
+ const uint8_t *pk_seed, uint64_t tree_id, uint32_t leaf_id,
+ const uint8_t *pk_root)
{
const SLH_DSA_KEY *key = ctx->key;
SLH_ADRS_FUNC_DECLARE(key, adrsf);
@@ -126,7 +126,7 @@ int ossl_slh_ht_verify(SLH_DSA_HASH_CTX *ctx, const uint8_t *msg, PACKET *sig_pk
adrsf->set_layer_address(adrs, layer);
adrsf->set_tree_address(adrs, tree_id);
if (!ossl_slh_xmss_pk_from_sig(ctx, leaf_id, sig_pkt, node,
- pk_seed, adrs, node, sizeof(node)))
+ pk_seed, adrs, node, sizeof(node)))
return 0;
leaf_id = tree_id & mask;
tree_id >>= tree_height;
diff --git a/crypto/slh_dsa/slh_params.c b/crypto/slh_dsa/slh_params.c
index 7e6011116a..42c70cfaeb 100644
--- a/crypto/slh_dsa/slh_params.c
+++ b/crypto/slh_dsa/slh_params.c
@@ -81,33 +81,32 @@
#define OSSL_SLH_DSA_256F_PUB_BYTES 64
#define OSSL_SLH_DSA_256F_SIG_BYTES 49856
-#define OSSL_SLH_PARAMS(name) \
- OSSL_SLH_DSA_##name##_N, \
- OSSL_SLH_DSA_##name##_H, \
- OSSL_SLH_DSA_##name##_D, \
- OSSL_SLH_DSA_##name##_H_DASH, \
- OSSL_SLH_DSA_##name##_A, \
- OSSL_SLH_DSA_##name##_K, \
- OSSL_SLH_DSA_##name##_M, \
- OSSL_SLH_DSA_##name##_SECURITY_CATEGORY, \
- OSSL_SLH_DSA_##name##_PUB_BYTES, \
- OSSL_SLH_DSA_##name##_SIG_BYTES \
-
+#define OSSL_SLH_PARAMS(name) \
+ OSSL_SLH_DSA_##name##_N, \
+ OSSL_SLH_DSA_##name##_H, \
+ OSSL_SLH_DSA_##name##_D, \
+ OSSL_SLH_DSA_##name##_H_DASH, \
+ OSSL_SLH_DSA_##name##_A, \
+ OSSL_SLH_DSA_##name##_K, \
+ OSSL_SLH_DSA_##name##_M, \
+ OSSL_SLH_DSA_##name##_SECURITY_CATEGORY, \
+ OSSL_SLH_DSA_##name##_PUB_BYTES, \
+ OSSL_SLH_DSA_##name##_SIG_BYTES
static const SLH_DSA_PARAMS slh_dsa_params[] = {
- {"SLH-DSA-SHA2-128s", NID_SLH_DSA_SHA2_128s, 0, OSSL_SLH_PARAMS(128S), OSSL_SLH_DSA_SHA2_NUM_ZEROS_H_AND_T_BOUND1},
- {"SLH-DSA-SHAKE-128s", NID_SLH_DSA_SHAKE_128s, 1, OSSL_SLH_PARAMS(128S)},
- {"SLH-DSA-SHA2-128f", NID_SLH_DSA_SHA2_128f, 0, OSSL_SLH_PARAMS(128F), OSSL_SLH_DSA_SHA2_NUM_ZEROS_H_AND_T_BOUND1},
- {"SLH-DSA-SHAKE-128f", NID_SLH_DSA_SHAKE_128f, 1, OSSL_SLH_PARAMS(128F)},
- {"SLH-DSA-SHA2-192s", NID_SLH_DSA_SHA2_192s, 0, OSSL_SLH_PARAMS(192S), OSSL_SLH_DSA_SHA2_NUM_ZEROS_H_AND_T_BOUND2},
- {"SLH-DSA-SHAKE-192s", NID_SLH_DSA_SHAKE_192s, 1, OSSL_SLH_PARAMS(192S)},
- {"SLH-DSA-SHA2-192f", NID_SLH_DSA_SHA2_192f, 0, OSSL_SLH_PARAMS(192F), OSSL_SLH_DSA_SHA2_NUM_ZEROS_H_AND_T_BOUND2},
- {"SLH-DSA-SHAKE-192f", NID_SLH_DSA_SHAKE_192f, 1, OSSL_SLH_PARAMS(192F)},
- {"SLH-DSA-SHA2-256s", NID_SLH_DSA_SHA2_256s, 0, OSSL_SLH_PARAMS(256S), OSSL_SLH_DSA_SHA2_NUM_ZEROS_H_AND_T_BOUND2},
- {"SLH-DSA-SHAKE-256s", NID_SLH_DSA_SHAKE_256s, 1, OSSL_SLH_PARAMS(256S)},
- {"SLH-DSA-SHA2-256f", NID_SLH_DSA_SHA2_256f, 0, OSSL_SLH_PARAMS(256F), OSSL_SLH_DSA_SHA2_NUM_ZEROS_H_AND_T_BOUND2},
- {"SLH-DSA-SHAKE-256f", NID_SLH_DSA_SHAKE_256f, 1, OSSL_SLH_PARAMS(256F)},
- {NULL},
+ { "SLH-DSA-SHA2-128s", NID_SLH_DSA_SHA2_128s, 0, OSSL_SLH_PARAMS(128S), OSSL_SLH_DSA_SHA2_NUM_ZEROS_H_AND_T_BOUND1 },
+ { "SLH-DSA-SHAKE-128s", NID_SLH_DSA_SHAKE_128s, 1, OSSL_SLH_PARAMS(128S) },
+ { "SLH-DSA-SHA2-128f", NID_SLH_DSA_SHA2_128f, 0, OSSL_SLH_PARAMS(128F), OSSL_SLH_DSA_SHA2_NUM_ZEROS_H_AND_T_BOUND1 },
+ { "SLH-DSA-SHAKE-128f", NID_SLH_DSA_SHAKE_128f, 1, OSSL_SLH_PARAMS(128F) },
+ { "SLH-DSA-SHA2-192s", NID_SLH_DSA_SHA2_192s, 0, OSSL_SLH_PARAMS(192S), OSSL_SLH_DSA_SHA2_NUM_ZEROS_H_AND_T_BOUND2 },
+ { "SLH-DSA-SHAKE-192s", NID_SLH_DSA_SHAKE_192s, 1, OSSL_SLH_PARAMS(192S) },
+ { "SLH-DSA-SHA2-192f", NID_SLH_DSA_SHA2_192f, 0, OSSL_SLH_PARAMS(192F), OSSL_SLH_DSA_SHA2_NUM_ZEROS_H_AND_T_BOUND2 },
+ { "SLH-DSA-SHAKE-192f", NID_SLH_DSA_SHAKE_192f, 1, OSSL_SLH_PARAMS(192F) },
+ { "SLH-DSA-SHA2-256s", NID_SLH_DSA_SHA2_256s, 0, OSSL_SLH_PARAMS(256S), OSSL_SLH_DSA_SHA2_NUM_ZEROS_H_AND_T_BOUND2 },
+ { "SLH-DSA-SHAKE-256s", NID_SLH_DSA_SHAKE_256s, 1, OSSL_SLH_PARAMS(256S) },
+ { "SLH-DSA-SHA2-256f", NID_SLH_DSA_SHA2_256f, 0, OSSL_SLH_PARAMS(256F), OSSL_SLH_DSA_SHA2_NUM_ZEROS_H_AND_T_BOUND2 },
+ { "SLH-DSA-SHAKE-256f", NID_SLH_DSA_SHAKE_256f, 1, OSSL_SLH_PARAMS(256F) },
+ { NULL },
};
/**
diff --git a/crypto/slh_dsa/slh_params.h b/crypto/slh_dsa/slh_params.h
index 6a006d445a..fea14d5d6a 100644
--- a/crypto/slh_dsa/slh_params.h
+++ b/crypto/slh_dsa/slh_params.h
@@ -23,13 +23,13 @@ typedef struct slh_dsa_params_st {
const char *alg;
int type;
int is_shake;
- uint32_t n; /* Security parameter (Hash output size in bytes) (16, 24, 32) */
- uint32_t h; /* The total height of the tree (63, 64, 66, 68). #keypairs = 2^h */
- uint32_t d; /* The number of tree layers (7, 8, 17, 22) */
+ uint32_t n; /* Security parameter (Hash output size in bytes) (16, 24, 32) */
+ uint32_t h; /* The total height of the tree (63, 64, 66, 68). #keypairs = 2^h */
+ uint32_t d; /* The number of tree layers (7, 8, 17, 22) */
uint32_t hm; /* The height (h') of each merkle tree. (h = hm * d ) */
- uint32_t a; /* Height of a FORS tree */
- uint32_t k; /* The number of FORS trees */
- uint32_t m; /* The size of H_MSG() output */
+ uint32_t a; /* Height of a FORS tree */
+ uint32_t k; /* The number of FORS trees */
+ uint32_t m; /* The size of H_MSG() output */
uint32_t security_category;
uint32_t pk_len;
uint32_t sig_len;
diff --git a/crypto/slh_dsa/slh_wots.c b/crypto/slh_dsa/slh_wots.c
index 35288912b6..1c612e8561 100644
--- a/crypto/slh_dsa/slh_wots.c
+++ b/crypto/slh_dsa/slh_wots.c
@@ -31,7 +31,7 @@
* @param out The returned array of nibbles, with a size of 2*|in_len|
*/
static ossl_inline void slh_bytes_to_nibbles(const uint8_t *in, size_t in_len,
- uint8_t *out)
+ uint8_t *out)
{
size_t consumed = 0;
@@ -49,7 +49,7 @@ static ossl_inline void slh_bytes_to_nibbles(const uint8_t *in, size_t in_len,
* which does a complicated base2^b(tobyte()) operation.
*/
static ossl_inline void compute_checksum_nibbles(const uint8_t *in, size_t in_len,
- uint8_t *out)
+ uint8_t *out)
{
size_t i;
uint16_t csum = 0;
@@ -90,8 +90,8 @@ static ossl_inline void compute_checksum_nibbles(const uint8_t *in, size_t in_le
* @returns 1 on success, or 0 on error.
*/
static int slh_wots_chain(SLH_DSA_HASH_CTX *ctx, const uint8_t *in,
- uint8_t start_index, uint8_t steps,
- const uint8_t *pk_seed, uint8_t *adrs, WPACKET *wpkt)
+ uint8_t start_index, uint8_t steps,
+ const uint8_t *pk_seed, uint8_t *adrs, WPACKET *wpkt)
{
const SLH_DSA_KEY *key = ctx->key;
SLH_HASH_FUNC_DECLARE(key, hashf);
@@ -136,8 +136,8 @@ static int slh_wots_chain(SLH_DSA_HASH_CTX *ctx, const uint8_t *in,
* @returns 1 on success, or 0 on error.
*/
int ossl_slh_wots_pk_gen(SLH_DSA_HASH_CTX *ctx,
- const uint8_t *sk_seed, const uint8_t *pk_seed,
- uint8_t *adrs, uint8_t *pk_out, size_t pk_out_len)
+ const uint8_t *sk_seed, const uint8_t *pk_seed,
+ uint8_t *adrs, uint8_t *pk_out, size_t pk_out_len)
{
int ret = 0;
const SLH_DSA_KEY *key = ctx->key;
@@ -201,8 +201,8 @@ end:
* @returns 1 on success, or 0 on error.
*/
int ossl_slh_wots_sign(SLH_DSA_HASH_CTX *ctx, const uint8_t *msg,
- const uint8_t *sk_seed, const uint8_t *pk_seed,
- uint8_t *adrs, WPACKET *sig_wpkt)
+ const uint8_t *sk_seed, const uint8_t *pk_seed,
+ uint8_t *adrs, WPACKET *sig_wpkt)
{
int ret = 0;
const SLH_DSA_KEY *key = ctx->key;
@@ -211,7 +211,7 @@ int ossl_slh_wots_sign(SLH_DSA_HASH_CTX *ctx, const uint8_t *msg,
size_t i;
size_t n = key->params->n;
size_t len1 = SLH_WOTS_LEN1(n); /* 2 * n = the msg length in nibbles */
- size_t len = len1 + SLH_WOTS_LEN2; /* 2 * n + 3 (3 checksum nibbles) */
+ size_t len = len1 + SLH_WOTS_LEN2; /* 2 * n + 3 (3 checksum nibbles) */
SLH_ADRS_DECLARE(sk_adrs);
SLH_HASH_FUNC_DECLARE(key, hashf);
@@ -239,7 +239,7 @@ int ossl_slh_wots_sign(SLH_DSA_HASH_CTX *ctx, const uint8_t *msg,
set_chain_address(adrs, (uint32_t)i);
/* compute chain i signature */
if (!slh_wots_chain(ctx, sk, 0, msg_and_csum_nibbles[i],
- pk_seed, adrs, sig_wpkt))
+ pk_seed, adrs, sig_wpkt))
goto err;
}
ret = 1;
@@ -264,9 +264,9 @@ err:
* @returns 1 on success, or 0 on error.
*/
int ossl_slh_wots_pk_from_sig(SLH_DSA_HASH_CTX *ctx,
- PACKET *sig_rpkt, const uint8_t *msg,
- const uint8_t *pk_seed, uint8_t *adrs,
- uint8_t *pk_out, size_t pk_out_len)
+ PACKET *sig_rpkt, const uint8_t *msg,
+ const uint8_t *pk_seed, uint8_t *adrs,
+ uint8_t *pk_out, size_t pk_out_len)
{
int ret = 0;
const SLH_DSA_KEY *key = ctx->key;
@@ -275,7 +275,7 @@ int ossl_slh_wots_pk_from_sig(SLH_DSA_HASH_CTX *ctx,
size_t n = key->params->n;
size_t len1 = SLH_WOTS_LEN1(n);
size_t len = len1 + SLH_WOTS_LEN2; /* 2n + 3 */
- const uint8_t *sig_i; /* Pointer into |sig_rpkt| buffer */
+ const uint8_t *sig_i; /* Pointer into |sig_rpkt| buffer */
uint8_t tmp[SLH_WOTS_LEN_MAX * SLH_MAX_N];
WPACKET pkt, *tmp_pkt = &pkt;
size_t tmp_len = 0;
@@ -295,9 +295,9 @@ int ossl_slh_wots_pk_from_sig(SLH_DSA_HASH_CTX *ctx,
for (i = 0; i < len; ++i) {
set_chain_address(adrs, (uint32_t)i);
if (!PACKET_get_bytes(sig_rpkt, &sig_i, n)
- || !slh_wots_chain(ctx, sig_i, msg_and_csum_nibbles[i],
- NIBBLE_MASK - msg_and_csum_nibbles[i],
- pk_seed, adrs, tmp_pkt))
+ || !slh_wots_chain(ctx, sig_i, msg_and_csum_nibbles[i],
+ NIBBLE_MASK - msg_and_csum_nibbles[i],
+ pk_seed, adrs, tmp_pkt))
goto err;
}
/* compress the computed public key value */
@@ -307,8 +307,8 @@ int ossl_slh_wots_pk_from_sig(SLH_DSA_HASH_CTX *ctx,
if (!WPACKET_get_total_written(tmp_pkt, &tmp_len))
goto err;
ret = hashf->T(ctx, pk_seed, wots_pk_adrs, tmp, tmp_len,
- pk_out, pk_out_len);
- err:
+ pk_out, pk_out_len);
+err:
if (!WPACKET_finish(tmp_pkt))
ret = 0;
return ret;
diff --git a/crypto/slh_dsa/slh_xmss.c b/crypto/slh_dsa/slh_xmss.c
index c78a1571c6..dae036c6a2 100644
--- a/crypto/slh_dsa/slh_xmss.c
+++ b/crypto/slh_dsa/slh_xmss.c
@@ -33,9 +33,9 @@
* @returns 1 on success, or 0 on error.
*/
int ossl_slh_xmss_node(SLH_DSA_HASH_CTX *ctx, const uint8_t *sk_seed,
- uint32_t node_id, uint32_t h,
- const uint8_t *pk_seed, uint8_t *adrs,
- uint8_t *pk_out, size_t pk_out_len)
+ uint32_t node_id, uint32_t h,
+ const uint8_t *pk_seed, uint8_t *adrs,
+ uint8_t *pk_out, size_t pk_out_len)
{
const SLH_DSA_KEY *key = ctx->key;
SLH_ADRS_FUNC_DECLARE(key, adrsf);
@@ -45,15 +45,15 @@ int ossl_slh_xmss_node(SLH_DSA_HASH_CTX *ctx, const uint8_t *sk_seed,
adrsf->set_type_and_clear(adrs, SLH_ADRS_TYPE_WOTS_HASH);
adrsf->set_keypair_address(adrs, node_id);
if (!ossl_slh_wots_pk_gen(ctx, sk_seed, pk_seed, adrs,
- pk_out, pk_out_len))
+ pk_out, pk_out_len))
return 0;
} else {
uint8_t lnode[SLH_MAX_N], rnode[SLH_MAX_N];
if (!ossl_slh_xmss_node(ctx, sk_seed, 2 * node_id, h - 1, pk_seed, adrs,
- lnode, sizeof(lnode))
- || !ossl_slh_xmss_node(ctx, sk_seed, 2 * node_id + 1, h - 1,
- pk_seed, adrs, rnode, sizeof(rnode)))
+ lnode, sizeof(lnode))
+ || !ossl_slh_xmss_node(ctx, sk_seed, 2 * node_id + 1, h - 1,
+ pk_seed, adrs, rnode, sizeof(rnode)))
return 0;
adrsf->set_type_and_clear(adrs, SLH_ADRS_TYPE_TREE);
adrsf->set_tree_height(adrs, h);
@@ -83,8 +83,8 @@ int ossl_slh_xmss_node(SLH_DSA_HASH_CTX *ctx, const uint8_t *sk_seed,
* @returns 1 on success, or 0 on error.
*/
int ossl_slh_xmss_sign(SLH_DSA_HASH_CTX *ctx, const uint8_t *msg,
- const uint8_t *sk_seed, uint32_t node_id,
- const uint8_t *pk_seed, uint8_t *adrs, WPACKET *sig_wpkt)
+ const uint8_t *sk_seed, uint32_t node_id,
+ const uint8_t *pk_seed, uint8_t *adrs, WPACKET *sig_wpkt)
{
const SLH_DSA_KEY *key = ctx->key;
SLH_ADRS_FUNC_DECLARE(key, adrsf);
@@ -108,8 +108,8 @@ int ossl_slh_xmss_sign(SLH_DSA_HASH_CTX *ctx, const uint8_t *msg,
adrsf->copy(adrs, tmp_adrs);
for (h = 0; h < hm; ++h) {
if (!WPACKET_allocate_bytes(sig_wpkt, auth_path_len, &auth_path)
- || !ossl_slh_xmss_node(ctx, sk_seed, id ^ 1, h, pk_seed, adrs,
- auth_path, auth_path_len))
+ || !ossl_slh_xmss_node(ctx, sk_seed, id ^ 1, h, pk_seed, adrs,
+ auth_path, auth_path_len))
return 0;
id >>= 1;
}
@@ -137,9 +137,9 @@ int ossl_slh_xmss_sign(SLH_DSA_HASH_CTX *ctx, const uint8_t *msg,
* @returns 1 on success, or 0 on error.
*/
int ossl_slh_xmss_pk_from_sig(SLH_DSA_HASH_CTX *ctx, uint32_t node_id,
- PACKET *sig_rpkt, const uint8_t *msg,
- const uint8_t *pk_seed, uint8_t *adrs,
- uint8_t *pk_out, size_t pk_out_len)
+ PACKET *sig_rpkt, const uint8_t *msg,
+ const uint8_t *pk_seed, uint8_t *adrs,
+ uint8_t *pk_out, size_t pk_out_len)
{
const SLH_DSA_KEY *key = ctx->key;
SLH_HASH_FUNC_DECLARE(key, hashf);
@@ -156,7 +156,7 @@ int ossl_slh_xmss_pk_from_sig(SLH_DSA_HASH_CTX *ctx, uint32_t node_id,
adrsf->set_type_and_clear(adrs, SLH_ADRS_TYPE_WOTS_HASH);
adrsf->set_keypair_address(adrs, node_id);
if (!ossl_slh_wots_pk_from_sig(ctx, sig_rpkt, msg, pk_seed, adrs,
- node, pk_out_len))
+ node, pk_out_len))
return 0;
adrsf->set_type_and_clear(adrs, SLH_ADRS_TYPE_TREE);
diff --git a/crypto/sm2/sm2_crypt.c b/crypto/sm2/sm2_crypt.c
index c1ebd2eccb..7a8c758552 100644
--- a/crypto/sm2/sm2_crypt.c
+++ b/crypto/sm2/sm2_crypt.c
@@ -67,7 +67,7 @@ static int is_all_zeros(const unsigned char *msg, size_t msglen)
}
int ossl_sm2_plaintext_size(const unsigned char *ct, size_t ct_size,
- size_t *pt_size)
+ size_t *pt_size)
{
struct SM2_Ciphertext_st *sm2_ctext = NULL;
@@ -85,19 +85,19 @@ int ossl_sm2_plaintext_size(const unsigned char *ct, size_t ct_size,
}
int ossl_sm2_ciphertext_size(const EC_KEY *key, const EVP_MD *digest,
- size_t msg_len, size_t *ct_size)
+ size_t msg_len, size_t *ct_size)
{
const int field_size = ec_field_size(EC_KEY_get0_group(key));
const int md_size = EVP_MD_get_size(digest);
int sz;
- if (field_size == 0 || md_size <= 0 || msg_len > INT_MAX/2)
+ if (field_size == 0 || md_size <= 0 || msg_len > INT_MAX / 2)
return 0;
/* Integer and string are simple type; set constructed = 0, means primitive and definite length encoding. */
sz = 2 * ASN1_object_size(0, field_size + 1, V_ASN1_INTEGER)
- + ASN1_object_size(0, md_size, V_ASN1_OCTET_STRING)
- + ASN1_object_size(0, (int)msg_len, V_ASN1_OCTET_STRING);
+ + ASN1_object_size(0, md_size, V_ASN1_OCTET_STRING)
+ + ASN1_object_size(0, (int)msg_len, V_ASN1_OCTET_STRING);
/* Sequence is structured type; set constructed = 1, means constructed and definite length encoding. */
*ct_size = (size_t)ASN1_object_size(1, sz, V_ASN1_SEQUENCE);
@@ -105,9 +105,9 @@ int ossl_sm2_ciphertext_size(const EC_KEY *key, const EVP_MD *digest,
}
int ossl_sm2_encrypt(const EC_KEY *key,
- const EVP_MD *digest,
- const uint8_t *msg, size_t msg_len,
- uint8_t *ciphertext_buf, size_t *ciphertext_len)
+ const EVP_MD *digest,
+ const uint8_t *msg, size_t msg_len,
+ uint8_t *ciphertext_buf, size_t *ciphertext_len)
{
int rc = 0, ciphertext_leni;
size_t i;
@@ -137,7 +137,7 @@ int ossl_sm2_encrypt(const EC_KEY *key,
ctext_struct.C2 = NULL;
ctext_struct.C3 = NULL;
- if (msg_len > INT_MAX/2) {
+ if (msg_len > INT_MAX / 2) {
ERR_raise(ERR_LIB_SM2, ERR_R_PASSED_INVALID_ARGUMENT);
goto done;
}
@@ -187,7 +187,7 @@ int ossl_sm2_encrypt(const EC_KEY *key,
msg_mask = OPENSSL_zalloc(msg_len);
if (msg_mask == NULL)
- goto done;
+ goto done;
again:
if (!BN_priv_rand_range_ex(k, order, 0, ctx)) {
@@ -196,22 +196,22 @@ again:
}
if (!EC_POINT_mul(group, kG, k, NULL, NULL, ctx)
- || !EC_POINT_get_affine_coordinates(group, kG, x1, y1, ctx)
- || !EC_POINT_mul(group, kP, NULL, P, k, ctx)
- || !EC_POINT_get_affine_coordinates(group, kP, x2, y2, ctx)) {
+ || !EC_POINT_get_affine_coordinates(group, kG, x1, y1, ctx)
+ || !EC_POINT_mul(group, kP, NULL, P, k, ctx)
+ || !EC_POINT_get_affine_coordinates(group, kP, x2, y2, ctx)) {
ERR_raise(ERR_LIB_SM2, ERR_R_EC_LIB);
goto done;
}
if (BN_bn2binpad(x2, x2y2, field_size) < 0
- || BN_bn2binpad(y2, x2y2 + field_size, field_size) < 0) {
+ || BN_bn2binpad(y2, x2y2 + field_size, field_size) < 0) {
ERR_raise(ERR_LIB_SM2, ERR_R_INTERNAL_ERROR);
goto done;
}
/* X9.63 with no salt happens to match the KDF used in SM2 */
if (!ossl_ecdh_kdf_X9_63(msg_mask, msg_len, x2y2, 2 * field_size, NULL, 0,
- digest, libctx, propq)) {
+ digest, libctx, propq)) {
ERR_raise(ERR_LIB_SM2, ERR_R_EVP_LIB);
goto done;
}
@@ -230,10 +230,10 @@ again:
goto done;
}
if (EVP_DigestInit(hash, fetched_digest) == 0
- || EVP_DigestUpdate(hash, x2y2, field_size) == 0
- || EVP_DigestUpdate(hash, msg, msg_len) == 0
- || EVP_DigestUpdate(hash, x2y2 + field_size, field_size) == 0
- || EVP_DigestFinal(hash, C3, NULL) == 0) {
+ || EVP_DigestUpdate(hash, x2y2, field_size) == 0
+ || EVP_DigestUpdate(hash, msg, msg_len) == 0
+ || EVP_DigestUpdate(hash, x2y2 + field_size, field_size) == 0
+ || EVP_DigestFinal(hash, C3, NULL) == 0) {
ERR_raise(ERR_LIB_SM2, ERR_R_EVP_LIB);
goto done;
}
@@ -244,11 +244,11 @@ again:
ctext_struct.C2 = ASN1_OCTET_STRING_new();
if (ctext_struct.C3 == NULL || ctext_struct.C2 == NULL) {
- ERR_raise(ERR_LIB_SM2, ERR_R_ASN1_LIB);
- goto done;
+ ERR_raise(ERR_LIB_SM2, ERR_R_ASN1_LIB);
+ goto done;
}
if (!ASN1_OCTET_STRING_set(ctext_struct.C3, C3, C3_size)
- || !ASN1_OCTET_STRING_set(ctext_struct.C2, msg_mask, (int)msg_len)) {
+ || !ASN1_OCTET_STRING_set(ctext_struct.C2, msg_mask, (int)msg_len)) {
ERR_raise(ERR_LIB_SM2, ERR_R_INTERNAL_ERROR);
goto done;
}
@@ -263,7 +263,7 @@ again:
rc = 1;
- done:
+done:
EVP_MD_free(fetched_digest);
ASN1_OCTET_STRING_free(ctext_struct.C2);
ASN1_OCTET_STRING_free(ctext_struct.C3);
@@ -278,9 +278,9 @@ again:
}
int ossl_sm2_decrypt(const EC_KEY *key,
- const EVP_MD *digest,
- const uint8_t *ciphertext, size_t ciphertext_len,
- uint8_t *ptext_buf, size_t *ptext_len)
+ const EVP_MD *digest,
+ const uint8_t *ciphertext, size_t ciphertext_len,
+ uint8_t *ptext_buf, size_t *ptext_len)
{
int rc = 0;
int i;
@@ -303,7 +303,7 @@ int ossl_sm2_decrypt(const EC_KEY *key,
const char *propq = ossl_ec_key_get0_propq(key);
if (field_size == 0 || hash_size <= 0 || ciphertext_len > LONG_MAX)
- goto done;
+ goto done;
memset(ptext_buf, 0xFF, *ptext_len);
@@ -356,18 +356,18 @@ int ossl_sm2_decrypt(const EC_KEY *key,
}
if (!EC_POINT_set_affine_coordinates(group, C1, sm2_ctext->C1x,
- sm2_ctext->C1y, ctx)
- || !EC_POINT_mul(group, C1, NULL, C1, EC_KEY_get0_private_key(key),
- ctx)
- || !EC_POINT_get_affine_coordinates(group, C1, x2, y2, ctx)) {
+ sm2_ctext->C1y, ctx)
+ || !EC_POINT_mul(group, C1, NULL, C1, EC_KEY_get0_private_key(key),
+ ctx)
+ || !EC_POINT_get_affine_coordinates(group, C1, x2, y2, ctx)) {
ERR_raise(ERR_LIB_SM2, ERR_R_EC_LIB);
goto done;
}
if (BN_bn2binpad(x2, x2y2, field_size) < 0
- || BN_bn2binpad(y2, x2y2 + field_size, field_size) < 0
- || !ossl_ecdh_kdf_X9_63(msg_mask, msg_len, x2y2, 2 * field_size,
- NULL, 0, digest, libctx, propq)) {
+ || BN_bn2binpad(y2, x2y2 + field_size, field_size) < 0
+ || !ossl_ecdh_kdf_X9_63(msg_mask, msg_len, x2y2, 2 * field_size,
+ NULL, 0, digest, libctx, propq)) {
ERR_raise(ERR_LIB_SM2, ERR_R_INTERNAL_ERROR);
goto done;
}
@@ -387,10 +387,10 @@ int ossl_sm2_decrypt(const EC_KEY *key,
}
if (!EVP_DigestInit(hash, digest)
- || !EVP_DigestUpdate(hash, x2y2, field_size)
- || !EVP_DigestUpdate(hash, ptext_buf, msg_len)
- || !EVP_DigestUpdate(hash, x2y2 + field_size, field_size)
- || !EVP_DigestFinal(hash, computed_C3, NULL)) {
+ || !EVP_DigestUpdate(hash, x2y2, field_size)
+ || !EVP_DigestUpdate(hash, ptext_buf, msg_len)
+ || !EVP_DigestUpdate(hash, x2y2 + field_size, field_size)
+ || !EVP_DigestFinal(hash, computed_C3, NULL)) {
ERR_raise(ERR_LIB_SM2, ERR_R_EVP_LIB);
goto done;
}
@@ -403,7 +403,7 @@ int ossl_sm2_decrypt(const EC_KEY *key,
rc = 1;
*ptext_len = msg_len;
- done:
+done:
if (rc == 0)
memset(ptext_buf, 0, *ptext_len);
diff --git a/crypto/sm2/sm2_err.c b/crypto/sm2/sm2_err.c
index d420d4e597..2cb3de1c9e 100644
--- a/crypto/sm2/sm2_err.c
+++ b/crypto/sm2/sm2_err.c
@@ -13,36 +13,36 @@
#ifndef OPENSSL_NO_SM2
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA SM2_str_reasons[] = {
- {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_ASN1_ERROR), "asn1 error"},
- {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_BAD_SIGNATURE), "bad signature"},
- {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_BUFFER_TOO_SMALL), "buffer too small"},
- {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_DIST_ID_TOO_LARGE), "dist id too large"},
- {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_ID_NOT_SET), "id not set"},
- {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_ID_TOO_LARGE), "id too large"},
- {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_INVALID_CURVE), "invalid curve"},
- {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_INVALID_DIGEST), "invalid digest"},
- {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_INVALID_DIGEST_TYPE),
- "invalid digest type"},
- {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_INVALID_ENCODING), "invalid encoding"},
- {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_INVALID_FIELD), "invalid field"},
- {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_INVALID_PRIVATE_KEY),
- "invalid private key"},
- {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_NO_PARAMETERS_SET), "no parameters set"},
- {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_USER_ID_TOO_LARGE), "user id too large"},
- {0, NULL}
+ { ERR_PACK(ERR_LIB_SM2, 0, SM2_R_ASN1_ERROR), "asn1 error" },
+ { ERR_PACK(ERR_LIB_SM2, 0, SM2_R_BAD_SIGNATURE), "bad signature" },
+ { ERR_PACK(ERR_LIB_SM2, 0, SM2_R_BUFFER_TOO_SMALL), "buffer too small" },
+ { ERR_PACK(ERR_LIB_SM2, 0, SM2_R_DIST_ID_TOO_LARGE), "dist id too large" },
+ { ERR_PACK(ERR_LIB_SM2, 0, SM2_R_ID_NOT_SET), "id not set" },
+ { ERR_PACK(ERR_LIB_SM2, 0, SM2_R_ID_TOO_LARGE), "id too large" },
+ { ERR_PACK(ERR_LIB_SM2, 0, SM2_R_INVALID_CURVE), "invalid curve" },
+ { ERR_PACK(ERR_LIB_SM2, 0, SM2_R_INVALID_DIGEST), "invalid digest" },
+ { ERR_PACK(ERR_LIB_SM2, 0, SM2_R_INVALID_DIGEST_TYPE),
+ "invalid digest type" },
+ { ERR_PACK(ERR_LIB_SM2, 0, SM2_R_INVALID_ENCODING), "invalid encoding" },
+ { ERR_PACK(ERR_LIB_SM2, 0, SM2_R_INVALID_FIELD), "invalid field" },
+ { ERR_PACK(ERR_LIB_SM2, 0, SM2_R_INVALID_PRIVATE_KEY),
+ "invalid private key" },
+ { ERR_PACK(ERR_LIB_SM2, 0, SM2_R_NO_PARAMETERS_SET), "no parameters set" },
+ { ERR_PACK(ERR_LIB_SM2, 0, SM2_R_USER_ID_TOO_LARGE), "user id too large" },
+ { 0, NULL }
};
-# endif
+#endif
int ossl_err_load_SM2_strings(void)
{
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(SM2_str_reasons[0].error) == NULL)
ERR_load_strings_const(SM2_str_reasons);
-# endif
+#endif
return 1;
}
#else
diff --git a/crypto/sm2/sm2_key.c b/crypto/sm2/sm2_key.c
index e3a10d38e7..ce8e7087db 100644
--- a/crypto/sm2/sm2_key.c
+++ b/crypto/sm2/sm2_key.c
@@ -27,9 +27,9 @@ int ossl_sm2_key_private_check(const EC_KEY *eckey)
const BIGNUM *priv_key = NULL, *order = NULL;
if (eckey == NULL
- || (group = EC_KEY_get0_group(eckey)) == NULL
- || (priv_key = EC_KEY_get0_private_key(eckey)) == NULL
- || (order = EC_GROUP_get0_order(group)) == NULL) {
+ || (group = EC_KEY_get0_group(eckey)) == NULL
+ || (priv_key = EC_KEY_get0_private_key(eckey)) == NULL
+ || (order = EC_GROUP_get0_order(group)) == NULL) {
ERR_raise(ERR_LIB_SM2, ERR_R_PASSED_NULL_PARAMETER);
return 0;
}
@@ -45,7 +45,7 @@ int ossl_sm2_key_private_check(const EC_KEY *eckey)
}
ret = 1;
- end:
+end:
BN_free(max);
return ret;
}
diff --git a/crypto/sm2/sm2_sign.c b/crypto/sm2/sm2_sign.c
index 7c49128b47..590a730974 100644
--- a/crypto/sm2/sm2_sign.c
+++ b/crypto/sm2/sm2_sign.c
@@ -21,10 +21,10 @@
#include <string.h>
int ossl_sm2_compute_z_digest(uint8_t *out,
- const EVP_MD *digest,
- const uint8_t *id,
- const size_t id_len,
- const EC_KEY *key)
+ const EVP_MD *digest,
+ const uint8_t *id,
+ const size_t id_len,
+ const EC_KEY *key)
{
int rc = 0;
const EC_GROUP *group = EC_KEY_get0_group(key);
@@ -115,31 +115,31 @@ int ossl_sm2_compute_z_digest(uint8_t *out,
goto done;
if (BN_bn2binpad(a, buf, p_bytes) < 0
- || !EVP_DigestUpdate(hash, buf, p_bytes)
- || BN_bn2binpad(b, buf, p_bytes) < 0
- || !EVP_DigestUpdate(hash, buf, p_bytes)
- || !EC_POINT_get_affine_coordinates(group,
- EC_GROUP_get0_generator(group),
- xG, yG, ctx)
- || BN_bn2binpad(xG, buf, p_bytes) < 0
- || !EVP_DigestUpdate(hash, buf, p_bytes)
- || BN_bn2binpad(yG, buf, p_bytes) < 0
- || !EVP_DigestUpdate(hash, buf, p_bytes)
- || !EC_POINT_get_affine_coordinates(group,
- pubkey,
- xA, yA, ctx)
- || BN_bn2binpad(xA, buf, p_bytes) < 0
- || !EVP_DigestUpdate(hash, buf, p_bytes)
- || BN_bn2binpad(yA, buf, p_bytes) < 0
- || !EVP_DigestUpdate(hash, buf, p_bytes)
- || !EVP_DigestFinal(hash, out, NULL)) {
+ || !EVP_DigestUpdate(hash, buf, p_bytes)
+ || BN_bn2binpad(b, buf, p_bytes) < 0
+ || !EVP_DigestUpdate(hash, buf, p_bytes)
+ || !EC_POINT_get_affine_coordinates(group,
+ EC_GROUP_get0_generator(group),
+ xG, yG, ctx)
+ || BN_bn2binpad(xG, buf, p_bytes) < 0
+ || !EVP_DigestUpdate(hash, buf, p_bytes)
+ || BN_bn2binpad(yG, buf, p_bytes) < 0
+ || !EVP_DigestUpdate(hash, buf, p_bytes)
+ || !EC_POINT_get_affine_coordinates(group,
+ pubkey,
+ xA, yA, ctx)
+ || BN_bn2binpad(xA, buf, p_bytes) < 0
+ || !EVP_DigestUpdate(hash, buf, p_bytes)
+ || BN_bn2binpad(yA, buf, p_bytes) < 0
+ || !EVP_DigestUpdate(hash, buf, p_bytes)
+ || !EVP_DigestFinal(hash, out, NULL)) {
ERR_raise(ERR_LIB_SM2, ERR_R_INTERNAL_ERROR);
goto done;
}
rc = 1;
- done:
+done:
OPENSSL_free(buf);
BN_CTX_free(ctx);
EVP_MD_CTX_free(hash);
@@ -147,10 +147,10 @@ int ossl_sm2_compute_z_digest(uint8_t *out,
}
static BIGNUM *sm2_compute_msg_hash(const EVP_MD *digest,
- const EC_KEY *key,
- const uint8_t *id,
- const size_t id_len,
- const uint8_t *msg, size_t msg_len)
+ const EC_KEY *key,
+ const uint8_t *id,
+ const size_t id_len,
+ const uint8_t *msg, size_t msg_len)
{
EVP_MD_CTX *hash = EVP_MD_CTX_new();
const int md_size = EVP_MD_get_size(digest);
@@ -185,10 +185,10 @@ static BIGNUM *sm2_compute_msg_hash(const EVP_MD *digest,
}
if (!EVP_DigestInit(hash, fetched_digest)
- || !EVP_DigestUpdate(hash, z, md_size)
- || !EVP_DigestUpdate(hash, msg, msg_len)
- /* reuse z buffer to hold H(Z || M) */
- || !EVP_DigestFinal(hash, z, NULL)) {
+ || !EVP_DigestUpdate(hash, z, md_size)
+ || !EVP_DigestUpdate(hash, msg, msg_len)
+ /* reuse z buffer to hold H(Z || M) */
+ || !EVP_DigestFinal(hash, z, NULL)) {
ERR_raise(ERR_LIB_SM2, ERR_R_EVP_LIB);
goto done;
}
@@ -197,7 +197,7 @@ static BIGNUM *sm2_compute_msg_hash(const EVP_MD *digest,
if (e == NULL)
ERR_raise(ERR_LIB_SM2, ERR_R_INTERNAL_ERROR);
- done:
+done:
EVP_MD_free(fetched_digest);
OPENSSL_free(z);
EVP_MD_CTX_free(hash);
@@ -273,9 +273,9 @@ static ECDSA_SIG *sm2_sig_gen(const EC_KEY *key, const BIGNUM *e)
}
if (!EC_POINT_mul(group, kG, k, NULL, NULL, ctx)
- || !EC_POINT_get_affine_coordinates(group, kG, x1, NULL,
- ctx)
- || !BN_mod_add(r, e, x1, order, ctx)) {
+ || !EC_POINT_get_affine_coordinates(group, kG, x1, NULL,
+ ctx)
+ || !BN_mod_add(r, e, x1, order, ctx)) {
ERR_raise(ERR_LIB_SM2, ERR_R_INTERNAL_ERROR);
goto done;
}
@@ -293,10 +293,10 @@ static ECDSA_SIG *sm2_sig_gen(const EC_KEY *key, const BIGNUM *e)
continue;
if (!BN_add(s, dA, BN_value_one())
- || !ossl_ec_group_do_inverse_ord(group, s, s, ctx)
- || !BN_mod_mul(tmp, dA, r, order, ctx)
- || !BN_sub(tmp, k, tmp)
- || !BN_mod_mul(s, s, tmp, order, ctx)) {
+ || !ossl_ec_group_do_inverse_ord(group, s, s, ctx)
+ || !BN_mod_mul(tmp, dA, r, order, ctx)
+ || !BN_sub(tmp, k, tmp)
+ || !BN_mod_mul(s, s, tmp, order, ctx)) {
ERR_raise(ERR_LIB_SM2, ERR_R_BN_LIB);
goto done;
}
@@ -311,12 +311,12 @@ static ECDSA_SIG *sm2_sig_gen(const EC_KEY *key, const BIGNUM *e)
goto done;
}
- /* takes ownership of r and s */
+ /* takes ownership of r and s */
ECDSA_SIG_set0(sig, r, s);
break;
}
- done:
+done:
if (sig == NULL) {
BN_free(r);
BN_free(s);
@@ -328,7 +328,7 @@ static ECDSA_SIG *sm2_sig_gen(const EC_KEY *key, const BIGNUM *e)
}
static int sm2_sig_verify(const EC_KEY *key, const ECDSA_SIG *sig,
- const BIGNUM *e)
+ const BIGNUM *e)
{
int ret = 0;
const EC_GROUP *group = EC_KEY_get0_group(key);
@@ -373,9 +373,9 @@ static int sm2_sig_verify(const EC_KEY *key, const ECDSA_SIG *sig,
ECDSA_SIG_get0(sig, &r, &s);
if (BN_cmp(r, BN_value_one()) < 0
- || BN_cmp(s, BN_value_one()) < 0
- || BN_cmp(order, r) <= 0
- || BN_cmp(order, s) <= 0) {
+ || BN_cmp(s, BN_value_one()) < 0
+ || BN_cmp(order, r) <= 0
+ || BN_cmp(order, s) <= 0) {
ERR_raise(ERR_LIB_SM2, SM2_R_BAD_SIGNATURE);
goto done;
}
@@ -391,7 +391,7 @@ static int sm2_sig_verify(const EC_KEY *key, const ECDSA_SIG *sig,
}
if (!EC_POINT_mul(group, pt, s, EC_KEY_get0_public_key(key), t, ctx)
- || !EC_POINT_get_affine_coordinates(group, pt, x1, NULL, ctx)) {
+ || !EC_POINT_get_affine_coordinates(group, pt, x1, NULL, ctx)) {
ERR_raise(ERR_LIB_SM2, ERR_R_EC_LIB);
goto done;
}
@@ -404,7 +404,7 @@ static int sm2_sig_verify(const EC_KEY *key, const ECDSA_SIG *sig,
if (BN_cmp(r, t) == 0)
ret = 1;
- done:
+done:
BN_CTX_end(ctx);
EC_POINT_free(pt);
BN_CTX_free(ctx);
@@ -412,10 +412,10 @@ static int sm2_sig_verify(const EC_KEY *key, const ECDSA_SIG *sig,
}
ECDSA_SIG *ossl_sm2_do_sign(const EC_KEY *key,
- const EVP_MD *digest,
- const uint8_t *id,
- const size_t id_len,
- const uint8_t *msg, size_t msg_len)
+ const EVP_MD *digest,
+ const uint8_t *id,
+ const size_t id_len,
+ const uint8_t *msg, size_t msg_len)
{
BIGNUM *e = NULL;
ECDSA_SIG *sig = NULL;
@@ -428,17 +428,17 @@ ECDSA_SIG *ossl_sm2_do_sign(const EC_KEY *key,
sig = sm2_sig_gen(key, e);
- done:
+done:
BN_free(e);
return sig;
}
int ossl_sm2_do_verify(const EC_KEY *key,
- const EVP_MD *digest,
- const ECDSA_SIG *sig,
- const uint8_t *id,
- const size_t id_len,
- const uint8_t *msg, size_t msg_len)
+ const EVP_MD *digest,
+ const ECDSA_SIG *sig,
+ const uint8_t *id,
+ const size_t id_len,
+ const uint8_t *msg, size_t msg_len)
{
BIGNUM *e = NULL;
int ret = 0;
@@ -451,14 +451,14 @@ int ossl_sm2_do_verify(const EC_KEY *key,
ret = sm2_sig_verify(key, sig, e);
- done:
+done:
BN_free(e);
return ret;
}
int ossl_sm2_internal_sign(const unsigned char *dgst, int dgstlen,
- unsigned char *sig, unsigned int *siglen,
- EC_KEY *eckey)
+ unsigned char *sig, unsigned int *siglen,
+ EC_KEY *eckey)
{
BIGNUM *e = NULL;
ECDSA_SIG *s = NULL;
@@ -472,8 +472,8 @@ int ossl_sm2_internal_sign(const unsigned char *dgst, int dgstlen,
e = BN_bin2bn(dgst, dgstlen, NULL);
if (e == NULL) {
- ERR_raise(ERR_LIB_SM2, ERR_R_BN_LIB);
- goto done;
+ ERR_raise(ERR_LIB_SM2, ERR_R_BN_LIB);
+ goto done;
}
s = sm2_sig_gen(eckey, e);
@@ -484,22 +484,22 @@ int ossl_sm2_internal_sign(const unsigned char *dgst, int dgstlen,
sigleni = i2d_ECDSA_SIG(s, &sig);
if (sigleni < 0) {
- ERR_raise(ERR_LIB_SM2, ERR_R_INTERNAL_ERROR);
- goto done;
+ ERR_raise(ERR_LIB_SM2, ERR_R_INTERNAL_ERROR);
+ goto done;
}
*siglen = (unsigned int)sigleni;
ret = 1;
- done:
+done:
ECDSA_SIG_free(s);
BN_free(e);
return ret;
}
int ossl_sm2_internal_verify(const unsigned char *dgst, int dgstlen,
- const unsigned char *sig, int sig_len,
- EC_KEY *eckey)
+ const unsigned char *sig, int sig_len,
+ EC_KEY *eckey)
{
ECDSA_SIG *s = NULL;
BIGNUM *e = NULL;
@@ -532,7 +532,7 @@ int ossl_sm2_internal_verify(const unsigned char *dgst, int dgstlen,
ret = sm2_sig_verify(eckey, s, e);
- done:
+done:
OPENSSL_free(der);
BN_free(e);
ECDSA_SIG_free(s);
diff --git a/crypto/sm3/legacy_sm3.c b/crypto/sm3/legacy_sm3.c
index c81f3b4ab4..7f5ee97807 100644
--- a/crypto/sm3/legacy_sm3.c
+++ b/crypto/sm3/legacy_sm3.c
@@ -8,7 +8,6 @@
* https://www.openssl.org/source/license.html
*/
-
#include "crypto/evp.h"
#include "../evp/legacy_meth.h"
#include "internal/sm3.h"
@@ -22,7 +21,7 @@ static const EVP_MD sm3_md = {
0,
EVP_ORIG_GLOBAL,
LEGACY_EVP_MD_METH_TABLE(sm3_int_init, sm3_int_update, sm3_int_final, NULL,
- SM3_CBLOCK),
+ SM3_CBLOCK),
};
const EVP_MD *EVP_sm3(void)
diff --git a/crypto/sm3/sm3.c b/crypto/sm3/sm3.c
index ff78fb763e..ebdbd8bdb9 100644
--- a/crypto/sm3/sm3.c
+++ b/crypto/sm3/sm3.c
@@ -46,9 +46,9 @@ void ossl_sm3_block_data_order(SM3_CTX *ctx, const void *p, size_t num)
H = ctx->H;
/*
- * We have to load all message bytes immediately since SM3 reads
- * them slightly out of order.
- */
+ * We have to load all message bytes immediately since SM3 reads
+ * them slightly out of order.
+ */
(void)HOST_c2l(data, W00);
(void)HOST_c2l(data, W01);
(void)HOST_c2l(data, W02);
diff --git a/crypto/sm3/sm3_local.h b/crypto/sm3/sm3_local.h
index 0e06d251ac..d6c9a96710 100644
--- a/crypto/sm3/sm3_local.h
+++ b/crypto/sm3/sm3_local.h
@@ -15,47 +15,55 @@
#define DATA_ORDER_IS_BIG_ENDIAN
-#define HASH_LONG SM3_WORD
-#define HASH_CTX SM3_CTX
-#define HASH_CBLOCK SM3_CBLOCK
-#define HASH_UPDATE ossl_sm3_update
-#define HASH_TRANSFORM ossl_sm3_transform
-#define HASH_FINAL ossl_sm3_final
-#define HASH_MAKE_STRING(c, s) \
- do { \
- unsigned long ll; \
- ll=(c)->A; (void)HOST_l2c(ll, (s)); \
- ll=(c)->B; (void)HOST_l2c(ll, (s)); \
- ll=(c)->C; (void)HOST_l2c(ll, (s)); \
- ll=(c)->D; (void)HOST_l2c(ll, (s)); \
- ll=(c)->E; (void)HOST_l2c(ll, (s)); \
- ll=(c)->F; (void)HOST_l2c(ll, (s)); \
- ll=(c)->G; (void)HOST_l2c(ll, (s)); \
- ll=(c)->H; (void)HOST_l2c(ll, (s)); \
- } while (0)
+#define HASH_LONG SM3_WORD
+#define HASH_CTX SM3_CTX
+#define HASH_CBLOCK SM3_CBLOCK
+#define HASH_UPDATE ossl_sm3_update
+#define HASH_TRANSFORM ossl_sm3_transform
+#define HASH_FINAL ossl_sm3_final
+#define HASH_MAKE_STRING(c, s) \
+ do { \
+ unsigned long ll; \
+ ll = (c)->A; \
+ (void)HOST_l2c(ll, (s)); \
+ ll = (c)->B; \
+ (void)HOST_l2c(ll, (s)); \
+ ll = (c)->C; \
+ (void)HOST_l2c(ll, (s)); \
+ ll = (c)->D; \
+ (void)HOST_l2c(ll, (s)); \
+ ll = (c)->E; \
+ (void)HOST_l2c(ll, (s)); \
+ ll = (c)->F; \
+ (void)HOST_l2c(ll, (s)); \
+ ll = (c)->G; \
+ (void)HOST_l2c(ll, (s)); \
+ ll = (c)->H; \
+ (void)HOST_l2c(ll, (s)); \
+ } while (0)
#if defined(OPENSSL_SM3_ASM)
-# if defined(__aarch64__) || defined(_M_ARM64)
-# include "crypto/arm_arch.h"
-# define HWSM3_CAPABLE (OPENSSL_armcap_P & ARMV8_SM3)
+#if defined(__aarch64__) || defined(_M_ARM64)
+#include "crypto/arm_arch.h"
+#define HWSM3_CAPABLE (OPENSSL_armcap_P & ARMV8_SM3)
void ossl_hwsm3_block_data_order(SM3_CTX *c, const void *p, size_t num);
-# endif
-# if defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64
-# include "crypto/riscv_arch.h"
-# define HWSM3_CAPABLE 1
+#endif
+#if defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64
+#include "crypto/riscv_arch.h"
+#define HWSM3_CAPABLE 1
void ossl_hwsm3_block_data_order(SM3_CTX *c, const void *p, size_t num);
-# endif
-# if (defined(__x86_64) || defined(__x86_64__) || defined(_M_X64))
-# define HWSM3_CAPABLE ((OPENSSL_ia32cap_P[2] & (1 << 5)) && (OPENSSL_ia32cap_P[5] & (1 << 1)))
+#endif
+#if (defined(__x86_64) || defined(__x86_64__) || defined(_M_X64))
+#define HWSM3_CAPABLE ((OPENSSL_ia32cap_P[2] & (1 << 5)) && (OPENSSL_ia32cap_P[5] & (1 << 1)))
void ossl_hwsm3_block_data_order(SM3_CTX *c, const void *p, size_t num);
-# endif
+#endif
#endif
#if defined(HWSM3_CAPABLE)
-# define HASH_BLOCK_DATA_ORDER (HWSM3_CAPABLE ? ossl_hwsm3_block_data_order \
- : ossl_sm3_block_data_order)
+#define HASH_BLOCK_DATA_ORDER (HWSM3_CAPABLE ? ossl_hwsm3_block_data_order \
+ : ossl_sm3_block_data_order)
#else
-# define HASH_BLOCK_DATA_ORDER ossl_sm3_block_data_order
+#define HASH_BLOCK_DATA_ORDER ossl_sm3_block_data_order
#endif
void ossl_sm3_block_data_order(SM3_CTX *c, const void *p, size_t num);
@@ -64,55 +72,54 @@ void ossl_sm3_transform(SM3_CTX *c, const unsigned char *data);
#include "crypto/md32_common.h"
#ifndef PEDANTIC
-# if defined(__GNUC__) && __GNUC__>=2 && \
- !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
-# if defined(__riscv_zksh)
-# define P0(x) ({ MD32_REG_T ret; \
+#if defined(__GNUC__) && __GNUC__ >= 2 && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
+#if defined(__riscv_zksh)
+#define P0(x) ({ MD32_REG_T ret; \
asm ("sm3p0 %0, %1" \
: "=r"(ret) \
- : "r"(x)); ret; })
-# define P1(x) ({ MD32_REG_T ret; \
+ : "r"(x)); ret; })
+#define P1(x) ({ MD32_REG_T ret; \
asm ("sm3p1 %0, %1" \
: "=r"(ret) \
- : "r"(x)); ret; })
-# endif
-# endif
+ : "r"(x)); ret; })
+#endif
+#endif
#endif
#ifndef P0
-# define P0(X) (X ^ ROTATE(X, 9) ^ ROTATE(X, 17))
+#define P0(X) (X ^ ROTATE(X, 9) ^ ROTATE(X, 17))
#endif
#ifndef P1
-# define P1(X) (X ^ ROTATE(X, 15) ^ ROTATE(X, 23))
+#define P1(X) (X ^ ROTATE(X, 15) ^ ROTATE(X, 23))
#endif
-#define FF0(X,Y,Z) (X ^ Y ^ Z)
-#define GG0(X,Y,Z) (X ^ Y ^ Z)
-
-#define FF1(X,Y,Z) ((X & Y) | ((X | Y) & Z))
-#define GG1(X,Y,Z) ((Z ^ (X & (Y ^ Z))))
-
-#define EXPAND(W0,W7,W13,W3,W10) \
- (P1(W0 ^ W7 ^ ROTATE(W13, 15)) ^ ROTATE(W3, 7) ^ W10)
-
-#define RND(A, B, C, D, E, F, G, H, TJ, Wi, Wj, FF, GG) \
- do { \
- const SM3_WORD A12 = ROTATE(A, 12); \
- const SM3_WORD A12_SM = A12 + E + TJ; \
- const SM3_WORD SS1 = ROTATE(A12_SM, 7); \
- const SM3_WORD TT1 = FF(A, B, C) + D + (SS1 ^ A12) + (Wj); \
- const SM3_WORD TT2 = GG(E, F, G) + H + SS1 + Wi; \
- B = ROTATE(B, 9); \
- D = TT1; \
- F = ROTATE(F, 19); \
- H = P0(TT2); \
- } while(0)
-
-#define R1(A,B,C,D,E,F,G,H,TJ,Wi,Wj) \
- RND(A,B,C,D,E,F,G,H,TJ,Wi,Wj,FF0,GG0)
-
-#define R2(A,B,C,D,E,F,G,H,TJ,Wi,Wj) \
- RND(A,B,C,D,E,F,G,H,TJ,Wi,Wj,FF1,GG1)
+#define FF0(X, Y, Z) (X ^ Y ^ Z)
+#define GG0(X, Y, Z) (X ^ Y ^ Z)
+
+#define FF1(X, Y, Z) ((X & Y) | ((X | Y) & Z))
+#define GG1(X, Y, Z) ((Z ^ (X & (Y ^ Z))))
+
+#define EXPAND(W0, W7, W13, W3, W10) \
+ (P1(W0 ^ W7 ^ ROTATE(W13, 15)) ^ ROTATE(W3, 7) ^ W10)
+
+#define RND(A, B, C, D, E, F, G, H, TJ, Wi, Wj, FF, GG) \
+ do { \
+ const SM3_WORD A12 = ROTATE(A, 12); \
+ const SM3_WORD A12_SM = A12 + E + TJ; \
+ const SM3_WORD SS1 = ROTATE(A12_SM, 7); \
+ const SM3_WORD TT1 = FF(A, B, C) + D + (SS1 ^ A12) + (Wj); \
+ const SM3_WORD TT2 = GG(E, F, G) + H + SS1 + Wi; \
+ B = ROTATE(B, 9); \
+ D = TT1; \
+ F = ROTATE(F, 19); \
+ H = P0(TT2); \
+ } while (0)
+
+#define R1(A, B, C, D, E, F, G, H, TJ, Wi, Wj) \
+ RND(A, B, C, D, E, F, G, H, TJ, Wi, Wj, FF0, GG0)
+
+#define R2(A, B, C, D, E, F, G, H, TJ, Wi, Wj) \
+ RND(A, B, C, D, E, F, G, H, TJ, Wi, Wj, FF1, GG1)
#define SM3_A 0x7380166fUL
#define SM3_B 0x4914b2b9UL
diff --git a/crypto/sm4/sm4.c b/crypto/sm4/sm4.c
index d1881b7c7e..0bc4a705b5 100644
--- a/crypto/sm4/sm4.c
+++ b/crypto/sm4/sm4.c
@@ -83,7 +83,8 @@ static const uint32_t SM4_SBOX_T0[256] = {
0x35F2C7C7, 0x2D092424, 0xD1C61717, 0xD66FB9B9, 0xDEC51B1B, 0x94861212,
0x78186060, 0x30F3C3C3, 0x897CF5F5, 0x5CEFB3B3, 0xD23AE8E8, 0xACDF7373,
0x794C3535, 0xA0208080, 0x9D78E5E5, 0x56EDBBBB, 0x235E7D7D, 0xC63EF8F8,
- 0x8BD45F5F, 0xE7C82F2F, 0xDD39E4E4, 0x68492121 };
+ 0x8BD45F5F, 0xE7C82F2F, 0xDD39E4E4, 0x68492121
+};
static const uint32_t SM4_SBOX_T1[256] = {
0x5B8ED55B, 0x42D09242, 0xA74DEAA7, 0xFB06FDFB, 0x33FCCF33, 0x8765E287,
@@ -128,7 +129,8 @@ static const uint32_t SM4_SBOX_T1[256] = {
0xC735F2C7, 0x242D0924, 0x17D1C617, 0xB9D66FB9, 0x1BDEC51B, 0x12948612,
0x60781860, 0xC330F3C3, 0xF5897CF5, 0xB35CEFB3, 0xE8D23AE8, 0x73ACDF73,
0x35794C35, 0x80A02080, 0xE59D78E5, 0xBB56EDBB, 0x7D235E7D, 0xF8C63EF8,
- 0x5F8BD45F, 0x2FE7C82F, 0xE4DD39E4, 0x21684921};
+ 0x5F8BD45F, 0x2FE7C82F, 0xE4DD39E4, 0x21684921
+};
static const uint32_t SM4_SBOX_T2[256] = {
0x5B5B8ED5, 0x4242D092, 0xA7A74DEA, 0xFBFB06FD, 0x3333FCCF, 0x878765E2,
@@ -173,7 +175,8 @@ static const uint32_t SM4_SBOX_T2[256] = {
0xC7C735F2, 0x24242D09, 0x1717D1C6, 0xB9B9D66F, 0x1B1BDEC5, 0x12129486,
0x60607818, 0xC3C330F3, 0xF5F5897C, 0xB3B35CEF, 0xE8E8D23A, 0x7373ACDF,
0x3535794C, 0x8080A020, 0xE5E59D78, 0xBBBB56ED, 0x7D7D235E, 0xF8F8C63E,
- 0x5F5F8BD4, 0x2F2FE7C8, 0xE4E4DD39, 0x21216849};
+ 0x5F5F8BD4, 0x2F2FE7C8, 0xE4E4DD39, 0x21216849
+};
static const uint32_t SM4_SBOX_T3[256] = {
0xD55B5B8E, 0x924242D0, 0xEAA7A74D, 0xFDFBFB06, 0xCF3333FC, 0xE2878765,
@@ -218,7 +221,8 @@ static const uint32_t SM4_SBOX_T3[256] = {
0xF2C7C735, 0x0924242D, 0xC61717D1, 0x6FB9B9D6, 0xC51B1BDE, 0x86121294,
0x18606078, 0xF3C3C330, 0x7CF5F589, 0xEFB3B35C, 0x3AE8E8D2, 0xDF7373AC,
0x4C353579, 0x208080A0, 0x78E5E59D, 0xEDBBBB56, 0x5E7D7D23, 0x3EF8F8C6,
- 0xD45F5F8B, 0xC82F2FE7, 0x39E4E4DD, 0x49212168};
+ 0xD45F5F8B, 0xC82F2FE7, 0x39E4E4DD, 0x49212168
+};
static ossl_inline uint32_t rotl(uint32_t a, uint8_t n)
{
@@ -227,10 +231,7 @@ static ossl_inline uint32_t rotl(uint32_t a, uint8_t n)
static ossl_inline uint32_t load_u32_be(const uint8_t *b, uint32_t n)
{
- return ((uint32_t)b[4 * n] << 24) |
- ((uint32_t)b[4 * n + 1] << 16) |
- ((uint32_t)b[4 * n + 2] << 8) |
- ((uint32_t)b[4 * n + 3]);
+ return ((uint32_t)b[4 * n] << 24) | ((uint32_t)b[4 * n + 1] << 16) | ((uint32_t)b[4 * n + 2] << 8) | ((uint32_t)b[4 * n + 3]);
}
static ossl_inline void store_u32_be(uint32_t v, uint8_t *b)
@@ -265,10 +266,7 @@ static ossl_inline uint32_t SM4_T_slow(uint32_t X)
static ossl_inline uint32_t SM4_T(uint32_t X)
{
- return SM4_SBOX_T0[(uint8_t)(X >> 24)] ^
- SM4_SBOX_T1[(uint8_t)(X >> 16)] ^
- SM4_SBOX_T2[(uint8_t)(X >> 8)] ^
- SM4_SBOX_T3[(uint8_t)X];
+ return SM4_SBOX_T0[(uint8_t)(X >> 24)] ^ SM4_SBOX_T1[(uint8_t)(X >> 16)] ^ SM4_SBOX_T2[(uint8_t)(X >> 8)] ^ SM4_SBOX_T3[(uint8_t)X];
}
static ossl_inline uint32_t SM4_key_sub(uint32_t X)
@@ -314,7 +312,7 @@ int ossl_sm4_set_key(const uint8_t *key, SM4_KEY *ks)
K[1] ^= SM4_key_sub(K[2] ^ K[3] ^ K[0] ^ CK[i + 1]);
K[2] ^= SM4_key_sub(K[3] ^ K[0] ^ K[1] ^ CK[i + 2]);
K[3] ^= SM4_key_sub(K[0] ^ K[1] ^ K[2] ^ CK[i + 3]);
- ks->rk[i ] = K[0];
+ ks->rk[i] = K[0];
ks->rk[i + 1] = K[1];
ks->rk[i + 2] = K[2];
ks->rk[i + 3] = K[3];
@@ -323,13 +321,13 @@ int ossl_sm4_set_key(const uint8_t *key, SM4_KEY *ks)
return 1;
}
-#define SM4_RNDS(k0, k1, k2, k3, F) \
- do { \
- B0 ^= F(B1 ^ B2 ^ B3 ^ ks->rk[k0]); \
- B1 ^= F(B0 ^ B2 ^ B3 ^ ks->rk[k1]); \
- B2 ^= F(B0 ^ B1 ^ B3 ^ ks->rk[k2]); \
- B3 ^= F(B0 ^ B1 ^ B2 ^ ks->rk[k3]); \
- } while(0)
+#define SM4_RNDS(k0, k1, k2, k3, F) \
+ do { \
+ B0 ^= F(B1 ^ B2 ^ B3 ^ ks->rk[k0]); \
+ B1 ^= F(B0 ^ B2 ^ B3 ^ ks->rk[k1]); \
+ B2 ^= F(B0 ^ B1 ^ B3 ^ ks->rk[k2]); \
+ B3 ^= F(B0 ^ B1 ^ B2 ^ ks->rk[k3]); \
+ } while (0)
void ossl_sm4_encrypt(const uint8_t *in, uint8_t *out, const SM4_KEY *ks)
{
@@ -342,9 +340,9 @@ void ossl_sm4_encrypt(const uint8_t *in, uint8_t *out, const SM4_KEY *ks)
* Uses byte-wise sbox in the first and last rounds to provide some
* protection from cache based side channels.
*/
- SM4_RNDS( 0, 1, 2, 3, SM4_T_slow);
- SM4_RNDS( 4, 5, 6, 7, SM4_T);
- SM4_RNDS( 8, 9, 10, 11, SM4_T);
+ SM4_RNDS(0, 1, 2, 3, SM4_T_slow);
+ SM4_RNDS(4, 5, 6, 7, SM4_T);
+ SM4_RNDS(8, 9, 10, 11, SM4_T);
SM4_RNDS(12, 13, 14, 15, SM4_T);
SM4_RNDS(16, 17, 18, 19, SM4_T);
SM4_RNDS(20, 21, 22, 23, SM4_T);
@@ -369,9 +367,9 @@ void ossl_sm4_decrypt(const uint8_t *in, uint8_t *out, const SM4_KEY *ks)
SM4_RNDS(23, 22, 21, 20, SM4_T);
SM4_RNDS(19, 18, 17, 16, SM4_T);
SM4_RNDS(15, 14, 13, 12, SM4_T);
- SM4_RNDS(11, 10, 9, 8, SM4_T);
- SM4_RNDS( 7, 6, 5, 4, SM4_T);
- SM4_RNDS( 3, 2, 1, 0, SM4_T_slow);
+ SM4_RNDS(11, 10, 9, 8, SM4_T);
+ SM4_RNDS(7, 6, 5, 4, SM4_T);
+ SM4_RNDS(3, 2, 1, 0, SM4_T_slow);
store_u32_be(B3, out);
store_u32_be(B2, out + 4);
diff --git a/crypto/sparcv9cap.c b/crypto/sparcv9cap.c
index 53c0c3e045..b7f109581f 100644
--- a/crypto/sparcv9cap.c
+++ b/crypto/sparcv9cap.c
@@ -19,9 +19,10 @@
#include "crypto/sparc_arch.h"
#if defined(__GNUC__) && defined(__linux)
-__attribute__ ((visibility("hidden")))
+__attribute__((visibility("hidden")))
#endif
-unsigned int OPENSSL_sparcv9cap_P[2] = { SPARCV9_TICK_PRIVILEGED, 0 };
+unsigned int OPENSSL_sparcv9cap_P[2]
+ = { SPARCV9_TICK_PRIVILEGED, 0 };
unsigned long _sparcv9_rdtick(void);
void _sparcv9_vis1_probe(void);
@@ -49,8 +50,7 @@ uint32_t OPENSSL_rdtsc(void)
size_t OPENSSL_instrument_bus(unsigned int *out, size_t cnt)
{
- if ((OPENSSL_sparcv9cap_P[0] & (SPARCV9_TICK_PRIVILEGED | SPARCV9_BLK)) ==
- SPARCV9_BLK)
+ if ((OPENSSL_sparcv9cap_P[0] & (SPARCV9_TICK_PRIVILEGED | SPARCV9_BLK)) == SPARCV9_BLK)
return _sparcv9_vis1_instrument_bus(out, cnt);
else
return 0;
@@ -58,8 +58,7 @@ size_t OPENSSL_instrument_bus(unsigned int *out, size_t cnt)
size_t OPENSSL_instrument_bus2(unsigned int *out, size_t cnt, size_t max)
{
- if ((OPENSSL_sparcv9cap_P[0] & (SPARCV9_TICK_PRIVILEGED | SPARCV9_BLK)) ==
- SPARCV9_BLK)
+ if ((OPENSSL_sparcv9cap_P[0] & (SPARCV9_TICK_PRIVILEGED | SPARCV9_BLK)) == SPARCV9_BLK)
return _sparcv9_vis1_instrument_bus2(out, cnt, max);
else
return 0;
@@ -72,14 +71,14 @@ static void common_handler(int sig)
}
#if defined(__sun) && defined(__SVR4)
-# if defined(__GNUC__) && __GNUC__>=2
-extern unsigned int getisax(unsigned int vec[], unsigned int sz) __attribute__ ((weak));
-# elif defined(__SUNPRO_C)
+#if defined(__GNUC__) && __GNUC__ >= 2
+extern unsigned int getisax(unsigned int vec[], unsigned int sz) __attribute__((weak));
+#elif defined(__SUNPRO_C)
#pragma weak getisax
extern unsigned int getisax(unsigned int vec[], unsigned int sz);
-# else
-static unsigned int (*getisax) (unsigned int vec[], unsigned int sz) = NULL;
-# endif
+#else
+static unsigned int (*getisax)(unsigned int vec[], unsigned int sz) = NULL;
+#endif
#endif
void OPENSSL_cpuid_setup(void)
@@ -104,36 +103,47 @@ void OPENSSL_cpuid_setup(void)
if (getisax != NULL) {
unsigned int vec[2] = { 0, 0 };
- if (getisax (vec,2)) {
- if (vec[0]&0x00020) OPENSSL_sparcv9cap_P[0] |= SPARCV9_VIS1;
- if (vec[0]&0x00040) OPENSSL_sparcv9cap_P[0] |= SPARCV9_VIS2;
- if (vec[0]&0x00080) OPENSSL_sparcv9cap_P[0] |= SPARCV9_BLK;
- if (vec[0]&0x00100) OPENSSL_sparcv9cap_P[0] |= SPARCV9_FMADD;
- if (vec[0]&0x00400) OPENSSL_sparcv9cap_P[0] |= SPARCV9_VIS3;
- if (vec[0]&0x01000) OPENSSL_sparcv9cap_P[0] |= SPARCV9_FJHPCACE;
- if (vec[0]&0x02000) OPENSSL_sparcv9cap_P[0] |= SPARCV9_FJDESX;
- if (vec[0]&0x08000) OPENSSL_sparcv9cap_P[0] |= SPARCV9_IMA;
- if (vec[0]&0x10000) OPENSSL_sparcv9cap_P[0] |= SPARCV9_FJAESX;
- if (vec[1]&0x00008) OPENSSL_sparcv9cap_P[0] |= SPARCV9_VIS4;
+ if (getisax(vec, 2)) {
+ if (vec[0] & 0x00020)
+ OPENSSL_sparcv9cap_P[0] |= SPARCV9_VIS1;
+ if (vec[0] & 0x00040)
+ OPENSSL_sparcv9cap_P[0] |= SPARCV9_VIS2;
+ if (vec[0] & 0x00080)
+ OPENSSL_sparcv9cap_P[0] |= SPARCV9_BLK;
+ if (vec[0] & 0x00100)
+ OPENSSL_sparcv9cap_P[0] |= SPARCV9_FMADD;
+ if (vec[0] & 0x00400)
+ OPENSSL_sparcv9cap_P[0] |= SPARCV9_VIS3;
+ if (vec[0] & 0x01000)
+ OPENSSL_sparcv9cap_P[0] |= SPARCV9_FJHPCACE;
+ if (vec[0] & 0x02000)
+ OPENSSL_sparcv9cap_P[0] |= SPARCV9_FJDESX;
+ if (vec[0] & 0x08000)
+ OPENSSL_sparcv9cap_P[0] |= SPARCV9_IMA;
+ if (vec[0] & 0x10000)
+ OPENSSL_sparcv9cap_P[0] |= SPARCV9_FJAESX;
+ if (vec[1] & 0x00008)
+ OPENSSL_sparcv9cap_P[0] |= SPARCV9_VIS4;
/* reconstruct %cfr copy */
- OPENSSL_sparcv9cap_P[1] = (vec[0]>>17)&0x3ff;
- OPENSSL_sparcv9cap_P[1] |= (OPENSSL_sparcv9cap_P[1]&CFR_MONTMUL)<<1;
- if (vec[0]&0x20000000) OPENSSL_sparcv9cap_P[1] |= CFR_CRC32C;
- if (vec[1]&0x00000020) OPENSSL_sparcv9cap_P[1] |= CFR_XMPMUL;
- if (vec[1]&0x00000040)
- OPENSSL_sparcv9cap_P[1] |= CFR_XMONTMUL|CFR_XMONTSQR;
+ OPENSSL_sparcv9cap_P[1] = (vec[0] >> 17) & 0x3ff;
+ OPENSSL_sparcv9cap_P[1] |= (OPENSSL_sparcv9cap_P[1] & CFR_MONTMUL) << 1;
+ if (vec[0] & 0x20000000)
+ OPENSSL_sparcv9cap_P[1] |= CFR_CRC32C;
+ if (vec[1] & 0x00000020)
+ OPENSSL_sparcv9cap_P[1] |= CFR_XMPMUL;
+ if (vec[1] & 0x00000040)
+ OPENSSL_sparcv9cap_P[1] |= CFR_XMONTMUL | CFR_XMONTSQR;
/* Some heuristics */
/* all known VIS2-capable CPUs have unprivileged tick counter */
- if (OPENSSL_sparcv9cap_P[0]&SPARCV9_VIS2)
+ if (OPENSSL_sparcv9cap_P[0] & SPARCV9_VIS2)
OPENSSL_sparcv9cap_P[0] &= ~SPARCV9_TICK_PRIVILEGED;
OPENSSL_sparcv9cap_P[0] |= SPARCV9_PREFER_FPU;
/* detect UltraSPARC-Tx, see sparccpud.S for details... */
- if ((OPENSSL_sparcv9cap_P[0]&SPARCV9_VIS1) &&
- _sparcv9_vis1_instrument() >= 12)
+ if ((OPENSSL_sparcv9cap_P[0] & SPARCV9_VIS1) && _sparcv9_vis1_instrument() >= 12)
OPENSSL_sparcv9cap_P[0] &= ~(SPARCV9_VIS1 | SPARCV9_PREFER_FPU);
}
@@ -150,9 +160,9 @@ void OPENSSL_cpuid_setup(void)
sigfillset(&all_masked);
sigdelset(&all_masked, SIGILL);
sigdelset(&all_masked, SIGTRAP);
-# ifdef SIGEMT
+#ifdef SIGEMT
sigdelset(&all_masked, SIGEMT);
-# endif
+#endif
sigdelset(&all_masked, SIGFPE);
sigdelset(&all_masked, SIGBUS);
sigdelset(&all_masked, SIGSEGV);
@@ -208,8 +218,7 @@ void OPENSSL_cpuid_setup(void)
* loop on UltraSPARC II running Solaris. Things might be
* different on Linux...
*/
- if ((OPENSSL_sparcv9cap_P[0] & SPARCV9_VIS3) &&
- sigsetjmp(common_jmp, 1) == 0) {
+ if ((OPENSSL_sparcv9cap_P[0] & SPARCV9_VIS3) && sigsetjmp(common_jmp, 1) == 0) {
OPENSSL_sparcv9cap_P[1] = (unsigned int)_sparcv9_rdcfr();
}
@@ -220,12 +229,12 @@ void OPENSSL_cpuid_setup(void)
if (sizeof(size_t) == 8)
OPENSSL_sparcv9cap_P[0] |= SPARCV9_64BIT_STACK;
-# ifdef __linux
+#ifdef __linux
else {
int ret = syscall(340);
if (ret >= 0 && ret & 1)
OPENSSL_sparcv9cap_P[0] |= SPARCV9_64BIT_STACK;
}
-# endif
+#endif
}
diff --git a/crypto/sparse_array.c b/crypto/sparse_array.c
index d9c204d08a..bf5a14ba7a 100644
--- a/crypto/sparse_array.c
+++ b/crypto/sparse_array.c
@@ -31,9 +31,9 @@
* will be three.
*/
#ifndef OPENSSL_SA_BLOCK_BITS
-# define OPENSSL_SA_BLOCK_BITS 4
+#define OPENSSL_SA_BLOCK_BITS 4
#elif OPENSSL_SA_BLOCK_BITS < 2 || OPENSSL_SA_BLOCK_BITS > (BN_BITS2 - 1)
-# error OPENSSL_SA_BLOCK_BITS is out of range
+#error OPENSSL_SA_BLOCK_BITS is out of range
#endif
/*
@@ -41,12 +41,12 @@
* the number of pointers in a tree node;
* a bit mask to quickly extract an index and
* the maximum depth of the tree structure.
- */
-#define SA_BLOCK_MAX (1 << OPENSSL_SA_BLOCK_BITS)
-#define SA_BLOCK_MASK (SA_BLOCK_MAX - 1)
-#define SA_BLOCK_MAX_LEVELS (((int)sizeof(ossl_uintmax_t) * 8 \
- + OPENSSL_SA_BLOCK_BITS - 1) \
- / OPENSSL_SA_BLOCK_BITS)
+ */
+#define SA_BLOCK_MAX (1 << OPENSSL_SA_BLOCK_BITS)
+#define SA_BLOCK_MASK (SA_BLOCK_MAX - 1)
+#define SA_BLOCK_MAX_LEVELS (((int)sizeof(ossl_uintmax_t) * 8 \
+ + OPENSSL_SA_BLOCK_BITS - 1) \
+ / OPENSSL_SA_BLOCK_BITS)
struct sparse_array_st {
int levels;
@@ -63,7 +63,7 @@ OPENSSL_SA *ossl_sa_new(void)
}
static void sa_doall(const OPENSSL_SA *sa, void (*node)(void **),
- void (*leaf)(ossl_uintmax_t, void *, void *), void *arg)
+ void (*leaf)(ossl_uintmax_t, void *, void *), void *arg)
{
int i[SA_BLOCK_MAX_LEVELS];
void *nodes[SA_BLOCK_MAX_LEVELS];
@@ -74,7 +74,7 @@ static void sa_doall(const OPENSSL_SA *sa, void (*node)(void **),
nodes[0] = sa->nodes;
while (l >= 0) {
const int n = i[l];
- void ** const p = nodes[l];
+ void **const p = nodes[l];
if (n >= SA_BLOCK_MAX) {
if (p != NULL && node != NULL)
@@ -141,8 +141,8 @@ void ossl_sa_doall(const OPENSSL_SA *sa, void (*leaf)(ossl_uintmax_t, void *))
}
void ossl_sa_doall_arg(const OPENSSL_SA *sa,
- void (*leaf)(ossl_uintmax_t, void *, void *),
- void *arg)
+ void (*leaf)(ossl_uintmax_t, void *, void *),
+ void *arg)
{
if (sa != NULL)
sa_doall(sa, NULL, leaf, arg);
@@ -165,7 +165,7 @@ void *ossl_sa_get(const OPENSSL_SA *sa, ossl_uintmax_t n)
p = sa->nodes;
for (level = sa->levels - 1; p != NULL && level > 0; level--)
p = (void **)p[(n >> (OPENSSL_SA_BLOCK_BITS * level))
- & SA_BLOCK_MASK];
+ & SA_BLOCK_MASK];
r = p == NULL ? NULL : p[n & SA_BLOCK_MASK];
}
return r;
@@ -189,7 +189,7 @@ int ossl_sa_set(OPENSSL_SA *sa, ossl_uintmax_t posn, void *val)
if ((n >>= OPENSSL_SA_BLOCK_BITS) == 0)
break;
- for (;sa->levels < level; sa->levels++) {
+ for (; sa->levels < level; sa->levels++) {
p = alloc_node();
if (p == NULL)
return 0;
diff --git a/crypto/srp/srp_lib.c b/crypto/srp/srp_lib.c
index 5a6356e4d2..f957174eaa 100644
--- a/crypto/srp/srp_lib.c
+++ b/crypto/srp/srp_lib.c
@@ -15,16 +15,16 @@
#define OPENSSL_SUPPRESS_DEPRECATED
#ifndef OPENSSL_NO_SRP
-# include "internal/cryptlib.h"
-# include <openssl/sha.h>
-# include <openssl/srp.h>
-# include <openssl/evp.h>
-# include "crypto/bn_srp.h"
+#include "internal/cryptlib.h"
+#include <openssl/sha.h>
+#include <openssl/srp.h>
+#include <openssl/evp.h>
+#include "crypto/bn_srp.h"
/* calculate = SHA1(PAD(x) || PAD(y)) */
static BIGNUM *srp_Calc_xy(const BIGNUM *x, const BIGNUM *y, const BIGNUM *N,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_LIB_CTX *libctx, const char *propq)
{
unsigned char digest[SHA_DIGEST_LENGTH];
unsigned char *tmp = NULL;
@@ -46,22 +46,22 @@ static BIGNUM *srp_Calc_xy(const BIGNUM *x, const BIGNUM *y, const BIGNUM *N,
|| !EVP_Digest(tmp, numN * 2, digest, NULL, sha1, NULL))
goto err;
res = BN_bin2bn(digest, sizeof(digest), NULL);
- err:
+err:
EVP_MD_free(sha1);
OPENSSL_free(tmp);
return res;
}
static BIGNUM *srp_Calc_k(const BIGNUM *N, const BIGNUM *g,
- OSSL_LIB_CTX *libctx,
- const char *propq)
+ OSSL_LIB_CTX *libctx,
+ const char *propq)
{
/* k = SHA1(N | PAD(g)) -- tls-srp RFC 5054 */
return srp_Calc_xy(N, g, N, libctx, propq);
}
BIGNUM *SRP_Calc_u_ex(const BIGNUM *A, const BIGNUM *B, const BIGNUM *N,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_LIB_CTX *libctx, const char *propq)
{
/* u = SHA1(PAD(A) || PAD(B) ) -- tls-srp RFC 5054 */
return srp_Calc_xy(A, B, N, libctx, propq);
@@ -74,7 +74,7 @@ BIGNUM *SRP_Calc_u(const BIGNUM *A, const BIGNUM *B, const BIGNUM *N)
}
BIGNUM *SRP_Calc_server_key(const BIGNUM *A, const BIGNUM *v, const BIGNUM *u,
- const BIGNUM *b, const BIGNUM *N)
+ const BIGNUM *b, const BIGNUM *N)
{
BIGNUM *tmp = NULL, *S = NULL;
BN_CTX *bn_ctx;
@@ -97,25 +97,23 @@ BIGNUM *SRP_Calc_server_key(const BIGNUM *A, const BIGNUM *v, const BIGNUM *u,
BN_free(S);
S = NULL;
}
- err:
+err:
BN_CTX_free(bn_ctx);
BN_clear_free(tmp);
return S;
}
BIGNUM *SRP_Calc_B_ex(const BIGNUM *b, const BIGNUM *N, const BIGNUM *g,
- const BIGNUM *v, OSSL_LIB_CTX *libctx, const char *propq)
+ const BIGNUM *v, OSSL_LIB_CTX *libctx, const char *propq)
{
BIGNUM *kv = NULL, *gb = NULL;
BIGNUM *B = NULL, *k = NULL;
BN_CTX *bn_ctx;
- if (b == NULL || N == NULL || g == NULL || v == NULL ||
- (bn_ctx = BN_CTX_new_ex(libctx)) == NULL)
+ if (b == NULL || N == NULL || g == NULL || v == NULL || (bn_ctx = BN_CTX_new_ex(libctx)) == NULL)
return NULL;
- if ((kv = BN_new()) == NULL ||
- (gb = BN_new()) == NULL || (B = BN_new()) == NULL)
+ if ((kv = BN_new()) == NULL || (gb = BN_new()) == NULL || (B = BN_new()) == NULL)
goto err;
/* B = g**b + k*v */
@@ -127,7 +125,7 @@ BIGNUM *SRP_Calc_B_ex(const BIGNUM *b, const BIGNUM *N, const BIGNUM *g,
BN_free(B);
B = NULL;
}
- err:
+err:
BN_CTX_free(bn_ctx);
BN_clear_free(kv);
BN_clear_free(gb);
@@ -136,13 +134,13 @@ BIGNUM *SRP_Calc_B_ex(const BIGNUM *b, const BIGNUM *N, const BIGNUM *g,
}
BIGNUM *SRP_Calc_B(const BIGNUM *b, const BIGNUM *N, const BIGNUM *g,
- const BIGNUM *v)
+ const BIGNUM *v)
{
return SRP_Calc_B_ex(b, N, g, v, NULL, NULL);
}
BIGNUM *SRP_Calc_x_ex(const BIGNUM *s, const char *user, const char *pass,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_LIB_CTX *libctx, const char *propq)
{
unsigned char dig[SHA_DIGEST_LENGTH];
EVP_MD_CTX *ctxt;
@@ -181,7 +179,7 @@ BIGNUM *SRP_Calc_x_ex(const BIGNUM *s, const char *user, const char *pass,
res = BN_bin2bn(dig, sizeof(dig), NULL);
- err:
+err:
EVP_MD_free(sha1);
OPENSSL_free(cs);
EVP_MD_CTX_free(ctxt);
@@ -210,8 +208,8 @@ BIGNUM *SRP_Calc_A(const BIGNUM *a, const BIGNUM *N, const BIGNUM *g)
}
BIGNUM *SRP_Calc_client_key_ex(const BIGNUM *N, const BIGNUM *B, const BIGNUM *g,
- const BIGNUM *x, const BIGNUM *a, const BIGNUM *u,
- OSSL_LIB_CTX *libctx, const char *propq)
+ const BIGNUM *x, const BIGNUM *a, const BIGNUM *u,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
BIGNUM *tmp = NULL, *tmp2 = NULL, *tmp3 = NULL, *k = NULL, *K = NULL;
BIGNUM *xtmp = NULL;
@@ -221,10 +219,7 @@ BIGNUM *SRP_Calc_client_key_ex(const BIGNUM *N, const BIGNUM *B, const BIGNUM *g
|| a == NULL || (bn_ctx = BN_CTX_new_ex(libctx)) == NULL)
return NULL;
- if ((tmp = BN_new()) == NULL ||
- (tmp2 = BN_new()) == NULL ||
- (tmp3 = BN_new()) == NULL ||
- (xtmp = BN_new()) == NULL)
+ if ((tmp = BN_new()) == NULL || (tmp2 = BN_new()) == NULL || (tmp3 = BN_new()) == NULL || (xtmp = BN_new()) == NULL)
goto err;
BN_with_flags(xtmp, x, BN_FLG_CONSTTIME);
@@ -247,7 +242,7 @@ BIGNUM *SRP_Calc_client_key_ex(const BIGNUM *N, const BIGNUM *B, const BIGNUM *g
K = NULL;
}
- err:
+err:
BN_CTX_free(bn_ctx);
BN_free(xtmp);
BN_clear_free(tmp);
@@ -258,7 +253,7 @@ BIGNUM *SRP_Calc_client_key_ex(const BIGNUM *N, const BIGNUM *B, const BIGNUM *g
}
BIGNUM *SRP_Calc_client_key(const BIGNUM *N, const BIGNUM *B, const BIGNUM *g,
- const BIGNUM *x, const BIGNUM *a, const BIGNUM *u)
+ const BIGNUM *x, const BIGNUM *a, const BIGNUM *u)
{
return SRP_Calc_client_key_ex(N, B, g, x, a, u, NULL, NULL);
}
@@ -278,7 +273,7 @@ int SRP_Verify_B_mod_N(const BIGNUM *B, const BIGNUM *N)
if (!BN_nnmod(r, B, N, bn_ctx))
goto err;
ret = !BN_is_zero(r);
- err:
+err:
BN_CTX_free(bn_ctx);
BN_free(r);
return ret;
@@ -291,16 +286,16 @@ int SRP_Verify_A_mod_N(const BIGNUM *A, const BIGNUM *N)
}
static SRP_gN knowngN[] = {
- {"8192", &ossl_bn_generator_19, &ossl_bn_group_8192},
- {"6144", &ossl_bn_generator_5, &ossl_bn_group_6144},
- {"4096", &ossl_bn_generator_5, &ossl_bn_group_4096},
- {"3072", &ossl_bn_generator_5, &ossl_bn_group_3072},
- {"2048", &ossl_bn_generator_2, &ossl_bn_group_2048},
- {"1536", &ossl_bn_generator_2, &ossl_bn_group_1536},
- {"1024", &ossl_bn_generator_2, &ossl_bn_group_1024},
+ { "8192", &ossl_bn_generator_19, &ossl_bn_group_8192 },
+ { "6144", &ossl_bn_generator_5, &ossl_bn_group_6144 },
+ { "4096", &ossl_bn_generator_5, &ossl_bn_group_4096 },
+ { "3072", &ossl_bn_generator_5, &ossl_bn_group_3072 },
+ { "2048", &ossl_bn_generator_2, &ossl_bn_group_2048 },
+ { "1536", &ossl_bn_generator_2, &ossl_bn_group_1536 },
+ { "1024", &ossl_bn_generator_2, &ossl_bn_group_1024 },
};
-# define KNOWN_GN_NUMBER sizeof(knowngN) / sizeof(SRP_gN)
+#define KNOWN_GN_NUMBER sizeof(knowngN) / sizeof(SRP_gN)
/*
* Check if G and N are known parameters. The values have been generated
diff --git a/crypto/srp/srp_vfy.c b/crypto/srp/srp_vfy.c
index ebd838846b..504c4ad9b8 100644
--- a/crypto/srp/srp_vfy.c
+++ b/crypto/srp/srp_vfy.c
@@ -15,18 +15,18 @@
#define OPENSSL_SUPPRESS_DEPRECATED
#ifndef OPENSSL_NO_SRP
-# include "internal/cryptlib.h"
-# include "crypto/evp.h"
-# include <openssl/sha.h>
-# include <openssl/srp.h>
-# include <openssl/evp.h>
-# include <openssl/buffer.h>
-# include <openssl/rand.h>
-# include <openssl/txt_db.h>
-# include <openssl/err.h>
-
-# define SRP_RANDOM_SALT_LEN 20
-# define MAX_LEN 2500
+#include "internal/cryptlib.h"
+#include "crypto/evp.h"
+#include <openssl/sha.h>
+#include <openssl/srp.h>
+#include <openssl/evp.h>
+#include <openssl/buffer.h>
+#include <openssl/rand.h>
+#include <openssl/txt_db.h>
+#include <openssl/err.h>
+
+#define SRP_RANDOM_SALT_LEN 20
+#define MAX_LEN 2500
/*
* Note that SRP uses its own variant of base 64 encoding. A different base64
@@ -84,7 +84,7 @@ static int t_fromb64(unsigned char *a, size_t alen, const char *src)
/* Add any encoded padding that is required */
if (padsize != 0
- && EVP_DecodeUpdate(ctx, a, &outl, pad, (int)padsize) < 0) {
+ && EVP_DecodeUpdate(ctx, a, &outl, pad, (int)padsize) < 0) {
outl = -1;
goto err;
}
@@ -120,7 +120,7 @@ static int t_fromb64(unsigned char *a, size_t alen, const char *src)
outl -= (int)padsize;
}
- err:
+err:
EVP_ENCODE_CTX_free(ctx);
return outl;
@@ -134,15 +134,14 @@ static int t_tob64(char *dst, const unsigned char *src, int size)
{
EVP_ENCODE_CTX *ctx = EVP_ENCODE_CTX_new();
int outl = 0, outl2 = 0;
- unsigned char pad[2] = {0, 0};
+ unsigned char pad[2] = { 0, 0 };
int leadz = 0;
if (ctx == NULL)
return 0;
EVP_EncodeInit(ctx);
- evp_encode_ctx_set_flags(ctx, EVP_ENCODE_CTX_NO_NEWLINES
- | EVP_ENCODE_CTX_USE_SRP_ALPHABET);
+ evp_encode_ctx_set_flags(ctx, EVP_ENCODE_CTX_NO_NEWLINES | EVP_ENCODE_CTX_USE_SRP_ALPHABET);
/*
* We pad at the front with zero bytes until the length is a multiple of 3
@@ -151,14 +150,14 @@ static int t_tob64(char *dst, const unsigned char *src, int size)
*/
leadz = 3 - (size % 3);
if (leadz != 3
- && !EVP_EncodeUpdate(ctx, (unsigned char *)dst, &outl, pad,
- leadz)) {
+ && !EVP_EncodeUpdate(ctx, (unsigned char *)dst, &outl, pad,
+ leadz)) {
EVP_ENCODE_CTX_free(ctx);
return 0;
}
if (!EVP_EncodeUpdate(ctx, (unsigned char *)dst + outl, &outl2, src,
- size)) {
+ size)) {
EVP_ENCODE_CTX_free(ctx);
return 0;
}
@@ -203,14 +202,14 @@ SRP_user_pwd *SRP_user_pwd_new(void)
}
void SRP_user_pwd_set_gN(SRP_user_pwd *vinfo, const BIGNUM *g,
- const BIGNUM *N)
+ const BIGNUM *N)
{
vinfo->N = N;
vinfo->g = g;
}
int SRP_user_pwd_set1_ids(SRP_user_pwd *vinfo, const char *id,
- const char *info)
+ const char *info)
{
OPENSSL_free(vinfo->id);
OPENSSL_free(vinfo->info);
@@ -222,7 +221,7 @@ int SRP_user_pwd_set1_ids(SRP_user_pwd *vinfo, const char *id,
}
static int SRP_user_pwd_set_sv(SRP_user_pwd *vinfo, const char *s,
- const char *v)
+ const char *v)
{
unsigned char tmp[MAX_LEN];
int len;
@@ -242,7 +241,7 @@ static int SRP_user_pwd_set_sv(SRP_user_pwd *vinfo, const char *s,
if (vinfo->s == NULL)
goto err;
return 1;
- err:
+err:
BN_free(vinfo->v);
vinfo->v = NULL;
return 0;
@@ -269,8 +268,8 @@ static SRP_user_pwd *srp_user_pwd_dup(SRP_user_pwd *src)
SRP_user_pwd_set_gN(ret, src->g, src->N);
if (!SRP_user_pwd_set1_ids(ret, src->id, src->info)
|| !SRP_user_pwd_set0_sv(ret, BN_dup(src->s), BN_dup(src->v))) {
- SRP_user_pwd_free(ret);
- return NULL;
+ SRP_user_pwd_free(ret);
+ return NULL;
}
return ret;
}
@@ -329,7 +328,7 @@ static SRP_gN_cache *SRP_gN_new_init(const char *ch)
return newgN;
OPENSSL_free(newgN->b64_bn);
- err:
+err:
OPENSSL_free(newgN);
return NULL;
}
@@ -371,7 +370,7 @@ static BIGNUM *SRP_gN_place_bn(STACK_OF(SRP_gN_cache) *gN_cache, char *ch)
if (strcmp(cache->b64_bn, ch) == 0)
return cache->bn;
}
- { /* it is the first time that we find it */
+ { /* it is the first time that we find it */
SRP_gN_cache *newgN = SRP_gN_new_init(ch);
if (newgN) {
if (sk_SRP_gN_cache_insert(gN_cache, newgN, 0) > 0)
@@ -441,9 +440,9 @@ int SRP_VBASE_init(SRP_VBASE *vb, char *verifier_file)
if ((gN->id = OPENSSL_strdup(pp[DB_srpid])) == NULL
|| (gN->N = SRP_gN_place_bn(vb->gN_cache, pp[DB_srpverifier]))
- == NULL
+ == NULL
|| (gN->g = SRP_gN_place_bn(vb->gN_cache, pp[DB_srpsalt]))
- == NULL
+ == NULL
|| sk_SRP_gN_insert(SRP_gN_tab, gN, 0) == 0)
goto err;
@@ -462,13 +461,11 @@ int SRP_VBASE_init(SRP_VBASE *vb, char *verifier_file)
goto err;
SRP_user_pwd_set_gN(user_pwd, lgN->g, lgN->N);
- if (!SRP_user_pwd_set1_ids
- (user_pwd, pp[DB_srpid], pp[DB_srpinfo]))
+ if (!SRP_user_pwd_set1_ids(user_pwd, pp[DB_srpid], pp[DB_srpinfo]))
goto err;
error_code = SRP_ERR_VBASE_BN_LIB;
- if (!SRP_user_pwd_set_sv
- (user_pwd, pp[DB_srpsalt], pp[DB_srpverifier]))
+ if (!SRP_user_pwd_set_sv(user_pwd, pp[DB_srpsalt], pp[DB_srpverifier]))
goto err;
if (sk_SRP_user_pwd_insert(vb->users_pwd, user_pwd, 0) == 0)
@@ -491,7 +488,7 @@ int SRP_VBASE_init(SRP_VBASE *vb, char *verifier_file)
}
error_code = SRP_NO_ERROR;
- err:
+err:
/*
* there may be still some leaks to fix, if this fails, the application
* terminates most likely
@@ -510,7 +507,6 @@ int SRP_VBASE_init(SRP_VBASE *vb, char *verifier_file)
sk_SRP_gN_free(SRP_gN_tab);
return error_code;
-
}
static SRP_user_pwd *find_user(SRP_VBASE *vb, char *username)
@@ -537,7 +533,7 @@ int SRP_VBASE_add0_user(SRP_VBASE *vb, SRP_user_pwd *user_pwd)
return 1;
}
-# ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
/*
* DEPRECATED: use SRP_VBASE_get1_by_user instead.
* This method ignores the configured seed and fails for an unknown user.
@@ -548,7 +544,7 @@ SRP_user_pwd *SRP_VBASE_get_by_user(SRP_VBASE *vb, char *username)
{
return find_user(vb, username);
}
-# endif
+#endif
/*
* Ownership of the returned pointer is released to the caller.
@@ -568,11 +564,10 @@ SRP_user_pwd *SRP_VBASE_get1_by_user(SRP_VBASE *vb, char *username)
if ((user = find_user(vb, username)) != NULL)
return srp_user_pwd_dup(user);
- if ((vb->seed_key == NULL) ||
- (vb->default_g == NULL) || (vb->default_N == NULL))
+ if ((vb->seed_key == NULL) || (vb->default_g == NULL) || (vb->default_N == NULL))
return NULL;
-/* if the user is unknown we set parameters as well if we have a seed_key */
+ /* if the user is unknown we set parameters as well if we have a seed_key */
if ((user = SRP_user_pwd_new()) == NULL)
return NULL;
@@ -599,11 +594,11 @@ SRP_user_pwd *SRP_VBASE_get1_by_user(SRP_VBASE *vb, char *username)
EVP_MD_free(md);
md = NULL;
if (SRP_user_pwd_set0_sv(user,
- BN_bin2bn(digs, SHA_DIGEST_LENGTH, NULL),
- BN_bin2bn(digv, SHA_DIGEST_LENGTH, NULL)))
+ BN_bin2bn(digs, SHA_DIGEST_LENGTH, NULL),
+ BN_bin2bn(digv, SHA_DIGEST_LENGTH, NULL)))
return user;
- err:
+err:
EVP_MD_free(md);
EVP_MD_CTX_free(ctxt);
SRP_user_pwd_free(user);
@@ -614,8 +609,8 @@ SRP_user_pwd *SRP_VBASE_get1_by_user(SRP_VBASE *vb, char *username)
* create a verifier (*salt,*verifier,g and N are in base64)
*/
char *SRP_create_verifier_ex(const char *user, const char *pass, char **salt,
- char **verifier, const char *N, const char *g,
- OSSL_LIB_CTX *libctx, const char *propq)
+ char **verifier, const char *N, const char *g,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
int len;
char *result = NULL, *vf = NULL;
@@ -626,8 +621,7 @@ char *SRP_create_verifier_ex(const char *user, const char *pass, char **salt,
char *defgNid = NULL;
int vfsize = 0;
- if ((user == NULL) ||
- (pass == NULL) || (salt == NULL) || (verifier == NULL))
+ if ((user == NULL) || (pass == NULL) || (salt == NULL) || (verifier == NULL))
goto err;
if (N) {
@@ -667,7 +661,7 @@ char *SRP_create_verifier_ex(const char *user, const char *pass, char **salt,
goto err;
if (!SRP_create_verifier_BN_ex(user, pass, &s, &v, N_bn, g_bn, libctx,
- propq))
+ propq))
goto err;
if (BN_bn2bin(v, tmp) < 0)
@@ -694,7 +688,7 @@ char *SRP_create_verifier_ex(const char *user, const char *pass, char **salt,
vf = NULL;
result = defgNid;
- err:
+err:
BN_free(N_bn_alloc);
BN_free(g_bn_alloc);
OPENSSL_clear_free(vf, vfsize);
@@ -704,7 +698,7 @@ char *SRP_create_verifier_ex(const char *user, const char *pass, char **salt,
}
char *SRP_create_verifier(const char *user, const char *pass, char **salt,
- char **verifier, const char *N, const char *g)
+ char **verifier, const char *N, const char *g)
{
return SRP_create_verifier_ex(user, pass, salt, verifier, N, g, NULL, NULL);
}
@@ -719,9 +713,9 @@ char *SRP_create_verifier(const char *user, const char *pass, char **salt,
* BIGNUMS.
*/
int SRP_create_verifier_BN_ex(const char *user, const char *pass, BIGNUM **salt,
- BIGNUM **verifier, const BIGNUM *N,
- const BIGNUM *g, OSSL_LIB_CTX *libctx,
- const char *propq)
+ BIGNUM **verifier, const BIGNUM *N,
+ const BIGNUM *g, OSSL_LIB_CTX *libctx,
+ const char *propq)
{
int result = 0;
BIGNUM *x = NULL;
@@ -729,10 +723,7 @@ int SRP_create_verifier_BN_ex(const char *user, const char *pass, BIGNUM **salt,
unsigned char tmp2[MAX_LEN];
BIGNUM *salttmp = NULL, *verif;
- if ((user == NULL) ||
- (pass == NULL) ||
- (salt == NULL) ||
- (verifier == NULL) || (N == NULL) || (g == NULL) || (bn_ctx == NULL))
+ if ((user == NULL) || (pass == NULL) || (salt == NULL) || (verifier == NULL) || (N == NULL) || (g == NULL) || (bn_ctx == NULL))
goto err;
if (*salt == NULL) {
@@ -763,7 +754,7 @@ int SRP_create_verifier_BN_ex(const char *user, const char *pass, BIGNUM **salt,
*salt = salttmp;
*verifier = verif;
- err:
+err:
if (salt != NULL && *salt != salttmp)
BN_clear_free(salttmp);
BN_clear_free(x);
@@ -772,10 +763,10 @@ int SRP_create_verifier_BN_ex(const char *user, const char *pass, BIGNUM **salt,
}
int SRP_create_verifier_BN(const char *user, const char *pass, BIGNUM **salt,
- BIGNUM **verifier, const BIGNUM *N,
- const BIGNUM *g)
+ BIGNUM **verifier, const BIGNUM *N,
+ const BIGNUM *g)
{
return SRP_create_verifier_BN_ex(user, pass, salt, verifier, N, g, NULL,
- NULL);
+ NULL);
}
#endif
diff --git a/crypto/ssl_err.c b/crypto/ssl_err.c
index b791daf548..6b88675200 100644
--- a/crypto/ssl_err.c
+++ b/crypto/ssl_err.c
@@ -15,612 +15,612 @@
#ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA SSL_str_reasons[] = {
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_APPLICATION_DATA_AFTER_CLOSE_NOTIFY),
- "application data after close notify"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_APP_DATA_IN_HANDSHAKE),
- "app data in handshake"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT),
- "attempt to reuse session in different context"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_AT_LEAST_TLS_1_2_NEEDED_IN_SUITEB_MODE),
- "at least (D)TLS 1.2 needed in Suite B mode"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_CERTIFICATE), "bad certificate"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_CHANGE_CIPHER_SPEC),
- "bad change cipher spec"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_CIPHER), "bad cipher"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_COMPRESSION_ALGORITHM),
- "bad compression algorithm"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_DATA), "bad data"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_DATA_RETURNED_BY_CALLBACK),
- "bad data returned by callback"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_DECOMPRESSION), "bad decompression"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_DH_VALUE), "bad dh value"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_DIGEST_LENGTH), "bad digest length"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_EARLY_DATA), "bad early data"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_ECC_CERT), "bad ecc cert"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_ECPOINT), "bad ecpoint"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_EXTENSION), "bad extension"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_HANDSHAKE_LENGTH),
- "bad handshake length"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_HANDSHAKE_STATE),
- "bad handshake state"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_HELLO_REQUEST), "bad hello request"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_HRR_VERSION), "bad hrr version"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_KEY_SHARE), "bad key share"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_KEY_UPDATE), "bad key update"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_LEGACY_VERSION), "bad legacy version"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_LENGTH), "bad length"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_PACKET), "bad packet"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_PACKET_LENGTH), "bad packet length"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_PROTOCOL_VERSION_NUMBER),
- "bad protocol version number"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_PSK), "bad psk"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_PSK_IDENTITY), "bad psk identity"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_RECORD_TYPE), "bad record type"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_RSA_ENCRYPT), "bad rsa encrypt"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_SIGNATURE), "bad signature"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_SRP_A_LENGTH), "bad srp a length"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_SRP_PARAMETERS), "bad srp parameters"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_SRTP_MKI_VALUE), "bad srtp mki value"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_SRTP_PROTECTION_PROFILE_LIST),
- "bad srtp protection profile list"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_SSL_FILETYPE), "bad ssl filetype"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_VALUE), "bad value"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_WRITE_RETRY), "bad write retry"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BINDER_DOES_NOT_VERIFY),
- "binder does not verify"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BIO_NOT_SET), "bio not set"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BLOCK_CIPHER_PAD_IS_WRONG),
- "block cipher pad is wrong"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BN_LIB), "bn lib"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CALLBACK_FAILED), "callback failed"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CANNOT_CHANGE_CIPHER),
- "cannot change cipher"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CANNOT_GET_GROUP_NAME),
- "cannot get group name"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CA_DN_LENGTH_MISMATCH),
- "ca dn length mismatch"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CA_KEY_TOO_SMALL), "ca key too small"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CA_MD_TOO_WEAK), "ca md too weak"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CCS_RECEIVED_EARLY), "ccs received early"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CERTIFICATE_VERIFY_FAILED),
- "certificate verify failed"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CERT_CB_ERROR), "cert cb error"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CERT_LENGTH_MISMATCH),
- "cert length mismatch"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CIPHERSUITE_DIGEST_HAS_CHANGED),
- "ciphersuite digest has changed"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CIPHER_CODE_WRONG_LENGTH),
- "cipher code wrong length"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CLIENTHELLO_TLSEXT), "clienthello tlsext"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_COMPRESSED_LENGTH_TOO_LONG),
- "compressed length too long"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_COMPRESSION_DISABLED),
- "compression disabled"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_COMPRESSION_FAILURE),
- "compression failure"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_COMPRESSION_ID_NOT_WITHIN_PRIVATE_RANGE),
- "compression id not within private range"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_COMPRESSION_LIBRARY_ERROR),
- "compression library error"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CONNECTION_TYPE_NOT_SET),
- "connection type not set"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CONN_USE_ONLY), "conn use only"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CONTEXT_NOT_DANE_ENABLED),
- "context not dane enabled"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_COOKIE_GEN_CALLBACK_FAILURE),
- "cookie gen callback failure"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_COOKIE_MISMATCH), "cookie mismatch"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_COPY_PARAMETERS_FAILED),
- "copy parameters failed"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CUSTOM_EXT_HANDLER_ALREADY_INSTALLED),
- "custom ext handler already installed"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DANE_ALREADY_ENABLED),
- "dane already enabled"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DANE_CANNOT_OVERRIDE_MTYPE_FULL),
- "dane cannot override mtype full"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DANE_NOT_ENABLED), "dane not enabled"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DANE_TLSA_BAD_CERTIFICATE),
- "dane tlsa bad certificate"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DANE_TLSA_BAD_CERTIFICATE_USAGE),
- "dane tlsa bad certificate usage"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DANE_TLSA_BAD_DATA_LENGTH),
- "dane tlsa bad data length"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DANE_TLSA_BAD_DIGEST_LENGTH),
- "dane tlsa bad digest length"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DANE_TLSA_BAD_MATCHING_TYPE),
- "dane tlsa bad matching type"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DANE_TLSA_BAD_PUBLIC_KEY),
- "dane tlsa bad public key"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DANE_TLSA_BAD_SELECTOR),
- "dane tlsa bad selector"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DANE_TLSA_NULL_DATA),
- "dane tlsa null data"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DATA_BETWEEN_CCS_AND_FINISHED),
- "data between ccs and finished"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DATA_LENGTH_TOO_LONG),
- "data length too long"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DECRYPTION_FAILED), "decryption failed"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DECRYPTION_FAILED_OR_BAD_RECORD_MAC),
- "decryption failed or bad record mac"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DH_KEY_TOO_SMALL), "dh key too small"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DH_PUBLIC_VALUE_LENGTH_IS_WRONG),
- "dh public value length is wrong"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DIGEST_CHECK_FAILED),
- "digest check failed"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DOMAIN_USE_ONLY), "domain use only"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DTLS_MESSAGE_TOO_BIG),
- "dtls message too big"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DUPLICATE_COMPRESSION_ID),
- "duplicate compression id"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_ECC_CERT_NOT_FOR_SIGNING),
- "ecc cert not for signing"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_ECDH_REQUIRED_FOR_SUITEB_MODE),
- "ecdh required for suiteb mode"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_EE_KEY_TOO_SMALL), "ee key too small"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_EMPTY_RAW_PUBLIC_KEY),
- "empty raw public key"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_EMPTY_SRTP_PROTECTION_PROFILE_LIST),
- "empty srtp protection profile list"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_ENCRYPTED_LENGTH_TOO_LONG),
- "encrypted length too long"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST),
- "error in received cipher list"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_ERROR_IN_SYSTEM_DEFAULT_CONFIG),
- "error in system default config"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_ERROR_SETTING_TLSA_BASE_DOMAIN),
- "error setting tlsa base domain"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_EXCEEDS_MAX_FRAGMENT_SIZE),
- "exceeds max fragment size"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_EXCESSIVE_MESSAGE_SIZE),
- "excessive message size"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_EXTENSION_NOT_RECEIVED),
- "extension not received"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_EXTRA_DATA_IN_MESSAGE),
- "extra data in message"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_EXT_LENGTH_MISMATCH),
- "ext length mismatch"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_FAILED_TO_GET_PARAMETER),
- "failed to get parameter"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_FAILED_TO_INIT_ASYNC),
- "failed to init async"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_FEATURE_NEGOTIATION_NOT_COMPLETE),
- "feature negotiation not complete"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_FEATURE_NOT_RENEGOTIABLE),
- "feature not renegotiable"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_FRAGMENTED_CLIENT_HELLO),
- "fragmented client hello"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_GOT_A_FIN_BEFORE_A_CCS),
- "got a fin before a ccs"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_HTTPS_PROXY_REQUEST),
- "https proxy request"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_HTTP_REQUEST), "http request"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_ILLEGAL_POINT_COMPRESSION),
- "illegal point compression"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_ILLEGAL_SUITEB_DIGEST),
- "illegal Suite B digest"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INAPPROPRIATE_FALLBACK),
- "inappropriate fallback"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INCONSISTENT_COMPRESSION),
- "inconsistent compression"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INCONSISTENT_EARLY_DATA_ALPN),
- "inconsistent early data alpn"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INCONSISTENT_EARLY_DATA_SNI),
- "inconsistent early data sni"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INCONSISTENT_EXTMS), "inconsistent extms"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INSUFFICIENT_SECURITY),
- "insufficient security"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_ALERT), "invalid alert"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_CCS_MESSAGE),
- "invalid ccs message"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_CERTIFICATE_OR_ALG),
- "invalid certificate or alg"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_COMMAND), "invalid command"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_COMPRESSION_ALGORITHM),
- "invalid compression algorithm"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_CONFIG), "invalid config"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_CONFIGURATION_NAME),
- "invalid configuration name"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_CONTEXT), "invalid context"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_CT_VALIDATION_TYPE),
- "invalid ct validation type"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_KEY_UPDATE_TYPE),
- "invalid key update type"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_MAX_EARLY_DATA),
- "invalid max early data"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_NULL_CMD_NAME),
- "invalid null cmd name"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_RAW_PUBLIC_KEY),
- "invalid raw public key"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_RECORD), "invalid record"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_SEQUENCE_NUMBER),
- "invalid sequence number"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_SERVERINFO_DATA),
- "invalid serverinfo data"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_SESSION_ID), "invalid session id"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_SRP_USERNAME),
- "invalid srp username"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_STATUS_RESPONSE),
- "invalid status response"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_TICKET_KEYS_LENGTH),
- "invalid ticket keys length"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_LEGACY_SIGALG_DISALLOWED_OR_UNSUPPORTED),
- "legacy sigalg disallowed or unsupported"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_LENGTH_MISMATCH), "length mismatch"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_LENGTH_TOO_LONG), "length too long"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_LENGTH_TOO_SHORT), "length too short"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_LIBRARY_BUG), "library bug"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_LIBRARY_HAS_NO_CIPHERS),
- "library has no ciphers"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_LISTENER_USE_ONLY), "listener use only"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MAXIMUM_ENCRYPTED_PKTS_REACHED),
- "maximum encrypted pkts reached"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_DSA_SIGNING_CERT),
- "missing dsa signing cert"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_ECDSA_SIGNING_CERT),
- "missing ecdsa signing cert"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_FATAL), "missing fatal"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_PARAMETERS), "missing parameters"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_PSK_KEX_MODES_EXTENSION),
- "missing psk kex modes extension"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_QUIC_TLS_FUNCTIONS),
- "missing quic tls functions"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_RSA_CERTIFICATE),
- "missing rsa certificate"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_RSA_ENCRYPTING_CERT),
- "missing rsa encrypting cert"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_RSA_SIGNING_CERT),
- "missing rsa signing cert"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_SIGALGS_EXTENSION),
- "missing sigalgs extension"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_SIGNING_CERT),
- "missing signing cert"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_SRP_PARAM),
- "can't find SRP server param"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_SUPPORTED_GROUPS_EXTENSION),
- "missing supported groups extension"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_SUPPORTED_VERSIONS_EXTENSION),
- "missing supported versions extension"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_TMP_DH_KEY), "missing tmp dh key"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_TMP_ECDH_KEY),
- "missing tmp ecdh key"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MIXED_HANDSHAKE_AND_NON_HANDSHAKE_DATA),
- "mixed handshake and non handshake data"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NOT_ON_RECORD_BOUNDARY),
- "not on record boundary"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NOT_REPLACING_CERTIFICATE),
- "not replacing certificate"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NOT_SERVER), "not server"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_APPLICATION_PROTOCOL),
- "no application protocol"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_CERTIFICATES_RETURNED),
- "no certificates returned"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_CERTIFICATE_ASSIGNED),
- "no certificate assigned"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_CERTIFICATE_SET), "no certificate set"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_CHANGE_FOLLOWING_HRR),
- "no change following hrr"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_CIPHERS_AVAILABLE),
- "no ciphers available"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_CIPHERS_SPECIFIED),
- "no ciphers specified"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_CIPHER_MATCH), "no cipher match"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_CLIENT_CERT_METHOD),
- "no client cert method"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_COMPRESSION_SPECIFIED),
- "no compression specified"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_COOKIE_CALLBACK_SET),
- "no cookie callback set"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_GOST_CERTIFICATE_SENT_BY_PEER),
- "Peer haven't sent GOST certificate, required for selected ciphersuite"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_METHOD_SPECIFIED),
- "no method specified"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_PEM_EXTENSIONS), "no pem extensions"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_PRIVATE_KEY_ASSIGNED),
- "no private key assigned"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_PROTOCOLS_AVAILABLE),
- "no protocols available"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_RENEGOTIATION), "no renegotiation"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_REQUIRED_DIGEST), "no required digest"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_SHARED_CIPHER), "no shared cipher"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_SHARED_GROUPS), "no shared groups"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_SHARED_SIGNATURE_ALGORITHMS),
- "no shared signature algorithms"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_SRTP_PROFILES), "no srtp profiles"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_STREAM), "no stream"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_SUITABLE_DIGEST_ALGORITHM),
- "no suitable digest algorithm"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_SUITABLE_GROUPS), "no suitable groups"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_SUITABLE_KEY_SHARE),
- "no suitable key share"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_SUITABLE_RECORD_LAYER),
- "no suitable record layer"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_SUITABLE_SIGNATURE_ALGORITHM),
- "no suitable signature algorithm"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_VALID_SCTS), "no valid scts"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_VERIFY_COOKIE_CALLBACK),
- "no verify cookie callback"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NULL_SSL_CTX), "null ssl ctx"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NULL_SSL_METHOD_PASSED),
- "null ssl method passed"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_OCSP_CALLBACK_FAILURE),
- "ocsp callback failure"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED),
- "old session cipher not returned"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_OLD_SESSION_COMPRESSION_ALGORITHM_NOT_RETURNED),
- "old session compression algorithm not returned"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_OVERFLOW_ERROR), "overflow error"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PACKET_LENGTH_TOO_LONG),
- "packet length too long"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PARSE_TLSEXT), "parse tlsext"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PATH_TOO_LONG), "path too long"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE),
- "peer did not return a certificate"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PEM_NAME_BAD_PREFIX),
- "pem name bad prefix"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PEM_NAME_TOO_SHORT), "pem name too short"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PIPELINE_FAILURE), "pipeline failure"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_POLL_REQUEST_NOT_SUPPORTED),
- "poll request not supported"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_POST_HANDSHAKE_AUTH_ENCODING_ERR),
- "post handshake auth encoding err"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PRIVATE_KEY_MISMATCH),
- "private key mismatch"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PROTOCOL_IS_SHUTDOWN),
- "protocol is shutdown"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PSK_IDENTITY_NOT_FOUND),
- "psk identity not found"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PSK_NO_CLIENT_CB), "psk no client cb"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PSK_NO_SERVER_CB), "psk no server cb"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_QUIC_HANDSHAKE_LAYER_ERROR),
- "quic handshake layer error"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_QUIC_NETWORK_ERROR), "quic network error"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_QUIC_PROTOCOL_ERROR),
- "quic protocol error"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_READ_BIO_NOT_SET), "read bio not set"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_READ_TIMEOUT_EXPIRED),
- "read timeout expired"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_RECORDS_NOT_RELEASED),
- "records not released"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_RECORD_LAYER_FAILURE),
- "record layer failure"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_RECORD_LENGTH_MISMATCH),
- "record length mismatch"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_RECORD_TOO_SMALL), "record too small"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_REMOTE_PEER_ADDRESS_NOT_SET),
- "remote peer address not set"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_RENEGOTIATE_EXT_TOO_LONG),
- "renegotiate ext too long"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_RENEGOTIATION_ENCODING_ERR),
- "renegotiation encoding err"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_RENEGOTIATION_MISMATCH),
- "renegotiation mismatch"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_REQUEST_PENDING), "request pending"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_REQUEST_SENT), "request sent"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_REQUIRED_CIPHER_MISSING),
- "required cipher missing"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_REQUIRED_COMPRESSION_ALGORITHM_MISSING),
- "required compression algorithm missing"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SCSV_RECEIVED_WHEN_RENEGOTIATING),
- "scsv received when renegotiating"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SCT_VERIFICATION_FAILED),
- "sct verification failed"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SEQUENCE_CTR_WRAPPED),
- "sequence ctr wrapped"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SERVERHELLO_TLSEXT), "serverhello tlsext"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SESSION_ID_CONTEXT_UNINITIALIZED),
- "session id context uninitialized"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SHUTDOWN_WHILE_IN_INIT),
- "shutdown while in init"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SIGNATURE_ALGORITHMS_ERROR),
- "signature algorithms error"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SIGNATURE_FOR_NON_SIGNING_CERTIFICATE),
- "signature for non signing certificate"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SRP_A_CALC), "error with the srp params"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SRTP_COULD_NOT_ALLOCATE_PROFILES),
- "srtp could not allocate profiles"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SRTP_PROTECTION_PROFILE_LIST_TOO_LONG),
- "srtp protection profile list too long"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SRTP_UNKNOWN_PROTECTION_PROFILE),
- "srtp unknown protection profile"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL3_EXT_INVALID_MAX_FRAGMENT_LENGTH),
- "ssl3 ext invalid max fragment length"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL3_EXT_INVALID_SERVERNAME),
- "ssl3 ext invalid servername"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL3_EXT_INVALID_SERVERNAME_TYPE),
- "ssl3 ext invalid servername type"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL3_SESSION_ID_TOO_LONG),
- "ssl3 session id too long"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSLV3_ALERT_BAD_CERTIFICATE),
- "ssl/tls alert bad certificate"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSLV3_ALERT_BAD_RECORD_MAC),
- "ssl/tls alert bad record mac"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSLV3_ALERT_CERTIFICATE_EXPIRED),
- "ssl/tls alert certificate expired"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSLV3_ALERT_CERTIFICATE_REVOKED),
- "ssl/tls alert certificate revoked"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSLV3_ALERT_CERTIFICATE_UNKNOWN),
- "ssl/tls alert certificate unknown"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSLV3_ALERT_DECOMPRESSION_FAILURE),
- "ssl/tls alert decompression failure"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSLV3_ALERT_HANDSHAKE_FAILURE),
- "ssl/tls alert handshake failure"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSLV3_ALERT_ILLEGAL_PARAMETER),
- "ssl/tls alert illegal parameter"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSLV3_ALERT_NO_CERTIFICATE),
- "ssl/tls alert no certificate"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSLV3_ALERT_UNEXPECTED_MESSAGE),
- "ssl/tls alert unexpected message"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSLV3_ALERT_UNSUPPORTED_CERTIFICATE),
- "ssl/tls alert unsupported certificate"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_COMMAND_SECTION_EMPTY),
- "ssl command section empty"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_COMMAND_SECTION_NOT_FOUND),
- "ssl command section not found"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_CTX_HAS_NO_DEFAULT_SSL_VERSION),
- "ssl ctx has no default ssl version"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_HANDSHAKE_FAILURE),
- "ssl handshake failure"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_LIBRARY_HAS_NO_CIPHERS),
- "ssl library has no ciphers"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_NEGATIVE_LENGTH),
- "ssl negative length"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_SECTION_EMPTY), "ssl section empty"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_SECTION_NOT_FOUND),
- "ssl section not found"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_SESSION_ID_CALLBACK_FAILED),
- "ssl session id callback failed"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_SESSION_ID_CONFLICT),
- "ssl session id conflict"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_SESSION_ID_CONTEXT_TOO_LONG),
- "ssl session id context too long"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_SESSION_ID_HAS_BAD_LENGTH),
- "ssl session id has bad length"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_SESSION_ID_TOO_LONG),
- "ssl session id too long"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_SESSION_VERSION_MISMATCH),
- "ssl session version mismatch"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_STILL_IN_INIT), "still in init"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_STREAM_COUNT_LIMITED),
- "stream count limited"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_STREAM_FINISHED), "stream finished"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_STREAM_RECV_ONLY), "stream recv only"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_STREAM_RESET), "stream reset"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_STREAM_SEND_ONLY), "stream send only"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV13_ALERT_CERTIFICATE_REQUIRED),
- "tlsv13 alert certificate required"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV13_ALERT_MISSING_EXTENSION),
- "tlsv13 alert missing extension"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_ACCESS_DENIED),
- "tlsv1 alert access denied"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_DECODE_ERROR),
- "tlsv1 alert decode error"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_DECRYPTION_FAILED),
- "tlsv1 alert decryption failed"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_DECRYPT_ERROR),
- "tlsv1 alert decrypt error"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_EXPORT_RESTRICTION),
- "tlsv1 alert export restriction"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_INAPPROPRIATE_FALLBACK),
- "tlsv1 alert inappropriate fallback"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY),
- "tlsv1 alert insufficient security"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_INTERNAL_ERROR),
- "tlsv1 alert internal error"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_NO_APPLICATION_PROTOCOL),
- "tlsv1 alert no application protocol"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_NO_RENEGOTIATION),
- "tlsv1 alert no renegotiation"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_PROTOCOL_VERSION),
- "tlsv1 alert protocol version"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_RECORD_OVERFLOW),
- "tlsv1 alert record overflow"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_UNKNOWN_CA),
- "tlsv1 alert unknown ca"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_UNKNOWN_PSK_IDENTITY),
- "tlsv1 alert unknown psk identity"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_USER_CANCELLED),
- "tlsv1 alert user cancelled"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_BAD_CERTIFICATE_HASH_VALUE),
- "tlsv1 bad certificate hash value"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_BAD_CERTIFICATE_STATUS_RESPONSE),
- "tlsv1 bad certificate status response"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_CERTIFICATE_UNOBTAINABLE),
- "tlsv1 certificate unobtainable"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_UNRECOGNIZED_NAME),
- "tlsv1 unrecognized name"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_UNSUPPORTED_EXTENSION),
- "tlsv1 unsupported extension"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLS_ILLEGAL_EXPORTER_LABEL),
- "tls illegal exporter label"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLS_INVALID_ECPOINTFORMAT_LIST),
- "tls invalid ecpointformat list"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TOO_MANY_KEY_UPDATES),
- "too many key updates"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TOO_MANY_WARN_ALERTS),
- "too many warn alerts"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TOO_MUCH_EARLY_DATA),
- "too much early data"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNABLE_TO_FIND_ECDH_PARAMETERS),
- "unable to find ecdh parameters"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS),
- "unable to find public key parameters"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNABLE_TO_LOAD_SSL3_MD5_ROUTINES),
- "unable to load ssl3 md5 routines"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNABLE_TO_LOAD_SSL3_SHA1_ROUTINES),
- "unable to load ssl3 sha1 routines"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNEXPECTED_CCS_MESSAGE),
- "unexpected ccs message"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNEXPECTED_END_OF_EARLY_DATA),
- "unexpected end of early data"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNEXPECTED_EOF_WHILE_READING),
- "unexpected eof while reading"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNEXPECTED_MESSAGE), "unexpected message"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNEXPECTED_RECORD), "unexpected record"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNINITIALIZED), "uninitialized"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_ALERT_TYPE), "unknown alert type"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_CERTIFICATE_TYPE),
- "unknown certificate type"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_CIPHER_RETURNED),
- "unknown cipher returned"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_CIPHER_TYPE),
- "unknown cipher type"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_CMD_NAME), "unknown cmd name"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_COMMAND), "unknown command"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_DIGEST), "unknown digest"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE),
- "unknown key exchange type"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_MANDATORY_PARAMETER),
- "unknown mandatory parameter"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_PKEY_TYPE), "unknown pkey type"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_PROTOCOL), "unknown protocol"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_SSL_VERSION),
- "unknown ssl version"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_STATE), "unknown state"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED),
- "unsafe legacy renegotiation disabled"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNSOLICITED_EXTENSION),
- "unsolicited extension"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM),
- "unsupported compression algorithm"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNSUPPORTED_CONFIG_VALUE),
- "unsupported config value"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNSUPPORTED_CONFIG_VALUE_CLASS),
- "unsupported config value class"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNSUPPORTED_CONFIG_VALUE_OP),
- "unsupported config value op"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNSUPPORTED_ELLIPTIC_CURVE),
- "unsupported elliptic curve"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNSUPPORTED_PROTOCOL),
- "unsupported protocol"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNSUPPORTED_SSL_VERSION),
- "unsupported ssl version"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNSUPPORTED_STATUS_TYPE),
- "unsupported status type"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNSUPPORTED_WRITE_FLAG),
- "unsupported write flag"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_USE_SRTP_NOT_NEGOTIATED),
- "use srtp not negotiated"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_VERSION_TOO_HIGH), "version too high"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_VERSION_TOO_LOW), "version too low"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_WRONG_CERTIFICATE_TYPE),
- "wrong certificate type"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_WRONG_CIPHER_RETURNED),
- "wrong cipher returned"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_WRONG_CURVE), "wrong curve"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_WRONG_RPK_TYPE), "wrong rpk type"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_WRONG_SIGNATURE_LENGTH),
- "wrong signature length"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_WRONG_SIGNATURE_SIZE),
- "wrong signature size"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_WRONG_SIGNATURE_TYPE),
- "wrong signature type"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_WRONG_SSL_VERSION), "wrong ssl version"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_WRONG_VERSION_NUMBER),
- "wrong version number"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_X509_LIB), "x509 lib"},
- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_X509_VERIFICATION_SETUP_PROBLEMS),
- "x509 verification setup problems"},
- {0, NULL}
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_APPLICATION_DATA_AFTER_CLOSE_NOTIFY),
+ "application data after close notify" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_APP_DATA_IN_HANDSHAKE),
+ "app data in handshake" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT),
+ "attempt to reuse session in different context" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_AT_LEAST_TLS_1_2_NEEDED_IN_SUITEB_MODE),
+ "at least (D)TLS 1.2 needed in Suite B mode" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_CERTIFICATE), "bad certificate" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_CHANGE_CIPHER_SPEC),
+ "bad change cipher spec" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_CIPHER), "bad cipher" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_COMPRESSION_ALGORITHM),
+ "bad compression algorithm" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_DATA), "bad data" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_DATA_RETURNED_BY_CALLBACK),
+ "bad data returned by callback" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_DECOMPRESSION), "bad decompression" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_DH_VALUE), "bad dh value" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_DIGEST_LENGTH), "bad digest length" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_EARLY_DATA), "bad early data" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_ECC_CERT), "bad ecc cert" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_ECPOINT), "bad ecpoint" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_EXTENSION), "bad extension" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_HANDSHAKE_LENGTH),
+ "bad handshake length" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_HANDSHAKE_STATE),
+ "bad handshake state" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_HELLO_REQUEST), "bad hello request" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_HRR_VERSION), "bad hrr version" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_KEY_SHARE), "bad key share" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_KEY_UPDATE), "bad key update" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_LEGACY_VERSION), "bad legacy version" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_LENGTH), "bad length" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_PACKET), "bad packet" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_PACKET_LENGTH), "bad packet length" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_PROTOCOL_VERSION_NUMBER),
+ "bad protocol version number" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_PSK), "bad psk" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_PSK_IDENTITY), "bad psk identity" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_RECORD_TYPE), "bad record type" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_RSA_ENCRYPT), "bad rsa encrypt" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_SIGNATURE), "bad signature" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_SRP_A_LENGTH), "bad srp a length" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_SRP_PARAMETERS), "bad srp parameters" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_SRTP_MKI_VALUE), "bad srtp mki value" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_SRTP_PROTECTION_PROFILE_LIST),
+ "bad srtp protection profile list" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_SSL_FILETYPE), "bad ssl filetype" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_VALUE), "bad value" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_WRITE_RETRY), "bad write retry" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BINDER_DOES_NOT_VERIFY),
+ "binder does not verify" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BIO_NOT_SET), "bio not set" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BLOCK_CIPHER_PAD_IS_WRONG),
+ "block cipher pad is wrong" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BN_LIB), "bn lib" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CALLBACK_FAILED), "callback failed" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CANNOT_CHANGE_CIPHER),
+ "cannot change cipher" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CANNOT_GET_GROUP_NAME),
+ "cannot get group name" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CA_DN_LENGTH_MISMATCH),
+ "ca dn length mismatch" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CA_KEY_TOO_SMALL), "ca key too small" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CA_MD_TOO_WEAK), "ca md too weak" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CCS_RECEIVED_EARLY), "ccs received early" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CERTIFICATE_VERIFY_FAILED),
+ "certificate verify failed" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CERT_CB_ERROR), "cert cb error" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CERT_LENGTH_MISMATCH),
+ "cert length mismatch" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CIPHERSUITE_DIGEST_HAS_CHANGED),
+ "ciphersuite digest has changed" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CIPHER_CODE_WRONG_LENGTH),
+ "cipher code wrong length" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CLIENTHELLO_TLSEXT), "clienthello tlsext" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_COMPRESSED_LENGTH_TOO_LONG),
+ "compressed length too long" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_COMPRESSION_DISABLED),
+ "compression disabled" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_COMPRESSION_FAILURE),
+ "compression failure" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_COMPRESSION_ID_NOT_WITHIN_PRIVATE_RANGE),
+ "compression id not within private range" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_COMPRESSION_LIBRARY_ERROR),
+ "compression library error" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CONNECTION_TYPE_NOT_SET),
+ "connection type not set" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CONN_USE_ONLY), "conn use only" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CONTEXT_NOT_DANE_ENABLED),
+ "context not dane enabled" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_COOKIE_GEN_CALLBACK_FAILURE),
+ "cookie gen callback failure" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_COOKIE_MISMATCH), "cookie mismatch" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_COPY_PARAMETERS_FAILED),
+ "copy parameters failed" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CUSTOM_EXT_HANDLER_ALREADY_INSTALLED),
+ "custom ext handler already installed" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DANE_ALREADY_ENABLED),
+ "dane already enabled" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DANE_CANNOT_OVERRIDE_MTYPE_FULL),
+ "dane cannot override mtype full" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DANE_NOT_ENABLED), "dane not enabled" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DANE_TLSA_BAD_CERTIFICATE),
+ "dane tlsa bad certificate" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DANE_TLSA_BAD_CERTIFICATE_USAGE),
+ "dane tlsa bad certificate usage" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DANE_TLSA_BAD_DATA_LENGTH),
+ "dane tlsa bad data length" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DANE_TLSA_BAD_DIGEST_LENGTH),
+ "dane tlsa bad digest length" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DANE_TLSA_BAD_MATCHING_TYPE),
+ "dane tlsa bad matching type" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DANE_TLSA_BAD_PUBLIC_KEY),
+ "dane tlsa bad public key" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DANE_TLSA_BAD_SELECTOR),
+ "dane tlsa bad selector" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DANE_TLSA_NULL_DATA),
+ "dane tlsa null data" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DATA_BETWEEN_CCS_AND_FINISHED),
+ "data between ccs and finished" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DATA_LENGTH_TOO_LONG),
+ "data length too long" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DECRYPTION_FAILED), "decryption failed" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DECRYPTION_FAILED_OR_BAD_RECORD_MAC),
+ "decryption failed or bad record mac" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DH_KEY_TOO_SMALL), "dh key too small" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DH_PUBLIC_VALUE_LENGTH_IS_WRONG),
+ "dh public value length is wrong" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DIGEST_CHECK_FAILED),
+ "digest check failed" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DOMAIN_USE_ONLY), "domain use only" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DTLS_MESSAGE_TOO_BIG),
+ "dtls message too big" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DUPLICATE_COMPRESSION_ID),
+ "duplicate compression id" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_ECC_CERT_NOT_FOR_SIGNING),
+ "ecc cert not for signing" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_ECDH_REQUIRED_FOR_SUITEB_MODE),
+ "ecdh required for suiteb mode" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_EE_KEY_TOO_SMALL), "ee key too small" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_EMPTY_RAW_PUBLIC_KEY),
+ "empty raw public key" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_EMPTY_SRTP_PROTECTION_PROFILE_LIST),
+ "empty srtp protection profile list" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_ENCRYPTED_LENGTH_TOO_LONG),
+ "encrypted length too long" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST),
+ "error in received cipher list" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_ERROR_IN_SYSTEM_DEFAULT_CONFIG),
+ "error in system default config" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_ERROR_SETTING_TLSA_BASE_DOMAIN),
+ "error setting tlsa base domain" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_EXCEEDS_MAX_FRAGMENT_SIZE),
+ "exceeds max fragment size" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_EXCESSIVE_MESSAGE_SIZE),
+ "excessive message size" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_EXTENSION_NOT_RECEIVED),
+ "extension not received" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_EXTRA_DATA_IN_MESSAGE),
+ "extra data in message" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_EXT_LENGTH_MISMATCH),
+ "ext length mismatch" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_FAILED_TO_GET_PARAMETER),
+ "failed to get parameter" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_FAILED_TO_INIT_ASYNC),
+ "failed to init async" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_FEATURE_NEGOTIATION_NOT_COMPLETE),
+ "feature negotiation not complete" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_FEATURE_NOT_RENEGOTIABLE),
+ "feature not renegotiable" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_FRAGMENTED_CLIENT_HELLO),
+ "fragmented client hello" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_GOT_A_FIN_BEFORE_A_CCS),
+ "got a fin before a ccs" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_HTTPS_PROXY_REQUEST),
+ "https proxy request" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_HTTP_REQUEST), "http request" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_ILLEGAL_POINT_COMPRESSION),
+ "illegal point compression" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_ILLEGAL_SUITEB_DIGEST),
+ "illegal Suite B digest" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INAPPROPRIATE_FALLBACK),
+ "inappropriate fallback" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INCONSISTENT_COMPRESSION),
+ "inconsistent compression" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INCONSISTENT_EARLY_DATA_ALPN),
+ "inconsistent early data alpn" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INCONSISTENT_EARLY_DATA_SNI),
+ "inconsistent early data sni" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INCONSISTENT_EXTMS), "inconsistent extms" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INSUFFICIENT_SECURITY),
+ "insufficient security" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_ALERT), "invalid alert" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_CCS_MESSAGE),
+ "invalid ccs message" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_CERTIFICATE_OR_ALG),
+ "invalid certificate or alg" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_COMMAND), "invalid command" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_COMPRESSION_ALGORITHM),
+ "invalid compression algorithm" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_CONFIG), "invalid config" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_CONFIGURATION_NAME),
+ "invalid configuration name" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_CONTEXT), "invalid context" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_CT_VALIDATION_TYPE),
+ "invalid ct validation type" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_KEY_UPDATE_TYPE),
+ "invalid key update type" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_MAX_EARLY_DATA),
+ "invalid max early data" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_NULL_CMD_NAME),
+ "invalid null cmd name" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_RAW_PUBLIC_KEY),
+ "invalid raw public key" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_RECORD), "invalid record" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_SEQUENCE_NUMBER),
+ "invalid sequence number" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_SERVERINFO_DATA),
+ "invalid serverinfo data" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_SESSION_ID), "invalid session id" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_SRP_USERNAME),
+ "invalid srp username" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_STATUS_RESPONSE),
+ "invalid status response" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_TICKET_KEYS_LENGTH),
+ "invalid ticket keys length" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_LEGACY_SIGALG_DISALLOWED_OR_UNSUPPORTED),
+ "legacy sigalg disallowed or unsupported" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_LENGTH_MISMATCH), "length mismatch" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_LENGTH_TOO_LONG), "length too long" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_LENGTH_TOO_SHORT), "length too short" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_LIBRARY_BUG), "library bug" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_LIBRARY_HAS_NO_CIPHERS),
+ "library has no ciphers" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_LISTENER_USE_ONLY), "listener use only" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MAXIMUM_ENCRYPTED_PKTS_REACHED),
+ "maximum encrypted pkts reached" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_DSA_SIGNING_CERT),
+ "missing dsa signing cert" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_ECDSA_SIGNING_CERT),
+ "missing ecdsa signing cert" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_FATAL), "missing fatal" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_PARAMETERS), "missing parameters" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_PSK_KEX_MODES_EXTENSION),
+ "missing psk kex modes extension" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_QUIC_TLS_FUNCTIONS),
+ "missing quic tls functions" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_RSA_CERTIFICATE),
+ "missing rsa certificate" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_RSA_ENCRYPTING_CERT),
+ "missing rsa encrypting cert" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_RSA_SIGNING_CERT),
+ "missing rsa signing cert" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_SIGALGS_EXTENSION),
+ "missing sigalgs extension" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_SIGNING_CERT),
+ "missing signing cert" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_SRP_PARAM),
+ "can't find SRP server param" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_SUPPORTED_GROUPS_EXTENSION),
+ "missing supported groups extension" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_SUPPORTED_VERSIONS_EXTENSION),
+ "missing supported versions extension" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_TMP_DH_KEY), "missing tmp dh key" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_TMP_ECDH_KEY),
+ "missing tmp ecdh key" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MIXED_HANDSHAKE_AND_NON_HANDSHAKE_DATA),
+ "mixed handshake and non handshake data" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NOT_ON_RECORD_BOUNDARY),
+ "not on record boundary" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NOT_REPLACING_CERTIFICATE),
+ "not replacing certificate" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NOT_SERVER), "not server" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_APPLICATION_PROTOCOL),
+ "no application protocol" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_CERTIFICATES_RETURNED),
+ "no certificates returned" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_CERTIFICATE_ASSIGNED),
+ "no certificate assigned" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_CERTIFICATE_SET), "no certificate set" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_CHANGE_FOLLOWING_HRR),
+ "no change following hrr" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_CIPHERS_AVAILABLE),
+ "no ciphers available" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_CIPHERS_SPECIFIED),
+ "no ciphers specified" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_CIPHER_MATCH), "no cipher match" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_CLIENT_CERT_METHOD),
+ "no client cert method" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_COMPRESSION_SPECIFIED),
+ "no compression specified" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_COOKIE_CALLBACK_SET),
+ "no cookie callback set" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_GOST_CERTIFICATE_SENT_BY_PEER),
+ "Peer haven't sent GOST certificate, required for selected ciphersuite" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_METHOD_SPECIFIED),
+ "no method specified" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_PEM_EXTENSIONS), "no pem extensions" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_PRIVATE_KEY_ASSIGNED),
+ "no private key assigned" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_PROTOCOLS_AVAILABLE),
+ "no protocols available" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_RENEGOTIATION), "no renegotiation" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_REQUIRED_DIGEST), "no required digest" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_SHARED_CIPHER), "no shared cipher" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_SHARED_GROUPS), "no shared groups" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_SHARED_SIGNATURE_ALGORITHMS),
+ "no shared signature algorithms" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_SRTP_PROFILES), "no srtp profiles" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_STREAM), "no stream" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_SUITABLE_DIGEST_ALGORITHM),
+ "no suitable digest algorithm" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_SUITABLE_GROUPS), "no suitable groups" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_SUITABLE_KEY_SHARE),
+ "no suitable key share" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_SUITABLE_RECORD_LAYER),
+ "no suitable record layer" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_SUITABLE_SIGNATURE_ALGORITHM),
+ "no suitable signature algorithm" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_VALID_SCTS), "no valid scts" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_VERIFY_COOKIE_CALLBACK),
+ "no verify cookie callback" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NULL_SSL_CTX), "null ssl ctx" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NULL_SSL_METHOD_PASSED),
+ "null ssl method passed" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_OCSP_CALLBACK_FAILURE),
+ "ocsp callback failure" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED),
+ "old session cipher not returned" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_OLD_SESSION_COMPRESSION_ALGORITHM_NOT_RETURNED),
+ "old session compression algorithm not returned" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_OVERFLOW_ERROR), "overflow error" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PACKET_LENGTH_TOO_LONG),
+ "packet length too long" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PARSE_TLSEXT), "parse tlsext" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PATH_TOO_LONG), "path too long" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE),
+ "peer did not return a certificate" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PEM_NAME_BAD_PREFIX),
+ "pem name bad prefix" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PEM_NAME_TOO_SHORT), "pem name too short" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PIPELINE_FAILURE), "pipeline failure" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_POLL_REQUEST_NOT_SUPPORTED),
+ "poll request not supported" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_POST_HANDSHAKE_AUTH_ENCODING_ERR),
+ "post handshake auth encoding err" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PRIVATE_KEY_MISMATCH),
+ "private key mismatch" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PROTOCOL_IS_SHUTDOWN),
+ "protocol is shutdown" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PSK_IDENTITY_NOT_FOUND),
+ "psk identity not found" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PSK_NO_CLIENT_CB), "psk no client cb" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PSK_NO_SERVER_CB), "psk no server cb" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_QUIC_HANDSHAKE_LAYER_ERROR),
+ "quic handshake layer error" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_QUIC_NETWORK_ERROR), "quic network error" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_QUIC_PROTOCOL_ERROR),
+ "quic protocol error" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_READ_BIO_NOT_SET), "read bio not set" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_READ_TIMEOUT_EXPIRED),
+ "read timeout expired" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_RECORDS_NOT_RELEASED),
+ "records not released" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_RECORD_LAYER_FAILURE),
+ "record layer failure" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_RECORD_LENGTH_MISMATCH),
+ "record length mismatch" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_RECORD_TOO_SMALL), "record too small" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_REMOTE_PEER_ADDRESS_NOT_SET),
+ "remote peer address not set" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_RENEGOTIATE_EXT_TOO_LONG),
+ "renegotiate ext too long" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_RENEGOTIATION_ENCODING_ERR),
+ "renegotiation encoding err" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_RENEGOTIATION_MISMATCH),
+ "renegotiation mismatch" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_REQUEST_PENDING), "request pending" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_REQUEST_SENT), "request sent" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_REQUIRED_CIPHER_MISSING),
+ "required cipher missing" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_REQUIRED_COMPRESSION_ALGORITHM_MISSING),
+ "required compression algorithm missing" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SCSV_RECEIVED_WHEN_RENEGOTIATING),
+ "scsv received when renegotiating" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SCT_VERIFICATION_FAILED),
+ "sct verification failed" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SEQUENCE_CTR_WRAPPED),
+ "sequence ctr wrapped" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SERVERHELLO_TLSEXT), "serverhello tlsext" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SESSION_ID_CONTEXT_UNINITIALIZED),
+ "session id context uninitialized" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SHUTDOWN_WHILE_IN_INIT),
+ "shutdown while in init" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SIGNATURE_ALGORITHMS_ERROR),
+ "signature algorithms error" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SIGNATURE_FOR_NON_SIGNING_CERTIFICATE),
+ "signature for non signing certificate" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SRP_A_CALC), "error with the srp params" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SRTP_COULD_NOT_ALLOCATE_PROFILES),
+ "srtp could not allocate profiles" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SRTP_PROTECTION_PROFILE_LIST_TOO_LONG),
+ "srtp protection profile list too long" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SRTP_UNKNOWN_PROTECTION_PROFILE),
+ "srtp unknown protection profile" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL3_EXT_INVALID_MAX_FRAGMENT_LENGTH),
+ "ssl3 ext invalid max fragment length" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL3_EXT_INVALID_SERVERNAME),
+ "ssl3 ext invalid servername" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL3_EXT_INVALID_SERVERNAME_TYPE),
+ "ssl3 ext invalid servername type" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL3_SESSION_ID_TOO_LONG),
+ "ssl3 session id too long" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSLV3_ALERT_BAD_CERTIFICATE),
+ "ssl/tls alert bad certificate" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSLV3_ALERT_BAD_RECORD_MAC),
+ "ssl/tls alert bad record mac" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSLV3_ALERT_CERTIFICATE_EXPIRED),
+ "ssl/tls alert certificate expired" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSLV3_ALERT_CERTIFICATE_REVOKED),
+ "ssl/tls alert certificate revoked" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSLV3_ALERT_CERTIFICATE_UNKNOWN),
+ "ssl/tls alert certificate unknown" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSLV3_ALERT_DECOMPRESSION_FAILURE),
+ "ssl/tls alert decompression failure" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSLV3_ALERT_HANDSHAKE_FAILURE),
+ "ssl/tls alert handshake failure" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSLV3_ALERT_ILLEGAL_PARAMETER),
+ "ssl/tls alert illegal parameter" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSLV3_ALERT_NO_CERTIFICATE),
+ "ssl/tls alert no certificate" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSLV3_ALERT_UNEXPECTED_MESSAGE),
+ "ssl/tls alert unexpected message" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSLV3_ALERT_UNSUPPORTED_CERTIFICATE),
+ "ssl/tls alert unsupported certificate" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_COMMAND_SECTION_EMPTY),
+ "ssl command section empty" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_COMMAND_SECTION_NOT_FOUND),
+ "ssl command section not found" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_CTX_HAS_NO_DEFAULT_SSL_VERSION),
+ "ssl ctx has no default ssl version" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_HANDSHAKE_FAILURE),
+ "ssl handshake failure" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_LIBRARY_HAS_NO_CIPHERS),
+ "ssl library has no ciphers" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_NEGATIVE_LENGTH),
+ "ssl negative length" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_SECTION_EMPTY), "ssl section empty" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_SECTION_NOT_FOUND),
+ "ssl section not found" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_SESSION_ID_CALLBACK_FAILED),
+ "ssl session id callback failed" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_SESSION_ID_CONFLICT),
+ "ssl session id conflict" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_SESSION_ID_CONTEXT_TOO_LONG),
+ "ssl session id context too long" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_SESSION_ID_HAS_BAD_LENGTH),
+ "ssl session id has bad length" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_SESSION_ID_TOO_LONG),
+ "ssl session id too long" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_SESSION_VERSION_MISMATCH),
+ "ssl session version mismatch" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_STILL_IN_INIT), "still in init" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_STREAM_COUNT_LIMITED),
+ "stream count limited" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_STREAM_FINISHED), "stream finished" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_STREAM_RECV_ONLY), "stream recv only" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_STREAM_RESET), "stream reset" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_STREAM_SEND_ONLY), "stream send only" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV13_ALERT_CERTIFICATE_REQUIRED),
+ "tlsv13 alert certificate required" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV13_ALERT_MISSING_EXTENSION),
+ "tlsv13 alert missing extension" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_ACCESS_DENIED),
+ "tlsv1 alert access denied" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_DECODE_ERROR),
+ "tlsv1 alert decode error" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_DECRYPTION_FAILED),
+ "tlsv1 alert decryption failed" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_DECRYPT_ERROR),
+ "tlsv1 alert decrypt error" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_EXPORT_RESTRICTION),
+ "tlsv1 alert export restriction" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_INAPPROPRIATE_FALLBACK),
+ "tlsv1 alert inappropriate fallback" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY),
+ "tlsv1 alert insufficient security" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_INTERNAL_ERROR),
+ "tlsv1 alert internal error" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_NO_APPLICATION_PROTOCOL),
+ "tlsv1 alert no application protocol" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_NO_RENEGOTIATION),
+ "tlsv1 alert no renegotiation" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_PROTOCOL_VERSION),
+ "tlsv1 alert protocol version" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_RECORD_OVERFLOW),
+ "tlsv1 alert record overflow" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_UNKNOWN_CA),
+ "tlsv1 alert unknown ca" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_UNKNOWN_PSK_IDENTITY),
+ "tlsv1 alert unknown psk identity" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_USER_CANCELLED),
+ "tlsv1 alert user cancelled" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_BAD_CERTIFICATE_HASH_VALUE),
+ "tlsv1 bad certificate hash value" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_BAD_CERTIFICATE_STATUS_RESPONSE),
+ "tlsv1 bad certificate status response" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_CERTIFICATE_UNOBTAINABLE),
+ "tlsv1 certificate unobtainable" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_UNRECOGNIZED_NAME),
+ "tlsv1 unrecognized name" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_UNSUPPORTED_EXTENSION),
+ "tlsv1 unsupported extension" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLS_ILLEGAL_EXPORTER_LABEL),
+ "tls illegal exporter label" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLS_INVALID_ECPOINTFORMAT_LIST),
+ "tls invalid ecpointformat list" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TOO_MANY_KEY_UPDATES),
+ "too many key updates" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TOO_MANY_WARN_ALERTS),
+ "too many warn alerts" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TOO_MUCH_EARLY_DATA),
+ "too much early data" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNABLE_TO_FIND_ECDH_PARAMETERS),
+ "unable to find ecdh parameters" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS),
+ "unable to find public key parameters" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNABLE_TO_LOAD_SSL3_MD5_ROUTINES),
+ "unable to load ssl3 md5 routines" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNABLE_TO_LOAD_SSL3_SHA1_ROUTINES),
+ "unable to load ssl3 sha1 routines" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNEXPECTED_CCS_MESSAGE),
+ "unexpected ccs message" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNEXPECTED_END_OF_EARLY_DATA),
+ "unexpected end of early data" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNEXPECTED_EOF_WHILE_READING),
+ "unexpected eof while reading" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNEXPECTED_MESSAGE), "unexpected message" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNEXPECTED_RECORD), "unexpected record" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNINITIALIZED), "uninitialized" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_ALERT_TYPE), "unknown alert type" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_CERTIFICATE_TYPE),
+ "unknown certificate type" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_CIPHER_RETURNED),
+ "unknown cipher returned" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_CIPHER_TYPE),
+ "unknown cipher type" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_CMD_NAME), "unknown cmd name" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_COMMAND), "unknown command" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_DIGEST), "unknown digest" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE),
+ "unknown key exchange type" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_MANDATORY_PARAMETER),
+ "unknown mandatory parameter" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_PKEY_TYPE), "unknown pkey type" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_PROTOCOL), "unknown protocol" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_SSL_VERSION),
+ "unknown ssl version" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_STATE), "unknown state" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED),
+ "unsafe legacy renegotiation disabled" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNSOLICITED_EXTENSION),
+ "unsolicited extension" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM),
+ "unsupported compression algorithm" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNSUPPORTED_CONFIG_VALUE),
+ "unsupported config value" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNSUPPORTED_CONFIG_VALUE_CLASS),
+ "unsupported config value class" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNSUPPORTED_CONFIG_VALUE_OP),
+ "unsupported config value op" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNSUPPORTED_ELLIPTIC_CURVE),
+ "unsupported elliptic curve" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNSUPPORTED_PROTOCOL),
+ "unsupported protocol" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNSUPPORTED_SSL_VERSION),
+ "unsupported ssl version" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNSUPPORTED_STATUS_TYPE),
+ "unsupported status type" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNSUPPORTED_WRITE_FLAG),
+ "unsupported write flag" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_USE_SRTP_NOT_NEGOTIATED),
+ "use srtp not negotiated" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_VERSION_TOO_HIGH), "version too high" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_VERSION_TOO_LOW), "version too low" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_WRONG_CERTIFICATE_TYPE),
+ "wrong certificate type" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_WRONG_CIPHER_RETURNED),
+ "wrong cipher returned" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_WRONG_CURVE), "wrong curve" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_WRONG_RPK_TYPE), "wrong rpk type" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_WRONG_SIGNATURE_LENGTH),
+ "wrong signature length" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_WRONG_SIGNATURE_SIZE),
+ "wrong signature size" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_WRONG_SIGNATURE_TYPE),
+ "wrong signature type" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_WRONG_SSL_VERSION), "wrong ssl version" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_WRONG_VERSION_NUMBER),
+ "wrong version number" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_X509_LIB), "x509 lib" },
+ { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_X509_VERIFICATION_SETUP_PROBLEMS),
+ "x509 verification setup problems" },
+ { 0, NULL }
};
#endif
diff --git a/crypto/sslerr.h b/crypto/sslerr.h
index 14644f429d..968f27b00a 100644
--- a/crypto/sslerr.h
+++ b/crypto/sslerr.h
@@ -9,19 +9,19 @@
*/
#ifndef OSSL_SSLERR_H
-# define OSSL_SSLERR_H
-# pragma once
+#define OSSL_SSLERR_H
+#pragma once
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
+#include <openssl/opensslconf.h>
+#include <openssl/symhacks.h>
-# ifdef __cplusplus
+#ifdef __cplusplus
extern "C" {
-# endif
+#endif
int ossl_err_load_SSL_strings(void);
-# ifdef __cplusplus
+#ifdef __cplusplus
}
-# endif
+#endif
#endif
diff --git a/crypto/stack/stack.c b/crypto/stack/stack.c
index bd85c82ede..d35348743b 100644
--- a/crypto/stack/stack.c
+++ b/crypto/stack/stack.c
@@ -13,7 +13,7 @@
#include "internal/safe_math.h"
#include <openssl/stack.h>
#include <errno.h>
-#include <openssl/e_os2.h> /* For ossl_inline */
+#include <openssl/e_os2.h> /* For ossl_inline */
OSSL_SAFE_MATH_SIGNED(int, int)
@@ -22,7 +22,8 @@ OSSL_SAFE_MATH_SIGNED(int, int)
*/
static const int min_nodes = 4;
static const int max_nodes = SIZE_MAX / sizeof(void *) < INT_MAX
- ? (int)(SIZE_MAX / sizeof(void *)) : INT_MAX;
+ ? (int)(SIZE_MAX / sizeof(void *))
+ : INT_MAX;
struct stack_st {
int num;
@@ -34,7 +35,7 @@ struct stack_st {
};
OPENSSL_sk_compfunc OPENSSL_sk_set_cmp_func(OPENSSL_STACK *sk,
- OPENSSL_sk_compfunc c)
+ OPENSSL_sk_compfunc c)
{
OPENSSL_sk_compfunc old = sk->comp;
@@ -46,8 +47,8 @@ OPENSSL_sk_compfunc OPENSSL_sk_set_cmp_func(OPENSSL_STACK *sk,
}
static OPENSSL_STACK *internal_copy(const OPENSSL_STACK *sk,
- OPENSSL_sk_copyfunc copy_func,
- OPENSSL_sk_freefunc free_func)
+ OPENSSL_sk_copyfunc copy_func,
+ OPENSSL_sk_freefunc free_func)
{
OPENSSL_STACK *ret;
int i;
@@ -85,17 +86,17 @@ static OPENSSL_STACK *internal_copy(const OPENSSL_STACK *sk,
}
}
- done:
+done:
return ret;
- err:
+err:
OPENSSL_sk_free(ret);
return NULL;
}
OPENSSL_STACK *OPENSSL_sk_deep_copy(const OPENSSL_STACK *sk,
- OPENSSL_sk_copyfunc copy_func,
- OPENSSL_sk_freefunc free_func)
+ OPENSSL_sk_copyfunc copy_func,
+ OPENSSL_sk_freefunc free_func)
{
return internal_copy(sk, copy_func, free_func);
}
@@ -261,7 +262,7 @@ int OPENSSL_sk_insert(OPENSSL_STACK *st, const void *data, int loc)
st->data[loc] = data;
} else {
memmove(&st->data[loc + 1], &st->data[loc],
- sizeof(st->data[0]) * (st->num - loc));
+ sizeof(st->data[0]) * (st->num - loc));
st->data[loc] = data;
}
st->num++;
@@ -285,7 +286,7 @@ static ossl_inline void *internal_delete(OPENSSL_STACK *st, int loc)
if (loc != st->num - 1)
memmove(&st->data[loc], &st->data[loc + 1],
- sizeof(st->data[0]) * (st->num - loc - 1));
+ sizeof(st->data[0]) * (st->num - loc - 1));
st->num--;
st->sorted = st->sorted || st->num <= 1;
@@ -314,7 +315,7 @@ void *OPENSSL_sk_delete(OPENSSL_STACK *st, int loc)
}
static int internal_find(const OPENSSL_STACK *st, const void *data,
- int ret_val_options, int *pnum_matched)
+ int ret_val_options, int *pnum_matched)
{
const void *r;
int i, count = 0;
@@ -359,7 +360,7 @@ static int internal_find(const OPENSSL_STACK *st, const void *data,
if (pnum_matched != NULL)
ret_val_options |= OSSL_BSEARCH_FIRST_VALUE_ON_MATCH;
r = ossl_bsearch(&data, st->data, st->num, sizeof(void *), st->comp,
- ret_val_options);
+ ret_val_options);
if (pnum_matched != NULL) {
*pnum = 0;
@@ -473,7 +474,7 @@ void *OPENSSL_sk_set(OPENSSL_STACK *st, int i, const void *data)
}
if (i < 0 || i >= st->num) {
ERR_raise_data(ERR_LIB_CRYPTO, ERR_R_PASSED_INVALID_ARGUMENT,
- "i=%d", i);
+ "i=%d", i);
return NULL;
}
st->data[i] = data;
diff --git a/crypto/store/store_err.c b/crypto/store/store_err.c
index ec62b358c5..ee35151cc3 100644
--- a/crypto/store/store_err.c
+++ b/crypto/store/store_err.c
@@ -15,52 +15,52 @@
#ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA OSSL_STORE_str_reasons[] = {
- {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_AMBIGUOUS_CONTENT_TYPE),
- "ambiguous content type"},
- {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_BAD_PASSWORD_READ),
- "bad password read"},
- {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_ERROR_VERIFYING_PKCS12_MAC),
- "error verifying pkcs12 mac"},
- {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_FINGERPRINT_SIZE_DOES_NOT_MATCH_DIGEST),
- "fingerprint size does not match digest"},
- {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_INVALID_SCHEME),
- "invalid scheme"},
- {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_IS_NOT_A), "is not a"},
- {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_LOADER_INCOMPLETE),
- "loader incomplete"},
- {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_LOADING_STARTED),
- "loading started"},
- {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_NOT_A_CERTIFICATE),
- "not a certificate"},
- {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_NOT_A_CRL), "not a crl"},
- {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_NOT_A_NAME), "not a name"},
- {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_NOT_A_PRIVATE_KEY),
- "not a private key"},
- {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_NOT_A_PUBLIC_KEY),
- "not a public key"},
- {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_NOT_PARAMETERS),
- "not parameters"},
- {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_NO_LOADERS_FOUND),
- "no loaders found"},
- {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_PASSPHRASE_CALLBACK_ERROR),
- "passphrase callback error"},
- {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_PATH_MUST_BE_ABSOLUTE),
- "path must be absolute"},
- {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_SEARCH_ONLY_SUPPORTED_FOR_DIRECTORIES),
- "search only supported for directories"},
- {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_UI_PROCESS_INTERRUPTED_OR_CANCELLED),
- "ui process interrupted or cancelled"},
- {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_UNREGISTERED_SCHEME),
- "unregistered scheme"},
- {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_UNSUPPORTED_CONTENT_TYPE),
- "unsupported content type"},
- {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_UNSUPPORTED_OPERATION),
- "unsupported operation"},
- {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_UNSUPPORTED_SEARCH_TYPE),
- "unsupported search type"},
- {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_URI_AUTHORITY_UNSUPPORTED),
- "uri authority unsupported"},
- {0, NULL}
+ { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_AMBIGUOUS_CONTENT_TYPE),
+ "ambiguous content type" },
+ { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_BAD_PASSWORD_READ),
+ "bad password read" },
+ { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_ERROR_VERIFYING_PKCS12_MAC),
+ "error verifying pkcs12 mac" },
+ { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_FINGERPRINT_SIZE_DOES_NOT_MATCH_DIGEST),
+ "fingerprint size does not match digest" },
+ { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_INVALID_SCHEME),
+ "invalid scheme" },
+ { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_IS_NOT_A), "is not a" },
+ { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_LOADER_INCOMPLETE),
+ "loader incomplete" },
+ { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_LOADING_STARTED),
+ "loading started" },
+ { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_NOT_A_CERTIFICATE),
+ "not a certificate" },
+ { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_NOT_A_CRL), "not a crl" },
+ { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_NOT_A_NAME), "not a name" },
+ { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_NOT_A_PRIVATE_KEY),
+ "not a private key" },
+ { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_NOT_A_PUBLIC_KEY),
+ "not a public key" },
+ { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_NOT_PARAMETERS),
+ "not parameters" },
+ { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_NO_LOADERS_FOUND),
+ "no loaders found" },
+ { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_PASSPHRASE_CALLBACK_ERROR),
+ "passphrase callback error" },
+ { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_PATH_MUST_BE_ABSOLUTE),
+ "path must be absolute" },
+ { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_SEARCH_ONLY_SUPPORTED_FOR_DIRECTORIES),
+ "search only supported for directories" },
+ { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_UI_PROCESS_INTERRUPTED_OR_CANCELLED),
+ "ui process interrupted or cancelled" },
+ { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_UNREGISTERED_SCHEME),
+ "unregistered scheme" },
+ { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_UNSUPPORTED_CONTENT_TYPE),
+ "unsupported content type" },
+ { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_UNSUPPORTED_OPERATION),
+ "unsupported operation" },
+ { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_UNSUPPORTED_SEARCH_TYPE),
+ "unsupported search type" },
+ { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_URI_AUTHORITY_UNSUPPORTED),
+ "uri authority unsupported" },
+ { 0, NULL }
};
#endif
diff --git a/crypto/store/store_lib.c b/crypto/store/store_lib.c
index 386a33ce9c..7c11154138 100644
--- a/crypto/store/store_lib.c
+++ b/crypto/store/store_lib.c
@@ -33,38 +33,39 @@
static int ossl_store_close_it(OSSL_STORE_CTX *ctx);
static int loader_set_params(OSSL_STORE_LOADER *loader,
- OSSL_STORE_LOADER_CTX *loader_ctx,
- const OSSL_PARAM params[], const char *propq)
+ OSSL_STORE_LOADER_CTX *loader_ctx,
+ const OSSL_PARAM params[], const char *propq)
{
- if (params != NULL) {
- if (!loader->p_set_ctx_params(loader_ctx, params))
- return 0;
- }
+ if (params != NULL) {
+ if (!loader->p_set_ctx_params(loader_ctx, params))
+ return 0;
+ }
- if (propq != NULL) {
- OSSL_PARAM propp[2];
+ if (propq != NULL) {
+ OSSL_PARAM propp[2];
- if (OSSL_PARAM_locate_const(params,
- OSSL_STORE_PARAM_PROPERTIES) != NULL)
- /* use the propq from params */
- return 1;
+ if (OSSL_PARAM_locate_const(params,
+ OSSL_STORE_PARAM_PROPERTIES)
+ != NULL)
+ /* use the propq from params */
+ return 1;
- propp[0] = OSSL_PARAM_construct_utf8_string(OSSL_STORE_PARAM_PROPERTIES,
- (char *)propq, 0);
- propp[1] = OSSL_PARAM_construct_end();
+ propp[0] = OSSL_PARAM_construct_utf8_string(OSSL_STORE_PARAM_PROPERTIES,
+ (char *)propq, 0);
+ propp[1] = OSSL_PARAM_construct_end();
- if (!loader->p_set_ctx_params(loader_ctx, propp))
- return 0;
+ if (!loader->p_set_ctx_params(loader_ctx, propp))
+ return 0;
}
return 1;
}
OSSL_STORE_CTX *
OSSL_STORE_open_ex(const char *uri, OSSL_LIB_CTX *libctx, const char *propq,
- const UI_METHOD *ui_method, void *ui_data,
- const OSSL_PARAM params[],
- OSSL_STORE_post_process_info_fn post_process,
- void *post_process_data)
+ const UI_METHOD *ui_method, void *ui_data,
+ const OSSL_PARAM params[],
+ OSSL_STORE_post_process_info_fn post_process,
+ void *post_process_data)
{
struct ossl_passphrase_data_st pwdata = { 0 };
const OSSL_STORE_LOADER *loader = NULL;
@@ -101,7 +102,7 @@ OSSL_STORE_open_ex(const char *uri, OSSL_LIB_CTX *libctx, const char *propq,
*p++ = '\0';
if (OPENSSL_strcasecmp(scheme_copy, "file") != 0) {
if (HAS_PREFIX(p, "//"))
- schemes_n--; /* Invalidate the file scheme */
+ schemes_n--; /* Invalidate the file scheme */
schemes[schemes_n++] = scheme_copy;
}
}
@@ -133,7 +134,7 @@ OSSL_STORE_open_ex(const char *uri, OSSL_LIB_CTX *libctx, const char *propq,
no_loader_found = 0;
if (loader->open_ex != NULL)
loader_ctx = loader->open_ex(loader, uri, libctx, propq,
- ui_method, ui_data);
+ ui_method, ui_data);
else
loader_ctx = loader->open(loader, uri, ui_method, ui_data);
} else {
@@ -141,23 +142,17 @@ OSSL_STORE_open_ex(const char *uri, OSSL_LIB_CTX *libctx, const char *propq,
}
#endif
if (loader == NULL
- && (fetched_loader =
- OSSL_STORE_LOADER_fetch(libctx, scheme, propq)) != NULL) {
- const OSSL_PROVIDER *provider =
- OSSL_STORE_LOADER_get0_provider(fetched_loader);
+ && (fetched_loader = OSSL_STORE_LOADER_fetch(libctx, scheme, propq)) != NULL) {
+ const OSSL_PROVIDER *provider = OSSL_STORE_LOADER_get0_provider(fetched_loader);
void *provctx = OSSL_PROVIDER_get0_provider_ctx(provider);
no_loader_found = 0;
if (fetched_loader->p_open_ex != NULL) {
- loader_ctx =
- fetched_loader->p_open_ex(provctx, uri, params,
- ossl_pw_passphrase_callback_dec,
- &pwdata);
+ loader_ctx = fetched_loader->p_open_ex(provctx, uri, params,
+ ossl_pw_passphrase_callback_dec,
+ &pwdata);
} else {
- if (fetched_loader->p_open != NULL &&
- (loader_ctx = fetched_loader->p_open(provctx, uri)) != NULL &&
- !loader_set_params(fetched_loader, loader_ctx,
- params, propq)) {
+ if (fetched_loader->p_open != NULL && (loader_ctx = fetched_loader->p_open(provctx, uri)) != NULL && !loader_set_params(fetched_loader, loader_ctx, params, propq)) {
(void)fetched_loader->p_close(loader_ctx);
loader_ctx = NULL;
}
@@ -212,14 +207,16 @@ OSSL_STORE_open_ex(const char *uri, OSSL_LIB_CTX *libctx, const char *propq,
return ctx;
- err:
+err:
ERR_clear_last_mark();
if (loader_ctx != NULL) {
/*
* Temporary structure so OSSL_STORE_close() can work even when
* |ctx| couldn't be allocated properly
*/
- OSSL_STORE_CTX tmpctx = { NULL, };
+ OSSL_STORE_CTX tmpctx = {
+ NULL,
+ };
tmpctx.fetched_loader = fetched_loader;
tmpctx.loader = loader;
@@ -241,12 +238,12 @@ OSSL_STORE_open_ex(const char *uri, OSSL_LIB_CTX *libctx, const char *propq,
}
OSSL_STORE_CTX *OSSL_STORE_open(const char *uri,
- const UI_METHOD *ui_method, void *ui_data,
- OSSL_STORE_post_process_info_fn post_process,
- void *post_process_data)
+ const UI_METHOD *ui_method, void *ui_data,
+ OSSL_STORE_post_process_info_fn post_process,
+ void *post_process_data)
{
return OSSL_STORE_open_ex(uri, NULL, NULL, ui_method, ui_data, NULL,
- post_process, post_process_data);
+ post_process, post_process_data);
}
#ifndef OPENSSL_NO_DEPRECATED_3_0
@@ -269,19 +266,17 @@ int OSSL_STORE_vctrl(OSSL_STORE_CTX *ctx, int cmd, va_list args)
OSSL_PARAM params[2] = { OSSL_PARAM_END, OSSL_PARAM_END };
switch (cmd) {
- case OSSL_STORE_C_USE_SECMEM:
- {
- int on = *(va_arg(args, int *));
+ case OSSL_STORE_C_USE_SECMEM: {
+ int on = *(va_arg(args, int *));
- params[0] = OSSL_PARAM_construct_int("use_secmem", &on);
- }
- break;
+ params[0] = OSSL_PARAM_construct_int("use_secmem", &on);
+ } break;
default:
break;
}
return ctx->fetched_loader->p_set_ctx_params(ctx->loader_ctx,
- params);
+ params);
}
} else if (ctx->loader->ctrl != NULL) {
return ctx->loader->ctrl(ctx->loader_ctx, cmd, args);
@@ -300,7 +295,7 @@ int OSSL_STORE_expect(OSSL_STORE_CTX *ctx, int expected_type)
int ret = 1;
if (ctx == NULL
- || expected_type < 0 || expected_type > OSSL_STORE_INFO_CRL) {
+ || expected_type < 0 || expected_type > OSSL_STORE_INFO_CRL) {
ERR_raise(ERR_LIB_OSSL_STORE, ERR_R_PASSED_INVALID_ARGUMENT);
return 0;
}
@@ -314,8 +309,7 @@ int OSSL_STORE_expect(OSSL_STORE_CTX *ctx, int expected_type)
&& ctx->fetched_loader->p_set_ctx_params != NULL) {
OSSL_PARAM params[2] = { OSSL_PARAM_END, OSSL_PARAM_END };
- params[0] =
- OSSL_PARAM_construct_int(OSSL_STORE_PARAM_EXPECT, &expected_type);
+ params[0] = OSSL_PARAM_construct_int(OSSL_STORE_PARAM_EXPECT, &expected_type);
ret = ctx->fetched_loader->p_set_ctx_params(ctx->loader_ctx, params);
}
#ifndef OPENSSL_NO_DEPRECATED_3_0
@@ -359,49 +353,51 @@ int OSSL_STORE_find(OSSL_STORE_CTX *ctx, const OSSL_STORE_SEARCH *search)
return 0;
}
- ret = 0; /* Assume the worst */
+ ret = 0; /* Assume the worst */
switch (search->search_type) {
case OSSL_STORE_SEARCH_BY_NAME:
if ((name_der_sz = i2d_X509_NAME(search->name,
- (unsigned char **)&name_der)) > 0
+ (unsigned char **)&name_der))
+ > 0
&& OSSL_PARAM_BLD_push_octet_string(bld,
- OSSL_STORE_PARAM_SUBJECT,
- name_der, name_der_sz))
+ OSSL_STORE_PARAM_SUBJECT,
+ name_der, name_der_sz))
ret = 1;
break;
case OSSL_STORE_SEARCH_BY_ISSUER_SERIAL:
if ((name_der_sz = i2d_X509_NAME(search->name,
- (unsigned char **)&name_der)) > 0
+ (unsigned char **)&name_der))
+ > 0
&& (number = ASN1_INTEGER_to_BN(search->serial, NULL)) != NULL
&& OSSL_PARAM_BLD_push_octet_string(bld,
- OSSL_STORE_PARAM_ISSUER,
- name_der, name_der_sz)
+ OSSL_STORE_PARAM_ISSUER,
+ name_der, name_der_sz)
&& OSSL_PARAM_BLD_push_BN(bld, OSSL_STORE_PARAM_SERIAL,
- number))
+ number))
ret = 1;
break;
case OSSL_STORE_SEARCH_BY_KEY_FINGERPRINT:
if (OSSL_PARAM_BLD_push_utf8_string(bld, OSSL_STORE_PARAM_DIGEST,
- EVP_MD_get0_name(search->digest),
- 0)
+ EVP_MD_get0_name(search->digest),
+ 0)
&& OSSL_PARAM_BLD_push_octet_string(bld,
- OSSL_STORE_PARAM_FINGERPRINT,
- search->string,
- search->stringlength))
+ OSSL_STORE_PARAM_FINGERPRINT,
+ search->string,
+ search->stringlength))
ret = 1;
break;
case OSSL_STORE_SEARCH_BY_ALIAS:
if (OSSL_PARAM_BLD_push_utf8_string(bld, OSSL_STORE_PARAM_ALIAS,
- (char *)search->string,
- search->stringlength))
+ (char *)search->string,
+ search->stringlength))
ret = 1;
break;
}
if (ret) {
params = OSSL_PARAM_BLD_to_param(bld);
ret = ctx->fetched_loader->p_set_ctx_params(ctx->loader_ctx,
- params);
+ params);
OSSL_PARAM_free(params);
}
OSSL_PARAM_BLD_free(bld);
@@ -426,7 +422,7 @@ OSSL_STORE_INFO *OSSL_STORE_load(OSSL_STORE_CTX *ctx)
OSSL_STORE_INFO *v = NULL;
ctx->loading = 1;
- again:
+again:
if (OSSL_STORE_eof(ctx))
return NULL;
@@ -444,10 +440,10 @@ OSSL_STORE_INFO *OSSL_STORE_load(OSSL_STORE_CTX *ctx)
ctx->error_flag = 0;
if (!ctx->fetched_loader->p_load(ctx->loader_ctx,
- ossl_store_handle_load_result,
- &load_data,
- ossl_pw_passphrase_callback_dec,
- &ctx->pwdata)) {
+ ossl_store_handle_load_result,
+ &load_data,
+ ossl_pw_passphrase_callback_dec,
+ &ctx->pwdata)) {
ctx->error_flag = 1;
return NULL;
}
@@ -456,8 +452,8 @@ OSSL_STORE_INFO *OSSL_STORE_load(OSSL_STORE_CTX *ctx)
#ifndef OPENSSL_NO_DEPRECATED_3_0
if (ctx->fetched_loader == NULL)
v = ctx->loader->load(ctx->loader_ctx,
- ctx->pwdata._.ui_method.ui_method,
- ctx->pwdata._.ui_method.ui_method_data);
+ ctx->pwdata._.ui_method.ui_method,
+ ctx->pwdata._.ui_method.ui_method_data);
#endif
}
@@ -488,19 +484,19 @@ OSSL_STORE_INFO *OSSL_STORE_load(OSSL_STORE_CTX *ctx)
if (v != NULL)
OSSL_TRACE1(STORE, "Got a %s\n",
- OSSL_STORE_INFO_type_string(OSSL_STORE_INFO_get_type(v)));
+ OSSL_STORE_INFO_type_string(OSSL_STORE_INFO_get_type(v)));
return v;
}
int OSSL_STORE_delete(const char *uri, OSSL_LIB_CTX *libctx, const char *propq,
- const UI_METHOD *ui_method, void *ui_data,
- const OSSL_PARAM params[])
+ const UI_METHOD *ui_method, void *ui_data,
+ const OSSL_PARAM params[])
{
OSSL_STORE_LOADER *fetched_loader = NULL;
char scheme[256], *p;
int res = 0;
- struct ossl_passphrase_data_st pwdata = {0};
+ struct ossl_passphrase_data_st pwdata = { 0 };
OPENSSL_strlcpy(scheme, uri, sizeof(scheme));
if ((p = strchr(scheme, ':')) != NULL)
@@ -519,8 +515,7 @@ int OSSL_STORE_delete(const char *uri, OSSL_LIB_CTX *libctx, const char *propq,
fetched_loader = OSSL_STORE_LOADER_fetch(libctx, scheme, propq);
if (fetched_loader != NULL && fetched_loader->p_delete != NULL) {
- const OSSL_PROVIDER *provider =
- OSSL_STORE_LOADER_get0_provider(fetched_loader);
+ const OSSL_PROVIDER *provider = OSSL_STORE_LOADER_get0_provider(fetched_loader);
void *provctx = OSSL_PROVIDER_get0_provider_ctx(provider);
/*
@@ -529,8 +524,8 @@ int OSSL_STORE_delete(const char *uri, OSSL_LIB_CTX *libctx, const char *propq,
*/
OSSL_TRACE1(STORE, "Performing URI delete %s\n", uri);
res = fetched_loader->p_delete(provctx, uri, params,
- ossl_pw_passphrase_callback_dec,
- &pwdata);
+ ossl_pw_passphrase_callback_dec,
+ &pwdata);
}
/* Clear any internally cached passphrase */
(void)ossl_pw_clear_passphrase_cache(&pwdata);
@@ -866,8 +861,7 @@ int OSSL_STORE_supports_search(OSSL_STORE_CTX *ctx, int search_type)
int ret = 0;
if (ctx->fetched_loader != NULL) {
- void *provctx =
- ossl_provider_ctx(OSSL_STORE_LOADER_get0_provider(ctx->fetched_loader));
+ void *provctx = ossl_provider_ctx(OSSL_STORE_LOADER_get0_provider(ctx->fetched_loader));
const OSSL_PARAM *params;
const OSSL_PARAM *p_subject = NULL;
const OSSL_PARAM *p_issuer = NULL;
@@ -882,8 +876,7 @@ int OSSL_STORE_supports_search(OSSL_STORE_CTX *ctx, int search_type)
p_subject = OSSL_PARAM_locate_const(params, OSSL_STORE_PARAM_SUBJECT);
p_issuer = OSSL_PARAM_locate_const(params, OSSL_STORE_PARAM_ISSUER);
p_serial = OSSL_PARAM_locate_const(params, OSSL_STORE_PARAM_SERIAL);
- p_fingerprint =
- OSSL_PARAM_locate_const(params, OSSL_STORE_PARAM_FINGERPRINT);
+ p_fingerprint = OSSL_PARAM_locate_const(params, OSSL_STORE_PARAM_FINGERPRINT);
p_alias = OSSL_PARAM_locate_const(params, OSSL_STORE_PARAM_ALIAS);
switch (search_type) {
@@ -928,7 +921,7 @@ OSSL_STORE_SEARCH *OSSL_STORE_SEARCH_by_name(X509_NAME *name)
}
OSSL_STORE_SEARCH *OSSL_STORE_SEARCH_by_issuer_serial(X509_NAME *name,
- const ASN1_INTEGER *serial)
+ const ASN1_INTEGER *serial)
{
OSSL_STORE_SEARCH *search = OPENSSL_zalloc(sizeof(*search));
@@ -942,8 +935,9 @@ OSSL_STORE_SEARCH *OSSL_STORE_SEARCH_by_issuer_serial(X509_NAME *name,
}
OSSL_STORE_SEARCH *OSSL_STORE_SEARCH_by_key_fingerprint(const EVP_MD *digest,
- const unsigned char
- *bytes, size_t len)
+ const unsigned char
+ *bytes,
+ size_t len)
{
OSSL_STORE_SEARCH *search = OPENSSL_zalloc(sizeof(*search));
int md_size;
@@ -959,9 +953,9 @@ OSSL_STORE_SEARCH *OSSL_STORE_SEARCH_by_key_fingerprint(const EVP_MD *digest,
if (digest != NULL && len != (size_t)md_size) {
ERR_raise_data(ERR_LIB_OSSL_STORE,
- OSSL_STORE_R_FINGERPRINT_SIZE_DOES_NOT_MATCH_DIGEST,
- "%s size is %d, fingerprint size is %zu",
- EVP_MD_get0_name(digest), md_size, len);
+ OSSL_STORE_R_FINGERPRINT_SIZE_DOES_NOT_MATCH_DIGEST,
+ "%s size is %d, fingerprint size is %zu",
+ EVP_MD_get0_name(digest), md_size, len);
OPENSSL_free(search);
return NULL;
}
@@ -1004,13 +998,14 @@ X509_NAME *OSSL_STORE_SEARCH_get0_name(const OSSL_STORE_SEARCH *criterion)
}
const ASN1_INTEGER *OSSL_STORE_SEARCH_get0_serial(const OSSL_STORE_SEARCH
- *criterion)
+ *criterion)
{
return criterion->serial;
}
const unsigned char *OSSL_STORE_SEARCH_get0_bytes(const OSSL_STORE_SEARCH
- *criterion, size_t *length)
+ *criterion,
+ size_t *length)
{
*length = criterion->stringlength;
return criterion->string;
@@ -1027,11 +1022,11 @@ const EVP_MD *OSSL_STORE_SEARCH_get0_digest(const OSSL_STORE_SEARCH *criterion)
}
OSSL_STORE_CTX *OSSL_STORE_attach(BIO *bp, const char *scheme,
- OSSL_LIB_CTX *libctx, const char *propq,
- const UI_METHOD *ui_method, void *ui_data,
- const OSSL_PARAM params[],
- OSSL_STORE_post_process_info_fn post_process,
- void *post_process_data)
+ OSSL_LIB_CTX *libctx, const char *propq,
+ const UI_METHOD *ui_method, void *ui_data,
+ const OSSL_PARAM params[],
+ OSSL_STORE_post_process_info_fn post_process,
+ void *post_process_data)
{
const OSSL_STORE_LOADER *loader = NULL;
OSSL_STORE_LOADER *fetched_loader = NULL;
@@ -1046,13 +1041,11 @@ OSSL_STORE_CTX *OSSL_STORE_attach(BIO *bp, const char *scheme,
#ifndef OPENSSL_NO_DEPRECATED_3_0
if ((loader = ossl_store_get0_loader_int(scheme)) != NULL)
loader_ctx = loader->attach(loader, bp, libctx, propq,
- ui_method, ui_data);
+ ui_method, ui_data);
#endif
if (loader == NULL
- && (fetched_loader =
- OSSL_STORE_LOADER_fetch(libctx, scheme, propq)) != NULL) {
- const OSSL_PROVIDER *provider =
- OSSL_STORE_LOADER_get0_provider(fetched_loader);
+ && (fetched_loader = OSSL_STORE_LOADER_fetch(libctx, scheme, propq)) != NULL) {
+ const OSSL_PROVIDER *provider = OSSL_STORE_LOADER_get0_provider(fetched_loader);
void *provctx = OSSL_PROVIDER_get0_provider_ctx(provider);
OSSL_CORE_BIO *cbio = ossl_core_bio_new_from_bio(bp);
@@ -1062,7 +1055,7 @@ OSSL_STORE_CTX *OSSL_STORE_attach(BIO *bp, const char *scheme,
OSSL_STORE_LOADER_free(fetched_loader);
fetched_loader = NULL;
} else if (!loader_set_params(fetched_loader, loader_ctx,
- params, propq)) {
+ params, propq)) {
(void)fetched_loader->p_close(loader_ctx);
OSSL_STORE_LOADER_free(fetched_loader);
fetched_loader = NULL;
diff --git a/crypto/store/store_local.h b/crypto/store/store_local.h
index eff232332f..a7ae850d1b 100644
--- a/crypto/store/store_local.h
+++ b/crypto/store/store_local.h
@@ -25,18 +25,18 @@
struct ossl_store_info_st {
int type;
union {
- void *data; /* used internally as generic pointer */
+ void *data; /* used internally as generic pointer */
struct {
char *name;
char *desc;
- } name; /* when type == OSSL_STORE_INFO_NAME */
+ } name; /* when type == OSSL_STORE_INFO_NAME */
- EVP_PKEY *params; /* when type == OSSL_STORE_INFO_PARAMS */
- EVP_PKEY *pubkey; /* when type == OSSL_STORE_INFO_PUBKEY */
- EVP_PKEY *pkey; /* when type == OSSL_STORE_INFO_PKEY */
- X509 *x509; /* when type == OSSL_STORE_INFO_CERT */
- X509_CRL *crl; /* when type == OSSL_STORE_INFO_CRL */
+ EVP_PKEY *params; /* when type == OSSL_STORE_INFO_PARAMS */
+ EVP_PKEY *pubkey; /* when type == OSSL_STORE_INFO_PUBKEY */
+ EVP_PKEY *pkey; /* when type == OSSL_STORE_INFO_PKEY */
+ X509 *x509; /* when type == OSSL_STORE_INFO_CERT */
+ X509_CRL *crl; /* when type == OSSL_STORE_INFO_CRL */
} _;
};
DEFINE_STACK_OF(OSSL_STORE_INFO)
@@ -165,12 +165,12 @@ int ossl_store_file_detach_pem_bio_int(OSSL_STORE_LOADER_CTX *ctx);
* -------------------
*/
OSSL_STORE_LOADER *ossl_store_loader_fetch(OSSL_LIB_CTX *libctx,
- const char *scheme,
- const char *properties);
+ const char *scheme,
+ const char *properties);
/* Standard function to handle the result from OSSL_FUNC_store_load() */
struct ossl_load_result_data_st {
- OSSL_STORE_INFO *v; /* To be filled in */
+ OSSL_STORE_INFO *v; /* To be filled in */
OSSL_STORE_CTX *ctx;
};
OSSL_CALLBACK ossl_store_handle_load_result;
diff --git a/crypto/store/store_meth.c b/crypto/store/store_meth.c
index 675a5d51e0..3b60247f41 100644
--- a/crypto/store/store_meth.c
+++ b/crypto/store/store_meth.c
@@ -74,9 +74,9 @@ static void free_loader(void *method)
/* Data to be passed through ossl_method_construct() */
struct loader_data_st {
OSSL_LIB_CTX *libctx;
- int scheme_id; /* For get_loader_from_store() */
- const char *scheme; /* For get_loader_from_store() */
- const char *propquery; /* For get_loader_from_store() */
+ int scheme_id; /* For get_loader_from_store() */
+ const char *scheme; /* For get_loader_from_store() */
+ const char *propquery; /* For get_loader_from_store() */
OSSL_METHOD_STORE *tmp_store; /* For get_tmp_loader_store() */
@@ -98,7 +98,7 @@ static void *get_tmp_loader_store(void *data)
return methdata->tmp_store;
}
- static void dealloc_tmp_loader_store(void *store)
+static void dealloc_tmp_loader_store(void *store)
{
if (store != NULL)
ossl_method_store_free(store);
@@ -134,7 +134,7 @@ static int unreserve_loader_store(void *store, void *data)
/* Get loader methods from a store, or put one in */
static void *get_loader_from_store(void *store, const OSSL_PROVIDER **prov,
- void *data)
+ void *data)
{
struct loader_data_st *methdata = data;
void *method = NULL;
@@ -156,9 +156,9 @@ static void *get_loader_from_store(void *store, const OSSL_PROVIDER **prov,
}
static int put_loader_in_store(void *store, void *method,
- const OSSL_PROVIDER *prov,
- const char *scheme, const char *propdef,
- void *data)
+ const OSSL_PROVIDER *prov,
+ const char *scheme, const char *propdef,
+ void *data)
{
struct loader_data_st *methdata = data;
OSSL_NAMEMAP *namemap;
@@ -172,11 +172,11 @@ static int put_loader_in_store(void *store, void *method,
return 0;
return ossl_method_store_add(store, prov, id, propdef, method,
- up_ref_loader, free_loader);
+ up_ref_loader, free_loader);
}
static void *loader_from_algorithm(int scheme_id, const OSSL_ALGORITHM *algodef,
- OSSL_PROVIDER *prov)
+ OSSL_PROVIDER *prov)
{
OSSL_STORE_LOADER *loader = NULL;
const OSSL_DISPATCH *fns = algodef->implementation;
@@ -199,8 +199,7 @@ static void *loader_from_algorithm(int scheme_id, const OSSL_ALGORITHM *algodef,
break;
case OSSL_FUNC_STORE_SETTABLE_CTX_PARAMS:
if (loader->p_settable_ctx_params == NULL)
- loader->p_settable_ctx_params =
- OSSL_FUNC_store_settable_ctx_params(fns);
+ loader->p_settable_ctx_params = OSSL_FUNC_store_settable_ctx_params(fns);
break;
case OSSL_FUNC_STORE_SET_CTX_PARAMS:
if (loader->p_set_ctx_params == NULL)
@@ -251,7 +250,7 @@ static void *loader_from_algorithm(int scheme_id, const OSSL_ALGORITHM *algodef,
* then call loader_from_algorithm() with that identity number.
*/
static void *construct_loader(const OSSL_ALGORITHM *algodef,
- OSSL_PROVIDER *prov, void *data)
+ OSSL_PROVIDER *prov, void *data)
{
/*
* This function is only called if get_loader_from_store() returned
@@ -289,7 +288,7 @@ static void destruct_loader(void *method, void *data)
/* Fetching support. Can fetch by numeric identity or by scheme */
static OSSL_STORE_LOADER *
inner_loader_fetch(struct loader_data_st *methdata,
- const char *scheme, const char *properties)
+ const char *scheme, const char *properties)
{
OSSL_METHOD_STORE *store = get_loader_store(methdata->libctx);
OSSL_NAMEMAP *namemap = ossl_namemap_stored(methdata->libctx);
@@ -329,8 +328,9 @@ inner_loader_fetch(struct loader_data_st *methdata,
methdata->propquery = propq;
methdata->flag_construct_error_occurred = 0;
if ((method = ossl_method_construct(methdata->libctx, OSSL_OP_STORE,
- &prov, 0 /* !force_cache */,
- &mcm, methdata)) != NULL) {
+ &prov, 0 /* !force_cache */,
+ &mcm, methdata))
+ != NULL) {
/*
* If construction did create a method for us, we know that there
* is a correct scheme_id, since those have already been calculated
@@ -339,7 +339,7 @@ inner_loader_fetch(struct loader_data_st *methdata,
if (id == 0)
id = ossl_namemap_name2num(namemap, scheme);
ossl_method_store_cache_set(store, prov, id, propq, method,
- up_ref_loader, free_loader);
+ up_ref_loader, free_loader);
}
/*
@@ -351,29 +351,28 @@ inner_loader_fetch(struct loader_data_st *methdata,
if ((id != 0 || scheme != NULL) && method == NULL) {
int code = unsupported ? ERR_R_UNSUPPORTED : ERR_R_FETCH_FAILED;
- const char *helpful_msg =
- unsupported
- ? ( "No store loader found. For standard store loaders you need "
- "at least one of the default or base providers available. "
- "Did you forget to load them? Info: " )
+ const char *helpful_msg = unsupported
+ ? ("No store loader found. For standard store loaders you need "
+ "at least one of the default or base providers available. "
+ "Did you forget to load them? Info: ")
: "";
if (scheme == NULL)
scheme = ossl_namemap_num2name(namemap, id, 0);
ERR_raise_data(ERR_LIB_OSSL_STORE, code,
- "%s%s, Scheme (%s : %d), Properties (%s)",
- helpful_msg,
- ossl_lib_ctx_get_descriptor(methdata->libctx),
- scheme == NULL ? "<null>" : scheme, id,
- properties == NULL ? "<null>" : properties);
+ "%s%s, Scheme (%s : %d), Properties (%s)",
+ helpful_msg,
+ ossl_lib_ctx_get_descriptor(methdata->libctx),
+ scheme == NULL ? "<null>" : scheme, id,
+ properties == NULL ? "<null>" : properties);
}
return method;
}
OSSL_STORE_LOADER *OSSL_STORE_LOADER_fetch(OSSL_LIB_CTX *libctx,
- const char *scheme,
- const char *properties)
+ const char *scheme,
+ const char *properties)
{
struct loader_data_st methdata;
void *method;
@@ -467,9 +466,9 @@ static void do_one(ossl_unused int id, void *method, void *arg)
}
void OSSL_STORE_LOADER_do_all_provided(OSSL_LIB_CTX *libctx,
- void (*user_fn)(OSSL_STORE_LOADER *loader,
- void *arg),
- void *user_arg)
+ void (*user_fn)(OSSL_STORE_LOADER *loader,
+ void *arg),
+ void *user_arg)
{
struct loader_data_st methdata;
struct do_one_data_st data;
@@ -487,8 +486,8 @@ void OSSL_STORE_LOADER_do_all_provided(OSSL_LIB_CTX *libctx,
}
int OSSL_STORE_LOADER_names_do_all(const OSSL_STORE_LOADER *loader,
- void (*fn)(const char *name, void *data),
- void *data)
+ void (*fn)(const char *name, void *data),
+ void *data)
{
if (loader == NULL)
return 0;
diff --git a/crypto/store/store_register.c b/crypto/store/store_register.c
index a72dc20b4c..c9d789e27b 100644
--- a/crypto/store/store_register.c
+++ b/crypto/store/store_register.c
@@ -59,71 +59,70 @@ const char *OSSL_STORE_LOADER_get0_scheme(const OSSL_STORE_LOADER *loader)
}
int OSSL_STORE_LOADER_set_open(OSSL_STORE_LOADER *loader,
- OSSL_STORE_open_fn open_function)
+ OSSL_STORE_open_fn open_function)
{
loader->open = open_function;
return 1;
}
-int OSSL_STORE_LOADER_set_open_ex
- (OSSL_STORE_LOADER *loader,
- OSSL_STORE_open_ex_fn open_ex_function)
+int OSSL_STORE_LOADER_set_open_ex(OSSL_STORE_LOADER *loader,
+ OSSL_STORE_open_ex_fn open_ex_function)
{
loader->open_ex = open_ex_function;
return 1;
}
int OSSL_STORE_LOADER_set_attach(OSSL_STORE_LOADER *loader,
- OSSL_STORE_attach_fn attach_function)
+ OSSL_STORE_attach_fn attach_function)
{
loader->attach = attach_function;
return 1;
}
int OSSL_STORE_LOADER_set_ctrl(OSSL_STORE_LOADER *loader,
- OSSL_STORE_ctrl_fn ctrl_function)
+ OSSL_STORE_ctrl_fn ctrl_function)
{
loader->ctrl = ctrl_function;
return 1;
}
int OSSL_STORE_LOADER_set_expect(OSSL_STORE_LOADER *loader,
- OSSL_STORE_expect_fn expect_function)
+ OSSL_STORE_expect_fn expect_function)
{
loader->expect = expect_function;
return 1;
}
int OSSL_STORE_LOADER_set_find(OSSL_STORE_LOADER *loader,
- OSSL_STORE_find_fn find_function)
+ OSSL_STORE_find_fn find_function)
{
loader->find = find_function;
return 1;
}
int OSSL_STORE_LOADER_set_load(OSSL_STORE_LOADER *loader,
- OSSL_STORE_load_fn load_function)
+ OSSL_STORE_load_fn load_function)
{
loader->load = load_function;
return 1;
}
int OSSL_STORE_LOADER_set_eof(OSSL_STORE_LOADER *loader,
- OSSL_STORE_eof_fn eof_function)
+ OSSL_STORE_eof_fn eof_function)
{
loader->eof = eof_function;
return 1;
}
int OSSL_STORE_LOADER_set_error(OSSL_STORE_LOADER *loader,
- OSSL_STORE_error_fn error_function)
+ OSSL_STORE_error_fn error_function)
{
loader->error = error_function;
return 1;
}
int OSSL_STORE_LOADER_set_close(OSSL_STORE_LOADER *loader,
- OSSL_STORE_close_fn close_function)
+ OSSL_STORE_close_fn close_function)
{
loader->closefn = close_function;
return 1;
@@ -139,7 +138,7 @@ static unsigned long store_loader_hash(const OSSL_STORE_LOADER *v)
}
static int store_loader_cmp(const OSSL_STORE_LOADER *a,
- const OSSL_STORE_LOADER *b)
+ const OSSL_STORE_LOADER *b)
{
assert(a->scheme != NULL && b->scheme != NULL);
return strcmp(a->scheme, b->scheme);
@@ -150,7 +149,7 @@ static int ossl_store_register_init(void)
{
if (loader_register == NULL) {
loader_register = lh_OSSL_STORE_LOADER_new(store_loader_hash,
- store_loader_cmp);
+ store_loader_cmp);
}
return loader_register != NULL;
}
@@ -168,13 +167,13 @@ int ossl_store_register_loader_int(OSSL_STORE_LOADER *loader)
*/
if (ossl_isalpha(*scheme))
while (*scheme != '\0'
- && (ossl_isalpha(*scheme)
- || ossl_isdigit(*scheme)
- || strchr("+-.", *scheme) != NULL))
+ && (ossl_isalpha(*scheme)
+ || ossl_isdigit(*scheme)
+ || strchr("+-.", *scheme) != NULL))
scheme++;
if (*scheme != '\0') {
ERR_raise_data(ERR_LIB_OSSL_STORE, OSSL_STORE_R_INVALID_SCHEME,
- "scheme=%s", loader->scheme);
+ "scheme=%s", loader->scheme);
return 0;
}
@@ -230,9 +229,10 @@ const OSSL_STORE_LOADER *ossl_store_get0_loader_int(const char *scheme)
if (!ossl_store_register_init())
ERR_raise(ERR_LIB_OSSL_STORE, ERR_R_INTERNAL_ERROR);
else if ((loader = lh_OSSL_STORE_LOADER_retrieve(loader_register,
- &template)) == NULL)
+ &template))
+ == NULL)
ERR_raise_data(ERR_LIB_OSSL_STORE, OSSL_STORE_R_UNREGISTERED_SCHEME,
- "scheme=%s", scheme);
+ "scheme=%s", scheme);
CRYPTO_THREAD_unlock(registry_lock);
@@ -261,9 +261,10 @@ OSSL_STORE_LOADER *ossl_store_unregister_loader_int(const char *scheme)
if (!ossl_store_register_init())
ERR_raise(ERR_LIB_OSSL_STORE, ERR_R_INTERNAL_ERROR);
else if ((loader = lh_OSSL_STORE_LOADER_delete(loader_register,
- &template)) == NULL)
+ &template))
+ == NULL)
ERR_raise_data(ERR_LIB_OSSL_STORE, OSSL_STORE_R_UNREGISTERED_SCHEME,
- "scheme=%s", scheme);
+ "scheme=%s", scheme);
CRYPTO_THREAD_unlock(registry_lock);
@@ -287,9 +288,10 @@ void ossl_store_destroy_loaders_int(void)
*/
IMPLEMENT_LHASH_DOALL_ARG_CONST(OSSL_STORE_LOADER, void);
-int OSSL_STORE_do_all_loaders(void (*do_function) (const OSSL_STORE_LOADER
- *loader, void *do_arg),
- void *do_arg)
+int OSSL_STORE_do_all_loaders(void (*do_function)(const OSSL_STORE_LOADER
+ *loader,
+ void *do_arg),
+ void *do_arg)
{
if (ossl_store_register_init())
lh_OSSL_STORE_LOADER_doall_void(loader_register, do_function, do_arg);
diff --git a/crypto/store/store_result.c b/crypto/store/store_result.c
index 70e67ad502..849e4f33fb 100644
--- a/crypto/store/store_result.c
+++ b/crypto/store/store_result.c
@@ -32,7 +32,7 @@
* numbers, negative ones should be fine. They must never slip out from
* this translation unit anyway.
*/
-# define OSSL_OBJECT_PKCS12 -1
+#define OSSL_OBJECT_PKCS12 -1
#endif
/*
@@ -75,22 +75,21 @@ struct extracted_param_data_st {
static int try_name(struct extracted_param_data_st *, OSSL_STORE_INFO **);
static int try_key(struct extracted_param_data_st *, OSSL_STORE_INFO **,
- OSSL_STORE_CTX *, const OSSL_PROVIDER *,
- OSSL_LIB_CTX *, const char *);
+ OSSL_STORE_CTX *, const OSSL_PROVIDER *,
+ OSSL_LIB_CTX *, const char *);
static int try_cert(struct extracted_param_data_st *, OSSL_STORE_INFO **,
- OSSL_LIB_CTX *, const char *);
+ OSSL_LIB_CTX *, const char *);
static int try_crl(struct extracted_param_data_st *, OSSL_STORE_INFO **,
- OSSL_LIB_CTX *, const char *);
+ OSSL_LIB_CTX *, const char *);
static int try_pkcs12(struct extracted_param_data_st *, OSSL_STORE_INFO **,
- OSSL_STORE_CTX *, OSSL_LIB_CTX *, const char *);
+ OSSL_STORE_CTX *, OSSL_LIB_CTX *, const char *);
int ossl_store_handle_load_result(const OSSL_PARAM params[], void *arg)
{
struct ossl_load_result_data_st *cbdata = arg;
OSSL_STORE_INFO **v = &cbdata->v;
OSSL_STORE_CTX *ctx = cbdata->ctx;
- const OSSL_PROVIDER *provider =
- OSSL_STORE_LOADER_get0_provider(ctx->fetched_loader);
+ const OSSL_PROVIDER *provider = OSSL_STORE_LOADER_get0_provider(ctx->fetched_loader);
OSSL_LIB_CTX *libctx = ossl_provider_libctx(provider);
const char *propq = ctx->properties;
const OSSL_PARAM *p;
@@ -109,7 +108,7 @@ int ossl_store_handle_load_result(const OSSL_PARAM params[], void *arg)
p = OSSL_PARAM_locate_const(params, OSSL_OBJECT_PARAM_DATA);
if (p != NULL
&& !OSSL_PARAM_get_octet_string_ptr(p, &helper_data.octet_data,
- &helper_data.octet_data_size)
+ &helper_data.octet_data_size)
&& !OSSL_PARAM_get_utf8_string_ptr(p, &helper_data.utf8_data))
return 0;
p = OSSL_PARAM_locate_const(params, OSSL_OBJECT_PARAM_DATA_STRUCTURE);
@@ -121,8 +120,7 @@ int ossl_store_handle_load_result(const OSSL_PARAM params[], void *arg)
&& !OSSL_PARAM_get_utf8_string_ptr(p, &helper_data.input_type))
return 0;
p = OSSL_PARAM_locate_const(params, OSSL_OBJECT_PARAM_REFERENCE);
- if (p != NULL && !OSSL_PARAM_get_octet_string_ptr(p, &helper_data.ref,
- &helper_data.ref_size))
+ if (p != NULL && !OSSL_PARAM_get_octet_string_ptr(p, &helper_data.ref, &helper_data.ref_size))
return 0;
p = OSSL_PARAM_locate_const(params, OSSL_OBJECT_PARAM_DESC);
if (p != NULL && !OSSL_PARAM_get_utf8_string_ptr(p, &helper_data.desc))
@@ -160,7 +158,7 @@ int ossl_store_handle_load_result(const OSSL_PARAM params[], void *arg)
hint = ":maybe need to load the default provider?";
if (provider != NULL)
ERR_raise_data(ERR_LIB_OSSL_STORE, ERR_R_UNSUPPORTED, "provider=%s%s",
- OSSL_PROVIDER_get0_name(provider), hint);
+ OSSL_PROVIDER_get0_name(provider), hint);
else if (hint[0] != '\0')
ERR_raise_data(ERR_LIB_OSSL_STORE, ERR_R_UNSUPPORTED, "%s", hint);
else
@@ -168,7 +166,7 @@ int ossl_store_handle_load_result(const OSSL_PARAM params[], void *arg)
}
return (*v != NULL);
- err:
+err:
ERR_clear_last_mark();
return 0;
}
@@ -201,9 +199,9 @@ static int try_name(struct extracted_param_data_st *data, OSSL_STORE_INFO **v)
*/
static EVP_PKEY *try_key_ref(struct extracted_param_data_st *data,
- OSSL_STORE_CTX *ctx,
- const OSSL_PROVIDER *provider,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_STORE_CTX *ctx,
+ const OSSL_PROVIDER *provider,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
EVP_PKEY *pk = NULL;
EVP_KEYMGMT *keymgmt = NULL;
@@ -231,8 +229,7 @@ static EVP_PKEY *try_key_ref(struct extracted_param_data_st *data,
keydata = evp_keymgmt_load(keymgmt, data->ref, data->ref_size);
} else {
struct evp_keymgmt_util_try_import_data_st import_data;
- OSSL_FUNC_store_export_object_fn *export_object =
- ctx->fetched_loader->p_export_object;
+ OSSL_FUNC_store_export_object_fn *export_object = ctx->fetched_loader->p_export_object;
import_data.keymgmt = keymgmt;
import_data.keydata = NULL;
@@ -244,9 +241,9 @@ static EVP_PKEY *try_key_ref(struct extracted_param_data_st *data,
* |import_data.keydata| is as much an indicator.
*/
(void)export_object(ctx->loader_ctx,
- data->ref, data->ref_size,
- &evp_keymgmt_util_try_import,
- &import_data);
+ data->ref, data->ref_size,
+ &evp_keymgmt_util_try_import,
+ &import_data);
}
keydata = import_data.keydata;
@@ -255,7 +252,7 @@ static EVP_PKEY *try_key_ref(struct extracted_param_data_st *data,
if (keydata == NULL && try_fallback > 0) {
EVP_KEYMGMT_free(keymgmt);
keymgmt = evp_keymgmt_fetch_from_prov((OSSL_PROVIDER *)provider,
- data->data_type, propq);
+ data->data_type, propq);
if (keymgmt != NULL) {
ERR_pop_to_mark();
ERR_set_mark();
@@ -274,10 +271,10 @@ static EVP_PKEY *try_key_ref(struct extracted_param_data_st *data,
}
static EVP_PKEY *try_key_value(struct extracted_param_data_st *data,
- OSSL_STORE_CTX *ctx,
- OSSL_PASSPHRASE_CALLBACK *cb, void *cbarg,
- OSSL_LIB_CTX *libctx, const char *propq,
- int *harderr)
+ OSSL_STORE_CTX *ctx,
+ OSSL_PASSPHRASE_CALLBACK *cb, void *cbarg,
+ OSSL_LIB_CTX *libctx, const char *propq,
+ int *harderr)
{
EVP_PKEY *pk = NULL;
OSSL_DECODER_CTX *decoderctx = NULL;
@@ -292,8 +289,7 @@ static EVP_PKEY *try_key_value(struct extracted_param_data_st *data,
selection = OSSL_KEYMGMT_SELECT_ALL_PARAMETERS;
break;
case OSSL_STORE_INFO_PUBKEY:
- selection =
- OSSL_KEYMGMT_SELECT_PUBLIC_KEY
+ selection = OSSL_KEYMGMT_SELECT_PUBLIC_KEY
| OSSL_KEYMGMT_SELECT_ALL_PARAMETERS;
break;
case OSSL_STORE_INFO_PKEY:
@@ -303,10 +299,9 @@ static EVP_PKEY *try_key_value(struct extracted_param_data_st *data,
return NULL;
}
- decoderctx =
- OSSL_DECODER_CTX_new_for_pkey(&pk, data->input_type, data->data_structure,
- data->data_type, selection, libctx,
- propq);
+ decoderctx = OSSL_DECODER_CTX_new_for_pkey(&pk, data->input_type, data->data_structure,
+ data->data_type, selection, libctx,
+ propq);
(void)OSSL_DECODER_CTX_set_passphrase_cb(decoderctx, cb, cbarg);
/* No error if this couldn't be decoded */
@@ -322,10 +317,10 @@ static EVP_PKEY *try_key_value(struct extracted_param_data_st *data,
typedef OSSL_STORE_INFO *store_info_new_fn(EVP_PKEY *);
static EVP_PKEY *try_key_value_legacy(struct extracted_param_data_st *data,
- store_info_new_fn **store_info_new,
- OSSL_STORE_CTX *ctx,
- OSSL_PASSPHRASE_CALLBACK *cb, void *cbarg,
- OSSL_LIB_CTX *libctx, const char *propq)
+ store_info_new_fn **store_info_new,
+ OSSL_STORE_CTX *ctx,
+ OSSL_PASSPHRASE_CALLBACK *cb, void *cbarg,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
EVP_PKEY *pk = NULL;
const unsigned char *der = data->octet_data, *derp;
@@ -371,8 +366,8 @@ static EVP_PKEY *try_key_value_legacy(struct extracted_param_data_st *data,
* will be NULL on error anyway.
*/
PKCS12_pbe_crypt(alg, pbuf, (int)plen,
- oct->data, oct->length,
- &new_der, &len, 0);
+ oct->data, oct->length,
+ &new_der, &len, 0);
der_len = len;
der = new_der;
}
@@ -404,8 +399,8 @@ static EVP_PKEY *try_key_value_legacy(struct extracted_param_data_st *data,
}
static int try_key(struct extracted_param_data_st *data, OSSL_STORE_INFO **v,
- OSSL_STORE_CTX *ctx, const OSSL_PROVIDER *provider,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_STORE_CTX *ctx, const OSSL_PROVIDER *provider,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
store_info_new_fn *store_info_new = NULL;
int harderr = 0;
@@ -441,7 +436,7 @@ static int try_key(struct extracted_param_data_st *data, OSSL_STORE_INFO **v,
*/
if (pk == NULL && harderr == 0)
pk = try_key_value_legacy(data, &store_info_new, ctx,
- cb, cbarg, libctx, propq);
+ cb, cbarg, libctx, propq);
}
if (pk != NULL) {
@@ -459,7 +454,7 @@ static int try_key(struct extracted_param_data_st *data, OSSL_STORE_INFO **v,
if (evp_keymgmt_util_has(pk, OSSL_KEYMGMT_SELECT_PRIVATE_KEY))
store_info_new = OSSL_STORE_INFO_new_PKEY;
else if (evp_keymgmt_util_has(pk,
- OSSL_KEYMGMT_SELECT_PUBLIC_KEY))
+ OSSL_KEYMGMT_SELECT_PUBLIC_KEY))
store_info_new = OSSL_STORE_INFO_new_PUBKEY;
else
store_info_new = OSSL_STORE_INFO_new_PARAMS;
@@ -475,7 +470,7 @@ static int try_key(struct extracted_param_data_st *data, OSSL_STORE_INFO **v,
}
static int try_cert(struct extracted_param_data_st *data, OSSL_STORE_INFO **v,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_LIB_CTX *libctx, const char *propq)
{
if (data->object_type == OSSL_OBJECT_UNKNOWN
|| data->object_type == OSSL_OBJECT_CERT) {
@@ -500,10 +495,12 @@ static int try_cert(struct extracted_param_data_st *data, OSSL_STORE_INFO **v,
ignore_trusted = 0;
if (d2i_X509_AUX(&cert, (const unsigned char **)&data->octet_data,
- (long)data->octet_data_size) == NULL
+ (long)data->octet_data_size)
+ == NULL
&& (!ignore_trusted
|| d2i_X509(&cert, (const unsigned char **)&data->octet_data,
- (long)data->octet_data_size) == NULL)) {
+ (long)data->octet_data_size)
+ == NULL)) {
X509_free(cert);
cert = NULL;
}
@@ -521,14 +518,14 @@ static int try_cert(struct extracted_param_data_st *data, OSSL_STORE_INFO **v,
}
static int try_crl(struct extracted_param_data_st *data, OSSL_STORE_INFO **v,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_LIB_CTX *libctx, const char *propq)
{
if (data->object_type == OSSL_OBJECT_UNKNOWN
|| data->object_type == OSSL_OBJECT_CRL) {
X509_CRL *crl;
crl = d2i_X509_CRL(NULL, (const unsigned char **)&data->octet_data,
- (long)data->octet_data_size);
+ (long)data->octet_data_size);
if (crl != NULL)
/* We determined the object type */
@@ -549,8 +546,8 @@ static int try_crl(struct extracted_param_data_st *data, OSSL_STORE_INFO **v,
}
static int try_pkcs12(struct extracted_param_data_st *data, OSSL_STORE_INFO **v,
- OSSL_STORE_CTX *ctx,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_STORE_CTX *ctx,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
int ok = 1;
@@ -560,7 +557,7 @@ static int try_pkcs12(struct extracted_param_data_st *data, OSSL_STORE_INFO **v,
PKCS12 *p12;
p12 = d2i_PKCS12(NULL, (const unsigned char **)&data->octet_data,
- (long)data->octet_data_size);
+ (long)data->octet_data_size);
if (p12 != NULL) {
char *pass = NULL;
@@ -572,7 +569,7 @@ static int try_pkcs12(struct extracted_param_data_st *data, OSSL_STORE_INFO **v,
data->object_type = OSSL_OBJECT_PKCS12;
- ok = 0; /* Assume decryption or parse error */
+ ok = 0; /* Assume decryption or parse error */
if (!PKCS12_mac_present(p12)
|| PKCS12_verify_mac(p12, NULL, 0)) {
@@ -583,16 +580,16 @@ static int try_pkcs12(struct extracted_param_data_st *data, OSSL_STORE_INFO **v,
static char prompt_info[] = "PKCS12 import pass phrase";
OSSL_PARAM pw_params[] = {
OSSL_PARAM_utf8_string(OSSL_PASSPHRASE_PARAM_INFO,
- prompt_info,
- sizeof(prompt_info) - 1),
+ prompt_info,
+ sizeof(prompt_info) - 1),
OSSL_PARAM_END
};
if (!ossl_pw_get_passphrase(tpass, sizeof(tpass) - 1,
- &tpass_len,
- pw_params, 0, &ctx->pwdata)) {
+ &tpass_len,
+ pw_params, 0, &ctx->pwdata)) {
ERR_raise(ERR_LIB_OSSL_STORE,
- OSSL_STORE_R_PASSPHRASE_CALLBACK_ERROR);
+ OSSL_STORE_R_PASSPHRASE_CALLBACK_ERROR);
goto p12_end;
}
pass = tpass;
@@ -603,9 +600,8 @@ static int try_pkcs12(struct extracted_param_data_st *data, OSSL_STORE_INFO **v,
pass[tpass_len] = '\0';
if (!PKCS12_verify_mac(p12, pass, (int)tpass_len)) {
ERR_raise_data(ERR_LIB_OSSL_STORE,
- OSSL_STORE_R_ERROR_VERIFYING_PKCS12_MAC,
- tpass_len == 0 ? "empty password" :
- "maybe wrong password");
+ OSSL_STORE_R_ERROR_VERIFYING_PKCS12_MAC,
+ tpass_len == 0 ? "empty password" : "maybe wrong password");
goto p12_end;
}
}
@@ -616,7 +612,7 @@ static int try_pkcs12(struct extracted_param_data_st *data, OSSL_STORE_INFO **v,
OSSL_STORE_INFO *osi_cert = NULL;
OSSL_STORE_INFO *osi_ca = NULL;
- ok = 1; /* Parsing went through correctly! */
+ ok = 1; /* Parsing went through correctly! */
if ((infos = sk_OSSL_STORE_INFO_new_null()) != NULL) {
if (pkey != NULL) {
@@ -660,7 +656,7 @@ static int try_pkcs12(struct extracted_param_data_st *data, OSSL_STORE_INFO **v,
}
ctx->cached_info = infos;
}
- p12_end:
+ p12_end:
OPENSSL_cleanse(tpass, sizeof(tpass));
PKCS12_free(p12);
}
diff --git a/crypto/store/store_strings.c b/crypto/store/store_strings.c
index 8f20693b1c..0d525b71c2 100644
--- a/crypto/store/store_strings.c
+++ b/crypto/store/store_strings.c
@@ -12,12 +12,12 @@
#include "internal/nelem.h"
static const char *const type_strings[] = {
- "Name", /* OSSL_STORE_INFO_NAME */
- "Parameters", /* OSSL_STORE_INFO_PARAMS */
- "Public key", /* OSSL_STORE_INFO_PUBKEY */
- "Pkey", /* OSSL_STORE_INFO_PKEY */
- "Certificate", /* OSSL_STORE_INFO_CERT */
- "CRL" /* OSSL_STORE_INFO_CRL */
+ "Name", /* OSSL_STORE_INFO_NAME */
+ "Parameters", /* OSSL_STORE_INFO_PARAMS */
+ "Public key", /* OSSL_STORE_INFO_PUBKEY */
+ "Pkey", /* OSSL_STORE_INFO_PKEY */
+ "Certificate", /* OSSL_STORE_INFO_CERT */
+ "CRL" /* OSSL_STORE_INFO_CRL */
};
const char *OSSL_STORE_INFO_type_string(int type)
diff --git a/crypto/thread/arch.c b/crypto/thread/arch.c
index 7c139a6a60..d02e9ead45 100644
--- a/crypto/thread/arch.c
+++ b/crypto/thread/arch.c
@@ -11,7 +11,7 @@
#include <internal/thread_arch.h>
CRYPTO_THREAD *ossl_crypto_thread_native_start(CRYPTO_THREAD_ROUTINE routine,
- void *data, int joinable)
+ void *data, int joinable)
{
CRYPTO_THREAD *handle;
diff --git a/crypto/thread/arch/thread_none.c b/crypto/thread/arch/thread_none.c
index 10a804f1b7..531f628025 100644
--- a/crypto/thread/arch/thread_none.c
+++ b/crypto/thread/arch/thread_none.c
@@ -63,7 +63,7 @@ void ossl_crypto_condvar_wait(CRYPTO_CONDVAR *cv, CRYPTO_MUTEX *mutex)
}
void ossl_crypto_condvar_wait_timeout(CRYPTO_CONDVAR *cv, CRYPTO_MUTEX *mutex,
- OSSL_TIME deadline)
+ OSSL_TIME deadline)
{
}
diff --git a/crypto/thread/arch/thread_posix.c b/crypto/thread/arch/thread_posix.c
index 7650ddc85a..1b285a690e 100644
--- a/crypto/thread/arch/thread_posix.c
+++ b/crypto/thread/arch/thread_posix.c
@@ -10,10 +10,10 @@
#include <internal/thread_arch.h>
#if defined(OPENSSL_THREADS_POSIX)
-# define _GNU_SOURCE
-# include <errno.h>
-# include <sys/types.h>
-# include <unistd.h>
+#define _GNU_SOURCE
+#include <errno.h>
+#include <sys/types.h>
+#include <unistd.h>
static void *thread_start_thunk(void *vthread)
{
@@ -68,7 +68,7 @@ int ossl_crypto_thread_native_perform_join(CRYPTO_THREAD *thread, CRYPTO_THREAD_
if (thread == NULL || thread->handle == NULL)
return 0;
- handle = (pthread_t *) thread->handle;
+ handle = (pthread_t *)thread->handle;
if (pthread_join(*handle, &thread_retval) != 0)
return 0;
@@ -162,7 +162,7 @@ CRYPTO_CONDVAR *ossl_crypto_condvar_new(void)
OPENSSL_free(cv_p);
return NULL;
}
- return (CRYPTO_CONDVAR *) cv_p;
+ return (CRYPTO_CONDVAR *)cv_p;
}
void ossl_crypto_condvar_wait(CRYPTO_CONDVAR *cv, CRYPTO_MUTEX *mutex)
@@ -176,7 +176,7 @@ void ossl_crypto_condvar_wait(CRYPTO_CONDVAR *cv, CRYPTO_MUTEX *mutex)
}
void ossl_crypto_condvar_wait_timeout(CRYPTO_CONDVAR *cv, CRYPTO_MUTEX *mutex,
- OSSL_TIME deadline)
+ OSSL_TIME deadline)
{
pthread_cond_t *cv_p = (pthread_cond_t *)cv;
pthread_mutex_t *mutex_p = (pthread_mutex_t *)mutex;
diff --git a/crypto/thread/arch/thread_win.c b/crypto/thread/arch/thread_win.c
index f74542838d..3240054702 100644
--- a/crypto/thread/arch/thread_win.c
+++ b/crypto/thread/arch/thread_win.c
@@ -10,8 +10,8 @@
#include <internal/thread_arch.h>
#if defined(OPENSSL_THREADS_WINNT)
-# include <process.h>
-# include <windows.h>
+#include <process.h>
+#include <windows.h>
static unsigned __stdcall thread_start_thunk(LPVOID vthread)
{
@@ -61,7 +61,7 @@ int ossl_crypto_thread_native_perform_join(CRYPTO_THREAD *thread, CRYPTO_THREAD_
if (thread == NULL || thread->handle == NULL)
return 0;
- handle = (HANDLE *) thread->handle;
+ handle = (HANDLE *)thread->handle;
if (WaitForSingleObject(*handle, INFINITE) != WAIT_OBJECT_0)
return 0;
@@ -172,8 +172,8 @@ static int determine_timeout(OSSL_TIME deadline, DWORD *w_timeout_p)
return 1;
}
-# if defined(OPENSSL_THREADS_WINNT_LEGACY)
-# include <assert.h>
+#if defined(OPENSSL_THREADS_WINNT_LEGACY)
+#include <assert.h>
/*
* Win32, before Vista, did not have an OS-provided condition variable
@@ -280,9 +280,9 @@ static int determine_timeout(OSSL_TIME deadline, DWORD *w_timeout_p)
*
*/
typedef struct legacy_condvar_st {
- CRYPTO_MUTEX *int_m; /* internal mutex */
- HANDLE sema; /* main wait semaphore */
- HANDLE prewait_sema; /* prewait semaphore */
+ CRYPTO_MUTEX *int_m; /* internal mutex */
+ HANDLE sema; /* main wait semaphore */
+ HANDLE prewait_sema; /* prewait semaphore */
/*
* All of the following fields are protected by int_m.
*
@@ -290,11 +290,11 @@ typedef struct legacy_condvar_st {
* num_wait. num_wait can decrease for other reasons (for example due to a
* wait operation timing out).
*/
- size_t num_wait; /* Num. threads currently blocked */
- size_t num_wake; /* Num. threads due to wake up */
- size_t num_prewait; /* Num. threads in prewait */
- size_t gen; /* Prewait generation */
- int closed; /* Is closed? */
+ size_t num_wait; /* Num. threads currently blocked */
+ size_t num_wake; /* Num. threads due to wake up */
+ size_t num_prewait; /* Num. threads in prewait */
+ size_t gen; /* Prewait generation */
+ int closed; /* Is closed? */
} LEGACY_CONDVAR;
CRYPTO_CONDVAR *ossl_crypto_condvar_new(void)
@@ -322,10 +322,10 @@ CRYPTO_CONDVAR *ossl_crypto_condvar_new(void)
return NULL;
}
- cv->num_wait = 0;
- cv->num_wake = 0;
- cv->num_prewait = 0;
- cv->closed = 0;
+ cv->num_wait = 0;
+ cv->num_wake = 0;
+ cv->num_prewait = 0;
+ cv->closed = 0;
return (CRYPTO_CONDVAR *)cv;
}
@@ -355,7 +355,7 @@ static uint32_t obj_wait(HANDLE h, OSSL_TIME deadline)
}
void ossl_crypto_condvar_wait_timeout(CRYPTO_CONDVAR *cv_, CRYPTO_MUTEX *ext_m,
- OSSL_TIME deadline)
+ OSSL_TIME deadline)
{
LEGACY_CONDVAR *cv = (LEGACY_CONDVAR *)cv_;
int closed, set_prewait = 0, have_orig_gen = 0;
@@ -499,9 +499,9 @@ void ossl_crypto_condvar_broadcast(CRYPTO_CONDVAR *cv_)
return;
}
- cv->num_wake += num_wake;
- cv->num_wait -= num_wake;
- cv->closed = 1;
+ cv->num_wake += num_wake;
+ cv->num_wait -= num_wake;
+ cv->closed = 1;
ossl_crypto_mutex_unlock(cv->int_m);
ReleaseSemaphore(cv->sema, (LONG)num_wake, NULL);
@@ -529,7 +529,7 @@ void ossl_crypto_condvar_signal(CRYPTO_CONDVAR *cv_)
ReleaseSemaphore(cv->sema, 1, NULL);
}
-# else
+#else
CRYPTO_CONDVAR *ossl_crypto_condvar_new(void)
{
@@ -552,7 +552,7 @@ void ossl_crypto_condvar_wait(CRYPTO_CONDVAR *cv, CRYPTO_MUTEX *mutex)
}
void ossl_crypto_condvar_wait_timeout(CRYPTO_CONDVAR *cv, CRYPTO_MUTEX *mutex,
- OSSL_TIME deadline)
+ OSSL_TIME deadline)
{
DWORD timeout;
CONDITION_VARIABLE *cv_p = (CONDITION_VARIABLE *)cv;
@@ -589,7 +589,7 @@ void ossl_crypto_condvar_free(CRYPTO_CONDVAR **cv)
*cv_p = NULL;
}
-# endif
+#endif
void ossl_crypto_mem_barrier(void)
{
diff --git a/crypto/thread/internal.c b/crypto/thread/internal.c
index 61486c8d4d..eada15ec88 100644
--- a/crypto/thread/internal.c
+++ b/crypto/thread/internal.c
@@ -38,7 +38,7 @@ uint64_t ossl_get_avail_threads(OSSL_LIB_CTX *ctx)
}
void *ossl_crypto_thread_start(OSSL_LIB_CTX *ctx, CRYPTO_THREAD_ROUTINE start,
- void *data)
+ void *data)
{
CRYPTO_THREAD *thread;
OSSL_LIB_CTX_THREADS *tdata = OSSL_LIB_CTX_GET_THREADS(ctx);
@@ -67,7 +67,7 @@ void *ossl_crypto_thread_start(OSSL_LIB_CTX *ctx, CRYPTO_THREAD_ROUTINE start,
thread->ctx = ctx;
fail:
- return (void *) thread;
+ return (void *)thread;
}
int ossl_crypto_thread_join(void *vhandle, CRYPTO_THREAD_RETVAL *retval)
@@ -107,7 +107,7 @@ ossl_inline uint64_t ossl_get_avail_threads(OSSL_LIB_CTX *ctx)
}
void *ossl_crypto_thread_start(OSSL_LIB_CTX *ctx, CRYPTO_THREAD_ROUTINE start,
- void *data)
+ void *data)
{
return NULL;
}
@@ -146,7 +146,7 @@ fail:
void ossl_threads_ctx_free(void *vdata)
{
- OSSL_LIB_CTX_THREADS *t = (OSSL_LIB_CTX_THREADS *) vdata;
+ OSSL_LIB_CTX_THREADS *t = (OSSL_LIB_CTX_THREADS *)vdata;
if (t == NULL)
return;
diff --git a/crypto/threads_common.c b/crypto/threads_common.c
index fbc28483f8..52b4d76c5a 100644
--- a/crypto/threads_common.c
+++ b/crypto/threads_common.c
@@ -123,7 +123,7 @@ DEFINE_SPARSE_ARRAY_OF(CTX_TABLE_ENTRY);
*
*/
typedef struct master_key_entry {
- SPARSE_ARRAY_OF(CTX_TABLE_ENTRY) *ctx_table;
+ SPARSE_ARRAY_OF(CTX_TABLE_ENTRY) * ctx_table;
} MASTER_KEY_ENTRY;
/**
@@ -334,7 +334,7 @@ void *CRYPTO_THREAD_get_local_ex(CRYPTO_THREAD_LOCAL_KEY_ID id, OSSL_LIB_CTX *ct
* @return 1 on success, or 0 if allocation or initialization fails.
*/
int CRYPTO_THREAD_set_local_ex(CRYPTO_THREAD_LOCAL_KEY_ID id,
- OSSL_LIB_CTX *ctx, void *data)
+ OSSL_LIB_CTX *ctx, void *data)
{
MASTER_KEY_ENTRY *mkey;
@@ -359,7 +359,7 @@ int CRYPTO_THREAD_set_local_ex(CRYPTO_THREAD_LOCAL_KEY_ID id,
* we didn't find one, but that's ok, just initialize it now
*/
mkey = OPENSSL_calloc(CRYPTO_THREAD_LOCAL_KEY_MAX,
- sizeof(MASTER_KEY_ENTRY));
+ sizeof(MASTER_KEY_ENTRY));
if (mkey == NULL)
return 0;
/*
@@ -392,7 +392,7 @@ int CRYPTO_THREAD_set_local_ex(CRYPTO_THREAD_LOCAL_KEY_ID id,
* Assign to the entry in the table so that we can find it later
*/
return ossl_sa_CTX_TABLE_ENTRY_set(mkey[id].ctx_table,
- (uintptr_t)ctx, data);
+ (uintptr_t)ctx, data);
}
void CRYPTO_THREAD_clean_local(void)
diff --git a/crypto/threads_lib.c b/crypto/threads_lib.c
index 240ef726ec..25807ef4a8 100644
--- a/crypto/threads_lib.c
+++ b/crypto/threads_lib.c
@@ -9,7 +9,7 @@
#include <openssl/crypto.h>
#ifdef OPENSSL_SYS_UNIX
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
void OPENSSL_fork_prepare(void)
{
@@ -23,5 +23,5 @@ void OPENSSL_fork_child(void)
{
}
-# endif
+#endif
#endif
diff --git a/crypto/threads_none.c b/crypto/threads_none.c
index 04bc4f1d7d..da807fc82c 100644
--- a/crypto/threads_none.c
+++ b/crypto/threads_none.c
@@ -14,17 +14,17 @@
#if !defined(OPENSSL_THREADS) || defined(CRYPTO_TDEBUG)
-# if defined(OPENSSL_SYS_UNIX)
-# include <sys/types.h>
-# include <unistd.h>
-# endif
+#if defined(OPENSSL_SYS_UNIX)
+#include <sys/types.h>
+#include <unistd.h>
+#endif
struct rcu_lock_st {
struct rcu_cb_item *cb_items;
};
CRYPTO_RCU_LOCK *ossl_rcu_lock_new(int num_writers,
- ossl_unused OSSL_LIB_CTX *ctx)
+ ossl_unused OSSL_LIB_CTX *ctx)
{
struct rcu_lock_st *lock;
@@ -130,7 +130,8 @@ int CRYPTO_THREAD_unlock(CRYPTO_RWLOCK *lock)
return 1;
}
-void CRYPTO_THREAD_lock_free(CRYPTO_RWLOCK *lock) {
+void CRYPTO_THREAD_lock_free(CRYPTO_RWLOCK *lock)
+{
if (lock == NULL)
return;
@@ -151,7 +152,7 @@ int CRYPTO_THREAD_run_once(CRYPTO_ONCE *once, void (*init)(void))
return 1;
}
-# define OPENSSL_CRYPTO_THREAD_LOCAL_KEY_MAX 256
+#define OPENSSL_CRYPTO_THREAD_LOCAL_KEY_MAX 256
struct thread_local_storage_entry {
void *data;
@@ -221,41 +222,41 @@ int CRYPTO_THREAD_compare_id(CRYPTO_THREAD_ID a, CRYPTO_THREAD_ID b)
int CRYPTO_atomic_add(int *val, int amount, int *ret, CRYPTO_RWLOCK *lock)
{
*val += amount;
- *ret = *val;
+ *ret = *val;
return 1;
}
int CRYPTO_atomic_add64(uint64_t *val, uint64_t op, uint64_t *ret,
- CRYPTO_RWLOCK *lock)
+ CRYPTO_RWLOCK *lock)
{
*val += op;
- *ret = *val;
+ *ret = *val;
return 1;
}
int CRYPTO_atomic_and(uint64_t *val, uint64_t op, uint64_t *ret,
- CRYPTO_RWLOCK *lock)
+ CRYPTO_RWLOCK *lock)
{
*val &= op;
- *ret = *val;
+ *ret = *val;
return 1;
}
int CRYPTO_atomic_or(uint64_t *val, uint64_t op, uint64_t *ret,
- CRYPTO_RWLOCK *lock)
+ CRYPTO_RWLOCK *lock)
{
*val |= op;
- *ret = *val;
+ *ret = *val;
return 1;
}
int CRYPTO_atomic_load(uint64_t *val, uint64_t *ret, CRYPTO_RWLOCK *lock)
{
- *ret = *val;
+ *ret = *val;
return 1;
}
@@ -281,10 +282,10 @@ int openssl_init_fork_handlers(void)
int openssl_get_fork_id(void)
{
-# if defined(OPENSSL_SYS_UNIX)
+#if defined(OPENSSL_SYS_UNIX)
return getpid();
-# else
+#else
return 0;
-# endif
+#endif
}
#endif
diff --git a/crypto/threads_pthread.c b/crypto/threads_pthread.c
index d3d92cf120..75d26c9b30 100644
--- a/crypto/threads_pthread.c
+++ b/crypto/threads_pthread.c
@@ -10,8 +10,7 @@
/* We need to use the OPENSSL_fork_*() deprecated APIs */
#define OPENSSL_SUPPRESS_DEPRECATED
-#if !defined(__GNUC__) || !defined(__ATOMIC_ACQ_REL) || \
- defined(BROKEN_CLANG_ATOMICS) || defined(OPENSSL_NO_STDIO)
+#if !defined(__GNUC__) || !defined(__ATOMIC_ACQ_REL) || defined(BROKEN_CLANG_ATOMICS) || defined(OPENSSL_NO_STDIO)
/*
* we only enable REPORT_RWLOCK_CONTENTION on clang/gcc when we have
* atomics available. We do this because we need to use an atomic to track
@@ -19,16 +18,16 @@
* but that requires lock creation which gets us into a bad recursive loop
* when we try to initialize the file pointer
*/
-# ifdef REPORT_RWLOCK_CONTENTION
-# warning "RWLOCK CONTENTION REPORTING NOT SUPPORTED, Disabling"
-# undef REPORT_RWLOCK_CONTENTION
-# endif
+#ifdef REPORT_RWLOCK_CONTENTION
+#warning "RWLOCK CONTENTION REPORTING NOT SUPPORTED, Disabling"
+#undef REPORT_RWLOCK_CONTENTION
+#endif
#endif
#ifdef REPORT_RWLOCK_CONTENTION
-# define _GNU_SOURCE
-# include <execinfo.h>
-# include <unistd.h>
+#define _GNU_SOURCE
+#include <execinfo.h>
+#include <unistd.h>
#endif
#include <openssl/crypto.h>
@@ -38,34 +37,36 @@
#include "internal/threads_common.h"
#include "internal/rcu.h"
#ifdef REPORT_RWLOCK_CONTENTION
-# include <fcntl.h>
-# include <stdbool.h>
-# include <sys/syscall.h>
-# include <sys/uio.h>
-# include "internal/time.h"
+#include <fcntl.h>
+#include <stdbool.h>
+#include <sys/syscall.h>
+#include <sys/uio.h>
+#include "internal/time.h"
#endif
#include "rcu_internal.h"
#if defined(__clang__) && defined(__has_feature)
-# if __has_feature(thread_sanitizer)
-# define __SANITIZE_THREAD__
-# endif
+#if __has_feature(thread_sanitizer)
+#define __SANITIZE_THREAD__
+#endif
#endif
#if defined(__SANITIZE_THREAD__)
-# include <sanitizer/tsan_interface.h>
-# define TSAN_FAKE_UNLOCK(x) __tsan_mutex_pre_unlock((x), 0); \
-__tsan_mutex_post_unlock((x), 0)
-
-# define TSAN_FAKE_LOCK(x) __tsan_mutex_pre_lock((x), 0); \
-__tsan_mutex_post_lock((x), 0, 0)
+#include <sanitizer/tsan_interface.h>
+#define TSAN_FAKE_UNLOCK(x) \
+ __tsan_mutex_pre_unlock((x), 0); \
+ __tsan_mutex_post_unlock((x), 0)
+
+#define TSAN_FAKE_LOCK(x) \
+ __tsan_mutex_pre_lock((x), 0); \
+ __tsan_mutex_post_lock((x), 0, 0)
#else
-# define TSAN_FAKE_UNLOCK(x)
-# define TSAN_FAKE_LOCK(x)
+#define TSAN_FAKE_UNLOCK(x)
+#define TSAN_FAKE_LOCK(x)
#endif
#if defined(__sun)
-# include <atomic.h>
+#include <atomic.h>
#endif
#if defined(__apple_build_version__) && __apple_build_version__ < 6000000
@@ -77,27 +78,27 @@ __tsan_mutex_post_lock((x), 0, 0)
*
* See: https://github.com/llvm/llvm-project/commit/a4c2602b714e6c6edb98164550a5ae829b2de760
*/
-# define BROKEN_CLANG_ATOMICS
+#define BROKEN_CLANG_ATOMICS
#endif
#if defined(OPENSSL_THREADS) && !defined(CRYPTO_TDEBUG) && !defined(OPENSSL_SYS_WINDOWS)
-# if defined(OPENSSL_SYS_UNIX)
-# include <sys/types.h>
-# include <unistd.h>
-# endif
+#if defined(OPENSSL_SYS_UNIX)
+#include <sys/types.h>
+#include <unistd.h>
+#endif
-# include <assert.h>
+#include <assert.h>
/*
* The Non-Stop KLT thread model currently seems broken in its rwlock
* implementation
* Likewise is there a problem with the glibc implementation on riscv.
*/
-# if defined(PTHREAD_RWLOCK_INITIALIZER) && !defined(_KLT_MODEL_) \
- && !defined(__riscv)
-# define USE_RWLOCK
-# endif
+#if defined(PTHREAD_RWLOCK_INITIALIZER) && !defined(_KLT_MODEL_) \
+ && !defined(__riscv)
+#define USE_RWLOCK
+#endif
/*
* For all GNU/clang atomic builtins, we also need fallbacks, to cover all
@@ -123,34 +124,34 @@ __tsan_mutex_post_lock((x), 0, 0)
*/
typedef void *pvoid;
-# if defined(__GNUC__) && defined(__ATOMIC_ACQUIRE) && !defined(BROKEN_CLANG_ATOMICS) \
+#if defined(__GNUC__) && defined(__ATOMIC_ACQUIRE) && !defined(BROKEN_CLANG_ATOMICS) \
&& !defined(USE_ATOMIC_FALLBACKS)
-# define ATOMIC_LOAD_N(t, p, o) __atomic_load_n(p, o)
-# define ATOMIC_STORE_N(t, p, v, o) __atomic_store_n(p, v, o)
-# define ATOMIC_STORE(t, p, v, o) __atomic_store(p, v, o)
-# define ATOMIC_ADD_FETCH(p, v, o) __atomic_add_fetch(p, v, o)
-# define ATOMIC_SUB_FETCH(p, v, o) __atomic_sub_fetch(p, v, o)
-# else
+#define ATOMIC_LOAD_N(t, p, o) __atomic_load_n(p, o)
+#define ATOMIC_STORE_N(t, p, v, o) __atomic_store_n(p, v, o)
+#define ATOMIC_STORE(t, p, v, o) __atomic_store(p, v, o)
+#define ATOMIC_ADD_FETCH(p, v, o) __atomic_add_fetch(p, v, o)
+#define ATOMIC_SUB_FETCH(p, v, o) __atomic_sub_fetch(p, v, o)
+#else
static pthread_mutex_t atomic_sim_lock = PTHREAD_MUTEX_INITIALIZER;
-# define IMPL_fallback_atomic_load_n(t) \
- static ossl_inline t fallback_atomic_load_n_##t(t *p) \
- { \
- t ret; \
- \
- pthread_mutex_lock(&atomic_sim_lock); \
- ret = *p; \
- pthread_mutex_unlock(&atomic_sim_lock); \
- return ret; \
+#define IMPL_fallback_atomic_load_n(t) \
+ static ossl_inline t fallback_atomic_load_n_##t(t *p) \
+ { \
+ t ret; \
+ \
+ pthread_mutex_lock(&atomic_sim_lock); \
+ ret = *p; \
+ pthread_mutex_unlock(&atomic_sim_lock); \
+ return ret; \
}
IMPL_fallback_atomic_load_n(uint32_t)
-IMPL_fallback_atomic_load_n(uint64_t)
-IMPL_fallback_atomic_load_n(pvoid)
+ IMPL_fallback_atomic_load_n(uint64_t)
+ IMPL_fallback_atomic_load_n(pvoid)
-# define ATOMIC_LOAD_N(t, p, o) fallback_atomic_load_n_##t(p)
+#define ATOMIC_LOAD_N(t, p, o) fallback_atomic_load_n_##t(p)
-# define IMPL_fallback_atomic_store_n(t) \
- static ossl_inline t fallback_atomic_store_n_##t(t *p, t v) \
+#define IMPL_fallback_atomic_store_n(t) \
+ static ossl_inline t fallback_atomic_store_n_##t(t *p, t v) \
{ \
t ret; \
\
@@ -160,29 +161,29 @@ IMPL_fallback_atomic_load_n(pvoid)
pthread_mutex_unlock(&atomic_sim_lock); \
return ret; \
}
-IMPL_fallback_atomic_store_n(uint32_t)
+ IMPL_fallback_atomic_store_n(uint32_t)
-# define ATOMIC_STORE_N(t, p, v, o) fallback_atomic_store_n_##t(p, v)
+#define ATOMIC_STORE_N(t, p, v, o) fallback_atomic_store_n_##t(p, v)
-# define IMPL_fallback_atomic_store(t) \
- static ossl_inline void fallback_atomic_store_##t(t *p, t *v) \
- { \
- pthread_mutex_lock(&atomic_sim_lock); \
- *p = *v; \
- pthread_mutex_unlock(&atomic_sim_lock); \
+#define IMPL_fallback_atomic_store(t) \
+ static ossl_inline void fallback_atomic_store_##t(t *p, t *v) \
+ { \
+ pthread_mutex_lock(&atomic_sim_lock); \
+ *p = *v; \
+ pthread_mutex_unlock(&atomic_sim_lock); \
}
-IMPL_fallback_atomic_store(pvoid)
+ IMPL_fallback_atomic_store(pvoid)
-# define ATOMIC_STORE(t, p, v, o) fallback_atomic_store_##t(p, v)
+#define ATOMIC_STORE(t, p, v, o) fallback_atomic_store_##t(p, v)
-/*
- * The fallbacks that follow don't need any per type implementation, as
- * they are designed for uint64_t only. If there comes a time when multiple
- * types need to be covered, it's relatively easy to refactor them the same
- * way as the fallbacks above.
- */
+ /*
+ * The fallbacks that follow don't need any per type implementation, as
+ * they are designed for uint64_t only. If there comes a time when multiple
+ * types need to be covered, it's relatively easy to refactor them the same
+ * way as the fallbacks above.
+ */
-static ossl_inline uint64_t fallback_atomic_add_fetch(uint64_t *p, uint64_t v)
+ static ossl_inline uint64_t fallback_atomic_add_fetch(uint64_t *p, uint64_t v)
{
uint64_t ret;
@@ -193,7 +194,7 @@ static ossl_inline uint64_t fallback_atomic_add_fetch(uint64_t *p, uint64_t v)
return ret;
}
-# define ATOMIC_ADD_FETCH(p, v, o) fallback_atomic_add_fetch(p, v)
+#define ATOMIC_ADD_FETCH(p, v, o) fallback_atomic_add_fetch(p, v)
static ossl_inline uint64_t fallback_atomic_sub_fetch(uint64_t *p, uint64_t v)
{
@@ -206,8 +207,8 @@ static ossl_inline uint64_t fallback_atomic_sub_fetch(uint64_t *p, uint64_t v)
return ret;
}
-# define ATOMIC_SUB_FETCH(p, v, o) fallback_atomic_sub_fetch(p, v)
-# endif
+#define ATOMIC_SUB_FETCH(p, v, o) fallback_atomic_sub_fetch(p, v)
+#endif
/*
* This is the core of an rcu lock. It tracks the readers and writers for the
@@ -225,7 +226,7 @@ struct thread_qp {
CRYPTO_RCU_LOCK *lock;
};
-# define MAX_QPS 10
+#define MAX_QPS 10
/*
* This is the per thread tracking data
* that is assigned to each thread participating
@@ -307,15 +308,14 @@ static struct rcu_qp *get_hold_current_qp(struct rcu_lock_st *lock)
* systems like x86, but is relevant on other arches
*/
ATOMIC_ADD_FETCH(&lock->qp_group[qp_idx].users, (uint64_t)1,
- __ATOMIC_ACQUIRE);
+ __ATOMIC_ACQUIRE);
/* if the idx hasn't changed, we're good, else try again */
- if (qp_idx == ATOMIC_LOAD_N(uint32_t, &lock->reader_idx,
- __ATOMIC_ACQUIRE))
+ if (qp_idx == ATOMIC_LOAD_N(uint32_t, &lock->reader_idx, __ATOMIC_ACQUIRE))
break;
ATOMIC_SUB_FETCH(&lock->qp_group[qp_idx].users, (uint64_t)1,
- __ATOMIC_RELAXED);
+ __ATOMIC_RELAXED);
}
return &lock->qp_group[qp_idx];
@@ -396,7 +396,7 @@ void ossl_rcu_read_unlock(CRYPTO_RCU_LOCK *lock)
data->thread_qps[i].depth--;
if (data->thread_qps[i].depth == 0) {
ret = ATOMIC_SUB_FETCH(&data->thread_qps[i].qp->users,
- (uint64_t)1, __ATOMIC_RELEASE);
+ (uint64_t)1, __ATOMIC_RELEASE);
OPENSSL_assert(ret != UINT64_MAX);
data->thread_qps[i].qp = NULL;
data->thread_qps[i].lock = NULL;
@@ -436,8 +436,7 @@ static struct rcu_qp *update_qp(CRYPTO_RCU_LOCK *lock, uint32_t *curr_id)
lock->writers_alloced++;
/* increment the allocation index */
- lock->current_alloc_idx =
- (lock->current_alloc_idx + 1) % lock->group_count;
+ lock->current_alloc_idx = (lock->current_alloc_idx + 1) % lock->group_count;
*curr_id = lock->id_ctr;
lock->id_ctr++;
@@ -447,14 +446,14 @@ static struct rcu_qp *update_qp(CRYPTO_RCU_LOCK *lock, uint32_t *curr_id)
* when get_hold_current_qp acquires the next qp
*/
ATOMIC_STORE_N(uint32_t, &lock->reader_idx, lock->current_alloc_idx,
- __ATOMIC_RELEASE);
+ __ATOMIC_RELEASE);
/*
* this should make sure that the new value of reader_idx is visible in
* get_hold_current_qp, directly after incrementing the users count
*/
ATOMIC_ADD_FETCH(&lock->qp_group[current_idx].users, (uint64_t)0,
- __ATOMIC_RELEASE);
+ __ATOMIC_RELEASE);
/* wake up any waiters */
pthread_cond_signal(&lock->alloc_signal);
@@ -471,10 +470,9 @@ static void retire_qp(CRYPTO_RCU_LOCK *lock, struct rcu_qp *qp)
}
static struct rcu_qp *allocate_new_qp_group(CRYPTO_RCU_LOCK *lock,
- uint32_t count)
+ uint32_t count)
{
- struct rcu_qp *new =
- OPENSSL_calloc(count, sizeof(*new));
+ struct rcu_qp *new = OPENSSL_calloc(count, sizeof(*new));
lock->group_count = count;
return new;
@@ -545,8 +543,7 @@ void ossl_synchronize_rcu(CRYPTO_RCU_LOCK *lock)
*/
int ossl_rcu_call(CRYPTO_RCU_LOCK *lock, rcu_cb_fn cb, void *data)
{
- struct rcu_cb_item *new =
- OPENSSL_zalloc(sizeof(*new));
+ struct rcu_cb_item *new = OPENSSL_zalloc(sizeof(*new));
if (new == NULL)
return 0;
@@ -619,7 +616,7 @@ void ossl_rcu_lock_free(CRYPTO_RCU_LOCK *lock)
OPENSSL_free(rlock);
}
-# ifdef REPORT_RWLOCK_CONTENTION
+#ifdef REPORT_RWLOCK_CONTENTION
/*
* Normally we would use a BIO here to do this, but we create locks during
* library initialization, and creating a bio too early, creates a recursive set
@@ -642,8 +639,8 @@ struct stack_info {
char **strings;
};
-# define STACKS_COUNT 32
-# define BT_BUF_SIZE 1024
+#define STACKS_COUNT 32
+#define BT_BUF_SIZE 1024
struct stack_traces {
int fd;
int lock_depth;
@@ -654,7 +651,7 @@ struct stack_traces {
/* The glibc gettid() definition presents only since 2.30. */
static ossl_inline pid_t get_tid(void)
{
-# ifdef OPENSSL_SYS_MACOSX
+#ifdef OPENSSL_SYS_MACOSX
/*
* MACOS has the gettid call, but it does something completely different
* here than on other unixes. Specifically it returns the uid of the calling thread
@@ -664,16 +661,16 @@ static ossl_inline pid_t get_tid(void)
pthread_threadid_np(NULL, &tid);
return (pid_t)tid;
-# else
+#else
return syscall(SYS_gettid);
-# endif
+#endif
}
-# ifdef FIPS_MODULE
-# define FIPS_SFX "-fips"
-# else
-# define FIPS_SFX ""
-# endif
+#ifdef FIPS_MODULE
+#define FIPS_SFX "-fips"
+#else
+#define FIPS_SFX ""
+#endif
static void *init_contention_data(void)
{
struct stack_traces *traces;
@@ -728,11 +725,11 @@ static void print_stack_traces(struct stack_traces *traces)
while (traces != NULL && traces->idx >= 1) {
traces->idx--;
dprintf(traces->fd,
- "lock blocked on %s for %zu usec at time %zu tid %d\n",
- traces->stacks[traces->idx].write == 1 ? "WRITE" : "READ",
- ossl_time2us(traces->stacks[traces->idx].duration),
- ossl_time2us(traces->stacks[traces->idx].start),
- get_tid());
+ "lock blocked on %s for %zu usec at time %zu tid %d\n",
+ traces->stacks[traces->idx].write == 1 ? "WRITE" : "READ",
+ ossl_time2us(traces->stacks[traces->idx].duration),
+ ossl_time2us(traces->stacks[traces->idx].start),
+ get_tid());
if (traces->stacks[traces->idx].strings != NULL) {
static const char lf = '\n';
@@ -741,17 +738,17 @@ static void print_stack_traces(struct stack_traces *traces)
for (j = 0; j < traces->stacks[traces->idx].nptrs; j++) {
iov[2 * j].iov_base = traces->stacks[traces->idx].strings[j];
iov[2 * j].iov_len = strlen(traces->stacks[traces->idx].strings[j]);
- iov[2 * j + 1].iov_base = (char *) &lf;
+ iov[2 * j + 1].iov_base = (char *)&lf;
iov[2 * j + 1].iov_len = 1;
}
- iov[traces->stacks[traces->idx].nptrs * 2].iov_base = (char *) &lf;
+ iov[traces->stacks[traces->idx].nptrs * 2].iov_base = (char *)&lf;
iov[traces->stacks[traces->idx].nptrs * 2].iov_len = 1;
} else {
static const char no_bt[] = "No stack trace available\n\n";
iovcnt = 1;
iov = alloca(iovcnt * sizeof(*iov));
- iov[0].iov_base = (char *) no_bt;
+ iov[0].iov_base = (char *)no_bt;
iov[0].iov_len = sizeof(no_bt) - 1;
}
writev(traces->fd, iov, iovcnt);
@@ -765,7 +762,7 @@ static ossl_inline void ossl_init_rwlock_contention_data(void)
}
static int record_lock_contention(pthread_rwlock_t *lock,
- struct stack_traces *traces, bool write)
+ struct stack_traces *traces, bool write)
{
void *buffer[BT_BUF_SIZE];
OSSL_TIME start, end;
@@ -778,7 +775,7 @@ static int record_lock_contention(pthread_rwlock_t *lock,
end = ossl_time_now();
traces->stacks[traces->idx].nptrs = backtrace(buffer, BT_BUF_SIZE);
traces->stacks[traces->idx].strings = backtrace_symbols(buffer,
- traces->stacks[traces->idx].nptrs);
+ traces->stacks[traces->idx].nptrs);
traces->stacks[traces->idx].duration = ossl_time_subtract(end, start);
traces->stacks[traces->idx].start = start;
traces->stacks[traces->idx].write = write;
@@ -853,7 +850,7 @@ static ossl_inline int ossl_rwlock_unlock(pthread_rwlock_t *lock)
return 0;
}
-# else /* !REPORT_RWLOCK_CONTENTION */
+#else /* !REPORT_RWLOCK_CONTENTION */
static ossl_inline void ossl_init_rwlock_contention_data(void)
{
@@ -873,11 +870,11 @@ static ossl_inline int ossl_rwlock_unlock(pthread_rwlock_t *rwlock)
{
return pthread_rwlock_unlock(rwlock);
}
-# endif /* REPORT_RWLOCK_CONTENTION */
+#endif /* REPORT_RWLOCK_CONTENTION */
CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void)
{
-# ifdef USE_RWLOCK
+#ifdef USE_RWLOCK
CRYPTO_RWLOCK *lock;
ossl_init_rwlock_contention_data();
@@ -890,7 +887,7 @@ CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void)
OPENSSL_free(lock);
return NULL;
}
-# else
+#else
pthread_mutexattr_t attr;
CRYPTO_RWLOCK *lock;
@@ -902,13 +899,13 @@ CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void)
* We don't use recursive mutexes, but try to catch errors if we do.
*/
pthread_mutexattr_init(&attr);
-# if !defined (__TANDEM) && !defined (_SPT_MODEL_)
-# if !defined(NDEBUG) && !defined(OPENSSL_NO_MUTEX_ERRORCHECK)
+#if !defined(__TANDEM) && !defined(_SPT_MODEL_)
+#if !defined(NDEBUG) && !defined(OPENSSL_NO_MUTEX_ERRORCHECK)
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK);
-# endif
-# else
+#endif
+#else
/* The SPT Thread Library does not define MUTEX attributes. */
-# endif
+#endif
if (pthread_mutex_init(lock, &attr) != 0) {
pthread_mutexattr_destroy(&attr);
@@ -917,52 +914,52 @@ CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void)
}
pthread_mutexattr_destroy(&attr);
-# endif
+#endif
return lock;
}
__owur int CRYPTO_THREAD_read_lock(CRYPTO_RWLOCK *lock)
{
-# ifdef USE_RWLOCK
+#ifdef USE_RWLOCK
if (!ossl_assert(ossl_rwlock_rdlock(lock) == 0))
return 0;
-# else
+#else
if (pthread_mutex_lock(lock) != 0) {
assert(errno != EDEADLK && errno != EBUSY);
return 0;
}
-# endif
+#endif
return 1;
}
__owur int CRYPTO_THREAD_write_lock(CRYPTO_RWLOCK *lock)
{
-# ifdef USE_RWLOCK
+#ifdef USE_RWLOCK
if (!ossl_assert(ossl_rwlock_wrlock(lock) == 0))
return 0;
-# else
+#else
if (pthread_mutex_lock(lock) != 0) {
assert(errno != EDEADLK && errno != EBUSY);
return 0;
}
-# endif
+#endif
return 1;
}
int CRYPTO_THREAD_unlock(CRYPTO_RWLOCK *lock)
{
-# ifdef USE_RWLOCK
+#ifdef USE_RWLOCK
if (ossl_rwlock_unlock(lock) != 0)
return 0;
-# else
+#else
if (pthread_mutex_unlock(lock) != 0) {
assert(errno != EPERM);
return 0;
}
-# endif
+#endif
return 1;
}
@@ -972,11 +969,11 @@ void CRYPTO_THREAD_lock_free(CRYPTO_RWLOCK *lock)
if (lock == NULL)
return;
-# ifdef USE_RWLOCK
+#ifdef USE_RWLOCK
pthread_rwlock_destroy(lock);
-# else
+#else
pthread_mutex_destroy(lock);
-# endif
+#endif
OPENSSL_free(lock);
return;
@@ -1031,23 +1028,23 @@ int CRYPTO_THREAD_compare_id(CRYPTO_THREAD_ID a, CRYPTO_THREAD_ID b)
int CRYPTO_atomic_add(int *val, int amount, int *ret, CRYPTO_RWLOCK *lock)
{
-# if defined(__GNUC__) && defined(__ATOMIC_ACQ_REL) && !defined(BROKEN_CLANG_ATOMICS)
+#if defined(__GNUC__) && defined(__ATOMIC_ACQ_REL) && !defined(BROKEN_CLANG_ATOMICS)
if (__atomic_is_lock_free(sizeof(*val), val)) {
*ret = __atomic_add_fetch(val, amount, __ATOMIC_ACQ_REL);
return 1;
}
-# elif defined(__sun) && (defined(__SunOS_5_10) || defined(__SunOS_5_11))
+#elif defined(__sun) && (defined(__SunOS_5_10) || defined(__SunOS_5_11))
/* This will work for all future Solaris versions. */
if (ret != NULL) {
*ret = atomic_add_int_nv((volatile unsigned int *)val, amount);
return 1;
}
-# endif
+#endif
if (lock == NULL || !CRYPTO_THREAD_write_lock(lock))
return 0;
*val += amount;
- *ret = *val;
+ *ret = *val;
if (!CRYPTO_THREAD_unlock(lock))
return 0;
@@ -1056,24 +1053,24 @@ int CRYPTO_atomic_add(int *val, int amount, int *ret, CRYPTO_RWLOCK *lock)
}
int CRYPTO_atomic_add64(uint64_t *val, uint64_t op, uint64_t *ret,
- CRYPTO_RWLOCK *lock)
+ CRYPTO_RWLOCK *lock)
{
-# if defined(__GNUC__) && defined(__ATOMIC_ACQ_REL) && !defined(BROKEN_CLANG_ATOMICS)
+#if defined(__GNUC__) && defined(__ATOMIC_ACQ_REL) && !defined(BROKEN_CLANG_ATOMICS)
if (__atomic_is_lock_free(sizeof(*val), val)) {
*ret = __atomic_add_fetch(val, op, __ATOMIC_ACQ_REL);
return 1;
}
-# elif defined(__sun) && (defined(__SunOS_5_10) || defined(__SunOS_5_11))
+#elif defined(__sun) && (defined(__SunOS_5_10) || defined(__SunOS_5_11))
/* This will work for all future Solaris versions. */
if (ret != NULL) {
*ret = atomic_add_64_nv(val, op);
return 1;
}
-# endif
+#endif
if (lock == NULL || !CRYPTO_THREAD_write_lock(lock))
return 0;
*val += op;
- *ret = *val;
+ *ret = *val;
if (!CRYPTO_THREAD_unlock(lock))
return 0;
@@ -1082,24 +1079,24 @@ int CRYPTO_atomic_add64(uint64_t *val, uint64_t op, uint64_t *ret,
}
int CRYPTO_atomic_and(uint64_t *val, uint64_t op, uint64_t *ret,
- CRYPTO_RWLOCK *lock)
+ CRYPTO_RWLOCK *lock)
{
-# if defined(__GNUC__) && defined(__ATOMIC_ACQ_REL) && !defined(BROKEN_CLANG_ATOMICS)
+#if defined(__GNUC__) && defined(__ATOMIC_ACQ_REL) && !defined(BROKEN_CLANG_ATOMICS)
if (__atomic_is_lock_free(sizeof(*val), val)) {
*ret = __atomic_and_fetch(val, op, __ATOMIC_ACQ_REL);
return 1;
}
-# elif defined(__sun) && (defined(__SunOS_5_10) || defined(__SunOS_5_11))
+#elif defined(__sun) && (defined(__SunOS_5_10) || defined(__SunOS_5_11))
/* This will work for all future Solaris versions. */
if (ret != NULL) {
*ret = atomic_and_64_nv(val, op);
return 1;
}
-# endif
+#endif
if (lock == NULL || !CRYPTO_THREAD_write_lock(lock))
return 0;
*val &= op;
- *ret = *val;
+ *ret = *val;
if (!CRYPTO_THREAD_unlock(lock))
return 0;
@@ -1108,24 +1105,24 @@ int CRYPTO_atomic_and(uint64_t *val, uint64_t op, uint64_t *ret,
}
int CRYPTO_atomic_or(uint64_t *val, uint64_t op, uint64_t *ret,
- CRYPTO_RWLOCK *lock)
+ CRYPTO_RWLOCK *lock)
{
-# if defined(__GNUC__) && defined(__ATOMIC_ACQ_REL) && !defined(BROKEN_CLANG_ATOMICS)
+#if defined(__GNUC__) && defined(__ATOMIC_ACQ_REL) && !defined(BROKEN_CLANG_ATOMICS)
if (__atomic_is_lock_free(sizeof(*val), val)) {
*ret = __atomic_or_fetch(val, op, __ATOMIC_ACQ_REL);
return 1;
}
-# elif defined(__sun) && (defined(__SunOS_5_10) || defined(__SunOS_5_11))
+#elif defined(__sun) && (defined(__SunOS_5_10) || defined(__SunOS_5_11))
/* This will work for all future Solaris versions. */
if (ret != NULL) {
*ret = atomic_or_64_nv(val, op);
return 1;
}
-# endif
+#endif
if (lock == NULL || !CRYPTO_THREAD_write_lock(lock))
return 0;
*val |= op;
- *ret = *val;
+ *ret = *val;
if (!CRYPTO_THREAD_unlock(lock))
return 0;
@@ -1135,21 +1132,21 @@ int CRYPTO_atomic_or(uint64_t *val, uint64_t op, uint64_t *ret,
int CRYPTO_atomic_load(uint64_t *val, uint64_t *ret, CRYPTO_RWLOCK *lock)
{
-# if defined(__GNUC__) && defined(__ATOMIC_ACQ_REL) && !defined(BROKEN_CLANG_ATOMICS)
+#if defined(__GNUC__) && defined(__ATOMIC_ACQ_REL) && !defined(BROKEN_CLANG_ATOMICS)
if (__atomic_is_lock_free(sizeof(*val), val)) {
__atomic_load(val, ret, __ATOMIC_ACQUIRE);
return 1;
}
-# elif defined(__sun) && (defined(__SunOS_5_10) || defined(__SunOS_5_11))
+#elif defined(__sun) && (defined(__SunOS_5_10) || defined(__SunOS_5_11))
/* This will work for all future Solaris versions. */
if (ret != NULL) {
*ret = atomic_or_64_nv(val, 0);
return 1;
}
-# endif
+#endif
if (lock == NULL || !CRYPTO_THREAD_read_lock(lock))
return 0;
- *ret = *val;
+ *ret = *val;
if (!CRYPTO_THREAD_unlock(lock))
return 0;
@@ -1158,21 +1155,21 @@ int CRYPTO_atomic_load(uint64_t *val, uint64_t *ret, CRYPTO_RWLOCK *lock)
int CRYPTO_atomic_store(uint64_t *dst, uint64_t val, CRYPTO_RWLOCK *lock)
{
-# if defined(__GNUC__) && defined(__ATOMIC_ACQ_REL) && !defined(BROKEN_CLANG_ATOMICS)
+#if defined(__GNUC__) && defined(__ATOMIC_ACQ_REL) && !defined(BROKEN_CLANG_ATOMICS)
if (__atomic_is_lock_free(sizeof(*dst), dst)) {
__atomic_store(dst, &val, __ATOMIC_RELEASE);
return 1;
}
-# elif defined(__sun) && (defined(__SunOS_5_10) || defined(__SunOS_5_11))
+#elif defined(__sun) && (defined(__SunOS_5_10) || defined(__SunOS_5_11))
/* This will work for all future Solaris versions. */
if (dst != NULL) {
atomic_swap_64(dst, val);
return 1;
}
-# endif
+#endif
if (lock == NULL || !CRYPTO_THREAD_write_lock(lock))
return 0;
- *dst = val;
+ *dst = val;
if (!CRYPTO_THREAD_unlock(lock))
return 0;
@@ -1181,33 +1178,33 @@ int CRYPTO_atomic_store(uint64_t *dst, uint64_t val, CRYPTO_RWLOCK *lock)
int CRYPTO_atomic_load_int(int *val, int *ret, CRYPTO_RWLOCK *lock)
{
-# if defined(__GNUC__) && defined(__ATOMIC_ACQ_REL) && !defined(BROKEN_CLANG_ATOMICS)
+#if defined(__GNUC__) && defined(__ATOMIC_ACQ_REL) && !defined(BROKEN_CLANG_ATOMICS)
if (__atomic_is_lock_free(sizeof(*val), val)) {
__atomic_load(val, ret, __ATOMIC_ACQUIRE);
return 1;
}
-# elif defined(__sun) && (defined(__SunOS_5_10) || defined(__SunOS_5_11))
+#elif defined(__sun) && (defined(__SunOS_5_10) || defined(__SunOS_5_11))
/* This will work for all future Solaris versions. */
if (ret != NULL) {
*ret = (int)atomic_or_uint_nv((unsigned int *)val, 0);
return 1;
}
-# endif
+#endif
if (lock == NULL || !CRYPTO_THREAD_read_lock(lock))
return 0;
- *ret = *val;
+ *ret = *val;
if (!CRYPTO_THREAD_unlock(lock))
return 0;
return 1;
}
-# ifndef FIPS_MODULE
+#ifndef FIPS_MODULE
int openssl_init_fork_handlers(void)
{
return 1;
}
-# endif /* FIPS_MODULE */
+#endif /* FIPS_MODULE */
int openssl_get_fork_id(void)
{
diff --git a/crypto/threads_win.c b/crypto/threads_win.c
index 11029ea0c0..c315c86404 100644
--- a/crypto/threads_win.c
+++ b/crypto/threads_win.c
@@ -8,10 +8,10 @@
*/
#if defined(_WIN32)
-# include <windows.h>
-# if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x600
-# define USE_RWLOCK
-# endif
+#include <windows.h>
+#if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x600
+#define USE_RWLOCK
+#endif
#endif
#include <assert.h>
@@ -24,7 +24,7 @@
*/
#if ((defined(_MSC_VER) && defined(_M_IX86) && _MSC_VER <= 1600) || (defined(__MINGW32__) && !defined(__MINGW64__)))
-# define NO_INTERLOCKEDOR64
+#define NO_INTERLOCKEDOR64
#endif
#include <openssl/crypto.h>
@@ -37,12 +37,12 @@
#if defined(OPENSSL_THREADS) && !defined(CRYPTO_TDEBUG) && defined(OPENSSL_SYS_WINDOWS)
-# ifdef USE_RWLOCK
+#ifdef USE_RWLOCK
typedef struct {
SRWLOCK lock;
int exclusive;
} CRYPTO_win_rwlock;
-# endif
+#endif
/*
* This defines a quescent point (qp)
@@ -60,7 +60,7 @@ struct thread_qp {
CRYPTO_RCU_LOCK *lock;
};
-# define MAX_QPS 10
+#define MAX_QPS 10
/*
* This is the per thread tracking data
* that is assigned to each thread participating
@@ -125,10 +125,9 @@ struct rcu_lock_st {
};
static struct rcu_qp *allocate_new_qp_group(struct rcu_lock_st *lock,
- uint32_t count)
+ uint32_t count)
{
- struct rcu_qp *new =
- OPENSSL_calloc(count, sizeof(*new));
+ struct rcu_qp *new = OPENSSL_calloc(count, sizeof(*new));
lock->group_count = count;
return new;
@@ -180,7 +179,6 @@ CRYPTO_RCU_LOCK *ossl_rcu_lock_new(int num_writers, OSSL_LIB_CTX *ctx)
}
return new;
-
}
void ossl_rcu_lock_free(CRYPTO_RCU_LOCK *lock)
@@ -205,15 +203,15 @@ static ossl_inline struct rcu_qp *get_hold_current_qp(CRYPTO_RCU_LOCK *lock)
/* get the current qp index */
for (;;) {
CRYPTO_atomic_load_int((int *)&lock->reader_idx, (int *)&qp_idx,
- lock->rw_lock);
+ lock->rw_lock);
CRYPTO_atomic_add64(&lock->qp_group[qp_idx].users, (uint64_t)1, &tmp64,
- lock->rw_lock);
+ lock->rw_lock);
CRYPTO_atomic_load_int((int *)&lock->reader_idx, (int *)&tmp,
- lock->rw_lock);
+ lock->rw_lock);
if (qp_idx == tmp)
break;
CRYPTO_atomic_add64(&lock->qp_group[qp_idx].users, (uint64_t)-1, &tmp64,
- lock->rw_lock);
+ lock->rw_lock);
}
return &lock->qp_group[qp_idx];
@@ -297,8 +295,8 @@ void ossl_rcu_read_unlock(CRYPTO_RCU_LOCK *lock)
data->thread_qps[i].depth--;
if (data->thread_qps[i].depth == 0) {
CRYPTO_atomic_add64(&data->thread_qps[i].qp->users,
- (uint64_t)-1, (uint64_t *)&ret,
- lock->rw_lock);
+ (uint64_t)-1, (uint64_t *)&ret,
+ lock->rw_lock);
OPENSSL_assert(ret >= 0);
data->thread_qps[i].qp = NULL;
data->thread_qps[i].lock = NULL;
@@ -333,8 +331,7 @@ static struct rcu_qp *update_qp(CRYPTO_RCU_LOCK *lock, uint32_t *curr_id)
lock->writers_alloced++;
/* increment the allocation index */
- lock->current_alloc_idx =
- (lock->current_alloc_idx + 1) % lock->group_count;
+ lock->current_alloc_idx = (lock->current_alloc_idx + 1) % lock->group_count;
/* get and insert a new id */
*curr_id = lock->id_ctr;
@@ -342,13 +339,13 @@ static struct rcu_qp *update_qp(CRYPTO_RCU_LOCK *lock, uint32_t *curr_id)
/* update the reader index to be the prior qp */
tmp = lock->current_alloc_idx;
-# if (defined(NO_INTERLOCKEDOR64))
+#if (defined(NO_INTERLOCKEDOR64))
CRYPTO_THREAD_write_lock(lock->rw_lock);
lock->reader_idx = tmp;
CRYPTO_THREAD_unlock(lock->rw_lock);
-# else
+#else
InterlockedExchange((LONG volatile *)&lock->reader_idx, tmp);
-# endif
+#endif
/* wake up any waiters */
ossl_crypto_condvar_broadcast(lock->alloc_signal);
@@ -357,7 +354,7 @@ static struct rcu_qp *update_qp(CRYPTO_RCU_LOCK *lock, uint32_t *curr_id)
}
static void retire_qp(CRYPTO_RCU_LOCK *lock,
- struct rcu_qp *qp)
+ struct rcu_qp *qp)
{
ossl_crypto_mutex_lock(lock->alloc_lock);
lock->writers_alloced--;
@@ -365,7 +362,6 @@ static void retire_qp(CRYPTO_RCU_LOCK *lock,
ossl_crypto_mutex_unlock(lock->alloc_lock);
}
-
void ossl_synchronize_rcu(CRYPTO_RCU_LOCK *lock)
{
struct rcu_qp *qp;
@@ -407,7 +403,6 @@ void ossl_synchronize_rcu(CRYPTO_RCU_LOCK *lock)
/* and we're done */
return;
-
}
/*
@@ -436,14 +431,13 @@ void *ossl_rcu_uptr_deref(void **p)
void ossl_rcu_assign_uptr(void **p, void **v)
{
- InterlockedExchangePointer((void * volatile *)p, (void *)*v);
+ InterlockedExchangePointer((void *volatile *)p, (void *)*v);
}
-
CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void)
{
CRYPTO_RWLOCK *lock;
-# ifdef USE_RWLOCK
+#ifdef USE_RWLOCK
CRYPTO_win_rwlock *rwlock;
if ((lock = OPENSSL_zalloc(sizeof(CRYPTO_win_rwlock))) == NULL)
@@ -451,54 +445,54 @@ CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void)
return NULL;
rwlock = lock;
InitializeSRWLock(&rwlock->lock);
-# else
+#else
if ((lock = OPENSSL_zalloc(sizeof(CRITICAL_SECTION))) == NULL)
/* Don't set error, to avoid recursion blowup. */
return NULL;
-# if !defined(_WIN32_WCE)
+#if !defined(_WIN32_WCE)
/* 0x400 is the spin count value suggested in the documentation */
if (!InitializeCriticalSectionAndSpinCount(lock, 0x400)) {
OPENSSL_free(lock);
return NULL;
}
-# else
+#else
InitializeCriticalSection(lock);
-# endif
-# endif
+#endif
+#endif
return lock;
}
__owur int CRYPTO_THREAD_read_lock(CRYPTO_RWLOCK *lock)
{
-# ifdef USE_RWLOCK
+#ifdef USE_RWLOCK
CRYPTO_win_rwlock *rwlock = lock;
AcquireSRWLockShared(&rwlock->lock);
-# else
+#else
EnterCriticalSection(lock);
-# endif
+#endif
return 1;
}
__owur int CRYPTO_THREAD_write_lock(CRYPTO_RWLOCK *lock)
{
-# ifdef USE_RWLOCK
+#ifdef USE_RWLOCK
CRYPTO_win_rwlock *rwlock = lock;
AcquireSRWLockExclusive(&rwlock->lock);
rwlock->exclusive = 1;
-# else
+#else
EnterCriticalSection(lock);
-# endif
+#endif
return 1;
}
int CRYPTO_THREAD_unlock(CRYPTO_RWLOCK *lock)
{
-# ifdef USE_RWLOCK
+#ifdef USE_RWLOCK
CRYPTO_win_rwlock *rwlock = lock;
if (rwlock->exclusive) {
@@ -507,9 +501,9 @@ int CRYPTO_THREAD_unlock(CRYPTO_RWLOCK *lock)
} else {
ReleaseSRWLockShared(&rwlock->lock);
}
-# else
+#else
LeaveCriticalSection(lock);
-# endif
+#endif
return 1;
}
@@ -518,17 +512,17 @@ void CRYPTO_THREAD_lock_free(CRYPTO_RWLOCK *lock)
if (lock == NULL)
return;
-# ifndef USE_RWLOCK
+#ifndef USE_RWLOCK
DeleteCriticalSection(lock);
-# endif
+#endif
OPENSSL_free(lock);
return;
}
-# define ONCE_UNINITED 0
-# define ONCE_ININIT 1
-# define ONCE_DONE 2
+#define ONCE_UNINITED 0
+#define ONCE_ININIT 1
+#define ONCE_DONE 2
/*
* We don't use InitOnceExecuteOnce because that isn't available in WinXP which
@@ -615,7 +609,7 @@ int CRYPTO_THREAD_compare_id(CRYPTO_THREAD_ID a, CRYPTO_THREAD_ID b)
int CRYPTO_atomic_add(int *val, int amount, int *ret, CRYPTO_RWLOCK *lock)
{
-# if (defined(NO_INTERLOCKEDOR64))
+#if (defined(NO_INTERLOCKEDOR64))
if (lock == NULL || !CRYPTO_THREAD_write_lock(lock))
return 0;
*val += amount;
@@ -625,17 +619,17 @@ int CRYPTO_atomic_add(int *val, int amount, int *ret, CRYPTO_RWLOCK *lock)
return 0;
return 1;
-# else
+#else
*ret = (int)InterlockedExchangeAdd((LONG volatile *)val, (LONG)amount)
+ amount;
return 1;
-# endif
+#endif
}
int CRYPTO_atomic_add64(uint64_t *val, uint64_t op, uint64_t *ret,
- CRYPTO_RWLOCK *lock)
+ CRYPTO_RWLOCK *lock)
{
-# if (defined(NO_INTERLOCKEDOR64))
+#if (defined(NO_INTERLOCKEDOR64))
if (lock == NULL || !CRYPTO_THREAD_write_lock(lock))
return 0;
*val += op;
@@ -645,16 +639,16 @@ int CRYPTO_atomic_add64(uint64_t *val, uint64_t op, uint64_t *ret,
return 0;
return 1;
-# else
+#else
*ret = (uint64_t)InterlockedAdd64((LONG64 volatile *)val, (LONG64)op);
return 1;
-# endif
+#endif
}
int CRYPTO_atomic_and(uint64_t *val, uint64_t op, uint64_t *ret,
- CRYPTO_RWLOCK *lock)
+ CRYPTO_RWLOCK *lock)
{
-# if (defined(NO_INTERLOCKEDOR64))
+#if (defined(NO_INTERLOCKEDOR64))
if (lock == NULL || !CRYPTO_THREAD_write_lock(lock))
return 0;
*val &= op;
@@ -664,16 +658,16 @@ int CRYPTO_atomic_and(uint64_t *val, uint64_t op, uint64_t *ret,
return 0;
return 1;
-# else
+#else
*ret = (uint64_t)InterlockedAnd64((LONG64 volatile *)val, (LONG64)op) & op;
return 1;
-# endif
+#endif
}
int CRYPTO_atomic_or(uint64_t *val, uint64_t op, uint64_t *ret,
- CRYPTO_RWLOCK *lock)
+ CRYPTO_RWLOCK *lock)
{
-# if (defined(NO_INTERLOCKEDOR64))
+#if (defined(NO_INTERLOCKEDOR64))
if (lock == NULL || !CRYPTO_THREAD_write_lock(lock))
return 0;
*val |= op;
@@ -683,15 +677,15 @@ int CRYPTO_atomic_or(uint64_t *val, uint64_t op, uint64_t *ret,
return 0;
return 1;
-# else
+#else
*ret = (uint64_t)InterlockedOr64((LONG64 volatile *)val, (LONG64)op) | op;
return 1;
-# endif
+#endif
}
int CRYPTO_atomic_load(uint64_t *val, uint64_t *ret, CRYPTO_RWLOCK *lock)
{
-# if (defined(NO_INTERLOCKEDOR64))
+#if (defined(NO_INTERLOCKEDOR64))
if (lock == NULL || !CRYPTO_THREAD_read_lock(lock))
return 0;
*ret = *val;
@@ -699,15 +693,15 @@ int CRYPTO_atomic_load(uint64_t *val, uint64_t *ret, CRYPTO_RWLOCK *lock)
return 0;
return 1;
-# else
+#else
*ret = (uint64_t)InterlockedOr64((LONG64 volatile *)val, 0);
return 1;
-# endif
+#endif
}
int CRYPTO_atomic_store(uint64_t *dst, uint64_t val, CRYPTO_RWLOCK *lock)
{
-# if (defined(NO_INTERLOCKEDOR64))
+#if (defined(NO_INTERLOCKEDOR64))
if (lock == NULL || !CRYPTO_THREAD_read_lock(lock))
return 0;
*dst = val;
@@ -715,15 +709,15 @@ int CRYPTO_atomic_store(uint64_t *dst, uint64_t val, CRYPTO_RWLOCK *lock)
return 0;
return 1;
-# else
+#else
InterlockedExchange64(dst, val);
return 1;
-# endif
+#endif
}
int CRYPTO_atomic_load_int(int *val, int *ret, CRYPTO_RWLOCK *lock)
{
-# if (defined(NO_INTERLOCKEDOR64))
+#if (defined(NO_INTERLOCKEDOR64))
if (lock == NULL || !CRYPTO_THREAD_read_lock(lock))
return 0;
*ret = *val;
@@ -731,11 +725,11 @@ int CRYPTO_atomic_load_int(int *val, int *ret, CRYPTO_RWLOCK *lock)
return 0;
return 1;
-# else
+#else
/* On Windows, LONG (but not long) is always the same size as int. */
*ret = (int)InterlockedOr((LONG volatile *)val, 0);
return 1;
-# endif
+#endif
}
int openssl_init_fork_handlers(void)
diff --git a/crypto/time.c b/crypto/time.c
index a6ab6cd127..c8380ca930 100644
--- a/crypto/time.c
+++ b/crypto/time.c
@@ -26,24 +26,24 @@ OSSL_TIME ossl_time_now(void)
GetSystemTime(&st);
SystemTimeToFileTime(&st, &now.ft);
/* re-bias to 1/1/1970 */
-# ifdef __MINGW32__
+#ifdef __MINGW32__
now.ul -= 116444736000000000ULL;
-# else
+#else
now.ul -= 116444736000000000UI64;
-# endif
+#endif
r.t = ((uint64_t)now.ul) * (OSSL_TIME_SECOND / 10000000);
-#else /* defined(_WIN32) */
+#else /* defined(_WIN32) */
struct timeval t;
if (gettimeofday(&t, NULL) < 0) {
ERR_raise_data(ERR_LIB_SYS, get_last_sys_error(),
- "calling gettimeofday()");
+ "calling gettimeofday()");
return ossl_time_zero();
}
if (t.tv_sec <= 0)
r.t = t.tv_usec <= 0 ? 0 : t.tv_usec * OSSL_TIME_US;
else
r.t = ((uint64_t)t.tv_sec * 1000000 + t.tv_usec) * OSSL_TIME_US;
-#endif /* defined(_WIN32) */
+#endif /* defined(_WIN32) */
return r;
}
diff --git a/crypto/trace.c b/crypto/trace.c
index 83e8da8b71..8c72a12417 100644
--- a/crypto/trace.c
+++ b/crypto/trace.c
@@ -24,7 +24,7 @@
static CRYPTO_RWLOCK *trace_lock = NULL;
-static const BIO *current_channel = NULL;
+static const BIO *current_channel = NULL;
/*-
* INTERNAL TRACE CHANNEL IMPLEMENTATION
@@ -36,7 +36,7 @@ static const BIO *current_channel = NULL;
* callback function.
*/
static int trace_write(BIO *b, const char *buf,
- size_t num, size_t *written);
+ size_t num, size_t *written);
static int trace_puts(BIO *b, const char *str);
static long trace_ctrl(BIO *channel, int cmd, long argl, void *argp);
static int trace_free(BIO *b);
@@ -45,15 +45,15 @@ static const BIO_METHOD trace_method = {
BIO_TYPE_SOURCE_SINK,
"trace",
trace_write,
- NULL, /* old write */
- NULL, /* read_ex */
- NULL, /* read */
+ NULL, /* old write */
+ NULL, /* read_ex */
+ NULL, /* read */
trace_puts,
- NULL, /* gets */
- trace_ctrl, /* ctrl */
- NULL, /* create */
- trace_free, /* free */
- NULL, /* callback_ctrl */
+ NULL, /* gets */
+ trace_ctrl, /* ctrl */
+ NULL, /* create */
+ trace_free, /* free */
+ NULL, /* callback_ctrl */
};
struct trace_data_st {
@@ -63,11 +63,11 @@ struct trace_data_st {
};
static int trace_write(BIO *channel,
- const char *buf, size_t num, size_t *written)
+ const char *buf, size_t num, size_t *written)
{
struct trace_data_st *ctx = BIO_get_data(channel);
size_t cnt = ctx->callback(buf, num, ctx->category, OSSL_TRACE_CTRL_WRITE,
- ctx->data);
+ ctx->data);
*written = cnt;
return cnt != 0;
@@ -96,7 +96,7 @@ static long trace_ctrl(BIO *channel, int cmd, long argl, void *argp)
default:
break;
}
- return -2; /* Unsupported */
+ return -2; /* Unsupported */
}
static int trace_free(BIO *channel)
@@ -114,33 +114,34 @@ static int trace_free(BIO *channel)
/* Helper struct and macro to get name string to number mapping */
struct trace_category_st {
- const char * const name;
+ const char *const name;
const int num;
};
-#define TRACE_CATEGORY_(name) { #name, OSSL_TRACE_CATEGORY_##name }
+#define TRACE_CATEGORY_(name) { #name, OSSL_TRACE_CATEGORY_##name }
static const struct trace_category_st
- trace_categories[OSSL_TRACE_CATEGORY_NUM] = {
- TRACE_CATEGORY_(ALL),
- TRACE_CATEGORY_(TRACE),
- TRACE_CATEGORY_(INIT),
- TRACE_CATEGORY_(TLS),
- TRACE_CATEGORY_(TLS_CIPHER),
- TRACE_CATEGORY_(CONF),
- TRACE_CATEGORY_(PKCS5V2),
- TRACE_CATEGORY_(PKCS12_KEYGEN),
- TRACE_CATEGORY_(PKCS12_DECRYPT),
- TRACE_CATEGORY_(X509V3_POLICY),
- TRACE_CATEGORY_(BN_CTX),
- TRACE_CATEGORY_(CMP),
- TRACE_CATEGORY_(STORE),
- TRACE_CATEGORY_(DECODER),
- TRACE_CATEGORY_(ENCODER),
- TRACE_CATEGORY_(REF_COUNT),
- TRACE_CATEGORY_(HTTP),
- TRACE_CATEGORY_(PROVIDER),
- TRACE_CATEGORY_(QUERY),
-}; /* KEEP THIS LIST IN SYNC with #define OSSL_TRACE_CATEGORY_... in trace.h */
+ trace_categories[OSSL_TRACE_CATEGORY_NUM]
+ = {
+ TRACE_CATEGORY_(ALL),
+ TRACE_CATEGORY_(TRACE),
+ TRACE_CATEGORY_(INIT),
+ TRACE_CATEGORY_(TLS),
+ TRACE_CATEGORY_(TLS_CIPHER),
+ TRACE_CATEGORY_(CONF),
+ TRACE_CATEGORY_(PKCS5V2),
+ TRACE_CATEGORY_(PKCS12_KEYGEN),
+ TRACE_CATEGORY_(PKCS12_DECRYPT),
+ TRACE_CATEGORY_(X509V3_POLICY),
+ TRACE_CATEGORY_(BN_CTX),
+ TRACE_CATEGORY_(CMP),
+ TRACE_CATEGORY_(STORE),
+ TRACE_CATEGORY_(DECODER),
+ TRACE_CATEGORY_(ENCODER),
+ TRACE_CATEGORY_(REF_COUNT),
+ TRACE_CATEGORY_(HTTP),
+ TRACE_CATEGORY_(PROVIDER),
+ TRACE_CATEGORY_(QUERY),
+ }; /* KEEP THIS LIST IN SYNC with #define OSSL_TRACE_CATEGORY_... in trace.h */
const char *OSSL_trace_get_category_name(int num)
{
@@ -174,7 +175,8 @@ int OSSL_trace_get_category_num(const char *name)
/* We use one trace channel for each trace category */
static struct {
- enum { SIMPLE_CHANNEL, CALLBACK_CHANNEL } type;
+ enum { SIMPLE_CHANNEL,
+ CALLBACK_CHANNEL } type;
BIO *bio;
char *prefix;
char *suffix;
@@ -197,17 +199,17 @@ static int trace_attach_cb(int category, int type, const void *data)
switch (type) {
case CHANNEL:
OSSL_TRACE2(TRACE, "Attach channel %p to category '%s'\n",
- data, trace_categories[category].name);
+ data, trace_categories[category].name);
break;
case PREFIX:
OSSL_TRACE2(TRACE, "Attach prefix \"%s\" to category '%s'\n",
- (const char *)data, trace_categories[category].name);
+ (const char *)data, trace_categories[category].name);
break;
case SUFFIX:
OSSL_TRACE2(TRACE, "Attach suffix \"%s\" to category '%s'\n",
- (const char *)data, trace_categories[category].name);
+ (const char *)data, trace_categories[category].name);
break;
- default: /* No clue */
+ default: /* No clue */
break;
}
return 1;
@@ -218,17 +220,17 @@ static int trace_detach_cb(int category, int type, const void *data)
switch (type) {
case CHANNEL:
OSSL_TRACE2(TRACE, "Detach channel %p from category '%s'\n",
- data, trace_categories[category].name);
+ data, trace_categories[category].name);
break;
case PREFIX:
OSSL_TRACE2(TRACE, "Detach prefix \"%s\" from category '%s'\n",
- (const char *)data, trace_categories[category].name);
+ (const char *)data, trace_categories[category].name);
break;
case SUFFIX:
OSSL_TRACE2(TRACE, "Detach suffix \"%s\" from category '%s'\n",
- (const char *)data, trace_categories[category].name);
+ (const char *)data, trace_categories[category].name);
break;
- default: /* No clue */
+ default: /* No clue */
break;
}
return 1;
@@ -242,9 +244,9 @@ DEFINE_RUN_ONCE_STATIC(ossl_trace_init)
}
static int set_trace_data(int category, int type, BIO **channel,
- const char **prefix, const char **suffix,
- int (*attach_cb)(int, int, const void *),
- int (*detach_cb)(int, int, const void *))
+ const char **prefix, const char **suffix,
+ int (*attach_cb)(int, int, const void *),
+ int (*detach_cb)(int, int, const void *))
{
BIO *curr_channel = NULL;
char *curr_prefix = NULL;
@@ -347,11 +349,11 @@ void ossl_trace_cleanup(void)
if (category == OSSL_TRACE_CATEGORY_TRACE)
continue;
set_trace_data(category, 0, &channel, &prefix, &suffix,
- trace_attach_cb, trace_detach_cb);
+ trace_attach_cb, trace_detach_cb);
}
set_trace_data(OSSL_TRACE_CATEGORY_TRACE, 0, &channel,
- &prefix, &suffix,
- trace_attach_cb, trace_detach_cb);
+ &prefix, &suffix,
+ trace_attach_cb, trace_detach_cb);
CRYPTO_THREAD_lock_free(trace_lock);
#endif
}
@@ -361,7 +363,7 @@ int OSSL_trace_set_channel(int category, BIO *channel)
#ifndef OPENSSL_NO_TRACE
if (category >= 0 && category < OSSL_TRACE_CATEGORY_NUM)
return set_trace_data(category, SIMPLE_CHANNEL, &channel, NULL, NULL,
- trace_attach_cb, trace_detach_cb);
+ trace_attach_cb, trace_detach_cb);
#endif
return 0;
}
@@ -372,18 +374,18 @@ static int trace_attach_w_callback_cb(int category, int type, const void *data)
switch (type) {
case CHANNEL:
OSSL_TRACE2(TRACE,
- "Attach channel %p to category '%s' (with callback)\n",
- data, trace_categories[category].name);
+ "Attach channel %p to category '%s' (with callback)\n",
+ data, trace_categories[category].name);
break;
case PREFIX:
OSSL_TRACE2(TRACE, "Attach prefix \"%s\" to category '%s'\n",
- (const char *)data, trace_categories[category].name);
+ (const char *)data, trace_categories[category].name);
break;
case SUFFIX:
OSSL_TRACE2(TRACE, "Attach suffix \"%s\" to category '%s'\n",
- (const char *)data, trace_categories[category].name);
+ (const char *)data, trace_categories[category].name);
break;
- default: /* No clue */
+ default: /* No clue */
break;
}
return 1;
@@ -401,8 +403,7 @@ int OSSL_trace_set_callback(int category, OSSL_trace_cb callback, void *data)
if (callback != NULL) {
if ((channel = BIO_new(&trace_method)) == NULL
- || (trace_data =
- OPENSSL_zalloc(sizeof(struct trace_data_st))) == NULL)
+ || (trace_data = OPENSSL_zalloc(sizeof(struct trace_data_st))) == NULL)
goto err;
trace_data->callback = callback;
@@ -413,12 +414,12 @@ int OSSL_trace_set_callback(int category, OSSL_trace_cb callback, void *data)
}
if (!set_trace_data(category, CALLBACK_CHANNEL, &channel, NULL, NULL,
- trace_attach_w_callback_cb, trace_detach_cb))
+ trace_attach_w_callback_cb, trace_detach_cb))
goto err;
return 1;
- err:
+err:
BIO_free(channel);
OPENSSL_free(trace_data);
#endif
@@ -431,7 +432,7 @@ int OSSL_trace_set_prefix(int category, const char *prefix)
#ifndef OPENSSL_NO_TRACE
if (category >= 0 && category < OSSL_TRACE_CATEGORY_NUM)
return set_trace_data(category, 0, NULL, &prefix, NULL,
- trace_attach_cb, trace_detach_cb);
+ trace_attach_cb, trace_detach_cb);
#endif
return 0;
}
@@ -441,7 +442,7 @@ int OSSL_trace_set_suffix(int category, const char *suffix)
#ifndef OPENSSL_NO_TRACE
if (category >= 0 && category < OSSL_TRACE_CATEGORY_NUM)
return set_trace_data(category, 0, NULL, NULL, &suffix,
- trace_attach_cb, trace_detach_cb);
+ trace_attach_cb, trace_detach_cb);
#endif
return 0;
}
@@ -494,7 +495,7 @@ BIO *OSSL_trace_begin(int category)
break;
case CALLBACK_CHANNEL:
(void)BIO_ctrl(channel, OSSL_TRACE_CTRL_BEGIN,
- prefix == NULL ? 0 : (int)strlen(prefix), prefix);
+ prefix == NULL ? 0 : (int)strlen(prefix), prefix);
break;
}
}
@@ -523,7 +524,7 @@ void OSSL_trace_end(int category, BIO *channel)
break;
case CALLBACK_CHANNEL:
(void)BIO_ctrl(channel, OSSL_TRACE_CTRL_END,
- suffix == NULL ? 0 : (int)strlen(suffix), suffix);
+ suffix == NULL ? 0 : (int)strlen(suffix), suffix);
break;
}
current_channel = NULL;
@@ -533,14 +534,14 @@ void OSSL_trace_end(int category, BIO *channel)
}
int OSSL_trace_string(BIO *out, int text, int full,
- const unsigned char *data, size_t size)
+ const unsigned char *data, size_t size)
{
unsigned char buf[OSSL_TRACE_STRING_MAX + 1];
int len, i;
if (!full && size > OSSL_TRACE_STRING_MAX) {
BIO_printf(out, "[len %zu limited to %d]: ",
- size, OSSL_TRACE_STRING_MAX);
+ size, OSSL_TRACE_STRING_MAX);
len = OSSL_TRACE_STRING_MAX;
} else {
len = (int)size;
@@ -548,7 +549,8 @@ int OSSL_trace_string(BIO *out, int text, int full,
if (!text) { /* mask control characters while preserving newlines */
for (i = 0; i < len; i++, data++)
buf[i] = (char)*data != '\n' && ossl_iscntrl((int)*data)
- ? ' ' : *data;
+ ? ' '
+ : *data;
if (len == 0 || data[-1] != '\n')
buf[len++] = '\n';
data = buf;
diff --git a/crypto/ts/ts_asn1.c b/crypto/ts/ts_asn1.c
index ba3195eab8..93a741d04d 100644
--- a/crypto/ts/ts_asn1.c
+++ b/crypto/ts/ts_asn1.c
@@ -13,16 +13,16 @@
#include "ts_local.h"
ASN1_SEQUENCE(TS_MSG_IMPRINT) = {
- ASN1_SIMPLE(TS_MSG_IMPRINT, hash_algo, X509_ALGOR),
- ASN1_SIMPLE(TS_MSG_IMPRINT, hashed_msg, ASN1_OCTET_STRING)
+ ASN1_SIMPLE(TS_MSG_IMPRINT, hash_algo, X509_ALGOR),
+ ASN1_SIMPLE(TS_MSG_IMPRINT, hashed_msg, ASN1_OCTET_STRING)
} static_ASN1_SEQUENCE_END(TS_MSG_IMPRINT)
-IMPLEMENT_ASN1_FUNCTIONS(TS_MSG_IMPRINT)
+ IMPLEMENT_ASN1_FUNCTIONS(TS_MSG_IMPRINT)
IMPLEMENT_ASN1_DUP_FUNCTION(TS_MSG_IMPRINT)
TS_MSG_IMPRINT *d2i_TS_MSG_IMPRINT_bio(BIO *bp, TS_MSG_IMPRINT **a)
{
return ASN1_d2i_bio_of(TS_MSG_IMPRINT, TS_MSG_IMPRINT_new,
- d2i_TS_MSG_IMPRINT, bp, a);
+ d2i_TS_MSG_IMPRINT, bp, a);
}
int i2d_TS_MSG_IMPRINT_bio(BIO *bp, const TS_MSG_IMPRINT *a)
@@ -33,7 +33,7 @@ int i2d_TS_MSG_IMPRINT_bio(BIO *bp, const TS_MSG_IMPRINT *a)
TS_MSG_IMPRINT *d2i_TS_MSG_IMPRINT_fp(FILE *fp, TS_MSG_IMPRINT **a)
{
return ASN1_d2i_fp_of(TS_MSG_IMPRINT, TS_MSG_IMPRINT_new,
- d2i_TS_MSG_IMPRINT, fp, a);
+ d2i_TS_MSG_IMPRINT, fp, a);
}
int i2d_TS_MSG_IMPRINT_fp(FILE *fp, const TS_MSG_IMPRINT *a)
@@ -43,15 +43,15 @@ int i2d_TS_MSG_IMPRINT_fp(FILE *fp, const TS_MSG_IMPRINT *a)
#endif
ASN1_SEQUENCE(TS_REQ) = {
- ASN1_SIMPLE(TS_REQ, version, ASN1_INTEGER),
- ASN1_SIMPLE(TS_REQ, msg_imprint, TS_MSG_IMPRINT),
- ASN1_OPT(TS_REQ, policy_id, ASN1_OBJECT),
- ASN1_OPT(TS_REQ, nonce, ASN1_INTEGER),
- ASN1_OPT(TS_REQ, cert_req, ASN1_FBOOLEAN),
- ASN1_IMP_SEQUENCE_OF_OPT(TS_REQ, extensions, X509_EXTENSION, 0)
+ ASN1_SIMPLE(TS_REQ, version, ASN1_INTEGER),
+ ASN1_SIMPLE(TS_REQ, msg_imprint, TS_MSG_IMPRINT),
+ ASN1_OPT(TS_REQ, policy_id, ASN1_OBJECT),
+ ASN1_OPT(TS_REQ, nonce, ASN1_INTEGER),
+ ASN1_OPT(TS_REQ, cert_req, ASN1_FBOOLEAN),
+ ASN1_IMP_SEQUENCE_OF_OPT(TS_REQ, extensions, X509_EXTENSION, 0)
} static_ASN1_SEQUENCE_END(TS_REQ)
-IMPLEMENT_ASN1_FUNCTIONS(TS_REQ)
+ IMPLEMENT_ASN1_FUNCTIONS(TS_REQ)
IMPLEMENT_ASN1_DUP_FUNCTION(TS_REQ)
TS_REQ *d2i_TS_REQ_bio(BIO *bp, TS_REQ **a)
{
@@ -75,33 +75,33 @@ int i2d_TS_REQ_fp(FILE *fp, const TS_REQ *a)
#endif
ASN1_SEQUENCE(TS_ACCURACY) = {
- ASN1_OPT(TS_ACCURACY, seconds, ASN1_INTEGER),
- ASN1_IMP_OPT(TS_ACCURACY, millis, ASN1_INTEGER, 0),
- ASN1_IMP_OPT(TS_ACCURACY, micros, ASN1_INTEGER, 1)
+ ASN1_OPT(TS_ACCURACY, seconds, ASN1_INTEGER),
+ ASN1_IMP_OPT(TS_ACCURACY, millis, ASN1_INTEGER, 0),
+ ASN1_IMP_OPT(TS_ACCURACY, micros, ASN1_INTEGER, 1)
} static_ASN1_SEQUENCE_END(TS_ACCURACY)
-IMPLEMENT_ASN1_FUNCTIONS(TS_ACCURACY)
+ IMPLEMENT_ASN1_FUNCTIONS(TS_ACCURACY)
IMPLEMENT_ASN1_DUP_FUNCTION(TS_ACCURACY)
ASN1_SEQUENCE(TS_TST_INFO) = {
- ASN1_SIMPLE(TS_TST_INFO, version, ASN1_INTEGER),
- ASN1_SIMPLE(TS_TST_INFO, policy_id, ASN1_OBJECT),
- ASN1_SIMPLE(TS_TST_INFO, msg_imprint, TS_MSG_IMPRINT),
- ASN1_SIMPLE(TS_TST_INFO, serial, ASN1_INTEGER),
- ASN1_SIMPLE(TS_TST_INFO, time, ASN1_GENERALIZEDTIME),
- ASN1_OPT(TS_TST_INFO, accuracy, TS_ACCURACY),
- ASN1_OPT(TS_TST_INFO, ordering, ASN1_FBOOLEAN),
- ASN1_OPT(TS_TST_INFO, nonce, ASN1_INTEGER),
- ASN1_EXP_OPT(TS_TST_INFO, tsa, GENERAL_NAME, 0),
- ASN1_IMP_SEQUENCE_OF_OPT(TS_TST_INFO, extensions, X509_EXTENSION, 1)
+ ASN1_SIMPLE(TS_TST_INFO, version, ASN1_INTEGER),
+ ASN1_SIMPLE(TS_TST_INFO, policy_id, ASN1_OBJECT),
+ ASN1_SIMPLE(TS_TST_INFO, msg_imprint, TS_MSG_IMPRINT),
+ ASN1_SIMPLE(TS_TST_INFO, serial, ASN1_INTEGER),
+ ASN1_SIMPLE(TS_TST_INFO, time, ASN1_GENERALIZEDTIME),
+ ASN1_OPT(TS_TST_INFO, accuracy, TS_ACCURACY),
+ ASN1_OPT(TS_TST_INFO, ordering, ASN1_FBOOLEAN),
+ ASN1_OPT(TS_TST_INFO, nonce, ASN1_INTEGER),
+ ASN1_EXP_OPT(TS_TST_INFO, tsa, GENERAL_NAME, 0),
+ ASN1_IMP_SEQUENCE_OF_OPT(TS_TST_INFO, extensions, X509_EXTENSION, 1)
} static_ASN1_SEQUENCE_END(TS_TST_INFO)
-IMPLEMENT_ASN1_FUNCTIONS(TS_TST_INFO)
+ IMPLEMENT_ASN1_FUNCTIONS(TS_TST_INFO)
IMPLEMENT_ASN1_DUP_FUNCTION(TS_TST_INFO)
TS_TST_INFO *d2i_TS_TST_INFO_bio(BIO *bp, TS_TST_INFO **a)
{
return ASN1_d2i_bio_of(TS_TST_INFO, TS_TST_INFO_new, d2i_TS_TST_INFO, bp,
- a);
+ a);
}
int i2d_TS_TST_INFO_bio(BIO *bp, const TS_TST_INFO *a)
@@ -112,7 +112,7 @@ int i2d_TS_TST_INFO_bio(BIO *bp, const TS_TST_INFO *a)
TS_TST_INFO *d2i_TS_TST_INFO_fp(FILE *fp, TS_TST_INFO **a)
{
return ASN1_d2i_fp_of(TS_TST_INFO, TS_TST_INFO_new, d2i_TS_TST_INFO, fp,
- a);
+ a);
}
int i2d_TS_TST_INFO_fp(FILE *fp, const TS_TST_INFO *a)
@@ -122,12 +122,12 @@ int i2d_TS_TST_INFO_fp(FILE *fp, const TS_TST_INFO *a)
#endif
ASN1_SEQUENCE(TS_STATUS_INFO) = {
- ASN1_SIMPLE(TS_STATUS_INFO, status, ASN1_INTEGER),
- ASN1_SEQUENCE_OF_OPT(TS_STATUS_INFO, text, ASN1_UTF8STRING),
- ASN1_OPT(TS_STATUS_INFO, failure_info, ASN1_BIT_STRING)
+ ASN1_SIMPLE(TS_STATUS_INFO, status, ASN1_INTEGER),
+ ASN1_SEQUENCE_OF_OPT(TS_STATUS_INFO, text, ASN1_UTF8STRING),
+ ASN1_OPT(TS_STATUS_INFO, failure_info, ASN1_BIT_STRING)
} static_ASN1_SEQUENCE_END(TS_STATUS_INFO)
-IMPLEMENT_ASN1_FUNCTIONS(TS_STATUS_INFO)
+ IMPLEMENT_ASN1_FUNCTIONS(TS_STATUS_INFO)
IMPLEMENT_ASN1_DUP_FUNCTION(TS_STATUS_INFO)
static int ts_resp_set_tst_info(TS_RESP *a)
@@ -156,7 +156,7 @@ static int ts_resp_set_tst_info(TS_RESP *a)
}
static int ts_resp_cb(int op, ASN1_VALUE **pval, const ASN1_ITEM *it,
- void *exarg)
+ void *exarg)
{
TS_RESP *ts_resp = (TS_RESP *)*pval;
if (op == ASN1_OP_NEW_POST) {
@@ -171,11 +171,11 @@ static int ts_resp_cb(int op, ASN1_VALUE **pval, const ASN1_ITEM *it,
}
ASN1_SEQUENCE_cb(TS_RESP, ts_resp_cb) = {
- ASN1_SIMPLE(TS_RESP, status_info, TS_STATUS_INFO),
- ASN1_OPT(TS_RESP, token, PKCS7),
+ ASN1_SIMPLE(TS_RESP, status_info, TS_STATUS_INFO),
+ ASN1_OPT(TS_RESP, token, PKCS7),
} static_ASN1_SEQUENCE_END_cb(TS_RESP, TS_RESP)
-IMPLEMENT_ASN1_FUNCTIONS(TS_RESP)
+ IMPLEMENT_ASN1_FUNCTIONS(TS_RESP)
IMPLEMENT_ASN1_DUP_FUNCTION(TS_RESP)
diff --git a/crypto/ts/ts_conf.c b/crypto/ts/ts_conf.c
index 60d4ac3e9c..f8d01813df 100644
--- a/crypto/ts/ts_conf.c
+++ b/crypto/ts/ts_conf.c
@@ -16,27 +16,27 @@
#include <openssl/conf_api.h>
/* Macro definitions for the configuration file. */
-#define BASE_SECTION "tsa"
-#define ENV_DEFAULT_TSA "default_tsa"
-#define ENV_SERIAL "serial"
-#define ENV_SIGNER_CERT "signer_cert"
-#define ENV_CERTS "certs"
-#define ENV_SIGNER_KEY "signer_key"
-#define ENV_SIGNER_DIGEST "signer_digest"
-#define ENV_DEFAULT_POLICY "default_policy"
-#define ENV_OTHER_POLICIES "other_policies"
-#define ENV_DIGESTS "digests"
-#define ENV_ACCURACY "accuracy"
-#define ENV_ORDERING "ordering"
-#define ENV_TSA_NAME "tsa_name"
-#define ENV_ESS_CERT_ID_CHAIN "ess_cert_id_chain"
-#define ENV_VALUE_SECS "secs"
-#define ENV_VALUE_MILLISECS "millisecs"
-#define ENV_VALUE_MICROSECS "microsecs"
-#define ENV_CLOCK_PRECISION_DIGITS "clock_precision_digits"
-#define ENV_VALUE_YES "yes"
-#define ENV_VALUE_NO "no"
-#define ENV_ESS_CERT_ID_ALG "ess_cert_id_alg"
+#define BASE_SECTION "tsa"
+#define ENV_DEFAULT_TSA "default_tsa"
+#define ENV_SERIAL "serial"
+#define ENV_SIGNER_CERT "signer_cert"
+#define ENV_CERTS "certs"
+#define ENV_SIGNER_KEY "signer_key"
+#define ENV_SIGNER_DIGEST "signer_digest"
+#define ENV_DEFAULT_POLICY "default_policy"
+#define ENV_OTHER_POLICIES "other_policies"
+#define ENV_DIGESTS "digests"
+#define ENV_ACCURACY "accuracy"
+#define ENV_ORDERING "ordering"
+#define ENV_TSA_NAME "tsa_name"
+#define ENV_ESS_CERT_ID_CHAIN "ess_cert_id_chain"
+#define ENV_VALUE_SECS "secs"
+#define ENV_VALUE_MILLISECS "millisecs"
+#define ENV_VALUE_MICROSECS "microsecs"
+#define ENV_CLOCK_PRECISION_DIGITS "clock_precision_digits"
+#define ENV_VALUE_YES "yes"
+#define ENV_VALUE_NO "no"
+#define ENV_ESS_CERT_ID_ALG "ess_cert_id_alg"
/* Function definitions for certificate and key loading. */
@@ -52,7 +52,7 @@ X509 *TS_CONF_load_cert(const char *file)
#endif
goto end;
x = PEM_read_bio_X509_AUX(cert, NULL, NULL, NULL);
- end:
+end:
if (x == NULL)
ERR_raise(ERR_LIB_TS, TS_R_CANNOT_LOAD_CERT);
BIO_free(cert);
@@ -88,7 +88,7 @@ STACK_OF(X509) *TS_CONF_load_certs(const char *file)
xi->x509 = NULL;
}
}
- end:
+end:
if (othercerts == NULL)
ERR_raise(ERR_LIB_TS, TS_R_CANNOT_LOAD_CERT);
sk_X509_INFO_pop_free(allcerts, X509_INFO_free);
@@ -108,7 +108,7 @@ EVP_PKEY *TS_CONF_load_key(const char *file, const char *pass)
#endif
goto end;
pkey = PEM_read_bio_PrivateKey(key, NULL, NULL, (char *)pass);
- end:
+end:
if (pkey == NULL)
ERR_raise(ERR_LIB_TS, TS_R_CANNOT_LOAD_KEY);
BIO_free(key);
@@ -138,7 +138,7 @@ const char *TS_CONF_get_tsa_section(CONF *conf, const char *section)
}
int TS_CONF_set_serial(CONF *conf, const char *section, TS_serial_cb cb,
- TS_RESP_CTX *ctx)
+ TS_RESP_CTX *ctx)
{
int ret = 0;
char *serial = NCONF_get_string(conf, section, ENV_SERIAL);
@@ -149,12 +149,12 @@ int TS_CONF_set_serial(CONF *conf, const char *section, TS_serial_cb cb,
TS_RESP_CTX_set_serial_cb(ctx, cb, serial);
ret = 1;
- err:
+err:
return ret;
}
int TS_CONF_set_signer_cert(CONF *conf, const char *section,
- const char *cert, TS_RESP_CTX *ctx)
+ const char *cert, TS_RESP_CTX *ctx)
{
int ret = 0;
X509 *cert_obj = NULL;
@@ -172,13 +172,13 @@ int TS_CONF_set_signer_cert(CONF *conf, const char *section,
goto err;
ret = 1;
- err:
+err:
X509_free(cert_obj);
return ret;
}
int TS_CONF_set_certs(CONF *conf, const char *section, const char *certs,
- TS_RESP_CTX *ctx)
+ TS_RESP_CTX *ctx)
{
int ret = 0;
STACK_OF(X509) *certs_obj = NULL;
@@ -192,16 +192,16 @@ int TS_CONF_set_certs(CONF *conf, const char *section, const char *certs,
goto err;
if (!TS_RESP_CTX_set_certs(ctx, certs_obj))
goto err;
- end:
+end:
ret = 1;
- err:
+err:
OSSL_STACK_OF_X509_free(certs_obj);
return ret;
}
int TS_CONF_set_signer_key(CONF *conf, const char *section,
- const char *key, const char *pass,
- TS_RESP_CTX *ctx)
+ const char *key, const char *pass,
+ TS_RESP_CTX *ctx)
{
int ret = 0;
EVP_PKEY *key_obj = NULL;
@@ -217,13 +217,13 @@ int TS_CONF_set_signer_key(CONF *conf, const char *section,
goto err;
ret = 1;
- err:
+err:
EVP_PKEY_free(key_obj);
return ret;
}
int TS_CONF_set_signer_digest(CONF *conf, const char *section,
- const char *md, TS_RESP_CTX *ctx)
+ const char *md, TS_RESP_CTX *ctx)
{
int ret = 0;
const EVP_MD *sign_md = NULL;
@@ -242,12 +242,12 @@ int TS_CONF_set_signer_digest(CONF *conf, const char *section,
goto err;
ret = 1;
- err:
+err:
return ret;
}
int TS_CONF_set_def_policy(CONF *conf, const char *section,
- const char *policy, TS_RESP_CTX *ctx)
+ const char *policy, TS_RESP_CTX *ctx)
{
int ret = 0;
ASN1_OBJECT *policy_obj = NULL;
@@ -266,7 +266,7 @@ int TS_CONF_set_def_policy(CONF *conf, const char *section,
goto err;
ret = 1;
- err:
+err:
ASN1_OBJECT_free(policy_obj);
return ret;
}
@@ -300,7 +300,7 @@ int TS_CONF_set_policies(CONF *conf, const char *section, TS_RESP_CTX *ctx)
}
ret = 1;
- err:
+err:
sk_CONF_VALUE_pop_free(list, X509V3_conf_free);
return ret;
}
@@ -338,7 +338,7 @@ int TS_CONF_set_digests(CONF *conf, const char *section, TS_RESP_CTX *ctx)
}
ret = 1;
- err:
+err:
sk_CONF_VALUE_pop_free(list, X509V3_conf_free);
return ret;
}
@@ -375,13 +375,13 @@ int TS_CONF_set_accuracy(CONF *conf, const char *section, TS_RESP_CTX *ctx)
goto err;
ret = 1;
- err:
+err:
sk_CONF_VALUE_pop_free(list, X509V3_conf_free);
return ret;
}
int TS_CONF_set_clock_precision_digits(const CONF *conf, const char *section,
- TS_RESP_CTX *ctx)
+ TS_RESP_CTX *ctx)
{
int ret = 0;
long digits = 0;
@@ -399,12 +399,12 @@ int TS_CONF_set_clock_precision_digits(const CONF *conf, const char *section,
goto err;
return 1;
- err:
+err:
return ret;
}
static int ts_CONF_add_flag(CONF *conf, const char *section,
- const char *field, int flag, TS_RESP_CTX *ctx)
+ const char *field, int flag, TS_RESP_CTX *ctx)
{
const char *value = NCONF_get_string(conf, section, field);
@@ -431,14 +431,14 @@ int TS_CONF_set_tsa_name(CONF *conf, const char *section, TS_RESP_CTX *ctx)
}
int TS_CONF_set_ess_cert_id_chain(CONF *conf, const char *section,
- TS_RESP_CTX *ctx)
+ TS_RESP_CTX *ctx)
{
return ts_CONF_add_flag(conf, section, ENV_ESS_CERT_ID_CHAIN,
- TS_ESS_CERT_ID_CHAIN, ctx);
+ TS_ESS_CERT_ID_CHAIN, ctx);
}
int TS_CONF_set_ess_cert_id_digest(CONF *conf, const char *section,
- TS_RESP_CTX *ctx)
+ TS_RESP_CTX *ctx)
{
int ret = 0;
const EVP_MD *cert_md = NULL;
diff --git a/crypto/ts/ts_err.c b/crypto/ts/ts_err.c
index 46e89beee8..fa3f6bc169 100644
--- a/crypto/ts/ts_err.c
+++ b/crypto/ts/ts_err.c
@@ -14,76 +14,76 @@
#ifndef OPENSSL_NO_TS
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA TS_str_reasons[] = {
- {ERR_PACK(ERR_LIB_TS, 0, TS_R_BAD_PKCS7_TYPE), "bad pkcs7 type"},
- {ERR_PACK(ERR_LIB_TS, 0, TS_R_BAD_TYPE), "bad type"},
- {ERR_PACK(ERR_LIB_TS, 0, TS_R_CANNOT_LOAD_CERT), "cannot load certificate"},
- {ERR_PACK(ERR_LIB_TS, 0, TS_R_CANNOT_LOAD_KEY), "cannot load private key"},
- {ERR_PACK(ERR_LIB_TS, 0, TS_R_CERTIFICATE_VERIFY_ERROR),
- "certificate verify error"},
- {ERR_PACK(ERR_LIB_TS, 0, TS_R_COULD_NOT_SET_ENGINE),
- "could not set engine"},
- {ERR_PACK(ERR_LIB_TS, 0, TS_R_COULD_NOT_SET_TIME), "could not set time"},
- {ERR_PACK(ERR_LIB_TS, 0, TS_R_DETACHED_CONTENT), "detached content"},
- {ERR_PACK(ERR_LIB_TS, 0, TS_R_ESS_ADD_SIGNING_CERT_ERROR),
- "ess add signing cert error"},
- {ERR_PACK(ERR_LIB_TS, 0, TS_R_ESS_ADD_SIGNING_CERT_V2_ERROR),
- "ess add signing cert v2 error"},
- {ERR_PACK(ERR_LIB_TS, 0, TS_R_ESS_SIGNING_CERTIFICATE_ERROR),
- "ess signing certificate error"},
- {ERR_PACK(ERR_LIB_TS, 0, TS_R_INVALID_NULL_POINTER),
- "invalid null pointer"},
- {ERR_PACK(ERR_LIB_TS, 0, TS_R_INVALID_SIGNER_CERTIFICATE_PURPOSE),
- "invalid signer certificate purpose"},
- {ERR_PACK(ERR_LIB_TS, 0, TS_R_MESSAGE_IMPRINT_MISMATCH),
- "message imprint mismatch"},
- {ERR_PACK(ERR_LIB_TS, 0, TS_R_NONCE_MISMATCH), "nonce mismatch"},
- {ERR_PACK(ERR_LIB_TS, 0, TS_R_NONCE_NOT_RETURNED), "nonce not returned"},
- {ERR_PACK(ERR_LIB_TS, 0, TS_R_NO_CONTENT), "no content"},
- {ERR_PACK(ERR_LIB_TS, 0, TS_R_NO_TIME_STAMP_TOKEN), "no time stamp token"},
- {ERR_PACK(ERR_LIB_TS, 0, TS_R_PKCS7_ADD_SIGNATURE_ERROR),
- "pkcs7 add signature error"},
- {ERR_PACK(ERR_LIB_TS, 0, TS_R_PKCS7_ADD_SIGNED_ATTR_ERROR),
- "pkcs7 add signed attr error"},
- {ERR_PACK(ERR_LIB_TS, 0, TS_R_PKCS7_TO_TS_TST_INFO_FAILED),
- "pkcs7 to ts tst info failed"},
- {ERR_PACK(ERR_LIB_TS, 0, TS_R_POLICY_MISMATCH), "policy mismatch"},
- {ERR_PACK(ERR_LIB_TS, 0, TS_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE),
- "private key does not match certificate"},
- {ERR_PACK(ERR_LIB_TS, 0, TS_R_RESPONSE_SETUP_ERROR),
- "response setup error"},
- {ERR_PACK(ERR_LIB_TS, 0, TS_R_SIGNATURE_FAILURE), "signature failure"},
- {ERR_PACK(ERR_LIB_TS, 0, TS_R_THERE_MUST_BE_ONE_SIGNER),
- "there must be one signer"},
- {ERR_PACK(ERR_LIB_TS, 0, TS_R_TIME_SYSCALL_ERROR), "time syscall error"},
- {ERR_PACK(ERR_LIB_TS, 0, TS_R_TOKEN_NOT_PRESENT), "token not present"},
- {ERR_PACK(ERR_LIB_TS, 0, TS_R_TOKEN_PRESENT), "token present"},
- {ERR_PACK(ERR_LIB_TS, 0, TS_R_TSA_NAME_MISMATCH), "tsa name mismatch"},
- {ERR_PACK(ERR_LIB_TS, 0, TS_R_TSA_UNTRUSTED), "tsa untrusted"},
- {ERR_PACK(ERR_LIB_TS, 0, TS_R_TST_INFO_SETUP_ERROR),
- "tst info setup error"},
- {ERR_PACK(ERR_LIB_TS, 0, TS_R_TS_DATASIGN), "ts datasign"},
- {ERR_PACK(ERR_LIB_TS, 0, TS_R_UNACCEPTABLE_POLICY), "unacceptable policy"},
- {ERR_PACK(ERR_LIB_TS, 0, TS_R_UNSUPPORTED_MD_ALGORITHM),
- "unsupported md algorithm"},
- {ERR_PACK(ERR_LIB_TS, 0, TS_R_UNSUPPORTED_VERSION), "unsupported version"},
- {ERR_PACK(ERR_LIB_TS, 0, TS_R_VAR_BAD_VALUE), "var bad value"},
- {ERR_PACK(ERR_LIB_TS, 0, TS_R_VAR_LOOKUP_FAILURE),
- "cannot find config variable"},
- {ERR_PACK(ERR_LIB_TS, 0, TS_R_WRONG_CONTENT_TYPE), "wrong content type"},
- {0, NULL}
+ { ERR_PACK(ERR_LIB_TS, 0, TS_R_BAD_PKCS7_TYPE), "bad pkcs7 type" },
+ { ERR_PACK(ERR_LIB_TS, 0, TS_R_BAD_TYPE), "bad type" },
+ { ERR_PACK(ERR_LIB_TS, 0, TS_R_CANNOT_LOAD_CERT), "cannot load certificate" },
+ { ERR_PACK(ERR_LIB_TS, 0, TS_R_CANNOT_LOAD_KEY), "cannot load private key" },
+ { ERR_PACK(ERR_LIB_TS, 0, TS_R_CERTIFICATE_VERIFY_ERROR),
+ "certificate verify error" },
+ { ERR_PACK(ERR_LIB_TS, 0, TS_R_COULD_NOT_SET_ENGINE),
+ "could not set engine" },
+ { ERR_PACK(ERR_LIB_TS, 0, TS_R_COULD_NOT_SET_TIME), "could not set time" },
+ { ERR_PACK(ERR_LIB_TS, 0, TS_R_DETACHED_CONTENT), "detached content" },
+ { ERR_PACK(ERR_LIB_TS, 0, TS_R_ESS_ADD_SIGNING_CERT_ERROR),
+ "ess add signing cert error" },
+ { ERR_PACK(ERR_LIB_TS, 0, TS_R_ESS_ADD_SIGNING_CERT_V2_ERROR),
+ "ess add signing cert v2 error" },
+ { ERR_PACK(ERR_LIB_TS, 0, TS_R_ESS_SIGNING_CERTIFICATE_ERROR),
+ "ess signing certificate error" },
+ { ERR_PACK(ERR_LIB_TS, 0, TS_R_INVALID_NULL_POINTER),
+ "invalid null pointer" },
+ { ERR_PACK(ERR_LIB_TS, 0, TS_R_INVALID_SIGNER_CERTIFICATE_PURPOSE),
+ "invalid signer certificate purpose" },
+ { ERR_PACK(ERR_LIB_TS, 0, TS_R_MESSAGE_IMPRINT_MISMATCH),
+ "message imprint mismatch" },
+ { ERR_PACK(ERR_LIB_TS, 0, TS_R_NONCE_MISMATCH), "nonce mismatch" },
+ { ERR_PACK(ERR_LIB_TS, 0, TS_R_NONCE_NOT_RETURNED), "nonce not returned" },
+ { ERR_PACK(ERR_LIB_TS, 0, TS_R_NO_CONTENT), "no content" },
+ { ERR_PACK(ERR_LIB_TS, 0, TS_R_NO_TIME_STAMP_TOKEN), "no time stamp token" },
+ { ERR_PACK(ERR_LIB_TS, 0, TS_R_PKCS7_ADD_SIGNATURE_ERROR),
+ "pkcs7 add signature error" },
+ { ERR_PACK(ERR_LIB_TS, 0, TS_R_PKCS7_ADD_SIGNED_ATTR_ERROR),
+ "pkcs7 add signed attr error" },
+ { ERR_PACK(ERR_LIB_TS, 0, TS_R_PKCS7_TO_TS_TST_INFO_FAILED),
+ "pkcs7 to ts tst info failed" },
+ { ERR_PACK(ERR_LIB_TS, 0, TS_R_POLICY_MISMATCH), "policy mismatch" },
+ { ERR_PACK(ERR_LIB_TS, 0, TS_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE),
+ "private key does not match certificate" },
+ { ERR_PACK(ERR_LIB_TS, 0, TS_R_RESPONSE_SETUP_ERROR),
+ "response setup error" },
+ { ERR_PACK(ERR_LIB_TS, 0, TS_R_SIGNATURE_FAILURE), "signature failure" },
+ { ERR_PACK(ERR_LIB_TS, 0, TS_R_THERE_MUST_BE_ONE_SIGNER),
+ "there must be one signer" },
+ { ERR_PACK(ERR_LIB_TS, 0, TS_R_TIME_SYSCALL_ERROR), "time syscall error" },
+ { ERR_PACK(ERR_LIB_TS, 0, TS_R_TOKEN_NOT_PRESENT), "token not present" },
+ { ERR_PACK(ERR_LIB_TS, 0, TS_R_TOKEN_PRESENT), "token present" },
+ { ERR_PACK(ERR_LIB_TS, 0, TS_R_TSA_NAME_MISMATCH), "tsa name mismatch" },
+ { ERR_PACK(ERR_LIB_TS, 0, TS_R_TSA_UNTRUSTED), "tsa untrusted" },
+ { ERR_PACK(ERR_LIB_TS, 0, TS_R_TST_INFO_SETUP_ERROR),
+ "tst info setup error" },
+ { ERR_PACK(ERR_LIB_TS, 0, TS_R_TS_DATASIGN), "ts datasign" },
+ { ERR_PACK(ERR_LIB_TS, 0, TS_R_UNACCEPTABLE_POLICY), "unacceptable policy" },
+ { ERR_PACK(ERR_LIB_TS, 0, TS_R_UNSUPPORTED_MD_ALGORITHM),
+ "unsupported md algorithm" },
+ { ERR_PACK(ERR_LIB_TS, 0, TS_R_UNSUPPORTED_VERSION), "unsupported version" },
+ { ERR_PACK(ERR_LIB_TS, 0, TS_R_VAR_BAD_VALUE), "var bad value" },
+ { ERR_PACK(ERR_LIB_TS, 0, TS_R_VAR_LOOKUP_FAILURE),
+ "cannot find config variable" },
+ { ERR_PACK(ERR_LIB_TS, 0, TS_R_WRONG_CONTENT_TYPE), "wrong content type" },
+ { 0, NULL }
};
-# endif
+#endif
int ossl_err_load_TS_strings(void)
{
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(TS_str_reasons[0].error) == NULL)
ERR_load_strings_const(TS_str_reasons);
-# endif
+#endif
return 1;
}
#else
diff --git a/crypto/ts/ts_lib.c b/crypto/ts/ts_lib.c
index dd57bb79d0..c4392ef02e 100644
--- a/crypto/ts/ts_lib.c
+++ b/crypto/ts/ts_lib.c
@@ -74,7 +74,7 @@ int TS_X509_ALGOR_print_bio(BIO *bio, const X509_ALGOR *alg)
{
int i = OBJ_obj2nid(alg->algorithm);
return BIO_printf(bio, "Hash Algorithm: %s\n",
- (i == NID_undef) ? "UNKNOWN" : OBJ_nid2ln(i));
+ (i == NID_undef) ? "UNKNOWN" : OBJ_nid2ln(i));
}
int TS_MSG_IMPRINT_print_bio(BIO *bio, TS_MSG_IMPRINT *a)
@@ -86,7 +86,7 @@ int TS_MSG_IMPRINT_print_bio(BIO *bio, TS_MSG_IMPRINT *a)
BIO_printf(bio, "Message data:\n");
msg = a->hashed_msg;
BIO_dump_indent(bio, (const char *)ASN1_STRING_get0_data(msg),
- ASN1_STRING_length(msg), 4);
+ ASN1_STRING_length(msg), 4);
return 1;
}
diff --git a/crypto/ts/ts_local.h b/crypto/ts/ts_local.h
index b0dbd5fdd9..7aebad0948 100644
--- a/crypto/ts/ts_local.h
+++ b/crypto/ts/ts_local.h
@@ -103,23 +103,23 @@ struct TS_resp_ctx {
EVP_PKEY *signer_key;
const EVP_MD *signer_md;
const EVP_MD *ess_cert_id_digest;
- STACK_OF(X509) *certs; /* Certs to include in signed data. */
+ STACK_OF(X509) *certs; /* Certs to include in signed data. */
STACK_OF(ASN1_OBJECT) *policies; /* Acceptable policies. */
ASN1_OBJECT *default_policy; /* It may appear in policies, too. */
- STACK_OF(EVP_MD) *mds; /* Acceptable message digests. */
- ASN1_INTEGER *seconds; /* accuracy, 0 means not specified. */
- ASN1_INTEGER *millis; /* accuracy, 0 means not specified. */
- ASN1_INTEGER *micros; /* accuracy, 0 means not specified. */
+ STACK_OF(EVP_MD) *mds; /* Acceptable message digests. */
+ ASN1_INTEGER *seconds; /* accuracy, 0 means not specified. */
+ ASN1_INTEGER *millis; /* accuracy, 0 means not specified. */
+ ASN1_INTEGER *micros; /* accuracy, 0 means not specified. */
unsigned clock_precision_digits; /* fraction of seconds in timestamp
* token. */
- unsigned flags; /* Optional info, see values above. */
+ unsigned flags; /* Optional info, see values above. */
/* Callback functions. */
TS_serial_cb serial_cb;
- void *serial_cb_data; /* User data for serial_cb. */
+ void *serial_cb_data; /* User data for serial_cb. */
TS_time_cb time_cb;
- void *time_cb_data; /* User data for time_cb. */
+ void *time_cb_data; /* User data for time_cb. */
TS_extension_cb extension_cb;
- void *extension_cb_data; /* User data for extension_cb. */
+ void *extension_cb_data; /* User data for extension_cb. */
/* These members are used only while creating the response. */
TS_REQ *request;
TS_RESP *response;
diff --git a/crypto/ts/ts_req_print.c b/crypto/ts/ts_req_print.c
index 968816ae28..9d8f905ce0 100644
--- a/crypto/ts/ts_req_print.c
+++ b/crypto/ts/ts_req_print.c
@@ -43,7 +43,7 @@ int TS_REQ_print_bio(BIO *bio, TS_REQ *a)
BIO_write(bio, "\n", 1);
BIO_printf(bio, "Certificate required: %s\n",
- a->cert_req ? "yes" : "no");
+ a->cert_req ? "yes" : "no");
TS_ext_print_bio(bio, a->extensions);
diff --git a/crypto/ts/ts_rsp_print.c b/crypto/ts/ts_rsp_print.c
index c002239905..bd70727b0c 100644
--- a/crypto/ts/ts_rsp_print.c
+++ b/crypto/ts/ts_rsp_print.c
@@ -21,10 +21,9 @@ struct status_map_st {
};
static int ts_status_map_print(BIO *bio, const struct status_map_st *a,
- const ASN1_BIT_STRING *v);
+ const ASN1_BIT_STRING *v);
static int ts_ACCURACY_print_bio(BIO *bio, const TS_ACCURACY *accuracy);
-
int TS_RESP_print_bio(BIO *bio, TS_RESP *a)
{
BIO_printf(bio, "Status info:\n");
@@ -50,24 +49,24 @@ int TS_STATUS_INFO_print_bio(BIO *bio, TS_STATUS_INFO *a)
"Revoked."
};
static const struct status_map_st failure_map[] = {
- {TS_INFO_BAD_ALG,
- "unrecognized or unsupported algorithm identifier"},
- {TS_INFO_BAD_REQUEST,
- "transaction not permitted or supported"},
- {TS_INFO_BAD_DATA_FORMAT,
- "the data submitted has the wrong format"},
- {TS_INFO_TIME_NOT_AVAILABLE,
- "the TSA's time source is not available"},
- {TS_INFO_UNACCEPTED_POLICY,
- "the requested TSA policy is not supported by the TSA"},
- {TS_INFO_UNACCEPTED_EXTENSION,
- "the requested extension is not supported by the TSA"},
- {TS_INFO_ADD_INFO_NOT_AVAILABLE,
- "the additional information requested could not be understood "
- "or is not available"},
- {TS_INFO_SYSTEM_FAILURE,
- "the request cannot be handled due to system failure"},
- {-1, NULL}
+ { TS_INFO_BAD_ALG,
+ "unrecognized or unsupported algorithm identifier" },
+ { TS_INFO_BAD_REQUEST,
+ "transaction not permitted or supported" },
+ { TS_INFO_BAD_DATA_FORMAT,
+ "the data submitted has the wrong format" },
+ { TS_INFO_TIME_NOT_AVAILABLE,
+ "the TSA's time source is not available" },
+ { TS_INFO_UNACCEPTED_POLICY,
+ "the requested TSA policy is not supported by the TSA" },
+ { TS_INFO_UNACCEPTED_EXTENSION,
+ "the requested extension is not supported by the TSA" },
+ { TS_INFO_ADD_INFO_NOT_AVAILABLE,
+ "the additional information requested could not be understood "
+ "or is not available" },
+ { TS_INFO_SYSTEM_FAILURE,
+ "the request cannot be handled due to system failure" },
+ { -1, NULL }
};
long status;
int i, lines = 0;
@@ -100,7 +99,7 @@ int TS_STATUS_INFO_print_bio(BIO *bio, TS_STATUS_INFO *a)
}
static int ts_status_map_print(BIO *bio, const struct status_map_st *a,
- const ASN1_BIT_STRING *v)
+ const ASN1_BIT_STRING *v)
{
int lines = 0;
diff --git a/crypto/ts/ts_rsp_sign.c b/crypto/ts/ts_rsp_sign.c
index 510bbd5da2..cdd8f4d401 100644
--- a/crypto/ts/ts_rsp_sign.c
+++ b/crypto/ts/ts_rsp_sign.c
@@ -30,15 +30,14 @@ static void ts_RESP_CTX_cleanup(TS_RESP_CTX *ctx);
static int ts_RESP_check_request(TS_RESP_CTX *ctx);
static ASN1_OBJECT *ts_RESP_get_policy(TS_RESP_CTX *ctx);
static TS_TST_INFO *ts_RESP_create_tst_info(TS_RESP_CTX *ctx,
- ASN1_OBJECT *policy);
+ ASN1_OBJECT *policy);
static int ts_RESP_process_extensions(TS_RESP_CTX *ctx);
static int ts_RESP_sign(TS_RESP_CTX *ctx);
static int ts_TST_INFO_content_new(PKCS7 *p7);
-static ASN1_GENERALIZEDTIME
-*TS_RESP_set_genTime_with_precision(ASN1_GENERALIZEDTIME *, long, long,
- unsigned);
+static ASN1_GENERALIZEDTIME *TS_RESP_set_genTime_with_precision(ASN1_GENERALIZEDTIME *, long, long,
+ unsigned);
/* Default callback for response generation. */
static ASN1_INTEGER *def_serial_cb(struct TS_resp_ctx *ctx, void *data)
@@ -51,16 +50,16 @@ static ASN1_INTEGER *def_serial_cb(struct TS_resp_ctx *ctx, void *data)
goto err;
return serial;
- err:
+err:
ERR_raise(ERR_LIB_TS, ERR_R_ASN1_LIB);
TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
- "Error during serial number generation.");
+ "Error during serial number generation.");
ASN1_INTEGER_free(serial);
return NULL;
}
static int def_time_cb(struct TS_resp_ctx *ctx, void *data,
- long *sec, long *usec)
+ long *sec, long *usec)
{
OSSL_TIME t;
struct timeval tv;
@@ -69,7 +68,7 @@ static int def_time_cb(struct TS_resp_ctx *ctx, void *data,
if (ossl_time_is_zero(t)) {
ERR_raise(ERR_LIB_TS, TS_R_TIME_SYSCALL_ERROR);
TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
- "Time is not available.");
+ "Time is not available.");
TS_RESP_CTX_add_failure_info(ctx, TS_INFO_TIME_NOT_AVAILABLE);
return 0;
}
@@ -81,10 +80,10 @@ static int def_time_cb(struct TS_resp_ctx *ctx, void *data,
}
static int def_extension_cb(struct TS_resp_ctx *ctx, X509_EXTENSION *ext,
- void *data)
+ void *data)
{
TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
- "Unsupported extension.");
+ "Unsupported extension.");
TS_RESP_CTX_add_failure_info(ctx, TS_INFO_UNACCEPTED_EXTENSION);
return 0;
}
@@ -129,7 +128,7 @@ void TS_RESP_CTX_free(TS_RESP_CTX *ctx)
OSSL_STACK_OF_X509_free(ctx->certs);
sk_ASN1_OBJECT_pop_free(ctx->policies, ASN1_OBJECT_free);
ASN1_OBJECT_free(ctx->default_policy);
- sk_EVP_MD_free(ctx->mds); /* No EVP_MD_free method exists. */
+ sk_EVP_MD_free(ctx->mds); /* No EVP_MD_free method exists. */
ASN1_INTEGER_free(ctx->seconds);
ASN1_INTEGER_free(ctx->millis);
ASN1_INTEGER_free(ctx->micros);
@@ -174,7 +173,7 @@ int TS_RESP_CTX_set_def_policy(TS_RESP_CTX *ctx, const ASN1_OBJECT *def_policy)
if ((ctx->default_policy = OBJ_dup(def_policy)) == NULL)
goto err;
return 1;
- err:
+err:
ERR_raise(ERR_LIB_TS, ERR_R_OBJ_LIB);
return 0;
}
@@ -206,7 +205,7 @@ int TS_RESP_CTX_add_policy(TS_RESP_CTX *ctx, const ASN1_OBJECT *policy)
}
return 1;
- err:
+err:
ASN1_OBJECT_free(copy);
return 0;
}
@@ -220,21 +219,21 @@ int TS_RESP_CTX_add_md(TS_RESP_CTX *ctx, const EVP_MD *md)
goto err;
return 1;
- err:
+err:
ERR_raise(ERR_LIB_TS, ERR_R_CRYPTO_LIB);
return 0;
}
-#define TS_RESP_CTX_accuracy_free(ctx) \
- ASN1_INTEGER_free(ctx->seconds); \
- ctx->seconds = NULL; \
- ASN1_INTEGER_free(ctx->millis); \
- ctx->millis = NULL; \
- ASN1_INTEGER_free(ctx->micros); \
- ctx->micros = NULL;
+#define TS_RESP_CTX_accuracy_free(ctx) \
+ ASN1_INTEGER_free(ctx->seconds); \
+ ctx->seconds = NULL; \
+ ASN1_INTEGER_free(ctx->millis); \
+ ctx->millis = NULL; \
+ ASN1_INTEGER_free(ctx->micros); \
+ ctx->micros = NULL;
int TS_RESP_CTX_set_accuracy(TS_RESP_CTX *ctx,
- int secs, int millis, int micros)
+ int secs, int millis, int micros)
{
TS_RESP_CTX_accuracy_free(ctx);
@@ -252,7 +251,7 @@ int TS_RESP_CTX_set_accuracy(TS_RESP_CTX *ctx,
goto err;
return 1;
- err:
+err:
TS_RESP_CTX_accuracy_free(ctx);
ERR_raise(ERR_LIB_TS, ERR_R_ASN1_LIB);
return 0;
@@ -276,14 +275,14 @@ void TS_RESP_CTX_set_time_cb(TS_RESP_CTX *ctx, TS_time_cb cb, void *data)
}
void TS_RESP_CTX_set_extension_cb(TS_RESP_CTX *ctx,
- TS_extension_cb cb, void *data)
+ TS_extension_cb cb, void *data)
{
ctx->extension_cb = cb;
ctx->extension_cb_data = data;
}
int TS_RESP_CTX_set_status_info(TS_RESP_CTX *ctx,
- int status, const char *text)
+ int status, const char *text)
{
TS_STATUS_INFO *si = NULL;
ASN1_UTF8STRING *utf8_text = NULL;
@@ -312,21 +311,21 @@ int TS_RESP_CTX_set_status_info(TS_RESP_CTX *ctx,
ERR_raise(ERR_LIB_TS, ERR_R_CRYPTO_LIB);
goto err;
}
- utf8_text = NULL; /* Ownership is lost. */
+ utf8_text = NULL; /* Ownership is lost. */
}
if (!TS_RESP_set_status_info(ctx->response, si)) {
ERR_raise(ERR_LIB_TS, ERR_R_TS_LIB);
goto err;
}
ret = 1;
- err:
+err:
TS_STATUS_INFO_free(si);
ASN1_UTF8STRING_free(utf8_text);
return ret;
}
int TS_RESP_CTX_set_status_info_cond(TS_RESP_CTX *ctx,
- int status, const char *text)
+ int status, const char *text)
{
int ret = 1;
TS_STATUS_INFO *si = ctx->response->status_info;
@@ -346,7 +345,7 @@ int TS_RESP_CTX_add_failure_info(TS_RESP_CTX *ctx, int failure)
if (!ASN1_BIT_STRING_set_bit(si->failure_info, failure, 1))
goto err;
return 1;
- err:
+err:
ERR_raise(ERR_LIB_TS, ERR_R_ASN1_LIB);
return 0;
}
@@ -362,7 +361,7 @@ TS_TST_INFO *TS_RESP_CTX_get_tst_info(TS_RESP_CTX *ctx)
}
int TS_RESP_CTX_set_clock_precision_digits(TS_RESP_CTX *ctx,
- unsigned precision)
+ unsigned precision)
{
if (precision > TS_MAX_CLOCK_PRECISION_DIGITS)
return 0;
@@ -385,7 +384,7 @@ TS_RESP *TS_RESP_create_response(TS_RESP_CTX *ctx, BIO *req_bio)
}
if ((ctx->request = d2i_TS_REQ_bio(req_bio, NULL)) == NULL) {
TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
- "Bad request format or system error.");
+ "Bad request format or system error.");
TS_RESP_CTX_add_failure_info(ctx, TS_INFO_BAD_DATA_FORMAT);
goto end;
}
@@ -403,21 +402,22 @@ TS_RESP *TS_RESP_create_response(TS_RESP_CTX *ctx, BIO *req_bio)
goto end;
result = 1;
- end:
+end:
if (!result) {
ERR_raise(ERR_LIB_TS, TS_R_RESPONSE_SETUP_ERROR);
if (ctx->response != NULL) {
if (TS_RESP_CTX_set_status_info_cond(ctx,
- TS_STATUS_REJECTION,
- "Error during response "
- "generation.") == 0) {
+ TS_STATUS_REJECTION,
+ "Error during response "
+ "generation.")
+ == 0) {
TS_RESP_free(ctx->response);
ctx->response = NULL;
}
}
}
response = ctx->response;
- ctx->response = NULL; /* Ownership will be returned to caller. */
+ ctx->response = NULL; /* Ownership will be returned to caller. */
ts_RESP_CTX_cleanup(ctx);
return response;
}
@@ -454,7 +454,7 @@ static int ts_RESP_check_request(TS_RESP_CTX *ctx)
if (TS_REQ_get_version(request) != 1) {
TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
- "Bad request version.");
+ "Bad request version.");
TS_RESP_CTX_add_failure_info(ctx, TS_INFO_BAD_REQUEST);
return 0;
}
@@ -469,8 +469,8 @@ static int ts_RESP_check_request(TS_RESP_CTX *ctx)
}
if (!md) {
TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
- "Message digest algorithm is "
- "not supported.");
+ "Message digest algorithm is "
+ "not supported.");
TS_RESP_CTX_add_failure_info(ctx, TS_INFO_BAD_ALG);
return 0;
}
@@ -481,15 +481,15 @@ static int ts_RESP_check_request(TS_RESP_CTX *ctx)
if (md_alg->parameter && ASN1_TYPE_get(md_alg->parameter) != V_ASN1_NULL) {
TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
- "Superfluous message digest "
- "parameter.");
+ "Superfluous message digest "
+ "parameter.");
TS_RESP_CTX_add_failure_info(ctx, TS_INFO_BAD_ALG);
return 0;
}
digest = msg_imprint->hashed_msg;
if (digest->length != md_size) {
TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
- "Bad message digest.");
+ "Bad message digest.");
TS_RESP_CTX_add_failure_info(ctx, TS_INFO_BAD_DATA_FORMAT);
return 0;
}
@@ -520,7 +520,8 @@ static ASN1_OBJECT *ts_RESP_get_policy(TS_RESP_CTX *ctx)
if (policy == NULL) {
ERR_raise(ERR_LIB_TS, TS_R_UNACCEPTABLE_POLICY);
TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
- "Requested policy is not " "supported.");
+ "Requested policy is not "
+ "supported.");
TS_RESP_CTX_add_failure_info(ctx, TS_INFO_UNACCEPTED_POLICY);
}
return policy;
@@ -528,7 +529,7 @@ static ASN1_OBJECT *ts_RESP_get_policy(TS_RESP_CTX *ctx)
/* Creates the TS_TST_INFO object based on the settings of the context. */
static TS_TST_INFO *ts_RESP_create_tst_info(TS_RESP_CTX *ctx,
- ASN1_OBJECT *policy)
+ ASN1_OBJECT *policy)
{
int result = 0;
TS_TST_INFO *tst_info = NULL;
@@ -551,9 +552,9 @@ static TS_TST_INFO *ts_RESP_create_tst_info(TS_RESP_CTX *ctx,
|| !TS_TST_INFO_set_serial(tst_info, serial))
goto end;
if (!ctx->time_cb(ctx, ctx->time_cb_data, &sec, &usec)
- || (asn1_time =
- TS_RESP_set_genTime_with_precision(NULL, sec, usec,
- ctx->clock_precision_digits)) == NULL
+ || (asn1_time = TS_RESP_set_genTime_with_precision(NULL, sec, usec,
+ ctx->clock_precision_digits))
+ == NULL
|| !TS_TST_INFO_set_time(tst_info, asn1_time))
goto end;
@@ -581,8 +582,7 @@ static TS_TST_INFO *ts_RESP_create_tst_info(TS_RESP_CTX *ctx,
if ((tsa_name = GENERAL_NAME_new()) == NULL)
goto end;
tsa_name->type = GEN_DIRNAME;
- tsa_name->d.dirn =
- X509_NAME_dup(X509_get_subject_name(ctx->signer_cert));
+ tsa_name->d.dirn = X509_NAME_dup(X509_get_subject_name(ctx->signer_cert));
if (!tsa_name->d.dirn)
goto end;
if (!TS_TST_INFO_set_tsa(tst_info, tsa_name))
@@ -590,14 +590,14 @@ static TS_TST_INFO *ts_RESP_create_tst_info(TS_RESP_CTX *ctx,
}
result = 1;
- end:
+end:
if (!result) {
TS_TST_INFO_free(tst_info);
tst_info = NULL;
ERR_raise(ERR_LIB_TS, TS_R_TST_INFO_SETUP_ERROR);
TS_RESP_CTX_set_status_info_cond(ctx, TS_STATUS_REJECTION,
- "Error during TSTInfo "
- "generation.");
+ "Error during TSTInfo "
+ "generation.");
}
GENERAL_NAME_free(tsa_name);
TS_ACCURACY_free(accuracy);
@@ -622,7 +622,7 @@ static int ts_RESP_process_extensions(TS_RESP_CTX *ctx)
* For lack of better information, I'm placing a NULL there instead.
* The callback can pick its own address out from the ctx anyway...
*/
- ok = (*ctx->extension_cb) (ctx, ext, NULL);
+ ok = (*ctx->extension_cb)(ctx, ext, NULL);
}
return ok;
@@ -630,7 +630,7 @@ static int ts_RESP_process_extensions(TS_RESP_CTX *ctx)
/* Functions for signing the TS_TST_INFO structure of the context. */
static int ossl_ess_add1_signing_cert(PKCS7_SIGNER_INFO *si,
- const ESS_SIGNING_CERT *sc)
+ const ESS_SIGNING_CERT *sc)
{
ASN1_STRING *seq = NULL;
int len;
@@ -653,7 +653,7 @@ static int ossl_ess_add1_signing_cert(PKCS7_SIGNER_INFO *si,
OPENSSL_free(pp);
if (!PKCS7_add_signed_attribute(si, NID_id_smime_aa_signingCertificate,
- V_ASN1_SEQUENCE, seq)) {
+ V_ASN1_SEQUENCE, seq)) {
ASN1_STRING_free(seq);
return 0;
}
@@ -661,7 +661,7 @@ static int ossl_ess_add1_signing_cert(PKCS7_SIGNER_INFO *si,
}
static int ossl_ess_add1_signing_cert_v2(PKCS7_SIGNER_INFO *si,
- const ESS_SIGNING_CERT_V2 *sc)
+ const ESS_SIGNING_CERT_V2 *sc)
{
ASN1_STRING *seq = NULL;
int len;
@@ -684,7 +684,7 @@ static int ossl_ess_add1_signing_cert_v2(PKCS7_SIGNER_INFO *si,
OPENSSL_free(pp);
if (!PKCS7_add_signed_attribute(si, NID_id_smime_aa_signingCertificateV2,
- V_ASN1_SEQUENCE, seq)) {
+ V_ASN1_SEQUENCE, seq)) {
ASN1_STRING_free(seq);
return 0;
}
@@ -696,7 +696,7 @@ static int ts_RESP_sign(TS_RESP_CTX *ctx)
int ret = 0;
PKCS7 *p7 = NULL;
PKCS7_SIGNER_INFO *si;
- STACK_OF(X509) *certs; /* Certificates to include in sc. */
+ STACK_OF(X509) *certs; /* Certificates to include in sc. */
ESS_SIGNING_CERT_V2 *sc2 = NULL;
ESS_SIGNING_CERT *sc = NULL;
ASN1_OBJECT *oid;
@@ -732,19 +732,20 @@ static int ts_RESP_sign(TS_RESP_CTX *ctx)
signer_md = EVP_MD_fetch(ctx->libctx, "SHA256", ctx->propq);
else if (EVP_MD_get0_provider(ctx->signer_md) == NULL)
signer_md = EVP_MD_fetch(ctx->libctx, EVP_MD_get0_name(ctx->signer_md),
- ctx->propq);
+ ctx->propq);
else
signer_md = (EVP_MD *)ctx->signer_md;
if ((si = PKCS7_add_signature(p7, ctx->signer_cert,
- ctx->signer_key, signer_md)) == NULL) {
+ ctx->signer_key, signer_md))
+ == NULL) {
ERR_raise(ERR_LIB_TS, TS_R_PKCS7_ADD_SIGNATURE_ERROR);
goto err;
}
oid = OBJ_nid2obj(NID_id_smime_ct_TSTInfo);
if (!PKCS7_add_signed_attribute(si, NID_pkcs9_contentType,
- V_ASN1_OBJECT, oid)) {
+ V_ASN1_OBJECT, oid)) {
ERR_raise(ERR_LIB_TS, TS_R_PKCS7_ADD_SIGNED_ATTR_ERROR);
goto err;
}
@@ -753,7 +754,8 @@ static int ts_RESP_sign(TS_RESP_CTX *ctx)
if (ctx->ess_cert_id_digest == NULL
|| EVP_MD_is_a(ctx->ess_cert_id_digest, SN_sha1)) {
if ((sc = OSSL_ESS_signing_cert_new_init(ctx->signer_cert,
- certs, 0)) == NULL)
+ certs, 0))
+ == NULL)
goto err;
if (!ossl_ess_add1_signing_cert(si, sc)) {
@@ -762,7 +764,7 @@ static int ts_RESP_sign(TS_RESP_CTX *ctx)
}
} else {
sc2 = OSSL_ESS_signing_cert_v2_new_init(ctx->ess_cert_id_digest,
- ctx->signer_cert, certs, 0);
+ ctx->signer_cert, certs, 0);
if (sc2 == NULL)
goto err;
@@ -787,18 +789,18 @@ static int ts_RESP_sign(TS_RESP_CTX *ctx)
goto err;
}
TS_RESP_set_tst_info(ctx->response, p7, ctx->tst_info);
- p7 = NULL; /* Ownership is lost. */
- ctx->tst_info = NULL; /* Ownership is lost. */
+ p7 = NULL; /* Ownership is lost. */
+ ctx->tst_info = NULL; /* Ownership is lost. */
ret = 1;
- err:
+err:
if (signer_md != ctx->signer_md)
EVP_MD_free(signer_md);
if (!ret)
TS_RESP_CTX_set_status_info_cond(ctx, TS_STATUS_REJECTION,
- "Error during signature "
- "generation.");
+ "Error during signature "
+ "generation.");
BIO_free_all(p7bio);
ESS_SIGNING_CERT_V2_free(sc2);
ESS_SIGNING_CERT_free(sc);
@@ -827,15 +829,15 @@ static int ts_TST_INFO_content_new(PKCS7 *p7)
goto err;
return 1;
- err:
+err:
ASN1_OCTET_STRING_free(octet_string);
PKCS7_free(ret);
return 0;
}
static ASN1_GENERALIZEDTIME *TS_RESP_set_genTime_with_precision(
- ASN1_GENERALIZEDTIME *asn1_time, long sec, long usec,
- unsigned precision)
+ ASN1_GENERALIZEDTIME *asn1_time, long sec, long usec,
+ unsigned precision)
{
time_t time_sec = (time_t)sec;
struct tm *tm = NULL, tm_result;
@@ -857,9 +859,9 @@ static ASN1_GENERALIZEDTIME *TS_RESP_set_genTime_with_precision(
* fraction-of-second details".
*/
p += BIO_snprintf(p, p_end - p,
- "%04d%02d%02d%02d%02d%02d",
- tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
- tm->tm_hour, tm->tm_min, tm->tm_sec);
+ "%04d%02d%02d%02d%02d%02d",
+ tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
+ tm->tm_hour, tm->tm_min, tm->tm_sec);
if (precision > 0) {
BIO_snprintf(p, 2 + precision, ".%06ld", usec);
p += strlen(p);
@@ -880,7 +882,7 @@ static ASN1_GENERALIZEDTIME *TS_RESP_set_genTime_with_precision(
* this loop even if all the digits are zero.
*/
while (*--p == '0')
- continue;
+ continue;
if (*p != '.')
++p;
}
@@ -896,7 +898,7 @@ static ASN1_GENERALIZEDTIME *TS_RESP_set_genTime_with_precision(
}
return asn1_time;
- err:
+err:
ERR_raise(ERR_LIB_TS, TS_R_COULD_NOT_SET_TIME);
return NULL;
}
diff --git a/crypto/ts/ts_rsp_verify.c b/crypto/ts/ts_rsp_verify.c
index 8bfde55f72..3876e30f47 100644
--- a/crypto/ts/ts_rsp_verify.c
+++ b/crypto/ts/ts_rsp_verify.c
@@ -17,32 +17,32 @@
#include "ts_local.h"
static int ts_verify_cert(X509_STORE *store, STACK_OF(X509) *untrusted,
- X509 *signer, STACK_OF(X509) **chain);
+ X509 *signer, STACK_OF(X509) **chain);
static int ts_check_signing_certs(const PKCS7_SIGNER_INFO *si,
- const STACK_OF(X509) *chain);
+ const STACK_OF(X509) *chain);
static int int_ts_RESP_verify_token(TS_VERIFY_CTX *ctx,
- PKCS7 *token, TS_TST_INFO *tst_info);
+ PKCS7 *token, TS_TST_INFO *tst_info);
static int ts_check_status_info(TS_RESP *response);
static char *ts_get_status_text(STACK_OF(ASN1_UTF8STRING) *text);
static int ts_check_policy(const ASN1_OBJECT *req_oid,
- const TS_TST_INFO *tst_info);
+ const TS_TST_INFO *tst_info);
static int ts_compute_imprint(BIO *data, TS_TST_INFO *tst_info,
- X509_ALGOR **md_alg,
- unsigned char **imprint, unsigned *imprint_len);
+ X509_ALGOR **md_alg,
+ unsigned char **imprint, unsigned *imprint_len);
static int ts_check_imprints(X509_ALGOR *algor_a,
- const unsigned char *imprint_a, unsigned len_a,
- TS_TST_INFO *tst_info);
+ const unsigned char *imprint_a, unsigned len_a,
+ TS_TST_INFO *tst_info);
static int ts_check_nonces(const ASN1_INTEGER *a, TS_TST_INFO *tst_info);
static int ts_check_signer_name(GENERAL_NAME *tsa_name, X509 *signer);
static int ts_find_name(STACK_OF(GENERAL_NAME) *gen_names,
- GENERAL_NAME *name);
+ GENERAL_NAME *name);
/*
* This must be large enough to hold all values in ts_status_text (with
* comma separator) or all text fields in ts_failure_info (also with comma).
*/
-#define TS_STATUS_BUF_SIZE 256
+#define TS_STATUS_BUF_SIZE 256
/*
* Local mapping between response codes and descriptions.
@@ -56,23 +56,22 @@ static const char *ts_status_text[] = {
"revocationNotification"
};
-#define TS_STATUS_TEXT_SIZE OSSL_NELEM(ts_status_text)
+#define TS_STATUS_TEXT_SIZE OSSL_NELEM(ts_status_text)
static const struct {
int code;
const char *text;
} ts_failure_info[] = {
- {TS_INFO_BAD_ALG, "badAlg"},
- {TS_INFO_BAD_REQUEST, "badRequest"},
- {TS_INFO_BAD_DATA_FORMAT, "badDataFormat"},
- {TS_INFO_TIME_NOT_AVAILABLE, "timeNotAvailable"},
- {TS_INFO_UNACCEPTED_POLICY, "unacceptedPolicy"},
- {TS_INFO_UNACCEPTED_EXTENSION, "unacceptedExtension"},
- {TS_INFO_ADD_INFO_NOT_AVAILABLE, "addInfoNotAvailable"},
- {TS_INFO_SYSTEM_FAILURE, "systemFailure"}
+ { TS_INFO_BAD_ALG, "badAlg" },
+ { TS_INFO_BAD_REQUEST, "badRequest" },
+ { TS_INFO_BAD_DATA_FORMAT, "badDataFormat" },
+ { TS_INFO_TIME_NOT_AVAILABLE, "timeNotAvailable" },
+ { TS_INFO_UNACCEPTED_POLICY, "unacceptedPolicy" },
+ { TS_INFO_UNACCEPTED_EXTENSION, "unacceptedExtension" },
+ { TS_INFO_ADD_INFO_NOT_AVAILABLE, "addInfoNotAvailable" },
+ { TS_INFO_SYSTEM_FAILURE, "systemFailure" }
};
-
/*-
* This function carries out the following tasks:
* - Checks if there is one and only one signer.
@@ -86,7 +85,7 @@ static const struct {
* - Returns the signer certificate in 'signer', if 'signer' is not NULL.
*/
int TS_RESP_verify_signature(PKCS7 *token, STACK_OF(X509) *certs,
- X509_STORE *store, X509 **signer_out)
+ X509_STORE *store, X509 **signer_out)
{
STACK_OF(PKCS7_SIGNER_INFO) *sinfos = NULL;
PKCS7_SIGNER_INFO *si;
@@ -127,11 +126,10 @@ int TS_RESP_verify_signature(PKCS7 *token, STACK_OF(X509) *certs,
goto err;
signer = sk_X509_value(signers, 0);
- untrusted = sk_X509_new_reserve(NULL, sk_X509_num(certs)
- + sk_X509_num(token->d.sign->cert));
+ untrusted = sk_X509_new_reserve(NULL, sk_X509_num(certs) + sk_X509_num(token->d.sign->cert));
if (untrusted == NULL
- || !X509_add_certs(untrusted, certs, 0)
- || !X509_add_certs(untrusted, token->d.sign->cert, 0))
+ || !X509_add_certs(untrusted, certs, 0)
+ || !X509_add_certs(untrusted, token->d.sign->cert, 0))
goto err;
if (!ts_verify_cert(store, untrusted, signer, &chain))
goto err;
@@ -157,7 +155,7 @@ int TS_RESP_verify_signature(PKCS7 *token, STACK_OF(X509) *certs,
}
ret = 1;
- err:
+err:
BIO_free_all(p7bio);
sk_X509_free(untrusted);
OSSL_STACK_OF_X509_free(chain);
@@ -171,7 +169,7 @@ int TS_RESP_verify_signature(PKCS7 *token, STACK_OF(X509) *certs,
* freeing the vector.
*/
static int ts_verify_cert(X509_STORE *store, STACK_OF(X509) *untrusted,
- X509 *signer, STACK_OF(X509) **chain)
+ X509 *signer, STACK_OF(X509) **chain)
{
X509_STORE_CTX *cert_ctx = NULL;
int i;
@@ -190,7 +188,7 @@ static int ts_verify_cert(X509_STORE *store, STACK_OF(X509) *untrusted,
if (i <= 0) {
int j = X509_STORE_CTX_get_error(cert_ctx);
ERR_raise_data(ERR_LIB_TS, TS_R_CERTIFICATE_VERIFY_ERROR,
- "Verify error:%s", X509_verify_cert_error_string(j));
+ "Verify error:%s", X509_verify_cert_error_string(j));
goto err;
}
*chain = X509_STORE_CTX_get1_chain(cert_ctx);
@@ -217,8 +215,7 @@ static ESS_SIGNING_CERT *ossl_ess_get_signing_cert(const PKCS7_SIGNER_INFO *si)
return d2i_ESS_SIGNING_CERT(NULL, &p, attr->value.sequence->length);
}
-static
-ESS_SIGNING_CERT_V2 *ossl_ess_get_signing_cert_v2(const PKCS7_SIGNER_INFO *si)
+static ESS_SIGNING_CERT_V2 *ossl_ess_get_signing_cert_v2(const PKCS7_SIGNER_INFO *si)
{
ASN1_TYPE *attr;
const unsigned char *p;
@@ -231,7 +228,7 @@ ESS_SIGNING_CERT_V2 *ossl_ess_get_signing_cert_v2(const PKCS7_SIGNER_INFO *si)
}
static int ts_check_signing_certs(const PKCS7_SIGNER_INFO *si,
- const STACK_OF(X509) *chain)
+ const STACK_OF(X509) *chain)
{
ESS_SIGNING_CERT *ss = ossl_ess_get_signing_cert(si);
ESS_SIGNING_CERT_V2 *ssv2 = ossl_ess_get_signing_cert_v2(si);
@@ -260,7 +257,7 @@ int TS_RESP_verify_response(TS_VERIFY_CTX *ctx, TS_RESP *response)
goto err;
ret = 1;
- err:
+err:
return ret;
}
@@ -292,7 +289,7 @@ int TS_RESP_verify_token(TS_VERIFY_CTX *ctx, PKCS7 *token)
* - Check if the TSA name is the expected TSA.
*/
static int int_ts_RESP_verify_token(TS_VERIFY_CTX *ctx,
- PKCS7 *token, TS_TST_INFO *tst_info)
+ PKCS7 *token, TS_TST_INFO *tst_info)
{
X509 *signer = NULL;
GENERAL_NAME *tsa_name = tst_info->tsa;
@@ -304,7 +301,7 @@ static int int_ts_RESP_verify_token(TS_VERIFY_CTX *ctx,
/* Some options require us to also check the signature */
if (((flags & TS_VFY_SIGNER) && tsa_name != NULL)
- || (flags & TS_VFY_TSA_NAME)) {
+ || (flags & TS_VFY_TSA_NAME)) {
flags |= TS_VFY_SIGNATURE;
}
@@ -321,11 +318,11 @@ static int int_ts_RESP_verify_token(TS_VERIFY_CTX *ctx,
goto err;
if ((flags & TS_VFY_IMPRINT)
&& !ts_check_imprints(ctx->md_alg, ctx->imprint, ctx->imprint_len,
- tst_info))
+ tst_info))
goto err;
if ((flags & TS_VFY_DATA)
&& (!ts_compute_imprint(ctx->data, tst_info,
- &md_alg, &imprint, &imprint_len)
+ &md_alg, &imprint, &imprint_len)
|| !ts_check_imprints(md_alg, imprint, imprint_len, tst_info)))
goto err;
if ((flags & TS_VFY_NONCE)
@@ -343,7 +340,7 @@ static int int_ts_RESP_verify_token(TS_VERIFY_CTX *ctx,
}
ret = 1;
- err:
+err:
X509_free(signer);
X509_ALGOR_free(md_alg);
OPENSSL_free(imprint);
@@ -362,7 +359,7 @@ static int ts_check_status_info(TS_RESP *response)
return 1;
/* There was an error, get the description in status_text. */
- if (0 <= status && status < (long) OSSL_NELEM(ts_status_text))
+ if (0 <= status && status < (long)OSSL_NELEM(ts_status_text))
status_text = ts_status_text[status];
else
status_text = "unknown code";
@@ -377,7 +374,7 @@ static int ts_check_status_info(TS_RESP *response)
int first = 1;
for (i = 0; i < (int)OSSL_NELEM(ts_failure_info); ++i) {
if (ASN1_BIT_STRING_get_bit(info->failure_info,
- ts_failure_info[i].code)) {
+ ts_failure_info[i].code)) {
if (!first)
strcat(failure_text, ",");
else
@@ -390,10 +387,10 @@ static int ts_check_status_info(TS_RESP *response)
strcpy(failure_text, "unspecified");
ERR_raise_data(ERR_LIB_TS, TS_R_NO_TIME_STAMP_TOKEN,
- "status code: %s, status text: %s, failure codes: %s",
- status_text,
- embedded_status_text ? embedded_status_text : "unspecified",
- failure_text);
+ "status code: %s, status text: %s, failure codes: %s",
+ status_text,
+ embedded_status_text ? embedded_status_text : "unspecified",
+ failure_text);
OPENSSL_free(embedded_status_text);
return 0;
@@ -405,7 +402,7 @@ static char *ts_get_status_text(STACK_OF(ASN1_UTF8STRING) *text)
}
static int ts_check_policy(const ASN1_OBJECT *req_oid,
- const TS_TST_INFO *tst_info)
+ const TS_TST_INFO *tst_info)
{
const ASN1_OBJECT *resp_oid = tst_info->policy_id;
@@ -418,8 +415,8 @@ static int ts_check_policy(const ASN1_OBJECT *req_oid,
}
static int ts_compute_imprint(BIO *data, TS_TST_INFO *tst_info,
- X509_ALGOR **md_alg,
- unsigned char **imprint, unsigned *imprint_len)
+ X509_ALGOR **md_alg,
+ unsigned char **imprint, unsigned *imprint_len)
{
TS_MSG_IMPRINT *msg_imprint = tst_info->msg_imprint;
X509_ALGOR *md_alg_resp = msg_imprint->hash_algo;
@@ -474,7 +471,7 @@ static int ts_compute_imprint(BIO *data, TS_TST_INFO *tst_info,
EVP_MD_CTX_free(md_ctx);
return 1;
- err:
+err:
EVP_MD_CTX_free(md_ctx);
EVP_MD_free(md);
X509_ALGOR_free(*md_alg);
@@ -486,8 +483,8 @@ static int ts_compute_imprint(BIO *data, TS_TST_INFO *tst_info,
}
static int ts_check_imprints(X509_ALGOR *algor_a,
- const unsigned char *imprint_a, unsigned len_a,
- TS_TST_INFO *tst_info)
+ const unsigned char *imprint_a, unsigned len_a,
+ TS_TST_INFO *tst_info)
{
TS_MSG_IMPRINT *b = tst_info->msg_imprint;
X509_ALGOR *algor_b = b->hash_algo;
@@ -499,15 +496,14 @@ static int ts_check_imprints(X509_ALGOR *algor_a,
/* The parameter must be NULL in both. */
if ((algor_a->parameter
- && ASN1_TYPE_get(algor_a->parameter) != V_ASN1_NULL)
+ && ASN1_TYPE_get(algor_a->parameter) != V_ASN1_NULL)
|| (algor_b->parameter
&& ASN1_TYPE_get(algor_b->parameter) != V_ASN1_NULL))
goto err;
}
- ret = len_a == (unsigned)ASN1_STRING_length(b->hashed_msg) &&
- memcmp(imprint_a, ASN1_STRING_get0_data(b->hashed_msg), len_a) == 0;
- err:
+ ret = len_a == (unsigned)ASN1_STRING_length(b->hashed_msg) && memcmp(imprint_a, ASN1_STRING_get0_data(b->hashed_msg), len_a) == 0;
+err:
if (!ret)
ERR_raise(ERR_LIB_TS, TS_R_MESSAGE_IMPRINT_MISMATCH);
return ret;
diff --git a/crypto/ts/ts_verify_ctx.c b/crypto/ts/ts_verify_ctx.c
index 4b6a3ada9b..ec9993ed9f 100644
--- a/crypto/ts/ts_verify_ctx.c
+++ b/crypto/ts/ts_verify_ctx.c
@@ -78,7 +78,7 @@ int TS_VERIFY_CTX_set0_store(TS_VERIFY_CTX *ctx, X509_STORE *s)
#ifndef OPENSSL_NO_DEPRECATED_3_4
STACK_OF(X509) *TS_VERIFY_CTX_set_certs(TS_VERIFY_CTX *ctx,
- STACK_OF(X509) *certs)
+ STACK_OF(X509) *certs)
{
ctx->certs = certs;
return ctx->certs;
@@ -94,7 +94,7 @@ int TS_VERIFY_CTX_set0_certs(TS_VERIFY_CTX *ctx, STACK_OF(X509) *certs)
#ifndef OPENSSL_NO_DEPRECATED_3_4
unsigned char *TS_VERIFY_CTX_set_imprint(TS_VERIFY_CTX *ctx,
- unsigned char *hexstr, long len)
+ unsigned char *hexstr, long len)
{
OPENSSL_free(ctx->imprint);
ctx->imprint = hexstr;
@@ -104,7 +104,7 @@ unsigned char *TS_VERIFY_CTX_set_imprint(TS_VERIFY_CTX *ctx,
#endif
int TS_VERIFY_CTX_set0_imprint(TS_VERIFY_CTX *ctx,
- unsigned char *hexstr, long len)
+ unsigned char *hexstr, long len)
{
OPENSSL_free(ctx->imprint);
ctx->imprint = hexstr;
@@ -176,7 +176,7 @@ TS_VERIFY_CTX *TS_REQ_to_TS_VERIFY_CTX(TS_REQ *req, TS_VERIFY_CTX *ctx)
ret->flags &= ~TS_VFY_NONCE;
return ret;
- err:
+err:
if (ctx)
TS_VERIFY_CTX_cleanup(ctx);
else
diff --git a/crypto/txt_db/txt_db.c b/crypto/txt_db/txt_db.c
index 96edc67c97..902ea2b97c 100644
--- a/crypto/txt_db/txt_db.c
+++ b/crypto/txt_db/txt_db.c
@@ -113,7 +113,7 @@ TXT_DB *TXT_DB_read(BIO *in, int num)
}
BUF_MEM_free(buf);
return ret;
- err:
+err:
BUF_MEM_free(buf);
if (ret != NULL) {
sk_OPENSSL_PSTRING_free(ret->data);
@@ -125,7 +125,7 @@ TXT_DB *TXT_DB_read(BIO *in, int num)
}
OPENSSL_STRING *TXT_DB_get_by_index(TXT_DB *db, int idx,
- OPENSSL_STRING *value)
+ OPENSSL_STRING *value)
{
OPENSSL_STRING *ret;
LHASH_OF(OPENSSL_STRING) *lh;
@@ -144,8 +144,8 @@ OPENSSL_STRING *TXT_DB_get_by_index(TXT_DB *db, int idx,
return ret;
}
-int TXT_DB_create_index(TXT_DB *db, int field, int (*qual) (OPENSSL_STRING *),
- OPENSSL_LH_HASHFUNC hash, OPENSSL_LH_COMPFUNC cmp)
+int TXT_DB_create_index(TXT_DB *db, int field, int (*qual)(OPENSSL_STRING *),
+ OPENSSL_LH_HASHFUNC hash, OPENSSL_LH_COMPFUNC cmp)
{
LHASH_OF(OPENSSL_STRING) *idx;
OPENSSL_STRING *r, *k;
@@ -226,7 +226,7 @@ long TXT_DB_write(BIO *out, TXT_DB *db)
tot += j;
}
ret = tot;
- err:
+err:
BUF_MEM_free(buf);
return ret;
}
@@ -238,7 +238,7 @@ int TXT_DB_insert(TXT_DB *db, OPENSSL_STRING *row)
for (i = 0; i < db->num_fields; i++) {
if (db->index[i] != NULL) {
- if ((db->qual[i] != NULL) && (db->qual[i] (row) == 0))
+ if ((db->qual[i] != NULL) && (db->qual[i](row) == 0))
continue;
r = lh_OPENSSL_STRING_retrieve(db->index[i], row);
if (r != NULL) {
@@ -252,7 +252,7 @@ int TXT_DB_insert(TXT_DB *db, OPENSSL_STRING *row)
for (i = 0; i < db->num_fields; i++) {
if (db->index[i] != NULL) {
- if ((db->qual[i] != NULL) && (db->qual[i] (row) == 0))
+ if ((db->qual[i] != NULL) && (db->qual[i](row) == 0))
continue;
(void)lh_OPENSSL_STRING_insert(db->index[i], row);
if (lh_OPENSSL_STRING_retrieve(db->index[i], row) == NULL)
@@ -263,16 +263,16 @@ int TXT_DB_insert(TXT_DB *db, OPENSSL_STRING *row)
goto err1;
return 1;
- err1:
+err1:
db->error = DB_ERROR_MALLOC;
while (i-- > 0) {
if (db->index[i] != NULL) {
- if ((db->qual[i] != NULL) && (db->qual[i] (row) == 0))
+ if ((db->qual[i] != NULL) && (db->qual[i](row) == 0))
continue;
(void)lh_OPENSSL_STRING_delete(db->index[i], row);
}
}
- err:
+err:
return 0;
}
@@ -297,7 +297,7 @@ void TXT_DB_free(TXT_DB *db)
*/
p = sk_OPENSSL_PSTRING_value(db->data, i);
max = p[db->num_fields]; /* last address */
- if (max == NULL) { /* new row */
+ if (max == NULL) { /* new row */
for (n = 0; n < db->num_fields; n++)
OPENSSL_free(p[n]);
} else {
diff --git a/crypto/ui/ui_err.c b/crypto/ui/ui_err.c
index 9b9c121332..1c21b3a4f7 100644
--- a/crypto/ui/ui_err.c
+++ b/crypto/ui/ui_err.c
@@ -15,24 +15,24 @@
#ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA UI_str_reasons[] = {
- {ERR_PACK(ERR_LIB_UI, 0, UI_R_COMMON_OK_AND_CANCEL_CHARACTERS),
- "common ok and cancel characters"},
- {ERR_PACK(ERR_LIB_UI, 0, UI_R_INDEX_TOO_LARGE), "index too large"},
- {ERR_PACK(ERR_LIB_UI, 0, UI_R_INDEX_TOO_SMALL), "index too small"},
- {ERR_PACK(ERR_LIB_UI, 0, UI_R_NO_RESULT_BUFFER), "no result buffer"},
- {ERR_PACK(ERR_LIB_UI, 0, UI_R_PROCESSING_ERROR), "processing error"},
- {ERR_PACK(ERR_LIB_UI, 0, UI_R_RESULT_TOO_LARGE), "result too large"},
- {ERR_PACK(ERR_LIB_UI, 0, UI_R_RESULT_TOO_SMALL), "result too small"},
- {ERR_PACK(ERR_LIB_UI, 0, UI_R_SYSASSIGN_ERROR), "sys$assign error"},
- {ERR_PACK(ERR_LIB_UI, 0, UI_R_SYSDASSGN_ERROR), "sys$dassgn error"},
- {ERR_PACK(ERR_LIB_UI, 0, UI_R_SYSQIOW_ERROR), "sys$qiow error"},
- {ERR_PACK(ERR_LIB_UI, 0, UI_R_UNKNOWN_CONTROL_COMMAND),
- "unknown control command"},
- {ERR_PACK(ERR_LIB_UI, 0, UI_R_UNKNOWN_TTYGET_ERRNO_VALUE),
- "unknown ttyget errno value"},
- {ERR_PACK(ERR_LIB_UI, 0, UI_R_USER_DATA_DUPLICATION_UNSUPPORTED),
- "user data duplication unsupported"},
- {0, NULL}
+ { ERR_PACK(ERR_LIB_UI, 0, UI_R_COMMON_OK_AND_CANCEL_CHARACTERS),
+ "common ok and cancel characters" },
+ { ERR_PACK(ERR_LIB_UI, 0, UI_R_INDEX_TOO_LARGE), "index too large" },
+ { ERR_PACK(ERR_LIB_UI, 0, UI_R_INDEX_TOO_SMALL), "index too small" },
+ { ERR_PACK(ERR_LIB_UI, 0, UI_R_NO_RESULT_BUFFER), "no result buffer" },
+ { ERR_PACK(ERR_LIB_UI, 0, UI_R_PROCESSING_ERROR), "processing error" },
+ { ERR_PACK(ERR_LIB_UI, 0, UI_R_RESULT_TOO_LARGE), "result too large" },
+ { ERR_PACK(ERR_LIB_UI, 0, UI_R_RESULT_TOO_SMALL), "result too small" },
+ { ERR_PACK(ERR_LIB_UI, 0, UI_R_SYSASSIGN_ERROR), "sys$assign error" },
+ { ERR_PACK(ERR_LIB_UI, 0, UI_R_SYSDASSGN_ERROR), "sys$dassgn error" },
+ { ERR_PACK(ERR_LIB_UI, 0, UI_R_SYSQIOW_ERROR), "sys$qiow error" },
+ { ERR_PACK(ERR_LIB_UI, 0, UI_R_UNKNOWN_CONTROL_COMMAND),
+ "unknown control command" },
+ { ERR_PACK(ERR_LIB_UI, 0, UI_R_UNKNOWN_TTYGET_ERRNO_VALUE),
+ "unknown ttyget errno value" },
+ { ERR_PACK(ERR_LIB_UI, 0, UI_R_USER_DATA_DUPLICATION_UNSUPPORTED),
+ "user data duplication unsupported" },
+ { 0, NULL }
};
#endif
diff --git a/crypto/ui/ui_lib.c b/crypto/ui/ui_lib.c
index 12147ce425..addb6155e2 100644
--- a/crypto/ui/ui_lib.c
+++ b/crypto/ui/ui_lib.c
@@ -93,16 +93,17 @@ static int allocate_string_stack(UI *ui)
}
static UI_STRING *general_allocate_prompt(UI *ui, const char *prompt,
- int prompt_freeable,
- enum UI_string_types type,
- int input_flags, char *result_buf)
+ int prompt_freeable,
+ enum UI_string_types type,
+ int input_flags, char *result_buf)
{
UI_STRING *ret = NULL;
if (prompt == NULL) {
ERR_raise(ERR_LIB_UI, ERR_R_PASSED_NULL_PARAMETER);
} else if ((type == UIT_PROMPT || type == UIT_VERIFY
- || type == UIT_BOOLEAN) && result_buf == NULL) {
+ || type == UIT_BOOLEAN)
+ && result_buf == NULL) {
ERR_raise(ERR_LIB_UI, UI_R_NO_RESULT_BUFFER);
} else if ((ret = OPENSSL_zalloc(sizeof(*ret))) != NULL) {
ret->out_string = prompt;
@@ -115,14 +116,14 @@ static UI_STRING *general_allocate_prompt(UI *ui, const char *prompt,
}
static int general_allocate_string(UI *ui, const char *prompt,
- int prompt_freeable,
- enum UI_string_types type, int input_flags,
- char *result_buf, int minsize, int maxsize,
- const char *test_buf)
+ int prompt_freeable,
+ enum UI_string_types type, int input_flags,
+ char *result_buf, int minsize, int maxsize,
+ const char *test_buf)
{
int ret = -1;
UI_STRING *s = general_allocate_prompt(ui, prompt, prompt_freeable,
- type, input_flags, result_buf);
+ type, input_flags, result_buf);
if (s != NULL) {
if (allocate_string_stack(ui) >= 0) {
@@ -142,13 +143,13 @@ static int general_allocate_string(UI *ui, const char *prompt,
}
static int general_allocate_boolean(UI *ui,
- const char *prompt,
- const char *action_desc,
- const char *ok_chars,
- const char *cancel_chars,
- int prompt_freeable,
- enum UI_string_types type,
- int input_flags, char *result_buf)
+ const char *prompt,
+ const char *action_desc,
+ const char *ok_chars,
+ const char *cancel_chars,
+ int prompt_freeable,
+ enum UI_string_types type,
+ int input_flags, char *result_buf)
{
int ret = -1;
UI_STRING *s;
@@ -166,7 +167,7 @@ static int general_allocate_boolean(UI *ui,
}
s = general_allocate_prompt(ui, prompt, prompt_freeable,
- type, input_flags, result_buf);
+ type, input_flags, result_buf);
if (s != NULL) {
if (allocate_string_stack(ui) >= 0) {
@@ -193,16 +194,16 @@ static int general_allocate_boolean(UI *ui,
* direct reference to the prompt.
*/
int UI_add_input_string(UI *ui, const char *prompt, int flags,
- char *result_buf, int minsize, int maxsize)
+ char *result_buf, int minsize, int maxsize)
{
return general_allocate_string(ui, prompt, 0,
- UIT_PROMPT, flags, result_buf, minsize,
- maxsize, NULL);
+ UIT_PROMPT, flags, result_buf, minsize,
+ maxsize, NULL);
}
/* Same as UI_add_input_string(), excepts it takes a copy of the prompt */
int UI_dup_input_string(UI *ui, const char *prompt, int flags,
- char *result_buf, int minsize, int maxsize)
+ char *result_buf, int minsize, int maxsize)
{
char *prompt_copy = NULL;
int ret;
@@ -214,8 +215,8 @@ int UI_dup_input_string(UI *ui, const char *prompt, int flags,
}
ret = general_allocate_string(ui, prompt_copy, 1,
- UIT_PROMPT, flags, result_buf, minsize,
- maxsize, NULL);
+ UIT_PROMPT, flags, result_buf, minsize,
+ maxsize, NULL);
if (ret <= 0)
OPENSSL_free(prompt_copy);
@@ -223,17 +224,17 @@ int UI_dup_input_string(UI *ui, const char *prompt, int flags,
}
int UI_add_verify_string(UI *ui, const char *prompt, int flags,
- char *result_buf, int minsize, int maxsize,
- const char *test_buf)
+ char *result_buf, int minsize, int maxsize,
+ const char *test_buf)
{
return general_allocate_string(ui, prompt, 0,
- UIT_VERIFY, flags, result_buf, minsize,
- maxsize, test_buf);
+ UIT_VERIFY, flags, result_buf, minsize,
+ maxsize, test_buf);
}
int UI_dup_verify_string(UI *ui, const char *prompt, int flags,
- char *result_buf, int minsize, int maxsize,
- const char *test_buf)
+ char *result_buf, int minsize, int maxsize,
+ const char *test_buf)
{
char *prompt_copy = NULL;
int ret;
@@ -245,25 +246,25 @@ int UI_dup_verify_string(UI *ui, const char *prompt, int flags,
}
ret = general_allocate_string(ui, prompt_copy, 1,
- UIT_VERIFY, flags, result_buf, minsize,
- maxsize, test_buf);
+ UIT_VERIFY, flags, result_buf, minsize,
+ maxsize, test_buf);
if (ret <= 0)
OPENSSL_free(prompt_copy);
return ret;
}
int UI_add_input_boolean(UI *ui, const char *prompt, const char *action_desc,
- const char *ok_chars, const char *cancel_chars,
- int flags, char *result_buf)
+ const char *ok_chars, const char *cancel_chars,
+ int flags, char *result_buf)
{
return general_allocate_boolean(ui, prompt, action_desc,
- ok_chars, cancel_chars, 0, UIT_BOOLEAN,
- flags, result_buf);
+ ok_chars, cancel_chars, 0, UIT_BOOLEAN,
+ flags, result_buf);
}
int UI_dup_input_boolean(UI *ui, const char *prompt, const char *action_desc,
- const char *ok_chars, const char *cancel_chars,
- int flags, char *result_buf)
+ const char *ok_chars, const char *cancel_chars,
+ int flags, char *result_buf)
{
char *prompt_copy = NULL;
char *action_desc_copy = NULL;
@@ -296,14 +297,14 @@ int UI_dup_input_boolean(UI *ui, const char *prompt, const char *action_desc,
}
ret = general_allocate_boolean(ui, prompt_copy, action_desc_copy,
- ok_chars_copy, cancel_chars_copy, 1,
- UIT_BOOLEAN, flags, result_buf);
+ ok_chars_copy, cancel_chars_copy, 1,
+ UIT_BOOLEAN, flags, result_buf);
if (ret <= 0)
goto err;
return ret;
- err:
+err:
OPENSSL_free(prompt_copy);
OPENSSL_free(action_desc_copy);
OPENSSL_free(ok_chars_copy);
@@ -314,7 +315,7 @@ int UI_dup_input_boolean(UI *ui, const char *prompt, const char *action_desc,
int UI_add_info_string(UI *ui, const char *text)
{
return general_allocate_string(ui, text, 0, UIT_INFO, 0, NULL, 0, 0,
- NULL);
+ NULL);
}
int UI_dup_info_string(UI *ui, const char *text)
@@ -329,7 +330,7 @@ int UI_dup_info_string(UI *ui, const char *text)
}
ret = general_allocate_string(ui, text_copy, 1, UIT_INFO, 0, NULL,
- 0, 0, NULL);
+ 0, 0, NULL);
if (ret <= 0)
OPENSSL_free(text_copy);
return ret;
@@ -338,7 +339,7 @@ int UI_dup_info_string(UI *ui, const char *text)
int UI_add_error_string(UI *ui, const char *text)
{
return general_allocate_string(ui, text, 0, UIT_ERROR, 0, NULL, 0, 0,
- NULL);
+ NULL);
}
int UI_dup_error_string(UI *ui, const char *text)
@@ -353,14 +354,14 @@ int UI_dup_error_string(UI *ui, const char *text)
}
ret = general_allocate_string(ui, text_copy, 1, UIT_ERROR, 0, NULL,
- 0, 0, NULL);
+ 0, 0, NULL);
if (ret <= 0)
OPENSSL_free(text_copy);
return ret;
}
char *UI_construct_prompt(UI *ui, const char *phrase_desc,
- const char *object_name)
+ const char *object_name)
{
char *prompt = NULL;
@@ -486,14 +487,14 @@ int UI_process(UI *ui)
if (ui->flags & UI_FLAG_PRINT_ERRORS)
ERR_print_errors_cb((int (*)(const char *, size_t, void *))
- print_error, (void *)ui);
+ print_error,
+ (void *)ui);
for (i = 0; i < sk_UI_STRING_num(ui->strings); i++) {
if (ui->meth->ui_write_string != NULL
&& (ui->meth->ui_write_string(ui,
- sk_UI_STRING_value(ui->strings, i))
- <= 0))
- {
+ sk_UI_STRING_value(ui->strings, i))
+ <= 0)) {
state = "writing strings";
ok = -1;
goto err;
@@ -502,15 +503,15 @@ int UI_process(UI *ui)
if (ui->meth->ui_flush != NULL)
switch (ui->meth->ui_flush(ui)) {
- case -1: /* Interrupt/Cancel/something... */
+ case -1: /* Interrupt/Cancel/something... */
ui->flags &= ~UI_FLAG_REDOABLE;
ok = -2;
goto err;
- case 0: /* Errors */
+ case 0: /* Errors */
state = "flushing";
ok = -1;
goto err;
- default: /* Success */
+ default: /* Success */
ok = 0;
break;
}
@@ -518,17 +519,17 @@ int UI_process(UI *ui)
for (i = 0; i < sk_UI_STRING_num(ui->strings); i++) {
if (ui->meth->ui_read_string != NULL) {
switch (ui->meth->ui_read_string(ui,
- sk_UI_STRING_value(ui->strings,
- i))) {
- case -1: /* Interrupt/Cancel/something... */
+ sk_UI_STRING_value(ui->strings,
+ i))) {
+ case -1: /* Interrupt/Cancel/something... */
ui->flags &= ~UI_FLAG_REDOABLE;
ok = -2;
goto err;
- case 0: /* Errors */
+ case 0: /* Errors */
state = "reading strings";
ok = -1;
goto err;
- default: /* Success */
+ default: /* Success */
ok = 0;
break;
}
@@ -540,7 +541,7 @@ int UI_process(UI *ui)
}
state = NULL;
- err:
+err:
if (ui->meth->ui_close_session != NULL
&& ui->meth->ui_close_session(ui) <= 0) {
if (state == NULL)
@@ -553,24 +554,23 @@ int UI_process(UI *ui)
return ok;
}
-int UI_ctrl(UI *ui, int cmd, long i, void *p, void (*f) (void))
+int UI_ctrl(UI *ui, int cmd, long i, void *p, void (*f)(void))
{
if (ui == NULL) {
ERR_raise(ERR_LIB_UI, ERR_R_PASSED_NULL_PARAMETER);
return -1;
}
switch (cmd) {
- case UI_CTRL_PRINT_ERRORS:
- {
- int save_flag = ! !(ui->flags & UI_FLAG_PRINT_ERRORS);
- if (i)
- ui->flags |= UI_FLAG_PRINT_ERRORS;
- else
- ui->flags &= ~UI_FLAG_PRINT_ERRORS;
- return save_flag;
- }
+ case UI_CTRL_PRINT_ERRORS: {
+ int save_flag = !!(ui->flags & UI_FLAG_PRINT_ERRORS);
+ if (i)
+ ui->flags |= UI_FLAG_PRINT_ERRORS;
+ else
+ ui->flags &= ~UI_FLAG_PRINT_ERRORS;
+ return save_flag;
+ }
case UI_CTRL_IS_REDOABLE:
- return ! !(ui->flags & UI_FLAG_REDOABLE);
+ return !!(ui->flags & UI_FLAG_REDOABLE);
default:
break;
}
@@ -606,7 +606,7 @@ UI_METHOD *UI_create_method(const char *name)
if ((ui_method = OPENSSL_zalloc(sizeof(*ui_method))) == NULL
|| (ui_method->name = OPENSSL_strdup(name)) == NULL
|| !CRYPTO_new_ex_data(CRYPTO_EX_INDEX_UI_METHOD, ui_method,
- &ui_method->ex_data)) {
+ &ui_method->ex_data)) {
if (ui_method != NULL) {
if (ui_method->name != NULL)
@@ -633,13 +633,13 @@ void UI_destroy_method(UI_METHOD *ui_method)
if (ui_method == NULL)
return;
CRYPTO_free_ex_data(CRYPTO_EX_INDEX_UI_METHOD, ui_method,
- &ui_method->ex_data);
+ &ui_method->ex_data);
OPENSSL_free(ui_method->name);
ui_method->name = NULL;
OPENSSL_free(ui_method);
}
-int UI_method_set_opener(UI_METHOD *method, int (*opener) (UI *ui))
+int UI_method_set_opener(UI_METHOD *method, int (*opener)(UI *ui))
{
if (method != NULL) {
method->ui_open_session = opener;
@@ -649,7 +649,7 @@ int UI_method_set_opener(UI_METHOD *method, int (*opener) (UI *ui))
}
int UI_method_set_writer(UI_METHOD *method,
- int (*writer) (UI *ui, UI_STRING *uis))
+ int (*writer)(UI *ui, UI_STRING *uis))
{
if (method != NULL) {
method->ui_write_string = writer;
@@ -658,7 +658,7 @@ int UI_method_set_writer(UI_METHOD *method,
return -1;
}
-int UI_method_set_flusher(UI_METHOD *method, int (*flusher) (UI *ui))
+int UI_method_set_flusher(UI_METHOD *method, int (*flusher)(UI *ui))
{
if (method != NULL) {
method->ui_flush = flusher;
@@ -668,7 +668,7 @@ int UI_method_set_flusher(UI_METHOD *method, int (*flusher) (UI *ui))
}
int UI_method_set_reader(UI_METHOD *method,
- int (*reader) (UI *ui, UI_STRING *uis))
+ int (*reader)(UI *ui, UI_STRING *uis))
{
if (method != NULL) {
method->ui_read_string = reader;
@@ -677,7 +677,7 @@ int UI_method_set_reader(UI_METHOD *method,
return -1;
}
-int UI_method_set_closer(UI_METHOD *method, int (*closer) (UI *ui))
+int UI_method_set_closer(UI_METHOD *method, int (*closer)(UI *ui))
{
if (method != NULL) {
method->ui_close_session = closer;
@@ -687,8 +687,8 @@ int UI_method_set_closer(UI_METHOD *method, int (*closer) (UI *ui))
}
int UI_method_set_data_duplicator(UI_METHOD *method,
- void *(*duplicator) (UI *ui, void *ui_data),
- void (*destructor)(UI *ui, void *ui_data))
+ void *(*duplicator)(UI *ui, void *ui_data),
+ void (*destructor)(UI *ui, void *ui_data))
{
if (method != NULL) {
method->ui_duplicate_data = duplicator;
@@ -699,9 +699,9 @@ int UI_method_set_data_duplicator(UI_METHOD *method,
}
int UI_method_set_prompt_constructor(UI_METHOD *method,
- char *(*prompt_constructor) (UI *ui,
- const char *,
- const char *))
+ char *(*prompt_constructor)(UI *ui,
+ const char *,
+ const char *))
{
if (method != NULL) {
method->ui_construct_prompt = prompt_constructor;
@@ -715,57 +715,56 @@ int UI_method_set_ex_data(UI_METHOD *method, int idx, void *data)
return CRYPTO_set_ex_data(&method->ex_data, idx, data);
}
-int (*UI_method_get_opener(const UI_METHOD *method)) (UI *)
+int (*UI_method_get_opener(const UI_METHOD *method))(UI *)
{
if (method != NULL)
return method->ui_open_session;
return NULL;
}
-int (*UI_method_get_writer(const UI_METHOD *method)) (UI *, UI_STRING *)
+int (*UI_method_get_writer(const UI_METHOD *method))(UI *, UI_STRING *)
{
if (method != NULL)
return method->ui_write_string;
return NULL;
}
-int (*UI_method_get_flusher(const UI_METHOD *method)) (UI *)
+int (*UI_method_get_flusher(const UI_METHOD *method))(UI *)
{
if (method != NULL)
return method->ui_flush;
return NULL;
}
-int (*UI_method_get_reader(const UI_METHOD *method)) (UI *, UI_STRING *)
+int (*UI_method_get_reader(const UI_METHOD *method))(UI *, UI_STRING *)
{
if (method != NULL)
return method->ui_read_string;
return NULL;
}
-int (*UI_method_get_closer(const UI_METHOD *method)) (UI *)
+int (*UI_method_get_closer(const UI_METHOD *method))(UI *)
{
if (method != NULL)
return method->ui_close_session;
return NULL;
}
-char *(*UI_method_get_prompt_constructor(const UI_METHOD *method))
- (UI *, const char *, const char *)
+char *(*UI_method_get_prompt_constructor(const UI_METHOD *method))(UI *, const char *, const char *)
{
if (method != NULL)
return method->ui_construct_prompt;
return NULL;
}
-void *(*UI_method_get_data_duplicator(const UI_METHOD *method)) (UI *, void *)
+void *(*UI_method_get_data_duplicator(const UI_METHOD *method))(UI *, void *)
{
if (method != NULL)
return method->ui_duplicate_data;
return NULL;
}
-void (*UI_method_get_data_destructor(const UI_METHOD *method)) (UI *, void *)
+void (*UI_method_get_data_destructor(const UI_METHOD *method))(UI *, void *)
{
if (method != NULL)
return method->ui_destroy_data;
@@ -897,17 +896,17 @@ int UI_set_result_ex(UI *ui, UI_STRING *uis, const char *result, int len)
if (len < uis->_.string_data.result_minsize) {
ui->flags |= UI_FLAG_REDOABLE;
ERR_raise_data(ERR_LIB_UI, UI_R_RESULT_TOO_SMALL,
- "You must type in %d to %d characters",
- uis->_.string_data.result_minsize,
- uis->_.string_data.result_maxsize);
+ "You must type in %d to %d characters",
+ uis->_.string_data.result_minsize,
+ uis->_.string_data.result_maxsize);
return -1;
}
if (len > uis->_.string_data.result_maxsize) {
ui->flags |= UI_FLAG_REDOABLE;
ERR_raise_data(ERR_LIB_UI, UI_R_RESULT_TOO_LARGE,
- "You must type in %d to %d characters",
- uis->_.string_data.result_minsize,
- uis->_.string_data.result_maxsize);
+ "You must type in %d to %d characters",
+ uis->_.string_data.result_minsize,
+ uis->_.string_data.result_maxsize);
return -1;
}
@@ -921,27 +920,26 @@ int UI_set_result_ex(UI *ui, UI_STRING *uis, const char *result, int len)
uis->result_buf[len] = '\0';
uis->result_len = len;
break;
- case UIT_BOOLEAN:
- {
- const char *p;
+ case UIT_BOOLEAN: {
+ const char *p;
- if (uis->result_buf == NULL) {
- ERR_raise(ERR_LIB_UI, UI_R_NO_RESULT_BUFFER);
- return -1;
- }
+ if (uis->result_buf == NULL) {
+ ERR_raise(ERR_LIB_UI, UI_R_NO_RESULT_BUFFER);
+ return -1;
+ }
- uis->result_buf[0] = '\0';
- for (p = result; *p; p++) {
- if (strchr(uis->_.boolean_data.ok_chars, *p)) {
- uis->result_buf[0] = uis->_.boolean_data.ok_chars[0];
- break;
- }
- if (strchr(uis->_.boolean_data.cancel_chars, *p)) {
- uis->result_buf[0] = uis->_.boolean_data.cancel_chars[0];
- break;
- }
+ uis->result_buf[0] = '\0';
+ for (p = result; *p; p++) {
+ if (strchr(uis->_.boolean_data.ok_chars, *p)) {
+ uis->result_buf[0] = uis->_.boolean_data.ok_chars[0];
+ break;
+ }
+ if (strchr(uis->_.boolean_data.cancel_chars, *p)) {
+ uis->result_buf[0] = uis->_.boolean_data.cancel_chars[0];
+ break;
}
}
+ }
case UIT_NONE:
case UIT_INFO:
case UIT_ERROR:
diff --git a/crypto/ui/ui_local.h b/crypto/ui/ui_local.h
index 36b3e6194b..7bd5eff692 100644
--- a/crypto/ui/ui_local.h
+++ b/crypto/ui/ui_local.h
@@ -8,14 +8,14 @@
*/
#ifndef OSSL_CRYPTO_UI_LOCAL_H
-# define OSSL_CRYPTO_UI_LOCAL_H
+#define OSSL_CRYPTO_UI_LOCAL_H
-# include <openssl/ui.h>
-# include <openssl/crypto.h>
+#include <openssl/ui.h>
+#include <openssl/crypto.h>
-# ifdef _
-# undef _
-# endif
+#ifdef _
+#undef _
+#endif
struct ui_method_st {
char *name;
@@ -28,21 +28,21 @@ struct ui_method_st {
* whatever. This function should use the ex_data structure to save
* intermediate data.
*/
- int (*ui_open_session) (UI *ui);
- int (*ui_write_string) (UI *ui, UI_STRING *uis);
+ int (*ui_open_session)(UI *ui);
+ int (*ui_write_string)(UI *ui, UI_STRING *uis);
/*
* Flush the output. If a GUI dialog box is used, this function can be
* used to actually display it.
*/
- int (*ui_flush) (UI *ui);
- int (*ui_read_string) (UI *ui, UI_STRING *uis);
- int (*ui_close_session) (UI *ui);
+ int (*ui_flush)(UI *ui);
+ int (*ui_read_string)(UI *ui, UI_STRING *uis);
+ int (*ui_close_session)(UI *ui);
/*
* Duplicate the ui_data that often comes alongside a ui_method. This
* allows some backends to save away UI information for later use.
*/
- void *(*ui_duplicate_data) (UI *ui, void *ui_data);
- void (*ui_destroy_data) (UI *ui, void *ui_data);
+ void *(*ui_duplicate_data)(UI *ui, void *ui_data);
+ void (*ui_destroy_data)(UI *ui, void *ui_data);
/*
* Construct a prompt in a user-defined manner. object_desc is a textual
* short description of the object, for example "pass phrase", and
@@ -50,8 +50,8 @@ struct ui_method_st {
* name. The returned string shall always be allocated on the heap with
* OPENSSL_malloc(), and need to be free'd with OPENSSL_free().
*/
- char *(*ui_construct_prompt) (UI *ui, const char *object_desc,
- const char *object_name);
+ char *(*ui_construct_prompt)(UI *ui, const char *object_desc,
+ const char *object_name);
/*
* UI_METHOD specific application data.
*/
@@ -59,18 +59,18 @@ struct ui_method_st {
};
struct ui_string_st {
- enum UI_string_types type; /* Input */
- const char *out_string; /* Input */
- int input_flags; /* Flags from the user */
+ enum UI_string_types type; /* Input */
+ const char *out_string; /* Input */
+ int input_flags; /* Flags from the user */
/*
* The following parameters are completely irrelevant for UIT_INFO, and
* can therefore be set to 0 or NULL
*/
- char *result_buf; /* Input and Output: If not NULL,
- * user-defined with size in result_maxsize.
- * Otherwise, it may be allocated by the UI
- * routine, meaning result_minsize is going
- * to be overwritten. */
+ char *result_buf; /* Input and Output: If not NULL,
+ * user-defined with size in result_maxsize.
+ * Otherwise, it may be allocated by the UI
+ * routine, meaning result_minsize is going
+ * to be overwritten. */
size_t result_len;
union {
struct {
@@ -87,8 +87,8 @@ struct ui_string_st {
} boolean_data;
} _;
-# define OUT_STRING_FREEABLE 0x01
- int flags; /* flags for internal use */
+#define OUT_STRING_FREEABLE 0x01
+ int flags; /* flags for internal use */
};
struct ui_st {
@@ -98,9 +98,9 @@ struct ui_st {
* echoing status. */
void *user_data;
CRYPTO_EX_DATA ex_data;
-# define UI_FLAG_REDOABLE 0x0001
-# define UI_FLAG_DUPL_DATA 0x0002 /* user_data was duplicated */
-# define UI_FLAG_PRINT_ERRORS 0x0100
+#define UI_FLAG_REDOABLE 0x0001
+#define UI_FLAG_DUPL_DATA 0x0002 /* user_data was duplicated */
+#define UI_FLAG_PRINT_ERRORS 0x0100
int flags;
CRYPTO_RWLOCK *lock;
diff --git a/crypto/ui/ui_null.c b/crypto/ui/ui_null.c
index f002448d2c..999f21bc2a 100644
--- a/crypto/ui/ui_null.c
+++ b/crypto/ui/ui_null.c
@@ -11,11 +11,11 @@
static const UI_METHOD ui_null = {
"OpenSSL NULL UI",
- NULL, /* opener */
- NULL, /* writer */
- NULL, /* flusher */
- NULL, /* reader */
- NULL, /* closer */
+ NULL, /* opener */
+ NULL, /* writer */
+ NULL, /* flusher */
+ NULL, /* reader */
+ NULL, /* closer */
NULL
};
diff --git a/crypto/ui/ui_openssl.c b/crypto/ui/ui_openssl.c
index 544415e5b1..41823a739f 100644
--- a/crypto/ui/ui_openssl.c
+++ b/crypto/ui/ui_openssl.c
@@ -19,52 +19,52 @@
* sigaction and fileno included. -pedantic would be more appropriate for the
* intended purposes, but we can't prevent users from adding -ansi.
*/
-# if defined(OPENSSL_SYS_VXWORKS)
-# include <sys/types.h>
-# endif
-
-# if !defined(_POSIX_C_SOURCE) && defined(OPENSSL_SYS_VMS)
-# ifndef _POSIX_C_SOURCE
-# define _POSIX_C_SOURCE 2
-# endif
-# endif
-# include <signal.h>
-# include <stdio.h>
-# include <string.h>
-# include <errno.h>
-
-# if !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_VMS)
-# include <unistd.h>
+#if defined(OPENSSL_SYS_VXWORKS)
+#include <sys/types.h>
+#endif
+
+#if !defined(_POSIX_C_SOURCE) && defined(OPENSSL_SYS_VMS)
+#ifndef _POSIX_C_SOURCE
+#define _POSIX_C_SOURCE 2
+#endif
+#endif
+#include <signal.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+
+#if !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_VMS)
+#include <unistd.h>
/*
* If unistd.h defines _POSIX_VERSION, we conclude that we are on a POSIX
* system and have sigaction and termios.
*/
-# if defined(_POSIX_VERSION) && _POSIX_VERSION>=199309L
+#if defined(_POSIX_VERSION) && _POSIX_VERSION >= 199309L
-# define SIGACTION
-# if !defined(TERMIOS) && !defined(TERMIO) && !defined(SGTTY)
-# define TERMIOS
-# endif
+#define SIGACTION
+#if !defined(TERMIOS) && !defined(TERMIO) && !defined(SGTTY)
+#define TERMIOS
+#endif
-# endif
-# endif
+#endif
+#endif
-# include "ui_local.h"
-# include "internal/cryptlib.h"
+#include "ui_local.h"
+#include "internal/cryptlib.h"
-# ifdef OPENSSL_SYS_VMS /* prototypes for sys$whatever */
-# include <starlet.h>
-# ifdef __DECC
-# pragma message disable DOLLARID
-# endif
-# endif
+#ifdef OPENSSL_SYS_VMS /* prototypes for sys$whatever */
+#include <starlet.h>
+#ifdef __DECC
+#pragma message disable DOLLARID
+#endif
+#endif
-# ifdef WIN_CONSOLE_BUG
-# include <windows.h>
-# ifndef OPENSSL_SYS_WINCE
-# include <wincon.h>
-# endif
-# endif
+#ifdef WIN_CONSOLE_BUG
+#include <windows.h>
+#ifndef OPENSSL_SYS_WINCE
+#include <wincon.h>
+#endif
+#endif
/*
* There are 6 types of terminal interface supported, TERMIO, TERMIOS, VMS,
@@ -78,87 +78,87 @@
* may eventually opt to remove its use entirely.
*/
-# if !defined(TERMIOS) && !defined(TERMIO) && !defined(SGTTY)
+#if !defined(TERMIOS) && !defined(TERMIO) && !defined(SGTTY)
-# if defined(_LIBC)
-# undef TERMIOS
-# define TERMIO
-# undef SGTTY
+#if defined(_LIBC)
+#undef TERMIOS
+#define TERMIO
+#undef SGTTY
/*
* We know that VMS, MSDOS, VXWORKS, use entirely other mechanisms.
*/
-# elif !defined(OPENSSL_SYS_VMS) \
- && !defined(OPENSSL_SYS_MSDOS) \
- && !defined(OPENSSL_SYS_VXWORKS)
-# define TERMIOS
-# undef TERMIO
-# undef SGTTY
-# endif
-
-# endif
-
-# if defined(OPENSSL_SYS_VXWORKS)
-# undef TERMIOS
-# undef TERMIO
-# undef SGTTY
-# endif
-
-# ifdef TERMIOS
-# include <termios.h>
-# define TTY_STRUCT struct termios
-# define TTY_FLAGS c_lflag
-# define TTY_get(tty,data) tcgetattr(tty,data)
-# define TTY_set(tty,data) tcsetattr(tty,TCSANOW,data)
-# endif
-
-# ifdef TERMIO
-# include <termio.h>
-# define TTY_STRUCT struct termio
-# define TTY_FLAGS c_lflag
-# define TTY_get(tty,data) ioctl(tty,TCGETA,data)
-# define TTY_set(tty,data) ioctl(tty,TCSETA,data)
-# endif
-
-# ifdef SGTTY
-# include <sgtty.h>
-# define TTY_STRUCT struct sgttyb
-# define TTY_FLAGS sg_flags
-# define TTY_get(tty,data) ioctl(tty,TIOCGETP,data)
-# define TTY_set(tty,data) ioctl(tty,TIOCSETP,data)
-# endif
-
-# if !defined(_LIBC) && !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_VMS) && ! (defined(OPENSSL_SYS_TANDEM) && defined(_SPT_MODEL_))
-# include <sys/ioctl.h>
-# endif
-
-# ifdef OPENSSL_SYS_MSDOS
-# include <conio.h>
-# endif
-
-# ifdef OPENSSL_SYS_VMS
-# include <ssdef.h>
-# include <iodef.h>
-# include <ttdef.h>
-# include <descrip.h>
+#elif !defined(OPENSSL_SYS_VMS) \
+ && !defined(OPENSSL_SYS_MSDOS) \
+ && !defined(OPENSSL_SYS_VXWORKS)
+#define TERMIOS
+#undef TERMIO
+#undef SGTTY
+#endif
+
+#endif
+
+#if defined(OPENSSL_SYS_VXWORKS)
+#undef TERMIOS
+#undef TERMIO
+#undef SGTTY
+#endif
+
+#ifdef TERMIOS
+#include <termios.h>
+#define TTY_STRUCT struct termios
+#define TTY_FLAGS c_lflag
+#define TTY_get(tty, data) tcgetattr(tty, data)
+#define TTY_set(tty, data) tcsetattr(tty, TCSANOW, data)
+#endif
+
+#ifdef TERMIO
+#include <termio.h>
+#define TTY_STRUCT struct termio
+#define TTY_FLAGS c_lflag
+#define TTY_get(tty, data) ioctl(tty, TCGETA, data)
+#define TTY_set(tty, data) ioctl(tty, TCSETA, data)
+#endif
+
+#ifdef SGTTY
+#include <sgtty.h>
+#define TTY_STRUCT struct sgttyb
+#define TTY_FLAGS sg_flags
+#define TTY_get(tty, data) ioctl(tty, TIOCGETP, data)
+#define TTY_set(tty, data) ioctl(tty, TIOCSETP, data)
+#endif
+
+#if !defined(_LIBC) && !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_VMS) && !(defined(OPENSSL_SYS_TANDEM) && defined(_SPT_MODEL_))
+#include <sys/ioctl.h>
+#endif
+
+#ifdef OPENSSL_SYS_MSDOS
+#include <conio.h>
+#endif
+
+#ifdef OPENSSL_SYS_VMS
+#include <ssdef.h>
+#include <iodef.h>
+#include <ttdef.h>
+#include <descrip.h>
struct IOSB {
short iosb$w_value;
short iosb$w_count;
long iosb$l_info;
};
-# endif
+#endif
-# ifndef NX509_SIG
-# define NX509_SIG 32
-# endif
+#ifndef NX509_SIG
+#define NX509_SIG 32
+#endif
/* Define globals. They are protected by a lock */
-# ifdef SIGACTION
+#ifdef SIGACTION
static struct sigaction savsig[NX509_SIG];
-# else
-static void (*savsig[NX509_SIG]) (int);
-# endif
+#else
+static void (*savsig[NX509_SIG])(int);
+#endif
-# ifdef OPENSSL_SYS_VMS
+#ifdef OPENSSL_SYS_VMS
static struct IOSB iosb;
static $DESCRIPTOR(terminal, "TT");
static long tty_orig[3], tty_new[3]; /* XXX Is there any guarantee that this
@@ -166,26 +166,26 @@ static long tty_orig[3], tty_new[3]; /* XXX Is there any guarantee that this
* structures? */
static long status;
static unsigned short channel = 0;
-# elif defined(_WIN32) && !defined(_WIN32_WCE)
+#elif defined(_WIN32) && !defined(_WIN32_WCE)
static DWORD tty_orig, tty_new;
-# else
-# if !defined(OPENSSL_SYS_MSDOS) || defined(__DJGPP__)
+#else
+#if !defined(OPENSSL_SYS_MSDOS) || defined(__DJGPP__)
static TTY_STRUCT tty_orig, tty_new;
-# endif
-# endif
+#endif
+#endif
static FILE *tty_in, *tty_out;
static int is_a_tty;
/* Declare static functions */
-# if !defined(OPENSSL_SYS_WINCE)
+#if !defined(OPENSSL_SYS_WINCE)
static int read_till_nl(FILE *);
static void recsig(int);
static void pushsig(void);
static void popsig(void);
-# endif
-# if defined(OPENSSL_SYS_MSDOS) && !defined(_WIN32)
+#endif
+#if defined(OPENSSL_SYS_MSDOS) && !defined(_WIN32)
static int noecho_fgets(char *buf, int size, FILE *tty);
-# endif
+#endif
static int read_string_inner(UI *ui, UI_STRING *uis, int echo, int strip_nl);
static int read_string(UI *ui, UI_STRING *uis);
@@ -227,20 +227,20 @@ static int read_string(UI *ui, UI_STRING *uis)
fputs(UI_get0_action_string(uis), tty_out);
fflush(tty_out);
return read_string_inner(ui, uis,
- UI_get_input_flags(uis) & UI_INPUT_FLAG_ECHO,
- 0);
+ UI_get_input_flags(uis) & UI_INPUT_FLAG_ECHO,
+ 0);
case UIT_PROMPT:
fputs(UI_get0_output_string(uis), tty_out);
fflush(tty_out);
return read_string_inner(ui, uis,
- UI_get_input_flags(uis) & UI_INPUT_FLAG_ECHO,
- 1);
+ UI_get_input_flags(uis) & UI_INPUT_FLAG_ECHO,
+ 1);
case UIT_VERIFY:
fprintf(tty_out, "Verifying - %s", UI_get0_output_string(uis));
fflush(tty_out);
if ((ok = read_string_inner(ui, uis,
- UI_get_input_flags(uis) &
- UI_INPUT_FLAG_ECHO, 1)) <= 0)
+ UI_get_input_flags(uis) & UI_INPUT_FLAG_ECHO, 1))
+ <= 0)
return ok;
if (strcmp(UI_get0_result_string(uis), UI_get0_test_string(uis)) != 0) {
fprintf(tty_out, "Verify failure\n");
@@ -256,11 +256,11 @@ static int read_string(UI *ui, UI_STRING *uis)
return 1;
}
-# if !defined(OPENSSL_SYS_WINCE)
+#if !defined(OPENSSL_SYS_WINCE)
/* Internal functions to read a string without echoing */
static int read_till_nl(FILE *in)
{
-# define SIZE 4
+#define SIZE 4
char buf[SIZE + 1];
do {
@@ -271,7 +271,7 @@ static int read_till_nl(FILE *in)
}
static volatile sig_atomic_t intr_signal;
-# endif
+#endif
static int read_string_inner(UI *ui, UI_STRING *uis, int echo, int strip_nl)
{
@@ -279,7 +279,7 @@ static int read_string_inner(UI *ui, UI_STRING *uis, int echo, int strip_nl)
int ok;
char result[BUFSIZ];
int maxsize = BUFSIZ - 1;
-# if !defined(OPENSSL_SYS_WINCE)
+#if !defined(OPENSSL_SYS_WINCE)
char *p = NULL;
int echo_eol = !echo;
@@ -295,48 +295,46 @@ static int read_string_inner(UI *ui, UI_STRING *uis, int echo, int strip_nl)
ps = 2;
result[0] = '\0';
-# if defined(_WIN32)
+#if defined(_WIN32)
if (is_a_tty) {
DWORD numread;
-# if defined(CP_UTF8)
+#if defined(CP_UTF8)
if (GetEnvironmentVariableW(L"OPENSSL_WIN32_UTF8", NULL, 0) != 0) {
WCHAR wresult[BUFSIZ];
if (ReadConsoleW(GetStdHandle(STD_INPUT_HANDLE),
- wresult, maxsize, &numread, NULL)) {
- if (numread >= 2 &&
- wresult[numread-2] == L'\r' &&
- wresult[numread-1] == L'\n') {
- wresult[numread-2] = L'\n';
+ wresult, maxsize, &numread, NULL)) {
+ if (numread >= 2 && wresult[numread - 2] == L'\r' && wresult[numread - 1] == L'\n') {
+ wresult[numread - 2] = L'\n';
numread--;
}
wresult[numread] = '\0';
if (WideCharToMultiByte(CP_UTF8, 0, wresult, -1,
- result, sizeof(result), NULL, 0) > 0)
+ result, sizeof(result), NULL, 0)
+ > 0)
p = result;
OPENSSL_cleanse(wresult, sizeof(wresult));
}
} else
-# endif
- if (ReadConsoleA(GetStdHandle(STD_INPUT_HANDLE),
- result, maxsize, &numread, NULL)) {
- if (numread >= 2 &&
- result[numread-2] == '\r' && result[numread-1] == '\n') {
- result[numread-2] = '\n';
+#endif
+ if (ReadConsoleA(GetStdHandle(STD_INPUT_HANDLE),
+ result, maxsize, &numread, NULL)) {
+ if (numread >= 2 && result[numread - 2] == '\r' && result[numread - 1] == '\n') {
+ result[numread - 2] = '\n';
numread--;
}
result[numread] = '\0';
p = result;
}
} else
-# elif defined(OPENSSL_SYS_MSDOS)
+#elif defined(OPENSSL_SYS_MSDOS)
if (!echo) {
noecho_fgets(result, maxsize, tty_in);
- p = result; /* FIXME: noecho_fgets doesn't return errors */
+ p = result; /* FIXME: noecho_fgets doesn't return errors */
} else
-# endif
- p = fgets(result, maxsize, tty_in);
+#endif
+ p = fgets(result, maxsize, tty_in);
if (p == NULL)
goto error;
if (feof(tty_in))
@@ -351,7 +349,7 @@ static int read_string_inner(UI *ui, UI_STRING *uis, int echo, int strip_nl)
if (UI_set_result(ui, uis, result) >= 0)
ok = 1;
- error:
+error:
if (intr_signal == SIGINT)
ok = -1;
if (echo_eol)
@@ -361,9 +359,9 @@ static int read_string_inner(UI *ui, UI_STRING *uis, int echo, int strip_nl)
if (ps >= 1)
popsig();
-# else
+#else
ok = 1;
-# endif
+#endif
OPENSSL_cleanse(result, BUFSIZ);
return ok;
@@ -376,10 +374,10 @@ static int open_console(UI *ui)
return 0;
is_a_tty = 1;
-# if defined(OPENSSL_SYS_VXWORKS)
+#if defined(OPENSSL_SYS_VXWORKS)
tty_in = stdin;
tty_out = stderr;
-# elif defined(_WIN32) && !defined(_WIN32_WCE)
+#elif defined(_WIN32) && !defined(_WIN32_WCE)
if ((tty_out = fopen("conout$", "w")) == NULL)
tty_out = stderr;
@@ -390,162 +388,162 @@ static int open_console(UI *ui)
if ((tty_in = fopen("conin$", "r")) == NULL)
tty_in = stdin;
}
-# else
-# ifdef OPENSSL_SYS_MSDOS
-# define DEV_TTY "con"
-# else
-# define DEV_TTY "/dev/tty"
-# endif
+#else
+#ifdef OPENSSL_SYS_MSDOS
+#define DEV_TTY "con"
+#else
+#define DEV_TTY "/dev/tty"
+#endif
if ((tty_in = fopen(DEV_TTY, "r")) == NULL)
tty_in = stdin;
if ((tty_out = fopen(DEV_TTY, "w")) == NULL)
tty_out = stderr;
-# endif
+#endif
-# if defined(TTY_get) && !defined(OPENSSL_SYS_VMS)
+#if defined(TTY_get) && !defined(OPENSSL_SYS_VMS)
if (TTY_get(fileno(tty_in), &tty_orig) == -1) {
-# ifdef ENOTTY
+#ifdef ENOTTY
if (errno == ENOTTY)
is_a_tty = 0;
else
-# endif
-# ifdef EINVAL
+#endif
+#ifdef EINVAL
/*
* Ariel Glenn reports that solaris can return EINVAL instead.
* This should be ok
*/
- if (errno == EINVAL)
- is_a_tty = 0;
- else
-# endif
-# ifdef ENXIO
- /*
- * Solaris can return ENXIO.
- * This should be ok
- */
- if (errno == ENXIO)
- is_a_tty = 0;
- else
-# endif
-# ifdef EIO
- /*
- * Linux can return EIO.
- * This should be ok
- */
- if (errno == EIO)
- is_a_tty = 0;
- else
-# endif
-# ifdef EPERM
- /*
- * Linux can return EPERM (Operation not permitted),
- * e.g. if a daemon executes openssl via fork()+execve()
- * This should be ok
- */
- if (errno == EPERM)
- is_a_tty = 0;
- else
-# endif
-# ifdef ENODEV
- /*
- * MacOS X returns ENODEV (Operation not supported by device),
- * which seems appropriate.
- */
- if (errno == ENODEV)
+ if (errno == EINVAL)
is_a_tty = 0;
- else
-# endif
- {
- ERR_raise_data(ERR_LIB_UI, UI_R_UNKNOWN_TTYGET_ERRNO_VALUE,
- "errno=%d", errno);
- return 0;
- }
+ else
+#endif
+#ifdef ENXIO
+ /*
+ * Solaris can return ENXIO.
+ * This should be ok
+ */
+ if (errno == ENXIO)
+ is_a_tty = 0;
+ else
+#endif
+#ifdef EIO
+ /*
+ * Linux can return EIO.
+ * This should be ok
+ */
+ if (errno == EIO)
+ is_a_tty = 0;
+ else
+#endif
+#ifdef EPERM
+ /*
+ * Linux can return EPERM (Operation not permitted),
+ * e.g. if a daemon executes openssl via fork()+execve()
+ * This should be ok
+ */
+ if (errno == EPERM)
+ is_a_tty = 0;
+ else
+#endif
+#ifdef ENODEV
+ /*
+ * MacOS X returns ENODEV (Operation not supported by device),
+ * which seems appropriate.
+ */
+ if (errno == ENODEV)
+ is_a_tty = 0;
+ else
+#endif
+ {
+ ERR_raise_data(ERR_LIB_UI, UI_R_UNKNOWN_TTYGET_ERRNO_VALUE,
+ "errno=%d", errno);
+ return 0;
+ }
}
-# endif
-# ifdef OPENSSL_SYS_VMS
+#endif
+#ifdef OPENSSL_SYS_VMS
status = sys$assign(&terminal, &channel, 0, 0);
/* if there isn't a TT device, something is very wrong */
if (status != SS$_NORMAL) {
ERR_raise_data(ERR_LIB_UI, UI_R_SYSASSIGN_ERROR,
- "status=%%X%08X", status);
+ "status=%%X%08X", status);
return 0;
}
status = sys$qiow(0, channel, IO$_SENSEMODE, &iosb, 0, 0, tty_orig, 12,
- 0, 0, 0, 0);
+ 0, 0, 0, 0);
/* If IO$_SENSEMODE doesn't work, this is not a terminal device */
if ((status != SS$_NORMAL) || (iosb.iosb$w_value != SS$_NORMAL))
is_a_tty = 0;
-# endif
+#endif
return 1;
}
static int noecho_console(UI *ui)
{
-# ifdef TTY_FLAGS
+#ifdef TTY_FLAGS
memcpy(&(tty_new), &(tty_orig), sizeof(tty_orig));
tty_new.TTY_FLAGS &= ~ECHO;
-# endif
+#endif
-# if defined(TTY_set) && !defined(OPENSSL_SYS_VMS)
+#if defined(TTY_set) && !defined(OPENSSL_SYS_VMS)
if (is_a_tty && (TTY_set(fileno(tty_in), &tty_new) == -1))
return 0;
-# endif
-# ifdef OPENSSL_SYS_VMS
+#endif
+#ifdef OPENSSL_SYS_VMS
if (is_a_tty) {
tty_new[0] = tty_orig[0];
tty_new[1] = tty_orig[1] | TT$M_NOECHO;
tty_new[2] = tty_orig[2];
status = sys$qiow(0, channel, IO$_SETMODE, &iosb, 0, 0, tty_new, 12,
- 0, 0, 0, 0);
+ 0, 0, 0, 0);
if ((status != SS$_NORMAL) || (iosb.iosb$w_value != SS$_NORMAL)) {
ERR_raise_data(ERR_LIB_UI, UI_R_SYSQIOW_ERROR,
- "status=%%X%08X, iosb.iosb$w_value=%%X%08X",
- status, iosb.iosb$w_value);
+ "status=%%X%08X, iosb.iosb$w_value=%%X%08X",
+ status, iosb.iosb$w_value);
return 0;
}
}
-# endif
-# if defined(_WIN32) && !defined(_WIN32_WCE)
+#endif
+#if defined(_WIN32) && !defined(_WIN32_WCE)
if (is_a_tty) {
tty_new = tty_orig;
tty_new &= ~ENABLE_ECHO_INPUT;
SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), tty_new);
}
-# endif
+#endif
return 1;
}
static int echo_console(UI *ui)
{
-# if defined(TTY_set) && !defined(OPENSSL_SYS_VMS)
+#if defined(TTY_set) && !defined(OPENSSL_SYS_VMS)
memcpy(&(tty_new), &(tty_orig), sizeof(tty_orig));
if (is_a_tty && (TTY_set(fileno(tty_in), &tty_new) == -1))
return 0;
-# endif
-# ifdef OPENSSL_SYS_VMS
+#endif
+#ifdef OPENSSL_SYS_VMS
if (is_a_tty) {
tty_new[0] = tty_orig[0];
tty_new[1] = tty_orig[1];
tty_new[2] = tty_orig[2];
status = sys$qiow(0, channel, IO$_SETMODE, &iosb, 0, 0, tty_new, 12,
- 0, 0, 0, 0);
+ 0, 0, 0, 0);
if ((status != SS$_NORMAL) || (iosb.iosb$w_value != SS$_NORMAL)) {
ERR_raise_data(ERR_LIB_UI, UI_R_SYSQIOW_ERROR,
- "status=%%X%08X, iosb.iosb$w_value=%%X%08X",
- status, iosb.iosb$w_value);
+ "status=%%X%08X, iosb.iosb$w_value=%%X%08X",
+ status, iosb.iosb$w_value);
return 0;
}
}
-# endif
-# if defined(_WIN32) && !defined(_WIN32_WCE)
+#endif
+#if defined(_WIN32) && !defined(_WIN32_WCE)
if (is_a_tty) {
tty_new = tty_orig;
SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), tty_new);
}
-# endif
+#endif
return 1;
}
@@ -557,104 +555,104 @@ static int close_console(UI *ui)
fclose(tty_in);
if (tty_out != stderr)
fclose(tty_out);
-# ifdef OPENSSL_SYS_VMS
+#ifdef OPENSSL_SYS_VMS
status = sys$dassgn(channel);
if (status != SS$_NORMAL) {
ERR_raise_data(ERR_LIB_UI, UI_R_SYSDASSGN_ERROR,
- "status=%%X%08X", status);
+ "status=%%X%08X", status);
ret = 0;
}
-# endif
+#endif
CRYPTO_THREAD_unlock(ui->lock);
return ret;
}
-# if !defined(OPENSSL_SYS_WINCE)
+#if !defined(OPENSSL_SYS_WINCE)
/* Internal functions to handle signals and act on them */
static void pushsig(void)
{
-# ifndef OPENSSL_SYS_WIN32
+#ifndef OPENSSL_SYS_WIN32
int i;
-# endif
-# ifdef SIGACTION
+#endif
+#ifdef SIGACTION
struct sigaction sa;
memset(&sa, 0, sizeof(sa));
sa.sa_handler = recsig;
-# endif
+#endif
-# ifdef OPENSSL_SYS_WIN32
+#ifdef OPENSSL_SYS_WIN32
savsig[SIGABRT] = signal(SIGABRT, recsig);
savsig[SIGFPE] = signal(SIGFPE, recsig);
savsig[SIGILL] = signal(SIGILL, recsig);
savsig[SIGINT] = signal(SIGINT, recsig);
savsig[SIGSEGV] = signal(SIGSEGV, recsig);
savsig[SIGTERM] = signal(SIGTERM, recsig);
-# else
+#else
for (i = 1; i < NX509_SIG; i++) {
-# ifdef SIGUSR1
+#ifdef SIGUSR1
if (i == SIGUSR1)
continue;
-# endif
-# ifdef SIGUSR2
+#endif
+#ifdef SIGUSR2
if (i == SIGUSR2)
continue;
-# endif
-# ifdef SIGKILL
- if (i == SIGKILL) /* We can't make any action on that. */
+#endif
+#ifdef SIGKILL
+ if (i == SIGKILL) /* We can't make any action on that. */
continue;
-# endif
-# ifdef SIGACTION
+#endif
+#ifdef SIGACTION
sigaction(i, &sa, &savsig[i]);
-# else
+#else
savsig[i] = signal(i, recsig);
-# endif
+#endif
}
-# endif
+#endif
-# ifdef SIGWINCH
+#ifdef SIGWINCH
signal(SIGWINCH, SIG_DFL);
-# endif
+#endif
}
static void popsig(void)
{
-# ifdef OPENSSL_SYS_WIN32
+#ifdef OPENSSL_SYS_WIN32
signal(SIGABRT, savsig[SIGABRT]);
signal(SIGFPE, savsig[SIGFPE]);
signal(SIGILL, savsig[SIGILL]);
signal(SIGINT, savsig[SIGINT]);
signal(SIGSEGV, savsig[SIGSEGV]);
signal(SIGTERM, savsig[SIGTERM]);
-# else
+#else
int i;
for (i = 1; i < NX509_SIG; i++) {
-# ifdef SIGUSR1
+#ifdef SIGUSR1
if (i == SIGUSR1)
continue;
-# endif
-# ifdef SIGUSR2
+#endif
+#ifdef SIGUSR2
if (i == SIGUSR2)
continue;
-# endif
-# ifdef SIGACTION
+#endif
+#ifdef SIGACTION
sigaction(i, &savsig[i], NULL);
-# else
+#else
signal(i, savsig[i]);
-# endif
+#endif
}
-# endif
+#endif
}
static void recsig(int i)
{
intr_signal = i;
}
-# endif
+#endif
/* Internal functions specific for Windows */
-# if defined(OPENSSL_SYS_MSDOS) && !defined(_WIN32)
+#if defined(OPENSSL_SYS_MSDOS) && !defined(_WIN32)
static int noecho_fgets(char *buf, int size, FILE *tty)
{
int i;
@@ -667,11 +665,11 @@ static int noecho_fgets(char *buf, int size, FILE *tty)
break;
}
size--;
-# if defined(_WIN32)
+#if defined(_WIN32)
i = _getch();
-# else
+#else
i = getch();
-# endif
+#endif
if (i == '\r')
i = '\n';
*(p++) = i;
@@ -680,7 +678,7 @@ static int noecho_fgets(char *buf, int size, FILE *tty)
break;
}
}
-# ifdef WIN_CONSOLE_BUG
+#ifdef WIN_CONSOLE_BUG
/*
* Win95 has several evil console bugs: one of these is that the last
* character read using getch() is passed to the next read: this is
@@ -692,16 +690,16 @@ static int noecho_fgets(char *buf, int size, FILE *tty)
inh = GetStdHandle(STD_INPUT_HANDLE);
FlushConsoleInputBuffer(inh);
}
-# endif
+#endif
return strlen(buf);
}
-# endif
+#endif
static UI_METHOD ui_openssl = {
"OpenSSL default user interface",
open_console,
write_string,
- NULL, /* No flusher is needed for command lines */
+ NULL, /* No flusher is needed for command lines */
read_string,
close_console,
NULL
diff --git a/crypto/ui/ui_util.c b/crypto/ui/ui_util.c
index 554bf79856..a8b3c1d44c 100644
--- a/crypto/ui/ui_util.c
+++ b/crypto/ui/ui_util.c
@@ -8,7 +8,7 @@
*/
#include <string.h>
-#include <openssl/pem.h> /* PEM_def_callback() */
+#include <openssl/pem.h> /* PEM_def_callback() */
#include "internal/thread_once.h"
#include "ui_local.h"
@@ -17,20 +17,19 @@
#endif
int UI_UTIL_read_pw_string(char *buf, int length, const char *prompt,
- int verify)
+ int verify)
{
char buff[BUFSIZ];
int ret;
- ret =
- UI_UTIL_read_pw(buf, buff, (length > BUFSIZ) ? BUFSIZ : length,
- prompt, verify);
+ ret = UI_UTIL_read_pw(buf, buff, (length > BUFSIZ) ? BUFSIZ : length,
+ prompt, verify);
OPENSSL_cleanse(buff, BUFSIZ);
return ret;
}
int UI_UTIL_read_pw(char *buf, char *buff, int size, const char *prompt,
- int verify)
+ int verify)
{
int ok = -2;
UI *ui;
@@ -60,7 +59,7 @@ struct pem_password_cb_data {
};
static void ui_new_method_data(void *parent, void *ptr, CRYPTO_EX_DATA *ad,
- int idx, long argl, void *argp)
+ int idx, long argl, void *argp)
{
/*
* Do nothing, the data is allocated externally and assigned later with
@@ -69,7 +68,7 @@ static void ui_new_method_data(void *parent, void *ptr, CRYPTO_EX_DATA *ad,
}
static int ui_dup_method_data(CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from,
- void **pptr, int idx, long argl, void *argp)
+ void **pptr, int idx, long argl, void *argp)
{
if (*pptr != NULL) {
*pptr = OPENSSL_memdup(*pptr, sizeof(struct pem_password_cb_data));
@@ -80,7 +79,7 @@ static int ui_dup_method_data(CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from,
}
static void ui_free_method_data(void *parent, void *ptr, CRYPTO_EX_DATA *ad,
- int idx, long argl, void *argp)
+ int idx, long argl, void *argp)
{
OPENSSL_free(ptr);
}
@@ -90,9 +89,9 @@ static int ui_method_data_index = -1;
DEFINE_RUN_ONCE_STATIC(ui_method_data_index_init)
{
ui_method_data_index = CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_UI_METHOD,
- 0, NULL, ui_new_method_data,
- ui_dup_method_data,
- ui_free_method_data);
+ 0, NULL, ui_new_method_data,
+ ui_dup_method_data,
+ ui_free_method_data);
return 1;
}
@@ -103,28 +102,26 @@ static int ui_open(UI *ui)
static int ui_read(UI *ui, UI_STRING *uis)
{
switch (UI_get_string_type(uis)) {
- case UIT_PROMPT:
- {
- int len;
- char result[PEM_BUFSIZE + 1]; /* reserve one byte at the end */
- const struct pem_password_cb_data *data =
- UI_method_get_ex_data(UI_get_method(ui), ui_method_data_index);
- int maxsize = UI_get_result_maxsize(uis);
-
- if (maxsize > PEM_BUFSIZE)
- maxsize = PEM_BUFSIZE;
- len = data->cb(result, maxsize, data->rwflag,
- UI_get0_user_data(ui));
- if (len > maxsize)
- return -1;
- if (len >= 0)
- result[len] = '\0';
- if (len < 0)
- return len;
- if (UI_set_result_ex(ui, uis, result, len) >= 0)
- return 1;
- return 0;
- }
+ case UIT_PROMPT: {
+ int len;
+ char result[PEM_BUFSIZE + 1]; /* reserve one byte at the end */
+ const struct pem_password_cb_data *data = UI_method_get_ex_data(UI_get_method(ui), ui_method_data_index);
+ int maxsize = UI_get_result_maxsize(uis);
+
+ if (maxsize > PEM_BUFSIZE)
+ maxsize = PEM_BUFSIZE;
+ len = data->cb(result, maxsize, data->rwflag,
+ UI_get0_user_data(ui));
+ if (len > maxsize)
+ return -1;
+ if (len >= 0)
+ result[len] = '\0';
+ if (len < 0)
+ return len;
+ if (UI_set_result_ex(ui, uis, result, len) >= 0)
+ return 1;
+ return 0;
+ }
case UIT_VERIFY:
case UIT_NONE:
case UIT_BOOLEAN:
diff --git a/crypto/uid.c b/crypto/uid.c
index 45b63a431e..c0c62909fd 100644
--- a/crypto/uid.c
+++ b/crypto/uid.c
@@ -19,7 +19,7 @@ int OPENSSL_issetugid(void)
#elif defined(__OpenBSD__) || (defined(__FreeBSD__) && __FreeBSD__ > 2) || defined(__DragonFly__) || (defined(__GLIBC__) && defined(__FreeBSD_kernel__))
-# include <unistd.h>
+#include <unistd.h>
int OPENSSL_issetugid(void)
{
@@ -28,28 +28,28 @@ int OPENSSL_issetugid(void)
#else
-# include <unistd.h>
-# include <sys/types.h>
+#include <unistd.h>
+#include <sys/types.h>
-# if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
-# if __GLIBC_PREREQ(2, 16)
-# include <sys/auxv.h>
-# define OSSL_IMPLEMENT_GETAUXVAL
-# endif
-# elif defined(__ANDROID_API__)
+#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+#if __GLIBC_PREREQ(2, 16)
+#include <sys/auxv.h>
+#define OSSL_IMPLEMENT_GETAUXVAL
+#endif
+#elif defined(__ANDROID_API__)
/* see https://developer.android.google.cn/ndk/guides/cpu-features */
-# if __ANDROID_API__ >= 18
-# include <sys/auxv.h>
-# define OSSL_IMPLEMENT_GETAUXVAL
-# endif
-# endif
+#if __ANDROID_API__ >= 18
+#include <sys/auxv.h>
+#define OSSL_IMPLEMENT_GETAUXVAL
+#endif
+#endif
int OPENSSL_issetugid(void)
{
-# ifdef OSSL_IMPLEMENT_GETAUXVAL
+#ifdef OSSL_IMPLEMENT_GETAUXVAL
return getauxval(AT_SECURE) != 0;
-# else
+#else
return getuid() != geteuid() || getgid() != getegid();
-# endif
+#endif
}
#endif
diff --git a/crypto/vms_rms.h b/crypto/vms_rms.h
index ae74ba6829..fed6cd0fc3 100644
--- a/crypto/vms_rms.h
+++ b/crypto/vms_rms.h
@@ -9,50 +9,52 @@
#ifdef NAML$C_MAXRSS
-# define CC_RMS_NAMX cc$rms_naml
-# define FAB_NAMX fab$l_naml
-# define FAB_OR_NAML( fab, naml) naml
-# define FAB_OR_NAML_DNA naml$l_long_defname
-# define FAB_OR_NAML_DNS naml$l_long_defname_size
-# define FAB_OR_NAML_FNA naml$l_long_filename
-# define FAB_OR_NAML_FNS naml$l_long_filename_size
-# define NAMX_ESA naml$l_long_expand
-# define NAMX_ESL naml$l_long_expand_size
-# define NAMX_ESS naml$l_long_expand_alloc
-# define NAMX_NOP naml$b_nop
-# define SET_NAMX_NO_SHORT_UPCASE( nam) nam.naml$v_no_short_upcase = 1
+#define CC_RMS_NAMX cc$rms_naml
+#define FAB_NAMX fab$l_naml
+#define FAB_OR_NAML(fab, naml) naml
+#define FAB_OR_NAML_DNA naml$l_long_defname
+#define FAB_OR_NAML_DNS naml$l_long_defname_size
+#define FAB_OR_NAML_FNA naml$l_long_filename
+#define FAB_OR_NAML_FNS naml$l_long_filename_size
+#define NAMX_ESA naml$l_long_expand
+#define NAMX_ESL naml$l_long_expand_size
+#define NAMX_ESS naml$l_long_expand_alloc
+#define NAMX_NOP naml$b_nop
+#define SET_NAMX_NO_SHORT_UPCASE(nam) nam.naml$v_no_short_upcase = 1
-# if __INITIAL_POINTER_SIZE == 64
-# define NAMX_DNA_FNA_SET(fab) fab.fab$l_dna = (__char_ptr32) -1; \
- fab.fab$l_fna = (__char_ptr32) -1;
-# else /* __INITIAL_POINTER_SIZE == 64 */
-# define NAMX_DNA_FNA_SET(fab) fab.fab$l_dna = (char *) -1; \
- fab.fab$l_fna = (char *) -1;
-# endif /* __INITIAL_POINTER_SIZE == 64 [else] */
+#if __INITIAL_POINTER_SIZE == 64
+#define NAMX_DNA_FNA_SET(fab) \
+ fab.fab$l_dna = (__char_ptr32) - 1; \
+ fab.fab$l_fna = (__char_ptr32) - 1;
+#else /* __INITIAL_POINTER_SIZE == 64 */
+#define NAMX_DNA_FNA_SET(fab) \
+ fab.fab$l_dna = (char *)-1; \
+ fab.fab$l_fna = (char *)-1;
+#endif /* __INITIAL_POINTER_SIZE == 64 [else] */
-# define NAMX_MAXRSS NAML$C_MAXRSS
-# define NAMX_STRUCT NAML
+#define NAMX_MAXRSS NAML$C_MAXRSS
+#define NAMX_STRUCT NAML
-#else /* def NAML$C_MAXRSS */
+#else /* def NAML$C_MAXRSS */
-# define CC_RMS_NAMX cc$rms_nam
-# define FAB_NAMX fab$l_nam
-# define FAB_OR_NAML( fab, naml) fab
-# define FAB_OR_NAML_DNA fab$l_dna
-# define FAB_OR_NAML_DNS fab$b_dns
-# define FAB_OR_NAML_FNA fab$l_fna
-# define FAB_OR_NAML_FNS fab$b_fns
-# define NAMX_ESA nam$l_esa
-# define NAMX_ESL nam$b_esl
-# define NAMX_ESS nam$b_ess
-# define NAMX_NOP nam$b_nop
-# define NAMX_DNA_FNA_SET(fab)
-# define NAMX_MAXRSS NAM$C_MAXRSS
-# define NAMX_STRUCT NAM
-# ifdef NAM$M_NO_SHORT_UPCASE
-# define SET_NAMX_NO_SHORT_UPCASE( nam) naml.naml$v_no_short_upcase = 1
-# else /* def NAM$M_NO_SHORT_UPCASE */
-# define SET_NAMX_NO_SHORT_UPCASE( nam)
-# endif /* def NAM$M_NO_SHORT_UPCASE [else] */
+#define CC_RMS_NAMX cc$rms_nam
+#define FAB_NAMX fab$l_nam
+#define FAB_OR_NAML(fab, naml) fab
+#define FAB_OR_NAML_DNA fab$l_dna
+#define FAB_OR_NAML_DNS fab$b_dns
+#define FAB_OR_NAML_FNA fab$l_fna
+#define FAB_OR_NAML_FNS fab$b_fns
+#define NAMX_ESA nam$l_esa
+#define NAMX_ESL nam$b_esl
+#define NAMX_ESS nam$b_ess
+#define NAMX_NOP nam$b_nop
+#define NAMX_DNA_FNA_SET(fab)
+#define NAMX_MAXRSS NAM$C_MAXRSS
+#define NAMX_STRUCT NAM
+#ifdef NAM$M_NO_SHORT_UPCASE
+#define SET_NAMX_NO_SHORT_UPCASE(nam) naml.naml$v_no_short_upcase = 1
+#else /* def NAM$M_NO_SHORT_UPCASE */
+#define SET_NAMX_NO_SHORT_UPCASE(nam)
+#endif /* def NAM$M_NO_SHORT_UPCASE [else] */
-#endif /* def NAML$C_MAXRSS [else] */
+#endif /* def NAML$C_MAXRSS [else] */
diff --git a/crypto/whrlpool/wp_block.c b/crypto/whrlpool/wp_block.c
index bcf7a199ed..dab8cf9793 100644
--- a/crypto/whrlpool/wp_block.c
+++ b/crypto/whrlpool/wp_block.c
@@ -55,27 +55,24 @@ typedef unsigned long u64;
typedef unsigned long long u64;
#endif
-#define ROUNDS 10
+#define ROUNDS 10
#define STRICT_ALIGNMENT
-#if !defined(PEDANTIC) && (defined(__i386) || defined(__i386__) || \
- defined(__x86_64) || defined(__x86_64__) || \
- defined(_M_IX86) || defined(_M_AMD64) || \
- defined(_M_X64))
+#if !defined(PEDANTIC) && (defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__) || defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64))
/*
* Well, formally there're couple of other architectures, which permit
* unaligned loads, specifically those not crossing cache lines, IA-64 and
* PowerPC...
*/
-# undef STRICT_ALIGNMENT
+#undef STRICT_ALIGNMENT
#endif
#ifndef STRICT_ALIGNMENT
-# ifdef __GNUC__
+#ifdef __GNUC__
typedef u64 u64_a1 __attribute((__aligned__(1)));
-# else
+#else
typedef u64 u64_a1;
-# endif
+#endif
#endif
#if defined(__GNUC__) && !defined(STRICT_ALIGNMENT)
@@ -86,70 +83,73 @@ typedef u64 u64_aX;
#undef SMALL_REGISTER_BANK
#if defined(__i386) || defined(__i386__) || defined(_M_IX86)
-# define SMALL_REGISTER_BANK
-# if defined(WHIRLPOOL_ASM)
-# ifndef OPENSSL_SMALL_FOOTPRINT
+#define SMALL_REGISTER_BANK
+#if defined(WHIRLPOOL_ASM)
+#ifndef OPENSSL_SMALL_FOOTPRINT
/*
* it appears that for elder non-MMX
* CPUs this is actually faster!
*/
-# define OPENSSL_SMALL_FOOTPRINT
-# endif
-# define GO_FOR_MMX(ctx,inp,num) do { \
- void whirlpool_block_mmx(void *,const void *,size_t); \
- if (!(OPENSSL_ia32cap_P[0] & (1<<23))) break; \
- whirlpool_block_mmx(ctx->H.c,inp,num); return; \
- } while (0)
-# endif
+#define OPENSSL_SMALL_FOOTPRINT
+#endif
+#define GO_FOR_MMX(ctx, inp, num) \
+ do { \
+ void whirlpool_block_mmx(void *, const void *, size_t); \
+ if (!(OPENSSL_ia32cap_P[0] & (1 << 23))) \
+ break; \
+ whirlpool_block_mmx(ctx->H.c, inp, num); \
+ return; \
+ } while (0)
+#endif
#endif
#undef ROTATE
#ifndef PEDANTIC
-# if defined(_MSC_VER)
-# if defined(_WIN64) /* applies to both IA-64 and AMD64 */
-# include <stdlib.h>
-# pragma intrinsic(_rotl64)
-# define ROTATE(a,n) _rotl64((a),n)
-# endif
-# elif defined(__GNUC__) && __GNUC__>=2
-# if defined(__x86_64) || defined(__x86_64__)
-# if defined(L_ENDIAN)
-# define ROTATE(a,n) ({ u64 ret; asm ("rolq %1,%0" \
+#if defined(_MSC_VER)
+#if defined(_WIN64) /* applies to both IA-64 and AMD64 */
+#include <stdlib.h>
+#pragma intrinsic(_rotl64)
+#define ROTATE(a, n) _rotl64((a), n)
+#endif
+#elif defined(__GNUC__) && __GNUC__ >= 2
+#if defined(__x86_64) || defined(__x86_64__)
+#if defined(L_ENDIAN)
+#define ROTATE(a, n) ({ u64 ret; asm ("rolq %1,%0" \
: "=r"(ret) : "J"(n),"0"(a) : "cc"); ret; })
-# elif defined(B_ENDIAN)
- /*
- * Most will argue that x86_64 is always little-endian. Well, yes, but
- * then we have stratus.com who has modified gcc to "emulate"
- * big-endian on x86. Is there evidence that they [or somebody else]
- * won't do same for x86_64? Naturally no. And this line is waiting
- * ready for that brave soul:-)
- */
-# define ROTATE(a,n) ({ u64 ret; asm ("rorq %1,%0" \
+#elif defined(B_ENDIAN)
+/*
+ * Most will argue that x86_64 is always little-endian. Well, yes, but
+ * then we have stratus.com who has modified gcc to "emulate"
+ * big-endian on x86. Is there evidence that they [or somebody else]
+ * won't do same for x86_64? Naturally no. And this line is waiting
+ * ready for that brave soul:-)
+ */
+#define ROTATE(a, n) ({ u64 ret; asm ("rorq %1,%0" \
: "=r"(ret) : "J"(n),"0"(a) : "cc"); ret; })
-# endif
-# elif defined(__ia64) || defined(__ia64__)
-# if defined(L_ENDIAN)
-# define ROTATE(a,n) ({ u64 ret; asm ("shrp %0=%1,%1,%2" \
+#endif
+#elif defined(__ia64) || defined(__ia64__)
+#if defined(L_ENDIAN)
+#define ROTATE(a, n) ({ u64 ret; asm ("shrp %0=%1,%1,%2" \
: "=r"(ret) : "r"(a),"M"(64-(n))); ret; })
-# elif defined(B_ENDIAN)
-# define ROTATE(a,n) ({ u64 ret; asm ("shrp %0=%1,%1,%2" \
+#elif defined(B_ENDIAN)
+#define ROTATE(a, n) ({ u64 ret; asm ("shrp %0=%1,%1,%2" \
: "=r"(ret) : "r"(a),"M"(n)); ret; })
-# endif
-# endif
-# endif
+#endif
+#endif
+#endif
#endif
#if defined(OPENSSL_SMALL_FOOTPRINT)
-# if !defined(ROTATE)
-# if defined(L_ENDIAN) /* little-endians have to rotate left */
-# define ROTATE(i,n) ((i)<<(n) ^ (i)>>(64-n))
-# elif defined(B_ENDIAN) /* big-endians have to rotate right */
-# define ROTATE(i,n) ((i)>>(n) ^ (i)<<(64-n))
-# endif
-# endif
-# if defined(ROTATE) && !defined(STRICT_ALIGNMENT)
-# define STRICT_ALIGNMENT /* ensure smallest table size */
-# endif
+#if !defined(ROTATE)
+#if defined(L_ENDIAN) /* little-endians have to rotate left */
+#define ROTATE(i, n) ((i) << (n) ^ (i) >> (64 - n))
+#elif defined(B_ENDIAN) /* big-endians have to rotate right */
+#define ROTATE(i, n) ((i) >> (n) ^ (i) << (64 - n))
+#endif
+#endif
+#if defined(ROTATE) && !defined(STRICT_ALIGNMENT)
+#define STRICT_ALIGNMENT /* ensure smallest table size */
+#endif
#endif
/*
@@ -176,325 +176,322 @@ typedef u64 u64_aX;
* Hand-coded assembler would be another alternative:-)
*/
#ifdef STRICT_ALIGNMENT
-# if defined(ROTATE)
-# define N 1
-# define LL(c0,c1,c2,c3,c4,c5,c6,c7) c0,c1,c2,c3,c4,c5,c6,c7
-# define C0(K,i) (Cx.q[K.c[(i)*8+0]])
-# define C1(K,i) ROTATE(Cx.q[K.c[(i)*8+1]],8)
-# define C2(K,i) ROTATE(Cx.q[K.c[(i)*8+2]],16)
-# define C3(K,i) ROTATE(Cx.q[K.c[(i)*8+3]],24)
-# define C4(K,i) ROTATE(Cx.q[K.c[(i)*8+4]],32)
-# define C5(K,i) ROTATE(Cx.q[K.c[(i)*8+5]],40)
-# define C6(K,i) ROTATE(Cx.q[K.c[(i)*8+6]],48)
-# define C7(K,i) ROTATE(Cx.q[K.c[(i)*8+7]],56)
-# else
-# define N 8
-# define LL(c0,c1,c2,c3,c4,c5,c6,c7) c0,c1,c2,c3,c4,c5,c6,c7, \
- c7,c0,c1,c2,c3,c4,c5,c6, \
- c6,c7,c0,c1,c2,c3,c4,c5, \
- c5,c6,c7,c0,c1,c2,c3,c4, \
- c4,c5,c6,c7,c0,c1,c2,c3, \
- c3,c4,c5,c6,c7,c0,c1,c2, \
- c2,c3,c4,c5,c6,c7,c0,c1, \
- c1,c2,c3,c4,c5,c6,c7,c0
-# define C0(K,i) (Cx.q[0+8*K.c[(i)*8+0]])
-# define C1(K,i) (Cx.q[1+8*K.c[(i)*8+1]])
-# define C2(K,i) (Cx.q[2+8*K.c[(i)*8+2]])
-# define C3(K,i) (Cx.q[3+8*K.c[(i)*8+3]])
-# define C4(K,i) (Cx.q[4+8*K.c[(i)*8+4]])
-# define C5(K,i) (Cx.q[5+8*K.c[(i)*8+5]])
-# define C6(K,i) (Cx.q[6+8*K.c[(i)*8+6]])
-# define C7(K,i) (Cx.q[7+8*K.c[(i)*8+7]])
-# endif
+#if defined(ROTATE)
+#define N 1
+#define LL(c0, c1, c2, c3, c4, c5, c6, c7) c0, c1, c2, c3, c4, c5, c6, c7
+#define C0(K, i) (Cx.q[K.c[(i) * 8 + 0]])
+#define C1(K, i) ROTATE(Cx.q[K.c[(i) * 8 + 1]], 8)
+#define C2(K, i) ROTATE(Cx.q[K.c[(i) * 8 + 2]], 16)
+#define C3(K, i) ROTATE(Cx.q[K.c[(i) * 8 + 3]], 24)
+#define C4(K, i) ROTATE(Cx.q[K.c[(i) * 8 + 4]], 32)
+#define C5(K, i) ROTATE(Cx.q[K.c[(i) * 8 + 5]], 40)
+#define C6(K, i) ROTATE(Cx.q[K.c[(i) * 8 + 6]], 48)
+#define C7(K, i) ROTATE(Cx.q[K.c[(i) * 8 + 7]], 56)
+#else
+#define N 8
+#define LL(c0, c1, c2, c3, c4, c5, c6, c7) c0, c1, c2, c3, c4, c5, c6, c7, \
+ c7, c0, c1, c2, c3, c4, c5, c6, \
+ c6, c7, c0, c1, c2, c3, c4, c5, \
+ c5, c6, c7, c0, c1, c2, c3, c4, \
+ c4, c5, c6, c7, c0, c1, c2, c3, \
+ c3, c4, c5, c6, c7, c0, c1, c2, \
+ c2, c3, c4, c5, c6, c7, c0, c1, \
+ c1, c2, c3, c4, c5, c6, c7, c0
+#define C0(K, i) (Cx.q[0 + 8 * K.c[(i) * 8 + 0]])
+#define C1(K, i) (Cx.q[1 + 8 * K.c[(i) * 8 + 1]])
+#define C2(K, i) (Cx.q[2 + 8 * K.c[(i) * 8 + 2]])
+#define C3(K, i) (Cx.q[3 + 8 * K.c[(i) * 8 + 3]])
+#define C4(K, i) (Cx.q[4 + 8 * K.c[(i) * 8 + 4]])
+#define C5(K, i) (Cx.q[5 + 8 * K.c[(i) * 8 + 5]])
+#define C6(K, i) (Cx.q[6 + 8 * K.c[(i) * 8 + 6]])
+#define C7(K, i) (Cx.q[7 + 8 * K.c[(i) * 8 + 7]])
+#endif
#else
-# define N 2
-# define LL(c0,c1,c2,c3,c4,c5,c6,c7) c0,c1,c2,c3,c4,c5,c6,c7, \
- c0,c1,c2,c3,c4,c5,c6,c7
-# define C0(K,i) (((u64*)(Cx.c+0))[2*K.c[(i)*8+0]])
-# define C1(K,i) (((u64_a1*)(Cx.c+7))[2*K.c[(i)*8+1]])
-# define C2(K,i) (((u64_a1*)(Cx.c+6))[2*K.c[(i)*8+2]])
-# define C3(K,i) (((u64_a1*)(Cx.c+5))[2*K.c[(i)*8+3]])
-# define C4(K,i) (((u64_a1*)(Cx.c+4))[2*K.c[(i)*8+4]])
-# define C5(K,i) (((u64_a1*)(Cx.c+3))[2*K.c[(i)*8+5]])
-# define C6(K,i) (((u64_a1*)(Cx.c+2))[2*K.c[(i)*8+6]])
-# define C7(K,i) (((u64_a1*)(Cx.c+1))[2*K.c[(i)*8+7]])
+#define N 2
+#define LL(c0, c1, c2, c3, c4, c5, c6, c7) c0, c1, c2, c3, c4, c5, c6, c7, \
+ c0, c1, c2, c3, c4, c5, c6, c7
+#define C0(K, i) (((u64 *)(Cx.c + 0))[2 * K.c[(i) * 8 + 0]])
+#define C1(K, i) (((u64_a1 *)(Cx.c + 7))[2 * K.c[(i) * 8 + 1]])
+#define C2(K, i) (((u64_a1 *)(Cx.c + 6))[2 * K.c[(i) * 8 + 2]])
+#define C3(K, i) (((u64_a1 *)(Cx.c + 5))[2 * K.c[(i) * 8 + 3]])
+#define C4(K, i) (((u64_a1 *)(Cx.c + 4))[2 * K.c[(i) * 8 + 4]])
+#define C5(K, i) (((u64_a1 *)(Cx.c + 3))[2 * K.c[(i) * 8 + 5]])
+#define C6(K, i) (((u64_a1 *)(Cx.c + 2))[2 * K.c[(i) * 8 + 6]])
+#define C7(K, i) (((u64_a1 *)(Cx.c + 1))[2 * K.c[(i) * 8 + 7]])
#endif
-static const
- union {
+static const union {
u8 c[(256 * N + ROUNDS) * sizeof(u64)];
u64 q[(256 * N + ROUNDS)];
} Cx = {
- {
- /* Note endian-neutral representation:-) */
- LL(0x18, 0x18, 0x60, 0x18, 0xc0, 0x78, 0x30, 0xd8),
- LL(0x23, 0x23, 0x8c, 0x23, 0x05, 0xaf, 0x46, 0x26),
- LL(0xc6, 0xc6, 0x3f, 0xc6, 0x7e, 0xf9, 0x91, 0xb8),
- LL(0xe8, 0xe8, 0x87, 0xe8, 0x13, 0x6f, 0xcd, 0xfb),
- LL(0x87, 0x87, 0x26, 0x87, 0x4c, 0xa1, 0x13, 0xcb),
- LL(0xb8, 0xb8, 0xda, 0xb8, 0xa9, 0x62, 0x6d, 0x11),
- LL(0x01, 0x01, 0x04, 0x01, 0x08, 0x05, 0x02, 0x09),
- LL(0x4f, 0x4f, 0x21, 0x4f, 0x42, 0x6e, 0x9e, 0x0d),
- LL(0x36, 0x36, 0xd8, 0x36, 0xad, 0xee, 0x6c, 0x9b),
- LL(0xa6, 0xa6, 0xa2, 0xa6, 0x59, 0x04, 0x51, 0xff),
- LL(0xd2, 0xd2, 0x6f, 0xd2, 0xde, 0xbd, 0xb9, 0x0c),
- LL(0xf5, 0xf5, 0xf3, 0xf5, 0xfb, 0x06, 0xf7, 0x0e),
- LL(0x79, 0x79, 0xf9, 0x79, 0xef, 0x80, 0xf2, 0x96),
- LL(0x6f, 0x6f, 0xa1, 0x6f, 0x5f, 0xce, 0xde, 0x30),
- LL(0x91, 0x91, 0x7e, 0x91, 0xfc, 0xef, 0x3f, 0x6d),
- LL(0x52, 0x52, 0x55, 0x52, 0xaa, 0x07, 0xa4, 0xf8),
- LL(0x60, 0x60, 0x9d, 0x60, 0x27, 0xfd, 0xc0, 0x47),
- LL(0xbc, 0xbc, 0xca, 0xbc, 0x89, 0x76, 0x65, 0x35),
- LL(0x9b, 0x9b, 0x56, 0x9b, 0xac, 0xcd, 0x2b, 0x37),
- LL(0x8e, 0x8e, 0x02, 0x8e, 0x04, 0x8c, 0x01, 0x8a),
- LL(0xa3, 0xa3, 0xb6, 0xa3, 0x71, 0x15, 0x5b, 0xd2),
- LL(0x0c, 0x0c, 0x30, 0x0c, 0x60, 0x3c, 0x18, 0x6c),
- LL(0x7b, 0x7b, 0xf1, 0x7b, 0xff, 0x8a, 0xf6, 0x84),
- LL(0x35, 0x35, 0xd4, 0x35, 0xb5, 0xe1, 0x6a, 0x80),
- LL(0x1d, 0x1d, 0x74, 0x1d, 0xe8, 0x69, 0x3a, 0xf5),
- LL(0xe0, 0xe0, 0xa7, 0xe0, 0x53, 0x47, 0xdd, 0xb3),
- LL(0xd7, 0xd7, 0x7b, 0xd7, 0xf6, 0xac, 0xb3, 0x21),
- LL(0xc2, 0xc2, 0x2f, 0xc2, 0x5e, 0xed, 0x99, 0x9c),
- LL(0x2e, 0x2e, 0xb8, 0x2e, 0x6d, 0x96, 0x5c, 0x43),
- LL(0x4b, 0x4b, 0x31, 0x4b, 0x62, 0x7a, 0x96, 0x29),
- LL(0xfe, 0xfe, 0xdf, 0xfe, 0xa3, 0x21, 0xe1, 0x5d),
- LL(0x57, 0x57, 0x41, 0x57, 0x82, 0x16, 0xae, 0xd5),
- LL(0x15, 0x15, 0x54, 0x15, 0xa8, 0x41, 0x2a, 0xbd),
- LL(0x77, 0x77, 0xc1, 0x77, 0x9f, 0xb6, 0xee, 0xe8),
- LL(0x37, 0x37, 0xdc, 0x37, 0xa5, 0xeb, 0x6e, 0x92),
- LL(0xe5, 0xe5, 0xb3, 0xe5, 0x7b, 0x56, 0xd7, 0x9e),
- LL(0x9f, 0x9f, 0x46, 0x9f, 0x8c, 0xd9, 0x23, 0x13),
- LL(0xf0, 0xf0, 0xe7, 0xf0, 0xd3, 0x17, 0xfd, 0x23),
- LL(0x4a, 0x4a, 0x35, 0x4a, 0x6a, 0x7f, 0x94, 0x20),
- LL(0xda, 0xda, 0x4f, 0xda, 0x9e, 0x95, 0xa9, 0x44),
- LL(0x58, 0x58, 0x7d, 0x58, 0xfa, 0x25, 0xb0, 0xa2),
- LL(0xc9, 0xc9, 0x03, 0xc9, 0x06, 0xca, 0x8f, 0xcf),
- LL(0x29, 0x29, 0xa4, 0x29, 0x55, 0x8d, 0x52, 0x7c),
- LL(0x0a, 0x0a, 0x28, 0x0a, 0x50, 0x22, 0x14, 0x5a),
- LL(0xb1, 0xb1, 0xfe, 0xb1, 0xe1, 0x4f, 0x7f, 0x50),
- LL(0xa0, 0xa0, 0xba, 0xa0, 0x69, 0x1a, 0x5d, 0xc9),
- LL(0x6b, 0x6b, 0xb1, 0x6b, 0x7f, 0xda, 0xd6, 0x14),
- LL(0x85, 0x85, 0x2e, 0x85, 0x5c, 0xab, 0x17, 0xd9),
- LL(0xbd, 0xbd, 0xce, 0xbd, 0x81, 0x73, 0x67, 0x3c),
- LL(0x5d, 0x5d, 0x69, 0x5d, 0xd2, 0x34, 0xba, 0x8f),
- LL(0x10, 0x10, 0x40, 0x10, 0x80, 0x50, 0x20, 0x90),
- LL(0xf4, 0xf4, 0xf7, 0xf4, 0xf3, 0x03, 0xf5, 0x07),
- LL(0xcb, 0xcb, 0x0b, 0xcb, 0x16, 0xc0, 0x8b, 0xdd),
- LL(0x3e, 0x3e, 0xf8, 0x3e, 0xed, 0xc6, 0x7c, 0xd3),
- LL(0x05, 0x05, 0x14, 0x05, 0x28, 0x11, 0x0a, 0x2d),
- LL(0x67, 0x67, 0x81, 0x67, 0x1f, 0xe6, 0xce, 0x78),
- LL(0xe4, 0xe4, 0xb7, 0xe4, 0x73, 0x53, 0xd5, 0x97),
- LL(0x27, 0x27, 0x9c, 0x27, 0x25, 0xbb, 0x4e, 0x02),
- LL(0x41, 0x41, 0x19, 0x41, 0x32, 0x58, 0x82, 0x73),
- LL(0x8b, 0x8b, 0x16, 0x8b, 0x2c, 0x9d, 0x0b, 0xa7),
- LL(0xa7, 0xa7, 0xa6, 0xa7, 0x51, 0x01, 0x53, 0xf6),
- LL(0x7d, 0x7d, 0xe9, 0x7d, 0xcf, 0x94, 0xfa, 0xb2),
- LL(0x95, 0x95, 0x6e, 0x95, 0xdc, 0xfb, 0x37, 0x49),
- LL(0xd8, 0xd8, 0x47, 0xd8, 0x8e, 0x9f, 0xad, 0x56),
- LL(0xfb, 0xfb, 0xcb, 0xfb, 0x8b, 0x30, 0xeb, 0x70),
- LL(0xee, 0xee, 0x9f, 0xee, 0x23, 0x71, 0xc1, 0xcd),
- LL(0x7c, 0x7c, 0xed, 0x7c, 0xc7, 0x91, 0xf8, 0xbb),
- LL(0x66, 0x66, 0x85, 0x66, 0x17, 0xe3, 0xcc, 0x71),
- LL(0xdd, 0xdd, 0x53, 0xdd, 0xa6, 0x8e, 0xa7, 0x7b),
- LL(0x17, 0x17, 0x5c, 0x17, 0xb8, 0x4b, 0x2e, 0xaf),
- LL(0x47, 0x47, 0x01, 0x47, 0x02, 0x46, 0x8e, 0x45),
- LL(0x9e, 0x9e, 0x42, 0x9e, 0x84, 0xdc, 0x21, 0x1a),
- LL(0xca, 0xca, 0x0f, 0xca, 0x1e, 0xc5, 0x89, 0xd4),
- LL(0x2d, 0x2d, 0xb4, 0x2d, 0x75, 0x99, 0x5a, 0x58),
- LL(0xbf, 0xbf, 0xc6, 0xbf, 0x91, 0x79, 0x63, 0x2e),
- LL(0x07, 0x07, 0x1c, 0x07, 0x38, 0x1b, 0x0e, 0x3f),
- LL(0xad, 0xad, 0x8e, 0xad, 0x01, 0x23, 0x47, 0xac),
- LL(0x5a, 0x5a, 0x75, 0x5a, 0xea, 0x2f, 0xb4, 0xb0),
- LL(0x83, 0x83, 0x36, 0x83, 0x6c, 0xb5, 0x1b, 0xef),
- LL(0x33, 0x33, 0xcc, 0x33, 0x85, 0xff, 0x66, 0xb6),
- LL(0x63, 0x63, 0x91, 0x63, 0x3f, 0xf2, 0xc6, 0x5c),
- LL(0x02, 0x02, 0x08, 0x02, 0x10, 0x0a, 0x04, 0x12),
- LL(0xaa, 0xaa, 0x92, 0xaa, 0x39, 0x38, 0x49, 0x93),
- LL(0x71, 0x71, 0xd9, 0x71, 0xaf, 0xa8, 0xe2, 0xde),
- LL(0xc8, 0xc8, 0x07, 0xc8, 0x0e, 0xcf, 0x8d, 0xc6),
- LL(0x19, 0x19, 0x64, 0x19, 0xc8, 0x7d, 0x32, 0xd1),
- LL(0x49, 0x49, 0x39, 0x49, 0x72, 0x70, 0x92, 0x3b),
- LL(0xd9, 0xd9, 0x43, 0xd9, 0x86, 0x9a, 0xaf, 0x5f),
- LL(0xf2, 0xf2, 0xef, 0xf2, 0xc3, 0x1d, 0xf9, 0x31),
- LL(0xe3, 0xe3, 0xab, 0xe3, 0x4b, 0x48, 0xdb, 0xa8),
- LL(0x5b, 0x5b, 0x71, 0x5b, 0xe2, 0x2a, 0xb6, 0xb9),
- LL(0x88, 0x88, 0x1a, 0x88, 0x34, 0x92, 0x0d, 0xbc),
- LL(0x9a, 0x9a, 0x52, 0x9a, 0xa4, 0xc8, 0x29, 0x3e),
- LL(0x26, 0x26, 0x98, 0x26, 0x2d, 0xbe, 0x4c, 0x0b),
- LL(0x32, 0x32, 0xc8, 0x32, 0x8d, 0xfa, 0x64, 0xbf),
- LL(0xb0, 0xb0, 0xfa, 0xb0, 0xe9, 0x4a, 0x7d, 0x59),
- LL(0xe9, 0xe9, 0x83, 0xe9, 0x1b, 0x6a, 0xcf, 0xf2),
- LL(0x0f, 0x0f, 0x3c, 0x0f, 0x78, 0x33, 0x1e, 0x77),
- LL(0xd5, 0xd5, 0x73, 0xd5, 0xe6, 0xa6, 0xb7, 0x33),
- LL(0x80, 0x80, 0x3a, 0x80, 0x74, 0xba, 0x1d, 0xf4),
- LL(0xbe, 0xbe, 0xc2, 0xbe, 0x99, 0x7c, 0x61, 0x27),
- LL(0xcd, 0xcd, 0x13, 0xcd, 0x26, 0xde, 0x87, 0xeb),
- LL(0x34, 0x34, 0xd0, 0x34, 0xbd, 0xe4, 0x68, 0x89),
- LL(0x48, 0x48, 0x3d, 0x48, 0x7a, 0x75, 0x90, 0x32),
- LL(0xff, 0xff, 0xdb, 0xff, 0xab, 0x24, 0xe3, 0x54),
- LL(0x7a, 0x7a, 0xf5, 0x7a, 0xf7, 0x8f, 0xf4, 0x8d),
- LL(0x90, 0x90, 0x7a, 0x90, 0xf4, 0xea, 0x3d, 0x64),
- LL(0x5f, 0x5f, 0x61, 0x5f, 0xc2, 0x3e, 0xbe, 0x9d),
- LL(0x20, 0x20, 0x80, 0x20, 0x1d, 0xa0, 0x40, 0x3d),
- LL(0x68, 0x68, 0xbd, 0x68, 0x67, 0xd5, 0xd0, 0x0f),
- LL(0x1a, 0x1a, 0x68, 0x1a, 0xd0, 0x72, 0x34, 0xca),
- LL(0xae, 0xae, 0x82, 0xae, 0x19, 0x2c, 0x41, 0xb7),
- LL(0xb4, 0xb4, 0xea, 0xb4, 0xc9, 0x5e, 0x75, 0x7d),
- LL(0x54, 0x54, 0x4d, 0x54, 0x9a, 0x19, 0xa8, 0xce),
- LL(0x93, 0x93, 0x76, 0x93, 0xec, 0xe5, 0x3b, 0x7f),
- LL(0x22, 0x22, 0x88, 0x22, 0x0d, 0xaa, 0x44, 0x2f),
- LL(0x64, 0x64, 0x8d, 0x64, 0x07, 0xe9, 0xc8, 0x63),
- LL(0xf1, 0xf1, 0xe3, 0xf1, 0xdb, 0x12, 0xff, 0x2a),
- LL(0x73, 0x73, 0xd1, 0x73, 0xbf, 0xa2, 0xe6, 0xcc),
- LL(0x12, 0x12, 0x48, 0x12, 0x90, 0x5a, 0x24, 0x82),
- LL(0x40, 0x40, 0x1d, 0x40, 0x3a, 0x5d, 0x80, 0x7a),
- LL(0x08, 0x08, 0x20, 0x08, 0x40, 0x28, 0x10, 0x48),
- LL(0xc3, 0xc3, 0x2b, 0xc3, 0x56, 0xe8, 0x9b, 0x95),
- LL(0xec, 0xec, 0x97, 0xec, 0x33, 0x7b, 0xc5, 0xdf),
- LL(0xdb, 0xdb, 0x4b, 0xdb, 0x96, 0x90, 0xab, 0x4d),
- LL(0xa1, 0xa1, 0xbe, 0xa1, 0x61, 0x1f, 0x5f, 0xc0),
- LL(0x8d, 0x8d, 0x0e, 0x8d, 0x1c, 0x83, 0x07, 0x91),
- LL(0x3d, 0x3d, 0xf4, 0x3d, 0xf5, 0xc9, 0x7a, 0xc8),
- LL(0x97, 0x97, 0x66, 0x97, 0xcc, 0xf1, 0x33, 0x5b),
- LL(0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00),
- LL(0xcf, 0xcf, 0x1b, 0xcf, 0x36, 0xd4, 0x83, 0xf9),
- LL(0x2b, 0x2b, 0xac, 0x2b, 0x45, 0x87, 0x56, 0x6e),
- LL(0x76, 0x76, 0xc5, 0x76, 0x97, 0xb3, 0xec, 0xe1),
- LL(0x82, 0x82, 0x32, 0x82, 0x64, 0xb0, 0x19, 0xe6),
- LL(0xd6, 0xd6, 0x7f, 0xd6, 0xfe, 0xa9, 0xb1, 0x28),
- LL(0x1b, 0x1b, 0x6c, 0x1b, 0xd8, 0x77, 0x36, 0xc3),
- LL(0xb5, 0xb5, 0xee, 0xb5, 0xc1, 0x5b, 0x77, 0x74),
- LL(0xaf, 0xaf, 0x86, 0xaf, 0x11, 0x29, 0x43, 0xbe),
- LL(0x6a, 0x6a, 0xb5, 0x6a, 0x77, 0xdf, 0xd4, 0x1d),
- LL(0x50, 0x50, 0x5d, 0x50, 0xba, 0x0d, 0xa0, 0xea),
- LL(0x45, 0x45, 0x09, 0x45, 0x12, 0x4c, 0x8a, 0x57),
- LL(0xf3, 0xf3, 0xeb, 0xf3, 0xcb, 0x18, 0xfb, 0x38),
- LL(0x30, 0x30, 0xc0, 0x30, 0x9d, 0xf0, 0x60, 0xad),
- LL(0xef, 0xef, 0x9b, 0xef, 0x2b, 0x74, 0xc3, 0xc4),
- LL(0x3f, 0x3f, 0xfc, 0x3f, 0xe5, 0xc3, 0x7e, 0xda),
- LL(0x55, 0x55, 0x49, 0x55, 0x92, 0x1c, 0xaa, 0xc7),
- LL(0xa2, 0xa2, 0xb2, 0xa2, 0x79, 0x10, 0x59, 0xdb),
- LL(0xea, 0xea, 0x8f, 0xea, 0x03, 0x65, 0xc9, 0xe9),
- LL(0x65, 0x65, 0x89, 0x65, 0x0f, 0xec, 0xca, 0x6a),
- LL(0xba, 0xba, 0xd2, 0xba, 0xb9, 0x68, 0x69, 0x03),
- LL(0x2f, 0x2f, 0xbc, 0x2f, 0x65, 0x93, 0x5e, 0x4a),
- LL(0xc0, 0xc0, 0x27, 0xc0, 0x4e, 0xe7, 0x9d, 0x8e),
- LL(0xde, 0xde, 0x5f, 0xde, 0xbe, 0x81, 0xa1, 0x60),
- LL(0x1c, 0x1c, 0x70, 0x1c, 0xe0, 0x6c, 0x38, 0xfc),
- LL(0xfd, 0xfd, 0xd3, 0xfd, 0xbb, 0x2e, 0xe7, 0x46),
- LL(0x4d, 0x4d, 0x29, 0x4d, 0x52, 0x64, 0x9a, 0x1f),
- LL(0x92, 0x92, 0x72, 0x92, 0xe4, 0xe0, 0x39, 0x76),
- LL(0x75, 0x75, 0xc9, 0x75, 0x8f, 0xbc, 0xea, 0xfa),
- LL(0x06, 0x06, 0x18, 0x06, 0x30, 0x1e, 0x0c, 0x36),
- LL(0x8a, 0x8a, 0x12, 0x8a, 0x24, 0x98, 0x09, 0xae),
- LL(0xb2, 0xb2, 0xf2, 0xb2, 0xf9, 0x40, 0x79, 0x4b),
- LL(0xe6, 0xe6, 0xbf, 0xe6, 0x63, 0x59, 0xd1, 0x85),
- LL(0x0e, 0x0e, 0x38, 0x0e, 0x70, 0x36, 0x1c, 0x7e),
- LL(0x1f, 0x1f, 0x7c, 0x1f, 0xf8, 0x63, 0x3e, 0xe7),
- LL(0x62, 0x62, 0x95, 0x62, 0x37, 0xf7, 0xc4, 0x55),
- LL(0xd4, 0xd4, 0x77, 0xd4, 0xee, 0xa3, 0xb5, 0x3a),
- LL(0xa8, 0xa8, 0x9a, 0xa8, 0x29, 0x32, 0x4d, 0x81),
- LL(0x96, 0x96, 0x62, 0x96, 0xc4, 0xf4, 0x31, 0x52),
- LL(0xf9, 0xf9, 0xc3, 0xf9, 0x9b, 0x3a, 0xef, 0x62),
- LL(0xc5, 0xc5, 0x33, 0xc5, 0x66, 0xf6, 0x97, 0xa3),
- LL(0x25, 0x25, 0x94, 0x25, 0x35, 0xb1, 0x4a, 0x10),
- LL(0x59, 0x59, 0x79, 0x59, 0xf2, 0x20, 0xb2, 0xab),
- LL(0x84, 0x84, 0x2a, 0x84, 0x54, 0xae, 0x15, 0xd0),
- LL(0x72, 0x72, 0xd5, 0x72, 0xb7, 0xa7, 0xe4, 0xc5),
- LL(0x39, 0x39, 0xe4, 0x39, 0xd5, 0xdd, 0x72, 0xec),
- LL(0x4c, 0x4c, 0x2d, 0x4c, 0x5a, 0x61, 0x98, 0x16),
- LL(0x5e, 0x5e, 0x65, 0x5e, 0xca, 0x3b, 0xbc, 0x94),
- LL(0x78, 0x78, 0xfd, 0x78, 0xe7, 0x85, 0xf0, 0x9f),
- LL(0x38, 0x38, 0xe0, 0x38, 0xdd, 0xd8, 0x70, 0xe5),
- LL(0x8c, 0x8c, 0x0a, 0x8c, 0x14, 0x86, 0x05, 0x98),
- LL(0xd1, 0xd1, 0x63, 0xd1, 0xc6, 0xb2, 0xbf, 0x17),
- LL(0xa5, 0xa5, 0xae, 0xa5, 0x41, 0x0b, 0x57, 0xe4),
- LL(0xe2, 0xe2, 0xaf, 0xe2, 0x43, 0x4d, 0xd9, 0xa1),
- LL(0x61, 0x61, 0x99, 0x61, 0x2f, 0xf8, 0xc2, 0x4e),
- LL(0xb3, 0xb3, 0xf6, 0xb3, 0xf1, 0x45, 0x7b, 0x42),
- LL(0x21, 0x21, 0x84, 0x21, 0x15, 0xa5, 0x42, 0x34),
- LL(0x9c, 0x9c, 0x4a, 0x9c, 0x94, 0xd6, 0x25, 0x08),
- LL(0x1e, 0x1e, 0x78, 0x1e, 0xf0, 0x66, 0x3c, 0xee),
- LL(0x43, 0x43, 0x11, 0x43, 0x22, 0x52, 0x86, 0x61),
- LL(0xc7, 0xc7, 0x3b, 0xc7, 0x76, 0xfc, 0x93, 0xb1),
- LL(0xfc, 0xfc, 0xd7, 0xfc, 0xb3, 0x2b, 0xe5, 0x4f),
- LL(0x04, 0x04, 0x10, 0x04, 0x20, 0x14, 0x08, 0x24),
- LL(0x51, 0x51, 0x59, 0x51, 0xb2, 0x08, 0xa2, 0xe3),
- LL(0x99, 0x99, 0x5e, 0x99, 0xbc, 0xc7, 0x2f, 0x25),
- LL(0x6d, 0x6d, 0xa9, 0x6d, 0x4f, 0xc4, 0xda, 0x22),
- LL(0x0d, 0x0d, 0x34, 0x0d, 0x68, 0x39, 0x1a, 0x65),
- LL(0xfa, 0xfa, 0xcf, 0xfa, 0x83, 0x35, 0xe9, 0x79),
- LL(0xdf, 0xdf, 0x5b, 0xdf, 0xb6, 0x84, 0xa3, 0x69),
- LL(0x7e, 0x7e, 0xe5, 0x7e, 0xd7, 0x9b, 0xfc, 0xa9),
- LL(0x24, 0x24, 0x90, 0x24, 0x3d, 0xb4, 0x48, 0x19),
- LL(0x3b, 0x3b, 0xec, 0x3b, 0xc5, 0xd7, 0x76, 0xfe),
- LL(0xab, 0xab, 0x96, 0xab, 0x31, 0x3d, 0x4b, 0x9a),
- LL(0xce, 0xce, 0x1f, 0xce, 0x3e, 0xd1, 0x81, 0xf0),
- LL(0x11, 0x11, 0x44, 0x11, 0x88, 0x55, 0x22, 0x99),
- LL(0x8f, 0x8f, 0x06, 0x8f, 0x0c, 0x89, 0x03, 0x83),
- LL(0x4e, 0x4e, 0x25, 0x4e, 0x4a, 0x6b, 0x9c, 0x04),
- LL(0xb7, 0xb7, 0xe6, 0xb7, 0xd1, 0x51, 0x73, 0x66),
- LL(0xeb, 0xeb, 0x8b, 0xeb, 0x0b, 0x60, 0xcb, 0xe0),
- LL(0x3c, 0x3c, 0xf0, 0x3c, 0xfd, 0xcc, 0x78, 0xc1),
- LL(0x81, 0x81, 0x3e, 0x81, 0x7c, 0xbf, 0x1f, 0xfd),
- LL(0x94, 0x94, 0x6a, 0x94, 0xd4, 0xfe, 0x35, 0x40),
- LL(0xf7, 0xf7, 0xfb, 0xf7, 0xeb, 0x0c, 0xf3, 0x1c),
- LL(0xb9, 0xb9, 0xde, 0xb9, 0xa1, 0x67, 0x6f, 0x18),
- LL(0x13, 0x13, 0x4c, 0x13, 0x98, 0x5f, 0x26, 0x8b),
- LL(0x2c, 0x2c, 0xb0, 0x2c, 0x7d, 0x9c, 0x58, 0x51),
- LL(0xd3, 0xd3, 0x6b, 0xd3, 0xd6, 0xb8, 0xbb, 0x05),
- LL(0xe7, 0xe7, 0xbb, 0xe7, 0x6b, 0x5c, 0xd3, 0x8c),
- LL(0x6e, 0x6e, 0xa5, 0x6e, 0x57, 0xcb, 0xdc, 0x39),
- LL(0xc4, 0xc4, 0x37, 0xc4, 0x6e, 0xf3, 0x95, 0xaa),
- LL(0x03, 0x03, 0x0c, 0x03, 0x18, 0x0f, 0x06, 0x1b),
- LL(0x56, 0x56, 0x45, 0x56, 0x8a, 0x13, 0xac, 0xdc),
- LL(0x44, 0x44, 0x0d, 0x44, 0x1a, 0x49, 0x88, 0x5e),
- LL(0x7f, 0x7f, 0xe1, 0x7f, 0xdf, 0x9e, 0xfe, 0xa0),
- LL(0xa9, 0xa9, 0x9e, 0xa9, 0x21, 0x37, 0x4f, 0x88),
- LL(0x2a, 0x2a, 0xa8, 0x2a, 0x4d, 0x82, 0x54, 0x67),
- LL(0xbb, 0xbb, 0xd6, 0xbb, 0xb1, 0x6d, 0x6b, 0x0a),
- LL(0xc1, 0xc1, 0x23, 0xc1, 0x46, 0xe2, 0x9f, 0x87),
- LL(0x53, 0x53, 0x51, 0x53, 0xa2, 0x02, 0xa6, 0xf1),
- LL(0xdc, 0xdc, 0x57, 0xdc, 0xae, 0x8b, 0xa5, 0x72),
- LL(0x0b, 0x0b, 0x2c, 0x0b, 0x58, 0x27, 0x16, 0x53),
- LL(0x9d, 0x9d, 0x4e, 0x9d, 0x9c, 0xd3, 0x27, 0x01),
- LL(0x6c, 0x6c, 0xad, 0x6c, 0x47, 0xc1, 0xd8, 0x2b),
- LL(0x31, 0x31, 0xc4, 0x31, 0x95, 0xf5, 0x62, 0xa4),
- LL(0x74, 0x74, 0xcd, 0x74, 0x87, 0xb9, 0xe8, 0xf3),
- LL(0xf6, 0xf6, 0xff, 0xf6, 0xe3, 0x09, 0xf1, 0x15),
- LL(0x46, 0x46, 0x05, 0x46, 0x0a, 0x43, 0x8c, 0x4c),
- LL(0xac, 0xac, 0x8a, 0xac, 0x09, 0x26, 0x45, 0xa5),
- LL(0x89, 0x89, 0x1e, 0x89, 0x3c, 0x97, 0x0f, 0xb5),
- LL(0x14, 0x14, 0x50, 0x14, 0xa0, 0x44, 0x28, 0xb4),
- LL(0xe1, 0xe1, 0xa3, 0xe1, 0x5b, 0x42, 0xdf, 0xba),
- LL(0x16, 0x16, 0x58, 0x16, 0xb0, 0x4e, 0x2c, 0xa6),
- LL(0x3a, 0x3a, 0xe8, 0x3a, 0xcd, 0xd2, 0x74, 0xf7),
- LL(0x69, 0x69, 0xb9, 0x69, 0x6f, 0xd0, 0xd2, 0x06),
- LL(0x09, 0x09, 0x24, 0x09, 0x48, 0x2d, 0x12, 0x41),
- LL(0x70, 0x70, 0xdd, 0x70, 0xa7, 0xad, 0xe0, 0xd7),
- LL(0xb6, 0xb6, 0xe2, 0xb6, 0xd9, 0x54, 0x71, 0x6f),
- LL(0xd0, 0xd0, 0x67, 0xd0, 0xce, 0xb7, 0xbd, 0x1e),
- LL(0xed, 0xed, 0x93, 0xed, 0x3b, 0x7e, 0xc7, 0xd6),
- LL(0xcc, 0xcc, 0x17, 0xcc, 0x2e, 0xdb, 0x85, 0xe2),
- LL(0x42, 0x42, 0x15, 0x42, 0x2a, 0x57, 0x84, 0x68),
- LL(0x98, 0x98, 0x5a, 0x98, 0xb4, 0xc2, 0x2d, 0x2c),
- LL(0xa4, 0xa4, 0xaa, 0xa4, 0x49, 0x0e, 0x55, 0xed),
- LL(0x28, 0x28, 0xa0, 0x28, 0x5d, 0x88, 0x50, 0x75),
- LL(0x5c, 0x5c, 0x6d, 0x5c, 0xda, 0x31, 0xb8, 0x86),
- LL(0xf8, 0xf8, 0xc7, 0xf8, 0x93, 0x3f, 0xed, 0x6b),
- LL(0x86, 0x86, 0x22, 0x86, 0x44, 0xa4, 0x11, 0xc2),
-#define RC (&(Cx.q[256*N]))
- 0x18, 0x23, 0xc6, 0xe8, 0x87, 0xb8, 0x01, 0x4f,
- /* rc[ROUNDS] */
- 0x36, 0xa6, 0xd2, 0xf5, 0x79, 0x6f, 0x91, 0x52, 0x60, 0xbc, 0x9b,
- 0x8e, 0xa3, 0x0c, 0x7b, 0x35, 0x1d, 0xe0, 0xd7, 0xc2, 0x2e, 0x4b,
- 0xfe, 0x57, 0x15, 0x77, 0x37, 0xe5, 0x9f, 0xf0, 0x4a, 0xda, 0x58,
- 0xc9, 0x29, 0x0a, 0xb1, 0xa0, 0x6b, 0x85, 0xbd, 0x5d, 0x10, 0xf4,
- 0xcb, 0x3e, 0x05, 0x67, 0xe4, 0x27, 0x41, 0x8b, 0xa7, 0x7d, 0x95,
- 0xd8, 0xfb, 0xee, 0x7c, 0x66, 0xdd, 0x17, 0x47, 0x9e, 0xca, 0x2d,
- 0xbf, 0x07, 0xad, 0x5a, 0x83, 0x33
- }
- };
+ { /* Note endian-neutral representation:-) */
+ LL(0x18, 0x18, 0x60, 0x18, 0xc0, 0x78, 0x30, 0xd8),
+ LL(0x23, 0x23, 0x8c, 0x23, 0x05, 0xaf, 0x46, 0x26),
+ LL(0xc6, 0xc6, 0x3f, 0xc6, 0x7e, 0xf9, 0x91, 0xb8),
+ LL(0xe8, 0xe8, 0x87, 0xe8, 0x13, 0x6f, 0xcd, 0xfb),
+ LL(0x87, 0x87, 0x26, 0x87, 0x4c, 0xa1, 0x13, 0xcb),
+ LL(0xb8, 0xb8, 0xda, 0xb8, 0xa9, 0x62, 0x6d, 0x11),
+ LL(0x01, 0x01, 0x04, 0x01, 0x08, 0x05, 0x02, 0x09),
+ LL(0x4f, 0x4f, 0x21, 0x4f, 0x42, 0x6e, 0x9e, 0x0d),
+ LL(0x36, 0x36, 0xd8, 0x36, 0xad, 0xee, 0x6c, 0x9b),
+ LL(0xa6, 0xa6, 0xa2, 0xa6, 0x59, 0x04, 0x51, 0xff),
+ LL(0xd2, 0xd2, 0x6f, 0xd2, 0xde, 0xbd, 0xb9, 0x0c),
+ LL(0xf5, 0xf5, 0xf3, 0xf5, 0xfb, 0x06, 0xf7, 0x0e),
+ LL(0x79, 0x79, 0xf9, 0x79, 0xef, 0x80, 0xf2, 0x96),
+ LL(0x6f, 0x6f, 0xa1, 0x6f, 0x5f, 0xce, 0xde, 0x30),
+ LL(0x91, 0x91, 0x7e, 0x91, 0xfc, 0xef, 0x3f, 0x6d),
+ LL(0x52, 0x52, 0x55, 0x52, 0xaa, 0x07, 0xa4, 0xf8),
+ LL(0x60, 0x60, 0x9d, 0x60, 0x27, 0xfd, 0xc0, 0x47),
+ LL(0xbc, 0xbc, 0xca, 0xbc, 0x89, 0x76, 0x65, 0x35),
+ LL(0x9b, 0x9b, 0x56, 0x9b, 0xac, 0xcd, 0x2b, 0x37),
+ LL(0x8e, 0x8e, 0x02, 0x8e, 0x04, 0x8c, 0x01, 0x8a),
+ LL(0xa3, 0xa3, 0xb6, 0xa3, 0x71, 0x15, 0x5b, 0xd2),
+ LL(0x0c, 0x0c, 0x30, 0x0c, 0x60, 0x3c, 0x18, 0x6c),
+ LL(0x7b, 0x7b, 0xf1, 0x7b, 0xff, 0x8a, 0xf6, 0x84),
+ LL(0x35, 0x35, 0xd4, 0x35, 0xb5, 0xe1, 0x6a, 0x80),
+ LL(0x1d, 0x1d, 0x74, 0x1d, 0xe8, 0x69, 0x3a, 0xf5),
+ LL(0xe0, 0xe0, 0xa7, 0xe0, 0x53, 0x47, 0xdd, 0xb3),
+ LL(0xd7, 0xd7, 0x7b, 0xd7, 0xf6, 0xac, 0xb3, 0x21),
+ LL(0xc2, 0xc2, 0x2f, 0xc2, 0x5e, 0xed, 0x99, 0x9c),
+ LL(0x2e, 0x2e, 0xb8, 0x2e, 0x6d, 0x96, 0x5c, 0x43),
+ LL(0x4b, 0x4b, 0x31, 0x4b, 0x62, 0x7a, 0x96, 0x29),
+ LL(0xfe, 0xfe, 0xdf, 0xfe, 0xa3, 0x21, 0xe1, 0x5d),
+ LL(0x57, 0x57, 0x41, 0x57, 0x82, 0x16, 0xae, 0xd5),
+ LL(0x15, 0x15, 0x54, 0x15, 0xa8, 0x41, 0x2a, 0xbd),
+ LL(0x77, 0x77, 0xc1, 0x77, 0x9f, 0xb6, 0xee, 0xe8),
+ LL(0x37, 0x37, 0xdc, 0x37, 0xa5, 0xeb, 0x6e, 0x92),
+ LL(0xe5, 0xe5, 0xb3, 0xe5, 0x7b, 0x56, 0xd7, 0x9e),
+ LL(0x9f, 0x9f, 0x46, 0x9f, 0x8c, 0xd9, 0x23, 0x13),
+ LL(0xf0, 0xf0, 0xe7, 0xf0, 0xd3, 0x17, 0xfd, 0x23),
+ LL(0x4a, 0x4a, 0x35, 0x4a, 0x6a, 0x7f, 0x94, 0x20),
+ LL(0xda, 0xda, 0x4f, 0xda, 0x9e, 0x95, 0xa9, 0x44),
+ LL(0x58, 0x58, 0x7d, 0x58, 0xfa, 0x25, 0xb0, 0xa2),
+ LL(0xc9, 0xc9, 0x03, 0xc9, 0x06, 0xca, 0x8f, 0xcf),
+ LL(0x29, 0x29, 0xa4, 0x29, 0x55, 0x8d, 0x52, 0x7c),
+ LL(0x0a, 0x0a, 0x28, 0x0a, 0x50, 0x22, 0x14, 0x5a),
+ LL(0xb1, 0xb1, 0xfe, 0xb1, 0xe1, 0x4f, 0x7f, 0x50),
+ LL(0xa0, 0xa0, 0xba, 0xa0, 0x69, 0x1a, 0x5d, 0xc9),
+ LL(0x6b, 0x6b, 0xb1, 0x6b, 0x7f, 0xda, 0xd6, 0x14),
+ LL(0x85, 0x85, 0x2e, 0x85, 0x5c, 0xab, 0x17, 0xd9),
+ LL(0xbd, 0xbd, 0xce, 0xbd, 0x81, 0x73, 0x67, 0x3c),
+ LL(0x5d, 0x5d, 0x69, 0x5d, 0xd2, 0x34, 0xba, 0x8f),
+ LL(0x10, 0x10, 0x40, 0x10, 0x80, 0x50, 0x20, 0x90),
+ LL(0xf4, 0xf4, 0xf7, 0xf4, 0xf3, 0x03, 0xf5, 0x07),
+ LL(0xcb, 0xcb, 0x0b, 0xcb, 0x16, 0xc0, 0x8b, 0xdd),
+ LL(0x3e, 0x3e, 0xf8, 0x3e, 0xed, 0xc6, 0x7c, 0xd3),
+ LL(0x05, 0x05, 0x14, 0x05, 0x28, 0x11, 0x0a, 0x2d),
+ LL(0x67, 0x67, 0x81, 0x67, 0x1f, 0xe6, 0xce, 0x78),
+ LL(0xe4, 0xe4, 0xb7, 0xe4, 0x73, 0x53, 0xd5, 0x97),
+ LL(0x27, 0x27, 0x9c, 0x27, 0x25, 0xbb, 0x4e, 0x02),
+ LL(0x41, 0x41, 0x19, 0x41, 0x32, 0x58, 0x82, 0x73),
+ LL(0x8b, 0x8b, 0x16, 0x8b, 0x2c, 0x9d, 0x0b, 0xa7),
+ LL(0xa7, 0xa7, 0xa6, 0xa7, 0x51, 0x01, 0x53, 0xf6),
+ LL(0x7d, 0x7d, 0xe9, 0x7d, 0xcf, 0x94, 0xfa, 0xb2),
+ LL(0x95, 0x95, 0x6e, 0x95, 0xdc, 0xfb, 0x37, 0x49),
+ LL(0xd8, 0xd8, 0x47, 0xd8, 0x8e, 0x9f, 0xad, 0x56),
+ LL(0xfb, 0xfb, 0xcb, 0xfb, 0x8b, 0x30, 0xeb, 0x70),
+ LL(0xee, 0xee, 0x9f, 0xee, 0x23, 0x71, 0xc1, 0xcd),
+ LL(0x7c, 0x7c, 0xed, 0x7c, 0xc7, 0x91, 0xf8, 0xbb),
+ LL(0x66, 0x66, 0x85, 0x66, 0x17, 0xe3, 0xcc, 0x71),
+ LL(0xdd, 0xdd, 0x53, 0xdd, 0xa6, 0x8e, 0xa7, 0x7b),
+ LL(0x17, 0x17, 0x5c, 0x17, 0xb8, 0x4b, 0x2e, 0xaf),
+ LL(0x47, 0x47, 0x01, 0x47, 0x02, 0x46, 0x8e, 0x45),
+ LL(0x9e, 0x9e, 0x42, 0x9e, 0x84, 0xdc, 0x21, 0x1a),
+ LL(0xca, 0xca, 0x0f, 0xca, 0x1e, 0xc5, 0x89, 0xd4),
+ LL(0x2d, 0x2d, 0xb4, 0x2d, 0x75, 0x99, 0x5a, 0x58),
+ LL(0xbf, 0xbf, 0xc6, 0xbf, 0x91, 0x79, 0x63, 0x2e),
+ LL(0x07, 0x07, 0x1c, 0x07, 0x38, 0x1b, 0x0e, 0x3f),
+ LL(0xad, 0xad, 0x8e, 0xad, 0x01, 0x23, 0x47, 0xac),
+ LL(0x5a, 0x5a, 0x75, 0x5a, 0xea, 0x2f, 0xb4, 0xb0),
+ LL(0x83, 0x83, 0x36, 0x83, 0x6c, 0xb5, 0x1b, 0xef),
+ LL(0x33, 0x33, 0xcc, 0x33, 0x85, 0xff, 0x66, 0xb6),
+ LL(0x63, 0x63, 0x91, 0x63, 0x3f, 0xf2, 0xc6, 0x5c),
+ LL(0x02, 0x02, 0x08, 0x02, 0x10, 0x0a, 0x04, 0x12),
+ LL(0xaa, 0xaa, 0x92, 0xaa, 0x39, 0x38, 0x49, 0x93),
+ LL(0x71, 0x71, 0xd9, 0x71, 0xaf, 0xa8, 0xe2, 0xde),
+ LL(0xc8, 0xc8, 0x07, 0xc8, 0x0e, 0xcf, 0x8d, 0xc6),
+ LL(0x19, 0x19, 0x64, 0x19, 0xc8, 0x7d, 0x32, 0xd1),
+ LL(0x49, 0x49, 0x39, 0x49, 0x72, 0x70, 0x92, 0x3b),
+ LL(0xd9, 0xd9, 0x43, 0xd9, 0x86, 0x9a, 0xaf, 0x5f),
+ LL(0xf2, 0xf2, 0xef, 0xf2, 0xc3, 0x1d, 0xf9, 0x31),
+ LL(0xe3, 0xe3, 0xab, 0xe3, 0x4b, 0x48, 0xdb, 0xa8),
+ LL(0x5b, 0x5b, 0x71, 0x5b, 0xe2, 0x2a, 0xb6, 0xb9),
+ LL(0x88, 0x88, 0x1a, 0x88, 0x34, 0x92, 0x0d, 0xbc),
+ LL(0x9a, 0x9a, 0x52, 0x9a, 0xa4, 0xc8, 0x29, 0x3e),
+ LL(0x26, 0x26, 0x98, 0x26, 0x2d, 0xbe, 0x4c, 0x0b),
+ LL(0x32, 0x32, 0xc8, 0x32, 0x8d, 0xfa, 0x64, 0xbf),
+ LL(0xb0, 0xb0, 0xfa, 0xb0, 0xe9, 0x4a, 0x7d, 0x59),
+ LL(0xe9, 0xe9, 0x83, 0xe9, 0x1b, 0x6a, 0xcf, 0xf2),
+ LL(0x0f, 0x0f, 0x3c, 0x0f, 0x78, 0x33, 0x1e, 0x77),
+ LL(0xd5, 0xd5, 0x73, 0xd5, 0xe6, 0xa6, 0xb7, 0x33),
+ LL(0x80, 0x80, 0x3a, 0x80, 0x74, 0xba, 0x1d, 0xf4),
+ LL(0xbe, 0xbe, 0xc2, 0xbe, 0x99, 0x7c, 0x61, 0x27),
+ LL(0xcd, 0xcd, 0x13, 0xcd, 0x26, 0xde, 0x87, 0xeb),
+ LL(0x34, 0x34, 0xd0, 0x34, 0xbd, 0xe4, 0x68, 0x89),
+ LL(0x48, 0x48, 0x3d, 0x48, 0x7a, 0x75, 0x90, 0x32),
+ LL(0xff, 0xff, 0xdb, 0xff, 0xab, 0x24, 0xe3, 0x54),
+ LL(0x7a, 0x7a, 0xf5, 0x7a, 0xf7, 0x8f, 0xf4, 0x8d),
+ LL(0x90, 0x90, 0x7a, 0x90, 0xf4, 0xea, 0x3d, 0x64),
+ LL(0x5f, 0x5f, 0x61, 0x5f, 0xc2, 0x3e, 0xbe, 0x9d),
+ LL(0x20, 0x20, 0x80, 0x20, 0x1d, 0xa0, 0x40, 0x3d),
+ LL(0x68, 0x68, 0xbd, 0x68, 0x67, 0xd5, 0xd0, 0x0f),
+ LL(0x1a, 0x1a, 0x68, 0x1a, 0xd0, 0x72, 0x34, 0xca),
+ LL(0xae, 0xae, 0x82, 0xae, 0x19, 0x2c, 0x41, 0xb7),
+ LL(0xb4, 0xb4, 0xea, 0xb4, 0xc9, 0x5e, 0x75, 0x7d),
+ LL(0x54, 0x54, 0x4d, 0x54, 0x9a, 0x19, 0xa8, 0xce),
+ LL(0x93, 0x93, 0x76, 0x93, 0xec, 0xe5, 0x3b, 0x7f),
+ LL(0x22, 0x22, 0x88, 0x22, 0x0d, 0xaa, 0x44, 0x2f),
+ LL(0x64, 0x64, 0x8d, 0x64, 0x07, 0xe9, 0xc8, 0x63),
+ LL(0xf1, 0xf1, 0xe3, 0xf1, 0xdb, 0x12, 0xff, 0x2a),
+ LL(0x73, 0x73, 0xd1, 0x73, 0xbf, 0xa2, 0xe6, 0xcc),
+ LL(0x12, 0x12, 0x48, 0x12, 0x90, 0x5a, 0x24, 0x82),
+ LL(0x40, 0x40, 0x1d, 0x40, 0x3a, 0x5d, 0x80, 0x7a),
+ LL(0x08, 0x08, 0x20, 0x08, 0x40, 0x28, 0x10, 0x48),
+ LL(0xc3, 0xc3, 0x2b, 0xc3, 0x56, 0xe8, 0x9b, 0x95),
+ LL(0xec, 0xec, 0x97, 0xec, 0x33, 0x7b, 0xc5, 0xdf),
+ LL(0xdb, 0xdb, 0x4b, 0xdb, 0x96, 0x90, 0xab, 0x4d),
+ LL(0xa1, 0xa1, 0xbe, 0xa1, 0x61, 0x1f, 0x5f, 0xc0),
+ LL(0x8d, 0x8d, 0x0e, 0x8d, 0x1c, 0x83, 0x07, 0x91),
+ LL(0x3d, 0x3d, 0xf4, 0x3d, 0xf5, 0xc9, 0x7a, 0xc8),
+ LL(0x97, 0x97, 0x66, 0x97, 0xcc, 0xf1, 0x33, 0x5b),
+ LL(0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00),
+ LL(0xcf, 0xcf, 0x1b, 0xcf, 0x36, 0xd4, 0x83, 0xf9),
+ LL(0x2b, 0x2b, 0xac, 0x2b, 0x45, 0x87, 0x56, 0x6e),
+ LL(0x76, 0x76, 0xc5, 0x76, 0x97, 0xb3, 0xec, 0xe1),
+ LL(0x82, 0x82, 0x32, 0x82, 0x64, 0xb0, 0x19, 0xe6),
+ LL(0xd6, 0xd6, 0x7f, 0xd6, 0xfe, 0xa9, 0xb1, 0x28),
+ LL(0x1b, 0x1b, 0x6c, 0x1b, 0xd8, 0x77, 0x36, 0xc3),
+ LL(0xb5, 0xb5, 0xee, 0xb5, 0xc1, 0x5b, 0x77, 0x74),
+ LL(0xaf, 0xaf, 0x86, 0xaf, 0x11, 0x29, 0x43, 0xbe),
+ LL(0x6a, 0x6a, 0xb5, 0x6a, 0x77, 0xdf, 0xd4, 0x1d),
+ LL(0x50, 0x50, 0x5d, 0x50, 0xba, 0x0d, 0xa0, 0xea),
+ LL(0x45, 0x45, 0x09, 0x45, 0x12, 0x4c, 0x8a, 0x57),
+ LL(0xf3, 0xf3, 0xeb, 0xf3, 0xcb, 0x18, 0xfb, 0x38),
+ LL(0x30, 0x30, 0xc0, 0x30, 0x9d, 0xf0, 0x60, 0xad),
+ LL(0xef, 0xef, 0x9b, 0xef, 0x2b, 0x74, 0xc3, 0xc4),
+ LL(0x3f, 0x3f, 0xfc, 0x3f, 0xe5, 0xc3, 0x7e, 0xda),
+ LL(0x55, 0x55, 0x49, 0x55, 0x92, 0x1c, 0xaa, 0xc7),
+ LL(0xa2, 0xa2, 0xb2, 0xa2, 0x79, 0x10, 0x59, 0xdb),
+ LL(0xea, 0xea, 0x8f, 0xea, 0x03, 0x65, 0xc9, 0xe9),
+ LL(0x65, 0x65, 0x89, 0x65, 0x0f, 0xec, 0xca, 0x6a),
+ LL(0xba, 0xba, 0xd2, 0xba, 0xb9, 0x68, 0x69, 0x03),
+ LL(0x2f, 0x2f, 0xbc, 0x2f, 0x65, 0x93, 0x5e, 0x4a),
+ LL(0xc0, 0xc0, 0x27, 0xc0, 0x4e, 0xe7, 0x9d, 0x8e),
+ LL(0xde, 0xde, 0x5f, 0xde, 0xbe, 0x81, 0xa1, 0x60),
+ LL(0x1c, 0x1c, 0x70, 0x1c, 0xe0, 0x6c, 0x38, 0xfc),
+ LL(0xfd, 0xfd, 0xd3, 0xfd, 0xbb, 0x2e, 0xe7, 0x46),
+ LL(0x4d, 0x4d, 0x29, 0x4d, 0x52, 0x64, 0x9a, 0x1f),
+ LL(0x92, 0x92, 0x72, 0x92, 0xe4, 0xe0, 0x39, 0x76),
+ LL(0x75, 0x75, 0xc9, 0x75, 0x8f, 0xbc, 0xea, 0xfa),
+ LL(0x06, 0x06, 0x18, 0x06, 0x30, 0x1e, 0x0c, 0x36),
+ LL(0x8a, 0x8a, 0x12, 0x8a, 0x24, 0x98, 0x09, 0xae),
+ LL(0xb2, 0xb2, 0xf2, 0xb2, 0xf9, 0x40, 0x79, 0x4b),
+ LL(0xe6, 0xe6, 0xbf, 0xe6, 0x63, 0x59, 0xd1, 0x85),
+ LL(0x0e, 0x0e, 0x38, 0x0e, 0x70, 0x36, 0x1c, 0x7e),
+ LL(0x1f, 0x1f, 0x7c, 0x1f, 0xf8, 0x63, 0x3e, 0xe7),
+ LL(0x62, 0x62, 0x95, 0x62, 0x37, 0xf7, 0xc4, 0x55),
+ LL(0xd4, 0xd4, 0x77, 0xd4, 0xee, 0xa3, 0xb5, 0x3a),
+ LL(0xa8, 0xa8, 0x9a, 0xa8, 0x29, 0x32, 0x4d, 0x81),
+ LL(0x96, 0x96, 0x62, 0x96, 0xc4, 0xf4, 0x31, 0x52),
+ LL(0xf9, 0xf9, 0xc3, 0xf9, 0x9b, 0x3a, 0xef, 0x62),
+ LL(0xc5, 0xc5, 0x33, 0xc5, 0x66, 0xf6, 0x97, 0xa3),
+ LL(0x25, 0x25, 0x94, 0x25, 0x35, 0xb1, 0x4a, 0x10),
+ LL(0x59, 0x59, 0x79, 0x59, 0xf2, 0x20, 0xb2, 0xab),
+ LL(0x84, 0x84, 0x2a, 0x84, 0x54, 0xae, 0x15, 0xd0),
+ LL(0x72, 0x72, 0xd5, 0x72, 0xb7, 0xa7, 0xe4, 0xc5),
+ LL(0x39, 0x39, 0xe4, 0x39, 0xd5, 0xdd, 0x72, 0xec),
+ LL(0x4c, 0x4c, 0x2d, 0x4c, 0x5a, 0x61, 0x98, 0x16),
+ LL(0x5e, 0x5e, 0x65, 0x5e, 0xca, 0x3b, 0xbc, 0x94),
+ LL(0x78, 0x78, 0xfd, 0x78, 0xe7, 0x85, 0xf0, 0x9f),
+ LL(0x38, 0x38, 0xe0, 0x38, 0xdd, 0xd8, 0x70, 0xe5),
+ LL(0x8c, 0x8c, 0x0a, 0x8c, 0x14, 0x86, 0x05, 0x98),
+ LL(0xd1, 0xd1, 0x63, 0xd1, 0xc6, 0xb2, 0xbf, 0x17),
+ LL(0xa5, 0xa5, 0xae, 0xa5, 0x41, 0x0b, 0x57, 0xe4),
+ LL(0xe2, 0xe2, 0xaf, 0xe2, 0x43, 0x4d, 0xd9, 0xa1),
+ LL(0x61, 0x61, 0x99, 0x61, 0x2f, 0xf8, 0xc2, 0x4e),
+ LL(0xb3, 0xb3, 0xf6, 0xb3, 0xf1, 0x45, 0x7b, 0x42),
+ LL(0x21, 0x21, 0x84, 0x21, 0x15, 0xa5, 0x42, 0x34),
+ LL(0x9c, 0x9c, 0x4a, 0x9c, 0x94, 0xd6, 0x25, 0x08),
+ LL(0x1e, 0x1e, 0x78, 0x1e, 0xf0, 0x66, 0x3c, 0xee),
+ LL(0x43, 0x43, 0x11, 0x43, 0x22, 0x52, 0x86, 0x61),
+ LL(0xc7, 0xc7, 0x3b, 0xc7, 0x76, 0xfc, 0x93, 0xb1),
+ LL(0xfc, 0xfc, 0xd7, 0xfc, 0xb3, 0x2b, 0xe5, 0x4f),
+ LL(0x04, 0x04, 0x10, 0x04, 0x20, 0x14, 0x08, 0x24),
+ LL(0x51, 0x51, 0x59, 0x51, 0xb2, 0x08, 0xa2, 0xe3),
+ LL(0x99, 0x99, 0x5e, 0x99, 0xbc, 0xc7, 0x2f, 0x25),
+ LL(0x6d, 0x6d, 0xa9, 0x6d, 0x4f, 0xc4, 0xda, 0x22),
+ LL(0x0d, 0x0d, 0x34, 0x0d, 0x68, 0x39, 0x1a, 0x65),
+ LL(0xfa, 0xfa, 0xcf, 0xfa, 0x83, 0x35, 0xe9, 0x79),
+ LL(0xdf, 0xdf, 0x5b, 0xdf, 0xb6, 0x84, 0xa3, 0x69),
+ LL(0x7e, 0x7e, 0xe5, 0x7e, 0xd7, 0x9b, 0xfc, 0xa9),
+ LL(0x24, 0x24, 0x90, 0x24, 0x3d, 0xb4, 0x48, 0x19),
+ LL(0x3b, 0x3b, 0xec, 0x3b, 0xc5, 0xd7, 0x76, 0xfe),
+ LL(0xab, 0xab, 0x96, 0xab, 0x31, 0x3d, 0x4b, 0x9a),
+ LL(0xce, 0xce, 0x1f, 0xce, 0x3e, 0xd1, 0x81, 0xf0),
+ LL(0x11, 0x11, 0x44, 0x11, 0x88, 0x55, 0x22, 0x99),
+ LL(0x8f, 0x8f, 0x06, 0x8f, 0x0c, 0x89, 0x03, 0x83),
+ LL(0x4e, 0x4e, 0x25, 0x4e, 0x4a, 0x6b, 0x9c, 0x04),
+ LL(0xb7, 0xb7, 0xe6, 0xb7, 0xd1, 0x51, 0x73, 0x66),
+ LL(0xeb, 0xeb, 0x8b, 0xeb, 0x0b, 0x60, 0xcb, 0xe0),
+ LL(0x3c, 0x3c, 0xf0, 0x3c, 0xfd, 0xcc, 0x78, 0xc1),
+ LL(0x81, 0x81, 0x3e, 0x81, 0x7c, 0xbf, 0x1f, 0xfd),
+ LL(0x94, 0x94, 0x6a, 0x94, 0xd4, 0xfe, 0x35, 0x40),
+ LL(0xf7, 0xf7, 0xfb, 0xf7, 0xeb, 0x0c, 0xf3, 0x1c),
+ LL(0xb9, 0xb9, 0xde, 0xb9, 0xa1, 0x67, 0x6f, 0x18),
+ LL(0x13, 0x13, 0x4c, 0x13, 0x98, 0x5f, 0x26, 0x8b),
+ LL(0x2c, 0x2c, 0xb0, 0x2c, 0x7d, 0x9c, 0x58, 0x51),
+ LL(0xd3, 0xd3, 0x6b, 0xd3, 0xd6, 0xb8, 0xbb, 0x05),
+ LL(0xe7, 0xe7, 0xbb, 0xe7, 0x6b, 0x5c, 0xd3, 0x8c),
+ LL(0x6e, 0x6e, 0xa5, 0x6e, 0x57, 0xcb, 0xdc, 0x39),
+ LL(0xc4, 0xc4, 0x37, 0xc4, 0x6e, 0xf3, 0x95, 0xaa),
+ LL(0x03, 0x03, 0x0c, 0x03, 0x18, 0x0f, 0x06, 0x1b),
+ LL(0x56, 0x56, 0x45, 0x56, 0x8a, 0x13, 0xac, 0xdc),
+ LL(0x44, 0x44, 0x0d, 0x44, 0x1a, 0x49, 0x88, 0x5e),
+ LL(0x7f, 0x7f, 0xe1, 0x7f, 0xdf, 0x9e, 0xfe, 0xa0),
+ LL(0xa9, 0xa9, 0x9e, 0xa9, 0x21, 0x37, 0x4f, 0x88),
+ LL(0x2a, 0x2a, 0xa8, 0x2a, 0x4d, 0x82, 0x54, 0x67),
+ LL(0xbb, 0xbb, 0xd6, 0xbb, 0xb1, 0x6d, 0x6b, 0x0a),
+ LL(0xc1, 0xc1, 0x23, 0xc1, 0x46, 0xe2, 0x9f, 0x87),
+ LL(0x53, 0x53, 0x51, 0x53, 0xa2, 0x02, 0xa6, 0xf1),
+ LL(0xdc, 0xdc, 0x57, 0xdc, 0xae, 0x8b, 0xa5, 0x72),
+ LL(0x0b, 0x0b, 0x2c, 0x0b, 0x58, 0x27, 0x16, 0x53),
+ LL(0x9d, 0x9d, 0x4e, 0x9d, 0x9c, 0xd3, 0x27, 0x01),
+ LL(0x6c, 0x6c, 0xad, 0x6c, 0x47, 0xc1, 0xd8, 0x2b),
+ LL(0x31, 0x31, 0xc4, 0x31, 0x95, 0xf5, 0x62, 0xa4),
+ LL(0x74, 0x74, 0xcd, 0x74, 0x87, 0xb9, 0xe8, 0xf3),
+ LL(0xf6, 0xf6, 0xff, 0xf6, 0xe3, 0x09, 0xf1, 0x15),
+ LL(0x46, 0x46, 0x05, 0x46, 0x0a, 0x43, 0x8c, 0x4c),
+ LL(0xac, 0xac, 0x8a, 0xac, 0x09, 0x26, 0x45, 0xa5),
+ LL(0x89, 0x89, 0x1e, 0x89, 0x3c, 0x97, 0x0f, 0xb5),
+ LL(0x14, 0x14, 0x50, 0x14, 0xa0, 0x44, 0x28, 0xb4),
+ LL(0xe1, 0xe1, 0xa3, 0xe1, 0x5b, 0x42, 0xdf, 0xba),
+ LL(0x16, 0x16, 0x58, 0x16, 0xb0, 0x4e, 0x2c, 0xa6),
+ LL(0x3a, 0x3a, 0xe8, 0x3a, 0xcd, 0xd2, 0x74, 0xf7),
+ LL(0x69, 0x69, 0xb9, 0x69, 0x6f, 0xd0, 0xd2, 0x06),
+ LL(0x09, 0x09, 0x24, 0x09, 0x48, 0x2d, 0x12, 0x41),
+ LL(0x70, 0x70, 0xdd, 0x70, 0xa7, 0xad, 0xe0, 0xd7),
+ LL(0xb6, 0xb6, 0xe2, 0xb6, 0xd9, 0x54, 0x71, 0x6f),
+ LL(0xd0, 0xd0, 0x67, 0xd0, 0xce, 0xb7, 0xbd, 0x1e),
+ LL(0xed, 0xed, 0x93, 0xed, 0x3b, 0x7e, 0xc7, 0xd6),
+ LL(0xcc, 0xcc, 0x17, 0xcc, 0x2e, 0xdb, 0x85, 0xe2),
+ LL(0x42, 0x42, 0x15, 0x42, 0x2a, 0x57, 0x84, 0x68),
+ LL(0x98, 0x98, 0x5a, 0x98, 0xb4, 0xc2, 0x2d, 0x2c),
+ LL(0xa4, 0xa4, 0xaa, 0xa4, 0x49, 0x0e, 0x55, 0xed),
+ LL(0x28, 0x28, 0xa0, 0x28, 0x5d, 0x88, 0x50, 0x75),
+ LL(0x5c, 0x5c, 0x6d, 0x5c, 0xda, 0x31, 0xb8, 0x86),
+ LL(0xf8, 0xf8, 0xc7, 0xf8, 0x93, 0x3f, 0xed, 0x6b),
+ LL(0x86, 0x86, 0x22, 0x86, 0x44, 0xa4, 0x11, 0xc2),
+#define RC (&(Cx.q[256 * N]))
+ 0x18, 0x23, 0xc6, 0xe8, 0x87, 0xb8, 0x01, 0x4f,
+ /* rc[ROUNDS] */
+ 0x36, 0xa6, 0xd2, 0xf5, 0x79, 0x6f, 0x91, 0x52, 0x60, 0xbc, 0x9b,
+ 0x8e, 0xa3, 0x0c, 0x7b, 0x35, 0x1d, 0xe0, 0xd7, 0xc2, 0x2e, 0x4b,
+ 0xfe, 0x57, 0x15, 0x77, 0x37, 0xe5, 0x9f, 0xf0, 0x4a, 0xda, 0x58,
+ 0xc9, 0x29, 0x0a, 0xb1, 0xa0, 0x6b, 0x85, 0xbd, 0x5d, 0x10, 0xf4,
+ 0xcb, 0x3e, 0x05, 0x67, 0xe4, 0x27, 0x41, 0x8b, 0xa7, 0x7d, 0x95,
+ 0xd8, 0xfb, 0xee, 0x7c, 0x66, 0xdd, 0x17, 0x47, 0x9e, 0xca, 0x2d,
+ 0xbf, 0x07, 0xad, 0x5a, 0x83, 0x33 }
+};
void whirlpool_block(WHIRLPOOL_CTX *ctx, const void *inp, size_t n)
{
@@ -518,17 +515,11 @@ void whirlpool_block(WHIRLPOOL_CTX *ctx, const void *inp, size_t n)
for (r = 0; r < ROUNDS; r++) {
for (i = 0; i < 8; i++) {
L[i] = i ? 0 : RC[r];
- L[i] ^= C0(K, i) ^ C1(K, (i - 1) & 7) ^
- C2(K, (i - 2) & 7) ^ C3(K, (i - 3) & 7) ^
- C4(K, (i - 4) & 7) ^ C5(K, (i - 5) & 7) ^
- C6(K, (i - 6) & 7) ^ C7(K, (i - 7) & 7);
+ L[i] ^= C0(K, i) ^ C1(K, (i - 1) & 7) ^ C2(K, (i - 2) & 7) ^ C3(K, (i - 3) & 7) ^ C4(K, (i - 4) & 7) ^ C5(K, (i - 5) & 7) ^ C6(K, (i - 6) & 7) ^ C7(K, (i - 7) & 7);
}
memcpy(K.q, L, 64);
for (i = 0; i < 8; i++) {
- L[i] ^= C0(S, i) ^ C1(S, (i - 1) & 7) ^
- C2(S, (i - 2) & 7) ^ C3(S, (i - 3) & 7) ^
- C4(S, (i - 4) & 7) ^ C5(S, (i - 5) & 7) ^
- C6(S, (i - 6) & 7) ^ C7(S, (i - 7) & 7);
+ L[i] ^= C0(S, i) ^ C1(S, (i - 1) & 7) ^ C2(S, (i - 2) & 7) ^ C3(S, (i - 3) & 7) ^ C4(S, (i - 4) & 7) ^ C5(S, (i - 5) & 7) ^ C6(S, (i - 6) & 7) ^ C7(S, (i - 7) & 7);
}
memcpy(S.q, L, 64);
}
@@ -537,7 +528,7 @@ void whirlpool_block(WHIRLPOOL_CTX *ctx, const void *inp, size_t n)
#else
u64 L0, L1, L2, L3, L4, L5, L6, L7;
-# ifdef STRICT_ALIGNMENT
+#ifdef STRICT_ALIGNMENT
if ((size_t)p & 7) {
memcpy(S.c, p, 64);
S.q[0] ^= (K.q[0] = H->q[0]);
@@ -549,7 +540,7 @@ void whirlpool_block(WHIRLPOOL_CTX *ctx, const void *inp, size_t n)
S.q[6] ^= (K.q[6] = H->q[6]);
S.q[7] ^= (K.q[7] = H->q[7]);
} else
-# endif
+#endif
{
const u64_aX *pa = (const u64_aX *)p;
S.q[0] = (K.q[0] = H->q[0]) ^ pa[0];
@@ -563,23 +554,15 @@ void whirlpool_block(WHIRLPOOL_CTX *ctx, const void *inp, size_t n)
}
for (r = 0; r < ROUNDS; r++) {
-# ifdef SMALL_REGISTER_BANK
- L0 = C0(K, 0) ^ C1(K, 7) ^ C2(K, 6) ^ C3(K, 5) ^
- C4(K, 4) ^ C5(K, 3) ^ C6(K, 2) ^ C7(K, 1) ^ RC[r];
- L1 = C0(K, 1) ^ C1(K, 0) ^ C2(K, 7) ^ C3(K, 6) ^
- C4(K, 5) ^ C5(K, 4) ^ C6(K, 3) ^ C7(K, 2);
- L2 = C0(K, 2) ^ C1(K, 1) ^ C2(K, 0) ^ C3(K, 7) ^
- C4(K, 6) ^ C5(K, 5) ^ C6(K, 4) ^ C7(K, 3);
- L3 = C0(K, 3) ^ C1(K, 2) ^ C2(K, 1) ^ C3(K, 0) ^
- C4(K, 7) ^ C5(K, 6) ^ C6(K, 5) ^ C7(K, 4);
- L4 = C0(K, 4) ^ C1(K, 3) ^ C2(K, 2) ^ C3(K, 1) ^
- C4(K, 0) ^ C5(K, 7) ^ C6(K, 6) ^ C7(K, 5);
- L5 = C0(K, 5) ^ C1(K, 4) ^ C2(K, 3) ^ C3(K, 2) ^
- C4(K, 1) ^ C5(K, 0) ^ C6(K, 7) ^ C7(K, 6);
- L6 = C0(K, 6) ^ C1(K, 5) ^ C2(K, 4) ^ C3(K, 3) ^
- C4(K, 2) ^ C5(K, 1) ^ C6(K, 0) ^ C7(K, 7);
- L7 = C0(K, 7) ^ C1(K, 6) ^ C2(K, 5) ^ C3(K, 4) ^
- C4(K, 3) ^ C5(K, 2) ^ C6(K, 1) ^ C7(K, 0);
+#ifdef SMALL_REGISTER_BANK
+ L0 = C0(K, 0) ^ C1(K, 7) ^ C2(K, 6) ^ C3(K, 5) ^ C4(K, 4) ^ C5(K, 3) ^ C6(K, 2) ^ C7(K, 1) ^ RC[r];
+ L1 = C0(K, 1) ^ C1(K, 0) ^ C2(K, 7) ^ C3(K, 6) ^ C4(K, 5) ^ C5(K, 4) ^ C6(K, 3) ^ C7(K, 2);
+ L2 = C0(K, 2) ^ C1(K, 1) ^ C2(K, 0) ^ C3(K, 7) ^ C4(K, 6) ^ C5(K, 5) ^ C6(K, 4) ^ C7(K, 3);
+ L3 = C0(K, 3) ^ C1(K, 2) ^ C2(K, 1) ^ C3(K, 0) ^ C4(K, 7) ^ C5(K, 6) ^ C6(K, 5) ^ C7(K, 4);
+ L4 = C0(K, 4) ^ C1(K, 3) ^ C2(K, 2) ^ C3(K, 1) ^ C4(K, 0) ^ C5(K, 7) ^ C6(K, 6) ^ C7(K, 5);
+ L5 = C0(K, 5) ^ C1(K, 4) ^ C2(K, 3) ^ C3(K, 2) ^ C4(K, 1) ^ C5(K, 0) ^ C6(K, 7) ^ C7(K, 6);
+ L6 = C0(K, 6) ^ C1(K, 5) ^ C2(K, 4) ^ C3(K, 3) ^ C4(K, 2) ^ C5(K, 1) ^ C6(K, 0) ^ C7(K, 7);
+ L7 = C0(K, 7) ^ C1(K, 6) ^ C2(K, 5) ^ C3(K, 4) ^ C4(K, 3) ^ C5(K, 2) ^ C6(K, 1) ^ C7(K, 0);
K.q[0] = L0;
K.q[1] = L1;
@@ -590,22 +573,14 @@ void whirlpool_block(WHIRLPOOL_CTX *ctx, const void *inp, size_t n)
K.q[6] = L6;
K.q[7] = L7;
- L0 ^= C0(S, 0) ^ C1(S, 7) ^ C2(S, 6) ^ C3(S, 5) ^
- C4(S, 4) ^ C5(S, 3) ^ C6(S, 2) ^ C7(S, 1);
- L1 ^= C0(S, 1) ^ C1(S, 0) ^ C2(S, 7) ^ C3(S, 6) ^
- C4(S, 5) ^ C5(S, 4) ^ C6(S, 3) ^ C7(S, 2);
- L2 ^= C0(S, 2) ^ C1(S, 1) ^ C2(S, 0) ^ C3(S, 7) ^
- C4(S, 6) ^ C5(S, 5) ^ C6(S, 4) ^ C7(S, 3);
- L3 ^= C0(S, 3) ^ C1(S, 2) ^ C2(S, 1) ^ C3(S, 0) ^
- C4(S, 7) ^ C5(S, 6) ^ C6(S, 5) ^ C7(S, 4);
- L4 ^= C0(S, 4) ^ C1(S, 3) ^ C2(S, 2) ^ C3(S, 1) ^
- C4(S, 0) ^ C5(S, 7) ^ C6(S, 6) ^ C7(S, 5);
- L5 ^= C0(S, 5) ^ C1(S, 4) ^ C2(S, 3) ^ C3(S, 2) ^
- C4(S, 1) ^ C5(S, 0) ^ C6(S, 7) ^ C7(S, 6);
- L6 ^= C0(S, 6) ^ C1(S, 5) ^ C2(S, 4) ^ C3(S, 3) ^
- C4(S, 2) ^ C5(S, 1) ^ C6(S, 0) ^ C7(S, 7);
- L7 ^= C0(S, 7) ^ C1(S, 6) ^ C2(S, 5) ^ C3(S, 4) ^
- C4(S, 3) ^ C5(S, 2) ^ C6(S, 1) ^ C7(S, 0);
+ L0 ^= C0(S, 0) ^ C1(S, 7) ^ C2(S, 6) ^ C3(S, 5) ^ C4(S, 4) ^ C5(S, 3) ^ C6(S, 2) ^ C7(S, 1);
+ L1 ^= C0(S, 1) ^ C1(S, 0) ^ C2(S, 7) ^ C3(S, 6) ^ C4(S, 5) ^ C5(S, 4) ^ C6(S, 3) ^ C7(S, 2);
+ L2 ^= C0(S, 2) ^ C1(S, 1) ^ C2(S, 0) ^ C3(S, 7) ^ C4(S, 6) ^ C5(S, 5) ^ C6(S, 4) ^ C7(S, 3);
+ L3 ^= C0(S, 3) ^ C1(S, 2) ^ C2(S, 1) ^ C3(S, 0) ^ C4(S, 7) ^ C5(S, 6) ^ C6(S, 5) ^ C7(S, 4);
+ L4 ^= C0(S, 4) ^ C1(S, 3) ^ C2(S, 2) ^ C3(S, 1) ^ C4(S, 0) ^ C5(S, 7) ^ C6(S, 6) ^ C7(S, 5);
+ L5 ^= C0(S, 5) ^ C1(S, 4) ^ C2(S, 3) ^ C3(S, 2) ^ C4(S, 1) ^ C5(S, 0) ^ C6(S, 7) ^ C7(S, 6);
+ L6 ^= C0(S, 6) ^ C1(S, 5) ^ C2(S, 4) ^ C3(S, 3) ^ C4(S, 2) ^ C5(S, 1) ^ C6(S, 0) ^ C7(S, 7);
+ L7 ^= C0(S, 7) ^ C1(S, 6) ^ C2(S, 5) ^ C3(S, 4) ^ C4(S, 3) ^ C5(S, 2) ^ C6(S, 1) ^ C7(S, 0);
S.q[0] = L0;
S.q[1] = L1;
@@ -615,7 +590,7 @@ void whirlpool_block(WHIRLPOOL_CTX *ctx, const void *inp, size_t n)
S.q[5] = L5;
S.q[6] = L6;
S.q[7] = L7;
-# else
+#else
L0 = C0(K, 0);
L1 = C1(K, 0);
L2 = C2(K, 0);
@@ -778,16 +753,16 @@ void whirlpool_block(WHIRLPOOL_CTX *ctx, const void *inp, size_t n)
S.q[5] = L5;
S.q[6] = L6;
S.q[7] = L7;
-# endif
+#endif
}
-# ifdef STRICT_ALIGNMENT
+#ifdef STRICT_ALIGNMENT
if ((size_t)p & 7) {
int i;
for (i = 0; i < 64; i++)
H->c[i] ^= S.c[i] ^ p[i];
} else
-# endif
+#endif
{
const u64_aX *pa = (const u64_aX *)p;
H->q[0] ^= S.q[0] ^ pa[0];
diff --git a/crypto/whrlpool/wp_dgst.c b/crypto/whrlpool/wp_dgst.c
index 3f970deb9c..beb29c6968 100644
--- a/crypto/whrlpool/wp_dgst.c
+++ b/crypto/whrlpool/wp_dgst.c
@@ -93,7 +93,7 @@ void WHIRLPOOL_BitUpdate(WHIRLPOOL_CTX *c, const void *_inp, size_t bits)
{
size_t n;
unsigned int bitoff = c->bitoff,
- bitrem = bitoff % 8, inpgap = (8 - (unsigned int)bits % 8) & 7;
+ bitrem = bitoff % 8, inpgap = (8 - (unsigned int)bits % 8) & 7;
const unsigned char *inp = _inp;
/*
@@ -102,15 +102,15 @@ void WHIRLPOOL_BitUpdate(WHIRLPOOL_CTX *c, const void *_inp, size_t bits)
* to detect overflows.
*/
c->bitlen[0] += bits;
- if (c->bitlen[0] < bits) { /* overflow */
+ if (c->bitlen[0] < bits) { /* overflow */
n = 1;
do {
c->bitlen[n]++;
} while (c->bitlen[n] == 0
- && ++n < (WHIRLPOOL_COUNTER / sizeof(size_t)));
+ && ++n < (WHIRLPOOL_COUNTER / sizeof(size_t)));
}
#ifndef OPENSSL_SMALL_FOOTPRINT
- reconsider:
+reconsider:
if (inpgap == 0 && bitrem == 0) { /* byte-oriented loop */
while (bits) {
if (bitoff == 0 && (n = bits / WHIRLPOOL_BBLOCK)) {
@@ -136,7 +136,7 @@ void WHIRLPOOL_BitUpdate(WHIRLPOOL_CTX *c, const void *_inp, size_t bits)
c->bitoff = bitoff;
}
}
- } else /* bit-oriented loop */
+ } else /* bit-oriented loop */
#endif
{
/*-
@@ -160,9 +160,9 @@ void WHIRLPOOL_BitUpdate(WHIRLPOOL_CTX *c, const void *_inp, size_t bits)
c->data[byteoff++] |= inp[0] & (0xff >> inpgap);
inpgap = 8 - inpgap;
bitoff += inpgap;
- bitrem = 0; /* bitoff%8 */
+ bitrem = 0; /* bitoff%8 */
bits -= inpgap;
- inpgap = 0; /* bits%8 */
+ inpgap = 0; /* bits%8 */
inp++;
if (bitoff == WHIRLPOOL_BBLOCK) {
whirlpool_block(c, c->data, 1);
@@ -172,7 +172,7 @@ void WHIRLPOOL_BitUpdate(WHIRLPOOL_CTX *c, const void *_inp, size_t bits)
goto reconsider;
} else
#endif
- if (bits > 8) {
+ if (bits > 8) {
b = ((inp[0] << inpgap) | (inp[1] >> (8 - inpgap)));
b &= 0xff;
if (bitrem)
@@ -189,7 +189,7 @@ void WHIRLPOOL_BitUpdate(WHIRLPOOL_CTX *c, const void *_inp, size_t bits)
}
if (bitrem)
c->data[byteoff] = b << (8 - bitrem);
- } else { /* remaining less than or equal to 8 bits */
+ } else { /* remaining less than or equal to 8 bits */
b = (inp[0] << inpgap) & 0xff;
if (bitrem)
@@ -233,7 +233,7 @@ int WHIRLPOOL_Final(unsigned char *md, WHIRLPOOL_CTX *c)
}
if (byteoff < (WHIRLPOOL_BBLOCK / 8 - WHIRLPOOL_COUNTER))
memset(&c->data[byteoff], 0,
- (WHIRLPOOL_BBLOCK / 8 - WHIRLPOOL_COUNTER) - byteoff);
+ (WHIRLPOOL_BBLOCK / 8 - WHIRLPOOL_COUNTER) - byteoff);
/* smash 256-bit c->bitlen in big-endian order */
p = &c->data[WHIRLPOOL_BBLOCK / 8 - 1]; /* last byte in c->data */
for (i = 0; i < WHIRLPOOL_COUNTER / sizeof(size_t); i++)
diff --git a/crypto/x509/by_dir.c b/crypto/x509/by_dir.c
index 20ad8062fc..d9a3e986e9 100644
--- a/crypto/x509/by_dir.c
+++ b/crypto/x509/by_dir.c
@@ -7,13 +7,13 @@
* https://www.openssl.org/source/license.html
*/
-#if defined (__TANDEM) && defined (_SPT_MODEL_)
- /*
- * These definitions have to come first in SPT due to scoping of the
- * declarations in c99 associated with SPT use of stat.
- */
-# include <sys/types.h>
-# include <sys/stat.h>
+#if defined(__TANDEM) && defined(_SPT_MODEL_)
+/*
+ * These definitions have to come first in SPT due to scoping of the
+ * declarations in c99 associated with SPT use of stat.
+ */
+#include <sys/types.h>
+#include <sys/stat.h>
#endif
#include "internal/e_os.h"
@@ -24,7 +24,7 @@
#include <sys/types.h>
#ifndef OPENSSL_NO_POSIX_IO
-# include <sys/stat.h>
+#include <sys/stat.h>
#endif
#include <openssl/x509.h>
@@ -49,29 +49,29 @@ typedef struct lookup_dir_st {
} BY_DIR;
static int dir_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp, long argl,
- char **retp);
+ char **retp);
static int new_dir(X509_LOOKUP *lu);
static void free_dir(X509_LOOKUP *lu);
static int add_cert_dir(BY_DIR *ctx, const char *dir, int type);
static int get_cert_by_subject(X509_LOOKUP *xl, X509_LOOKUP_TYPE type,
- const X509_NAME *name, X509_OBJECT *ret);
+ const X509_NAME *name, X509_OBJECT *ret);
static int get_cert_by_subject_ex(X509_LOOKUP *xl, X509_LOOKUP_TYPE type,
- const X509_NAME *name, X509_OBJECT *ret,
- OSSL_LIB_CTX *libctx, const char *propq);
+ const X509_NAME *name, X509_OBJECT *ret,
+ OSSL_LIB_CTX *libctx, const char *propq);
static X509_LOOKUP_METHOD x509_dir_lookup = {
"Load certs from files in a directory",
- new_dir, /* new_item */
- free_dir, /* free */
- NULL, /* init */
- NULL, /* shutdown */
- dir_ctrl, /* ctrl */
- get_cert_by_subject, /* get_by_subject */
- NULL, /* get_by_issuer_serial */
- NULL, /* get_by_fingerprint */
- NULL, /* get_by_alias */
- get_cert_by_subject_ex, /* get_by_subject_ex */
- NULL, /* ctrl_ex */
+ new_dir, /* new_item */
+ free_dir, /* free */
+ NULL, /* init */
+ NULL, /* shutdown */
+ dir_ctrl, /* ctrl */
+ get_cert_by_subject, /* get_by_subject */
+ NULL, /* get_by_issuer_serial */
+ NULL, /* get_by_fingerprint */
+ NULL, /* get_by_alias */
+ get_cert_by_subject_ex, /* get_by_subject_ex */
+ NULL, /* ctrl_ex */
};
X509_LOOKUP_METHOD *X509_LOOKUP_hash_dir(void)
@@ -80,7 +80,7 @@ X509_LOOKUP_METHOD *X509_LOOKUP_hash_dir(void)
}
static int dir_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp, long argl,
- char **retp)
+ char **retp)
{
int ret = 0;
BY_DIR *ld = (BY_DIR *)ctx->method_data;
@@ -94,7 +94,7 @@ static int dir_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp, long argl,
ret = add_cert_dir(ld, dir, X509_FILETYPE_PEM);
else
ret = add_cert_dir(ld, X509_get_default_cert_dir(),
- X509_FILETYPE_PEM);
+ X509_FILETYPE_PEM);
if (!ret) {
ERR_raise(ERR_LIB_X509, X509_R_LOADING_CERT_DIR);
}
@@ -126,7 +126,7 @@ static int new_dir(X509_LOOKUP *lu)
lu->method_data = a;
return 1;
- err:
+err:
OPENSSL_free(a);
return 0;
}
@@ -137,7 +137,7 @@ static void by_dir_hash_free(BY_DIR_HASH *hash)
}
static int by_dir_hash_cmp(const BY_DIR_HASH *const *a,
- const BY_DIR_HASH *const *b)
+ const BY_DIR_HASH *const *b)
{
if ((*a)->hash > (*b)->hash)
return 1;
@@ -220,8 +220,8 @@ static int add_cert_dir(BY_DIR *ctx, const char *dir, int type)
}
static int get_cert_by_subject_ex(X509_LOOKUP *xl, X509_LOOKUP_TYPE type,
- const X509_NAME *name, X509_OBJECT *ret,
- OSSL_LIB_CTX *libctx, const char *propq)
+ const X509_NAME *name, X509_OBJECT *ret,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
BY_DIR *ctx;
union {
@@ -311,17 +311,17 @@ static int get_cert_by_subject_ex(X509_LOOKUP *xl, X509_LOOKUP_TYPE type,
* should be added.
*/
BIO_snprintf(b->data, b->max,
- "%s%08lx.%s%d", ent->dir, h, postfix, k);
+ "%s%08lx.%s%d", ent->dir, h, postfix, k);
} else
#endif
{
BIO_snprintf(b->data, b->max,
- "%s%c%08lx.%s%d", ent->dir, c, h, postfix, k);
+ "%s%c%08lx.%s%d", ent->dir, c, h, postfix, k);
}
#ifndef OPENSSL_NO_POSIX_IO
-# ifdef _WIN32
-# define stat _stat
-# endif
+#ifdef _WIN32
+#define stat _stat
+#endif
{
struct stat st;
if (stat(b->data, &st) < 0)
@@ -331,7 +331,8 @@ static int get_cert_by_subject_ex(X509_LOOKUP *xl, X509_LOOKUP_TYPE type,
/* found one. */
if (type == X509_LU_X509) {
if ((X509_load_cert_file_ex(xl, b->data, ent->dir_type, libctx,
- propq)) == 0)
+ propq))
+ == 0)
break;
} else if (type == X509_LU_CRL) {
if ((X509_load_crl_file(xl, b->data, ent->dir_type)) == 0)
@@ -409,7 +410,6 @@ static int get_cert_by_subject_ex(X509_LOOKUP *xl, X509_LOOKUP_TYPE type,
}
CRYPTO_THREAD_unlock(ctx->lock);
-
}
if (tmp != NULL) {
@@ -426,13 +426,13 @@ static int get_cert_by_subject_ex(X509_LOOKUP *xl, X509_LOOKUP_TYPE type,
goto finish;
}
}
- finish:
+finish:
BUF_MEM_free(b);
return ok;
}
static int get_cert_by_subject(X509_LOOKUP *xl, X509_LOOKUP_TYPE type,
- const X509_NAME *name, X509_OBJECT *ret)
+ const X509_NAME *name, X509_OBJECT *ret)
{
return get_cert_by_subject_ex(xl, type, name, ret, NULL, NULL);
}
diff --git a/crypto/x509/by_file.c b/crypto/x509/by_file.c
index f594ab3cf2..5c99557649 100644
--- a/crypto/x509/by_file.c
+++ b/crypto/x509/by_file.c
@@ -18,25 +18,24 @@
#include "x509_local.h"
static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc,
- long argl, char **ret);
+ long argl, char **ret);
static int by_file_ctrl_ex(X509_LOOKUP *ctx, int cmd, const char *argc,
- long argl, char **ret, OSSL_LIB_CTX *libctx,
- const char *propq);
-
+ long argl, char **ret, OSSL_LIB_CTX *libctx,
+ const char *propq);
static X509_LOOKUP_METHOD x509_file_lookup = {
"Load file into cache",
- NULL, /* new_item */
- NULL, /* free */
- NULL, /* init */
- NULL, /* shutdown */
- by_file_ctrl, /* ctrl */
- NULL, /* get_by_subject */
- NULL, /* get_by_issuer_serial */
- NULL, /* get_by_fingerprint */
- NULL, /* get_by_alias */
- NULL, /* get_by_subject_ex */
- by_file_ctrl_ex, /* ctrl_ex */
+ NULL, /* new_item */
+ NULL, /* free */
+ NULL, /* init */
+ NULL, /* shutdown */
+ by_file_ctrl, /* ctrl */
+ NULL, /* get_by_subject */
+ NULL, /* get_by_issuer_serial */
+ NULL, /* get_by_fingerprint */
+ NULL, /* get_by_alias */
+ NULL, /* get_by_subject_ex */
+ by_file_ctrl_ex, /* ctrl_ex */
};
X509_LOOKUP_METHOD *X509_LOOKUP_file(void)
@@ -45,8 +44,8 @@ X509_LOOKUP_METHOD *X509_LOOKUP_file(void)
}
static int by_file_ctrl_ex(X509_LOOKUP *ctx, int cmd, const char *argp,
- long argl, char **ret, OSSL_LIB_CTX *libctx,
- const char *propq)
+ long argl, char **ret, OSSL_LIB_CTX *libctx,
+ const char *propq)
{
int ok = 0;
const char *file;
@@ -57,21 +56,25 @@ static int by_file_ctrl_ex(X509_LOOKUP *ctx, int cmd, const char *argp,
file = ossl_safe_getenv(X509_get_default_cert_file_env());
if (file)
ok = (X509_load_cert_crl_file_ex(ctx, file, X509_FILETYPE_PEM,
- libctx, propq) != 0);
+ libctx, propq)
+ != 0);
else
ok = (X509_load_cert_crl_file_ex(
- ctx, X509_get_default_cert_file(),
- X509_FILETYPE_PEM, libctx, propq) != 0);
+ ctx, X509_get_default_cert_file(),
+ X509_FILETYPE_PEM, libctx, propq)
+ != 0);
if (!ok)
ERR_raise(ERR_LIB_X509, X509_R_LOADING_DEFAULTS);
} else {
if (argl == X509_FILETYPE_PEM)
ok = (X509_load_cert_crl_file_ex(ctx, argp, X509_FILETYPE_PEM,
- libctx, propq) != 0);
+ libctx, propq)
+ != 0);
else
ok = (X509_load_cert_file_ex(ctx, argp, (int)argl, libctx,
- propq) != 0);
+ propq)
+ != 0);
}
break;
}
@@ -79,13 +82,13 @@ static int by_file_ctrl_ex(X509_LOOKUP *ctx, int cmd, const char *argp,
}
static int by_file_ctrl(X509_LOOKUP *ctx, int cmd,
- const char *argp, long argl, char **ret)
+ const char *argp, long argl, char **ret)
{
return by_file_ctrl_ex(ctx, cmd, argp, argl, ret, NULL, NULL);
}
int X509_load_cert_file_ex(X509_LOOKUP *ctx, const char *file, int type,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_LIB_CTX *libctx, const char *propq)
{
BIO *in = NULL;
int count = 0;
@@ -113,8 +116,7 @@ int X509_load_cert_file_ex(X509_LOOKUP *ctx, const char *file, int type,
for (;;) {
ERR_set_mark();
if (PEM_read_bio_X509_AUX(in, &x, NULL, "") == NULL) {
- if ((ERR_GET_REASON(ERR_peek_last_error()) ==
- PEM_R_NO_START_LINE) && (count > 0)) {
+ if ((ERR_GET_REASON(ERR_peek_last_error()) == PEM_R_NO_START_LINE) && (count > 0)) {
ERR_pop_to_mark();
break;
} else {
@@ -156,7 +158,7 @@ int X509_load_cert_file_ex(X509_LOOKUP *ctx, const char *file, int type,
ERR_raise(ERR_LIB_X509, X509_R_BAD_X509_FILETYPE);
goto err;
}
- err:
+err:
X509_free(x);
BIO_free(in);
return count;
@@ -189,8 +191,7 @@ int X509_load_crl_file(X509_LOOKUP *ctx, const char *file, int type)
for (;;) {
x = PEM_read_bio_X509_CRL(in, NULL, NULL, "");
if (x == NULL) {
- if ((ERR_GET_REASON(ERR_peek_last_error()) ==
- PEM_R_NO_START_LINE) && (count > 0)) {
+ if ((ERR_GET_REASON(ERR_peek_last_error()) == PEM_R_NO_START_LINE) && (count > 0)) {
ERR_clear_error();
break;
} else {
@@ -222,14 +223,14 @@ int X509_load_crl_file(X509_LOOKUP *ctx, const char *file, int type)
ERR_raise(ERR_LIB_X509, X509_R_BAD_X509_FILETYPE);
goto err;
}
- err:
+err:
X509_CRL_free(x);
BIO_free(in);
return count;
}
int X509_load_cert_crl_file_ex(X509_LOOKUP *ctx, const char *file, int type,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_LIB_CTX *libctx, const char *propq)
{
STACK_OF(X509_INFO) *inf = NULL;
X509_INFO *itmp = NULL;
@@ -272,7 +273,7 @@ int X509_load_cert_crl_file_ex(X509_LOOKUP *ctx, const char *file, int type,
}
if (count == 0)
ERR_raise(ERR_LIB_X509, X509_R_NO_CERTIFICATE_OR_CRL_FOUND);
- err:
+err:
sk_X509_INFO_pop_free(inf, X509_INFO_free);
return count;
}
@@ -281,4 +282,3 @@ int X509_load_cert_crl_file(X509_LOOKUP *ctx, const char *file, int type)
{
return X509_load_cert_crl_file_ex(ctx, file, type, NULL, NULL);
}
-
diff --git a/crypto/x509/by_store.c b/crypto/x509/by_store.c
index 043801c2ef..38496699b3 100644
--- a/crypto/x509/by_store.c
+++ b/crypto/x509/by_store.c
@@ -23,14 +23,15 @@ DEFINE_STACK_OF(CACHED_STORE)
/* Generic object loader, given expected type and criterion */
static int cache_objects(X509_LOOKUP *lctx, CACHED_STORE *store,
- const OSSL_STORE_SEARCH *criterion, int depth)
+ const OSSL_STORE_SEARCH *criterion, int depth)
{
int ok = 1;
OSSL_STORE_CTX *ctx;
X509_STORE *xstore = X509_LOOKUP_get_store(lctx);
if ((ctx = OSSL_STORE_open_ex(store->uri, store->libctx, store->propq,
- NULL, NULL, NULL, NULL, NULL)) == NULL)
+ NULL, NULL, NULL, NULL, NULL))
+ == NULL)
return 0;
/*
@@ -111,7 +112,6 @@ static int cache_objects(X509_LOOKUP *lctx, CACHED_STORE *store,
return ok;
}
-
static void free_store(CACHED_STORE *store)
{
if (store != NULL) {
@@ -128,8 +128,8 @@ static void by_store_free(X509_LOOKUP *ctx)
}
static int by_store_ctrl_ex(X509_LOOKUP *ctx, int cmd, const char *argp,
- long argl, char **retp, OSSL_LIB_CTX *libctx,
- const char *propq)
+ long argl, char **retp, OSSL_LIB_CTX *libctx,
+ const char *propq)
{
switch (cmd) {
case X509_L_ADD_STORE:
@@ -151,7 +151,7 @@ static int by_store_ctrl_ex(X509_LOOKUP *ctx, int cmd, const char *argp,
* errors early.
*/
sctx = OSSL_STORE_open_ex(argp, libctx, propq, NULL, NULL,
- NULL, NULL, NULL);
+ NULL, NULL, NULL);
if (sctx == NULL
|| (propq != NULL && store->propq == NULL)
|| store->uri == NULL) {
@@ -190,13 +190,13 @@ static int by_store_ctrl_ex(X509_LOOKUP *ctx, int cmd, const char *argp,
}
static int by_store_ctrl(X509_LOOKUP *ctx, int cmd,
- const char *argp, long argl, char **retp)
+ const char *argp, long argl, char **retp)
{
return by_store_ctrl_ex(ctx, cmd, argp, argl, retp, NULL, NULL);
}
static int by_store(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
- const OSSL_STORE_SEARCH *criterion, X509_OBJECT *ret)
+ const OSSL_STORE_SEARCH *criterion, X509_OBJECT *ret)
{
STACK_OF(CACHED_STORE) *stores = X509_LOOKUP_get_method_data(ctx);
int i;
@@ -204,7 +204,7 @@ static int by_store(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
for (i = 0; i < sk_CACHED_STORE_num(stores); i++) {
ok = cache_objects(ctx, sk_CACHED_STORE_value(stores, i), criterion,
- 1 /* depth */);
+ 1 /* depth */);
if (ok)
break;
@@ -213,10 +213,9 @@ static int by_store(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
}
static int by_store_subject(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
- const X509_NAME *name, X509_OBJECT *ret)
+ const X509_NAME *name, X509_OBJECT *ret)
{
- OSSL_STORE_SEARCH *criterion =
- OSSL_STORE_SEARCH_by_name((X509_NAME *)name); /* won't modify it */
+ OSSL_STORE_SEARCH *criterion = OSSL_STORE_SEARCH_by_name((X509_NAME *)name); /* won't modify it */
int ok = by_store(ctx, type, criterion, ret);
X509_OBJECT *tmp = NULL;
@@ -283,16 +282,16 @@ static int by_store_subject(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
static X509_LOOKUP_METHOD x509_store_lookup = {
"Load certificates and CRLs from OSSL_STORE URIs",
- NULL, /* new_item */
- by_store_free, /* free */
- NULL, /* init */
- NULL, /* shutdown */
- by_store_ctrl, /* ctrl */
- by_store_subject, /* get_by_subject */
- NULL, /* get_by_issuer_serial */
- NULL, /* get_by_fingerprint */
- NULL, /* get_by_alias */
- NULL, /* get_by_subject_ex */
+ NULL, /* new_item */
+ by_store_free, /* free */
+ NULL, /* init */
+ NULL, /* shutdown */
+ by_store_ctrl, /* ctrl */
+ by_store_subject, /* get_by_subject */
+ NULL, /* get_by_issuer_serial */
+ NULL, /* get_by_fingerprint */
+ NULL, /* get_by_alias */
+ NULL, /* get_by_subject_ex */
by_store_ctrl_ex
};
diff --git a/crypto/x509/pcy_cache.c b/crypto/x509/pcy_cache.c
index 2d1d4cd367..d1ee35377b 100644
--- a/crypto/x509/pcy_cache.c
+++ b/crypto/x509/pcy_cache.c
@@ -15,7 +15,7 @@
#include "pcy_local.h"
static int policy_data_cmp(const X509_POLICY_DATA *const *a,
- const X509_POLICY_DATA *const *b);
+ const X509_POLICY_DATA *const *b);
static int policy_cache_set_int(long *out, ASN1_INTEGER *value);
/*
@@ -24,7 +24,7 @@ static int policy_cache_set_int(long *out, ASN1_INTEGER *value);
*/
static int policy_cache_create(X509 *x,
- CERTIFICATEPOLICIES *policies, int crit)
+ CERTIFICATEPOLICIES *policies, int crit)
{
int i, num, ret = 0;
X509_POLICY_CACHE *cache = x->policy_cache;
@@ -54,7 +54,7 @@ static int policy_cache_create(X509 *x,
goto bad_policy;
}
cache->anyPolicy = data;
- } else if (sk_X509_POLICY_DATA_find(cache->data, data) >=0) {
+ } else if (sk_X509_POLICY_DATA_find(cache->data, data) >= 0) {
ret = -1;
goto bad_policy;
} else if (!sk_X509_POLICY_DATA_push(cache->data, data)) {
@@ -67,11 +67,11 @@ static int policy_cache_create(X509 *x,
sk_X509_POLICY_DATA_sort(cache->data);
ret = 1;
- bad_policy:
+bad_policy:
if (ret == -1)
x->ex_flags |= EXFLAG_INVALID_POLICY;
ossl_policy_data_free(data);
- just_cleanup:
+just_cleanup:
sk_POLICYINFO_pop_free(policies, POLICYINFO_free);
if (ret <= 0) {
sk_X509_POLICY_DATA_pop_free(cache->data, ossl_policy_data_free);
@@ -116,10 +116,10 @@ static int policy_cache_new(X509 *x)
&& !ext_pcons->inhibitPolicyMapping)
goto bad_cache;
if (!policy_cache_set_int(&cache->explicit_skip,
- ext_pcons->requireExplicitPolicy))
+ ext_pcons->requireExplicitPolicy))
goto bad_cache;
if (!policy_cache_set_int(&cache->map_skip,
- ext_pcons->inhibitPolicyMapping))
+ ext_pcons->inhibitPolicyMapping))
goto bad_cache;
}
@@ -165,14 +165,13 @@ static int policy_cache_new(X509 *x)
goto bad_cache;
goto just_cleanup;
- bad_cache:
+bad_cache:
x->ex_flags |= EXFLAG_INVALID_POLICY;
- just_cleanup:
+just_cleanup:
POLICY_CONSTRAINTS_free(ext_pcons);
ASN1_INTEGER_free(ext_any);
return 1;
-
}
void ossl_policy_cache_free(X509_POLICY_CACHE *cache)
@@ -195,11 +194,10 @@ const X509_POLICY_CACHE *ossl_policy_cache_set(X509 *x)
}
return x->policy_cache;
-
}
X509_POLICY_DATA *ossl_policy_cache_find_data(const X509_POLICY_CACHE *cache,
- const ASN1_OBJECT *id)
+ const ASN1_OBJECT *id)
{
int idx;
X509_POLICY_DATA tmp;
@@ -209,7 +207,7 @@ X509_POLICY_DATA *ossl_policy_cache_find_data(const X509_POLICY_CACHE *cache,
}
static int policy_data_cmp(const X509_POLICY_DATA *const *a,
- const X509_POLICY_DATA *const *b)
+ const X509_POLICY_DATA *const *b)
{
return OBJ_cmp((*a)->valid_policy, (*b)->valid_policy);
}
diff --git a/crypto/x509/pcy_data.c b/crypto/x509/pcy_data.c
index 8e8b91a781..dda2ed2a53 100644
--- a/crypto/x509/pcy_data.c
+++ b/crypto/x509/pcy_data.c
@@ -36,7 +36,7 @@ void ossl_policy_data_free(X509_POLICY_DATA *data)
*/
X509_POLICY_DATA *ossl_policy_data_new(POLICYINFO *policy,
- const ASN1_OBJECT *cid, int crit)
+ const ASN1_OBJECT *cid, int crit)
{
X509_POLICY_DATA *ret;
ASN1_OBJECT *id;
diff --git a/crypto/x509/pcy_lib.c b/crypto/x509/pcy_lib.c
index c4740a0a30..abb3ead909 100644
--- a/crypto/x509/pcy_lib.c
+++ b/crypto/x509/pcy_lib.c
@@ -25,25 +25,23 @@ int X509_policy_tree_level_count(const X509_POLICY_TREE *tree)
}
X509_POLICY_LEVEL *X509_policy_tree_get0_level(const X509_POLICY_TREE *tree,
- int i)
+ int i)
{
if (!tree || (i < 0) || (i >= tree->nlevel))
return NULL;
return tree->levels + i;
}
-STACK_OF(X509_POLICY_NODE) *X509_policy_tree_get0_policies(const
- X509_POLICY_TREE
- *tree)
+STACK_OF(X509_POLICY_NODE) *X509_policy_tree_get0_policies(const X509_POLICY_TREE
+ *tree)
{
if (!tree)
return NULL;
return tree->auth_policies;
}
-STACK_OF(X509_POLICY_NODE) *X509_policy_tree_get0_user_policies(const
- X509_POLICY_TREE
- *tree)
+STACK_OF(X509_POLICY_NODE) *X509_policy_tree_get0_user_policies(const X509_POLICY_TREE
+ *tree)
{
if (!tree)
return NULL;
@@ -90,9 +88,8 @@ const ASN1_OBJECT *X509_policy_node_get0_policy(const X509_POLICY_NODE *node)
return node->data->valid_policy;
}
-STACK_OF(POLICYQUALINFO) *X509_policy_node_get0_qualifiers(const
- X509_POLICY_NODE
- *node)
+STACK_OF(POLICYQUALINFO) *X509_policy_node_get0_qualifiers(const X509_POLICY_NODE
+ *node)
{
if (!node)
return NULL;
@@ -100,7 +97,7 @@ STACK_OF(POLICYQUALINFO) *X509_policy_node_get0_qualifiers(const
}
const X509_POLICY_NODE *X509_policy_node_get0_parent(const X509_POLICY_NODE
- *node)
+ *node)
{
if (!node)
return NULL;
diff --git a/crypto/x509/pcy_local.h b/crypto/x509/pcy_local.h
index 523f3e35fe..957ea59723 100644
--- a/crypto/x509/pcy_local.h
+++ b/crypto/x509/pcy_local.h
@@ -35,30 +35,30 @@ struct X509_POLICY_DATA_st {
* extension. If policy mapping is not active its references get deleted.
*/
-#define POLICY_DATA_FLAG_MAPPED 0x1
+#define POLICY_DATA_FLAG_MAPPED 0x1
/*
* This flag indicates the data doesn't correspond to a policy in Certificate
* Policies: it has been mapped to any policy.
*/
-#define POLICY_DATA_FLAG_MAPPED_ANY 0x2
+#define POLICY_DATA_FLAG_MAPPED_ANY 0x2
/* AND with flags to see if any mapping has occurred */
-#define POLICY_DATA_FLAG_MAP_MASK 0x3
+#define POLICY_DATA_FLAG_MAP_MASK 0x3
/* qualifiers are shared and shouldn't be freed */
-#define POLICY_DATA_FLAG_SHARED_QUALIFIERS 0x4
+#define POLICY_DATA_FLAG_SHARED_QUALIFIERS 0x4
/* Parent node is an extra node and should be freed */
-#define POLICY_DATA_FLAG_EXTRA_NODE 0x8
+#define POLICY_DATA_FLAG_EXTRA_NODE 0x8
/* Corresponding CertificatePolicies is critical */
-#define POLICY_DATA_FLAG_CRITICAL 0x10
+#define POLICY_DATA_FLAG_CRITICAL 0x10
/* This structure is cached with a certificate */
@@ -131,7 +131,7 @@ struct X509_POLICY_TREE_st {
};
/* Set if anyPolicy present in user policies */
-#define POLICY_FLAG_ANY_POLICY 0x2
+#define POLICY_FLAG_ANY_POLICY 0x2
/* Useful macros */
@@ -141,11 +141,11 @@ struct X509_POLICY_TREE_st {
/* Internal functions */
X509_POLICY_DATA *ossl_policy_data_new(POLICYINFO *policy, const ASN1_OBJECT *id,
- int crit);
+ int crit);
void ossl_policy_data_free(X509_POLICY_DATA *data);
X509_POLICY_DATA *ossl_policy_cache_find_data(const X509_POLICY_CACHE *cache,
- const ASN1_OBJECT *id);
+ const ASN1_OBJECT *id);
int ossl_policy_cache_set_mapping(X509 *x, POLICY_MAPPINGS *maps);
STACK_OF(X509_POLICY_NODE) *ossl_policy_node_cmp_new(void);
@@ -153,19 +153,19 @@ STACK_OF(X509_POLICY_NODE) *ossl_policy_node_cmp_new(void);
void ossl_policy_cache_free(X509_POLICY_CACHE *cache);
X509_POLICY_NODE *ossl_policy_level_find_node(const X509_POLICY_LEVEL *level,
- const X509_POLICY_NODE *parent,
- const ASN1_OBJECT *id);
+ const X509_POLICY_NODE *parent,
+ const ASN1_OBJECT *id);
X509_POLICY_NODE *ossl_policy_tree_find_sk(STACK_OF(X509_POLICY_NODE) *sk,
- const ASN1_OBJECT *id);
+ const ASN1_OBJECT *id);
X509_POLICY_NODE *ossl_policy_level_add_node(X509_POLICY_LEVEL *level,
- X509_POLICY_DATA *data,
- X509_POLICY_NODE *parent,
- X509_POLICY_TREE *tree,
- int extra_data);
+ X509_POLICY_DATA *data,
+ X509_POLICY_NODE *parent,
+ X509_POLICY_TREE *tree,
+ int extra_data);
void ossl_policy_node_free(X509_POLICY_NODE *node);
int ossl_policy_node_match(const X509_POLICY_LEVEL *lvl,
- const X509_POLICY_NODE *node, const ASN1_OBJECT *oid);
+ const X509_POLICY_NODE *node, const ASN1_OBJECT *oid);
const X509_POLICY_CACHE *ossl_policy_cache_set(X509 *x);
diff --git a/crypto/x509/pcy_map.c b/crypto/x509/pcy_map.c
index 60dfd1e320..cc192211e9 100644
--- a/crypto/x509/pcy_map.c
+++ b/crypto/x509/pcy_map.c
@@ -48,8 +48,8 @@ int ossl_policy_cache_set_mapping(X509 *x, POLICY_MAPPINGS *maps)
/* Create a NODE from anyPolicy */
if (data == NULL) {
data = ossl_policy_data_new(NULL, map->issuerDomainPolicy,
- cache->anyPolicy->flags
- & POLICY_DATA_FLAG_CRITICAL);
+ cache->anyPolicy->flags
+ & POLICY_DATA_FLAG_CRITICAL);
if (data == NULL)
goto bad_mapping;
data->qualifier_set = cache->anyPolicy->qualifier_set;
@@ -65,15 +65,13 @@ int ossl_policy_cache_set_mapping(X509 *x, POLICY_MAPPINGS *maps)
} else
data->flags |= POLICY_DATA_FLAG_MAPPED;
if (!sk_ASN1_OBJECT_push(data->expected_policy_set,
- map->subjectDomainPolicy))
+ map->subjectDomainPolicy))
goto bad_mapping;
map->subjectDomainPolicy = NULL;
-
}
ret = 1;
- bad_mapping:
+bad_mapping:
sk_POLICY_MAPPING_pop_free(maps, POLICY_MAPPING_free);
return ret;
-
}
diff --git a/crypto/x509/pcy_node.c b/crypto/x509/pcy_node.c
index c6e7af5ab1..cbb421ddf4 100644
--- a/crypto/x509/pcy_node.c
+++ b/crypto/x509/pcy_node.c
@@ -15,7 +15,7 @@
#include "pcy_local.h"
static int node_cmp(const X509_POLICY_NODE *const *a,
- const X509_POLICY_NODE *const *b)
+ const X509_POLICY_NODE *const *b)
{
return OBJ_cmp((*a)->data->valid_policy, (*b)->data->valid_policy);
}
@@ -26,7 +26,7 @@ STACK_OF(X509_POLICY_NODE) *ossl_policy_node_cmp_new(void)
}
X509_POLICY_NODE *ossl_policy_tree_find_sk(STACK_OF(X509_POLICY_NODE) *nodes,
- const ASN1_OBJECT *id)
+ const ASN1_OBJECT *id)
{
X509_POLICY_DATA n;
X509_POLICY_NODE l;
@@ -37,12 +37,11 @@ X509_POLICY_NODE *ossl_policy_tree_find_sk(STACK_OF(X509_POLICY_NODE) *nodes,
idx = sk_X509_POLICY_NODE_find(nodes, &l);
return sk_X509_POLICY_NODE_value(nodes, idx);
-
}
X509_POLICY_NODE *ossl_policy_level_find_node(const X509_POLICY_LEVEL *level,
- const X509_POLICY_NODE *parent,
- const ASN1_OBJECT *id)
+ const X509_POLICY_NODE *parent,
+ const ASN1_OBJECT *id)
{
X509_POLICY_NODE *node;
int i;
@@ -57,10 +56,10 @@ X509_POLICY_NODE *ossl_policy_level_find_node(const X509_POLICY_LEVEL *level,
}
X509_POLICY_NODE *ossl_policy_level_add_node(X509_POLICY_LEVEL *level,
- X509_POLICY_DATA *data,
- X509_POLICY_NODE *parent,
- X509_POLICY_TREE *tree,
- int extra_data)
+ X509_POLICY_DATA *data,
+ X509_POLICY_NODE *parent,
+ X509_POLICY_TREE *tree,
+ int extra_data)
{
X509_POLICY_NODE *node;
@@ -112,15 +111,15 @@ X509_POLICY_NODE *ossl_policy_level_add_node(X509_POLICY_LEVEL *level,
return node;
- extra_data_error:
+extra_data_error:
if (level != NULL) {
if (level->anyPolicy == node)
level->anyPolicy = NULL;
else
- (void) sk_X509_POLICY_NODE_pop(level->nodes);
+ (void)sk_X509_POLICY_NODE_pop(level->nodes);
}
- node_error:
+node_error:
ossl_policy_node_free(node);
return NULL;
}
@@ -136,7 +135,7 @@ void ossl_policy_node_free(X509_POLICY_NODE *node)
*/
int ossl_policy_node_match(const X509_POLICY_LEVEL *lvl,
- const X509_POLICY_NODE *node, const ASN1_OBJECT *oid)
+ const X509_POLICY_NODE *node, const ASN1_OBJECT *oid)
{
int i;
ASN1_OBJECT *policy_oid;
@@ -155,5 +154,4 @@ int ossl_policy_node_match(const X509_POLICY_LEVEL *lvl,
return 1;
}
return 0;
-
}
diff --git a/crypto/x509/pcy_tree.c b/crypto/x509/pcy_tree.c
index 69e000c7f8..cdf39ba5c7 100644
--- a/crypto/x509/pcy_tree.c
+++ b/crypto/x509/pcy_tree.c
@@ -22,14 +22,14 @@
* door on CVE-2023-0464.
*/
#ifndef OPENSSL_POLICY_TREE_NODES_MAX
-# define OPENSSL_POLICY_TREE_NODES_MAX 1000
+#define OPENSSL_POLICY_TREE_NODES_MAX 1000
#endif
static void exnode_free(X509_POLICY_NODE *node);
static void expected_print(BIO *channel,
- X509_POLICY_LEVEL *lev, X509_POLICY_NODE *node,
- int indent)
+ X509_POLICY_LEVEL *lev, X509_POLICY_NODE *node,
+ int indent)
{
if ((lev->flags & X509_V_FLAG_INHIBIT_MAP)
|| !(node->data->flags & POLICY_DATA_FLAG_MAP_MASK))
@@ -51,8 +51,8 @@ static void expected_print(BIO *channel,
}
static void tree_print(BIO *channel,
- char *str, X509_POLICY_TREE *tree,
- X509_POLICY_LEVEL *curr)
+ char *str, X509_POLICY_TREE *tree,
+ X509_POLICY_LEVEL *curr)
{
X509_POLICY_LEVEL *plev;
@@ -63,15 +63,14 @@ static void tree_print(BIO *channel,
BIO_printf(channel, "Level print after %s\n", str);
BIO_printf(channel, "Printing Up to Level %ld\n",
- (long)(curr - tree->levels));
+ (long)(curr - tree->levels));
for (plev = tree->levels; plev != curr; plev++) {
int i;
BIO_printf(channel, "Level %ld, flags = %x\n",
- (long)(plev - tree->levels), plev->flags);
+ (long)(plev - tree->levels), plev->flags);
for (i = 0; i < sk_X509_POLICY_NODE_num(plev->nodes); i++) {
- X509_POLICY_NODE *node =
- sk_X509_POLICY_NODE_value(plev->nodes, i);
+ X509_POLICY_NODE *node = sk_X509_POLICY_NODE_value(plev->nodes, i);
X509_POLICY_NODE_print(channel, node, 2);
expected_print(channel, plev, node, 2);
@@ -82,10 +81,12 @@ static void tree_print(BIO *channel,
}
}
-#define TREE_PRINT(str, tree, curr) \
- OSSL_TRACE_BEGIN(X509V3_POLICY) { \
+#define TREE_PRINT(str, tree, curr) \
+ OSSL_TRACE_BEGIN(X509V3_POLICY) \
+ { \
tree_print(trc_out, "before tree_prune()", tree, curr); \
- } OSSL_TRACE_END(X509V3_POLICY)
+ } \
+ OSSL_TRACE_END(X509V3_POLICY)
/*-
* Return value: <= 0 on error, or positive bit mask:
@@ -95,7 +96,7 @@ static void tree_print(BIO *channel,
* X509_PCY_TREE_EXPLICIT: explicit policy required
*/
static int tree_init(X509_POLICY_TREE **ptree, STACK_OF(X509) *certs,
- unsigned int flags)
+ unsigned int flags)
{
X509_POLICY_TREE *tree;
X509_POLICY_LEVEL *level;
@@ -103,9 +104,9 @@ static int tree_init(X509_POLICY_TREE **ptree, STACK_OF(X509) *certs,
X509_POLICY_DATA *data = NULL;
int ret = X509_PCY_TREE_VALID;
int n = sk_X509_num(certs) - 1; /* RFC5280 paths omit the TA */
- int explicit_policy = (flags & X509_V_FLAG_EXPLICIT_POLICY) ? 0 : n+1;
- int any_skip = (flags & X509_V_FLAG_INHIBIT_ANY) ? 0 : n+1;
- int map_skip = (flags & X509_V_FLAG_INHIBIT_MAP) ? 0 : n+1;
+ int explicit_policy = (flags & X509_V_FLAG_EXPLICIT_POLICY) ? 0 : n + 1;
+ int any_skip = (flags & X509_V_FLAG_INHIBIT_ANY) ? 0 : n + 1;
+ int map_skip = (flags & X509_V_FLAG_INHIBIT_MAP) ? 0 : n + 1;
int i;
*ptree = NULL;
@@ -144,8 +145,8 @@ static int tree_init(X509_POLICY_TREE **ptree, STACK_OF(X509) *certs,
* policy is required we're done.
*/
for (i = n - 1;
- i >= 0 && (explicit_policy > 0 || (ret & X509_PCY_TREE_EMPTY) == 0);
- i--) {
+ i >= 0 && (explicit_policy > 0 || (ret & X509_PCY_TREE_EMPTY) == 0);
+ i--) {
X509 *x = sk_X509_value(certs, i);
uint32_t ex_flags = X509_get_extension_flags(x);
@@ -190,10 +191,11 @@ static int tree_init(X509_POLICY_TREE **ptree, STACK_OF(X509) *certs,
OPENSSL_free(tree);
return X509_PCY_TREE_INTERNAL;
}
- tree->nlevel = n+1;
+ tree->nlevel = n + 1;
level = tree->levels;
if ((data = ossl_policy_data_new(NULL,
- OBJ_nid2obj(NID_any_policy), 0)) == NULL)
+ OBJ_nid2obj(NID_any_policy), 0))
+ == NULL)
goto bad_tree;
if (ossl_policy_level_add_node(level, data, NULL, tree, 1) == NULL) {
ossl_policy_data_free(data);
@@ -247,7 +249,7 @@ static int tree_init(X509_POLICY_TREE **ptree, STACK_OF(X509) *certs,
*ptree = tree;
return ret;
- bad_tree:
+bad_tree:
X509_policy_tree_free(tree);
return X509_PCY_TREE_INTERNAL;
}
@@ -256,8 +258,8 @@ static int tree_init(X509_POLICY_TREE **ptree, STACK_OF(X509) *certs,
* Return value: 1 on success, 0 otherwise
*/
static int tree_link_matching_nodes(X509_POLICY_LEVEL *curr,
- X509_POLICY_DATA *data,
- X509_POLICY_TREE *tree)
+ X509_POLICY_DATA *data,
+ X509_POLICY_TREE *tree)
{
X509_POLICY_LEVEL *last = curr - 1;
int i, matched = 0;
@@ -286,8 +288,8 @@ static int tree_link_matching_nodes(X509_POLICY_LEVEL *curr,
* Return value: 1 on success, 0 otherwise.
*/
static int tree_link_nodes(X509_POLICY_LEVEL *curr,
- const X509_POLICY_CACHE *cache,
- X509_POLICY_TREE *tree)
+ const X509_POLICY_CACHE *cache,
+ X509_POLICY_TREE *tree)
{
int i;
@@ -308,9 +310,9 @@ static int tree_link_nodes(X509_POLICY_LEVEL *curr,
* Return value: 1 on success, 0 otherwise.
*/
static int tree_add_unmatched(X509_POLICY_LEVEL *curr,
- const X509_POLICY_CACHE *cache,
- const ASN1_OBJECT *id,
- X509_POLICY_NODE *node, X509_POLICY_TREE *tree)
+ const X509_POLICY_CACHE *cache,
+ const ASN1_OBJECT *id,
+ X509_POLICY_NODE *node, X509_POLICY_TREE *tree)
{
X509_POLICY_DATA *data;
@@ -337,8 +339,8 @@ static int tree_add_unmatched(X509_POLICY_LEVEL *curr,
* Return value: 1 on success, 0 otherwise.
*/
static int tree_link_unmatched(X509_POLICY_LEVEL *curr,
- const X509_POLICY_CACHE *cache,
- X509_POLICY_NODE *node, X509_POLICY_TREE *tree)
+ const X509_POLICY_CACHE *cache,
+ X509_POLICY_NODE *node, X509_POLICY_TREE *tree)
{
const X509_POLICY_LEVEL *last = curr - 1;
int i;
@@ -364,7 +366,6 @@ static int tree_link_unmatched(X509_POLICY_LEVEL *curr,
if (!tree_add_unmatched(curr, cache, oid, node, tree))
return 0;
}
-
}
return 1;
}
@@ -373,8 +374,8 @@ static int tree_link_unmatched(X509_POLICY_LEVEL *curr,
* Return value: 1 on success, 0 otherwise
*/
static int tree_link_any(X509_POLICY_LEVEL *curr,
- const X509_POLICY_CACHE *cache,
- X509_POLICY_TREE *tree)
+ const X509_POLICY_CACHE *cache,
+ X509_POLICY_TREE *tree)
{
int i;
X509_POLICY_NODE *node;
@@ -387,9 +388,7 @@ static int tree_link_any(X509_POLICY_LEVEL *curr,
return 0;
}
/* Finally add link to anyPolicy */
- if (last->anyPolicy &&
- ossl_policy_level_add_node(curr, cache->anyPolicy,
- last->anyPolicy, tree, 0) == NULL)
+ if (last->anyPolicy && ossl_policy_level_add_node(curr, cache->anyPolicy, last->anyPolicy, tree, 0) == NULL)
return 0;
return 1;
}
@@ -453,10 +452,9 @@ static int tree_prune(X509_POLICY_TREE *tree, X509_POLICY_LEVEL *curr)
* Return value: 1 on success, 0 otherwise.
*/
static int tree_add_auth_node(STACK_OF(X509_POLICY_NODE) **pnodes,
- X509_POLICY_NODE *pcy)
+ X509_POLICY_NODE *pcy)
{
- if (*pnodes == NULL &&
- (*pnodes = ossl_policy_node_cmp_new()) == NULL)
+ if (*pnodes == NULL && (*pnodes = ossl_policy_node_cmp_new()) == NULL)
return 0;
if (sk_X509_POLICY_NODE_find(*pnodes, pcy) >= 0)
return 1;
@@ -480,7 +478,7 @@ static int tree_add_auth_node(STACK_OF(X509_POLICY_NODE) **pnodes,
* TREE_CALC_OK_DOFREE on success and pnodes needs to be freed
*/
static int tree_calculate_authority_set(X509_POLICY_TREE *tree,
- STACK_OF(X509_POLICY_NODE) **pnodes)
+ STACK_OF(X509_POLICY_NODE) **pnodes)
{
X509_POLICY_LEVEL *curr;
X509_POLICY_NODE *node, *anyptr;
@@ -529,8 +527,8 @@ static int tree_calculate_authority_set(X509_POLICY_TREE *tree,
* Return value: 1 on success, 0 otherwise.
*/
static int tree_calculate_user_set(X509_POLICY_TREE *tree,
- STACK_OF(ASN1_OBJECT) *policy_oids,
- STACK_OF(X509_POLICY_NODE) *auth_nodes)
+ STACK_OF(ASN1_OBJECT) *policy_oids,
+ STACK_OF(X509_POLICY_NODE) *auth_nodes)
{
int i;
X509_POLICY_NODE *node;
@@ -572,7 +570,7 @@ static int tree_calculate_user_set(X509_POLICY_TREE *tree,
extra->flags = POLICY_DATA_FLAG_SHARED_QUALIFIERS
| POLICY_DATA_FLAG_EXTRA_NODE;
node = ossl_policy_level_add_node(NULL, extra, anyPolicy->parent,
- tree, 1);
+ tree, 1);
if (node == NULL) {
ossl_policy_data_free(extra);
return 0;
@@ -647,7 +645,6 @@ void X509_policy_tree_free(X509_POLICY_TREE *tree)
sk_X509_POLICY_DATA_pop_free(tree->extra_data, ossl_policy_data_free);
OPENSSL_free(tree->levels);
OPENSSL_free(tree);
-
}
/*-
@@ -659,8 +656,8 @@ void X509_policy_tree_free(X509_POLICY_TREE *tree)
* X509_PCY_TREE_VALID: Success (null tree if empty or bare TA)
*/
int X509_policy_check(X509_POLICY_TREE **ptree, int *pexplicit_policy,
- STACK_OF(X509) *certs,
- STACK_OF(ASN1_OBJECT) *policy_oids, unsigned int flags)
+ STACK_OF(X509) *certs,
+ STACK_OF(ASN1_OBJECT) *policy_oids, unsigned int flags)
{
int init_ret;
int ret;
@@ -719,7 +716,7 @@ int X509_policy_check(X509_POLICY_TREE **ptree, int *pexplicit_policy,
}
return X509_PCY_TREE_VALID;
- error:
+error:
X509_policy_tree_free(tree);
return X509_PCY_TREE_INTERNAL;
}
diff --git a/crypto/x509/standard_exts.h b/crypto/x509/standard_exts.h
index b9b8ada307..46bda55558 100644
--- a/crypto/x509/standard_exts.h
+++ b/crypto/x509/standard_exts.h
@@ -97,4 +97,3 @@ static const X509V3_EXT_METHOD *const standard_exts[] = {
/* Number of standard extensions */
#define STANDARD_EXTENSION_COUNT OSSL_NELEM(standard_exts)
-
diff --git a/crypto/x509/t_acert.c b/crypto/x509/t_acert.c
index 088454bc65..1ee6b9eacb 100644
--- a/crypto/x509/t_acert.c
+++ b/crypto/x509/t_acert.c
@@ -63,11 +63,12 @@ static int print_attribute(BIO *bp, X509_ATTRIBUTE *a)
if (BIO_puts(bp, "\n") <= 0)
goto err;
ASN1_parse_dump(bp, at->value.sequence->data,
- at->value.sequence->length, i, 1);
+ at->value.sequence->length, i, 1);
break;
default:
if (BIO_printf(bp, "unable to print attribute of type 0x%X\n",
- type) < 0)
+ type)
+ < 0)
goto err;
break;
}
@@ -78,7 +79,7 @@ err:
}
int X509_ACERT_print_ex(BIO *bp, X509_ACERT *x, unsigned long nmflags,
- unsigned long cflag)
+ unsigned long cflag)
{
int i;
char mlch = ' ';
@@ -100,7 +101,8 @@ int X509_ACERT_print_ex(BIO *bp, X509_ACERT *x, unsigned long nmflags,
l = X509_ACERT_get_version(x);
if (l == X509_ACERT_VERSION_2) {
if (BIO_printf(bp, "%8sVersion: %ld (0x%lx)\n", "", l + 1,
- (unsigned long)l) <= 0)
+ (unsigned long)l)
+ <= 0)
goto err;
} else {
if (BIO_printf(bp, "%8sVersion: Unknown (%ld)\n", "", l) <= 0)
diff --git a/crypto/x509/t_crl.c b/crypto/x509/t_crl.c
index d7cc435e00..7dfaaad5eb 100644
--- a/crypto/x509/t_crl.c
+++ b/crypto/x509/t_crl.c
@@ -34,7 +34,7 @@ int X509_CRL_print_fp(FILE *fp, X509_CRL *x)
int X509_CRL_print(BIO *out, const X509_CRL *x)
{
- return X509_CRL_print_ex(out, x, XN_FLAG_COMPAT);
+ return X509_CRL_print_ex(out, x, XN_FLAG_COMPAT);
}
int X509_CRL_print_ex(BIO *out, const X509_CRL *x, unsigned long nmflag)
@@ -74,7 +74,7 @@ int X509_CRL_print_ex(BIO *out, const X509_CRL *x, unsigned long nmflag)
BIO_printf(out, "\n");
X509V3_extensions_print(out, "CRL extensions",
- X509_CRL_get0_extensions(x), 0, 4);
+ X509_CRL_get0_extensions(x), 0, 4);
rev = X509_CRL_get_REVOKED(x);
@@ -91,10 +91,9 @@ int X509_CRL_print_ex(BIO *out, const X509_CRL *x, unsigned long nmflag)
ASN1_TIME_print(out, X509_REVOKED_get0_revocationDate(r));
BIO_printf(out, "\n");
X509V3_extensions_print(out, "CRL entry extensions",
- X509_REVOKED_get0_extensions(r), 0, 8);
+ X509_REVOKED_get0_extensions(r), 0, 8);
}
X509_signature_print(out, sig_alg, sig);
return 1;
-
}
diff --git a/crypto/x509/t_req.c b/crypto/x509/t_req.c
index d427c19348..bb10d6f6f1 100644
--- a/crypto/x509/t_req.c
+++ b/crypto/x509/t_req.c
@@ -71,7 +71,8 @@ int X509_REQ_print_ex(BIO *bp, const X509_REQ *x, unsigned long nmflags, unsigne
if (BIO_printf(bp, " Subject:%c", mlch) <= 0)
goto err;
if (X509_NAME_print_ex(bp, X509_REQ_get_subject_name(x),
- nmindent, nmflags) < printok)
+ nmindent, nmflags)
+ < printok)
goto err;
if (BIO_write(bp, "\n", 1) <= 0)
goto err;
@@ -127,10 +128,10 @@ int X509_REQ_print_ex(BIO *bp, const X509_REQ *x, unsigned long nmflags, unsigne
ii = 0;
count = X509_ATTRIBUTE_count(a);
if (count == 0) {
- ERR_raise(ERR_LIB_X509, X509_R_INVALID_ATTRIBUTES);
- return 0;
+ ERR_raise(ERR_LIB_X509, X509_R_INVALID_ATTRIBUTES);
+ return 0;
}
- get_next:
+ get_next:
at = X509_ATTRIBUTE_get0_type(a, ii);
type = at->type;
bs = at->value.asn1_string;
@@ -147,7 +148,7 @@ int X509_REQ_print_ex(BIO *bp, const X509_REQ *x, unsigned long nmflags, unsigne
case V_ASN1_UTF8STRING:
case V_ASN1_IA5STRING:
if (BIO_write(bp, (char *)bs->data, bs->length)
- != bs->length)
+ != bs->length)
goto err;
if (BIO_puts(bp, "\n") <= 0)
goto err;
@@ -183,7 +184,8 @@ int X509_REQ_print_ex(BIO *bp, const X509_REQ *x, unsigned long nmflags, unsigne
if (!X509V3_EXT_print(bp, ex, cflag, 20)) {
if (BIO_printf(bp, "%20s", "") <= 0
|| ASN1_STRING_print(bp,
- X509_EXTENSION_get_data(ex)) <= 0)
+ X509_EXTENSION_get_data(ex))
+ <= 0)
goto err;
}
if (BIO_write(bp, "\n", 1) <= 0)
@@ -203,7 +205,7 @@ int X509_REQ_print_ex(BIO *bp, const X509_REQ *x, unsigned long nmflags, unsigne
}
return 1;
- err:
+err:
sk_X509_EXTENSION_pop_free(exts, X509_EXTENSION_free);
ERR_raise(ERR_LIB_X509, ERR_R_BUF_LIB);
return 0;
diff --git a/crypto/x509/t_x509.c b/crypto/x509/t_x509.c
index 589fa87bd4..c4927d357b 100644
--- a/crypto/x509/t_x509.c
+++ b/crypto/x509/t_x509.c
@@ -132,8 +132,7 @@ int X509_print_ex(BIO *bp, const X509 *x, unsigned long nmflags, unsigned long c
if (!(cflag & X509_FLAG_NO_SUBJECT)) {
if (BIO_printf(bp, " Subject:%c", mlch) <= 0)
goto err;
- if (X509_NAME_print_ex
- (bp, X509_get_subject_name(x), nmindent, nmflags) < printok)
+ if (X509_NAME_print_ex(bp, X509_get_subject_name(x), nmindent, nmflags) < printok)
goto err;
if (BIO_write(bp, "\n", 1) <= 0)
goto err;
@@ -179,7 +178,7 @@ int X509_print_ex(BIO *bp, const X509 *x, unsigned long nmflags, unsigned long c
if (!(cflag & X509_FLAG_NO_EXTENSIONS)
&& !X509V3_extensions_print(bp, "X509v3 extensions",
- X509_get0_extensions(x), cflag, 8))
+ X509_get0_extensions(x), cflag, 8))
goto err;
if (!(cflag & X509_FLAG_NO_SIGDUMP)) {
@@ -194,7 +193,7 @@ int X509_print_ex(BIO *bp, const X509 *x, unsigned long nmflags, unsigned long c
goto err;
}
ret = 1;
- err:
+err:
return ret;
}
@@ -249,7 +248,7 @@ int X509_ocspid_print(BIO *bp, const X509 *x)
goto err;
if (!EVP_Digest(ASN1_STRING_get0_data(keybstr),
- ASN1_STRING_length(keybstr), SHA1md, NULL, md, NULL))
+ ASN1_STRING_length(keybstr), SHA1md, NULL, md, NULL))
goto err;
for (i = 0; i < SHA_DIGEST_LENGTH; i++) {
if (BIO_printf(bp, "%02X", SHA1md[i]) <= 0)
@@ -259,7 +258,7 @@ int X509_ocspid_print(BIO *bp, const X509 *x)
EVP_MD_free(md);
return 1;
- err:
+err:
OPENSSL_free(der);
EVP_MD_free(md);
return 0;
@@ -289,7 +288,7 @@ int X509_signature_dump(BIO *bp, const ASN1_STRING *sig, int indent)
}
int X509_signature_print(BIO *bp, const X509_ALGOR *sigalg,
- const ASN1_STRING *sig)
+ const ASN1_STRING *sig)
{
#ifndef OPENSSL_NO_DEPRECATED_3_6
int sig_nid;
@@ -341,7 +340,7 @@ int X509_aux_print(BIO *out, const X509 *x, int indent)
else
first = 0;
OBJ_obj2txt(oidstr, sizeof(oidstr),
- sk_ASN1_OBJECT_value(trust, i), 0);
+ sk_ASN1_OBJECT_value(trust, i), 0);
BIO_puts(out, oidstr);
}
BIO_puts(out, "\n");
@@ -356,7 +355,7 @@ int X509_aux_print(BIO *out, const X509 *x, int indent)
else
first = 0;
OBJ_obj2txt(oidstr, sizeof(oidstr),
- sk_ASN1_OBJECT_value(reject, i), 0);
+ sk_ASN1_OBJECT_value(reject, i), 0);
BIO_puts(out, oidstr);
}
BIO_puts(out, "\n");
@@ -381,13 +380,12 @@ int X509_aux_print(BIO *out, const X509 *x, int indent)
int ossl_x509_print_ex_brief(BIO *bio, X509 *cert, unsigned long neg_cflags)
{
- unsigned long flags = ASN1_STRFLGS_RFC2253 | ASN1_STRFLGS_ESC_QUOTE |
- XN_FLAG_SEP_CPLUS_SPC | XN_FLAG_FN_SN;
+ unsigned long flags = ASN1_STRFLGS_RFC2253 | ASN1_STRFLGS_ESC_QUOTE | XN_FLAG_SEP_CPLUS_SPC | XN_FLAG_FN_SN;
if (cert == NULL)
return BIO_printf(bio, " (no certificate)\n") > 0;
if (BIO_printf(bio, " certificate\n") <= 0
- || !X509_print_ex(bio, cert, flags, ~X509_FLAG_NO_SUBJECT))
+ || !X509_print_ex(bio, cert, flags, ~X509_FLAG_NO_SUBJECT))
return 0;
if (X509_check_issued((X509 *)cert, cert) == X509_V_OK) {
if (BIO_printf(bio, " self-issued\n") <= 0)
@@ -398,7 +396,7 @@ int ossl_x509_print_ex_brief(BIO *bio, X509 *cert, unsigned long neg_cflags)
return 0;
}
if (!X509_print_ex(bio, cert, flags,
- ~(X509_FLAG_NO_SERIAL | X509_FLAG_NO_VALIDITY)))
+ ~(X509_FLAG_NO_SERIAL | X509_FLAG_NO_VALIDITY)))
return 0;
if (X509_cmp_current_time(X509_get0_notBefore(cert)) > 0)
if (BIO_printf(bio, " not yet valid\n") <= 0)
@@ -407,7 +405,7 @@ int ossl_x509_print_ex_brief(BIO *bio, X509 *cert, unsigned long neg_cflags)
if (BIO_printf(bio, " no more valid\n") <= 0)
return 0;
return X509_print_ex(bio, cert, flags,
- ~neg_cflags & ~X509_FLAG_EXTENSIONS_ONLY_KID);
+ ~neg_cflags & ~X509_FLAG_EXTENSIONS_ONLY_KID);
}
static int print_certs(BIO *bio, const STACK_OF(X509) *certs)
@@ -424,10 +422,10 @@ static int print_certs(BIO *bio, const STACK_OF(X509) *certs)
if (!ossl_x509_print_ex_brief(bio, cert, 0))
return 0;
if (!X509V3_extensions_print(bio, NULL,
- X509_get0_extensions(cert),
- X509_FLAG_EXTENSIONS_ONLY_KID, 8))
+ X509_get0_extensions(cert),
+ X509_FLAG_EXTENSIONS_ONLY_KID, 8))
return 0;
- }
+ }
}
return 1;
}
@@ -455,11 +453,11 @@ int X509_STORE_CTX_print_verify_cb(int ok, X509_STORE_CTX *ctx)
if (bio == NULL)
return 0;
BIO_printf(bio, "%s at depth = %d error = %d (%s)\n",
- X509_STORE_CTX_get0_parent_ctx(ctx) != NULL
- ? "CRL path validation"
- : "Certificate verification",
- X509_STORE_CTX_get_error_depth(ctx),
- cert_error, X509_verify_cert_error_string(cert_error));
+ X509_STORE_CTX_get0_parent_ctx(ctx) != NULL
+ ? "CRL path validation"
+ : "Certificate verification",
+ X509_STORE_CTX_get_error_depth(ctx),
+ cert_error, X509_verify_cert_error_string(cert_error));
{
X509_STORE *ts = X509_STORE_CTX_get0_store(ctx);
X509_VERIFY_PARAM *vpm = X509_STORE_get0_param(ts);
@@ -491,14 +489,14 @@ int X509_STORE_CTX_print_verify_cb(int ok, X509_STORE_CTX *ctx)
BIO_printf(bio, "Failure for:\n");
ossl_x509_print_ex_brief(bio, X509_STORE_CTX_get_current_cert(ctx),
- X509_FLAG_NO_EXTENSIONS);
+ X509_FLAG_NO_EXTENSIONS);
if (cert_error == X509_V_ERR_CERT_UNTRUSTED
- || cert_error == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT
- || cert_error == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN
- || cert_error == X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT
- || cert_error == X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY
- || cert_error == X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER
- || cert_error == X509_V_ERR_STORE_LOOKUP) {
+ || cert_error == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT
+ || cert_error == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN
+ || cert_error == X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT
+ || cert_error == X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY
+ || cert_error == X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER
+ || cert_error == X509_V_ERR_STORE_LOOKUP) {
BIO_printf(bio, "Non-trusted certs:\n");
print_certs(bio, X509_STORE_CTX_get0_untrusted(ctx));
BIO_printf(bio, "Certs in trust store:\n");
diff --git a/crypto/x509/v3_aaa.c b/crypto/x509/v3_aaa.c
index 719216b302..64d0791eb4 100644
--- a/crypto/x509/v3_aaa.c
+++ b/crypto/x509/v3_aaa.c
@@ -15,21 +15,20 @@
ASN1_CHOICE(OSSL_ALLOWED_ATTRIBUTES_CHOICE) = {
ASN1_IMP(OSSL_ALLOWED_ATTRIBUTES_CHOICE, choice.attributeType, ASN1_OBJECT,
- OSSL_AAA_ATTRIBUTE_TYPE),
+ OSSL_AAA_ATTRIBUTE_TYPE),
ASN1_IMP(OSSL_ALLOWED_ATTRIBUTES_CHOICE, choice.attributeTypeandValues,
- X509_ATTRIBUTE, OSSL_AAA_ATTRIBUTE_VALUES),
+ X509_ATTRIBUTE, OSSL_AAA_ATTRIBUTE_VALUES),
} ASN1_CHOICE_END(OSSL_ALLOWED_ATTRIBUTES_CHOICE)
ASN1_SEQUENCE(OSSL_ALLOWED_ATTRIBUTES_ITEM) = {
ASN1_IMP_SET_OF(OSSL_ALLOWED_ATTRIBUTES_ITEM, attributes,
- OSSL_ALLOWED_ATTRIBUTES_CHOICE, 0),
+ OSSL_ALLOWED_ATTRIBUTES_CHOICE, 0),
/* This MUST be EXPLICIT, because it contains a CHOICE. */
ASN1_EXP(OSSL_ALLOWED_ATTRIBUTES_ITEM, holderDomain, GENERAL_NAME, 1),
} ASN1_SEQUENCE_END(OSSL_ALLOWED_ATTRIBUTES_ITEM)
-ASN1_ITEM_TEMPLATE(OSSL_ALLOWED_ATTRIBUTES_SYNTAX) =
- ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SET_OF, 0, OSSL_ALLOWED_ATTRIBUTES_SYNTAX,
- OSSL_ALLOWED_ATTRIBUTES_ITEM)
+ASN1_ITEM_TEMPLATE(OSSL_ALLOWED_ATTRIBUTES_SYNTAX) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SET_OF, 0, OSSL_ALLOWED_ATTRIBUTES_SYNTAX,
+ OSSL_ALLOWED_ATTRIBUTES_ITEM)
ASN1_ITEM_TEMPLATE_END(OSSL_ALLOWED_ATTRIBUTES_SYNTAX)
IMPLEMENT_ASN1_FUNCTIONS(OSSL_ALLOWED_ATTRIBUTES_CHOICE)
@@ -37,8 +36,8 @@ IMPLEMENT_ASN1_FUNCTIONS(OSSL_ALLOWED_ATTRIBUTES_ITEM)
IMPLEMENT_ASN1_FUNCTIONS(OSSL_ALLOWED_ATTRIBUTES_SYNTAX)
static int i2r_ALLOWED_ATTRIBUTES_CHOICE(X509V3_EXT_METHOD *method,
- OSSL_ALLOWED_ATTRIBUTES_CHOICE *a,
- BIO *out, int indent)
+ OSSL_ALLOWED_ATTRIBUTES_CHOICE *a,
+ BIO *out, int indent)
{
ASN1_OBJECT *attr_obj;
int attr_nid, j;
@@ -77,8 +76,8 @@ static int i2r_ALLOWED_ATTRIBUTES_CHOICE(X509V3_EXT_METHOD *method,
}
static int i2r_ALLOWED_ATTRIBUTES_ITEM(X509V3_EXT_METHOD *method,
- OSSL_ALLOWED_ATTRIBUTES_ITEM *aai,
- BIO *out, int indent)
+ OSSL_ALLOWED_ATTRIBUTES_ITEM *aai,
+ BIO *out, int indent)
{
int i;
OSSL_ALLOWED_ATTRIBUTES_CHOICE *a;
@@ -100,8 +99,8 @@ static int i2r_ALLOWED_ATTRIBUTES_ITEM(X509V3_EXT_METHOD *method,
}
static int i2r_ALLOWED_ATTRIBUTES_SYNTAX(X509V3_EXT_METHOD *method,
- OSSL_ALLOWED_ATTRIBUTES_SYNTAX *aaa,
- BIO *out, int indent)
+ OSSL_ALLOWED_ATTRIBUTES_SYNTAX *aaa,
+ BIO *out, int indent)
{
int i;
OSSL_ALLOWED_ATTRIBUTES_ITEM *aai;
diff --git a/crypto/x509/v3_ac_tgt.c b/crypto/x509/v3_ac_tgt.c
index 9bc10b9627..654263e216 100644
--- a/crypto/x509/v3_ac_tgt.c
+++ b/crypto/x509/v3_ac_tgt.c
@@ -25,20 +25,20 @@
#include "crypto/asn1.h"
static int i2r_ISSUER_SERIAL(X509V3_EXT_METHOD *method,
- OSSL_ISSUER_SERIAL *iss,
- BIO *out, int indent);
+ OSSL_ISSUER_SERIAL *iss,
+ BIO *out, int indent);
static int i2r_OBJECT_DIGEST_INFO(X509V3_EXT_METHOD *method,
- OSSL_OBJECT_DIGEST_INFO *odi,
- BIO *out, int indent);
+ OSSL_OBJECT_DIGEST_INFO *odi,
+ BIO *out, int indent);
static int i2r_TARGET_CERT(X509V3_EXT_METHOD *method,
- OSSL_TARGET_CERT *tc,
- BIO *out, int indent);
+ OSSL_TARGET_CERT *tc,
+ BIO *out, int indent);
static int i2r_TARGET(X509V3_EXT_METHOD *method,
- OSSL_TARGET *target,
- BIO *out, int indent);
+ OSSL_TARGET *target,
+ BIO *out, int indent);
static int i2r_TARGETING_INFORMATION(X509V3_EXT_METHOD *method,
- OSSL_TARGETING_INFORMATION *tinfo,
- BIO *out, int indent);
+ OSSL_TARGETING_INFORMATION *tinfo,
+ BIO *out, int indent);
ASN1_SEQUENCE(OSSL_ISSUER_SERIAL) = {
ASN1_SEQUENCE_OF(OSSL_ISSUER_SERIAL, issuer, GENERAL_NAME),
@@ -46,31 +46,32 @@ ASN1_SEQUENCE(OSSL_ISSUER_SERIAL) = {
ASN1_OPT(OSSL_ISSUER_SERIAL, issuerUID, ASN1_BIT_STRING),
} static_ASN1_SEQUENCE_END(OSSL_ISSUER_SERIAL)
-ASN1_SEQUENCE(OSSL_OBJECT_DIGEST_INFO) = {
- ASN1_EMBED(OSSL_OBJECT_DIGEST_INFO, digestedObjectType, ASN1_ENUMERATED),
- ASN1_OPT(OSSL_OBJECT_DIGEST_INFO, otherObjectTypeID, ASN1_OBJECT),
- ASN1_EMBED(OSSL_OBJECT_DIGEST_INFO, digestAlgorithm, X509_ALGOR),
- ASN1_EMBED(OSSL_OBJECT_DIGEST_INFO, objectDigest, ASN1_BIT_STRING),
-} static_ASN1_SEQUENCE_END(OSSL_OBJECT_DIGEST_INFO)
-
-ASN1_SEQUENCE(OSSL_TARGET_CERT) = {
- ASN1_SIMPLE(OSSL_TARGET_CERT, targetCertificate, OSSL_ISSUER_SERIAL),
- ASN1_OPT(OSSL_TARGET_CERT, targetName, GENERAL_NAME),
- ASN1_OPT(OSSL_TARGET_CERT, certDigestInfo, OSSL_OBJECT_DIGEST_INFO),
-} static_ASN1_SEQUENCE_END(OSSL_TARGET_CERT)
-
-ASN1_CHOICE(OSSL_TARGET) = {
- ASN1_EXP(OSSL_TARGET, choice.targetName, GENERAL_NAME, 0),
- ASN1_EXP(OSSL_TARGET, choice.targetGroup, GENERAL_NAME, 1),
- ASN1_IMP(OSSL_TARGET, choice.targetCert, OSSL_TARGET_CERT, 2),
-} ASN1_CHOICE_END(OSSL_TARGET)
-
-ASN1_ITEM_TEMPLATE(OSSL_TARGETS) =
- ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, Targets, OSSL_TARGET)
+ ASN1_SEQUENCE(OSSL_OBJECT_DIGEST_INFO)
+ = {
+ ASN1_EMBED(OSSL_OBJECT_DIGEST_INFO, digestedObjectType, ASN1_ENUMERATED),
+ ASN1_OPT(OSSL_OBJECT_DIGEST_INFO, otherObjectTypeID, ASN1_OBJECT),
+ ASN1_EMBED(OSSL_OBJECT_DIGEST_INFO, digestAlgorithm, X509_ALGOR),
+ ASN1_EMBED(OSSL_OBJECT_DIGEST_INFO, objectDigest, ASN1_BIT_STRING),
+ } static_ASN1_SEQUENCE_END(OSSL_OBJECT_DIGEST_INFO)
+
+ ASN1_SEQUENCE(OSSL_TARGET_CERT)
+ = {
+ ASN1_SIMPLE(OSSL_TARGET_CERT, targetCertificate, OSSL_ISSUER_SERIAL),
+ ASN1_OPT(OSSL_TARGET_CERT, targetName, GENERAL_NAME),
+ ASN1_OPT(OSSL_TARGET_CERT, certDigestInfo, OSSL_OBJECT_DIGEST_INFO),
+ } static_ASN1_SEQUENCE_END(OSSL_TARGET_CERT)
+
+ ASN1_CHOICE(OSSL_TARGET)
+ = {
+ ASN1_EXP(OSSL_TARGET, choice.targetName, GENERAL_NAME, 0),
+ ASN1_EXP(OSSL_TARGET, choice.targetGroup, GENERAL_NAME, 1),
+ ASN1_IMP(OSSL_TARGET, choice.targetCert, OSSL_TARGET_CERT, 2),
+ } ASN1_CHOICE_END(OSSL_TARGET)
+
+ASN1_ITEM_TEMPLATE(OSSL_TARGETS) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, Targets, OSSL_TARGET)
ASN1_ITEM_TEMPLATE_END(OSSL_TARGETS)
-ASN1_ITEM_TEMPLATE(OSSL_TARGETING_INFORMATION) =
- ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, TargetingInformation, OSSL_TARGETS)
+ASN1_ITEM_TEMPLATE(OSSL_TARGETING_INFORMATION) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, TargetingInformation, OSSL_TARGETS)
ASN1_ITEM_TEMPLATE_END(OSSL_TARGETING_INFORMATION)
IMPLEMENT_ASN1_FUNCTIONS(OSSL_TARGET)
@@ -78,8 +79,8 @@ IMPLEMENT_ASN1_FUNCTIONS(OSSL_TARGETS)
IMPLEMENT_ASN1_FUNCTIONS(OSSL_TARGETING_INFORMATION)
static int i2r_ISSUER_SERIAL(X509V3_EXT_METHOD *method,
- OSSL_ISSUER_SERIAL *iss,
- BIO *out, int indent)
+ OSSL_ISSUER_SERIAL *iss,
+ BIO *out, int indent)
{
if (iss->issuer != NULL) {
BIO_printf(out, "%*sIssuer Names:\n", indent, "");
@@ -104,8 +105,8 @@ static int i2r_ISSUER_SERIAL(X509V3_EXT_METHOD *method,
}
static int i2r_OBJECT_DIGEST_INFO(X509V3_EXT_METHOD *method,
- OSSL_OBJECT_DIGEST_INFO *odi,
- BIO *out, int indent)
+ OSSL_OBJECT_DIGEST_INFO *odi,
+ BIO *out, int indent)
{
int64_t dot = 0;
#ifndef OPENSSL_NO_DEPRECATED_3_6
@@ -166,8 +167,8 @@ static int i2r_OBJECT_DIGEST_INFO(X509V3_EXT_METHOD *method,
}
static int i2r_TARGET_CERT(X509V3_EXT_METHOD *method,
- OSSL_TARGET_CERT *tc,
- BIO *out, int indent)
+ OSSL_TARGET_CERT *tc,
+ BIO *out, int indent)
{
BIO_printf(out, "%*s", indent, "");
if (tc->targetCertificate != NULL) {
@@ -188,8 +189,8 @@ static int i2r_TARGET_CERT(X509V3_EXT_METHOD *method,
}
static int i2r_TARGET(X509V3_EXT_METHOD *method,
- OSSL_TARGET *target,
- BIO *out, int indent)
+ OSSL_TARGET *target,
+ BIO *out, int indent)
{
switch (target->type) {
case OSSL_TGT_TARGET_NAME:
@@ -211,8 +212,8 @@ static int i2r_TARGET(X509V3_EXT_METHOD *method,
}
static int i2r_TARGETS(X509V3_EXT_METHOD *method,
- OSSL_TARGETS *targets,
- BIO *out, int indent)
+ OSSL_TARGETS *targets,
+ BIO *out, int indent)
{
int i;
OSSL_TARGET *target;
@@ -226,8 +227,8 @@ static int i2r_TARGETS(X509V3_EXT_METHOD *method,
}
static int i2r_TARGETING_INFORMATION(X509V3_EXT_METHOD *method,
- OSSL_TARGETING_INFORMATION *tinfo,
- BIO *out, int indent)
+ OSSL_TARGETING_INFORMATION *tinfo,
+ BIO *out, int indent)
{
int i;
OSSL_TARGETS *targets;
diff --git a/crypto/x509/v3_addr.c b/crypto/x509/v3_addr.c
index 463d8f18b5..f5436d1d3b 100644
--- a/crypto/x509/v3_addr.c
+++ b/crypto/x509/v3_addr.c
@@ -40,25 +40,24 @@ ASN1_SEQUENCE(IPAddressRange) = {
ASN1_CHOICE(IPAddressOrRange) = {
ASN1_SIMPLE(IPAddressOrRange, u.addressPrefix, ASN1_BIT_STRING),
- ASN1_SIMPLE(IPAddressOrRange, u.addressRange, IPAddressRange)
+ ASN1_SIMPLE(IPAddressOrRange, u.addressRange, IPAddressRange)
} ASN1_CHOICE_END(IPAddressOrRange)
ASN1_CHOICE(IPAddressChoice) = {
- ASN1_SIMPLE(IPAddressChoice, u.inherit, ASN1_NULL),
+ ASN1_SIMPLE(IPAddressChoice, u.inherit, ASN1_NULL),
ASN1_SEQUENCE_OF(IPAddressChoice, u.addressesOrRanges, IPAddressOrRange)
} ASN1_CHOICE_END(IPAddressChoice)
ASN1_SEQUENCE(IPAddressFamily) = {
- ASN1_SIMPLE(IPAddressFamily, addressFamily, ASN1_OCTET_STRING),
+ ASN1_SIMPLE(IPAddressFamily, addressFamily, ASN1_OCTET_STRING),
ASN1_SIMPLE(IPAddressFamily, ipAddressChoice, IPAddressChoice)
} ASN1_SEQUENCE_END(IPAddressFamily)
-ASN1_ITEM_TEMPLATE(IPAddrBlocks) =
- ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0,
- IPAddrBlocks, IPAddressFamily)
+ASN1_ITEM_TEMPLATE(IPAddrBlocks) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0,
+ IPAddrBlocks, IPAddressFamily)
static_ASN1_ITEM_TEMPLATE_END(IPAddrBlocks)
-IMPLEMENT_ASN1_FUNCTIONS(IPAddressRange)
+ IMPLEMENT_ASN1_FUNCTIONS(IPAddressRange)
IMPLEMENT_ASN1_FUNCTIONS(IPAddressOrRange)
IMPLEMENT_ASN1_FUNCTIONS(IPAddressChoice)
IMPLEMENT_ASN1_FUNCTIONS(IPAddressFamily)
@@ -66,7 +65,7 @@ IMPLEMENT_ASN1_FUNCTIONS(IPAddressFamily)
/*
* How much buffer space do we need for a raw address?
*/
-# define ADDR_RAW_BUF_LEN 16
+#define ADDR_RAW_BUF_LEN 16
/*
* What's the address length associated with this AFI?
@@ -89,9 +88,9 @@ static int length_from_afi(const unsigned afi)
unsigned int X509v3_addr_get_afi(const IPAddressFamily *f)
{
if (f == NULL
- || f->addressFamily == NULL
- || f->addressFamily->data == NULL
- || f->addressFamily->length < 2)
+ || f->addressFamily == NULL
+ || f->addressFamily->data == NULL
+ || f->addressFamily->length < 2)
return 0;
return (f->addressFamily->data[0] << 8) | f->addressFamily->data[1];
}
@@ -101,8 +100,8 @@ unsigned int X509v3_addr_get_afi(const IPAddressFamily *f)
* At the moment this is coded for simplicity, not speed.
*/
static int addr_expand(unsigned char *addr,
- const ASN1_BIT_STRING *bs,
- const int length, const unsigned char fill)
+ const ASN1_BIT_STRING *bs,
+ const int length, const unsigned char fill)
{
if (bs->length < 0 || bs->length > length)
return 0;
@@ -124,14 +123,14 @@ static int addr_expand(unsigned char *addr,
/*
* Extract the prefix length from a bitstring.
*/
-# define addr_prefixlen(bs) ((int)((bs)->length * 8 - ((bs)->flags & 7)))
+#define addr_prefixlen(bs) ((int)((bs)->length * 8 - ((bs)->flags & 7)))
/*
* i2r handler for one address bitstring.
*/
static int i2r_address(BIO *out,
- const unsigned afi,
- const unsigned char fill, const ASN1_BIT_STRING *bs)
+ const unsigned afi,
+ const unsigned char fill, const ASN1_BIT_STRING *bs)
{
unsigned char addr[ADDR_RAW_BUF_LEN];
int i, n;
@@ -148,10 +147,11 @@ static int i2r_address(BIO *out,
if (!addr_expand(addr, bs, 16, fill))
return 0;
for (n = 16; n > 1 && addr[n - 1] == 0x00 && addr[n - 2] == 0x00;
- n -= 2) ;
+ n -= 2)
+ ;
for (i = 0; i < n; i += 2)
BIO_printf(out, "%x%s", (addr[i] << 8) | addr[i + 1],
- (i < 14 ? ":" : ""));
+ (i < 14 ? ":" : ""));
if (i < 16)
BIO_puts(out, ":");
if (i == 0)
@@ -170,9 +170,9 @@ static int i2r_address(BIO *out,
* i2r handler for a sequence of addresses and ranges.
*/
static int i2r_IPAddressOrRanges(BIO *out,
- const int indent,
- const IPAddressOrRanges *aors,
- const unsigned afi)
+ const int indent,
+ const IPAddressOrRanges *aors,
+ const unsigned afi)
{
int i;
@@ -203,7 +203,7 @@ static int i2r_IPAddressOrRanges(BIO *out,
* i2r handler for an IPAddrBlocks extension.
*/
static int i2r_IPAddrBlocks(const X509V3_EXT_METHOD *method,
- void *ext, BIO *out, int indent)
+ void *ext, BIO *out, int indent)
{
const IPAddrBlocks *addr = ext;
int i;
@@ -251,7 +251,7 @@ static int i2r_IPAddrBlocks(const X509V3_EXT_METHOD *method,
break;
default:
BIO_printf(out, " (Unknown SAFI %u)",
- (unsigned)f->addressFamily->data[2]);
+ (unsigned)f->addressFamily->data[2]);
break;
}
}
@@ -262,9 +262,8 @@ static int i2r_IPAddrBlocks(const X509V3_EXT_METHOD *method,
case IPAddressChoice_addressesOrRanges:
BIO_puts(out, ":\n");
if (!i2r_IPAddressOrRanges(out,
- indent + 2,
- f->ipAddressChoice->
- u.addressesOrRanges, afi))
+ indent + 2,
+ f->ipAddressChoice->u.addressesOrRanges, afi))
return 0;
break;
}
@@ -283,7 +282,7 @@ static int i2r_IPAddrBlocks(const X509V3_EXT_METHOD *method,
* for garbage input, tough noogies.
*/
static int IPAddressOrRange_cmp(const IPAddressOrRange *a,
- const IPAddressOrRange *b, const int length)
+ const IPAddressOrRange *b, const int length)
{
unsigned char addr_a[ADDR_RAW_BUF_LEN], addr_b[ADDR_RAW_BUF_LEN];
int prefixlen_a = 0, prefixlen_b = 0;
@@ -330,7 +329,7 @@ static int IPAddressOrRange_cmp(const IPAddressOrRange *a,
* comparison routines are only allowed two arguments.
*/
static int v4IPAddressOrRange_cmp(const IPAddressOrRange *const *a,
- const IPAddressOrRange *const *b)
+ const IPAddressOrRange *const *b)
{
return IPAddressOrRange_cmp(*a, *b, 4);
}
@@ -340,7 +339,7 @@ static int v4IPAddressOrRange_cmp(const IPAddressOrRange *const *a,
* comparison routines are only allowed two arguments.
*/
static int v6IPAddressOrRange_cmp(const IPAddressOrRange *const *a,
- const IPAddressOrRange *const *b)
+ const IPAddressOrRange *const *b)
{
return IPAddressOrRange_cmp(*a, *b, 16);
}
@@ -350,7 +349,7 @@ static int v6IPAddressOrRange_cmp(const IPAddressOrRange *const *a,
* See last paragraph of RFC 3779 2.2.3.7.
*/
static int range_should_be_prefix(const unsigned char *min,
- const unsigned char *max, const int length)
+ const unsigned char *max, const int length)
{
unsigned char mask;
int i, j;
@@ -362,8 +361,10 @@ static int range_should_be_prefix(const unsigned char *min,
*/
assert(memcmp(min, max, length) <= 0);
- for (i = 0; i < length && min[i] == max[i]; i++) ;
- for (j = length - 1; j >= 0 && min[j] == 0x00 && max[j] == 0xFF; j--) ;
+ for (i = 0; i < length && min[i] == max[i]; i++)
+ ;
+ for (j = length - 1; j >= 0 && min[j] == 0x00 && max[j] == 0xFF; j--)
+ ;
if (i < j)
return -1;
if (i > j)
@@ -404,7 +405,7 @@ static int range_should_be_prefix(const unsigned char *min,
* Construct a prefix.
*/
static int make_addressPrefix(IPAddressOrRange **result, unsigned char *addr,
- const int prefixlen, const int afilen)
+ const int prefixlen, const int afilen)
{
int bytelen = (prefixlen + 7) / 8, bitlen = prefixlen % 8;
IPAddressOrRange *aor;
@@ -414,8 +415,7 @@ static int make_addressPrefix(IPAddressOrRange **result, unsigned char *addr,
if ((aor = IPAddressOrRange_new()) == NULL)
return 0;
aor->type = IPAddressOrRange_addressPrefix;
- if (aor->u.addressPrefix == NULL &&
- (aor->u.addressPrefix = ASN1_BIT_STRING_new()) == NULL)
+ if (aor->u.addressPrefix == NULL && (aor->u.addressPrefix = ASN1_BIT_STRING_new()) == NULL)
goto err;
if (!ASN1_BIT_STRING_set(aor->u.addressPrefix, addr, bytelen))
goto err;
@@ -426,7 +426,7 @@ static int make_addressPrefix(IPAddressOrRange **result, unsigned char *addr,
*result = aor;
return 1;
- err:
+err:
IPAddressOrRange_free(aor);
return 0;
}
@@ -437,8 +437,8 @@ static int make_addressPrefix(IPAddressOrRange **result, unsigned char *addr,
* the rest of the code considerably.
*/
static int make_addressRange(IPAddressOrRange **result,
- unsigned char *min,
- unsigned char *max, const int length)
+ unsigned char *min,
+ unsigned char *max, const int length)
{
IPAddressOrRange *aor;
int i, prefixlen;
@@ -454,14 +454,13 @@ static int make_addressRange(IPAddressOrRange **result,
aor->type = IPAddressOrRange_addressRange;
if ((aor->u.addressRange = IPAddressRange_new()) == NULL)
goto err;
- if (aor->u.addressRange->min == NULL &&
- (aor->u.addressRange->min = ASN1_BIT_STRING_new()) == NULL)
+ if (aor->u.addressRange->min == NULL && (aor->u.addressRange->min = ASN1_BIT_STRING_new()) == NULL)
goto err;
- if (aor->u.addressRange->max == NULL &&
- (aor->u.addressRange->max = ASN1_BIT_STRING_new()) == NULL)
+ if (aor->u.addressRange->max == NULL && (aor->u.addressRange->max = ASN1_BIT_STRING_new()) == NULL)
goto err;
- for (i = length; i > 0 && min[i - 1] == 0x00; --i) ;
+ for (i = length; i > 0 && min[i - 1] == 0x00; --i)
+ ;
if (!ASN1_BIT_STRING_set(aor->u.addressRange->min, min, i))
goto err;
ossl_asn1_string_set_bits_left(aor->u.addressRange->min, 0);
@@ -474,7 +473,8 @@ static int make_addressRange(IPAddressOrRange **result,
aor->u.addressRange->min->flags |= 8 - j;
}
- for (i = length; i > 0 && max[i - 1] == 0xFF; --i) ;
+ for (i = length; i > 0 && max[i - 1] == 0xFF; --i)
+ ;
if (!ASN1_BIT_STRING_set(aor->u.addressRange->max, max, i))
goto err;
ossl_asn1_string_set_bits_left(aor->u.addressRange->max, 0);
@@ -490,7 +490,7 @@ static int make_addressRange(IPAddressOrRange **result,
*result = aor;
return 1;
- err:
+err:
IPAddressOrRange_free(aor);
return 0;
}
@@ -499,8 +499,8 @@ static int make_addressRange(IPAddressOrRange **result,
* Construct a new address family or find an existing one.
*/
static IPAddressFamily *make_IPAddressFamily(IPAddrBlocks *addr,
- const unsigned afi,
- const unsigned *safi)
+ const unsigned afi,
+ const unsigned *safi)
{
IPAddressFamily *f;
unsigned char key[3];
@@ -518,18 +518,15 @@ static IPAddressFamily *make_IPAddressFamily(IPAddrBlocks *addr,
for (i = 0; i < sk_IPAddressFamily_num(addr); i++) {
f = sk_IPAddressFamily_value(addr, i);
- if (f->addressFamily->length == keylen &&
- !memcmp(f->addressFamily->data, key, keylen))
+ if (f->addressFamily->length == keylen && !memcmp(f->addressFamily->data, key, keylen))
return f;
}
if ((f = IPAddressFamily_new()) == NULL)
goto err;
- if (f->ipAddressChoice == NULL &&
- (f->ipAddressChoice = IPAddressChoice_new()) == NULL)
+ if (f->ipAddressChoice == NULL && (f->ipAddressChoice = IPAddressChoice_new()) == NULL)
goto err;
- if (f->addressFamily == NULL &&
- (f->addressFamily = ASN1_OCTET_STRING_new()) == NULL)
+ if (f->addressFamily == NULL && (f->addressFamily = ASN1_OCTET_STRING_new()) == NULL)
goto err;
if (!ASN1_OCTET_STRING_set(f->addressFamily, key, keylen))
goto err;
@@ -538,7 +535,7 @@ static IPAddressFamily *make_IPAddressFamily(IPAddrBlocks *addr,
return f;
- err:
+err:
IPAddressFamily_free(f);
return NULL;
}
@@ -547,20 +544,15 @@ static IPAddressFamily *make_IPAddressFamily(IPAddrBlocks *addr,
* Add an inheritance element.
*/
int X509v3_addr_add_inherit(IPAddrBlocks *addr,
- const unsigned afi, const unsigned *safi)
+ const unsigned afi, const unsigned *safi)
{
IPAddressFamily *f = make_IPAddressFamily(addr, afi, safi);
- if (f == NULL ||
- f->ipAddressChoice == NULL ||
- (f->ipAddressChoice->type == IPAddressChoice_addressesOrRanges &&
- f->ipAddressChoice->u.addressesOrRanges != NULL))
+ if (f == NULL || f->ipAddressChoice == NULL || (f->ipAddressChoice->type == IPAddressChoice_addressesOrRanges && f->ipAddressChoice->u.addressesOrRanges != NULL))
return 0;
- if (f->ipAddressChoice->type == IPAddressChoice_inherit &&
- f->ipAddressChoice->u.inherit != NULL)
+ if (f->ipAddressChoice->type == IPAddressChoice_inherit && f->ipAddressChoice->u.inherit != NULL)
return 1;
- if (f->ipAddressChoice->u.inherit == NULL &&
- (f->ipAddressChoice->u.inherit = ASN1_NULL_new()) == NULL)
+ if (f->ipAddressChoice->u.inherit == NULL && (f->ipAddressChoice->u.inherit = ASN1_NULL_new()) == NULL)
return 0;
f->ipAddressChoice->type = IPAddressChoice_inherit;
return 1;
@@ -570,16 +562,13 @@ int X509v3_addr_add_inherit(IPAddrBlocks *addr,
* Construct an IPAddressOrRange sequence, or return an existing one.
*/
static IPAddressOrRanges *make_prefix_or_range(IPAddrBlocks *addr,
- const unsigned afi,
- const unsigned *safi)
+ const unsigned afi,
+ const unsigned *safi)
{
IPAddressFamily *f = make_IPAddressFamily(addr, afi, safi);
IPAddressOrRanges *aors = NULL;
- if (f == NULL ||
- f->ipAddressChoice == NULL ||
- (f->ipAddressChoice->type == IPAddressChoice_inherit &&
- f->ipAddressChoice->u.inherit != NULL))
+ if (f == NULL || f->ipAddressChoice == NULL || (f->ipAddressChoice->type == IPAddressChoice_inherit && f->ipAddressChoice->u.inherit != NULL))
return NULL;
if (f->ipAddressChoice->type == IPAddressChoice_addressesOrRanges)
aors = f->ipAddressChoice->u.addressesOrRanges;
@@ -604,15 +593,15 @@ static IPAddressOrRanges *make_prefix_or_range(IPAddrBlocks *addr,
* Add a prefix.
*/
int X509v3_addr_add_prefix(IPAddrBlocks *addr,
- const unsigned afi,
- const unsigned *safi,
- unsigned char *a, const int prefixlen)
+ const unsigned afi,
+ const unsigned *safi,
+ unsigned char *a, const int prefixlen)
{
IPAddressOrRanges *aors = make_prefix_or_range(addr, afi, safi);
IPAddressOrRange *aor;
if (aors == NULL
- || !make_addressPrefix(&aor, a, prefixlen, length_from_afi(afi)))
+ || !make_addressPrefix(&aor, a, prefixlen, length_from_afi(afi)))
return 0;
if (sk_IPAddressOrRange_push(aors, aor))
return 1;
@@ -624,9 +613,9 @@ int X509v3_addr_add_prefix(IPAddrBlocks *addr,
* Add a range.
*/
int X509v3_addr_add_range(IPAddrBlocks *addr,
- const unsigned afi,
- const unsigned *safi,
- unsigned char *min, unsigned char *max)
+ const unsigned afi,
+ const unsigned *safi,
+ unsigned char *min, unsigned char *max)
{
IPAddressOrRanges *aors = make_prefix_or_range(addr, afi, safi);
IPAddressOrRange *aor;
@@ -646,17 +635,15 @@ int X509v3_addr_add_range(IPAddrBlocks *addr,
* Extract min and max values from an IPAddressOrRange.
*/
static int extract_min_max(IPAddressOrRange *aor,
- unsigned char *min, unsigned char *max, int length)
+ unsigned char *min, unsigned char *max, int length)
{
if (aor == NULL || min == NULL || max == NULL)
return 0;
switch (aor->type) {
case IPAddressOrRange_addressPrefix:
- return (addr_expand(min, aor->u.addressPrefix, length, 0x00) &&
- addr_expand(max, aor->u.addressPrefix, length, 0xFF));
+ return (addr_expand(min, aor->u.addressPrefix, length, 0x00) && addr_expand(max, aor->u.addressPrefix, length, 0xFF));
case IPAddressOrRange_addressRange:
- return (addr_expand(min, aor->u.addressRange->min, length, 0x00) &&
- addr_expand(max, aor->u.addressRange->max, length, 0xFF));
+ return (addr_expand(min, aor->u.addressRange->min, length, 0x00) && addr_expand(max, aor->u.addressRange->max, length, 0xFF));
}
return 0;
}
@@ -665,17 +652,13 @@ static int extract_min_max(IPAddressOrRange *aor,
* Public wrapper for extract_min_max().
*/
int X509v3_addr_get_range(IPAddressOrRange *aor,
- const unsigned afi,
- unsigned char *min,
- unsigned char *max, const int length)
+ const unsigned afi,
+ unsigned char *min,
+ unsigned char *max, const int length)
{
int afi_length = length_from_afi(afi);
- if (aor == NULL || min == NULL || max == NULL ||
- afi_length == 0 || length < afi_length ||
- (aor->type != IPAddressOrRange_addressPrefix &&
- aor->type != IPAddressOrRange_addressRange) ||
- !extract_min_max(aor, min, max, afi_length))
+ if (aor == NULL || min == NULL || max == NULL || afi_length == 0 || length < afi_length || (aor->type != IPAddressOrRange_addressPrefix && aor->type != IPAddressOrRange_addressRange) || !extract_min_max(aor, min, max, afi_length))
return 0;
return afi_length;
@@ -692,7 +675,7 @@ int X509v3_addr_get_range(IPAddressOrRange *aor,
* would have expected and is what the following code implements.
*/
static int IPAddressFamily_cmp(const IPAddressFamily *const *a_,
- const IPAddressFamily *const *b_)
+ const IPAddressFamily *const *b_)
{
const ASN1_OCTET_STRING *a = (*a_)->addressFamily;
const ASN1_OCTET_STRING *b = (*b_)->addressFamily;
@@ -775,31 +758,28 @@ int X509v3_addr_is_canonical(IPAddrBlocks *addr)
IPAddressOrRange *a = sk_IPAddressOrRange_value(aors, j);
IPAddressOrRange *b = sk_IPAddressOrRange_value(aors, j + 1);
- if (!extract_min_max(a, a_min, a_max, length) ||
- !extract_min_max(b, b_min, b_max, length))
+ if (!extract_min_max(a, a_min, a_max, length) || !extract_min_max(b, b_min, b_max, length))
return 0;
/*
* Punt misordered list, overlapping start, or inverted range.
*/
- if (memcmp(a_min, b_min, length) >= 0 ||
- memcmp(a_min, a_max, length) > 0 ||
- memcmp(b_min, b_max, length) > 0)
+ if (memcmp(a_min, b_min, length) >= 0 || memcmp(a_min, a_max, length) > 0 || memcmp(b_min, b_max, length) > 0)
return 0;
/*
* Punt if adjacent or overlapping. Check for adjacency by
* subtracting one from b_min first.
*/
- for (k = length - 1; k >= 0 && b_min[k]-- == 0x00; k--) ;
+ for (k = length - 1; k >= 0 && b_min[k]-- == 0x00; k--)
+ ;
if (memcmp(a_max, b_min, length) >= 0)
return 0;
/*
* Check for range that should be expressed as a prefix.
*/
- if (a->type == IPAddressOrRange_addressRange &&
- range_should_be_prefix(a_min, a_max, length) >= 0)
+ if (a->type == IPAddressOrRange_addressRange && range_should_be_prefix(a_min, a_max, length) >= 0)
return 0;
}
@@ -814,8 +794,7 @@ int X509v3_addr_is_canonical(IPAddrBlocks *addr)
if (a != NULL && a->type == IPAddressOrRange_addressRange) {
if (!extract_min_max(a, a_min, a_max, length))
return 0;
- if (memcmp(a_min, a_max, length) > 0 ||
- range_should_be_prefix(a_min, a_max, length) >= 0)
+ if (memcmp(a_min, a_max, length) > 0 || range_should_be_prefix(a_min, a_max, length) >= 0)
return 0;
}
}
@@ -831,7 +810,7 @@ int X509v3_addr_is_canonical(IPAddrBlocks *addr)
* Whack an IPAddressOrRanges into canonical form.
*/
static int IPAddressOrRanges_canonize(IPAddressOrRanges *aors,
- const unsigned afi)
+ const unsigned afi)
{
int i, j, length = length_from_afi(afi);
@@ -849,15 +828,13 @@ static int IPAddressOrRanges_canonize(IPAddressOrRanges *aors,
unsigned char a_min[ADDR_RAW_BUF_LEN], a_max[ADDR_RAW_BUF_LEN];
unsigned char b_min[ADDR_RAW_BUF_LEN], b_max[ADDR_RAW_BUF_LEN];
- if (!extract_min_max(a, a_min, a_max, length) ||
- !extract_min_max(b, b_min, b_max, length))
+ if (!extract_min_max(a, a_min, a_max, length) || !extract_min_max(b, b_min, b_max, length))
return 0;
/*
* Punt inverted ranges.
*/
- if (memcmp(a_min, a_max, length) > 0 ||
- memcmp(b_min, b_max, length) > 0)
+ if (memcmp(a_min, a_max, length) > 0 || memcmp(b_min, b_max, length) > 0)
return 0;
/*
@@ -870,7 +847,8 @@ static int IPAddressOrRanges_canonize(IPAddressOrRanges *aors,
* Merge if a and b are adjacent. We check for
* adjacency by subtracting one from b_min first.
*/
- for (j = length - 1; j >= 0 && b_min[j]-- == 0x00; j--) ;
+ for (j = length - 1; j >= 0 && b_min[j]-- == 0x00; j--)
+ ;
if (memcmp(a_max, b_min, length) == 0) {
IPAddressOrRange *merged;
@@ -923,10 +901,7 @@ int X509v3_addr_canonize(IPAddrBlocks *addr)
if (!IPAddressFamily_check_len(f))
return 0;
- if (f->ipAddressChoice->type == IPAddressChoice_addressesOrRanges &&
- !IPAddressOrRanges_canonize(f->ipAddressChoice->
- u.addressesOrRanges,
- X509v3_addr_get_afi(f)))
+ if (f->ipAddressChoice->type == IPAddressChoice_addressesOrRanges && !IPAddressOrRanges_canonize(f->ipAddressChoice->u.addressesOrRanges, X509v3_addr_get_afi(f)))
return 0;
}
(void)sk_IPAddressFamily_set_cmp_func(addr, IPAddressFamily_cmp);
@@ -940,8 +915,8 @@ int X509v3_addr_canonize(IPAddrBlocks *addr)
* v2i handler for the IPAddrBlocks extension.
*/
static void *v2i_IPAddrBlocks(const struct v3_ext_method *method,
- struct v3_ext_ctx *ctx,
- STACK_OF(CONF_VALUE) *values)
+ struct v3_ext_ctx *ctx,
+ STACK_OF(CONF_VALUE) *values)
{
static const char v4addr_chars[] = "0123456789.";
static const char v6addr_chars[] = "0123456789.:abcdefABCDEF";
@@ -973,7 +948,7 @@ static void *v2i_IPAddrBlocks(const struct v3_ext_method *method,
safi = &safi_;
} else {
ERR_raise_data(ERR_LIB_X509V3, X509V3_R_EXTENSION_NAME_ERROR,
- "%s", val->name);
+ "%s", val->name);
goto err;
}
@@ -1042,9 +1017,9 @@ static void *v2i_IPAddrBlocks(const struct v3_ext_method *method,
case '/':
prefixlen = (int)strtoul(s + i2, &t, 10);
if (t == s + i2
- || *t != '\0'
- || prefixlen > (length * 8)
- || prefixlen < 0) {
+ || *t != '\0'
+ || prefixlen > (length * 8)
+ || prefixlen < 0) {
ERR_raise(ERR_LIB_X509V3, X509V3_R_EXTENSION_VALUE_ERROR);
X509V3_conf_add_error_name_value(val);
goto err;
@@ -1100,7 +1075,7 @@ static void *v2i_IPAddrBlocks(const struct v3_ext_method *method,
goto err;
return addr;
- err:
+err:
OPENSSL_free(s);
sk_IPAddressFamily_pop_free(addr, IPAddressFamily_free);
return NULL;
@@ -1110,17 +1085,17 @@ static void *v2i_IPAddrBlocks(const struct v3_ext_method *method,
* OpenSSL dispatch
*/
const X509V3_EXT_METHOD ossl_v3_addr = {
- NID_sbgp_ipAddrBlock, /* nid */
- 0, /* flags */
+ NID_sbgp_ipAddrBlock, /* nid */
+ 0, /* flags */
ASN1_ITEM_ref(IPAddrBlocks), /* template */
- 0, 0, 0, 0, /* old functions, ignored */
- 0, /* i2s */
- 0, /* s2i */
- 0, /* i2v */
- v2i_IPAddrBlocks, /* v2i */
- i2r_IPAddrBlocks, /* i2r */
- 0, /* r2i */
- NULL /* extension-specific data */
+ 0, 0, 0, 0, /* old functions, ignored */
+ 0, /* i2s */
+ 0, /* s2i */
+ 0, /* i2v */
+ v2i_IPAddrBlocks, /* v2i */
+ i2r_IPAddrBlocks, /* i2r */
+ 0, /* r2i */
+ NULL /* extension-specific data */
};
/*
@@ -1145,7 +1120,7 @@ int X509v3_addr_inherits(IPAddrBlocks *addr)
* Figure out whether parent contains child.
*/
static int addr_contains(IPAddressOrRanges *parent,
- IPAddressOrRanges *child, int length)
+ IPAddressOrRanges *child, int length)
{
unsigned char p_min[ADDR_RAW_BUF_LEN], p_max[ADDR_RAW_BUF_LEN];
unsigned char c_min[ADDR_RAW_BUF_LEN], c_max[ADDR_RAW_BUF_LEN];
@@ -1159,13 +1134,13 @@ static int addr_contains(IPAddressOrRanges *parent,
p = 0;
for (c = 0; c < sk_IPAddressOrRange_num(child); c++) {
if (!extract_min_max(sk_IPAddressOrRange_value(child, c),
- c_min, c_max, length))
+ c_min, c_max, length))
return 0;
for (;; p++) {
if (p >= sk_IPAddressOrRange_num(parent))
return 0;
if (!extract_min_max(sk_IPAddressOrRange_value(parent, p),
- p_min, p_max, length))
+ p_min, p_max, length))
return 0;
if (memcmp(p_max, c_max, length) < 0)
continue;
@@ -1202,8 +1177,8 @@ int X509v3_addr_subset(IPAddrBlocks *a, IPAddrBlocks *b)
if (!IPAddressFamily_check_len(fa) || !IPAddressFamily_check_len(fb))
return 0;
if (!addr_contains(fb->ipAddressChoice->u.addressesOrRanges,
- fa->ipAddressChoice->u.addressesOrRanges,
- length_from_afi(X509v3_addr_get_afi(fb))))
+ fa->ipAddressChoice->u.addressesOrRanges,
+ length_from_afi(X509v3_addr_get_afi(fb))))
return 0;
}
return 1;
@@ -1212,18 +1187,18 @@ int X509v3_addr_subset(IPAddrBlocks *a, IPAddrBlocks *b)
/*
* Validation error handling via callback.
*/
-# define validation_err(_err_) \
- do { \
- if (ctx != NULL) { \
- ctx->error = _err_; \
- ctx->error_depth = i; \
- ctx->current_cert = x; \
- rv = ctx->verify_cb(0, ctx); \
- } else { \
- rv = 0; \
- } \
- if (rv == 0) \
- goto done; \
+#define validation_err(_err_) \
+ do { \
+ if (ctx != NULL) { \
+ ctx->error = _err_; \
+ ctx->error_depth = i; \
+ ctx->current_cert = x; \
+ rv = ctx->verify_cb(0, ctx); \
+ } else { \
+ rv = 0; \
+ } \
+ if (rv == 0) \
+ goto done; \
} while (0)
/*
@@ -1235,16 +1210,16 @@ int X509v3_addr_subset(IPAddrBlocks *a, IPAddrBlocks *b)
* X509_V_OK.
*/
static int addr_validate_path_internal(X509_STORE_CTX *ctx,
- STACK_OF(X509) *chain,
- IPAddrBlocks *ext)
+ STACK_OF(X509) *chain,
+ IPAddrBlocks *ext)
{
IPAddrBlocks *child = NULL;
int i, j, ret = 0, rv;
X509 *x;
if (!ossl_assert(chain != NULL && sk_X509_num(chain) > 0)
- || !ossl_assert(ctx != NULL || ext != NULL)
- || !ossl_assert(ctx == NULL || ctx->verify_cb != NULL)) {
+ || !ossl_assert(ctx != NULL || ext != NULL)
+ || !ossl_assert(ctx == NULL || ctx->verify_cb != NULL)) {
if (ctx != NULL)
ctx->error = X509_V_ERR_UNSPECIFIED;
return 0;
@@ -1298,17 +1273,15 @@ static int addr_validate_path_internal(X509_STORE_CTX *ctx,
continue;
}
(void)sk_IPAddressFamily_set_cmp_func(x->rfc3779_addr,
- IPAddressFamily_cmp);
+ IPAddressFamily_cmp);
sk_IPAddressFamily_sort(x->rfc3779_addr);
for (j = 0; j < sk_IPAddressFamily_num(child); j++) {
IPAddressFamily *fc = sk_IPAddressFamily_value(child, j);
int k = sk_IPAddressFamily_find(x->rfc3779_addr, fc);
- IPAddressFamily *fp =
- sk_IPAddressFamily_value(x->rfc3779_addr, k);
+ IPAddressFamily *fp = sk_IPAddressFamily_value(x->rfc3779_addr, k);
if (fp == NULL) {
- if (fc->ipAddressChoice->type ==
- IPAddressChoice_addressesOrRanges) {
+ if (fc->ipAddressChoice->type == IPAddressChoice_addressesOrRanges) {
validation_err(X509_V_ERR_UNNESTED_RESOURCE);
break;
}
@@ -1318,12 +1291,11 @@ static int addr_validate_path_internal(X509_STORE_CTX *ctx,
if (!IPAddressFamily_check_len(fc) || !IPAddressFamily_check_len(fp))
goto done;
- if (fp->ipAddressChoice->type ==
- IPAddressChoice_addressesOrRanges) {
+ if (fp->ipAddressChoice->type == IPAddressChoice_addressesOrRanges) {
if (fc->ipAddressChoice->type == IPAddressChoice_inherit
|| addr_contains(fp->ipAddressChoice->u.addressesOrRanges,
- fc->ipAddressChoice->u.addressesOrRanges,
- length_from_afi(X509v3_addr_get_afi(fc))))
+ fc->ipAddressChoice->u.addressesOrRanges,
+ length_from_afi(X509v3_addr_get_afi(fc))))
(void)sk_IPAddressFamily_set(child, j, fp);
else
validation_err(X509_V_ERR_UNNESTED_RESOURCE);
@@ -1347,12 +1319,12 @@ static int addr_validate_path_internal(X509_STORE_CTX *ctx,
}
}
ret = 1;
- done:
+done:
sk_IPAddressFamily_free(child);
return ret;
}
-# undef validation_err
+#undef validation_err
/*
* RFC 3779 2.3 path validation -- called from X509_verify_cert().
@@ -1360,8 +1332,8 @@ static int addr_validate_path_internal(X509_STORE_CTX *ctx,
int X509v3_addr_validate_path(X509_STORE_CTX *ctx)
{
if (ctx->chain == NULL
- || sk_X509_num(ctx->chain) == 0
- || ctx->verify_cb == NULL) {
+ || sk_X509_num(ctx->chain) == 0
+ || ctx->verify_cb == NULL) {
ctx->error = X509_V_ERR_UNSPECIFIED;
return 0;
}
@@ -1373,7 +1345,7 @@ int X509v3_addr_validate_path(X509_STORE_CTX *ctx)
* Test whether chain covers extension.
*/
int X509v3_addr_validate_resource_set(STACK_OF(X509) *chain,
- IPAddrBlocks *ext, int allow_inheritance)
+ IPAddrBlocks *ext, int allow_inheritance)
{
if (ext == NULL)
return 1;
diff --git a/crypto/x509/v3_admis.c b/crypto/x509/v3_admis.c
index 8f9e95c44a..607d408376 100644
--- a/crypto/x509/v3_admis.c
+++ b/crypto/x509/v3_admis.c
@@ -51,26 +51,26 @@ IMPLEMENT_ASN1_FUNCTIONS(ADMISSIONS)
IMPLEMENT_ASN1_FUNCTIONS(ADMISSION_SYNTAX)
static int i2r_ADMISSION_SYNTAX(const struct v3_ext_method *method, void *in,
- BIO *bp, int ind);
+ BIO *bp, int ind);
const X509V3_EXT_METHOD ossl_v3_ext_admission = {
- NID_x509ExtAdmission, /* .ext_nid = */
- 0, /* .ext_flags = */
+ NID_x509ExtAdmission, /* .ext_nid = */
+ 0, /* .ext_flags = */
ASN1_ITEM_ref(ADMISSION_SYNTAX), /* .it = */
NULL, NULL, NULL, NULL,
- NULL, /* .i2s = */
- NULL, /* .s2i = */
- NULL, /* .i2v = */
- NULL, /* .v2i = */
- &i2r_ADMISSION_SYNTAX, /* .i2r = */
- NULL, /* .r2i = */
- NULL /* extension-specific data */
+ NULL, /* .i2s = */
+ NULL, /* .s2i = */
+ NULL, /* .i2v = */
+ NULL, /* .v2i = */
+ &i2r_ADMISSION_SYNTAX, /* .i2r = */
+ NULL, /* .r2i = */
+ NULL /* extension-specific data */
};
static int i2r_NAMING_AUTHORITY(const struct v3_ext_method *method, void *in,
- BIO *bp, int ind)
+ BIO *bp, int ind)
{
- NAMING_AUTHORITY *namingAuthority = (NAMING_AUTHORITY *) in;
+ NAMING_AUTHORITY *namingAuthority = (NAMING_AUTHORITY *)in;
if (namingAuthority == NULL)
return 0;
@@ -93,7 +93,8 @@ static int i2r_NAMING_AUTHORITY(const struct v3_ext_method *method, void *in,
OBJ_obj2txt(objbuf, sizeof(objbuf), namingAuthority->namingAuthorityId, 1);
if (BIO_printf(bp, "%s%s%s%s\n", ln ? ln : "",
- ln ? " (" : "", objbuf, ln ? ")" : "") <= 0)
+ ln ? " (" : "", objbuf, ln ? ")" : "")
+ <= 0)
goto err;
}
if (namingAuthority->namingAuthorityText != NULL) {
@@ -115,7 +116,7 @@ err:
}
static int i2r_ADMISSION_SYNTAX(const struct v3_ext_method *method, void *in,
- BIO *bp, int ind)
+ BIO *bp, int ind)
{
ADMISSION_SYNTAX *admission = (ADMISSION_SYNTAX *)in;
int i, j, k;
@@ -189,8 +190,9 @@ static int i2r_ADMISSION_SYNTAX(const struct v3_ext_method *method, void *in,
OBJ_obj2txt(objbuf, sizeof(objbuf), obj, 1);
if (BIO_printf(bp, "%*s %s%s%s%s\n", ind, "",
- ln ? ln : "", ln ? " (" : "",
- objbuf, ln ? ")" : "") <= 0)
+ ln ? ln : "", ln ? " (" : "",
+ objbuf, ln ? ")" : "")
+ <= 0)
goto err;
}
}
@@ -241,7 +243,7 @@ const GENERAL_NAME *ADMISSION_SYNTAX_get0_admissionAuthority(const ADMISSION_SYN
}
void ADMISSION_SYNTAX_set0_admissionAuthority(ADMISSION_SYNTAX *as,
- GENERAL_NAME *aa)
+ GENERAL_NAME *aa)
{
GENERAL_NAME_free(as->admissionAuthority);
as->admissionAuthority = aa;
@@ -253,7 +255,7 @@ const STACK_OF(ADMISSIONS) *ADMISSION_SYNTAX_get0_contentsOfAdmissions(const ADM
}
void ADMISSION_SYNTAX_set0_contentsOfAdmissions(ADMISSION_SYNTAX *as,
- STACK_OF(ADMISSIONS) *a)
+ STACK_OF(ADMISSIONS) *a)
{
sk_ADMISSIONS_pop_free(as->contentsOfAdmissions, ADMISSIONS_free);
as->contentsOfAdmissions = a;
@@ -298,7 +300,7 @@ const ASN1_OCTET_STRING *PROFESSION_INFO_get0_addProfessionInfo(const PROFESSION
}
void PROFESSION_INFO_set0_addProfessionInfo(PROFESSION_INFO *pi,
- ASN1_OCTET_STRING *aos)
+ ASN1_OCTET_STRING *aos)
{
ASN1_OCTET_STRING_free(pi->addProfessionInfo);
pi->addProfessionInfo = aos;
@@ -310,7 +312,7 @@ const NAMING_AUTHORITY *PROFESSION_INFO_get0_namingAuthority(const PROFESSION_IN
}
void PROFESSION_INFO_set0_namingAuthority(PROFESSION_INFO *pi,
- NAMING_AUTHORITY *na)
+ NAMING_AUTHORITY *na)
{
NAMING_AUTHORITY_free(pi->namingAuthority);
pi->namingAuthority = na;
@@ -322,7 +324,7 @@ const STACK_OF(ASN1_STRING) *PROFESSION_INFO_get0_professionItems(const PROFESSI
}
void PROFESSION_INFO_set0_professionItems(PROFESSION_INFO *pi,
- STACK_OF(ASN1_STRING) *as)
+ STACK_OF(ASN1_STRING) *as)
{
sk_ASN1_STRING_pop_free(pi->professionItems, ASN1_STRING_free);
pi->professionItems = as;
@@ -334,7 +336,7 @@ const STACK_OF(ASN1_OBJECT) *PROFESSION_INFO_get0_professionOIDs(const PROFESSIO
}
void PROFESSION_INFO_set0_professionOIDs(PROFESSION_INFO *pi,
- STACK_OF(ASN1_OBJECT) *po)
+ STACK_OF(ASN1_OBJECT) *po)
{
sk_ASN1_OBJECT_pop_free(pi->professionOIDs, ASN1_OBJECT_free);
pi->professionOIDs = po;
@@ -346,7 +348,7 @@ const ASN1_PRINTABLESTRING *PROFESSION_INFO_get0_registrationNumber(const PROFES
}
void PROFESSION_INFO_set0_registrationNumber(PROFESSION_INFO *pi,
- ASN1_PRINTABLESTRING *rn)
+ ASN1_PRINTABLESTRING *rn)
{
ASN1_PRINTABLESTRING_free(pi->registrationNumber);
pi->registrationNumber = rn;
diff --git a/crypto/x509/v3_admis.h b/crypto/x509/v3_admis.h
index 1e82c0f4a3..75a07c1fcd 100644
--- a/crypto/x509/v3_admis.h
+++ b/crypto/x509/v3_admis.h
@@ -8,31 +8,31 @@
*/
#ifndef OSSL_CRYPTO_X509_V3_ADMIS_H
-# define OSSL_CRYPTO_X509_V3_ADMIS_H
+#define OSSL_CRYPTO_X509_V3_ADMIS_H
struct NamingAuthority_st {
- ASN1_OBJECT* namingAuthorityId;
- ASN1_IA5STRING* namingAuthorityUrl;
- ASN1_STRING* namingAuthorityText; /* i.e. DIRECTORYSTRING */
+ ASN1_OBJECT *namingAuthorityId;
+ ASN1_IA5STRING *namingAuthorityUrl;
+ ASN1_STRING *namingAuthorityText; /* i.e. DIRECTORYSTRING */
};
struct ProfessionInfo_st {
- NAMING_AUTHORITY* namingAuthority;
- STACK_OF(ASN1_STRING)* professionItems; /* i.e. DIRECTORYSTRING */
- STACK_OF(ASN1_OBJECT)* professionOIDs;
- ASN1_PRINTABLESTRING* registrationNumber;
- ASN1_OCTET_STRING* addProfessionInfo;
+ NAMING_AUTHORITY *namingAuthority;
+ STACK_OF(ASN1_STRING) *professionItems; /* i.e. DIRECTORYSTRING */
+ STACK_OF(ASN1_OBJECT) *professionOIDs;
+ ASN1_PRINTABLESTRING *registrationNumber;
+ ASN1_OCTET_STRING *addProfessionInfo;
};
struct Admissions_st {
- GENERAL_NAME* admissionAuthority;
- NAMING_AUTHORITY* namingAuthority;
- STACK_OF(PROFESSION_INFO)* professionInfos;
+ GENERAL_NAME *admissionAuthority;
+ NAMING_AUTHORITY *namingAuthority;
+ STACK_OF(PROFESSION_INFO) *professionInfos;
};
struct AdmissionSyntax_st {
- GENERAL_NAME* admissionAuthority;
- STACK_OF(ADMISSIONS)* contentsOfAdmissions;
+ GENERAL_NAME *admissionAuthority;
+ STACK_OF(ADMISSIONS) *contentsOfAdmissions;
};
#endif
diff --git a/crypto/x509/v3_akeya.c b/crypto/x509/v3_akeya.c
index aae8c21e73..0d5691a117 100644
--- a/crypto/x509/v3_akeya.c
+++ b/crypto/x509/v3_akeya.c
@@ -15,9 +15,9 @@
#include <openssl/x509v3.h>
ASN1_SEQUENCE(AUTHORITY_KEYID) = {
- ASN1_IMP_OPT(AUTHORITY_KEYID, keyid, ASN1_OCTET_STRING, 0),
- ASN1_IMP_SEQUENCE_OF_OPT(AUTHORITY_KEYID, issuer, GENERAL_NAME, 1),
- ASN1_IMP_OPT(AUTHORITY_KEYID, serial, ASN1_INTEGER, 2)
+ ASN1_IMP_OPT(AUTHORITY_KEYID, keyid, ASN1_OCTET_STRING, 0),
+ ASN1_IMP_SEQUENCE_OF_OPT(AUTHORITY_KEYID, issuer, GENERAL_NAME, 1),
+ ASN1_IMP_OPT(AUTHORITY_KEYID, serial, ASN1_INTEGER, 2)
} ASN1_SEQUENCE_END(AUTHORITY_KEYID)
IMPLEMENT_ASN1_FUNCTIONS(AUTHORITY_KEYID)
diff --git a/crypto/x509/v3_akid.c b/crypto/x509/v3_akid.c
index de93dae70e..08c751b77c 100644
--- a/crypto/x509/v3_akid.c
+++ b/crypto/x509/v3_akid.c
@@ -17,28 +17,28 @@
#include "ext_dat.h"
static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
- AUTHORITY_KEYID *akeyid,
- STACK_OF(CONF_VALUE)
- *extlist);
+ AUTHORITY_KEYID *akeyid,
+ STACK_OF(CONF_VALUE)
+ *extlist);
static AUTHORITY_KEYID *v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx,
- STACK_OF(CONF_VALUE) *values);
+ X509V3_CTX *ctx,
+ STACK_OF(CONF_VALUE) *values);
const X509V3_EXT_METHOD ossl_v3_akey_id = {
NID_authority_key_identifier,
X509V3_EXT_MULTILINE, ASN1_ITEM_ref(AUTHORITY_KEYID),
0, 0, 0, 0,
0, 0,
- (X509V3_EXT_I2V) i2v_AUTHORITY_KEYID,
+ (X509V3_EXT_I2V)i2v_AUTHORITY_KEYID,
(X509V3_EXT_V2I)v2i_AUTHORITY_KEYID,
0, 0,
NULL
};
static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
- AUTHORITY_KEYID *akeyid,
- STACK_OF(CONF_VALUE)
- *extlist)
+ AUTHORITY_KEYID *akeyid,
+ STACK_OF(CONF_VALUE)
+ *extlist)
{
char *tmp = NULL;
STACK_OF(CONF_VALUE) *origextlist = extlist, *tmpextlist;
@@ -50,7 +50,7 @@ static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
return NULL;
}
if (!X509V3_add_value((akeyid->issuer || akeyid->serial) ? "keyid" : NULL,
- tmp, &extlist)) {
+ tmp, &extlist)) {
OPENSSL_free(tmp);
ERR_raise(ERR_LIB_X509V3, ERR_R_X509_LIB);
goto err;
@@ -78,7 +78,7 @@ static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
OPENSSL_free(tmp);
}
return extlist;
- err:
+err:
if (origextlist == NULL)
sk_CONF_VALUE_pop_free(extlist, X509V3_conf_free);
return NULL;
@@ -94,8 +94,8 @@ static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
* this is always included.
*/
static AUTHORITY_KEYID *v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx,
- STACK_OF(CONF_VALUE) *values)
+ X509V3_CTX *ctx,
+ STACK_OF(CONF_VALUE) *values)
{
char keyid = 0, issuer = 0;
int i, n = sk_CONF_VALUE_num(values);
@@ -121,7 +121,7 @@ static AUTHORITY_KEYID *v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
cnf = sk_CONF_VALUE_value(values, i);
if (cnf->value != NULL && strcmp(cnf->value, "always") != 0) {
ERR_raise_data(ERR_LIB_X509V3, X509V3_R_UNKNOWN_OPTION,
- "name=%s option=%s", cnf->name, cnf->value);
+ "name=%s option=%s", cnf->name, cnf->value);
goto err;
}
if (strcmp(cnf->name, "keyid") == 0 && keyid == 0) {
@@ -133,14 +133,14 @@ static AUTHORITY_KEYID *v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
if (cnf->value != NULL)
issuer = 2;
} else if (strcmp(cnf->name, "none") == 0
- || strcmp(cnf->name, "keyid") == 0
- || strcmp(cnf->name, "issuer") == 0) {
+ || strcmp(cnf->name, "keyid") == 0
+ || strcmp(cnf->name, "issuer") == 0) {
ERR_raise_data(ERR_LIB_X509V3, X509V3_R_BAD_VALUE,
- "name=%s", cnf->name);
+ "name=%s", cnf->name);
goto err;
} else {
ERR_raise_data(ERR_LIB_X509V3, X509V3_R_UNKNOWN_VALUE,
- "name=%s", cnf->name);
+ "name=%s", cnf->name);
goto err;
}
}
@@ -224,7 +224,7 @@ static AUTHORITY_KEYID *v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
return akeyid;
- err:
+err:
sk_GENERAL_NAME_free(gens);
GENERAL_NAME_free(gen);
X509_NAME_free(isname);
diff --git a/crypto/x509/v3_asid.c b/crypto/x509/v3_asid.c
index 720d8f8296..b6dedde738 100644
--- a/crypto/x509/v3_asid.c
+++ b/crypto/x509/v3_asid.c
@@ -32,23 +32,23 @@
*/
ASN1_SEQUENCE(ASRange) = {
- ASN1_SIMPLE(ASRange, min, ASN1_INTEGER),
- ASN1_SIMPLE(ASRange, max, ASN1_INTEGER)
+ ASN1_SIMPLE(ASRange, min, ASN1_INTEGER),
+ ASN1_SIMPLE(ASRange, max, ASN1_INTEGER)
} ASN1_SEQUENCE_END(ASRange)
ASN1_CHOICE(ASIdOrRange) = {
- ASN1_SIMPLE(ASIdOrRange, u.id, ASN1_INTEGER),
- ASN1_SIMPLE(ASIdOrRange, u.range, ASRange)
+ ASN1_SIMPLE(ASIdOrRange, u.id, ASN1_INTEGER),
+ ASN1_SIMPLE(ASIdOrRange, u.range, ASRange)
} ASN1_CHOICE_END(ASIdOrRange)
ASN1_CHOICE(ASIdentifierChoice) = {
- ASN1_SIMPLE(ASIdentifierChoice, u.inherit, ASN1_NULL),
- ASN1_SEQUENCE_OF(ASIdentifierChoice, u.asIdsOrRanges, ASIdOrRange)
+ ASN1_SIMPLE(ASIdentifierChoice, u.inherit, ASN1_NULL),
+ ASN1_SEQUENCE_OF(ASIdentifierChoice, u.asIdsOrRanges, ASIdOrRange)
} ASN1_CHOICE_END(ASIdentifierChoice)
ASN1_SEQUENCE(ASIdentifiers) = {
- ASN1_EXP_OPT(ASIdentifiers, asnum, ASIdentifierChoice, 0),
- ASN1_EXP_OPT(ASIdentifiers, rdi, ASIdentifierChoice, 1)
+ ASN1_EXP_OPT(ASIdentifiers, asnum, ASIdentifierChoice, 0),
+ ASN1_EXP_OPT(ASIdentifiers, rdi, ASIdentifierChoice, 1)
} ASN1_SEQUENCE_END(ASIdentifiers)
IMPLEMENT_ASN1_FUNCTIONS(ASRange)
@@ -60,8 +60,8 @@ IMPLEMENT_ASN1_FUNCTIONS(ASIdentifiers)
* i2r method for an ASIdentifierChoice.
*/
static int i2r_ASIdentifierChoice(BIO *out,
- ASIdentifierChoice *choice,
- int indent, const char *msg)
+ ASIdentifierChoice *choice,
+ int indent, const char *msg)
{
int i;
char *s;
@@ -74,8 +74,7 @@ static int i2r_ASIdentifierChoice(BIO *out,
break;
case ASIdentifierChoice_asIdsOrRanges:
for (i = 0; i < sk_ASIdOrRange_num(choice->u.asIdsOrRanges); i++) {
- ASIdOrRange *aor =
- sk_ASIdOrRange_value(choice->u.asIdsOrRanges, i);
+ ASIdOrRange *aor = sk_ASIdOrRange_value(choice->u.asIdsOrRanges, i);
switch (aor->type) {
case ASIdOrRange_id:
if ((s = i2s_ASN1_INTEGER(NULL, aor->u.id)) == NULL)
@@ -108,38 +107,33 @@ static int i2r_ASIdentifierChoice(BIO *out,
* i2r method for an ASIdentifier extension.
*/
static int i2r_ASIdentifiers(const X509V3_EXT_METHOD *method,
- void *ext, BIO *out, int indent)
+ void *ext, BIO *out, int indent)
{
ASIdentifiers *asid = ext;
return (i2r_ASIdentifierChoice(out, asid->asnum, indent,
- "Autonomous System Numbers") &&
- i2r_ASIdentifierChoice(out, asid->rdi, indent,
- "Routing Domain Identifiers"));
+ "Autonomous System Numbers")
+ && i2r_ASIdentifierChoice(out, asid->rdi, indent,
+ "Routing Domain Identifiers"));
}
/*
* Sort comparison function for a sequence of ASIdOrRange elements.
*/
static int ASIdOrRange_cmp(const ASIdOrRange *const *a_,
- const ASIdOrRange *const *b_)
+ const ASIdOrRange *const *b_)
{
const ASIdOrRange *a = *a_, *b = *b_;
- assert((a->type == ASIdOrRange_id && a->u.id != NULL) ||
- (a->type == ASIdOrRange_range && a->u.range != NULL &&
- a->u.range->min != NULL && a->u.range->max != NULL));
+ assert((a->type == ASIdOrRange_id && a->u.id != NULL) || (a->type == ASIdOrRange_range && a->u.range != NULL && a->u.range->min != NULL && a->u.range->max != NULL));
- assert((b->type == ASIdOrRange_id && b->u.id != NULL) ||
- (b->type == ASIdOrRange_range && b->u.range != NULL &&
- b->u.range->min != NULL && b->u.range->max != NULL));
+ assert((b->type == ASIdOrRange_id && b->u.id != NULL) || (b->type == ASIdOrRange_range && b->u.range != NULL && b->u.range->min != NULL && b->u.range->max != NULL));
if (a->type == ASIdOrRange_id && b->type == ASIdOrRange_id)
return ASN1_INTEGER_cmp(a->u.id, b->u.id);
if (a->type == ASIdOrRange_range && b->type == ASIdOrRange_range) {
int r = ASN1_INTEGER_cmp(a->u.range->min, b->u.range->min);
- return r != 0 ? r : ASN1_INTEGER_cmp(a->u.range->max,
- b->u.range->max);
+ return r != 0 ? r : ASN1_INTEGER_cmp(a->u.range->max, b->u.range->max);
}
if (a->type == ASIdOrRange_id)
@@ -183,7 +177,7 @@ int X509v3_asid_add_inherit(ASIdentifiers *asid, int which)
* Add an ID or range to an ASIdentifierChoice.
*/
int X509v3_asid_add_id_or_range(ASIdentifiers *asid,
- int which, ASN1_INTEGER *min, ASN1_INTEGER *max)
+ int which, ASN1_INTEGER *min, ASN1_INTEGER *max)
{
ASIdentifierChoice **choice;
ASIdOrRange *aor;
@@ -233,7 +227,7 @@ int X509v3_asid_add_id_or_range(ASIdentifiers *asid,
goto err;
return 1;
- err:
+err:
ASIdOrRange_free(aor);
return 0;
}
@@ -242,7 +236,7 @@ int X509v3_asid_add_id_or_range(ASIdentifiers *asid,
* Extract min and max values from an ASIdOrRange.
*/
static int extract_min_max(ASIdOrRange *aor,
- ASN1_INTEGER **min, ASN1_INTEGER **max)
+ ASN1_INTEGER **min, ASN1_INTEGER **max)
{
if (!ossl_assert(aor != NULL))
return 0;
@@ -279,8 +273,7 @@ static int ASIdentifierChoice_is_canonical(ASIdentifierChoice *choice)
/*
* If not a list, or if empty list, it's broken.
*/
- if (choice->type != ASIdentifierChoice_asIdsOrRanges ||
- sk_ASIdOrRange_num(choice->u.asIdsOrRanges) == 0)
+ if (choice->type != ASIdentifierChoice_asIdsOrRanges || sk_ASIdOrRange_num(choice->u.asIdsOrRanges) == 0)
return 0;
/*
@@ -289,33 +282,27 @@ static int ASIdentifierChoice_is_canonical(ASIdentifierChoice *choice)
for (i = 0; i < sk_ASIdOrRange_num(choice->u.asIdsOrRanges) - 1; i++) {
ASIdOrRange *a = sk_ASIdOrRange_value(choice->u.asIdsOrRanges, i);
ASIdOrRange *b = sk_ASIdOrRange_value(choice->u.asIdsOrRanges, i + 1);
- ASN1_INTEGER *a_min = NULL, *a_max = NULL, *b_min = NULL, *b_max =
- NULL;
+ ASN1_INTEGER *a_min = NULL, *a_max = NULL, *b_min = NULL, *b_max = NULL;
if (!extract_min_max(a, &a_min, &a_max)
- || !extract_min_max(b, &b_min, &b_max))
+ || !extract_min_max(b, &b_min, &b_max))
goto done;
/*
* Punt misordered list, overlapping start, or inverted range.
*/
- if (ASN1_INTEGER_cmp(a_min, b_min) >= 0 ||
- ASN1_INTEGER_cmp(a_min, a_max) > 0 ||
- ASN1_INTEGER_cmp(b_min, b_max) > 0)
+ if (ASN1_INTEGER_cmp(a_min, b_min) >= 0 || ASN1_INTEGER_cmp(a_min, a_max) > 0 || ASN1_INTEGER_cmp(b_min, b_max) > 0)
goto done;
/*
* Calculate a_max + 1 to check for adjacency.
*/
- if ((bn == NULL && (bn = BN_new()) == NULL) ||
- ASN1_INTEGER_to_BN(a_max, bn) == NULL ||
- !BN_add_word(bn, 1)) {
+ if ((bn == NULL && (bn = BN_new()) == NULL) || ASN1_INTEGER_to_BN(a_max, bn) == NULL || !BN_add_word(bn, 1)) {
ERR_raise(ERR_LIB_X509V3, ERR_R_BN_LIB);
goto done;
}
- if ((a_max_plus_one =
- BN_to_ASN1_INTEGER(bn, orig = a_max_plus_one)) == NULL) {
+ if ((a_max_plus_one = BN_to_ASN1_INTEGER(bn, orig = a_max_plus_one)) == NULL) {
a_max_plus_one = orig;
ERR_raise(ERR_LIB_X509V3, ERR_R_ASN1_LIB);
goto done;
@@ -337,14 +324,14 @@ static int ASIdentifierChoice_is_canonical(ASIdentifierChoice *choice)
ASN1_INTEGER *a_min, *a_max;
if (a != NULL && a->type == ASIdOrRange_range) {
if (!extract_min_max(a, &a_min, &a_max)
- || ASN1_INTEGER_cmp(a_min, a_max) > 0)
+ || ASN1_INTEGER_cmp(a_min, a_max) > 0)
goto done;
}
}
ret = 1;
- done:
+done:
ASN1_INTEGER_free(a_max_plus_one);
BN_free(bn);
return ret;
@@ -355,9 +342,7 @@ static int ASIdentifierChoice_is_canonical(ASIdentifierChoice *choice)
*/
int X509v3_asid_is_canonical(ASIdentifiers *asid)
{
- return (asid == NULL ||
- (ASIdentifierChoice_is_canonical(asid->asnum) &&
- ASIdentifierChoice_is_canonical(asid->rdi)));
+ return (asid == NULL || (ASIdentifierChoice_is_canonical(asid->asnum) && ASIdentifierChoice_is_canonical(asid->rdi)));
}
/*
@@ -379,8 +364,7 @@ static int ASIdentifierChoice_canonize(ASIdentifierChoice *choice)
/*
* If not a list, or if empty list, it's broken.
*/
- if (choice->type != ASIdentifierChoice_asIdsOrRanges ||
- sk_ASIdOrRange_num(choice->u.asIdsOrRanges) == 0) {
+ if (choice->type != ASIdentifierChoice_asIdsOrRanges || sk_ASIdOrRange_num(choice->u.asIdsOrRanges) == 0) {
ERR_raise(ERR_LIB_X509V3, X509V3_R_EXTENSION_VALUE_ERROR);
return 0;
}
@@ -397,11 +381,10 @@ static int ASIdentifierChoice_canonize(ASIdentifierChoice *choice)
for (i = 0; i < sk_ASIdOrRange_num(choice->u.asIdsOrRanges) - 1; i++) {
ASIdOrRange *a = sk_ASIdOrRange_value(choice->u.asIdsOrRanges, i);
ASIdOrRange *b = sk_ASIdOrRange_value(choice->u.asIdsOrRanges, i + 1);
- ASN1_INTEGER *a_min = NULL, *a_max = NULL, *b_min = NULL, *b_max =
- NULL;
+ ASN1_INTEGER *a_min = NULL, *a_max = NULL, *b_min = NULL, *b_max = NULL;
if (!extract_min_max(a, &a_min, &a_max)
- || !extract_min_max(b, &b_min, &b_max))
+ || !extract_min_max(b, &b_min, &b_max))
goto done;
/*
@@ -413,8 +396,7 @@ static int ASIdentifierChoice_canonize(ASIdentifierChoice *choice)
/*
* Punt inverted ranges.
*/
- if (ASN1_INTEGER_cmp(a_min, a_max) > 0 ||
- ASN1_INTEGER_cmp(b_min, b_max) > 0)
+ if (ASN1_INTEGER_cmp(a_min, a_max) > 0 || ASN1_INTEGER_cmp(b_min, b_max) > 0)
goto done;
/*
@@ -428,15 +410,12 @@ static int ASIdentifierChoice_canonize(ASIdentifierChoice *choice)
/*
* Calculate a_max + 1 to check for adjacency.
*/
- if ((bn == NULL && (bn = BN_new()) == NULL) ||
- ASN1_INTEGER_to_BN(a_max, bn) == NULL ||
- !BN_add_word(bn, 1)) {
+ if ((bn == NULL && (bn = BN_new()) == NULL) || ASN1_INTEGER_to_BN(a_max, bn) == NULL || !BN_add_word(bn, 1)) {
ERR_raise(ERR_LIB_X509V3, ERR_R_BN_LIB);
goto done;
}
- if ((a_max_plus_one =
- BN_to_ASN1_INTEGER(bn, orig = a_max_plus_one)) == NULL) {
+ if ((a_max_plus_one = BN_to_ASN1_INTEGER(bn, orig = a_max_plus_one)) == NULL) {
a_max_plus_one = orig;
ERR_raise(ERR_LIB_X509V3, ERR_R_ASN1_LIB);
goto done;
@@ -485,7 +464,7 @@ static int ASIdentifierChoice_canonize(ASIdentifierChoice *choice)
ASN1_INTEGER *a_min, *a_max;
if (a != NULL && a->type == ASIdOrRange_range) {
if (!extract_min_max(a, &a_min, &a_max)
- || ASN1_INTEGER_cmp(a_min, a_max) > 0)
+ || ASN1_INTEGER_cmp(a_min, a_max) > 0)
goto done;
}
}
@@ -496,7 +475,7 @@ static int ASIdentifierChoice_canonize(ASIdentifierChoice *choice)
ret = 1;
- done:
+done:
ASN1_INTEGER_free(a_max_plus_one);
BN_free(bn);
return ret;
@@ -507,17 +486,15 @@ static int ASIdentifierChoice_canonize(ASIdentifierChoice *choice)
*/
int X509v3_asid_canonize(ASIdentifiers *asid)
{
- return (asid == NULL ||
- (ASIdentifierChoice_canonize(asid->asnum) &&
- ASIdentifierChoice_canonize(asid->rdi)));
+ return (asid == NULL || (ASIdentifierChoice_canonize(asid->asnum) && ASIdentifierChoice_canonize(asid->rdi)));
}
/*
* v2i method for an ASIdentifier extension.
*/
static void *v2i_ASIdentifiers(const struct v3_ext_method *method,
- struct v3_ext_ctx *ctx,
- STACK_OF(CONF_VALUE) *values)
+ struct v3_ext_ctx *ctx,
+ STACK_OF(CONF_VALUE) *values)
{
ASN1_INTEGER *min = NULL, *max = NULL;
ASIdentifiers *asid = NULL;
@@ -624,7 +601,7 @@ static void *v2i_ASIdentifiers(const struct v3_ext_method *method,
goto err;
return asid;
- err:
+err:
ASIdentifiers_free(asid);
ASN1_INTEGER_free(min);
ASN1_INTEGER_free(max);
@@ -635,17 +612,17 @@ static void *v2i_ASIdentifiers(const struct v3_ext_method *method,
* OpenSSL dispatch.
*/
const X509V3_EXT_METHOD ossl_v3_asid = {
- NID_sbgp_autonomousSysNum, /* nid */
- 0, /* flags */
+ NID_sbgp_autonomousSysNum, /* nid */
+ 0, /* flags */
ASN1_ITEM_ref(ASIdentifiers), /* template */
- 0, 0, 0, 0, /* old functions, ignored */
- 0, /* i2s */
- 0, /* s2i */
- 0, /* i2v */
- v2i_ASIdentifiers, /* v2i */
- i2r_ASIdentifiers, /* i2r */
- 0, /* r2i */
- NULL /* extension-specific data */
+ 0, 0, 0, 0, /* old functions, ignored */
+ 0, /* i2s */
+ 0, /* s2i */
+ 0, /* i2v */
+ v2i_ASIdentifiers, /* v2i */
+ i2r_ASIdentifiers, /* i2r */
+ 0, /* r2i */
+ NULL /* extension-specific data */
};
/*
@@ -653,11 +630,7 @@ const X509V3_EXT_METHOD ossl_v3_asid = {
*/
int X509v3_asid_inherits(ASIdentifiers *asid)
{
- return (asid != NULL &&
- ((asid->asnum != NULL &&
- asid->asnum->type == ASIdentifierChoice_inherit) ||
- (asid->rdi != NULL &&
- asid->rdi->type == ASIdentifierChoice_inherit)));
+ return (asid != NULL && ((asid->asnum != NULL && asid->asnum->type == ASIdentifierChoice_inherit) || (asid->rdi != NULL && asid->rdi->type == ASIdentifierChoice_inherit)));
}
/*
@@ -681,7 +654,7 @@ static int asid_contains(ASIdOrRanges *parent, ASIdOrRanges *child)
if (p >= sk_ASIdOrRange_num(parent))
return 0;
if (!extract_min_max(sk_ASIdOrRange_value(parent, p), &p_min,
- &p_max))
+ &p_max))
return 0;
if (ASN1_INTEGER_cmp(p_max, c_max) < 0)
continue;
@@ -711,55 +684,54 @@ int X509v3_asid_subset(ASIdentifiers *a, ASIdentifiers *b)
return 0;
subset = a->asnum == NULL
- || (b->asnum != NULL
- && asid_contains(b->asnum->u.asIdsOrRanges,
- a->asnum->u.asIdsOrRanges));
+ || (b->asnum != NULL
+ && asid_contains(b->asnum->u.asIdsOrRanges,
+ a->asnum->u.asIdsOrRanges));
if (!subset)
return 0;
return a->rdi == NULL
- || (b->rdi != NULL
- && asid_contains(b->rdi->u.asIdsOrRanges,
- a->rdi->u.asIdsOrRanges));
+ || (b->rdi != NULL
+ && asid_contains(b->rdi->u.asIdsOrRanges,
+ a->rdi->u.asIdsOrRanges));
}
/*
* Validation error handling via callback.
*/
-#define validation_err(_err_) \
- do { \
- if (ctx != NULL) { \
- ctx->error = _err_; \
- ctx->error_depth = i; \
- ctx->current_cert = x; \
- ret = ctx->verify_cb(0, ctx); \
- } else { \
- ret = 0; \
- } \
- if (!ret) \
- goto done; \
- } while (0)
+#define validation_err(_err_) \
+ do { \
+ if (ctx != NULL) { \
+ ctx->error = _err_; \
+ ctx->error_depth = i; \
+ ctx->current_cert = x; \
+ ret = ctx->verify_cb(0, ctx); \
+ } else { \
+ ret = 0; \
+ } \
+ if (!ret) \
+ goto done; \
+ } while (0)
/*
* Core code for RFC 3779 3.3 path validation.
*/
static int asid_validate_path_internal(X509_STORE_CTX *ctx,
- STACK_OF(X509) *chain,
- ASIdentifiers *ext)
+ STACK_OF(X509) *chain,
+ ASIdentifiers *ext)
{
ASIdOrRanges *child_as = NULL, *child_rdi = NULL;
int i, ret = 1, inherit_as = 0, inherit_rdi = 0;
X509 *x;
if (!ossl_assert(chain != NULL && sk_X509_num(chain) > 0)
- || !ossl_assert(ctx != NULL || ext != NULL)
- || !ossl_assert(ctx == NULL || ctx->verify_cb != NULL)) {
+ || !ossl_assert(ctx != NULL || ext != NULL)
+ || !ossl_assert(ctx == NULL || ctx->verify_cb != NULL)) {
if (ctx != NULL)
ctx->error = X509_V_ERR_UNSPECIFIED;
return 0;
}
-
/*
* Figure out where to start. If we don't have an extension to
* check, we're done. Otherwise, check canonical form and
@@ -820,12 +792,10 @@ static int asid_validate_path_internal(X509_STORE_CTX *ctx,
child_as = NULL;
inherit_as = 0;
}
- if (x->rfc3779_asid->asnum != NULL &&
- x->rfc3779_asid->asnum->type ==
- ASIdentifierChoice_asIdsOrRanges) {
+ if (x->rfc3779_asid->asnum != NULL && x->rfc3779_asid->asnum->type == ASIdentifierChoice_asIdsOrRanges) {
if (inherit_as
|| asid_contains(x->rfc3779_asid->asnum->u.asIdsOrRanges,
- child_as)) {
+ child_as)) {
child_as = x->rfc3779_asid->asnum->u.asIdsOrRanges;
inherit_as = 0;
} else {
@@ -837,11 +807,8 @@ static int asid_validate_path_internal(X509_STORE_CTX *ctx,
child_rdi = NULL;
inherit_rdi = 0;
}
- if (x->rfc3779_asid->rdi != NULL &&
- x->rfc3779_asid->rdi->type == ASIdentifierChoice_asIdsOrRanges) {
- if (inherit_rdi ||
- asid_contains(x->rfc3779_asid->rdi->u.asIdsOrRanges,
- child_rdi)) {
+ if (x->rfc3779_asid->rdi != NULL && x->rfc3779_asid->rdi->type == ASIdentifierChoice_asIdsOrRanges) {
+ if (inherit_rdi || asid_contains(x->rfc3779_asid->rdi->u.asIdsOrRanges, child_rdi)) {
child_rdi = x->rfc3779_asid->rdi->u.asIdsOrRanges;
inherit_rdi = 0;
} else {
@@ -859,15 +826,13 @@ static int asid_validate_path_internal(X509_STORE_CTX *ctx,
return 0;
}
if (x->rfc3779_asid != NULL) {
- if (x->rfc3779_asid->asnum != NULL &&
- x->rfc3779_asid->asnum->type == ASIdentifierChoice_inherit)
+ if (x->rfc3779_asid->asnum != NULL && x->rfc3779_asid->asnum->type == ASIdentifierChoice_inherit)
validation_err(X509_V_ERR_UNNESTED_RESOURCE);
- if (x->rfc3779_asid->rdi != NULL &&
- x->rfc3779_asid->rdi->type == ASIdentifierChoice_inherit)
+ if (x->rfc3779_asid->rdi != NULL && x->rfc3779_asid->rdi->type == ASIdentifierChoice_inherit)
validation_err(X509_V_ERR_UNNESTED_RESOURCE);
}
- done:
+done:
return ret;
}
@@ -879,8 +844,8 @@ static int asid_validate_path_internal(X509_STORE_CTX *ctx,
int X509v3_asid_validate_path(X509_STORE_CTX *ctx)
{
if (ctx->chain == NULL
- || sk_X509_num(ctx->chain) == 0
- || ctx->verify_cb == NULL) {
+ || sk_X509_num(ctx->chain) == 0
+ || ctx->verify_cb == NULL) {
ctx->error = X509_V_ERR_UNSPECIFIED;
return 0;
}
@@ -892,7 +857,7 @@ int X509v3_asid_validate_path(X509_STORE_CTX *ctx)
* Test whether chain covers extension.
*/
int X509v3_asid_validate_resource_set(STACK_OF(X509) *chain,
- ASIdentifiers *ext, int allow_inheritance)
+ ASIdentifiers *ext, int allow_inheritance)
{
if (ext == NULL)
return 1;
@@ -903,4 +868,4 @@ int X509v3_asid_validate_resource_set(STACK_OF(X509) *chain,
return asid_validate_path_internal(NULL, chain, ext);
}
-#endif /* OPENSSL_NO_RFC3779 */
+#endif /* OPENSSL_NO_RFC3779 */
diff --git a/crypto/x509/v3_attrdesc.c b/crypto/x509/v3_attrdesc.c
index 0745e9acdb..997241fac0 100644
--- a/crypto/x509/v3_attrdesc.c
+++ b/crypto/x509/v3_attrdesc.c
@@ -47,8 +47,8 @@ IMPLEMENT_ASN1_FUNCTIONS(OSSL_PRIVILEGE_POLICY_ID)
IMPLEMENT_ASN1_FUNCTIONS(OSSL_ATTRIBUTE_DESCRIPTOR)
static int i2r_HASH(X509V3_EXT_METHOD *method,
- OSSL_HASH *hash,
- BIO *out, int indent)
+ OSSL_HASH *hash,
+ BIO *out, int indent)
{
if (BIO_printf(out, "%*sAlgorithm: ", indent, "") <= 0)
return 0;
@@ -60,7 +60,8 @@ static int i2r_HASH(X509V3_EXT_METHOD *method,
if (BIO_printf(out, "%*sParameter: ", indent, "") <= 0)
return 0;
if (ossl_print_attribute_value(out, 0, hash->algorithmIdentifier->parameter,
- indent + 4) <= 0)
+ indent + 4)
+ <= 0)
return 0;
if (BIO_puts(out, "\n") <= 0)
return 0;
@@ -73,8 +74,8 @@ static int i2r_HASH(X509V3_EXT_METHOD *method,
}
static int i2r_INFO_SYNTAX_POINTER(X509V3_EXT_METHOD *method,
- OSSL_INFO_SYNTAX_POINTER *pointer,
- BIO *out, int indent)
+ OSSL_INFO_SYNTAX_POINTER *pointer,
+ BIO *out, int indent)
{
if (BIO_printf(out, "%*sNames:\n", indent, "") <= 0)
return 0;
@@ -92,8 +93,8 @@ static int i2r_INFO_SYNTAX_POINTER(X509V3_EXT_METHOD *method,
}
static int i2r_OSSL_INFO_SYNTAX(X509V3_EXT_METHOD *method,
- OSSL_INFO_SYNTAX *info,
- BIO *out, int indent)
+ OSSL_INFO_SYNTAX *info,
+ BIO *out, int indent)
{
switch (info->type) {
case OSSL_INFO_SYNTAX_TYPE_CONTENT:
@@ -115,8 +116,8 @@ static int i2r_OSSL_INFO_SYNTAX(X509V3_EXT_METHOD *method,
}
static int i2r_OSSL_PRIVILEGE_POLICY_ID(X509V3_EXT_METHOD *method,
- OSSL_PRIVILEGE_POLICY_ID *ppid,
- BIO *out, int indent)
+ OSSL_PRIVILEGE_POLICY_ID *ppid,
+ BIO *out, int indent)
{
char buf[80];
@@ -131,8 +132,8 @@ static int i2r_OSSL_PRIVILEGE_POLICY_ID(X509V3_EXT_METHOD *method,
}
static int i2r_OSSL_ATTRIBUTE_DESCRIPTOR(X509V3_EXT_METHOD *method,
- OSSL_ATTRIBUTE_DESCRIPTOR *ad,
- BIO *out, int indent)
+ OSSL_ATTRIBUTE_DESCRIPTOR *ad,
+ BIO *out, int indent)
{
char buf[80];
@@ -144,7 +145,8 @@ static int i2r_OSSL_ATTRIBUTE_DESCRIPTOR(X509V3_EXT_METHOD *method,
if (BIO_printf(out, "%*sSyntax:\n", indent, "") <= 0)
return 0;
if (BIO_printf(out, "%*s%.*s", indent + 4, "",
- ad->attributeSyntax->length, ad->attributeSyntax->data) <= 0)
+ ad->attributeSyntax->length, ad->attributeSyntax->data)
+ <= 0)
return 0;
if (BIO_puts(out, "\n\n") <= 0)
return 0;
@@ -154,7 +156,8 @@ static int i2r_OSSL_ATTRIBUTE_DESCRIPTOR(X509V3_EXT_METHOD *method,
}
if (ad->description != NULL) {
if (BIO_printf(out, "%*sDescription: %.*s\n", indent, "",
- ad->description->length, ad->description->data) <= 0)
+ ad->description->length, ad->description->data)
+ <= 0)
return 0;
}
if (BIO_printf(out, "%*sDomination Rule:\n", indent, "") <= 0)
diff --git a/crypto/x509/v3_attrmap.c b/crypto/x509/v3_attrmap.c
index a01e6556ea..614e3e26e9 100644
--- a/crypto/x509/v3_attrmap.c
+++ b/crypto/x509/v3_attrmap.c
@@ -29,13 +29,12 @@ ASN1_SEQUENCE(OSSL_ATTRIBUTE_VALUE_MAPPING) = {
ASN1_CHOICE(OSSL_ATTRIBUTE_MAPPING) = {
ASN1_IMP(OSSL_ATTRIBUTE_MAPPING, choice.typeMappings,
- OSSL_ATTRIBUTE_TYPE_MAPPING, OSSL_ATTR_MAP_TYPE),
+ OSSL_ATTRIBUTE_TYPE_MAPPING, OSSL_ATTR_MAP_TYPE),
ASN1_IMP(OSSL_ATTRIBUTE_MAPPING, choice.typeValueMappings,
- OSSL_ATTRIBUTE_VALUE_MAPPING, OSSL_ATTR_MAP_VALUE),
+ OSSL_ATTRIBUTE_VALUE_MAPPING, OSSL_ATTR_MAP_VALUE),
} ASN1_CHOICE_END(OSSL_ATTRIBUTE_MAPPING)
-ASN1_ITEM_TEMPLATE(OSSL_ATTRIBUTE_MAPPINGS) =
- ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SET_OF, 0, OSSL_ATTRIBUTE_MAPPINGS, OSSL_ATTRIBUTE_MAPPING)
+ASN1_ITEM_TEMPLATE(OSSL_ATTRIBUTE_MAPPINGS) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SET_OF, 0, OSSL_ATTRIBUTE_MAPPINGS, OSSL_ATTRIBUTE_MAPPING)
ASN1_ITEM_TEMPLATE_END(OSSL_ATTRIBUTE_MAPPINGS)
IMPLEMENT_ASN1_FUNCTIONS(OSSL_ATAV)
@@ -45,8 +44,8 @@ IMPLEMENT_ASN1_FUNCTIONS(OSSL_ATTRIBUTE_MAPPING)
IMPLEMENT_ASN1_FUNCTIONS(OSSL_ATTRIBUTE_MAPPINGS)
static int i2r_ATTRIBUTE_MAPPING(X509V3_EXT_METHOD *method,
- OSSL_ATTRIBUTE_MAPPING *am,
- BIO *out, int indent)
+ OSSL_ATTRIBUTE_MAPPING *am,
+ BIO *out, int indent)
{
ASN1_OBJECT *local_type, *remote_type;
int local_attr_nid, remote_attr_nid;
@@ -86,8 +85,8 @@ static int i2r_ATTRIBUTE_MAPPING(X509V3_EXT_METHOD *method,
}
static int i2r_ATTRIBUTE_MAPPINGS(X509V3_EXT_METHOD *method,
- OSSL_ATTRIBUTE_MAPPINGS *ams,
- BIO *out, int indent)
+ OSSL_ATTRIBUTE_MAPPINGS *ams,
+ BIO *out, int indent)
{
int i;
OSSL_ATTRIBUTE_MAPPING *am;
diff --git a/crypto/x509/v3_authattid.c b/crypto/x509/v3_authattid.c
index 65d9bb67ed..829593ed6c 100644
--- a/crypto/x509/v3_authattid.c
+++ b/crypto/x509/v3_authattid.c
@@ -16,15 +16,14 @@
DECLARE_ASN1_ITEM(OSSL_ISSUER_SERIAL)
-ASN1_ITEM_TEMPLATE(OSSL_AUTHORITY_ATTRIBUTE_ID_SYNTAX) =
- ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, OSSL_AUTHORITY_ATTRIBUTE_ID_SYNTAX, OSSL_ISSUER_SERIAL)
+ASN1_ITEM_TEMPLATE(OSSL_AUTHORITY_ATTRIBUTE_ID_SYNTAX) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, OSSL_AUTHORITY_ATTRIBUTE_ID_SYNTAX, OSSL_ISSUER_SERIAL)
ASN1_ITEM_TEMPLATE_END(OSSL_AUTHORITY_ATTRIBUTE_ID_SYNTAX)
IMPLEMENT_ASN1_FUNCTIONS(OSSL_AUTHORITY_ATTRIBUTE_ID_SYNTAX)
static int i2r_ISSUER_SERIAL(X509V3_EXT_METHOD *method,
- OSSL_ISSUER_SERIAL *iss,
- BIO *out, int indent)
+ OSSL_ISSUER_SERIAL *iss,
+ BIO *out, int indent)
{
if (iss->issuer != NULL) {
BIO_printf(out, "%*sIssuer Names:\n", indent, "");
@@ -49,8 +48,8 @@ static int i2r_ISSUER_SERIAL(X509V3_EXT_METHOD *method,
}
static int i2r_auth_attr_id(X509V3_EXT_METHOD *method,
- OSSL_AUTHORITY_ATTRIBUTE_ID_SYNTAX *aids,
- BIO *out, int indent)
+ OSSL_AUTHORITY_ATTRIBUTE_ID_SYNTAX *aids,
+ BIO *out, int indent)
{
int i;
OSSL_ISSUER_SERIAL *aid;
diff --git a/crypto/x509/v3_battcons.c b/crypto/x509/v3_battcons.c
index fd767fe7d7..3d03066402 100644
--- a/crypto/x509/v3_battcons.c
+++ b/crypto/x509/v3_battcons.c
@@ -18,7 +18,7 @@ static STACK_OF(CONF_VALUE) *i2v_OSSL_BASIC_ATTR_CONSTRAINTS(
X509V3_EXT_METHOD *method,
OSSL_BASIC_ATTR_CONSTRAINTS *battcons,
STACK_OF(CONF_VALUE)
- *extlist);
+ *extlist);
static OSSL_BASIC_ATTR_CONSTRAINTS *v2i_OSSL_BASIC_ATTR_CONSTRAINTS(
X509V3_EXT_METHOD *method,
X509V3_CTX *ctx,
@@ -29,7 +29,7 @@ const X509V3_EXT_METHOD ossl_v3_battcons = {
ASN1_ITEM_ref(OSSL_BASIC_ATTR_CONSTRAINTS),
0, 0, 0, 0,
0, 0,
- (X509V3_EXT_I2V) i2v_OSSL_BASIC_ATTR_CONSTRAINTS,
+ (X509V3_EXT_I2V)i2v_OSSL_BASIC_ATTR_CONSTRAINTS,
(X509V3_EXT_V2I)v2i_OSSL_BASIC_ATTR_CONSTRAINTS,
NULL, NULL,
NULL
@@ -80,7 +80,7 @@ static OSSL_BASIC_ATTR_CONSTRAINTS *v2i_OSSL_BASIC_ATTR_CONSTRAINTS(
}
}
return battcons;
- err:
+err:
OSSL_BASIC_ATTR_CONSTRAINTS_free(battcons);
return NULL;
}
diff --git a/crypto/x509/v3_bcons.c b/crypto/x509/v3_bcons.c
index 17962ed43f..b909966f02 100644
--- a/crypto/x509/v3_bcons.c
+++ b/crypto/x509/v3_bcons.c
@@ -17,35 +17,35 @@
#include "x509_local.h"
static STACK_OF(CONF_VALUE) *i2v_BASIC_CONSTRAINTS(X509V3_EXT_METHOD *method,
- BASIC_CONSTRAINTS *bcons,
- STACK_OF(CONF_VALUE)
- *extlist);
+ BASIC_CONSTRAINTS *bcons,
+ STACK_OF(CONF_VALUE)
+ *extlist);
static BASIC_CONSTRAINTS *v2i_BASIC_CONSTRAINTS(X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx,
- STACK_OF(CONF_VALUE) *values);
+ X509V3_CTX *ctx,
+ STACK_OF(CONF_VALUE) *values);
const X509V3_EXT_METHOD ossl_v3_bcons = {
NID_basic_constraints, 0,
ASN1_ITEM_ref(BASIC_CONSTRAINTS),
0, 0, 0, 0,
0, 0,
- (X509V3_EXT_I2V) i2v_BASIC_CONSTRAINTS,
+ (X509V3_EXT_I2V)i2v_BASIC_CONSTRAINTS,
(X509V3_EXT_V2I)v2i_BASIC_CONSTRAINTS,
NULL, NULL,
NULL
};
ASN1_SEQUENCE(BASIC_CONSTRAINTS) = {
- ASN1_OPT(BASIC_CONSTRAINTS, ca, ASN1_FBOOLEAN),
- ASN1_OPT(BASIC_CONSTRAINTS, pathlen, ASN1_INTEGER)
+ ASN1_OPT(BASIC_CONSTRAINTS, ca, ASN1_FBOOLEAN),
+ ASN1_OPT(BASIC_CONSTRAINTS, pathlen, ASN1_INTEGER)
} ASN1_SEQUENCE_END(BASIC_CONSTRAINTS)
IMPLEMENT_ASN1_FUNCTIONS(BASIC_CONSTRAINTS)
static STACK_OF(CONF_VALUE) *i2v_BASIC_CONSTRAINTS(X509V3_EXT_METHOD *method,
- BASIC_CONSTRAINTS *bcons,
- STACK_OF(CONF_VALUE)
- *extlist)
+ BASIC_CONSTRAINTS *bcons,
+ STACK_OF(CONF_VALUE)
+ *extlist)
{
X509V3_add_value_bool("CA", bcons->ca, &extlist);
X509V3_add_value_int("pathlen", bcons->pathlen, &extlist);
@@ -53,8 +53,8 @@ static STACK_OF(CONF_VALUE) *i2v_BASIC_CONSTRAINTS(X509V3_EXT_METHOD *method,
}
static BASIC_CONSTRAINTS *v2i_BASIC_CONSTRAINTS(X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx,
- STACK_OF(CONF_VALUE) *values)
+ X509V3_CTX *ctx,
+ STACK_OF(CONF_VALUE) *values)
{
BASIC_CONSTRAINTS *bcons = NULL;
CONF_VALUE *val;
@@ -79,7 +79,7 @@ static BASIC_CONSTRAINTS *v2i_BASIC_CONSTRAINTS(X509V3_EXT_METHOD *method,
}
}
return bcons;
- err:
+err:
BASIC_CONSTRAINTS_free(bcons);
return NULL;
}
diff --git a/crypto/x509/v3_bitst.c b/crypto/x509/v3_bitst.c
index 4f43b17755..89c3deddd3 100644
--- a/crypto/x509/v3_bitst.c
+++ b/crypto/x509/v3_bitst.c
@@ -14,39 +14,37 @@
#include "ext_dat.h"
static BIT_STRING_BITNAME ns_cert_type_table[] = {
- {0, "SSL Client", "client"},
- {1, "SSL Server", "server"},
- {2, "S/MIME", "email"},
- {3, "Object Signing", "objsign"},
- {4, "Unused", "reserved"},
- {5, "SSL CA", "sslCA"},
- {6, "S/MIME CA", "emailCA"},
- {7, "Object Signing CA", "objCA"},
- {-1, NULL, NULL}
+ { 0, "SSL Client", "client" },
+ { 1, "SSL Server", "server" },
+ { 2, "S/MIME", "email" },
+ { 3, "Object Signing", "objsign" },
+ { 4, "Unused", "reserved" },
+ { 5, "SSL CA", "sslCA" },
+ { 6, "S/MIME CA", "emailCA" },
+ { 7, "Object Signing CA", "objCA" },
+ { -1, NULL, NULL }
};
static BIT_STRING_BITNAME key_usage_type_table[] = {
- {0, "Digital Signature", "digitalSignature"},
- {1, "Non Repudiation", "nonRepudiation"},
- {1, "Content Commitment", "contentCommitment"},
- {2, "Key Encipherment", "keyEncipherment"},
- {3, "Data Encipherment", "dataEncipherment"},
- {4, "Key Agreement", "keyAgreement"},
- {5, "Certificate Sign", "keyCertSign"},
- {6, "CRL Sign", "cRLSign"},
- {7, "Encipher Only", "encipherOnly"},
- {8, "Decipher Only", "decipherOnly"},
- {-1, NULL, NULL}
+ { 0, "Digital Signature", "digitalSignature" },
+ { 1, "Non Repudiation", "nonRepudiation" },
+ { 1, "Content Commitment", "contentCommitment" },
+ { 2, "Key Encipherment", "keyEncipherment" },
+ { 3, "Data Encipherment", "dataEncipherment" },
+ { 4, "Key Agreement", "keyAgreement" },
+ { 5, "Certificate Sign", "keyCertSign" },
+ { 6, "CRL Sign", "cRLSign" },
+ { 7, "Encipher Only", "encipherOnly" },
+ { 8, "Decipher Only", "decipherOnly" },
+ { -1, NULL, NULL }
};
-const X509V3_EXT_METHOD ossl_v3_nscert =
-EXT_BITSTRING(NID_netscape_cert_type, ns_cert_type_table);
-const X509V3_EXT_METHOD ossl_v3_key_usage =
-EXT_BITSTRING(NID_key_usage, key_usage_type_table);
+const X509V3_EXT_METHOD ossl_v3_nscert = EXT_BITSTRING(NID_netscape_cert_type, ns_cert_type_table);
+const X509V3_EXT_METHOD ossl_v3_key_usage = EXT_BITSTRING(NID_key_usage, key_usage_type_table);
STACK_OF(CONF_VALUE) *i2v_ASN1_BIT_STRING(X509V3_EXT_METHOD *method,
- ASN1_BIT_STRING *bits,
- STACK_OF(CONF_VALUE) *ret)
+ ASN1_BIT_STRING *bits,
+ STACK_OF(CONF_VALUE) *ret)
{
BIT_STRING_BITNAME *bnam;
int last_seen_bit = -1;
@@ -67,8 +65,8 @@ STACK_OF(CONF_VALUE) *i2v_ASN1_BIT_STRING(X509V3_EXT_METHOD *method,
}
ASN1_BIT_STRING *v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx,
- STACK_OF(CONF_VALUE) *nval)
+ X509V3_CTX *ctx,
+ STACK_OF(CONF_VALUE) *nval)
{
CONF_VALUE *val;
ASN1_BIT_STRING *bs;
@@ -93,7 +91,7 @@ ASN1_BIT_STRING *v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method,
}
if (!bnam->lname) {
ERR_raise_data(ERR_LIB_X509V3, X509V3_R_UNKNOWN_BIT_STRING_ARGUMENT,
- "%s", val->name);
+ "%s", val->name);
ASN1_BIT_STRING_free(bs);
return NULL;
}
diff --git a/crypto/x509/v3_conf.c b/crypto/x509/v3_conf.c
index c575a43459..f9350d6381 100644
--- a/crypto/x509/v3_conf.c
+++ b/crypto/x509/v3_conf.c
@@ -20,20 +20,20 @@
static int v3_check_critical(const char **value);
static int v3_check_generic(const char **value);
static X509_EXTENSION *do_ext_nconf(CONF *conf, X509V3_CTX *ctx, int ext_nid,
- int crit, const char *value);
+ int crit, const char *value);
static X509_EXTENSION *v3_generic_extension(const char *ext, const char *value,
- int crit, int type,
- X509V3_CTX *ctx);
+ int crit, int type,
+ X509V3_CTX *ctx);
static char *conf_lhash_get_string(void *db, const char *section, const char *value);
static STACK_OF(CONF_VALUE) *conf_lhash_get_section(void *db, const char *section);
static X509_EXTENSION *do_ext_i2d(const X509V3_EXT_METHOD *method,
- int ext_nid, int crit, void *ext_struc);
+ int ext_nid, int crit, void *ext_struc);
static unsigned char *generic_asn1(const char *value, X509V3_CTX *ctx,
- long *ext_len);
+ long *ext_len);
static X509_EXTENSION *X509V3_EXT_nconf_int(CONF *conf, X509V3_CTX *ctx,
- const char *section,
- const char *name, const char *value)
+ const char *section,
+ const char *name, const char *value)
{
int crit;
int ext_type;
@@ -46,23 +46,23 @@ static X509_EXTENSION *X509V3_EXT_nconf_int(CONF *conf, X509V3_CTX *ctx,
if (!ret) {
if (section != NULL)
ERR_raise_data(ERR_LIB_X509V3, X509V3_R_ERROR_IN_EXTENSION,
- "section=%s, name=%s, value=%s",
- section, name, value);
+ "section=%s, name=%s, value=%s",
+ section, name, value);
else
ERR_raise_data(ERR_LIB_X509V3, X509V3_R_ERROR_IN_EXTENSION,
- "name=%s, value=%s", name, value);
+ "name=%s, value=%s", name, value);
}
return ret;
}
X509_EXTENSION *X509V3_EXT_nconf(CONF *conf, X509V3_CTX *ctx, const char *name,
- const char *value)
+ const char *value)
{
return X509V3_EXT_nconf_int(conf, ctx, NULL, name, value);
}
X509_EXTENSION *X509V3_EXT_nconf_nid(CONF *conf, X509V3_CTX *ctx, int ext_nid,
- const char *value)
+ const char *value)
{
int crit;
int ext_type;
@@ -70,14 +70,14 @@ X509_EXTENSION *X509V3_EXT_nconf_nid(CONF *conf, X509V3_CTX *ctx, int ext_nid,
crit = v3_check_critical(&value);
if ((ext_type = v3_check_generic(&value)))
return v3_generic_extension(OBJ_nid2sn(ext_nid),
- value, crit, ext_type, ctx);
+ value, crit, ext_type, ctx);
return do_ext_nconf(conf, ctx, ext_nid, crit, value);
}
/* CONF *conf: Config file */
/* char *value: Value */
static X509_EXTENSION *do_ext_nconf(CONF *conf, X509V3_CTX *ctx, int ext_nid,
- int crit, const char *value)
+ int crit, const char *value)
{
const X509V3_EXT_METHOD *method;
X509_EXTENSION *ext;
@@ -100,7 +100,7 @@ static X509_EXTENSION *do_ext_nconf(CONF *conf, X509V3_CTX *ctx, int ext_nid,
nval = X509V3_parse_list(value);
if (nval == NULL || sk_CONF_VALUE_num(nval) <= 0) {
ERR_raise_data(ERR_LIB_X509V3, X509V3_R_INVALID_EXTENSION_STRING,
- "name=%s,section=%s", OBJ_nid2sn(ext_nid), value);
+ "name=%s,section=%s", OBJ_nid2sn(ext_nid), value);
if (*value != '@')
sk_CONF_VALUE_pop_free(nval, X509V3_conf_free);
return NULL;
@@ -122,7 +122,7 @@ static X509_EXTENSION *do_ext_nconf(CONF *conf, X509V3_CTX *ctx, int ext_nid,
return NULL;
} else {
ERR_raise_data(ERR_LIB_X509V3, X509V3_R_EXTENSION_SETTING_NOT_SUPPORTED,
- "name=%s", OBJ_nid2sn(ext_nid));
+ "name=%s", OBJ_nid2sn(ext_nid));
return NULL;
}
@@ -132,11 +132,10 @@ static X509_EXTENSION *do_ext_nconf(CONF *conf, X509V3_CTX *ctx, int ext_nid,
else
method->ext_free(ext_struc);
return ext;
-
}
static X509_EXTENSION *do_ext_i2d(const X509V3_EXT_METHOD *method,
- int ext_nid, int crit, void *ext_struc)
+ int ext_nid, int crit, void *ext_struc)
{
unsigned char *ext_der = NULL;
int ext_len;
@@ -146,8 +145,7 @@ static X509_EXTENSION *do_ext_i2d(const X509V3_EXT_METHOD *method,
/* Convert internal representation to DER */
if (method->it) {
ext_der = NULL;
- ext_len =
- ASN1_item_i2d(ext_struc, &ext_der, ASN1_ITEM_ptr(method->it));
+ ext_len = ASN1_item_i2d(ext_struc, &ext_der, ASN1_ITEM_ptr(method->it));
if (ext_len < 0) {
ERR_raise(ERR_LIB_X509V3, ERR_R_ASN1_LIB);
goto err;
@@ -182,11 +180,10 @@ static X509_EXTENSION *do_ext_i2d(const X509V3_EXT_METHOD *method,
return ext;
- err:
+err:
OPENSSL_free(ext_der);
ASN1_OCTET_STRING_free(ext_oct);
return NULL;
-
}
/* Given an internal structure, nid and critical flag create an extension */
@@ -236,8 +233,8 @@ static int v3_check_generic(const char **value)
/* Create a generic extension: for now just handle DER type */
static X509_EXTENSION *v3_generic_extension(const char *ext, const char *value,
- int crit, int gen_type,
- X509V3_CTX *ctx)
+ int crit, int gen_type,
+ X509V3_CTX *ctx)
{
unsigned char *ext_der = NULL;
long ext_len = 0;
@@ -247,7 +244,7 @@ static X509_EXTENSION *v3_generic_extension(const char *ext, const char *value,
if ((obj = OBJ_txt2obj(ext, 0)) == NULL) {
ERR_raise_data(ERR_LIB_X509V3, X509V3_R_EXTENSION_NAME_ERROR,
- "name=%s", ext);
+ "name=%s", ext);
goto err;
}
@@ -258,7 +255,7 @@ static X509_EXTENSION *v3_generic_extension(const char *ext, const char *value,
if (ext_der == NULL) {
ERR_raise_data(ERR_LIB_X509V3, X509V3_R_EXTENSION_VALUE_ERROR,
- "value=%s", value);
+ "value=%s", value);
goto err;
}
@@ -273,16 +270,15 @@ static X509_EXTENSION *v3_generic_extension(const char *ext, const char *value,
extension = X509_EXTENSION_create_by_OBJ(NULL, obj, crit, oct);
- err:
+err:
ASN1_OBJECT_free(obj);
ASN1_OCTET_STRING_free(oct);
OPENSSL_free(ext_der);
return extension;
-
}
static unsigned char *generic_asn1(const char *value, X509V3_CTX *ctx,
- long *ext_len)
+ long *ext_len)
{
ASN1_TYPE *typ;
unsigned char *ext_der = NULL;
@@ -311,7 +307,7 @@ static void delete_ext(STACK_OF(X509_EXTENSION) *sk, X509_EXTENSION *dext)
* Note that on error new elements may have been added to *sk if sk != NULL.
*/
int X509V3_EXT_add_nconf_sk(CONF *conf, X509V3_CTX *ctx, const char *section,
- STACK_OF(X509_EXTENSION) **sk)
+ STACK_OF(X509_EXTENSION) **sk)
{
X509_EXTENSION *ext;
STACK_OF(CONF_VALUE) *nval;
@@ -337,7 +333,8 @@ int X509V3_EXT_add_nconf_sk(CONF *conf, X509V3_CTX *ctx, const char *section,
val = sk_CONF_VALUE_value(nval, akid);
}
if ((ext = X509V3_EXT_nconf_int(conf, ctx, val->section,
- val->name, val->value)) == NULL)
+ val->name, val->value))
+ == NULL)
return 0;
if (sk != NULL) {
if (ctx->flags == X509V3_CTX_REPLACE)
@@ -357,7 +354,7 @@ int X509V3_EXT_add_nconf_sk(CONF *conf, X509V3_CTX *ctx, const char *section,
* Note that on error new elements may remain added to cert if cert != NULL.
*/
int X509V3_EXT_add_nconf(CONF *conf, X509V3_CTX *ctx, const char *section,
- X509 *cert)
+ X509 *cert)
{
STACK_OF(X509_EXTENSION) **sk = NULL;
if (cert != NULL)
@@ -370,7 +367,7 @@ int X509V3_EXT_add_nconf(CONF *conf, X509V3_CTX *ctx, const char *section,
* Note that on error new elements may remain added to crl if crl != NULL.
*/
int X509V3_EXT_CRL_add_nconf(CONF *conf, X509V3_CTX *ctx, const char *section,
- X509_CRL *crl)
+ X509_CRL *crl)
{
STACK_OF(X509_EXTENSION) **sk = NULL;
if (crl != NULL)
@@ -383,7 +380,7 @@ int X509V3_EXT_CRL_add_nconf(CONF *conf, X509V3_CTX *ctx, const char *section,
* Note that on error new elements may remain added to req if req != NULL.
*/
int X509V3_EXT_REQ_add_nconf(CONF *conf, X509V3_CTX *ctx, const char *section,
- X509_REQ *req)
+ X509_REQ *req)
{
STACK_OF(X509_EXTENSION) *exts = NULL;
int ret = X509V3_EXT_add_nconf_sk(conf, ctx, section, &exts);
@@ -462,7 +459,7 @@ void X509V3_set_nconf(X509V3_CTX *ctx, CONF *conf)
}
void X509V3_set_ctx(X509V3_CTX *ctx, X509 *issuer, X509 *subj, X509_REQ *req,
- X509_CRL *crl, int flags)
+ X509_CRL *crl, int flags)
{
if (ctx == NULL) {
ERR_raise(ERR_LIB_X509V3, ERR_R_PASSED_NULL_PARAMETER);
@@ -496,7 +493,7 @@ int X509V3_set_issuer_pkey(X509V3_CTX *ctx, EVP_PKEY *pkey)
/* Old conf compatibility functions */
X509_EXTENSION *X509V3_EXT_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx,
- const char *name, const char *value)
+ const char *name, const char *value)
{
CONF *ctmp;
X509_EXTENSION *ret;
@@ -511,7 +508,7 @@ X509_EXTENSION *X509V3_EXT_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx,
}
X509_EXTENSION *X509V3_EXT_conf_nid(LHASH_OF(CONF_VALUE) *conf,
- X509V3_CTX *ctx, int ext_nid, const char *value)
+ X509V3_CTX *ctx, int ext_nid, const char *value)
{
CONF *ctmp;
X509_EXTENSION *ret;
@@ -553,7 +550,7 @@ void X509V3_set_conf_lhash(X509V3_CTX *ctx, LHASH_OF(CONF_VALUE) *lhash)
}
int X509V3_EXT_add_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx,
- const char *section, X509 *cert)
+ const char *section, X509 *cert)
{
CONF *ctmp;
int ret;
@@ -570,7 +567,7 @@ int X509V3_EXT_add_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx,
/* Same as above but for a CRL */
int X509V3_EXT_CRL_add_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx,
- const char *section, X509_CRL *crl)
+ const char *section, X509_CRL *crl)
{
CONF *ctmp;
int ret;
@@ -587,7 +584,7 @@ int X509V3_EXT_CRL_add_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx,
/* Add extensions to certificate request */
int X509V3_EXT_REQ_add_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx,
- const char *section, X509_REQ *req)
+ const char *section, X509_REQ *req)
{
CONF *ctmp;
int ret;
diff --git a/crypto/x509/v3_cpols.c b/crypto/x509/v3_cpols.c
index 5dcbf8888d..9d95a91240 100644
--- a/crypto/x509/v3_cpols.c
+++ b/crypto/x509/v3_cpols.c
@@ -21,16 +21,16 @@
/* Certificate policies extension support: this one is a bit complex... */
static int i2r_certpol(X509V3_EXT_METHOD *method, STACK_OF(POLICYINFO) *pol,
- BIO *out, int indent);
+ BIO *out, int indent);
static STACK_OF(POLICYINFO) *r2i_certpol(X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx, const char *value);
+ X509V3_CTX *ctx, const char *value);
static void print_qualifiers(BIO *out, STACK_OF(POLICYQUALINFO) *quals,
- int indent);
+ int indent);
static void print_notice(BIO *out, USERNOTICE *notice, int indent);
static POLICYINFO *policy_section(X509V3_CTX *ctx,
- STACK_OF(CONF_VALUE) *polstrs, int ia5org);
+ STACK_OF(CONF_VALUE) *polstrs, int ia5org);
static POLICYQUALINFO *notice_section(X509V3_CTX *ctx,
- STACK_OF(CONF_VALUE) *unot, int ia5org);
+ STACK_OF(CONF_VALUE) *unot, int ia5org);
static int nref_nos(STACK_OF(ASN1_INTEGER) *nnums, STACK_OF(CONF_VALUE) *nos);
static int displaytext_str2tag(const char *tagstr, unsigned int *tag_len);
static int displaytext_get_tag_len(const char *tagstr);
@@ -45,15 +45,14 @@ const X509V3_EXT_METHOD ossl_v3_cpols = {
NULL
};
-ASN1_ITEM_TEMPLATE(CERTIFICATEPOLICIES) =
- ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, CERTIFICATEPOLICIES, POLICYINFO)
+ASN1_ITEM_TEMPLATE(CERTIFICATEPOLICIES) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, CERTIFICATEPOLICIES, POLICYINFO)
ASN1_ITEM_TEMPLATE_END(CERTIFICATEPOLICIES)
IMPLEMENT_ASN1_FUNCTIONS(CERTIFICATEPOLICIES)
ASN1_SEQUENCE(POLICYINFO) = {
- ASN1_SIMPLE(POLICYINFO, policyid, ASN1_OBJECT),
- ASN1_SEQUENCE_OF_OPT(POLICYINFO, qualifiers, POLICYQUALINFO)
+ ASN1_SIMPLE(POLICYINFO, policyid, ASN1_OBJECT),
+ ASN1_SEQUENCE_OF_OPT(POLICYINFO, qualifiers, POLICYQUALINFO)
} ASN1_SEQUENCE_END(POLICYINFO)
IMPLEMENT_ASN1_FUNCTIONS(POLICYINFO)
@@ -61,33 +60,33 @@ IMPLEMENT_ASN1_FUNCTIONS(POLICYINFO)
ASN1_ADB_TEMPLATE(policydefault) = ASN1_SIMPLE(POLICYQUALINFO, d.other, ASN1_ANY);
ASN1_ADB(POLICYQUALINFO) = {
- ADB_ENTRY(NID_id_qt_cps, ASN1_SIMPLE(POLICYQUALINFO, d.cpsuri, ASN1_IA5STRING)),
- ADB_ENTRY(NID_id_qt_unotice, ASN1_SIMPLE(POLICYQUALINFO, d.usernotice, USERNOTICE))
+ ADB_ENTRY(NID_id_qt_cps, ASN1_SIMPLE(POLICYQUALINFO, d.cpsuri, ASN1_IA5STRING)),
+ ADB_ENTRY(NID_id_qt_unotice, ASN1_SIMPLE(POLICYQUALINFO, d.usernotice, USERNOTICE))
} ASN1_ADB_END(POLICYQUALINFO, 0, pqualid, 0, &policydefault_tt, NULL);
ASN1_SEQUENCE(POLICYQUALINFO) = {
- ASN1_SIMPLE(POLICYQUALINFO, pqualid, ASN1_OBJECT),
- ASN1_ADB_OBJECT(POLICYQUALINFO)
+ ASN1_SIMPLE(POLICYQUALINFO, pqualid, ASN1_OBJECT),
+ ASN1_ADB_OBJECT(POLICYQUALINFO)
} ASN1_SEQUENCE_END(POLICYQUALINFO)
IMPLEMENT_ASN1_FUNCTIONS(POLICYQUALINFO)
ASN1_SEQUENCE(USERNOTICE) = {
- ASN1_OPT(USERNOTICE, noticeref, NOTICEREF),
- ASN1_OPT(USERNOTICE, exptext, DISPLAYTEXT)
+ ASN1_OPT(USERNOTICE, noticeref, NOTICEREF),
+ ASN1_OPT(USERNOTICE, exptext, DISPLAYTEXT)
} ASN1_SEQUENCE_END(USERNOTICE)
IMPLEMENT_ASN1_FUNCTIONS(USERNOTICE)
ASN1_SEQUENCE(NOTICEREF) = {
- ASN1_SIMPLE(NOTICEREF, organization, DISPLAYTEXT),
- ASN1_SEQUENCE_OF(NOTICEREF, noticenos, ASN1_INTEGER)
+ ASN1_SIMPLE(NOTICEREF, organization, DISPLAYTEXT),
+ ASN1_SEQUENCE_OF(NOTICEREF, noticenos, ASN1_INTEGER)
} ASN1_SEQUENCE_END(NOTICEREF)
IMPLEMENT_ASN1_FUNCTIONS(NOTICEREF)
static STACK_OF(POLICYINFO) *r2i_certpol(X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx, const char *value)
+ X509V3_CTX *ctx, const char *value)
{
STACK_OF(POLICYINFO) *pols;
char *pstr;
@@ -127,7 +126,7 @@ static STACK_OF(POLICYINFO) *r2i_certpol(X509V3_EXT_METHOD *method,
polsect = X509V3_get_section(ctx, pstr + 1);
if (polsect == NULL) {
ERR_raise_data(ERR_LIB_X509V3, X509V3_R_INVALID_SECTION,
- "%s", cnf->name);
+ "%s", cnf->name);
goto err;
}
pol = policy_section(ctx, polsect, ia5org);
@@ -137,8 +136,8 @@ static STACK_OF(POLICYINFO) *r2i_certpol(X509V3_EXT_METHOD *method,
} else {
if ((pobj = OBJ_txt2obj(cnf->name, 0)) == NULL) {
ERR_raise_data(ERR_LIB_X509V3,
- X509V3_R_INVALID_OBJECT_IDENTIFIER,
- "%s", cnf->name);
+ X509V3_R_INVALID_OBJECT_IDENTIFIER,
+ "%s", cnf->name);
goto err;
}
pol = POLICYINFO_new();
@@ -157,14 +156,14 @@ static STACK_OF(POLICYINFO) *r2i_certpol(X509V3_EXT_METHOD *method,
}
sk_CONF_VALUE_pop_free(vals, X509V3_conf_free);
return pols;
- err:
+err:
sk_CONF_VALUE_pop_free(vals, X509V3_conf_free);
sk_POLICYINFO_pop_free(pols, POLICYINFO_free);
return NULL;
}
static POLICYINFO *policy_section(X509V3_CTX *ctx,
- STACK_OF(CONF_VALUE) *polstrs, int ia5org)
+ STACK_OF(CONF_VALUE) *polstrs, int ia5org)
{
int i;
CONF_VALUE *cnf;
@@ -208,7 +207,7 @@ static POLICYINFO *policy_section(X509V3_CTX *ctx,
goto err;
}
if (!ASN1_STRING_set(qual->d.cpsuri, cnf->value,
- (int)strlen(cnf->value))) {
+ (int)strlen(cnf->value))) {
ERR_raise(ERR_LIB_X509V3, ERR_R_ASN1_LIB);
goto err;
}
@@ -250,7 +249,7 @@ static POLICYINFO *policy_section(X509V3_CTX *ctx,
return pol;
- err:
+err:
POLICYINFO_free(pol);
return NULL;
}
@@ -289,7 +288,7 @@ static int displaytext_str2tag(const char *tagstr, unsigned int *tag_len)
}
static POLICYQUALINFO *notice_section(X509V3_CTX *ctx,
- STACK_OF(CONF_VALUE) *unot, int ia5org)
+ STACK_OF(CONF_VALUE) *unot, int ia5org)
{
int i, ret, len, tag;
unsigned int tag_len;
@@ -344,7 +343,7 @@ static POLICYQUALINFO *notice_section(X509V3_CTX *ctx,
else
nref->organization->type = V_ASN1_VISIBLESTRING;
if (!ASN1_STRING_set(nref->organization, cnf->value,
- (int)strlen(cnf->value))) {
+ (int)strlen(cnf->value))) {
ERR_raise(ERR_LIB_X509V3, ERR_R_ASN1_LIB);
goto err;
}
@@ -378,15 +377,14 @@ static POLICYQUALINFO *notice_section(X509V3_CTX *ctx,
}
}
- if (not->noticeref &&
- (!not->noticeref->noticenos || !not->noticeref->organization)) {
+ if (not->noticeref && (!not->noticeref->noticenos || !not->noticeref->organization)) {
ERR_raise(ERR_LIB_X509V3, X509V3_R_NEED_ORGANIZATION_AND_NUMBERS);
goto err;
}
return qual;
- err:
+err:
POLICYQUALINFO_free(qual);
return NULL;
}
@@ -414,7 +412,7 @@ static int nref_nos(STACK_OF(ASN1_INTEGER) *nnums, STACK_OF(CONF_VALUE) *nos)
}
static int i2r_certpol(X509V3_EXT_METHOD *method, STACK_OF(POLICYINFO) *pol,
- BIO *out, int indent)
+ BIO *out, int indent)
{
int i;
POLICYINFO *pinfo;
@@ -434,7 +432,7 @@ static int i2r_certpol(X509V3_EXT_METHOD *method, STACK_OF(POLICYINFO) *pol,
}
static void print_qualifiers(BIO *out, STACK_OF(POLICYQUALINFO) *quals,
- int indent)
+ int indent)
{
POLICYQUALINFO *qualinfo;
int i;
@@ -445,8 +443,8 @@ static void print_qualifiers(BIO *out, STACK_OF(POLICYQUALINFO) *quals,
switch (OBJ_obj2nid(qualinfo->pqualid)) {
case NID_id_qt_cps:
BIO_printf(out, "%*sCPS: %.*s", indent, "",
- qualinfo->d.cpsuri->length,
- qualinfo->d.cpsuri->data);
+ qualinfo->d.cpsuri->length,
+ qualinfo->d.cpsuri->data);
break;
case NID_id_qt_unotice:
@@ -470,10 +468,10 @@ static void print_notice(BIO *out, USERNOTICE *notice, int indent)
NOTICEREF *ref;
ref = notice->noticeref;
BIO_printf(out, "%*sOrganization: %.*s\n", indent, "",
- ref->organization->length,
- ref->organization->data);
+ ref->organization->length,
+ ref->organization->data);
BIO_printf(out, "%*sNumber%s: ", indent, "",
- sk_ASN1_INTEGER_num(ref->noticenos) > 1 ? "s" : "");
+ sk_ASN1_INTEGER_num(ref->noticenos) > 1 ? "s" : "");
for (i = 0; i < sk_ASN1_INTEGER_num(ref->noticenos); i++) {
ASN1_INTEGER *num;
char *tmp;
@@ -495,8 +493,8 @@ static void print_notice(BIO *out, USERNOTICE *notice, int indent)
}
if (notice->exptext)
BIO_printf(out, "%*sExplicit Text: %.*s", indent, "",
- notice->exptext->length,
- notice->exptext->data);
+ notice->exptext->length,
+ notice->exptext->data);
}
void X509_POLICY_NODE_print(BIO *out, X509_POLICY_NODE *node, int indent)
@@ -508,11 +506,10 @@ void X509_POLICY_NODE_print(BIO *out, X509_POLICY_NODE *node, int indent)
i2a_ASN1_OBJECT(out, dat->valid_policy);
BIO_puts(out, "\n");
BIO_printf(out, "%*s%s\n", indent + 2, "",
- node_data_critical(dat) ? "Critical" : "Non Critical");
+ node_data_critical(dat) ? "Critical" : "Non Critical");
if (dat->qualifier_set) {
print_qualifiers(out, dat->qualifier_set, indent + 2);
BIO_puts(out, "\n");
- }
- else
+ } else
BIO_printf(out, "%*sNo Qualifiers\n", indent + 2, "");
}
diff --git a/crypto/x509/v3_crld.c b/crypto/x509/v3_crld.c
index ef13215aed..56715439a4 100644
--- a/crypto/x509/v3_crld.c
+++ b/crypto/x509/v3_crld.c
@@ -19,9 +19,9 @@
#include "x509_local.h"
static void *v2i_crld(const X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
+ X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
static int i2r_crldp(const X509V3_EXT_METHOD *method, void *pcrldp, BIO *out,
- int indent);
+ int indent);
const X509V3_EXT_METHOD ossl_v3_crld = {
NID_crl_distribution_points, 0, ASN1_ITEM_ref(CRL_DIST_POINTS),
@@ -44,7 +44,7 @@ const X509V3_EXT_METHOD ossl_v3_freshest_crl = {
};
static STACK_OF(GENERAL_NAME) *gnames_from_sectname(X509V3_CTX *ctx,
- char *sect)
+ char *sect)
{
STACK_OF(CONF_VALUE) *gnsect;
STACK_OF(GENERAL_NAME) *gens;
@@ -65,7 +65,7 @@ static STACK_OF(GENERAL_NAME) *gnames_from_sectname(X509V3_CTX *ctx,
}
static int set_dist_point_name(DIST_POINT_NAME **pdp, X509V3_CTX *ctx,
- CONF_VALUE *cnf)
+ CONF_VALUE *cnf)
{
STACK_OF(GENERAL_NAME) *fnm = NULL;
STACK_OF(X509_NAME_ENTRY) *rnm = NULL;
@@ -103,7 +103,8 @@ static int set_dist_point_name(DIST_POINT_NAME **pdp, X509V3_CTX *ctx,
* Since its a name fragment can't have more than one RDNSequence
*/
if (sk_X509_NAME_ENTRY_value(rnm,
- sk_X509_NAME_ENTRY_num(rnm) - 1)->set) {
+ sk_X509_NAME_ENTRY_num(rnm) - 1)
+ ->set) {
ERR_raise(ERR_LIB_X509V3, X509V3_R_INVALID_MULTIPLE_RDNS);
goto err;
}
@@ -128,23 +129,23 @@ static int set_dist_point_name(DIST_POINT_NAME **pdp, X509V3_CTX *ctx,
return 1;
- err:
+err:
sk_GENERAL_NAME_pop_free(fnm, GENERAL_NAME_free);
sk_X509_NAME_ENTRY_pop_free(rnm, X509_NAME_ENTRY_free);
return -1;
}
static const BIT_STRING_BITNAME reason_flags[] = {
- {0, "Unused", "unused"},
- {1, "Key Compromise", "keyCompromise"},
- {2, "CA Compromise", "CACompromise"},
- {3, "Affiliation Changed", "affiliationChanged"},
- {4, "Superseded", "superseded"},
- {5, "Cessation Of Operation", "cessationOfOperation"},
- {6, "Certificate Hold", "certificateHold"},
- {7, "Privilege Withdrawn", "privilegeWithdrawn"},
- {8, "AA Compromise", "AACompromise"},
- {-1, NULL, NULL}
+ { 0, "Unused", "unused" },
+ { 1, "Key Compromise", "keyCompromise" },
+ { 2, "CA Compromise", "CACompromise" },
+ { 3, "Affiliation Changed", "affiliationChanged" },
+ { 4, "Superseded", "superseded" },
+ { 5, "Cessation Of Operation", "cessationOfOperation" },
+ { 6, "Certificate Hold", "certificateHold" },
+ { 7, "Privilege Withdrawn", "privilegeWithdrawn" },
+ { 8, "AA Compromise", "AACompromise" },
+ { -1, NULL, NULL }
};
static int set_reasons(ASN1_BIT_STRING **preas, char *value)
@@ -177,13 +178,13 @@ static int set_reasons(ASN1_BIT_STRING **preas, char *value)
}
ret = 1;
- err:
+err:
sk_CONF_VALUE_pop_free(rsk, X509V3_conf_free);
return ret;
}
static int print_reasons(BIO *out, const char *rname,
- ASN1_BIT_STRING *rflags, int indent)
+ ASN1_BIT_STRING *rflags, int indent)
{
int first = 1;
const BIT_STRING_BITNAME *pbn;
@@ -205,7 +206,7 @@ static int print_reasons(BIO *out, const char *rname,
}
static DIST_POINT *crldp_from_section(X509V3_CTX *ctx,
- STACK_OF(CONF_VALUE) *nval)
+ STACK_OF(CONF_VALUE) *nval)
{
int i;
CONF_VALUE *cnf;
@@ -233,13 +234,13 @@ static DIST_POINT *crldp_from_section(X509V3_CTX *ctx,
return point;
- err:
+err:
DIST_POINT_free(point);
return NULL;
}
static void *v2i_crld(const X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
+ X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
{
STACK_OF(DIST_POINT) *crld;
GENERAL_NAMES *gens = NULL;
@@ -295,7 +296,7 @@ static void *v2i_crld(const X509V3_EXT_METHOD *method,
}
return crld;
- err:
+err:
GENERAL_NAME_free(gen);
GENERAL_NAMES_free(gens);
sk_DIST_POINT_pop_free(crld, DIST_POINT_free);
@@ -303,7 +304,7 @@ static void *v2i_crld(const X509V3_EXT_METHOD *method,
}
static int dpn_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
- void *exarg)
+ void *exarg)
{
DIST_POINT_NAME *dpn = (DIST_POINT_NAME *)*pval;
@@ -319,45 +320,42 @@ static int dpn_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
return 1;
}
-
ASN1_CHOICE_cb(DIST_POINT_NAME, dpn_cb) = {
- ASN1_IMP_SEQUENCE_OF(DIST_POINT_NAME, name.fullname, GENERAL_NAME, 0),
- ASN1_IMP_SET_OF(DIST_POINT_NAME, name.relativename, X509_NAME_ENTRY, 1)
+ ASN1_IMP_SEQUENCE_OF(DIST_POINT_NAME, name.fullname, GENERAL_NAME, 0),
+ ASN1_IMP_SET_OF(DIST_POINT_NAME, name.relativename, X509_NAME_ENTRY, 1)
} ASN1_CHOICE_END_cb(DIST_POINT_NAME, DIST_POINT_NAME, type)
-
IMPLEMENT_ASN1_FUNCTIONS(DIST_POINT_NAME)
IMPLEMENT_ASN1_DUP_FUNCTION(DIST_POINT_NAME)
ASN1_SEQUENCE(DIST_POINT) = {
- ASN1_EXP_OPT(DIST_POINT, distpoint, DIST_POINT_NAME, 0),
- ASN1_IMP_OPT(DIST_POINT, reasons, ASN1_BIT_STRING, 1),
- ASN1_IMP_SEQUENCE_OF_OPT(DIST_POINT, CRLissuer, GENERAL_NAME, 2)
+ ASN1_EXP_OPT(DIST_POINT, distpoint, DIST_POINT_NAME, 0),
+ ASN1_IMP_OPT(DIST_POINT, reasons, ASN1_BIT_STRING, 1),
+ ASN1_IMP_SEQUENCE_OF_OPT(DIST_POINT, CRLissuer, GENERAL_NAME, 2)
} ASN1_SEQUENCE_END(DIST_POINT)
IMPLEMENT_ASN1_FUNCTIONS(DIST_POINT)
-ASN1_ITEM_TEMPLATE(CRL_DIST_POINTS) =
- ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, CRLDistributionPoints, DIST_POINT)
+ASN1_ITEM_TEMPLATE(CRL_DIST_POINTS) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, CRLDistributionPoints, DIST_POINT)
ASN1_ITEM_TEMPLATE_END(CRL_DIST_POINTS)
IMPLEMENT_ASN1_FUNCTIONS(CRL_DIST_POINTS)
ASN1_SEQUENCE(ISSUING_DIST_POINT) = {
- ASN1_EXP_OPT(ISSUING_DIST_POINT, distpoint, DIST_POINT_NAME, 0),
- ASN1_IMP_OPT(ISSUING_DIST_POINT, onlyuser, ASN1_FBOOLEAN, 1),
- ASN1_IMP_OPT(ISSUING_DIST_POINT, onlyCA, ASN1_FBOOLEAN, 2),
- ASN1_IMP_OPT(ISSUING_DIST_POINT, onlysomereasons, ASN1_BIT_STRING, 3),
- ASN1_IMP_OPT(ISSUING_DIST_POINT, indirectCRL, ASN1_FBOOLEAN, 4),
- ASN1_IMP_OPT(ISSUING_DIST_POINT, onlyattr, ASN1_FBOOLEAN, 5)
+ ASN1_EXP_OPT(ISSUING_DIST_POINT, distpoint, DIST_POINT_NAME, 0),
+ ASN1_IMP_OPT(ISSUING_DIST_POINT, onlyuser, ASN1_FBOOLEAN, 1),
+ ASN1_IMP_OPT(ISSUING_DIST_POINT, onlyCA, ASN1_FBOOLEAN, 2),
+ ASN1_IMP_OPT(ISSUING_DIST_POINT, onlysomereasons, ASN1_BIT_STRING, 3),
+ ASN1_IMP_OPT(ISSUING_DIST_POINT, indirectCRL, ASN1_FBOOLEAN, 4),
+ ASN1_IMP_OPT(ISSUING_DIST_POINT, onlyattr, ASN1_FBOOLEAN, 5)
} ASN1_SEQUENCE_END(ISSUING_DIST_POINT)
IMPLEMENT_ASN1_FUNCTIONS(ISSUING_DIST_POINT)
static int i2r_idp(const X509V3_EXT_METHOD *method, void *pidp, BIO *out,
- int indent);
+ int indent);
static void *v2i_idp(const X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
- STACK_OF(CONF_VALUE) *nval);
+ STACK_OF(CONF_VALUE) *nval);
const X509V3_EXT_METHOD ossl_v3_idp = {
NID_issuing_distribution_point, X509V3_EXT_MULTILINE,
@@ -371,7 +369,7 @@ const X509V3_EXT_METHOD ossl_v3_idp = {
};
static void *v2i_idp(const X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
- STACK_OF(CONF_VALUE) *nval)
+ STACK_OF(CONF_VALUE) *nval)
{
ISSUING_DIST_POINT *idp = NULL;
CONF_VALUE *cnf;
@@ -414,7 +412,7 @@ static void *v2i_idp(const X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
}
return idp;
- err:
+err:
ISSUING_DIST_POINT_free(idp);
return NULL;
}
@@ -436,7 +434,7 @@ static int print_distpoint(BIO *out, DIST_POINT_NAME *dpn, int indent)
}
static int i2r_idp(const X509V3_EXT_METHOD *method, void *pidp, BIO *out,
- int indent)
+ int indent)
{
ISSUING_DIST_POINT *idp = pidp;
if (idp->distpoint)
@@ -460,7 +458,7 @@ static int i2r_idp(const X509V3_EXT_METHOD *method, void *pidp, BIO *out,
}
static int i2r_crldp(const X509V3_EXT_METHOD *method, void *pcrldp, BIO *out,
- int indent)
+ int indent)
{
STACK_OF(DIST_POINT) *crld = pcrldp;
DIST_POINT *point;
@@ -482,9 +480,9 @@ static int i2r_crldp(const X509V3_EXT_METHOD *method, void *pcrldp, BIO *out,
}
static int i2r_crl_invdate(const X509V3_EXT_METHOD *method, void *date,
- BIO *out, int indent);
+ BIO *out, int indent);
static int i2r_object(const X509V3_EXT_METHOD *method, void *obj, BIO *out,
- int indent);
+ int indent);
const X509V3_EXT_METHOD ossl_v3_crl_invdate = {
NID_invalidity_date, 0, ASN1_ITEM_ref(ASN1_GENERALIZEDTIME),
@@ -505,7 +503,7 @@ const X509V3_EXT_METHOD ossl_v3_crl_hold = {
};
static int i2r_crl_invdate(const X509V3_EXT_METHOD *method, void *date,
- BIO *bp, int ind)
+ BIO *bp, int ind)
{
if (BIO_printf(bp, "%*s", ind, "") <= 0)
return 0;
@@ -515,7 +513,7 @@ static int i2r_crl_invdate(const X509V3_EXT_METHOD *method, void *date,
}
static int i2r_object(const X509V3_EXT_METHOD *method, void *oid, BIO *bp,
- int ind)
+ int ind)
{
if (BIO_printf(bp, "%*s", ind, "") <= 0)
return 0;
@@ -547,7 +545,7 @@ int DIST_POINT_set_dpname(DIST_POINT_NAME *dpn, const X509_NAME *iname)
if (i2d_X509_NAME(dpn->dpname, NULL) >= 0)
return 1;
- err:
+err:
X509_NAME_free(dpn->dpname);
dpn->dpname = NULL;
return 0;
@@ -570,7 +568,7 @@ static int print_boolean(BIO *out, ASN1_BOOLEAN b)
}
static OSSL_AA_DIST_POINT *aaidp_from_section(X509V3_CTX *ctx,
- STACK_OF(CONF_VALUE) *nval)
+ STACK_OF(CONF_VALUE) *nval)
{
int i, ret;
CONF_VALUE *cnf;
@@ -605,13 +603,13 @@ static OSSL_AA_DIST_POINT *aaidp_from_section(X509V3_CTX *ctx,
return point;
- err:
+err:
OSSL_AA_DIST_POINT_free(point);
return NULL;
}
static void *v2i_aaidp(const X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
+ X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
{
GENERAL_NAMES *gens = NULL;
GENERAL_NAME *gen = NULL;
@@ -656,7 +654,7 @@ static void *v2i_aaidp(const X509V3_EXT_METHOD *method,
}
return point;
- err:
+err:
OSSL_AA_DIST_POINT_free(point);
GENERAL_NAME_free(gen);
GENERAL_NAMES_free(gens);
@@ -664,7 +662,7 @@ static void *v2i_aaidp(const X509V3_EXT_METHOD *method,
}
static int i2r_aaidp(const X509V3_EXT_METHOD *method, void *dp, BIO *out,
- int indent)
+ int indent)
{
OSSL_AA_DIST_POINT *pdp = dp;
@@ -692,7 +690,8 @@ static int i2r_aaidp(const X509V3_EXT_METHOD *method, void *dp, BIO *out,
}
if (pdp->containsAACerts) {
if (BIO_printf(out, "%*sContains Attribute Authority (AA) Certificates: ",
- indent, "") <= 0)
+ indent, "")
+ <= 0)
return 0;
if (print_boolean(out, pdp->containsAACerts) <= 0)
return 0;
@@ -701,8 +700,9 @@ static int i2r_aaidp(const X509V3_EXT_METHOD *method, void *dp, BIO *out,
}
if (pdp->containsSOAPublicKeyCerts) {
if (BIO_printf(out,
- "%*sContains Source Of Authority (SOA) Public Key Certificates: ",
- indent, "") <= 0)
+ "%*sContains Source Of Authority (SOA) Public Key Certificates: ",
+ indent, "")
+ <= 0)
return 0;
if (print_boolean(out, pdp->containsSOAPublicKeyCerts) <= 0)
return 0;
diff --git a/crypto/x509/v3_enum.c b/crypto/x509/v3_enum.c
index b73a6d5516..56d44c855f 100644
--- a/crypto/x509/v3_enum.c
+++ b/crypto/x509/v3_enum.c
@@ -13,20 +13,20 @@
#include "ext_dat.h"
static ENUMERATED_NAMES crl_reasons[] = {
- {CRL_REASON_UNSPECIFIED, "Unspecified", "unspecified"},
- {CRL_REASON_KEY_COMPROMISE, "Key Compromise", "keyCompromise"},
- {CRL_REASON_CA_COMPROMISE, "CA Compromise", "CACompromise"},
- {CRL_REASON_AFFILIATION_CHANGED, "Affiliation Changed",
- "affiliationChanged"},
- {CRL_REASON_SUPERSEDED, "Superseded", "superseded"},
- {CRL_REASON_CESSATION_OF_OPERATION,
- "Cessation Of Operation", "cessationOfOperation"},
- {CRL_REASON_CERTIFICATE_HOLD, "Certificate Hold", "certificateHold"},
- {CRL_REASON_REMOVE_FROM_CRL, "Remove From CRL", "removeFromCRL"},
- {CRL_REASON_PRIVILEGE_WITHDRAWN, "Privilege Withdrawn",
- "privilegeWithdrawn"},
- {CRL_REASON_AA_COMPROMISE, "AA Compromise", "AACompromise"},
- {-1, NULL, NULL}
+ { CRL_REASON_UNSPECIFIED, "Unspecified", "unspecified" },
+ { CRL_REASON_KEY_COMPROMISE, "Key Compromise", "keyCompromise" },
+ { CRL_REASON_CA_COMPROMISE, "CA Compromise", "CACompromise" },
+ { CRL_REASON_AFFILIATION_CHANGED, "Affiliation Changed",
+ "affiliationChanged" },
+ { CRL_REASON_SUPERSEDED, "Superseded", "superseded" },
+ { CRL_REASON_CESSATION_OF_OPERATION,
+ "Cessation Of Operation", "cessationOfOperation" },
+ { CRL_REASON_CERTIFICATE_HOLD, "Certificate Hold", "certificateHold" },
+ { CRL_REASON_REMOVE_FROM_CRL, "Remove From CRL", "removeFromCRL" },
+ { CRL_REASON_PRIVILEGE_WITHDRAWN, "Privilege Withdrawn",
+ "privilegeWithdrawn" },
+ { CRL_REASON_AA_COMPROMISE, "AA Compromise", "AACompromise" },
+ { -1, NULL, NULL }
};
const X509V3_EXT_METHOD ossl_v3_crl_reason = {
@@ -39,7 +39,7 @@ const X509V3_EXT_METHOD ossl_v3_crl_reason = {
};
char *i2s_ASN1_ENUMERATED_TABLE(X509V3_EXT_METHOD *method,
- const ASN1_ENUMERATED *e)
+ const ASN1_ENUMERATED *e)
{
ENUMERATED_NAMES *enam;
long strval;
diff --git a/crypto/x509/v3_extku.c b/crypto/x509/v3_extku.c
index cb95c5bb79..8aabd8f48d 100644
--- a/crypto/x509/v3_extku.c
+++ b/crypto/x509/v3_extku.c
@@ -15,11 +15,11 @@
#include "ext_dat.h"
static void *v2i_EXTENDED_KEY_USAGE(const X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx,
- STACK_OF(CONF_VALUE) *nval);
+ X509V3_CTX *ctx,
+ STACK_OF(CONF_VALUE) *nval);
static STACK_OF(CONF_VALUE) *i2v_EXTENDED_KEY_USAGE(const X509V3_EXT_METHOD
- *method, void *eku, STACK_OF(CONF_VALUE)
- *extlist);
+ *method,
+ void *eku, STACK_OF(CONF_VALUE) *extlist);
const X509V3_EXT_METHOD ossl_v3_ext_ku = {
NID_ext_key_usage, 0,
@@ -68,15 +68,14 @@ const X509V3_EXT_METHOD ossl_v3_acc_priv_policies = {
NULL
};
-ASN1_ITEM_TEMPLATE(EXTENDED_KEY_USAGE) =
- ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, EXTENDED_KEY_USAGE, ASN1_OBJECT)
+ASN1_ITEM_TEMPLATE(EXTENDED_KEY_USAGE) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, EXTENDED_KEY_USAGE, ASN1_OBJECT)
ASN1_ITEM_TEMPLATE_END(EXTENDED_KEY_USAGE)
IMPLEMENT_ASN1_FUNCTIONS(EXTENDED_KEY_USAGE)
static STACK_OF(CONF_VALUE) *i2v_EXTENDED_KEY_USAGE(const X509V3_EXT_METHOD
- *method, void *a, STACK_OF(CONF_VALUE)
- *ext_list)
+ *method,
+ void *a, STACK_OF(CONF_VALUE) *ext_list)
{
EXTENDED_KEY_USAGE *eku = a;
int i;
@@ -91,8 +90,8 @@ static STACK_OF(CONF_VALUE) *i2v_EXTENDED_KEY_USAGE(const X509V3_EXT_METHOD
}
static void *v2i_EXTENDED_KEY_USAGE(const X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx,
- STACK_OF(CONF_VALUE) *nval)
+ X509V3_CTX *ctx,
+ STACK_OF(CONF_VALUE) *nval)
{
EXTENDED_KEY_USAGE *extku;
char *extval;
@@ -117,10 +116,10 @@ static void *v2i_EXTENDED_KEY_USAGE(const X509V3_EXT_METHOD *method,
if ((objtmp = OBJ_txt2obj(extval, 0)) == NULL) {
sk_ASN1_OBJECT_pop_free(extku, ASN1_OBJECT_free);
ERR_raise_data(ERR_LIB_X509V3, X509V3_R_INVALID_OBJECT_IDENTIFIER,
- "%s", extval);
+ "%s", extval);
return NULL;
}
- sk_ASN1_OBJECT_push(extku, objtmp); /* no failure as it was reserved */
+ sk_ASN1_OBJECT_push(extku, objtmp); /* no failure as it was reserved */
}
return extku;
}
diff --git a/crypto/x509/v3_genn.c b/crypto/x509/v3_genn.c
index fd48b51927..d63168a77a 100644
--- a/crypto/x509/v3_genn.c
+++ b/crypto/x509/v3_genn.c
@@ -14,39 +14,38 @@
#include <openssl/x509v3.h>
ASN1_SEQUENCE(OTHERNAME) = {
- ASN1_SIMPLE(OTHERNAME, type_id, ASN1_OBJECT),
- /* Maybe have a true ANY DEFINED BY later */
- ASN1_EXP(OTHERNAME, value, ASN1_ANY, 0)
+ ASN1_SIMPLE(OTHERNAME, type_id, ASN1_OBJECT),
+ /* Maybe have a true ANY DEFINED BY later */
+ ASN1_EXP(OTHERNAME, value, ASN1_ANY, 0)
} ASN1_SEQUENCE_END(OTHERNAME)
IMPLEMENT_ASN1_FUNCTIONS(OTHERNAME)
ASN1_SEQUENCE(EDIPARTYNAME) = {
- /* DirectoryString is a CHOICE type so use explicit tagging */
- ASN1_EXP_OPT(EDIPARTYNAME, nameAssigner, DIRECTORYSTRING, 0),
- ASN1_EXP(EDIPARTYNAME, partyName, DIRECTORYSTRING, 1)
+ /* DirectoryString is a CHOICE type so use explicit tagging */
+ ASN1_EXP_OPT(EDIPARTYNAME, nameAssigner, DIRECTORYSTRING, 0),
+ ASN1_EXP(EDIPARTYNAME, partyName, DIRECTORYSTRING, 1)
} ASN1_SEQUENCE_END(EDIPARTYNAME)
IMPLEMENT_ASN1_FUNCTIONS(EDIPARTYNAME)
ASN1_CHOICE(GENERAL_NAME) = {
- ASN1_IMP(GENERAL_NAME, d.otherName, OTHERNAME, GEN_OTHERNAME),
- ASN1_IMP(GENERAL_NAME, d.rfc822Name, ASN1_IA5STRING, GEN_EMAIL),
- ASN1_IMP(GENERAL_NAME, d.dNSName, ASN1_IA5STRING, GEN_DNS),
- /* Don't decode this */
- ASN1_IMP(GENERAL_NAME, d.x400Address, ASN1_SEQUENCE, GEN_X400),
- /* X509_NAME is a CHOICE type so use EXPLICIT */
- ASN1_EXP(GENERAL_NAME, d.directoryName, X509_NAME, GEN_DIRNAME),
- ASN1_IMP(GENERAL_NAME, d.ediPartyName, EDIPARTYNAME, GEN_EDIPARTY),
- ASN1_IMP(GENERAL_NAME, d.uniformResourceIdentifier, ASN1_IA5STRING, GEN_URI),
- ASN1_IMP(GENERAL_NAME, d.iPAddress, ASN1_OCTET_STRING, GEN_IPADD),
- ASN1_IMP(GENERAL_NAME, d.registeredID, ASN1_OBJECT, GEN_RID)
+ ASN1_IMP(GENERAL_NAME, d.otherName, OTHERNAME, GEN_OTHERNAME),
+ ASN1_IMP(GENERAL_NAME, d.rfc822Name, ASN1_IA5STRING, GEN_EMAIL),
+ ASN1_IMP(GENERAL_NAME, d.dNSName, ASN1_IA5STRING, GEN_DNS),
+ /* Don't decode this */
+ ASN1_IMP(GENERAL_NAME, d.x400Address, ASN1_SEQUENCE, GEN_X400),
+ /* X509_NAME is a CHOICE type so use EXPLICIT */
+ ASN1_EXP(GENERAL_NAME, d.directoryName, X509_NAME, GEN_DIRNAME),
+ ASN1_IMP(GENERAL_NAME, d.ediPartyName, EDIPARTYNAME, GEN_EDIPARTY),
+ ASN1_IMP(GENERAL_NAME, d.uniformResourceIdentifier, ASN1_IA5STRING, GEN_URI),
+ ASN1_IMP(GENERAL_NAME, d.iPAddress, ASN1_OCTET_STRING, GEN_IPADD),
+ ASN1_IMP(GENERAL_NAME, d.registeredID, ASN1_OBJECT, GEN_RID)
} ASN1_CHOICE_END(GENERAL_NAME)
IMPLEMENT_ASN1_FUNCTIONS(GENERAL_NAME)
-ASN1_ITEM_TEMPLATE(GENERAL_NAMES) =
- ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, GeneralNames, GENERAL_NAME)
+ASN1_ITEM_TEMPLATE(GENERAL_NAMES) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, GeneralNames, GENERAL_NAME)
ASN1_ITEM_TEMPLATE_END(GENERAL_NAMES)
IMPLEMENT_ASN1_FUNCTIONS(GENERAL_NAMES)
@@ -54,8 +53,8 @@ IMPLEMENT_ASN1_FUNCTIONS(GENERAL_NAMES)
GENERAL_NAME *GENERAL_NAME_dup(const GENERAL_NAME *a)
{
return (GENERAL_NAME *)ASN1_dup((i2d_of_void *)i2d_GENERAL_NAME,
- (d2i_of_void *)d2i_GENERAL_NAME,
- (char *)a);
+ (d2i_of_void *)d2i_GENERAL_NAME,
+ (char *)a);
}
int GENERAL_NAME_set1_X509_NAME(GENERAL_NAME **tgt, const X509_NAME *src)
@@ -82,7 +81,7 @@ int GENERAL_NAME_set1_X509_NAME(GENERAL_NAME **tgt, const X509_NAME *src)
*tgt = name;
return 1;
- err:
+err:
GENERAL_NAME_free(name);
return 0;
}
@@ -244,7 +243,7 @@ void *GENERAL_NAME_get0_value(const GENERAL_NAME *a, int *ptype)
}
int GENERAL_NAME_set0_othername(GENERAL_NAME *gen,
- ASN1_OBJECT *oid, ASN1_TYPE *value)
+ ASN1_OBJECT *oid, ASN1_TYPE *value)
{
OTHERNAME *oth;
oth = OTHERNAME_new();
@@ -258,7 +257,7 @@ int GENERAL_NAME_set0_othername(GENERAL_NAME *gen,
}
int GENERAL_NAME_get0_otherName(const GENERAL_NAME *gen,
- ASN1_OBJECT **poid, ASN1_TYPE **pvalue)
+ ASN1_OBJECT **poid, ASN1_TYPE **pvalue)
{
if (gen->type != GEN_OTHERNAME)
return 0;
diff --git a/crypto/x509/v3_group_ac.c b/crypto/x509/v3_group_ac.c
index 9a2b69dece..d73d1b6d15 100644
--- a/crypto/x509/v3_group_ac.c
+++ b/crypto/x509/v3_group_ac.c
@@ -15,14 +15,14 @@
#include "ext_dat.h"
static int i2r_GROUP_AC(X509V3_EXT_METHOD *method,
- void *su, BIO *out,
- int indent)
+ void *su, BIO *out,
+ int indent)
{
return 1;
}
static void *r2i_GROUP_AC(X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx, const char *value)
+ X509V3_CTX *ctx, const char *value)
{
return ASN1_NULL_new();
}
diff --git a/crypto/x509/v3_ia5.c b/crypto/x509/v3_ia5.c
index 1a9b68d6ba..6dbf627a1d 100644
--- a/crypto/x509/v3_ia5.c
+++ b/crypto/x509/v3_ia5.c
@@ -39,7 +39,7 @@ char *i2s_ASN1_IA5STRING(X509V3_EXT_METHOD *method, ASN1_IA5STRING *ia5)
}
ASN1_IA5STRING *s2i_ASN1_IA5STRING(X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx, const char *str)
+ X509V3_CTX *ctx, const char *str)
{
ASN1_IA5STRING *ia5;
if (str == NULL) {
@@ -56,6 +56,6 @@ ASN1_IA5STRING *s2i_ASN1_IA5STRING(X509V3_EXT_METHOD *method,
}
#ifdef CHARSET_EBCDIC
ebcdic2ascii(ia5->data, ia5->data, ia5->length);
-#endif /* CHARSET_EBCDIC */
+#endif /* CHARSET_EBCDIC */
return ia5;
}
diff --git a/crypto/x509/v3_ind_iss.c b/crypto/x509/v3_ind_iss.c
index ff41ba7bed..850a002186 100644
--- a/crypto/x509/v3_ind_iss.c
+++ b/crypto/x509/v3_ind_iss.c
@@ -15,14 +15,14 @@
#include "ext_dat.h"
static int i2r_INDIRECT_ISSUER(X509V3_EXT_METHOD *method,
- void *su, BIO *out,
- int indent)
+ void *su, BIO *out,
+ int indent)
{
return 1;
}
static void *r2i_INDIRECT_ISSUER(X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx, const char *value)
+ X509V3_CTX *ctx, const char *value)
{
return ASN1_NULL_new();
}
diff --git a/crypto/x509/v3_info.c b/crypto/x509/v3_info.c
index 5a9ba7f864..e49e251667 100644
--- a/crypto/x509/v3_info.c
+++ b/crypto/x509/v3_info.c
@@ -16,44 +16,43 @@
#include "ext_dat.h"
static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_INFO_ACCESS(X509V3_EXT_METHOD
- *method, AUTHORITY_INFO_ACCESS
- *ainfo, STACK_OF(CONF_VALUE)
- *ret);
+ *method,
+ AUTHORITY_INFO_ACCESS
+ *ainfo,
+ STACK_OF(CONF_VALUE)
+ *ret);
static AUTHORITY_INFO_ACCESS *v2i_AUTHORITY_INFO_ACCESS(X509V3_EXT_METHOD
- *method,
- X509V3_CTX *ctx,
- STACK_OF(CONF_VALUE)
- *nval);
+ *method,
+ X509V3_CTX *ctx,
+ STACK_OF(CONF_VALUE)
+ *nval);
const X509V3_EXT_METHOD ossl_v3_info = { NID_info_access, X509V3_EXT_MULTILINE,
ASN1_ITEM_ref(AUTHORITY_INFO_ACCESS),
0, 0, 0, 0,
0, 0,
- (X509V3_EXT_I2V) i2v_AUTHORITY_INFO_ACCESS,
+ (X509V3_EXT_I2V)i2v_AUTHORITY_INFO_ACCESS,
(X509V3_EXT_V2I)v2i_AUTHORITY_INFO_ACCESS,
0, 0,
- NULL
-};
+ NULL };
const X509V3_EXT_METHOD ossl_v3_sinfo = { NID_sinfo_access, X509V3_EXT_MULTILINE,
ASN1_ITEM_ref(AUTHORITY_INFO_ACCESS),
0, 0, 0, 0,
0, 0,
- (X509V3_EXT_I2V) i2v_AUTHORITY_INFO_ACCESS,
+ (X509V3_EXT_I2V)i2v_AUTHORITY_INFO_ACCESS,
(X509V3_EXT_V2I)v2i_AUTHORITY_INFO_ACCESS,
0, 0,
- NULL
-};
+ NULL };
ASN1_SEQUENCE(ACCESS_DESCRIPTION) = {
- ASN1_SIMPLE(ACCESS_DESCRIPTION, method, ASN1_OBJECT),
- ASN1_SIMPLE(ACCESS_DESCRIPTION, location, GENERAL_NAME)
+ ASN1_SIMPLE(ACCESS_DESCRIPTION, method, ASN1_OBJECT),
+ ASN1_SIMPLE(ACCESS_DESCRIPTION, location, GENERAL_NAME)
} ASN1_SEQUENCE_END(ACCESS_DESCRIPTION)
IMPLEMENT_ASN1_FUNCTIONS(ACCESS_DESCRIPTION)
-ASN1_ITEM_TEMPLATE(AUTHORITY_INFO_ACCESS) =
- ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, GeneralNames, ACCESS_DESCRIPTION)
+ASN1_ITEM_TEMPLATE(AUTHORITY_INFO_ACCESS) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, GeneralNames, ACCESS_DESCRIPTION)
ASN1_ITEM_TEMPLATE_END(AUTHORITY_INFO_ACCESS)
IMPLEMENT_ASN1_FUNCTIONS(AUTHORITY_INFO_ACCESS)
@@ -93,17 +92,17 @@ static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_INFO_ACCESS(
return sk_CONF_VALUE_new_null();
return tret;
- err:
+err:
if (ret == NULL && tret != NULL)
sk_CONF_VALUE_pop_free(tret, X509V3_conf_free);
return NULL;
}
static AUTHORITY_INFO_ACCESS *v2i_AUTHORITY_INFO_ACCESS(X509V3_EXT_METHOD
- *method,
- X509V3_CTX *ctx,
- STACK_OF(CONF_VALUE)
- *nval)
+ *method,
+ X509V3_CTX *ctx,
+ STACK_OF(CONF_VALUE)
+ *nval)
{
AUTHORITY_INFO_ACCESS *ainfo = NULL;
CONF_VALUE *cnf, ctmp;
@@ -137,14 +136,14 @@ static AUTHORITY_INFO_ACCESS *v2i_AUTHORITY_INFO_ACCESS(X509V3_EXT_METHOD
acc->method = OBJ_txt2obj(objtmp, 0);
if (!acc->method) {
ERR_raise_data(ERR_LIB_X509V3, X509V3_R_BAD_OBJECT,
- "value=%s", objtmp);
+ "value=%s", objtmp);
OPENSSL_free(objtmp);
goto err;
}
OPENSSL_free(objtmp);
}
return ainfo;
- err:
+err:
sk_ACCESS_DESCRIPTION_pop_free(ainfo, ACCESS_DESCRIPTION_free);
return NULL;
}
diff --git a/crypto/x509/v3_int.c b/crypto/x509/v3_int.c
index dae26a5ba9..d6d0d72fed 100644
--- a/crypto/x509/v3_int.c
+++ b/crypto/x509/v3_int.c
@@ -29,7 +29,7 @@ const X509V3_EXT_METHOD ossl_v3_delta_crl = {
};
static void *s2i_asn1_int(X509V3_EXT_METHOD *meth, X509V3_CTX *ctx,
- const char *value)
+ const char *value)
{
return s2i_ASN1_INTEGER(meth, value);
}
diff --git a/crypto/x509/v3_iobo.c b/crypto/x509/v3_iobo.c
index 23f991f6b6..84d729325d 100644
--- a/crypto/x509/v3_iobo.c
+++ b/crypto/x509/v3_iobo.c
@@ -11,8 +11,8 @@
#include "ext_dat.h"
static int i2r_ISSUED_ON_BEHALF_OF(X509V3_EXT_METHOD *method,
- GENERAL_NAME *gn, BIO *out,
- int indent)
+ GENERAL_NAME *gn, BIO *out,
+ int indent)
{
if (BIO_printf(out, "%*s", indent, "") <= 0)
return 0;
diff --git a/crypto/x509/v3_ist.c b/crypto/x509/v3_ist.c
index 32044622f0..fb7aaacbb3 100644
--- a/crypto/x509/v3_ist.c
+++ b/crypto/x509/v3_ist.c
@@ -23,17 +23,16 @@
*/
ASN1_SEQUENCE(ISSUER_SIGN_TOOL) = {
- ASN1_SIMPLE(ISSUER_SIGN_TOOL, signTool, ASN1_UTF8STRING),
- ASN1_SIMPLE(ISSUER_SIGN_TOOL, cATool, ASN1_UTF8STRING),
- ASN1_SIMPLE(ISSUER_SIGN_TOOL, signToolCert, ASN1_UTF8STRING),
- ASN1_SIMPLE(ISSUER_SIGN_TOOL, cAToolCert, ASN1_UTF8STRING)
+ ASN1_SIMPLE(ISSUER_SIGN_TOOL, signTool, ASN1_UTF8STRING),
+ ASN1_SIMPLE(ISSUER_SIGN_TOOL, cATool, ASN1_UTF8STRING),
+ ASN1_SIMPLE(ISSUER_SIGN_TOOL, signToolCert, ASN1_UTF8STRING),
+ ASN1_SIMPLE(ISSUER_SIGN_TOOL, cAToolCert, ASN1_UTF8STRING)
} ASN1_SEQUENCE_END(ISSUER_SIGN_TOOL)
IMPLEMENT_ASN1_FUNCTIONS(ISSUER_SIGN_TOOL)
-
static ISSUER_SIGN_TOOL *v2i_issuer_sign_tool(X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
- STACK_OF(CONF_VALUE) *nval)
+ STACK_OF(CONF_VALUE) *nval)
{
ISSUER_SIGN_TOOL *ist = ISSUER_SIGN_TOOL_new();
int i;
@@ -93,8 +92,8 @@ err:
}
static int i2r_issuer_sign_tool(X509V3_EXT_METHOD *method,
- ISSUER_SIGN_TOOL *ist, BIO *out,
- int indent)
+ ISSUER_SIGN_TOOL *ist, BIO *out,
+ int indent)
{
int new_line = 0;
@@ -135,15 +134,15 @@ static int i2r_issuer_sign_tool(X509V3_EXT_METHOD *method,
}
const X509V3_EXT_METHOD ossl_v3_issuer_sign_tool = {
- NID_issuerSignTool, /* nid */
- X509V3_EXT_MULTILINE, /* flags */
- ASN1_ITEM_ref(ISSUER_SIGN_TOOL), /* template */
- 0, 0, 0, 0, /* old functions, ignored */
- 0, /* i2s */
- 0, /* s2i */
- 0, /* i2v */
+ NID_issuerSignTool, /* nid */
+ X509V3_EXT_MULTILINE, /* flags */
+ ASN1_ITEM_ref(ISSUER_SIGN_TOOL), /* template */
+ 0, 0, 0, 0, /* old functions, ignored */
+ 0, /* i2s */
+ 0, /* s2i */
+ 0, /* i2v */
(X509V3_EXT_V2I)v2i_issuer_sign_tool, /* v2i */
(X509V3_EXT_I2R)i2r_issuer_sign_tool, /* i2r */
- 0, /* r2i */
- NULL /* extension-specific data */
+ 0, /* r2i */
+ NULL /* extension-specific data */
};
diff --git a/crypto/x509/v3_lib.c b/crypto/x509/v3_lib.c
index 86d8721b60..fe6c235c5d 100644
--- a/crypto/x509/v3_lib.c
+++ b/crypto/x509/v3_lib.c
@@ -19,7 +19,7 @@
static STACK_OF(X509V3_EXT_METHOD) *ext_list = NULL;
static int ext_cmp(const X509V3_EXT_METHOD *const *a,
- const X509V3_EXT_METHOD *const *b);
+ const X509V3_EXT_METHOD *const *b);
static void ext_list_free(X509V3_EXT_METHOD *ext);
int X509V3_EXT_add(X509V3_EXT_METHOD *ext)
@@ -37,22 +37,22 @@ int X509V3_EXT_add(X509V3_EXT_METHOD *ext)
}
static int ext_cmp(const X509V3_EXT_METHOD *const *a,
- const X509V3_EXT_METHOD *const *b)
+ const X509V3_EXT_METHOD *const *b)
{
return ((*a)->ext_nid - (*b)->ext_nid);
}
DECLARE_OBJ_BSEARCH_CMP_FN(const X509V3_EXT_METHOD *,
- const X509V3_EXT_METHOD *, ext);
+ const X509V3_EXT_METHOD *, ext);
IMPLEMENT_OBJ_BSEARCH_CMP_FN(const X509V3_EXT_METHOD *,
- const X509V3_EXT_METHOD *, ext);
+ const X509V3_EXT_METHOD *, ext);
#include "standard_exts.h"
const X509V3_EXT_METHOD *X509V3_EXT_get_nid(int nid)
{
X509V3_EXT_METHOD tmp;
- const X509V3_EXT_METHOD *t = &tmp, *const *ret;
+ const X509V3_EXT_METHOD *t = &tmp, *const * ret;
int idx;
if (nid < 0)
@@ -165,7 +165,7 @@ void *X509V3_EXT_d2i(X509_EXTENSION *ext)
*/
void *X509V3_get_d2i(const STACK_OF(X509_EXTENSION) *x, int nid, int *crit,
- int *idx)
+ int *idx)
{
int lastpos, i;
X509_EXTENSION *ex, *found_ex = NULL;
@@ -221,7 +221,7 @@ void *X509V3_get_d2i(const STACK_OF(X509_EXTENSION) *x, int nid, int *crit,
*/
int X509V3_add1_i2d(STACK_OF(X509_EXTENSION) **x, int nid, void *value,
- int crit, unsigned long flags)
+ int crit, unsigned long flags)
{
int errcode, extidx = -1;
X509_EXTENSION *ext = NULL, *extmp;
@@ -257,8 +257,7 @@ int X509V3_add1_i2d(STACK_OF(X509_EXTENSION) **x, int nid, void *value,
/*
* If replace existing or delete, error since extension must exist
*/
- if ((ext_op == X509V3_ADD_REPLACE_EXISTING) ||
- (ext_op == X509V3_ADD_DELETE)) {
+ if ((ext_op == X509V3_ADD_REPLACE_EXISTING) || (ext_op == X509V3_ADD_DELETE)) {
errcode = X509V3_R_EXTENSION_NOT_FOUND;
goto err;
}
@@ -295,14 +294,14 @@ int X509V3_add1_i2d(STACK_OF(X509_EXTENSION) **x, int nid, void *value,
*x = ret;
return 1;
- m_fail:
+m_fail:
/* ERR_raise(ERR_LIB_X509V3, ERR_R_CRYPTO_LIB); */
if (ret != *x)
sk_X509_EXTENSION_free(ret);
X509_EXTENSION_free(ext);
return -1;
- err:
+err:
if (!(flags & X509V3_ADD_SILENT))
ERR_raise(ERR_LIB_X509V3, errcode);
return 0;
diff --git a/crypto/x509/v3_ncons.c b/crypto/x509/v3_ncons.c
index 73e1dbc0c8..a791fe6511 100644
--- a/crypto/x509/v3_ncons.c
+++ b/crypto/x509/v3_ncons.c
@@ -25,18 +25,18 @@
OSSL_SAFE_MATH_SIGNED(int, int)
static void *v2i_NAME_CONSTRAINTS(const X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx,
- STACK_OF(CONF_VALUE) *nval);
+ X509V3_CTX *ctx,
+ STACK_OF(CONF_VALUE) *nval);
static int i2r_NAME_CONSTRAINTS(const X509V3_EXT_METHOD *method, void *a,
- BIO *bp, int ind);
+ BIO *bp, int ind);
static int do_i2r_name_constraints(const X509V3_EXT_METHOD *method,
- STACK_OF(GENERAL_SUBTREE) *trees, BIO *bp,
- int ind, const char *name);
+ STACK_OF(GENERAL_SUBTREE) *trees, BIO *bp,
+ int ind, const char *name);
static int print_nc_ipadd(BIO *bp, ASN1_OCTET_STRING *ip);
static int nc_match(GENERAL_NAME *gen, NAME_CONSTRAINTS *nc);
static int nc_match_single(int effective_type, GENERAL_NAME *gen,
- GENERAL_NAME *base);
+ GENERAL_NAME *base);
static int nc_dn(const X509_NAME *sub, const X509_NAME *nm);
static int nc_dns(ASN1_IA5STRING *sub, ASN1_IA5STRING *dns);
static int nc_email(ASN1_IA5STRING *sub, ASN1_IA5STRING *eml);
@@ -75,37 +75,36 @@ const X509V3_EXT_METHOD ossl_v3_delegated_name_constraints = {
};
ASN1_SEQUENCE(GENERAL_SUBTREE) = {
- ASN1_SIMPLE(GENERAL_SUBTREE, base, GENERAL_NAME),
- ASN1_IMP_OPT(GENERAL_SUBTREE, minimum, ASN1_INTEGER, 0),
- ASN1_IMP_OPT(GENERAL_SUBTREE, maximum, ASN1_INTEGER, 1)
+ ASN1_SIMPLE(GENERAL_SUBTREE, base, GENERAL_NAME),
+ ASN1_IMP_OPT(GENERAL_SUBTREE, minimum, ASN1_INTEGER, 0),
+ ASN1_IMP_OPT(GENERAL_SUBTREE, maximum, ASN1_INTEGER, 1)
} ASN1_SEQUENCE_END(GENERAL_SUBTREE)
ASN1_SEQUENCE(NAME_CONSTRAINTS) = {
- ASN1_IMP_SEQUENCE_OF_OPT(NAME_CONSTRAINTS, permittedSubtrees,
- GENERAL_SUBTREE, 0),
- ASN1_IMP_SEQUENCE_OF_OPT(NAME_CONSTRAINTS, excludedSubtrees,
- GENERAL_SUBTREE, 1),
+ ASN1_IMP_SEQUENCE_OF_OPT(NAME_CONSTRAINTS, permittedSubtrees,
+ GENERAL_SUBTREE, 0),
+ ASN1_IMP_SEQUENCE_OF_OPT(NAME_CONSTRAINTS, excludedSubtrees,
+ GENERAL_SUBTREE, 1),
} ASN1_SEQUENCE_END(NAME_CONSTRAINTS)
-
IMPLEMENT_ASN1_ALLOC_FUNCTIONS(GENERAL_SUBTREE)
IMPLEMENT_ASN1_ALLOC_FUNCTIONS(NAME_CONSTRAINTS)
-
#define IA5_OFFSET_LEN(ia5base, offset) \
((ia5base)->length - ((unsigned char *)(offset) - (ia5base)->data))
/* Like memchr but for ASN1_IA5STRING. Additionally you can specify the
* starting point to search from
*/
-# define ia5memchr(str, start, c) memchr(start, c, IA5_OFFSET_LEN(str, start))
+#define ia5memchr(str, start, c) memchr(start, c, IA5_OFFSET_LEN(str, start))
/* Like memrrchr but for ASN1_IA5STRING */
static char *ia5memrchr(ASN1_IA5STRING *str, int c)
{
int i;
- for (i = str->length; i > 0 && str->data[i - 1] != c; i--);
+ for (i = str->length; i > 0 && str->data[i - 1] != c; i--)
+ ;
if (i == 0)
return NULL;
@@ -147,7 +146,7 @@ static int ia5ncasecmp(const char *s1, const char *s2, size_t n)
}
static void *v2i_NAME_CONSTRAINTS(const X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
+ X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
{
int i;
CONF_VALUE tval, *val;
@@ -193,7 +192,7 @@ static void *v2i_NAME_CONSTRAINTS(const X509V3_EXT_METHOD *method,
return ncons;
- err:
+err:
NAME_CONSTRAINTS_free(ncons);
GENERAL_SUBTREE_free(sub);
@@ -201,21 +200,21 @@ static void *v2i_NAME_CONSTRAINTS(const X509V3_EXT_METHOD *method,
}
static int i2r_NAME_CONSTRAINTS(const X509V3_EXT_METHOD *method, void *a,
- BIO *bp, int ind)
+ BIO *bp, int ind)
{
NAME_CONSTRAINTS *ncons = a;
do_i2r_name_constraints(method, ncons->permittedSubtrees,
- bp, ind, "Permitted");
+ bp, ind, "Permitted");
if (ncons->permittedSubtrees && ncons->excludedSubtrees)
BIO_puts(bp, "\n");
do_i2r_name_constraints(method, ncons->excludedSubtrees,
- bp, ind, "Excluded");
+ bp, ind, "Excluded");
return 1;
}
static int do_i2r_name_constraints(const X509V3_EXT_METHOD *method,
- STACK_OF(GENERAL_SUBTREE) *trees,
- BIO *bp, int ind, const char *name)
+ STACK_OF(GENERAL_SUBTREE) *trees,
+ BIO *bp, int ind, const char *name)
{
GENERAL_SUBTREE *tree;
int i;
@@ -237,7 +236,8 @@ static int do_i2r_name_constraints(const X509V3_EXT_METHOD *method,
static int print_nc_ipadd(BIO *bp, ASN1_OCTET_STRING *ip)
{
/* ip->length should be 8 or 32 and len1 == len2 == 4 or len1 == len2 == 16 */
- int len1 = ip->length >= 16 ? 16 : ip->length >= 4 ? 4 : ip->length;
+ int len1 = ip->length >= 16 ? 16 : ip->length >= 4 ? 4
+ : ip->length;
int len2 = ip->length - len1;
char *ip1 = ossl_ipaddr_to_asc(ip->data, len1);
char *ip2 = ossl_ipaddr_to_asc(ip->data + len1, len2);
@@ -289,10 +289,10 @@ int NAME_CONSTRAINTS_check(X509 *x, NAME_CONSTRAINTS *nc)
* constraints causing a computationally expensive name constraints check.
*/
if (!add_lengths(&name_count, X509_NAME_entry_count(nm),
- sk_GENERAL_NAME_num(x->altname))
+ sk_GENERAL_NAME_num(x->altname))
|| !add_lengths(&constraint_count,
- sk_GENERAL_SUBTREE_num(nc->permittedSubtrees),
- sk_GENERAL_SUBTREE_num(nc->excludedSubtrees))
+ sk_GENERAL_SUBTREE_num(nc->permittedSubtrees),
+ sk_GENERAL_SUBTREE_num(nc->excludedSubtrees))
|| (name_count > 0 && constraint_count > NAME_CHECK_MAX / name_count))
return X509_V_ERR_UNSPECIFIED;
@@ -326,7 +326,6 @@ int NAME_CONSTRAINTS_check(X509 *x, NAME_CONSTRAINTS *nc)
if (r != X509_V_OK)
return r;
}
-
}
for (i = 0; i < sk_GENERAL_NAME_num(x->altname); i++) {
@@ -337,7 +336,6 @@ int NAME_CONSTRAINTS_check(X509 *x, NAME_CONSTRAINTS *nc)
}
return X509_V_OK;
-
}
static int cn2dnsid(ASN1_STRING *cn, unsigned char **dnsid, size_t *idlen)
@@ -482,7 +480,8 @@ int NAME_CONSTRAINTS_check_CN(X509 *x, NAME_CONSTRAINTS *nc)
* Return nonzero if the GeneralSubtree has valid 'minimum' field
* (must be absent or 0) and valid 'maximum' field (must be absent).
*/
-static int nc_minmax_valid(GENERAL_SUBTREE *sub) {
+static int nc_minmax_valid(GENERAL_SUBTREE *sub)
+{
BIGNUM *bn = NULL;
int ok = 1;
@@ -510,8 +509,7 @@ static int nc_match(GENERAL_NAME *gen, NAME_CONSTRAINTS *nc)
* the otherName field may contain EAI email address treated specially
* according to RFC 8398, section 6
*/
- if (effective_type == GEN_OTHERNAME &&
- (OBJ_obj2nid(gen->d.otherName->type_id) == NID_id_on_SmtpUTF8Mailbox)) {
+ if (effective_type == GEN_OTHERNAME && (OBJ_obj2nid(gen->d.otherName->type_id) == NID_id_on_SmtpUTF8Mailbox)) {
effective_type = GEN_EMAIL;
}
@@ -523,9 +521,7 @@ static int nc_match(GENERAL_NAME *gen, NAME_CONSTRAINTS *nc)
for (i = 0; i < sk_GENERAL_SUBTREE_num(nc->permittedSubtrees); i++) {
sub = sk_GENERAL_SUBTREE_value(nc->permittedSubtrees, i);
if (effective_type != sub->base->type
- || (effective_type == GEN_OTHERNAME &&
- OBJ_cmp(gen->d.otherName->type_id,
- sub->base->d.otherName->type_id) != 0))
+ || (effective_type == GEN_OTHERNAME && OBJ_cmp(gen->d.otherName->type_id, sub->base->d.otherName->type_id) != 0))
continue;
if (!nc_minmax_valid(sub))
return X509_V_ERR_SUBTREE_MINMAX;
@@ -549,9 +545,7 @@ static int nc_match(GENERAL_NAME *gen, NAME_CONSTRAINTS *nc)
for (i = 0; i < sk_GENERAL_SUBTREE_num(nc->excludedSubtrees); i++) {
sub = sk_GENERAL_SUBTREE_value(nc->excludedSubtrees, i);
if (effective_type != sub->base->type
- || (effective_type == GEN_OTHERNAME &&
- OBJ_cmp(gen->d.otherName->type_id,
- sub->base->d.otherName->type_id) != 0))
+ || (effective_type == GEN_OTHERNAME && OBJ_cmp(gen->d.otherName->type_id, sub->base->d.otherName->type_id) != 0))
continue;
if (!nc_minmax_valid(sub))
return X509_V_ERR_SUBTREE_MINMAX;
@@ -561,15 +555,13 @@ static int nc_match(GENERAL_NAME *gen, NAME_CONSTRAINTS *nc)
return X509_V_ERR_EXCLUDED_VIOLATION;
else if (r != X509_V_ERR_PERMITTED_VIOLATION)
return r;
-
}
return X509_V_OK;
-
}
static int nc_match_single(int effective_type, GENERAL_NAME *gen,
- GENERAL_NAME *base)
+ GENERAL_NAME *base)
{
switch (gen->type) {
case GEN_OTHERNAME:
@@ -596,7 +588,7 @@ static int nc_match_single(int effective_type, GENERAL_NAME *gen,
case GEN_URI:
return nc_uri(gen->d.uniformResourceIdentifier,
- base->d.uniformResourceIdentifier);
+ base->d.uniformResourceIdentifier);
case GEN_IPADD:
return nc_ip(gen->d.iPAddress, base->d.iPAddress);
@@ -604,7 +596,6 @@ static int nc_match_single(int effective_type, GENERAL_NAME *gen,
default:
return X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE;
}
-
}
/*
@@ -653,7 +644,6 @@ static int nc_dns(ASN1_IA5STRING *dns, ASN1_IA5STRING *base)
return X509_V_ERR_PERMITTED_VIOLATION;
return X509_V_OK;
-
}
/*
@@ -723,12 +713,12 @@ static int nc_email_eai(ASN1_TYPE *emltype, ASN1_IA5STRING *base)
emlptr = emlat + 1;
emlhostlen = IA5_OFFSET_LEN(eml, emlptr);
if (emlhostlen != strlen(ulabel)
- || ia5ncasecmp(ulabel, emlptr, emlhostlen) != 0) {
+ || ia5ncasecmp(ulabel, emlptr, emlhostlen) != 0) {
ret = X509_V_ERR_PERMITTED_VIOLATION;
goto end;
}
- end:
+end:
OPENSSL_free(baseptr);
return ret;
}
@@ -759,8 +749,7 @@ static int nc_email(ASN1_IA5STRING *eml, ASN1_IA5STRING *base)
if (baseat != baseptr) {
if ((baseat - baseptr) != (emlat - emlptr))
return X509_V_ERR_PERMITTED_VIOLATION;
- if (memchr(baseptr, 0, baseat - baseptr) ||
- memchr(emlptr, 0, emlat - emlptr))
+ if (memchr(baseptr, 0, baseat - baseptr) || memchr(emlptr, 0, emlat - emlptr))
return X509_V_ERR_UNSUPPORTED_NAME_SYNTAX;
/* Case sensitive match of local part */
if (strncmp(baseptr, emlptr, emlat - emlptr))
@@ -777,7 +766,6 @@ static int nc_email(ASN1_IA5STRING *eml, ASN1_IA5STRING *base)
return X509_V_ERR_PERMITTED_VIOLATION;
return X509_V_OK;
-
}
static int nc_uri(ASN1_IA5STRING *uri, ASN1_IA5STRING *base)
@@ -800,7 +788,7 @@ static int nc_uri(ASN1_IA5STRING *uri, ASN1_IA5STRING *base)
/* Make sure the scheme is there */
if (scheme == NULL || *scheme == '\0') {
ERR_raise_data(ERR_LIB_X509V3, X509_V_ERR_UNSUPPORTED_NAME_SYNTAX,
- "x509: missing scheme in URI: %s\n", uri_copy);
+ "x509: missing scheme in URI: %s\n", uri_copy);
OPENSSL_free(uri_copy);
ret = X509_V_ERR_UNSUPPORTED_NAME_SYNTAX;
goto end;
@@ -834,7 +822,6 @@ static int nc_uri(ASN1_IA5STRING *uri, ASN1_IA5STRING *base)
end:
OPENSSL_free(host);
return ret;
-
}
static int nc_ip(ASN1_OCTET_STRING *ip, ASN1_OCTET_STRING *base)
@@ -865,5 +852,4 @@ static int nc_ip(ASN1_OCTET_STRING *ip, ASN1_OCTET_STRING *base)
return X509_V_ERR_PERMITTED_VIOLATION;
return X509_V_OK;
-
}
diff --git a/crypto/x509/v3_no_ass.c b/crypto/x509/v3_no_ass.c
index 873e20a751..ee012c38e2 100644
--- a/crypto/x509/v3_no_ass.c
+++ b/crypto/x509/v3_no_ass.c
@@ -15,14 +15,14 @@
#include "ext_dat.h"
static int i2r_NO_ASSERTION(X509V3_EXT_METHOD *method,
- void *su, BIO *out,
- int indent)
+ void *su, BIO *out,
+ int indent)
{
return 1;
}
static void *r2i_NO_ASSERTION(X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx, const char *value)
+ X509V3_CTX *ctx, const char *value)
{
return ASN1_NULL_new();
}
diff --git a/crypto/x509/v3_no_rev_avail.c b/crypto/x509/v3_no_rev_avail.c
index 849feda5ec..ab84b3a27d 100644
--- a/crypto/x509/v3_no_rev_avail.c
+++ b/crypto/x509/v3_no_rev_avail.c
@@ -15,14 +15,14 @@
#include "ext_dat.h"
static int i2r_NO_REV_AVAIL(X509V3_EXT_METHOD *method,
- void *su, BIO *out,
- int indent)
+ void *su, BIO *out,
+ int indent)
{
return 1;
}
static void *r2i_NO_REV_AVAIL(X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx, const char *value)
+ X509V3_CTX *ctx, const char *value)
{
return ASN1_NULL_new();
}
diff --git a/crypto/x509/v3_pci.c b/crypto/x509/v3_pci.c
index cadc1fa145..7d0a5faf4b 100644
--- a/crypto/x509/v3_pci.c
+++ b/crypto/x509/v3_pci.c
@@ -50,22 +50,29 @@
#include "ext_dat.h"
static int i2r_pci(X509V3_EXT_METHOD *method, PROXY_CERT_INFO_EXTENSION *ext,
- BIO *out, int indent);
+ BIO *out, int indent);
static PROXY_CERT_INFO_EXTENSION *r2i_pci(X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx, char *str);
+ X509V3_CTX *ctx, char *str);
const X509V3_EXT_METHOD ossl_v3_pci = {
- NID_proxyCertInfo, 0, ASN1_ITEM_ref(PROXY_CERT_INFO_EXTENSION),
- 0, 0, 0, 0,
- 0, 0,
- NULL, NULL,
+ NID_proxyCertInfo,
+ 0,
+ ASN1_ITEM_ref(PROXY_CERT_INFO_EXTENSION),
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ NULL,
+ NULL,
(X509V3_EXT_I2R)i2r_pci,
(X509V3_EXT_R2I)r2i_pci,
NULL,
};
static int i2r_pci(X509V3_EXT_METHOD *method, PROXY_CERT_INFO_EXTENSION *pci,
- BIO *out, int indent)
+ BIO *out, int indent)
{
BIO_printf(out, "%*sPath Length Constraint: ", indent, "");
if (pci->pcPathLengthConstraint)
@@ -77,14 +84,14 @@ static int i2r_pci(X509V3_EXT_METHOD *method, PROXY_CERT_INFO_EXTENSION *pci,
i2a_ASN1_OBJECT(out, pci->proxyPolicy->policyLanguage);
if (pci->proxyPolicy->policy && pci->proxyPolicy->policy->data)
BIO_printf(out, "\n%*sPolicy Text: %.*s", indent, "",
- pci->proxyPolicy->policy->length,
- pci->proxyPolicy->policy->data);
+ pci->proxyPolicy->policy->length,
+ pci->proxyPolicy->policy->data);
return 1;
}
static int process_pci_value(CONF_VALUE *val,
- ASN1_OBJECT **language, ASN1_INTEGER **pathlen,
- ASN1_OCTET_STRING **policy)
+ ASN1_OBJECT **language, ASN1_INTEGER **pathlen,
+ ASN1_OCTET_STRING **policy)
{
int free_policy = 0;
@@ -102,7 +109,7 @@ static int process_pci_value(CONF_VALUE *val,
} else if (strcmp(val->name, "pathlen") == 0) {
if (*pathlen) {
ERR_raise(ERR_LIB_X509V3,
- X509V3_R_POLICY_PATH_LENGTH_ALREADY_DEFINED);
+ X509V3_R_POLICY_PATH_LENGTH_ALREADY_DEFINED);
X509V3_conf_err(val);
return 0;
}
@@ -126,8 +133,7 @@ static int process_pci_value(CONF_VALUE *val,
free_policy = 1;
}
if (CHECK_AND_SKIP_PREFIX(valp, "hex:")) {
- unsigned char *tmp_data2 =
- OPENSSL_hexstr2buf(valp, &val_len);
+ unsigned char *tmp_data2 = OPENSSL_hexstr2buf(valp, &val_len);
if (!tmp_data2) {
X509V3_conf_err(val);
@@ -135,11 +141,11 @@ static int process_pci_value(CONF_VALUE *val,
}
tmp_data = OPENSSL_realloc((*policy)->data,
- (*policy)->length + val_len + 1);
+ (*policy)->length + val_len + 1);
if (tmp_data) {
(*policy)->data = tmp_data;
memcpy(&(*policy)->data[(*policy)->length],
- tmp_data2, val_len);
+ tmp_data2, val_len);
(*policy)->length += val_len;
(*policy)->data[(*policy)->length] = '\0';
} else {
@@ -165,12 +171,12 @@ static int process_pci_value(CONF_VALUE *val,
goto err;
}
while ((n = BIO_read(b, buf, sizeof(buf))) > 0
- || (n == 0 && BIO_should_retry(b))) {
+ || (n == 0 && BIO_should_retry(b))) {
if (!n)
continue;
tmp_data = OPENSSL_realloc((*policy)->data,
- (*policy)->length + n + 1);
+ (*policy)->length + n + 1);
if (!tmp_data) {
OPENSSL_free((*policy)->data);
@@ -196,11 +202,11 @@ static int process_pci_value(CONF_VALUE *val,
} else if (CHECK_AND_SKIP_PREFIX(valp, "text:")) {
val_len = (int)strlen(valp);
tmp_data = OPENSSL_realloc((*policy)->data,
- (*policy)->length + val_len + 1);
+ (*policy)->length + val_len + 1);
if (tmp_data) {
(*policy)->data = tmp_data;
memcpy(&(*policy)->data[(*policy)->length],
- val->value + 5, val_len);
+ val->value + 5, val_len);
(*policy)->length += val_len;
(*policy)->data[(*policy)->length] = '\0';
} else {
@@ -225,7 +231,7 @@ static int process_pci_value(CONF_VALUE *val,
}
}
return 1;
- err:
+err:
if (free_policy) {
ASN1_OCTET_STRING_free(*policy);
*policy = NULL;
@@ -234,7 +240,7 @@ static int process_pci_value(CONF_VALUE *val,
}
static PROXY_CERT_INFO_EXTENSION *r2i_pci(X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx, char *value)
+ X509V3_CTX *ctx, char *value)
{
PROXY_CERT_INFO_EXTENSION *pci = NULL;
STACK_OF(CONF_VALUE) *vals;
@@ -263,9 +269,8 @@ static PROXY_CERT_INFO_EXTENSION *r2i_pci(X509V3_EXT_METHOD *method,
goto err;
}
for (j = 0; success_p && j < sk_CONF_VALUE_num(sect); j++) {
- success_p =
- process_pci_value(sk_CONF_VALUE_value(sect, j),
- &language, &pathlen, &policy);
+ success_p = process_pci_value(sk_CONF_VALUE_value(sect, j),
+ &language, &pathlen, &policy);
}
X509V3_section_free(ctx, sect);
if (!success_p)
@@ -281,13 +286,13 @@ static PROXY_CERT_INFO_EXTENSION *r2i_pci(X509V3_EXT_METHOD *method,
/* Language is mandatory */
if (!language) {
ERR_raise(ERR_LIB_X509V3,
- X509V3_R_NO_PROXY_CERT_POLICY_LANGUAGE_DEFINED);
+ X509V3_R_NO_PROXY_CERT_POLICY_LANGUAGE_DEFINED);
goto err;
}
i = OBJ_obj2nid(language);
if ((i == NID_Independent || i == NID_id_ppl_inheritAll) && policy) {
ERR_raise(ERR_LIB_X509V3,
- X509V3_R_POLICY_WHEN_PROXY_LANGUAGE_REQUIRES_NO_POLICY);
+ X509V3_R_POLICY_WHEN_PROXY_LANGUAGE_REQUIRES_NO_POLICY);
goto err;
}
@@ -304,7 +309,7 @@ static PROXY_CERT_INFO_EXTENSION *r2i_pci(X509V3_EXT_METHOD *method,
pci->pcPathLengthConstraint = pathlen;
pathlen = NULL;
goto end;
- err:
+err:
ASN1_OBJECT_free(language);
ASN1_INTEGER_free(pathlen);
pathlen = NULL;
@@ -312,7 +317,7 @@ static PROXY_CERT_INFO_EXTENSION *r2i_pci(X509V3_EXT_METHOD *method,
policy = NULL;
PROXY_CERT_INFO_EXTENSION_free(pci);
pci = NULL;
- end:
+end:
sk_CONF_VALUE_pop_free(vals, X509V3_conf_free);
return pci;
}
diff --git a/crypto/x509/v3_pcia.c b/crypto/x509/v3_pcia.c
index 478de610ae..427b263c2e 100644
--- a/crypto/x509/v3_pcia.c
+++ b/crypto/x509/v3_pcia.c
@@ -48,15 +48,15 @@
#include <openssl/x509v3.h>
ASN1_SEQUENCE(PROXY_POLICY) = {
- ASN1_SIMPLE(PROXY_POLICY, policyLanguage, ASN1_OBJECT),
- ASN1_OPT(PROXY_POLICY, policy, ASN1_OCTET_STRING)
+ ASN1_SIMPLE(PROXY_POLICY, policyLanguage, ASN1_OBJECT),
+ ASN1_OPT(PROXY_POLICY, policy, ASN1_OCTET_STRING)
} ASN1_SEQUENCE_END(PROXY_POLICY)
IMPLEMENT_ASN1_FUNCTIONS(PROXY_POLICY)
ASN1_SEQUENCE(PROXY_CERT_INFO_EXTENSION) = {
- ASN1_OPT(PROXY_CERT_INFO_EXTENSION, pcPathLengthConstraint, ASN1_INTEGER),
- ASN1_SIMPLE(PROXY_CERT_INFO_EXTENSION, proxyPolicy, PROXY_POLICY)
+ ASN1_OPT(PROXY_CERT_INFO_EXTENSION, pcPathLengthConstraint, ASN1_INTEGER),
+ ASN1_SIMPLE(PROXY_CERT_INFO_EXTENSION, proxyPolicy, PROXY_POLICY)
} ASN1_SEQUENCE_END(PROXY_CERT_INFO_EXTENSION)
IMPLEMENT_ASN1_FUNCTIONS(PROXY_CERT_INFO_EXTENSION)
diff --git a/crypto/x509/v3_pcons.c b/crypto/x509/v3_pcons.c
index 72c2364b05..e8c3d242d9 100644
--- a/crypto/x509/v3_pcons.c
+++ b/crypto/x509/v3_pcons.c
@@ -16,11 +16,11 @@
#include "ext_dat.h"
static STACK_OF(CONF_VALUE) *i2v_POLICY_CONSTRAINTS(const X509V3_EXT_METHOD
- *method, void *bcons, STACK_OF(CONF_VALUE)
- *extlist);
+ *method,
+ void *bcons, STACK_OF(CONF_VALUE) *extlist);
static void *v2i_POLICY_CONSTRAINTS(const X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx,
- STACK_OF(CONF_VALUE) *values);
+ X509V3_CTX *ctx,
+ STACK_OF(CONF_VALUE) *values);
const X509V3_EXT_METHOD ossl_v3_policy_constraints = {
NID_policy_constraints, 0,
@@ -34,27 +34,27 @@ const X509V3_EXT_METHOD ossl_v3_policy_constraints = {
};
ASN1_SEQUENCE(POLICY_CONSTRAINTS) = {
- ASN1_IMP_OPT(POLICY_CONSTRAINTS, requireExplicitPolicy, ASN1_INTEGER,0),
- ASN1_IMP_OPT(POLICY_CONSTRAINTS, inhibitPolicyMapping, ASN1_INTEGER,1)
+ ASN1_IMP_OPT(POLICY_CONSTRAINTS, requireExplicitPolicy, ASN1_INTEGER, 0),
+ ASN1_IMP_OPT(POLICY_CONSTRAINTS, inhibitPolicyMapping, ASN1_INTEGER, 1)
} ASN1_SEQUENCE_END(POLICY_CONSTRAINTS)
IMPLEMENT_ASN1_ALLOC_FUNCTIONS(POLICY_CONSTRAINTS)
static STACK_OF(CONF_VALUE) *i2v_POLICY_CONSTRAINTS(const X509V3_EXT_METHOD
- *method, void *a, STACK_OF(CONF_VALUE)
- *extlist)
+ *method,
+ void *a, STACK_OF(CONF_VALUE) *extlist)
{
POLICY_CONSTRAINTS *pcons = a;
X509V3_add_value_int("Require Explicit Policy",
- pcons->requireExplicitPolicy, &extlist);
+ pcons->requireExplicitPolicy, &extlist);
X509V3_add_value_int("Inhibit Policy Mapping",
- pcons->inhibitPolicyMapping, &extlist);
+ pcons->inhibitPolicyMapping, &extlist);
return extlist;
}
static void *v2i_POLICY_CONSTRAINTS(const X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx,
- STACK_OF(CONF_VALUE) *values)
+ X509V3_CTX *ctx,
+ STACK_OF(CONF_VALUE) *values)
{
POLICY_CONSTRAINTS *pcons = NULL;
CONF_VALUE *val;
@@ -74,18 +74,18 @@ static void *v2i_POLICY_CONSTRAINTS(const X509V3_EXT_METHOD *method,
goto err;
} else {
ERR_raise_data(ERR_LIB_X509V3, X509V3_R_INVALID_NAME,
- "%s", val->name);
+ "%s", val->name);
goto err;
}
}
if (pcons->inhibitPolicyMapping == NULL
- && pcons->requireExplicitPolicy == NULL) {
+ && pcons->requireExplicitPolicy == NULL) {
ERR_raise(ERR_LIB_X509V3, X509V3_R_ILLEGAL_EMPTY_EXTENSION);
goto err;
}
return pcons;
- err:
+err:
POLICY_CONSTRAINTS_free(pcons);
return NULL;
}
diff --git a/crypto/x509/v3_pku.c b/crypto/x509/v3_pku.c
index 8f7e7d6813..4c3f623703 100644
--- a/crypto/x509/v3_pku.c
+++ b/crypto/x509/v3_pku.c
@@ -15,8 +15,8 @@
#include "ext_dat.h"
static int i2r_PKEY_USAGE_PERIOD(X509V3_EXT_METHOD *method,
- PKEY_USAGE_PERIOD *usage, BIO *out,
- int indent);
+ PKEY_USAGE_PERIOD *usage, BIO *out,
+ int indent);
const X509V3_EXT_METHOD ossl_v3_pkey_usage_period = {
NID_private_key_usage_period, 0, ASN1_ITEM_ref(PKEY_USAGE_PERIOD),
@@ -27,15 +27,15 @@ const X509V3_EXT_METHOD ossl_v3_pkey_usage_period = {
};
ASN1_SEQUENCE(PKEY_USAGE_PERIOD) = {
- ASN1_IMP_OPT(PKEY_USAGE_PERIOD, notBefore, ASN1_GENERALIZEDTIME, 0),
- ASN1_IMP_OPT(PKEY_USAGE_PERIOD, notAfter, ASN1_GENERALIZEDTIME, 1)
+ ASN1_IMP_OPT(PKEY_USAGE_PERIOD, notBefore, ASN1_GENERALIZEDTIME, 0),
+ ASN1_IMP_OPT(PKEY_USAGE_PERIOD, notAfter, ASN1_GENERALIZEDTIME, 1)
} ASN1_SEQUENCE_END(PKEY_USAGE_PERIOD)
IMPLEMENT_ASN1_FUNCTIONS(PKEY_USAGE_PERIOD)
static int i2r_PKEY_USAGE_PERIOD(X509V3_EXT_METHOD *method,
- PKEY_USAGE_PERIOD *usage, BIO *out,
- int indent)
+ PKEY_USAGE_PERIOD *usage, BIO *out,
+ int indent)
{
BIO_printf(out, "%*s", indent, "");
if (usage->notBefore) {
diff --git a/crypto/x509/v3_pmaps.c b/crypto/x509/v3_pmaps.c
index e5d7dddc0a..cd6af2e839 100644
--- a/crypto/x509/v3_pmaps.c
+++ b/crypto/x509/v3_pmaps.c
@@ -15,10 +15,10 @@
#include "ext_dat.h"
static void *v2i_POLICY_MAPPINGS(const X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
+ X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
static STACK_OF(CONF_VALUE) *i2v_POLICY_MAPPINGS(const X509V3_EXT_METHOD
- *method, void *pmps, STACK_OF(CONF_VALUE)
- *extlist);
+ *method,
+ void *pmps, STACK_OF(CONF_VALUE) *extlist);
const X509V3_EXT_METHOD ossl_v3_policy_mappings = {
NID_policy_mappings, 0,
@@ -32,20 +32,19 @@ const X509V3_EXT_METHOD ossl_v3_policy_mappings = {
};
ASN1_SEQUENCE(POLICY_MAPPING) = {
- ASN1_SIMPLE(POLICY_MAPPING, issuerDomainPolicy, ASN1_OBJECT),
- ASN1_SIMPLE(POLICY_MAPPING, subjectDomainPolicy, ASN1_OBJECT)
+ ASN1_SIMPLE(POLICY_MAPPING, issuerDomainPolicy, ASN1_OBJECT),
+ ASN1_SIMPLE(POLICY_MAPPING, subjectDomainPolicy, ASN1_OBJECT)
} ASN1_SEQUENCE_END(POLICY_MAPPING)
-ASN1_ITEM_TEMPLATE(POLICY_MAPPINGS) =
- ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, POLICY_MAPPINGS,
- POLICY_MAPPING)
+ASN1_ITEM_TEMPLATE(POLICY_MAPPINGS) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, POLICY_MAPPINGS,
+ POLICY_MAPPING)
ASN1_ITEM_TEMPLATE_END(POLICY_MAPPINGS)
IMPLEMENT_ASN1_ALLOC_FUNCTIONS(POLICY_MAPPING)
static STACK_OF(CONF_VALUE) *i2v_POLICY_MAPPINGS(const X509V3_EXT_METHOD
- *method, void *a, STACK_OF(CONF_VALUE)
- *ext_list)
+ *method,
+ void *a, STACK_OF(CONF_VALUE) *ext_list)
{
POLICY_MAPPINGS *pmaps = a;
POLICY_MAPPING *pmap;
@@ -63,7 +62,7 @@ static STACK_OF(CONF_VALUE) *i2v_POLICY_MAPPINGS(const X509V3_EXT_METHOD
}
static void *v2i_POLICY_MAPPINGS(const X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
+ X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
{
POLICY_MAPPING *pmap = NULL;
ASN1_OBJECT *obj1 = NULL, *obj2 = NULL;
@@ -81,14 +80,14 @@ static void *v2i_POLICY_MAPPINGS(const X509V3_EXT_METHOD *method,
val = sk_CONF_VALUE_value(nval, i);
if (!val->value || !val->name) {
ERR_raise_data(ERR_LIB_X509V3, X509V3_R_INVALID_OBJECT_IDENTIFIER,
- "%s", val->name);
+ "%s", val->name);
goto err;
}
obj1 = OBJ_txt2obj(val->name, 0);
obj2 = OBJ_txt2obj(val->value, 0);
if (!obj1 || !obj2) {
ERR_raise_data(ERR_LIB_X509V3, X509V3_R_INVALID_OBJECT_IDENTIFIER,
- "%s", val->name);
+ "%s", val->name);
goto err;
}
pmap = POLICY_MAPPING_new();
@@ -102,7 +101,7 @@ static void *v2i_POLICY_MAPPINGS(const X509V3_EXT_METHOD *method,
sk_POLICY_MAPPING_push(pmaps, pmap); /* no failure as it was reserved */
}
return pmaps;
- err:
+err:
ASN1_OBJECT_free(obj1);
ASN1_OBJECT_free(obj2);
sk_POLICY_MAPPING_pop_free(pmaps, POLICY_MAPPING_free);
diff --git a/crypto/x509/v3_prn.c b/crypto/x509/v3_prn.c
index 1e4516a713..088cffed69 100644
--- a/crypto/x509/v3_prn.c
+++ b/crypto/x509/v3_prn.c
@@ -17,12 +17,12 @@
/* Extension printing routines */
static int unknown_ext_print(BIO *out, const unsigned char *ext, int extlen,
- unsigned long flag, int indent, int supported);
+ unsigned long flag, int indent, int supported);
/* Print out a name+value stack */
void X509V3_EXT_val_prn(BIO *out, STACK_OF(CONF_VALUE) *val, int indent,
- int ml)
+ int ml)
{
int i;
CONF_VALUE *nval;
@@ -38,8 +38,7 @@ void X509V3_EXT_val_prn(BIO *out, STACK_OF(CONF_VALUE) *val, int indent,
if (i > 0)
BIO_printf(out, "\n");
BIO_printf(out, "%*s", indent, "");
- }
- else if (i > 0)
+ } else if (i > 0)
BIO_printf(out, ", ");
nval = sk_CONF_VALUE_value(val, i);
if (!nval->name)
@@ -68,7 +67,7 @@ void X509V3_EXT_val_prn(BIO *out, STACK_OF(CONF_VALUE) *val, int indent,
/* Main routine: print out a general extension */
int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, unsigned long flag,
- int indent)
+ int indent)
{
void *ext_str = NULL;
char *value = NULL;
@@ -119,14 +118,14 @@ int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, unsigned long flag,
goto err;
}
X509V3_EXT_val_prn(out, nval, indent,
- method->ext_flags & X509V3_EXT_MULTILINE);
+ method->ext_flags & X509V3_EXT_MULTILINE);
} else if (method->i2r) {
if (!method->i2r(method, ext_str, out, indent))
ok = 0;
} else
ok = 0;
- err:
+err:
sk_CONF_VALUE_pop_free(nval, X509V3_conf_free);
OPENSSL_free(value);
if (method->it)
@@ -137,8 +136,8 @@ int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, unsigned long flag,
}
int X509V3_extensions_print(BIO *bp, const char *title,
- const STACK_OF(X509_EXTENSION) *exts,
- unsigned long flag, int indent)
+ const STACK_OF(X509_EXTENSION) *exts,
+ unsigned long flag, int indent)
{
int i, j;
@@ -157,8 +156,8 @@ int X509V3_extensions_print(BIO *bp, const char *title,
ex = sk_X509_EXTENSION_value(exts, i);
obj = X509_EXTENSION_get_object(ex);
if ((flag & X509_FLAG_EXTENSIONS_ONLY_KID) != 0
- && OBJ_obj2nid(obj) != NID_subject_key_identifier
- && OBJ_obj2nid(obj) != NID_authority_key_identifier)
+ && OBJ_obj2nid(obj) != NID_subject_key_identifier
+ && OBJ_obj2nid(obj) != NID_authority_key_identifier)
continue;
if (indent && BIO_printf(bp, "%*s", indent, "") <= 0)
return 0;
@@ -177,7 +176,7 @@ int X509V3_extensions_print(BIO *bp, const char *title,
}
static int unknown_ext_print(BIO *out, const unsigned char *ext, int extlen,
- unsigned long flag, int indent, int supported)
+ unsigned long flag, int indent, int supported)
{
switch (flag & X509V3_EXT_UNKNOWN_MASK) {
diff --git a/crypto/x509/v3_purp.c b/crypto/x509/v3_purp.c
index 518b525866..0955a7aed5 100644
--- a/crypto/x509/v3_purp.c
+++ b/crypto/x509/v3_purp.c
@@ -18,55 +18,55 @@
static int check_ssl_ca(const X509 *x);
static int check_purpose_ssl_client(const X509_PURPOSE *xp, const X509 *x,
- int non_leaf);
+ int non_leaf);
static int check_purpose_ssl_server(const X509_PURPOSE *xp, const X509 *x,
- int non_leaf);
+ int non_leaf);
static int check_purpose_ns_ssl_server(const X509_PURPOSE *xp, const X509 *x,
- int non_leaf);
+ int non_leaf);
static int purpose_smime(const X509 *x, int non_leaf);
static int check_purpose_smime_sign(const X509_PURPOSE *xp, const X509 *x,
- int non_leaf);
+ int non_leaf);
static int check_purpose_smime_encrypt(const X509_PURPOSE *xp, const X509 *x,
- int non_leaf);
+ int non_leaf);
static int check_purpose_crl_sign(const X509_PURPOSE *xp, const X509 *x,
- int non_leaf);
+ int non_leaf);
static int check_purpose_timestamp_sign(const X509_PURPOSE *xp, const X509 *x,
- int non_leaf);
+ int non_leaf);
static int check_purpose_code_sign(const X509_PURPOSE *xp, const X509 *x,
- int non_leaf);
+ int non_leaf);
static int no_check_purpose(const X509_PURPOSE *xp, const X509 *x,
- int non_leaf);
+ int non_leaf);
static int check_purpose_ocsp_helper(const X509_PURPOSE *xp, const X509 *x,
- int non_leaf);
+ int non_leaf);
static int xp_cmp(const X509_PURPOSE *const *a, const X509_PURPOSE *const *b);
static void xptable_free(X509_PURPOSE *p);
/* note that the id must be unique and for the standard entries == idx + 1 */
static X509_PURPOSE xstandard[] = {
- {X509_PURPOSE_SSL_CLIENT, X509_TRUST_SSL_CLIENT, 0,
- check_purpose_ssl_client, "SSL client", "sslclient", NULL},
- {X509_PURPOSE_SSL_SERVER, X509_TRUST_SSL_SERVER, 0,
- check_purpose_ssl_server, "SSL server", "sslserver", NULL},
- {X509_PURPOSE_NS_SSL_SERVER, X509_TRUST_SSL_SERVER, 0,
- check_purpose_ns_ssl_server, "Netscape SSL server", "nssslserver", NULL},
- {X509_PURPOSE_SMIME_SIGN, X509_TRUST_EMAIL, 0, check_purpose_smime_sign,
- "S/MIME signing", "smimesign", NULL},
- {X509_PURPOSE_SMIME_ENCRYPT, X509_TRUST_EMAIL, 0,
- check_purpose_smime_encrypt, "S/MIME encryption", "smimeencrypt", NULL},
- {X509_PURPOSE_CRL_SIGN, X509_TRUST_COMPAT, 0, check_purpose_crl_sign,
- "CRL signing", "crlsign", NULL},
- {X509_PURPOSE_ANY, X509_TRUST_DEFAULT, 0, no_check_purpose,
- "Any Purpose", "any",
- NULL},
- {X509_PURPOSE_OCSP_HELPER, X509_TRUST_COMPAT, 0, check_purpose_ocsp_helper,
- "OCSP helper", "ocsphelper", NULL},
- {X509_PURPOSE_TIMESTAMP_SIGN, X509_TRUST_TSA, 0,
- check_purpose_timestamp_sign, "Time Stamp signing", "timestampsign",
- NULL},
- {X509_PURPOSE_CODE_SIGN, X509_TRUST_OBJECT_SIGN, 0,
- check_purpose_code_sign, "Code signing", "codesign",
- NULL},
+ { X509_PURPOSE_SSL_CLIENT, X509_TRUST_SSL_CLIENT, 0,
+ check_purpose_ssl_client, "SSL client", "sslclient", NULL },
+ { X509_PURPOSE_SSL_SERVER, X509_TRUST_SSL_SERVER, 0,
+ check_purpose_ssl_server, "SSL server", "sslserver", NULL },
+ { X509_PURPOSE_NS_SSL_SERVER, X509_TRUST_SSL_SERVER, 0,
+ check_purpose_ns_ssl_server, "Netscape SSL server", "nssslserver", NULL },
+ { X509_PURPOSE_SMIME_SIGN, X509_TRUST_EMAIL, 0, check_purpose_smime_sign,
+ "S/MIME signing", "smimesign", NULL },
+ { X509_PURPOSE_SMIME_ENCRYPT, X509_TRUST_EMAIL, 0,
+ check_purpose_smime_encrypt, "S/MIME encryption", "smimeencrypt", NULL },
+ { X509_PURPOSE_CRL_SIGN, X509_TRUST_COMPAT, 0, check_purpose_crl_sign,
+ "CRL signing", "crlsign", NULL },
+ { X509_PURPOSE_ANY, X509_TRUST_DEFAULT, 0, no_check_purpose,
+ "Any Purpose", "any",
+ NULL },
+ { X509_PURPOSE_OCSP_HELPER, X509_TRUST_COMPAT, 0, check_purpose_ocsp_helper,
+ "OCSP helper", "ocsphelper", NULL },
+ { X509_PURPOSE_TIMESTAMP_SIGN, X509_TRUST_TSA, 0,
+ check_purpose_timestamp_sign, "Time Stamp signing", "timestampsign",
+ NULL },
+ { X509_PURPOSE_CODE_SIGN, X509_TRUST_OBJECT_SIGN, 0,
+ check_purpose_code_sign, "Code signing", "codesign",
+ NULL },
};
#define X509_PURPOSE_COUNT OSSL_NELEM(xstandard)
@@ -174,8 +174,8 @@ int X509_PURPOSE_get_by_id(int purpose)
* May also be used to modify existing entry, including changing its id.
*/
int X509_PURPOSE_add(int id, int trust, int flags,
- int (*ck) (const X509_PURPOSE *, const X509 *, int),
- const char *name, const char *sname, void *arg)
+ int (*ck)(const X509_PURPOSE *, const X509 *, int),
+ const char *name, const char *sname, void *arg)
{
int old_id = 0;
int idx;
@@ -250,7 +250,7 @@ int X509_PURPOSE_add(int id, int trust, int flags,
(void)sk_X509_PURPOSE_set(xptable, idx, ptmp);
}
return 1;
- err:
+err:
if (idx == -1) {
OPENSSL_free(ptmp->name);
OPENSSL_free(ptmp->sname);
@@ -317,22 +317,22 @@ int X509_supported_extension(X509_EXTENSION *ex)
*/
static const int supported_nids[] = {
NID_netscape_cert_type, /* 71 */
- NID_key_usage, /* 83 */
- NID_subject_alt_name, /* 85 */
- NID_basic_constraints, /* 87 */
+ NID_key_usage, /* 83 */
+ NID_subject_alt_name, /* 85 */
+ NID_basic_constraints, /* 87 */
NID_certificate_policies, /* 89 */
NID_crl_distribution_points, /* 103 */
- NID_ext_key_usage, /* 126 */
+ NID_ext_key_usage, /* 126 */
#ifndef OPENSSL_NO_RFC3779
- NID_sbgp_ipAddrBlock, /* 290 */
+ NID_sbgp_ipAddrBlock, /* 290 */
NID_sbgp_autonomousSysNum, /* 291 */
#endif
NID_id_pkix_OCSP_noCheck, /* 369 */
NID_policy_constraints, /* 401 */
- NID_proxyCertInfo, /* 663 */
- NID_name_constraints, /* 666 */
- NID_policy_mappings, /* 747 */
- NID_inhibit_any_policy /* 748 */
+ NID_proxyCertInfo, /* 663 */
+ NID_name_constraints, /* 666 */
+ NID_policy_mappings, /* 747 */
+ NID_inhibit_any_policy /* 748 */
};
int ex_nid = OBJ_obj2nid(X509_EXTENSION_get_object(ex));
@@ -413,7 +413,8 @@ static int check_sig_alg_match(const EVP_PKEY *issuer_key, const X509 *subject)
if (issuer_key == NULL)
return X509_V_ERR_NO_ISSUER_PUBLIC_KEY;
if (OBJ_find_sigid_algs(OBJ_obj2nid(subject->cert_info.signature.algorithm),
- NULL, &subj_sig_nid) == 0)
+ NULL, &subj_sig_nid)
+ == 0)
return X509_V_ERR_UNSUPPORTED_SIGNATURE_ALGORITHM;
if (EVP_PKEY_is_a(issuer_key, OBJ_nid2sn(subj_sig_nid))
|| (EVP_PKEY_is_a(issuer_key, "RSA") && subj_sig_nid == NID_rsassaPss))
@@ -597,8 +598,8 @@ int ossl_x509v3_cache_extensions(X509 *x)
if (X509_NAME_cmp(X509_get_subject_name(x), X509_get_issuer_name(x)) == 0) {
x->ex_flags |= EXFLAG_SI; /* Cert is self-issued */
if (X509_check_akid(x, x->akid) == X509_V_OK /* SKID matches AKID */
- /* .. and the signature alg matches the PUBKEY alg: */
- && check_sig_alg_match(X509_get0_pubkey(x), x) == X509_V_OK)
+ /* .. and the signature alg matches the PUBKEY alg: */
+ && check_sig_alg_match(X509_get0_pubkey(x), x) == X509_V_OK)
x->ex_flags |= EXFLAG_SS; /* indicate self-signed */
/* This is very related to ossl_x509_likely_issued(x, x) == X509_V_OK */
}
@@ -708,7 +709,7 @@ static int check_ca(const X509 *x)
return 4;
/* Older certificates could have Netscape-specific CA types */
else if ((x->ex_flags & EXFLAG_NSCERT) != 0
- && (x->ex_nscert & NS_ANY_CA) != 0)
+ && (x->ex_nscert & NS_ANY_CA) != 0)
return 5;
/* Can this still be regarded a CA certificate? I doubt it. */
return 0;
@@ -749,7 +750,7 @@ static int check_ssl_ca(const X509 *x)
}
static int check_purpose_ssl_client(const X509_PURPOSE *xp, const X509 *x,
- int non_leaf)
+ int non_leaf)
{
if (xku_reject(x, XKU_SSL_CLIENT))
return 0;
@@ -773,7 +774,7 @@ static int check_purpose_ssl_client(const X509_PURPOSE *xp, const X509 *x,
KU_DIGITAL_SIGNATURE | KU_KEY_ENCIPHERMENT | KU_KEY_AGREEMENT
static int check_purpose_ssl_server(const X509_PURPOSE *xp, const X509 *x,
- int non_leaf)
+ int non_leaf)
{
if (xku_reject(x, XKU_SSL_SERVER | XKU_SGC))
return 0;
@@ -786,11 +787,10 @@ static int check_purpose_ssl_server(const X509_PURPOSE *xp, const X509 *x,
return 0;
return 1;
-
}
static int check_purpose_ns_ssl_server(const X509_PURPOSE *xp, const X509 *x,
- int non_leaf)
+ int non_leaf)
{
int ret = check_purpose_ssl_server(xp, x, non_leaf);
@@ -826,7 +826,7 @@ static int purpose_smime(const X509 *x, int non_leaf)
}
static int check_purpose_smime_sign(const X509_PURPOSE *xp, const X509 *x,
- int non_leaf)
+ int non_leaf)
{
int ret = purpose_smime(x, non_leaf);
@@ -836,7 +836,7 @@ static int check_purpose_smime_sign(const X509_PURPOSE *xp, const X509 *x,
}
static int check_purpose_smime_encrypt(const X509_PURPOSE *xp, const X509 *x,
- int non_leaf)
+ int non_leaf)
{
int ret = purpose_smime(x, non_leaf);
@@ -846,7 +846,7 @@ static int check_purpose_smime_encrypt(const X509_PURPOSE *xp, const X509 *x,
}
static int check_purpose_crl_sign(const X509_PURPOSE *xp, const X509 *x,
- int non_leaf)
+ int non_leaf)
{
if (non_leaf) {
int ca_ret = check_ca(x);
@@ -861,7 +861,7 @@ static int check_purpose_crl_sign(const X509_PURPOSE *xp, const X509 *x,
* is valid. Additional checks must be made on the chain.
*/
static int check_purpose_ocsp_helper(const X509_PURPOSE *xp, const X509 *x,
- int non_leaf)
+ int non_leaf)
{
/*
* Must be a valid CA. Should we really support the "I don't know" value
@@ -874,7 +874,7 @@ static int check_purpose_ocsp_helper(const X509_PURPOSE *xp, const X509 *x,
}
static int check_purpose_timestamp_sign(const X509_PURPOSE *xp, const X509 *x,
- int non_leaf)
+ int non_leaf)
{
int i_ext;
@@ -900,8 +900,7 @@ static int check_purpose_timestamp_sign(const X509_PURPOSE *xp, const X509 *x,
* be rejected).
*/
if ((x->ex_flags & EXFLAG_KUSAGE) != 0
- && ((x->ex_kusage & ~(KU_NON_REPUDIATION | KU_DIGITAL_SIGNATURE)) ||
- !(x->ex_kusage & (KU_NON_REPUDIATION | KU_DIGITAL_SIGNATURE))))
+ && ((x->ex_kusage & ~(KU_NON_REPUDIATION | KU_DIGITAL_SIGNATURE)) || !(x->ex_kusage & (KU_NON_REPUDIATION | KU_DIGITAL_SIGNATURE))))
return 0;
/* Only timestamp key usage is permitted and it's required. */
@@ -911,13 +910,13 @@ static int check_purpose_timestamp_sign(const X509_PURPOSE *xp, const X509 *x,
/* Extended Key Usage MUST be critical */
i_ext = X509_get_ext_by_NID(x, NID_ext_key_usage, -1);
if (i_ext >= 0
- && !X509_EXTENSION_get_critical(X509_get_ext((X509 *)x, i_ext)))
+ && !X509_EXTENSION_get_critical(X509_get_ext((X509 *)x, i_ext)))
return 0;
return 1;
}
static int check_purpose_code_sign(const X509_PURPOSE *xp, const X509 *x,
- int non_leaf)
+ int non_leaf)
{
int i_ext;
@@ -967,11 +966,10 @@ static int check_purpose_code_sign(const X509_PURPOSE *xp, const X509 *x,
return 0;
return 1;
-
}
static int no_check_purpose(const X509_PURPOSE *xp, const X509 *x,
- int non_leaf)
+ int non_leaf)
{
return 1;
}
@@ -1004,12 +1002,13 @@ int ossl_x509_likely_issued(X509 *issuer, X509 *subject)
int ret;
if (X509_NAME_cmp(X509_get_subject_name(issuer),
- X509_get_issuer_name(subject)) != 0)
+ X509_get_issuer_name(subject))
+ != 0)
return X509_V_ERR_SUBJECT_ISSUER_MISMATCH;
/* set issuer->skid and subject->akid */
if (!ossl_x509v3_cache_extensions(issuer)
- || !ossl_x509v3_cache_extensions(subject))
+ || !ossl_x509v3_cache_extensions(subject))
return X509_V_ERR_UNSPECIFIED;
ret = X509_check_akid(issuer, subject->akid);
@@ -1044,12 +1043,10 @@ int X509_check_akid(const X509 *issuer, const AUTHORITY_KEYID *akid)
return X509_V_OK;
/* Check key ids (if present) */
- if (akid->keyid && issuer->skid &&
- ASN1_OCTET_STRING_cmp(akid->keyid, issuer->skid))
+ if (akid->keyid && issuer->skid && ASN1_OCTET_STRING_cmp(akid->keyid, issuer->skid))
return X509_V_ERR_AKID_SKID_MISMATCH;
/* Check serial number */
- if (akid->serial &&
- ASN1_INTEGER_cmp(X509_get0_serialNumber(issuer), akid->serial))
+ if (akid->serial && ASN1_INTEGER_cmp(X509_get0_serialNumber(issuer), akid->serial))
return X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH;
/* Check issuer name */
if (akid->issuer) {
@@ -1135,7 +1132,7 @@ long X509_get_pathlen(X509 *x)
{
/* Called for side effect of caching extensions */
if (X509_check_purpose(x, -1, 0) != 1
- || (x->ex_flags & EXFLAG_BCONS) == 0)
+ || (x->ex_flags & EXFLAG_BCONS) == 0)
return -1;
return x->ex_pathlen;
}
@@ -1144,7 +1141,7 @@ long X509_get_proxy_pathlen(X509 *x)
{
/* Called for side effect of caching extensions */
if (X509_check_purpose(x, -1, 0) != 1
- || (x->ex_flags & EXFLAG_PROXY) == 0)
+ || (x->ex_flags & EXFLAG_PROXY) == 0)
return -1;
return x->ex_pcpathlen;
}
diff --git a/crypto/x509/v3_rolespec.c b/crypto/x509/v3_rolespec.c
index 57111b1f0f..bffaa71706 100644
--- a/crypto/x509/v3_rolespec.c
+++ b/crypto/x509/v3_rolespec.c
@@ -21,16 +21,15 @@ ASN1_SEQUENCE(OSSL_ROLE_SPEC_CERT_ID) = {
IMPLEMENT_ASN1_FUNCTIONS(OSSL_ROLE_SPEC_CERT_ID)
-ASN1_ITEM_TEMPLATE(OSSL_ROLE_SPEC_CERT_ID_SYNTAX) =
- ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF,
- 0, OSSL_ROLE_SPEC_CERT_ID_SYNTAX, OSSL_ROLE_SPEC_CERT_ID)
+ASN1_ITEM_TEMPLATE(OSSL_ROLE_SPEC_CERT_ID_SYNTAX) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF,
+ 0, OSSL_ROLE_SPEC_CERT_ID_SYNTAX, OSSL_ROLE_SPEC_CERT_ID)
ASN1_ITEM_TEMPLATE_END(OSSL_ROLE_SPEC_CERT_ID_SYNTAX)
IMPLEMENT_ASN1_FUNCTIONS(OSSL_ROLE_SPEC_CERT_ID_SYNTAX)
static int i2r_OSSL_ROLE_SPEC_CERT_ID(X509V3_EXT_METHOD *method,
- OSSL_ROLE_SPEC_CERT_ID *rscid,
- BIO *out, int indent)
+ OSSL_ROLE_SPEC_CERT_ID *rscid,
+ BIO *out, int indent)
{
if (BIO_printf(out, "%*sRole Name: ", indent, "") <= 0)
return 0;
@@ -62,8 +61,8 @@ static int i2r_OSSL_ROLE_SPEC_CERT_ID(X509V3_EXT_METHOD *method,
}
static int i2r_OSSL_ROLE_SPEC_CERT_ID_SYNTAX(X509V3_EXT_METHOD *method,
- OSSL_ROLE_SPEC_CERT_ID_SYNTAX *rscids,
- BIO *out, int indent)
+ OSSL_ROLE_SPEC_CERT_ID_SYNTAX *rscids,
+ BIO *out, int indent)
{
OSSL_ROLE_SPEC_CERT_ID *rscid;
int i;
@@ -72,8 +71,9 @@ static int i2r_OSSL_ROLE_SPEC_CERT_ID_SYNTAX(X509V3_EXT_METHOD *method,
if (i > 0 && BIO_puts(out, "\n") <= 0)
return 0;
if (BIO_printf(out,
- "%*sRole Specification Certificate Identifier #%d:\n",
- indent, "", i + 1) <= 0)
+ "%*sRole Specification Certificate Identifier #%d:\n",
+ indent, "", i + 1)
+ <= 0)
return 0;
rscid = sk_OSSL_ROLE_SPEC_CERT_ID_value(rscids, i);
if (i2r_OSSL_ROLE_SPEC_CERT_ID(method, rscid, out, indent + 4) != 1)
diff --git a/crypto/x509/v3_san.c b/crypto/x509/v3_san.c
index 0975e01ed2..fcd7465271 100644
--- a/crypto/x509/v3_san.c
+++ b/crypto/x509/v3_san.c
@@ -16,41 +16,41 @@
#include "ext_dat.h"
static GENERAL_NAMES *v2i_subject_alt(X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx,
- STACK_OF(CONF_VALUE) *nval);
+ X509V3_CTX *ctx,
+ STACK_OF(CONF_VALUE) *nval);
static GENERAL_NAMES *v2i_issuer_alt(X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx,
- STACK_OF(CONF_VALUE) *nval);
+ X509V3_CTX *ctx,
+ STACK_OF(CONF_VALUE) *nval);
static int copy_email(X509V3_CTX *ctx, GENERAL_NAMES *gens, int move_p);
static int copy_issuer(X509V3_CTX *ctx, GENERAL_NAMES *gens);
static int do_othername(GENERAL_NAME *gen, const char *value, X509V3_CTX *ctx);
static int do_dirname(GENERAL_NAME *gen, const char *value, X509V3_CTX *ctx);
const X509V3_EXT_METHOD ossl_v3_alt[3] = {
- {NID_subject_alt_name, 0, ASN1_ITEM_ref(GENERAL_NAMES),
- 0, 0, 0, 0,
- 0, 0,
- (X509V3_EXT_I2V) i2v_GENERAL_NAMES,
- (X509V3_EXT_V2I)v2i_subject_alt,
- NULL, NULL, NULL},
-
- {NID_issuer_alt_name, 0, ASN1_ITEM_ref(GENERAL_NAMES),
- 0, 0, 0, 0,
- 0, 0,
- (X509V3_EXT_I2V) i2v_GENERAL_NAMES,
- (X509V3_EXT_V2I)v2i_issuer_alt,
- NULL, NULL, NULL},
-
- {NID_certificate_issuer, 0, ASN1_ITEM_ref(GENERAL_NAMES),
- 0, 0, 0, 0,
- 0, 0,
- (X509V3_EXT_I2V) i2v_GENERAL_NAMES,
- NULL, NULL, NULL, NULL},
+ { NID_subject_alt_name, 0, ASN1_ITEM_ref(GENERAL_NAMES),
+ 0, 0, 0, 0,
+ 0, 0,
+ (X509V3_EXT_I2V)i2v_GENERAL_NAMES,
+ (X509V3_EXT_V2I)v2i_subject_alt,
+ NULL, NULL, NULL },
+
+ { NID_issuer_alt_name, 0, ASN1_ITEM_ref(GENERAL_NAMES),
+ 0, 0, 0, 0,
+ 0, 0,
+ (X509V3_EXT_I2V)i2v_GENERAL_NAMES,
+ (X509V3_EXT_V2I)v2i_issuer_alt,
+ NULL, NULL, NULL },
+
+ { NID_certificate_issuer, 0, ASN1_ITEM_ref(GENERAL_NAMES),
+ 0, 0, 0, 0,
+ 0, 0,
+ (X509V3_EXT_I2V)i2v_GENERAL_NAMES,
+ NULL, NULL, NULL, NULL },
};
STACK_OF(CONF_VALUE) *i2v_GENERAL_NAMES(X509V3_EXT_METHOD *method,
- GENERAL_NAMES *gens,
- STACK_OF(CONF_VALUE) *ret)
+ GENERAL_NAMES *gens,
+ STACK_OF(CONF_VALUE) *ret)
{
int i;
GENERAL_NAME *gen;
@@ -77,8 +77,8 @@ STACK_OF(CONF_VALUE) *i2v_GENERAL_NAMES(X509V3_EXT_METHOD *method,
}
STACK_OF(CONF_VALUE) *i2v_GENERAL_NAME(X509V3_EXT_METHOD *method,
- GENERAL_NAME *gen,
- STACK_OF(CONF_VALUE) *ret)
+ GENERAL_NAME *gen,
+ STACK_OF(CONF_VALUE) *ret)
{
char othername[300];
char oline[256], *tmp;
@@ -88,64 +88,64 @@ STACK_OF(CONF_VALUE) *i2v_GENERAL_NAME(X509V3_EXT_METHOD *method,
switch (OBJ_obj2nid(gen->d.otherName->type_id)) {
case NID_id_on_SmtpUTF8Mailbox:
if (gen->d.otherName->value->type != V_ASN1_UTF8STRING
- || !x509v3_add_len_value_uchar("othername: SmtpUTF8Mailbox",
- gen->d.otherName->value->value.utf8string->data,
- gen->d.otherName->value->value.utf8string->length,
- &ret))
+ || !x509v3_add_len_value_uchar("othername: SmtpUTF8Mailbox",
+ gen->d.otherName->value->value.utf8string->data,
+ gen->d.otherName->value->value.utf8string->length,
+ &ret))
return NULL;
break;
case NID_XmppAddr:
if (gen->d.otherName->value->type != V_ASN1_UTF8STRING
- || !x509v3_add_len_value_uchar("othername: XmppAddr",
- gen->d.otherName->value->value.utf8string->data,
- gen->d.otherName->value->value.utf8string->length,
- &ret))
+ || !x509v3_add_len_value_uchar("othername: XmppAddr",
+ gen->d.otherName->value->value.utf8string->data,
+ gen->d.otherName->value->value.utf8string->length,
+ &ret))
return NULL;
break;
case NID_SRVName:
if (gen->d.otherName->value->type != V_ASN1_IA5STRING
- || !x509v3_add_len_value_uchar("othername: SRVName",
- gen->d.otherName->value->value.ia5string->data,
- gen->d.otherName->value->value.ia5string->length,
- &ret))
+ || !x509v3_add_len_value_uchar("othername: SRVName",
+ gen->d.otherName->value->value.ia5string->data,
+ gen->d.otherName->value->value.ia5string->length,
+ &ret))
return NULL;
break;
case NID_ms_upn:
if (gen->d.otherName->value->type != V_ASN1_UTF8STRING
- || !x509v3_add_len_value_uchar("othername: UPN",
- gen->d.otherName->value->value.utf8string->data,
- gen->d.otherName->value->value.utf8string->length,
- &ret))
+ || !x509v3_add_len_value_uchar("othername: UPN",
+ gen->d.otherName->value->value.utf8string->data,
+ gen->d.otherName->value->value.utf8string->length,
+ &ret))
return NULL;
break;
case NID_NAIRealm:
if (gen->d.otherName->value->type != V_ASN1_UTF8STRING
- || !x509v3_add_len_value_uchar("othername: NAIRealm",
- gen->d.otherName->value->value.utf8string->data,
- gen->d.otherName->value->value.utf8string->length,
- &ret))
+ || !x509v3_add_len_value_uchar("othername: NAIRealm",
+ gen->d.otherName->value->value.utf8string->data,
+ gen->d.otherName->value->value.utf8string->length,
+ &ret))
return NULL;
break;
default:
if (OBJ_obj2txt(oline, sizeof(oline), gen->d.otherName->type_id, 0) > 0)
BIO_snprintf(othername, sizeof(othername), "othername: %s",
- oline);
+ oline);
else
OPENSSL_strlcpy(othername, "othername", sizeof(othername));
/* check if the value is something printable */
if (gen->d.otherName->value->type == V_ASN1_IA5STRING) {
if (x509v3_add_len_value_uchar(othername,
- gen->d.otherName->value->value.ia5string->data,
- gen->d.otherName->value->value.ia5string->length,
- &ret))
+ gen->d.otherName->value->value.ia5string->data,
+ gen->d.otherName->value->value.ia5string->length,
+ &ret))
return ret;
}
if (gen->d.otherName->value->type == V_ASN1_UTF8STRING) {
if (x509v3_add_len_value_uchar(othername,
- gen->d.otherName->value->value.utf8string->data,
- gen->d.otherName->value->value.utf8string->length,
- &ret))
+ gen->d.otherName->value->value.utf8string->data,
+ gen->d.otherName->value->value.utf8string->length,
+ &ret))
return ret;
}
if (!X509V3_add_value(othername, "<unsupported>", &ret))
@@ -166,25 +166,25 @@ STACK_OF(CONF_VALUE) *i2v_GENERAL_NAME(X509V3_EXT_METHOD *method,
case GEN_EMAIL:
if (!x509v3_add_len_value_uchar("email", gen->d.ia5->data,
- gen->d.ia5->length, &ret))
+ gen->d.ia5->length, &ret))
return NULL;
break;
case GEN_DNS:
if (!x509v3_add_len_value_uchar("DNS", gen->d.ia5->data,
- gen->d.ia5->length, &ret))
+ gen->d.ia5->length, &ret))
return NULL;
break;
case GEN_URI:
if (!x509v3_add_len_value_uchar("URI", gen->d.ia5->data,
- gen->d.ia5->length, &ret))
+ gen->d.ia5->length, &ret))
return NULL;
break;
case GEN_DIRNAME:
if (X509_NAME_oneline(gen->d.dirn, oline, sizeof(oline)) == NULL
- || !X509V3_add_value("DirName", oline, &ret))
+ || !X509V3_add_value("DirName", oline, &ret))
return NULL;
break;
@@ -214,9 +214,9 @@ int GENERAL_NAME_print(BIO *out, GENERAL_NAME *gen)
nid = OBJ_obj2nid(gen->d.otherName->type_id);
/* Validate the types are as we expect before we use them */
if ((nid == NID_SRVName
- && gen->d.otherName->value->type != V_ASN1_IA5STRING)
- || (nid != NID_SRVName
- && gen->d.otherName->value->type != V_ASN1_UTF8STRING)) {
+ && gen->d.otherName->value->type != V_ASN1_IA5STRING)
+ || (nid != NID_SRVName
+ && gen->d.otherName->value->type != V_ASN1_UTF8STRING)) {
BIO_printf(out, "othername:<unsupported>");
break;
}
@@ -224,28 +224,28 @@ int GENERAL_NAME_print(BIO *out, GENERAL_NAME *gen)
switch (nid) {
case NID_id_on_SmtpUTF8Mailbox:
BIO_printf(out, "othername:SmtpUTF8Mailbox:%.*s",
- gen->d.otherName->value->value.utf8string->length,
- gen->d.otherName->value->value.utf8string->data);
+ gen->d.otherName->value->value.utf8string->length,
+ gen->d.otherName->value->value.utf8string->data);
break;
case NID_XmppAddr:
BIO_printf(out, "othername:XmppAddr:%.*s",
- gen->d.otherName->value->value.utf8string->length,
- gen->d.otherName->value->value.utf8string->data);
+ gen->d.otherName->value->value.utf8string->length,
+ gen->d.otherName->value->value.utf8string->data);
break;
case NID_SRVName:
BIO_printf(out, "othername:SRVName:%.*s",
- gen->d.otherName->value->value.ia5string->length,
- gen->d.otherName->value->value.ia5string->data);
+ gen->d.otherName->value->value.ia5string->length,
+ gen->d.otherName->value->value.ia5string->data);
break;
case NID_ms_upn:
BIO_printf(out, "othername:UPN:%.*s",
- gen->d.otherName->value->value.utf8string->length,
- gen->d.otherName->value->value.utf8string->data);
+ gen->d.otherName->value->value.utf8string->length,
+ gen->d.otherName->value->value.utf8string->data);
break;
case NID_NAIRealm:
BIO_printf(out, "othername:NAIRealm:%.*s",
- gen->d.otherName->value->value.utf8string->length,
- gen->d.otherName->value->value.utf8string->data);
+ gen->d.otherName->value->value.utf8string->length,
+ gen->d.otherName->value->value.utf8string->data);
break;
default:
BIO_printf(out, "othername:<unsupported>");
@@ -299,8 +299,8 @@ int GENERAL_NAME_print(BIO *out, GENERAL_NAME *gen)
}
static GENERAL_NAMES *v2i_issuer_alt(X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx,
- STACK_OF(CONF_VALUE) *nval)
+ X509V3_CTX *ctx,
+ STACK_OF(CONF_VALUE) *nval)
{
const int num = sk_CONF_VALUE_num(nval);
GENERAL_NAMES *gens = sk_GENERAL_NAME_new_reserve(NULL, num);
@@ -326,7 +326,7 @@ static GENERAL_NAMES *v2i_issuer_alt(X509V3_EXT_METHOD *method,
}
}
return gens;
- err:
+err:
sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free);
return NULL;
}
@@ -363,21 +363,20 @@ static int copy_issuer(X509V3_CTX *ctx, GENERAL_NAMES *gens)
for (i = 0; i < num; i++) {
gen = sk_GENERAL_NAME_value(ialt, i);
- sk_GENERAL_NAME_push(gens, gen); /* no failure as it was reserved */
+ sk_GENERAL_NAME_push(gens, gen); /* no failure as it was reserved */
}
sk_GENERAL_NAME_free(ialt);
return 1;
- err:
+err:
sk_GENERAL_NAME_free(ialt);
return 0;
-
}
static GENERAL_NAMES *v2i_subject_alt(X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx,
- STACK_OF(CONF_VALUE) *nval)
+ X509V3_CTX *ctx,
+ STACK_OF(CONF_VALUE) *nval)
{
GENERAL_NAMES *gens;
CONF_VALUE *cnf;
@@ -397,7 +396,7 @@ static GENERAL_NAMES *v2i_subject_alt(X509V3_EXT_METHOD *method,
if (!copy_email(ctx, gens, 0))
goto err;
} else if (ossl_v3_name_cmp(cnf->name, "email") == 0
- && cnf->value && strcmp(cnf->value, "move") == 0) {
+ && cnf->value && strcmp(cnf->value, "move") == 0) {
if (!copy_email(ctx, gens, 1))
goto err;
} else {
@@ -408,7 +407,7 @@ static GENERAL_NAMES *v2i_subject_alt(X509V3_EXT_METHOD *method,
}
}
return gens;
- err:
+err:
sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free);
return NULL;
}
@@ -433,13 +432,12 @@ static int copy_email(X509V3_CTX *ctx, GENERAL_NAMES *gens, int move_p)
return 0;
}
/* Find the subject name */
- nm = ctx->subject_cert != NULL ?
- X509_get_subject_name(ctx->subject_cert) :
- X509_REQ_get_subject_name(ctx->subject_req);
+ nm = ctx->subject_cert != NULL ? X509_get_subject_name(ctx->subject_cert) : X509_REQ_get_subject_name(ctx->subject_req);
/* Now add any email address(es) to STACK */
while ((i = X509_NAME_get_index_by_NID(nm,
- NID_pkcs9_emailAddress, i)) >= 0) {
+ NID_pkcs9_emailAddress, i))
+ >= 0) {
ne = X509_NAME_get_entry(nm, i);
email = ASN1_STRING_dup(X509_NAME_ENTRY_get_data(ne));
if (move_p) {
@@ -463,15 +461,14 @@ static int copy_email(X509V3_CTX *ctx, GENERAL_NAMES *gens, int move_p)
return 1;
- err:
+err:
GENERAL_NAME_free(gen);
ASN1_IA5STRING_free(email);
return 0;
-
}
GENERAL_NAMES *v2i_GENERAL_NAMES(const X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
+ X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
{
GENERAL_NAME *gen;
GENERAL_NAMES *gens;
@@ -489,24 +486,24 @@ GENERAL_NAMES *v2i_GENERAL_NAMES(const X509V3_EXT_METHOD *method,
cnf = sk_CONF_VALUE_value(nval, i);
if ((gen = v2i_GENERAL_NAME(method, ctx, cnf)) == NULL)
goto err;
- sk_GENERAL_NAME_push(gens, gen); /* no failure as it was reserved */
+ sk_GENERAL_NAME_push(gens, gen); /* no failure as it was reserved */
}
return gens;
- err:
+err:
sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free);
return NULL;
}
GENERAL_NAME *v2i_GENERAL_NAME(const X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx, CONF_VALUE *cnf)
+ X509V3_CTX *ctx, CONF_VALUE *cnf)
{
return v2i_GENERAL_NAME_ex(NULL, method, ctx, cnf, 0);
}
GENERAL_NAME *a2i_GENERAL_NAME(GENERAL_NAME *out,
- const X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx, int gen_type, const char *value,
- int is_nc)
+ const X509V3_EXT_METHOD *method,
+ X509V3_CTX *ctx, int gen_type, const char *value,
+ int is_nc)
{
char is_string = 0;
GENERAL_NAME *gen = NULL;
@@ -533,17 +530,15 @@ GENERAL_NAME *a2i_GENERAL_NAME(GENERAL_NAME *out,
is_string = 1;
break;
- case GEN_RID:
- {
- ASN1_OBJECT *obj;
- if ((obj = OBJ_txt2obj(value, 0)) == NULL) {
- ERR_raise_data(ERR_LIB_X509V3, X509V3_R_BAD_OBJECT,
- "value=%s", value);
- goto err;
- }
- gen->d.rid = obj;
+ case GEN_RID: {
+ ASN1_OBJECT *obj;
+ if ((obj = OBJ_txt2obj(value, 0)) == NULL) {
+ ERR_raise_data(ERR_LIB_X509V3, X509V3_R_BAD_OBJECT,
+ "value=%s", value);
+ goto err;
}
- break;
+ gen->d.rid = obj;
+ } break;
case GEN_IPADD:
if (is_nc)
@@ -552,7 +547,7 @@ GENERAL_NAME *a2i_GENERAL_NAME(GENERAL_NAME *out,
gen->d.ip = a2i_IPADDRESS(value);
if (gen->d.ip == NULL) {
ERR_raise_data(ERR_LIB_X509V3, X509V3_R_BAD_IP_ADDRESS,
- "value=%s", value);
+ "value=%s", value);
goto err;
}
break;
@@ -576,9 +571,7 @@ GENERAL_NAME *a2i_GENERAL_NAME(GENERAL_NAME *out,
}
if (is_string) {
- if ((gen->d.ia5 = ASN1_IA5STRING_new()) == NULL ||
- !ASN1_STRING_set(gen->d.ia5, (unsigned char *)value,
- (int)strlen(value))) {
+ if ((gen->d.ia5 = ASN1_IA5STRING_new()) == NULL || !ASN1_STRING_set(gen->d.ia5, (unsigned char *)value, (int)strlen(value))) {
ASN1_IA5STRING_free(gen->d.ia5);
gen->d.ia5 = NULL;
ERR_raise(ERR_LIB_X509V3, ERR_R_ASN1_LIB);
@@ -590,15 +583,15 @@ GENERAL_NAME *a2i_GENERAL_NAME(GENERAL_NAME *out,
return gen;
- err:
+err:
if (!out)
GENERAL_NAME_free(gen);
return NULL;
}
GENERAL_NAME *v2i_GENERAL_NAME_ex(GENERAL_NAME *out,
- const X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx, CONF_VALUE *cnf, int is_nc)
+ const X509V3_EXT_METHOD *method,
+ X509V3_CTX *ctx, CONF_VALUE *cnf, int is_nc)
{
int type;
@@ -628,12 +621,11 @@ GENERAL_NAME *v2i_GENERAL_NAME_ex(GENERAL_NAME *out,
type = GEN_OTHERNAME;
else {
ERR_raise_data(ERR_LIB_X509V3, X509V3_R_UNSUPPORTED_OPTION,
- "name=%s", name);
+ "name=%s", name);
return NULL;
}
return a2i_GENERAL_NAME(out, method, ctx, type, value, is_nc);
-
}
static int do_othername(GENERAL_NAME *gen, const char *value, X509V3_CTX *ctx)
@@ -662,7 +654,7 @@ static int do_othername(GENERAL_NAME *gen, const char *value, X509V3_CTX *ctx)
goto err;
return 1;
- err:
+err:
OTHERNAME_free(gen->d.otherName);
gen->d.otherName = NULL;
return 0;
@@ -679,7 +671,7 @@ static int do_dirname(GENERAL_NAME *gen, const char *value, X509V3_CTX *ctx)
sk = X509V3_get_section(ctx, value);
if (!sk) {
ERR_raise_data(ERR_LIB_X509V3, X509V3_R_SECTION_NOT_FOUND,
- "section=%s", value);
+ "section=%s", value);
goto err;
}
/* FIXME: should allow other character types... */
diff --git a/crypto/x509/v3_sda.c b/crypto/x509/v3_sda.c
index a27c31711a..a3ecc3318d 100644
--- a/crypto/x509/v3_sda.c
+++ b/crypto/x509/v3_sda.c
@@ -12,15 +12,14 @@
#include <crypto/x509.h>
#include "ext_dat.h"
-ASN1_ITEM_TEMPLATE(OSSL_ATTRIBUTES_SYNTAX) =
- ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, Attributes, X509_ATTRIBUTE)
+ASN1_ITEM_TEMPLATE(OSSL_ATTRIBUTES_SYNTAX) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, Attributes, X509_ATTRIBUTE)
ASN1_ITEM_TEMPLATE_END(OSSL_ATTRIBUTES_SYNTAX)
IMPLEMENT_ASN1_FUNCTIONS(OSSL_ATTRIBUTES_SYNTAX)
static int i2r_ATTRIBUTES_SYNTAX(X509V3_EXT_METHOD *method,
- OSSL_ATTRIBUTES_SYNTAX *attrlst,
- BIO *out, int indent)
+ OSSL_ATTRIBUTES_SYNTAX *attrlst,
+ BIO *out, int indent)
{
X509_ATTRIBUTE *attr;
ASN1_TYPE *av;
@@ -54,8 +53,7 @@ static int i2r_ATTRIBUTES_SYNTAX(X509V3_EXT_METHOD *method,
}
if (X509_ATTRIBUTE_count(attr)) {
- for (j = 0; j < X509_ATTRIBUTE_count(attr); j++)
- {
+ for (j = 0; j < X509_ATTRIBUTE_count(attr); j++) {
av = X509_ATTRIBUTE_get0_type(attr, j);
if (ossl_print_attribute_value(out, attr_nid, av, indent + 4) <= 0)
return 0;
diff --git a/crypto/x509/v3_single_use.c b/crypto/x509/v3_single_use.c
index 50da6e1770..98a1a64a67 100644
--- a/crypto/x509/v3_single_use.c
+++ b/crypto/x509/v3_single_use.c
@@ -15,14 +15,14 @@
#include "ext_dat.h"
static int i2r_SINGLE_USE(X509V3_EXT_METHOD *method,
- void *su, BIO *out,
- int indent)
+ void *su, BIO *out,
+ int indent)
{
return 1;
}
static void *r2i_SINGLE_USE(X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx, const char *value)
+ X509V3_CTX *ctx, const char *value)
{
return ASN1_NULL_new();
}
diff --git a/crypto/x509/v3_skid.c b/crypto/x509/v3_skid.c
index 8657f4cdf2..469ff70e80 100644
--- a/crypto/x509/v3_skid.c
+++ b/crypto/x509/v3_skid.c
@@ -14,7 +14,7 @@
#include "ext_dat.h"
static ASN1_OCTET_STRING *s2i_skey_id(X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx, char *str);
+ X509V3_CTX *ctx, char *str);
const X509V3_EXT_METHOD ossl_v3_skey_id = {
NID_subject_key_identifier, 0, ASN1_ITEM_ref(ASN1_OCTET_STRING),
0, 0, 0, 0,
@@ -25,13 +25,13 @@ const X509V3_EXT_METHOD ossl_v3_skey_id = {
};
char *i2s_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method,
- const ASN1_OCTET_STRING *oct)
+ const ASN1_OCTET_STRING *oct)
{
return OPENSSL_buf2hexstr(oct->data, oct->length);
}
ASN1_OCTET_STRING *s2i_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx, const char *str)
+ X509V3_CTX *ctx, const char *str)
{
ASN1_OCTET_STRING *oct;
long length;
@@ -49,7 +49,6 @@ ASN1_OCTET_STRING *s2i_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method,
oct->length = length;
return oct;
-
}
ASN1_OCTET_STRING *ossl_x509_pubkey_hash(X509_PUBKEY *pubkey)
@@ -78,7 +77,7 @@ ASN1_OCTET_STRING *ossl_x509_pubkey_hash(X509_PUBKEY *pubkey)
X509_PUBKEY_get0_param(NULL, &pk, &pklen, NULL, pubkey);
if (EVP_Digest(pk, pklen, pkey_dig, &diglen, md, NULL)
- && ASN1_OCTET_STRING_set(oct, pkey_dig, diglen)) {
+ && ASN1_OCTET_STRING_set(oct, pkey_dig, diglen)) {
EVP_MD_free(md);
return oct;
}
@@ -89,7 +88,7 @@ ASN1_OCTET_STRING *ossl_x509_pubkey_hash(X509_PUBKEY *pubkey)
}
static ASN1_OCTET_STRING *s2i_skey_id(X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx, char *str)
+ X509V3_CTX *ctx, char *str)
{
if (strcmp(str, "none") == 0)
return ASN1_OCTET_STRING_new(); /* dummy */
@@ -105,7 +104,5 @@ static ASN1_OCTET_STRING *s2i_skey_id(X509V3_EXT_METHOD *method,
return NULL;
}
- return ossl_x509_pubkey_hash(ctx->subject_cert != NULL ?
- ctx->subject_cert->cert_info.key :
- ctx->subject_req->req_info.pubkey);
+ return ossl_x509_pubkey_hash(ctx->subject_cert != NULL ? ctx->subject_cert->cert_info.key : ctx->subject_req->req_info.pubkey);
}
diff --git a/crypto/x509/v3_soa_id.c b/crypto/x509/v3_soa_id.c
index 8be5bd8aa5..ab56384c2d 100644
--- a/crypto/x509/v3_soa_id.c
+++ b/crypto/x509/v3_soa_id.c
@@ -15,14 +15,14 @@
#include "ext_dat.h"
static int i2r_SOA_IDENTIFIER(X509V3_EXT_METHOD *method,
- void *su, BIO *out,
- int indent)
+ void *su, BIO *out,
+ int indent)
{
return 1;
}
static void *r2i_SOA_IDENTIFIER(X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx, const char *value)
+ X509V3_CTX *ctx, const char *value)
{
return ASN1_NULL_new();
}
diff --git a/crypto/x509/v3_sxnet.c b/crypto/x509/v3_sxnet.c
index 8c02d8244a..f0f93953e4 100644
--- a/crypto/x509/v3_sxnet.c
+++ b/crypto/x509/v3_sxnet.c
@@ -20,10 +20,10 @@
#define SXNET_TEST
static int sxnet_i2r(X509V3_EXT_METHOD *method, SXNET *sx, BIO *out,
- int indent);
+ int indent);
#ifdef SXNET_TEST
static SXNET *sxnet_v2i(X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
- STACK_OF(CONF_VALUE) *nval);
+ STACK_OF(CONF_VALUE) *nval);
#endif
const X509V3_EXT_METHOD ossl_v3_sxnet = {
NID_sxnet, X509V3_EXT_MULTILINE, ASN1_ITEM_ref(SXNET),
@@ -41,21 +41,21 @@ const X509V3_EXT_METHOD ossl_v3_sxnet = {
};
ASN1_SEQUENCE(SXNETID) = {
- ASN1_SIMPLE(SXNETID, zone, ASN1_INTEGER),
- ASN1_SIMPLE(SXNETID, user, ASN1_OCTET_STRING)
+ ASN1_SIMPLE(SXNETID, zone, ASN1_INTEGER),
+ ASN1_SIMPLE(SXNETID, user, ASN1_OCTET_STRING)
} ASN1_SEQUENCE_END(SXNETID)
IMPLEMENT_ASN1_FUNCTIONS(SXNETID)
ASN1_SEQUENCE(SXNET) = {
- ASN1_SIMPLE(SXNET, version, ASN1_INTEGER),
- ASN1_SEQUENCE_OF(SXNET, ids, SXNETID)
+ ASN1_SIMPLE(SXNET, version, ASN1_INTEGER),
+ ASN1_SEQUENCE_OF(SXNET, ids, SXNETID)
} ASN1_SEQUENCE_END(SXNET)
IMPLEMENT_ASN1_FUNCTIONS(SXNET)
static int sxnet_i2r(X509V3_EXT_METHOD *method, SXNET *sx, BIO *out,
- int indent)
+ int indent)
{
int64_t v;
char *tmp;
@@ -67,8 +67,8 @@ static int sxnet_i2r(X509V3_EXT_METHOD *method, SXNET *sx, BIO *out,
* LONG_MAX since that would cause on overflow.
*/
if (!ASN1_INTEGER_get_int64(&v, sx->version)
- || v >= LONG_MAX
- || v < LONG_MIN) {
+ || v >= LONG_MAX
+ || v < LONG_MIN) {
BIO_printf(out, "%*sVersion: <unsupported>", indent, "");
} else {
long vl = (long)v;
@@ -96,7 +96,7 @@ static int sxnet_i2r(X509V3_EXT_METHOD *method, SXNET *sx, BIO *out,
*/
static SXNET *sxnet_v2i(X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
- STACK_OF(CONF_VALUE) *nval)
+ STACK_OF(CONF_VALUE) *nval)
{
CONF_VALUE *cnf;
SXNET *sx = NULL;
@@ -106,7 +106,7 @@ static SXNET *sxnet_v2i(X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
if (!SXNET_add_id_asc(&sx, cnf->name, cnf->value, -1)) {
SXNET_free(sx);
return NULL;
- }
+ }
}
return sx;
}
@@ -135,7 +135,7 @@ int SXNET_add_id_asc(SXNET **psx, const char *zone, const char *user, int userle
/* Add an id given the zone as an unsigned long */
int SXNET_add_id_ulong(SXNET **psx, unsigned long lzone, const char *user,
- int userlen)
+ int userlen)
{
ASN1_INTEGER *izone;
@@ -158,7 +158,7 @@ int SXNET_add_id_ulong(SXNET **psx, unsigned long lzone, const char *user,
*/
int SXNET_add_id_INTEGER(SXNET **psx, ASN1_INTEGER *zone, const char *user,
- int userlen)
+ int userlen)
{
SXNET *sx = NULL;
SXNETID *id = NULL;
@@ -196,7 +196,7 @@ int SXNET_add_id_INTEGER(SXNET **psx, ASN1_INTEGER *zone, const char *user,
goto err;
}
- if (!ASN1_OCTET_STRING_set(id->user, (const unsigned char *)user, userlen)){
+ if (!ASN1_OCTET_STRING_set(id->user, (const unsigned char *)user, userlen)) {
ERR_raise(ERR_LIB_X509V3, ERR_R_ASN1_LIB);
goto err;
}
@@ -209,7 +209,7 @@ int SXNET_add_id_INTEGER(SXNET **psx, ASN1_INTEGER *zone, const char *user,
*psx = sx;
return 1;
- err:
+err:
SXNETID_free(id);
if (*psx == NULL)
SXNET_free(sx);
diff --git a/crypto/x509/v3_timespec.c b/crypto/x509/v3_timespec.c
index a9cda1f9ba..28f9a1c610 100644
--- a/crypto/x509/v3_timespec.c
+++ b/crypto/x509/v3_timespec.c
@@ -125,8 +125,8 @@ IMPLEMENT_ASN1_FUNCTIONS(OSSL_TIME_SPEC)
IMPLEMENT_ASN1_FUNCTIONS(OSSL_TIME_PERIOD)
static int i2r_OSSL_TIME_SPEC_ABSOLUTE(X509V3_EXT_METHOD *method,
- OSSL_TIME_SPEC_ABSOLUTE *time,
- BIO *out, int indent)
+ OSSL_TIME_SPEC_ABSOLUTE *time,
+ BIO *out, int indent)
{
if (time->startTime != NULL && time->endTime != NULL) {
if (!BIO_puts(out, "Any time between "))
@@ -156,8 +156,8 @@ static int i2r_OSSL_TIME_SPEC_ABSOLUTE(X509V3_EXT_METHOD *method,
}
static int i2r_OSSL_DAY_TIME(X509V3_EXT_METHOD *method,
- OSSL_DAY_TIME *dt,
- BIO *out, int indent)
+ OSSL_DAY_TIME *dt,
+ BIO *out, int indent)
{
int64_t h = 0;
int64_t m = 0;
@@ -170,12 +170,13 @@ static int i2r_OSSL_DAY_TIME(X509V3_EXT_METHOD *method,
if (dt->minute && !ASN1_INTEGER_get_int64(&s, dt->second))
return 0;
return BIO_printf(out, "%02lld:%02lld:%02lld",
- (long long int)h, (long long int)m, (long long int)s) > 0;
+ (long long int)h, (long long int)m, (long long int)s)
+ > 0;
}
static int i2r_OSSL_DAY_TIME_BAND(X509V3_EXT_METHOD *method,
- OSSL_DAY_TIME_BAND *band,
- BIO *out, int indent)
+ OSSL_DAY_TIME_BAND *band,
+ BIO *out, int indent)
{
if (band->startDayTime) {
if (!i2r_OSSL_DAY_TIME(method, band->startDayTime, out, indent))
@@ -335,8 +336,8 @@ static int print_bit_named_day(BIO *out, ASN1_BIT_STRING *bs)
}
static int i2r_OSSL_PERIOD(X509V3_EXT_METHOD *method,
- OSSL_TIME_PERIOD *p,
- BIO *out, int indent)
+ OSSL_TIME_PERIOD *p,
+ BIO *out, int indent)
{
int i;
OSSL_DAY_TIME_BAND *band;
@@ -534,8 +535,8 @@ static int i2r_OSSL_PERIOD(X509V3_EXT_METHOD *method,
}
static int i2r_OSSL_TIME_SPEC_TIME(X509V3_EXT_METHOD *method,
- OSSL_TIME_SPEC_TIME *time,
- BIO *out, int indent)
+ OSSL_TIME_SPEC_TIME *time,
+ BIO *out, int indent)
{
OSSL_TIME_PERIOD *tp;
int i;
@@ -565,8 +566,8 @@ static int i2r_OSSL_TIME_SPEC_TIME(X509V3_EXT_METHOD *method,
}
static int i2r_OSSL_TIME_SPEC(X509V3_EXT_METHOD *method,
- OSSL_TIME_SPEC *time,
- BIO *out, int indent)
+ OSSL_TIME_SPEC *time,
+ BIO *out, int indent)
{
int64_t tz;
diff --git a/crypto/x509/v3_tlsf.c b/crypto/x509/v3_tlsf.c
index 85dea65f35..a56907ae7a 100644
--- a/crypto/x509/v3_tlsf.c
+++ b/crypto/x509/v3_tlsf.c
@@ -17,17 +17,16 @@
#include "x509_local.h"
static STACK_OF(CONF_VALUE) *i2v_TLS_FEATURE(const X509V3_EXT_METHOD *method,
- TLS_FEATURE *tls_feature,
- STACK_OF(CONF_VALUE) *ext_list);
+ TLS_FEATURE *tls_feature,
+ STACK_OF(CONF_VALUE) *ext_list);
static TLS_FEATURE *v2i_TLS_FEATURE(const X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx,
- STACK_OF(CONF_VALUE) *nval);
+ X509V3_CTX *ctx,
+ STACK_OF(CONF_VALUE) *nval);
-ASN1_ITEM_TEMPLATE(TLS_FEATURE) =
- ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, TLS_FEATURE, ASN1_INTEGER)
+ASN1_ITEM_TEMPLATE(TLS_FEATURE) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, TLS_FEATURE, ASN1_INTEGER)
static_ASN1_ITEM_TEMPLATE_END(TLS_FEATURE)
-IMPLEMENT_ASN1_ALLOC_FUNCTIONS(TLS_FEATURE)
+ IMPLEMENT_ASN1_ALLOC_FUNCTIONS(TLS_FEATURE)
const X509V3_EXT_METHOD ossl_v3_tls_feature = {
NID_tlsfeature, 0,
@@ -40,7 +39,6 @@ const X509V3_EXT_METHOD ossl_v3_tls_feature = {
NULL
};
-
typedef struct {
long num;
const char *name;
@@ -58,8 +56,8 @@ static TLS_FEATURE_NAME tls_feature_tbl[] = {
* returned.
*/
static STACK_OF(CONF_VALUE) *i2v_TLS_FEATURE(const X509V3_EXT_METHOD *method,
- TLS_FEATURE *tls_feature,
- STACK_OF(CONF_VALUE) *ext_list)
+ TLS_FEATURE *tls_feature,
+ STACK_OF(CONF_VALUE) *ext_list)
{
int i;
size_t j;
@@ -85,7 +83,7 @@ static STACK_OF(CONF_VALUE) *i2v_TLS_FEATURE(const X509V3_EXT_METHOD *method,
* error, NULL is returned.
*/
static TLS_FEATURE *v2i_TLS_FEATURE(const X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
+ X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
{
TLS_FEATURE *tlsf;
char *extval, *endptr;
@@ -114,8 +112,7 @@ static TLS_FEATURE *v2i_TLS_FEATURE(const X509V3_EXT_METHOD *method,
tlsextid = tls_feature_tbl[j].num;
else {
tlsextid = strtol(extval, &endptr, 10);
- if (((*endptr) != '\0') || (extval == endptr) || (tlsextid < 0) ||
- (tlsextid > 65535)) {
+ if (((*endptr) != '\0') || (extval == endptr) || (tlsextid < 0) || (tlsextid > 65535)) {
ERR_raise(ERR_LIB_X509V3, X509V3_R_INVALID_SYNTAX);
X509V3_conf_add_error_name_value(val);
goto err;
@@ -123,8 +120,8 @@ static TLS_FEATURE *v2i_TLS_FEATURE(const X509V3_EXT_METHOD *method,
}
if ((ai = ASN1_INTEGER_new()) == NULL
- || !ASN1_INTEGER_set(ai, tlsextid)
- || sk_ASN1_INTEGER_push(tlsf, ai) <= 0) {
+ || !ASN1_INTEGER_set(ai, tlsextid)
+ || sk_ASN1_INTEGER_push(tlsf, ai) <= 0) {
ERR_raise(ERR_LIB_X509V3, ERR_R_ASN1_LIB);
goto err;
}
@@ -133,7 +130,7 @@ static TLS_FEATURE *v2i_TLS_FEATURE(const X509V3_EXT_METHOD *method,
}
return tlsf;
- err:
+err:
sk_ASN1_INTEGER_pop_free(tlsf, ASN1_INTEGER_free);
ASN1_INTEGER_free(ai);
return NULL;
diff --git a/crypto/x509/v3_usernotice.c b/crypto/x509/v3_usernotice.c
index cc99132525..9bf1502f75 100644
--- a/crypto/x509/v3_usernotice.c
+++ b/crypto/x509/v3_usernotice.c
@@ -11,8 +11,7 @@
#include <openssl/x509v3.h>
#include "ext_dat.h"
-ASN1_ITEM_TEMPLATE(OSSL_USER_NOTICE_SYNTAX) =
- ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, OSSL_USER_NOTICE_SYNTAX, USERNOTICE)
+ASN1_ITEM_TEMPLATE(OSSL_USER_NOTICE_SYNTAX) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, OSSL_USER_NOTICE_SYNTAX, USERNOTICE)
ASN1_ITEM_TEMPLATE_END(OSSL_USER_NOTICE_SYNTAX)
IMPLEMENT_ASN1_FUNCTIONS(OSSL_USER_NOTICE_SYNTAX)
@@ -27,11 +26,13 @@ static int print_notice(BIO *out, USERNOTICE *notice, int indent)
NOTICEREF *ref;
ref = notice->noticeref;
if (BIO_printf(out, "%*sOrganization: %.*s\n", indent, "",
- ref->organization->length,
- ref->organization->data) <= 0)
+ ref->organization->length,
+ ref->organization->data)
+ <= 0)
return 0;
if (BIO_printf(out, "%*sNumber%s: ", indent, "",
- sk_ASN1_INTEGER_num(ref->noticenos) > 1 ? "s" : "") <= 0)
+ sk_ASN1_INTEGER_num(ref->noticenos) > 1 ? "s" : "")
+ <= 0)
return 0;
for (i = 0; i < sk_ASN1_INTEGER_num(ref->noticenos); i++) {
num = sk_ASN1_INTEGER_value(ref->noticenos, i);
@@ -57,13 +58,14 @@ static int print_notice(BIO *out, USERNOTICE *notice, int indent)
return 1;
return BIO_printf(out, "%*sExplicit Text: %.*s", indent, "",
- notice->exptext->length,
- notice->exptext->data) >= 0;
+ notice->exptext->length,
+ notice->exptext->data)
+ >= 0;
}
static int i2r_USER_NOTICE_SYNTAX(X509V3_EXT_METHOD *method,
- OSSL_USER_NOTICE_SYNTAX *uns,
- BIO *out, int indent)
+ OSSL_USER_NOTICE_SYNTAX *uns,
+ BIO *out, int indent)
{
int i;
USERNOTICE *unotice;
diff --git a/crypto/x509/v3_utf8.c b/crypto/x509/v3_utf8.c
index b8fcc92a1f..e9aaedab81 100644
--- a/crypto/x509/v3_utf8.c
+++ b/crypto/x509/v3_utf8.c
@@ -21,13 +21,12 @@
* Russian Federal Law 63 "Digital Sign" is available here: http://www.consultant.ru/document/cons_doc_LAW_112701/
*/
-
const X509V3_EXT_METHOD ossl_v3_utf8_list[1] = {
EXT_UTF8STRING(NID_subjectSignTool),
};
char *i2s_ASN1_UTF8STRING(X509V3_EXT_METHOD *method,
- ASN1_UTF8STRING *utf8)
+ ASN1_UTF8STRING *utf8)
{
char *tmp;
@@ -43,7 +42,7 @@ char *i2s_ASN1_UTF8STRING(X509V3_EXT_METHOD *method,
}
ASN1_UTF8STRING *s2i_ASN1_UTF8STRING(X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx, const char *str)
+ X509V3_CTX *ctx, const char *str)
{
ASN1_UTF8STRING *utf8;
if (str == NULL) {
@@ -61,6 +60,6 @@ ASN1_UTF8STRING *s2i_ASN1_UTF8STRING(X509V3_EXT_METHOD *method,
}
#ifdef CHARSET_EBCDIC
ebcdic2ascii(utf8->data, utf8->data, utf8->length);
-#endif /* CHARSET_EBCDIC */
+#endif /* CHARSET_EBCDIC */
return utf8;
}
diff --git a/crypto/x509/v3_utl.c b/crypto/x509/v3_utl.c
index 5f40a088a9..e7abe6150a 100644
--- a/crypto/x509/v3_utl.c
+++ b/crypto/x509/v3_utl.c
@@ -25,10 +25,10 @@
static char *strip_spaces(char *name);
static int sk_strcmp(const char *const *a, const char *const *b);
static STACK_OF(OPENSSL_STRING) *get_email(const X509_NAME *name,
- GENERAL_NAMES *gens);
+ GENERAL_NAMES *gens);
static void str_free(OPENSSL_STRING str);
static int append_ia5(STACK_OF(OPENSSL_STRING) **sk,
- const ASN1_IA5STRING *email);
+ const ASN1_IA5STRING *email);
static int ipv4_from_asc(unsigned char *v4, const char *in);
static int ipv6_from_asc(unsigned char *v6, const char *in);
@@ -38,7 +38,7 @@ static int ipv6_hex(unsigned char *out, const char *in, int inlen);
/* Add a CONF_VALUE name value pair to stack */
static int x509v3_add_len_value(const char *name, const char *value,
- size_t vallen, STACK_OF(CONF_VALUE) **extlist)
+ size_t vallen, STACK_OF(CONF_VALUE) **extlist)
{
CONF_VALUE *vtmp = NULL;
char *tname = NULL, *tvalue = NULL;
@@ -66,7 +66,7 @@ static int x509v3_add_len_value(const char *name, const char *value,
if (!sk_CONF_VALUE_push(*extlist, vtmp))
goto err;
return 1;
- err:
+err:
if (sk_allocated) {
sk_CONF_VALUE_free(*extlist);
*extlist = NULL;
@@ -78,23 +78,23 @@ static int x509v3_add_len_value(const char *name, const char *value,
}
int X509V3_add_value(const char *name, const char *value,
- STACK_OF(CONF_VALUE) **extlist)
+ STACK_OF(CONF_VALUE) **extlist)
{
return x509v3_add_len_value(name, value,
- value != NULL ? strlen((const char *)value) : 0,
- extlist);
+ value != NULL ? strlen((const char *)value) : 0,
+ extlist);
}
int X509V3_add_value_uchar(const char *name, const unsigned char *value,
- STACK_OF(CONF_VALUE) **extlist)
+ STACK_OF(CONF_VALUE) **extlist)
{
return x509v3_add_len_value(name, (const char *)value,
- value != NULL ? strlen((const char *)value) : 0,
- extlist);
+ value != NULL ? strlen((const char *)value) : 0,
+ extlist);
}
int x509v3_add_len_value_uchar(const char *name, const unsigned char *value,
- size_t vallen, STACK_OF(CONF_VALUE) **extlist)
+ size_t vallen, STACK_OF(CONF_VALUE) **extlist)
{
return x509v3_add_len_value(name, (const char *)value, vallen, extlist);
}
@@ -112,7 +112,7 @@ void X509V3_conf_free(CONF_VALUE *conf)
}
int X509V3_add_value_bool(const char *name, int asn1_bool,
- STACK_OF(CONF_VALUE) **extlist)
+ STACK_OF(CONF_VALUE) **extlist)
{
if (asn1_bool)
return X509V3_add_value(name, "TRUE", extlist);
@@ -120,7 +120,7 @@ int X509V3_add_value_bool(const char *name, int asn1_bool,
}
int X509V3_add_value_bool_nf(const char *name, int asn1_bool,
- STACK_OF(CONF_VALUE) **extlist)
+ STACK_OF(CONF_VALUE) **extlist)
{
if (asn1_bool)
return X509V3_add_value(name, "TRUE", extlist);
@@ -249,7 +249,7 @@ ASN1_INTEGER *s2i_ASN1_INTEGER(X509V3_EXT_METHOD *method, const char *value)
}
int X509V3_add_value_int(const char *name, const ASN1_INTEGER *aint,
- STACK_OF(CONF_VALUE) **extlist)
+ STACK_OF(CONF_VALUE) **extlist)
{
char *strtmp;
int ret;
@@ -287,7 +287,7 @@ int X509V3_get_value_bool(const CONF_VALUE *value, int *asn1_bool)
*asn1_bool = 0;
return 1;
}
- err:
+err:
ERR_raise(ERR_LIB_X509V3, X509V3_R_INVALID_BOOLEAN_STRING);
X509V3_conf_add_error_name_value(value);
return 0;
@@ -305,8 +305,8 @@ int X509V3_get_value_int(const CONF_VALUE *value, ASN1_INTEGER **aint)
return 1;
}
-#define HDR_NAME 1
-#define HDR_VALUE 2
+#define HDR_NAME 1
+#define HDR_VALUE 2
/*
* #define DEBUG
@@ -328,7 +328,7 @@ STACK_OF(CONF_VALUE) *X509V3_parse_list(const char *line)
ntmp = NULL;
/* Go through all characters */
for (p = linebuf, q = linebuf; (c = *p) && (c != '\r') && (c != '\n');
- p++) {
+ p++) {
switch (state) {
case HDR_NAME:
@@ -370,7 +370,6 @@ STACK_OF(CONF_VALUE) *X509V3_parse_list(const char *line)
ntmp = NULL;
q = p + 1;
}
-
}
}
@@ -396,11 +395,10 @@ STACK_OF(CONF_VALUE) *X509V3_parse_list(const char *line)
OPENSSL_free(linebuf);
return values;
- err:
+err:
OPENSSL_free(linebuf);
sk_CONF_VALUE_pop_free(values, X509V3_conf_free);
return NULL;
-
}
/* Delete leading and trailing spaces from a string */
@@ -424,7 +422,6 @@ static char *strip_spaces(char *name)
return p;
}
-
/*
* V2I name comparison function: returns zero if 'name' matches cmp or cmp.*
*/
@@ -473,8 +470,7 @@ STACK_OF(OPENSSL_STRING) *X509_get1_ocsp(X509 *x)
ACCESS_DESCRIPTION *ad = sk_ACCESS_DESCRIPTION_value(info, i);
if (OBJ_obj2nid(ad->method) == NID_ad_OCSP) {
if (ad->location->type == GEN_URI) {
- if (!append_ia5
- (&ret, ad->location->d.uniformResourceIdentifier))
+ if (!append_ia5(&ret, ad->location->d.uniformResourceIdentifier))
break;
}
}
@@ -498,7 +494,7 @@ STACK_OF(OPENSSL_STRING) *X509_REQ_get1_email(X509_REQ *x)
}
static STACK_OF(OPENSSL_STRING) *get_email(const X509_NAME *name,
- GENERAL_NAMES *gens)
+ GENERAL_NAMES *gens)
{
STACK_OF(OPENSSL_STRING) *ret = NULL;
X509_NAME_ENTRY *ne;
@@ -509,7 +505,8 @@ static STACK_OF(OPENSSL_STRING) *get_email(const X509_NAME *name,
/* Now add any email address(es) to STACK */
/* First supplied X509_NAME */
while ((i = X509_NAME_get_index_by_NID(name,
- NID_pkcs9_emailAddress, i)) >= 0) {
+ NID_pkcs9_emailAddress, i))
+ >= 0) {
ne = X509_NAME_get_entry(name, i);
email = X509_NAME_ENTRY_get_data(ne);
if (!append_ia5(&ret, email))
@@ -531,7 +528,7 @@ static void str_free(OPENSSL_STRING str)
}
static int append_ia5(STACK_OF(OPENSSL_STRING) **sk,
- const ASN1_IA5STRING *email)
+ const ASN1_IA5STRING *email)
{
char *emtmp;
@@ -573,14 +570,14 @@ void X509_email_free(STACK_OF(OPENSSL_STRING) *sk)
sk_OPENSSL_STRING_pop_free(sk, str_free);
}
-typedef int (*equal_fn) (const unsigned char *pattern, size_t pattern_len,
- const unsigned char *subject, size_t subject_len,
- unsigned int flags);
+typedef int (*equal_fn)(const unsigned char *pattern, size_t pattern_len,
+ const unsigned char *subject, size_t subject_len,
+ unsigned int flags);
/* Skip pattern prefix to match "wildcard" subject */
static void skip_prefix(const unsigned char **p, size_t *plen,
- size_t subject_len,
- unsigned int flags)
+ size_t subject_len,
+ unsigned int flags)
{
const unsigned char *pattern = *p;
size_t pattern_len = *plen;
@@ -595,8 +592,7 @@ static void skip_prefix(const unsigned char **p, size_t *plen,
return;
while (pattern_len > subject_len && *pattern) {
- if ((flags & X509_CHECK_FLAG_SINGLE_LABEL_SUBDOMAINS) &&
- *pattern == '.')
+ if ((flags & X509_CHECK_FLAG_SINGLE_LABEL_SUBDOMAINS) && *pattern == '.')
break;
++pattern;
--pattern_len;
@@ -611,8 +607,8 @@ static void skip_prefix(const unsigned char **p, size_t *plen,
/* Compare while ASCII ignoring case. */
static int equal_nocase(const unsigned char *pattern, size_t pattern_len,
- const unsigned char *subject, size_t subject_len,
- unsigned int flags)
+ const unsigned char *subject, size_t subject_len,
+ unsigned int flags)
{
skip_prefix(&pattern, &pattern_len, subject_len, flags);
if (pattern_len != subject_len)
@@ -641,8 +637,8 @@ static int equal_nocase(const unsigned char *pattern, size_t pattern_len,
/* Compare using memcmp. */
static int equal_case(const unsigned char *pattern, size_t pattern_len,
- const unsigned char *subject, size_t subject_len,
- unsigned int flags)
+ const unsigned char *subject, size_t subject_len,
+ unsigned int flags)
{
skip_prefix(&pattern, &pattern_len, subject_len, flags);
if (pattern_len != subject_len)
@@ -655,8 +651,8 @@ static int equal_case(const unsigned char *pattern, size_t pattern_len,
* case-insensitive manner.
*/
static int equal_email(const unsigned char *a, size_t a_len,
- const unsigned char *b, size_t b_len,
- unsigned int unused_flags)
+ const unsigned char *b, size_t b_len,
+ unsigned int unused_flags)
{
size_t i = a_len;
@@ -685,9 +681,9 @@ static int equal_email(const unsigned char *a, size_t a_len,
* characters in-between are valid.
*/
static int wildcard_match(const unsigned char *prefix, size_t prefix_len,
- const unsigned char *suffix, size_t suffix_len,
- const unsigned char *subject, size_t subject_len,
- unsigned int flags)
+ const unsigned char *suffix, size_t suffix_len,
+ const unsigned char *subject, size_t subject_len,
+ unsigned int flags)
{
const unsigned char *wildcard_start;
const unsigned char *wildcard_end;
@@ -715,8 +711,7 @@ static int wildcard_match(const unsigned char *prefix, size_t prefix_len,
allow_multi = 1;
}
/* IDNA labels cannot match partial wildcards */
- if (!allow_idna &&
- subject_len >= 4 && HAS_CASE_PREFIX((const char *)subject, "xn--"))
+ if (!allow_idna && subject_len >= 4 && HAS_CASE_PREFIX((const char *)subject, "xn--"))
return 0;
/* The wildcard may match a literal '*' */
if (wildcard_end == wildcard_start + 1 && *wildcard_start == '*')
@@ -727,21 +722,18 @@ static int wildcard_match(const unsigned char *prefix, size_t prefix_len,
* allow_multi is set.
*/
for (p = wildcard_start; p != wildcard_end; ++p)
- if (!(('0' <= *p && *p <= '9') ||
- ('A' <= *p && *p <= 'Z') ||
- ('a' <= *p && *p <= 'z') ||
- *p == '-' || (allow_multi && *p == '.')))
+ if (!(('0' <= *p && *p <= '9') || ('A' <= *p && *p <= 'Z') || ('a' <= *p && *p <= 'z') || *p == '-' || (allow_multi && *p == '.')))
return 0;
return 1;
}
-#define LABEL_START (1 << 0)
-#define LABEL_END (1 << 1)
-#define LABEL_HYPHEN (1 << 2)
-#define LABEL_IDNA (1 << 3)
+#define LABEL_START (1 << 0)
+#define LABEL_END (1 << 1)
+#define LABEL_HYPHEN (1 << 2)
+#define LABEL_IDNA (1 << 3)
static const unsigned char *valid_star(const unsigned char *p, size_t len,
- unsigned int flags)
+ unsigned int flags)
{
const unsigned char *star = 0;
size_t i;
@@ -773,8 +765,8 @@ static const unsigned char *valid_star(const unsigned char *p, size_t len,
star = &p[i];
state &= ~LABEL_START;
} else if (('a' <= p[i] && p[i] <= 'z')
- || ('A' <= p[i] && p[i] <= 'Z')
- || ('0' <= p[i] && p[i] <= '9')) {
+ || ('A' <= p[i] && p[i] <= 'Z')
+ || ('0' <= p[i] && p[i] <= '9')) {
if ((state & LABEL_START) != 0
&& len - i >= 4 && HAS_CASE_PREFIX((const char *)&p[i], "xn--"))
state |= LABEL_IDNA;
@@ -805,8 +797,8 @@ static const unsigned char *valid_star(const unsigned char *p, size_t len,
/* Compare using wildcards. */
static int equal_wildcard(const unsigned char *pattern, size_t pattern_len,
- const unsigned char *subject, size_t subject_len,
- unsigned int flags)
+ const unsigned char *subject, size_t subject_len,
+ unsigned int flags)
{
const unsigned char *star = NULL;
@@ -818,10 +810,10 @@ static int equal_wildcard(const unsigned char *pattern, size_t pattern_len,
star = valid_star(pattern, pattern_len, flags);
if (star == NULL)
return equal_nocase(pattern, pattern_len,
- subject, subject_len, flags);
+ subject, subject_len, flags);
return wildcard_match(pattern, star - pattern,
- star + 1, (pattern + pattern_len) - star - 1,
- subject, subject_len, flags);
+ star + 1, (pattern + pattern_len) - star - 1,
+ subject, subject_len, flags);
}
/*
@@ -831,8 +823,8 @@ static int equal_wildcard(const unsigned char *pattern, size_t pattern_len,
*/
static int do_check_string(const ASN1_STRING *a, int cmp_type, equal_fn equal,
- unsigned int flags, const char *b, size_t blen,
- char **peername)
+ unsigned int flags, const char *b, size_t blen,
+ char **peername)
{
int rv = 0;
@@ -875,7 +867,7 @@ static int do_check_string(const ASN1_STRING *a, int cmp_type, equal_fn equal,
}
static int do_x509_check(X509 *x, const char *chk, size_t chklen,
- unsigned int flags, int check_type, char **peername)
+ unsigned int flags, int check_type, char **peername)
{
GENERAL_NAMES *gens = NULL;
const X509_NAME *name = NULL;
@@ -921,7 +913,7 @@ static int do_x509_check(X509 *x, const char *chk, size_t chklen,
default:
continue;
case GEN_OTHERNAME:
- switch (OBJ_obj2nid(gen->d.otherName->type_id)) {
+ switch (OBJ_obj2nid(gen->d.otherName->type_id)) {
default:
continue;
case NID_id_on_SmtpUTF8Mailbox:
@@ -977,7 +969,8 @@ static int do_x509_check(X509 *x, const char *chk, size_t chklen,
san_present = 1;
/* Positive on success, negative on error! */
if ((rv = do_check_string(cstr, alt_type, equal, flags,
- chk, chklen, peername)) != 0)
+ chk, chklen, peername))
+ != 0)
break;
}
GENERAL_NAMES_free(gens);
@@ -999,14 +992,15 @@ static int do_x509_check(X509 *x, const char *chk, size_t chklen,
/* Positive on success, negative on error! */
if ((rv = do_check_string(str, -1, equal, flags,
- chk, chklen, peername)) != 0)
+ chk, chklen, peername))
+ != 0)
return rv;
}
return 0;
}
int X509_check_host(X509 *x, const char *chk, size_t chklen,
- unsigned int flags, char **peername)
+ unsigned int flags, char **peername)
{
if (chk == NULL)
return -2;
@@ -1025,7 +1019,7 @@ int X509_check_host(X509 *x, const char *chk, size_t chklen,
}
int X509_check_email(X509 *x, const char *chk, size_t chklen,
- unsigned int flags)
+ unsigned int flags)
{
if (chk == NULL)
return -2;
@@ -1044,7 +1038,7 @@ int X509_check_email(X509 *x, const char *chk, size_t chklen,
}
int X509_check_ip(X509 *x, const unsigned char *chk, size_t chklen,
- unsigned int flags)
+ unsigned int flags)
{
if (chk == NULL)
return -2;
@@ -1079,8 +1073,8 @@ char *ossl_ipaddr_to_asc(unsigned char *p, int len)
break;
case 16: /* IPv6 */
for (out = buf, i = 8, remain = sizeof(buf);
- i-- > 0 && bytes >= 0;
- remain -= bytes, out += bytes) {
+ i-- > 0 && bytes >= 0;
+ remain -= bytes, out += bytes) {
const char *template = (i > 0 ? "%X:" : "%X");
bytes = BIO_snprintf(out, remain, template, p[0] << 8 | p[1]);
@@ -1159,7 +1153,7 @@ ASN1_OCTET_STRING *a2i_IPADDRESS_NC(const char *ipasc)
return ret;
- err:
+err:
OPENSSL_free(iptmp);
ASN1_OCTET_STRING_free(ret);
return NULL;
@@ -1186,7 +1180,8 @@ int ossl_a2i_ipadd(unsigned char *ipout, const char *ipasc)
* to the component, and advances *str to the first unconsumed character. On
* invalid input, it returns zero.
*/
-static int get_ipv4_component(uint8_t *out_byte, const char **str) {
+static int get_ipv4_component(uint8_t *out_byte, const char **str)
+{
/* Store a slightly larger intermediary so the overflow check is easier. */
uint32_t out = 0;
@@ -1205,7 +1200,7 @@ static int get_ipv4_component(uint8_t *out_byte, const char **str) {
return 1;
}
if (out == 0) {
- /* Reject extra leading zeros. Parsers sometimes treat them as
+ /* Reject extra leading zeros. Parsers sometimes treat them as
* octal, so accepting them would misinterpret input.
*/
return 0;
@@ -1232,7 +1227,7 @@ static int ipv4_from_asc(unsigned char *v4, const char *in)
|| !get_ipv4_component(&v4[1], &in) || !get_ipv4_dot(&in)
|| !get_ipv4_component(&v4[2], &in) || !get_ipv4_dot(&in)
|| !get_ipv4_component(&v4[3], &in) || *in != '\0') {
- return 0;
+ return 0;
}
return 1;
}
@@ -1276,7 +1271,7 @@ static int ipv6_from_asc(unsigned char *v6, const char *in)
/* More than three zeroes is an error */
if (v6stat.zero_cnt > 3) {
return 0;
- /* Can only have three zeroes if nothing else present */
+ /* Can only have three zeroes if nothing else present */
} else if (v6stat.zero_cnt == 3) {
if (v6stat.total > 0)
return 0;
@@ -1303,8 +1298,8 @@ static int ipv6_from_asc(unsigned char *v6, const char *in)
/* Copy final part */
if (v6stat.total != v6stat.zero_pos)
memcpy(v6 + v6stat.zero_pos + 16 - v6stat.total,
- v6stat.tmp + v6stat.zero_pos,
- v6stat.total - v6stat.zero_pos);
+ v6stat.tmp + v6stat.zero_pos,
+ v6stat.total - v6stat.zero_pos);
} else {
memcpy(v6, v6stat.tmp, 16);
}
@@ -1374,7 +1369,7 @@ static int ipv6_hex(unsigned char *out, const char *in, int inlen)
}
int X509V3_NAME_from_section(X509_NAME *nm, STACK_OF(CONF_VALUE) *dn_sk,
- unsigned long chtype)
+ unsigned long chtype)
{
CONF_VALUE *v;
int i, mval, spec_char, plus_char;
@@ -1394,7 +1389,7 @@ int X509V3_NAME_from_section(X509_NAME *nm, STACK_OF(CONF_VALUE) *dn_sk,
spec_char = ((*p == ':') || (*p == ',') || (*p == '.'));
#else
spec_char = ((*p == os_toascii[':']) || (*p == os_toascii[','])
- || (*p == os_toascii['.']));
+ || (*p == os_toascii['.']));
#endif
if (spec_char) {
p++;
@@ -1415,10 +1410,9 @@ int X509V3_NAME_from_section(X509_NAME *nm, STACK_OF(CONF_VALUE) *dn_sk,
mval = 0;
}
if (!X509_NAME_add_entry_by_txt(nm, type, chtype,
- (unsigned char *)v->value, -1, -1,
- mval))
+ (unsigned char *)v->value, -1, -1,
+ mval))
return 0;
-
}
return 1;
}
diff --git a/crypto/x509/v3err.c b/crypto/x509/v3err.c
index b03bc8524c..96a27aaf48 100644
--- a/crypto/x509/v3err.c
+++ b/crypto/x509/v3err.c
@@ -15,129 +15,129 @@
#ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA X509V3_str_reasons[] = {
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_BAD_IP_ADDRESS), "bad ip address"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_BAD_OBJECT), "bad object"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_BAD_OPTION), "bad option"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_BAD_VALUE), "bad value"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_BN_DEC2BN_ERROR), "bn dec2bn error"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_BN_TO_ASN1_INTEGER_ERROR),
- "bn to asn1 integer error"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_DIRNAME_ERROR), "dirname error"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_DISTPOINT_ALREADY_SET),
- "distpoint already set"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_DUPLICATE_ZONE_ID),
- "duplicate zone id"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_EMPTY_KEY_USAGE), "empty key usage"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_ERROR_CONVERTING_ZONE),
- "error converting zone"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_ERROR_CREATING_EXTENSION),
- "error creating extension"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_ERROR_IN_EXTENSION),
- "error in extension"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_EXPECTED_A_SECTION_NAME),
- "expected a section name"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_EXTENSION_EXISTS),
- "extension exists"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_EXTENSION_NAME_ERROR),
- "extension name error"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_EXTENSION_NOT_FOUND),
- "extension not found"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_EXTENSION_SETTING_NOT_SUPPORTED),
- "extension setting not supported"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_EXTENSION_VALUE_ERROR),
- "extension value error"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_ILLEGAL_EMPTY_EXTENSION),
- "illegal empty extension"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INCORRECT_POLICY_SYNTAX_TAG),
- "incorrect policy syntax tag"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_ASNUMBER),
- "invalid asnumber"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_ASRANGE), "invalid asrange"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_BOOLEAN_STRING),
- "invalid boolean string"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_CERTIFICATE),
- "invalid certificate"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_EMPTY_NAME),
- "invalid empty name"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_EXTENSION_STRING),
- "invalid extension string"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_INHERITANCE),
- "invalid inheritance"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_IPADDRESS),
- "invalid ipaddress"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_MULTIPLE_RDNS),
- "invalid multiple rdns"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_NAME), "invalid name"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_NULL_ARGUMENT),
- "invalid null argument"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_NULL_VALUE),
- "invalid null value"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_NUMBER), "invalid number"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_NUMBERS), "invalid numbers"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_OBJECT_IDENTIFIER),
- "invalid object identifier"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_OPTION), "invalid option"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_POLICY_IDENTIFIER),
- "invalid policy identifier"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_PROXY_POLICY_SETTING),
- "invalid proxy policy setting"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_PURPOSE), "invalid purpose"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_SAFI), "invalid safi"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_SECTION), "invalid section"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_SYNTAX), "invalid syntax"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_ISSUER_DECODE_ERROR),
- "issuer decode error"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_MISSING_VALUE), "missing value"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_NEED_ORGANIZATION_AND_NUMBERS),
- "need organization and numbers"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_NEGATIVE_PATHLEN),
- "negative pathlen"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_NO_CONFIG_DATABASE),
- "no config database"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_NO_ISSUER_CERTIFICATE),
- "no issuer certificate"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_NO_ISSUER_DETAILS),
- "no issuer details"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_NO_POLICY_IDENTIFIER),
- "no policy identifier"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_NO_PROXY_CERT_POLICY_LANGUAGE_DEFINED),
- "no proxy cert policy language defined"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_NO_PUBLIC_KEY), "no public key"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_NO_SUBJECT_DETAILS),
- "no subject details"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_OPERATION_NOT_DEFINED),
- "operation not defined"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_OTHERNAME_ERROR), "othername error"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_POLICY_LANGUAGE_ALREADY_DEFINED),
- "policy language already defined"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_POLICY_PATH_LENGTH),
- "policy path length"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_POLICY_PATH_LENGTH_ALREADY_DEFINED),
- "policy path length already defined"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_POLICY_WHEN_PROXY_LANGUAGE_REQUIRES_NO_POLICY),
- "policy when proxy language requires no policy"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_PURPOSE_NOT_UNIQUE),
- "purpose not unique"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_SECTION_NOT_FOUND),
- "section not found"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_UNABLE_TO_GET_ISSUER_DETAILS),
- "unable to get issuer details"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_UNABLE_TO_GET_ISSUER_KEYID),
- "unable to get issuer keyid"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_UNKNOWN_BIT_STRING_ARGUMENT),
- "unknown bit string argument"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_UNKNOWN_EXTENSION),
- "unknown extension"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_UNKNOWN_EXTENSION_NAME),
- "unknown extension name"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_UNKNOWN_OPTION), "unknown option"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_UNKNOWN_VALUE), "unknown value"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_UNSUPPORTED_OPTION),
- "unsupported option"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_UNSUPPORTED_TYPE),
- "unsupported type"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_USER_TOO_LONG), "user too long"},
- {0, NULL}
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_BAD_IP_ADDRESS), "bad ip address" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_BAD_OBJECT), "bad object" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_BAD_OPTION), "bad option" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_BAD_VALUE), "bad value" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_BN_DEC2BN_ERROR), "bn dec2bn error" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_BN_TO_ASN1_INTEGER_ERROR),
+ "bn to asn1 integer error" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_DIRNAME_ERROR), "dirname error" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_DISTPOINT_ALREADY_SET),
+ "distpoint already set" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_DUPLICATE_ZONE_ID),
+ "duplicate zone id" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_EMPTY_KEY_USAGE), "empty key usage" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_ERROR_CONVERTING_ZONE),
+ "error converting zone" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_ERROR_CREATING_EXTENSION),
+ "error creating extension" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_ERROR_IN_EXTENSION),
+ "error in extension" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_EXPECTED_A_SECTION_NAME),
+ "expected a section name" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_EXTENSION_EXISTS),
+ "extension exists" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_EXTENSION_NAME_ERROR),
+ "extension name error" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_EXTENSION_NOT_FOUND),
+ "extension not found" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_EXTENSION_SETTING_NOT_SUPPORTED),
+ "extension setting not supported" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_EXTENSION_VALUE_ERROR),
+ "extension value error" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_ILLEGAL_EMPTY_EXTENSION),
+ "illegal empty extension" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INCORRECT_POLICY_SYNTAX_TAG),
+ "incorrect policy syntax tag" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_ASNUMBER),
+ "invalid asnumber" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_ASRANGE), "invalid asrange" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_BOOLEAN_STRING),
+ "invalid boolean string" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_CERTIFICATE),
+ "invalid certificate" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_EMPTY_NAME),
+ "invalid empty name" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_EXTENSION_STRING),
+ "invalid extension string" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_INHERITANCE),
+ "invalid inheritance" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_IPADDRESS),
+ "invalid ipaddress" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_MULTIPLE_RDNS),
+ "invalid multiple rdns" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_NAME), "invalid name" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_NULL_ARGUMENT),
+ "invalid null argument" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_NULL_VALUE),
+ "invalid null value" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_NUMBER), "invalid number" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_NUMBERS), "invalid numbers" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_OBJECT_IDENTIFIER),
+ "invalid object identifier" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_OPTION), "invalid option" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_POLICY_IDENTIFIER),
+ "invalid policy identifier" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_PROXY_POLICY_SETTING),
+ "invalid proxy policy setting" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_PURPOSE), "invalid purpose" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_SAFI), "invalid safi" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_SECTION), "invalid section" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_SYNTAX), "invalid syntax" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_ISSUER_DECODE_ERROR),
+ "issuer decode error" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_MISSING_VALUE), "missing value" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_NEED_ORGANIZATION_AND_NUMBERS),
+ "need organization and numbers" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_NEGATIVE_PATHLEN),
+ "negative pathlen" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_NO_CONFIG_DATABASE),
+ "no config database" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_NO_ISSUER_CERTIFICATE),
+ "no issuer certificate" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_NO_ISSUER_DETAILS),
+ "no issuer details" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_NO_POLICY_IDENTIFIER),
+ "no policy identifier" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_NO_PROXY_CERT_POLICY_LANGUAGE_DEFINED),
+ "no proxy cert policy language defined" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_NO_PUBLIC_KEY), "no public key" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_NO_SUBJECT_DETAILS),
+ "no subject details" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_OPERATION_NOT_DEFINED),
+ "operation not defined" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_OTHERNAME_ERROR), "othername error" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_POLICY_LANGUAGE_ALREADY_DEFINED),
+ "policy language already defined" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_POLICY_PATH_LENGTH),
+ "policy path length" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_POLICY_PATH_LENGTH_ALREADY_DEFINED),
+ "policy path length already defined" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_POLICY_WHEN_PROXY_LANGUAGE_REQUIRES_NO_POLICY),
+ "policy when proxy language requires no policy" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_PURPOSE_NOT_UNIQUE),
+ "purpose not unique" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_SECTION_NOT_FOUND),
+ "section not found" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_UNABLE_TO_GET_ISSUER_DETAILS),
+ "unable to get issuer details" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_UNABLE_TO_GET_ISSUER_KEYID),
+ "unable to get issuer keyid" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_UNKNOWN_BIT_STRING_ARGUMENT),
+ "unknown bit string argument" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_UNKNOWN_EXTENSION),
+ "unknown extension" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_UNKNOWN_EXTENSION_NAME),
+ "unknown extension name" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_UNKNOWN_OPTION), "unknown option" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_UNKNOWN_VALUE), "unknown value" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_UNSUPPORTED_OPTION),
+ "unsupported option" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_UNSUPPORTED_TYPE),
+ "unsupported type" },
+ { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_USER_TOO_LONG), "user too long" },
+ { 0, NULL }
};
#endif
diff --git a/crypto/x509/x509_acert.c b/crypto/x509/x509_acert.c
index 8e6890a303..31d8d82be1 100644
--- a/crypto/x509/x509_acert.c
+++ b/crypto/x509/x509_acert.c
@@ -91,9 +91,9 @@ static X509_NAME *get_dirName(const GENERAL_NAMES *names)
}
void OSSL_OBJECT_DIGEST_INFO_get0_digest(const OSSL_OBJECT_DIGEST_INFO *o,
- int *digestedObjectType,
- const X509_ALGOR **digestAlgorithm,
- const ASN1_BIT_STRING **digest)
+ int *digestedObjectType,
+ const X509_ALGOR **digestAlgorithm,
+ const ASN1_BIT_STRING **digest)
{
if (digestedObjectType != NULL)
*digestedObjectType = ASN1_ENUMERATED_get(&o->digestedObjectType);
@@ -124,8 +124,8 @@ long X509_ACERT_get_version(const X509_ACERT *x)
}
void X509_ACERT_get0_signature(const X509_ACERT *x,
- const ASN1_BIT_STRING **psig,
- const X509_ALGOR **palg)
+ const ASN1_BIT_STRING **psig,
+ const X509_ALGOR **palg)
{
if (psig != NULL)
*psig = &x->signature;
@@ -200,7 +200,7 @@ int X509_ACERT_get_attr_by_NID(const X509_ACERT *x, int nid, int lastpos)
}
int X509_ACERT_get_attr_by_OBJ(const X509_ACERT *x, const ASN1_OBJECT *obj,
- int lastpos)
+ int lastpos)
{
return X509at_get_attr_by_OBJ(x->acinfo->attributes, obj, lastpos);
}
@@ -223,7 +223,7 @@ int X509_ACERT_add1_attr(X509_ACERT *x, X509_ATTRIBUTE *attr)
}
int X509_ACERT_add1_attr_by_OBJ(X509_ACERT *x, const ASN1_OBJECT *obj,
- int type, const void *bytes, int len)
+ int type, const void *bytes, int len)
{
STACK_OF(X509_ATTRIBUTE) **attrs = &x->acinfo->attributes;
@@ -231,7 +231,7 @@ int X509_ACERT_add1_attr_by_OBJ(X509_ACERT *x, const ASN1_OBJECT *obj,
}
int X509_ACERT_add1_attr_by_NID(X509_ACERT *x, int nid, int type,
- const void *bytes, int len)
+ const void *bytes, int len)
{
STACK_OF(X509_ATTRIBUTE) **attrs = &x->acinfo->attributes;
@@ -239,7 +239,7 @@ int X509_ACERT_add1_attr_by_NID(X509_ACERT *x, int nid, int type,
}
int X509_ACERT_add1_attr_by_txt(X509_ACERT *x, const char *attrname, int type,
- const unsigned char *bytes, int len)
+ const unsigned char *bytes, int len)
{
STACK_OF(X509_ATTRIBUTE) **attrs = &x->acinfo->attributes;
@@ -262,7 +262,7 @@ static int check_asn1_attribute(const char **value)
}
int X509_ACERT_add_attr_nconf(CONF *conf, const char *section,
- X509_ACERT *acert)
+ X509_ACERT *acert)
{
int ret = 0, i;
STACK_OF(CONF_VALUE) *attr_sk = NCONF_get_section(conf, section);
@@ -276,7 +276,7 @@ int X509_ACERT_add_attr_nconf(CONF *conf, const char *section,
if (value == NULL) {
ERR_raise_data(ERR_LIB_X509, X509_R_INVALID_ATTRIBUTES,
- "name=%s,section=%s",v->name, section);
+ "name=%s,section=%s", v->name, section);
goto err;
}
@@ -291,7 +291,7 @@ int X509_ACERT_add_attr_nconf(CONF *conf, const char *section,
att_len = i2d_ASN1_TYPE(asn1, &att_data);
ret = X509_ACERT_add1_attr_by_txt(acert, v->name, V_ASN1_SEQUENCE,
- att_data, att_len);
+ att_data, att_len);
OPENSSL_free(att_data);
ASN1_TYPE_free(asn1);
@@ -299,9 +299,9 @@ int X509_ACERT_add_attr_nconf(CONF *conf, const char *section,
goto err;
} else {
ret = X509_ACERT_add1_attr_by_txt(acert, v->name,
- V_ASN1_OCTET_STRING,
- (unsigned char *)value,
- (int)strlen(value));
+ V_ASN1_OCTET_STRING,
+ (unsigned char *)value,
+ (int)strlen(value));
if (!ret)
goto err;
}
@@ -317,7 +317,7 @@ void *X509_ACERT_get_ext_d2i(const X509_ACERT *x, int nid, int *crit, int *idx)
}
int X509_ACERT_add1_ext_i2d(X509_ACERT *x, int nid, void *value, int crit,
- unsigned long flags)
+ unsigned long flags)
{
return X509V3_add1_i2d(&x->acinfo->extensions, nid, value, crit, flags);
}
diff --git a/crypto/x509/x509_acert.h b/crypto/x509/x509_acert.h
index f6d212bdbd..c7065ad92c 100644
--- a/crypto/x509/x509_acert.h
+++ b/crypto/x509/x509_acert.h
@@ -8,11 +8,11 @@
*/
#ifndef OSSL_CRYPTO_X509_X509_ACERT_H
-# define OSSL_CRYPTO_X509_X509_ACERT_H
+#define OSSL_CRYPTO_X509_X509_ACERT_H
#include <crypto/x509_acert.h>
-# define X509_ACERT_ISSUER_V2 1
+#define X509_ACERT_ISSUER_V2 1
DECLARE_ASN1_ITEM(OSSL_OBJECT_DIGEST_INFO)
DECLARE_ASN1_ITEM(OSSL_ISSUER_SERIAL)
diff --git a/crypto/x509/x509_att.c b/crypto/x509/x509_att.c
index b21aa4d299..a0fb445472 100644
--- a/crypto/x509/x509_att.c
+++ b/crypto/x509/x509_att.c
@@ -24,7 +24,7 @@ int X509at_get_attr_count(const STACK_OF(X509_ATTRIBUTE) *x)
}
int X509at_get_attr_by_NID(const STACK_OF(X509_ATTRIBUTE) *x, int nid,
- int lastpos)
+ int lastpos)
{
const ASN1_OBJECT *obj = OBJ_nid2obj(nid);
@@ -34,7 +34,7 @@ int X509at_get_attr_by_NID(const STACK_OF(X509_ATTRIBUTE) *x, int nid,
}
int X509at_get_attr_by_OBJ(const STACK_OF(X509_ATTRIBUTE) *sk,
- const ASN1_OBJECT *obj, int lastpos)
+ const ASN1_OBJECT *obj, int lastpos)
{
int n;
X509_ATTRIBUTE *ex;
@@ -80,7 +80,7 @@ X509_ATTRIBUTE *X509at_delete_attr(STACK_OF(X509_ATTRIBUTE) *x, int loc)
}
STACK_OF(X509_ATTRIBUTE) *ossl_x509at_add1_attr(STACK_OF(X509_ATTRIBUTE) **x,
- const X509_ATTRIBUTE *attr)
+ const X509_ATTRIBUTE *attr)
{
X509_ATTRIBUTE *new_attr = NULL;
STACK_OF(X509_ATTRIBUTE) *sk = NULL;
@@ -108,7 +108,7 @@ STACK_OF(X509_ATTRIBUTE) *ossl_x509at_add1_attr(STACK_OF(X509_ATTRIBUTE) **x,
if (*x == NULL)
*x = sk;
return sk;
- err:
+err:
X509_ATTRIBUTE_free(new_attr);
if (*x == NULL)
sk_X509_ATTRIBUTE_free(sk);
@@ -116,7 +116,7 @@ STACK_OF(X509_ATTRIBUTE) *ossl_x509at_add1_attr(STACK_OF(X509_ATTRIBUTE) **x,
}
STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr(STACK_OF(X509_ATTRIBUTE) **x,
- X509_ATTRIBUTE *attr)
+ X509_ATTRIBUTE *attr)
{
if (x == NULL || attr == NULL) {
ERR_raise(ERR_LIB_X509, ERR_R_PASSED_NULL_PARAMETER);
@@ -124,7 +124,7 @@ STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr(STACK_OF(X509_ATTRIBUTE) **x,
}
if (*x != NULL && X509at_get_attr_by_OBJ(*x, attr->object, -1) != -1) {
ERR_raise_data(ERR_LIB_X509, X509_R_DUPLICATE_ATTRIBUTE,
- "name=%s", OBJ_nid2sn(OBJ_obj2nid(attr->object)));
+ "name=%s", OBJ_nid2sn(OBJ_obj2nid(attr->object)));
return NULL;
}
@@ -132,10 +132,10 @@ STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr(STACK_OF(X509_ATTRIBUTE) **x,
}
STACK_OF(X509_ATTRIBUTE) *ossl_x509at_add1_attr_by_OBJ(STACK_OF(X509_ATTRIBUTE) **x,
- const ASN1_OBJECT *obj,
- int type,
- const unsigned char *bytes,
- int len)
+ const ASN1_OBJECT *obj,
+ int type,
+ const unsigned char *bytes,
+ int len)
{
X509_ATTRIBUTE *attr;
STACK_OF(X509_ATTRIBUTE) *ret;
@@ -149,10 +149,11 @@ STACK_OF(X509_ATTRIBUTE) *ossl_x509at_add1_attr_by_OBJ(STACK_OF(X509_ATTRIBUTE)
}
STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_OBJ(STACK_OF(X509_ATTRIBUTE)
- **x, const ASN1_OBJECT *obj,
- int type,
- const unsigned char *bytes,
- int len)
+ **x,
+ const ASN1_OBJECT *obj,
+ int type,
+ const unsigned char *bytes,
+ int len)
{
if (x == NULL || obj == NULL) {
ERR_raise(ERR_LIB_X509, ERR_R_PASSED_NULL_PARAMETER);
@@ -160,7 +161,7 @@ STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_OBJ(STACK_OF(X509_ATTRIBUTE)
}
if (*x != NULL && X509at_get_attr_by_OBJ(*x, obj, -1) != -1) {
ERR_raise_data(ERR_LIB_X509, X509_R_DUPLICATE_ATTRIBUTE,
- "name=%s", OBJ_nid2sn(OBJ_obj2nid(obj)));
+ "name=%s", OBJ_nid2sn(OBJ_obj2nid(obj)));
return NULL;
}
@@ -168,9 +169,9 @@ STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_OBJ(STACK_OF(X509_ATTRIBUTE)
}
STACK_OF(X509_ATTRIBUTE) *ossl_x509at_add1_attr_by_NID(STACK_OF(X509_ATTRIBUTE) **x,
- int nid, int type,
- const unsigned char *bytes,
- int len)
+ int nid, int type,
+ const unsigned char *bytes,
+ int len)
{
X509_ATTRIBUTE *attr;
STACK_OF(X509_ATTRIBUTE) *ret;
@@ -184,9 +185,10 @@ STACK_OF(X509_ATTRIBUTE) *ossl_x509at_add1_attr_by_NID(STACK_OF(X509_ATTRIBUTE)
}
STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_NID(STACK_OF(X509_ATTRIBUTE)
- **x, int nid, int type,
- const unsigned char *bytes,
- int len)
+ **x,
+ int nid, int type,
+ const unsigned char *bytes,
+ int len)
{
if (x == NULL) {
ERR_raise(ERR_LIB_X509, ERR_R_PASSED_NULL_PARAMETER);
@@ -194,7 +196,7 @@ STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_NID(STACK_OF(X509_ATTRIBUTE)
}
if (*x != NULL && X509at_get_attr_by_NID(*x, nid, -1) != -1) {
ERR_raise_data(ERR_LIB_X509, X509_R_DUPLICATE_ATTRIBUTE,
- "name=%s", OBJ_nid2sn(nid));
+ "name=%s", OBJ_nid2sn(nid));
return NULL;
}
@@ -202,10 +204,10 @@ STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_NID(STACK_OF(X509_ATTRIBUTE)
}
STACK_OF(X509_ATTRIBUTE) *ossl_x509at_add1_attr_by_txt(STACK_OF(X509_ATTRIBUTE) **x,
- const char *attrname,
- int type,
- const unsigned char *bytes,
- int len)
+ const char *attrname,
+ int type,
+ const unsigned char *bytes,
+ int len)
{
X509_ATTRIBUTE *attr;
STACK_OF(X509_ATTRIBUTE) *ret;
@@ -219,10 +221,11 @@ STACK_OF(X509_ATTRIBUTE) *ossl_x509at_add1_attr_by_txt(STACK_OF(X509_ATTRIBUTE)
}
STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_txt(STACK_OF(X509_ATTRIBUTE)
- **x, const char *attrname,
- int type,
- const unsigned char *bytes,
- int len)
+ **x,
+ const char *attrname,
+ int type,
+ const unsigned char *bytes,
+ int len)
{
X509_ATTRIBUTE *attr;
STACK_OF(X509_ATTRIBUTE) *ret;
@@ -236,7 +239,7 @@ STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_txt(STACK_OF(X509_ATTRIBUTE)
}
void *X509at_get0_data_by_OBJ(const STACK_OF(X509_ATTRIBUTE) *x,
- const ASN1_OBJECT *obj, int lastpos, int type)
+ const ASN1_OBJECT *obj, int lastpos, int type)
{
int i = X509at_get_attr_by_OBJ(x, obj, lastpos);
X509_ATTRIBUTE *at;
@@ -266,8 +269,8 @@ STACK_OF(X509_ATTRIBUTE) *ossl_x509at_dup(const STACK_OF(X509_ATTRIBUTE) *x)
}
X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_NID(X509_ATTRIBUTE **attr, int nid,
- int atrtype, const void *data,
- int len)
+ int atrtype, const void *data,
+ int len)
{
ASN1_OBJECT *obj = OBJ_nid2obj(nid);
X509_ATTRIBUTE *ret;
@@ -283,9 +286,9 @@ X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_NID(X509_ATTRIBUTE **attr, int nid,
}
X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_OBJ(X509_ATTRIBUTE **attr,
- const ASN1_OBJECT *obj,
- int atrtype, const void *data,
- int len)
+ const ASN1_OBJECT *obj,
+ int atrtype, const void *data,
+ int len)
{
X509_ATTRIBUTE *ret;
@@ -306,23 +309,23 @@ X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_OBJ(X509_ATTRIBUTE **attr,
if (attr != NULL && *attr == NULL)
*attr = ret;
return ret;
- err:
+err:
if (attr == NULL || ret != *attr)
X509_ATTRIBUTE_free(ret);
return NULL;
}
X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_txt(X509_ATTRIBUTE **attr,
- const char *atrname, int type,
- const unsigned char *bytes,
- int len)
+ const char *atrname, int type,
+ const unsigned char *bytes,
+ int len)
{
ASN1_OBJECT *obj = OBJ_txt2obj(atrname, 0);
X509_ATTRIBUTE *nattr;
if (obj == NULL) {
ERR_raise_data(ERR_LIB_X509, X509_R_INVALID_FIELD_NAME,
- "name=%s", atrname);
+ "name=%s", atrname);
return NULL;
}
nattr = X509_ATTRIBUTE_create_by_OBJ(attr, obj, type, bytes, len);
@@ -342,7 +345,7 @@ int X509_ATTRIBUTE_set1_object(X509_ATTRIBUTE *attr, const ASN1_OBJECT *obj)
}
int X509_ATTRIBUTE_set1_data(X509_ATTRIBUTE *attr, int attrtype,
- const void *data, int len)
+ const void *data, int len)
{
ASN1_TYPE *ttmp = NULL;
ASN1_STRING *stmp = NULL;
@@ -354,7 +357,7 @@ int X509_ATTRIBUTE_set1_data(X509_ATTRIBUTE *attr, int attrtype,
}
if ((attrtype & MBSTRING_FLAG) != 0) {
stmp = ASN1_STRING_set_by_NID(NULL, data, len, attrtype,
- OBJ_obj2nid(attr->object));
+ OBJ_obj2nid(attr->object));
if (stmp == NULL) {
ERR_raise(ERR_LIB_X509, ERR_R_ASN1_LIB);
return 0;
@@ -395,7 +398,7 @@ int X509_ATTRIBUTE_set1_data(X509_ATTRIBUTE *attr, int attrtype,
goto err;
}
return 1;
- err:
+err:
ASN1_TYPE_free(ttmp);
ASN1_STRING_free(stmp);
return 0;
@@ -418,15 +421,15 @@ ASN1_OBJECT *X509_ATTRIBUTE_get0_object(X509_ATTRIBUTE *attr)
}
void *X509_ATTRIBUTE_get0_data(X509_ATTRIBUTE *attr, int idx,
- int atrtype, void *data)
+ int atrtype, void *data)
{
ASN1_TYPE *ttmp = X509_ATTRIBUTE_get0_type(attr, idx);
if (ttmp == NULL)
return NULL;
if (atrtype == V_ASN1_BOOLEAN
- || atrtype == V_ASN1_NULL
- || atrtype != ASN1_TYPE_get(ttmp)) {
+ || atrtype == V_ASN1_NULL
+ || atrtype != ASN1_TYPE_get(ttmp)) {
ERR_raise(ERR_LIB_X509, X509_R_WRONG_TYPE);
return NULL;
}
diff --git a/crypto/x509/x509_cmp.c b/crypto/x509/x509_cmp.c
index de34fa5cc2..6d9848d234 100644
--- a/crypto/x509/x509_cmp.c
+++ b/crypto/x509/x509_cmp.c
@@ -55,16 +55,13 @@ unsigned long X509_issuer_and_serial_hash(X509 *a)
goto err;
if (!EVP_DigestUpdate(ctx, (unsigned char *)f, strlen(f)))
goto err;
- if (!EVP_DigestUpdate
- (ctx, (unsigned char *)a->cert_info.serialNumber.data,
- (unsigned long)a->cert_info.serialNumber.length))
+ if (!EVP_DigestUpdate(ctx, (unsigned char *)a->cert_info.serialNumber.data,
+ (unsigned long)a->cert_info.serialNumber.length))
goto err;
if (!EVP_DigestFinal_ex(ctx, &(md[0]), NULL))
goto err;
- ret = (((unsigned long)md[0]) | ((unsigned long)md[1] << 8L) |
- ((unsigned long)md[2] << 16L) | ((unsigned long)md[3] << 24L)
- ) & 0xffffffffL;
- err:
+ ret = (((unsigned long)md[0]) | ((unsigned long)md[1] << 8L) | ((unsigned long)md[2] << 16L) | ((unsigned long)md[3] << 24L)) & 0xffffffffL;
+err:
OPENSSL_free(f);
EVP_MD_free(digest);
EVP_MD_CTX_free(ctx);
@@ -92,7 +89,7 @@ int X509_CRL_match(const X509_CRL *a, const X509_CRL *b)
int rv;
if ((a->flags & EXFLAG_NO_FINGERPRINT) == 0
- && (b->flags & EXFLAG_NO_FINGERPRINT) == 0)
+ && (b->flags & EXFLAG_NO_FINGERPRINT) == 0)
rv = memcmp(a->sha1_hash, b->sha1_hash, SHA_DIGEST_LENGTH);
else
return -2;
@@ -164,7 +161,7 @@ int X509_cmp(const X509 *a, const X509 *b)
(void)X509_check_purpose((X509 *)b, -1, 0);
if ((a->ex_flags & EXFLAG_NO_FINGERPRINT) == 0
- && (b->ex_flags & EXFLAG_NO_FINGERPRINT) == 0)
+ && (b->ex_flags & EXFLAG_NO_FINGERPRINT) == 0)
rv = memcmp(a->sha1_hash, b->sha1_hash, SHA_DIGEST_LENGTH);
if (rv != 0)
return rv < 0 ? -1 : 1;
@@ -176,7 +173,7 @@ int X509_cmp(const X509 *a, const X509 *b)
if (a->cert_info.enc.len > b->cert_info.enc.len)
return 1;
rv = memcmp(a->cert_info.enc.enc,
- b->cert_info.enc.enc, a->cert_info.enc.len);
+ b->cert_info.enc.enc, a->cert_info.enc.len);
}
return rv < 0 ? -1 : rv > 0;
}
@@ -219,7 +216,7 @@ int X509_add_cert(STACK_OF(X509) *sk, X509 *cert, int flags)
if ((flags & X509_ADD_FLAG_UP_REF) != 0 && !X509_up_ref(cert))
return 0;
if (!sk_X509_insert(sk, cert,
- (flags & X509_ADD_FLAG_PREPEND) != 0 ? 0 : -1)) {
+ (flags & X509_ADD_FLAG_PREPEND) != 0 ? 0 : -1)) {
if ((flags & X509_ADD_FLAG_UP_REF) != 0)
X509_free(cert);
ERR_raise(ERR_LIB_X509, ERR_R_CRYPTO_LIB);
@@ -239,7 +236,7 @@ int X509_add_certs(STACK_OF(X509) *sk, STACK_OF(X509) *certs, int flags)
}
int ossl_x509_add_certs_new(STACK_OF(X509) **p_sk, STACK_OF(X509) *certs,
- int flags)
+ int flags)
/* compiler would allow 'const' for the certs, yet they may get up-ref'ed */
{
int n = sk_X509_num(certs /* may be NULL */);
@@ -291,7 +288,7 @@ int X509_NAME_cmp(const X509_NAME *a, const X509_NAME *b)
}
unsigned long X509_NAME_hash_ex(const X509_NAME *x, OSSL_LIB_CTX *libctx,
- const char *propq, int *ok)
+ const char *propq, int *ok)
{
unsigned long ret = 0;
unsigned char md[SHA_DIGEST_LENGTH];
@@ -304,9 +301,7 @@ unsigned long X509_NAME_hash_ex(const X509_NAME *x, OSSL_LIB_CTX *libctx,
*ok = 0;
if (i2d_ret >= 0 && sha1 != NULL
&& EVP_Digest(x->canon_enc, x->canon_enclen, md, NULL, sha1, NULL)) {
- ret = (((unsigned long)md[0]) | ((unsigned long)md[1] << 8L) |
- ((unsigned long)md[2] << 16L) | ((unsigned long)md[3] << 24L)
- ) & 0xffffffffL;
+ ret = (((unsigned long)md[0]) | ((unsigned long)md[1] << 8L) | ((unsigned long)md[2] << 16L) | ((unsigned long)md[3] << 24L)) & 0xffffffffL;
if (ok != NULL)
*ok = 1;
}
@@ -336,11 +331,9 @@ unsigned long X509_NAME_hash_old(const X509_NAME *x)
if (EVP_DigestInit_ex(md_ctx, md5, NULL)
&& EVP_DigestUpdate(md_ctx, x->bytes->data, x->bytes->length)
&& EVP_DigestFinal_ex(md_ctx, md, NULL))
- ret = (((unsigned long)md[0]) | ((unsigned long)md[1] << 8L) |
- ((unsigned long)md[2] << 16L) | ((unsigned long)md[3] << 24L)
- ) & 0xffffffffL;
+ ret = (((unsigned long)md[0]) | ((unsigned long)md[1] << 8L) | ((unsigned long)md[2] << 16L) | ((unsigned long)md[3] << 24L)) & 0xffffffffL;
- end:
+end:
EVP_MD_CTX_free(md_ctx);
EVP_MD_free(md5);
@@ -350,7 +343,7 @@ unsigned long X509_NAME_hash_old(const X509_NAME *x)
/* Search a stack of X509 for a match */
X509 *X509_find_by_issuer_and_serial(STACK_OF(X509) *sk, const X509_NAME *name,
- const ASN1_INTEGER *serial)
+ const ASN1_INTEGER *serial)
{
int i;
X509 x, *x509 = NULL;
@@ -448,7 +441,7 @@ static int check_suite_b(EVP_PKEY *pkey, int sign_nid, unsigned long *pflags)
return X509_V_ERR_SUITE_B_INVALID_ALGORITHM;
if (!EVP_PKEY_get_group_name(pkey, curve_name, sizeof(curve_name),
- &curve_name_len))
+ &curve_name_len))
return X509_V_ERR_SUITE_B_INVALID_CURVE;
curve_nid = OBJ_txt2nid(curve_name);
@@ -475,7 +468,7 @@ static int check_suite_b(EVP_PKEY *pkey, int sign_nid, unsigned long *pflags)
}
int X509_chain_check_suiteb(int *perror_depth, X509 *x, STACK_OF(X509) *chain,
- unsigned long flags)
+ unsigned long flags)
{
int rv, i, sign_nid;
EVP_PKEY *pk;
@@ -531,11 +524,12 @@ int X509_chain_check_suiteb(int *perror_depth, X509 *x, STACK_OF(X509) *chain,
/* Final check: root CA signature */
rv = check_suite_b(pk, X509_get_signature_nid(x), &tflags);
- end:
+end:
if (rv != X509_V_OK) {
/* Invalid signature or LOS errors are for previous cert */
if ((rv == X509_V_ERR_SUITE_B_INVALID_SIGNATURE_ALGORITHM
- || rv == X509_V_ERR_SUITE_B_LOS_NOT_ALLOWED) && i)
+ || rv == X509_V_ERR_SUITE_B_LOS_NOT_ALLOWED)
+ && i)
i--;
/*
* If we have LOS error and flags changed then we are signing P-384
@@ -560,7 +554,7 @@ int X509_CRL_check_suiteb(X509_CRL *crl, EVP_PKEY *pk, unsigned long flags)
#else
int X509_chain_check_suiteb(int *perror_depth, X509 *x, STACK_OF(X509) *chain,
- unsigned long flags)
+ unsigned long flags)
{
return 0;
}
@@ -592,7 +586,7 @@ STACK_OF(X509) *X509_chain_up_ref(STACK_OF(X509) *chain)
}
return ret;
- err:
+err:
while (i-- > 0)
X509_free(sk_X509_value(ret, i));
sk_X509_free(ret);
diff --git a/crypto/x509/x509_d2.c b/crypto/x509/x509_d2.c
index dd18bcd586..010cdb9c7b 100644
--- a/crypto/x509/x509_d2.c
+++ b/crypto/x509/x509_d2.c
@@ -13,7 +13,7 @@
#include <openssl/x509.h>
int X509_STORE_set_default_paths_ex(X509_STORE *ctx, OSSL_LIB_CTX *libctx,
- const char *propq)
+ const char *propq)
{
X509_LOOKUP *lookup;
@@ -48,14 +48,15 @@ int X509_STORE_set_default_paths(X509_STORE *ctx)
}
int X509_STORE_load_file_ex(X509_STORE *ctx, const char *file,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_LIB_CTX *libctx, const char *propq)
{
X509_LOOKUP *lookup;
if (file == NULL
|| (lookup = X509_STORE_add_lookup(ctx, X509_LOOKUP_file())) == NULL
|| X509_LOOKUP_load_file_ex(lookup, file, X509_FILETYPE_PEM, libctx,
- propq) <= 0)
+ propq)
+ <= 0)
return 0;
return 1;
@@ -79,7 +80,7 @@ int X509_STORE_load_path(X509_STORE *ctx, const char *path)
}
int X509_STORE_load_store_ex(X509_STORE *ctx, const char *uri,
- OSSL_LIB_CTX *libctx, const char *propq)
+ OSSL_LIB_CTX *libctx, const char *propq)
{
X509_LOOKUP *lookup;
@@ -97,8 +98,8 @@ int X509_STORE_load_store(X509_STORE *ctx, const char *uri)
}
int X509_STORE_load_locations_ex(X509_STORE *ctx, const char *file,
- const char *path, OSSL_LIB_CTX *libctx,
- const char *propq)
+ const char *path, OSSL_LIB_CTX *libctx,
+ const char *propq)
{
if (file == NULL && path == NULL)
return 0;
@@ -110,7 +111,7 @@ int X509_STORE_load_locations_ex(X509_STORE *ctx, const char *file,
}
int X509_STORE_load_locations(X509_STORE *ctx, const char *file,
- const char *path)
+ const char *path)
{
return X509_STORE_load_locations_ex(ctx, file, path, NULL, NULL);
}
diff --git a/crypto/x509/x509_def.c b/crypto/x509/x509_def.c
index 7d5b642c45..5a6ecaf476 100644
--- a/crypto/x509/x509_def.c
+++ b/crypto/x509/x509_def.c
@@ -16,7 +16,7 @@
#if defined(_WIN32)
-static char x509_private_dir[MAX_PATH + 1];
+static char x509_private_dir[MAX_PATH + 1];
static char *x509_private_dirptr = NULL;
static char x509_cert_area[MAX_PATH + 1];
@@ -67,7 +67,7 @@ DEFINE_RUN_ONCE_STATIC(do_openssldir_setup)
const char *X509_get_default_private_dir(void)
{
-#if defined (_WIN32)
+#if defined(_WIN32)
RUN_ONCE(&openssldir_setup_init, do_openssldir_setup);
return x509_private_dirptr;
#else
@@ -77,7 +77,7 @@ const char *X509_get_default_private_dir(void)
const char *X509_get_default_cert_area(void)
{
-#if defined (_WIN32)
+#if defined(_WIN32)
RUN_ONCE(&openssldir_setup_init, do_openssldir_setup);
return x509_cert_areaptr;
#else
@@ -87,7 +87,7 @@ const char *X509_get_default_cert_area(void)
const char *X509_get_default_cert_dir(void)
{
-#if defined (_WIN32)
+#if defined(_WIN32)
RUN_ONCE(&openssldir_setup_init, do_openssldir_setup);
return x509_cert_dirptr;
#else
@@ -97,7 +97,7 @@ const char *X509_get_default_cert_dir(void)
const char *X509_get_default_cert_file(void)
{
-#if defined (_WIN32)
+#if defined(_WIN32)
RUN_ONCE(&openssldir_setup_init, do_openssldir_setup);
return x509_cert_fileptr;
#else
diff --git a/crypto/x509/x509_err.c b/crypto/x509/x509_err.c
index 607d38f3be..3d6e8768f8 100644
--- a/crypto/x509/x509_err.c
+++ b/crypto/x509/x509_err.c
@@ -15,75 +15,75 @@
#ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA X509_str_reasons[] = {
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_AKID_MISMATCH), "akid mismatch"},
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_BAD_SELECTOR), "bad selector"},
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_BAD_X509_FILETYPE), "bad x509 filetype"},
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_BASE64_DECODE_ERROR),
- "base64 decode error"},
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_CANT_CHECK_DH_KEY), "can't check dh key"},
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_CERTIFICATE_VERIFICATION_FAILED),
- "certificate verification failed"},
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_CERT_ALREADY_IN_HASH_TABLE),
- "cert already in hash table"},
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_CRL_ALREADY_DELTA), "crl already delta"},
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_CRL_VERIFY_FAILURE),
- "crl verify failure"},
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_DUPLICATE_ATTRIBUTE),
- "duplicate attribute"},
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_ERROR_GETTING_MD_BY_NID),
- "error getting md by nid"},
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_ERROR_USING_SIGINF_SET),
- "error using siginf set"},
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_IDP_MISMATCH), "idp mismatch"},
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_INVALID_ATTRIBUTES),
- "invalid attributes"},
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_INVALID_DIRECTORY), "invalid directory"},
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_INVALID_DISTPOINT), "invalid distpoint"},
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_INVALID_FIELD_NAME),
- "invalid field name"},
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_INVALID_TRUST), "invalid trust"},
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_ISSUER_MISMATCH), "issuer mismatch"},
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_KEY_TYPE_MISMATCH), "key type mismatch"},
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_KEY_VALUES_MISMATCH),
- "key values mismatch"},
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_LOADING_CERT_DIR), "loading cert dir"},
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_LOADING_DEFAULTS), "loading defaults"},
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_METHOD_NOT_SUPPORTED),
- "method not supported"},
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_NAME_TOO_LONG), "name too long"},
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_NEWER_CRL_NOT_NEWER),
- "newer crl not newer"},
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_NO_CERTIFICATE_FOUND),
- "no certificate found"},
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_NO_CERTIFICATE_OR_CRL_FOUND),
- "no certificate or crl found"},
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_NO_CERT_SET_FOR_US_TO_VERIFY),
- "no cert set for us to verify"},
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_NO_CRL_FOUND), "no crl found"},
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_NO_CRL_NUMBER), "no crl number"},
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_PUBLIC_KEY_DECODE_ERROR),
- "public key decode error"},
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_PUBLIC_KEY_ENCODE_ERROR),
- "public key encode error"},
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_SHOULD_RETRY), "should retry"},
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_UNABLE_TO_FIND_PARAMETERS_IN_CHAIN),
- "unable to find parameters in chain"},
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_UNABLE_TO_GET_CERTS_PUBLIC_KEY),
- "unable to get certs public key"},
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_UNKNOWN_KEY_TYPE), "unknown key type"},
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_UNKNOWN_NID), "unknown nid"},
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_UNKNOWN_PURPOSE_ID),
- "unknown purpose id"},
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_UNKNOWN_SIGID_ALGS),
- "unknown sigid algs"},
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_UNKNOWN_TRUST_ID), "unknown trust id"},
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_UNSUPPORTED_ALGORITHM),
- "unsupported algorithm"},
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_UNSUPPORTED_VERSION),
- "unsupported version"},
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_WRONG_LOOKUP_TYPE), "wrong lookup type"},
- {ERR_PACK(ERR_LIB_X509, 0, X509_R_WRONG_TYPE), "wrong type"},
- {0, NULL}
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_AKID_MISMATCH), "akid mismatch" },
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_BAD_SELECTOR), "bad selector" },
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_BAD_X509_FILETYPE), "bad x509 filetype" },
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_BASE64_DECODE_ERROR),
+ "base64 decode error" },
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_CANT_CHECK_DH_KEY), "can't check dh key" },
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_CERTIFICATE_VERIFICATION_FAILED),
+ "certificate verification failed" },
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_CERT_ALREADY_IN_HASH_TABLE),
+ "cert already in hash table" },
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_CRL_ALREADY_DELTA), "crl already delta" },
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_CRL_VERIFY_FAILURE),
+ "crl verify failure" },
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_DUPLICATE_ATTRIBUTE),
+ "duplicate attribute" },
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_ERROR_GETTING_MD_BY_NID),
+ "error getting md by nid" },
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_ERROR_USING_SIGINF_SET),
+ "error using siginf set" },
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_IDP_MISMATCH), "idp mismatch" },
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_INVALID_ATTRIBUTES),
+ "invalid attributes" },
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_INVALID_DIRECTORY), "invalid directory" },
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_INVALID_DISTPOINT), "invalid distpoint" },
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_INVALID_FIELD_NAME),
+ "invalid field name" },
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_INVALID_TRUST), "invalid trust" },
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_ISSUER_MISMATCH), "issuer mismatch" },
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_KEY_TYPE_MISMATCH), "key type mismatch" },
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_KEY_VALUES_MISMATCH),
+ "key values mismatch" },
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_LOADING_CERT_DIR), "loading cert dir" },
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_LOADING_DEFAULTS), "loading defaults" },
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_METHOD_NOT_SUPPORTED),
+ "method not supported" },
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_NAME_TOO_LONG), "name too long" },
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_NEWER_CRL_NOT_NEWER),
+ "newer crl not newer" },
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_NO_CERTIFICATE_FOUND),
+ "no certificate found" },
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_NO_CERTIFICATE_OR_CRL_FOUND),
+ "no certificate or crl found" },
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_NO_CERT_SET_FOR_US_TO_VERIFY),
+ "no cert set for us to verify" },
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_NO_CRL_FOUND), "no crl found" },
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_NO_CRL_NUMBER), "no crl number" },
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_PUBLIC_KEY_DECODE_ERROR),
+ "public key decode error" },
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_PUBLIC_KEY_ENCODE_ERROR),
+ "public key encode error" },
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_SHOULD_RETRY), "should retry" },
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_UNABLE_TO_FIND_PARAMETERS_IN_CHAIN),
+ "unable to find parameters in chain" },
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_UNABLE_TO_GET_CERTS_PUBLIC_KEY),
+ "unable to get certs public key" },
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_UNKNOWN_KEY_TYPE), "unknown key type" },
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_UNKNOWN_NID), "unknown nid" },
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_UNKNOWN_PURPOSE_ID),
+ "unknown purpose id" },
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_UNKNOWN_SIGID_ALGS),
+ "unknown sigid algs" },
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_UNKNOWN_TRUST_ID), "unknown trust id" },
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_UNSUPPORTED_ALGORITHM),
+ "unsupported algorithm" },
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_UNSUPPORTED_VERSION),
+ "unsupported version" },
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_WRONG_LOOKUP_TYPE), "wrong lookup type" },
+ { ERR_PACK(ERR_LIB_X509, 0, X509_R_WRONG_TYPE), "wrong type" },
+ { 0, NULL }
};
#endif
diff --git a/crypto/x509/x509_ext.c b/crypto/x509/x509_ext.c
index e004a07d88..88315e6d5c 100644
--- a/crypto/x509/x509_ext.c
+++ b/crypto/x509/x509_ext.c
@@ -27,7 +27,7 @@ int X509_CRL_get_ext_by_NID(const X509_CRL *x, int nid, int lastpos)
}
int X509_CRL_get_ext_by_OBJ(const X509_CRL *x, const ASN1_OBJECT *obj,
- int lastpos)
+ int lastpos)
{
return X509v3_get_ext_by_OBJ(x->crl.extensions, obj, lastpos);
}
@@ -65,7 +65,7 @@ void *X509_CRL_get_ext_d2i(const X509_CRL *x, int nid, int *crit, int *idx)
}
int X509_CRL_add1_ext_i2d(X509_CRL *x, int nid, void *value, int crit,
- unsigned long flags)
+ unsigned long flags)
{
return X509V3_add1_i2d(&x->crl.extensions, nid, value, crit, flags);
}
@@ -92,8 +92,7 @@ int X509_get_ext_by_OBJ(const X509 *x, const ASN1_OBJECT *obj, int lastpos)
int X509_get_ext_by_critical(const X509 *x, int crit, int lastpos)
{
- return (X509v3_get_ext_by_critical
- (x->cert_info.extensions, crit, lastpos));
+ return (X509v3_get_ext_by_critical(x->cert_info.extensions, crit, lastpos));
}
X509_EXTENSION *X509_get_ext(const X509 *x, int loc)
@@ -117,10 +116,10 @@ void *X509_get_ext_d2i(const X509 *x, int nid, int *crit, int *idx)
}
int X509_add1_ext_i2d(X509 *x, int nid, void *value, int crit,
- unsigned long flags)
+ unsigned long flags)
{
return X509V3_add1_i2d(&x->cert_info.extensions, nid, value, crit,
- flags);
+ flags);
}
int X509_REVOKED_get_ext_count(const X509_REVOKED *x)
@@ -134,7 +133,7 @@ int X509_REVOKED_get_ext_by_NID(const X509_REVOKED *x, int nid, int lastpos)
}
int X509_REVOKED_get_ext_by_OBJ(const X509_REVOKED *x, const ASN1_OBJECT *obj,
- int lastpos)
+ int lastpos)
{
return X509v3_get_ext_by_OBJ(x->extensions, obj, lastpos);
}
@@ -165,7 +164,7 @@ void *X509_REVOKED_get_ext_d2i(const X509_REVOKED *x, int nid, int *crit, int *i
}
int X509_REVOKED_add1_ext_i2d(X509_REVOKED *x, int nid, void *value, int crit,
- unsigned long flags)
+ unsigned long flags)
{
return X509V3_add1_i2d(&x->extensions, nid, value, crit, flags);
}
diff --git a/crypto/x509/x509_local.h b/crypto/x509/x509_local.h
index 5510520709..9eef700436 100644
--- a/crypto/x509/x509_local.h
+++ b/crypto/x509/x509_local.h
@@ -21,22 +21,22 @@
struct X509_VERIFY_PARAM_st {
char *name;
- int64_t check_time; /* Time to use */
- uint32_t inh_flags; /* Inheritance flags */
- unsigned long flags; /* Various verify flags */
- int purpose; /* purpose to check untrusted certificates */
- int trust; /* trust setting to check */
- int depth; /* Verify depth */
- int auth_level; /* Security level for chain verification */
+ int64_t check_time; /* Time to use */
+ uint32_t inh_flags; /* Inheritance flags */
+ unsigned long flags; /* Various verify flags */
+ int purpose; /* purpose to check untrusted certificates */
+ int trust; /* trust setting to check */
+ int depth; /* Verify depth */
+ int auth_level; /* Security level for chain verification */
STACK_OF(ASN1_OBJECT) *policies; /* Permissible policies */
/* Peer identity details */
STACK_OF(OPENSSL_STRING) *hosts; /* Set of acceptable names */
- unsigned int hostflags; /* Flags to control matching features */
- char *peername; /* Matching hostname in peer certificate */
- char *email; /* If not NULL email address to match */
+ unsigned int hostflags; /* Flags to control matching features */
+ char *peername; /* Matching hostname in peer certificate */
+ char *email; /* If not NULL email address to match */
size_t emaillen;
- unsigned char *ip; /* If not NULL IP address to match */
- size_t iplen; /* Length of IP address */
+ unsigned char *ip; /* If not NULL IP address to match */
+ size_t iplen; /* Length of IP address */
};
/* No error callback if depth < 0 */
@@ -61,50 +61,50 @@ struct X509_extension_st {
* redirected to more efficient callbacks: for example a CRL entry database.
*/
-#define X509_CRL_METHOD_DYNAMIC 1
+#define X509_CRL_METHOD_DYNAMIC 1
struct x509_crl_method_st {
int flags;
- int (*crl_init) (X509_CRL *crl);
- int (*crl_free) (X509_CRL *crl);
- int (*crl_lookup) (X509_CRL *crl, X509_REVOKED **ret,
- const ASN1_INTEGER *ser, const X509_NAME *issuer);
- int (*crl_verify) (X509_CRL *crl, EVP_PKEY *pk);
+ int (*crl_init)(X509_CRL *crl);
+ int (*crl_free)(X509_CRL *crl);
+ int (*crl_lookup)(X509_CRL *crl, X509_REVOKED **ret,
+ const ASN1_INTEGER *ser, const X509_NAME *issuer);
+ int (*crl_verify)(X509_CRL *crl, EVP_PKEY *pk);
};
struct x509_lookup_method_st {
char *name;
- int (*new_item) (X509_LOOKUP *ctx);
- void (*free) (X509_LOOKUP *ctx);
- int (*init) (X509_LOOKUP *ctx);
- int (*shutdown) (X509_LOOKUP *ctx);
- int (*ctrl) (X509_LOOKUP *ctx, int cmd, const char *argc, long argl,
- char **ret);
- int (*get_by_subject) (X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
- const X509_NAME *name, X509_OBJECT *ret);
- int (*get_by_issuer_serial) (X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
- const X509_NAME *name,
- const ASN1_INTEGER *serial,
- X509_OBJECT *ret);
- int (*get_by_fingerprint) (X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
- const unsigned char *bytes, int len,
- X509_OBJECT *ret);
- int (*get_by_alias) (X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
- const char *str, int len, X509_OBJECT *ret);
- int (*get_by_subject_ex) (X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
- const X509_NAME *name, X509_OBJECT *ret,
- OSSL_LIB_CTX *libctx, const char *propq);
- int (*ctrl_ex) (X509_LOOKUP *ctx, int cmd, const char *argc, long argl,
- char **ret, OSSL_LIB_CTX *libctx, const char *propq);
+ int (*new_item)(X509_LOOKUP *ctx);
+ void (*free)(X509_LOOKUP *ctx);
+ int (*init)(X509_LOOKUP *ctx);
+ int (*shutdown)(X509_LOOKUP *ctx);
+ int (*ctrl)(X509_LOOKUP *ctx, int cmd, const char *argc, long argl,
+ char **ret);
+ int (*get_by_subject)(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
+ const X509_NAME *name, X509_OBJECT *ret);
+ int (*get_by_issuer_serial)(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
+ const X509_NAME *name,
+ const ASN1_INTEGER *serial,
+ X509_OBJECT *ret);
+ int (*get_by_fingerprint)(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
+ const unsigned char *bytes, int len,
+ X509_OBJECT *ret);
+ int (*get_by_alias)(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
+ const char *str, int len, X509_OBJECT *ret);
+ int (*get_by_subject_ex)(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
+ const X509_NAME *name, X509_OBJECT *ret,
+ OSSL_LIB_CTX *libctx, const char *propq);
+ int (*ctrl_ex)(X509_LOOKUP *ctx, int cmd, const char *argc, long argl,
+ char **ret, OSSL_LIB_CTX *libctx, const char *propq);
};
/* This is the functions plus an instance of the local variables. */
struct x509_lookup_st {
- int init; /* have we been started */
- int skip; /* don't use us. */
+ int init; /* have we been started */
+ int skip; /* don't use us. */
X509_LOOKUP_METHOD *method; /* the functions */
- void *method_data; /* method data */
- X509_STORE *store_ctx; /* who owns us */
+ void *method_data; /* method data */
+ X509_STORE *store_ctx; /* who owns us */
};
HT_START_KEY_DEFN(objs_key)
@@ -119,7 +119,7 @@ HT_END_KEY_DEFN(OBJS_KEY)
*/
struct x509_store_st {
/* The following is a cache of trusted certs */
- int cache; /* if true, stash any hits */
+ int cache; /* if true, stash any hits */
/* Maps X509_NAME -> STACK_OF(X509_OBJECT) */
HT *objs_ht;
/*
@@ -132,29 +132,29 @@ struct x509_store_st {
X509_VERIFY_PARAM *param;
/* Callbacks for various operations */
/* called to verify a certificate */
- int (*verify) (X509_STORE_CTX *ctx);
+ int (*verify)(X509_STORE_CTX *ctx);
/* error callback */
- int (*verify_cb) (int ok, X509_STORE_CTX *ctx);
+ int (*verify_cb)(int ok, X509_STORE_CTX *ctx);
/* get issuers cert from ctx */
- int (*get_issuer) (X509 **issuer, X509_STORE_CTX *ctx, X509 *x);
+ int (*get_issuer)(X509 **issuer, X509_STORE_CTX *ctx, X509 *x);
/* check issued */
- int (*check_issued) (X509_STORE_CTX *ctx, X509 *x, X509 *issuer);
+ int (*check_issued)(X509_STORE_CTX *ctx, X509 *x, X509 *issuer);
/* Check revocation status of chain */
- int (*check_revocation) (X509_STORE_CTX *ctx);
+ int (*check_revocation)(X509_STORE_CTX *ctx);
/* retrieve CRL */
- int (*get_crl) (X509_STORE_CTX *ctx, X509_CRL **crl, X509 *x);
+ int (*get_crl)(X509_STORE_CTX *ctx, X509_CRL **crl, X509 *x);
/* Check CRL validity */
- int (*check_crl) (X509_STORE_CTX *ctx, X509_CRL *crl);
+ int (*check_crl)(X509_STORE_CTX *ctx, X509_CRL *crl);
/* Check certificate against CRL */
- int (*cert_crl) (X509_STORE_CTX *ctx, X509_CRL *crl, X509 *x);
+ int (*cert_crl)(X509_STORE_CTX *ctx, X509_CRL *crl, X509 *x);
/* Check policy status of the chain */
- int (*check_policy) (X509_STORE_CTX *ctx);
- STACK_OF(X509) *(*lookup_certs) (X509_STORE_CTX *ctx,
- const X509_NAME *nm);
+ int (*check_policy)(X509_STORE_CTX *ctx);
+ STACK_OF(X509) *(*lookup_certs)(X509_STORE_CTX *ctx,
+ const X509_NAME *nm);
/* cannot constify 'ctx' param due to lookup_certs_sk() in x509_vfy.c */
- STACK_OF(X509_CRL) *(*lookup_crls) (const X509_STORE_CTX *ctx,
- const X509_NAME *nm);
- int (*cleanup) (X509_STORE_CTX *ctx);
+ STACK_OF(X509_CRL) *(*lookup_crls)(const X509_STORE_CTX *ctx,
+ const X509_NAME *nm);
+ int (*cleanup)(X509_STORE_CTX *ctx);
CRYPTO_EX_DATA ex_data;
CRYPTO_REF_COUNT references;
CRYPTO_RWLOCK *lock;
@@ -170,7 +170,7 @@ DEFINE_STACK_OF(STACK_OF_X509_NAME_ENTRY)
int ossl_x509_likely_issued(X509 *issuer, X509 *subject);
int ossl_x509_signing_allowed(const X509 *issuer, const X509 *subject);
int ossl_x509_store_ctx_get_by_subject(const X509_STORE_CTX *ctx, X509_LOOKUP_TYPE type,
- const X509_NAME *name, X509_OBJECT *ret);
+ const X509_NAME *name, X509_OBJECT *ret);
__owur int ossl_x509_store_read_lock(X509_STORE *xs);
STACK_OF(X509_OBJECT) *ossl_x509_store_ht_get_by_name(const X509_STORE *store,
- const X509_NAME *xn);
+ const X509_NAME *xn);
diff --git a/crypto/x509/x509_lu.c b/crypto/x509/x509_lu.c
index a8a80fb948..1167fcf1fc 100644
--- a/crypto/x509/x509_lu.c
+++ b/crypto/x509/x509_lu.c
@@ -39,7 +39,7 @@ void X509_LOOKUP_free(X509_LOOKUP *ctx)
if (ctx == NULL)
return;
if ((ctx->method != NULL) && (ctx->method->free != NULL))
- (*ctx->method->free) (ctx);
+ (*ctx->method->free)(ctx);
OPENSSL_free(ctx);
}
@@ -79,7 +79,7 @@ int X509_LOOKUP_shutdown(X509_LOOKUP *ctx)
}
int X509_LOOKUP_ctrl_ex(X509_LOOKUP *ctx, int cmd, const char *argc, long argl,
- char **ret, OSSL_LIB_CTX *libctx, const char *propq)
+ char **ret, OSSL_LIB_CTX *libctx, const char *propq)
{
if (ctx->method == NULL)
return -1;
@@ -91,14 +91,14 @@ int X509_LOOKUP_ctrl_ex(X509_LOOKUP *ctx, int cmd, const char *argc, long argl,
}
int X509_LOOKUP_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc, long argl,
- char **ret)
+ char **ret)
{
return X509_LOOKUP_ctrl_ex(ctx, cmd, argc, argl, ret, NULL, NULL);
}
int X509_LOOKUP_by_subject_ex(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
- const X509_NAME *name, X509_OBJECT *ret,
- OSSL_LIB_CTX *libctx, const char *propq)
+ const X509_NAME *name, X509_OBJECT *ret,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
if (ctx->skip
|| ctx->method == NULL
@@ -107,21 +107,21 @@ int X509_LOOKUP_by_subject_ex(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
return 0;
if (ctx->method->get_by_subject_ex != NULL)
return ctx->method->get_by_subject_ex(ctx, type, name, ret, libctx,
- propq);
+ propq);
else
return ctx->method->get_by_subject(ctx, type, name, ret);
}
int X509_LOOKUP_by_subject(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
- const X509_NAME *name, X509_OBJECT *ret)
+ const X509_NAME *name, X509_OBJECT *ret)
{
return X509_LOOKUP_by_subject_ex(ctx, type, name, ret, NULL, NULL);
}
int X509_LOOKUP_by_issuer_serial(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
- const X509_NAME *name,
- const ASN1_INTEGER *serial,
- X509_OBJECT *ret)
+ const X509_NAME *name,
+ const ASN1_INTEGER *serial,
+ X509_OBJECT *ret)
{
if ((ctx->method == NULL) || (ctx->method->get_by_issuer_serial == NULL))
return 0;
@@ -129,8 +129,8 @@ int X509_LOOKUP_by_issuer_serial(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
}
int X509_LOOKUP_by_fingerprint(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
- const unsigned char *bytes, int len,
- X509_OBJECT *ret)
+ const unsigned char *bytes, int len,
+ X509_OBJECT *ret)
{
if ((ctx->method == NULL) || (ctx->method->get_by_fingerprint == NULL))
return 0;
@@ -138,7 +138,7 @@ int X509_LOOKUP_by_fingerprint(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
}
int X509_LOOKUP_by_alias(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
- const char *str, int len, X509_OBJECT *ret)
+ const char *str, int len, X509_OBJECT *ret)
{
if ((ctx->method == NULL) || (ctx->method->get_by_alias == NULL))
return 0;
@@ -162,7 +162,7 @@ X509_STORE *X509_LOOKUP_get_store(const X509_LOOKUP *ctx)
}
static int x509_object_cmp(const X509_OBJECT *const *a,
- const X509_OBJECT *const *b)
+ const X509_OBJECT *const *b)
{
int ret;
@@ -326,8 +326,8 @@ X509_LOOKUP *X509_STORE_add_lookup(X509_STORE *xs, X509_LOOKUP_METHOD *m)
/* Also fill the cache (ctx->store->objs) with all matching certificates. */
X509_OBJECT *X509_STORE_CTX_get_obj_by_subject(X509_STORE_CTX *ctx,
- X509_LOOKUP_TYPE type,
- const X509_NAME *name)
+ X509_LOOKUP_TYPE type,
+ const X509_NAME *name)
{
X509_OBJECT *ret = X509_OBJECT_new();
@@ -341,7 +341,7 @@ X509_OBJECT *X509_STORE_CTX_get_obj_by_subject(X509_STORE_CTX *ctx,
}
STACK_OF(X509_OBJECT) *ossl_x509_store_ht_get_by_name(const X509_STORE *store,
- const X509_NAME *xn)
+ const X509_NAME *xn)
{
HT_VALUE *v;
OBJS_KEY key;
@@ -365,11 +365,11 @@ STACK_OF(X509_OBJECT) *ossl_x509_store_ht_get_by_name(const X509_STORE *store,
}
static int x509_name_objs_ht_insert(const X509_STORE *store, const X509_NAME *xn,
- STACK_OF(X509_OBJECT) *objs, X509_OBJECT *obj)
+ STACK_OF(X509_OBJECT) *objs, X509_OBJECT *obj)
{
int ret = 0, added = 0;
OBJS_KEY key;
- HT_VALUE val = {0};
+ HT_VALUE val = { 0 };
if (objs != NULL) {
added = sk_X509_OBJECT_push(objs, obj) != 0;
@@ -435,7 +435,7 @@ static int obj_ht_foreach_certs(HT_VALUE *v, void *arg)
* -1 on failure
*/
int ossl_x509_store_ctx_get_by_subject(const X509_STORE_CTX *ctx, X509_LOOKUP_TYPE type,
- const X509_NAME *name, X509_OBJECT *ret)
+ const X509_NAME *name, X509_OBJECT *ret)
{
X509_STORE *store = ctx->store;
X509_LOOKUP *lu;
@@ -468,7 +468,7 @@ int ossl_x509_store_ctx_get_by_subject(const X509_STORE_CTX *ctx, X509_LOOKUP_TY
if (lu->method == NULL)
return -1;
j = X509_LOOKUP_by_subject_ex(lu, type, name, &stmp,
- ctx->libctx, ctx->propq);
+ ctx->libctx, ctx->propq);
if (j != 0) { /* non-zero value is considered success here */
tmp = &stmp;
break;
@@ -489,8 +489,8 @@ int ossl_x509_store_ctx_get_by_subject(const X509_STORE_CTX *ctx, X509_LOOKUP_TY
/* Also fill the cache |ctx->store->objs| with all matching certificates. */
int X509_STORE_CTX_get_by_subject(const X509_STORE_CTX *ctx,
- X509_LOOKUP_TYPE type,
- const X509_NAME *name, X509_OBJECT *ret)
+ X509_LOOKUP_TYPE type,
+ const X509_NAME *name, X509_OBJECT *ret)
{
return ossl_x509_store_ctx_get_by_subject(ctx, type, name, ret) > 0;
}
@@ -553,7 +553,7 @@ static int x509_store_add(X509_STORE *store, void *x, int crl)
}
X509_STORE_unlock(store);
- if (added == 0) /* obj not pushed */
+ if (added == 0) /* obj not pushed */
X509_OBJECT_free(obj);
return ret;
@@ -665,7 +665,7 @@ void X509_OBJECT_free(X509_OBJECT *a)
/* Returns -1 if not found, but also on error */
static int x509_object_idx_cnt(STACK_OF(X509_OBJECT) *h, X509_LOOKUP_TYPE type,
- const X509_NAME *name, int *pnmatch)
+ const X509_NAME *name, int *pnmatch)
{
X509_OBJECT stmp;
X509 x509_s;
@@ -693,15 +693,15 @@ static int x509_object_idx_cnt(STACK_OF(X509_OBJECT) *h, X509_LOOKUP_TYPE type,
/* Assumes h is locked for read if applicable */
int X509_OBJECT_idx_by_subject(STACK_OF(X509_OBJECT) *h, X509_LOOKUP_TYPE type,
- const X509_NAME *name)
+ const X509_NAME *name)
{
return x509_object_idx_cnt(h, type, name, NULL);
}
/* Assumes h is locked for read if applicable */
X509_OBJECT *X509_OBJECT_retrieve_by_subject(STACK_OF(X509_OBJECT) *h,
- X509_LOOKUP_TYPE type,
- const X509_NAME *name)
+ X509_LOOKUP_TYPE type,
+ const X509_NAME *name)
{
int idx = X509_OBJECT_idx_by_subject(h, type, name);
@@ -740,7 +740,7 @@ static int obj_ht_foreach_object(HT_VALUE *v, void *arg)
return 1;
- err:
+err:
sk_X509_OBJECT_pop_free(*sk, X509_OBJECT_free);
*sk = NULL;
@@ -782,7 +782,7 @@ STACK_OF(X509_OBJECT) *X509_STORE_get1_objects(X509_STORE *store)
ossl_ht_foreach_until(store->objs_ht, obj_ht_foreach_object, &objs);
} else {
objs = sk_X509_OBJECT_deep_copy(store->objs, x509_object_dup,
- X509_OBJECT_free);
+ X509_OBJECT_free);
}
X509_STORE_unlock(store);
@@ -818,9 +818,9 @@ STACK_OF(X509) *X509_STORE_get1_all_certs(X509_STORE *store)
return sk;
- err:
+err:
X509_STORE_unlock(store);
- out_free:
+out_free:
OSSL_STACK_OF_X509_free(sk);
return NULL;
}
@@ -830,7 +830,7 @@ STACK_OF(X509) *X509_STORE_get1_all_certs(X509_STORE *store)
* Returns NULL on internal/fatal error, empty stack if not found.
*/
STACK_OF(X509) *X509_STORE_CTX_get1_certs(X509_STORE_CTX *ctx,
- const X509_NAME *nm)
+ const X509_NAME *nm)
{
int i, idx = -1, cnt = 0;
STACK_OF(X509) *sk = NULL;
@@ -889,14 +889,14 @@ STACK_OF(X509) *X509_STORE_CTX_get1_certs(X509_STORE_CTX *ctx,
}
}
- end:
+end:
X509_STORE_unlock(store);
return sk;
}
/* Returns NULL on internal/fatal error, empty stack if not found */
STACK_OF(X509_CRL) *X509_STORE_CTX_get1_crls(const X509_STORE_CTX *ctx,
- const X509_NAME *nm)
+ const X509_NAME *nm)
{
int i = 1, idx, cnt = 0;
STACK_OF(X509_CRL) *sk;
@@ -944,13 +944,13 @@ STACK_OF(X509_CRL) *X509_STORE_CTX_get1_crls(const X509_STORE_CTX *ctx,
return NULL;
}
}
- end:
+end:
X509_STORE_unlock(store);
return sk;
}
X509_OBJECT *X509_OBJECT_retrieve_match(STACK_OF(X509_OBJECT) *h,
- X509_OBJECT *x)
+ X509_OBJECT *x)
{
int idx, i, num;
X509_OBJECT *obj;
@@ -963,7 +963,7 @@ X509_OBJECT *X509_OBJECT_retrieve_match(STACK_OF(X509_OBJECT) *h,
for (i = idx, num = sk_X509_OBJECT_num(h); i < num; i++) {
obj = sk_X509_OBJECT_value(h, i);
if (x509_object_cmp((const X509_OBJECT **)&obj,
- (const X509_OBJECT **)&x))
+ (const X509_OBJECT **)&x))
return NULL;
if (x->type == X509_LU_X509) {
if (!X509_cmp(obj->data.x509, x->data.x509))
@@ -1020,7 +1020,7 @@ X509_STORE_CTX_verify_fn X509_STORE_get_verify(const X509_STORE *xs)
}
void X509_STORE_set_verify_cb(X509_STORE *xs,
- X509_STORE_CTX_verify_cb verify_cb)
+ X509_STORE_CTX_verify_cb verify_cb)
{
xs->verify_cb = verify_cb;
}
@@ -1031,7 +1031,7 @@ X509_STORE_CTX_verify_cb X509_STORE_get_verify_cb(const X509_STORE *xs)
}
void X509_STORE_set_get_issuer(X509_STORE *xs,
- X509_STORE_CTX_get_issuer_fn get_issuer)
+ X509_STORE_CTX_get_issuer_fn get_issuer)
{
xs->get_issuer = get_issuer;
}
@@ -1042,7 +1042,7 @@ X509_STORE_CTX_get_issuer_fn X509_STORE_get_get_issuer(const X509_STORE *xs)
}
void X509_STORE_set_check_issued(X509_STORE *xs,
- X509_STORE_CTX_check_issued_fn check_issued)
+ X509_STORE_CTX_check_issued_fn check_issued)
{
xs->check_issued = check_issued;
}
@@ -1053,7 +1053,7 @@ X509_STORE_CTX_check_issued_fn X509_STORE_get_check_issued(const X509_STORE *xs)
}
void X509_STORE_set_check_revocation(X509_STORE *xs,
- X509_STORE_CTX_check_revocation_fn cb)
+ X509_STORE_CTX_check_revocation_fn cb)
{
xs->check_revocation = cb;
}
@@ -1064,7 +1064,7 @@ X509_STORE_CTX_check_revocation_fn X509_STORE_get_check_revocation(const X509_ST
}
void X509_STORE_set_get_crl(X509_STORE *xs,
- X509_STORE_CTX_get_crl_fn get_crl)
+ X509_STORE_CTX_get_crl_fn get_crl)
{
xs->get_crl = get_crl;
}
@@ -1075,7 +1075,7 @@ X509_STORE_CTX_get_crl_fn X509_STORE_get_get_crl(const X509_STORE *xs)
}
void X509_STORE_set_check_crl(X509_STORE *xs,
- X509_STORE_CTX_check_crl_fn check_crl)
+ X509_STORE_CTX_check_crl_fn check_crl)
{
xs->check_crl = check_crl;
}
@@ -1086,7 +1086,7 @@ X509_STORE_CTX_check_crl_fn X509_STORE_get_check_crl(const X509_STORE *xs)
}
void X509_STORE_set_cert_crl(X509_STORE *xs,
- X509_STORE_CTX_cert_crl_fn cert_crl)
+ X509_STORE_CTX_cert_crl_fn cert_crl)
{
xs->cert_crl = cert_crl;
}
@@ -1097,7 +1097,7 @@ X509_STORE_CTX_cert_crl_fn X509_STORE_get_cert_crl(const X509_STORE *xs)
}
void X509_STORE_set_check_policy(X509_STORE *xs,
- X509_STORE_CTX_check_policy_fn check_policy)
+ X509_STORE_CTX_check_policy_fn check_policy)
{
xs->check_policy = check_policy;
}
@@ -1108,7 +1108,7 @@ X509_STORE_CTX_check_policy_fn X509_STORE_get_check_policy(const X509_STORE *xs)
}
void X509_STORE_set_lookup_certs(X509_STORE *xs,
- X509_STORE_CTX_lookup_certs_fn lookup_certs)
+ X509_STORE_CTX_lookup_certs_fn lookup_certs)
{
xs->lookup_certs = lookup_certs;
}
@@ -1119,7 +1119,7 @@ X509_STORE_CTX_lookup_certs_fn X509_STORE_get_lookup_certs(const X509_STORE *xs)
}
void X509_STORE_set_lookup_crls(X509_STORE *xs,
- X509_STORE_CTX_lookup_crls_fn lookup_crls)
+ X509_STORE_CTX_lookup_crls_fn lookup_crls)
{
xs->lookup_crls = lookup_crls;
}
@@ -1130,7 +1130,7 @@ X509_STORE_CTX_lookup_crls_fn X509_STORE_get_lookup_crls(const X509_STORE *xs)
}
void X509_STORE_set_cleanup(X509_STORE *xs,
- X509_STORE_CTX_cleanup_fn cleanup)
+ X509_STORE_CTX_cleanup_fn cleanup)
{
xs->cleanup = cleanup;
}
diff --git a/crypto/x509/x509_meth.c b/crypto/x509/x509_meth.c
index 305fe4c6d3..e7b228a33f 100644
--- a/crypto/x509/x509_meth.c
+++ b/crypto/x509/x509_meth.c
@@ -42,55 +42,51 @@ void X509_LOOKUP_meth_free(X509_LOOKUP_METHOD *method)
}
int X509_LOOKUP_meth_set_new_item(X509_LOOKUP_METHOD *method,
- int (*new_item) (X509_LOOKUP *ctx))
+ int (*new_item)(X509_LOOKUP *ctx))
{
method->new_item = new_item;
return 1;
}
-int (*X509_LOOKUP_meth_get_new_item(const X509_LOOKUP_METHOD* method))
- (X509_LOOKUP *ctx)
+int (*X509_LOOKUP_meth_get_new_item(const X509_LOOKUP_METHOD *method))(X509_LOOKUP *ctx)
{
return method->new_item;
}
int X509_LOOKUP_meth_set_free(
X509_LOOKUP_METHOD *method,
- void (*free_fn) (X509_LOOKUP *ctx))
+ void (*free_fn)(X509_LOOKUP *ctx))
{
method->free = free_fn;
return 1;
}
-void (*X509_LOOKUP_meth_get_free(const X509_LOOKUP_METHOD* method))
- (X509_LOOKUP *ctx)
+void (*X509_LOOKUP_meth_get_free(const X509_LOOKUP_METHOD *method))(X509_LOOKUP *ctx)
{
return method->free;
}
int X509_LOOKUP_meth_set_init(X509_LOOKUP_METHOD *method,
- int (*init) (X509_LOOKUP *ctx))
+ int (*init)(X509_LOOKUP *ctx))
{
method->init = init;
return 1;
}
-int (*X509_LOOKUP_meth_get_init(const X509_LOOKUP_METHOD* method))
- (X509_LOOKUP *ctx)
+int (*X509_LOOKUP_meth_get_init(const X509_LOOKUP_METHOD *method))(X509_LOOKUP *ctx)
{
return method->init;
}
int X509_LOOKUP_meth_set_shutdown(
X509_LOOKUP_METHOD *method,
- int (*shutdown) (X509_LOOKUP *ctx))
+ int (*shutdown)(X509_LOOKUP *ctx))
{
method->shutdown = shutdown;
return 1;
}
-int (*X509_LOOKUP_meth_get_shutdown(const X509_LOOKUP_METHOD* method))
- (X509_LOOKUP *ctx)
+int (*X509_LOOKUP_meth_get_shutdown(const X509_LOOKUP_METHOD *method))(X509_LOOKUP *ctx)
{
return method->shutdown;
}
@@ -121,7 +117,6 @@ X509_LOOKUP_get_by_subject_fn X509_LOOKUP_meth_get_get_by_subject(
return method->get_by_subject;
}
-
int X509_LOOKUP_meth_set_get_by_issuer_serial(X509_LOOKUP_METHOD *method,
X509_LOOKUP_get_by_issuer_serial_fn get_by_issuer_serial)
{
@@ -130,12 +125,11 @@ int X509_LOOKUP_meth_set_get_by_issuer_serial(X509_LOOKUP_METHOD *method,
}
X509_LOOKUP_get_by_issuer_serial_fn
- X509_LOOKUP_meth_get_get_by_issuer_serial(const X509_LOOKUP_METHOD *method)
+X509_LOOKUP_meth_get_get_by_issuer_serial(const X509_LOOKUP_METHOD *method)
{
return method->get_by_issuer_serial;
}
-
int X509_LOOKUP_meth_set_get_by_fingerprint(X509_LOOKUP_METHOD *method,
X509_LOOKUP_get_by_fingerprint_fn get_by_fingerprint)
{
@@ -150,7 +144,7 @@ X509_LOOKUP_get_by_fingerprint_fn X509_LOOKUP_meth_get_get_by_fingerprint(
}
int X509_LOOKUP_meth_set_get_by_alias(X509_LOOKUP_METHOD *method,
- X509_LOOKUP_get_by_alias_fn get_by_alias)
+ X509_LOOKUP_get_by_alias_fn get_by_alias)
{
method->get_by_alias = get_by_alias;
return 1;
@@ -161,4 +155,3 @@ X509_LOOKUP_get_by_alias_fn X509_LOOKUP_meth_get_get_by_alias(
{
return method->get_by_alias;
}
-
diff --git a/crypto/x509/x509_obj.c b/crypto/x509/x509_obj.c
index f48972cafe..e2924a62da 100644
--- a/crypto/x509/x509_obj.c
+++ b/crypto/x509/x509_obj.c
@@ -20,7 +20,7 @@
* anything encountered in practice.
*/
-#define NAME_ONELINE_MAX (1024 * 1024)
+#define NAME_ONELINE_MAX (1024 * 1024)
char *X509_NAME_oneline(const X509_NAME *a, char *buf, int len)
{
@@ -58,7 +58,7 @@ char *X509_NAME_oneline(const X509_NAME *a, char *buf, int len)
return buf;
}
- len--; /* space for '\0' */
+ len--; /* space for '\0' */
l = 0;
for (i = 0; i < sk_X509_NAME_ENTRY_num(a->entries); i++) {
ne = sk_X509_NAME_ENTRY_value(a->entries, i);
@@ -77,11 +77,7 @@ char *X509_NAME_oneline(const X509_NAME *a, char *buf, int len)
}
q = ne->value->data;
#ifdef CHARSET_EBCDIC
- if (type == V_ASN1_GENERALSTRING ||
- type == V_ASN1_VISIBLESTRING ||
- type == V_ASN1_PRINTABLESTRING ||
- type == V_ASN1_TELETEXSTRING ||
- type == V_ASN1_IA5STRING) {
+ if (type == V_ASN1_GENERALSTRING || type == V_ASN1_VISIBLESTRING || type == V_ASN1_PRINTABLESTRING || type == V_ASN1_TELETEXSTRING || type == V_ASN1_IA5STRING) {
if (num > (int)sizeof(ebcdic_buf))
num = sizeof(ebcdic_buf);
ascii2ebcdic(ebcdic_buf, q, num);
@@ -110,8 +106,7 @@ char *X509_NAME_oneline(const X509_NAME *a, char *buf, int len)
l2++;
if (q[j] == '/' || q[j] == '+')
l2++; /* char needs to be escaped */
- else if ((ossl_toascii(q[j]) < ossl_toascii(' ')) ||
- (ossl_toascii(q[j]) > ossl_toascii('~')))
+ else if ((ossl_toascii(q[j]) < ossl_toascii(' ')) || (ossl_toascii(q[j]) > ossl_toascii('~')))
l2 += 3;
}
@@ -134,7 +129,7 @@ char *X509_NAME_oneline(const X509_NAME *a, char *buf, int len)
p += l1;
*(p++) = '=';
-#ifndef CHARSET_EBCDIC /* q was assigned above already. */
+#ifndef CHARSET_EBCDIC /* q was assigned above already. */
q = ne->value->data;
#endif
@@ -176,9 +171,9 @@ char *X509_NAME_oneline(const X509_NAME *a, char *buf, int len)
if (i == 0)
*p = '\0';
return p;
- buferr:
+buferr:
ERR_raise(ERR_LIB_X509, ERR_R_BUF_LIB);
- end:
+end:
BUF_MEM_free(b);
return NULL;
}
diff --git a/crypto/x509/x509_r2x.c b/crypto/x509/x509_r2x.c
index a6ea8e36a0..b373a2caa4 100644
--- a/crypto/x509/x509_r2x.c
+++ b/crypto/x509/x509_r2x.c
@@ -37,8 +37,8 @@ X509 *X509_REQ_to_X509(X509_REQ *r, int days, EVP_PKEY *pkey)
goto err;
if (!ASN1_INTEGER_set(xi->version, 2))
goto err;
-/*- xi->extensions=ri->attributes; <- bad, should not ever be done
- ri->attributes=NULL; */
+ /*- xi->extensions=ri->attributes; <- bad, should not ever be done
+ ri->attributes=NULL; */
}
xn = X509_REQ_get_subject_name(r);
@@ -49,8 +49,7 @@ X509 *X509_REQ_to_X509(X509_REQ *r, int days, EVP_PKEY *pkey)
if (X509_gmtime_adj(xi->validity.notBefore, 0) == NULL)
goto err;
- if (X509_gmtime_adj(xi->validity.notAfter, (long)60 * 60 * 24 * days) ==
- NULL)
+ if (X509_gmtime_adj(xi->validity.notAfter, (long)60 * 60 * 24 * days) == NULL)
goto err;
pubkey = X509_REQ_get0_pubkey(r);
@@ -61,7 +60,7 @@ X509 *X509_REQ_to_X509(X509_REQ *r, int days, EVP_PKEY *pkey)
goto err;
return ret;
- err:
+err:
X509_free(ret);
return NULL;
}
diff --git a/crypto/x509/x509_req.c b/crypto/x509/x509_req.c
index 74ebc67529..014c7aa361 100644
--- a/crypto/x509/x509_req.c
+++ b/crypto/x509/x509_req.c
@@ -38,7 +38,7 @@ X509_REQ *X509_to_X509_REQ(X509 *x, EVP_PKEY *pkey, const EVP_MD *md)
ri->version->data = OPENSSL_malloc(1);
if (ri->version->data == NULL)
goto err;
- ri->version->data[0] = 0; /* version == 0 */
+ ri->version->data[0] = 0; /* version == 0 */
if (!X509_REQ_set_subject_name(ret, X509_get_subject_name(x)))
goto err;
@@ -55,7 +55,7 @@ X509_REQ *X509_to_X509_REQ(X509 *x, EVP_PKEY *pkey, const EVP_MD *md)
goto err;
}
return ret;
- err:
+err:
X509_REQ_free(ret);
return NULL;
}
@@ -118,7 +118,7 @@ void X509_REQ_set_extension_nids(int *nids)
}
static STACK_OF(X509_EXTENSION) *get_extensions_by_nid(const X509_REQ *req,
- int nid)
+ int nid)
{
X509_ATTRIBUTE *attr;
ASN1_TYPE *ext = NULL;
@@ -136,7 +136,7 @@ static STACK_OF(X509_EXTENSION) *get_extensions_by_nid(const X509_REQ *req,
p = ext->value.sequence->data;
return (STACK_OF(X509_EXTENSION) *)
ASN1_item_d2i(NULL, &p, ext->value.sequence->length,
- ASN1_ITEM_rptr(X509_EXTENSIONS));
+ ASN1_ITEM_rptr(X509_EXTENSIONS));
}
STACK_OF(X509_EXTENSION) *X509_REQ_get_extensions(const X509_REQ *req)
@@ -163,7 +163,7 @@ STACK_OF(X509_EXTENSION) *X509_REQ_get_extensions(const X509_REQ *req)
* in case we want to create a non standard one.
*/
int X509_REQ_add_extensions_nid(X509_REQ *req,
- const STACK_OF(X509_EXTENSION) *exts, int nid)
+ const STACK_OF(X509_EXTENSION) *exts, int nid)
{
int extlen;
int rv = 0;
@@ -183,9 +183,8 @@ int X509_REQ_add_extensions_nid(X509_REQ *req,
}
/* Generate encoding of extensions */
- extlen = ASN1_item_i2d((const ASN1_VALUE *)
- (mod_exts == NULL ? exts : mod_exts),
- &ext, ASN1_ITEM_rptr(X509_EXTENSIONS));
+ extlen = ASN1_item_i2d((const ASN1_VALUE *)(mod_exts == NULL ? exts : mod_exts),
+ &ext, ASN1_ITEM_rptr(X509_EXTENSIONS));
if (extlen <= 0)
goto end;
if (mod_exts != NULL) {
@@ -199,7 +198,7 @@ int X509_REQ_add_extensions_nid(X509_REQ *req,
rv = X509_REQ_add1_attr_by_NID(req, nid, V_ASN1_SEQUENCE, ext, extlen);
OPENSSL_free(ext);
- end:
+end:
sk_X509_EXTENSION_pop_free(mod_exts, X509_EXTENSION_free);
return rv;
}
@@ -223,7 +222,7 @@ int X509_REQ_get_attr_by_NID(const X509_REQ *req, int nid, int lastpos)
}
int X509_REQ_get_attr_by_OBJ(const X509_REQ *req, const ASN1_OBJECT *obj,
- int lastpos)
+ int lastpos)
{
return X509at_get_attr_by_OBJ(req->req_info.attributes, obj, lastpos);
}
@@ -260,45 +259,45 @@ int X509_REQ_add1_attr(X509_REQ *req, X509_ATTRIBUTE *attr)
}
int X509_REQ_add1_attr_by_OBJ(X509_REQ *req,
- const ASN1_OBJECT *obj, int type,
- const unsigned char *bytes, int len)
+ const ASN1_OBJECT *obj, int type,
+ const unsigned char *bytes, int len)
{
if (req == NULL) {
ERR_raise(ERR_LIB_X509, ERR_R_PASSED_NULL_PARAMETER);
return 0;
}
if (!X509at_add1_attr_by_OBJ(&req->req_info.attributes, obj,
- type, bytes, len))
+ type, bytes, len))
return 0;
req->req_info.enc.modified = 1;
return 1;
}
int X509_REQ_add1_attr_by_NID(X509_REQ *req,
- int nid, int type,
- const unsigned char *bytes, int len)
+ int nid, int type,
+ const unsigned char *bytes, int len)
{
if (req == NULL) {
ERR_raise(ERR_LIB_X509, ERR_R_PASSED_NULL_PARAMETER);
return 0;
}
if (!X509at_add1_attr_by_NID(&req->req_info.attributes, nid,
- type, bytes, len))
+ type, bytes, len))
return 0;
req->req_info.enc.modified = 1;
return 1;
}
int X509_REQ_add1_attr_by_txt(X509_REQ *req,
- const char *attrname, int type,
- const unsigned char *bytes, int len)
+ const char *attrname, int type,
+ const unsigned char *bytes, int len)
{
if (req == NULL) {
ERR_raise(ERR_LIB_X509, ERR_R_PASSED_NULL_PARAMETER);
return 0;
}
if (!X509at_add1_attr_by_txt(&req->req_info.attributes, attrname,
- type, bytes, len))
+ type, bytes, len))
return 0;
req->req_info.enc.modified = 1;
return 1;
@@ -315,7 +314,7 @@ X509_NAME *X509_REQ_get_subject_name(const X509_REQ *req)
}
void X509_REQ_get0_signature(const X509_REQ *req, const ASN1_BIT_STRING **psig,
- const X509_ALGOR **palg)
+ const X509_ALGOR **palg)
{
if (psig != NULL)
*psig = req->signature;
diff --git a/crypto/x509/x509_set.c b/crypto/x509/x509_set.c
index 3fab2af96a..af5af61058 100644
--- a/crypto/x509/x509_set.c
+++ b/crypto/x509/x509_set.c
@@ -96,7 +96,7 @@ int X509_set1_notBefore(X509 *x, const ASN1_TIME *tm)
if (x == NULL || tm == NULL)
return 0;
return ossl_x509_set1_time(&x->cert_info.enc.modified,
- &x->cert_info.validity.notBefore, tm);
+ &x->cert_info.validity.notBefore, tm);
}
int X509_set1_notAfter(X509 *x, const ASN1_TIME *tm)
@@ -104,7 +104,7 @@ int X509_set1_notAfter(X509 *x, const ASN1_TIME *tm)
if (x == NULL || tm == NULL)
return 0;
return ossl_x509_set1_time(&x->cert_info.enc.modified,
- &x->cert_info.validity.notAfter, tm);
+ &x->cert_info.validity.notAfter, tm);
}
int X509_set_pubkey(X509 *x, EVP_PKEY *pkey)
@@ -170,7 +170,7 @@ const STACK_OF(X509_EXTENSION) *X509_get0_extensions(const X509 *x)
}
void X509_get0_uids(const X509 *x, const ASN1_BIT_STRING **piuid,
- const ASN1_BIT_STRING **psuid)
+ const ASN1_BIT_STRING **psuid)
{
if (piuid != NULL)
*piuid = x->cert_info.issuerUID;
@@ -184,7 +184,7 @@ const X509_ALGOR *X509_get0_tbs_sigalg(const X509 *x)
}
int X509_SIG_INFO_get(const X509_SIG_INFO *siginf, int *mdnid, int *pknid,
- int *secbits, uint32_t *flags)
+ int *secbits, uint32_t *flags)
{
if (mdnid != NULL)
*mdnid = siginf->mdnid;
@@ -198,7 +198,7 @@ int X509_SIG_INFO_get(const X509_SIG_INFO *siginf, int *mdnid, int *pknid,
}
void X509_SIG_INFO_set(X509_SIG_INFO *siginf, int mdnid, int pknid,
- int secbits, uint32_t flags)
+ int secbits, uint32_t flags)
{
siginf->mdnid = mdnid;
siginf->pknid = pknid;
@@ -207,7 +207,7 @@ void X509_SIG_INFO_set(X509_SIG_INFO *siginf, int mdnid, int pknid,
}
int X509_get_signature_info(X509 *x, int *mdnid, int *pknid, int *secbits,
- uint32_t *flags)
+ uint32_t *flags)
{
X509_check_purpose(x, -1, -1);
return X509_SIG_INFO_get(&x->siginf, mdnid, pknid, secbits, flags);
@@ -215,7 +215,7 @@ int X509_get_signature_info(X509 *x, int *mdnid, int *pknid, int *secbits,
/* Modify *siginf according to alg and sig. Return 1 on success, else 0. */
static int x509_sig_info_init(X509_SIG_INFO *siginf, const X509_ALGOR *alg,
- const ASN1_STRING *sig, const EVP_PKEY *pubkey)
+ const ASN1_STRING *sig, const EVP_PKEY *pubkey)
{
int pknid, mdnid, md_size;
const EVP_MD *md;
@@ -226,7 +226,7 @@ static int x509_sig_info_init(X509_SIG_INFO *siginf, const X509_ALGOR *alg,
siginf->secbits = -1;
siginf->flags = 0;
if (!OBJ_find_sigid_algs(OBJ_obj2nid(alg->algorithm), &mdnid, &pknid)
- || pknid == NID_undef) {
+ || pknid == NID_undef) {
ERR_raise(ERR_LIB_X509, X509_R_UNKNOWN_SIGID_ALGS);
return 0;
}
@@ -238,8 +238,8 @@ static int x509_sig_info_init(X509_SIG_INFO *siginf, const X509_ALGOR *alg,
/* If we have one, use a custom handler for this algorithm */
ameth = EVP_PKEY_asn1_find(NULL, pknid);
if (ameth != NULL && ameth->siginf_set != NULL
- && ameth->siginf_set(siginf, alg, sig))
- break;
+ && ameth->siginf_set(siginf, alg, sig))
+ break;
if (pubkey != NULL) {
int secbits;
@@ -305,5 +305,5 @@ static int x509_sig_info_init(X509_SIG_INFO *siginf, const X509_ALGOR *alg,
int ossl_x509_init_sig_info(X509 *x)
{
return x509_sig_info_init(&x->siginf, &x->sig_alg, &x->signature,
- X509_PUBKEY_get0(x->cert_info.key));
+ X509_PUBKEY_get0(x->cert_info.key));
}
diff --git a/crypto/x509/x509_trust.c b/crypto/x509/x509_trust.c
index 986d05a60a..167a5e888e 100644
--- a/crypto/x509/x509_trust.c
+++ b/crypto/x509/x509_trust.c
@@ -20,7 +20,7 @@ static int trust_1oid(X509_TRUST *trust, X509 *x, int flags);
static int trust_compat(X509_TRUST *trust, X509 *x, int flags);
static int obj_trust(int id, X509 *x, int flags);
-static int (*default_trust) (int id, X509 *x, int flags) = obj_trust;
+static int (*default_trust)(int id, X509 *x, int flags) = obj_trust;
/*
* WARNING: the following table should be kept in order of trust and without
@@ -29,23 +29,23 @@ static int (*default_trust) (int id, X509 *x, int flags) = obj_trust;
*/
static X509_TRUST trstandard[] = {
- {X509_TRUST_COMPAT, 0, trust_compat, "compatible", 0, NULL},
- {X509_TRUST_SSL_CLIENT, 0, trust_1oidany, "SSL Client", NID_client_auth,
- NULL},
- {X509_TRUST_SSL_SERVER, 0, trust_1oidany, "SSL Server", NID_server_auth,
- NULL},
- {X509_TRUST_EMAIL, 0, trust_1oidany, "S/MIME email", NID_email_protect,
- NULL},
- {X509_TRUST_OBJECT_SIGN, 0, trust_1oidany, "Object Signer", NID_code_sign,
- NULL},
- {X509_TRUST_OCSP_SIGN, 0, trust_1oid, "OCSP responder", NID_OCSP_sign,
- NULL},
- {X509_TRUST_OCSP_REQUEST, 0, trust_1oid, "OCSP request", NID_ad_OCSP,
- NULL},
- {X509_TRUST_TSA, 0, trust_1oidany, "TSA server", NID_time_stamp, NULL}
+ { X509_TRUST_COMPAT, 0, trust_compat, "compatible", 0, NULL },
+ { X509_TRUST_SSL_CLIENT, 0, trust_1oidany, "SSL Client", NID_client_auth,
+ NULL },
+ { X509_TRUST_SSL_SERVER, 0, trust_1oidany, "SSL Server", NID_server_auth,
+ NULL },
+ { X509_TRUST_EMAIL, 0, trust_1oidany, "S/MIME email", NID_email_protect,
+ NULL },
+ { X509_TRUST_OBJECT_SIGN, 0, trust_1oidany, "Object Signer", NID_code_sign,
+ NULL },
+ { X509_TRUST_OCSP_SIGN, 0, trust_1oid, "OCSP responder", NID_OCSP_sign,
+ NULL },
+ { X509_TRUST_OCSP_REQUEST, 0, trust_1oid, "OCSP request", NID_ad_OCSP,
+ NULL },
+ { X509_TRUST_TSA, 0, trust_1oidany, "TSA server", NID_time_stamp, NULL }
};
-#define X509_TRUST_COUNT OSSL_NELEM(trstandard)
+#define X509_TRUST_COUNT OSSL_NELEM(trstandard)
static STACK_OF(X509_TRUST) *trtable = NULL;
@@ -54,9 +54,10 @@ static int tr_cmp(const X509_TRUST *const *a, const X509_TRUST *const *b)
return (*a)->trust - (*b)->trust;
}
-int (*X509_TRUST_set_default(int (*trust) (int, X509 *, int))) (int, X509 *,
- int) {
- int (*oldtrust) (int, X509 *, int);
+int (*X509_TRUST_set_default(int (*trust)(int, X509 *, int)))(int, X509 *,
+ int)
+{
+ int (*oldtrust)(int, X509 *, int);
oldtrust = default_trust;
default_trust = trust;
return oldtrust;
@@ -71,7 +72,7 @@ int X509_check_trust(X509 *x, int id, int flags)
/* We get this as a default value */
if (id == X509_TRUST_DEFAULT)
return obj_trust(NID_anyExtendedKeyUsage, x,
- flags | X509_TRUST_DO_SS_COMPAT);
+ flags | X509_TRUST_DO_SS_COMPAT);
idx = X509_TRUST_get_by_id(id);
if (idx < 0)
return default_trust(id, x, flags);
@@ -123,8 +124,8 @@ int X509_TRUST_set(int *t, int trust)
return 1;
}
-int X509_TRUST_add(int id, int flags, int (*ck) (X509_TRUST *, X509 *, int),
- const char *name, int arg1, void *arg2)
+int X509_TRUST_add(int id, int flags, int (*ck)(X509_TRUST *, X509 *, int),
+ const char *name, int arg1, void *arg2)
{
int idx;
X509_TRUST *trtmp;
@@ -173,7 +174,7 @@ int X509_TRUST_add(int id, int flags, int (*ck) (X509_TRUST *, X509 *, int),
}
}
return 1;
- err:
+err:
if (idx < 0) {
OPENSSL_free(trtmp->name);
OPENSSL_free(trtmp);
@@ -264,8 +265,7 @@ static int obj_trust(int id, X509 *x, int flags)
ASN1_OBJECT *obj = sk_ASN1_OBJECT_value(ax->reject, i);
int nid = OBJ_obj2nid(obj);
- if (nid == id || (nid == NID_anyExtendedKeyUsage &&
- (flags & X509_TRUST_OK_ANY_EKU)))
+ if (nid == id || (nid == NID_anyExtendedKeyUsage && (flags & X509_TRUST_OK_ANY_EKU)))
return X509_TRUST_REJECTED;
}
}
@@ -275,8 +275,7 @@ static int obj_trust(int id, X509 *x, int flags)
ASN1_OBJECT *obj = sk_ASN1_OBJECT_value(ax->trust, i);
int nid = OBJ_obj2nid(obj);
- if (nid == id || (nid == NID_anyExtendedKeyUsage &&
- (flags & X509_TRUST_OK_ANY_EKU)))
+ if (nid == id || (nid == NID_anyExtendedKeyUsage && (flags & X509_TRUST_OK_ANY_EKU)))
return X509_TRUST_TRUSTED;
}
/*
diff --git a/crypto/x509/x509_txt.c b/crypto/x509/x509_txt.c
index f1f7c4e9cf..a415237b8b 100644
--- a/crypto/x509/x509_txt.c
+++ b/crypto/x509/x509_txt.c
@@ -102,8 +102,7 @@ const char *X509_verify_cert_error_string(long n)
case X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE:
return "key usage does not include digital signature";
case X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED:
- return
- "proxy certificates not allowed, please set the appropriate flag";
+ return "proxy certificates not allowed, please set the appropriate flag";
case X509_V_ERR_INVALID_EXTENSION:
return "invalid or inconsistent certificate extension";
case X509_V_ERR_INVALID_POLICY_EXTENSION:
diff --git a/crypto/x509/x509_v3.c b/crypto/x509/x509_v3.c
index 9c4ee2bf5f..611a5dabd6 100644
--- a/crypto/x509/x509_v3.c
+++ b/crypto/x509/x509_v3.c
@@ -28,7 +28,7 @@ int X509v3_get_ext_count(const STACK_OF(X509_EXTENSION) *x)
}
int X509v3_get_ext_by_NID(const STACK_OF(X509_EXTENSION) *x, int nid,
- int lastpos)
+ int lastpos)
{
ASN1_OBJECT *obj;
@@ -39,7 +39,7 @@ int X509v3_get_ext_by_NID(const STACK_OF(X509_EXTENSION) *x, int nid,
}
int X509v3_get_ext_by_OBJ(const STACK_OF(X509_EXTENSION) *sk,
- const ASN1_OBJECT *obj, int lastpos)
+ const ASN1_OBJECT *obj, int lastpos)
{
int n;
X509_EXTENSION *ex;
@@ -59,7 +59,7 @@ int X509v3_get_ext_by_OBJ(const STACK_OF(X509_EXTENSION) *sk,
}
int X509v3_get_ext_by_critical(const STACK_OF(X509_EXTENSION) *sk, int crit,
- int lastpos)
+ int lastpos)
{
int n, c;
X509_EXTENSION *ex;
@@ -99,7 +99,7 @@ X509_EXTENSION *X509v3_delete_ext(STACK_OF(X509_EXTENSION) *x, int loc)
}
STACK_OF(X509_EXTENSION) *X509v3_add_ext(STACK_OF(X509_EXTENSION) **x,
- X509_EXTENSION *ex, int loc)
+ X509_EXTENSION *ex, int loc)
{
X509_EXTENSION *new_ex = NULL;
int n;
@@ -135,7 +135,7 @@ STACK_OF(X509_EXTENSION) *X509v3_add_ext(STACK_OF(X509_EXTENSION) **x,
if (*x == NULL)
*x = sk;
return sk;
- err:
+err:
X509_EXTENSION_free(new_ex);
if (x != NULL && *x == NULL)
sk_X509_EXTENSION_free(sk);
@@ -144,7 +144,7 @@ STACK_OF(X509_EXTENSION) *X509v3_add_ext(STACK_OF(X509_EXTENSION) **x,
/* This returns NULL also in non-error case *target == NULL && sk_X509_EXTENSION_num(exts) <= 0 */
STACK_OF(X509_EXTENSION) *X509v3_add_extensions(STACK_OF(X509_EXTENSION) **target,
- const STACK_OF(X509_EXTENSION) *exts)
+ const STACK_OF(X509_EXTENSION) *exts)
{
int i;
@@ -173,8 +173,8 @@ STACK_OF(X509_EXTENSION) *X509v3_add_extensions(STACK_OF(X509_EXTENSION) **targe
}
X509_EXTENSION *X509_EXTENSION_create_by_NID(X509_EXTENSION **ex, int nid,
- int crit,
- ASN1_OCTET_STRING *data)
+ int crit,
+ ASN1_OCTET_STRING *data)
{
ASN1_OBJECT *obj;
X509_EXTENSION *ret;
@@ -191,8 +191,8 @@ X509_EXTENSION *X509_EXTENSION_create_by_NID(X509_EXTENSION **ex, int nid,
}
X509_EXTENSION *X509_EXTENSION_create_by_OBJ(X509_EXTENSION **ex,
- const ASN1_OBJECT *obj, int crit,
- ASN1_OCTET_STRING *data)
+ const ASN1_OBJECT *obj, int crit,
+ ASN1_OCTET_STRING *data)
{
X509_EXTENSION *ret;
@@ -214,7 +214,7 @@ X509_EXTENSION *X509_EXTENSION_create_by_OBJ(X509_EXTENSION **ex,
if ((ex != NULL) && (*ex == NULL))
*ex = ret;
return ret;
- err:
+err:
if ((ex == NULL) || (ret != *ex))
X509_EXTENSION_free(ret);
return NULL;
diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c
index 696f3286ea..97e1571be8 100644
--- a/crypto/x509/x509_vfy.c
+++ b/crypto/x509/x509_vfy.c
@@ -32,16 +32,16 @@
/* CRL score values */
-#define CRL_SCORE_NOCRITICAL 0x100 /* No unhandled critical extensions */
-#define CRL_SCORE_SCOPE 0x080 /* certificate is within CRL scope */
-#define CRL_SCORE_TIME 0x040 /* CRL times valid */
-#define CRL_SCORE_ISSUER_NAME 0x020 /* Issuer name matches certificate */
+#define CRL_SCORE_NOCRITICAL 0x100 /* No unhandled critical extensions */
+#define CRL_SCORE_SCOPE 0x080 /* certificate is within CRL scope */
+#define CRL_SCORE_TIME 0x040 /* CRL times valid */
+#define CRL_SCORE_ISSUER_NAME 0x020 /* Issuer name matches certificate */
#define CRL_SCORE_VALID /* If this score or above CRL is probably valid */ \
(CRL_SCORE_NOCRITICAL | CRL_SCORE_TIME | CRL_SCORE_SCOPE)
-#define CRL_SCORE_ISSUER_CERT 0x018 /* CRL issuer is certificate issuer */
-#define CRL_SCORE_SAME_PATH 0x008 /* CRL issuer is on certificate path */
-#define CRL_SCORE_AKID 0x004 /* CRL issuer matches CRL AKID */
-#define CRL_SCORE_TIME_DELTA 0x002 /* Have a delta CRL with valid times */
+#define CRL_SCORE_ISSUER_CERT 0x018 /* CRL issuer is certificate issuer */
+#define CRL_SCORE_SAME_PATH 0x008 /* CRL issuer is on certificate path */
+#define CRL_SCORE_AKID 0x004 /* CRL issuer matches CRL AKID */
+#define CRL_SCORE_TIME_DELTA 0x002 /* Have a delta CRL with valid times */
static int x509_verify_x509(X509_STORE_CTX *ctx);
static int x509_verify_rpk(X509_STORE_CTX *ctx);
@@ -69,20 +69,20 @@ static int check_sig_level(X509_STORE_CTX *ctx, X509 *cert);
static int check_curve(X509 *cert);
static int get_crl_score(X509_STORE_CTX *ctx, X509 **pissuer,
- unsigned int *preasons, X509_CRL *crl, X509 *x);
+ unsigned int *preasons, X509_CRL *crl, X509 *x);
static int get_crl_delta(X509_STORE_CTX *ctx,
- X509_CRL **pcrl, X509_CRL **pdcrl, X509 *x);
+ X509_CRL **pcrl, X509_CRL **pdcrl, X509 *x);
static void get_delta_sk(X509_STORE_CTX *ctx, X509_CRL **dcrl,
- int *pcrl_score, X509_CRL *base,
- STACK_OF(X509_CRL) *crls);
+ int *pcrl_score, X509_CRL *base,
+ STACK_OF(X509_CRL) *crls);
static void crl_akid_check(X509_STORE_CTX *ctx, X509_CRL *crl, X509 **pissuer,
- int *pcrl_score);
+ int *pcrl_score);
static int crl_crldp_check(X509 *x, X509_CRL *crl, int crl_score,
- unsigned int *preasons);
+ unsigned int *preasons);
static int check_crl_path(X509_STORE_CTX *ctx, X509 *x);
static int check_crl_chain(X509_STORE_CTX *ctx,
- STACK_OF(X509) *cert_path,
- STACK_OF(X509) *crl_path);
+ STACK_OF(X509) *cert_path,
+ STACK_OF(X509) *crl_path);
static int internal_verify(X509_STORE_CTX *ctx);
@@ -172,9 +172,9 @@ static int verify_cb_cert(X509_STORE_CTX *ctx, X509 *x, int depth, int err)
return ctx->verify_cb(0, ctx);
}
-#define CB_FAIL_IF(cond, ctx, cert, depth, err) \
+#define CB_FAIL_IF(cond, ctx, cert, depth, err) \
if ((cond) && verify_cb_cert(ctx, cert, depth, err) == 0) \
- return 0
+ return 0
/*-
* Inform the verify callback of an error, CRL-specific variant. Here, the
@@ -224,13 +224,13 @@ static int check_auth_level(X509_STORE_CTX *ctx)
* check the security of issuer keys.
*/
CB_FAIL_IF(i > 0 && !check_cert_key_level(ctx, cert),
- ctx, cert, i, X509_V_ERR_CA_KEY_TOO_SMALL);
+ ctx, cert, i, X509_V_ERR_CA_KEY_TOO_SMALL);
/*
* We also check the signature algorithm security of all certificates
* except those of the trust anchor at index num-1.
*/
CB_FAIL_IF(i < num - 1 && !check_sig_level(ctx, cert),
- ctx, cert, i, X509_V_ERR_CA_MD_TOO_WEAK);
+ ctx, cert, i, X509_V_ERR_CA_MD_TOO_WEAK);
}
return 1;
}
@@ -266,7 +266,7 @@ static int verify_chain(X509_STORE_CTX *ctx)
return ok;
err = X509_chain_check_suiteb(&ctx->error_depth, NULL, ctx->chain,
- ctx->param->flags);
+ ctx->param->flags);
CB_FAIL_IF(err != X509_V_OK, ctx, NULL, ctx->error_depth, err);
/* Verify chain signatures and expiration times */
@@ -373,7 +373,7 @@ static int x509_verify_x509(X509_STORE_CTX *ctx)
/* If the peer's public key is too weak, we can stop early. */
CB_FAIL_IF(!check_cert_key_level(ctx, ctx->cert),
- ctx, ctx->cert, 0, X509_V_ERR_EE_KEY_TOO_SMALL);
+ ctx, ctx->cert, 0, X509_V_ERR_EE_KEY_TOO_SMALL);
ret = DANETLS_ENABLED(ctx->dane) ? dane_verify(ctx) : verify_chain(ctx);
@@ -412,7 +412,7 @@ static int sk_X509_contains(STACK_OF(X509) *sk, X509 *cert)
* Maybe not touch X509_STORE_CTX_get1_issuer(), for API backward compatibility.
*/
static X509 *get0_best_issuer_sk(X509_STORE_CTX *ctx, int check_signing_allowed,
- int no_dup, STACK_OF(X509) *sk, X509 *x)
+ int no_dup, STACK_OF(X509) *sk, X509 *x)
{
int i;
X509 *candidate, *issuer = NULL;
@@ -435,8 +435,9 @@ static X509 *get0_best_issuer_sk(X509_STORE_CTX *ctx, int check_signing_allowed,
* date so we return nearest match if no certificate time is OK.
*/
if (issuer == NULL
- || ASN1_TIME_compare(X509_get0_notAfter(candidate),
- X509_get0_notAfter(issuer)) > 0)
+ || ASN1_TIME_compare(X509_get0_notAfter(candidate),
+ X509_get0_notAfter(issuer))
+ > 0)
issuer = candidate;
}
}
@@ -484,7 +485,7 @@ int X509_STORE_CTX_get1_issuer(X509 **issuer, X509_STORE_CTX *ctx, X509 *x)
if (*issuer != NULL)
ret = X509_up_ref(*issuer) ? 1 : -1;
OSSL_STACK_OF_X509_free(certs);
- end:
+end:
X509_OBJECT_free(obj);
return ret;
}
@@ -546,7 +547,7 @@ static STACK_OF(X509) *lookup_certs_sk(X509_STORE_CTX *ctx, const X509_NAME *nm)
* Sadly, returns 0 also on internal error in ctx->verify_cb().
*/
static int check_purpose(X509_STORE_CTX *ctx, X509 *x, int purpose, int depth,
- int must_be_ca)
+ int must_be_ca)
{
int tr_ok = X509_TRUST_UNTRUSTED;
@@ -619,24 +620,23 @@ static int check_extensions(X509_STORE_CTX *ctx)
allow_proxy_certs = 0;
purpose = X509_PURPOSE_CRL_SIGN;
} else {
- allow_proxy_certs =
- (ctx->param->flags & X509_V_FLAG_ALLOW_PROXY_CERTS) != 0;
+ allow_proxy_certs = (ctx->param->flags & X509_V_FLAG_ALLOW_PROXY_CERTS) != 0;
purpose = ctx->param->purpose;
}
for (i = 0; i < num; i++) {
x = sk_X509_value(ctx->chain, i);
CB_FAIL_IF((ctx->param->flags & X509_V_FLAG_IGNORE_CRITICAL) == 0
- && (x->ex_flags & EXFLAG_CRITICAL) != 0,
- ctx, x, i, X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION);
+ && (x->ex_flags & EXFLAG_CRITICAL) != 0,
+ ctx, x, i, X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION);
CB_FAIL_IF(!allow_proxy_certs && (x->ex_flags & EXFLAG_PROXY) != 0,
- ctx, x, i, X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED);
+ ctx, x, i, X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED);
ret = X509_check_ca(x);
switch (must_be_ca) {
case -1:
CB_FAIL_IF((ctx->param->flags & X509_V_FLAG_X509_STRICT) != 0
- && ret != 1 && ret != 0,
- ctx, x, i, X509_V_ERR_INVALID_CA);
+ && ret != 1 && ret != 0,
+ ctx, x, i, X509_V_ERR_INVALID_CA);
break;
case 0:
CB_FAIL_IF(ret != 0, ctx, x, i, X509_V_ERR_INVALID_NON_CA);
@@ -644,9 +644,10 @@ static int check_extensions(X509_STORE_CTX *ctx)
default:
/* X509_V_FLAG_X509_STRICT is implicit for intermediate CAs */
CB_FAIL_IF(ret == 0
- || ((i + 1 < num
+ || ((i + 1 < num
|| (ctx->param->flags & X509_V_FLAG_X509_STRICT) != 0)
- && ret != 1), ctx, x, i, X509_V_ERR_INVALID_CA);
+ && ret != 1),
+ ctx, x, i, X509_V_ERR_INVALID_CA);
break;
}
if (num > 1) {
@@ -669,62 +670,63 @@ static int check_extensions(X509_STORE_CTX *ctx)
/* Check Basic Constraints according to RFC 5280 section 4.2.1.9 */
if (x->ex_pathlen != -1) {
CB_FAIL_IF((x->ex_flags & EXFLAG_CA) == 0,
- ctx, x, i, X509_V_ERR_PATHLEN_INVALID_FOR_NON_CA);
+ ctx, x, i, X509_V_ERR_PATHLEN_INVALID_FOR_NON_CA);
CB_FAIL_IF((x->ex_kusage & KU_KEY_CERT_SIGN) == 0, ctx,
- x, i, X509_V_ERR_PATHLEN_WITHOUT_KU_KEY_CERT_SIGN);
+ x, i, X509_V_ERR_PATHLEN_WITHOUT_KU_KEY_CERT_SIGN);
}
CB_FAIL_IF((x->ex_flags & EXFLAG_CA) != 0
- && (x->ex_flags & EXFLAG_BCONS) != 0
- && (x->ex_flags & EXFLAG_BCONS_CRITICAL) == 0,
- ctx, x, i, X509_V_ERR_CA_BCONS_NOT_CRITICAL);
+ && (x->ex_flags & EXFLAG_BCONS) != 0
+ && (x->ex_flags & EXFLAG_BCONS_CRITICAL) == 0,
+ ctx, x, i, X509_V_ERR_CA_BCONS_NOT_CRITICAL);
/* Check Key Usage according to RFC 5280 section 4.2.1.3 */
if ((x->ex_flags & EXFLAG_CA) != 0) {
CB_FAIL_IF((x->ex_flags & EXFLAG_KUSAGE) == 0,
- ctx, x, i, X509_V_ERR_CA_CERT_MISSING_KEY_USAGE);
+ ctx, x, i, X509_V_ERR_CA_CERT_MISSING_KEY_USAGE);
} else {
CB_FAIL_IF((x->ex_kusage & KU_KEY_CERT_SIGN) != 0, ctx, x, i,
- X509_V_ERR_KU_KEY_CERT_SIGN_INVALID_FOR_NON_CA);
+ X509_V_ERR_KU_KEY_CERT_SIGN_INVALID_FOR_NON_CA);
}
/* Check issuer is non-empty acc. to RFC 5280 section 4.1.2.4 */
CB_FAIL_IF(X509_NAME_entry_count(X509_get_issuer_name(x)) == 0,
- ctx, x, i, X509_V_ERR_ISSUER_NAME_EMPTY);
+ ctx, x, i, X509_V_ERR_ISSUER_NAME_EMPTY);
/* Check subject is non-empty acc. to RFC 5280 section 4.1.2.6 */
CB_FAIL_IF(((x->ex_flags & EXFLAG_CA) != 0
- || (x->ex_kusage & KU_CRL_SIGN) != 0
- || x->altname == NULL)
- && X509_NAME_entry_count(X509_get_subject_name(x)) == 0,
- ctx, x, i, X509_V_ERR_SUBJECT_NAME_EMPTY);
+ || (x->ex_kusage & KU_CRL_SIGN) != 0
+ || x->altname == NULL)
+ && X509_NAME_entry_count(X509_get_subject_name(x)) == 0,
+ ctx, x, i, X509_V_ERR_SUBJECT_NAME_EMPTY);
CB_FAIL_IF(X509_NAME_entry_count(X509_get_subject_name(x)) == 0
- && x->altname != NULL
- && (x->ex_flags & EXFLAG_SAN_CRITICAL) == 0,
- ctx, x, i, X509_V_ERR_EMPTY_SUBJECT_SAN_NOT_CRITICAL);
+ && x->altname != NULL
+ && (x->ex_flags & EXFLAG_SAN_CRITICAL) == 0,
+ ctx, x, i, X509_V_ERR_EMPTY_SUBJECT_SAN_NOT_CRITICAL);
/* Check SAN is non-empty according to RFC 5280 section 4.2.1.6 */
CB_FAIL_IF(x->altname != NULL
- && sk_GENERAL_NAME_num(x->altname) <= 0,
- ctx, x, i, X509_V_ERR_EMPTY_SUBJECT_ALT_NAME);
+ && sk_GENERAL_NAME_num(x->altname) <= 0,
+ ctx, x, i, X509_V_ERR_EMPTY_SUBJECT_ALT_NAME);
/* Check sig alg consistency acc. to RFC 5280 section 4.1.1.2 */
CB_FAIL_IF(X509_ALGOR_cmp(&x->sig_alg, &x->cert_info.signature) != 0,
- ctx, x, i, X509_V_ERR_SIGNATURE_ALGORITHM_INCONSISTENCY);
+ ctx, x, i, X509_V_ERR_SIGNATURE_ALGORITHM_INCONSISTENCY);
CB_FAIL_IF(x->akid != NULL
- && (x->ex_flags & EXFLAG_AKID_CRITICAL) != 0,
- ctx, x, i, X509_V_ERR_AUTHORITY_KEY_IDENTIFIER_CRITICAL);
+ && (x->ex_flags & EXFLAG_AKID_CRITICAL) != 0,
+ ctx, x, i, X509_V_ERR_AUTHORITY_KEY_IDENTIFIER_CRITICAL);
CB_FAIL_IF(x->skid != NULL
- && (x->ex_flags & EXFLAG_SKID_CRITICAL) != 0,
- ctx, x, i, X509_V_ERR_SUBJECT_KEY_IDENTIFIER_CRITICAL);
+ && (x->ex_flags & EXFLAG_SKID_CRITICAL) != 0,
+ ctx, x, i, X509_V_ERR_SUBJECT_KEY_IDENTIFIER_CRITICAL);
if (X509_get_version(x) >= X509_VERSION_3) {
/* Check AKID presence acc. to RFC 5280 section 4.2.1.1 */
CB_FAIL_IF(i + 1 < num /*
* this means not last cert in chain,
* taken as "generated by conforming CAs"
*/
- && (x->akid == NULL || x->akid->keyid == NULL), ctx,
- x, i, X509_V_ERR_MISSING_AUTHORITY_KEY_IDENTIFIER);
+ && (x->akid == NULL || x->akid->keyid == NULL),
+ ctx,
+ x, i, X509_V_ERR_MISSING_AUTHORITY_KEY_IDENTIFIER);
/* Check SKID presence acc. to RFC 5280 section 4.2.1.2 */
CB_FAIL_IF((x->ex_flags & EXFLAG_CA) != 0 && x->skid == NULL,
- ctx, x, i, X509_V_ERR_MISSING_SUBJECT_KEY_IDENTIFIER);
+ ctx, x, i, X509_V_ERR_MISSING_SUBJECT_KEY_IDENTIFIER);
} else {
CB_FAIL_IF(sk_X509_EXTENSION_num(X509_get0_extensions(x)) > 0,
- ctx, x, i, X509_V_ERR_EXTENSIONS_REQUIRE_VERSION_3);
+ ctx, x, i, X509_V_ERR_EXTENSIONS_REQUIRE_VERSION_3);
}
}
@@ -733,8 +735,8 @@ static int check_extensions(X509_STORE_CTX *ctx)
return 0;
/* Check path length */
CB_FAIL_IF(i > 1 && x->ex_pathlen != -1
- && plen > x->ex_pathlen + proxy_path_length,
- ctx, x, i, X509_V_ERR_PATH_LENGTH_EXCEEDED);
+ && plen > x->ex_pathlen + proxy_path_length,
+ ctx, x, i, X509_V_ERR_PATH_LENGTH_EXCEEDED);
/* Increment path length if not a self-issued intermediate CA */
if (i > 0 && (x->ex_flags & EXFLAG_SI) == 0)
plen++;
@@ -757,7 +759,7 @@ static int check_extensions(X509_STORE_CTX *ctx)
*/
if (x->ex_pcpathlen != -1) {
CB_FAIL_IF(proxy_path_length > x->ex_pcpathlen,
- ctx, x, i, X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED);
+ ctx, x, i, X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED);
proxy_path_length = x->ex_pcpathlen;
}
proxy_path_length++;
@@ -843,7 +845,7 @@ static int check_name_constraints(X509_STORE_CTX *ctx)
*/
if (X509_NAME_ENTRY_set(X509_NAME_get_entry(tmpsubject, last_loc))
== X509_NAME_ENTRY_set(X509_NAME_get_entry(tmpsubject,
- last_loc - 1))) {
+ last_loc - 1))) {
err = X509_V_ERR_PROXY_SUBJECT_NAME_VIOLATION;
goto proxy_name_done;
}
@@ -890,9 +892,11 @@ static int check_name_constraints(X509_STORE_CTX *ctx)
/* If EE certificate check commonName too */
if (rv == X509_V_OK && i == 0
&& (ctx->param->hostflags
- & X509_CHECK_FLAG_NEVER_CHECK_SUBJECT) == 0
+ & X509_CHECK_FLAG_NEVER_CHECK_SUBJECT)
+ == 0
&& ((ctx->param->hostflags
- & X509_CHECK_FLAG_ALWAYS_CHECK_SUBJECT) != 0
+ & X509_CHECK_FLAG_ALWAYS_CHECK_SUBJECT)
+ != 0
|| (ret = has_san_id(x, GEN_DNS)) == 0))
rv = NAME_CONSTRAINTS_check_CN(x, nc);
if (ret < 0)
@@ -946,7 +950,7 @@ static int check_id(X509_STORE_CTX *ctx)
return 0;
}
if (vpm->email != NULL
- && X509_check_email(x, vpm->email, vpm->emaillen, 0) <= 0) {
+ && X509_check_email(x, vpm->email, vpm->emaillen, 0) <= 0) {
if (!check_id_error(ctx, X509_V_ERR_EMAIL_MISMATCH))
return 0;
}
@@ -1074,7 +1078,7 @@ static int check_trust(X509_STORE_CTX *ctx, int num_untrusted)
}
if (num_untrusted == num
- && (ctx->param->flags & X509_V_FLAG_PARTIAL_CHAIN) != 0) {
+ && (ctx->param->flags & X509_V_FLAG_PARTIAL_CHAIN) != 0) {
/*
* Last-resort call with no new trusted certificates, check the leaf
* for a direct trust store match.
@@ -1110,11 +1114,12 @@ static int check_trust(X509_STORE_CTX *ctx, int num_untrusted)
*/
return X509_TRUST_UNTRUSTED;
- rejected:
+rejected:
return verify_cb_cert(ctx, x, i, X509_V_ERR_CERT_REJECTED) == 0
- ? X509_TRUST_REJECTED : X509_TRUST_UNTRUSTED;
+ ? X509_TRUST_REJECTED
+ : X509_TRUST_UNTRUSTED;
- trusted:
+trusted:
if (!DANETLS_ENABLED(dane))
return X509_TRUST_TRUSTED;
if (dane->pdpth < 0)
@@ -1129,16 +1134,10 @@ static int check_trust(X509_STORE_CTX *ctx, int num_untrusted)
static int check_revocation(X509_STORE_CTX *ctx)
{
int i = 0, last = 0, ok = 0;
- int crl_check_enabled =
- (ctx->param->flags &
- (X509_V_FLAG_CRL_CHECK | X509_V_FLAG_CRL_CHECK_ALL)) != 0;
- int crl_check_all_enabled =
- (ctx->param->flags & X509_V_FLAG_CRL_CHECK_ALL) != 0;
- int ocsp_check_enabled =
- (ctx->param->flags &
- (X509_V_FLAG_OCSP_RESP_CHECK | X509_V_FLAG_OCSP_RESP_CHECK_ALL)) != 0;
- int ocsp_check_all_enabled =
- (ctx->param->flags & X509_V_FLAG_OCSP_RESP_CHECK_ALL) != 0;
+ int crl_check_enabled = (ctx->param->flags & (X509_V_FLAG_CRL_CHECK | X509_V_FLAG_CRL_CHECK_ALL)) != 0;
+ int crl_check_all_enabled = (ctx->param->flags & X509_V_FLAG_CRL_CHECK_ALL) != 0;
+ int ocsp_check_enabled = (ctx->param->flags & (X509_V_FLAG_OCSP_RESP_CHECK | X509_V_FLAG_OCSP_RESP_CHECK_ALL)) != 0;
+ int ocsp_check_all_enabled = (ctx->param->flags & X509_V_FLAG_OCSP_RESP_CHECK_ALL) != 0;
if (!crl_check_enabled && !ocsp_check_enabled)
return 1;
@@ -1171,9 +1170,7 @@ static int check_revocation(X509_STORE_CTX *ctx)
* can stop here.
*/
if (ok == V_OCSP_CERTSTATUS_REVOKED) {
- return verify_cb_ocsp(ctx, ctx->error != 0
- ? ctx->error
- : X509_V_ERR_OCSP_VERIFY_FAILED);
+ return verify_cb_ocsp(ctx, ctx->error != 0 ? ctx->error : X509_V_ERR_OCSP_VERIFY_FAILED);
}
/*
@@ -1304,7 +1301,8 @@ static int check_cert_ocsp_resp(X509_STORE_CTX *ctx)
}
if (OCSP_resp_find_status(bs, cert_id, &cert_status, &crl_reason, &rev,
- &thisupd, &nextupd) <= 0) {
+ &thisupd, &nextupd)
+ <= 0) {
ret = X509_V_ERR_OCSP_RESP_INVALID;
goto end;
}
@@ -1360,7 +1358,7 @@ static int check_cert_crl(X509_STORE_CTX *ctx)
ok = ctx->get_crl(ctx, &crl, x);
if (crl != NULL) {
ctx->current_crl_score = get_crl_score(ctx, &crl_issuer,
- &reasons, crl, x);
+ &reasons, crl, x);
ctx->current_issuer = crl_issuer;
ctx->current_reasons = reasons;
}
@@ -1408,7 +1406,7 @@ static int check_cert_crl(X509_STORE_CTX *ctx)
goto done;
}
}
- done:
+done:
X509_CRL_free(crl);
X509_CRL_free(dcrl);
@@ -1421,7 +1419,7 @@ static int check_cert_crl(X509_STORE_CTX *ctx)
* returns 0 if time should not be checked.
*/
static int get_verification_time(const X509_VERIFY_PARAM *vpm,
- int64_t *verification_time)
+ int64_t *verification_time)
{
if (vpm != NULL && (vpm->flags & X509_V_FLAG_USE_CHECK_TIME) != 0)
*verification_time = vpm->check_time;
@@ -1444,7 +1442,7 @@ int ossl_x509_check_crl_time(X509_STORE_CTX *ctx, X509_CRL *crl, int notify)
ctx->current_crl = crl;
if (!certificate_time_to_posix(X509_CRL_get0_lastUpdate(crl),
- &last_update)) {
+ &last_update)) {
err = X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD;
if (!notify || !verify_cb_crl(ctx, err))
return 0;
@@ -1456,13 +1454,13 @@ int ossl_x509_check_crl_time(X509_STORE_CTX *ctx, X509_CRL *crl, int notify)
if (X509_CRL_get0_nextUpdate(crl)) {
if (!certificate_time_to_posix(X509_CRL_get0_nextUpdate(crl),
- &next_update)) {
+ &next_update)) {
err = X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD;
if (!notify || !verify_cb_crl(ctx, err))
return 0;
} else if (verification_time > next_update
- /* Ignore expiration of base CRL is delta is valid */
- && (ctx->current_crl_score & CRL_SCORE_TIME_DELTA) == 0) {
+ /* Ignore expiration of base CRL is delta is valid */
+ && (ctx->current_crl_score & CRL_SCORE_TIME_DELTA) == 0) {
err = X509_V_ERR_CRL_HAS_EXPIRED;
if (!notify || !verify_cb_crl(ctx, err))
return 0;
@@ -1476,8 +1474,8 @@ int ossl_x509_check_crl_time(X509_STORE_CTX *ctx, X509_CRL *crl, int notify)
}
static int get_crl_sk(X509_STORE_CTX *ctx, X509_CRL **pcrl, X509_CRL **pdcrl,
- X509 **pissuer, int *pscore, unsigned int *preasons,
- STACK_OF(X509_CRL) *crls)
+ X509 **pissuer, int *pscore, unsigned int *preasons,
+ STACK_OF(X509_CRL) *crls)
{
int i, crl_score, best_score = *pscore;
unsigned int reasons, best_reasons = 0;
@@ -1496,7 +1494,8 @@ static int get_crl_sk(X509_STORE_CTX *ctx, X509_CRL **pcrl, X509_CRL **pdcrl,
int day, sec;
if (ASN1_TIME_diff(&day, &sec, X509_CRL_get0_lastUpdate(best_crl),
- X509_CRL_get0_lastUpdate(crl)) == 0)
+ X509_CRL_get0_lastUpdate(crl))
+ == 0)
continue;
/*
* ASN1_TIME_diff never returns inconsistent signs for |day|
@@ -1573,7 +1572,8 @@ static int check_delta_base(X509_CRL *delta, X509_CRL *base)
return 0;
/* Issuer names must match */
if (X509_NAME_cmp(X509_CRL_get_issuer(base),
- X509_CRL_get_issuer(delta)) != 0)
+ X509_CRL_get_issuer(delta))
+ != 0)
return 0;
/* AKID and IDP must match */
if (!crl_extension_match(delta, base, NID_authority_key_identifier))
@@ -1592,7 +1592,7 @@ static int check_delta_base(X509_CRL *delta, X509_CRL *base)
* retrieve a chain of deltas...
*/
static void get_delta_sk(X509_STORE_CTX *ctx, X509_CRL **dcrl, int *pscore,
- X509_CRL *base, STACK_OF(X509_CRL) *crls)
+ X509_CRL *base, STACK_OF(X509_CRL) *crls)
{
X509_CRL *delta;
int i;
@@ -1628,7 +1628,7 @@ static void get_delta_sk(X509_STORE_CTX *ctx, X509_CRL **dcrl, int *pscore,
* is rejected, otherwise reasons is updated.
*/
static int get_crl_score(X509_STORE_CTX *ctx, X509 **pissuer,
- unsigned int *preasons, X509_CRL *crl, X509 *x)
+ unsigned int *preasons, X509_CRL *crl, X509 *x)
{
int crl_score = 0;
unsigned int tmp_reasons = *preasons, crl_reasons;
@@ -1686,7 +1686,7 @@ static int get_crl_score(X509_STORE_CTX *ctx, X509 **pissuer,
}
static void crl_akid_check(X509_STORE_CTX *ctx, X509_CRL *crl,
- X509 **pissuer, int *pcrl_score)
+ X509 **pissuer, int *pcrl_score)
{
X509 *crl_issuer = NULL;
const X509_NAME *cnm = X509_CRL_get_issuer(crl);
@@ -1745,7 +1745,7 @@ static void crl_akid_check(X509_STORE_CTX *ctx, X509_CRL *crl,
*/
static int check_crl_path(X509_STORE_CTX *ctx, X509 *x)
{
- X509_STORE_CTX crl_ctx = {0};
+ X509_STORE_CTX crl_ctx = { 0 };
int ret;
/* Don't allow recursive CRL path validation */
@@ -1768,7 +1768,7 @@ static int check_crl_path(X509_STORE_CTX *ctx, X509 *x)
/* Check chain is acceptable */
ret = check_crl_chain(ctx, ctx->chain, crl_ctx.chain);
- err:
+err:
X509_STORE_CTX_cleanup(&crl_ctx);
return ret;
}
@@ -1782,8 +1782,8 @@ static int check_crl_path(X509_STORE_CTX *ctx, X509 *x)
* RFC5280 version
*/
static int check_crl_chain(X509_STORE_CTX *ctx,
- STACK_OF(X509) *cert_path,
- STACK_OF(X509) *crl_path)
+ STACK_OF(X509) *cert_path,
+ STACK_OF(X509) *crl_path)
{
X509 *cert_ta = sk_X509_value(cert_path, sk_X509_num(cert_path) - 1);
X509 *crl_ta = sk_X509_value(crl_path, sk_X509_num(crl_path) - 1);
@@ -1851,7 +1851,6 @@ static int idp_check_dp(DIST_POINT_NAME *a, DIST_POINT_NAME *b)
}
return 0;
-
}
static int crldp_check_crlissuer(DIST_POINT *dp, X509_CRL *crl, int crl_score)
@@ -1875,7 +1874,7 @@ static int crldp_check_crlissuer(DIST_POINT *dp, X509_CRL *crl, int crl_score)
/* Check CRLDP and IDP */
static int crl_crldp_check(X509 *x, X509_CRL *crl, int crl_score,
- unsigned int *preasons)
+ unsigned int *preasons)
{
int i;
@@ -1894,14 +1893,14 @@ static int crl_crldp_check(X509 *x, X509_CRL *crl, int crl_score,
if (crldp_check_crlissuer(dp, crl, crl_score)) {
if (crl->idp == NULL
- || idp_check_dp(dp->distpoint, crl->idp->distpoint)) {
+ || idp_check_dp(dp->distpoint, crl->idp->distpoint)) {
*preasons &= dp->dp_reasons;
return 1;
}
}
}
return (crl->idp == NULL || crl->idp->distpoint == NULL)
- && (crl_score & CRL_SCORE_ISSUER_NAME) != 0;
+ && (crl_score & CRL_SCORE_ISSUER_NAME) != 0;
}
/*
@@ -1909,7 +1908,7 @@ static int crl_crldp_check(X509 *x, X509_CRL *crl, int crl_score,
* to find a delta CRL too
*/
static int get_crl_delta(X509_STORE_CTX *ctx,
- X509_CRL **pcrl, X509_CRL **pdcrl, X509 *x)
+ X509_CRL **pcrl, X509_CRL **pdcrl, X509 *x)
{
int ok;
X509 *issuer = NULL;
@@ -1921,7 +1920,7 @@ static int get_crl_delta(X509_STORE_CTX *ctx,
reasons = ctx->current_reasons;
ok = get_crl_sk(ctx, &crl, &dcrl,
- &issuer, &crl_score, &reasons, ctx->crls);
+ &issuer, &crl_score, &reasons, ctx->crls);
if (ok)
goto done;
@@ -1960,10 +1959,10 @@ static int check_crl(X509_STORE_CTX *ctx, X509_CRL *crl)
/* If we have an alternative CRL issuer cert use that */
if (ctx->current_issuer != NULL) {
issuer = ctx->current_issuer;
- /*
- * Else find CRL issuer: if not last certificate then issuer is next
- * certificate in chain.
- */
+ /*
+ * Else find CRL issuer: if not last certificate then issuer is next
+ * certificate in chain.
+ */
} else if (cnum < chnum) {
issuer = sk_X509_value(ctx->chain, cnum + 1);
} else {
@@ -1971,8 +1970,7 @@ static int check_crl(X509_STORE_CTX *ctx, X509_CRL *crl)
if (!ossl_assert(issuer != NULL))
return 0;
/* If not self-issued, can't check signature */
- if (!ctx->check_issued(ctx, issuer, issuer) &&
- !verify_cb_crl(ctx, X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER))
+ if (!ctx->check_issued(ctx, issuer, issuer) && !verify_cb_crl(ctx, X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER))
return 0;
}
@@ -1984,33 +1982,25 @@ static int check_crl(X509_STORE_CTX *ctx, X509_CRL *crl)
*/
if (crl->base_crl_number == NULL) {
/* Check for cRLSign bit if keyUsage present */
- if ((issuer->ex_flags & EXFLAG_KUSAGE) != 0 &&
- (issuer->ex_kusage & KU_CRL_SIGN) == 0 &&
- !verify_cb_crl(ctx, X509_V_ERR_KEYUSAGE_NO_CRL_SIGN))
+ if ((issuer->ex_flags & EXFLAG_KUSAGE) != 0 && (issuer->ex_kusage & KU_CRL_SIGN) == 0 && !verify_cb_crl(ctx, X509_V_ERR_KEYUSAGE_NO_CRL_SIGN))
return 0;
- if ((ctx->current_crl_score & CRL_SCORE_SCOPE) == 0 &&
- !verify_cb_crl(ctx, X509_V_ERR_DIFFERENT_CRL_SCOPE))
+ if ((ctx->current_crl_score & CRL_SCORE_SCOPE) == 0 && !verify_cb_crl(ctx, X509_V_ERR_DIFFERENT_CRL_SCOPE))
return 0;
- if ((ctx->current_crl_score & CRL_SCORE_SAME_PATH) == 0 &&
- check_crl_path(ctx, ctx->current_issuer) <= 0 &&
- !verify_cb_crl(ctx, X509_V_ERR_CRL_PATH_VALIDATION_ERROR))
+ if ((ctx->current_crl_score & CRL_SCORE_SAME_PATH) == 0 && check_crl_path(ctx, ctx->current_issuer) <= 0 && !verify_cb_crl(ctx, X509_V_ERR_CRL_PATH_VALIDATION_ERROR))
return 0;
- if ((crl->idp_flags & IDP_INVALID) != 0 &&
- !verify_cb_crl(ctx, X509_V_ERR_INVALID_EXTENSION))
+ if ((crl->idp_flags & IDP_INVALID) != 0 && !verify_cb_crl(ctx, X509_V_ERR_INVALID_EXTENSION))
return 0;
}
- if ((ctx->current_crl_score & CRL_SCORE_TIME) == 0 &&
- !ossl_x509_check_crl_time(ctx, crl, 1))
+ if ((ctx->current_crl_score & CRL_SCORE_TIME) == 0 && !ossl_x509_check_crl_time(ctx, crl, 1))
return 0;
/* Attempt to get issuer certificate public key */
ikey = X509_get0_pubkey(issuer);
- if (ikey == NULL &&
- !verify_cb_crl(ctx, X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY))
+ if (ikey == NULL && !verify_cb_crl(ctx, X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY))
return 0;
if (ikey != NULL) {
@@ -2019,8 +2009,7 @@ static int check_crl(X509_STORE_CTX *ctx, X509_CRL *crl)
if (rv != X509_V_OK && !verify_cb_crl(ctx, rv))
return 0;
/* Verify CRL signature */
- if (X509_CRL_verify(crl, ikey) <= 0 &&
- !verify_cb_crl(ctx, X509_V_ERR_CRL_SIGNATURE_FAILURE))
+ if (X509_CRL_verify(crl, ikey) <= 0 && !verify_cb_crl(ctx, X509_V_ERR_CRL_SIGNATURE_FAILURE))
return 0;
}
return 1;
@@ -2038,8 +2027,7 @@ static int cert_crl(X509_STORE_CTX *ctx, X509_CRL *crl, X509 *x)
* change the meaning of CRL entries.
*/
if ((ctx->param->flags & X509_V_FLAG_IGNORE_CRITICAL) == 0
- && (crl->flags & EXFLAG_CRITICAL) != 0 &&
- !verify_cb_crl(ctx, X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION))
+ && (crl->flags & EXFLAG_CRITICAL) != 0 && !verify_cb_crl(ctx, X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION))
return 0;
/*
* Look for serial number of certificate in CRL. If found, make sure
@@ -2078,7 +2066,7 @@ static int check_policy(X509_STORE_CTX *ctx)
goto memerr;
}
ret = X509_policy_check(&ctx->tree, &ctx->explicit_policy, ctx->chain,
- ctx->param->policies, ctx->param->flags);
+ ctx->param->policies, ctx->param->flags);
if (ctx->bare_ta_signed)
(void)sk_X509_pop(ctx->chain);
@@ -2097,7 +2085,7 @@ static int check_policy(X509_STORE_CTX *ctx)
if ((x->ex_flags & EXFLAG_INVALID_POLICY) != 0)
cbcalled = 1;
CB_FAIL_IF((x->ex_flags & EXFLAG_INVALID_POLICY) != 0,
- ctx, x, i, X509_V_ERR_INVALID_POLICY_EXTENSION);
+ ctx, x, i, X509_V_ERR_INVALID_POLICY_EXTENSION);
}
if (!cbcalled) {
/* Should not be able to get here */
@@ -2131,7 +2119,7 @@ static int check_policy(X509_STORE_CTX *ctx)
return 1;
- memerr:
+memerr:
ctx->error = X509_V_ERR_OUT_OF_MEM;
return -1;
}
@@ -2142,7 +2130,7 @@ static int check_policy(X509_STORE_CTX *ctx)
* Return 1 on success, 0 otherwise.
*/
int ossl_x509_check_certificate_times(const X509_VERIFY_PARAM *vpm, X509 *x,
- int *error)
+ int *error)
{
int ret = 0, err = 0;
int64_t notafter_seconds, notbefore_seconds, verification_time;
@@ -2271,15 +2259,15 @@ static int internal_verify(X509_STORE_CTX *ctx)
*/
xi = NULL;
} else if (ossl_x509_likely_issued(xi, xi) != X509_V_OK
- /* exceptional case: last cert in the chain is not self-issued */
- && ((ctx->param->flags & X509_V_FLAG_PARTIAL_CHAIN) == 0)) {
+ /* exceptional case: last cert in the chain is not self-issued */
+ && ((ctx->param->flags & X509_V_FLAG_PARTIAL_CHAIN) == 0)) {
if (n > 0) {
n--;
ctx->error_depth = n;
xs = sk_X509_value(ctx->chain, n);
} else {
CB_FAIL_IF(1, ctx, xi, 0,
- X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE);
+ X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE);
}
/*
* The below code will certainly not do a
@@ -2329,15 +2317,16 @@ static int internal_verify(X509_STORE_CTX *ctx)
* we are free to ignore any key usage restrictions on such certs.
*/
int ret = xs == xi && (xi->ex_flags & EXFLAG_CA) == 0
- ? X509_V_OK : ossl_x509_signing_allowed(xi, xs);
+ ? X509_V_OK
+ : ossl_x509_signing_allowed(xi, xs);
CB_FAIL_IF(ret != X509_V_OK, ctx, xi, issuer_depth, ret);
if ((pkey = X509_get0_pubkey(xi)) == NULL) {
CB_FAIL_IF(1, ctx, xi, issuer_depth,
- X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY);
+ X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY);
} else {
CB_FAIL_IF(X509_verify(xs, pkey) <= 0,
- ctx, xs, n, X509_V_ERR_CERT_SIGNATURE_FAILURE);
+ ctx, xs, n, X509_V_ERR_CERT_SIGNATURE_FAILURE);
}
}
@@ -2372,8 +2361,7 @@ int X509_cmp_current_time(const ASN1_TIME *ctm)
/* returns 0 on error, otherwise 1 if ctm > cmp_time, else -1 */
int X509_cmp_time(const ASN1_TIME *ctm, time_t *cmp_time)
{
- int64_t cert_time, posix_time = cmp_time == NULL ? (int64_t)time(NULL)
- : (int64_t)*cmp_time;
+ int64_t cert_time, posix_time = cmp_time == NULL ? (int64_t)time(NULL) : (int64_t)*cmp_time;
if (!certificate_time_to_posix(ctm, &cert_time))
return 0;
@@ -2393,7 +2381,7 @@ int X509_cmp_time(const ASN1_TIME *ctm, time_t *cmp_time)
* do not use this when validating certificates for actual use)
*/
int X509_cmp_timeframe(const X509_VERIFY_PARAM *vpm,
- const ASN1_TIME *start, const ASN1_TIME *end)
+ const ASN1_TIME *start, const ASN1_TIME *end)
{
unsigned long flags = vpm == NULL ? 0 : X509_VERIFY_PARAM_get_flags(vpm);
time_t ref_time;
@@ -2446,7 +2434,7 @@ ASN1_TIME *X509_time_adj(ASN1_TIME *s, long offset_sec, time_t *in_tm)
}
ASN1_TIME *X509_time_adj_ex(ASN1_TIME *s,
- int offset_day, long offset_sec, time_t *in_tm)
+ int offset_day, long offset_sec, time_t *in_tm)
{
time_t t;
@@ -2505,7 +2493,7 @@ int X509_get_pubkey_parameters(EVP_PKEY *pkey, STACK_OF(X509) *chain)
* Sadly, returns NULL also on internal error.
*/
X509_CRL *X509_CRL_diff(X509_CRL *base, X509_CRL *newer,
- EVP_PKEY *skey, const EVP_MD *md, unsigned int flags)
+ EVP_PKEY *skey, const EVP_MD *md, unsigned int flags)
{
X509_CRL *crl = NULL;
int i;
@@ -2523,7 +2511,8 @@ X509_CRL *X509_CRL_diff(X509_CRL *base, X509_CRL *newer,
}
/* Issuer names must match */
if (X509_NAME_cmp(X509_CRL_get_issuer(base),
- X509_CRL_get_issuer(newer)) != 0) {
+ X509_CRL_get_issuer(newer))
+ != 0) {
ERR_raise(ERR_LIB_X509, X509_R_ISSUER_MISMATCH);
return NULL;
}
@@ -2542,8 +2531,7 @@ X509_CRL *X509_CRL_diff(X509_CRL *base, X509_CRL *newer,
return NULL;
}
/* CRLs must verify */
- if (skey != NULL && (X509_CRL_verify(base, skey) <= 0 ||
- X509_CRL_verify(newer, skey) <= 0)) {
+ if (skey != NULL && (X509_CRL_verify(base, skey) <= 0 || X509_CRL_verify(newer, skey) <= 0)) {
ERR_raise(ERR_LIB_X509, X509_R_CRL_VERIFY_FAILURE);
return NULL;
}
@@ -2620,7 +2608,7 @@ X509_CRL *X509_CRL_diff(X509_CRL *base, X509_CRL *newer,
return crl;
- err:
+err:
X509_CRL_free(crl);
return NULL;
}
@@ -2747,7 +2735,7 @@ int X509_STORE_CTX_set_trust(X509_STORE_CTX *ctx, int trust)
* client/server.
*/
int X509_STORE_CTX_purpose_inherit(X509_STORE_CTX *ctx, int def_purpose,
- int purpose, int trust)
+ int purpose, int trust)
{
int idx;
@@ -2842,7 +2830,7 @@ int X509_STORE_CTX_init_rpk(X509_STORE_CTX *ctx, X509_STORE *store, EVP_PKEY *rp
}
int X509_STORE_CTX_init(X509_STORE_CTX *ctx, X509_STORE *store, X509 *x509,
- STACK_OF(X509) *chain)
+ STACK_OF(X509) *chain)
{
if (ctx == NULL) {
ERR_raise(ERR_LIB_X509, ERR_R_PASSED_NULL_PARAMETER);
@@ -2964,11 +2952,11 @@ int X509_STORE_CTX_init(X509_STORE_CTX *ctx, X509_STORE *store, X509 *x509,
}
if (CRYPTO_new_ex_data(CRYPTO_EX_INDEX_X509_STORE_CTX, ctx,
- &ctx->ex_data))
+ &ctx->ex_data))
return 1;
ERR_raise(ERR_LIB_X509, ERR_R_CRYPTO_LIB);
- err:
+err:
/*
* On error clean up allocated storage, if the store context was not
* allocated with X509_STORE_CTX_new() this is our last chance to do so.
@@ -3025,13 +3013,13 @@ void X509_STORE_CTX_set_flags(X509_STORE_CTX *ctx, unsigned long flags)
}
void X509_STORE_CTX_set_time(X509_STORE_CTX *ctx, unsigned long flags,
- time_t t)
+ time_t t)
{
X509_VERIFY_PARAM_set_time(ctx->param, t);
}
void X509_STORE_CTX_set_current_reasons(X509_STORE_CTX *ctx,
- unsigned int current_reasons)
+ unsigned int current_reasons)
{
ctx->current_reasons = current_reasons;
}
@@ -3063,7 +3051,7 @@ void X509_STORE_CTX_set0_verified_chain(X509_STORE_CTX *ctx, STACK_OF(X509) *sk)
}
void X509_STORE_CTX_set_verify_cb(X509_STORE_CTX *ctx,
- X509_STORE_CTX_verify_cb verify_cb)
+ X509_STORE_CTX_verify_cb verify_cb)
{
ctx->verify_cb = verify_cb;
}
@@ -3074,7 +3062,7 @@ X509_STORE_CTX_verify_cb X509_STORE_CTX_get_verify_cb(const X509_STORE_CTX *ctx)
}
void X509_STORE_CTX_set_verify(X509_STORE_CTX *ctx,
- X509_STORE_CTX_verify_fn verify)
+ X509_STORE_CTX_verify_fn verify)
{
ctx->verify = verify;
}
@@ -3108,7 +3096,7 @@ X509_STORE_CTX_get_crl_fn X509_STORE_CTX_get_get_crl(const X509_STORE_CTX *ctx)
}
void X509_STORE_CTX_set_get_crl(X509_STORE_CTX *ctx,
- X509_STORE_CTX_get_crl_fn get_crl)
+ X509_STORE_CTX_get_crl_fn get_crl)
{
ctx->get_crl = get_crl;
}
@@ -3192,7 +3180,7 @@ void X509_STORE_CTX_set0_dane(X509_STORE_CTX *ctx, SSL_DANE *dane)
}
static unsigned char *dane_i2d(X509 *cert, uint8_t selector,
- unsigned int *i2dlen)
+ unsigned int *i2dlen)
{
unsigned char *buf = NULL;
int len;
@@ -3346,8 +3334,7 @@ static int dane_match_cert(X509_STORE_CTX *ctx, X509 *cert, int depth)
* DANE match is dispositive, but with PKIX we still need to build a
* full chain.
*/
- if (cmplen == t->dlen &&
- memcmp(cmpbuf, t->data, cmplen) == 0) {
+ if (cmplen == t->dlen && memcmp(cmpbuf, t->data, cmplen) == 0) {
if (DANETLS_USAGE_BIT(usage) & DANETLS_DANE_MASK)
matched = 1;
if (matched || dane->mdpth < 0) {
@@ -3407,10 +3394,7 @@ static int check_dane_pkeys(X509_STORE_CTX *ctx)
for (i = 0; i < recnum; ++i) {
t = sk_danetls_record_value(dane->trecs, i);
- if (t->usage != DANETLS_USAGE_DANE_TA ||
- t->selector != DANETLS_SELECTOR_SPKI ||
- t->mtype != DANETLS_MATCHING_FULL ||
- X509_verify(cert, t->spki) <= 0)
+ if (t->usage != DANETLS_USAGE_DANE_TA || t->selector != DANETLS_SELECTOR_SPKI || t->mtype != DANETLS_MATCHING_FULL || X509_verify(cert, t->spki) <= 0)
continue;
/* Clear any PKIX-?? matches that failed to extend to a full chain */
@@ -3571,8 +3555,7 @@ static int dane_verify(X509_STORE_CTX *ctx)
if (!check_leaf_suiteb(ctx, cert))
return 0;
/* Callback invoked as needed */
- if ((dane->flags & DANE_FLAG_NO_DANE_EE_NAMECHECKS) == 0 &&
- !check_id(ctx))
+ if ((dane->flags & DANE_FLAG_NO_DANE_EE_NAMECHECKS) == 0 && !check_id(ctx))
return 0;
/* Bypass internal_verify(), issue depth 0 success callback */
ctx->error_depth = 0;
@@ -3640,7 +3623,7 @@ static int build_chain(X509_STORE_CTX *ctx)
goto int_err;
#define S_DOUNTRUSTED (1 << 0) /* Search untrusted chain */
-#define S_DOTRUSTED (1 << 1) /* Search trusted store */
+#define S_DOTRUSTED (1 << 1) /* Search trusted store */
#define S_DOALTERNATE (1 << 2) /* Retry with pruned alternate chain */
/*
* Set up search policy, untrusted if possible, trusted-first if enabled,
@@ -3780,14 +3763,12 @@ static int build_chain(X509_STORE_CTX *ctx)
X509_free(sk_X509_pop(ctx->chain));
ctx->num_untrusted = num;
- if (DANETLS_ENABLED(dane) &&
- dane->mdpth >= ctx->num_untrusted) {
+ if (DANETLS_ENABLED(dane) && dane->mdpth >= ctx->num_untrusted) {
dane->mdpth = -1;
X509_free(dane->mcert);
dane->mcert = NULL;
}
- if (DANETLS_ENABLED(dane) &&
- dane->pdpth >= ctx->num_untrusted)
+ if (DANETLS_ENABLED(dane) && dane->pdpth >= ctx->num_untrusted)
dane->pdpth = -1;
}
@@ -3858,8 +3839,7 @@ static int build_chain(X509_STORE_CTX *ctx)
if ((search & S_DOALTERNATE) != 0 && --alt_untrusted > 0)
continue;
/* Still no luck and no fallbacks left? */
- if (!may_alternate || (search & S_DOALTERNATE) != 0 ||
- ctx->num_untrusted < 2)
+ if (!may_alternate || (search & S_DOALTERNATE) != 0 || ctx->num_untrusted < 2)
break;
/* Search for a trusted issuer of a shorter chain */
search |= S_DOALTERNATE;
@@ -3875,8 +3855,7 @@ static int build_chain(X509_STORE_CTX *ctx)
if (!ossl_assert(num == ctx->num_untrusted))
goto int_err;
curr = sk_X509_value(ctx->chain, num - 1);
- issuer = (X509_self_signed(curr, 0) > 0 || num > max_depth) ?
- NULL : get0_best_issuer_sk(ctx, 0, 1 /* no_dup */, sk_untrusted, curr);
+ issuer = (X509_self_signed(curr, 0) > 0 || num > max_depth) ? NULL : get0_best_issuer_sk(ctx, 0, 1 /* no_dup */, sk_untrusted, curr);
if (issuer == NULL) {
/*
* Once we have reached a self-signed cert or num > max_depth
@@ -3941,36 +3920,36 @@ static int build_chain(X509_STORE_CTX *ctx)
break;
}
CB_FAIL_IF(num > max_depth,
- ctx, NULL, num - 1, X509_V_ERR_CERT_CHAIN_TOO_LONG);
+ ctx, NULL, num - 1, X509_V_ERR_CERT_CHAIN_TOO_LONG);
CB_FAIL_IF(DANETLS_ENABLED(dane)
- && (!DANETLS_HAS_PKIX(dane) || dane->pdpth >= 0),
- ctx, NULL, num - 1, X509_V_ERR_DANE_NO_MATCH);
+ && (!DANETLS_HAS_PKIX(dane) || dane->pdpth >= 0),
+ ctx, NULL, num - 1, X509_V_ERR_DANE_NO_MATCH);
if (X509_self_signed(sk_X509_value(ctx->chain, num - 1), 0) > 0)
return verify_cb_cert(ctx, NULL, num - 1,
- num == 1
- ? X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT
- : X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN);
+ num == 1
+ ? X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT
+ : X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN);
return verify_cb_cert(ctx, NULL, num - 1,
- ctx->num_untrusted < num
- ? X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT
- : X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY);
+ ctx->num_untrusted < num
+ ? X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT
+ : X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY);
}
- int_err:
+int_err:
ERR_raise(ERR_LIB_X509, ERR_R_INTERNAL_ERROR);
ctx->error = X509_V_ERR_UNSPECIFIED;
sk_X509_free(sk_untrusted);
return -1;
- memerr:
+memerr:
ctx->error = X509_V_ERR_OUT_OF_MEM;
sk_X509_free(sk_untrusted);
return -1;
}
STACK_OF(X509) *X509_build_chain(X509 *target, STACK_OF(X509) *certs,
- X509_STORE *store, int with_self_signed,
- OSSL_LIB_CTX *libctx, const char *propq)
+ X509_STORE *store, int with_self_signed,
+ OSSL_LIB_CTX *libctx, const char *propq)
{
int finish_chain = store != NULL;
X509_STORE_CTX *ctx;
@@ -4005,7 +3984,7 @@ STACK_OF(X509) *X509_build_chain(X509 *target, STACK_OF(X509) *certs,
result = NULL;
}
- err:
+err:
X509_STORE_CTX_free(ctx);
return result;
}
@@ -4070,10 +4049,9 @@ static int check_curve(X509 *cert)
if (EVP_PKEY_get_id(pkey) != EVP_PKEY_EC)
return 1;
- ret =
- EVP_PKEY_get_int_param(pkey,
- OSSL_PKEY_PARAM_EC_DECODED_FROM_EXPLICIT_PARAMS,
- &val);
+ ret = EVP_PKEY_get_int_param(pkey,
+ OSSL_PKEY_PARAM_EC_DECODED_FROM_EXPLICIT_PARAMS,
+ &val);
return ret == 1 ? !val : -1;
}
diff --git a/crypto/x509/x509_vpm.c b/crypto/x509/x509_vpm.c
index 346bfd73ff..dc214409af 100644
--- a/crypto/x509/x509_vpm.c
+++ b/crypto/x509/x509_vpm.c
@@ -34,7 +34,7 @@ static void str_free(char *s)
}
static int int_x509_param_set_hosts(X509_VERIFY_PARAM *vpm, int mode,
- const char *name, size_t namelen)
+ const char *name, size_t namelen)
{
char *copy;
@@ -45,7 +45,7 @@ static int int_x509_param_set_hosts(X509_VERIFY_PARAM *vpm, int mode,
if (namelen == 0 || name == NULL)
namelen = name ? strlen(name) : 0;
else if (name != NULL
- && memchr(name, '\0', namelen > 1 ? namelen - 1 : namelen) != NULL)
+ && memchr(name, '\0', namelen > 1 ? namelen - 1 : namelen) != NULL)
return 0;
if (namelen > 0 && name[namelen - 1] == '\0')
--namelen;
@@ -61,8 +61,7 @@ static int int_x509_param_set_hosts(X509_VERIFY_PARAM *vpm, int mode,
if (copy == NULL)
return 0;
- if (vpm->hosts == NULL &&
- (vpm->hosts = sk_OPENSSL_STRING_new_null()) == NULL) {
+ if (vpm->hosts == NULL && (vpm->hosts = sk_OPENSSL_STRING_new_null()) == NULL) {
OPENSSL_free(copy);
return 0;
}
@@ -144,12 +143,12 @@ void X509_VERIFY_PARAM_free(X509_VERIFY_PARAM *param)
/* Macro to test and copy a field if necessary */
-#define x509_verify_param_copy(field, def) \
+#define x509_verify_param_copy(field, def) \
if (test_x509_verify_param_copy(field, def)) \
dest->field = src->field;
int X509_VERIFY_PARAM_inherit(X509_VERIFY_PARAM *dest,
- const X509_VERIFY_PARAM *src)
+ const X509_VERIFY_PARAM *src)
{
unsigned long inh_flags;
int to_default, to_overwrite;
@@ -196,8 +195,7 @@ int X509_VERIFY_PARAM_inherit(X509_VERIFY_PARAM *dest,
sk_OPENSSL_STRING_pop_free(dest->hosts, str_free);
dest->hosts = NULL;
if (src->hosts != NULL) {
- dest->hosts =
- sk_OPENSSL_STRING_deep_copy(src->hosts, str_copy, str_free);
+ dest->hosts = sk_OPENSSL_STRING_deep_copy(src->hosts, str_copy, str_free);
if (dest->hosts == NULL)
return 0;
}
@@ -217,7 +215,7 @@ int X509_VERIFY_PARAM_inherit(X509_VERIFY_PARAM *dest,
}
int X509_VERIFY_PARAM_set1(X509_VERIFY_PARAM *to,
- const X509_VERIFY_PARAM *from)
+ const X509_VERIFY_PARAM *from)
{
unsigned long save_flags;
int ret;
@@ -234,7 +232,7 @@ int X509_VERIFY_PARAM_set1(X509_VERIFY_PARAM *to,
}
static int int_x509_param_set1(char **pdest, size_t *pdestlen,
- const char *src, size_t srclen)
+ const char *src, size_t srclen)
{
char *tmp;
@@ -274,7 +272,7 @@ int X509_VERIFY_PARAM_set_flags(X509_VERIFY_PARAM *param, unsigned long flags)
}
int X509_VERIFY_PARAM_clear_flags(X509_VERIFY_PARAM *param,
- unsigned long flags)
+ unsigned long flags)
{
param->flags &= ~flags;
return 1;
@@ -341,7 +339,7 @@ void ossl_x509_verify_param_set_time_posix(X509_VERIFY_PARAM *param, int64_t t)
}
int X509_VERIFY_PARAM_add0_policy(X509_VERIFY_PARAM *param,
- ASN1_OBJECT *policy)
+ ASN1_OBJECT *policy)
{
if (param->policies == NULL) {
param->policies = sk_ASN1_OBJECT_new_null();
@@ -355,7 +353,7 @@ int X509_VERIFY_PARAM_add0_policy(X509_VERIFY_PARAM *param,
}
int X509_VERIFY_PARAM_set1_policies(X509_VERIFY_PARAM *param,
- STACK_OF(ASN1_OBJECT) *policies)
+ STACK_OF(ASN1_OBJECT) *policies)
{
int i;
ASN1_OBJECT *oid, *doid;
@@ -395,19 +393,19 @@ char *X509_VERIFY_PARAM_get0_host(X509_VERIFY_PARAM *param, int idx)
}
int X509_VERIFY_PARAM_set1_host(X509_VERIFY_PARAM *param,
- const char *name, size_t namelen)
+ const char *name, size_t namelen)
{
return int_x509_param_set_hosts(param, SET_HOST, name, namelen);
}
int X509_VERIFY_PARAM_add1_host(X509_VERIFY_PARAM *param,
- const char *name, size_t namelen)
+ const char *name, size_t namelen)
{
return int_x509_param_set_hosts(param, ADD_HOST, name, namelen);
}
void X509_VERIFY_PARAM_set_hostflags(X509_VERIFY_PARAM *param,
- unsigned int flags)
+ unsigned int flags)
{
param->hostflags = flags;
}
@@ -428,7 +426,7 @@ char *X509_VERIFY_PARAM_get0_peername(const X509_VERIFY_PARAM *param)
* the target peername.
*/
void X509_VERIFY_PARAM_move_peername(X509_VERIFY_PARAM *to,
- X509_VERIFY_PARAM *from)
+ X509_VERIFY_PARAM *from)
{
char *peername = (from != NULL) ? from->peername : NULL;
@@ -446,14 +444,13 @@ char *X509_VERIFY_PARAM_get0_email(X509_VERIFY_PARAM *param)
}
int X509_VERIFY_PARAM_set1_email(X509_VERIFY_PARAM *param,
- const char *email, size_t emaillen)
+ const char *email, size_t emaillen)
{
return int_x509_param_set1(¶m->email, ¶m->emaillen,
- email, emaillen);
+ email, emaillen);
}
-static unsigned char
-*int_X509_VERIFY_PARAM_get0_ip(X509_VERIFY_PARAM *param, size_t *plen)
+static unsigned char *int_X509_VERIFY_PARAM_get0_ip(X509_VERIFY_PARAM *param, size_t *plen)
{
if (param == NULL || param->ip == NULL) {
ERR_raise(ERR_LIB_X509, ERR_R_PASSED_NULL_PARAMETER);
@@ -473,14 +470,14 @@ char *X509_VERIFY_PARAM_get1_ip_asc(X509_VERIFY_PARAM *param)
}
int X509_VERIFY_PARAM_set1_ip(X509_VERIFY_PARAM *param,
- const unsigned char *ip, size_t iplen)
+ const unsigned char *ip, size_t iplen)
{
if (iplen != 0 && iplen != 4 && iplen != 16) {
ERR_raise(ERR_LIB_X509, ERR_R_PASSED_INVALID_ARGUMENT);
return 0;
}
return int_x509_param_set1((char **)¶m->ip, ¶m->iplen,
- (char *)ip, iplen);
+ (char *)ip, iplen);
}
int X509_VERIFY_PARAM_set1_ip_asc(X509_VERIFY_PARAM *param, const char *ipasc)
@@ -517,78 +514,66 @@ const char *X509_VERIFY_PARAM_get0_name(const X509_VERIFY_PARAM *param)
*/
static const X509_VERIFY_PARAM default_table[] = {
- {
- "code_sign", /* Code sign parameters */
- 0, /* check time to use */
- 0, /* inheritance flags */
- 0, /* flags */
- X509_PURPOSE_CODE_SIGN, /* purpose */
- X509_TRUST_OBJECT_SIGN, /* trust */
- -1, /* depth */
- -1, /* auth_level */
- NULL, /* policies */
- vpm_empty_id
- },
- {
- "default", /* X509 default parameters */
- 0, /* check time to use */
- 0, /* inheritance flags */
- X509_V_FLAG_TRUSTED_FIRST, /* flags */
- 0, /* purpose */
- 0, /* trust */
- 100, /* depth */
- -1, /* auth_level */
- NULL, /* policies */
- vpm_empty_id
- },
- {
- "pkcs7", /* S/MIME sign parameters */
- 0, /* check time to use */
- 0, /* inheritance flags */
- 0, /* flags */
- X509_PURPOSE_SMIME_SIGN, /* purpose */
- X509_TRUST_EMAIL, /* trust */
- -1, /* depth */
- -1, /* auth_level */
- NULL, /* policies */
- vpm_empty_id
- },
- {
- "smime_sign", /* S/MIME sign parameters */
- 0, /* check time to use */
- 0, /* inheritance flags */
- 0, /* flags */
- X509_PURPOSE_SMIME_SIGN, /* purpose */
- X509_TRUST_EMAIL, /* trust */
- -1, /* depth */
- -1, /* auth_level */
- NULL, /* policies */
- vpm_empty_id
- },
- {
- "ssl_client", /* SSL/TLS client parameters */
- 0, /* check time to use */
- 0, /* inheritance flags */
- 0, /* flags */
- X509_PURPOSE_SSL_CLIENT, /* purpose */
- X509_TRUST_SSL_CLIENT, /* trust */
- -1, /* depth */
- -1, /* auth_level */
- NULL, /* policies */
- vpm_empty_id
- },
- {
- "ssl_server", /* SSL/TLS server parameters */
- 0, /* check time to use */
- 0, /* inheritance flags */
- 0, /* flags */
- X509_PURPOSE_SSL_SERVER, /* purpose */
- X509_TRUST_SSL_SERVER, /* trust */
- -1, /* depth */
- -1, /* auth_level */
- NULL, /* policies */
- vpm_empty_id
- }
+ { "code_sign", /* Code sign parameters */
+ 0, /* check time to use */
+ 0, /* inheritance flags */
+ 0, /* flags */
+ X509_PURPOSE_CODE_SIGN, /* purpose */
+ X509_TRUST_OBJECT_SIGN, /* trust */
+ -1, /* depth */
+ -1, /* auth_level */
+ NULL, /* policies */
+ vpm_empty_id },
+ { "default", /* X509 default parameters */
+ 0, /* check time to use */
+ 0, /* inheritance flags */
+ X509_V_FLAG_TRUSTED_FIRST, /* flags */
+ 0, /* purpose */
+ 0, /* trust */
+ 100, /* depth */
+ -1, /* auth_level */
+ NULL, /* policies */
+ vpm_empty_id },
+ { "pkcs7", /* S/MIME sign parameters */
+ 0, /* check time to use */
+ 0, /* inheritance flags */
+ 0, /* flags */
+ X509_PURPOSE_SMIME_SIGN, /* purpose */
+ X509_TRUST_EMAIL, /* trust */
+ -1, /* depth */
+ -1, /* auth_level */
+ NULL, /* policies */
+ vpm_empty_id },
+ { "smime_sign", /* S/MIME sign parameters */
+ 0, /* check time to use */
+ 0, /* inheritance flags */
+ 0, /* flags */
+ X509_PURPOSE_SMIME_SIGN, /* purpose */
+ X509_TRUST_EMAIL, /* trust */
+ -1, /* depth */
+ -1, /* auth_level */
+ NULL, /* policies */
+ vpm_empty_id },
+ { "ssl_client", /* SSL/TLS client parameters */
+ 0, /* check time to use */
+ 0, /* inheritance flags */
+ 0, /* flags */
+ X509_PURPOSE_SSL_CLIENT, /* purpose */
+ X509_TRUST_SSL_CLIENT, /* trust */
+ -1, /* depth */
+ -1, /* auth_level */
+ NULL, /* policies */
+ vpm_empty_id },
+ { "ssl_server", /* SSL/TLS server parameters */
+ 0, /* check time to use */
+ 0, /* inheritance flags */
+ 0, /* flags */
+ X509_PURPOSE_SSL_SERVER, /* purpose */
+ X509_TRUST_SSL_SERVER, /* trust */
+ -1, /* depth */
+ -1, /* auth_level */
+ NULL, /* policies */
+ vpm_empty_id }
};
static STACK_OF(X509_VERIFY_PARAM) *param_table = NULL;
@@ -602,7 +587,7 @@ DECLARE_OBJ_BSEARCH_CMP_FN(X509_VERIFY_PARAM, X509_VERIFY_PARAM, table);
IMPLEMENT_OBJ_BSEARCH_CMP_FN(X509_VERIFY_PARAM, X509_VERIFY_PARAM, table);
static int param_cmp(const X509_VERIFY_PARAM *const *a,
- const X509_VERIFY_PARAM *const *b)
+ const X509_VERIFY_PARAM *const *b)
{
return strcmp((*a)->name, (*b)->name);
}
diff --git a/crypto/x509/x509aset.c b/crypto/x509/x509aset.c
index 8200ea4440..03afc4ae56 100644
--- a/crypto/x509/x509aset.c
+++ b/crypto/x509/x509aset.c
@@ -75,9 +75,9 @@ err:
}
int OSSL_OBJECT_DIGEST_INFO_set1_digest(OSSL_OBJECT_DIGEST_INFO *o,
- int digestedObjectType,
- X509_ALGOR *digestAlgorithm,
- ASN1_BIT_STRING *digest)
+ int digestedObjectType,
+ X509_ALGOR *digestAlgorithm,
+ ASN1_BIT_STRING *digest)
{
if (ASN1_ENUMERATED_set(&o->digestedObjectType, digestedObjectType) <= 0)
@@ -93,19 +93,19 @@ int OSSL_OBJECT_DIGEST_INFO_set1_digest(OSSL_OBJECT_DIGEST_INFO *o,
}
int OSSL_ISSUER_SERIAL_set1_issuer(OSSL_ISSUER_SERIAL *isss,
- const X509_NAME *issuer)
+ const X509_NAME *issuer)
{
return replace_dirName(&isss->issuer, issuer);
}
int OSSL_ISSUER_SERIAL_set1_serial(OSSL_ISSUER_SERIAL *isss,
- const ASN1_INTEGER *serial)
+ const ASN1_INTEGER *serial)
{
return ASN1_STRING_copy(&isss->serial, serial);
}
int OSSL_ISSUER_SERIAL_set1_issuerUID(OSSL_ISSUER_SERIAL *isss,
- const ASN1_BIT_STRING *uid)
+ const ASN1_BIT_STRING *uid)
{
ASN1_BIT_STRING_free(isss->issuerUID);
isss->issuerUID = ASN1_STRING_dup(uid);
@@ -128,14 +128,14 @@ void X509_ACERT_set0_holder_entityName(X509_ACERT *x, GENERAL_NAMES *names)
}
void X509_ACERT_set0_holder_baseCertId(X509_ACERT *x,
- OSSL_ISSUER_SERIAL *isss)
+ OSSL_ISSUER_SERIAL *isss)
{
OSSL_ISSUER_SERIAL_free(x->acinfo->holder.baseCertificateID);
x->acinfo->holder.baseCertificateID = isss;
}
void X509_ACERT_set0_holder_digest(X509_ACERT *x,
- OSSL_OBJECT_DIGEST_INFO *dinfo)
+ OSSL_OBJECT_DIGEST_INFO *dinfo)
{
OSSL_OBJECT_DIGEST_INFO_free(x->acinfo->holder.objectDigestInfo);
x->acinfo->holder.objectDigestInfo = dinfo;
diff --git a/crypto/x509/x509cset.c b/crypto/x509/x509cset.c
index cade403fd1..8e0874aa1d 100644
--- a/crypto/x509/x509cset.c
+++ b/crypto/x509/x509cset.c
@@ -131,7 +131,7 @@ const X509_ALGOR *X509_CRL_get0_tbs_sigalg(const X509_CRL *crl)
}
void X509_CRL_get0_signature(const X509_CRL *crl, const ASN1_BIT_STRING **psig,
- const X509_ALGOR **palg)
+ const X509_ALGOR **palg)
{
if (psig != NULL)
*psig = &crl->signature;
@@ -173,8 +173,7 @@ int X509_REVOKED_set_serialNumber(X509_REVOKED *x, ASN1_INTEGER *serial)
return 1;
}
-const STACK_OF(X509_EXTENSION) *X509_REVOKED_get0_extensions(const
- X509_REVOKED *r)
+const STACK_OF(X509_EXTENSION) *X509_REVOKED_get0_extensions(const X509_REVOKED *r)
{
return r->extensions;
}
diff --git a/crypto/x509/x509name.c b/crypto/x509/x509name.c
index 809d369fca..6345e3273e 100644
--- a/crypto/x509/x509name.c
+++ b/crypto/x509/x509name.c
@@ -17,7 +17,7 @@
#include "crypto/x509.h"
int X509_NAME_get_text_by_NID(const X509_NAME *name, int nid,
- char *buf, int len)
+ char *buf, int len)
{
ASN1_OBJECT *obj;
@@ -28,7 +28,7 @@ int X509_NAME_get_text_by_NID(const X509_NAME *name, int nid,
}
int X509_NAME_get_text_by_OBJ(const X509_NAME *name, const ASN1_OBJECT *obj,
- char *buf, int len)
+ char *buf, int len)
{
int i;
const ASN1_STRING *data;
@@ -69,7 +69,7 @@ int X509_NAME_get_index_by_NID(const X509_NAME *name, int nid, int lastpos)
/* NOTE: you should be passing -1, not 0 as lastpos */
int X509_NAME_get_index_by_OBJ(const X509_NAME *name, const ASN1_OBJECT *obj,
- int lastpos)
+ int lastpos)
{
int n;
X509_NAME_ENTRY *ne;
@@ -139,8 +139,8 @@ X509_NAME_ENTRY *X509_NAME_delete_entry(X509_NAME *name, int loc)
}
int X509_NAME_add_entry_by_OBJ(X509_NAME *name, const ASN1_OBJECT *obj, int type,
- const unsigned char *bytes, int len, int loc,
- int set)
+ const unsigned char *bytes, int len, int loc,
+ int set)
{
X509_NAME_ENTRY *ne;
int ret;
@@ -154,8 +154,8 @@ int X509_NAME_add_entry_by_OBJ(X509_NAME *name, const ASN1_OBJECT *obj, int type
}
int X509_NAME_add_entry_by_NID(X509_NAME *name, int nid, int type,
- const unsigned char *bytes, int len, int loc,
- int set)
+ const unsigned char *bytes, int len, int loc,
+ int set)
{
X509_NAME_ENTRY *ne;
int ret;
@@ -168,8 +168,8 @@ int X509_NAME_add_entry_by_NID(X509_NAME *name, int nid, int type,
}
int X509_NAME_add_entry_by_txt(X509_NAME *name, const char *field, int type,
- const unsigned char *bytes, int len, int loc,
- int set)
+ const unsigned char *bytes, int len, int loc,
+ int set)
{
X509_NAME_ENTRY *ne;
int ret;
@@ -186,7 +186,7 @@ int X509_NAME_add_entry_by_txt(X509_NAME *name, const char *field, int type,
* guy we are about to stomp on.
*/
int X509_NAME_add_entry(X509_NAME *name, const X509_NAME_ENTRY *ne, int loc,
- int set)
+ int set)
{
X509_NAME_ENTRY *new_name = NULL;
int n, i, inc;
@@ -210,7 +210,7 @@ int X509_NAME_add_entry(X509_NAME *name, const X509_NAME_ENTRY *ne, int loc,
} else {
set = sk_X509_NAME_ENTRY_value(sk, loc - 1)->set;
}
- } else { /* if (set >= 0) */
+ } else { /* if (set >= 0) */
if (loc >= n) {
if (loc != 0)
@@ -234,15 +234,15 @@ int X509_NAME_add_entry(X509_NAME *name, const X509_NAME_ENTRY *ne, int loc,
sk_X509_NAME_ENTRY_value(sk, i)->set += 1;
}
return 1;
- err:
+err:
X509_NAME_ENTRY_free(new_name);
return 0;
}
X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_txt(X509_NAME_ENTRY **ne,
- const char *field, int type,
- const unsigned char *bytes,
- int len)
+ const char *field, int type,
+ const unsigned char *bytes,
+ int len)
{
ASN1_OBJECT *obj;
X509_NAME_ENTRY *nentry;
@@ -250,7 +250,7 @@ X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_txt(X509_NAME_ENTRY **ne,
obj = OBJ_txt2obj(field, 0);
if (obj == NULL) {
ERR_raise_data(ERR_LIB_X509, X509_R_INVALID_FIELD_NAME,
- "name=%s", field);
+ "name=%s", field);
return NULL;
}
nentry = X509_NAME_ENTRY_create_by_OBJ(ne, obj, type, bytes, len);
@@ -259,9 +259,9 @@ X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_txt(X509_NAME_ENTRY **ne,
}
X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_NID(X509_NAME_ENTRY **ne, int nid,
- int type,
- const unsigned char *bytes,
- int len)
+ int type,
+ const unsigned char *bytes,
+ int len)
{
ASN1_OBJECT *obj;
X509_NAME_ENTRY *nentry;
@@ -277,9 +277,9 @@ X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_NID(X509_NAME_ENTRY **ne, int nid,
}
X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_OBJ(X509_NAME_ENTRY **ne,
- const ASN1_OBJECT *obj, int type,
- const unsigned char *bytes,
- int len)
+ const ASN1_OBJECT *obj, int type,
+ const unsigned char *bytes,
+ int len)
{
X509_NAME_ENTRY *ret;
@@ -297,7 +297,7 @@ X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_OBJ(X509_NAME_ENTRY **ne,
if ((ne != NULL) && (*ne == NULL))
*ne = ret;
return ret;
- err:
+err:
if ((ne == NULL) || (ret != *ne))
X509_NAME_ENTRY_free(ret);
return NULL;
@@ -315,7 +315,7 @@ int X509_NAME_ENTRY_set_object(X509_NAME_ENTRY *ne, const ASN1_OBJECT *obj)
}
int X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *ne, int type,
- const unsigned char *bytes, int len)
+ const unsigned char *bytes, int len)
{
int i;
@@ -323,8 +323,10 @@ int X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *ne, int type,
return 0;
if ((type > 0) && (type & MBSTRING_FLAG))
return ASN1_STRING_set_by_NID(&ne->value, bytes,
- len, type,
- OBJ_obj2nid(ne->object)) ? 1 : 0;
+ len, type,
+ OBJ_obj2nid(ne->object))
+ ? 1
+ : 0;
if (len < 0)
len = (int)strlen((const char *)bytes);
i = ASN1_STRING_set(ne->value, bytes, len);
diff --git a/crypto/x509/x509type.c b/crypto/x509/x509type.c
index 79fd5e7db6..6a499a91da 100644
--- a/crypto/x509/x509type.c
+++ b/crypto/x509/x509type.c
@@ -32,7 +32,7 @@ int X509_certificate_type(const X509 *x, const EVP_PKEY *pkey)
switch (EVP_PKEY_get_id(pk)) {
case EVP_PKEY_RSA:
ret = EVP_PK_RSA | EVP_PKT_SIGN;
-/* if (!sign only extension) */
+ /* if (!sign only extension) */
ret |= EVP_PKT_ENC;
break;
case EVP_PKEY_RSA_PSS:
diff --git a/crypto/x509/x_all.c b/crypto/x509/x_all.c
index 845b53837e..1de8274c28 100644
--- a/crypto/x509/x_all.c
+++ b/crypto/x509/x_all.c
@@ -36,12 +36,12 @@ int X509_verify(X509 *a, EVP_PKEY *r)
return 0;
return ASN1_item_verify_ex(ASN1_ITEM_rptr(X509_CINF), &a->sig_alg,
- &a->signature, &a->cert_info,
- a->distinguishing_id, r, a->libctx, a->propq);
+ &a->signature, &a->cert_info,
+ a->distinguishing_id, r, a->libctx, a->propq);
}
int X509_REQ_verify_ex(X509_REQ *a, EVP_PKEY *r, OSSL_LIB_CTX *libctx,
- const char *propq)
+ const char *propq)
{
if (X509_REQ_get_version(a) != X509_REQ_VERSION_1) {
ERR_raise(ERR_LIB_X509, X509_R_UNSUPPORTED_VERSION);
@@ -49,8 +49,8 @@ int X509_REQ_verify_ex(X509_REQ *a, EVP_PKEY *r, OSSL_LIB_CTX *libctx,
}
return ASN1_item_verify_ex(ASN1_ITEM_rptr(X509_REQ_INFO), &a->sig_alg,
- a->signature, &a->req_info, a->distinguishing_id,
- r, libctx, propq);
+ a->signature, &a->req_info, a->distinguishing_id,
+ r, libctx, propq);
}
int X509_REQ_verify(X509_REQ *a, EVP_PKEY *r)
@@ -64,14 +64,14 @@ int X509_ACERT_verify(X509_ACERT *a, EVP_PKEY *r)
return 0;
return ASN1_item_verify_ex(ASN1_ITEM_rptr(X509_ACERT_INFO), &a->sig_alg,
- &a->signature, a->acinfo,
- NULL, r, NULL, NULL);
+ &a->signature, a->acinfo,
+ NULL, r, NULL, NULL);
}
int NETSCAPE_SPKI_verify(NETSCAPE_SPKI *a, EVP_PKEY *r)
{
return ASN1_item_verify(ASN1_ITEM_rptr(NETSCAPE_SPKAC),
- &a->sig_algor, a->signature, a->spkac, r);
+ &a->sig_algor, a->signature, a->spkac, r);
}
int X509_sign(X509 *x, EVP_PKEY *pkey, const EVP_MD *md)
@@ -81,7 +81,7 @@ int X509_sign(X509 *x, EVP_PKEY *pkey, const EVP_MD *md)
return 0;
}
if (sk_X509_EXTENSION_num(X509_get0_extensions(x)) > 0
- && !X509_set_version(x, X509_VERSION_3))
+ && !X509_set_version(x, X509_VERSION_3))
return 0;
/*
@@ -93,8 +93,8 @@ int X509_sign(X509 *x, EVP_PKEY *pkey, const EVP_MD *md)
*/
x->cert_info.enc.modified = 1;
return ASN1_item_sign_ex(ASN1_ITEM_rptr(X509_CINF), &x->cert_info.signature,
- &x->sig_alg, &x->signature, &x->cert_info, NULL,
- pkey, md, x->libctx, x->propq);
+ &x->sig_alg, &x->signature, &x->cert_info, NULL,
+ pkey, md, x->libctx, x->propq);
}
int X509_sign_ctx(X509 *x, EVP_MD_CTX *ctx)
@@ -104,25 +104,24 @@ int X509_sign_ctx(X509 *x, EVP_MD_CTX *ctx)
return 0;
}
if (sk_X509_EXTENSION_num(X509_get0_extensions(x)) > 0
- && !X509_set_version(x, X509_VERSION_3))
+ && !X509_set_version(x, X509_VERSION_3))
return 0;
x->cert_info.enc.modified = 1;
return ASN1_item_sign_ctx(ASN1_ITEM_rptr(X509_CINF),
- &x->cert_info.signature,
- &x->sig_alg, &x->signature, &x->cert_info, ctx);
+ &x->cert_info.signature,
+ &x->sig_alg, &x->signature, &x->cert_info, ctx);
}
static ASN1_VALUE *simple_get_asn1(const char *url, BIO *bio, BIO *rbio,
- int timeout, const ASN1_ITEM *it)
+ int timeout, const ASN1_ITEM *it)
{
#ifndef OPENSSL_NO_HTTP
- size_t max_resp_len = (it == ASN1_ITEM_rptr(X509_CRL)) ?
- OSSL_HTTP_DEFAULT_MAX_CRL_LEN : OSSL_HTTP_DEFAULT_MAX_RESP_LEN;
+ size_t max_resp_len = (it == ASN1_ITEM_rptr(X509_CRL)) ? OSSL_HTTP_DEFAULT_MAX_CRL_LEN : OSSL_HTTP_DEFAULT_MAX_RESP_LEN;
BIO *mem = OSSL_HTTP_get(url, NULL /* proxy */, NULL /* no_proxy */,
- bio, rbio, NULL /* cb */, NULL /* arg */,
- 1024 /* buf_size */, NULL /* headers */,
- NULL /* expected_ct */, 1 /* expect_asn1 */,
- max_resp_len, timeout);
+ bio, rbio, NULL /* cb */, NULL /* arg */,
+ 1024 /* buf_size */, NULL /* headers */,
+ NULL /* expected_ct */, 1 /* expect_asn1 */,
+ max_resp_len, timeout);
ASN1_VALUE *res = ASN1_item_d2i_bio(it, mem, NULL);
BIO_free(mem);
@@ -135,7 +134,7 @@ static ASN1_VALUE *simple_get_asn1(const char *url, BIO *bio, BIO *rbio,
X509 *X509_load_http(const char *url, BIO *bio, BIO *rbio, int timeout)
{
return (X509 *)simple_get_asn1(url, bio, rbio, timeout,
- ASN1_ITEM_rptr(X509));
+ ASN1_ITEM_rptr(X509));
}
int X509_REQ_sign(X509_REQ *x, EVP_PKEY *pkey, const EVP_MD *md)
@@ -146,8 +145,8 @@ int X509_REQ_sign(X509_REQ *x, EVP_PKEY *pkey, const EVP_MD *md)
}
x->req_info.enc.modified = 1;
return ASN1_item_sign_ex(ASN1_ITEM_rptr(X509_REQ_INFO), &x->sig_alg, NULL,
- x->signature, &x->req_info, NULL,
- pkey, md, x->libctx, x->propq);
+ x->signature, &x->req_info, NULL,
+ pkey, md, x->libctx, x->propq);
}
int X509_REQ_sign_ctx(X509_REQ *x, EVP_MD_CTX *ctx)
@@ -158,8 +157,8 @@ int X509_REQ_sign_ctx(X509_REQ *x, EVP_MD_CTX *ctx)
}
x->req_info.enc.modified = 1;
return ASN1_item_sign_ctx(ASN1_ITEM_rptr(X509_REQ_INFO),
- &x->sig_alg, NULL, x->signature, &x->req_info,
- ctx);
+ &x->sig_alg, NULL, x->signature, &x->req_info,
+ ctx);
}
int X509_CRL_sign(X509_CRL *x, EVP_PKEY *pkey, const EVP_MD *md)
@@ -170,8 +169,8 @@ int X509_CRL_sign(X509_CRL *x, EVP_PKEY *pkey, const EVP_MD *md)
}
x->crl.enc.modified = 1;
return ASN1_item_sign_ex(ASN1_ITEM_rptr(X509_CRL_INFO), &x->crl.sig_alg,
- &x->sig_alg, &x->signature, &x->crl, NULL,
- pkey, md, x->libctx, x->propq);
+ &x->sig_alg, &x->signature, &x->crl, NULL,
+ pkey, md, x->libctx, x->propq);
}
int X509_CRL_sign_ctx(X509_CRL *x, EVP_MD_CTX *ctx)
@@ -182,36 +181,35 @@ int X509_CRL_sign_ctx(X509_CRL *x, EVP_MD_CTX *ctx)
}
x->crl.enc.modified = 1;
return ASN1_item_sign_ctx(ASN1_ITEM_rptr(X509_CRL_INFO),
- &x->crl.sig_alg, &x->sig_alg, &x->signature,
- &x->crl, ctx);
+ &x->crl.sig_alg, &x->sig_alg, &x->signature,
+ &x->crl, ctx);
}
X509_CRL *X509_CRL_load_http(const char *url, BIO *bio, BIO *rbio, int timeout)
{
return (X509_CRL *)simple_get_asn1(url, bio, rbio, timeout,
- ASN1_ITEM_rptr(X509_CRL));
+ ASN1_ITEM_rptr(X509_CRL));
}
int X509_ACERT_sign(X509_ACERT *x, EVP_PKEY *pkey, const EVP_MD *md)
{
return ASN1_item_sign_ex(ASN1_ITEM_rptr(X509_ACERT_INFO), &x->sig_alg,
- &x->acinfo->signature,
- &x->signature, x->acinfo, NULL,
- pkey, md, NULL, NULL);
+ &x->acinfo->signature,
+ &x->signature, x->acinfo, NULL,
+ pkey, md, NULL, NULL);
}
int X509_ACERT_sign_ctx(X509_ACERT *x, EVP_MD_CTX *ctx)
{
return ASN1_item_sign_ctx(ASN1_ITEM_rptr(X509_ACERT_INFO),
- &x->sig_alg, &x->acinfo->signature, &x->signature,
- x->acinfo, ctx);
+ &x->sig_alg, &x->acinfo->signature, &x->signature,
+ x->acinfo, ctx);
}
int NETSCAPE_SPKI_sign(NETSCAPE_SPKI *x, EVP_PKEY *pkey, const EVP_MD *md)
{
- return
- ASN1_item_sign_ex(ASN1_ITEM_rptr(NETSCAPE_SPKAC), &x->sig_algor, NULL,
- x->signature, x->spkac, NULL, pkey, md, NULL, NULL);
+ return ASN1_item_sign_ex(ASN1_ITEM_rptr(NETSCAPE_SPKAC), &x->sig_algor, NULL,
+ x->signature, x->spkac, NULL, pkey, md, NULL, NULL);
}
#ifndef OPENSSL_NO_STDIO
@@ -326,8 +324,7 @@ X509_REQ *d2i_X509_REQ_bio(BIO *bp, X509_REQ **req)
propq = (*req)->propq;
}
- return
- ASN1_item_d2i_bio_ex(ASN1_ITEM_rptr(X509_REQ), bp, req, libctx, propq);
+ return ASN1_item_d2i_bio_ex(ASN1_ITEM_rptr(X509_REQ), bp, req, libctx, propq);
}
int i2d_X509_REQ_bio(BIO *bp, const X509_REQ *req)
@@ -354,8 +351,9 @@ RSA *d2i_RSAPublicKey_fp(FILE *fp, RSA **rsa)
RSA *d2i_RSA_PUBKEY_fp(FILE *fp, RSA **rsa)
{
return ASN1_d2i_fp((void *(*)(void))
- RSA_new, (D2I_OF(void)) d2i_RSA_PUBKEY, fp,
- (void **)rsa);
+ RSA_new,
+ (D2I_OF(void))d2i_RSA_PUBKEY, fp,
+ (void **)rsa);
}
int i2d_RSAPublicKey_fp(FILE *fp, const RSA *rsa)
@@ -400,7 +398,7 @@ int i2d_RSA_PUBKEY_bio(BIO *bp, const RSA *rsa)
}
#ifndef OPENSSL_NO_DSA
-# ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_STDIO
DSA *d2i_DSAPrivateKey_fp(FILE *fp, DSA **dsa)
{
return ASN1_d2i_fp_of(DSA, DSA_new, d2i_DSAPrivateKey, fp, dsa);
@@ -420,7 +418,7 @@ int i2d_DSA_PUBKEY_fp(FILE *fp, const DSA *dsa)
{
return ASN1_i2d_fp_of(DSA, i2d_DSA_PUBKEY, fp, dsa);
}
-# endif
+#endif
DSA *d2i_DSAPrivateKey_bio(BIO *bp, DSA **dsa)
{
@@ -445,7 +443,7 @@ int i2d_DSA_PUBKEY_bio(BIO *bp, const DSA *dsa)
#endif
#ifndef OPENSSL_NO_EC
-# ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_STDIO
EC_KEY *d2i_EC_PUBKEY_fp(FILE *fp, EC_KEY **eckey)
{
return ASN1_d2i_fp_of(EC_KEY, EC_KEY_new, d2i_EC_PUBKEY, fp, eckey);
@@ -465,7 +463,7 @@ int i2d_ECPrivateKey_fp(FILE *fp, const EC_KEY *eckey)
{
return ASN1_i2d_fp_of(EC_KEY, i2d_ECPrivateKey, fp, eckey);
}
-# endif
+#endif
EC_KEY *d2i_EC_PUBKEY_bio(BIO *bp, EC_KEY **eckey)
{
return ASN1_d2i_bio_of(EC_KEY, EC_KEY_new, d2i_EC_PUBKEY, bp, eckey);
@@ -488,7 +486,7 @@ int i2d_ECPrivateKey_bio(BIO *bp, const EC_KEY *eckey)
#endif
int X509_pubkey_digest(const X509 *data, const EVP_MD *type,
- unsigned char *md, unsigned int *len)
+ unsigned char *md, unsigned int *len)
{
ASN1_BIT_STRING *key = X509_get0_pubkey_bitstr(data);
@@ -498,10 +496,10 @@ int X509_pubkey_digest(const X509 *data, const EVP_MD *type,
}
int X509_digest(const X509 *cert, const EVP_MD *md, unsigned char *data,
- unsigned int *len)
+ unsigned int *len)
{
if (EVP_MD_is_a(md, SN_sha1) && (cert->ex_flags & EXFLAG_SET) != 0
- && (cert->ex_flags & EXFLAG_NO_FINGERPRINT) == 0) {
+ && (cert->ex_flags & EXFLAG_NO_FINGERPRINT) == 0) {
/* Asking for SHA1 and we already computed it. */
if (len != NULL)
*len = sizeof(cert->sha1_hash);
@@ -509,12 +507,12 @@ int X509_digest(const X509 *cert, const EVP_MD *md, unsigned char *data,
return 1;
}
return ossl_asn1_item_digest_ex(ASN1_ITEM_rptr(X509), md, (char *)cert,
- data, len, cert->libctx, cert->propq);
+ data, len, cert->libctx, cert->propq);
}
/* calculate cert digest using the same hash algorithm as in its signature */
ASN1_OCTET_STRING *X509_digest_sig(const X509 *cert,
- EVP_MD **md_used, int *md_is_fallback)
+ EVP_MD **md_used, int *md_is_fallback)
{
unsigned int len;
unsigned char hash[EVP_MAX_MD_SIZE];
@@ -546,8 +544,8 @@ ASN1_OCTET_STRING *X509_digest_sig(const X509 *cert,
if (pss == NULL
|| !ossl_rsa_pss_get_param_unverified(pss, &mmd, &mgf1md,
- &saltlen,
- &trailerfield)
+ &saltlen,
+ &trailerfield)
|| mmd == NULL) {
RSA_PSS_PARAMS_free(pss);
ERR_raise(ERR_LIB_X509, X509_R_UNSUPPORTED_ALGORITHM);
@@ -556,7 +554,8 @@ ASN1_OCTET_STRING *X509_digest_sig(const X509 *cert,
RSA_PSS_PARAMS_free(pss);
/* Fetch explicitly and do not fallback */
if ((md = EVP_MD_fetch(cert->libctx, EVP_MD_get0_name(mmd),
- cert->propq)) == NULL)
+ cert->propq))
+ == NULL)
/* Error code from fetch is sufficient */
return NULL;
} else if (pknid != NID_undef) {
@@ -573,7 +572,8 @@ ASN1_OCTET_STRING *X509_digest_sig(const X509 *cert,
break;
}
if ((md = EVP_MD_fetch(cert->libctx, md_name,
- cert->propq)) == NULL)
+ cert->propq))
+ == NULL)
return NULL;
if (md_is_fallback != NULL)
*md_is_fallback = 1;
@@ -583,13 +583,14 @@ ASN1_OCTET_STRING *X509_digest_sig(const X509 *cert,
return NULL;
}
} else if ((md = EVP_MD_fetch(cert->libctx, OBJ_nid2sn(mdnid),
- cert->propq)) == NULL
- && (md = (EVP_MD *)EVP_get_digestbynid(mdnid)) == NULL) {
+ cert->propq))
+ == NULL
+ && (md = (EVP_MD *)EVP_get_digestbynid(mdnid)) == NULL) {
ERR_raise(ERR_LIB_X509, X509_R_UNSUPPORTED_ALGORITHM);
return NULL;
}
if (!X509_digest(cert, md, hash, &len)
- || (new = ASN1_OCTET_STRING_new()) == NULL)
+ || (new = ASN1_OCTET_STRING_new()) == NULL)
goto err;
if (ASN1_OCTET_STRING_set(new, hash, len)) {
if (md_used != NULL)
@@ -599,53 +600,51 @@ ASN1_OCTET_STRING *X509_digest_sig(const X509 *cert,
return new;
}
ASN1_OCTET_STRING_free(new);
- err:
+err:
EVP_MD_free(md);
return NULL;
}
int X509_CRL_digest(const X509_CRL *data, const EVP_MD *type,
- unsigned char *md, unsigned int *len)
+ unsigned char *md, unsigned int *len)
{
if (type == NULL) {
ERR_raise(ERR_LIB_X509, ERR_R_PASSED_NULL_PARAMETER);
return 0;
}
if (EVP_MD_is_a(type, SN_sha1)
- && (data->flags & EXFLAG_SET) != 0
- && (data->flags & EXFLAG_NO_FINGERPRINT) == 0) {
+ && (data->flags & EXFLAG_SET) != 0
+ && (data->flags & EXFLAG_NO_FINGERPRINT) == 0) {
/* Asking for SHA1; always computed in CRL d2i. */
if (len != NULL)
*len = sizeof(data->sha1_hash);
memcpy(md, data->sha1_hash, sizeof(data->sha1_hash));
return 1;
}
- return
- ossl_asn1_item_digest_ex(ASN1_ITEM_rptr(X509_CRL), type, (char *)data,
- md, len, data->libctx, data->propq);
+ return ossl_asn1_item_digest_ex(ASN1_ITEM_rptr(X509_CRL), type, (char *)data,
+ md, len, data->libctx, data->propq);
}
int X509_REQ_digest(const X509_REQ *data, const EVP_MD *type,
- unsigned char *md, unsigned int *len)
+ unsigned char *md, unsigned int *len)
{
- return
- ossl_asn1_item_digest_ex(ASN1_ITEM_rptr(X509_REQ), type, (char *)data,
- md, len, data->libctx, data->propq);
+ return ossl_asn1_item_digest_ex(ASN1_ITEM_rptr(X509_REQ), type, (char *)data,
+ md, len, data->libctx, data->propq);
}
int X509_NAME_digest(const X509_NAME *data, const EVP_MD *type,
- unsigned char *md, unsigned int *len)
+ unsigned char *md, unsigned int *len)
{
return ASN1_item_digest(ASN1_ITEM_rptr(X509_NAME), type, (char *)data,
- md, len);
+ md, len);
}
int PKCS7_ISSUER_AND_SERIAL_digest(PKCS7_ISSUER_AND_SERIAL *data,
- const EVP_MD *type, unsigned char *md,
- unsigned int *len)
+ const EVP_MD *type, unsigned char *md,
+ unsigned int *len)
{
return ASN1_item_digest(ASN1_ITEM_rptr(PKCS7_ISSUER_AND_SERIAL), type,
- (char *)data, md, len);
+ (char *)data, md, len);
}
#ifndef OPENSSL_NO_STDIO
@@ -674,7 +673,7 @@ int i2d_PKCS8_bio(BIO *bp, const X509_SIG *p8)
X509_PUBKEY *d2i_X509_PUBKEY_fp(FILE *fp, X509_PUBKEY **xpk)
{
return ASN1_d2i_fp_of(X509_PUBKEY, X509_PUBKEY_new, d2i_X509_PUBKEY,
- fp, xpk);
+ fp, xpk);
}
int i2d_X509_PUBKEY_fp(FILE *fp, const X509_PUBKEY *xpk)
@@ -686,7 +685,7 @@ int i2d_X509_PUBKEY_fp(FILE *fp, const X509_PUBKEY *xpk)
X509_PUBKEY *d2i_X509_PUBKEY_bio(BIO *bp, X509_PUBKEY **xpk)
{
return ASN1_d2i_bio_of(X509_PUBKEY, X509_PUBKEY_new, d2i_X509_PUBKEY,
- bp, xpk);
+ bp, xpk);
}
int i2d_X509_PUBKEY_bio(BIO *bp, const X509_PUBKEY *xpk)
@@ -696,16 +695,16 @@ int i2d_X509_PUBKEY_bio(BIO *bp, const X509_PUBKEY *xpk)
#ifndef OPENSSL_NO_STDIO
PKCS8_PRIV_KEY_INFO *d2i_PKCS8_PRIV_KEY_INFO_fp(FILE *fp,
- PKCS8_PRIV_KEY_INFO **p8inf)
+ PKCS8_PRIV_KEY_INFO **p8inf)
{
return ASN1_d2i_fp_of(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO_new,
- d2i_PKCS8_PRIV_KEY_INFO, fp, p8inf);
+ d2i_PKCS8_PRIV_KEY_INFO, fp, p8inf);
}
int i2d_PKCS8_PRIV_KEY_INFO_fp(FILE *fp, const PKCS8_PRIV_KEY_INFO *p8inf)
{
return ASN1_i2d_fp_of(PKCS8_PRIV_KEY_INFO, i2d_PKCS8_PRIV_KEY_INFO, fp,
- p8inf);
+ p8inf);
}
int i2d_PKCS8PrivateKeyInfo_fp(FILE *fp, const EVP_PKEY *key)
@@ -732,7 +731,7 @@ EVP_PKEY *d2i_PrivateKey_fp(FILE *fp, EVP_PKEY **a)
}
EVP_PKEY *d2i_PrivateKey_ex_fp(FILE *fp, EVP_PKEY **a, OSSL_LIB_CTX *libctx,
- const char *propq)
+ const char *propq)
{
BIO *b;
void *ret;
@@ -753,7 +752,7 @@ int i2d_PUBKEY_fp(FILE *fp, const EVP_PKEY *pkey)
}
EVP_PKEY *d2i_PUBKEY_ex_fp(FILE *fp, EVP_PKEY **a, OSSL_LIB_CTX *libctx,
- const char *propq)
+ const char *propq)
{
BIO *b;
void *ret;
@@ -776,16 +775,16 @@ EVP_PKEY *d2i_PUBKEY_fp(FILE *fp, EVP_PKEY **a)
#endif
PKCS8_PRIV_KEY_INFO *d2i_PKCS8_PRIV_KEY_INFO_bio(BIO *bp,
- PKCS8_PRIV_KEY_INFO **p8inf)
+ PKCS8_PRIV_KEY_INFO **p8inf)
{
return ASN1_d2i_bio_of(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO_new,
- d2i_PKCS8_PRIV_KEY_INFO, bp, p8inf);
+ d2i_PKCS8_PRIV_KEY_INFO, bp, p8inf);
}
int i2d_PKCS8_PRIV_KEY_INFO_bio(BIO *bp, const PKCS8_PRIV_KEY_INFO *p8inf)
{
return ASN1_i2d_bio_of(PKCS8_PRIV_KEY_INFO, i2d_PKCS8_PRIV_KEY_INFO, bp,
- p8inf);
+ p8inf);
}
int i2d_PKCS8PrivateKeyInfo_bio(BIO *bp, const EVP_PKEY *key)
@@ -812,7 +811,7 @@ EVP_PKEY *d2i_PrivateKey_bio(BIO *bp, EVP_PKEY **a)
}
EVP_PKEY *d2i_PrivateKey_ex_bio(BIO *bp, EVP_PKEY **a, OSSL_LIB_CTX *libctx,
- const char *propq)
+ const char *propq)
{
BUF_MEM *b = NULL;
const unsigned char *p;
@@ -825,7 +824,7 @@ EVP_PKEY *d2i_PrivateKey_ex_bio(BIO *bp, EVP_PKEY **a, OSSL_LIB_CTX *libctx,
p = (unsigned char *)b->data;
ret = d2i_AutoPrivateKey_ex(a, &p, len, libctx, propq);
- err:
+err:
BUF_MEM_free(b);
return ret;
}
@@ -836,7 +835,7 @@ int i2d_PUBKEY_bio(BIO *bp, const EVP_PKEY *pkey)
}
EVP_PKEY *d2i_PUBKEY_ex_bio(BIO *bp, EVP_PKEY **a, OSSL_LIB_CTX *libctx,
- const char *propq)
+ const char *propq)
{
BUF_MEM *b = NULL;
const unsigned char *p;
@@ -849,7 +848,7 @@ EVP_PKEY *d2i_PUBKEY_ex_bio(BIO *bp, EVP_PKEY **a, OSSL_LIB_CTX *libctx,
p = (unsigned char *)b->data;
ret = d2i_PUBKEY_ex(a, &p, len, libctx, propq);
- err:
+err:
BUF_MEM_free(b);
return ret;
}
diff --git a/crypto/x509/x_attrib.c b/crypto/x509/x_attrib.c
index 0bae13dd73..f4c225a8ff 100644
--- a/crypto/x509/x_attrib.c
+++ b/crypto/x509/x_attrib.c
@@ -27,8 +27,8 @@
*/
ASN1_SEQUENCE(X509_ATTRIBUTE) = {
- ASN1_SIMPLE(X509_ATTRIBUTE, object, ASN1_OBJECT),
- ASN1_SET_OF(X509_ATTRIBUTE, set, ASN1_ANY)
+ ASN1_SIMPLE(X509_ATTRIBUTE, object, ASN1_OBJECT),
+ ASN1_SET_OF(X509_ATTRIBUTE, set, ASN1_ANY)
} ASN1_SEQUENCE_END(X509_ATTRIBUTE)
IMPLEMENT_ASN1_FUNCTIONS(X509_ATTRIBUTE)
@@ -52,13 +52,14 @@ X509_ATTRIBUTE *X509_ATTRIBUTE_create(int nid, int atrtype, void *value)
ASN1_TYPE_set(val, atrtype, value);
return ret;
- err:
+err:
X509_ATTRIBUTE_free(ret);
ASN1_TYPE_free(val);
return NULL;
}
-static int print_oid(BIO *out, const ASN1_OBJECT *oid) {
+static int print_oid(BIO *out, const ASN1_OBJECT *oid)
+{
const char *ln;
char objbuf[80];
int rc;
@@ -67,15 +68,15 @@ static int print_oid(BIO *out, const ASN1_OBJECT *oid) {
return 0;
ln = OBJ_nid2ln(OBJ_obj2nid(oid));
rc = (ln != NULL)
- ? BIO_printf(out, "%s (%s)", objbuf, ln)
- : BIO_printf(out, "%s", objbuf);
+ ? BIO_printf(out, "%s (%s)", objbuf, ln)
+ : BIO_printf(out, "%s", objbuf);
return (rc >= 0);
}
int ossl_print_attribute_value(BIO *out,
- int obj_nid,
- const ASN1_TYPE *av,
- int indent)
+ int obj_nid,
+ const ASN1_TYPE *av,
+ int indent)
{
ASN1_STRING *str;
unsigned char *value;
@@ -105,14 +106,14 @@ int ossl_print_attribute_value(BIO *out,
if (BIO_printf(out, "%*s", indent, "") < 0)
return 0;
return ossl_bio_print_hex(out, av->value.bit_string->data,
- av->value.bit_string->length);
+ av->value.bit_string->length);
case V_ASN1_OCTET_STRING:
case V_ASN1_VIDEOTEXSTRING:
if (BIO_printf(out, "%*s", indent, "") < 0)
return 0;
return ossl_bio_print_hex(out, av->value.octet_string->data,
- av->value.octet_string->length);
+ av->value.octet_string->length);
case V_ASN1_NULL:
return BIO_printf(out, "%*sNULL", indent, "") >= 4;
@@ -131,22 +132,24 @@ int ossl_print_attribute_value(BIO *out,
case V_ASN1_GRAPHICSTRING:
case V_ASN1_OBJECT_DESCRIPTOR:
return BIO_printf(out, "%*s%.*s", indent, "",
- av->value.generalstring->length,
- av->value.generalstring->data) >= 0;
+ av->value.generalstring->length,
+ av->value.generalstring->data)
+ >= 0;
- /* EXTERNAL would go here. */
- /* EMBEDDED PDV would go here. */
+ /* EXTERNAL would go here. */
+ /* EMBEDDED PDV would go here. */
case V_ASN1_UTF8STRING:
return BIO_printf(out, "%*s%.*s", indent, "",
- av->value.utf8string->length,
- av->value.utf8string->data) >= 0;
+ av->value.utf8string->length,
+ av->value.utf8string->data)
+ >= 0;
case V_ASN1_REAL:
return BIO_printf(out, "%*sREAL", indent, "") >= 4;
- /* RELATIVE-OID would go here. */
- /* TIME would go here. */
+ /* RELATIVE-OID would go here. */
+ /* TIME would go here. */
case V_ASN1_SEQUENCE:
switch (obj_nid) {
@@ -169,8 +172,8 @@ int ossl_print_attribute_value(BIO *out,
*/
value = av->value.sequence->data;
xn = d2i_X509_NAME(NULL,
- (const unsigned char **)&value,
- av->value.sequence->length);
+ (const unsigned char **)&value,
+ av->value.sequence->length);
if (xn == NULL) {
BIO_puts(out, "(COULD NOT DECODE DISTINGUISHED NAME)\n");
return 0;
@@ -184,11 +187,13 @@ int ossl_print_attribute_value(BIO *out,
break;
}
return ASN1_parse_dump(out, av->value.sequence->data,
- av->value.sequence->length, indent, 1) > 0;
+ av->value.sequence->length, indent, 1)
+ > 0;
case V_ASN1_SET:
return ASN1_parse_dump(out, av->value.set->data,
- av->value.set->length, indent, 1) > 0;
+ av->value.set->length, indent, 1)
+ > 0;
/*
* UTCTime ::= [UNIVERSAL 23] IMPLICIT VisibleString
@@ -200,23 +205,27 @@ int ossl_print_attribute_value(BIO *out,
case V_ASN1_GENERALIZEDTIME:
case V_ASN1_NUMERICSTRING:
return BIO_printf(out, "%*s%.*s", indent, "",
- av->value.visiblestring->length,
- av->value.visiblestring->data) >= 0;
+ av->value.visiblestring->length,
+ av->value.visiblestring->data)
+ >= 0;
case V_ASN1_PRINTABLESTRING:
return BIO_printf(out, "%*s%.*s", indent, "",
- av->value.printablestring->length,
- av->value.printablestring->data) >= 0;
+ av->value.printablestring->length,
+ av->value.printablestring->data)
+ >= 0;
case V_ASN1_T61STRING:
return BIO_printf(out, "%*s%.*s", indent, "",
- av->value.t61string->length,
- av->value.t61string->data) >= 0;
+ av->value.t61string->length,
+ av->value.t61string->data)
+ >= 0;
case V_ASN1_IA5STRING:
return BIO_printf(out, "%*s%.*s", indent, "",
- av->value.ia5string->length,
- av->value.ia5string->data) >= 0;
+ av->value.ia5string->length,
+ av->value.ia5string->data)
+ >= 0;
/* UniversalString would go here. */
/* CHARACTER STRING would go here. */
@@ -231,9 +240,10 @@ int ossl_print_attribute_value(BIO *out,
/* Would it be appropriate to just hexdump? */
default:
return BIO_printf(out,
- "%*s<Unsupported tag %d>",
- indent,
- "",
- av->type) >= 0;
+ "%*s<Unsupported tag %d>",
+ indent,
+ "",
+ av->type)
+ >= 0;
}
}
diff --git a/crypto/x509/x_crl.c b/crypto/x509/x_crl.c
index 9866286e01..7314d30dbd 100644
--- a/crypto/x509/x_crl.c
+++ b/crypto/x509/x_crl.c
@@ -16,19 +16,19 @@
#include "x509_local.h"
static int X509_REVOKED_cmp(const X509_REVOKED *const *a,
- const X509_REVOKED *const *b);
+ const X509_REVOKED *const *b);
static int setup_idp(X509_CRL *crl, ISSUING_DIST_POINT *idp);
ASN1_SEQUENCE(X509_REVOKED) = {
- ASN1_EMBED(X509_REVOKED, serialNumber, ASN1_INTEGER),
- ASN1_SIMPLE(X509_REVOKED, revocationDate, ASN1_TIME),
- ASN1_SEQUENCE_OF_OPT(X509_REVOKED, extensions, X509_EXTENSION)
+ ASN1_EMBED(X509_REVOKED, serialNumber, ASN1_INTEGER),
+ ASN1_SIMPLE(X509_REVOKED, revocationDate, ASN1_TIME),
+ ASN1_SEQUENCE_OF_OPT(X509_REVOKED, extensions, X509_EXTENSION)
} ASN1_SEQUENCE_END(X509_REVOKED)
static int def_crl_verify(X509_CRL *crl, EVP_PKEY *r);
static int def_crl_lookup(X509_CRL *crl,
- X509_REVOKED **ret, const ASN1_INTEGER *serial,
- const X509_NAME *issuer);
+ X509_REVOKED **ret, const ASN1_INTEGER *serial,
+ const X509_NAME *issuer);
static X509_CRL_METHOD int_crl_meth = {
0,
@@ -45,7 +45,7 @@ static const X509_CRL_METHOD *default_crl_method = &int_crl_meth;
* revoked field.
*/
static int crl_inf_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
- void *exarg)
+ void *exarg)
{
X509_CRL_INFO *a = (X509_CRL_INFO *)*pval;
@@ -63,15 +63,14 @@ static int crl_inf_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
return 1;
}
-
ASN1_SEQUENCE_enc(X509_CRL_INFO, enc, crl_inf_cb) = {
- ASN1_OPT(X509_CRL_INFO, version, ASN1_INTEGER),
- ASN1_EMBED(X509_CRL_INFO, sig_alg, X509_ALGOR),
- ASN1_SIMPLE(X509_CRL_INFO, issuer, X509_NAME),
- ASN1_SIMPLE(X509_CRL_INFO, lastUpdate, ASN1_TIME),
- ASN1_OPT(X509_CRL_INFO, nextUpdate, ASN1_TIME),
- ASN1_SEQUENCE_OF_OPT(X509_CRL_INFO, revoked, X509_REVOKED),
- ASN1_EXP_SEQUENCE_OF_OPT(X509_CRL_INFO, extensions, X509_EXTENSION, 0)
+ ASN1_OPT(X509_CRL_INFO, version, ASN1_INTEGER),
+ ASN1_EMBED(X509_CRL_INFO, sig_alg, X509_ALGOR),
+ ASN1_SIMPLE(X509_CRL_INFO, issuer, X509_NAME),
+ ASN1_SIMPLE(X509_CRL_INFO, lastUpdate, ASN1_TIME),
+ ASN1_OPT(X509_CRL_INFO, nextUpdate, ASN1_TIME),
+ ASN1_SEQUENCE_OF_OPT(X509_CRL_INFO, revoked, X509_REVOKED),
+ ASN1_EXP_SEQUENCE_OF_OPT(X509_CRL_INFO, extensions, X509_EXTENSION, 0)
} ASN1_SEQUENCE_END_enc(X509_CRL_INFO, X509_CRL_INFO)
/*
@@ -197,11 +196,9 @@ static int crl_set_issuers(X509_CRL *crl)
crl->flags |= EXFLAG_CRITICAL;
}
}
-
}
return 1;
-
}
/*
@@ -209,7 +206,7 @@ static int crl_set_issuers(X509_CRL *crl)
* and hash of the whole CRL or set EXFLAG_NO_FINGERPRINT if this fails.
*/
static int crl_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
- void *exarg)
+ void *exarg)
{
X509_CRL *crl = (X509_CRL *)*pval;
STACK_OF(X509_EXTENSION) *exts;
@@ -246,30 +243,29 @@ static int crl_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
if (!X509_CRL_digest(crl, EVP_sha1(), crl->sha1_hash, NULL))
crl->flags |= EXFLAG_NO_FINGERPRINT;
crl->idp = X509_CRL_get_ext_d2i(crl,
- NID_issuing_distribution_point, &i,
- NULL);
+ NID_issuing_distribution_point, &i,
+ NULL);
if (crl->idp != NULL) {
if (!setup_idp(crl, crl->idp))
crl->flags |= EXFLAG_INVALID;
- }
- else if (i != -1) {
+ } else if (i != -1) {
crl->flags |= EXFLAG_INVALID;
}
crl->akid = X509_CRL_get_ext_d2i(crl,
- NID_authority_key_identifier, &i,
- NULL);
+ NID_authority_key_identifier, &i,
+ NULL);
if (crl->akid == NULL && i != -1)
crl->flags |= EXFLAG_INVALID;
crl->crl_number = X509_CRL_get_ext_d2i(crl,
- NID_crl_number, &i, NULL);
+ NID_crl_number, &i, NULL);
if (crl->crl_number == NULL && i != -1)
crl->flags |= EXFLAG_INVALID;
crl->base_crl_number = X509_CRL_get_ext_d2i(crl,
- NID_delta_crl, &i,
- NULL);
+ NID_delta_crl, &i,
+ NULL);
if (crl->base_crl_number == NULL && i != -1)
crl->flags |= EXFLAG_INVALID;
/* Delta CRLs must have CRL number */
@@ -325,14 +321,12 @@ static int crl_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
sk_GENERAL_NAMES_pop_free(crl->issuers, GENERAL_NAMES_free);
OPENSSL_free(crl->propq);
break;
- case ASN1_OP_DUP_POST:
- {
- X509_CRL *old = exarg;
+ case ASN1_OP_DUP_POST: {
+ X509_CRL *old = exarg;
- if (!ossl_x509_crl_set0_libctx(crl, old->libctx, old->propq))
- return 0;
- }
- break;
+ if (!ossl_x509_crl_set0_libctx(crl, old->libctx, old->propq))
+ return 0;
+ } break;
}
return 1;
}
@@ -388,9 +382,9 @@ static int setup_idp(X509_CRL *crl, ISSUING_DIST_POINT *idp)
}
ASN1_SEQUENCE_ref(X509_CRL, crl_cb) = {
- ASN1_EMBED(X509_CRL, crl, X509_CRL_INFO),
- ASN1_EMBED(X509_CRL, sig_alg, X509_ALGOR),
- ASN1_EMBED(X509_CRL, signature, ASN1_BIT_STRING)
+ ASN1_EMBED(X509_CRL, crl, X509_CRL_INFO),
+ ASN1_EMBED(X509_CRL, sig_alg, X509_ALGOR),
+ ASN1_EMBED(X509_CRL, signature, ASN1_BIT_STRING)
} ASN1_SEQUENCE_END_ref(X509_CRL, X509_CRL)
IMPLEMENT_ASN1_FUNCTIONS(X509_REVOKED)
@@ -404,10 +398,10 @@ IMPLEMENT_ASN1_FUNCTIONS(X509_CRL)
IMPLEMENT_ASN1_DUP_FUNCTION(X509_CRL)
static int X509_REVOKED_cmp(const X509_REVOKED *const *a,
- const X509_REVOKED *const *b)
+ const X509_REVOKED *const *b)
{
return (ASN1_STRING_cmp((ASN1_STRING *)&(*a)->serialNumber,
- (ASN1_STRING *)&(*b)->serialNumber));
+ (ASN1_STRING *)&(*b)->serialNumber));
}
X509_CRL *X509_CRL_new_ex(OSSL_LIB_CTX *libctx, const char *propq)
@@ -445,7 +439,7 @@ int X509_CRL_verify(X509_CRL *crl, EVP_PKEY *r)
}
int X509_CRL_get0_by_serial(X509_CRL *crl,
- X509_REVOKED **ret, const ASN1_INTEGER *serial)
+ X509_REVOKED **ret, const ASN1_INTEGER *serial)
{
if (crl->meth->crl_lookup)
return crl->meth->crl_lookup(crl, ret, serial, NULL);
@@ -456,20 +450,20 @@ int X509_CRL_get0_by_cert(X509_CRL *crl, X509_REVOKED **ret, X509 *x)
{
if (crl->meth->crl_lookup)
return crl->meth->crl_lookup(crl, ret,
- X509_get0_serialNumber(x),
- X509_get_issuer_name(x));
+ X509_get0_serialNumber(x),
+ X509_get_issuer_name(x));
return 0;
}
static int def_crl_verify(X509_CRL *crl, EVP_PKEY *r)
{
return ASN1_item_verify_ex(ASN1_ITEM_rptr(X509_CRL_INFO),
- &crl->sig_alg, &crl->signature, &crl->crl, NULL,
- r, crl->libctx, crl->propq);
+ &crl->sig_alg, &crl->signature, &crl->crl, NULL,
+ r, crl->libctx, crl->propq);
}
static int crl_revoked_issuer_match(X509_CRL *crl, const X509_NAME *nm,
- X509_REVOKED *rev)
+ X509_REVOKED *rev)
{
int i;
@@ -492,12 +486,11 @@ static int crl_revoked_issuer_match(X509_CRL *crl, const X509_NAME *nm,
return 1;
}
return 0;
-
}
static int def_crl_lookup(X509_CRL *crl,
- X509_REVOKED **ret, const ASN1_INTEGER *serial,
- const X509_NAME *issuer)
+ X509_REVOKED **ret, const ASN1_INTEGER *serial,
+ const X509_NAME *issuer)
{
X509_REVOKED rtmp, *rev;
int idx, num;
@@ -543,14 +536,14 @@ void X509_CRL_set_default_method(const X509_CRL_METHOD *meth)
default_crl_method = meth;
}
-X509_CRL_METHOD *X509_CRL_METHOD_new(int (*crl_init) (X509_CRL *crl),
- int (*crl_free) (X509_CRL *crl),
- int (*crl_lookup) (X509_CRL *crl,
- X509_REVOKED **ret,
- const ASN1_INTEGER *ser,
- const X509_NAME *issuer),
- int (*crl_verify) (X509_CRL *crl,
- EVP_PKEY *pk))
+X509_CRL_METHOD *X509_CRL_METHOD_new(int (*crl_init)(X509_CRL *crl),
+ int (*crl_free)(X509_CRL *crl),
+ int (*crl_lookup)(X509_CRL *crl,
+ X509_REVOKED **ret,
+ const ASN1_INTEGER *ser,
+ const X509_NAME *issuer),
+ int (*crl_verify)(X509_CRL *crl,
+ EVP_PKEY *pk))
{
X509_CRL_METHOD *m = OPENSSL_malloc(sizeof(*m));
@@ -582,7 +575,7 @@ void *X509_CRL_get_meth_data(X509_CRL *crl)
}
int ossl_x509_crl_set0_libctx(X509_CRL *x, OSSL_LIB_CTX *libctx,
- const char *propq)
+ const char *propq)
{
if (x != NULL) {
x->libctx = libctx;
diff --git a/crypto/x509/x_exten.c b/crypto/x509/x_exten.c
index f4be4dd0d6..51b268433d 100644
--- a/crypto/x509/x_exten.c
+++ b/crypto/x509/x_exten.c
@@ -14,13 +14,12 @@
#include "x509_local.h"
ASN1_SEQUENCE(X509_EXTENSION) = {
- ASN1_SIMPLE(X509_EXTENSION, object, ASN1_OBJECT),
- ASN1_OPT(X509_EXTENSION, critical, ASN1_FBOOLEAN),
- ASN1_EMBED(X509_EXTENSION, value, ASN1_OCTET_STRING)
+ ASN1_SIMPLE(X509_EXTENSION, object, ASN1_OBJECT),
+ ASN1_OPT(X509_EXTENSION, critical, ASN1_FBOOLEAN),
+ ASN1_EMBED(X509_EXTENSION, value, ASN1_OCTET_STRING)
} ASN1_SEQUENCE_END(X509_EXTENSION)
-ASN1_ITEM_TEMPLATE(X509_EXTENSIONS) =
- ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, Extension, X509_EXTENSION)
+ASN1_ITEM_TEMPLATE(X509_EXTENSIONS) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, Extension, X509_EXTENSION)
ASN1_ITEM_TEMPLATE_END(X509_EXTENSIONS)
IMPLEMENT_ASN1_FUNCTIONS(X509_EXTENSION)
diff --git a/crypto/x509/x_ietfatt.c b/crypto/x509/x_ietfatt.c
index dd1c0ab347..df68878dad 100644
--- a/crypto/x509/x_ietfatt.c
+++ b/crypto/x509/x_ietfatt.c
@@ -56,20 +56,19 @@ ASN1_SEQUENCE(OSSL_IETF_ATTR_SYNTAX) = {
IMPLEMENT_ASN1_ALLOC_FUNCTIONS(OSSL_IETF_ATTR_SYNTAX)
IMPLEMENT_ASN1_ALLOC_FUNCTIONS(OSSL_IETF_ATTR_SYNTAX_VALUE)
-OSSL_IETF_ATTR_SYNTAX *d2i_OSSL_IETF_ATTR_SYNTAX (OSSL_IETF_ATTR_SYNTAX **a,
- const unsigned char **in,
- long len)
+OSSL_IETF_ATTR_SYNTAX *d2i_OSSL_IETF_ATTR_SYNTAX(OSSL_IETF_ATTR_SYNTAX **a,
+ const unsigned char **in,
+ long len)
{
OSSL_IETF_ATTR_SYNTAX *ias;
int i;
- ias = (OSSL_IETF_ATTR_SYNTAX *) ASN1_item_d2i((ASN1_VALUE **)a, in, len,
- OSSL_IETF_ATTR_SYNTAX_it());
+ ias = (OSSL_IETF_ATTR_SYNTAX *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
+ OSSL_IETF_ATTR_SYNTAX_it());
if (ias == NULL)
return ias;
- for (i = 0; i < sk_OSSL_IETF_ATTR_SYNTAX_VALUE_num(ias->values); i++)
- {
+ for (i = 0; i < sk_OSSL_IETF_ATTR_SYNTAX_VALUE_num(ias->values); i++) {
OSSL_IETF_ATTR_SYNTAX_VALUE *val;
val = sk_OSSL_IETF_ATTR_SYNTAX_VALUE_value(ias->values, i);
@@ -89,8 +88,8 @@ invalid_types:
return NULL;
}
-int i2d_OSSL_IETF_ATTR_SYNTAX (const OSSL_IETF_ATTR_SYNTAX *a,
- unsigned char **out)
+int i2d_OSSL_IETF_ATTR_SYNTAX(const OSSL_IETF_ATTR_SYNTAX *a,
+ unsigned char **out)
{
return ASN1_item_i2d((const ASN1_VALUE *)a, out, OSSL_IETF_ATTR_SYNTAX_it());
}
@@ -110,14 +109,14 @@ OSSL_IETF_ATTR_SYNTAX_get0_policyAuthority(const OSSL_IETF_ATTR_SYNTAX *a)
}
void OSSL_IETF_ATTR_SYNTAX_set0_policyAuthority(OSSL_IETF_ATTR_SYNTAX *a,
- GENERAL_NAMES *names)
+ GENERAL_NAMES *names)
{
GENERAL_NAMES_free(a->policyAuthority);
a->policyAuthority = names;
}
void *OSSL_IETF_ATTR_SYNTAX_get0_value(const OSSL_IETF_ATTR_SYNTAX *a,
- int ind, int *type)
+ int ind, int *type)
{
OSSL_IETF_ATTR_SYNTAX_VALUE *val;
@@ -141,7 +140,7 @@ void *OSSL_IETF_ATTR_SYNTAX_get0_value(const OSSL_IETF_ATTR_SYNTAX *a,
}
int OSSL_IETF_ATTR_SYNTAX_add1_value(OSSL_IETF_ATTR_SYNTAX *a, int type,
- void *data)
+ void *data)
{
OSSL_IETF_ATTR_SYNTAX_VALUE *val;
@@ -200,8 +199,7 @@ int OSSL_IETF_ATTR_SYNTAX_print(BIO *bp, OSSL_IETF_ATTR_SYNTAX *a, int indent)
if (BIO_printf(bp, "%*s", indent, "") <